diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b90b3b9094d..80da193a15e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,96 +15,33 @@ parameters:
   generate_screenshots:
     type: boolean
     default: false
+  release_build:
+    type: boolean
+    default: false
 
 commands:
   copy-gradle-properties:
     steps:
       - run:
           name: Setup gradle.properties
-          command: cp gradle.properties-example gradle.properties && cp libs/utils/WordPressUtils/gradle.properties-example libs/utils/WordPressUtils/gradle.properties
+          command: cp gradle.properties-example gradle.properties
   update-gradle-memory:
+      parameters:
+        jvmargs:
+          type: string
+          default: "Xmx2048m"
       steps:
         - run:
             name: Update memory setting
-            command: sed -i "s/org.gradle.jvmargs=.*/org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false /" gradle.properties
-  npm-install:
-    steps:
-      - restore_cache:
-          name: Restore NPM Cache
-          keys:
-            - npm-i18n-v1-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/package-lock.json" }}
-      - run:
-          name: NPM Install
-          working_directory: libs/gutenberg-mobile
-          command: npm ci --prefer-offline
-      - save_cache:
-          name: Save NPM Cache
-          key: npm-i18n-v1-cache-v{{ .Environment.CACHE_TRIGGER_VERSION }}-job-{{ .Environment.CIRCLE_JOB }}-{{ checksum "libs/gutenberg-mobile/package-lock.json" }}
-          paths:
-            - ~/.npm
-            - libs/gutenberg-mobile/i18n-cache/data
+            command: sed -i "s/org.gradle.jvmargs=.*/org.gradle.jvmargs=-<< parameters.jvmargs >> -XX:+HeapDumpOnOutOfMemoryError -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false /" gradle.properties
   checkout-submodules:
     steps:
       - run:
           name: Checkout submodules
           command: git submodule update --init --recursive --depth 1
-  npm-bundle-android:
-    steps:
-      - run:
-          name: Npm bundle Android
-          working_directory: libs/gutenberg-mobile
-          command: npm run bundle:android
-  save-gutenberg-bundle-cache:
-    steps:
-      - run:
-          name: Save Gutenberg-Mobile Submodule Hash
-          command: |
-            git rev-parse @:./libs/gutenberg-mobile > gutenberg_submodule_hash
-            cat gutenberg_submodule_hash
-      - save_cache:
-          name: Cache JS Bundle
-          key: android-js-bundle-{{ checksum "gutenberg_submodule_hash" }}
-          paths:
-            - libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle
-  restore-gutenberg-bundle-cache:
-    steps:
-      - run:
-          name: Save Gutenberg-Mobile Submodule Hash
-          command: |
-            git rev-parse @:./libs/gutenberg-mobile > gutenberg_submodule_hash
-            cat gutenberg_submodule_hash
-      - restore_cache:
-          name: Restore JS Bundle From Cache
-          key: android-js-bundle-{{ checksum "gutenberg_submodule_hash" }}
 
 version: 2.1
 jobs:
-  gutenberg-bundle-build:
-    machine:
-      image: ubuntu-2004:202010-01 # Latest supported ubuntu image from https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
-    steps:
-      - git/shallow-checkout
-      - run: node -v
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Abort If JS Bundle Exists
-          command: |
-            if [ -f "libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle" ]; then
-              echo "Gutenberg-Mobile bundle already in cache, no need to create a new one."
-              circleci-agent step halt
-            else
-              echo "Gutenberg-Mobile bundle not found in cache. Proceeding to generate new bundle"
-            fi
-      - checkout-submodules
-      - npm-install
-      - npm-bundle-android
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - run:
-          name: Move bundle to assets folder
-          command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle
-      - save-gutenberg-bundle-cache
   test:
     executor:
       name: android/default
@@ -116,27 +53,15 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - update-gradle-memory
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
       - run:
           name: Test WordPress
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
-          command: SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD=1 ./gradlew testVanillaRelease --stacktrace --no-daemon
-      - run:
-          name: Test WordPressUtils
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
-          command: cd libs/utils && ./gradlew --stacktrace testReleaseUnitTest
+          command: ./gradlew testWordpressVanillaRelease --stacktrace --no-daemon
       - run:
           name: Test WordPressProcessors
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew :libs:WordPressProcessors:test --stacktrace
+      - run:
+          name: Test ImageEditor
+          command: ./gradlew :libs:image-editor:ImageEditor:test --stacktrace
       - android/save-gradle-cache
       - android/save-test-results
   lint:
@@ -150,36 +75,25 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - update-gradle-memory
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
       - run:
           name: Checkstyle
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew --stacktrace checkstyle
       - run:
           name: ktlint
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: ./gradlew --stacktrace ciktlint
+      - run:
+          name: Detekt
+          command: ./gradlew --stacktrace WordPress:detekt
       - run:
           name: Lint
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
-          command: ./gradlew --stacktrace lintVanillaRelease || (grep -A20 -B2 'severity="Error"' -r --include="*.xml" WordPress libs; exit 1)
+          command: ./gradlew --stacktrace lintWordpressVanillaRelease || (grep -A20 -B2 'severity="Error"' -r --include="*.xml" WordPress libs; exit 1)
           no_output_timeout: 40m
       - run:
           name: Violations
           when: on_fail
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: |
             if [ -n "$GITHUB_API_TOKEN" ]; then
-              ./gradlew --stacktrace violationCommentsToGitHub -DGITHUB_PULLREQUESTID=${CIRCLE_PULL_REQUEST##*/} -DGITHUB_OAUTH2TOKEN=$GITHUB_API_TOKEN
+              ./gradlew --stacktrace violationCommentsToGitHub -DGITHUB_PULLREQUESTID=${CIRCLE_PULL_REQUEST##*/} -DGITHUB_OAUTH2TOKEN=$GHHELPER_ACCESS
             else
               echo "Not posting lint errors to Github because \$GITHUB_API_TOKEN is not found"
             fi
@@ -194,22 +108,14 @@ jobs:
           init-submodules: true
       - checkout-submodules
       - bundle-install/bundle-install:
-          cache_key_prefix: installable-build
+          cache_key_prefix: installable-build-v4
       - run:
           name: Copy Secrets
-          command: bundle exec fastlane run configure_apply
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane run configure_apply
       - update-gradle-memory
       - android/restore-gradle-cache
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
       - run:
           name: Build APK
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: |
             if [ -n "$CIRCLE_PULL_REQUEST" ]; then
               PR_NUMBER=$(basename $CIRCLE_PULL_REQUEST)
@@ -221,13 +127,13 @@ jobs:
             VERSION_NAME="${PREFIX}-build-${CIRCLE_BUILD_NUM}"
             echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
 
-            ./gradlew --stacktrace assembleJalapenoDebug -PversionName="$VERSION_NAME"
+            ./gradlew --stacktrace assembleWordpressJalapenoDebug -PversionName="$VERSION_NAME"
       - android/save-gradle-cache
       - run:
           name: Prepare APK
           command: |
             mkdir -p Artifacts
-            mv WordPress/build/outputs/apk/jalapeno/debug/org.wordpress.android-jalapeno-debug.apk "Artifacts/WordPress-${VERSION_NAME}.apk"
+            mv WordPress/build/outputs/apk/wordpressJalapeno/debug/org.wordpress.android-wordpress-jalapeno-debug.apk "Artifacts/WordPress-${VERSION_NAME}.apk"
       - store_artifacts:
           path: Artifacts
           destination: Artifacts
@@ -238,7 +144,7 @@ jobs:
     environment:
       JVM_OPTS: -Xmx2048m
     steps:
-      - run: 
+      - run:
           name: Init messages
           command: |
             echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for WordPress Android failed!'" >> $BASH_ENV
@@ -246,47 +152,31 @@ jobs:
           init-submodules: true
       - checkout-submodules
       - bundle-install/bundle-install:
-          cache_key_prefix: installable-build
+          cache_key_prefix: release-build-v2
       - run:
           name: Copy Secrets
-          command: bundle exec fastlane run configure_apply
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane run configure_apply
       - update-gradle-memory
       - android/restore-gradle-cache
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
       - run:
-          name: Install other tools
-          command: |
-            /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-            eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)
-            brew install openjdk
-            brew install bundletool
-            echo "export PATH='/home/linuxbrew/.linuxbrew/Cellar/bundletool/1.2.0/bin:$PATH'" >> $BASH_ENV
-      - run: 
           name: Prepare build
           command: |
-            echo "export APP_VERSION=$(./gradlew -q printVersionName | tail -1)" >> $BASH_ENV 
+            echo "export APP_VERSION=$(./gradlew -q printVersionName | tail -1)" >> $BASH_ENV
             SLACK_MESSAGE_VERSION=$(./gradlew -q printVersionName | tail -1)
             echo "export SLACK_FAILURE_MESSAGE=':red_circle: Build for WordPress Android $SLACK_MESSAGE_VERSION failed!'" >> $BASH_ENV
             echo "export SLACK_SUCCESS_MESSAGE=':tada: WordPress Android $SLACK_MESSAGE_VERSION has been deployed!'" >> $BASH_ENV
+            # Prevent fastlane from checking for updates, also removing the verbose fastlane changelog at the end of each invocation.
+            echo "export FASTLANE_SKIP_UPDATE_CHECK=1" >> $BASH_ENV
             bundle check
       - run:
-          name: Build Zalpha 
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
+          name: Build Zalpha
           command: |
             if [[ ${APP_VERSION} == *"-rc-"* ]]; then
               bundle exec fastlane build_alpha skip_confirm:true skip_prechecks:true create_release:true upload_to_play_store:true
-            fi 
+            fi
           no_output_timeout: 15m
-      - run: 
+      - run:
           name: Build Vanilla
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: |
             if [[ ${APP_VERSION} == *"-rc-"* ]]; then
               bundle exec fastlane build_beta skip_confirm:true skip_prechecks:true create_release:true upload_to_play_store:true
@@ -321,26 +211,22 @@ jobs:
       - checkout-submodules
       - android/restore-gradle-cache
       - copy-gradle-properties
-      - update-gradle-memory
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
+      - update-gradle-memory:
+          jvmargs: "Xmx1024m"
       - run:
           name: Build
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
-          command: ./gradlew WordPress:assembleVanillaDebug WordPress:assembleVanillaDebugAndroidTest --stacktrace
+          command: ./gradlew WordPress:assembleWordPressVanillaDebug --stacktrace
+      - run:
+          name: Build Tests
+          command: ./gradlew WordPress:assembleWordPressVanillaDebugAndroidTest --stacktrace
       - run:
           name: Decrypt credentials
           command: openssl aes-256-cbc -md sha256 -d -in .circleci/.firebase.secrets.json.enc -out .circleci/.firebase.secrets.json -k "${FIREBASE_SECRETS_ENCRYPTION_KEY}"
       - android/firebase-test:
           key-file: .circleci/.firebase.secrets.json
           type: instrumentation
-          apk-path: WordPress/build/outputs/apk/vanilla/debug/org.wordpress.android-vanilla-debug.apk
-          test-apk-path: WordPress/build/outputs/apk/androidTest/vanilla/debug/org.wordpress.android-vanilla-debug-androidTest.apk
+          apk-path: WordPress/build/outputs/apk/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug.apk
+          test-apk-path: WordPress/build/outputs/apk/androidTest/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug-androidTest.apk
           test-targets: notPackage org.wordpress.android.ui.screenshots
           device: model=Pixel2,version=28,locale=en,orientation=portrait
           project: api-project-108380595987
@@ -366,35 +252,25 @@ jobs:
           init-submodules: true
       - checkout-submodules
       - bundle-install/bundle-install:
-          cache_key_prefix: v1-raw-screenshots
+          cache_key_prefix: raw-screenshots-v2
       - android/restore-gradle-cache
       - copy-gradle-properties
-      - update-gradle-memory
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/assets
-      - run: 
-          name: Setup assets
-          command: |
-            INDEX_BUNDLE_PATH="libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle"
-            mkdir -p "$(dirname "${CIRCLE_WORKING_DIRECTORY}/${INDEX_BUNDLE_PATH}")"
-            cp ~/project/"${INDEX_BUNDLE_PATH}" "${CIRCLE_WORKING_DIRECTORY}/${INDEX_BUNDLE_PATH}"
+      - update-gradle-memory:
+          jvmargs: "Xmx1024m"
       - run:
           name: Build
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
-          command: ./gradlew WordPress:assembleVanillaDebug WordPress:assembleVanillaDebugAndroidTest --stacktrace
+          command: ./gradlew WordPress:assembleWordPressVanillaDebug --stacktrace
+      - run:
+          name: Build Tests
+          command: ./gradlew WordPress:assembleWordPressVanillaDebugAndroidTest --stacktrace
       - run:
           name: Decrypt credentials
           command: openssl aes-256-cbc -md sha256 -d -in .circleci/.firebase.secrets.json.enc -out .circleci/.firebase.secrets.json -k "${FIREBASE_SECRETS_ENCRYPTION_KEY}"
       - android/firebase-test:
           key-file: .circleci/.firebase.secrets.json
           type: instrumentation
-          apk-path: WordPress/build/outputs/apk/vanilla/debug/org.wordpress.android-vanilla-debug.apk
-          test-apk-path: WordPress/build/outputs/apk/androidTest/vanilla/debug/org.wordpress.android-vanilla-debug-androidTest.apk
+          apk-path: WordPress/build/outputs/apk/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug.apk
+          test-apk-path: WordPress/build/outputs/apk/androidTest/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug-androidTest.apk
           test-targets: package org.wordpress.android.ui.screenshots
           # NOTE: When updating this list of devices, ensure to also update the `phone:` and `tenInch:` parameters in "Download Raw Screenshots from Google Storage"
           devices: |
@@ -412,6 +288,7 @@ jobs:
           name: Download Raw Screenshots from Google Storage
           command: |
             TEST_BUCKET=$(cat log.txt | grep -o "gs://test\-lab\-.*/" | head -1)
+            export FASTLANE_SKIP_UPDATE_CHECK=1
             bundle exec fastlane download_raw_screenshots bucket:"$TEST_BUCKET" phone:blueline-28 tenInch:gts3lltevzw-28
       - persist_to_workspace:
           root: .
@@ -453,10 +330,10 @@ jobs:
             bundle install --path vendor/bundle
       - run:
           name: Download Promo Strings
-          command: bundle exec fastlane download_promo_strings
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane download_promo_strings
       - run:
           name: Create Promo Screenshots
-          command: bundle exec fastlane android create_promo_screenshots force:true
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane android create_promo_screenshots force:true
       - run:
           name: ZIP Metadata
           command: cd fastlane/metadata; zip -r Android-Promo-Screenshots.zip android
@@ -483,24 +360,16 @@ jobs:
       - android/restore-gradle-cache
       - copy-gradle-properties
       - update-gradle-memory
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
       - run:
           name: Build
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
-          command: ./gradlew WordPress:assembleVanillaDebug && cd libs/utils && ./gradlew assembleAndroidTest --stacktrace
+          command: ./gradlew WordPress:assembleWordPressVanillaDebug && cd libs/utils && ./gradlew assembleAndroidTest --stacktrace
       - run:
           name: Decrypt credentials
           command: openssl aes-256-cbc -md sha256 -d -in .circleci/.firebase.secrets.json.enc -out .circleci/.firebase.secrets.json -k "${FIREBASE_SECRETS_ENCRYPTION_KEY}"
       - android/firebase-test:
           key-file: .circleci/.firebase.secrets.json
           type: instrumentation
-          apk-path: WordPress/build/outputs/apk/vanilla/debug/org.wordpress.android-vanilla-debug.apk
+          apk-path: WordPress/build/outputs/apk/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug.apk
           test-apk-path: libs/utils/WordPressUtils/build/outputs/apk/androidTest/debug/WordPressUtils-debug-androidTest.apk
           device: model=Pixel2,version=28,locale=en,orientation=portrait
           project: api-project-108380595987
@@ -518,10 +387,10 @@ jobs:
           name: Install bundler
           command: gem install bundler --version 2.0.2
       - bundle-install/bundle-install:
-          cache_key_prefix: strings-check
+          cache_key_prefix: strings-check-v2
       - run:
           name: Validate login strings
-          command: bundle exec fastlane validate_login_strings pr_url:$CIRCLE_PULL_REQUEST
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane validate_login_strings pr_url:$CIRCLE_PULL_REQUEST
   translation-review-build:
     executor:
       name: android/default
@@ -533,26 +402,19 @@ jobs:
           init-submodules: true
       - checkout-submodules
       - bundle-install/bundle-install:
-          cache_key_prefix: installable-build
+          cache_key_prefix: translation-review-build-v2
       - run:
           name: Copy Secrets
-          command: bundle exec fastlane run configure_apply
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane run configure_apply
       - update-gradle-memory
       - android/restore-gradle-cache
-      - restore-gutenberg-bundle-cache
-      - run:
-          name: Ensure assets folder exists
-          command: mkdir -p libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
-      - attach_workspace:
-          at: libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets
       - run:
           name: Build APK
-          environment:
-            SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD: 1
           command: |
             TODAY_DATE=$(date +'%Y%m%d')
             VERSION_NAME="${APP_VERSION_PREFIX}-build-${TODAY_DATE}-${CIRCLE_BUILD_NUM}"
             echo "export VERSION_NAME=$VERSION_NAME" >> $BASH_ENV
+            echo "export FASTLANE_SKIP_UPDATE_CHECK=1" >> $BASH_ENV
 
             cp ~/.android/debug_a8c.keystore ~/.android/debug.keystore
             bundle exec fastlane build_for_translation_review custom_version:"$VERSION_NAME"
@@ -561,8 +423,8 @@ jobs:
           name: Prepare APK
           command: |
             mkdir -p Artifacts
-            mv WordPress/build/outputs/apk/jalapeno/release/org.wordpress.android-jalapeno-release.apk "Artifacts/WordPress-${VERSION_NAME}.apk"
-      - run: 
+            mv WordPress/build/outputs/apk/wordpressJalapeno/release/org.wordpress.android-wordpress-jalapeno-release.apk "Artifacts/WordPress-${VERSION_NAME}.apk"
+      - run:
           name: Upload APK
           command: |
             curl --http1.1 https://${APPET_TOKEN}@api.appetize.io/v1/apps/${APPET_APPID} -F "file=@Artifacts/WordPress-${VERSION_NAME}.apk" -F "platform=android"
@@ -576,30 +438,16 @@ workflows:
       or:
         - << pipeline.parameters.translation_review_build >>
         - << pipeline.parameters.generate_screenshots >>
+        - << pipeline.parameters.release_build >>
     jobs:
-      - gutenberg-bundle-build
       - strings-check
-      - test:
-          requires:
-            - gutenberg-bundle-build
-      - lint:
-          requires:
-            - gutenberg-bundle-build
+      - test
+      - lint
       - Installable Build:
-          requires:
-            - gutenberg-bundle-build
-          filters:
-            branches:
-              ignore: /pull\/[0-9]+/
-      - WordPressUtils Connected Tests:
-          requires:
-            - gutenberg-bundle-build
           filters:
             branches:
               ignore: /pull\/[0-9]+/
       - Connected Tests:
-          requires:
-            - gutenberg-bundle-build
           post-to-slack: true
           # Always run connected tests on develop and release branches
           filters:
@@ -612,6 +460,7 @@ workflows:
       or:
         - << pipeline.parameters.translation_review_build >>
         - << pipeline.parameters.generate_screenshots >>
+        - << pipeline.parameters.release_build >>
     #Optionally run connected tests on PRs
     jobs:
       - Hold:
@@ -631,33 +480,14 @@ workflows:
   Screenshots:
     when: << pipeline.parameters.generate_screenshots >>
     jobs:
-      - gutenberg-bundle-build
-      - raw-screenshots:
-          requires: [gutenberg-bundle-build]
+      - raw-screenshots
       - promo-screenshots:
           requires: [raw-screenshots]
   Release Build:
-    unless: << pipeline.parameters.translation_review_build >>
+    when: << pipeline.parameters.release_build >>
     jobs:
-      - gutenberg-bundle-build:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^\d+(\.\d+)*(-rc-\d)?$/
-      - lint:
-          requires:
-            - gutenberg-bundle-build
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^\d+(\.\d+)*(-rc-\d)?$/
+      - lint
       - Release Build:
           requires:
-            - lint 
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^\d+(\.\d+)*(-rc-\d)?$/
+            - lint
+
diff --git a/.configure b/.configure
index 237787951b1a..5330bd512141 100644
--- a/.configure
+++ b/.configure
@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "trunk",
-  "pinned_hash": "3e2b97bc9ea33aae58bb348933f4fee7cda5e691",
+  "pinned_hash": "92cde8f76c2a77791f8e5164f1e5b287d9cb6f1e",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",
diff --git a/.configure-files/google-services.json.enc b/.configure-files/google-services.json.enc
index 9e4888925cee..744f6156bfc1 100644
Binary files a/.configure-files/google-services.json.enc and b/.configure-files/google-services.json.enc differ
diff --git a/.configure-files/gradle.properties.enc b/.configure-files/gradle.properties.enc
index 45e467c84d0e..44b6a57b4782 100644
Binary files a/.configure-files/gradle.properties.enc and b/.configure-files/gradle.properties.enc differ
diff --git a/.editorconfig b/.editorconfig
index 590d68372e0d..09b32d4b6f83 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,2 +1,13 @@
+# Apply to all files
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Ruby specific rules
+[{*.rb,Fastfile,Gemfile}]
+indent_style = space
+indent_size = 2
+
 [*.{kt,kts}]
 max_line_length=120
diff --git a/.gitattributes b/.gitattributes
index 3b5ef1783701..5e238f6e9bc3 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,4 +5,5 @@ gradlew text eol=lf
 *.bat text eol=crlf
 *.png binary
 *.jpg binary
+.configure-files/*.enc binary
 RELEASE-NOTES.txt merge=union
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index a6e0d8365f3a..14e196c030fd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,8 +2,17 @@ Fixes #
 
 To test:
 
+## Regression Notes
+1. Potential unintended areas of impact
+
+
+2. What I did to test those areas of impact (or what existing automated tests I relied on)
+
+
+3. What automated tests I added (or what prevented me from doing so)
+
 PR submission checklist:
 
-- [ ] I have considered adding unit tests where possible.
+- [ ] I have completed the Regression Notes.
 - [ ] I have considered adding accessibility improvements for my changes.
 - [ ] I have considered if this change warrants user-facing release notes and have added them to `RELEASE-NOTES.txt` if necessary.
diff --git a/.gitignore b/.gitignore
index 8f4173c25301..a43121fe9a18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,7 +29,7 @@ local.properties
 *.iml
 *.ipr
 *.iws
-/.idea/*
+.idea/
 
 # IntelliJ/Android Studio exceptions
 !/.idea/codeStyles/
@@ -39,7 +39,6 @@ local.properties
 !/.idea/codeStyleSettings.xml
 !/.idea/encodings.xml
 !/.idea/copyright/
-!/.idea/compiler.xml
 # Enforce plugins
 !/.idea/externalDependencies.xml
 # Checkstyle configuration
@@ -92,3 +91,9 @@ WordPress/debug.keystore
 WordPress/*.jks
 
 local-builds.gradle
+
+# Currently, the configure tool stores the encrypted files under
+# .configure-files. Everything in that folder without a .enc extension should
+# be ignored.
+.configure-files/*
+!.configure-files/*.enc
diff --git a/.gitmodules b/.gitmodules
index cb3ab492e3ab..4d5754da9246 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "libs/gutenberg-mobile"]
-	path = libs/gutenberg-mobile
-	url = ../../wordpress-mobile/gutenberg-mobile.git
-	shallow = true
 [submodule "libs/stories-android"]
 	path = libs/stories-android
 	url = ../../Automattic/stories-android.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 3bf04816d9bb..7ef8f3098d07 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -32,7 +32,16 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
@@ -245,4 +254,4 @@
       <option name="ENUM_CONSTANTS_WRAP" value="5" />
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index d9c7dcdd7264..000000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <bytecodeTargetLevel>
-      <module name="fluxc-annotations" target="1.7" />
-      <module name="fluxc-processor" target="1.7" />
-      <module name="WordPressAnnotations" target="1.7" />
-      <module name="WordPressProcessors" target="1.7" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index b03104d5e72e..fc266ee2bc1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org" do
-  gem 'fastlane', "~> 2"
-  gem 'nokogiri'
-end
+source "https://rubygems.org"
+
+gem 'fastlane', "~> 2"
+gem 'nokogiri'
 
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/Gemfile.lock b/Gemfile.lock
index 11cc7e1c84f8..99a08908ad7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,16 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: 3dcfb7f1231d6da70861b0632a6265dcecc1e761
-  tag: 0.10.0
+  revision: ce59a5e7b4fa75f6bb694bcfa333f85175294c3c
+  tag: 0.18.0
   specs:
-    fastlane-plugin-wpmreleasetoolkit (0.10.0)
-      activesupport (~> 4)
+    fastlane-plugin-wpmreleasetoolkit (0.18.0)
+      activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
       diffy (~> 3.3)
       git (~> 1.3)
-      jsonlint
-      nokogiri (>= 1.10.4)
+      jsonlint (~> 0.3)
+      nokogiri (~> 1.11)
       octokit (~> 4.18)
       parallel (~> 1.14)
       progress_bar (~> 1.3)
@@ -20,30 +20,31 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.2)
-    activesupport (4.2.11.3)
-      i18n (~> 0.7)
+    CFPropertyList (3.0.3)
+    activesupport (5.2.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
+    artifactory (3.0.15)
     atomos (0.1.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.385.0)
-    aws-sdk-core (3.109.1)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.453.0)
+    aws-sdk-core (3.114.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.39.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.94.1)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     bigdecimal (1.4.4)
@@ -51,34 +52,42 @@ GEM
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
-    concurrent-ruby (1.1.7)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.1.8)
     declarative (0.0.20)
-    declarative-option (0.1.0)
     diffy (3.4.0)
-    digest-crc (0.6.0)
+    digest-crc (0.6.3)
+      rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
-    emoji_regex (3.0.0)
-    excon (0.78.0)
-    faraday (1.0.1)
+    emoji_regex (3.2.2)
+    excon (0.81.0)
+    faraday (1.4.1)
+      faraday-excon (~> 1.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
       multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
       http-cookie (~> 1.0.0)
+    faraday-excon (1.1.0)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.1.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
-    fastimage (2.2.0)
-    fastlane (2.164.0)
+    fastimage (2.2.3)
+    fastlane (2.182.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
+      artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
       colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
       excon (>= 0.71.0, < 1.0.0)
@@ -89,16 +98,16 @@ GEM
       gh_inspector (>= 1.1.2, < 2.0.0)
       google-api-client (>= 0.37.0, < 0.39.0)
       google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      highline (~> 2.0)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (~> 2.0.0)
+      naturally (~> 2.2)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
       security (= 0.1.3)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (>= 1.4.5, < 2.0.0)
       tty-screen (>= 0.6.3, < 1.0.0)
@@ -108,7 +117,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    git (1.7.0)
+    git (1.8.1)
       rchardet (~> 1.8)
     google-api-client (0.38.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -118,79 +127,98 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
       signet (~> 0.12)
-    google-cloud-core (1.5.0)
+    google-apis-core (0.3.0)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (~> 0.14)
+      httpclient (>= 2.8.1, < 3.0)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.0)
+      rexml
+      signet (~> 0.14)
+      webrick
+    google-apis-iamcredentials_v1 (0.3.0)
+      google-apis-core (~> 0.1)
+    google-apis-storage_v1 (0.3.0)
+      google-apis-core (~> 0.1)
+    google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.4.0)
+    google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.0.1)
-    google-cloud-storage (1.29.1)
+    google-cloud-errors (1.1.0)
+    google-cloud-storage (1.31.0)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.1)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.14.0)
+    googleauth (0.16.2)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (~> 0.14)
-    highline (1.7.10)
+    highline (2.0.3)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (0.9.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
-    json (2.3.1)
+    json (2.5.1)
     jsonlint (0.3.0)
       oj (~> 3)
       optimist (~> 3)
-    jwt (2.2.2)
+    jwt (2.2.3)
     memoist (0.16.2)
-    mini_magick (4.10.1)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
+    mini_magick (4.11.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.0)
+    minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
-    naturally (2.2.0)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    octokit (4.19.0)
+    naturally (2.2.1)
+    nokogiri (1.11.3)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.10.15)
+    oj (3.11.5)
     optimist (3.0.1)
     options (2.3.2)
     os (1.1.1)
-    parallel (1.19.2)
-    plist (3.5.0)
-    progress_bar (1.3.1)
+    parallel (1.20.1)
+    plist (3.6.0)
+    progress_bar (1.3.3)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
+    racc (1.5.2)
     rake (12.3.3)
     rake-compiler (1.1.1)
       rake
     rchardet (1.8.0)
-    representable (3.0.4)
+    representable (3.1.1)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rmagick (4.1.2)
+    rexml (3.2.5)
+    rmagick (4.2.1)
     rouge (2.0.7)
+    ruby2_keywords (0.0.4)
     rubyzip (2.3.0)
     sawyer (0.8.2)
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     security (0.1.3)
-    signet (0.14.0)
+    signet (0.15.0)
       addressable (~> 2.3)
       faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
@@ -198,22 +226,23 @@ GEM
     simctl (1.6.8)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
+    trailblazer-option (0.1.1)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.7)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
     unicode-display_width (1.7.0)
+    webrick (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.19.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -223,17 +252,17 @@ GEM
       nanaimo (~> 0.3.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
-    xcpretty-travis-formatter (1.0.0)
+    xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastlane (~> 2)!
+  fastlane (~> 2)
   fastlane-plugin-wpmreleasetoolkit!
-  nokogiri!
+  nokogiri
   rmagick (~> 4.1)
 
 BUNDLED WITH
-   2.1.4
+   2.2.15
diff --git a/README.md b/README.md
index ce6bde1b36a9..2ac1d8d67d21 100644
--- a/README.md
+++ b/README.md
@@ -12,10 +12,10 @@ it on [Google Play](https://play.google.com/store/apps/details?id=org.wordpress.
 1. Install npm using [Node Version Manager](https://github.com/nvm-sh/nvm)(nvm), as described in step one from the [Block Editor Quickstart guide](https://developer.wordpress.org/block-editor/tutorials/devenv/#quickstart)
 1. `git clone --recurse-submodules git@github.com:wordpress-mobile/WordPress-Android.git` in the folder of your preference.
 Or if you already have the project cloned, initialize and update the submodules:
-```
-git submodule init
-git submodule update
-```
+    ```
+    git submodule init
+    git submodule update
+    ```
 1. `cd WordPress-Android` to enter the working directory.
 1. `cp gradle.properties-example gradle.properties` to set up the sample app credentials file.
 1. `git submodule update --init --recursive`  to pull the submodules (optionally use `--depth=1 --recommend-shallow` flags to skip pulling full submodules' history).
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index f2c9400719be..5e96632903e7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,130 @@
+*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
+
+17.5
+-----
+
+
+17.4
+-----
+* [*] Stories: Improved reliability of retrying slides that failed to upload. [https://github.com/wordpress-mobile/WordPress-Android/pull/14579]
+* [*] Stories: Adding story block from block editor now opens media picker first. [https://github.com/wordpress-mobile/WordPress-Android/pull/14588]
+* [*] Stories: Fixed story preview rendering in the Reader. [https://github.com/wordpress-mobile/WordPress-Android/pull/14656]
+
+17.3
+-----
+* [*] Comments: Updated look of comments list. [https://github.com/wordpress-mobile/WordPress-Android/pull/14417]
+* [***]  Block Editor: New Block: Search Block [#https://github.com/wordpress-mobile/gutenberg-mobile/pull/3210]
+* [**]  Block Editor: The media upload options of the Image, Video and Gallery block automatically opens when the respective block is inserted. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2700]
+* [*] Block Editor: Image block: Add a "featured" banner [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3371]
+* [**]  Block Editor: The media upload options of the File and Audio block automatically opens when the respective block is inserted. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3399]
+* [*]  Block Editor: Remove visual feedback from non-interactive bottom-sheet cell sections [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3404]
+* [**] Likes Enhancements: the full list of people who liked a post or comment is now shown in notifications and reader post detail. A user profile bottom sheet shows info about a liker. [https://github.com/wordpress-mobile/WordPress-Android/pull/14563]
+
+
+17.2
+-----
+* [**] Added transform block capability [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3321]
+* [*] Timezone: Timezone selection dialog in site settings is updated with grouping by continents, manual offsets and additional timezone information. [https://github.com/wordpress-mobile/WordPress-Android/pull/14198]
+* [*] My Site: Fixes a bug in rendering the menu in RTL interface languages
+* [*] a11y: Bug fix: Allow stepper cell to be selected by screenreader [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3362]
+* [*] Image block: Improve text entry for long alt text. [https://github.com/WordPress/gutenberg/pull/29670]
+* [***] New Block: Jetpack contact info. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3340]
+
+17.1
+-----
+* [**] Comments: added an Unreplied comments filter [https://github.com/wordpress-mobile/WordPress-Android/pull/14373]
+* [***] Block Editor: Improved the accessibility of range and step-type block settings. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3255]
+* [**] Updated the app icon to match the new color scheme within the app. [#14391]
+* [**] Colors: Replaced pink with blue as the accent color of the app [https://github.com/wordpress-mobile/WordPress-Android/pull/14376]
+* [*] Colors: Updated color palette to 2.5.0 [https://github.com/wordpress-mobile/WordPress-Android/pull/14370]
+* [*] Colors: Replaced wordpress_blue with blue color [https://github.com/wordpress-mobile/WordPress-Android/pull/14369]
+
+17.0
+-----
+* [*] Comments: Switched comments filter from dropdown to tabs. [https://github.com/wordpress-mobile/WordPress-Android/pull/14140]
+* [*] [Block Editor] Remove the cancel button from settings options [https://github.com/WordPress/gutenberg/pull/29599]
+* [**] Stories: enabled pinch to zoom on your slides background images! [https://github.com/wordpress-mobile/WordPress-Android/pull/14284]
+
+16.9
+-----
+* [*] Starter Page Templates: Adds the option to choose between mobile, tablet or desktop thumbnails and previews
+* [**] Site Creation: Adds filterable categories to the site design picker when creating a WordPress.com site [#14144]
+* [**] The classic editor will no longer be available for new posts soon, but this won’t affect editing any existing posts or pages. Users should consider switching over to the Block Editor now. [#14205]
+* [**] My Site: Quick Start was completely redesigned and is now always shown after creating a site [https://github.com/wordpress-mobile/WordPress-Android/pull/14122]
+
+16.8.1
+------
+* [**] Block Editor: Reduce the number of items per page when fetching reusable blocks to prevent a crash. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3227]
+
+16.8
+-----
+* [*] Block Editor: Fixed block mover title wording for better clarity from 'Move block position' to 'Change block position'. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3049]
+* [**] Block Editor: Add support for setting Cover block focal point. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3028]
+* [**] Prevent deleting published homepages which would have the effect of breaking a site. [#14061]
+* [**] Prevent converting published homepage to a draft in the page list and settings which would have the effect of breaking a site. [#14061]
+* [**] People management on P2s: adds capability to generate, share and disable invite links for roles on your P2 site [https://github.com/wordpress-mobile/WordPress-Android/pull/14044]
+
+16.7
+-----
+* [*] Adds tablet mode in site and post/page previews [https://github.com/wordpress-mobile/WordPress-Android/pull/13787]
+* [*] Reader: show post menu for posts in Blog Preview and Search results [https://github.com/wordpress-mobile/WordPress-Android/pull/13897]
+* [**] Site Creation: Enables dot blog subdomains for each site design. [https://github.com/wordpress-mobile/WordPress-Android/pull/13917]
+* [***] Block Editor: New Block: Audio [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2854, https://github.com/wordpress-mobile/gutenberg-mobile/pull/3070]
+* [**] Block Editor: Add support for setting heading anchors [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2947]
+* [**] Block Editor: Disable Unsupported Block Editor for Reusable blocks [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3067]
+* [**] Block Editor: Add proper handling for single use blocks such as the more block [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3042]
+* [***] Jetpack: Jetpack site owners, you can now run scans, fix threats, restore your site and download backup files directly from within the app. [https://github.com/wordpress-mobile/WordPress-Android/issues/13267]
+* [**] Reader: introduced an Unread Post counter in the Site Filter bottom sheet [https://github.com/wordpress-mobile/WordPress-Android/pull/13625]
+* [**] Reader: added functionality for marking reader posts as Seen or Unseen [https://github.com/wordpress-mobile/WordPress-Android/pull/13901]
+* [**] Block Editor: Make inserter long-press options "add to beginning" and "add to end" always available. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3074]
+* [*] Block Editor: Fix crash when Column block width attribute was empty. [https://github.com/WordPress/gutenberg/pull/29015]
+
+16.6
+-----
+* [**] Reader: adds site filter capability to Followed P2s tab page. Now the sites listed in the filters are only those relevant to the page (Following/Followed P2s) [https://github.com/wordpress-mobile/WordPress-Android/pull/13766]
+* [**] Site Creation: Adds the option to choose between mobile, tablet or desktop thumbnails in the home page design picker when creating a WordPress.com site [https://github.com/wordpress-mobile/WordPress-Android/pull/13674]
+* [**] Site Creation: Adds the option to choose between mobile, tablet or desktop home page design previews when creating a WordPress.com site [https://github.com/wordpress-mobile/WordPress-Android/pull/13673]
+* [*] Quick Start: Removed the browse theme step and added guidance for reviewing pages and editing your Homepage. [#13855]
+
+16.5
+-----
+* [***] Block Editor: Cross-post suggestions are now available by typing the + character (or long-pressing the toolbar button labelled with an @-symbol) in a post on a P2 site [https://github.com/wordpress-mobile/WordPress-Android/pull/13184]
+* [***] Block Editor: Full-width and wide alignment support for Columns (https://github.com/wordpress-mobile/gutenberg-mobile/pull/2919)
+* [**] Block Editor: Image block - Add link picker to the block settings and enhance link settings with auto-hide options (https://github.com/wordpress-mobile/gutenberg-mobile/pull/2841)
+* [*] Block Editor: Fix button link setting, rel link will not be overwritten if modified by the user (https://github.com/wordpress-mobile/gutenberg-mobile/pull/2894)
+* [**] Block Editor: Added move to top/bottom when long pressing on respective block movers (https://github.com/wordpress-mobile/gutenberg-mobile/pull/2872)
+* [***] Activity Log: Adds support for Date Range and Activity Type filters. [https://github.com/wordpress-mobile/WordPress-Android/issues/13268]
+* [**] Page List: Adds duplicate page functionality [https://github.com/wordpress-mobile/WordPress-Android/pull/13607]
+* [**] Block Editor: Fix crash in text-based blocks with custom font size [https://github.com/WordPress/gutenberg/pull/28121]
+
+16.4
+-----
+* [*] My Site: Fixes crash on rotation while editing site title [https://github.com/wordpress-mobile/WordPress-Android/pull/13505]
+* [**] Posts List: Adds duplicate post functionality [https://github.com/wordpress-mobile/WordPress-Android/pull/13521]
+* [*] Block Editor: Fix Gallery block uploads when the editor is closed [https://github.com/wordpress-mobile/WordPress-Android/pull/13570]
+* [*] Block Editor: Remove popup informing user that they will be using the block editor by default [https://github.com/wordpress-mobile/WordPress-Android/pull/13593]
+* [**] Block Editor: Fixed an issue where a block would disappear when deleting all of the text inside without requiring the extra backspace to remove the block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2877]
+* [***] Block Editor: New Block: File [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2835]
+
+
+16.3
+-----
+* [***] Site Creation: Adds an option to pick a home page design when creating a WordPress.com site.
+* [*] Posts Settings: removed deprecated location setting [https://github.com/wordpress-mobile/WordPress-Android/pull/13404]
+* [**] Block Editor: Button block - Add link picker to the block settings [https://github.com/WordPress/gutenberg/pull/26206]
+* [***] Block Editor: Adding support for selecting different unit of value in Cover and Columns blocks [https://github.com/WordPress/gutenberg/pull/26161]
+* [*] Block Editor: Fix theme colors syncing with the editor [https://github.com/WordPress/gutenberg/pull/26821]
+* [***] Stories: New feature for WordPress.com and Jetpack sites: Use photos and videos to create engaging and tappable fullscreen slideshows. [https://github.com/wordpress-mobile/WordPress-Android/pull/13459]
+* [**] Reader: introduced a Follow/Unfollow button in comments screen to follow a post conversation and get notified by e-mail. Not supported for self-hosted sites not Jetpack connected. [https://github.com/wordpress-mobile/WordPress-Android/pull/13473]
+
 16.2
 -----
+* [***] Block Editor: Faster editor start and overall operation. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2780]
+* [*] Block Editor: Enable multiple upload support for Image block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2530]
 * [*] Posts List: fixed bug that prevented showing the Featured Image of a post for pure self-hosted sites [https://github.com/wordpress-mobile/WordPress-Android/pull/13323]
+* [**] Media picker: New media picker is now used in all the places where the user selects any kind of file (featured image, site icon, gravatar, in posts or media library) except stories [https://github.com/wordpress-mobile/WordPress-Android/pull/13368]
+* [*] Reader: Fixes an infinite loading indicator on Discover tab in Reader.
+* [*] My Site: Hide Activity Log, Themes and Plans for P2 sites.
 
 16.1
 -----
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
index 279997551a3a..a3e76717244a 100644
--- a/WordPress/build.gradle
+++ b/WordPress/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'com.google.gms:google-services:3.2.0'
-        classpath 'se.bjurr.violations:violation-comments-to-github-gradle-plugin:1.51'
+        classpath 'se.bjurr.violations:violation-comments-to-github-gradle-plugin:1.67'
         classpath 'io.sentry:sentry-android-gradle-plugin:1.7.28'
     }
 }
@@ -14,9 +14,11 @@ buildscript {
 repositories {
     google()
     jcenter()
+    mavenCentral()
     maven { url 'https://zendesk.jfrog.io/zendesk/repo' }
     maven { url "https://www.jitpack.io" }
-    maven { url "http://dl.bintray.com/terl/lazysodium-maven" }
+    maven { url "https://a8c-libs.s3.amazonaws.com/android" }
+    maven { url "https://a8c-libs.s3.amazonaws.com/android/hermes-mirror" }
 }
 
 apply plugin: 'com.android.application'
@@ -26,6 +28,10 @@ apply plugin: 'se.bjurr.violations.violation-comments-to-github-gradle-plugin'
 apply plugin: 'kotlin-allopen'
 apply plugin: 'kotlin-kapt'
 
+detekt {
+    baseline = file("${project.rootDir}/config/detekt/baseline.xml")
+}
+
 allOpen {
     // allows mocking for classes w/o directly opening them for release builds
     annotation 'org.wordpress.android.testing.OpenClassAnnotation'
@@ -54,9 +60,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-256"
+            versionName "alpha-295"
         }
-        versionCode 953
+        versionCode 1051
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -66,19 +72,18 @@ android {
         testInstrumentationRunner 'org.wordpress.android.WordPressTestRunner'
 
         buildConfigField "boolean", "OFFER_GUTENBERG", "true"
-        buildConfigField "boolean", "TENOR_AVAILABLE", "true"
         buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "10"
         buildConfigField "boolean", "FEATURE_ANNOUNCEMENT_AVAILABLE", "false"
-        buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
-        buildConfigField "boolean", "MODAL_LAYOUT_PICKER", "true"
-        buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
-        buildConfigField "boolean", "UNIFIED_LOGIN_AVAILABLE", "true"
-        buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true"
-        buildConfigField "boolean", "ANY_FILE_UPLOAD", "true"
-        buildConfigField "boolean", "CONSOLIDATED_MEDIA_PICKER", "false"
-        buildConfigField "boolean", "ACTIVITY_LOG_FILTERS", "false"
-        buildConfigField "boolean", "SCAN_AVAILABLE", "false"
         buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "true"
+        buildConfigField "boolean", "MY_SITE_IMPROVEMENTS", "false"
+        buildConfigField "boolean", "SEEN_UNSEEN_WITH_COUNTER", "false"
+        buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
+        buildConfigField "boolean", "LIKES_ENHANCEMENTS", "false"
+        buildConfigField "boolean", "IS_JETPACK_APP", "false"
+        buildConfigField "String", "TRACKS_EVENT_PREFIX", '"wpandroid_"'
+        buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"org.wordpress.android"'
+
+        manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
 
     // Gutenberg's dependency - react-native-video is using
@@ -88,45 +93,58 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    flavorDimensions "buildType"
+    flavorDimensions "app", "buildType"
 
     productFlavors {
+        wordpress {
+            isDefault true
+            dimension "app"
+            applicationId "org.wordpress.android"
+            buildConfigField "boolean", "IS_JETPACK_APP", "false"
+            buildConfigField "String", "TRACKS_EVENT_PREFIX", '"wpandroid_"'
+            buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"org.wordpress.android"'
+
+            manifestPlaceholders = [magicLinkScheme:"wordpress"]
+        }
+
+        jetpack {
+            dimension "app"
+            applicationId "com.jetpack.android"
+            buildConfigField "boolean", "IS_JETPACK_APP", "true"
+            buildConfigField "String", "TRACKS_EVENT_PREFIX", '"jpandroid_"'
+            buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"com.jetpack.android"'
+
+            manifestPlaceholders = [magicLinkScheme:"jetpack"]
+        }
+
         vanilla { // used for release and beta
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "16.1-rc-3"
+                versionName "17.4-rc-2"
             }
-            versionCode 952
+            versionCode 1050
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
-            buildConfigField "boolean", "TENOR_AVAILABLE", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
-            buildConfigField "boolean", "GUTENBERG_MENTIONS", "true"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
-            buildConfigField "boolean", "WP_STORIES_AVAILABLE", "false"
-            buildConfigField "boolean", "ANY_FILE_UPLOAD", "false"
             buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
+            buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
         }
 
         zalpha { // alpha version - enable experimental features
-            applicationId "org.wordpress.android"
             dimension "buildType"
             buildConfigField "boolean", "VIDEO_OPTIMIZATION_AVAILABLE", "true"
             buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
         }
 
         wasabi { // "hot" version, can be installed along release, alpha or beta versions
-            applicationId "org.wordpress.android.beta"
+            applicationIdSuffix ".beta"
             dimension "buildType"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "true"
-            // Enable this for testing consolidated media picker
-            // buildConfigField "boolean", "CONSOLIDATED_MEDIA_PICKER", "true"
         }
 
         jalapeno { // Pre-Alpha version, used for PR builds, can be installed along release, alpha, beta, dev versions
-            applicationId "org.wordpress.android.prealpha"
+            isDefault true
+            applicationIdSuffix ".prealpha"
             dimension "buildType"
-            buildConfigField "boolean", "HOME_PAGE_PICKER", "false"
         }
     }
 
@@ -154,6 +172,7 @@ android {
 
     lintOptions{
         checkDependencies = true
+        checkGeneratedSources = true
         lintConfig file('lint.xml')
         baseline file("lint-baseline.xml")
     }
@@ -178,6 +197,10 @@ android {
             enableSplit = false
         }
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 // allows us to use cool things like @Parcelize annotations
@@ -196,6 +219,9 @@ dependencies {
     implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
 
     implementation "androidx.core:core:$coreVersion"
+    implementation "androidx.core:core-ktx:$coreVersion"
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
     implementation 'androidx.fragment:fragment:1.2.4'
 
@@ -212,6 +238,8 @@ dependencies {
     implementation "androidx.preference:preference:$preferenceVersion"
     implementation "androidx.work:work-runtime:$androidxWorkVersion"
     implementation "androidx.work:work-runtime-ktx:$androidxWorkVersion"
+    // GCMNetworkManager on api <= 22
+    implementation "androidx.work:work-gcm:$androidxWorkVersion"
 
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
 
@@ -219,6 +247,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
     // LiveData
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
+    // ProcessLifecycleOwner
+    implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
 
     testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", {
         exclude group: 'com.android.support', module: 'support-compat'
@@ -227,12 +257,11 @@ dependencies {
     })
 
     implementation 'com.android.volley:volley:1.1.1'
-    implementation 'com.google.firebase:firebase-messaging:20.1.5'
+    implementation 'com.google.firebase:firebase-messaging:21.1.0'
     implementation 'com.google.android.gms:play-services-auth:18.1.0'
-    implementation 'com.google.android.gms:play-services-places:17.0.0'
-    implementation 'com.android.installreferrer:installreferrer:1.0'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation 'org.greenrobot:eventbus:3.1.1'
+    implementation 'org.greenrobot:eventbus:3.2.0'
     implementation ('com.automattic:rest:1.0.8') {
         exclude group: 'com.mcxiaoke.volley'
     }
@@ -241,7 +270,7 @@ dependencies {
     implementation 'org.wordpress:emailchecker2:1.1.0'
     implementation 'com.squareup.okio:okio:2.8.0'
     implementation 'org.apache.commons:commons-text:1.1'
-    implementation 'com.airbnb.android:lottie:3.0.7'
+    implementation 'com.airbnb.android:lottie:3.4.0'
     implementation 'com.facebook.shimmer:shimmer:0.5.0'
 
     implementation ("com.github.yalantis:ucrop:$uCropVersion") {
@@ -310,24 +339,31 @@ dependencies {
 
     implementation("$gradle.ext.fluxCBinaryPath:fluxc:$fluxCVersion") {
         exclude group: "com.android.volley"
+        exclude group: 'org.wordpress', module: 'utils'
     }
 
     implementation ('com.github.indexos.media-for-mobile:android:43a9026f0973a2f0a74fa813132f6a16f7499c3a')
 
-    implementation project(path:':libs:utils:WordPressUtils')
-    testImplementation project(path:':libs:utils:WordPressUtils')
-    debugImplementation project(path:':libs:utils:WordPressUtils')
+    implementation "$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion"
+    testImplementation "$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion"
+    debugImplementation "$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion"
     implementation (project(path:':libs:networking:WordPressNetworking')) {
         exclude group: "com.android.volley"
+        exclude group: 'org.wordpress', module: 'utils'
+    }
+    implementation (project(path:':libs:analytics:WordPressAnalytics')) {
+        exclude group: 'org.wordpress', module: 'utils'
+    }
+    implementation (project(path:':libs:editor:WordPressEditor')) {
+        exclude group: 'org.wordpress', module: 'utils'
     }
-    implementation project(path:':libs:analytics:WordPressAnalytics')
-    implementation project(path:':libs:editor:WordPressEditor')
     implementation (project(path:':libs:login:WordPressLoginFlow')) {
         exclude group: "com.github.wordpress-mobile.WordPress-FluxC-Android", module: "fluxc"
         exclude group: 'com.github.bumptech.glide'
+        exclude group: 'org.wordpress', module: 'utils'
     }
 
-    implementation (group: 'com.zendesk', name: 'support', version: '5.0.1') {
+    implementation (group: 'com.zendesk', name: 'support', version: '5.0.2') {
         exclude group: 'com.google.dagger'
         exclude group: 'com.android.support', module: 'support-annotations'
     }
@@ -346,10 +382,6 @@ dependencies {
     compileOnly project(path:':libs:WordPressAnnotations')
     kapt project(':libs:WordPressProcessors')
 
-    // Encrypted Logging
-    implementation "com.goterl.lazycode:lazysodium-android:4.1.0@aar"
-    implementation "net.java.dev.jna:jna:4.5.1@aar"
-
     // Debug
     debugImplementation 'com.facebook.stetho:stetho:1.5.1'
     debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
@@ -360,12 +392,16 @@ dependencies {
 
     implementation "org.jsoup:jsoup:1.10.3"
     implementation 'androidx.emoji:emoji:1.0.0'
+
+    // Enables accessibility checks in Espresso
+    androidTestImplementation 'androidx.test.espresso:espresso-accessibility:3.3.0-alpha05'
+
+    detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:$detektVersion"
 }
 
 configurations.all {
     // Exclude packaged wordpress sub projects, force the use of the source project
     // (eg. use :libs:utils:WordPressUtils instead of 'org.wordpress:utils')
-    exclude group: 'org.wordpress', module: 'utils'
     exclude group: 'org.wordpress', module: 'analytics'
 }
 
@@ -402,7 +438,7 @@ android.buildTypes.all { buildType ->
 }
 
 task violationCommentsToGitHub(type: se.bjurr.violations.comments.github.plugin.gradle.ViolationCommentsToGitHubTask) {
-    repositoryOwner = "wordpress-mobile";
+    repositoryOwner = "wordpress-mobile"
     repositoryName = "WordPress-Android"
     pullRequestId = System.properties['GITHUB_PULLREQUESTID']
     username = System.properties['GITHUB_USERNAME']
@@ -422,7 +458,8 @@ task violationCommentsToGitHub(type: se.bjurr.violations.comments.github.plugin.
 {{violation.message}}
 """
     violations = [
-            ["CHECKSTYLE", ".", ".*/build/.*\\.xml\$", "Checkstyle"]
+            ["CHECKSTYLE", ".", ".*/build/.*/checkstyle/.*\\.xml\$", "CheckStyle"],
+            ["CHECKSTYLE", ".", ".*/build/.*/detekt/.*\\.xml\$", "Detekt"]
     ]
 }
 
@@ -476,10 +513,6 @@ if (project.hasProperty("debugStoreFile")) {
     }
 }
 
-def legacyGBBundleFile = 'src/main/assets/index.android.bundle'
-assert !(file(legacyGBBundleFile).exists()) : "Error: Legacy Gutenberg JS bundle file detected. Please delete it: " + file(legacyGBBundleFile).getAbsolutePath()
-
 // Keep this at the bottom (https://stackoverflow.com/a/37565535)
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'io.sentry.android.gradle'
-
diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml
index bb383a8dd07e..6addeb11afee 100644
--- a/WordPress/lint-baseline.xml
+++ b/WordPress/lint-baseline.xml
@@ -46,22 +46,6 @@
             column="20"/>
     </issue>
 
-    <issue
-        id="RtlSetPadding"
-        severity="Error"
-        message="For RtL compatibility, use setPaddingRelativeor ViewCompat.setPaddingRelative() when setting left/right padding."
-        category="Internationalization:Bidirectional Text"
-        priority="6"
-        summary="Using setPadding instead of setPaddingRelative."
-        explanation="For RtL compatibility, use setPaddingRelativeor ViewCompat.setPaddingRelative() when setting left/right padding."
-        errorLine1="            view.setPadding("
-        errorLine2="            ^">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
-            line="550"
-            column="13"/>
-    </issue>
-
     <issue
         id="ClickableViewAccessibility"
         message="Custom view `RecyclableWrapperViewGroup` overrides `onTouchEvent` but not `performClick`"
@@ -84,22 +68,6 @@
             column="20"/>
     </issue>
 
-    <issue
-        id="ExifInterface"
-        severity="Warning"
-        message="Avoid using `android.media.ExifInterface`; use `android.support.media.ExifInterface` from the support library instead"
-        category="Correctness"
-        priority="6"
-        summary="Using `android.media.ExifInterface`"
-        explanation="The `android.media.ExifInterface` implementation has some known security bugs in older versions of Android. There is a new implementation available of this library in the support library, which is preferable."
-        errorLine1="import android.media.ExifInterface;"
-        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java"
-            line="17"
-            column="8"/>
-    </issue>
-
     <issue
         id="LocaleFolder"
         severity="Warning"
@@ -215,23 +183,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of com.android.tools.build:gradle than 3.2.1 is available: 3.3.0"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="        classpath &apos;com.android.tools.build:gradle:3.3.2&apos;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/build.gradle"
-            line="7"
-            column="9"/>
-    </issue>
-
     <issue
         id="GradleDependency"
         severity="Warning"
@@ -249,23 +200,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of com.android.support:design than 27.1.1 is available: 28.0.0"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="    implementation &apos;com.android.support:design:27.1.1&apos;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/build.gradle"
-            line="23"
-            column="5"/>
-    </issue>
-
     <issue
         id="GradleDependency"
         severity="Warning"
@@ -283,23 +217,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of com.android.support:recyclerview-v7 than 27.1.1 is available: 28.0.0"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="    implementation &apos;com.android.support:recyclerview-v7:27.1.1&apos;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/build.gradle"
-            line="24"
-            column="5"/>
-    </issue>
-
     <issue
         id="GradleDependency"
         severity="Warning"
@@ -503,108 +420,6 @@
             file="../org/jsoup/helper/HttpConnection$Response$2.class"/>
     </issue>
 
-    <issue
-        id="ObsoleteSdkInt"
-        severity="Error"
-        message="Unnecessary; SDK_INT is never &lt; 21"
-        category="Performance"
-        priority="6"
-        summary="Obsolete SDK_INT Version Check"
-        explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
-        errorLine1="        if (Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.JELLY_BEAN_MR1) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java"
-            line="52"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        severity="Error"
-        message="Unnecessary; SDK_INT is always >= 21"
-        category="Performance"
-        priority="6"
-        summary="Obsolete SDK_INT Version Check"
-        explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
-        errorLine1="        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java"
-            line="144"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        severity="Error"
-        message="Unnecessary; SDK_INT is always >= 21"
-        category="Performance"
-        priority="6"
-        summary="Obsolete SDK_INT Version Check"
-        explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
-        errorLine1="    private static final boolean HAS_EMOJI = SDK_INT >= VERSION_CODES.JELLY_BEAN;"
-        errorLine2="                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java"
-            line="19"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        severity="Error"
-        message="Unnecessary; SDK_INT is always >= 21"
-        category="Performance"
-        priority="6"
-        summary="Obsolete SDK_INT Version Check"
-        explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
-        errorLine1="        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;"
-        errorLine2="                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java"
-            line="440"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        severity="Error"
-        message="Unnecessary; SDK_INT is never &lt; 21"
-        category="Performance"
-        priority="6"
-        summary="Obsolete SDK_INT Version Check"
-        explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
-        errorLine1="        if (Build.VERSION.SDK_INT &lt; Build.VERSION_CODES.JELLY_BEAN_MR1) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java"
-            line="79"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="ObsoleteSdkInt"
-        severity="Error"
-        message="Unnecessary; SDK_INT is always >= 21"
-        category="Performance"
-        priority="6"
-        summary="Obsolete SDK_INT Version Check"
-        explanation="This check flags version checks that are not necessary, because the `minSdkVersion` (or surrounding known API level) is already at least as high as the version checked for.&#xA;&#xA;Similarly, it also looks for resources in `-vNN` folders, such as `values-v14` where the version qualifier is less than or equal to the `minSdkVersion`, where the contents should be merged into the best folder."
-        errorLine1="        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-        quickfix="studio">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ViewUtils.java"
-            line="27"
-            column="13"/>
-    </issue>
-
     <issue
         id="ObsoleteSdkInt"
         severity="Error"
@@ -2769,22 +2584,6 @@
             column="20"/>
     </issue>
 
-    <issue
-        id="ClickableViewAccessibility"
-        severity="Error"
-        message="Custom view `CustomSwipeRefreshLayout` overrides `onTouchEvent` but not `performClick`"
-        category="Accessibility"
-        priority="6"
-        summary="Accessibility in Custom Views"
-        explanation="If a `View` that overrides `onTouchEvent` or uses an `OnTouchListener` does not also implement `performClick` and call it when clicks are detected, the `View` may not handle accessibility actions properly. Logic handling the click actions should ideally be placed in `View#performClick` as some accessibility services invoke `performClick` when a click action should occur."
-        errorLine1="    public boolean onTouchEvent(MotionEvent event) {"
-        errorLine2="                   ~~~~~~~~~~~~">
-        <location
-            file="../libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/CustomSwipeRefreshLayout.java"
-            line="21"
-            column="20"/>
-    </issue>
-
     <issue
         id="ClickableViewAccessibility"
         severity="Error"
@@ -3916,270 +3715,6 @@
             column="9"/>
     </issue>
 
-    <issue
-        id="InlinedApi"
-        severity="Error"
-        message="Field requires API level 23 (current min is 21): `android.text.Layout#BREAK_STRATEGY_HIGH_QUALITY`"
-        category="Correctness"
-        priority="6"
-        summary="Using inlined constants on older versions"
-        explanation="This check scans through all the Android API field references in the application and flags certain constants, such as static final integers and Strings, which were introduced in later versions. These will actually be copied into the class files rather than being referenced, which means that the value is available even when running on older devices. In some cases that&apos;s fine, and in other cases it can result in a runtime crash or incorrect behavior. It depends on the context, so consider the code carefully and decide whether it&apos;s safe and can be suppressed or whether the code needs to be guarded.&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level."
-        errorLine1="                Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;"
-        errorLine2="                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
-            line="53"
-            column="48"/>
-    </issue>
-
-    <issue
-        id="InlinedApi"
-        severity="Error"
-        message="Field requires API level 23 (current min is 21): `android.text.Layout#BREAK_STRATEGY_SIMPLE`"
-        category="Correctness"
-        priority="6"
-        summary="Using inlined constants on older versions"
-        explanation="This check scans through all the Android API field references in the application and flags certain constants, such as static final integers and Strings, which were introduced in later versions. These will actually be copied into the class files rather than being referenced, which means that the value is available even when running on older devices. In some cases that&apos;s fine, and in other cases it can result in a runtime crash or incorrect behavior. It depends on the context, so consider the code carefully and decide whether it&apos;s safe and can be suppressed or whether the code needs to be guarded.&#xA;&#xA;If you really want to use this API and don&apos;t need to support older devices just set the `minSdkVersion` in your `build.gradle` or `AndroidManifest.xml` files.&#xA;&#xA;If your code is **deliberately** accessing newer APIs, and you have ensured (e.g. with conditional execution) that this code will only ever be called on a supported platform, then you can annotate your class or method with the `@TargetApi` annotation specifying the local minimum SDK to apply, such as `@TargetApi(11)`, such that this check considers 11 rather than your manifest file&apos;s minimum SDK as the required API level."
-        errorLine1="                Layout.BREAK_STRATEGY_SIMPLE : Layout.BREAK_STRATEGY_HIGH_QUALITY;"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactTextInputShadowNodeFork.java"
-            line="53"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        severity="Error"
-        message="Must be one of: android.graphics.text.LineBreaker.JUSTIFICATION_MODE_NONE, android.graphics.text.LineBreaker.JUSTIFICATION_MODE_INTER_WORD"
-        category="Correctness"
-        priority="6"
-        summary="Incorrect constant"
-        explanation="Ensures that when parameter in a method only allows a specific set of constants, calls obey those rules."
-        errorLine1="                view.setJustificationMode(Layout.JUSTIFICATION_MODE_INTER_WORD);"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
-            line="337"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="WrongConstant"
-        severity="Error"
-        message="Must be one of: android.graphics.text.LineBreaker.JUSTIFICATION_MODE_NONE, android.graphics.text.LineBreaker.JUSTIFICATION_MODE_INTER_WORD"
-        category="Correctness"
-        priority="6"
-        summary="Incorrect constant"
-        explanation="Ensures that when parameter in a method only allows a specific set of constants, calls obey those rules."
-        errorLine1="                view.setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
-            line="342"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of com.android.tools.build:gradle than 3.4.2 is available: 3.6.3"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="        classpath &apos;com.android.tools.build:gradle:3.4.2&apos;"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build.gradle"
-            line="18"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of androidx.appcompat:appcompat than 1.0.0 is available: 1.1.0"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="    implementation &apos;androidx.appcompat:appcompat:1.0.0&apos;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/build.gradle"
-            line="104"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of androidx.appcompat:appcompat than 1.0.0 is available: 1.1.0"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="    implementation &apos;androidx.appcompat:appcompat:1.0.0&apos;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/build.gradle"
-            line="109"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="GradleDependency"
-        severity="Warning"
-        message="A newer version of androidx.recyclerview:recyclerview than 1.0.0 is available: 1.1.0"
-        category="Correctness"
-        priority="4"
-        summary="Obsolete Gradle Dependency"
-        explanation="This detector looks for usages of libraries where the version you are using is not the current stable release. Using older versions is fine, and there are cases where you deliberately want to stick with an older version. However, you may simply not be aware that a more recent version is available, and that is what this lint check helps find."
-        errorLine1="    implementation &apos;androidx.recyclerview:recyclerview:1.0.0&apos;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/build.gradle"
-            line="110"
-            column="5"/>
-    </issue>
-
-    <issue
-        id="VisibleForTests"
-        severity="Warning"
-        message="This method should only be accessed from tests or within private scope"
-        category="Correctness"
-        priority="4"
-        summary="Visible Only For Tests"
-        explanation="With the `@VisibleForTesting` annotation you can specify an `otherwise=` attribute which specifies the intended visibility if the method had not been made more widely visible for the tests.&#xA;&#xA;This check looks for accesses from production code (e.g. not tests) where the access would not have been allowed with the intended production visibility."
-        errorLine1="    @ReactProp(name = PROP_TEXT)"
-        errorLine2="                      ~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecTextShadowNode.java"
-            line="18"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UseSparseArrays"
-        severity="Warning"
-        message="Use `new SparseArray&lt;Media>(...)` instead for better performance"
-        category="Performance"
-        priority="4"
-        summary="HashMap can be replaced with SparseArray"
-        explanation="For maps where the keys are of type integer, it&apos;s typically more efficient to use the Android `SparseArray` API. This check identifies scenarios where you might want to consider using `SparseArray` instead of `HashMap` for better performance.&#xA;&#xA;This is **particularly** useful when the value types are primitives like ints, where you can use `SparseIntArray` and avoid auto-boxing the values from `int` to `Integer`.&#xA;&#xA;If you need to construct a `HashMap` because you need to call an API outside of your control which requires a `Map`, you can suppress this warning using for example the `@SuppressLint` annotation."
-        errorLine1="    private HashMap&lt;Integer, Media> mMediaToAddAfterMounting = new HashMap&lt;>();"
-        errorLine2="                                                               ~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java"
-            line="85"
-            column="64"/>
-    </issue>
-
-    <issue
-        id="IconColors"
-        severity="Warning"
-        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
-        category="Usability:Icons"
-        priority="6"
-        summary="Icon colors do not follow the recommended visual style"
-        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
-        url="http://developer.android.com/design/style/iconography.html"
-        urls="http://developer.android.com/design/style/iconography.html">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-hdpi/ic_launcher.png"/>
-    </issue>
-
-    <issue
-        id="IconColors"
-        severity="Warning"
-        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
-        category="Usability:Icons"
-        priority="6"
-        summary="Icon colors do not follow the recommended visual style"
-        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
-        url="http://developer.android.com/design/style/iconography.html"
-        urls="http://developer.android.com/design/style/iconography.html">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-mdpi/ic_launcher.png"/>
-    </issue>
-
-    <issue
-        id="IconColors"
-        severity="Warning"
-        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
-        category="Usability:Icons"
-        priority="6"
-        summary="Icon colors do not follow the recommended visual style"
-        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
-        url="http://developer.android.com/design/style/iconography.html"
-        urls="http://developer.android.com/design/style/iconography.html">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-xhdpi/ic_launcher.png"/>
-    </issue>
-
-    <issue
-        id="IconColors"
-        severity="Warning"
-        message="Action Bar icons should use a single gray color (`#333333` for light themes (with 60%/30% opacity for enabled/disabled), and `#FFFFFF` with opacity 80%/30% for dark themes"
-        category="Usability:Icons"
-        priority="6"
-        summary="Icon colors do not follow the recommended visual style"
-        explanation="Notification icons and Action Bar icons should only white and shades of gray. See the Android Design Guide for more details. Note that the way Lint decides whether an icon is an action bar icon or a notification icon is based on the filename prefix: `ic_menu_` for action bar icons, `ic_stat_` for notification icons etc. These correspond to the naming conventions documented in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html"
-        url="http://developer.android.com/design/style/iconography.html"
-        urls="http://developer.android.com/design/style/iconography.html">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/res/drawable-xxhdpi/ic_launcher.png"/>
-    </issue>
-
-    <issue
-        id="ViewConstructor"
-        severity="Warning"
-        message="Custom view `ReactAztecText` is missing constructor used by tools: `(Context)` or `(Context,AttributeSet)` or `(Context,AttributeSet,int)`"
-        category="Usability"
-        priority="3"
-        summary="Missing View constructors for XML inflation"
-        explanation="Some layout tools (such as the Android layout editor) need to find a constructor with one of the following signatures:&#xA;* `View(Context context)`&#xA;* `View(Context context, AttributeSet attrs)`&#xA;* `View(Context context, AttributeSet attrs, int defStyle)`&#xA;&#xA;If your custom view needs to perform initialization which does not apply when used in a layout editor, you can surround the given code with a check to see if `View#isInEditMode()` is false, since that method will return `false` at runtime but true within a user interface editor."
-        errorLine1="public class ReactAztecText extends AztecText {"
-        errorLine2="             ~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecText.java"
-            line="49"
-            column="14"/>
-    </issue>
-
-    <issue
-        id="RtlGetPadding"
-        severity="Error"
-        message="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
-        category="Internationalization:Bidirectional Text"
-        priority="6"
-        summary="Using getPaddingLeft/Right instead of getPaddingStart/End."
-        explanation="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
-        errorLine1="                    (int) update.getPaddingLeft(),"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
-            line="551"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="RtlGetPadding"
-        severity="Error"
-        message="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
-        category="Internationalization:Bidirectional Text"
-        priority="6"
-        summary="Using getPaddingLeft/Right instead of getPaddingStart/End."
-        explanation="For RtL compatibility, use getPaddingStart() and getPaddingEnd() or their ViewCompat version, when getting left/right padding."
-        errorLine1="                    (int) update.getPaddingRight(),"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="../libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android/src/main/java/org/wordpress/mobile/ReactNativeAztec/ReactAztecManager.java"
-            line="553"
-            column="27"/>
-    </issue>
-
     <issue
         id="RtlHardcoded"
         severity="Error"
@@ -4245,4 +3780,20 @@
             column="28"/>
     </issue>
 
+    <issue
+        id="ResourceType"
+        severity="Error"
+        message="Expected a color resource id (`R.color.`) but received an RGB integer"
+        category="Correctness"
+        priority="7"
+        summary="Wrong Resource Type"
+        explanation="Ensures that resource id&apos;s passed to APIs are of the right type; for example, calling `Resources.getColor(R.string.name)` is wrong."
+        errorLine1="        return new SwipeToRefreshHelper(swipeRefreshLayout, listener, backgroundColor, primaryProgressColor,"
+        errorLine2="                                                                      ~~~~~~~~~~~~~~~">
+        <location
+            file="../WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java"
+            line="33"
+            column="71"/>
+    </issue>
+
 </issues>
diff --git a/WordPress/lint.xml b/WordPress/lint.xml
index e172b2ce132d..557e77627f7c 100644
--- a/WordPress/lint.xml
+++ b/WordPress/lint.xml
@@ -77,7 +77,8 @@
     <issue id="PluralsCandidate" severity="ignore" /> <!-- GlotPress doesn't support plurals -->
     <issue id="LabelFor" severity="ignore" /> <!-- Severity should be increased to error when minSdk >= 17 -->
     <issue id="OldTargetApi" severity="ignore" /> <!-- We are aware of down sides of having an old targetApi -->
-
+    <issue id="UseAppTint" severity="ignore" /> <!-- android:tint attribute had a problem on API<=21, but our minSdk is 21, ignore -->
+    
     <issue id="InvalidPackage">
         <ignore regexp="okio-1.9.0.jar" />
         <ignore regexp="java-common-1.13.jar" />
diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po
index 9c75bb1b018e..868a0f864b18 100644
--- a/WordPress/metadata/PlayStoreStrings.po
+++ b/WordPress/metadata/PlayStoreStrings.po
@@ -11,19 +11,26 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
-msgctxt "release_note_161"
+msgctxt "release_note_174"
 msgid ""
-"16.1:\n"
-"* Choose from a variety of predesigned page templates when you create a new page on a Gutenberg-enabled site.\n"
+"17.4:\n"
+"We’ve added 3 new updates to Stories in this update:\n"
 "\n"
+"You’ll now see a media picker when adding a Story block from the block editor, making it easier to get started.\n"
+"\n"
+"Story previews now render as expected in the Reader.\n"
+"\n"
+"And finally, when slides fail to upload, the app will automatically retry, saving you an extra tap!\n"
 msgstr ""
 
-msgctxt "release_note_160"
+msgctxt "release_note_173"
 msgid ""
-"16.0:\n"
-"Block editor updates: There’s now full-width and wide alignment support for the Video, Gallery, and more blocks. We fixed an issue affecting the Classic block on Jetpack sites and resolved an issue involving unsupported blocks on rotated devices.\n"
+"17.3:\n"
+"What’s new?\n"
+"\n"
+"With the new Search block, you can add a search function to any post or page. In the Image block, you can now add a “featured” banner. We’ve also simplified the flow for inserting media when using our popular multimedia blocks.\n"
 "\n"
-"Reader updates: Enjoy a cleaner reading experience and beautiful images in the redesigned Reader. You can access it even if you don’t follow any topics.\n"
+"Other improvements include more user information about your Likes, as well as an updated Comments screen.\n"
 msgstr ""
 
 #. translators: A shorter version of the Release notes to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
index 1ee5ce7ddc90..49597b375a1f 100644
--- a/WordPress/metadata/release_notes.txt
+++ b/WordPress/metadata/release_notes.txt
@@ -1,2 +1,7 @@
-* Choose from a variety of predesigned page templates when you create a new page on a Gutenberg-enabled site.
+We’ve added 3 new updates to Stories in this update:
 
+You’ll now see a media picker when adding a Story block from the block editor, making it easier to get started.
+
+Story previews now render as expected in the Reader.
+
+And finally, when slides fail to upload, the app will automatically retry, saving you an extra tap!
diff --git a/WordPress/metadata/release_notes_short.txt b/WordPress/metadata/release_notes_short.txt
index e69de29bb2d1..49597b375a1f 100644
--- a/WordPress/metadata/release_notes_short.txt
+++ b/WordPress/metadata/release_notes_short.txt
@@ -0,0 +1,7 @@
+We’ve added 3 new updates to Stories in this update:
+
+You’ll now see a media picker when adding a Story block from the block editor, making it easier to get started.
+
+Story previews now render as expected in the Reader.
+
+And finally, when slides fail to upload, the app will automatically retry, saving you an extra tap!
diff --git a/WordPress/proguard.cfg b/WordPress/proguard.cfg
index bd3341e3ce21..09d34bac5c4f 100644
--- a/WordPress/proguard.cfg
+++ b/WordPress/proguard.cfg
@@ -87,4 +87,10 @@
 -keep class org.wordpress.android.R$* {
     <fields>;
 }
+
+# Proguard is incorrectly removing FragmentContainerView classes
+# Explanation by @renanferrari ->
+# https://github.com/wordpress-mobile/WordPress-Android/issues/14323#issuecomment-805052191
+-keep class * extends androidx.fragment.app.Fragment
+
 ###### Main resource class - end
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java
index 6157274feaa6..869abcaa2d6b 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/BlockEditorTests.java
@@ -9,9 +9,7 @@
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.wordpress.android.e2e.components.MasterbarComponent;
 import org.wordpress.android.e2e.pages.BlockEditorPage;
-import org.wordpress.android.e2e.pages.EditorPage;
 import org.wordpress.android.e2e.pages.MySitesPage;
 import org.wordpress.android.e2e.pages.PostPreviewPage;
 import org.wordpress.android.e2e.pages.SiteSettingsPage;
@@ -39,11 +37,10 @@ public void setUp() {
     public void testSwitchToClassicAndPreview() {
         String title = "Hello Espresso!";
 
-        MasterbarComponent mb = new MasterbarComponent().goToMySitesTab();
+        MySitesPage mySitesPage = new MySitesPage().go();
         sleep();
 
-        MySitesPage mySitesPage = new MySitesPage();
-        mySitesPage.gotoSiteSettings();
+        mySitesPage.clickSettingsItem();
 
         // Set to Gutenberg. Apparently the site is defaulting to Aztec still.
         new SiteSettingsPage().setEditorToGutenberg();
@@ -51,22 +48,16 @@ public void testSwitchToClassicAndPreview() {
         // exit the Settings page
         pressBack();
 
-        mb.clickBlogPosts();
+        mySitesPage.clickBlogPostsItem();
 
-        new MySitesPage()
-                .startNewPost();
+        mySitesPage.startNewPost();
 
         BlockEditorPage blockEditorPage = new BlockEditorPage();
         blockEditorPage.waitForTitleDisplayed();
 
         blockEditorPage.enterTitle(title);
 
-        blockEditorPage.switchToClassic();
-
-        EditorPage editorPage = new EditorPage();
-        editorPage.hasTitle(title);
-
-        editorPage.previewPost();
+        blockEditorPage.previewPost();
         sleep();
 
         new PostPreviewPage();
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java
index cf76c61a3ac6..8c1d783105d8 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/EditorTests.java
@@ -6,10 +6,10 @@
 import androidx.test.rule.GrantPermissionRule;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.wordpress.android.R;
-import org.wordpress.android.e2e.components.MasterbarComponent;
 import org.wordpress.android.e2e.pages.EditorPage;
 import org.wordpress.android.e2e.pages.MySitesPage;
 import org.wordpress.android.e2e.pages.SiteSettingsPage;
@@ -39,11 +39,10 @@ public void setUp() {
         logoutIfNecessary();
         wpLogin();
 
-        MasterbarComponent mb = new MasterbarComponent().goToMySitesTab();
+        MySitesPage mySitesPage = new MySitesPage().go();
         sleep();
 
-        MySitesPage mySitesPage = new MySitesPage();
-        mySitesPage.gotoSiteSettings();
+        mySitesPage.clickSettingsItem();
 
         // Set to Classic.
         new SiteSettingsPage().setEditorToClassic();
@@ -51,12 +50,13 @@ public void setUp() {
         // exit the Settings page
         pressBack();
 
-        mb.clickBlogPosts();
+        mySitesPage.clickBlogPostsItem();
 
-        new MySitesPage()
-                .startNewPost();
+        mySitesPage.startNewPost();
     }
 
+    // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
+    @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
     public void testPublishSimplePost() {
         String title = "Hello Espresso!";
@@ -69,6 +69,8 @@ public void testPublishSimplePost() {
         assertTrue(isPublished);
     }
 
+    // For more info see Issue: https://github.com/wordpress-mobile/WordPress-Android/issues/14389
+    @Ignore("Classic Editor being deprecated for new posts, test should be adjusted to editing existing classic post")
     @Test
     public void testPublishFullPost() {
         String title = "Hello Espresso!";
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/components/MasterbarComponent.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/components/MasterbarComponent.java
deleted file mode 100644
index 2397a355e13c..000000000000
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/components/MasterbarComponent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.wordpress.android.e2e.components;
-
-import org.wordpress.android.R;
-
-import static androidx.test.espresso.Espresso.onView;
-import static org.wordpress.android.support.BetterScrollToAction.scrollTo;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static org.wordpress.android.support.WPSupportUtils.clickOn;
-
-public class MasterbarComponent {
-    public MasterbarComponent() {
-    }
-
-    public MasterbarComponent goToMySitesTab() {
-        clickOn(R.id.nav_sites);
-        return this;
-    }
-
-    public MasterbarComponent clickBlogPosts() {
-        onView(withId(R.id.quick_action_posts_button))
-                .perform(scrollTo());
-        clickOn(R.id.quick_action_posts_button);
-        return this;
-    }
-}
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java
index 123d42d20341..3911621c0d77 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java
@@ -28,7 +28,7 @@ public class LoginFlow {
     public LoginFlow chooseContinueWithWpCom() {
         // Login Prologue – We want to Continue with WordPress.com, not a site address
         // See LoginPrologueFragment
-        clickOn(R.id.first_button);
+        clickOn(R.id.continue_with_wpcom_button);
         return this;
     }
 
@@ -44,7 +44,7 @@ public LoginFlow enterPassword(String password) {
         // Password Screen – Fill it in and click "Continue"
         // See LoginEmailPasswordFragment
         populateTextField(R.id.input, password);
-        clickOn(R.id.primary_button);
+        clickOn(R.id.bottom_button);
         return this;
     }
 
@@ -54,7 +54,7 @@ public void confirmLogin() {
             enterUsernameAndPassword(E2E_WP_COM_USER_USERNAME, E2E_WP_COM_USER_PASSWORD);
         }
 
-        ViewInteraction continueButton = onView(withId(R.id.primary_button));
+        ViewInteraction continueButton = onView(withId(R.id.bottom_button));
 
         waitForElementToBeDisplayed(continueButton);
         clickOn(continueButton);
@@ -90,14 +90,14 @@ public LoginFlow enterUsernameAndPassword(String username, String password) {
                 Matchers.<View>instanceOf(EditText.class)));
         populateTextField(usernameElement, username + "\n");
         populateTextField(passwordElement, password + "\n");
-        clickOn(R.id.primary_button);
+        clickOn(R.id.bottom_button);
         return this;
     }
 
     public LoginFlow chooseEnterYourSiteAddress() {
         // Login Prologue – We want to continue with a site address not a WordPress.com account
         // See LoginPrologueFragment
-        clickOn(R.id.second_button);
+        clickOn(R.id.enter_your_site_address_button);
         return this;
     }
 
@@ -105,7 +105,7 @@ public LoginFlow enterSiteAddress(String siteAddress) {
         // Site Address Screen – Fill it in and click "Continue"
         // See LoginSiteAddressFragment
         populateTextField(R.id.input, siteAddress);
-        clickOn(R.id.primary_button);
+        clickOn(R.id.bottom_button);
         return this;
     }
 }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/SignupFlow.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/SignupFlow.java
index 901563663daa..b4832ac7b479 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/SignupFlow.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/SignupFlow.java
@@ -23,7 +23,7 @@ public class SignupFlow {
     public SignupFlow chooseContinueWithWpCom() {
         // Login Prologue – We want to Continue with WordPress.com, not a site address
         // See LoginPrologueFragment
-        clickOn(R.id.first_button);
+        clickOn(R.id.continue_with_wpcom_button);
         return this;
     }
 
@@ -35,10 +35,6 @@ public SignupFlow enterEmail(String email) {
     }
 
     public SignupFlow openMagicLink(ActivityTestRule<LoginMagicLinkInterceptActivity> magicLinkActivityTestRule) {
-        // Receive Magic Link – Choose "Send link by email"
-        // See SignupConfirmationFragment
-        clickOn(R.id.signup_confirmation_button);
-
         // Should see "Check email" button
         // See SignupMagicLinkFragment
         waitForElementToBeDisplayed(R.id.signup_magic_link_button);
@@ -76,7 +72,7 @@ public SignupFlow enterPassword(String password) {
         populateTextField(passwordField, password);
 
         // Click continue
-        clickOn(onView(withId(R.id.primary_button)));
+        clickOn(onView(withId(R.id.bottom_button)));
 
         return this;
     }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.java
index 7311419c587b..41953fecb2fb 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.java
@@ -13,6 +13,7 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withHint;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.wordpress.android.support.WPSupportUtils.clickOn;
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayed;
 
@@ -34,8 +35,8 @@ public void enterTitle(String postTitle) {
         titleField.perform(typeText(postTitle), ViewActions.closeSoftKeyboard());
     }
 
-    public void switchToClassic() {
+    public void previewPost() {
         openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
-        clickOn("Switch to classic editor");
+        clickOn(onView(withText(R.string.menu_preview)));
     }
 }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
index 3a6657b9eae1..f3799a529e29 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/EditorPage.java
@@ -1,9 +1,15 @@
 package org.wordpress.android.e2e.pages;
 
+import android.view.View;
+
 import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.FailureHandler;
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.action.ViewActions;
 
+import com.google.android.material.snackbar.SnackbarContentLayout;
+
+import org.hamcrest.Matcher;
 import org.wordpress.android.R;
 
 import static androidx.test.espresso.Espresso.onView;
@@ -13,6 +19,7 @@
 import static androidx.test.espresso.action.ViewActions.typeText;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.RootMatchers.isDialog;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withHint;
@@ -33,13 +40,19 @@ public class EditorPage {
     private static ViewInteraction titleField = onView(allOf(withId(R.id.title),
             withHint("Title")));
     private static ViewInteraction publishConfirmation = onView(allOf(
-            withText("Post published"), isDescendantOfA(withId(R.id.snackbar))));
+            withText("Post published"), isDescendantOfA(isAssignableFrom(SnackbarContentLayout.class))));
     private static ViewInteraction allowMediaAccessButton = onView(allOf(withId(R.id.button),
             withText("Allow")));
     private static ViewInteraction confirmButton = onView(withId(R.id.mnu_confirm_selection));
 
 
     public EditorPage() {
+        onView(withText("Dismiss")).withFailureHandler(new FailureHandler() {
+            @Override public void handle(Throwable error, Matcher<View> viewMatcher) {
+                // Deprecation Dialog only shows up the first time this test is run because of SharedPreference
+            }
+        }).check(matches(isDisplayed())).perform(click());
+
         editor.check(matches(isDisplayed()));
     }
 
@@ -73,7 +86,7 @@ public void enterImage() {
         waitForElementToBeDisplayed(onView(withText("WordPress media")));
         // wait for images to load before clicking
         idleFor(2000);
-        onView(withIndex(withId(R.id.media_grid_item_image), 0)).perform(click());
+        onView(withIndex(withId(R.id.image_thumbnail), 0)).perform(click());
 
         // Click the confirm button
         clickOn(confirmButton);
@@ -106,8 +119,11 @@ public void addATag(String tag) {
 
     public void setFeaturedImage() {
         clickOn(onView(withId(R.id.post_add_featured_image_button)));
-        clickOn(onView(withId(R.id.icon_wpmedia)));
-        onView(withIndex(withId(R.id.media_grid_item_image), 0)).perform(click());
+        openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
+        clickOn(onView(withText(R.string.photo_picker_wordpress_media_library)));
+        idleFor(2000);
+        onView(withIndex(withId(R.id.image_thumbnail), 0)).perform(click());
+        clickOn(confirmButton);
     }
 
     public boolean publishPost() {
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java
index 297f59052dc9..7b036199a50c 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java
@@ -1,21 +1,27 @@
 package org.wordpress.android.e2e.pages;
 
+import android.view.View;
 import android.widget.TextView;
 
 import androidx.appcompat.widget.Toolbar;
 import androidx.test.espresso.ViewInteraction;
 
+import org.hamcrest.Matcher;
 import org.wordpress.android.R;
 
 import static androidx.test.espresso.Espresso.onView;
-import static org.wordpress.android.support.BetterScrollToAction.scrollTo;
+import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItem;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withParent;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
+import static org.wordpress.android.support.BetterScrollToAction.scrollTo;
 import static org.wordpress.android.support.WPSupportUtils.clickOn;
+import static org.wordpress.android.support.WPSupportUtils.isElementDisplayed;
 import static org.wordpress.android.support.WPSupportUtils.longClickOn;
 
 public class MySitesPage {
@@ -49,11 +55,32 @@ public void removeSite(String siteName) {
 
     public void startNewPost() {
         clickOn(R.id.fab_button);
+        if (isElementDisplayed(R.id.design_bottom_sheet)) {
+            // If Stories are enabled, FAB opens a bottom sheet with options - select the 'Blog post' option
+            clickOn(onView(withText(R.string.my_site_bottom_sheet_add_post)));
+        }
+    }
+
+    public void clickSettingsItem() {
+        clickItemWithText(R.string.my_site_btn_site_settings);
+    }
+
+    public void clickBlogPostsItem() {
+        clickItemWithText(R.string.my_site_btn_blog_posts);
+    }
+
+    private void clickItemWithText(int stringResId) {
+        clickItem(withText(stringResId));
     }
 
-    public void gotoSiteSettings() {
-        onView(withId(R.id.row_settings))
-                .perform(scrollTo());
-        clickOn(R.id.row_settings);
+    private void clickItem(final Matcher<View> itemViewMatcher) {
+        if (isElementDisplayed(R.id.recycler_view)) {
+            // If My Site Improvements are enabled, we reach the item in a different way
+            onView(withId(R.id.recycler_view))
+                    .perform(actionOnItem(hasDescendant(itemViewMatcher), click()));
+        } else {
+            onView(itemViewMatcher)
+                    .perform(scrollTo(), click());
+        }
     }
 }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
index 22486c85c738..ccf1c39c9a7a 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/PostsListPage.java
@@ -1,5 +1,7 @@
 package org.wordpress.android.e2e.pages;
 
+import android.view.ViewGroup;
+
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
@@ -22,6 +24,13 @@ public static void scrollToTop() {
 
     private static RecyclerView getRecyclerView() {
         ViewPager pager = getCurrentActivity().findViewById(R.id.postPager);
-        return (RecyclerView) pager.getChildAt(pager.getCurrentItem()).findViewById(R.id.recycler_view);
+        RecyclerView recyclerView = (RecyclerView) pager.getChildAt(pager.getCurrentItem())
+                                                        .findViewById(R.id.recycler_view);
+        if (recyclerView == null) {
+            // Workaround for cases when recyclerview id missing
+            recyclerView = (RecyclerView) ((ViewGroup) ((ViewGroup) (pager.getChildAt(pager.getCurrentItem()))
+                    .findViewById(R.id.ptr_layout)).getChildAt(0)).getChildAt(0);
+        }
+        return recyclerView;
     }
 }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/modules/AppComponentTest.kt b/WordPress/src/androidTest/java/org/wordpress/android/modules/AppComponentTest.kt
index a5f726b19521..a9cffadea48a 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/modules/AppComponentTest.kt
+++ b/WordPress/src/androidTest/java/org/wordpress/android/modules/AppComponentTest.kt
@@ -4,35 +4,39 @@ import android.app.Application
 import dagger.BindsInstance
 import dagger.Component
 import dagger.android.support.AndroidSupportInjectionModule
-import org.wordpress.android.fluxc.module.DebugOkHttpClientModule
-import org.wordpress.android.fluxc.module.ReleaseBaseModule
+import org.wordpress.android.fluxc.module.OkHttpClientModule
 import org.wordpress.android.fluxc.module.ReleaseNetworkModule
 import org.wordpress.android.fluxc.module.ReleaseToolsModule
 import org.wordpress.android.login.di.LoginFragmentModule
 import org.wordpress.android.login.di.LoginServiceModule
 import org.wordpress.android.ui.stats.refresh.StatsModule
+import org.wordpress.android.ui.suggestion.SuggestionSourceSubcomponent.SuggestionSourceModule
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [
-    ApplicationModule::class,
-    AppConfigModule::class,
-    ReleaseBaseModule::class,
-    DebugOkHttpClientModule::class,
-    InterceptorModuleTest::class,
-    ReleaseNetworkModule::class,
-    LegacyModule::class,
-    ReleaseToolsModule::class,
-    AndroidSupportInjectionModule::class,
-    ViewModelModule::class,
-    StatsModule::class,
-    TrackerTestModule::class,
-    // Login flow library
-    LoginAnalyticsModule::class,
-    LoginFragmentModule::class,
-    LoginServiceModule::class,
-    SupportModule::class,
-    ThreadModule::class])
+@Component(
+        modules = [
+            ApplicationModule::class,
+            AppConfigModule::class,
+            OkHttpClientModule::class,
+            InterceptorModuleTest::class,
+            ReleaseNetworkModule::class,
+            LegacyModule::class,
+            ReleaseToolsModule::class,
+            AndroidSupportInjectionModule::class,
+            ViewModelModule::class,
+            StatsModule::class,
+            TrackerTestModule::class,
+            // Login flow library
+            LoginAnalyticsModule::class,
+            LoginFragmentModule::class,
+            LoginServiceModule::class,
+            SupportModule::class,
+            ThreadModule::class,
+            SuggestionSourceModule::class,
+            ExperimentModule::class
+        ]
+)
 interface AppComponentTest : AppComponent {
     @Component.Builder
     interface Builder : AppComponent.Builder {
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java b/WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java
index 77794f35878d..91694fecb656 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java
@@ -3,6 +3,7 @@
 import android.app.Instrumentation;
 
 import androidx.test.core.app.ApplicationProvider;
+import androidx.test.espresso.accessibility.AccessibilityChecks;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
@@ -13,8 +14,12 @@
 import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.DateOffset;
 import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HandlebarsHelper;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResult;
+import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResult.AccessibilityCheckResultType;
 
 import org.apache.commons.lang3.LocaleUtils;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
 import org.wordpress.android.R;
@@ -36,6 +41,9 @@
 import java.util.TimeZone;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+import static com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesTypes;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.is;
 import static org.wordpress.android.BuildConfig.E2E_SELF_HOSTED_USER_SITE_ADDRESS;
 import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_EMAIL;
 import static org.wordpress.android.BuildConfig.E2E_WP_COM_USER_PASSWORD;
@@ -53,6 +61,12 @@ public void setup() {
         mMockedAppComponent = DaggerAppComponentTest.builder()
                                                     .application(mAppContext)
                                                     .build();
+
+        Matcher<? super AccessibilityCheckResult> nonErrorLevelMatcher =
+                Matchers.allOf(matchesTypes(
+                        anyOf(is(AccessibilityCheckResultType.INFO), is(AccessibilityCheckResultType.WARNING))));
+        AccessibilityChecks.enable().setRunChecksFromRootView(true).setThrowExceptionForErrors(false)
+                           .setSuppressingResultMatcher(nonErrorLevelMatcher);
     }
 
     @Rule
@@ -87,7 +101,7 @@ private void logout() {
     }
 
     protected void logoutIfNecessary() {
-        if (isElementDisplayed(R.id.first_button) || isElementDisplayed(R.id.login_open_email_client)) {
+        if (isElementDisplayed(R.id.continue_with_wpcom_button) || isElementDisplayed(R.id.login_open_email_client)) {
             return;
         }
 
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java b/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java
index 3f779e95e7db..725951f087b1 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/support/WPSupportUtils.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.support;
 
 import android.app.Activity;
+import android.util.DisplayMetrics;
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
@@ -8,6 +9,7 @@
 import android.view.ViewParent;
 import android.widget.Checkable;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.espresso.AmbiguousViewMatcherException;
 import androidx.test.espresso.Espresso;
@@ -16,7 +18,9 @@
 import androidx.test.espresso.ViewInteraction;
 import androidx.test.espresso.action.GeneralClickAction;
 import androidx.test.espresso.action.GeneralLocation;
+import androidx.test.espresso.action.GeneralSwipeAction;
 import androidx.test.espresso.action.Press;
+import androidx.test.espresso.action.Swipe;
 import androidx.test.espresso.action.Tap;
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
@@ -39,7 +43,7 @@
 import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
 import static androidx.test.espresso.action.ViewActions.longClick;
 import static androidx.test.espresso.action.ViewActions.replaceText;
-import static org.wordpress.android.support.BetterScrollToAction.scrollTo;
+import static androidx.test.espresso.action.ViewActions.swipeDown;
 import static androidx.test.espresso.action.ViewActions.swipeLeft;
 import static androidx.test.espresso.action.ViewActions.swipeRight;
 import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
@@ -49,8 +53,10 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
 import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withTagValue;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.runner.lifecycle.Stage.RESUMED;
@@ -58,6 +64,7 @@
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
+import static org.wordpress.android.support.BetterScrollToAction.scrollTo;
 
 
 public class WPSupportUtils {
@@ -111,6 +118,10 @@ public static void clickOn(ViewInteraction viewInteraction) {
         idleFor(500); // allow for transitions
     }
 
+    public static void clickOnViewWithTag(String tag) {
+        clickOn(onView(withTagValue(is(tag))));
+    }
+
     /**
      * Returns an action that performs a single click on the view.
      *
@@ -210,6 +221,14 @@ public static void clickOnChildAtIndex(int index, int parentElementID, int child
         clickOn(childElement);
     }
 
+    public static void swipeLeftOnViewPager(int viewPagerID) {
+        onView(withId(viewPagerID)).perform(swipeLeft());
+    }
+
+    public static void swipeRightOnViewPager(int viewPagerID) {
+        onView(withId(viewPagerID)).perform(swipeRight());
+    }
+
     public static void clickOnSpinnerItemAtIndex(int index) {
         final ViewInteraction spinnerItem = onView(
                 allOf(
@@ -359,6 +378,39 @@ public static void selectItemWithTitleInTabLayout(String string, Integer element
         clickOn(tabItemInTabLayoutWithTitle(elementID, string));
     }
 
+    private static ViewAction swipeFromBottomToTop(float yFactor) {
+        return new GeneralSwipeAction(Swipe.SLOW,
+                view -> {
+                    float[] coordinates = GeneralLocation.CENTER.calculateCoordinates(view);
+                    coordinates[1] *= yFactor;
+                    return coordinates;
+                }, GeneralLocation.TOP_CENTER, Press.FINGER);
+    }
+
+    private static ViewAction swipeFromTopToBottom(float yFactor) {
+        return new GeneralSwipeAction(Swipe.SLOW,
+                GeneralLocation.TOP_CENTER,
+                view -> {
+                    float[] coordinates = GeneralLocation.CENTER.calculateCoordinates(view);
+                    coordinates[1] *= yFactor;
+                    return coordinates;
+                }, Press.FINGER);
+    }
+
+    public static void swipeUpOnView(Integer elementID, float yFactor) {
+        onView(withId(elementID)).perform(withCustomConstraints(swipeFromBottomToTop(yFactor),
+                isDisplayingAtLeast(10)));
+    }
+
+    public static void swipeDownOnView(Integer elementID, float yFactor) {
+        onView(withId(elementID)).perform(withCustomConstraints(swipeFromTopToBottom(yFactor),
+                isDisplayingAtLeast(10)));
+    }
+
+    public static void swipeDownOnView(Integer elementID) {
+        onView(withId(elementID)).perform(withCustomConstraints(swipeDown(), isDisplayingAtLeast(10)));
+    }
+
     private static Boolean tabLayoutHasTextDisplayed(Integer elementID, String text) {
         return isElementCompletelyDisplayed(tabItemInTabLayoutWithTitle(elementID, text));
     }
@@ -679,4 +731,44 @@ public void run() {
     public static String getTranslatedString(Integer resourceID) {
         return getCurrentActivity().getResources().getString(resourceID);
     }
+
+    public static void setNightMode(boolean isNightMode) {
+        getCurrentActivity().runOnUiThread(new Runnable() {
+            @Override public void run() {
+                AppCompatDelegate.setDefaultNightMode(
+                        isNightMode ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
+            }
+        });
+
+        idleFor(1000);
+    }
+
+    // Checks for screen having both width and height greater than 600dp
+    public static boolean isTabletScreen() {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getCurrentActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        float widthDp = displayMetrics.widthPixels / displayMetrics.density;
+        float heightDp = displayMetrics.heightPixels / displayMetrics.density;
+        float screenSw = Math.min(widthDp, heightDp);
+        return screenSw >= 600;
+    }
+
+    private static ViewAction withCustomConstraints(final ViewAction action, final Matcher<View> constraints) {
+        return new ViewAction() {
+            @Override
+            public Matcher<View> getConstraints() {
+                return constraints;
+            }
+
+            @Override
+            public String getDescription() {
+                return action.getDescription();
+            }
+
+            @Override
+            public void perform(UiController uiController, View view) {
+                action.perform(uiController, view);
+            }
+        };
+    }
 }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
index 5833357a20b7..0c5ae1286039 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/WPScreenshotTest.java
@@ -23,14 +23,19 @@
 import org.wordpress.android.util.image.ImageType;
 
 import static org.wordpress.android.support.WPSupportUtils.clickOn;
-import static org.wordpress.android.support.WPSupportUtils.dialogExistsWithTitle;
+import static org.wordpress.android.support.WPSupportUtils.clickOnViewWithTag;
 import static org.wordpress.android.support.WPSupportUtils.getCurrentActivity;
 import static org.wordpress.android.support.WPSupportUtils.getTranslatedString;
 import static org.wordpress.android.support.WPSupportUtils.idleFor;
+import static org.wordpress.android.support.WPSupportUtils.isElementDisplayed;
+import static org.wordpress.android.support.WPSupportUtils.isTabletScreen;
 import static org.wordpress.android.support.WPSupportUtils.pressBackUntilElementIsDisplayed;
-import static org.wordpress.android.support.WPSupportUtils.scrollToThenClickOn;
 import static org.wordpress.android.support.WPSupportUtils.selectItemWithTitleInTabLayout;
-import static org.wordpress.android.support.WPSupportUtils.tapButtonInDialogWithTitle;
+import static org.wordpress.android.support.WPSupportUtils.setNightMode;
+import static org.wordpress.android.support.WPSupportUtils.swipeDownOnView;
+import static org.wordpress.android.support.WPSupportUtils.swipeLeftOnViewPager;
+import static org.wordpress.android.support.WPSupportUtils.swipeRightOnViewPager;
+import static org.wordpress.android.support.WPSupportUtils.swipeUpOnView;
 import static org.wordpress.android.support.WPSupportUtils.waitForAtLeastOneElementWithIdToBeDisplayed;
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayed;
 import static org.wordpress.android.support.WPSupportUtils.waitForElementToBeDisplayedWithoutFailure;
@@ -59,32 +64,20 @@ public void wPScreenshotTest() {
 
         // Enable Demo Mode
         mDemoModeEnabler.enable();
-
         wpLogin();
 
-        idleFor(1000);
-        takeScreenshot("1-build-and-manage-your-website");
-
-        navigateMySite();
         editBlogPost();
-        manageMedia();
-        navigateNotifications();
+        navigateDiscover();
+        navigateMySite();
         navigateStats();
+        navigateNotifications();
+        manageMedia();
 
         // Turn Demo Mode off on the emulator when we're done
         mDemoModeEnabler.disable();
         logoutIfNecessary();
     }
 
-    private void navigateMySite() {
-        // Click on the "Sites" tab and take a screenshot
-        clickOn(R.id.nav_sites);
-
-        waitForElementToBeDisplayedWithoutFailure(R.id.row_blog_posts);
-
-        takeScreenshot("4-keep-tabs-on-your-site");
-    }
-
     private void editBlogPost() {
         // Choose the "sites" tab in the nav
         clickOn(R.id.nav_sites);
@@ -92,65 +85,142 @@ private void editBlogPost() {
         // Choose "Switch Site"
         clickOn(R.id.switch_site);
 
-        (new SitePickerPage()).chooseSiteWithURL("infocusphotographers.com");
+        (new SitePickerPage()).chooseSiteWithURL("fourpawsdoggrooming.wordpress.com");
 
         // Choose "Blog Posts"
-        scrollToThenClickOn(R.id.quick_action_posts_button);
+        clickOn(R.id.quick_action_posts_button);
 
         // Choose "Drafts"
         selectItemWithTitleInTabLayout(getTranslatedString(R.string.post_list_tab_drafts), R.id.tabLayout);
 
-        // Get a screenshot of the writing feature (without image)
-        String name = "2-create-beautiful-posts-and-pages";
-        screenshotPostWithName("Time to Book Summer Sessions", name, false);
+        // Get a screenshot of the editor with the block library expanded
+        String name = "1-create-a-site-or-start-a-blog";
 
-        // Get a screenshot of the drafts feature
-        screenshotPostWithName("Ideas", "6-capture-ideas-on-the-go", false);
-
-        // Get a screenshot of the drafts feature
-        screenshotPostWithName("Summer Band Jam", "7-create-beautiful-posts-and-pages", true);
+        // Wait for the editor to load all images
+        idleFor(5000);
 
-        // Get a screenshot for "write without compromises"
-        screenshotPostWithName("Now Booking Summer Sessions", "8-write-without-compromises", true);
+        screenshotPostWithName("Our Services", name, false, !isTabletScreen());
 
         // Exit back to the main activity
         pressBackUntilElementIsDisplayed(R.id.nav_sites);
     }
 
-    private void screenshotPostWithName(String name, String screenshotName, boolean hideKeyboard) {
+    private void screenshotPostWithName(String name,
+                                        String screenshotName,
+                                        boolean hideKeyboard,
+                                        boolean openBlockList) {
         idleFor(2000);
 
         PostsListPage.scrollToTop();
         PostsListPage.tapPostWithName(name);
 
-        if (dialogExistsWithTitle(getTranslatedString(R.string.dialog_gutenberg_informative_title))) {
-            tapButtonInDialogWithTitle(getTranslatedString(R.string.dialog_button_ok));
-        }
-
-
         waitForElementToBeDisplayed(R.id.editor_activity);
 
         // Wait for the editor to load all images
-        idleFor(5000);
+        idleFor(7000);
 
         if (hideKeyboard) {
             Espresso.closeSoftKeyboard();
         }
 
+        setNightModeAndWait(false);
+
+        if (openBlockList) {
+            clickOnViewWithTag("add-block-button");
+            idleFor(2000);
+        }
+
         takeScreenshot(screenshotName);
         pressBackUntilElementIsDisplayed(R.id.tabLayout);
     }
 
-    private void manageMedia() {
-        // Click on the "Sites" tab in the nav, then choose "Media"
+    private void navigateDiscover() {
+        // Click on the "Reader" tab and take a screenshot
+        clickOn(R.id.nav_reader);
+
+        waitForElementToBeDisplayedWithoutFailure(R.id.interests_fragment_container);
+
+        idleFor(2000);
+        if (isElementDisplayed(R.id.welcome_banner_wrapper)) {
+            swipeDownOnView(R.id.welcome_banner_wrapper, 2);
+            idleFor(4000);
+        }
+
+        swipeUpOnView(R.id.interests_fragment_container, (float) 1.15);
+
+        swipeUpOnView(R.id.fragment_container, (float) 0.5);
+
+        idleFor(2000);
+
+        // Workaround to avoid gray overlay
+        try {
+            swipeToAvoidGrayOverlay(R.id.view_pager);
+
+            if (isTabletScreen()) {
+                swipeDownOnView(R.id.view_pager, (float) 0.5);
+                idleFor(1000);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        setNightModeAndWait(true);
+
+        // Wait for the editor to load all images
+        idleFor(7000);
+
+        takeScreenshot("2-discover-new-reads");
+
+        // Exit back to the main activity
+        pressBackUntilElementIsDisplayed(R.id.nav_sites);
+    }
+
+    private void moveToStats() {
+        // Click on the "Sites" tab in the nav, then choose "Stats"
         clickOn(R.id.nav_sites);
-        clickOn(R.id.quick_action_media_button);
+        clickOn(R.id.quick_action_stats_button);
 
-        waitForElementToBeDisplayedWithoutFailure(R.id.media_grid_item_image);
+        waitForElementToBeDisplayedWithoutFailure(R.id.image_thumbnail);
 
-        takeScreenshot("5-share-from-anywhere");
+        // Wait for the stats to load
+        idleFor(8000);
+    }
 
-        pressBackUntilElementIsDisplayed(R.id.quick_action_media_button);
+    private void navigateStats() {
+        moveToStats();
+
+        swipeToAvoidGrayOverlay(R.id.statsPager);
+
+        if (isElementDisplayed(R.id.button_negative)) {
+            clickOn(R.id.button_negative);
+        }
+
+        setNightModeAndWait(true);
+
+        takeScreenshot("3-build-an-audience");
+
+        // Exit the Stats Activity
+        pressBackUntilElementIsDisplayed(R.id.nav_sites);
+    }
+
+    private void navigateMySite() {
+        // Click on the "Sites" tab and take a screenshot
+        clickOn(R.id.nav_sites);
+
+        // Choose "Switch Site"
+        clickOn(R.id.switch_site);
+
+        (new SitePickerPage()).chooseSiteWithURL("tricountyrealestate.wordpress.com");
+
+        waitForElementToBeDisplayedWithoutFailure(R.id.row_blog_posts);
+
+        if (isElementDisplayed(R.id.tooltip_message)) {
+            clickOn(R.id.tooltip_message);
+        }
+
+        setNightModeAndWait(true);
+
+        takeScreenshot("4-keep-tabs-on-your-site");
     }
 
     private void navigateNotifications() {
@@ -161,27 +231,30 @@ private void navigateNotifications() {
         waitForImagesOfTypeWithPlaceholder(R.id.note_avatar, ImageType.AVATAR);
 
 
-        takeScreenshot("4-check-whats-happening-in-real-time");
+        // Wait for the images to load
+        idleFor(6000);
+
+        setNightModeAndWait(false);
+
+        takeScreenshot("5-reply-in-real-time");
 
         // Exit the notifications activity
         pressBackUntilElementIsDisplayed(R.id.nav_sites);
     }
 
-    private void navigateStats() {
-        // Click on the "Sites" tab in the nav, then choose "Stats"
+    private void manageMedia() {
+        // Click on the "Sites" tab in the nav, then choose "Media"
         clickOn(R.id.nav_sites);
-        clickOn(R.id.row_stats);
+        clickOn(R.id.quick_action_media_button);
 
-        // Show the year view – it'll have the best layout
-        selectItemWithTitleInTabLayout(getTranslatedString(R.string.stats_timeframe_years), R.id.tabLayout);
+        waitForElementToBeDisplayedWithoutFailure(R.id.media_grid_item_image);
 
-        // Wait for the stats to load
-        idleFor(5000);
+        idleFor(2000);
+        setNightModeAndWait(true);
 
-        takeScreenshot("3-track-what-your-visitors-love");
+        takeScreenshot("6-upload-on-the-go");
 
-        // Exit the Stats Activity
-        pressBackUntilElementIsDisplayed(R.id.nav_sites);
+        pressBackUntilElementIsDisplayed(R.id.quick_action_media_button);
     }
 
     private void takeScreenshot(String screenshotName) {
@@ -206,8 +279,25 @@ private boolean runningInTestLab() {
         return "true".equals(testLabSetting);
     }
 
+
+    // In some cases there's a gray overlay on view pager screens when taking screenshots
+    // this function swipes left and then right as a workaround to clear it
+    // resourceID should be the ID of the viewPager
+    private void swipeToAvoidGrayOverlay(int resourceID) {
+        // Workaround to avoid gray overlay
+        swipeLeftOnViewPager(resourceID);
+        idleFor(1000);
+        swipeRightOnViewPager(resourceID);
+        idleFor(1000);
+    }
+
     private boolean editPostActivityIsNoLongerLoadingImages() {
         EditPostActivity editPostActivity = (EditPostActivity) getCurrentActivity();
         return editPostActivity.getAztecImageLoader().getNumberOfImagesBeingDownloaded() == 0;
     }
+
+    private void setNightModeAndWait(boolean isNightMode) {
+        setNightMode(isNightMode);
+        idleFor(5000);
+    }
 }
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/AutolinkUtilsTest.java b/WordPress/src/androidTest/java/org/wordpress/android/util/AutolinkUtilsTest.java
index 9bf38fec6b81..2b581b8ded31 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/util/AutolinkUtilsTest.java
+++ b/WordPress/src/androidTest/java/org/wordpress/android/util/AutolinkUtilsTest.java
@@ -18,14 +18,14 @@ public void testEmptyString() {
         assertEquals(sourceTest, output);
     }
 
-    public void testNonBlacklistedUrl1() {
+    public void testNonDenylistedUrl1() {
         String sourceTest = "http://test.com";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         String expected = "<a href=\"http://test.com\">http://test.com</a>";
         assertEquals(expected, output);
     }
 
-    public void testNonBlacklistedUrl2() {
+    public void testNonDenylistedUrl2() {
         String sourceTest = "http://test.com http://test.com";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         String expected =
@@ -33,7 +33,7 @@ public void testNonBlacklistedUrl2() {
         assertEquals(expected, output);
     }
 
-    public void testNonBlacklistedUrl3() {
+    public void testNonDenylistedUrl3() {
         String sourceTest = "http://test.com\nhttp://test.com";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         String expected =
@@ -41,26 +41,26 @@ public void testNonBlacklistedUrl3() {
         assertEquals(expected, output);
     }
 
-    public void testBlacklistedUrl1() {
+    public void testDenylistedUrl1() {
         String sourceTest = "http://youtube.com/watch?test";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         assertEquals(sourceTest, output);
     }
 
-    public void testBlacklistedUrlIgnoreCase1() {
+    public void testDenylistedUrlIgnoreCase1() {
         String sourceTest = "http://youtube.com/WATCH?test";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         assertEquals(sourceTest, output);
     }
 
-    public void testBlacklistedUrlKickStarter1() {
+    public void testDenylistedUrlKickStarter1() {
         String sourceTest = "testing https://www.kickstarter.com/projects/583173617/raspi-boy-retro-"
                             + "handheld-emulation-console-electro ponies";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         assertEquals(sourceTest, output);
     }
 
-    public void testBlacklistedUrlKickStarter2() {
+    public void testDenylistedUrlKickStarter2() {
         String sourceTest = "testing http://kck.st/2gNq7KK ponies";
         String output = AutolinkUtils.autoCreateLinks(sourceTest);
         assertEquals(sourceTest, output);
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/EncryptionUtilsTest.kt b/WordPress/src/androidTest/java/org/wordpress/android/util/EncryptionUtilsTest.kt
deleted file mode 100644
index 826b16b7ff2d..000000000000
--- a/WordPress/src/androidTest/java/org/wordpress/android/util/EncryptionUtilsTest.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.wordpress.android.util
-
-import com.goterl.lazycode.lazysodium.utils.KeyPair
-import org.json.JSONObject
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotNull
-import org.junit.Before
-import org.junit.Test
-import org.wordpress.android.util.encryptedlogging.EncryptedLogReader
-import org.wordpress.android.util.encryptedlogging.EncryptedLogWriter
-import org.wordpress.android.util.encryptedlogging.EncryptionUtils
-import java.io.File
-import java.util.UUID
-
-class EncryptionUtilsTest {
-    private lateinit var keypair: KeyPair
-
-    @Before
-    fun setup() {
-        keypair = EncryptionUtils.sodium.cryptoBoxKeypair()
-    }
-
-    @Test
-    @Throws
-    fun testThatEncryptedLogsMatchV1FileFormat() {
-        val testLogString = UUID.randomUUID().toString()
-        val log = logWithContent(testLogString)
-
-        val json = JSONObject(log.readText())
-        assertEquals(
-                "`keyedWith` must ALWAYS be v1 in this version of the file format",
-                "v1",
-                json.getString("keyedWith")
-        )
-
-        assertNotNull(
-                "The UUID must be valid",
-                UUID.fromString(json.getString("uuid"))
-        )
-
-        assertEquals(
-                "The header must be 32 bytes long",
-                32,
-                json.getString("header").count()
-        )
-
-        assertEquals(
-                "The encrypted key should be 108 bytes long",
-                108,
-                json.getString("encryptedKey").count()
-        )
-
-        assertEquals(
-                "There should be one message and the closing tag",
-                2,
-                json.getJSONArray("messages").length()
-        )
-    }
-
-    @Test
-    fun testThatLogsCanBeDecrypted() {
-        val testLogString = UUID.randomUUID().toString()
-        assertEquals(testLogString, EncryptedLogReader(logWithContent(testLogString), keypair).decrypt())
-    }
-
-    @Test
-    fun testThatEmptyLogsCanBeEncrypted() {
-        val testLogString = ""
-        assertEquals(testLogString, EncryptedLogReader(logWithContent(testLogString), keypair).decrypt())
-    }
-
-    @Test
-    fun testThatExplicitUUIDsCanBeRetrievedFromEncryptedLogs() {
-        val testUUID = UUID.randomUUID().toString()
-        val writer = EncryptedLogWriter(createTempFile(), keypair.publicKey, testUUID)
-        writer.write("")
-        writer.close()
-
-        assertEquals(EncryptedLogReader(writer.file, keypair).uuid, testUUID)
-    }
-
-    // Helpers
-    private fun logWithContent(string: String): File {
-        val file = createTempFile()
-        val enc = EncryptedLogWriter(file, keypair.publicKey)
-        enc.write(string)
-        enc.close()
-
-        return file
-    }
-}
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/SupportedBlocksProviderTest.kt b/WordPress/src/androidTest/java/org/wordpress/android/util/SupportedBlocksProviderTest.kt
new file mode 100644
index 000000000000..af0f750e585c
--- /dev/null
+++ b/WordPress/src/androidTest/java/org/wordpress/android/util/SupportedBlocksProviderTest.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.util
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.wordpress.android.ui.mlp.SupportedBlocksProvider
+import org.wordpress.android.viewmodel.ContextProvider
+
+@RunWith(AndroidJUnit4::class)
+class SupportedBlocksProviderTest {
+    private val context = InstrumentationRegistry.getInstrumentation().targetContext
+    private val contextProvider = ContextProvider(context)
+    private val supportedBlocksProvider = SupportedBlocksProvider(contextProvider)
+
+    @Test
+    fun fetchSupportedBlocks() {
+        val supportedBlocks = supportedBlocksProvider.fromAssets().supported
+        assertTrue(supportedBlocks.isNotEmpty())
+    }
+}
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/util/UploadWorkerTest.kt b/WordPress/src/androidTest/java/org/wordpress/android/util/UploadWorkerTest.kt
index 7cb572e56097..ed0e75b6468b 100644
--- a/WordPress/src/androidTest/java/org/wordpress/android/util/UploadWorkerTest.kt
+++ b/WordPress/src/androidTest/java/org/wordpress/android/util/UploadWorkerTest.kt
@@ -47,8 +47,8 @@ class UploadWorkerTest {
 
     @Test
     fun testOneTimeUploadWorker() {
-        val testDriver = WorkManagerTestInitHelper.getTestDriver()
-        val workManager = WorkManager.getInstance()
+        val testDriver = WorkManagerTestInitHelper.getTestDriver(mock())
+        val workManager = WorkManager.getInstance(mock())
 
         // Define inputs
         val site = SiteModel()
@@ -58,7 +58,7 @@ class UploadWorkerTest {
         val (request, operation) = enqueueUploadWorkRequestForSite(site)
 
         // Meet constraints
-        testDriver.setAllConstraintsMet(request.id)
+        testDriver!!.setAllConstraintsMet(request.id)
 
         // Wait for result
         operation.result.get()
@@ -77,7 +77,7 @@ class UploadWorkerTest {
         val site = SiteModel()
         whenever(siteStore.getSiteByLocalId(any())).doReturn(site)
 
-        val workManager = WorkManager.getInstance()
+        val workManager = WorkManager.getInstance(mock())
 
         // Enqueue
         val (request, operation) = enqueueUploadWorkRequestForSite(site)
@@ -96,14 +96,14 @@ class UploadWorkerTest {
     @Test
     fun testPeriodicUploadWorkerWithMetConstraints() {
         // Define input data
-        val testDriver = WorkManagerTestInitHelper.getTestDriver()
-        val workManager = WorkManager.getInstance()
+        val testDriver = WorkManagerTestInitHelper.getTestDriver(mock())
+        val workManager = WorkManager.getInstance(mock())
 
         // Enqueue
         val (request, operation) = enqueuePeriodicUploadWorkRequestForAllSites()
 
         // Meet constraints and delay
-        testDriver.setAllConstraintsMet(request.id)
+        testDriver!!.setAllConstraintsMet(request.id)
         testDriver.setPeriodDelayMet(request.id)
 
         // Wait for result
@@ -120,15 +120,15 @@ class UploadWorkerTest {
     @Test
     fun testPeriodicUploadWorkerWithMetConstraintsCalledTwice() {
         // Define input data
-        val testDriver = WorkManagerTestInitHelper.getTestDriver()
-        val workManager = WorkManager.getInstance()
+        val testDriver = WorkManagerTestInitHelper.getTestDriver(mock())
+        val workManager = WorkManager.getInstance(mock())
 
         // Enqueue
         val (request, operation) = enqueuePeriodicUploadWorkRequestForAllSites()
 
         // ############### First round
         // Meet delay, constraints, and wait for result
-        testDriver.setAllConstraintsMet(request.id)
+        testDriver!!.setAllConstraintsMet(request.id)
         testDriver.setPeriodDelayMet(request.id)
         operation.result.get()
 
diff --git a/WordPress/src/debug/java/org/wordpress/android/WPWellSqlConfig.kt b/WordPress/src/debug/java/org/wordpress/android/WPWellSqlConfig.kt
index 918767e7a3dc..bfd94306f956 100644
--- a/WordPress/src/debug/java/org/wordpress/android/WPWellSqlConfig.kt
+++ b/WordPress/src/debug/java/org/wordpress/android/WPWellSqlConfig.kt
@@ -39,9 +39,9 @@ class WPWellSqlConfig(context: Context) : WellSqlConfig(context) {
     }
 
     /**
-     * Increase the cursor window size to 5MB for devices running API 28 and above. This should reduce the
+     * Increase the cursor window size to 20MB for devices running API 28 and above. This should reduce the
      * number of SQLiteBlobTooBigExceptions. Note that this is only called on API 28 and
      * above since earlier versions don't allow adjusting the cursor window size.
      */
-    override fun getCursorWindowSize() = (1024L * 1024L * 5L)
+    override fun getCursorWindowSize() = (1024L * 1024L * 20L)
 }
diff --git a/WordPress/src/debug/java/org/wordpress/android/modules/AppComponentDebug.java b/WordPress/src/debug/java/org/wordpress/android/modules/AppComponentDebug.java
index 0d2a256eebfe..06d291257944 100644
--- a/WordPress/src/debug/java/org/wordpress/android/modules/AppComponentDebug.java
+++ b/WordPress/src/debug/java/org/wordpress/android/modules/AppComponentDebug.java
@@ -2,13 +2,13 @@
 
 import android.app.Application;
 
-import org.wordpress.android.fluxc.module.DebugOkHttpClientModule;
-import org.wordpress.android.fluxc.module.ReleaseBaseModule;
+import org.wordpress.android.fluxc.module.OkHttpClientModule;
 import org.wordpress.android.fluxc.module.ReleaseNetworkModule;
 import org.wordpress.android.fluxc.module.ReleaseToolsModule;
 import org.wordpress.android.login.di.LoginFragmentModule;
 import org.wordpress.android.login.di.LoginServiceModule;
 import org.wordpress.android.ui.stats.refresh.StatsModule;
+import org.wordpress.android.ui.suggestion.SuggestionSourceSubcomponent.SuggestionSourceModule;
 
 import javax.inject.Singleton;
 
@@ -20,8 +20,7 @@
 @Component(modules = {
         ApplicationModule.class,
         AppConfigModule.class,
-        ReleaseBaseModule.class,
-        DebugOkHttpClientModule.class,
+        OkHttpClientModule.class,
         InterceptorModule.class,
         ReleaseNetworkModule.class,
         LegacyModule.class,
@@ -30,6 +29,8 @@
         ViewModelModule.class,
         StatsModule.class,
         TrackerModule.class,
+        SuggestionSourceModule.class,
+        ExperimentModule.class,
         // Login flow library
         LoginAnalyticsModule.class,
         LoginFragmentModule.class,
diff --git a/WordPress/src/jalapeno/res/mipmap-mdpi/app_icon.png b/WordPress/src/jalapeno/res/mipmap-mdpi/app_icon.png
deleted file mode 100644
index 78d91e3a96bc..000000000000
Binary files a/WordPress/src/jalapeno/res/mipmap-mdpi/app_icon.png and /dev/null differ
diff --git a/WordPress/src/jetpack/assets/licenses.html b/WordPress/src/jetpack/assets/licenses.html
new file mode 100644
index 000000000000..7c799de4b711
--- /dev/null
+++ b/WordPress/src/jetpack/assets/licenses.html
@@ -0,0 +1,49 @@
+<html>
+  <head>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <style>
+      body {
+        margin: 1em;
+      }
+      pre {
+        background: #DDD;
+        padding: 1em;
+        white-space: pre-wrap;
+      }
+    </style>
+  </head>
+  <body>
+    <h2>Jetpack for Android</h2>
+
+    <p>Source code available from
+    <a href="http://android.wordpress.org/">android.wordpress.org</a>.</p>
+
+    <p>Jetpack for Android is released under the terms of the GNU <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html">GPL v2</a>:</p>
+
+    <h2>Additional Libraries</h2>
+
+    <p>Jetpack for Android is made possible with the help of many fantastic open source libraries! The following
+libraries are licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache v2</a>:</p>
+
+    <ul>
+      <li><a href="https://github.com/google/gson">gson</a>: Copyright 2002-2008, Google</li>
+      <li><a href="https://github.com/chrisbanes/PhotoView">PhotoView</a>: Copyright 2011-2012, Chris Banes</li>
+      <li><a href="https://github.com/jukka/tagsoup">TagSoup</a>: Copyright 2002-2008, John Cowan</li>
+      <li><a href="https://github.com/Yalantis/uCrop">uCrop</a>: Copyright 2017, Yalantis</li>
+      <li><a href="https://github.com/xizzhu/simple-tool-tip">Simple Tool Tip</a>: Copyright 2016, Xizhi Zhu</li>
+      <li><a href="https://github.com/square/okio">okio/okhttp</a>: Copyright 2013 Square, Inc.</li>
+      <li><a href="https://github.com/greenrobot/EventBus">EventBus</a>: Copyright 2012-2016 Markus Junginger, greenrobot</li>
+      <li><a href="https://github.com/INDExOS/media-for-mobile">Mobile 4 Media</a>: Copyright 2016, INDExOS</li>
+      <li><a href="https://github.com/Tenor-Inc/tenor-android-core">Tenor Android Core</a>: Copyright 2017, Tenor Inc</li>
+    </ul>
+
+    <br>
+    <br>
+    <p>And here's our lone <a href="http://www.gnu.org/licenses/lgpl.html">LGPL v3 licensed dependency</a>:</p>
+
+    <ul>
+      <li><a href="https://github.com/wordpress-mobile/GraphView">GraphView</a>: Copyright 2013, Jonas Gehring</li>
+    </ul>
+
+  </body>
+</html>
diff --git a/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt b/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt
new file mode 100644
index 000000000000..fa6055c02166
--- /dev/null
+++ b/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.ui.accounts.login
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.button.MaterialButton
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.JetpackLoginPrologueScreenBinding
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowEmailLoginScreen
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowLoginViaSiteAddressScreen
+import org.wordpress.android.util.WPActivityUtils
+import javax.inject.Inject
+
+class LoginPrologueFragment : Fragment(R.layout.jetpack_login_prologue_screen) {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: LoginPrologueViewModel
+    private lateinit var loginPrologueListener: LoginPrologueListener
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        if (context !is LoginPrologueListener) {
+            throw RuntimeException("$context must implement LoginPrologueListener")
+        }
+        loginPrologueListener = context
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initDagger()
+
+        // setting up a full screen flags for the decor view of this fragment,
+        // that will work with transparent status bar
+        WPActivityUtils.showFullScreen(view)
+
+        updateSystemBars(showDarkStatusAndNavBarInLightMode = true)
+
+        with(JetpackLoginPrologueScreenBinding.bind(view)) { initViewModel() }
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component().inject(this)
+    }
+
+    private fun JetpackLoginPrologueScreenBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@LoginPrologueFragment, viewModelFactory).get(
+                LoginPrologueViewModel::class.java
+        )
+        initObservers()
+        viewModel.start()
+    }
+
+    private fun JetpackLoginPrologueScreenBinding.initObservers() {
+        viewModel.navigationEvents.observe(viewLifecycleOwner, { events ->
+            events.getContentIfNotHandled()?.let {
+                when (it) {
+                    is ShowEmailLoginScreen -> loginPrologueListener.showEmailLoginScreen()
+                    is ShowLoginViaSiteAddressScreen -> loginPrologueListener.loginViaSiteAddress()
+                    else -> Unit // Do nothing
+                }
+            }
+        })
+
+        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            updateButtonUiState(
+                    bottomButtonsContainer.continueWithWpcomButton,
+                    uiState.continueWithWpcomButtonState.title,
+                    uiState.continueWithWpcomButtonState.onClick
+            )
+            updateButtonUiState(
+                    bottomButtonsContainer.enterYourSiteAddressButton,
+                    uiState.enterYourSiteAddressButtonState.title,
+                    uiState.enterYourSiteAddressButtonState.onClick
+            )
+        })
+    }
+
+    private fun updateButtonUiState(button: MaterialButton, title: Int, onClick: () -> Unit) {
+        button.setText(title)
+        button.setOnClickListener { onClick.invoke() }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.onFragmentResume()
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        // important for accessibility - talkback
+        activity?.setTitle(R.string.login_prologue_screen_title)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        updateSystemBars(showDarkStatusAndNavBarInLightMode = false)
+    }
+
+    private fun updateSystemBars(showDarkStatusAndNavBarInLightMode: Boolean) {
+        activity?.let {
+            WPActivityUtils.setLightStatusBar(it.window, !showDarkStatusAndNavBarInLightMode)
+            WPActivityUtils.setLightNavigationBar(it.window, !showDarkStatusAndNavBarInLightMode)
+        }
+    }
+
+    companion object {
+        const val TAG = "jetpack_login_prologue_fragment_tag"
+    }
+}
diff --git a/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueViewModel.kt b/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueViewModel.kt
new file mode 100644
index 000000000000..4a2e98d759c4
--- /dev/null
+++ b/WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueViewModel.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.ui.accounts.login
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.accounts.LoginNavigationEvents
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowEmailLoginScreen
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowLoginViaSiteAddressScreen
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Click.CONTINUE_WITH_WORDPRESS_COM
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Click.LOGIN_WITH_SITE_ADDRESS
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Flow
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Step.PROLOGUE
+import org.wordpress.android.ui.accounts.login.LoginPrologueViewModel.ButtonUiState.ContinueWithWpcomButtonState
+import org.wordpress.android.ui.accounts.login.LoginPrologueViewModel.ButtonUiState.EnterYourSiteAddressButtonState
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+class LoginPrologueViewModel @Inject constructor(
+    private val unifiedLoginTracker: UnifiedLoginTracker,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
+    val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
+
+    private val _uiState: MutableLiveData<UiState> = MutableLiveData()
+    val uiState: LiveData<UiState> = _uiState
+
+    private var isStarted = false
+    fun start() {
+        if (isStarted) return
+        isStarted = true
+
+        analyticsTrackerWrapper.track(stat = Stat.LOGIN_PROLOGUE_VIEWED)
+        unifiedLoginTracker.track(flow = Flow.PROLOGUE, step = PROLOGUE)
+
+        _uiState.value = UiState(
+                enterYourSiteAddressButtonState = EnterYourSiteAddressButtonState(::onEnterYourSiteAddressButtonClick),
+                continueWithWpcomButtonState = ContinueWithWpcomButtonState(::onContinueWithWpcomButtonClick)
+        )
+    }
+
+    fun onFragmentResume() {
+        unifiedLoginTracker.setFlowAndStep(Flow.PROLOGUE, PROLOGUE)
+    }
+
+    private fun onContinueWithWpcomButtonClick() {
+        unifiedLoginTracker.trackClick(CONTINUE_WITH_WORDPRESS_COM)
+        _navigationEvents.postValue(Event(ShowEmailLoginScreen))
+    }
+
+    private fun onEnterYourSiteAddressButtonClick() {
+        unifiedLoginTracker.trackClick(LOGIN_WITH_SITE_ADDRESS)
+        _navigationEvents.postValue(Event(ShowLoginViaSiteAddressScreen))
+    }
+
+    data class UiState(
+        val enterYourSiteAddressButtonState: EnterYourSiteAddressButtonState,
+        val continueWithWpcomButtonState: ContinueWithWpcomButtonState
+    )
+
+    sealed class ButtonUiState {
+        abstract val title: Int
+        abstract val onClick: (() -> Unit)
+
+        data class ContinueWithWpcomButtonState(override val onClick: () -> Unit) : ButtonUiState() {
+            override val title = R.string.continue_with_wpcom_no_signup
+        }
+
+        data class EnterYourSiteAddressButtonState(override val onClick: () -> Unit) : ButtonUiState() {
+            override val title = R.string.enter_your_site_address
+        }
+    }
+}
diff --git a/WordPress/src/jetpack/res/drawable/app_icon_background.xml b/WordPress/src/jetpack/res/drawable/app_icon_background.xml
new file mode 100644
index 000000000000..ea6e0aa4b2c8
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/app_icon_background.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startY="0"
+          android:startX="0"
+          android:endY="108"
+          android:endX="108"
+          android:type="linear">
+        <item android:offset="0" android:color="@color/primary_30"/>
+        <item android:offset="1" android:color="@color/primary_40"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/WordPress/src/jetpack/res/drawable/app_icon_foreground.xml b/WordPress/src/jetpack/res/drawable/app_icon_foreground.xml
new file mode 100644
index 000000000000..47afe14276e0
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/app_icon_foreground.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M54,23C71.121,23 85,36.879 85,54C85,71.121 71.121,85 54,85C36.879,85 23,71.121 23,54C23,36.879 36.879,23 54,23ZM71.034,48.814L55.572,48.814L55.572,78.86L71.034,48.814ZM52.427,29.143L36.964,59.19L52.427,59.19L52.427,29.143Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpack/res/drawable/bg_nav_badge.xml b/WordPress/src/jetpack/res/drawable/bg_nav_badge.xml
new file mode 100644
index 000000000000..b107ecd0fc6c
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/bg_nav_badge.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="@color/colorPrimary"/>
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/white"/>
+</shape>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_translucent.xml b/WordPress/src/jetpack/res/drawable/bg_note_avatar_badge.xml
similarity index 56%
rename from libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_translucent.xml
rename to WordPress/src/jetpack/res/drawable/bg_note_avatar_badge.xml
index 8f44a4eacb27..6b7cf25d33c3 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_translucent.xml
+++ b/WordPress/src/jetpack/res/drawable/bg_note_avatar_badge.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/black_translucent_50" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid
+        android:color="@color/colorPrimary"/>
 </shape>
diff --git a/WordPress/src/jetpack/res/drawable/bg_rectangle_blue_90_gradient.xml b/WordPress/src/jetpack/res/drawable/bg_rectangle_blue_90_gradient.xml
new file mode 100644
index 000000000000..e58af124b74c
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/bg_rectangle_blue_90_gradient.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+
+    <gradient
+        android:angle="270"
+        android:endColor="@color/wordpress_blue_90"
+        android:startColor="@color/transparent"
+        android:type="linear"/>
+
+    <corners
+        android:radius="0dp"/>
+
+</shape>
diff --git a/WordPress/src/jetpack/res/drawable/bg_stars_background_large.xml b/WordPress/src/jetpack/res/drawable/bg_stars_background_large.xml
new file mode 100644
index 000000000000..fd15a8a29816
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/bg_stars_background_large.xml
@@ -0,0 +1,2436 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="2258dp"
+    android:height="1305dp"
+    android:viewportWidth="2258"
+    android:viewportHeight="1305">
+  <path
+      android:pathData="M208.09,63.05C208.09,60.84 209.89,59.04 212.1,59.04C214.32,59.04 216.11,60.84 216.11,63.05C216.11,65.27 214.32,67.06 212.1,67.06C209.89,67.06 208.09,65.27 208.09,63.05Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M213.37,206.06C213.37,203.84 215.16,202.05 217.38,202.05C219.59,202.05 221.39,203.84 221.39,206.06C221.39,208.27 219.59,210.07 217.38,210.07C215.16,210.07 213.37,208.27 213.37,206.06Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M93.38,226.43C93.38,224.22 95.18,222.42 97.39,222.42C99.61,222.42 101.4,224.22 101.4,226.43C101.4,228.65 99.61,230.44 97.39,230.44C95.18,230.44 93.38,228.65 93.38,226.43Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M13.58,171.53C13.58,169.32 15.38,167.52 17.59,167.52C19.81,167.52 21.6,169.32 21.6,171.53C21.6,173.75 19.81,175.54 17.59,175.54C15.38,175.54 13.58,173.75 13.58,171.53Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M62.26,140.41C62.26,138.19 64.05,136.4 66.27,136.4C68.48,136.4 70.28,138.19 70.28,140.41C70.28,142.62 68.48,144.42 66.27,144.42C64.05,144.42 62.26,142.62 62.26,140.41Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M171.49,381.51C171.49,379.29 173.28,377.49 175.5,377.49C177.71,377.49 179.51,379.29 179.51,381.51C179.51,383.72 177.71,385.52 175.5,385.52C173.28,385.52 171.49,383.72 171.49,381.51Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M33.39,332.83C33.39,330.62 35.19,328.82 37.4,328.82C39.62,328.82 41.41,330.62 41.41,332.83C41.41,335.05 39.62,336.84 37.4,336.84C35.19,336.84 33.39,335.05 33.39,332.83Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1096.83,331.7C1096.83,329.49 1098.63,327.69 1100.84,327.69C1103.06,327.69 1104.85,329.49 1104.85,331.7C1104.85,333.92 1103.06,335.71 1100.84,335.71C1098.63,335.71 1096.83,333.92 1096.83,331.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M974.02,87.21C974.02,84.99 975.81,83.2 978.03,83.2C980.24,83.2 982.04,84.99 982.04,87.21C982.04,89.42 980.24,91.22 978.03,91.22C975.81,91.22 974.02,89.42 974.02,87.21Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M858.56,74.19C858.56,71.97 860.36,70.18 862.57,70.18C864.79,70.18 866.58,71.97 866.58,74.19C866.58,76.4 864.79,78.2 862.57,78.2C860.36,78.2 858.56,76.4 858.56,74.19Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M637.84,4.01C637.84,1.8 639.63,-0 641.85,-0C644.06,-0 645.86,1.8 645.86,4.01C645.86,6.22 644.06,8.02 641.85,8.02C639.63,8.02 637.84,6.22 637.84,4.01Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M534.83,290.39C534.83,288.17 536.63,286.38 538.84,286.38C541.06,286.38 542.85,288.17 542.85,290.39C542.85,292.6 541.06,294.4 538.84,294.4C536.63,294.4 534.83,292.6 534.83,290.39Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M996.09,14.2C996.09,11.98 997.89,10.19 1000.1,10.19C1002.31,10.19 1004.11,11.98 1004.11,14.2C1004.11,16.41 1002.31,18.21 1000.1,18.21C997.89,18.21 996.09,16.41 996.09,14.2Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1110.98,619.21C1110.98,616.99 1112.78,615.2 1114.99,615.2C1117.2,615.2 1119,616.99 1119,619.21C1119,621.42 1117.2,623.22 1114.99,623.22C1112.78,623.22 1110.98,621.42 1110.98,619.21Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M645.76,202.1C645.76,199.88 647.56,198.09 649.77,198.09C651.98,198.09 653.78,199.88 653.78,202.1C653.78,204.31 651.98,206.11 649.77,206.11C647.56,206.11 645.76,204.31 645.76,202.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M402.4,90.04C402.4,87.82 404.19,86.03 406.41,86.03C408.62,86.03 410.42,87.82 410.42,90.04C410.42,92.25 408.62,94.05 406.41,94.05C404.19,94.05 402.4,92.25 402.4,90.04Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M452.2,481.68C452.2,479.47 454,477.67 456.21,477.67C458.43,477.67 460.22,479.47 460.22,481.68C460.22,483.89 458.43,485.69 456.21,485.69C454,485.69 452.2,483.89 452.2,481.68Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M796.31,606.76C796.31,604.54 798.1,602.75 800.32,602.75C802.53,602.75 804.33,604.54 804.33,606.76C804.33,608.97 802.53,610.77 800.32,610.77C798.1,610.77 796.31,608.97 796.31,606.76Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M925.35,482.25C925.35,480.03 927.14,478.24 929.35,478.24C931.57,478.24 933.36,480.03 933.36,482.25C933.36,484.46 931.57,486.26 929.35,486.26C927.14,486.26 925.35,484.46 925.35,482.25Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M886.86,332.83C886.86,330.62 888.66,328.82 890.87,328.82C893.08,328.82 894.88,330.62 894.88,332.83C894.88,335.05 893.08,336.84 890.87,336.84C888.66,336.84 886.86,335.05 886.86,332.83Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M841.58,221.9C841.58,219.69 843.38,217.9 845.59,217.9C847.81,217.9 849.6,219.69 849.6,221.9C849.6,224.12 847.81,225.91 845.59,225.91C843.38,225.91 841.58,224.12 841.58,221.9Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M168.09,73.43C168.21,73.55 168.33,73.68 168.45,73.8C168.74,73.11 169.12,72.47 169.57,71.87L168.09,73.43Z"
+      android:strokeWidth="1"
+      android:fillColor="#5198D9"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M169.57,71.87L170.92,70.45C170.81,70.55 170.69,70.65 170.58,70.75C170.2,71.1 169.87,71.47 169.57,71.87Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFE"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M231.17,41.34C231.17,40.22 232.08,39.31 233.19,39.31C234.31,39.31 235.21,40.22 235.21,41.34C235.21,42.45 234.31,43.36 233.19,43.36C232.08,43.36 231.17,42.45 231.17,41.34Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M385.99,290.09C385.99,288.98 386.89,288.07 388.01,288.07C389.12,288.07 390.03,288.98 390.03,290.09C390.03,291.21 389.12,292.11 388.01,292.11C386.89,292.11 385.99,291.21 385.99,290.09Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M731.22,365.93C731.22,364.82 732.13,363.91 733.24,363.91C734.36,363.91 735.26,364.82 735.26,365.93C735.26,367.05 734.36,367.95 733.24,367.95C732.13,367.95 731.22,367.05 731.22,365.93Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M575.02,485.92C575.02,484.8 575.92,483.9 577.04,483.9C578.15,483.9 579.06,484.8 579.06,485.92C579.06,487.03 578.15,487.94 577.04,487.94C575.92,487.94 575.02,487.03 575.02,485.92Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M280.72,475.73C280.72,474.61 281.62,473.71 282.74,473.71C283.85,473.71 284.76,474.61 284.76,475.73C284.76,476.85 283.85,477.75 282.74,477.75C281.62,477.75 280.72,476.85 280.72,475.73Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M210.92,12C210.92,11.35 211.45,10.82 212.1,10.82C212.76,10.82 213.29,11.35 213.29,12C213.29,12.66 212.76,13.19 212.1,13.19C211.45,13.19 210.92,12.66 210.92,12Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M41.88,95.42C41.88,94.3 42.79,93.38 43.92,93.38C45.05,93.38 45.96,94.3 45.96,95.42C45.96,96.55 45.05,97.46 43.92,97.46C42.79,97.46 41.88,96.55 41.88,95.42Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M404.1,294.08C404.1,292.95 405.01,292.04 406.14,292.04C407.26,292.04 408.18,292.95 408.18,294.08C408.18,295.2 407.26,296.11 406.14,296.11C405.01,296.11 404.1,295.2 404.1,294.08Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M700.66,411.23C700.66,410.1 701.57,409.19 702.7,409.19C703.83,409.19 704.74,410.1 704.74,411.23C704.74,412.36 703.83,413.27 702.7,413.27C701.57,413.27 700.66,412.36 700.66,411.23Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M637.84,500.65C637.84,499.52 638.75,498.61 639.88,498.61C641,498.61 641.92,499.52 641.92,500.65C641.92,501.78 641,502.69 639.88,502.69C638.75,502.69 637.84,501.78 637.84,500.65Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M886.86,558.38C886.86,557.25 887.77,556.34 888.9,556.34C890.03,556.34 890.94,557.25 890.94,558.38C890.94,559.51 890.03,560.42 888.9,560.42C887.77,560.42 886.86,559.51 886.86,558.38Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M812.15,444.05C812.15,442.93 813.07,442.02 814.19,442.02C815.32,442.02 816.23,442.93 816.23,444.05C816.23,445.18 815.32,446.1 814.19,446.1C813.07,446.1 812.15,445.18 812.15,444.05Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M769.14,290.11C769.14,288.99 770.05,288.07 771.18,288.07C772.31,288.07 773.22,288.99 773.22,290.11C773.22,291.24 772.31,292.15 771.18,292.15C770.05,292.15 769.14,291.24 769.14,290.11Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M987.04,318.98C987.04,317.85 987.95,316.94 989.08,316.94C990.2,316.94 991.11,317.85 991.11,318.98C991.11,320.1 990.2,321.02 989.08,321.02C987.95,321.02 987.04,320.1 987.04,318.98Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M369.57,185.98C369.57,184.85 370.49,183.94 371.61,183.94C372.74,183.94 373.65,184.85 373.65,185.98C373.65,187.1 372.74,188.02 371.61,188.02C370.49,188.02 369.57,187.1 369.57,185.98Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M298.26,337.65C298.26,336.53 299.18,335.61 300.3,335.61C301.43,335.61 302.34,336.53 302.34,337.65C302.34,338.78 301.43,339.69 300.3,339.69C299.18,339.69 298.26,338.78 298.26,337.65Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M101.31,4.3C101.31,3.18 102.22,2.26 103.35,2.26C104.47,2.26 105.39,3.18 105.39,4.3C105.39,5.43 104.47,6.34 103.35,6.34C102.22,6.34 101.31,5.43 101.31,4.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M0,56.94C0,55.81 0.91,54.9 2.04,54.9C3.17,54.9 4.08,55.81 4.08,56.94C4.08,58.06 3.17,58.98 2.04,58.98C0.91,58.98 0,58.06 0,56.94Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M42.87,17.4l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M159.45,180.96l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M151.53,273.78l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M214.35,318.49l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M177,259.06l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M22.49,495.64l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M77.96,451.49l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M155.49,555.63l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M449.23,639.39l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M613.35,523.93l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M655.24,577.13l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M678.44,574.87l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M732.21,609.96l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M997.08,408.48l3.06,-1.22l-3.06,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M756.54,182.66l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M987.45,231.33l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1067.82,508.09l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M760.5,574.87l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M431.11,595.24l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M887.85,137.38l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M739,75.13l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M598.64,113.61l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M465.64,66.64l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1036.13,324.71l3.07,-1.22l-3.07,-1.22l-1.23,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M838.61,439.04l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M760.5,26.45l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M142.86,90.76l1.31,-3.03l-3.03,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M283.21,14.92l1.31,-3.03l-3.03,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M512.43,7.56l1.31,-3.03l-3.03,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1012.74,342.61l1.3,-3.04l-3.03,1.31l-3.03,-1.31l1.3,3.04l-1.3,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1109.52,21.15l1.3,-3.03l-3.03,1.31l-3.04,-1.31l1.31,3.03l-1.31,3.03l3.04,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M92.38,49.97l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M71.38,569.3l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M972.96,2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M318.71,27.11l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M988.24,8.43l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1112.18,234.25l0.95,-2.21l-2.21,0.95l-2.2,-0.95l0.95,2.21l-0.95,2.21l2.2,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1009.74,529.12l0.95,-2.21l-2.2,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.2,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1082.75,142.57l0.95,-2.21l-2.21,0.95l-2.2,-0.95l0.95,2.21l-0.95,2.21l2.2,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1027.85,248.97l0.95,-2.21l-2.2,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.2,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M879.57,253.49l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M671.86,90.5l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M533.77,159.54l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M619.8,268.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M564.33,363.86l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M573.95,375.18l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M323.23,490.07l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M286.45,549.49l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M569.43,612.88l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M61.19,409.13l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M3.47,375.18l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1099.73,448.18l0.95,-2.21l-2.21,0.95l-2.2,-0.95l0.95,2.21l-0.95,2.21l2.2,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M24.97,244.44l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M247.96,600.43l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M170.16,30.94l1.47,-0.59l-1.47,-0.58l-0.58,-1.47l-0.59,1.47l-1.47,0.58l1.47,0.59l0.59,1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1090.23,556.36C1090.23,555.24 1091.14,554.34 1092.26,554.34C1093.37,554.34 1094.28,555.24 1094.28,556.36C1094.28,557.47 1093.37,558.38 1092.26,558.38C1091.14,558.38 1090.23,557.47 1090.23,556.36Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1026.65,146.91C1026.65,145.79 1027.56,144.89 1028.67,144.89C1029.79,144.89 1030.69,145.79 1030.69,146.91C1030.69,148.02 1029.79,148.93 1028.67,148.93C1027.56,148.93 1026.65,148.02 1026.65,146.91Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1000.05,379.52C1000.05,378.4 1000.96,377.49 1002.07,377.49C1003.19,377.49 1004.09,378.4 1004.09,379.52C1004.09,380.63 1003.19,381.54 1002.07,381.54C1000.96,381.54 1000.05,380.63 1000.05,379.52Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1001.92,605.78l1.31,-3.03l-3.04,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.04l3.03,-1.31l3.04,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M951.45,565l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1029.23,545.96l1.47,-0.59l-1.47,-0.58l-0.59,-1.47l-0.58,1.47l-1.47,0.58l1.47,0.59l0.58,1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M910.91,1221.4C910.91,1223.62 909.11,1225.41 906.9,1225.41C904.68,1225.41 902.89,1223.62 902.89,1221.4C902.89,1219.19 904.68,1217.39 906.9,1217.39C909.11,1217.39 910.91,1219.19 910.91,1221.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M905.63,1078.4C905.63,1080.61 903.84,1082.41 901.62,1082.41C899.41,1082.41 897.61,1080.61 897.61,1078.4C897.61,1076.19 899.41,1074.39 901.62,1074.39C903.84,1074.39 905.63,1076.19 905.63,1078.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1025.62,1058.03C1025.62,1060.24 1023.82,1062.04 1021.61,1062.04C1019.39,1062.04 1017.6,1060.24 1017.6,1058.03C1017.6,1055.81 1019.39,1054.02 1021.61,1054.02C1023.82,1054.02 1025.62,1055.81 1025.62,1058.03Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1105.42,1112.92C1105.42,1115.14 1103.62,1116.93 1101.41,1116.93C1099.19,1116.93 1097.4,1115.14 1097.4,1112.92C1097.4,1110.71 1099.19,1108.91 1101.41,1108.91C1103.62,1108.91 1105.42,1110.71 1105.42,1112.92Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1056.74,1144.05C1056.74,1146.27 1054.95,1148.06 1052.73,1148.06C1050.52,1148.06 1048.72,1146.27 1048.72,1144.05C1048.72,1141.84 1050.52,1140.04 1052.73,1140.04C1054.95,1140.04 1056.74,1141.84 1056.74,1144.05Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M947.51,902.95C947.51,905.17 945.72,906.96 943.5,906.96C941.29,906.96 939.49,905.17 939.49,902.95C939.49,900.74 941.29,898.94 943.5,898.94C945.72,898.94 947.51,900.74 947.51,902.95Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1085.61,951.63C1085.61,953.84 1083.81,955.64 1081.6,955.64C1079.38,955.64 1077.59,953.84 1077.59,951.63C1077.59,949.41 1079.38,947.61 1081.6,947.61C1083.81,947.61 1085.61,949.41 1085.61,951.63Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M22.17,952.76C22.17,954.97 20.37,956.77 18.16,956.77C15.94,956.77 14.15,954.97 14.15,952.76C14.15,950.54 15.94,948.75 18.16,948.75C20.37,948.75 22.17,950.54 22.17,952.76Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M144.98,1197.25C144.98,1199.47 143.19,1201.26 140.97,1201.26C138.76,1201.26 136.96,1199.47 136.96,1197.25C136.96,1195.04 138.76,1193.24 140.97,1193.24C143.19,1193.24 144.98,1195.04 144.98,1197.25Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M260.44,1210.27C260.44,1212.48 258.64,1214.28 256.43,1214.28C254.21,1214.28 252.42,1212.48 252.42,1210.27C252.42,1208.05 254.21,1206.26 256.43,1206.26C258.64,1206.26 260.44,1208.05 260.44,1210.27Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M481.16,1280.45C481.16,1282.66 479.37,1284.46 477.15,1284.46C474.94,1284.46 473.14,1282.66 473.14,1280.45C473.14,1278.23 474.94,1276.44 477.15,1276.44C479.37,1276.44 481.16,1278.23 481.16,1280.45Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M584.17,994.07C584.17,996.29 582.37,998.08 580.16,998.08C577.94,998.08 576.15,996.29 576.15,994.07C576.15,991.86 577.94,990.06 580.16,990.06C582.37,990.06 584.17,991.86 584.17,994.07Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M122.91,1270.26C122.91,1272.47 121.11,1274.27 118.9,1274.27C116.69,1274.27 114.89,1272.47 114.89,1270.26C114.89,1268.05 116.69,1266.25 118.9,1266.25C121.11,1266.25 122.91,1268.05 122.91,1270.26Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M8.02,665.25C8.02,667.46 6.22,669.26 4.01,669.26C1.8,669.26 -0,667.46 -0,665.25C-0,663.03 1.8,661.24 4.01,661.24C6.22,661.24 8.02,663.03 8.02,665.25Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M473.24,1082.36C473.24,1084.58 471.44,1086.37 469.23,1086.37C467.02,1086.37 465.22,1084.58 465.22,1082.36C465.22,1080.15 467.02,1078.35 469.23,1078.35C471.44,1078.35 473.24,1080.15 473.24,1082.36Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M716.6,1194.42C716.6,1196.64 714.81,1198.43 712.59,1198.43C710.38,1198.43 708.58,1196.64 708.58,1194.42C708.58,1192.21 710.38,1190.41 712.59,1190.41C714.81,1190.41 716.6,1192.21 716.6,1194.42Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M666.8,802.78C666.8,804.99 665,806.79 662.79,806.79C660.57,806.79 658.78,804.99 658.78,802.78C658.78,800.56 660.57,798.77 662.79,798.77C665,798.77 666.8,800.56 666.8,802.78Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M322.69,677.7C322.69,679.91 320.9,681.71 318.68,681.71C316.47,681.71 314.67,679.91 314.67,677.7C314.67,675.49 316.47,673.69 318.68,673.69C320.9,673.69 322.69,675.49 322.69,677.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M193.65,802.21C193.65,804.43 191.86,806.22 189.65,806.22C187.43,806.22 185.64,804.43 185.64,802.21C185.64,800 187.43,798.2 189.65,798.2C191.86,798.2 193.65,800 193.65,802.21Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M232.14,951.63C232.14,953.84 230.35,955.64 228.13,955.64C225.92,955.64 224.12,953.84 224.12,951.63C224.12,949.41 225.92,947.61 228.13,947.61C230.35,947.61 232.14,949.41 232.14,951.63Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M277.42,1062.55C277.42,1064.77 275.62,1066.56 273.41,1066.56C271.19,1066.56 269.4,1064.77 269.4,1062.55C269.4,1060.34 271.19,1058.54 273.41,1058.54C275.62,1058.54 277.42,1060.34 277.42,1062.55Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M950.91,1211.03C950.79,1210.91 950.67,1210.78 950.55,1210.66C950.26,1211.35 949.88,1211.99 949.43,1212.59L950.91,1211.03Z"
+      android:strokeWidth="1"
+      android:fillColor="#5198D9"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M949.43,1212.59L948.08,1214.01C948.19,1213.91 948.31,1213.81 948.42,1213.71C948.8,1213.36 949.13,1212.98 949.43,1212.59Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFE"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M887.83,1243.12C887.83,1244.24 886.92,1245.14 885.81,1245.14C884.69,1245.14 883.79,1244.24 883.79,1243.12C883.79,1242.01 884.69,1241.1 885.81,1241.1C886.92,1241.1 887.83,1242.01 887.83,1243.12Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M733.02,994.36C733.02,995.48 732.11,996.38 730.99,996.38C729.88,996.38 728.97,995.48 728.97,994.36C728.97,993.25 729.88,992.34 730.99,992.34C732.11,992.34 733.02,993.25 733.02,994.36Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M387.78,918.53C387.78,919.64 386.88,920.54 385.76,920.54C384.64,920.54 383.74,919.64 383.74,918.53C383.74,917.41 384.64,916.5 385.76,916.5C386.88,916.5 387.78,917.41 387.78,918.53Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M543.98,798.54C543.98,799.66 543.08,800.56 541.96,800.56C540.85,800.56 539.94,799.66 539.94,798.54C539.94,797.42 540.85,796.52 541.96,796.52C543.08,796.52 543.98,797.42 543.98,798.54Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M838.28,808.73C838.28,809.84 837.38,810.75 836.26,810.75C835.15,810.75 834.24,809.84 834.24,808.73C834.24,807.61 835.15,806.71 836.26,806.71C837.38,806.71 838.28,807.61 838.28,808.73Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M908.09,1272.45C908.09,1273.11 907.55,1273.64 906.9,1273.64C906.24,1273.64 905.71,1273.11 905.71,1272.45C905.71,1271.8 906.24,1271.27 906.9,1271.27C907.55,1271.27 908.09,1271.8 908.09,1272.45Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1077.12,1189.04C1077.12,1190.16 1076.21,1191.07 1075.08,1191.07C1073.95,1191.07 1073.04,1190.16 1073.04,1189.04C1073.04,1187.91 1073.95,1186.99 1075.08,1186.99C1076.21,1186.99 1077.12,1187.91 1077.12,1189.04Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M714.9,990.38C714.9,991.51 713.99,992.42 712.86,992.42C711.74,992.42 710.83,991.51 710.83,990.38C710.83,989.26 711.74,988.34 712.86,988.34C713.99,988.34 714.9,989.26 714.9,990.38Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M418.34,873.23C418.34,874.35 417.43,875.27 416.3,875.27C415.18,875.27 414.26,874.35 414.26,873.23C414.26,872.1 415.18,871.19 416.3,871.19C417.43,871.19 418.34,872.1 418.34,873.23Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M481.16,783.81C481.16,784.93 480.25,785.85 479.12,785.85C478,785.85 477.08,784.93 477.08,783.81C477.08,782.68 478,781.77 479.12,781.77C480.25,781.77 481.16,782.68 481.16,783.81Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M232.14,726.08C232.14,727.21 231.23,728.12 230.1,728.12C228.97,728.12 228.06,727.21 228.06,726.08C228.06,724.95 228.97,724.04 230.1,724.04C231.23,724.04 232.14,724.95 232.14,726.08Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M306.85,840.4C306.85,841.53 305.93,842.44 304.81,842.44C303.68,842.44 302.77,841.53 302.77,840.4C302.77,839.28 303.68,838.36 304.81,838.36C305.93,838.36 306.85,839.28 306.85,840.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M349.86,994.34C349.86,995.47 348.95,996.38 347.82,996.38C346.69,996.38 345.78,995.47 345.78,994.34C345.78,993.22 346.69,992.3 347.82,992.3C348.95,992.3 349.86,993.22 349.86,994.34Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M131.97,965.48C131.97,966.61 131.05,967.52 129.93,967.52C128.8,967.52 127.89,966.61 127.89,965.48C127.89,964.35 128.8,963.44 129.93,963.44C131.05,963.44 131.97,964.35 131.97,965.48Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M749.43,1098.48C749.43,1099.61 748.51,1100.52 747.39,1100.52C746.26,1100.52 745.35,1099.61 745.35,1098.48C745.35,1097.35 746.26,1096.44 747.39,1096.44C748.51,1096.44 749.43,1097.35 749.43,1098.48Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M820.74,946.8C820.74,947.93 819.83,948.84 818.7,948.84C817.57,948.84 816.66,947.93 816.66,946.8C816.66,945.68 817.57,944.76 818.7,944.76C819.83,944.76 820.74,945.68 820.74,946.8Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1017.69,1280.15C1017.69,1281.28 1016.78,1282.19 1015.65,1282.19C1014.53,1282.19 1013.61,1281.28 1013.61,1280.15C1013.61,1279.03 1014.53,1278.11 1015.65,1278.11C1016.78,1278.11 1017.69,1279.03 1017.69,1280.15Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1119,1227.52C1119,1228.65 1118.09,1229.56 1116.96,1229.56C1115.83,1229.56 1114.92,1228.65 1114.92,1227.52C1114.92,1226.39 1115.83,1225.48 1116.96,1225.48C1118.09,1225.48 1119,1226.39 1119,1227.52Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1076.13,1267.06l-3.07,1.22l3.07,1.22l1.23,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M959.55,1103.5l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M967.47,1010.68l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M904.65,965.97l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M942,1025.39l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1096.51,788.82l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1041.04,832.97l-3.07,1.22l3.07,1.22l1.23,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M963.51,728.83l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M669.77,645.07l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M505.65,760.53l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M463.76,707.32l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M440.56,709.59l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M386.79,674.5l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M121.92,875.98l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M362.46,1101.8l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M131.55,1053.13l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M51.18,776.37l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M358.5,709.59l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M687.89,689.21l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M231.15,1147.08l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M380,1209.33l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M520.36,1170.85l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M653.36,1217.82l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M82.87,959.74l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M280.39,845.42l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M358.5,1258l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M976.14,1193.7l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M835.79,1269.54l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M606.57,1276.9l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M106.26,941.85l-1.31,3.03l3.03,-1.31l3.03,1.31l-1.31,-3.03l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M9.48,1263.31l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1026.62,1234.49l-0.95,2.21l2.2,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.2,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1047.62,715.16l-0.95,2.21l2.21,-0.95l2.2,0.95l-0.95,-2.21l0.95,-2.21l-2.2,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M146.04,1282.25l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M800.29,1257.35l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M130.76,1276.02l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M6.82,1050.21l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M109.26,755.34l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M36.25,1141.89l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M91.15,1035.49l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M239.43,1030.96l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M447.14,1193.96l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M585.23,1124.91l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M499.2,1016.25l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M554.67,920.6l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M545.05,909.28l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M795.77,794.39l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M832.55,734.97l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M549.57,671.58l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1057.81,875.32l-0.95,2.21l2.2,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.2,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1115.53,909.28l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M19.27,836.27l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1094.03,1040.02l-0.95,2.21l2.21,-0.95l2.2,0.95l-0.95,-2.21l0.95,-2.21l-2.2,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M871.04,684.03l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M948.84,1253.52l-1.47,0.58l1.47,0.58l0.59,1.47l0.58,-1.47l1.47,-0.58l-1.47,-0.58l-0.58,-1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M28.77,728.1C28.77,729.21 27.86,730.12 26.74,730.12C25.63,730.12 24.72,729.21 24.72,728.1C24.72,726.98 25.63,726.08 26.74,726.08C27.86,726.08 28.77,726.98 28.77,728.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M92.35,1137.55C92.35,1138.67 91.44,1139.57 90.33,1139.57C89.21,1139.57 88.31,1138.67 88.31,1137.55C88.31,1136.44 89.21,1135.53 90.33,1135.53C91.44,1135.53 92.35,1136.44 92.35,1137.55Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M118.95,904.94C118.95,906.06 118.04,906.96 116.93,906.96C115.81,906.96 114.91,906.06 114.91,904.94C114.91,903.83 115.81,902.92 116.93,902.92C118.04,902.92 118.95,903.83 118.95,904.94Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M117.08,678.68l-1.31,3.03l3.03,-1.31l3.03,1.31l-1.31,-3.03l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M167.55,719.46l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M89.77,738.5l-1.47,0.59l1.47,0.58l0.59,1.47l0.58,-1.47l1.47,-0.58l-1.47,-0.59l-0.58,-1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1347.09,83.05C1347.09,80.84 1348.89,79.04 1351.1,79.04C1353.32,79.04 1355.11,80.84 1355.11,83.05C1355.11,85.27 1353.32,87.06 1351.1,87.06C1348.89,87.06 1347.09,85.27 1347.09,83.05Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1352.37,226.06C1352.37,223.84 1354.16,222.05 1356.38,222.05C1358.59,222.05 1360.39,223.84 1360.39,226.06C1360.39,228.27 1358.59,230.07 1356.38,230.07C1354.16,230.07 1352.37,228.27 1352.37,226.06Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1232.38,246.43C1232.38,244.22 1234.18,242.42 1236.39,242.42C1238.61,242.42 1240.4,244.22 1240.4,246.43C1240.4,248.65 1238.61,250.44 1236.39,250.44C1234.18,250.44 1232.38,248.65 1232.38,246.43Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1152.58,191.53C1152.58,189.32 1154.38,187.52 1156.59,187.52C1158.81,187.52 1160.6,189.32 1160.6,191.53C1160.6,193.75 1158.81,195.54 1156.59,195.54C1154.38,195.54 1152.58,193.75 1152.58,191.53Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1201.26,160.41C1201.26,158.19 1203.05,156.4 1205.27,156.4C1207.48,156.4 1209.28,158.19 1209.28,160.41C1209.28,162.62 1207.48,164.42 1205.27,164.42C1203.05,164.42 1201.26,162.62 1201.26,160.41Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1310.49,401.51C1310.49,399.29 1312.28,397.49 1314.5,397.49C1316.71,397.49 1318.51,399.29 1318.51,401.51C1318.51,403.72 1316.71,405.52 1314.5,405.52C1312.28,405.52 1310.49,403.72 1310.49,401.51Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1172.39,352.83C1172.39,350.62 1174.19,348.82 1176.4,348.82C1178.62,348.82 1180.41,350.62 1180.41,352.83C1180.41,355.05 1178.62,356.84 1176.4,356.84C1174.19,356.84 1172.39,355.05 1172.39,352.83Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2235.83,351.7C2235.83,349.49 2237.63,347.69 2239.84,347.69C2242.06,347.69 2243.85,349.49 2243.85,351.7C2243.85,353.92 2242.06,355.71 2239.84,355.71C2237.63,355.71 2235.83,353.92 2235.83,351.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2113.02,107.21C2113.02,104.99 2114.81,103.2 2117.03,103.2C2119.24,103.2 2121.04,104.99 2121.04,107.21C2121.04,109.42 2119.24,111.22 2117.03,111.22C2114.81,111.22 2113.02,109.42 2113.02,107.21Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1997.56,94.19C1997.56,91.97 1999.36,90.18 2001.57,90.18C2003.79,90.18 2005.58,91.97 2005.58,94.19C2005.58,96.4 2003.79,98.2 2001.57,98.2C1999.36,98.2 1997.56,96.4 1997.56,94.19Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1776.84,24.01C1776.84,21.8 1778.63,20 1780.85,20C1783.06,20 1784.86,21.8 1784.86,24.01C1784.86,26.22 1783.06,28.02 1780.85,28.02C1778.63,28.02 1776.84,26.22 1776.84,24.01Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1673.83,310.39C1673.83,308.17 1675.63,306.38 1677.84,306.38C1680.06,306.38 1681.85,308.17 1681.85,310.39C1681.85,312.6 1680.06,314.4 1677.84,314.4C1675.63,314.4 1673.83,312.6 1673.83,310.39Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2135.09,34.2C2135.09,31.98 2136.89,30.19 2139.1,30.19C2141.31,30.19 2143.11,31.98 2143.11,34.2C2143.11,36.41 2141.31,38.21 2139.1,38.21C2136.89,38.21 2135.09,36.41 2135.09,34.2Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2249.98,639.21C2249.98,636.99 2251.78,635.2 2253.99,635.2C2256.2,635.2 2258,636.99 2258,639.21C2258,641.42 2256.2,643.22 2253.99,643.22C2251.78,643.22 2249.98,641.42 2249.98,639.21Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1784.76,222.1C1784.76,219.88 1786.56,218.09 1788.77,218.09C1790.98,218.09 1792.78,219.88 1792.78,222.1C1792.78,224.31 1790.98,226.11 1788.77,226.11C1786.56,226.11 1784.76,224.31 1784.76,222.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1541.4,110.04C1541.4,107.82 1543.19,106.03 1545.41,106.03C1547.62,106.03 1549.42,107.82 1549.42,110.04C1549.42,112.25 1547.62,114.05 1545.41,114.05C1543.19,114.05 1541.4,112.25 1541.4,110.04Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1591.2,501.68C1591.2,499.47 1593,497.67 1595.21,497.67C1597.43,497.67 1599.22,499.47 1599.22,501.68C1599.22,503.89 1597.43,505.69 1595.21,505.69C1593,505.69 1591.2,503.89 1591.2,501.68Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1935.31,626.76C1935.31,624.54 1937.1,622.75 1939.32,622.75C1941.53,622.75 1943.33,624.54 1943.33,626.76C1943.33,628.97 1941.53,630.77 1939.32,630.77C1937.1,630.77 1935.31,628.97 1935.31,626.76Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2064.34,502.25C2064.34,500.03 2066.14,498.24 2068.35,498.24C2070.57,498.24 2072.36,500.03 2072.36,502.25C2072.36,504.46 2070.57,506.26 2068.35,506.26C2066.14,506.26 2064.34,504.46 2064.34,502.25Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2025.86,352.83C2025.86,350.62 2027.66,348.82 2029.87,348.82C2032.08,348.82 2033.88,350.62 2033.88,352.83C2033.88,355.05 2032.08,356.84 2029.87,356.84C2027.66,356.84 2025.86,355.05 2025.86,352.83Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1980.58,241.9C1980.58,239.69 1982.38,237.9 1984.59,237.9C1986.81,237.9 1988.6,239.69 1988.6,241.9C1988.6,244.12 1986.81,245.91 1984.59,245.91C1982.38,245.91 1980.58,244.12 1980.58,241.9Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1307.09,93.43C1307.21,93.55 1307.33,93.68 1307.45,93.8C1307.74,93.11 1308.12,92.47 1308.57,91.87L1307.09,93.43Z"
+      android:strokeWidth="1"
+      android:fillColor="#5198D9"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1308.57,91.87L1309.92,90.45C1309.81,90.55 1309.69,90.65 1309.58,90.75C1309.2,91.1 1308.87,91.47 1308.57,91.87Z"
+      android:strokeWidth="1"
+      android:fillColor="#FFFFFE"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1370.17,61.34C1370.17,60.22 1371.07,59.31 1372.19,59.31C1373.31,59.31 1374.21,60.22 1374.21,61.34C1374.21,62.45 1373.31,63.36 1372.19,63.36C1371.07,63.36 1370.17,62.45 1370.17,61.34Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1524.98,310.09C1524.98,308.98 1525.89,308.07 1527.01,308.07C1528.12,308.07 1529.03,308.98 1529.03,310.09C1529.03,311.21 1528.12,312.11 1527.01,312.11C1525.89,312.11 1524.98,311.21 1524.98,310.09Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1870.22,385.93C1870.22,384.82 1871.13,383.91 1872.24,383.91C1873.36,383.91 1874.26,384.82 1874.26,385.93C1874.26,387.05 1873.36,387.95 1872.24,387.95C1871.13,387.95 1870.22,387.05 1870.22,385.93Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1714.02,505.92C1714.02,504.8 1714.92,503.9 1716.04,503.9C1717.15,503.9 1718.06,504.8 1718.06,505.92C1718.06,507.03 1717.15,507.94 1716.04,507.94C1714.92,507.94 1714.02,507.03 1714.02,505.92Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1419.72,495.73C1419.72,494.61 1420.62,493.71 1421.74,493.71C1422.85,493.71 1423.76,494.61 1423.76,495.73C1423.76,496.85 1422.85,497.75 1421.74,497.75C1420.62,497.75 1419.72,496.85 1419.72,495.73Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1349.92,32C1349.92,31.35 1350.45,30.82 1351.1,30.82C1351.76,30.82 1352.29,31.35 1352.29,32C1352.29,32.66 1351.76,33.19 1351.1,33.19C1350.45,33.19 1349.92,32.66 1349.92,32Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1180.88,115.42C1180.88,114.3 1181.79,113.38 1182.92,113.38C1184.05,113.38 1184.96,114.3 1184.96,115.42C1184.96,116.55 1184.05,117.46 1182.92,117.46C1181.79,117.46 1180.88,116.55 1180.88,115.42Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1543.1,314.08C1543.1,312.95 1544.01,312.04 1545.14,312.04C1546.26,312.04 1547.18,312.95 1547.18,314.08C1547.18,315.2 1546.26,316.11 1545.14,316.11C1544.01,316.11 1543.1,315.2 1543.1,314.08Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1839.66,431.23C1839.66,430.1 1840.57,429.19 1841.7,429.19C1842.82,429.19 1843.74,430.1 1843.74,431.23C1843.74,432.36 1842.82,433.27 1841.7,433.27C1840.57,433.27 1839.66,432.36 1839.66,431.23Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1776.84,520.65C1776.84,519.53 1777.75,518.61 1778.88,518.61C1780,518.61 1780.92,519.53 1780.92,520.65C1780.92,521.78 1780,522.69 1778.88,522.69C1777.75,522.69 1776.84,521.78 1776.84,520.65Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2025.86,578.38C2025.86,577.25 2026.77,576.34 2027.9,576.34C2029.03,576.34 2029.94,577.25 2029.94,578.38C2029.94,579.51 2029.03,580.42 2027.9,580.42C2026.77,580.42 2025.86,579.51 2025.86,578.38Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1951.15,464.05C1951.15,462.93 1952.07,462.02 1953.19,462.02C1954.32,462.02 1955.23,462.93 1955.23,464.05C1955.23,465.18 1954.32,466.1 1953.19,466.1C1952.07,466.1 1951.15,465.18 1951.15,464.05Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1908.14,310.11C1908.14,308.99 1909.05,308.07 1910.18,308.07C1911.31,308.07 1912.22,308.99 1912.22,310.11C1912.22,311.24 1911.31,312.15 1910.18,312.15C1909.05,312.15 1908.14,311.24 1908.14,310.11Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2126.03,338.98C2126.03,337.85 2126.95,336.94 2128.07,336.94C2129.2,336.94 2130.11,337.85 2130.11,338.98C2130.11,340.1 2129.2,341.02 2128.07,341.02C2126.95,341.02 2126.03,340.1 2126.03,338.98Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1508.57,205.98C1508.57,204.85 1509.49,203.94 1510.61,203.94C1511.74,203.94 1512.65,204.85 1512.65,205.98C1512.65,207.1 1511.74,208.02 1510.61,208.02C1509.49,208.02 1508.57,207.1 1508.57,205.98Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1437.26,357.65C1437.26,356.53 1438.18,355.61 1439.3,355.61C1440.43,355.61 1441.34,356.53 1441.34,357.65C1441.34,358.78 1440.43,359.69 1439.3,359.69C1438.18,359.69 1437.26,358.78 1437.26,357.65Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1240.31,24.3C1240.31,23.18 1241.22,22.26 1242.35,22.26C1243.47,22.26 1244.39,23.18 1244.39,24.3C1244.39,25.43 1243.47,26.34 1242.35,26.34C1241.22,26.34 1240.31,25.43 1240.31,24.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1139,76.94C1139,75.81 1139.91,74.9 1141.04,74.9C1142.17,74.9 1143.08,75.81 1143.08,76.94C1143.08,78.06 1142.17,78.98 1141.04,78.98C1139.91,78.98 1139,78.06 1139,76.94Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1181.87,37.4l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1298.45,200.96l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1290.53,293.78l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1353.35,338.49l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1316,279.06l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1161.49,515.64l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1216.96,471.49l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1294.49,575.63l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1588.23,659.39l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1752.35,543.93l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1794.24,597.13l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1817.44,594.87l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1871.21,629.96l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2136.08,428.48l3.06,-1.22l-3.06,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1895.54,202.66l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2126.45,251.33l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2206.82,528.09l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1899.5,594.87l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1570.11,615.24l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2026.84,157.38l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1878,95.13l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1737.64,133.61l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1604.64,86.64l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2175.13,344.71l3.07,-1.22l-3.07,-1.22l-1.23,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1977.61,459.04l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1899.5,46.45l3.07,-1.22l-3.07,-1.22l-1.22,-3.07l-1.22,3.07l-3.07,1.22l3.07,1.22l1.22,3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1281.86,110.76l1.31,-3.03l-3.03,1.31l-3.04,-1.31l1.31,3.03l-1.31,3.03l3.04,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1422.21,34.92l1.31,-3.03l-3.03,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1651.43,27.56l1.31,-3.03l-3.03,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2151.74,362.61l1.3,-3.04l-3.03,1.31l-3.03,-1.31l1.3,3.04l-1.3,3.03l3.03,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2248.52,41.15l1.3,-3.03l-3.03,1.31l-3.04,-1.31l1.31,3.03l-1.31,3.03l3.04,-1.31l3.03,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1231.38,69.97l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1210.38,589.3l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2111.96,22.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1457.7,47.11l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2127.24,28.43l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2251.18,254.25l0.95,-2.21l-2.21,0.95l-2.2,-0.95l0.95,2.21l-0.95,2.21l2.2,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2148.74,549.12l0.95,-2.21l-2.2,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.2,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2221.75,162.57l0.95,-2.21l-2.21,0.95l-2.2,-0.95l0.95,2.21l-0.95,2.21l2.2,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2166.85,268.97l0.95,-2.21l-2.2,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.2,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2018.57,273.49l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1810.86,110.5l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1672.77,179.54l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1758.8,288.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1703.33,383.86l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1712.95,395.18l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1462.23,510.07l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1425.45,569.49l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1708.43,632.88l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1200.19,429.13l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1142.47,395.18l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2238.73,468.18l0.95,-2.21l-2.21,0.95l-2.2,-0.95l0.95,2.21l-0.95,2.21l2.2,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1163.97,264.44l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1386.96,620.43l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1309.16,50.94l1.47,-0.59l-1.47,-0.58l-0.58,-1.47l-0.58,1.47l-1.47,0.58l1.47,0.59l0.58,1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2229.23,576.36C2229.23,575.24 2230.14,574.34 2231.26,574.34C2232.37,574.34 2233.28,575.24 2233.28,576.36C2233.28,577.47 2232.37,578.38 2231.26,578.38C2230.14,578.38 2229.23,577.47 2229.23,576.36Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2165.65,166.91C2165.65,165.79 2166.56,164.89 2167.67,164.89C2168.79,164.89 2169.69,165.79 2169.69,166.91C2169.69,168.02 2168.79,168.93 2167.67,168.93C2166.56,168.93 2165.65,168.02 2165.65,166.91Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2139.05,399.52C2139.05,398.4 2139.96,397.49 2141.07,397.49C2142.19,397.49 2143.09,398.4 2143.09,399.52C2143.09,400.63 2142.19,401.54 2141.07,401.54C2139.96,401.54 2139.05,400.63 2139.05,399.52Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2140.92,625.78l1.31,-3.03l-3.04,1.31l-3.03,-1.31l1.31,3.03l-1.31,3.04l3.03,-1.31l3.04,1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2090.45,585l0.95,-2.21l-2.21,0.95l-2.21,-0.95l0.95,2.21l-0.95,2.21l2.21,-0.95l2.21,0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2168.23,565.96l1.47,-0.59l-1.47,-0.58l-0.59,-1.47l-0.58,1.47l-1.47,0.58l1.47,0.59l0.58,1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2049.91,1241.4C2049.91,1243.62 2048.11,1245.41 2045.9,1245.41C2043.68,1245.41 2041.89,1243.62 2041.89,1241.4C2041.89,1239.19 2043.68,1237.39 2045.9,1237.39C2048.11,1237.39 2049.91,1239.19 2049.91,1241.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2044.63,1098.4C2044.63,1100.61 2042.84,1102.41 2040.62,1102.41C2038.41,1102.41 2036.61,1100.61 2036.61,1098.4C2036.61,1096.19 2038.41,1094.39 2040.62,1094.39C2042.84,1094.39 2044.63,1096.19 2044.63,1098.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2164.62,1078.03C2164.62,1080.24 2162.82,1082.04 2160.61,1082.04C2158.39,1082.04 2156.6,1080.24 2156.6,1078.03C2156.6,1075.81 2158.39,1074.02 2160.61,1074.02C2162.82,1074.02 2164.62,1075.81 2164.62,1078.03Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2244.42,1132.92C2244.42,1135.14 2242.62,1136.93 2240.41,1136.93C2238.19,1136.93 2236.4,1135.14 2236.4,1132.92C2236.4,1130.71 2238.19,1128.91 2240.41,1128.91C2242.62,1128.91 2244.42,1130.71 2244.42,1132.92Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2195.74,1164.05C2195.74,1166.27 2193.95,1168.06 2191.73,1168.06C2189.52,1168.06 2187.72,1166.27 2187.72,1164.05C2187.72,1161.84 2189.52,1160.04 2191.73,1160.04C2193.95,1160.04 2195.74,1161.84 2195.74,1164.05Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2086.51,922.95C2086.51,925.17 2084.72,926.96 2082.5,926.96C2080.29,926.96 2078.49,925.17 2078.49,922.95C2078.49,920.74 2080.29,918.94 2082.5,918.94C2084.72,918.94 2086.51,920.74 2086.51,922.95Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2224.61,971.63C2224.61,973.84 2222.81,975.64 2220.6,975.64C2218.38,975.64 2216.59,973.84 2216.59,971.63C2216.59,969.41 2218.38,967.61 2220.6,967.61C2222.81,967.61 2224.61,969.41 2224.61,971.63Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1161.17,972.76C1161.17,974.97 1159.37,976.77 1157.16,976.77C1154.94,976.77 1153.15,974.97 1153.15,972.76C1153.15,970.54 1154.94,968.75 1157.16,968.75C1159.37,968.75 1161.17,970.54 1161.17,972.76Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1283.98,1217.25C1283.98,1219.47 1282.19,1221.26 1279.97,1221.26C1277.76,1221.26 1275.96,1219.47 1275.96,1217.25C1275.96,1215.04 1277.76,1213.24 1279.97,1213.24C1282.19,1213.24 1283.98,1215.04 1283.98,1217.25Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1399.44,1230.27C1399.44,1232.48 1397.64,1234.28 1395.43,1234.28C1393.21,1234.28 1391.42,1232.48 1391.42,1230.27C1391.42,1228.05 1393.21,1226.26 1395.43,1226.26C1397.64,1226.26 1399.44,1228.05 1399.44,1230.27Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1620.16,1300.45C1620.16,1302.66 1618.37,1304.46 1616.15,1304.46C1613.94,1304.46 1612.14,1302.66 1612.14,1300.45C1612.14,1298.23 1613.94,1296.44 1616.15,1296.44C1618.37,1296.44 1620.16,1298.23 1620.16,1300.45Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1723.17,1014.07C1723.17,1016.29 1721.37,1018.08 1719.16,1018.08C1716.94,1018.08 1715.15,1016.29 1715.15,1014.07C1715.15,1011.86 1716.94,1010.06 1719.16,1010.06C1721.37,1010.06 1723.17,1011.86 1723.17,1014.07Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1261.91,1290.26C1261.91,1292.47 1260.11,1294.27 1257.9,1294.27C1255.69,1294.27 1253.89,1292.47 1253.89,1290.26C1253.89,1288.05 1255.69,1286.25 1257.9,1286.25C1260.11,1286.25 1261.91,1288.05 1261.91,1290.26Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1147.02,685.25C1147.02,687.46 1145.22,689.26 1143.01,689.26C1140.8,689.26 1139,687.46 1139,685.25C1139,683.03 1140.8,681.24 1143.01,681.24C1145.22,681.24 1147.02,683.03 1147.02,685.25Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1612.24,1102.36C1612.24,1104.58 1610.44,1106.37 1608.23,1106.37C1606.02,1106.37 1604.22,1104.58 1604.22,1102.36C1604.22,1100.15 1606.02,1098.35 1608.23,1098.35C1610.44,1098.35 1612.24,1100.15 1612.24,1102.36Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1855.6,1214.42C1855.6,1216.64 1853.81,1218.43 1851.59,1218.43C1849.38,1218.43 1847.58,1216.64 1847.58,1214.42C1847.58,1212.21 1849.38,1210.41 1851.59,1210.41C1853.81,1210.41 1855.6,1212.21 1855.6,1214.42Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1805.8,822.78C1805.8,824.99 1804,826.79 1801.79,826.79C1799.57,826.79 1797.78,824.99 1797.78,822.78C1797.78,820.56 1799.57,818.77 1801.79,818.77C1804,818.77 1805.8,820.56 1805.8,822.78Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1461.69,697.7C1461.69,699.91 1459.9,701.71 1457.68,701.71C1455.47,701.71 1453.67,699.91 1453.67,697.7C1453.67,695.49 1455.47,693.69 1457.68,693.69C1459.9,693.69 1461.69,695.49 1461.69,697.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1332.66,822.21C1332.66,824.43 1330.86,826.22 1328.65,826.22C1326.43,826.22 1324.64,824.43 1324.64,822.21C1324.64,820 1326.43,818.2 1328.65,818.2C1330.86,818.2 1332.66,820 1332.66,822.21Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1371.14,971.63C1371.14,973.84 1369.34,975.64 1367.13,975.64C1364.92,975.64 1363.12,973.84 1363.12,971.63C1363.12,969.41 1364.92,967.61 1367.13,967.61C1369.34,967.61 1371.14,969.41 1371.14,971.63Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1416.42,1082.55C1416.42,1084.77 1414.62,1086.56 1412.41,1086.56C1410.19,1086.56 1408.4,1084.77 1408.4,1082.55C1408.4,1080.34 1410.19,1078.54 1412.41,1078.54C1414.62,1078.54 1416.42,1080.34 1416.42,1082.55Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2089.91,1231.03C2089.79,1230.91 2089.67,1230.78 2089.55,1230.66C2089.26,1231.35 2088.88,1231.99 2088.43,1232.59L2089.91,1231.03Z"
+      android:strokeWidth="1"
+      android:fillColor="#5198D9"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2088.43,1232.59L2087.08,1234.01C2087.19,1233.91 2087.31,1233.81 2087.42,1233.71C2087.8,1233.36 2088.13,1232.98 2088.43,1232.59Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2026.83,1263.12C2026.83,1264.24 2025.93,1265.14 2024.81,1265.14C2023.69,1265.14 2022.79,1264.24 2022.79,1263.12C2022.79,1262.01 2023.69,1261.1 2024.81,1261.1C2025.93,1261.1 2026.83,1262.01 2026.83,1263.12Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1872.02,1014.36C1872.02,1015.48 1871.11,1016.38 1869.99,1016.38C1868.88,1016.38 1867.97,1015.48 1867.97,1014.36C1867.97,1013.25 1868.88,1012.34 1869.99,1012.34C1871.11,1012.34 1872.02,1013.25 1872.02,1014.36Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1526.78,938.53C1526.78,939.64 1525.88,940.54 1524.76,940.54C1523.64,940.54 1522.74,939.64 1522.74,938.53C1522.74,937.41 1523.64,936.5 1524.76,936.5C1525.88,936.5 1526.78,937.41 1526.78,938.53Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1682.98,818.54C1682.98,819.66 1682.08,820.56 1680.96,820.56C1679.85,820.56 1678.94,819.66 1678.94,818.54C1678.94,817.42 1679.85,816.52 1680.96,816.52C1682.08,816.52 1682.98,817.42 1682.98,818.54Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1977.28,828.73C1977.28,829.84 1976.38,830.75 1975.26,830.75C1974.15,830.75 1973.24,829.84 1973.24,828.73C1973.24,827.61 1974.15,826.71 1975.26,826.71C1976.38,826.71 1977.28,827.61 1977.28,828.73Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2047.08,1292.45C2047.08,1293.11 2046.55,1293.64 2045.9,1293.64C2045.24,1293.64 2044.71,1293.11 2044.71,1292.45C2044.71,1291.8 2045.24,1291.27 2045.9,1291.27C2046.55,1291.27 2047.08,1291.8 2047.08,1292.45Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2216.12,1209.04C2216.12,1210.16 2215.21,1211.07 2214.08,1211.07C2212.95,1211.07 2212.04,1210.16 2212.04,1209.04C2212.04,1207.91 2212.95,1206.99 2214.08,1206.99C2215.21,1206.99 2216.12,1207.91 2216.12,1209.04Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1853.9,1010.38C1853.9,1011.51 1852.99,1012.42 1851.86,1012.42C1850.74,1012.42 1849.82,1011.51 1849.82,1010.38C1849.82,1009.26 1850.74,1008.34 1851.86,1008.34C1852.99,1008.34 1853.9,1009.26 1853.9,1010.38Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1557.34,893.23C1557.34,894.35 1556.43,895.27 1555.3,895.27C1554.18,895.27 1553.26,894.35 1553.26,893.23C1553.26,892.1 1554.18,891.19 1555.3,891.19C1556.43,891.19 1557.34,892.1 1557.34,893.23Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1620.16,803.81C1620.16,804.93 1619.25,805.85 1618.12,805.85C1617,805.85 1616.08,804.93 1616.08,803.81C1616.08,802.68 1617,801.77 1618.12,801.77C1619.25,801.77 1620.16,802.68 1620.16,803.81Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1371.14,746.08C1371.14,747.21 1370.23,748.12 1369.1,748.12C1367.97,748.12 1367.06,747.21 1367.06,746.08C1367.06,744.95 1367.97,744.04 1369.1,744.04C1370.23,744.04 1371.14,744.95 1371.14,746.08Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1445.85,860.4C1445.85,861.53 1444.93,862.44 1443.81,862.44C1442.68,862.44 1441.77,861.53 1441.77,860.4C1441.77,859.28 1442.68,858.36 1443.81,858.36C1444.93,858.36 1445.85,859.28 1445.85,860.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1488.86,1014.34C1488.86,1015.47 1487.95,1016.38 1486.82,1016.38C1485.69,1016.38 1484.78,1015.47 1484.78,1014.34C1484.78,1013.22 1485.69,1012.3 1486.82,1012.3C1487.95,1012.3 1488.86,1013.22 1488.86,1014.34Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1270.96,985.48C1270.96,986.61 1270.05,987.52 1268.93,987.52C1267.8,987.52 1266.89,986.61 1266.89,985.48C1266.89,984.35 1267.8,983.44 1268.93,983.44C1270.05,983.44 1270.96,984.35 1270.96,985.48Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1888.43,1118.48C1888.43,1119.61 1887.51,1120.52 1886.39,1120.52C1885.26,1120.52 1884.35,1119.61 1884.35,1118.48C1884.35,1117.35 1885.26,1116.44 1886.39,1116.44C1887.51,1116.44 1888.43,1117.35 1888.43,1118.48Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1959.74,966.8C1959.74,967.93 1958.82,968.84 1957.7,968.84C1956.57,968.84 1955.66,967.93 1955.66,966.8C1955.66,965.68 1956.57,964.76 1957.7,964.76C1958.82,964.76 1959.74,965.68 1959.74,966.8Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2156.69,1300.15C2156.69,1301.28 2155.78,1302.19 2154.65,1302.19C2153.53,1302.19 2152.61,1301.28 2152.61,1300.15C2152.61,1299.03 2153.53,1298.11 2154.65,1298.11C2155.78,1298.11 2156.69,1299.03 2156.69,1300.15Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2258,1247.52C2258,1248.65 2257.09,1249.56 2255.96,1249.56C2254.83,1249.56 2253.92,1248.65 2253.92,1247.52C2253.92,1246.39 2254.83,1245.48 2255.96,1245.48C2257.09,1245.48 2258,1246.39 2258,1247.52Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2215.13,1287.06l-3.07,1.22l3.07,1.22l1.23,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2098.55,1123.5l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2106.47,1030.68l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2043.65,985.97l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2081,1045.39l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2235.51,808.82l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2180.04,852.97l-3.07,1.22l3.07,1.22l1.23,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2102.51,748.83l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1808.77,665.07l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1644.65,780.53l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1602.76,727.32l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1579.56,729.59l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1525.79,694.5l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1260.92,895.98l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1501.46,1121.8l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1270.55,1073.13l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1190.18,796.37l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1497.5,729.59l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1826.89,709.21l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1370.16,1167.08l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1519,1229.33l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1659.36,1190.85l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1792.36,1237.82l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1221.87,979.74l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1419.39,865.42l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1497.5,1278l-3.07,1.22l3.07,1.22l1.22,3.07l1.22,-3.07l3.07,-1.22l-3.07,-1.22l-1.22,-3.07z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2115.14,1213.7l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1974.79,1289.54l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1745.57,1296.9l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1245.26,961.85l-1.31,3.03l3.03,-1.31l3.04,1.31l-1.31,-3.03l1.31,-3.03l-3.04,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1148.48,1283.31l-1.31,3.04l3.03,-1.31l3.03,1.31l-1.31,-3.04l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2165.62,1254.49l-0.95,2.21l2.2,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.2,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2186.62,735.16l-0.95,2.21l2.21,-0.95l2.2,0.95l-0.95,-2.21l0.95,-2.21l-2.2,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1285.04,1302.25l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1939.3,1277.35l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1269.76,1296.02l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1248.26,775.34l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1230.15,1055.49l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1378.43,1050.96l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1586.14,1213.96l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1724.23,1144.91l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1638.2,1036.25l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1693.67,940.6l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1684.05,929.28l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1934.77,814.39l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1971.55,754.97l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1688.57,691.58l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2196.81,895.32l-0.95,2.21l2.2,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.2,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2254.53,929.28l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1158.27,856.27l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2233.03,1060.02l-0.95,2.21l2.21,-0.95l2.2,0.95l-0.95,-2.21l0.95,-2.21l-2.2,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2010.04,704.03l-0.95,2.21l2.21,-0.95l2.21,0.95l-0.95,-2.21l0.95,-2.21l-2.21,0.95l-2.21,-0.95z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2087.84,1273.52l-1.47,0.58l1.47,0.58l0.58,1.47l0.59,-1.47l1.47,-0.58l-1.47,-0.58l-0.59,-1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1167.77,748.1C1167.77,749.21 1166.86,750.12 1165.74,750.12C1164.63,750.12 1163.72,749.21 1163.72,748.1C1163.72,746.98 1164.63,746.08 1165.74,746.08C1166.86,746.08 1167.77,746.98 1167.77,748.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1231.35,1157.55C1231.35,1158.67 1230.44,1159.57 1229.33,1159.57C1228.21,1159.57 1227.31,1158.67 1227.31,1157.55C1227.31,1156.44 1228.21,1155.53 1229.33,1155.53C1230.44,1155.53 1231.35,1156.44 1231.35,1157.55Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1257.95,924.94C1257.95,926.06 1257.04,926.96 1255.93,926.96C1254.81,926.96 1253.91,926.06 1253.91,924.94C1253.91,923.83 1254.81,922.92 1255.93,922.92C1257.04,922.92 1257.95,923.83 1257.95,924.94Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/blue_60"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1256.08,698.68l-1.31,3.03l3.03,-1.31l3.03,1.31l-1.31,-3.03l1.31,-3.03l-3.03,1.31l-3.03,-1.31z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M1228.77,758.5l-1.47,0.59l1.47,0.58l0.59,1.47l0.58,-1.47l1.47,-0.58l-1.47,-0.59l-0.58,-1.47z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpack/res/drawable/ic_app_white_24dp.xml b/WordPress/src/jetpack/res/drawable/ic_app_white_24dp.xml
new file mode 100644
index 000000000000..11cdb5412e49
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/ic_app_white_24dp.xml
@@ -0,0 +1,14 @@
+<!-- This asset is a copy of ic_plans_white_24dp from WordPress. It is the jetpack grid icon -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="UnusedResources">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zm-1 12H6l5-10v10zm2 6V10h5l-5 10z" />
+</vector>
diff --git a/WordPress/src/jetpack/res/drawable/ic_my_sites_white_24dp.xml b/WordPress/src/jetpack/res/drawable/ic_my_sites_white_24dp.xml
new file mode 100644
index 000000000000..905fbac6e155
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/ic_my_sites_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M22,9L12,1 2,9v2h2v10h5v-4c0,-1.657 1.343,-3 3,-3s3,1.343 3,3v4h5V11h2V9z"/>
+</vector>
diff --git a/WordPress/src/jetpack/res/drawable/img_jetpack_horizontal_white.xml b/WordPress/src/jetpack/res/drawable/img_jetpack_horizontal_white.xml
new file mode 100644
index 000000000000..4a42e0c35214
--- /dev/null
+++ b/WordPress/src/jetpack/res/drawable/img_jetpack_horizontal_white.xml
@@ -0,0 +1,60 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="386dp"
+    android:height="105dp"
+    android:viewportWidth="386"
+    android:viewportHeight="105">
+  <path
+      android:pathData="M52,50.5m-47.5,0a47.5,47.5 0,1 1,95 0a47.5,47.5 0,1 1,-95 0"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M52.4,0C23.5,0 0,23.5 0,52.4C0,81.3 23.5,104.8 52.4,104.8C81.3,104.8 104.8,81.3 104.8,52.4C104.8,23.5 81.3,0 52.4,0ZM49.7,61.1L23.6,61.1L49.7,10.3L49.7,61.1ZM55,94.4L55,43.6L81.1,43.6L55,94.4Z"
+      android:strokeWidth="1"
+      android:fillColor="#2EA948"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M135.3,87C133.8,84.7 132.4,82.4 131,80.2C138.4,75.7 140.9,72.1 140.9,65.3L140.9,26L132.2,26L132.2,18.5L150.7,18.5L150.7,63.3C150.7,74.7 147.4,81.1 135.3,87Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M212.8,60.2C212.8,64 215.5,64.4 217.3,64.4C219.1,64.4 221.7,63.8 223.7,63.2L223.7,70.2C220.9,71.1 218,71.8 214,71.8C209.2,71.8 203.6,70 203.6,61.6L203.6,41L198.5,41L198.5,33.9L203.6,33.9L203.6,23.4L212.8,23.4L212.8,33.9L224.4,33.9L224.4,41L212.8,41L212.8,60.2Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M232,90.5L232,33.8L240.8,33.8L240.8,37.2C244.3,34.5 248.2,32.8 253,32.8C261.3,32.8 267.9,38.6 267.9,51.1C267.9,63.5 260.7,71.7 248.8,71.7C245.9,71.7 243.6,71.3 241.2,70.8L241.2,90.4L232,90.4L232,90.5ZM250.6,40.4C247.9,40.4 244.5,41.7 241.3,44.5L241.3,63.8C243.3,64.2 245.4,64.5 248.2,64.5C254.7,64.5 258.4,60.4 258.4,51.8C258.4,43.9 255.7,40.4 250.6,40.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M304.1,70.9L295.5,70.9L295.5,66.8L295.3,66.8C292.3,69.1 288.6,71.6 283.1,71.6C278.3,71.6 273.1,68.1 273.1,61C273.1,51.5 281.2,49.7 286.9,48.9L295,47.8L295,46.7C295,41.7 293,40.1 288.3,40.1C286,40.1 280.6,40.8 276.2,42.6L275.4,35.2C279.4,33.8 284.9,32.8 289.5,32.8C298.5,32.8 304.3,36.4 304.3,47.1L304.3,70.9L304.1,70.9ZM294.9,53.6L287.3,54.8C285,55.1 282.6,56.5 282.6,59.9C282.6,62.9 284.3,64.6 286.8,64.6C289.5,64.6 292.4,63 294.9,61.2L294.9,53.6Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M342.1,69.7C338.3,71 334.9,71.8 330.6,71.8C316.8,71.8 311.3,63.9 311.3,52.4C311.3,40.3 318.9,32.8 331.2,32.8C335.8,32.8 338.6,33.6 341.7,34.6L341.7,42.4C339,41.4 335.1,40.3 331.3,40.3C325.7,40.3 320.9,43.3 320.9,51.9C320.9,61.4 325.7,64.3 331.8,64.3C334.7,64.3 337.9,63.7 342.2,62L342.2,69.7L342.1,69.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M359.5,49.8C360.3,48.9 360.9,48 372.5,33.9L384.5,33.9L369.5,51.5L385.9,71L373.9,71L359.6,53.4L359.6,71L350.4,71L350.4,18.5L359.6,18.5L359.6,49.8L359.5,49.8Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M191.6,69.7C186.8,71.2 182.7,71.8 177.9,71.8C166.1,71.8 158.8,65.9 158.8,52.1C158.8,42 165,32.8 176.9,32.8C188.7,32.8 192.8,41 192.8,48.8C192.8,51.4 192.6,52.8 192.5,54.3L168.7,54.3C168.9,62.4 173.5,64.3 180.4,64.3C184.2,64.3 187.6,63.4 191.5,62L191.5,69.7L191.6,69.7ZM183.2,48.2C183.2,43.7 181.7,39.8 176.8,39.8C172.2,39.8 169.4,43.1 168.8,48.2L183.2,48.2Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpack/res/layout/jetpack_login_prologue_screen.xml b/WordPress/src/jetpack/res/layout/jetpack_login_prologue_screen.xml
new file mode 100644
index 000000000000..a4295488322b
--- /dev/null
+++ b/WordPress/src/jetpack/res/layout/jetpack_login_prologue_screen.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/wordpress_blue_90">
+
+    <ImageView
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:contentDescription="@null"
+        android:scaleType="centerCrop"
+        android:src="@drawable/bg_stars_background_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:background="@drawable/bg_rectangle_blue_90_gradient"
+        app:layout_constraintBottom_toTopOf="@id/bottom_buttons"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/app_logo"
+        android:layout_width="0dp"
+        android:layout_height="40dp"
+        android:contentDescription="@null"
+        android:src="@drawable/img_jetpack_horizontal_white"
+        app:layout_constraintBottom_toTopOf="@id/app_tagline"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/app_tagline"
+        style="@style/Widget.LoginFlow.TextAppTagLine.Prologue"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/login_prologue_tagline_start_end_padding"
+        android:layout_marginStart="@dimen/login_prologue_tagline_start_end_padding"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:layout_marginBottom="@dimen/margin_extra_large"
+        android:text="@string/app_tagline"
+        app:layout_constraintBottom_toTopOf="@id/bottom_buttons"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/app_logo" />
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/bottom_buttons"
+        style="@style/Widget.LoginFlow.CardView.BottomBar.Prologue"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="0dp"
+        app:cardElevation="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <include
+            android:id="@+id/bottom_buttons_container"
+            layout="@layout/login_prologue_bottom_buttons_container" />
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/jetpack/res/mipmap-anydpi-v26/app_icon.xml b/WordPress/src/jetpack/res/mipmap-anydpi-v26/app_icon.xml
new file mode 100644
index 000000000000..837699140399
--- /dev/null
+++ b/WordPress/src/jetpack/res/mipmap-anydpi-v26/app_icon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/app_icon_background"/>
+    <foreground android:drawable="@drawable/app_icon_foreground"/>
+</adaptive-icon>
diff --git a/WordPress/src/jetpack/res/mipmap-hdpi/app_icon.png b/WordPress/src/jetpack/res/mipmap-hdpi/app_icon.png
new file mode 100644
index 000000000000..89ad73cbea2c
Binary files /dev/null and b/WordPress/src/jetpack/res/mipmap-hdpi/app_icon.png differ
diff --git a/WordPress/src/jetpack/res/mipmap-xhdpi/app_icon.png b/WordPress/src/jetpack/res/mipmap-xhdpi/app_icon.png
new file mode 100644
index 000000000000..60e9ed4d5fa6
Binary files /dev/null and b/WordPress/src/jetpack/res/mipmap-xhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpack/res/mipmap-xxhdpi/app_icon.png b/WordPress/src/jetpack/res/mipmap-xxhdpi/app_icon.png
new file mode 100644
index 000000000000..4de9ae3f6bf0
Binary files /dev/null and b/WordPress/src/jetpack/res/mipmap-xxhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpack/res/mipmap-xxxhdpi/app_icon.png b/WordPress/src/jetpack/res/mipmap-xxxhdpi/app_icon.png
new file mode 100644
index 000000000000..1b733e3187a2
Binary files /dev/null and b/WordPress/src/jetpack/res/mipmap-xxxhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpack/res/values-night/colors_base.xml b/WordPress/src/jetpack/res/values-night/colors_base.xml
new file mode 100644
index 000000000000..6e7c90d7d37e
--- /dev/null
+++ b/WordPress/src/jetpack/res/values-night/colors_base.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@color/primary_40</color>
+    <color name="colorPrimaryVariant">@color/primary_50</color>
+    <color name="colorSecondary">@color/primary_40</color>
+    <color name="colorSecondaryVariant">@color/primary_50</color>
+
+    <color name="nav_bar">@color/white</color>
+</resources>
diff --git a/WordPress/src/jetpack/res/values-night/colors_stats.xml b/WordPress/src/jetpack/res/values-night/colors_stats.xml
new file mode 100644
index 000000000000..c044aa801e0c
--- /dev/null
+++ b/WordPress/src/jetpack/res/values-night/colors_stats.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="stats_activity_very_low">@color/gray_80</color>
+    <color name="stats_activity_low">@color/jetpack_green_70</color>
+    <color name="stats_activity_medium">@color/jetpack_green_50</color>
+    <color name="stats_activity_high">@color/jetpack_green_30</color>
+    <color name="stats_activity_very_high">@color/jetpack_green_10</color>
+    <color name="stats_value_bar_color">@color/gray_60</color>
+    <color name="stats_bar_chart_bottom">@color/jetpack_green_30</color>
+    <color name="stats_bar_chart_top">@color/jetpack_green_60</color>
+    <color name="stats_bar_chart_accent_top">@color/pink_60</color>
+    <color name="stats_bar_chart_accent_bottom">@color/pink_30</color>
+    <color name="stats_bar_chart_gridline">@color/gray_80</color>
+    <color name="stats_map_activity_low">@color/jetpack_green_80</color>
+    <color name="stats_map_activity_high">@color/jetpack_green_30</color>
+    <color name="stats_map_activity_empty">@color/gray_80</color>
+</resources>
diff --git a/WordPress/src/jetpack/res/values/colors_base.xml b/WordPress/src/jetpack/res/values/colors_base.xml
new file mode 100644
index 000000000000..93fd4bdd1d10
--- /dev/null
+++ b/WordPress/src/jetpack/res/values/colors_base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+    <color name="colorPrimary">@color/primary</color>
+    <color name="colorPrimaryVariant">@color/primary_40</color>
+    <color name="colorSecondary">@color/primary</color>
+    <color name="colorSecondaryVariant">@color/primary_40</color>
+
+    <color name="primary">@color/jetpack_green_50</color>
+    <color name="primary_0">@color/jetpack_green_0</color>
+    <color name="primary_5">@color/jetpack_green_5</color>
+    <color name="primary_10">@color/jetpack_green_10</color>
+    <color name="primary_20">@color/jetpack_green_20</color>
+    <color name="primary_30">@color/jetpack_green_30</color>
+    <color name="primary_40">@color/jetpack_green_40</color>
+    <color name="primary_50">@color/jetpack_green_50</color>
+    <color name="primary_60">@color/jetpack_green_60</color>
+    <color name="primary_70">@color/jetpack_green_70</color>
+    <color name="primary_80">@color/jetpack_green_80</color>
+    <color name="primary_90">@color/jetpack_green_90</color>
+    <color name="primary_100">@color/jetpack_green_100</color>
+    <color name="primary_dark">@color/jetpack_green_80</color>
+    <color name="primary_light">@color/jetpack_green_30</color>
+
+    <color name="nav_bar">@color/black</color>
+</resources>
diff --git a/WordPress/src/jetpack/res/values/colors_stats.xml b/WordPress/src/jetpack/res/values/colors_stats.xml
new file mode 100644
index 000000000000..fa2008138de1
--- /dev/null
+++ b/WordPress/src/jetpack/res/values/colors_stats.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="stats_activity_very_low">@color/gray_0</color>
+    <color name="stats_activity_low">@color/jetpack_green_5</color>
+    <color name="stats_activity_medium">@color/jetpack_green_20</color>
+    <color name="stats_activity_high">@color/jetpack_green_50</color>
+    <color name="stats_activity_very_high">@color/jetpack_green_70</color>
+    <color name="stats_value_bar_color">@color/gray_10</color>
+    <color name="stats_bar_chart_bottom">@color/jetpack_green_60</color>
+    <color name="stats_bar_chart_top">@color/jetpack_green_30</color>
+    <color name="stats_bar_chart_accent_top">@color/pink_30</color>
+    <color name="stats_bar_chart_accent_bottom">@color/pink_60</color>
+    <color name="stats_bar_chart_gridline">@color/neutral_5</color>
+    <color name="stats_map_activity_low">@color/jetpack_green_5</color>
+    <color name="stats_map_activity_high">@color/jetpack_green</color>
+    <color name="stats_map_activity_empty">@color/neutral_5</color>
+</resources>
diff --git a/WordPress/src/jetpack/res/values/dimens.xml b/WordPress/src/jetpack/res/values/dimens.xml
new file mode 100644
index 000000000000..f8553cdd3ea1
--- /dev/null
+++ b/WordPress/src/jetpack/res/values/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="login_prologue_tagline_start_end_padding">40dp</dimen>
+</resources>
diff --git a/WordPress/src/jetpack/res/values/strings.xml b/WordPress/src/jetpack/res/values/strings.xml
new file mode 100644
index 000000000000..cd3d122b4d21
--- /dev/null
+++ b/WordPress/src/jetpack/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">Jetpack</string>
+    <string name="widgets_enabled" translatable="false">false</string>
+
+    <!-- About View -->
+    <string name="app_title">Jetpack for Android</string>
+
+    <!-- Login Prologue -->
+    <string name="app_tagline">Site security and performance from your pocket</string>
+    <string name="continue_with_wpcom_no_signup">Log in with WordPress.com</string>
+
+    <!-- Login Magic Link -->
+    <string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from Jetpack.com.</string>
+
+    <!-- Contact us -->
+    <!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
+    <string name="support_ticket_subject" translatable="false">Jetpack for Android Support</string>
+
+    <!-- Log out actions in Me -->
+    <string name="me_disconnect_from_wordpress_com">Log out of Jetpack</string>
+    <string name="sign_out_wpcom_confirm_with_no_changes">Log out of Jetpack?</string>
+</resources>
diff --git a/WordPress/src/jetpack/res/values/styles_login.xml b/WordPress/src/jetpack/res/values/styles_login.xml
new file mode 100644
index 000000000000..d024766081b6
--- /dev/null
+++ b/WordPress/src/jetpack/res/values/styles_login.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Login Prologue -->
+    <style name="Widget.LoginFlow.Prologue" parent="">
+        <item name="android:background">@color/wordpress_blue_90</item>
+    </style>
+
+    <style name="Widget.LoginFlow.Button.Primary.Prologue" parent="Widget.LoginFlow.Button.Primary">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.LoginFlow.Button.Secondary.Prologue</item>
+    </style>
+
+    <style name="Widget.LoginFlow.Button.Secondary.Prologue" parent="Widget.LoginFlow.Button.Secondary">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.LoginFlow.Button.OnSurface.Prologue</item>
+    </style>
+
+    <style name="ThemeOverlay.LoginFlow.Button.Secondary.Prologue" parent="ThemeOverlay.LoginFlow.Button.Secondary">
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorOnPrimary">@color/black</item>
+    </style>
+
+    <style name="ThemeOverlay.LoginFlow.Button.OnSurface.Prologue" parent="ThemeOverlay.LoginFlow.Button.OnSurface">
+        <item name="colorPrimary">@color/white</item>
+        <item name="colorOnSurface">@color/white</item>
+    </style>
+
+    <style name="Widget.LoginFlow.TextAppTagLine.Prologue" parent="">
+        <item name="android:textAlignment">center</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6</item>
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <!-- Cards -->
+    <style name="Widget.LoginFlow.CardView.BottomBar.Prologue" parent="Widget.MaterialComponents.CardView">
+        <item name="cardCornerRadius">0dp</item>
+        <item name="cardElevation">0dp</item>
+        <item name="cardBackgroundColor">@color/wordpress_blue_90</item>
+    </style>
+</resources>
diff --git a/WordPress/src/jetpack/res/values/styles_toolbar.xml b/WordPress/src/jetpack/res/values/styles_toolbar.xml
new file mode 100644
index 000000000000..173c3ba3556a
--- /dev/null
+++ b/WordPress/src/jetpack/res/values/styles_toolbar.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- TextAppearance -->
+    <style name="TextAppearance.App.Toolbar.Title" parent="TextAppearance.MaterialComponents.Headline6"/>
+
+    <style name="TextAppearance.App.CollapsingToolbar.Expanded" parent="TextAppearance.MaterialComponents.Headline4">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextAppearance.App.CollapsingToolbar.Collapsed" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
+
+</resources>
diff --git a/WordPress/src/jetpack/res/xml/shortcuts.xml b/WordPress/src/jetpack/res/xml/shortcuts.xml
new file mode 100644
index 000000000000..77a2fd8ed7ec
--- /dev/null
+++ b/WordPress/src/jetpack/res/xml/shortcuts.xml
@@ -0,0 +1,47 @@
+<!--WARNING - build flavors might use a copy of this file -->
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:tools="http://schemas.android.com/tools"
+           tools:targetApi="n_mr1">
+    <shortcut
+        android:icon="@drawable/ic_shortcut_stats"
+        android:shortcutId="stats"
+        android:shortcutShortLabel="@string/stats"
+        android:enabled="true">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.OPEN_STATS"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:icon="@drawable/ic_shortcut_notifications"
+        android:shortcutId="notifications"
+        android:shortcutShortLabel="@string/notifications_screen_title"
+        android:enabled="true">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.OPEN_NOTIFICATIONS"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:icon="@drawable/ic_shortcut_create_post"
+        android:shortcutId="new_post"
+        android:shortcutShortLabel="@string/new_post"
+        android:enabled="false">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.CREATE_NEW_POST"/>
+        </intent>
+    </shortcut>
+</shortcuts>
diff --git a/WordPress/src/jetpackJalapeno/res/drawable/app_icon_background.xml b/WordPress/src/jetpackJalapeno/res/drawable/app_icon_background.xml
new file mode 100644
index 000000000000..7292ba5c118d
--- /dev/null
+++ b/WordPress/src/jetpackJalapeno/res/drawable/app_icon_background.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h108v108h-108z"
+      android:strokeWidth="1"
+      android:fillColor="#76B154"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpackJalapeno/res/drawable/app_icon_foreground.xml b/WordPress/src/jetpackJalapeno/res/drawable/app_icon_foreground.xml
new file mode 100644
index 000000000000..d9020ae84602
--- /dev/null
+++ b/WordPress/src/jetpackJalapeno/res/drawable/app_icon_foreground.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M54,85C36.879,85 23,71.121 23,54C23,36.879 36.879,23 54,23C71.121,23 85,36.879 85,54C85,71.121 71.121,85 54,85Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+  <path
+      android:pathData="M55.572,78.86l15.462,-30.046l-15.462,0z"
+      android:strokeWidth="1"
+      android:fillColor="#DAE574"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+  <path
+      android:pathData="M52.427,29.143l-15.462,30.047l15.462,0z"
+      android:strokeWidth="1"
+      android:fillColor="#DAE574"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpackJalapeno/res/mipmap-hdpi/app_icon.png b/WordPress/src/jetpackJalapeno/res/mipmap-hdpi/app_icon.png
new file mode 100644
index 000000000000..8110b9cb2212
Binary files /dev/null and b/WordPress/src/jetpackJalapeno/res/mipmap-hdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackJalapeno/res/mipmap-xhdpi/app_icon.png b/WordPress/src/jetpackJalapeno/res/mipmap-xhdpi/app_icon.png
new file mode 100644
index 000000000000..0297c93f2ed3
Binary files /dev/null and b/WordPress/src/jetpackJalapeno/res/mipmap-xhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackJalapeno/res/mipmap-xxhdpi/app_icon.png b/WordPress/src/jetpackJalapeno/res/mipmap-xxhdpi/app_icon.png
new file mode 100644
index 000000000000..ffdf9944b3fa
Binary files /dev/null and b/WordPress/src/jetpackJalapeno/res/mipmap-xxhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackJalapeno/res/mipmap-xxxhdpi/app_icon.png b/WordPress/src/jetpackJalapeno/res/mipmap-xxxhdpi/app_icon.png
new file mode 100644
index 000000000000..1382f0d29fcd
Binary files /dev/null and b/WordPress/src/jetpackJalapeno/res/mipmap-xxxhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackJalapeno/res/values/strings.xml b/WordPress/src/jetpackJalapeno/res/values/strings.xml
new file mode 100644
index 000000000000..c119e6bd977e
--- /dev/null
+++ b/WordPress/src/jetpackJalapeno/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">Jetpack Pre-Alpha</string>
+</resources>
diff --git a/WordPress/src/jetpackJalapeno/res/xml/shortcuts.xml b/WordPress/src/jetpackJalapeno/res/xml/shortcuts.xml
new file mode 100644
index 000000000000..03087cd29351
--- /dev/null
+++ b/WordPress/src/jetpackJalapeno/res/xml/shortcuts.xml
@@ -0,0 +1,47 @@
+<!--WARNING - build flavors might use a copy of this file -->
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:tools="http://schemas.android.com/tools"
+           tools:targetApi="n_mr1">
+    <shortcut
+        android:icon="@drawable/ic_shortcut_stats"
+        android:shortcutId="stats"
+        android:shortcutShortLabel="@string/stats"
+        android:enabled="true">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android.prealpha">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.OPEN_STATS"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:icon="@drawable/ic_shortcut_notifications"
+        android:shortcutId="notifications"
+        android:shortcutShortLabel="@string/notifications_screen_title"
+        android:enabled="true">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android.prealpha">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.OPEN_NOTIFICATIONS"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:icon="@drawable/ic_shortcut_create_post"
+        android:shortcutId="new_post"
+        android:shortcutShortLabel="@string/new_post"
+        android:enabled="false">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android.prealpha">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.CREATE_NEW_POST"/>
+        </intent>
+    </shortcut>
+</shortcuts>
diff --git a/WordPress/src/jetpackWasabi/res/drawable/app_icon_background.xml b/WordPress/src/jetpackWasabi/res/drawable/app_icon_background.xml
new file mode 100644
index 000000000000..d9d6942e437f
--- /dev/null
+++ b/WordPress/src/jetpackWasabi/res/drawable/app_icon_background.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M0,0h54v108h-54z"
+      android:strokeWidth="1"
+      android:fillColor="#F5971B"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+  <path
+      android:pathData="M54,0h54v108h-54z"
+      android:strokeWidth="1"
+      android:fillColor="#7DB65D"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpackWasabi/res/drawable/app_icon_foreground.xml b/WordPress/src/jetpackWasabi/res/drawable/app_icon_foreground.xml
new file mode 100644
index 000000000000..47afe14276e0
--- /dev/null
+++ b/WordPress/src/jetpackWasabi/res/drawable/app_icon_foreground.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:pathData="M54,23C71.121,23 85,36.879 85,54C85,71.121 71.121,85 54,85C36.879,85 23,71.121 23,54C23,36.879 36.879,23 54,23ZM71.034,48.814L55.572,48.814L55.572,78.86L71.034,48.814ZM52.427,29.143L36.964,59.19L52.427,59.19L52.427,29.143Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
+</vector>
diff --git a/WordPress/src/jetpackWasabi/res/mipmap-hdpi/app_icon.png b/WordPress/src/jetpackWasabi/res/mipmap-hdpi/app_icon.png
new file mode 100644
index 000000000000..418c610332a7
Binary files /dev/null and b/WordPress/src/jetpackWasabi/res/mipmap-hdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackWasabi/res/mipmap-xhdpi/app_icon.png b/WordPress/src/jetpackWasabi/res/mipmap-xhdpi/app_icon.png
new file mode 100644
index 000000000000..80075aedb5e7
Binary files /dev/null and b/WordPress/src/jetpackWasabi/res/mipmap-xhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackWasabi/res/mipmap-xxhdpi/app_icon.png b/WordPress/src/jetpackWasabi/res/mipmap-xxhdpi/app_icon.png
new file mode 100644
index 000000000000..c894873b48bf
Binary files /dev/null and b/WordPress/src/jetpackWasabi/res/mipmap-xxhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackWasabi/res/mipmap-xxxhdpi/app_icon.png b/WordPress/src/jetpackWasabi/res/mipmap-xxxhdpi/app_icon.png
new file mode 100644
index 000000000000..fd8d0e1af16e
Binary files /dev/null and b/WordPress/src/jetpackWasabi/res/mipmap-xxxhdpi/app_icon.png differ
diff --git a/WordPress/src/jetpackWasabi/res/values/strings.xml b/WordPress/src/jetpackWasabi/res/values/strings.xml
new file mode 100644
index 000000000000..6bb9cb282379
--- /dev/null
+++ b/WordPress/src/jetpackWasabi/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name" translatable="false">Jetpack Beta</string>
+</resources>
diff --git a/WordPress/src/jetpackWasabi/res/xml/shortcuts.xml b/WordPress/src/jetpackWasabi/res/xml/shortcuts.xml
new file mode 100644
index 000000000000..b51afb5029d7
--- /dev/null
+++ b/WordPress/src/jetpackWasabi/res/xml/shortcuts.xml
@@ -0,0 +1,47 @@
+<!--WARNING - build flavors might use a copy of this file -->
+<shortcuts xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:tools="http://schemas.android.com/tools"
+           tools:targetApi="n_mr1">
+    <shortcut
+        android:icon="@drawable/ic_shortcut_stats"
+        android:shortcutId="stats"
+        android:shortcutShortLabel="@string/stats"
+        android:enabled="true">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android.beta">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.OPEN_STATS"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:icon="@drawable/ic_shortcut_notifications"
+        android:shortcutId="notifications"
+        android:shortcutShortLabel="@string/notifications_screen_title"
+        android:enabled="true">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android.beta">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.OPEN_NOTIFICATIONS"/>
+        </intent>
+    </shortcut>
+    <shortcut
+        android:icon="@drawable/ic_shortcut_create_post"
+        android:shortcutId="new_post"
+        android:shortcutShortLabel="@string/new_post"
+        android:enabled="false">
+        <intent
+            android:action="android.intent.action.VIEW"
+            android:targetClass="org.wordpress.android.ui.main.WPMainActivity"
+            android:targetPackage="com.jetpack.android.beta">
+            <extra
+                android:name="org.wordpress.android.ui.ShortcutsNavigator.ACTION_OPEN_SHORTCUT"
+                android:value="org.wordpress.android.ui.ShortcutsNavigator.CREATE_NEW_POST"/>
+        </intent>
+    </shortcut>
+</shortcuts>
diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
index 7cb091442b62..5107f5d7ae45 100644
--- a/WordPress/src/main/AndroidManifest.xml
+++ b/WordPress/src/main/AndroidManifest.xml
@@ -66,10 +66,6 @@
         android:supportsRtl="true"
         tools:ignore="UnusedAttribute">
 
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="@string/com_google_android_geo_api_key"/>
-
         <meta-data android:name="io.sentry.auto-init" android:value="false" />
 
         <uses-library
@@ -104,7 +100,7 @@
             android:label="@string/me_section_screen_title" />
         <activity
             android:name=".ui.accounts.LoginActivity"
-            android:theme="@style/Theme.LoginFlow.TransparentStatusBar"
+            android:theme="@style/LoginTheme.TransparentStatusBar"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
@@ -117,24 +113,24 @@
                 <category android:name="android.intent.category.BROWSABLE" />
                 <data
                     android:host="magic-login"
-                    android:scheme="wordpress" />
+                    android:scheme="${magicLinkScheme}" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".ui.accounts.LoginEpilogueActivity"
             android:label="@string/login_epilogue_screen_title"
-            android:theme="@style/Theme.LoginFlow" />
+            android:theme="@style/LoginTheme" />
 
         <activity
             android:name=".ui.accounts.SignupEpilogueActivity"
             android:label="@string/signup_epilogue_screen_title"
-            android:theme="@style/Theme.LoginFlow" />
+            android:theme="@style/LoginTheme" />
 
         <activity
             android:name=".ui.accounts.PostSignupInterstitialActivity"
             android:label="@string/post_signup_interstitial_title"
-            android:theme="@style/Theme.LoginFlow"
+            android:theme="@style/LoginTheme"
             />
 
         <activity
@@ -224,6 +220,7 @@
         <activity
             android:name=".ui.comments.CommentsDetailActivity"
             android:theme="@style/WordPress.NoActionBar"
+            android:windowSoftInputMode="adjustResize"
             android:label="@string/comments"/>
 
         <!-- Posts activities -->
@@ -372,7 +369,7 @@
 
         <!-- Deep Linking Activity -->
         <activity
-            android:name=".ui.DeepLinkingIntentReceiverActivity"
+            android:name=".ui.deeplinks.DeepLinkingIntentReceiverActivity"
             android:theme="@style/WordPress.NoActionBar"
             android:excludeFromRecents="true">
             <intent-filter>
@@ -439,6 +436,16 @@
                     android:pathPattern="/pages/..*"
                     android:scheme="http" />
 
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/notifications/.*"
+                    android:scheme="https" />
+
+                <data
+                    android:host="wordpress.com"
+                    android:pathPattern="/notifications/.*"
+                    android:scheme="http" />
+
             </intent-filter>
 
         </activity>
@@ -460,6 +467,10 @@
             android:theme="@style/WordPress.NoActionBar.TranslucentStatus"
             android:windowSoftInputMode="adjustResize" >
         </activity>
+        <activity
+            android:name=".ui.engagement.EngagedPeopleListActivity"
+            android:theme="@style/WordPress.NoActionBar"
+            />
         <activity-alias
             android:name=".WPComPostReaderActivity"
             android:targetActivity=".ui.reader.ReaderPostPagerActivity">
@@ -512,6 +523,7 @@
                     android:scheme="http" >
                 </data>
 
+                <action android:name="org.wordpress.android.action.VIEW_POST" />
                 <action android:name="android.intent.action.VIEW" />
 
                 <category android:name="android.intent.category.DEFAULT" />
@@ -545,10 +557,14 @@
             android:name=".ui.reader.ReaderVideoViewerActivity"
             android:screenOrientation="landscape"
             android:theme="@style/ReaderMediaViewerTheme" />
+        <activity
+            android:name=".ui.reader.discover.interests.ReaderInterestsActivity"
+            android:label="@string/reader_title_interests"
+            android:theme="@style/WordPress.NoActionBar" />
 
         <!-- Gutenberg activities -->
         <activity
-            android:name=".ui.SuggestUsersActivity"
+            android:name=".ui.suggestion.SuggestionActivity"
             android:theme="@style/WordPressNoDisplay"
             android:windowSoftInputMode="adjustResize"
             />
@@ -580,7 +596,8 @@
         <activity
             android:name=".ui.AddQuickPressShortcutActivity"
             android:label="@string/quickpress_shortcut_activity_label"
-            android:theme="@style/WordPress.NoActionBar">
+            android:theme="@style/WordPress.NoActionBar"
+            android:enabled="@string/widgets_enabled">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
 
@@ -645,6 +662,23 @@
             android:label="@string/activity_log_event"
             android:theme="@style/WordPress.NoActionBar"/>
 
+        <!-- Jetpack - Scan-->
+        <activity
+            android:name=".ui.jetpack.scan.ScanActivity"
+            android:label="@string/scan"
+            android:theme="@style/WordPress.NoActionBar"/>
+
+        <activity
+            android:name=".ui.jetpack.scan.history.ScanHistoryActivity"
+            android:label="@string/scan_history"
+            android:theme="@style/WordPress.NoActionBar"/>
+
+        <!-- Jetpack - Threat Details-->
+        <activity
+            android:name=".ui.jetpack.scan.details.ThreatDetailsActivity"
+            android:label="@string/threat_details"
+            android:theme="@style/WordPress.NoActionBar"/>
+
         <!--Domain Registration-->
         <activity
             android:name=".ui.domains.DomainRegistrationActivity"
@@ -667,6 +701,18 @@
             android:name=".ui.posts.JetpackSecuritySettingsActivity"
             android:theme="@style/WordPress.NoActionBar"/>
 
+        <!-- Jetpack backup -->
+        <activity
+            android:name=".ui.jetpack.backup.download.BackupDownloadActivity"
+            android:label="@string/backup_download"
+            android:theme="@style/WordPress.NoActionBar"/>
+
+        <!-- Jetpack restore -->
+        <activity
+            android:name=".ui.jetpack.restore.RestoreActivity"
+            android:label="@string/restore"
+            android:theme="@style/WordPress.NoActionBar"/>
+
         <!-- Services -->
         <service
             android:name=".ui.uploads.UploadService"
@@ -787,7 +833,8 @@
         <receiver android:name=".ui.notifications.ShareAndDismissNotificationReceiver" />
         <receiver
             android:name=".ui.stats.refresh.lists.widget.views.StatsViewsWidget"
-            android:label="@string/stats_widget_weekly_views_name">
+            android:label="@string/stats_widget_weekly_views_name"
+            android:enabled="@string/widgets_enabled">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
@@ -798,7 +845,8 @@
         </receiver>
         <receiver
             android:name=".ui.stats.refresh.lists.widget.alltime.StatsAllTimeWidget"
-            android:label="@string/stats_widget_all_time_insights_name">
+            android:label="@string/stats_widget_all_time_insights_name"
+            android:enabled="@string/widgets_enabled">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
@@ -809,7 +857,8 @@
         </receiver>
         <receiver
             android:name=".ui.stats.refresh.lists.widget.today.StatsTodayWidget"
-            android:label="@string/stats_widget_today_insights_name">
+            android:label="@string/stats_widget_today_insights_name"
+            android:enabled="@string/widgets_enabled">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
@@ -820,7 +869,8 @@
         </receiver>
         <receiver
             android:name=".ui.stats.refresh.lists.widget.minified.StatsMinifiedWidget"
-            android:label="@string/stats_widget_minified_name">
+            android:label="@string/stats_widget_minified_name"
+            android:enabled="@string/widgets_enabled">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
             </intent-filter>
diff --git a/WordPress/src/main/assets/supported-blocks.json b/WordPress/src/main/assets/supported-blocks.json
deleted file mode 120000
index be8f0aa4a0af..000000000000
--- a/WordPress/src/main/assets/supported-blocks.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../libs/gutenberg-mobile/src/block-support/supported-blocks.json
\ No newline at end of file
diff --git a/WordPress/src/main/java/org/wordpress/android/Constants.java b/WordPress/src/main/java/org/wordpress/android/Constants.java
index 2ea3f90c9e1f..d5034a3279ec 100644
--- a/WordPress/src/main/java/org/wordpress/android/Constants.java
+++ b/WordPress/src/main/java/org/wordpress/android/Constants.java
@@ -6,4 +6,5 @@ public class Constants {
     public static final String URL_PRIVACY_POLICY = "https://automattic.com/privacy";
     public static final String URL_DATETIME_FORMAT_HELP = "https://codex.wordpress.org/Formatting_Date_and_Time";
     public static final String URL_TIMEZONE_ENDPOINT = "https://public-api.wordpress.com/wpcom/v2/timezones";
+    public static final String URL_JETPACK_SETTINGS = "https://wordpress.com/settings/jetpack";
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java
index da8a544f12ff..1fd334af888f 100644
--- a/WordPress/src/main/java/org/wordpress/android/WordPress.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java
@@ -115,6 +115,7 @@
 import org.wordpress.android.util.VolleyUtils;
 import org.wordpress.android.util.WPActivityUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.experiments.ExPlat;
 import org.wordpress.android.util.config.AppConfig;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.widgets.AppRatingDialog;
@@ -134,11 +135,12 @@
 import dagger.android.HasAndroidInjector;
 import kotlinx.coroutines.CoroutineScope;
 
-import static org.wordpress.android.modules.ThreadModuleKt.DEFAULT_SCOPE;
+import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
 
 public class WordPress extends MultiDexApplication implements HasAndroidInjector, LifecycleObserver {
     public static final String SITE = "SITE";
     public static final String LOCAL_SITE_ID = "LOCAL_SITE_ID";
+    public static final String REMOTE_SITE_ID = "REMOTE_SITE_ID";
     public static String versionName;
     public static WordPressDB wpDB;
     public static boolean sAppIsInTheBackground = true;
@@ -180,7 +182,8 @@ public class WordPress extends MultiDexApplication implements HasAndroidInjector
     @Inject EncryptedLogging mEncryptedLogging;
     @Inject AppConfig mAppConfig;
     @Inject ImageEditorFileUtils mImageEditorFileUtils;
-    @Inject @Named(DEFAULT_SCOPE) CoroutineScope mDefaultScope;
+    @Inject ExPlat mExPlat;
+    @Inject @Named(APPLICATION_SCOPE) CoroutineScope mAppScope;
 
     // For development and production `AnalyticsTrackerNosara`, for testing a mocked `Tracker` will be injected.
     @Inject Tracker mTracker;
@@ -204,7 +207,7 @@ public AppComponent component() {
     public RateLimitedTask mUpdateSiteList = new RateLimitedTask(SECONDS_BETWEEN_BLOGLIST_UPDATE) {
         protected boolean run() {
             if (mAccountStore.hasAccessToken()) {
-                mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction());
+                mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction(SiteUtils.getFetchSitesPayload()));
                 mDispatcher.dispatch(AccountActionBuilder.newFetchSubscriptionsAction());
             }
             return true;
@@ -256,6 +259,7 @@ public void onCreate() {
         initDaggerComponent();
         component().inject(this);
         mDispatcher.register(this);
+        mAppConfig.init();
 
         // Start crash logging and upload any encrypted logs that were queued but not yet uploaded
         mCrashLogging.start(getContext());
@@ -270,7 +274,7 @@ public void onCreate() {
 
         // Enable log recording
         AppLog.enableRecording(true);
-        AppLog.enableLogFilePersistence(this.getBaseContext(), 30);
+        AppLog.enableLogFilePersistence(this.getBaseContext(), 5);
         AppLog.addListener(new AppLogListener() {
             @Override
             public void onLog(T tag, LogLevel logLevel, String message) {
@@ -354,13 +358,15 @@ public void onConnectionSuspended(int i) {
                 mImageManager,
                 mImageEditorTracker,
                 mImageEditorFileUtils,
-                mDefaultScope
+                mAppScope
         );
 
         initEmojiCompat();
         mStoryNotificationTrackerProvider = new StoryNotificationTrackerProvider();
         mStoryMediaSaveUploadBridge.init(this);
         ProcessLifecycleOwner.get().getLifecycle().addObserver(mStoryMediaSaveUploadBridge);
+
+        mExPlat.forceRefresh();
     }
 
     protected void initWorkManager() {
@@ -616,6 +622,9 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
             // Make sure the Push Notification token is sent to our servers after a successful login
             GCMRegistrationIntentService.enqueueWork(this,
                     new Intent(this, GCMRegistrationIntentService.class));
+
+            // Force a refresh if user has logged in. This can be removed once we start using an anonymous ID.
+            mExPlat.forceRefresh();
         }
     }
 
@@ -644,8 +653,11 @@ public void removeWpComUserRelatedData(Context context) {
         for (SiteModel site : mSiteStore.getSites()) {
             mDispatcher.dispatch(ThemeActionBuilder.newRemoveSiteThemesAction(site));
         }
-        // delete wpcom and jetpack sites
-        mDispatcher.dispatch(SiteActionBuilder.newRemoveWpcomAndJetpackSitesAction());
+
+        if (!BuildConfig.IS_JETPACK_APP || mSiteStore.hasSite()) {
+            // delete wpcom and jetpack sites
+            mDispatcher.dispatch(SiteActionBuilder.newRemoveWpcomAndJetpackSitesAction());
+        }
         // remove all lists
         mDispatcher.dispatch(ListActionBuilder.newRemoveAllListsAction());
         // remove all posts
@@ -669,6 +681,9 @@ public void removeWpComUserRelatedData(Context context) {
 
         // Remove private Atomic cookie
         mPrivateAtomicCookie.clearCookie();
+
+        // Clear cached assignments if user has logged out. This can be removed once we start using an anonymous ID.
+        mExPlat.clear();
     }
 
     private static String mDefaultUserAgent;
@@ -988,6 +1003,12 @@ public void onAppComesFromBackground() {
             // Let's migrate the old editor preference if available in AppPrefs to the remote backend
             SiteUtils.migrateAppWideMobileEditorPreferenceToRemote(mAccountStore, mSiteStore, mDispatcher);
 
+            if (!mFirstActivityResumed) {
+                // Since we're force refreshing on app startup, we don't need to try refreshing again
+                // when starting our first Activity.
+                mExPlat.refreshIfNeeded();
+            }
+
             if (mFirstActivityResumed) {
                 deferredInit();
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
index 5cb7f960cda8..95886d3a14e7 100755
--- a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
+++ b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java
@@ -8,7 +8,7 @@
 import org.wordpress.android.datasets.PeopleTable;
 import org.wordpress.android.datasets.PublicizeTable;
 import org.wordpress.android.datasets.SiteSettingsTable;
-import org.wordpress.android.datasets.SuggestionTable;
+import org.wordpress.android.datasets.UserSuggestionTable;
 import org.wordpress.android.models.SiteSettingsModel;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.util.AppLog;
@@ -47,7 +47,7 @@ public WordPressDB(Context ctx) {
         // Create tables if they don't exist
         mDb.execSQL(CREATE_TABLE_QUICKPRESS_SHORTCUTS);
         SiteSettingsTable.createTable(mDb);
-        SuggestionTable.createTables(mDb);
+        UserSuggestionTable.createTables(mDb);
         NotificationsTable.createTables(mDb);
 
         // Update tables for new installs and app updates
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/NotificationsTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/NotificationsTable.java
index e286e1283a5f..01e36017d661 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/NotificationsTable.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/NotificationsTable.java
@@ -15,6 +15,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class NotificationsTable {
     private static final String NOTIFICATIONS_TABLE = "tbl_notifications";
@@ -25,6 +27,16 @@ private static SQLiteDatabase getDb() {
 
     public static final int NOTES_TO_RETRIEVE = 200;
 
+    private static final Pattern STAT_ATTR_PATTERN = Pattern.compile(
+            "\"type\":\"stat\"",
+            Pattern.MULTILINE | Pattern.CASE_INSENSITIVE);
+
+    private static final Pattern REWIND_DOWNLOAD_READY_ATTR_PATTERN = Pattern.compile(
+            "\"type\":\"rewind_download_ready\"",
+            Pattern.DOTALL | Pattern.CASE_INSENSITIVE);
+
+    private static final String REWIND_DOWNLOAD_READY_ATTR_SUBSTR = "\"type\":\"rewind_download_ready\"";
+
     public static void createTables(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE IF NOT EXISTS " + NOTIFICATIONS_TABLE + " ("
                    + "id INTEGER PRIMARY KEY DEFAULT 0,"
@@ -63,10 +75,12 @@ public static ArrayList<Note> getLatestNotes(int limit) {
     }
 
     private static boolean putNote(Note note, boolean checkBeforeInsert) {
+        String rawNote = prepareNote(note.getId(), note.getJSON().toString());
+
         ContentValues values = new ContentValues();
         values.put("type", note.getType());
         values.put("timestamp", note.getTimestamp());
-        values.put("raw_note_data", note.getJSON().toString());
+        values.put("raw_note_data", rawNote);
 
         long result;
         if (checkBeforeInsert && isNoteAvailable(note.getId())) {
@@ -89,6 +103,25 @@ private static boolean putNote(Note note, boolean checkBeforeInsert) {
         }
     }
 
+    /***
+     * PrepareNote is used as a stop gap for handling rewind_download_ready notifications. As of this comment,
+     * rewind download ready notifications have a deep link to stats and until the API changes, we are going to
+     * swap "type""type":"stat" for "type""type":"rewind_download_ready" so that the generated link sends the
+     * user to the correct location in the app. The source remains the same if this is not a rewind_download_ready note.
+     * @param noteId
+     * @param noteSrc
+     * @return
+     */
+    private static String prepareNote(String noteId, String noteSrc) {
+        final Matcher typeMatcher = REWIND_DOWNLOAD_READY_ATTR_PATTERN.matcher(noteSrc);
+        if (typeMatcher.find()) {
+            AppLog.d(AppLog.T.DB, "Substituting " + REWIND_DOWNLOAD_READY_ATTR_SUBSTR + " in NoteID: " + noteId);
+            final Matcher matcher = STAT_ATTR_PATTERN.matcher(noteSrc);
+            noteSrc = matcher.replaceAll(REWIND_DOWNLOAD_READY_ATTR_SUBSTR);
+        }
+        return noteSrc;
+    }
+
     public static void saveNotes(List<Note> notes, boolean clearBeforeSaving) {
         getDb().beginTransaction();
         try {
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTable.java
index c688fe43b4f0..34bcc4367f82 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTable.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTable.java
@@ -46,6 +46,8 @@ protected static void createTables(SQLiteDatabase db) {
                    + " num_followers INTEGER DEFAULT 0,"
                    + " is_notifications_enabled INTEGER DEFAULT 0,"
                    + " date_updated TEXT,"
+                   + " organization_id INTEGER DEFAULT 0,"
+                   + " unseen_count INTEGER DEFAULT 0,"
                    + " PRIMARY KEY (blog_id)"
                    + ")");
     }
@@ -114,6 +116,8 @@ private static ReaderBlog getBlogInfoFromCursor(Cursor c) {
         blogInfo.isFollowing = SqlUtils.sqlToBool(c.getInt(c.getColumnIndex("is_following")));
         blogInfo.isNotificationsEnabled = SqlUtils.sqlToBool(c.getInt(c.getColumnIndex("is_notifications_enabled")));
         blogInfo.numSubscribers = c.getInt(c.getColumnIndex("num_followers"));
+        blogInfo.organizationId = c.getInt(c.getColumnIndex("organization_id"));
+        blogInfo.numUnseenPosts = c.getInt(c.getColumnIndex("unseen_count"));
 
         return blogInfo;
     }
@@ -124,8 +128,9 @@ public static void addOrUpdateBlog(ReaderBlog blogInfo) {
         }
         String sql = "INSERT OR REPLACE INTO tbl_blog_info"
                      + " (blog_id, feed_id, blog_url, image_url, feed_url, name, description, is_private, is_jetpack, "
-                     + "  is_following, is_notifications_enabled, num_followers, date_updated)"
-                     + " VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)";
+                     + "  is_following, is_notifications_enabled, num_followers, date_updated, "
+                     + "  organization_id, unseen_count)"
+                     + " VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15)";
         SQLiteStatement stmt = ReaderDatabase.getWritableDb().compileStatement(sql);
         try {
             stmt.bindLong(1, blogInfo.blogId);
@@ -141,6 +146,8 @@ public static void addOrUpdateBlog(ReaderBlog blogInfo) {
             stmt.bindLong(11, SqlUtils.boolToSql(blogInfo.isNotificationsEnabled));
             stmt.bindLong(12, blogInfo.numSubscribers);
             stmt.bindString(13, DateTimeUtils.iso8601FromDate(new Date()));
+            stmt.bindLong(14, blogInfo.organizationId);
+            stmt.bindLong(15, blogInfo.numUnseenPosts);
             stmt.execute();
         } finally {
             SqlUtils.closeStatement(stmt);
@@ -321,6 +328,20 @@ public static void deleteBlogsWithIds(final List<Long> blogIds) {
         }
     }
 
+    public static void incrementUnseenCount(long blogId) {
+        ReaderDatabase.getWritableDb().execSQL(
+                "UPDATE tbl_blog_info SET unseen_count = unseen_count+1"
+                + " WHERE blog_id=?",
+                new String[]{Long.toString(blogId)});
+    }
+
+    public static void decrementUnseenCount(long blogId) {
+        ReaderDatabase.getWritableDb().execSQL(
+                "UPDATE tbl_blog_info SET unseen_count = unseen_count-1"
+                + " WHERE blog_id=?",
+                new String[]{Long.toString(blogId)});
+    }
+
     /*
      * determine whether the passed blog info should be updated based on when it was last updated
      */
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTableWrapper.kt b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTableWrapper.kt
index 528dc01539f3..3ad12869f640 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTableWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderBlogTableWrapper.kt
@@ -1,28 +1,34 @@
 package org.wordpress.android.datasets
 
 import org.wordpress.android.models.ReaderBlog
+import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import javax.inject.Inject
 
 class ReaderBlogTableWrapper
-@Inject constructor() {
+@Inject constructor(private val readerUtilsWrapper: ReaderUtilsWrapper) {
     fun getFollowedBlogs(): List<ReaderBlog> = ReaderBlogTable.getFollowedBlogs()!!
     fun getBlogInfo(blogId: Long): ReaderBlog? = ReaderBlogTable.getBlogInfo(blogId)
     fun getFeedInfo(feedId: Long): ReaderBlog? = ReaderBlogTable.getFeedInfo(feedId)
     fun isNotificationsEnabled(blogId: Long): Boolean = ReaderBlogTable.isNotificationsEnabled(blogId)
     fun setNotificationsEnabledByBlogId(blogId: Long, isEnabled: Boolean) =
             ReaderBlogTable.setNotificationsEnabledByBlogId(blogId, isEnabled)
+
     fun getReaderBlog(blogId: Long, feedId: Long): ReaderBlog? {
-        return if (feedId != 0L) {
+        return if (readerUtilsWrapper.isExternalFeed(blogId, feedId)) {
             ReaderBlogTable.getFeedInfo(feedId)
         } else {
             ReaderBlogTable.getBlogInfo(blogId)
         }
     }
+
     fun isSiteFollowed(blogId: Long, feedId: Long): Boolean {
-        return if (feedId != 0L) {
+        return if (readerUtilsWrapper.isExternalFeed(blogId, feedId)) {
             ReaderBlogTable.isFollowedFeed(feedId)
         } else {
             ReaderBlogTable.isFollowedBlog(blogId)
         }
     }
+
+    fun incrementUnseenCount(blogId: Long) = ReaderBlogTable.incrementUnseenCount(blogId)
+    fun decrementUnseenCount(blogId: Long) = ReaderBlogTable.decrementUnseenCount(blogId)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
index 446c88756c91..e1048cc573e1 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderDatabase.java
@@ -25,7 +25,7 @@
  */
 public class ReaderDatabase extends SQLiteOpenHelper {
     protected static final String DB_NAME = "wpreader.db";
-    private static final int DB_VERSION = 143;
+    private static final int DB_VERSION = 150;
     private static final int DB_LAST_VERSION_WITHOUT_MIGRATION_SCRIPT = 136; // do not change this value
 
     /*
@@ -102,6 +102,13 @@ public class ReaderDatabase extends SQLiteOpenHelper {
      * 141 - added tbl_posts.tags
      * 142 - remove followed tags from tbl_tags
      * 143 - drop tbl_recommended_blogs
+     * 144 - added tbl_posts.is_wpforteams_site
+     * 145 - added tbl_blog_info.is_wp_for_teams
+     * 146 - replaced tbl_blog_info.is_wp_for_teams and tbl_posts.is_wpforteams_site with organization_id
+     * 147 - added tbl_blog_info.unseen_count
+     * 148 - added tbl_posts.is_seen
+     * 149 - added tbl_posts.is_seen_supported that will be false for posts created before 2020-07-13
+     * 150 - added tbl_posts.author_blog_id and tbl_posts.author_blog_url
      */
 
     /*
@@ -210,6 +217,29 @@ public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             case 142:
                 db.execSQL("DROP TABLE IF EXISTS tbl_recommended_blogs;");
                 currentVersion++;
+            case 143:
+                // removed additions of deprecated tbl_posts.is_wpforteams_site
+                currentVersion++;
+            case 144:
+                // removed additions of deprecated tbl_blog_info.is_wp_for_teams
+                currentVersion++;
+            case 145:
+                db.execSQL("ALTER TABLE tbl_blog_info ADD organization_id INTEGER;");
+                db.execSQL("ALTER TABLE tbl_posts ADD organization_id INTEGER;");
+                currentVersion++;
+            case 146:
+                db.execSQL("ALTER TABLE tbl_blog_info ADD unseen_count INTEGER;");
+                currentVersion++;
+            case 147:
+                db.execSQL("ALTER TABLE tbl_posts ADD is_seen BOOLEAN;");
+                currentVersion++;
+            case 148:
+                db.execSQL("ALTER TABLE tbl_posts ADD is_seen_supported BOOLEAN;");
+                currentVersion++;
+            case 149:
+                db.execSQL("ALTER TABLE tbl_posts ADD author_blog_id INTEGER;");
+                db.execSQL("ALTER TABLE tbl_posts ADD author_blog_url TEXT;");
+                currentVersion++;
         }
         if (currentVersion != newVersion) {
             throw new RuntimeException(
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java
index 0c61f22d6d25..01b26cfc7053 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/ReaderPostTable.java
@@ -8,6 +8,7 @@
 import android.util.Pair;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.R;
@@ -87,7 +88,12 @@ public class ReaderPostTable {
             + "use_excerpt," // 45
             + "is_bookmarked," // 46
             + "is_private_atomic," // 47
-            + "tags"; // 48
+            + "tags," // 48
+            + "organization_id," // 49
+            + "is_seen," // 50
+            + "is_seen_supported," // 51
+            + "author_blog_id," // 52
+            + "author_blog_url"; // 53
 
     // used when querying multiple rows and skipping text column
     private static final String COLUMN_NAMES_NO_TEXT =
@@ -137,7 +143,12 @@ public class ReaderPostTable {
             + "use_excerpt," // 44
             + "is_bookmarked," // 45
             + "is_private_atomic," // 46
-            + "tags"; // 47
+            + "tags," // 47
+            + "organization_id," // 48
+            + "is_seen," // 49
+            + "is_seen_supported," // 50
+            + "author_blog_id," // 51
+            + "author_blog_url"; // 52
 
     protected static void createTables(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE tbl_posts ("
@@ -189,6 +200,11 @@ protected static void createTables(SQLiteDatabase db) {
                    + " is_bookmarked INTEGER DEFAULT 0,"
                    + " is_private_atomic INTEGER DEFAULT 0,"
                    + " tags TEXT,"
+                   + " organization_id INTEGER DEFAULT 0,"
+                   + " is_seen INTEGER DEFAULT 0,"
+                   + " is_seen_supported INTEGER DEFAULT 0,"
+                   + " author_blog_id INTEGER DEFAULT 0,"
+                   + " author_blog_url TEXT,"
                    + " PRIMARY KEY (pseudo_id, tag_name, tag_type)"
                    + ")");
 
@@ -284,8 +300,8 @@ public static int getNumPostsInBlog(long blogId) {
             return 0;
         }
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                                    "SELECT count(*) FROM tbl_posts WHERE blog_id=? AND tag_name=''",
-                                    new String[]{Long.toString(blogId)});
+                "SELECT count(*) FROM tbl_posts WHERE blog_id=? AND tag_name=''",
+                new String[]{Long.toString(blogId)});
     }
 
     public static int getNumPostsInFeed(long feedId) {
@@ -293,8 +309,8 @@ public static int getNumPostsInFeed(long feedId) {
             return 0;
         }
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                                    "SELECT count(*) FROM tbl_posts WHERE feed_id=? AND tag_name=''",
-                                    new String[]{Long.toString(feedId)});
+                "SELECT count(*) FROM tbl_posts WHERE feed_id=? AND tag_name=''",
+                new String[]{Long.toString(feedId)});
     }
 
     public static int getNumPostsWithTag(ReaderTag tag) {
@@ -303,8 +319,8 @@ public static int getNumPostsWithTag(ReaderTag tag) {
         }
         String[] args = {tag.getTagSlug(), Integer.toString(tag.tagType.toInt())};
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                                    "SELECT count(*) FROM tbl_posts WHERE tag_name=? AND tag_type=?",
-                                    args);
+                "SELECT count(*) FROM tbl_posts WHERE tag_name=? AND tag_type=?",
+                args);
     }
 
     public static void updatePost(@NonNull ReaderPost post) {
@@ -334,21 +350,25 @@ public static void addPost(@NonNull ReaderPost post) {
         addOrUpdatePosts(null, posts);
     }
 
+    @Nullable
     public static ReaderPost getBlogPost(long blogId, long postId, boolean excludeTextColumn) {
         return getPost("blog_id=? AND post_id=?", new String[]{Long.toString(blogId), Long.toString(postId)},
-                       excludeTextColumn);
+                excludeTextColumn);
     }
 
+    @Nullable
     public static ReaderPost getBlogPost(String blogSlug, String postSlug, boolean excludeTextColumn) {
         return getPost("blog_url LIKE ? AND url LIKE ?", new String[]{"%//" + blogSlug, "%/" + postSlug + "/"},
-                       excludeTextColumn);
+                excludeTextColumn);
     }
 
+    @Nullable
     public static ReaderPost getFeedPost(long feedId, long feedItemId, boolean excludeTextColumn) {
         return getPost("feed_id=? AND feed_item_id=?", new String[]{Long.toString(feedId), Long.toString(feedItemId)},
-                       excludeTextColumn);
+                excludeTextColumn);
     }
 
+    @Nullable
     private static ReaderPost getPost(String where, String[] args, boolean excludeTextColumn) {
         String columns = (excludeTextColumn ? COLUMN_NAMES_NO_TEXT : "*");
         String sql = "SELECT " + columns + " FROM tbl_posts WHERE " + where + " LIMIT 1";
@@ -367,29 +387,29 @@ private static ReaderPost getPost(String where, String[] args, boolean excludeTe
     public static String getPostTitle(long blogId, long postId) {
         String[] args = {Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(),
-                                       "SELECT title FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                       args);
+                "SELECT title FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     public static String getPostBlogName(long blogId, long postId) {
         String[] args = {Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(),
-                                       "SELECT blog_name FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                       args);
+                "SELECT blog_name FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     public static String getPostText(long blogId, long postId) {
         String[] args = {Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.stringForQuery(ReaderDatabase.getReadableDb(),
-                                       "SELECT text FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                       args);
+                "SELECT text FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     public static boolean postExists(long blogId, long postId) {
         String[] args = {Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.boolForQuery(ReaderDatabase.getReadableDb(),
-                                     "SELECT 1 FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                     args);
+                "SELECT 1 FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     private static boolean postExistsForReaderTag(long blogId, long postId, ReaderTag readerTag) {
@@ -447,8 +467,8 @@ public static int getNumCommentsForPost(ReaderPost post) {
     public static int getNumCommentsForPost(long blogId, long postId) {
         String[] args = new String[]{Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                                    "SELECT num_replies FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                    args);
+                "SELECT num_replies FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     public static void setNumCommentsForPost(long blogId, long postId, int numComments) {
@@ -471,8 +491,8 @@ public static void incNumCommentsForPost(long blogId, long postId) {
     public static int getNumLikesForPost(long blogId, long postId) {
         String[] args = {Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.intForQuery(ReaderDatabase.getReadableDb(),
-                                    "SELECT num_likes FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                    args);
+                "SELECT num_likes FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     public static boolean isPostLikedByCurrentUser(ReaderPost post) {
@@ -482,8 +502,8 @@ public static boolean isPostLikedByCurrentUser(ReaderPost post) {
     public static boolean isPostLikedByCurrentUser(long blogId, long postId) {
         String[] args = new String[]{Long.toString(blogId), Long.toString(postId)};
         return SqlUtils.boolForQuery(ReaderDatabase.getReadableDb(),
-                                     "SELECT is_liked FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                     args);
+                "SELECT is_liked FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
     }
 
     /*
@@ -530,8 +550,30 @@ public static boolean isPostFollowed(ReaderPost post) {
         }
         String[] args = new String[]{Long.toString(post.blogId), Long.toString(post.postId)};
         return SqlUtils.boolForQuery(ReaderDatabase.getReadableDb(),
-                                     "SELECT is_followed FROM tbl_posts WHERE blog_id=? AND post_id=?",
-                                     args);
+                "SELECT is_followed FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
+    }
+
+    public static boolean isPostSeen(ReaderPost post) {
+        String[] args = new String[]{Long.toString(post.blogId), Long.toString(post.postId)};
+        return SqlUtils.boolForQuery(ReaderDatabase.getReadableDb(),
+                "SELECT is_seen FROM tbl_posts WHERE blog_id=? AND post_id=?",
+                args);
+    }
+
+    public static void setPostSeenStatus(ReaderPost post, boolean isSeen) {
+        SQLiteDatabase db = ReaderDatabase.getWritableDb();
+        db.beginTransaction();
+        try {
+            String sql = "UPDATE tbl_posts SET is_seen=" + SqlUtils.boolToSql(isSeen)
+                         + " WHERE blog_id=? AND post_id=?";
+            db.execSQL(sql, new String[]{Long.toString(post.blogId), Long.toString(post.postId)});
+
+            db.setTransactionSuccessful();
+            EventBus.getDefault().post(ReaderPostTableActionEnded.INSTANCE);
+        } finally {
+            db.endTransaction();
+        }
     }
 
     public static int deletePostsWithTag(final ReaderTag tag) {
@@ -772,14 +814,16 @@ private static void setFollowStatusForPosts(long blogId, long feedId, boolean is
             }
 
 
-            // if blog/feed is no longer followed, remove its posts tagged with "Followed Sites"
+            // if blog/feed is no longer followed, remove its posts tagged with "Followed Sites" or "P2"
             if (!isFollowed) {
                 if (blogId != 0) {
-                    db.delete("tbl_posts", "blog_id=? AND tag_name=?",
-                              new String[]{Long.toString(blogId), ReaderTag.TAG_TITLE_FOLLOWED_SITES});
+                    db.delete("tbl_posts", "blog_id=? AND (tag_name=? OR tag_name=?)",
+                            new String[]{Long.toString(blogId), ReaderTag.TAG_TITLE_FOLLOWED_SITES,
+                                    ReaderTag.TAG_SLUG_P2});
                 } else {
-                    db.delete("tbl_posts", "feed_id=? AND tag_name=?",
-                              new String[]{Long.toString(feedId), ReaderTag.TAG_TITLE_FOLLOWED_SITES});
+                    db.delete("tbl_posts", "feed_id=? AND (tag_name=? OR tag_name=?)",
+                            new String[]{Long.toString(feedId), ReaderTag.TAG_TITLE_FOLLOWED_SITES,
+                                    ReaderTag.TAG_SLUG_P2});
                 }
             }
 
@@ -810,8 +854,8 @@ private static String maxText(final ReaderPost post) {
             AppLog.w(AppLog.T.READER, "reader post table > max text exceeded, storing excerpt");
             return "<p>" + post.getExcerpt() + "</p>"
                    + String.format("<p style='text-align:center'><a href='%s'>%s</a></p>",
-                                   post.getUrl(),
-                                   WordPress.getContext().getString(R.string.reader_label_view_original));
+                    post.getUrl(),
+                    WordPress.getContext().getString(R.string.reader_label_view_original));
         } else {
             AppLog.w(AppLog.T.READER, "reader post table > max text exceeded, storing truncated text");
             return post.getText().substring(0, MAX_TEXT_LEN);
@@ -831,7 +875,7 @@ public static void addOrUpdatePosts(final ReaderTag tag, ReaderPostList posts) {
                 + COLUMN_NAMES
                 + ") VALUES (?1,?2,?3,?4,?5,?6,?7,?8,?9,?10,?11,?12,?13,?14,?15,?16,?17,?18,?19,?20,?21,?22,?23,?24,"
                 + "?25,?26,?27,?28,?29,?30,?31,?32,?33,?34,?35,?36,?37,?38,?39,?40,?41,?42,?43,?44, ?45, ?46, ?47,"
-                + "?48)");
+                + "?48,?49,?50,?51,?52,?53)");
 
         db.beginTransaction();
         try {
@@ -892,6 +936,11 @@ public static void addOrUpdatePosts(final ReaderTag tag, ReaderPostList posts) {
                 stmtPosts.bindLong(46, SqlUtils.boolToSql(post.isBookmarked));
                 stmtPosts.bindLong(47, SqlUtils.boolToSql(post.isPrivateAtomic));
                 stmtPosts.bindString(48, ReaderUtils.getCommaSeparatedTagSlugs(post.getTags()));
+                stmtPosts.bindLong(49, post.organizationId);
+                stmtPosts.bindLong(50, SqlUtils.boolToSql(post.isSeen));
+                stmtPosts.bindLong(51, SqlUtils.boolToSql(post.isSeenSupported));
+                stmtPosts.bindLong(52, post.authorBlogId);
+                stmtPosts.bindString(53, post.getAuthorBlogUrl());
                 stmtPosts.execute();
             }
 
@@ -924,7 +973,7 @@ public static ReaderPostList getPostsWithTag(ReaderTag tag, int maxPosts, boolea
         sql += " ORDER BY " + getSortColumnForTag(tag) + " DESC";
 
         if (maxPosts > 0) {
-            sql += " LIMIT " + Integer.toString(maxPosts);
+            sql += " LIMIT " + maxPosts;
         }
 
         String[] args = {tag.getTagSlug(), Integer.toString(tag.tagType.toInt())};
@@ -942,7 +991,7 @@ public static ReaderPostList getPostsInBlog(long blogId, int maxPosts, boolean e
                 "SELECT " + columns + " FROM tbl_posts WHERE blog_id=? AND tag_name='' ORDER BY date_published DESC";
 
         if (maxPosts > 0) {
-            sql += " LIMIT " + Integer.toString(maxPosts);
+            sql += " LIMIT " + maxPosts;
         }
 
         Cursor cursor = ReaderDatabase.getReadableDb().rawQuery(sql, new String[]{Long.toString(blogId)});
@@ -969,7 +1018,7 @@ public static ReaderPostList getPostsInFeed(long feedId, int maxPosts, boolean e
                 "SELECT " + columns + " FROM tbl_posts WHERE feed_id=? AND tag_name='' ORDER BY date_published DESC";
 
         if (maxPosts > 0) {
-            sql += " LIMIT " + Integer.toString(maxPosts);
+            sql += " LIMIT " + maxPosts;
         }
 
         Cursor cursor = ReaderDatabase.getReadableDb().rawQuery(sql, new String[]{Long.toString(feedId)});
@@ -1001,7 +1050,7 @@ public static ReaderBlogIdPostIdList getBlogIdPostIdsWithTag(ReaderTag tag, int
         sql += " ORDER BY " + getSortColumnForTag(tag) + " DESC";
 
         if (maxPosts > 0) {
-            sql += " LIMIT " + Integer.toString(maxPosts);
+            sql += " LIMIT " + maxPosts;
         }
 
         String[] args = {tag.getTagSlug(), Integer.toString(tag.tagType.toInt())};
@@ -1016,7 +1065,7 @@ private static ReaderBlogIdPostIdList getBlogIdPostIdsWithTagType(ReaderTagType
         String sql = "SELECT blog_id, post_id FROM tbl_posts WHERE tag_type=?";
 
         if (maxPosts > 0) {
-            sql += " LIMIT " + Integer.toString(maxPosts);
+            sql += " LIMIT " + maxPosts;
         }
 
         String[] args = {Integer.toString(tagType.toInt())};
@@ -1045,7 +1094,7 @@ public static ReaderBlogIdPostIdList getBlogIdPostIdsInBlog(long blogId, int max
         String sql = "SELECT post_id FROM tbl_posts WHERE blog_id=? AND tag_name='' ORDER BY date_published DESC";
 
         if (maxPosts > 0) {
-            sql += " LIMIT " + Integer.toString(maxPosts);
+            sql += " LIMIT " + maxPosts;
         }
 
         Cursor cursor = ReaderDatabase.getReadableDb().rawQuery(sql, new String[]{Long.toString(blogId)});
@@ -1140,11 +1189,18 @@ private static ReaderPost getPostFromCursor(Cursor c) {
 
         post.useExcerpt = SqlUtils.sqlToBool(c.getInt(c.getColumnIndex("use_excerpt")));
 
+        post.isSeen = SqlUtils.sqlToBool(c.getInt(c.getColumnIndex("is_seen")));
+        post.isSeenSupported = SqlUtils.sqlToBool(c.getInt(c.getColumnIndex("is_seen_supported")));
+
         String commaSeparatedTags = (c.getString(c.getColumnIndex("tags")));
         if (commaSeparatedTags != null) {
             post.setTags(ReaderUtils.getTagsFromCommaSeparatedSlugs(commaSeparatedTags));
         }
 
+        post.organizationId = c.getInt(c.getColumnIndex("organization_id"));
+        post.authorBlogId = c.getLong(c.getColumnIndex("author_blog_id"));
+        post.setAuthorBlogUrl(c.getString(c.getColumnIndex("author_blog_url")));
+
         return post;
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/SuggestionTable.java b/WordPress/src/main/java/org/wordpress/android/datasets/UserSuggestionTable.java
similarity index 90%
rename from WordPress/src/main/java/org/wordpress/android/datasets/SuggestionTable.java
rename to WordPress/src/main/java/org/wordpress/android/datasets/UserSuggestionTable.java
index 01de5424b653..02a20e9e6505 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/SuggestionTable.java
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/UserSuggestionTable.java
@@ -5,7 +5,7 @@
 import android.database.sqlite.SQLiteDatabase;
 
 import org.wordpress.android.WordPress;
-import org.wordpress.android.models.Suggestion;
+import org.wordpress.android.models.UserSuggestion;
 import org.wordpress.android.models.Tag;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.SqlUtils;
@@ -13,7 +13,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class SuggestionTable {
+public class UserSuggestionTable {
     private static final String SUGGESTIONS_TABLE = "suggestions";
     private static final String TAXONOMY_TABLE = "taxonomy";
 
@@ -52,7 +52,7 @@ private static SQLiteDatabase getWritableDb() {
         return WordPress.wpDB.getDatabase();
     }
 
-    public static void insertSuggestionsForSite(final long siteId, final List<Suggestion> suggestions) {
+    public static void insertSuggestionsForSite(final long siteId, final List<UserSuggestion> suggestions) {
         // we want to delete the current suggestions, so that removed users will not show up as a suggestion
         deleteSuggestionsForSite(siteId);
 
@@ -60,7 +60,7 @@ public static void insertSuggestionsForSite(final long siteId, final List<Sugges
         // performance when there are a lot of suggestions
         getWritableDb().beginTransaction();
         if (suggestions != null) {
-            for (Suggestion suggestion : suggestions) {
+            for (UserSuggestion suggestion : suggestions) {
                 addSuggestion(suggestion);
             }
         }
@@ -68,7 +68,7 @@ public static void insertSuggestionsForSite(final long siteId, final List<Sugges
         getWritableDb().endTransaction();
     }
 
-    public static void addSuggestion(final Suggestion suggestion) {
+    public static void addSuggestion(final UserSuggestion suggestion) {
         if (suggestion == null) {
             return;
         }
@@ -83,8 +83,8 @@ public static void addSuggestion(final Suggestion suggestion) {
         getWritableDb().insertWithOnConflict(SUGGESTIONS_TABLE, null, values, SQLiteDatabase.CONFLICT_REPLACE);
     }
 
-    public static List<Suggestion> getSuggestionsForSite(long siteId) {
-        List<Suggestion> suggestions = new ArrayList<Suggestion>();
+    public static List<UserSuggestion> getSuggestionsForSite(long siteId) {
+        List<UserSuggestion> suggestions = new ArrayList<UserSuggestion>();
 
         String[] args = {Long.toString(siteId)};
         Cursor c = getReadableDb()
@@ -93,7 +93,7 @@ public static List<Suggestion> getSuggestionsForSite(long siteId) {
         try {
             if (c.moveToFirst()) {
                 do {
-                    Suggestion comment = getSuggestionFromCursor(c);
+                    UserSuggestion comment = getSuggestionFromCursor(c);
                     suggestions.add(comment);
                 } while (c.moveToNext());
             }
@@ -108,7 +108,7 @@ public static int deleteSuggestionsForSite(long siteId) {
         return getWritableDb().delete(SUGGESTIONS_TABLE, "site_id=?", new String[]{Long.toString(siteId)});
     }
 
-    private static Suggestion getSuggestionFromCursor(Cursor c) {
+    private static UserSuggestion getSuggestionFromCursor(Cursor c) {
         final String userLogin = c.getString(c.getColumnIndex("user_login"));
         final String displayName = c.getString(c.getColumnIndex("display_name"));
         final String imageUrl = c.getString(c.getColumnIndex("image_url"));
@@ -116,7 +116,7 @@ private static Suggestion getSuggestionFromCursor(Cursor c) {
 
         long siteId = c.getLong(c.getColumnIndex("site_id"));
 
-        return new Suggestion(
+        return new UserSuggestion(
                 siteId,
                 userLogin,
                 displayName,
diff --git a/WordPress/src/main/java/org/wordpress/android/datasets/wrappers/ReaderPostTableWrapper.kt b/WordPress/src/main/java/org/wordpress/android/datasets/wrappers/ReaderPostTableWrapper.kt
index 65902f2b7bdc..f9dccd5447c9 100644
--- a/WordPress/src/main/java/org/wordpress/android/datasets/wrappers/ReaderPostTableWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/datasets/wrappers/ReaderPostTableWrapper.kt
@@ -12,8 +12,15 @@ class ReaderPostTableWrapper @Inject constructor() {
     fun getBlogPost(blogId: Long, postId: Long, excludeTextColumn: Boolean): ReaderPost? =
             ReaderPostTable.getBlogPost(blogId, postId, excludeTextColumn)
 
+    fun getFeedPost(blogId: Long, postId: Long, excludeTextColumn: Boolean): ReaderPost? = ReaderPostTable
+            .getFeedPost(blogId, postId, excludeTextColumn)
+
     fun isPostFollowed(post: ReaderPost): Boolean = ReaderPostTable.isPostFollowed(post)
 
+    fun isPostSeen(post: ReaderPost): Boolean = ReaderPostTable.isPostSeen(post)
+
+    fun setPostSeenStatusInDb(post: ReaderPost, isSeen: Boolean) = ReaderPostTable.setPostSeenStatus(post, isSeen)
+
     fun getPostsWithTag(
         readerTag: ReaderTag,
         maxRows: Int,
diff --git a/WordPress/src/main/java/org/wordpress/android/models/InvitePeopleUtils.kt b/WordPress/src/main/java/org/wordpress/android/models/InvitePeopleUtils.kt
new file mode 100644
index 000000000000..8132c9c8d361
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/models/InvitePeopleUtils.kt
@@ -0,0 +1,97 @@
+package org.wordpress.android.models
+
+import dagger.Reusable
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.models.wrappers.RoleUtilsWrapper
+import org.wordpress.android.models.wrappers.SimpleDateFormatWrapper
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksItem
+import org.wordpress.android.ui.people.InviteLinksUiItem
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.DateTimeUtilsWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+@Reusable
+class InvitePeopleUtils @Inject constructor(
+    private val siteStore: SiteStore,
+    private val contextProvider: ContextProvider,
+    private val dateTimeUtilsWrapper: DateTimeUtilsWrapper,
+    private val roleUtilsWrapper: RoleUtilsWrapper,
+    private val simpleDateFormatWrapper: SimpleDateFormatWrapper
+) {
+    fun getInviteLinkDataFromRoleDisplayName(
+        inviteLinksData: MutableList<InviteLinksItem>,
+        siteModel: SiteModel,
+        roleDisplayName: String
+    ): InviteLinksItem? {
+        val roles = getMappedLinksUiItems(inviteLinksData, siteModel)
+
+        return inviteLinksData.firstOrNull { linksItem ->
+            roles.firstOrNull { linksUiItem ->
+                linksItem.role.equals(linksUiItem.roleName, ignoreCase = true) &&
+                        linksUiItem.roleDisplayName.equals(roleDisplayName, ignoreCase = true)
+            } != null
+        }
+    }
+
+    fun getDisplayNameForRole(
+        siteModel: SiteModel,
+        roleName: String
+    ): String {
+        val roles = roleUtilsWrapper.getInviteRoles(siteStore, siteModel, contextProvider.getContext())
+
+        return roles.firstOrNull { roleModel ->
+            roleModel.name.equals(roleName, ignoreCase = true)
+        }?.displayName ?: ""
+    }
+
+    fun getMappedLinksUiItems(
+        inviteLinksData: MutableList<InviteLinksItem>,
+        siteModel: SiteModel
+    ): List<InviteLinksUiItem> {
+        val formatter = simpleDateFormatWrapper.getDateInstance()
+        val roles = roleUtilsWrapper.getInviteRoles(siteStore, siteModel, contextProvider.getContext())
+
+        AppLog.d(T.PEOPLE, "getMappedLinksUiItems > ${siteModel.siteId}")
+        AppLog.d(
+                T.PEOPLE,
+                "getMappedLinksUiItems > roles: ${roles.map { "DisplayName: ${it.displayName} Name: ${it.name}" }}"
+        )
+        AppLog.d(
+                T.PEOPLE,
+                "getMappedLinksUiItems > " +
+                        "inviteLinksData: ${inviteLinksData.map { "DisplayName: ${it.role} Expiry: ${it.expiry}" }}"
+        )
+
+        return roles.let {
+            it.filter { role ->
+                inviteLinksData.firstOrNull { linksItem ->
+                    role.name.equals(linksItem.role, ignoreCase = true)
+                } != null
+            }.map { role ->
+                val linksData = inviteLinksData.first { linksItem ->
+                    role.name.equals(linksItem.role, ignoreCase = true)
+                }
+
+                InviteLinksUiItem(
+                        roleName = role.name,
+                        roleDisplayName = role.displayName,
+                        expiryDate = formatter.format(dateTimeUtilsWrapper.dateFromTimestamp(linksData.expiry))
+                )
+            }
+        } ?: listOf()
+    }
+
+    fun getInviteLinksRoleDisplayNames(
+        inviteLinksData: MutableList<InviteLinksItem>,
+        siteModel: SiteModel
+    ): List<String> {
+        val mappedRolesItems = getMappedLinksUiItems(inviteLinksData, siteModel)
+
+        return mappedRolesItems.map { linksItem ->
+            linksItem.roleDisplayName
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/models/JetpackSettingsModel.java b/WordPress/src/main/java/org/wordpress/android/models/JetpackSettingsModel.java
index d7d8717fd841..eb632cbb9474 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/JetpackSettingsModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/JetpackSettingsModel.java
@@ -6,7 +6,7 @@
 import java.util.Set;
 
 public class JetpackSettingsModel {
-    public final ArrayList<String> jetpackProtectWhitelist = new ArrayList<>();
+    public final ArrayList<String> jetpackProtectAllowlist = new ArrayList<>();
 
     public long localTableId;
     public boolean monitorActive;
@@ -44,7 +44,7 @@ public JetpackSettingsModel(final JetpackSettingsModel other) {
         ssoMatchEmail = other.ssoMatchEmail;
         ssoRequireTwoFactor = other.ssoRequireTwoFactor;
         commentLikes = other.commentLikes;
-        jetpackProtectWhitelist.addAll(other.jetpackProtectWhitelist);
+        jetpackProtectAllowlist.addAll(other.jetpackProtectAllowlist);
         serveImagesFromOurServers = other.serveImagesFromOurServers;
         serveStaticFilesFromOurServers = other.serveStaticFilesFromOurServers;
         lazyLoadImages = other.lazyLoadImages;
@@ -58,29 +58,29 @@ public boolean equals(Object other) {
         if (!(other instanceof JetpackSettingsModel)) return false;
         JetpackSettingsModel otherModel = (JetpackSettingsModel) other;
         return monitorActive == otherModel.monitorActive
-                && emailNotifications == otherModel.emailNotifications
-                && wpNotifications == otherModel.wpNotifications
-                && jetpackProtectEnabled == otherModel.jetpackProtectEnabled
-                && ssoActive == otherModel.ssoActive
-                && ssoMatchEmail == otherModel.ssoMatchEmail
-                && ssoRequireTwoFactor == otherModel.ssoRequireTwoFactor
-                && serveImagesFromOurServers == otherModel.serveImagesFromOurServers
-                && serveStaticFilesFromOurServers == otherModel.serveStaticFilesFromOurServers
-                && lazyLoadImages == otherModel.lazyLoadImages
-                && commentLikes == otherModel.commentLikes
-                && sharingEnabled == otherModel.sharingEnabled
-                && improvedSearch == otherModel.improvedSearch
-                && adFreeVideoHosting == otherModel.adFreeVideoHosting
-                && whitelistMatches(otherModel.jetpackProtectWhitelist);
+               && emailNotifications == otherModel.emailNotifications
+               && wpNotifications == otherModel.wpNotifications
+               && jetpackProtectEnabled == otherModel.jetpackProtectEnabled
+               && ssoActive == otherModel.ssoActive
+               && ssoMatchEmail == otherModel.ssoMatchEmail
+               && ssoRequireTwoFactor == otherModel.ssoRequireTwoFactor
+               && serveImagesFromOurServers == otherModel.serveImagesFromOurServers
+               && serveStaticFilesFromOurServers == otherModel.serveStaticFilesFromOurServers
+               && lazyLoadImages == otherModel.lazyLoadImages
+               && commentLikes == otherModel.commentLikes
+               && sharingEnabled == otherModel.sharingEnabled
+               && improvedSearch == otherModel.improvedSearch
+               && adFreeVideoHosting == otherModel.adFreeVideoHosting
+               && allowlistMatches(otherModel.jetpackProtectAllowlist);
     }
 
-    public boolean whitelistMatches(List<String> otherWhitelist) {
-        if (otherWhitelist == null) {
+    public boolean allowlistMatches(List<String> otherAllowlist) {
+        if (otherAllowlist == null) {
             return false;
         }
 
-        Set<String> whitelistSet = new HashSet<>(jetpackProtectWhitelist);
-        Set<String> otherSet = new HashSet<>(otherWhitelist);
-        return whitelistSet.equals(otherSet);
+        Set<String> allowlistSet = new HashSet<>(jetpackProtectAllowlist);
+        Set<String> otherSet = new HashSet<>(otherAllowlist);
+        return allowlistSet.equals(otherSet);
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/models/Note.java b/WordPress/src/main/java/org/wordpress/android/models/Note.java
index fd2d1559a9a2..c9f9d01c2522 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Note.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/Note.java
@@ -40,6 +40,7 @@ public class Note {
     public static final String NOTE_COMMENT_LIKE_TYPE = "comment_like";
     public static final String NOTE_REBLOG_TYPE = "reblog";
     public static final String NOTE_NEW_POST_TYPE = "new_post";
+    public static final String NOTE_VIEW_MILESTONE = "view_milestone";
     public static final String NOTE_UNKNOWN_TYPE = "unknown";
 
     // JSON action keys
@@ -132,6 +133,10 @@ public Boolean isReblogType() {
         return isType(NOTE_REBLOG_TYPE);
     }
 
+    public Boolean isViewMilestoneType() {
+        return isType(NOTE_VIEW_MILESTONE);
+    }
+
     public Boolean isCommentReplyType() {
         return isCommentType() && getParentCommentId() > 0;
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/models/NoticonUtils.kt b/WordPress/src/main/java/org/wordpress/android/models/NoticonUtils.kt
index f8aab629a4f0..ce02662dc261 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/NoticonUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/models/NoticonUtils.kt
@@ -6,8 +6,7 @@ import javax.inject.Inject
 class NoticonUtils
 @Inject constructor() {
     fun noticonToGridicon(noticon: String): Int {
-        // Transformation based on Calypso:
-        // https://github.com/Automattic/wp-calypso/blob/master/apps/notifications/src/panel/utils/noticon2gridicon.js
+        // Transformation based on Calypso: https://git.io/JqUEC
         return when (noticon) {
             "\uf814" -> R.drawable.ic_mention_white_24dp
             "\uf300" -> R.drawable.ic_comment_white_24dp
diff --git a/WordPress/src/main/java/org/wordpress/android/models/NotificationsSettings.java b/WordPress/src/main/java/org/wordpress/android/models/NotificationsSettings.java
index 1c28dfecaba5..a41446992b4a 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/NotificationsSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/NotificationsSettings.java
@@ -135,19 +135,19 @@ public JSONObject getSettingsJsonForChannelAndType(Channel channel, Type type, l
     }
 
     /**
-     * Determines if the master switch should be displayed on a notifications settings preference screen
+     * Determines if the main switch should be displayed on a notifications settings preference screen
      * for the given {@link Channel} and {@link Type}
      *
      * @param channel The {@link Channel}
      * @param type The {@link Type}
-     * @return A flag indicating whether master switch should be displayed.
+     * @return A flag indicating whether main switch should be displayed.
      */
-    public boolean shouldDisplayMasterSwitch(Channel channel, Type type) {
-        boolean displayMasterSwitch = false;
+    public boolean shouldDisplayMainSwitch(Channel channel, Type type) {
+        boolean displayMainSwitch = false;
         switch (channel) {
             case BLOGS:
                 if (type == Type.TIMELINE) {
-                    displayMasterSwitch = true;
+                    displayMainSwitch = true;
                 }
                 break;
             case OTHER:
@@ -156,7 +156,7 @@ public boolean shouldDisplayMasterSwitch(Channel channel, Type type) {
                 break;
         }
 
-        return displayMasterSwitch;
+        return displayMainSwitch;
     }
 
     /**
diff --git a/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java b/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java
index d27fb6ec740f..8e3930af7eec 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/ReaderBlog.java
@@ -3,6 +3,7 @@
 import android.text.TextUtils;
 
 import org.json.JSONObject;
+import org.wordpress.android.ui.Organization;
 import org.wordpress.android.util.JSONUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.UrlUtils;
@@ -18,6 +19,8 @@ public class ReaderBlog {
     public boolean isFollowing;
     public boolean isNotificationsEnabled;
     public int numSubscribers;
+    public int organizationId;
+    public int numUnseenPosts;
 
     private String mName;
     private String mDescription;
@@ -54,6 +57,7 @@ public static ReaderBlog fromJson(JSONObject json) {
             if (jsonIcon != null) {
                 blog.setImageUrl(JSONUtils.getString(jsonIcon, "img"));
             }
+            blog.organizationId = jsonSite.optInt("organization_id");
         } else if (jsonFeed != null) {
             blog.feedId = jsonFeed.optLong("feed_ID");
             blog.setFeedUrl(JSONUtils.getString(jsonFeed, "feed_URL"));
@@ -78,6 +82,8 @@ public static ReaderBlog fromJson(JSONObject json) {
             blog.numSubscribers = json.optInt("subscribers_count");
         }
 
+        blog.numUnseenPosts = json.optInt("unseen_count");
+
         // blogId will be empty for feeds, so set it to the feedId (consistent with /read/ endpoints)
         if (blog.blogId == 0 && blog.feedId != 0) {
             blog.blogId = blog.feedId;
@@ -158,6 +164,17 @@ public boolean isExternal() {
         return (feedId != 0);
     }
 
+    public Organization getOrganization() {
+        return Organization.fromOrgId(organizationId);
+    }
+
+    /*
+     * returns true if this is a P2 or A8C site
+     */
+    public boolean isP2orA8C() {
+        return getOrganization() == Organization.P2 || getOrganization() == Organization.A8C;
+    }
+
     /*
      * returns the mshot url to use for this blog, ex:
      * http://s.wordpress.com/mshots/v1/http%3A%2F%2Fnickbradbury.com?w=600
@@ -178,6 +195,7 @@ public boolean isSameAs(ReaderBlog blogInfo) {
                && this.isFollowing == blogInfo.isFollowing
                && this.isPrivate == blogInfo.isPrivate
                && this.numSubscribers == blogInfo.numSubscribers
+               && this.numUnseenPosts == blogInfo.numUnseenPosts
                && this.getName().equals(blogInfo.getName())
                && this.getDescription().equals(blogInfo.getDescription())
                && this.getUrl().equals(blogInfo.getUrl())
diff --git a/WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java b/WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java
index 5ce9840584f9..769662295373 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/ReaderPost.java
@@ -5,6 +5,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wordpress.android.ui.Organization;
 import org.wordpress.android.ui.reader.ReaderConstants;
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId;
 import org.wordpress.android.ui.reader.utils.ReaderIframeScanner;
@@ -28,6 +29,7 @@ public class ReaderPost {
     public long feedId;
     public long feedItemId;
     public long authorId;
+    public long authorBlogId;
 
     private String mTitle;
     private String mText;
@@ -52,6 +54,7 @@ public class ReaderPost {
     private String mShortUrl;
     private String mFeaturedImage;
     private String mFeaturedVideo;
+    private String mAuthorBlogUrl;
 
     public int numReplies; // includes comments, trackbacks & pingbacks
     public int numLikes;
@@ -66,6 +69,10 @@ public class ReaderPost {
     public boolean isVideoPress;
     public boolean isJetpack;
     public boolean useExcerpt;
+    public boolean isSeen;
+    public boolean isSeenSupported; // might not be supported for posts created before 2020-07-13
+
+    public int organizationId;
 
     private String mAttachmentsJson;
     private String mDiscoverJson;
@@ -113,6 +120,8 @@ public static ReaderPost fromJson(JSONObject json) {
         post.isPrivateAtomic = JSONUtils.getBool(json, "site_is_atomic");
         post.isJetpack = JSONUtils.getBool(json, "is_jetpack");
         post.useExcerpt = JSONUtils.getBool(json, "use_excerpt");
+        post.isSeen = JSONUtils.getBool(json, "is_seen");
+        post.isSeenSupported = json.has("is_seen");
 
         JSONObject jsonDiscussion = json.optJSONObject("discussion");
         if (jsonDiscussion != null) {
@@ -168,6 +177,8 @@ public static ReaderPost fromJson(JSONObject json) {
             }
             // TODO: as of 29-Sept-2014, this is broken - endpoint returns false when it should be true
             post.isJetpack = JSONUtils.getBool(jsonSite, "jetpack");
+
+            post.organizationId = jsonSite.optInt("organization_id");
         }
 
         // "discover" posts
@@ -265,6 +276,7 @@ private static void assignAuthorFromJson(ReaderPost post, JSONObject jsonAuthor)
         post.mAuthorName = JSONUtils.getStringDecoded(jsonAuthor, "name");
         post.mAuthorFirstName = JSONUtils.getStringDecoded(jsonAuthor, "first_name");
         post.authorId = jsonAuthor.optLong("ID");
+        post.authorBlogId = jsonAuthor.optLong("site_ID");
 
         // v1.2 endpoint contains a "has_avatar" boolean which tells us whether the author
         // has a valid avatar - if this field exists and is set to false, skip setting
@@ -283,6 +295,8 @@ private static void assignAuthorFromJson(ReaderPost post, JSONObject jsonAuthor)
         if (TextUtils.isEmpty(post.mBlogUrl)) {
             post.setBlogUrl(JSONUtils.getString(jsonAuthor, "URL"));
         }
+
+        post.setAuthorBlogUrl(JSONUtils.getString(jsonAuthor, "URL"));
     }
 
     /*
@@ -475,6 +489,14 @@ public void setBlogUrl(String blogUrl) {
         this.mBlogUrl = StringUtils.notNullStr(blogUrl);
     }
 
+    public String getAuthorBlogUrl() {
+        return StringUtils.notNullStr(mAuthorBlogUrl);
+    }
+
+    public void setAuthorBlogUrl(String authorBlogUrl) {
+        this.mAuthorBlogUrl = StringUtils.notNullStr(authorBlogUrl);
+    }
+
     public String getBlogImageUrl() {
         return StringUtils.notNullStr(mBlogImageUrl);
     }
@@ -555,6 +577,14 @@ public boolean hasSecondaryTag() {
         return !TextUtils.isEmpty(mSecondaryTag);
     }
 
+    public Organization getOrganization() {
+        return Organization.fromOrgId(organizationId);
+    }
+
+    public void setOrganization(Organization organization) {
+        organizationId = organization.getOrgId();
+    }
+
     /*
      * attachments are stored as the actual JSON to avoid having a separate table for
      * them, may need to revisit this if/when attachments become more important
@@ -668,6 +698,13 @@ public boolean isXpost() {
         return xpostBlogId != 0 && xpostPostId != 0;
     }
 
+    /*
+     * returns true if this is a P2 or A8C post
+     */
+    public boolean isP2orA8C() {
+        return getOrganization() == Organization.P2 || getOrganization() == Organization.A8C;
+    }
+
     /*
      * returns true if the passed post appears to be the same as this one - used when posts are
      * retrieved to determine which ones are new/changed/unchanged
diff --git a/WordPress/src/main/java/org/wordpress/android/models/ReaderTag.java b/WordPress/src/main/java/org/wordpress/android/models/ReaderTag.java
index 98596edd055d..a8e8018e9814 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/ReaderTag.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/ReaderTag.java
@@ -2,6 +2,7 @@
 
 import android.text.TextUtils;
 
+import org.wordpress.android.ui.Organization;
 import org.wordpress.android.ui.reader.ReaderConstants;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.util.StringUtils;
@@ -17,6 +18,7 @@ public class ReaderTag implements Serializable, FilterCriteria {
             ReaderConstants.DISCOVER_SITE_ID);
 
     public static final String TAG_TITLE_FOLLOWED_SITES = "Followed Sites";
+    public static final String TAG_SLUG_P2 = "p2";
     public static final String TAG_SLUG_BOOKMARKED = "bookmarked-posts";
     public static final String TAG_TITLE_DEFAULT = TAG_TITLE_FOLLOWED_SITES;
     public static final String TAG_ENDPOINT_DEFAULT = FOLLOWING_PATH;
@@ -191,11 +193,41 @@ public boolean isTagTopic() {
         return endpoint.toLowerCase(Locale.ROOT).contains("/read/tags/");
     }
 
+    public boolean isP2() {
+        String endpoint = getEndpoint();
+        return endpoint.toLowerCase(Locale.ROOT).contains("/read/following/p2");
+    }
+
+    public boolean isA8C() {
+        String endpoint = getEndpoint();
+        return endpoint.toLowerCase(Locale.ROOT).contains("/read/a8c");
+    }
+
+    public boolean isFilterable() {
+        return this.isFollowedSites() || this.isA8C() || this.isP2();
+    }
+
     public boolean isListTopic() {
         String endpoint = getEndpoint();
         return endpoint.toLowerCase(Locale.ROOT).contains("/read/list/");
     }
 
+    public Organization getOrganization() {
+        if (this.isA8C()) {
+            return Organization.A8C;
+        } else if (this.isP2()) {
+            return Organization.P2;
+        } else if (this.isFollowedSites() || this.isDefaultInMemoryTag()) {
+            return Organization.NO_ORGANIZATION;
+        } else {
+            return Organization.UNKNOWN;
+        }
+    }
+
+    public String getKeyString() {
+        return tagType.toInt() + getTagSlug();
+    }
+
     /*
      * the label is the text displayed in the dropdown filter
      */
diff --git a/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java b/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java
index 28be8eeaf959..6df388644a8b 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/RoleUtils.java
@@ -1,6 +1,6 @@
 package org.wordpress.android.models;
 
-import androidx.fragment.app.Fragment;
+import android.content.Context;
 
 import org.wordpress.android.R;
 import org.wordpress.android.fluxc.model.RoleModel;
@@ -22,7 +22,7 @@ public static String getDisplayName(String userRole, List<RoleModel> siteUserRol
         return StringUtils.capitalize(userRole);
     }
 
-    public static List<RoleModel> getInviteRoles(SiteStore siteStore, SiteModel siteModel, Fragment fragment) {
+    public static List<RoleModel> getInviteRoles(SiteStore siteStore, SiteModel siteModel, Context context) {
         // Setup invite roles
         List<RoleModel> inviteRoles = siteStore.getUserRoles(siteModel);
         // The API doesn't return the follower/viewer role, so we need to manually add it for invites
@@ -30,7 +30,7 @@ public static List<RoleModel> getInviteRoles(SiteStore siteStore, SiteModel site
         // the remote expects "follower" as the role parameter even if the role is "viewer"
         viewerOrFollowerRole.setName("follower");
         int displayNameRes = siteModel.isPrivate() ? R.string.role_viewer : R.string.role_follower;
-        viewerOrFollowerRole.setDisplayName(fragment.getString(displayNameRes));
+        viewerOrFollowerRole.setDisplayName(context.getString(displayNameRes));
         inviteRoles.add(viewerOrFollowerRole);
         return inviteRoles;
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java b/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
index af15c32e4ef5..7d47715cf0a5 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java
@@ -51,9 +51,9 @@ public class SiteSettingsModel {
     private static final String MANUAL_APPROVAL_COLUMN_NAME = "manualApproval";
     private static final String IDENTITY_REQUIRED_COLUMN_NAME = "identityRequired";
     private static final String USER_ACCOUNT_REQUIRED_COLUMN_NAME = "userAccountRequired";
-    private static final String WHITELIST_COLUMN_NAME = "whitelist";
+    private static final String ALLOWLIST_COLUMN_NAME = "whitelist";
     private static final String MODERATION_KEYS_COLUMN_NAME = "moderationKeys";
-    private static final String BLACKLIST_KEYS_COLUMN_NAME = "blacklistKeys";
+    private static final String DENYLIST_KEYS_COLUMN_NAME = "blacklistKeys";
     private static final String SHARING_LABEL_COLUMN_NAME = "sharingLabel";
     private static final String SHARING_BUTTON_STYLE_COLUMN_NAME = "sharingButtonStyle";
     private static final String ALLOW_REBLOG_BUTTON_COLUMN_NAME = "allowReblogButton";
@@ -137,9 +137,9 @@ public class SiteSettingsModel {
             + MANUAL_APPROVAL_COLUMN_NAME + " BOOLEAN, "
             + IDENTITY_REQUIRED_COLUMN_NAME + " BOOLEAN, "
             + USER_ACCOUNT_REQUIRED_COLUMN_NAME + " BOOLEAN, "
-            + WHITELIST_COLUMN_NAME + " BOOLEAN, "
+            + ALLOWLIST_COLUMN_NAME + " BOOLEAN, "
             + MODERATION_KEYS_COLUMN_NAME + " TEXT, "
-            + BLACKLIST_KEYS_COLUMN_NAME + " TEXT"
+            + DENYLIST_KEYS_COLUMN_NAME + " TEXT"
             + ");";
 
     public boolean isInLocalTable;
@@ -178,7 +178,7 @@ public class SiteSettingsModel {
     public boolean commentAutoApprovalKnownUsers;
     public int maxLinks;
     public List<String> holdForModeration;
-    public List<String> blacklist;
+    public List<String> denylist;
     public String sharingLabel;
     public String sharingButtonStyle;
     public boolean allowReblogButton;
@@ -242,7 +242,7 @@ && equals(timezone, otherModel.timezone)
                && equals(defaultPostFormat, otherModel.defaultPostFormat)
                && holdForModeration != null
                && holdForModeration.equals(otherModel.holdForModeration)
-               && blacklist != null && blacklist.equals(otherModel.blacklist)
+               && denylist != null && denylist.equals(otherModel.denylist)
                && sharingLabel != null && sharingLabel.equals(otherModel.sharingLabel)
                && sharingButtonStyle != null && sharingButtonStyle.equals(otherModel.sharingButtonStyle)
                && allowReblogButton == otherModel.allowReblogButton
@@ -306,8 +306,8 @@ public void copyFrom(SiteSettingsModel other) {
         if (other.holdForModeration != null) {
             holdForModeration = new ArrayList<>(other.holdForModeration);
         }
-        if (other.blacklist != null) {
-            blacklist = new ArrayList<>(other.blacklist);
+        if (other.denylist != null) {
+            denylist = new ArrayList<>(other.denylist);
         }
         if (other.sharingLabel != null) {
             sharingLabel = other.sharingLabel;
@@ -357,7 +357,7 @@ public void deserializeOptionsDatabaseCursor(Cursor cursor, SparseArrayCompat<Ca
         commentApprovalRequired = getBooleanFromCursor(cursor, MANUAL_APPROVAL_COLUMN_NAME);
         commentsRequireIdentity = getBooleanFromCursor(cursor, IDENTITY_REQUIRED_COLUMN_NAME);
         commentsRequireUserAccount = getBooleanFromCursor(cursor, USER_ACCOUNT_REQUIRED_COLUMN_NAME);
-        commentAutoApprovalKnownUsers = getBooleanFromCursor(cursor, WHITELIST_COLUMN_NAME);
+        commentAutoApprovalKnownUsers = getBooleanFromCursor(cursor, ALLOWLIST_COLUMN_NAME);
         startOfWeek = getStringFromCursor(cursor, START_OF_WEEK_COLUMN_NAME);
         dateFormat = getStringFromCursor(cursor, DATE_FORMAT_COLUMN_NAME);
         timeFormat = getStringFromCursor(cursor, TIME_FORMAT_COLUMN_NAME);
@@ -369,14 +369,14 @@ public void deserializeOptionsDatabaseCursor(Cursor cursor, SparseArrayCompat<Ca
         jetpackSearchEnabled = getBooleanFromCursor(cursor, JETPACK_SEARCH_ENABLED_COLUMN_NAME);
 
         String moderationKeys = getStringFromCursor(cursor, MODERATION_KEYS_COLUMN_NAME);
-        String blacklistKeys = getStringFromCursor(cursor, BLACKLIST_KEYS_COLUMN_NAME);
+        String denylistKeys = getStringFromCursor(cursor, DENYLIST_KEYS_COLUMN_NAME);
         holdForModeration = new ArrayList<>();
-        blacklist = new ArrayList<>();
+        denylist = new ArrayList<>();
         if (!TextUtils.isEmpty(moderationKeys)) {
             Collections.addAll(holdForModeration, moderationKeys.split("\n"));
         }
-        if (!TextUtils.isEmpty(blacklistKeys)) {
-            Collections.addAll(blacklist, blacklistKeys.split("\n"));
+        if (!TextUtils.isEmpty(denylistKeys)) {
+            Collections.addAll(denylist, denylistKeys.split("\n"));
         }
 
         sharingLabel = getStringFromCursor(cursor, SHARING_LABEL_COLUMN_NAME);
@@ -449,7 +449,7 @@ public ContentValues serializeToDatabase() {
         values.put(MANUAL_APPROVAL_COLUMN_NAME, commentApprovalRequired);
         values.put(IDENTITY_REQUIRED_COLUMN_NAME, commentsRequireIdentity);
         values.put(USER_ACCOUNT_REQUIRED_COLUMN_NAME, commentsRequireUserAccount);
-        values.put(WHITELIST_COLUMN_NAME, commentAutoApprovalKnownUsers);
+        values.put(ALLOWLIST_COLUMN_NAME, commentAutoApprovalKnownUsers);
         values.put(START_OF_WEEK_COLUMN_NAME, startOfWeek);
         values.put(DATE_FORMAT_COLUMN_NAME, dateFormat);
         values.put(TIME_FORMAT_COLUMN_NAME, timeFormat);
@@ -460,20 +460,20 @@ public ContentValues serializeToDatabase() {
         values.put(JETPACK_SEARCH_SUPPORTED_COLUMN_NAME, jetpackSearchSupported);
         values.put(JETPACK_SEARCH_ENABLED_COLUMN_NAME, jetpackSearchEnabled);
 
-        String moderationKeys = "";
+        StringBuilder moderationKeys = new StringBuilder();
         if (holdForModeration != null) {
             for (String key : holdForModeration) {
-                moderationKeys += key + "\n";
+                moderationKeys.append(key).append("\n");
             }
         }
-        String blacklistKeys = "";
-        if (blacklist != null) {
-            for (String key : blacklist) {
-                blacklistKeys += key + "\n";
+        StringBuilder denylistKeys = new StringBuilder();
+        if (denylist != null) {
+            for (String key : denylist) {
+                denylistKeys.append(key).append("\n");
             }
         }
-        values.put(MODERATION_KEYS_COLUMN_NAME, moderationKeys);
-        values.put(BLACKLIST_KEYS_COLUMN_NAME, blacklistKeys);
+        values.put(MODERATION_KEYS_COLUMN_NAME, moderationKeys.toString());
+        values.put(DENYLIST_KEYS_COLUMN_NAME, denylistKeys.toString());
         values.put(SHARING_LABEL_COLUMN_NAME, sharingLabel);
         values.put(SHARING_BUTTON_STYLE_COLUMN_NAME, sharingButtonStyle);
         values.put(ALLOW_REBLOG_BUTTON_COLUMN_NAME, allowReblogButton);
diff --git a/WordPress/src/main/java/org/wordpress/android/models/Suggestion.java b/WordPress/src/main/java/org/wordpress/android/models/UserSuggestion.java
similarity index 68%
rename from WordPress/src/main/java/org/wordpress/android/models/Suggestion.java
rename to WordPress/src/main/java/org/wordpress/android/models/UserSuggestion.java
index 7b02e259a175..3c08686a4fee 100644
--- a/WordPress/src/main/java/org/wordpress/android/models/Suggestion.java
+++ b/WordPress/src/main/java/org/wordpress/android/models/UserSuggestion.java
@@ -8,7 +8,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class Suggestion {
+public class UserSuggestion {
     private static final String MENTION_TAXONOMY = "mention";
 
     public long siteID;
@@ -18,11 +18,11 @@ public class Suggestion {
     private String mImageUrl;
     private String mTaxonomy;
 
-    public Suggestion(long siteID,
-                      String userLogin,
-                      String displayName,
-                      String imageUrl,
-                      String taxonomy) {
+    public UserSuggestion(long siteID,
+                          String userLogin,
+                          String displayName,
+                          String imageUrl,
+                          String taxonomy) {
         this.siteID = siteID;
         mUserLogin = userLogin;
         mDisplayName = displayName;
@@ -30,7 +30,7 @@ public Suggestion(long siteID,
         mTaxonomy = taxonomy;
     }
 
-    public static Suggestion fromJSON(JSONObject json, long siteID) {
+    public static UserSuggestion fromJSON(JSONObject json, long siteID) {
         if (json == null) {
             return null;
         }
@@ -40,18 +40,18 @@ public static Suggestion fromJSON(JSONObject json, long siteID) {
         String imageUrl = JSONUtils.getString(json, "image_URL");
 
         // the api currently doesn't return a taxonomy field but we want to be ready for when it does
-        return new Suggestion(siteID, userLogin, displayName, imageUrl, MENTION_TAXONOMY);
+        return new UserSuggestion(siteID, userLogin, displayName, imageUrl, MENTION_TAXONOMY);
     }
 
-    public static List<Suggestion> suggestionListFromJSON(JSONArray jsonArray, long siteID) {
+    public static List<UserSuggestion> suggestionListFromJSON(JSONArray jsonArray, long siteID) {
         if (jsonArray == null) {
             return null;
         }
 
-        ArrayList<Suggestion> suggestions = new ArrayList<Suggestion>(jsonArray.length());
+        ArrayList<UserSuggestion> suggestions = new ArrayList<UserSuggestion>(jsonArray.length());
 
         for (int i = 0; i < jsonArray.length(); i++) {
-            Suggestion suggestion = Suggestion.fromJSON(jsonArray.optJSONObject(i), siteID);
+            UserSuggestion suggestion = UserSuggestion.fromJSON(jsonArray.optJSONObject(i), siteID);
             suggestions.add(suggestion);
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/models/wrappers/RoleUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/models/wrappers/RoleUtilsWrapper.kt
new file mode 100644
index 000000000000..0d1badbc562f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/models/wrappers/RoleUtilsWrapper.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.models.wrappers
+
+import android.content.Context
+import dagger.Reusable
+import org.wordpress.android.fluxc.model.RoleModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.models.RoleUtils
+import javax.inject.Inject
+
+@Reusable
+class RoleUtilsWrapper @Inject constructor() {
+    fun getInviteRoles(
+        siteStore: SiteStore,
+        siteModel: SiteModel,
+        context: Context
+    ): List<RoleModel> = RoleUtils.getInviteRoles(siteStore, siteModel, context)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/models/wrappers/SimpleDateFormatWrapper.kt b/WordPress/src/main/java/org/wordpress/android/models/wrappers/SimpleDateFormatWrapper.kt
new file mode 100644
index 000000000000..5a3e9e9aec35
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/models/wrappers/SimpleDateFormatWrapper.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.models.wrappers
+
+import dagger.Reusable
+import java.text.DateFormat
+import java.text.SimpleDateFormat
+import javax.inject.Inject
+
+@Reusable
+class SimpleDateFormatWrapper @Inject constructor() {
+    fun getDateInstance(): DateFormat = SimpleDateFormat.getDateInstance()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
index 94e677e76315..c2ddb782ee61 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -3,9 +3,8 @@
 import android.app.Application;
 
 import org.wordpress.android.WordPress;
-import org.wordpress.android.fluxc.module.ReleaseBaseModule;
+import org.wordpress.android.fluxc.module.OkHttpClientModule;
 import org.wordpress.android.fluxc.module.ReleaseNetworkModule;
-import org.wordpress.android.fluxc.module.ReleaseOkHttpClientModule;
 import org.wordpress.android.fluxc.module.ReleaseToolsModule;
 import org.wordpress.android.login.di.LoginFragmentModule;
 import org.wordpress.android.login.di.LoginServiceModule;
@@ -14,7 +13,6 @@
 import org.wordpress.android.push.NotificationsProcessingService;
 import org.wordpress.android.ui.AddQuickPressShortcutActivity;
 import org.wordpress.android.ui.CommentFullScreenDialogFragment;
-import org.wordpress.android.ui.DeepLinkingIntentReceiverActivity;
 import org.wordpress.android.ui.JetpackConnectionResultActivity;
 import org.wordpress.android.ui.JetpackRemoteInstallFragment;
 import org.wordpress.android.ui.ShareIntentReceiverActivity;
@@ -26,24 +24,40 @@
 import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity;
 import org.wordpress.android.ui.accounts.PostSignupInterstitialActivity;
 import org.wordpress.android.ui.accounts.SignupEpilogueActivity;
-import org.wordpress.android.ui.accounts.login.LoginEpilogueFragment;
 import org.wordpress.android.ui.accounts.login.LoginPrologueFragment;
+import org.wordpress.android.ui.accounts.login.LoginEpilogueFragment;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesFragment;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginSiteCheckErrorFragment;
 import org.wordpress.android.ui.accounts.signup.SignupEpilogueFragment;
 import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailFragment;
 import org.wordpress.android.ui.activitylog.list.ActivityLogListActivity;
 import org.wordpress.android.ui.activitylog.list.ActivityLogListFragment;
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterFragment;
 import org.wordpress.android.ui.comments.CommentAdapter;
 import org.wordpress.android.ui.comments.CommentDetailFragment;
 import org.wordpress.android.ui.comments.CommentsActivity;
 import org.wordpress.android.ui.comments.CommentsDetailActivity;
 import org.wordpress.android.ui.comments.CommentsListFragment;
 import org.wordpress.android.ui.comments.EditCommentActivity;
+import org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverActivity;
 import org.wordpress.android.ui.domains.DomainRegistrationActivity;
 import org.wordpress.android.ui.domains.DomainRegistrationDetailsFragment;
 import org.wordpress.android.ui.domains.DomainSuggestionsFragment;
+import org.wordpress.android.ui.engagement.EngagedPeopleListActivity;
+import org.wordpress.android.ui.engagement.EngagedPeopleListFragment;
+import org.wordpress.android.ui.engagement.UserProfileBottomSheetFragment;
 import org.wordpress.android.ui.gif.GifPickerActivity;
 import org.wordpress.android.ui.history.HistoryAdapter;
 import org.wordpress.android.ui.history.HistoryDetailContainerFragment;
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadActivity;
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadFragment;
+import org.wordpress.android.ui.jetpack.restore.RestoreActivity;
+import org.wordpress.android.ui.jetpack.restore.RestoreFragment;
+import org.wordpress.android.ui.jetpack.scan.ScanFragment;
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsFragment;
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryFragment;
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListFragment;
+import org.wordpress.android.ui.layoutpicker.LayoutsAdapter;
 import org.wordpress.android.ui.main.AddContentAdapter;
 import org.wordpress.android.ui.main.MainBottomSheetFragment;
 import org.wordpress.android.ui.main.MeFragment;
@@ -60,8 +74,10 @@
 import org.wordpress.android.ui.media.services.MediaDeleteService;
 import org.wordpress.android.ui.mediapicker.MediaPickerActivity;
 import org.wordpress.android.ui.mediapicker.MediaPickerFragment;
-import org.wordpress.android.ui.mlp.LayoutsAdapter;
+import org.wordpress.android.ui.mlp.BlockLayoutPreviewFragment;
 import org.wordpress.android.ui.mlp.ModalLayoutPickerFragment;
+import org.wordpress.android.ui.mysite.ImprovedMySiteFragment;
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuFragment;
 import org.wordpress.android.ui.notifications.NotificationsDetailActivity;
 import org.wordpress.android.ui.notifications.NotificationsDetailListFragment;
 import org.wordpress.android.ui.notifications.NotificationsListFragment;
@@ -74,6 +90,7 @@
 import org.wordpress.android.ui.pages.PagesActivity;
 import org.wordpress.android.ui.pages.PagesFragment;
 import org.wordpress.android.ui.pages.SearchListFragment;
+import org.wordpress.android.ui.people.PeopleInviteDialogFragment;
 import org.wordpress.android.ui.people.PeopleInviteFragment;
 import org.wordpress.android.ui.people.PeopleListFragment;
 import org.wordpress.android.ui.people.PeopleManagementActivity;
@@ -125,6 +142,7 @@
 import org.wordpress.android.ui.prefs.SiteSettingsTagListActivity;
 import org.wordpress.android.ui.prefs.homepage.HomepageSettingsDialog;
 import org.wordpress.android.ui.prefs.notifications.NotificationsSettingsFragment;
+import org.wordpress.android.ui.prefs.timezone.SiteSettingsTimezoneBottomSheet;
 import org.wordpress.android.ui.publicize.PublicizeAccountChooserListAdapter;
 import org.wordpress.android.ui.publicize.PublicizeButtonPrefsFragment;
 import org.wordpress.android.ui.publicize.PublicizeDetailFragment;
@@ -135,6 +153,7 @@
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter;
 import org.wordpress.android.ui.quickstart.QuickStartFullScreenDialogFragment;
 import org.wordpress.android.ui.quickstart.QuickStartReminderReceiver;
+import org.wordpress.android.ui.reader.ReaderBlogFragment;
 import org.wordpress.android.ui.reader.ReaderCommentListActivity;
 import org.wordpress.android.ui.reader.ReaderFragment;
 import org.wordpress.android.ui.reader.ReaderPostDetailFragment;
@@ -155,17 +174,20 @@
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic;
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverService;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic;
+import org.wordpress.android.ui.reader.views.ReaderCommentsPostHeaderView;
 import org.wordpress.android.ui.reader.views.ReaderExpandableTagsView;
 import org.wordpress.android.ui.reader.views.ReaderLikingUsersView;
 import org.wordpress.android.ui.reader.views.ReaderPostDetailHeaderView;
+import org.wordpress.android.ui.reader.views.ReaderSimplePostContainerView;
 import org.wordpress.android.ui.reader.views.ReaderSiteHeaderView;
+import org.wordpress.android.ui.reader.views.ReaderSiteSearchResultView;
 import org.wordpress.android.ui.reader.views.ReaderTagHeaderView;
 import org.wordpress.android.ui.reader.views.ReaderWebView;
 import org.wordpress.android.ui.sitecreation.SiteCreationActivity;
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsFragment;
 import org.wordpress.android.ui.sitecreation.previews.SiteCreationPreviewFragment;
-import org.wordpress.android.ui.sitecreation.segments.SiteCreationSegmentsFragment;
 import org.wordpress.android.ui.sitecreation.services.SiteCreationService;
+import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerFragment;
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
 import org.wordpress.android.ui.stats.refresh.StatsActivity;
@@ -183,6 +205,8 @@
 import org.wordpress.android.ui.stockmedia.StockMediaPickerActivity;
 import org.wordpress.android.ui.stories.StoryComposerActivity;
 import org.wordpress.android.ui.stories.intro.StoriesIntroDialogFragment;
+import org.wordpress.android.ui.suggestion.SuggestionActivity;
+import org.wordpress.android.ui.suggestion.SuggestionSourceSubcomponent.SuggestionSourceModule;
 import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter;
 import org.wordpress.android.ui.themes.ThemeBrowserActivity;
 import org.wordpress.android.ui.themes.ThemeBrowserFragment;
@@ -208,8 +232,7 @@
 @Component(modules = {
         ApplicationModule.class,
         AppConfigModule.class,
-        ReleaseBaseModule.class,
-        ReleaseOkHttpClientModule.class,
+        OkHttpClientModule.class,
         ReleaseNetworkModule.class,
         LegacyModule.class,
         ReleaseToolsModule.class,
@@ -219,6 +242,8 @@
         SupportModule.class,
         ThreadModule.class,
         TrackerModule.class,
+        SuggestionSourceModule.class,
+        ExperimentModule.class,
         // Login flow library
         LoginAnalyticsModule.class,
         LoginFragmentModule.class,
@@ -254,8 +279,6 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(SiteCreationActivity object);
 
-    void inject(SiteCreationSegmentsFragment object);
-
     void inject(SiteCreationDomainsFragment object);
 
     void inject(SiteCreationPreviewFragment object);
@@ -326,6 +349,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(RoleSelectDialogFragment object);
 
+    void inject(PeopleInviteDialogFragment object);
+
     void inject(PlansActivity object);
 
     void inject(MediaBrowserActivity object);
@@ -386,7 +411,7 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(NotificationsPendingDraftsReceiver object);
 
-    void inject(NotificationsDetailListFragment notificationsDetailListFragment);
+    void inject(NotificationsDetailListFragment object);
 
     void inject(ReaderCommentListActivity object);
 
@@ -408,6 +433,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(ReaderSiteHeaderView object);
 
+    void inject(ReaderSiteSearchResultView object);
+
     void inject(ReaderTagHeaderView object);
 
     void inject(ReaderPostDetailHeaderView object);
@@ -418,12 +445,18 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(ReaderWebView object);
 
+    void inject(ReaderSimplePostContainerView object);
+
     void inject(ReaderPostPagerActivity object);
 
     void inject(ReaderPostListActivity object);
 
+    void inject(ReaderBlogFragment object);
+
     void inject(ReaderBlogAdapter object);
 
+    void inject(ReaderCommentsPostHeaderView object);
+
     void inject(ReleaseNotesActivity object);
 
     void inject(WPWebViewActivity object);
@@ -454,6 +487,14 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(ActivityLogDetailFragment object);
 
+    void inject(ScanFragment object);
+
+    void inject(ScanHistoryFragment object);
+
+    void inject(ScanHistoryListFragment object);
+
+    void inject(ThreatDetailsFragment object);
+
     void inject(PluginListFragment object);
 
     void inject(PluginDetailActivity object);
@@ -536,6 +577,10 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(HomePagePickerFragment object);
 
+    void inject(DesignPreviewFragment object);
+
+    void inject(BlockLayoutPreviewFragment object);
+
     void inject(SubfilterBottomSheetFragment object);
 
     void inject(AddContentAdapter object);
@@ -592,6 +637,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(ReaderDiscoverService object);
 
+    void inject(SuggestionActivity object);
+
     void inject(MediaPickerActivity object);
 
     void inject(MediaPickerFragment object);
@@ -602,6 +649,32 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(PrepublishingAddCategoryFragment object);
 
+    void inject(ActivityLogTypeFilterFragment object);
+
+    void inject(ImprovedMySiteFragment object);
+
+    void inject(BackupDownloadActivity object);
+
+    void inject(RestoreActivity object);
+
+    void inject(DynamicCardMenuFragment object);
+
+    void inject(BackupDownloadFragment object);
+
+    void inject(RestoreFragment object);
+
+    void inject(EngagedPeopleListFragment object);
+
+    void inject(SiteSettingsTimezoneBottomSheet object);
+
+    void inject(LoginSiteCheckErrorFragment object);
+
+    void inject(LoginNoSitesFragment object);
+
+    void inject(UserProfileBottomSheetFragment object);
+
+    void inject(EngagedPeopleListActivity object);
+
     // Allows us to inject the application without having to instantiate any modules, and provides the Application
     // in the app graph
     @Component.Builder
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppConfigModule.java b/WordPress/src/main/java/org/wordpress/android/modules/AppConfigModule.java
index 0befd9b84949..5ddfefc620ac 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/AppConfigModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/AppConfigModule.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.util.Base64;
 
-import com.goterl.lazycode.lazysodium.utils.Key;
+import com.goterl.lazysodium.utils.Key;
 
 import org.wordpress.android.BuildConfig;
 import org.wordpress.android.WordPress;
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java
index 1201decd45d4..1642b500768e 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java
@@ -15,7 +15,12 @@
 import org.wordpress.android.ui.accounts.signup.UsernameChangerFullScreenDialogFragment;
 import org.wordpress.android.ui.domains.DomainRegistrationDetailsFragment.CountryPickerDialogFragment;
 import org.wordpress.android.ui.domains.DomainRegistrationDetailsFragment.StatePickerDialogFragment;
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadStep;
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadStepsProvider;
+import org.wordpress.android.ui.jetpack.restore.RestoreStep;
+import org.wordpress.android.ui.jetpack.restore.RestoreStepsProvider;
 import org.wordpress.android.ui.mediapicker.loader.TenorGifClient;
+import org.wordpress.android.ui.posts.BasicDialog;
 import org.wordpress.android.ui.reader.ReaderPostWebViewCachingFragment;
 import org.wordpress.android.ui.reader.subfilter.SubfilterPageFragment;
 import org.wordpress.android.ui.sitecreation.SiteCreationStep;
@@ -102,6 +107,9 @@ public abstract class ApplicationModule {
     @ContributesAndroidInjector
     abstract ManualFeatureConfigFragment contributeManualFeatureConfigFragment();
 
+    @ContributesAndroidInjector
+    abstract BasicDialog contributeBasicDialog();
+
     @Provides
     public static WizardManager<SiteCreationStep> provideWizardManager(
             SiteCreationStepsProvider stepsProvider) {
@@ -128,4 +136,16 @@ static TenorGifClient provideTenorGifClient(Context context) {
         ApiClient.init(context, builder);
         return new TenorGifClient(context, ApiClient.getInstance(context));
     }
+
+    @Provides
+    public static WizardManager<BackupDownloadStep> provideBackupDownloadWizardManager(
+            BackupDownloadStepsProvider stepsProvider) {
+        return new WizardManager<>(stepsProvider.getSteps());
+    }
+
+    @Provides
+    public static WizardManager<RestoreStep> provideRestoreWizardManager(
+            RestoreStepsProvider stepsProvider) {
+        return new WizardManager<>(stepsProvider.getSteps());
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ExperimentModule.kt b/WordPress/src/main/java/org/wordpress/android/modules/ExperimentModule.kt
new file mode 100644
index 000000000000..093bea77b648
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ExperimentModule.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.modules
+
+import dagger.Module
+import dagger.multibindings.Multibinds
+import org.wordpress.android.util.experiments.Experiment
+
+@Module
+interface ExperimentModule {
+    @Multibinds fun experiments(): Set<Experiment>
+
+    // Copy and paste the line below to add a new experiment.
+    // @Binds @IntoSet fun exampleExperiment(experiment: ExampleExperiment): Experiment
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ThreadModule.kt b/WordPress/src/main/java/org/wordpress/android/modules/ThreadModule.kt
index 9983859331e8..559c1e62ad2f 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ThreadModule.kt
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ThreadModule.kt
@@ -8,8 +8,11 @@ import kotlinx.coroutines.Dispatchers
 import org.wordpress.android.util.helpers.Debouncer
 import javax.inject.Named
 
+@Deprecated(message = "Implement CoroutineScope interface and cancel all child coroutines in onCleared/onDestroy/..")
 const val UI_SCOPE = "UI_SCOPE"
+@Deprecated(message = "Implement CoroutineScope interface and cancel all child coroutines in onCleared/onDestroy/..")
 const val DEFAULT_SCOPE = "DEFAULT_SCOPE"
+const val APPLICATION_SCOPE = "APPLICATION_SCOPE"
 const val UI_THREAD = "UI_THREAD"
 const val BG_THREAD = "BG_THREAD"
 const val IO_THREAD = "IO_THREAD"
@@ -30,10 +33,20 @@ class ThreadModule {
 
     @Provides
     @Named(DEFAULT_SCOPE)
+    @Deprecated(
+            message = "CoroutineScope should be provided by an object which implements CoroutineScope",
+            replaceWith = ReplaceWith("Inject dispatcher and implement CoroutineScope interface")
+    )
     fun provideBackgroundScope(): CoroutineScope {
         return CoroutineScope(Dispatchers.Default)
     }
 
+    @Provides
+    @Named(APPLICATION_SCOPE)
+    fun provideApplicationScope(): CoroutineScope {
+        return CoroutineScope(Dispatchers.Default)
+    }
+
     @Provides
     @Named(BG_THREAD)
     fun provideBackgroundDispatcher(): CoroutineDispatcher {
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/TrackerModule.kt b/WordPress/src/main/java/org/wordpress/android/modules/TrackerModule.kt
index 910adc90d463..8fc68a841de6 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/TrackerModule.kt
+++ b/WordPress/src/main/java/org/wordpress/android/modules/TrackerModule.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.modules
 import android.content.Context
 import dagger.Module
 import dagger.Provides
+import org.wordpress.android.BuildConfig
 import org.wordpress.android.analytics.AnalyticsTrackerNosara
 import org.wordpress.android.analytics.Tracker
 
@@ -10,6 +11,6 @@ import org.wordpress.android.analytics.Tracker
 class TrackerModule {
     @Provides
     fun provideTracker(appContext: Context): Tracker {
-        return AnalyticsTrackerNosara(appContext)
+        return AnalyticsTrackerNosara(appContext, BuildConfig.TRACKS_EVENT_PREFIX)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
index 48ab8c3a32fd..fdf00102c4b6 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
+++ b/WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java
@@ -3,12 +3,31 @@
 import androidx.lifecycle.ViewModel;
 import androidx.lifecycle.ViewModelProvider;
 
+import org.wordpress.android.ui.accounts.LoginEpilogueViewModel;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginSiteCheckErrorViewModel;
+import org.wordpress.android.ui.accounts.login.LoginPrologueViewModel;
+import org.wordpress.android.ui.deeplinks.DeepLinkingIntentReceiverViewModel;
 import org.wordpress.android.ui.JetpackRemoteInstallViewModel;
+import org.wordpress.android.ui.accounts.LoginViewModel;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel;
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel;
 import org.wordpress.android.ui.domains.DomainRegistrationMainViewModel;
+import org.wordpress.android.ui.engagement.EngagedPeopleListViewModel;
+import org.wordpress.android.ui.engagement.UserProfileViewModel;
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel;
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel;
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel;
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsViewModel;
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel;
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel;
 import org.wordpress.android.ui.main.MeViewModel;
 import org.wordpress.android.ui.mediapicker.MediaPickerViewModel;
+import org.wordpress.android.ui.mysite.MySiteViewModel;
+import org.wordpress.android.ui.people.PeopleInviteViewModel;
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel;
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel;
 import org.wordpress.android.ui.plans.PlansViewModel;
+import org.wordpress.android.ui.posts.BasicDialogViewModel;
 import org.wordpress.android.ui.posts.EditPostPublishSettingsViewModel;
 import org.wordpress.android.ui.posts.PostListMainViewModel;
 import org.wordpress.android.ui.posts.PrepublishingAddCategoryViewModel;
@@ -19,6 +38,7 @@
 import org.wordpress.android.ui.posts.editor.StorePostViewModel;
 import org.wordpress.android.ui.posts.prepublishing.PrepublishingPublishSettingsViewModel;
 import org.wordpress.android.ui.prefs.homepage.HomepageSettingsViewModel;
+import org.wordpress.android.ui.prefs.timezone.SiteSettingsTimezoneViewModel;
 import org.wordpress.android.ui.reader.ReaderCommentListViewModel;
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel;
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel;
@@ -30,7 +50,6 @@
 import org.wordpress.android.ui.sitecreation.SiteCreationMainVM;
 import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewModel;
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel;
-import org.wordpress.android.ui.sitecreation.segments.SiteCreationSegmentsViewModel;
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel;
 import org.wordpress.android.ui.stats.refresh.StatsViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
@@ -48,6 +67,7 @@
 import org.wordpress.android.ui.stats.refresh.lists.widget.minified.StatsMinifiedWidgetConfigureViewModel;
 import org.wordpress.android.ui.stories.StoryComposerViewModel;
 import org.wordpress.android.ui.stories.intro.StoriesIntroViewModel;
+import org.wordpress.android.ui.suggestion.SuggestionViewModel;
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncementViewModel;
 import org.wordpress.android.util.config.manual.ManualFeatureConfigViewModel;
 import org.wordpress.android.viewmodel.ViewModelFactory;
@@ -71,6 +91,7 @@
 import org.wordpress.android.viewmodel.posts.PostListCreateMenuViewModel;
 import org.wordpress.android.viewmodel.posts.PostListViewModel;
 import org.wordpress.android.viewmodel.quickstart.QuickStartViewModel;
+import org.wordpress.android.viewmodel.storage.StorageUtilsViewModel;
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel;
 
 import dagger.Binds;
@@ -219,11 +240,6 @@ abstract class ViewModelModule {
     @ViewModelKey(HistoryViewModel.class)
     abstract ViewModel historyViewModel(HistoryViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(SiteCreationSegmentsViewModel.class)
-    abstract ViewModel siteCreationSegmentsViewModel(SiteCreationSegmentsViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(SiteCreationDomainsViewModel.class)
@@ -378,7 +394,7 @@ abstract class ViewModelModule {
     @IntoMap
     @ViewModelKey(PostListCreateMenuViewModel.class)
     abstract ViewModel postListCreateMenuViewModel(PostListCreateMenuViewModel postListCreateMenuViewModel);
-    
+
     @Binds
     @IntoMap
     @ViewModelKey(StoryComposerViewModel.class)
@@ -414,6 +430,116 @@ abstract class ViewModelModule {
     @ViewModelKey(PrepublishingAddCategoryViewModel.class)
     abstract ViewModel prepublishingAddCategoryViewModel(PrepublishingAddCategoryViewModel viewModel);
 
+    @Binds
+    @IntoMap
+    @ViewModelKey(SuggestionViewModel.class)
+    abstract ViewModel suggestionViewModel(SuggestionViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(ActivityLogTypeFilterViewModel.class)
+    abstract ViewModel activityLogTypeFilterViewModel(ActivityLogTypeFilterViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(ScanViewModel.class)
+    abstract ViewModel scanViewModel(ScanViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(ScanHistoryViewModel.class)
+    abstract ViewModel scanHistoryViewModel(ScanHistoryViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(ScanHistoryListViewModel.class)
+    abstract ViewModel scanHistoryListViewModel(ScanHistoryListViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(ThreatDetailsViewModel.class)
+    abstract ViewModel threatDetailsViewModel(ThreatDetailsViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(MySiteViewModel.class)
+    abstract ViewModel mySiteViewModel(MySiteViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(BasicDialogViewModel.class)
+    abstract ViewModel basicDialogViewModel(BasicDialogViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(BackupDownloadViewModel.class)
+    abstract ViewModel backupDownloadViewModel(BackupDownloadViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(RestoreViewModel.class)
+    abstract ViewModel restoreViewModel(RestoreViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(DynamicCardMenuViewModel.class)
+    abstract ViewModel dynamicCardMenuViewModel(DynamicCardMenuViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(PeopleInviteViewModel.class)
+    abstract ViewModel peopleInviteViewModel(PeopleInviteViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(EngagedPeopleListViewModel.class)
+    abstract ViewModel engagedPeopleListViewModel(EngagedPeopleListViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(UserProfileViewModel.class)
+    abstract ViewModel userProfileViewModel(UserProfileViewModel viewModel);
+
     @Binds
     abstract ViewModelProvider.Factory provideViewModelFactory(ViewModelFactory viewModelFactory);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(SiteSettingsTimezoneViewModel.class)
+    abstract ViewModel siteSettingsTimezoneViewModel(SiteSettingsTimezoneViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(LoginNoSitesViewModel.class)
+    abstract ViewModel loginNoSitesErrorViewModel(LoginNoSitesViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(LoginEpilogueViewModel.class)
+    abstract ViewModel loginEpilogueViewModel(LoginEpilogueViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(LoginPrologueViewModel.class)
+    abstract ViewModel loginPrologueViewModel(LoginPrologueViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(LoginViewModel.class)
+    abstract ViewModel loginViewModel(LoginViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(DeepLinkingIntentReceiverViewModel.class)
+    abstract ViewModel deepLinkingIntentReceiverViewModel(DeepLinkingIntentReceiverViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(LoginSiteCheckErrorViewModel.class)
+    abstract ViewModel loginSiteCheckErrorViewModel(LoginSiteCheckErrorViewModel viewModel);
+
+    @Binds
+    @IntoMap
+    @ViewModelKey(StorageUtilsViewModel.class)
+    abstract ViewModel storageUtilsViewModel(StorageUtilsViewModel viewModel);
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/modules/WordPressGlideModule.kt b/WordPress/src/main/java/org/wordpress/android/modules/WordPressGlideModule.kt
index b42c3d86ffe4..5d7c1adb1073 100644
--- a/WordPress/src/main/java/org/wordpress/android/modules/WordPressGlideModule.kt
+++ b/WordPress/src/main/java/org/wordpress/android/modules/WordPressGlideModule.kt
@@ -11,6 +11,8 @@ import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.module.AppGlideModule
 import org.wordpress.android.WordPress
 import org.wordpress.android.networking.GlideRequestFactory
+import org.wordpress.android.networking.MShot
+import org.wordpress.android.networking.GlideMShotsLoader
 import java.io.InputStream
 import javax.inject.Inject
 import javax.inject.Named
@@ -21,7 +23,8 @@ import javax.inject.Named
  */
 @GlideModule
 class WordPressGlideModule : AppGlideModule() {
-    @Inject @field:Named("custom-ssl") lateinit var requestQueue: RequestQueue
+    @Inject @Named("custom-ssl") lateinit var requestQueue: RequestQueue
+    @Inject @Named("no-redirects") lateinit var noRedirectsRequestQueue: RequestQueue
     @Inject lateinit var glideRequestFactory: GlideRequestFactory
 
     override fun applyOptions(context: Context, builder: GlideBuilder) {}
@@ -34,5 +37,6 @@ class WordPressGlideModule : AppGlideModule() {
         (context as WordPress).component().inject(this)
         registry.replace(GlideUrl::class.java, InputStream::class.java,
                 VolleyUrlLoader.Factory(requestQueue, glideRequestFactory))
+        registry.prepend(MShot::class.java, InputStream::class.java, GlideMShotsLoader.Factory(noRedirectsRequestQueue))
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt b/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
new file mode 100644
index 000000000000..9ff08f772c48
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/networking/GlideMShotsLoader.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.networking
+
+import com.android.volley.DefaultRetryPolicy
+import com.android.volley.DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
+import com.android.volley.DefaultRetryPolicy.DEFAULT_TIMEOUT_MS
+import com.android.volley.RequestQueue
+import com.bumptech.glide.integration.volley.VolleyRequestFactory
+import com.bumptech.glide.integration.volley.VolleyStreamFetcher
+import com.bumptech.glide.integration.volley.VolleyUrlLoader
+import com.bumptech.glide.load.Options
+import com.bumptech.glide.load.model.GlideUrl
+import com.bumptech.glide.load.model.ModelLoader
+import com.bumptech.glide.load.model.ModelLoader.LoadData
+import com.bumptech.glide.load.model.ModelLoaderFactory
+import com.bumptech.glide.load.model.MultiModelLoaderFactory
+import java.io.InputStream
+
+private const val MAX_RETRIES = 10
+
+/**
+ * String URL wrapper used to customise the request via [GlideMShotsLoader]
+ */
+class MShot(val url: String)
+
+/**
+ * Implements a custom Glide [ModelLoader] that retries loading on http redirection (307)
+ *
+ * This is needed because the mshot backend service redirects to a loading gif image when the thumbnail is not ready.
+ * This occurs when the thumbnail has not been accessed recently for the specific language and viewport size. When this
+ * thumbnail is requested it is cached on the server and is readily available according to the server cache policy.
+ */
+class GlideMShotsLoader(noRedirectsRequestQueue: RequestQueue) : ModelLoader<MShot, InputStream> {
+    private val requestFactory = VolleyRequestFactory { url, callback, priority, headers ->
+        VolleyStreamFetcher.GlideRequest(url, callback, priority, headers).apply {
+            retryPolicy = DefaultRetryPolicy(DEFAULT_TIMEOUT_MS, MAX_RETRIES, DEFAULT_BACKOFF_MULT)
+        }
+    }
+
+    private val loader: VolleyUrlLoader = VolleyUrlLoader(noRedirectsRequestQueue, requestFactory)
+
+    override fun handles(item: MShot) = true
+
+    override fun buildLoadData(model: MShot, width: Int, height: Int, options: Options): LoadData<InputStream>? =
+            loader.buildLoadData(GlideUrl(model.url), width, height, options)
+
+    class Factory(private val noRedirectsRequestQueue: RequestQueue) : ModelLoaderFactory<MShot, InputStream> {
+        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<MShot, InputStream> =
+                GlideMShotsLoader(noRedirectsRequestQueue)
+
+        override fun teardown() {}
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/push/GCMMessageHandler.java b/WordPress/src/main/java/org/wordpress/android/push/GCMMessageHandler.java
index b380b2007d44..650405abbd66 100644
--- a/WordPress/src/main/java/org/wordpress/android/push/GCMMessageHandler.java
+++ b/WordPress/src/main/java/org/wordpress/android/push/GCMMessageHandler.java
@@ -610,7 +610,7 @@ private NotificationCompat.Builder getNotificationBuilder(Context context, Strin
             // Build the new notification, add group to support wearable stacking
             return new NotificationCompat.Builder(context,
                     context.getString(R.string.notification_channel_normal_id))
-                    .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
+                    .setSmallIcon(R.drawable.ic_app_white_24dp)
                     .setColor(context.getResources().getColor(R.color.primary_50))
                     .setContentTitle(title)
                     .setContentText(message)
@@ -665,7 +665,7 @@ private void showGroupNotificationForBuilder(Context context, NotificationCompat
                 NotificationCompat.Builder groupBuilder = new NotificationCompat.Builder(context,
                         context.getString(R.string.notification_channel_normal_id))
                         .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
-                        .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
+                        .setSmallIcon(R.drawable.ic_app_white_24dp)
                         .setColor(context.getResources().getColor(R.color.primary_50))
                         .setGroup(NOTIFICATION_GROUP_KEY)
                         .setGroupSummary(true)
@@ -754,7 +754,7 @@ private void showNotificationForBuilder(NotificationCompat.Builder builder, Cont
 
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
             boolean shouldReceiveNotifications =
-                    prefs.getBoolean(context.getString(R.string.wp_pref_notifications_master), true);
+                    prefs.getBoolean(context.getString(R.string.wp_pref_notifications_main), true);
 
             if (shouldReceiveNotifications) {
                 if (notifyUser) {
@@ -983,7 +983,7 @@ private void handlePushAuth(Context context, Bundle data) {
 
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context,
                     context.getString(R.string.notification_channel_important_id))
-                    .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
+                    .setSmallIcon(R.drawable.ic_app_white_24dp)
                     .setColor(context.getResources().getColor(R.color.primary_50))
                     .setContentTitle(title)
                     .setContentText(message)
diff --git a/WordPress/src/main/java/org/wordpress/android/push/GCMRegistrationIntentService.java b/WordPress/src/main/java/org/wordpress/android/push/GCMRegistrationIntentService.java
index abb111e09f24..a629647c59f1 100644
--- a/WordPress/src/main/java/org/wordpress/android/push/GCMRegistrationIntentService.java
+++ b/WordPress/src/main/java/org/wordpress/android/push/GCMRegistrationIntentService.java
@@ -9,7 +9,7 @@
 import androidx.annotation.NonNull;
 import androidx.core.app.JobIntentService;
 
-import com.google.firebase.iid.FirebaseInstanceId;
+import com.google.firebase.messaging.FirebaseMessaging;
 
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.store.AccountStore;
@@ -41,8 +41,18 @@ public static void enqueueWork(Context context, Intent work) {
     @Override
     protected void onHandleWork(@NonNull Intent intent) {
         try {
-            String token = FirebaseInstanceId.getInstance().getToken();
-            sendRegistrationToken(token);
+            FirebaseMessaging
+                    .getInstance()
+                    .getToken()
+                    .addOnCompleteListener(task -> {
+                                if (!task.isSuccessful()) {
+                                    AppLog.e(T.NOTIFS, "Fetching FCM registration token failed: ", task.getException());
+                                    return;
+                                }
+                                String token = task.getResult();
+                                sendRegistrationToken(token);
+                            }
+                    );
         } catch (Exception e) {
             // SecurityException can happen on some devices without Google services (these devices probably strip
             // the AndroidManifest.xml and remove unsupported permissions).
diff --git a/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java b/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java
index 2e416bbe6e92..9ac7db071948 100644
--- a/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java
@@ -52,7 +52,7 @@ public static void showMessageToUserWithBuilder(NotificationCompat.Builder build
 
     public static NotificationCompat.Builder getBuilder(Context context, String channelId) {
         return new NotificationCompat.Builder(context, channelId)
-                .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
+                .setSmallIcon(R.drawable.ic_app_white_24dp)
                 .setColor(context.getResources().getColor(R.color.primary_50))
                 .setContentTitle(context.getString(R.string.app_name))
                 .setAutoCancel(true);
diff --git a/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java b/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java
index 41ba7e0cb632..0202f9a29af8 100644
--- a/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java
+++ b/WordPress/src/main/java/org/wordpress/android/push/NotificationsProcessingService.java
@@ -49,6 +49,7 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.LocaleManager;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.util.analytics.AnalyticsUtils.QuickActionTrackPropertyValue;
 
 import java.util.ArrayList;
@@ -543,15 +544,19 @@ private void likeComment() {
                 return;
             }
 
+            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+
             // Bump analytics
+            // TODO klymyam remove legacy comment tracking after new comments are shipped and new funnels are made
             AnalyticsUtils.trackWithBlogPostDetails(
                     AnalyticsTracker.Stat.NOTIFICATION_QUICK_ACTIONS_LIKED, mNote.getSiteId(), mNote.getPostId());
+            AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_QUICK_ACTION_LIKED,
+                    AnalyticsCommentActionSource.NOTIFICATIONS, site);
             AnalyticsUtils.trackQuickActionTouched(
                     QuickActionTrackPropertyValue.LIKE,
-                    mSiteStore.getSiteBySiteId(mNote.getSiteId()),
+                    site,
                     mNote.buildComment());
 
-            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
             if (site != null) {
                 mDispatcher.dispatch(CommentActionBuilder.newLikeCommentAction(
                         new RemoteLikeCommentPayload(site, mNote.getCommentId(), true)));
@@ -567,18 +572,24 @@ private void approveComment() {
                 return;
             }
 
+            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+
             // Bump analytics
+            // TODO klymyam remove legacy comment tracking after new comments are shipped and new funnels are made
             AnalyticsUtils.trackWithBlogPostDetails(
                     AnalyticsTracker.Stat.NOTIFICATION_QUICK_ACTIONS_APPROVED, mNote.getSiteId(), mNote.getPostId());
+            AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_QUICK_ACTION_APPROVED,
+                    AnalyticsCommentActionSource.NOTIFICATIONS, site);
+
             AnalyticsUtils.trackQuickActionTouched(
                     QuickActionTrackPropertyValue.APPROVE,
-                    mSiteStore.getSiteBySiteId(mNote.getSiteId()),
+                    site,
                     mNote.buildComment());
 
             // Update pseudo comment (built from the note)
             CommentModel comment = mNote.buildComment();
             comment.setStatus(CommentStatus.APPROVED.toString());
-            SiteModel site = mSiteStore.getSiteBySiteId(mNote.getSiteId());
+
             if (site == null) {
                 AppLog.e(T.NOTIFS, "Impossible to approve a comment on a site that is not in the App. SiteId: "
                                    + mNote.getSiteId());
@@ -621,7 +632,8 @@ private void replyToComment() {
                 mDispatcher.dispatch(CommentActionBuilder.newCreateNewCommentAction(payload));
 
                 // Bump analytics
-                AnalyticsUtils.trackCommentReplyWithDetails(true, site, comment);
+                AnalyticsUtils.trackCommentReplyWithDetails(true,
+                        site, comment, AnalyticsCommentActionSource.NOTIFICATIONS);
                 AnalyticsUtils.trackQuickActionTouched(QuickActionTrackPropertyValue.REPLY_TO, site, comment);
             } else {
                 // cancel the current notification
diff --git a/WordPress/src/main/java/org/wordpress/android/support/ZendeskHelper.kt b/WordPress/src/main/java/org/wordpress/android/support/ZendeskHelper.kt
index b006a03f875c..48c97fe2116e 100644
--- a/WordPress/src/main/java/org/wordpress/android/support/ZendeskHelper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/support/ZendeskHelper.kt
@@ -7,6 +7,7 @@ import androidx.preference.PreferenceManager
 import com.zendesk.logger.Logger
 import com.zendesk.service.ErrorResponse
 import com.zendesk.service.ZendeskCallback
+import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
@@ -35,7 +36,6 @@ import zendesk.core.PushRegistrationProvider
 import zendesk.core.Zendesk
 import zendesk.support.CustomField
 import zendesk.support.Support
-import zendesk.support.guide.HelpCenterActivity
 import zendesk.support.request.RequestActivity
 import zendesk.support.requestlist.RequestListActivity
 import java.util.Timer
@@ -108,45 +108,6 @@ class ZendeskHelper(
         refreshIdentity()
     }
 
-    /**
-     * This function shows the Zendesk Help Center. It doesn't require a valid identity. If the support identity is
-     * available it'll be used and the "New Ticket" button will be available, if not, it'll work with an anonymous
-     * identity. The configuration will only be passed in if the identity is available, as it's only required if
-     * the user contacts us through it.
-     */
-    fun showZendeskHelpCenter(
-        context: Context,
-        origin: Origin?,
-        selectedSite: SiteModel?,
-        extraTags: List<String>? = null
-    ) {
-        require(isZendeskEnabled) {
-            zendeskNeedsToBeEnabledError
-        }
-        val isIdentitySet = isIdentitySet()
-        val builder = HelpCenterActivity.builder()
-                .withArticlesForCategoryIds(ZendeskConstants.mobileCategoryId)
-                .withContactUsButtonVisible(isIdentitySet)
-                .withLabelNames(ZendeskConstants.articleLabel)
-                .withShowConversationsMenuButton(isIdentitySet)
-        AnalyticsTracker.track(Stat.SUPPORT_HELP_CENTER_VIEWED)
-        if (isIdentitySet) {
-            builder.show(
-                context,
-                buildZendeskConfig(
-                    context,
-                    siteStore.sites,
-                    origin,
-                    selectedSite,
-                    extraTags,
-                    zendeskPlanFieldHelper
-                )
-            )
-        } else {
-            builder.show(context)
-        }
-    }
-
     /**
      * This function creates a new ticket. It'll force a valid identity, so if the user doesn't have one set, a dialog
      * will be shown where the user will need to enter an email and a name. If they cancel the dialog, the ticket
@@ -382,12 +343,13 @@ private fun buildZendeskConfig(
     extraTags: List<String>? = null,
     zendeskPlanFieldHelper: ZendeskPlanFieldHelper
 ): Configuration {
+    val ticketSubject = context.getString(R.string.support_ticket_subject)
     return RequestActivity.builder()
         .withTicketForm(
             TicketFieldIds.form,
             buildZendeskCustomFields(context, allSites, selectedSite, zendeskPlanFieldHelper)
         )
-        .withRequestSubject(ZendeskConstants.ticketSubject)
+        .withRequestSubject(ticketSubject)
         .withTags(buildZendeskTags(allSites, origin ?: Origin.UNKNOWN, extraTags))
         .config()
 }
@@ -520,20 +482,17 @@ private val wpcomPushNotificationDeviceToken: String?
     }
 
 private object ZendeskConstants {
-    const val articleLabel = "Android"
     const val blogSeparator = "\n----------\n"
     const val jetpackTag = "jetpack"
-    const val mobileCategoryId = 360000041586
     const val networkWifi = "WiFi"
     const val networkWWAN = "Mobile"
     const val networkTypeLabel = "Network Type:"
     const val networkCarrierLabel = "Carrier:"
     const val networkCountryCodeLabel = "Country Code:"
     const val noneValue = "none"
-    // We rely on this platform tag to filter tickets in Zendesk, so should be kept separate from the `articleLabel`
+    // We rely on this platform tag to filter tickets in Zendesk
     const val platformTag = "Android"
     const val sourcePlatform = "mobile_-_android"
-    const val ticketSubject = "WordPress for Android Support"
     const val wpComTag = "wpcom"
     const val unknownValue = "unknown"
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
index 37f279103940..2990a9fcdc08 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/ActivityLauncher.java
@@ -10,9 +10,13 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.core.app.TaskStackBuilder;
 import androidx.fragment.app.Fragment;
 
+import com.wordpress.stories.compose.frame.FrameSaveNotifier;
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult;
+
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
@@ -40,10 +44,19 @@
 import org.wordpress.android.ui.comments.CommentsActivity;
 import org.wordpress.android.ui.domains.DomainRegistrationActivity;
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose;
-import org.wordpress.android.ui.gif.GifPickerActivity;
+import org.wordpress.android.ui.engagement.EngagedPeopleListActivity;
+import org.wordpress.android.ui.engagement.EngagementNavigationSource;
+import org.wordpress.android.ui.engagement.HeaderData;
+import org.wordpress.android.ui.engagement.ListScenario;
+import org.wordpress.android.ui.engagement.ListScenarioType;
 import org.wordpress.android.ui.history.HistoryDetailActivity;
 import org.wordpress.android.ui.history.HistoryDetailContainerFragment;
 import org.wordpress.android.ui.history.HistoryListItem.Revision;
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadActivity;
+import org.wordpress.android.ui.jetpack.restore.RestoreActivity;
+import org.wordpress.android.ui.jetpack.scan.ScanActivity;
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsActivity;
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryActivity;
 import org.wordpress.android.ui.main.MeActivity;
 import org.wordpress.android.ui.main.SitePickerActivity;
 import org.wordpress.android.ui.main.SitePickerAdapter.SitePickerMode;
@@ -60,6 +73,7 @@
 import org.wordpress.android.ui.plugins.PluginDetailActivity;
 import org.wordpress.android.ui.plugins.PluginUtils;
 import org.wordpress.android.ui.posts.EditPostActivity;
+import org.wordpress.android.ui.posts.JetpackSecuritySettingsActivity;
 import org.wordpress.android.ui.posts.PostUtils;
 import org.wordpress.android.ui.posts.PostsListActivity;
 import org.wordpress.android.ui.posts.RemotePreviewLogicHelper.RemotePreviewType;
@@ -69,9 +83,12 @@
 import org.wordpress.android.ui.prefs.MyProfileActivity;
 import org.wordpress.android.ui.prefs.notifications.NotificationsSettingsActivity;
 import org.wordpress.android.ui.publicize.PublicizeListActivity;
+import org.wordpress.android.ui.reader.ReaderActivityLauncher;
+import org.wordpress.android.ui.reader.ReaderConstants;
 import org.wordpress.android.ui.sitecreation.SiteCreationActivity;
 import org.wordpress.android.ui.stats.StatsConnectJetpackActivity;
 import org.wordpress.android.ui.stats.StatsConstants;
+import org.wordpress.android.ui.stats.StatsTimeframe;
 import org.wordpress.android.ui.stats.StatsViewType;
 import org.wordpress.android.ui.stats.refresh.StatsActivity;
 import org.wordpress.android.ui.stats.refresh.StatsViewAllActivity;
@@ -80,6 +97,8 @@
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity;
 import org.wordpress.android.ui.stockmedia.StockMediaPickerActivity;
 import org.wordpress.android.ui.stories.StoryComposerActivity;
+import org.wordpress.android.ui.suggestion.SuggestionActivity;
+import org.wordpress.android.ui.suggestion.SuggestionType;
 import org.wordpress.android.ui.themes.ThemeBrowserActivity;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -96,6 +115,7 @@
 import java.util.Map;
 
 import static com.wordpress.stories.util.BundleUtilsKt.KEY_STORY_INDEX;
+import static com.wordpress.stories.util.BundleUtilsKt.KEY_STORY_SAVE_RESULT;
 import static org.wordpress.android.analytics.AnalyticsTracker.ACTIVITY_LOG_ACTIVITY_ID_KEY;
 import static org.wordpress.android.analytics.AnalyticsTracker.Stat.POST_LIST_ACCESS_ERROR;
 import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_DETAIL_REBLOGGED;
@@ -103,16 +123,26 @@
 import static org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_ACCESS_ERROR;
 import static org.wordpress.android.editor.gutenberg.GutenbergEditorFragment.ARG_STORY_BLOCK_ID;
 import static org.wordpress.android.imageeditor.preview.PreviewImageFragment.ARG_EDIT_IMAGE_DATA;
+import static org.wordpress.android.login.LoginMode.JETPACK_LOGIN_ONLY;
 import static org.wordpress.android.login.LoginMode.WPCOM_LOGIN_ONLY;
 import static org.wordpress.android.ui.WPWebViewActivity.ENCODING_UTF8;
+import static org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModelKt.KEY_BACKUP_DOWNLOAD_ACTIVITY_ID_KEY;
+import static org.wordpress.android.ui.jetpack.restore.RestoreViewModelKt.KEY_RESTORE_ACTIVITY_ID_KEY;
+import static org.wordpress.android.ui.jetpack.scan.ScanFragment.ARG_THREAT_ID;
 import static org.wordpress.android.ui.media.MediaBrowserActivity.ARG_BROWSER_TYPE;
 import static org.wordpress.android.ui.pages.PagesActivityKt.EXTRA_PAGE_REMOTE_ID_KEY;
 import static org.wordpress.android.ui.stories.StoryComposerActivity.KEY_ALL_UNFLATTENED_LOADED_SLIDES;
 import static org.wordpress.android.ui.stories.StoryComposerActivity.KEY_LAUNCHED_FROM_GUTENBERG;
 import static org.wordpress.android.ui.stories.StoryComposerActivity.KEY_POST_LOCAL_ID;
+import static org.wordpress.android.viewmodel.activitylog.ActivityLogDetailViewModelKt.ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY;
 import static org.wordpress.android.viewmodel.activitylog.ActivityLogDetailViewModelKt.ACTIVITY_LOG_ID_KEY;
+import static org.wordpress.android.viewmodel.activitylog.ActivityLogViewModelKt.ACTIVITY_LOG_REWINDABLE_ONLY_KEY;
 
 public class ActivityLauncher {
+    public static final String SOURCE_TRACK_EVENT_PROPERTY_KEY = "source";
+    public static final String BACKUP_TRACK_EVENT_PROPERTY_VALUE = "backup";
+    public static final String ACTIVITY_LOG_TRACK_EVENT_PROPERTY_VALUE = "activity_log";
+
     public static void showMainActivityAndLoginEpilogue(Activity activity, ArrayList<Integer> oldSitesIds,
                                                         boolean doLoginUpdate) {
         Intent intent = new Intent(activity, WPMainActivity.class);
@@ -185,19 +215,6 @@ public static void showPhotoPickerForResult(Activity activity,
         activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER);
     }
 
-
-    /**
-     * Use {@link org.wordpress.android.ui.photopicker.MediaPickerLauncher::showPhotoPickerForResult}  instead
-     */
-    @Deprecated
-    public static void showPhotoPickerForResult(Fragment fragment,
-                                                @NonNull MediaBrowserType browserType,
-                                                @Nullable SiteModel site,
-                                                @Nullable Integer localPostId) {
-        Intent intent = createShowPhotoPickerIntent(fragment.getContext(), browserType, site, localPostId);
-        fragment.startActivityForResult(intent, RequestCodes.PHOTO_PICKER);
-    }
-
     private static Intent createShowPhotoPickerIntent(Context context,
                                                       @NonNull MediaBrowserType browserType,
                                                       @Nullable SiteModel site,
@@ -231,20 +248,6 @@ public static void showStockMediaPickerForResult(Activity activity,
         activity.startActivityForResult(intent, requestCode);
     }
 
-    /**
-     * Use {@link org.wordpress.android.ui.photopicker.MediaPickerLauncher::showGifPickerForResult}  instead
-     */
-    public static void showGifPickerForResult(Activity activity, @NonNull SiteModel site, int requestCode) {
-        Map<String, String> properties = new HashMap<>();
-        properties.put("from", activity.getClass().getSimpleName());
-        AnalyticsTracker.track(Stat.GIF_PICKER_ACCESSED, properties);
-
-        Intent intent = new Intent(activity, GifPickerActivity.class);
-        intent.putExtra(WordPress.SITE, site);
-        intent.putExtra(GifPickerActivity.KEY_REQUEST_CODE, requestCode);
-        activity.startActivityForResult(intent, requestCode);
-    }
-
     public static void startJetpackInstall(Context context, JetpackConnectionSource source, SiteModel site) {
         Intent intent = new Intent(context, JetpackRemoteInstallActivity.class);
         intent.putExtra(WordPress.SITE, site);
@@ -309,6 +312,35 @@ public static void viewReaderInNewStack(Context context) {
         context.startActivity(intent);
     }
 
+    public static void viewPostDeeplinkInNewStack(Context context, Uri uri) {
+        Intent mainActivityIntent = getMainActivityInNewStack(context)
+                .putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
+        Intent viewPostIntent = new Intent(ReaderConstants.ACTION_VIEW_POST, uri);
+        TaskStackBuilder.create(context)
+                        .addNextIntent(mainActivityIntent)
+                        .addNextIntent(viewPostIntent)
+                        .startActivities();
+    }
+
+    public static void viewReaderPostDetailInNewStack(Context context, long blogId, long postId, Uri uri) {
+        Intent mainActivityIntent = getMainActivityInNewStack(context)
+                .putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_READER);
+        Intent viewPostIntent = ReaderActivityLauncher.buildReaderPostDetailIntent(
+                context,
+                false,
+                blogId,
+                postId,
+                null,
+                0,
+                false,
+                uri.toString()
+        );
+        TaskStackBuilder.create(context)
+                        .addNextIntent(mainActivityIntent)
+                        .addNextIntent(viewPostIntent)
+                        .startActivities();
+    }
+
     public static void openEditorInNewStack(Context context) {
         Intent intent = getMainActivityInNewStack(context);
         intent.putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_EDITOR);
@@ -386,25 +418,42 @@ public static void openEditorForReblog(
     }
 
     public static void viewStatsInNewStack(Context context, SiteModel site) {
+        viewStatsInNewStack(context, site, null);
+    }
+
+    public static void viewStatsInNewStack(Context context, SiteModel site, @Nullable StatsTimeframe statsTimeframe) {
         if (site == null) {
-            AppLog.e(T.STATS, "SiteModel is null when opening the stats from the deeplink.");
-            AnalyticsTracker.track(
-                    STATS_ACCESS_ERROR,
-                    ActivityLauncher.class.getName(),
-                    "NullPointerException",
-                    "Failed to open Stats from the deeplink because of the null SiteModel"
-                                  );
-            ToastUtils.showToast(context, R.string.stats_cannot_be_started, ToastUtils.Duration.SHORT);
+            handleMissingSite(context);
             return;
         }
+        Intent statsIntent;
+        if (statsTimeframe != null) {
+            statsIntent = StatsActivity.buildIntent(context, site, statsTimeframe);
+        } else {
+            statsIntent = StatsActivity.buildIntent(context, site);
+        }
+
+        runIntentOverMainActivityInNewStack(context, statsIntent);
+    }
+
+    private static void handleMissingSite(Context context) {
+        AppLog.e(T.STATS, "SiteModel is null when opening the stats from the deeplink.");
+        AnalyticsTracker.track(
+                STATS_ACCESS_ERROR,
+                ActivityLauncher.class.getName(),
+                "NullPointerException",
+                "Failed to open Stats from the deeplink because of the null SiteModel"
+        );
+        ToastUtils.showToast(context, R.string.stats_cannot_be_started, ToastUtils.Duration.SHORT);
+    }
+
+    private static void runIntentOverMainActivityInNewStack(Context context, Intent intent) {
         TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context);
 
         Intent mainActivityIntent = getMainActivityInNewStack(context);
 
-        Intent statsIntent = StatsActivity.buildIntent(context, site);
-
         taskStackBuilder.addNextIntent(mainActivityIntent);
-        taskStackBuilder.addNextIntent(statsIntent);
+        taskStackBuilder.addNextIntent(intent);
         taskStackBuilder.startActivities();
     }
 
@@ -414,6 +463,13 @@ public static void viewStatsInNewStack(Context context) {
         context.startActivity(intent);
     }
 
+    public static void viewStatsForTimeframeInNewStack(Context context, StatsTimeframe statsTimeframe) {
+        Intent intent = getMainActivityInNewStack(context);
+        intent.putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_STATS);
+        intent.putExtra(WPMainActivity.ARG_STATS_TIMEFRAME, statsTimeframe);
+        context.startActivity(intent);
+    }
+
     private static Intent getMainActivityInNewStack(Context context) {
         Intent mainActivityIntent = new Intent(context, WPMainActivity.class);
         mainActivityIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -445,6 +501,21 @@ public static void viewBlogStats(Context context, SiteModel site) {
         }
     }
 
+    public static void viewBlogStatsForTimeframe(Context context, SiteModel site, StatsTimeframe statsTimeframe) {
+        if (site == null) {
+            AppLog.e(T.STATS, "SiteModel is null when opening the stats.");
+            AnalyticsTracker.track(
+                    STATS_ACCESS_ERROR,
+                    ActivityLauncher.class.getName(),
+                    "NullPointerException",
+                    "Failed to open Stats because of the null SiteModel"
+                                  );
+            ToastUtils.showToast(context, R.string.stats_cannot_be_started, ToastUtils.Duration.SHORT);
+        } else {
+            StatsActivity.start(context, site, statsTimeframe);
+        }
+    }
+
     public static void viewAllTabbedInsightsStats(Context context, StatsViewType statsType, int selectedTab,
                                                   int localSiteId) {
         StatsViewAllActivity.startForTabbedInsightsStats(context, statsType, selectedTab, localSiteId);
@@ -541,12 +612,10 @@ public static void viewCurrentBlogComments(Context context, SiteModel site) {
     }
 
     public static void viewCurrentBlogThemes(Context context, SiteModel site) {
-        if (ThemeBrowserActivity.isAccessible(site)) {
-            Intent intent = new Intent(context, ThemeBrowserActivity.class);
-            intent.putExtra(WordPress.SITE, site);
-            context.startActivity(intent);
-            AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.THEMES_ACCESSED_THEMES_BROWSER, site);
-        }
+        Intent intent = new Intent(context, ThemeBrowserActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        context.startActivity(intent);
+        AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.THEMES_ACCESSED_THEMES_BROWSER, site);
     }
 
     public static void viewCurrentBlogPeople(Context context, SiteModel site) {
@@ -594,17 +663,98 @@ public static void viewActivityLogList(Activity activity, SiteModel site) {
         activity.startActivity(intent);
     }
 
-    public static void viewActivityLogDetailForResult(Activity activity, SiteModel site, String activityId) {
+    public static void viewBackupList(Activity activity, SiteModel site) {
+        if (site == null) {
+            ToastUtils.showToast(activity, R.string.blog_not_found, ToastUtils.Duration.SHORT);
+            return;
+        }
+        AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.JETPACK_BACKUP_LIST_OPENED, site);
+        Intent intent = new Intent(activity, ActivityLogListActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        intent.putExtra(ACTIVITY_LOG_REWINDABLE_ONLY_KEY, true);
+        activity.startActivity(intent);
+    }
+
+    public static void viewActivityLogDetailForResult(
+            Activity activity,
+            SiteModel site,
+            String activityId,
+            boolean isButtonVisible,
+            boolean rewindableOnly
+    ) {
         Map<String, Object> properties = new HashMap<>();
         properties.put(ACTIVITY_LOG_ACTIVITY_ID_KEY, activityId);
+        String source;
+        if (rewindableOnly) {
+            source = BACKUP_TRACK_EVENT_PROPERTY_VALUE;
+        } else {
+            source = ACTIVITY_LOG_TRACK_EVENT_PROPERTY_VALUE;
+        }
+        properties.put(SOURCE_TRACK_EVENT_PROPERTY_KEY, source);
         AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.ACTIVITY_LOG_DETAIL_OPENED, site, properties);
 
         Intent intent = new Intent(activity, ActivityLogDetailActivity.class);
         intent.putExtra(WordPress.SITE, site);
         intent.putExtra(ACTIVITY_LOG_ID_KEY, activityId);
+        intent.putExtra(ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY, isButtonVisible);
+        intent.putExtra(SOURCE_TRACK_EVENT_PROPERTY_KEY, source);
         activity.startActivityForResult(intent, RequestCodes.ACTIVITY_LOG_DETAIL);
     }
 
+    public static void viewScan(Activity activity, SiteModel site) {
+        if (site == null) {
+            ToastUtils.showToast(activity, R.string.blog_not_found, ToastUtils.Duration.SHORT);
+            return;
+        }
+        AnalyticsTracker.track(Stat.JETPACK_SCAN_ACCESSED);
+        Intent intent = new Intent(activity, ScanActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        activity.startActivity(intent);
+    }
+
+    public static void viewScanRequestScanState(Activity activity, SiteModel site, @StringRes int messageRes) {
+        if (site == null) {
+            ToastUtils.showToast(activity, R.string.blog_not_found, ToastUtils.Duration.SHORT);
+            return;
+        }
+        Intent intent = new Intent(activity, ScanActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        intent.putExtra(ScanActivity.REQUEST_SCAN_STATE, messageRes);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        activity.startActivity(intent);
+    }
+
+    public static void viewScanRequestFixState(Activity activity, SiteModel site, long threatId) {
+        if (site == null) {
+            ToastUtils.showToast(activity, R.string.blog_not_found, ToastUtils.Duration.SHORT);
+            return;
+        }
+        Intent intent = new Intent(activity, ScanActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        intent.putExtra(ScanActivity.REQUEST_FIX_STATE, threatId);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        activity.startActivity(intent);
+    }
+
+    public static void viewScanHistory(Activity activity, SiteModel site) {
+        if (site == null) {
+            ToastUtils.showToast(activity, R.string.blog_not_found, ToastUtils.Duration.SHORT);
+            return;
+        }
+        AnalyticsTracker.track(Stat.JETPACK_SCAN_HISTORY_ACCESSED);
+        Intent intent = new Intent(activity, ScanHistoryActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        activity.startActivity(intent);
+    }
+
+    public static void viewThreatDetails(@NonNull Fragment fragment, SiteModel site, @NonNull Long threatId) {
+        Intent intent = new Intent(fragment.getContext(), ThreatDetailsActivity.class);
+        intent.putExtra(ARG_THREAT_ID, threatId);
+        intent.putExtra(WordPress.SITE, site);
+        fragment.startActivity(intent);
+    }
+
     public static void viewBlogSettingsForResult(Activity activity, SiteModel site) {
         Intent intent = new Intent(activity, BlogPreferencesActivity.class);
         intent.putExtra(WordPress.SITE, site);
@@ -783,10 +933,11 @@ public static void editEmptyStoryForResult(
             return;
         }
 
+        AnalyticsTracker.track(Stat.STORY_BLOCK_ADD_MEDIA_TAPPED);
         Intent intent = new Intent(activity, StoryComposerActivity.class);
         intent.putExtra(WordPress.SITE, site);
         intent.putExtra(KEY_LAUNCHED_FROM_GUTENBERG, true);
-        intent.putExtra(MediaPickerConstants.EXTRA_LAUNCH_WPSTORIES_CAMERA_REQUESTED, true);
+        intent.putExtra(MediaPickerConstants.EXTRA_LAUNCH_WPSTORIES_MEDIA_PICKER_REQUESTED, true);
         intent.putExtra(KEY_POST_LOCAL_ID, localPostId.getValue());
         intent.putExtra(KEY_STORY_INDEX, storyIndex);
         intent.putExtra(ARG_STORY_BLOCK_ID, storyBlockId);
@@ -851,7 +1002,6 @@ public static void addNewPageForResult(
         Intent intent = new Intent(activity, EditPostActivity.class);
         intent.putExtra(WordPress.SITE, site);
         intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, true);
-        intent.putExtra(EditPostActivity.EXTRA_IS_PREVIEW, false);
         intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, false);
         intent.putExtra(EditPostActivity.EXTRA_PAGE_TITLE, title);
         intent.putExtra(EditPostActivity.EXTRA_PAGE_CONTENT, content);
@@ -870,7 +1020,6 @@ public static void addNewPageForResult(
         Intent intent = new Intent(fragment.getContext(), EditPostActivity.class);
         intent.putExtra(WordPress.SITE, site);
         intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, true);
-        intent.putExtra(EditPostActivity.EXTRA_IS_PREVIEW, false);
         intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, false);
         intent.putExtra(EditPostActivity.EXTRA_PAGE_TITLE, title);
         intent.putExtra(EditPostActivity.EXTRA_PAGE_CONTENT, content);
@@ -879,21 +1028,6 @@ public static void addNewPageForResult(
         fragment.startActivityForResult(intent, RequestCodes.EDIT_POST);
     }
 
-    public static void previewPageForResult(
-            @NonNull Fragment fragment,
-            @NonNull SiteModel site,
-            @NonNull String content,
-            @Nullable String template) {
-        Intent intent = new Intent(fragment.getContext(), EditPostActivity.class);
-        intent.putExtra(WordPress.SITE, site);
-        intent.putExtra(EditPostActivity.EXTRA_IS_PAGE, true);
-        intent.putExtra(EditPostActivity.EXTRA_IS_PREVIEW, true);
-        intent.putExtra(EditPostActivity.EXTRA_IS_PROMO, false);
-        intent.putExtra(EditPostActivity.EXTRA_PAGE_CONTENT, content);
-        intent.putExtra(EditPostActivity.EXTRA_PAGE_TEMPLATE, template);
-        fragment.startActivityForResult(intent, RequestCodes.PREVIEW_POST);
-    }
-
     public static void viewHistoryDetailForResult(Activity activity, Revision revision, List<Revision> revisions) {
         Intent intent = new Intent(activity, HistoryDetailActivity.class);
         intent.putExtra(HistoryDetailContainerFragment.EXTRA_REVISION, revision);
@@ -1013,6 +1147,29 @@ public static void viewMeActivityForResult(Activity activity) {
         activity.startActivityForResult(intent, RequestCodes.APP_SETTINGS);
     }
 
+    public static void viewPostLikesListActivity(
+            Activity activity,
+            long siteId,
+            long postId,
+            HeaderData headerData,
+            EngagementNavigationSource source
+    ) {
+        Intent intent = new Intent(activity, EngagedPeopleListActivity.class);
+        intent.putExtra(
+                EngagedPeopleListActivity.KEY_LIST_SCENARIO,
+                new ListScenario(
+                        ListScenarioType.LOAD_POST_LIKES,
+                        source,
+                        siteId,
+                        postId,
+                        0L,
+                        "",
+                        headerData
+                )
+        );
+        activity.startActivity(intent);
+    }
+
     public static void viewAccountSettings(Context context) {
         Intent intent = new Intent(context, AccountSettingsActivity.class);
         AnalyticsTracker.track(AnalyticsTracker.Stat.OPENED_ACCOUNT_SETTINGS);
@@ -1030,6 +1187,36 @@ public static void viewNotificationsSettings(Activity activity) {
         activity.startActivity(intent);
     }
 
+    public static void viewJetpackSecuritySettings(Activity activity, SiteModel site) {
+        AnalyticsTracker.track(Stat.SITE_SETTINGS_JETPACK_SECURITY_SETTINGS_VIEWED);
+        Intent intent = new Intent(activity, JetpackSecuritySettingsActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        activity.startActivity(intent);
+    }
+
+    public static void viewStories(Activity activity, SiteModel site, StorySaveResult event) {
+        Intent intent = new Intent(activity, StoryComposerActivity.class);
+        intent.putExtra(KEY_STORY_SAVE_RESULT, event);
+        intent.putExtra(WordPress.SITE, site);
+
+        // we need to have a way to cancel the related error notification when the user comes
+        // from tapping on MANAGE on the snackbar (otherwise they'll be able to discard the
+        // errored story but the error notification will remain existing in the system dashboard)
+        intent.setAction(String.valueOf(FrameSaveNotifier.getNotificationIdForError(
+                StoryComposerActivity.BASE_FRAME_MEDIA_ERROR_NOTIFICATION_ID,
+                event.getStoryIndex()
+        )));
+
+        activity.startActivity(intent);
+    }
+
+    public static void viewJetpackSecuritySettingsForResult(Activity activity, SiteModel site) {
+        AnalyticsTracker.track(Stat.SITE_SETTINGS_JETPACK_SECURITY_SETTINGS_VIEWED);
+        Intent intent = new Intent(activity, JetpackSecuritySettingsActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        activity.startActivityForResult(intent, JetpackSecuritySettingsActivity.JETPACK_SECURITY_SETTINGS_REQUEST_CODE);
+    }
+
     public static void viewHelpAndSupportInNewStack(@NonNull Context context, @NonNull Origin origin,
                                           @Nullable SiteModel selectedSite, @Nullable List<String> extraSupportTags) {
         Map<String, String> properties = new HashMap<>();
@@ -1085,14 +1272,21 @@ public static void showMainActivityAndSiteCreationActivity(Activity activity) {
     }
 
     public static void showSignInForResult(Activity activity) {
-        showSignInForResult(activity, false);
+        Intent intent = new Intent(activity, LoginActivity.class);
+        activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
     }
 
-    public static void showSignInForResult(Activity activity, boolean isWpComOnly) {
+    public static void showSignInForResultWpComOnly(Activity activity) {
         Intent intent = new Intent(activity, LoginActivity.class);
-        if (isWpComOnly) {
-            WPCOM_LOGIN_ONLY.putInto(intent);
-        }
+        WPCOM_LOGIN_ONLY.putInto(intent);
+        activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
+    }
+
+    public static void showSignInForResultJetpackOnly(Activity activity) {
+        Intent intent = new Intent(activity, LoginActivity.class);
+        intent.setFlags(
+                Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        JETPACK_LOGIN_ONLY.putInto(intent);
         activity.startActivityForResult(intent, RequestCodes.ADD_ACCOUNT);
     }
 
@@ -1166,9 +1360,12 @@ public static void viewMediaPickerForResult(Activity activity,
         activity.startActivityForResult(intent, requestCode);
     }
 
-    public static void viewSuggestUsersForResult(@NonNull Activity activity, @NonNull SiteModel site) {
-        Intent intent = new Intent(activity, SuggestUsersActivity.class);
-        intent.putExtra(WordPress.SITE, site);
+    public static void viewSuggestionsForResult(@NonNull Activity activity,
+                                                @NonNull SiteModel site,
+                                                @NonNull SuggestionType type) {
+        Intent intent = new Intent(activity, SuggestionActivity.class);
+        intent.putExtra(SuggestionActivity.INTENT_KEY_SITE_MODEL, site);
+        intent.putExtra(SuggestionActivity.INTENT_KEY_SUGGESTION_TYPE, type);
         activity.startActivityForResult(intent, RequestCodes.SELECTED_USER_MENTION);
     }
 
@@ -1199,6 +1396,12 @@ public static void loginWithoutMagicLink(Activity activity) {
         activity.startActivityForResult(intent, RequestCodes.DO_LOGIN);
     }
 
+    public static void loginForJetpackStats(Fragment fragment) {
+        Intent intent = new Intent(fragment.getActivity(), LoginActivity.class);
+        LoginMode.JETPACK_STATS.putInto(intent);
+        fragment.startActivityForResult(intent, RequestCodes.DO_LOGIN);
+    }
+
     /*
      * open the passed url in the device's external browser
      */
@@ -1278,4 +1481,41 @@ public static void viewPagesInNewStack(Context context) {
         intent.putExtra(WPMainActivity.ARG_OPEN_PAGE, WPMainActivity.ARG_PAGES);
         context.startActivity(intent);
     }
+
+    public static void showBackupDownloadForResult(Activity activity, @NonNull SiteModel site, String activityId,
+                                                   int resultCode, String source) {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(SOURCE_TRACK_EVENT_PROPERTY_KEY, source);
+        AnalyticsTracker.track(Stat.JETPACK_BACKUP_DOWNLOAD_OPENED, properties);
+
+        Intent intent = new Intent(activity, BackupDownloadActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        intent.putExtra(KEY_BACKUP_DOWNLOAD_ACTIVITY_ID_KEY, activityId);
+        activity.startActivityForResult(intent, resultCode);
+    }
+
+    public static void shareBackupDownloadFileLink(Context context, String url) {
+        Intent intent = new Intent(Intent.ACTION_SEND);
+        intent.setType("text/plain");
+        intent.putExtra(Intent.EXTRA_TEXT, url);
+
+        context.startActivity(Intent.createChooser(intent, context.getString(R.string.share_link)));
+    }
+
+    public static void downloadBackupDownloadFile(Context context, String url) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+        context.startActivity(intent);
+    }
+
+    public static void showRestoreForResult(Activity activity, @NonNull SiteModel site, String activityId,
+                                                   int resultCode, String source) {
+        Map<String, String> properties = new HashMap<>();
+        properties.put(SOURCE_TRACK_EVENT_PROPERTY_KEY, source);
+        AnalyticsTracker.track(Stat.JETPACK_RESTORE_OPENED, properties);
+
+        Intent intent = new Intent(activity, RestoreActivity.class);
+        intent.putExtra(WordPress.SITE, site);
+        intent.putExtra(KEY_RESTORE_ACTIVITY_ID_KEY, activityId);
+        activity.startActivityForResult(intent, resultCode);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java
index 61a87e5952f4..808cacf81de9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/CollapseFullScreenDialogFragment.java
@@ -281,7 +281,7 @@ private void initToolbar(View view) {
             mMenuAction = menu.add(0, ID_ACTION, 0, this.mAction);
             mMenuAction.setIcon(R.drawable.ic_send_white_24dp);
             MenuItemCompat.setIconTintList(mMenuAction,
-                    AppCompatResources.getColorStateList(view.getContext(), R.color.accent_neutral_30_selector));
+                    AppCompatResources.getColorStateList(view.getContext(), R.color.primary_neutral_30_selector));
             mMenuAction.setEnabled(false);
             mMenuAction.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
             mMenuAction.setOnMenuItemClickListener(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/CommentFullScreenDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/CommentFullScreenDialogFragment.kt
index 052fb016ca4d..ab6172d5a04b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/CommentFullScreenDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/CommentFullScreenDialogFragment.kt
@@ -5,12 +5,14 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
+import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -23,6 +25,7 @@ import org.wordpress.android.ui.CollapseFullScreenDialogFragment.CollapseFullScr
 import org.wordpress.android.ui.suggestion.util.SuggestionServiceConnectionManager
 import org.wordpress.android.ui.suggestion.util.SuggestionUtils
 import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.SuggestionAutoCompleteText
 import javax.inject.Inject
 
@@ -40,6 +43,7 @@ class CommentFullScreenDialogFragment : Fragment(), CollapseFullScreenDialogCont
     ): View? {
         val layout = inflater.inflate(R.layout.comment_dialog_fragment, container, false) as ViewGroup
         reply = layout.findViewById(R.id.edit_comment_expand)
+        reply.initializeWithPrefix('@')
         reply.requestFocus()
         reply.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
@@ -51,12 +55,17 @@ class CommentFullScreenDialogFragment : Fragment(), CollapseFullScreenDialogCont
             }
         })
 
-        viewModel.onKeyboardOpened.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                coroutineScope.launch {
-                    val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
-                    imm?.showSoftInput(reply, InputMethodManager.SHOW_IMPLICIT)
-                }
+        reply.setOnEditorActionListener { _: TextView?, actionId: Int, _: KeyEvent? ->
+            if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEND) {
+                dialogController.confirm(saveResult())
+            }
+            false
+        }
+
+        viewModel.onKeyboardOpened.observeEvent(viewLifecycleOwner, {
+            coroutineScope.launch {
+                val imm = activity?.getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+                imm?.showSoftInput(reply, InputMethodManager.SHOW_IMPLICIT)
             }
         })
 
@@ -85,13 +94,11 @@ class CommentFullScreenDialogFragment : Fragment(), CollapseFullScreenDialogCont
                 activity,
                 site.siteId
         )
-        val suggestionAdapter = SuggestionUtils.setupSuggestions(
-                site, activity,
+        val suggestionAdapter = SuggestionUtils.setupUserSuggestions(
+                site, requireActivity(),
                 suggestionServiceConnectionManager
         )
-        if (suggestionAdapter != null) {
-            this.reply.setAdapter(suggestionAdapter)
-        }
+        this.reply.setAdapter(suggestionAdapter)
     }
 
     override fun onCollapseClicked(controller: CollapseFullScreenDialogController): Boolean {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/DeepLinkingIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/DeepLinkingIntentReceiverActivity.java
deleted file mode 100644
index 34f894bdac8b..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/DeepLinkingIntentReceiverActivity.java
+++ /dev/null
@@ -1,419 +0,0 @@
-package org.wordpress.android.ui;
-
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.TextUtils;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.wordpress.android.R;
-import org.wordpress.android.WordPress;
-import org.wordpress.android.analytics.AnalyticsTracker;
-import org.wordpress.android.fluxc.model.PostModel;
-import org.wordpress.android.fluxc.model.SiteModel;
-import org.wordpress.android.fluxc.store.AccountStore;
-import org.wordpress.android.fluxc.store.PostStore;
-import org.wordpress.android.fluxc.store.SiteStore;
-import org.wordpress.android.ui.reader.ReaderActivityLauncher;
-import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.StringUtils;
-import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
-
-import java.util.List;
-
-import javax.inject.Inject;
-
-import static org.wordpress.android.WordPress.getContext;
-
-/**
- * An activity to handle deep linking and intercepting links like:
- * <p>
- * wordpress://viewpost?blogId={blogId}&postId={postId}
- * <p>
- * Redirects users to the reader activity along with IDs passed in the intent
- */
-public class DeepLinkingIntentReceiverActivity extends LocaleAwareActivity {
-    private static final String DEEP_LINK_HOST_NOTIFICATIONS = "notifications";
-    private static final String DEEP_LINK_HOST_POST = "post";
-    private static final String DEEP_LINK_HOST_STATS = "stats";
-    private static final String DEEP_LINK_HOST_READ = "read";
-    private static final String DEEP_LINK_HOST_VIEWPOST = "viewpost";
-    private static final String HOST_WORDPRESS_COM = "wordpress.com";
-    private static final String HOST_API_WORDPRESS_COM = "public-api.wordpress.com";
-    private static final String MOBILE_TRACKING_PATH = "mbar";
-    private static final String REGULAR_TRACKING_PATH = "bar";
-    private static final String POST_PATH = "post";
-    private static final String REDIRECT_TO_PARAM = "redirect_to";
-    private static final String STATS_PATH = "stats";
-    private static final String PAGES_PATH = "pages";
-
-    private String mInterceptedUri;
-    private String mBlogId;
-    private String mPostId;
-
-    @Inject AccountStore mAccountStore;
-    @Inject SiteStore mSiteStore;
-    @Inject PostStore mPostStore;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ((WordPress) getApplication()).component().inject(this);
-
-        String action = getIntent().getAction();
-        Uri uri = getIntent().getData();
-        String host = "";
-        if (uri != null) {
-            host = uri.getHost();
-        }
-        AnalyticsUtils.trackWithDeepLinkData(AnalyticsTracker.Stat.DEEP_LINKED, action, host, uri);
-
-        // check if this intent is started via custom scheme link
-        if (Intent.ACTION_VIEW.equals(action) && uri != null) {
-            mInterceptedUri = uri.toString();
-            if (shouldOpenEditor(uri)) {
-                handleOpenEditor(uri);
-            } else if (shouldOpenEditorFromDeepLink(host)) {
-                handleOpenEditorFromDeepLink(uri);
-            } else if (shouldHandleTrackingUrl(uri)) {
-                // There is only one handled tracking URL for now (open editor)
-                handleOpenEditorFromTrackingUrl(uri);
-            } else if (isFromAppBanner(host)) {
-                handleAppBanner(host);
-            } else if (shouldViewPost(host)) {
-                handleViewPost(uri);
-            } else if (shouldShowStats(uri)) {
-                handleShowStats(uri);
-            } else if (shouldShowPages(uri)) {
-                handleShowPages(uri);
-            } else {
-                // not handled
-                finish();
-            }
-        } else {
-            finish();
-        }
-    }
-
-    private boolean shouldOpenEditor(@NonNull Uri uri) {
-        // Match: https://wordpress.com/post/
-        return shouldShow(uri, POST_PATH);
-    }
-
-    private boolean shouldOpenEditorFromDeepLink(String host) {
-        // Match: wordpress://post/...
-        return host != null && host.equals(DEEP_LINK_HOST_POST);
-    }
-
-    private @Nullable Uri getRedirectUri(@NonNull Uri uri) {
-        String redirectTo = uri.getQueryParameter(REDIRECT_TO_PARAM);
-        if (redirectTo == null) {
-            return null;
-        }
-        return Uri.parse(redirectTo);
-    }
-
-    private boolean shouldHandleTrackingUrl(@NonNull Uri uri) {
-        // https://public-api.wordpress.com/mbar/
-        return StringUtils.equals(uri.getHost(), HOST_API_WORDPRESS_COM)
-               && (!uri.getPathSegments().isEmpty()
-                   && StringUtils.equals(uri.getPathSegments().get(0), MOBILE_TRACKING_PATH));
-    }
-
-    private void handleOpenEditorFromTrackingUrl(@NonNull Uri uri) {
-        Uri redirectUri = getRedirectUri(uri);
-        if (redirectUri == null || !shouldOpenEditor(redirectUri)) {
-            // Replace host to redirect to the browser
-            Uri newUri = (new Uri.Builder())
-                    .scheme(uri.getScheme())
-                    .path(REGULAR_TRACKING_PATH)
-                    .query(uri.getQuery())
-                    .fragment(uri.getFragment())
-                    .authority(uri.getAuthority())
-                    .build();
-            Intent browserIntent = new Intent(Intent.ACTION_VIEW, newUri);
-            startActivity(browserIntent);
-            finish();
-            return;
-        }
-        handleOpenEditor(redirectUri);
-    }
-
-    /**
-     * Opens post editor for provided uri. If uri contains a site and a postId
-     * (e.g. https://wordpress.com/example.com/1231/), opens the post for editing, if available.
-     * If the uri only contains a site (e.g. https://wordpress.com/example.com/ ), opens a new post
-     * editor for that site, if available.
-     * Else opens the new post editor for currently selected site.
-     */
-    private void handleOpenEditor(@NonNull Uri uri) {
-        List<String> pathSegments = uri.getPathSegments();
-
-        if (pathSegments.size() < 3) {
-            // No postId in path, open new post editor for site
-            openEditorForSite(extractTargetHost(uri));
-            return;
-        }
-
-        // Match: https://wordpress.com/post/blogNameOrUrl/postId
-        String targetHost = pathSegments.get(1);
-        String targetPostId = pathSegments.get(2);
-        openEditorForSiteAndPost(targetHost, targetPostId);
-    }
-
-    /**
-     * Opens post editor for provided uri. If uri contains a site and a postId
-     * (e.g. wordpress/post?blogId=798&postId=1231), opens the post for editing, if available.
-     * If the uri only contains a site (e.g. wordpress/post?blogId=798 ), opens a new post
-     * editor for that site, if available.
-     * Else opens the new post editor for currently selected site.
-     */
-    private void handleOpenEditorFromDeepLink(@NonNull Uri uri) {
-        String blogId = uri.getQueryParameter("blogId");
-        String postId = uri.getQueryParameter("postId");
-
-        if (blogId == null) {
-            // No blogId provided. Follow default behaviour: open a blank editor with the current selected site
-            ActivityLauncher.openEditorInNewStack(getContext());
-            return;
-        }
-
-        SiteModel site;
-
-        Long siteId = parseAsLongOrNull(blogId);
-        if (siteId != null) {
-            // Blog id is a number so we check for it as site id
-            site = mSiteStore.getSiteBySiteId(siteId);
-        } else {
-            // Blog id is not a number so we check for it as blog name or url
-            List<SiteModel> matchedSites = mSiteStore.getSitesByNameOrUrlMatching(blogId);
-            site = matchedSites.isEmpty() ? null : matchedSites.get(0);
-        }
-
-        if (site == null) {
-            // Site not found. Open a blank editor with the current selected site
-            ToastUtils.showToast(getContext(), R.string.blog_not_found);
-            ActivityLauncher.openEditorInNewStack(getContext());
-            return;
-        }
-
-        Long remotePostId = parseAsLongOrNull(postId);
-
-        if (remotePostId == null) {
-            // Open new post editor for given site
-            ActivityLauncher.openEditorForSiteInNewStack(getContext(), site);
-            return;
-        }
-
-        // Check if post is available for opening
-        PostModel post = mPostStore.getPostByRemotePostId(remotePostId, site);
-
-        if (post == null) {
-            ToastUtils.showToast(getContext(), R.string.post_not_found);
-            // Post not found. Open new post editor for given site.
-            ActivityLauncher.openEditorForSiteInNewStack(getContext(), site);
-            return;
-        }
-
-        // Open editor with post
-        ActivityLauncher.openEditorForPostInNewStack(getContext(), site, post.getId());
-    }
-
-    private void openEditorForSite(@NonNull String targetHost) {
-        SiteModel site = extractSiteModelFromTargetHost(targetHost);
-        String host = extractHostFromSite(site);
-        if (site != null && host != null && StringUtils.equals(host, targetHost)) {
-            // if we found the site with the matching url, open the editor for this site.
-            ActivityLauncher.openEditorForSiteInNewStack(getContext(), site);
-        } else {
-            // In other cases, open the editor with the current selected site.
-            ActivityLauncher.openEditorInNewStack(getContext());
-        }
-    }
-
-    private void openEditorForSiteAndPost(@NonNull String targetHost, @NonNull String targetPostId) {
-        // Check if a site is available with given targetHost
-        SiteModel site = extractSiteModelFromTargetHost(targetHost);
-        String host = extractHostFromSite(site);
-        if (site == null || host == null || !StringUtils.equals(host, targetHost)) {
-            // Site not found, or host of site doesn't match the host in url
-            ToastUtils.showToast(getContext(), R.string.blog_not_found);
-            // Open a new post editor with current selected site
-            ActivityLauncher.openEditorInNewStack(getContext());
-            return;
-        }
-
-        Long remotePostId = parseAsLongOrNull(targetPostId);
-
-        if (remotePostId == null) {
-            // No post id provided; open new post editor for given site
-            ActivityLauncher.openEditorForSiteInNewStack(getContext(), site);
-            return;
-        }
-
-        // Check if post with given id is available for opening
-        PostModel post = mPostStore.getPostByRemotePostId(remotePostId, site);
-
-        if (post == null) {
-            // Post not found
-            ToastUtils.showToast(getContext(), R.string.post_not_found);
-            // Open new post editor for given site
-            ActivityLauncher.openEditorForSiteInNewStack(getContext(), site);
-            return;
-        }
-
-        // Open editor with post
-        ActivityLauncher.openEditorForPostInNewStack(getContext(), site, post.getId());
-    }
-
-    private boolean shouldViewPost(String host) {
-        return StringUtils.equals(host, DEEP_LINK_HOST_VIEWPOST);
-    }
-
-    private void handleViewPost(@NonNull Uri uri) {
-        mBlogId = uri.getQueryParameter("blogId");
-        mPostId = uri.getQueryParameter("postId");
-
-        // if user is signed in wpcom show the post right away - otherwise show welcome activity
-        // and then show the post once the user has signed in
-        if (mAccountStore.hasAccessToken()) {
-            showPost();
-            finish();
-        } else {
-            ActivityLauncher.loginForDeeplink(this);
-        }
-    }
-
-    private boolean shouldShowStats(@NonNull Uri uri) {
-        // Match: https://wordpress.com/stats/
-        return shouldShow(uri, STATS_PATH);
-    }
-
-    private void handleShowStats(@NonNull Uri uri) {
-        String targetHost = extractTargetHost(uri);
-        SiteModel site = extractSiteModelFromTargetHost(targetHost);
-        String host = extractHostFromSite(site);
-        if (site != null && host != null && StringUtils.equals(host, targetHost)) {
-            ActivityLauncher.viewStatsInNewStack(getContext(), site);
-        } else {
-            // In other cases, launch stats with the current selected site.
-            ActivityLauncher.viewStatsInNewStack(getContext());
-        }
-        finish();
-    }
-
-    private boolean shouldShowPages(@NonNull Uri uri) {
-        // Match: https://wordpress.com/pages/
-        return shouldShow(uri, PAGES_PATH);
-    }
-
-    private void handleShowPages(@NonNull Uri uri) {
-        String targetHost = extractTargetHost(uri);
-        SiteModel site = extractSiteModelFromTargetHost(targetHost);
-        String host = extractHostFromSite(site);
-        if (site != null && host != null && StringUtils.equals(host, targetHost)) {
-            ActivityLauncher.viewPagesInNewStack(getContext(), site);
-        } else {
-            // In other cases, launch pages with the current selected site.
-            ActivityLauncher.viewPagesInNewStack(getContext());
-        }
-        finish();
-    }
-
-    private void handleAppBanner(@NonNull String host) {
-        switch (host) {
-            case DEEP_LINK_HOST_NOTIFICATIONS:
-                ActivityLauncher.viewNotificationsInNewStack(getContext());
-                break;
-            case DEEP_LINK_HOST_STATS:
-                long primarySiteId = mAccountStore.getAccount().getPrimarySiteId();
-                SiteModel siteModel = mSiteStore.getSiteBySiteId(primarySiteId);
-                ActivityLauncher.viewStatsInNewStack(getContext(), siteModel);
-                break;
-            case DEEP_LINK_HOST_READ:
-                ActivityLauncher.viewReaderInNewStack(getContext());
-                break;
-        }
-    }
-
-    private boolean isFromAppBanner(String host) {
-        return (host != null
-                && (host.equals(DEEP_LINK_HOST_NOTIFICATIONS)
-                    || host.equals(DEEP_LINK_HOST_READ)
-                    || host.equals(DEEP_LINK_HOST_STATS)));
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        // show the post if user is returning from successful login
-        if (requestCode == RequestCodes.DO_LOGIN && resultCode == RESULT_OK) {
-            showPost();
-        }
-
-        finish();
-    }
-
-    private void showPost() {
-        if (!TextUtils.isEmpty(mBlogId) && !TextUtils.isEmpty(mPostId)) {
-            try {
-                final long blogId = Long.parseLong(mBlogId);
-                final long postId = Long.parseLong(mPostId);
-
-                AnalyticsUtils.trackWithBlogPostDetails(AnalyticsTracker.Stat.READER_VIEWPOST_INTERCEPTED,
-                        blogId, postId);
-
-                ReaderActivityLauncher.showReaderPostDetail(this, false, blogId, postId, null, 0,
-                        mInterceptedUri);
-            } catch (NumberFormatException e) {
-                AppLog.e(T.READER, e);
-            }
-        } else {
-            ToastUtils.showToast(this, R.string.error_generic);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        finish();
-    }
-
-    // Helper Methods
-    private String extractTargetHost(@NonNull Uri uri) {
-        return uri.getLastPathSegment() == null ? "" : uri.getLastPathSegment();
-    }
-
-    private @Nullable SiteModel extractSiteModelFromTargetHost(String host) {
-        List<SiteModel> matchedSites = mSiteStore.getSitesByNameOrUrlMatching(host);
-        return matchedSites.isEmpty() ? null : matchedSites.get(0);
-    }
-
-    private @Nullable String extractHostFromSite(SiteModel site) {
-        if (site != null && site.getUrl() != null) {
-            return Uri.parse(site.getUrl()).getHost();
-        }
-        return null;
-    }
-
-    private boolean shouldShow(@NonNull Uri uri, @NonNull String path) {
-        return StringUtils.equals(uri.getHost(), HOST_WORDPRESS_COM)
-               && (!uri.getPathSegments().isEmpty() && StringUtils.equals(uri.getPathSegments().get(0), path));
-    }
-
-    private Long parseAsLongOrNull(String longAsString) {
-        if (longAsString == null || longAsString.isEmpty()) {
-            return null;
-        }
-
-        try {
-            return Long.valueOf(longAsString);
-        } catch (NumberFormatException nfe) {
-            return null;
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/FullscreenBottomSheetDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/FullscreenBottomSheetDialogFragment.kt
new file mode 100644
index 000000000000..60f5d0d95a43
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/FullscreenBottomSheetDialogFragment.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.ui
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.View
+import android.view.WindowManager
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+/**
+ * Customises [BottomSheetDialogFragment] for fullscreen
+ */
+abstract class FullscreenBottomSheetDialogFragment : BottomSheetDialogFragment() {
+    abstract fun closeModal()
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+        closeModal()
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?) = BottomSheetDialog(requireContext(), getTheme()).apply {
+        fillTheScreen(this)
+        window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
+    }
+
+    private fun fillTheScreen(dialog: BottomSheetDialog) {
+        dialog.setOnShowListener {
+            dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)?.let {
+                val behaviour = BottomSheetBehavior.from(it)
+                setupFullHeight(it)
+                behaviour.skipCollapsed = true
+                behaviour.state = BottomSheetBehavior.STATE_EXPANDED
+            }
+        }
+    }
+
+    private fun setupFullHeight(bottomSheet: View) {
+        val layoutParams = bottomSheet.layoutParams
+        layoutParams.height = WindowManager.LayoutParams.MATCH_PARENT
+        bottomSheet.layoutParams = layoutParams
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java
index 9ad621064985..69159dc25f3f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/JetpackConnectionResultActivity.java
@@ -19,6 +19,7 @@
 import org.wordpress.android.login.LoginMode;
 import org.wordpress.android.ui.accounts.LoginActivity;
 import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 
@@ -132,7 +133,7 @@ private void trackResult() {
     private void finishAndGoBackToSource() {
         if (mSource == JetpackConnectionSource.STATS) {
             SiteModel site = (SiteModel) getIntent().getSerializableExtra(SITE);
-            mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction());
+            mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction(SiteUtils.getFetchSitesPayload()));
             ActivityLauncher.viewBlogStatsAfterJetpackSetup(this, site);
         }
         finish();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallFragment.kt
index bd3fa25ff7bc..d278385e039b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallFragment.kt
@@ -11,7 +11,6 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import kotlinx.android.synthetic.main.jetpack_remote_install_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
@@ -36,8 +35,7 @@ class JetpackRemoteInstallFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         requireActivity().let { activity ->
-            viewModel = ViewModelProviders.of(this, viewModelFactory)
-                    .get<JetpackRemoteInstallViewModel>(JetpackRemoteInstallViewModel::class.java)
+            viewModel = ViewModelProvider(this, viewModelFactory).get(JetpackRemoteInstallViewModel::class.java)
 
             val intent = activity.intent
             val site = intent.getSerializableExtra(WordPress.SITE) as SiteModel
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/Organization.kt b/WordPress/src/main/java/org/wordpress/android/ui/Organization.kt
new file mode 100644
index 000000000000..b53c1fc18e7a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/Organization.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui
+
+enum class Organization(val orgId: Int) {
+    UNKNOWN(-1),
+    NO_ORGANIZATION(0),
+    A8C(1),
+    P2(2);
+
+    companion object {
+        private val map = values().associateBy(Organization::orgId)
+
+        @JvmStatic
+        fun fromOrgId(orgId: Int) = map[orgId] ?: UNKNOWN
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/PreviewMode.kt b/WordPress/src/main/java/org/wordpress/android/ui/PreviewMode.kt
new file mode 100644
index 000000000000..5f811fee9c90
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/PreviewMode.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui
+
+/**
+ * Holds the available preview/thumbnail modes
+ *
+ * @param key the preview mode key (used mainly for analytics)
+ * @param previewWidth the rendering width of the preview
+ */
+enum class PreviewMode(val key: String, val previewWidth: Int) {
+    MOBILE("mobile", 400),
+    TABLET("tablet", 800),
+    DESKTOP("desktop", 1200)
+}
+
+/**
+ * Defines an interface for handling the [PreviewMode]
+ */
+interface PreviewModeHandler {
+    fun selectedPreviewMode(): PreviewMode
+    fun onPreviewModeChanged(mode: PreviewMode)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeMenuAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeMenuAdapter.kt
index 8f8cf61c6974..b11b13967601 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeMenuAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeMenuAdapter.kt
@@ -9,23 +9,23 @@ import android.widget.ImageView
 import android.widget.TextView
 
 import org.wordpress.android.R
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode
-
+import org.wordpress.android.ui.PreviewMode.DESKTOP
+import org.wordpress.android.ui.PreviewMode.MOBILE
+import org.wordpress.android.ui.PreviewMode.TABLET
+import org.wordpress.android.util.setVisible
+
+/**
+ * Implements the preview/thumbnail mode popup adapter
+ */
 class PreviewModeMenuAdapter(context: Context, private val selectedPreviewMode: PreviewMode) : BaseAdapter() {
     private val inflater: LayoutInflater = LayoutInflater.from(context)
-    private val menuItems = arrayOf(PreviewMode.DEFAULT, PreviewMode.DESKTOP)
+    private val menuItems = arrayOf(MOBILE, TABLET, DESKTOP)
 
-    override fun getCount(): Int {
-        return menuItems.size
-    }
+    override fun getCount() = menuItems.size
 
-    override fun getItem(position: Int): PreviewMode {
-        return menuItems[position]
-    }
+    override fun getItem(position: Int): PreviewMode = menuItems[position]
 
-    override fun getItemId(position: Int): Long {
-        return position.toLong()
-    }
+    override fun getItemId(position: Int): Long = position.toLong()
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup): View? {
         var view = convertView
@@ -38,25 +38,21 @@ class PreviewModeMenuAdapter(context: Context, private val selectedPreviewMode:
             holder = view.tag as PreviewModeMenuHolder
         }
 
-        val previewMode = menuItems[position]
+        val previewMode = getItem(position)
         val labelResId = when (previewMode) {
-            PreviewMode.DEFAULT -> R.string.web_preview_default
-            PreviewMode.DESKTOP -> R.string.web_preview_desktop
+            MOBILE -> R.string.web_preview_mobile
+            TABLET -> R.string.web_preview_tablet
+            DESKTOP -> R.string.web_preview_desktop
         }
 
         holder.label.setText(labelResId)
-
-        if (previewMode === selectedPreviewMode) {
-            holder.checkmark.visibility = View.VISIBLE
-        } else {
-            holder.checkmark.visibility = View.GONE
-        }
+        holder.checkMark.setVisible(previewMode === selectedPreviewMode)
 
         return view
     }
 
     internal inner class PreviewModeMenuHolder(view: View) {
         val label: TextView = view.findViewById(R.id.preview_mode_label)
-        val checkmark: ImageView = view.findViewById(R.id.checkmark)
+        val checkMark: ImageView = view.findViewById(R.id.checkmark)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeSelectorPopup.kt b/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeSelectorPopup.kt
new file mode 100644
index 000000000000..a24a8e5e58a4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/PreviewModeSelectorPopup.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.ui
+
+import android.content.Context
+import android.graphics.drawable.ColorDrawable
+import android.view.Gravity
+import android.view.View
+import androidx.appcompat.widget.ListPopupWindow
+import com.google.android.material.elevation.ElevationOverlayProvider
+import org.wordpress.android.R.dimen
+
+/**
+ * Implements the preview mode popup
+ */
+class PreviewModeSelectorPopup(val context: Context, val button: View) : ListPopupWindow(context) {
+    init {
+        val resources = context.resources
+        val popupOffset = resources.getDimensionPixelSize(dimen.margin_extra_large)
+        width = resources.getDimensionPixelSize(dimen.web_preview_mode_popup_width)
+        setDropDownGravity(Gravity.END)
+        anchorView = button
+        horizontalOffset = -popupOffset
+        verticalOffset = popupOffset
+        isModal = true
+        val popupBackgroundColor = ElevationOverlayProvider(context).compositeOverlayWithThemeSurfaceColorIfNeeded(
+                resources.getDimension(dimen.popup_over_toolbar_elevation)
+        )
+        setBackgroundDrawable(ColorDrawable(popupBackgroundColor))
+    }
+
+    fun show(handler: PreviewModeHandler) {
+        button.post(Runnable {
+            setAdapter(PreviewModeMenuAdapter(context, handler.selectedPreviewMode()))
+            setOnItemClickListener { parent, _, position, _ ->
+                dismiss()
+                val adapter = parent.adapter as PreviewModeMenuAdapter
+                val selected = adapter.getItem(position)
+                if (selected !== handler.selectedPreviewMode()) {
+                    handler.onPreviewModeChanged(selected)
+                }
+            }
+            show()
+        })
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java b/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java
index 9a9fd3aa754a..bdda658d6a1d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java
@@ -10,7 +10,6 @@ public class RequestCodes {
     public static final int NOTE_DETAIL = 600;
     public static final int SITE_PICKER = 700;
     public static final int EDIT_POST = 800;
-    public static final int PREVIEW_POST = 810;
     public static final int REMOTE_PREVIEW_POST = 820;
     public static final int NO_REBLOG_SITE = 830;
     public static final int CREATE_SITE = 900;
@@ -21,13 +20,15 @@ public class RequestCodes {
     public static final int STOCK_MEDIA_PICKER_SINGLE_SELECT = 1202;
     public static final int STOCK_MEDIA_PICKER_SINGLE_SELECT_FOR_GUTENBERG_BLOCK = 1203;
     public static final int STORIES_PHOTO_PICKER = 1204;
-    public static final int GIF_PICKER = 1205;
+    public static final int SITE_ICON_PICKER = 1205;
     public static final int SHOW_LOGIN_EPILOGUE_AND_RETURN = 1300;
     public static final int SHOW_SIGNUP_EPILOGUE_AND_RETURN = 1301;
     public static final int SMART_LOCK_SAVE = 1400;
     public static final int SMART_LOCK_READ = 1500;
     public static final int NOTIFICATION_SETTINGS = 1600;
     public static final int ACTIVITY_LOG_DETAIL = 1700;
+    public static final int BACKUP_DOWNLOAD = 1710;
+    public static final int RESTORE = 1720;
     public static final int PAGE_PARENT = 1800;
     public static final int HISTORY_DETAIL = 1900;
 
@@ -37,6 +38,7 @@ public class RequestCodes {
     public static final int VIDEO_LIBRARY = 2200;
     public static final int MEDIA_LIBRARY = 2210;
     public static final int FILE_LIBRARY = 2220;
+    public static final int AUDIO_LIBRARY = 2230;
     public static final int TAKE_VIDEO = 2300;
     public static final int CROP_PHOTO = 2400;
     public static final int PICTURE_LIBRARY_OR_CAPTURE = 2500;
@@ -66,4 +68,7 @@ public class RequestCodes {
     // Story creator
     public static final int CREATE_STORY = 8000;
     public static final int EDIT_STORY = 8001;
+
+    // Reader Interests
+    public static final int READER_INTERESTS = 9001;
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/SuggestUsersActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/SuggestUsersActivity.kt
deleted file mode 100644
index 8358e35158a3..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/SuggestUsersActivity.kt
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.wordpress.android.ui
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Intent
-import android.database.DataSetObserver
-import android.os.Bundle
-import android.text.Editable
-import android.text.TextWatcher
-import android.view.KeyEvent
-import android.view.View
-import android.view.inputmethod.EditorInfo
-import kotlinx.android.synthetic.main.suggest_users_activity.*
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode.MAIN
-import org.wordpress.android.R
-import org.wordpress.android.WordPress
-import org.wordpress.android.datasets.SuggestionTable
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChangeEvent
-import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter
-import org.wordpress.android.ui.suggestion.service.SuggestionEvents.SuggestionNameListUpdated
-import org.wordpress.android.ui.suggestion.util.SuggestionServiceConnectionManager
-import org.wordpress.android.ui.suggestion.util.SuggestionUtils
-import org.wordpress.android.util.AppLog
-import org.wordpress.android.util.NetworkUtils
-import org.wordpress.android.util.SiteUtils
-import org.wordpress.android.util.ToastUtils
-import org.wordpress.android.widgets.SuggestionAutoCompleteText
-
-class SuggestUsersActivity : LocaleAwareActivity() {
-    private var suggestionServiceConnectionManager: SuggestionServiceConnectionManager? = null
-    private var suggestionAdapter: SuggestionAdapter? = null
-    private var siteId: Long? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.suggest_users_activity)
-
-        val siteModel = intent.getSerializableExtra(WordPress.SITE) as? SiteModel
-        if (siteModel == null) {
-            val message = "${this.javaClass.simpleName} started without ${WordPress.SITE}. Finishing Activity."
-            AppLog.e(AppLog.T.EDITOR, message)
-            finish()
-        } else {
-            initializeActivity(siteModel)
-        }
-    }
-
-    private fun initializeActivity(siteModel: SiteModel) {
-        siteId = siteModel.siteId
-
-        initializeSuggestionAdapter(siteModel)
-
-        rootView.setOnClickListener {
-            // The previous activity is visible "behind" this Activity if the list of Suggestions does not fill
-            // the entire screen. If the user taps a part of the screen showing the still-visible previous
-            // Activity, then finish this Activity and return the user to the previous Activity.
-            finish()
-        }
-
-        autocompleteText.apply {
-            setOnItemClickListener { _, _, position, _ ->
-                val suggestionUserId = suggestionAdapter?.getItem(position)?.userLogin
-                finishWithId(suggestionUserId)
-            }
-
-            setOnKeyListener { _, keyCode, event ->
-                if (event.action == KeyEvent.ACTION_UP) {
-                    if (keyCode == KeyEvent.KEYCODE_ENTER) {
-                        return@setOnKeyListener exitIfOnlyOneMatchingUser()
-                    }
-                }
-                false
-            }
-
-            setOnEditorActionListener { _, actionId, _ ->
-                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    exitIfOnlyOneMatchingUser()
-                } else {
-                    false
-                }
-            }
-
-            setOnFocusChangeListener { _, _ ->
-                // The purpose of this Activity is to allow the user to select a user, so we want
-                // the dropdown to always be visible.
-                post { showDropDown() }
-            }
-
-            // Insure the text always starts with an "@"
-            addTextChangedListener(object : TextWatcher {
-                var singleAtChar: Boolean? = null
-
-                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
-                    singleAtChar = s?.let { "@".contentEquals(it) }
-                }
-                override fun afterTextChanged(s: Editable?) {}
-                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-                    if (s?.isEmpty() == true && singleAtChar == true) {
-                        // Tapping delete when only @ is shown in the input should exit the @-mention UI
-                        finish()
-                    } else if (s?.startsWith("@") == false) {
-                        // Re-insert initial @ if it was deleted
-                        autocompleteText.setText(resources.getString(R.string.at_username, s))
-                        autocompleteText.setSelection(1)
-                        showDropDown()
-                    }
-                    singleAtChar = null
-                }
-            })
-
-            if (text.isEmpty()) {
-                setText("@")
-                setSelection(1)
-            }
-
-            updateEmptyView()
-            post { requestFocus() }
-            showDropdownOnTouch()
-        }
-    }
-
-    private fun exitIfOnlyOneMatchingUser(): Boolean {
-        val onlySuggestedUser = if (suggestionAdapter?.count == 1) {
-            suggestionAdapter?.getItem(0)?.userLogin
-        } else {
-            null
-        }
-
-        if (onlySuggestedUser != null) {
-            finishWithId(onlySuggestedUser)
-        } else {
-            // If there is not exactly 1 suggestion, notify that entered text is not a valid user
-            val message = getString(R.string.suggestion_invalid_user, autocompleteText.text)
-            ToastUtils.showToast(this@SuggestUsersActivity, message)
-        }
-
-        return onlySuggestedUser != null
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun SuggestionAutoCompleteText.showDropdownOnTouch() {
-        setOnTouchListener { _, _ ->
-            // Prevent touching the view from dismissing the suggestion list if it's not empty
-            if (!adapter.isEmpty) {
-                showDropDown()
-            }
-            false
-        }
-    }
-
-    override fun finish() {
-        super.finish()
-        overridePendingTransition(R.anim.do_nothing, R.anim.do_nothing)
-    }
-
-    private fun finishWithId(userId: String?) {
-        setResult(Activity.RESULT_OK, Intent().apply {
-            putExtra(SELECTED_USER_ID, userId)
-        })
-        finish()
-    }
-
-    private fun initializeSuggestionAdapter(site: SiteModel) {
-        if (SiteUtils.isAccessedViaWPComRest(site)) {
-            val connectionManager = SuggestionServiceConnectionManager(this, site.siteId)
-            val adapter = SuggestionUtils.setupSuggestions(site, this, connectionManager)?.apply {
-                setBackgroundColorAttr(R.attr.colorGutenbergBackground)
-
-                registerDataSetObserver(object : DataSetObserver() {
-                    override fun onChanged() {
-                        updateEmptyView()
-                    }
-
-                    override fun onInvalidated() {
-                        updateEmptyView()
-                    }
-                })
-            }
-
-            autocompleteText.setAdapter(adapter)
-
-            suggestionServiceConnectionManager = connectionManager
-            suggestionAdapter = adapter
-        }
-    }
-
-    private fun updateEmptyView() {
-        val hasSuggestions = suggestionAdapter?.suggestionList?.isNotEmpty() == true
-        val showingSuggestions = suggestionAdapter?.isEmpty == false
-
-        empty_view.apply {
-            text = getString(
-                    when {
-                        hasSuggestions -> R.string.suggestion_no_matching_users
-                        NetworkUtils.isNetworkAvailable(applicationContext) -> R.string.loading
-                        else -> R.string.suggestion_no_connection
-                    }
-            )
-
-            visibility = when {
-                showingSuggestions -> View.GONE
-                else -> View.VISIBLE
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        EventBus.getDefault().register(this)
-    }
-
-    override fun onPause() {
-        EventBus.getDefault().unregister(this)
-        super.onPause()
-    }
-
-    override fun onDestroy() {
-        suggestionServiceConnectionManager?.unbindFromService()
-        super.onDestroy()
-    }
-
-    @Subscribe(threadMode = MAIN)
-    fun onEventMainThread(event: SuggestionNameListUpdated) {
-        // check if the updated suggestions are for the current blog and update the suggestions
-        if (siteId != 0L && siteId == event.mRemoteBlogId) {
-            val suggestions = SuggestionTable.getSuggestionsForSite(event.mRemoteBlogId)
-            suggestionAdapter?.setSuggestionList(suggestions)
-
-            // Calling forceFiltering is the only way I was able to force the suggestions list to immediately refresh
-            // with the new data
-            autocompleteText.forceFiltering(autocompleteText.text)
-
-            // Ensure that the suggestions list is displayed wth the new data. This is particularly needed when
-            // suggestion list was empty before the new data was received, otherwise the no-longer-empty suggestion
-            // list will not display when it is updated.
-            autocompleteText.showDropDown()
-        }
-    }
-
-    @Subscribe(threadMode = MAIN)
-    fun onEventMainThread(event: ConnectionChangeEvent) {
-        val hasNoSuggestions = suggestionAdapter?.suggestionList?.isEmpty() == true
-        if (hasNoSuggestions && event.isConnected) {
-            suggestionServiceConnectionManager?.apply {
-                unbindFromService()
-                bindToService()
-            }
-        }
-        updateEmptyView()
-    }
-
-    companion object {
-        const val SELECTED_USER_ID = "SELECTED_USER_ID"
-    }
-}
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPBottomSheetDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/WPBottomSheetDialogFragment.java
similarity index 96%
rename from libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPBottomSheetDialogFragment.java
rename to WordPress/src/main/java/org/wordpress/android/ui/WPBottomSheetDialogFragment.java
index bf25fcf95bb7..3fa9ec728c71 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPBottomSheetDialogFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPBottomSheetDialogFragment.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.login.widgets;
+package org.wordpress.android.ui;
 
 import android.app.Dialog;
 import android.content.res.Resources;
@@ -13,7 +13,7 @@
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 
-import org.wordpress.android.login.R;
+import org.wordpress.android.R;
 
 public class WPBottomSheetDialogFragment extends BottomSheetDialogFragment {
     @NonNull
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
index 2e7eade5cc39..65a3677ec447 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WPWebViewActivity.java
@@ -4,11 +4,10 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
-import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -17,19 +16,18 @@
 import android.view.ViewGroup;
 import android.webkit.CookieManager;
 import android.webkit.WebViewClient;
-import android.widget.AdapterView;
 import android.widget.LinearLayout;
-import android.widget.PopupWindow.OnDismissListener;
+import android.widget.RelativeLayout;
+import android.widget.RelativeLayout.LayoutParams;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.ListPopupWindow;
 import androidx.appcompat.widget.Toolbar;
 import androidx.appcompat.widget.TooltipCompat;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import com.google.android.material.elevation.ElevationOverlayProvider;
 import com.google.android.material.snackbar.Snackbar;
@@ -52,6 +50,7 @@
 import org.wordpress.android.ui.utils.UiHelpers;
 import org.wordpress.android.util.AniUtils;
 import org.wordpress.android.util.AppLog;
+import org.wordpress.android.util.DisplayUtilsWrapper;
 import org.wordpress.android.util.ErrorManagedWebViewClient.ErrorManagedWebViewClientListener;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
@@ -62,7 +61,6 @@
 import org.wordpress.android.util.helpers.WPWebChromeClient;
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel;
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.NavBarUiState;
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode;
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewModeSelectorStatus;
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState;
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewFullscreenUiState;
@@ -131,6 +129,8 @@ public class WPWebViewActivity extends WebViewActivity implements ErrorManagedWe
     public static final String ACTION_BAR_TITLE = "action_bar_title";
     public static final String SHOW_PREVIEW_MODE_TOGGLE = "SHOW_PREVIEW_MODE_TOGGLE";
     public static final String PRIVATE_AT_SITE_ID = "PRIVATE_AT_SITE_ID";
+    private static final int PREVIEW_INITIAL_SCALE = 90;
+    private static final long PREVIEW_JS_EVALUATION_DELAY = 250L;
 
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
@@ -138,11 +138,12 @@ public class WPWebViewActivity extends WebViewActivity implements ErrorManagedWe
     @Inject UiHelpers mUiHelpers;
     @Inject PrivateAtomicCookie mPrivateAtomicCookie;
     @Inject Dispatcher mDispatcher;
+    @Inject DisplayUtilsWrapper mDisplayUtilsWrapper;
 
     private ActionableEmptyView mActionableEmptyView;
     private ViewGroup mFullScreenProgressLayout;
     private WPWebViewViewModel mViewModel;
-    private ListPopupWindow mPreviewModeSelector;
+    private PreviewModeSelectorPopup mPreviewModeSelectorPopup;
     private ElevationOverlayProvider mElevationOverlayProvider;
     private View mNavBarContainer;
     private LinearLayout mNavBar;
@@ -151,7 +152,8 @@ public class WPWebViewActivity extends WebViewActivity implements ErrorManagedWe
     private View mShareButton;
     private View mExternalBrowserButton;
     private View mPreviewModeButton;
-    private View mDesktopPreviewHint;
+    private TextView mDesktopPreviewHint;
+    private boolean mPreviewModeChangeAllowed = false;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -231,13 +233,15 @@ public final void configureView() {
         final Bundle extras = getIntent().getExtras();
 
         if (extras != null) {
-            boolean isPreviewModeChangeAllowed = extras.getBoolean(SHOW_PREVIEW_MODE_TOGGLE, false);
-            if (!isPreviewModeChangeAllowed) {
+            mPreviewModeChangeAllowed = extras.getBoolean(SHOW_PREVIEW_MODE_TOGGLE, false);
+            if (!mPreviewModeChangeAllowed) {
                 mNavBar.setWeightSum(80);
                 mPreviewModeButton.setVisibility(View.GONE);
             }
         }
 
+        mPreviewModeSelectorPopup = new PreviewModeSelectorPopup(this, mPreviewModeButton);
+
         setupToolbar();
     }
 
@@ -284,7 +288,7 @@ private void initRetryButton() {
     }
 
     private void initViewModel(WPWebViewUsageCategory webViewUsageCategory) {
-        mViewModel = ViewModelProviders.of(this, mViewModelFactory).get(WPWebViewViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(WPWebViewViewModel.class);
         mViewModel.getUiState().observe(this, new Observer<WebPreviewUiState>() {
             @Override public void onChanged(@Nullable WebPreviewUiState webPreviewUiState) {
                 if (webPreviewUiState != null) {
@@ -321,7 +325,8 @@ public void onChanged(@Nullable NavBarUiState navBarUiState) {
                 if (navBarUiState != null) {
                     mNavigateBackButton.setEnabled(navBarUiState.getBackNavigationEnabled());
                     mNavigateForwardButton.setEnabled(navBarUiState.getForwardNavigationEnabled());
-                    AniUtils.animateBottomBar(mDesktopPreviewHint, navBarUiState.getDesktopPreviewHintVisible());
+                    AniUtils.animateBottomBar(mDesktopPreviewHint, navBarUiState.getPreviewModeHintVisible());
+                    mDesktopPreviewHint.setText(navBarUiState.getReviewHintResId());
                 }
             }
         });
@@ -379,49 +384,9 @@ public void onChanged(@Nullable Unit unit) {
             public void onChanged(final @Nullable PreviewModeSelectorStatus previewModelSelectorStatus) {
                 if (previewModelSelectorStatus != null) {
                     mPreviewModeButton.setEnabled(previewModelSelectorStatus.isEnabled());
-
-                    if (!previewModelSelectorStatus.isVisible()) {
-                        return;
+                    if (previewModelSelectorStatus.isVisible()) {
+                        mPreviewModeSelectorPopup.show(mViewModel);
                     }
-
-                    mPreviewModeButton.post(new Runnable() {
-                        @Override public void run() {
-                            int popupWidth =
-                                    getResources().getDimensionPixelSize(R.dimen.web_preview_mode_popup_width);
-                            int popupOffset = getResources().getDimensionPixelSize(R.dimen.margin_extra_large);
-
-                            mPreviewModeSelector = new ListPopupWindow(WPWebViewActivity.this);
-                            mPreviewModeSelector.setWidth(popupWidth);
-                            mPreviewModeSelector.setAdapter(new PreviewModeMenuAdapter(WPWebViewActivity.this,
-                                    previewModelSelectorStatus.getSelectedPreviewMode()));
-                            mPreviewModeSelector.setDropDownGravity(Gravity.END);
-                            mPreviewModeSelector.setAnchorView(mPreviewModeButton);
-                            mPreviewModeSelector.setHorizontalOffset(-popupOffset);
-                            mPreviewModeSelector.setVerticalOffset(popupOffset);
-                            mPreviewModeSelector.setModal(true);
-
-                            int elevatedPopupBackgroundColor =
-                                    mElevationOverlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(
-                                            getResources().getDimension(R.dimen.popup_over_toolbar_elevation));
-                            mPreviewModeSelector.setBackgroundDrawable(new ColorDrawable(elevatedPopupBackgroundColor));
-
-                            mPreviewModeSelector.setOnDismissListener(new OnDismissListener() {
-                                @Override public void onDismiss() {
-                                    mViewModel.togglePreviewModeSelectorVisibility(false);
-                                }
-                            });
-                            mPreviewModeSelector.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                                @Override
-                                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                                    mPreviewModeSelector.dismiss();
-                                    PreviewModeMenuAdapter adapter = (PreviewModeMenuAdapter) parent.getAdapter();
-                                    PreviewMode selectedMode = adapter.getItem(position);
-                                    mViewModel.selectPreviewMode(selectedMode);
-                                }
-                            });
-                            mPreviewModeSelector.show();
-                        }
-                    });
                 }
             }
         });
@@ -429,9 +394,6 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         mViewModel.getPreviewMode().observe(this, new Observer<PreviewMode>() {
             @Override
             public void onChanged(@Nullable PreviewMode previewMode) {
-                mWebView.getSettings().setLoadWithOverviewMode(previewMode == PreviewMode.DESKTOP);
-                mWebView.getSettings().setUseWideViewPort(previewMode != PreviewMode.DESKTOP);
-                mWebView.setInitialScale(100);
                 mWebView.reload();
             }
         });
@@ -678,10 +640,20 @@ protected void configureWebView() {
             }
         }
 
+        if (mPreviewModeChangeAllowed) {
+            mWebView.getSettings().setUseWideViewPort(true);
+            mWebView.setInitialScale(PREVIEW_INITIAL_SCALE);
+        }
+
         WebViewClient webViewClient = createWebViewClient(allowedURL);
 
         mWebView.setWebViewClient(webViewClient);
-        mWebView.setWebChromeClient(new WPWebChromeClient(this, (ProgressBar) findViewById(R.id.progress_bar)));
+        mWebView.setWebChromeClient(new WPWebChromeClient(
+                this,
+                mWebView,
+                R.drawable.media_movieclip,
+                (ProgressBar) findViewById(R.id.progress_bar)
+        ));
     }
 
     protected WebViewClient createWebViewClient(List<String> allowedURL) {
@@ -701,7 +673,11 @@ protected WebViewClient createWebViewClient(List<String> allowedURL) {
 
     @Override
     public void onWebViewPageLoaded() {
-        mViewModel.onUrlLoaded();
+        if (mPreviewModeChangeAllowed) {
+            enforcePreviewMode();
+        } else {
+            mViewModel.onUrlLoaded();
+        }
         refreshBackForwardNavButtons();
     }
 
@@ -710,6 +686,31 @@ private void refreshBackForwardNavButtons() {
         mViewModel.toggleForwardNavigation(mWebView.canGoForward());
     }
 
+    private void enforcePreviewMode() {
+        int previewWidth = mViewModel.selectedPreviewMode().getPreviewWidth();
+        setWebViewWidth(previewWidth);
+        String script = getResources().getString(R.string.web_preview_width_script, previewWidth);
+        new Handler().postDelayed(new Runnable() {
+            @Override
+            public void run() {
+                mWebView.evaluateJavascript(script, value -> mViewModel.onUrlLoaded());
+            }
+        }, PREVIEW_JS_EVALUATION_DELAY);
+    }
+
+    private void setWebViewWidth(int previewWidth) {
+        if (!mDisplayUtilsWrapper.isTablet()) return;
+        if (mViewModel.selectedPreviewMode() == PreviewMode.MOBILE) {
+            int width = previewWidth * (int) getResources().getDisplayMetrics().density;
+            LayoutParams params = new LayoutParams(width, LayoutParams.MATCH_PARENT);
+            params.addRule(RelativeLayout.CENTER_HORIZONTAL);
+            mWebView.setLayoutParams(params);
+        } else {
+            LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+            mWebView.setLayoutParams(params);
+        }
+    }
+
     @Override
     public void onWebViewReceivedError() {
         mViewModel.onReceivedError();
@@ -907,14 +908,6 @@ private void setResultIfNeededAndFinish() {
         finish();
     }
 
-    protected void onDestroy() {
-        super.onDestroy();
-        if (mPreviewModeSelector != null && mPreviewModeSelector.isShowing()) {
-            mPreviewModeSelector.setOnDismissListener(null);
-            mPreviewModeSelector.dismiss();
-        }
-    }
-
     @Override
     public void onBackPressed() {
         if (mWebView.canGoBack()) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java
index 0c8bbc8702e4..43ccf8c2f184 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/WebViewActivity.java
@@ -120,6 +120,9 @@ protected void configureWebView() {
     private void pauseWebView() {
         if (mWebView != null) {
             mWebView.onPause();
+            if (isFinishing()) {
+                loadUrl("about:blank");
+            }
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt
index bad6bcc46559..6b971593a2af 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/HelpActivity.kt
@@ -2,13 +2,14 @@ package org.wordpress.android.ui.accounts
 
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.help_activity.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.databinding.HelpActivityBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.SiteStore
@@ -28,6 +29,7 @@ class HelpActivity : LocaleAwareActivity() {
     @Inject lateinit var siteStore: SiteStore
     @Inject lateinit var supportHelper: SupportHelper
     @Inject lateinit var zendeskHelper: ZendeskHelper
+    private var binding: HelpActivityBinding? = null
 
     private val originFromExtras by lazy {
         (intent.extras?.get(ORIGIN_KEY) as Origin?) ?: Origin.UNKNOWN
@@ -42,48 +44,48 @@ class HelpActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
+        with(HelpActivityBinding.inflate(layoutInflater)) {
+            binding = this
+            setContentView(root)
+            setSupportActionBar(toolbarMain)
+
+            val actionBar = supportActionBar
+            if (actionBar != null) {
+                actionBar.setHomeButtonEnabled(true)
+                actionBar.setDisplayHomeAsUpEnabled(true)
+                actionBar.elevation = 0f // remove shadow
+            }
 
-        setContentView(R.layout.help_activity)
-
-        setSupportActionBar(toolbar_main)
-
-        val actionBar = supportActionBar
-        if (actionBar != null) {
-            actionBar.setHomeButtonEnabled(true)
-            actionBar.setDisplayHomeAsUpEnabled(true)
-            actionBar.elevation = 0f // remove shadow
-        }
-
-        contact_us_button.setOnClickListener { createNewZendeskTicket() }
-        faq_button.setOnClickListener { showZendeskFaq() }
-        my_tickets_button.setOnClickListener { showZendeskTickets() }
-        applicationVersion.text = getString(R.string.version_with_name_param, WordPress.versionName)
-        application_log_button.setOnClickListener { v ->
-            startActivity(Intent(v.context, AppLogViewerActivity::class.java))
-        }
-
-        contactEmailContainer.setOnClickListener {
-            var emailSuggestion = AppPrefs.getSupportEmail()
-            if (emailSuggestion.isNullOrEmpty()) {
-                emailSuggestion = supportHelper
-                        .getSupportEmailAndNameSuggestion(
-                                accountStore.account,
-                                selectedSiteFromExtras
-                        ).first
+            contactUsButton.setOnClickListener { createNewZendeskTicket() }
+            faqButton.setOnClickListener { showFaq() }
+            myTicketsButton.setOnClickListener { showZendeskTickets() }
+            applicationVersion.text = getString(R.string.version_with_name_param, WordPress.versionName)
+            applicationLogButton.setOnClickListener { v ->
+                startActivity(Intent(v.context, AppLogViewerActivity::class.java))
             }
 
-            supportHelper.showSupportIdentityInputDialog(
-                    this,
-                    emailSuggestion,
-                    isNameInputHidden = true
-            ) { email, _ ->
-                zendeskHelper.setSupportEmail(email)
-                refreshContactEmailText()
-                AnalyticsTracker.track(Stat.SUPPORT_IDENTITY_SET)
+            contactEmailContainer.setOnClickListener {
+                var emailSuggestion = AppPrefs.getSupportEmail()
+                if (emailSuggestion.isNullOrEmpty()) {
+                    emailSuggestion = supportHelper
+                            .getSupportEmailAndNameSuggestion(
+                                    accountStore.account,
+                                    selectedSiteFromExtras
+                            ).first
+                }
+
+                supportHelper.showSupportIdentityInputDialog(
+                        this@HelpActivity,
+                        emailSuggestion,
+                        isNameInputHidden = true
+                ) { email, _ ->
+                    zendeskHelper.setSupportEmail(email)
+                    refreshContactEmailText()
+                    AnalyticsTracker.track(Stat.SUPPORT_IDENTITY_SET)
+                }
+                AnalyticsTracker.track(Stat.SUPPORT_IDENTITY_FORM_VIEWED)
             }
-            AnalyticsTracker.track(Stat.SUPPORT_IDENTITY_FORM_VIEWED)
         }
-
         /**
          * If the user taps on a Zendesk notification, we want to show them the `My Tickets` page. However, this
          * should only be triggered when the activity is first created, otherwise if the user comes back from
@@ -95,10 +97,15 @@ class HelpActivity : LocaleAwareActivity() {
         }
     }
 
+    override fun onDestroy() {
+        binding = null
+        super.onDestroy()
+    }
+
     override fun onResume() {
         super.onResume()
         ActivityId.trackLastActivity(ActivityId.HELP_SCREEN)
-        refreshContactEmailText()
+        binding?.refreshContactEmailText()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -127,17 +134,13 @@ class HelpActivity : LocaleAwareActivity() {
         )
     }
 
-    private fun showZendeskFaq() {
-        zendeskHelper
-                .showZendeskHelpCenter(
-                        this,
-                        originFromExtras,
-                        selectedSiteFromExtras,
-                        extraTagsFromExtras
-                )
+    private fun showFaq() {
+        val intent = Intent(Intent.ACTION_VIEW, Uri.parse("http://apps.wordpress.com/mobile-app-support/"))
+        startActivity(intent)
+        AnalyticsTracker.track(Stat.SUPPORT_HELP_CENTER_VIEWED)
     }
 
-    private fun refreshContactEmailText() {
+    private fun HelpActivityBinding.refreshContactEmailText() {
         val supportEmail = AppPrefs.getSupportEmail()
         contactEmailAddress.text = if (!supportEmail.isNullOrEmpty()) {
             supportEmail
@@ -172,7 +175,8 @@ class HelpActivity : LocaleAwareActivity() {
         SITE_CREATION_SEGMENTS("origin:site-create-site-segments"),
         SITE_CREATION_VERTICALS("origin:site-create-site-verticals"),
         SITE_CREATION_DOMAINS("origin:site-create-domains"),
-        SITE_CREATION_SITE_INFO("origin:site-create-site-info");
+        SITE_CREATION_SITE_INFO("origin:site-create-site-info"),
+        SCAN_SCREEN_HELP("origin:scan-screen-help");
 
         override fun toString(): String {
             return stringValue
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java
index d5d56126770e..0d0d82cf8974 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginActivity.java
@@ -10,6 +10,7 @@
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.common.ConnectionResult;
@@ -18,7 +19,6 @@
 import com.google.android.material.snackbar.Snackbar;
 
 import org.jetbrains.annotations.NotNull;
-import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
@@ -26,6 +26,7 @@
 import org.wordpress.android.fluxc.network.MemorizingTrustManager;
 import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayloadScheme;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.ConnectSiteInfoPayload;
 import org.wordpress.android.login.AuthOptions;
 import org.wordpress.android.login.GoogleFragment;
 import org.wordpress.android.login.GoogleFragment.GoogleListener;
@@ -40,10 +41,7 @@
 import org.wordpress.android.login.LoginMode;
 import org.wordpress.android.login.LoginSiteAddressFragment;
 import org.wordpress.android.login.LoginUsernamePasswordFragment;
-import org.wordpress.android.login.SignupBottomSheetDialogFragment;
-import org.wordpress.android.login.SignupBottomSheetDialogFragment.SignupSheetListener;
 import org.wordpress.android.login.SignupConfirmationFragment;
-import org.wordpress.android.login.SignupEmailFragment;
 import org.wordpress.android.login.SignupGoogleFragment;
 import org.wordpress.android.login.SignupMagicLinkFragment;
 import org.wordpress.android.support.ZendeskExtraTags;
@@ -53,12 +51,16 @@
 import org.wordpress.android.ui.LocaleAwareActivity;
 import org.wordpress.android.ui.RequestCodes;
 import org.wordpress.android.ui.accounts.HelpActivity.Origin;
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowNoJetpackSites;
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSiteAddressError;
 import org.wordpress.android.ui.accounts.SmartLockHelper.Callback;
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Click;
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Flow;
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Source;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesFragment;
 import org.wordpress.android.ui.accounts.login.LoginPrologueFragment;
 import org.wordpress.android.ui.accounts.login.LoginPrologueListener;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginSiteCheckErrorFragment;
 import org.wordpress.android.ui.main.SitePickerActivity;
 import org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter;
 import org.wordpress.android.ui.posts.BasicFragmentDialog;
@@ -68,7 +70,6 @@
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.SelfSignedSSLUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
@@ -87,14 +88,15 @@
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.HasAndroidInjector;
 
+import static org.wordpress.android.util.ActivityUtils.hideKeyboard;
+
 public class LoginActivity extends LocaleAwareActivity implements ConnectionCallbacks, OnConnectionFailedListener,
-        Callback, LoginListener, GoogleListener, LoginPrologueListener, SignupSheetListener,
+        Callback, LoginListener, GoogleListener, LoginPrologueListener,
         HasAndroidInjector, BasicDialogPositiveClickInterface {
     public static final String ARG_JETPACK_CONNECT_SOURCE = "ARG_JETPACK_CONNECT_SOURCE";
     public static final String MAGIC_LOGIN = "magic-login";
     public static final String TOKEN_PARAMETER = "token";
 
-    private static final String KEY_SIGNUP_SHEET_DISPLAYED = "KEY_SIGNUP_SHEET_DISPLAYED";
     private static final String KEY_SMARTLOCK_HELPER_STATE = "KEY_SMARTLOCK_HELPER_STATE";
     private static final String KEY_SIGNUP_FROM_LOGIN_ENABLED = "KEY_SIGNUP_FROM_LOGIN_ENABLED";
     private static final String KEY_SITE_LOGIN_AVAILABLE_FROM_PROLOGUE = "KEY_SITE_LOGIN_AVAILABLE_FROM_PROLOGUE";
@@ -122,12 +124,14 @@ private enum SmartLockHelperState {
     private boolean mIsSiteLoginAvailableFromPrologue;
 
     private LoginMode mLoginMode;
+    private LoginViewModel mViewModel;
 
     @Inject DispatchingAndroidInjector<Object> mDispatchingAndroidInjector;
     @Inject protected LoginAnalyticsListener mLoginAnalyticsListener;
     @Inject ZendeskHelper mZendeskHelper;
     @Inject UnifiedLoginTracker mUnifiedLoginTracker;
     @Inject protected SiteStore mSiteStore;
+    @Inject protected ViewModelProvider.Factory mViewModelFactory;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -152,14 +156,15 @@ protected void onCreate(Bundle savedInstanceState) {
                     mIsSignupFromLoginEnabled = true;
                     loginFromPrologue();
                     break;
+                case JETPACK_LOGIN_ONLY:
+                    mUnifiedLoginTracker.setSource(Source.DEFAULT);
+                    mIsSignupFromLoginEnabled = false;
+                    loginFromPrologue();
+                    break;
                 case WPCOM_LOGIN_ONLY:
                     mUnifiedLoginTracker.setSource(Source.ADD_WORDPRESS_COM_ACCOUNT);
                     mIsSignupFromLoginEnabled = true;
-                    if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
-                        checkSmartLockPasswordAndStartLogin();
-                    } else {
-                        loginFromPrologue();
-                    }
+                    checkSmartLockPasswordAndStartLogin();
                     break;
                 case SELFHOSTED_ONLY:
                     mUnifiedLoginTracker.setSource(Source.SELF_HOSTED);
@@ -182,6 +187,8 @@ protected void onCreate(Bundle savedInstanceState) {
                     mUnifiedLoginTracker.setSource(Source.SHARE);
                     checkSmartLockPasswordAndStartLogin();
                     break;
+                case WOO_LOGIN_MODE:
+                    break;
             }
         } else {
             mSmartLockHelperState = SmartLockHelperState.valueOf(
@@ -200,21 +207,34 @@ protected void onCreate(Bundle savedInstanceState) {
             }
             mUnifiedLoginTracker.setFlow(savedInstanceState.getString(KEY_UNIFIED_TRACKER_FLOW));
         }
+
+        initViewModel();
+    }
+
+    private void initViewModel() {
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(LoginViewModel.class);
+
+        // initObservers
+        mViewModel.getNavigationEvents().observe(this, event -> {
+            LoginNavigationEvents loginEvent = event.getContentIfNotHandled();
+            if (loginEvent instanceof ShowSiteAddressError) {
+                showSiteAddressError((ShowSiteAddressError) loginEvent);
+            } else if (loginEvent instanceof ShowNoJetpackSites) {
+                showNoJetpackSites();
+            }
+        });
     }
 
     private void loginFromPrologue() {
         showFragment(new LoginPrologueFragment(), LoginPrologueFragment.TAG);
-        if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
-            mIsSmartLockTriggeredFromPrologue = true;
-            mIsSiteLoginAvailableFromPrologue = true;
-            initSmartLockIfNotFinished(true);
-        }
+        mIsSmartLockTriggeredFromPrologue = true;
+        mIsSiteLoginAvailableFromPrologue = true;
+        initSmartLockIfNotFinished(true);
     }
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-
         outState.putString(KEY_SMARTLOCK_HELPER_STATE, mSmartLockHelperState.name());
         outState.putBoolean(KEY_SIGNUP_FROM_LOGIN_ENABLED, mIsSignupFromLoginEnabled);
         outState.putBoolean(KEY_SITE_LOGIN_AVAILABLE_FROM_PROLOGUE, mIsSiteLoginAvailableFromPrologue);
@@ -284,6 +304,15 @@ public LoginMode getLoginMode() {
 
     private void loggedInAndFinish(ArrayList<Integer> oldSitesIds, boolean doLoginUpdate) {
         switch (getLoginMode()) {
+            case JETPACK_LOGIN_ONLY:
+                if (!mSiteStore.hasSite()) {
+                    handleNoJetpackSites();
+                } else {
+                    ActivityLauncher.showMainActivityAndLoginEpilogue(this, oldSitesIds, doLoginUpdate);
+                    setResult(Activity.RESULT_OK);
+                    finish();
+                }
+                break;
             case FULL:
             case WPCOM_LOGIN_ONLY:
                 if (!mSiteStore.hasSite() && AppPrefs.shouldShowPostSignupInterstitial() && !doLoginUpdate) {
@@ -325,6 +354,8 @@ private void loggedInAndFinish(ArrayList<Integer> oldSitesIds, boolean doLoginUp
                 // skip the epilogue when only added a self-hosted site or sharing to WordPress
                 finish();
                 break;
+            case WOO_LOGIN_MODE:
+                break;
         }
     }
 
@@ -409,17 +440,14 @@ private void startLogin() {
 
         if (getLoginPrologueFragment() == null) {
             // prologue fragment is not shown so, the email screen will be the initial screen on the fragment container
-            showFragment(LoginEmailFragment.newInstance(mIsSignupFromLoginEnabled,
-                    true, BuildConfig.UNIFIED_LOGIN_AVAILABLE), LoginEmailFragment.TAG);
+            showFragment(LoginEmailFragment.newInstance(mIsSignupFromLoginEnabled), LoginEmailFragment.TAG);
 
             if (getLoginMode() == LoginMode.JETPACK_STATS) {
                 mIsJetpackConnect = true;
             }
         } else {
             // prologue fragment is shown so, slide in the email screen (and add to history)
-            slideInFragment(LoginEmailFragment.newInstance(mIsSignupFromLoginEnabled,
-                    !mIsSiteLoginAvailableFromPrologue, BuildConfig.UNIFIED_LOGIN_AVAILABLE), true,
-                    LoginEmailFragment.TAG);
+            slideInFragment(LoginEmailFragment.newInstance(mIsSignupFromLoginEnabled), true, LoginEmailFragment.TAG);
         }
     }
 
@@ -431,59 +459,12 @@ public void showEmailLoginScreen() {
     }
 
     @Override
-    public void doStartSignup() {
-        // This stat is part of a funnel that provides critical information.  Before
-        // making ANY modification to this stat please refer to: p4qSXL-35X-p2
-        AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_BUTTON_TAPPED);
-        SignupBottomSheetDialogFragment signupFragment = SignupBottomSheetDialogFragment.newInstance();
-        signupFragment.show(getSupportFragmentManager(), SignupBottomSheetDialogFragment.TAG);
-    }
-
-    @Override
-    public void onSignupSheetCanceled() {
-        AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_CANCELED);
-    }
-
-    @Override
-    public void onSignupSheetEmailClicked() {
-        AnalyticsTracker.track(AnalyticsTracker.Stat.CREATE_ACCOUNT_INITIATED);
-        AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_EMAIL_BUTTON_TAPPED);
-        mUnifiedLoginTracker.trackClick(Click.SIGNUP_WITH_EMAIL);
-        dismissSignupSheet();
-        slideInFragment(new SignupEmailFragment(), true, SignupEmailFragment.TAG);
-    }
-
-    @Override
-    public void onSignupSheetGoogleClicked() {
-        dismissSignupSheet();
-        AnalyticsTracker.track(AnalyticsTracker.Stat.CREATE_ACCOUNT_INITIATED);
-        AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_SOCIAL_BUTTON_TAPPED);
-        mUnifiedLoginTracker.trackClick(Click.SIGNUP_WITH_GOOGLE);
-
-        if (NetworkUtils.checkConnection(this)) {
-            addGoogleFragment(new SignupGoogleFragment(), SignupGoogleFragment.TAG);
-        }
-    }
-
-    @Override
-    public void onSignupSheetTermsOfServiceClicked() {
+    public void onTermsOfServiceClicked() {
         AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_TERMS_OF_SERVICE_TAPPED);
         mUnifiedLoginTracker.trackClick(Click.TERMS_OF_SERVICE_CLICKED);
         ActivityLauncher.openUrlExternal(this, WPUrlUtils.buildTermsOfServiceUrl(this));
     }
 
-    @Override
-    public void loggedInViaSignup(ArrayList<Integer> oldSitesIds) {
-        loggedInAndFinish(oldSitesIds, false);
-    }
-
-    @Override
-    public void newUserCreatedButErrored(String email, String password) {
-        LoginEmailPasswordFragment loginEmailPasswordFragment =
-                LoginEmailPasswordFragment.newInstance(email, password, null, null, false);
-        slideInFragment(loginEmailPasswordFragment, false, LoginEmailPasswordFragment.TAG);
-    }
-
     // LoginListener implementation methods
 
     @Override
@@ -515,7 +496,7 @@ private void showEmailPasswordScreen(String email, boolean verifyEmail, boolean
 
     private void showMagicLinkRequestScreen(String email, boolean verifyEmail, boolean allowPassword,
                                             boolean forceRequestAtStart) {
-        AuthEmailPayloadScheme scheme = AuthEmailPayloadScheme.WORDPRESS;
+        AuthEmailPayloadScheme scheme = mViewModel.getMagicLinkScheme();
         String jetpackConnectionSource = mJetpackConnectSource != null ? mJetpackConnectSource.toString() : null;
         LoginMagicLinkRequestFragment loginMagicLinkRequestFragment = LoginMagicLinkRequestFragment
                 .newInstance(email, scheme, mIsJetpackConnect, jetpackConnectionSource, verifyEmail, allowPassword,
@@ -525,8 +506,7 @@ private void showMagicLinkRequestScreen(String email, boolean verifyEmail, boole
 
     @Override
     public void gotUnregisteredEmail(String email) {
-        SignupConfirmationFragment signupConfirmationFragment = SignupConfirmationFragment.newInstance(email);
-        slideInFragment(signupConfirmationFragment, true, SignupConfirmationFragment.TAG);
+        showSignupMagicLink(email);
     }
 
     @Override
@@ -545,7 +525,6 @@ public void loginViaSiteAddress() {
 
     @Override
     public void loginViaSocialAccount(String email, String idToken, String service, boolean isPasswordRequired) {
-        dismissSignupSheet();
         LoginEmailPasswordFragment loginEmailPasswordFragment =
                 LoginEmailPasswordFragment.newInstance(email, null, idToken, service, isPasswordRequired);
         slideInFragment(loginEmailPasswordFragment, true, LoginEmailPasswordFragment.TAG);
@@ -628,7 +607,6 @@ public void needs2fa(String email, String password) {
     @Override
     public void needs2faSocial(String email, String userId, String nonceAuthenticator, String nonceBackup,
                                String nonceSms) {
-        dismissSignupSheet();
         mLoginAnalyticsListener.trackLoginSocial2faNeeded();
         Login2FaFragment login2FaFragment = Login2FaFragment.newInstanceSocial(email, userId,
                 nonceAuthenticator, nonceBackup,
@@ -657,7 +635,7 @@ public void alreadyLoggedInWpcom(ArrayList<Integer> oldSitesIds) {
 
     @Override
     public void gotWpcomSiteInfo(String siteAddress) {
-        LoginEmailFragment loginEmailFragment = LoginEmailFragment.newInstance(false, false, true, siteAddress);
+        LoginEmailFragment loginEmailFragment = LoginEmailFragment.newInstance(siteAddress);
         slideInFragment(loginEmailFragment, true, LoginEmailFragment.TAG);
     }
 
@@ -918,20 +896,14 @@ public void onPositiveClicked(@NotNull String instanceTag) {
         }
     }
 
-    private void dismissSignupSheet() {
-        SignupBottomSheetDialogFragment signupFragment =
-                (SignupBottomSheetDialogFragment) getSupportFragmentManager()
-                        .findFragmentByTag(SignupBottomSheetDialogFragment.TAG);
-
-        if (signupFragment != null) {
-            signupFragment.dismiss();
-        }
-    }
-
     @Override public AndroidInjector<Object> androidInjector() {
         return mDispatchingAndroidInjector;
     }
 
+    @Override public void startOver() {
+        // Not used in WordPress app
+    }
+
     @Override
     public void showHelpFindingConnectedEmail() {
         // Not used in WordPress app
@@ -971,4 +943,26 @@ public void helpNoJetpackScreen(
     public void loginViaSiteCredentials(String inputSiteAddress) {
         // Not used in WordPress app
     }
+
+    @Override
+    public void handleSiteAddressError(ConnectSiteInfoPayload siteInfo) {
+        mViewModel.onHandleSiteAddressError(siteInfo);
+    }
+
+    public void handleNoJetpackSites() {
+        // hide keyboard if you can
+        hideKeyboard(this);
+        mViewModel.onHandleNoJetpackSites();
+    }
+
+
+    private void showSiteAddressError(ShowSiteAddressError event) {
+        LoginSiteCheckErrorFragment fragment = LoginSiteCheckErrorFragment.Companion.newInstance(event.getUrl());
+        slideInFragment(fragment, true, LoginSiteCheckErrorFragment.TAG);
+    }
+
+    private void showNoJetpackSites() {
+        LoginNoSitesFragment fragment = LoginNoSitesFragment.Companion.newInstance();
+        slideInFragment(fragment, false, LoginNoSitesFragment.TAG);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java
index 74086c120440..b4345e53b9f1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueActivity.java
@@ -2,7 +2,9 @@
 
 import android.os.Bundle;
 
+import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.ViewModelProvider;
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
@@ -10,9 +12,12 @@
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.ui.LocaleAwareActivity;
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.CloseWithResultOk;
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowNoJetpackSites;
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowPostSignupInterstitialScreen;
 import org.wordpress.android.ui.accounts.login.LoginEpilogueFragment;
 import org.wordpress.android.ui.accounts.login.LoginEpilogueListener;
-import org.wordpress.android.ui.prefs.AppPrefs;
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesFragment;
 
 import java.util.ArrayList;
 
@@ -25,6 +30,8 @@ public class LoginEpilogueActivity extends LocaleAwareActivity implements LoginE
 
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
+    @Inject ViewModelProvider.Factory mViewModelFactory;
+    @Inject LoginEpilogueViewModel mViewModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -42,14 +49,32 @@ protected void onCreate(Bundle savedInstanceState) {
 
             addPostLoginFragment(doLoginUpdate, showAndReturn, oldSitesIds);
         }
+
+        initViewModel();
+        initObservers();
+    }
+
+    private void initViewModel() {
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(LoginEpilogueViewModel.class);
+    }
+
+    private void initObservers() {
+        mViewModel.getNavigationEvents().observe(this, event -> {
+            LoginNavigationEvents loginEvent = event.getContentIfNotHandled();
+            if (loginEvent instanceof ShowPostSignupInterstitialScreen) {
+                showPostSignupInterstitialScreen();
+            } else if (loginEvent instanceof CloseWithResultOk) {
+                closeWithResultOk();
+            } else if (loginEvent instanceof ShowNoJetpackSites) {
+                showNoJetpackSites();
+            }
+        });
     }
 
     protected void addPostLoginFragment(boolean doLoginUpdate, boolean showAndReturn, ArrayList<Integer> oldSitesIds) {
         LoginEpilogueFragment loginEpilogueFragment = LoginEpilogueFragment.newInstance(doLoginUpdate, showAndReturn,
-                                                                                        oldSitesIds);
-        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
-        fragmentTransaction.replace(R.id.fragment_container, loginEpilogueFragment, LoginEpilogueFragment.TAG);
-        fragmentTransaction.commit();
+                oldSitesIds);
+        showFragment(loginEpilogueFragment, LoginEpilogueFragment.TAG, false);
     }
 
     @Override
@@ -65,11 +90,31 @@ public void onConnectAnotherSite() {
 
     @Override
     public void onContinue() {
-        if (!mSiteStore.hasSite() && AppPrefs.shouldShowPostSignupInterstitial()) {
-            ActivityLauncher.showPostSignupInterstitial(this);
-        }
+        mViewModel.onContinue();
+    }
 
+    private void showPostSignupInterstitialScreen() {
+        ActivityLauncher.showPostSignupInterstitial(this);
+    }
+
+    private void closeWithResultOk() {
         setResult(RESULT_OK);
         finish();
     }
+
+    private void showNoJetpackSites() {
+        LoginNoSitesFragment fragment = LoginNoSitesFragment.Companion.newInstance();
+        showFragment(fragment, LoginNoSitesFragment.TAG, true);
+    }
+
+    private void showFragment(Fragment fragment, String tag, boolean applySlideAnimation) {
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        if (applySlideAnimation) {
+            fragmentTransaction
+                    .setCustomAnimations(R.anim.activity_slide_in_from_right, R.anim.activity_slide_out_to_left,
+                            R.anim.activity_slide_in_from_left, R.anim.activity_slide_out_to_right);
+        }
+        fragmentTransaction.replace(R.id.fragment_container, fragment, tag);
+        fragmentTransaction.commit();
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt
new file mode 100644
index 000000000000..c154040d5ca4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.accounts
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.ViewModel
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import org.wordpress.android.util.BuildConfigWrapper
+import org.wordpress.android.viewmodel.Event
+
+import javax.inject.Inject
+
+class LoginEpilogueViewModel @Inject constructor(
+    private val appPrefsWrapper: AppPrefsWrapper,
+    private val buildConfigWrapper: BuildConfigWrapper,
+    private val siteStore: SiteStore
+) : ViewModel() {
+    private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
+    val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
+
+    fun onContinue() {
+        if (!siteStore.hasSite()) handleNoSitesFound() else handleSitesFound()
+    }
+
+    private fun handleNoSitesFound() {
+        if (buildConfigWrapper.isJetpackApp) {
+            _navigationEvents.postValue(Event(LoginNavigationEvents.ShowNoJetpackSites))
+        } else {
+            if (appPrefsWrapper.shouldShowPostSignupInterstitial) {
+                _navigationEvents.postValue(Event(LoginNavigationEvents.ShowPostSignupInterstitialScreen))
+            }
+            _navigationEvents.postValue(Event(LoginNavigationEvents.CloseWithResultOk))
+        }
+    }
+
+    private fun handleSitesFound() {
+        _navigationEvents.postValue(Event(LoginNavigationEvents.CloseWithResultOk))
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginNavigationEvents.kt
new file mode 100644
index 000000000000..9ce87d91c8d2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginNavigationEvents.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.ui.accounts
+
+const val INSTRUCTIONS_URL = "https://jetpack.com/support/getting-started-with-jetpack/"
+
+sealed class LoginNavigationEvents {
+    data class ShowSiteAddressError(val url: String) : LoginNavigationEvents()
+    object ShowNoJetpackSites : LoginNavigationEvents()
+    object ShowSignInForResultJetpackOnly : LoginNavigationEvents()
+    data class ShowInstructions(val url: String = INSTRUCTIONS_URL) : LoginNavigationEvents()
+    object ShowPostSignupInterstitialScreen : LoginNavigationEvents()
+    object CloseWithResultOk : LoginNavigationEvents()
+    object ShowEmailLoginScreen : LoginNavigationEvents()
+    object ShowLoginViaSiteAddressScreen : LoginNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginViewModel.kt
new file mode 100644
index 000000000000..b717efbbaf67
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginViewModel.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.accounts
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.ViewModel
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayloadScheme
+import org.wordpress.android.fluxc.store.SiteStore.ConnectSiteInfoPayload
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowNoJetpackSites
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSiteAddressError
+import org.wordpress.android.util.BuildConfigWrapper
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+import kotlin.text.RegexOption.IGNORE_CASE
+
+class LoginViewModel @Inject constructor(private val buildConfigWrapper: BuildConfigWrapper) : ViewModel() {
+    private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
+    val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
+
+    fun onHandleSiteAddressError(siteInfo: ConnectSiteInfoPayload) {
+        val protocolRegex = Regex("^(http[s]?://)", IGNORE_CASE)
+        val siteAddressClean = siteInfo.url.replaceFirst(protocolRegex.toString().toRegex(), "")
+        _navigationEvents.postValue(Event(ShowSiteAddressError(siteAddressClean)))
+    }
+
+    fun onHandleNoJetpackSites() {
+        _navigationEvents.postValue(Event(ShowNoJetpackSites))
+    }
+
+    fun getMagicLinkScheme() = if (buildConfigWrapper.isJetpackApp) {
+        AuthEmailPayloadScheme.JETPACK
+    } else {
+        AuthEmailPayloadScheme.WORDPRESS
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt
index eae054fff4a8..e82345549f05 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/PostSignupInterstitialActivity.kt
@@ -1,12 +1,12 @@
 package org.wordpress.android.ui.accounts
 
 import android.os.Bundle
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.post_signup_interstitial_default.*
+import com.google.android.material.button.MaterialButton
+import kotlinx.android.synthetic.main.post_signup_interstitial_landscape.view.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PostSignupInterstitialActivityBinding
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.viewmodel.accounts.PostSignupInterstitialViewModel
@@ -26,19 +26,28 @@ class PostSignupInterstitialActivity : LocaleAwareActivity() {
 
         LoginFlowThemeHelper.injectMissingCustomAttributes(theme)
 
-        setContentView(R.layout.post_signup_interstitial_activity)
-
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(PostSignupInterstitialViewModel::class.java)
+        val binding = PostSignupInterstitialActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        with(binding) {
+            viewModel.onInterstitialShown()
+            createNewSiteButton().setOnClickListener { viewModel.onCreateNewSiteButtonPressed() }
+            addSelfHostedSiteButton().setOnClickListener { viewModel.onAddSelfHostedSiteButtonPressed() }
+            dismissButton().setOnClickListener { viewModel.onDismissButtonPressed() }
+        }
+
+        viewModel.navigationAction.observe(this, { executeAction(it) })
+    }
 
-        viewModel.onInterstitialShown()
+    private fun PostSignupInterstitialActivityBinding.createNewSiteButton() =
+            root.findViewById<MaterialButton>(R.id.create_new_site_button)
 
-        create_new_site_button.setOnClickListener { viewModel.onCreateNewSiteButtonPressed() }
-        add_self_hosted_site_button.setOnClickListener { viewModel.onAddSelfHostedSiteButtonPressed() }
-        dismiss_button.setOnClickListener { viewModel.onDismissButtonPressed() }
+    private fun PostSignupInterstitialActivityBinding.addSelfHostedSiteButton() =
+            root.findViewById<MaterialButton>(R.id.add_self_hosted_site_button)
 
-        viewModel.navigationAction.observe(this, Observer { executeAction(it) })
-    }
+    private fun PostSignupInterstitialActivityBinding.dismissButton() =
+            root.findViewById<MaterialButton>(R.id.dismiss_button)
 
     override fun onBackPressed() {
         viewModel.onBackButtonPressed()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/UnifiedLoginTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/UnifiedLoginTracker.kt
index da510218447e..39b097a4c568 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/UnifiedLoginTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/UnifiedLoginTracker.kt
@@ -25,51 +25,45 @@ class UnifiedLoginTracker
     ) {
         currentFlow = flow
         currentStep = step
-        if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
-            if (currentFlow != null && currentStep != null) {
-                analyticsTracker.track(
-                        stat = UNIFIED_LOGIN_STEP,
-                        properties = buildDefaultParams()
-                )
-            } else {
-                handleMissingFlowOrStep("step: ${step.value}")
-            }
+        if (currentFlow != null && currentStep != null) {
+            analyticsTracker.track(
+                    stat = UNIFIED_LOGIN_STEP,
+                    properties = buildDefaultParams()
+            )
+        } else {
+            handleMissingFlowOrStep("step: ${step.value}")
         }
     }
 
     fun trackFailure(error: String?) {
-        if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
-            if (currentFlow != null && currentStep != null) {
-                currentFlow?.let {
-                    analyticsTracker.track(
-                            stat = UNIFIED_LOGIN_FAILURE,
-                            properties = buildDefaultParams().apply {
-                                error?.let {
-                                    put(FAILURE, error)
-                                }
+        if (currentFlow != null && currentStep != null) {
+            currentFlow?.let {
+                analyticsTracker.track(
+                        stat = UNIFIED_LOGIN_FAILURE,
+                        properties = buildDefaultParams().apply {
+                            error?.let {
+                                put(FAILURE, error)
                             }
-                    )
-                }
-            } else {
-                handleMissingFlowOrStep("failure: $error")
+                        }
+                )
             }
+        } else {
+            handleMissingFlowOrStep("failure: $error")
         }
     }
 
     fun trackClick(click: Click) {
-        if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
-            if (currentFlow != null && currentStep != null) {
-                currentFlow?.let {
-                    analyticsTracker.track(
-                            stat = UNIFIED_LOGIN_INTERACTION,
-                            properties = buildDefaultParams().apply {
-                                put(CLICK, click.value)
-                            }
-                    )
-                }
-            } else {
-                handleMissingFlowOrStep("click: ${click.value}")
+        if (currentFlow != null && currentStep != null) {
+            currentFlow?.let {
+                analyticsTracker.track(
+                        stat = UNIFIED_LOGIN_INTERACTION,
+                        properties = buildDefaultParams().apply {
+                            put(CLICK, click.value)
+                        }
+                )
             }
+        } else {
+            handleMissingFlowOrStep("click: ${click.value}")
         }
     }
 
@@ -107,6 +101,10 @@ class UnifiedLoginTracker
         currentFlow = Flow.values().find { it.value == value }
     }
 
+    fun setStep(step: Step) {
+        currentStep = step
+    }
+
     fun setFlowAndStep(flow: Flow, step: Step) {
         currentFlow = flow
         currentStep = step
@@ -147,7 +145,9 @@ class UnifiedLoginTracker
         HELP("help"),
         TWO_FACTOR_AUTHENTICATION("2fa"),
         SHOW_EMAIL_HINTS("show_email_hints"),
-        PASSWORD_CHALLENGE("password_challenge")
+        PASSWORD_CHALLENGE("password_challenge"),
+        NOT_A_JETPACK_SITE("not_a_jetpack_site"),
+        NO_JETPACK_SITES("no_jetpack_sites")
     }
 
     enum class Click(val value: String) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginAnalyticsTracker.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginAnalyticsTracker.java
index 86fba8887e71..dcc4113a1d97 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginAnalyticsTracker.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginAnalyticsTracker.java
@@ -361,11 +361,6 @@ public void emailFormScreenResumed() {
         mUnifiedLoginTracker.setFlowAndStep(Flow.WORDPRESS_COM, Step.START);
     }
 
-    @Override
-    public void trackEmailSignupConfirmationViewed() {
-        mUnifiedLoginTracker.track(Flow.SIGNUP, Step.START);
-    }
-
     @Override
     public void trackSocialSignupConfirmationViewed() {
         mUnifiedLoginTracker.track(Flow.GOOGLE_SIGNUP, Step.START);
@@ -375,4 +370,24 @@ public void trackSocialSignupConfirmationViewed() {
     public void trackCreateAccountClick() {
         mUnifiedLoginTracker.trackClick(Click.CREATE_ACCOUNT);
     }
+
+    @Override public void emailPasswordFormScreenResumed() {
+        mUnifiedLoginTracker.setStep(Step.START);
+    }
+
+    @Override public void siteAddressFormScreenResumed() {
+        mUnifiedLoginTracker.setStep(Step.START);
+    }
+
+    @Override public void magicLinkRequestScreenResumed() {
+        mUnifiedLoginTracker.setStep(Step.START);
+    }
+
+    @Override public void magicLinkSentScreenResumed() {
+        mUnifiedLoginTracker.setStep(Step.MAGIC_LINK_REQUESTED);
+    }
+
+    @Override public void usernamePasswordScreenResumed() {
+        mUnifiedLoginTracker.setStep(Step.USERNAME_PASSWORD);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
index 4bfff636e1f7..48bedf9d9da3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java
@@ -15,6 +15,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
@@ -28,6 +29,7 @@
 import org.wordpress.android.ui.main.SitePickerAdapter.SiteList;
 import org.wordpress.android.ui.main.SitePickerAdapter.SitePickerMode;
 import org.wordpress.android.ui.main.SitePickerAdapter.ViewHolderHandler;
+import org.wordpress.android.util.BuildConfigWrapper;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.image.ImageManager;
@@ -55,6 +57,7 @@ public class LoginEpilogueFragment extends LoginBaseFormFragment<LoginEpilogueLi
 
     @Inject ImageManager mImageManager;
     @Inject UnifiedLoginTracker mUnifiedLoginTracker;
+    @Inject BuildConfigWrapper mBuildConfigWrapper;
 
     public static LoginEpilogueFragment newInstance(boolean doLoginUpdate, boolean showAndReturn,
                                                     ArrayList<Integer> oldSitesIds) {
@@ -103,8 +106,8 @@ protected void setupContent(ViewGroup rootView) {
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        primaryButton.setOnClickListener(v -> {
+    protected void setupBottomButton(Button button) {
+        button.setOnClickListener(v -> {
             mUnifiedLoginTracker.trackClick(Click.CONTINUE);
             if (mLoginEpilogueListener != null) {
                 mLoginEpilogueListener.onContinue();
@@ -210,6 +213,11 @@ public void onResume() {
         }
     }
 
+    @Override
+    protected boolean isJetpackAppLogin() {
+        return mDoLoginUpdate && mBuildConfigWrapper.isJetpackApp();
+    }
+
     private void bindHeaderViewHolder(LoginHeaderViewHolder holder, SiteList sites) {
         if (!isAdded()) {
             return;
@@ -236,7 +244,7 @@ private void bindHeaderViewHolder(LoginHeaderViewHolder holder, SiteList sites)
     }
 
     private void bindFooterViewHolder(LoginFooterViewHolder holder, SiteList sites) {
-        holder.itemView.setVisibility(mShowAndReturn ? View.GONE : View.VISIBLE);
+        holder.itemView.setVisibility((mShowAndReturn || BuildConfig.IS_JETPACK_APP) ? View.GONE : View.VISIBLE);
         holder.itemView.setOnClickListener(v -> {
             if (mLoginEpilogueListener != null) {
                 mUnifiedLoginTracker.trackClick(Click.CONNECT_SITE);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueListener.kt
index e34efeb78670..2ea009c72b6e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueListener.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueListener.kt
@@ -1,12 +1,7 @@
 package org.wordpress.android.ui.accounts.login
 
-import java.util.ArrayList
-
 interface LoginPrologueListener {
     // Login Prologue callbacks
     fun showEmailLoginScreen()
-    fun doStartSignup()
     fun loginViaSiteAddress()
-    fun loggedInViaSignup(oldSitesIds: ArrayList<Int?>?)
-    fun newUserCreatedButErrored(email: String?, password: String?)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginProloguePageFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginProloguePageFragment.kt
index b47f61106724..813b129f62e4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginProloguePageFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginProloguePageFragment.kt
@@ -4,17 +4,16 @@ import android.os.Bundle
 import android.text.Html
 import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.login_intro_template_view.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.LoginIntroTemplateViewBinding
 import kotlin.math.min
 
-class LoginProloguePageFragment : Fragment() {
+class LoginProloguePageFragment : Fragment(R.layout.login_intro_template_view) {
     @StringRes private var promoTitle: Int? = null
     @LayoutRes private var promoLayoutId: Int? = null
     @LayoutRes private var promoBackgroundId: Int? = null
@@ -47,20 +46,14 @@ class LoginProloguePageFragment : Fragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = inflater.inflate(R.layout.login_intro_template_view, container, false)
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
         val inflater = LayoutInflater.from(view.context)
+        val binding = LoginIntroTemplateViewBinding.bind(view)
 
-        promoTitle?.let { promo_title.setText(it) }
+        promoTitle?.let { binding.promoTitle.setText(it) }
 
-        val container = view.findViewById<ViewGroup>(R.id.promo_layout_container)
+        val container = binding.promoLayoutContainer
         container.post {
             promoLayoutId?.let {
                 val content = inflater.inflate(promoLayoutId!!, container, false)
@@ -99,7 +92,7 @@ class LoginProloguePageFragment : Fragment() {
             }
         }
         promoBackgroundId?.let {
-            inflater.inflate(it, promo_background_container, true)
+            inflater.inflate(it, binding.promoBackgroundContainer, true)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesFragment.kt
new file mode 100644
index 000000000000..46971326a6be
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesFragment.kt
@@ -0,0 +1,161 @@
+package org.wordpress.android.ui.accounts.login.jetpack
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.JetpackLoginEmptyViewBinding
+import org.wordpress.android.login.LoginListener
+import org.wordpress.android.login.util.AvatarHelper
+import org.wordpress.android.login.util.AvatarHelper.AvatarRequestListener
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowInstructions
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSignInForResultJetpackOnly
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.State.NoUser
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.State.ShowUser
+import org.wordpress.android.ui.main.utils.MeGravatarLoader
+import org.wordpress.android.ui.utils.UiHelpers
+import javax.inject.Inject
+
+@Suppress("TooManyFunctions")
+class LoginNoSitesFragment : Fragment(R.layout.jetpack_login_empty_view) {
+    companion object {
+        const val TAG = "LoginNoSitesFragment"
+
+        fun newInstance(): LoginNoSitesFragment {
+            return LoginNoSitesFragment()
+        }
+    }
+
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var meGravatarLoader: MeGravatarLoader
+    @Inject lateinit var uiHelpers: UiHelpers
+    private var loginListener: LoginListener? = null
+    private lateinit var viewModel: LoginNoSitesViewModel
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        initDagger()
+        initBackPressHandler()
+        with(JetpackLoginEmptyViewBinding.bind(view)) {
+            initContentViews()
+            initClickListeners()
+            initViewModel(savedInstanceState)
+        }
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component().inject(this)
+    }
+
+    private fun JetpackLoginEmptyViewBinding.initContentViews() {
+        uiHelpers.setTextOrHide(loginErrorMessageTitle, R.string.login_no_jetpack_sites)
+        uiHelpers.setTextOrHide(loginErrorMessageText, R.string.login_no_jetpack_sites_error_message)
+    }
+
+    private fun JetpackLoginEmptyViewBinding.initClickListeners() {
+        bottomButtonsContainer.buttonPrimary.setOnClickListener { viewModel.onSeeInstructionsPressed() }
+        bottomButtonsContainer.buttonSecondary.setOnClickListener { viewModel.onTryAnotherAccountPressed() }
+    }
+
+    private fun JetpackLoginEmptyViewBinding.initViewModel(savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(this@LoginNoSitesFragment, viewModelFactory)
+                .get(LoginNoSitesViewModel::class.java)
+
+        initObservers()
+
+        viewModel.start(
+                application = requireActivity().application as WordPress,
+                savedInstanceState = savedInstanceState
+        )
+    }
+
+    private fun JetpackLoginEmptyViewBinding.initObservers() {
+        viewModel.navigationEvents.observe(viewLifecycleOwner, { events ->
+            events.getContentIfNotHandled()?.let {
+                when (it) {
+                    is ShowSignInForResultJetpackOnly -> showSignInForResultJetpackOnly()
+                    is ShowInstructions -> showInstructions(it.url)
+                    else -> { // no op
+                    }
+                }
+            }
+        })
+
+        viewModel.uiModel.observe(viewLifecycleOwner, { uiModel ->
+            when (val state = uiModel.state) {
+                is ShowUser -> {
+                    loadGravatar(state.accountAvatarUrl)
+                    setUserName(state.userName)
+                    setDisplayName(state.displayName)
+                    userCardView.visibility = View.VISIBLE
+                }
+                is NoUser -> userCardView.visibility = View.GONE
+            }
+        })
+    }
+
+    private fun JetpackLoginEmptyViewBinding.loadGravatar(avatarUrl: String) {
+        AvatarHelper.loadAvatarFromUrl(
+                this@LoginNoSitesFragment,
+                meGravatarLoader.constructGravatarUrl(avatarUrl),
+                userContainer.imageAvatar,
+                object : AvatarRequestListener {
+                    override fun onRequestFinished() {
+                        // no op
+                    }
+                })
+    }
+
+    private fun JetpackLoginEmptyViewBinding.setUserName(value: String) =
+            uiHelpers.setTextOrHide(userContainer.textUsername, value)
+
+    private fun JetpackLoginEmptyViewBinding.setDisplayName(value: String) =
+            uiHelpers.setTextOrHide(userContainer.textDisplayName, value)
+
+    private fun showSignInForResultJetpackOnly() {
+        ActivityLauncher.showSignInForResultJetpackOnly(requireActivity())
+    }
+
+    private fun showInstructions(url: String) {
+        ActivityLauncher.openUrlExternal(requireContext(), url)
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewModel.writeToBundle(outState)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        // this will throw if parent activity doesn't implement the login listener interface
+        loginListener = context as? LoginListener
+    }
+
+    override fun onDetach() {
+        loginListener = null
+        super.onDetach()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.onFragmentResume()
+    }
+
+    private fun initBackPressHandler() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+                viewLifecycleOwner,
+                object : OnBackPressedCallback(
+                        true
+                ) {
+                    override fun handleOnBackPressed() {
+                        viewModel.onBackPressed()
+                    }
+                })
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesViewModel.kt
new file mode 100644
index 000000000000..7a75ee1cea5e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesViewModel.kt
@@ -0,0 +1,111 @@
+package org.wordpress.android.ui.accounts.login.jetpack
+
+import android.os.Bundle
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.WordPress
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.accounts.LoginNavigationEvents
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowInstructions
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSignInForResultJetpackOnly
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Step
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.State.NoUser
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.State.ShowUser
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import java.io.Serializable
+import javax.inject.Inject
+import javax.inject.Named
+
+const val KEY_STATE = "key_state"
+
+class LoginNoSitesViewModel @Inject constructor(
+    private val unifiedLoginTracker: UnifiedLoginTracker,
+    private val accountStore: AccountStore,
+    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher,
+    @Named(BG_THREAD) val bgDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
+    val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
+
+    private val _uiModel = MediatorLiveData<UiModel>()
+    val uiModel: LiveData<UiModel> = _uiModel
+
+    private var isStarted = false
+
+    fun start(application: WordPress, savedInstanceState: Bundle?) {
+        if (isStarted) return
+        isStarted = true
+
+        init(savedInstanceState)
+
+        signOutWordPress(application)
+    }
+
+    private fun init(savedInstanceState: Bundle?) {
+        val state = if (savedInstanceState != null) {
+            buildStateFromSavedInstanceState(savedInstanceState)
+        } else {
+            buildStateFromAccountStore()
+        }
+        _uiModel.postValue(UiModel(state = state))
+    }
+
+    private fun buildStateFromSavedInstanceState(savedInstanceState: Bundle) =
+            savedInstanceState.getSerializable(KEY_STATE) as State
+
+    private fun buildStateFromAccountStore() =
+            accountStore.account?.let {
+                ShowUser(
+                        it.avatarUrl.orEmpty(),
+                        it.userName,
+                        it.displayName
+                )
+            } ?: NoUser
+
+    private fun signOutWordPress(application: WordPress) {
+        launch {
+            withContext(bgDispatcher) {
+                application.wordPressComSignOut()
+            }
+        }
+    }
+
+    fun onSeeInstructionsPressed() {
+        _navigationEvents.postValue(Event(ShowInstructions()))
+    }
+
+    fun onTryAnotherAccountPressed() {
+        _navigationEvents.postValue(Event(ShowSignInForResultJetpackOnly))
+    }
+
+    fun onFragmentResume() {
+        unifiedLoginTracker.track(step = Step.NO_JETPACK_SITES)
+    }
+
+    fun onBackPressed() {
+        _navigationEvents.postValue(Event(ShowSignInForResultJetpackOnly))
+    }
+
+    fun writeToBundle(outState: Bundle) {
+        requireNotNull(outState.putSerializable(KEY_STATE, uiModel.value?.state))
+    }
+
+    data class UiModel(
+        val state: State
+    )
+
+    sealed class State : Serializable {
+        object NoUser : State()
+        data class ShowUser(
+            val accountAvatarUrl: String,
+            val userName: String,
+            val displayName: String
+        ) : State()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorFragment.kt
new file mode 100644
index 000000000000..a02cbc59990a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorFragment.kt
@@ -0,0 +1,135 @@
+package org.wordpress.android.ui.accounts.login.jetpack
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.activity.OnBackPressedCallback
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.JetpackLoginEmptyViewBinding
+import org.wordpress.android.login.LoginListener
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowInstructions
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSignInForResultJetpackOnly
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Step
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import javax.inject.Inject
+
+@Suppress("TooManyFunctions")
+class LoginSiteCheckErrorFragment : Fragment(R.layout.jetpack_login_empty_view) {
+    companion object {
+        const val TAG = "LoginSiteCheckErrorFragment"
+        const val ARG_SITE_ADDRESS = "SITE-ADDRESS"
+
+        fun newInstance(siteAddress: String): LoginSiteCheckErrorFragment {
+            val fragment = LoginSiteCheckErrorFragment()
+            val args = Bundle()
+            args.putString(ARG_SITE_ADDRESS, siteAddress)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var unifiedLoginTracker: UnifiedLoginTracker
+    @Inject lateinit var htmlMessageUtils: HtmlMessageUtils
+    private var loginListener: LoginListener? = null
+    private var siteAddress: String? = null
+    private lateinit var viewModel: LoginSiteCheckErrorViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        arguments?.let {
+            siteAddress = it.getString(ARG_SITE_ADDRESS, null)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        initDagger()
+        initBackPressHandler()
+        initViewModel()
+        with(JetpackLoginEmptyViewBinding.bind(view)) {
+            initErrorMessageView()
+            initClickListeners()
+        }
+        initObservers()
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component().inject(this)
+    }
+
+    private fun initViewModel() {
+        viewModel = ViewModelProvider(this@LoginSiteCheckErrorFragment, viewModelFactory)
+                .get(LoginSiteCheckErrorViewModel::class.java)
+    }
+
+    private fun JetpackLoginEmptyViewBinding.initErrorMessageView() {
+        loginErrorMessageText.text = htmlMessageUtils.getHtmlMessageFromStringFormatResId(
+                R.string.login_not_a_jetpack_site,
+                "<b>$siteAddress</b>"
+        )
+    }
+
+    private fun JetpackLoginEmptyViewBinding.initClickListeners() {
+        bottomButtonsContainer.buttonPrimary.setOnClickListener { viewModel.onSeeInstructionsPressed() }
+        bottomButtonsContainer.buttonSecondary.setOnClickListener { viewModel.onTryAnotherAccountPressed() }
+    }
+
+    private fun initObservers() {
+        viewModel.navigationEvents.observe(viewLifecycleOwner, { events ->
+            events.getContentIfNotHandled()?.let {
+                when (it) {
+                    is ShowSignInForResultJetpackOnly -> showSignInForResultJetpackOnly()
+                    is ShowInstructions -> showInstructions(it.url)
+                    else -> { // no op
+                    }
+                }
+            }
+        })
+    }
+
+    private fun showSignInForResultJetpackOnly() {
+        ActivityLauncher.showSignInForResultJetpackOnly(requireActivity())
+    }
+
+    private fun showInstructions(url: String) {
+        ActivityLauncher.openUrlExternal(requireContext(), url)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        // this will throw if parent activity doesn't implement the login listener interface
+        loginListener = context as? LoginListener
+    }
+
+    override fun onDetach() {
+        loginListener = null
+        super.onDetach()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        unifiedLoginTracker.track(step = Step.NOT_A_JETPACK_SITE)
+    }
+
+    private fun initBackPressHandler() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+                viewLifecycleOwner,
+                object : OnBackPressedCallback(
+                        true
+                ) {
+                    override fun handleOnBackPressed() {
+                        viewModel.onBackPressed()
+                    }
+                })
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModel.kt
new file mode 100644
index 000000000000..1094cf357fed
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModel.kt
@@ -0,0 +1,38 @@
+package org.wordpress.android.ui.accounts.login.jetpack
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.accounts.LoginNavigationEvents
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowInstructions
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSignInForResultJetpackOnly
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+class LoginSiteCheckErrorViewModel @Inject constructor(
+    @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
+    val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
+
+    private var isStarted = false
+    fun start() {
+        if (isStarted) return
+        isStarted = true
+    }
+
+    fun onSeeInstructionsPressed() {
+        _navigationEvents.postValue(Event(ShowInstructions()))
+    }
+
+    fun onTryAnotherAccountPressed() {
+        _navigationEvents.postValue(Event(ShowSignInForResultJetpackOnly))
+    }
+
+    fun onBackPressed() {
+        _navigationEvents.postValue(Event(ShowSignInForResultJetpackOnly))
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
index 429ef9bfb32f..e529b2da93db 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java
@@ -90,6 +90,9 @@
 
 import javax.inject.Inject;
 
+import static org.wordpress.android.analytics.AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_GALLERY_PICKED;
+import static org.wordpress.android.analytics.AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW;
+
 public class SignupEpilogueFragment extends LoginBaseFormFragment<SignupEpilogueListener>
         implements OnConfirmListener, OnDismissListener {
     private EditText mEditTextDisplayName;
@@ -190,7 +193,7 @@ public void onClick(View view) {
             @Override
             public boolean onLongClick(View view) {
                 ToastUtils.showToast(getActivity(), getString(R.string.content_description_add_avatar),
-                                     ToastUtils.Duration.SHORT);
+                        ToastUtils.Duration.SHORT);
                 return true;
             }
         });
@@ -279,8 +282,8 @@ private void showBottomShadowIfNeeded() {
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        primaryButton.setOnClickListener(new View.OnClickListener() {
+    protected void setupBottomButton(Button button) {
+        button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 mUnifiedLoginTracker.trackClick(Click.CONTINUE);
@@ -373,8 +376,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                                             data.getStringExtra(MediaPickerConstants.EXTRA_MEDIA_SOURCE));
                                     AnalyticsTracker.Stat stat =
                                             source == PhotoPickerActivity.PhotoPickerMediaSource.ANDROID_CAMERA
-                                                ? AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW
-                                                : AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_GALLERY_PICKED;
+                                                    ? SIGNUP_EMAIL_EPILOGUE_GRAVATAR_SHOT_NEW
+                                                    : SIGNUP_EMAIL_EPILOGUE_GRAVATAR_GALLERY_PICKED;
                                     AnalyticsTracker.track(stat);
                                     Uri imageUri = Uri.parse(mediaUriStringsArray[0]);
 
@@ -403,13 +406,13 @@ public void doNext(Uri uri) {
                         case UCrop.REQUEST_CROP:
                             AnalyticsTracker.track(AnalyticsTracker.Stat.SIGNUP_EMAIL_EPILOGUE_GRAVATAR_CROPPED);
                             WPMediaUtils.fetchMediaAndDoNext(getActivity(), UCrop.getOutput(data),
-                                                             new WPMediaUtils.MediaFetchDoNext() {
-                                                                 @Override
-                                                                 public void doNext(Uri uri) {
-                                                                     startGravatarUpload(MediaUtils.getRealPathFromURI(
-                                                                             getActivity(), uri));
-                                                                 }
-                                                             });
+                                    new WPMediaUtils.MediaFetchDoNext() {
+                                        @Override
+                                        public void doNext(Uri uri) {
+                                            startGravatarUpload(MediaUtils.getRealPathFromURI(
+                                                    getActivity(), uri));
+                                        }
+                                    });
 
                             break;
                     }
@@ -504,8 +507,8 @@ public void onAccountChanged(OnAccountChanged event) {
             } else {
                 showErrorDialog(getString(R.string.signup_epilogue_error_generic));
             }
-        // Wait to populate epilogue for email interface until account is fetched and email address
-        // is available since flow is coming from magic link with no instance argument values.
+            // Wait to populate epilogue for email interface until account is fetched and email address
+            // is available since flow is coming from magic link with no instance argument values.
         } else if (mIsEmailSignup && event.causeOfChange == AccountAction.FETCH_ACCOUNT
                    && !TextUtils.isEmpty(mAccountStore.getAccount().getEmail())) {
             endProgress();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/ActivityLogNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/ActivityLogNavigationEvents.kt
new file mode 100644
index 000000000000..4d8dc65c31f6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/ActivityLogNavigationEvents.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.ui.activitylog
+
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem
+
+sealed class ActivityLogNavigationEvents {
+    data class ShowBackupDownload(val event: ActivityLogListItem.Event) : ActivityLogNavigationEvents()
+    data class ShowRestore(val event: ActivityLogListItem.Event) : ActivityLogNavigationEvents()
+    data class DownloadBackupFile(val url: String) : ActivityLogNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/RewindProgressChecker.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/RewindProgressChecker.kt
deleted file mode 100644
index 7940de44982f..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/RewindProgressChecker.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.wordpress.android.ui.activitylog
-
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.withContext
-import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_REWIND_STATE
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FAILED
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FINISHED
-import org.wordpress.android.fluxc.store.ActivityLogStore
-import org.wordpress.android.fluxc.store.ActivityLogStore.FetchRewindStatePayload
-import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewindStatusFetched
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType.GENERIC_ERROR
-import org.wordpress.android.modules.DEFAULT_SCOPE
-import javax.inject.Inject
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Singleton
-class RewindProgressChecker
-@Inject constructor(
-    private val activityLogStore: ActivityLogStore,
-    @param:Named(DEFAULT_SCOPE) private val defaultScope: CoroutineScope
-) {
-    companion object {
-        const val CHECK_DELAY_MILLIS = 10000L
-    }
-
-    suspend fun startNow(site: SiteModel, restoreId: Long): OnRewindStatusFetched? {
-        return start(site, restoreId, true)
-    }
-
-    suspend fun start(
-        site: SiteModel,
-        restoreId: Long,
-        now: Boolean = false,
-        checkDelay: Long = CHECK_DELAY_MILLIS
-    ) = withContext(defaultScope.coroutineContext) {
-        if (!now) {
-            delay(checkDelay)
-        }
-        var result: OnRewindStatusFetched? = null
-        while (coroutineContext.isActive) {
-            val rewindStatusForSite = activityLogStore.getRewindStatusForSite(site)
-            val rewind = rewindStatusForSite?.rewind
-            if (rewind != null && rewind.restoreId == restoreId) {
-                if (rewind.status == FINISHED) {
-                    result = OnRewindStatusFetched(FETCH_REWIND_STATE)
-                    break
-                } else if (rewind.status == FAILED) {
-                    result = OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR, rewind.reason), FETCH_REWIND_STATE)
-                    break
-                }
-            }
-            result = activityLogStore.fetchActivitiesRewind(FetchRewindStatePayload(site))
-            if (result.isError) {
-                break
-            }
-            delay(checkDelay)
-        }
-        return@withContext result
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/RewindStatusService.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/RewindStatusService.kt
deleted file mode 100644
index 43550aecc895..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/RewindStatusService.kt
+++ /dev/null
@@ -1,190 +0,0 @@
-package org.wordpress.android.ui.activitylog
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import org.wordpress.android.analytics.AnalyticsTracker
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.activity.ActivityLogModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.RUNNING
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State.ACTIVE
-import org.wordpress.android.fluxc.store.ActivityLogStore
-import org.wordpress.android.fluxc.store.ActivityLogStore.FetchRewindStatePayload
-import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewind
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindError
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindPayload
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
-import org.wordpress.android.modules.UI_SCOPE
-import org.wordpress.android.util.analytics.AnalyticsUtils
-import java.util.Date
-import javax.inject.Inject
-import javax.inject.Named
-import javax.inject.Singleton
-
-@Singleton
-class RewindStatusService
-@Inject constructor(
-    private val activityLogStore: ActivityLogStore,
-    private val rewindProgressChecker: RewindProgressChecker,
-    @param:Named(UI_SCOPE) private val uiScope: CoroutineScope
-) {
-    private val mutableRewindAvailable = MutableLiveData<Boolean>()
-    private val mutableRewindError = MutableLiveData<RewindError>()
-    private val mutableRewindStatusFetchError = MutableLiveData<RewindStatusError>()
-    private val mutableRewindProgress = MutableLiveData<RewindProgress>()
-    private var site: SiteModel? = null
-    private var activityLogModelItem: ActivityLogModel? = null
-    private var rewindProgressCheckerJob: Job? = null
-    private var fetchRewindJob: Job? = null
-
-    val rewindingActivity: ActivityLogModel?
-        get() = activityLogModelItem
-
-    val rewindAvailable: LiveData<Boolean> = mutableRewindAvailable
-    val rewindError: LiveData<RewindError> = mutableRewindError
-    val rewindStatusFetchError: LiveData<RewindStatusError> = mutableRewindStatusFetchError
-    val rewindProgress: LiveData<RewindProgress> = mutableRewindProgress
-
-    val isRewindInProgress: Boolean
-        get() = rewindProgress.value?.status == RUNNING
-
-    val isRewindAvailable: Boolean
-        get() = rewindAvailable.value == true
-
-    companion object {
-        const val REWIND_ID_TRACKING_KEY = "rewind_id"
-    }
-
-    fun rewind(rewindId: String, site: SiteModel) = uiScope.launch {
-        AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.ACTIVITY_LOG_REWIND_STARTED,
-                site, mutableMapOf(REWIND_ID_TRACKING_KEY to rewindId as Any))
-
-        updateRewindProgress(rewindId, 0, RUNNING)
-        mutableRewindAvailable.value = false
-        mutableRewindError.value = null
-
-        val rewindResult = activityLogStore.rewind(RewindPayload(site, rewindId))
-        onRewind(rewindResult)
-    }
-
-    fun start(site: SiteModel) {
-        if (this.site == null) {
-            this.site = site
-            requestStatusUpdate()
-            reloadRewindStatus()
-        }
-    }
-
-    fun stop() {
-        rewindProgressCheckerJob?.cancel()
-        fetchRewindJob?.cancel()
-        if (site != null) {
-            site = null
-        }
-    }
-
-    fun requestStatusUpdate() {
-        site?.let {
-            fetchRewindJob?.cancel()
-            fetchRewindJob = uiScope.launch {
-                val rewindStatus = activityLogStore.fetchActivitiesRewind(FetchRewindStatePayload(it))
-                onRewindStatusFetched(rewindStatus.error, rewindStatus.isError)
-            }
-        }
-    }
-
-    private fun reloadRewindStatus(): Boolean {
-        site?.let {
-            val state = activityLogStore.getRewindStatusForSite(it)
-            state?.let {
-                updateRewindStatus(state)
-                return true
-            }
-        }
-        return false
-    }
-
-    private fun updateRewindStatus(rewindStatus: RewindStatusModel?) {
-        mutableRewindAvailable.value = rewindStatus?.state == ACTIVE && rewindStatus.rewind?.status != RUNNING
-
-        val rewind = rewindStatus?.rewind
-        if (rewind != null) {
-            val restoreId = rewindStatus.rewind?.restoreId
-            if (rewindProgressCheckerJob?.isActive != true && restoreId != null) {
-                site?.let {
-                    rewindProgressCheckerJob = uiScope.launch {
-                        val rewindStatusFetched = rewindProgressChecker.startNow(it, restoreId)
-                        onRewindStatusFetched(rewindStatusFetched?.error, rewindStatusFetched?.isError == true)
-                    }
-                }
-            }
-            updateRewindProgress(rewind.rewindId, rewind.progress, rewind.status, rewind.reason)
-            if (rewind.status != RUNNING) {
-                rewindProgressCheckerJob?.cancel()
-            }
-        } else {
-            mutableRewindProgress.setValue(null)
-        }
-    }
-
-    private fun onRewindStatusFetched(rewindStatusError: RewindStatusError?, isError: Boolean) {
-        mutableRewindStatusFetchError.value = rewindStatusError
-        if (isError) {
-            rewindProgressCheckerJob?.cancel()
-        }
-        reloadRewindStatus()
-    }
-
-    private fun onRewind(event: OnRewind) {
-        mutableRewindError.value = event.error
-        if (event.isError) {
-            mutableRewindAvailable.value = true
-            reloadRewindStatus()
-            updateRewindProgress(event.rewindId, 0, Status.FAILED, event.error?.type?.toString())
-            return
-        }
-        site?.let {
-            event.restoreId?.let { restoreId ->
-                rewindProgressCheckerJob = uiScope.launch {
-                    val rewindStatusFetched = rewindProgressChecker.start(it, restoreId)
-                    onRewindStatusFetched(rewindStatusFetched?.error, rewindStatusFetched?.isError == true)
-                }
-            }
-        }
-    }
-
-    private fun updateRewindProgress(
-        rewindId: String?,
-        progress: Int?,
-        rewindStatus: Status,
-        rewindError: String? = null
-    ) {
-        var activityItem = if (rewindId != null) activityLogStore.getActivityLogItemByRewindId(rewindId) else null
-        if (activityItem == null && activityLogModelItem != null && activityLogModelItem?.rewindID == rewindId) {
-            activityItem = activityLogModelItem
-        }
-        if (activityItem != null) {
-            activityLogModelItem = activityItem
-        }
-        val rewindProgress = RewindProgress(
-                activityItem,
-                progress,
-                activityItem?.published,
-                rewindStatus,
-                rewindError
-        )
-        mutableRewindProgress.value = rewindProgress
-    }
-
-    data class RewindProgress(
-        val activityLogItem: ActivityLogModel?,
-        val progress: Int?,
-        val date: Date?,
-        val status: Status,
-        val failureReason: String? = null
-    )
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt
index ce9f4a15830e..c1c7b2b55162 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailActivity.kt
@@ -1,21 +1,20 @@
 package org.wordpress.android.ui.activitylog.detail
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.ActivityLogDetailActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
-import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogNegativeClickInterface
-import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveClickInterface
+import org.wordpress.android.ui.RequestCodes
 
-class ActivityLogDetailActivity : LocaleAwareActivity(), BasicDialogPositiveClickInterface,
-        BasicDialogNegativeClickInterface {
+class ActivityLogDetailActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.activity_log_detail_activity)
+        val binding = ActivityLogDetailActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-        setSupportActionBar(toolbar_main)
+        setSupportActionBar(binding.toolbarMain)
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
@@ -30,13 +29,29 @@ class ActivityLogDetailActivity : LocaleAwareActivity(), BasicDialogPositiveClic
         return super.onOptionsItemSelected(item)
     }
 
-    override fun onPositiveClicked(instanceTag: String) {
-        val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
-        if (fragment is ActivityLogDetailFragment) {
-            fragment.onRewindConfirmed(instanceTag)
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            RequestCodes.RESTORE -> if (resultCode == RESULT_OK) onActivityResultForRestore(data)
+            RequestCodes.BACKUP_DOWNLOAD -> if (resultCode == RESULT_OK) onActivityResultForBackupDownload(data)
         }
     }
 
-    override fun onNegativeClicked(instanceTag: String) {
+    private fun onActivityResultForRestore(data: Intent?) {
+        data?.putExtra(EXTRA_INNER_FLOW, EXTRA_RESTORE_FLOW)
+        setResult(RESULT_OK, data)
+        finish()
+    }
+
+    private fun onActivityResultForBackupDownload(data: Intent?) {
+        data?.putExtra(EXTRA_INNER_FLOW, EXTRA_BACKUP_DOWNLOAD_FLOW)
+        setResult(RESULT_OK, data)
+        finish()
+    }
+
+    companion object {
+        const val EXTRA_INNER_FLOW = "extra_inner_flow"
+        const val EXTRA_RESTORE_FLOW = "extra_restore_inner_flow"
+        const val EXTRA_BACKUP_DOWNLOAD_FLOW = "extra_backup_download_inner_flow"
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt
index 29c808e44879..8b118adbdd8b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt
@@ -1,32 +1,37 @@
 package org.wordpress.android.ui.activitylog.detail
 
-import android.app.Activity.RESULT_OK
+import android.content.Intent
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
+import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.activity_log_item_detail.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ActivityLogItemDetailBinding
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.tools.FormattableRange
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.ActivityLauncher.SOURCE_TRACK_EVENT_PROPERTY_KEY
+import org.wordpress.android.ui.RequestCodes
+import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailNavigationEvents.ShowBackupDownload
+import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailNavigationEvents.ShowRestore
 import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan
 import org.wordpress.android.ui.notifications.utils.FormattableContentClickHandler
 import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
-import org.wordpress.android.ui.posts.BasicFragmentDialog
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
+import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY
 import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_ID_KEY
-import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_REWIND_ID_KEY
 import org.wordpress.android.viewmodel.activitylog.ActivityLogDetailViewModel
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
-class ActivityLogDetailFragment : Fragment() {
+private const val DETAIL_TRACKING_SOURCE = "detail"
+private const val FORWARD_SLASH = "/"
+
+class ActivityLogDetailFragment : Fragment(R.layout.activity_log_item_detail) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var notificationsUtilsWrapper: NotificationsUtilsWrapper
@@ -46,92 +51,139 @@ class ActivityLogDetailFragment : Fragment() {
         (activity?.application as WordPress).component()?.inject(this)
     }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         activity?.let { activity ->
-            viewModel = ViewModelProviders.of(activity, viewModelFactory)
-                    .get<ActivityLogDetailViewModel>(ActivityLogDetailViewModel::class.java)
-
-            val intent = activity.intent
-            val (site, activityLogId) = when {
-                savedInstanceState != null -> {
-                    val site = savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
-                    val activityLogId = requireNotNull(savedInstanceState.getString(ACTIVITY_LOG_ID_KEY))
-                    site to activityLogId
-                }
-                intent != null -> {
-                    val site = intent.getSerializableExtra(WordPress.SITE) as SiteModel
-                    val activityLogId = intent.getStringExtra(ACTIVITY_LOG_ID_KEY)
-                    site to activityLogId
+            viewModel = ViewModelProvider(activity, viewModelFactory)
+                    .get(ActivityLogDetailViewModel::class.java)
+            with(ActivityLogItemDetailBinding.bind(view)) {
+                val (site, activityLogId) = sideAndActivityId(savedInstanceState, activity.intent)
+                val areButtonsVisible = areButtonsVisible(savedInstanceState, activity.intent)
+
+                viewModel.activityLogItem.observe(viewLifecycleOwner, { activityLogModel ->
+                    loadLogItem(activityLogModel, activity)
+                })
+
+                viewModel.restoreVisible.observe(viewLifecycleOwner, { available ->
+                    activityRestoreButton.visibility = if (available == true) View.VISIBLE else View.GONE
+                })
+                viewModel.downloadBackupVisible.observe(viewLifecycleOwner, { available ->
+                    activityDownloadBackupButton.visibility = if (available == true) View.VISIBLE else View.GONE
+                })
+
+            viewModel.navigationEvents.observeEvent(viewLifecycleOwner, {
+                when (it) {
+                    is ShowBackupDownload -> ActivityLauncher.showBackupDownloadForResult(
+                            requireActivity(),
+                            viewModel.site,
+                            it.model.activityID,
+                            RequestCodes.BACKUP_DOWNLOAD,
+                            buildTrackingSource()
+                    )
+                    is ShowRestore -> ActivityLauncher.showRestoreForResult(
+                            requireActivity(),
+                            viewModel.site,
+                            it.model.activityID,
+                            RequestCodes.RESTORE,
+                            buildTrackingSource()
+                    )
                 }
-                else -> throw Throwable("Couldn't initialize Activity Log view model")
-            }
-
-            viewModel.activityLogItem.observe(viewLifecycleOwner, Observer { activityLogModel ->
-                setActorIcon(activityLogModel?.actorIconUrl, activityLogModel?.showJetpackIcon)
-                uiHelpers.setTextOrHide(activityActorName, activityLogModel?.actorName)
-                uiHelpers.setTextOrHide(activityActorRole, activityLogModel?.actorRole)
+            })
 
-                val spannable = activityLogModel?.content?.let {
-                    notificationsUtilsWrapper.getSpannableContentForRanges(it, activityMessage, { range ->
-                        viewModel.onRangeClicked(range)
-                    }, false)
-                }
+                viewModel.handleFormattableRangeClick.observe(viewLifecycleOwner, { range ->
+                    if (range != null) {
+                        formattableContentClickHandler.onClick(
+                                activity,
+                                range,
+                                ReaderTracker.SOURCE_ACTIVITY_LOG_DETAIL
+                        )
+                    }
+                })
 
-                val noteBlockSpans = spannable?.getSpans(0, spannable.length, NoteBlockClickableSpan::class.java)
+                viewModel.start(site, activityLogId, areButtonsVisible)
+            }
+        }
+    }
 
-                noteBlockSpans?.forEach {
-                    it.enableColors(activity)
-                }
+    private fun ActivityLogItemDetailBinding.loadLogItem(
+        activityLogModel: ActivityLogDetailModel?,
+        activity: FragmentActivity
+    ) {
+        setActorIcon(activityLogModel?.actorIconUrl, activityLogModel?.showJetpackIcon)
+        uiHelpers.setTextOrHide(activityActorName, activityLogModel?.actorName)
+        uiHelpers.setTextOrHide(activityActorRole, activityLogModel?.actorRole)
 
-                uiHelpers.setTextOrHide(activityMessage, spannable)
-                uiHelpers.setTextOrHide(activityType, activityLogModel?.summary)
+        val spannable = activityLogModel?.content?.let {
+            notificationsUtilsWrapper.getSpannableContentForRanges(
+                    it,
+                    activityMessage,
+                    { range ->
+                        viewModel.onRangeClicked(range)
+                    },
+                    false
+            )
+        }
 
-                activityCreatedDate.text = activityLogModel?.createdDate
-                activityCreatedTime.text = activityLogModel?.createdTime
+        val noteBlockSpans = spannable?.getSpans(
+                0,
+                spannable.length,
+                NoteBlockClickableSpan::class.java
+        )
 
-                if (activityLogModel != null) {
-                    activityRewindButton.setOnClickListener {
-                        viewModel.onRewindClicked(activityLogModel)
-                    }
-                }
-            })
+        noteBlockSpans?.forEach {
+            it.enableColors(activity)
+        }
 
-            viewModel.rewindAvailable.observe(viewLifecycleOwner, Observer { available ->
-                activityRewindButton.visibility = if (available == true) View.VISIBLE else View.GONE
-            })
+        uiHelpers.setTextOrHide(activityMessage, spannable)
+        uiHelpers.setTextOrHide(activityType, activityLogModel?.summary)
 
-            viewModel.showRewindDialog.observe(viewLifecycleOwner, Observer<ActivityLogDetailModel> { detailModel ->
-                detailModel?.let { onRewindButtonClicked(it) }
-            })
+        activityCreatedDate.text = activityLogModel?.createdDate
+        activityCreatedTime.text = activityLogModel?.createdTime
 
-            viewModel.handleFormattableRangeClick.observe(viewLifecycleOwner, Observer<FormattableRange> { range ->
-                if (range != null) {
-                    formattableContentClickHandler.onClick(activity, range)
-                }
-            })
+        if (activityLogModel != null) {
+            activityRestoreButton.setOnClickListener {
+                viewModel.onRestoreClicked(activityLogModel)
+            }
+            activityDownloadBackupButton.setOnClickListener {
+                viewModel.onDownloadBackupClicked(activityLogModel)
+            }
+        }
+    }
 
-            viewModel.start(site, activityLogId)
+    private fun sideAndActivityId(savedInstanceState: Bundle?, intent: Intent?) = when {
+        savedInstanceState != null -> {
+            val site = savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
+            val activityLogId = requireNotNull(
+                    savedInstanceState.getString(
+                            ACTIVITY_LOG_ID_KEY
+                    )
+            )
+            site to activityLogId
         }
+        intent != null -> {
+            val site = intent.getSerializableExtra(WordPress.SITE) as SiteModel
+            val activityLogId = intent.getStringExtra(ACTIVITY_LOG_ID_KEY) as String
+            site to activityLogId
+        }
+        else -> throw Throwable("Couldn't initialize Activity Log view model")
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.activity_log_item_detail, container, false)
+    private fun areButtonsVisible(savedInstanceState: Bundle?, intent: Intent?) = when {
+        savedInstanceState != null ->
+            requireNotNull(savedInstanceState.getBoolean(ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY, true))
+        intent != null ->
+            intent.getBooleanExtra(ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY, true)
+        else -> throw Throwable("Couldn't initialize Activity Log view model")
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         outState.putSerializable(WordPress.SITE, viewModel.site)
         outState.putString(ACTIVITY_LOG_ID_KEY, viewModel.activityLogId)
+        outState.putBoolean(ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY, viewModel.areButtonsVisible)
     }
 
-    fun onRewindConfirmed(rewindId: String) {
-        val intent = activity?.intent?.putExtra(ACTIVITY_LOG_REWIND_ID_KEY, rewindId)
-        activity?.setResult(RESULT_OK, intent)
-        activity?.finish()
-    }
-
-    private fun setActorIcon(actorIcon: String?, showJetpackIcon: Boolean?) {
+    private fun ActivityLogItemDetailBinding.setActorIcon(actorIcon: String?, showJetpackIcon: Boolean?) {
         when {
             actorIcon != null && actorIcon != "" -> {
                 imageManager.loadIntoCircle(activityActorIcon, AVATAR_WITH_BACKGROUND, actorIcon)
@@ -150,17 +202,11 @@ class ActivityLogDetailFragment : Fragment() {
         }
     }
 
-    private fun onRewindButtonClicked(item: ActivityLogDetailModel) {
-        val dialog = BasicFragmentDialog()
-        item.rewindId?.let {
-            dialog.initialize(
-                    it,
-                    getString(R.string.activity_log_rewind_site),
-                    getString(R.string.activity_log_rewind_dialog_message, item.createdDate, item.createdTime),
-                    getString(R.string.activity_log_rewind_site),
-                    getString(R.string.cancel)
-            )
-            dialog.show(requireFragmentManager(), it)
+    private fun buildTrackingSource() = requireActivity().intent?.extras?.let {
+        val source = it.getString(SOURCE_TRACK_EVENT_PROPERTY_KEY)
+        when {
+            source != null -> source + FORWARD_SLASH + DETAIL_TRACKING_SOURCE
+            else -> DETAIL_TRACKING_SOURCE
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailNavigationEvents.kt
new file mode 100644
index 000000000000..6d40fd770efd
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailNavigationEvents.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.ui.activitylog.detail
+
+sealed class ActivityLogDetailNavigationEvents {
+    data class ShowBackupDownload(val model: ActivityLogDetailModel) : ActivityLogDetailNavigationEvents()
+    data class ShowRestore(val model: ActivityLogDetailModel) : ActivityLogDetailNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogAdapter.kt
index 0005ff9643f3..cc173266b2da 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogAdapter.kt
@@ -6,12 +6,15 @@ import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Event
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Header
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Notice
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Progress
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType
+import org.wordpress.android.ui.utils.UiHelpers
 
 class ActivityLogAdapter(
     private val itemClickListener: (ActivityLogListItem) -> Unit,
-    private val rewindClickListener: (ActivityLogListItem) -> Unit
+    private val secondaryActionClickListener: (ActivityLogListItem.SecondaryAction, ActivityLogListItem) -> Boolean,
+    private val uiHelpers: UiHelpers
 ) : Adapter<ActivityLogViewHolder>() {
     private val list = mutableListOf<ActivityLogListItem>()
 
@@ -31,6 +34,7 @@ class ActivityLogAdapter(
             is HeaderItemViewHolder -> holder.bind(list[position] as Header)
             is FooterItemViewHolder -> {}
             is LoadingItemViewHolder -> {}
+            is NoticeItemViewHolder -> holder.bind(list[position] as Notice, uiHelpers)
             else -> throw IllegalArgumentException("Unexpected view holder in ActivityLog")
         }
     }
@@ -58,10 +62,11 @@ class ActivityLogAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ActivityLogViewHolder {
         return when (viewType) {
             ViewType.PROGRESS.id -> ProgressItemViewHolder(parent)
-            ViewType.EVENT.id -> EventItemViewHolder(parent, itemClickListener, rewindClickListener)
+            ViewType.EVENT.id -> EventItemViewHolder(parent, itemClickListener, secondaryActionClickListener)
             ViewType.HEADER.id -> HeaderItemViewHolder(parent)
             ViewType.FOOTER.id -> FooterItemViewHolder(parent)
             ViewType.LOADING.id -> LoadingItemViewHolder(parent)
+            ViewType.NOTICE.id -> NoticeItemViewHolder(parent)
             else -> throw IllegalArgumentException("Unexpected view type in ActivityLog")
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogDiffCallback.kt
index 7819f32150ee..e5cef3f43ce7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogDiffCallback.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import androidx.recyclerview.widget.DiffUtil
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Event
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.IActionableItem
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Notice
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Progress
 
 class ActivityLogDiffCallback(
@@ -21,6 +22,7 @@ class ActivityLogDiffCallback(
         return when {
             oldItem is Event && newItem is Event -> oldItem.activityId == newItem.activityId
             oldItem is Progress && newItem is Progress -> oldItem == newItem
+            oldItem is Notice && newItem is Notice -> oldItem == newItem
             else -> false
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt
index 3e8776686e5b..4a3a6ec00252 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListActivity.kt
@@ -3,27 +3,53 @@ package org.wordpress.android.ui.activitylog.list
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
+import android.view.View
 import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ActivityLogListActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.RequestCodes
-import org.wordpress.android.ui.posts.BasicFragmentDialog
-import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_REWIND_ID_KEY
+import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailActivity
+import org.wordpress.android.ui.jetpack.backup.download.KEY_BACKUP_DOWNLOAD_ACTION_STATE_ID
+import org.wordpress.android.ui.jetpack.backup.download.KEY_BACKUP_DOWNLOAD_DOWNLOAD_ID
+import org.wordpress.android.ui.jetpack.backup.download.KEY_BACKUP_DOWNLOAD_REWIND_ID
+import org.wordpress.android.ui.jetpack.common.JetpackBackupDownloadActionState
+import org.wordpress.android.ui.jetpack.restore.KEY_RESTORE_RESTORE_ID
+import org.wordpress.android.ui.jetpack.restore.KEY_RESTORE_REWIND_ID
+import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_REWINDABLE_ONLY_KEY
 
-class ActivityLogListActivity : LocaleAwareActivity(), BasicFragmentDialog.BasicDialogPositiveClickInterface,
-        BasicFragmentDialog.BasicDialogNegativeClickInterface {
+class ActivityLogListActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        (application as WordPress).component().inject(this)
+        val binding = ActivityLogListActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.checkAndUpdateUiToBackupScreen()
 
-        setContentView(R.layout.activity_log_list_activity)
-
-        setSupportActionBar(toolbar_main)
+        setSupportActionBar(binding.toolbarMain)
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
         }
     }
 
+    /**
+     * It was decided to reuse the 'Activity Log' screen instead of creating a new 'Backup' screen. This was due to the
+     * fact that there will be lots of code that would need to be duplicated for the new 'Backup' screen. On the other
+     * hand, not much more complexity would be introduced if the 'Activity Log' screen is reused (mainly some 'if/else'
+     * code branches here and there).
+     *
+     * However, should more 'Backup' related additions are added to the 'Activity Log' screen, then it should become a
+     * necessity to split those features in separate screens in order not to increase further the complexity of this
+     * screen's architecture.
+     */
+    private fun ActivityLogListActivityBinding.checkAndUpdateUiToBackupScreen() {
+        if (intent.getBooleanExtra(ACTIVITY_LOG_REWINDABLE_ONLY_KEY, false)) {
+            setTitle(R.string.backup)
+            activityTypeFilter.visibility = View.GONE
+        }
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
             onBackPressed()
@@ -34,24 +60,48 @@ class ActivityLogListActivity : LocaleAwareActivity(), BasicFragmentDialog.Basic
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == RequestCodes.ACTIVITY_LOG_DETAIL) {
-            data?.getStringExtra(ACTIVITY_LOG_REWIND_ID_KEY)?.let {
-                passRewindConfirmation(it)
+        when (requestCode) {
+            RequestCodes.ACTIVITY_LOG_DETAIL -> {
+                when (data?.getStringExtra(ActivityLogDetailActivity.EXTRA_INNER_FLOW)) {
+                    ActivityLogDetailActivity.EXTRA_RESTORE_FLOW -> onActivityResultForRestore(data)
+                    ActivityLogDetailActivity.EXTRA_BACKUP_DOWNLOAD_FLOW -> onActivityResultForBackupDownload(data)
+                    else -> Unit // Do nothing
+                }
             }
+            RequestCodes.RESTORE -> onActivityResultForRestore(data)
+            RequestCodes.BACKUP_DOWNLOAD -> onActivityResultForBackupDownload(data)
         }
     }
 
-    override fun onPositiveClicked(instanceTag: String) {
-        passRewindConfirmation(instanceTag)
+    private fun onActivityResultForRestore(data: Intent?) {
+        val rewindId = data?.getStringExtra(KEY_RESTORE_REWIND_ID)
+        val restoreId = data?.getLongExtra(KEY_RESTORE_RESTORE_ID, 0)
+        if (rewindId != null && restoreId != null) {
+            passQueryRestoreStatus(rewindId, restoreId)
+        }
     }
 
-    override fun onNegativeClicked(instanceTag: String) {
+    private fun onActivityResultForBackupDownload(data: Intent?) {
+        val rewindId = data?.getStringExtra(KEY_BACKUP_DOWNLOAD_REWIND_ID)
+        val downloadId = data?.getLongExtra(KEY_BACKUP_DOWNLOAD_DOWNLOAD_ID, 0)
+        val actionState = data?.getIntExtra(KEY_BACKUP_DOWNLOAD_ACTION_STATE_ID, 0)
+                ?: JetpackBackupDownloadActionState.CANCEL.id
+        if (actionState != JetpackBackupDownloadActionState.CANCEL.id && rewindId != null && downloadId != null) {
+            passQueryBackupDownloadStatus(rewindId, downloadId, actionState)
+        }
+    }
+
+    private fun passQueryRestoreStatus(rewindId: String, restoreId: Long) {
+        val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
+        if (fragment is ActivityLogListFragment) {
+            fragment.onQueryRestoreStatus(rewindId, restoreId)
+        }
     }
 
-    private fun passRewindConfirmation(rewindId: String) {
+    private fun passQueryBackupDownloadStatus(rewindId: String, downloadId: Long, actionState: Int) {
         val fragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
         if (fragment is ActivityLogListFragment) {
-            fragment.onRewindConfirmed(rewindId)
+            fragment.onQueryBackupDownloadStatus(rewindId, downloadId, actionState)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
index 8fc265918afe..8da564733a40 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListFragment.kt
@@ -1,81 +1,126 @@
 package org.wordpress.android.ui.activitylog.list
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
+import androidx.core.util.Pair
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.chip.Chip
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.DateValidatorPointBackward
+import com.google.android.material.datepicker.MaterialDatePicker
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.activity_log_list_fragment.*
-import kotlinx.android.synthetic.main.activity_log_list_loading_item.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ActivityLogListFragmentBinding
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActivityLauncher
-import org.wordpress.android.ui.posts.BasicFragmentDialog
+import org.wordpress.android.ui.RequestCodes
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents.DownloadBackupFile
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents.ShowBackupDownload
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents.ShowRestore
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterFragment
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.NetworkUtils
 import org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
+import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_REWINDABLE_ONLY_KEY
 import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel
 import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus.FETCHING
 import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus.LOADING_MORE
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.FiltersUiState.FiltersShown
+import org.wordpress.android.viewmodel.activitylog.DateRange
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPSnackbar
 import javax.inject.Inject
 
-class ActivityLogListFragment : Fragment() {
+private const val ACTIVITY_TYPE_FILTER_TAG = "activity_log_type_filter_tag"
+private const val DATE_PICKER_TAG = "activity_log_date_picker_tag"
+private const val ACTIVITY_LOG_TRACKING_SOURCE = "activity_log"
+private const val BACKUP_TRACKING_SOURCE = "backup"
+
+/**
+ * It was decided to reuse the 'Activity Log' screen instead of creating a new 'Backup' screen. This was due to the
+ * fact that there will be lots of code that would need to be duplicated for the new 'Backup' screen. On the other
+ * hand, not much more complexity would be introduced if the 'Activity Log' screen is reused (mainly some 'if/else'
+ * code branches here and there).
+ *
+ * However, should more 'Backup' related additions are added to the 'Activity Log' screen, then it should become a
+ * necessity to split those features in separate screens in order not to increase further the complexity of this
+ * screen's architecture.
+ */
+class ActivityLogListFragment : Fragment(R.layout.activity_log_list_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var uiHelpers: UiHelpers
     private lateinit var viewModel: ActivityLogViewModel
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.activity_log_list_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
+        (nonNullActivity.application as WordPress).component()?.inject(this@ActivityLogListFragment)
+        viewModel = ViewModelProvider(
+                this@ActivityLogListFragment,
+                viewModelFactory
+        ).get(ActivityLogViewModel::class.java)
 
-        log_list_view.layoutManager = LinearLayoutManager(nonNullActivity, RecyclerView.VERTICAL, false)
+        with(ActivityLogListFragmentBinding.bind(view)) {
+            logListView.layoutManager = LinearLayoutManager(nonNullActivity, RecyclerView.VERTICAL, false)
+
+            swipeToRefreshHelper = buildSwipeToRefreshHelper(swipeRefreshLayout) {
+                if (NetworkUtils.checkConnection(nonNullActivity)) {
+                    viewModel.onPullToRefresh()
+                } else {
+                    swipeToRefreshHelper.isRefreshing = false
+                }
+            }
 
-        swipeToRefreshHelper = buildSwipeToRefreshHelper(swipe_refresh_layout) {
-            if (NetworkUtils.checkConnection(nonNullActivity)) {
-                viewModel.onPullToRefresh()
+            val site = if (savedInstanceState == null) {
+                val nonNullIntent = checkNotNull(nonNullActivity.intent)
+                nonNullIntent.getSerializableExtra(WordPress.SITE) as SiteModel
             } else {
-                swipeToRefreshHelper.isRefreshing = false
+                savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
             }
-        }
+            val rewindableOnly = nonNullActivity.intent.getBooleanExtra(ACTIVITY_LOG_REWINDABLE_ONLY_KEY, false)
 
-        (nonNullActivity.application as WordPress).component()?.inject(this)
+            logListView.setEmptyView(actionableEmptyView)
+            logListView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    if (!recyclerView.canScrollVertically(1) && dy != 0) {
+                        viewModel.onScrolledToBottom()
+                    }
+                }
+            })
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(ActivityLogViewModel::class.java)
+            setupObservers()
 
-        val site = if (savedInstanceState == null) {
-            val nonNullIntent = checkNotNull(nonNullActivity.intent)
-            nonNullIntent.getSerializableExtra(WordPress.SITE) as SiteModel
-        } else {
-            savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
+            viewModel.start(site, rewindableOnly)
         }
+    }
 
-        log_list_view.setEmptyView(actionable_empty_view)
-        log_list_view.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                if (!recyclerView.canScrollVertically(1) && dy != 0) {
-                    viewModel.onScrolledToBottom()
-                }
-            }
-        })
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        with(requireActivity()) {
+            findViewById<View>(R.id.activity_type_filter).setOnClickListener { viewModel.onActivityTypeFilterClicked() }
+            findViewById<View>(R.id.date_range_picker).setOnClickListener { viewModel.dateRangePickerClicked() }
+        }
+    }
 
-        setupObservers()
+    override fun onViewStateRestored(savedInstanceState: Bundle?) {
+        super.onViewStateRestored(savedInstanceState)
+        restoreDateRangePickerListeners()
+    }
 
-        viewModel.start(site)
+    private fun restoreDateRangePickerListeners() {
+        (childFragmentManager.findFragmentByTag(DATE_PICKER_TAG) as? MaterialDatePicker<Pair<Long, Long>>)
+                ?.let { picker ->
+                    initDateRangePickerButtonClickListener(picker)
+                }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -83,56 +128,151 @@ class ActivityLogListFragment : Fragment() {
         super.onSaveInstanceState(outState)
     }
 
-    fun onRewindConfirmed(activityId: String) {
-        viewModel.onRewindConfirmed(activityId)
+    fun onQueryRestoreStatus(rewindId: String, restoreId: Long) {
+        viewModel.onQueryRestoreStatus(rewindId, restoreId)
+    }
+
+    fun onQueryBackupDownloadStatus(rewindId: String, downloadId: Long, actionState: Int) {
+        viewModel.onQueryBackupDownloadStatus(rewindId, downloadId, actionState)
     }
 
-    private fun setupObservers() {
-        viewModel.events.observe(viewLifecycleOwner, Observer {
+    private fun ActivityLogListFragmentBinding.setupObservers() {
+        viewModel.events.observe(viewLifecycleOwner, {
             reloadEvents(it ?: emptyList())
         })
 
-        viewModel.eventListStatus.observe(viewLifecycleOwner, Observer { listStatus ->
+        viewModel.eventListStatus.observe(viewLifecycleOwner, { listStatus ->
             refreshProgressBars(listStatus)
         })
 
-        viewModel.dateRangePickerVisibility.observe(viewLifecycleOwner, Observer { visibility ->
-            uiHelpers.updateVisibility(date_range_picker, visibility)
+        viewModel.filtersUiState.observe(viewLifecycleOwner, { uiState ->
+            with(requireActivity()) {
+                uiHelpers.updateVisibility(findViewById(R.id.filters_bar), uiState.visibility)
+                uiHelpers.updateVisibility(findViewById(R.id.filters_bar_divider), uiState.visibility)
+            }
+            if (uiState is FiltersShown) updateFilters(uiState)
         })
 
-        viewModel.showItemDetail.observe(viewLifecycleOwner, Observer {
-            if (it is ActivityLogListItem.Event) {
-                ActivityLauncher.viewActivityLogDetailForResult(activity, viewModel.site, it.activityId)
-            }
+        viewModel.emptyUiState.observe(viewLifecycleOwner, { emptyState ->
+            actionableEmptyView.title.text = uiHelpers.getTextOfUiString(
+                    requireContext(),
+                    emptyState.emptyScreenTitle
+            )
+            actionableEmptyView.subtitle.text = uiHelpers.getTextOfUiString(
+                    requireContext(),
+                    emptyState.emptyScreenSubtitle
+            )
+        })
+
+        viewModel.showActivityTypeFilterDialog.observe(viewLifecycleOwner, { event ->
+            showActivityTypeFilterDialog(event.siteId, event.initialSelection, event.dateRange)
         })
 
-        viewModel.showRewindDialog.observe(viewLifecycleOwner, Observer {
+        viewModel.showDateRangePicker.observe(viewLifecycleOwner, { event ->
+            showDateRangePicker(event.initialSelection)
+        })
+
+        viewModel.showItemDetail.observe(viewLifecycleOwner, {
             if (it is ActivityLogListItem.Event) {
-                displayRewindDialog(it)
+                ActivityLauncher.viewActivityLogDetailForResult(
+                        activity,
+                        viewModel.site,
+                        it.activityId,
+                        it.isButtonVisible,
+                        viewModel.rewindableOnly
+                )
             }
         })
 
-        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, Observer { message ->
+        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, { message ->
             val parent: View? = activity?.findViewById(android.R.id.content)
             if (message != null && parent != null) {
                 WPSnackbar.make(parent, message, Snackbar.LENGTH_LONG).show()
             }
         })
 
-        viewModel.moveToTop.observe(this, Observer {
-            log_list_view.scrollToPosition(0)
+        viewModel.moveToTop.observe(this@ActivityLogListFragment, {
+            logListView.scrollToPosition(0)
+        })
+
+        viewModel.navigationEvents.observeEvent(viewLifecycleOwner, {
+            navigate(it)
         })
     }
 
-    private fun displayRewindDialog(item: ActivityLogListItem.Event) {
-        val dialog = BasicFragmentDialog()
-        item.rewindId?.let {
-            dialog.initialize(it,
-                    getString(R.string.activity_log_rewind_site),
-                    getString(R.string.activity_log_rewind_dialog_message, item.formattedDate, item.formattedTime),
-                    getString(R.string.activity_log_rewind_site),
-                    getString(R.string.cancel))
-            dialog.show(requireFragmentManager(), it)
+    private fun navigate(events: ActivityLogNavigationEvents) {
+        val trackingSource = when {
+            requireNotNull(
+                    requireActivity().intent.extras?.containsKey(ACTIVITY_LOG_REWINDABLE_ONLY_KEY)
+            ) ->
+                BACKUP_TRACKING_SOURCE
+            else -> {
+                ACTIVITY_LOG_TRACKING_SOURCE
+            }
+        }
+
+        when (events) {
+            is ShowBackupDownload -> ActivityLauncher.showBackupDownloadForResult(
+                    requireActivity(),
+                    viewModel.site,
+                    events.event.activityId,
+                    RequestCodes.BACKUP_DOWNLOAD,
+                    trackingSource
+            )
+            is ShowRestore -> ActivityLauncher.showRestoreForResult(
+                    requireActivity(),
+                    viewModel.site,
+                    events.event.activityId,
+                    RequestCodes.RESTORE,
+                    trackingSource
+            )
+            is DownloadBackupFile -> ActivityLauncher.downloadBackupDownloadFile(requireActivity(), events.url)
+        }
+    }
+
+    private fun showDateRangePicker(initialDateRange: DateRange?) {
+        val picker = MaterialDatePicker.Builder
+                .dateRangePicker()
+                .setTheme(R.style.WordPress_MaterialCalendarFullscreenTheme)
+                .setCalendarConstraints(
+                        CalendarConstraints.Builder()
+                                .setValidator(DateValidatorPointBackward.now())
+                                .setEnd(MaterialDatePicker.todayInUtcMilliseconds())
+                                .build()
+                )
+                .setSelection(initialDateRange)
+                .build()
+        initDateRangePickerButtonClickListener(picker)
+        picker.show(childFragmentManager, DATE_PICKER_TAG)
+    }
+
+    private fun initDateRangePickerButtonClickListener(picker: MaterialDatePicker<Pair<Long, Long>>) {
+        picker.addOnPositiveButtonClickListener { viewModel.onDateRangeSelected(it) }
+    }
+
+    private fun showActivityTypeFilterDialog(
+        remoteSiteId: RemoteId,
+        initialSelection: List<String>,
+        dateRange: DateRange?
+    ) {
+        ActivityLogTypeFilterFragment.newInstance(remoteSiteId, initialSelection, dateRange)
+                .show(childFragmentManager, ACTIVITY_TYPE_FILTER_TAG)
+    }
+
+    private fun updateFilters(uiState: FiltersShown) {
+        with(requireActivity().findViewById<Chip>(R.id.date_range_picker)) {
+            text = uiHelpers.getTextOfUiString(requireContext(), uiState.dateRangeLabel)
+            contentDescription = uiHelpers.getTextOfUiString(requireContext(), uiState.dateRangeLabelContentDescription)
+            isCloseIconVisible = uiState.onClearDateRangeFilterClicked != null
+            setOnCloseIconClickListener { uiState.onClearDateRangeFilterClicked?.invoke() }
+        }
+
+        with(requireActivity().findViewById<Chip>(R.id.activity_type_filter)) {
+            text = uiHelpers.getTextOfUiString(requireContext(), uiState.activityTypeLabel)
+            contentDescription = uiHelpers
+                    .getTextOfUiString(requireContext(), uiState.activityTypeLabelContentDescription)
+            isCloseIconVisible = uiState.onClearActivityTypeFilterClicked != null
+            setOnCloseIconClickListener { uiState.onClearActivityTypeFilterClicked?.invoke() }
         }
     }
 
@@ -144,10 +284,10 @@ class ActivityLogListFragment : Fragment() {
         swipeToRefreshHelper.isRefreshing = eventListStatus == FETCHING
         // We want to show the progress bar at the bottom while loading more but not for initial fetch
         val showLoadMore = eventListStatus == LOADING_MORE
-        progress?.visibility = if (showLoadMore) View.VISIBLE else View.GONE
+        requireActivity().findViewById<View>(R.id.progress)?.visibility = if (showLoadMore) View.VISIBLE else View.GONE
     }
 
-    private fun reloadEvents(data: List<ActivityLogListItem>) {
+    private fun ActivityLogListFragmentBinding.reloadEvents(data: List<ActivityLogListItem>) {
         setEvents(data)
     }
 
@@ -155,17 +295,24 @@ class ActivityLogListFragment : Fragment() {
         viewModel.onItemClicked(item)
     }
 
-    private fun onItemButtonClicked(item: ActivityLogListItem) {
-        viewModel.onActionButtonClicked(item)
+    private fun onSecondaryActionClicked(
+        secondaryAction: ActivityLogListItem.SecondaryAction,
+        item: ActivityLogListItem
+    ): Boolean {
+        return viewModel.onSecondaryActionClicked(secondaryAction, item)
     }
 
-    private fun setEvents(events: List<ActivityLogListItem>) {
+    private fun ActivityLogListFragmentBinding.setEvents(events: List<ActivityLogListItem>) {
         val adapter: ActivityLogAdapter
-        if (log_list_view.adapter == null) {
-            adapter = ActivityLogAdapter(this::onItemClicked, this::onItemButtonClicked)
-            log_list_view.adapter = adapter
+        if (logListView.adapter == null) {
+            adapter = ActivityLogAdapter(
+                    this@ActivityLogListFragment::onItemClicked,
+                    this@ActivityLogListFragment::onSecondaryActionClicked,
+                    uiHelpers
+            )
+            logListView.adapter = adapter
         } else {
-            adapter = log_list_view.adapter as ActivityLogAdapter
+            adapter = logListView.adapter as ActivityLogAdapter
         }
         adapter.updateList(events)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt
index 1f4761acbf6b..a4e4aad55ac7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt
@@ -3,14 +3,14 @@ package org.wordpress.android.ui.activitylog.list
 import androidx.annotation.DrawableRes
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.activity.ActivityLogModel
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Icon.HISTORY
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Icon.MORE
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType.EVENT
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType.FOOTER
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType.HEADER
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType.LOADING
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType.NOTICE
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.ViewType.PROGRESS
 import org.wordpress.android.util.toFormattedDateString
-import org.wordpress.android.util.toFormattedTimeString
 import java.util.Date
 
 sealed class ActivityLogListItem(val type: ViewType) {
@@ -30,32 +30,41 @@ sealed class ActivityLogListItem(val type: ViewType) {
         val rewindId: String?,
         val date: Date,
         override val isButtonVisible: Boolean,
-        val buttonIcon: Icon = HISTORY,
-        val isProgressBarVisible: Boolean = false
+        val buttonIcon: Icon
     ) : ActivityLogListItem(EVENT), IActionableItem {
         val formattedDate: String = date.toFormattedDateString()
-        val formattedTime: String = date.toFormattedTimeString()
         val icon = Icon.fromValue(gridIcon)
         val status = Status.fromValue(eventStatus)
 
-        constructor(model: ActivityLogModel, rewindDisabled: Boolean = false) : this(
-                model.activityID,
-                model.summary,
-                model.content?.text ?: "",
-                model.gridicon,
-                model.status,
-                model.rewindable ?: false,
-                model.rewindID,
-                model.published,
-                isButtonVisible = !rewindDisabled && model.rewindable ?: false)
+        constructor(
+            model: ActivityLogModel,
+            rewindDisabled: Boolean = false
+        ) : this(
+                activityId = model.activityID,
+                title = model.summary,
+                description = model.content?.text ?: "",
+                gridIcon = model.gridicon,
+                eventStatus = model.status,
+                isRewindable = model.rewindable ?: false,
+                rewindId = model.rewindID,
+                date = model.published,
+                isButtonVisible = !rewindDisabled && model.rewindable ?: false,
+                buttonIcon = MORE
+        )
 
         override fun longId(): Long = activityId.hashCode().toLong()
     }
 
     data class Progress(
         val title: String,
-        val description: String
-    ) : ActivityLogListItem(PROGRESS)
+        val description: String,
+        val progressType: Type
+    ) : ActivityLogListItem(PROGRESS) {
+        enum class Type {
+            RESTORE,
+            BACKUP_DOWNLOAD
+        }
+    }
 
     data class Header(val text: String) : ActivityLogListItem(HEADER)
 
@@ -63,12 +72,19 @@ sealed class ActivityLogListItem(val type: ViewType) {
 
     object Loading : ActivityLogListItem(LOADING)
 
+    data class Notice(
+        val label: String,
+        val primaryAction: () -> Unit,
+        val secondaryAction: () -> Unit
+    ) : ActivityLogListItem(NOTICE)
+
     enum class ViewType(val id: Int) {
         EVENT(0),
         PROGRESS(1),
         HEADER(2),
         FOOTER(3),
-        LOADING(4)
+        LOADING(4),
+        NOTICE(5)
     }
 
     enum class Status(val value: String, @DrawableRes val color: Int) {
@@ -110,6 +126,7 @@ sealed class ActivityLogListItem(val type: ViewType) {
         THEMES("themes", R.drawable.ic_themes_white_24dp),
         TRASH("trash", R.drawable.ic_trash_white_24dp),
         USER("user", R.drawable.ic_user_white_24dp),
+        MORE("more", R.drawable.ic_ellipsis_vertical_white_24dp),
         DEFAULT("", R.drawable.ic_notice_white_24dp);
 
         companion object {
@@ -117,4 +134,9 @@ sealed class ActivityLogListItem(val type: ViewType) {
             fun fromValue(value: String?) = map[value] ?: DEFAULT
         }
     }
+
+    enum class SecondaryAction(val itemId: Long) {
+        RESTORE(0),
+        DOWNLOAD_BACKUP(1);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItemMenuAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItemMenuAdapter.kt
new file mode 100644
index 000000000000..40079ef63c86
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItemMenuAdapter.kt
@@ -0,0 +1,79 @@
+package org.wordpress.android.ui.activitylog.list
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.appcompat.content.res.AppCompatResources
+import org.wordpress.android.R
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.SecondaryAction
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.SecondaryAction.DOWNLOAD_BACKUP
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.SecondaryAction.RESTORE
+import org.wordpress.android.util.ColorUtils.setImageResourceWithTint
+import org.wordpress.android.util.getColorResIdFromAttribute
+
+class ActivityLogListItemMenuAdapter(
+    context: Context
+) : BaseAdapter() {
+    private val inflater: LayoutInflater = LayoutInflater.from(context)
+    private val items: List<SecondaryAction> = SecondaryAction.values().toList()
+    override fun getCount(): Int {
+        return items.size
+    }
+
+    override fun getItem(position: Int): Any {
+        return items[position]
+    }
+
+    override fun getItemId(position: Int): Long {
+        return items[position].itemId
+    }
+
+    override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
+        val holder: ActivityListItemMenuHolder
+        val view: View
+        if (convertView == null) {
+            view = inflater.inflate(R.layout.activity_log_list_item_menu_item, parent, false)
+            holder = ActivityListItemMenuHolder(view)
+            view.tag = holder
+        } else {
+            view = convertView
+            holder = view.tag as ActivityListItemMenuHolder
+        }
+
+        val textRes: Int
+        val iconRes: Int
+        val colorRes = view.context.getColorResIdFromAttribute(R.attr.wpColorOnSurfaceMedium)
+        when (items[position]) {
+            RESTORE -> {
+                textRes = R.string.activity_log_item_menu_restore_label
+                iconRes = R.drawable.ic_history_white_24dp
+            }
+            DOWNLOAD_BACKUP -> {
+                textRes = R.string.activity_log_item_menu_download_backup_label
+                iconRes = R.drawable.ic_get_app_white_24dp
+            }
+        }
+        holder.text.setText(textRes)
+        holder.text.setTextColor(
+                AppCompatResources.getColorStateList(
+                        view.context,
+                        colorRes
+                )
+        )
+        setImageResourceWithTint(
+                holder.icon,
+                iconRes,
+                colorRes
+        )
+        return view
+    }
+
+    internal inner class ActivityListItemMenuHolder(view: View) {
+        val text: TextView = view.findViewById(R.id.text)
+        val icon: ImageView = view.findViewById(R.id.image)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt
index cac254251141..ad7df787eab1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt
@@ -1,19 +1,23 @@
 package org.wordpress.android.ui.activitylog.list
 
 import android.os.Bundle
+import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageButton
 import android.widget.ImageView
+import android.widget.ListPopupWindow
 import android.widget.TextView
 import org.wordpress.android.R
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Event
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.SecondaryAction
 import org.wordpress.android.util.ColorUtils
 import org.wordpress.android.util.getColorResIdFromAttribute
 
 class EventItemViewHolder(
     parent: ViewGroup,
     private val itemClickListener: (ActivityLogListItem) -> Unit,
-    private val rewindClickListener: (ActivityLogListItem) -> Unit
+    private val secondaryActionClickListener: (SecondaryAction, ActivityLogListItem) -> Boolean
 ) : ActivityLogViewHolder(parent, R.layout.activity_log_list_event_item) {
     private val summary: TextView = itemView.findViewById(R.id.action_summary)
     private val text: TextView = itemView.findViewById(R.id.action_text)
@@ -24,23 +28,24 @@ class EventItemViewHolder(
     override fun updateChanges(bundle: Bundle) {
         if (bundle.containsKey(ActivityLogDiffCallback.LIST_ITEM_BUTTON_VISIBILITY_KEY)) {
             actionButton.visibility =
-                    if (bundle.getBoolean(ActivityLogDiffCallback.LIST_ITEM_BUTTON_VISIBILITY_KEY))
+                    if (bundle.getBoolean(ActivityLogDiffCallback.LIST_ITEM_BUTTON_VISIBILITY_KEY)) {
                         View.VISIBLE
-                    else
+                    } else {
                         View.GONE
+                    }
         }
     }
 
-    fun bind(activity: ActivityLogListItem.Event) {
+    fun bind(activity: Event) {
         summary.text = activity.title
         text.text = activity.description
 
+        ColorUtils.setImageResourceWithTint(
+                actionButton,
+                activity.buttonIcon.drawable,
+                actionButton.context.getColorResIdFromAttribute(R.attr.wpColorOnSurfaceMedium)
+        )
         if (activity.isButtonVisible) {
-            ColorUtils.setImageResourceWithTint(
-                    actionButton,
-                    activity.buttonIcon.drawable,
-                    actionButton.context.getColorResIdFromAttribute(R.attr.colorPrimary)
-            )
             actionButton.visibility = View.VISIBLE
         } else {
             actionButton.visibility = View.GONE
@@ -49,11 +54,23 @@ class EventItemViewHolder(
         thumbnail.setImageResource(activity.icon.drawable)
         thumbnail.setBackgroundResource(activity.status.color)
         container.setOnClickListener {
-            itemClickListener(activity)
+            itemClickListener(activity.copy(isButtonVisible = actionButton.visibility == View.VISIBLE))
         }
 
-        actionButton.setOnClickListener {
-            rewindClickListener(activity)
+        actionButton.setOnClickListener { renderMoreMenu(activity, it) }
+    }
+
+    private fun renderMoreMenu(event: ActivityLogListItem, v: View) {
+        val popup = ListPopupWindow(v.context)
+        popup.width = v.context.resources.getDimensionPixelSize(R.dimen.menu_item_width)
+        popup.setAdapter(ActivityLogListItemMenuAdapter(v.context))
+        popup.setDropDownGravity(Gravity.END)
+        popup.anchorView = v
+        popup.isModal = true
+        popup.setOnItemClickListener { _, _, _, id ->
+            popup.dismiss()
+            secondaryActionClickListener(SecondaryAction.values()[id.toInt()], event)
         }
+        popup.show()
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/NoticeItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/NoticeItemViewHolder.kt
new file mode 100644
index 000000000000..49e09a350042
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/NoticeItemViewHolder.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.ui.activitylog.list
+
+import android.view.ViewGroup
+import android.widget.TextView
+import org.wordpress.android.R
+import org.wordpress.android.ui.utils.UiHelpers
+
+class NoticeItemViewHolder(parent: ViewGroup) :
+        ActivityLogViewHolder(parent, R.layout.activity_log_list_notice_item) {
+    private val label: TextView = itemView.findViewById(R.id.label)
+    private val primaryButton: TextView = itemView.findViewById(R.id.primary_button)
+    private val secondaryButton: TextView = itemView.findViewById(R.id.secondary_button)
+
+    fun bind(item: ActivityLogListItem.Notice, uiHelpers: UiHelpers) {
+        uiHelpers.setTextOrHide(label, item.label)
+        primaryButton.setOnClickListener { item.primaryAction() }
+        secondaryButton.setOnClickListener { item.secondaryAction() }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterAdapter.kt
new file mode 100644
index 000000000000..8d33099a9a71
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterAdapter.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.ui.activitylog.list.filter
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState.ActivityType
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState.SectionHeader
+import org.wordpress.android.ui.utils.UiHelpers
+
+private const val headerViewType: Int = 1
+private const val activityViewType: Int = 2
+
+class ActivityLogTypeFilterAdapter(private val uiHelpers: UiHelpers) : Adapter<ActivityLogTypeFilterViewHolder>() {
+    private val items = mutableListOf<ListItemUiState>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ActivityLogTypeFilterViewHolder {
+        return when (viewType) {
+            headerViewType -> ActivityLogTypeFilterViewHolder.HeaderViewHolder(parent, uiHelpers)
+            activityViewType -> ActivityLogTypeFilterViewHolder.ActivityTypeViewHolder(parent, uiHelpers)
+            else -> throw IllegalStateException("View type ($viewType) not implemented")
+        }
+    }
+
+    override fun onBindViewHolder(holder: ActivityLogTypeFilterViewHolder, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (items[position]) {
+            is SectionHeader -> headerViewType
+            is ActivityType -> activityViewType
+        }
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    fun update(newItems: List<ListItemUiState>) {
+        val diffResult = DiffUtil.calculateDiff(TypeFilterDiffUtil(items, newItems))
+        items.clear()
+        items.addAll(newItems)
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    private class TypeFilterDiffUtil(
+        val oldItems: List<ListItemUiState>,
+        val newItems: List<ListItemUiState>
+    ) : DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = oldItems[oldItemPosition]
+            val newItem = newItems[newItemPosition]
+            if (oldItem::class != newItem::class) {
+                return false
+            }
+            return when (oldItem) {
+                is SectionHeader -> true
+                is ActivityType -> oldItem.title == (newItem as ActivityType).title
+            }
+        }
+
+        override fun getOldListSize(): Int {
+            return oldItems.size
+        }
+
+        override fun getNewListSize(): Int {
+            return newItems.size
+        }
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldItems[oldItemPosition] == newItems[newItemPosition]
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterFragment.kt
new file mode 100644
index 000000000000..36347a4f3881
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterFragment.kt
@@ -0,0 +1,194 @@
+package org.wordpress.android.ui.activitylog.list.filter
+
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.util.Pair
+import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ActivityLogTypeFilterFragmentBinding
+import org.wordpress.android.databinding.ProgressLayoutBinding
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.Content
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.Error
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.FullscreenLoading
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.ColorUtils
+import org.wordpress.android.util.getColorResIdFromAttribute
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel
+import org.wordpress.android.viewmodel.activitylog.DateRange
+import org.wordpress.android.viewmodel.observeEvent
+import javax.inject.Inject
+
+private const val ARG_INITIAL_SELECTION = "arg_initial_selection"
+private const val ARG_DATE_RANGE_AFTER = "arg_date_range_after"
+private const val ARG_DATE_RANGE_BEFORE = "arg_date_range_before"
+private const val ACTIONS_MENU_GROUP = 1
+
+/**
+ * Show the primary action closer to user's finger.
+ */
+private const val PRIMARY_ACTION_ORDER = 2
+private const val SECONDARY_ACTION_ORDER = 1
+
+/**
+ * Always show the primary action no matter the screen size.
+ */
+private const val PRIMARY_ACTION_SHOW_ALWAYS = true
+private const val SECONDARY_ACTION_SHOW_ALWAYS = false
+
+class ActivityLogTypeFilterFragment : DialogFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var uiHelpers: UiHelpers
+
+    private lateinit var viewModel: ActivityLogTypeFilterViewModel
+
+    override fun getTheme(): Int = R.style.WordPress_FullscreenDialog
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.activity_log_type_filter_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(ActivityLogTypeFilterFragmentBinding.bind(view)) {
+            initToolbar()
+            initRecyclerView()
+            initViewModel()
+        }
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.initToolbar() {
+        toolbarMain.navigationIcon = ColorUtils.applyTintToDrawable(
+                toolbarMain.context, R.drawable.ic_close_white_24dp,
+                toolbarMain.context.getColorResIdFromAttribute(R.attr.colorOnSurface)
+        )
+        toolbarMain.setNavigationContentDescription(R.string.close_dialog_button_desc)
+        toolbarMain.setNavigationOnClickListener { dismiss() }
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.initRecyclerView() {
+        recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+        initAdapter()
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@ActivityLogTypeFilterFragment, viewModelFactory)
+                .get(ActivityLogTypeFilterViewModel::class.java)
+
+        val parentViewModel = ViewModelProvider(requireParentFragment(), viewModelFactory)
+                .get(ActivityLogViewModel::class.java)
+
+        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            uiHelpers.updateVisibility(actionableEmptyView, uiState.errorVisibility)
+            uiHelpers.updateVisibility(recyclerView, uiState.contentVisibility)
+            uiHelpers.updateVisibility(progress.root, uiState.loadingVisibility)
+            refreshMenuItems(uiState)
+            when (uiState) {
+                is FullscreenLoading -> progress.refreshLoadingScreen(uiState)
+                is Error -> refreshErrorScreen(uiState)
+                is Content -> refreshContentScreen(uiState)
+            }
+        })
+        viewModel.dismissDialog.observeEvent(viewLifecycleOwner, {
+            dismiss()
+        })
+
+        val afterDateRangeAvailable = requireNotNull(arguments).containsKey(ARG_DATE_RANGE_AFTER)
+        val beforeDateRangeAvailable = requireNotNull(arguments).containsKey(ARG_DATE_RANGE_BEFORE)
+        val dateRange: DateRange? = if (afterDateRangeAvailable && beforeDateRangeAvailable) {
+            val after = requireNotNull(arguments).getLong(ARG_DATE_RANGE_AFTER)
+            val before = requireNotNull(arguments).getLong(ARG_DATE_RANGE_BEFORE)
+            Pair(after, before)
+        } else if (afterDateRangeAvailable || beforeDateRangeAvailable) {
+            throw IllegalStateException("DateRange is missing after or before date")
+        } else {
+            null
+        }
+        viewModel.start(
+                remoteSiteId = RemoteId(requireNotNull(arguments).getLong(WordPress.REMOTE_SITE_ID)),
+                initialSelection = requireNotNull(arguments).getStringArray(ARG_INITIAL_SELECTION)?.toList()
+                        ?: listOf(),
+                dateRange = dateRange,
+                parentViewModel = parentViewModel
+        )
+    }
+
+    private fun ProgressLayoutBinding.refreshLoadingScreen(uiState: FullscreenLoading) {
+        uiHelpers.setTextOrHide(progressText, uiState.loadingText)
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.refreshErrorScreen(uiState: Error) {
+        actionableEmptyView.image.setImageResource(uiState.image)
+        uiHelpers.setTextOrHide(actionableEmptyView.title, uiState.title)
+        uiHelpers.setTextOrHide(actionableEmptyView.subtitle, uiState.subtitle)
+        uiHelpers.setTextOrHide(actionableEmptyView.button, uiState.buttonText)
+        actionableEmptyView.button.setOnClickListener { uiState.retryAction?.action?.invoke() }
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.refreshContentScreen(uiState: Content) {
+        (recyclerView.adapter as ActivityLogTypeFilterAdapter).update(uiState.items)
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.refreshMenuItems(uiState: ActivityLogTypeFilterViewModel.UiState) {
+        val menu = toolbarMain.menu
+        menu.removeGroup(ACTIONS_MENU_GROUP)
+
+        if (uiState is Content) {
+            addMenuItem(uiState.primaryAction, PRIMARY_ACTION_ORDER, showAlways = PRIMARY_ACTION_SHOW_ALWAYS)
+            addMenuItem(uiState.secondaryAction, SECONDARY_ACTION_ORDER, showAlways = SECONDARY_ACTION_SHOW_ALWAYS)
+        }
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.addMenuItem(
+        action: ActivityLogTypeFilterViewModel.Action,
+        order: Int,
+        showAlways: Boolean
+    ) {
+        val actionLabel = uiHelpers.getTextOfUiString(requireContext(), action.label)
+        toolbarMain.menu.add(ACTIONS_MENU_GROUP, Menu.NONE, order, actionLabel).let {
+            if (showAlways) {
+                it.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
+            } else {
+                it.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
+            }
+            it.setOnMenuItemClickListener {
+                action.action.invoke()
+                true
+            }
+        }
+    }
+
+    private fun ActivityLogTypeFilterFragmentBinding.initAdapter() {
+        recyclerView.adapter = ActivityLogTypeFilterAdapter(uiHelpers)
+    }
+
+    companion object {
+        @JvmStatic
+        fun newInstance(
+            remoteSiteId: RemoteId,
+            initialSelection: List<String>,
+            dateRange: DateRange?
+        ): ActivityLogTypeFilterFragment {
+            val args = Bundle()
+            args.putStringArray(ARG_INITIAL_SELECTION, initialSelection.toTypedArray())
+            dateRange?.first?.let { args.putLong(ARG_DATE_RANGE_AFTER, it) }
+            dateRange?.second?.let { args.putLong(ARG_DATE_RANGE_BEFORE, it) }
+            args.putLong(WordPress.REMOTE_SITE_ID, remoteSiteId.value)
+            return ActivityLogTypeFilterFragment().apply { arguments = args }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewHolder.kt
new file mode 100644
index 000000000000..45dc3c48ed14
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewHolder.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.ui.activitylog.list.filter
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.TextView
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import org.wordpress.android.R
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState.ActivityType
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState.SectionHeader
+import org.wordpress.android.ui.utils.UiHelpers
+
+sealed class ActivityLogTypeFilterViewHolder(internal val parent: ViewGroup, @LayoutRes layout: Int) :
+        RecyclerView.ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
+    abstract fun onBind(uiState: ListItemUiState)
+
+    class ActivityTypeViewHolder(
+        parent: ViewGroup,
+        private val uiHelpers: UiHelpers
+    ) : ActivityLogTypeFilterViewHolder(parent, R.layout.activity_log_type_filter_item) {
+        private val container = itemView.findViewById<ViewGroup>(R.id.container)
+        private val activityType = itemView.findViewById<TextView>(R.id.activity_type)
+        private val checkbox = itemView.findViewById<CheckBox>(R.id.checkbox)
+
+        override fun onBind(uiState: ListItemUiState) {
+            uiState as ActivityType
+            uiHelpers.setTextOrHide(activityType, uiState.title)
+            checkbox.isChecked = uiState.checked
+            container.setOnClickListener {
+                uiState.onClick.invoke()
+            }
+        }
+    }
+
+    class HeaderViewHolder(
+        parent: ViewGroup,
+        private val uiHelpers: UiHelpers
+    ) : ActivityLogTypeFilterViewHolder(parent, R.layout.activity_log_type_filter_header) {
+        private val headerTitle = itemView.findViewById<TextView>(R.id.header_title)
+        override fun onBind(uiState: ListItemUiState) {
+            uiState as SectionHeader
+            uiHelpers.setTextOrHide(headerTitle, uiState.title)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModel.kt
new file mode 100644
index 000000000000..c04e9aba5794
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModel.kt
@@ -0,0 +1,212 @@
+package org.wordpress.android.ui.activitylog.list.filter
+
+import androidx.annotation.DrawableRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchActivityTypesPayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.Content
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.Error
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.FullscreenLoading
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel
+import org.wordpress.android.viewmodel.activitylog.DateRange
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+
+class ActivityLogTypeFilterViewModel @Inject constructor(
+    private val activityLogStore: ActivityLogStore,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+    private lateinit var remoteSiteId: RemoteId
+    private lateinit var parentViewModel: ActivityLogViewModel
+    private lateinit var initialSelection: List<String>
+    private var dateRange: DateRange? = null
+
+    private val _uiState = MutableLiveData<UiState>()
+    val uiState: LiveData<UiState> = _uiState
+
+    private val _dismissDialog = MutableLiveData<Event<Unit>>()
+    val dismissDialog: LiveData<Event<Unit>> = _dismissDialog
+
+    fun start(
+        remoteSiteId: RemoteId,
+        parentViewModel: ActivityLogViewModel,
+        dateRange: DateRange?,
+        initialSelection: List<String>
+    ) {
+        if (isStarted) return
+        isStarted = true
+        this.remoteSiteId = remoteSiteId
+        this.parentViewModel = parentViewModel
+        this.initialSelection = initialSelection
+        this.dateRange = dateRange
+        fetchAvailableActivityTypes()
+    }
+
+    private fun fetchAvailableActivityTypes() {
+        launch {
+            _uiState.value = FullscreenLoading
+            val response = activityLogStore.fetchActivityTypes(
+                    FetchActivityTypesPayload(
+                            remoteSiteId.value,
+                            dateRange?.first?.let { Date(it) },
+                            dateRange?.second?.let { Date(it) }
+                    )
+            )
+            if (response.isError) {
+                _uiState.value = buildErrorUiState()
+            } else {
+                _uiState.value = buildContentUiState(response.activityTypeModels)
+            }
+        }
+    }
+
+    private fun buildErrorUiState() =
+            Error.ConnectionError(Action(UiStringRes(R.string.retry)).apply { action = ::onRetryClicked })
+
+    private suspend fun buildContentUiState(activityTypes: List<ActivityTypeModel>): UiState {
+        return withContext(bgDispatcher) {
+            if (activityTypes.isEmpty()) { return@withContext Error.NoActivitiesError }
+
+            val headerListItem = ListItemUiState.SectionHeader(
+                    UiStringRes(R.string.activity_log_activity_type_filter_header)
+            )
+            val activityTypeListItems: List<ListItemUiState.ActivityType> = activityTypes
+                    .map {
+                        ListItemUiState.ActivityType(
+                                id = it.key,
+                                title = UiStringText("${it.name} (${it.count})"),
+                                onClick = { onItemClicked(it.key) },
+                                checked = initialSelection.contains(it.key)
+                        )
+                    }
+            Content(
+                    listOf(headerListItem) + activityTypeListItems,
+                    primaryAction = Action(label = UiStringRes(R.string.activity_log_activity_type_filter_apply))
+                            .apply { action = { onApplyClicked(activityTypes) } },
+                    secondaryAction = Action(label = UiStringRes(R.string.activity_log_activity_type_filter_clear))
+                            .apply { action = ::onClearClicked }
+            )
+        }
+    }
+
+    private fun onItemClicked(itemId: String) {
+        (_uiState.value as? Content)?.let { content ->
+            val updatedList = content.items.map { itemUiState ->
+                if (itemUiState is ListItemUiState.ActivityType && itemUiState.id == itemId) {
+                    itemUiState.copy(checked = !itemUiState.checked)
+                } else {
+                    itemUiState
+                }
+            }
+            _uiState.postValue(content.copy(items = updatedList))
+        }
+    }
+
+    private fun onApplyClicked(activityTypes: List<ActivityTypeModel>) {
+        val selectedModels = getSelectedActivityTypeIds().mapNotNull { key ->
+            activityTypes.find { model -> model.key == key }
+        }
+        parentViewModel.onActivityTypesSelected(selectedModels)
+        _dismissDialog.value = Event(Unit)
+    }
+
+    private fun onRetryClicked() {
+        fetchAvailableActivityTypes()
+    }
+
+    private fun onClearClicked() {
+        (_uiState.value as? Content)?.let { it ->
+            _uiState.value = it.copy(items = getAllActivityTypeItemsUnchecked(it.items))
+        }
+    }
+
+    private fun getAllActivityTypeItemsUnchecked(listItemUiStates: List<ListItemUiState>): List<ListItemUiState> =
+            listItemUiStates.map { item ->
+                if (item is ListItemUiState.ActivityType) {
+                    item.copy(checked = false)
+                } else {
+                    item
+                }
+            }
+
+    private fun getSelectedActivityTypeIds(): List<String> =
+            (_uiState.value as Content).items
+                    .filterIsInstance(ListItemUiState.ActivityType::class.java)
+                    .filter { it.checked }
+                    .map { it.id }
+
+    sealed class UiState {
+        open val contentVisibility = false
+        open val loadingVisibility = false
+        open val errorVisibility = false
+
+        object FullscreenLoading : UiState() {
+            override val loadingVisibility: Boolean = true
+            val loadingText: UiString = UiStringRes(R.string.loading)
+        }
+
+        sealed class Error : UiState() {
+            override val errorVisibility = true
+            abstract val image: Int
+            abstract val title: UiString
+            abstract val subtitle: UiString
+            open val buttonText: UiString? = null
+            open val retryAction: Action? = null
+
+            data class ConnectionError(override val retryAction: Action) : Error() {
+                @DrawableRes override val image = R.drawable.img_illustration_cloud_off_152dp
+                override val title: UiString = UiStringRes(R.string.activity_log_activity_type_error_title)
+                override val subtitle: UiString = UiStringRes(R.string.activity_log_activity_type_error_subtitle)
+                override val buttonText: UiString = UiStringRes(R.string.retry)
+            }
+
+            object NoActivitiesError : Error() {
+                @DrawableRes override val image = R.drawable.img_illustration_empty_results_216dp
+                override val title = UiStringRes(R.string.activity_log_activity_type_empty_title)
+                override val subtitle = UiStringRes(R.string.activity_log_activity_type_empty_subtitle)
+            }
+        }
+
+        data class Content(
+            val items: List<ListItemUiState>,
+            val primaryAction: Action,
+            val secondaryAction: Action
+        ) : UiState() {
+            override val contentVisibility = true
+        }
+    }
+
+    sealed class ListItemUiState {
+        data class SectionHeader(
+            val title: UiString
+        ) : ListItemUiState()
+
+        data class ActivityType(
+            val id: String,
+            val title: UiString,
+            val checked: Boolean = false,
+            val onClick: (() -> Unit)
+        ) : ListItemUiState()
+    }
+
+    data class Action(val label: UiString) {
+        lateinit var action: (() -> Unit)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java
index 09e652a9de39..ffae6903e58b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java
@@ -2,38 +2,32 @@
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.text.Html;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
-import androidx.core.graphics.ColorUtils;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.DiffUtil.DiffResult;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.jetbrains.annotations.NotNull;
-import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.fluxc.model.AccountModel;
 import org.wordpress.android.fluxc.model.CommentModel;
 import org.wordpress.android.fluxc.model.CommentStatus;
 import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.fluxc.store.CommentStore;
 import org.wordpress.android.models.CommentList;
-import org.wordpress.android.util.AniUtils;
+import org.wordpress.android.ui.comments.CommentListItem.Comment;
+import org.wordpress.android.ui.comments.CommentListItem.CommentListItemType;
+import org.wordpress.android.ui.comments.CommentListItem.SubHeader;
+import org.wordpress.android.ui.utils.UiHelpers;
 import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.ContextExtensionsKt;
 import org.wordpress.android.util.DateTimeUtils;
-import org.wordpress.android.util.GravatarUtils;
-import org.wordpress.android.util.StringUtils;
-import org.wordpress.android.util.ViewUtilsKt;
-import org.wordpress.android.util.WPHtml;
 import org.wordpress.android.util.image.ImageManager;
-import org.wordpress.android.util.image.ImageType;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
@@ -41,7 +35,7 @@
 
 import javax.inject.Inject;
 
-public class CommentAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+public class CommentAdapter extends RecyclerView.Adapter<CommentListViewHolder> {
     interface OnDataLoadedListener {
         void onDataLoaded(boolean isEmpty);
     }
@@ -54,27 +48,15 @@ interface OnSelectedItemsChangeListener {
         void onSelectedItemsChanged();
     }
 
-    interface OnCommentPressedListener {
+    public interface OnCommentPressedListener {
         void onCommentPressed(int position, View view);
 
         void onCommentLongPressed(int position, View view);
     }
 
-    private final LayoutInflater mInflater;
-    private final Context mContext;
-
-    private final CommentList mComments = new CommentList();
+    private final ArrayList<CommentListItem> mComments = new ArrayList<>();
     private final HashSet<Integer> mSelectedPositions = new HashSet<>();
 
-    private final int mStatusColorSpam;
-    private final int mStatusColorUnapproved;
-
-    private int mSelectedItemBackground;
-
-    private final int mAvatarSz;
-    private final String mStatusTextSpam;
-    private final String mStatusTextUnapproved;
-
     private OnDataLoadedListener mOnDataLoadedListener;
     private OnCommentPressedListener mOnCommentPressedListener;
     private OnLoadMoreListener mOnLoadMoreListener;
@@ -83,71 +65,17 @@ interface OnCommentPressedListener {
     private boolean mEnableSelection;
 
     private SiteModel mSite;
+    private Context mContext;
 
     @Inject CommentStore mCommentStore;
     @Inject ImageManager mImageManager;
-
-    class CommentHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
-        private final TextView mTxtTitle;
-        private final TextView mTxtComment;
-        private final TextView mTxtStatus;
-        private final TextView mTxtDate;
-        private final ImageView mImgAvatar;
-        private final ImageView mImgCheckmark;
-        private final ViewGroup mContainerView;
-
-        CommentHolder(View view) {
-            super(view);
-            mTxtTitle = view.findViewById(R.id.title);
-            mTxtComment = view.findViewById(R.id.comment);
-            mTxtStatus = view.findViewById(R.id.status);
-            mTxtDate = view.findViewById(R.id.text_date);
-            mImgCheckmark = view.findViewById(R.id.image_checkmark);
-            mImgAvatar = view.findViewById(R.id.avatar);
-            mContainerView = view.findViewById(R.id.layout_container);
-
-            itemView.setOnClickListener(this);
-            itemView.setOnLongClickListener(this);
-            ViewUtilsKt.redirectContextClickToLongPressListener(itemView);
-        }
-
-        @Override
-        public void onClick(View v) {
-            if (mOnCommentPressedListener != null) {
-                mOnCommentPressedListener.onCommentPressed(getAdapterPosition(), v);
-            }
-        }
-
-        @Override
-        public boolean onLongClick(View v) {
-            if (mOnCommentPressedListener != null) {
-                mOnCommentPressedListener.onCommentLongPressed(getAdapterPosition(), v);
-            }
-            return true;
-        }
-    }
+    @Inject AccountStore mAccountStore;
+    @Inject UiHelpers mUiHelpers;
 
     CommentAdapter(Context context, SiteModel site) {
         ((WordPress) context.getApplicationContext()).component().inject(this);
-
-        mInflater = LayoutInflater.from(context);
-        mContext = context;
-
         mSite = site;
-
-        mStatusColorSpam = ContextExtensionsKt.getColorFromAttribute(context, R.attr.wpColorError);
-        mStatusColorUnapproved = ContextExtensionsKt.getColorFromAttribute(context, R.attr.wpColorWarningDark);
-
-
-        mStatusTextSpam = context.getResources().getString(R.string.comment_status_spam);
-        mStatusTextUnapproved = context.getResources().getString(R.string.comment_status_unapproved);
-
-        mAvatarSz = context.getResources().getDimensionPixelSize(R.dimen.avatar_sz_medium);
-
-        mSelectedItemBackground = ColorUtils
-                .setAlphaComponent(ContextExtensionsKt.getColorFromAttribute(context, R.attr.colorOnSurface),
-                        context.getResources().getInteger(R.integer.selected_list_item_opacity));
-
+        mContext = context;
         setHasStableIds(true);
     }
 
@@ -169,112 +97,40 @@ void setOnSelectedItemsChangeListener(OnSelectedItemsChangeListener listener) {
 
     @NotNull
     @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
-        //noinspection InflateParams
-        View view = mInflater.inflate(R.layout.comment_listitem, null);
-        CommentHolder holder = new CommentHolder(view);
-        view.setTag(holder);
-        return holder;
-    }
-
-    private String getFormattedTitle(CommentModel comment) {
-        String formattedTitle;
-        Context context = WordPress.getContext();
-
-        String author = context.getString(R.string.anonymous);
-        if (!TextUtils.isEmpty(comment.getAuthorName())) {
-            author = comment.getAuthorName().trim();
-        }
-
-        if (!TextUtils.isEmpty(comment.getPostTitle())) {
-            formattedTitle = context.getString(R.string.comment_title, author, comment.getPostTitle().trim());
-        } else {
-            formattedTitle = author;
-        }
-        return formattedTitle;
-    }
-
-    private String getAvatarForDisplay(CommentModel comment, int avatarSize) {
-        String avatarForDisplay = "";
-        if (!TextUtils.isEmpty(comment.getAuthorProfileImageUrl())) {
-            avatarForDisplay = GravatarUtils.fixGravatarUrl(comment.getAuthorProfileImageUrl(), avatarSize);
-        } else if (!TextUtils.isEmpty(comment.getAuthorEmail())) {
-            avatarForDisplay = GravatarUtils.gravatarFromEmail(comment.getAuthorEmail(), avatarSize);
+    public CommentListViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
+        switch (CommentListItemType.fromOrdinal(viewType)) {
+            case HEADER:
+                return new CommentSubHeaderViewHolder(parent);
+            case COMMENT:
+                return new CommentViewHolder(parent, mOnCommentPressedListener, mImageManager, mUiHelpers);
+            default:
+                throw new IllegalArgumentException("Unexpected view holder in CommentListAdapter");
         }
-        return avatarForDisplay;
     }
 
-    private Spanned getSpannedContent(CommentModel comment) {
-        String content = StringUtils.notNullStr(comment.getContent());
-        return WPHtml.fromHtml(content, null, null, mContext, null, 0);
+    @Override
+    public int getItemViewType(int position) {
+        return getItem(position).getType().ordinal();
     }
 
-    private String getFormattedDate(CommentModel comment, Context context) {
+    private String getFormattedDate(CommentModel comment) {
         if (comment.getDatePublished() != null) {
-            return DateTimeUtils.javaDateToTimeSpan(DateTimeUtils.dateFromIso8601(comment.getDatePublished()), context);
+            return DateTimeUtils
+                    .javaDateToTimeSpan(DateTimeUtils.dateFromIso8601(comment.getDatePublished()), mContext);
         }
         return "";
     }
 
     @Override
-    public void onBindViewHolder(@NotNull RecyclerView.ViewHolder viewHolder, int position) {
-        CommentModel comment = mComments.get(position);
-        CommentHolder holder = (CommentHolder) viewHolder;
-
-        // Note: following operation can take some time, we could maybe cache the calculated objects (title, spanned
-        // content) to make the list scroll smoother.
-        holder.mTxtTitle.setText(Html.fromHtml(getFormattedTitle(comment)));
-        holder.mTxtComment.setText(getSpannedContent(comment));
-        holder.mTxtDate.setText(getFormattedDate(comment, mContext));
-
-        // status is only shown for comments that haven't been approved
-        final boolean showStatus;
-        CommentStatus commentStatus = CommentStatus.fromString(comment.getStatus());
-        switch (commentStatus) {
-            case SPAM:
-                showStatus = true;
-                holder.mTxtStatus.setText(mStatusTextSpam);
-                holder.mTxtStatus.setTextColor(mStatusColorSpam);
-                break;
-            case UNAPPROVED:
-                showStatus = true;
-                holder.mTxtStatus.setText(mStatusTextUnapproved);
-                holder.mTxtStatus.setTextColor(mStatusColorUnapproved);
-                break;
-            default:
-                showStatus = false;
-                break;
-        }
-        holder.mTxtStatus.setVisibility(showStatus ? View.VISIBLE : View.GONE);
-
-        int checkmarkVisibility;
-        if (mEnableSelection && isItemSelected(position)) {
-            checkmarkVisibility = View.VISIBLE;
-            mImageManager.cancelRequestAndClearImageView(holder.mImgAvatar);
-            holder.mContainerView.setBackgroundColor(mSelectedItemBackground);
-        } else {
-            checkmarkVisibility = View.GONE;
-            mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND,
-                    getAvatarForDisplay(comment, mAvatarSz));
-            holder.mContainerView.setBackground(null);
-        }
-
-        if (holder.mImgCheckmark.getVisibility() != checkmarkVisibility) {
-            holder.mImgCheckmark.setVisibility(checkmarkVisibility);
-        }
-
-        // comment text needs to be to the left of date/status when the title is a single line and
-        // the status is displayed or else the status may overlap the comment text - note that
-        // getLineCount() will return 0 if the view hasn't been rendered yet, which is why we
-        // check getLineCount() <= 1
-        boolean adjustComment = (showStatus && holder.mTxtTitle.getLineCount() <= 1);
-        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) holder.mTxtComment.getLayoutParams();
-        if (adjustComment) {
-            params.addRule(RelativeLayout.LEFT_OF, R.id.layout_date_status);
-        } else {
-            params.addRule(RelativeLayout.LEFT_OF, 0);
+    public void onBindViewHolder(@NonNull CommentListViewHolder viewHolder, int position,
+                                 @NonNull List<Object> payloads) {
+        if (viewHolder instanceof CommentSubHeaderViewHolder) {
+            ((CommentSubHeaderViewHolder) viewHolder).bind((SubHeader) mComments.get(position));
+        } else if (viewHolder instanceof CommentViewHolder) {
+            ((CommentViewHolder) viewHolder).bind(
+                    (Comment) mComments.get(position),
+                    mEnableSelection && isItemSelected(position));
         }
-
         // request to load more comments when we near the end
         if (mOnLoadMoreListener != null && position >= getItemCount() - 1
             && position >= CommentsListFragment.COMMENTS_PER_PAGE - 1) {
@@ -282,7 +138,12 @@ public void onBindViewHolder(@NotNull RecyclerView.ViewHolder viewHolder, int po
         }
     }
 
-    public CommentModel getItem(int position) {
+    @Override
+    public void onBindViewHolder(@NotNull CommentListViewHolder viewHolder, int position) {
+        onBindViewHolder(viewHolder, position, new ArrayList<>());
+    }
+
+    public CommentListItem getItem(int position) {
         if (isPositionValid(position)) {
             return mComments.get(position);
         } else {
@@ -292,7 +153,7 @@ public CommentModel getItem(int position) {
 
     @Override
     public long getItemId(int position) {
-        return mComments.get(position).getRemoteCommentId();
+        return getItem(position).getId();
     }
 
     @Override
@@ -300,6 +161,16 @@ public int getItemCount() {
         return mComments.size();
     }
 
+    public int getNumberOfComments() {
+        int counter = 0;
+        for (CommentListItem subHeader : mComments) {
+            if (subHeader instanceof Comment) {
+                counter++;
+            }
+        }
+        return counter;
+    }
+
     private boolean isEmpty() {
         return getItemCount() == 0;
     }
@@ -310,9 +181,7 @@ void setEnableSelection(boolean enable) {
         }
 
         mEnableSelection = enable;
-        if (mEnableSelection) {
-            notifyDataSetChanged();
-        } else {
+        if (!mEnableSelection) {
             clearSelectedComments();
         }
     }
@@ -339,7 +208,7 @@ CommentList getSelectedComments() {
 
         for (Integer position : mSelectedPositions) {
             if (isPositionValid(position)) {
-                comments.add(mComments.get(position));
+                comments.add(((Comment) mComments.get(position)).getComment());
             }
         }
 
@@ -363,13 +232,6 @@ void setItemSelected(int position, boolean isSelected, View view) {
 
         notifyItemChanged(position);
 
-        if (view != null && view.getTag() instanceof CommentHolder) {
-            CommentHolder holder = (CommentHolder) view.getTag();
-            // animate the selection change
-            AniUtils.startAnimation(holder.mImgCheckmark, isSelected ? R.anim.cab_select : R.anim.cab_deselect);
-            holder.mImgCheckmark.setVisibility(isSelected ? View.VISIBLE : View.GONE);
-        }
-
         if (mOnSelectedChangeListener != null) {
             mOnSelectedChangeListener.onSelectedItemsChanged();
         }
@@ -380,7 +242,15 @@ void toggleItemSelected(int position, View view) {
     }
 
     private int indexOfCommentId(long commentId) {
-        return mComments.indexOfCommentId(commentId);
+        for (int i = 0; i < getItemCount(); i++) {
+            CommentListItem commentListItem = getItem(i);
+            if (commentListItem instanceof Comment) {
+                if (((Comment) commentListItem).getComment().getRemoteCommentId() == commentId) {
+                    return i;
+                }
+            }
+        }
+        return -1;
     }
 
     private boolean isPositionValid(int position) {
@@ -395,24 +265,44 @@ public void removeComment(CommentModel comment) {
         }
     }
 
+    void loadInitialCachedComments(CommentStatus statusFilter) {
+        loadComments(statusFilter, new LoadCommentsTaskParameters(0, true, false));
+    }
+
+    void reloadComments(CommentStatus statusFilter) {
+        loadComments(statusFilter, new LoadCommentsTaskParameters(0, false, true));
+    }
+
+    void loadMoreComments(CommentStatus statusFilter, int offset) {
+        loadComments(statusFilter, new LoadCommentsTaskParameters(offset, false, false));
+    }
+
     /*
      * load comments using an AsyncTask
      */
-    void loadComments(CommentStatus statusFilter) {
+    private void loadComments(CommentStatus statusFilter, LoadCommentsTaskParameters params) {
         if (mIsLoadTaskRunning) {
             AppLog.w(AppLog.T.COMMENTS, "load comments task already active");
         } else {
-            new LoadCommentsTask(statusFilter).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            new LoadCommentsTask(statusFilter).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
         }
     }
 
+    public void loadData(ArrayList<CommentListItem> commentListItems) {
+        DiffResult diffResult = DiffUtil.calculateDiff(
+                new CommentListItemDiffCallback(mComments, commentListItems));
+        mComments.clear();
+        mComments.addAll(commentListItems);
+        diffResult.dispatchUpdatesTo(this);
+    }
+
     /*
      * AsyncTask to load comments from SQLite
      */
     private boolean mIsLoadTaskRunning = false;
 
-    private class LoadCommentsTask extends AsyncTask<Void, Void, Boolean> {
-        private CommentList mTmpComments;
+    private class LoadCommentsTask extends AsyncTask<LoadCommentsTaskParameters, Void, Boolean> {
+        private ArrayList<CommentListItem> mTmpComments;
         final CommentStatus mStatusFilter;
 
         LoadCommentsTask(CommentStatus statusFilter) {
@@ -430,37 +320,117 @@ protected void onCancelled() {
         }
 
         @Override
-        protected Boolean doInBackground(Void... params) {
+        protected Boolean doInBackground(LoadCommentsTaskParameters... params) {
+            LoadCommentsTaskParameters parameters = params[0];
+            int numOfCommentsToFetch;
+            // UNREPLIED filter has no paging, so we always request MAX_COMMENTS_IN_RESPONSE
+            if (mStatusFilter == CommentStatus.UNREPLIED) {
+                numOfCommentsToFetch = CommentsListFragment.MAX_COMMENTS_IN_RESPONSE;
+            } else if (parameters.mIsLoadingCache) {
+                numOfCommentsToFetch = CommentsListFragment.COMMENTS_PER_PAGE;
+            } else if (parameters.mIsReloadingContent) {
+                // round up to nearest page size (eg. 30, 60, 90, etc.)
+                numOfCommentsToFetch = ((getNumberOfComments() + CommentsListFragment.COMMENTS_PER_PAGE - 1)
+                                        / CommentsListFragment.COMMENTS_PER_PAGE)
+                                       * CommentsListFragment.COMMENTS_PER_PAGE;
+            } else {
+                numOfCommentsToFetch = CommentsListFragment.COMMENTS_PER_PAGE + parameters.mOffset;
+            }
+
             List<CommentModel> comments;
-            if (mStatusFilter == null || mStatusFilter == CommentStatus.ALL) {
+            if (mStatusFilter == null || mStatusFilter == CommentStatus.ALL
+                || mStatusFilter == CommentStatus.UNREPLIED) {
                 // The "all" filter actually means "approved" + "unapproved" (but not "spam", "trash" or "deleted")
-                comments = mCommentStore.getCommentsForSite(mSite, false,
-                        CommentStatus.APPROVED, CommentStatus.UNAPPROVED);
+                comments = mCommentStore.getCommentsForSite(mSite, false, numOfCommentsToFetch, CommentStatus.APPROVED,
+                        CommentStatus.UNAPPROVED);
             } else {
-                comments = mCommentStore.getCommentsForSite(mSite, false, mStatusFilter);
+                comments = mCommentStore.getCommentsForSite(mSite, false, numOfCommentsToFetch,
+                        mStatusFilter);
             }
 
-            mTmpComments = new CommentList();
-            mTmpComments.addAll(comments);
+            if (mStatusFilter == CommentStatus.UNREPLIED) {
+                comments = getUnrepliedComments(comments);
+            }
+
+            // Sort by date
+            Collections.sort(comments, (commentModelX, commentModelY) -> {
+                Date d0 = DateTimeUtils.dateFromIso8601(commentModelX.getDatePublished());
+                Date d1 = DateTimeUtils.dateFromIso8601(commentModelY.getDatePublished());
+                if (d0 == null || d1 == null) {
+                    return 0;
+                }
+                return d1.compareTo(d0);
+            });
+
+            mTmpComments = new ArrayList<>();
+            for (CommentModel comment : comments) {
+                Comment commentListItem = new Comment(comment);
+
+                if (!mTmpComments.isEmpty()) {
+                    Comment lastItem = (Comment) mTmpComments.get(mTmpComments.size() - 1);
+                    if (lastItem == null || !getFormattedDate(lastItem.getComment())
+                            .equals(getFormattedDate(comment))) {
+                        mTmpComments.add(
+                                new SubHeader(getFormattedDate(comment), comment.getPublishedTimestamp() * -10));
+                    }
+                } else {
+                    mTmpComments.add(
+                            new SubHeader(getFormattedDate(comment), comment.getPublishedTimestamp() * -10));
+                }
+
+                mTmpComments.add(commentListItem);
+            }
 
-            return !mComments.isSameList(mTmpComments);
+            return true;
+        }
+
+        private ArrayList<CommentModel> getUnrepliedComments(List<CommentModel> comments) {
+            CommentLeveler leveler = new CommentLeveler(comments);
+            ArrayList<CommentModel> leveledComments = leveler.createLevelList();
+
+            ArrayList<CommentModel> topLevelComments = new ArrayList<>();
+            for (CommentModel comment : leveledComments) {
+                // only check top level comments
+                if (comment.level == 0) {
+                    ArrayList<CommentModel> childrenComments = leveler.getChildren(comment.getRemoteCommentId());
+                    // comment is not mine and has no replies
+                    if (!isMyComment(comment) && childrenComments.isEmpty()) {
+                        topLevelComments.add(comment);
+                    } else if (!isMyComment(comment)) {  // comment is not mine and has replies
+                        boolean hasMyReplies = false;
+                        for (CommentModel childrenComment : childrenComments) { // check if any replies are mine
+                            if (isMyComment(childrenComment)) {
+                                hasMyReplies = true;
+                                break;
+                            }
+                        }
+
+                        if (!hasMyReplies) {
+                            topLevelComments.add(comment);
+                        }
+                    }
+                }
+            }
+            return topLevelComments;
+        }
+
+        private boolean isMyComment(CommentModel comment) {
+            String myEmail;
+            // if site is self hosted, we want to use email associate with it, even if we are logged into wpcom
+            if (!mSite.isUsingWpComRestApi()) {
+                myEmail = mSite.getEmail();
+            } else {
+                AccountModel account = mAccountStore.getAccount();
+                myEmail = account.getEmail();
+            }
+
+            return comment.getAuthorEmail().equals(myEmail);
         }
 
         @Override
         protected void onPostExecute(Boolean result) {
             if (result) {
-                mComments.clear();
-                mComments.addAll(mTmpComments);
-                // Sort by date
-                Collections.sort(mComments, (commentModel, t1) -> {
-                    Date d0 = DateTimeUtils.dateFromIso8601(commentModel.getDatePublished());
-                    Date d1 = DateTimeUtils.dateFromIso8601(t1.getDatePublished());
-                    if (d0 == null || d1 == null) {
-                        return 0;
-                    }
-                    return d1.compareTo(d0);
-                });
-                notifyDataSetChanged();
+                loadData(mTmpComments);
             }
 
             if (mOnDataLoadedListener != null) {
@@ -470,4 +440,16 @@ protected void onPostExecute(Boolean result) {
             mIsLoadTaskRunning = false;
         }
     }
+
+    static class LoadCommentsTaskParameters {
+        int mOffset;
+        boolean mIsLoadingCache;
+        boolean mIsReloadingContent;
+
+        LoadCommentsTaskParameters(int offset, boolean isLoadingCache, boolean isReloadingContent) {
+            mOffset = offset;
+            mIsLoadingCache = isLoadingCache;
+            mIsReloadingContent = isReloadingContent;
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
index 3b1058330a77..938de13c566c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java
@@ -45,7 +45,7 @@
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.datasets.NotificationsTable;
 import org.wordpress.android.datasets.ReaderPostTable;
-import org.wordpress.android.datasets.SuggestionTable;
+import org.wordpress.android.datasets.UserSuggestionTable;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.action.CommentAction;
 import org.wordpress.android.fluxc.generated.CommentActionBuilder;
@@ -62,10 +62,12 @@
 import org.wordpress.android.fluxc.tools.FluxCImageLoader;
 import org.wordpress.android.models.Note;
 import org.wordpress.android.models.Note.EnabledActions;
-import org.wordpress.android.models.Suggestion;
+import org.wordpress.android.models.UserSuggestion;
 import org.wordpress.android.ui.ActivityId;
 import org.wordpress.android.ui.CollapseFullScreenDialogFragment;
 import org.wordpress.android.ui.CollapseFullScreenDialogFragment.Builder;
+import org.wordpress.android.ui.CollapseFullScreenDialogFragment.OnCollapseListener;
+import org.wordpress.android.ui.CollapseFullScreenDialogFragment.OnConfirmListener;
 import org.wordpress.android.ui.CommentFullScreenDialogFragment;
 import org.wordpress.android.ui.ViewPagerFragment;
 import org.wordpress.android.ui.comments.CommentActions.OnCommentActionListener;
@@ -77,6 +79,7 @@
 import org.wordpress.android.ui.reader.ReaderAnim;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.actions.ReaderPostActions;
+import org.wordpress.android.ui.suggestion.Suggestion;
 import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter;
 import org.wordpress.android.ui.suggestion.service.SuggestionEvents;
 import org.wordpress.android.ui.suggestion.util.SuggestionServiceConnectionManager;
@@ -96,6 +99,7 @@
 import org.wordpress.android.util.ViewUtilsKt;
 import org.wordpress.android.util.WPLinkMovementMethod;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
 import org.wordpress.android.widgets.SuggestionAutoCompleteText;
@@ -111,7 +115,8 @@
  * comment detail displayed from both the notification list and the comment list
  * prior to this there were separate comment detail screens for each list
  */
-public class CommentDetailFragment extends ViewPagerFragment implements NotificationFragment {
+public class CommentDetailFragment extends ViewPagerFragment implements NotificationFragment, OnConfirmListener,
+        OnCollapseListener {
     private static final String KEY_MODE = "KEY_MODE";
     private static final String KEY_SITE_LOCAL_ID = "KEY_SITE_LOCAL_ID";
     private static final String KEY_COMMENT_ID = "KEY_COMMENT_ID";
@@ -119,8 +124,22 @@ public class CommentDetailFragment extends ViewPagerFragment implements Notifica
     private static final String KEY_REPLY_TEXT = "KEY_REPLY_TEXT";
 
     private static final int INTENT_COMMENT_EDITOR = 1010;
-    private static final int FROM_BLOG_COMMENT = 1;
-    private static final int FROM_NOTE = 2;
+
+    enum CommentSource {
+        NOTIFICATION,
+        SITE_COMMENTS;
+
+        AnalyticsCommentActionSource toAnalyticsCommentActionSource() {
+            switch (this) {
+                case NOTIFICATION:
+                    return AnalyticsCommentActionSource.NOTIFICATIONS;
+                case SITE_COMMENTS:
+                    return AnalyticsCommentActionSource.SITE_COMMENTS;
+            }
+            throw new IllegalArgumentException(
+                    this + " CommentSource is not mapped to corresponding AnalyticsCommentActionSource");
+        }
+    }
 
     private CommentModel mComment;
     private SiteModel mSite;
@@ -167,6 +186,8 @@ public class CommentDetailFragment extends ViewPagerFragment implements Notifica
     private OnCommentActionListener mOnCommentActionListener;
     private OnNoteCommentActionListener mOnNoteCommentActionListener;
 
+    private CommentSource mCommentSource;
+
     /*
      * these determine which actions (moderation, replying, marking as spam) to enable
      * for this comment - all actions are enabled when opened from the comment list, only
@@ -180,7 +201,7 @@ public class CommentDetailFragment extends ViewPagerFragment implements Notifica
     static CommentDetailFragment newInstance(SiteModel site, CommentModel commentModel) {
         CommentDetailFragment fragment = new CommentDetailFragment();
         Bundle args = new Bundle();
-        args.putInt(KEY_MODE, FROM_BLOG_COMMENT);
+        args.putSerializable(KEY_MODE, CommentSource.SITE_COMMENTS);
         args.putInt(KEY_SITE_LOCAL_ID, site.getId());
         args.putLong(KEY_COMMENT_ID, commentModel.getRemoteCommentId());
         fragment.setArguments(args);
@@ -193,7 +214,7 @@ static CommentDetailFragment newInstance(SiteModel site, CommentModel commentMod
     public static CommentDetailFragment newInstance(final String noteId, final String replyText) {
         CommentDetailFragment fragment = new CommentDetailFragment();
         Bundle args = new Bundle();
-        args.putInt(KEY_MODE, FROM_NOTE);
+        args.putSerializable(KEY_MODE, CommentSource.NOTIFICATION);
         args.putString(KEY_NOTE_ID, noteId);
         args.putString(KEY_REPLY_TEXT, replyText);
         fragment.setArguments(args);
@@ -205,11 +226,13 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getActivity().getApplication()).component().inject(this);
 
-        switch (getArguments().getInt(KEY_MODE)) {
-            case FROM_BLOG_COMMENT:
+        mCommentSource = (CommentSource) getArguments().getSerializable(KEY_MODE);
+
+        switch (mCommentSource) {
+            case SITE_COMMENTS:
                 setComment(getArguments().getLong(KEY_COMMENT_ID), getArguments().getInt(KEY_SITE_LOCAL_ID));
                 break;
-            case FROM_NOTE:
+            case NOTIFICATION:
                 setNote(getArguments().getString(KEY_NOTE_ID));
                 setReplyText(getArguments().getString(KEY_REPLY_TEXT));
                 break;
@@ -306,6 +329,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         ViewUtilsKt.redirectContextClickToLongPressListener(mSubmitReplyBtn);
 
         mEditReply = mLayoutReply.findViewById(R.id.edit_comment);
+        mEditReply.initializeWithPrefix('@');
         mEditReply.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -333,27 +357,14 @@ public void afterTextChanged(Editable s) {
 
                     new Builder(requireContext())
                             .setTitle(R.string.comment)
-                            .setOnCollapseListener(result -> {
-                                if (result != null) {
-                                    mEditReply.setText(result.getString(CommentFullScreenDialogFragment.RESULT_REPLY));
-                                    mEditReply.setSelection(result.getInt(
-                                            CommentFullScreenDialogFragment.RESULT_SELECTION_START),
-                                            result.getInt(CommentFullScreenDialogFragment.RESULT_SELECTION_END));
-                                    mEditReply.requestFocus();
-                                }
-                            })
-                            .setOnConfirmListener(result -> {
-                                if (result != null) {
-                                    mEditReply.setText(result.getString(CommentFullScreenDialogFragment.RESULT_REPLY));
-                                    submitReply();
-                                }
-                            })
+                            .setOnCollapseListener(this)
+                            .setOnConfirmListener(this)
                             .setContent(CommentFullScreenDialogFragment.class, bundle)
                             .setAction(R.string.send)
                             .setHideActivityBar(true)
                             .build()
                             .show(requireActivity().getSupportFragmentManager(),
-                                    CollapseFullScreenDialogFragment.TAG);
+                                    CollapseFullScreenDialogFragment.TAG + getCommentSpecificFragmentTagSuffix());
                 }
         );
         buttonExpand.setOnLongClickListener(v -> {
@@ -417,6 +428,29 @@ public void afterTextChanged(Editable s) {
         return view;
     }
 
+    private String getCommentSpecificFragmentTagSuffix() {
+        return "_" + mComment.getRemoteSiteId() + "_" + mComment.getRemoteCommentId();
+    }
+
+    @Override
+    public void onConfirm(@Nullable Bundle result) {
+        if (result != null) {
+            mEditReply.setText(result.getString(CommentFullScreenDialogFragment.RESULT_REPLY));
+            submitReply();
+        }
+    }
+
+    @Override
+    public void onCollapse(@Nullable Bundle result) {
+        if (result != null) {
+            mEditReply.setText(result.getString(CommentFullScreenDialogFragment.RESULT_REPLY));
+            mEditReply.setSelection(result.getInt(
+                    CommentFullScreenDialogFragment.RESULT_SELECTION_START),
+                    result.getInt(CommentFullScreenDialogFragment.RESULT_SELECTION_END));
+            mEditReply.requestFocus();
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -427,6 +461,17 @@ public void onResume() {
             setNote(mRestoredNoteId);
             mRestoredNoteId = null;
         }
+
+        // reattach listeners to collapsible reply dialog
+        // we need to to it in onResume to make sure mComment is already intialized
+        CollapseFullScreenDialogFragment fragment =
+                (CollapseFullScreenDialogFragment) requireActivity().getSupportFragmentManager().findFragmentByTag(
+                        CollapseFullScreenDialogFragment.TAG + getCommentSpecificFragmentTagSuffix());
+
+        if (fragment != null && fragment.isAdded()) {
+            fragment.setOnCollapseListener(this);
+            fragment.setOnConfirmListener(this);
+        }
     }
 
     private void setupSuggestionServiceAndAdapter() {
@@ -434,7 +479,7 @@ private void setupSuggestionServiceAndAdapter() {
             return;
         }
         mSuggestionServiceConnectionManager = new SuggestionServiceConnectionManager(getActivity(), mSite.getSiteId());
-        mSuggestionAdapter = SuggestionUtils.setupSuggestions(mSite, getActivity(),
+        mSuggestionAdapter = SuggestionUtils.setupUserSuggestions(mSite, getActivity(),
                 mSuggestionServiceConnectionManager);
         if (mSuggestionAdapter != null) {
             mEditReply.setAdapter(mSuggestionAdapter);
@@ -572,9 +617,13 @@ public void onStop() {
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(SuggestionEvents.SuggestionNameListUpdated event) {
         // check if the updated suggestions are for the current blog and update the suggestions
-        if (event.mRemoteBlogId != 0 && mSite != null
-            && event.mRemoteBlogId == mSite.getSiteId() && mSuggestionAdapter != null) {
-            List<Suggestion> suggestions = SuggestionTable.getSuggestionsForSite(event.mRemoteBlogId);
+        if (event.mRemoteBlogId != 0
+            && mSite != null
+            && event.mRemoteBlogId == mSite.getSiteId()
+            && mSuggestionAdapter != null
+        ) {
+            List<UserSuggestion> userSuggestions = UserSuggestionTable.getSuggestionsForSite(event.mRemoteBlogId);
+            List<Suggestion> suggestions = Suggestion.Companion.fromUserSuggestions(userSuggestions);
             mSuggestionAdapter.setSuggestionList(suggestions);
         }
     }
@@ -589,6 +638,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == INTENT_COMMENT_EDITOR && resultCode == Activity.RESULT_OK) {
             reloadComment();
+            AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_EDITED,
+                    mCommentSource.toAnalyticsCommentActionSource(), mSite);
         }
     }
 
@@ -612,6 +663,8 @@ private void editComment() {
         if (!isAdded() || mComment == null) {
             return;
         }
+        AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_EDITOR_OPENED,
+                mCommentSource.toAnalyticsCommentActionSource(), mSite);
         // IMPORTANT: don't use getActivity().startActivityForResult() or else onActivityResult()
         // won't be called in this fragment
         // https://code.google.com/p/android/issues/detail?id=15394#c45
@@ -800,28 +853,29 @@ private void showPostTitle(final SiteModel site, final long postId) {
             // the title if it wasn't set above
             if (!postExists) {
                 AppLog.d(T.COMMENTS, "comment detail > retrieving post");
-                ReaderPostActions.requestBlogPost(site.getSiteId(), postId, new ReaderActions.OnRequestListener() {
-                    @Override
-                    public void onSuccess() {
-                        if (!isAdded()) {
-                            return;
-                        }
-
-                        // update title if it wasn't set above
-                        if (!hasTitle) {
-                            String postTitle = ReaderPostTable.getPostTitle(site.getSiteId(), postId);
-                            if (!TextUtils.isEmpty(postTitle)) {
-                                setPostTitle(txtPostTitle, postTitle, true);
-                            } else {
-                                txtPostTitle.setText(R.string.untitled);
+                ReaderPostActions
+                        .requestBlogPost(site.getSiteId(), postId, new ReaderActions.OnRequestListener<String>() {
+                            @Override
+                            public void onSuccess(String blogUrl) {
+                                if (!isAdded()) {
+                                    return;
+                                }
+
+                                // update title if it wasn't set above
+                                if (!hasTitle) {
+                                    String postTitle = ReaderPostTable.getPostTitle(site.getSiteId(), postId);
+                                    if (!TextUtils.isEmpty(postTitle)) {
+                                        setPostTitle(txtPostTitle, postTitle, true);
+                                    } else {
+                                        txtPostTitle.setText(R.string.untitled);
+                                    }
+                                }
                             }
-                        }
-                    }
 
-                    @Override
-                    public void onFailure(int statusCode) {
-                    }
-                });
+                            @Override
+                            public void onFailure(int statusCode) {
+                            }
+                        });
             }
 
             txtPostTitle.setOnClickListener(v -> {
@@ -838,19 +892,50 @@ public void onFailure(int statusCode) {
         }
     }
 
-    private void trackModerationFromNotification(final CommentStatus newStatus) {
+    // TODO klymyam remove legacy comment tracking after new comments are shipped and new funnels are made
+    private void trackModerationEvent(final CommentStatus newStatus) {
         switch (newStatus) {
             case APPROVED:
-                AnalyticsTracker.track(Stat.NOTIFICATION_APPROVED);
+                if (mCommentSource == CommentSource.NOTIFICATION) {
+                    AnalyticsTracker.track(Stat.NOTIFICATION_APPROVED);
+                }
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_APPROVED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
                 break;
             case UNAPPROVED:
-                AnalyticsTracker.track(Stat.NOTIFICATION_UNAPPROVED);
+                if (mCommentSource == CommentSource.NOTIFICATION) {
+                    AnalyticsTracker.track(Stat.NOTIFICATION_UNAPPROVED);
+                }
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_UNAPPROVED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
                 break;
             case SPAM:
-                AnalyticsTracker.track(Stat.NOTIFICATION_FLAGGED_AS_SPAM);
+                if (mCommentSource == CommentSource.NOTIFICATION) {
+                    AnalyticsTracker.track(Stat.NOTIFICATION_FLAGGED_AS_SPAM);
+                }
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_SPAMMED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
+                break;
+            case UNSPAM:
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_UNSPAMMED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
                 break;
             case TRASH:
-                AnalyticsTracker.track(Stat.NOTIFICATION_TRASHED);
+                if (mCommentSource == CommentSource.NOTIFICATION) {
+                    AnalyticsTracker.track(Stat.NOTIFICATION_TRASHED);
+                }
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_TRASHED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
+                break;
+            case UNTRASH:
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_UNTRASHED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
+                break;
+            case DELETED:
+                AnalyticsUtils.trackCommentActionWithSiteDetails(Stat.COMMENT_DELETED,
+                        mCommentSource.toAnalyticsCommentActionSource(), mSite);
+                break;
+            case ALL:
                 break;
         }
     }
@@ -868,10 +953,23 @@ private void moderateComment(CommentStatus newStatus) {
 
         mPreviousStatus = mComment.getStatus();
 
+        // Restoring comment from trash or spam works by approving it, but we want to track the actual action
+        // instead of generic Approve action
+        CommentStatus statusToTrack;
+        if (CommentStatus.fromString(mPreviousStatus) == CommentStatus.SPAM && newStatus == CommentStatus.APPROVED) {
+            statusToTrack = CommentStatus.UNSPAM;
+        } else if (CommentStatus.fromString(mPreviousStatus) == CommentStatus.TRASH
+                   && newStatus == CommentStatus.APPROVED) {
+            statusToTrack = CommentStatus.UNTRASH;
+        } else {
+            statusToTrack = newStatus;
+        }
+
+        trackModerationEvent(statusToTrack);
+
         // Fire the appropriate listener if we have one
         if (mNote != null && mOnNoteCommentActionListener != null) {
             mOnNoteCommentActionListener.onModerateCommentForNote(mNote, newStatus);
-            trackModerationFromNotification(newStatus);
             dispatchModerationAction(newStatus);
         } else if (mOnCommentActionListener != null) {
             mOnCommentActionListener.onModerateComment(mSite, mComment, newStatus);
@@ -920,7 +1018,8 @@ private void submitReply() {
 
         mIsSubmittingReply = true;
 
-        AnalyticsUtils.trackCommentReplyWithDetails(false, mSite, mComment);
+        AnalyticsUtils.trackCommentReplyWithDetails(
+                false, mSite, mComment, mCommentSource.toAnalyticsCommentActionSource());
 
         // Pseudo comment reply
         CommentModel reply = new CommentModel();
@@ -1037,7 +1136,6 @@ private void performModerateAction() {
         announceCommentStatusChangeForAccessibility(
                 currentStatus == CommentStatus.TRASH ? CommentStatus.UNTRASH : newStatus);
 
-        mComment.setStatus(newStatus.toString());
         setModerateButtonForStatus(newStatus);
         AniUtils.startAnimation(mBtnModerateIcon, R.anim.notifications_button_scale);
         moderateComment(newStatus);
@@ -1167,7 +1265,13 @@ private void likeComment(boolean forceLike) {
         ReaderAnim.animateLikeButton(mBtnLikeIcon, mBtnLikeComment.isActivated());
 
         // Bump analytics
-        AnalyticsTracker.track(mBtnLikeComment.isActivated() ? Stat.NOTIFICATION_LIKED : Stat.NOTIFICATION_UNLIKED);
+        // TODO klymyam remove legacy comment tracking after new comments are shipped and new funnels are made
+        if (mCommentSource == CommentSource.NOTIFICATION) {
+            AnalyticsTracker.track(mBtnLikeComment.isActivated() ? Stat.NOTIFICATION_LIKED : Stat.NOTIFICATION_UNLIKED);
+        }
+        AnalyticsUtils.trackCommentActionWithSiteDetails(
+                mBtnLikeComment.isActivated() ? Stat.COMMENT_LIKED : Stat.COMMENT_UNLIKED,
+                mCommentSource.toAnalyticsCommentActionSource(), mSite);
 
         if (mNotificationsDetailListFragment != null && mComment != null) {
             // Optimistically set comment to approved when liking an unapproved comment
@@ -1261,6 +1365,16 @@ private void onCommentCreated(OnCommentChanged event) {
             mEditReply.getAutoSaveTextHelper().clearSavedText(mEditReply);
         }
 
+        // Self Hosted site does not return a newly created comment, so we need to fetch it manually.
+        if (!mSite.isUsingWpComRestApi() && !event.changedCommentsLocalIds.isEmpty()) {
+            CommentModel createdComment = mCommentStore.getCommentByLocalId(event.changedCommentsLocalIds.get(0));
+
+            if (createdComment != null) {
+                mDispatcher.dispatch(CommentActionBuilder.newFetchCommentAction(
+                        new RemoteCommentPayload(mSite, createdComment.getRemoteCommentId())));
+            }
+        }
+
         // approve the comment
         if (mComment != null && !(CommentStatus.fromString(mComment.getStatus()) == CommentStatus.APPROVED)) {
             moderateComment(CommentStatus.APPROVED);
@@ -1440,22 +1554,25 @@ private void copyCommentLinkAddress() {
     }
 
     private void showSnackBar(String message) {
-        WPSnackbar snackBar = WPSnackbar.make(getView(), message, Snackbar.LENGTH_LONG)
-                                        .setAction(getString(R.string.share_action),
-                                                v -> {
-                                                    try {
-                                                        Intent intent = new Intent(Intent.ACTION_SEND);
-                                                        intent.setType("text/plain");
-                                                        intent.putExtra(Intent.EXTRA_TEXT, mComment.getUrl());
-                                                        startActivity(Intent.createChooser(intent,
-                                                                getString(R.string.comment_share_link_via)));
-                                                    } catch (ActivityNotFoundException exception) {
-                                                        ToastUtils.showToast(getContext(),
-                                                                R.string.comment_toast_err_share_intent);
-                                                    }
-                                                })
-                                        .setAnchorView(mSnackbarAnchor);
-        snackBar.show();
+        View view = getView();
+        if (view != null) {
+            Snackbar snackBar = WPSnackbar.make(view, message, Snackbar.LENGTH_LONG)
+                                          .setAction(getString(R.string.share_action),
+                                                  v -> {
+                                                      try {
+                                                          Intent intent = new Intent(Intent.ACTION_SEND);
+                                                          intent.setType("text/plain");
+                                                          intent.putExtra(Intent.EXTRA_TEXT, mComment.getUrl());
+                                                          startActivity(Intent.createChooser(intent,
+                                                                  getString(R.string.comment_share_link_via)));
+                                                      } catch (ActivityNotFoundException exception) {
+                                                          ToastUtils.showToast(view.getContext(),
+                                                                  R.string.comment_toast_err_share_intent);
+                                                      }
+                                                  })
+                                          .setAnchorView(mSnackbarAnchor);
+            snackBar.show();
+        }
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentLeveler.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentLeveler.kt
new file mode 100644
index 000000000000..20f5d581bf7f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentLeveler.kt
@@ -0,0 +1,101 @@
+package org.wordpress.android.ui.comments
+
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.models.CommentList
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.READER
+import java.util.ArrayList
+
+/**
+ * Adaptation of ReaderCommentLeveler. We should combine them together as part of Comment Unification.
+ */
+class CommentLeveler(private val mComments: List<CommentModel>) {
+    fun createLevelList(): ArrayList<CommentModel> {
+        val result = ArrayList<CommentModel>()
+
+        // reset all levels, and add root comments to result
+        for (comment in mComments) {
+            comment.level = 0
+            if (comment.parentId == 0L) {
+                result.add(comment)
+            }
+        }
+
+        // add children at each level
+        var level = 0
+        while (walkCommentsAtLevel(result, level)) {
+            level++
+        }
+
+        // check for orphans (child comments whose parents weren't found above) and give them
+        // a non-zero level to distinguish them from top level comments
+        val remainingComments = ArrayList(mComments)
+        remainingComments.removeAll(result)
+
+        for (comment in remainingComments) {
+            if (!hasParent(comment)) {
+                comment.level = 1
+                result.add(comment)
+                AppLog.d(READER, "Orphan comment encountered")
+            }
+        }
+        return result
+    }
+
+    /*
+     * walk comments in the passed list that have the passed level and add their children
+     * beneath them
+     */
+    private fun walkCommentsAtLevel(comments: ArrayList<CommentModel>, level: Int): Boolean {
+        var hasChanges = false
+        var index = 0
+        while (index < comments.size) {
+            val parent = comments[index]
+            if (parent.level == level && hasChildren(parent.remoteCommentId)) {
+                // get children for this comment, set their level, then add them below the parent
+                val children = getChildren(parent.remoteCommentId)
+                setLevel(children, level + 1)
+                comments.addAll(index + 1, children)
+                hasChanges = true
+                // skip past the children we just added
+                index += children.size
+            }
+            index++
+        }
+        return hasChanges
+    }
+
+    private fun hasChildren(commentId: Long): Boolean {
+        for (comment in mComments) {
+            if (comment.parentId == commentId) {
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun hasParent(comment: CommentModel): Boolean {
+        for (parentComment in mComments) {
+            if (parentComment.remoteCommentId == comment.parentId) {
+                return true
+            }
+        }
+        return false
+    }
+
+    fun getChildren(commentId: Long): CommentList {
+        val children = CommentList()
+        for (comment in mComments) {
+            if (comment.parentId == commentId) {
+                children.add(comment)
+            }
+        }
+        return children
+    }
+
+    private fun setLevel(comments: CommentList, level: Int) {
+        for (comment in comments) {
+            comment.level = level
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItem.kt
new file mode 100644
index 000000000000..32835d155789
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItem.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.ui.comments
+
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.ui.comments.CommentListItem.CommentListItemType.COMMENT
+import org.wordpress.android.ui.comments.CommentListItem.CommentListItemType.HEADER
+
+sealed class CommentListItem(val type: CommentListItemType) {
+    abstract val id: Long
+    data class SubHeader(val label: String, override val id: Long) : CommentListItem(HEADER)
+    data class Comment(val comment: CommentModel) : CommentListItem(COMMENT) {
+        override val id: Long
+            get() = comment.remoteCommentId
+    }
+
+    enum class CommentListItemType {
+        HEADER,
+        COMMENT;
+
+        companion object {
+            @JvmStatic
+            fun fromOrdinal(ordinal: Int): CommentListItemType {
+                return when (ordinal) {
+                    HEADER.ordinal -> HEADER
+                    COMMENT.ordinal -> COMMENT
+                    else -> throw IllegalArgumentException("Illegal CommentListItem ordinal $ordinal")
+                }
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItemDecoration.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItemDecoration.kt
new file mode 100644
index 000000000000..f56583286fb8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItemDecoration.kt
@@ -0,0 +1,90 @@
+package org.wordpress.android.ui.comments
+
+import android.R.attr
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+import androidx.recyclerview.widget.RecyclerView.State
+import org.wordpress.android.R.dimen
+import org.wordpress.android.util.RtlUtils
+import kotlin.math.roundToInt
+
+/**
+ * CommentListItemDecoration adds margin to the start of the divider and skipp drawing divider for list sub-headers.
+ * Based on DividerItemDecoration.
+ */
+class CommentListItemDecoration(val context: Context) : ItemDecoration() {
+    private val divider: Drawable?
+    private val bounds = Rect()
+    private var dividerStartOffset = 0
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: State) {
+        if (parent.layoutManager == null || divider == null) {
+            return
+        }
+        canvas.save()
+        val left: Int
+        val right: Int
+        if (parent.clipToPadding) {
+            left = parent.paddingStart
+            right = parent.width - parent.paddingEnd
+            canvas.clipRect(
+                    left, parent.paddingTop, right,
+                    parent.height - parent.paddingBottom
+            )
+        } else {
+            left = 0
+            right = parent.width
+        }
+        val childCount = parent.childCount
+        for (i in 0 until childCount) {
+            val child = parent.getChildAt(i)
+            val viewHolder = parent.getChildViewHolder(child)
+            if (viewHolder !is CommentSubHeaderViewHolder) {
+                parent.getDecoratedBoundsWithMargins(child, bounds)
+                val bottom = bounds.bottom + child.translationY.roundToInt()
+                val top = bottom - divider.intrinsicHeight
+                if (RtlUtils.isRtl(context)) {
+                    divider.setBounds(left, top, right - dividerStartOffset, bottom)
+                } else {
+                    divider.setBounds(left + dividerStartOffset, top, right, bottom)
+                }
+                divider.draw(canvas)
+            }
+        }
+        canvas.restore()
+    }
+
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: State
+    ) {
+        if (divider == null) {
+            outRect[0, 0, 0] = 0
+            return
+        }
+        val viewHolder = parent.getChildViewHolder(view)
+        if (viewHolder is CommentSubHeaderViewHolder) {
+            outRect.setEmpty()
+        } else {
+            outRect[0, 0, 0] = divider.intrinsicHeight
+        }
+    }
+
+    companion object {
+        private val ATTRS = intArrayOf(attr.listDivider)
+    }
+
+    init {
+        val attrs = context.obtainStyledAttributes(ATTRS)
+        divider = attrs.getDrawable(0)
+        attrs.recycle()
+        dividerStartOffset = context.resources.getDimensionPixelOffset(dimen.comment_list_divider_start_offset)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItemDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItemDiffCallback.kt
new file mode 100644
index 000000000000..146054fed9b3
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListItemDiffCallback.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.ui.comments
+
+import androidx.recyclerview.widget.DiffUtil
+import org.wordpress.android.ui.comments.CommentListItem.Comment
+import org.wordpress.android.ui.comments.CommentListItem.SubHeader
+
+class CommentListItemDiffCallback(
+    private val oldList: List<CommentListItem>,
+    private val newList: List<CommentListItem>
+) : DiffUtil.Callback() {
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        val oldItem = oldList[oldItemPosition]
+        val newItem = newList[newItemPosition]
+
+        return when {
+            oldItem is SubHeader && newItem is SubHeader -> oldItem.id == newItem.id
+            oldItem is Comment && newItem is Comment -> {
+                oldItem.comment.remoteCommentId == newItem.comment.remoteCommentId
+            }
+            else -> false
+        }
+    }
+
+    override fun getOldListSize(): Int {
+        return oldList.size
+    }
+
+    override fun getNewListSize(): Int {
+        return newList.size
+    }
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        val oldItem = oldList[oldItemPosition]
+        val newItem = newList[newItemPosition]
+
+        var isSame = false
+
+        if (oldItem is SubHeader && newItem is SubHeader) {
+            isSame = oldItem.label == newItem.label
+        }
+
+        if (oldItem is Comment && newItem is Comment) {
+            isSame = oldItem.comment.status == newItem.comment.status &&
+                    oldItem.comment.content == newItem.comment.content &&
+                    oldItem.comment.datePublished == newItem.comment.datePublished &&
+                    oldItem.comment.authorName == newItem.comment.authorName
+        }
+
+        return isSame
+    }
+
+    /**
+     * Since we don't currently have a logic for updating only a part of the view, this method sends empty Payload
+     * to avoid view blinking in RecyclerView.
+     */
+    override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any? {
+        val oldItem = oldList[oldItemPosition]
+        val newItem = newList[newItemPosition]
+        if (oldItem is Comment && newItem is Comment) {
+            return Payload
+        }
+        return null
+    }
+
+    object Payload
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListViewHolder.kt
new file mode 100644
index 000000000000..5f289aa914b6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentListViewHolder.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.ui.comments
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+
+abstract class CommentListViewHolder(parent: ViewGroup, @LayoutRes layout: Int) : RecyclerView.ViewHolder(
+        LayoutInflater.from(
+                parent.context
+        ).inflate(layout, parent, false)
+)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentSubHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentSubHeaderViewHolder.kt
new file mode 100644
index 000000000000..9d209d5e1d42
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentSubHeaderViewHolder.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.ui.comments
+
+import android.view.ViewGroup
+import android.widget.TextView
+import org.wordpress.android.R
+
+class CommentSubHeaderViewHolder(parent: ViewGroup) : CommentListViewHolder(
+        parent,
+        R.layout.comment_list_subheader
+) {
+    private val header: TextView = itemView.findViewById(R.id.label)
+
+    fun bind(item: CommentListItem.SubHeader) {
+        header.text = item.label
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentViewHolder.kt
new file mode 100644
index 000000000000..40275e382392
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentViewHolder.kt
@@ -0,0 +1,125 @@
+package org.wordpress.android.ui.comments
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.Spannable
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.TextUtils
+import android.text.style.StyleSpan
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.graphics.ColorUtils
+import org.wordpress.android.R
+import org.wordpress.android.R.attr
+import org.wordpress.android.R.integer
+import org.wordpress.android.R.string
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.CommentStatus.UNAPPROVED
+import org.wordpress.android.ui.comments.CommentAdapter.OnCommentPressedListener
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.GravatarUtils
+import org.wordpress.android.util.StringUtils
+import org.wordpress.android.util.WPHtml
+import org.wordpress.android.util.getColorFromAttribute
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
+
+class CommentViewHolder(
+    parent: ViewGroup,
+    private val clickListener: OnCommentPressedListener,
+    private val imageManager: ImageManager,
+    private val uiHelpers: UiHelpers
+) : CommentListViewHolder(
+        parent,
+        R.layout.comment_list_item
+) {
+    private val title: TextView = itemView.findViewById(R.id.title)
+    private val commentBody: TextView = itemView.findViewById(R.id.comment)
+    private val avatar: ImageView = itemView.findViewById(R.id.avatar)
+    private val checkMark: ImageView = itemView.findViewById(R.id.image_checkmark)
+    private val containerView: ViewGroup = itemView.findViewById(R.id.layout_container)
+    private val statusIndicator: View = itemView.findViewById(R.id.status_indicator)
+
+    fun bind(item: CommentListItem.Comment, isSelected: Boolean) {
+        val commentModel = item.comment
+
+        title.text = getFormattedTitle(commentModel, title.context)
+        commentBody.text = getSpannedContent(commentModel, commentBody.context)
+
+        uiHelpers.updateVisibility(checkMark, isSelected)
+
+        if (isSelected) {
+            imageManager.cancelRequestAndClearImageView(avatar)
+            containerView.setBackgroundColor(
+                    ColorUtils.setAlphaComponent(
+                            containerView.context.getColorFromAttribute(attr.colorOnSurface),
+                            containerView.context.resources.getInteger(integer.selected_list_item_opacity)
+                    )
+            )
+        } else {
+            imageManager.loadIntoCircle(
+                    avatar, AVATAR_WITH_BACKGROUND,
+                    getAvatarForDisplay(commentModel, avatar.resources.getDimensionPixelSize(R.dimen.avatar_sz_medium))
+            )
+            containerView.background = null
+        }
+
+        uiHelpers.updateVisibility(statusIndicator, CommentStatus.fromString(commentModel.status) == UNAPPROVED)
+
+        itemView.setOnClickListener {
+            clickListener.onCommentPressed(adapterPosition, it)
+        }
+        itemView.setOnLongClickListener {
+            clickListener.onCommentLongPressed(adapterPosition, it)
+            true
+        }
+    }
+
+    private fun getAvatarForDisplay(comment: CommentModel, avatarSize: Int): String {
+        var avatarForDisplay = ""
+        if (!TextUtils.isEmpty(comment.authorProfileImageUrl)) {
+            avatarForDisplay = GravatarUtils.fixGravatarUrl(comment.authorProfileImageUrl, avatarSize)
+        } else if (!TextUtils.isEmpty(comment.authorEmail)) {
+            avatarForDisplay = GravatarUtils.gravatarFromEmail(comment.authorEmail, avatarSize)
+        }
+        return avatarForDisplay
+    }
+
+    private fun getSpannedContent(comment: CommentModel, context: Context): Spanned {
+        val spannedContent = WPHtml.fromHtml(StringUtils.notNullStr(comment.content), null, null, context, null, 0)
+        val trimmedContent = spannedContent.trim()
+        return spannedContent.subSequence(0, trimmedContent.length) as Spanned
+    }
+
+    private fun getFormattedTitle(comment: CommentModel, context: Context): Spannable {
+        val formattedTitle: String
+        var author = context.getString(string.anonymous)
+        if (!TextUtils.isEmpty(comment.authorName)) {
+            author = comment.authorName.trim { it <= ' ' }
+        }
+        val postTitle = comment.postTitle.trim { it <= ' ' }
+        formattedTitle = if (!TextUtils.isEmpty(comment.postTitle)) {
+            context.getString(string.comment_title, author, postTitle)
+        } else {
+            author
+        }
+        val string = SpannableStringBuilder(formattedTitle)
+        val authorStartIndex = formattedTitle.indexOf(author)
+        val authorEndIndex = authorStartIndex + author.length
+        val titleStartIndex = formattedTitle.indexOf(postTitle)
+        val titleEndIndex = titleStartIndex + postTitle.length
+        string.setSpan(
+                StyleSpan(Typeface.BOLD), authorStartIndex, authorEndIndex,
+                Spannable.SPAN_INCLUSIVE_INCLUSIVE
+        )
+        string.setSpan(
+                StyleSpan(Typeface.BOLD), titleStartIndex, titleEndIndex,
+                Spannable.SPAN_INCLUSIVE_INCLUSIVE
+        )
+        return string
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsActivity.java
deleted file mode 100644
index 501f8bf5bc99..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsActivity.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package org.wordpress.android.ui.comments;
-
-import android.app.Dialog;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.MenuItem;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.google.android.material.snackbar.Snackbar;
-
-import org.jetbrains.annotations.NotNull;
-import org.wordpress.android.R;
-import org.wordpress.android.WordPress;
-import org.wordpress.android.fluxc.Dispatcher;
-import org.wordpress.android.fluxc.generated.CommentActionBuilder;
-import org.wordpress.android.fluxc.model.CommentModel;
-import org.wordpress.android.fluxc.model.CommentStatus;
-import org.wordpress.android.fluxc.model.SiteModel;
-import org.wordpress.android.fluxc.store.CommentStore;
-import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentPayload;
-import org.wordpress.android.models.CommentList;
-import org.wordpress.android.models.Note;
-import org.wordpress.android.ui.ActivityId;
-import org.wordpress.android.ui.LocaleAwareActivity;
-import org.wordpress.android.ui.comments.CommentsListFragment.OnCommentSelectedListener;
-import org.wordpress.android.ui.notifications.NotificationFragment;
-import org.wordpress.android.ui.posts.BasicFragmentDialog;
-import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveClickInterface;
-import org.wordpress.android.ui.prefs.AppPrefs;
-import org.wordpress.android.ui.reader.ReaderPostDetailFragment;
-import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.widgets.WPSnackbar;
-
-import javax.inject.Inject;
-
-public class CommentsActivity extends LocaleAwareActivity
-        implements OnCommentSelectedListener,
-        NotificationFragment.OnPostClickListener,
-        BasicFragmentDialog.BasicDialogPositiveClickInterface {
-    static final String KEY_AUTO_REFRESHED = "has_auto_refreshed";
-    static final String KEY_EMPTY_VIEW_MESSAGE = "empty_view_message";
-    private static final String SAVED_COMMENTS_STATUS_TYPE = "saved_comments_status_type";
-    public static final String COMMENT_MODERATE_ID_EXTRA = "commentModerateId";
-    public static final String COMMENT_MODERATE_STATUS_EXTRA = "commentModerateStatus";
-    private final CommentList mTrashedComments = new CommentList();
-
-    private SiteModel mSite;
-
-    @Inject Dispatcher mDispatcher;
-    @Inject CommentStore mCommentStore;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ((WordPress) getApplication()).component().inject(this);
-
-        setContentView(R.layout.comment_activity);
-
-        Toolbar toolbar = findViewById(R.id.toolbar_main);
-        setSupportActionBar(toolbar);
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayShowTitleEnabled(true);
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
-
-        if (savedInstanceState == null) {
-            mSite = (SiteModel) getIntent().getSerializableExtra(WordPress.SITE);
-        } else {
-            mSite = (SiteModel) savedInstanceState.getSerializable(WordPress.SITE);
-        }
-
-        if (mSite == null) {
-            ToastUtils.showToast(this, R.string.blog_not_found, ToastUtils.Duration.SHORT);
-            finish();
-            return;
-        }
-
-        CommentStatus currentCommentStatusType;
-        if (getIntent() != null && getIntent().hasExtra(SAVED_COMMENTS_STATUS_TYPE)) {
-            currentCommentStatusType = (CommentStatus) getIntent().getSerializableExtra(SAVED_COMMENTS_STATUS_TYPE);
-        } else {
-            // Read the value from app preferences here. Default to 0 - All
-            currentCommentStatusType = AppPrefs.getCommentsStatusFilter().toCommentStatus();
-        }
-
-        if (savedInstanceState == null) {
-            CommentsListFragment commentsListFragment = new CommentsListFragment();
-            // initialize comment status filter first time
-            commentsListFragment.setCommentStatusFilter(currentCommentStatusType);
-            getSupportFragmentManager().beginTransaction()
-                                       .add(R.id.layout_fragment_container, commentsListFragment,
-                                               getString(R.string.fragment_tag_comment_list))
-                                       .commitAllowingStateLoss();
-        } else {
-            getIntent().putExtra(KEY_AUTO_REFRESHED, savedInstanceState.getBoolean(KEY_AUTO_REFRESHED));
-            getIntent().putExtra(KEY_EMPTY_VIEW_MESSAGE, savedInstanceState.getString(KEY_EMPTY_VIEW_MESSAGE));
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        ActivityId.trackLastActivity(ActivityId.COMMENTS);
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (getSupportFragmentManager().getBackStackEntryCount() > 0) {
-            getSupportFragmentManager().popBackStack();
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        AppLog.d(AppLog.T.COMMENTS, "comment activity new intent");
-    }
-
-    private CommentsListFragment getListFragment() {
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag(getString(
-                R.string.fragment_tag_comment_list));
-        if (fragment == null) {
-            return null;
-        }
-        return (CommentsListFragment) fragment;
-    }
-
-    private boolean hasListFragment() {
-        return (getListFragment() != null);
-    }
-
-    private void showReaderFragment(long remoteBlogId, long postId) {
-        FragmentManager fm = getSupportFragmentManager();
-        fm.executePendingTransactions();
-
-        Fragment fragment = ReaderPostDetailFragment.Companion.newInstance(remoteBlogId, postId);
-        FragmentTransaction ft = fm.beginTransaction();
-        String tagForFragment = getString(R.string.fragment_tag_reader_post_detail);
-        ft.add(R.id.layout_fragment_container, fragment, tagForFragment)
-          .addToBackStack(tagForFragment)
-          .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-        ft.commit();
-    }
-
-    /*
-     * called from comment list when user taps a comment
-     */
-    @Override
-    public void onCommentSelected(long commentId, CommentStatus statusFilter) {
-        Intent detailIntent = new Intent(this, CommentsDetailActivity.class);
-        detailIntent.putExtra(CommentsDetailActivity.COMMENT_ID_EXTRA, commentId);
-        detailIntent.putExtra(CommentsDetailActivity.COMMENT_STATUS_FILTER_EXTRA, statusFilter);
-        detailIntent.putExtra(WordPress.SITE, mSite);
-        startActivityForResult(detailIntent, 1);
-    }
-
-    /*
-     * called from comment detail when user taps a link to a post - show the post in a
-     * reader detail fragment
-     */
-    @Override
-    public void onPostClicked(Note note, long remoteBlogId, int postId) {
-        showReaderFragment(remoteBlogId, postId);
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull Bundle outState) {
-        outState.putSerializable(WordPress.SITE, mSite);
-
-        // retain the id of the highlighted comments
-        if (hasListFragment()) {
-            outState.putBoolean(KEY_AUTO_REFRESHED, getListFragment().mHasAutoRefreshedComments);
-            outState.putString(KEY_EMPTY_VIEW_MESSAGE, getListFragment().getEmptyViewMessage());
-        }
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    protected Dialog onCreateDialog(int id) {
-        Dialog dialog = CommentDialogs.createCommentDialog(this, id);
-        if (dialog != null) {
-            return dialog;
-        }
-        return super.onCreateDialog(id);
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode == RESULT_OK) {
-            long commentId = data.getLongExtra(COMMENT_MODERATE_ID_EXTRA, -1);
-            String newStatus = data.getStringExtra(COMMENT_MODERATE_STATUS_EXTRA);
-            if (commentId >= 0 && !TextUtils.isEmpty(newStatus)) {
-                onModerateComment(mCommentStore.getCommentBySiteAndRemoteId(mSite, commentId),
-                        CommentStatus.fromString(newStatus));
-            }
-        }
-    }
-
-    public void onModerateComment(final CommentModel comment,
-                                  final CommentStatus newStatus) {
-        if (newStatus == CommentStatus.APPROVED || newStatus == CommentStatus.UNAPPROVED) {
-            getListFragment().updateEmptyView();
-            comment.setStatus(newStatus.toString());
-            mDispatcher.dispatch(CommentActionBuilder.newUpdateCommentAction(comment));
-            mDispatcher.dispatch(CommentActionBuilder.newPushCommentAction(new RemoteCommentPayload(mSite, comment)));
-        } else if (newStatus == CommentStatus.SPAM || newStatus == CommentStatus.TRASH
-                   || newStatus == CommentStatus.DELETED) {
-            mTrashedComments.add(comment);
-            getListFragment().removeComment(comment);
-
-            String message = (newStatus == CommentStatus.TRASH ? getString(R.string.comment_trashed)
-                    : newStatus == CommentStatus.SPAM ? getString(R.string.comment_spammed)
-                            : getString(R.string.comment_deleted_permanently));
-            View.OnClickListener undoListener = v -> {
-                mTrashedComments.remove(comment);
-                getListFragment().loadComments();
-            };
-
-            WPSnackbar snackbar = WPSnackbar.make(getListFragment().getView(), message, Snackbar.LENGTH_LONG)
-                                            .setAction(R.string.undo, undoListener);
-
-            // do the actual moderation once the undo bar has been hidden
-            snackbar.setCallback(new Snackbar.Callback() {
-                @Override
-                public void onDismissed(Snackbar snackbar, int event) {
-                    super.onDismissed(snackbar, event);
-
-                    // comment will no longer exist in moderating list if action was undone
-                    if (!mTrashedComments.contains(comment)) {
-                        return;
-                    }
-                    mTrashedComments.remove(comment);
-                    moderateComment(comment, newStatus);
-                }
-            });
-
-            snackbar.show();
-        }
-    }
-
-    private void moderateComment(CommentModel comment, CommentStatus newStatus) {
-        if (newStatus == CommentStatus.DELETED) {
-            // For deletion, we need to dispatch a specific action.
-            mDispatcher.dispatch(CommentActionBuilder.newDeleteCommentAction(new RemoteCommentPayload(mSite, comment)));
-        } else {
-            // Actual moderation (push the modified comment).
-            comment.setStatus(newStatus.toString());
-            mDispatcher.dispatch(CommentActionBuilder.newPushCommentAction(new RemoteCommentPayload(mSite, comment)));
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            onBackPressed();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
-    public void onPositiveClicked(@NotNull String instanceTag) {
-        Fragment fragmentById = getSupportFragmentManager().findFragmentById(R.id.layout_fragment_container);
-        if (fragmentById instanceof BasicFragmentDialog.BasicDialogPositiveClickInterface) {
-            ((BasicDialogPositiveClickInterface) fragmentById).onPositiveClicked(instanceTag);
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsActivity.kt
new file mode 100644
index 000000000000..b586beed62e8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsActivity.kt
@@ -0,0 +1,280 @@
+package org.wordpress.android.ui.comments
+
+import android.content.Intent
+import android.os.Bundle
+import android.text.TextUtils
+import android.util.TypedValue
+import android.view.MenuItem
+import android.view.View
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.appbar.AppBarLayout
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.snackbar.Snackbar.Callback
+import com.google.android.material.tabs.TabLayout
+import com.google.android.material.tabs.TabLayoutMediator
+import org.wordpress.android.R.dimen
+import org.wordpress.android.R.id
+import org.wordpress.android.R.layout
+import org.wordpress.android.R.string
+import org.wordpress.android.WordPress
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.COMMENT_FILTER_CHANGED
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.CommentActionBuilder
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.CommentStore
+import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentPayload
+import org.wordpress.android.models.CommentList
+import org.wordpress.android.models.Note
+import org.wordpress.android.ui.ActivityId
+import org.wordpress.android.ui.ActivityId.COMMENTS
+import org.wordpress.android.ui.LocaleAwareActivity
+import org.wordpress.android.ui.ScrollableViewInitializedListener
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.ALL
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.APPROVED
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.SPAM
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.TRASH
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.UNAPPROVED
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.UNREPLIED
+import org.wordpress.android.ui.comments.CommentsListFragment.OnCommentSelectedListener
+import org.wordpress.android.ui.notifications.NotificationFragment.OnPostClickListener
+import org.wordpress.android.ui.reader.ReaderActivityLauncher
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.SmartToast
+import org.wordpress.android.util.SmartToast.SmartToastType.COMMENTS_LONG_PRESS
+import org.wordpress.android.util.ToastUtils
+import org.wordpress.android.util.setLiftOnScrollTargetViewIdAndRequestLayout
+import org.wordpress.android.widgets.WPSnackbar.Companion.make
+import java.util.HashMap
+import javax.inject.Inject
+
+@Suppress("TooManyFunctions")
+class CommentsActivity : LocaleAwareActivity(),
+        OnCommentSelectedListener,
+        OnPostClickListener,
+        ScrollableViewInitializedListener {
+    private val tempTrashedComments = CommentList()
+    private lateinit var tabLayout: TabLayout
+    private lateinit var viewPager: ViewPager2
+    private lateinit var appBar: AppBarLayout
+    private lateinit var site: SiteModel
+
+    private val commentListFilters = listOf(ALL, UNAPPROVED, UNREPLIED, APPROVED, SPAM, TRASH)
+
+    private var disabledTabsOpacity: Float = 0F
+
+    private lateinit var pagerAdapter: CommentsListPagerAdapter
+
+    @Inject internal lateinit var dispatcher: Dispatcher
+    @Inject internal lateinit var commentStore: CommentStore
+
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (application as WordPress).component().inject(this)
+
+        setContentView(layout.comment_activity)
+
+        if (!intent.hasExtra(WordPress.SITE)) {
+            ToastUtils.showToast(this, string.blog_not_found, ToastUtils.Duration.SHORT)
+            finish()
+            return
+        }
+
+        site = intent.getSerializableExtra(WordPress.SITE) as SiteModel
+
+        appBar = findViewById(id.appbar_main)
+
+        setSupportActionBar(findViewById(id.toolbar_main))
+        supportActionBar?.setDisplayShowTitleEnabled(true)
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+        viewPager = findViewById(id.view_pager)
+        viewPager.offscreenPageLimit = 1
+
+        viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                val properties: MutableMap<String, String?> = HashMap()
+                properties["selected_filter"] = commentListFilters[position].label
+                AnalyticsTracker.track(COMMENT_FILTER_CHANGED, properties)
+                super.onPageSelected(position)
+            }
+        })
+
+        pagerAdapter = CommentsListPagerAdapter(commentListFilters, this)
+        viewPager.adapter = pagerAdapter
+
+        tabLayout = findViewById(id.tab_layout)
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            tab.setText(commentListFilters[position].labelResId)
+        }.attach()
+
+        val disabledAlpha = TypedValue()
+        resources.getValue(dimen.material_emphasis_disabled, disabledAlpha, true)
+        disabledTabsOpacity = disabledAlpha.float
+
+        if (savedInstanceState == null) {
+            SmartToast.show(this, COMMENTS_LONG_PRESS)
+        }
+    }
+
+    fun onActionModeToggled(isActive: Boolean) {
+        viewPager.isUserInputEnabled = !isActive
+        for (i in 0 until tabLayout.tabCount) {
+            tabLayout.getTabAt(i)?.view?.isEnabled = !isActive
+            tabLayout.getTabAt(i)?.view?.isClickable = !isActive
+            if (isActive) {
+                tabLayout.getTabAt(i)?.view?.alpha = disabledTabsOpacity
+            } else {
+                tabLayout.getTabAt(i)?.view?.alpha = 1F
+            }
+        }
+    }
+
+    public override fun onResume() {
+        super.onResume()
+        ActivityId.trackLastActivity(COMMENTS)
+    }
+
+    override fun onNewIntent(intent: Intent) {
+        super.onNewIntent(intent)
+        AppLog.d(T.COMMENTS, "comment activity new intent")
+    }
+
+    /*
+     * called from comment list when user taps a comment
+     */
+    override fun onCommentSelected(commentId: Long, statusFilter: CommentStatus) {
+        val detailIntent = Intent(this, CommentsDetailActivity::class.java)
+        detailIntent.putExtra(CommentsDetailActivity.COMMENT_ID_EXTRA, commentId)
+        detailIntent.putExtra(CommentsDetailActivity.COMMENT_STATUS_FILTER_EXTRA, statusFilter)
+        detailIntent.putExtra(WordPress.SITE, site)
+        startActivityForResult(detailIntent, 1)
+    }
+
+    /*
+     * called from comment detail when user taps a link to a post - show the post in a ReaderPostPagerActivity
+     */
+    override fun onPostClicked(note: Note, remoteBlogId: Long, postId: Int) {
+        ReaderActivityLauncher.showReaderPostDetail(this, remoteBlogId, postId.toLong())
+    }
+
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == RESULT_OK) {
+            val commentId = data!!.getLongExtra(COMMENT_MODERATE_ID_EXTRA, -1)
+            val newStatus = data.getStringExtra(COMMENT_MODERATE_STATUS_EXTRA)
+            if (commentId >= 0 && !TextUtils.isEmpty(newStatus)) {
+                onModerateComment(
+                        commentStore.getCommentBySiteAndRemoteId(site, commentId),
+                        CommentStatus.fromString(newStatus)
+                )
+            }
+        }
+    }
+
+    private fun getCommentFragments(comment: CommentModel): List<CommentsListFragment> {
+        val oldStatus = CommentStatus.fromString(comment.status)
+
+        val targetFragments: ArrayList<CommentsListFragment?> = ArrayList()
+        if (oldStatus == CommentStatus.APPROVED || oldStatus == CommentStatus.UNAPPROVED) {
+            targetFragments.add(pagerAdapter.getItemAtPosition(commentListFilters.indexOf(ALL)))
+            targetFragments.add(pagerAdapter.getItemAtPosition(commentListFilters.indexOf(APPROVED)))
+            targetFragments.add(pagerAdapter.getItemAtPosition(commentListFilters.indexOf(UNAPPROVED)))
+        } else {
+            targetFragments.add(
+                    pagerAdapter.getItemAtPosition(
+                            commentListFilters.indexOf(CommentStatusCriteria.fromCommentStatus(oldStatus))
+                    )
+            )
+        }
+        return targetFragments.filterNotNull()
+    }
+
+    @JvmOverloads
+    fun onModerateComment(
+        comment: CommentModel,
+        newStatus: CommentStatus,
+        allowUndo: Boolean = true
+    ) {
+        if (newStatus == CommentStatus.APPROVED || newStatus == CommentStatus.UNAPPROVED) {
+            comment.status = newStatus.toString()
+            dispatcher.dispatch(CommentActionBuilder.newUpdateCommentAction(comment))
+            dispatcher.dispatch(CommentActionBuilder.newPushCommentAction(RemoteCommentPayload(site, comment)))
+        } else if (newStatus == CommentStatus.SPAM || newStatus == CommentStatus.TRASH ||
+                newStatus == CommentStatus.DELETED) {
+            val targetFragments = getCommentFragments(comment)
+            targetFragments.forEach { it.removeComment(comment) }
+
+            val message = when (newStatus) {
+                CommentStatus.TRASH -> getString(string.comment_trashed)
+                CommentStatus.SPAM -> getString(
+                        string.comment_spammed
+                )
+                else -> getString(string.comment_deleted_permanently)
+            }
+            if (allowUndo) {
+                tempTrashedComments.add(comment)
+                val undoListener = View.OnClickListener { _: View? ->
+                    tempTrashedComments.remove(comment)
+                    targetFragments.forEach { it.loadComments() }
+                }
+                val view = findViewById<View>(id.coordinator_layout)
+                if (view != null) {
+                    val snackbar = make(view, message, Snackbar.LENGTH_LONG)
+                            .setAction(string.undo, undoListener)
+
+                    // do the actual moderation once the undo bar has been hidden
+                    snackbar.addCallback(object : Callback() {
+                        override fun onDismissed(snackbar: Snackbar, event: Int) {
+                            super.onDismissed(snackbar, event)
+
+                            // comment will no longer exist in moderating list if action was undone
+                            if (!tempTrashedComments.contains(comment)) {
+                                return
+                            }
+                            tempTrashedComments.remove(comment)
+                            moderateComment(comment, newStatus)
+                        }
+                    })
+                    snackbar.show()
+                }
+            } else {
+                moderateComment(comment, newStatus)
+            }
+        }
+    }
+
+    private fun moderateComment(comment: CommentModel, newStatus: CommentStatus) {
+        if (newStatus == CommentStatus.DELETED) {
+            // For deletion, we need to dispatch a specific action.
+            dispatcher.dispatch(CommentActionBuilder.newDeleteCommentAction(RemoteCommentPayload(site, comment)))
+        } else {
+            // Actual moderation (push the modified comment).
+            comment.status = newStatus.toString()
+            dispatcher.dispatch(CommentActionBuilder.newUpdateCommentAction(comment))
+            dispatcher.dispatch(CommentActionBuilder.newPushCommentAction(RemoteCommentPayload(site, comment)))
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+        const val COMMENT_MODERATE_ID_EXTRA = "commentModerateId"
+        const val COMMENT_MODERATE_STATUS_EXTRA = "commentModerateStatus"
+    }
+
+    override fun onScrollableViewInitialized(containerId: Int) {
+        appBar.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
+        appBar.setTag(id.posts_non_search_recycler_view_id_tag_key, containerId)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java
index ff0b48187ef9..4e1ba4ecebeb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsDetailActivity.java
@@ -18,6 +18,7 @@
 import org.greenrobot.eventbus.ThreadMode;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.action.CommentAction;
 import org.wordpress.android.fluxc.generated.CommentActionBuilder;
@@ -34,6 +35,8 @@
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.widgets.WPViewPager;
 import org.wordpress.android.widgets.WPViewPagerTransformer;
 
@@ -113,6 +116,12 @@ public void onCreate(Bundle savedInstanceState) {
 
         // Asynchronously loads comments and build the adapter
         loadDataInViewPager();
+
+        if (savedInstanceState == null) {
+            // track initial comment view
+            AnalyticsUtils.trackCommentActionWithSiteDetails(
+                    Stat.COMMENT_VIEWED, AnalyticsCommentActionSource.SITE_COMMENTS, mSite);
+        }
     }
 
     @Override
@@ -205,6 +214,9 @@ public void loadingFinished(CommentList commentList) {
     }
 
     private void showCommentList(CommentList commentList) {
+        if (isFinishing()) {
+            return;
+        }
         final int previousItem = mViewPager.getCurrentItem();
 
         // Only notify adapter when loading new page
@@ -231,6 +243,9 @@ public void onPageSelected(int position) {
                     final CommentModel comment = mAdapter.getCommentAtPosition(position);
                     if (comment != null) {
                         mCommentId = comment.getRemoteCommentId();
+                        // track subsequent comment views
+                        AnalyticsUtils.trackCommentActionWithSiteDetails(
+                                Stat.COMMENT_VIEWED, AnalyticsCommentActionSource.SITE_COMMENTS, mSite);
                     }
                 }
             };
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java
index 32699de816f9..854612217c93 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java
@@ -10,21 +10,24 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.view.ActionMode;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
+import org.wordpress.android.analytics.AnalyticsTracker;
+import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.action.CommentAction;
 import org.wordpress.android.fluxc.generated.CommentActionBuilder;
@@ -34,26 +37,34 @@
 import org.wordpress.android.fluxc.store.CommentStore;
 import org.wordpress.android.fluxc.store.CommentStore.FetchCommentsPayload;
 import org.wordpress.android.fluxc.store.CommentStore.OnCommentChanged;
-import org.wordpress.android.fluxc.store.CommentStore.RemoteCommentPayload;
 import org.wordpress.android.models.CommentList;
 import org.wordpress.android.models.FilterCriteria;
 import org.wordpress.android.ui.ActionableEmptyView;
 import org.wordpress.android.ui.EmptyViewMessageType;
-import org.wordpress.android.ui.FilteredRecyclerView;
-import org.wordpress.android.ui.prefs.AppPrefs;
-import org.wordpress.android.util.AppLog;
+import org.wordpress.android.ui.ViewPagerFragment;
+import org.wordpress.android.ui.comments.CommentListItem.Comment;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.SmartToast;
 import org.wordpress.android.util.ToastUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import org.wordpress.android.util.helpers.SwipeToRefreshHelper;
+import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout;
 
 import javax.inject.Inject;
 
-public class CommentsListFragment extends Fragment {
+import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper;
+
+public class CommentsListFragment extends ViewPagerFragment {
     static final int COMMENTS_PER_PAGE = 30;
+    static final int MAX_COMMENTS_IN_RESPONSE = 100;
+    static final String COMMENT_FILTER_KEY = "COMMENT_FILTER_KEY";
+    static final String LOADING_IN_PROGRESS_KEY = "LOADING_IN_PROGRESS_KEY";
+    static final String AUTO_REFRESHED_KEY = "has_auto_refreshed";
+
+    @Nullable
+    @Override
+    public View getScrollableViewForUniqueIdProvision() {
+        return mRecyclerView;
+    }
 
     interface OnCommentSelectedListener {
         void onCommentSelected(long commentId, CommentStatus statusFilter);
@@ -63,6 +74,7 @@ public enum CommentStatusCriteria implements FilterCriteria {
         ALL(R.string.comment_status_all),
         UNAPPROVED(R.string.comment_status_unapproved),
         APPROVED(R.string.comment_status_approved),
+        UNREPLIED(R.string.comment_status_unreplied),
         TRASH(R.string.comment_status_trash),
         SPAM(R.string.comment_status_spam),
         DELETE(R.string.comment_status_trash);
@@ -73,6 +85,11 @@ public enum CommentStatusCriteria implements FilterCriteria {
             mLabelResId = labelResId;
         }
 
+        @StringRes
+        public int getLabelResId() {
+            return mLabelResId;
+        }
+
         @Override
         public String getLabel() {
             return WordPress.getContext().getString(mLabelResId);
@@ -88,33 +105,36 @@ public CommentStatus toCommentStatus() {
     }
 
     private boolean mIsUpdatingComments = false;
-    private boolean mCanLoadMoreComments = true;
-    boolean mHasAutoRefreshedComments = false;
-
-    private final CommentStatusCriteria[] mCommentStatuses = {
-            CommentStatusCriteria.ALL, CommentStatusCriteria.UNAPPROVED, CommentStatusCriteria.APPROVED,
-            CommentStatusCriteria.TRASH, CommentStatusCriteria.SPAM};
+    private boolean mHasAutoRefreshedComments = false;
 
-    private EmptyViewMessageType mEmptyViewMessageType = EmptyViewMessageType.NO_CONTENT;
-    private FilteredRecyclerView mFilteredCommentsView;
+    private RecyclerView mRecyclerView;
     private CommentAdapter mAdapter;
     private ActionMode mActionMode;
     private CommentStatusCriteria mCommentStatusFilter = CommentStatusCriteria.ALL;
     private ActionableEmptyView mActionableEmptyView;
     private SiteModel mSite;
+    private CustomSwipeRefreshLayout mSwipeRefreshLayout;
+    private SwipeToRefreshHelper mSwipeToRefreshHelper;
+    private View mLoadMoreProgress;
 
     @Inject Dispatcher mDispatcher;
     @Inject CommentStore mCommentStore;
 
+
+    public static CommentsListFragment newInstance(CommentStatusCriteria commentStatusFilter) {
+        Bundle args = new Bundle();
+        CommentsListFragment fragment = new CommentsListFragment();
+        args.putSerializable(COMMENT_FILTER_KEY, commentStatusFilter);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getActivity().getApplication()).component().inject(this);
         mDispatcher.register(this);
         updateSiteOrFinishActivity(savedInstanceState);
-        if (savedInstanceState == null) {
-            SmartToast.show(getActivity(), SmartToast.SmartToastType.COMMENTS_LONG_PRESS);
-        }
     }
 
     @Override
@@ -124,22 +144,123 @@ public void onDestroy() {
     }
 
     private void updateSiteOrFinishActivity(Bundle savedInstanceState) {
-        if (savedInstanceState == null) {
-            if (getArguments() != null) {
-                mSite = (SiteModel) getArguments().getSerializable(WordPress.SITE);
+        mSite = (SiteModel) getActivity().getIntent().getSerializableExtra(WordPress.SITE);
+        mCommentStatusFilter = (CommentStatusCriteria) getArguments().getSerializable(COMMENT_FILTER_KEY);
+        if (mSite == null) {
+            ToastUtils.showToast(getActivity(), R.string.blog_not_found, ToastUtils.Duration.SHORT);
+            getActivity().finish();
+        }
+    }
+
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.comment_list_fragment, container, false);
+
+        mActionableEmptyView = view.findViewById(R.id.actionable_empty_view);
+
+        mRecyclerView = view.findViewById(R.id.comments_recycler_view);
+        mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
+        mRecyclerView.addItemDecoration(
+                new CommentListItemDecoration(view.getContext()));
+
+        mRecyclerView.swapAdapter(getAdapter(), true);
+
+        mLoadMoreProgress = view.findViewById(R.id.progress);
+
+        mSwipeRefreshLayout = view.findViewById(R.id.ptr_layout);
+        mSwipeToRefreshHelper = buildSwipeToRefreshHelper(
+                mSwipeRefreshLayout,
+                () -> {
+                    if (!NetworkUtils.checkConnection(getContext())) {
+                        if (getAdapter().getItemCount() == 0) {
+                            showEmptyView(EmptyViewMessageType.NETWORK_ERROR);
+                        }
+                        mSwipeToRefreshHelper.setRefreshing(false);
+                        return;
+                    }
+                    updateComments(false);
+                }
+        );
+
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        if (savedInstanceState != null) {
+            mIsUpdatingComments = savedInstanceState.getBoolean(LOADING_IN_PROGRESS_KEY, false);
+            mHasAutoRefreshedComments = savedInstanceState.getBoolean(AUTO_REFRESHED_KEY, false);
+        }
+
+        if (!NetworkUtils.isNetworkAvailable(getActivity())) {
+            showEmptyView(EmptyViewMessageType.NETWORK_ERROR);
+        } else {
+            if (!mHasAutoRefreshedComments) {
+                updateComments(false);
+                mHasAutoRefreshedComments = true;
             } else {
-                mSite = (SiteModel) getActivity().getIntent().getSerializableExtra(WordPress.SITE);
+                getAdapter().loadInitialCachedComments(mCommentStatusFilter.toCommentStatus());
             }
-        } else {
-            mSite = (SiteModel) savedInstanceState.getSerializable(WordPress.SITE);
         }
+    }
 
-        if (mSite == null) {
-            ToastUtils.showToast(getActivity(), R.string.blog_not_found, ToastUtils.Duration.SHORT);
-            getActivity().finish();
+
+    private void showEmptyView(EmptyViewMessageType messageType) {
+        int emptyViewMessageStringId = 0;
+        if (messageType == EmptyViewMessageType.NO_CONTENT) {
+            switch (mCommentStatusFilter) {
+                case APPROVED:
+                    emptyViewMessageStringId = R.string.comments_empty_list_filtered_approved;
+                    break;
+                case UNAPPROVED:
+                    emptyViewMessageStringId = R.string.comments_empty_list_filtered_pending;
+                    break;
+                case UNREPLIED:
+                    emptyViewMessageStringId = R.string.comments_empty_list_filtered_unreplied;
+                    break;
+                case SPAM:
+                    emptyViewMessageStringId = R.string.comments_empty_list_filtered_spam;
+                    break;
+                case TRASH:
+                    emptyViewMessageStringId = R.string.comments_empty_list_filtered_trashed;
+                    break;
+                case DELETE:
+                case ALL:
+                default:
+                    emptyViewMessageStringId = R.string.comments_empty_list;
+                    break;
+            }
+            mActionableEmptyView.image.setImageResource(R.drawable.img_illustration_empty_results_216dp);
+            mActionableEmptyView.image.setVisibility(View.VISIBLE);
+        } else {
+            @DrawableRes int emptyViewIllustrationId = 0;
+            int emptyViewIllustrationVisibility = View.GONE;
+            switch (messageType) {
+                case LOADING:
+                    emptyViewMessageStringId = R.string.comments_fetching;
+                    break;
+                case NETWORK_ERROR:
+                    emptyViewMessageStringId = R.string.no_network_message;
+                    emptyViewIllustrationId = R.drawable.img_illustration_cloud_off_152dp;
+                    emptyViewIllustrationVisibility = View.VISIBLE;
+                    break;
+                case PERMISSION_ERROR:
+                    emptyViewMessageStringId = R.string.error_refresh_unauthorized_comments;
+                    break;
+                case GENERIC_ERROR:
+                    emptyViewMessageStringId = R.string.error_refresh_comments;
+                    break;
+            }
+            mActionableEmptyView.image.setImageResource(emptyViewIllustrationId);
+            mActionableEmptyView.image.setVisibility(emptyViewIllustrationVisibility);
         }
+        mActionableEmptyView.title.setText(emptyViewMessageStringId);
+        mActionableEmptyView.setVisibility(View.VISIBLE);
     }
 
+
     private CommentAdapter getAdapter() {
         if (mAdapter == null) {
             // called after comments have been loaded
@@ -150,20 +271,16 @@ private CommentAdapter getAdapter() {
 
                 if (!isEmpty) {
                     // Hide the empty view if there are already some displayed comments
-                    mFilteredCommentsView.hideEmptyView();
-                    mFilteredCommentsView.setToolbarScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL);
                     mActionableEmptyView.setVisibility(View.GONE);
                 } else if (!mIsUpdatingComments) {
                     // Change LOADING to NO_CONTENT message
-                    mFilteredCommentsView.updateEmptyView(EmptyViewMessageType.NO_CONTENT);
+                    showEmptyView(EmptyViewMessageType.NO_CONTENT);
                 }
             };
 
             // adapter calls this to request more comments from server when it reaches the end
             CommentAdapter.OnLoadMoreListener loadMoreListener = () -> {
-                if (mCanLoadMoreComments && !mIsUpdatingComments) {
-                    updateComments(true);
-                }
+                updateComments(true);
             };
 
             // adapter calls this when selected comments have changed (CAB)
@@ -183,16 +300,23 @@ private CommentAdapter getAdapter() {
             CommentAdapter.OnCommentPressedListener pressedListener = new CommentAdapter.OnCommentPressedListener() {
                 @Override
                 public void onCommentPressed(int position, View view) {
-                    CommentModel comment = getAdapter().getItem(position);
+                    CommentModel comment = ((Comment) getAdapter().getItem(position)).getComment();
                     if (comment == null) {
                         return;
                     }
                     if (mActionMode == null) {
-                        mFilteredCommentsView.invalidate();
+                        mRecyclerView.invalidate();
                         if (getActivity() instanceof OnCommentSelectedListener) {
-                            ((OnCommentSelectedListener) getActivity()).onCommentSelected(comment.getRemoteCommentId(),
-                                    mCommentStatusFilter
-                                            .toCommentStatus());
+                            CommentStatus commentStatus;
+                            // for purposes of comment details UNREPLIED should be treated as ALL
+                            if (mCommentStatusFilter == CommentStatusCriteria.UNREPLIED) {
+                                commentStatus = CommentStatusCriteria.ALL.toCommentStatus();
+                            } else {
+                                commentStatus = mCommentStatusFilter.toCommentStatus();
+                            }
+
+                            ((OnCommentSelectedListener) getActivity())
+                                    .onCommentSelected(comment.getRemoteCommentId(), commentStatus);
                         }
                     } else {
                         getAdapter().toggleItemSelected(position, view);
@@ -236,160 +360,13 @@ void removeComment(CommentModel comment) {
         if (hasAdapter() && comment != null) {
             getAdapter().removeComment(comment);
         }
-        // Show the empty view if the comment count drop to zero
-        updateEmptyView();
     }
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-
-        Bundle extras = getActivity().getIntent().getExtras();
-        if (extras != null) {
-            mHasAutoRefreshedComments = extras.getBoolean(CommentsActivity.KEY_AUTO_REFRESHED);
-            mEmptyViewMessageType = EmptyViewMessageType.getEnumFromString(extras.getString(
-                    CommentsActivity.KEY_EMPTY_VIEW_MESSAGE));
-        } else {
-            mHasAutoRefreshedComments = false;
-            mEmptyViewMessageType = EmptyViewMessageType.NO_CONTENT;
-        }
-
-        if (!NetworkUtils.isNetworkAvailable(getActivity())) {
-            mFilteredCommentsView.updateEmptyView(EmptyViewMessageType.NETWORK_ERROR);
-            return;
-        }
-
-        // Restore the empty view's message
-        mFilteredCommentsView.updateEmptyView(mEmptyViewMessageType);
-
-        if (!mHasAutoRefreshedComments) {
-            updateComments(false);
-            mHasAutoRefreshedComments = true;
-        }
     }
 
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.comment_list_fragment, container, false);
-
-        mActionableEmptyView = view.findViewById(R.id.actionable_empty_view);
-        mFilteredCommentsView = view.findViewById(R.id.filtered_recycler_view);
-        mFilteredCommentsView
-                .addItemDecoration(new DividerItemDecoration(view.getContext(), DividerItemDecoration.VERTICAL));
-        mFilteredCommentsView.setLogT(AppLog.T.COMMENTS);
-        mFilteredCommentsView.setFilterListener(new FilteredRecyclerView.FilterListener() {
-            @Override
-            public List<FilterCriteria> onLoadFilterCriteriaOptions(boolean refresh) {
-                @SuppressWarnings("unchecked")
-                ArrayList<FilterCriteria> criteria = new ArrayList();
-                Collections.addAll(criteria, mCommentStatuses);
-                return criteria;
-            }
-
-            @Override
-            public void onLoadFilterCriteriaOptionsAsync(
-                    FilteredRecyclerView.FilterCriteriaAsyncLoaderListener listener,
-                    boolean refresh) {
-            }
-
-            @Override
-            public void onLoadData(boolean forced) {
-                updateComments(false);
-            }
-
-            @Override
-            public void onFilterSelected(int position, FilterCriteria criteria) {
-                AppPrefs.setCommentsStatusFilter((CommentStatusCriteria) criteria);
-                mCommentStatusFilter = (CommentStatusCriteria) criteria;
-            }
-
-            @Override
-            public FilterCriteria onRecallSelection() {
-                mCommentStatusFilter = AppPrefs.getCommentsStatusFilter();
-                return mCommentStatusFilter;
-            }
-
-            @Override
-            public String onShowEmptyViewMessage(EmptyViewMessageType emptyViewMsgType) {
-                if (emptyViewMsgType == EmptyViewMessageType.NO_CONTENT) {
-                    FilterCriteria filter = mFilteredCommentsView.getCurrentFilter();
-                    String title;
-
-                    if (filter == null || filter == CommentStatusCriteria.ALL) {
-                        title = getString(R.string.comments_empty_list);
-                    } else {
-                        switch (mCommentStatusFilter) {
-                            case APPROVED:
-                                title = getString(R.string.comments_empty_list_filtered_approved);
-                                break;
-                            case UNAPPROVED:
-                                title = getString(R.string.comments_empty_list_filtered_pending);
-                                break;
-                            case SPAM:
-                                title = getString(R.string.comments_empty_list_filtered_spam);
-                                break;
-                            case TRASH:
-                                title = getString(R.string.comments_empty_list_filtered_trashed);
-                                break;
-                            default:
-                                title = getString(R.string.comments_empty_list);
-                        }
-                    }
-
-                    mActionableEmptyView.title.setText(title);
-                    mActionableEmptyView.setVisibility(View.VISIBLE);
-                    mFilteredCommentsView.setToolbarScrollFlags(0);
-                    return "";
-                } else {
-                    int stringId = 0;
-                    switch (emptyViewMsgType) {
-                        case LOADING:
-                            stringId = R.string.comments_fetching;
-                            break;
-                        case NETWORK_ERROR:
-                            stringId = R.string.no_network_message;
-                            break;
-                        case PERMISSION_ERROR:
-                            stringId = R.string.error_refresh_unauthorized_comments;
-                            break;
-                        case GENERIC_ERROR:
-                            stringId = R.string.error_refresh_comments;
-                            break;
-                    }
-
-                    mActionableEmptyView.setVisibility(View.GONE);
-                    mFilteredCommentsView.setToolbarScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL);
-                    return getString(stringId);
-                }
-            }
-
-            @Override
-            public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) {
-            }
-        });
-
-        mFilteredCommentsView.setToolbarLeftAndRightPadding(
-                getResources().getDimensionPixelSize(R.dimen.margin_filter_spinner),
-                getResources().getDimensionPixelSize(R.dimen.margin_none));
-
-        return view;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (mFilteredCommentsView.getAdapter() == null) {
-            mFilteredCommentsView.setAdapter(getAdapter());
-            if (!NetworkUtils.isNetworkAvailable(getActivity())) {
-                ToastUtils.showToast(getActivity(), getString(R.string.error_refresh_comments_showing_older));
-            }
-            getAdapter().loadComments(mCommentStatusFilter.toCommentStatus());
-        }
-    }
-
-    void setCommentStatusFilter(CommentStatus statusFilter) {
-        mCommentStatusFilter = CommentStatusCriteria.fromCommentStatus(statusFilter);
-    }
 
     private void dismissDialog(int id) {
         if (!isAdded()) {
@@ -467,40 +444,34 @@ private void deleteSelectedComments(boolean deletePermanently) {
         moderateComments(selectedComments, newStatus);
     }
 
-    private boolean shouldRemoveCommentFromList(CommentModel comment) {
-        CommentStatus status = CommentStatus.fromString(comment.getStatus());
-        switch (mCommentStatusFilter) {
-            case ALL:
-                return status != CommentStatus.APPROVED && status != CommentStatus.UNAPPROVED;
-            case UNAPPROVED:
-                return status != CommentStatus.UNAPPROVED;
+
+    private void moderateComments(CommentList comments, CommentStatus status) {
+        // track batch actions
+        switch (status) {
             case APPROVED:
-                return status != CommentStatus.APPROVED;
-            case TRASH:
-                return status != CommentStatus.TRASH;
+                AnalyticsTracker.track(Stat.COMMENT_BATCH_APPROVED);
+                break;
+            case UNAPPROVED:
+                AnalyticsTracker.track(Stat.COMMENT_BATCH_UNAPPROVED);
+                break;
             case SPAM:
-                return status != CommentStatus.SPAM;
-            case DELETE:
-            default:
-                return true;
+                AnalyticsTracker.track(Stat.COMMENT_BATCH_SPAMMED);
+                break;
+            case TRASH:
+                AnalyticsTracker.track(Stat.COMMENT_BATCH_TRASHED);
+                break;
+            case DELETED:
+                AnalyticsTracker.track(Stat.COMMENT_BATCH_DELETED);
+                break;
+            case ALL:
+            case UNSPAM:
+            case UNTRASH:
+                break; // noop
         }
-    }
 
-    private void moderateComments(CommentList comments, CommentStatus status) {
         for (CommentModel comment : comments) {
-            // Preemptive update
-            comment.setStatus(status.toString());
-            if (shouldRemoveCommentFromList(comment)) {
-                removeComment(comment);
-            }
-            if (status == CommentStatus.DELETED) {
-                // For deletion, we need to dispatch a specific action.
-                mDispatcher.dispatch(CommentActionBuilder.newDeleteCommentAction(
-                        new RemoteCommentPayload(mSite, comment)));
-            } else {
-                // Dispatch the update
-                mDispatcher.dispatch(CommentActionBuilder.newPushCommentAction(
-                        new RemoteCommentPayload(mSite, comment)));
+            if (getActivity() instanceof CommentsActivity) {
+                ((CommentsActivity) getActivity()).onModerateComment(comment, status, false);
             }
         }
     }
@@ -509,16 +480,7 @@ void loadComments() {
         // this is called from CommentsActivity when a comment was changed in the detail view,
         // and the change will already be in SQLite so simply reload the comment adapter
         // to show the change
-        getAdapter().loadComments(mCommentStatusFilter.toCommentStatus());
-    }
-
-    void updateEmptyView() {
-        // this is called from CommentsActivity in the case the last moment for a given type has been changed from that
-        // status, leaving the list empty, so we need to update the empty view. The method inside FilteredRecyclerView
-        // does the handling itself, so we only check for null here.
-        if (mFilteredCommentsView != null) {
-            mFilteredCommentsView.updateEmptyView(EmptyViewMessageType.NO_CONTENT);
-        }
+        getAdapter().reloadComments(mCommentStatusFilter.toCommentStatus());
     }
 
     /*
@@ -526,45 +488,46 @@ void updateEmptyView() {
      * existing ones
      */
     private void updateComments(boolean loadMore) {
-        if (mIsUpdatingComments) {
-            AppLog.w(AppLog.T.COMMENTS, "update comments task already running");
-            return;
-        } else if (!NetworkUtils.isNetworkAvailable(getActivity())) {
-            mFilteredCommentsView.updateEmptyView(EmptyViewMessageType.NETWORK_ERROR);
-            mFilteredCommentsView.setRefreshing(false);
+        if (!NetworkUtils.isNetworkAvailable(getActivity())) {
+            showEmptyView(EmptyViewMessageType.NETWORK_ERROR);
+            mSwipeRefreshLayout.setRefreshing(false);
             ToastUtils.showToast(getActivity(), getString(R.string.error_refresh_comments_showing_older));
             // we're offline, load/refresh whatever we have in our local db
-            getAdapter().loadComments(mCommentStatusFilter.toCommentStatus());
+            getAdapter().reloadComments(mCommentStatusFilter.toCommentStatus());
             return;
         }
 
+        if (getAdapter().getItemCount() == 0) {
+            showEmptyView(EmptyViewMessageType.LOADING);
+        }
+
         // immediately load/refresh whatever we have in our local db as we wait for the API call to get latest results
         if (!loadMore) {
-            getAdapter().loadComments(mCommentStatusFilter.toCommentStatus());
+            mSwipeRefreshLayout.setRefreshing(true);
+            getAdapter().loadInitialCachedComments(mCommentStatusFilter.toCommentStatus());
         }
 
-        mFilteredCommentsView.updateEmptyView(EmptyViewMessageType.LOADING);
-
         int offset = 0;
         if (loadMore) {
             offset = getAdapter().getItemCount();
-            mFilteredCommentsView.showLoadingProgress();
+            mLoadMoreProgress.setVisibility(View.VISIBLE);
+        }
+        mIsUpdatingComments = true;
+        if (mCommentStatusFilter == CommentStatusCriteria.UNREPLIED) {
+            mDispatcher.dispatch(CommentActionBuilder.newFetchCommentsAction(
+                    new FetchCommentsPayload(mSite, CommentStatus.ALL, MAX_COMMENTS_IN_RESPONSE, 0)));
+        } else {
+            mDispatcher.dispatch(CommentActionBuilder.newFetchCommentsAction(
+                    new FetchCommentsPayload(mSite, mCommentStatusFilter.toCommentStatus(), COMMENTS_PER_PAGE,
+                            offset)));
         }
-        mFilteredCommentsView.setRefreshing(true);
-
-        mDispatcher.dispatch(CommentActionBuilder.newFetchCommentsAction(
-                new FetchCommentsPayload(mSite, mCommentStatusFilter.toCommentStatus(), COMMENTS_PER_PAGE, offset)));
-    }
-
-
-    String getEmptyViewMessage() {
-        return mEmptyViewMessageType.name();
     }
 
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
-        outState.putSerializable(WordPress.SITE, mSite);
         super.onSaveInstanceState(outState);
+        outState.putSerializable(LOADING_IN_PROGRESS_KEY, mIsUpdatingComments);
+        outState.putSerializable(AUTO_REFRESHED_KEY, mHasAutoRefreshedComments);
     }
 
     /****
@@ -594,8 +557,13 @@ public boolean onCreateActionMode(ActionMode actionMode, Menu menu) {
             mActionMode = actionMode;
             MenuInflater inflater = actionMode.getMenuInflater();
             inflater.inflate(R.menu.menu_comments_cab, menu);
-            mFilteredCommentsView.setSwipeToRefreshEnabled(false);
+            mSwipeRefreshLayout.setEnabled(false);
             SmartToast.disableSmartToast(SmartToast.SmartToastType.COMMENTS_LONG_PRESS);
+
+            if (getActivity() instanceof CommentsActivity) {
+                ((CommentsActivity) getActivity()).onActionModeToggled(true);
+            }
+
             return true;
         }
 
@@ -670,27 +638,58 @@ public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
         @Override
         public void onDestroyActionMode(ActionMode mode) {
             getAdapter().setEnableSelection(false);
-            mFilteredCommentsView.setSwipeToRefreshEnabled(true);
+            mSwipeRefreshLayout.setEnabled(true);
             mActionMode = null;
+            if (getActivity() instanceof CommentsActivity) {
+                ((CommentsActivity) getActivity()).onActionModeToggled(false);
+            }
         }
     }
 
-    @SuppressWarnings("unused")
+    private boolean shouldRefreshCommentsList(OnCommentChanged event) {
+        if (event.requestedStatus == null) {
+            return true;
+        }
+
+        if (event.requestedStatus.equals(mCommentStatusFilter.toCommentStatus())) {
+            return true;
+        }
+
+        if (mCommentStatusFilter.toCommentStatus() == CommentStatus.UNREPLIED && event.requestedStatus
+                .equals(CommentStatus.ALL)) {
+            return true;
+        }
+
+        return event.causeOfChange == CommentAction.UPDATE_COMMENT
+               && mCommentStatusFilter.toCommentStatus().equals(CommentStatus.ALL) && (
+                       event.requestedStatus.equals(CommentStatus.UNAPPROVED) || event.requestedStatus
+                               .equals(CommentStatus.APPROVED));
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onCommentChanged(OnCommentChanged event) {
-        mFilteredCommentsView.hideLoadingProgress();
-        mFilteredCommentsView.setRefreshing(false);
+        mLoadMoreProgress.setVisibility(View.GONE);
+        mSwipeRefreshLayout.setRefreshing(false);
+        mIsUpdatingComments = false;
 
         // Don't refresh the list on push, we already updated comments
         if (event.causeOfChange != CommentAction.PUSH_COMMENT) {
-            loadComments();
+            if (shouldRefreshCommentsList(event)) {
+                if (event.offset > 0) {
+                    getAdapter().loadMoreComments(mCommentStatusFilter.toCommentStatus(), event.offset);
+                } else {
+                    getAdapter().reloadComments(mCommentStatusFilter.toCommentStatus());
+                }
+            }
+            return;
         }
+
         if (event.isError()) {
             if (!TextUtils.isEmpty(event.error.message)) {
                 ToastUtils.showToast(getActivity(), event.error.message);
             }
             // Reload the comment list in case of an error, we want to revert the UI to the previous state.
-            loadComments();
+            getAdapter().reloadComments(mCommentStatusFilter.toCommentStatus());
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListPagerAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListPagerAdapter.kt
new file mode 100644
index 000000000000..8a9c0370110d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListPagerAdapter.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.ui.comments
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria
+import java.lang.ref.WeakReference
+
+class CommentsListPagerAdapter(
+    private val pages: List<CommentStatusCriteria>,
+    fragmentActivity: FragmentActivity
+) : FragmentStateAdapter(fragmentActivity) {
+    private val listFragments = mutableMapOf<Int, WeakReference<CommentsListFragment>>()
+
+    fun getItemAtPosition(position: Int): CommentsListFragment? {
+        return listFragments[position]?.get()
+    }
+
+    override fun getItemCount(): Int = pages.size
+
+    override fun createFragment(position: Int): Fragment {
+        val fragment = CommentsListFragment.newInstance(pages[position])
+        listFragments[position] = WeakReference(fragment)
+        return fragment
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/LoadCommentsTask.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/LoadCommentsTask.java
index 751a146759d4..bd1f67cb4f13 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/comments/LoadCommentsTask.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/LoadCommentsTask.java
@@ -47,10 +47,10 @@ protected CommentList doInBackground(Void... params) {
         List<CommentModel> comments;
         if (mStatusFilter == null || mStatusFilter == CommentStatus.ALL) {
             // The "all" filter actually means "approved" + "unapproved" (but not "spam", "trash" or "deleted")
-            comments = mCommentStore.getCommentsForSite(mSite, false,
+            comments = mCommentStore.getCommentsForSite(mSite, false, 0,
                                                         CommentStatus.APPROVED, CommentStatus.UNAPPROVED);
         } else {
-            comments = mCommentStore.getCommentsForSite(mSite, false, mStatusFilter);
+            comments = mCommentStore.getCommentsForSite(mSite, false, 0, mStatusFilter);
         }
 
         CommentList tmpComments = new CommentList();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt
new file mode 100644
index 000000000000..f860ca759a64
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkNavigator.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.ui.deeplinks
+
+import android.content.Intent
+import androidx.appcompat.app.AppCompatActivity
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.LoginForResult
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditor
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForPost
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForSite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInBrowser
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenNotifications
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPages
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPagesForSite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStats
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForSite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForSiteAndTimeframe
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForTimeframe
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ShowSignInFlow
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.StartCreateSiteFlow
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ViewPostInReader
+import org.wordpress.android.ui.stats.StatsTimeframe
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class DeepLinkNavigator
+@Inject constructor() {
+    @Suppress("ComplexMethod")
+    fun handleNavigationAction(navigateAction: NavigateAction, activity: AppCompatActivity) {
+        when (navigateAction) {
+            LoginForResult -> ActivityLauncher.loginForDeeplink(activity)
+            StartCreateSiteFlow -> ActivityLauncher.showMainActivityAndSiteCreationActivity(activity)
+            ShowSignInFlow -> ActivityLauncher.showSignInForResultWpComOnly(activity)
+            OpenEditor -> ActivityLauncher.openEditorInNewStack(activity)
+            is OpenEditorForSite -> ActivityLauncher.openEditorForSiteInNewStack(
+                    activity,
+                    navigateAction.site
+            )
+            is OpenInBrowser -> {
+                val browserIntent = Intent(Intent.ACTION_VIEW, navigateAction.uri.uri)
+                activity.startActivity(browserIntent)
+            }
+            is OpenEditorForPost -> ActivityLauncher.openEditorForPostInNewStack(
+                    activity,
+                    navigateAction.site,
+                    navigateAction.postId
+            )
+            OpenStats -> ActivityLauncher.viewStatsInNewStack(activity)
+            is OpenStatsForTimeframe -> ActivityLauncher.viewStatsForTimeframeInNewStack(
+                    activity,
+                    navigateAction.statsTimeframe
+            )
+            is OpenStatsForSite -> ActivityLauncher.viewStatsInNewStack(activity, navigateAction.site)
+            is OpenStatsForSiteAndTimeframe -> ActivityLauncher.viewStatsInNewStack(
+                    activity,
+                    navigateAction.site,
+                    navigateAction.statsTimeframe
+            )
+            OpenReader -> ActivityLauncher.viewReaderInNewStack(activity)
+            is OpenInReader -> ActivityLauncher.viewPostDeeplinkInNewStack(activity, navigateAction.uri.uri)
+            is ViewPostInReader -> ActivityLauncher.viewReaderPostDetailInNewStack(
+                    activity,
+                    navigateAction.blogId,
+                    navigateAction.postId,
+                    navigateAction.uri.uri
+            )
+            OpenNotifications -> ActivityLauncher.viewNotificationsInNewStack(activity)
+            is OpenPagesForSite -> ActivityLauncher.viewPagesInNewStack(activity, navigateAction.site)
+            OpenPages -> ActivityLauncher.viewPagesInNewStack(activity)
+        }
+        if (navigateAction != LoginForResult) {
+            activity.finish()
+        }
+    }
+
+    sealed class NavigateAction {
+        object LoginForResult : NavigateAction()
+        data class OpenInBrowser(val uri: UriWrapper) : NavigateAction()
+        data class OpenEditorForPost(val site: SiteModel, val postId: Int) : NavigateAction()
+        data class OpenEditorForSite(val site: SiteModel) : NavigateAction()
+        object OpenReader : NavigateAction()
+        data class OpenInReader(val uri: UriWrapper) : NavigateAction()
+        data class ViewPostInReader(val blogId: Long, val postId: Long, val uri: UriWrapper) : NavigateAction()
+        object OpenEditor : NavigateAction()
+        data class OpenStatsForSiteAndTimeframe(val site: SiteModel, val statsTimeframe: StatsTimeframe) :
+                NavigateAction()
+
+        data class OpenStatsForSite(val site: SiteModel) : NavigateAction()
+        data class OpenStatsForTimeframe(val statsTimeframe: StatsTimeframe) : NavigateAction()
+        object OpenStats : NavigateAction()
+        object StartCreateSiteFlow : NavigateAction()
+        object ShowSignInFlow : NavigateAction()
+        object OpenNotifications : NavigateAction()
+        data class OpenPagesForSite(val site: SiteModel) : NavigateAction()
+        object OpenPages : NavigateAction()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtils.kt
new file mode 100644
index 000000000000..e1381f3fc273
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtils.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.ui.deeplinks
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.util.UriUtilsWrapper
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class DeepLinkUriUtils
+@Inject constructor(private val siteStore: SiteStore, private val uriUtilsWrapper: UriUtilsWrapper) {
+    private fun extractHostFromSite(site: SiteModel?): String? {
+        return site?.url?.let { uriUtilsWrapper.parse(it).host }
+    }
+
+    fun getUriFromQueryParameter(uri: UriWrapper, key: String) =
+            uri.getQueryParameter(key)?.let { uriUtilsWrapper.parse(it) }
+
+    private fun extractSiteModelFromTargetHost(host: String): List<SiteModel> {
+        return siteStore.getSitesByNameOrUrlMatching(host)
+    }
+
+    fun hostToSite(siteUrl: String): SiteModel? {
+        return extractSiteModelFromTargetHost(siteUrl).find { site ->
+            // Check if a site is available with given targetHost
+            val host = extractHostFromSite(site)
+            host != null && host == siteUrl
+        }
+    }
+
+    fun blogIdToSite(blogId: String): SiteModel? {
+        return blogId.toLongOrNull()?.let { siteStore.getSiteBySiteId(it) }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java
new file mode 100644
index 000000000000..748ee9585edd
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverActivity.java
@@ -0,0 +1,100 @@
+package org.wordpress.android.ui.deeplinks;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModelProvider;
+
+import org.wordpress.android.WordPress;
+import org.wordpress.android.ui.LocaleAwareActivity;
+import org.wordpress.android.ui.RequestCodes;
+import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.UriWrapper;
+
+import javax.inject.Inject;
+
+import static org.wordpress.android.WordPress.getContext;
+
+/**
+ * An activity to handle deep linking and intercepting links like:
+ * <p>
+ * wordpress://viewpost?blogId={blogId}&postId={postId}
+ * <p>
+ * Redirects users to the reader activity along with IDs passed in the intent
+ */
+public class DeepLinkingIntentReceiverActivity extends LocaleAwareActivity {
+    private static final String URI_KEY = "uri_key";
+
+    @Inject DeepLinkNavigator mDeeplinkNavigator;
+    @Inject DeepLinkUriUtils mDeepLinkUriUtils;
+    @Inject ViewModelProvider.Factory mViewModelFactory;
+    private DeepLinkingIntentReceiverViewModel mViewModel;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ((WordPress) getApplication()).component().inject(this);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(DeepLinkingIntentReceiverViewModel.class);
+        String action = null;
+        Uri uri;
+        if (savedInstanceState == null) {
+            action = getIntent().getAction();
+            uri = getIntent().getData();
+        } else {
+            uri = savedInstanceState.getParcelable(URI_KEY);
+        }
+
+        setupObservers();
+
+        UriWrapper uriWrapper = null;
+        if (uri != null) {
+            uriWrapper = new UriWrapper(uri);
+        }
+        mViewModel.start(action, uriWrapper);
+    }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        UriWrapper cachedUri = mViewModel.getCachedUri();
+        if (cachedUri != null) {
+            outState.putParcelable(URI_KEY, cachedUri.getUri());
+        }
+    }
+
+    private void setupObservers() {
+        mViewModel.getNavigateAction()
+                  .observe(this, navigateActionEvent -> navigateActionEvent.applyIfNotHandled(navigateAction -> {
+                      mDeeplinkNavigator.handleNavigationAction(navigateAction, this);
+                      return null;
+                  }));
+        mViewModel.getFinish()
+                  .observe(this, finishEvent -> finishEvent.applyIfNotHandled(unit -> {
+                      finish();
+                      return null;
+                  }));
+        mViewModel.getToast().observe(this, toastEvent -> toastEvent.applyIfNotHandled(toastMessage -> {
+            ToastUtils.showToast(getContext(), toastMessage);
+            return null;
+        }));
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        // show the post if user is returning from successful login
+        if (requestCode == RequestCodes.DO_LOGIN && resultCode == RESULT_OK) {
+            mViewModel.onSuccessfulLogin();
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModel.kt
new file mode 100644
index 000000000000..9fdb035cde07
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModel.kt
@@ -0,0 +1,130 @@
+package org.wordpress.android.ui.deeplinks
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DEEP_LINKED
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.LoginForResult
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInBrowser
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ShowSignInFlow
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+class DeepLinkingIntentReceiverViewModel
+@Inject constructor(
+    @Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher,
+    private val editorLinkHandler: EditorLinkHandler,
+    private val statsLinkHandler: StatsLinkHandler,
+    private val startLinkHandler: StartLinkHandler,
+    private val readerLinkHandler: ReaderLinkHandler,
+    private val pagesLinkHandler: PagesLinkHandler,
+    private val notificationsLinkHandler: NotificationsLinkHandler,
+    private val deepLinkUriUtils: DeepLinkUriUtils,
+    private val accountStore: AccountStore,
+    private val serverTrackingHandler: ServerTrackingHandler,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
+) : ScopedViewModel(uiDispatcher) {
+    private val _navigateAction = MutableLiveData<Event<NavigateAction>>()
+    val navigateAction = _navigateAction as LiveData<Event<NavigateAction>>
+    private val _finish = MutableLiveData<Event<Unit>>()
+    val finish = _finish as LiveData<Event<Unit>>
+    val toast = editorLinkHandler.toast
+    var cachedUri: UriWrapper? = null
+
+    fun start(action: String?, uri: UriWrapper?) {
+        if (action != null) {
+            analyticsUtilsWrapper.trackWithDeepLinkData(DEEP_LINKED, action, uri?.host ?: "", uri?.uri)
+        }
+        if (uri == null || !handleUrl(uri)) {
+            _finish.value = Event(Unit)
+        }
+    }
+
+    fun onSuccessfulLogin() {
+        cachedUri?.let {
+            handleUrl(it)
+        }
+    }
+
+    /**
+     * Handles the following URLs
+     * `wordpress.com/post...`
+     * `wordpress.com/stats...`
+     * `public-api.wordpress.com/mbar`
+     * and builds the navigation action based on them
+     */
+    private fun handleUrl(uriWrapper: UriWrapper): Boolean {
+        cachedUri = uriWrapper
+        return buildNavigateAction(uriWrapper)?.also {
+            if (accountStore.hasAccessToken() || it is OpenInBrowser || it is ShowSignInFlow) {
+                _navigateAction.value = Event(it)
+            } else {
+                _navigateAction.value = Event(LoginForResult)
+            }
+        } != null
+    }
+
+    /**
+     * Tracking URIs like `public-api.wordpress.com/mbar/...` come from emails and should be handled here
+     */
+    private fun isTrackingUrl(uri: UriWrapper): Boolean {
+        // https://public-api.wordpress.com/mbar/
+        return uri.host == HOST_API_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == MOBILE_TRACKING_PATH
+    }
+
+    private fun isWpLoginUrl(uri: UriWrapper): Boolean {
+        // https://wordpress.com/wp-login.php/
+        return uri.host == HOST_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == WP_LOGIN
+    }
+
+    private fun buildNavigateAction(uri: UriWrapper, rootUri: UriWrapper = uri): NavigateAction? {
+        return when {
+            isTrackingUrl(uri) -> getRedirectUriAndBuildNavigateAction(uri, rootUri)
+                    ?.also {
+                        // The new URL was build so we need to hit the original `mbar` tracking URL
+                        serverTrackingHandler.request(uri)
+                    }
+                    ?: OpenInBrowser(rootUri.copy(REGULAR_TRACKING_PATH))
+            isWpLoginUrl(uri) -> getRedirectUriAndBuildNavigateAction(uri, rootUri)
+            readerLinkHandler.isReaderUrl(uri) -> readerLinkHandler.buildOpenInReaderNavigateAction(uri)
+            editorLinkHandler.isEditorUrl(uri) -> editorLinkHandler.buildOpenEditorNavigateAction(uri)
+            statsLinkHandler.isStatsUrl(uri) -> statsLinkHandler.buildOpenStatsNavigateAction(uri)
+            startLinkHandler.isStartUrl(uri) -> startLinkHandler.buildNavigateAction()
+            notificationsLinkHandler.isNotificationsUrl(uri) -> notificationsLinkHandler.buildNavigateAction()
+            pagesLinkHandler.isPagesUrl(uri) -> pagesLinkHandler.buildNavigateAction(uri)
+            else -> null
+        }
+    }
+
+    private fun getRedirectUriAndBuildNavigateAction(uri: UriWrapper, rootUri: UriWrapper): NavigateAction? {
+        return getRedirectUri(uri)?.let { buildNavigateAction(it, rootUri) }
+    }
+
+    private fun getRedirectUri(uri: UriWrapper): UriWrapper? {
+        return deepLinkUriUtils.getUriFromQueryParameter(uri, REDIRECT_TO_PARAM)
+    }
+
+    override fun onCleared() {
+        serverTrackingHandler.clear()
+        cachedUri = null
+        super.onCleared()
+    }
+
+    companion object {
+        const val HOST_WORDPRESS_COM = "wordpress.com"
+        private const val HOST_API_WORDPRESS_COM = "public-api.wordpress.com"
+        private const val MOBILE_TRACKING_PATH = "mbar"
+        private const val REGULAR_TRACKING_PATH = "bar"
+        private const val REDIRECT_TO_PARAM = "redirect_to"
+        private const val WP_LOGIN = "wp-login.php"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/EditorLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/EditorLinkHandler.kt
new file mode 100644
index 000000000000..e9b5060a0bd8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/EditorLinkHandler.kt
@@ -0,0 +1,121 @@
+package org.wordpress.android.ui.deeplinks
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditor
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForPost
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditorForSite
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+
+class EditorLinkHandler
+@Inject constructor(
+    private val deepLinkUriUtils: DeepLinkUriUtils,
+    private val postStore: PostStore
+) {
+    private val _toast = MutableLiveData<Event<Int>>()
+    val toast = _toast as LiveData<Event<Int>>
+
+    /**
+     * Builds navigate action from URL like:
+     * https://wordpress.com/post/siteNameOrUrl/postId
+     * where siteNameOrUrl and postID are optional
+     * or App links like wordpress://post?blogId=798&postId=1231
+     */
+    fun buildOpenEditorNavigateAction(uri: UriWrapper): NavigateAction {
+        var hasSiteParam = false
+        var hasPostParam = false
+        val (targetSite, targetPost) = if (uri.host == POST_PATH) {
+            // Handles wordpress://post?blogId=798&postId=1231
+            val targetSite = uri.getQueryParameter(BLOG_ID).also { hasSiteParam = it != null }?.blogIdToSite()
+            val targetPost = uri.getQueryParameter(POST_ID).also { hasPostParam = it != null }?.toPost(targetSite)
+            targetSite to targetPost
+        } else {
+            // Handles https://wordpress.com/post/siteNameOrUrl/postId
+            val pathSegments = uri.pathSegments
+            val targetSite = pathSegments.getOrNull(1).also { hasSiteParam = it != null }?.hostNameToSite()
+            val targetPost = pathSegments.getOrNull(2).also { hasPostParam = it != null }?.toPost(targetSite)
+            targetSite to targetPost
+        }
+        return openEditorForSiteAndPost(hasSiteParam, hasPostParam, targetSite, targetPost)
+    }
+
+    /**
+     * Returns true if the URI should be handled by EditorLinkHandler.
+     * The handled links are `wordpress.com/post...1
+     */
+    fun isEditorUrl(uri: UriWrapper): Boolean {
+        return (uri.host == DeepLinkingIntentReceiverViewModel.HOST_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == POST_PATH) || uri.host == POST_PATH
+    }
+
+    /**
+     * Converts BlogID if long or Site URL for other cases to a SiteModel
+     */
+    private fun String.blogIdToSite(): SiteModel? {
+        return deepLinkUriUtils.blogIdToSite(this) ?: this.hostNameToSite()
+    }
+
+    /**
+     * Converts HOST name of a site to SiteModel. It finds the Site in the current local sites and matches the name
+     * to the host.
+     */
+    private fun String.hostNameToSite(): SiteModel? {
+        return deepLinkUriUtils.hostToSite(this)
+    }
+
+    /**
+     * Converts the post ID in String to the local PostModel (if available).
+     */
+    private fun String.toPost(site: SiteModel?): PostModel? {
+        val remotePostId: Long? = toLongOrNull()
+        return if (site != null && remotePostId != null) {
+            val post = postStore.getPostByRemotePostId(remotePostId, site)
+            if (post == null) {
+                _toast.value = Event(R.string.post_not_found)
+            }
+            post
+        } else {
+            null
+        }
+    }
+
+    private fun openEditorForSiteAndPost(
+        hasSiteParam: Boolean,
+        hasPostParam: Boolean,
+        site: SiteModel?,
+        post: PostModel?
+    ): NavigateAction {
+        return when {
+            site == null -> {
+                if (hasSiteParam) {
+                    // Site not found, or host of site doesn't match the host in url
+                    _toast.value = Event(R.string.blog_not_found)
+                }
+                // Open a new post editor with current selected site
+                OpenEditor
+            }
+            post == null -> {
+                if (hasPostParam) {
+                    // Post not found. Open new post editor for given site.
+                    _toast.value = Event(R.string.post_not_found)
+                }
+                // Open new post editor for given site
+                OpenEditorForSite(site)
+            }
+            else -> OpenEditorForPost(site, post.id)
+        }
+    }
+
+    companion object {
+        private const val POST_PATH = "post"
+        private const val BLOG_ID = "blogId"
+        private const val POST_ID = "postId"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/NotificationsLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/NotificationsLinkHandler.kt
new file mode 100644
index 000000000000..d331c68ddfc0
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/NotificationsLinkHandler.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.ui.deeplinks
+
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenNotifications
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class NotificationsLinkHandler
+@Inject constructor() {
+    /**
+     * Builds navigate action from URL like:
+     * https://wordpress.com/notifcations
+     */
+    fun buildNavigateAction(): NavigateAction {
+        return OpenNotifications
+    }
+
+    /**
+     * Returns true if the URI should be handled by NotificationsLinkHandler.
+     * The handled links are `https://wordpress.com/notifications`
+     */
+    fun isNotificationsUrl(uri: UriWrapper): Boolean {
+        return (uri.host == DeepLinkingIntentReceiverViewModel.HOST_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == NOTIFICATIONS_PATH) || uri.host == NOTIFICATIONS_PATH
+    }
+
+    companion object {
+        private const val NOTIFICATIONS_PATH = "notifications"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/PagesLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/PagesLinkHandler.kt
new file mode 100644
index 000000000000..6b7462f71801
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/PagesLinkHandler.kt
@@ -0,0 +1,37 @@
+package org.wordpress.android.ui.deeplinks
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPages
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenPagesForSite
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class PagesLinkHandler
+@Inject constructor(private val deepLinkUriUtils: DeepLinkUriUtils) {
+    /**
+     * Returns true if the URI looks like `wordpress.com/pages`
+     */
+    fun isPagesUrl(uri: UriWrapper): Boolean {
+        return uri.host == DeepLinkingIntentReceiverViewModel.HOST_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == PAGES_PATH
+    }
+
+    /**
+     * Returns StartCreateSiteFlow is user logged in and ShowSignInFlow if user is logged out
+     */
+    fun buildNavigateAction(uri: UriWrapper): NavigateAction {
+        val targetHost: String = uri.lastPathSegment ?: ""
+        val site: SiteModel? = deepLinkUriUtils.hostToSite(targetHost)
+        return if (site != null) {
+            OpenPagesForSite(site)
+        } else {
+            // In other cases, launch pages with the current selected site.
+            OpenPages
+        }
+    }
+
+    companion object {
+        private const val PAGES_PATH = "pages"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/ReaderLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/ReaderLinkHandler.kt
new file mode 100644
index 000000000000..e529cc328028
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/ReaderLinkHandler.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.ui.deeplinks
+
+import android.content.Intent
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_VIEWPOST_INTERCEPTED
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ViewPostInReader
+import org.wordpress.android.ui.reader.ReaderConstants
+import org.wordpress.android.ui.utils.IntentUtils
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+
+class ReaderLinkHandler
+@Inject constructor(
+    private val intentUtils: IntentUtils,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
+) {
+    private val _toast = MutableLiveData<Event<Int>>()
+    val toast = _toast as LiveData<Event<Int>>
+
+    /**
+     * URIs supported by the Reader are already defined as intent filters in the manifest. Instead of replicating
+     * that logic here, we simply check if we can resolve an [Intent] that uses [ReaderConstants.ACTION_VIEW_POST].
+     * Since that's a custom action that is only handled by the Reader, we can then assume it supports this URI.
+     * Other deeplinks handled:
+     * `wordpress://read`
+     * `wordpress://viewpost?blogId={blogId}&postId={postId}`
+     */
+    fun isReaderUrl(uri: UriWrapper) =
+            DEEP_LINK_HOST_READ == uri.host || DEEP_LINK_HOST_VIEWPOST == uri.host || intentUtils.canResolveWith(
+                    ReaderConstants.ACTION_VIEW_POST,
+                    uri
+            )
+
+    fun buildOpenInReaderNavigateAction(uri: UriWrapper): NavigateAction {
+        return when (uri.host) {
+            DEEP_LINK_HOST_READ -> OpenReader
+            DEEP_LINK_HOST_VIEWPOST -> {
+                val blogId = uri.getQueryParameter("blogId")?.toLongOrNull()
+                val postId = uri.getQueryParameter("postId")?.toLongOrNull()
+                if (blogId != null && postId != null) {
+                    analyticsUtilsWrapper.trackWithBlogPostDetails(READER_VIEWPOST_INTERCEPTED, blogId, postId)
+                    ViewPostInReader(blogId, postId, uri)
+                } else {
+                    _toast.value = Event(R.string.error_generic)
+                    OpenReader
+                }
+            }
+            else -> OpenInReader(uri)
+        }
+    }
+
+    companion object {
+        private const val DEEP_LINK_HOST_READ = "read"
+        private const val DEEP_LINK_HOST_VIEWPOST = "viewpost"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/ServerTrackingHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/ServerTrackingHandler.kt
new file mode 100644
index 000000000000..6aa950f27683
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/ServerTrackingHandler.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.android.volley.Request.Method
+import com.android.volley.RequestQueue
+import com.android.volley.toolbox.StringRequest
+import com.android.volley.toolbox.Volley
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.util.AppLog.T.API
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.coroutines.CoroutineContext
+
+class ServerTrackingHandler
+@Inject constructor(
+    private val appLogWrapper: AppLogWrapper,
+    contextProvider: ContextProvider,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) : CoroutineScope {
+    private val queue: RequestQueue = Volley.newRequestQueue(contextProvider.getContext())
+    private val job = Job()
+    fun request(uri: UriWrapper) {
+        launch {
+            queue.add(
+                    StringRequest(
+                            Method.GET, uri.toString(),
+                            { appLogWrapper.d(API, "DeepLink tracking URI successfully requested") },
+                            { error -> appLogWrapper.e(API, "DeepLink tracking URI request failed: $error") })
+            )
+        }
+    }
+
+    fun clear() {
+        job.cancel()
+    }
+
+    override val coroutineContext: CoroutineContext
+        get() = bgDispatcher + job
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/StartLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/StartLinkHandler.kt
new file mode 100644
index 000000000000..7721b4054a3c
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/StartLinkHandler.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.deeplinks
+
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ShowSignInFlow
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.StartCreateSiteFlow
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class StartLinkHandler
+@Inject constructor(private val accountStore: AccountStore) {
+    /**
+     * Returns true if the URI looks like `wordpress.com/start`
+     */
+    fun isStartUrl(uri: UriWrapper): Boolean {
+        return uri.host == DeepLinkingIntentReceiverViewModel.HOST_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == START_PATH
+    }
+
+    /**
+     * Returns StartCreateSiteFlow is user logged in and ShowSignInFlow if user is logged out
+     */
+    fun buildNavigateAction(): NavigateAction {
+        return if (accountStore.hasAccessToken()) {
+            StartCreateSiteFlow
+        } else {
+            ShowSignInFlow
+        }
+    }
+
+    companion object {
+        private const val START_PATH = "start"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/StatsLinkHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/StatsLinkHandler.kt
new file mode 100644
index 000000000000..3f2c225f279a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/deeplinks/StatsLinkHandler.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.ui.deeplinks
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStats
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForSite
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForSiteAndTimeframe
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenStatsForTimeframe
+import org.wordpress.android.ui.stats.StatsTimeframe
+import org.wordpress.android.util.UriWrapper
+import javax.inject.Inject
+
+class StatsLinkHandler
+@Inject constructor(
+    private val deepLinkUriUtils: DeepLinkUriUtils
+) {
+    /**
+     * Builds navigate action from URL like:
+     * https://wordpress.com/stats/$timeframe/$site
+     * where timeframe and site are optional
+     * or
+     * wordpress://stats
+     */
+    fun buildOpenStatsNavigateAction(uri: UriWrapper): NavigateAction {
+        val pathSegments = uri.pathSegments
+        val length = pathSegments.size
+        val site = pathSegments.getOrNull(length - 1)?.toSite()
+        val statsTimeframe = pathSegments.getOrNull(length - 2)?.toStatsTimeframe()
+        return when {
+            site != null && statsTimeframe != null -> {
+                OpenStatsForSiteAndTimeframe(site, statsTimeframe)
+            }
+            site != null -> {
+                OpenStatsForSite(site)
+            }
+            statsTimeframe != null -> {
+                OpenStatsForTimeframe(statsTimeframe)
+            }
+            else -> {
+                // In other cases, launch stats with the current selected site.
+                OpenStats
+            }
+        }
+    }
+
+    /**
+     * Returns true if the URI should be handled by StatsLinkHandler.
+     * The handled links are `https://wordpress.com/stats/day/$site` and `wordpress://stats`
+     */
+    fun isStatsUrl(uri: UriWrapper): Boolean {
+        return (uri.host == DeepLinkingIntentReceiverViewModel.HOST_WORDPRESS_COM &&
+                uri.pathSegments.firstOrNull() == STATS_PATH) || uri.host == STATS_PATH
+    }
+
+    /**
+     * Converts HOST name of a site to SiteModel. It finds the Site in the current local sites and matches the name
+     * to the host.
+     */
+    private fun String.toSite(): SiteModel? {
+        return deepLinkUriUtils.hostToSite(this)
+    }
+
+    private fun String.toStatsTimeframe(): StatsTimeframe? {
+        return when (this) {
+            "day" -> StatsTimeframe.DAY
+            "week" -> StatsTimeframe.WEEK
+            "month" -> StatsTimeframe.MONTH
+            "year" -> StatsTimeframe.YEAR
+            "insights" -> StatsTimeframe.INSIGHTS
+            else -> null
+        }
+    }
+    companion object {
+        private const val STATS_PATH = "stats"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt
index 06c338abe3ec..dfd83bb51761 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationActivity.kt
@@ -7,10 +7,9 @@ import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.domain_suggestions_activity.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.DomainSuggestionsActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.ScrollableViewInitializedListener
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION
@@ -29,25 +28,34 @@ class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitiali
     @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: DomainRegistrationMainViewModel
     private lateinit var domainRegistrationPurpose: DomainRegistrationPurpose
+    private var binding: DomainSuggestionsActivityBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
-        setContentView(R.layout.domain_suggestions_activity)
+        with(DomainSuggestionsActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
+            binding = this
 
-        domainRegistrationPurpose = intent.getSerializableExtra(DOMAIN_REGISTRATION_PURPOSE_KEY)
-                as DomainRegistrationPurpose
+            domainRegistrationPurpose = intent.getSerializableExtra(DOMAIN_REGISTRATION_PURPOSE_KEY)
+                    as DomainRegistrationPurpose
 
-        setSupportActionBar(toolbar_main)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
+            setSupportActionBar(toolbarDomain)
+            supportActionBar?.let {
+                it.setHomeButtonEnabled(true)
+                it.setDisplayHomeAsUpEnabled(true)
+            }
+            setupViewModel()
         }
-        setupViewModel()
+    }
+
+    override fun onDestroy() {
+        binding = null
+        super.onDestroy()
     }
 
     private fun setupViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(DomainRegistrationMainViewModel::class.java)
         viewModel.start()
 
@@ -140,18 +148,20 @@ class DomainRegistrationActivity : LocaleAwareActivity(), ScrollableViewInitiali
     }
 
     override fun onScrollableViewInitialized(containerId: Int) {
-        if (containerId == R.id.domain_suggestions_list) {
-            appbar_main.post {
-                appbar_main.isLiftOnScroll = false
-                appbar_main.setLifted(false)
-                appbar_main.elevation = 0F
-                appbar_main.requestLayout()
-            }
-        } else {
-            appbar_main.post {
-                appbar_main.isLiftOnScroll = true
-                appbar_main.liftOnScrollTargetViewId = containerId
-                appbar_main.requestLayout()
+        binding?.apply {
+            if (containerId == R.id.domain_suggestions_list) {
+                appbarMain.post {
+                    appbarMain.isLiftOnScroll = false
+                    appbarMain.setLifted(false)
+                    appbarMain.elevation = 0F
+                    appbarMain.requestLayout()
+                }
+            } else {
+                appbarMain.post {
+                    appbarMain.isLiftOnScroll = true
+                    appbarMain.liftOnScrollTargetViewId = containerId
+                    appbarMain.requestLayout()
+                }
             }
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt
index 95af86776c2d..2be7da7abdba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationDetailsFragment.kt
@@ -15,17 +15,15 @@ import android.view.ViewGroup
 import android.widget.EditText
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
 import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.domain_registration_details_fragment.*
 import org.apache.commons.lang3.StringEscapeUtils
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.DomainRegistrationDetailsFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.rest.wpcom.site.SupportedStateResponse
 import org.wordpress.android.fluxc.network.rest.wpcom.transactions.SupportedDomainCountry
@@ -47,6 +45,7 @@ import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.WPUrlUtils
 import org.wordpress.android.viewmodel.domains.DomainRegistrationDetailsViewModel
 import org.wordpress.android.viewmodel.domains.DomainRegistrationDetailsViewModel.DomainContactFormModel
+import org.wordpress.android.viewmodel.domains.DomainRegistrationDetailsViewModel.DomainRegistrationDetailsUiState
 import javax.inject.Inject
 
 class DomainRegistrationDetailsFragment : Fragment() {
@@ -68,6 +67,7 @@ class DomainRegistrationDetailsFragment : Fragment() {
     private lateinit var mainViewModel: DomainRegistrationMainViewModel
 
     private var loadingProgressDialog: ProgressDialog? = null
+    private var binding: DomainRegistrationDetailsFragmentBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -86,60 +86,68 @@ class DomainRegistrationDetailsFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        mainViewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        mainViewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(DomainRegistrationMainViewModel::class.java)
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(DomainRegistrationDetailsViewModel::class.java)
-        setupObservers()
+        with(DomainRegistrationDetailsFragmentBinding.bind(view)) {
+            binding = this
+            setupObservers()
 
-        val domainProductDetails = requireNotNull(
-                arguments?.getParcelable<DomainProductDetails?>(EXTRA_DOMAIN_PRODUCT_DETAILS)
-        )
-        val site = requireActivity().intent?.getSerializableExtra(WordPress.SITE) as SiteModel
+            val domainProductDetails = requireNotNull(
+                    arguments?.getParcelable<DomainProductDetails?>(EXTRA_DOMAIN_PRODUCT_DETAILS)
+            )
+            val site = requireActivity().intent?.getSerializableExtra(WordPress.SITE) as SiteModel
 
-        viewModel.start(site, domainProductDetails)
+            viewModel.start(site, domainProductDetails)
 
-        domain_privacy_on_radio_button.setOnClickListener {
-            viewModel.togglePrivacyProtection(true)
-        }
+            domainPrivacyOnRadioButton.setOnClickListener {
+                viewModel.togglePrivacyProtection(true)
+            }
 
-        domain_privacy_off_radio_button.setOnClickListener {
-            viewModel.togglePrivacyProtection(false)
-        }
+            domainPrivacyOffRadioButton.setOnClickListener {
+                viewModel.togglePrivacyProtection(false)
+            }
 
-        // Country and State input could only be populated from the dialog
-        country_input.inputType = 0
-        country_input.setOnClickListener {
-            viewModel.onCountrySelectorClicked()
-        }
+            // Country and State input could only be populated from the dialog
+            countryInput.inputType = 0
+            countryInput.setOnClickListener {
+                viewModel.onCountrySelectorClicked()
+            }
 
-        state_input.inputType = 0
-        state_input.setOnClickListener {
-            viewModel.onStateSelectorClicked()
-        }
+            stateInput.inputType = 0
+            stateInput.setOnClickListener {
+                viewModel.onStateSelectorClicked()
+            }
 
-        register_domain_button.setOnClickListener {
-            if (validateForm()) {
-                viewModel.onRegisterDomainButtonClicked()
+            registerDomainButton.setOnClickListener {
+                if (validateForm()) {
+                    viewModel.onRegisterDomainButtonClicked()
+                }
             }
+
+            setupTosLink()
+            setupInputFieldTextWatchers()
         }
+    }
 
-        setupTosLink()
-        setupInputFieldTextWatchers()
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
-    private fun setupInputFieldTextWatchers() {
+    private fun DomainRegistrationDetailsFragmentBinding.setupInputFieldTextWatchers() {
         arrayOf(
-                first_name_input,
-                last_name_input,
-                organization_input,
-                email_input,
-                country_code_input,
-                phone_number_input,
-                address_first_line_input,
-                address_second_line_input,
-                city_input,
-                postal_code_input
+                firstNameInput,
+                lastNameInput,
+                organizationInput,
+                emailInput,
+                countryCodeInput,
+                phoneNumberInput,
+                addressFirstLineInput,
+                addressSecondLineInput,
+                cityInput,
+                postalCodeInput
         ).forEach {
             it.addTextChangedListener(object : TextWatcher {
                 override fun afterTextChanged(p0: Editable?) {
@@ -156,51 +164,29 @@ class DomainRegistrationDetailsFragment : Fragment() {
     }
 
     // make link to ToS clickable
-    private fun setupTosLink() {
-        tos_explanation.text = Html.fromHtml(
+    private fun DomainRegistrationDetailsFragmentBinding.setupTosLink() {
+        tosExplanation.text = Html.fromHtml(
                 String.format(
                         resources.getString(R.string.domain_registration_privacy_protection_tos),
                         "<u>",
                         "</u>"
                 )
         )
-        tos_explanation.movementMethod = LinkMovementMethod.getInstance()
-        tos_explanation.setOnClickListener {
+        tosExplanation.movementMethod = LinkMovementMethod.getInstance()
+        tosExplanation.setOnClickListener {
             viewModel.onTosLinkClicked()
         }
     }
 
-    private fun setupObservers() {
+    private fun DomainRegistrationDetailsFragmentBinding.setupObservers() {
         viewModel.uiState.observe(viewLifecycleOwner,
-                Observer { uiState ->
-                    uiState?.let {
-                        toggleFormProgressIndictor(uiState.isFormProgressIndicatorVisible)
-                        toggleStateProgressIndicator(uiState.isStateProgressIndicatorVisible)
-                        toggleStateInputEnabledState(uiState.isStateInputEnabled)
-
-                        if (uiState.isRegistrationProgressIndicatorVisible) {
-                            showDomainRegistrationProgressDialog()
-                        } else {
-                            hideDomainRegistrationProgressDialog()
-                        }
-
-                        if (uiState.isPrivacyProtectionEnabled) {
-                            domain_privacy_options_radiogroup.check(R.id.domain_privacy_on_radio_button)
-                        } else {
-                            domain_privacy_options_radiogroup.check(R.id.domain_privacy_off_radio_button)
-                        }
-
-                        register_domain_button.isEnabled = uiState.isDomainRegistrationButtonEnabled
-
-                        // Country and State fields treated as UI state, since we only use them for display purpose
-                        country_input.setText(uiState.selectedCountry?.name)
-                        state_input.setText(uiState.selectedState?.name)
-                    }
+                {
+                    it?.let { uiState -> loadState(uiState) }
                 })
 
         viewModel.domainContactForm.observe(
                 viewLifecycleOwner,
-                Observer<DomainContactFormModel> { domainContactFormModel ->
+                { domainContactFormModel ->
                     val currentModel = getDomainContactFormModel()
                     if (currentModel != domainContactFormModel) {
                         populateContactForm(domainContactFormModel!!)
@@ -208,62 +194,33 @@ class DomainRegistrationDetailsFragment : Fragment() {
                 })
 
         viewModel.showCountryPickerDialog.observe(viewLifecycleOwner,
-                Observer {
+                {
                     if (it != null && it.isNotEmpty()) {
                         showCountryPicker(it)
                     }
                 })
 
         viewModel.showStatePickerDialog.observe(viewLifecycleOwner,
-                Observer {
+                {
                     if (it != null && it.isNotEmpty()) {
                         showStatePicker(it)
                     }
                 })
 
-        viewModel.formError.observe(viewLifecycleOwner,
-                Observer { error ->
-                    var affectedInputFields: Array<TextInputEditText>? = null
-
-                    when (error?.type) {
-                        FIRST_NAME -> affectedInputFields = arrayOf(first_name_input)
-                        LAST_NAME -> affectedInputFields = arrayOf(last_name_input)
-                        ORGANIZATION -> affectedInputFields = arrayOf(organization_input)
-                        ADDRESS_1 -> affectedInputFields = arrayOf(address_first_line_input)
-                        ADDRESS_2 -> affectedInputFields = arrayOf(address_second_line_input)
-                        POSTAL_CODE -> affectedInputFields = arrayOf(postal_code_input)
-                        CITY -> affectedInputFields = arrayOf(city_input)
-                        STATE -> affectedInputFields = arrayOf(state_input)
-                        COUNTRY_CODE -> affectedInputFields = arrayOf(country_input)
-                        EMAIL -> affectedInputFields = arrayOf(email_input)
-                        PHONE -> affectedInputFields = arrayOf(
-                                country_code_input,
-                                phone_number_input
-                        )
-                        else -> {
-                        } // Something else, will just show a Toast with an error message
-                    }
-                    affectedInputFields?.forEach {
-                        showFieldError(
-                                it,
-                                StringEscapeUtils.unescapeHtml4(error?.message)
-                        )
-                    }
-                    affectedInputFields?.firstOrNull { it.requestFocus() }
-                })
+        observeFormError(viewModel)
 
         viewModel.showErrorMessage.observe(viewLifecycleOwner,
-                Observer { errorMessage ->
+                { errorMessage ->
                     ToastUtils.showToast(context, errorMessage)
                 })
 
         viewModel.handleCompletedDomainRegistration.observe(viewLifecycleOwner,
-                Observer { domainRegisteredEvent ->
+                { domainRegisteredEvent ->
                     mainViewModel.completeDomainRegistration(domainRegisteredEvent)
                 })
 
         viewModel.showTos.observe(viewLifecycleOwner,
-                Observer {
+                {
                     ActivityLauncher.openUrlExternal(
                             context,
                             WPUrlUtils.buildTermsOfServiceUrl(context)
@@ -271,33 +228,89 @@ class DomainRegistrationDetailsFragment : Fragment() {
                 })
     }
 
-    private fun populateContactForm(domainContactFormModel: DomainContactFormModel) {
-        first_name_input.setText(domainContactFormModel.firstName)
-        last_name_input.setText(domainContactFormModel.lastName)
-        organization_input.setText(domainContactFormModel.organization)
-        email_input.setText(domainContactFormModel.email)
-        country_code_input.setText(domainContactFormModel.phoneNumberPrefix)
-        phone_number_input.setText(domainContactFormModel.phoneNumber)
-        address_first_line_input.setText(domainContactFormModel.addressLine1)
-        address_second_line_input.setText(domainContactFormModel.addressLine2)
-        city_input.setText(domainContactFormModel.city)
-        postal_code_input.setText(domainContactFormModel.postalCode)
+    private fun DomainRegistrationDetailsFragmentBinding.loadState(uiState: DomainRegistrationDetailsUiState) {
+        toggleFormProgressIndictor(uiState.isFormProgressIndicatorVisible)
+        toggleStateProgressIndicator(uiState.isStateProgressIndicatorVisible)
+        toggleStateInputEnabledState(uiState.isStateInputEnabled)
+
+        if (uiState.isRegistrationProgressIndicatorVisible) {
+            showDomainRegistrationProgressDialog()
+        } else {
+            hideDomainRegistrationProgressDialog()
+        }
+
+        if (uiState.isPrivacyProtectionEnabled) {
+            domainPrivacyOptionsRadiogroup.check(R.id.domain_privacy_on_radio_button)
+        } else {
+            domainPrivacyOptionsRadiogroup.check(R.id.domain_privacy_off_radio_button)
+        }
+
+        registerDomainButton.isEnabled = uiState.isDomainRegistrationButtonEnabled
+
+        // Country and State fields treated as UI state, since we only use them for display purpose
+        countryInput.setText(uiState.selectedCountry?.name)
+        stateInput.setText(uiState.selectedState?.name)
+    }
+
+    private fun DomainRegistrationDetailsFragmentBinding.observeFormError(
+        viewModel: DomainRegistrationDetailsViewModel
+    ) {
+        viewModel.formError.observe(viewLifecycleOwner,
+                { error ->
+                    var affectedInputFields: Array<TextInputEditText>? = null
+
+                    when (error?.type) {
+                        FIRST_NAME -> affectedInputFields = arrayOf(firstNameInput)
+                        LAST_NAME -> affectedInputFields = arrayOf(lastNameInput)
+                        ORGANIZATION -> affectedInputFields = arrayOf(organizationInput)
+                        ADDRESS_1 -> affectedInputFields = arrayOf(addressFirstLineInput)
+                        ADDRESS_2 -> affectedInputFields = arrayOf(addressSecondLineInput)
+                        POSTAL_CODE -> affectedInputFields = arrayOf(postalCodeInput)
+                        CITY -> affectedInputFields = arrayOf(cityInput)
+                        STATE -> affectedInputFields = arrayOf(stateInput)
+                        COUNTRY_CODE -> affectedInputFields = arrayOf(countryInput)
+                        EMAIL -> affectedInputFields = arrayOf(emailInput)
+                        PHONE -> affectedInputFields = arrayOf(
+                                countryCodeInput,
+                                phoneNumberInput
+                        )
+                        else -> {
+                        } // Something else, will just show a Toast with an error message
+                    }
+                    affectedInputFields?.forEach {
+                        showFieldError(it, StringEscapeUtils.unescapeHtml4(error?.message))
+                    }
+                    affectedInputFields?.firstOrNull { it.requestFocus() }
+                })
+    }
+
+    private fun DomainRegistrationDetailsFragmentBinding.populateContactForm(formModel: DomainContactFormModel) {
+        firstNameInput.setText(formModel.firstName)
+        lastNameInput.setText(formModel.lastName)
+        organizationInput.setText(formModel.organization)
+        emailInput.setText(formModel.email)
+        countryCodeInput.setText(formModel.phoneNumberPrefix)
+        phoneNumberInput.setText(formModel.phoneNumber)
+        addressFirstLineInput.setText(formModel.addressLine1)
+        addressSecondLineInput.setText(formModel.addressLine2)
+        cityInput.setText(formModel.city)
+        postalCodeInput.setText(formModel.postalCode)
     }
 
     // local validation
-    private fun validateForm(): Boolean {
+    private fun DomainRegistrationDetailsFragmentBinding.validateForm(): Boolean {
         var formIsCompleted = true
 
         val requiredFields = arrayOf(
-                first_name_input,
-                last_name_input,
-                email_input,
-                country_code_input,
-                phone_number_input,
-                country_input,
-                address_first_line_input,
-                city_input,
-                postal_code_input
+                firstNameInput,
+                lastNameInput,
+                emailInput,
+                countryCodeInput,
+                phoneNumberInput,
+                countryInput,
+                addressFirstLineInput,
+                cityInput,
+                postalCodeInput
         )
 
         var fieldToFocusOn: TextInputEditText? = null
@@ -343,20 +356,20 @@ class DomainRegistrationDetailsFragment : Fragment() {
         editText.error = errorMessage
     }
 
-    private fun getDomainContactFormModel(): DomainContactFormModel {
+    private fun getDomainContactFormModel(): DomainContactFormModel = with(binding!!) {
         return DomainContactFormModel(
-                first_name_input.text.toString(),
-                last_name_input.text.toString(),
-                StringUtils.notNullStr(organization_input.text.toString()),
-                address_first_line_input.text.toString(),
-                address_second_line_input.text.toString(),
-                postal_code_input.text.toString(),
-                city_input.text.toString(),
+                firstNameInput.text.toString(),
+                lastNameInput.text.toString(),
+                StringUtils.notNullStr(organizationInput.text.toString()),
+                addressFirstLineInput.text.toString(),
+                addressSecondLineInput.text.toString(),
+                postalCodeInput.text.toString(),
+                cityInput.text.toString(),
                 null, // state code will be added in ViewModel
                 null, // country code will be added in ViewModel
-                email_input.text.toString(),
-                country_code_input.text.toString(),
-                phone_number_input.text.toString()
+                emailInput.text.toString(),
+                countryCodeInput.text.toString(),
+                phoneNumberInput.text.toString()
         )
     }
 
@@ -376,30 +389,30 @@ class DomainRegistrationDetailsFragment : Fragment() {
         dialogFragment.show(requireFragmentManager(), CountryPickerDialogFragment.TAG)
     }
 
-    private fun toggleFormProgressIndictor(visible: Boolean) {
+    private fun DomainRegistrationDetailsFragmentBinding.toggleFormProgressIndictor(visible: Boolean) {
         if (visible) {
-            form_progress_indicator.visibility = View.VISIBLE
+            formProgressIndicator.visibility = View.VISIBLE
         } else {
-            form_progress_indicator.visibility = View.GONE
+            formProgressIndicator.visibility = View.GONE
         }
     }
 
-    private fun toggleStateProgressIndicator(visible: Boolean) {
+    private fun DomainRegistrationDetailsFragmentBinding.toggleStateProgressIndicator(visible: Boolean) {
         if (visible) {
-            states_loading_progress_indicator.visibility = View.VISIBLE
+            statesLoadingProgressIndicator.visibility = View.VISIBLE
         } else {
-            states_loading_progress_indicator.visibility = View.GONE
+            statesLoadingProgressIndicator.visibility = View.GONE
         }
 
-        state_input_container.isEnabled = !visible
+        stateInputContainer.isEnabled = !visible
     }
 
-    private fun toggleStateInputEnabledState(enabled: Boolean) {
-        state_input_container.isEnabled = enabled
+    private fun DomainRegistrationDetailsFragmentBinding.toggleStateInputEnabledState(enabled: Boolean) {
+        stateInputContainer.isEnabled = enabled
         if (enabled) {
-            state_input_container.hint = getString(R.string.domain_contact_information_state_hint)
+            stateInputContainer.hint = getString(R.string.domain_contact_information_state_hint)
         } else {
-            state_input_container.hint = getString(R.string.domain_contact_information_state_not_available_hint)
+            stateInputContainer.hint = getString(R.string.domain_contact_information_state_not_available_hint)
         }
     }
 
@@ -452,7 +465,7 @@ class DomainRegistrationDetailsFragment : Fragment() {
                 throw IllegalStateException("StatePickerDialogFragment is missing a targetFragment ")
             }
 
-            viewModel = ViewModelProviders.of(targetFragment!!, viewModelFactory)
+            viewModel = ViewModelProvider(targetFragment!!, viewModelFactory)
                     .get(DomainRegistrationDetailsViewModel::class.java)
             val builder = MaterialAlertDialogBuilder(requireContext())
             builder.setTitle(R.string.domain_registration_state_picker_dialog_title)
@@ -502,7 +515,7 @@ class DomainRegistrationDetailsFragment : Fragment() {
                 throw IllegalStateException("CountryPickerDialogFragment is missing a targetFragment ")
             }
 
-            viewModel = ViewModelProviders.of(targetFragment!!, viewModelFactory)
+            viewModel = ViewModelProvider(targetFragment!!, viewModelFactory)
                     .get(DomainRegistrationDetailsViewModel::class.java)
             val builder = MaterialAlertDialogBuilder(requireContext())
             builder.setTitle(R.string.domain_registration_country_picker_dialog_title)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationResultFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationResultFragment.kt
index 0620d6d944cb..247e38e98eea 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationResultFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainRegistrationResultFragment.kt
@@ -3,17 +3,15 @@ package org.wordpress.android.ui.domains
 import android.app.Activity.RESULT_OK
 import android.content.Intent
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT
 import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.domain_registration_result_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.DomainRegistrationResultFragmentBinding
 
-class DomainRegistrationResultFragment : Fragment() {
+class DomainRegistrationResultFragment : Fragment(R.layout.domain_registration_result_fragment) {
     private var domainName: String? = null
     private var email: String? = null
 
@@ -39,28 +37,25 @@ class DomainRegistrationResultFragment : Fragment() {
         email = arguments?.getString(EXTRA_REGISTERED_DOMAIN_EMAIL, "")
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.domain_registration_result_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         checkNotNull((activity?.application as WordPress).component())
-
-        continue_button.setOnClickListener {
-            val intent = Intent()
-            intent.putExtra(RESULT_REGISTERED_DOMAIN_EMAIL, email)
-            val nonNullActivity = requireActivity()
-            nonNullActivity.setResult(RESULT_OK, intent)
-            nonNullActivity.finish()
+        with(DomainRegistrationResultFragmentBinding.bind(view)) {
+            continueButton.setOnClickListener {
+                val intent = Intent()
+                intent.putExtra(RESULT_REGISTERED_DOMAIN_EMAIL, email)
+                val nonNullActivity = requireActivity()
+                nonNullActivity.setResult(RESULT_OK, intent)
+                nonNullActivity.finish()
+            }
+
+            domainRegistrationResultMessage.text = HtmlCompat.fromHtml(
+                    getString(
+                            R.string.domain_registration_result_description,
+                            domainName
+                    ), FROM_HTML_MODE_COMPACT
+            )
         }
-
-        domain_registration_result_message.text = HtmlCompat.fromHtml(
-                getString(
-                        R.string.domain_registration_result_description,
-                        domainName
-                ), FROM_HTML_MODE_COMPACT
-        )
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsFragment.kt
index 9e1ea268a1eb..698282e27101 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/domains/DomainSuggestionsFragment.kt
@@ -4,18 +4,15 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextUtils
 import android.text.TextWatcher
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.domain_suggestions_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.DomainSuggestionsFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.rest.wpcom.site.DomainSuggestionResponse
 import org.wordpress.android.models.networkresource.ListState
@@ -24,7 +21,7 @@ import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.viewmodel.domains.DomainSuggestionsViewModel
 import javax.inject.Inject
 
-class DomainSuggestionsFragment : Fragment() {
+class DomainSuggestionsFragment : Fragment(R.layout.domain_suggestions_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var mainViewModel: DomainRegistrationMainViewModel
     private lateinit var viewModel: DomainSuggestionsViewModel
@@ -36,42 +33,35 @@ class DomainSuggestionsFragment : Fragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.domain_suggestions_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
         (nonNullActivity.application as WordPress).component().inject(this)
 
-        mainViewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        mainViewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(DomainRegistrationMainViewModel::class.java)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(DomainSuggestionsViewModel::class.java)
+        with(DomainSuggestionsFragmentBinding.bind(view)) {
+            val nonNullIntent = checkNotNull(nonNullActivity.intent)
+            val site = nonNullIntent.getSerializableExtra(WordPress.SITE) as SiteModel
 
-        val nonNullIntent = checkNotNull(nonNullActivity.intent)
-        val site = nonNullIntent.getSerializableExtra(WordPress.SITE) as SiteModel
-
-        setupViews()
-        setupObservers()
-        viewModel.start(site)
+            setupViews()
+            setupObservers()
+            viewModel.start(site)
+        }
     }
 
-    private fun setupViews() {
-        domain_suggestions_list.layoutManager = LinearLayoutManager(
+    private fun DomainSuggestionsFragmentBinding.setupViews() {
+        domainSuggestionsList.layoutManager = LinearLayoutManager(
                 activity,
                 RecyclerView.VERTICAL,
                 false
         )
-        domain_suggestions_list.setEmptyView(actionableEmptyView)
-        chose_domain_button.setOnClickListener {
+        domainSuggestionsList.setEmptyView(actionableEmptyView)
+        choseDomainButton.setOnClickListener {
             val selectedDomain = viewModel.selectedSuggestion.value
 
             mainViewModel.selectDomain(
@@ -81,7 +71,7 @@ class DomainSuggestionsFragment : Fragment() {
                     )
             )
         }
-        domain_suggestion_keyword_input.addTextChangedListener(object : TextWatcher {
+        domainSuggestionKeywordInput.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
             override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
 
@@ -89,23 +79,23 @@ class DomainSuggestionsFragment : Fragment() {
                 viewModel.updateSearchQuery(view.toString())
             }
         })
-        val adapter = DomainSuggestionsAdapter(this::onDomainSuggestionSelected)
-        domain_suggestions_list.adapter = adapter
+        val adapter = DomainSuggestionsAdapter(this@DomainSuggestionsFragment::onDomainSuggestionSelected)
+        domainSuggestionsList.adapter = adapter
     }
 
-    private fun setupObservers() {
+    private fun DomainSuggestionsFragmentBinding.setupObservers() {
         viewModel.isIntroVisible.observe(viewLifecycleOwner, Observer {
             it?.let { isIntroVisible ->
-                introduction_container.visibility = if (isIntroVisible) View.VISIBLE else View.GONE
+                introductionContainer.visibility = if (isIntroVisible) View.VISIBLE else View.GONE
             }
         })
         viewModel.suggestionsLiveData.observe(viewLifecycleOwner, Observer { listState ->
             if (listState != null) {
                 val isLoading = listState is ListState.Loading<*>
 
-                domain_suggestions_container.visibility = if (isLoading) View.INVISIBLE else View.VISIBLE
-                suggestion_progress_bar.visibility = if (isLoading) View.VISIBLE else View.GONE
-                suggestion_search_icon.visibility = if (isLoading) View.GONE else View.VISIBLE
+                domainSuggestionsContainer.visibility = if (isLoading) View.INVISIBLE else View.VISIBLE
+                suggestionProgressBar.visibility = if (isLoading) View.VISIBLE else View.GONE
+                suggestionSearchIcon.visibility = if (isLoading) View.GONE else View.VISIBLE
 
                 if (!isLoading) {
                     reloadSuggestions(listState.data)
@@ -122,12 +112,12 @@ class DomainSuggestionsFragment : Fragment() {
             }
         })
         viewModel.choseDomainButtonEnabledState.observe(viewLifecycleOwner, Observer {
-            chose_domain_button.isEnabled = it ?: false
+            choseDomainButton.isEnabled = it ?: false
         })
     }
 
-    private fun reloadSuggestions(domainSuggestions: List<DomainSuggestionResponse>) {
-        val adapter = domain_suggestions_list.adapter as DomainSuggestionsAdapter
+    private fun DomainSuggestionsFragmentBinding.reloadSuggestions(domainSuggestions: List<DomainSuggestionResponse>) {
+        val adapter = domainSuggestionsList.adapter as DomainSuggestionsAdapter
         adapter.selectedPosition = viewModel.selectedPosition.value ?: -1
         adapter.updateSuggestionsList(domainSuggestions)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/BottomSheetAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/BottomSheetAction.kt
new file mode 100644
index 000000000000..13360c543e44
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/BottomSheetAction.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.ui.engagement
+
+sealed class BottomSheetAction {
+    object ShowBottomSheet : BottomSheetAction()
+    object HideBottomSheet : BottomSheetAction()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/BottomSheetUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/BottomSheetUiState.kt
new file mode 100644
index 000000000000..45b0fc146195
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/BottomSheetUiState.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.ui.engagement
+
+sealed class BottomSheetUiState {
+    data class UserProfileUiState(
+        val userAvatarUrl: String,
+        val blavatarUrl: String,
+        val userName: String,
+        val userLogin: String,
+        val userBio: String,
+        val siteTitle: String,
+        val siteUrl: String,
+        val siteId: Long,
+        val onSiteClickListener: ((siteId: Long, siteUrl: String, source: String) -> Unit)? = null,
+        val blogPreviewSource: String
+    ) : BottomSheetUiState() {
+        val hasSiteUrl: Boolean = siteUrl.isNotBlank()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngageItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngageItem.kt
new file mode 100644
index 000000000000..acd298f903bb
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngageItem.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.ui.engagement
+
+import org.wordpress.android.ui.engagement.EngageItem.EngageItemType.LIKED_ITEM
+import org.wordpress.android.ui.engagement.EngageItem.EngageItemType.LIKER
+import org.wordpress.android.ui.engagement.EngageItem.EngageItemType.NEXT_LIKES_PAGE_LOADER
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+
+sealed class EngageItem(val type: EngageItemType) {
+    data class LikedItem(
+        val author: AuthorName, // author of liked post or comment
+        val postOrCommentText: CharSequence, // liked post title or comment excerpt
+        val authorAvatarUrl: String, // author avatar url
+
+        val likedItemId: Long, // liked post or comment remote id
+        val likedItemSiteId: Long, // site id to which the liked post or comment belongs
+        val likedItemSiteUrl: String, // used for comments only; site id to which the liked comment belongs
+        val likedItemPostId: Long, // used for comments only; the post to which the comment belongs
+
+        val authorUserId: Long, // author user id
+
+        val authorPreferredSiteId: Long, // author preferred site id
+        val authorPreferredSiteUrl: String, // author preferred site url
+
+        val onGravatarClick: (siteId: Long, siteUrl: String, source: String) -> Unit,
+        val blogPreviewSource: String,
+
+        val onHeaderClicked: (siteId: Long, siteUrl: String, postOrCommentId: Long, commentPostId: Long) -> Unit
+    ) : EngageItem(LIKED_ITEM)
+
+    data class Liker(
+        val name: String,
+        val login: String,
+        val userSiteId: Long,
+        val userSiteUrl: String,
+        val userAvatarUrl: String,
+        val userBio: String,
+        val userId: Long,
+        val preferredBlogId: Long,
+        val preferredBlogName: String,
+        val preferredBlogUrl: String,
+        val preferredBlogBlavatar: String,
+        val onClick: ((userProfile: UserProfile, source: EngagementNavigationSource?) -> Unit)? = null,
+        val source: EngagementNavigationSource?
+    ) : EngageItem(LIKER)
+
+    data class NextLikesPageLoader(val isLoading: Boolean, val action: () -> Unit) : EngageItem(NEXT_LIKES_PAGE_LOADER)
+
+    enum class EngageItemType {
+        LIKED_ITEM,
+        LIKER,
+        NEXT_LIKES_PAGE_LOADER
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedListNavigationEvent.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedListNavigationEvent.kt
new file mode 100644
index 000000000000..a8813a0e998e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedListNavigationEvent.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.ui.engagement
+
+sealed class EngagedListNavigationEvent(val closeUserProfileIfOpened: Boolean = true) {
+    data class PreviewSiteByUrl(val siteUrl: String, val source: String) : EngagedListNavigationEvent()
+    data class PreviewSiteById(val siteId: Long, val source: String) : EngagedListNavigationEvent()
+    data class PreviewCommentInReader(
+        val siteId: Long,
+        val commentPostId: Long,
+        val postOrCommentId: Long
+    ) : EngagedListNavigationEvent()
+    data class PreviewPostInReader(val siteId: Long, val postId: Long) : EngagedListNavigationEvent()
+    data class OpenUserProfileBottomSheet(
+        val userProfile: UserProfile,
+        val onClick: ((siteId: Long, siteUrl: String, source: String) -> Unit)? = null,
+        val source: EngagementNavigationSource?
+    ) : EngagedListNavigationEvent(false) {
+        data class UserProfile(
+            val userAvatarUrl: String,
+            val blavatarUrl: String,
+            val userName: String,
+            val userLogin: String,
+            val userBio: String,
+            val siteTitle: String,
+            val siteUrl: String,
+            val siteId: Long
+        )
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedListServiceRequestEvent.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedListServiceRequestEvent.kt
new file mode 100644
index 000000000000..8a5b3260971d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedListServiceRequestEvent.kt
@@ -0,0 +1,10 @@
+package org.wordpress.android.ui.engagement
+
+sealed class EngagedListServiceRequestEvent {
+    data class RequestBlogPost(val siteId: Long, val postId: Long) : EngagedListServiceRequestEvent()
+    data class RequestComment(
+        val siteId: Long,
+        val postId: Long,
+        val commentId: Long
+    ) : EngagedListServiceRequestEvent()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleAdapter.kt
new file mode 100644
index 000000000000..9dfd43b9a7ba
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleAdapter.kt
@@ -0,0 +1,53 @@
+package org.wordpress.android.ui.engagement
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.engagement.EngageItem.EngageItemType
+import org.wordpress.android.ui.engagement.EngageItem.LikedItem
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngageItem.NextLikesPageLoader
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.ResourceProvider
+import java.lang.IllegalArgumentException
+
+class EngagedPeopleAdapter constructor(
+    private val imageManager: ImageManager,
+    private val resourceProvider: ResourceProvider
+) : Adapter<EngagedPeopleViewHolder>() {
+    private var itemsList = listOf<EngageItem>()
+
+    fun loadData(items: List<EngageItem>) {
+        val diffResult = DiffUtil.calculateDiff(
+                EngagedPeopleAdapterDiffCallback(itemsList, items)
+        )
+        itemsList = items
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EngagedPeopleViewHolder {
+        return when (viewType) {
+            EngageItemType.LIKED_ITEM.ordinal -> LikedItemViewHolder(parent, imageManager)
+            EngageItemType.LIKER.ordinal -> LikerViewHolder(parent, imageManager, resourceProvider)
+            EngageItemType.NEXT_LIKES_PAGE_LOADER.ordinal -> NextPageLoadViewHolder(parent)
+            else -> throw IllegalArgumentException("Illegal view type $viewType")
+        }
+    }
+
+    override fun onBindViewHolder(holder: EngagedPeopleViewHolder, position: Int) {
+        val item = itemsList[position]
+        when (item) {
+            is LikedItem -> (holder as LikedItemViewHolder).bind(item)
+            is Liker -> (holder as LikerViewHolder).bind(item)
+            is NextLikesPageLoader -> (holder as NextPageLoadViewHolder).bind(item)
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return itemsList.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return itemsList[position].type.ordinal
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleAdapterDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleAdapterDiffCallback.kt
new file mode 100644
index 000000000000..19784123ecfe
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleAdapterDiffCallback.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.engagement
+
+import androidx.recyclerview.widget.DiffUtil
+import org.wordpress.android.ui.engagement.EngageItem.LikedItem
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngageItem.NextLikesPageLoader
+
+class EngagedPeopleAdapterDiffCallback(
+    private val oldItems: List<EngageItem>,
+    private val newItems: List<EngageItem>
+) : DiffUtil.Callback() {
+    override fun getOldListSize(): Int {
+        return oldItems.size
+    }
+
+    override fun getNewListSize(): Int {
+        return newItems.size
+    }
+
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        val oldItem = oldItems[oldItemPosition]
+        val newItem = newItems[newItemPosition]
+        return when {
+            oldItem is LikedItem && newItem is LikedItem -> oldItem.author == newItem.author
+            oldItem is Liker && newItem is Liker -> oldItem.userId == newItem.userId
+            oldItem is NextLikesPageLoader && newItem is NextLikesPageLoader -> true
+            else -> false
+        }
+    }
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldItems[oldItemPosition] == newItems[newItemPosition]
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt
new file mode 100644
index 000000000000..7237a8bcc511
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListActivity.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.ui.engagement
+
+import android.os.Bundle
+import android.view.MenuItem
+import kotlinx.android.synthetic.main.toolbar_main.*
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.LocaleAwareActivity
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import java.lang.IllegalArgumentException
+import javax.inject.Inject
+
+class EngagedPeopleListActivity : LocaleAwareActivity() {
+    @Inject lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (application as WordPress).component().inject(this)
+
+        setContentView(R.layout.engaged_people_list_activity)
+
+        val listScenario = intent.getParcelableExtra<ListScenario>(KEY_LIST_SCENARIO)
+                ?: throw IllegalArgumentException(
+                        "List Scenario cannot be null. Make sure to pass a valid List Scenario in the intent"
+                )
+
+        analyticsUtilsWrapper.trackLikeListOpened(
+                EngagementNavigationSource.getSourceDescription(listScenario.source),
+                ListScenarioType.getSourceDescription(listScenario.type)
+        )
+
+        setSupportActionBar(toolbar_main)
+        supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+
+            val titleText = if (listScenario.headerData.numLikes == 1) {
+                getString(R.string.like_title_singular)
+            } else {
+                getString(R.string.like_title_plural, listScenario.headerData.numLikes)
+            }
+            it.title = titleText
+            // Important for talkback accessibility
+            title = getString(R.string.likes_list_screen_title, titleText)
+        }
+
+        val fm = supportFragmentManager
+        var likeListFragment = fm.findFragmentByTag(TAG_LIKE_LIST_FRAGMENT) as? EngagedPeopleListFragment
+
+        if (likeListFragment == null) {
+            likeListFragment = EngagedPeopleListFragment.newInstance(listScenario)
+            fm.beginTransaction()
+                    .add(R.id.fragment_container, likeListFragment, TAG_LIKE_LIST_FRAGMENT)
+                    .commit()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+        const val KEY_LIST_SCENARIO = "list_scenario"
+        private const val TAG_LIKE_LIST_FRAGMENT = "tag_like_list_fragment"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListFragment.kt
new file mode 100644
index 000000000000..21a2271ad2e1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListFragment.kt
@@ -0,0 +1,283 @@
+package org.wordpress.android.ui.engagement
+
+import android.content.Context
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Lifecycle.State
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.android.synthetic.main.scan_list_threat_item.*
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.ActionableEmptyView
+import org.wordpress.android.ui.WPWebViewActivity
+import org.wordpress.android.ui.engagement.BottomSheetAction.HideBottomSheet
+import org.wordpress.android.ui.engagement.BottomSheetAction.ShowBottomSheet
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewCommentInReader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewPostInReader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewSiteById
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewSiteByUrl
+import org.wordpress.android.ui.engagement.EngagedListServiceRequestEvent.RequestBlogPost
+import org.wordpress.android.ui.engagement.EngagedListServiceRequestEvent.RequestComment
+import org.wordpress.android.ui.engagement.EngagedPeopleListViewModel.EngagedPeopleListUiState
+import org.wordpress.android.ui.engagement.UserProfileViewModel.Companion.USER_PROFILE_VM_KEY
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.ReaderActivityLauncher
+import org.wordpress.android.ui.reader.actions.ReaderPostActions
+import org.wordpress.android.ui.reader.services.ReaderCommentService
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.SnackbarItem
+import org.wordpress.android.util.SnackbarItem.Action
+import org.wordpress.android.util.SnackbarItem.Info
+import org.wordpress.android.util.SnackbarSequencer
+import org.wordpress.android.util.WPUrlUtils
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.ResourceProvider
+import org.wordpress.android.viewmodel.observeEvent
+import javax.inject.Inject
+
+class EngagedPeopleListFragment : Fragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var resourceProvider: ResourceProvider
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var snackbarSequencer: SnackbarSequencer
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var readerTracker: ReaderTracker
+    @Inject lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+
+    private lateinit var viewModel: EngagedPeopleListViewModel
+    private lateinit var userProfileViewModel: UserProfileViewModel
+    private lateinit var recycler: RecyclerView
+    private lateinit var loadingView: View
+    private lateinit var rootView: View
+    private lateinit var emptyView: ActionableEmptyView
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (requireActivity().application as WordPress).component().inject(this)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(EngagedPeopleListViewModel::class.java)
+        userProfileViewModel = ViewModelProvider(this, viewModelFactory)
+                .get(USER_PROFILE_VM_KEY, UserProfileViewModel::class.java)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.engaged_people_list_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        rootView = view
+        recycler = view.findViewById(R.id.recycler)
+        loadingView = view.findViewById(R.id.loading_view)
+        emptyView = view.findViewById(R.id.actionable_empty_view)
+
+        val listScenario = requireArguments().getParcelable<ListScenario>(KEY_LIST_SCENARIO)
+
+        val layoutManager = LinearLayoutManager(activity)
+
+        savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
+            layoutManager.onRestoreInstanceState(it)
+        }
+
+        recycler.layoutManager = layoutManager
+
+        userProfileViewModel.onBottomSheetAction.observeEvent(viewLifecycleOwner, { state ->
+            val fragmentManager = childFragmentManager
+            fragmentManager?.let {
+                var bottomSheet = it.findFragmentByTag(USER_PROFILE_BOTTOM_SHEET_TAG) as? UserProfileBottomSheetFragment
+
+                when (state) {
+                    ShowBottomSheet -> {
+                        if (bottomSheet == null) {
+                            bottomSheet = UserProfileBottomSheetFragment.newInstance(USER_PROFILE_VM_KEY)
+                            bottomSheet.show(fragmentManager, USER_PROFILE_BOTTOM_SHEET_TAG)
+                        }
+                    }
+                    HideBottomSheet -> {
+                        bottomSheet?.apply { this.dismiss() }
+                    }
+                }
+            }
+        })
+
+        viewModel.uiState.observe(viewLifecycleOwner, { state ->
+            if (!isAdded) return@observe
+
+            updateUiState(state)
+        })
+
+        viewModel.onNavigationEvent.observeEvent(viewLifecycleOwner, { event ->
+            if (!isAdded) return@observeEvent
+
+            manageNavigation(event)
+        })
+
+        viewModel.onSnackbarMessage.observeEvent(viewLifecycleOwner, { messageHolder ->
+            if (!isAdded || !lifecycle.currentState.isAtLeast(State.RESUMED)) return@observeEvent
+
+            showSnackbar(messageHolder)
+        })
+
+        viewModel.onServiceRequestEvent.observeEvent(viewLifecycleOwner, { serviceRequest ->
+            if (!isAdded) return@observeEvent
+
+            manageServiceRequest(serviceRequest)
+        })
+
+        viewModel.start(listScenario!!)
+    }
+
+    private fun manageNavigation(event: EngagedListNavigationEvent) {
+        with(requireActivity()) {
+            if (this.isFinishing) return@with
+
+            when (event) {
+                is PreviewSiteById -> {
+                    ReaderActivityLauncher.showReaderBlogPreview(
+                            this,
+                            event.siteId,
+                            // TODO: this can be true if we use this fragment for NOTE_FOLLOW_TYPE notifications
+                            false,
+                            event.source,
+                            readerTracker
+                    )
+                }
+                is PreviewSiteByUrl -> {
+                    val url = event.siteUrl
+                    openUrl(this, url, event.source)
+                }
+                is PreviewCommentInReader -> {
+                    ReaderActivityLauncher.showReaderComments(
+                            this,
+                            event.siteId,
+                            event.commentPostId,
+                            event.postOrCommentId
+                    )
+                }
+                is PreviewPostInReader -> {
+                    ReaderActivityLauncher.showReaderPostDetail(this, event.siteId, event.postId)
+                }
+                is OpenUserProfileBottomSheet -> {
+                    userProfileViewModel.onBottomSheetOpen(event.userProfile, event.onClick, event.source)
+                }
+            }
+
+            if (event.closeUserProfileIfOpened) {
+                userProfileViewModel.onBottomSheetCancelled()
+            }
+        }
+    }
+
+    private fun updateUiState(state: EngagedPeopleListUiState) {
+        uiHelpers.updateVisibility(loadingView, state.showLoading)
+
+        setupAdapter(state.engageItemsList)
+
+        if (state.showEmptyState) {
+            uiHelpers.setTextOrHide(emptyView.title, state.emptyStateTitle)
+            uiHelpers.setTextOrHide(emptyView.button, state.emptyStateButtonText)
+            emptyView.button.setOnClickListener { state.emptyStateAction?.invoke() }
+
+            emptyView.visibility = View.VISIBLE
+        } else {
+            emptyView.visibility = View.GONE
+        }
+    }
+
+    private fun manageServiceRequest(serviceRequest: EngagedListServiceRequestEvent) {
+        with(requireActivity()) {
+            if (this.isFinishing) return@with
+
+            when (serviceRequest) {
+                is RequestBlogPost -> ReaderPostActions.requestBlogPost(
+                        serviceRequest.siteId,
+                        serviceRequest.postId,
+                        null
+                )
+                is RequestComment -> ReaderCommentService.startServiceForComment(
+                        this,
+                        serviceRequest.siteId,
+                        serviceRequest.postId,
+                        serviceRequest.commentId
+                )
+            }
+        }
+    }
+
+    private fun openUrl(context: Context, url: String, source: String) {
+        analyticsUtilsWrapper.trackBlogPreviewedByUrl(source)
+        if (WPUrlUtils.isWordPressCom(url)) {
+            WPWebViewActivity.openUrlByUsingGlobalWPCOMCredentials(context, url)
+        } else {
+            WPWebViewActivity.openURL(context, url)
+        }
+    }
+
+    private fun setupAdapter(items: List<EngageItem>) {
+        val adapter = recycler.adapter as? EngagedPeopleAdapter ?: EngagedPeopleAdapter(
+                imageManager,
+                resourceProvider
+        ).also {
+            recycler.adapter = it
+        }
+
+        val recyclerViewState = recycler.layoutManager?.onSaveInstanceState()
+        adapter.loadData(items)
+        recycler.layoutManager?.onRestoreInstanceState(recyclerViewState)
+    }
+
+    private fun showSnackbar(holder: SnackbarMessageHolder) {
+        snackbarSequencer.enqueue(
+                SnackbarItem(
+                        Info(
+                                view = rootView,
+                                textRes = holder.message,
+                                duration = Snackbar.LENGTH_LONG
+                        ),
+                        holder.buttonTitle?.let {
+                            Action(
+                                    textRes = holder.buttonTitle,
+                                    clickListener = { holder.buttonAction() }
+                            )
+                        },
+                        dismissCallback = { _, _ -> holder.onDismissAction() }
+                )
+        )
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+
+        recycler.layoutManager?.let {
+            outState.putParcelable(KEY_LIST_STATE, it.onSaveInstanceState())
+        }
+    }
+
+    companion object {
+        private const val KEY_LIST_SCENARIO = "list_scenario"
+        private const val KEY_LIST_STATE = "list_state"
+
+        private const val USER_PROFILE_BOTTOM_SHEET_TAG = "USER_PROFILE_BOTTOM_SHEET_TAG"
+
+        @JvmStatic
+        fun newInstance(listScenario: ListScenario): EngagedPeopleListFragment {
+            val args = Bundle()
+            args.putParcelable(KEY_LIST_SCENARIO, listScenario)
+
+            val fragment = EngagedPeopleListFragment()
+            fragment.arguments = args
+
+            return fragment
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListViewModel.kt
new file mode 100644
index 000000000000..c90b7e8caa09
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleListViewModel.kt
@@ -0,0 +1,285 @@
+package org.wordpress.android.ui.engagement
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import org.wordpress.android.R.string
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.engagement.EngageItem.LikedItem
+import org.wordpress.android.ui.engagement.EngageItem.NextLikesPageLoader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewCommentInReader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewPostInReader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewSiteById
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewSiteByUrl
+import org.wordpress.android.ui.engagement.EngagedListServiceRequestEvent.RequestBlogPost
+import org.wordpress.android.ui.engagement.EngagedListServiceRequestEvent.RequestComment
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_NOTIFICATION_LIST
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_READER_LIST
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Loading
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeGroupFingerPrint
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_COMMENT_LIKES
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_POST_LIKES
+import org.wordpress.android.ui.engagement.PreviewBlogByUrlSource.LIKED_COMMENT_USER_HEADER
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.util.map
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+class EngagedPeopleListViewModel @Inject constructor(
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val getLikesHandler: GetLikesHandler,
+    private val readerUtilsWrapper: ReaderUtilsWrapper,
+    private val engagementUtils: EngagementUtils,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+    private var getLikesJob: Job? = null
+
+    private var listScenario: ListScenario? = null
+
+    private val _onSnackbarMessage = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    private val _updateLikesState = MediatorLiveData<GetLikesState>()
+    private val _onNavigationEvent = MutableLiveData<Event<EngagedListNavigationEvent>>()
+    private val _onServiceRequestEvent = MutableLiveData<Event<EngagedListServiceRequestEvent>>()
+
+    val onSnackbarMessage: LiveData<Event<SnackbarMessageHolder>> = _onSnackbarMessage
+    val uiState: LiveData<EngagedPeopleListUiState> = _updateLikesState.map { state ->
+        buildUiState(state, listScenario)
+    }
+    val onNavigationEvent: LiveData<Event<EngagedListNavigationEvent>> = _onNavigationEvent
+    val onServiceRequestEvent: LiveData<Event<EngagedListServiceRequestEvent>> = _onServiceRequestEvent
+
+    data class EngagedPeopleListUiState(
+        val showLikeFacesTrainContainer: Boolean,
+        val numLikes: Int = 0,
+        val showLoading: Boolean,
+        val engageItemsList: List<EngageItem>,
+        val showEmptyState: Boolean,
+        val emptyStateTitle: UiString? = null,
+        val emptyStateAction: (() -> Unit)? = null,
+        val emptyStateButtonText: UiString? = null,
+        val likersFacesText: UiString? = null
+    )
+
+    fun start(listScenario: ListScenario) {
+        if (isStarted) return
+        isStarted = true
+
+        this.listScenario = listScenario
+
+        _onSnackbarMessage.addSource(getLikesHandler.snackbarEvents) { event ->
+            _onSnackbarMessage.value = event
+        }
+
+        _updateLikesState.addSource(getLikesHandler.likesStatusUpdate) { state ->
+            _updateLikesState.value = state
+        }
+
+        onRefreshData()
+    }
+
+    private fun onRefreshData() {
+        loadRequest(listScenario, requestPostOrComment = true, requestNextPage = false)
+    }
+
+    private fun requestPostOrCommentIfNeeded(
+        listScenarioType: ListScenarioType,
+        siteId: Long,
+        postOrCommentId: Long,
+        commentPostId: Long
+    ) {
+        val postId = if (listScenarioType == LOAD_POST_LIKES) postOrCommentId else commentPostId
+        val commentId = if (listScenarioType == LOAD_COMMENT_LIKES) postOrCommentId else 0L
+
+        if (!readerUtilsWrapper.postExists(
+                        siteId,
+                        postId
+                )) {
+            _onServiceRequestEvent.value = Event(RequestBlogPost(siteId, postId))
+        }
+
+        if (listScenarioType == LOAD_COMMENT_LIKES && !readerUtilsWrapper.commentExists(
+                        siteId,
+                        postId,
+                        commentId
+                )) {
+            _onServiceRequestEvent.value = Event(RequestComment(siteId, postId, commentId))
+        }
+    }
+
+    private fun loadRequest(
+        listScenario: ListScenario?,
+        requestPostOrComment: Boolean,
+        requestNextPage: Boolean
+    ) {
+        if (listScenario == null) return
+
+        if (requestPostOrComment) {
+            requestPostOrCommentIfNeeded(
+                    listScenario.type,
+                    listScenario.siteId,
+                    listScenario.postOrCommentId,
+                    listScenario.commentPostId
+            )
+        }
+
+        getLikesJob?.cancel()
+        getLikesJob = launch(bgDispatcher) {
+            // TODO: currently API is not sorting the likes as the list in notifications does,
+            // use case logic has code to sort based on a list of ids (ideally the available likers ids taken
+            // from the notification).
+            // Keeping the logic for now, but remove empty listOf and relevant logic when API will sort likes
+            when (listScenario.type) {
+                LOAD_POST_LIKES -> getLikesHandler.handleGetLikesForPost(
+                        LikeGroupFingerPrint(
+                                listScenario.siteId,
+                                listScenario.postOrCommentId,
+                                listScenario.headerData.numLikes
+                        ),
+                        requestNextPage
+                )
+                LOAD_COMMENT_LIKES -> getLikesHandler.handleGetLikesForComment(
+                        LikeGroupFingerPrint(
+                                listScenario.siteId,
+                                listScenario.postOrCommentId,
+                                listScenario.headerData.numLikes
+                        ),
+                        requestNextPage
+                )
+            }
+        }
+    }
+
+    private fun buildUiState(updateLikesState: GetLikesState?, listScenario: ListScenario?): EngagedPeopleListUiState {
+        val likedItem = listScenario?.headerData?.let {
+            listOf(LikedItem(
+                            author = it.authorName,
+                            postOrCommentText = it.snippetText,
+                            authorAvatarUrl = it.authorAvatarUrl,
+                            likedItemId = listScenario.postOrCommentId,
+                            likedItemSiteId = listScenario.siteId,
+                            likedItemSiteUrl = listScenario.commentSiteUrl,
+                            likedItemPostId = listScenario.commentPostId,
+                            authorUserId = it.authorUserId,
+                            authorPreferredSiteId = it.authorPreferredSiteId,
+                            authorPreferredSiteUrl = it.authorPreferredSiteUrl,
+                            onGravatarClick = ::onSiteLinkHolderClicked,
+                            blogPreviewSource = when (listScenario.source) {
+                                LIKE_NOTIFICATION_LIST -> ReaderTracker.SOURCE_NOTIFICATION
+                                LIKE_READER_LIST -> ReaderTracker.SOURCE_READER_LIKE_LIST
+                            },
+                            onHeaderClicked = ::onHeaderClicked
+            ))
+        } ?: listOf()
+
+        val likers = when (updateLikesState) {
+            is LikesData -> {
+                engagementUtils.likesToEngagedPeople(
+                        updateLikesState.likes,
+                        ::onUserProfileHolderClicked,
+                        listScenario?.source
+                ) + appendNextPageLoaderIfNeeded(updateLikesState.hasMore, true)
+            }
+            is Failure -> {
+                engagementUtils.likesToEngagedPeople(
+                        updateLikesState.cachedLikes,
+                        ::onUserProfileHolderClicked,
+                        listScenario?.source
+                ) + appendNextPageLoaderIfNeeded(updateLikesState.hasMore, false)
+            }
+            Loading, null -> listOf()
+        }
+
+        var showEmptyState = false
+        var emptyStateTitle: UiString? = null
+        var emptyStateAction: (() -> Unit)? = null
+
+        if (updateLikesState is Failure) {
+            updateLikesState.emptyStateData?.let {
+                showEmptyState = it.showEmptyState
+                emptyStateTitle = it.title
+                emptyStateAction = ::onRefreshData
+            }
+        }
+
+        return EngagedPeopleListUiState(
+                showLikeFacesTrainContainer = false,
+                showLoading = updateLikesState is Loading,
+                engageItemsList = likedItem + likers,
+                showEmptyState = showEmptyState,
+                emptyStateTitle = emptyStateTitle,
+                emptyStateAction = emptyStateAction,
+                emptyStateButtonText = emptyStateAction?.let { UiStringRes(string.retry) }
+        )
+    }
+
+    private fun appendNextPageLoaderIfNeeded(hasMore: Boolean, isLoading: Boolean): List<EngageItem> {
+        return if (hasMore) {
+            listOf(NextLikesPageLoader(isLoading) {
+                loadRequest(listScenario, requestPostOrComment = false, requestNextPage = true)
+            })
+        } else {
+            listOf()
+        }
+    }
+
+    private fun onUserProfileHolderClicked(userProfile: UserProfile, source: EngagementNavigationSource?) {
+        _onNavigationEvent.value = Event(
+                OpenUserProfileBottomSheet(
+                        userProfile,
+                        ::onSiteLinkHolderClicked,
+                        source
+                )
+        )
+    }
+
+    private fun onSiteLinkHolderClicked(siteId: Long, siteUrl: String, source: String) {
+        if (ReaderTracker.isUserProfileSource(source)) {
+            analyticsUtilsWrapper.trackUserProfileSiteShown()
+        }
+
+        if (siteId <= 0L && siteUrl.isNotEmpty()) {
+            _onNavigationEvent.value = Event(PreviewSiteByUrl(siteUrl, source))
+        } else if (siteId > 0L) {
+            _onNavigationEvent.value = Event(PreviewSiteById(siteId, source))
+        }
+    }
+
+    private fun onHeaderClicked(siteId: Long, siteUrl: String, postOrCommentId: Long, commentPostId: Long) {
+        _onNavigationEvent.value = Event(
+                if (commentPostId > 0) {
+                    if (readerUtilsWrapper.postAndCommentExists(siteId, commentPostId, postOrCommentId)) {
+                        PreviewCommentInReader(siteId, commentPostId, postOrCommentId)
+                    } else {
+                        PreviewSiteByUrl(siteUrl, LIKED_COMMENT_USER_HEADER.sourceDescription)
+                    }
+                } else {
+                    PreviewPostInReader(siteId, postOrCommentId)
+                }
+        )
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    public override fun onCleared() {
+        super.onCleared()
+        getLikesJob?.cancel()
+        getLikesHandler.clear()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleViewHolder.kt
new file mode 100644
index 000000000000..d6ae4cb72b3e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagedPeopleViewHolder.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.ui.engagement
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+
+open class EngagedPeopleViewHolder(
+    internal val parent: ViewGroup,
+    @LayoutRes layout: Int
+) : ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false))
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagementSources.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagementSources.kt
new file mode 100644
index 000000000000..b108c85e0241
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagementSources.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.ui.engagement
+
+enum class EngagementNavigationSource(private val sourceDescription: String) {
+    LIKE_NOTIFICATION_LIST("like_notification_list"),
+    LIKE_READER_LIST("like_reader_list");
+
+    companion object {
+        fun getSourceDescription(source: EngagementNavigationSource?): String {
+            return source?.sourceDescription ?: "unknown"
+        }
+    }
+}
+
+enum class PreviewBlogByUrlSource(val sourceDescription: String) {
+    LIKED_COMMENT_USER_HEADER("liked_comment_user_avatar"),
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagementUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagementUtils.kt
new file mode 100644
index 000000000000..2688a98eb719
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/EngagementUtils.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.engagement
+
+import dagger.Reusable
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+import javax.inject.Inject
+
+@Reusable
+class EngagementUtils @Inject constructor() {
+    fun likesToEngagedPeople(
+        likes: List<LikeModel>,
+        onClick: ((userProfile: UserProfile, source: EngagementNavigationSource?) -> Unit)? = null,
+        source: EngagementNavigationSource? = null
+    ): List<EngageItem> {
+        return likes.map { likeData ->
+            Liker(
+                    name = likeData.likerName!!,
+                    login = likeData.likerLogin!!,
+                    userSiteId = likeData.likerSiteId,
+                    userSiteUrl = likeData.likerSiteUrl!!,
+                    userAvatarUrl = likeData.likerAvatarUrl!!,
+                    userBio = likeData.likerBio!!,
+                    userId = likeData.likerId,
+                    preferredBlogId = likeData.preferredBlogId,
+                    preferredBlogName = likeData.preferredBlogName!!,
+                    preferredBlogUrl = likeData.preferredBlogUrl!!,
+                    preferredBlogBlavatar = likeData.preferredBlogBlavatarUrl!!,
+                    onClick = onClick,
+                    source = source
+            )
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesHandler.kt
new file mode 100644
index 000000000000..0941ce550e24
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesHandler.kt
@@ -0,0 +1,93 @@
+package org.wordpress.android.ui.engagement
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.DONT_CARE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType.NO_NETWORK
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Loading
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeGroupFingerPrint
+import org.wordpress.android.ui.engagement.GetLikesUseCase.PaginationParams
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+import javax.inject.Named
+
+class GetLikesHandler @Inject constructor(
+    private val getLikesUseCase: GetLikesUseCase,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _likesStatusUpdate = MediatorLiveData<GetLikesState>()
+    val likesStatusUpdate: LiveData<GetLikesState> = _likesStatusUpdate
+
+    suspend fun handleGetLikesForPost(
+        fingerPrint: LikeGroupFingerPrint,
+        requestNextPage: Boolean,
+        pageLength: Int = LIKES_PER_PAGE_DEFAULT,
+        limit: Int = LIKES_RESULT_NO_LIMITS,
+        expectingToBeThere: CurrentUserInListRequirement = DONT_CARE
+    ) {
+        getLikesUseCase.getLikesForPost(
+                fingerPrint,
+                PaginationParams(
+                        requestNextPage,
+                        pageLength,
+                        limit
+                ),
+                expectingToBeThere
+        ).flowOn(bgDispatcher).collect { state ->
+            manageState(state)
+        }
+    }
+
+    suspend fun handleGetLikesForComment(
+        fingerPrint: LikeGroupFingerPrint,
+        requestNextPage: Boolean,
+        pageLength: Int = LIKES_PER_PAGE_DEFAULT
+    ) {
+        getLikesUseCase.getLikesForComment(
+                fingerPrint,
+                PaginationParams(
+                        requestNextPage,
+                        pageLength,
+                        LIKES_RESULT_NO_LIMITS
+                )
+        ).flowOn(bgDispatcher).collect { state ->
+            manageState(state)
+        }
+    }
+
+    fun clear() {
+        getLikesUseCase.clear()
+    }
+
+    private fun manageState(state: GetLikesState) {
+        when (state) {
+            Loading,
+            is LikesData -> {
+                _likesStatusUpdate.postValue(state)
+            }
+            is Failure -> {
+                _likesStatusUpdate.postValue(state)
+                if (state.failureType != NO_NETWORK || !state.emptyStateData.showEmptyState) {
+                    _snackbarEvents.postValue(Event(SnackbarMessageHolder(state.error)))
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val LIKES_PER_PAGE_DEFAULT = 20
+        private const val LIKES_RESULT_NO_LIMITS = -1
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesUseCase.kt
new file mode 100644
index 000000000000..34d1acdf4bc7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/GetLikesUseCase.kt
@@ -0,0 +1,324 @@
+package org.wordpress.android.ui.engagement
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.CommentAction.FETCHED_COMMENT_LIKES
+import org.wordpress.android.fluxc.generated.CommentActionBuilder
+import org.wordpress.android.fluxc.generated.PostActionBuilder
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.FetchPostLikes
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.CommentStore
+import org.wordpress.android.fluxc.store.CommentStore.FetchCommentLikesPayload
+import org.wordpress.android.fluxc.store.CommentStore.OnCommentLikesChanged
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.fluxc.store.PostStore.FetchPostLikesPayload
+import org.wordpress.android.fluxc.store.PostStore.OnPostLikesChanged
+import org.wordpress.android.fluxc.store.Store.OnChanged
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.DONT_CARE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.REQUIRE_TO_BE_THERE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.REQUIRE_TO_NOT_BE_THERE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType.GENERIC
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType.NO_NETWORK
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure.EmptyStateData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Loading
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeCategory.COMMENT_LIKE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeCategory.POST_LIKE
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+// NOTE: Do not remove the commentStore and postStore fields; commentStore seems needed so that the store is registered
+// when we dispatch events; postStore added to keep the rational even if not strictly needed as of today.
+// Possibly there is a better way, in that case please update here.
+class GetLikesUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val dispatcher: Dispatcher,
+    @SuppressWarnings("Unused")
+    val commentStore: CommentStore,
+    @SuppressWarnings("Unused")
+    val postStore: PostStore,
+    val accountStore: AccountStore
+) {
+    private var getLikesContinuations = mutableMapOf<String, Continuation<OnChanged<*>>>()
+
+    init {
+        dispatcher.register(this)
+    }
+
+    fun clear() {
+        dispatcher.unregister(this)
+    }
+
+    suspend fun getLikesForPost(
+        fingerPrint: LikeGroupFingerPrint,
+        paginationParams: PaginationParams,
+        expectingToBeThere: CurrentUserInListRequirement
+    ): Flow<GetLikesState> = flow {
+        getLikes(POST_LIKE, this, fingerPrint, paginationParams, expectingToBeThere)
+    }
+
+    suspend fun getLikesForComment(
+        fingerPrint: LikeGroupFingerPrint,
+        paginationParams: PaginationParams
+    ): Flow<GetLikesState> = flow {
+        getLikes(COMMENT_LIKE, this, fingerPrint, paginationParams)
+    }
+
+    @SuppressWarnings("ComplexMethod", "NestedBlockDepth", "LoopWithTooManyJumpStatements")
+    private suspend fun getLikes(
+        category: LikeCategory,
+        flow: FlowCollector<GetLikesState>,
+        fingerPrint: LikeGroupFingerPrint,
+        paginationParams: PaginationParams,
+        expectingToBeThere: CurrentUserInListRequirement = DONT_CARE
+    ) {
+        if (!paginationParams.requestNextPage) {
+            flow.emit(Loading)
+            delay(PROGRESS_DELAY_MS)
+        }
+
+        for (retry in 1..NUM_RETRY) {
+            val noNetworkDetected = !networkUtilsWrapper.isNetworkAvailable()
+
+            val result = makeRequest(category, fingerPrint, paginationParams)
+
+            val isPostLikeEvent = category == POST_LIKE && result is OnPostLikesChanged
+            val isCommentLikeEvent = category == COMMENT_LIKE && result is OnCommentLikesChanged
+
+            if (isPostLikeEvent || isCommentLikeEvent) {
+                var likes = listOf<LikeModel>()
+                var errorMessage: String? = null
+                var hasMore = false
+
+                if (result is OnPostLikesChanged) {
+                    likes = result.postLikes
+                    if (result.isError) errorMessage = result.error.message
+                    hasMore = result.hasMore
+                }
+
+                if (result is OnCommentLikesChanged) {
+                    likes = result.commentLikes
+                    if (result.isError) errorMessage = result.error.message
+                }
+
+                if (shouldRetry(expectingToBeThere, retry, result, likes)) {
+                    delay(PROGRESS_DELAY_MS)
+                    continue
+                }
+
+                likes = if (paginationParams.limit > 0) {
+                    likes.take(paginationParams.limit)
+                } else {
+                    likes
+                }
+
+                flow.emit(
+                    if (result.isError) {
+                        getFailureState(noNetworkDetected, likes, errorMessage, fingerPrint.expectedNumLikes)
+                    } else {
+                        LikesData(likes, fingerPrint.expectedNumLikes, hasMore)
+                    }
+                )
+
+                break
+            }
+        }
+    }
+
+    private fun shouldRetry(
+        expectingToBeThere: CurrentUserInListRequirement,
+        retry: Int,
+        result: OnChanged<*>,
+        likes: List<LikeModel>
+    ): Boolean {
+        val shouldCheck = expectingToBeThere != DONT_CARE &&
+                retry < NUM_RETRY &&
+                !result.isError &&
+                accountStore.hasAccessToken()
+
+        return if (shouldCheck) {
+            when (expectingToBeThere) {
+                DONT_CARE -> {
+                    false
+                }
+                REQUIRE_TO_BE_THERE -> {
+                    !likes.any { it.likerId == accountStore.account.userId }
+                }
+                REQUIRE_TO_NOT_BE_THERE -> {
+                    likes.any { it.likerId == accountStore.account.userId }
+                }
+            }
+        } else {
+            false
+        }
+    }
+
+    private suspend fun makeRequest(
+        category: LikeCategory,
+        fingerPrint: LikeGroupFingerPrint,
+        paginationParams: PaginationParams
+    ): OnChanged<*> {
+        return suspendCoroutine {
+            getLikesContinuations[category.getActionKey(fingerPrint.siteId, fingerPrint.postOrCommentId)] = it
+            when (category) {
+                POST_LIKE -> {
+                    val payload = FetchPostLikesPayload(
+                            fingerPrint.siteId,
+                            fingerPrint.postOrCommentId,
+                            paginationParams.requestNextPage,
+                            paginationParams.pageLength
+                    )
+                    dispatcher.dispatch(PostActionBuilder.newFetchPostLikesAction(payload))
+                }
+                COMMENT_LIKE -> {
+                    val payload = FetchCommentLikesPayload(
+                            fingerPrint.siteId,
+                            fingerPrint.postOrCommentId,
+                            paginationParams.requestNextPage,
+                            paginationParams.pageLength
+                    )
+                    dispatcher.dispatch(CommentActionBuilder.newFetchCommentLikesAction(payload))
+                }
+            }
+        }
+    }
+
+    private fun getFailureState(
+        noNetworkDetected: Boolean,
+        orderedLikes: List<LikeModel>,
+        errorMessage: String?,
+        expectedNumLikes: Int
+    ): Failure {
+        return if (noNetworkDetected) {
+            Failure(
+                    NO_NETWORK,
+                    UiStringRes(R.string.get_likes_no_network_error),
+                    orderedLikes,
+                    EmptyStateData(
+                            orderedLikes.isEmpty(),
+                            UiStringRes(R.string.no_network_title)
+                    ),
+                    expectedNumLikes,
+                    orderedLikes.isNotEmpty()
+            )
+        } else {
+            Failure(
+                    GENERIC,
+                    if (errorMessage.isNullOrEmpty()) {
+                        UiStringRes(R.string.get_likes_unknown_error)
+                    } else {
+                        UiStringText(errorMessage)
+                    },
+                    orderedLikes,
+                    EmptyStateData(
+                            orderedLikes.isEmpty(),
+                            UiStringRes(R.string.get_likes_empty_state_title)
+                    ),
+                    expectedNumLikes,
+                    orderedLikes.isNotEmpty()
+            )
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    fun onPostLikesChanged(event: OnPostLikesChanged) {
+        if (event.causeOfChange !is FetchPostLikes) {
+            AppLog.d(T.POSTS, "GetLikesUseCase > unexpected event cause received [${event.causeOfChange}]")
+            return
+        }
+
+        val key = POST_LIKE.getActionKey(event.siteId, event.postId)
+
+        getLikesContinuations[key]?.let {
+            it.resume(event)
+            getLikesContinuations.remove(key)
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    fun onCommentLikesChanged(event: OnCommentLikesChanged) {
+        if (event.causeOfChange != FETCHED_COMMENT_LIKES) {
+            AppLog.d(T.COMMENTS, "GetLikesUseCase > unexpected event cause received [${event.causeOfChange}]")
+            return
+        }
+
+        val key = COMMENT_LIKE.getActionKey(event.siteId, event.commentId)
+
+        getLikesContinuations[key]?.let {
+            it.resume(event)
+            getLikesContinuations.remove(key)
+        }
+    }
+
+    sealed class GetLikesState {
+        object Loading : GetLikesState()
+
+        data class LikesData(
+            val likes: List<LikeModel>,
+            val expectedNumLikes: Int,
+            val hasMore: Boolean = false
+        ) : GetLikesState()
+
+        data class Failure(
+            val failureType: FailureType,
+            val error: UiString,
+            val cachedLikes: List<LikeModel>,
+            val emptyStateData: EmptyStateData,
+            val expectedNumLikes: Int,
+            val hasMore: Boolean
+        ) : GetLikesState() {
+            data class EmptyStateData(
+                val showEmptyState: Boolean,
+                val title: UiStringRes? = null
+            )
+        }
+    }
+
+    // Extend error categories if appropriate
+    enum class FailureType {
+        NO_NETWORK,
+        GENERIC
+    }
+
+    enum class LikeCategory {
+        POST_LIKE,
+        COMMENT_LIKE;
+
+        fun getActionKey(siteId: Long, entityId: Long): String {
+            return "${this.name}-$siteId-$entityId"
+        }
+    }
+
+    data class LikeGroupFingerPrint(val siteId: Long, val postOrCommentId: Long, val expectedNumLikes: Int)
+    data class PaginationParams(val requestNextPage: Boolean, val pageLength: Int, val limit: Int)
+
+    enum class CurrentUserInListRequirement {
+        DONT_CARE,
+        REQUIRE_TO_BE_THERE,
+        REQUIRE_TO_NOT_BE_THERE
+    }
+
+    companion object {
+        // Pretty arbitrary amount to allow the loading state to appear to the user
+        private const val PROGRESS_DELAY_MS = 600L
+
+        // Num of retries for post likes when BeInListRequirement is not DON_T_CARE
+        private const val NUM_RETRY = 6
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/LikedItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/LikedItemViewHolder.kt
new file mode 100644
index 000000000000..709935485f84
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/LikedItemViewHolder.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.ui.engagement
+
+import android.text.TextUtils
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import org.wordpress.android.R
+import org.wordpress.android.R.string
+import org.wordpress.android.ui.engagement.EngageItem.LikedItem
+import org.wordpress.android.ui.engagement.AuthorName.AuthorNameCharSequence
+import org.wordpress.android.ui.engagement.AuthorName.AuthorNameString
+import org.wordpress.android.util.GravatarUtils
+import org.wordpress.android.util.getDrawableResIdFromAttribute
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType
+
+class LikedItemViewHolder(
+    parent: ViewGroup,
+    private val imageManager: ImageManager
+) : EngagedPeopleViewHolder(parent, R.layout.note_block_header) {
+    private val name = itemView.findViewById<TextView>(R.id.header_user)
+    private val snippet = itemView.findViewById<TextView>(R.id.header_snippet)
+    private val avatar = itemView.findViewById<ImageView>(R.id.header_avatar)
+    private val rootView = itemView.findViewById<View>(R.id.header_root_view)
+
+    fun bind(likedItem: LikedItem) {
+        val authorName = when (val author = likedItem.author) {
+            is AuthorNameString -> author.nameString
+            is AuthorNameCharSequence -> author.nameCharSequence
+        }
+
+        this.name.text = authorName
+        this.snippet.text = likedItem.postOrCommentText
+
+        val avatarUrl = GravatarUtils.fixGravatarUrl(
+                likedItem.authorAvatarUrl,
+                rootView.context.resources.getDimensionPixelSize(R.dimen.avatar_sz_small)
+        )
+
+        imageManager.loadIntoCircle(this.avatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl)
+
+        if (!TextUtils.isEmpty(likedItem.authorPreferredSiteUrl) || likedItem.authorPreferredSiteId > 0) {
+            with(this.avatar) {
+                importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_YES
+                contentDescription = this.context.getString(string.profile_picture, authorName)
+                setOnClickListener {
+                    likedItem.onGravatarClick.invoke(
+                            likedItem.authorPreferredSiteId,
+                            likedItem.authorPreferredSiteUrl,
+                            likedItem.blogPreviewSource
+                    )
+                }
+                setBackgroundResource(
+                        this.context.getDrawableResIdFromAttribute(R.attr.selectableItemBackgroundBorderless)
+                )
+            }
+        } else {
+            with(this.avatar) {
+                importantForAccessibility = View.IMPORTANT_FOR_ACCESSIBILITY_NO
+                contentDescription = null
+                setOnClickListener(null)
+                setBackgroundResource(0)
+            }
+        }
+
+        rootView.setOnClickListener {
+            likedItem.onHeaderClicked.invoke(
+                    likedItem.likedItemSiteId,
+                    likedItem.likedItemSiteUrl,
+                    likedItem.likedItemId,
+                    likedItem.likedItemPostId
+            )
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/LikerViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/LikerViewHolder.kt
new file mode 100644
index 000000000000..4789ef1fb163
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/LikerViewHolder.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.ui.engagement
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import org.wordpress.android.R
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+import org.wordpress.android.util.GravatarUtils
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType
+import org.wordpress.android.viewmodel.ResourceProvider
+
+class LikerViewHolder(
+    parent: ViewGroup,
+    private val imageManager: ImageManager,
+    private val resourceProvider: ResourceProvider
+) : EngagedPeopleViewHolder(parent, R.layout.liker_user) {
+    private val likerName = itemView.findViewById<TextView>(R.id.user_name)
+    private val likerLogin = itemView.findViewById<TextView>(R.id.user_login)
+    private val likerAvatar = itemView.findViewById<ImageView>(R.id.user_avatar)
+    private val likerRootView = itemView.findViewById<View>(R.id.liker_root_view)
+
+    fun bind(liker: Liker) {
+        this.likerName.text = liker.name
+        this.likerLogin.text = if (liker.login.isNotBlank()) {
+            resourceProvider.getString(R.string.at_username, liker.login)
+        } else {
+            liker.login
+        }
+
+        val likerAvatarUrl = GravatarUtils.fixGravatarUrl(
+                liker.userAvatarUrl,
+                likerRootView.context.resources.getDimensionPixelSize(R.dimen.avatar_sz_medium)
+        )
+
+        imageManager.loadIntoCircle(this.likerAvatar, ImageType.AVATAR_WITH_BACKGROUND, likerAvatarUrl)
+
+        if (liker.onClick != null) {
+            likerRootView.isEnabled = true
+            likerRootView.setOnClickListener {
+                liker.onClick.invoke(
+                        UserProfile(
+                                userAvatarUrl = liker.userAvatarUrl,
+                                blavatarUrl = liker.preferredBlogBlavatar,
+                                userName = liker.name,
+                                userLogin = liker.login,
+                                userBio = liker.userBio,
+                                siteTitle = liker.preferredBlogName,
+                                siteUrl = liker.preferredBlogUrl,
+                                siteId = liker.preferredBlogId
+                        ),
+                        liker.source
+                )
+            }
+        } else {
+            likerRootView.isEnabled = true
+            likerRootView.setOnClickListener(null)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenario.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenario.kt
new file mode 100644
index 000000000000..f07d76f93ab0
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenario.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.ui.engagement
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class ListScenario(
+    val type: ListScenarioType,
+    val source: EngagementNavigationSource,
+    val siteId: Long,
+    val postOrCommentId: Long,
+    val commentPostId: Long = 0,
+    val commentSiteUrl: String,
+    val headerData: HeaderData
+) : Parcelable
+
+enum class ListScenarioType(val typeDescription: String) {
+    LOAD_POST_LIKES("post"),
+    LOAD_COMMENT_LIKES("comment");
+
+    companion object {
+        fun getSourceDescription(type: ListScenarioType?): String {
+            return type?.typeDescription ?: "unknown"
+        }
+    }
+}
+
+@Parcelize
+data class HeaderData constructor(
+    val authorName: AuthorName,
+    val snippetText: String,
+    val authorAvatarUrl: String,
+    val authorUserId: Long,
+    val authorPreferredSiteId: Long,
+    val authorPreferredSiteUrl: String,
+    val numLikes: Int = 0
+) : Parcelable
+
+sealed class AuthorName : Parcelable {
+    @Parcelize
+    data class AuthorNameString(val nameString: String?) : AuthorName()
+    @Parcelize
+    data class AuthorNameCharSequence(val nameCharSequence: CharSequence?) : AuthorName()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenarioUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenarioUtils.kt
new file mode 100644
index 000000000000..49b08f6ca8ff
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/ListScenarioUtils.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.ui.engagement
+
+import android.content.Context
+import android.text.Spannable
+import dagger.Reusable
+import org.json.JSONArray
+import org.json.JSONException
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.models.Note
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_COMMENT_LIKES
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_POST_LIKES
+import org.wordpress.android.ui.engagement.AuthorName.AuthorNameCharSequence
+import org.wordpress.android.ui.notifications.blocks.HeaderNoteBlock
+import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan
+import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.NOTIFS
+import org.wordpress.android.util.getMediaUrlOrEmpty
+import org.wordpress.android.util.getRangeIdOrZero
+import org.wordpress.android.util.getRangeSiteIdOrZero
+import org.wordpress.android.util.getRangeUrlOrEmpty
+import org.wordpress.android.util.getTextOrEmpty
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
+import java.util.ArrayList
+import javax.inject.Inject
+
+@Reusable
+class ListScenarioUtils @Inject constructor(
+    val imageManager: ImageManager,
+    val notificationsUtilsWrapper: NotificationsUtilsWrapper
+) {
+    fun mapLikeNoteToListScenario(note: Note, context: Context): ListScenario {
+        if (!note.isLikeType) throw IllegalArgumentException(
+                "mapLikeNoteToListScenario > unexpected note type ${note.type}"
+        )
+
+        val imageType = AVATAR_WITH_BACKGROUND
+        val headerNoteBlock = HeaderNoteBlock(
+                null,
+                transformToFormattableContentList(note.header),
+                imageType,
+                null,
+                null,
+                imageManager,
+                notificationsUtilsWrapper
+        )
+        headerNoteBlock.setIsComment(note.isCommentType)
+
+        val spannable: Spannable = notificationsUtilsWrapper.getSpannableContentForRanges(headerNoteBlock.getHeader(0))
+        val spans = spannable.getSpans(
+                0, spannable.length,
+                NoteBlockClickableSpan::class.java
+        )
+        for (span in spans) {
+            span.enableColors(context)
+        }
+
+        return ListScenario(
+                type = if (note.isPostLikeType) LOAD_POST_LIKES else LOAD_COMMENT_LIKES,
+                source = EngagementNavigationSource.LIKE_NOTIFICATION_LIST,
+                siteId = note.siteId.toLong(),
+                postOrCommentId = if (note.isPostLikeType) note.postId.toLong() else note.commentId,
+                commentPostId = if (note.isCommentLikeType) note.postId.toLong() else 0L,
+                commentSiteUrl = if (note.isCommentLikeType) note.url else "",
+                headerData = HeaderData(
+                        authorName = AuthorNameCharSequence(spannable),
+                        snippetText = headerNoteBlock.getHeader(1).getTextOrEmpty(),
+                        authorAvatarUrl = headerNoteBlock.getHeader(0).getMediaUrlOrEmpty(0),
+                        authorUserId = headerNoteBlock.getHeader(0).getRangeIdOrZero(0),
+                        authorPreferredSiteId = headerNoteBlock.getHeader(0).getRangeSiteIdOrZero(0),
+                        authorPreferredSiteUrl = headerNoteBlock.getHeader(0).getRangeUrlOrEmpty(0)
+                )
+        )
+    }
+
+    fun transformToFormattableContentList(headerArray: JSONArray?): List<FormattableContent> {
+        val headersList: MutableList<FormattableContent> = ArrayList()
+        if (headerArray != null) {
+            for (i in 0 until headerArray.length()) {
+                try {
+                    headersList.add(
+                            notificationsUtilsWrapper.mapJsonToFormattableContent(
+                                    headerArray.getJSONObject(i)
+                            )
+                    )
+                } catch (e: JSONException) {
+                    AppLog.e(NOTIFS, "Header array has invalid format.")
+                }
+            }
+        }
+        return headersList
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/NextPageLoadViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/NextPageLoadViewHolder.kt
new file mode 100644
index 000000000000..fc847eb6ef54
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/NextPageLoadViewHolder.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.ui.engagement
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import org.wordpress.android.R
+import org.wordpress.android.ui.engagement.EngageItem.NextLikesPageLoader
+
+class NextPageLoadViewHolder(parent: ViewGroup) : EngagedPeopleViewHolder(parent, R.layout.load_or_action_item) {
+    private val progress = itemView.findViewById<View>(R.id.progress)
+    private val actionButton = itemView.findViewById<Button>(R.id.action_button)
+
+    fun bind(item: NextLikesPageLoader) {
+        if (item.isLoading) {
+            item.action.invoke()
+            progress.visibility = View.VISIBLE
+            actionButton.visibility = View.GONE
+        } else {
+            progress.visibility = View.GONE
+            actionButton.visibility = View.VISIBLE
+            actionButton.setOnClickListener {
+                item.action.invoke()
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/UserProfileBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/UserProfileBottomSheetFragment.kt
new file mode 100644
index 000000000000..e53c991c6cb6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/UserProfileBottomSheetFragment.kt
@@ -0,0 +1,162 @@
+package org.wordpress.android.ui.engagement
+
+import android.content.Context
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.view.ViewCompat
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.engagement.BottomSheetUiState.UserProfileUiState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.GravatarUtils
+import org.wordpress.android.util.PhotonUtils
+import org.wordpress.android.util.PhotonUtils.Quality.HIGH
+import org.wordpress.android.util.UrlUtils
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
+import org.wordpress.android.util.image.ImageType.BLAVATAR
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class UserProfileBottomSheetFragment : BottomSheetDialogFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var resourceProvider: ResourceProvider
+
+    private lateinit var viewModel: UserProfileViewModel
+
+    companion object {
+        const val USER_PROFILE_VIEW_MODEL_KEY = "user_profile_view_model_key"
+
+        fun newInstance(viewModelKey: String): UserProfileBottomSheetFragment {
+            val fragment = UserProfileBottomSheetFragment()
+            val bundle = Bundle()
+
+            bundle.putString(USER_PROFILE_VIEW_MODEL_KEY, viewModelKey)
+
+            fragment.arguments = bundle
+
+            return fragment
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.user_profile_bottom_sheet, container)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val vmKey = requireArguments().getString(USER_PROFILE_VIEW_MODEL_KEY)!!
+
+        ViewCompat.setAccessibilityPaneTitle(view, getString(R.string.user_profile_bottom_sheet_description))
+
+        viewModel = ViewModelProvider(parentFragment as ViewModelStoreOwner, viewModelFactory)
+                .get(vmKey, UserProfileViewModel::class.java)
+
+        initObservers(view)
+
+        dialog?.setOnShowListener { dialogInterface ->
+            val sheetDialog = dialogInterface as? BottomSheetDialog
+
+            val bottomSheet = sheetDialog?.findViewById<View>(
+                    com.google.android.material.R.id.design_bottom_sheet
+            ) as? FrameLayout
+
+            bottomSheet?.let {
+                val behavior = BottomSheetBehavior.from(it)
+                val metrics = resources.displayMetrics
+                behavior.peekHeight = metrics.heightPixels
+            }
+        }
+    }
+
+    private fun initObservers(view: View) {
+        val userAvatar = view.findViewById<ImageView>(R.id.user_avatar)
+        val blavatar = view.findViewById<ImageView>(R.id.user_site_blavatar)
+        val userName = view.findViewById<TextView>(R.id.user_name)
+        val userLogin = view.findViewById<TextView>(R.id.user_login)
+        val userBio = view.findViewById<TextView>(R.id.user_bio)
+        val siteTitle = view.findViewById<TextView>(R.id.site_title)
+        val siteUrl = view.findViewById<TextView>(R.id.site_url)
+        val siteSectionHeader = view.findViewById<TextView>(R.id.site_section_header)
+        val siteData = view.findViewById<View>(R.id.site_data)
+
+        viewModel.bottomSheetUiState.observe(viewLifecycleOwner, { state ->
+            when (state) {
+                is UserProfileUiState -> {
+                    val avatarSz = resourceProvider.getDimensionPixelSize(R.dimen.user_profile_bottom_sheet_avatar_sz)
+                    val blavatarSz = resourceProvider.getDimensionPixelSize(R.dimen.avatar_sz_medium)
+
+                    imageManager.loadIntoCircle(
+                            userAvatar,
+                            AVATAR_WITH_BACKGROUND,
+                            GravatarUtils.fixGravatarUrl(state.userAvatarUrl, avatarSz)
+                    )
+                    userName.text = state.userName
+                    userLogin.text = if (state.userLogin.isNotBlank()) {
+                        getString(R.string.at_username, state.userLogin)
+                    } else {
+                        ""
+                    }
+                    if (state.userBio.isNotBlank()) {
+                        userBio.text = state.userBio
+                        userBio.visibility = View.VISIBLE
+                    } else {
+                        userBio.visibility = View.GONE
+                    }
+
+                    imageManager.load(
+                            blavatar,
+                            BLAVATAR,
+                            PhotonUtils.getPhotonImageUrl(state.blavatarUrl, blavatarSz, blavatarSz, HIGH)
+                    )
+
+                    if (state.hasSiteUrl) {
+                        siteTitle.text = state.siteTitle
+                        siteUrl.text = UrlUtils.getHost(state.siteUrl)
+                        siteData.setOnClickListener {
+                            state.onSiteClickListener?.invoke(
+                                    state.siteId,
+                                    state.siteUrl,
+                                    state.blogPreviewSource
+                            )
+                        }
+                        siteSectionHeader.visibility = View.VISIBLE
+                        blavatar.visibility = View.VISIBLE
+                        siteData.visibility = View.VISIBLE
+                    } else {
+                        siteSectionHeader.visibility = View.GONE
+                        blavatar.visibility = View.GONE
+                        siteData.visibility = View.GONE
+                    }
+                }
+            }
+        })
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        super.onCancel(dialog)
+        viewModel.onBottomSheetCancelled()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/engagement/UserProfileViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/engagement/UserProfileViewModel.kt
new file mode 100644
index 000000000000..efbbd1d4a4c9
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/engagement/UserProfileViewModel.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.ui.engagement
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import org.wordpress.android.R
+import org.wordpress.android.ui.engagement.BottomSheetAction.HideBottomSheet
+import org.wordpress.android.ui.engagement.BottomSheetAction.ShowBottomSheet
+import org.wordpress.android.ui.engagement.BottomSheetUiState.UserProfileUiState
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_NOTIFICATION_LIST
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_READER_LIST
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class UserProfileViewModel @Inject constructor(
+    private val resourceProvider: ResourceProvider,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
+) : ViewModel() {
+    private val _onBottomSheetAction = MutableLiveData<Event<BottomSheetAction>>()
+    val onBottomSheetAction: LiveData<Event<BottomSheetAction>> = _onBottomSheetAction
+
+    private val _bottomSheetUiState = MutableLiveData<BottomSheetUiState>()
+    val bottomSheetUiState: LiveData<BottomSheetUiState> = _bottomSheetUiState
+
+    fun onBottomSheetOpen(
+        userProfile: UserProfile,
+        onClick: ((siteId: Long, siteUrl: String, source: String) -> Unit)?,
+        source: EngagementNavigationSource?
+    ) {
+        _bottomSheetUiState.value = with(userProfile) {
+            UserProfileUiState(
+                    userAvatarUrl = userAvatarUrl,
+                    blavatarUrl = blavatarUrl,
+                    userName = userName,
+                    userLogin = userLogin,
+                    userBio = userBio,
+                    siteTitle = if (siteTitle.isBlank()) {
+                        resourceProvider.getString(R.string.user_profile_untitled_site)
+                    } else {
+                        siteTitle
+                    },
+                    siteUrl = siteUrl,
+                    siteId = siteId,
+                    onSiteClickListener = onClick,
+                    blogPreviewSource = source?.let {
+                        when (it) {
+                            LIKE_NOTIFICATION_LIST -> ReaderTracker.SOURCE_NOTIF_LIKE_LIST_USER_PROFILE
+                            LIKE_READER_LIST -> ReaderTracker.SOURCE_READER_LIKE_LIST_USER_PROFILE
+                        }
+                    } ?: ReaderTracker.SOURCE_USER_PROFILE_UNKNOWN
+            )
+        }
+        analyticsUtilsWrapper.trackUserProfileShown(EngagementNavigationSource.getSourceDescription(source))
+        _onBottomSheetAction.value = Event(ShowBottomSheet)
+    }
+
+    fun onBottomSheetCancelled() {
+        _onBottomSheetAction.value = Event(HideBottomSheet)
+    }
+
+    companion object {
+        const val USER_PROFILE_VM_KEY = "USER_PROFILE_VIEW_MODEL_KEY"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/gif/GifMediaViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/gif/GifMediaViewHolder.kt
index d3fb031176e0..a484a1c602b4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/gif/GifMediaViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/gif/GifMediaViewHolder.kt
@@ -3,12 +3,9 @@ package org.wordpress.android.ui.gif
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.ImageView.ScaleType.CENTER_CROP
-import android.widget.TextView
-import androidx.lifecycle.Observer
-import kotlinx.android.synthetic.main.media_picker_thumbnail.view.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.MediaPickerThumbnailBinding
 import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.AniUtils.Duration.MEDIUM
 import org.wordpress.android.util.getDistinct
@@ -53,13 +50,12 @@ class GifMediaViewHolder(
 ) : LifecycleOwnerViewHolder<GifMediaViewModel>(itemView) {
     data class ThumbnailViewDimensions(val width: Int, val height: Int)
 
-    private val thumbnailView: ImageView = itemView.image_thumbnail
-    private val selectionNumberTextView: TextView = itemView.text_selection_count
+    private val binding = MediaPickerThumbnailBinding.bind(itemView)
 
     private var mediaViewModel: GifMediaViewModel? = null
 
     init {
-        thumbnailView.apply {
+        binding.imageThumbnail.apply {
             layoutParams.width = thumbnailViewDimensions.width
             layoutParams.height = thumbnailViewDimensions.height
 
@@ -91,7 +87,7 @@ class GifMediaViewHolder(
         updateThumbnailOnSelectionChange(isSelected = isSelected, animated = false)
 
         // When the [isSelected] property changes later, update the selection number and scale the thumbnail
-        mediaViewModel?.isSelected?.observe(this, Observer {
+        mediaViewModel?.isSelected?.observe(this, {
             val selected = it ?: false
 
             updateSelectionIndicatorOnSelectionChange(isSelected = selected, animated = true)
@@ -99,20 +95,20 @@ class GifMediaViewHolder(
         })
 
         // Update selection number text and observe later changes
-        selectionNumberTextView.text = mediaViewModel?.selectionNumber?.value?.toString() ?: ""
-        mediaViewModel?.selectionNumber?.getDistinct()?.observe(this, Observer {
-            selectionNumberTextView.text = it?.toString() ?: ""
+        binding.textSelectionCount.text = mediaViewModel?.selectionNumber?.value?.toString() ?: ""
+        mediaViewModel?.selectionNumber?.getDistinct()?.observe(this, {
+            binding.textSelectionCount.text = it?.toString() ?: ""
         })
 
-        thumbnailView.contentDescription = mediaViewModel?.title
-        imageManager.load(thumbnailView, PHOTO, mediaViewModel?.thumbnailUri.toString(), CENTER_CROP)
+        binding.imageThumbnail.contentDescription = mediaViewModel?.title
+        imageManager.load(binding.imageThumbnail, PHOTO, mediaViewModel?.thumbnailUri.toString(), CENTER_CROP)
     }
 
     private fun updateSelectionIndicatorOnSelectionChange(isSelected: Boolean, animated: Boolean) {
         // The `isSelected` here changes the color of the text. It will be blue when selected.
-        selectionNumberTextView.isSelected = isSelected
+        binding.textSelectionCount.isSelected = isSelected
         if (!isMultiSelectEnabled) {
-            selectionNumberTextView.visibility = if (isSelected) {
+            binding.textSelectionCount.visibility = if (isSelected) {
                 View.VISIBLE
             } else {
                 View.GONE
@@ -122,12 +118,12 @@ class GifMediaViewHolder(
         if (animated) {
             if (!isMultiSelectEnabled) {
                 if (isSelected) {
-                    AniUtils.scaleIn(selectionNumberTextView, MEDIUM)
+                    AniUtils.scaleIn(binding.textSelectionCount, MEDIUM)
                 } else {
-                    AniUtils.scaleOut(selectionNumberTextView, MEDIUM)
+                    AniUtils.scaleOut(binding.textSelectionCount, MEDIUM)
                 }
             } else {
-                AniUtils.startAnimation(selectionNumberTextView, R.anim.pop)
+                AniUtils.startAnimation(binding.textSelectionCount, R.anim.pop)
             }
         }
     }
@@ -139,7 +135,7 @@ class GifMediaViewHolder(
         val scaleStart = if (isSelected) THUMBNAIL_SCALE_NORMAL else THUMBNAIL_SCALE_SELECTED
         val scaleEnd = if (scaleStart == THUMBNAIL_SCALE_SELECTED) THUMBNAIL_SCALE_NORMAL else THUMBNAIL_SCALE_SELECTED
 
-        with(thumbnailView) {
+        with(binding.imageThumbnail) {
             if (animated) {
                 AniUtils.scale(this, scaleStart, scaleEnd, AniUtils.Duration.SHORT)
             } else {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/gif/GifPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/gif/GifPickerActivity.kt
index 9edaae47b46a..9ed2604a4856 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/gif/GifPickerActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/gif/GifPickerActivity.kt
@@ -11,12 +11,12 @@ import android.widget.RelativeLayout
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.SearchView.OnQueryTextListener
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.GridLayoutManager
-import kotlinx.android.synthetic.main.media_picker_activity.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.databinding.MediaPickerActivityBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActionableEmptyView
 import org.wordpress.android.ui.LocaleAwareActivity
@@ -69,36 +69,38 @@ class GifPickerActivity : LocaleAwareActivity() {
         val requestCode = intent.getIntExtra(KEY_REQUEST_CODE, 0)
         isMultiSelectEnabled = requestCode == RequestCodes.GIF_PICKER_MULTI_SELECT
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(GifPickerViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(GifPickerViewModel::class.java)
         viewModel.start(site, isMultiSelectEnabled)
 
         // We are intentionally reusing this layout since the UI is very similar.
-        setContentView(R.layout.media_picker_activity)
-
-        initializeToolbar()
-        initializeRecyclerView()
-        initializeSearchView()
-        initializeSearchProgressBar()
-        initializeSelectionBar()
-        initializeEmptyView()
-        initializeRangeLoadErrorEventHandlers()
-        initializePreviewHandlers()
-        initializeDownloadHandlers()
-        initializeStateChangeHandlers()
+        val binding = MediaPickerActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.apply {
+            initializeToolbar()
+            initializeRecyclerView()
+            initializeSearchView()
+            initializeSearchProgressBar()
+            initializeSelectionBar()
+            initializeEmptyView()
+            initializeRangeLoadErrorEventHandlers()
+            initializePreviewHandlers()
+            initializeDownloadHandlers()
+            initializeStateChangeHandlers()
+        }
     }
 
     /**
      * Show the back arrow.
      */
-    private fun initializeToolbar() {
-        setSupportActionBar(toolbar_main)
+    private fun MediaPickerActivityBinding.initializeToolbar() {
+        setSupportActionBar(toolbarMain)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
     /**
      * Configure the RecyclerView to use [GifPickerPagedListAdapter] and display the items in a grid
      */
-    private fun initializeRecyclerView() {
+    private fun MediaPickerActivityBinding.initializeRecyclerView() {
         val pagedListAdapter = GifPickerPagedListAdapter(
                 imageManager = imageManager,
                 thumbnailViewDimensions = thumbnailViewDimensions,
@@ -121,7 +123,7 @@ class GifPickerActivity : LocaleAwareActivity() {
         }
 
         // Update the RecyclerView when new items arrive from the API
-        viewModel.mediaViewModelPagedList.observe(this, Observer {
+        viewModel.mediaViewModelPagedList.observe(this@GifPickerActivity, Observer {
             pagedListAdapter.submitList(it)
         })
     }
@@ -129,12 +131,12 @@ class GifPickerActivity : LocaleAwareActivity() {
     /**
      * Configure the search view to execute search when the keyboard's Done button is pressed.
      */
-    private fun initializeSearchView() {
-        search_view.queryHint = getString(R.string.gif_picker_search_hint)
+    private fun MediaPickerActivityBinding.initializeSearchView() {
+        searchView.queryHint = getString(R.string.gif_picker_search_hint)
 
-        search_view.setOnQueryTextListener(object : OnQueryTextListener {
+        searchView.setOnQueryTextListener(object : OnQueryTextListener {
             override fun onQueryTextSubmit(query: String): Boolean {
-                search_view.clearFocus()
+                searchView.clearFocus()
                 return true
             }
 
@@ -148,8 +150,8 @@ class GifPickerActivity : LocaleAwareActivity() {
     /**
      * Show the progress bar in the center of the page if we are performing an initial page load.
      */
-    private fun initializeSearchProgressBar() {
-        viewModel.isPerformingInitialLoad.getDistinct().observe(this, Observer {
+    private fun MediaPickerActivityBinding.initializeSearchProgressBar() {
+        viewModel.isPerformingInitialLoad.getDistinct().observe(this@GifPickerActivity, Observer {
             val isPerformingInitialLoad = it ?: return@Observer
             progress.visibility = if (isPerformingInitialLoad) View.VISIBLE else View.GONE
         })
@@ -158,8 +160,8 @@ class GifPickerActivity : LocaleAwareActivity() {
     /**
      * Configure the selection bar and its labels when the [GifPickerViewModel] selected items change
      */
-    private fun initializeSelectionBar() {
-        viewModel.selectionBarUiModel.observe(this, Observer { uiModel ->
+    private fun MediaPickerActivityBinding.initializeSelectionBar() {
+        viewModel.selectionBarUiModel.observe(this@GifPickerActivity, Observer { uiModel ->
             if (uiModel.isMultiselectEnabled) {
                 // Update the "Add" and "Preview" labels to include the number of items. For example, "Add 7" and "Preview 7".
                 //
@@ -168,18 +170,18 @@ class GifPickerActivity : LocaleAwareActivity() {
                 // change to just "Add" and "Preview" too.
                 val selectedCount = uiModel.numberOfSelectedImages
                 if (selectedCount > 0) {
-                    text_preview.text = getString(R.string.preview_count, selectedCount)
-                    text_add.text = getString(R.string.add_count, selectedCount)
+                    textPreview.text = getString(R.string.preview_count, selectedCount)
+                    textAdd.text = getString(R.string.add_count, selectedCount)
                 }
             } else {
                 // When in single selection mode we only show  ADD label
-                text_add.text = getString(R.string.photo_picker_use_gif)
-                text_add.visibility = View.VISIBLE
-                text_preview.visibility = View.GONE
+                textAdd.text = getString(R.string.photo_picker_use_gif)
+                textAdd.visibility = View.VISIBLE
+                textPreview.visibility = View.GONE
             }
 
             val isVisible = uiModel.isVisible
-            val selectionBar: ViewGroup = container_selection_bar
+            val selectionBar: ViewGroup = containerSelectionBar
 
             // Do nothing if the selection bar is already in the visibility state that we want it to be
             if (isVisible && selectionBar.visibility == View.VISIBLE ||
@@ -205,15 +207,15 @@ class GifPickerActivity : LocaleAwareActivity() {
     /**
      * Set up showing and hiding of the empty view depending on the search results
      */
-    private fun initializeEmptyView() {
-        val emptyView: ActionableEmptyView = actionable_empty_view
+    private fun MediaPickerActivityBinding.initializeEmptyView() {
+        val emptyView: ActionableEmptyView = actionableEmptyView
         emptyView.run {
             image.setImageResource(R.drawable.img_illustration_media_105dp)
             bottomImage.setImageResource(R.drawable.img_tenor_100dp)
             bottomImage.contentDescription = getString(R.string.gif_powered_by_tenor)
         }
 
-        viewModel.emptyDisplayMode.getDistinct().observe(this, Observer { emptyDisplayMode ->
+        viewModel.emptyDisplayMode.getDistinct().observe(this@GifPickerActivity, Observer { emptyDisplayMode ->
             when (emptyDisplayMode) {
                 EmptyDisplayMode.HIDDEN -> {
                     emptyView.visibility = View.GONE
@@ -270,8 +272,8 @@ class GifPickerActivity : LocaleAwareActivity() {
     /**
      * Set up listener for the Preview button
      */
-    private fun initializePreviewHandlers() {
-        text_preview.setOnClickListener {
+    private fun MediaPickerActivityBinding.initializePreviewHandlers() {
+        textPreview.setOnClickListener {
             val mediaViewModels = viewModel.selectedMediaViewModelList.value?.values?.toList()
             if (mediaViewModels != null && mediaViewModels.isNotEmpty()) {
                 showPreview(mediaViewModels)
@@ -294,10 +296,10 @@ class GifPickerActivity : LocaleAwareActivity() {
     /**
      * Set up reacting to "Add" button presses and processing the result
      */
-    private fun initializeDownloadHandlers() {
-        text_add.setOnClickListener { viewModel.downloadSelected() }
+    private fun MediaPickerActivityBinding.initializeDownloadHandlers() {
+        textAdd.setOnClickListener { viewModel.downloadSelected() }
 
-        viewModel.downloadResult.observe(this, Observer { result ->
+        viewModel.downloadResult.observe(this@GifPickerActivity, Observer { result ->
             if (result?.mediaModels != null) {
                 val mediaLocalIds = result.mediaModels.map { it.id }.toIntArray()
 
@@ -323,29 +325,29 @@ class GifPickerActivity : LocaleAwareActivity() {
      * - [State.DOWNLOADING] or [State.FINISHED]: "Add", "Preview", searching, and selecting are disabled
      * - [State.DOWNLOADING]: The "Add" button is replaced with a progress bar
      */
-    private fun initializeStateChangeHandlers() {
-        viewModel.state.observe(this, Observer { state ->
+    private fun MediaPickerActivityBinding.initializeStateChangeHandlers() {
+        viewModel.state.observe(this@GifPickerActivity, Observer { state ->
             state ?: return@Observer
 
             val searchClearButton =
-                    search_view.findViewById(androidx.appcompat.R.id.search_close_btn) as ImageView
+                    searchView.findViewById(androidx.appcompat.R.id.search_close_btn) as ImageView
             val searchEditText =
-                    search_view.findViewById(androidx.appcompat.R.id.search_src_text)
+                    searchView.findViewById(androidx.appcompat.R.id.search_src_text)
                             as SearchView.SearchAutoComplete
 
             val isIdle = state == State.IDLE
             val isDownloading = state == State.DOWNLOADING
 
             // Disable all the controls if we are not idle
-            text_add.isEnabled = isIdle
-            text_preview.isEnabled = isIdle
+            textAdd.isEnabled = isIdle
+            textPreview.isEnabled = isIdle
             searchClearButton.isEnabled = isIdle
             searchEditText.isEnabled = isIdle
 
             // Show the progress bar instead of the Add text if we are downloading
-            upload_progress.visibility = if (isDownloading) View.VISIBLE else View.GONE
+            uploadProgress.visibility = if (isDownloading) View.VISIBLE else View.GONE
             // The Add text should not be View.GONE because the progress bar relies on its layout to position itself
-            text_add.visibility = if (isDownloading) View.INVISIBLE else View.VISIBLE
+            textAdd.visibility = if (isDownloading) View.INVISIBLE else View.VISIBLE
         })
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCase.kt
new file mode 100644
index 000000000000..dc8fc0ee55fc
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCase.kt
@@ -0,0 +1,109 @@
+package org.wordpress.android.ui.jetpack
+
+import kotlinx.coroutines.flow.flow
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.JetpackCapability
+import org.wordpress.android.fluxc.model.JetpackCapability.BACKUP
+import org.wordpress.android.fluxc.model.JetpackCapability.BACKUP_DAILY
+import org.wordpress.android.fluxc.model.JetpackCapability.BACKUP_REALTIME
+import org.wordpress.android.fluxc.model.JetpackCapability.SCAN
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.fluxc.store.SiteStore.FetchJetpackCapabilitiesPayload
+import org.wordpress.android.fluxc.store.SiteStore.JetpackCapabilitiesError
+import org.wordpress.android.fluxc.store.SiteStore.JetpackCapabilitiesErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.SiteStore.OnJetpackCapabilitiesFetched
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+private val SCAN_CAPABILITIES = listOf(SCAN)
+val BACKUP_CAPABILITIES = listOf(BACKUP, BACKUP_DAILY, BACKUP_REALTIME)
+
+class JetpackCapabilitiesUseCase @Inject constructor(
+    @Suppress("unused") private val siteStore: SiteStore,
+    private val dispatcher: Dispatcher,
+    private val appPrefsWrapper: AppPrefsWrapper
+) {
+    private var continuation: HashMap<Long, Continuation<OnJetpackCapabilitiesFetched>?> = hashMapOf()
+
+    init {
+        dispatcher.register(this@JetpackCapabilitiesUseCase)
+    }
+
+    fun clear() {
+        dispatcher.unregister(this)
+    }
+
+    suspend fun getJetpackPurchasedProducts(remoteSiteId: Long) = flow {
+        emit(getCachedJetpackPurchasedProducts(remoteSiteId))
+        emit(fetchJetpackPurchasedProducts(remoteSiteId))
+    }
+
+    fun getCachedJetpackPurchasedProducts(remoteSiteId: Long): JetpackPurchasedProducts =
+            mapToJetpackPurchasedProducts(getCachedJetpackCapabilities(remoteSiteId))
+
+    suspend fun fetchJetpackPurchasedProducts(remoteSiteId: Long): JetpackPurchasedProducts =
+            mapToJetpackPurchasedProducts(fetchJetpackCapabilities(remoteSiteId))
+
+    private fun mapToJetpackPurchasedProducts(capabilities: List<JetpackCapability>) =
+            JetpackPurchasedProducts(
+                    scan = capabilities.find { SCAN_CAPABILITIES.contains(it) } != null,
+                    backup = capabilities.find { BACKUP_CAPABILITIES.contains(it) } != null
+            )
+
+    private fun getCachedJetpackCapabilities(remoteSiteId: Long): List<JetpackCapability> {
+        return appPrefsWrapper.getSiteJetpackCapabilities(remoteSiteId)
+    }
+
+    private suspend fun fetchJetpackCapabilities(remoteSiteId: Long): List<JetpackCapability> {
+        forceResumeDuplicateRequests(remoteSiteId)
+
+        val response = suspendCoroutine<OnJetpackCapabilitiesFetched> { cont ->
+            val payload = FetchJetpackCapabilitiesPayload(remoteSiteId)
+            continuation[remoteSiteId] = cont
+            dispatcher.dispatch(SiteActionBuilder.newFetchJetpackCapabilitiesAction(payload))
+        }
+
+        val capabilities: List<JetpackCapability> = response.capabilities ?: listOf()
+        if (!response.isError) {
+            updateCache(remoteSiteId, capabilities)
+        }
+        return capabilities
+    }
+
+    private fun forceResumeDuplicateRequests(remoteSiteId: Long) {
+        continuation[remoteSiteId]?.let {
+            continuation.remove(remoteSiteId)
+            val event = OnJetpackCapabilitiesFetched(
+                    remoteSiteId, listOf(), JetpackCapabilitiesError(GENERIC_ERROR, "Already running")
+            )
+            it.resume(event)
+        }
+    }
+
+    private fun updateCache(
+        remoteSiteId: Long,
+        capabilities: List<JetpackCapability>
+    ) {
+        appPrefsWrapper.setSiteJetpackCapabilities(
+                remoteSiteId,
+                capabilities
+        )
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    @SuppressWarnings("unused")
+    fun onJetpackCapabilitiesFetched(event: OnJetpackCapabilitiesFetched) {
+        continuation[event.remoteSiteId]?.let {
+            continuation.remove(event.remoteSiteId)
+            it.resume(event)
+        }
+    }
+
+    data class JetpackPurchasedProducts(val scan: Boolean, val backup: Boolean)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt
new file mode 100644
index 000000000000..1b84f71d463f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadActivity.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+import android.R.id
+import android.os.Bundle
+import android.view.MenuItem
+import org.wordpress.android.databinding.BackupDownloadActivityBinding
+import org.wordpress.android.ui.LocaleAwareActivity
+
+class BackupDownloadActivity : LocaleAwareActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        with(BackupDownloadActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
+
+            setSupportActionBar(toolbarMain)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadErrorTypes.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadErrorTypes.kt
new file mode 100644
index 000000000000..f9220db3a6e6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadErrorTypes.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+enum class BackupDownloadErrorTypes constructor(val id: Int) {
+    NetworkUnavailable(0), RemoteRequestFailure(1), GenericFailure(2);
+
+    companion object {
+        fun fromInt(value: Int): BackupDownloadErrorTypes =
+                values().firstOrNull { it.id == value }
+                        ?: throw IllegalArgumentException("BackupDownloadErrorTypes wrong value $value")
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadFragment.kt
new file mode 100644
index 000000000000..ef53408ae029
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadFragment.kt
@@ -0,0 +1,197 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+import android.app.Activity.RESULT_CANCELED
+import android.app.Activity.RESULT_OK
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.snackbar.Snackbar
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.JetpackBackupRestoreFragmentBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadNavigationEvents.DownloadFile
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadNavigationEvents.ShareLink
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadCanceled
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadCompleted
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadInProgress
+import org.wordpress.android.ui.jetpack.common.JetpackBackupDownloadActionState
+import org.wordpress.android.ui.jetpack.common.adapters.JetpackBackupRestoreAdapter
+import org.wordpress.android.ui.jetpack.scan.adapters.HorizontalMarginItemDecoration
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
+import org.wordpress.android.widgets.WPSnackbar
+import javax.inject.Inject
+
+const val KEY_BACKUP_DOWNLOAD_REWIND_ID = "key_backup_download_rewind_id"
+const val KEY_BACKUP_DOWNLOAD_DOWNLOAD_ID = "key_backup_download_download_id"
+const val KEY_BACKUP_DOWNLOAD_ACTION_STATE_ID = "key_backup_download_action_state_id"
+
+class BackupDownloadFragment : Fragment(R.layout.jetpack_backup_restore_fragment) {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var imageManager: ImageManager
+    private lateinit var viewModel: BackupDownloadViewModel
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(JetpackBackupRestoreFragmentBinding.bind(view)) {
+            initDagger()
+            initBackPressHandler()
+            initAdapter()
+            initViewModel(savedInstanceState)
+        }
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component().inject(this)
+    }
+
+    private fun initBackPressHandler() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+                viewLifecycleOwner,
+                object : OnBackPressedCallback(
+                        true
+                ) {
+                    override fun handleOnBackPressed() {
+                        onBackPressed()
+                    }
+                })
+    }
+
+    private fun onBackPressed() {
+        viewModel.onBackPressed()
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.initAdapter() {
+        recyclerView.adapter = JetpackBackupRestoreAdapter(imageManager, uiHelpers)
+        recyclerView.itemAnimator = null
+        recyclerView.addItemDecoration(
+                HorizontalMarginItemDecoration(resources.getDimensionPixelSize(R.dimen.margin_extra_large))
+        )
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.initViewModel(savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(
+                this@BackupDownloadFragment,
+                viewModelFactory
+        ).get(BackupDownloadViewModel::class.java)
+
+        val (site, activityId) = when {
+            requireActivity().intent?.extras != null -> {
+                val site = requireNotNull(requireActivity().intent.extras).getSerializable(WordPress.SITE) as SiteModel
+                val activityId = requireNotNull(requireActivity().intent.extras).getString(
+                        KEY_BACKUP_DOWNLOAD_ACTIVITY_ID_KEY
+                ) as String
+                site to activityId
+            }
+            else -> {
+                AppLog.e(T.JETPACK_BACKUP, "Error initializing ${this.javaClass.simpleName}")
+                throw Throwable("Couldn't initialize ${this.javaClass.simpleName} view model")
+            }
+        }
+
+        initObservers()
+
+        viewModel.start(site, activityId, savedInstanceState)
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.initObservers() {
+        viewModel.uiState.observe(viewLifecycleOwner, {
+            updateToolbar(it.toolbarState)
+            showView(it)
+        })
+
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, {
+            it.showSnackbar()
+        })
+
+        viewModel.navigationEvents.observeEvent(viewLifecycleOwner, {
+            when (it) {
+                is ShareLink -> {
+                    ActivityLauncher.shareBackupDownloadFileLink(requireContext(), it.url)
+                }
+                is DownloadFile -> {
+                    ActivityLauncher.downloadBackupDownloadFile(requireContext(), it.url)
+                }
+            }
+        })
+
+        viewModel.wizardFinishedObservable.observeEvent(viewLifecycleOwner, { state ->
+            val intent = Intent()
+            val (backupDownloadCreated, ids, actionType) = when (state) {
+                is BackupDownloadCanceled -> Triple(
+                        false,
+                        null,
+                        JetpackBackupDownloadActionState.CANCEL
+                )
+                is BackupDownloadInProgress -> Triple(
+                        true,
+                        Pair(state.rewindId, state.downloadId),
+                        JetpackBackupDownloadActionState.PROGRESS
+                )
+                is BackupDownloadCompleted -> Triple(
+                        true,
+                        Pair(state.rewindId, state.downloadId),
+                        JetpackBackupDownloadActionState.COMPLETE
+                )
+            }
+            intent.putExtra(KEY_BACKUP_DOWNLOAD_REWIND_ID, ids?.first)
+            intent.putExtra(KEY_BACKUP_DOWNLOAD_DOWNLOAD_ID, ids?.second)
+            intent.putExtra(KEY_BACKUP_DOWNLOAD_ACTION_STATE_ID, actionType.id)
+            requireActivity().let { activity ->
+                activity.setResult(if (backupDownloadCreated) RESULT_OK else RESULT_CANCELED, intent)
+                activity.finish()
+            }
+        })
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.showView(state: BackupDownloadUiState) {
+        ((recyclerView.adapter) as JetpackBackupRestoreAdapter).update(state.items)
+    }
+
+    private fun updateToolbar(toolbarState: ToolbarState) {
+        val activity = requireActivity() as? AppCompatActivity
+        activity?.supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+            it.title = getString(toolbarState.title)
+            it.setHomeAsUpIndicator(toolbarState.icon)
+        }
+    }
+
+    private fun SnackbarMessageHolder.showSnackbar() {
+        activity?.findViewById<View>(R.id.coordinator_layout)?.let { coordinator ->
+            val snackbar = WPSnackbar.make(
+                    coordinator,
+                    uiHelpers.getTextOfUiString(requireContext(), this.message),
+                    Snackbar.LENGTH_LONG
+            )
+            if (this.buttonTitle != null) {
+                snackbar.setAction(
+                        uiHelpers.getTextOfUiString(
+                                requireContext(),
+                                this.buttonTitle
+                        )
+                ) {
+                    this.buttonAction.invoke()
+                }
+            }
+            snackbar.show()
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewModel.writeToBundle(outState)
+        super.onSaveInstanceState(outState)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadNavigationEvents.kt
new file mode 100644
index 000000000000..e478b06100a1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadNavigationEvents.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+sealed class BackupDownloadNavigationEvents {
+    data class ShareLink(val url: String) : BackupDownloadNavigationEvents()
+    data class DownloadFile(val url: String) : BackupDownloadNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadStates.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadStates.kt
new file mode 100644
index 000000000000..f16794ec1090
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadStates.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.ui.jetpack.backup.download.StateType.COMPLETE
+import org.wordpress.android.ui.jetpack.backup.download.StateType.DETAILS
+import org.wordpress.android.ui.jetpack.backup.download.StateType.ERROR
+import org.wordpress.android.ui.jetpack.backup.download.StateType.PROGRESS
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.CompleteToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.DetailsToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.ErrorToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.ProgressToolbarState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import java.util.Date
+
+abstract class BackupDownloadUiState(open val type: StateType) {
+    abstract val items: List<JetpackListItemState>
+    abstract val toolbarState: ToolbarState
+
+    data class ErrorState(
+        val errorType: BackupDownloadErrorTypes,
+        override val items: List<JetpackListItemState>
+    ) : BackupDownloadUiState(ERROR) {
+        override val toolbarState: ToolbarState = ErrorToolbarState
+    }
+
+    sealed class ContentState(override val type: StateType) : BackupDownloadUiState(type) {
+        data class DetailsState(
+            val activityLogModel: ActivityLogModel,
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(DETAILS) {
+            override val toolbarState: ToolbarState = DetailsToolbarState
+        }
+
+        data class ProgressState(
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(PROGRESS) {
+            override val toolbarState: ToolbarState = ProgressToolbarState
+        }
+
+        data class CompleteState(
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(COMPLETE) {
+            override val toolbarState: ToolbarState = CompleteToolbarState
+        }
+    }
+}
+
+enum class StateType(val id: Int) {
+    DETAILS(0),
+    PROGRESS(1),
+    COMPLETE(2),
+    ERROR(3)
+}
+
+sealed class ToolbarState {
+    abstract val title: Int
+    @DrawableRes val icon: Int = R.drawable.ic_close_24px
+
+    object DetailsToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.backup_download_details_page_title
+    }
+
+    object ProgressToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.backup_download_progress_page_title
+    }
+
+    object CompleteToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.backup_download_complete_page_title
+    }
+
+    object ErrorToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.backup_download_complete_failed_title
+    }
+}
+
+sealed class BackupDownloadRequestState {
+    data class Success(
+        val requestRewindId: String,
+        val rewindId: String,
+        val downloadId: Long?
+    ) : BackupDownloadRequestState()
+
+    data class Progress(
+        val rewindId: String,
+        val progress: Int?,
+        val published: Date? = null
+    ) : BackupDownloadRequestState()
+
+    data class Complete(
+        val rewindId: String,
+        val downloadId: Long,
+        val url: String?,
+        val published: Date? = null,
+        val validUntil: Date? = null,
+        val isValid: Boolean = false
+    ) : BackupDownloadRequestState()
+
+    object Empty : BackupDownloadRequestState()
+    sealed class Failure : BackupDownloadRequestState() {
+        object NetworkUnavailable : Failure()
+        object RemoteRequestFailure : Failure()
+        object OtherRequestRunning : Failure()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadStep.kt
new file mode 100644
index 000000000000..f5c88826ec6b
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadStep.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+import org.wordpress.android.util.wizard.WizardStep
+import javax.inject.Inject
+import javax.inject.Singleton
+
+enum class BackupDownloadStep(val id: Int) : WizardStep {
+    DETAILS(0), PROGRESS(1), COMPLETE(2), ERROR(3);
+
+    companion object {
+        fun fromString(input: String): BackupDownloadStep = when (input) {
+            "backup_download_details" -> DETAILS
+            "backup_download_progress" -> PROGRESS
+            "backup_download_complete" -> COMPLETE
+            "backup_download_error" -> ERROR
+            else -> throw IllegalArgumentException("SiteCreationStep not recognized: \$input")
+        }
+
+        fun indexForErrorTransition(): Int = COMPLETE.id
+    }
+}
+
+@Singleton
+class BackupDownloadStepsProvider @Inject constructor() {
+    fun getSteps() = listOf(
+            BackupDownloadStep.fromString("backup_download_details"),
+            BackupDownloadStep.fromString("backup_download_progress"),
+            BackupDownloadStep.fromString("backup_download_complete"),
+            BackupDownloadStep.fromString("backup_download_error")
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModel.kt
new file mode 100644
index 000000000000..c5e1c7ec2179
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModel.kt
@@ -0,0 +1,466 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.os.Parcelable
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.collect
+import org.json.JSONObject
+import org.wordpress.android.R.string
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.JETPACK_BACKUP_DOWNLOAD_CONFIRMED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.JETPACK_BACKUP_DOWNLOAD_ERROR
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.JETPACK_BACKUP_DOWNLOAD_FILE_DOWNLOAD_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.JETPACK_BACKUP_DOWNLOAD_SHARE_LINK_TAPPED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadRequestTypes
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadNavigationEvents.DownloadFile
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadNavigationEvents.ShareLink
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Complete
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Empty
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.OtherRequestRunning
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Progress
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Success
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadStep.COMPLETE
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadStep.DETAILS
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadStep.ERROR
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadStep.PROGRESS
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ContentState.CompleteState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ContentState.DetailsState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ContentState.ProgressState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ErrorState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadCanceled
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadCompleted
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadInProgress
+import org.wordpress.android.ui.jetpack.backup.download.builders.BackupDownloadStateListItemBuilder
+import org.wordpress.android.ui.jetpack.backup.download.usecases.GetBackupDownloadStatusUseCase
+import org.wordpress.android.ui.jetpack.backup.download.usecases.PostBackupDownloadUseCase
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.CONTENTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.MEDIA_UPLOADS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.PLUGINS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.ROOTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.SQLS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.THEMES
+import org.wordpress.android.ui.jetpack.usecases.GetActivityLogItemUseCase
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.wizard.WizardManager
+import org.wordpress.android.util.wizard.WizardNavigationTarget
+import org.wordpress.android.util.wizard.WizardState
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import java.util.Date
+import java.util.HashMap
+import javax.inject.Inject
+import javax.inject.Named
+
+const val KEY_BACKUP_DOWNLOAD_ACTIVITY_ID_KEY = "key_backup_download_activity_id_key"
+const val KEY_BACKUP_DOWNLOAD_CURRENT_STEP = "key_backup_download_current_step"
+const val KEY_BACKUP_DOWNLOAD_STATE = "key_backup_download_state"
+private const val TRACKING_ERROR_CAUSE_OFFLINE = "offline"
+private const val TRACKING_ERROR_CAUSE_REMOTE = "remote"
+private const val TRACKING_ERROR_CAUSE_OTHER = "other"
+
+@Parcelize
+@SuppressLint("ParcelCreator")
+data class BackupDownloadState(
+    val siteId: Long? = null,
+    val activityId: String? = null,
+    val rewindId: String? = null,
+    val downloadId: Long? = null,
+    val published: Date? = null,
+    val url: String? = null,
+    val errorType: Int? = null
+) : WizardState, Parcelable
+
+typealias NavigationTarget = WizardNavigationTarget<BackupDownloadStep, BackupDownloadState>
+
+class BackupDownloadViewModel @Inject constructor(
+    private val wizardManager: WizardManager<BackupDownloadStep>,
+    private val availableItemsProvider: JetpackAvailableItemsProvider,
+    private val getActivityLogItemUseCase: GetActivityLogItemUseCase,
+    private val stateListItemBuilder: BackupDownloadStateListItemBuilder,
+    private val postBackupDownloadUseCase: PostBackupDownloadUseCase,
+    private val getBackupDownloadStatusUseCase: GetBackupDownloadStatusUseCase,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+    private lateinit var site: SiteModel
+    private lateinit var activityId: String
+
+    private lateinit var backupDownloadState: BackupDownloadState
+    private val progressStart = 0
+
+    private val _wizardFinishedObservable = MutableLiveData<Event<BackupDownloadWizardState>>()
+    val wizardFinishedObservable: LiveData<Event<BackupDownloadWizardState>> = _wizardFinishedObservable
+
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _navigationEvents = MediatorLiveData<Event<BackupDownloadNavigationEvents>>()
+    val navigationEvents: LiveData<Event<BackupDownloadNavigationEvents>> = _navigationEvents
+
+    private val _uiState = MutableLiveData<BackupDownloadUiState>()
+    val uiState: LiveData<BackupDownloadUiState> = _uiState
+
+    private val wizardObserver = Observer { data: BackupDownloadStep? ->
+        data?.let {
+            clearOldBackupDownloadState(it)
+            showStep(NavigationTarget(it, backupDownloadState))
+        }
+    }
+
+    fun start(site: SiteModel, activityId: String, savedInstanceState: Bundle?) {
+        if (isStarted) return
+        isStarted = true
+
+        this.site = site
+        this.activityId = activityId
+
+        wizardManager.navigatorLiveData.observeForever(wizardObserver)
+
+        if (savedInstanceState == null) {
+            backupDownloadState = BackupDownloadState()
+            // Show the next step only if it's a fresh activity so we can handle the navigation
+            wizardManager.showNextStep()
+        } else {
+            backupDownloadState = requireNotNull(savedInstanceState.getParcelable(KEY_BACKUP_DOWNLOAD_STATE))
+            val currentStepIndex = savedInstanceState.getInt(KEY_BACKUP_DOWNLOAD_CURRENT_STEP)
+            wizardManager.setCurrentStepIndex(currentStepIndex)
+        }
+    }
+
+    fun onBackPressed() {
+        when (wizardManager.currentStep) {
+            DETAILS.id -> _wizardFinishedObservable.value = Event(BackupDownloadCanceled)
+            PROGRESS.id -> constructProgressEvent()
+            COMPLETE.id -> constructCompleteEvent()
+            ERROR.id -> _wizardFinishedObservable.value = Event(BackupDownloadCanceled)
+        }
+    }
+
+    private fun constructProgressEvent() {
+        _wizardFinishedObservable.value = if (backupDownloadState.downloadId != null) {
+            Event(
+                    BackupDownloadInProgress(
+                            backupDownloadState.rewindId as String,
+                            backupDownloadState.downloadId as Long
+                    )
+            )
+        } else {
+            Event(BackupDownloadCanceled)
+        }
+    }
+
+    private fun constructCompleteEvent() {
+        _wizardFinishedObservable.value = if (backupDownloadState.downloadId != null) {
+            Event(
+                    BackupDownloadCompleted(
+                            backupDownloadState.rewindId as String,
+                            backupDownloadState.downloadId as Long
+                    )
+            )
+        } else {
+            Event(BackupDownloadCanceled)
+        }
+    }
+
+    fun writeToBundle(outState: Bundle) {
+        outState.putInt(KEY_BACKUP_DOWNLOAD_CURRENT_STEP, wizardManager.currentStep)
+        outState.putParcelable(KEY_BACKUP_DOWNLOAD_STATE, backupDownloadState)
+    }
+
+    private fun buildDetails() {
+        launch {
+            val availableItems = availableItemsProvider.getAvailableItems()
+            val activityLogModel = getActivityLogItemUseCase.get(activityId)
+            if (activityLogModel != null) {
+                _uiState.value = DetailsState(
+                        activityLogModel = activityLogModel,
+                        items = stateListItemBuilder.buildDetailsListStateItems(
+                                availableItems = availableItems,
+                                published = activityLogModel.published,
+                                onCreateDownloadClick = this@BackupDownloadViewModel::onCreateDownloadClick,
+                                onCheckboxItemClicked = this@BackupDownloadViewModel::onCheckboxItemClicked
+                        ),
+                        type = StateType.DETAILS
+                )
+            } else {
+                trackError(TRACKING_ERROR_CAUSE_OTHER)
+                transitionToError(BackupDownloadErrorTypes.GenericFailure)
+            }
+        }
+    }
+
+    private fun buildProgress() {
+        _uiState.value = ProgressState(
+                items = stateListItemBuilder.buildProgressListStateItems(
+                        progress = progressStart,
+                        published = backupDownloadState.published as Date
+                ),
+                type = StateType.PROGRESS
+        )
+        queryStatus()
+    }
+
+    private fun buildComplete() {
+        _uiState.value = CompleteState(
+                items = stateListItemBuilder.buildCompleteListStateItems(
+                        published = backupDownloadState.published as Date,
+                        onDownloadFileClick = this@BackupDownloadViewModel::onDownloadFileClick,
+                        onShareLinkClick = this@BackupDownloadViewModel::onShareLinkClick
+                ), type = StateType.COMPLETE
+        )
+    }
+
+    private fun buildError(errorType: BackupDownloadErrorTypes) {
+        _uiState.value = ErrorState(
+                errorType = errorType,
+                items = stateListItemBuilder.buildErrorListStateErrorItems(
+                        errorType = errorType,
+                        onDoneClick = this@BackupDownloadViewModel::onDoneClick
+                )
+        )
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun showStep(target: WizardNavigationTarget<BackupDownloadStep, BackupDownloadState>) {
+        when (target.wizardStep) {
+            DETAILS -> buildDetails()
+            PROGRESS -> buildProgress()
+            COMPLETE -> buildComplete()
+            ERROR -> buildError(
+                    BackupDownloadErrorTypes.fromInt(
+                            target.wizardState.errorType ?: BackupDownloadErrorTypes.GenericFailure.id
+                    )
+            )
+        }
+    }
+
+    private fun transitionToError(errorType: BackupDownloadErrorTypes) {
+        backupDownloadState = backupDownloadState.copy(errorType = errorType.id)
+        wizardManager.setCurrentStepIndex(BackupDownloadStep.indexForErrorTransition())
+        wizardManager.showNextStep()
+    }
+
+    private fun getParams(): Pair<String?, BackupDownloadRequestTypes> {
+        val rewindId = (_uiState.value as? DetailsState)?.activityLogModel?.rewindID
+        val items = _uiState.value?.items ?: mutableListOf()
+        val types = buildBackupDownloadRequestTypes(items)
+        return rewindId to types
+    }
+
+    private fun buildBackupDownloadRequestTypes(items: List<JetpackListItemState>): BackupDownloadRequestTypes {
+        val checkboxes = items.filterIsInstance(CheckboxState::class.java)
+
+        return BackupDownloadRequestTypes(
+                themes = checkboxes.firstOrNull { it.availableItemType == THEMES }?.checked ?: true,
+                plugins = checkboxes.firstOrNull { it.availableItemType == PLUGINS }?.checked
+                        ?: true,
+                uploads = checkboxes.firstOrNull { it.availableItemType == MEDIA_UPLOADS }?.checked
+                        ?: true,
+                sqls = checkboxes.firstOrNull { it.availableItemType == SQLS }?.checked ?: true,
+                roots = checkboxes.firstOrNull { it.availableItemType == ROOTS }?.checked ?: true,
+                contents = checkboxes.firstOrNull { it.availableItemType == CONTENTS }?.checked
+                        ?: true
+        )
+    }
+
+    private fun handleBackupDownloadRequestResult(result: BackupDownloadRequestState) {
+        when (result) {
+            is NetworkUnavailable -> {
+                trackError(TRACKING_ERROR_CAUSE_OFFLINE)
+                _snackbarEvents.postValue(Event(NetworkUnavailableMsg))
+            }
+            is RemoteRequestFailure -> {
+                trackError(TRACKING_ERROR_CAUSE_REMOTE)
+                _snackbarEvents.postValue(Event(GenericFailureMsg))
+            }
+            is Success -> handleBackupDownloadRequestSuccess(result)
+            is OtherRequestRunning -> {
+                trackError(TRACKING_ERROR_CAUSE_OTHER)
+                _snackbarEvents.postValue(Event(OtherRequestRunningMsg))
+            }
+            else -> Unit // Do nothing
+        }
+    }
+
+    private fun handleBackupDownloadRequestSuccess(result: Success) {
+        backupDownloadState = backupDownloadState.copy(
+                rewindId = result.rewindId,
+                downloadId = result.downloadId,
+                published = extractPublishedDate()
+        )
+        wizardManager.showNextStep()
+    }
+
+    private fun extractPublishedDate(): Date {
+        return (_uiState.value as? DetailsState)?.activityLogModel?.published as Date
+    }
+
+    private fun queryStatus() {
+        launch {
+            getBackupDownloadStatusUseCase.getBackupDownloadStatus(site, backupDownloadState.downloadId as Long)
+                    .collect { state -> handleQueryStatus(state) }
+        }
+    }
+
+    private fun handleQueryStatus(state: BackupDownloadRequestState) {
+        when (state) {
+            is NetworkUnavailable -> {
+                trackError(TRACKING_ERROR_CAUSE_OFFLINE)
+                transitionToError(BackupDownloadErrorTypes.RemoteRequestFailure)
+            }
+            is RemoteRequestFailure -> {
+                trackError(TRACKING_ERROR_CAUSE_REMOTE)
+                transitionToError(BackupDownloadErrorTypes.RemoteRequestFailure)
+            }
+            is Progress -> transitionToProgress(state)
+            is Complete -> transitionToComplete(state)
+            is Empty -> {
+                trackError(TRACKING_ERROR_CAUSE_REMOTE)
+                transitionToError(BackupDownloadErrorTypes.RemoteRequestFailure)
+            }
+            else -> Unit // Do nothing
+        }
+    }
+
+    private fun transitionToProgress(state: Progress) {
+        (_uiState.value as? ProgressState)?.let { content ->
+            val updatedList = content.items.map { contentState ->
+                if (contentState.type == ViewType.PROGRESS) {
+                    contentState as JetpackListItemState.ProgressState
+                    contentState.copy(
+                            progress = state.progress ?: 0,
+                            progressLabel = UiStringResWithParams(
+                                    string.backup_download_progress_label,
+                                    listOf(UiStringText(state.progress?.toString() ?: "0"))
+                            )
+                    )
+                } else {
+                    contentState
+                }
+            }
+            _uiState.postValue(content.copy(items = updatedList))
+        }
+    }
+
+    private fun transitionToComplete(state: Complete) {
+        backupDownloadState = backupDownloadState.copy(url = state.url)
+        wizardManager.showNextStep()
+    }
+
+    private fun clearOldBackupDownloadState(wizardStep: BackupDownloadStep) {
+        if (wizardStep == DETAILS) {
+            backupDownloadState = backupDownloadState.copy(
+                    rewindId = null,
+                    downloadId = null,
+                    url = null,
+                    errorType = null
+            )
+        }
+    }
+
+    private fun onCheckboxItemClicked(itemType: JetpackAvailableItemType) {
+        (_uiState.value as? DetailsState)?.let {
+            val updatedItems = stateListItemBuilder.updateCheckboxes(it, itemType)
+            _uiState.postValue(it.copy(items = updatedItems))
+        }
+    }
+
+    private fun onCreateDownloadClick() {
+        val (rewindId, types) = getParams()
+        if (rewindId == null) {
+            transitionToError(BackupDownloadErrorTypes.GenericFailure)
+        } else {
+            trackBackupDownloadConfirmed(types)
+            launch {
+                val result = postBackupDownloadUseCase.postBackupDownloadRequest(
+                        rewindId,
+                        site,
+                        types
+                )
+                handleBackupDownloadRequestResult(result)
+            }
+        }
+    }
+
+    private fun onDownloadFileClick() {
+        AnalyticsTracker.track(JETPACK_BACKUP_DOWNLOAD_FILE_DOWNLOAD_TAPPED)
+        backupDownloadState.url?.let { _navigationEvents.postValue(Event(DownloadFile(it))) }
+    }
+
+    private fun onShareLinkClick() {
+        AnalyticsTracker.track(JETPACK_BACKUP_DOWNLOAD_SHARE_LINK_TAPPED)
+        backupDownloadState.url?.let { _navigationEvents.postValue(Event(ShareLink(it))) }
+    }
+
+    private fun onDoneClick() {
+        _wizardFinishedObservable.value = Event(BackupDownloadCanceled)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        wizardManager.navigatorLiveData.removeObserver(wizardObserver)
+    }
+
+    private fun trackBackupDownloadConfirmed(types: BackupDownloadRequestTypes) {
+        val propertiesSetup = mapOf(
+                "themes" to types.themes,
+                "plugins" to types.plugins,
+                "uploads" to types.uploads,
+                "sqls" to types.sqls,
+                "roots" to types.roots,
+                "contents" to types.contents
+        )
+        val map = mapOf("restore_types" to JSONObject(propertiesSetup))
+        AnalyticsTracker.track(JETPACK_BACKUP_DOWNLOAD_CONFIRMED, map)
+    }
+
+    private fun trackError(cause: String) {
+        val properties: MutableMap<String, String?> = HashMap()
+        properties["cause"] = cause
+        AnalyticsTracker.track(JETPACK_BACKUP_DOWNLOAD_ERROR, properties)
+    }
+
+    companion object {
+        private val NetworkUnavailableMsg = SnackbarMessageHolder(UiStringRes(string.error_network_connection))
+        private val GenericFailureMsg = SnackbarMessageHolder(UiStringRes(string.backup_download_generic_failure))
+        private val OtherRequestRunningMsg = SnackbarMessageHolder(
+                UiStringRes(string.backup_download_another_download_running)
+        )
+    }
+
+    sealed class BackupDownloadWizardState : Parcelable {
+        @Parcelize
+        object BackupDownloadCanceled : BackupDownloadWizardState()
+
+        @Parcelize
+        data class BackupDownloadInProgress(
+            val rewindId: String,
+            val downloadId: Long
+        ) : BackupDownloadWizardState()
+
+        @Parcelize
+        data class BackupDownloadCompleted(
+            val rewindId: String,
+            val downloadId: Long
+        ) : BackupDownloadWizardState()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/builders/BackupDownloadStateListItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/builders/BackupDownloadStateListItemBuilder.kt
new file mode 100644
index 000000000000..7aea594bcafe
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/builders/BackupDownloadStateListItemBuilder.kt
@@ -0,0 +1,297 @@
+package org.wordpress.android.ui.jetpack.backup.download.builders
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import dagger.Reusable
+import org.wordpress.android.R
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadErrorTypes
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadErrorTypes.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState
+import org.wordpress.android.ui.jetpack.common.CheckboxSpannableLabel
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.BulletState
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.FootnoteState
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.SubHeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.IconState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ProgressState
+import org.wordpress.android.ui.jetpack.common.ViewType.CHECKBOX
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItem
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.toFormattedDateString
+import org.wordpress.android.util.toFormattedTimeString
+import java.util.Date
+import javax.inject.Inject
+
+@Reusable
+class BackupDownloadStateListItemBuilder @Inject constructor(
+    private val checkboxSpannableLabel: CheckboxSpannableLabel
+) {
+    fun buildDetailsListStateItems(
+        published: Date,
+        availableItems: List<JetpackAvailableItem>,
+        onCreateDownloadClick: () -> Unit,
+        onCheckboxItemClicked: (availableItemType: JetpackAvailableItemType) -> Unit
+    ): List<JetpackListItemState> {
+        val items = mutableListOf(
+                buildIconState(
+                        R.drawable.ic_get_app_white_24dp,
+                        R.string.backup_download_details_icon_content_description,
+                        R.color.success
+                ),
+                buildHeaderState(R.string.backup_download_details_header),
+                buildDescriptionState(published, R.string.backup_download_details_description_with_two_parameters),
+                buildActionButtonState(
+                        titleRes = R.string.backup_download_details_action_button,
+                        contentDescRes = R.string.backup_download_details_action_button_content_description,
+                        onClick = onCreateDownloadClick
+                ),
+                buildSubHeaderState(R.string.backup_download_details_choose_items_header)
+        )
+
+        val availableItemsListItems: List<CheckboxState> = availableItems.map {
+            CheckboxState(
+                    availableItemType = it.availableItemType,
+                    label = UiStringRes(it.labelResId),
+                    labelSpannable = checkboxSpannableLabel.buildSpannableLabel(it.labelResId, it.labelHintResId),
+                    checked = true,
+                    onClick = { onCheckboxItemClicked(it.availableItemType) }
+            )
+        }
+        items.addAll(availableItemsListItems)
+        return items
+    }
+
+    fun buildProgressListStateItems(
+        progress: Int = 0,
+        published: Date
+    ): List<JetpackListItemState> {
+        return mutableListOf(
+                buildIconState(
+                        R.drawable.ic_get_app_white_24dp,
+                        R.string.backup_download_progress_icon_content_description,
+                        R.color.success
+                ),
+                buildHeaderState(R.string.backup_download_progress_header),
+                buildDescriptionState(published, R.string.backup_download_progress_description_with_two_parameters),
+                buildProgressState(progress),
+                buildFootnoteState(
+                        iconRes = R.drawable.ic_info_outline_white_24dp,
+                        iconSizeResId = R.dimen.jetpack_backup_restore_footnote_icon_size,
+                        textRes = R.string.backup_download_progress_footnote,
+                        isVisible = true
+                )
+        )
+    }
+
+    fun buildCompleteListStateItems(
+        published: Date,
+        onDownloadFileClick: () -> Unit,
+        onShareLinkClick: () -> Unit
+    ): List<JetpackListItemState> {
+        return listOf(
+                buildIconState(
+                        R.drawable.ic_cloud_done_white_24dp,
+                        R.string.backup_download_complete_icon_content_description,
+                        R.color.success
+                ),
+                buildHeaderState(R.string.backup_download_complete_header),
+                buildDescriptionState(published, R.string.backup_download_complete_description_with_two_parameters),
+                buildActionButtonState(
+                        titleRes = R.string.backup_download_complete_download_action_button,
+                        contentDescRes = R.string.backup_download_complete_download_action_button_content_description,
+                        onClick = onDownloadFileClick
+                ),
+                buildActionButtonState(
+                        titleRes = R.string.backup_download_complete_download_share_action_button,
+                        contentDescRes =
+                        R.string.backup_download_complete_download_share_action_button_content_description,
+                        isSecondary = true,
+                        iconRes = R.drawable.ic_share_white_24dp,
+                        onClick = onShareLinkClick
+                ),
+                buildFootnoteState(
+                        textRes = R.string.backup_download_complete_info,
+                        textAlphaResId = R.dimen.material_emphasis_medium
+                )
+        )
+    }
+
+    fun buildErrorListStateErrorItems(errorType: BackupDownloadErrorTypes, onDoneClick: () -> Unit) = (
+            if (errorType == RemoteRequestFailure) buildStatusErrorListStateItems(onDoneClick)
+            else buildGenericErrorListStateItems(onDoneClick)
+            )
+
+    private fun buildStatusErrorListStateItems(onDoneClick: () -> Unit) = listOf(
+            buildHeaderState(R.string.backup_download_status_failure_heading),
+            buildBulletState(
+                    R.drawable.ic_query_builder_white_24dp,
+                    R.string.backup_download_status_bullet_clock_icon_content_desc,
+                    R.color.warning,
+                    R.string.backup_download_status_failure_bullet1
+            ),
+            buildBulletState(
+                    R.drawable.ic_gridicons_checkmark_circle,
+                    R.string.backup_download_status_bullet_checkmark_icon_content_desc,
+                    R.color.success,
+                    R.string.backup_download_status_failure_bullet2
+            ),
+            buildBulletState(
+                    R.drawable.ic_gridicons_checkmark_circle,
+                    R.string.backup_download_status_bullet_checkmark_icon_content_desc,
+                    R.color.success,
+                    R.string.backup_download_status_failure_bullet3,
+                    R.dimen.jetpack_backup_restore_last_bullet_bottom_margin
+            ),
+            buildActionButtonState(
+                    titleRes = R.string.restore_complete_failed_action_button,
+                    contentDescRes = R.string.restore_complete_failed_action_button_content_description,
+                    onClick = onDoneClick
+            )
+    )
+
+    private fun buildGenericErrorListStateItems(onDoneClick: () -> Unit) = listOf(
+            buildIconState(
+                    R.drawable.ic_cloud_off_white_24dp,
+                    R.string.backup_download_complete_failed_icon_content_description,
+                    R.color.error
+            ),
+            buildHeaderState(R.string.backup_download_complete_failed_description),
+            buildDescriptionState(descRes = R.string.request_failed_message),
+            buildActionButtonState(
+                    titleRes = R.string.backup_download_complete_failed_action_button,
+                    contentDescRes = R.string.backup_download_complete_failed_action_button_content_description,
+                    onClick = onDoneClick
+            )
+    )
+
+    private fun buildIconState(
+        @DrawableRes iconRes: Int,
+        @StringRes contentDescRes: Int,
+        @ColorRes colorRes: Int
+    ) = IconState(
+            icon = iconRes,
+            contentDescription = UiStringRes(contentDescRes),
+            colorResId = colorRes
+    )
+
+    private fun buildHeaderState(@StringRes titleRes: Int) = HeaderState(UiStringRes(titleRes))
+
+    private fun buildDescriptionState(published: Date? = null, @StringRes descRes: Int) = DescriptionState(
+            if (published != null) {
+                UiStringResWithParams(
+                        descRes,
+                        listOf(
+                                UiStringText(published.toFormattedDateString()),
+                                UiStringText(published.toFormattedTimeString())
+                        )
+                )
+            } else {
+                UiStringRes(descRes)
+            }
+    )
+
+    @Suppress("LongMethod", "LongParameterList")
+    private fun buildActionButtonState(
+        @StringRes titleRes: Int,
+        @StringRes contentDescRes: Int,
+        isSecondary: Boolean = false,
+        @DrawableRes iconRes: Int? = null,
+        isVisible: Boolean = true,
+        onClick: () -> Unit
+    ) = ActionButtonState(
+            text = UiStringRes(titleRes),
+            contentDescription = UiStringRes(contentDescRes),
+            isSecondary = isSecondary,
+            iconRes = iconRes,
+            onClick = onClick,
+            isVisible = isVisible
+    )
+
+    private fun buildSubHeaderState(
+        @StringRes textResId: Int,
+        @DimenRes topMarginResId: Int? = null,
+        @DimenRes bottomMarginResId: Int? = null
+    ) = SubHeaderState(
+            text = UiStringRes(textResId),
+            itemTopMarginResId = topMarginResId,
+            itemBottomMarginResId = bottomMarginResId
+    )
+
+    private fun buildFootnoteState(
+        @DrawableRes iconRes: Int? = null,
+        @DimenRes textAlphaResId: Int? = null,
+        @DimenRes iconSizeResId: Int? = null,
+        @StringRes textRes: Int,
+        isVisible: Boolean = true
+    ) = FootnoteState(
+            iconRes = iconRes,
+            textAlphaResId = textAlphaResId,
+            iconSizeResId = iconSizeResId,
+            text = UiStringRes(textRes),
+            isVisible = isVisible
+    )
+
+    private fun buildProgressState(progress: Int) = ProgressState(
+            progress = progress,
+            progressLabel = UiStringResWithParams(
+                    R.string.backup_download_progress_label,
+                    listOf(UiStringText(progress.toString()))
+            )
+    )
+
+    private fun buildBulletState(
+        @DrawableRes iconRes: Int,
+        @StringRes contentDescRes: Int,
+        @ColorRes colorRes: Int,
+        @StringRes labelRes: Int,
+        @DimenRes itemBottomMarginResId: Int? = null
+    ) = BulletState(
+            icon = iconRes,
+            contentDescription = UiStringRes(contentDescRes),
+            colorResId = colorRes,
+            label = UiStringRes(labelRes),
+            itemBottomMarginResId = itemBottomMarginResId
+    )
+
+    fun updateCheckboxes(
+        uiState: BackupDownloadUiState,
+        itemType: JetpackAvailableItemType
+    ): List<JetpackListItemState> {
+        val updatedCheckboxes = uiState.items.map { state ->
+            if (state.type == CHECKBOX) {
+                state as CheckboxState
+                if (state.availableItemType == itemType) {
+                    state.copy(checked = !state.checked)
+                } else {
+                    state
+                }
+            } else {
+                state
+            }
+        }
+        val atLeastOneChecked = updatedCheckboxes.filterIsInstance<CheckboxState>().find { it.checked } != null
+        return updateDetailsActionButtonState(updatedCheckboxes, atLeastOneChecked)
+    }
+
+    private fun updateDetailsActionButtonState(
+        details: List<JetpackListItemState>,
+        enableActionButton: Boolean
+    ): List<JetpackListItemState> {
+        return details.map { state ->
+            if (state is ActionButtonState) {
+                state.copy(isEnabled = enableActionButton)
+            } else {
+                state
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/GetBackupDownloadStatusUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/GetBackupDownloadStatusUseCase.kt
new file mode 100644
index 000000000000..6173a6b2c662
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/GetBackupDownloadStatusUseCase.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.ui.jetpack.backup.download.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchBackupDownloadStatePayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Complete
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Empty
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Progress
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.util.Calendar
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.math.max
+
+const val DELAY_MILLIS = 1000L
+const val MAX_RETRY = 3
+const val DELAY_FACTOR = 2
+
+class GetBackupDownloadStatusUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val activityLogStore: ActivityLogStore,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val tag = javaClass.simpleName
+
+    @Suppress("ComplexMethod", "LoopWithTooManyJumpStatements")
+    suspend fun getBackupDownloadStatus(
+        site: SiteModel,
+        downloadId: Long? = null
+    ) = flow {
+        var retryAttempts = 0
+        while (true) {
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, NetworkUnavailable)
+                if (retryAttemptsExceeded) break else continue
+            }
+            val result = activityLogStore.fetchBackupDownloadState(FetchBackupDownloadStatePayload(site))
+            if (result.isError) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, RemoteRequestFailure)
+                if (retryAttemptsExceeded) break else continue
+            }
+            retryAttempts = 0
+            val status = activityLogStore.getBackupDownloadStatusForSite(site)
+            if (status == null) {
+                emit(Empty)
+                break
+            }
+            if (downloadId == null || status.downloadId == downloadId) {
+                if (emitCompleteElseProgress(status)) break
+            }
+            delay(DELAY_MILLIS)
+        }
+    }.flowOn(bgDispatcher)
+
+    private suspend fun FlowCollector<BackupDownloadRequestState>.emitCompleteElseProgress(
+        status: BackupDownloadStatusModel
+    ): Boolean {
+        val published = activityLogStore.getActivityLogItemByRewindId(status.rewindId)?.published
+        return if (status.progress == null) {
+            val isValid = isValid(status.url, status.validUntil, status.downloadId)
+            emit(Complete(status.rewindId, status.downloadId, status.url, published, status.validUntil, isValid))
+            true
+        } else {
+            emit(Progress(status.rewindId, status.progress, published))
+            false
+        }
+    }
+
+    private suspend fun FlowCollector<BackupDownloadRequestState>.handleError(
+        retryAttempts: Int,
+        failure: Failure
+    ): Boolean {
+        return if (retryAttempts >= MAX_RETRY) {
+            AppLog.d(T.JETPACK_BACKUP, "$tag: Exceeded $MAX_RETRY retries while fetching status")
+            emit(failure)
+            true
+        } else {
+            delay(DELAY_MILLIS * (max(1, DELAY_FACTOR * retryAttempts)))
+            false
+        }
+    }
+
+    private fun isValid(url: String?, validUntil: Date?, downloadId: Long?): Boolean {
+        if (validUntil == null || url == null || downloadId == null) return false
+        // Now represents the current time using the current locale and timezone
+        val now = Calendar.getInstance().apply { time = Date() }
+        val expires = Calendar.getInstance().apply { time = validUntil }
+        return now.before(expires)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostBackupDownloadUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostBackupDownloadUseCase.kt
new file mode 100644
index 000000000000..0857b5726912
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostBackupDownloadUseCase.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.ui.jetpack.backup.download.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadRequestTypes
+import org.wordpress.android.modules.IO_THREAD
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.OtherRequestRunning
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+
+class PostBackupDownloadUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val activityLogStore: ActivityLogStore,
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
+) {
+    suspend fun postBackupDownloadRequest(
+        rewindId: String,
+        site: SiteModel,
+        types: BackupDownloadRequestTypes
+    ): BackupDownloadRequestState = withContext(ioDispatcher) {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            return@withContext NetworkUnavailable
+        }
+
+        val result = activityLogStore.backupDownload(BackupDownloadPayload(site, rewindId, types))
+        if (result.isError) {
+            RemoteRequestFailure
+        } else {
+            if (result.rewindId == rewindId) {
+                if (result.downloadId == null) {
+                    RemoteRequestFailure
+                } else {
+                    Success(rewindId, result.rewindId, result.downloadId)
+                }
+            } else {
+                OtherRequestRunning
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostDismissBackupDownloadUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostDismissBackupDownloadUseCase.kt
new file mode 100644
index 000000000000..6426cefec50d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostDismissBackupDownloadUseCase.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.ui.jetpack.backup.download.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadPayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.math.max
+
+class PostDismissBackupDownloadUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val activityLogStore: ActivityLogStore,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val tag = javaClass.simpleName
+
+    @Suppress("ComplexMethod", "LoopWithTooManyJumpStatements")
+    suspend fun dismissBackupDownload(
+        downloadId: Long,
+        site: SiteModel
+    ): Boolean = withContext(bgDispatcher) {
+        var retryAttempts = 0
+        var dismissed = false
+        while (true) {
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                val retryAttemptsExceeded = handleError(retryAttempts++)
+                if (retryAttemptsExceeded) break else continue
+            }
+            val result = activityLogStore.dismissBackupDownload(DismissBackupDownloadPayload(site, downloadId))
+            if (result.isError) break
+            dismissed = true
+            break
+        }
+        dismissed
+    }
+
+    private suspend fun handleError(retryAttempts: Int) = if (retryAttempts >= MAX_RETRY) {
+        AppLog.d(T.JETPACK_BACKUP, "$tag: Exceeded $MAX_RETRY retries while dismiss download backup file")
+        true
+    } else {
+        delay(DELAY_MILLIS * max(1, DELAY_FACTOR * retryAttempts))
+        false
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/CheckboxSpannableLabel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/CheckboxSpannableLabel.kt
new file mode 100644
index 000000000000..68f37463cfd5
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/CheckboxSpannableLabel.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.jetpack.common
+
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
+import androidx.annotation.StringRes
+import org.wordpress.android.R.color
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class CheckboxSpannableLabel @Inject constructor(
+    private val resourceProvider: ResourceProvider
+) {
+    fun buildSpannableLabel(
+        @StringRes labelRes: Int,
+        @StringRes labelHintRes: Int?
+    ): CharSequence? {
+        val labelText = resourceProvider.getString(labelRes)
+        if (labelHintRes == null) {
+            return null
+        }
+        val labelHintText = resourceProvider.getString(labelHintRes)
+        val spannable = SpannableString(labelHintText)
+        spannable.setSpan(
+                ForegroundColorSpan(resourceProvider.getColor(color.neutral)),
+                0,
+                labelHintText.length,
+                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+
+        return SpannableString(SpannableStringBuilder().append(labelText).append(" ").append(spannable))
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackBackupDownloadActionState.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackBackupDownloadActionState.kt
new file mode 100644
index 000000000000..78d934808118
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackBackupDownloadActionState.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.ui.jetpack.common
+
+enum class JetpackBackupDownloadActionState(val id: Int) {
+    CANCEL(0),
+    COMPLETE(1),
+    PROGRESS(2)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackBackupRestoreListItemState.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackBackupRestoreListItemState.kt
new file mode 100644
index 000000000000..39fbb69a088e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackBackupRestoreListItemState.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.ui.jetpack.common
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import org.wordpress.android.R
+import org.wordpress.android.ui.utils.UiString
+
+sealed class JetpackBackupRestoreListItemState(override val type: ViewType) : JetpackListItemState(type) {
+    data class SubHeaderState(
+        val text: UiString,
+        @DimenRes val itemTopMarginResId: Int? = null,
+        @DimenRes val itemBottomMarginResId: Int? = null
+    ) : JetpackBackupRestoreListItemState(ViewType.BACKUP_RESTORE_SUB_HEADER)
+
+    data class FootnoteState(
+        @DrawableRes val iconRes: Int? = null,
+        @DimenRes val iconSizeResId: Int? = null,
+        @DimenRes val textAlphaResId: Int? = null,
+        val text: UiString,
+        val isVisible: Boolean = true
+    ) : JetpackListItemState(ViewType.BACKUP_RESTORE_FOOTNOTE)
+
+    data class BulletState(
+        @DrawableRes val icon: Int,
+        @ColorRes val colorResId: Int? = null,
+        @DimenRes val sizeResId: Int = R.dimen.jetpack_icon_size,
+        @DimenRes val itemBottomMarginResId: Int? = null,
+        val contentDescription: UiString,
+        val label: UiString
+    ) : JetpackListItemState(ViewType.BACKUP_RESTORE_BULLET)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackListItemState.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackListItemState.kt
new file mode 100644
index 000000000000..87948a254ba7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/JetpackListItemState.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.ui.jetpack.common
+
+import android.view.View
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorRes
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import org.wordpress.android.R
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType
+import org.wordpress.android.ui.utils.UiString
+
+open class JetpackListItemState(open val type: ViewType) {
+    open fun longId(): Long = hashCode().toLong()
+
+    data class IconState(
+        @DrawableRes val icon: Int,
+        @ColorRes val colorResId: Int? = null,
+        @DimenRes val sizeResId: Int = R.dimen.jetpack_icon_size,
+        @DimenRes val marginResId: Int = R.dimen.jetpack_icon_margin,
+        val contentDescription: UiString
+    ) : JetpackListItemState(ViewType.ICON)
+
+    data class HeaderState(val text: UiString, @AttrRes val textColorRes: Int = R.attr.colorOnSurface) :
+            JetpackListItemState(ViewType.HEADER)
+
+    data class DescriptionState(
+        val text: UiString?,
+        val clickableTextsInfo: List<ClickableTextInfo>? = null
+    ) : JetpackListItemState(ViewType.DESCRIPTION) {
+        data class ClickableTextInfo(
+            val startIndex: Int,
+            val endIndex: Int,
+            val onClick: () -> Unit
+        )
+    }
+
+    data class ActionButtonState(
+        val text: UiString,
+        val contentDescription: UiString,
+        val isSecondary: Boolean = false,
+        val isEnabled: Boolean = true,
+        val isVisible: Boolean = true,
+        @DrawableRes val iconRes: Int? = null,
+        val onClick: () -> Unit
+    ) : JetpackListItemState(if (isSecondary) ViewType.SECONDARY_ACTION_BUTTON else ViewType.PRIMARY_ACTION_BUTTON)
+
+    data class CheckboxState(
+        val availableItemType: JetpackAvailableItemType,
+        val label: UiString,
+        val labelSpannable: CharSequence? = null,
+        val checked: Boolean = false,
+        val onClick: (() -> Unit)
+    ) : JetpackListItemState(ViewType.CHECKBOX)
+
+    data class ProgressState(
+        val progress: Int = 0,
+        val progressLabel: UiString? = null,
+        val progressStateLabel: UiString? = null,
+        val progressInfoLabel: UiString? = null,
+        val isIndeterminate: Boolean = false,
+        val isVisible: Boolean = true
+    ) : JetpackListItemState(ViewType.PROGRESS) {
+        val progressStateLabelTextAlignment = if (progressLabel == null) {
+            View.TEXT_ALIGNMENT_TEXT_START
+        } else {
+            View.TEXT_ALIGNMENT_TEXT_END
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/ViewType.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/ViewType.kt
new file mode 100644
index 000000000000..802a1e2f042c
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/ViewType.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.jetpack.common
+
+enum class ViewType(val id: Int) {
+    ICON(0),
+    HEADER(1),
+    DESCRIPTION(2),
+    PRIMARY_ACTION_BUTTON(3),
+    SECONDARY_ACTION_BUTTON(4),
+    THREATS_HEADER(5),
+    THREAT_DETAIL_HEADER(6),
+    THREAT_ITEM_LOADING_SKELETON(7),
+    THREAT_ITEM(8),
+    CHECKBOX(9),
+    BACKUP_RESTORE_SUB_HEADER(10),
+    THREAT_CONTEXT_LINES(11),
+    THREAT_FILE_NAME(12),
+    BACKUP_RESTORE_FOOTNOTE(13),
+    PROGRESS(14),
+    BACKUP_RESTORE_BULLET(15),
+    THREAT_DETECTED_DATE(16)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/adapters/JetpackBackupRestoreAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/adapters/JetpackBackupRestoreAdapter.kt
new file mode 100644
index 000000000000..df70b26a2114
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/adapters/JetpackBackupRestoreAdapter.kt
@@ -0,0 +1,101 @@
+package org.wordpress.android.ui.jetpack.common.adapters
+
+import android.view.ViewGroup
+import androidx.annotation.MainThread
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackBackupRestoreBulletViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackBackupRestoreFootnoteViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackBackupRestoreSubHeaderViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackButtonViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackCheckboxViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackDescriptionViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackHeaderViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackIconViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackProgressViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+
+class JetpackBackupRestoreAdapter(
+    private val imageManager: ImageManager,
+    private val uiHelpers: UiHelpers
+) : RecyclerView.Adapter<JetpackViewHolder<*>>() {
+    private val items = mutableListOf<JetpackListItemState>()
+
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): JetpackViewHolder<*> {
+        return when (viewType) {
+            ViewType.ICON.id -> JetpackIconViewHolder(imageManager, parent)
+            ViewType.HEADER.id -> JetpackHeaderViewHolder(uiHelpers, parent)
+            ViewType.DESCRIPTION.id -> JetpackDescriptionViewHolder(uiHelpers, parent)
+            ViewType.PROGRESS.id -> JetpackProgressViewHolder(uiHelpers, parent)
+            ViewType.PRIMARY_ACTION_BUTTON.id -> JetpackButtonViewHolder.Primary(uiHelpers, parent)
+            ViewType.SECONDARY_ACTION_BUTTON.id -> JetpackButtonViewHolder.Secondary(uiHelpers, parent)
+            ViewType.CHECKBOX.id -> JetpackCheckboxViewHolder(uiHelpers, parent)
+            ViewType.BACKUP_RESTORE_FOOTNOTE.id -> JetpackBackupRestoreFootnoteViewHolder(
+                    imageManager,
+                    uiHelpers,
+                    parent
+            )
+            ViewType.BACKUP_RESTORE_SUB_HEADER.id -> JetpackBackupRestoreSubHeaderViewHolder(
+                    uiHelpers,
+                    parent
+            )
+            ViewType.BACKUP_RESTORE_BULLET.id -> JetpackBackupRestoreBulletViewHolder(imageManager, uiHelpers, parent)
+            else -> throw IllegalArgumentException("Unexpected view type in ${this::class.java.simpleName}")
+        }
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    override fun getItemId(position: Int): Long {
+        return position.toLong()
+    }
+
+    override fun onBindViewHolder(holder: JetpackViewHolder<*>, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    override fun getItemViewType(position: Int) = items[position].type.id
+
+    @MainThread
+    fun update(newItems: List<JetpackListItemState>) {
+        val diffResult = DiffUtil.calculateDiff(
+                JetpackBackupRestoreListDiffUtils(
+                        items.toList(),
+                        newItems
+                )
+        )
+        items.clear()
+        items.addAll(newItems)
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    private class JetpackBackupRestoreListDiffUtils(
+        val oldItems: List<JetpackListItemState>,
+        val newItems: List<JetpackListItemState>
+    ) : DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = oldItems[oldItemPosition]
+            val newItem = newItems[newItemPosition]
+            if (oldItem::class != newItem::class) {
+                return false
+            }
+
+            return oldItem.longId() == newItem.longId()
+        }
+
+        override fun getOldListSize(): Int = oldItems.size
+
+        override fun getNewListSize(): Int = newItems.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldItems[oldItemPosition] == newItems[newItemPosition]
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/providers/JetpackAvailableItemsProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/providers/JetpackAvailableItemsProvider.kt
new file mode 100644
index 000000000000..a5d09be97112
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/providers/JetpackAvailableItemsProvider.kt
@@ -0,0 +1,65 @@
+package org.wordpress.android.ui.jetpack.common.providers
+
+import androidx.annotation.StringRes
+import org.wordpress.android.R
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.CONTENTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.MEDIA_UPLOADS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.PLUGINS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.ROOTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.SQLS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.THEMES
+import javax.inject.Inject
+import javax.inject.Singleton
+
+/**
+ * This class provides the available item choices for Jetpack Backup Download & Restore
+ */
+@Singleton
+class JetpackAvailableItemsProvider @Inject constructor() {
+    fun getAvailableItems(): List<JetpackAvailableItem> {
+        return listOf(
+                JetpackAvailableItem(
+                        THEMES,
+                        R.string.backup_item_themes
+                ),
+                JetpackAvailableItem(
+                        PLUGINS,
+                        R.string.backup_item_plugins
+                ),
+                JetpackAvailableItem(
+                        MEDIA_UPLOADS,
+                        R.string.backup_item_media_uploads
+                ),
+                JetpackAvailableItem(
+                        SQLS,
+                        R.string.backup_item_sqls,
+                        R.string.backup_item_sqls_hint
+                ),
+                JetpackAvailableItem(
+                        ROOTS,
+                        R.string.backup_item_roots,
+                        R.string.backup_item_roots_hint
+                ),
+                JetpackAvailableItem(
+                        CONTENTS,
+                        R.string.backup_item_contents,
+                        R.string.backup_item_content_hint
+                )
+        )
+    }
+
+    data class JetpackAvailableItem(
+        val availableItemType: JetpackAvailableItemType,
+        @StringRes val labelResId: Int,
+        @StringRes val labelHintResId: Int? = null
+    )
+
+    enum class JetpackAvailableItemType(val id: Int) {
+        THEMES(0),
+        PLUGINS(1),
+        MEDIA_UPLOADS(2),
+        SQLS(3),
+        ROOTS(4),
+        CONTENTS(5)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreBulletViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreBulletViewHolder.kt
new file mode 100644
index 000000000000..b2d36c336194
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreBulletViewHolder.kt
@@ -0,0 +1,48 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
+import org.wordpress.android.databinding.JetpackBackupRestoreListBulletItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.BulletState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.ColorUtils
+import org.wordpress.android.util.image.ImageManager
+
+class JetpackBackupRestoreBulletViewHolder(
+    private val imageManager: ImageManager,
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackBackupRestoreListBulletItemBinding>(
+        parent,
+        JetpackBackupRestoreListBulletItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val state = itemUiState as BulletState
+        val resources = root.context.resources
+
+        with(icon.layoutParams) {
+            val size = resources.getDimensionPixelSize(state.sizeResId)
+            width = size
+            height = size
+        }
+
+        state.itemBottomMarginResId?.let {
+            with(itemView.layoutParams as MarginLayoutParams) {
+                val margin = resources.getDimensionPixelSize(it)
+                bottomMargin = margin
+            }
+        }
+
+        if (state.colorResId == null) {
+            imageManager.load(icon, state.icon)
+        } else {
+            ColorUtils.setImageResourceWithTint(
+                    icon,
+                    state.icon,
+                    state.colorResId
+            )
+        }
+        bulletLabel.text = uiHelpers.getTextOfUiString(itemView.context, state.label)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreFootnoteViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreFootnoteViewHolder.kt
new file mode 100644
index 000000000000..cfdce8bd19f7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreFootnoteViewHolder.kt
@@ -0,0 +1,45 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.View
+import android.view.ViewGroup
+import org.wordpress.android.databinding.JetpackBackupRestoreListFootnoteItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.FootnoteState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+
+class JetpackBackupRestoreFootnoteViewHolder(
+    private val imageManager: ImageManager,
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackBackupRestoreListFootnoteItemBinding>(
+        parent,
+        JetpackBackupRestoreListFootnoteItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {
+        with(binding) {
+            val state = itemUiState as FootnoteState
+            val resources = itemView.context.resources
+
+            footnote.text = uiHelpers.getTextOfUiString(itemView.context, state.text)
+            footnote.visibility = if (state.isVisible) View.VISIBLE else View.GONE
+
+            state.textAlphaResId?.let {
+                footnote.setTextColor(footnote.textColors.withAlpha(state.textAlphaResId))
+            }
+
+            state.iconSizeResId?.let {
+                with(icon.layoutParams) {
+                    val size = resources.getDimensionPixelSize(state.iconSizeResId)
+                    width = size
+                    height = size
+                }
+            }
+
+            state.iconRes?.let {
+                imageManager.load(icon, it)
+                icon.visibility = if (state.isVisible) View.VISIBLE else View.GONE
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreSubHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreSubHeaderViewHolder.kt
new file mode 100644
index 000000000000..6a048b43dae7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackBackupRestoreSubHeaderViewHolder.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
+import org.wordpress.android.databinding.JetpackBackupRestoreListSubheaderItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.SubHeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.utils.UiHelpers
+
+class JetpackBackupRestoreSubHeaderViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackBackupRestoreListSubheaderItemBinding>(
+        parent,
+        JetpackBackupRestoreListSubheaderItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val subHeaderItemState = itemUiState as SubHeaderState
+        val resources = root.context.resources
+
+        with(root.layoutParams as MarginLayoutParams) {
+            subHeaderItemState.itemTopMarginResId?.let {
+                val margin = resources.getDimensionPixelSize(it)
+                topMargin = margin
+            }
+            subHeaderItemState.itemBottomMarginResId?.let {
+                val margin = resources.getDimensionPixelSize(it)
+                bottomMargin = margin
+            }
+        }
+
+        subheader.text = uiHelpers.getTextOfUiString(root.context, subHeaderItemState.text)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackButtonViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackButtonViewHolder.kt
new file mode 100644
index 000000000000..390725b80104
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackButtonViewHolder.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.viewbinding.ViewBinding
+import com.google.android.material.button.MaterialButton
+import org.wordpress.android.R
+import org.wordpress.android.databinding.JetpackListButtonPrimaryItemBinding
+import org.wordpress.android.databinding.JetpackListButtonSecondaryItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.setVisible
+import org.wordpress.android.widgets.FlowLayout.LayoutParams
+
+sealed class JetpackButtonViewHolder<T : ViewBinding>(
+    parent: ViewGroup,
+    inflateBinding: (LayoutInflater, ViewGroup, Boolean) -> T
+) : JetpackViewHolder<T>(parent, inflateBinding) {
+    class Primary(
+        private val uiHelpers: UiHelpers,
+        parent: ViewGroup
+    ) : JetpackButtonViewHolder<JetpackListButtonPrimaryItemBinding>(
+            parent,
+            JetpackListButtonPrimaryItemBinding::inflate
+    ) {
+        override fun onBind(itemUiState: JetpackListItemState) {
+            binding.button.updateState(binding.root, itemUiState as ActionButtonState, uiHelpers)
+        }
+    }
+
+    class Secondary(
+        private val uiHelpers: UiHelpers,
+        parent: ViewGroup
+    ) : JetpackButtonViewHolder<JetpackListButtonSecondaryItemBinding>(
+            parent,
+            JetpackListButtonSecondaryItemBinding::inflate
+    ) {
+        override fun onBind(itemUiState: JetpackListItemState) {
+            binding.button.updateState(binding.root, itemUiState as ActionButtonState, uiHelpers)
+        }
+    }
+
+    internal fun MaterialButton.updateState(root: View, buttonState: ActionButtonState, uiHelpers: UiHelpers) {
+        updateItemViewVisibility(root, buttonState.isVisible)
+        uiHelpers.setTextOrHide(this, buttonState.text)
+        isEnabled = buttonState.isEnabled
+        setOnClickListener { buttonState.onClick.invoke() }
+
+        buttonState.iconRes?.let {
+            iconGravity = MaterialButton.ICON_GRAVITY_TEXT_START
+            icon = context.getDrawable(it)
+            val resources = itemView.context.resources
+            iconSize = resources.getDimensionPixelSize(R.dimen.jetpack_button_icon_size)
+        }
+    }
+
+    private fun updateItemViewVisibility(root: View, isVisible: Boolean) {
+        with(root) {
+            setVisible(isVisible)
+            layoutParams = if (isVisible) {
+                ConstraintLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)
+            } else {
+                ConstraintLayout.LayoutParams(0, 0)
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackCheckboxViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackCheckboxViewHolder.kt
new file mode 100644
index 000000000000..eed2b1f093e6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackCheckboxViewHolder.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.JetpackListCheckboxItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.utils.UiHelpers
+
+class JetpackCheckboxViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackListCheckboxItemBinding>(
+        parent,
+        JetpackListCheckboxItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val checkboxState = itemUiState as CheckboxState
+        if (checkboxState.labelSpannable == null) {
+            uiHelpers.setTextOrHide(checkboxLabel, checkboxState.label)
+        } else {
+            checkboxLabel.text = checkboxState.labelSpannable
+        }
+        checkbox.isChecked = checkboxState.checked
+        itemContainer.setOnClickListener { checkboxState.onClick.invoke() }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackDescriptionViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackDescriptionViewHolder.kt
new file mode 100644
index 000000000000..455c24986283
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackDescriptionViewHolder.kt
@@ -0,0 +1,46 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.text.SpannableString
+import android.text.Spanned
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
+import android.view.View
+import android.view.ViewGroup
+import org.wordpress.android.databinding.JetpackListDescriptionItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState.ClickableTextInfo
+import org.wordpress.android.ui.utils.UiHelpers
+
+class JetpackDescriptionViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackListDescriptionItemBinding>(
+        parent,
+        JetpackListDescriptionItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {
+        val descriptionState = itemUiState as DescriptionState
+        uiHelpers.setTextOrHide(binding.description, descriptionState.text)
+        descriptionState.clickableTextsInfo?.let { setClickableSpan(it) }
+    }
+
+    private fun setClickableSpan(clickableTextsInfo: List<ClickableTextInfo>) = with(binding) {
+        val spannableString = SpannableString(description.text)
+        for (clickableTextInfo in clickableTextsInfo) {
+            val (startIndex, endIndex, onClick) = clickableTextInfo
+            val clickableSpan = object : ClickableSpan() {
+                override fun onClick(widget: View) {
+                    onClick.invoke()
+                }
+            }
+            spannableString.setSpan(clickableSpan, startIndex, endIndex, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+        }
+        with(description) {
+            linksClickable = true
+            isClickable = true
+            movementMethod = LinkMovementMethod.getInstance()
+            text = spannableString
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackHeaderViewHolder.kt
new file mode 100644
index 000000000000..7b4a5a9f4d01
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackHeaderViewHolder.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import org.wordpress.android.databinding.JetpackListHeaderItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.getColorResIdFromAttribute
+
+class JetpackHeaderViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackListHeaderItemBinding>(
+        parent,
+        JetpackListHeaderItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {
+        val headerState = itemUiState as HeaderState
+        val context = itemView.context
+
+        binding.header.text = uiHelpers.getTextOfUiString(context, headerState.text)
+        val textColorRes = context.getColorResIdFromAttribute(headerState.textColorRes)
+        binding.header.setTextColor(ContextCompat.getColor(context, textColorRes))
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackIconViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackIconViewHolder.kt
new file mode 100644
index 000000000000..71c9997426e7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackIconViewHolder.kt
@@ -0,0 +1,41 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.ViewGroup
+import android.view.ViewGroup.MarginLayoutParams
+import org.wordpress.android.databinding.JetpackListIconItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.IconState
+import org.wordpress.android.util.ColorUtils
+import org.wordpress.android.util.image.ImageManager
+
+class JetpackIconViewHolder(
+    private val imageManager: ImageManager,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackListIconItemBinding>(parent, JetpackListIconItemBinding::inflate) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val iconState = itemUiState as IconState
+        val resources = itemView.context.resources
+
+        with(icon.layoutParams) {
+            val size = resources.getDimensionPixelSize(iconState.sizeResId)
+            width = size
+            height = size
+        }
+
+        with(icon.layoutParams as MarginLayoutParams) {
+            val margin = resources.getDimensionPixelSize(iconState.marginResId)
+            topMargin = margin
+            bottomMargin = margin
+        }
+
+        if (iconState.colorResId == null) {
+            imageManager.load(icon, iconState.icon)
+        } else {
+            ColorUtils.setImageResourceWithTint(
+                    icon,
+                    iconState.icon,
+                    iconState.colorResId
+            )
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackProgressViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackProgressViewHolder.kt
new file mode 100644
index 000000000000..d2752a42f5c9
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackProgressViewHolder.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.ViewGroup
+import androidx.constraintlayout.widget.ConstraintLayout.LayoutParams
+import org.wordpress.android.databinding.JetpackListProgressItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ProgressState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.setVisible
+
+class JetpackProgressViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<JetpackListProgressItemBinding>(
+        parent,
+        JetpackListProgressItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val state = itemUiState as ProgressState
+        updateItemViewVisibility(state)
+        updateProgressBar(state)
+        updateProgressStateLabel(state)
+        uiHelpers.setTextOrHide(progressLabel, state.progressLabel)
+        uiHelpers.setTextOrHide(progressInfoLabel, state.progressInfoLabel)
+    }
+
+    private fun updateItemViewVisibility(state: ProgressState) {
+        with(binding.root) {
+            setVisible(state.isVisible)
+            layoutParams = if (state.isVisible) {
+                LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
+            } else {
+                LayoutParams(0, 0)
+            }
+        }
+    }
+
+    private fun updateProgressStateLabel(state: ProgressState) = with(binding) {
+        uiHelpers.setTextOrHide(progressStateLabel, state.progressStateLabel)
+        progressStateLabel.textAlignment = state.progressStateLabelTextAlignment
+    }
+
+    private fun updateProgressBar(state: ProgressState) = with(binding) {
+        progressBar.isIndeterminate = state.isIndeterminate
+        progressBar.progress = state.progress
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackViewHolder.kt
new file mode 100644
index 000000000000..a2e01eb5219f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/common/viewholders/JetpackViewHolder.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui.jetpack.common.viewholders
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+
+abstract class JetpackViewHolder<T : ViewBinding>(
+    parent: ViewGroup,
+    inflateBinding: (LayoutInflater, ViewGroup, Boolean) -> T,
+    protected val binding: T = inflateBinding(LayoutInflater.from(parent.context), parent, false)
+) : RecyclerView.ViewHolder(binding.root) {
+    abstract fun onBind(itemUiState: JetpackListItemState)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt
new file mode 100644
index 000000000000..705aa2ed00b1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreActivity.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.ui.jetpack.restore
+
+import android.os.Bundle
+import android.view.MenuItem
+import org.wordpress.android.databinding.RestoreActivityBinding
+import org.wordpress.android.ui.LocaleAwareActivity
+
+class RestoreActivity : LocaleAwareActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        with(RestoreActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
+
+            setSupportActionBar(toolbarMain)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return false
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreErrorTypes.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreErrorTypes.kt
new file mode 100644
index 000000000000..0a5a4c79d414
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreErrorTypes.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.ui.jetpack.restore
+
+enum class RestoreErrorTypes(val id: Int) {
+    NetworkUnavailable(0), RemoteRequestFailure(1), GenericFailure(2), OtherRequestRunning(3);
+
+    companion object {
+        fun fromInt(value: Int): RestoreErrorTypes =
+                values().firstOrNull { it.id == value }
+                        ?: throw IllegalArgumentException("RestoreErrorTypes wrong value $value")
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreFragment.kt
new file mode 100644
index 000000000000..907754d99396
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreFragment.kt
@@ -0,0 +1,174 @@
+package org.wordpress.android.ui.jetpack.restore
+
+import android.app.Activity.RESULT_CANCELED
+import android.app.Activity.RESULT_OK
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.activity.OnBackPressedCallback
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.snackbar.Snackbar
+import org.wordpress.android.R
+import org.wordpress.android.R.dimen
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.JetpackBackupRestoreFragmentBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.jetpack.common.adapters.JetpackBackupRestoreAdapter
+import org.wordpress.android.ui.jetpack.restore.RestoreNavigationEvents.VisitSite
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreCanceled
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreCompleted
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreInProgress
+import org.wordpress.android.ui.jetpack.scan.adapters.HorizontalMarginItemDecoration
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
+import org.wordpress.android.widgets.WPSnackbar
+import javax.inject.Inject
+
+const val KEY_RESTORE_REWIND_ID = "key_restore_rewind_id"
+const val KEY_RESTORE_RESTORE_ID = "key_restore_restore_id"
+
+class RestoreFragment : Fragment(R.layout.jetpack_backup_restore_fragment) {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var imageManager: ImageManager
+    private lateinit var viewModel: RestoreViewModel
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(JetpackBackupRestoreFragmentBinding.bind(view)) {
+            initDagger()
+            initBackPressHandler()
+            initAdapter()
+            initViewModel(savedInstanceState)
+        }
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component().inject(this)
+    }
+
+    private fun initBackPressHandler() {
+        requireActivity().onBackPressedDispatcher.addCallback(
+                viewLifecycleOwner,
+                object : OnBackPressedCallback(
+                        true
+                ) {
+                    override fun handleOnBackPressed() {
+                        onBackPressed()
+                    }
+                })
+    }
+
+    private fun onBackPressed() {
+        viewModel.onBackPressed()
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.initAdapter() {
+        recyclerView.adapter = JetpackBackupRestoreAdapter(imageManager, uiHelpers)
+        recyclerView.itemAnimator = null
+        recyclerView.addItemDecoration(
+                HorizontalMarginItemDecoration(resources.getDimensionPixelSize(dimen.margin_extra_large))
+        )
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.initViewModel(savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(this@RestoreFragment, viewModelFactory).get(RestoreViewModel::class.java)
+
+        val (site, activityId) = when {
+            requireActivity().intent?.extras != null -> {
+                val site = requireNotNull(requireActivity().intent.extras).getSerializable(WordPress.SITE) as SiteModel
+                val activityId = requireNotNull(requireActivity().intent.extras).getString(
+                        KEY_RESTORE_ACTIVITY_ID_KEY
+                ) as String
+                site to activityId
+            }
+            else -> {
+                AppLog.e(T.JETPACK_REWIND, "Error initializing ${this.javaClass.simpleName}")
+                throw Throwable("Couldn't initialize ${this.javaClass.simpleName} view model")
+            }
+        }
+
+        initObservers()
+
+        viewModel.start(site, activityId, savedInstanceState)
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.initObservers() {
+        viewModel.uiState.observe(viewLifecycleOwner, {
+            updateToolbar(it.toolbarState)
+            showView(it)
+        })
+
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, {
+            it.showSnackbar()
+        })
+
+        viewModel.navigationEvents.observeEvent(viewLifecycleOwner, { events ->
+            when (events) {
+                is VisitSite -> ActivityLauncher.openUrlExternal(requireContext(), events.url)
+            }
+        })
+
+        viewModel.wizardFinishedObservable.observeEvent(viewLifecycleOwner, { state ->
+            val intent = Intent()
+            val (restoreCreated, ids) = when (state) {
+                is RestoreCanceled -> Pair(false, null)
+                is RestoreInProgress -> Pair(true, Pair(state.rewindId, state.restoreId))
+                is RestoreCompleted -> Pair(true, null)
+            }
+            intent.putExtra(KEY_RESTORE_REWIND_ID, ids?.first)
+            intent.putExtra(KEY_RESTORE_RESTORE_ID, ids?.second)
+            requireActivity().let { activity ->
+                activity.setResult(if (restoreCreated) RESULT_OK else RESULT_CANCELED, intent)
+                activity.finish()
+            }
+        })
+    }
+
+    private fun JetpackBackupRestoreFragmentBinding.showView(state: RestoreUiState) {
+        ((recyclerView.adapter) as JetpackBackupRestoreAdapter).update(state.items)
+    }
+
+    private fun updateToolbar(toolbarState: ToolbarState) {
+        val activity = requireActivity() as? AppCompatActivity
+        activity?.supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+            it.title = getString(toolbarState.title)
+            it.setHomeAsUpIndicator(toolbarState.icon)
+        }
+    }
+
+    private fun SnackbarMessageHolder.showSnackbar() {
+        activity?.findViewById<View>(R.id.coordinator_layout)?.let { coordinator ->
+            val snackbar = WPSnackbar.make(
+                    coordinator,
+                    uiHelpers.getTextOfUiString(requireContext(), this.message),
+                    Snackbar.LENGTH_LONG
+            )
+            if (this.buttonTitle != null) {
+                snackbar.setAction(
+                        uiHelpers.getTextOfUiString(
+                                requireContext(),
+                                this.buttonTitle
+                        )
+                ) {
+                    this.buttonAction.invoke()
+                }
+            }
+            snackbar.show()
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        viewModel.writeToBundle(outState)
+        super.onSaveInstanceState(outState)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreNavigationEvents.kt
new file mode 100644
index 000000000000..eebc9b3abef3
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreNavigationEvents.kt
@@ -0,0 +1,5 @@
+package org.wordpress.android.ui.jetpack.restore
+
+sealed class RestoreNavigationEvents {
+    data class VisitSite(val url: String) : RestoreNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreStates.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreStates.kt
new file mode 100644
index 000000000000..f4cbfb228d77
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreStates.kt
@@ -0,0 +1,123 @@
+package org.wordpress.android.ui.jetpack.restore
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.restore.StateType.COMPLETE
+import org.wordpress.android.ui.jetpack.restore.StateType.DETAILS
+import org.wordpress.android.ui.jetpack.restore.StateType.ERROR
+import org.wordpress.android.ui.jetpack.restore.StateType.PROGRESS
+import org.wordpress.android.ui.jetpack.restore.StateType.WARNING
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.CompleteToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.DetailsToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.ErrorToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.ProgressToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.WarningToolbarState
+import java.util.Date
+
+abstract class RestoreUiState(open val type: StateType) {
+    abstract val items: List<JetpackListItemState>
+    abstract val toolbarState: ToolbarState
+
+    data class ErrorState(
+        val errorType: RestoreErrorTypes,
+        override val items: List<JetpackListItemState>
+    ) : RestoreUiState(ERROR) {
+        override val toolbarState: ToolbarState = ErrorToolbarState
+    }
+
+    sealed class ContentState(override val type: StateType) : RestoreUiState(type) {
+        data class DetailsState(
+            val activityLogModel: ActivityLogModel,
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(DETAILS) {
+            override val toolbarState: ToolbarState = DetailsToolbarState
+        }
+
+        data class WarningState(
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(WARNING) {
+            override val toolbarState: ToolbarState = WarningToolbarState
+        }
+
+        data class ProgressState(
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(PROGRESS) {
+            override val toolbarState: ToolbarState = ProgressToolbarState
+        }
+
+        data class CompleteState(
+            override val items: List<JetpackListItemState>,
+            override val type: StateType
+        ) : ContentState(COMPLETE) {
+            override val toolbarState: ToolbarState = CompleteToolbarState
+        }
+    }
+}
+
+enum class StateType(val id: Int) {
+    DETAILS(0),
+    WARNING(1),
+    PROGRESS(2),
+    COMPLETE(3),
+    ERROR(4)
+}
+
+sealed class ToolbarState {
+    abstract val title: Int
+    @DrawableRes val icon: Int = R.drawable.ic_close_24px
+
+    object DetailsToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.restore_details_page_title
+    }
+
+    object WarningToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.restore_warning_page_title
+    }
+
+    object ProgressToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.restore_progress_page_title
+    }
+
+    object CompleteToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.restore_complete_page_title
+    }
+
+    object ErrorToolbarState : ToolbarState() {
+        @StringRes override val title: Int = R.string.restore_complete_failed_title
+    }
+}
+
+sealed class RestoreRequestState {
+    data class Success(
+        val requestRewindId: String,
+        val rewindId: String,
+        val restoreId: Long?
+    ) : RestoreRequestState()
+
+    data class Progress(
+        val rewindId: String,
+        val progress: Int?,
+        val message: String? = null,
+        val currentEntry: String? = null,
+        val published: Date? = null
+    ) : RestoreRequestState()
+
+    data class Complete(
+        val rewindId: String,
+        val restoreId: Long,
+        val published: Date? = null
+    ) : RestoreRequestState()
+
+    object Empty : RestoreRequestState()
+    sealed class Failure : RestoreRequestState() {
+        object NetworkUnavailable : Failure()
+        object RemoteRequestFailure : Failure()
+        object OtherRequestRunning : Failure()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreStep.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreStep.kt
new file mode 100644
index 000000000000..0958b90c50ee
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreStep.kt
@@ -0,0 +1,33 @@
+package org.wordpress.android.ui.jetpack.restore
+
+import org.wordpress.android.util.wizard.WizardStep
+import javax.inject.Inject
+import javax.inject.Singleton
+
+enum class RestoreStep(val id: Int) : WizardStep {
+    DETAILS(0), WARNING(1), PROGRESS(2), COMPLETE(3), ERROR(4);
+
+    companion object {
+        fun fromString(input: String): RestoreStep = when (input) {
+            "restore_details" -> DETAILS
+            "restore_warning" -> WARNING
+            "restore_progress" -> PROGRESS
+            "restore_complete" -> COMPLETE
+            "restore_error" -> ERROR
+            else -> throw IllegalArgumentException("RestoreStep not recognized: \$input")
+        }
+
+        fun indexForErrorTransition(): Int = COMPLETE.id
+    }
+}
+
+@Singleton
+class RestoreStepsProvider @Inject constructor() {
+    fun getSteps() = listOf(
+            RestoreStep.fromString("restore_details"),
+            RestoreStep.fromString("restore_warning"),
+            RestoreStep.fromString("restore_progress"),
+            RestoreStep.fromString("restore_complete"),
+            RestoreStep.fromString("restore_error")
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModel.kt
new file mode 100644
index 000000000000..6f5851f81c84
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModel.kt
@@ -0,0 +1,533 @@
+package org.wordpress.android.ui.jetpack.restore
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.os.Parcelable
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Observer
+import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.collect
+import org.json.JSONObject
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.JETPACK_RESTORE_CONFIRMED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.JETPACK_RESTORE_ERROR
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindRequestTypes
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.CONTENTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.MEDIA_UPLOADS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.PLUGINS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.ROOTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.SQLS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.THEMES
+import org.wordpress.android.ui.jetpack.restore.RestoreErrorTypes.GenericFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreNavigationEvents.VisitSite
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Complete
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Empty
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.OtherRequestRunning
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Progress
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Success
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.COMPLETE
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.DETAILS
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.ERROR
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.PROGRESS
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.WARNING
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.CompleteState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.DetailsState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.ProgressState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.WarningState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ErrorState
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreCanceled
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreCompleted
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreInProgress
+import org.wordpress.android.ui.jetpack.restore.builders.RestoreStateListItemBuilder
+import org.wordpress.android.ui.jetpack.restore.usecases.GetRestoreStatusUseCase
+import org.wordpress.android.ui.jetpack.restore.usecases.PostRestoreUseCase
+import org.wordpress.android.ui.jetpack.usecases.GetActivityLogItemUseCase
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.wizard.WizardManager
+import org.wordpress.android.util.wizard.WizardNavigationTarget
+import org.wordpress.android.util.wizard.WizardState
+import org.wordpress.android.util.wizard.WizardStep
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import java.util.Date
+import java.util.HashMap
+import javax.inject.Inject
+import javax.inject.Named
+
+const val KEY_RESTORE_ACTIVITY_ID_KEY = "key_restore_activity_id_key"
+const val KEY_RESTORE_CURRENT_STEP = "key_restore_current_step"
+const val KEY_RESTORE_STATE = "key_restore_state"
+private const val TRACKING_ERROR_CAUSE_OFFLINE = "offline"
+private const val TRACKING_ERROR_CAUSE_REMOTE = "remote"
+private const val TRACKING_ERROR_CAUSE_OTHER = "other"
+
+@Parcelize
+@SuppressLint("ParcelCreator")
+data class RestoreState(
+    val rewindId: String? = null,
+    val optionsSelected: List<Pair<Int, Boolean>>? = null,
+    val restoreId: Long? = null,
+    val published: Date? = null,
+    val errorType: Int? = null,
+    val shouldInitProgress: Boolean = true
+) : WizardState, Parcelable
+
+typealias NavigationTarget = WizardNavigationTarget<RestoreStep, RestoreState>
+
+class RestoreViewModel @Inject constructor(
+    private val wizardManager: WizardManager<RestoreStep>,
+    private val availableItemsProvider: JetpackAvailableItemsProvider,
+    private val getActivityLogItemUseCase: GetActivityLogItemUseCase,
+    private val stateListItemBuilder: RestoreStateListItemBuilder,
+    private val postRestoreUseCase: PostRestoreUseCase,
+    private val getRestoreStatusUseCase: GetRestoreStatusUseCase,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+    private lateinit var site: SiteModel
+    private lateinit var activityId: String
+    private lateinit var restoreState: RestoreState
+    private val progressStart = 0
+
+    private val _wizardFinishedObservable = MutableLiveData<Event<RestoreWizardState>>()
+    val wizardFinishedObservable: LiveData<Event<RestoreWizardState>> = _wizardFinishedObservable
+
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _navigationEvents = MediatorLiveData<Event<RestoreNavigationEvents>>()
+    val navigationEvents: LiveData<Event<RestoreNavigationEvents>> = _navigationEvents
+
+    private val _uiState = MutableLiveData<RestoreUiState>()
+    val uiState: LiveData<RestoreUiState> = _uiState
+
+    private val wizardObserver = Observer { data: RestoreStep? ->
+        data?.let {
+            clearOldRestoreState(it)
+            showStep(NavigationTarget(it, restoreState))
+        }
+    }
+
+    fun start(site: SiteModel, activityId: String, savedInstanceState: Bundle?) {
+        if (isStarted) return
+        isStarted = true
+
+        this.site = site
+        this.activityId = activityId
+
+        wizardManager.navigatorLiveData.observeForever(wizardObserver)
+
+        if (savedInstanceState == null) {
+            restoreState = RestoreState()
+            // Show the next step only if it's a fresh activity so we can handle the navigation
+            wizardManager.showNextStep()
+        } else {
+            restoreState = requireNotNull(savedInstanceState.getParcelable(KEY_RESTORE_STATE))
+            val currentStepIndex = savedInstanceState.getInt(KEY_RESTORE_CURRENT_STEP)
+            wizardManager.setCurrentStepIndex(currentStepIndex)
+        }
+    }
+
+    fun onBackPressed() {
+        when (wizardManager.currentStep) {
+            DETAILS.id -> _wizardFinishedObservable.value = Event(RestoreCanceled)
+            WARNING.id -> _wizardFinishedObservable.value = Event(RestoreCanceled)
+            PROGRESS.id -> _wizardFinishedObservable.value = constructProgressEvent()
+            COMPLETE.id -> _wizardFinishedObservable.value = Event(RestoreCompleted)
+            ERROR.id -> _wizardFinishedObservable.value = Event(RestoreCanceled)
+        }
+    }
+
+    private fun constructProgressEvent() = if (restoreState.restoreId != null) {
+        Event(
+                RestoreInProgress(
+                        restoreState.rewindId as String,
+                        restoreState.restoreId as Long
+                )
+        )
+    } else {
+        Event(RestoreCanceled)
+    }
+
+    fun writeToBundle(outState: Bundle) {
+        outState.putInt(KEY_RESTORE_CURRENT_STEP, wizardManager.currentStep)
+        outState.putParcelable(KEY_RESTORE_STATE, restoreState)
+    }
+
+    private fun buildDetails() {
+        launch {
+            val availableItems = availableItemsProvider.getAvailableItems()
+            val activityLogModel = getActivityLogItemUseCase.get(activityId)
+            if (activityLogModel != null) {
+                _uiState.value = DetailsState(
+                        activityLogModel = activityLogModel,
+                        items = stateListItemBuilder.buildDetailsListStateItems(
+                                availableItems = availableItems,
+                                published = activityLogModel.published,
+                                onCreateDownloadClick = this@RestoreViewModel::onRestoreSiteClick,
+                                onCheckboxItemClicked = this@RestoreViewModel::onCheckboxItemClicked
+                        ),
+                        type = StateType.DETAILS
+                )
+            } else {
+                trackError(TRACKING_ERROR_CAUSE_OTHER)
+                transitionToError(GenericFailure)
+            }
+        }
+    }
+
+    private fun buildWarning() {
+        _uiState.value = WarningState(
+                items = stateListItemBuilder.buildWarningListStateItems(
+                        published = restoreState.published as Date,
+                        onConfirmRestoreClick = this@RestoreViewModel::onConfirmRestoreClick,
+                        onCancelClick = this@RestoreViewModel::onCancelClick
+                ),
+                type = StateType.WARNING
+        )
+    }
+
+    private fun buildProgress() {
+        _uiState.value = ProgressState(
+                items = stateListItemBuilder.buildProgressListStateItems(
+                        progress = progressStart,
+                        published = restoreState.published as Date,
+                        isIndeterminate = true
+                ),
+                type = StateType.PROGRESS
+        )
+        if (restoreState.shouldInitProgress) {
+            restoreState = restoreState.copy(shouldInitProgress = false)
+            launch {
+                val result = postRestoreUseCase.postRestoreRequest(
+                        restoreState.rewindId as String,
+                        site,
+                        buildRewindRequestTypes(restoreState.optionsSelected)
+                )
+                handleRestoreRequestResult(result)
+            }
+        } else {
+            queryRestoreStatus()
+        }
+    }
+
+    private fun buildComplete() {
+        _uiState.value = CompleteState(
+                items = stateListItemBuilder.buildCompleteListStateItems(
+                        published = restoreState.published as Date,
+                        onDoneClick = this@RestoreViewModel::onDoneClick,
+                        onVisitSiteClick = this@RestoreViewModel::onVisitSiteClick
+                ),
+                type = StateType.COMPLETE
+        )
+    }
+
+    private fun buildError(errorType: RestoreErrorTypes) {
+        _uiState.value = ErrorState(
+                items = stateListItemBuilder.buildErrorListStateErrorItems(
+                        errorType = errorType,
+                        onDoneClick = this@RestoreViewModel::onDoneClick
+                ),
+                errorType = errorType
+        )
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun showStep(target: WizardNavigationTarget<RestoreStep, RestoreState>) {
+        when (target.wizardStep) {
+            DETAILS -> buildDetails()
+            WARNING -> buildWarning()
+            PROGRESS -> buildProgress()
+            COMPLETE -> buildComplete()
+            ERROR -> buildError(
+                    RestoreErrorTypes.fromInt(
+                            target.wizardState.errorType ?: GenericFailure.id
+                    )
+            )
+        }
+    }
+
+    private fun transitionToError(errorType: RestoreErrorTypes) {
+        restoreState = restoreState.copy(errorType = errorType.id)
+        wizardManager.setCurrentStepIndex(RestoreStep.indexForErrorTransition())
+        wizardManager.showNextStep()
+    }
+
+    private fun getParams(): Pair<String?, List<Pair<Int, Boolean>>> {
+        val rewindId = (_uiState.value as? DetailsState)?.activityLogModel?.rewindID
+        val items = _uiState.value?.items ?: mutableListOf()
+        val options = buildOptionsSelected(items)
+        return rewindId to options
+    }
+
+    private fun buildOptionsSelected(items: List<JetpackListItemState>): List<Pair<Int, Boolean>> {
+        val checkboxes = items.filterIsInstance(CheckboxState::class.java)
+        return listOf(
+                Pair(
+                        THEMES.id,
+                        checkboxes.firstOrNull { it.availableItemType == THEMES }?.checked ?: true
+                ),
+                Pair(
+                        PLUGINS.id,
+                        checkboxes.firstOrNull { it.availableItemType == PLUGINS }?.checked ?: true
+                ),
+                Pair(
+                        MEDIA_UPLOADS.id,
+                        checkboxes.firstOrNull { it.availableItemType == MEDIA_UPLOADS }?.checked
+                                ?: true
+                ),
+                Pair(
+                        SQLS.id,
+                        checkboxes.firstOrNull { it.availableItemType == SQLS }?.checked ?: true
+                ),
+                Pair(
+                        ROOTS.id,
+                        checkboxes.firstOrNull { it.availableItemType == ROOTS }?.checked ?: true
+                ),
+                Pair(
+                        CONTENTS.id,
+                        checkboxes.firstOrNull { it.availableItemType == CONTENTS }?.checked ?: true
+                )
+        )
+    }
+
+    private fun buildRewindRequestTypes(optionsSelected: List<Pair<Int, Boolean>>?) =
+            RewindRequestTypes(
+                    themes = optionsSelected?.firstOrNull { it.first == THEMES.id }?.second ?: true,
+                    plugins = optionsSelected?.firstOrNull { it.first == PLUGINS.id }?.second
+                            ?: true,
+                    uploads = optionsSelected?.firstOrNull { it.first == MEDIA_UPLOADS.id }?.second
+                            ?: true,
+                    sqls = optionsSelected?.firstOrNull { it.first == SQLS.id }?.second ?: true,
+                    roots = optionsSelected?.firstOrNull { it.first == ROOTS.id }?.second ?: true,
+                    contents = optionsSelected?.firstOrNull { it.first == CONTENTS.id }?.second
+                            ?: true
+            )
+
+    private fun handleRestoreRequestResult(result: RestoreRequestState) {
+        when (result) {
+            is NetworkUnavailable -> {
+                trackError(TRACKING_ERROR_CAUSE_OFFLINE)
+                handleRestoreRequestError(NetworkUnavailableMsg)
+            }
+            is RemoteRequestFailure -> {
+                trackError(TRACKING_ERROR_CAUSE_REMOTE)
+                handleRestoreRequestError(GenericFailureMsg)
+            }
+            is Success -> handleRestoreRequestSuccess(result)
+            is OtherRequestRunning -> {
+                trackError(TRACKING_ERROR_CAUSE_OTHER)
+                handleRestoreRequestError(OtherRequestRunningMsg)
+            }
+            else -> throw Throwable("Unexpected restoreRequestResult ${this.javaClass.simpleName}")
+        }
+    }
+
+    private fun handleRestoreRequestSuccess(result: Success) {
+        restoreState = restoreState.copy(
+                rewindId = result.rewindId,
+                restoreId = result.restoreId
+        )
+        (_uiState.value as? ProgressState)?.let {
+            val updatedItems = stateListItemBuilder.updateProgressActionButtonState(it, result.restoreId != null)
+            _uiState.postValue(it.copy(items = updatedItems))
+        }
+        queryRestoreStatus()
+    }
+
+    private fun handleRestoreRequestError(snackbarMessageHolder: SnackbarMessageHolder) {
+        _snackbarEvents.postValue((Event(snackbarMessageHolder)))
+        resetWizardIndex(DETAILS)
+        showStep(NavigationTarget(DETAILS, restoreState))
+    }
+
+    private fun resetWizardIndex(targetStep: WizardStep) {
+        val currentIndex = wizardManager.currentStep
+        val targetIndex = wizardManager.stepPosition(targetStep)
+
+        for (i in currentIndex downTo targetIndex) {
+            wizardManager.onBackPressed()
+        }
+    }
+
+    private fun extractPublishedDate(): Date {
+        return (_uiState.value as? DetailsState)?.activityLogModel?.published as Date
+    }
+
+    private fun queryRestoreStatus() {
+        launch {
+            getRestoreStatusUseCase.getRestoreStatus(site, restoreState.restoreId as Long)
+                    .collect { state -> handleQueryStatus(state) }
+        }
+    }
+
+    private fun handleQueryStatus(restoreStatus: RestoreRequestState) {
+        when (restoreStatus) {
+            is NetworkUnavailable -> {
+                trackError(TRACKING_ERROR_CAUSE_OFFLINE)
+                transitionToError(RestoreErrorTypes.RemoteRequestFailure)
+            }
+            is RemoteRequestFailure -> {
+                trackError(TRACKING_ERROR_CAUSE_REMOTE)
+                transitionToError(RestoreErrorTypes.RemoteRequestFailure)
+            }
+            is Progress -> transitionToProgress(restoreStatus)
+            is Complete -> wizardManager.showNextStep()
+            is Empty -> transitionToError(RestoreErrorTypes.RemoteRequestFailure)
+            else -> Unit // Do nothing
+        }
+    }
+
+    private fun transitionToProgress(restoreStatus: Progress) {
+        (_uiState.value as? ProgressState)?.let { content ->
+            val updatedList = content.items.map { contentState ->
+                if (contentState.type == ViewType.PROGRESS) {
+                    contentState as JetpackListItemState.ProgressState
+                    contentState.copy(
+                            progress = restoreStatus.progress ?: 0,
+                            progressLabel = UiStringResWithParams(
+                                    R.string.restore_progress_label,
+                                    listOf(UiStringText(restoreStatus.progress?.toString() ?: "0"))
+                            ),
+                            progressInfoLabel = if (restoreStatus.currentEntry != null) {
+                                UiStringText("${restoreStatus.currentEntry}")
+                            } else {
+                                null
+                            },
+                            progressStateLabel = if (restoreStatus.message != null) {
+                                UiStringText("${restoreStatus.message}")
+                            } else {
+                                null
+                            },
+                            isIndeterminate = (restoreStatus.progress ?: 0) <= 0
+                    )
+                } else {
+                    contentState
+                }
+            }
+            _uiState.postValue(content.copy(items = updatedList))
+        }
+    }
+
+    private fun clearOldRestoreState(wizardStep: RestoreStep) {
+        if (wizardStep == DETAILS) {
+            restoreState = restoreState.copy(
+                    rewindId = null,
+                    restoreId = null,
+                    errorType = null,
+                    optionsSelected = null,
+                    published = null,
+                    shouldInitProgress = true
+            )
+        }
+    }
+
+    private fun onCheckboxItemClicked(itemType: JetpackAvailableItemType) {
+        (_uiState.value as? DetailsState)?.let {
+            val updatedItems = stateListItemBuilder.updateCheckboxes(it, itemType)
+            _uiState.postValue(it.copy(items = updatedItems))
+        }
+    }
+
+    private fun onRestoreSiteClick() {
+        val (rewindId, optionsSelected) = getParams()
+        if (rewindId == null) {
+            trackError(TRACKING_ERROR_CAUSE_OTHER)
+            transitionToError(GenericFailure)
+        } else {
+            restoreState = restoreState.copy(
+                    rewindId = rewindId,
+                    optionsSelected = optionsSelected,
+                    published = extractPublishedDate(),
+                    shouldInitProgress = true
+            )
+            wizardManager.showNextStep()
+        }
+    }
+
+    private fun onConfirmRestoreClick() {
+        if (restoreState.rewindId == null) {
+            trackError(TRACKING_ERROR_CAUSE_OTHER)
+            transitionToError(GenericFailure)
+        } else {
+            trackRestoreConfirmed()
+            wizardManager.showNextStep()
+        }
+    }
+
+    private fun onCancelClick() {
+        wizardManager.onBackPressed()
+        showStep(NavigationTarget(DETAILS, restoreState))
+    }
+
+    private fun onVisitSiteClick() {
+        site.url?.let { _navigationEvents.postValue(Event(VisitSite(site.url))) }
+    }
+
+    private fun onDoneClick() {
+        _wizardFinishedObservable.value = Event(RestoreCanceled)
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        wizardManager.navigatorLiveData.removeObserver(wizardObserver)
+    }
+
+    private fun trackRestoreConfirmed() {
+        val types = buildRewindRequestTypes(restoreState.optionsSelected)
+        val propertiesSetup = mapOf(
+                "themes" to types.themes,
+                "plugins" to types.plugins,
+                "uploads" to types.uploads,
+                "sqls" to types.sqls,
+                "roots" to types.roots,
+                "contents" to types.contents
+        )
+        val map = mapOf("restore_types" to JSONObject(propertiesSetup))
+        AnalyticsTracker.track(JETPACK_RESTORE_CONFIRMED, map)
+    }
+
+    private fun trackError(cause: String) {
+        val properties: MutableMap<String, String?> = HashMap()
+        properties["cause"] = cause
+        AnalyticsTracker.track(JETPACK_RESTORE_ERROR, properties)
+    }
+
+    companion object {
+        private val NetworkUnavailableMsg = SnackbarMessageHolder(UiStringRes(R.string.error_network_connection))
+        private val GenericFailureMsg = SnackbarMessageHolder(UiStringRes(R.string.restore_generic_failure))
+        private val OtherRequestRunningMsg =
+                SnackbarMessageHolder(UiStringRes(R.string.restore_another_process_running))
+    }
+
+    sealed class RestoreWizardState : Parcelable {
+        @Parcelize
+        object RestoreCanceled : RestoreWizardState()
+
+        @Parcelize
+        data class RestoreInProgress(
+            val rewindId: String,
+            val restoreId: Long
+        ) : RestoreWizardState()
+
+        @Parcelize
+        object RestoreCompleted : RestoreWizardState()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/builders/RestoreStateListItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/builders/RestoreStateListItemBuilder.kt
new file mode 100644
index 000000000000..141259478aec
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/builders/RestoreStateListItemBuilder.kt
@@ -0,0 +1,319 @@
+package org.wordpress.android.ui.jetpack.restore.builders
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DimenRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import dagger.Reusable
+import org.wordpress.android.R
+import org.wordpress.android.ui.jetpack.common.CheckboxSpannableLabel
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.BulletState
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.FootnoteState
+import org.wordpress.android.ui.jetpack.common.JetpackBackupRestoreListItemState.SubHeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.IconState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ProgressState
+import org.wordpress.android.ui.jetpack.common.ViewType.CHECKBOX
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItem
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType
+import org.wordpress.android.ui.jetpack.restore.RestoreErrorTypes
+import org.wordpress.android.ui.jetpack.restore.RestoreErrorTypes.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.toFormattedDateString
+import org.wordpress.android.util.toFormattedTimeString
+import java.util.Date
+import javax.inject.Inject
+
+@Reusable
+class RestoreStateListItemBuilder @Inject constructor(
+    private val checkboxSpannableLabel: CheckboxSpannableLabel
+) {
+    fun buildDetailsListStateItems(
+        published: Date,
+        availableItems: List<JetpackAvailableItem>,
+        onCreateDownloadClick: () -> Unit,
+        onCheckboxItemClicked: (availableItemType: JetpackAvailableItemType) -> Unit
+    ): List<JetpackListItemState> {
+        val items = mutableListOf(
+                buildIconState(
+                        R.drawable.ic_history_white_24dp,
+                        R.string.restore_details_icon_content_description,
+                        R.color.success
+                ),
+                buildHeaderState(R.string.restore_details_header),
+                buildDescriptionState(published, R.string.restore_details_description_with_two_parameters),
+                buildActionButtonState(
+                        titleRes = R.string.restore_details_action_button,
+                        contentDescRes = R.string.restore_details_action_button_content_description,
+                        onClick = onCreateDownloadClick
+                ),
+                buildSubHeaderState(R.string.restore_details_choose_items_header)
+        )
+
+        val availableItemsListItems: List<CheckboxState> = availableItems.map {
+            CheckboxState(
+                    availableItemType = it.availableItemType,
+                    label = UiStringRes(it.labelResId),
+                    labelSpannable = checkboxSpannableLabel.buildSpannableLabel(it.labelResId, it.labelHintResId),
+                    checked = true,
+                    onClick = { onCheckboxItemClicked(it.availableItemType) }
+            )
+        }
+        items.addAll(availableItemsListItems)
+        return items
+    }
+
+    fun buildWarningListStateItems(
+        published: Date,
+        onConfirmRestoreClick: () -> Unit,
+        onCancelClick: () -> Unit
+    ): List<JetpackListItemState> = listOf(
+            buildIconState(
+                    R.drawable.ic_notice_white_24dp,
+                    R.string.restore_warning_icon_content_description,
+                    R.color.error
+            ),
+            buildHeaderState(R.string.restore_warning_header),
+            buildDescriptionState(published, R.string.restore_warning_description_with_two_parameters),
+            buildActionButtonState(
+                    titleRes = R.string.restore_warning_action_button,
+                    contentDescRes = R.string.restore_warning_action_button_content_description,
+                    onClick = onConfirmRestoreClick
+            ),
+            buildActionButtonState(
+                    titleRes = R.string.cancel,
+                    contentDescRes = R.string.cancel,
+                    isSecondary = true,
+                    onClick = onCancelClick
+            )
+    )
+
+    fun buildProgressListStateItems(
+        progress: Int = 0,
+        published: Date,
+        isIndeterminate: Boolean = false
+    ): List<JetpackListItemState> {
+        return mutableListOf(
+                buildIconState(
+                        R.drawable.ic_history_white_24dp,
+                        R.string.restore_progress_icon_content_description,
+                        R.color.success
+                ),
+                buildHeaderState(R.string.restore_progress_header),
+                buildDescriptionState(published, R.string.restore_progress_description_with_two_parameters),
+                buildProgressState(progress, isIndeterminate),
+                buildFootnoteState(
+                        iconRes = R.drawable.ic_info_outline_white_24dp,
+                        iconSizeResId = R.dimen.jetpack_backup_restore_footnote_icon_size,
+                        textRes = R.string.restore_progress_footnote
+                )
+        )
+    }
+
+    fun buildCompleteListStateItems(
+        published: Date,
+        onDoneClick: () -> Unit,
+        onVisitSiteClick: () -> Unit
+    ): List<JetpackListItemState> {
+        return listOf(
+                buildIconState(
+                        R.drawable.ic_history_white_24dp,
+                        R.string.restore_complete_icon_content_description,
+                        R.color.success
+                ),
+                buildHeaderState(R.string.restore_complete_header),
+                buildDescriptionState(published, R.string.restore_complete_description_with_two_parameters),
+                buildActionButtonState(
+                        titleRes = R.string.restore_complete_done_action_button,
+                        contentDescRes = R.string.restore_complete_done_button_content_description,
+                        onClick = onDoneClick
+                ),
+                buildActionButtonState(
+                        titleRes = R.string.restore_complete_visit_site_action_button,
+                        contentDescRes = R.string.restore_complete_visit_site_button_content_description,
+                        isSecondary = true,
+                        onClick = onVisitSiteClick
+                )
+        )
+    }
+
+    fun buildErrorListStateErrorItems(errorType: RestoreErrorTypes, onDoneClick: () -> Unit) = (
+            if (errorType == RemoteRequestFailure) buildStatusErrorListStateItems(onDoneClick)
+            else buildGenericErrorListStateItems(onDoneClick)
+            )
+
+    private fun buildStatusErrorListStateItems(onDoneClick: () -> Unit) = listOf(
+            buildHeaderState(R.string.restore_status_failure_heading),
+            buildBulletState(
+                    R.drawable.ic_query_builder_white_24dp,
+                    R.string.restore_status_bullet_clock_icon_content_desc,
+                    R.color.warning,
+                    R.string.restore_status_failure_bullet1
+            ),
+            buildBulletState(
+                    R.drawable.ic_gridicons_checkmark_circle,
+                    R.string.restore_status_bullet_checkmark_icon_content_desc,
+                    R.color.success,
+                    R.string.restore_status_failure_bullet2
+            ),
+            buildBulletState(
+                    R.drawable.ic_gridicons_checkmark_circle,
+                    R.string.restore_status_bullet_checkmark_icon_content_desc,
+                    R.color.success,
+                    R.string.restore_status_failure_bullet3,
+                    R.dimen.jetpack_backup_restore_last_bullet_bottom_margin
+            ),
+            buildActionButtonState(
+                    titleRes = R.string.restore_complete_failed_action_button,
+                    contentDescRes = R.string.restore_complete_failed_action_button_content_description,
+                    onClick = onDoneClick
+            )
+    )
+
+    private fun buildGenericErrorListStateItems(onDoneClick: () -> Unit) = listOf(
+            buildIconState(
+                    R.drawable.ic_notice_white_24dp,
+                    R.string.restore_complete_failed_icon_content_description,
+                    R.color.error
+            ),
+            buildHeaderState(R.string.restore_complete_failed_description),
+            buildDescriptionState(descRes = R.string.request_failed_message),
+            buildActionButtonState(
+                    titleRes = R.string.restore_complete_failed_action_button,
+                    contentDescRes = R.string.restore_complete_failed_action_button_content_description,
+                    onClick = onDoneClick
+            )
+    )
+
+    private fun buildIconState(
+        @DrawableRes iconRes: Int,
+        @StringRes contentDescRes: Int,
+        @ColorRes colorRes: Int
+    ) = IconState(
+            icon = iconRes,
+            contentDescription = UiStringRes(contentDescRes),
+            colorResId = colorRes
+    )
+
+    private fun buildHeaderState(@StringRes titleRes: Int) = HeaderState(UiStringRes(titleRes))
+
+    private fun buildDescriptionState(published: Date? = null, @StringRes descRes: Int) = DescriptionState(
+            if (published != null) {
+                UiStringResWithParams(
+                        descRes,
+                        listOf(
+                                UiStringText(published.toFormattedDateString()),
+                                UiStringText(published.toFormattedTimeString())
+                        )
+                )
+            } else {
+                UiStringRes(descRes)
+            }
+    )
+
+    private fun buildActionButtonState(
+        @StringRes titleRes: Int,
+        @StringRes contentDescRes: Int,
+        isSecondary: Boolean = false,
+        isEnabled: Boolean = true,
+        onClick: () -> Unit
+    ) = ActionButtonState(
+            text = UiStringRes(titleRes),
+            contentDescription = UiStringRes(contentDescRes),
+            isSecondary = isSecondary,
+            onClick = onClick,
+            isEnabled = isEnabled
+    )
+
+    private fun buildSubHeaderState(
+        @StringRes textResId: Int,
+        @DimenRes topMarginResId: Int? = null,
+        @DimenRes bottomMarginResId: Int? = null
+    ) = SubHeaderState(
+            text = UiStringRes(textResId),
+            itemTopMarginResId = topMarginResId,
+            itemBottomMarginResId = bottomMarginResId
+    )
+
+    private fun buildFootnoteState(
+        @DrawableRes iconRes: Int? = null,
+        @DimenRes iconSizeResId: Int? = null,
+        @StringRes textRes: Int
+    ) = FootnoteState(
+            iconRes = iconRes,
+            iconSizeResId = iconSizeResId,
+            text = UiStringRes(textRes)
+    )
+
+    private fun buildProgressState(progress: Int, isIndeterminate: Boolean = false) = ProgressState(
+            progress = progress,
+            isIndeterminate = isIndeterminate,
+            progressLabel = UiStringResWithParams(
+                    R.string.restore_progress_label, listOf(UiStringText(progress.toString()))
+            )
+    )
+
+    private fun buildBulletState(
+        @DrawableRes iconRes: Int,
+        @StringRes contentDescRes: Int,
+        @ColorRes colorRes: Int,
+        @StringRes labelRes: Int,
+        @DimenRes itemBottomMarginResId: Int? = null
+    ) = BulletState(
+            icon = iconRes,
+            contentDescription = UiStringRes(contentDescRes),
+            colorResId = colorRes,
+            label = UiStringRes(labelRes),
+            itemBottomMarginResId = itemBottomMarginResId
+    )
+
+    fun updateCheckboxes(
+        uiState: RestoreUiState,
+        itemType: JetpackAvailableItemType
+    ): List<JetpackListItemState> {
+        val updatedCheckboxes = uiState.items.map { state ->
+            if (state.type == CHECKBOX) {
+                state as CheckboxState
+                if (state.availableItemType == itemType) {
+                    state.copy(checked = !state.checked)
+                } else {
+                    state
+                }
+            } else {
+                state
+            }
+        }
+        val atLeastOneChecked = updatedCheckboxes.filterIsInstance<CheckboxState>().find { it.checked } != null
+        return updateDetailsActionButtonState(updatedCheckboxes, atLeastOneChecked)
+    }
+
+    private fun updateDetailsActionButtonState(
+        details: List<JetpackListItemState>,
+        enableActionButton: Boolean
+    ): List<JetpackListItemState> {
+        return details.map { state ->
+            if (state is ActionButtonState) {
+                state.copy(isEnabled = enableActionButton)
+            } else {
+                state
+            }
+        }
+    }
+
+    fun updateProgressActionButtonState(uiState: RestoreUiState, value: Boolean): List<JetpackListItemState> {
+        return uiState.items.map { state ->
+            if (state is ActionButtonState) {
+                state.copy(isEnabled = value)
+            } else {
+                state
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/usecases/GetRestoreStatusUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/usecases/GetRestoreStatusUseCase.kt
new file mode 100644
index 000000000000..de3503463230
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/usecases/GetRestoreStatusUseCase.kt
@@ -0,0 +1,114 @@
+package org.wordpress.android.ui.jetpack.restore.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FAILED
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FINISHED
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.QUEUED
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.RUNNING
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchRewindStatePayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Complete
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Empty
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Progress
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.math.max
+
+const val DELAY_MILLIS = 1000L
+const val MAX_RETRY = 3
+const val DELAY_FACTOR = 2
+
+class GetRestoreStatusUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val activityLogStore: ActivityLogStore,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val tag = javaClass.simpleName
+
+    @Suppress("ComplexMethod", "LoopWithTooManyJumpStatements")
+    suspend fun getRestoreStatus(
+        site: SiteModel,
+        restoreId: Long? = null
+    ) = flow {
+        var retryAttempts = 0
+        while (true) {
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, NetworkUnavailable)
+                if (retryAttemptsExceeded) break else continue
+            }
+            if (!fetchActivitiesRewind(site)) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, RemoteRequestFailure)
+                if (retryAttemptsExceeded) break else continue
+            }
+
+            retryAttempts = 0
+            val rewind = activityLogStore.getRewindStatusForSite(site)?.rewind
+            if (rewind == null) {
+                emit(Empty)
+                break
+            }
+            if (restoreId == null || rewind.restoreId == restoreId) {
+                when (rewind.status) {
+                    FINISHED -> {
+                        emitFinished(rewind)
+                        break
+                    }
+                    FAILED -> {
+                        emitFailure()
+                        break
+                    }
+                    RUNNING -> emitProgress(rewind)
+                    QUEUED -> emitProgress(rewind)
+                }
+            }
+            delay(DELAY_MILLIS)
+        }
+    }.flowOn(bgDispatcher)
+
+    private suspend fun fetchActivitiesRewind(site: SiteModel): Boolean {
+        val result = activityLogStore.fetchActivitiesRewind(FetchRewindStatePayload(site))
+        return !result.isError
+    }
+
+    private suspend fun FlowCollector<RestoreRequestState>.emitFinished(rewind: Rewind) =
+            if (rewind.rewindId != null) emitComplete(rewind) else emitFailure()
+
+    private suspend fun FlowCollector<RestoreRequestState>.emitComplete(rewind: Rewind) {
+        val rewindId = rewind.rewindId as String
+        val published = activityLogStore.getActivityLogItemByRewindId(rewindId)?.published
+        emit(Complete(rewind.rewindId as String, rewind.restoreId, published))
+    }
+
+    private suspend fun FlowCollector<RestoreRequestState>.emitFailure() = emit(RemoteRequestFailure)
+
+    private suspend fun FlowCollector<RestoreRequestState>.emitProgress(rewind: Rewind) {
+        val rewindId = rewind.rewindId as String
+        val published = activityLogStore.getActivityLogItemByRewindId(rewindId)?.published
+        emit(Progress(rewindId, rewind.progress, rewind.message, rewind.currentEntry, published))
+    }
+
+    private suspend fun FlowCollector<RestoreRequestState>.handleError(retryAttempts: Int, failure: Failure): Boolean {
+        return if (retryAttempts >= MAX_RETRY) {
+            AppLog.d(T.JETPACK_BACKUP, "$tag: Exceeded $MAX_RETRY retries while fetching status")
+            emit(failure)
+            true
+        } else {
+            delay(DELAY_MILLIS * (max(1, DELAY_FACTOR * retryAttempts)))
+            false
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/usecases/PostRestoreUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/usecases/PostRestoreUseCase.kt
new file mode 100644
index 000000000000..17658c3ca844
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/restore/usecases/PostRestoreUseCase.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.ui.jetpack.restore.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.QUEUED
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.RUNNING
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchRewindStatePayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindRequestTypes
+import org.wordpress.android.modules.IO_THREAD
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.OtherRequestRunning
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+
+class PostRestoreUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val activityLogStore: ActivityLogStore,
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
+) {
+    suspend fun postRestoreRequest(
+        rewindId: String,
+        site: SiteModel,
+        types: RewindRequestTypes? = null
+    ): RestoreRequestState = withContext(ioDispatcher) {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            return@withContext NetworkUnavailable
+        }
+
+        val fetchResult = activityLogStore.fetchActivitiesRewind(FetchRewindStatePayload(site))
+        if (fetchResult.isError) {
+            return@withContext RemoteRequestFailure
+        }
+
+        val rewind = activityLogStore.getRewindStatusForSite(site)?.rewind
+        if (isRestoreRunning(rewind)) {
+            return@withContext OtherRequestRunning
+        }
+        val result = activityLogStore.rewind(RewindPayload(site, rewindId, types))
+        if (result.isError) {
+            RemoteRequestFailure
+        } else {
+            if (result.restoreId == null) {
+                RemoteRequestFailure
+            } else {
+                Success(rewindId, result.rewindId, result.restoreId)
+            }
+        }
+    }
+
+    private fun isRestoreRunning(rewind: RewindStatusModel.Rewind?): Boolean {
+        if (rewind == null) return false
+        return (rewind.status == QUEUED || rewind.status == RUNNING)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanActivity.kt
new file mode 100644
index 000000000000..eaeefbc400dd
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanActivity.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ScanActivityBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+
+class ScanActivity : AppCompatActivity() {
+    override fun onNewIntent(intent: Intent?) {
+        super.onNewIntent(intent)
+        (supportFragmentManager.findFragmentById(R.id.fragment_container_view) as? ScanFragment)?.let {
+            it.onNewIntent(intent)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        with(ScanActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
+
+            setSupportActionBar(toolbarMain)
+        }
+        supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        } else if (item.itemId == R.id.menu_scan_history) {
+            // todo malinjir is it worth introducing a vm?
+            ActivityLauncher.viewScanHistory(this, intent.getSerializableExtra(WordPress.SITE) as SiteModel)
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.scan_menu, menu)
+        return true
+    }
+
+    companion object {
+        const val REQUEST_SCAN_STATE = "request_scan_state"
+        const val REQUEST_FIX_STATE = "request_fix_state"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanFragment.kt
new file mode 100644
index 000000000000..2bbea1f7b1c6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanFragment.kt
@@ -0,0 +1,183 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ScanFragmentBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.accounts.HelpActivity.Origin.SCAN_SCREEN_HELP
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.OpenFixThreatsConfirmationDialog
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowContactSupport
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowJetpackSettings
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowThreatDetails
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.FullScreenLoadingUiState
+import org.wordpress.android.ui.jetpack.scan.adapters.HorizontalMarginItemDecoration
+import org.wordpress.android.ui.jetpack.scan.adapters.ScanAdapter
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
+import org.wordpress.android.widgets.WPSnackbar
+import javax.inject.Inject
+
+class ScanFragment : Fragment(R.layout.scan_fragment) {
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: ScanViewModel
+    private var fixThreatsConfirmationDialog: AlertDialog? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(ScanFragmentBinding.bind(view)) {
+            initDagger()
+            initRecyclerView()
+            initViewModel(getSite(savedInstanceState))
+        }
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component()?.inject(this)
+    }
+
+    private fun ScanFragmentBinding.initRecyclerView() {
+        recyclerView.itemAnimator = null
+        recyclerView.addItemDecoration(
+                HorizontalMarginItemDecoration(resources.getDimensionPixelSize(R.dimen.margin_extra_large))
+        )
+        recyclerView.setEmptyView(actionableEmptyView)
+        initAdapter()
+    }
+
+    private fun ScanFragmentBinding.initAdapter() {
+        recyclerView.adapter = ScanAdapter(imageManager, uiHelpers)
+    }
+
+    private fun ScanFragmentBinding.initViewModel(site: SiteModel) {
+        viewModel = ViewModelProvider(this@ScanFragment, viewModelFactory).get(ScanViewModel::class.java)
+        setupObservers()
+        viewModel.start(site)
+    }
+
+    private fun ScanFragmentBinding.setupObservers() {
+        viewModel.uiState.observe(
+                viewLifecycleOwner,
+                { uiState ->
+                    uiHelpers.updateVisibility(progressBar, uiState.loadingVisible)
+                    uiHelpers.updateVisibility(recyclerView, uiState.contentVisible)
+                    uiHelpers.updateVisibility(actionableEmptyView, uiState.errorVisible)
+
+                    when (uiState) {
+                        is ContentUiState -> updateContentLayout(uiState)
+
+                        is FullScreenLoadingUiState -> { // Do Nothing
+                        }
+
+                        is ErrorUiState.NoConnection,
+                        is ErrorUiState.GenericRequestFailed,
+                        is ErrorUiState.ScanRequestFailed -> updateErrorLayout(uiState as ErrorUiState)
+                    }
+                }
+        )
+
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, { it.showSnackbar() })
+
+        viewModel.navigationEvents.observeEvent(
+                viewLifecycleOwner,
+                { events ->
+                    when (events) {
+                        is OpenFixThreatsConfirmationDialog -> showFixThreatsConfirmationDialog(events)
+
+                        is ShowThreatDetails -> ActivityLauncher.viewThreatDetails(
+                                this@ScanFragment,
+                                events.siteModel,
+                                events.threatId
+                        )
+
+                        is ShowContactSupport ->
+                            ActivityLauncher.viewHelpAndSupport(requireContext(), SCAN_SCREEN_HELP, events.site, null)
+
+                        is ShowJetpackSettings -> ActivityLauncher.openUrlExternal(context, events.url)
+                    }
+                }
+        )
+    }
+
+    private fun ScanFragmentBinding.updateContentLayout(state: ContentUiState) {
+        ((recyclerView.adapter) as ScanAdapter).update(state.items)
+    }
+
+    private fun ScanFragmentBinding.updateErrorLayout(state: ErrorUiState) {
+        uiHelpers.setTextOrHide(actionableEmptyView.title, state.title)
+        uiHelpers.setTextOrHide(actionableEmptyView.subtitle, state.subtitle)
+        uiHelpers.setTextOrHide(actionableEmptyView.button, state.buttonText)
+        actionableEmptyView.image.setImageResource(state.image)
+        actionableEmptyView.button.setOnClickListener { state.action.invoke() }
+    }
+
+    private fun SnackbarMessageHolder.showSnackbar() {
+        view?.let {
+            val snackbar = WPSnackbar.make(
+                    it,
+                    uiHelpers.getTextOfUiString(requireContext(), message),
+                    Snackbar.LENGTH_LONG
+            )
+            snackbar.show()
+        }
+    }
+
+    private fun showFixThreatsConfirmationDialog(holder: OpenFixThreatsConfirmationDialog) {
+        fixThreatsConfirmationDialog = MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(uiHelpers.getTextOfUiString(requireContext(), holder.title))
+                .setMessage(uiHelpers.getTextOfUiString(requireContext(), holder.message))
+                .setPositiveButton(holder.positiveButtonLabel) { _, _ -> holder.okButtonAction.invoke() }
+                .setNegativeButton(holder.negativeButtonLabel) { _, _ -> fixThreatsConfirmationDialog?.dismiss() }
+                .setCancelable(true)
+                .create()
+        fixThreatsConfirmationDialog?.show()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        fixThreatsConfirmationDialog?.dismiss()
+    }
+
+    private fun getSite(savedInstanceState: Bundle?): SiteModel {
+        return if (savedInstanceState == null) {
+            requireActivity().intent.getSerializableExtra(WordPress.SITE) as SiteModel
+        } else {
+            savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putSerializable(WordPress.SITE, viewModel.site)
+        super.onSaveInstanceState(outState)
+    }
+
+    fun onNewIntent(intent: Intent?) {
+        intent?.let {
+            val threatId = intent.getLongExtra(ScanActivity.REQUEST_FIX_STATE, 0L)
+            val messageRes = intent.getIntExtra(ScanActivity.REQUEST_SCAN_STATE, 0)
+            if (threatId > 0L) {
+                viewModel.onFixStateRequested(threatId)
+            } else if (messageRes > 0) {
+                viewModel.onScanStateRequestedWithMessage(messageRes)
+            }
+        }
+    }
+
+    companion object {
+        const val ARG_THREAT_ID = "arg_threat_id"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanListItemState.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanListItemState.kt
new file mode 100644
index 000000000000..9874faf32943
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanListItemState.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import androidx.annotation.AttrRes
+import androidx.annotation.DrawableRes
+import org.wordpress.android.R
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+
+sealed class ScanListItemState(override val type: ViewType) : JetpackListItemState(type) {
+    data class ThreatsHeaderItemState(val threatsCount: Int) : ScanListItemState(
+            ViewType.THREATS_HEADER
+    ) {
+        val text = UiStringRes(if (threatsCount > 1) R.string.threats_found_plural else R.string.threats_found_singular)
+    }
+
+    data class ThreatDateItemState(val text: UiString) : ScanListItemState(ViewType.THREAT_DETECTED_DATE)
+
+    data class ThreatItemState(
+        val threatId: Long,
+        val isFixing: Boolean = false,
+        val firstDetectedDate: UiString,
+        val header: UiString,
+        val subHeader: UiString?,
+        @AttrRes val subHeaderColor: Int,
+        @DrawableRes val icon: Int,
+        @DrawableRes val iconBackground: Int,
+        val onClick: () -> Unit
+    ) : ScanListItemState(
+            ViewType.THREAT_ITEM
+    ) {
+        val isLoadingVisible = isFixing
+        val isIconVisible = !isFixing
+        override fun longId() = threatId.hashCode().toLong()
+    }
+
+    object ThreatItemLoadingSkeletonState : ScanListItemState(ViewType.THREAT_ITEM_LOADING_SKELETON)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanNavigationEvents.kt
new file mode 100644
index 000000000000..bd378db7d0e5
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanNavigationEvents.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import androidx.annotation.StringRes
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.utils.UiString
+
+sealed class ScanNavigationEvents {
+    data class ShowThreatDetails(val siteModel: SiteModel, val threatId: Long) : ScanNavigationEvents()
+
+    class OpenFixThreatsConfirmationDialog(
+        val title: UiString,
+        val message: UiString,
+        val okButtonAction: () -> Unit
+    ) : ScanNavigationEvents() {
+        @StringRes val positiveButtonLabel: Int = R.string.dialog_button_ok
+        @StringRes val negativeButtonLabel: Int = R.string.dialog_button_cancel
+    }
+
+    data class ShowContactSupport(val site: SiteModel) : ScanNavigationEvents()
+
+    data class ShowJetpackSettings(val url: String) : ScanNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanViewModel.kt
new file mode 100644
index 000000000000..995cbfb50f34
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/ScanViewModel.kt
@@ -0,0 +1,379 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.collect
+import org.wordpress.android.Constants
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.OpenFixThreatsConfirmationDialog
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowContactSupport
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowJetpackSettings
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowThreatDetails
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.FullScreenLoadingUiState
+import org.wordpress.android.ui.jetpack.scan.builders.ScanStateListItemsBuilder
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.util.analytics.ScanTracker.ErrorAction
+import org.wordpress.android.util.analytics.ScanTracker.ErrorCause
+import org.wordpress.android.util.analytics.ScanTracker.OnThreatItemClickSource
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+const val RETRY_DELAY = 300L
+
+class ScanViewModel @Inject constructor(
+    private val scanStateListItemsBuilder: ScanStateListItemsBuilder,
+    private val fetchScanStateUseCase: FetchScanStateUseCase,
+    private val startScanUseCase: StartScanUseCase,
+    private val fixThreatsUseCase: FixThreatsUseCase,
+    private val fetchFixThreatsStatusUseCase: FetchFixThreatsStatusUseCase,
+    private val scanStore: ScanStore,
+    private val scanTracker: ScanTracker,
+    private val htmlMessageUtils: HtmlMessageUtils,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+
+    private val _uiState: MutableLiveData<UiState> = MutableLiveData()
+    val uiState: LiveData<UiState> = _uiState
+
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _navigationEvents = MediatorLiveData<Event<ScanNavigationEvents>>()
+    val navigationEvents: LiveData<Event<ScanNavigationEvents>> = _navigationEvents
+
+    private val fixableThreatIds
+        get() = scanStateModel?.threats
+                ?.filter { it.baseThreatModel.fixable != null }
+                ?.map { it.baseThreatModel.id }
+                ?: emptyList()
+
+    private var scanStateModel: ScanStateModel? = null
+    lateinit var site: SiteModel
+
+    fun start(site: SiteModel) {
+        if (isStarted) {
+            return
+        }
+        isStarted = true
+        this.site = site
+        init()
+    }
+
+    private fun init() {
+        launch {
+            scanStateModel = scanStore.getScanStateForSite(this@ScanViewModel.site)
+            scanStateModel?.let {
+                updateUiState(buildContentUiState(it))
+                if (fixableThreatIds.isNotEmpty()) fetchFixThreatsStatus(fixableThreatIds, isInvokedByUser = false)
+            }
+            fetchScanState()
+        }
+    }
+
+    private fun fetchScanState(invokedByUser: Boolean = false, isRetry: Boolean = false) {
+        launch {
+            if (scanStateModel == null) updateUiState(FullScreenLoadingUiState)
+            if (isRetry) delay(RETRY_DELAY)
+
+            fetchScanStateUseCase.fetchScanState(site = site, startWithDelay = invokedByUser)
+                    .collect { state ->
+                        when (state) {
+                            is FetchScanState.Success -> {
+                                scanStateModel = state.scanStateModel
+                                updateUiState(buildContentUiState(state.scanStateModel))
+                                if (state.scanStateModel.state in listOf(State.UNAVAILABLE, State.UNKNOWN)) {
+                                    scanTracker.trackOnError(ErrorAction.FETCH_SCAN_STATE, ErrorCause.OTHER)
+                                    updateUiState(ErrorUiState.ScanRequestFailed(::onContactSupportClicked))
+                                } else if (invokedByUser && state.scanStateModel.state == State.IDLE) {
+                                    showScanFinishedMessage(state.scanStateModel)
+                                }
+                            }
+
+                            is FetchScanState.Failure.NetworkUnavailable -> {
+                                scanTracker.trackOnError(ErrorAction.FETCH_SCAN_STATE, ErrorCause.OFFLINE)
+                                scanStateModel
+                                        ?.let {
+                                            updateSnackbarMessageEvent(UiStringRes(R.string.error_generic_network))
+                                        }
+                                        ?: updateUiState(ErrorUiState.NoConnection(::onRetryClicked))
+                            }
+
+                            is FetchScanState.Failure.RemoteRequestFailure -> {
+                                scanTracker.trackOnError(ErrorAction.FETCH_SCAN_STATE, ErrorCause.REMOTE)
+                                scanStateModel
+                                        ?.let {
+                                            updateSnackbarMessageEvent(UiStringRes(R.string.request_failed_message))
+                                        }
+                                        ?: updateUiState(ErrorUiState.GenericRequestFailed(::onContactSupportClicked))
+                            }
+                        }
+                    }
+        }
+    }
+
+    private fun showScanFinishedMessage(scanStateModel: ScanStateModel) {
+        val threatsCount = scanStateModel.threats?.size ?: 0
+        val message = UiStringText(
+                when (threatsCount) {
+                    0 -> htmlMessageUtils.getHtmlMessageFromStringFormatResId(
+                            R.string.scan_finished_no_threats_found_message
+                    )
+
+                    1 -> htmlMessageUtils.getHtmlMessageFromStringFormatResId(
+                            R.string.scan_finished_potential_threats_found_message_singular
+                    )
+
+                    else -> htmlMessageUtils.getHtmlMessageFromStringFormatResId(
+                            R.string.scan_finished_potential_threats_found_message_plural,
+                            "$threatsCount"
+                    )
+                }
+        )
+        updateSnackbarMessageEvent(message)
+    }
+
+    private fun startScan() {
+        launch {
+            startScanUseCase.startScan(site)
+                    .collect { state ->
+                        when (state) {
+                            is StartScanState.ScanningStateUpdatedInDb ->
+                                updateUiState(buildContentUiState(state.model))
+
+                            is StartScanState.Success -> fetchScanState(invokedByUser = true)
+
+                            is StartScanState.Failure.NetworkUnavailable -> {
+                                scanTracker.trackOnError(ErrorAction.SCAN, ErrorCause.OFFLINE)
+                                updateSnackbarMessageEvent(UiStringRes(R.string.error_generic_network))
+                            }
+                            is StartScanState.Failure.RemoteRequestFailure -> {
+                                scanTracker.trackOnError(ErrorAction.SCAN, ErrorCause.REMOTE)
+                                updateUiState(ContentUiState(emptyList()))
+                                updateUiState(ErrorUiState.ScanRequestFailed(::onContactSupportClicked))
+                            }
+                        }
+                    }
+        }
+    }
+
+    private fun fixAllThreats() {
+        scanTracker.trackOnFixAllThreatsConfirmed()
+        launch {
+            when (fixThreatsUseCase.fixThreats(remoteSiteId = site.siteId, fixableThreatIds = fixableThreatIds)) {
+                is FixThreatsState.Success -> {
+                    val someOrAllThreatFixed = fetchFixThreatsStatus(fixableThreatIds, isInvokedByUser = true)
+                    if (someOrAllThreatFixed) fetchScanState()
+                }
+                is FixThreatsState.Failure.NetworkUnavailable -> {
+                    scanTracker.trackOnError(ErrorAction.FIX_ALL, ErrorCause.OFFLINE)
+                    updateSnackbarMessageEvent(UiStringRes(R.string.error_generic_network))
+                }
+                is FixThreatsState.Failure.RemoteRequestFailure -> {
+                    scanTracker.trackOnError(ErrorAction.FIX_ALL, ErrorCause.REMOTE)
+                    updateSnackbarMessageEvent(UiStringRes(R.string.threat_fix_all_error_message))
+                }
+            }
+        }
+    }
+
+    private suspend fun fetchFixThreatsStatus(fixableThreatIds: List<Long>, isInvokedByUser: Boolean): Boolean {
+        var someOrAllThreatFixed = false
+
+        @StringRes var messageRes: Int? = null
+        fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(
+                remoteSiteId = site.siteId,
+                fixableThreatIds = fixableThreatIds
+        ).collect { status ->
+            var fixingThreatIds = emptyList<Long>()
+            when (status) {
+                is FetchFixThreatsState.NotStarted -> { // Do nothing
+                }
+                is FetchFixThreatsState.InProgress -> {
+                    fixingThreatIds = status.threatIds
+                }
+                is FetchFixThreatsState.Complete -> {
+                    someOrAllThreatFixed = true
+                    messageRes = if (status.fixedThreatsCount == 1) {
+                        R.string.threat_fix_all_status_success_message_singular
+                    } else R.string.threat_fix_all_status_success_message_plural
+                }
+                is FetchFixThreatsState.Failure.NetworkUnavailable -> {
+                    scanTracker.trackOnError(ErrorAction.FETCH_FIX_THREAT_STATUS, ErrorCause.OFFLINE)
+                    messageRes = R.string.error_generic_network
+                }
+                is FetchFixThreatsState.Failure.RemoteRequestFailure -> {
+                    scanTracker.trackOnError(ErrorAction.FETCH_FIX_THREAT_STATUS, ErrorCause.REMOTE)
+                    messageRes = R.string.threat_fix_all_status_error_message
+                }
+                is FetchFixThreatsState.Failure.FixFailure -> {
+                    if (status.mightBeMissingCredentials) {
+                        scanTracker.trackOnError(ErrorAction.FETCH_FIX_THREAT_STATUS, ErrorCause.ALL_THREATS_NOT_FIXED)
+                    } else {
+                        scanTracker.trackOnError(ErrorAction.FETCH_FIX_THREAT_STATUS, ErrorCause.OTHER)
+                    }
+                    if (!status.containsOnlyErrors) {
+                        someOrAllThreatFixed = true
+                    } else if (isInvokedByUser) {
+                        messageRes = R.string.threat_fix_all_status_error_message
+                    }
+                }
+            }
+            updateUiState(
+                    buildContentUiState(model = requireNotNull(scanStateModel), fixingThreatIds = fixingThreatIds)
+            )
+
+            messageRes?.let { updateSnackbarMessageEvent(UiStringRes(it)) }
+        }
+
+        return someOrAllThreatFixed
+    }
+
+    private fun onRetryClicked() {
+        fetchScanState(isRetry = true)
+    }
+
+    private fun onContactSupportClicked() {
+        updateNavigationEvent(ShowContactSupport(site))
+    }
+
+    private fun onScanButtonClicked() {
+        scanTracker.trackOnScanButtonClicked()
+        startScan()
+    }
+
+    private fun onFixAllButtonClicked() {
+        scanTracker.trackOnFixAllThreatsButtonClicked()
+        updateNavigationEvent(
+                OpenFixThreatsConfirmationDialog(
+                        title = UiStringRes(R.string.threat_fix_all_warning_title),
+                        message = if (fixableThreatIds.size > 1) {
+                            UiStringResWithParams(
+                                    R.string.threat_fix_all_confirmation_message_plural,
+                                    listOf(UiStringText("${fixableThreatIds.size}"))
+                            )
+                        } else UiStringRes(R.string.threat_fix_all_confirmation_message_singular),
+                        okButtonAction = this@ScanViewModel::fixAllThreats
+                )
+        )
+    }
+
+    private fun onThreatItemClicked(threatId: Long) {
+        launch {
+            scanTracker.trackOnThreatItemClicked(threatId, OnThreatItemClickSource.SCANNER)
+            _navigationEvents.value = Event(ShowThreatDetails(site, threatId))
+        }
+    }
+
+    private fun onEnterServerCredsMessageClicked() {
+        updateNavigationEvent(ShowJetpackSettings("${Constants.URL_JETPACK_SETTINGS}/${site.siteId}"))
+    }
+
+    fun onScanStateRequestedWithMessage(@StringRes messageRes: Int) {
+        updateSnackbarMessageEvent(UiStringRes(messageRes))
+        fetchScanState()
+    }
+
+    fun onFixStateRequested(threatId: Long) {
+        launch {
+            val isThreatFixed = fetchFixThreatsStatus(listOf(threatId), isInvokedByUser = true)
+            if (isThreatFixed) fetchScanState()
+        }
+    }
+
+    private fun updateSnackbarMessageEvent(message: UiString) {
+        _snackbarEvents.value = Event(SnackbarMessageHolder(message))
+    }
+
+    private fun updateNavigationEvent(navigationEvent: ScanNavigationEvents) {
+        _navigationEvents.value = Event(navigationEvent)
+    }
+
+    private fun updateUiState(state: UiState) {
+        _uiState.value = state
+    }
+
+    private suspend fun buildContentUiState(
+        model: ScanStateModel,
+        fixingThreatIds: List<Long> = emptyList()
+    ) = ContentUiState(
+            scanStateListItemsBuilder.buildScanStateListItems(
+                    model = model,
+                    site = site,
+                    fixingThreatIds = fixingThreatIds,
+                    onScanButtonClicked = this@ScanViewModel::onScanButtonClicked,
+                    onFixAllButtonClicked = this@ScanViewModel::onFixAllButtonClicked,
+                    onThreatItemClicked = this@ScanViewModel::onThreatItemClicked,
+                    onHelpClicked = this@ScanViewModel::onContactSupportClicked,
+                    onEnterServerCredsMessageClicked = this@ScanViewModel::onEnterServerCredsMessageClicked
+            )
+    )
+
+    sealed class UiState(
+        val loadingVisible: Boolean = false,
+        val contentVisible: Boolean = false,
+        val errorVisible: Boolean = false
+    ) {
+        object FullScreenLoadingUiState : UiState(loadingVisible = true)
+
+        data class ContentUiState(val items: List<JetpackListItemState>) : UiState(contentVisible = true)
+
+        sealed class ErrorUiState : UiState(errorVisible = true) {
+            abstract val image: Int
+            abstract val title: UiString
+            abstract val subtitle: UiString
+            abstract val buttonText: UiString
+            abstract val action: (() -> Unit)
+
+            data class NoConnection(override val action: () -> Unit) : ErrorUiState() {
+                @DrawableRes override val image = R.drawable.img_illustration_cloud_off_152dp
+                override val title = UiStringRes(R.string.scan_no_network_title)
+                override val subtitle = UiStringRes(R.string.scan_no_network_subtitle)
+                override val buttonText = UiStringRes(R.string.retry)
+            }
+
+            data class GenericRequestFailed(override val action: () -> Unit) : ErrorUiState() {
+                @DrawableRes override val image = R.drawable.img_illustration_cloud_off_152dp
+                override val title = UiStringRes(R.string.scan_request_failed_title)
+                override val subtitle = UiStringRes(R.string.scan_request_failed_subtitle)
+                override val buttonText = UiStringRes(R.string.contact_support)
+            }
+
+            data class ScanRequestFailed(override val action: () -> Unit) : ErrorUiState() {
+                @DrawableRes override val image = R.drawable.img_illustration_empty_results_216dp
+                override val title = UiStringRes(R.string.scan_start_request_failed_title)
+                override val subtitle = UiStringRes(R.string.scan_start_request_failed_subtitle)
+                override val buttonText = UiStringRes(R.string.contact_support)
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/HorizontalMarginItemDecoration.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/HorizontalMarginItemDecoration.kt
new file mode 100644
index 000000000000..9ceea6eac628
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/HorizontalMarginItemDecoration.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.ui.jetpack.scan.adapters
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+import org.wordpress.android.ui.jetpack.common.ViewType
+
+class HorizontalMarginItemDecoration(private val defaultMargin: Int) : ItemDecoration() {
+    override fun getItemOffsets(
+        outRect: Rect,
+        view: View,
+        parent: RecyclerView,
+        state: RecyclerView.State
+    ) {
+        val position = parent.getChildAdapterPosition(view)
+        val viewType = parent.adapter?.getItemViewType(position)
+        if (viewType != ViewType.THREAT_ITEM.id && viewType != ViewType.THREATS_HEADER.id) {
+            outRect.left = defaultMargin
+            outRect.right = defaultMargin
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/ScanAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/ScanAdapter.kt
new file mode 100644
index 000000000000..f98ddf426ee4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/ScanAdapter.kt
@@ -0,0 +1,86 @@
+package org.wordpress.android.ui.jetpack.scan.adapters
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackButtonViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackDescriptionViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackHeaderViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackIconViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackProgressViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.adapters.viewholders.ThreatLoadingSkeletonViewHolder
+import org.wordpress.android.ui.jetpack.scan.adapters.viewholders.ThreatViewHolder
+import org.wordpress.android.ui.jetpack.scan.adapters.viewholders.ThreatsDateHeaderViewHolder
+import org.wordpress.android.ui.jetpack.scan.adapters.viewholders.ThreatsHeaderViewHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+
+class ScanAdapter(
+    private val imageManager: ImageManager,
+    private val uiHelpers: UiHelpers
+) : Adapter<JetpackViewHolder<*>>() {
+    private val items = mutableListOf<JetpackListItemState>()
+
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): JetpackViewHolder<*> {
+        return when (viewType) {
+            ViewType.ICON.id -> JetpackIconViewHolder(imageManager, parent)
+            ViewType.HEADER.id -> JetpackHeaderViewHolder(uiHelpers, parent)
+            ViewType.DESCRIPTION.id -> JetpackDescriptionViewHolder(uiHelpers, parent)
+            ViewType.PROGRESS.id -> JetpackProgressViewHolder(uiHelpers, parent)
+            ViewType.PRIMARY_ACTION_BUTTON.id -> JetpackButtonViewHolder.Primary(uiHelpers, parent)
+            ViewType.SECONDARY_ACTION_BUTTON.id -> JetpackButtonViewHolder.Secondary(uiHelpers, parent)
+            ViewType.THREATS_HEADER.id -> ThreatsHeaderViewHolder(uiHelpers, parent)
+            ViewType.THREAT_ITEM.id -> ThreatViewHolder(uiHelpers, parent)
+            ViewType.THREAT_ITEM_LOADING_SKELETON.id -> ThreatLoadingSkeletonViewHolder(parent)
+            ViewType.THREAT_DETECTED_DATE.id -> ThreatsDateHeaderViewHolder(uiHelpers, parent)
+            else -> throw IllegalArgumentException("Unexpected view type in ${this::class.java.simpleName}")
+        }
+    }
+
+    override fun onBindViewHolder(holder: JetpackViewHolder<*>, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    override fun getItemViewType(position: Int) = items[position].type.id
+
+    override fun getItemId(position: Int): Long = items[position].longId()
+
+    override fun getItemCount() = items.size
+
+    fun update(newItems: List<JetpackListItemState>) {
+        val diffResult = DiffUtil.calculateDiff(ScanDiffCallback(items.toList(), newItems))
+        items.clear()
+        items.addAll(newItems)
+
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    class ScanDiffCallback(
+        private val oldList: List<JetpackListItemState>,
+        private val newList: List<JetpackListItemState>
+    ) : DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = oldList[oldItemPosition]
+            val newItem = newList[newItemPosition]
+            if (oldItem::class != newItem::class) {
+                return false
+            }
+            return oldItem.longId() == newItem.longId()
+        }
+
+        override fun getOldListSize() = oldList.size
+
+        override fun getNewListSize() = newList.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldList[oldItemPosition] == newList[newItemPosition]
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatLoadingSkeletonViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatLoadingSkeletonViewHolder.kt
new file mode 100644
index 000000000000..90d55d287287
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatLoadingSkeletonViewHolder.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui.jetpack.scan.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ScanListThreatItemLoadingSkeletonBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+
+class ThreatLoadingSkeletonViewHolder(
+    parent: ViewGroup
+) : JetpackViewHolder<ScanListThreatItemLoadingSkeletonBinding>(
+        parent,
+        ScanListThreatItemLoadingSkeletonBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {}
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatViewHolder.kt
new file mode 100644
index 000000000000..7466d192cd3a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatViewHolder.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.jetpack.scan.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ScanListThreatItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.getColorFromAttribute
+import org.wordpress.android.util.setVisible
+
+class ThreatViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<ScanListThreatItemBinding>(
+        parent,
+        ScanListThreatItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val threatItemState = itemUiState as ThreatItemState
+        with(threatItemState) {
+            with(uiHelpers) {
+                setTextOrHide(threatHeader, header)
+                setTextOrHide(threatSubHeader, subHeader)
+            }
+            threatSubHeader.setTextColor(threatSubHeader.context.getColorFromAttribute(subHeaderColor))
+            threatIcon.setImageResource(icon)
+            threatIcon.setBackgroundResource(iconBackground)
+            threatIcon.setVisible(isIconVisible)
+            loading.setVisible(isLoadingVisible)
+            root.setOnClickListener { onClick.invoke() }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatsDateHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatsDateHeaderViewHolder.kt
new file mode 100644
index 000000000000..3ed157bcb6f0
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatsDateHeaderViewHolder.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.jetpack.scan.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ScanListThreatsDateItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatDateItemState
+import org.wordpress.android.ui.utils.UiHelpers
+
+class ThreatsDateHeaderViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<ScanListThreatsDateItemBinding>(
+        parent,
+        ScanListThreatsDateItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {
+        val headerItemState = itemUiState as ThreatDateItemState
+        binding.dateText.text = uiHelpers.getTextOfUiString(itemView.context, headerItemState.text)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatsHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatsHeaderViewHolder.kt
new file mode 100644
index 000000000000..406afff0bbdb
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/adapters/viewholders/ThreatsHeaderViewHolder.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.jetpack.scan.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ScanListThreatsHeaderItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatsHeaderItemState
+import org.wordpress.android.ui.utils.UiHelpers
+
+class ThreatsHeaderViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<ScanListThreatsHeaderItemBinding>(
+        parent,
+        ScanListThreatsHeaderItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {
+        val headerItemState = itemUiState as ThreatsHeaderItemState
+        binding.headerText.text = uiHelpers.getTextOfUiString(itemView.context, headerItemState.text)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilder.kt
new file mode 100644
index 000000000000..4814fbb15d39
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilder.kt
@@ -0,0 +1,339 @@
+package org.wordpress.android.ui.jetpack.scan.builders
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import dagger.Reusable
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.ScanProgressStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState.ClickableTextInfo
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.IconState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ProgressState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatsHeaderItemState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemsBuilder
+import org.wordpress.android.ui.reader.utils.DateProvider
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+@Reusable
+class ScanStateListItemsBuilder @Inject constructor(
+    private val dateProvider: DateProvider,
+    private val htmlMessageUtils: HtmlMessageUtils,
+    private val resourceProvider: ResourceProvider,
+    private val threatItemBuilder: ThreatItemBuilder,
+    private val threatDetailsListItemsBuilder: ThreatDetailsListItemsBuilder,
+    private val scanStore: ScanStore
+) {
+    @Suppress("LongParameterList")
+    suspend fun buildScanStateListItems(
+        model: ScanStateModel,
+        site: SiteModel,
+        fixingThreatIds: List<Long>,
+        onScanButtonClicked: () -> Unit,
+        onFixAllButtonClicked: () -> Unit,
+        onThreatItemClicked: (threatId: Long) -> Unit,
+        onHelpClicked: () -> Unit,
+        onEnterServerCredsMessageClicked: () -> Unit
+    ): List<JetpackListItemState> {
+        return if (fixingThreatIds.isNotEmpty()) {
+            buildThreatsFixingStateItems(fixingThreatIds)
+        } else when (model.state) {
+            ScanStateModel.State.IDLE -> {
+                model.threats?.takeIf { threats -> threats.isNotEmpty() }?.let { threats ->
+                    buildThreatsFoundStateItems(
+                            model,
+                            threats,
+                            site,
+                            onScanButtonClicked,
+                            onFixAllButtonClicked,
+                            onThreatItemClicked,
+                            onHelpClicked,
+                            onEnterServerCredsMessageClicked
+                    )
+                } ?: buildThreatsNotFoundStateItems(model, onScanButtonClicked)
+            }
+            ScanStateModel.State.SCANNING -> buildScanningStateItems(model.mostRecentStatus, model.currentStatus)
+            ScanStateModel.State.PROVISIONING -> buildProvisioningStateItems()
+            ScanStateModel.State.UNAVAILABLE, ScanStateModel.State.UNKNOWN -> emptyList()
+        }
+    }
+
+    private suspend fun buildThreatsFixingStateItems(fixingThreatIds: List<Long>): List<JetpackListItemState> {
+        val items = mutableListOf<JetpackListItemState>()
+
+        val scanIcon = buildScanIcon(R.drawable.ic_shield_warning_white, R.color.error)
+        val scanHeaderResId = if (fixingThreatIds.size > 1) {
+            R.string.scan_fixing_threats_title_plural
+        } else R.string.scan_fixing_threats_title_singular
+        val scanHeader = HeaderState(UiStringRes(scanHeaderResId))
+        val scanDescriptionResId = if (fixingThreatIds.size > 1) {
+            R.string.scan_fixing_threats_description_plural
+        } else R.string.scan_fixing_threats_description_singular
+        val scanDescription = DescriptionState(UiStringRes(scanDescriptionResId))
+        val scanProgress = ProgressState(isIndeterminate = true, isVisible = fixingThreatIds.isNotEmpty())
+
+        items.add(scanIcon)
+        items.add(scanHeader)
+        items.add(scanDescription)
+        items.add(scanProgress)
+
+        items.addAll(
+                fixingThreatIds.mapNotNull { threatId ->
+                    items.add(ThreatsHeaderItemState(threatsCount = fixingThreatIds.size))
+                    scanStore.getThreatModelByThreatId(threatId)?.let { threatModel ->
+                        val threatItem = threatItemBuilder.buildThreatItem(threatModel).copy(
+                                isFixing = true,
+                                subHeader = threatDetailsListItemsBuilder.buildFixableThreatDescription(
+                                        requireNotNull(threatModel.baseThreatModel.fixable)
+                                ).text
+                        )
+                        threatItem
+                    }
+                }
+        )
+
+        return items
+    }
+
+    @Suppress("LongParameterList")
+    private fun buildThreatsFoundStateItems(
+        model: ScanStateModel,
+        threats: List<ThreatModel>,
+        site: SiteModel,
+        onScanButtonClicked: () -> Unit,
+        onFixAllButtonClicked: () -> Unit,
+        onThreatItemClicked: (threatId: Long) -> Unit,
+        onHelpClicked: () -> Unit,
+        onEnterServerCredsMessageClicked: () -> Unit
+    ): List<JetpackListItemState> {
+        val items = mutableListOf<JetpackListItemState>()
+
+        val scanIcon = buildScanIcon(R.drawable.ic_shield_warning_white, R.color.error)
+        val scanHeader = HeaderState(UiStringRes(R.string.scan_idle_threats_found_title))
+        val scanDescription = buildThreatsFoundDescription(site, threats.size, onHelpClicked)
+        val scanButton = buildScanButtonAction(titleRes = R.string.scan_again, onClick = onScanButtonClicked)
+
+        items.add(scanIcon)
+        items.add(scanHeader)
+        items.add(scanDescription)
+
+        val fixableThreats = threats.filter { it.baseThreatModel.fixable != null }
+        buildFixAllButtonAction(
+                onFixAllButtonClicked = onFixAllButtonClicked,
+                isEnabled = model.hasValidCredentials
+        ).takeIf { fixableThreats.isNotEmpty() }?.let { items.add(it) }
+
+        items.add(scanButton)
+
+        if (!model.hasValidCredentials && fixableThreats.isNotEmpty()) {
+            items.add(
+                    buildEnterServerCredsMessageState(
+                            onEnterServerCredsMessageClicked = onEnterServerCredsMessageClicked,
+                            threatsCount = threats.size
+                    )
+            )
+        }
+
+        threats.takeIf { it.isNotEmpty() }?.let {
+            items.add(ThreatsHeaderItemState(threatsCount = threats.size))
+            items.addAll(threats.map { threat -> threatItemBuilder.buildThreatItem(threat, onThreatItemClicked) })
+        }
+
+        return items
+    }
+
+    private fun buildThreatsNotFoundStateItems(
+        scanStateModel: ScanStateModel,
+        onScanButtonClicked: () -> Unit
+    ): List<JetpackListItemState> {
+        val items = mutableListOf<JetpackListItemState>()
+
+        val scanIcon = buildScanIcon(R.drawable.ic_shield_tick_white, R.color.jetpack_green_40)
+        val scanHeader = HeaderState(UiStringRes(R.string.scan_idle_no_threats_found_title))
+        val scanDescription = scanStateModel.mostRecentStatus?.startDate?.time?.let {
+            buildLastScanDescription(it)
+        } ?: DescriptionState(UiStringRes(R.string.scan_idle_manual_scan_description))
+        val scanButton = buildScanButtonAction(titleRes = R.string.scan_now, onClick = onScanButtonClicked)
+
+        items.add(scanIcon)
+        items.add(scanHeader)
+        items.add(scanDescription)
+        items.add(scanButton)
+
+        return items
+    }
+
+    private fun buildScanningStateItems(
+        mostRecentStatus: ScanProgressStatus?,
+        currentProgress: ScanProgressStatus?
+    ): List<JetpackListItemState> {
+        val items = mutableListOf<JetpackListItemState>()
+        // TODO: ashiagr replace icon with stroke, using direct icon (color = null) causing issues with dynamic tinting
+        val progress = currentProgress?.progress ?: 0
+        val scanIcon = buildScanIcon(R.drawable.ic_shield_white, R.color.jetpack_green_5)
+        val scanTitleRes = if (progress == 0) R.string.scan_preparing_to_scan_title else R.string.scan_scanning_title
+        val scanHeader = HeaderState(UiStringRes(scanTitleRes))
+        val descriptionRes = if (mostRecentStatus?.isInitial == true) {
+            R.string.scan_scanning_is_initial_description
+        } else {
+            R.string.scan_scanning_description
+        }
+        val scanDescription = DescriptionState(UiStringRes(descriptionRes))
+        val scanProgress = ProgressState(
+                progress = progress,
+                progressLabel = UiStringResWithParams(
+                        R.string.scan_progress_label,
+                        listOf(UiStringText(progress.toString()))
+                )
+        )
+
+        items.add(scanIcon)
+        items.add(scanHeader)
+        items.add(scanDescription)
+        items.add(scanProgress)
+
+        return items
+    }
+
+    private fun buildProvisioningStateItems(): List<JetpackListItemState> {
+        val items = mutableListOf<JetpackListItemState>()
+        val scanIcon = buildScanIcon(R.drawable.ic_shield_white, R.color.jetpack_green_5)
+        val scanHeader = HeaderState(UiStringRes(R.string.scan_preparing_to_scan_title))
+        val scanDescription = DescriptionState(UiStringRes(R.string.scan_provisioning_description))
+
+        items.add(scanIcon)
+        items.add(scanHeader)
+        items.add(scanDescription)
+
+        return items
+    }
+
+    private fun buildScanIcon(@DrawableRes icon: Int, @ColorRes color: Int?) = IconState(
+            icon = icon,
+            colorResId = color,
+            sizeResId = R.dimen.scan_icon_size,
+            marginResId = R.dimen.scan_icon_margin,
+            contentDescription = UiStringRes(R.string.scan_state_icon)
+    )
+
+    private fun buildScanButtonAction(@StringRes titleRes: Int, onClick: () -> Unit) = ActionButtonState(
+            text = UiStringRes(titleRes),
+            onClick = onClick,
+            contentDescription = UiStringRes(titleRes),
+            isSecondary = true
+    )
+
+    private fun buildFixAllButtonAction(
+        onFixAllButtonClicked: () -> Unit,
+        isEnabled: Boolean = true
+    ): ActionButtonState {
+        val title = UiStringRes(R.string.threats_fix_all)
+        return ActionButtonState(
+                text = title,
+                onClick = onFixAllButtonClicked,
+                contentDescription = title,
+                isEnabled = isEnabled
+        )
+    }
+
+    private fun buildLastScanDescription(timeInMs: Long): DescriptionState {
+        val durationInMs = dateProvider.getCurrentDate().time - timeInMs
+        val hours = durationInMs / ONE_HOUR
+        val minutes = durationInMs / ONE_MINUTE
+        val displayDuration = when {
+            hours > 0 -> UiStringResWithParams(R.string.scan_in_hours_ago, listOf(UiStringText("${hours.toInt()}")))
+            minutes > 0 -> UiStringResWithParams(
+                    R.string.scan_in_minutes_ago,
+                    listOf(UiStringText("${minutes.toInt()}"))
+            )
+            else -> UiStringRes(R.string.scan_in_few_seconds)
+        }
+
+        return DescriptionState(
+                UiStringResWithParams(
+                        R.string.scan_idle_last_scan_description,
+                        listOf(displayDuration, UiStringRes(R.string.scan_idle_manual_scan_description))
+                )
+        )
+    }
+
+    private fun buildThreatsFoundDescription(
+        site: SiteModel,
+        threatsCount: Int,
+        onHelpClicked: () -> Unit
+    ): DescriptionState {
+        val clickableText = resourceProvider.getString(R.string.scan_here_to_help)
+
+        val descriptionText = if (threatsCount > 1) {
+            htmlMessageUtils
+                    .getHtmlMessageFromStringFormatResId(
+                            R.string.scan_idle_threats_description_plural,
+                            "<b>$threatsCount</b>",
+                            "<b>${site.name ?: resourceProvider.getString(R.string.scan_this_site)}</b>",
+                            clickableText
+                    )
+        } else {
+            htmlMessageUtils
+                    .getHtmlMessageFromStringFormatResId(
+                            R.string.scan_idle_threats_description_singular,
+                            "<b>${site.name ?: resourceProvider.getString(R.string.scan_this_site)}</b>",
+                            clickableText
+                    )
+        }
+
+        val clickableTextStartIndex = descriptionText.indexOf(clickableText)
+        val clickableTextEndIndex = clickableTextStartIndex + clickableText.length
+        val clickableTextsInfo = listOf(
+                ClickableTextInfo(
+                        startIndex = clickableTextStartIndex,
+                        endIndex = clickableTextEndIndex,
+                        onClick = onHelpClicked
+                )
+        )
+
+        return DescriptionState(
+                text = UiStringText(descriptionText),
+                clickableTextsInfo = clickableTextsInfo
+        )
+    }
+
+    private fun buildEnterServerCredsMessageState(
+        onEnterServerCredsMessageClicked: () -> Unit,
+        threatsCount: Int
+    ): DescriptionState {
+        val messageResId = if (threatsCount > 1) {
+            R.string.threat_fix_enter_server_creds_message_plural
+        } else {
+            R.string.threat_fix_enter_server_creds_message_singular
+        }
+
+        val clickableText = resourceProvider.getString(messageResId)
+
+        val clickableTextsInfo = listOf(
+                ClickableTextInfo(
+                        startIndex = 0,
+                        endIndex = clickableText.length,
+                        onClick = onEnterServerCredsMessageClicked
+                )
+        )
+
+        return DescriptionState(text = UiStringRes(messageResId), clickableTextsInfo = clickableTextsInfo)
+    }
+
+    companion object {
+        private const val ONE_MINUTE = 60 * 1000L
+        private const val ONE_HOUR = 60 * ONE_MINUTE
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ThreatItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ThreatItemBuilder.kt
new file mode 100644
index 000000000000..31f8899b799a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/builders/ThreatItemBuilder.kt
@@ -0,0 +1,160 @@
+package org.wordpress.android.ui.jetpack.scan.builders
+
+import dagger.Reusable
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.CoreFileModificationThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.CURRENT
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.FIXED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.IGNORED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.UNKNOWN
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension.ExtensionType
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemState
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DateFormatWrapper
+import java.util.Date
+import javax.inject.Inject
+
+@Reusable
+class ThreatItemBuilder @Inject constructor(
+    private val dateFormatWrapper: DateFormatWrapper
+) {
+    fun buildThreatItem(
+        threatModel: ThreatModel,
+        onThreatItemClicked: ((threatId: Long) -> Unit)? = null,
+        isFixing: Boolean = false
+    ) = ThreatItemState(
+            threatId = threatModel.baseThreatModel.id,
+            isFixing = isFixing,
+            firstDetectedDate = getDateString(threatModel.baseThreatModel.firstDetected),
+            header = buildThreatItemHeader(threatModel),
+            subHeader = buildThreatItemSubHeader(threatModel),
+            subHeaderColor = buildThreatItemSubHeaderColor(threatModel),
+            icon = buildThreatItemIcon(threatModel),
+            iconBackground = buildThreatItemIconBackground(threatModel),
+            onClick = { onThreatItemClicked?.let { onThreatItemClicked(threatModel.baseThreatModel.id) } }
+    )
+
+    fun buildThreatItemHeader(threatModel: ThreatModel) = when (threatModel) {
+        is CoreFileModificationThreatModel -> UiStringResWithParams(
+                R.string.threat_item_header_infected_core_file,
+                listOf(UiStringText(getDisplayFileName(threatModel.fileName)))
+        )
+
+        is DatabaseThreatModel -> UiStringResWithParams(
+                R.string.threat_item_header_database_threat,
+                listOf(UiStringText("${threatModel.rows?.size ?: 0}"))
+        )
+
+        is FileThreatModel -> UiStringResWithParams(
+                R.string.threat_item_header_file_malicious_code_pattern,
+                listOf(UiStringText(getDisplayFileName(threatModel.fileName)))
+        )
+
+        is VulnerableExtensionThreatModel -> {
+            val slug = threatModel.extension.slug ?: ""
+            val version = threatModel.extension.version ?: ""
+            when (threatModel.extension.type) {
+                ExtensionType.PLUGIN -> UiStringResWithParams(
+                        R.string.threat_item_header_vulnerable_plugin,
+                        listOf(UiStringText(slug), UiStringText(version))
+                )
+                ExtensionType.THEME -> UiStringResWithParams(
+                        R.string.threat_item_header_vulnerable_theme,
+                        listOf(UiStringText(slug), UiStringText(version))
+                )
+                ExtensionType.UNKNOWN -> throw IllegalArgumentException(
+                        "$UNKNOWN_VULNERABLE_EXTENSION_TYPE in ${this::class.java.simpleName}"
+                )
+            }
+        }
+
+        is GenericThreatModel -> UiStringRes(R.string.threat_item_header_threat_found)
+    }
+
+    private fun buildThreatItemSubHeader(threatModel: ThreatModel): UiString? {
+        return when (threatModel.baseThreatModel.status) {
+            FIXED -> {
+                UiStringResWithParams(
+                        R.string.threat_item_sub_header_status_fixed_on,
+                        listOf(getDateString(threatModel.baseThreatModel.fixedOn))
+                )
+            }
+            IGNORED -> {
+                UiStringRes(R.string.threat_item_sub_header_status_ignored)
+            }
+            else -> {
+                buildThreatItemDescription(threatModel)
+            }
+        }
+    }
+
+    private fun buildThreatItemSubHeaderColor(threatModel: ThreatModel) =
+            if (threatModel.baseThreatModel.status == FIXED) {
+                R.attr.wpColorSuccess
+            } else {
+                R.attr.colorOnSurface
+            }
+
+    fun buildThreatItemDescription(threatModel: ThreatModel): UiString? {
+        return when (threatModel) {
+            is CoreFileModificationThreatModel -> UiStringRes(R.string.threat_item_sub_header_core_file)
+
+            is DatabaseThreatModel -> null
+
+            is FileThreatModel -> UiStringResWithParams(
+                    R.string.threat_item_sub_header_file_signature,
+                    listOf(UiStringText(threatModel.baseThreatModel.signature))
+            )
+
+            is VulnerableExtensionThreatModel -> {
+                when (threatModel.extension.type) {
+                    ExtensionType.PLUGIN -> UiStringRes(R.string.threat_item_sub_header_vulnerable_plugin)
+                    ExtensionType.THEME -> UiStringRes(R.string.threat_item_sub_header_vulnerable_theme)
+                    ExtensionType.UNKNOWN -> throw IllegalArgumentException(
+                            "$UNKNOWN_VULNERABLE_EXTENSION_TYPE in ${this::class.java.simpleName}"
+                    )
+                }
+            }
+
+            is GenericThreatModel -> UiStringRes(R.string.threat_item_sub_header_misc_vulnerability)
+        }
+    }
+
+    fun buildThreatItemIcon(threatModel: ThreatModel): Int =
+            when (threatModel.baseThreatModel.status) {
+                FIXED -> R.drawable.ic_shield_tick_white
+                IGNORED, UNKNOWN, CURRENT -> R.drawable.ic_notice_outline_white_24dp
+            }
+
+    fun buildThreatItemIconBackground(threatModel: ThreatModel): Int =
+            when (threatModel.baseThreatModel.status) {
+                FIXED -> R.drawable.bg_oval_success_50
+                IGNORED -> R.drawable.bg_oval_neutral_30
+                UNKNOWN, CURRENT -> R.drawable.bg_oval_error_50
+            }
+
+    private fun getDateString(date: Date?): UiStringText {
+        return date?.let {
+            val dateFormat = dateFormatWrapper.getLongDateFormat()
+            return UiStringText(dateFormat.format(date))
+        } ?: UiStringText("")
+    }
+
+    /**
+     * Uses regex to remove the whole path except of the file name
+     * e.g. "/var/www/html/jp-scan-daily/wp-admin/index.php" returns "index.php".
+     * */
+    private fun getDisplayFileName(fileName: String?) = fileName?.replace(".*/".toRegex(), "") ?: ""
+
+    companion object {
+        private const val UNKNOWN_VULNERABLE_EXTENSION_TYPE = "Unexpected vulnerable extension threat type"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsActivity.kt
new file mode 100644
index 000000000000..eb7b96ab3ff2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsActivity.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import org.wordpress.android.databinding.ThreatDetailsActivityBinding
+
+class ThreatDetailsActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        with(ThreatDetailsActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
+            setSupportActionBar(toolbarMain)
+        }
+        supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt
new file mode 100644
index 000000000000..7c3fcf42bfae
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsFragment.kt
@@ -0,0 +1,138 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ThreatDetailsFragmentBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.jetpack.scan.ScanFragment.Companion.ARG_THREAT_ID
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.OpenThreatActionDialog
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowGetFreeEstimate
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowJetpackSettings
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowUpdatedFixState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowUpdatedScanStateWithMessage
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsViewModel.UiState.Content
+import org.wordpress.android.ui.jetpack.scan.details.adapters.ThreatDetailsAdapter
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
+import org.wordpress.android.widgets.WPSnackbar
+import javax.inject.Inject
+
+class ThreatDetailsFragment : Fragment(R.layout.threat_details_fragment) {
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: ThreatDetailsViewModel
+    private var threatActionDialog: AlertDialog? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        with(ThreatDetailsFragmentBinding.bind(view)) {
+            initDagger()
+            initAdapter()
+            initViewModel()
+        }
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component()?.inject(this)
+    }
+
+    private fun ThreatDetailsFragmentBinding.initAdapter() {
+        recyclerView.adapter = ThreatDetailsAdapter(imageManager, uiHelpers)
+    }
+
+    private fun ThreatDetailsFragmentBinding.initViewModel() {
+        viewModel = ViewModelProvider(
+                this@ThreatDetailsFragment,
+                viewModelFactory
+        ).get(ThreatDetailsViewModel::class.java)
+        setupObservers()
+        val threatId = requireActivity().intent.getLongExtra(ARG_THREAT_ID, 0)
+        viewModel.start(threatId)
+    }
+
+    private fun ThreatDetailsFragmentBinding.setupObservers() {
+        viewModel.uiState.observe(
+                viewLifecycleOwner,
+                { uiState ->
+                    if (uiState is Content) {
+                        refreshContentScreen(uiState)
+                    }
+                }
+        )
+
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, { it.showSnackbar() })
+
+        viewModel.navigationEvents.observeEvent(
+                viewLifecycleOwner,
+                { events ->
+                    when (events) {
+                        is OpenThreatActionDialog -> showThreatActionDialog(events)
+
+                        is ShowUpdatedScanStateWithMessage -> {
+                            val site = requireNotNull(requireActivity().intent.extras)
+                                    .getSerializable(WordPress.SITE) as SiteModel
+                            ActivityLauncher.viewScanRequestScanState(requireActivity(), site, events.messageRes)
+                        }
+                        is ShowUpdatedFixState -> {
+                            val site = requireNotNull(requireActivity().intent.extras)
+                                    .getSerializable(WordPress.SITE) as SiteModel
+                            ActivityLauncher.viewScanRequestFixState(requireActivity(), site, events.threatId)
+                        }
+                        is ShowGetFreeEstimate -> {
+                            ActivityLauncher.openUrlExternal(context, events.url())
+                        }
+                        is ShowJetpackSettings -> ActivityLauncher.openUrlExternal(context, events.url)
+                    }
+                }
+        )
+    }
+
+    private fun ThreatDetailsFragmentBinding.refreshContentScreen(content: Content) {
+        ((recyclerView.adapter) as ThreatDetailsAdapter).update(content.items)
+    }
+
+    private fun SnackbarMessageHolder.showSnackbar() {
+        view?.let {
+            val snackbar = WPSnackbar.make(
+                    it,
+                    uiHelpers.getTextOfUiString(requireContext(), message),
+                    Snackbar.LENGTH_LONG
+            )
+            snackbar.show()
+        }
+    }
+
+    private fun showThreatActionDialog(holder: OpenThreatActionDialog) {
+        threatActionDialog = MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(uiHelpers.getTextOfUiString(requireContext(), holder.title))
+                .setMessage(uiHelpers.getTextOfUiString(requireContext(), holder.message))
+                .setPositiveButton(holder.positiveButtonLabel) { _, _ -> holder.okButtonAction.invoke() }
+                .setNegativeButton(holder.negativeButtonLabel) { _, _ -> threatActionDialog?.dismiss() }
+                .setCancelable(true)
+                .create()
+        threatActionDialog?.show()
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        if (requireActivity().intent.extras?.containsKey(WordPress.SITE) != true) {
+            throw RuntimeException("ThreatDetailsFragment - missing siteModel extras.")
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        threatActionDialog?.dismiss()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemState.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemState.kt
new file mode 100644
index 000000000000..a500f0e940d9
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemState.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext.ContextLine
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.utils.UiString
+
+sealed class ThreatDetailsListItemState(override val type: ViewType) : JetpackListItemState(type) {
+    data class ThreatContextLinesItemState(val lines: List<ThreatContextLineItemState>) : ThreatDetailsListItemState(
+            ViewType.THREAT_CONTEXT_LINES
+    ) {
+        data class ThreatContextLineItemState(
+            val line: ContextLine,
+            @ColorRes val lineNumberBackgroundColorRes: Int,
+            @ColorRes val contentBackgroundColorRes: Int,
+            @ColorRes val highlightedBackgroundColorRes: Int,
+            @ColorRes val highlightedTextColorRes: Int
+        )
+    }
+
+    data class ThreatDetailHeaderState(
+        @DrawableRes val icon: Int,
+        @DrawableRes val iconBackground: Int,
+        val header: UiString,
+        val description: UiString
+    ) : ThreatDetailsListItemState(ViewType.THREAT_DETAIL_HEADER)
+
+    data class ThreatFileNameState(val fileName: UiString) : ThreatDetailsListItemState(ViewType.THREAT_FILE_NAME)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemsBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemsBuilder.kt
new file mode 100644
index 000000000000..c70bacc38c79
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemsBuilder.kt
@@ -0,0 +1,300 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import dagger.Reusable
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable.FixType
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState.ClickableTextInfo
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.jetpack.scan.builders.ThreatItemBuilder
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatContextLinesItemState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatDetailHeaderState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatFileNameState
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DateFormatWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
+import java.util.Date
+import javax.inject.Inject
+
+@Reusable
+class ThreatDetailsListItemsBuilder @Inject constructor(
+    private val htmlMessageUtils: HtmlMessageUtils,
+    private val threatItemBuilder: ThreatItemBuilder,
+    private val dateFormatWrapper: DateFormatWrapper,
+    private val resourceProvider: ResourceProvider
+) {
+    @Suppress("LongParameterList")
+    fun buildThreatDetailsListItems(
+        threatModel: ThreatModel,
+        scanStateHasValidCredentials: Boolean,
+        onFixThreatButtonClicked: () -> Unit,
+        onGetFreeEstimateButtonClicked: () -> Unit,
+        onIgnoreThreatButtonClicked: () -> Unit,
+        onEnterServerCredsMessageClicked: () -> Unit
+    ): List<JetpackListItemState> = mutableListOf<JetpackListItemState>().apply {
+        addAll(buildBasicThreatDetailsListItems(threatModel))
+        addAll(buildTechnicalDetailsListItems(threatModel))
+        addAll(buildFixDetailsListItems(threatModel))
+        addAll(
+                buildActionButtons(
+                        threatModel,
+                        scanStateHasValidCredentials,
+                        onFixThreatButtonClicked,
+                        onGetFreeEstimateButtonClicked,
+                        onIgnoreThreatButtonClicked
+                )
+        )
+        if (shouldShowEnterServerCredsMessage(scanStateHasValidCredentials, threatModel)) {
+            add(buildEnterServerCredsMessageState(onEnterServerCredsMessageClicked))
+        }
+    }.toList()
+
+    private fun shouldShowEnterServerCredsMessage(hasValidCredentials: Boolean, threatModel: ThreatModel) =
+            !hasValidCredentials &&
+                    threatModel.baseThreatModel.fixable != null &&
+                    threatModel.baseThreatModel.status != ThreatStatus.FIXED
+
+    private fun buildBasicThreatDetailsListItems(threatModel: ThreatModel) =
+            mutableListOf<JetpackListItemState>().apply {
+                add(buildThreatDetailHeader(threatModel))
+                // show both Fixed and Found rows for threats in Fixed state
+                if (threatModel.baseThreatModel.status == ThreatStatus.FIXED) {
+                    add(buildThreatFoundHeaderItem())
+                    add(buildThreatFoundDateSubHeaderItem(threatModel))
+                }
+                add(buildThreatHeaderItem(threatModel))
+                add(buildThreatSubHeaderItem(threatModel))
+                add(buildProblemHeaderItem())
+                add(buildProblemDescriptionItem(threatModel))
+            }
+
+    private fun buildTechnicalDetailsListItems(threatModel: ThreatModel): List<JetpackListItemState> {
+        var fileName: String? = null
+        var threatContext: ThreatContext? = null
+        var diff: String? = null
+
+        when (threatModel) {
+            is ThreatModel.FileThreatModel -> {
+                fileName = threatModel.fileName
+                threatContext = threatModel.context
+            }
+
+            is ThreatModel.CoreFileModificationThreatModel -> {
+                fileName = threatModel.fileName
+                diff = threatModel.diff
+            }
+
+            is ThreatModel.DatabaseThreatModel,
+            is ThreatModel.GenericThreatModel,
+            is ThreatModel.VulnerableExtensionThreatModel -> { // Do Nothing
+            }
+        }
+
+        return mutableListOf<JetpackListItemState>().apply {
+            fileName?.let {
+                add(buildFileNameDescription())
+                add(buildFileName(it))
+            }
+            threatContext?.let { add(buildThreatContextLines(threatContext)) }
+            diff?.let { add(buildDiff(diff)) }
+
+            if (isNotEmpty()) {
+                add(0, buildTechnicalDetailsHeaderItem())
+            }
+        }
+    }
+
+    private fun buildFixDetailsListItems(threatModel: ThreatModel) = mutableListOf<JetpackListItemState>().apply {
+        with(threatModel.baseThreatModel) {
+            if (status != ThreatStatus.FIXED) {
+                add(buildFixTitleHeader(status, fixable))
+                add(buildFixDescription(fixable))
+            }
+        }
+    }
+
+    private fun buildActionButtons(
+        threatModel: ThreatModel,
+        hasValidCredentials: Boolean,
+        onFixThreatButtonClicked: () -> Unit,
+        onGetFreeEstimateButtonClicked: () -> Unit,
+        onIgnoreThreatButtonClicked: () -> Unit
+    ) = mutableListOf<JetpackListItemState>().apply {
+        val isFixable = threatModel.baseThreatModel.fixable != null
+        if (threatModel.baseThreatModel.status != ThreatStatus.FIXED) {
+            if (isFixable) {
+                add(
+                        buildFixThreatButtonAction(
+                                onFixThreatButtonClicked = onFixThreatButtonClicked,
+                                isEnabled = hasValidCredentials
+                        )
+                )
+            } else {
+                add(buildGetFreeEstimateButtonAction(onGetFreeEstimateButtonClicked))
+            }
+        }
+        if (threatModel.baseThreatModel.status == ThreatStatus.CURRENT) {
+            add(buildIgnoreThreatButtonAction(onIgnoreThreatButtonClicked))
+        }
+    }
+
+    private fun buildThreatDetailHeader(threatModel: ThreatModel) = ThreatDetailHeaderState(
+            icon = threatItemBuilder.buildThreatItemIcon(threatModel),
+            iconBackground = threatItemBuilder.buildThreatItemIconBackground(threatModel),
+            header = when (threatModel.baseThreatModel.status) {
+                ThreatStatus.FIXED -> UiStringRes(R.string.threat_status_fixed)
+                ThreatStatus.IGNORED, ThreatStatus.CURRENT, ThreatStatus.UNKNOWN ->
+                    UiStringRes(R.string.threat_found_header)
+            },
+            description = when (threatModel.baseThreatModel.status) {
+                ThreatStatus.FIXED -> getThreatFoundString(threatModel.baseThreatModel.fixedOn)
+                ThreatStatus.IGNORED, ThreatStatus.CURRENT, ThreatStatus.UNKNOWN ->
+                    getThreatFoundString(threatModel.baseThreatModel.firstDetected)
+            }
+    )
+
+    private fun buildThreatFoundHeaderItem() = HeaderState(text = UiStringRes(R.string.threat_found_header))
+
+    private fun buildThreatFoundDateSubHeaderItem(threatModel: ThreatModel): DescriptionState {
+        return DescriptionState(text = getThreatFoundString(threatModel.baseThreatModel.firstDetected))
+    }
+
+    private fun getThreatFoundString(date: Date?): UiStringText {
+        return date?.let {
+            val dateFormat = dateFormatWrapper.getLongDateFormat()
+            return UiStringText(dateFormat.format(date))
+        } ?: UiStringText("")
+    }
+
+    private fun buildThreatHeaderItem(threatModel: ThreatModel) = HeaderState(
+            text = threatItemBuilder.buildThreatItemHeader(threatModel)
+    )
+
+    private fun buildThreatSubHeaderItem(threatModel: ThreatModel) =
+            DescriptionState(threatItemBuilder.buildThreatItemDescription(threatModel))
+
+    private fun buildProblemHeaderItem() = HeaderState(UiStringRes(R.string.threat_problem_header))
+
+    private fun buildProblemDescriptionItem(threatModel: ThreatModel) =
+            DescriptionState(UiStringText(threatModel.baseThreatModel.description))
+
+    private fun buildTechnicalDetailsHeaderItem() = HeaderState(UiStringRes(R.string.threat_technical_details_header))
+
+    private fun buildFileNameDescription() = DescriptionState(UiStringRes(R.string.threat_file_description))
+
+    private fun buildFileName(fileName: String) = ThreatFileNameState(UiStringText(fileName))
+
+    private fun buildThreatContextLines(context: ThreatContext) =
+            ThreatContextLinesItemState(lines = context.lines.map { buildThreatContextLine(it) })
+
+    private fun buildThreatContextLine(
+        line: ThreatContext.ContextLine
+    ): ThreatContextLinesItemState.ThreatContextLineItemState {
+        val isHighlighted = line.highlights?.isNotEmpty() == true
+
+        val lineNumberBackgroundColorRes = if (isHighlighted) {
+            R.color.context_line_highlighted_row_background
+        } else R.color.material_on_surface_disabled
+
+        val contentBackgroundColorRes = if (isHighlighted) {
+            R.color.context_line_highlighted_row_background
+        } else R.color.on_surface_emphasis_lowest
+
+        return ThreatContextLinesItemState.ThreatContextLineItemState(
+                line = line,
+                lineNumberBackgroundColorRes = lineNumberBackgroundColorRes,
+                contentBackgroundColorRes = contentBackgroundColorRes,
+                highlightedBackgroundColorRes = R.color.red_60,
+                highlightedTextColorRes = R.color.white
+        )
+    }
+
+    private fun buildDiff(diff: String) = DescriptionState(UiStringText(diff)) // TODO: ashiagr custom diff view?
+
+    private fun buildFixTitleHeader(status: ThreatStatus, fixable: Fixable?) = HeaderState(
+            UiStringRes(
+                    when (status) {
+                        ThreatStatus.FIXED -> R.string.threat_fix_fixed_header
+
+                        ThreatStatus.CURRENT ->
+                            fixable?.let { R.string.threat_fix_current_fixable_header }
+                                    ?: R.string.threat_fix_current_not_fixable_header
+
+                        ThreatStatus.IGNORED, ThreatStatus.UNKNOWN -> R.string.threat_fix_default_header
+                    }
+            )
+    )
+
+    private fun buildFixDescription(fixable: Fixable?) = fixable?.let { buildFixableThreatDescription(it) }
+            ?: buildNotFixableThreatDescription()
+
+    fun buildFixableThreatDescription(fixable: Fixable) = DescriptionState(
+            when (fixable.fixer) {
+                FixType.REPLACE -> UiStringRes(R.string.threat_fix_fixable_replace)
+
+                FixType.DELETE -> UiStringRes(R.string.threat_fix_fixable_delete)
+
+                FixType.UPDATE -> fixable.target?.let {
+                    UiStringResWithParams(R.string.threat_fix_fixable_update, listOf(UiStringText(it)))
+                } ?: UiStringRes(R.string.threat_fix_fixable_default)
+
+                FixType.EDIT -> UiStringRes(R.string.threat_fix_fixable_edit)
+
+                FixType.UNKNOWN -> UiStringRes(R.string.threat_fix_fixable_default)
+            }
+    )
+
+    private fun buildNotFixableThreatDescription() = DescriptionState(
+            UiStringText(
+                    htmlMessageUtils
+                            .getHtmlMessageFromStringFormatResId(R.string.threat_fix_current_not_fixable_description)
+            )
+    )
+
+    private fun buildFixThreatButtonAction(
+        onFixThreatButtonClicked: () -> Unit,
+        isEnabled: Boolean = true
+    ) = ActionButtonState(
+            text = UiStringRes(R.string.threat_fix),
+            onClick = onFixThreatButtonClicked,
+            contentDescription = UiStringRes(R.string.threat_fix),
+            isEnabled = isEnabled
+    )
+
+    private fun buildGetFreeEstimateButtonAction(onGetFreeEstimateButtonClicked: () -> Unit) = ActionButtonState(
+            text = UiStringRes(R.string.threat_get_free_estimate),
+            onClick = onGetFreeEstimateButtonClicked,
+            contentDescription = UiStringRes(R.string.threat_get_free_estimate)
+    )
+
+    private fun buildIgnoreThreatButtonAction(onIgnoreThreatButtonClicked: () -> Unit) = ActionButtonState(
+            text = UiStringRes(R.string.threat_ignore),
+            onClick = onIgnoreThreatButtonClicked,
+            contentDescription = UiStringRes(R.string.threat_ignore),
+            isSecondary = true
+    )
+
+    private fun buildEnterServerCredsMessageState(onEnterServerCredsMessageClicked: () -> Unit): DescriptionState {
+        val messageResId = R.string.threat_fix_enter_server_creds_message_singular
+        val clickableText = resourceProvider.getString(messageResId)
+
+        val clickableTextsInfo = listOf(
+                ClickableTextInfo(
+                        startIndex = 0,
+                        endIndex = clickableText.length,
+                        onClick = onEnterServerCredsMessageClicked
+                )
+        )
+
+        return DescriptionState(text = UiStringRes(messageResId), clickableTextsInfo = clickableTextsInfo)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsNavigationEvents.kt
new file mode 100644
index 000000000000..750523b01950
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsNavigationEvents.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import androidx.annotation.StringRes
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import org.wordpress.android.R
+import org.wordpress.android.ui.utils.UiString
+
+private const val CODEABLE_GET_FREE_ESTIMATE_FIREBASE_KEY = "codeable_get_free_estimate_url"
+
+sealed class ThreatDetailsNavigationEvents {
+    class OpenThreatActionDialog(
+        val title: UiString,
+        val message: UiString,
+        val okButtonAction: () -> Unit
+    ) : ThreatDetailsNavigationEvents() {
+        @StringRes val positiveButtonLabel: Int = R.string.dialog_button_ok
+        @StringRes val negativeButtonLabel: Int = R.string.dialog_button_cancel
+    }
+
+    data class ShowUpdatedScanStateWithMessage(@StringRes val messageRes: Int) : ThreatDetailsNavigationEvents()
+
+    data class ShowUpdatedFixState(val threatId: Long) : ThreatDetailsNavigationEvents()
+
+    object ShowGetFreeEstimate : ThreatDetailsNavigationEvents() {
+        fun url() = FirebaseRemoteConfig.getInstance().getString(CODEABLE_GET_FREE_ESTIMATE_FIREBASE_KEY)
+    }
+
+    data class ShowJetpackSettings(val url: String) : ThreatDetailsNavigationEvents()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModel.kt
new file mode 100644
index 000000000000..a2e0a90d2bc3
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModel.kt
@@ -0,0 +1,202 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.launch
+import org.wordpress.android.Constants
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.OpenThreatActionDialog
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowJetpackSettings
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowUpdatedFixState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowUpdatedScanStateWithMessage
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsViewModel.UiState.Content
+import org.wordpress.android.ui.jetpack.scan.details.usecases.GetThreatModelUseCase
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState
+import org.wordpress.android.ui.mysite.SelectedSiteRepository
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class ThreatDetailsViewModel @Inject constructor(
+    private val getThreatModelUseCase: GetThreatModelUseCase,
+    private val ignoreThreatUseCase: IgnoreThreatUseCase,
+    private val fixThreatsUseCase: FixThreatsUseCase,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val scanStore: ScanStore,
+    private val builder: ThreatDetailsListItemsBuilder,
+    private val htmlMessageUtils: HtmlMessageUtils,
+    private val resourceProvider: ResourceProvider,
+    private val scanTracker: ScanTracker
+) : ViewModel() {
+    private lateinit var site: SiteModel
+    private lateinit var threatModel: ThreatModel
+    private var isStarted = false
+
+    private val _uiState: MutableLiveData<UiState> = MutableLiveData()
+    val uiState: LiveData<UiState> = _uiState
+
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _navigationEvents = MediatorLiveData<Event<ThreatDetailsNavigationEvents>>()
+    val navigationEvents: LiveData<Event<ThreatDetailsNavigationEvents>> = _navigationEvents
+
+    fun start(threatId: Long) {
+        if (isStarted) {
+            return
+        }
+        isStarted = true
+        site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        getData(threatId)
+    }
+
+    private fun getData(threatId: Long) {
+        viewModelScope.launch {
+            threatModel = requireNotNull(getThreatModelUseCase.get(threatId))
+            val scanStateHasValidCredentials = scanStore.hasValidCredentials(site)
+            updateUiState(buildContentUiState(threatModel, scanStateHasValidCredentials))
+        }
+    }
+
+    private fun fixThreat() {
+        scanTracker.trackOnFixThreatConfirmed(threatModel.baseThreatModel.signature)
+        viewModelScope.launch {
+            val threatId = threatModel.baseThreatModel.id
+            updateThreatActionButtons(isEnabled = false)
+            when (fixThreatsUseCase.fixThreats(remoteSiteId = site.siteId, fixableThreatIds = listOf(threatId))) {
+                is FixThreatsState.Success -> {
+                    updateNavigationEvent(ShowUpdatedFixState(threatId))
+                }
+                is FixThreatsState.Failure.NetworkUnavailable -> {
+                    scanTracker.trackOnError(ScanTracker.ErrorAction.FIX, ScanTracker.ErrorCause.OFFLINE)
+                    updateThreatActionButtons(isEnabled = true)
+                    updateSnackbarMessageEvent(UiStringRes(R.string.error_generic_network))
+                }
+                is FixThreatsState.Failure.RemoteRequestFailure -> {
+                    scanTracker.trackOnError(ScanTracker.ErrorAction.FIX, ScanTracker.ErrorCause.REMOTE)
+                    updateThreatActionButtons(isEnabled = true)
+                    updateSnackbarMessageEvent(UiStringRes(R.string.threat_fix_error_message))
+                }
+            }
+        }
+    }
+
+    private fun ignoreThreat() {
+        scanTracker.trackOnIgnoreThreatConfirmed(threatModel.baseThreatModel.signature)
+        viewModelScope.launch {
+            updateThreatActionButtons(isEnabled = false)
+            when (ignoreThreatUseCase.ignoreThreat(site.siteId, threatModel.baseThreatModel.id)) {
+                is IgnoreThreatState.Success -> updateNavigationEvent(
+                        ShowUpdatedScanStateWithMessage(R.string.threat_ignore_success_message)
+                )
+
+                is IgnoreThreatState.Failure.NetworkUnavailable -> {
+                    scanTracker.trackOnError(ScanTracker.ErrorAction.IGNORE, ScanTracker.ErrorCause.OFFLINE)
+                    updateThreatActionButtons(isEnabled = true)
+                    updateSnackbarMessageEvent(UiStringRes(R.string.error_generic_network))
+                }
+                is IgnoreThreatState.Failure.RemoteRequestFailure -> {
+                    scanTracker.trackOnError(ScanTracker.ErrorAction.IGNORE, ScanTracker.ErrorCause.REMOTE)
+                    updateThreatActionButtons(isEnabled = true)
+                    updateSnackbarMessageEvent(UiStringRes(R.string.threat_ignore_error_message))
+                }
+            }
+        }
+    }
+
+    private fun onFixThreatButtonClicked() {
+        scanTracker.trackOnFixThreatButtonClicked(threatModel.baseThreatModel.signature)
+        val fixable = requireNotNull(threatModel.baseThreatModel.fixable)
+        updateNavigationEvent(
+                OpenThreatActionDialog(
+                        title = UiStringRes(R.string.threat_fix),
+                        message = requireNotNull(builder.buildFixableThreatDescription(fixable).text),
+                        okButtonAction = this@ThreatDetailsViewModel::fixThreat
+                )
+        )
+    }
+
+    private fun onIgnoreThreatButtonClicked() {
+        scanTracker.trackOnIgnoreThreatButtonClicked(threatModel.baseThreatModel.signature)
+        val siteName = site.name ?: resourceProvider.getString(R.string.scan_this_site)
+        updateNavigationEvent(
+                OpenThreatActionDialog(
+                        title = UiStringRes(R.string.threat_ignore),
+                        message = UiStringText(
+                                htmlMessageUtils
+                                        .getHtmlMessageFromStringFormatResId(
+                                                R.string.threat_ignore_warning,
+                                                "<b>$siteName</b>"
+                                        )
+                        ),
+                        okButtonAction = this@ThreatDetailsViewModel::ignoreThreat
+                )
+        )
+    }
+
+    private fun onGetFreeEstimateButtonClicked() {
+        scanTracker.trackOnGetFreeEstimateButtonClicked()
+        updateNavigationEvent(ThreatDetailsNavigationEvents.ShowGetFreeEstimate)
+    }
+
+    private fun onEnterServerCredsMessageClicked() {
+        updateNavigationEvent(ShowJetpackSettings("${Constants.URL_JETPACK_SETTINGS}/${site.siteId}"))
+    }
+
+    private fun updateThreatActionButtons(isEnabled: Boolean) {
+        (_uiState.value as? Content)?.let { content ->
+            val updatesContentItems = content.items.map { contentItem ->
+                if (contentItem is ActionButtonState) {
+                    contentItem.copy(isEnabled = isEnabled)
+                } else {
+                    contentItem
+                }
+            }
+            updateUiState(content.copy(items = updatesContentItems))
+        }
+    }
+
+    private fun updateSnackbarMessageEvent(message: UiString) {
+        _snackbarEvents.value = Event(SnackbarMessageHolder((message)))
+    }
+
+    private fun updateNavigationEvent(navigationEvent: ThreatDetailsNavigationEvents) {
+        _navigationEvents.value = Event(navigationEvent)
+    }
+
+    private fun updateUiState(state: UiState) {
+        _uiState.value = state
+    }
+
+    private fun buildContentUiState(model: ThreatModel, scanStateHasValidCredentials: Boolean) = Content(
+            builder.buildThreatDetailsListItems(
+                    model,
+                    scanStateHasValidCredentials,
+                    this@ThreatDetailsViewModel::onFixThreatButtonClicked,
+                    this@ThreatDetailsViewModel::onGetFreeEstimateButtonClicked,
+                    this@ThreatDetailsViewModel::onIgnoreThreatButtonClicked,
+                    this@ThreatDetailsViewModel::onEnterServerCredsMessageClicked
+            )
+    )
+
+    sealed class UiState { // TODO: ashiagr add states for loading, error as needed
+        data class Content(val items: List<JetpackListItemState>) : UiState()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/ThreatContextLinesAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/ThreatContextLinesAdapter.kt
new file mode 100644
index 000000000000..5d51719299e2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/ThreatContextLinesAdapter.kt
@@ -0,0 +1,46 @@
+package org.wordpress.android.ui.jetpack.scan.details.adapters
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatContextLinesItemState.ThreatContextLineItemState
+import org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders.ThreatContextLineViewHolder
+
+class ThreatContextLinesAdapter : Adapter<ThreatContextLineViewHolder>() {
+    private val items = mutableListOf<ThreatContextLineItemState>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ThreatContextLineViewHolder(parent)
+
+    override fun onBindViewHolder(holder: ThreatContextLineViewHolder, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    override fun getItemCount() = items.size
+
+    fun update(newItems: List<ThreatContextLineItemState>) {
+        val diffResult = DiffUtil.calculateDiff(ThreatContextLineDiffCallback(items.toList(), newItems))
+        items.clear()
+        items.addAll(newItems)
+
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    class ThreatContextLineDiffCallback(
+        private val oldList: List<ThreatContextLineItemState>,
+        private val newList: List<ThreatContextLineItemState>
+    ) : DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = oldList[oldItemPosition]
+            val newItem = newList[newItemPosition]
+            return oldItem == newItem
+        }
+
+        override fun getOldListSize() = oldList.size
+
+        override fun getNewListSize() = newList.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldList[oldItemPosition] == newList[newItemPosition]
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/ThreatDetailsAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/ThreatDetailsAdapter.kt
new file mode 100644
index 000000000000..48c61b562cbb
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/ThreatDetailsAdapter.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.ui.jetpack.scan.details.adapters
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.ViewType
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackButtonViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackDescriptionViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackHeaderViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackIconViewHolder
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders.ThreatContextLinesViewHolder
+import org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders.ThreatDetailHeaderViewHolder
+import org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders.ThreatFileNameViewHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+
+class ThreatDetailsAdapter(
+    private val imageManager: ImageManager,
+    private val uiHelpers: UiHelpers
+) : Adapter<JetpackViewHolder<*>>() {
+    private val items = mutableListOf<JetpackListItemState>()
+
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): JetpackViewHolder<*> {
+        return when (viewType) {
+            ViewType.ICON.id -> JetpackIconViewHolder(imageManager, parent)
+            ViewType.THREAT_DETAIL_HEADER.id -> ThreatDetailHeaderViewHolder(uiHelpers, parent)
+            ViewType.HEADER.id -> JetpackHeaderViewHolder(uiHelpers, parent)
+            ViewType.DESCRIPTION.id -> JetpackDescriptionViewHolder(uiHelpers, parent)
+            ViewType.THREAT_FILE_NAME.id -> ThreatFileNameViewHolder(uiHelpers, parent)
+            ViewType.THREAT_CONTEXT_LINES.id -> ThreatContextLinesViewHolder(parent)
+            ViewType.PRIMARY_ACTION_BUTTON.id -> JetpackButtonViewHolder.Primary(uiHelpers, parent)
+            ViewType.SECONDARY_ACTION_BUTTON.id -> JetpackButtonViewHolder.Secondary(uiHelpers, parent)
+            else -> throw IllegalArgumentException("Unexpected view type in ${this::class.java.simpleName}")
+        }
+    }
+
+    override fun onBindViewHolder(holder: JetpackViewHolder<*>, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    override fun getItemViewType(position: Int) = items[position].type.id
+
+    override fun getItemId(position: Int): Long = items[position].longId()
+
+    override fun getItemCount() = items.size
+
+    fun update(newItems: List<JetpackListItemState>) {
+        val diffResult = DiffUtil.calculateDiff(ThreatDetailsDiffCallback(items.toList(), newItems))
+        items.clear()
+        items.addAll(newItems)
+
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    class ThreatDetailsDiffCallback(
+        private val oldList: List<JetpackListItemState>,
+        private val newList: List<JetpackListItemState>
+    ) : DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = oldList[oldItemPosition]
+            val newItem = newList[newItemPosition]
+            if (oldItem::class != newItem::class) {
+                return false
+            }
+            return oldItem.longId() == newItem.longId()
+        }
+
+        override fun getOldListSize() = oldList.size
+
+        override fun getNewListSize() = newList.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldList[oldItemPosition] == newList[newItemPosition]
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt
new file mode 100644
index 000000000000..50ec25422eaa
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLineViewHolder.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders
+
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.ForegroundColorSpan
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.RecyclerView
+import org.wordpress.android.R
+import org.wordpress.android.databinding.ThreatContextLinesListContextLineItemBinding
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatContextLinesItemState.ThreatContextLineItemState
+import org.wordpress.android.ui.utils.PaddingBackgroundColorSpan
+import org.wordpress.android.util.viewBinding
+
+class ThreatContextLineViewHolder(
+    parent: ViewGroup,
+    val binding: ThreatContextLinesListContextLineItemBinding = parent.viewBinding(
+            ThreatContextLinesListContextLineItemBinding::inflate
+    )
+) : RecyclerView.ViewHolder(binding.root) {
+    private val highlightedContentTextPadding = itemView.context.resources.getDimensionPixelSize(R.dimen.margin_small)
+
+    fun onBind(itemState: ThreatContextLineItemState) {
+        updateLineNumber(itemState)
+        updateContent(itemState)
+    }
+
+    private fun updateLineNumber(itemState: ThreatContextLineItemState) {
+        with(binding.lineNumber) {
+            setBackgroundColor(ContextCompat.getColor(itemView.context, itemState.lineNumberBackgroundColorRes))
+            text = itemState.line.lineNumber.toString()
+        }
+    }
+
+    private fun updateContent(itemState: ThreatContextLineItemState) {
+        with(binding.content) {
+            setBackgroundColor(ContextCompat.getColor(itemView.context, itemState.contentBackgroundColorRes))
+            text = getHighlightedContentText(itemState)
+            // Fixes highlighted background clip by the bounds of the TextView
+            setShadowLayer(highlightedContentTextPadding.toFloat(), 0f, 0f, 0)
+        }
+    }
+
+    private fun getHighlightedContentText(itemState: ThreatContextLineItemState): SpannableString {
+        val spannableText: SpannableString
+
+        with(itemState) {
+            spannableText = SpannableString(line.contents)
+
+            line.highlights?.map {
+                val (startIndex, lastIndex) = it
+                val context = itemView.context
+
+                val foregroundSpan = ForegroundColorSpan(ContextCompat.getColor(context, highlightedTextColorRes))
+                val backgroundSpan = PaddingBackgroundColorSpan(
+                        backgroundColor = ContextCompat.getColor(context, highlightedBackgroundColorRes),
+                        padding = highlightedContentTextPadding
+                )
+
+                with(spannableText) {
+                    setSpan(foregroundSpan, startIndex, lastIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                    setSpan(backgroundSpan, startIndex, lastIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                }
+            }
+        }
+
+        return spannableText
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLinesViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLinesViewHolder.kt
new file mode 100644
index 000000000000..95347eb92297
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatContextLinesViewHolder.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ThreatDetailsListContextLinesItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatContextLinesItemState
+import org.wordpress.android.ui.jetpack.scan.details.adapters.ThreatContextLinesAdapter
+
+class ThreatContextLinesViewHolder(parent: ViewGroup) : JetpackViewHolder<ThreatDetailsListContextLinesItemBinding>(
+        parent,
+        ThreatDetailsListContextLinesItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val contextLinesItemState = itemUiState as ThreatContextLinesItemState
+        if (recyclerView.adapter == null) {
+            recyclerView.adapter = ThreatContextLinesAdapter()
+        }
+        (recyclerView.adapter as ThreatContextLinesAdapter).update(contextLinesItemState.lines)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatDetailHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatDetailHeaderViewHolder.kt
new file mode 100644
index 000000000000..aad227c94954
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatDetailHeaderViewHolder.kt
@@ -0,0 +1,26 @@
+package org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ThreatDetailsListHeaderBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatDetailHeaderState
+import org.wordpress.android.ui.utils.UiHelpers
+
+class ThreatDetailHeaderViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<ThreatDetailsListHeaderBinding>(
+        parent,
+        ThreatDetailsListHeaderBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) = with(binding) {
+        val state = itemUiState as ThreatDetailHeaderState
+        with(uiHelpers) {
+            setTextOrHide(header, state.header)
+            setTextOrHide(description, state.description)
+        }
+        icon.setImageResource(state.icon)
+        icon.setBackgroundResource(itemUiState.iconBackground)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatFileNameViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatFileNameViewHolder.kt
new file mode 100644
index 000000000000..000e3a8e45a6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/adapters/viewholders/ThreatFileNameViewHolder.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.jetpack.scan.details.adapters.viewholders
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.ThreatDetailsListFileNameItemBinding
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.viewholders.JetpackViewHolder
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatFileNameState
+import org.wordpress.android.ui.utils.UiHelpers
+
+class ThreatFileNameViewHolder(
+    private val uiHelpers: UiHelpers,
+    parent: ViewGroup
+) : JetpackViewHolder<ThreatDetailsListFileNameItemBinding>(
+        parent,
+        ThreatDetailsListFileNameItemBinding::inflate
+) {
+    override fun onBind(itemUiState: JetpackListItemState) {
+        val threatFileNameState = itemUiState as ThreatFileNameState
+        binding.fileName.text = uiHelpers.getTextOfUiString(itemView.context, threatFileNameState.fileName)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/usecases/GetThreatModelUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/usecases/GetThreatModelUseCase.kt
new file mode 100644
index 000000000000..e92e5d925009
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/usecases/GetThreatModelUseCase.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.ui.jetpack.scan.details.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.modules.IO_THREAD
+import javax.inject.Inject
+import javax.inject.Named
+
+class GetThreatModelUseCase @Inject constructor(
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
+    private val scanStore: ScanStore
+) {
+    suspend fun get(threatId: Long) = withContext(ioDispatcher) {
+        scanStore.getThreatModelByThreatId(threatId)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/usecases/IgnoreThreatUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/usecases/IgnoreThreatUseCase.kt
new file mode 100644
index 000000000000..3fd2b09aacf8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/details/usecases/IgnoreThreatUseCase.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.jetpack.scan.details.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatPayload
+import org.wordpress.android.modules.IO_THREAD
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState.Failure
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+
+class IgnoreThreatUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val scanStore: ScanStore,
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
+) {
+    suspend fun ignoreThreat(remoteSiteId: Long, threatId: Long) = withContext(ioDispatcher) {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            Failure.NetworkUnavailable
+        } else {
+            val result = scanStore.ignoreThreat(IgnoreThreatPayload(remoteSiteId, threatId))
+            if (result.isError) {
+                Failure.RemoteRequestFailure
+            } else {
+                Success
+            }
+        }
+    }
+
+    sealed class IgnoreThreatState {
+        object Success : IgnoreThreatState()
+        sealed class Failure : IgnoreThreatState() {
+            object NetworkUnavailable : Failure()
+            object RemoteRequestFailure : Failure()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryActivity.kt
new file mode 100644
index 000000000000..c77ac476b6f4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryActivity.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import org.wordpress.android.R
+
+class ScanHistoryActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContentView(R.layout.scan_history_activity)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryFragment.kt
new file mode 100644
index 000000000000..01d752fbf7bc
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryFragment.kt
@@ -0,0 +1,146 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import android.os.Bundle
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
+import com.google.android.material.tabs.TabLayout.Tab
+import com.google.android.material.tabs.TabLayoutMediator
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.FullscreenErrorWithRetryBinding
+import org.wordpress.android.databinding.ScanHistoryFragmentBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ScrollableViewInitializedListener
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.TabUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.LocaleManagerWrapper
+import javax.inject.Inject
+
+class ScanHistoryFragment : Fragment(R.layout.scan_history_fragment), ScrollableViewInitializedListener {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var localeManagerWrapper: LocaleManagerWrapper
+    private lateinit var viewModel: ScanHistoryViewModel
+    private var binding: ScanHistoryFragmentBinding? = null
+
+    private val onTabSelectedListener = object : OnTabSelectedListener {
+        override fun onTabReselected(tab: Tab) {
+        }
+
+        override fun onTabUnselected(tab: Tab) {
+        }
+
+        override fun onTabSelected(tab: Tab) {
+            viewModel.onTabSelected(tab.position)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = ScanHistoryFragmentBinding.bind(view).apply {
+            initDagger()
+            initViewModel(getSite(savedInstanceState))
+            initToolbar()
+        }
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component()?.inject(this)
+    }
+
+    private fun ScanHistoryFragmentBinding.initViewModel(site: SiteModel) {
+        viewModel = ViewModelProvider(this@ScanHistoryFragment, viewModelFactory).get(ScanHistoryViewModel::class.java)
+        setupObservers()
+        viewModel.start(site)
+    }
+
+    private fun ScanHistoryFragmentBinding.setupObservers() {
+        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            uiHelpers.updateVisibility(tabLayout, uiState.contentVisible)
+            uiHelpers.updateVisibility(viewPager, uiState.contentVisible)
+            uiHelpers.updateVisibility(fullscreenErrorWithRetry.errorLayout, uiState.errorVisible)
+            when (uiState) {
+                is ContentUiState -> {
+                    updateTabs(uiState.tabs)
+                }
+                is ErrorUiState -> fullscreenErrorWithRetry.updateErrorLayout(uiState)
+            }
+        })
+    }
+
+    private fun FullscreenErrorWithRetryBinding.updateErrorLayout(uiState: ErrorUiState) {
+        uiHelpers.setTextOrHide(errorTitle, uiState.title)
+        uiHelpers.updateVisibility(errorImage, true)
+        errorImage.setImageResource(uiState.img)
+        errorRetry.setOnClickListener { uiState.retry.invoke() }
+    }
+
+    private fun ScanHistoryFragmentBinding.updateTabs(list: List<TabUiState>) {
+        val adapter = ScanHistoryTabAdapter(list, this@ScanHistoryFragment)
+        viewPager.adapter = adapter
+
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+            tab.text = uiHelpers.getTextOfUiString(requireContext(), list[position].label)
+                    .toString()
+                    .toUpperCase(localeManagerWrapper.getLocale())
+        }.attach()
+        tabLayout.addOnTabSelectedListener(onTabSelectedListener)
+    }
+
+    private fun ScanHistoryFragmentBinding.initToolbar() {
+        setHasOptionsMenu(true)
+        val activity = (requireActivity() as AppCompatActivity)
+        toolbarMain.title = getString(R.string.scan_history)
+        activity.setSupportActionBar(toolbarMain)
+        activity.supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+    }
+
+    private fun getSite(savedInstanceState: Bundle?): SiteModel {
+        return if (savedInstanceState == null) {
+            requireActivity().intent.getSerializableExtra(WordPress.SITE) as SiteModel
+        } else {
+            savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putSerializable(WordPress.SITE, viewModel.site)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            requireActivity().onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private class ScanHistoryTabAdapter(
+        private val items: List<TabUiState>,
+        parent: Fragment
+    ) : FragmentStateAdapter(parent) {
+        override fun getItemCount(): Int = items.count()
+
+        override fun createFragment(position: Int): Fragment = ScanHistoryListFragment.newInstance(items[position].type)
+    }
+
+    override fun onScrollableViewInitialized(viewId: Int) {
+        binding?.appbarMain?.liftOnScrollTargetViewId = viewId
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListFragment.kt
new file mode 100644
index 000000000000..104c85c9690d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListFragment.kt
@@ -0,0 +1,115 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ScanHistoryListFragmentBinding
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.ViewPagerFragment
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState
+import org.wordpress.android.ui.jetpack.scan.adapters.ScanAdapter
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel.ScanHistoryUiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel.ScanHistoryUiState.EmptyUiState.EmptyHistory
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
+import javax.inject.Inject
+
+class ScanHistoryListFragment : ViewPagerFragment(R.layout.scan_history_list_fragment) {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var uiHelpers: UiHelpers
+
+    private lateinit var viewModel: ScanHistoryListViewModel
+    private lateinit var parentViewModel: ScanHistoryViewModel
+
+    private var binding: ScanHistoryListFragmentBinding? = null
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = ScanHistoryListFragmentBinding.bind(view).apply {
+            initDagger()
+            initRecyclerView()
+            initViewModel(getSite(savedInstanceState), getTabType())
+        }
+    }
+
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    private fun initDagger() {
+        (requireActivity().application as WordPress).component()?.inject(this)
+    }
+
+    private fun ScanHistoryListFragmentBinding.initRecyclerView() {
+        recyclerView.adapter = ScanAdapter(imageManager, uiHelpers)
+        recyclerView.itemAnimator = null
+    }
+
+    private fun ScanHistoryListFragmentBinding.initViewModel(site: SiteModel, tabType: ScanHistoryTabType) {
+        viewModel = ViewModelProvider(
+                this@ScanHistoryListFragment,
+                viewModelFactory
+        ).get(ScanHistoryListViewModel::class.java)
+        parentViewModel = ViewModelProvider(parentFragment as ViewModelStoreOwner, viewModelFactory).get(
+                ScanHistoryViewModel::class.java
+        )
+        viewModel.start(tabType, site, parentViewModel)
+        setupObservers()
+    }
+
+    private fun ScanHistoryListFragmentBinding.setupObservers() {
+        viewModel.uiState.observe(viewLifecycleOwner, {
+            uiHelpers.updateVisibility(actionableEmptyView, it.emptyVisibility)
+            uiHelpers.updateVisibility(recyclerView, it.contentVisibility)
+            uiHelpers.updateVisibility(actionableEmptyView.button, false)
+            when (it) {
+                EmptyHistory -> { // no-op
+                }
+                is ContentUiState -> refreshContentScreen(it.items)
+            }
+        })
+        viewModel.navigation.observeEvent(viewLifecycleOwner, {
+            ActivityLauncher.viewThreatDetails(this@ScanHistoryListFragment, it.siteModel, it.threatId)
+        })
+    }
+
+    private fun ScanHistoryListFragmentBinding.refreshContentScreen(items: List<ScanListItemState>) {
+        ((recyclerView.adapter) as ScanAdapter).update(items)
+    }
+
+    private fun getSite(savedInstanceState: Bundle?): SiteModel {
+        return if (savedInstanceState == null) {
+            requireActivity().intent.getSerializableExtra(WordPress.SITE) as SiteModel
+        } else {
+            savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
+        }
+    }
+
+    private fun getTabType(): ScanHistoryTabType = requireNotNull(arguments?.getParcelable(ARG_TAB_TYPE))
+
+    override fun getScrollableViewForUniqueIdProvision(): View? = binding?.recyclerView
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putSerializable(WordPress.SITE, viewModel.site)
+        super.onSaveInstanceState(outState)
+    }
+
+    companion object {
+        private const val ARG_TAB_TYPE = "arg_tab_type"
+
+        fun newInstance(tabType: ScanHistoryTabType): ScanHistoryListFragment {
+            val newBundle = Bundle().apply {
+                putParcelable(ARG_TAB_TYPE, tabType)
+            }
+            return ScanHistoryListFragment().apply { arguments = newBundle }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListViewModel.kt
new file mode 100644
index 000000000000..95304eb6c5f2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListViewModel.kt
@@ -0,0 +1,122 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import androidx.annotation.DrawableRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.map
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatDateItemState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemLoadingSkeletonState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemState
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowThreatDetails
+import org.wordpress.android.ui.jetpack.scan.builders.ThreatItemBuilder
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel.ScanHistoryUiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel.ScanHistoryUiState.EmptyUiState.EmptyHistory
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.ALL
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.FIXED
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.IGNORED
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+private const val SKELETON_LOADING_ITEM_COUNT = 10
+
+class ScanHistoryListViewModel @Inject constructor(
+    private val scanThreatItemBuilder: ThreatItemBuilder,
+    private val scanTracker: ScanTracker,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+
+    private val _uiState = MediatorLiveData<ScanHistoryUiState>()
+    val uiState: LiveData<ScanHistoryUiState> = _uiState
+
+    private val _navigation = MutableLiveData<Event<ShowThreatDetails>>()
+    val navigation: LiveData<Event<ShowThreatDetails>> = _navigation
+
+    lateinit var site: SiteModel
+
+    fun start(tabType: ScanHistoryTabType, site: SiteModel, parentViewModel: ScanHistoryViewModel) {
+        if (isStarted) return
+        isStarted = true
+        this.site = site
+        showLoadingState()
+        _uiState.addSource(transformThreatsToUiState(parentViewModel, tabType)) { _uiState.value = it }
+    }
+
+    private fun showLoadingState() {
+        _uiState.value = ContentUiState((1..SKELETON_LOADING_ITEM_COUNT).map { ThreatItemLoadingSkeletonState })
+    }
+
+    private fun transformThreatsToUiState(
+        parentViewModel: ScanHistoryViewModel,
+        tabType: ScanHistoryTabType
+    ) = parentViewModel.threats
+            .map { threatList -> filterByTabType(threatList, tabType) }
+            .map { threatList -> mapToThreatUiStateList(threatList) }
+            .map { threatItemStateList -> addDateHeaders(threatItemStateList) }
+            .map { threatUiStateList ->
+                if (threatUiStateList.isEmpty()) {
+                    EmptyHistory
+                } else {
+                    ContentUiState(threatUiStateList)
+                }
+            }
+
+    private fun filterByTabType(threatList: List<ThreatModel>, tabType: ScanHistoryTabType) =
+            threatList.filter { mapTabTypeToThreatStatuses(tabType).contains(it.baseThreatModel.status) }
+
+    private fun mapToThreatUiStateList(threatList: List<ThreatModel>) =
+            threatList.map { model ->
+                scanThreatItemBuilder.buildThreatItem(model, this::onItemClicked)
+            }
+
+    private fun addDateHeaders(threatItemList: List<ThreatItemState>) =
+            threatItemList.groupBy { threatItem -> threatItem.firstDetectedDate }
+                    .flatMap { entry ->
+                        val uiStateList = mutableListOf<ScanListItemState>()
+                        uiStateList.add(ThreatDateItemState(entry.key))
+                        uiStateList.addAll(entry.value)
+                        uiStateList
+                    }
+
+    private fun onItemClicked(threatId: Long) {
+        launch {
+            scanTracker.trackOnThreatItemClicked(threatId, ScanTracker.OnThreatItemClickSource.HISTORY)
+            _navigation.value = Event(ShowThreatDetails(site, threatId))
+        }
+    }
+
+    private fun mapTabTypeToThreatStatuses(tabType: ScanHistoryTabType): List<ThreatStatus> =
+            when (tabType) {
+                ALL -> listOf(ThreatStatus.FIXED, ThreatStatus.IGNORED)
+                FIXED -> listOf(ThreatStatus.FIXED)
+                IGNORED -> listOf(ThreatStatus.IGNORED)
+            }
+
+    sealed class ScanHistoryUiState(
+        open val emptyVisibility: Boolean = false,
+        open val contentVisibility: Boolean = false
+    ) {
+        sealed class EmptyUiState : ScanHistoryUiState(emptyVisibility = true) {
+            object EmptyHistory : EmptyUiState() {
+                val label: UiString = UiStringRes(R.string.scan_history_no_threats_found)
+                @DrawableRes val img: Int = R.drawable.img_illustration_empty_results_216dp
+            }
+        }
+
+        data class ContentUiState(val items: List<ScanListItemState>) : ScanHistoryUiState(contentVisibility = true)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModel.kt
new file mode 100644
index 000000000000..e22ed328749c
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModel.kt
@@ -0,0 +1,109 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import android.os.Parcelable
+import androidx.annotation.DrawableRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.android.parcel.Parcelize
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.ALL
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.FIXED
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.IGNORED
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ErrorUiState.NoConnection
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ErrorUiState.RequestFailed
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase.FetchScanHistoryState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase.FetchScanHistoryState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase.FetchScanHistoryState.Success
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+private const val RETRY_DELAY = 300L
+
+class ScanHistoryViewModel @Inject constructor(
+    private val scanTracker: ScanTracker,
+    private val fetchScanHistoryUseCase: FetchScanHistoryUseCase,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+
+    private val _threats = MutableLiveData<List<ThreatModel>>()
+    val threats: LiveData<List<ThreatModel>> = _threats
+
+    private val _uiState = MutableLiveData<UiState>()
+    val uiState: LiveData<UiState> = _uiState
+
+    lateinit var site: SiteModel
+
+    fun start(site: SiteModel) {
+        if (isStarted) return
+        isStarted = true
+        this.site = site
+        fetchScanHistory()
+    }
+
+    private fun fetchScanHistory(isRetry: Boolean = false) {
+        launch {
+            _uiState.value = ContentUiState
+            if (isRetry) {
+                delay(RETRY_DELAY)
+            }
+            when (val result = fetchScanHistoryUseCase.fetch(site)) {
+                is Success -> _threats.postValue(result.threatModels)
+                is NetworkUnavailable -> _uiState.value = NoConnection(this@ScanHistoryViewModel::onRetryClicked)
+                is RemoteRequestFailure -> _uiState.value = RequestFailed(this@ScanHistoryViewModel::onRetryClicked)
+            }
+        }
+    }
+
+    private fun onRetryClicked() {
+        fetchScanHistory(true)
+    }
+
+    fun onTabSelected(position: Int) {
+        scanTracker.trackOnScanHistoryTabSelected(ContentUiState.tabs[position].type)
+    }
+
+    data class TabUiState(val label: UiString, val type: ScanHistoryTabType)
+
+    sealed class UiState(val contentVisible: Boolean = false, val errorVisible: Boolean = false) {
+        object ContentUiState : UiState(contentVisible = true) {
+            val tabs = listOf(
+                    TabUiState(UiStringRes(R.string.scan_history_all_threats_tab), ALL),
+                    TabUiState(UiStringRes(R.string.scan_history_fixed_threats_tab), FIXED),
+                    TabUiState(UiStringRes(R.string.scan_history_ignored_threats_tab), IGNORED)
+            )
+        }
+
+        sealed class ErrorUiState : UiState(errorVisible = true) {
+            abstract val title: UiString
+            abstract val img: Int
+            abstract val retry: () -> Unit
+
+            data class NoConnection(override val retry: () -> Unit) : ErrorUiState() {
+                override val title: UiString = UiStringRes(R.string.scan_history_no_connection)
+                @DrawableRes override val img: Int = R.drawable.img_illustration_cloud_off_152dp
+            }
+
+            data class RequestFailed(override val retry: () -> Unit) : ErrorUiState() {
+                override val title: UiString = UiStringRes(R.string.scan_history_request_failed)
+                @DrawableRes override val img: Int = R.drawable.img_illustration_cloud_off_152dp
+            }
+        }
+    }
+
+    @Parcelize
+    enum class ScanHistoryTabType : Parcelable {
+        ALL, FIXED, IGNORED
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchFixThreatsStatusUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchFixThreatsStatusUseCase.kt
new file mode 100644
index 000000000000..b5f4038a98a5
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchFixThreatsStatusUseCase.kt
@@ -0,0 +1,92 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel.FixStatus
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FetchFixThreatsStatusPayload
+import org.wordpress.android.modules.IO_THREAD
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.Complete
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.InProgress
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.NotStarted
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+
+const val FETCH_FIX_THREATS_STATUS_DELAY_MILLIS = 5000L
+
+class FetchFixThreatsStatusUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val scanStore: ScanStore,
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
+) {
+    suspend fun fetchFixThreatsStatus(
+        remoteSiteId: Long,
+        fixableThreatIds: List<Long>
+    ): Flow<FetchFixThreatsState> = flow {
+        while (true) {
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                emit(Failure.NetworkUnavailable)
+                return@flow
+            }
+
+            val result = scanStore.fetchFixThreatsStatus(FetchFixThreatsStatusPayload(remoteSiteId, fixableThreatIds))
+            if (result.isError) {
+                emit(Failure.RemoteRequestFailure)
+                return@flow
+            } else {
+                val fixState = mapToFixState(result.fixThreatStatusModels, fixableThreatIds)
+                emit(fixState)
+                if (fixState is InProgress) {
+                    delay(FETCH_FIX_THREATS_STATUS_DELAY_MILLIS)
+                } else {
+                    return@flow
+                }
+            }
+        }
+    }.flowOn(ioDispatcher)
+
+    private fun mapToFixState(models: List<FixThreatStatusModel>, fixableThreatIds: List<Long>): FetchFixThreatsState {
+        val isFixingNotStarted = models.filter { it.status == FixStatus.NOT_STARTED }.size == fixableThreatIds.size
+        val fixingThreatIds = models.filter { it.status == FixStatus.IN_PROGRESS }.map { it.id }
+        val isFixing = fixingThreatIds.isNotEmpty()
+        val isFixingComplete = models.filter { it.status == FixStatus.FIXED }.size == fixableThreatIds.size
+        val errors = models.filter { it.error != null || it.status == FixStatus.NOT_FIXED }
+        // When NOT_FIXED is returned for all threats, the .com account might be missing server credentials
+        val mightBeMissingCredentials = models.filter { it.status == FixStatus.NOT_FIXED }.size == fixableThreatIds.size
+
+        return when {
+            isFixingNotStarted -> NotStarted
+            isFixing -> InProgress(fixingThreatIds)
+            isFixingComplete -> Complete(fixableThreatIds.size)
+            else -> {
+                if (errors.isNotEmpty()) AppLog.e(T.JETPACK_SCAN, models.filter { it.error != null }.toString())
+                Failure.FixFailure(
+                        containsOnlyErrors = errors.size == fixableThreatIds.size,
+                        mightBeMissingCredentials = mightBeMissingCredentials
+                )
+            }
+        }
+    }
+
+    sealed class FetchFixThreatsState {
+        object NotStarted : FetchFixThreatsState()
+        data class InProgress(val threatIds: List<Long>) : FetchFixThreatsState()
+        data class Complete(val fixedThreatsCount: Int) : FetchFixThreatsState()
+        sealed class Failure : FetchFixThreatsState() {
+            object NetworkUnavailable : Failure()
+            object RemoteRequestFailure : Failure()
+            data class FixFailure(
+                val containsOnlyErrors: Boolean,
+                val mightBeMissingCredentials: Boolean
+            ) : Failure()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanHistoryUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanHistoryUseCase.kt
new file mode 100644
index 000000000000..727a32936318
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanHistoryUseCase.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanHistoryPayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.analytics.ScanTracker
+import javax.inject.Inject
+import javax.inject.Named
+
+class FetchScanHistoryUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val scanStore: ScanStore,
+    private val scanTracker: ScanTracker,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    suspend fun fetch(
+        site: SiteModel
+    ): FetchScanHistoryState {
+        return if (!networkUtilsWrapper.isNetworkAvailable()) {
+            scanTracker.trackOnError(ScanTracker.ErrorAction.FETCH_SCAN_HISTORY, ScanTracker.ErrorCause.OFFLINE)
+            FetchScanHistoryState.Failure.NetworkUnavailable
+        } else {
+            val result = scanStore.fetchScanHistory(FetchScanHistoryPayload(site))
+            if (result.isError) {
+                scanTracker.trackOnError(ScanTracker.ErrorAction.FETCH_SCAN_HISTORY, ScanTracker.ErrorCause.REMOTE)
+                FetchScanHistoryState.Failure.RemoteRequestFailure
+            } else {
+                withContext(bgDispatcher) {
+                    FetchScanHistoryState.Success(scanStore.getScanHistoryForSite(site))
+                }
+            }
+        }
+    }
+
+    sealed class FetchScanHistoryState {
+        data class Success(val threatModels: List<ThreatModel>) : FetchScanHistoryState()
+        sealed class Failure : FetchScanHistoryState() {
+            object NetworkUnavailable : Failure()
+            object RemoteRequestFailure : Failure()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanStateUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanStateUseCase.kt
new file mode 100644
index 000000000000..5f49fcdb6251
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanStateUseCase.kt
@@ -0,0 +1,92 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanStatePayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.jetpack.restore.usecases.DELAY_FACTOR
+import org.wordpress.android.ui.jetpack.restore.usecases.DELAY_MILLIS
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState.Success
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.math.max
+
+const val FETCH_SCAN_STATE_DELAY_MILLIS = 1000L
+const val MAX_RETRY = 3
+
+class FetchScanStateUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val scanStore: ScanStore,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val tag = javaClass.simpleName
+
+    @Suppress("ComplexMethod", "LoopWithTooManyJumpStatements")
+    suspend fun fetchScanState(
+        site: SiteModel,
+        startWithDelay: Boolean = false
+    ): Flow<FetchScanState> = flow {
+        var retryAttempts = 0
+        if (startWithDelay) {
+            delay(FETCH_SCAN_STATE_DELAY_MILLIS)
+        }
+
+        while (true) {
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, Failure.NetworkUnavailable)
+                if (retryAttemptsExceeded) break else continue
+            }
+
+            val result = scanStore.fetchScanState(FetchScanStatePayload(site))
+            if (result.isError) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, Failure.RemoteRequestFailure)
+                if (retryAttemptsExceeded) break else continue
+            }
+            val scanStateModel = scanStore.getScanStateForSite(site)
+            if (scanStateModel == null) {
+                val retryAttemptsExceeded = handleError(retryAttempts++, Failure.RemoteRequestFailure)
+                if (retryAttemptsExceeded) break else continue
+            }
+            emit(Success(scanStateModel))
+
+            if (scanStateModel.state != ScanStateModel.State.SCANNING) {
+                return@flow
+            }
+            retryAttempts = 0
+            delay(FETCH_SCAN_STATE_DELAY_MILLIS)
+        }
+    }.flowOn(bgDispatcher)
+
+    private suspend fun FlowCollector<FetchScanState>.handleError(
+        retryAttempts: Int,
+        failure: Failure
+    ): Boolean {
+        return if (retryAttempts >= MAX_RETRY) {
+            AppLog.d(T.JETPACK_BACKUP, "$tag: Exceeded $MAX_RETRY retries while fetching status")
+            emit(failure)
+            true
+        } else {
+            delay(DELAY_MILLIS * (max(1, DELAY_FACTOR * retryAttempts)))
+            false
+        }
+    }
+
+    sealed class FetchScanState {
+        data class Success(val scanStateModel: ScanStateModel) : FetchScanState()
+        sealed class Failure : FetchScanState() {
+            object NetworkUnavailable : Failure()
+            object RemoteRequestFailure : Failure()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FixThreatsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FixThreatsUseCase.kt
new file mode 100644
index 000000000000..ba7360f72170
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/FixThreatsUseCase.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsPayload
+import org.wordpress.android.modules.IO_THREAD
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+
+class FixThreatsUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val scanStore: ScanStore,
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
+) {
+    suspend fun fixThreats(remoteSiteId: Long, fixableThreatIds: List<Long>) = withContext(ioDispatcher) {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            Failure.NetworkUnavailable
+        } else {
+            val result = scanStore.fixThreats(FixThreatsPayload(remoteSiteId, fixableThreatIds))
+            if (result.isError) {
+                Failure.RemoteRequestFailure
+            } else {
+                Success
+            }
+        }
+    }
+
+    sealed class FixThreatsState {
+        object Success : FixThreatsState()
+        sealed class Failure : FixThreatsState() {
+            object NetworkUnavailable : Failure()
+            object RemoteRequestFailure : Failure()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/StartScanUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/StartScanUseCase.kt
new file mode 100644
index 000000000000..0d0fd3bc640d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/scan/usecases/StartScanUseCase.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.fluxc.action.ScanAction.START_SCAN
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State.SCANNING
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartPayload
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState.ScanningStateUpdatedInDb
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+
+class StartScanUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val scanStore: ScanStore,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    suspend fun startScan(site: SiteModel) = flow {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            emit(Failure.NetworkUnavailable)
+            return@flow
+        } else {
+            /** Update scanning state in Db to start scan optimistically */
+            updateScanScanningStateInDb(site)
+
+            val result = scanStore.startScan(ScanStartPayload(site))
+            if (result.isError) {
+                emit(Failure.RemoteRequestFailure)
+                return@flow
+            } else {
+                emit(Success)
+                return@flow
+            }
+        }
+    }.flowOn(bgDispatcher)
+
+    private suspend fun FlowCollector<StartScanState>.updateScanScanningStateInDb(site: SiteModel) {
+        val model = scanStore.getScanStateForSite(site)?.copy(state = SCANNING) ?: ScanStateModel(state = SCANNING)
+        scanStore.addOrUpdateScanStateModelForSite(START_SCAN, site, model)
+        emit(ScanningStateUpdatedInDb(model))
+    }
+
+    sealed class StartScanState {
+        data class ScanningStateUpdatedInDb(val model: ScanStateModel) : StartScanState()
+        object Success : StartScanState()
+        sealed class Failure : StartScanState() {
+            object NetworkUnavailable : Failure()
+            object RemoteRequestFailure : Failure()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/jetpack/usecases/GetActivityLogItemUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/usecases/GetActivityLogItemUseCase.kt
new file mode 100644
index 000000000000..ee9589a0c06e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/jetpack/usecases/GetActivityLogItemUseCase.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.jetpack.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.modules.IO_THREAD
+import javax.inject.Inject
+import javax.inject.Named
+
+class GetActivityLogItemUseCase @Inject constructor(
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
+    private val activityLogStore: ActivityLogStore
+) {
+    suspend fun get(
+        activityId: String
+    ): ActivityLogModel? =
+            withContext(ioDispatcher) {
+                activityLogStore.getActivityLogItemByActivityId(activityId)
+            }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ButtonsUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ButtonsUiState.kt
similarity index 83%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/ButtonsUiState.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ButtonsUiState.kt
index 422096058944..9ed8387a317e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ButtonsUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ButtonsUiState.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 /**
  * The buttons visibility state
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoriesAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoriesAdapter.kt
similarity index 94%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoriesAdapter.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoriesAdapter.kt
index f6d823e1e567..1c1d8c9babb2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoriesAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoriesAdapter.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoriesDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoriesDiffCallback.kt
similarity index 94%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoriesDiffCallback.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoriesDiffCallback.kt
index 0e51a63683be..1fae53112181 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoriesDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoriesDiffCallback.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import androidx.recyclerview.widget.DiffUtil.Callback
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoryListItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoryListItemUiState.kt
similarity index 94%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoryListItemUiState.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoryListItemUiState.kt
index 90c869ed1a09..1e655a193bab 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoryListItemUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoryListItemUiState.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import org.wordpress.android.R
 import org.wordpress.android.R.attr
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoryViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoryViewHolder.kt
similarity index 97%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoryViewHolder.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoryViewHolder.kt
index 3ccd299e6400..962a879b029c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/CategoryViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/CategoryViewHolder.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import android.view.LayoutInflater
 import android.view.View
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
similarity index 95%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryAdapter.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
index 7104a730a20a..f9c474b8e476 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryAdapter.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt
similarity index 95%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryDiffCallback.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt
index af46a2a3f5d8..ec4fd12cab99 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryDiffCallback.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import androidx.recyclerview.widget.DiffUtil.Callback
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
new file mode 100644
index 000000000000..801c2ca35229
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryModel.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.ui.layoutpicker
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
+
+@Parcelize
+class LayoutCategoryModel(
+    private val starterDesignCategory: StarterDesignCategory? = null,
+    private val blockLayoutCategory: GutenbergLayoutCategory? = null
+) : Parcelable {
+    val slug: String
+        get() = starterDesignCategory?.slug ?: blockLayoutCategory?.slug ?: ""
+    val title: String
+        get() = starterDesignCategory?.title ?: blockLayoutCategory?.title ?: ""
+    val description: String
+        get() = starterDesignCategory?.description ?: blockLayoutCategory?.description ?: ""
+    val emoji: String
+        get() = starterDesignCategory?.emoji ?: blockLayoutCategory?.emoji ?: ""
+}
+
+@JvmName("starterDesignToLayoutCategories")
+fun List<StarterDesignCategory>.toLayoutCategories() = map { LayoutCategoryModel(starterDesignCategory = it) }
+
+@JvmName("gutenbergLayoutToLayoutCategories")
+fun List<GutenbergLayoutCategory>.toLayoutCategories() = map { LayoutCategoryModel(blockLayoutCategory = it) }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt
similarity index 88%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryUiState.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt
index fc2190d83d1e..33ba6f20171e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutCategoryUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutCategoryUiState.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 /**
  * The layout category row list item
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutListItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
similarity index 91%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutListItemUiState.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
index 16d9580763d5..f775acdc946f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutListItemUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutListItemUiState.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import org.wordpress.android.R
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutModel.kt
new file mode 100644
index 000000000000..672df8918b7d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutModel.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.ui.layoutpicker
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
+
+@Parcelize
+data class LayoutModel(
+    val slug: String,
+    val title: String,
+    val preview: String,
+    val previewTablet: String,
+    val previewMobile: String,
+    val demoUrl: String,
+    val categories: List<LayoutCategoryModel>
+) : Parcelable {
+    constructor(starterDesign: StarterDesign) : this(
+            starterDesign.slug,
+            starterDesign.title,
+            starterDesign.preview,
+            starterDesign.previewTablet,
+            starterDesign.previewMobile,
+            starterDesign.demoUrl,
+            starterDesign.categories.toLayoutCategories()
+    )
+
+    constructor(blockLayout: GutenbergLayout) : this(
+            blockLayout.slug,
+            blockLayout.title,
+            blockLayout.preview,
+            blockLayout.previewTablet,
+            blockLayout.previewMobile,
+            blockLayout.demoUrl,
+            blockLayout.categories.toLayoutCategories()
+    )
+}
+
+@JvmName("designToLayoutModel") fun List<StarterDesign>.toLayoutModels() = map { LayoutModel(starterDesign = it) }
+
+@JvmName("blockLayoutToLayoutModel") fun List<GutenbergLayout>.toLayoutModels() = map { LayoutModel(blockLayout = it) }
+
+fun List<LayoutModel>.getFilteredLayouts(categorySlug: String) =
+        filter { l -> l.categories.any { c -> c.slug == categorySlug } }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
new file mode 100644
index 000000000000..dde4ded7b34f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerTracker.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.ui.layoutpicker
+
+interface LayoutPickerTracker {
+    fun trackPreviewModeChanged(mode: String)
+
+    fun trackThumbnailModeTapped(mode: String)
+
+    fun trackPreviewModeTapped(mode: String)
+
+    fun trackPreviewLoading(template: String, mode: String)
+
+    fun trackPreviewLoaded(template: String, mode: String)
+
+    fun trackPreviewViewed(template: String, mode: String)
+
+    fun trackNoNetworkErrorShown(message: String)
+
+    fun trackErrorShown(message: String)
+
+    fun filterSelected(filter: String, selectedFilters: List<String>)
+
+    fun filterDeselected(filter: String, selectedFilters: List<String>)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt
new file mode 100644
index 000000000000..44f2dbb00651
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerUiState.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.ui.layoutpicker
+
+import androidx.annotation.StringRes
+
+sealed class LayoutPickerUiState(
+    open val isHeaderVisible: Boolean = false,
+    open val isToolbarVisible: Boolean = false,
+    val isDescriptionVisible: Boolean = true,
+    val loadingSkeletonVisible: Boolean = false,
+    val errorViewVisible: Boolean = false,
+    open val buttonsUiState: ButtonsUiState = ButtonsUiState()
+) {
+    object Loading : LayoutPickerUiState(loadingSkeletonVisible = true)
+
+    data class Content(
+        override val isHeaderVisible: Boolean = false,
+        override val isToolbarVisible: Boolean = false,
+        val selectedCategoriesSlugs: ArrayList<String> = arrayListOf(),
+        val selectedLayoutSlug: String? = null,
+        val loadedThumbnailSlugs: ArrayList<String> = arrayListOf(),
+        val categories: List<CategoryListItemUiState> = listOf(),
+        val layoutCategories: List<LayoutCategoryUiState> = listOf(),
+        override val buttonsUiState: ButtonsUiState = ButtonsUiState()
+    ) : LayoutPickerUiState()
+
+    class Error(
+        @StringRes val title: Int? = null,
+        @StringRes val subtitle: Int? = null,
+        @StringRes val toast: Int? = null
+    ) : LayoutPickerUiState(
+            errorViewVisible = true,
+            isHeaderVisible = true,
+            isDescriptionVisible = false,
+            buttonsUiState = ButtonsUiState(retryVisible = true)
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
new file mode 100644
index 000000000000..4dd322f53799
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPickerViewModel.kt
@@ -0,0 +1,332 @@
+package org.wordpress.android.ui.layoutpicker
+
+import android.os.Bundle
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.R
+import org.wordpress.android.R.string
+import org.wordpress.android.ui.PreviewMode
+import org.wordpress.android.ui.PreviewMode.MOBILE
+import org.wordpress.android.ui.PreviewMode.TABLET
+import org.wordpress.android.ui.PreviewMode.valueOf
+import org.wordpress.android.ui.PreviewModeHandler
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import org.wordpress.android.viewmodel.SingleLiveEvent
+
+private const val FETCHED_LAYOUTS = "FETCHED_LAYOUTS"
+private const val FETCHED_CATEGORIES = "FETCHED_CATEGORIES"
+private const val SELECTED_LAYOUT = "SELECTED_LAYOUT"
+private const val SELECTED_CATEGORIES = "SELECTED_CATEGORIES"
+private const val PREVIEW_MODE = "PREVIEW_MODE"
+
+abstract class LayoutPickerViewModel(
+    open val mainDispatcher: CoroutineDispatcher,
+    open val bgDispatcher: CoroutineDispatcher,
+    open val networkUtils: NetworkUtilsWrapper,
+    private val layoutPickerTracker: LayoutPickerTracker
+) : ScopedViewModel(bgDispatcher), PreviewModeHandler {
+    lateinit var layouts: List<LayoutModel>
+    lateinit var categories: List<LayoutCategoryModel>
+
+    private val _uiState: MutableLiveData<LayoutPickerUiState> = MutableLiveData()
+    val uiState: LiveData<LayoutPickerUiState> = _uiState
+
+    private val _previewMode = SingleLiveEvent<PreviewMode>()
+    val previewMode: LiveData<PreviewMode> = _previewMode
+
+    private val _previewState: MutableLiveData<PreviewUiState> = MutableLiveData()
+    val previewState: LiveData<PreviewUiState> = _previewState
+
+    private val _onPreviewModeButtonPressed = SingleLiveEvent<Unit>()
+    val onPreviewModeButtonPressed: LiveData<Unit> = _onPreviewModeButtonPressed
+
+    private val _onPreviewActionPressed = SingleLiveEvent<DesignPreviewAction>()
+    val onPreviewActionPressed: LiveData<DesignPreviewAction> = _onPreviewActionPressed
+
+    private val _onCategorySelectionChanged = MutableLiveData<Event<Unit>>()
+    val onCategorySelectionChanged: LiveData<Event<Unit>> = _onCategorySelectionChanged
+
+    private val _onThumbnailModeButtonPressed = SingleLiveEvent<Unit>()
+    val onThumbnailModeButtonPressed: LiveData<Unit> = _onThumbnailModeButtonPressed
+
+    val isLoading: Boolean
+        get() = _uiState.value === LayoutPickerUiState.Loading
+
+    open val selectedLayout: LayoutModel?
+        get() = (uiState.value as? Content)?.let { state ->
+            layouts.firstOrNull { it.slug == state.selectedLayoutSlug }
+        }
+
+    abstract val useCachedData: Boolean
+
+    abstract fun fetchLayouts(preferCache: Boolean = false)
+
+    open fun onPreviewChooseTapped() = onDismissPreview()
+
+    fun handleResponse(layouts: List<LayoutModel>, categories: List<LayoutCategoryModel>) {
+        this.layouts = layouts
+        this.categories = categories
+        loadCategories()
+    }
+
+    fun initializePreviewMode(isTablet: Boolean) {
+        if (_previewMode.value == null) {
+            _previewMode.value = if (isTablet) TABLET else MOBILE
+        }
+    }
+
+    override fun selectedPreviewMode() = previewMode.value ?: MOBILE
+
+    override fun onPreviewModeChanged(mode: PreviewMode) {
+        if (_previewMode.value !== mode) {
+            layoutPickerTracker.trackPreviewModeChanged(mode.key)
+            _previewMode.value = mode
+            if (uiState.value is Content) {
+                loadLayouts()
+            }
+        }
+    }
+
+    fun updateUiState(uiState: LayoutPickerUiState) {
+        _uiState.value = uiState
+    }
+
+    /**
+     * Category tapped
+     * @param categorySlug the slug of the tapped category
+     */
+    fun onCategoryTapped(categorySlug: String) {
+        (uiState.value as? Content)?.let { state ->
+            if (state.selectedCategoriesSlugs.contains(categorySlug)) { // deselect
+                updateUiState(
+                        state.copy(selectedCategoriesSlugs = state.selectedCategoriesSlugs.apply {
+                            remove(categorySlug)
+                        })
+                )
+                layoutPickerTracker.filterDeselected(categorySlug, state.selectedCategoriesSlugs)
+            } else {
+                updateUiState(
+                        state.copy(selectedCategoriesSlugs = state.selectedCategoriesSlugs.apply { add(categorySlug) })
+                )
+                layoutPickerTracker.filterSelected(categorySlug, state.selectedCategoriesSlugs)
+            }
+            loadCategories()
+            _onCategorySelectionChanged.postValue(Event(Unit))
+        }
+    }
+
+    private fun loadCategories() {
+        val state = uiState.value as? Content ?: Content()
+        launch(bgDispatcher) {
+            val listItems: List<CategoryListItemUiState> = categories.map {
+                CategoryListItemUiState(
+                        it.slug,
+                        it.title,
+                        it.emoji,
+                        state.selectedCategoriesSlugs.contains(it.slug)
+                ) { onCategoryTapped(it.slug) }
+            }
+            withContext(mainDispatcher) {
+                updateUiState(state.copy(categories = listItems))
+            }
+            loadLayouts()
+        }
+    }
+
+    private fun loadLayouts() {
+        val state = uiState.value as? Content ?: Content()
+        launch(bgDispatcher) {
+            val listItems = ArrayList<LayoutCategoryUiState>()
+
+            val selectedCategories = if (state.selectedCategoriesSlugs.isNotEmpty()) {
+                categories.filter { state.selectedCategoriesSlugs.contains(it.slug) }
+            } else {
+                categories
+            }
+
+            selectedCategories.forEach { category ->
+
+                val layouts = layouts.getFilteredLayouts(category.slug).map { layout ->
+                    LayoutListItemUiState(
+                            slug = layout.slug,
+                            title = layout.title,
+                            preview = when (_previewMode.value) {
+                                MOBILE -> layout.previewMobile
+                                TABLET -> layout.previewTablet
+                                else -> layout.preview
+                            },
+                            selected = layout.slug == state.selectedLayoutSlug,
+                            onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
+                            onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
+                    )
+                }
+                listItems.add(
+                        LayoutCategoryUiState(
+                                category.slug,
+                                category.title,
+                                category.description,
+                                layouts
+                        )
+                )
+            }
+            withContext(mainDispatcher) {
+                updateUiState(state.copy(layoutCategories = listItems))
+            }
+        }
+    }
+
+    /**
+     * Layout tapped
+     * @param layoutSlug the slug of the tapped layout
+     */
+    fun onLayoutTapped(layoutSlug: String) {
+        (uiState.value as? Content)?.let { state ->
+            if (!state.loadedThumbnailSlugs.contains(layoutSlug)) return // No action
+            if (layoutSlug == state.selectedLayoutSlug) { // deselect
+                updateUiState(state.copy(selectedLayoutSlug = null, isToolbarVisible = false))
+            } else {
+                updateUiState(state.copy(selectedLayoutSlug = layoutSlug, isToolbarVisible = true))
+            }
+            updateButtonsUiState()
+            loadLayouts()
+        }
+    }
+
+    /**
+     * Layout thumbnail is ready
+     * @param layoutSlug the slug of the tapped layout
+     */
+    fun onThumbnailReady(layoutSlug: String) {
+        (uiState.value as? Content)?.let { state ->
+            updateUiState(state.copy(loadedThumbnailSlugs = state.loadedThumbnailSlugs.apply { add(layoutSlug) }))
+        }
+    }
+
+    /**
+     * Updates the buttons UiState
+     */
+    private fun updateButtonsUiState() {
+        (uiState.value as? Content)?.let { state ->
+            val selection = state.selectedLayoutSlug != null
+            updateUiState(state.copy(buttonsUiState = ButtonsUiState(!selection, selection, selection)))
+        }
+    }
+
+    fun onThumbnailModePressed() {
+        layoutPickerTracker.trackThumbnailModeTapped(selectedPreviewMode().key)
+        _onThumbnailModeButtonPressed.call()
+    }
+
+    /**
+     * Retries data fetching
+     */
+    fun onRetryClicked() = fetchLayouts()
+
+    fun onPreviewLoading() {
+        if (networkUtils.isNetworkAvailable()) {
+            selectedLayout?.let { layout ->
+                _previewState.value = PreviewUiState.Loading(layout.demoUrl)
+                layoutPickerTracker.trackPreviewLoading(layout.slug, selectedPreviewMode().key)
+            }
+        } else {
+            _previewState.value = PreviewUiState.Error(toast = R.string.hpp_retry_error)
+            layoutPickerTracker.trackNoNetworkErrorShown("Preview error")
+        }
+    }
+
+    fun onPreviewLoaded() {
+        selectedLayout?.let { layout ->
+            _previewState.value = PreviewUiState.Loaded
+            layoutPickerTracker.trackPreviewLoaded(layout.slug, selectedPreviewMode().key)
+        }
+    }
+
+    fun onPreviewError() {
+        _previewState.value = PreviewUiState.Error()
+        layoutPickerTracker.trackErrorShown("Preview error")
+    }
+
+    fun onPreviewModePressed() {
+        layoutPickerTracker.trackPreviewModeTapped(selectedPreviewMode().key)
+        _onPreviewModeButtonPressed.call()
+    }
+
+    fun onPreviewTapped() {
+        selectedLayout?.let { layout ->
+            val template = layout.slug
+            layoutPickerTracker.trackPreviewViewed(template, selectedPreviewMode().key)
+            _onPreviewActionPressed.value = DesignPreviewAction.Show(template, layout.demoUrl)
+            return
+        }
+        layoutPickerTracker.trackErrorShown("Error previewing design")
+        updateUiState(Error(toast = string.hpp_choose_error))
+    }
+
+    fun onDismissPreview() {
+        _onPreviewActionPressed.value = DesignPreviewAction.Dismiss
+    }
+
+    /**
+     * Appbar scrolled event used to set the header and title visibility
+     * @param verticalOffset the scroll state vertical offset
+     * @param scrollThreshold the scroll threshold
+     */
+    fun onAppBarOffsetChanged(verticalOffset: Int, scrollThreshold: Int) {
+        val headerShouldBeVisible = verticalOffset < scrollThreshold
+        (uiState.value as? Content)?.let { state ->
+            if (state.isHeaderVisible == headerShouldBeVisible) return // No change
+            updateUiState(state.copy(isHeaderVisible = headerShouldBeVisible))
+        }
+    }
+
+    fun loadSavedState(savedInstanceState: Bundle?) {
+        if (savedInstanceState == null) return
+        val layouts = savedInstanceState.getParcelableArrayList<LayoutModel>(FETCHED_LAYOUTS)
+        val categories = savedInstanceState.getParcelableArrayList<LayoutCategoryModel>(FETCHED_CATEGORIES)
+        val selected = savedInstanceState.getString(SELECTED_LAYOUT)
+        val selectedCategories = (savedInstanceState.getSerializable(SELECTED_CATEGORIES) as? List<*>)
+                ?.filterIsInstance<String>() ?: listOf()
+        val previewMode = savedInstanceState.getString(PREVIEW_MODE, MOBILE.name)
+        resetState(selected, ArrayList(selectedCategories.toMutableList()), previewMode)
+        if (layouts == null || categories == null || layouts.isEmpty()) {
+            fetchLayouts(preferCache = useCachedData)
+            return
+        }
+        handleResponse(layouts, categories)
+    }
+
+    private fun resetState(selected: String?, selectedCategories: ArrayList<String>, previewMode: String) {
+        val state = uiState.value as? Content ?: Content()
+        updateUiState(
+                state.copy(
+                        selectedLayoutSlug = selected,
+                        selectedCategoriesSlugs = selectedCategories
+                )
+        )
+        _previewMode.value = valueOf(previewMode)
+        updateButtonsUiState()
+    }
+
+    fun writeToBundle(outState: Bundle) {
+        (uiState.value as? Content)?.let {
+            if (!useCachedData) {
+                outState.putParcelableArrayList(FETCHED_LAYOUTS, ArrayList(layouts))
+                outState.putParcelableArrayList(FETCHED_CATEGORIES, ArrayList(categories))
+            }
+            outState.putString(SELECTED_LAYOUT, it.selectedLayoutSlug)
+            outState.putSerializable(SELECTED_CATEGORIES, it.selectedCategoriesSlugs)
+            outState.putString(PREVIEW_MODE, selectedPreviewMode().name)
+        }
+    }
+
+    sealed class DesignPreviewAction {
+        object Dismiss : DesignPreviewAction()
+        class Show(val template: String, val demoUrl: String) : DesignPreviewAction()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPreviewFragment.kt
new file mode 100644
index 000000000000..2246f44923b8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutPreviewFragment.kt
@@ -0,0 +1,141 @@
+package org.wordpress.android.ui.layoutpicker
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.os.Handler
+import android.view.Gravity.CENTER_HORIZONTAL
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.webkit.WebResourceError
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import android.widget.FrameLayout.LayoutParams
+import androidx.lifecycle.Observer
+import kotlinx.android.synthetic.main.layout_picker_preview_fragment.*
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.FullscreenBottomSheetDialogFragment
+import org.wordpress.android.ui.PreviewMode.DESKTOP
+import org.wordpress.android.ui.PreviewMode.MOBILE
+import org.wordpress.android.ui.PreviewMode.TABLET
+import org.wordpress.android.ui.PreviewModeSelectorPopup
+import org.wordpress.android.ui.layoutpicker.PreviewUiState.Error
+import org.wordpress.android.ui.layoutpicker.PreviewUiState.Loaded
+import org.wordpress.android.ui.layoutpicker.PreviewUiState.Loading
+import org.wordpress.android.util.AniUtils
+import org.wordpress.android.util.DisplayUtilsWrapper
+import org.wordpress.android.util.ToastUtils
+import org.wordpress.android.util.setVisible
+import org.wordpress.android.util.skip
+import javax.inject.Inject
+
+private const val INITIAL_SCALE = 90
+private const val JS_EVALUATION_DELAY = 250L
+
+abstract class LayoutPreviewFragment : FullscreenBottomSheetDialogFragment() {
+    @Inject lateinit var displayUtilsWrapper: DisplayUtilsWrapper
+    private lateinit var viewModel: LayoutPickerViewModel
+    private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? =
+            inflater.inflate(R.layout.layout_picker_preview_fragment, container)
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        webView.settings.javaScriptEnabled = true
+        webView.settings.useWideViewPort = true
+        webView.setInitialScale(INITIAL_SCALE)
+    }
+
+    fun setViewModel(viewModel: LayoutPickerViewModel) {
+        this.viewModel = viewModel
+
+        viewModel.previewState.observe(viewLifecycleOwner, Observer { state ->
+            when (state) {
+                is Loading -> {
+                    desktopPreviewHint.setVisible(false)
+                    progressBar.setVisible(true)
+                    webView.setVisible(false)
+                    errorView.setVisible(false)
+                    webView.loadUrl(state.url)
+                }
+                is Loaded -> {
+                    progressBar.setVisible(false)
+                    webView.setVisible(true)
+                    errorView.setVisible(false)
+                    desktopPreviewHint.setText(
+                            when (viewModel.selectedPreviewMode()) {
+                                MOBILE -> R.string.web_preview_mobile
+                                TABLET -> R.string.web_preview_tablet
+                                DESKTOP -> R.string.web_preview_desktop
+                            }
+                    )
+                    AniUtils.animateBottomBar(desktopPreviewHint, true)
+                }
+                is Error -> {
+                    progressBar.setVisible(false)
+                    webView.setVisible(false)
+                    errorView.setVisible(true)
+                    state.toast?.let { ToastUtils.showToast(requireContext(), it) }
+                }
+            }
+        })
+
+        // We're skipping the first emitted value since it derives from the view model initialization (`start` method)
+        viewModel.previewMode.skip(1).observe(viewLifecycleOwner, Observer { load() })
+
+        viewModel.onPreviewModeButtonPressed.observe(viewLifecycleOwner, Observer {
+            previewModeSelectorPopup.show(viewModel)
+        })
+
+        previewModeSelectorPopup = PreviewModeSelectorPopup(requireActivity(), previewTypeSelectorButton)
+
+        backButton.setOnClickListener { closeModal() }
+
+        chooseButton.setOnClickListener { viewModel.onPreviewChooseTapped() }
+
+        previewTypeSelectorButton.setOnClickListener { viewModel.onPreviewModePressed() }
+
+        webView.settings.userAgentString = WordPress.getUserAgent()
+        webView.webViewClient = object : WebViewClient() {
+            override fun onPageFinished(view: WebView?, url: String?) {
+                super.onPageFinished(view, url)
+                if (view == null) return
+                val width = viewModel.selectedPreviewMode().previewWidth
+                setWebViewWidth(view, width)
+                val widthScript = context?.getString(R.string.web_preview_width_script, width)
+                if (widthScript != null) {
+                    Handler().postDelayed({
+                        view.evaluateJavascript(widthScript) { viewModel.onPreviewLoaded() }
+                    }, JS_EVALUATION_DELAY)
+                }
+            }
+
+            override fun onReceivedError(view: WebView?, request: WebResourceRequest?, error: WebResourceError?) {
+                super.onReceivedError(view, request, error)
+                viewModel.onPreviewError()
+            }
+        }
+
+        errorView.button.setOnClickListener { load() }
+        load()
+    }
+
+    override fun closeModal() = viewModel.onDismissPreview()
+
+    private fun load() = viewModel.onPreviewLoading()
+
+    private fun setWebViewWidth(view: View, previewWidth: Int) {
+        if (!displayUtilsWrapper.isTablet()) return
+        view.layoutParams = if (viewModel.selectedPreviewMode() === MOBILE) {
+            val width = previewWidth * resources.displayMetrics.density.toInt()
+            LayoutParams(width, LayoutParams.MATCH_PARENT).apply { gravity = CENTER_HORIZONTAL }
+        } else {
+            LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
similarity index 74%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutViewHolder.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
index 4d6d7a338458..1e48ad4e36a1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutViewHolder.kt
@@ -1,17 +1,16 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.ImageView.ScaleType.FIT_CENTER
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.card.MaterialCardView
 import kotlinx.android.synthetic.main.modal_layout_picker_layouts_card.view.*
 import org.wordpress.android.R
+import org.wordpress.android.networking.MShot
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageManager.RequestListener
-import org.wordpress.android.util.image.ImageType
 import org.wordpress.android.util.setVisible
 
 /**
@@ -25,7 +24,7 @@ class LayoutViewHolder(internal val parent: ViewGroup) :
                         false
                 )
         ) {
-    private val container: View = itemView.layout_container
+    private val container: MaterialCardView = itemView.layout_container
     private val preview: ImageView = itemView.preview
     private val selected: ImageView = itemView.selected_overlay
 
@@ -33,7 +32,7 @@ class LayoutViewHolder(internal val parent: ViewGroup) :
         uiState: LayoutListItemUiState,
         imageManager: ImageManager
     ) {
-        imageManager.loadWithResultListener(preview, ImageType.THEME, uiState.preview, FIT_CENTER, null,
+        imageManager.loadWithResultListener(preview, MShot(uiState.preview),
                 object : RequestListener<Drawable> {
                     override fun onLoadFailed(e: Exception?, model: Any?) {
                     }
@@ -45,6 +44,13 @@ class LayoutViewHolder(internal val parent: ViewGroup) :
 
         selected.setVisible(uiState.selectedOverlayVisible)
         preview.contentDescription = parent.context.getString(uiState.contentDescriptionResId, uiState.title)
+        preview.context?.let { ctx ->
+            container.strokeWidth = if (uiState.selectedOverlayVisible) {
+                ctx.resources.getDimensionPixelSize(R.dimen.picker_header_selection_overlay_width)
+            } else {
+                0
+            }
+        }
         container.setOnClickListener {
             uiState.onItemTapped.invoke()
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt
similarity index 96%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsAdapter.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt
index 0fdcad1d68e7..b017dd0d35c9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsAdapter.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import android.content.Context
 import android.view.ViewGroup
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsDiffCallback.kt
similarity index 94%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsDiffCallback.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsDiffCallback.kt
index 56721d39cfc6..9ec13618835c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsDiffCallback.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import androidx.recyclerview.widget.DiffUtil.Callback
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
similarity index 96%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsItemViewHolder.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
index 4d12f324bdb4..f4cf95355c7b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/LayoutsItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/LayoutsItemViewHolder.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/PreviewUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/PreviewUiState.kt
new file mode 100644
index 000000000000..0bfee4d28ac6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/PreviewUiState.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.ui.layoutpicker
+
+import androidx.annotation.StringRes
+
+sealed class PreviewUiState {
+    class Loading(val url: String) : PreviewUiState()
+    object Loaded : PreviewUiState()
+    class Error(@StringRes val toast: Int? = null) : PreviewUiState()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ThumbDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
similarity index 70%
rename from WordPress/src/main/java/org/wordpress/android/ui/mlp/ThumbDimensionProvider.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
index 09ce26eb296e..09d257055200 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ThumbDimensionProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/layoutpicker/ThumbDimensionProvider.kt
@@ -1,4 +1,4 @@
-package org.wordpress.android.ui.mlp
+package org.wordpress.android.ui.layoutpicker
 
 import org.wordpress.android.R
 import org.wordpress.android.viewmodel.ContextProvider
@@ -8,5 +8,8 @@ class ThumbDimensionProvider @Inject constructor(private val contextProvider: Co
     val previewWidth: Int
         get() = contextProvider.getContext().resources.getDimensionPixelSize(R.dimen.mlp_layout_card_width)
 
+    val previewHeight: Int
+        get() = contextProvider.getContext().resources.getDimensionPixelSize(R.dimen.mlp_layout_card_height)
+
     val scale: Double = 1.0 // Passing 1.0 and the rendered pixels per device in previewWidth
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MainBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MainBottomSheetFragment.kt
index 5d7f6862ea84..95d9c9549e2b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MainBottomSheetFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MainBottomSheetFragment.kt
@@ -6,17 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.add_content_bottom_sheet.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.AddContentBottomSheetBinding
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel
 import javax.inject.Inject
 
@@ -35,26 +32,26 @@ class MainBottomSheetFragment : BottomSheetDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val recyclerView = view.findViewById<RecyclerView>(R.id.content_recycler_view)
-        recyclerView.layoutManager = LinearLayoutManager(requireActivity())
-        recyclerView.adapter = AddContentAdapter(requireActivity())
+        with(AddContentBottomSheetBinding.bind(view)) {
+            contentRecyclerView.layoutManager = LinearLayoutManager(requireActivity())
+            contentRecyclerView.adapter = AddContentAdapter(requireActivity())
 
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory).get(WPMainActivityViewModel::class.java)
-
-        viewModel.mainActions.observe(this, Observer {
-            (dialog?.content_recycler_view?.adapter as? AddContentAdapter)?.update(it ?: listOf())
-        })
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(WPMainActivityViewModel::class.java)
+            viewModel.mainActions.observe(this@MainBottomSheetFragment) {
+                (contentRecyclerView.adapter as? AddContentAdapter)?.update(it ?: listOf())
+            }
 
-        dialog?.setOnShowListener { dialogInterface ->
-            val sheetDialog = dialogInterface as? BottomSheetDialog
+            dialog?.setOnShowListener { dialogInterface ->
+                val sheetDialog = dialogInterface as? BottomSheetDialog
 
-            val bottomSheet = sheetDialog?.findViewById<View>(
-                    com.google.android.material.R.id.design_bottom_sheet
-            ) as? FrameLayout
+                val bottomSheet = sheetDialog?.findViewById<View>(
+                        com.google.android.material.R.id.design_bottom_sheet
+                ) as? FrameLayout
 
-            bottomSheet?.let {
-                val behavior = BottomSheetBehavior.from(it)
-                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                bottomSheet?.let {
+                    val behavior = BottomSheetBehavior.from(it)
+                    behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                }
             }
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MainFabUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MainFabUiState.kt
index 7c4fc54d132a..7caecc9e37a8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MainFabUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MainFabUiState.kt
@@ -5,5 +5,6 @@ import androidx.annotation.StringRes
 data class MainFabUiState(
     val isFabVisible: Boolean,
     val isFabTooltipVisible: Boolean,
-    @StringRes val CreateContentMessageId: Int
+    @StringRes val CreateContentMessageId: Int,
+    val isFocusPointVisible: Boolean = false
 )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt
index f18045d5d642..e82a09f9bb47 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeActivity.kt
@@ -1,10 +1,8 @@
 package org.wordpress.android.ui.main
 
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
 import org.wordpress.android.R
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.RequestCodes
@@ -14,17 +12,6 @@ class MeActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.me_activity)
-
-        setSupportActionBar(toolbar_main)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-            val activityInfo = packageManager.getActivityInfo(
-                    componentName,
-                    PackageManager.GET_META_DATA
-            )
-            it.setTitle(activityInfo.labelRes)
-        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt
index 979136423694..72d5a0420f37 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt
@@ -3,27 +3,25 @@ package org.wordpress.android.ui.main
 import android.app.Activity
 import android.app.ProgressDialog
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnClickListener
-import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.yalantis.ucrop.UCrop
 import com.yalantis.ucrop.UCrop.Options
 import com.yalantis.ucrop.UCropActivity
-import kotlinx.android.synthetic.main.me_fragment.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.R.attr
 import org.wordpress.android.WordPress
@@ -33,6 +31,7 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat.ME_GRAVATAR_GALLERY
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.ME_GRAVATAR_SHOT_NEW
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.ME_GRAVATAR_TAPPED
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.ME_GRAVATAR_UPLOADED
+import org.wordpress.android.databinding.MeFragmentBinding
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.AccountStore
@@ -61,12 +60,14 @@ import org.wordpress.android.util.WPMediaUtils
 import org.wordpress.android.util.getColorFromAttribute
 import org.wordpress.android.util.image.ImageManager.RequestListener
 import org.wordpress.android.util.image.ImageType.AVATAR_WITHOUT_BACKGROUND
+import org.wordpress.android.viewmodel.observeEvent
 import java.io.File
 import javax.inject.Inject
 
-class MeFragment : Fragment(), OnScrollToTopListener {
+class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
     private var disconnectProgressDialog: ProgressDialog? = null
     private var isUpdatingGravatar = false
+    private var binding: MeFragmentBinding? = null
 
     @Inject lateinit var dispatcher: Dispatcher
     @Inject lateinit var accountStore: AccountStore
@@ -85,47 +86,49 @@ class MeFragment : Fragment(), OnScrollToTopListener {
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.me_fragment, container, false) as ViewGroup
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        binding = MeFragmentBinding.bind(view).apply { onBind(savedInstanceState) }
+    }
+
+    private fun MeFragmentBinding.onBind(savedInstanceState: Bundle?) {
+        with(requireActivity() as AppCompatActivity) {
+            setSupportActionBar(toolbarMain)
+            supportActionBar?.apply {
+                setHomeButtonEnabled(true)
+                setDisplayHomeAsUpEnabled(true)
+                // We need to set the title this way so it can be updated on locale change
+                setTitle(packageManager.getActivityInfo(componentName, PackageManager.GET_META_DATA).labelRes)
+            }
+        }
+
         val showPickerListener = OnClickListener {
             AnalyticsTracker.track(ME_GRAVATAR_TAPPED)
             showPhotoPickerForGravatar()
         }
-        avatar_container.setOnClickListener(showPickerListener)
-        change_photo.setOnClickListener(showPickerListener)
-        row_my_profile.setOnClickListener {
-            ActivityLauncher.viewMyProfile(
-                    activity
-            )
+        avatarContainer.setOnClickListener(showPickerListener)
+        changePhoto.setOnClickListener(showPickerListener)
+        rowMyProfile.setOnClickListener {
+            ActivityLauncher.viewMyProfile(activity)
         }
-        row_account_settings.setOnClickListener {
-            ActivityLauncher.viewAccountSettings(
-                    activity
-            )
+        rowAccountSettings.setOnClickListener {
+            ActivityLauncher.viewAccountSettings(activity)
         }
-        row_app_settings.setOnClickListener {
-            ActivityLauncher.viewAppSettingsForResult(
-                    activity
-            )
+        rowAppSettings.setOnClickListener {
+            ActivityLauncher.viewAppSettingsForResult(activity)
         }
-        row_support.setOnClickListener {
-            ActivityLauncher
-                    .viewHelpAndSupport(
-                            requireContext(),
-                            ME_SCREEN_HELP,
-                            selectedSite,
-                            null
-                    )
+        rowSupport.setOnClickListener {
+            ActivityLauncher.viewHelpAndSupport(requireContext(), ME_SCREEN_HELP, selectedSite, null)
         }
-        row_logout.setOnClickListener {
+        rowLogout.setOnClickListener {
             if (accountStore.hasAccessToken()) {
                 signOutWordPressComWithConfirmation()
             } else {
-                ActivityLauncher.showSignInForResult(activity, true)
+                if (BuildConfig.IS_JETPACK_APP) {
+                    ActivityLauncher.showSignInForResultJetpackOnly(activity)
+                } else {
+                    ActivityLauncher.showSignInForResultWpComOnly(activity)
+                }
             }
         }
         if (savedInstanceState != null) {
@@ -137,13 +140,11 @@ class MeFragment : Fragment(), OnScrollToTopListener {
             }
         }
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(MeViewModel::class.java)
-        viewModel.showDisconnectDialog.observe(viewLifecycleOwner, Observer {
-            it.applyIfNotHandled {
-                when (this) {
-                    true -> showDisconnectDialog()
-                    false -> hideDisconnectDialog()
-                }
+        viewModel = ViewModelProvider(this@MeFragment, viewModelFactory).get(MeViewModel::class.java)
+        viewModel.showDisconnectDialog.observeEvent(viewLifecycleOwner, {
+            when (it) {
+                true -> showDisconnectDialog()
+                false -> hideDisconnectDialog()
             }
         })
     }
@@ -158,7 +159,7 @@ class MeFragment : Fragment(), OnScrollToTopListener {
 
     override fun onScrollToTop() {
         if (isAdded) {
-            scroll_view.smoothScrollTo(0, 0)
+            binding?.scrollView?.smoothScrollTo(0, 0)
         }
     }
 
@@ -176,7 +177,7 @@ class MeFragment : Fragment(), OnScrollToTopListener {
 
     override fun onResume() {
         super.onResume()
-        refreshAccountDetails()
+        binding?.refreshAccountDetails()
     }
 
     override fun onDestroy() {
@@ -185,50 +186,50 @@ class MeFragment : Fragment(), OnScrollToTopListener {
         super.onDestroy()
     }
 
-    private fun refreshAccountDetails() {
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
+    private fun MeFragmentBinding.refreshAccountDetails() {
         if (!FluxCUtils.isSignedInWPComOrHasWPOrgSite(accountStore, siteStore)) {
             return
         }
         // we only want to show user details for WordPress.com users
         if (accountStore.hasAccessToken()) {
             val defaultAccount = accountStore.account
-            me_display_name.visibility = View.VISIBLE
-            me_username.visibility = View.VISIBLE
-            card_avatar.visibility = View.VISIBLE
-            row_my_profile.visibility = View.VISIBLE
+            meDisplayName.visibility = View.VISIBLE
+            meUsername.visibility = View.VISIBLE
+            cardAvatar.visibility = View.VISIBLE
+            rowMyProfile.visibility = View.VISIBLE
             loadAvatar(null)
-            me_username.text = getString(R.string.at_username, defaultAccount.userName)
-            me_login_logout_text_view.setText(R.string.me_disconnect_from_wordpress_com)
-            val displayName = defaultAccount.displayName
-            if (!TextUtils.isEmpty(displayName)) {
-                me_display_name.text = displayName
-            } else {
-                me_display_name.text = defaultAccount.userName
-            }
+            meUsername.text = getString(R.string.at_username, defaultAccount.userName)
+            meLoginLogoutTextView.setText(R.string.me_disconnect_from_wordpress_com)
+            meDisplayName.text = defaultAccount.displayName.ifEmpty { defaultAccount.userName }
         } else {
-            me_display_name.visibility = View.GONE
-            me_username.visibility = View.GONE
-            card_avatar.visibility = View.GONE
-            avatar_progress.visibility = View.GONE
-            row_my_profile.visibility = View.GONE
-            row_account_settings.visibility = View.GONE
-            me_login_logout_text_view.setText(R.string.me_connect_to_wordpress_com)
+            meDisplayName.visibility = View.GONE
+            meUsername.visibility = View.GONE
+            cardAvatar.visibility = View.GONE
+            avatarProgress.visibility = View.GONE
+            rowMyProfile.visibility = View.GONE
+            rowAccountSettings.visibility = View.GONE
+            meLoginLogoutTextView.setText(R.string.me_connect_to_wordpress_com)
         }
     }
 
-    private fun showGravatarProgressBar(isUpdating: Boolean) {
-        avatar_progress.visibility = if (isUpdating) View.VISIBLE else View.GONE
+    private fun MeFragmentBinding.showGravatarProgressBar(isUpdating: Boolean) {
+        avatarProgress.visibility = if (isUpdating) View.VISIBLE else View.GONE
         isUpdatingGravatar = isUpdating
     }
 
-    private fun loadAvatar(injectFilePath: String?) {
+    private fun MeFragmentBinding.loadAvatar(injectFilePath: String?) {
         val newAvatarUploaded = injectFilePath != null && injectFilePath.isNotEmpty()
         val avatarUrl = meGravatarLoader.constructGravatarUrl(accountStore.account.avatarUrl)
         meGravatarLoader.load(
                 newAvatarUploaded,
                 avatarUrl,
                 injectFilePath,
-                me_avatar,
+                meAvatar,
                 AVATAR_WITHOUT_BACKGROUND,
                 object : RequestListener<Drawable> {
                     override fun onLoadFailed(e: Exception?, model: Any?) {
@@ -410,7 +411,7 @@ class MeFragment : Fragment(), OnScrollToTopListener {
             )
             return
         }
-        showGravatarProgressBar(true)
+        binding?.showGravatarProgressBar(true)
         GravatarApi.uploadGravatar(file, accountStore.account.email, accountStore.accessToken,
                 object : GravatarUploadListener {
                     override fun onSuccess() {
@@ -427,10 +428,10 @@ class MeFragment : Fragment(), OnScrollToTopListener {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(event: GravatarUploadFinished) {
-        showGravatarProgressBar(false)
+        binding?.showGravatarProgressBar(false)
         if (event.success) {
             AnalyticsTracker.track(ME_GRAVATAR_UPLOADED)
-            loadAvatar(event.filePath)
+            binding?.loadAvatar(event.filePath)
         } else {
             ToastUtils.showToast(
                     activity,
@@ -442,7 +443,7 @@ class MeFragment : Fragment(), OnScrollToTopListener {
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onAccountChanged(event: OnAccountChanged?) {
-        refreshAccountDetails()
+        binding?.refreshAccountDetails()
     }
 
     private val selectedSite: SiteModel?
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.kt
index 0122fb0ae44b..639c6c70defd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.kt
@@ -7,7 +7,6 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
 import android.text.TextUtils
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
@@ -22,23 +21,21 @@ import androidx.fragment.app.Fragment
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.snackbar.Snackbar
 import com.wordpress.stories.compose.frame.FrameSaveNotifier.Companion.buildSnackbarErrorMessage
-import com.wordpress.stories.compose.frame.FrameSaveNotifier.Companion.getNotificationIdForError
 import com.wordpress.stories.compose.frame.StorySaveEvents.Companion.allErrorsInResult
 import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveProcessStart
 import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult
 import com.wordpress.stories.compose.story.StoryRepository.getStoryAtIndex
-import com.wordpress.stories.util.KEY_STORY_SAVE_RESULT
 import com.yalantis.ucrop.UCrop
 import com.yalantis.ucrop.UCrop.Options
 import com.yalantis.ucrop.UCropActivity
-import kotlinx.android.synthetic.main.me_action_layout.*
-import kotlinx.android.synthetic.main.my_site_fragment.*
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
-import org.wordpress.android.R.attr
-import org.wordpress.android.R.string
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_PROMPT_SHOWN
@@ -66,21 +63,22 @@ import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_START_TASK_DI
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_START_TASK_DIALOG_POSITIVE_TAPPED
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_START_TASK_DIALOG_VIEWED
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STORY_SAVE_ERROR_SNACKBAR_MANAGE_TAPPED
+import org.wordpress.android.databinding.MySiteFragmentBinding
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.SiteActionBuilder
 import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.MediaStore
 import org.wordpress.android.fluxc.store.QuickStartStore
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHECK_STATS
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHOOSE_THEME
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_NEW_PAGE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_SITE
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CUSTOMIZE_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.ENABLE_POST_SHARING
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EXPLORE_PLANS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.REVIEW_PAGES
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPLOAD_SITE_ICON
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.VIEW_SITE
@@ -90,20 +88,26 @@ import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.UNKNOWN
 import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched
 import org.wordpress.android.login.LoginMode.JETPACK_STATS
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.FullScreenDialogFragment
 import org.wordpress.android.ui.FullScreenDialogFragment.Builder
 import org.wordpress.android.ui.FullScreenDialogFragment.OnConfirmListener
 import org.wordpress.android.ui.FullScreenDialogFragment.OnDismissListener
+import org.wordpress.android.ui.PagePostCreationSourcesDetail.STORY_FROM_MY_SITE
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.TextInputDialogFragment
 import org.wordpress.android.ui.accounts.LoginActivity
-import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria.ALL
 import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION
 import org.wordpress.android.ui.domains.DomainRegistrationResultFragment
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase.JetpackPurchasedProducts
 import org.wordpress.android.ui.main.WPMainActivity.OnScrollToTopListener
 import org.wordpress.android.ui.main.utils.MeGravatarLoader
+import org.wordpress.android.ui.mysite.SelectedSiteRepository
 import org.wordpress.android.ui.photopicker.MediaPickerConstants
+import org.wordpress.android.ui.photopicker.MediaPickerConstants.EXTRA_MEDIA_SOURCE
 import org.wordpress.android.ui.photopicker.MediaPickerLauncher
 import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource
 import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource.ANDROID_CAMERA
@@ -116,8 +120,6 @@ import org.wordpress.android.ui.posts.BasicFragmentDialog.BasicDialogPositiveCli
 import org.wordpress.android.ui.posts.PromoDialog
 import org.wordpress.android.ui.posts.PromoDialog.PromoDialogClickInterface
 import org.wordpress.android.ui.prefs.AppPrefs
-import org.wordpress.android.ui.prefs.SiteSettingsInterface
-import org.wordpress.android.ui.prefs.SiteSettingsInterface.SiteSettingsListener
 import org.wordpress.android.ui.quickstart.QuickStartEvent
 import org.wordpress.android.ui.quickstart.QuickStartFullScreenDialogFragment
 import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts
@@ -126,18 +128,19 @@ import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts.Companion.isT
 import org.wordpress.android.ui.quickstart.QuickStartNoticeDetails
 import org.wordpress.android.ui.stories.StoriesMediaPickerResultHandler
 import org.wordpress.android.ui.stories.StoriesTrackerHelper
-import org.wordpress.android.ui.stories.StoryComposerActivity
-import org.wordpress.android.ui.themes.ThemeBrowserActivity
+import org.wordpress.android.ui.themes.ThemeBrowserUtils
 import org.wordpress.android.ui.uploads.UploadService
 import org.wordpress.android.ui.uploads.UploadService.UploadErrorEvent
 import org.wordpress.android.ui.uploads.UploadService.UploadMediaSuccessEvent
 import org.wordpress.android.ui.uploads.UploadUtilsWrapper
+import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.AccessibilityUtils.getSnackbarDuration
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.DOMAIN_REGISTRATION
 import org.wordpress.android.util.AppLog.T.EDITOR
 import org.wordpress.android.util.AppLog.T.MAIN
 import org.wordpress.android.util.AppLog.T.UTILS
+import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.DateTimeUtils
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.util.FluxCUtils
@@ -146,19 +149,19 @@ import org.wordpress.android.util.NetworkUtils
 import org.wordpress.android.util.PhotonUtils
 import org.wordpress.android.util.PhotonUtils.Quality.HIGH
 import org.wordpress.android.util.QuickStartUtils.Companion.addQuickStartFocusPointAboveTheView
-import org.wordpress.android.util.QuickStartUtils.Companion.completeTaskAndRemindNextOne
 import org.wordpress.android.util.QuickStartUtils.Companion.getNextUncompletedQuickStartTask
 import org.wordpress.android.util.QuickStartUtils.Companion.isQuickStartInProgress
 import org.wordpress.android.util.QuickStartUtils.Companion.removeQuickStartFocusPoint
-import org.wordpress.android.util.QuickStartUtils.Companion.stylizeQuickStartPrompt
-import org.wordpress.android.util.ScanFeatureConfig
+import org.wordpress.android.util.QuickStartUtilsWrapper
 import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.SiteUtilsWrapper
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.ToastUtils.Duration.SHORT
 import org.wordpress.android.util.WPMediaUtils
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtils
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig
 import org.wordpress.android.util.getColorFromAttribute
+import org.wordpress.android.util.image.BlavatarShape.SQUARE
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType.BLAVATAR
 import org.wordpress.android.util.image.ImageType.USER
@@ -170,9 +173,13 @@ import java.io.File
 import java.util.GregorianCalendar
 import java.util.TimeZone
 import javax.inject.Inject
+import javax.inject.Named
 
-class MySiteFragment : Fragment(),
-        SiteSettingsListener,
+@Deprecated(
+        "This class is being refactored, if you implement any change, please also update " +
+                "{@link org.wordpress.android.ui.mysite.ImprovedMySiteFragment}"
+)
+class MySiteFragment : Fragment(R.layout.my_site_fragment),
         OnScrollToTopListener,
         BasicDialogPositiveClickInterface,
         BasicDialogNegativeClickInterface,
@@ -181,12 +188,13 @@ class MySiteFragment : Fragment(),
         OnConfirmListener,
         OnDismissListener,
         TextInputDialogFragment.Callback {
-    private var siteSettings: SiteSettingsInterface? = null
+    private var binding: MySiteFragmentBinding? = null
     private var activeTutorialPrompt: QuickStartMySitePrompts? = null
     private val quickStartSnackBarHandler = Handler()
     private var blavatarSz = 0
     private var isDomainCreditAvailable = false
     private var isDomainCreditChecked = false
+    private val job = Job()
 
     @Inject lateinit var accountStore: AccountStore
     @Inject lateinit var dispatcher: Dispatcher
@@ -198,18 +206,28 @@ class MySiteFragment : Fragment(),
     @Inject lateinit var storiesTrackerHelper: StoriesTrackerHelper
     @Inject lateinit var mediaPickerLauncher: MediaPickerLauncher
     @Inject lateinit var storiesMediaPickerResultHandler: StoriesMediaPickerResultHandler
-    @Inject lateinit var consolidatedMediaPickerFeatureConfig: ConsolidatedMediaPickerFeatureConfig
-    @Inject lateinit var scanFeatureConfig: ScanFeatureConfig
-
-    val selectedSite: SiteModel?
+    @Inject lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var themeBrowserUtils: ThemeBrowserUtils
+    @Inject lateinit var jetpackCapabilitiesUseCase: JetpackCapabilitiesUseCase
+    @Inject lateinit var siteUtilsWrapper: SiteUtilsWrapper
+    @Inject lateinit var quickStartUtilsWrapper: QuickStartUtilsWrapper
+    @Inject lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Inject lateinit var buildConfigWrapper: BuildConfigWrapper
+    @Inject @Named(UI_THREAD) lateinit var uiDispatcher: CoroutineDispatcher
+    @Inject @Named(BG_THREAD) lateinit var bgDispatcher: CoroutineDispatcher
+    lateinit var uiScope: CoroutineScope
+
+    private val selectedSite: SiteModel?
         get() {
-            return (activity as? WPMainActivity)?.selectedSite
+            return selectedSiteRepository.getSelectedSite()
         }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
         (requireActivity().application as WordPress).component().inject(this)
+        uiScope = CoroutineScope(uiDispatcher + job)
         if (savedInstanceState != null) {
             activeTutorialPrompt = savedInstanceState
                     .getSerializable(QuickStartMySitePrompts.KEY) as? QuickStartMySitePrompts
@@ -225,40 +243,83 @@ class MySiteFragment : Fragment(),
     }
 
     override fun onDestroy() {
-        siteSettings?.clear()
+        selectedSiteRepository.clear()
+        job.cancel()
+        jetpackCapabilitiesUseCase.clear()
         super.onDestroy()
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
     override fun onResume() {
         super.onResume()
         updateSiteSettingsIfNecessary()
-
+        completeQuickStartStepsIfNeeded()
         // Site details may have changed (e.g. via Settings and returning to this Fragment) so update the UI
-        refreshSelectedSiteDetails(selectedSite)
-        selectedSite?.let { site ->
-            updateScanMenuVisibility()
-
-            val isNotAdmin = !site.hasCapabilityManageOptions
-            val isSelfHostedWithoutJetpack = !SiteUtils.isAccessedViaWPComRest(
-                    site
-            ) && !site.isJetpackConnected
-            if (isNotAdmin || isSelfHostedWithoutJetpack) {
-                row_activity_log.visibility = View.GONE
-            } else {
-                row_activity_log.visibility = View.VISIBLE
-            }
+        binding?.apply {
+            refreshSelectedSiteDetails(selectedSite)
+            selectedSite?.let { site ->
+                updateScanAndBackup(site)
 
-            site_info_container.title.isClickable = SiteUtils.isAccessedViaWPComRest(site)
+                val isNotAdmin = !site.hasCapabilityManageOptions
+                val isSelfHostedWithoutJetpack = !SiteUtils.isAccessedViaWPComRest(
+                        site
+                ) && !site.isJetpackConnected
+                if (isNotAdmin || isSelfHostedWithoutJetpack || site.isWpForTeamsSite) {
+                    rowActivityLog.visibility = View.GONE
+                } else {
+                    rowActivityLog.visibility = View.VISIBLE
+                }
+
+                siteInfoContainer.title.isClickable = SiteUtils.isAccessedViaWPComRest(site)
+            }
+            updateQuickStartContainer()
+            if (!AppPrefs.hasQuickStartMigrationDialogShown() && isQuickStartInProgress(quickStartStore)) {
+                showQuickStartDialogMigration()
+            }
+            showQuickStartNoticeIfNecessary()
         }
-        updateQuickStartContainer()
-        if (!AppPrefs.hasQuickStartMigrationDialogShown() && isQuickStartInProgress(quickStartStore)) {
-            showQuickStartDialogMigration()
+    }
+
+    private fun MySiteFragmentBinding.updateScanAndBackup(site: SiteModel) {
+        // Make sure that we load the cached value synchronously as we want to suppress the default animation
+        updateScanAndBackupVisibility(
+                site = site,
+                products = jetpackCapabilitiesUseCase.getCachedJetpackPurchasedProducts(site.siteId)
+        )
+        uiScope.launch {
+            val products = jetpackCapabilitiesUseCase.fetchJetpackPurchasedProducts(site.siteId)
+            view?.let {
+                updateScanAndBackupVisibility(
+                        site = site,
+                        products = products
+                )
+            }
         }
-        showQuickStartNoticeIfNecessary()
     }
 
-    private fun updateScanMenuVisibility() {
-        row_scan.setVisible(scanFeatureConfig.isEnabled())
+    private fun MySiteFragmentBinding.updateScanAndBackupVisibility(
+        site: SiteModel,
+        products: JetpackPurchasedProducts
+    ) {
+        rowScan.setVisible(SiteUtils.isScanEnabled(products.scan, site))
+        rowBackup.setVisible(products.backup)
+    }
+
+    private fun completeQuickStartStepsIfNeeded() {
+        selectedSite?.let {
+            if (it.showOnFront == ShowOnFront.POSTS.value) {
+                quickStartUtilsWrapper.completeTaskAndRemindNextOne(
+                        EDIT_HOMEPAGE,
+                        it,
+                        null,
+                        requireContext()
+                )
+            }
+        }
     }
 
     private fun showQuickStartNoticeIfNecessary() {
@@ -315,18 +376,7 @@ class MySiteFragment : Fragment(),
     }
 
     private fun updateSiteSettingsIfNecessary() {
-        // If the selected site is null, we can't update its site settings
-        val selectedSite = selectedSite ?: return
-        if (siteSettings != null && siteSettings!!.localSiteId != selectedSite.id) {
-            // The site has changed, we can't use the previous site settings, force a refresh
-            siteSettings = null
-        }
-        if (siteSettings == null) {
-            siteSettings = SiteSettingsInterface.getInterface(activity, selectedSite, this)
-            if (siteSettings != null) {
-                siteSettings!!.init(true)
-            }
-        }
+        selectedSiteRepository.updateSiteSettingsIfNecessary()
     }
 
     override fun onPause() {
@@ -334,124 +384,77 @@ class MySiteFragment : Fragment(),
         clearActiveQuickStart()
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val rootView = inflater.inflate(R.layout.my_site_fragment, container, false) as ViewGroup
-        blavatarSz = resources.getDimensionPixelSize(R.dimen.blavatar_sz_small)
-        return rootView
-    }
-
-    private fun setupClickListeners() {
-        site_info_container.title.setOnClickListener {
+    private fun MySiteFragmentBinding.setupClickListeners() {
+        siteInfoContainer.title.setOnClickListener {
             completeQuickStarTask(UPDATE_SITE_TITLE)
             showTitleChangerDialog()
         }
-        site_info_container.subtitle.setOnClickListener { viewSite() }
-        switch_site.setOnClickListener { showSitePicker() }
-        row_view_site.setOnClickListener { viewSite() }
-        my_site_register_domain_cta.setOnClickListener { registerDomain() }
-        quick_action_stats_button.setOnClickListener {
-            AnalyticsTracker.track(QUICK_ACTION_STATS_TAPPED)
-            viewStats()
-        }
-        row_stats.setOnClickListener { viewStats() }
-        my_site_blavatar.setOnClickListener { updateBlavatar() }
-        row_plan.setOnClickListener {
+        siteInfoContainer.subtitle.setOnClickListener { viewSite() }
+        switchSite.setOnClickListener { showSitePicker() }
+        rowViewSite.setOnClickListener { viewSite() }
+        mySiteRegisterDomainCta.setOnClickListener { registerDomain() }
+        rowStats.setOnClickListener { viewStats() }
+        mySiteBlavatar.setOnClickListener { updateBlavatar() }
+        rowPlan.setOnClickListener {
             completeQuickStarTask(EXPLORE_PLANS)
             ActivityLauncher.viewBlogPlans(activity, selectedSite)
         }
-        quick_action_posts_button.setOnClickListener {
-            AnalyticsTracker.track(QUICK_ACTION_POSTS_TAPPED)
-            viewPosts()
-        }
-        row_blog_posts.setOnClickListener { viewPosts() }
-        quick_action_media_button.setOnClickListener {
-            AnalyticsTracker.track(QUICK_ACTION_MEDIA_TAPPED)
-            viewMedia()
-        }
-        row_media.setOnClickListener { viewMedia() }
-        quick_action_pages_button.setOnClickListener {
-            AnalyticsTracker.track(QUICK_ACTION_PAGES_TAPPED)
-            viewPages()
-        }
-        row_pages.setOnClickListener { viewPages() }
-        row_comments.setOnClickListener {
-            ActivityLauncher.viewCurrentBlogComments(
-                    activity,
-                    selectedSite
-            )
-        }
-        row_themes.setOnClickListener {
-            completeQuickStarTask(CHOOSE_THEME)
-            if (isQuickStartTaskActive(CUSTOMIZE_SITE)) {
-                requestNextStepOfActiveQuickStartTask()
+        rowJetpackSettings.setOnClickListener { ActivityLauncher.viewJetpackSecuritySettings(activity, selectedSite) }
+        rowBlogPosts.setOnClickListener { viewPosts() }
+        rowMedia.setOnClickListener { viewMedia() }
+        rowPages.setOnClickListener { viewPages() }
+        rowComments.setOnClickListener { ActivityLauncher.viewCurrentBlogComments(activity, selectedSite) }
+        rowThemes.setOnClickListener {
+            if (themeBrowserUtils.isAccessible(selectedSite)) {
+                ActivityLauncher.viewCurrentBlogThemes(activity, selectedSite)
             }
-            ActivityLauncher.viewCurrentBlogThemes(activity, selectedSite)
-        }
-        row_people.setOnClickListener {
-            ActivityLauncher.viewCurrentBlogPeople(
-                    activity,
-                    selectedSite
-            )
         }
-        row_plugins.setOnClickListener {
-            ActivityLauncher.viewPluginBrowser(
-                    activity,
-                    selectedSite
-            )
-        }
-        row_activity_log.setOnClickListener {
-            ActivityLauncher.viewActivityLogList(
-                    activity,
-                    selectedSite
-            )
+        rowPeople.setOnClickListener { ActivityLauncher.viewCurrentBlogPeople(activity, selectedSite) }
+        rowPlugins.setOnClickListener { ActivityLauncher.viewPluginBrowser(activity, selectedSite) }
+        rowActivityLog.setOnClickListener { ActivityLauncher.viewActivityLogList(activity, selectedSite) }
+        rowBackup.setOnClickListener { ActivityLauncher.viewBackupList(activity, selectedSite) }
+        rowScan.setOnClickListener { ActivityLauncher.viewScan(activity, selectedSite) }
+        rowSettings.setOnClickListener { ActivityLauncher.viewBlogSettingsForResult(activity, selectedSite) }
+        rowSharing.setOnClickListener {
+            if (isQuickStartTaskActive(ENABLE_POST_SHARING)) requestNextStepOfActiveQuickStartTask()
+            ActivityLauncher.viewBlogSharing(activity, selectedSite)
         }
-        row_settings.setOnClickListener {
-            ActivityLauncher.viewBlogSettingsForResult(
-                    activity,
-                    selectedSite
-            )
+        rowAdmin.setOnClickListener { ActivityLauncher.viewBlogAdmin(activity, selectedSite) }
+        actionableEmptyView.button.setOnClickListener {
+            SitePickerActivity.addSite(activity, accountStore.hasAccessToken())
         }
-        row_sharing.setOnClickListener {
-            if (isQuickStartTaskActive(ENABLE_POST_SHARING)) {
-                requestNextStepOfActiveQuickStartTask()
-            }
-            ActivityLauncher.viewBlogSharing(activity, selectedSite)
+        quickStartCustomize.setOnClickListener { showQuickStartList(CUSTOMIZE) }
+        quickStartGrow.setOnClickListener { showQuickStartList(GROW) }
+        quickStartMore.setOnClickListener { showQuickStartCardMenu() }
+    }
+
+    private fun MySiteFragmentBinding.setupQuickActionsIfNecessary() {
+        if (buildConfigWrapper.isJetpackApp) {
+            quickActionButtonsContainer.visibility = View.GONE
+            return
         }
-        row_admin.setOnClickListener {
-            ActivityLauncher.viewBlogAdmin(
-                    activity,
-                    selectedSite
-            )
+
+        quickActionStatsButton.setOnClickListener {
+            AnalyticsTracker.track(QUICK_ACTION_STATS_TAPPED)
+            viewStats()
         }
-        actionable_empty_view.button.setOnClickListener {
-            SitePickerActivity.addSite(
-                    activity,
-                    accountStore.hasAccessToken()
-            )
+        quickActionPostsButton.setOnClickListener {
+            AnalyticsTracker.track(QUICK_ACTION_POSTS_TAPPED)
+            viewPosts()
         }
-        quick_start_customize.setOnClickListener {
-            showQuickStartList(
-                    CUSTOMIZE
-            )
+        quickActionMediaButton.setOnClickListener {
+            AnalyticsTracker.track(QUICK_ACTION_MEDIA_TAPPED)
+            viewMedia()
         }
-        quick_start_grow.setOnClickListener {
-            showQuickStartList(
-                    GROW
-            )
+        quickActionPagesButton.setOnClickListener {
+            AnalyticsTracker.track(QUICK_ACTION_PAGES_TAPPED)
+            viewPages()
         }
-        quick_start_more.setOnClickListener { showQuickStartCardMenu() }
     }
 
     private fun registerDomain() {
         AnalyticsUtils.trackWithSiteDetails(DOMAIN_CREDIT_REDEMPTION_TAPPED, selectedSite)
-        ActivityLauncher.viewDomainRegistrationActivityForResult(
-                activity, selectedSite,
-                CTA_DOMAIN_CREDIT_REDEMPTION
-        )
+        ActivityLauncher.viewDomainRegistrationActivityForResult(activity, selectedSite, CTA_DOMAIN_CREDIT_REDEMPTION)
     }
 
     private fun viewMedia() {
@@ -498,7 +501,11 @@ class MySiteFragment : Fragment(),
     }
 
     private fun viewPages() {
-        requestNextStepOfActiveQuickStartTask()
+        if (activeTutorialPrompt != null && activeTutorialPrompt == QuickStartMySitePrompts.EDIT_HOMEPAGE) {
+            requestNextStepOfActiveQuickStartTask()
+        } else {
+            completeQuickStarTask(REVIEW_PAGES)
+        }
         val selectedSite = selectedSite
         if (selectedSite != null) {
             ActivityLauncher.viewCurrentBlogPages(requireActivity(), selectedSite)
@@ -523,7 +530,7 @@ class MySiteFragment : Fragment(),
         }
     }
 
-    private fun showTitleChangerDialog() {
+    private fun MySiteFragmentBinding.showTitleChangerDialog() {
         if (!NetworkUtils.isNetworkAvailable(activity)) {
             WPSnackbar.make(
                     requireActivity().findViewById(R.id.coordinator),
@@ -546,7 +553,7 @@ class MySiteFragment : Fragment(),
                 hint,
                 false,
                 canEditTitle,
-                site_info_container.title.id
+                siteInfoContainer.title.id
         )
         inputDialog.setTargetFragment(this@MySiteFragment, 0)
         inputDialog.show(parentFragmentManager, TextInputDialogFragment.TAG)
@@ -559,10 +566,18 @@ class MySiteFragment : Fragment(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        blavatarSz = resources.getDimensionPixelSize(R.dimen.blavatar_sz_small)
+        binding = MySiteFragmentBinding.bind(view).apply { onBind() }
+    }
+
+    private fun MySiteFragmentBinding.onBind() {
+        setupQuickActionsIfNecessary()
         setupClickListeners()
-        collapsing_toolbar.title = getString(R.string.my_site_section_screen_title)
+        collapsingToolbar.title = getString(R.string.my_site_section_screen_title)
+
+        val avatar = root.findViewById<ImageView>(R.id.avatar)
 
-        appbar_main.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
+        appbarMain.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
             val maxOffset = appBarLayout.totalScrollRange
             val currentOffset = maxOffset + verticalOffset
 
@@ -578,27 +593,35 @@ class MySiteFragment : Fragment(),
                 avatar.scaleY = newScale
             }
         })
-        (activity as AppCompatActivity).setSupportActionBar(toolbar_main)
+        (activity as AppCompatActivity).setSupportActionBar(toolbarMain)
         if (activeTutorialPrompt != null) {
             showQuickStartFocusPoint()
         }
+        selectedSiteRepository.selectedSiteChange.observe(viewLifecycleOwner, {
+            onSiteChanged(it)
+        })
+        selectedSiteRepository.showSiteIconProgressBar.observe(viewLifecycleOwner, {
+            showSiteIconProgressBar(it == true)
+        })
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.my_site_menu, menu)
-        val meMenu = toolbar_main.menu.findItem(R.id.me_item)
-        val actionView = meMenu.actionView
-        actionView.setOnClickListener {
-            ActivityLauncher.viewMeActivityForResult(
-                    activity
-            )
-        }
-        actionView.let {
-            TooltipCompat.setTooltipText(it, meMenu.title)
-        }
+        binding?.apply {
+            val meMenu = toolbarMain.menu.findItem(R.id.me_item)
+            val actionView = meMenu.actionView
+            actionView.setOnClickListener {
+                ActivityLauncher.viewMeActivityForResult(
+                        activity
+                )
+            }
+            actionView.let {
+                TooltipCompat.setTooltipText(it, meMenu.title)
+            }
 
-        refreshMeGravatar(actionView.findViewById(R.id.avatar))
+            refreshMeGravatar(actionView.findViewById(R.id.avatar))
+        }
     }
 
     private fun refreshMeGravatar(gravatarImageView: ImageView) {
@@ -613,7 +636,7 @@ class MySiteFragment : Fragment(),
         )
     }
 
-    private fun updateQuickStartContainer() {
+    private fun MySiteFragmentBinding.updateQuickStartContainer() {
         if (!isAdded) {
             return
         }
@@ -636,42 +659,42 @@ class MySiteFragment : Fragment(),
                     GROW
             ).size
             if (countCustomizeUncompleted > 0) {
-                quick_start_customize_icon.isEnabled = true
-                quick_start_customize_title.isEnabled = true
-                val updatedPaintFlags = quick_start_customize_title.paintFlags and STRIKE_THRU_TEXT_FLAG.inv()
-                quick_start_customize_title.paintFlags = updatedPaintFlags
+                quickStartCustomizeIcon.isEnabled = true
+                quickStartCustomizeTitle.isEnabled = true
+                val updatedPaintFlags = quickStartCustomizeTitle.paintFlags and STRIKE_THRU_TEXT_FLAG.inv()
+                quickStartCustomizeTitle.paintFlags = updatedPaintFlags
             } else {
-                quick_start_customize_icon.isEnabled = false
-                quick_start_customize_title.isEnabled = false
-                quick_start_customize_title.paintFlags = quick_start_customize_title.paintFlags or STRIKE_THRU_TEXT_FLAG
+                quickStartCustomizeIcon.isEnabled = false
+                quickStartCustomizeTitle.isEnabled = false
+                quickStartCustomizeTitle.paintFlags = quickStartCustomizeTitle.paintFlags or STRIKE_THRU_TEXT_FLAG
             }
-            quick_start_customize_subtitle.text = getString(
+            quickStartCustomizeSubtitle.text = getString(
                     R.string.quick_start_sites_type_subtitle,
                     countCustomizeCompleted, countCustomizeCompleted + countCustomizeUncompleted
             )
             if (countGrowUncompleted > 0) {
-                quick_start_grow_icon.setBackgroundResource(R.drawable.bg_oval_pink_50_multiple_users_white_40dp)
-                quick_start_grow_title.isEnabled = true
-                quick_start_grow_title.paintFlags = quick_start_grow_title.paintFlags and STRIKE_THRU_TEXT_FLAG.inv()
+                quickStartGrowIcon.setBackgroundResource(R.drawable.bg_oval_blue_50_multiple_users_white_40dp)
+                quickStartGrowTitle.isEnabled = true
+                quickStartGrowTitle.paintFlags = quickStartGrowTitle.paintFlags and STRIKE_THRU_TEXT_FLAG.inv()
             } else {
-                quick_start_grow_icon.setBackgroundResource(R.drawable.bg_oval_neutral_30_multiple_users_white_40dp)
-                quick_start_grow_title.isEnabled = false
-                quick_start_grow_title.paintFlags = quick_start_grow_title.paintFlags or STRIKE_THRU_TEXT_FLAG
+                quickStartGrowIcon.setBackgroundResource(R.drawable.bg_oval_neutral_30_multiple_users_white_40dp)
+                quickStartGrowTitle.isEnabled = false
+                quickStartGrowTitle.paintFlags = quickStartGrowTitle.paintFlags or STRIKE_THRU_TEXT_FLAG
             }
-            quick_start_grow_subtitle.text = getString(
+            quickStartGrowSubtitle.text = getString(
                     R.string.quick_start_sites_type_subtitle,
                     countGrowCompleted, countGrowCompleted + countGrowUncompleted
             )
-            quick_start.visibility = View.VISIBLE
+            quickStart.visibility = View.VISIBLE
         } else {
-            quick_start.visibility = View.GONE
+            quickStart.visibility = View.GONE
         }
     }
 
-    private fun showQuickStartCardMenu() {
+    private fun MySiteFragmentBinding.showQuickStartCardMenu() {
         val quickStartPopupMenu = PopupMenu(
                 requireContext(),
-                quick_start_more
+                quickStartMore
         )
         quickStartPopupMenu.setOnMenuItemClickListener { item: MenuItem ->
             if (item.itemId == R.id.quick_start_card_menu_remove) {
@@ -778,52 +801,35 @@ class MySiteFragment : Fragment(),
                 ActivityLauncher.viewBlogStats(activity, selectedSite)
             }
             RequestCodes.SITE_PICKER -> if (resultCode == Activity.RESULT_OK) {
-                // reset comments status filter
-                AppPrefs.setCommentsStatusFilter(ALL)
                 // reset domain credit flag - it will be checked in onSiteChanged
                 isDomainCreditAvailable = false
             }
             RequestCodes.PHOTO_PICKER -> if (resultCode == Activity.RESULT_OK && data != null) {
-                if (consolidatedMediaPickerFeatureConfig.isEnabled() ||
-                        !storiesMediaPickerResultHandler.handleMediaPickerResultForStories(
-                                data,
-                                activity,
-                                selectedSite
-                        )) {
+                if (!storiesMediaPickerResultHandler.handleMediaPickerResultForStories(
+                                data, activity, selectedSite, STORY_FROM_MY_SITE
+                        )
+                ) {
                     if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_ID)) {
                         val mediaId = data.getLongExtra(MediaPickerConstants.EXTRA_MEDIA_ID, 0).toInt()
-                        showSiteIconProgressBar(true)
-                        updateSiteIconMediaId(mediaId)
+                        updateSiteIconMediaId(mediaId, true)
                     } else {
-                        val mediaUriStringsArray = data.getStringArrayExtra(
-                                MediaPickerConstants.EXTRA_MEDIA_URIS
-                        )
+                        val mediaUriStringsArray = data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)
                         if (mediaUriStringsArray.isNullOrEmpty()) {
-                            AppLog.e(
-                                    UTILS,
-                                    "Can't resolve picked or captured image"
-                            )
+                            AppLog.e(UTILS, "Can't resolve picked or captured image")
                             return
                         }
 
-                        val source = PhotoPickerMediaSource.fromString(
-                                data.getStringExtra(MediaPickerConstants.EXTRA_MEDIA_SOURCE)
-                        )
+                        val source = PhotoPickerMediaSource.fromString(data.getStringExtra(EXTRA_MEDIA_SOURCE))
                         val stat = if (source == ANDROID_CAMERA) MY_SITE_ICON_SHOT_NEW else MY_SITE_ICON_GALLERY_PICKED
                         AnalyticsTracker.track(stat)
                         val imageUri = Uri.parse(mediaUriStringsArray[0])
                         if (imageUri != null) {
-                            val didGoWell = WPMediaUtils.fetchMediaAndDoNext(
-                                    activity, imageUri
-                            ) { uri: Uri ->
-                                showSiteIconProgressBar(true)
+                            val didGoWell = WPMediaUtils.fetchMediaAndDoNext(activity, imageUri) { uri: Uri ->
+                                selectedSiteRepository.showSiteIconProgressBar(true)
                                 startCropActivity(uri)
                             }
                             if (!didGoWell) {
-                                AppLog.e(
-                                        UTILS,
-                                        "Can't download picked or captured image"
-                                )
+                                AppLog.e(UTILS, "Can't download picked or captured image")
                             }
                         }
                     }
@@ -833,29 +839,18 @@ class MySiteFragment : Fragment(),
                 storiesMediaPickerResultHandler.handleMediaPickerResultForStories(
                         data,
                         activity,
-                        selectedSite
+                        selectedSite,
+                        STORY_FROM_MY_SITE
                 )
             }
             UCrop.REQUEST_CROP -> if (resultCode == Activity.RESULT_OK) {
                 AnalyticsTracker.track(MY_SITE_ICON_CROPPED)
-                WPMediaUtils.fetchMediaAndDoNext(
-                        activity, UCrop.getOutput(data!!)
-                ) { uri: Uri? ->
-                    startSiteIconUpload(
-                            MediaUtils.getRealPathFromURI(activity, uri)
-                    )
+                WPMediaUtils.fetchMediaAndDoNext(activity, UCrop.getOutput(data!!)) { uri: Uri? ->
+                    startSiteIconUpload(MediaUtils.getRealPathFromURI(activity, uri))
                 }
             } else if (resultCode == UCrop.RESULT_ERROR) {
-                AppLog.e(
-                        MAIN,
-                        "Image cropping failed!",
-                        UCrop.getError(data!!)
-                )
-                ToastUtils.showToast(
-                        activity,
-                        R.string.error_cropping_image,
-                        SHORT
-                )
+                AppLog.e(MAIN, "Image cropping failed!", UCrop.getError(data!!))
+                ToastUtils.showToast(activity, R.string.error_cropping_image, SHORT)
             }
             RequestCodes.DOMAIN_REGISTRATION -> if (resultCode == Activity.RESULT_OK && isAdded && data != null) {
                 AnalyticsTracker.track(DOMAIN_CREDIT_REDEMPTION_SUCCESS)
@@ -882,7 +877,7 @@ class MySiteFragment : Fragment(),
     }
 
     override fun onDismiss() {
-        updateQuickStartContainer()
+        binding?.updateQuickStartContainer()
     }
 
     private fun startSiteIconUpload(filePath: String) {
@@ -928,20 +923,18 @@ class MySiteFragment : Fragment(),
         }
     }
 
-    private fun showSiteIconProgressBar(isVisible: Boolean) {
-        if (my_site_icon_progress != null && my_site_blavatar != null) {
-            if (isVisible) {
-                my_site_icon_progress.visibility = View.VISIBLE
-                my_site_blavatar.visibility = View.INVISIBLE
-            } else {
-                my_site_icon_progress.visibility = View.GONE
-                my_site_blavatar.visibility = View.VISIBLE
-            }
+    private fun MySiteFragmentBinding.showSiteIconProgressBar(isVisible: Boolean) {
+        if (isVisible) {
+            mySiteIconProgress.visibility = View.VISIBLE
+            mySiteBlavatar.visibility = View.INVISIBLE
+        } else {
+            mySiteIconProgress.visibility = View.GONE
+            mySiteBlavatar.visibility = View.VISIBLE
         }
     }
 
     private val isMediaUploadInProgress: Boolean
-        get() = my_site_icon_progress.visibility == View.VISIBLE
+        get() = binding?.mySiteIconProgress?.visibility == View.VISIBLE
 
     private fun buildMediaModel(file: File, site: SiteModel): MediaModel? {
         val uri = Uri.Builder().path(file.path).build()
@@ -955,7 +948,7 @@ class MySiteFragment : Fragment(),
         options.setShowCropGrid(false)
         options.setStatusBarColor(context.getColorFromAttribute(android.R.attr.statusBarColor))
         options.setToolbarColor(context.getColorFromAttribute(R.attr.wpColorAppBar))
-        options.setToolbarWidgetColor(context.getColorFromAttribute(attr.colorOnSurface))
+        options.setToolbarWidgetColor(context.getColorFromAttribute(R.attr.colorOnSurface))
         options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE)
         options.setHideBottomControls(true)
         UCrop.of(uri, Uri.fromFile(File(context.cacheDir, "cropped_for_site_icon.jpg")))
@@ -964,93 +957,116 @@ class MySiteFragment : Fragment(),
                 .start(requireActivity(), this)
     }
 
-    private fun refreshSelectedSiteDetails(site: SiteModel?) {
+    private fun MySiteFragmentBinding.refreshSelectedSiteDetails(site: SiteModel?) {
         if (!isAdded || view == null) {
             return
         }
         if (site == null) {
-            scroll_view.visibility = View.GONE
-            actionable_empty_view.visibility = View.VISIBLE
-
-            // Hide actionable empty view image when screen height is under 600 pixels.
-            if (DisplayUtils.getDisplayPixelHeight(activity) >= 600) {
-                actionable_empty_view.image.visibility = View.VISIBLE
-            } else {
-                actionable_empty_view.image.visibility = View.GONE
-            }
-            return
+            showEmptyView()
+        } else {
+            showContent(site)
         }
-        if (SiteUtils.onFreePlan(site) || SiteUtils.hasCustomDomain(
-                        site
-                )) {
-            isDomainCreditAvailable = false
-            toggleDomainRegistrationCtaVisibility()
-        } else if (!isDomainCreditChecked) {
-            fetchSitePlans(site)
+    }
+
+    private fun MySiteFragmentBinding.showEmptyView() {
+        scrollView.visibility = View.GONE
+        actionableEmptyView.visibility = View.VISIBLE
+
+        // Hide actionable empty view image when screen height is under 600 pixels.
+        if (DisplayUtils.getDisplayPixelHeight(activity) >= 600) {
+            actionableEmptyView.image.visibility = View.VISIBLE
         } else {
-            toggleDomainRegistrationCtaVisibility()
+            actionableEmptyView.image.visibility = View.GONE
         }
-        scroll_view.visibility = View.VISIBLE
-        actionable_empty_view.visibility = View.GONE
+    }
+
+    private fun MySiteFragmentBinding.showContent(site: SiteModel) {
+        showDomainRegistrationIfNeeded(site)
+
+        scrollView.visibility = View.VISIBLE
+        actionableEmptyView.visibility = View.GONE
         toggleAdminVisibility(site)
-        val themesVisibility = if (ThemeBrowserActivity.isAccessible(site)) View.VISIBLE else View.GONE
-        my_site_look_and_feel_header.visibility = themesVisibility
-        row_themes.visibility = themesVisibility
+        val themesVisibility = if (themeBrowserUtils.isAccessible(site)) View.VISIBLE else View.GONE
+        mySiteLookAndFeelHeader.visibility = themesVisibility
+        rowThemes.visibility = themesVisibility
 
         // sharing is only exposed for sites accessed via the WPCOM REST API (wpcom or Jetpack)
         val sharingVisibility = if (SiteUtils.isAccessedViaWPComRest(site)) View.VISIBLE else View.GONE
-        row_sharing.visibility = sharingVisibility
+        rowSharing.visibility = sharingVisibility
 
         // show settings for all self-hosted to expose Delete Site
-        val isAdminOrSelfHosted = site.hasCapabilityManageOptions || !SiteUtils.isAccessedViaWPComRest(
-                site
-        )
-        row_settings.visibility = if (isAdminOrSelfHosted) View.VISIBLE else View.GONE
-        row_people.visibility = if (site.hasCapabilityListUsers) View.VISIBLE else View.GONE
-        row_plugins.visibility = if (PluginUtils.isPluginFeatureAvailable(site)) View.VISIBLE else View.GONE
+        val isAdminOrSelfHosted = site.hasCapabilityManageOptions || !SiteUtils.isAccessedViaWPComRest(site)
+        rowSettings.visibility = if (isAdminOrSelfHosted) View.VISIBLE else View.GONE
+        rowPeople.visibility = if (site.hasCapabilityListUsers) View.VISIBLE else View.GONE
+        rowPlugins.visibility = if (PluginUtils.isPluginFeatureAvailable(site)) View.VISIBLE else View.GONE
 
         // if either people or settings is visible, configuration header should be visible
         val settingsVisibility = if (isAdminOrSelfHosted || site.hasCapabilityListUsers) View.VISIBLE else View.GONE
-        my_site_configuration_header.visibility = settingsVisibility
+        mySiteConfigurationHeader.visibility = settingsVisibility
         imageManager.load(
-                my_site_blavatar,
-                BLAVATAR,
+                mySiteBlavatar,
+                SiteUtils.getSiteImageType(site.isWpForTeamsSite, SQUARE),
                 SiteUtils.getSiteIconUrl(site, blavatarSz)
         )
         val homeUrl = SiteUtils.getHomeURLOrHostName(site)
         val blogTitle = SiteUtils.getSiteNameOrHomeURL(site)
-        site_info_container.title.text = blogTitle
-        site_info_container.subtitle.text = homeUrl
+        siteInfoContainer.title.text = blogTitle
+        siteInfoContainer.subtitle.text = homeUrl
 
         // Hide the Plan item if the Plans feature is not available for this blog
+        showPlanIfNeeded(site)
+
+        val jetpackSectionVisible = site.isJetpackConnected && // jetpack is installed and connected
+                !site.isWPComAtomic // isn't atomic site
+
+        val jetpackSettingsVisible = jetpackSectionVisible &&
+                SiteUtils.isAccessedViaWPComRest(site) && // is using .com login
+                site.hasCapabilityManageOptions // has permissions to manage the site
+
+        uiHelpers.updateVisibility(rowLabelJetpack, jetpackSectionVisible)
+        uiHelpers.updateVisibility(rowJetpackSettings, jetpackSettingsVisible)
+
+        // Do not show pages menu item to Collaborators.
+        val pageVisibility = if (site.isSelfHostedAdmin || site.hasCapabilityEditPages) View.VISIBLE else View.GONE
+        rowPages.visibility = pageVisibility
+        quickActionPagesContainer.visibility = pageVisibility
+        middleQuickActionSpacing.visibility = pageVisibility
+    }
+
+    private fun MySiteFragmentBinding.showDomainRegistrationIfNeeded(site: SiteModel) {
+        if (SiteUtils.onFreePlan(site) || SiteUtils.hasCustomDomain(site)) {
+            isDomainCreditAvailable = false
+            toggleDomainRegistrationCtaVisibility()
+        } else if (!isDomainCreditChecked) {
+            fetchSitePlans(site)
+        } else {
+            toggleDomainRegistrationCtaVisibility()
+        }
+    }
+
+    private fun MySiteFragmentBinding.showPlanIfNeeded(site: SiteModel) {
         val planShortName = site.planShortName
-        if (!TextUtils.isEmpty(planShortName) && site.hasCapabilityManageOptions) {
+        if (!TextUtils.isEmpty(planShortName) && site.hasCapabilityManageOptions && !site.isWpForTeamsSite) {
             if (site.isWPCom || site.isAutomatedTransfer) {
-                my_site_current_plan_text_view.text = planShortName
-                row_plan.visibility = View.VISIBLE
+                mySiteCurrentPlanTextView.text = planShortName
+                rowPlan.visibility = View.VISIBLE
             } else {
                 // TODO: Support Jetpack plans
-                row_plan.visibility = View.GONE
+                rowPlan.visibility = View.GONE
             }
         } else {
-            row_plan.visibility = View.GONE
+            rowPlan.visibility = View.GONE
         }
-
-        // Do not show pages menu item to Collaborators.
-        val pageVisibility = if (site.isSelfHostedAdmin || site.hasCapabilityEditPages) View.VISIBLE else View.GONE
-        row_pages.visibility = pageVisibility
-        quick_action_pages_container.visibility = pageVisibility
-        middle_quick_action_spacing.visibility = pageVisibility
     }
 
-    private fun toggleAdminVisibility(site: SiteModel?) {
+    private fun MySiteFragmentBinding.toggleAdminVisibility(site: SiteModel?) {
         if (site == null) {
             return
         }
         if (shouldHideWPAdmin(site)) {
-            row_admin.visibility = View.GONE
+            rowAdmin.visibility = View.GONE
         } else {
-            row_admin.visibility = View.VISIBLE
+            rowAdmin.visibility = View.VISIBLE
         }
     }
 
@@ -1076,7 +1092,7 @@ class MySiteFragment : Fragment(),
 
     override fun onScrollToTop() {
         if (isAdded) {
-            scroll_view.smoothScrollTo(0, 0)
+            binding?.scrollView?.smoothScrollTo(0, 0)
         }
     }
 
@@ -1097,11 +1113,10 @@ class MySiteFragment : Fragment(),
      * method might return an out of date SiteModel, if the OnSiteChanged event handler in the WPMainActivity wasn't
      * called yet.
      */
-    fun onSiteChanged(site: SiteModel?) {
+    private fun MySiteFragmentBinding.onSiteChanged(site: SiteModel?) {
         // whenever site changes we hide CTA and check for credit in refreshSelectedSiteDetails()
         isDomainCreditChecked = false
         refreshSelectedSiteDetails(site)
-        showSiteIconProgressBar(false)
     }
 
     @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
@@ -1109,14 +1124,14 @@ class MySiteFragment : Fragment(),
         AnalyticsTracker.track(MY_SITE_ICON_UPLOAD_UNSUCCESSFUL)
         EventBus.getDefault().removeStickyEvent(event)
         if (isMediaUploadInProgress) {
-            showSiteIconProgressBar(false)
+            selectedSiteRepository.showSiteIconProgressBar(false)
         }
         val site = selectedSite
         if (site != null && event.post != null) {
             if (event.post.localSiteId == site.id) {
                 uploadUtilsWrapper.onPostUploadedSnackbarHandler(
                         activity,
-                        requireActivity().findViewById(R.id.coordinator), true,
+                        requireActivity().findViewById(R.id.coordinator), true, false,
                         event.post, event.errorMessage, site
                 )
             }
@@ -1135,37 +1150,37 @@ class MySiteFragment : Fragment(),
         EventBus.getDefault().removeStickyEvent(event)
         val site = selectedSite
         if (site != null) {
-            if (isMediaUploadInProgress) {
-                if (event.mediaModelList.size > 0) {
-                    val media = event.mediaModelList[0]
-                    imageManager.load(
-                            my_site_blavatar,
-                            BLAVATAR,
-                            PhotonUtils
-                                    .getPhotonImageUrl(
-                                            media.url,
-                                            blavatarSz,
-                                            blavatarSz,
-                                            HIGH,
-                                            site.isPrivateWPComAtomic
-                                    )
-                    )
-                    updateSiteIconMediaId(media.mediaId.toInt())
-                } else {
-                    AppLog.w(
-                            MAIN,
-                            "Site icon upload completed, but mediaList is empty."
-                    )
-                }
-                showSiteIconProgressBar(false)
+            binding?.handleUploadMediaSuccessEvent(site, event)
+        }
+    }
+
+    private fun MySiteFragmentBinding.handleUploadMediaSuccessEvent(site: SiteModel, event: UploadMediaSuccessEvent) {
+        if (isMediaUploadInProgress) {
+            if (event.mediaModelList.size > 0) {
+                val media = event.mediaModelList[0]
+                imageManager.load(
+                        mySiteBlavatar,
+                        BLAVATAR,
+                        PhotonUtils.getPhotonImageUrl(
+                                media.url,
+                                blavatarSz,
+                                blavatarSz,
+                                HIGH,
+                                site.isPrivateWPComAtomic
+                        )
+                )
+                updateSiteIconMediaId(media.mediaId.toInt(), false)
             } else {
-                if (event.mediaModelList != null && event.mediaModelList.isNotEmpty()) {
-                    uploadUtilsWrapper.onMediaUploadedSnackbarHandler(
-                            activity,
-                            requireActivity().findViewById(R.id.coordinator), false,
-                            event.mediaModelList, site, event.successMessage
-                    )
-                }
+                AppLog.w(MAIN, "Site icon upload completed, but mediaList is empty.")
+            }
+            selectedSiteRepository.showSiteIconProgressBar(false)
+        } else {
+            if (event.mediaModelList != null && event.mediaModelList.isNotEmpty()) {
+                uploadUtilsWrapper.onMediaUploadedSnackbarHandler(
+                        activity,
+                        requireActivity().findViewById(R.id.coordinator), false,
+                        event.mediaModelList, site, event.successMessage
+                )
             }
         }
     }
@@ -1176,7 +1191,7 @@ class MySiteFragment : Fragment(),
         if (!event.isSuccess()) {
             // note: no tracking added here as we'll perform tracking in StoryMediaSaveUploadBridge
             val errorText = String.format(
-                    getString(string.story_saving_snackbar_finished_with_error),
+                    getString(R.string.story_saving_snackbar_finished_with_error),
                     getStoryAtIndex(event.storyIndex).title
             )
             val snackbarMessage = buildSnackbarErrorMessage(
@@ -1187,37 +1202,21 @@ class MySiteFragment : Fragment(),
             uploadUtilsWrapper.showSnackbarError(
                     requireActivity().findViewById<View>(R.id.coordinator),
                     snackbarMessage,
-                    string.story_saving_failed_quick_action_manage,
-                    View.OnClickListener { view: View? ->
-                        val intent = Intent(
-                                requireActivity(),
-                                StoryComposerActivity::class.java
-                        )
-                        intent.putExtra(KEY_STORY_SAVE_RESULT, event)
-                        intent.putExtra(WordPress.SITE, selectedSite)
-
-                        // we need to have a way to cancel the related error notification when the user comes
-                        // from tapping on MANAGE on the snackbar (otherwise they'll be able to discard the
-                        // errored story but the error notification will remain existing in the system dashboard)
-                        intent.action = getNotificationIdForError(
-                                StoryComposerActivity.BASE_FRAME_MEDIA_ERROR_NOTIFICATION_ID,
-                                event.storyIndex
-                        ).toString() + ""
-
-                        // TODO WPSTORIES add TRACKS: the putExtra described here below for NOTIFICATION_TYPE
-                        // is meant to be used for tracking purposes. Use it!
-                        // TODO add NotificationType.MEDIA_SAVE_ERROR param later when integrating with WPAndroid
-                        //        val notificationType = NotificationType.MEDIA_SAVE_ERROR
-                        //        notificationIntent.putExtra(ARG_NOTIFICATION_TYPE, notificationType)
-
-                        storiesTrackerHelper.trackStorySaveResultEvent(
-                                event,
-                                STORY_SAVE_ERROR_SNACKBAR_MANAGE_TAPPED
+                    R.string.story_saving_failed_quick_action_manage
+            ) {
+                // TODO WPSTORIES add TRACKS: the putExtra described here below for NOTIFICATION_TYPE
+                // is meant to be used for tracking purposes. Use it!
+                // TODO add NotificationType.MEDIA_SAVE_ERROR param later when integrating with WPAndroid
+                //        val notificationType = NotificationType.MEDIA_SAVE_ERROR
+                //        notificationIntent.putExtra(ARG_NOTIFICATION_TYPE, notificationType)
+
+                storiesTrackerHelper.trackStorySaveResultEvent(
+                        event,
+                        STORY_SAVE_ERROR_SNACKBAR_MANAGE_TAPPED
 
-                        )
-                        startActivity(intent)
-                    }
-            )
+                )
+                ActivityLauncher.viewStories(requireActivity(), selectedSite, event)
+            }
         }
     }
 
@@ -1225,7 +1224,7 @@ class MySiteFragment : Fragment(),
     fun onStorySaveStart(event: StorySaveProcessStart) {
         EventBus.getDefault().removeStickyEvent(event)
         val snackbarMessage = String.format(
-                getString(string.story_saving_snackbar_started),
+                getString(R.string.story_saving_snackbar_started),
                 getStoryAtIndex(event.storyIndex).title
         )
         uploadUtilsWrapper.showSnackbar(
@@ -1250,7 +1249,7 @@ class MySiteFragment : Fragment(),
             TAG_REMOVE_NEXT_STEPS_DIALOG -> {
                 AnalyticsTracker.track(QUICK_START_REMOVE_DIALOG_POSITIVE_TAPPED)
                 skipQuickStart()
-                updateQuickStartContainer()
+                binding?.updateQuickStartContainer()
                 clearActiveQuickStart()
             }
             else -> {
@@ -1274,19 +1273,19 @@ class MySiteFragment : Fragment(),
     }
 
     private fun startQuickStart() {
-        quickStartStore.setDoneTask(AppPrefs.getSelectedSite().toLong(), CREATE_SITE, true)
-        updateQuickStartContainer()
+        quickStartUtilsWrapper.startQuickStart(AppPrefs.getSelectedSite())
+        binding?.updateQuickStartContainer()
     }
 
-    private fun toggleDomainRegistrationCtaVisibility() {
+    private fun MySiteFragmentBinding.toggleDomainRegistrationCtaVisibility() {
         if (isDomainCreditAvailable) {
             // we nest this check because of some weirdness with ui state and race conditions
-            if (my_site_register_domain_cta.visibility != View.VISIBLE) {
+            if (mySiteRegisterDomainCta.visibility != View.VISIBLE) {
                 AnalyticsTracker.track(DOMAIN_CREDIT_PROMPT_SHOWN)
-                my_site_register_domain_cta.visibility = View.VISIBLE
+                mySiteRegisterDomainCta.visibility = View.VISIBLE
             }
         } else {
-            my_site_register_domain_cta.visibility = View.GONE
+            mySiteRegisterDomainCta.visibility = View.GONE
         }
     }
 
@@ -1295,8 +1294,7 @@ class MySiteFragment : Fragment(),
             TAG_ADD_SITE_ICON_DIALOG -> showQuickStartNoticeIfNecessary()
             TAG_CHANGE_SITE_ICON_DIALOG -> {
                 AnalyticsTracker.track(MY_SITE_ICON_REMOVED)
-                showSiteIconProgressBar(true)
-                updateSiteIconMediaId(0)
+                updateSiteIconMediaId(0, true)
             }
             TAG_QUICK_START_DIALOG -> AnalyticsTracker.track(QUICK_START_REQUEST_DIALOG_NEGATIVE_TAPPED)
             TAG_REMOVE_NEXT_STEPS_DIALOG -> AnalyticsTracker.track(QUICK_START_REMOVE_DIALOG_NEGATIVE_TAPPED)
@@ -1343,24 +1341,7 @@ class MySiteFragment : Fragment(),
     }
 
     override fun onLinkClicked(instanceTag: String) {}
-    override fun onSettingsSaved() {
-        // refresh the site after site icon change
-        val site = selectedSite
-        if (site != null) {
-            dispatcher.dispatch(SiteActionBuilder.newFetchSiteAction(site))
-        }
-    }
-
-    override fun onSaveError(error: Exception) {
-        showSiteIconProgressBar(false)
-    }
-
-    override fun onFetchError(error: Exception) {
-        showSiteIconProgressBar(false)
-    }
 
-    override fun onSettingsUpdated() {}
-    override fun onCredentialsValidated(error: Exception?) {}
     private fun fetchSitePlans(site: SiteModel?) {
         dispatcher.dispatch(SiteActionBuilder.newFetchPlansAction(site))
     }
@@ -1378,7 +1359,7 @@ class MySiteFragment : Fragment(),
         } else {
             isDomainCreditChecked = true
             isDomainCreditAvailable = isDomainCreditAvailable(event.plans)
-            toggleDomainRegistrationCtaVisibility()
+            binding?.toggleDomainRegistrationCtaVisibility()
         }
     }
 
@@ -1406,7 +1387,9 @@ class MySiteFragment : Fragment(),
                 horizontalOffset = focusPointSize
                 verticalOffset = -focusPointSize / 2
             }
-            activeTutorialPrompt!!.task == CHECK_STATS || activeTutorialPrompt!!.task == CREATE_NEW_PAGE -> {
+            activeTutorialPrompt!!.task == CHECK_STATS ||
+                    activeTutorialPrompt!!.task == REVIEW_PAGES ||
+                    activeTutorialPrompt!!.task == EDIT_HOMEPAGE -> {
                 horizontalOffset = -focusPointSize / 4
                 verticalOffset = -focusPointSize / 4
             }
@@ -1432,7 +1415,7 @@ class MySiteFragment : Fragment(),
 
         // highlight MySite row and scroll to it
         if (!isTargetingBottomNavBar(activeTutorialPrompt!!.task)) {
-            scroll_view.post { scroll_view.smoothScrollTo(0, quickStartTarget.top) }
+            binding?.scrollView?.post { binding?.scrollView?.smoothScrollTo(0, quickStartTarget.top) }
         }
     }
 
@@ -1465,14 +1448,11 @@ class MySiteFragment : Fragment(),
                             activeTutorialPrompt != null &&
                             activeTutorialPrompt!!.task == quickStartTask
             )
-            completeTaskAndRemindNextOne(
-                    quickStartStore, quickStartTask, dispatcher,
-                    site, context = requireContext()
-            )
+            quickStartUtilsWrapper.completeTaskAndRemindNextOne(quickStartTask, site, context = requireContext())
             // We update completed tasks counter onResume, but UPLOAD_SITE_ICON can be completed without navigating
             // away from the activity, so we are updating counter here
             if (quickStartTask == UPLOAD_SITE_ICON) {
-                updateQuickStartContainer()
+                binding?.updateQuickStartContainer()
             }
             if (activeTutorialPrompt != null && activeTutorialPrompt!!.task == quickStartTask) {
                 removeQuickStartFocusPoint()
@@ -1523,12 +1503,12 @@ class MySiteFragment : Fragment(),
                     HtmlCompat.fromHtml(
                             getString(
                                     R.string.quick_start_dialog_update_site_title_message_short,
-                                    site_info_container.title.text.toString()
+                                    binding?.siteInfoContainer?.title?.text.toString()
                             ), HtmlCompat.FROM_HTML_MODE_COMPACT
                     )
                 } else {
-                    stylizeQuickStartPrompt(
-                            requireActivity(),
+                    quickStartUtilsWrapper.stylizeQuickStartPrompt(
+                            requireContext(),
                             activeTutorialPrompt!!.shortMessagePrompt,
                             activeTutorialPrompt!!.iconId
                     )
@@ -1559,11 +1539,8 @@ class MySiteFragment : Fragment(),
         }
     }
 
-    private fun updateSiteIconMediaId(mediaId: Int) {
-        siteSettings?.let {
-            it.setSiteIconMediaId(mediaId)
-            it.saveSettings()
-        }
+    private fun updateSiteIconMediaId(mediaId: Int, showProgressBar: Boolean) {
+        selectedSiteRepository.updateSiteIconMediaId(mediaId, showProgressBar)
     }
 
     companion object {
@@ -1587,32 +1564,30 @@ class MySiteFragment : Fragment(),
     }
 
     override fun onSuccessfulInput(input: String, callbackId: Int) {
-        if (callbackId == site_info_container.title.id && selectedSite != null) {
-            if (!NetworkUtils.isNetworkAvailable(activity)) {
-                WPSnackbar.make(
-                        requireActivity().findViewById(R.id.coordinator),
-                        R.string.error_update_site_title_network,
-                        getSnackbarDuration(activity, Snackbar.LENGTH_SHORT)
-                ).show()
-                return
-            }
+        binding?.apply {
+            if (callbackId == siteInfoContainer.title.id && selectedSite != null) {
+                if (!NetworkUtils.isNetworkAvailable(activity)) {
+                    WPSnackbar.make(
+                            requireActivity().findViewById(R.id.coordinator),
+                            R.string.error_update_site_title_network,
+                            getSnackbarDuration(activity, Snackbar.LENGTH_SHORT)
+                    ).show()
+                    return
+                }
 
-            site_info_container.title.text = input
-            selectedSite?.name = input
-            // save the site locally with updated title
-            dispatcher.dispatch(SiteActionBuilder.newUpdateSiteAction(selectedSite))
+                siteInfoContainer.title.text = input
 
-            siteSettings?.let {
-                it.title = input
-                it.saveSettings()
+                selectedSiteRepository.updateTitle(input)
             }
         }
     }
 
     override fun onTextInputDialogDismissed(callbackId: Int) {
-        if (callbackId == site_info_container.title.id) {
-            showQuickStartNoticeIfNecessary()
-            updateQuickStartContainer()
+        binding?.apply {
+            if (callbackId == siteInfoContainer.title.id) {
+                showQuickStartNoticeIfNecessary()
+                updateQuickStartContainer()
+            }
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
index 60ecfa2ec54d..eeb803311fc7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
@@ -16,7 +16,6 @@
 import androidx.appcompat.widget.SearchView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -122,7 +121,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getApplication()).component().inject(this);
 
-        mViewModel = ViewModelProviders.of(this, mViewModelFactory).get(SitePickerViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(SitePickerViewModel.class);
 
         setContentView(R.layout.site_picker_activity);
         restoreSavedInstanceState(savedInstanceState);
@@ -241,7 +240,7 @@ private void updateMenuItemVisibility() {
         } else {
             // don't allow editing visibility unless there are multiple wp.com and jetpack sites
             mMenuEdit.setVisible(mSiteStore.getSitesAccessedViaWPComRestCount() > 1);
-            mMenuAdd.setVisible(true);
+            mMenuAdd.setVisible(!BuildConfig.IS_JETPACK_APP);
         }
 
         // no point showing search if there aren't multiple blogs
@@ -356,7 +355,7 @@ private void initSwipeToRefreshHelper(View view) {
                         mSwipeToRefreshHelper.setRefreshing(false);
                         return;
                     }
-                    mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction());
+                    mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction(SiteUtils.getFetchSitesPayload()));
                 }
         );
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
index d12c7911ac43..abfddce7d0fe 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java
@@ -28,6 +28,7 @@
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ViewUtilsKt;
+import org.wordpress.android.util.image.BlavatarShape;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
 
@@ -312,7 +313,7 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder viewHolder,
         final SiteViewHolder holder = (SiteViewHolder) viewHolder;
         holder.mTxtTitle.setText(site.getBlogNameOrHomeURL());
         holder.mTxtDomain.setText(site.mHomeURL);
-        mImageManager.loadImageWithCorners(holder.mImgBlavatar, ImageType.BLAVATAR_ROUNDED_CORNERS, site.mBlavatarUrl,
+        mImageManager.loadImageWithCorners(holder.mImgBlavatar, site.getBlavatarType(), site.mBlavatarUrl,
                 DisplayUtils.dpToPx(holder.itemView.getContext(), 4));
 
         if ((site.mLocalId == mCurrentLocalId && !mIsMultiSelectEnabled
@@ -768,6 +769,7 @@ public static class SiteRecord {
         private final String mBlogName;
         private final String mHomeURL;
         private final String mBlavatarUrl;
+        private final ImageType mBlavatarType;
         private boolean mIsHidden;
         private boolean mIsRecentPick;
 
@@ -777,6 +779,8 @@ public static class SiteRecord {
             mBlogName = SiteUtils.getSiteNameOrHomeURL(siteModel);
             mHomeURL = SiteUtils.getHomeURLOrHostName(siteModel);
             mBlavatarUrl = SiteUtils.getSiteIconUrl(siteModel, mBlavatarSz);
+            mBlavatarType = SiteUtils.getSiteImageType(
+                    siteModel.isWpForTeamsSite(), BlavatarShape.SQUARE_WITH_ROUNDED_CORNERES);
             mIsHidden = !siteModel.isVisible();
         }
 
@@ -807,6 +811,10 @@ public String getBlavatarUrl() {
             return mBlavatarUrl;
         }
 
+        public ImageType getBlavatarType() {
+            return mBlavatarType;
+        }
+
         public long getSiteId() {
             return mSiteId;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
index d2e193482809..245d967b4bf1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -22,7 +22,6 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
@@ -32,6 +31,7 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.jetbrains.annotations.NotNull;
+import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
@@ -81,6 +81,8 @@
 import org.wordpress.android.ui.main.WPMainNavigationView.OnPageListener;
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType;
 import org.wordpress.android.ui.mlp.ModalLayoutPickerFragment;
+import org.wordpress.android.ui.mysite.QuickStartRepository;
+import org.wordpress.android.ui.mysite.SelectedSiteRepository;
 import org.wordpress.android.ui.notifications.NotificationEvents;
 import org.wordpress.android.ui.notifications.NotificationsListFragment;
 import org.wordpress.android.ui.notifications.SystemNotificationsTracker;
@@ -100,10 +102,12 @@
 import org.wordpress.android.ui.prefs.AppSettingsFragment;
 import org.wordpress.android.ui.prefs.SiteSettingsFragment;
 import org.wordpress.android.ui.quickstart.QuickStartEvent;
+import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts;
 import org.wordpress.android.ui.reader.ReaderFragment;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
 import org.wordpress.android.ui.reader.tracker.ReaderTracker;
+import org.wordpress.android.ui.stats.StatsTimeframe;
 import org.wordpress.android.ui.stories.intro.StoriesIntroDialogFragment;
 import org.wordpress.android.ui.uploads.UploadActionUseCase;
 import org.wordpress.android.ui.uploads.UploadUtils;
@@ -118,15 +122,18 @@
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ProfilingUtils;
 import org.wordpress.android.util.QuickStartUtils;
+import org.wordpress.android.util.QuickStartUtilsWrapper;
 import org.wordpress.android.util.ShortcutUtils;
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ViewUtilsKt;
 import org.wordpress.android.util.WPActivityUtils;
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.service.InstallationReferrerServiceStarter;
-import org.wordpress.android.util.config.ModalLayoutPickerFeatureConfig;
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel;
+import org.wordpress.android.viewmodel.main.WPMainActivityViewModel.FocusPointInfo;
 import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel;
 import org.wordpress.android.widgets.AppRatingDialog;
 import org.wordpress.android.widgets.WPDialogSnackbar;
@@ -164,6 +171,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
     public static final String ARG_SHOW_LOGIN_EPILOGUE = "show_login_epilogue";
     public static final String ARG_SHOW_SIGNUP_EPILOGUE = "show_signup_epilogue";
     public static final String ARG_SHOW_SITE_CREATION = "show_site_creation";
+    public static final String ARG_WP_COM_SIGN_UP = "sign_up";
     public static final String ARG_OPEN_PAGE = "open_page";
     public static final String ARG_MY_SITE = "show_my_site";
     public static final String ARG_NOTIFICATIONS = "show_notifications";
@@ -172,6 +180,7 @@ public class WPMainActivity extends LocaleAwareActivity implements
     public static final String ARG_EDITOR = "show_editor";
     public static final String ARG_SHOW_ZENDESK_NOTIFICATIONS = "show_zendesk_notifications";
     public static final String ARG_STATS = "show_stats";
+    public static final String ARG_STATS_TIMEFRAME = "stats_timeframe";
     public static final String ARG_PAGES = "show_pages";
 
     // Track the first `onResume` event for the current session so we can use it for Analytics tracking
@@ -185,7 +194,6 @@ public class WPMainActivity extends LocaleAwareActivity implements
     private boolean mIsMagicLinkLogin;
     private boolean mIsMagicLinkSignup;
 
-    private SiteModel mSelectedSite;
     private WPMainActivityViewModel mViewModel;
     private ModalLayoutPickerViewModel mMLPViewModel;
     private FloatingActionButton mFloatingActionButton;
@@ -207,9 +215,13 @@ public class WPMainActivity extends LocaleAwareActivity implements
     @Inject UploadUtilsWrapper mUploadUtilsWrapper;
     @Inject ViewModelProvider.Factory mViewModelFactory;
     @Inject PrivateAtomicCookie mPrivateAtomicCookie;
-    @Inject ModalLayoutPickerFeatureConfig mModalLayoutPickerFeatureConfig;
     @Inject ReaderTracker mReaderTracker;
     @Inject MediaPickerLauncher mMediaPickerLauncher;
+    @Inject MySiteImprovementsFeatureConfig mMySiteImprovementsFeatureConfig;
+    @Inject SelectedSiteRepository mSelectedSiteRepository;
+    @Inject QuickStartRepository mQuickStartRepository;
+    @Inject QuickStartUtilsWrapper mQuickStartUtilsWrapper;
+    @Inject AnalyticsTrackerWrapper mAnalyticsTrackerWrapper;
 
     /*
      * fragments implement this if their contents can be scrolled, called when user
@@ -227,6 +239,17 @@ public interface OnActivityBackPressedListener {
         boolean onActivityBackPressed();
     }
 
+    private final Runnable mShowFabFocusPoint = () -> {
+        if (isFinishing()) {
+            return;
+        }
+        boolean focusPointVisible =
+                findViewById(R.id.fab_container).findViewById(R.id.quick_start_focus_point) != null;
+        if (!focusPointVisible) {
+            addOrRemoveQuickStartFocusPoint(QuickStartTask.PUBLISH_POST, true);
+        }
+    };
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         ProfilingUtils.split("WPMainActivity.onCreate");
@@ -237,7 +260,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         mBottomNav = findViewById(R.id.bottom_navigation);
 
-        mBottomNav.init(getSupportFragmentManager(), this);
+        mBottomNav.init(getSupportFragmentManager(), this, mMySiteImprovementsFeatureConfig.isEnabled());
 
         mConnectionBar = findViewById(R.id.connection_bar);
         mConnectionBar.setOnClickListener(v -> {
@@ -320,7 +343,11 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
                 if (mIsMagicLinkLogin) {
                     authTokenToSet = getAuthToken();
                 } else {
-                    ActivityLauncher.showSignInForResult(this);
+                    if (BuildConfig.IS_JETPACK_APP) {
+                        ActivityLauncher.showSignInForResultJetpackOnly(this);
+                    } else {
+                        ActivityLauncher.showSignInForResult(this);
+                    }
                     finish();
                 }
             }
@@ -354,6 +381,9 @@ && getIntent().getExtras().getBoolean(ARG_CONTINUE_JETPACK_CONNECT, false)) {
         } else if (getIntent().getBooleanExtra(ARG_SHOW_SITE_CREATION, false) && savedInstanceState == null) {
             canShowAppRatingPrompt = false;
             ActivityLauncher.newBlogForResult(this);
+        } else if (getIntent().getBooleanExtra(ARG_WP_COM_SIGN_UP, false) && savedInstanceState == null) {
+            canShowAppRatingPrompt = false;
+            ActivityLauncher.showSignInForResultWpComOnly(this);
         }
 
         if (isGooglePlayServicesAvailable(this)) {
@@ -397,8 +427,8 @@ private void initViewModel() {
         mFloatingActionButton = findViewById(R.id.fab_button);
         mFabTooltip = findViewById(R.id.fab_tooltip);
 
-        mViewModel = ViewModelProviders.of(this, mViewModelFactory).get(WPMainActivityViewModel.class);
-        mMLPViewModel = ViewModelProviders.of(this, mViewModelFactory).get(ModalLayoutPickerViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(WPMainActivityViewModel.class);
+        mMLPViewModel = new ViewModelProvider(this, mViewModelFactory).get(ModalLayoutPickerViewModel.class);
 
         // Setup Observers
         mViewModel.getFabUiState().observe(this, fabUiState -> {
@@ -419,17 +449,24 @@ private void initViewModel() {
             } else {
                 mFloatingActionButton.hide();
             }
+
+            if (mMySiteImprovementsFeatureConfig.isEnabled()) {
+                if (fabUiState.isFocusPointVisible()) {
+                    mHandler.postDelayed(mShowFabFocusPoint, 200);
+                } else if (!fabUiState.isFocusPointVisible()) {
+                    mHandler.removeCallbacks(mShowFabFocusPoint);
+                    mHandler.post(() -> addOrRemoveQuickStartFocusPoint(QuickStartTask.PUBLISH_POST, false));
+                }
+            }
         });
 
         mViewModel.getCreateAction().observe(this, createAction -> {
             switch (createAction) {
                 case CREATE_NEW_POST:
                     // complete quick start task outside of QS process
-                    if (getSelectedSite() != null) {
-                        QuickStartUtils.completeTaskAndRemindNextOne(
-                                mQuickStartStore,
+                    if (getSelectedSite() != null && !mMySiteImprovementsFeatureConfig.isEnabled()) {
+                        mQuickStartUtilsWrapper.completeTaskAndRemindNextOne(
                                 QuickStartTask.PUBLISH_POST,
-                                mDispatcher,
                                 getSelectedSite(),
                                 null,
                                 this
@@ -438,7 +475,7 @@ private void initViewModel() {
                     handleNewPostAction(PagePostCreationSourcesDetail.POST_FROM_MY_SITE);
                     break;
                 case CREATE_NEW_PAGE:
-                    if (mModalLayoutPickerFeatureConfig.isEnabled() && mMLPViewModel.canShowModalLayoutPicker()) {
+                    if (mMLPViewModel.canShowModalLayoutPicker()) {
                         mMLPViewModel.createPageFlowTriggered();
                     } else {
                         handleNewPageAction("", "", null,
@@ -446,18 +483,16 @@ private void initViewModel() {
                     }
                     break;
                 case CREATE_NEW_STORY:
-                    handleNewStoryAction(PagePostCreationSourcesDetail.STORY_FROM_MY_SITE);
+                    handleNewStoryAction();
                     break;
             }
         });
 
         mViewModel.getCompleteBottomSheetQuickStartTask().observe(this, event -> {
-             // complete quick start task during QS process and remind of a next one
+            // complete quick start task during QS process and remind of a next one
             if (getSelectedSite() != null) {
-                QuickStartUtils.completeTaskAndRemindNextOne(
-                        mQuickStartStore,
+                mQuickStartUtilsWrapper.completeTaskAndRemindNextOne(
                         QuickStartTask.PUBLISH_POST,
-                        mDispatcher,
                         getSelectedSite(),
                         new QuickStartEvent(QuickStartTask.PUBLISH_POST),
                         this
@@ -465,6 +500,15 @@ private void initViewModel() {
             }
         });
 
+        mViewModel.getOnFocusPointVisibilityChange().observe(this, event ->
+                event.applyIfNotHandled(focusPointInfos -> {
+                    for (FocusPointInfo focusPointInfo : focusPointInfos) {
+                        addOrRemoveQuickStartFocusPoint(focusPointInfo.getTask(), focusPointInfo.isVisible());
+                    }
+                    return null;
+                })
+        );
+
         mMLPViewModel.getOnCreateNewPageRequested().observe(this, request -> {
             handleNewPageAction(request.getTitle(), request.getContent(), request.getTemplate(),
                     PagePostCreationSourcesDetail.PAGE_FROM_MY_SITE);
@@ -486,16 +530,16 @@ private void initViewModel() {
                     getMySiteFragment().requestNextStepOfActiveQuickStartTask(false);
                 }
             }
-            mViewModel.onFabClicked(mSelectedSite, shouldShowPublishPostQuickStartTask);
+            mViewModel.onFabClicked(mSelectedSiteRepository.getSelectedSite(), shouldShowPublishPostQuickStartTask);
         });
 
         mFloatingActionButton.setOnLongClickListener(v -> {
             if (v.isHapticFeedbackEnabled()) {
                 v.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             }
-            mViewModel.onFabLongPressed(mSelectedSite);
+            mViewModel.onFabLongPressed(mSelectedSiteRepository.getSelectedSite());
 
-            int messageId = mViewModel.getCreateContentMessageId(mSelectedSite);
+            int messageId = mViewModel.getCreateContentMessageId(mSelectedSiteRepository.getSelectedSite());
 
             Toast.makeText(v.getContext(), messageId, Toast.LENGTH_SHORT).show();
             return true;
@@ -504,7 +548,7 @@ private void initViewModel() {
         ViewUtilsKt.redirectContextClickToLongPressListener(mFloatingActionButton);
 
         mFabTooltip.setOnClickListener(v -> {
-            mViewModel.onTooltipTapped(mSelectedSite);
+            mViewModel.onTooltipTapped(mSelectedSiteRepository.getSelectedSite());
         });
 
         mViewModel.isBottomSheetShowing().observe(this, event -> {
@@ -544,26 +588,30 @@ private void initViewModel() {
         });
 
         mViewModel.getStartLoginFlow().observe(this, event -> {
-            event.applyIfNotHandled(startLoginFlow -> {
+            event.applyIfNotHandled(unit -> {
+                ActivityLauncher.viewMeActivityForResult(this);
+
+                return null;
+            });
+        });
+
+        mViewModel.getSwitchToMySite().observe(this, event -> {
+            event.applyIfNotHandled(unit -> {
                 if (mBottomNav != null) {
-                    mBottomNav.postDelayed(new Runnable() {
-                        @Override public void run() {
-                            mBottomNav.setCurrentSelectedPage(PageType.MY_SITE);
-                        }
-                    }, 500);
-                    ActivityLauncher.viewMeActivityForResult(this);
+                    mBottomNav.setCurrentSelectedPage(PageType.MY_SITE);
                 }
 
                 return null;
             });
         });
 
+
         // At this point we still haven't initialized mSelectedSite, which will mean that the ViewModel
         // will act as though SiteUtils.hasFullAccessToContent() is false, and as such the state will be
         // initialized with the most restrictive rights case. This is OK and will be frequently checked
         // to normalize the UI state whenever mSelectedSite changes.
         // It also means that the ViewModel must accept a nullable SiteModel.
-        mViewModel.start(mSelectedSite);
+        mViewModel.start(mSelectedSiteRepository.getSelectedSite());
     }
 
     private @Nullable String getAuthToken() {
@@ -603,22 +651,30 @@ private void handleOpenPageIntent(Intent intent) {
                     }
                     break;
                 case ARG_EDITOR:
-                    if (mSelectedSite == null) {
+                    if (!mSelectedSiteRepository.hasSelectedSite()) {
                         initSelectedSite();
                     }
                     onNewPostButtonClicked();
                     break;
                 case ARG_STATS:
-                    if (mSelectedSite == null) {
+                    if (!mSelectedSiteRepository.hasSelectedSite()) {
                         initSelectedSite();
                     }
-                    ActivityLauncher.viewBlogStats(this, mSelectedSite);
+                    if (intent.hasExtra(ARG_STATS_TIMEFRAME)) {
+                        ActivityLauncher.viewBlogStatsForTimeframe(this, mSelectedSiteRepository.getSelectedSite(),
+                                (StatsTimeframe) intent.getSerializableExtra(ARG_STATS_TIMEFRAME));
+                    } else {
+                        ActivityLauncher.viewBlogStats(this, mSelectedSiteRepository.getSelectedSite());
+                    }
                     break;
                 case ARG_PAGES:
-                    if (mSelectedSite == null) {
+                    if (!mSelectedSiteRepository.hasSelectedSite()) {
                         initSelectedSite();
                     }
-                    ActivityLauncher.viewCurrentBlogPages(this, mSelectedSite);
+                    ActivityLauncher.viewCurrentBlogPages(this, mSelectedSiteRepository.getSelectedSite());
+                    break;
+                case ARG_WP_COM_SIGN_UP:
+                    ActivityLauncher.showSignInForResultWpComOnly(this);
                     break;
             }
         } else {
@@ -805,8 +861,8 @@ protected void onResume() {
         ProfilingUtils.dump();
         ProfilingUtils.stop();
 
-        mViewModel.onResume(mSelectedSite,
-                mSelectedSite != null && mBottomNav.getCurrentSelectedPage() == PageType.MY_SITE);
+        mViewModel.onResume(mSelectedSiteRepository.getSelectedSite(),
+                mSelectedSiteRepository.hasSelectedSite() && mBottomNav.getCurrentSelectedPage() == PageType.MY_SITE);
 
         mFirstResume = false;
     }
@@ -862,18 +918,28 @@ public void onPageChanged(int position) {
         mReaderTracker.onBottomNavigationTabChanged();
         PageType pageType = WPMainNavigationView.getPageType(position);
         trackLastVisiblePage(pageType, true);
-        if (getMySiteFragment() != null) {
-            QuickStartUtils.removeQuickStartFocusPoint((ViewGroup) findViewById(R.id.root_view_main));
-            hideQuickStartSnackBar();
-            if (pageType == PageType.READER && getMySiteFragment().isQuickStartTaskActive(QuickStartTask.FOLLOW_SITE)) {
+
+        if (mMySiteImprovementsFeatureConfig.isEnabled()) {
+            if (pageType == PageType.READER) {
                 // MySite fragment might not be attached to activity, so we need to remove focus point from here
-                getMySiteFragment().requestNextStepOfActiveQuickStartTask();
+                QuickStartUtils.removeQuickStartFocusPoint((ViewGroup) findViewById(R.id.root_view_main));
+                mQuickStartRepository.requestNextStepOfTask(QuickStartTask.FOLLOW_SITE);
+            }
+        } else {
+            if (getMySiteFragment() != null) {
+                QuickStartUtils.removeQuickStartFocusPoint((ViewGroup) findViewById(R.id.root_view_main));
+                hideQuickStartSnackBar();
+                if (pageType == PageType.READER && getMySiteFragment()
+                        .isQuickStartTaskActive(QuickStartTask.FOLLOW_SITE)) {
+                    // MySite fragment might not be attached to activity, so we need to remove focus point from here
+                    getMySiteFragment().requestNextStepOfActiveQuickStartTask();
+                }
             }
         }
 
         mViewModel.onPageChanged(
                 mSiteStore.hasSite() && pageType == PageType.MY_SITE,
-                mSelectedSite);
+                mSelectedSiteRepository.getSelectedSite());
     }
 
     // user tapped the new post button in the bottom navbar
@@ -907,7 +973,7 @@ public void handleNewPostAction(PagePostCreationSourcesDetail source) {
         ActivityLauncher.addNewPostForResult(this, getSelectedSite(), false, source);
     }
 
-    private void handleNewStoryAction(PagePostCreationSourcesDetail source) {
+    private void handleNewStoryAction() {
         if (!mSiteStore.hasSite()) {
             // No site yet - Move to My Sites fragment that shows the create new site screen
             mBottomNav.setCurrentSelectedPage(PageType.MY_SITE);
@@ -919,7 +985,7 @@ private void handleNewStoryAction(PagePostCreationSourcesDetail source) {
             // TODO: evaluate to include the QuickStart logic like in the handleNewPostAction
             if (AppPrefs.shouldShowStoriesIntro()) {
                 StoriesIntroDialogFragment.newInstance(site)
-                        .show(getSupportFragmentManager(), StoriesIntroDialogFragment.TAG);
+                                          .show(getSupportFragmentManager(), StoriesIntroDialogFragment.TAG);
             } else {
                 mMediaPickerLauncher.showStoriesPhotoPickerForResultAndTrack(this, site);
             }
@@ -931,7 +997,9 @@ private void trackLastVisiblePage(PageType pageType, boolean trackAnalytics) {
             case MY_SITE:
                 ActivityId.trackLastActivity(ActivityId.MY_SITE);
                 if (trackAnalytics) {
-                    AnalyticsUtils.trackWithSiteDetails(AnalyticsTracker.Stat.MY_SITE_ACCESSED, getSelectedSite());
+                    mAnalyticsTrackerWrapper
+                            .trackWithSiteDetails(AnalyticsTracker.Stat.MY_SITE_ACCESSED, getSelectedSite(),
+                                    mMySiteImprovementsFeatureConfig);
                 }
                 break;
             case READER:
@@ -975,7 +1043,7 @@ private void setSite(Intent data) {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (mSelectedSite == null) {
+        if (!mSelectedSiteRepository.hasSelectedSite()) {
             initSelectedSite();
         }
         switch (requestCode) {
@@ -1012,10 +1080,6 @@ public void onClick(View v) {
                 }
                 break;
             case RequestCodes.CREATE_SITE:
-                MySiteFragment mySiteFragment = getMySiteFragment();
-                if (mySiteFragment != null) {
-                    mySiteFragment.onActivityResult(requestCode, resultCode, data);
-                }
                 QuickStartUtils.cancelQuickStartReminder(this);
                 AppPrefs.setQuickStartNoticeRequired(false);
                 AppPrefs.setLastSkippedQuickStartTask(null);
@@ -1027,7 +1091,11 @@ public void onClick(View v) {
                 }
 
                 setSite(data);
-                showQuickStartDialog();
+                if (getMySiteFragment() != null) {
+                    showQuickStartDialog();
+                } else {
+                    passOnActivityResultToMySiteFragment(requestCode, resultCode, data);
+                }
                 mPrivateAtomicCookie.clearCookie();
                 break;
             case RequestCodes.ADD_ACCOUNT:
@@ -1048,10 +1116,9 @@ public void onClick(View v) {
                 break;
             case RequestCodes.SITE_PICKER:
                 if (getMySiteFragment() != null) {
-                    getMySiteFragment().onActivityResult(requestCode, resultCode, data);
-
                     boolean isSameSiteSelected = data != null
-                            && data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1) == AppPrefs.getSelectedSite();
+                                                 && data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1) == AppPrefs
+                            .getSelectedSite();
 
                     if (!isSameSiteSelected) {
                         QuickStartUtils.cancelQuickStartReminder(this);
@@ -1059,12 +1126,16 @@ public void onClick(View v) {
                         AppPrefs.setLastSkippedQuickStartTask(null);
                         mPrivateAtomicCookie.clearCookie();
                     }
+                }
 
-                    setSite(data);
+                setSite(data);
 
+                if (getMySiteFragment() != null) {
                     if (data != null && data.getIntExtra(ARG_CREATE_SITE, 0) == RequestCodes.CREATE_SITE) {
                         showQuickStartDialog();
                     }
+                } else {
+                    passOnActivityResultToMySiteFragment(requestCode, resultCode, data);
                 }
                 break;
             case RequestCodes.SITE_SETTINGS:
@@ -1084,15 +1155,8 @@ public void onClick(View v) {
                 break;
             case RequestCodes.STORIES_PHOTO_PICKER:
             case RequestCodes.PHOTO_PICKER:
-                Fragment fragment = mBottomNav.getActiveFragment();
-                if (fragment instanceof MySiteFragment) {
-                    fragment.onActivityResult(requestCode, resultCode, data);
-                }
-                break;
             case RequestCodes.DOMAIN_REGISTRATION:
-                if (getMySiteFragment() != null) {
-                    getMySiteFragment().onActivityResult(requestCode, resultCode, data);
-                }
+                passOnActivityResultToMySiteFragment(requestCode, resultCode, data);
                 break;
         }
     }
@@ -1146,9 +1210,18 @@ private MySiteFragment getMySiteFragment() {
         if (fragment instanceof MySiteFragment) {
             return (MySiteFragment) fragment;
         }
+
+        // TODO consider the new my site fragment
         return null;
     }
 
+    private void passOnActivityResultToMySiteFragment(int requestCode, int resultCode, Intent data) {
+        Fragment fragment = mBottomNav.getFragment(PageType.MY_SITE);
+        if (fragment != null) {
+            fragment.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
     private NotificationsListFragment getNotificationsListFragment() {
         Fragment fragment = mBottomNav.getFragment(PageType.NOTIFS);
         if (fragment instanceof NotificationsListFragment) {
@@ -1157,14 +1230,55 @@ private NotificationsListFragment getNotificationsListFragment() {
         return null;
     }
 
+    // We only do this for Quick Start focus points that need to be shown on the activity level.
+    private void addOrRemoveQuickStartFocusPoint(QuickStartTask activeTask, boolean shouldAdd) {
+        final QuickStartMySitePrompts prompts = QuickStartMySitePrompts.getPromptDetailsForTask(activeTask);
+        if (prompts == null) return;
+        final ViewGroup parentView = findViewById(prompts.getParentContainerId());
+        final View targetView = findViewById(prompts.getFocusedContainerId());
+        if (parentView != null) {
+            int size = getResources().getDimensionPixelOffset(R.dimen.quick_start_focus_point_size);
+            int horizontalOffset;
+            int verticalOffset;
+            switch (activeTask) {
+                case FOLLOW_SITE:
+                    horizontalOffset = targetView != null ? ((targetView.getWidth() / 2 - size + getResources()
+                            .getDimensionPixelOffset(R.dimen.quick_start_focus_point_bottom_nav_offset))) : 0;
+                    verticalOffset = 0;
+                    break;
+                case PUBLISH_POST:
+                    horizontalOffset = getResources()
+                            .getDimensionPixelOffset(R.dimen.quick_start_focus_point_my_site_right_offset);
+                    verticalOffset = targetView != null ? ((targetView.getHeight() - size) / 2) : 0;
+                    break;
+                default:
+                    horizontalOffset = 0;
+                    verticalOffset = 0;
+                    break;
+            }
+            if (targetView != null && shouldAdd) {
+                QuickStartUtils.addQuickStartFocusPointAboveTheView(
+                        parentView,
+                        targetView,
+                        horizontalOffset,
+                        verticalOffset
+                );
+            } else {
+                QuickStartUtils.removeQuickStartFocusPoint(parentView);
+            }
+        }
+    }
+
     // Events
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onAuthenticationChanged(OnAuthenticationChanged event) {
         if (event.isError()) {
-            if (mSelectedSite != null && event.error.type == AuthenticationErrorType.INVALID_TOKEN) {
-                AuthenticationDialogUtils.showAuthErrorView(this, mSiteStore, mSelectedSite);
+            if (mSelectedSiteRepository.hasSelectedSite()
+                && event.error.type == AuthenticationErrorType.INVALID_TOKEN) {
+                AuthenticationDialogUtils
+                        .showAuthErrorView(this, mSiteStore, mSelectedSiteRepository.getSelectedSite());
             }
 
             return;
@@ -1179,7 +1293,8 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
                     AppPrefs.setShouldTrackMagicLinkSignup(true);
                     mDispatcher.dispatch(AccountActionBuilder.newFetchAccountAction());
                     if (mJetpackConnectSource != null) {
-                        ActivityLauncher.continueJetpackConnect(this, mJetpackConnectSource, mSelectedSite);
+                        ActivityLauncher.continueJetpackConnect(this, mJetpackConnectSource,
+                                mSelectedSiteRepository.getSelectedSite());
                     } else {
                         ActivityLauncher.showSignupEpilogue(this, null, null, null, null, true);
                     }
@@ -1187,7 +1302,8 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
                     mLoginAnalyticsListener.trackLoginMagicLinkSucceeded();
 
                     if (mJetpackConnectSource != null) {
-                        ActivityLauncher.continueJetpackConnect(this, mJetpackConnectSource, mSelectedSite);
+                        ActivityLauncher.continueJetpackConnect(this, mJetpackConnectSource,
+                                mSelectedSiteRepository.getSelectedSite());
                     } else {
                         ActivityLauncher.showLoginEpilogue(this, true,
                                 getIntent().getIntegerArrayListExtra(ARG_OLD_SITES_IDS));
@@ -1268,7 +1384,11 @@ private void handleSiteRemoved() {
             // Reset site selection
             setSelectedSite(null);
             // Show the sign in screen
-            ActivityLauncher.showSignInForResult(this);
+            if (BuildConfig.IS_JETPACK_APP) {
+                ActivityLauncher.showSignInForResultJetpackOnly(this);
+            } else {
+                ActivityLauncher.showSignInForResult(this);
+            }
         } else {
             SiteModel site = getSelectedSite();
             if (site == null && mSiteStore.hasSite()) {
@@ -1281,7 +1401,7 @@ private void handleSiteRemoved() {
      * @return null if there is no site or if there is no selected site
      */
     public @Nullable SiteModel getSelectedSite() {
-        return mSelectedSite;
+        return mSelectedSiteRepository.getSelectedSite();
     }
 
     public void setSelectedSite(int localSiteId) {
@@ -1289,7 +1409,7 @@ public void setSelectedSite(int localSiteId) {
     }
 
     public void setSelectedSite(@Nullable SiteModel selectedSite) {
-        mSelectedSite = selectedSite;
+        mSelectedSiteRepository.updateSite(selectedSite);
         if (selectedSite == null) {
             AppPrefs.setSelectedSite(-1);
             return;
@@ -1313,9 +1433,9 @@ public void initSelectedSite() {
 
         if (siteLocalId != -1) {
             // Site previously selected, use it
-            mSelectedSite = mSiteStore.getSiteByLocalId(siteLocalId);
+            mSelectedSiteRepository.updateSite(mSiteStore.getSiteByLocalId(siteLocalId));
             // If saved site exist, then return, else (site has been removed?) try to select another site
-            if (mSelectedSite != null) {
+            if (mSelectedSiteRepository.hasSelectedSite()) {
                 return;
             }
         }
@@ -1381,6 +1501,7 @@ public void onPostUploaded(OnPostUploaded event) {
                         this,
                         findViewById(R.id.coordinator),
                         event.isError(),
+                        event.isFirstTimePublish,
                         event.post,
                         null,
                         targetSite);
@@ -1402,10 +1523,7 @@ public void onSiteChanged(OnSiteChanged event) {
 
         SiteModel site = mSiteStore.getSiteByLocalId(getSelectedSite().getId());
         if (site != null) {
-            mSelectedSite = site;
-        }
-        if (getMySiteFragment() != null) {
-            getMySiteFragment().onSiteChanged(site);
+            mSelectedSiteRepository.updateSite(site);
         }
     }
 
@@ -1457,10 +1575,7 @@ private void refreshCurrentSelectedSiteAfterEditorChanges(boolean alwaysRefreshU
 
         SiteModel site = mSiteStore.getSiteByLocalId(getSelectedSite().getId());
         if (site != null) {
-            mSelectedSite = site;
-        }
-        if (getMySiteFragment() != null) {
-            getMySiteFragment().onSiteChanged(site);
+            mSelectedSiteRepository.updateSite(site);
         }
     }
 
@@ -1530,6 +1645,7 @@ private void hideQuickStartSnackBar() {
     @Override protected void onPause() {
         super.onPause();
         hideQuickStartSnackBar();
+
         QuickStartUtils.removeQuickStartFocusPoint((ViewGroup) findViewById(R.id.root_view_main));
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt
index cb6d2606aaf3..1b77e86fdf3f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainNavigationView.kt
@@ -19,11 +19,13 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.bottomnavigation.BottomNavigationView.OnNavigationItemReselectedListener
 import com.google.android.material.bottomnavigation.BottomNavigationView.OnNavigationItemSelectedListener
 import com.google.android.material.bottomnavigation.LabelVisibilityMode
+import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.ui.main.WPMainActivity.OnScrollToTopListener
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType.MY_SITE
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType.NOTIFS
 import org.wordpress.android.ui.main.WPMainNavigationView.PageType.READER
+import org.wordpress.android.ui.mysite.ImprovedMySiteFragment
 import org.wordpress.android.ui.notifications.NotificationsListFragment
 import org.wordpress.android.ui.prefs.AppPrefs
 import org.wordpress.android.ui.reader.ReaderFragment
@@ -67,16 +69,18 @@ class WPMainNavigationView @JvmOverloads constructor(
         fun onNewPostButtonClicked()
     }
 
-    fun init(fm: FragmentManager, listener: OnPageListener) {
+    fun init(fm: FragmentManager, listener: OnPageListener, showNewMySiteFragment: Boolean) {
         fragmentManager = fm
         pageListener = listener
 
-        navAdapter = NavAdapter()
+        navAdapter = NavAdapter(showNewMySiteFragment)
         assignNavigationListeners(true)
         disableShiftMode()
 
         // overlay each item with our custom view
         val menuView = getChildAt(0) as BottomNavigationMenuView
+        if (BuildConfig.IS_JETPACK_APP) hideReaderTab()
+
         val inflater = LayoutInflater.from(context)
         for (i in 0 until menu.size()) {
             val itemView = menuView.getChildAt(i) as BottomNavigationItemView
@@ -97,6 +101,10 @@ class WPMainNavigationView @JvmOverloads constructor(
         currentPosition = AppPrefs.getMainPageIndex(numPages() - 1)
     }
 
+    private fun hideReaderTab() {
+        menu.removeItem(R.id.nav_reader)
+    }
+
     private fun disableShiftMode() {
         labelVisibilityMode = LabelVisibilityMode.LABEL_VISIBILITY_LABELED
     }
@@ -184,7 +192,7 @@ class WPMainNavigationView @JvmOverloads constructor(
     private fun setTitleViewSelected(position: Int, isSelected: Boolean) {
         getTitleViewForPosition(position)?.setTextColor(
                 context.getColorStateListFromAttribute(
-                        if (isSelected) R.attr.colorPrimary else R.attr.wpColorOnSurfaceMedium
+                        if (isSelected) R.attr.wpColorNavBar else R.attr.wpColorOnSurfaceMedium
                 )
         )
     }
@@ -259,7 +267,7 @@ class WPMainNavigationView @JvmOverloads constructor(
      * show or hide the badge on the 'pageId' icon in the bottom bar
      */
     private fun showBadge(pageId: Int, showBadge: Boolean) {
-        val badgeView = getItemView(pageId)?.findViewById<View>(R.id.badge)
+        val badgeView = getItemView(pageId)?.findViewById<View>(R.id.nav_badge)
 
         val currentVisibility = badgeView?.visibility
         val newVisibility = if (showBadge) View.VISIBLE else View.GONE
@@ -278,10 +286,14 @@ class WPMainNavigationView @JvmOverloads constructor(
         return position in 0 until numPages()
     }
 
-    private inner class NavAdapter {
+    private inner class NavAdapter(val showNewMySiteFragment: Boolean) {
         private fun createFragment(pageType: PageType): Fragment {
             val fragment = when (pageType) {
-                MY_SITE -> MySiteFragment.newInstance()
+                MY_SITE -> if (showNewMySiteFragment) {
+                    ImprovedMySiteFragment.newInstance()
+                } else {
+                    MySiteFragment.newInstance()
+                }
                 READER -> ReaderFragment()
                 NOTIFS -> NotificationsListFragment.newInstance()
             }
@@ -305,7 +317,7 @@ class WPMainNavigationView @JvmOverloads constructor(
     }
 
     companion object {
-        private val pages = listOf(MY_SITE, READER, NOTIFS)
+        private val pages = if (BuildConfig.IS_JETPACK_APP) listOf(MY_SITE, NOTIFS) else listOf(MY_SITE, READER, NOTIFS)
 
         private const val TAG_MY_SITE = "tag-mysite"
         private const val TAG_READER = "tag-reader"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
index 9439f1c347d5..df743421b2e5 100755
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java
@@ -3,7 +3,6 @@
 import android.Manifest;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
-import android.content.ClipData;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -87,9 +86,6 @@
 import org.wordpress.android.util.WPMediaUtils;
 import org.wordpress.android.util.WPPermissionUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
-import org.wordpress.android.util.config.AnyFileUploadFeatureConfig;
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig;
-import org.wordpress.android.util.config.TenorFeatureConfig;
 import org.wordpress.android.widgets.AppRatingDialog;
 
 import java.util.ArrayList;
@@ -121,10 +117,7 @@ public class MediaBrowserActivity extends LocaleAwareActivity implements MediaGr
     @Inject SiteStore mSiteStore;
     @Inject UploadUtilsWrapper mUploadUtilsWrapper;
     @Inject SystemNotificationsTracker mSystemNotificationsTracker;
-    @Inject TenorFeatureConfig mTenorFeatureConfig;
-    @Inject AnyFileUploadFeatureConfig mAnyFileUploadFeatureConfig;
     @Inject MediaPickerLauncher mMediaPickerLauncher;
-    @Inject ConsolidatedMediaPickerFeatureConfig mConsolidatedMediaPickerFeatureConfig;
 
     private SiteModel mSite;
 
@@ -149,8 +142,6 @@ public class MediaBrowserActivity extends LocaleAwareActivity implements MediaGr
     private enum AddMenuItem {
         ITEM_CAPTURE_PHOTO,
         ITEM_CAPTURE_VIDEO,
-        ITEM_CHOOSE_PHOTO,
-        ITEM_CHOOSE_VIDEO,
         ITEM_CHOOSE_FILE,
         ITEM_CHOOSE_STOCK_MEDIA,
         ITEM_CHOOSE_GIF
@@ -213,6 +204,8 @@ public void onCreate(Bundle savedInstanceState) {
             filter = MediaFilter.FILTER_IMAGES;
         } else if (mBrowserType == MediaBrowserType.GUTENBERG_VIDEO_PICKER) {
             filter = MediaFilter.FILTER_VIDEOS;
+        } else if (mBrowserType == MediaBrowserType.GUTENBERG_SINGLE_AUDIO_FILE_PICKER) {
+            filter = MediaFilter.FILTER_AUDIO;
         } else if (savedInstanceState != null) {
             filter = (MediaFilter) savedInstanceState.getSerializable(ARG_FILTER);
         } else {
@@ -474,24 +467,13 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             case RequestCodes.PICTURE_LIBRARY:
             case RequestCodes.VIDEO_LIBRARY:
             case RequestCodes.FILE_LIBRARY:
+            case RequestCodes.AUDIO_LIBRARY:
                 if (resultCode == Activity.RESULT_OK && data != null) {
-                    if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
-                        if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)) {
-                            List<Uri> uris = convertStringArrayIntoUrisList(
-                                    data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS));
-                            for (Uri uri : uris) {
-                                getMediaFromDeviceAndTrack(uri, requestCode);
-                            }
-                        }
-                    } else {
-                        ClipData clipData = data.getClipData();
-                        if (clipData != null) {
-                            for (int i = 0; i < clipData.getItemCount(); i++) {
-                                ClipData.Item item = clipData.getItemAt(i);
-                                getMediaFromDeviceAndTrack(item.getUri(), requestCode);
-                            }
-                        } else {
-                            getMediaFromDeviceAndTrack(data.getData(), requestCode);
+                    if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)) {
+                        List<Uri> uris = convertStringArrayIntoUrisList(
+                                data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS));
+                        for (Uri uri : uris) {
+                            getMediaFromDeviceAndTrack(uri, requestCode);
                         }
                     }
                 }
@@ -707,10 +689,12 @@ public void onMediaItemSelected(int localMediaId, boolean isLongClick) {
         // show detail view when tapped if we're browsing media, when used as a picker show detail
         // when long tapped (to mimic native photo picker)
         if (mBrowserType.isBrowser() && !isLongClick
-                || mBrowserType.isPicker() && isLongClick) {
+            || mBrowserType.isPicker() && isLongClick) {
             showMediaSettings(media);
-        } else if ((mBrowserType.isSingleImagePicker() || mBrowserType.isSingleMediaPicker()) && !isLongClick) {
-            // if we're picking a single image, we're done
+        } else if ((mBrowserType.isSingleImagePicker() || mBrowserType.isSingleMediaPicker() || mBrowserType
+                .isSingleFilePicker() || mBrowserType
+                            .isSingleAudioFilePicker()) && !isLongClick) {
+            // if we're picking a single media item, we're done
             Intent intent = new Intent();
             ArrayList<Long> remoteMediaIds = new ArrayList<>();
             remoteMediaIds.add(media.getMediaId());
@@ -938,27 +922,11 @@ public void showAddMediaPopup() {
                     });
         }
 
-        if (!mAnyFileUploadFeatureConfig.isEnabled()) {
-            popup.getMenu().add(R.string.photo_picker_choose_photo).setOnMenuItemClickListener(
-                    item -> {
-                        doAddMediaItemClicked(AddMenuItem.ITEM_CHOOSE_PHOTO);
-                        return true;
-                    });
-
-            if (!mBrowserType.isSingleImagePicker()) {
-                popup.getMenu().add(R.string.photo_picker_choose_video).setOnMenuItemClickListener(
-                        item -> {
-                            doAddMediaItemClicked(AddMenuItem.ITEM_CHOOSE_VIDEO);
-                            return true;
-                        });
-            }
-        } else {
-            popup.getMenu().add(R.string.photo_picker_choose_file).setOnMenuItemClickListener(
-                    item -> {
-                        doAddMediaItemClicked(AddMenuItem.ITEM_CHOOSE_FILE);
-                        return true;
-                    });
-        }
+        popup.getMenu().add(R.string.photo_picker_choose_file).setOnMenuItemClickListener(
+                item -> {
+                    doAddMediaItemClicked(AddMenuItem.ITEM_CHOOSE_FILE);
+                    return true;
+                });
 
         if (mBrowserType.isBrowser() && mSite.isUsingWpComRestApi()) {
             popup.getMenu().add(R.string.photo_picker_stock_media).setOnMenuItemClickListener(
@@ -968,7 +936,7 @@ public void showAddMediaPopup() {
                     });
         }
 
-        if (mBrowserType.isBrowser() && mTenorFeatureConfig.isEnabled()) {
+        if (mBrowserType.isBrowser()) {
             popup.getMenu().add(R.string.photo_picker_gif).setOnMenuItemClickListener(
                     item -> {
                         doAddMediaItemClicked(AddMenuItem.ITEM_CHOOSE_GIF);
@@ -1003,14 +971,8 @@ private void doAddMediaItemClicked(@NonNull AddMenuItem item) {
             case ITEM_CAPTURE_VIDEO:
                 WPMediaUtils.launchVideoCamera(this);
                 break;
-            case ITEM_CHOOSE_PHOTO:
-                WPMediaUtils.launchPictureLibrary(this, true);
-                break;
-            case ITEM_CHOOSE_VIDEO:
-                WPMediaUtils.launchVideoLibrary(this, true);
-                break;
             case ITEM_CHOOSE_FILE:
-                mMediaPickerLauncher.showFilePicker(this);
+                mMediaPickerLauncher.showFilePicker(this, true, mSite);
                 break;
             case ITEM_CHOOSE_STOCK_MEDIA:
                 mMediaPickerLauncher.showStockMediaPickerForResult(this,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java
index b546764fdc62..f30ab8f2ca27 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java
@@ -13,6 +13,8 @@ public enum MediaBrowserType {
     GUTENBERG_SINGLE_VIDEO_PICKER, // select video from Gutenberg editor
     GUTENBERG_SINGLE_MEDIA_PICKER, // select a single image or video to insert into a post
     GUTENBERG_MEDIA_PICKER, // select multiple images or videos to insert into a post
+    GUTENBERG_SINGLE_FILE_PICKER, // select a file to insert into a post
+    GUTENBERG_SINGLE_AUDIO_FILE_PICKER, // select an audio file to insert into a post
     WP_STORIES_MEDIA_PICKER; // select multiple images or videos to insert as Story frames in a Story
 
     public boolean isPicker() {
@@ -40,7 +42,8 @@ public boolean isImagePicker() {
                || this == GUTENBERG_SINGLE_IMAGE_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
                || this == GUTENBERG_MEDIA_PICKER
-               || this == WP_STORIES_MEDIA_PICKER;
+               || this == WP_STORIES_MEDIA_PICKER
+               || this == GUTENBERG_SINGLE_FILE_PICKER;
     }
 
     public boolean isVideoPicker() {
@@ -50,7 +53,16 @@ public boolean isVideoPicker() {
                || this == GUTENBERG_SINGLE_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
                || this == GUTENBERG_MEDIA_PICKER
-               || this == WP_STORIES_MEDIA_PICKER;
+               || this == WP_STORIES_MEDIA_PICKER
+               || this == GUTENBERG_SINGLE_FILE_PICKER;
+    }
+
+    public boolean isAudioPicker() {
+        return this == GUTENBERG_SINGLE_FILE_PICKER || this == GUTENBERG_SINGLE_AUDIO_FILE_PICKER;
+    }
+
+    public boolean isDocumentPicker() {
+        return this == GUTENBERG_SINGLE_FILE_PICKER;
     }
 
     public boolean isGutenbergPicker() {
@@ -59,23 +71,33 @@ public boolean isGutenbergPicker() {
                || this == GUTENBERG_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
-               || this == GUTENBERG_MEDIA_PICKER;
+               || this == GUTENBERG_MEDIA_PICKER
+               || this == GUTENBERG_SINGLE_FILE_PICKER
+               || this == GUTENBERG_SINGLE_AUDIO_FILE_PICKER;
     }
 
     public boolean isWPStoriesPicker() {
         return this == WP_STORIES_MEDIA_PICKER;
     }
 
+    public boolean isSingleFilePicker() {
+        return this == GUTENBERG_SINGLE_FILE_PICKER;
+    }
+
+    public boolean isSingleAudioFilePicker() {
+        return this == GUTENBERG_SINGLE_AUDIO_FILE_PICKER;
+    }
+
     public boolean isSingleMediaPicker() {
         return this == GUTENBERG_SINGLE_MEDIA_PICKER;
     }
 
     public boolean canMultiselect() {
         return this == EDITOR_PICKER
-                || this == AZTEC_EDITOR_PICKER
-                || this == GUTENBERG_IMAGE_PICKER
-                || this == GUTENBERG_VIDEO_PICKER
-                || this == WP_STORIES_MEDIA_PICKER;
+               || this == AZTEC_EDITOR_PICKER
+               || this == GUTENBERG_IMAGE_PICKER
+               || this == GUTENBERG_VIDEO_PICKER
+               || this == WP_STORIES_MEDIA_PICKER;
     }
 
     public boolean canFilter() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java
index 7dbe31d45f0d..0bbc1c92efb0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java
@@ -4,6 +4,8 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -16,6 +18,8 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.wordpress.android.R;
@@ -29,7 +33,6 @@
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.ColorUtils;
 import org.wordpress.android.util.DisplayUtils;
-import org.wordpress.android.util.ImageUtils;
 import org.wordpress.android.util.MediaUtils;
 import org.wordpress.android.util.PhotoPickerUtils;
 import org.wordpress.android.util.PhotonUtils;
@@ -48,6 +51,11 @@
 import java.util.Locale;
 
 import javax.inject.Inject;
+import javax.inject.Named;
+
+import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
+
+import kotlinx.coroutines.CoroutineScope;
 
 /**
  * An adapter for the media gallery grid.
@@ -62,6 +70,7 @@ public class MediaGridAdapter extends RecyclerView.Adapter<MediaGridAdapter.Grid
 
     private final Handler mHandler;
     private final LayoutInflater mInflater;
+    private GridLayoutManager mLayoutManager;
 
     private final Context mContext;
     private final SiteModel mSite;
@@ -75,8 +84,11 @@ public class MediaGridAdapter extends RecyclerView.Adapter<MediaGridAdapter.Grid
     private static final float SCALE_NORMAL = 1.0f;
     private static final float SCALE_SELECTED = .8f;
 
+    private static final String VIEW_TAG_EXTRACT_FROM_REMOTE_VIDEO_URL = "view_tag_extract_from_remote_video_url";
+
     @Inject ImageManager mImageManager;
     @Inject AuthenticationUtils mAuthenticationUtils;
+    @Inject @Named(APPLICATION_SCOPE) CoroutineScope mAppScope;
 
     public interface MediaGridAdapterCallback {
         void onAdapterFetchMoreData();
@@ -258,12 +270,6 @@ public void onBindViewHolder(GridViewHolder holder, int position) {
         }
     }
 
-    @Override
-    public void onViewRecycled(GridViewHolder holder) {
-        super.onViewRecycled(holder);
-        holder.mImageView.setTag(R.id.media_grid_file_path_id, null);
-    }
-
     public ArrayList<Integer> getSelectedItems() {
         return mSelectedItems;
     }
@@ -446,6 +452,46 @@ private boolean canSelectPosition(int position) {
         }
     }
 
+    @Override public void onViewRecycled(@NonNull GridViewHolder holder) {
+        mImageManager.cancelRequestAndClearImageView(holder.mImageView);
+        holder.mImageView.setTag(R.id.media_grid_remote_thumb_extract_id, null);
+        super.onViewRecycled(holder);
+    }
+
+    public void cancelPendingRequestsForVisibleItems(@NonNull RecyclerView recyclerView) {
+        int firstVisibleItemPosition = mLayoutManager.findFirstVisibleItemPosition();
+        int lastVisibleItemPosition = mLayoutManager.findLastVisibleItemPosition();
+        for (int i = firstVisibleItemPosition; i <= lastVisibleItemPosition; i++) {
+            GridViewHolder holder = (GridViewHolder) recyclerView.findViewHolderForAdapterPosition(i);
+            if (holder != null
+                && (VIEW_TAG_EXTRACT_FROM_REMOTE_VIDEO_URL.equals(
+                        holder.mImageView.getTag(R.id.media_grid_remote_thumb_extract_id)))) {
+                mImageManager.cancelRequestAndClearImageView(holder.mImageView);
+            }
+        }
+    }
+
+    public void refreshCurrentItems(@NonNull RecyclerView recyclerView) {
+        int firstVisibleItemPosition = mLayoutManager.findFirstVisibleItemPosition();
+        int lastVisibleItemPosition = mLayoutManager.findLastVisibleItemPosition();
+        if (mMediaList.size() >= lastVisibleItemPosition && lastVisibleItemPosition > -1) {
+            for (int i = firstVisibleItemPosition; i <= lastVisibleItemPosition; i++) {
+                // only refresh this one
+                GridViewHolder holder = (GridViewHolder) recyclerView.findViewHolderForAdapterPosition(i);
+                if (holder != null
+                    && (VIEW_TAG_EXTRACT_FROM_REMOTE_VIDEO_URL.equals(
+                            holder.mImageView.getTag(R.id.media_grid_remote_thumb_extract_id)))) {
+                    notifyItemChanged(i);
+                }
+            }
+        }
+    }
+
+    @Override public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
+        super.onAttachedToRecyclerView(recyclerView);
+        mLayoutManager = (GridLayoutManager) recyclerView.getLayoutManager();
+    }
+
     /*
      * loads the thumbnail for the passed video media item - works with both local and network videos
      */
@@ -470,7 +516,6 @@ private void loadVideoThumbnail(final int position, final @NonNull MediaModel me
             AppLog.w(AppLog.T.MEDIA, "MediaGridAdapter > No path to video thumbnail");
             return;
         }
-        imageView.setTag(R.id.media_grid_file_path_id, filePath);
         // see if we have a cached thumbnail before retrieving it
         Bitmap bitmap = WordPress.getBitmapCache().get(filePath);
         if (bitmap != null) {
@@ -478,29 +523,25 @@ private void loadVideoThumbnail(final int position, final @NonNull MediaModel me
             return;
         }
 
-        new Thread() {
-            @Override
-            public void run() {
-                final Bitmap thumb =
-                        ImageUtils.getVideoFrameFromVideo(filePath,
-                                mThumbWidth,
-                                mAuthenticationUtils.getAuthHeaders(filePath)
-                        );
-                if (thumb != null) {
-                    mHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            WordPress.getBitmapCache().put(filePath, thumb);
-                            if (imageView.getTag(R.id.media_grid_file_path_id) instanceof String
-                                && (imageView.getTag(R.id.media_grid_file_path_id)).equals(filePath)) {
-                                imageView.setTag(R.id.media_grid_file_path_id, null);
-                                notifyItemChanged(position);
-                            }
+        imageView.setTag(R.id.media_grid_remote_thumb_extract_id, VIEW_TAG_EXTRACT_FROM_REMOTE_VIDEO_URL);
+        mImageManager.loadThumbnailFromVideoUrl(mAppScope, imageView, filePath, ScaleType.CENTER_CROP,
+                new ImageManager.RequestListener<Drawable>() {
+                    @Override
+                    public void onLoadFailed(@Nullable Exception e, @Nullable Object model) {
+                        if (e != null) {
+                            AppLog.d(AppLog.T.MEDIA, "MediaGridAdapter > error loading video thumbnail = " + e);
                         }
-                    });
-                }
-            }
-        }.start();
+                    }
+
+                    @Override
+                    public void onResourceReady(@NonNull Drawable resource, @Nullable Object model) {
+                        imageView.setTag(R.id.media_grid_remote_thumb_extract_id, null);
+                        Bitmap bitmap = ((BitmapDrawable) resource).getBitmap();
+                        // create a copy since the original bitmap may by automatically recycled
+                        bitmap = bitmap.copy(bitmap.getConfig(), true);
+                        WordPress.getBitmapCache().put(filePath, bitmap);
+                    }
+                });
     }
 
     public boolean isEmpty() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java
index 8627cedf7453..ebf53cfa566f 100755
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java
@@ -199,11 +199,13 @@ public void onCreate(Bundle savedInstanceState) {
     public void onStart() {
         super.onStart();
         mDispatcher.register(this);
+        mGridAdapter.refreshCurrentItems(mRecycler);
     }
 
     @Override
     public void onStop() {
         mDispatcher.unregister(this);
+        mGridAdapter.cancelPendingRequestsForVisibleItems(mRecycler);
         super.onStop();
     }
 
@@ -383,7 +385,9 @@ List<MediaModel> getFilteredMedia() {
             }
         } else if (mBrowserType.isSingleImagePicker()) {
             mediaList = mMediaStore.getSiteImages(mSite);
-        } else if (mBrowserType.canFilter() || mBrowserType.canOnlyDoInitialFilter()) {
+        } else if (mBrowserType.canFilter() || mBrowserType.canOnlyDoInitialFilter() || mBrowserType
+                .isSingleFilePicker() || mBrowserType
+                           .isSingleAudioFilePicker()) {
             mediaList = getMediaList();
         } else {
             List<MediaModel> allMedia = mMediaStore.getAllSiteMedia(mSite);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/VideoLoader.kt b/WordPress/src/main/java/org/wordpress/android/ui/media/VideoLoader.kt
new file mode 100644
index 000000000000..64b0c8926ac6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/VideoLoader.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.ui.media
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.utils.AuthenticationUtils
+import org.wordpress.android.util.AppLog.T
+import java.io.IOException
+import java.net.URL
+import javax.inject.Inject
+import javax.inject.Named
+
+class VideoLoader
+@Inject constructor(
+    @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    @param:Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
+    private val authenticationUtils: AuthenticationUtils,
+    private val appLogWrapper: AppLogWrapper
+) {
+    fun runIfMediaNotTooBig(
+        scope: CoroutineScope,
+        filePath: String,
+        loadAction: () -> Unit,
+        fallbackAction: () -> Unit
+    ) {
+        scope.launch {
+            var length = MIN_SIZE
+            withContext(bgDispatcher) {
+                try {
+                    val url = URL(filePath)
+
+                    val urlConnection = url.openConnection()
+                    for ((key, value) in authenticationUtils.getAuthHeaders(filePath).entries) {
+                        urlConnection.addRequestProperty(key, value)
+                    }
+
+                    length = urlConnection.contentLength
+                    if (length <= MIN_SIZE) {
+                        length = urlConnection.getHeaderFieldInt("Content-Length", MIN_SIZE)
+                    }
+                } catch (ioe: IOException) {
+                    appLogWrapper.e(T.MEDIA, "Failed to load video thumbnail: ${ioe.stackTrace}")
+                }
+            }
+            withContext(mainDispatcher) {
+                if (length > MIN_SIZE && length < SIZE_LIMIT_10_MB) {
+                    loadAction()
+                } else {
+                    fallbackAction()
+                }
+            }
+        }
+    }
+
+    companion object {
+        private const val MIN_SIZE = 0
+        private const val SIZE_LIMIT_10_MB = 10485760
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/services/MediaUploadReadyListener.java b/WordPress/src/main/java/org/wordpress/android/ui/media/services/MediaUploadReadyListener.java
index a17ab55ba944..b8ebe1d28fc1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/media/services/MediaUploadReadyListener.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/media/services/MediaUploadReadyListener.java
@@ -3,6 +3,7 @@
 import androidx.annotation.Nullable;
 
 import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.util.helpers.MediaFile;
 
 /**
@@ -10,7 +11,10 @@
  * and mark media failed if could not be uploaded
  */
 public interface MediaUploadReadyListener {
+    // TODO: We're passing a SiteModel parameter here in order to debug a crash on SaveStoryGutenbergBlockUseCase.
+    //  Once that's done, the parameter should be replaced with a site url String, like it was before.
+    //  See: https://git.io/JqfhK
     PostModel replaceMediaFileWithUrlInPost(@Nullable PostModel post, String localMediaId, MediaFile mediaFile,
-                                            String siteUrl);
+                                            @Nullable SiteModel site);
     PostModel markMediaUploadFailedInPost(@Nullable PostModel post, String localMediaId, MediaFile mediaFile);
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
index a7de91beec52..43c4d7bfbf4d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerActivity.kt
@@ -8,10 +8,10 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.MenuItem
 import androidx.fragment.app.FragmentTransaction
-import kotlinx.android.synthetic.main.toolbar_main.*
 import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PhotoPickerActivityBinding
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.MediaStore
@@ -24,7 +24,6 @@ import org.wordpress.android.ui.gif.GifPickerActivity
 import org.wordpress.android.ui.media.MediaBrowserActivity
 import org.wordpress.android.ui.mediapicker.MediaItem.Identifier
 import org.wordpress.android.ui.mediapicker.MediaPickerActivity.MediaPickerMediaSource.ANDROID_CAMERA
-import org.wordpress.android.ui.mediapicker.MediaPickerActivity.MediaPickerMediaSource.ANDROID_PICKER
 import org.wordpress.android.ui.mediapicker.MediaPickerActivity.MediaPickerMediaSource.APP_PICKER
 import org.wordpress.android.ui.mediapicker.MediaPickerFragment.Companion.newInstance
 import org.wordpress.android.ui.mediapicker.MediaPickerFragment.MediaPickerAction
@@ -103,9 +102,10 @@ class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
-        setContentView(R.layout.photo_picker_activity)
-        toolbar_main.setNavigationIcon(R.drawable.ic_close_white_24dp)
-        setSupportActionBar(toolbar_main)
+        val binding = PhotoPickerActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        binding.toolbarMain.setNavigationIcon(R.drawable.ic_close_white_24dp)
+        setSupportActionBar(binding.toolbarMain)
         val actionBar = supportActionBar
         if (actionBar != null) {
             actionBar.setDisplayHomeAsUpEnabled(true)
@@ -185,18 +185,9 @@ class MediaPickerActivity : LocaleAwareActivity(), MediaPickerListener {
         val intent: Intent? = when (requestCode) {
             MEDIA_LIBRARY -> {
                 data?.let {
-                    val intent = Intent()
                     val uris = WPMediaUtils.retrieveMediaUris(data)
-                    if (mediaPickerSetup.queueResults) {
-                        intent.putQueuedUris(uris)
-                    } else {
-                        intent.putUris(uris)
-                    }
-                    intent.putExtra(
-                            EXTRA_MEDIA_SOURCE,
-                            ANDROID_PICKER.name
-                    )
-                    intent
+                    pickerFragment?.urisSelectedFromSystemPicker(uris)
+                    return
                 }
             }
             TAKE_PHOTO -> {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerAdapter.kt
index ee0bc57c4190..d3a47a5328ba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerAdapter.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.mediapicker
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.Adapter
+import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.ui.mediapicker.MediaPickerAdapterDiffCallback.Payload.COUNT_CHANGE
 import org.wordpress.android.ui.mediapicker.MediaPickerAdapterDiffCallback.Payload.SELECTION_CHANGE
 import org.wordpress.android.ui.mediapicker.MediaPickerUiItem.FileItem
@@ -12,7 +13,10 @@ import org.wordpress.android.ui.mediapicker.MediaPickerUiItem.Type
 import org.wordpress.android.ui.mediapicker.MediaPickerUiItem.VideoItem
 import org.wordpress.android.util.image.ImageManager
 
-class MediaPickerAdapter internal constructor(imageManager: ImageManager) : Adapter<ThumbnailViewHolder>() {
+class MediaPickerAdapter internal constructor(
+    private val imageManager: ImageManager,
+    private val coroutineScope: CoroutineScope
+) : Adapter<ThumbnailViewHolder>() {
     private val thumbnailViewUtils = MediaThumbnailViewUtils(imageManager)
     private var mediaList = listOf<MediaPickerUiItem>()
 
@@ -30,8 +34,8 @@ class MediaPickerAdapter internal constructor(imageManager: ImageManager) : Adap
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThumbnailViewHolder {
         return when (viewType) {
-            Type.PHOTO.ordinal -> PhotoThumbnailViewHolder(parent, thumbnailViewUtils)
-            Type.VIDEO.ordinal -> VideoThumbnailViewHolder(parent, thumbnailViewUtils)
+            Type.PHOTO.ordinal -> PhotoThumbnailViewHolder(parent, thumbnailViewUtils, imageManager)
+            Type.VIDEO.ordinal -> VideoThumbnailViewHolder(parent, thumbnailViewUtils, imageManager, coroutineScope)
             Type.FILE.ordinal -> FileThumbnailViewHolder(parent, thumbnailViewUtils)
             Type.NEXT_PAGE_LOADER.ordinal -> LoaderViewHolder(parent)
             else -> throw IllegalArgumentException("Unexpected view type")
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt
index 4ef9128396af..ed4ea4169a3e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerFragment.kt
@@ -4,6 +4,7 @@ import android.Manifest.permission
 import android.app.Activity
 import android.content.Intent.ACTION_GET_CONTENT
 import android.content.Intent.ACTION_OPEN_DOCUMENT
+import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
 import android.text.Html
@@ -21,14 +22,14 @@ import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.media_picker_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.MediaPickerFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.media.MediaPreviewActivity
@@ -68,12 +69,13 @@ import org.wordpress.android.util.SnackbarItem
 import org.wordpress.android.util.SnackbarItem.Action
 import org.wordpress.android.util.SnackbarItem.Info
 import org.wordpress.android.util.SnackbarSequencer
+import org.wordpress.android.util.UriWrapper
 import org.wordpress.android.util.WPLinkMovementMethod
 import org.wordpress.android.util.WPMediaUtils
 import org.wordpress.android.util.WPPermissionUtils
 import org.wordpress.android.util.WPSwipeToRefreshHelper
-import org.wordpress.android.util.config.TenorFeatureConfig
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class MediaPickerFragment : Fragment() {
@@ -100,6 +102,7 @@ class MediaPickerFragment : Fragment() {
         PHOTO(ACTION_GET_CONTENT, UiStringRes(R.string.pick_photo), "image/*"),
         VIDEO(ACTION_GET_CONTENT, UiStringRes(R.string.pick_video), "video/*"),
         PHOTO_OR_VIDEO(ACTION_GET_CONTENT, UiStringRes(R.string.pick_media), "*/*"),
+        AUDIO(ACTION_GET_CONTENT, UiStringRes(R.string.pick_audio), "*/*"),
         MEDIA_FILE(ACTION_OPEN_DOCUMENT, UiStringRes(R.string.pick_file), "*/*");
     }
 
@@ -181,17 +184,17 @@ class MediaPickerFragment : Fragment() {
 
     private var listener: MediaPickerListener? = null
 
-    @Inject lateinit var tenorFeatureConfig: TenorFeatureConfig
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var snackbarSequencer: SnackbarSequencer
     @Inject lateinit var uiHelpers: UiHelpers
     private lateinit var viewModel: MediaPickerViewModel
+    private var binding: MediaPickerFragmentBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().application as WordPress).component().inject(this)
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(MediaPickerViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(MediaPickerViewModel::class.java)
         setHasOptionsMenu(true)
     }
 
@@ -229,91 +232,92 @@ class MediaPickerFragment : Fragment() {
         savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
             layoutManager.onRestoreInstanceState(it)
         }
-
-        recycler.layoutManager = layoutManager
-        recycler.setEmptyView(actionable_empty_view)
-        recycler.setHasFixedSize(true)
-
-        val swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(pullToRefresh) {
-            viewModel.onPullToRefresh()
-        }
-
-        var isShowingActionMode = false
-        viewModel.uiState.observe(viewLifecycleOwner, Observer {
-            it?.let { uiState ->
-                setupPhotoList(uiState.photoListUiModel)
-                setupSoftAskView(uiState.softAskViewUiModel)
-                if (uiState.actionModeUiModel is ActionModeUiModel.Visible && !isShowingActionMode) {
-                    isShowingActionMode = true
-                    (activity as AppCompatActivity).startSupportActionMode(
-                            MediaPickerActionModeCallback(
-                                    viewModel
-                            )
-                    )
-                } else if (uiState.actionModeUiModel is ActionModeUiModel.Hidden && isShowingActionMode) {
-                    isShowingActionMode = false
-                }
-                uiState.fabUiModel.let(this::setupFab)
-                swipeToRefreshHelper.isRefreshing = uiState.isRefreshing
+        with(MediaPickerFragmentBinding.bind(view)) {
+            binding = this
+            recycler.layoutManager = layoutManager
+            recycler.setEmptyView(actionableEmptyView)
+            recycler.setHasFixedSize(true)
+
+            val swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(pullToRefresh) {
+                viewModel.onPullToRefresh()
             }
-        })
 
-        viewModel.onNavigate.observe(viewLifecycleOwner, Observer
-        {
-            it.getContentIfNotHandled()?.let { navigationEvent ->
-                when (navigationEvent) {
-                    is PreviewUrl -> {
-                        MediaPreviewActivity.showPreview(
-                                requireContext(),
-                                null,
-                                navigationEvent.url
-                        )
-                        AccessibilityUtils.setActionModeDoneButtonContentDescription(
-                                activity,
-                                getString(R.string.cancel)
+            var isShowingActionMode = false
+            viewModel.uiState.observe(viewLifecycleOwner, Observer {
+                it?.let { uiState ->
+                    setupPhotoList(uiState.photoListUiModel)
+                    setupSoftAskView(uiState.softAskViewUiModel)
+                    if (uiState.actionModeUiModel is ActionModeUiModel.Visible && !isShowingActionMode) {
+                        isShowingActionMode = true
+                        (activity as AppCompatActivity).startSupportActionMode(
+                                MediaPickerActionModeCallback(
+                                        viewModel
+                                )
                         )
+                    } else if (uiState.actionModeUiModel is ActionModeUiModel.Hidden && isShowingActionMode) {
+                        isShowingActionMode = false
                     }
-                    is PreviewMedia -> MediaPreviewActivity.showPreview(
-                            requireContext(),
-                            null,
-                            navigationEvent.media,
-                            null
-                    )
-                    is EditMedia -> {
-                        val inputData = WPMediaUtils.createListOfEditImageInputData(
-                                requireContext(),
-                                navigationEvent.uris.map { wrapper -> wrapper.uri }
-                        )
-                        ActivityLauncher.openImageEditor(activity, inputData)
-                    }
-                    is InsertMedia -> listener?.onItemsChosen(navigationEvent.identifiers)
-                    is IconClickEvent -> listener?.onIconClicked(navigationEvent.action)
-                    Exit -> {
-                        val activity = requireActivity()
-                        activity.setResult(Activity.RESULT_CANCELED)
-                        activity.finish()
-                    }
+                    setupFab(uiState.fabUiModel)
+                    swipeToRefreshHelper.isRefreshing = uiState.isRefreshing
                 }
-            }
-        })
+            })
+
+            viewModel.onNavigate.observeEvent(viewLifecycleOwner,
+                    { navigationEvent ->
+                        when (navigationEvent) {
+                            is PreviewUrl -> {
+                                MediaPreviewActivity.showPreview(
+                                        requireContext(),
+                                        null,
+                                        navigationEvent.url
+                                )
+                                AccessibilityUtils.setActionModeDoneButtonContentDescription(
+                                        activity,
+                                        getString(R.string.cancel)
+                                )
+                            }
+                            is PreviewMedia -> MediaPreviewActivity.showPreview(
+                                    requireContext(),
+                                    null,
+                                    navigationEvent.media,
+                                    null
+                            )
+                            is EditMedia -> {
+                                val inputData = WPMediaUtils.createListOfEditImageInputData(
+                                        requireContext(),
+                                        navigationEvent.uris.map { wrapper -> wrapper.uri }
+                                )
+                                ActivityLauncher.openImageEditor(activity, inputData)
+                            }
+                            is InsertMedia -> listener?.onItemsChosen(navigationEvent.identifiers)
+                            is IconClickEvent -> listener?.onIconClicked(navigationEvent.action)
+                            Exit -> {
+                                val activity = requireActivity()
+                                activity.setResult(Activity.RESULT_CANCELED)
+                                activity.finish()
+                            }
+                        }
+                    })
 
-        viewModel.onPermissionsRequested.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                when (this) {
+            viewModel.onPermissionsRequested.observeEvent(viewLifecycleOwner, {
+                when (it) {
                     CAMERA -> requestCameraPermission()
                     STORAGE -> requestStoragePermission()
                 }
-            }
-        })
-        viewModel.onSnackbarMessage.observe(viewLifecycleOwner, Observer {
-            it?.getContentIfNotHandled()?.let { messageHolder ->
+            })
+            viewModel.onSnackbarMessage.observeEvent(viewLifecycleOwner, { messageHolder ->
                 showSnackbar(messageHolder)
-            }
-        })
+            })
+
+            setupProgressDialog()
 
-        setupProgressDialog()
+            viewModel.start(selectedIds, mediaPickerSetup, lastTappedIcon, site)
+        }
+    }
 
-        viewModel.start(selectedIds, mediaPickerSetup, lastTappedIcon, site)
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -384,6 +388,10 @@ class MediaPickerFragment : Fragment() {
         return true
     }
 
+    fun urisSelectedFromSystemPicker(uris: List<Uri>) {
+        viewModel.urisSelectedFromSystemPicker(uris.map { UriWrapper(it) })
+    }
+
     private fun initializeSearchView(actionMenuItem: MenuItem) {
         var isExpanding = false
         actionMenuItem.setOnActionExpandListener(object : OnActionExpandListener {
@@ -415,12 +423,12 @@ class MediaPickerFragment : Fragment() {
         })
     }
 
-    private fun setupSoftAskView(uiModel: SoftAskViewUiModel) {
+    private fun MediaPickerFragmentBinding.setupSoftAskView(uiModel: SoftAskViewUiModel) {
         when (uiModel) {
             is SoftAskViewUiModel.Visible -> {
-                soft_ask_view.title.text = Html.fromHtml(uiModel.label)
-                soft_ask_view.button.setText(uiModel.allowId.stringRes)
-                soft_ask_view.button.setOnClickListener {
+                softAskView.title.text = Html.fromHtml(uiModel.label)
+                softAskView.button.setText(uiModel.allowId.stringRes)
+                softAskView.button.setOnClickListener {
                     if (uiModel.isAlwaysDenied) {
                         WPPermissionUtils.showAppSettings(requireActivity())
                     } else {
@@ -428,19 +436,19 @@ class MediaPickerFragment : Fragment() {
                     }
                 }
 
-                soft_ask_view.visibility = View.VISIBLE
+                softAskView.visibility = View.VISIBLE
             }
             is SoftAskViewUiModel.Hidden -> {
-                if (soft_ask_view.visibility == View.VISIBLE) {
-                    AniUtils.fadeOut(soft_ask_view, MEDIUM)
+                if (softAskView.visibility == View.VISIBLE) {
+                    AniUtils.fadeOut(softAskView, MEDIUM)
                 }
             }
         }
     }
 
-    private fun setupPhotoList(uiModel: PhotoListUiModel) {
-        loading_view.visibility = if (uiModel == PhotoListUiModel.Loading) View.VISIBLE else View.GONE
-        actionable_empty_view.visibility = if (uiModel is PhotoListUiModel.Empty) View.VISIBLE else View.GONE
+    private fun MediaPickerFragmentBinding.setupPhotoList(uiModel: PhotoListUiModel) {
+        loadingView.visibility = if (uiModel == PhotoListUiModel.Loading) View.VISIBLE else View.GONE
+        actionableEmptyView.visibility = if (uiModel is PhotoListUiModel.Empty) View.VISIBLE else View.GONE
         recycler.visibility = if (uiModel is PhotoListUiModel.Data) View.VISIBLE else View.INVISIBLE
         when (uiModel) {
             is PhotoListUiModel.Data -> {
@@ -448,22 +456,22 @@ class MediaPickerFragment : Fragment() {
             }
             is PhotoListUiModel.Empty -> {
                 setupAdapter(listOf())
-                actionable_empty_view.updateLayoutForSearch(uiModel.isSearching, 0)
-                actionable_empty_view.title.text = uiHelpers.getTextOfUiString(requireContext(), uiModel.title)
+                actionableEmptyView.updateLayoutForSearch(uiModel.isSearching, 0)
+                actionableEmptyView.title.text = uiHelpers.getTextOfUiString(requireContext(), uiModel.title)
 
-                actionable_empty_view.subtitle.applyOrHide(uiModel.htmlSubtitle) { htmlSubtitle ->
-                    actionable_empty_view.subtitle.text = Html.fromHtml(
+                actionableEmptyView.subtitle.applyOrHide(uiModel.htmlSubtitle) { htmlSubtitle ->
+                    actionableEmptyView.subtitle.text = Html.fromHtml(
                             uiHelpers.getTextOfUiString(
                                     requireContext(),
                                     htmlSubtitle
                             ).toString()
                     )
-                    actionable_empty_view.subtitle.movementMethod = WPLinkMovementMethod.getInstance()
+                    actionableEmptyView.subtitle.movementMethod = WPLinkMovementMethod.getInstance()
                 }
-                actionable_empty_view.image.applyOrHide(uiModel.image) { image ->
+                actionableEmptyView.image.applyOrHide(uiModel.image) { image ->
                     this.setImageResource(image)
                 }
-                actionable_empty_view.bottomImage.applyOrHide(uiModel.bottomImage) { bottomImage ->
+                actionableEmptyView.bottomImage.applyOrHide(uiModel.bottomImage) { bottomImage ->
                     this.setImageResource(bottomImage)
                     if (uiModel.bottomImageDescription != null) {
                         this.contentDescription = uiHelpers.getTextOfUiString(
@@ -472,7 +480,7 @@ class MediaPickerFragment : Fragment() {
                         ).toString()
                     }
                 }
-                actionable_empty_view.button.applyOrHide(uiModel.retryAction) { action ->
+                actionableEmptyView.button.applyOrHide(uiModel.retryAction) { action ->
                     this.setOnClickListener {
                         action()
                     }
@@ -490,10 +498,11 @@ class MediaPickerFragment : Fragment() {
         }
     }
 
-    private fun setupAdapter(items: List<MediaPickerUiItem>) {
+    private fun MediaPickerFragmentBinding.setupAdapter(items: List<MediaPickerUiItem>) {
         if (recycler.adapter == null) {
             recycler.adapter = MediaPickerAdapter(
-                    imageManager
+                    imageManager,
+                    viewModel.viewModelScope
             )
         }
         val adapter = recycler.adapter as MediaPickerAdapter
@@ -511,14 +520,14 @@ class MediaPickerFragment : Fragment() {
         recycler.layoutManager?.onRestoreInstanceState(recyclerViewState)
     }
 
-    private fun setupFab(fabUiModel: FabUiModel) {
+    private fun MediaPickerFragmentBinding.setupFab(fabUiModel: FabUiModel) {
         if (fabUiModel.show) {
-            fab_take_picture.show()
-            fab_take_picture.setOnClickListener {
+            fabTakePicture.show()
+            fabTakePicture.setOnClickListener {
                 fabUiModel.action()
             }
         } else {
-            fab_take_picture.hide()
+            fabTakePicture.hide()
         }
     }
 
@@ -552,7 +561,7 @@ class MediaPickerFragment : Fragment() {
         })
     }
 
-    private fun showSnackbar(holder: SnackbarMessageHolder) {
+    private fun MediaPickerFragmentBinding.showSnackbar(holder: SnackbarMessageHolder) {
         snackbarSequencer.enqueue(
                 SnackbarItem(
                         Info(
@@ -578,7 +587,7 @@ class MediaPickerFragment : Fragment() {
         if (selectedIds.isNotEmpty()) {
             outState.putParcelableArrayList(KEY_SELECTED_IDS, ArrayList<Identifier>(selectedIds))
         }
-        recycler.layoutManager?.let {
+        binding!!.recycler.layoutManager?.let {
             outState.putParcelable(KEY_LIST_STATE, it.onSaveInstanceState())
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt
index d6d31c215061..42912cb92387 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt
@@ -8,8 +8,8 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.MediaModel
 import org.wordpress.android.fluxc.model.SiteModel
@@ -74,6 +74,7 @@ import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.MediaUtilsWrapper
+import org.wordpress.android.util.UriWrapper
 import org.wordpress.android.util.WPPermissionUtils
 import org.wordpress.android.util.distinct
 import org.wordpress.android.util.merge
@@ -286,10 +287,13 @@ class MediaPickerViewModel @Inject constructor(
             else -> {
                 val isImagePicker = mediaPickerSetup.allowedTypes.contains(IMAGE)
                 val isVideoPicker = mediaPickerSetup.allowedTypes.contains(VIDEO)
+                val isAudioPicker = mediaPickerSetup.allowedTypes.contains(AUDIO)
                 if (isImagePicker && isVideoPicker) {
                     UiStringRes(R.string.photo_picker_use_media)
                 } else if (isVideoPicker) {
                     UiStringRes(R.string.photo_picker_use_video)
+                } else if (isAudioPicker) {
+                    UiStringRes(R.string.photo_picker_use_audio)
                 } else {
                     UiStringRes(R.string.photo_picker_use_photo)
                 }
@@ -348,15 +352,15 @@ class MediaPickerViewModel @Inject constructor(
             mediaPickerTracker.trackMediaPickerOpened(mediaPickerSetup)
             this.mediaLoader = mediaLoaderFactory.build(mediaPickerSetup, site)
             this.mediaInsertHandler = mediaInsertHandlerFactory.build(mediaPickerSetup, site)
-            launch(bgDispatcher) {
-                mediaLoader.loadMedia(loadActions).collect { domainModel ->
-                    withContext(mainDispatcher) {
-                        _domainModel.value = domainModel
-                    }
+            launch {
+                mediaLoader.loadMedia(loadActions).flowOn(bgDispatcher).collect { domainModel ->
+                    _domainModel.value = domainModel
                 }
             }
-            launch(bgDispatcher) {
-                loadActions.send(LoadAction.Start())
+            if (!mediaPickerSetup.requiresStoragePermissions || permissionsHandler.hasStoragePermission()) {
+                launch(bgDispatcher) {
+                    loadActions.send(LoadAction.Start())
+                }
             }
         }
         if (mediaPickerSetup.defaultSearchView) {
@@ -416,10 +420,14 @@ class MediaPickerViewModel @Inject constructor(
 
     fun performInsertAction() {
         val ids = selectedIdentifiers()
+        insertIdentifiers(ids)
+    }
+
+    private fun insertIdentifiers(ids: List<Identifier>) {
         var job: Job? = null
         job = launch {
             var progressDialogJob: Job? = null
-            mediaInsertHandler.insertMedia(ids).collect {
+            mediaInsertHandler.insertMedia(ids).flowOn(bgDispatcher).collect {
                 when (it) {
                     is InsertModel.Progress -> {
                         progressDialogJob = launch {
@@ -510,8 +518,17 @@ class MediaPickerViewModel @Inject constructor(
                     listOf(IMAGE, VIDEO).containsAll(allowedTypes) -> {
                         Pair(ChooserContext.PHOTO_OR_VIDEO, MimeTypes().getVideoAndImageTypesOnly())
                     }
+                    listOf(AUDIO).containsAll(allowedTypes) -> {
+                        Pair(
+                                ChooserContext.AUDIO,
+                                MimeTypes().getAudioTypesOnly(mediaUtilsWrapper.getSitePlanForMimeTypes(site))
+                        )
+                    }
                     else -> {
-                        Pair(ChooserContext.MEDIA_FILE, MimeTypes().getAllTypes())
+                        Pair(
+                                ChooserContext.MEDIA_FILE,
+                                MimeTypes().getAllTypes(mediaUtilsWrapper.getSitePlanForMimeTypes(site))
+                        )
                     }
                 }
                 OpenSystemPicker(context, types.toList(), canMultiselect)
@@ -635,6 +652,13 @@ class MediaPickerViewModel @Inject constructor(
         searchJob?.cancel()
     }
 
+    fun urisSelectedFromSystemPicker(uris: List<UriWrapper>) {
+        launch {
+            delay(100)
+            insertIdentifiers(uris.map { LocalUri(it) })
+        }
+    }
+
     data class MediaPickerUiState(
         val photoListUiModel: PhotoListUiModel,
         val softAskViewUiModel: SoftAskViewUiModel,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaThumbnailViewUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaThumbnailViewUtils.kt
index d740031bfff2..5e94344e2c66 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaThumbnailViewUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaThumbnailViewUtils.kt
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.mediapicker
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.ImageView.ScaleType.FIT_CENTER
 import android.widget.TextView
 import org.wordpress.android.R
 import org.wordpress.android.ui.mediapicker.MediaPickerUiItem.ClickAction
@@ -15,26 +14,17 @@ import org.wordpress.android.util.PhotoPickerUtils
 import org.wordpress.android.util.ViewUtils
 import org.wordpress.android.util.WPMediaUtils
 import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.util.image.ImageType.PHOTO
 import org.wordpress.android.util.redirectContextClickToLongPressListener
 import java.util.Locale
 
 class MediaThumbnailViewUtils(val imageManager: ImageManager) {
-    fun setupThumbnailImage(
+    fun setupListeners(
         imgThumbnail: ImageView,
-        url: String,
         isSelected: Boolean,
-        clickAction: ClickAction,
         toggleAction: ToggleAction,
+        clickAction: ClickAction,
         animateSelection: Boolean
     ) {
-        imageManager.cancelRequestAndClearImageView(imgThumbnail)
-        imageManager.load(
-                imgThumbnail,
-                PHOTO,
-                url,
-                FIT_CENTER
-        )
         addImageSelectedToAccessibilityFocusedEvent(imgThumbnail, isSelected)
         imgThumbnail.setOnClickListener {
             toggleAction.toggle()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/PhotoThumbnailViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/PhotoThumbnailViewHolder.kt
index f19927fe18da..c13dce7782d8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/PhotoThumbnailViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/PhotoThumbnailViewHolder.kt
@@ -2,14 +2,20 @@ package org.wordpress.android.ui.mediapicker
 
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.ImageView.ScaleType.FIT_CENTER
 import android.widget.TextView
 import org.wordpress.android.R
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.PHOTO
 
 /*
  * ViewHolder containing a device thumbnail
  */
-class PhotoThumbnailViewHolder(parent: ViewGroup, private val mediaThumbnailViewUtils: MediaThumbnailViewUtils) :
-        ThumbnailViewHolder(parent, R.layout.media_picker_thumbnail_item) {
+class PhotoThumbnailViewHolder(
+    parent: ViewGroup,
+    private val mediaThumbnailViewUtils: MediaThumbnailViewUtils,
+    private val imageManager: ImageManager
+) : ThumbnailViewHolder(parent, R.layout.media_picker_thumbnail_item) {
     private val imgThumbnail: ImageView = itemView.findViewById(R.id.image_thumbnail)
     private val txtSelectionCount: TextView = itemView.findViewById(R.id.text_selection_count)
 
@@ -26,12 +32,17 @@ class PhotoThumbnailViewHolder(parent: ViewGroup, private val mediaThumbnailView
         if (updateCount) {
             return
         }
-        mediaThumbnailViewUtils.setupThumbnailImage(
+        imageManager.cancelRequestAndClearImageView(imgThumbnail)
+        imageManager.load(
                 imgThumbnail,
+                PHOTO,
                 item.url,
-                item.isSelected,
-                item.clickAction,
+                FIT_CENTER
+        )
+        mediaThumbnailViewUtils.setupListeners(
+                imgThumbnail, item.isSelected,
                 item.toggleAction,
+                item.clickAction,
                 animateSelection
         )
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/VideoThumbnailViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/VideoThumbnailViewHolder.kt
index 48b571d7f6ee..43f82ed95d68 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/VideoThumbnailViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/VideoThumbnailViewHolder.kt
@@ -2,15 +2,22 @@ package org.wordpress.android.ui.mediapicker
 
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.ImageView.ScaleType.FIT_CENTER
 import android.widget.TextView
+import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.R
 import org.wordpress.android.R.id
+import org.wordpress.android.util.image.ImageManager
 
 /*
  * ViewHolder containing a device thumbnail
  */
-class VideoThumbnailViewHolder(parent: ViewGroup, private val mediaThumbnailViewUtils: MediaThumbnailViewUtils) :
-        ThumbnailViewHolder(
+class VideoThumbnailViewHolder(
+    parent: ViewGroup,
+    private val mediaThumbnailViewUtils: MediaThumbnailViewUtils,
+    private val imageManager: ImageManager,
+    private val coroutineScope: CoroutineScope
+) : ThumbnailViewHolder(
                 parent,
                 R.layout.media_picker_thumbnail_item
         ) {
@@ -31,12 +38,17 @@ class VideoThumbnailViewHolder(parent: ViewGroup, private val mediaThumbnailView
         if (updateCount) {
             return
         }
-        mediaThumbnailViewUtils.setupThumbnailImage(
+        imageManager.cancelRequestAndClearImageView(imgThumbnail)
+        imageManager.loadThumbnailFromVideoUrl(
+                coroutineScope,
                 imgThumbnail,
                 item.url,
-                item.isSelected,
-                item.clickAction,
+                FIT_CENTER
+        )
+        mediaThumbnailViewUtils.setupListeners(
+                imgThumbnail, item.isSelected,
                 item.toggleAction,
+                item.clickAction,
                 animateSelection
         )
         mediaThumbnailViewUtils.setupVideoOverlay(videoOverlay, item.clickAction)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/insert/DeviceListInsertUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/insert/DeviceListInsertUseCase.kt
index db36f5cf1e7d..0c71c85ca133 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/insert/DeviceListInsertUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/insert/DeviceListInsertUseCase.kt
@@ -14,25 +14,20 @@ class DeviceListInsertUseCase(
 ) : MediaInsertUseCase {
     override suspend fun insert(identifiers: List<Identifier>) = flow {
         val localUris = identifiers.mapNotNull { it as? LocalUri }
-        val result = if (queueResults) {
-            emit(InsertModel.Progress(actionTitle))
-            var failed = false
-            val fetchedUris = localUris.mapNotNull { localUri ->
-                val fetchedUri = wpMediaUtilsWrapper.fetchMedia(localUri.value.uri)
-                if (fetchedUri == null) {
-                    failed = true
-                }
-                fetchedUri
-            }
-            if (failed) {
-                InsertModel.Error("Failed to fetch local media")
-            } else {
-                InsertModel.Success(fetchedUris.map { LocalUri(UriWrapper(it), queueResults) })
+        emit(InsertModel.Progress(actionTitle))
+        var failed = false
+        val fetchedUris = localUris.mapNotNull { localUri ->
+            val fetchedUri = wpMediaUtilsWrapper.fetchMedia(localUri.value.uri)
+            if (fetchedUri == null) {
+                failed = true
             }
+            fetchedUri
+        }
+        if (failed) {
+            emit(InsertModel.Error("Failed to fetch local media"))
         } else {
-            InsertModel.Success(localUris)
+            emit(InsertModel.Success(fetchedUris.map { LocalUri(UriWrapper(it), queueResults) }))
         }
-        emit(result)
     }
 
     class DeviceListInsertUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt
index e426ebd2b15d..07a98eafb607 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilder.kt
@@ -4,6 +4,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.async
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.utils.MediaUtils
 import org.wordpress.android.fluxc.utils.MimeTypes
 import org.wordpress.android.modules.BG_THREAD
@@ -18,12 +19,16 @@ import org.wordpress.android.ui.mediapicker.loader.MediaSource.MediaLoadingResul
 import org.wordpress.android.ui.mediapicker.loader.MediaSource.MediaLoadingResult.Empty
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.MediaUtilsWrapper
 import javax.inject.Inject
 import javax.inject.Named
 
+@Suppress("LongParameterList")
 class DeviceListBuilder(
     private val localeManagerWrapper: LocaleManagerWrapper,
     private val deviceMediaLoader: DeviceMediaLoader,
+    private val mediaUtilsWrapper: MediaUtilsWrapper,
+    private val site: SiteModel?,
     @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     private val mediaTypes: Set<MediaType>,
     private val pageSize: Int
@@ -98,7 +103,8 @@ class DeviceListBuilder(
         val deviceMediaList = deviceMediaLoader.loadMedia(mediaType, filter, pageSize, lastDateModified)
         val result = deviceMediaList.items.mapNotNull {
             val mimeType = deviceMediaLoader.getMimeType(it.uri)
-            if (MediaUtils.isSupportedMimeType(mimeType)) {
+            if (mimeType != null && MediaUtils.isSupportedMimeType(mimeType) &&
+                    mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(site, mimeType)) {
                 MediaItem(LocalUri(it.uri), it.uri.toString(), it.title, mediaType, mimeType, it.dateModified)
             } else {
                 null
@@ -117,7 +123,8 @@ class DeviceListBuilder(
 
         val filteredPage = documentsList.items.mapNotNull { document ->
             val mimeType = deviceMediaLoader.getMimeType(document.uri)
-            if (mimeType != null && mimeTypes.isSupportedApplicationType(mimeType)) {
+            if (mimeType != null && mimeTypes.isSupportedApplicationType(mimeType) &&
+                    mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(site, mimeType)) {
                 MediaItem(
                         LocalUri(document.uri),
                         document.uri.toString(),
@@ -151,12 +158,15 @@ class DeviceListBuilder(
     @Inject constructor(
         private val localeManagerWrapper: LocaleManagerWrapper,
         private val deviceMediaLoader: DeviceMediaLoader,
+        private val mediaUtilsWrapper: MediaUtilsWrapper,
         @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
     ) {
-        fun build(mediaTypes: Set<MediaType>): DeviceListBuilder {
+        fun build(mediaTypes: Set<MediaType>, site: SiteModel?): DeviceListBuilder {
             return DeviceListBuilder(
                     localeManagerWrapper,
                     deviceMediaLoader,
+                    mediaUtilsWrapper,
+                    site,
                     bgDispatcher,
                     mediaTypes,
                     PAGE_SIZE
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactory.kt b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactory.kt
index e47785694b25..abc50f44ce93 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactory.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactory.kt
@@ -23,7 +23,7 @@ class MediaLoaderFactory
 ) {
     fun build(mediaPickerSetup: MediaPickerSetup, siteModel: SiteModel?): MediaLoader {
         return when (mediaPickerSetup.primaryDataSource) {
-            DEVICE -> deviceListBuilderFactory.build(mediaPickerSetup.allowedTypes)
+            DEVICE -> deviceListBuilderFactory.build(mediaPickerSetup.allowedTypes, siteModel)
             WP_LIBRARY -> mediaLibraryDataSourceFactory.build(requireNotNull(siteModel) {
                 "Site is necessary when loading WP media library "
             }, mediaPickerSetup.allowedTypes)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/BlockLayoutPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/BlockLayoutPreviewFragment.kt
new file mode 100644
index 000000000000..3794aadd6951
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/BlockLayoutPreviewFragment.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.mlp
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.android.synthetic.main.layout_picker_preview_fragment.*
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.layoutpicker.LayoutPreviewFragment
+import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel
+import javax.inject.Inject
+
+/**
+ * Implements the Modal Layout Picker Preview UI
+ */
+class BlockLayoutPreviewFragment : LayoutPreviewFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: ModalLayoutPickerViewModel
+
+    companion object {
+        const val BLOCK_LAYOUT_PREVIEW_TAG = "BLOCK_LAYOUT_PREVIEW_TAG"
+
+        fun newInstance() = BlockLayoutPreviewFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        chooseButton.setText(R.string.mlp_create_page)
+
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(ModalLayoutPickerViewModel::class.java)
+        setViewModel(viewModel)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/GutenbergPageLayouts.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/GutenbergPageLayouts.kt
deleted file mode 100644
index 5141b560f8f8..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/GutenbergPageLayouts.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.wordpress.android.ui.mlp
-
-import android.os.Parcelable
-import kotlinx.android.parcel.Parcelize
-import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayout
-import org.wordpress.android.fluxc.network.rest.wpcom.site.GutenbergLayoutCategory
-
-@Parcelize
-data class GutenbergPageLayouts(
-    val layouts: List<GutenbergLayout> = listOf(),
-    val categories: List<GutenbergLayoutCategory> = listOf()
-) : Parcelable {
-    val isEmpty: Boolean
-        get() = layouts.isEmpty() || categories.isEmpty()
-    fun getFilteredLayouts(categorySlug: String) =
-            layouts.filter { l -> l.categories.any { c -> c.slug == categorySlug } }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
index ee2c8263ff27..f2d7752b6613 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerFragment.kt
@@ -1,24 +1,15 @@
 package org.wordpress.android.ui.mlp
 
-import android.app.Activity
 import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.WindowManager
 import androidx.core.view.ViewCompat
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import kotlinx.android.synthetic.main.modal_layout_picker_bottom_toolbar.*
 import kotlinx.android.synthetic.main.modal_layout_picker_categories_skeleton.*
 import kotlinx.android.synthetic.main.modal_layout_picker_error.*
@@ -29,32 +20,35 @@ import kotlinx.android.synthetic.main.modal_layout_picker_title_row.*
 import kotlinx.android.synthetic.main.modal_layout_picker_titlebar.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
-import org.wordpress.android.ui.ActivityLauncher
-import org.wordpress.android.ui.RequestCodes
+import org.wordpress.android.ui.FullscreenBottomSheetDialogFragment
+import org.wordpress.android.ui.PreviewModeSelectorPopup
+import org.wordpress.android.ui.layoutpicker.ButtonsUiState
+import org.wordpress.android.ui.layoutpicker.CategoriesAdapter
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Loading
 import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.AniUtils
-import org.wordpress.android.util.AniUtils.Duration
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.util.setVisible
 import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.ContentUiState
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.ErrorUiState
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.LoadingUiState
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Dismiss
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Show
+import org.wordpress.android.ui.mlp.BlockLayoutPreviewFragment.Companion.BLOCK_LAYOUT_PREVIEW_TAG
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 /**
- * Implements the Modal Layout Picker UI based on the [BottomSheetDialogFragment] to inherit the container behavior
+ * Implements the Modal Layout Picker UI
  */
-class ModalLayoutPickerFragment : BottomSheetDialogFragment() {
+class ModalLayoutPickerFragment : FullscreenBottomSheetDialogFragment() {
     @Inject internal lateinit var uiHelper: UiHelpers
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: ModalLayoutPickerViewModel
+    private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
 
     companion object {
         const val MODAL_LAYOUT_PICKER_TAG = "MODAL_LAYOUT_PICKER_TAG"
-        const val FETCHED_LAYOUTS = "FETCHED_LAYOUTS"
-        const val SELECTED_CATEGORIES = "SELECTED_CATEGORIES"
-        const val SELECTED_LAYOUT = "SELECTED_LAYOUT"
     }
 
     override fun onCreateView(
@@ -95,15 +89,20 @@ class ModalLayoutPickerFragment : BottomSheetDialogFragment() {
             viewModel.onCreatePageClicked()
         }
         previewButton.setOnClickListener {
-            viewModel.onPreviewPageClicked()
+            viewModel.onPreviewTapped()
         }
         retryButton.setOnClickListener {
             viewModel.onRetryClicked()
         }
+        previewTypeSelectorButton.setOnClickListener {
+            viewModel.onThumbnailModePressed()
+        }
 
         setScrollListener()
 
         setupViewModel(savedInstanceState)
+
+        previewModeSelectorPopup = PreviewModeSelectorPopup(requireActivity(), previewTypeSelectorButton)
     }
 
     private fun setScrollListener() {
@@ -114,21 +113,6 @@ class ModalLayoutPickerFragment : BottomSheetDialogFragment() {
         })
     }
 
-    /**
-     * Sets the header and title visibility
-     * @param visible if true the title is shown and the header is hidden
-     */
-    private fun setTitleVisibility(visible: Boolean) {
-        if (title == null || header == null || visible == (title.visibility == View.VISIBLE)) return // No change
-        if (visible) {
-            AniUtils.fadeIn(title, Duration.SHORT)
-            AniUtils.fadeOut(header, Duration.SHORT, View.INVISIBLE)
-        } else {
-            AniUtils.fadeIn(header, Duration.SHORT)
-            AniUtils.fadeOut(title, Duration.SHORT, View.INVISIBLE)
-        }
-    }
-
     /**
      * Sets the header description visibility
      * @param visible if true the description is visible else invisible
@@ -137,78 +121,66 @@ class ModalLayoutPickerFragment : BottomSheetDialogFragment() {
         description?.visibility = if (visible) View.VISIBLE else View.INVISIBLE
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?) = BottomSheetDialog(requireContext(), getTheme()).apply {
-        fillTheScreen(this)
-        window?.clearFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND)
-    }
-
     override fun onAttach(context: Context) {
         super.onAttach(context)
         (requireActivity().applicationContext as WordPress).component().inject(this)
     }
 
-    override fun onCancel(dialog: DialogInterface) {
-        super.onCancel(dialog)
-        closeModal()
-    }
-
-    private fun closeModal() {
+    override fun closeModal() {
         viewModel.dismiss()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        (viewModel.uiState.value as? ContentUiState)?.let {
-            outState.putSerializable(SELECTED_CATEGORIES, it.selectedCategoriesSlugs)
-            outState.putString(SELECTED_LAYOUT, it.selectedLayoutSlug)
-        }
-        outState.putParcelable(FETCHED_LAYOUTS, viewModel.fetchedLayouts())
-
         super.onSaveInstanceState(outState)
-    }
-
-    private fun loadSavedState(savedInstanceState: Bundle?) {
-        savedInstanceState?.let {
-            val layouts = it.getParcelable<GutenbergPageLayouts>(FETCHED_LAYOUTS)
-            val selected = it.getString(SELECTED_LAYOUT)
-            val categories = (it.getSerializable(SELECTED_CATEGORIES) as? List<*>)?.filterIsInstance<String>()
-            viewModel.loadSavedState(layouts, selected, categories)
-        }
+        viewModel.writeToBundle(outState)
     }
 
     private fun setupViewModel(savedInstanceState: Bundle?) {
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(ModalLayoutPickerViewModel::class.java)
 
-        loadSavedState(savedInstanceState)
+        viewModel.loadSavedState(savedInstanceState)
 
-        viewModel.uiState.observe(this, Observer { uiState ->
-            setTitleVisibility(uiState.isHeaderVisible)
+        viewModel.uiState.observe(this, { uiState ->
+            uiHelper.fadeInfadeOutViews(title, header, uiState.isHeaderVisible)
             setDescriptionVisibility(uiState.isDescriptionVisible)
             setButtonsVisibility(uiState.buttonsUiState)
             setContentVisibility(uiState.loadingSkeletonVisible, uiState.errorViewVisible)
             when (uiState) {
-                is LoadingUiState -> {
+                is Loading -> {
                 }
-                is ContentUiState -> {
+                is Content -> {
                     (categoriesRecyclerView.adapter as CategoriesAdapter).setData(uiState.categories)
                     (layoutsRecyclerView?.adapter as? LayoutCategoryAdapter)?.update(uiState.layoutCategories)
                 }
-                is ErrorUiState -> {
-                    actionableEmptyView.title.setText(uiState.title)
-                    actionableEmptyView.subtitle.setText(uiState.subtitle)
+                is Error -> {
+                    uiState.title?.let { actionableEmptyView.title.setText(it) }
+                    uiState.subtitle?.let { actionableEmptyView.subtitle.setText(it) }
                 }
             }
         })
 
-        viewModel.onPreviewPageRequested.observe(this, Observer { request ->
-            ActivityLauncher.previewPageForResult(this, request.site, request.content, request.template)
+        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner, {
+            previewModeSelectorPopup.show(viewModel)
         })
 
-        viewModel.onCategorySelected.observe(this, Observer {
-            it?.applyIfNotHandled {
-                layoutsRecyclerView?.smoothScrollToPosition(0)
+        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner, { action ->
+            activity?.supportFragmentManager?.let { fm ->
+                when (action) {
+                    is Show -> {
+                        val previewFragment = BlockLayoutPreviewFragment.newInstance()
+                        previewFragment.show(fm, BLOCK_LAYOUT_PREVIEW_TAG)
+                    }
+                    is Dismiss -> {
+                        (fm.findFragmentByTag(BLOCK_LAYOUT_PREVIEW_TAG) as? BlockLayoutPreviewFragment)?.dismiss()
+                    }
+                }
             }
         })
+
+        viewModel.onCategorySelectionChanged.observeEvent(this, {
+            layoutsRecyclerView?.smoothScrollToPosition(0)
+        })
     }
 
     private fun setContentVisibility(skeleton: Boolean, error: Boolean) {
@@ -226,29 +198,4 @@ class ModalLayoutPickerFragment : BottomSheetDialogFragment() {
         retryButton.setVisible(uiState.retryVisible)
         createOrRetryContainer.setVisible(uiState.createBlankPageVisible || uiState.retryVisible)
     }
-
-    private fun fillTheScreen(dialog: BottomSheetDialog) {
-        dialog.setOnShowListener {
-            dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)?.let {
-                val behaviour = BottomSheetBehavior.from(it)
-                setupFullHeight(it)
-                behaviour.skipCollapsed = true
-                behaviour.state = BottomSheetBehavior.STATE_EXPANDED
-            }
-        }
-    }
-
-    private fun setupFullHeight(bottomSheet: View) {
-        val layoutParams = bottomSheet.layoutParams
-        layoutParams.height = WindowManager.LayoutParams.MATCH_PARENT
-        bottomSheet.layoutParams = layoutParams
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        if (requestCode == RequestCodes.PREVIEW_POST) {
-            if (resultCode == Activity.RESULT_OK) {
-                viewModel.onCreatePageClicked()
-            }
-        }
-    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerTracker.kt
new file mode 100644
index 000000000000..5036de9d8452
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mlp/ModalLayoutPickerTracker.kt
@@ -0,0 +1,108 @@
+package org.wordpress.android.ui.mlp
+
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.ui.layoutpicker.LayoutPickerTracker
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker.PROPERTY.FILTER
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker.PROPERTY.LOCATION
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker.PROPERTY.PREVIEW_MODE
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker.PROPERTY.SELECTED_FILTERS
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker.PROPERTY.TEMPLATE
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import javax.inject.Inject
+import javax.inject.Singleton
+
+private const val LAYOUT_ERROR_CONTEXT = "layout"
+private const val PAGE_PICKER_LOCATION = "page_picker"
+
+@Singleton
+class ModalLayoutPickerTracker @Inject constructor(val tracker: AnalyticsTrackerWrapper) : LayoutPickerTracker {
+    private enum class PROPERTY(val key: String) {
+        TEMPLATE("template"),
+        PREVIEW_MODE("preview_mode"),
+        LOCATION("location"),
+        FILTER("filter"),
+        SELECTED_FILTERS("selected_filters")
+    }
+
+    override fun trackPreviewModeChanged(mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_PREVIEW_MODE_CHANGED,
+                mapOf(PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackThumbnailModeTapped(mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_THUMBNAIL_MODE_BUTTON_TAPPED,
+                mapOf(PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewModeTapped(mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_PREVIEW_MODE_BUTTON_TAPPED,
+                mapOf(PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewLoading(template: String, mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_PREVIEW_LOADING,
+                mapOf(TEMPLATE.key to template, PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewLoaded(template: String, mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_PREVIEW_LOADED,
+                mapOf(TEMPLATE.key to template, PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewViewed(template: String, mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_PREVIEW_VIEWED,
+                mapOf(TEMPLATE.key to template, PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackNoNetworkErrorShown(message: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_ERROR_SHOWN,
+                LAYOUT_ERROR_CONTEXT,
+                "internet_unavailable_error",
+                message
+        )
+    }
+
+    override fun trackErrorShown(message: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.LAYOUT_PICKER_ERROR_SHOWN,
+                LAYOUT_ERROR_CONTEXT,
+                "unknown",
+                message
+        )
+    }
+
+    override fun filterSelected(filter: String, selectedFilters: List<String>) {
+        tracker.track(
+                AnalyticsTracker.Stat.CATEGORY_FILTER_SELECTED,
+                mapOf(
+                        LOCATION.key to PAGE_PICKER_LOCATION,
+                        FILTER.key to filter,
+                        SELECTED_FILTERS.key to selectedFilters.joinToString()
+                )
+        )
+    }
+
+    override fun filterDeselected(filter: String, selectedFilters: List<String>) {
+        tracker.track(
+                AnalyticsTracker.Stat.CATEGORY_FILTER_DESELECTED,
+                mapOf(
+                        LOCATION.key to PAGE_PICKER_LOCATION,
+                        FILTER.key to filter,
+                        SELECTED_FILTERS.key to selectedFilters.joinToString()
+                )
+        )
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/CurrentAvatarSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/CurrentAvatarSource.kt
new file mode 100644
index 000000000000..5fad34984af8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/CurrentAvatarSource.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineScope
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.mysite.MySiteSource.SiteIndependentSource
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.CurrentAvatarUrl
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class CurrentAvatarSource
+@Inject constructor(private val accountStore: AccountStore) : SiteIndependentSource<CurrentAvatarUrl> {
+    private val avatarUrl = MutableLiveData<CurrentAvatarUrl>()
+    override fun buildSource(coroutineScope: CoroutineScope): LiveData<CurrentAvatarUrl> {
+        val result = MediatorLiveData<CurrentAvatarUrl>()
+        result.value = CurrentAvatarUrl(accountStore.account?.avatarUrl.orEmpty())
+        result.addSource(avatarUrl) {
+            result.value = it
+        }
+        return result
+    }
+    fun refresh() {
+        val url = accountStore.account?.avatarUrl.orEmpty()
+        if (url != avatarUrl.value?.url) {
+            avatarUrl.postValue(CurrentAvatarUrl(url))
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/DomainRegistrationHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/DomainRegistrationHandler.kt
new file mode 100644
index 000000000000..b316264c3774
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/DomainRegistrationHandler.kt
@@ -0,0 +1,83 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CancellableContinuation
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DomainCreditAvailable
+import org.wordpress.android.ui.plans.isDomainCreditAvailable
+import org.wordpress.android.util.AppLog.T.DOMAIN_REGISTRATION
+import org.wordpress.android.util.SiteUtilsWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.coroutines.resume
+
+class DomainRegistrationHandler
+@Inject constructor(
+    @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val dispatcher: Dispatcher,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val appLogWrapper: AppLogWrapper,
+    private val siteUtils: SiteUtilsWrapper
+) : MySiteSource<DomainCreditAvailable> {
+    private var continuation: CancellableContinuation<OnPlansFetched>? = null
+
+    override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<DomainCreditAvailable> {
+        continuation?.cancel()
+        continuation = null
+        val site = selectedSiteRepository.getSelectedSite()
+        if (site == null || site.id != siteId) {
+            return MutableLiveData()
+        }
+        if (shouldFetchPlans(site)) {
+            val result = MutableLiveData<DomainCreditAvailable>()
+            coroutineScope.launch(bgDispatcher) {
+                try {
+                    val event = suspendCancellableCoroutine<OnPlansFetched> { cancellableContinuation ->
+                        continuation = cancellableContinuation
+                        fetchPlans(site)
+                    }
+                    continuation = null
+                    if (event.isError) {
+                        val message = "An error occurred while fetching plans : " + event.error.message
+                        appLogWrapper.e(DOMAIN_REGISTRATION, message)
+                    } else if (siteId == event.site.id) {
+                        result.postValue(DomainCreditAvailable(isDomainCreditAvailable(event.plans)))
+                    }
+                } catch (e: CancellationException) {
+                    result.postValue(DomainCreditAvailable(false))
+                }
+            }
+            return result
+        } else {
+            return MutableLiveData(DomainCreditAvailable(false))
+        }
+    }
+
+    init {
+        dispatcher.register(this)
+    }
+
+    fun clear() {
+        dispatcher.unregister(this)
+    }
+
+    private fun shouldFetchPlans(site: SiteModel) = !siteUtils.onFreePlan(site) && !siteUtils.hasCustomDomain(site)
+
+    private fun fetchPlans(site: SiteModel) = dispatcher.dispatch(SiteActionBuilder.newFetchPlansAction(site))
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onPlansFetched(event: OnPlansFetched) = continuation?.resume(event)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/DomainRegistrationViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/DomainRegistrationViewHolder.kt
new file mode 100644
index 000000000000..2186045455ad
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/DomainRegistrationViewHolder.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.ui.mysite
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.DomainRegistrationBlockBinding
+import org.wordpress.android.ui.mysite.MySiteItem.DomainRegistrationBlock
+import org.wordpress.android.util.viewBinding
+
+class DomainRegistrationViewHolder(
+    parent: ViewGroup
+) : MySiteItemViewHolder<DomainRegistrationBlockBinding>(parent.viewBinding(DomainRegistrationBlockBinding::inflate)) {
+    fun bind(item: DomainRegistrationBlock) = with(binding) {
+        mySiteRegisterDomainCta.setOnClickListener { item.onClick.click() }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt
new file mode 100644
index 000000000000..6647cf7e041c
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt
@@ -0,0 +1,477 @@
+package org.wordpress.android.ui.mysite
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.View
+import android.widget.ImageView
+import androidx.appcompat.widget.TooltipCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.appbar.AppBarLayout.OnOffsetChangedListener
+import com.google.android.material.snackbar.Snackbar
+import com.yalantis.ucrop.UCrop
+import com.yalantis.ucrop.UCrop.Options
+import com.yalantis.ucrop.UCropActivity
+import org.wordpress.android.R
+import org.wordpress.android.R.attr
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.NewMySiteFragmentBinding
+import org.wordpress.android.ui.ActivityLauncher
+import org.wordpress.android.ui.RequestCodes
+import org.wordpress.android.ui.TextInputDialogFragment
+import org.wordpress.android.ui.domains.DomainRegistrationActivity.DomainRegistrationPurpose.CTA_DOMAIN_CREDIT_REDEMPTION
+import org.wordpress.android.ui.domains.DomainRegistrationResultFragment.Companion.RESULT_REGISTERED_DOMAIN_EMAIL
+import org.wordpress.android.ui.main.SitePickerActivity
+import org.wordpress.android.ui.main.WPMainActivity
+import org.wordpress.android.ui.main.utils.MeGravatarLoader
+import org.wordpress.android.ui.mysite.MySiteViewModel.State
+import org.wordpress.android.ui.mysite.SiteIconUploadHandler.ItemUploadedModel
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewSite
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewStory
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewStoryWithMediaIds
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewStoryWithMediaUris
+import org.wordpress.android.ui.mysite.SiteNavigationAction.ConnectJetpackForStats
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenActivityLog
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenAdmin
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenBackup
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenComments
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenCropActivity
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenDomainRegistration
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenJetpackSettings
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMeScreen
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMedia
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMediaPicker
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPages
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPeople
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPlan
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPlugins
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPosts
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenScan
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSharing
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSite
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSitePicker
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSiteSettings
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenStats
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenStories
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenThemes
+import org.wordpress.android.ui.mysite.SiteNavigationAction.StartWPComLoginForJetpackStats
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuFragment
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.photopicker.MediaPickerConstants
+import org.wordpress.android.ui.photopicker.MediaPickerLauncher
+import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource
+import org.wordpress.android.ui.posts.BasicDialogViewModel
+import org.wordpress.android.ui.posts.BasicDialogViewModel.BasicDialogModel
+import org.wordpress.android.ui.uploads.UploadService
+import org.wordpress.android.ui.uploads.UploadUtilsWrapper
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MAIN
+import org.wordpress.android.util.AppLog.T.UTILS
+import org.wordpress.android.util.QuickStartUtilsWrapper
+import org.wordpress.android.util.SnackbarItem
+import org.wordpress.android.util.SnackbarItem.Action
+import org.wordpress.android.util.SnackbarItem.Info
+import org.wordpress.android.util.SnackbarSequencer
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.util.getColorFromAttribute
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.USER
+import org.wordpress.android.util.setVisible
+import org.wordpress.android.viewmodel.observeEvent
+import java.io.File
+import javax.inject.Inject
+
+class ImprovedMySiteFragment : Fragment(R.layout.new_my_site_fragment),
+        TextInputDialogFragment.Callback {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var snackbarSequencer: SnackbarSequencer
+    @Inject lateinit var meGravatarLoader: MeGravatarLoader
+    @Inject lateinit var mediaPickerLauncher: MediaPickerLauncher
+    @Inject lateinit var uploadUtilsWrapper: UploadUtilsWrapper
+    @Inject lateinit var quickStartUtils: QuickStartUtilsWrapper
+    private lateinit var viewModel: MySiteViewModel
+    private lateinit var dialogViewModel: BasicDialogViewModel
+    private lateinit var dynamicCardMenuViewModel: DynamicCardMenuViewModel
+
+    private var binding: NewMySiteFragmentBinding? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (requireActivity().application as WordPress).component().inject(this)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(MySiteViewModel::class.java)
+        dialogViewModel = ViewModelProvider(requireActivity(), viewModelFactory)
+                .get(BasicDialogViewModel::class.java)
+        dynamicCardMenuViewModel = ViewModelProvider(requireActivity(), viewModelFactory)
+                .get(DynamicCardMenuViewModel::class.java)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding = NewMySiteFragmentBinding.bind(view).apply {
+            setupToolbar()
+            setupContentViews(savedInstanceState)
+            setupObservers()
+        }
+    }
+
+    private fun NewMySiteFragmentBinding.setupToolbar() {
+        toolbarMain.let { toolbar ->
+            toolbar.inflateMenu(R.menu.my_site_menu)
+            toolbar.menu.findItem(R.id.me_item)?.let { meMenu ->
+                meMenu.actionView.let { actionView ->
+                    actionView.setOnClickListener { viewModel.onAvatarPressed() }
+                    TooltipCompat.setTooltipText(actionView, meMenu.title)
+                }
+            }
+        }
+
+        val avatar = root.findViewById<ImageView>(R.id.avatar)
+
+        appbarMain.addOnOffsetChangedListener(OnOffsetChangedListener { appBarLayout, verticalOffset ->
+            val maxOffset = appBarLayout.totalScrollRange
+            val currentOffset = maxOffset + verticalOffset
+
+            val percentage = ((currentOffset.toFloat() / maxOffset.toFloat()) * 100).toInt()
+            avatar?.let { avatar ->
+                val minSize = avatar.minimumHeight
+                val maxSize = avatar.maxHeight
+                val modifierPx = (minSize.toFloat() - maxSize.toFloat()) * (percentage.toFloat() / 100) * -1
+                val modifierPercentage = modifierPx / minSize
+                val newScale = 1 + modifierPercentage
+
+                avatar.scaleX = newScale
+                avatar.scaleY = newScale
+            }
+        })
+    }
+
+    private fun NewMySiteFragmentBinding.setupContentViews(savedInstanceState: Bundle?) {
+        actionableEmptyView.button.setOnClickListener { viewModel.onAddSitePressed() }
+
+        val layoutManager = LinearLayoutManager(activity)
+
+        savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
+            layoutManager.onRestoreInstanceState(it)
+        }
+
+        recyclerView.layoutManager = layoutManager
+
+        val adapter = MySiteAdapter(imageManager, uiHelpers)
+
+        savedInstanceState?.getBundle(KEY_NESTED_LISTS_STATES)?.let {
+            adapter.onRestoreInstanceState(it)
+        }
+
+        recyclerView.adapter = adapter
+    }
+
+    private fun NewMySiteFragmentBinding.setupObservers() {
+        viewModel.uiModel.observe(viewLifecycleOwner, { uiModel ->
+            loadGravatar(uiModel.accountAvatarUrl)
+            when (val state = uiModel.state) {
+                is State.SiteSelected -> loadData(state.items)
+                is State.NoSites -> loadEmptyView(state.shouldShowImage)
+            }
+        })
+        viewModel.onScrollTo.observeEvent(viewLifecycleOwner, {
+            (recyclerView.layoutManager as LinearLayoutManager).scrollToPositionWithOffset(it, 0)
+        })
+        viewModel.onBasicDialogShown.observeEvent(viewLifecycleOwner, { model ->
+            dialogViewModel.showDialog(requireActivity().supportFragmentManager,
+                    BasicDialogModel(
+                            model.tag,
+                            getString(model.title),
+                            getString(model.message),
+                            getString(model.positiveButtonLabel),
+                            model.negativeButtonLabel?.let { label -> getString(label) },
+                            model.cancelButtonLabel?.let { label -> getString(label) }
+                    ))
+        })
+        viewModel.onTextInputDialogShown.observeEvent(viewLifecycleOwner, { model ->
+            val inputDialog = TextInputDialogFragment.newInstance(
+                    getString(model.title),
+                    model.initialText,
+                    getString(model.hint),
+                    model.isMultiline,
+                    model.isInputEnabled,
+                    model.callbackId
+            )
+            inputDialog.setTargetFragment(this@ImprovedMySiteFragment, 0)
+            inputDialog.show(parentFragmentManager, TextInputDialogFragment.TAG)
+        })
+        viewModel.onDynamicCardMenuShown.observeEvent(viewLifecycleOwner, { dynamicCardMenuModel ->
+            ((parentFragmentManager.findFragmentByTag(dynamicCardMenuModel.id) as? DynamicCardMenuFragment)
+                    ?: DynamicCardMenuFragment.newInstance(
+                            dynamicCardMenuModel.cardType,
+                            dynamicCardMenuModel.isPinned
+                    ))
+                    .show(parentFragmentManager, dynamicCardMenuModel.id)
+        })
+        viewModel.onNavigation.observeEvent(viewLifecycleOwner, { handleNavigationAction(it) })
+        viewModel.onSnackbarMessage.observeEvent(viewLifecycleOwner, { showSnackbar(it) })
+        viewModel.onQuickStartMySitePrompts.observeEvent(viewLifecycleOwner, { activeTutorialPrompt ->
+            val message = quickStartUtils.stylizeThemedQuickStartPrompt(
+                    requireContext(),
+                    activeTutorialPrompt.shortMessagePrompt,
+                    activeTutorialPrompt.iconId
+            )
+            showSnackbar(SnackbarMessageHolder(UiStringText(message)))
+        })
+        viewModel.onMediaUpload.observeEvent(viewLifecycleOwner, { UploadService.uploadMedia(requireActivity(), it) })
+        dialogViewModel.onInteraction.observeEvent(viewLifecycleOwner, { viewModel.onDialogInteraction(it) })
+        dynamicCardMenuViewModel.onInteraction.observeEvent(viewLifecycleOwner, { interaction ->
+            viewModel.onQuickStartMenuInteraction(interaction)
+        })
+        viewModel.onUploadedItem.observeEvent(viewLifecycleOwner, { handleUploadedItem(it) })
+    }
+
+    @Suppress("ComplexMethod")
+    private fun handleNavigationAction(action: SiteNavigationAction) = when (action) {
+        is OpenMeScreen -> ActivityLauncher.viewMeActivityForResult(activity)
+        is OpenSitePicker -> ActivityLauncher.showSitePickerForResult(activity, action.site)
+        is OpenSite -> ActivityLauncher.viewCurrentSite(activity, action.site, true)
+        is OpenMediaPicker -> mediaPickerLauncher.showSiteIconPicker(this@ImprovedMySiteFragment, action.site)
+        is OpenCropActivity -> startCropActivity(action.imageUri)
+        is OpenActivityLog -> ActivityLauncher.viewActivityLogList(activity, action.site)
+        is OpenBackup -> ActivityLauncher.viewBackupList(activity, action.site)
+        is OpenScan -> ActivityLauncher.viewScan(activity, action.site)
+        is OpenPlan -> ActivityLauncher.viewBlogPlans(activity, action.site)
+        is OpenPosts -> ActivityLauncher.viewCurrentBlogPosts(requireActivity(), action.site)
+        is OpenPages -> ActivityLauncher.viewCurrentBlogPages(requireActivity(), action.site)
+        is OpenAdmin -> ActivityLauncher.viewBlogAdmin(activity, action.site)
+        is OpenPeople -> ActivityLauncher.viewCurrentBlogPeople(activity, action.site)
+        is OpenSharing -> ActivityLauncher.viewBlogSharing(activity, action.site)
+        is OpenSiteSettings -> ActivityLauncher.viewBlogSettingsForResult(activity, action.site)
+        is OpenThemes -> ActivityLauncher.viewCurrentBlogThemes(activity, action.site)
+        is OpenPlugins -> ActivityLauncher.viewPluginBrowser(activity, action.site)
+        is OpenMedia -> ActivityLauncher.viewCurrentBlogMedia(activity, action.site)
+        is OpenComments -> ActivityLauncher.viewCurrentBlogComments(activity, action.site)
+        is OpenStats -> ActivityLauncher.viewBlogStats(activity, action.site)
+        is ConnectJetpackForStats -> ActivityLauncher.viewConnectJetpackForStats(activity, action.site)
+        is StartWPComLoginForJetpackStats -> ActivityLauncher.loginForJetpackStats(this@ImprovedMySiteFragment)
+        is OpenJetpackSettings -> ActivityLauncher.viewJetpackSecuritySettings(activity, action.site)
+        is OpenStories -> ActivityLauncher.viewStories(activity, action.site, action.event)
+        is AddNewStory -> ActivityLauncher.addNewStoryForResult(activity, action.site, action.source)
+        is AddNewStoryWithMediaIds -> ActivityLauncher.addNewStoryWithMediaIdsForResult(
+                activity,
+                action.site,
+                action.source,
+                action.mediaIds.toLongArray()
+        )
+        is AddNewStoryWithMediaUris -> ActivityLauncher.addNewStoryWithMediaUrisForResult(
+                activity,
+                action.site,
+                action.source,
+                action.mediaUris.toTypedArray()
+        )
+        is OpenDomainRegistration -> ActivityLauncher.viewDomainRegistrationActivityForResult(
+                activity,
+                action.site,
+                CTA_DOMAIN_CREDIT_REDEMPTION
+        )
+        is AddNewSite -> SitePickerActivity.addSite(activity, action.isSignedInWpCom)
+    }
+
+    private fun handleUploadedItem(itemUploadedModel: ItemUploadedModel) = when (itemUploadedModel) {
+        is ItemUploadedModel.PostUploaded -> {
+            uploadUtilsWrapper.onPostUploadedSnackbarHandler(
+                    activity,
+                    requireActivity().findViewById(R.id.coordinator),
+                    isError = true,
+                    isFirstTimePublish = false,
+                    post = itemUploadedModel.post,
+                    errorMessage = itemUploadedModel.errorMessage,
+                    site = itemUploadedModel.site
+            )
+        }
+        is ItemUploadedModel.MediaUploaded -> {
+            uploadUtilsWrapper.onMediaUploadedSnackbarHandler(
+                    activity,
+                    requireActivity().findViewById(R.id.coordinator),
+                    isError = true,
+                    mediaList = itemUploadedModel.media,
+                    site = itemUploadedModel.site,
+                    messageForUser = itemUploadedModel.errorMessage
+            )
+        }
+    }
+
+    private fun startCropActivity(imageUri: UriWrapper) {
+        val context = activity ?: return
+        val options = Options()
+        options.setShowCropGrid(false)
+        options.setStatusBarColor(context.getColorFromAttribute(android.R.attr.statusBarColor))
+        options.setToolbarColor(context.getColorFromAttribute(R.attr.wpColorAppBar))
+        options.setToolbarWidgetColor(context.getColorFromAttribute(attr.colorOnSurface))
+        options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE)
+        options.setHideBottomControls(true)
+        UCrop.of(imageUri.uri, Uri.fromFile(File(context.cacheDir, "cropped_for_site_icon.jpg")))
+                .withAspectRatio(1f, 1f)
+                .withOptions(options)
+                .start(requireActivity(), this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        viewModel.refresh()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        activity?.let {
+            if (!it.isChangingConfigurations) {
+                viewModel.clearActiveQuickStartTask()
+            }
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        binding?.recyclerView?.layoutManager?.let {
+            outState.putParcelable(KEY_LIST_STATE, it.onSaveInstanceState())
+        }
+        (binding?.recyclerView?.adapter as? MySiteAdapter)?.let {
+            outState.putBundle(KEY_NESTED_LISTS_STATES, it.onSaveInstanceState())
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
+    private fun NewMySiteFragmentBinding.loadGravatar(avatarUrl: String) =
+            root.findViewById<ImageView>(R.id.avatar)?.let {
+                meGravatarLoader.load(
+                        false,
+                        meGravatarLoader.constructGravatarUrl(avatarUrl),
+                        null,
+                        it,
+                        USER,
+                        null
+                )
+            }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (data == null) {
+            return
+        }
+        when (requestCode) {
+            RequestCodes.DO_LOGIN -> if (resultCode == Activity.RESULT_OK) {
+                viewModel.handleSuccessfulLoginResult()
+            }
+            RequestCodes.SITE_ICON_PICKER -> {
+                if (resultCode != Activity.RESULT_OK) {
+                    return
+                }
+                when {
+                    data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_ID) -> {
+                        val mediaId = data.getLongExtra(MediaPickerConstants.EXTRA_MEDIA_ID, 0)
+                        viewModel.handleSelectedSiteIcon(mediaId)
+                    }
+                    data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS) -> {
+                        val mediaUriStringsArray = data.getStringArrayExtra(
+                                MediaPickerConstants.EXTRA_MEDIA_URIS
+                        ) ?: return
+
+                        val source = PhotoPickerMediaSource.fromString(
+                                data.getStringExtra(MediaPickerConstants.EXTRA_MEDIA_SOURCE)
+                        )
+                        val iconUrl = mediaUriStringsArray.getOrNull(0) ?: return
+                        viewModel.handleTakenSiteIcon(iconUrl, source)
+                    }
+                    else -> {
+                        AppLog.e(
+                                UTILS,
+                                "Can't resolve picked or captured image"
+                        )
+                    }
+                }
+            }
+            RequestCodes.STORIES_PHOTO_PICKER,
+            RequestCodes.PHOTO_PICKER -> if (resultCode == Activity.RESULT_OK) {
+                viewModel.handleStoriesPhotoPickerResult(data)
+            }
+            UCrop.REQUEST_CROP -> {
+                if (resultCode == UCrop.RESULT_ERROR) {
+                    AppLog.e(
+                            MAIN,
+                            "Image cropping failed!",
+                            UCrop.getError(data)
+                    )
+                }
+                viewModel.handleCropResult(UCrop.getOutput(data), resultCode == Activity.RESULT_OK)
+            }
+            RequestCodes.DOMAIN_REGISTRATION -> if (resultCode == Activity.RESULT_OK) {
+                viewModel.handleSuccessfulDomainRegistrationResult(data.getStringExtra(RESULT_REGISTERED_DOMAIN_EMAIL))
+            }
+            RequestCodes.CREATE_SITE -> {
+                viewModel.startQuickStart(data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1))
+            }
+            RequestCodes.SITE_PICKER -> {
+                if (data.getIntExtra(WPMainActivity.ARG_CREATE_SITE, 0) == RequestCodes.CREATE_SITE) {
+                    viewModel.startQuickStart(data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1))
+                }
+            }
+        }
+    }
+
+    private fun NewMySiteFragmentBinding.loadData(items: List<MySiteItem>) {
+        recyclerView.setVisible(true)
+        actionableEmptyView.setVisible(false)
+        (recyclerView.adapter as? MySiteAdapter)?.loadData(items)
+    }
+
+    private fun NewMySiteFragmentBinding.loadEmptyView(shouldShowEmptyViewImage: Boolean) {
+        recyclerView.setVisible(false)
+        actionableEmptyView.setVisible(true)
+        actionableEmptyView.image.setVisible(shouldShowEmptyViewImage)
+    }
+
+    private fun showSnackbar(holder: SnackbarMessageHolder) {
+        activity?.let { parent ->
+            snackbarSequencer.enqueue(
+                    SnackbarItem(
+                            Info(
+                                    view = parent.findViewById(R.id.coordinator),
+                                    textRes = holder.message,
+                                    duration = Snackbar.LENGTH_LONG
+                            ),
+                            holder.buttonTitle?.let {
+                                Action(
+                                        textRes = holder.buttonTitle,
+                                        clickListener = { holder.buttonAction() }
+                                )
+                            },
+                            dismissCallback = { _, _ -> holder.onDismissAction() }
+                    )
+            )
+        }
+    }
+
+    companion object {
+        private const val KEY_LIST_STATE = "key_list_state"
+        private const val KEY_NESTED_LISTS_STATES = "key_nested_lists_states"
+        fun newInstance(): ImprovedMySiteFragment {
+            return ImprovedMySiteFragment()
+        }
+    }
+
+    override fun onSuccessfulInput(input: String, callbackId: Int) {
+        viewModel.onSiteNameChosen(input)
+    }
+
+    override fun onTextInputDialogDismissed(callbackId: Int) {
+        viewModel.onSiteNameChooserDismissed()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/ListItemAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ListItemAction.kt
new file mode 100644
index 000000000000..b78f0808e56f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ListItemAction.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.ui.mysite
+
+enum class ListItemAction {
+    ACTIVITY_LOG,
+    BACKUP,
+    SCAN,
+    JETPACK_SETTINGS,
+    PLAN,
+    POSTS,
+    PAGES,
+    ADMIN,
+    PEOPLE,
+    SHARING,
+    SITE_SETTINGS,
+    THEMES,
+    PLUGINS,
+    STATS,
+    MEDIA,
+    COMMENTS,
+    VIEW_SITE
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteAdapter.kt
new file mode 100644
index 000000000000..0e7492aeaeab
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteAdapter.kt
@@ -0,0 +1,82 @@
+package org.wordpress.android.ui.mysite
+
+import android.os.Bundle
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.mysite.MySiteItem.DomainRegistrationBlock
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard
+import org.wordpress.android.ui.mysite.MySiteItem.ListItem
+import org.wordpress.android.ui.mysite.MySiteItem.QuickActionsBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock
+import org.wordpress.android.ui.mysite.MySiteItem.Type.CATEGORY_HEADER
+import org.wordpress.android.ui.mysite.MySiteItem.Type.DOMAIN_REGISTRATION_BLOCK
+import org.wordpress.android.ui.mysite.MySiteItem.Type.LIST_ITEM
+import org.wordpress.android.ui.mysite.MySiteItem.Type.QUICK_ACTIONS_BLOCK
+import org.wordpress.android.ui.mysite.MySiteItem.Type.QUICK_START_CARD
+import org.wordpress.android.ui.mysite.MySiteItem.Type.SITE_INFO_BLOCK
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+
+class MySiteAdapter(val imageManager: ImageManager, val uiHelpers: UiHelpers) : Adapter<MySiteItemViewHolder<*>>() {
+    private var items = listOf<MySiteItem>()
+    private val quickStartViewPool = RecycledViewPool()
+    private var nestedScrollStates = Bundle()
+
+    fun loadData(result: List<MySiteItem>) {
+        val diffResult = DiffUtil.calculateDiff(
+                MySiteAdapterDiffCallback(items, result)
+        )
+        items = result
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MySiteItemViewHolder<*> {
+        return when (viewType) {
+            SITE_INFO_BLOCK.ordinal -> MySiteInfoViewHolder(parent, imageManager)
+            QUICK_ACTIONS_BLOCK.ordinal -> QuickActionsViewHolder(parent)
+            DOMAIN_REGISTRATION_BLOCK.ordinal -> DomainRegistrationViewHolder(parent)
+            QUICK_START_CARD.ordinal -> QuickStartCardViewHolder(
+                    parent,
+                    quickStartViewPool,
+                    nestedScrollStates,
+                    uiHelpers
+            )
+            CATEGORY_HEADER.ordinal -> MySiteCategoryViewHolder(parent, uiHelpers)
+            LIST_ITEM.ordinal -> MySiteListItemViewHolder(parent, uiHelpers)
+            else -> throw IllegalArgumentException("Unexpected view type")
+        }
+    }
+
+    override fun onBindViewHolder(holder: MySiteItemViewHolder<*>, position: Int) {
+        when (holder) {
+            is MySiteInfoViewHolder -> holder.bind(items[position] as SiteInfoBlock)
+            is QuickActionsViewHolder -> holder.bind(items[position] as QuickActionsBlock)
+            is DomainRegistrationViewHolder -> holder.bind(items[position] as DomainRegistrationBlock)
+            is QuickStartCardViewHolder -> holder.bind(items[position] as QuickStartCard)
+            is MySiteCategoryViewHolder -> holder.bind(items[position] as CategoryHeader)
+            is MySiteListItemViewHolder -> holder.bind(items[position] as ListItem)
+        }
+    }
+
+    override fun onViewRecycled(holder: MySiteItemViewHolder<*>) {
+        super.onViewRecycled(holder)
+        if (holder is QuickStartCardViewHolder) {
+            holder.onRecycled()
+        }
+    }
+
+    override fun getItemViewType(position: Int) = items[position].type.ordinal
+
+    override fun getItemCount(): Int = items.size
+
+    fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        nestedScrollStates = savedInstanceState
+    }
+
+    fun onSaveInstanceState(): Bundle {
+        return nestedScrollStates
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteAdapterDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteAdapterDiffCallback.kt
new file mode 100644
index 000000000000..79defb723b98
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteAdapterDiffCallback.kt
@@ -0,0 +1,37 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.recyclerview.widget.DiffUtil
+import org.apache.commons.lang3.NotImplementedException
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.mysite.MySiteItem.DomainRegistrationBlock
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard
+import org.wordpress.android.ui.mysite.MySiteItem.ListItem
+import org.wordpress.android.ui.mysite.MySiteItem.QuickActionsBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock
+
+class MySiteAdapterDiffCallback(
+    private val oldItems: List<MySiteItem>,
+    private val updatedItems: List<MySiteItem>
+) : DiffUtil.Callback() {
+    override fun getOldListSize(): Int = oldItems.size
+
+    override fun getNewListSize(): Int = updatedItems.size
+
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        val oldItem = oldItems[oldItemPosition]
+        val updatedItem = updatedItems[newItemPosition]
+        return oldItem.type == updatedItem.type && when {
+            oldItem is SiteInfoBlock && updatedItem is SiteInfoBlock -> true
+            oldItem is QuickActionsBlock && updatedItem is QuickActionsBlock -> true
+            oldItem is DomainRegistrationBlock && updatedItem is DomainRegistrationBlock -> true
+            oldItem is QuickStartCard && updatedItem is QuickStartCard -> oldItem.id == updatedItem.id
+            oldItem is CategoryHeader && updatedItem is CategoryHeader -> oldItem.title == updatedItem.title
+            oldItem is ListItem && updatedItem is ListItem -> oldItem.primaryText == updatedItem.primaryText
+            else -> throw NotImplementedException("Diff not implemented yet")
+        }
+    }
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldItems[oldItemPosition] == updatedItems[newItemPosition]
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCategoryViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCategoryViewHolder.kt
new file mode 100644
index 000000000000..c7ff66bd4b7d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteCategoryViewHolder.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.ui.mysite
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.MySiteCategoryHeaderBlockBinding
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.viewBinding
+
+class MySiteCategoryViewHolder(
+    parent: ViewGroup,
+    private val uiHelpers: UiHelpers
+) : MySiteItemViewHolder<MySiteCategoryHeaderBlockBinding>(
+        parent.viewBinding(MySiteCategoryHeaderBlockBinding::inflate)
+) {
+    fun bind(item: CategoryHeader) = with(binding) {
+        uiHelpers.setTextOrHide(category, item.title)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteInfoViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteInfoViewHolder.kt
new file mode 100644
index 000000000000..2d097dade544
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteInfoViewHolder.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.mysite
+
+import android.view.View
+import android.view.ViewGroup
+import org.wordpress.android.databinding.MySiteInfoBlockBinding
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock.IconState
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.BLAVATAR
+import org.wordpress.android.util.viewBinding
+
+class MySiteInfoViewHolder(
+    parent: ViewGroup,
+    private val imageManager: ImageManager
+) : MySiteItemViewHolder<MySiteInfoBlockBinding>(parent.viewBinding(MySiteInfoBlockBinding::inflate)) {
+    fun bind(item: SiteInfoBlock) = with(binding) {
+        if (item.iconState is IconState.Visible) {
+            mySiteBlavatar.visibility = View.VISIBLE
+            imageManager.load(mySiteBlavatar, BLAVATAR, item.iconState.url ?: "")
+            mySiteIconProgress.visibility = View.GONE
+            mySiteBlavatar.setOnClickListener { item.onIconClick.click() }
+        } else if (item.iconState is IconState.Progress) {
+            mySiteBlavatar.setOnClickListener(null)
+            mySiteIconProgress.visibility = View.VISIBLE
+            mySiteBlavatar.visibility = View.GONE
+        }
+        quickStartIconFocusPoint.setVisibleOrGone(item.showIconFocusPoint)
+        if (item.onTitleClick != null) {
+            siteInfoContainer.title.setOnClickListener { item.onTitleClick.click() }
+        } else {
+            siteInfoContainer.title.setOnClickListener(null)
+        }
+        siteInfoContainer.title.text = item.title
+        quickStartTitleFocusPoint.setVisibleOrGone(item.showTitleFocusPoint)
+        siteInfoContainer.subtitle.text = item.url
+        siteInfoContainer.subtitle.setOnClickListener { item.onUrlClick.click() }
+        switchSite.setOnClickListener { item.onSwitchSiteClick.click() }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteItem.kt
new file mode 100644
index 000000000000..bd94fc247a3d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteItem.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.ui.mysite.MySiteItem.Type.CATEGORY_HEADER
+import org.wordpress.android.ui.mysite.MySiteItem.Type.DOMAIN_REGISTRATION_BLOCK
+import org.wordpress.android.ui.mysite.MySiteItem.Type.LIST_ITEM
+import org.wordpress.android.ui.mysite.MySiteItem.Type.QUICK_ACTIONS_BLOCK
+import org.wordpress.android.ui.mysite.MySiteItem.Type.QUICK_START_CARD
+import org.wordpress.android.ui.mysite.MySiteItem.Type.SITE_INFO_BLOCK
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString
+
+sealed class MySiteItem(open val type: Type, open val activeQuickStartItem: Boolean = false) {
+    enum class Type {
+        SITE_INFO_BLOCK,
+        QUICK_ACTIONS_BLOCK,
+        DOMAIN_REGISTRATION_BLOCK,
+        QUICK_START_CARD,
+        CATEGORY_HEADER,
+        LIST_ITEM
+    }
+
+    data class SiteInfoBlock(
+        val title: String,
+        val url: String,
+        val iconState: IconState,
+        val showTitleFocusPoint: Boolean,
+        val showIconFocusPoint: Boolean,
+        val onTitleClick: ListItemInteraction? = null,
+        val onIconClick: ListItemInteraction,
+        val onUrlClick: ListItemInteraction,
+        val onSwitchSiteClick: ListItemInteraction
+    ) : MySiteItem(SITE_INFO_BLOCK, activeQuickStartItem = showTitleFocusPoint || showIconFocusPoint) {
+        sealed class IconState {
+            object Progress : IconState()
+            data class Visible(val url: String? = null) : IconState()
+        }
+    }
+
+    data class QuickActionsBlock(
+        val onStatsClick: ListItemInteraction,
+        val onPagesClick: ListItemInteraction,
+        val onPostsClick: ListItemInteraction,
+        val onMediaClick: ListItemInteraction,
+        val showPages: Boolean = true,
+        val showStatsFocusPoint: Boolean = false,
+        val showPagesFocusPoint: Boolean = false
+    ) : MySiteItem(QUICK_ACTIONS_BLOCK, activeQuickStartItem = showStatsFocusPoint || showPagesFocusPoint)
+
+    data class DomainRegistrationBlock(val onClick: ListItemInteraction) : MySiteItem(DOMAIN_REGISTRATION_BLOCK)
+
+    sealed class DynamicCard(
+        override val type: Type,
+        override val activeQuickStartItem: Boolean = false,
+        open val dynamicCardType: DynamicCardType,
+        open val onMoreClick: ListItemInteraction
+    ) : MySiteItem(
+            type,
+            activeQuickStartItem
+    ) {
+        data class QuickStartCard(
+            val id: DynamicCardType,
+            val title: UiString,
+            val taskCards: List<QuickStartTaskCard>,
+            @ColorRes val accentColor: Int,
+            val progress: Int,
+            override val onMoreClick: ListItemInteraction
+        ) : DynamicCard(QUICK_START_CARD, dynamicCardType = id, onMoreClick = onMoreClick) {
+            data class QuickStartTaskCard(
+                val quickStartTask: QuickStartTask,
+                val title: UiString,
+                val description: UiString,
+                @DrawableRes val illustration: Int,
+                @ColorRes val accentColor: Int,
+                val done: Boolean = false,
+                val onClick: ListItemInteraction
+            )
+        }
+    }
+
+    data class CategoryHeader(val title: UiString) : MySiteItem(CATEGORY_HEADER)
+
+    data class ListItem(
+        @DrawableRes val primaryIcon: Int,
+        val primaryText: UiString,
+        @DrawableRes val secondaryIcon: Int? = null,
+        val secondaryText: UiString? = null,
+        val showFocusPoint: Boolean = false,
+        val onClick: ListItemInteraction
+    ) : MySiteItem(LIST_ITEM, activeQuickStartItem = showFocusPoint)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteItemViewHolder.kt
new file mode 100644
index 000000000000..1eb935522642
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteItemViewHolder.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import androidx.viewbinding.ViewBinding
+
+open class MySiteItemViewHolder<T : ViewBinding>(protected val binding: T) : ViewHolder(binding.root)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteListItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteListItemViewHolder.kt
new file mode 100644
index 000000000000..e5cf65e67abe
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteListItemViewHolder.kt
@@ -0,0 +1,20 @@
+package org.wordpress.android.ui.mysite
+
+import android.view.ViewGroup
+import org.wordpress.android.databinding.MySiteItemBlockBinding
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.viewBinding
+
+class MySiteListItemViewHolder(
+    parent: ViewGroup,
+    private val uiHelpers: UiHelpers
+) : MySiteItemViewHolder<MySiteItemBlockBinding>(parent.viewBinding(MySiteItemBlockBinding::inflate)) {
+    fun bind(item: MySiteItem.ListItem) = with(binding) {
+        uiHelpers.setImageOrHide(mySiteItemPrimaryIcon, item.primaryIcon)
+        uiHelpers.setImageOrHide(mySiteItemSecondaryIcon, item.secondaryIcon)
+        uiHelpers.setTextOrHide(mySiteItemPrimaryText, item.primaryText)
+        uiHelpers.setTextOrHide(mySiteItemSecondaryText, item.secondaryText)
+        itemView.setOnClickListener { item.onClick.click() }
+        mySiteItemQuickStartFocusPoint.setVisibleOrGone(item.showFocusPoint)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteSource.kt
new file mode 100644
index 000000000000..88281867c30d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteSource.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import kotlinx.coroutines.CoroutineScope
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState
+
+interface MySiteSource<T : PartialState> {
+    fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<T>
+    interface SiteIndependentSource<T : PartialState> : MySiteSource<T> {
+        fun buildSource(coroutineScope: CoroutineScope): LiveData<T>
+        override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<T> = buildSource(coroutineScope)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteStateProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteStateProvider.kt
new file mode 100644
index 000000000000..aa3ac7c8057e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteStateProvider.kt
@@ -0,0 +1,73 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.switchMap
+import kotlinx.coroutines.CoroutineScope
+import org.wordpress.android.ui.mysite.MySiteSource.SiteIndependentSource
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.SelectedSite
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.ShowSiteIconProgressBar
+import org.wordpress.android.util.filter
+import org.wordpress.android.util.map
+
+class MySiteStateProvider(
+    private val coroutineScope: CoroutineScope,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    vararg sources: MySiteSource<*>
+) {
+    private val mySiteSources = mutableListOf<MySiteSource<*>>(
+            selectedSiteSource(),
+            siteIconProgressSource()
+    ).apply {
+        addAll(sources)
+    }
+
+    val state: LiveData<MySiteUiState> = selectedSiteRepository.siteSelected.switchMap { siteId ->
+        val result = MediatorLiveData<SiteIdToState>()
+        val currentSources = if (siteId != null) {
+            mySiteSources.map { source -> source.buildSource(coroutineScope, siteId).distinctUntilChanged() }
+        } else {
+            mySiteSources.filterIsInstance(SiteIndependentSource::class.java)
+                    .map { source -> source.buildSource(coroutineScope).distinctUntilChanged() }
+        }
+        for (newSource in currentSources) {
+            result.addSource(newSource) { partialState ->
+                if (partialState != null) {
+                    result.value = (result.value ?: SiteIdToState(siteId)).update(partialState)
+                }
+            }
+        }
+        // We want to filter out the empty state where we have a site ID but site object is missing.
+        // Without this check there is an emission of a NoSites state even if we have the site
+        result.filter { it.siteId == null || it.state.site != null }.map { it.state }
+    }.distinctUntilChanged()
+
+    private data class SiteIdToState(val siteId: Int?, val state: MySiteUiState = MySiteUiState()) {
+        fun update(partialState: PartialState): SiteIdToState {
+            return this.copy(state = state.update(partialState))
+        }
+    }
+
+    private fun selectedSiteSource(): MySiteSource<SelectedSite> =
+            object : MySiteSource<SelectedSite> {
+                override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<SelectedSite> {
+                    return selectedSiteRepository.selectedSiteChange
+                            .filter { it == null || it.id == siteId }
+                            .map { SelectedSite(it) }
+                }
+            }
+
+    private fun siteIconProgressSource(): MySiteSource<ShowSiteIconProgressBar> =
+            object : MySiteSource<ShowSiteIconProgressBar> {
+                override fun buildSource(
+                    coroutineScope: CoroutineScope,
+                    siteId: Int
+                ): LiveData<ShowSiteIconProgressBar> {
+                    return selectedSiteRepository.showSiteIconProgressBar
+                            .map { ShowSiteIconProgressBar(it == true) }
+                            .distinctUntilChanged()
+                }
+            }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteUiState.kt
new file mode 100644
index 000000000000..4c00bae4ce8d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteUiState.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.ui.mysite
+
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.CurrentAvatarUrl
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DomainCreditAvailable
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DynamicCardsUpdate
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.JetpackCapabilities
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.QuickStartUpdate
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.SelectedSite
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.ShowSiteIconProgressBar
+import org.wordpress.android.ui.mysite.QuickStartRepository.QuickStartCategory
+
+data class MySiteUiState(
+    val currentAvatarUrl: String? = null,
+    val site: SiteModel? = null,
+    val showSiteIconProgressBar: Boolean = false,
+    val isDomainCreditAvailable: Boolean = false,
+    val scanAvailable: Boolean = false,
+    val backupAvailable: Boolean = false,
+    val activeTask: QuickStartTask? = null,
+    val quickStartCategories: List<QuickStartCategory> = listOf(),
+    val pinnedDynamicCard: DynamicCardType? = null,
+    val visibleDynamicCards: List<DynamicCardType> = listOf()
+) {
+    sealed class PartialState {
+        data class CurrentAvatarUrl(val url: String) : PartialState()
+        data class SelectedSite(val site: SiteModel?) : PartialState()
+        data class ShowSiteIconProgressBar(val showSiteIconProgressBar: Boolean) : PartialState()
+        data class DomainCreditAvailable(val isDomainCreditAvailable: Boolean) : PartialState()
+        data class JetpackCapabilities(val scanAvailable: Boolean, val backupAvailable: Boolean) : PartialState()
+        data class QuickStartUpdate(
+            val activeTask: QuickStartTask? = null,
+            val categories: List<QuickStartCategory> = listOf()
+        ) : PartialState()
+
+        data class DynamicCardsUpdate(
+            val pinnedDynamicCard: DynamicCardType? = null,
+            val cards: List<DynamicCardType>
+        ) : PartialState()
+    }
+
+    fun update(partialState: PartialState): MySiteUiState {
+        return when (partialState) {
+            is CurrentAvatarUrl -> this.copy(currentAvatarUrl = partialState.url)
+            is SelectedSite -> this.copy(site = partialState.site)
+            is ShowSiteIconProgressBar -> this.copy(showSiteIconProgressBar = partialState.showSiteIconProgressBar)
+            is DomainCreditAvailable -> this.copy(isDomainCreditAvailable = partialState.isDomainCreditAvailable)
+            is JetpackCapabilities -> this.copy(
+                    scanAvailable = partialState.scanAvailable,
+                    backupAvailable = partialState.backupAvailable
+            )
+            is QuickStartUpdate -> this.copy(
+                    activeTask = partialState.activeTask,
+                    quickStartCategories = partialState.categories
+            )
+            is DynamicCardsUpdate -> this.copy(
+                    pinnedDynamicCard = partialState.pinnedDynamicCard,
+                    visibleDynamicCards = partialState.cards
+            )
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
new file mode 100644
index 000000000000..e699ef31c3a4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
@@ -0,0 +1,628 @@
+package org.wordpress.android.ui.mysite
+
+import android.content.Intent
+import android.net.Uri
+import android.text.TextUtils
+import androidx.annotation.StringRes
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_PROMPT_SHOWN
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_REDEMPTION_SUCCESS
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_REDEMPTION_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_CROPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_GALLERY_PICKED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_REMOVED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_SHOT_NEW
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_ACTION_MEDIA_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_ACTION_PAGES_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_ACTION_POSTS_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_ACTION_STATS_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_START_HIDE_CARD_TAPPED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_START_REMOVE_CARD_TAPPED
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHECK_STATS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.ENABLE_POST_SHARING
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EXPLORE_PLANS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.REVIEW_PAGES
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPLOAD_SITE_ICON
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.PagePostCreationSourcesDetail.STORY_FROM_MY_SITE
+import org.wordpress.android.ui.mysite.ListItemAction.ACTIVITY_LOG
+import org.wordpress.android.ui.mysite.ListItemAction.ADMIN
+import org.wordpress.android.ui.mysite.ListItemAction.BACKUP
+import org.wordpress.android.ui.mysite.ListItemAction.COMMENTS
+import org.wordpress.android.ui.mysite.ListItemAction.JETPACK_SETTINGS
+import org.wordpress.android.ui.mysite.ListItemAction.MEDIA
+import org.wordpress.android.ui.mysite.ListItemAction.PAGES
+import org.wordpress.android.ui.mysite.ListItemAction.PEOPLE
+import org.wordpress.android.ui.mysite.ListItemAction.PLAN
+import org.wordpress.android.ui.mysite.ListItemAction.PLUGINS
+import org.wordpress.android.ui.mysite.ListItemAction.POSTS
+import org.wordpress.android.ui.mysite.ListItemAction.SCAN
+import org.wordpress.android.ui.mysite.ListItemAction.SHARING
+import org.wordpress.android.ui.mysite.ListItemAction.SITE_SETTINGS
+import org.wordpress.android.ui.mysite.ListItemAction.STATS
+import org.wordpress.android.ui.mysite.ListItemAction.THEMES
+import org.wordpress.android.ui.mysite.ListItemAction.VIEW_SITE
+import org.wordpress.android.ui.mysite.MySiteItem.DomainRegistrationBlock
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard
+import org.wordpress.android.ui.mysite.MySiteItem.QuickActionsBlock
+import org.wordpress.android.ui.mysite.SiteDialogModel.AddSiteIconDialogModel
+import org.wordpress.android.ui.mysite.SiteDialogModel.ChangeSiteIconDialogModel
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewSite
+import org.wordpress.android.ui.mysite.SiteNavigationAction.ConnectJetpackForStats
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenActivityLog
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenAdmin
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenBackup
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenComments
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenCropActivity
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenDomainRegistration
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenJetpackSettings
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMeScreen
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMedia
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMediaPicker
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPages
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPeople
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPlan
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPlugins
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPosts
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenScan
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSharing
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSite
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSitePicker
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSiteSettings
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenStats
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenThemes
+import org.wordpress.android.ui.mysite.SiteNavigationAction.StartWPComLoginForJetpackStats
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuFragment.DynamicCardMenuModel
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Hide
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Pin
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Unpin
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardsSource
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource
+import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource.ANDROID_CAMERA
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Dismissed
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Negative
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Positive
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.BuildConfigWrapper
+import org.wordpress.android.util.DisplayUtilsWrapper
+import org.wordpress.android.util.FluxCUtilsWrapper
+import org.wordpress.android.util.MediaUtilsWrapper
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.util.WPMediaUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.getEmailValidationMessage
+import org.wordpress.android.util.map
+import org.wordpress.android.util.merge
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import java.io.File
+import javax.inject.Inject
+import javax.inject.Named
+
+@Suppress("LongMethod")
+class MySiteViewModel
+@Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    @param:Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
+    @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val siteInfoBlockBuilder: SiteInfoBlockBuilder,
+    private val siteItemsBuilder: SiteItemsBuilder,
+    private val accountStore: AccountStore,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val wpMediaUtilsWrapper: WPMediaUtilsWrapper,
+    private val mediaUtilsWrapper: MediaUtilsWrapper,
+    private val fluxCUtilsWrapper: FluxCUtilsWrapper,
+    private val contextProvider: ContextProvider,
+    private val siteIconUploadHandler: SiteIconUploadHandler,
+    private val siteStoriesHandler: SiteStoriesHandler,
+    private val domainRegistrationHandler: DomainRegistrationHandler,
+    private val scanAndBackupSource: ScanAndBackupSource,
+    private val displayUtilsWrapper: DisplayUtilsWrapper,
+    private val quickStartRepository: QuickStartRepository,
+    private val quickStartItemBuilder: QuickStartItemBuilder,
+    private val currentAvatarSource: CurrentAvatarSource,
+    private val dynamicCardsSource: DynamicCardsSource,
+    private val buildConfigWrapper: BuildConfigWrapper
+) : ScopedViewModel(mainDispatcher) {
+    private val _onSnackbarMessage = MutableLiveData<Event<SnackbarMessageHolder>>()
+    private val _onTechInputDialogShown = MutableLiveData<Event<TextInputDialogModel>>()
+    private val _onBasicDialogShown = MutableLiveData<Event<SiteDialogModel>>()
+    private val _onDynamicCardMenuShown = MutableLiveData<Event<DynamicCardMenuModel>>()
+    private val _onNavigation = MutableLiveData<Event<SiteNavigationAction>>()
+    private val _onMediaUpload = MutableLiveData<Event<MediaModel>>()
+    private val _activeTaskPosition = MutableLiveData<Pair<QuickStartTask, Int>>()
+
+    val onScrollTo: LiveData<Event<Int>> = merge(
+            _activeTaskPosition.distinctUntilChanged(),
+            quickStartRepository.activeTask
+    ) { pair, activeTask ->
+        if (pair != null && activeTask != null && pair.first == activeTask) {
+            Event(pair.second)
+        } else {
+            null
+        }
+    }
+    val onSnackbarMessage = merge(_onSnackbarMessage, siteStoriesHandler.onSnackbar, quickStartRepository.onSnackbar)
+    val onQuickStartMySitePrompts = quickStartRepository.onQuickStartMySitePrompts
+    val onTextInputDialogShown = _onTechInputDialogShown as LiveData<Event<TextInputDialogModel>>
+    val onBasicDialogShown = _onBasicDialogShown as LiveData<Event<SiteDialogModel>>
+    val onDynamicCardMenuShown = _onDynamicCardMenuShown as LiveData<Event<DynamicCardMenuModel>>
+    val onNavigation = merge(_onNavigation, siteStoriesHandler.onNavigation)
+    val onMediaUpload = _onMediaUpload as LiveData<Event<MediaModel>>
+    val onUploadedItem = siteIconUploadHandler.onUploadedItem
+
+    val uiModel: LiveData<UiModel> = MySiteStateProvider(
+            viewModelScope,
+            selectedSiteRepository,
+            quickStartRepository,
+            currentAvatarSource,
+            domainRegistrationHandler,
+            scanAndBackupSource,
+            dynamicCardsSource
+    ).state.map { (
+            currentAvatarUrl,
+            site,
+            showSiteIconProgressBar,
+            isDomainCreditAvailable,
+            scanAvailable,
+            backupAvailable,
+            activeTask,
+            quickStartCategories,
+            pinnedDynamicCard,
+            visibleDynamicCards
+    ) ->
+        val state = if (site != null) {
+            val siteItems = mutableListOf<MySiteItem>()
+            siteItems.add(
+                    siteInfoBlockBuilder.buildSiteInfoBlock(
+                            site,
+                            showSiteIconProgressBar,
+                            this::titleClick,
+                            this::iconClick,
+                            this::urlClick,
+                            this::switchSiteClick,
+                            activeTask == UPDATE_SITE_TITLE,
+                            activeTask == UPLOAD_SITE_ICON
+                    )
+            )
+            if (!buildConfigWrapper.isJetpackApp) {
+                siteItems.add(
+                        QuickActionsBlock(
+                                ListItemInteraction.create(this::quickActionStatsClick),
+                                ListItemInteraction.create(this::quickActionPagesClick),
+                                ListItemInteraction.create(this::quickActionPostsClick),
+                                ListItemInteraction.create(this::quickActionMediaClick),
+                                site.isSelfHostedAdmin || site.hasCapabilityEditPages,
+                                activeTask == CHECK_STATS,
+                                activeTask == EDIT_HOMEPAGE || activeTask == REVIEW_PAGES
+                        )
+                )
+            }
+            if (isDomainCreditAvailable) {
+                analyticsTrackerWrapper.track(DOMAIN_CREDIT_PROMPT_SHOWN)
+                siteItems.add(DomainRegistrationBlock(ListItemInteraction.create(this::domainRegistrationClick)))
+            }
+            val dynamicCards: Map<DynamicCardType, DynamicCard> = mutableListOf<DynamicCard>().also { list ->
+                // Add all possible future dynamic cards here. If we ever have a remote source of dynamic cards, we'd
+                // need to implement a smarter solution where we'd build the sources based on the dynamic cards.
+                // This means that the stream of dynamic cards would emit a new stream for each of the cards. The
+                // current solution is good enough for a few sources.
+                list.addAll(quickStartCategories.map { category ->
+                    quickStartItemBuilder.build(
+                            category,
+                            pinnedDynamicCard,
+                            this::onDynamicCardMoreClick,
+                            this::onQuickStartTaskCardClick
+                    )
+                })
+            }.associateBy { it.dynamicCardType }
+            siteItems.addAll(
+                    visibleDynamicCards.mapNotNull { dynamicCardType -> dynamicCards[dynamicCardType] }
+            )
+
+            siteItems.addAll(
+                    siteItemsBuilder.buildSiteItems(
+                            site,
+                            this::onItemClick,
+                            backupAvailable,
+                            scanAvailable,
+                            activeTask == QuickStartTask.VIEW_SITE,
+                            activeTask == ENABLE_POST_SHARING,
+                            activeTask == EXPLORE_PLANS
+                    )
+            )
+            scrollToQuickStartTaskIfNecessary(
+                    activeTask,
+                    siteItems.indexOfFirst { it.activeQuickStartItem })
+            State.SiteSelected(siteItems)
+        } else {
+            // Hide actionable empty view image when screen height is under 600 pixels.
+            val shouldShowImage = displayUtilsWrapper.getDisplayPixelHeight() >= 600
+            State.NoSites(shouldShowImage)
+        }
+        UiModel(currentAvatarUrl.orEmpty(), state)
+    }
+
+    private fun scrollToQuickStartTaskIfNecessary(
+        quickStartTask: QuickStartTask?,
+        position: Int
+    ) {
+        if (quickStartTask == null) {
+            _activeTaskPosition.postValue(null)
+        } else if (_activeTaskPosition.value?.first != quickStartTask && position >= 0) {
+            _activeTaskPosition.postValue(quickStartTask to position)
+        }
+    }
+
+    private fun onItemClick(action: ListItemAction) {
+        selectedSiteRepository.getSelectedSite()?.let { site ->
+            val navigationAction = when (action) {
+                ACTIVITY_LOG -> OpenActivityLog(site)
+                BACKUP -> OpenBackup(site)
+                SCAN -> OpenScan(site)
+                PLAN -> {
+                    quickStartRepository.completeTask(EXPLORE_PLANS)
+                    OpenPlan(site)
+                }
+                POSTS -> OpenPosts(site)
+                PAGES -> {
+                    quickStartRepository.completeTask(REVIEW_PAGES)
+                    OpenPages(site)
+                }
+                ADMIN -> OpenAdmin(site)
+                PEOPLE -> OpenPeople(site)
+                SHARING -> {
+                    quickStartRepository.requestNextStepOfTask(ENABLE_POST_SHARING)
+                    OpenSharing(site)
+                }
+                SITE_SETTINGS -> OpenSiteSettings(site)
+                THEMES -> OpenThemes(site)
+                PLUGINS -> OpenPlugins(site)
+                STATS -> {
+                    quickStartRepository.completeTask(CHECK_STATS)
+                    getStatsNavigationActionForSite(site)
+                }
+                MEDIA -> OpenMedia(site)
+                COMMENTS -> OpenComments(site)
+                VIEW_SITE -> {
+                    quickStartRepository.completeTask(QuickStartTask.VIEW_SITE)
+                    OpenSite(site)
+                }
+                JETPACK_SETTINGS -> OpenJetpackSettings(site)
+            }
+            _onNavigation.postValue(Event(navigationAction))
+        } ?: _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(UiStringRes(R.string.site_cannot_be_loaded))))
+    }
+
+    private fun onDynamicCardMoreClick(model: DynamicCardMenuModel) {
+        _onDynamicCardMenuShown.postValue(Event(model))
+    }
+
+    private fun onQuickStartTaskCardClick(task: QuickStartTask) {
+        quickStartRepository.setActiveTask(task)
+    }
+
+    private fun titleClick() {
+        val selectedSite = requireNotNull(selectedSiteRepository.getSelectedSite())
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            _onSnackbarMessage.value = Event(SnackbarMessageHolder(UiStringRes(R.string.error_network_connection)))
+        } else if (!SiteUtils.isAccessedViaWPComRest(selectedSite) || !selectedSite.hasCapabilityManageOptions) {
+            _onSnackbarMessage.value = Event(
+                    SnackbarMessageHolder(UiStringRes(R.string.my_site_title_changer_dialog_not_allowed_hint))
+            )
+        } else {
+            _onTechInputDialogShown.value = Event(
+                    TextInputDialogModel(
+                            callbackId = SITE_NAME_CHANGE_CALLBACK_ID,
+                            title = R.string.my_site_title_changer_dialog_title,
+                            initialText = selectedSite.name,
+                            hint = R.string.my_site_title_changer_dialog_hint,
+                            isMultiline = false,
+                            isInputEnabled = true
+                    )
+            )
+        }
+    }
+
+    private fun iconClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        analyticsTrackerWrapper.track(MY_SITE_ICON_TAPPED)
+        val hasIcon = site.iconUrl != null
+        if (site.hasCapabilityManageOptions && site.hasCapabilityUploadFiles) {
+            if (hasIcon) {
+                _onBasicDialogShown.value = Event(ChangeSiteIconDialogModel)
+            } else {
+                _onBasicDialogShown.value = Event(AddSiteIconDialogModel)
+            }
+        } else {
+            val message = when {
+                !site.isUsingWpComRestApi -> {
+                    R.string.my_site_icon_dialog_change_requires_jetpack_message
+                }
+                hasIcon -> {
+                    R.string.my_site_icon_dialog_change_requires_permission_message
+                }
+                else -> {
+                    R.string.my_site_icon_dialog_add_requires_permission_message
+                }
+            }
+            _onSnackbarMessage.value = Event(SnackbarMessageHolder(UiStringRes(message)))
+        }
+    }
+
+    private fun urlClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        _onNavigation.value = Event(OpenSite(site))
+    }
+
+    private fun switchSiteClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        _onNavigation.value = Event(OpenSitePicker(site))
+    }
+
+    private fun quickActionStatsClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        analyticsTrackerWrapper.track(QUICK_ACTION_STATS_TAPPED)
+        quickStartRepository.completeTask(CHECK_STATS)
+        _onNavigation.value = Event(getStatsNavigationActionForSite(site))
+    }
+
+    private fun quickActionPagesClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        analyticsTrackerWrapper.track(QUICK_ACTION_PAGES_TAPPED)
+        quickStartRepository.requestNextStepOfTask(EDIT_HOMEPAGE)
+        quickStartRepository.completeTask(REVIEW_PAGES)
+        _onNavigation.value = Event(OpenPages(site))
+    }
+
+    private fun quickActionPostsClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        analyticsTrackerWrapper.track(QUICK_ACTION_POSTS_TAPPED)
+        _onNavigation.value = Event(OpenPosts(site))
+    }
+
+    private fun quickActionMediaClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        analyticsTrackerWrapper.track(QUICK_ACTION_MEDIA_TAPPED)
+        _onNavigation.value = Event(OpenMedia(site))
+    }
+
+    private fun domainRegistrationClick() {
+        val site = requireNotNull(selectedSiteRepository.getSelectedSite())
+        analyticsTrackerWrapper.track(DOMAIN_CREDIT_REDEMPTION_TAPPED, site)
+        _onNavigation.value = Event(OpenDomainRegistration(site))
+    }
+
+    fun refresh() {
+        selectedSiteRepository.updateSiteSettingsIfNecessary()
+        quickStartRepository.refresh()
+        currentAvatarSource.refresh()
+    }
+
+    fun clearActiveQuickStartTask() {
+        quickStartRepository.clearActiveTask()
+    }
+
+    fun onSiteNameChosen(input: String) {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            _onSnackbarMessage.postValue(
+                    Event(SnackbarMessageHolder(UiStringRes(R.string.error_update_site_title_network)))
+            )
+        } else {
+            selectedSiteRepository.updateTitle(input)
+        }
+    }
+
+    fun onSiteNameChooserDismissed() {
+        // This callback is called even when the dialog interaction is positive,
+        // otherwise we would need to call 'completeTask' on 'onSiteNameChosen' as well.
+        quickStartRepository.completeTask(UPDATE_SITE_TITLE, true)
+    }
+
+    fun onDialogInteraction(interaction: DialogInteraction) {
+        when (interaction) {
+            is Positive -> when (interaction.tag) {
+                TAG_ADD_SITE_ICON_DIALOG, TAG_CHANGE_SITE_ICON_DIALOG -> {
+                    quickStartRepository.completeTask(UPLOAD_SITE_ICON)
+                    _onNavigation.postValue(
+                            Event(OpenMediaPicker(requireNotNull(selectedSiteRepository.getSelectedSite())))
+                    )
+                }
+            }
+            is Negative -> when (interaction.tag) {
+                TAG_ADD_SITE_ICON_DIALOG -> {
+                    quickStartRepository.completeTask(UPLOAD_SITE_ICON, true)
+                }
+                TAG_CHANGE_SITE_ICON_DIALOG -> {
+                    analyticsTrackerWrapper.track(MY_SITE_ICON_REMOVED)
+                    quickStartRepository.completeTask(UPLOAD_SITE_ICON, true)
+                    selectedSiteRepository.updateSiteIconMediaId(0, true)
+                }
+            }
+            is Dismissed -> when (interaction.tag) {
+                TAG_ADD_SITE_ICON_DIALOG, TAG_CHANGE_SITE_ICON_DIALOG -> {
+                    quickStartRepository.completeTask(UPLOAD_SITE_ICON, true)
+                }
+            }
+        }
+    }
+
+    fun handleTakenSiteIcon(iconUrl: String?, source: PhotoPickerMediaSource?) {
+        val stat = if (source == ANDROID_CAMERA) MY_SITE_ICON_SHOT_NEW else MY_SITE_ICON_GALLERY_PICKED
+        analyticsTrackerWrapper.track(stat)
+        val imageUri = Uri.parse(iconUrl)?.let { UriWrapper(it) }
+        if (imageUri != null) {
+            selectedSiteRepository.showSiteIconProgressBar(true)
+            launch(bgDispatcher) {
+                val fetchMedia = wpMediaUtilsWrapper.fetchMediaToUriWrapper(imageUri)
+                if (fetchMedia != null) {
+                    _onNavigation.postValue(Event(OpenCropActivity(fetchMedia)))
+                } else {
+                    selectedSiteRepository.showSiteIconProgressBar(false)
+                }
+            }
+        }
+    }
+
+    fun handleSelectedSiteIcon(mediaId: Long) {
+        selectedSiteRepository.updateSiteIconMediaId(mediaId.toInt(), true)
+    }
+
+    fun handleCropResult(croppedUri: Uri?, success: Boolean) {
+        if (success && croppedUri != null) {
+            analyticsTrackerWrapper.track(MY_SITE_ICON_CROPPED)
+            selectedSiteRepository.showSiteIconProgressBar(true)
+            launch(bgDispatcher) {
+                wpMediaUtilsWrapper.fetchMediaToUriWrapper(UriWrapper(croppedUri))?.let { fetchMedia ->
+                    mediaUtilsWrapper.getRealPathFromURI(fetchMedia.uri)
+                }?.let {
+                    startSiteIconUpload(it)
+                }
+            }
+        } else {
+            _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(UiStringRes(R.string.error_cropping_image))))
+        }
+    }
+
+    fun handleSuccessfulLoginResult() {
+        selectedSiteRepository.getSelectedSite()?.let { site -> _onNavigation.value = Event(OpenStats(site)) }
+    }
+
+    fun handleSuccessfulDomainRegistrationResult(email: String?) {
+        analyticsTrackerWrapper.track(DOMAIN_CREDIT_REDEMPTION_SUCCESS)
+        _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(getEmailValidationMessage(email))))
+    }
+
+    private fun startSiteIconUpload(filePath: String) {
+        if (TextUtils.isEmpty(filePath)) {
+            _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(UiStringRes(R.string.error_locating_image))))
+            return
+        }
+        val file = File(filePath)
+        if (!file.exists()) {
+            _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(UiStringRes(R.string.file_error_create))))
+            return
+        }
+        val site = selectedSiteRepository.getSelectedSite()
+        if (site != null) {
+            val media = buildMediaModel(file, site)
+            if (media == null) {
+                _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(UiStringRes(R.string.file_not_found))))
+                return
+            }
+            _onMediaUpload.postValue(Event(media))
+        } else {
+            _onSnackbarMessage.postValue(Event(SnackbarMessageHolder(UiStringRes(R.string.error_generic))))
+        }
+    }
+
+    private fun buildMediaModel(file: File, site: SiteModel): MediaModel? {
+        val uri = Uri.Builder().path(file.path).build()
+        val mimeType = contextProvider.getContext().contentResolver.getType(uri)
+        return fluxCUtilsWrapper.mediaModelFromLocalUri(uri, mimeType, site.id)
+    }
+
+    private fun getStatsNavigationActionForSite(site: SiteModel) = when {
+        // If the user is not logged in and the site is already connected to Jetpack, ask to login.
+        !accountStore.hasAccessToken() && site.isJetpackConnected -> StartWPComLoginForJetpackStats
+
+        // If it's a WordPress.com or Jetpack site, show the Stats screen.
+        site.isWPCom || site.isJetpackInstalled && site.isJetpackConnected -> OpenStats(site)
+
+        // If it's a self-hosted site, ask to connect to Jetpack.
+        else -> ConnectJetpackForStats(site)
+    }
+
+    fun onAvatarPressed() {
+        _onNavigation.value = Event(OpenMeScreen)
+    }
+
+    fun onAddSitePressed() {
+        _onNavigation.value = Event(AddNewSite(accountStore.hasAccessToken()))
+    }
+
+    override fun onCleared() {
+        siteIconUploadHandler.clear()
+        siteStoriesHandler.clear()
+        domainRegistrationHandler.clear()
+        quickStartRepository.clear()
+        scanAndBackupSource.clear()
+        super.onCleared()
+    }
+
+    fun handleStoriesPhotoPickerResult(data: Intent) {
+        selectedSiteRepository.getSelectedSite()?.let {
+            siteStoriesHandler.handleStoriesResult(it, data, STORY_FROM_MY_SITE)
+        }
+    }
+
+    fun startQuickStart(newSiteLocalID: Int) {
+        quickStartRepository.startQuickStart(newSiteLocalID)
+    }
+
+    fun onQuickStartMenuInteraction(interaction: DynamicCardMenuInteraction) {
+        launch {
+            when (interaction) {
+                is DynamicCardMenuInteraction.Remove -> {
+                    analyticsTrackerWrapper.track(QUICK_START_REMOVE_CARD_TAPPED)
+                    dynamicCardsSource.removeItem(interaction.cardType)
+                    quickStartRepository.refresh()
+                }
+                is Pin -> dynamicCardsSource.pinItem(interaction.cardType)
+                is Unpin -> dynamicCardsSource.unpinItem()
+                is Hide -> {
+                    analyticsTrackerWrapper.track(QUICK_START_HIDE_CARD_TAPPED)
+                    dynamicCardsSource.hideItem(interaction.cardType)
+                    quickStartRepository.refresh()
+                }
+            }
+        }
+    }
+
+    data class UiModel(
+        val accountAvatarUrl: String,
+        val state: State
+    )
+
+    sealed class State {
+        data class SiteSelected(val items: List<MySiteItem>) : State()
+        data class NoSites(val shouldShowImage: Boolean) : State()
+    }
+
+    data class TextInputDialogModel(
+        val callbackId: Int = SITE_NAME_CHANGE_CALLBACK_ID,
+        @StringRes val title: Int,
+        val initialText: String,
+        @StringRes val hint: Int,
+        val isMultiline: Boolean,
+        val isInputEnabled: Boolean
+    )
+
+    companion object {
+        const val TAG_ADD_SITE_ICON_DIALOG = "TAG_ADD_SITE_ICON_DIALOG"
+        const val TAG_CHANGE_SITE_ICON_DIALOG = "TAG_CHANGE_SITE_ICON_DIALOG"
+        const val SITE_NAME_CHANGE_CALLBACK_ID = 1
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickActionsViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickActionsViewHolder.kt
new file mode 100644
index 000000000000..54ab33fbf59e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickActionsViewHolder.kt
@@ -0,0 +1,25 @@
+package org.wordpress.android.ui.mysite
+
+import android.view.View
+import android.view.ViewGroup
+import org.wordpress.android.databinding.QuickActionsBlockBinding
+import org.wordpress.android.ui.mysite.MySiteItem.QuickActionsBlock
+import org.wordpress.android.util.viewBinding
+
+class QuickActionsViewHolder(
+    parent: ViewGroup
+) : MySiteItemViewHolder<QuickActionsBlockBinding>(parent.viewBinding(QuickActionsBlockBinding::inflate)) {
+    fun bind(item: QuickActionsBlock) = with(binding) {
+        quickActionStatsButton.setOnClickListener { item.onStatsClick.click() }
+        quickActionPostsButton.setOnClickListener { item.onPostsClick.click() }
+        quickActionMediaButton.setOnClickListener { item.onMediaClick.click() }
+        quickActionPagesButton.setOnClickListener { item.onPagesClick.click() }
+
+        val pagesVisibility = if (item.showPages) View.VISIBLE else View.GONE
+        quickActionPagesButton.visibility = pagesVisibility
+        quickActionPagesLabel.visibility = pagesVisibility
+
+        quickStartStatsFocusPoint.setVisibleOrGone(item.showStatsFocusPoint)
+        quickStartPagesFocusPoint.setVisibleOrGone(item.showPagesFocusPoint)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartCardViewHolder.kt
new file mode 100644
index 000000000000..01cf8924215d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartCardViewHolder.kt
@@ -0,0 +1,105 @@
+package org.wordpress.android.ui.mysite
+
+import android.animation.ObjectAnimator
+import android.content.res.ColorStateList
+import android.graphics.drawable.LayerDrawable
+import android.os.Build
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.ViewGroup
+import androidx.appcompat.widget.TooltipCompat
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.BlendModeColorFilterCompat.createBlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat.SRC_IN
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager.HORIZONTAL
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener
+import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
+import org.wordpress.android.R
+import org.wordpress.android.databinding.QuickStartCardBinding
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.ColorUtils
+import org.wordpress.android.util.viewBinding
+
+class QuickStartCardViewHolder(
+    parent: ViewGroup,
+    private val viewPool: RecycledViewPool,
+    private val nestedScrollStates: Bundle,
+    private val uiHelpers: UiHelpers
+) : MySiteItemViewHolder<QuickStartCardBinding>(parent.viewBinding(QuickStartCardBinding::inflate)) {
+    private var currentItem: QuickStartCard? = null
+    private val lowEmphasisAlpha = ResourcesCompat.getFloat(itemView.resources, R.dimen.emphasis_low)
+
+    init {
+        with(binding) {
+            quickStartCardMoreButton.let { TooltipCompat.setTooltipText(it, it.contentDescription) }
+            quickStartCardRecyclerView.apply {
+                adapter = QuickStartTaskCardAdapter(uiHelpers)
+                layoutManager = LinearLayoutManager(context, HORIZONTAL, false)
+                setRecycledViewPool(viewPool)
+                addItemDecoration(
+                        QuickStartListItemDecoration(
+                                resources.getDimensionPixelSize(R.dimen.margin_extra_small),
+                                resources.getDimensionPixelSize(R.dimen.margin_large)
+                        )
+                )
+                addOnScrollListener(object : OnScrollListener() {
+                    override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                        if (newState == RecyclerView.SCROLL_STATE_IDLE) {
+                            currentItem?.let { saveScrollState(recyclerView, it.id.toString()) }
+                        }
+                    }
+                })
+            }
+        }
+    }
+
+    fun bind(item: QuickStartCard) = with(binding) {
+        currentItem = item
+
+        ObjectAnimator.ofInt(quickStartCardProgress, "progress", item.progress).setDuration(600).start()
+
+        val progressIndicatorColor = ContextCompat.getColor(root.context, item.accentColor)
+        val progressTrackColor = ColorUtils.applyEmphasisToColor(progressIndicatorColor, lowEmphasisAlpha)
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP) {
+            quickStartCardProgress.progressBackgroundTintList = ColorStateList.valueOf(progressTrackColor)
+            quickStartCardProgress.progressTintList = ColorStateList.valueOf(progressIndicatorColor)
+        } else {
+            // Workaround for Lollipop
+            val progressDrawable = quickStartCardProgress.progressDrawable.mutate() as LayerDrawable
+            val backgroundLayer = progressDrawable.findDrawableByLayerId(android.R.id.background)
+            val progressLayer = progressDrawable.findDrawableByLayerId(android.R.id.progress)
+            backgroundLayer.colorFilter = createBlendModeColorFilterCompat(progressTrackColor, SRC_IN)
+            progressLayer.colorFilter = createBlendModeColorFilterCompat(progressIndicatorColor, SRC_IN)
+            quickStartCardProgress.progressDrawable = progressDrawable
+        }
+
+        quickStartCardTitle.text = uiHelpers.getTextOfUiString(root.context, item.title)
+        (quickStartCardRecyclerView.adapter as? QuickStartTaskCardAdapter)?.loadData(item.taskCards)
+        restoreScrollState(quickStartCardRecyclerView, item.id.toString())
+        quickStartCardMoreButton.setOnClickListener { item.onMoreClick.click() }
+    }
+
+    fun onRecycled() {
+        currentItem?.let { saveScrollState(binding.quickStartCardRecyclerView, it.id.toString()) }
+        currentItem = null
+    }
+
+    private fun saveScrollState(recyclerView: RecyclerView, key: String) {
+        recyclerView.layoutManager?.onSaveInstanceState()?.let { nestedScrollStates.putParcelable(key, it) }
+    }
+
+    private fun restoreScrollState(recyclerView: RecyclerView, key: String) {
+        recyclerView.layoutManager?.apply {
+            val scrollState = nestedScrollStates.getParcelable<Parcelable>(key)
+            if (scrollState != null) {
+                onRestoreInstanceState(scrollState)
+            } else {
+                scrollToPosition(0)
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartItemBuilder.kt
new file mode 100644
index 000000000000..dac409ffc1aa
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartItemBuilder.kt
@@ -0,0 +1,126 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHECK_STATS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.ENABLE_POST_SHARING
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EXPLORE_PLANS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.FOLLOW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.REVIEW_PAGES
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPLOAD_SITE_ICON
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.VIEW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.UNKNOWN
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard.QuickStartTaskCard
+import org.wordpress.android.ui.mysite.QuickStartRepository.QuickStartCategory
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuFragment.DynamicCardMenuModel
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import javax.inject.Inject
+import kotlin.math.roundToInt
+
+class QuickStartItemBuilder
+@Inject constructor() {
+    fun build(
+        quickStartCategory: QuickStartCategory,
+        pinnedDynamicCardType: DynamicCardType?,
+        onQuickStartCardMoreClick: (DynamicCardMenuModel) -> Unit,
+        onQuickStartTaskClick: (QuickStartTask) -> Unit
+    ): QuickStartCard {
+        val accentColor = getAccentColor(quickStartCategory.taskType)
+        val tasks = mutableListOf<QuickStartTaskCard>()
+        tasks.addAll(quickStartCategory.uncompletedTasks.map { it.toUiItem(false, accentColor, onQuickStartTaskClick) })
+        val completedTasks = quickStartCategory.completedTasks.map {
+            it.toUiItem(
+                    true,
+                    accentColor,
+                    onQuickStartTaskClick
+            )
+        }
+        tasks.addAll(completedTasks)
+        val dynamicCardType = quickStartCategory.taskType.toDynamicCardType()
+        val isPinned = pinnedDynamicCardType == dynamicCardType
+        return QuickStartCard(
+                dynamicCardType,
+                UiStringRes(getTitle(quickStartCategory.taskType)),
+                tasks,
+                accentColor,
+                getProgress(tasks, completedTasks),
+                ListItemInteraction.create(DynamicCardMenuModel(dynamicCardType, isPinned), onQuickStartCardMoreClick)
+        )
+    }
+
+    private fun QuickStartTaskType.toDynamicCardType(): DynamicCardType {
+        return when (this) {
+            CUSTOMIZE -> DynamicCardType.CUSTOMIZE_QUICK_START
+            GROW -> DynamicCardType.GROW_QUICK_START
+            UNKNOWN -> throw IllegalArgumentException("Unexpected quick start type")
+        }
+    }
+
+    private fun getProgress(tasks: List<QuickStartTaskCard>, completedTasks: List<QuickStartTaskCard>): Int {
+        return if (tasks.isNotEmpty()) ((completedTasks.size / tasks.size.toFloat()) * 100).roundToInt() else 0
+    }
+
+    @ColorRes
+    private fun getAccentColor(taskType: QuickStartTaskType): Int {
+        return when (taskType) {
+            CUSTOMIZE -> R.color.green_20
+            GROW -> R.color.orange_40
+            UNKNOWN -> throw IllegalArgumentException("Unexpected quick start type")
+        }
+    }
+
+    private fun getTitle(taskType: QuickStartTaskType): Int {
+        return when (taskType) {
+            CUSTOMIZE -> R.string.quick_start_sites_type_customize
+            GROW -> R.string.quick_start_sites_type_grow
+            UNKNOWN -> throw IllegalArgumentException("Unexpected quick start type")
+        }
+    }
+
+    private fun QuickStartTaskDetails.toUiItem(
+        done: Boolean,
+        accentColor: Int,
+        onQuickStartTaskClick: (QuickStartTask) -> Unit
+    ): QuickStartTaskCard {
+        return QuickStartTaskCard(
+                this.task,
+                UiStringRes(this.titleResId),
+                UiStringRes(this.subtitleResId),
+                getIllustration(this.task),
+                accentColor,
+                done,
+                ListItemInteraction.create(this.task, onQuickStartTaskClick)
+        )
+    }
+
+    @DrawableRes
+    private fun getIllustration(task: QuickStartTask): Int {
+        return when (task) {
+            UPDATE_SITE_TITLE -> R.drawable.img_illustration_quick_start_task_set_site_title
+            UPLOAD_SITE_ICON -> R.drawable.img_illustration_quick_start_task_edit_site_icon
+            VIEW_SITE -> R.drawable.img_illustration_quick_start_task_visit_your_site
+            ENABLE_POST_SHARING -> R.drawable.img_illustration_quick_start_task_enable_post_sharing
+            PUBLISH_POST -> R.drawable.img_illustration_quick_start_task_publish_post
+            FOLLOW_SITE -> R.drawable.img_illustration_quick_start_task_follow_other_sites
+            CHECK_STATS -> R.drawable.img_illustration_quick_start_task_check_site_stats
+            EDIT_HOMEPAGE -> R.drawable.img_illustration_quick_start_task_edit_your_homepage
+            REVIEW_PAGES -> R.drawable.img_illustration_quick_start_task_review_site_pages
+            EXPLORE_PLANS -> R.drawable.img_illustration_quick_start_task_explore_plans
+            CREATE_SITE -> R.drawable.img_illustration_quick_start_task_create_site
+            QuickStartTask.UNKNOWN -> R.drawable.img_illustration_quick_start_task_placeholder
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartListItemDecoration.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartListItemDecoration.kt
new file mode 100644
index 000000000000..c62c453d0c2b
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartListItemDecoration.kt
@@ -0,0 +1,24 @@
+package org.wordpress.android.ui.mysite
+
+import android.graphics.Rect
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+data class QuickStartListItemDecoration(
+    val itemHorizontalSpacing: Int,
+    val edgeHorizontalSpacing: Int
+) : RecyclerView.ItemDecoration() {
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        super.getItemOffsets(outRect, view, parent, state)
+        val itemPosition: Int = parent.getChildAdapterPosition(view)
+        val itemCount = state.itemCount
+        val isFirst = itemPosition == 0
+        val isLast = itemCount > 0 && itemPosition == itemCount - 1
+        outRect.set(
+                if (isFirst) edgeHorizontalSpacing else itemHorizontalSpacing,
+                0,
+                if (isLast) edgeHorizontalSpacing else itemHorizontalSpacing,
+                0
+        )
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt
new file mode 100644
index 000000000000..3ffa62f2af8d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt
@@ -0,0 +1,217 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.fluxc.model.DynamicCardType.CUSTOMIZE_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
+import org.wordpress.android.fluxc.store.DynamicCardStore
+import org.wordpress.android.fluxc.store.QuickStartStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.UNKNOWN
+import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartPayload
+import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartVariant.NEXT_STEPS
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.QuickStartUpdate
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.quickstart.QuickStartEvent
+import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.HtmlCompatWrapper
+import org.wordpress.android.util.QuickStartUtilsWrapper
+import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
+import org.wordpress.android.util.mapAsync
+import org.wordpress.android.util.merge
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+import kotlin.coroutines.CoroutineContext
+
+@Singleton
+class QuickStartRepository
+@Inject constructor(
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val quickStartStore: QuickStartStore,
+    private val quickStartUtils: QuickStartUtilsWrapper,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val resourceProvider: ResourceProvider,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val dispatcher: Dispatcher,
+    private val eventBus: EventBusWrapper,
+    private val dynamicCardStore: DynamicCardStore,
+    private val htmlCompat: HtmlCompatWrapper,
+    private val mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig
+) : CoroutineScope, MySiteSource<QuickStartUpdate> {
+    private val job: Job = Job()
+    override val coroutineContext: CoroutineContext
+        get() = bgDispatcher + job
+
+    private val detailsMap: Map<QuickStartTask, QuickStartTaskDetails> = QuickStartTaskDetails.values()
+            .associateBy { it.task }
+    private val refresh = MutableLiveData<Boolean>()
+    private val _activeTask = MutableLiveData<QuickStartTask?>()
+    private val _onSnackbar = MutableLiveData<Event<SnackbarMessageHolder>>()
+    private val _onQuickStartMySitePrompts = MutableLiveData<Event<QuickStartMySitePrompts>>()
+    val onSnackbar = _onSnackbar as LiveData<Event<SnackbarMessageHolder>>
+    val onQuickStartMySitePrompts = _onQuickStartMySitePrompts as LiveData<Event<QuickStartMySitePrompts>>
+    val activeTask = _activeTask as LiveData<QuickStartTask?>
+
+    private var pendingTask: QuickStartTask? = null
+
+    private fun buildQuickStartCategory(siteId: Int, quickStartTaskType: QuickStartTaskType) = QuickStartCategory(
+            quickStartTaskType,
+            uncompletedTasks = quickStartStore.getUncompletedTasksByType(siteId.toLong(), quickStartTaskType)
+                    .mapNotNull { detailsMap[it] },
+            completedTasks = quickStartStore.getCompletedTasksByType(siteId.toLong(), quickStartTaskType)
+                    .mapNotNull { detailsMap[it] })
+
+    override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<QuickStartUpdate> {
+        _activeTask.value = null
+        pendingTask = null
+        if (selectedSiteRepository.getSelectedSite()?.showOnFront == ShowOnFront.POSTS.value &&
+                !quickStartStore.hasDoneTask(siteId.toLong(), EDIT_HOMEPAGE)) {
+            setTaskDoneAndTrack(EDIT_HOMEPAGE, siteId)
+            refresh()
+        }
+        val quickStartTaskTypes = refresh.mapAsync(coroutineScope) {
+            dynamicCardStore.getCards(siteId).dynamicCardTypes.map { it.toQuickStartTaskType() }.onEach { taskType ->
+                if (quickStartUtils.isEveryQuickStartTaskDoneForType(siteId, taskType)) {
+                    onCategoryCompleted(siteId, taskType)
+                }
+            }
+        }
+        return merge(quickStartTaskTypes, activeTask) { types, activeTask ->
+            val categories = if (quickStartUtils.isQuickStartInProgress(siteId)) {
+                types?.map { buildQuickStartCategory(siteId, it) } ?: listOf()
+            } else {
+                listOf()
+            }
+            QuickStartUpdate(activeTask, categories)
+        }
+    }
+
+    fun startQuickStart(newSiteLocalID: Int) {
+        if (newSiteLocalID != -1) {
+            quickStartUtils.startQuickStart(newSiteLocalID)
+            refresh()
+        }
+    }
+
+    fun refresh() {
+        refresh.postValue(true)
+    }
+
+    fun setActiveTask(task: QuickStartTask) {
+        _activeTask.postValue(task)
+        pendingTask = null
+        if (task == UPDATE_SITE_TITLE) {
+            val shortQuickStartMessage = resourceProvider.getString(
+                    R.string.quick_start_dialog_update_site_title_message_short,
+                    SiteUtils.getSiteNameOrHomeURL(selectedSiteRepository.getSelectedSite())
+            )
+            _onSnackbar.postValue(Event(SnackbarMessageHolder(UiStringText(shortQuickStartMessage.asHtml()))))
+        } else {
+            QuickStartMySitePrompts.getPromptDetailsForTask(task)?.let { activeTutorialPrompt ->
+                _onQuickStartMySitePrompts.postValue(Event(activeTutorialPrompt))
+            }
+        }
+    }
+
+    fun clearActiveTask() {
+        _activeTask.value = null
+    }
+
+    @JvmOverloads fun completeTask(task: QuickStartTask, refreshImmediately: Boolean = false) {
+        selectedSiteRepository.getSelectedSite()?.let { site ->
+            if (task != activeTask.value && task != pendingTask) return
+            _activeTask.value = null
+            pendingTask = null
+            if (quickStartStore.hasDoneTask(site.id.toLong(), task)) return
+            // If we want notice and reminders, we should call QuickStartUtils.completeTaskAndRemindNextOne here
+            setTaskDoneAndTrack(task, site.id)
+            // We need to refresh immediately. This is useful for tasks that are completed on the My Site screen.
+            if (refreshImmediately) {
+                refresh()
+            }
+            if (quickStartUtils.isEveryQuickStartTaskDone(site.id)) {
+                quickStartStore.setQuickStartCompleted(site.id.toLong(), true)
+                analyticsTrackerWrapper.track(Stat.QUICK_START_ALL_TASKS_COMPLETED, mySiteImprovementsFeatureConfig)
+                val payload = CompleteQuickStartPayload(site, NEXT_STEPS.toString())
+                dispatcher.dispatch(SiteActionBuilder.newCompleteQuickStartAction(payload))
+            }
+        }
+    }
+
+    private fun setTaskDoneAndTrack(
+        task: QuickStartTask,
+        siteId: Int
+    ) {
+        quickStartStore.setDoneTask(siteId.toLong(), task, true)
+        analyticsTrackerWrapper.track(quickStartUtils.getTaskCompletedTracker(task), mySiteImprovementsFeatureConfig)
+    }
+
+    fun requestNextStepOfTask(task: QuickStartTask) {
+        if (task != activeTask.value) return
+        _activeTask.value = null
+        pendingTask = task
+        eventBus.postSticky(QuickStartEvent(task))
+    }
+
+    fun clear() {
+        job.cancel()
+    }
+
+    private suspend fun onCategoryCompleted(siteId: Int, categoryType: QuickStartTaskType) {
+        val completionMessage = getCategoryCompletionMessage(categoryType)
+        _onSnackbar.postValue(Event(SnackbarMessageHolder(UiStringText(completionMessage.asHtml()))))
+        dynamicCardStore.removeCard(siteId, categoryType.toDynamicCardType())
+    }
+
+    private fun getCategoryCompletionMessage(taskType: QuickStartTaskType) = when (taskType) {
+        CUSTOMIZE -> R.string.quick_start_completed_type_customize_message
+        GROW -> R.string.quick_start_completed_type_grow_message
+        UNKNOWN -> throw IllegalArgumentException("Unexpected quick start type")
+    }.let { resourceProvider.getString(it) }
+
+    private fun String.asHtml() = htmlCompat.fromHtml(this)
+
+    private fun DynamicCardType.toQuickStartTaskType(): QuickStartTaskType {
+        return when (this) {
+            CUSTOMIZE_QUICK_START -> CUSTOMIZE
+            GROW_QUICK_START -> GROW
+        }
+    }
+
+    private fun QuickStartTaskType.toDynamicCardType(): DynamicCardType {
+        return when (this) {
+            CUSTOMIZE -> CUSTOMIZE_QUICK_START
+            GROW -> GROW_QUICK_START
+            UNKNOWN -> throw IllegalArgumentException("Unexpected quick start type")
+        }
+    }
+
+    data class QuickStartCategory(
+        val taskType: QuickStartTaskType,
+        val uncompletedTasks: List<QuickStartTaskDetails>,
+        val completedTasks: List<QuickStartTaskDetails>
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartTaskCardAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartTaskCardAdapter.kt
new file mode 100644
index 000000000000..cd2c67997c6f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartTaskCardAdapter.kt
@@ -0,0 +1,61 @@
+package org.wordpress.android.ui.mysite
+
+import android.view.ViewGroup
+import androidx.core.content.ContextCompat
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import org.wordpress.android.databinding.QuickStartTaskCardBinding
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard.QuickStartTaskCard
+import org.wordpress.android.ui.mysite.QuickStartTaskCardAdapter.QuickStartTaskCardViewHolder
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.viewBinding
+
+class QuickStartTaskCardAdapter(private val uiHelpers: UiHelpers) : Adapter<QuickStartTaskCardViewHolder>() {
+    private var items = listOf<QuickStartTaskCard>()
+
+    fun loadData(newItems: List<QuickStartTaskCard>) {
+        val diffResult = DiffUtil.calculateDiff(QuickStartTaskCardAdapterDiffCallback(items, newItems))
+        items = newItems
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = QuickStartTaskCardViewHolder(
+            parent.viewBinding(QuickStartTaskCardBinding::inflate)
+    )
+
+    override fun onBindViewHolder(holder: QuickStartTaskCardViewHolder, position: Int) {
+        holder.bind(items[position])
+    }
+
+    override fun getItemCount() = items.size
+
+    inner class QuickStartTaskCardViewHolder(val binding: QuickStartTaskCardBinding) : ViewHolder(binding.root) {
+        fun bind(taskCard: QuickStartTaskCard) = with(binding) {
+            taskCardTitle.text = uiHelpers.getTextOfUiString(root.context, taskCard.title)
+            taskCardDescription.text = uiHelpers.getTextOfUiString(root.context, taskCard.description)
+            taskCardIllustration.setImageResource(taskCard.illustration)
+
+            taskCardView.apply {
+                checkedIconTint = ContextCompat.getColorStateList(root.context, taskCard.accentColor)
+                isChecked = taskCard.done
+                setOnClickListener(if (taskCard.done) null else ({ taskCard.onClick.click() }))
+            }
+        }
+    }
+
+    inner class QuickStartTaskCardAdapterDiffCallback(
+        private val oldItems: List<QuickStartTaskCard>,
+        private val newItems: List<QuickStartTaskCard>
+    ) : DiffUtil.Callback() {
+        override fun getOldListSize() = oldItems.size
+
+        override fun getNewListSize() = newItems.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+                oldItems[oldItemPosition].quickStartTask == newItems[newItemPosition].quickStartTask
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int) =
+                oldItems[oldItemPosition] == newItems[newItemPosition]
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/ScanAndBackupSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ScanAndBackupSource.kt
new file mode 100644
index 000000000000..20812f53f44a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ScanAndBackupSource.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.launch
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.JetpackCapabilities
+import org.wordpress.android.util.SiteUtils
+import javax.inject.Inject
+import javax.inject.Named
+
+class ScanAndBackupSource @Inject constructor(
+    @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val jetpackCapabilitiesUseCase: JetpackCapabilitiesUseCase
+) : MySiteSource<JetpackCapabilities> {
+    override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<JetpackCapabilities> {
+        val site = selectedSiteRepository.getSelectedSite()
+        if (site != null && site.id == siteId) {
+            val result = MutableLiveData<JetpackCapabilities>()
+            coroutineScope.launch(bgDispatcher) {
+                jetpackCapabilitiesUseCase.getJetpackPurchasedProducts(site.siteId).collect {
+                    result.postValue(
+                            JetpackCapabilities(
+                                    scanAvailable = SiteUtils.isScanEnabled(it.scan, site),
+                                    backupAvailable = it.backup
+                            )
+                    )
+                }
+            }
+            return result
+        } else {
+            return MutableLiveData(JetpackCapabilities(scanAvailable = false, backupAvailable = false))
+        }
+    }
+
+    fun clear() {
+        jetpackCapabilitiesUseCase.clear()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SelectedSiteRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SelectedSiteRepository.kt
new file mode 100644
index 000000000000..90906e661cb7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SelectedSiteRepository.kt
@@ -0,0 +1,94 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.distinctUntilChanged
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.prefs.SiteSettingsInterfaceWrapper
+import org.wordpress.android.util.map
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class SelectedSiteRepository
+@Inject constructor(
+    private val dispatcher: Dispatcher,
+    private val siteSettingsInterfaceFactory: SiteSettingsInterfaceWrapper.Factory
+) {
+    private var siteSettings: SiteSettingsInterfaceWrapper? = null
+    private val _selectedSiteChange = MutableLiveData<SiteModel?>(null)
+    private val _showSiteIconProgressBar = MutableLiveData<Boolean>()
+    val selectedSiteChange = _selectedSiteChange as LiveData<SiteModel?>
+    val siteSelected = _selectedSiteChange.map { it?.id }.distinctUntilChanged()
+    val showSiteIconProgressBar = _showSiteIconProgressBar as LiveData<Boolean>
+    fun updateSite(selectedSite: SiteModel?) {
+        if (getSelectedSite()?.iconUrl != selectedSite?.iconUrl) {
+            showSiteIconProgressBar(false)
+        }
+        _selectedSiteChange.value = selectedSite
+    }
+
+    fun updateSiteIconMediaId(mediaId: Int, showProgressBar: Boolean) {
+        siteSettings?.let {
+            showSiteIconProgressBar(showProgressBar)
+            it.setSiteIconMediaId(mediaId)
+            it.saveSettings()
+        }
+    }
+
+    fun showSiteIconProgressBar(progressBarVisible: Boolean) {
+        if (_showSiteIconProgressBar.value != progressBarVisible) {
+            _showSiteIconProgressBar.postValue(progressBarVisible)
+        }
+    }
+
+    fun updateTitle(title: String) {
+        siteSettings?.let {
+            getSelectedSite()?.name = title
+            dispatcher.dispatch(SiteActionBuilder.newUpdateSiteAction(getSelectedSite()))
+            it.title = title
+            it.saveSettings()
+        }
+    }
+
+    fun clear() {
+        siteSettings?.clear()
+    }
+
+    fun hasSelectedSite() = _selectedSiteChange.value != null
+
+    fun getSelectedSite() = _selectedSiteChange.value
+
+    fun updateSiteSettingsIfNecessary() {
+        // If the selected site is null, we can't update its site settings
+        val selectedSite = getSelectedSite() ?: return
+        if (siteSettings != null && siteSettings!!.localSiteId != selectedSite.id) {
+            // The site has changed, we can't use the previous site settings, force a refresh
+            siteSettings?.clear()
+            siteSettings = null
+        }
+        if (siteSettings == null) {
+            fun onError(error: Exception?) {
+                showSiteIconProgressBar(false)
+            }
+            siteSettings = siteSettingsInterfaceFactory.build(
+                    selectedSite,
+                    onSaveError = ::onError,
+                    onFetchError = ::onError,
+                    onSettingsSaved = {
+                        getSelectedSite()?.let { site ->
+                            dispatcher.dispatch(SiteActionBuilder.newFetchSiteAction(site))
+                        }
+                    }
+            )
+
+            siteSettings?.init(true)
+        }
+    }
+
+    fun isSiteIconUploadInProgress(): Boolean {
+        return _showSiteIconProgressBar.value == true
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteCategoryItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteCategoryItemBuilder.kt
new file mode 100644
index 000000000000..5f8db49f3897
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteCategoryItemBuilder.kt
@@ -0,0 +1,35 @@
+package org.wordpress.android.ui.mysite
+
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.themes.ThemeBrowserUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.SiteUtilsWrapper
+import javax.inject.Inject
+
+class SiteCategoryItemBuilder
+@Inject constructor(private val themeBrowserUtils: ThemeBrowserUtils, private val siteUtilsWrapper: SiteUtilsWrapper) {
+    fun buildJetpackCategoryIfAvailable(site: SiteModel): MySiteItem? {
+        val jetpackSettingsVisible = site.isJetpackConnected && // jetpack is installed and connected
+                !site.isWPComAtomic // isn't atomic site
+        return if (jetpackSettingsVisible) {
+            CategoryHeader(UiStringRes(R.string.my_site_header_jetpack))
+        } else null
+    }
+
+    fun buildLookAndFeelHeaderIfAvailable(site: SiteModel): MySiteItem? {
+        return if (themeBrowserUtils.isAccessible(site)) {
+            CategoryHeader(UiStringRes(R.string.my_site_header_look_and_feel))
+        } else null
+    }
+
+    fun buildConfigurationHeaderIfAvailable(site: SiteModel): MySiteItem? {
+        // if either people or settings is visible, configuration header should be visible
+        return if (site.hasCapabilityManageOptions ||
+                !siteUtilsWrapper.isAccessedViaWPComRest(site) ||
+                site.hasCapabilityListUsers) {
+            CategoryHeader(UiStringRes(R.string.my_site_header_configuration))
+        } else null
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteDialogModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteDialogModel.kt
new file mode 100644
index 000000000000..1eb2dd58b6a0
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteDialogModel.kt
@@ -0,0 +1,31 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.annotation.StringRes
+import org.wordpress.android.R
+
+sealed class SiteDialogModel(
+    val tag: String,
+    @StringRes val title: Int,
+    @StringRes open val message: Int,
+    @StringRes val positiveButtonLabel: Int,
+    @StringRes val negativeButtonLabel: Int? = null,
+    @StringRes val cancelButtonLabel: Int? = null
+) {
+    object AddSiteIconDialogModel : SiteDialogModel(
+            MySiteViewModel.TAG_ADD_SITE_ICON_DIALOG,
+            R.string.my_site_icon_dialog_title,
+            R.string.my_site_icon_dialog_add_message,
+            R.string.yes,
+            R.string.no,
+            null
+    )
+
+    object ChangeSiteIconDialogModel : SiteDialogModel(
+            MySiteViewModel.TAG_CHANGE_SITE_ICON_DIALOG,
+            R.string.my_site_icon_dialog_title,
+            R.string.my_site_icon_dialog_change_message,
+            R.string.my_site_icon_dialog_change_button,
+            R.string.my_site_icon_dialog_remove_button,
+            R.string.my_site_icon_dialog_cancel_button
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteIconUploadHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteIconUploadHandler.kt
new file mode 100644
index 000000000000..d18b6e245a85
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteIconUploadHandler.kt
@@ -0,0 +1,88 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_UPLOADED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_UPLOAD_UNSUCCESSFUL
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.mysite.SiteIconUploadHandler.ItemUploadedModel.MediaUploaded
+import org.wordpress.android.ui.mysite.SiteIconUploadHandler.ItemUploadedModel.PostUploaded
+import org.wordpress.android.ui.uploads.UploadService.UploadErrorEvent
+import org.wordpress.android.ui.uploads.UploadService.UploadMediaSuccessEvent
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.MAIN
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+
+class SiteIconUploadHandler
+@Inject constructor(
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val eventBusWrapper: EventBusWrapper
+) {
+    private val _onUploadedItem = MutableLiveData<Event<ItemUploadedModel>>()
+    val onUploadedItem = _onUploadedItem as LiveData<Event<ItemUploadedModel>>
+
+    init {
+        eventBusWrapper.register(this)
+    }
+
+    fun clear() {
+        eventBusWrapper.unregister(this)
+    }
+
+    sealed class ItemUploadedModel(open val site: SiteModel?, open val errorMessage: String? = null) {
+        data class PostUploaded(
+            val post: PostModel,
+            override val site: SiteModel?,
+            override val errorMessage: String? = null
+        ) : ItemUploadedModel(site, errorMessage)
+
+        data class MediaUploaded(
+            val media: List<MediaModel>,
+            override val site: SiteModel?,
+            override val errorMessage: String? = null
+        ) : ItemUploadedModel(site, errorMessage)
+    }
+
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    fun onEventMainThread(event: UploadErrorEvent) {
+        analyticsTrackerWrapper.track(MY_SITE_ICON_UPLOAD_UNSUCCESSFUL)
+        eventBusWrapper.removeStickyEvent(event)
+        selectedSiteRepository.showSiteIconProgressBar(false)
+        val site = selectedSiteRepository.getSelectedSite()
+        if (site != null && event.post != null && event.post.localSiteId == site.id) {
+            _onUploadedItem.postValue(Event(PostUploaded(event.post, site, event.errorMessage)))
+        } else if (event.mediaModelList != null && event.mediaModelList.isNotEmpty()) {
+            _onUploadedItem.postValue(Event(MediaUploaded(event.mediaModelList, site, event.errorMessage)))
+        }
+    }
+
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    fun onEventMainThread(event: UploadMediaSuccessEvent) {
+        analyticsTrackerWrapper.track(MY_SITE_ICON_UPLOADED)
+        eventBusWrapper.removeStickyEvent(event)
+        val site = selectedSiteRepository.getSelectedSite()
+        if (site != null) {
+            if (selectedSiteRepository.isSiteIconUploadInProgress()) {
+                if (event.mediaModelList.size > 0) {
+                    val media = event.mediaModelList[0]
+                    selectedSiteRepository.updateSiteIconMediaId(media.mediaId.toInt(), true)
+                } else {
+                    AppLog.w(
+                            MAIN,
+                            "Site icon upload completed, but mediaList is empty."
+                    )
+                }
+            } else if (event.mediaModelList != null && event.mediaModelList.isNotEmpty()) {
+                _onUploadedItem.postValue(Event(MediaUploaded(event.mediaModelList, site, event.successMessage)))
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteInfoBlockBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteInfoBlockBuilder.kt
new file mode 100644
index 000000000000..d036a9a6d755
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteInfoBlockBuilder.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.ui.mysite
+
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock.IconState
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class SiteInfoBlockBuilder
+@Inject constructor(private val resourceProvider: ResourceProvider) {
+    fun buildSiteInfoBlock(
+        site: SiteModel,
+        showSiteIconProgressBar: Boolean,
+        titleClick: () -> Unit,
+        iconClick: () -> Unit,
+        urlClick: () -> Unit,
+        switchSiteClick: () -> Unit,
+        showUpdateSiteTitleFocusPoint: Boolean,
+        showUploadSiteIconFocusPoint: Boolean
+    ): SiteInfoBlock {
+        val homeUrl = SiteUtils.getHomeURLOrHostName(site)
+        val blogTitle = SiteUtils.getSiteNameOrHomeURL(site)
+        val siteIcon = if (!showSiteIconProgressBar && !site.iconUrl.isNullOrEmpty()) {
+            IconState.Visible(SiteUtils.getSiteIconUrl(
+                    site,
+                    resourceProvider.getDimensionPixelSize(R.dimen.blavatar_sz_small)
+            ))
+        } else if (showSiteIconProgressBar) {
+            IconState.Progress
+        } else {
+            IconState.Visible()
+        }
+        return SiteInfoBlock(
+                blogTitle,
+                homeUrl,
+                siteIcon,
+                showUpdateSiteTitleFocusPoint,
+                showUploadSiteIconFocusPoint,
+                buildTitleClick(site, titleClick),
+                ListItemInteraction.create(iconClick),
+                ListItemInteraction.create(urlClick),
+                ListItemInteraction.create(switchSiteClick)
+        )
+    }
+
+    private fun buildTitleClick(site: SiteModel, titleClick: () -> Unit): ListItemInteraction? {
+        return if (SiteUtils.isAccessedViaWPComRest(site)) {
+            ListItemInteraction.create(titleClick)
+        } else {
+            null
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteItemsBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteItemsBuilder.kt
new file mode 100644
index 000000000000..8a6bf172a4fd
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteItemsBuilder.kt
@@ -0,0 +1,72 @@
+package org.wordpress.android.ui.mysite
+
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.mysite.MySiteItem.ListItem
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import javax.inject.Inject
+
+class SiteItemsBuilder
+@Inject constructor(
+    private val siteCategoryItemBuilder: SiteCategoryItemBuilder,
+    private val siteListItemBuilder: SiteListItemBuilder
+) {
+    fun buildSiteItems(
+        site: SiteModel,
+        onClick: (ListItemAction) -> Unit,
+        isBackupAvailable: Boolean = false,
+        isScanAvailable: Boolean = false,
+        showViewSiteFocusPoint: Boolean = false,
+        showEnablePostSharingFocusPoint: Boolean = false,
+        showExplorePlansFocusPoint: Boolean = false
+    ): List<MySiteItem> {
+        return listOfNotNull(
+                siteListItemBuilder.buildPlanItemIfAvailable(site, showExplorePlansFocusPoint, onClick),
+                siteCategoryItemBuilder.buildJetpackCategoryIfAvailable(site),
+                ListItem(
+                        R.drawable.ic_stats_alt_white_24dp,
+                        UiStringRes(R.string.stats),
+                        onClick = ListItemInteraction.create(ListItemAction.STATS, onClick)
+                ),
+                siteListItemBuilder.buildActivityLogItemIfAvailable(site, onClick),
+                siteListItemBuilder.buildBackupItemIfAvailable(onClick, isBackupAvailable),
+                siteListItemBuilder.buildScanItemIfAvailable(onClick, isScanAvailable),
+                siteListItemBuilder.buildJetpackItemIfAvailable(site, onClick),
+                CategoryHeader(UiStringRes(R.string.my_site_header_publish)),
+                ListItem(
+                        R.drawable.ic_posts_white_24dp,
+                        UiStringRes(R.string.my_site_btn_blog_posts),
+                        onClick = ListItemInteraction.create(ListItemAction.POSTS, onClick)
+                ),
+                ListItem(
+                        R.drawable.ic_media_white_24dp,
+                        UiStringRes(R.string.media),
+                        onClick = ListItemInteraction.create(ListItemAction.MEDIA, onClick)
+                ),
+                siteListItemBuilder.buildPagesItemIfAvailable(site, onClick),
+                ListItem(
+                        R.drawable.ic_comment_white_24dp,
+                        UiStringRes(R.string.my_site_btn_comments),
+                        onClick = ListItemInteraction.create(ListItemAction.COMMENTS, onClick)
+                ),
+                siteCategoryItemBuilder.buildLookAndFeelHeaderIfAvailable(site),
+                siteListItemBuilder.buildThemesItemIfAvailable(site, onClick),
+                siteCategoryItemBuilder.buildConfigurationHeaderIfAvailable(site),
+                siteListItemBuilder.buildPeopleItemIfAvailable(site, onClick),
+                siteListItemBuilder.buildPluginItemIfAvailable(site, onClick),
+                siteListItemBuilder.buildShareItemIfAvailable(site, onClick, showEnablePostSharingFocusPoint),
+                siteListItemBuilder.buildSiteSettingsItemIfAvailable(site, onClick),
+                CategoryHeader(UiStringRes(R.string.my_site_header_external)),
+                ListItem(
+                        R.drawable.ic_globe_white_24dp,
+                        UiStringRes(R.string.my_site_btn_view_site),
+                        secondaryIcon = R.drawable.ic_external_white_24dp,
+                        onClick = ListItemInteraction.create(ListItemAction.VIEW_SITE, onClick),
+                        showFocusPoint = showViewSiteFocusPoint
+                ),
+                siteListItemBuilder.buildAdminItemIfAvailable(site, onClick)
+        )
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteListItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteListItemBuilder.kt
new file mode 100644
index 000000000000..6888fdfe1786
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteListItemBuilder.kt
@@ -0,0 +1,189 @@
+package org.wordpress.android.ui.mysite
+
+import android.text.TextUtils
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.main.MySiteFragment
+import org.wordpress.android.ui.mysite.MySiteItem.ListItem
+import org.wordpress.android.ui.plugins.PluginUtilsWrapper
+import org.wordpress.android.ui.themes.ThemeBrowserUtils
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DateTimeUtils
+import org.wordpress.android.util.SiteUtilsWrapper
+import java.util.GregorianCalendar
+import java.util.TimeZone
+import javax.inject.Inject
+
+class SiteListItemBuilder
+@Inject constructor(
+    private val accountStore: AccountStore,
+    private val pluginUtilsWrapper: PluginUtilsWrapper,
+    private val siteUtilsWrapper: SiteUtilsWrapper,
+    private val themeBrowserUtils: ThemeBrowserUtils
+) {
+    fun buildActivityLogItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        val isWpComOrJetpack = siteUtilsWrapper.isAccessedViaWPComRest(
+                site
+        ) || site.isJetpackConnected
+        return if (site.hasCapabilityManageOptions && isWpComOrJetpack && !site.isWpForTeamsSite) {
+            ListItem(
+                    R.drawable.ic_gridicons_clipboard_white_24dp,
+                    UiStringRes(R.string.activity_log),
+                    onClick = ListItemInteraction.create(ListItemAction.ACTIVITY_LOG, onClick)
+            )
+        } else null
+    }
+
+    fun buildBackupItemIfAvailable(onClick: (ListItemAction) -> Unit, isBackupAvailable: Boolean = false): ListItem? {
+        return if (isBackupAvailable) {
+            ListItem(
+                    R.drawable.ic_gridicons_cloud_upload_white_24dp,
+                    UiStringRes(R.string.backup),
+                    onClick = ListItemInteraction.create(ListItemAction.BACKUP, onClick)
+            )
+        } else null
+    }
+
+    fun buildScanItemIfAvailable(onClick: (ListItemAction) -> Unit, isScanAvailable: Boolean = false): ListItem? {
+        return if (isScanAvailable) {
+            ListItem(
+                    R.drawable.ic_baseline_security_white_24dp,
+                    UiStringRes(R.string.scan),
+                    onClick = ListItemInteraction.create(ListItemAction.SCAN, onClick)
+            )
+        } else null
+    }
+
+    fun buildJetpackItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        val jetpackSettingsVisible = site.isJetpackConnected && // jetpack is installed and connected
+                !site.isWPComAtomic &&
+                siteUtilsWrapper.isAccessedViaWPComRest(site) && // is using .com login
+                site.hasCapabilityManageOptions // has permissions to manage the site
+        return if (jetpackSettingsVisible) {
+            ListItem(
+                    R.drawable.ic_cog_white_24dp,
+                    UiStringRes(R.string.my_site_btn_jetpack_settings),
+                    onClick = ListItemInteraction.create(ListItemAction.JETPACK_SETTINGS, onClick)
+            )
+        } else null
+    }
+
+    fun buildPlanItemIfAvailable(
+        site: SiteModel,
+        showFocusPoint: Boolean,
+        onClick: (ListItemAction) -> Unit
+    ): ListItem? {
+        val planShortName = site.planShortName
+        return if (!TextUtils.isEmpty(planShortName) &&
+                site.hasCapabilityManageOptions &&
+                !site.isWpForTeamsSite &&
+                (site.isWPCom || site.isAutomatedTransfer)) {
+            ListItem(
+                    R.drawable.ic_plans_white_24dp,
+                    UiStringRes(R.string.plan),
+                    secondaryText = UiStringText(planShortName),
+                    onClick = ListItemInteraction.create(ListItemAction.PLAN, onClick),
+                    showFocusPoint = showFocusPoint
+            )
+        } else null
+    }
+
+    fun buildPagesItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        return if (site.isSelfHostedAdmin || site.hasCapabilityEditPages) {
+            ListItem(
+                    R.drawable.ic_pages_white_24dp,
+                    UiStringRes(R.string.my_site_btn_site_pages),
+                    onClick = ListItemInteraction.create(ListItemAction.PAGES, onClick)
+            )
+        } else null
+    }
+
+    fun buildAdminItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        return if (shouldShowWPAdmin(site)) {
+            ListItem(
+                    R.drawable.ic_wordpress_white_24dp,
+                    UiStringRes(R.string.my_site_btn_view_admin),
+                    secondaryIcon = R.drawable.ic_external_white_24dp,
+                    onClick = ListItemInteraction.create(ListItemAction.ADMIN, onClick)
+            )
+        } else null
+    }
+
+    fun buildPeopleItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        return if (site.hasCapabilityListUsers) {
+            ListItem(
+                    R.drawable.ic_user_white_24dp,
+                    UiStringRes(R.string.people),
+                    onClick = ListItemInteraction.create(ListItemAction.PEOPLE, onClick)
+            )
+        } else null
+    }
+
+    fun buildPluginItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        return if (pluginUtilsWrapper.isPluginFeatureAvailable(site)) {
+            ListItem(
+                    R.drawable.ic_plugins_white_24dp,
+                    UiStringRes(R.string.my_site_btn_plugins),
+                    onClick = ListItemInteraction.create(ListItemAction.PLUGINS, onClick)
+            )
+        } else null
+    }
+
+    fun buildShareItemIfAvailable(
+        site: SiteModel,
+        onClick: (ListItemAction) -> Unit,
+        showFocusPoint: Boolean = false
+    ): ListItem? {
+        return if (siteUtilsWrapper.isAccessedViaWPComRest(site)) {
+            ListItem(
+                    R.drawable.ic_share_white_24dp,
+                    UiStringRes(R.string.my_site_btn_sharing),
+                    showFocusPoint = showFocusPoint,
+                    onClick = ListItemInteraction.create(ListItemAction.SHARING, onClick)
+            )
+        } else null
+    }
+
+    fun buildSiteSettingsItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): ListItem? {
+        return if (site.hasCapabilityManageOptions || !siteUtilsWrapper.isAccessedViaWPComRest(site)) {
+            ListItem(
+                    R.drawable.ic_cog_white_24dp,
+                    UiStringRes(R.string.my_site_btn_site_settings),
+                    onClick = ListItemInteraction.create(ListItemAction.SITE_SETTINGS, onClick)
+            )
+        } else null
+    }
+
+    private fun shouldShowWPAdmin(site: SiteModel): Boolean {
+        return if (!site.isWPCom) {
+            true
+        } else {
+            val dateCreated = DateTimeUtils.dateFromIso8601(
+                    accountStore.account
+                            .date
+            )
+            val calendar = GregorianCalendar(HIDE_WP_ADMIN_YEAR, HIDE_WP_ADMIN_MONTH, HIDE_WP_ADMIN_DAY)
+            calendar.timeZone = TimeZone.getTimeZone(MySiteFragment.HIDE_WP_ADMIN_GMT_TIME_ZONE)
+            dateCreated == null || dateCreated.before(calendar.time)
+        }
+    }
+
+    fun buildThemesItemIfAvailable(site: SiteModel, onClick: (ListItemAction) -> Unit): MySiteItem? {
+        return if (themeBrowserUtils.isAccessible(site)) {
+            ListItem(
+                    R.drawable.ic_themes_white_24dp,
+                    UiStringRes(R.string.themes),
+                    onClick = ListItemInteraction.create(ListItemAction.THEMES, onClick)
+            )
+        } else null
+    }
+
+    companion object {
+        const val HIDE_WP_ADMIN_YEAR = 2015
+        const val HIDE_WP_ADMIN_MONTH = 9
+        const val HIDE_WP_ADMIN_DAY = 7
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt
new file mode 100644
index 000000000000..1df4e4c0c6c7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteNavigationAction.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.ui.mysite
+
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.PagePostCreationSourcesDetail
+import org.wordpress.android.util.UriWrapper
+
+sealed class SiteNavigationAction {
+    object OpenMeScreen : SiteNavigationAction()
+    data class OpenSite(val site: SiteModel) : SiteNavigationAction()
+    data class OpenSitePicker(val site: SiteModel) : SiteNavigationAction()
+    data class OpenMediaPicker(val site: SiteModel) : SiteNavigationAction()
+    data class OpenCropActivity(val imageUri: UriWrapper) : SiteNavigationAction()
+    data class OpenActivityLog(val site: SiteModel) : SiteNavigationAction()
+    data class OpenBackup(val site: SiteModel) : SiteNavigationAction()
+    data class OpenScan(val site: SiteModel) : SiteNavigationAction()
+    data class OpenPlan(val site: SiteModel) : SiteNavigationAction()
+    data class OpenPosts(val site: SiteModel) : SiteNavigationAction()
+    data class OpenPages(val site: SiteModel) : SiteNavigationAction()
+    data class OpenAdmin(val site: SiteModel) : SiteNavigationAction()
+    data class OpenPeople(val site: SiteModel) : SiteNavigationAction()
+    data class OpenSharing(val site: SiteModel) : SiteNavigationAction()
+    data class OpenSiteSettings(val site: SiteModel) : SiteNavigationAction()
+    data class OpenThemes(val site: SiteModel) : SiteNavigationAction()
+    data class OpenPlugins(val site: SiteModel) : SiteNavigationAction()
+    data class OpenMedia(val site: SiteModel) : SiteNavigationAction()
+    data class OpenComments(val site: SiteModel) : SiteNavigationAction()
+    object StartWPComLoginForJetpackStats : SiteNavigationAction()
+    data class OpenStats(val site: SiteModel) : SiteNavigationAction()
+    data class ConnectJetpackForStats(val site: SiteModel) : SiteNavigationAction()
+    data class OpenJetpackSettings(val site: SiteModel) : SiteNavigationAction()
+    data class OpenStories(val site: SiteModel, val event: StorySaveResult) : SiteNavigationAction()
+    data class AddNewStory(
+        val site: SiteModel,
+        val source: PagePostCreationSourcesDetail
+    ) : SiteNavigationAction()
+
+    data class AddNewStoryWithMediaIds(
+        val site: SiteModel,
+        val source: PagePostCreationSourcesDetail,
+        val mediaIds: List<Long>
+    ) : SiteNavigationAction()
+
+    data class AddNewStoryWithMediaUris(
+        val site: SiteModel,
+        val source: PagePostCreationSourcesDetail,
+        val mediaUris: List<String>
+    ) : SiteNavigationAction()
+    data class OpenDomainRegistration(val site: SiteModel) : SiteNavigationAction()
+    data class AddNewSite(val isSignedInWpCom: Boolean) : SiteNavigationAction()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteStoriesHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteStoriesHandler.kt
new file mode 100644
index 000000000000..e6691ce73b60
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteStoriesHandler.kt
@@ -0,0 +1,101 @@
+package org.wordpress.android.ui.mysite
+
+import android.content.Intent
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import com.wordpress.stories.compose.frame.FrameSaveNotifier
+import com.wordpress.stories.compose.frame.StorySaveEvents
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveProcessStart
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult
+import com.wordpress.stories.compose.story.StoryRepository
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.STORY_SAVE_ERROR_SNACKBAR_MANAGE_TAPPED
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.PagePostCreationSourcesDetail
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenStories
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.stories.StoriesMediaPickerResultHandler
+import org.wordpress.android.ui.stories.StoriesTrackerHelper
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.merge
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class SiteStoriesHandler
+@Inject constructor(
+    private val eventBusWrapper: EventBusWrapper,
+    private val resourceProvider: ResourceProvider,
+    private val storiesTrackerHelper: StoriesTrackerHelper,
+    private val contextProvider: ContextProvider,
+    private val selectedSiteRepository: SelectedSiteRepository,
+    private val storiesMediaPickerResultHandler: StoriesMediaPickerResultHandler
+) {
+    private val _onSnackbar = MutableLiveData<Event<SnackbarMessageHolder>>()
+    val onSnackbar = _onSnackbar as LiveData<Event<SnackbarMessageHolder>>
+    private val _onNavigation = MutableLiveData<Event<SiteNavigationAction>>()
+    val onNavigation = merge(_onNavigation, storiesMediaPickerResultHandler.onNavigation)
+
+    init {
+        eventBusWrapper.register(this)
+    }
+
+    fun clear() {
+        eventBusWrapper.unregister(this)
+    }
+
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    fun onEventMainThread(event: StorySaveResult) {
+        eventBusWrapper.removeStickyEvent(event)
+        if (!event.isSuccess()) {
+            // note: no tracking added here as we'll perform tracking in StoryMediaSaveUploadBridge
+            val errorText = String.format(
+                    resourceProvider.getString(R.string.story_saving_snackbar_finished_with_error),
+                    StoryRepository.getStoryAtIndex(event.storyIndex).title
+            )
+            val snackbarMessage = FrameSaveNotifier.buildSnackbarErrorMessage(
+                    contextProvider.getContext(),
+                    StorySaveEvents.allErrorsInResult(event.frameSaveResult).size,
+                    errorText
+            )
+
+            _onSnackbar.postValue(
+                    Event(
+                            SnackbarMessageHolder(
+                                    UiStringText(snackbarMessage),
+                                    UiStringRes(R.string.story_saving_failed_quick_action_manage),
+                                    buttonAction = {
+                                        val selectedSite = selectedSiteRepository.getSelectedSite()
+                                                ?: return@SnackbarMessageHolder
+                                        _onNavigation.postValue(Event(OpenStories(selectedSite, event)))
+                                        storiesTrackerHelper.trackStorySaveResultEvent(
+                                                event,
+                                                STORY_SAVE_ERROR_SNACKBAR_MANAGE_TAPPED
+                                        )
+                                    },
+                                    onDismissAction = { }
+                            )
+                    )
+            )
+        }
+    }
+
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    fun onStorySaveStart(event: StorySaveProcessStart) {
+        eventBusWrapper.removeStickyEvent(event)
+        val snackbarMessage = String.format(
+                resourceProvider.getString(R.string.story_saving_snackbar_started),
+                StoryRepository.getStoryAtIndex(event.storyIndex).title
+        )
+        _onSnackbar.postValue(Event(SnackbarMessageHolder(UiStringText(snackbarMessage))))
+    }
+
+    fun handleStoriesResult(siteModel: SiteModel, data: Intent, source: PagePostCreationSourcesDetail) {
+        storiesMediaPickerResultHandler.handleMediaPickerResultForStories(data, siteModel, source)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuFragment.kt
new file mode 100644
index 000000000000..cd65566a0ed3
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuFragment.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.ui.mysite.dynamiccards
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.QuickStartMenuFragmentBinding
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.util.image.ImageManager
+import javax.inject.Inject
+
+class DynamicCardMenuFragment : BottomSheetDialogFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    @Inject lateinit var imageManager: ImageManager
+    private lateinit var viewModel: DynamicCardMenuViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(DynamicCardMenuViewModel::class.java)
+        viewModel.start(
+                requireNotNull(requireArguments().getString(ID_ARG_KEY)),
+                requireArguments().getBoolean(IS_PINNED_KEY)
+        )
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = inflater.inflate(R.layout.quick_start_menu_fragment, container)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        with(QuickStartMenuFragmentBinding.bind(view)) {
+            val quickStartCardMenuPin = if (viewModel.isPinned) {
+                R.string.quick_start_card_menu_unpin
+            } else {
+                R.string.quick_start_card_menu_pin
+            }
+            quickStartPinText.setText(quickStartCardMenuPin)
+            pinAction.setOnClickListener { invokeAndDismiss { viewModel.onPinActionClicked() } }
+            hideAction.setOnClickListener { invokeAndDismiss { viewModel.onHideActionClicked() } }
+            removeAction.setOnClickListener { invokeAndDismiss { viewModel.onRemoveActionClicked() } }
+        }
+
+        dialog?.setOnShowListener { dialogInterface ->
+            val sheetDialog = dialogInterface as? BottomSheetDialog
+
+            val bottomSheet = sheetDialog?.findViewById<View>(
+                    com.google.android.material.R.id.design_bottom_sheet
+            ) as? FrameLayout
+
+            bottomSheet?.let {
+                val behavior = BottomSheetBehavior.from(it)
+                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+            }
+        }
+    }
+
+    private fun invokeAndDismiss(action: () -> Unit) {
+        action.invoke()
+        dismiss()
+    }
+
+    companion object {
+        const val ID_ARG_KEY = "ID_ARG_KEY"
+        const val IS_PINNED_KEY = "PINNED_KEY"
+
+        fun newInstance(cardType: DynamicCardType, isPinned: Boolean) = DynamicCardMenuFragment().apply {
+            arguments = Bundle().apply {
+                putString(ID_ARG_KEY, cardType.name)
+                putBoolean(IS_PINNED_KEY, isPinned)
+            }
+        }
+    }
+
+    data class DynamicCardMenuModel(val cardType: DynamicCardType, val isPinned: Boolean) {
+        val id = cardType.name
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuViewModel.kt
new file mode 100644
index 000000000000..76f116d5aeee
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuViewModel.kt
@@ -0,0 +1,49 @@
+package org.wordpress.android.ui.mysite.dynamiccards
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Hide
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Pin
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Remove
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Unpin
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+
+class DynamicCardMenuViewModel
+@Inject constructor() : ViewModel() {
+    private val _onInteraction = MutableLiveData<Event<DynamicCardMenuInteraction>>()
+    val onInteraction = _onInteraction as LiveData<Event<DynamicCardMenuInteraction>>
+
+    private lateinit var cardType: DynamicCardType
+    var isPinned: Boolean = false
+
+    fun onPinActionClicked() {
+        if (isPinned) {
+            _onInteraction.postValue(Event(Unpin(cardType)))
+        } else {
+            _onInteraction.postValue(Event(Pin(cardType)))
+        }
+    }
+
+    fun onHideActionClicked() {
+        _onInteraction.postValue(Event(Hide(cardType)))
+    }
+
+    fun onRemoveActionClicked() {
+        _onInteraction.postValue(Event(Remove(cardType)))
+    }
+
+    fun start(cardType: String, isPinned: Boolean) {
+        this.cardType = DynamicCardType.valueOf(cardType)
+        this.isPinned = isPinned
+    }
+
+    sealed class DynamicCardMenuInteraction(open val cardType: DynamicCardType) {
+        data class Pin(override val cardType: DynamicCardType) : DynamicCardMenuInteraction(cardType)
+        data class Unpin(override val cardType: DynamicCardType) : DynamicCardMenuInteraction(cardType)
+        data class Hide(override val cardType: DynamicCardType) : DynamicCardMenuInteraction(cardType)
+        data class Remove(override val cardType: DynamicCardType) : DynamicCardMenuInteraction(cardType)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardsSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardsSource.kt
new file mode 100644
index 000000000000..f004ca526527
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardsSource.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.ui.mysite.dynamiccards
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import org.wordpress.android.fluxc.model.DynamicCardType
+import org.wordpress.android.fluxc.store.DynamicCardStore
+import org.wordpress.android.ui.mysite.MySiteSource
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DynamicCardsUpdate
+import org.wordpress.android.ui.mysite.SelectedSiteRepository
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DynamicCardsSource
+@Inject constructor(
+    private val dynamicCardStore: DynamicCardStore,
+    private val selectedSiteRepository: SelectedSiteRepository
+) : MySiteSource<DynamicCardsUpdate> {
+    private val refresh = MutableLiveData<Boolean>()
+
+    override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData<DynamicCardsUpdate> {
+        val data = MediatorLiveData<DynamicCardsUpdate>()
+        data.refreshData(coroutineScope, siteId)
+        data.addSource(refresh) {
+            data.refreshData(coroutineScope, siteId)
+        }
+        return data
+    }
+
+    private fun MediatorLiveData<DynamicCardsUpdate>.refreshData(coroutineScope: CoroutineScope, siteId: Int) {
+        coroutineScope.launch {
+            val cards = dynamicCardStore.getCards(siteId)
+            this@refreshData.postValue(
+                    DynamicCardsUpdate(
+                            pinnedDynamicCard = cards.pinnedItem,
+                            cards = cards.dynamicCardTypes
+                    )
+            )
+        }
+    }
+
+    suspend fun pinItem(dynamicCardType: DynamicCardType) {
+        callWithSite { siteId -> dynamicCardStore.pinCard(siteId, dynamicCardType) }
+    }
+
+    suspend fun hideItem(dynamicCardType: DynamicCardType) {
+        callWithSite { siteId -> dynamicCardStore.hideCard(siteId, dynamicCardType) }
+    }
+
+    suspend fun unpinItem() {
+        callWithSite { siteId -> dynamicCardStore.unpinCard(siteId) }
+    }
+
+    suspend fun removeItem(dynamicCardType: DynamicCardType) {
+        callWithSite { siteId -> dynamicCardStore.removeCard(siteId, dynamicCardType) }
+    }
+
+    private suspend fun callWithSite(function: suspend (Int) -> Unit) {
+        selectedSiteRepository.getSelectedSite()?.id?.let { siteId ->
+            function(siteId)
+            refresh.postValue(true)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
index c211ef72b1b2..60e1a91f2662 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java
@@ -10,6 +10,7 @@
 import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
@@ -26,6 +27,7 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
+import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.datasets.NotificationsTable;
 import org.wordpress.android.fluxc.model.CommentStatus;
 import org.wordpress.android.fluxc.model.SiteModel;
@@ -41,6 +43,8 @@
 import org.wordpress.android.ui.WPWebViewActivity;
 import org.wordpress.android.ui.comments.CommentActions;
 import org.wordpress.android.ui.comments.CommentDetailFragment;
+import org.wordpress.android.ui.engagement.EngagedPeopleListFragment;
+import org.wordpress.android.ui.engagement.ListScenarioUtils;
 import org.wordpress.android.ui.notifications.adapters.NotesAdapter;
 import org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter;
 import org.wordpress.android.ui.notifications.utils.NotificationsActions;
@@ -50,11 +54,15 @@
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.reader.ReaderActivityLauncher;
 import org.wordpress.android.ui.reader.ReaderPostDetailFragment;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.stats.StatsViewType;
 import org.wordpress.android.util.AppBarLayoutExtensionsKt;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
+import org.wordpress.android.util.config.LikesEnhancementsFeatureConfig;
 import org.wordpress.android.widgets.WPSwipeSnackbar;
 import org.wordpress.android.widgets.WPViewPager;
 import org.wordpress.android.widgets.WPViewPagerTransformer;
@@ -80,6 +88,9 @@ public class NotificationsDetailActivity extends LocaleAwareActivity implements
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
     @Inject GCMMessageHandler mGCMMessageHandler;
+    @Inject ReaderTracker mReaderTracker;
+    @Inject LikesEnhancementsFeatureConfig mLikesEnhancementsFeatureConfig;
+    @Inject ListScenarioUtils mListScenarioUtils;
 
     private String mNoteId;
     private boolean mIsTappedOnNotification;
@@ -145,6 +156,10 @@ public void onCreate(Bundle savedInstanceState) {
         if (!getIntent().getBooleanExtra(NotificationsListFragment.NOTE_INSTANT_REPLY_EXTRA, false)) {
             getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
         }
+        // track initial comment note view
+        if (savedInstanceState == null && note != null) {
+            trackCommentNote(note);
+        }
     }
 
     private void updateUIAndNote(boolean doRefresh) {
@@ -225,6 +240,8 @@ public void onPageSelected(int position) {
                         setActionBarTitleForNote(currentNote);
                         markNoteAsRead(currentNote);
                         NotificationsActions.updateSeenTimestamp(currentNote);
+                        // track subsequent comment note views
+                        trackCommentNote(currentNote);
                     }
                 }
 
@@ -236,6 +253,14 @@ public void onPageScrollStateChanged(int state) {
         mViewPager.addOnPageChangeListener(mOnPageChangeListener);
     }
 
+    private void trackCommentNote(@NotNull Note note) {
+        if (note.isCommentType()) {
+            SiteModel site = mSiteStore.getSiteBySiteId(note.getSiteId());
+            AnalyticsUtils.trackCommentActionWithSiteDetails(
+                    Stat.COMMENT_VIEWED, AnalyticsCommentActionSource.NOTIFICATIONS, site);
+        }
+    }
+
     public void showHideToolbar(boolean hide) {
         if (getSupportActionBar() != null) {
             if (hide) {
@@ -389,18 +414,30 @@ private Fragment getDetailFragmentForNote(Note note) {
                     note.getPostId()
             );
         } else {
-            fragment = NotificationsDetailListFragment.newInstance(note.getId());
+            if (mLikesEnhancementsFeatureConfig.isEnabled() && note.isLikeType()) {
+                fragment = EngagedPeopleListFragment.newInstance(
+                        mListScenarioUtils.mapLikeNoteToListScenario(note, this)
+                );
+            } else {
+                fragment = NotificationsDetailListFragment.newInstance(note.getId());
+            }
         }
 
         return fragment;
     }
 
-    public void showBlogPreviewActivity(long siteId) {
+    public void showBlogPreviewActivity(long siteId, @Nullable Boolean isFollowed) {
         if (isFinishing()) {
             return;
         }
 
-        ReaderActivityLauncher.showReaderBlogPreview(this, siteId);
+        ReaderActivityLauncher.showReaderBlogPreview(
+                this,
+                siteId,
+                isFollowed,
+                ReaderTracker.SOURCE_NOTIFICATION,
+                mReaderTracker
+        );
     }
 
     public void showPostActivity(long siteId, long postId) {
@@ -411,15 +448,36 @@ public void showPostActivity(long siteId, long postId) {
         ReaderActivityLauncher.showReaderPostDetail(this, siteId, postId);
     }
 
+    public void showScanActivityForSite(long siteId) {
+        SiteModel site = getSiteOrToast(siteId);
+        if (site != null) {
+            ActivityLauncher.viewScan(this, site);
+        }
+    }
+
     public void showStatsActivityForSite(long siteId, FormattableRangeType rangeType) {
+        SiteModel site = getSiteOrToast(siteId);
+        if (site != null) {
+            showStatsActivityForSite(site, rangeType);
+        }
+    }
+
+    public void showBackupForSite(long siteId) {
+        SiteModel site = getSiteOrToast(siteId);
+        if (site != null) {
+            showBackupActivityForSite(site);
+        }
+    }
+
+    @Nullable
+    private SiteModel getSiteOrToast(long siteId) {
         SiteModel site = mSiteStore.getSiteBySiteId(siteId);
         if (site == null) {
             // One way the site can be null: new site created, receive a notification from this site,
             // but the site list is not yet updated in the app.
             ToastUtils.showToast(this, R.string.blog_not_found);
-            return;
         }
-        showStatsActivityForSite(site, rangeType);
+        return site;
     }
 
     private void showStatsActivityForSite(@NonNull SiteModel site, FormattableRangeType rangeType) {
@@ -435,6 +493,14 @@ private void showStatsActivityForSite(@NonNull SiteModel site, FormattableRangeT
         }
     }
 
+    private void showBackupActivityForSite(@NonNull SiteModel site) {
+        if (isFinishing()) {
+            return;
+        }
+
+        ActivityLauncher.viewBackupList(this, site);
+    }
+
     public void showWebViewActivityForUrl(String url) {
         if (isFinishing() || url == null) {
             return;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java
deleted file mode 100644
index 42243b522bcc..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java
+++ /dev/null
@@ -1,584 +0,0 @@
-/**
- * One fragment to rule them all (Notes, that is)
- */
-package org.wordpress.android.ui.notifications;
-
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.text.TextUtils;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.ListView;
-
-import androidx.annotation.NonNull;
-import androidx.fragment.app.ListFragment;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.wordpress.android.R;
-import org.wordpress.android.WordPress;
-import org.wordpress.android.datasets.NotificationsTable;
-import org.wordpress.android.datasets.ReaderCommentTable;
-import org.wordpress.android.datasets.ReaderPostTable;
-import org.wordpress.android.fluxc.model.CommentStatus;
-import org.wordpress.android.fluxc.tools.FormattableContent;
-import org.wordpress.android.fluxc.tools.FormattableRange;
-import org.wordpress.android.models.Note;
-import org.wordpress.android.ui.ScrollableViewInitializedListener;
-import org.wordpress.android.ui.ViewPagerFragment;
-import org.wordpress.android.ui.notifications.adapters.NoteBlockAdapter;
-import org.wordpress.android.ui.notifications.blocks.BlockType;
-import org.wordpress.android.ui.notifications.blocks.CommentUserNoteBlock;
-import org.wordpress.android.ui.notifications.blocks.FooterNoteBlock;
-import org.wordpress.android.ui.notifications.blocks.GeneratedNoteBlock;
-import org.wordpress.android.ui.notifications.blocks.HeaderNoteBlock;
-import org.wordpress.android.ui.notifications.blocks.NoteBlock;
-import org.wordpress.android.ui.notifications.blocks.NoteBlock.OnNoteBlockTextClickListener;
-import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan;
-import org.wordpress.android.ui.notifications.blocks.UserNoteBlock;
-import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper;
-import org.wordpress.android.ui.reader.ReaderActivityLauncher;
-import org.wordpress.android.ui.reader.actions.ReaderPostActions;
-import org.wordpress.android.ui.reader.services.ReaderCommentService;
-import org.wordpress.android.ui.reader.utils.ReaderUtils;
-import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.FormattableContentUtilsKt;
-import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.image.ImageManager;
-import org.wordpress.android.util.image.ImageType;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-public class NotificationsDetailListFragment extends ListFragment implements NotificationFragment {
-    private static final String KEY_NOTE_ID = "noteId";
-    private static final String KEY_LIST_POSITION = "listPosition";
-
-    private int mRestoredListPosition;
-
-    private Note mNote;
-    private LinearLayout mRootLayout;
-    private ViewGroup mFooterView;
-
-    private String mRestoredNoteId;
-    private int mCommentListPosition = ListView.INVALID_POSITION;
-
-    private CommentUserNoteBlock.OnCommentStatusChangeListener mOnCommentStatusChangeListener;
-    private NoteBlockAdapter mNoteBlockAdapter;
-
-    @Inject ImageManager mImageManager;
-    @Inject NotificationsUtilsWrapper mNotificationsUtilsWrapper;
-
-    public NotificationsDetailListFragment() {
-    }
-
-    public static NotificationsDetailListFragment newInstance(final String noteId) {
-        NotificationsDetailListFragment fragment = new NotificationsDetailListFragment();
-        fragment.setNote(noteId);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        ((WordPress) getActivity().getApplication()).component().inject(this);
-        if (savedInstanceState != null && savedInstanceState.containsKey(KEY_NOTE_ID)) {
-            // The note will be set in onResume()
-            // See WordPress.deferredInit()
-            mRestoredNoteId = savedInstanceState.getString(KEY_NOTE_ID);
-            mRestoredListPosition = savedInstanceState.getInt(KEY_LIST_POSITION, 0);
-        }
-    }
-
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.notifications_fragment_detail_list, container, false);
-        mRootLayout = (LinearLayout) view.findViewById(R.id.notifications_list_root);
-
-        return view;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle bundle) {
-        super.onActivityCreated(bundle);
-
-        ListView listView = getListView();
-        listView.setDivider(null);
-        listView.setDividerHeight(0);
-        listView.setHeaderDividersEnabled(false);
-
-        if (mFooterView != null) {
-            listView.addFooterView(mFooterView);
-        }
-
-        reloadNoteBlocks();
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        ViewPagerFragment.Companion.setUniqueIdToView(getListView());
-
-        if (getActivity() instanceof ScrollableViewInitializedListener) {
-            ((ScrollableViewInitializedListener) getActivity()).onScrollableViewInitialized(getListView().getId());
-        }
-
-        // Set the note if we retrieved the noteId from savedInstanceState
-        if (!TextUtils.isEmpty(mRestoredNoteId)) {
-            setNote(mRestoredNoteId);
-            reloadNoteBlocks();
-            mRestoredNoteId = null;
-        }
-
-        if (getNote() == null) {
-            showErrorToastAndFinish();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        // Stop the reader comment service if it is running
-        ReaderCommentService.stopService(getActivity());
-        ViewPagerFragment.Companion.restoreOriginalViewId(getListView());
-        super.onPause();
-    }
-
-    @Override
-    public Note getNote() {
-        return mNote;
-    }
-
-    @Override
-    public void setNote(String noteId) {
-        if (noteId == null) {
-            showErrorToastAndFinish();
-            return;
-        }
-
-        Note note = NotificationsTable.getNoteById(noteId);
-        if (note == null) {
-            showErrorToastAndFinish();
-            return;
-        }
-        mNote = note;
-    }
-
-    private void showErrorToastAndFinish() {
-        AppLog.e(AppLog.T.NOTIFS, "Note could not be found.");
-        if (getActivity() != null) {
-            ToastUtils.showToast(getActivity(), R.string.error_notification_open);
-            getActivity().finish();
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        if (mNote != null) {
-            outState.putString(KEY_NOTE_ID, mNote.getId());
-            outState.putInt(KEY_LIST_POSITION, getListView().getFirstVisiblePosition());
-        }
-
-        super.onSaveInstanceState(outState);
-    }
-
-    private void reloadNoteBlocks() {
-        new LoadNoteBlocksTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-
-    public void setFooterView(ViewGroup footerView) {
-        mFooterView = footerView;
-    }
-
-    private final NoteBlock.OnNoteBlockTextClickListener mOnNoteBlockTextClickListener =
-            new NoteBlock.OnNoteBlockTextClickListener() {
-                @Override
-                public void onNoteBlockTextClicked(NoteBlockClickableSpan clickedSpan) {
-                    if (!isAdded() || !(getActivity() instanceof NotificationsDetailActivity)) {
-                        return;
-                    }
-
-                    handleNoteBlockSpanClick((NotificationsDetailActivity) getActivity(), clickedSpan);
-                }
-
-                @Override
-                public void showDetailForNoteIds() {
-                    if (!isAdded() || mNote == null || !(getActivity() instanceof NotificationsDetailActivity)) {
-                        return;
-                    }
-
-                    NotificationsDetailActivity detailActivity = (NotificationsDetailActivity) getActivity();
-                    if (mNote.isCommentReplyType() || (!mNote.isCommentType() && mNote.getCommentId() > 0)) {
-                        long commentId = mNote.isCommentReplyType() ? mNote.getParentCommentId() : mNote.getCommentId();
-
-                        // show comments list if it exists in the reader
-                        if (ReaderUtils.postAndCommentExists(mNote.getSiteId(), mNote.getPostId(), commentId)) {
-                            detailActivity.showReaderCommentsList(mNote.getSiteId(), mNote.getPostId(), commentId);
-                        } else {
-                            detailActivity.showWebViewActivityForUrl(mNote.getUrl());
-                        }
-                    } else if (mNote.isFollowType()) {
-                        detailActivity.showBlogPreviewActivity(mNote.getSiteId());
-                    } else {
-                        // otherwise, load the post in the Reader
-                        detailActivity.showPostActivity(mNote.getSiteId(), mNote.getPostId());
-                    }
-                }
-
-                @Override
-                public void showReaderPostComments() {
-                    if (!isAdded() || mNote == null || mNote.getCommentId() == 0) {
-                        return;
-                    }
-
-                    ReaderActivityLauncher.showReaderComments(getActivity(), mNote.getSiteId(), mNote.getPostId(),
-                            mNote.getCommentId());
-                }
-
-                @Override
-                public void showSitePreview(long siteId, String siteUrl) {
-                    if (!isAdded() || mNote == null || !(getActivity() instanceof NotificationsDetailActivity)) {
-                        return;
-                    }
-
-                    NotificationsDetailActivity detailActivity = (NotificationsDetailActivity) getActivity();
-                    if (siteId != 0) {
-                        detailActivity.showBlogPreviewActivity(siteId);
-                    } else if (!TextUtils.isEmpty(siteUrl)) {
-                        detailActivity.showWebViewActivityForUrl(siteUrl);
-                    }
-                }
-
-                public void handleNoteBlockSpanClick(NotificationsDetailActivity activity,
-                                                     NoteBlockClickableSpan clickedSpan) {
-                    switch (clickedSpan.getRangeType()) {
-                        case SITE:
-                            // Show blog preview
-                            activity.showBlogPreviewActivity(clickedSpan.getId());
-                            break;
-                        case USER:
-                            // Show blog preview
-                            activity.showBlogPreviewActivity(clickedSpan.getSiteId());
-                            break;
-                        case POST:
-                            // Show post detail
-                            activity.showPostActivity(clickedSpan.getSiteId(), clickedSpan.getId());
-                            break;
-                        case COMMENT:
-                            // Load the comment in the reader list if it exists, otherwise show a webview
-                            if (ReaderUtils.postAndCommentExists(clickedSpan.getSiteId(), clickedSpan.getPostId(),
-                                    clickedSpan.getId())) {
-                                activity.showReaderCommentsList(clickedSpan.getSiteId(), clickedSpan.getPostId(),
-                                        clickedSpan.getId());
-                            } else {
-                                activity.showWebViewActivityForUrl(clickedSpan.getUrl());
-                            }
-                            break;
-                        case STAT:
-                        case FOLLOW:
-                            // We can open native stats if the site is a wpcom or Jetpack sites
-                            activity.showStatsActivityForSite(clickedSpan.getSiteId(), clickedSpan.getRangeType());
-                            break;
-                        case LIKE:
-                            if (ReaderPostTable.postExists(clickedSpan.getSiteId(), clickedSpan.getId())) {
-                                activity.showReaderPostLikeUsers(clickedSpan.getSiteId(), clickedSpan.getId());
-                            } else {
-                                activity.showPostActivity(clickedSpan.getSiteId(), clickedSpan.getId());
-                            }
-                            break;
-                        default:
-                            // We don't know what type of id this is, let's see if it has a URL and push a webview
-                            if (!TextUtils.isEmpty(clickedSpan.getUrl())) {
-                                activity.showWebViewActivityForUrl(clickedSpan.getUrl());
-                            }
-                    }
-                }
-            };
-
-    private final UserNoteBlock.OnGravatarClickedListener mOnGravatarClickedListener =
-            new UserNoteBlock.OnGravatarClickedListener() {
-                @Override
-                public void onGravatarClicked(long siteId, long userId, String siteUrl) {
-                    if (!isAdded() || !(getActivity() instanceof NotificationsDetailActivity)) {
-                        return;
-                    }
-
-                    NotificationsDetailActivity detailActivity = (NotificationsDetailActivity) getActivity();
-                    if (siteId == 0 && !TextUtils.isEmpty(siteUrl)) {
-                        detailActivity.showWebViewActivityForUrl(siteUrl);
-                    } else if (siteId != 0) {
-                        detailActivity.showBlogPreviewActivity(siteId);
-                    }
-                }
-            };
-
-    private boolean hasNoteBlockAdapter() {
-        return mNoteBlockAdapter != null;
-    }
-
-
-    // Loop through the 'body' items in this note, and create blocks for each.
-    private class LoadNoteBlocksTask extends AsyncTask<Void, Boolean, List<NoteBlock>> {
-        private boolean mIsBadgeView;
-
-        @Override
-        protected List<NoteBlock> doInBackground(Void... params) {
-            if (mNote == null) {
-                return null;
-            }
-
-            requestReaderContentForNote();
-            JSONArray bodyArray = mNote.getBody();
-            final List<NoteBlock> noteList = new ArrayList<>();
-
-            // Add the note header if one was provided
-            if (mNote.getHeader() != null) {
-                ImageType imageType = mNote.isFollowType() ? ImageType.BLAVATAR : ImageType.AVATAR_WITH_BACKGROUND;
-                HeaderNoteBlock headerNoteBlock = new HeaderNoteBlock(
-                        getActivity(),
-                        transformToFormattableContentList(mNote.getHeader()),
-                        imageType,
-                        mOnNoteBlockTextClickListener,
-                        mOnGravatarClickedListener,
-                        mImageManager,
-                        mNotificationsUtilsWrapper
-                );
-
-                headerNoteBlock.setIsComment(mNote.isCommentType());
-                noteList.add(headerNoteBlock);
-            }
-            String pingbackUrl = null;
-
-            boolean isPingback = isPingback(mNote);
-            if (bodyArray != null && bodyArray.length() > 0) {
-                for (int i = 0; i < bodyArray.length(); i++) {
-                    try {
-                        FormattableContent noteObject = mNotificationsUtilsWrapper
-                                .mapJsonToFormattableContent(bodyArray.getJSONObject(i));
-                        // Determine NoteBlock type and add it to the array
-                        NoteBlock noteBlock;
-                        if (BlockType.fromString(noteObject.getType()) == BlockType.USER) {
-                            if (mNote.isCommentType()) {
-                                // Set comment position so we can target it later
-                                // See refreshBlocksForCommentStatus()
-                                mCommentListPosition = i + noteList.size();
-
-                                FormattableContent commentTextBlock = null;
-                                // Next item in the bodyArray is comment text
-                                if (i + 1 < bodyArray.length()) {
-                                    commentTextBlock = mNotificationsUtilsWrapper
-                                            .mapJsonToFormattableContent(bodyArray.getJSONObject(i + 1));
-                                    i++;
-                                }
-
-                                noteBlock = new CommentUserNoteBlock(
-                                        getActivity(),
-                                        noteObject,
-                                        commentTextBlock,
-                                        mNote.getTimestamp(),
-                                        mOnNoteBlockTextClickListener,
-                                        mOnGravatarClickedListener,
-                                        mImageManager,
-                                        mNotificationsUtilsWrapper
-                                );
-                                pingbackUrl = noteBlock.getMetaSiteUrl();
-
-                                // Set listener for comment status changes, so we can update bg and text colors
-                                CommentUserNoteBlock commentUserNoteBlock = (CommentUserNoteBlock) noteBlock;
-                                mOnCommentStatusChangeListener = commentUserNoteBlock.getOnCommentChangeListener();
-                                commentUserNoteBlock.setCommentStatus(mNote.getCommentStatus());
-                                commentUserNoteBlock.configureResources(getActivity());
-                            } else {
-                                noteBlock = new UserNoteBlock(
-                                        getActivity(),
-                                        noteObject,
-                                        mOnNoteBlockTextClickListener,
-                                        mOnGravatarClickedListener,
-                                        mImageManager,
-                                        mNotificationsUtilsWrapper
-                                );
-                            }
-                        } else if (isFooterBlock(noteObject)) {
-                            noteBlock = new FooterNoteBlock(noteObject, mImageManager, mNotificationsUtilsWrapper,
-                                    mOnNoteBlockTextClickListener);
-                            if (noteObject.getRanges() != null && noteObject.getRanges().size() > 0) {
-                                FormattableRange range =
-                                        noteObject.getRanges().get(noteObject.getRanges().size() - 1);
-                                ((FooterNoteBlock) noteBlock).setClickableSpan(range, mNote.getType());
-                            }
-                        } else {
-                            noteBlock = new NoteBlock(noteObject, mImageManager, mNotificationsUtilsWrapper,
-                                    mOnNoteBlockTextClickListener);
-                        }
-
-                        // Badge notifications apply different colors and formatting
-                        if (isAdded() && noteBlock.containsBadgeMediaType()) {
-                            mIsBadgeView = true;
-                        }
-
-                        if (mIsBadgeView) {
-                            noteBlock.setIsBadge();
-                        }
-
-                        if (isPingback) {
-                            noteBlock.setIsPingback();
-                        }
-
-                        noteList.add(noteBlock);
-                    } catch (JSONException e) {
-                        AppLog.e(AppLog.T.NOTIFS, "Invalid note data, could not parse.");
-                    }
-                }
-            }
-
-            if (isPingback) {
-                // Remove this when we start receiving "Read the source post block" from the backend
-                NoteBlock generatedBlock =
-                        buildGeneratedLinkBlock(mOnNoteBlockTextClickListener, pingbackUrl,
-                                getActivity().getString(R.string.comment_read_source_post));
-                generatedBlock.setIsPingback();
-                noteList.add(generatedBlock);
-            }
-
-            return noteList;
-        }
-
-        @NonNull private List<FormattableContent> transformToFormattableContentList(JSONArray headerArray) {
-            List<FormattableContent> headersList = new ArrayList<>();
-            if (headerArray != null) {
-                for (int i = 0; i < headerArray.length(); i++) {
-                    try {
-                        headersList.add(mNotificationsUtilsWrapper.mapJsonToFormattableContent(
-                                headerArray.getJSONObject(i)));
-                    } catch (JSONException e) {
-                        AppLog.e(T.NOTIFS, "Header array has invalid format.");
-                    }
-                }
-            }
-            return headersList;
-        }
-
-        private boolean isPingback(Note note) {
-            boolean hasRangeOfTypeSite = false;
-            boolean hasRangeOfTypePost = false;
-
-            JSONArray rangesArray = note.getSubject().optJSONArray("ranges");
-            if (rangesArray != null) {
-                for (int i = 0; i < rangesArray.length(); i++) {
-                    JSONObject rangeObject = rangesArray.optJSONObject(i);
-                    if (rangeObject == null) {
-                        continue;
-                    }
-                    if ("site".equals(rangeObject.optString("type"))) {
-                        hasRangeOfTypeSite = true;
-                    } else if ("post".equals(rangeObject.optString("type"))) {
-                        hasRangeOfTypePost = true;
-                    }
-                }
-            }
-            return hasRangeOfTypePost && hasRangeOfTypeSite;
-        }
-
-        private NoteBlock buildGeneratedLinkBlock(OnNoteBlockTextClickListener onNoteBlockTextClickListener,
-                                                  String pingbackUrl,
-                                                  String message) {
-            return new GeneratedNoteBlock(
-                    message,
-                    mImageManager,
-                    mNotificationsUtilsWrapper,
-                    onNoteBlockTextClickListener,
-                    pingbackUrl);
-        }
-
-        @Override
-        protected void onPostExecute(List<NoteBlock> noteList) {
-            if (!isAdded() || noteList == null) {
-                return;
-            }
-
-            if (mIsBadgeView) {
-                mRootLayout.setGravity(Gravity.CENTER_VERTICAL);
-            }
-
-            if (!hasNoteBlockAdapter()) {
-                mNoteBlockAdapter = new NoteBlockAdapter(getActivity(), noteList);
-                setListAdapter(mNoteBlockAdapter);
-            } else {
-                mNoteBlockAdapter.setNoteList(noteList);
-            }
-
-            if (mRestoredListPosition > 0) {
-                getListView().setSelectionFromTop(mRestoredListPosition, 0);
-                mRestoredListPosition = 0;
-            }
-        }
-    }
-
-    private boolean isFooterBlock(FormattableContent blockObject) {
-        if (mNote == null || blockObject == null) {
-            return false;
-        }
-
-        if (mNote.isCommentType()) {
-            Long commentReplyId = FormattableContentUtilsKt.getRangeIdOrZero(blockObject, 1);
-            // Check if this is a comment notification that has been replied to
-            // The block will not have a type, and its id will match the comment reply id in the Note.
-            return (blockObject.getType() == null
-                    && mNote.getCommentReplyId() == commentReplyId);
-        } else if (mNote.isFollowType() || mNote.isLikeType() || mNote.isReblogType()) {
-            // User list notifications have a footer if they have 10 or more users in the body
-            // The last block will not have a type, so we can use that to determine if it is the footer
-            return blockObject.getType() == null;
-        }
-
-        return false;
-    }
-
-    public void refreshBlocksForCommentStatus(CommentStatus newStatus) {
-        if (mOnCommentStatusChangeListener != null) {
-            mOnCommentStatusChangeListener.onCommentStatusChanged(newStatus);
-            ListView listView = getListView();
-            if (listView == null || mCommentListPosition == ListView.INVALID_POSITION) {
-                return;
-            }
-
-            // Redraw the comment row if it is visible so that the background and text colors update
-            // See: http://stackoverflow.com/questions/4075975/redraw-a-single-row-in-a-listview/9987616#9987616
-            int firstPosition = listView.getFirstVisiblePosition();
-            int endPosition = listView.getLastVisiblePosition();
-            for (int i = firstPosition; i < endPosition; i++) {
-                if (mCommentListPosition == i) {
-                    View view = listView.getChildAt(i - firstPosition);
-                    listView.getAdapter().getView(i, view, listView);
-                    break;
-                }
-            }
-        }
-    }
-
-    // Requests Reader content for certain notification types
-    private void requestReaderContentForNote() {
-        if (mNote == null || !isAdded()) {
-            return;
-        }
-
-        // Request the reader post so that loading reader activities will work.
-        if (mNote.isUserList() && !ReaderPostTable.postExists(mNote.getSiteId(), mNote.getPostId())) {
-            ReaderPostActions.requestBlogPost(mNote.getSiteId(), mNote.getPostId(), null);
-        }
-
-        // Request reader comments until we retrieve the comment for this note
-        if ((mNote.isCommentLikeType() || mNote.isCommentReplyType() || mNote.isCommentWithUserReply())
-            && !ReaderCommentTable.commentExists(mNote.getSiteId(), mNote.getPostId(), mNote.getCommentId())) {
-            ReaderCommentService
-                    .startServiceForComment(getActivity(), mNote.getSiteId(), mNote.getPostId(), mNote.getCommentId());
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.kt
new file mode 100644
index 000000000000..e957fffe9ba1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.kt
@@ -0,0 +1,623 @@
+/**
+ * One fragment to rule them all (Notes, that is)
+ */
+package org.wordpress.android.ui.notifications
+
+import android.annotation.SuppressLint
+import android.os.AsyncTask
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.LinearLayout
+import android.widget.ListView
+import androidx.fragment.app.ListFragment
+import com.airbnb.lottie.LottieAnimationView
+import org.json.JSONArray
+import org.json.JSONException
+import org.wordpress.android.R
+import org.wordpress.android.R.layout
+import org.wordpress.android.R.string
+import org.wordpress.android.WordPress
+import org.wordpress.android.datasets.NotificationsTable
+import org.wordpress.android.datasets.ReaderCommentTable
+import org.wordpress.android.datasets.ReaderPostTable
+import org.wordpress.android.fluxc.model.CommentStatus
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.fluxc.tools.FormattableRangeType.COMMENT
+import org.wordpress.android.fluxc.tools.FormattableRangeType.FOLLOW
+import org.wordpress.android.fluxc.tools.FormattableRangeType.LIKE
+import org.wordpress.android.fluxc.tools.FormattableRangeType.POST
+import org.wordpress.android.fluxc.tools.FormattableRangeType.REWIND_DOWNLOAD_READY
+import org.wordpress.android.fluxc.tools.FormattableRangeType.SCAN
+import org.wordpress.android.fluxc.tools.FormattableRangeType.SITE
+import org.wordpress.android.fluxc.tools.FormattableRangeType.STAT
+import org.wordpress.android.fluxc.tools.FormattableRangeType.USER
+import org.wordpress.android.models.Note
+import org.wordpress.android.ui.ScrollableViewInitializedListener
+import org.wordpress.android.ui.ViewPagerFragment.Companion.restoreOriginalViewId
+import org.wordpress.android.ui.ViewPagerFragment.Companion.setUniqueIdToView
+import org.wordpress.android.ui.engagement.ListScenarioUtils
+import org.wordpress.android.ui.notifications.adapters.NoteBlockAdapter
+import org.wordpress.android.ui.notifications.blocks.BlockType
+import org.wordpress.android.ui.notifications.blocks.CommentUserNoteBlock
+import org.wordpress.android.ui.notifications.blocks.CommentUserNoteBlock.OnCommentStatusChangeListener
+import org.wordpress.android.ui.notifications.blocks.FooterNoteBlock
+import org.wordpress.android.ui.notifications.blocks.GeneratedNoteBlock
+import org.wordpress.android.ui.notifications.blocks.HeaderNoteBlock
+import org.wordpress.android.ui.notifications.blocks.NoteBlock
+import org.wordpress.android.ui.notifications.blocks.NoteBlock.OnNoteBlockTextClickListener
+import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan
+import org.wordpress.android.ui.notifications.blocks.UserNoteBlock
+import org.wordpress.android.ui.notifications.blocks.UserNoteBlock.OnGravatarClickedListener
+import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
+import org.wordpress.android.ui.reader.ReaderActivityLauncher
+import org.wordpress.android.ui.reader.actions.ReaderPostActions
+import org.wordpress.android.ui.reader.services.ReaderCommentService
+import org.wordpress.android.ui.reader.utils.ReaderUtils
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.NOTIFS
+import org.wordpress.android.util.ToastUtils
+import org.wordpress.android.util.getRangeIdOrZero
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
+import org.wordpress.android.util.image.ImageType.BLAVATAR
+import java.util.ArrayList
+import javax.inject.Inject
+
+// This file was ported from java and there were many complains from linter,
+// fixed all of them but for the "TooManyFunctions" the total number of functions was reduced
+// but seemed not easily fully avoidable.
+// Skipping it for now since there will be probably more work around this area
+// and so further opportunity to iterate for review/refactor
+@Suppress("TooManyFunctions")
+class NotificationsDetailListFragment : ListFragment(), NotificationFragment {
+    private var restoredListPosition = 0
+    private var notification: Note? = null
+    private var rootLayout: LinearLayout? = null
+    private var footerView: ViewGroup? = null
+    private var restoredNoteId: String? = null
+    private var commentListPosition = ListView.INVALID_POSITION
+    private var onCommentStatusChangeListener: OnCommentStatusChangeListener? = null
+    private var noteBlockAdapter: NoteBlockAdapter? = null
+    private var confettiShown = false
+
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var notificationsUtilsWrapper: NotificationsUtilsWrapper
+    @Inject lateinit var listScenarioUtils: ListScenarioUtils
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (requireActivity().application as WordPress).component().inject(this)
+        if (savedInstanceState != null && savedInstanceState.containsKey(KEY_NOTE_ID)) {
+            // The note will be set in onResume()
+            // See WordPress.deferredInit()
+            restoredNoteId = savedInstanceState.getString(KEY_NOTE_ID)
+            restoredListPosition = savedInstanceState.getInt(KEY_LIST_POSITION, 0)
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(layout.notifications_fragment_detail_list, container, false)
+        rootLayout = view.findViewById(R.id.notifications_list_root) as LinearLayout
+        return view
+    }
+
+    override fun onActivityCreated(bundle: Bundle?) {
+        super.onActivityCreated(bundle)
+        val listView = listView
+        listView.divider = null
+        listView.dividerHeight = 0
+        listView.setHeaderDividersEnabled(false)
+        if (footerView != null) {
+            listView.addFooterView(footerView)
+        }
+        reloadNoteBlocks()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        setUniqueIdToView(listView)
+        if (activity is ScrollableViewInitializedListener) {
+            (activity as ScrollableViewInitializedListener).onScrollableViewInitialized(listView.id)
+        }
+
+        // Set the note if we retrieved the noteId from savedInstanceState
+        if (!TextUtils.isEmpty(restoredNoteId)) {
+            setNote(restoredNoteId)
+            reloadNoteBlocks()
+            restoredNoteId = null
+        }
+        if (note == null) {
+            showErrorToastAndFinish()
+        }
+
+        val confetti: LottieAnimationView = requireActivity().findViewById(R.id.confetti)
+        if (note?.isViewMilestoneType == true && !confettiShown) {
+            confetti.playAnimation()
+            confettiShown = true
+        }
+    }
+
+    override fun onPause() {
+        // Stop the reader comment service if it is running
+        ReaderCommentService.stopService(activity)
+        restoreOriginalViewId(listView)
+        super.onPause()
+    }
+
+    override fun getNote(): Note? {
+        return notification
+    }
+
+    override fun setNote(noteId: String?) {
+        if (noteId == null) {
+            showErrorToastAndFinish()
+            return
+        }
+        val note: Note? = NotificationsTable.getNoteById(noteId)
+        if (note == null) {
+            showErrorToastAndFinish()
+            return
+        }
+        if (noteId != note.id) {
+            confettiShown = false
+        }
+        notification = note
+    }
+
+    private fun showErrorToastAndFinish() {
+        AppLog.e(NOTIFS, "Note could not be found.")
+        activity?.let {
+            ToastUtils.showToast(activity, string.error_notification_open)
+            it.finish()
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        notification?.let {
+            outState.putString(KEY_NOTE_ID, it.id)
+            outState.putInt(KEY_LIST_POSITION, listView.firstVisiblePosition)
+        } ?: run {
+            // This is done so the fragments pre-loaded by the view pager can store the already rescued restoredNoteId
+            if (!TextUtils.isEmpty(restoredNoteId)) {
+                outState.putString(KEY_NOTE_ID, restoredNoteId)
+            }
+        }
+
+        super.onSaveInstanceState(outState)
+    }
+
+    private fun reloadNoteBlocks() {
+        LoadNoteBlocksTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+    }
+
+    fun setFooterView(footerView: ViewGroup?) {
+        this.footerView = footerView
+    }
+
+    private val mOnNoteBlockTextClickListener: OnNoteBlockTextClickListener = object : OnNoteBlockTextClickListener {
+        override fun onNoteBlockTextClicked(clickedSpan: NoteBlockClickableSpan) {
+            if (!isAdded || activity !is NotificationsDetailActivity) {
+                return
+            }
+            handleNoteBlockSpanClick(activity as NotificationsDetailActivity, clickedSpan)
+        }
+
+        override fun showDetailForNoteIds() {
+            if (!isAdded || notification == null || activity !is NotificationsDetailActivity) {
+                return
+            }
+            val detailActivity = activity as NotificationsDetailActivity
+
+            requireNotNull(notification).let { note ->
+                if (note.isCommentReplyType || !note.isCommentType && note.commentId > 0) {
+                    val commentId = if (note.isCommentReplyType) note.parentCommentId else note.commentId
+
+                    // show comments list if it exists in the reader
+                    if (ReaderUtils.postAndCommentExists(note.siteId.toLong(), note.postId.toLong(), commentId)) {
+                        detailActivity.showReaderCommentsList(note.siteId.toLong(), note.postId.toLong(), commentId)
+                    } else {
+                        detailActivity.showWebViewActivityForUrl(note.url)
+                    }
+                } else if (note.isFollowType) {
+                    detailActivity.showBlogPreviewActivity(note.siteId.toLong(), note.isFollowType)
+                } else {
+                    // otherwise, load the post in the Reader
+                    detailActivity.showPostActivity(note.siteId.toLong(), note.postId.toLong())
+                }
+            }
+        }
+
+        override fun showReaderPostComments() {
+            if (!isAdded || notification == null || notification!!.commentId == 0L) {
+                return
+            }
+
+            requireNotNull(notification).let { note ->
+                ReaderActivityLauncher.showReaderComments(
+                        activity, note.siteId.toLong(), note.postId.toLong(),
+                        note.commentId
+                )
+            }
+        }
+
+        override fun showSitePreview(siteId: Long, siteUrl: String) {
+            if (!isAdded || notification == null || activity !is NotificationsDetailActivity) {
+                return
+            }
+            val detailActivity = activity as NotificationsDetailActivity
+            if (siteId != 0L) {
+                detailActivity.showBlogPreviewActivity(siteId, note?.isFollowType)
+            } else if (!TextUtils.isEmpty(siteUrl)) {
+                detailActivity.showWebViewActivityForUrl(siteUrl)
+            }
+        }
+
+        fun handleNoteBlockSpanClick(
+            activity: NotificationsDetailActivity,
+            clickedSpan: NoteBlockClickableSpan
+        ) {
+            when (clickedSpan.rangeType) {
+                SITE ->
+                    // Show blog preview
+                    activity.showBlogPreviewActivity(clickedSpan.id, note?.isFollowType)
+                USER ->
+                    // Show blog preview
+                    activity.showBlogPreviewActivity(clickedSpan.siteId, note?.isFollowType)
+                POST ->
+                    // Show post detail
+                    activity.showPostActivity(clickedSpan.siteId, clickedSpan.id)
+                COMMENT ->
+                    // Load the comment in the reader list if it exists, otherwise show a webview
+                    if (ReaderUtils.postAndCommentExists(
+                                    clickedSpan.siteId, clickedSpan.postId,
+                                    clickedSpan.id
+                            )) {
+                        activity.showReaderCommentsList(
+                                clickedSpan.siteId, clickedSpan.postId,
+                                clickedSpan.id
+                        )
+                    } else {
+                        activity.showWebViewActivityForUrl(clickedSpan.url)
+                    }
+                SCAN -> activity.showScanActivityForSite(clickedSpan.siteId)
+                STAT, FOLLOW ->
+                    // We can open native stats if the site is a wpcom or Jetpack sites
+                    activity.showStatsActivityForSite(clickedSpan.siteId, clickedSpan.rangeType)
+                LIKE -> if (ReaderPostTable.postExists(clickedSpan.siteId, clickedSpan.id)) {
+                    activity.showReaderPostLikeUsers(clickedSpan.siteId, clickedSpan.id)
+                } else {
+                    activity.showPostActivity(clickedSpan.siteId, clickedSpan.id)
+                }
+                REWIND_DOWNLOAD_READY -> activity.showBackupForSite(clickedSpan.siteId)
+                else ->
+                    // We don't know what type of id this is, let's see if it has a URL and push a webview
+                    if (!TextUtils.isEmpty(clickedSpan.url)) {
+                        activity.showWebViewActivityForUrl(clickedSpan.url)
+                    }
+            }
+        }
+    }
+    private val mOnGravatarClickedListener = OnGravatarClickedListener { siteId, userId, siteUrl ->
+        if (!isAdded || activity !is NotificationsDetailActivity) {
+            return@OnGravatarClickedListener
+        }
+        val detailActivity = activity as NotificationsDetailActivity
+        if (siteId == 0L && !TextUtils.isEmpty(siteUrl)) {
+            detailActivity.showWebViewActivityForUrl(siteUrl)
+        } else if (siteId != 0L) {
+            detailActivity.showBlogPreviewActivity(siteId, note?.isFollowType)
+        }
+    }
+
+    private data class ManageUserBlockResults(val index: Int, val noteBlock: NoteBlock, val pingbackUrl: String?)
+
+    // Loop through the 'body' items in this note, and create blocks for each.
+    // TODO replace this inner async task with a coroutine
+    @SuppressLint("StaticFieldLeak")
+    private inner class LoadNoteBlocksTask : AsyncTask<Void, Void, List<NoteBlock>?>() {
+        private var mIsBadgeView = false
+
+        private fun addHeaderNoteBlock(note: Note, noteList: MutableList<NoteBlock>) {
+            val imageType = if (note.isFollowType) BLAVATAR else AVATAR_WITH_BACKGROUND
+            val headerNoteBlock = HeaderNoteBlock(
+                    activity,
+                    listScenarioUtils.transformToFormattableContentList(note.header),
+                    imageType,
+                    mOnNoteBlockTextClickListener,
+                    mOnGravatarClickedListener,
+                    imageManager,
+                    notificationsUtilsWrapper
+            )
+            headerNoteBlock.setIsComment(note.isCommentType)
+            noteList.add(headerNoteBlock)
+        }
+
+        private fun manageUserBlock(
+            note: Note,
+            bodyArray: JSONArray,
+            listSize: Int,
+            initialIndex: Int,
+            noteObject: FormattableContent
+        ): ManageUserBlockResults {
+            var index = initialIndex
+            var noteBlock: NoteBlock
+            var pingbackUrl: String? = null
+            if (note.isCommentType) {
+                // Set comment position so we can target it later
+                // See refreshBlocksForCommentStatus()
+                commentListPosition = index + listSize
+                var commentTextBlock: FormattableContent? = null
+                // Next item in the bodyArray is comment text
+                if (index + 1 < bodyArray.length()) {
+                    commentTextBlock = notificationsUtilsWrapper
+                            .mapJsonToFormattableContent(bodyArray.getJSONObject(index + 1))
+                    index++
+                }
+                noteBlock = CommentUserNoteBlock(
+                        activity,
+                        noteObject,
+                        commentTextBlock,
+                        note.timestamp,
+                        mOnNoteBlockTextClickListener,
+                        mOnGravatarClickedListener,
+                        imageManager,
+                        notificationsUtilsWrapper
+                )
+                pingbackUrl = noteBlock.metaSiteUrl
+
+                // Set listener for comment status changes, so we can update bg and text colors
+                val commentUserNoteBlock: CommentUserNoteBlock = noteBlock
+                onCommentStatusChangeListener = commentUserNoteBlock.onCommentChangeListener
+                commentUserNoteBlock.setCommentStatus(note.commentStatus)
+                commentUserNoteBlock.configureResources(activity)
+            } else {
+                noteBlock = UserNoteBlock(
+                        activity,
+                        noteObject,
+                        mOnNoteBlockTextClickListener,
+                        mOnGravatarClickedListener,
+                        imageManager,
+                        notificationsUtilsWrapper
+                )
+            }
+
+            return ManageUserBlockResults(index, noteBlock, pingbackUrl)
+        }
+
+        private fun addNotesBlock(
+            note: Note,
+            noteList: MutableList<NoteBlock>,
+            bodyArray: JSONArray,
+            isPingback: Boolean
+        ): String? {
+            var pingbackUrl: String? = null
+            var i = 0
+            while (i < bodyArray.length()) {
+                try {
+                    val noteObject = notificationsUtilsWrapper
+                            .mapJsonToFormattableContent(bodyArray.getJSONObject(i))
+
+                    // Determine NoteBlock type and add it to the array
+                    var noteBlock: NoteBlock
+
+                    if (BlockType.fromString(noteObject.type) == BlockType.USER) {
+                        val manageUserBlockResults = manageUserBlock(note, bodyArray, noteList.size, i, noteObject)
+                        i = manageUserBlockResults.index
+                        noteBlock = manageUserBlockResults.noteBlock
+                        pingbackUrl = manageUserBlockResults.pingbackUrl
+                    } else if (isFooterBlock(noteObject)) {
+                        noteBlock = FooterNoteBlock(
+                                noteObject, imageManager, notificationsUtilsWrapper,
+                                mOnNoteBlockTextClickListener
+                        ).also {
+                            if (noteObject.ranges != null && noteObject.ranges!!.isNotEmpty()) {
+                                val range = noteObject.ranges!![noteObject.ranges!!.size - 1]
+                                it.setClickableSpan(range, note.type)
+                            }
+                        }
+                    } else {
+                        noteBlock = NoteBlock(
+                                noteObject, imageManager, notificationsUtilsWrapper,
+                                mOnNoteBlockTextClickListener
+                        )
+                    }
+
+                    // Badge notifications apply different colors and formatting
+                    if (isAdded && noteBlock.containsBadgeMediaType()) {
+                        mIsBadgeView = true
+                    }
+                    if (mIsBadgeView) {
+                        noteBlock.setIsBadge()
+                    }
+                    if (note.isViewMilestoneType) {
+                        noteBlock.setIsViewMilestone()
+                    }
+                    if (isPingback) {
+                        noteBlock.setIsPingback()
+                    }
+                    noteList.add(noteBlock)
+                } catch (e: JSONException) {
+                    AppLog.e(NOTIFS, "Invalid note data, could not parse.")
+                }
+                i++
+            }
+
+            return pingbackUrl
+        }
+
+        override fun doInBackground(vararg params: Void): List<NoteBlock>? {
+            if (notification == null) {
+                return null
+            }
+            requestReaderContentForNote()
+
+            requireNotNull(notification).let { note ->
+                val bodyArray = note.body
+                val noteList: MutableList<NoteBlock> = ArrayList()
+
+                // Add the note header if one was provided
+                if (note.header != null) {
+                    addHeaderNoteBlock(note, noteList)
+                }
+                var pingbackUrl: String? = null
+                val isPingback = isPingback(note)
+                if (bodyArray != null && bodyArray.length() > 0) {
+                    pingbackUrl = addNotesBlock(note, noteList, bodyArray, isPingback)
+                }
+                if (isPingback) {
+                    // Remove this when we start receiving "Read the source post block" from the backend
+                    val generatedBlock = buildGeneratedLinkBlock(
+                            mOnNoteBlockTextClickListener, pingbackUrl,
+                            activity!!.getString(string.comment_read_source_post)
+                    )
+                    generatedBlock.setIsPingback()
+                    noteList.add(generatedBlock)
+                }
+                return noteList
+            }
+        }
+
+        private fun isPingback(note: Note): Boolean {
+            var hasRangeOfTypeSite = false
+            var hasRangeOfTypePost = false
+            val rangesArray = note.subject.optJSONArray("ranges")
+            if (rangesArray != null) {
+                for (i in 0 until rangesArray.length()) {
+                    val rangeObject = rangesArray.optJSONObject(i) ?: continue
+                    if ("site" == rangeObject.optString("type")) {
+                        hasRangeOfTypeSite = true
+                    } else if ("post" == rangeObject.optString("type")) {
+                        hasRangeOfTypePost = true
+                    }
+                }
+            }
+            return hasRangeOfTypePost && hasRangeOfTypeSite
+        }
+
+        private fun buildGeneratedLinkBlock(
+            onNoteBlockTextClickListener: OnNoteBlockTextClickListener,
+            pingbackUrl: String?,
+            message: String
+        ): NoteBlock {
+            return GeneratedNoteBlock(
+                    message,
+                    imageManager,
+                    notificationsUtilsWrapper,
+                    onNoteBlockTextClickListener,
+                    pingbackUrl!!
+            )
+        }
+
+        override fun onPostExecute(noteList: List<NoteBlock>?) {
+            if (!isAdded || noteList == null) {
+                return
+            }
+            if (mIsBadgeView) {
+                rootLayout!!.gravity = Gravity.CENTER_VERTICAL
+            }
+            if (noteBlockAdapter == null) {
+                noteBlockAdapter = NoteBlockAdapter(activity, noteList)
+                listAdapter = noteBlockAdapter
+            } else {
+                noteBlockAdapter!!.setNoteList(noteList)
+            }
+            if (restoredListPosition > 0) {
+                listView.setSelectionFromTop(restoredListPosition, 0)
+                restoredListPosition = 0
+            }
+        }
+    }
+
+    private fun isFooterBlock(blockObject: FormattableContent?): Boolean {
+        if (notification == null || blockObject == null) {
+            return false
+        }
+
+        return requireNotNull(notification).let { note ->
+            if (note.isCommentType) {
+                val commentReplyId = blockObject.getRangeIdOrZero(1)
+                // Check if this is a comment notification that has been replied to
+                // The block will not have a type, and its id will match the comment reply id in the Note.
+                (blockObject.type == null && note.commentReplyId == commentReplyId)
+            } else if (note.isFollowType || note.isLikeType || note.isReblogType) {
+                // User list notifications have a footer if they have 10 or more users in the body
+                // The last block will not have a type, so we can use that to determine if it is the footer
+                blockObject.type == null
+            } else {
+                false
+            }
+        }
+    }
+
+    fun refreshBlocksForCommentStatus(newStatus: CommentStatus) {
+        onCommentStatusChangeListener?.let { listener ->
+            listener.onCommentStatusChanged(newStatus)
+            val listView: ListView? = listView
+            if (listView == null || commentListPosition == ListView.INVALID_POSITION) {
+                return
+            }
+
+            // Redraw the comment row if it is visible so that the background and text colors update
+            // See: http://stackoverflow.com/questions/4075975/redraw-a-single-row-in-a-listview/9987616#9987616
+            val firstPosition = listView.firstVisiblePosition
+            val endPosition = listView.lastVisiblePosition
+            for (i in firstPosition until endPosition) {
+                if (commentListPosition == i) {
+                    val view = listView.getChildAt(i - firstPosition)
+                    listView.adapter.getView(i, view, listView)
+                    break
+                }
+            }
+        }
+    }
+
+    // Requests Reader content for certain notification types
+    private fun requestReaderContentForNote() {
+        if (notification == null || !isAdded) {
+            return
+        }
+
+        // Request the reader post so that loading reader activities will work.
+        if (notification!!.isUserList && !ReaderPostTable.postExists(
+                        notification!!.siteId.toLong(),
+                        notification!!.postId.toLong()
+                )) {
+            ReaderPostActions.requestBlogPost(notification!!.siteId.toLong(), notification!!.postId.toLong(), null)
+        }
+
+        requireNotNull(notification).let { note ->
+            // Request reader comments until we retrieve the comment for this note
+            val isReplyOrCommentLike = note.isCommentLikeType || note.isCommentReplyType || note.isCommentWithUserReply
+            val commentNotExists = !ReaderCommentTable.commentExists(
+                    note.siteId.toLong(),
+                    note.postId.toLong(),
+                    note.commentId
+            )
+
+            if (isReplyOrCommentLike && commentNotExists) {
+                ReaderCommentService.startServiceForComment(
+                        activity,
+                        note.siteId.toLong(),
+                        note.postId.toLong(),
+                        note.commentId
+                )
+            }
+        }
+    }
+
+    companion object {
+        private const val KEY_NOTE_ID = "noteId"
+        private const val KEY_LIST_POSITION = "listPosition"
+
+        @JvmStatic
+        fun newInstance(noteId: String?): NotificationsDetailListFragment {
+            val fragment = NotificationsDetailListFragment()
+            fragment.setNote(noteId)
+            return fragment
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
index 78e2a2d5256d..7b85df41459f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragment.kt
@@ -6,12 +6,10 @@ import android.os.Bundle
 import android.os.Parcelable
 import android.text.Html
 import android.text.TextUtils
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -19,13 +17,13 @@ import androidx.fragment.app.FragmentPagerAdapter
 import com.google.android.material.appbar.AppBarLayout.LayoutParams
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayout.Tab
-import kotlinx.android.synthetic.main.notifications_list_fragment.*
 import org.greenrobot.eventbus.EventBus
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.NOTIFICATIONS_SELECTED_FILTER
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.NOTIFICATION_TAPPED_SEGMENTED_CONTROL
+import org.wordpress.android.databinding.NotificationsListFragmentBinding
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.JetpackConnectionSource.NOTIFICATIONS
@@ -52,16 +50,18 @@ import org.wordpress.android.util.setLiftOnScrollTargetViewIdAndRequestLayout
 import java.util.HashMap
 import javax.inject.Inject
 
-class NotificationsListFragment : Fragment(), ScrollableViewInitializedListener {
+class NotificationsListFragment : Fragment(R.layout.notifications_list_fragment), ScrollableViewInitializedListener {
     private var shouldRefreshNotifications = false
     private var lastTabPosition = 0
 
     @Inject lateinit var accountStore: AccountStore
 
+    private var binding: NotificationsListFragmentBinding? = null
+
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         if (savedInstanceState != null) {
-            setSelectedTab(savedInstanceState.getInt(KEY_LAST_TAB_POSITION, TAB_POSITION_ALL))
+            binding?.setSelectedTab(savedInstanceState.getInt(KEY_LAST_TAB_POSITION, TAB_POSITION_ALL))
         }
     }
 
@@ -71,46 +71,44 @@ class NotificationsListFragment : Fragment(), ScrollableViewInitializedListener
         shouldRefreshNotifications = true
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.notifications_list_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setHasOptionsMenu(true)
-        toolbar_main.setTitle(R.string.notifications_screen_title)
-        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar_main)
+        binding = NotificationsListFragmentBinding.bind(view).apply {
+            toolbarMain.setTitle(R.string.notifications_screen_title)
+            (requireActivity() as AppCompatActivity).setSupportActionBar(toolbarMain)
 
-        tab_layout.addOnTabSelectedListener(object : OnTabSelectedListener {
-            override fun onTabSelected(tab: Tab) {
-                val properties: MutableMap<String, String?> = HashMap(1)
-                when (tab.position) {
-                    TAB_POSITION_ALL -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_ALL.toString()
-                    TAB_POSITION_COMMENT -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_COMMENT.toString()
-                    TAB_POSITION_FOLLOW -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_FOLLOW.toString()
-                    TAB_POSITION_LIKE -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_LIKE.toString()
-                    TAB_POSITION_UNREAD -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_UNREAD.toString()
-                    else -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_ALL.toString()
+            tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
+                override fun onTabSelected(tab: Tab) {
+                    val properties: MutableMap<String, String?> = HashMap(1)
+                    when (tab.position) {
+                        TAB_POSITION_ALL -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_ALL.toString()
+                        TAB_POSITION_COMMENT -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_COMMENT.toString()
+                        TAB_POSITION_FOLLOW -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_FOLLOW.toString()
+                        TAB_POSITION_LIKE -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_LIKE.toString()
+                        TAB_POSITION_UNREAD -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_UNREAD.toString()
+                        else -> properties[NOTIFICATIONS_SELECTED_FILTER] = FILTER_ALL.toString()
+                    }
+                    AnalyticsTracker.track(NOTIFICATION_TAPPED_SEGMENTED_CONTROL, properties)
+                    lastTabPosition = tab.position
                 }
-                AnalyticsTracker.track(NOTIFICATION_TAPPED_SEGMENTED_CONTROL, properties)
-                lastTabPosition = tab.position
-            }
 
-            override fun onTabUnselected(tab: Tab) {}
-            override fun onTabReselected(tab: Tab) {}
-        })
-        view_pager.adapter = NotificationsFragmentAdapter(childFragmentManager, buildTitles())
-        view_pager.pageMargin = resources.getDimensionPixelSize(R.dimen.margin_extra_large)
-        tab_layout.setupWithViewPager(view_pager)
+                override fun onTabUnselected(tab: Tab) {}
+                override fun onTabReselected(tab: Tab) {}
+            })
+            viewPager.adapter = NotificationsFragmentAdapter(childFragmentManager, buildTitles())
+            viewPager.pageMargin = resources.getDimensionPixelSize(R.dimen.margin_extra_large)
+            tabLayout.setupWithViewPager(viewPager)
 
-        jetpack_terms_and_conditions.text = Html.fromHtml(
-                String.format(resources.getString(R.string.jetpack_connection_terms_and_conditions), "<u>", "</u>")
-        )
-        jetpack_terms_and_conditions.setOnClickListener {
-            WPWebViewActivity.openURL(requireContext(), WPUrlUtils.buildTermsOfServiceUrl(context))
-        }
-        jetpack_faq.setOnClickListener {
-            WPWebViewActivity.openURL(requireContext(), StatsConnectJetpackActivity.FAQ_URL)
+            jetpackTermsAndConditions.text = Html.fromHtml(
+                    String.format(resources.getString(R.string.jetpack_connection_terms_and_conditions), "<u>", "</u>")
+            )
+            jetpackTermsAndConditions.setOnClickListener {
+                WPWebViewActivity.openURL(requireContext(), WPUrlUtils.buildTermsOfServiceUrl(context))
+            }
+            jetpackFaq.setOnClickListener {
+                WPWebViewActivity.openURL(requireContext(), StatsConnectJetpackActivity.FAQ_URL)
+            }
         }
     }
 
@@ -129,23 +127,30 @@ class NotificationsListFragment : Fragment(), ScrollableViewInitializedListener
         shouldRefreshNotifications = true
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
+    }
+
     override fun onResume() {
         super.onResume()
         EventBus.getDefault().post(NotificationsUnseenStatus(false))
-        if (!accountStore.hasAccessToken()) {
-            showConnectJetpackView()
-            connect_jetpack.visibility = View.VISIBLE
-            tab_layout.visibility = View.GONE
-            view_pager.visibility = View.GONE
-        } else {
-            connect_jetpack.visibility = View.GONE
-            tab_layout.visibility = View.VISIBLE
-            view_pager.visibility = View.VISIBLE
-            if (shouldRefreshNotifications) {
-                fetchNotesFromRemote()
+        binding?.apply {
+            if (!accountStore.hasAccessToken()) {
+                showConnectJetpackView()
+                connectJetpack.visibility = View.VISIBLE
+                tabLayout.visibility = View.GONE
+                viewPager.visibility = View.GONE
+            } else {
+                connectJetpack.visibility = View.GONE
+                tabLayout.visibility = View.VISIBLE
+                viewPager.visibility = View.VISIBLE
+                if (shouldRefreshNotifications) {
+                    fetchNotesFromRemote()
+                }
             }
+            setSelectedTab(lastTabPosition)
         }
-        setSelectedTab(lastTabPosition)
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -153,9 +158,9 @@ class NotificationsListFragment : Fragment(), ScrollableViewInitializedListener
         super.onSaveInstanceState(outState)
     }
 
-    private fun clearToolbarScrollFlags() {
-        if (toolbar_main.layoutParams is LayoutParams) {
-            val params = toolbar_main.layoutParams as LayoutParams
+    private fun NotificationsListFragmentBinding.clearToolbarScrollFlags() {
+        if (toolbarMain.layoutParams is LayoutParams) {
+            val params = toolbarMain.layoutParams as LayoutParams
             params.scrollFlags = 0
         }
     }
@@ -167,20 +172,20 @@ class NotificationsListFragment : Fragment(), ScrollableViewInitializedListener
         NotificationsUpdateServiceStarter.startService(activity)
     }
 
-    private fun setSelectedTab(position: Int) {
+    private fun NotificationsListFragmentBinding.setSelectedTab(position: Int) {
         lastTabPosition = position
-        tab_layout.getTabAt(lastTabPosition)?.select()
+        tabLayout.getTabAt(lastTabPosition)?.select()
     }
 
-    private fun showConnectJetpackView() {
+    private fun NotificationsListFragmentBinding.showConnectJetpackView() {
         clearToolbarScrollFlags()
-        jetpack_setup.setOnClickListener {
+        jetpackSetup.setOnClickListener {
             val siteModel = (requireActivity() as? WPMainActivity)?.selectedSite
             JetpackConnectionWebViewActivity.startJetpackConnectionFlow(activity, NOTIFICATIONS, siteModel, false)
         }
     }
 
-    private class NotificationsFragmentAdapter internal constructor(
+    private class NotificationsFragmentAdapter(
         fragmentManager: FragmentManager,
         private val titles: List<String>
     ) : FragmentPagerAdapter(fragmentManager, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
@@ -281,6 +286,6 @@ class NotificationsListFragment : Fragment(), ScrollableViewInitializedListener
     }
 
     override fun onScrollableViewInitialized(containerId: Int) {
-        app_bar.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
+        binding?.appBar?.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
index fd867d60f60e..d8728883018b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsListFragmentPage.kt
@@ -4,9 +4,7 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.animation.Animation
 import android.view.animation.Animation.AnimationListener
 import androidx.annotation.StringRes
@@ -14,13 +12,14 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.OnScrollListener
-import kotlinx.android.synthetic.main.notifications_list_fragment_page.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode.MAIN
+import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.APP_REVIEWS_EVENT_INCREMENTED_BY_CHECKING_NOTIFICATION
+import org.wordpress.android.databinding.NotificationsListFragmentPageBinding
 import org.wordpress.android.datasets.NotificationsTable
 import org.wordpress.android.fluxc.model.CommentStatus
 import org.wordpress.android.fluxc.model.SiteModel
@@ -57,7 +56,9 @@ import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import org.wordpress.android.widgets.AppRatingDialog.incrementInteractions
 import javax.inject.Inject
 
-class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener, DataLoadedListener {
+class NotificationsListFragmentPage : ViewPagerFragment(R.layout.notifications_list_fragment_page),
+        OnScrollToTopListener,
+        DataLoadedListener {
     private var notesAdapter: NotesAdapter? = null
     private var swipeToRefreshHelper: SwipeToRefreshHelper? = null
     private var isAnimatingOutNewNotificationsBar = false
@@ -69,10 +70,12 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
 
     private val showNewUnseenNotificationsRunnable = Runnable {
         if (isAdded) {
-            notifications_list.addOnScrollListener(mOnScrollListener)
+            binding?.notificationsList?.addOnScrollListener(mOnScrollListener)
         }
     }
 
+    private var binding: NotificationsListFragmentPageBinding? = null
+
     interface OnNoteClickListener {
         fun onClickNote(noteId: String?)
     }
@@ -80,7 +83,7 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         val adapter = createOrGetNotesAdapter()
-        notifications_list.adapter = adapter
+        binding?.notificationsList?.adapter = adapter
         if (savedInstanceState != null) {
             tabPosition = savedInstanceState.getInt(KEY_TAB_POSITION, NotificationsListFragment.TAB_POSITION_ALL)
         }
@@ -113,30 +116,29 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
         shouldRefreshNotifications = true
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.notifications_list_fragment_page, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         arguments?.let {
             tabPosition = it.getInt(KEY_TAB_POSITION, NotificationsListFragment.TAB_POSITION_ALL)
         }
-        notifications_list.layoutManager = LinearLayoutManager(activity)
-        swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(notifications_refresh) {
-            hideNewNotificationsBar()
-            fetchNotesFromRemote()
+        binding = NotificationsListFragmentPageBinding.bind(view).apply {
+            notificationsList.layoutManager = LinearLayoutManager(activity)
+            swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(notificationsRefresh) {
+                hideNewNotificationsBar()
+                fetchNotesFromRemote()
+            }
+            layoutNewNotificatons.visibility = View.GONE
+            layoutNewNotificatons.setOnClickListener { onScrollToTop() }
         }
-        layout_new_notificatons.visibility = View.GONE
-        layout_new_notificatons.setOnClickListener { onScrollToTop() }
     }
 
     override fun onDestroyView() {
         notesAdapter!!.cancelReloadNotesTask()
         swipeToRefreshHelper = null
-        notifications_list.adapter = null
-        notifications_list.removeCallbacks(showNewUnseenNotificationsRunnable)
+        binding?.notificationsList?.adapter = null
+        binding?.notificationsList?.removeCallbacks(showNewUnseenNotificationsRunnable)
         notesAdapter = null
+        binding = null
         super.onDestroyView()
     }
 
@@ -145,10 +147,12 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
             AppLog.d(T.NOTIFS,
                     "NotificationsListFragmentPage.onDataLoaded occurred when fragment is not attached.")
         }
-        if (itemsCount > 0) {
-            hideEmptyView()
-        } else {
-            showEmptyViewForCurrentFilter()
+        binding?.apply {
+            if (itemsCount > 0) {
+                hideEmptyView()
+            } else {
+                showEmptyViewForCurrentFilter()
+            }
         }
     }
 
@@ -158,12 +162,12 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
     }
 
     override fun getScrollableViewForUniqueIdProvision(): View? {
-        return notifications_list
+        return binding?.notificationsList
     }
 
     override fun onResume() {
         super.onResume()
-        hideNewNotificationsBar()
+        binding?.hideNewNotificationsBar()
         EventBus.getDefault().post(NotificationsUnseenStatus(false))
         if (accountStore.hasAccessToken()) {
             notesAdapter!!.reloadNotesFromDBAsync()
@@ -182,10 +186,12 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
         if (!isAdded) {
             return
         }
-        clearPendingNotificationsItemsOnUI()
-        val layoutManager = notifications_list.layoutManager as LinearLayoutManager
-        if (layoutManager.findFirstCompletelyVisibleItemPosition() > 0) {
-            layoutManager.smoothScrollToPosition(notifications_list, null, 0)
+        binding?.apply {
+            clearPendingNotificationsItemsOnUI()
+            val layoutManager = notificationsList.layoutManager as LinearLayoutManager
+            if (layoutManager.findFirstCompletelyVisibleItemPosition() > 0) {
+                layoutManager.smoothScrollToPosition(notificationsList, null, 0)
+            }
         }
     }
 
@@ -217,16 +223,16 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
     private val mOnScrollListener: OnScrollListener = object : OnScrollListener() {
         override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
             super.onScrolled(recyclerView, dx, dy)
-            notifications_list.removeOnScrollListener(this)
-            clearPendingNotificationsItemsOnUI()
+            binding?.notificationsList?.removeOnScrollListener(this)
+            binding?.clearPendingNotificationsItemsOnUI()
         }
     }
 
-    private fun clearPendingNotificationsItemsOnUI() {
+    private fun NotificationsListFragmentPageBinding.clearPendingNotificationsItemsOnUI() {
         hideNewNotificationsBar()
         EventBus.getDefault().post(NotificationsUnseenStatus(false))
         NotificationsActions.updateNotesSeenTimestamp()
-        Thread(Runnable { gcmMessageHandler.removeAllNotifications(activity) }).start()
+        Thread { gcmMessageHandler.removeAllNotifications(activity) }.start()
     }
 
     private fun fetchNotesFromRemote() {
@@ -243,14 +249,14 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
     val selectedSite: SiteModel?
         get() = (activity as? WPMainActivity)?.selectedSite
 
-    private fun hideEmptyView() {
+    private fun NotificationsListFragmentPageBinding.hideEmptyView() {
         if (isAdded) {
-            actionable_empty_view.visibility = View.GONE
-            notifications_list.visibility = View.VISIBLE
+            actionableEmptyView.visibility = View.GONE
+            notificationsList.visibility = View.VISIBLE
         }
     }
 
-    private fun hideNewNotificationsBar() {
+    private fun NotificationsListFragmentPageBinding.hideNewNotificationsBar() {
         if (!isAdded || !isNewNotificationsBarShowing || isAnimatingOutNewNotificationsBar) {
             return
         }
@@ -259,18 +265,18 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
             override fun onAnimationStart(animation: Animation) {}
             override fun onAnimationEnd(animation: Animation) {
                 if (isAdded) {
-                    layout_new_notificatons.visibility = View.GONE
+                    layoutNewNotificatons.visibility = View.GONE
                     isAnimatingOutNewNotificationsBar = false
                 }
             }
 
             override fun onAnimationRepeat(animation: Animation) {}
         }
-        AniUtils.startAnimation(layout_new_notificatons, R.anim.notifications_bottom_bar_out, listener)
+        AniUtils.startAnimation(layoutNewNotificatons, R.anim.notifications_bottom_bar_out, listener)
     }
 
     private val isNewNotificationsBarShowing: Boolean
-        get() = layout_new_notificatons != null && layout_new_notificatons.visibility == View.VISIBLE
+        get() = binding?.layoutNewNotificatons?.visibility == View.VISIBLE
 
     private fun performActionForActiveFilter() {
         if (!isAdded) {
@@ -287,89 +293,97 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
         }
     }
 
-    private fun showEmptyView(
+    private fun NotificationsListFragmentPageBinding.showEmptyView(
         @StringRes titleResId: Int,
         @StringRes descriptionResId: Int = 0,
         @StringRes buttonResId: Int = 0
     ) {
         if (isAdded) {
-            actionable_empty_view.visibility = View.VISIBLE
-            notifications_list.visibility = View.GONE
-            actionable_empty_view.title.setText(titleResId)
+            actionableEmptyView.visibility = View.VISIBLE
+            notificationsList.visibility = View.GONE
+            actionableEmptyView.title.setText(titleResId)
             if (descriptionResId != 0) {
-                actionable_empty_view.subtitle.setText(descriptionResId)
-                actionable_empty_view.subtitle.visibility = View.VISIBLE
+                actionableEmptyView.subtitle.setText(descriptionResId)
+                actionableEmptyView.subtitle.visibility = View.VISIBLE
             } else {
-                actionable_empty_view.subtitle.visibility = View.GONE
+                actionableEmptyView.subtitle.visibility = View.GONE
             }
             if (buttonResId != 0) {
-                actionable_empty_view.button.setText(buttonResId)
-                actionable_empty_view.button.visibility = View.VISIBLE
+                actionableEmptyView.button.setText(buttonResId)
+                actionableEmptyView.button.visibility = View.VISIBLE
             } else {
-                actionable_empty_view.button.visibility = View.GONE
+                actionableEmptyView.button.visibility = View.GONE
             }
-            actionable_empty_view.button.setOnClickListener { performActionForActiveFilter() }
+            actionableEmptyView.button.setOnClickListener { performActionForActiveFilter() }
         }
     }
 
     // Show different empty view message and action button based on selected tab.
-    private fun showEmptyViewForCurrentFilter() {
+    private fun NotificationsListFragmentPageBinding.showEmptyViewForCurrentFilter() {
         if (!accountStore.hasAccessToken()) {
             return
         }
+        val titleResId: Int
+        var descriptionResId = 0
+        var buttonResId = 0
         when (tabPosition) {
-            NotificationsListFragment.TAB_POSITION_ALL -> showEmptyView(
-                    R.string.notifications_empty_all,
-                    R.string.notifications_empty_action_all,
-                    R.string.notifications_empty_view_reader
-            )
-            NotificationsListFragment.TAB_POSITION_COMMENT -> showEmptyView(
-                    R.string.notifications_empty_comments,
-                    R.string.notifications_empty_action_comments,
-                    R.string.notifications_empty_view_reader
-            )
-            NotificationsListFragment.TAB_POSITION_FOLLOW -> showEmptyView(
-                    R.string.notifications_empty_followers,
-                    R.string.notifications_empty_action_followers_likes,
-                    R.string.notifications_empty_view_reader
-            )
-            NotificationsListFragment.TAB_POSITION_LIKE -> showEmptyView(
-                    R.string.notifications_empty_likes,
-                    R.string.notifications_empty_action_followers_likes,
-                    R.string.notifications_empty_view_reader
-            )
-            NotificationsListFragment.TAB_POSITION_UNREAD -> if (selectedSite == null) {
-                showEmptyView(R.string.notifications_empty_unread)
-            } else {
-                showEmptyView(
-                        R.string.notifications_empty_unread,
-                        R.string.notifications_empty_action_unread,
-                        R.string.posts_empty_list_button
-                )
+            NotificationsListFragment.TAB_POSITION_ALL -> {
+                titleResId = R.string.notifications_empty_all
+                descriptionResId = R.string.notifications_empty_action_all
+                buttonResId = R.string.notifications_empty_view_reader
+            }
+            NotificationsListFragment.TAB_POSITION_COMMENT -> {
+                titleResId = R.string.notifications_empty_comments
+                descriptionResId = R.string.notifications_empty_action_comments
+                buttonResId = R.string.notifications_empty_view_reader
+            }
+            NotificationsListFragment.TAB_POSITION_FOLLOW -> {
+                titleResId = R.string.notifications_empty_followers
+                descriptionResId = R.string.notifications_empty_action_followers_likes
+                buttonResId = R.string.notifications_empty_view_reader
+            }
+            NotificationsListFragment.TAB_POSITION_LIKE -> {
+                titleResId = R.string.notifications_empty_likes
+                descriptionResId = R.string.notifications_empty_action_followers_likes
+                buttonResId = R.string.notifications_empty_view_reader
+            }
+            NotificationsListFragment.TAB_POSITION_UNREAD -> {
+                if (selectedSite == null) {
+                    titleResId = R.string.notifications_empty_unread
+                } else {
+                    titleResId = R.string.notifications_empty_unread
+                    descriptionResId = R.string.notifications_empty_action_unread
+                    buttonResId = R.string.posts_empty_list_button
+                }
             }
-            else -> showEmptyView(R.string.notifications_empty_list)
+            else -> titleResId = R.string.notifications_empty_list
+        }
+        if (BuildConfig.IS_JETPACK_APP) {
+            showEmptyView(titleResId)
+        } else {
+            showEmptyView(titleResId, descriptionResId, buttonResId)
         }
-        actionable_empty_view.image.visibility = if (DisplayUtils.isLandscape(context)) View.GONE else View.VISIBLE
+        actionableEmptyView.image.visibility = if (DisplayUtils.isLandscape(context)) View.GONE else View.VISIBLE
     }
 
-    private fun showNewNotificationsBar() {
+    private fun NotificationsListFragmentPageBinding.showNewNotificationsBar() {
         if (!isAdded || isNewNotificationsBarShowing) {
             return
         }
-        AniUtils.startAnimation(layout_new_notificatons, R.anim.notifications_bottom_bar_in)
-        layout_new_notificatons.visibility = View.VISIBLE
+        AniUtils.startAnimation(layoutNewNotificatons, R.anim.notifications_bottom_bar_in)
+        layoutNewNotificatons.visibility = View.VISIBLE
     }
 
-    private fun showNewUnseenNotificationsUI() {
-        if (!isAdded || notifications_list.layoutManager == null) {
+    private fun NotificationsListFragmentPageBinding.showNewUnseenNotificationsUI() {
+        if (!isAdded || notificationsList.layoutManager == null) {
             return
         }
-        notifications_list.clearOnScrollListeners()
-        notifications_list.removeCallbacks(showNewUnseenNotificationsRunnable)
-        notifications_list.postDelayed(showNewUnseenNotificationsRunnable, 1000L)
-        val first = notifications_list.layoutManager!!.getChildAt(0)
+        notificationsList.clearOnScrollListeners()
+        notificationsList.removeCallbacks(showNewUnseenNotificationsRunnable)
+        notificationsList.postDelayed(showNewUnseenNotificationsRunnable, 1000L)
+        val first = notificationsList.layoutManager!!.getChildAt(0)
         // Show new notifications bar if first item is not visible on the screen.
-        if (first != null && notifications_list.layoutManager!!.getPosition(first) > 0) {
+        if (first != null && notificationsList.layoutManager!!.getPosition(first) > 0) {
             showNewNotificationsBar()
         }
     }
@@ -414,7 +428,7 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
         }
         notesAdapter!!.reloadNotesFromDBAsync()
         if (event.hasUnseenNotes) {
-            showNewUnseenNotificationsUI()
+            binding?.showNewUnseenNotificationsUI()
         }
     }
 
@@ -439,10 +453,12 @@ class NotificationsListFragmentPage : ViewPagerFragment(), OnScrollToTopListener
         if (!isAdded) {
             return
         }
-        if (event.hasUnseenNotes) {
-            showNewUnseenNotificationsUI()
-        } else {
-            hideNewNotificationsBar()
+        binding?.apply {
+            if (event.hasUnseenNotes) {
+                showNewUnseenNotificationsUI()
+            } else {
+                hideNewNotificationsBar()
+            }
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java
index 6be75b11a78b..be27f60b7934 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java
@@ -304,7 +304,7 @@ public void onBindViewHolder(NoteViewHolder noteViewHolder, int position) {
         if (commentStatus == CommentStatus.UNAPPROVED) {
             noteViewHolder.mImgAvatar.setBadgeBackground(R.drawable.bg_oval_warning_dark);
         } else if (isUnread) {
-            noteViewHolder.mImgAvatar.setBadgeBackground(R.drawable.bg_oval_primary);
+            noteViewHolder.mImgAvatar.setBadgeBackground(R.drawable.bg_note_avatar_badge);
         } else {
             noteViewHolder.mImgAvatar.setBadgeBackground(R.drawable.bg_oval_neutral_20);
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java
index 37218e14ceeb..3d4d8b5b0c82 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/HeaderNoteBlock.java
@@ -189,7 +189,7 @@ public boolean onTouch(View v, MotionEvent event) {
         }
     };
 
-    private FormattableContent getHeader(int headerIndex) {
+    public FormattableContent getHeader(int headerIndex) {
         if (mHeadersList != null && headerIndex < mHeadersList.size()) {
             return mHeadersList.get(headerIndex);
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlock.java
index a37aec226dcc..6c92527da847 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlock.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlock.java
@@ -5,9 +5,9 @@
 import android.net.Uri;
 import android.text.Spannable;
 import android.text.TextUtils;
+import android.text.style.TypefaceSpan;
 import android.view.Gravity;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -25,6 +25,7 @@
 import org.wordpress.android.R;
 import org.wordpress.android.fluxc.tools.FormattableContent;
 import org.wordpress.android.fluxc.tools.FormattableMedia;
+import org.wordpress.android.fluxc.tools.FormattableRange;
 import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper;
 import org.wordpress.android.util.AccessibilityUtils;
 import org.wordpress.android.util.AppLog;
@@ -48,6 +49,7 @@ public class NoteBlock {
     private boolean mIsBadge;
     private boolean mIsPingback;
     private boolean mHasAnimatedBadge;
+    private boolean mIsViewMilestone;
 
     public interface OnNoteBlockTextClickListener {
         void onNoteBlockTextClicked(NoteBlockClickableSpan clickedSpan);
@@ -113,6 +115,9 @@ public void setIsBadge() {
         mIsBadge = true;
     }
 
+    public void setIsViewMilestone() {
+        mIsViewMilestone = true;
+    }
 
     public int getLayoutResourceId() {
         return R.layout.note_block_basic;
@@ -199,18 +204,17 @@ public void onResourceReady(@NonNull Drawable resource, @Nullable Object model)
         if (!TextUtils.isEmpty(noteText)) {
             if (isPingBack()) {
                 noteBlockHolder.getTextView().setVisibility(View.GONE);
+                noteBlockHolder.getMaterialButton().setVisibility(View.GONE);
                 noteBlockHolder.getDivider().setVisibility(View.VISIBLE);
                 noteBlockHolder.getButton().setVisibility(View.VISIBLE);
                 noteBlockHolder.getButton().setText(noteText.toString());
-                noteBlockHolder.getButton().setOnClickListener(new OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (getOnNoteBlockTextClickListener() != null) {
-                            getOnNoteBlockTextClickListener().showSitePreview(0, getMetaSiteUrl());
-                        }
+                noteBlockHolder.getButton().setOnClickListener(v -> {
+                    if (getOnNoteBlockTextClickListener() != null) {
+                        getOnNoteBlockTextClickListener().showSitePreview(0, getMetaSiteUrl());
                     }
                 });
             } else {
+                int textViewVisibility = View.VISIBLE;
                 if (mIsBadge) {
                     LinearLayout.LayoutParams params =
                             new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,
@@ -218,12 +222,39 @@ public void onClick(View v) {
                     params.gravity = Gravity.CENTER_HORIZONTAL;
                     noteBlockHolder.getTextView().setLayoutParams(params);
                     noteBlockHolder.getTextView().setGravity(Gravity.CENTER_HORIZONTAL);
-                    noteBlockHolder.getTextView().setPadding(0, DisplayUtils.dpToPx(view.getContext(), 8), 0, 0);
+                    int padding;
+                    if (mIsViewMilestone) {
+                        padding = 40;
+                    } else {
+                        padding = 8;
+                    }
+                    noteBlockHolder.getTextView().setPadding(0, DisplayUtils.dpToPx(view.getContext(), padding), 0, 0);
 
                     if (AccessibilityUtils.isAccessibilityEnabled(noteBlockHolder.getTextView().getContext())) {
                         noteBlockHolder.getTextView().setClickable(false);
                         noteBlockHolder.getTextView().setLongClickable(false);
                     }
+                    if (mIsViewMilestone) {
+                        if (FormattableContentUtilsKt.isMobileButton(mNoteData)) {
+                            textViewVisibility = View.GONE;
+                            noteBlockHolder.getButton().setVisibility(View.GONE);
+                            noteBlockHolder.getMaterialButton().setVisibility(View.VISIBLE);
+                            noteBlockHolder.getMaterialButton().setText(noteText.toString());
+                            noteBlockHolder.getMaterialButton().setOnClickListener(v -> {
+                                FormattableRange buttonRange =
+                                        FormattableContentUtilsKt.getMobileButtonRange(mNoteData);
+                                if (getOnNoteBlockTextClickListener() != null && buttonRange != null) {
+                                    NoteBlockClickableSpan clickableSpan =
+                                            new NoteBlockClickableSpan(buttonRange, true, false);
+                                    getOnNoteBlockTextClickListener().onNoteBlockTextClicked(clickableSpan);
+                                }
+                            });
+                        } else {
+                            noteBlockHolder.getTextView().setTextSize(28);
+                            TypefaceSpan typefaceSpan = new TypefaceSpan("serif");
+                            noteText.setSpan(typefaceSpan, 0, noteText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+                        }
+                    }
                 } else {
                     noteBlockHolder.getTextView().setGravity(Gravity.NO_GRAVITY);
                     noteBlockHolder.getTextView().setPadding(0, 0, 0, 0);
@@ -234,9 +265,12 @@ public void onClick(View v) {
                     span.enableColors(view.getContext());
                 }
                 noteBlockHolder.getTextView().setText(noteText);
-                noteBlockHolder.getTextView().setVisibility(View.VISIBLE);
+                noteBlockHolder.getTextView().setVisibility(textViewVisibility);
             }
         } else {
+            noteBlockHolder.getButton().setVisibility(View.GONE);
+            noteBlockHolder.getDivider().setVisibility(View.GONE);
+            noteBlockHolder.getMaterialButton().setVisibility(View.GONE);
             noteBlockHolder.getTextView().setVisibility(View.GONE);
         }
 
@@ -251,6 +285,7 @@ static class BasicNoteBlockHolder {
         private final LinearLayout mRootLayout;
         private final WPTextView mTextView;
         private final Button mButton;
+        private final Button mMaterialButton;
         private final View mDivider;
 
         private ImageView mImageView;
@@ -261,6 +296,7 @@ static class BasicNoteBlockHolder {
             mTextView = view.findViewById(R.id.note_text);
             mTextView.setMovementMethod(new NoteBlockLinkMovementMethod());
             mButton = view.findViewById(R.id.note_button);
+            mMaterialButton = view.findViewById(R.id.note_material_button);
             mDivider = view.findViewById(R.id.divider_view);
         }
 
@@ -272,6 +308,10 @@ public Button getButton() {
             return mButton;
         }
 
+        public Button getMaterialButton() {
+            return mMaterialButton;
+        }
+
         public View getDivider() {
             return mDivider;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java
index 89d054985ac0..6e75adf56ac9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java
@@ -40,7 +40,6 @@ public class NoteBlockClickableSpan extends ClickableSpan {
     private int mLinkColor;
     private int mLightTextColor;
 
-
     public NoteBlockClickableSpan(FormattableRange range, boolean shouldLink, boolean isFooter) {
         mShouldLink = shouldLink;
         mIsFooter = isFooter;
@@ -90,6 +89,7 @@ private boolean shouldLinkRangeType() {
         return mShouldLink
                && mRangeType != FormattableRangeType.BLOCKQUOTE
                && mRangeType != FormattableRangeType.MATCH
+               && mRangeType != FormattableRangeType.B
                && (mRangeType != FormattableRangeType.UNKNOWN || !TextUtils.isEmpty(mUrl));
     }
 
@@ -119,6 +119,7 @@ public int getSpanStyle() {
             case SITE:
             case POST:
             case COMMENT:
+            case REWIND_DOWNLOAD_READY:
             case B:
                 return Typeface.BOLD;
             case BLOCKQUOTE:
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/FormattableContentClickHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/FormattableContentClickHandler.kt
index 668ab60ffe36..0c24576cc76a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/FormattableContentClickHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/FormattableContentClickHandler.kt
@@ -16,13 +16,16 @@ import org.wordpress.android.fluxc.tools.FormattableRangeType.MEDIA
 import org.wordpress.android.fluxc.tools.FormattableRangeType.NOTICON
 import org.wordpress.android.fluxc.tools.FormattableRangeType.PAGE
 import org.wordpress.android.fluxc.tools.FormattableRangeType.POST
+import org.wordpress.android.fluxc.tools.FormattableRangeType.REWIND_DOWNLOAD_READY
 import org.wordpress.android.fluxc.tools.FormattableRangeType.SITE
 import org.wordpress.android.fluxc.tools.FormattableRangeType.STAT
 import org.wordpress.android.fluxc.tools.FormattableRangeType.UNKNOWN
 import org.wordpress.android.fluxc.tools.FormattableRangeType.USER
+import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.WPWebViewActivity
 import org.wordpress.android.ui.reader.ReaderActivityLauncher
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.utils.ReaderUtils
 import org.wordpress.android.ui.stats.StatsViewType.FOLLOWERS
 import org.wordpress.android.util.AppLog
@@ -32,26 +35,32 @@ import javax.inject.Inject
 
 private const val DOMAIN_WP_COM = "wordpress.com"
 
-class FormattableContentClickHandler
-@Inject constructor(val siteStore: SiteStore) {
-    fun onClick(activity: FragmentActivity, clickedSpan: FormattableRange) {
+class FormattableContentClickHandler @Inject constructor(
+    val siteStore: SiteStore,
+    val readerTracker: ReaderTracker
+) {
+    fun onClick(
+        activity: FragmentActivity,
+        clickedSpan: FormattableRange,
+        source: String
+    ) {
         if (activity.isFinishing) {
             return
         }
         val id = clickedSpan.id ?: 0
         val siteId = clickedSpan.siteId ?: 0
+        val postId = clickedSpan.postId ?: 0
         when (val rangeType = clickedSpan.rangeType()) {
             SITE ->
                 // Show blog preview
-                showBlogPreviewActivity(activity, id)
+                showBlogPreviewActivity(activity, id, postId, source)
             USER ->
                 // Show blog preview
-                showBlogPreviewActivity(activity, siteId)
+                showBlogPreviewActivity(activity, siteId, postId, source)
             PAGE, POST ->
                 // Show post detail
                 showPostActivity(activity, siteId, id)
-            COMMENT ->
-            {
+            COMMENT -> {
                 // Load the comment in the reader list if it exists, otherwise show a webview
                 val postId = clickedSpan.postId ?: clickedSpan.rootId ?: 0
                 if (ReaderUtils.postAndCommentExists(siteId, postId, id)) {
@@ -68,6 +77,7 @@ class FormattableContentClickHandler
             } else {
                 showPostActivity(activity, siteId, id)
             }
+            REWIND_DOWNLOAD_READY -> showBackup(activity, siteId)
             BLOCKQUOTE,
             NOTICON,
             MATCH,
@@ -78,8 +88,20 @@ class FormattableContentClickHandler
         }
     }
 
-    private fun showBlogPreviewActivity(activity: FragmentActivity, siteId: Long) {
-        ReaderActivityLauncher.showReaderBlogPreview(activity, siteId)
+    private fun showBlogPreviewActivity(
+        activity: FragmentActivity,
+        siteId: Long,
+        postId: Long,
+        source: String
+    ) {
+        val post: ReaderPost? = ReaderPostTable.getBlogPost(siteId, postId, true)
+        ReaderActivityLauncher.showReaderBlogPreview(
+                activity,
+                siteId,
+                post?.isFollowedByCurrentUser,
+                source,
+                readerTracker
+        )
     }
 
     private fun showPostActivity(activity: FragmentActivity, siteId: Long, postId: Long) {
@@ -129,4 +151,9 @@ class FormattableContentClickHandler
     private fun showReaderCommentsList(activity: FragmentActivity, siteId: Long, postId: Long, commentId: Long) {
         ReaderActivityLauncher.showReaderComments(activity, siteId, postId, commentId)
     }
+
+    private fun showBackup(activity: FragmentActivity, siteId: Long) {
+        val site = siteStore.getSiteBySiteId(siteId)
+        ActivityLauncher.viewBackupList(activity, site)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
index 80c52b178366..01b76e8c8cea 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
@@ -30,6 +30,7 @@
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
@@ -101,6 +102,7 @@ public static void registerDeviceForPushNotifications(final Context ctx, String
 
         String deviceName = DeviceUtils.getInstance().getDeviceName(ctx);
         Map<String, String> contentStruct = new HashMap<>();
+        contentStruct.put("app_secret_key", BuildConfig.PUSH_NOTIFICATIONS_APP_KEY);
         contentStruct.put("device_token", token);
         contentStruct.put("device_family", "android");
         contentStruct.put("device_name", deviceName);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt
index 24052fd633fd..f22f1eee2d0e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItem.kt
@@ -17,6 +17,7 @@ sealed class PageItem(open val type: Type) {
         open val localId: Int,
         open val title: String,
         open val subtitle: Int? = null,
+        open val icon: Int? = null,
         open val date: Date,
         open val labels: List<UiString>,
         @ColorRes open val labelsColor: Int?,
@@ -27,7 +28,8 @@ sealed class PageItem(open val type: Type) {
         open val tapActionEnabled: Boolean,
         open val progressBarUiState: ProgressBarUiState,
         open val showOverlay: Boolean,
-        open val author: String?
+        open val author: String?,
+        open var showQuickStartFocusPoint: Boolean
     ) : PageItem(PAGE)
 
     data class PublishedPage(
@@ -35,6 +37,7 @@ sealed class PageItem(open val type: Type) {
         override val localId: Int,
         override val title: String,
         override val subtitle: Int? = null,
+        override val icon: Int? = null,
         override val date: Date,
         override val labels: List<UiString> = emptyList(),
         override val labelsColor: Int? = null,
@@ -44,7 +47,8 @@ sealed class PageItem(open val type: Type) {
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean,
-        override val author: String? = null
+        override val author: String? = null,
+        override var showQuickStartFocusPoint: Boolean = false
     ) : Page(
             remoteId = remoteId,
             localId = localId,
@@ -59,7 +63,8 @@ sealed class PageItem(open val type: Type) {
             tapActionEnabled = true,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay,
-            author = author
+            author = author,
+            showQuickStartFocusPoint = showQuickStartFocusPoint
     )
 
     data class DraftPage(
@@ -75,7 +80,8 @@ sealed class PageItem(open val type: Type) {
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean,
-        override val author: String? = null
+        override val author: String? = null,
+        override var showQuickStartFocusPoint: Boolean = false
     ) : Page(
             remoteId = remoteId,
             localId = localId,
@@ -90,7 +96,8 @@ sealed class PageItem(open val type: Type) {
             tapActionEnabled = true,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay,
-            author = author
+            author = author,
+            showQuickStartFocusPoint = showQuickStartFocusPoint
     )
 
     data class ScheduledPage(
@@ -106,7 +113,8 @@ sealed class PageItem(open val type: Type) {
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean,
-        override val author: String? = null
+        override val author: String? = null,
+        override var showQuickStartFocusPoint: Boolean = false
     ) : Page(
             remoteId = remoteId,
             localId = localId,
@@ -121,7 +129,8 @@ sealed class PageItem(open val type: Type) {
             tapActionEnabled = true,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay,
-            author = author
+            author = author,
+            showQuickStartFocusPoint = showQuickStartFocusPoint
     )
 
     data class TrashedPage(
@@ -137,7 +146,8 @@ sealed class PageItem(open val type: Type) {
         override var actionsEnabled: Boolean = true,
         override val progressBarUiState: ProgressBarUiState,
         override val showOverlay: Boolean,
-        override val author: String? = null
+        override val author: String? = null,
+        override var showQuickStartFocusPoint: Boolean = false
     ) : Page(
             remoteId = remoteId,
             localId = localId,
@@ -152,8 +162,8 @@ sealed class PageItem(open val type: Type) {
             tapActionEnabled = false,
             progressBarUiState = progressBarUiState,
             showOverlay = showOverlay,
-            author = author
-
+            author = author,
+            showQuickStartFocusPoint = showQuickStartFocusPoint
     )
 
     data class ParentPage(
@@ -186,6 +196,7 @@ sealed class PageItem(open val type: Type) {
         SET_PARENT(R.id.set_parent),
         SET_AS_HOMEPAGE(R.id.set_as_homepage),
         SET_AS_POSTS_PAGE(R.id.set_as_posts_page),
+        COPY(R.id.copy),
         PUBLISH_NOW(R.id.publish_now),
         MOVE_TO_DRAFT(R.id.move_to_draft),
         DELETE_PERMANENTLY(R.id.delete_permanently),
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt
index cff03da5d3a8..2ab29779a6c6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt
@@ -26,11 +26,14 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.DateTimeUtils
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.util.ImageUtils
+import org.wordpress.android.util.QuickStartUtils
+import org.wordpress.android.util.QuickStartUtils.Companion.addQuickStartFocusPointAboveTheView
 import org.wordpress.android.util.capitalizeWithLocaleWithoutLint
 import org.wordpress.android.util.currentLocale
 import org.wordpress.android.util.getDrawableFromAttribute
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType
+import org.wordpress.android.util.setVisible
 import org.wordpress.android.viewmodel.uistate.ProgressBarUiState
 import org.wordpress.android.viewmodel.uistate.ProgressBarUiState.Determinate
 import org.wordpress.android.viewmodel.uistate.ProgressBarUiState.Indeterminate
@@ -53,6 +56,8 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
         private val pageTitle = itemView.findViewById<TextView>(R.id.page_title)
         private val pageMore = itemView.findViewById<ImageButton>(R.id.page_more)
         private val pageSubtitle = itemView.findViewById<TextView>(R.id.page_subtitle)
+        private val pageSubtitleIcon = itemView.findViewById<ImageView>(R.id.page_subtitle_icon)
+        private val pageSubtitleSuffix = itemView.findViewById<TextView>(R.id.page_subtitle_suffix)
         private val labels = itemView.findViewById<TextView>(R.id.labels)
         private val featuredImage = itemView.findViewById<ImageView>(R.id.featured_image)
         private val uploadProgressBar: ProgressBar = itemView.findViewById(R.id.upload_progress)
@@ -80,7 +85,7 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
                 else
                     page.title
 
-                showSubtitle(page.date, page.author, page.subtitle)
+                showSubtitle(page.date, page.author, page.subtitle, page.icon)
 
                 labels.text = page.labels.map { uiHelper.getTextOfUiString(parent.context, it).toString() }.sorted()
                         .joinToString(separator = " · ")
@@ -95,7 +100,10 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
 
                 uiHelper.updateVisibility(labels, page.labels.isNotEmpty())
 
-                itemView.setOnClickListener { onItemTapped(page) }
+                itemView.setOnClickListener {
+                    QuickStartUtils.removeQuickStartFocusPoint(pageItemContainer)
+                    onItemTapped(page)
+                }
 
                 pageMore.setOnClickListener { view -> moreClick(page, view) }
                 pageMore.visibility =
@@ -106,6 +114,21 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
 
                 uiHelper.updateVisibility(disabledOverlay, page.showOverlay)
                 updateProgressBarState(page.progressBarUiState)
+
+                // Clean up focus tip if there
+                QuickStartUtils.removeQuickStartFocusPoint(pageItemContainer)
+                if (page.showQuickStartFocusPoint) {
+                    pageItemContainer.post {
+                        val horizontalOffset = pageItemContainer.width / 2
+                        val verticalOffset = (pageItemContainer.height)
+                        addQuickStartFocusPointAboveTheView(
+                                pageItemContainer,
+                                pageMore,
+                                horizontalOffset,
+                                -verticalOffset
+                        )
+                    }
+                }
             }
         }
 
@@ -165,41 +188,43 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou
         }
 
         @ExperimentalStdlibApi
-        private fun showSubtitle(inputDate: Date, author: String?, subtitle: Int?) {
+        private fun showSubtitle(inputDate: Date, author: String?, subtitle: Int?, icon: Int?) {
             val date = if (inputDate == Date(0)) Date() else inputDate
             val stringDate = DateTimeUtils.javaDateToTimeSpan(date, parent.context)
                     .capitalizeWithLocaleWithoutLint(parent.context.currentLocale)
 
-            /** The subtitle can use 2 or 3 placeholders
-            * Date - Only (author & subtitle are null)
-            * Date - Author (author != null && subtitle == null)
-            * Date - subtitle (author == null && subtitle != null)
-            * Date - Author - subtitle (all have values)
-            */
-            pageSubtitle.text = if (author == null && subtitle == null) {
-                stringDate
-            } else if (author != null && subtitle == null) {
-                String.format(
-                        Locale.getDefault(),
-                        parent.context.getString(R.string.pages_item_subtitle),
-                        stringDate,
-                        author)
-            } else if (author == null && subtitle != null) {
-                String.format(
+            /** The subtitle is split in two TextViews:
+             * - Date and Author (if not null) occupy the [pageSubtitle] TextView
+             * - Subtitle fills the [pageSubtitleSuffix] TextView
+             */
+            if (subtitle != null) {
+                pageSubtitle.text = author?.let {
+                    String.format(
+                            Locale.getDefault(),
+                            parent.context.getString(R.string.pages_item_date_author_subtitle),
+                            stringDate,
+                            it
+                    )
+                } ?: String.format(
                         Locale.getDefault(),
-                        parent.context.getString(R.string.pages_item_subtitle),
-                        stringDate,
-                        parent.context.getString(subtitle))
+                        parent.context.getString(R.string.pages_item_date_subtitle),
+                        stringDate
+                )
+                pageSubtitleSuffix.text = parent.context.getString(subtitle)
             } else {
-                subtitle?.let {
+                pageSubtitle.text = author?.let {
                     String.format(
                             Locale.getDefault(),
-                            parent.context.getString(R.string.pages_item_subtitle_date_author),
+                            parent.context.getString(R.string.pages_item_date_author),
                             stringDate,
-                            author,
-                            parent.context.getString(it))
-                }
+                            it
+                    )
+                } ?: stringDate
+                pageSubtitleSuffix.text = ""
             }
+
+            icon?.let { pageSubtitleIcon.setImageResource(it) }
+            pageSubtitleIcon.setVisible(icon != null)
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageListFragment.kt
index 936808cee62b..14d053db399f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageListFragment.kt
@@ -2,35 +2,43 @@ package org.wordpress.android.ui.pages
 
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.LinearSmoothScroller
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.pages_list_fragment.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PagesListFragmentBinding
+import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.ui.ViewPagerFragment
+import org.wordpress.android.ui.quickstart.QuickStartEvent
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.DisplayUtils
+import org.wordpress.android.util.QuickStartUtilsWrapper
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.viewmodel.pages.PageListViewModel
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType
 import org.wordpress.android.viewmodel.pages.PagesViewModel
 import org.wordpress.android.widgets.RecyclerItemDecoration
+import org.wordpress.android.widgets.WPDialogSnackbar
 import javax.inject.Inject
 
-class PageListFragment : ViewPagerFragment() {
+class PageListFragment : ViewPagerFragment(R.layout.pages_list_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var imageManager: ImageManager
     @Inject internal lateinit var uiHelper: UiHelpers
+    @Inject lateinit var dispatcher: Dispatcher
+    @Inject lateinit var quickStartUtilsWrapper: QuickStartUtilsWrapper
     private lateinit var viewModel: PageListViewModel
     private var linearLayoutManager: LinearLayoutManager? = null
+    private var snackbar: WPDialogSnackbar? = null
+    private var binding: PagesListFragmentBinding? = null
 
     private val listStateKey = "list_state"
 
@@ -46,12 +54,8 @@ class PageListFragment : ViewPagerFragment() {
         }
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.pages_list_fragment, container, false)
-    }
-
     override fun getScrollableViewForUniqueIdProvision(): View? {
-        return recyclerView
+        return binding?.recyclerView
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -59,9 +63,15 @@ class PageListFragment : ViewPagerFragment() {
 
         val nonNullActivity = requireActivity()
         (nonNullActivity.application as? WordPress)?.component()?.inject(this)
+        with(PagesListFragmentBinding.bind(view)) {
+            initializeViews(savedInstanceState)
+            initializeViewModels(nonNullActivity)
+        }
+    }
 
-        initializeViews(savedInstanceState)
-        initializeViewModels(nonNullActivity)
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -71,11 +81,11 @@ class PageListFragment : ViewPagerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViewModels(activity: FragmentActivity) {
-        val pagesViewModel = ViewModelProviders.of(activity, viewModelFactory).get(PagesViewModel::class.java)
+    private fun PagesListFragmentBinding.initializeViewModels(activity: FragmentActivity) {
+        val pagesViewModel = ViewModelProvider(activity, viewModelFactory).get(PagesViewModel::class.java)
 
         val listType = arguments?.getSerializable(typeKey) as PageListType
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this@PageListFragment, viewModelFactory)
                 .get(listType.name, PageListViewModel::class.java)
 
         viewModel.start(listType, pagesViewModel)
@@ -83,7 +93,7 @@ class PageListFragment : ViewPagerFragment() {
         setupObservers()
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+    private fun PagesListFragmentBinding.initializeViews(savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
             layoutManager.onRestoreInstanceState(it)
@@ -94,7 +104,7 @@ class PageListFragment : ViewPagerFragment() {
         recyclerView.addItemDecoration(RecyclerItemDecoration(0, DisplayUtils.dpToPx(activity, 1)))
     }
 
-    private fun setupObservers() {
+    private fun PagesListFragmentBinding.setupObservers() {
         viewModel.pages.observe(viewLifecycleOwner, Observer { data ->
             data?.let { setPages(data.first, data.second, data.third) }
         })
@@ -109,14 +119,27 @@ class PageListFragment : ViewPagerFragment() {
                 recyclerView.layoutManager?.startSmoothScroll(smoothScroller)
             }
         })
+
+        viewModel.quickStartEvent.observe(viewLifecycleOwner, Observer { event ->
+            if (event == null) {
+                snackbar?.dismiss()
+                snackbar = null
+            } else {
+                showSnackbar()
+            }
+        })
     }
 
-    private fun setPages(pages: List<PageItem>, isSitePhotonCapable: Boolean, isSitePrivateAt: Boolean) {
+    private fun PagesListFragmentBinding.setPages(
+        pages: List<PageItem>,
+        isSitePhotonCapable: Boolean,
+        isSitePrivateAt: Boolean
+    ) {
         val adapter: PageListAdapter
         if (recyclerView.adapter == null) {
             adapter = PageListAdapter(
-                    { action, page -> viewModel.onMenuAction(action, page) },
-                    { page -> viewModel.onItemTapped(page) },
+                    { action, page -> viewModel.onMenuAction(action, page, requireContext()) },
+                    { page -> viewModel.onItemTapped(page, requireContext()) },
                     { viewModel.onEmptyListNewPageButtonTapped() },
                     isSitePhotonCapable,
                     isSitePrivateAt,
@@ -133,4 +156,41 @@ class PageListFragment : ViewPagerFragment() {
     fun scrollToPage(localPageId: Int) {
         viewModel.onScrollToPageRequested(localPageId)
     }
+
+    override fun onStart() {
+        super.onStart()
+        EventBus.getDefault().register(this)
+    }
+
+    override fun onStop() {
+        super.onStop()
+        EventBus.getDefault().unregister(this)
+    }
+
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    @SuppressWarnings("unused")
+    fun onEvent(event: QuickStartEvent) {
+        if (!isAdded || view == null) {
+            return
+        }
+
+        EventBus.getDefault().removeStickyEvent(event)
+        viewModel.onQuickStartEvent(event)
+    }
+
+    fun showSnackbar() {
+        view?.post {
+            val title = quickStartUtilsWrapper.stylizeQuickStartPrompt(
+                    requireContext(),
+                    R.string.quick_start_dialog_edit_homepage_message_pages_short,
+                    R.drawable.ic_homepage_16dp
+            )
+
+            snackbar = WPDialogSnackbar.make(
+                    requireView().findViewById(R.id.page_list_layout), title,
+                    resources.getInteger(R.integer.quick_start_snackbar_duration_ms)
+            )
+            snackbar?.show()
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt
index 2bd7fdd52be5..d30b477d80ba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentActivity.kt
@@ -1,17 +1,16 @@
 package org.wordpress.android.ui.pages
 
 import android.os.Bundle
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.PagesParentActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class PageParentActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val binding = PagesParentActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-        setContentView(R.layout.pages_parent_activity)
-
-        setSupportActionBar(toolbar_main)
+        setSupportActionBar(binding.toolbar.toolbarMain)
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
index bbc8d3a61664..a1c46ae61e01 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentFragment.kt
@@ -4,38 +4,39 @@ import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.MenuItem.OnActionExpandListener
 import android.view.View
-import android.view.ViewGroup
 import android.widget.LinearLayout
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.page_parent_fragment.*
-import kotlinx.android.synthetic.main.pages_list_fragment.recyclerView
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PageParentFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.modules.UI_SCOPE
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.viewmodel.pages.PageParentViewModel
 import org.wordpress.android.widgets.RecyclerItemDecoration
 import javax.inject.Inject
-import javax.inject.Named
+import kotlin.coroutines.CoroutineContext
+
+class PageParentFragment : Fragment(R.layout.page_parent_fragment), CoroutineScope {
+    private var job: Job = Job()
+
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Main + job
 
-class PageParentFragment : Fragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
-    @field:[Inject Named(UI_SCOPE)] lateinit var uiScope: CoroutineScope
     private lateinit var viewModel: PageParentViewModel
 
     private val listStateKey = "list_state"
@@ -46,6 +47,7 @@ class PageParentFragment : Fragment() {
 
     private var pageId: Long? = null
     private var restorePreviousSearch = false
+    private var binding: PageParentFragmentBinding? = null
 
     companion object {
         fun newInstance(): PageParentFragment {
@@ -88,10 +90,10 @@ class PageParentFragment : Fragment() {
             "Menu does not contain mandatory search item"
         }
 
-        initializeSearchView()
+        binding!!.initializeSearchView()
     }
 
-    private fun initializeSearchView() {
+    private fun PageParentFragmentBinding.initializeSearchView() {
         searchAction.setOnActionExpandListener(object : OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                 viewModel.onSearchExpanded(restorePreviousSearch)
@@ -122,11 +124,11 @@ class PageParentFragment : Fragment() {
             }
         })
 
-        val searchEditFrame = searchAction?.actionView.findViewById<LinearLayout>(R.id.search_edit_frame)
+        val searchEditFrame = searchAction.actionView.findViewById<LinearLayout>(R.id.search_edit_frame)
         (searchEditFrame.layoutParams as LinearLayout.LayoutParams)
                 .apply { this.leftMargin = DisplayUtils.dpToPx(activity, -8) }
 
-        viewModel.isSearchExpanded.observe(this, Observer {
+        viewModel.isSearchExpanded.observe(this@PageParentFragment, Observer {
             if (it == true) {
                 showSearchList(searchAction)
             } else {
@@ -135,14 +137,6 @@ class PageParentFragment : Fragment() {
         })
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.page_parent_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -152,12 +146,19 @@ class PageParentFragment : Fragment() {
         val nonNullActivity = requireActivity()
 
         (nonNullActivity.application as? WordPress)?.component()?.inject(this)
+        with(PageParentFragmentBinding.bind(view)) {
+            binding = this
+            initializeViews(nonNullActivity, savedInstanceState)
+            initializeViewModels(nonNullActivity, nonNullPageId, savedInstanceState == null)
+        }
+    }
 
-        initializeViews(nonNullActivity, savedInstanceState)
-        initializeViewModels(nonNullActivity, nonNullPageId, savedInstanceState == null)
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
-    private fun initializeViews(activity: FragmentActivity, savedInstanceState: Bundle?) {
+    private fun PageParentFragmentBinding.initializeViews(activity: FragmentActivity, savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
             layoutManager.onRestoreInstanceState(it)
@@ -174,12 +175,12 @@ class PageParentFragment : Fragment() {
                 .commit()
     }
 
-    private fun initializeViewModels(
+    private fun PageParentFragmentBinding.initializeViewModels(
         activity: FragmentActivity,
         pageId: Long,
         isFirstStart: Boolean
     ) {
-        viewModel = ViewModelProviders.of(activity, viewModelFactory)
+        viewModel = ViewModelProvider(activity, viewModelFactory)
                 .get(PageParentViewModel::class.java)
 
         setupObservers()
@@ -193,16 +194,16 @@ class PageParentFragment : Fragment() {
         }
     }
 
-    private fun setupObservers() {
-        viewModel.pages.observe(viewLifecycleOwner, Observer { pages ->
+    private fun PageParentFragmentBinding.setupObservers() {
+        viewModel.pages.observe(viewLifecycleOwner, { pages ->
             pages?.let { setPages(pages) }
         })
 
-        viewModel.isSaveButtonVisible.observe(viewLifecycleOwner, Observer { isVisible ->
+        viewModel.isSaveButtonVisible.observe(viewLifecycleOwner, { isVisible ->
             isVisible?.let { saveButton?.isVisible = isVisible }
         })
 
-        viewModel.saveParent.observe(viewLifecycleOwner, Observer {
+        viewModel.saveParent.observe(viewLifecycleOwner, {
             returnParentChoiceAndExit()
         })
     }
@@ -212,10 +213,10 @@ class PageParentFragment : Fragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun setPages(pages: List<PageItem>) {
+    private fun PageParentFragmentBinding.setPages(pages: List<PageItem>) {
         val adapter: PageParentAdapter
         if (recyclerView.adapter == null) {
-            adapter = PageParentAdapter({ page -> viewModel.onParentSelected(page) }, uiScope)
+            adapter = PageParentAdapter({ page -> viewModel.onParentSelected(page) }, this@PageParentFragment)
             recyclerView.adapter = adapter
         } else {
             adapter = recyclerView.adapter as PageParentAdapter
@@ -223,7 +224,7 @@ class PageParentFragment : Fragment() {
         adapter.update(pages)
     }
 
-    private fun hideSearchList(myActionMenuItem: MenuItem) {
+    private fun PageParentFragmentBinding.hideSearchList(myActionMenuItem: MenuItem) {
         recyclerView.visibility = View.VISIBLE
         frameSearch.visibility = View.GONE
         if (myActionMenuItem.isActionViewExpanded) {
@@ -235,11 +236,16 @@ class PageParentFragment : Fragment() {
         }
     }
 
-    private fun showSearchList(myActionMenuItem: MenuItem) {
+    private fun PageParentFragmentBinding.showSearchList(myActionMenuItem: MenuItem) {
         frameSearch.visibility = View.VISIBLE
         recyclerView.visibility = View.GONE
         if (!myActionMenuItem.isActionViewExpanded) {
             myActionMenuItem.expandActionView()
         }
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
index a01896c136fb..286b3b26638a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageParentSearchFragment.kt
@@ -2,32 +2,34 @@ package org.wordpress.android.ui.pages
 
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.pages_list_fragment.*
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
-import org.wordpress.android.modules.UI_SCOPE
+import org.wordpress.android.databinding.PagesListFragmentBinding
 import org.wordpress.android.util.DisplayUtils
 import org.wordpress.android.viewmodel.pages.PageParentSearchViewModel
 import org.wordpress.android.viewmodel.pages.PageParentViewModel
 import org.wordpress.android.widgets.RecyclerItemDecoration
 import javax.inject.Inject
-import javax.inject.Named
+import kotlin.coroutines.CoroutineContext
+
+class PageParentSearchFragment : Fragment(R.layout.pages_list_fragment), CoroutineScope {
+    protected var job: Job = Job()
+
+    override val coroutineContext: CoroutineContext
+        get() = Dispatchers.Main + job
 
-class PageParentSearchFragment : Fragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: PageParentSearchViewModel
-    @field:[Inject Named(UI_SCOPE)] lateinit var uiScope: CoroutineScope
     private var linearLayoutManager: LinearLayoutManager? = null
 
     private val listStateKey = "list_state"
@@ -38,21 +40,14 @@ class PageParentSearchFragment : Fragment() {
         }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.pages_list_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val nonNullActivity = requireActivity()
         (nonNullActivity.application as? WordPress)?.component()?.inject(this)
-
-        initializeViews(savedInstanceState)
-        initializeViewModels(nonNullActivity)
+        with(PagesListFragmentBinding.bind(view)) {
+            initializeViews(savedInstanceState)
+            initializeViewModels(nonNullActivity)
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -62,18 +57,18 @@ class PageParentSearchFragment : Fragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViewModels(activity: FragmentActivity) {
-        val pageParentViewModel = ViewModelProviders.of(activity, viewModelFactory)
+    private fun PagesListFragmentBinding.initializeViewModels(activity: FragmentActivity) {
+        val pageParentViewModel = ViewModelProvider(activity, viewModelFactory)
                 .get(PageParentViewModel::class.java)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this@PageParentSearchFragment, viewModelFactory)
                 .get(PageParentSearchViewModel::class.java)
         viewModel.start(pageParentViewModel)
 
         setupObservers()
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+    private fun PagesListFragmentBinding.initializeViews(savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
             layoutManager.onRestoreInstanceState(it)
@@ -84,21 +79,27 @@ class PageParentSearchFragment : Fragment() {
         recyclerView.addItemDecoration(RecyclerItemDecoration(0, DisplayUtils.dpToPx(activity, 1)))
     }
 
-    private fun setupObservers() {
+    private fun PagesListFragmentBinding.setupObservers() {
         viewModel.searchResult.observe(viewLifecycleOwner, Observer { data ->
             data?.let { setSearchResult(data) }
         })
     }
 
-    private fun setSearchResult(pages: List<PageItem>) {
+    private fun PagesListFragmentBinding.setSearchResult(pages: List<PageItem>) {
         val adapter: PageParentSearchAdapter
         if (recyclerView.adapter == null) {
             adapter = PageParentSearchAdapter(
-                    { page -> viewModel.onParentSelected(page) }, uiScope)
+                    { page -> viewModel.onParentSelected(page) }, this@PageParentSearchFragment
+            )
             recyclerView.adapter = adapter
         } else {
             adapter = recyclerView.adapter as PageParentSearchAdapter
         }
         adapter.update(pages)
     }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        job.cancel()
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt
index 8a744ac5035a..5013678b596d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesActivity.kt
@@ -3,9 +3,9 @@ package org.wordpress.android.ui.pages
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.pages_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PagesActivityBinding
 import org.wordpress.android.push.NotificationType
 import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE
 import org.wordpress.android.ui.LocaleAwareActivity
@@ -25,14 +25,7 @@ class PagesActivity : LocaleAwareActivity(),
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
-
-        setContentView(R.layout.pages_activity)
-
-        setSupportActionBar(toolbar)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-        }
+        setContentView(PagesActivityBinding.inflate(layoutInflater).root)
 
         handleIntent(intent)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt
index 5d397db1ac92..a1da899c51d0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PagesFragment.kt
@@ -1,22 +1,22 @@
 package org.wordpress.android.ui.pages
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.ProgressDialog
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.HapticFeedbackConstants
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.MenuItem.OnActionExpandListener
 import android.view.MotionEvent
 import android.view.View
-import android.view.ViewGroup
 import android.widget.AdapterView
 import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
@@ -24,22 +24,16 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.pages_fragment.*
-import org.greenrobot.eventbus.EventBus
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PagesFragmentBinding
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.store.PostStore
-import org.wordpress.android.fluxc.store.QuickStartStore
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.PagePostCreationSourcesDetail.PAGE_FROM_PAGES_LIST
 import org.wordpress.android.ui.RequestCodes
@@ -52,21 +46,18 @@ import org.wordpress.android.ui.posts.PreviewStateHelper
 import org.wordpress.android.ui.posts.ProgressDialogHelper
 import org.wordpress.android.ui.posts.RemotePreviewLogicHelper
 import org.wordpress.android.ui.posts.adapters.AuthorSelectionAdapter
-import org.wordpress.android.ui.quickstart.QuickStartEvent
 import org.wordpress.android.ui.uploads.UploadActionUseCase
 import org.wordpress.android.ui.uploads.UploadUtilsWrapper
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.DisplayUtils
-import org.wordpress.android.util.QuickStartUtils
 import org.wordpress.android.util.ToastUtils.Duration
 import org.wordpress.android.util.WPSwipeToRefreshHelper
-import org.wordpress.android.util.config.ModalLayoutPickerFeatureConfig
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import org.wordpress.android.util.redirectContextClickToLongPressListener
 import org.wordpress.android.util.setLiftOnScrollTargetViewIdAndRequestLayout
-import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.helpers.ToastMessageHolder
 import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListState
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListState.FETCHING
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType
@@ -75,24 +66,23 @@ import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.PUBL
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.SCHEDULED
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.TRASHED
 import org.wordpress.android.viewmodel.pages.PagesViewModel
-import org.wordpress.android.widgets.WPDialogSnackbar
 import org.wordpress.android.widgets.WPSnackbar
 import java.lang.ref.WeakReference
 import javax.inject.Inject
 
-class PagesFragment : Fragment(), ScrollableViewInitializedListener {
+class PagesFragment : Fragment(R.layout.pages_fragment), ScrollableViewInitializedListener {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: PagesViewModel
     private lateinit var mlpViewModel: ModalLayoutPickerViewModel
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
     private lateinit var actionMenuItem: MenuItem
+    private var binding: PagesFragmentBinding? = null
 
     /**
      * PostStore needs to be injected here as otherwise FluxC doesn't accept emitted events.
      */
     @Suppress("unused")
     @Inject lateinit var postStore: PostStore
-    @Inject lateinit var quickStartStore: QuickStartStore
     @Inject lateinit var dispatcher: Dispatcher
     @Inject lateinit var uiHelpers: UiHelpers
     @Inject lateinit var remotePreviewLogicHelper: RemotePreviewLogicHelper
@@ -100,9 +90,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
     @Inject lateinit var progressDialogHelper: ProgressDialogHelper
     @Inject lateinit var uploadActionUseCase: UploadActionUseCase
     @Inject lateinit var uploadUtilsWrapper: UploadUtilsWrapper
-    @Inject lateinit var modalLayoutPickerFeatureConfig: ModalLayoutPickerFeatureConfig
 
-    private var quickStartEvent: QuickStartEvent? = null
     private var progressDialog: ProgressDialog? = null
 
     private var restorePreviousSearch = false
@@ -118,12 +106,6 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-
-        quickStartEvent = savedInstanceState?.getParcelable(QuickStartEvent.KEY)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.pages_fragment, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -131,9 +113,23 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
 
         val nonNullActivity = requireActivity()
         (nonNullActivity.application as? WordPress)?.component()?.inject(this)
+        with(PagesFragmentBinding.bind(view)) {
+            binding = this
+            with(nonNullActivity as AppCompatActivity) {
+                setSupportActionBar(toolbar)
+                supportActionBar?.let {
+                    it.setHomeButtonEnabled(true)
+                    it.setDisplayHomeAsUpEnabled(true)
+                }
+            }
+            initializeViews(nonNullActivity)
+            initializeViewModels(nonNullActivity, savedInstanceState)
+        }
+    }
 
-        initializeViews(nonNullActivity)
-        initializeViewModels(nonNullActivity, savedInstanceState)
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -177,7 +173,8 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         viewModel.onPageParentSet(pageId, parentId)
     }
 
-    private fun initializeViews(activity: FragmentActivity) {
+    @SuppressLint("ClickableViewAccessibility")
+    private fun PagesFragmentBinding.initializeViews(activity: FragmentActivity) {
         pagesPager.adapter = PagesPagerAdapter(activity, childFragmentManager)
         tabLayout.setupWithViewPager(pagesPager)
 
@@ -226,8 +223,8 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         }
 
         authorSelectionAdapter = AuthorSelectionAdapter(activity)
-        pages_author_selection.adapter = authorSelectionAdapter
-        pages_author_selection.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        pagesAuthorSelection.adapter = authorSelectionAdapter
+        pagesAuthorSelection.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>) {}
 
             override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
@@ -236,7 +233,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         }
     }
 
-    private fun initializeSearchView() {
+    private fun PagesFragmentBinding.initializeSearchView() {
         actionMenuItem.setOnActionExpandListener(object : OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                 viewModel.onSearchExpanded(restorePreviousSearch)
@@ -272,7 +269,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         (searchEditFrame.layoutParams as LinearLayout.LayoutParams)
                 .apply { this.leftMargin = DisplayUtils.dpToPx(activity, -8) }
 
-        viewModel.isSearchExpanded.observe(this, Observer {
+        viewModel.isSearchExpanded.observe(this@PagesFragment, Observer {
             if (it == true) {
                 showSearchList(actionMenuItem)
             } else {
@@ -281,11 +278,13 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         })
     }
 
-    private fun initializeViewModels(activity: FragmentActivity, savedInstanceState: Bundle?) {
-        viewModel = ViewModelProviders.of(activity, viewModelFactory).get(PagesViewModel::class.java)
-        mlpViewModel = ViewModelProviders.of(activity, viewModelFactory).get(ModalLayoutPickerViewModel::class.java)
+    private fun PagesFragmentBinding.initializeViewModels(activity: FragmentActivity, savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(activity, viewModelFactory).get(PagesViewModel::class.java)
+        mlpViewModel = ViewModelProvider(activity, viewModelFactory).get(ModalLayoutPickerViewModel::class.java)
 
         setupObservers(activity)
+        setupActions(activity)
+        setupMlpObservers(activity)
 
         val site = if (savedInstanceState == null) {
             val nonNullIntent = checkNotNull(activity.intent)
@@ -297,19 +296,19 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
 
         viewModel.authorUIState.observe(activity, Observer { state ->
             state?.let {
-                uiHelpers.updateVisibility(pages_author_selection, state.isAuthorFilterVisible)
-                uiHelpers.updateVisibility(pages_tab_layout_fading_edge, state.isAuthorFilterVisible)
+                uiHelpers.updateVisibility(pagesAuthorSelection, state.isAuthorFilterVisible)
+                uiHelpers.updateVisibility(pagesTabLayoutFadingEdge, state.isAuthorFilterVisible)
 
                 val tabLayoutPaddingStart =
-                        if (state.isAuthorFilterVisible)
+                        if (state.isAuthorFilterVisible) {
                             resources.getDimensionPixelSize(R.dimen.posts_list_tab_layout_fading_edge_width)
-                        else 0
+                        } else 0
                 tabLayout.setPaddingRelative(tabLayoutPaddingStart, 0, 0, 0)
 
                 authorSelectionAdapter.updateItems(state.authorFilterItems)
 
                 authorSelectionAdapter.getIndexOfSelection(state.authorFilterSelection)?.let { selectionIndex ->
-                    pages_author_selection.setSelection(selectionIndex)
+                    pagesAuthorSelection.setSelection(selectionIndex)
                 }
             }
         })
@@ -341,66 +340,42 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         )
     }
 
-    private fun setupObservers(activity: FragmentActivity) {
-        viewModel.listState.observe(viewLifecycleOwner, Observer {
+    private fun PagesFragmentBinding.setupObservers(activity: FragmentActivity) {
+        viewModel.listState.observe(viewLifecycleOwner, {
             refreshProgressBars(it)
         })
 
-        viewModel.createNewPage.observe(viewLifecycleOwner, Observer {
-            if (modalLayoutPickerFeatureConfig.isEnabled() && mlpViewModel.canShowModalLayoutPicker()) {
+        viewModel.createNewPage.observe(viewLifecycleOwner, {
+            if (mlpViewModel.canShowModalLayoutPicker()) {
                 mlpViewModel.createPageFlowTriggered()
             } else {
                 createNewPage()
             }
         })
 
-        mlpViewModel.onCreateNewPageRequested.observe(viewLifecycleOwner, Observer { request ->
-            createNewPage(request.title, request.content, request.template)
-        })
-
-        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, Observer { holder ->
-            val parent = activity.findViewById<View>(R.id.coordinatorLayout)
-            if (holder != null && parent != null) {
-                if (holder.buttonTitle == null) {
-                    WPSnackbar.make(
-                            parent,
-                            uiHelpers.getTextOfUiString(requireContext(), holder.message),
-                            Snackbar.LENGTH_LONG
-                    ).show()
-                } else {
-                    val snackbar = WPSnackbar.make(
-                            parent,
-                            uiHelpers.getTextOfUiString(requireContext(), holder.message),
-                            Snackbar.LENGTH_LONG
-                    )
-                    snackbar.setAction(
-                            uiHelpers.getTextOfUiString(requireContext(),
-                            holder.buttonTitle)) { holder.buttonAction()
-                    }
-                    snackbar.show()
-                }
-            }
+        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, { holder ->
+            showSnackbarInActivity(activity, holder)
         })
 
-        viewModel.editPage.observe(viewLifecycleOwner, Observer { (site, page, loadAutoRevision) ->
+        viewModel.editPage.observe(viewLifecycleOwner, { (site, page, loadAutoRevision) ->
             page?.let {
-                ActivityLauncher.editPageForResult(this, site, page.id, loadAutoRevision)
+                ActivityLauncher.editPageForResult(this@PagesFragment, site, page.id, loadAutoRevision)
             }
         })
 
-        viewModel.previewPage.observe(viewLifecycleOwner, Observer { post ->
+        viewModel.previewPage.observe(viewLifecycleOwner, { post ->
             post?.let {
                 previewPage(activity, post)
             }
         })
 
-        viewModel.browsePreview.observe(viewLifecycleOwner, Observer { preview ->
+        viewModel.browsePreview.observe(viewLifecycleOwner, { preview ->
             preview?.let {
                 ActivityLauncher.previewPostOrPageForResult(activity, viewModel.site, preview.post, preview.previewType)
             }
         })
 
-        viewModel.previewState.observe(viewLifecycleOwner, Observer {
+        viewModel.previewState.observe(viewLifecycleOwner, {
             progressDialog = progressDialogHelper.updateProgressDialogState(
                     activity,
                     progressDialog,
@@ -409,11 +384,11 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
             )
         })
 
-        viewModel.setPageParent.observe(viewLifecycleOwner, Observer { page ->
-            page?.let { ActivityLauncher.viewPageParentForResult(this, page) }
+        viewModel.setPageParent.observe(viewLifecycleOwner, { page ->
+            page?.let { ActivityLauncher.viewPageParentForResult(this@PagesFragment, page) }
         })
 
-        viewModel.isNewPageButtonVisible.observe(viewLifecycleOwner, Observer { isVisible ->
+        viewModel.isNewPageButtonVisible.observe(viewLifecycleOwner, { isVisible ->
             isVisible?.let {
                 if (isVisible) {
                     newPageButton.show()
@@ -423,19 +398,52 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
             }
         })
 
-        viewModel.scrollToPage.observe(viewLifecycleOwner, Observer { requestedPage ->
+        viewModel.scrollToPage.observe(viewLifecycleOwner, { requestedPage ->
             requestedPage?.let { page ->
                 val pagerIndex = PagesPagerAdapter.pageTypes.indexOf(PageListType.fromPageStatus(page.status))
                 pagesPager.currentItem = pagerIndex
                 (pagesPager.adapter as PagesPagerAdapter).scrollToPage(page)
             }
         })
+    }
+
+    private fun showSnackbarInActivity(
+        activity: FragmentActivity,
+        holder: SnackbarMessageHolder?
+    ) {
+        val parent = activity.findViewById<View>(R.id.coordinatorLayout)
+        if (holder != null && parent != null) {
+            if (holder.buttonTitle == null) {
+                WPSnackbar.make(
+                        parent,
+                        uiHelpers.getTextOfUiString(requireContext(), holder.message),
+                        Snackbar.LENGTH_LONG
+                ).show()
+            } else {
+                val snackbar = WPSnackbar.make(
+                        parent,
+                        uiHelpers.getTextOfUiString(requireContext(), holder.message),
+                        Snackbar.LENGTH_LONG
+                )
+                snackbar.setAction(
+                        uiHelpers.getTextOfUiString(
+                                requireContext(),
+                                holder.buttonTitle
+                        )
+                ) {
+                    holder.buttonAction()
+                }
+                snackbar.show()
+            }
+        }
+    }
 
-        viewModel.dialogAction.observe(viewLifecycleOwner, Observer {
+    private fun setupActions(activity: FragmentActivity) {
+        viewModel.dialogAction.observe(viewLifecycleOwner, {
             it?.show(activity, activity.supportFragmentManager, uiHelpers)
         })
 
-        viewModel.postUploadAction.observe(viewLifecycleOwner, Observer {
+        viewModel.postUploadAction.observe(viewLifecycleOwner, {
             it?.let { (post, site, data) ->
                 uploadUtilsWrapper.handleEditPostResultSnackbars(
                         activity,
@@ -443,47 +451,50 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
                         data,
                         post,
                         site,
-                        uploadActionUseCase.getUploadAction(post),
-                        View.OnClickListener {
-                            uploadUtilsWrapper.publishPost(
-                                    activity,
-                                    post,
-                                    site
-                            )
-                        }
-                )
+                        uploadActionUseCase.getUploadAction(post)
+                ) {
+                    uploadUtilsWrapper.publishPost(
+                            activity,
+                            post,
+                            site
+                    )
+                }
             }
         })
 
-        viewModel.publishAction.observe(this, Observer {
+        viewModel.publishAction.observe(this@PagesFragment, {
             it?.let {
                 uploadUtilsWrapper.publishPost(activity, it.post, it.site)
             }
         })
 
-        viewModel.uploadFinishedAction.observe(viewLifecycleOwner, Observer {
-            it?.let { (page, isError) ->
+        viewModel.uploadFinishedAction.observe(viewLifecycleOwner, {
+            it?.let { (page, isError, isFirstTimePublish) ->
                 uploadUtilsWrapper.onPostUploadedSnackbarHandler(
                         activity,
                         activity.findViewById(R.id.coordinator),
                         isError,
+                        isFirstTimePublish,
                         page.post,
                         null,
                         page.site
                 )
             }
         })
+    }
 
-        mlpViewModel.isModalLayoutPickerShowing.observe(viewLifecycleOwner, Observer { event: Event<Boolean> ->
-            event.applyIfNotHandled {
-                val fm = activity.supportFragmentManager
-                var mlpFragment = fm.findFragmentByTag(MODAL_LAYOUT_PICKER_TAG) as ModalLayoutPickerFragment?
-                if (this && mlpFragment == null) {
-                    mlpFragment = ModalLayoutPickerFragment()
-                    mlpFragment.show(fm, MODAL_LAYOUT_PICKER_TAG)
-                } else if (!this && mlpFragment != null) {
-                    mlpFragment.dismiss()
-                }
+    private fun setupMlpObservers(activity: FragmentActivity) {
+        mlpViewModel.onCreateNewPageRequested.observe(viewLifecycleOwner, { request ->
+            createNewPage(request.title, request.content, request.template)
+        })
+        mlpViewModel.isModalLayoutPickerShowing.observeEvent(viewLifecycleOwner, { isShowing ->
+            val fm = activity.supportFragmentManager
+            var mlpFragment = fm.findFragmentByTag(MODAL_LAYOUT_PICKER_TAG) as ModalLayoutPickerFragment?
+            if (isShowing && mlpFragment == null) {
+                mlpFragment = ModalLayoutPickerFragment()
+                mlpFragment.show(fm, MODAL_LAYOUT_PICKER_TAG)
+            } else if (!isShowing && mlpFragment != null) {
+                mlpFragment.dismiss()
             }
         })
     }
@@ -495,10 +506,6 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
      * @param template the selected layout template
      */
     private fun createNewPage(title: String = "", content: String = "", template: String? = null) {
-        QuickStartUtils.completeTaskAndRemindNextOne(
-                quickStartStore, QuickStartTask.CREATE_NEW_PAGE, dispatcher,
-                viewModel.site, quickStartEvent, context
-        )
         ActivityLauncher.addNewPageForResult(
                 this, viewModel.site, title, content, template,
                 PAGE_FROM_PAGES_LIST
@@ -512,7 +519,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
             "Menu does not contain mandatory search item"
         }
 
-        initializeSearchView()
+        binding!!.initializeSearchView()
     }
 
     private fun refreshProgressBars(listState: PageListState?) {
@@ -523,7 +530,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         swipeToRefreshHelper.isRefreshing = listState == FETCHING
     }
 
-    private fun hideSearchList(myActionMenuItem: MenuItem) {
+    private fun PagesFragmentBinding.hideSearchList(myActionMenuItem: MenuItem) {
         pagesPager.visibility = View.VISIBLE
         tabLayout.visibility = View.VISIBLE
         tabContainer.visibility = View.VISIBLE
@@ -531,12 +538,12 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         if (myActionMenuItem.isActionViewExpanded) {
             myActionMenuItem.collapseActionView()
         }
-        appbar_main.getTag(R.id.pages_non_search_recycler_view_id_tag_key)?.let {
-            appbar_main.setLiftOnScrollTargetViewIdAndRequestLayout(it as Int)
+        appbarMain.getTag(R.id.pages_non_search_recycler_view_id_tag_key)?.let {
+            appbarMain.setLiftOnScrollTargetViewIdAndRequestLayout(it as Int)
         }
     }
 
-    private fun showSearchList(myActionMenuItem: MenuItem) {
+    private fun PagesFragmentBinding.showSearchList(myActionMenuItem: MenuItem) {
         pagesPager.visibility = View.GONE
         tabLayout.visibility = View.GONE
         tabContainer.visibility = View.GONE
@@ -544,7 +551,7 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         if (!myActionMenuItem.isActionViewExpanded) {
             myActionMenuItem.expandActionView()
         }
-        appbar_main.setLiftOnScrollTargetViewIdAndRequestLayout(R.id.pages_search_recycler_view_id)
+        appbarMain.setLiftOnScrollTargetViewIdAndRequestLayout(R.id.pages_search_recycler_view_id)
     }
 
     fun onPositiveClickedForBasicDialog(instanceTag: String) {
@@ -555,45 +562,11 @@ class PagesFragment : Fragment(), ScrollableViewInitializedListener {
         viewModel.onNegativeClickedForBasicDialog(instanceTag)
     }
 
-    override fun onStart() {
-        super.onStart()
-        EventBus.getDefault().register(this)
-    }
-
-    override fun onStop() {
-        super.onStop()
-        EventBus.getDefault().unregister(this)
-    }
-
-    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    @SuppressWarnings("unused")
-    fun onEvent(event: QuickStartEvent) {
-        if (!isAdded || view == null) {
-            return
-        }
-
-        EventBus.getDefault().removeStickyEvent(event)
-        quickStartEvent = event
-
-        if (quickStartEvent?.task == QuickStartTask.CREATE_NEW_PAGE) {
-            view?.post {
-                val title = QuickStartUtils.stylizeQuickStartPrompt(
-                        requireActivity(),
-                        R.string.quick_start_dialog_create_new_page_message_short_pages,
-                        R.drawable.ic_create_white_24dp
-                )
-
-                WPDialogSnackbar.make(
-                        requireView().findViewById(R.id.coordinatorLayout), title,
-                        resources.getInteger(R.integer.quick_start_snackbar_duration_ms)
-                ).show()
-            }
-        }
-    }
-
     override fun onScrollableViewInitialized(containerId: Int) {
-        appbar_main.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
-        appbar_main.setTag(R.id.pages_non_search_recycler_view_id_tag_key, containerId)
+        with(binding!!) {
+            appbarMain.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
+            appbarMain.setTag(R.id.pages_non_search_recycler_view_id_tag_key, containerId)
+        }
     }
 }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/SearchListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/SearchListFragment.kt
index 83a250f1d304..1bd2d2571118 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/pages/SearchListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/SearchListFragment.kt
@@ -9,7 +9,6 @@ import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.pages_list_fragment.*
@@ -58,9 +57,9 @@ class SearchListFragment : Fragment() {
     }
 
     private fun initializeViewModels(activity: FragmentActivity) {
-        val pagesViewModel = ViewModelProviders.of(activity, viewModelFactory).get(PagesViewModel::class.java)
+        val pagesViewModel = ViewModelProvider(activity, viewModelFactory).get(PagesViewModel::class.java)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(SearchListViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(SearchListViewModel::class.java)
         viewModel.start(pagesViewModel)
 
         setupObservers()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksAnalyticsUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksAnalyticsUtils.kt
new file mode 100644
index 000000000000..aa37416983be
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksAnalyticsUtils.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.ui.people
+
+import org.wordpress.android.ui.people.AnalyticsInviteLinksActionResult.ERROR
+import org.wordpress.android.ui.people.AnalyticsInviteLinksActionResult.SUCCEEDED
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Failure
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Success
+
+private const val INVITE_LINKS_ACTION_RESULT = "invite_links_action_result"
+private const val INVITE_LINKS_ACTION_HAS_LINKS = "invite_links_action_has_links"
+private const val INVITE_LINKS_ACTION_ERROR_MESSAGE = "invite_links_action_error_message"
+private const val INVITE_LINKS_SHARED_ROLE = "invite_links_shared_role"
+
+enum class AnalyticsInviteLinksActionResult(val actionResult: String) {
+    SUCCEEDED("succeeded"),
+    ERROR("error")
+}
+
+enum class AnalyticsInviteLinksGenericError(val errorMessage: String) {
+    USER_NOT_AUTHENTICATED("user_not_authenticated"),
+    NO_NETWORK("no_network"),
+    NO_ROLE_DATA_MATCHED("no_role_data_matched")
+}
+
+fun MutableMap<String, Any?>.addInviteLinksActionResult(
+    result: AnalyticsInviteLinksActionResult,
+    errorMessage: String? = null
+): MutableMap<String, Any?> {
+    this[INVITE_LINKS_ACTION_RESULT] = result.actionResult
+    errorMessage?.also {
+        this[INVITE_LINKS_ACTION_ERROR_MESSAGE] = errorMessage
+    }
+    return this
+}
+
+fun MutableMap<String, Any?>.addInviteLinksActionResult(
+    actionResult: InviteLinksCallResult,
+    errorMessage: String? = null
+): MutableMap<String, Any?> {
+    this[INVITE_LINKS_ACTION_RESULT] = when (actionResult) {
+        is Success -> SUCCEEDED.actionResult
+        is Failure -> ERROR.actionResult
+    }
+
+    if (actionResult is Success) {
+        this[INVITE_LINKS_ACTION_HAS_LINKS] = actionResult.links.count() > 0
+    }
+
+    errorMessage?.also {
+        this[INVITE_LINKS_ACTION_ERROR_MESSAGE] = errorMessage
+    }
+    return this
+}
+
+fun MutableMap<String, Any?>.addInviteLinksSharedRole(
+    role: String
+): MutableMap<String, Any?> {
+    return this.apply { this[INVITE_LINKS_SHARED_ROLE] = role }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksApiCallsProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksApiCallsProvider.kt
new file mode 100644
index 000000000000..bd087b1d4d09
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksApiCallsProvider.kt
@@ -0,0 +1,142 @@
+package org.wordpress.android.ui.people
+
+import org.wordpress.android.WordPress
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+import com.android.volley.VolleyError
+import com.google.gson.Gson
+import com.google.gson.JsonParseException
+import com.google.gson.reflect.TypeToken
+import com.wordpress.rest.RestRequest.ErrorListener
+import com.wordpress.rest.RestRequest.Listener
+import org.json.JSONObject
+import org.wordpress.android.R
+import org.wordpress.android.R.string
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Failure
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Success
+import org.wordpress.android.util.VolleyUtils
+
+class InviteLinksApiCallsProvider @Inject constructor(
+    private val contextProvider: ContextProvider
+) {
+    suspend fun getInviteLinksStatus(blogId: Long): InviteLinksCallResult = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/invites"
+
+        val listener = Listener { jsonObject ->
+            val result = getLinks(jsonObject)
+            AppLog.d(
+                    T.PEOPLE,
+                    "getInviteLinksStatus > Succeeded [blogId=$blogId - result = " +
+                            "${(result as Success).links.map { "Name: ${it.role} Expiry: ${it.expiry}" }}]"
+            )
+            cont.resume(result)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            val error = getErrorStringAndLog("getInviteLinksStatus", blogId, volleyError)
+            cont.resume(Failure(error))
+        }
+
+        WordPress.getRestClientUtilsV1_1().get(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    suspend fun generateLinks(blogId: Long): InviteLinksCallResult = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/invites/links/generate"
+
+        val listener = Listener { jsonObject ->
+            AppLog.d(
+                    T.PEOPLE,
+                    "generateLinks > Succeeded [blogId=$blogId]"
+            )
+            cont.resume(Success(listOf()))
+        }
+        val errorListener = ErrorListener { volleyError ->
+            val error = getErrorStringAndLog("generateLinks", blogId, volleyError)
+            cont.resume(Failure(error))
+        }
+
+        WordPress.getRestClientUtilsV2().post(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    suspend fun disableLinks(blogId: Long): InviteLinksCallResult = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/invites/links/disable"
+
+        val listener = Listener { jsonObject ->
+            AppLog.d(
+                    T.PEOPLE,
+                    "deleteLinks > Succeeded [blogId=$blogId]"
+            )
+            cont.resume(Success(listOf()))
+        }
+        val errorListener = ErrorListener { volleyError ->
+            val error = getErrorStringAndLog("deleteLinks", blogId, volleyError)
+            cont.resume(Failure(error))
+        }
+
+        WordPress.getRestClientUtilsV2().post(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    private fun getLinks(json: JSONObject?): InviteLinksCallResult {
+        return json?.let {
+            if (it.has("links")) {
+                try {
+                    val linksSection = it.getJSONArray("links").toString()
+                    val gson = Gson()
+                    val mapType = object : TypeToken<Array<InviteLinksItem>>() {}.type
+                    val linksData = gson.fromJson<Array<InviteLinksItem>>(linksSection, mapType).toList()
+
+                    Success(linksData)
+                } catch (jsonEx: JsonParseException) {
+                    AppLog.d(T.PEOPLE, "getLinks > Error parsing server API response: error[{${jsonEx.message}}]")
+                    Failure(contextProvider.getContext().getString((string.invite_links_bad_format_response)))
+                }
+            } else {
+                Success(listOf())
+            }
+        } ?: Failure(contextProvider.getContext().getString(string.invite_links_null_response))
+    }
+
+    private fun getErrorStringAndLog(
+        functionName: String,
+        blogId: Long,
+        volleyError: VolleyError?
+    ): String {
+        val error = VolleyUtils.errStringFromVolleyError(volleyError)
+        return if (error.isNullOrEmpty()) {
+            AppLog.d(
+                    T.PEOPLE,
+                    "$functionName > Failed with empty string " +
+                            "[blogId=$blogId - volleyError = $volleyError]"
+            )
+            contextProvider.getContext().getString(R.string.invite_links_generic_get_data_error)
+        } else {
+            AppLog.d(
+                    T.PEOPLE,
+                    "$functionName > Failed [blogId=$blogId - error = $error]"
+            )
+            error
+        }
+    }
+
+    data class InviteLinksItem(val role: String, val expiry: Long, val link: String /*UriWrapper*/)
+
+    sealed class InviteLinksCallResult {
+        data class Success(val links: List<InviteLinksItem>) : InviteLinksCallResult()
+        data class Failure(val error: String) : InviteLinksCallResult()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksHandler.kt
new file mode 100644
index 000000000000..9d993b0f4a6f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksHandler.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.ui.people
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksData
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksError
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksLoading
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksNotAllowed
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksUserChangedRole
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.UserNotAuthenticated
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+import javax.inject.Named
+
+class InviteLinksHandler @Inject constructor(
+    private val inviteLinksUseCase: InviteLinksUseCase,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _inviteLinksState = MediatorLiveData<InviteLinksState>()
+    val inviteLinksState: LiveData<InviteLinksState> = _inviteLinksState
+
+    suspend fun handleInviteLinksStatusRequest(blogId: Long, scenarioContext: UseCaseScenarioContext) {
+        inviteLinksUseCase.getInviteLinksStatus(blogId, scenarioContext)
+                .flowOn(bgDispatcher).collect { state ->
+                    manageState(state)
+                }
+    }
+
+    suspend fun handleGenerateLinks(blogId: Long) {
+        inviteLinksUseCase.generateLinks(blogId)
+                .flowOn(bgDispatcher).collect { state ->
+                    manageState(state)
+                }
+    }
+
+    suspend fun handleDisableLinks(blogId: Long) {
+        inviteLinksUseCase.disableLinks(blogId)
+                .flowOn(bgDispatcher).collect { state ->
+                    manageState(state)
+                }
+    }
+
+    private fun manageState(state: InviteLinksState) {
+        when (state) {
+            InviteLinksNotAllowed,
+            UserNotAuthenticated,
+            is InviteLinksData,
+            is InviteLinksLoading -> { _inviteLinksState.postValue(state) }
+            is InviteLinksError -> {
+                _inviteLinksState.postValue(state)
+                _snackbarEvents.postValue(Event(SnackbarMessageHolder(state.error)))
+            }
+            is InviteLinksUserChangedRole -> {}
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksUiState.kt
new file mode 100644
index 000000000000..88676a909c99
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksUiState.kt
@@ -0,0 +1,36 @@
+package org.wordpress.android.ui.people
+
+import org.wordpress.android.ui.people.InviteLinksUiStateType.LOADING
+
+data class InviteLinksUiState(
+    val type: InviteLinksUiStateType,
+    val isLinksSectionVisible: Boolean,
+    val loadAndRetryUiState: LoadAndRetryUiState,
+    val isShimmerSectionVisible: Boolean,
+    val isRoleSelectionAllowed: Boolean,
+    val links: List<InviteLinksUiItem>,
+    val inviteLinksSelectedRole: InviteLinksUiItem,
+    val enableManageLinksActions: Boolean,
+    val startShimmer: Boolean = isShimmerSectionVisible && type == LOADING,
+    val isActionButtonsEnabled: Boolean = !startShimmer
+)
+
+enum class InviteLinksUiStateType {
+    HIDDEN,
+    LOADING,
+    GET_STATUS_RETRY,
+    LINKS_GENERATE,
+    LINKS_AVAILABLE
+}
+
+enum class LoadAndRetryUiState {
+    HIDDEN,
+    LOADING,
+    RETRY
+}
+
+data class InviteLinksUiItem(val roleName: String, val roleDisplayName: String, val expiryDate: String) {
+    companion object {
+        fun getEmptyItem() = InviteLinksUiItem("", "", "-")
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksUseCase.kt
new file mode 100644
index 000000000000..17a4e79df98e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/InviteLinksUseCase.kt
@@ -0,0 +1,194 @@
+package org.wordpress.android.ui.people
+
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import kotlinx.coroutines.flow.flow
+import org.wordpress.android.R.string
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.ui.people.AnalyticsInviteLinksActionResult.ERROR
+import org.wordpress.android.ui.people.AnalyticsInviteLinksGenericError.NO_NETWORK
+import org.wordpress.android.ui.people.AnalyticsInviteLinksGenericError.USER_NOT_AUTHENTICATED
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Failure
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Success
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksItem
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksData
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksError
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksLoading
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.UserNotAuthenticated
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.GENERATING_LINKS
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.INITIALIZING
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.MANAGING_AVAILABLE_LINKS
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import javax.inject.Inject
+
+class InviteLinksUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val inviteLinksApiCallsProvider: InviteLinksApiCallsProvider,
+    private val accountStore: AccountStore,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
+    private val siteStore: SiteStore
+) {
+    suspend fun getInviteLinksStatus(
+        blogId: Long,
+        scenarioContext: UseCaseScenarioContext
+    ): Flow<InviteLinksState> = flow {
+        makeChecksAndApplyStrategy(
+                this,
+                blogId,
+                ::getInvitesStrategy,
+                scenarioContext,
+                Stat.INVITE_LINKS_GET_STATUS
+        )
+    }
+
+    suspend fun generateLinks(blogId: Long): Flow<InviteLinksState> = flow {
+        makeChecksAndApplyStrategy(
+                this,
+                blogId,
+                ::generateInvitesStrategy,
+                GENERATING_LINKS,
+                Stat.INVITE_LINKS_GENERATE
+        )
+    }
+
+    suspend fun disableLinks(blogId: Long): Flow<InviteLinksState> = flow {
+        makeChecksAndApplyStrategy(
+                this,
+                blogId,
+                ::disableInvitesStrategy,
+                MANAGING_AVAILABLE_LINKS,
+                Stat.INVITE_LINKS_DISABLE
+        )
+    }
+
+    private suspend fun makeChecksAndApplyStrategy(
+        flow: FlowCollector<InviteLinksState>,
+        blogId: Long,
+        strategy: suspend (
+            flow: FlowCollector<InviteLinksState>,
+            blogId: Long,
+            scenarioContext: UseCaseScenarioContext
+        ) -> InviteLinksCallResult,
+        scenarioContext: UseCaseScenarioContext,
+        stat: Stat
+    ) {
+        val properties = mutableMapOf<String, Any?>()
+
+        if (!accountStore.hasAccessToken()) {
+            flow.emit(UserNotAuthenticated)
+            properties.addInviteLinksActionResult(ERROR, USER_NOT_AUTHENTICATED.errorMessage)
+        } else {
+            flow.emit(InviteLinksLoading(scenarioContext))
+            delay(PROGRESS_DELAY_MS)
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                flow.emit(InviteLinksError(scenarioContext, UiStringRes(string.error_network_connection)))
+                properties.addInviteLinksActionResult(ERROR, NO_NETWORK.errorMessage)
+            } else {
+                val actionResult = strategy.invoke(flow, blogId, scenarioContext)
+                properties.addInviteLinksActionResult(
+                        actionResult,
+                        if (actionResult is Failure) actionResult.error else null
+                )
+            }
+        }
+
+        analyticsUtilsWrapper.trackInviteLinksAction(stat, siteStore.getSiteBySiteId(blogId), properties)
+    }
+
+    private suspend fun getInvitesStrategy(
+        flow: FlowCollector<InviteLinksState>,
+        blogId: Long,
+        scenarioContext: UseCaseScenarioContext
+    ): InviteLinksCallResult {
+        val status = inviteLinksApiCallsProvider.getInviteLinksStatus(blogId)
+
+        when (status) {
+            is Success -> flow.emit(InviteLinksData(scenarioContext, status.links))
+            is Failure -> flow.emit(InviteLinksError(scenarioContext, UiStringText(status.error)))
+        }
+
+        return status
+    }
+
+    private suspend fun generateInvitesStrategy(
+        flow: FlowCollector<InviteLinksState>,
+        blogId: Long,
+        scenarioContext: UseCaseScenarioContext
+    ): InviteLinksCallResult {
+        var status = inviteLinksApiCallsProvider.generateLinks(blogId)
+
+        when (status) {
+            is Success -> {
+                status = inviteLinksApiCallsProvider.getInviteLinksStatus(blogId)
+
+                when (status) {
+                    is Success -> {
+                        flow.emit(InviteLinksData(scenarioContext, status.links))
+                    }
+                    is Failure -> {
+                        flow.emit(InviteLinksError(scenarioContext, UiStringText(status.error)))
+                    }
+                }
+            }
+            is Failure -> flow.emit(InviteLinksError(scenarioContext, UiStringText(status.error)))
+        }
+
+        return status
+    }
+
+    private suspend fun disableInvitesStrategy(
+        flow: FlowCollector<InviteLinksState>,
+        blogId: Long,
+        scenarioContext: UseCaseScenarioContext
+    ): InviteLinksCallResult {
+        val status = inviteLinksApiCallsProvider.disableLinks(blogId)
+
+        when (status) {
+            is Success -> flow.emit(InviteLinksData(scenarioContext, listOf()))
+            is Failure -> flow.emit(InviteLinksError(scenarioContext, UiStringText(status.error)))
+        }
+
+        return status
+    }
+
+    enum class UseCaseScenarioContext {
+        INITIALIZING,
+        GENERATING_LINKS,
+        MANAGING_AVAILABLE_LINKS
+    }
+
+    sealed class InviteLinksState(open val scenarioContext: UseCaseScenarioContext = INITIALIZING) {
+        object InviteLinksNotAllowed : InviteLinksState(INITIALIZING)
+
+        object UserNotAuthenticated : InviteLinksState(INITIALIZING)
+
+        data class InviteLinksLoading(override val scenarioContext: UseCaseScenarioContext) : InviteLinksState()
+
+        data class InviteLinksData(
+            override val scenarioContext: UseCaseScenarioContext,
+            val links: List<InviteLinksItem>
+        ) : InviteLinksState()
+
+        data class InviteLinksUserChangedRole(
+            val selectedRole: InviteLinksItem
+        ) : InviteLinksState(MANAGING_AVAILABLE_LINKS)
+
+        data class InviteLinksError(
+            override val scenarioContext: UseCaseScenarioContext,
+            val error: UiString
+        ) : InviteLinksState()
+    }
+
+    companion object {
+        // Pretty arbitrary amount to allow the progress bar to appear to the user
+        private const val PROGRESS_DELAY_MS = 600L
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteDialogFragment.kt
new file mode 100644
index 000000000000..972dca0ffa4d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteDialogFragment.kt
@@ -0,0 +1,112 @@
+package org.wordpress.android.ui.people
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelStoreOwner
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.people.PeopleInviteDialogFragment.DialogMode.DISABLE_INVITE_LINKS_CONFIRMATION
+import org.wordpress.android.ui.people.PeopleInviteDialogFragment.DialogMode.INVITE_LINKS_ROLE_SELECTION
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+/**
+ * This dialog is used in PeopleInviteFragment in the following scenarios
+ * based on DialogMode
+ *
+ * When DialogMode is INVITE_LINKS_ROLE_SELECTION: the dialog shows a simple dialog
+ * listing the available roles for sites to choose from
+ *
+ * When DialogMode is DISABLE_INVITE_LINKS_CONFIRMATION: the dialog shows a confirmation
+ * dialog asking to confirm to disable or not the currently available invite links
+ */
+
+class PeopleInviteDialogFragment : DialogFragment() {
+    @Inject lateinit var contextProvider: ContextProvider
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+
+    private lateinit var viewModel: PeopleInviteViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        viewModel = ViewModelProvider(
+                targetFragment as ViewModelStoreOwner, viewModelFactory
+        ).get(PeopleInviteViewModel::class.java)
+
+        val dialogMode = arguments?.getSerializable(ARG_DIALOG_MODE) as? DialogMode
+        val roles = arguments?.getStringArray(ARG_ROLES)
+        val builder = MaterialAlertDialogBuilder(requireActivity())
+
+        dialogMode?.let { mode ->
+            builder.apply {
+                setTitle(dialogMode.title)
+
+                when (mode) {
+                    INVITE_LINKS_ROLE_SELECTION -> {
+                        setItems(roles) { _, which ->
+                            if (!isAdded) return@setItems
+
+                            viewModel.onLinksRoleSelected(roles?.get(which) ?: "")
+                        }
+                    }
+                    DISABLE_INVITE_LINKS_CONFIRMATION -> {
+                        setMessage(mode.message)
+                        setNegativeButton(mode.negativeButtonText, null)
+                        setPositiveButton(mode.positiveButtonText) { _, _ ->
+                            if (!isAdded) return@setPositiveButton
+                            viewModel.onDisableLinksButtonClicked()
+                        }
+                    }
+                }
+            }
+        }
+
+        return builder.create()
+    }
+
+    companion object {
+        private const val ARG_DIALOG_MODE = "dialog_mode"
+        private const val ARG_ROLES = "roles"
+
+        @JvmStatic
+        @JvmOverloads
+        fun newInstance(
+            fragment: Fragment,
+            dialogMode: DialogMode,
+            roles: Array<String> = arrayOf()
+        ): PeopleInviteDialogFragment {
+            return PeopleInviteDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putSerializable(ARG_DIALOG_MODE, dialogMode)
+                    putStringArray(ARG_ROLES, roles)
+                }
+                setTargetFragment(fragment, 0)
+            }
+        }
+    }
+
+    enum class DialogMode(
+        val title: Int,
+        val message: Int = 0,
+        val negativeButtonText: Int = 0,
+        val positiveButtonText: Int = 0
+    ) {
+        INVITE_LINKS_ROLE_SELECTION(
+                R.string.role
+        ),
+        DISABLE_INVITE_LINKS_CONFIRMATION(
+                R.string.invite_links_disable_dialog_title,
+                R.string.invite_links_disable_dialog_message,
+                R.string.cancel,
+                R.string.disable
+        )
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
index 65b3053f84f2..2b681fcd78d7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java
@@ -1,29 +1,37 @@
 package org.wordpress.android.ui.people;
 
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
+import android.widget.AutoCompleteTextView;
 import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProvider;
 
+import com.facebook.shimmer.ShimmerFrameLayout;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.textview.MaterialTextView;
+
+import org.jetbrains.annotations.NotNull;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.model.RoleModel;
@@ -31,43 +39,64 @@
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.models.RoleUtils;
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.android.ui.people.PeopleInviteDialogFragment.DialogMode;
+import org.wordpress.android.ui.people.WPEditTextWithChipsOutlined.ItemValidationState;
+import org.wordpress.android.ui.people.WPEditTextWithChipsOutlined.ItemsManagerInterface;
 import org.wordpress.android.ui.people.utils.PeopleUtils;
 import org.wordpress.android.ui.people.utils.PeopleUtils.ValidateUsernameCallback.ValidationResult;
-import org.wordpress.android.util.ContextExtensionsKt;
-import org.wordpress.android.util.EditTextUtils;
+import org.wordpress.android.ui.utils.UiHelpers;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.widgets.MultiUsernameEditText;
+import org.wordpress.android.viewmodel.ContextProvider;
+import org.wordpress.android.widgets.WPSnackbar;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
 
+import static com.google.android.material.textfield.TextInputLayout.END_ICON_DROPDOWN_MENU;
+import static com.google.android.material.textfield.TextInputLayout.END_ICON_NONE;
+
+import kotlin.Unit;
+
 public class PeopleInviteFragment extends Fragment implements RoleSelectDialogFragment.OnRoleSelectListener,
         PeopleManagementActivity.InvitationSender {
     private static final String URL_USER_ROLES_DOCUMENTATION = "https://en.support.wordpress.com/user-roles/";
     private static final String FLAG_SUCCESS = "SUCCESS";
     private static final String KEY_USERNAMES = "usernames";
     private static final String KEY_SELECTED_ROLE = "selected-role";
-    private static final int MAX_NUMBER_OF_INVITEES = 10;
-    private static final String[] USERNAME_DELIMITERS = {" ", ","};
-    private final Map<String, ViewGroup> mUsernameButtons = new LinkedHashMap<>();
+    public static final String DIALOG_TAG = "dialog_fragment_tag";
+
+    private ArrayList<String> mUsernames = new ArrayList<>();
     private final HashMap<String, String> mUsernameResults = new HashMap<>();
     private final Map<String, View> mUsernameErrorViews = new Hashtable<>();
-    private ArrayList<String> mUsernames = new ArrayList<>();
-    private ViewGroup mUsernamesContainer;
-    private MultiUsernameEditText mUsernameEditText;
-    private TextView mRoleTextView;
+
+    private WPEditTextWithChipsOutlined mUsernamesEmails;
+    private AutoCompleteTextView mRoleTextView;
+    private TextInputLayout mRoleContainer;
     private EditText mCustomMessageEditText;
 
+    private ViewGroup mCoordinator;
+    private ViewGroup mInviteLinkContainer;
+    private ShimmerFrameLayout mShimmerContainer;
+    private MaterialButton mGenerateLinksButton;
+    private ViewGroup mLoadAndRetryLinksContainer;
+    private MaterialButton mRetryButton;
+    private ProgressBar mLoadingLinksProgress;
+    private ViewGroup mManageLinksContainer;
+    private MaterialButton mShareLinksButton;
+    private AutoCompleteTextView mLinksRoleTextView;
+    private TextInputLayout mLinksRoleContainer;
+    private MaterialButton mDisableLinksButton;
+    private MaterialTextView mExpireDateTextView;
+
     private List<RoleModel> mInviteRoles;
     private String mCurrentRole;
     private String mCustomMessage = "";
@@ -75,10 +104,11 @@ public class PeopleInviteFragment extends Fragment implements RoleSelectDialogFr
     private SiteModel mSite;
 
     @Inject SiteStore mSiteStore;
+    @Inject ViewModelProvider.Factory mViewModelFactory;
+    @Inject UiHelpers mUiHelpers;
+    @Inject ContextProvider mContextProvider;
 
-    private int mNormalUsernameColor;
-    private int mAddedUsernameColor;
-    private int mErrorUsernameColor;
+    private PeopleInviteViewModel mViewModel;
 
     public static PeopleInviteFragment newInstance(SiteModel site) {
         PeopleInviteFragment peopleInviteFragment = new PeopleInviteFragment();
@@ -116,11 +146,10 @@ public void onPrepareOptionsMenu(Menu menu) {
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
-
         if (mCurrentRole != null) {
             outState.putString(KEY_SELECTED_ROLE, mCurrentRole);
         }
-        outState.putStringArrayList(KEY_USERNAMES, new ArrayList<>(mUsernameButtons.keySet()));
+        outState.putStringArrayList(KEY_USERNAMES, new ArrayList<>(mUsernamesEmails.getChipsStrings()));
     }
 
     @Override
@@ -128,7 +157,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getActivity().getApplicationContext()).component().inject(this);
         updateSiteOrFinishActivity();
-        mInviteRoles = RoleUtils.getInviteRoles(mSiteStore, mSite, this);
+        mInviteRoles = RoleUtils.getInviteRoles(mSiteStore, mSite, mContextProvider.getContext());
 
         if (savedInstanceState != null) {
             mCurrentRole = savedInstanceState.getString(KEY_SELECTED_ROLE);
@@ -159,137 +188,190 @@ public View onCreateView(final LayoutInflater inflater, ViewGroup container, Bun
         if (actionBar != null) {
             actionBar.setHomeButtonEnabled(true);
             actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(R.string.people);
-        }
-
-        mNormalUsernameColor = ContextExtensionsKt.getColorResIdFromAttribute(getActivity(), R.attr.colorOnSurface);
-        mAddedUsernameColor = ContextExtensionsKt.getColorResIdFromAttribute(getActivity(), R.attr.colorPrimary);
-        mErrorUsernameColor = ContextExtensionsKt.getColorResIdFromAttribute(getActivity(), R.attr.wpColorError);
+            actionBar.setTitle(R.string.invite_people);
+        }
+
+        mInviteLinkContainer = rootView.findViewById(R.id.invite_links_container);
+        mShimmerContainer = rootView.findViewById(R.id.shimmer_view_container);
+        mGenerateLinksButton = rootView.findViewById(R.id.generate_links);
+        mLoadAndRetryLinksContainer = rootView.findViewById(R.id.load_and_retry_container);
+        mRetryButton = rootView.findViewById(R.id.get_status_retry);
+        mLoadingLinksProgress = rootView.findViewById(R.id.get_links_status_progress);
+        mManageLinksContainer = rootView.findViewById(R.id.manage_links_container);
+        mShareLinksButton = rootView.findViewById(R.id.share_links);
+        mLinksRoleTextView = rootView.findViewById(R.id.links_role);
+        mLinksRoleContainer = rootView.findViewById(R.id.links_role_container);
+        mDisableLinksButton = rootView.findViewById(R.id.disable_button);
+        mExpireDateTextView = rootView.findViewById(R.id.expire_date);
 
         return rootView;
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
-        mUsernamesContainer = (ViewGroup) view.findViewById(R.id.usernames);
-        mUsernamesContainer.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                EditTextUtils.showSoftInput(mUsernameEditText);
-            }
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(PeopleInviteViewModel.class);
+
+        mGenerateLinksButton.setOnClickListener(v -> {
+            if (!isAdded()) return;
+            mViewModel.onGenerateLinksButtonClicked();
         });
 
-        if (TextUtils.isEmpty(mCurrentRole)) {
-            mCurrentRole = getDefaultRole();
-        }
+        mShareLinksButton.setOnClickListener(v -> {
+            if (!isAdded()) return;
+            mViewModel.onShareButtonClicked(
+                    mLinksRoleTextView.getText() != null
+                            ? mLinksRoleTextView.getText().toString()
+                            : ""
+            );
+        });
 
-        mUsernameEditText = (MultiUsernameEditText) view.findViewById(R.id.invite_usernames);
+        mDisableLinksButton.setOnClickListener(v -> {
+            if (!isAdded()) return;
 
-        // handle key preses from hardware keyboard
-        mUsernameEditText.setOnKeyListener(new View.OnKeyListener() {
-            @Override
-            public boolean onKey(View view, int i, KeyEvent keyEvent) {
-                return keyEvent.getKeyCode() == KeyEvent.KEYCODE_DEL
-                       && keyEvent.getAction() == KeyEvent.ACTION_DOWN
-                       && removeLastEnteredUsername();
-            }
+            PeopleInviteDialogFragment
+                    .newInstance(this, DialogMode.DISABLE_INVITE_LINKS_CONFIRMATION)
+                    .show(getParentFragmentManager(), DIALOG_TAG);
         });
 
-        mUsernameEditText.setOnBackspacePressedListener(new MultiUsernameEditText.OnBackspacePressedListener() {
-            @Override
-            public boolean onBackspacePressed() {
-                return removeLastEnteredUsername();
+        mRetryButton.setOnClickListener(v -> {
+            if (!isAdded()) return;
+            mViewModel.onRetryButtonClicked();
+        });
+
+        mViewModel.getSnackbarEvents().observe(getViewLifecycleOwner(), event ->
+                event.applyIfNotHandled(holder -> {
+                    WPSnackbar.make(mCoordinator,
+                            mUiHelpers.getTextOfUiString(mContextProvider.getContext(), holder.getMessage()),
+                            Snackbar.LENGTH_LONG)
+                              .show();
+                    return Unit.INSTANCE;
+                })
+        );
+
+        mViewModel.getInviteLinksUiState().observe(getViewLifecycleOwner(), uiState -> {
+            manageLinksControlsVisibility(uiState);
+
+            manageShimmerSection(uiState.isShimmerSectionVisible(), uiState.getStartShimmer());
+
+            manageActionButtonsEnabledState(uiState.isActionButtonsEnabled());
+
+            switch (uiState.getType()) {
+                case HIDDEN:
+                case LOADING:
+                case GET_STATUS_RETRY:
+                    // Nothing to do here
+                    break;
+                case LINKS_GENERATE:
+                    mManageLinksContainer.setVisibility(View.GONE);
+                    mGenerateLinksButton.setVisibility(View.VISIBLE);
+
+                    break;
+                case LINKS_AVAILABLE:
+                    mGenerateLinksButton.setVisibility(View.GONE);
+                    mManageLinksContainer.setVisibility(View.VISIBLE);
+
+                    setLinksRoleControlsBehaviour(uiState.isRoleSelectionAllowed());
+
+                    mLinksRoleTextView.setText(uiState.getInviteLinksSelectedRole().getRoleDisplayName());
+                    mExpireDateTextView.setText(
+                            getString(
+                                    R.string.invite_links_expire_date,
+                                    uiState.getInviteLinksSelectedRole().getExpiryDate()
+                            )
+                    );
+
+                    break;
             }
         });
 
-        mUsernameEditText.addTextChangedListener(new TextWatcher() {
-            private boolean mShouldIgnoreChanges = false;
+        mViewModel.getShareLink().observe(getViewLifecycleOwner(), event ->
+            event.applyIfNotHandled(linksItem -> {
+                Intent shareIntent = new Intent(Intent.ACTION_SEND);
+                shareIntent.setType("text/plain");
+                shareIntent.putExtra(Intent.EXTRA_TEXT, linksItem.getLink());
 
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-            }
+                startActivity(Intent.createChooser(shareIntent, getResources().getString(R.string.share_link)));
 
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                if (mShouldIgnoreChanges) { // used to avoid double call after calling setText from this method
-                    return;
+                return null;
+            }
+        ));
+
+        mViewModel.getShowSelectLinksRoleDialog().observe(getViewLifecycleOwner(), event ->
+            event.applyIfNotHandled(roles -> {
+                if (isAdded()) {
+                    PeopleInviteDialogFragment
+                            .newInstance(this, DialogMode.INVITE_LINKS_ROLE_SELECTION, roles)
+                            .show(getParentFragmentManager(), DIALOG_TAG);
                 }
 
-                mShouldIgnoreChanges = true;
-                if (mUsernameButtons.size() >= MAX_NUMBER_OF_INVITEES && !TextUtils.isEmpty(s)) {
-                    resetEditTextContent(mUsernameEditText);
-                } else if (endsWithDelimiter(mUsernameEditText.getText().toString())) {
-                    addUsername(mUsernameEditText, null);
-                }
-                mShouldIgnoreChanges = false;
+                return null;
             }
+        ));
 
-            @Override
-            public void afterTextChanged(Editable s) {
-            }
-        });
+        mViewModel.start(mSite);
+    }
 
-        mUsernameEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE || (event != null && event.getKeyCode() == KeyEvent
-                        .KEYCODE_ENTER)) {
-                    addUsername(mUsernameEditText, null);
-                    return true;
-                } else {
-                    return false;
-                }
+    @Override
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+
+        mUsernamesEmails = getView().findViewById(R.id.user_names_emails);
+        mRoleContainer = getView().findViewById(R.id.role_container);
+        mRoleTextView = getView().findViewById(R.id.role);
+        mCustomMessageEditText = (EditText) getView().findViewById(R.id.message);
+        mCoordinator = getView().findViewById(R.id.coordinator_layout);
+
+        if (TextUtils.isEmpty(mCurrentRole)) {
+            mCurrentRole = getDefaultRole();
+        }
+
+        mUsernamesEmails.setItemsManager(new ItemsManagerInterface() {
+            @Override public void onRemoveItem(@NotNull String item) {
+                removeUsername(item);
             }
-        });
 
-        mUsernameEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View v, boolean hasFocus) {
-                if (!hasFocus && mUsernameEditText.getText().toString().length() > 0) {
-                    addUsername(mUsernameEditText, null);
-                }
+            @Override public void onAddItem(@NotNull String item) {
+                addUsername(item, null);
             }
         });
 
-
-        // if mUsernameButtons is not empty, this means fragment retained itself
-        // if mUsernameButtons is empty, but we have manually retained usernames, this means that fragment was destroyed
+        // if mUsernamesEmails is not empty, this means fragment retained itself
+        // if mUsernamesEmails is empty, but we have manually retained usernames, this means that fragment was destroyed
         // and we need to recreate manually added views and revalidate usernames
-        if (!mUsernameButtons.isEmpty()) {
+        if (mUsernamesEmails.hasChips()) {
             mUsernameErrorViews.clear();
-            populateUsernameButtons(new ArrayList<>(mUsernameButtons.keySet()));
+            populateUsernameChips(new ArrayList<>(mUsernamesEmails.getChipsStrings()));
         } else if (!mUsernames.isEmpty()) {
-            populateUsernameButtons(new ArrayList<>(mUsernames));
+            populateUsernameChips(new ArrayList<>(mUsernames));
         }
 
-        mRoleTextView = (TextView) view.findViewById(R.id.role);
+        mRoleTextView.setShowSoftInputOnFocus(false);
+        mRoleTextView.setInputType(EditorInfo.TYPE_NULL);
+        mRoleTextView.setKeyListener(null);
         refreshRoleTextView();
-        ImageView imgRoleInfo = (ImageView) view.findViewById(R.id.imgRoleInfo);
-        imgRoleInfo.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                ActivityLauncher.openUrlExternal(v.getContext(), URL_USER_ROLES_DOCUMENTATION);
-            }
-        });
 
         if (mInviteRoles.size() > 1) {
-            view.findViewById(R.id.role_container).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    RoleSelectDialogFragment.show(PeopleInviteFragment.this, 0, mSite);
-                }
-            });
+            mRoleContainer.setEndIconMode(END_ICON_DROPDOWN_MENU);
+            mRoleTextView.setOnClickListener(v -> RoleSelectDialogFragment.show(PeopleInviteFragment.this, 0, mSite));
+            mRoleTextView.setFocusable(true);
+            mRoleTextView.setFocusableInTouchMode(true);
         } else {
-            // Don't show drop-down arrow or role selector if there's only one role available
-            mRoleTextView.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
+            mRoleContainer.setEndIconMode(END_ICON_NONE);
+            mRoleTextView.setOnClickListener(null);
+            mRoleTextView.setFocusable(false);
+            mRoleTextView.setFocusableInTouchMode(false);
         }
 
-        final int maxChars = getResources().getInteger(R.integer.invite_message_char_limit);
-        final TextView remainingCharsTextView = (TextView) view.findViewById(R.id.message_remaining);
+        mRoleContainer.setEndIconOnClickListener(null);
+        mRoleContainer.setEndIconCheckable(false);
+
+        MaterialTextView moreInfo = (MaterialTextView) getView().findViewById(R.id.learn_more);
+        moreInfo.setOnClickListener(
+                v -> ActivityLauncher.openUrlExternal(v.getContext(), URL_USER_ROLES_DOCUMENTATION)
+        );
 
-        mCustomMessageEditText = (EditText) view.findViewById(R.id.message);
         mCustomMessageEditText.addTextChangedListener(new TextWatcher() {
             @Override
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {
@@ -298,48 +380,17 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
             @Override
             public void onTextChanged(CharSequence s, int start, int before, int count) {
                 mCustomMessage = mCustomMessageEditText.getText().toString();
-                updateRemainingCharsView(remainingCharsTextView, mCustomMessage, maxChars);
             }
 
             @Override
             public void afterTextChanged(Editable s) {
             }
         });
-        updateRemainingCharsView(remainingCharsTextView, mCustomMessage, maxChars);
+
         // important for accessibility - talkback
         getActivity().setTitle(R.string.invite_people);
     }
 
-    private boolean endsWithDelimiter(String string) {
-        if (TextUtils.isEmpty(string)) {
-            return false;
-        }
-
-        for (String usernameDelimiter : USERNAME_DELIMITERS) {
-            if (string.endsWith(usernameDelimiter)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private String removeDelimiterFromUsername(String username) {
-        if (TextUtils.isEmpty(username)) {
-            return username;
-        }
-
-        String trimmedUsername = username.trim();
-
-        for (String usernameDelimiter : USERNAME_DELIMITERS) {
-            if (trimmedUsername.endsWith(usernameDelimiter)) {
-                return trimmedUsername.substring(0, trimmedUsername.length() - usernameDelimiter.length());
-            }
-        }
-
-        return trimmedUsername;
-    }
-
     private void resetEditTextContent(EditText editText) {
         if (editText != null) {
             editText.setText("");
@@ -353,110 +404,41 @@ private String getDefaultRole() {
         return mInviteRoles.get(0).getName();
     }
 
-    private void updateRemainingCharsView(TextView remainingCharsTextView, String currentString, int limit) {
-        remainingCharsTextView.setText(StringUtils.getQuantityString(getActivity(),
-                R.string.invite_message_remaining_zero,
-                R.string.invite_message_remaining_one,
-                R.string.invite_message_remaining_other,
-                limit - (currentString == null ? 0
-                        : currentString.length())));
-    }
-
-    private void populateUsernameButtons(Collection<String> usernames) {
+    private void populateUsernameChips(Collection<String> usernames) {
         if (usernames != null && usernames.size() > 0) {
-            for (String username : usernames) {
-                mUsernameButtons.put(username, buttonizeUsername(username));
-            }
-
             validateAndStyleUsername(usernames, null);
         }
     }
 
-    private ViewGroup buttonizeUsername(final String username) {
-        if (!isAdded()) {
-            return null;
-        }
-
-        final ViewGroup usernameButton = (ViewGroup) LayoutInflater.from(
-                getActivity()).inflate(R.layout.invite_username_button, mUsernamesContainer, false);
-        final TextView usernameTextView = (TextView) usernameButton.findViewById(R.id.username);
-        usernameTextView.setText(username);
-
-        mUsernamesContainer.addView(usernameButton, mUsernamesContainer.getChildCount() - 1);
-
-        final ImageButton delete = (ImageButton) usernameButton.findViewById(R.id.username_delete);
-        delete.setContentDescription(getString(R.string.invite_user_delete_desc, username));
-        delete.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                removeUsername(username);
-            }
-        });
-
-        return usernameButton;
-    }
-
-    private void addUsername(EditText editText, ValidationEndListener validationEndListener) {
-        String username = removeDelimiterFromUsername(editText.getText().toString());
-        resetEditTextContent(editText);
-
-        if (username.isEmpty() || mUsernameButtons.keySet().contains(username)) {
+    private void addUsername(@NotNull String username, ValidationEndListener validationEndListener) {
+        if (username.isEmpty() || mUsernamesEmails.containsChip(username)) {
             if (validationEndListener != null) {
                 validationEndListener.onValidationEnd();
             }
             return;
         }
-
-        final ViewGroup usernameButton = buttonizeUsername(username);
-
-        mUsernameButtons.put(username, usernameButton);
-
         validateAndStyleUsername(Collections.singletonList(username), validationEndListener);
     }
 
     private void removeUsername(String username) {
-        final ViewGroup usernamesView = (ViewGroup) getView().findViewById(R.id.usernames);
-
-        ViewGroup removedButton = mUsernameButtons.remove(username);
         mUsernameResults.remove(username);
-        usernamesView.removeView(removedButton);
-
+        mUsernamesEmails.removeChip(username);
         updateUsernameError(username, null);
     }
 
     private boolean isUserInInvitees(String username) {
-        return mUsernameButtons.get(username) != null;
-    }
-
-    /**
-     * Deletes the last entered username.
-     *
-     * @return true if the username was deleted
-     */
-    private boolean removeLastEnteredUsername() {
-        if (!TextUtils.isEmpty(mUsernameEditText.getText())) {
-            return false;
-        }
-
-        // try and remove the last entered username
-        List<String> list = new ArrayList<>(mUsernameButtons.keySet());
-        if (!list.isEmpty()) {
-            String username = list.get(list.size() - 1);
-            removeUsername(username);
-            return true;
-        }
-        return false;
+        return mUsernamesEmails.containsChip(username);
     }
 
     @Override
     public void onRoleSelected(RoleModel newRole) {
         setRole(newRole.getName());
 
-        if (!mUsernameButtons.keySet().isEmpty()) {
+        if (mUsernamesEmails.hasChips()) {
             // clear the username results list and let the 'validate' routine do the updates
             mUsernameResults.clear();
 
-            validateAndStyleUsername(mUsernameButtons.keySet(), null);
+            validateAndStyleUsername(mUsernamesEmails.getChipsStrings(), null);
         }
     }
 
@@ -476,10 +458,10 @@ private void validateAndStyleUsername(Collection<String> usernames,
         for (String username : usernames) {
             if (mUsernameResults.containsKey(username)) {
                 String resultMessage = mUsernameResults.get(username);
-                styleButton(username, resultMessage);
+                styleChip(username, resultMessage);
                 updateUsernameError(username, resultMessage);
             } else {
-                styleButton(username, null);
+                styleChip(username, null);
                 updateUsernameError(username, null);
 
                 usernamesToCheck.add(username);
@@ -506,7 +488,7 @@ public void onUsernameValidation(String username,
                                     getValidationErrorString(username, validationResult);
                             mUsernameResults.put(username, usernameResultString);
 
-                            styleButton(username, usernameResultString);
+                            styleChip(username, usernameResultString);
                             updateUsernameError(username, usernameResultString);
                         }
 
@@ -529,15 +511,17 @@ public void onError() {
         }
     }
 
-    private void styleButton(String username, @Nullable String validationResultMessage) {
+    private void styleChip(String username, @Nullable String validationResultMessage) {
         if (!isAdded()) {
             return;
         }
 
-        TextView textView = mUsernameButtons.get(username).findViewById(R.id.username);
-        textView.setTextColor(ContextCompat.getColor(getActivity(),
-                validationResultMessage == null ? mNormalUsernameColor
-                        : (validationResultMessage.equals(FLAG_SUCCESS) ? mAddedUsernameColor : mErrorUsernameColor)));
+        ItemValidationState resultState = validationResultMessage == null ? ItemValidationState.NEUTRAL
+                : (validationResultMessage.equals(FLAG_SUCCESS)
+                        ? ItemValidationState.VALIDATED
+                        : ItemValidationState.VALIDATED_WITH_ERRORS);
+
+        mUsernamesEmails.addOrUpdateChip(username, resultState);
     }
 
     private
@@ -601,7 +585,7 @@ private void clearUsernames(Collection<String> usernames) {
             removeUsername(username);
         }
 
-        if (mUsernameButtons.size() == 0) {
+        if (!mUsernamesEmails.hasChips()) {
             setRole(getDefaultRole());
             resetEditTextContent(mCustomMessageEditText);
         }
@@ -620,8 +604,10 @@ public void send() {
 
         enableSendButton(false);
 
-        if (mUsernameEditText.getText().toString().length() > 0) {
-            addUsername(mUsernameEditText, new ValidationEndListener() {
+        String lastMinuteUser = mUsernamesEmails.getTextIfAvailableOrNull();
+
+        if (lastMinuteUser != null) {
+            addUsername(lastMinuteUser, new ValidationEndListener() {
                 @Override
                 public void onValidationEnd() {
                     if (!checkAndSend()) {
@@ -650,7 +636,7 @@ private boolean checkAndSend() {
             return false;
         }
 
-        if (mUsernameButtons.size() == 0) {
+        if (!mUsernamesEmails.hasChips()) {
             ToastUtils.showToast(getActivity(), R.string.invite_error_no_usernames);
             return false;
         }
@@ -676,7 +662,7 @@ private boolean checkAndSend() {
 
         long wpcomBlogId = mSite.getSiteId();
         PeopleUtils.sendInvitations(
-                new ArrayList<>(mUsernameButtons.keySet()), mCurrentRole, mCustomMessage, wpcomBlogId,
+                new ArrayList<>(mUsernamesEmails.getChipsStrings()), mCurrentRole, mCustomMessage, wpcomBlogId,
                 new PeopleUtils.InvitationsSendCallback() {
                     @Override
                     public void onSent(List<String> succeededUsernames, Map<String, String> failedUsernameErrors) {
@@ -696,7 +682,7 @@ public void onSent(List<String> succeededUsernames, Map<String, String> failedUs
                                         username, errorMessage));
                             }
 
-                            populateUsernameButtons(failedUsernameErrors.keySet());
+                            populateUsernameChips(failedUsernameErrors.keySet());
 
                             ToastUtils.showToast(getActivity(), succeededUsernames.isEmpty()
                                     ? R.string.invite_error_sending
@@ -730,14 +716,68 @@ private void enableSendButton(boolean enable) {
         }
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        // we need to remove focus listener when view is destroyed (ex. orientation change) to prevent mUsernameEditText
-        // content from being converted to username
-        if (mUsernameEditText != null) {
-            mUsernameEditText.setOnFocusChangeListener(null);
+    private void manageActionButtonsEnabledState(boolean enable) {
+        mGenerateLinksButton.setEnabled(enable);
+        mShareLinksButton.setEnabled(enable);
+        mLinksRoleTextView.setEnabled(enable);
+        mDisableLinksButton.setEnabled(enable);
+    }
+
+    private void manageShimmerSection(boolean showShimmerSection, boolean startShimmer) {
+        mShimmerContainer.setVisibility(showShimmerSection ? View.VISIBLE : View.GONE);
+
+        if (startShimmer) {
+            if (mShimmerContainer.isShimmerVisible()) {
+                mShimmerContainer.startShimmer();
+            } else {
+                mShimmerContainer.showShimmer(true);
+            }
+        } else {
+            mShimmerContainer.hideShimmer();
+        }
+    }
+
+    private void manageLinksControlsVisibility(InviteLinksUiState uiState) {
+        mInviteLinkContainer.setVisibility(uiState.isLinksSectionVisible() ? View.VISIBLE : View.GONE);
+
+        mLoadAndRetryLinksContainer.setVisibility(
+                uiState.getLoadAndRetryUiState() == LoadAndRetryUiState.HIDDEN
+                        ? View.GONE
+                        : View.VISIBLE
+        );
+        mLoadingLinksProgress.setVisibility(
+                uiState.getLoadAndRetryUiState() == LoadAndRetryUiState.LOADING
+                        ? View.VISIBLE
+                        : View.GONE
+        );
+        mRetryButton.setVisibility(
+                uiState.getLoadAndRetryUiState() == LoadAndRetryUiState.RETRY
+                        ? View.VISIBLE
+                        : View.GONE
+        );
+    }
+
+    private void setLinksRoleControlsBehaviour(boolean allowRoleSelection) {
+        mLinksRoleTextView.setShowSoftInputOnFocus(false);
+        mLinksRoleTextView.setInputType(EditorInfo.TYPE_NULL);
+        mLinksRoleTextView.setKeyListener(null);
+
+        if (allowRoleSelection) {
+            mLinksRoleContainer.setEndIconMode(END_ICON_DROPDOWN_MENU);
+            mLinksRoleTextView.setOnClickListener(v -> {
+                mViewModel.onLinksRoleClicked();
+            });
+            mLinksRoleTextView.setFocusable(true);
+            mLinksRoleTextView.setFocusableInTouchMode(true);
+        } else {
+            mLinksRoleContainer.setEndIconMode(END_ICON_NONE);
+            mLinksRoleTextView.setOnClickListener(null);
+            mLinksRoleTextView.setFocusable(false);
+            mLinksRoleTextView.setFocusableInTouchMode(false);
         }
+
+        mLinksRoleContainer.setEndIconOnClickListener(null);
+        mLinksRoleContainer.setEndIconCheckable(false);
     }
 
     public interface ValidationEndListener {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteViewModel.kt
new file mode 100644
index 000000000000..478185e281a2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteViewModel.kt
@@ -0,0 +1,277 @@
+package org.wordpress.android.ui.people
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.wordpress.android.R.string
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.models.InvitePeopleUtils
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.people.AnalyticsInviteLinksActionResult.ERROR
+import org.wordpress.android.ui.people.AnalyticsInviteLinksActionResult.SUCCEEDED
+import org.wordpress.android.ui.people.AnalyticsInviteLinksGenericError.NO_ROLE_DATA_MATCHED
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksItem
+import org.wordpress.android.ui.people.InviteLinksUiStateType.GET_STATUS_RETRY
+import org.wordpress.android.ui.people.InviteLinksUiStateType.HIDDEN
+import org.wordpress.android.ui.people.InviteLinksUiStateType.LINKS_AVAILABLE
+import org.wordpress.android.ui.people.InviteLinksUiStateType.LINKS_GENERATE
+import org.wordpress.android.ui.people.InviteLinksUiStateType.LOADING
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksData
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksError
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksLoading
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksNotAllowed
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksUserChangedRole
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.UserNotAuthenticated
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.GENERATING_LINKS
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.INITIALIZING
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.MANAGING_AVAILABLE_LINKS
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.DateTimeUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.util.map
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import java.text.SimpleDateFormat
+import javax.inject.Inject
+import javax.inject.Named
+
+class PeopleInviteViewModel @Inject constructor(
+    private val inviteLinksHandler: InviteLinksHandler,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val dateTimeUtilsWrapper: DateTimeUtilsWrapper,
+    private val contextProvider: ContextProvider,
+    private val invitePeopleUtils: InvitePeopleUtils,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
+) : ScopedViewModel(bgDispatcher) {
+    private var isStarted = false
+    private var inviteLinksRequestJob: Job? = null
+    private lateinit var siteModel: SiteModel
+    private val inviteLinksData: MutableList<InviteLinksItem> = mutableListOf()
+    private var inviteLinksSelectedRole: InviteLinksUiItem = InviteLinksUiItem.getEmptyItem()
+
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _inviteLinksState = MediatorLiveData<InviteLinksState>()
+    val inviteLinksUiState: LiveData<InviteLinksUiState> =
+            _inviteLinksState.map { state -> buildInviteLinksUiState(state) }
+
+    private val _shareLink = MutableLiveData<Event<InviteLinksItem>>()
+    val shareLink: LiveData<Event<InviteLinksItem>> = _shareLink
+
+    private val _showSelectLinksRoleDialog = MutableLiveData<Event<Array<String>>>()
+    val showSelectLinksRoleDialog: LiveData<Event<Array<String>>> = _showSelectLinksRoleDialog
+
+    fun start(siteModel: SiteModel) {
+        if (isStarted) return
+        isStarted = true
+
+        this.siteModel = siteModel
+
+        _snackbarEvents.addSource(inviteLinksHandler.snackbarEvents) { event ->
+            _snackbarEvents.value = event
+        }
+
+        _inviteLinksState.addSource(inviteLinksHandler.inviteLinksState) { event ->
+            _inviteLinksState.value = event
+        }
+
+        if (siteModel.isWpForTeamsSite) {
+            _inviteLinksState.value = InviteLinksLoading(INITIALIZING)
+            inviteLinksRequestJob?.cancel()
+            inviteLinksRequestJob = launch(bgDispatcher) {
+                inviteLinksHandler.handleInviteLinksStatusRequest(
+                        siteModel.siteId,
+                        INITIALIZING
+                )
+            }
+        } else {
+            _inviteLinksState.value = InviteLinksNotAllowed
+        }
+    }
+
+    fun onGenerateLinksButtonClicked() {
+        inviteLinksRequestJob?.cancel()
+        inviteLinksRequestJob = launch(bgDispatcher) {
+            inviteLinksHandler.handleGenerateLinks(siteModel.siteId)
+        }
+    }
+
+    fun onDisableLinksButtonClicked() {
+        inviteLinksRequestJob?.cancel()
+        inviteLinksRequestJob = launch(bgDispatcher) {
+            inviteLinksHandler.handleDisableLinks(siteModel.siteId)
+        }
+    }
+
+    fun onRetryButtonClicked() {
+        inviteLinksRequestJob?.cancel()
+        inviteLinksRequestJob = launch(bgDispatcher) {
+            inviteLinksHandler.handleInviteLinksStatusRequest(siteModel.siteId, INITIALIZING)
+        }
+    }
+
+    fun onLinksRoleClicked() {
+        val roles = invitePeopleUtils.getInviteLinksRoleDisplayNames(inviteLinksData, siteModel)
+
+        if (roles.count() > 0) {
+            _showSelectLinksRoleDialog.value = Event(roles.toTypedArray())
+        } else {
+            AppLog.d(T.PEOPLE, "Could not get roles for site [${siteModel.siteId}]")
+            _snackbarEvents.value = Event(
+                    SnackbarMessageHolder(
+                            UiStringText(
+                                    contextProvider.getContext()
+                                            .getString(string.invite_links_cannot_get_roles_error)
+                            )
+                    )
+            )
+        }
+    }
+
+    fun onLinksRoleSelected(roleDisplayName: String) {
+        val selectedRole = invitePeopleUtils.getInviteLinkDataFromRoleDisplayName(
+                inviteLinksData,
+                siteModel,
+                roleDisplayName
+        )
+
+        selectedRole?.let {
+            _inviteLinksState.value = InviteLinksUserChangedRole(it)
+        } ?: run {
+            AppLog.d(
+                    T.PEOPLE,
+                    "Could not get data for site [${siteModel.siteId}] " +
+                            "role [$roleDisplayName] from ${inviteLinksData.map { it.role }}"
+            )
+            _snackbarEvents.value = Event(
+                    SnackbarMessageHolder(
+                            UiStringText(
+                                    contextProvider.getContext()
+                                            .getString(string.invite_links_cannot_get_role_data_error, roleDisplayName)
+                            )
+                    )
+            )
+        }
+    }
+
+    fun onShareButtonClicked(roleDisplayName: String) {
+        val selectedRole = invitePeopleUtils.getInviteLinkDataFromRoleDisplayName(
+                inviteLinksData,
+                siteModel,
+                roleDisplayName
+        )
+
+        val properties = mutableMapOf<String, Any?>()
+
+        selectedRole?.let {
+            _shareLink.value = Event(it)
+            properties.addInviteLinksActionResult(SUCCEEDED)
+            properties.addInviteLinksSharedRole(it.role)
+        } ?: run {
+            AppLog.d(
+                    T.PEOPLE,
+                    "Could not share link for site [${siteModel.siteId}] " +
+                            "role [$roleDisplayName] from ${inviteLinksData.map { it.role }}"
+            )
+            _snackbarEvents.value = Event(
+                    SnackbarMessageHolder(
+                            UiStringText(
+                                    contextProvider.getContext()
+                                            .getString(string.invite_links_cannot_get_role_data_error, roleDisplayName)
+                            )
+                    )
+            )
+            properties.addInviteLinksActionResult(ERROR, NO_ROLE_DATA_MATCHED.errorMessage)
+            properties.addInviteLinksSharedRole(roleDisplayName)
+        }
+
+        analyticsUtilsWrapper.trackInviteLinksAction(Stat.INVITE_LINKS_SHARE, siteModel, properties)
+    }
+
+    private fun buildInviteLinksUiState(inviteLinksState: InviteLinksState): InviteLinksUiState {
+        val formatter = SimpleDateFormat.getDateInstance()
+        var links: List<InviteLinksUiItem> = invitePeopleUtils.getMappedLinksUiItems(inviteLinksData, siteModel)
+
+        if (inviteLinksState is InviteLinksData) {
+            inviteLinksData.clear()
+            inviteLinksData.addAll(inviteLinksState.links)
+
+            links = invitePeopleUtils.getMappedLinksUiItems(inviteLinksData, siteModel)
+
+            inviteLinksSelectedRole = links.firstOrNull() ?: InviteLinksUiItem.getEmptyItem()
+        } else if (
+                inviteLinksState.scenarioContext != MANAGING_AVAILABLE_LINKS &&
+                inviteLinksState is InviteLinksError
+        ) {
+            inviteLinksData.clear()
+            links = listOf()
+            inviteLinksSelectedRole = InviteLinksUiItem.getEmptyItem()
+        }
+
+        if (inviteLinksState is InviteLinksUserChangedRole) {
+            val roleData = inviteLinksState.selectedRole
+
+            inviteLinksSelectedRole = InviteLinksUiItem(
+                    roleName = roleData.role,
+                    roleDisplayName = invitePeopleUtils.getDisplayNameForRole(siteModel, roleData.role),
+                    expiryDate = formatter.format(dateTimeUtilsWrapper.dateFromTimestamp(roleData.expiry))
+            )
+        }
+
+        val uiStateType = mapUiStateType(inviteLinksState, links)
+
+        val loadAndRetryUiState = if (inviteLinksState.scenarioContext != INITIALIZING ||
+                listOf(LINKS_AVAILABLE, LINKS_GENERATE).contains(uiStateType)) {
+            LoadAndRetryUiState.HIDDEN
+        } else {
+            if (uiStateType == GET_STATUS_RETRY) {
+                LoadAndRetryUiState.RETRY
+            } else {
+                LoadAndRetryUiState.LOADING
+            }
+        }
+
+        return InviteLinksUiState(
+                type = uiStateType,
+                isLinksSectionVisible = uiStateType != HIDDEN,
+                loadAndRetryUiState = loadAndRetryUiState,
+                isShimmerSectionVisible = loadAndRetryUiState == LoadAndRetryUiState.HIDDEN,
+                isRoleSelectionAllowed = links.count() > 1,
+                links = links,
+                inviteLinksSelectedRole = inviteLinksSelectedRole,
+                enableManageLinksActions = links.count() > 0
+        )
+    }
+
+    private fun mapUiStateType(
+        inviteLinksState: InviteLinksState,
+        links: List<InviteLinksUiItem>
+    ): InviteLinksUiStateType {
+        return when (inviteLinksState) {
+            InviteLinksNotAllowed, UserNotAuthenticated -> HIDDEN
+            is InviteLinksData -> if (links.count() > 0) LINKS_AVAILABLE else LINKS_GENERATE
+            is InviteLinksError -> when (inviteLinksState.scenarioContext) {
+                INITIALIZING -> GET_STATUS_RETRY
+                GENERATING_LINKS -> LINKS_GENERATE
+                MANAGING_AVAILABLE_LINKS -> LINKS_AVAILABLE
+            }
+            is InviteLinksLoading -> LOADING
+            is InviteLinksUserChangedRole -> LINKS_AVAILABLE
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        inviteLinksRequestJob?.cancel()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/RoleSelectDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/RoleSelectDialogFragment.java
index d3a7d3cc6dc3..e7d6c4bdf029 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/people/RoleSelectDialogFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/RoleSelectDialogFragment.java
@@ -17,6 +17,7 @@
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.models.RoleUtils;
+import org.wordpress.android.viewmodel.ContextProvider;
 
 import java.util.List;
 
@@ -24,6 +25,7 @@
 
 public class RoleSelectDialogFragment extends DialogFragment {
     @Inject SiteStore mSiteStore;
+    @Inject ContextProvider mContextProvider;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -34,7 +36,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         SiteModel site = (SiteModel) getArguments().getSerializable(WordPress.SITE);
-        final List<RoleModel> inviteRoles = RoleUtils.getInviteRoles(mSiteStore, site, this);
+        final List<RoleModel> inviteRoles = RoleUtils.getInviteRoles(mSiteStore, site, mContextProvider.getContext());
         final String[] stringRoles = new String[inviteRoles.size()];
         for (int i = 0; i < inviteRoles.size(); i++) {
             stringRoles[i] = inviteRoles.get(i).getDisplayName();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/WPEditTextWithChipsOutlined.kt b/WordPress/src/main/java/org/wordpress/android/ui/people/WPEditTextWithChipsOutlined.kt
new file mode 100644
index 000000000000..542dee5569bc
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/people/WPEditTextWithChipsOutlined.kt
@@ -0,0 +1,735 @@
+package org.wordpress.android.ui.people
+
+import android.animation.Animator
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.os.Parcel
+import android.os.Parcelable
+import android.os.Parcelable.Creator
+import android.text.Editable
+import android.text.TextUtils.TruncateAt
+import android.text.TextWatcher
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.KeyEvent
+import android.view.View
+import android.view.inputmethod.EditorInfo
+import android.widget.TextView.OnEditorActionListener
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.graphics.ColorUtils
+import com.google.android.flexbox.FlexboxLayout
+import com.google.android.material.chip.Chip
+import com.google.android.material.shape.CornerFamily
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.google.android.material.shape.ShapeAppearanceModel
+import com.google.android.material.textfield.TextInputEditText
+import com.google.android.material.textview.MaterialTextView
+import org.wordpress.android.R
+import org.wordpress.android.databinding.WpEditTextWithChipsOutlinedBinding
+import org.wordpress.android.util.RtlUtils
+import org.wordpress.android.util.getColorResIdFromAttribute
+import java.util.LinkedHashMap
+
+/**
+ * As of our understanding, currently the TextInputLayout (that is a LinearLayout) works in OutlinedBox mode having
+ * a single TextInputEditText as a direct child, inflating needed views into an internal not accessible FrameLayout;
+ * so not easily possible to add additional views over the main TextInputLayout keeping the usual
+ * behaviours of the TextInputEditText.
+ *
+ * This component was mainly created to address the move of PeopleInviteFragment into material design.
+ * Specifically tries to cover the usage of chips in combination with an EditText while mimic an
+ * OutlinedBox with TextInputLayout material design behaviour.
+ *
+ * The implementation is pretty basic and do not cover all possible use cases. We should leave this component usage
+ * once we find a more out of the box solution with material design lib (keep an eye on future releases) that
+ * covers our use cases.
+ *
+ * Supports hint/label animation (with RTL support).
+ *
+ * Based and inspired by https://stackoverflow.com/a/61748466
+ *
+ * Note: other possible implementation is using ImageSpan in the EditText but we found cursor/keyboard management
+ * to be more complex and less clean and preferred to use the FlexBox approach for now.
+ */
+
+class WPEditTextWithChipsOutlined @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
+    private enum class HelperTextState {
+        HINT_VISIBLE,
+        LABEL_VISIBLE
+    }
+
+    private var helperTextState: HelperTextState = HelperTextState.HINT_VISIBLE
+    private var flexBox: FlexboxLayout
+    private var editor: TextInputEditText
+    private var label: MaterialTextView
+    private var hint: MaterialTextView
+
+    private lateinit var outlineDrawable: MaterialShapeDrawable
+
+    private var outlineColorDefault: Int = 0
+    private var outlineColorFocused: Int = 0
+    private var colorSurface: Int = 0
+
+    private var outlineColorAlphaFocused: Float = 0f
+    private var outlineColorAlphaDefault: Float = 0f
+    private var hintLabelColorAlphaDefault: Float = 0f
+
+    private var outlinePixelWidthDefault: Int = 0
+    private var outlinePixelWidthFocused: Int = 0
+
+    private var hintResourceId = 0
+    private var chipifyEnabled = false
+    private var maxChips = 0
+
+    private var isRightToLeft = false
+
+    private var itemsManager: ItemsManagerInterface? = null
+
+    fun setItemsManager(itemsManager: ItemsManagerInterface?) {
+        this.itemsManager = itemsManager
+    }
+
+    interface ItemsManagerInterface {
+        fun onRemoveItem(item: String)
+        fun onAddItem(item: String)
+    }
+
+    enum class ItemValidationState(@AttrRes val colorAttr: Int) {
+        NEUTRAL(R.attr.colorOnSurface),
+        VALIDATED(R.attr.colorPrimary),
+        VALIDATED_WITH_ERRORS(R.attr.wpColorError);
+
+        @ColorInt fun colorFromState(context: Context): Int {
+            val color = context.getColorResIdFromAttribute(this.colorAttr)
+
+            return ContextCompat.getColor(context, color)
+        }
+
+        companion object {
+            fun stateFromColor(context: Context, color: Int): ItemValidationState {
+                return values().first { value ->
+                    ContextCompat.getColor(context, context.getColorResIdFromAttribute(value.colorAttr)) == color
+                }
+            }
+        }
+    }
+
+    init {
+        attrs?.also {
+            val stylesAttributes = context.theme.obtainStyledAttributes(
+                    attrs,
+                    R.styleable.WPEditTextWithChipsOutlined,
+                    0,
+                    0
+            )
+
+            try {
+                hintResourceId = stylesAttributes.getResourceId(
+                        R.styleable.WPEditTextWithChipsOutlined_wpHint,
+                        0
+                )
+                chipifyEnabled = stylesAttributes.getBoolean(
+                        R.styleable.WPEditTextWithChipsOutlined_wpChipifyEnabled,
+                        false
+                )
+
+                maxChips = stylesAttributes.getInteger(
+                        R.styleable.WPEditTextWithChipsOutlined_wpMaxNumberChips, 0
+                )
+            } finally {
+                stylesAttributes.recycle()
+            }
+        }
+
+        inflate(getContext(), R.layout.wp_edit_text_with_chips_outlined, this)
+
+        flexBox = findViewById(R.id.flexbox)
+        editor = findViewById(R.id.flexbox_editor)
+        label = findViewById(R.id.flexbox_label)
+        hint = findViewById(R.id.flexbox_hint)
+
+        isRightToLeft = RtlUtils.isRtl(context)
+
+        if (hasHint()) {
+            label.setText(hintResourceId)
+            hint.setText(hintResourceId)
+        }
+
+        isSaveEnabled = true
+
+        loadOutlineDrawable()
+        loadDimensions()
+        loadColors()
+
+        styleView(isEditorFocused(), hasItemsOrText(), false)
+
+        setListeners()
+    }
+
+    fun getTextIfAvailableOrNull(): String? {
+        throwExceptionIfChipifyNotEnabled()
+
+        if (!hasText() || !canAddMoreChips()) {
+            resetText()
+            return null
+        }
+
+        return removeDelimiterFromItemIfPresent(editor.text.toString())
+    }
+
+    fun addOrUpdateChip(item: String, state: ItemValidationState) {
+        throwExceptionIfChipifyNotEnabled()
+        chipify(item, state)
+    }
+
+    fun removeChip(item: String) {
+        throwExceptionIfChipifyNotEnabled()
+        val chips = getChipsMap()
+
+        chips[item]?.let {
+            withBinding {
+                flexbox.removeView(it)
+                if (flexbox.childCount == 1) {
+                    styleView(isEditorFocused(), hasItemsOrText(), true)
+                }
+            }
+        }
+    }
+
+    fun getChipsStrings(): MutableSet<String> {
+        throwExceptionIfChipifyNotEnabled()
+
+        return getChipsMap().keys
+    }
+
+    fun hasChips(): Boolean {
+        throwExceptionIfChipifyNotEnabled()
+        return getChipsMap().isNotEmpty()
+    }
+
+    fun containsChip(item: String): Boolean {
+        throwExceptionIfChipifyNotEnabled()
+        return getChipsMap().containsKey(item)
+    }
+
+    private fun <T> withBinding(block: WpEditTextWithChipsOutlinedBinding.() -> T): T {
+        return with(WpEditTextWithChipsOutlinedBinding.bind(this)) {
+            block()
+        }
+    }
+
+    private fun loadOutlineDrawable() {
+        val shapeAppearanceModel = ShapeAppearanceModel.builder()
+                .setAllCorners(
+                        CornerFamily.ROUNDED,
+                        resources.getDimension(R.dimen.edit_with_chips_outline_radius)
+                )
+                .build()
+
+        outlineDrawable = MaterialShapeDrawable(shapeAppearanceModel)
+    }
+
+    private fun loadDimensions() {
+        outlinePixelWidthDefault = resources.getDimensionPixelSize(R.dimen.edit_with_chips_outline_default_width)
+        outlinePixelWidthFocused = resources.getDimensionPixelSize(R.dimen.edit_with_chips_outline_focused_width)
+    }
+
+    private fun loadColors() {
+        outlineColorDefault = ContextCompat.getColor(context,
+                TypedValue().let {
+                    getContext().theme.resolveAttribute(R.attr.colorOnSurface, it, true)
+                    it.resourceId
+                })
+        outlineColorFocused = ContextCompat.getColor(context,
+                TypedValue().let {
+                    getContext().theme.resolveAttribute(R.attr.colorPrimary, it, true)
+                    it.resourceId
+                })
+        colorSurface = ContextCompat.getColor(context,
+                TypedValue().let {
+                    getContext().theme.resolveAttribute(R.attr.colorSurface, it, true)
+                    it.resourceId
+                })
+
+        outlineColorAlphaDefault = ResourcesCompat.getFloat(
+                resources,
+                R.dimen.edit_with_chips_outline_default_alpha
+        )
+        outlineColorAlphaFocused = ResourcesCompat.getFloat(
+                resources,
+                R.dimen.edit_with_chips_outline_focused_alpha
+        )
+
+        hintLabelColorAlphaDefault = ResourcesCompat.getFloat(
+                resources,
+                R.dimen.edit_with_chips_hint_label_default_alpha
+        )
+    }
+
+    private fun setListeners() {
+        editor.setOnFocusChangeListener { v, hasFocus ->
+            val canAnimate = hint.width > 0 && label.width > 0 && hint.height > 0 && label.height > 0
+            if (canAnimate) {
+                styleView(hasFocus, hasItemsOrText(), true)
+            }
+
+            if (chipifyEnabled && !hasFocus && hasText()) {
+                addItem(editor.text.toString())
+            }
+        }
+
+        if (chipifyEnabled) {
+            editor.addTextChangedListener(object : TextWatcher {
+                private var mShouldIgnoreChanges = false
+
+                override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
+
+                override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+                    if (mShouldIgnoreChanges) { // used to avoid double call after calling setText from this method
+                        return
+                    }
+                    mShouldIgnoreChanges = true
+
+                    if (s.isNotBlank() && endsWithDelimiter(s.toString())) {
+                        addItem(s.toString())
+                    }
+
+                    mShouldIgnoreChanges = false
+                }
+
+                override fun afterTextChanged(s: Editable) {}
+            })
+
+            editor.setOnEditorActionListener(OnEditorActionListener { _, actionId, event ->
+                if (actionId == EditorInfo.IME_ACTION_DONE ||
+                        event != null && event.keyCode == KeyEvent.KEYCODE_ENTER) {
+                    val editable = editor.text
+
+                    editable?.let {
+                        val item = it.toString()
+
+                        if (item.isNotBlank()) {
+                            addItem(item)
+                        }
+                    }
+                    return@OnEditorActionListener true
+                } else {
+                    return@OnEditorActionListener false
+                }
+            })
+
+            // handle key preses from hardware keyboard
+            editor.setOnKeyListener { _, _, keyEvent ->
+                keyEvent.keyCode == KeyEvent.KEYCODE_DEL &&
+                        keyEvent.action == KeyEvent.ACTION_DOWN && removeLastEnteredItem()
+            }
+        }
+    }
+
+    private fun canAddMoreChips(): Boolean {
+        return withBinding {
+            flexbox.childCount < maxChips + 1 || maxChips == 0
+        }
+    }
+
+    private fun addItem(item: String) {
+        if (!canAddMoreChips() && item.isNotBlank()) {
+            resetText()
+        } else {
+            val cleanedItem = removeDelimiterFromItemIfPresent(item)
+
+            if (cleanedItem.isNullOrBlank()) return
+
+            resetText()
+
+            itemsManager?.onAddItem(cleanedItem) ?: chipify(cleanedItem, ItemValidationState.NEUTRAL)
+        }
+    }
+
+    private data class ChipReplaceData(val index: Int, val chip: Chip, val isAlreadyInGroup: Boolean)
+
+    private fun chipify(item: String, state: ItemValidationState) {
+        if (!chipifyEnabled) return
+
+        val chipsMap = getChipsMap()
+
+        val (index, chip, isAlreadyInGroup) = if (chipsMap.containsKey(item)) {
+            ChipReplaceData(flexBox.indexOfChild(chipsMap[item]), chipsMap[item]!!, true)
+        } else {
+            ChipReplaceData(flexBox.childCount - 1, Chip(context), false)
+        }
+
+        chip.layoutDirection = View.LAYOUT_DIRECTION_LOCALE
+        chip.setEnsureMinTouchTargetSize(true)
+        chip.ensureAccessibleTouchTarget(resources.getDimensionPixelSize(R.dimen.people_chips_min_target))
+        chip.text = item
+        chip.setTextColor(state.colorFromState(context))
+        chip.isCloseIconVisible = true
+        chip.isClickable = false
+        chip.isCheckable = false
+        chip.ellipsize = TruncateAt.MIDDLE
+        chip.closeIconContentDescription = resources.getString(
+                R.string.invite_user_delete_desc,
+                item
+        )
+
+        if (!isAlreadyInGroup) {
+            chip.setOnCloseIconClickListener { chipView ->
+                val itemName = chip.text.toString()
+                withBinding {
+                    flexbox.removeView(chipView)
+                    itemsManager?.onRemoveItem(itemName)
+
+                    if (flexbox.childCount == 1) {
+                        styleView(isEditorFocused(), hasItemsOrText(), true)
+                    }
+                }
+            }
+
+            flexBox.addView(chip as View, index)
+        }
+
+        resetText()
+    }
+
+    private fun resetText() {
+        editor.apply {
+            text?.clear() ?: setText("")
+        }
+    }
+
+    private fun removeDelimiterFromItemIfPresent(item: String?): String? {
+        if (item.isNullOrBlank()) {
+            return null
+        }
+        val trimmedItem = item.trim()
+        for (itemDelimiter in ITEM_DELIMITERS) {
+            if (trimmedItem.endsWith(itemDelimiter)) {
+                return trimmedItem.substring(0, trimmedItem.length - itemDelimiter.length)
+            }
+        }
+        return trimmedItem
+    }
+
+    private fun throwExceptionIfChipifyNotEnabled() {
+        if (!chipifyEnabled) throw IllegalArgumentException(
+                "Please set chipifyEnabled to true in order to use chips feature"
+        )
+    }
+
+    // This should be fast enough for our use case, so we get fresh data always
+    private fun getChipsMap(): MutableMap<String, Chip> {
+        val chips: MutableMap<String, Chip> = LinkedHashMap()
+        withBinding {
+            for (i in 0 until flexbox.childCount) {
+                val v: View = flexbox.getChildAt(i)
+                if (v is Chip) {
+                    chips[v.text.toString()] = v
+                }
+            }
+        }
+
+        return chips
+    }
+
+    private fun removeLastEnteredItem(): Boolean {
+        if (hasText()) {
+            return false
+        }
+
+        return withBinding {
+            // try and remove the last entered username
+            if (flexbox.childCount > 1) {
+                val chipToRemove = flexBox.getChildAt(flexbox.childCount - 2) as Chip
+                val itemName = chipToRemove.text.toString()
+                flexBox.removeViewAt(flexbox.childCount - 2)
+                itemsManager?.onRemoveItem(itemName)
+                true
+            } else {
+                false
+            }
+        }
+    }
+
+    private fun endsWithDelimiter(string: String): Boolean {
+        if (string.isBlank()) {
+            return false
+        }
+        for (usernameDelimiter in ITEM_DELIMITERS) {
+            if (string.endsWith(usernameDelimiter)) {
+                return true
+            }
+        }
+        return false
+    }
+
+    private fun styleView(hasFocus: Boolean, hasText: Boolean, animateOnChange: Boolean) {
+        flexBox.background = outlineDrawable
+        setLabelColor(hint, outlineColorDefault, hintLabelColorAlphaDefault)
+        if (hasFocus) {
+            setOutlineStroke(
+                    outlinePixelWidthFocused,
+                    outlineColorFocused,
+                    outlineColorAlphaFocused
+            )
+        } else {
+            setOutlineStroke(
+                    outlinePixelWidthDefault,
+                    outlineColorDefault,
+                    outlineColorAlphaDefault
+            )
+        }
+
+        if (!hasHint()) {
+            hint.visibility = View.INVISIBLE
+            label.visibility = View.INVISIBLE
+            return
+        }
+
+        val previousLabelState = helperTextState
+
+        if (hasFocus || hasText) {
+            helperTextState = HelperTextState.LABEL_VISIBLE
+
+            if (animateOnChange && previousLabelState != helperTextState) {
+                animateViewTo(HelperTextState.LABEL_VISIBLE)
+            } else {
+                if (hasFocus) {
+                    setLabelColor(label, outlineColorFocused, outlineColorAlphaFocused)
+                    hint.visibility = View.INVISIBLE
+                    label.visibility = View.VISIBLE
+                } else {
+                    setLabelColor(label, outlineColorDefault, hintLabelColorAlphaDefault)
+                    hint.visibility = View.INVISIBLE
+                    label.visibility = View.VISIBLE
+                }
+            }
+        } else {
+            helperTextState = HelperTextState.HINT_VISIBLE
+
+            if (animateOnChange && previousLabelState != helperTextState) {
+                animateViewTo(HelperTextState.HINT_VISIBLE)
+            } else {
+                setLabelColor(label, colorSurface, outlineColorAlphaFocused)
+
+                hint.visibility = View.VISIBLE
+                label.visibility = View.INVISIBLE
+            }
+        }
+    }
+
+    private fun animateViewTo(targetState: HelperTextState) {
+        if (isRightToLeft) {
+            hint.pivotX = hint.width.toFloat()
+            hint.pivotY = 0f
+        } else {
+            hint.pivotX = 0f
+            hint.pivotY = 0f
+        }
+
+        when (targetState) {
+            HelperTextState.HINT_VISIBLE -> {
+                hint.animate().cancel()
+
+                if (hint.translationY == 0f) {
+                    hint.translationY = label.y - hint.y
+                    hint.scaleX = label.width.toFloat() / hint.width
+                    hint.scaleX = label.height.toFloat() / hint.height
+                }
+
+                hint.animate()
+                        .translationY(0f)
+                        .scaleX(1f)
+                        .scaleY(1f)
+                        .setDuration(LABEL_ANIMATION_DURATION)
+                        .setListener(object : Animator.AnimatorListener {
+                            override fun onAnimationStart(animation: Animator?) {
+                                label.visibility = View.INVISIBLE
+                                hint.visibility = View.VISIBLE
+                            }
+
+                            override fun onAnimationEnd(animation: Animator?) {
+                            }
+
+                            override fun onAnimationCancel(animation: Animator?) {
+                            }
+
+                            override fun onAnimationRepeat(animation: Animator?) {
+                            }
+                        }).start()
+            }
+            HelperTextState.LABEL_VISIBLE -> {
+                hint.animate().cancel()
+
+                if (hint.translationY != 0f) {
+                    hint.translationY = 0f
+                    hint.scaleX = 1f
+                    hint.scaleX = 1f
+                }
+
+                hint.animate()
+                        .translationY(label.y - hint.y)
+                        .scaleX(label.width.toFloat() / hint.width)
+                        .scaleY(label.height.toFloat() / hint.height)
+                        .setDuration(LABEL_ANIMATION_DURATION)
+                        .setListener(object : Animator.AnimatorListener {
+                            override fun onAnimationStart(animation: Animator?) {
+                                setLabelColor(label, colorSurface, outlineColorAlphaFocused)
+                                label.visibility = View.VISIBLE
+                                hint.visibility = View.VISIBLE
+                            }
+
+                            override fun onAnimationEnd(animation: Animator?) {
+                                hint.visibility = View.INVISIBLE
+                                setLabelColor(label, outlineColorFocused, outlineColorAlphaFocused)
+                            }
+
+                            override fun onAnimationCancel(animation: Animator?) {
+                            }
+
+                            override fun onAnimationRepeat(animation: Animator?) {
+                            }
+                        }).start()
+            }
+        }
+    }
+
+    private fun setOutlineStroke(width: Int, color: Int, alpha: Float) {
+        outlineDrawable.apply {
+            this.setStroke(width.toFloat(), color)
+            this.alpha = (alpha * 255).coerceAtMost(255f).toInt()
+            this.fillColor = ColorStateList.valueOf(Color.TRANSPARENT)
+        }
+    }
+
+    private fun setLabelColor(textView: MaterialTextView, color: Int, alpha: Float) {
+        val colorWithAlpha = ColorUtils.setAlphaComponent(color, (alpha * 255).coerceAtMost(255f).toInt())
+        textView.setTextColor(colorWithAlpha)
+    }
+
+    private fun hasItemsOrText() = hasItems() || hasText()
+    private fun hasItems() = withBinding { flexbox.childCount > 1 }
+    private fun hasText() = (editor.text?.length ?: 0) > 0
+    private fun isEditorFocused() = editor.isFocused
+    private fun hasHint() = hintResourceId != 0
+
+    override fun onSaveInstanceState(): Parcelable {
+        val savedState = SavedState(super.onSaveInstanceState())
+        savedState.isFocused = isEditorFocused()
+        savedState.labelState = helperTextState
+        savedState.hasText = hasItemsOrText()
+        savedState.chipsData.clear()
+        savedState.chipsData.addAll(
+                getChipsMap().map { (_, v) ->
+                    ChipData(v.text.toString(), v.currentTextColor)
+                }
+        )
+        return savedState
+    }
+
+    override fun onRestoreInstanceState(state: Parcelable?) {
+        if (state !is SavedState) {
+            super.onRestoreInstanceState(state)
+            return
+        }
+        val savedState: SavedState = state
+        super.onRestoreInstanceState(savedState.superState)
+
+        helperTextState = savedState.labelState
+
+        val chipsData = savedState.chipsData
+
+        for (chip: ChipData in chipsData) {
+            chipify(chip.text, ItemValidationState.stateFromColor(context, chip.color))
+        }
+
+        styleView(savedState.isFocused, savedState.hasText, false)
+    }
+
+    private data class ChipData(val text: String, val color: Int) : Parcelable {
+        constructor(parcel: Parcel) : this(
+                parcel.readString()!!,
+                parcel.readInt()
+        )
+
+        override fun writeToParcel(parcel: Parcel, flags: Int) {
+            parcel.writeString(text)
+            parcel.writeInt(color)
+        }
+
+        override fun describeContents(): Int {
+            return 0
+        }
+
+        companion object CREATOR : Creator<ChipData> {
+            override fun createFromParcel(parcel: Parcel): ChipData {
+                return ChipData(parcel)
+            }
+
+            override fun newArray(size: Int): Array<ChipData?> {
+                return arrayOfNulls(size)
+            }
+        }
+    }
+
+    private class SavedState : BaseSavedState {
+        var labelState = HelperTextState.HINT_VISIBLE
+        var isFocused = false
+        var hasText = false
+        var chipsData = mutableListOf<ChipData>()
+
+        constructor(superState: Parcelable?) : super(superState) {}
+        private constructor(`in`: Parcel) : super(`in`) {
+            this.labelState = HelperTextState.values()[`in`.readInt()]
+            this.isFocused = `in`.readInt() == 1
+            this.hasText = `in`.readInt() == 1
+            val arrayLen = `in`.readInt()
+            if (arrayLen > 0) {
+                val chipsDataArray = arrayOfNulls<ChipData>(arrayLen)
+                `in`.readTypedArray(chipsDataArray, ChipData.CREATOR)
+                this.chipsData = chipsDataArray.filterNotNull().toMutableList()
+            }
+        }
+
+        override fun writeToParcel(out: Parcel, flags: Int) {
+            super.writeToParcel(out, flags)
+            out.writeInt(labelState.ordinal)
+            out.writeInt(if (this.isFocused) 1 else 0)
+            out.writeInt(if (this.hasText) 1 else 0)
+            if (chipsData.size == 0) {
+                out.writeInt(0)
+            } else {
+                out.writeInt(chipsData.size)
+                out.writeTypedArray(chipsData.toTypedArray(), flags)
+            }
+        }
+
+        companion object {
+            @JvmField
+            val CREATOR: Parcelable.Creator<SavedState> = object : Parcelable.Creator<SavedState> {
+                override fun createFromParcel(`in`: Parcel): SavedState {
+                    return SavedState(`in`)
+                }
+
+                override fun newArray(size: Int): Array<SavedState?> {
+                    return arrayOfNulls(size)
+                }
+            }
+        }
+    }
+
+    companion object {
+        // this duration should be the material design default for the animation
+        private const val LABEL_ANIMATION_DURATION = 167L
+        private val ITEM_DELIMITERS = arrayOf(" ", ",")
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerConstants.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerConstants.kt
index 63bb505121d8..26b5a36bb95f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerConstants.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerConstants.kt
@@ -5,6 +5,7 @@ object MediaPickerConstants {
     const val EXTRA_MEDIA_QUEUED_URIS = "queued_media_uris"
     const val EXTRA_MEDIA_ID = "media_id"
     const val EXTRA_LAUNCH_WPSTORIES_CAMERA_REQUESTED = "launch_wpstories_camera_requested"
+    const val EXTRA_LAUNCH_WPSTORIES_MEDIA_PICKER_REQUESTED = "launch_wpstories_media_picker_requested"
 
     // the enum name of the source will be returned as a string in EXTRA_MEDIA_SOURCE
     const val EXTRA_MEDIA_SOURCE = "media_source"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerLauncher.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerLauncher.kt
index 23f0f91f0d2f..199f7ca13075 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerLauncher.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerLauncher.kt
@@ -2,17 +2,16 @@ package org.wordpress.android.ui.photopicker
 
 import android.app.Activity
 import android.content.Intent
+import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.RequestCodes
-import org.wordpress.android.ui.media.MediaBrowserActivity
 import org.wordpress.android.ui.media.MediaBrowserType
 import org.wordpress.android.ui.media.MediaBrowserType.FEATURED_IMAGE_PICKER
-import org.wordpress.android.ui.media.MediaBrowserType.GRAVATAR_IMAGE_PICKER
-import org.wordpress.android.ui.media.MediaBrowserType.SITE_ICON_PICKER
+import org.wordpress.android.ui.media.MediaBrowserType.WP_STORIES_MEDIA_PICKER
 import org.wordpress.android.ui.mediapicker.MediaPickerActivity
 import org.wordpress.android.ui.mediapicker.MediaPickerSetup
 import org.wordpress.android.ui.mediapicker.MediaPickerSetup.CameraSetup.ENABLED
@@ -27,13 +26,10 @@ import org.wordpress.android.ui.mediapicker.MediaType.AUDIO
 import org.wordpress.android.ui.mediapicker.MediaType.DOCUMENT
 import org.wordpress.android.ui.mediapicker.MediaType.IMAGE
 import org.wordpress.android.ui.mediapicker.MediaType.VIDEO
-import org.wordpress.android.util.WPMediaUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig
 import javax.inject.Inject
 
 class MediaPickerLauncher @Inject constructor(
-    private val consolidatedMediaPickerFeatureConfig: ConsolidatedMediaPickerFeatureConfig,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
 ) {
     fun showFeaturedImagePicker(
@@ -41,66 +37,74 @@ class MediaPickerLauncher @Inject constructor(
         site: SiteModel?,
         localPostId: Int
     ) {
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val availableDataSources = if (site != null && site.isUsingWpComRestApi) {
-                setOf(WP_LIBRARY, STOCK_LIBRARY, GIF_LIBRARY)
-            } else {
-                setOf(WP_LIBRARY, GIF_LIBRARY)
-            }
-
-            val mediaPickerSetup = MediaPickerSetup(
-                    primaryDataSource = DEVICE,
-                    availableDataSources = availableDataSources,
-                    canMultiselect = false,
-                    requiresStoragePermissions = true,
-                    allowedTypes = setOf(IMAGE),
-                    cameraSetup = ENABLED,
-                    systemPickerEnabled = true,
-                    editingEnabled = true,
-                    queueResults = true,
-                    defaultSearchView = false,
-                    title = R.string.photo_picker_title
-            )
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    mediaPickerSetup,
-                    site,
-                    localPostId
-            )
-            activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
+        val availableDataSources = if (site != null && site.isUsingWpComRestApi) {
+            setOf(WP_LIBRARY, STOCK_LIBRARY, GIF_LIBRARY)
         } else {
-            ActivityLauncher.showPhotoPickerForResult(activity, FEATURED_IMAGE_PICKER, site, localPostId)
+            setOf(WP_LIBRARY, GIF_LIBRARY)
         }
+
+        val mediaPickerSetup = MediaPickerSetup(
+                primaryDataSource = DEVICE,
+                availableDataSources = availableDataSources,
+                canMultiselect = false,
+                requiresStoragePermissions = true,
+                allowedTypes = setOf(IMAGE),
+                cameraSetup = ENABLED,
+                systemPickerEnabled = true,
+                editingEnabled = true,
+                queueResults = true,
+                defaultSearchView = false,
+                title = R.string.photo_picker_title
+        )
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                mediaPickerSetup,
+                site,
+                localPostId
+        )
+        activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
     }
 
     fun showSiteIconPicker(
         activity: Activity,
         site: SiteModel?
     ) {
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val mediaPickerSetup = MediaPickerSetup(
-                    primaryDataSource = DEVICE,
-                    availableDataSources = setOf(WP_LIBRARY),
-                    canMultiselect = false,
-                    requiresStoragePermissions = true,
-                    allowedTypes = setOf(IMAGE),
-                    cameraSetup = ENABLED,
-                    systemPickerEnabled = true,
-                    editingEnabled = true,
-                    queueResults = false,
-                    defaultSearchView = false,
-                    title = R.string.photo_picker_title
-            )
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    mediaPickerSetup,
-                    site,
-                    null
-            )
-            activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
-        } else {
-            ActivityLauncher.showPhotoPickerForResult(activity, SITE_ICON_PICKER, site, null)
-        }
+        val intent = buildSitePickerIntent(activity, site)
+        activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
+    }
+
+    fun showSiteIconPicker(
+        fragment: Fragment,
+        site: SiteModel?
+    ) {
+        val intent = buildSitePickerIntent(fragment.requireActivity(), site)
+        fragment.startActivityForResult(intent, RequestCodes.SITE_ICON_PICKER)
+    }
+
+    private fun buildSitePickerIntent(
+        activity: Activity,
+        site: SiteModel?
+    ): Intent {
+        val mediaPickerSetup = MediaPickerSetup(
+                primaryDataSource = DEVICE,
+                availableDataSources = setOf(WP_LIBRARY),
+                canMultiselect = false,
+                requiresStoragePermissions = true,
+                allowedTypes = setOf(IMAGE),
+                cameraSetup = ENABLED,
+                systemPickerEnabled = true,
+                editingEnabled = true,
+                queueResults = false,
+                defaultSearchView = false,
+                title = R.string.photo_picker_title
+        )
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                mediaPickerSetup,
+                site,
+                null
+        )
+        return intent
     }
 
     fun showPhotoPickerForResult(
@@ -109,17 +113,13 @@ class MediaPickerLauncher @Inject constructor(
         site: SiteModel?,
         localPostId: Int?
     ) {
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    buildLocalMediaPickerSetup(browserType),
-                    site,
-                    localPostId
-            )
-            activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
-        } else {
-            ActivityLauncher.showPhotoPickerForResult(activity, browserType, site, localPostId)
-        }
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                buildLocalMediaPickerSetup(browserType),
+                site,
+                localPostId
+        )
+        activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
     }
 
     fun showStoriesPhotoPickerForResultAndTrack(activity: Activity, site: SiteModel?) {
@@ -129,94 +129,99 @@ class MediaPickerLauncher @Inject constructor(
 
     fun showStoriesPhotoPickerForResult(
         activity: Activity,
-        site: SiteModel?,
-        requestCode: Int = RequestCodes.STORIES_PHOTO_PICKER
+        site: SiteModel?
     ) {
-        val browserType = MediaBrowserType.WP_STORIES_MEDIA_PICKER
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    buildLocalMediaPickerSetup(browserType),
-                    site
-            )
-            activity.startActivityForResult(intent, requestCode)
-        } else {
-            ActivityLauncher.showPhotoPickerForResult(activity, browserType, site, null)
-        }
+        ActivityLauncher.showPhotoPickerForResult(activity, WP_STORIES_MEDIA_PICKER, site, null)
     }
 
     fun showGravatarPicker(fragment: Fragment) {
-        val intent = if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val mediaPickerSetup = MediaPickerSetup(
-                    primaryDataSource = DEVICE,
-                    availableDataSources = setOf(),
-                    canMultiselect = false,
-                    requiresStoragePermissions = true,
-                    allowedTypes = setOf(IMAGE),
-                    cameraSetup = ENABLED,
-                    systemPickerEnabled = true,
-                    editingEnabled = true,
-                    queueResults = false,
-                    defaultSearchView = false,
-                    title = R.string.photo_picker_title
-            )
-            MediaPickerActivity.buildIntent(
-                    fragment.requireContext(),
-                    mediaPickerSetup
-            )
-        } else {
-            Intent(fragment.requireContext(), PhotoPickerActivity::class.java).apply {
-                this.putExtra(MediaBrowserActivity.ARG_BROWSER_TYPE, GRAVATAR_IMAGE_PICKER)
-            }
-        }
+        val mediaPickerSetup = MediaPickerSetup(
+                primaryDataSource = DEVICE,
+                availableDataSources = setOf(),
+                canMultiselect = false,
+                requiresStoragePermissions = true,
+                allowedTypes = setOf(IMAGE),
+                cameraSetup = ENABLED,
+                systemPickerEnabled = true,
+                editingEnabled = true,
+                queueResults = false,
+                defaultSearchView = false,
+                title = R.string.photo_picker_title
+        )
+        val intent = MediaPickerActivity.buildIntent(
+                fragment.requireContext(),
+                mediaPickerSetup
+        )
         fragment.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
     }
 
-    fun showFilePicker(activity: Activity) {
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val allowedTypes = mutableSetOf(IMAGE, VIDEO, AUDIO, DOCUMENT)
-            val mediaPickerSetup = MediaPickerSetup(
-                    primaryDataSource = DEVICE,
-                    availableDataSources = setOf(),
-                    canMultiselect = true,
-                    requiresStoragePermissions = true,
-                    allowedTypes = allowedTypes,
-                    cameraSetup = HIDDEN,
-                    systemPickerEnabled = true,
-                    editingEnabled = true,
-                    queueResults = false,
-                    defaultSearchView = false,
-                    title = R.string.photo_picker_choose_file
-            )
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    mediaPickerSetup
-            )
-            activity.startActivityForResult(
-                    intent,
-                    RequestCodes.FILE_LIBRARY
-            )
-        } else {
-            WPMediaUtils.launchFileLibrary(activity, true)
-        }
+    fun showFilePicker(activity: Activity, canMultiselect: Boolean = true, site: SiteModel) {
+        showFilePicker(
+                activity,
+                site,
+                canMultiselect,
+                mutableSetOf(IMAGE, VIDEO, AUDIO, DOCUMENT),
+                RequestCodes.FILE_LIBRARY,
+                R.string.photo_picker_choose_file
+        )
+    }
+
+    fun showAudioFilePicker(activity: Activity, canMultiselect: Boolean = false, site: SiteModel) {
+        showFilePicker(
+                activity,
+                site,
+                canMultiselect,
+                mutableSetOf(AUDIO),
+                RequestCodes.AUDIO_LIBRARY,
+                R.string.photo_picker_choose_audio
+        )
+    }
+
+    @Suppress("LongParameterList")
+    private fun showFilePicker(
+        activity: Activity,
+        site: SiteModel,
+        canMultiselect: Boolean = false,
+        allowedTypes: Set<MediaType>,
+        requestCode: Int,
+        @StringRes title: Int
+    ) {
+        val mediaPickerSetup = MediaPickerSetup(
+                primaryDataSource = DEVICE,
+                availableDataSources = setOf(),
+                canMultiselect = canMultiselect,
+                requiresStoragePermissions = true,
+                allowedTypes = allowedTypes,
+                cameraSetup = HIDDEN,
+                systemPickerEnabled = true,
+                editingEnabled = true,
+                queueResults = false,
+                defaultSearchView = false,
+                title = title
+        )
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                mediaPickerSetup,
+                site
+        )
+        activity.startActivityForResult(
+                intent,
+                requestCode
+        )
     }
 
     fun viewWPMediaLibraryPickerForResult(activity: Activity, site: SiteModel, browserType: MediaBrowserType) {
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    buildWPMediaLibraryPickerSetup(browserType),
-                    site
-            )
-            val requestCode: Int = if (browserType.canMultiselect()) {
-                RequestCodes.MULTI_SELECT_MEDIA_PICKER
-            } else {
-                RequestCodes.SINGLE_SELECT_MEDIA_PICKER
-            }
-            activity.startActivityForResult(intent, requestCode)
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                buildWPMediaLibraryPickerSetup(browserType),
+                site
+        )
+        val requestCode: Int = if (browserType.canMultiselect()) {
+            RequestCodes.MULTI_SELECT_MEDIA_PICKER
         } else {
-            ActivityLauncher.viewMediaPickerForResult(activity, site, browserType)
+            RequestCodes.SINGLE_SELECT_MEDIA_PICKER
         }
+        activity.startActivityForResult(intent, requestCode)
     }
 
     fun showStockMediaPickerForResult(
@@ -225,29 +230,25 @@ class MediaPickerLauncher @Inject constructor(
         requestCode: Int,
         allowMultipleSelection: Boolean
     ) {
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val mediaPickerSetup = MediaPickerSetup(
-                    primaryDataSource = STOCK_LIBRARY,
-                    availableDataSources = setOf(),
-                    canMultiselect = allowMultipleSelection,
-                    requiresStoragePermissions = false,
-                    allowedTypes = setOf(IMAGE),
-                    cameraSetup = HIDDEN,
-                    systemPickerEnabled = false,
-                    editingEnabled = false,
-                    queueResults = false,
-                    defaultSearchView = true,
-                    title = R.string.photo_picker_stock_media
-            )
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    mediaPickerSetup,
-                    site
-            )
-            activity.startActivityForResult(intent, requestCode)
-        } else {
-            ActivityLauncher.showStockMediaPickerForResult(activity, site, requestCode)
-        }
+        val mediaPickerSetup = MediaPickerSetup(
+                primaryDataSource = STOCK_LIBRARY,
+                availableDataSources = setOf(),
+                canMultiselect = allowMultipleSelection,
+                requiresStoragePermissions = false,
+                allowedTypes = setOf(IMAGE),
+                cameraSetup = HIDDEN,
+                systemPickerEnabled = false,
+                editingEnabled = false,
+                queueResults = false,
+                defaultSearchView = true,
+                title = R.string.photo_picker_stock_media
+        )
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                mediaPickerSetup,
+                site
+        )
+        activity.startActivityForResult(intent, requestCode)
     }
 
     fun showGifPickerForResult(
@@ -260,29 +261,25 @@ class MediaPickerLauncher @Inject constructor(
         } else {
             RequestCodes.GIF_PICKER_SINGLE_SELECT
         }
-        if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
-            val mediaPickerSetup = MediaPickerSetup(
-                    primaryDataSource = GIF_LIBRARY,
-                    availableDataSources = setOf(),
-                    canMultiselect = allowMultipleSelection,
-                    requiresStoragePermissions = false,
-                    allowedTypes = setOf(IMAGE),
-                    cameraSetup = HIDDEN,
-                    systemPickerEnabled = false,
-                    editingEnabled = false,
-                    queueResults = false,
-                    defaultSearchView = true,
-                    title = R.string.photo_picker_gif
-            )
-            val intent = MediaPickerActivity.buildIntent(
-                    activity,
-                    mediaPickerSetup,
-                    site
-            )
-            activity.startActivityForResult(intent, requestCode)
-        } else {
-            ActivityLauncher.showGifPickerForResult(activity, site, requestCode)
-        }
+        val mediaPickerSetup = MediaPickerSetup(
+                primaryDataSource = GIF_LIBRARY,
+                availableDataSources = setOf(),
+                canMultiselect = allowMultipleSelection,
+                requiresStoragePermissions = false,
+                allowedTypes = setOf(IMAGE),
+                cameraSetup = HIDDEN,
+                systemPickerEnabled = false,
+                editingEnabled = false,
+                queueResults = false,
+                defaultSearchView = true,
+                title = R.string.photo_picker_gif
+        )
+        val intent = MediaPickerActivity.buildIntent(
+                activity,
+                mediaPickerSetup,
+                site
+        )
+        activity.startActivityForResult(intent, requestCode)
     }
 
     private fun buildLocalMediaPickerSetup(browserType: MediaBrowserType): MediaPickerSetup {
@@ -323,6 +320,15 @@ class MediaPickerLauncher @Inject constructor(
         if (browserType.isVideoPicker) {
             allowedTypes.add(VIDEO)
         }
+
+        if (browserType.isAudioPicker) {
+            allowedTypes.add(AUDIO)
+        }
+
+        if (browserType.isDocumentPicker) {
+            allowedTypes.add(DOCUMENT)
+        }
+
         return MediaPickerSetup(
                 primaryDataSource = WP_LIBRARY,
                 availableDataSources = setOf(),
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java
index 29b9d0d12d0a..bdccb881bb0c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java
@@ -187,7 +187,8 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             case RequestCodes.PICTURE_LIBRARY:
             case RequestCodes.VIDEO_LIBRARY:
                 if (data != null) {
-                    doMediaUrisSelected(WPMediaUtils.retrieveMediaUris(data), PhotoPickerMediaSource.ANDROID_PICKER);
+                    List<Uri> mediaUris = WPMediaUtils.retrieveMediaUris(data);
+                    getPickerFragment().urisSelectedFromSystemPicker(mediaUris);
                 }
                 break;
             case RequestCodes.TAKE_PHOTO:
@@ -324,12 +325,7 @@ private void doMediaIdsSelected(ArrayList<Long> mediaIds, @NonNull PhotoPickerMe
         if (mediaIds != null && mediaIds.size() > 0) {
             if (mBrowserType == MediaBrowserType.WP_STORIES_MEDIA_PICKER) {
                 // TODO WPSTORIES add TRACKS (see how it's tracked below? maybe do along the same lines)
-                Intent data = new Intent()
-                        .putExtra(MediaBrowserActivity.RESULT_IDS, ListUtils.toLongArray(mediaIds))
-                        .putExtra(ARG_BROWSER_TYPE, mBrowserType)
-                        .putExtra(MediaPickerConstants.EXTRA_MEDIA_SOURCE, source.name());
-                setResult(RESULT_OK, data);
-                finish();
+                getPickerFragment().mediaIdsSelectedFromWPMediaPicker(mediaIds);
             } else {
                 // if user chose a featured image, track image picked event
                 if (mBrowserType == MediaBrowserType.FEATURED_IMAGE_PICKER) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerAdapter.kt
index af67e3857aa9..f6d3d78141ff 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerAdapter.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.photopicker
 import android.view.ViewGroup
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView.Adapter
+import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.ui.photopicker.PhotoPickerAdapterDiffCallback.Payload.COUNT_CHANGE
 import org.wordpress.android.ui.photopicker.PhotoPickerAdapterDiffCallback.Payload.SELECTION_CHANGE
 import org.wordpress.android.ui.photopicker.PhotoPickerUiItem.PhotoItem
@@ -10,9 +11,14 @@ import org.wordpress.android.ui.photopicker.PhotoPickerUiItem.Type
 import org.wordpress.android.ui.photopicker.PhotoPickerUiItem.VideoItem
 import org.wordpress.android.util.image.ImageManager
 
-@Deprecated("This class is being refactored, if you implement any change, please also update " +
-        "{@link org.wordpress.android.ui.mediapicker.MedaPickerAdapter}")
-class PhotoPickerAdapter internal constructor(private val imageManager: ImageManager) : Adapter<ThumbnailViewHolder>() {
+@Deprecated(
+        "This class is being refactored, if you implement any change, please also update " +
+                "{@link org.wordpress.android.ui.mediapicker.MedaPickerAdapter}"
+)
+class PhotoPickerAdapter internal constructor(
+    private val imageManager: ImageManager,
+    private val coroutineScope: CoroutineScope
+) : Adapter<ThumbnailViewHolder>() {
     private val thumbnailViewUtils = ThumbnailViewUtils(imageManager)
     private var mediaList = listOf<PhotoPickerUiItem>()
 
@@ -38,8 +44,8 @@ class PhotoPickerAdapter internal constructor(private val imageManager: ImageMan
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ThumbnailViewHolder {
         return when (viewType) {
-            Type.PHOTO.ordinal -> PhotoThumbnailViewHolder(parent, thumbnailViewUtils)
-            Type.VIDEO.ordinal -> VideoThumbnailViewHolder(parent, thumbnailViewUtils)
+            Type.PHOTO.ordinal -> PhotoThumbnailViewHolder(parent, thumbnailViewUtils, imageManager)
+            Type.VIDEO.ordinal -> VideoThumbnailViewHolder(parent, thumbnailViewUtils, imageManager, coroutineScope)
             else -> throw IllegalArgumentException("Unexpected view type")
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt
index acea8f44d981..112aaafb7950 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.kt
@@ -5,25 +5,27 @@ import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
 import android.text.Html
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.PopupMenu
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AlertDialog.Builder
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.GridLayoutManager
-import kotlinx.android.synthetic.main.photo_picker_fragment.*
-import kotlinx.android.synthetic.main.photo_picker_fragment.view.*
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PhotoPickerFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.media.MediaBrowserActivity
 import org.wordpress.android.ui.media.MediaBrowserType
 import org.wordpress.android.ui.media.MediaPreviewActivity
+import org.wordpress.android.ui.mediapicker.MediaPickerViewModel.ProgressDialogUiModel
+import org.wordpress.android.ui.mediapicker.MediaPickerViewModel.ProgressDialogUiModel.Visible
 import org.wordpress.android.ui.photopicker.PhotoPickerFragment.PhotoPickerIcon.WP_MEDIA
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.ActionModeUiModel
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.BottomBarUiModel
@@ -41,16 +43,19 @@ import org.wordpress.android.util.AniUtils.Duration.MEDIUM
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.POSTS
 import org.wordpress.android.util.DisplayUtils
+import org.wordpress.android.util.UriWrapper
 import org.wordpress.android.util.ViewWrapper
 import org.wordpress.android.util.WPMediaUtils
 import org.wordpress.android.util.WPPermissionUtils
-import org.wordpress.android.util.config.TenorFeatureConfig
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
-@Deprecated("This class is being refactored, if you implement any change, please also update " +
-        "{@link org.wordpress.android.ui.mediapicker.MediaPickerFragment}")
-class PhotoPickerFragment : Fragment() {
+@Deprecated(
+        "This class is being refactored, if you implement any change, please also update " +
+                "{@link org.wordpress.android.ui.mediapicker.MediaPickerFragment}"
+)
+class PhotoPickerFragment : Fragment(R.layout.photo_picker_fragment) {
     enum class PhotoPickerIcon(private val mRequiresUploadPermission: Boolean) {
         ANDROID_CHOOSE_PHOTO(true),
         ANDROID_CHOOSE_VIDEO(true),
@@ -77,27 +82,15 @@ class PhotoPickerFragment : Fragment() {
 
     private var listener: PhotoPickerListener? = null
 
-    @Inject lateinit var tenorFeatureConfig: TenorFeatureConfig
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: PhotoPickerViewModel
+    private var binding: PhotoPickerFragmentBinding? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().application as WordPress).component().inject(this)
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(PhotoPickerViewModel::class.java)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(
-                R.layout.photo_picker_fragment,
-                container,
-                false
-        )
+        viewModel = ViewModelProvider(this, viewModelFactory).get(PhotoPickerViewModel::class.java)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -114,67 +107,60 @@ class PhotoPickerFragment : Fragment() {
                 selectedIds = savedInstanceState.getLongArray(KEY_SELECTED_POSITIONS)?.toList()
             }
         }
-        recycler.setEmptyView(actionable_empty_view)
-        recycler.setHasFixedSize(true)
-
-        val layoutManager = GridLayoutManager(
-                activity,
-                NUM_COLUMNS
-        )
-
-        savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
-            layoutManager.onRestoreInstanceState(it)
-        }
+        with(PhotoPickerFragmentBinding.bind(view)) {
+            binding = this
+            recycler.setEmptyView(actionableEmptyView)
+            recycler.setHasFixedSize(true)
+
+            val layoutManager = GridLayoutManager(
+                    activity,
+                    NUM_COLUMNS
+            )
 
-        recycler.layoutManager = layoutManager
+            savedInstanceState?.getParcelable<Parcelable>(KEY_LIST_STATE)?.let {
+                layoutManager.onRestoreInstanceState(it)
+            }
 
-        var isShowingActionMode = false
-        viewModel.uiState.observe(viewLifecycleOwner, Observer {
-            it?.let { uiState ->
-                setupPhotoList(uiState.photoListUiModel)
-                setupBottomBar(uiState.bottomBarUiModel)
-                setupSoftAskView(uiState.softAskViewUiModel)
-                if (uiState.actionModeUiModel is ActionModeUiModel.Visible && !isShowingActionMode) {
-                    isShowingActionMode = true
-                    (activity as AppCompatActivity).startSupportActionMode(
-                            PhotoPickerActionModeCallback(
-                                    viewModel
-                            )
-                    )
-                } else if (uiState.actionModeUiModel is ActionModeUiModel.Hidden && isShowingActionMode) {
-                    isShowingActionMode = false
+            recycler.layoutManager = layoutManager
+
+            var isShowingActionMode = false
+            viewModel.uiState.observe(viewLifecycleOwner, Observer {
+                it?.let { uiState ->
+                    setupPhotoList(uiState.photoListUiModel)
+                    setupBottomBar(uiState.bottomBarUiModel)
+                    setupSoftAskView(uiState.softAskViewUiModel)
+                    if (uiState.actionModeUiModel is ActionModeUiModel.Visible && !isShowingActionMode) {
+                        isShowingActionMode = true
+                        (activity as AppCompatActivity).startSupportActionMode(
+                                PhotoPickerActionModeCallback(
+                                        viewModel
+                                )
+                        )
+                    } else if (uiState.actionModeUiModel is ActionModeUiModel.Hidden && isShowingActionMode) {
+                        isShowingActionMode = false
+                    }
+                    setupFab(uiState.fabUiModel)
                 }
-                uiState.fabUiModel.let(this::setupFab)
-            }
-        })
+            })
 
-        viewModel.onNavigateToPreview.observe(viewLifecycleOwner, Observer
-        {
-            it.getContentIfNotHandled()?.let { uri ->
+            viewModel.onNavigateToPreview.observeEvent(viewLifecycleOwner, { uri ->
                 MediaPreviewActivity.showPreview(
                         requireContext(),
                         null,
                         uri.toString()
                 )
                 AccessibilityUtils.setActionModeDoneButtonContentDescription(activity, getString(R.string.cancel))
-            }
-        })
+            })
 
-        viewModel.onInsert.observe(viewLifecycleOwner, Observer
-        { event ->
-            event.getContentIfNotHandled()?.let { selectedUris ->
+            viewModel.onInsert.observeEvent(viewLifecycleOwner, { selectedUris ->
                 listener?.onPhotoPickerMediaChosen(selectedUris.map { it.uri })
-            }
-        })
+            })
 
-        viewModel.onIconClicked.observe(viewLifecycleOwner, Observer {
-            it?.getContentIfNotHandled()?.let { (icon, allowMultipleSelection) ->
+            viewModel.onIconClicked.observeEvent(viewLifecycleOwner, { (icon, allowMultipleSelection) ->
                 listener?.onPhotoPickerIconClicked(icon, allowMultipleSelection)
-            }
-        })
+            })
 
-        viewModel.onShowPopupMenu.observe(viewLifecycleOwner, Observer {
-            it?.getContentIfNotHandled()?.let { uiModel ->
+            viewModel.onShowPopupMenu.observeEvent(viewLifecycleOwner, { uiModel ->
                 val popup = PopupMenu(activity, uiModel.view.view)
                 for (popupMenuItem in uiModel.items) {
                     val item = popup.menu
@@ -185,48 +171,54 @@ class PhotoPickerFragment : Fragment() {
                     }
                 }
                 popup.show()
-            }
-        })
+            })
 
-        viewModel.onPermissionsRequested.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                when (this) {
+            viewModel.onPermissionsRequested.observeEvent(viewLifecycleOwner, {
+                when (it) {
                     CAMERA -> requestCameraPermission()
                     STORAGE -> requestStoragePermission()
                 }
-            }
-        })
+            })
 
-        viewModel.start(selectedIds, browserType, lastTappedIcon, site)
+            setupProgressDialog()
+
+            viewModel.start(selectedIds, browserType, lastTappedIcon, site)
+        }
     }
 
-    private fun setupSoftAskView(uiModel: SoftAskViewUiModel) {
+    override fun onDestroyView() {
+        binding = null
+        super.onDestroyView()
+    }
+
+    private fun PhotoPickerFragmentBinding.setupSoftAskView(uiModel: SoftAskViewUiModel) {
         when (uiModel) {
             is SoftAskViewUiModel.Visible -> {
-                soft_ask_view.title.text = Html.fromHtml(uiModel.label)
-                soft_ask_view.button.setText(uiModel.allowId.stringRes)
-                soft_ask_view.button.setOnClickListener {
+                softAskView.title.text = Html.fromHtml(uiModel.label)
+                softAskView.button.setText(uiModel.allowId.stringRes)
+                softAskView.button.setOnClickListener {
                     if (uiModel.isAlwaysDenied) {
                         WPPermissionUtils.showAppSettings(requireActivity())
                     } else {
                         requestStoragePermission()
                     }
                 }
-                soft_ask_view.visibility = View.VISIBLE
+                softAskView.visibility = View.VISIBLE
             }
             is SoftAskViewUiModel.Hidden -> {
-                if (soft_ask_view.visibility == View.VISIBLE) {
-                    AniUtils.fadeOut(soft_ask_view, MEDIUM)
+                if (softAskView.visibility == View.VISIBLE) {
+                    AniUtils.fadeOut(softAskView, MEDIUM)
                 }
             }
         }
     }
 
-    private fun setupPhotoList(uiModel: PhotoListUiModel) {
+    private fun PhotoPickerFragmentBinding.setupPhotoList(uiModel: PhotoListUiModel) {
         if (uiModel is PhotoListUiModel.Data) {
             if (recycler.adapter == null) {
                 recycler.adapter = PhotoPickerAdapter(
-                        imageManager
+                        imageManager,
+                        viewModel.viewModelScope
                 )
             }
             val adapter = recycler.adapter as PhotoPickerAdapter
@@ -236,43 +228,42 @@ class PhotoPickerFragment : Fragment() {
         }
     }
 
-    private fun setupFab(fabUiModel: FabUiModel) {
+    private fun PhotoPickerFragmentBinding.setupFab(fabUiModel: FabUiModel) {
         if (fabUiModel.show) {
-            wp_stories_take_picture.visibility = View.VISIBLE
-            wp_stories_take_picture.setOnClickListener {
+            wpStoriesTakePicture.visibility = View.VISIBLE
+            wpStoriesTakePicture.setOnClickListener {
                 fabUiModel.action()
             }
         } else {
-            wp_stories_take_picture.visibility = View.GONE
+            wpStoriesTakePicture.visibility = View.GONE
         }
     }
 
-    private fun setupBottomBar(uiModel: BottomBarUiModel) {
+    private fun PhotoPickerFragmentBinding.setupBottomBar(uiModel: BottomBarUiModel) {
         if (!canShowMediaSourceBottomBar(uiModel.hideMediaBottomBarInPortrait)) {
-            hideBottomBar(container_media_source_bar)
+            hideBottomBar(containerMediaSourceBar)
         } else {
             if (!uiModel.showCameraButton) {
-                container_media_source_bar.icon_camera.visibility = View.GONE
+                iconCamera.visibility = View.GONE
             } else {
-                container_media_source_bar.icon_camera.setOnClickListener {
+                iconCamera.setOnClickListener {
                     viewModel.onCameraClicked(ViewWrapper(it))
                 }
             }
-            container_media_source_bar.icon_picker
-                    ?.setOnClickListener {
+            iconPicker.setOnClickListener {
                         uiModel.onIconPickerClicked(ViewWrapper(it))
                     }
 
             if (uiModel.showWPMediaIcon) {
-                container_media_source_bar.icon_wpmedia.setOnClickListener {
+                iconWpmedia.setOnClickListener {
                     viewModel.clickIcon(WP_MEDIA)
                 }
             } else {
-                container_media_source_bar.icon_wpmedia.visibility = View.GONE
+                iconWpmedia.visibility = View.GONE
             }
         }
         if (uiModel.canShowInsertEditBottomBar) {
-            container_insert_edit_bar.text_edit
+            textEdit
                     .setOnClickListener {
                         val inputData = WPMediaUtils.createListOfEditImageInputData(
                                 requireContext(),
@@ -280,30 +271,59 @@ class PhotoPickerFragment : Fragment() {
                         )
                         ActivityLauncher.openImageEditor(activity, inputData)
                     }
-            container_insert_edit_bar.text_insert.setOnClickListener { viewModel.performInsertAction() }
+            textInsert.setOnClickListener { viewModel.performInsertAction() }
         }
         val editTextVisible = if (uiModel.insertEditTextBarVisible) View.VISIBLE else View.GONE
-        container_insert_edit_bar.text_edit.visibility = editTextVisible
+        textEdit.visibility = editTextVisible
         when (uiModel.type) {
             INSERT_EDIT -> {
-                hideBottomBar(container_media_source_bar)
-                showBottomBar(container_insert_edit_bar)
+                hideBottomBar(containerMediaSourceBar)
+                showBottomBar(containerInsertEditBar)
             }
             MEDIA_SOURCE -> {
                 if (canShowMediaSourceBottomBar(uiModel.hideMediaBottomBarInPortrait)) {
-                    showBottomBar(container_media_source_bar)
+                    showBottomBar(containerMediaSourceBar)
                 } else {
-                    hideBottomBar(container_media_source_bar)
+                    hideBottomBar(containerMediaSourceBar)
                 }
-                hideBottomBar(container_insert_edit_bar)
+                hideBottomBar(containerInsertEditBar)
             }
             NONE -> {
-                hideBottomBar(container_insert_edit_bar)
-                hideBottomBar(container_media_source_bar)
+                hideBottomBar(containerInsertEditBar)
+                hideBottomBar(containerMediaSourceBar)
             }
         }
     }
 
+    private fun setupProgressDialog() {
+        var progressDialog: AlertDialog? = null
+        viewModel.uiState.observe(viewLifecycleOwner, Observer {
+            it?.progressDialogUiModel?.apply {
+                when (this) {
+                    is Visible -> {
+                        if (progressDialog == null || progressDialog?.isShowing == false) {
+                            val builder: Builder = MaterialAlertDialogBuilder(requireContext())
+                            builder.setTitle(this.title)
+                            builder.setView(R.layout.media_picker_progress_dialog)
+                            builder.setNegativeButton(
+                                    R.string.cancel
+                            ) { _, _ -> this.cancelAction() }
+                            builder.setCancelable(false)
+                            progressDialog = builder.show()
+                        }
+                    }
+                    ProgressDialogUiModel.Hidden -> {
+                        progressDialog?.let { dialog ->
+                            if (dialog.isShowing) {
+                                dialog.dismiss()
+                            }
+                        }
+                    }
+                }
+            }
+        })
+    }
+
     private fun canShowMediaSourceBottomBar(
         hideMediaBottomBarInPortrait: Boolean
     ): Boolean {
@@ -320,7 +340,7 @@ class PhotoPickerFragment : Fragment() {
         if (selectedIds != null && selectedIds.isNotEmpty()) {
             outState.putLongArray(KEY_SELECTED_POSITIONS, selectedIds.toLongArray())
         }
-        recycler.layoutManager?.let {
+        binding!!.recycler.layoutManager?.let {
             outState.putParcelable(KEY_LIST_STATE, it.onSaveInstanceState())
         }
     }
@@ -358,10 +378,6 @@ class PhotoPickerFragment : Fragment() {
         return bottomBar.visibility == View.VISIBLE
     }
 
-    private fun hasAdapter(): Boolean {
-        return recycler.adapter != null
-    }
-
     /*
      * similar to the above but only repopulates if changes are detected
      */
@@ -433,6 +449,14 @@ class PhotoPickerFragment : Fragment() {
         viewModel.clickIcon(wpMedia)
     }
 
+    fun urisSelectedFromSystemPicker(uris: List<Uri>) {
+        viewModel.urisSelectedFromSystemPicker(uris.map { UriWrapper(it) })
+    }
+
+    fun mediaIdsSelectedFromWPMediaPicker(mediaIds: List<Long>) {
+        viewModel.mediaIdsSelectedFromWPMediaPicker(mediaIds)
+    }
+
     companion object {
         private const val KEY_LAST_TAPPED_ICON = "last_tapped_icon"
         private const val KEY_SELECTED_POSITIONS = "selected_positions"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt
index 467690fe5906..96b4c00880e5 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt
@@ -1,10 +1,12 @@
 package org.wordpress.android.ui.photopicker
 
 import android.Manifest.permission
+import android.net.Uri
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.isActive
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
@@ -21,6 +23,7 @@ import org.wordpress.android.ui.media.MediaBrowserType
 import org.wordpress.android.ui.media.MediaBrowserType.AZTEC_EDITOR_PICKER
 import org.wordpress.android.ui.media.MediaBrowserType.GRAVATAR_IMAGE_PICKER
 import org.wordpress.android.ui.media.MediaBrowserType.SITE_ICON_PICKER
+import org.wordpress.android.ui.mediapicker.MediaPickerViewModel.ProgressDialogUiModel
 import org.wordpress.android.ui.photopicker.PhotoPickerFragment.PhotoPickerIcon
 import org.wordpress.android.ui.photopicker.PhotoPickerFragment.PhotoPickerIcon.ANDROID_CAPTURE_PHOTO
 import org.wordpress.android.ui.photopicker.PhotoPickerFragment.PhotoPickerIcon.ANDROID_CAPTURE_VIDEO
@@ -37,6 +40,8 @@ import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.BottomBarUiMode
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.BottomBarUiModel.BottomBar.MEDIA_SOURCE
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.BottomBarUiModel.BottomBar.NONE
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.PopupMenuUiModel.PopupMenuItem
+import org.wordpress.android.ui.posts.editor.media.CopyMediaToAppStorageUseCase
+import org.wordpress.android.ui.posts.editor.media.GetMediaModelUseCase
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
@@ -48,7 +53,6 @@ import org.wordpress.android.util.ViewWrapper
 import org.wordpress.android.util.WPPermissionUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
-import org.wordpress.android.util.config.TenorFeatureConfig
 import org.wordpress.android.util.distinct
 import org.wordpress.android.util.merge
 import org.wordpress.android.viewmodel.Event
@@ -58,8 +62,10 @@ import java.util.HashMap
 import javax.inject.Inject
 import javax.inject.Named
 
-@Deprecated("This class is being refactored, if you implement any change, please also update " +
-        "{@link org.wordpress.android.ui.mediapicker.MediaPickerViewModel}")
+@Deprecated(
+        "This class is being refactored, if you implement any change, please also update " +
+                "{@link org.wordpress.android.ui.mediapicker.MediaPickerViewModel}"
+)
 class PhotoPickerViewModel @Inject constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
@@ -67,8 +73,9 @@ class PhotoPickerViewModel @Inject constructor(
     private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
     private val permissionsHandler: PermissionsHandler,
-    private val tenorFeatureConfig: TenorFeatureConfig,
-    private val resourceProvider: ResourceProvider
+    private val resourceProvider: ResourceProvider,
+    private val copyMediaToAppStorageUseCase: CopyMediaToAppStorageUseCase,
+    private val getMediaModelUseCase: GetMediaModelUseCase
 ) : ScopedViewModel(mainDispatcher) {
     private val _navigateToPreview = MutableLiveData<Event<UriWrapper>>()
     private val _onInsert = MutableLiveData<Event<List<UriWrapper>>>()
@@ -78,6 +85,7 @@ class PhotoPickerViewModel @Inject constructor(
     private val _onIconClicked = MutableLiveData<Event<IconClickEvent>>()
     private val _onPermissionsRequested = MutableLiveData<Event<PermissionsRequested>>()
     private val _softAskRequest = MutableLiveData<SoftAskRequest>()
+    private val _showProgressDialog = MutableLiveData<ProgressDialogUiModel>()
 
     val onNavigateToPreview: LiveData<Event<UriWrapper>> = _navigateToPreview
     val onInsert: LiveData<Event<List<UriWrapper>>> = _onInsert
@@ -91,8 +99,9 @@ class PhotoPickerViewModel @Inject constructor(
     val uiState: LiveData<PhotoPickerUiState> = merge(
             _photoPickerItems.distinct(),
             _selectedIds.distinct(),
-            _softAskRequest
-    ) { photoPickerItems, selectedIds, softAskRequest ->
+            _softAskRequest,
+            _showProgressDialog
+    ) { photoPickerItems, selectedIds, softAskRequest, progressDialogModel ->
         PhotoPickerUiState(
                 buildPhotoPickerUiModel(photoPickerItems, selectedIds),
                 buildBottomBar(
@@ -101,10 +110,11 @@ class PhotoPickerViewModel @Inject constructor(
                         softAskRequest?.show == true
                 ),
                 buildSoftAskView(softAskRequest),
-                FabUiModel(browserType.isWPStoriesPicker) {
+                FabUiModel(browserType.isWPStoriesPicker && selectedIds.isNullOrEmpty()) {
                     clickIcon(WP_STORIES_CAPTURE)
                 },
-                buildActionModeUiModel(selectedIds)
+                buildActionModeUiModel(selectedIds),
+                progressDialogModel ?: ProgressDialogUiModel.Hidden
         )
     }
 
@@ -410,7 +420,7 @@ class PhotoPickerViewModel @Inject constructor(
                 )
             })
             // only show GIF picker from Tenor if this is NOT the WPStories picker
-            if (tenorFeatureConfig.isEnabled() && !browserType.isWPStoriesPicker) {
+            if (!browserType.isWPStoriesPicker) {
                 items.add(PopupMenuItem(UiStringRes(R.string.photo_picker_gif)) {
                     clickIcon(
                             GIF
@@ -440,10 +450,12 @@ class PhotoPickerViewModel @Inject constructor(
         if (softAskRequest != null && softAskRequest.show) {
             val appName = "<strong>${resourceProvider.getString(R.string.app_name)}</strong>"
             val label = if (softAskRequest.isAlwaysDenied) {
-                val permissionName = ("<strong>${WPPermissionUtils.getPermissionName(
-                        resourceProvider,
-                        permission.WRITE_EXTERNAL_STORAGE
-                )}</strong>")
+                val permissionName = ("<strong>${
+                    WPPermissionUtils.getPermissionName(
+                            resourceProvider,
+                            permission.WRITE_EXTERNAL_STORAGE
+                    )
+                }</strong>")
                 String.format(
                         resourceProvider.getString(R.string.photo_picker_soft_ask_permissions_denied), appName,
                         permissionName
@@ -465,12 +477,39 @@ class PhotoPickerViewModel @Inject constructor(
         }
     }
 
+    fun urisSelectedFromSystemPicker(uris: List<UriWrapper>) {
+        copySelectedUrisLocally(uris)
+    }
+
+    fun mediaIdsSelectedFromWPMediaPicker(mediaIds: List<Long>) {
+        launch {
+            val mediaModels = getMediaModelUseCase
+                    .loadMediaByRemoteId(requireNotNull(site), mediaIds)
+            copySelectedUrisLocally(mediaModels.map { UriWrapper(Uri.parse(it.url)) })
+        }
+    }
+
+    fun copySelectedUrisLocally(uris: List<UriWrapper>) {
+        launch {
+            _showProgressDialog.value = ProgressDialogUiModel.Visible(R.string.uploading_title) {
+                _showProgressDialog.postValue(ProgressDialogUiModel.Hidden)
+                cancel()
+            }
+            val localUris = copyMediaToAppStorageUseCase.copyFilesToAppStorageIfNecessary(uris.map { it.uri })
+            _showProgressDialog.postValue(ProgressDialogUiModel.Hidden)
+            if (isActive) {
+                _onInsert.value = Event(localUris.permanentlyAccessibleUris.map { UriWrapper(it) })
+            }
+        }
+    }
+
     data class PhotoPickerUiState(
         val photoListUiModel: PhotoListUiModel,
         val bottomBarUiModel: BottomBarUiModel,
         val softAskViewUiModel: SoftAskViewUiModel,
         val fabUiModel: FabUiModel,
-        val actionModeUiModel: ActionModeUiModel
+        val actionModeUiModel: ActionModeUiModel,
+        val progressDialogUiModel: ProgressDialogUiModel
     )
 
     sealed class PhotoListUiModel {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoThumbnailViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoThumbnailViewHolder.kt
index 0cf149d0bab7..1e5d033693fb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoThumbnailViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoThumbnailViewHolder.kt
@@ -2,17 +2,25 @@ package org.wordpress.android.ui.photopicker
 
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.ImageView.ScaleType.FIT_CENTER
 import android.widget.TextView
 import org.wordpress.android.R
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.PHOTO
 
 /*
  * ViewHolder containing a device thumbnail
  */
 
-@Deprecated("This class is being refactored, if you implement any change, please also update " +
-        "{@link org.wordpress.android.ui.mediapicker.PhotoThumbnailViewHolder}")
-class PhotoThumbnailViewHolder(parent: ViewGroup, private val thumbnailViewUtils: ThumbnailViewUtils) :
-        ThumbnailViewHolder(parent, R.layout.photo_picker_thumbnail) {
+@Deprecated(
+        "This class is being refactored, if you implement any change, please also update " +
+                "{@link org.wordpress.android.ui.mediapicker.PhotoThumbnailViewHolder}"
+)
+class PhotoThumbnailViewHolder(
+    parent: ViewGroup,
+    private val thumbnailViewUtils: ThumbnailViewUtils,
+    private val imageManager: ImageManager
+) : ThumbnailViewHolder(parent, R.layout.photo_picker_thumbnail) {
     private val imgThumbnail: ImageView = itemView.findViewById(R.id.image_thumbnail)
     private val txtSelectionCount: TextView = itemView.findViewById(R.id.text_selection_count)
 
@@ -29,12 +37,17 @@ class PhotoThumbnailViewHolder(parent: ViewGroup, private val thumbnailViewUtils
         if (updateCount) {
             return
         }
-        thumbnailViewUtils.setupThumbnailImage(
+        imageManager.cancelRequestAndClearImageView(imgThumbnail)
+        imageManager.load(
                 imgThumbnail,
+                PHOTO,
                 item.uri.toString(),
-                item.isSelected,
-                item.clickAction,
+                FIT_CENTER
+        )
+        thumbnailViewUtils.setupListeners(
+                imgThumbnail, item.isSelected,
                 item.toggleAction,
+                item.clickAction,
                 animateSelection
         )
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/ThumbnailViewUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/ThumbnailViewUtils.kt
index de1401d73802..ed79a3ba7330 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/ThumbnailViewUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/ThumbnailViewUtils.kt
@@ -2,7 +2,6 @@ package org.wordpress.android.ui.photopicker
 
 import android.view.View
 import android.widget.ImageView
-import android.widget.ImageView.ScaleType.FIT_CENTER
 import android.widget.TextView
 import org.wordpress.android.R.anim
 import org.wordpress.android.R.drawable
@@ -15,28 +14,19 @@ import org.wordpress.android.util.AniUtils.Duration.SHORT
 import org.wordpress.android.util.PhotoPickerUtils
 import org.wordpress.android.util.ViewUtils
 import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.util.image.ImageType.PHOTO
 import org.wordpress.android.util.redirectContextClickToLongPressListener
 import java.util.Locale
 
 @Deprecated("This class is being refactored, if you implement any change, please also update " +
         "{@link org.wordpress.android.ui.mediapicker.ThumbnailViewUtils}")
 class ThumbnailViewUtils(val imageManager: ImageManager) {
-    fun setupThumbnailImage(
+    fun setupListeners(
         imgThumbnail: ImageView,
-        url: String,
         isSelected: Boolean,
-        clickAction: ClickAction,
         toggleAction: ToggleAction,
+        clickAction: ClickAction,
         animateSelection: Boolean
     ) {
-        imageManager.cancelRequestAndClearImageView(imgThumbnail)
-        imageManager.load(
-                imgThumbnail,
-                PHOTO,
-                url,
-                FIT_CENTER
-        )
         addImageSelectedToAccessibilityFocusedEvent(imgThumbnail, isSelected)
         imgThumbnail.setOnClickListener {
             toggleAction.toggle()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/VideoThumbnailViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/VideoThumbnailViewHolder.kt
index fe6e6bf615b0..976ec9770c26 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/VideoThumbnailViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/VideoThumbnailViewHolder.kt
@@ -2,17 +2,27 @@ package org.wordpress.android.ui.photopicker
 
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.ImageView.ScaleType.FIT_CENTER
 import android.widget.TextView
+import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.R
 import org.wordpress.android.R.id
+import org.wordpress.android.util.image.ImageManager
 
 /*
  * ViewHolder containing a device thumbnail
  */
 
-@Deprecated("This class is being refactored, if you implement any change, please also update " +
-        "{@link org.wordpress.android.ui.mediapicker.VideoThumbnailViewHolder}")
-class VideoThumbnailViewHolder(parent: ViewGroup, private val thumbnailViewUtils: ThumbnailViewUtils) :
+@Deprecated(
+        "This class is being refactored, if you implement any change, please also update " +
+                "{@link org.wordpress.android.ui.mediapicker.VideoThumbnailViewHolder}"
+)
+class VideoThumbnailViewHolder(
+    parent: ViewGroup,
+    private val thumbnailViewUtils: ThumbnailViewUtils,
+    private val imageManager: ImageManager,
+    private val coroutineScope: CoroutineScope
+) :
         ThumbnailViewHolder(
                 parent,
                 R.layout.photo_picker_thumbnail
@@ -34,12 +44,17 @@ class VideoThumbnailViewHolder(parent: ViewGroup, private val thumbnailViewUtils
         if (updateCount) {
             return
         }
-        thumbnailViewUtils.setupThumbnailImage(
+        imageManager.cancelRequestAndClearImageView(imgThumbnail)
+        imageManager.loadThumbnailFromVideoUrl(
+                coroutineScope,
                 imgThumbnail,
                 item.uri.toString(),
-                item.isSelected,
-                item.clickAction,
+                FIT_CENTER
+        )
+        thumbnailViewUtils.setupListeners(
+                imgThumbnail, item.isSelected,
                 item.toggleAction,
+                item.clickAction,
                 animateSelection
         )
         thumbnailViewUtils.setupVideoOverlay(videoOverlay, item.clickAction)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt
index 4a4a3b1ecfdc..c3b68989afb2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansActivity.kt
@@ -1,8 +1,7 @@
 package org.wordpress.android.ui.plans
 
 import android.os.Bundle
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.PlansActivityBinding
 import org.wordpress.android.fluxc.model.plans.PlanOffersModel
 import org.wordpress.android.ui.FullScreenDialogFragment
 import org.wordpress.android.ui.LocaleAwareActivity
@@ -12,9 +11,11 @@ import org.wordpress.android.util.StringUtils
 class PlansActivity : LocaleAwareActivity(), PlansListInterface {
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.plans_activity)
+        with(PlansActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
 
-        setSupportActionBar(toolbar_main)
+            setSupportActionBar(toolbarMain)
+        }
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansListFragment.kt
index 4861bc21c5bf..4613d7f41ae2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansListFragment.kt
@@ -7,12 +7,11 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.plans_list_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PlansListFragmentBinding
 import org.wordpress.android.fluxc.model.plans.PlanOffersModel
 import org.wordpress.android.ui.plans.PlansViewModel.PlansListStatus.ERROR
 import org.wordpress.android.ui.plans.PlansViewModel.PlansListStatus.ERROR_WITH_CACHE
@@ -44,43 +43,44 @@ class PlansListFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
-
-        empty_recycler_view.layoutManager = LinearLayoutManager(nonNullActivity, RecyclerView.VERTICAL, false)
-        empty_recycler_view.setEmptyView(actionable_empty_view)
-
-        swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(swipe_refresh_layout) {
-            if (NetworkUtils.checkConnection(nonNullActivity)) {
-                viewModel.onPullToRefresh()
-            } else {
-                swipeToRefreshHelper.isRefreshing = false
+        with(PlansListFragmentBinding.bind(view)) {
+            emptyRecyclerView.layoutManager = LinearLayoutManager(nonNullActivity, RecyclerView.VERTICAL, false)
+            emptyRecyclerView.setEmptyView(actionableEmptyView)
+
+            swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(swipeRefreshLayout) {
+                if (NetworkUtils.checkConnection(nonNullActivity)) {
+                    viewModel.onPullToRefresh()
+                } else {
+                    swipeToRefreshHelper.isRefreshing = false
+                }
             }
-        }
 
-        (nonNullActivity.application as WordPress).component()?.inject(this)
+            (nonNullActivity.application as WordPress).component()?.inject(this@PlansListFragment)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(PlansViewModel::class.java)
-        setObservers()
-        viewModel.create()
+            viewModel = ViewModelProvider(this@PlansListFragment, viewModelFactory).get(PlansViewModel::class.java)
+            setObservers()
+            viewModel.create()
+        }
     }
 
-    private fun reloadList(data: List<PlanOffersModel>) {
+    private fun PlansListFragmentBinding.reloadList(data: List<PlanOffersModel>) {
         setList(data)
     }
 
-    private fun setList(list: List<PlanOffersModel>) {
+    private fun PlansListFragmentBinding.setList(list: List<PlanOffersModel>) {
         val adapter: PlansListAdapter
 
-        if (empty_recycler_view.adapter == null) {
-            adapter = PlansListAdapter(requireActivity(), this::onItemClicked)
-            empty_recycler_view.adapter = adapter
+        if (emptyRecyclerView.adapter == null) {
+            adapter = PlansListAdapter(requireActivity(), this@PlansListFragment::onItemClicked)
+            emptyRecyclerView.adapter = adapter
         } else {
-            adapter = empty_recycler_view.adapter as PlansListAdapter
+            adapter = emptyRecyclerView.adapter as PlansListAdapter
         }
 
         adapter.updateList(list)
     }
 
-    private fun setObservers() {
+    private fun PlansListFragmentBinding.setObservers() {
         viewModel.plans.observe(viewLifecycleOwner, Observer {
             reloadList(it ?: emptyList())
         })
@@ -92,15 +92,15 @@ class PlansListFragment : Fragment() {
 
             when (listStatus) {
                 ERROR -> {
-                    actionable_empty_view.title.text = getString(R.string.plans_loading_error_network_title)
-                    actionable_empty_view.subtitle.text = getString(R.string.plans_loading_error_no_cache_subtitle)
-                    actionable_empty_view.button.visibility = View.GONE
+                    actionableEmptyView.title.text = getString(R.string.plans_loading_error_network_title)
+                    actionableEmptyView.subtitle.text = getString(R.string.plans_loading_error_no_cache_subtitle)
+                    actionableEmptyView.button.visibility = View.GONE
                 }
                 ERROR_WITH_CACHE -> {
-                    actionable_empty_view.title.text = getString(R.string.plans_loading_error_network_title)
-                    actionable_empty_view.subtitle.text = getString(R.string.plans_loading_error_with_cache_subtitle)
-                    actionable_empty_view.button.visibility = View.VISIBLE
-                    actionable_empty_view.button.setOnClickListener {
+                    actionableEmptyView.title.text = getString(R.string.plans_loading_error_network_title)
+                    actionableEmptyView.subtitle.text = getString(R.string.plans_loading_error_with_cache_subtitle)
+                    actionableEmptyView.button.visibility = View.VISIBLE
+                    actionableEmptyView.button.setOnClickListener {
                         viewModel.onShowCachedPlansButtonClicked()
                     }
                 }
@@ -111,9 +111,9 @@ class PlansListFragment : Fragment() {
                 }
                 else -> {
                     // show generic error in case there are no plans to show for any reason
-                    actionable_empty_view.title.text = getString(R.string.plans_loading_error_no_plans_title)
-                    actionable_empty_view.subtitle.text = getString(R.string.plans_loading_error_no_plans_subtitle)
-                    actionable_empty_view.button.visibility = View.GONE
+                    actionableEmptyView.title.text = getString(R.string.plans_loading_error_no_plans_title)
+                    actionableEmptyView.subtitle.text = getString(R.string.plans_loading_error_no_plans_subtitle)
+                    actionableEmptyView.button.visibility = View.GONE
                 }
             }
         })
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt
index 42fdbcba8f19..7ac95e46a1e3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/plans/PlansViewModel.kt
@@ -2,8 +2,7 @@ package org.wordpress.android.ui.plans
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -14,11 +13,12 @@ import org.wordpress.android.fluxc.generated.PlanOffersActionBuilder
 import org.wordpress.android.fluxc.model.plans.PlanOffersModel
 import org.wordpress.android.fluxc.store.PlanOffersStore
 import org.wordpress.android.fluxc.store.PlanOffersStore.OnPlanOffersFetched
-import org.wordpress.android.modules.UI_SCOPE
+import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.plans.PlansViewModel.PlansListStatus.DONE
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
 import javax.inject.Named
@@ -27,9 +27,9 @@ class PlansViewModel @Inject constructor(
     private val dispatcher: Dispatcher,
     @Suppress("unused")
     private var plansStore: PlanOffersStore,
-    @param:Named(UI_SCOPE) private val uiScope: CoroutineScope,
+    @param:Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
-) : ViewModel() {
+) : ScopedViewModel(uiDispatcher) {
     enum class PlansListStatus {
         DONE,
         ERROR,
@@ -69,7 +69,7 @@ class PlansViewModel @Inject constructor(
 
     private fun fetchPlans() {
         _listStatus.value = PlansListStatus.FETCHING
-        uiScope.launch {
+        launch {
             dispatcher.dispatch(PlanOffersActionBuilder.generateNoPayloadAction(FETCH_PLAN_OFFERS))
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java
index 97d06eb6caa9..1274dde54e8e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java
@@ -22,7 +22,6 @@
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -81,7 +80,7 @@ public void onCreate(Bundle savedInstanceState) {
         ((WordPress) getApplication()).component().inject(this);
         setContentView(R.layout.plugin_browser_activity);
 
-        mViewModel = ViewModelProviders.of(this, mViewModelFactory).get(PluginBrowserViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(PluginBrowserViewModel.class);
 
         mSitePluginsRecycler = findViewById(R.id.installed_plugins_recycler);
         mFeaturedPluginsRecycler = findViewById(R.id.featured_plugins_recycler);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java
index e0bc68e9e64b..03d43d937ae4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java
@@ -19,7 +19,6 @@
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -87,7 +86,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         setHasOptionsMenu(mListType != PluginListType.SEARCH);
 
         // Use the same view model as the PluginBrowserActivity
-        mViewModel = ViewModelProviders.of(getActivity(), mViewModelFactory).get(PluginBrowserViewModel.class);
+        mViewModel = new ViewModelProvider(getActivity(), mViewModelFactory).get(PluginBrowserViewModel.class);
         setupObservers();
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginUtilsWrapper.kt
new file mode 100644
index 000000000000..a928289d7b1e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginUtilsWrapper.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.ui.plugins
+
+import org.wordpress.android.fluxc.model.SiteModel
+import javax.inject.Inject
+
+class PluginUtilsWrapper
+@Inject constructor() {
+    fun isPluginFeatureAvailable(site: SiteModel): Boolean {
+        return PluginUtils.isPluginFeatureAvailable(site)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialog.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialog.kt
new file mode 100644
index 000000000000..7314f344abd5
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialog.kt
@@ -0,0 +1,92 @@
+package org.wordpress.android.ui.posts
+
+import android.app.Dialog
+import android.content.Context
+import android.content.DialogInterface
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import dagger.android.support.AndroidSupportInjection
+import org.wordpress.android.ui.posts.BasicDialogViewModel.BasicDialogModel
+import javax.inject.Inject
+
+/**
+ * Basic dialog fragment with support for 1,2 or 3 buttons.
+ */
+class BasicDialog : AppCompatDialogFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: BasicDialogViewModel
+    private lateinit var model: BasicDialogModel
+    private var dismissedByPositiveButton: Boolean = false
+    private var dismissedByNegativeButton: Boolean = false
+    private var dismissedByCancelButton: Boolean = false
+
+    fun initialize(model: BasicDialogModel) {
+        this.model = model
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        this.isCancelable = true
+        val theme = 0
+        setStyle(STYLE_NORMAL, theme)
+
+        if (savedInstanceState != null) {
+            model = requireNotNull(savedInstanceState.getParcelable(STATE_KEY_MODEL))
+        }
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        outState.putParcelable(STATE_KEY_MODEL, model)
+        super.onSaveInstanceState(outState)
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
+                .get(BasicDialogViewModel::class.java)
+        val builder = MaterialAlertDialogBuilder(requireActivity())
+        builder.setMessage(model.message)
+                .setPositiveButton(model.positiveButtonLabel) { _, _ ->
+                    dismissedByPositiveButton = true
+                    viewModel.onPositiveClicked(model.tag)
+                }.setCancelable(true)
+
+        model.title?.let {
+            builder.setTitle(it)
+        }
+
+        model.negativeButtonLabel?.let { negativeLabel ->
+            builder.setNegativeButton(negativeLabel) { _, _ ->
+                dismissedByNegativeButton = true
+                viewModel.onNegativeButtonClicked(model.tag)
+            }
+        }
+        builder.setOnCancelListener {
+            dismissedByCancelButton = true
+        }
+
+        model.cancelButtonLabel?.let { cancelLabel ->
+            builder.setNeutralButton(cancelLabel) { _, _ ->
+                // no-op - dialog is automatically dismissed
+            }
+        }
+        return builder.create()
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        AndroidSupportInjection.inject(this)
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        if (!dismissedByPositiveButton && !dismissedByNegativeButton && !dismissedByCancelButton) {
+            viewModel.onDismissByOutsideTouch(model.tag)
+        }
+        super.onDismiss(dialog)
+    }
+
+    companion object {
+        private const val STATE_KEY_MODEL = "state_key_model"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialogViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialogViewModel.kt
new file mode 100644
index 000000000000..adc71a90aa7d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/BasicDialogViewModel.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.ui.posts
+
+import android.os.Parcelable
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import kotlinx.android.parcel.Parcelize
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Dismissed
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Negative
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Positive
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+
+class BasicDialogViewModel
+@Inject constructor() : ViewModel() {
+    private val _onInteraction = MutableLiveData<Event<DialogInteraction>>()
+    val onInteraction = _onInteraction as LiveData<Event<DialogInteraction>>
+    fun showDialog(manager: FragmentManager, model: BasicDialogModel) {
+        val dialog = BasicDialog()
+        dialog.initialize(model)
+        dialog.show(manager, model.tag)
+    }
+
+    fun onPositiveClicked(tag: String) {
+        _onInteraction.postValue(Event(Positive(tag)))
+    }
+
+    fun onNegativeButtonClicked(tag: String) {
+        _onInteraction.postValue(Event(Negative(tag)))
+    }
+
+    fun onDismissByOutsideTouch(tag: String) {
+        _onInteraction.postValue(Event(Dismissed(tag)))
+    }
+
+    @Parcelize
+    data class BasicDialogModel(
+        val tag: String,
+        val title: String? = null,
+        val message: String,
+        val positiveButtonLabel: String,
+        val negativeButtonLabel: String? = null,
+        val cancelButtonLabel: String? = null
+    ) : Parcelable
+
+    sealed class DialogInteraction(open val tag: String) {
+        data class Positive(override val tag: String) : DialogInteraction(tag)
+        data class Negative(override val tag: String) : DialogInteraction(tag)
+        data class Dismissed(override val tag: String) : DialogInteraction(tag)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
index 3a7ade10de3e..acd8627952aa 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -18,7 +18,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
 
@@ -37,7 +36,6 @@
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
@@ -125,7 +123,6 @@
 import org.wordpress.android.ui.PrivateAtCookieRefreshProgressDialog.PrivateAtCookieProgressDialogOnDismissListener;
 import org.wordpress.android.ui.RequestCodes;
 import org.wordpress.android.ui.Shortcut;
-import org.wordpress.android.ui.SuggestUsersActivity;
 import org.wordpress.android.ui.gif.GifPickerActivity;
 import org.wordpress.android.ui.history.HistoryListItem.Revision;
 import org.wordpress.android.ui.media.MediaBrowserActivity;
@@ -145,6 +142,7 @@
 import org.wordpress.android.ui.posts.PostEditorAnalyticsSession.Editor;
 import org.wordpress.android.ui.posts.PostEditorAnalyticsSession.Outcome;
 import org.wordpress.android.ui.posts.RemotePreviewLogicHelper.PreviewLogicOperationResult;
+import org.wordpress.android.ui.posts.RemotePreviewLogicHelper.RemotePreviewType;
 import org.wordpress.android.ui.posts.editor.EditorActionsProvider;
 import org.wordpress.android.ui.posts.editor.EditorPhotoPicker;
 import org.wordpress.android.ui.posts.editor.EditorPhotoPickerListener;
@@ -158,6 +156,7 @@
 import org.wordpress.android.ui.posts.editor.StorePostViewModel.UpdateFromEditor;
 import org.wordpress.android.ui.posts.editor.StorePostViewModel.UpdateFromEditor.PostFields;
 import org.wordpress.android.ui.posts.editor.StoriesEventListener;
+import org.wordpress.android.ui.posts.editor.XPostsCapabilityChecker;
 import org.wordpress.android.ui.posts.editor.media.AddExistingMediaSource;
 import org.wordpress.android.ui.posts.editor.media.EditorMedia;
 import org.wordpress.android.ui.posts.editor.media.EditorMediaListener;
@@ -169,10 +168,11 @@
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.prefs.SiteSettingsInterface;
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper;
-import org.wordpress.android.ui.stockmedia.StockMediaPickerActivity;
 import org.wordpress.android.ui.stories.StoryRepositoryWrapper;
 import org.wordpress.android.ui.stories.prefs.StoriesPrefs;
 import org.wordpress.android.ui.stories.usecase.LoadStoryFromStoriesPrefsUseCase;
+import org.wordpress.android.ui.suggestion.SuggestionActivity;
+import org.wordpress.android.ui.suggestion.SuggestionType;
 import org.wordpress.android.ui.uploads.PostEvents;
 import org.wordpress.android.ui.uploads.UploadService;
 import org.wordpress.android.ui.uploads.UploadUtils;
@@ -199,6 +199,7 @@
 import org.wordpress.android.util.ReblogUtils;
 import org.wordpress.android.util.ShortcutUtils;
 import org.wordpress.android.util.SiteUtils;
+import org.wordpress.android.util.StorageUtilsProvider.Source;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ToastUtils.Duration;
@@ -209,15 +210,12 @@
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig;
-import org.wordpress.android.util.config.GutenbergMentionsFeatureConfig;
-import org.wordpress.android.util.config.ModalLayoutPickerFeatureConfig;
-import org.wordpress.android.util.config.TenorFeatureConfig;
-import org.wordpress.android.util.config.WPStoriesFeatureConfig;
+import org.wordpress.android.util.config.ContactInfoBlockFeatureConfig;
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.viewmodel.helpers.ToastMessageHolder;
+import org.wordpress.android.viewmodel.storage.StorageUtilsViewModel;
 import org.wordpress.android.widgets.AppRatingDialog;
 import org.wordpress.android.widgets.WPSnackbar;
 import org.wordpress.android.widgets.WPViewPager;
@@ -271,7 +269,6 @@ public class EditPostActivity extends LocaleAwareActivity implements
     public static final String EXTRA_POST_REMOTE_ID = "postModelRemoteId";
     public static final String EXTRA_IS_PAGE = "isPage";
     public static final String EXTRA_IS_PROMO = "isPromo";
-    public static final String EXTRA_IS_PREVIEW = "isPreviewMode";
     public static final String EXTRA_IS_QUICKPRESS = "isQuickPress";
     public static final String EXTRA_QUICKPRESS_BLOG_ID = "quickPressBlogId";
     public static final String EXTRA_UPLOAD_NOT_STARTED = "savedAsLocalDraft";
@@ -298,13 +295,12 @@ public class EditPostActivity extends LocaleAwareActivity implements
     private static final String STATE_KEY_REVISION = "stateKeyRevision";
     private static final String STATE_KEY_EDITOR_SESSION_DATA = "stateKeyEditorSessionData";
     private static final String STATE_KEY_GUTENBERG_IS_SHOWN = "stateKeyGutenbergIsShown";
-    private static final String TAG_GB_INFORMATIVE_DIALOG = "tag_gb_informative_dialog";
-    private static final String TAG_GB_ROLLOUT_V2_INFORMATIVE_DIALOG = "tag_gb_rollout_v2_informative_dialog";
 
     private static final int PAGE_CONTENT = 0;
     private static final int PAGE_SETTINGS = 1;
     private static final int PAGE_PUBLISH_SETTINGS = 2;
     private static final int PAGE_HISTORY = 3;
+    private static final int EDITOR_ONBOARDING_PHASE_PERCENTAGE = 0;
 
     private AztecImageLoader mAztecImageLoader;
 
@@ -352,10 +348,10 @@ enum RestartEditorOptions {
     private boolean mIsNewPost;
     private boolean mIsPage;
     private boolean mHasSetPostContent;
-    private boolean mIsPreview;
     private PostLoadingState mPostLoadingState = PostLoadingState.NONE;
+    @Nullable private Boolean mIsXPostsCapable = null;
 
-    @Nullable Consumer<String> mOnGetMentionResult;
+    @Nullable Consumer<String> mOnGetSuggestionResult;
 
     // For opening the context menu after permissions have been granted
     private View mMenuView = null;
@@ -400,23 +396,22 @@ enum RestartEditorOptions {
     @Inject ReblogUtils mReblogUtils;
     @Inject AnalyticsTrackerWrapper mAnalyticsTrackerWrapper;
     @Inject PublishPostImmediatelyUseCase mPublishPostImmediatelyUseCase;
-    @Inject TenorFeatureConfig mTenorFeatureConfig;
-    @Inject GutenbergMentionsFeatureConfig mGutenbergMentionsFeatureConfig;
-    @Inject ModalLayoutPickerFeatureConfig mModalLayoutPickerFeatureConfig;
-    @Inject ConsolidatedMediaPickerFeatureConfig mConsolidatedMediaPickerFeatureConfig;
+    @Inject XPostsCapabilityChecker mXpostsCapabilityChecker;
     @Inject CrashLogging mCrashLogging;
     @Inject MediaPickerLauncher mMediaPickerLauncher;
     @Inject StoryRepositoryWrapper mStoryRepositoryWrapper;
     @Inject LoadStoryFromStoriesPrefsUseCase mLoadStoryFromStoriesPrefsUseCase;
     @Inject StoriesPrefs mStoriesPrefs;
     @Inject StoriesEventListener mStoriesEventListener;
-    @Inject WPStoriesFeatureConfig mWPStoriesFeatureConfig;
+    @Inject ContactInfoBlockFeatureConfig mContactInfoBlockFeatureConfig;
 
     private StorePostViewModel mViewModel;
+    private StorageUtilsViewModel mStorageUtilsViewModel;
 
     private SiteModel mSite;
     private SiteSettingsInterface mSiteSettings;
     private boolean mIsJetpackSsoEnabled;
+    private boolean mStoryEditingCancelled = false;
 
     private boolean mNetworkErrorOnLastMediaFetchAttempt = false;
 
@@ -450,13 +445,37 @@ private void newPostSetup() {
         mShortcutUtils.reportShortcutUsed(Shortcut.CREATE_NEW_POST);
     }
 
+    private void newPageFromLayoutPickerSetup(String title, String content) {
+        mIsNewPost = true;
+
+        if (mSite == null) {
+            showErrorAndFinish(R.string.blog_not_found);
+            return;
+        }
+        if (!mSite.isVisible()) {
+            showErrorAndFinish(R.string.error_blog_hidden);
+            return;
+        }
+
+        // Create a new post
+        mEditPostRepository.set(() -> {
+            PostModel post = mPostStore.instantiatePostModel(mSite, mIsPage, title, content, null,
+                    null, null, false);
+            post.setStatus(PostStatus.DRAFT.toString());
+            return post;
+        });
+        mEditPostRepository.savePostSnapshot();
+        EventBus.getDefault().postSticky(
+                new PostEvents.PostOpenedInEditor(mEditPostRepository.getLocalSiteId(), mEditPostRepository.getId()));
+        mShortcutUtils.reportShortcutUsed(Shortcut.CREATE_NEW_POST);
+    }
+
     private void createPostEditorAnalyticsSessionTracker(boolean showGutenbergEditor, PostImmutableModel post,
                                                          SiteModel site, boolean isNewPost) {
         if (mPostEditorAnalyticsSession == null) {
             mPostEditorAnalyticsSession = new PostEditorAnalyticsSession(
                     showGutenbergEditor ? Editor.GUTENBERG : Editor.CLASSIC,
                     post, site, isNewPost);
-            mPostEditorAnalyticsSession.setPreview(mIsPreview);
         }
     }
 
@@ -465,8 +484,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getApplication()).component().inject(this);
         mDispatcher.register(this);
-        mViewModel =
-                ViewModelProviders.of(this, mViewModelFactory).get(StorePostViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(StorePostViewModel.class);
+        mStorageUtilsViewModel = new ViewModelProvider(this, mViewModelFactory).get(StorageUtilsViewModel.class);
         setContentView(R.layout.new_edit_post_activity);
 
         if (savedInstanceState == null) {
@@ -475,8 +494,6 @@ protected void onCreate(Bundle savedInstanceState) {
             mSite = (SiteModel) savedInstanceState.getSerializable(WordPress.SITE);
         }
 
-        mIsPreview = getIntent().getExtras().getBoolean(EXTRA_IS_PREVIEW);
-
         // FIXME: Make sure to use the latest fresh info about the site we've in the DB
         // set only the editor setting for now.
         if (mSite != null) {
@@ -530,7 +547,12 @@ protected void onCreate(Bundle savedInstanceState) {
                 }
 
                 mIsPage = extras.getBoolean(EXTRA_IS_PAGE);
-                newPostSetup();
+                if (mIsPage && !TextUtils.isEmpty(extras.getString(EXTRA_PAGE_TITLE))) {
+                    newPageFromLayoutPickerSetup(extras.getString(EXTRA_PAGE_TITLE),
+                            extras.getString(EXTRA_PAGE_CONTENT));
+                } else {
+                    newPostSetup();
+                }
             } else {
                 mEditPostRepository.loadPostByLocalPostId(extras.getInt(EXTRA_POST_LOCAL_ID));
                 // Load post from extra)s
@@ -641,7 +663,7 @@ protected void onCreate(Bundle savedInstanceState) {
         logTemplateSelection();
 
         // Bump post created analytics only once, first time the editor is opened
-        if (mIsNewPost && savedInstanceState == null && !isRestarting && !mIsPreview) {
+        if (mIsNewPost && savedInstanceState == null && !isRestarting) {
             AnalyticsUtils.trackEditorCreatedPost(
                     action,
                     getIntent(),
@@ -680,15 +702,15 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setupPrepublishingBottomSheetRunnable();
 
-        mStoriesEventListener.start(this.getLifecycle(), mSite, mEditPostRepository);
-        setupPreviewUI();
+        mStoriesEventListener.start(this.getLifecycle(), mSite, mEditPostRepository, this);
+
+        // The check on savedInstanceState should allow to show the dialog only on first start
+        // (even in cases when the VM could be re-created like when activity is destroyed in the background)
+        mStorageUtilsViewModel.start(savedInstanceState == null);
     }
 
     private void presentNewPageNoticeIfNeeded() {
-        if (mIsPreview
-            || !mIsPage
-            || !mIsNewPost
-            || !mModalLayoutPickerFeatureConfig.isEnabled()) {
+        if (!mIsPage || !mIsNewPost) {
             return;
         }
         String message = mEditPostRepository.getContent().isEmpty() ? getString(R.string.mlp_notice_blank_page_created)
@@ -696,29 +718,6 @@ private void presentNewPageNoticeIfNeeded() {
         mEditorFragment.showNotice(message);
     }
 
-    private void setupPreviewUI() {
-        if (!mIsPreview) {
-            return;
-        }
-        setTitle(R.string.mlp_preview_title);
-        // Set bottom editor margin
-        View container = findViewById(R.id.pager);
-        container.setPaddingRelative(container.getPaddingStart(), container.getPaddingTop(), container.getPaddingEnd(),
-                getResources().getDimensionPixelSize(R.dimen.mlp_preview_toolbar_offset));
-        // Set button visibility
-        findViewById(R.id.createPageButtonContainer).setVisibility(View.VISIBLE);
-        // Prevent keyboard from showing
-        getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-        // Set button action
-        findViewById(R.id.createPageButton).setOnClickListener(view -> {
-            mDispatcher.dispatch(PostActionBuilder.newRemovePostAction(mEditPostRepository.getEditablePost()));
-            mPostEditorAnalyticsSession.setOutcome(Outcome.CANCEL);
-            mViewModel.finish(ActivityFinishState.CANCELLED);
-            setResult(RESULT_OK, getIntent());
-            finish();
-        });
-    }
-
     private void fetchSiteSettings() {
         mSiteSettings.init(true);
     }
@@ -760,8 +759,9 @@ public void onSettingsUpdated() {
         if (mIsJetpackSsoEnabled != isJetpackSsoEnabled) {
             mIsJetpackSsoEnabled = isJetpackSsoEnabled;
             if (mEditorFragment instanceof GutenbergEditorFragment) {
-                ((GutenbergEditorFragment) mEditorFragment)
-                        .updateCapabilities(mIsJetpackSsoEnabled, getGutenbergPropsBuilder());
+                GutenbergEditorFragment gutenbergFragment = (GutenbergEditorFragment) mEditorFragment;
+                gutenbergFragment.setJetpackSsoEnabled(mIsJetpackSsoEnabled);
+                gutenbergFragment.updateCapabilities(getGutenbergPropsBuilder());
             }
         }
     }
@@ -860,11 +860,15 @@ private void startObserving() {
             return null;
         }));
         mEditPostRepository.getPostChanged().observe(this, postEvent -> postEvent.applyIfNotHandled(post -> {
-            if (!mIsPreview) {
-                mViewModel.savePostToDb(mEditPostRepository, mSite);
-            }
+            mViewModel.savePostToDb(mEditPostRepository, mSite);
             return null;
         }));
+        mStorageUtilsViewModel.getCheckStorageWarning().observe(this, event ->
+                event.applyIfNotHandled(unit -> {
+                    mStorageUtilsViewModel.onStorageWarningCheck(getSupportFragmentManager(), Source.EDITOR);
+                    return null;
+                })
+        );
     }
 
     private void initializePostObject() {
@@ -914,9 +918,7 @@ protected void onResume() {
         reattachUploadingMediaForAztec();
 
         // Bump editor opened event every time the activity is resumed, to match the EDITOR_CLOSED event onPause
-        if (!mIsPreview) {
-            PostUtils.trackOpenEditorAnalytics(mEditPostRepository.getPost(), mSite);
-        }
+        PostUtils.trackOpenEditorAnalytics(mEditPostRepository.getPost(), mSite);
         mIsConfigChange = false;
     }
 
@@ -935,9 +937,7 @@ protected void onPause() {
         super.onPause();
 
         EventBus.getDefault().unregister(this);
-        if (!mIsPreview) {
-            AnalyticsTracker.track(AnalyticsTracker.Stat.EDITOR_CLOSED);
-        }
+        AnalyticsTracker.track(AnalyticsTracker.Stat.EDITOR_CLOSED);
     }
 
     @Override protected void onStop() {
@@ -950,6 +950,10 @@ protected void onPause() {
         if (mShowPrepublishingBottomSheetHandler != null && mShowPrepublishingBottomSheetRunnable != null) {
             mShowPrepublishingBottomSheetHandler.removeCallbacks(mShowPrepublishingBottomSheetRunnable);
         }
+
+        if (mShowGutenbergEditor) {
+            AppPrefs.setHasLaunchedGutenbergEditor(true);
+        }
     }
 
     @Override
@@ -1176,9 +1180,6 @@ public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allo
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (mIsPreview) {
-            return false;
-        }
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.edit_post, menu);
@@ -1187,9 +1188,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
-        if (mIsPreview) {
-            return false;
-        }
         boolean showMenuItems = true;
         if (mViewPager != null && mViewPager.getCurrentItem() > PAGE_CONTENT) {
             showMenuItems = false;
@@ -1236,25 +1234,15 @@ public boolean onPrepareOptionsMenu(Menu menu) {
             }
         }
 
-        MenuItem switchToAztecMenuItem = menu.findItem(R.id.menu_switch_to_aztec);
         MenuItem switchToGutenbergMenuItem = menu.findItem(R.id.menu_switch_to_gutenberg);
 
         // The following null checks should basically be redundant but were added to manage
         // an odd behaviour recorded with Android 8.0.0
         // (see https://github.com/wordpress-mobile/WordPress-Android/issues/9748 for more information)
-        if (switchToAztecMenuItem != null && switchToGutenbergMenuItem != null) {
-            if (mShowGutenbergEditor) {
-                // we're showing Gutenberg so, just offer the Aztec switch
-                switchToAztecMenuItem.setVisible(true);
-                switchToGutenbergMenuItem.setVisible(false);
-            } else {
-                // we're showing Aztec so, hide the "Switch to Aztec" menu
-                switchToAztecMenuItem.setVisible(false);
-
-                switchToGutenbergMenuItem.setVisible(
-                        shouldSwitchToGutenbergBeVisible(mEditorFragment, mSite)
-                );
-            }
+        if (switchToGutenbergMenuItem != null) {
+            boolean switchToGutenbergVisibility = mShowGutenbergEditor ? false
+                    : shouldSwitchToGutenbergBeVisible(mEditorFragment, mSite);
+            switchToGutenbergMenuItem.setVisible(switchToGutenbergVisibility);
         }
 
         MenuItem contentInfo = menu.findItem(R.id.menu_content_info);
@@ -1323,12 +1311,30 @@ private boolean handleBackPressed() {
         } else if (mEditorPhotoPicker.isPhotoPickerShowing()) {
             mEditorPhotoPicker.hidePhotoPicker();
         } else {
-            savePostAndOptionallyFinish(true, false);
+            performWhenNoStoriesBeingSaved(new DoWhenNoStoriesBeingSavedCallback() {
+                @Override public void doWhenNoStoriesBeingSaved() {
+                    savePostAndOptionallyFinish(true, false);
+                }
+            });
         }
 
         return true;
     }
 
+    interface DoWhenNoStoriesBeingSavedCallback {
+        void doWhenNoStoriesBeingSaved();
+    }
+
+    private void performWhenNoStoriesBeingSaved(DoWhenNoStoriesBeingSavedCallback callback) {
+        if (mStoriesEventListener.getStoriesSavingInProgress().isEmpty()) {
+            callback.doWhenNoStoriesBeingSaved();
+        } else {
+            // Oops! A story is still being saved, let's wait
+            ToastUtils.showToast(EditPostActivity.this,
+                    getString(R.string.toast_edit_story_update_in_progress_title));
+        }
+    }
+
     private RemotePreviewLogicHelper.RemotePreviewHelperFunctions getEditPostActivityStrategyFunctions() {
         return new RemotePreviewLogicHelper.RemotePreviewHelperFunctions() {
             @Override
@@ -1423,19 +1429,6 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                 } else if (mEditorFragment instanceof GutenbergEditorFragment) {
                     ((GutenbergEditorFragment) mEditorFragment).onToggleHtmlMode();
                 }
-            } else if (itemId == R.id.menu_switch_to_aztec) {
-                // The following boolean check should be always redundant but was added to manage
-                // an odd behaviour recorded with Android 8.0.0
-                // (see https://github.com/wordpress-mobile/WordPress-Android/issues/9748 for more information)
-                if (mShowGutenbergEditor) {
-                    // let's finish this editing instance and start again, but not letting Gutenberg be used
-                    mRestartEditorOption = RestartEditorOptions.RESTART_SUPPRESS_GUTENBERG;
-                    mPostEditorAnalyticsSession.switchEditor(Editor.CLASSIC);
-                    mPostEditorAnalyticsSession.setOutcome(Outcome.SAVE);
-                    mViewModel.finish(ActivityFinishState.SAVED_LOCALLY);
-                } else {
-                    logWrongMenuState("Wrong state in menu_switch_to_aztec: menu should not be visible.");
-                }
             } else if (itemId == R.id.menu_switch_to_gutenberg) {
                 // The following boolean check should be always redundant but was added to manage
                 // an odd behaviour recorded with Android 8.0.0
@@ -1500,7 +1493,7 @@ private boolean performSecondaryAction() {
             case PUBLISH_NOW:
                 mAnalyticsTrackerWrapper.track(Stat.EDITOR_POST_PUBLISH_TAPPED);
                 mPublishPostImmediatelyUseCase.updatePostToPublishImmediately(mEditPostRepository, mIsNewPost);
-                showPrepublishingNudgeBottomSheet();
+                checkNoStorySaveOperationInProgressAndShowPrepublishingNudgeBottomSheet();
                 return true;
             case NONE:
                 throw new IllegalStateException("Switch in `secondaryAction` shouldn't go through the NONE case");
@@ -1612,12 +1605,12 @@ private void performPrimaryAction() {
         switch (getPrimaryAction()) {
             case PUBLISH_NOW:
                 mAnalyticsTrackerWrapper.track(Stat.EDITOR_POST_PUBLISH_TAPPED);
-                showPrepublishingNudgeBottomSheet();
+                checkNoStorySaveOperationInProgressAndShowPrepublishingNudgeBottomSheet();
                 return;
             case UPDATE:
             case SCHEDULE:
             case SUBMIT_FOR_REVIEW:
-                showPrepublishingNudgeBottomSheet();
+                checkNoStorySaveOperationInProgressAndShowPrepublishingNudgeBottomSheet();
                 return;
             case SAVE:
                 uploadPost(false);
@@ -1626,27 +1619,18 @@ private void performPrimaryAction() {
     }
 
     private void showGutenbergInformativeDialog() {
-        // Show the GB informative dialog on editing GB posts
-        final PromoDialog gbInformativeDialog = new PromoDialog();
-        gbInformativeDialog.initialize(TAG_GB_INFORMATIVE_DIALOG,
-                getString(R.string.dialog_gutenberg_informative_title),
-                mEditPostRepository.isPage() ? getString(R.string.dialog_gutenberg_informative_description_page)
-                        : getString(R.string.dialog_gutenberg_informative_description_post),
-                getString(org.wordpress.android.editor.R.string.dialog_button_ok));
-
-        gbInformativeDialog.show(getSupportFragmentManager(), TAG_GB_INFORMATIVE_DIALOG);
+        // We are no longer showing the dialog, but we are leaving all the surrounding logic because
+        // this is going in shortly before release, and we're going to remove all this logic in the
+        // very near future.
+
         AppPrefs.setGutenbergInfoPopupDisplayed(mSite.getUrl(), true);
     }
 
     private void showGutenbergRolloutV2InformativeDialog() {
-        // Show the GB informative dialog on editing GB posts
-        final PromoDialog gbInformativeDialog = new PromoDialog();
-        gbInformativeDialog.initialize(TAG_GB_ROLLOUT_V2_INFORMATIVE_DIALOG,
-                getString(R.string.dialog_gutenberg_informative_title),
-                getString(R.string.dialog_gutenberg_informative_description_v2),
-                getString(org.wordpress.android.editor.R.string.dialog_button_ok));
-
-        gbInformativeDialog.show(getSupportFragmentManager(), TAG_GB_ROLLOUT_V2_INFORMATIVE_DIALOG);
+        // We are no longer showing the dialog, but we are leaving all the surrounding logic because
+        // this is going in shortly before release, and we're going to remove all this logic in the
+        // very near future.
+
         AppPrefs.setGutenbergInfoPopupDisplayed(mSite.getUrl(), true);
     }
 
@@ -1683,17 +1667,9 @@ private void onUploadSuccess(MediaModel media) {
                         FluxCUtils.mediaFileFromMediaModel(media));
                 if (PostUtils.contentContainsWPStoryGutenbergBlocks(mEditPostRepository.getContent())) {
                     // make sure to sync the local post object with the UI and save
-                    updateAndSavePostAsync();
-                    // if this is a Story media item, then make sure to keep up with the StoriesPrefs serialized slides
-                    // this looks for the slide saved with the local id key (media.getId()), and re-converts it to
-                    // mediaId.
-                    // Also: we don't need to worry about checking if this mediaModel corresponds to a media upload
-                    // within a story block in this post: we will only replace items for which a local-keyed frame has
-                    // been created before, which can only happen when using the Story Creator.
-                    mStoriesPrefs.replaceLocalMediaIdKeyedSlideWithRemoteMediaIdKeyedSlide(
-                            media.getId(),
-                            media.getMediaId(),
-                            mSite.getId()
+                    // then post the event for StoriesEventListener to process
+                    updateAndSavePostAsync(
+                            updatePostResult -> mStoriesEventListener.postStoryMediaUploadedEvent(media)
                     );
                 }
             } else if (media.getMarkedLocallyAsFeatured() && media.getLocalPostId() == mEditPostRepository
@@ -1772,7 +1748,7 @@ private void updateAndSavePostAsyncOnEditorExit(@NonNull final OnPostUpdatedFrom
         // Store this before calling updateAndSavePostAsync because its value can change before the callback returns
         boolean isAutosavePending = mViewModel.isAutosavePending();
 
-        mViewModel.showSaveProgressDialog();
+        mViewModel.showSavingProgressDialog();
         updateAndSavePostAsync((result) -> {
             listener.onPostUpdatedFromUI(result);
 
@@ -1992,14 +1968,13 @@ private void saveResult(boolean saved, boolean uploadNotStarted) {
         i.putExtra(EXTRA_UPLOAD_NOT_STARTED, uploadNotStarted);
         i.putExtra(EXTRA_HAS_FAILED_MEDIA, hasFailedMedia());
         i.putExtra(EXTRA_IS_PAGE, mIsPage);
-        i.putExtra(EXTRA_IS_PREVIEW, mIsPreview);
         i.putExtra(EXTRA_HAS_CHANGES, saved);
         i.putExtra(EXTRA_POST_LOCAL_ID, mEditPostRepository.getId());
         i.putExtra(EXTRA_POST_REMOTE_ID, mEditPostRepository.getRemotePostId());
         i.putExtra(EXTRA_RESTART_EDITOR, mRestartEditorOption.name());
         i.putExtra(STATE_KEY_EDITOR_SESSION_DATA, mPostEditorAnalyticsSession);
         i.putExtra(EXTRA_IS_NEW_POST, mIsNewPost);
-        setResult(mIsPreview ? RESULT_CANCELED : RESULT_OK, i);
+        setResult(RESULT_OK, i);
     }
 
     private void setupPrepublishingBottomSheetRunnable() {
@@ -2015,6 +1990,14 @@ private void setupPrepublishingBottomSheetRunnable() {
         };
     }
 
+    private void checkNoStorySaveOperationInProgressAndShowPrepublishingNudgeBottomSheet() {
+        performWhenNoStoriesBeingSaved(new DoWhenNoStoriesBeingSavedCallback() {
+            @Override public void doWhenNoStoriesBeingSaved() {
+                showPrepublishingNudgeBottomSheet();
+            }
+        });
+    }
+
     private void showPrepublishingNudgeBottomSheet() {
         mViewPager.setCurrentItem(PAGE_CONTENT);
         ActivityUtils.hideKeyboard(this);
@@ -2035,6 +2018,7 @@ private void uploadPost(final boolean publishPost) {
             AccountModel account = mAccountStore.getAccount();
             // prompt user to verify e-mail before publishing
             if (!account.getEmailVerified()) {
+                mViewModel.hideSavingProgressDialog();
                 String message = TextUtils.isEmpty(account.getEmail())
                         ? getString(R.string.editor_confirm_email_prompt_message)
                         : String.format(getString(R.string.editor_confirm_email_prompt_message_with_email),
@@ -2056,6 +2040,7 @@ private void uploadPost(final boolean publishPost) {
                 return;
             }
             if (!mPostUtils.isPublishable(mEditPostRepository.getPost())) {
+                mViewModel.hideSavingProgressDialog();
                 // TODO we don't want to show "publish" message when the user clicked on eg. save
                 mEditPostRepository.updateStatusFromPostSnapshotWhenEditorOpened();
                 EditPostActivity.this.runOnUiThread(() -> {
@@ -2066,7 +2051,7 @@ private void uploadPost(final boolean publishPost) {
                 return;
             }
 
-            mViewModel.showSaveProgressDialog();
+            mViewModel.showSavingProgressDialog();
 
             boolean isFirstTimePublish = isFirstTimePublish(publishPost);
             mEditPostRepository.updateAsync(postModel -> {
@@ -2110,15 +2095,6 @@ private void savePostAndOptionallyFinish(final boolean doFinish, final boolean f
             return;
         }
 
-        if (mIsPreview) {
-            if (doFinish) {
-                mDispatcher.dispatch(PostActionBuilder.newRemovePostAction(mEditPostRepository.getEditablePost()));
-                mPostEditorAnalyticsSession.setOutcome(Outcome.CANCEL);
-                mViewModel.finish(ActivityFinishState.CANCELLED);
-            }
-            return;
-        }
-
         updateAndSavePostAsyncOnEditorExit(((updatePostResult) -> {
             // check if the opened post had some unsaved local changes
             boolean isFirstTimePublish = isFirstTimePublish(false);
@@ -2207,6 +2183,8 @@ public Fragment getItem(int position) {
                         // Enable gutenberg on the site & show the informative popup upon opening
                         // the GB editor the first time when the remote setting value is still null
                         setGutenbergEnabledIfNeeded();
+                        mXpostsCapabilityChecker.retrieveCapability(mSite,
+                                EditPostActivity.this::onXpostsSettingsCapability);
 
                         boolean isWpCom = getSite().isWPCom() || mSite.isPrivateWPComAtomic() || mSite.isWPComAtomic();
                         GutenbergPropsBuilder gutenbergPropsBuilder = getGutenbergPropsBuilder();
@@ -2231,7 +2209,6 @@ public Fragment getItem(int position) {
                                 "",
                                 mIsNewPost,
                                 gutenbergWebViewAuthorizationData,
-                                mTenorFeatureConfig.isEnabled(),
                                 gutenbergPropsBuilder,
                                 RequestCodes.EDIT_STORY
                         );
@@ -2288,13 +2265,21 @@ public int getCount() {
         }
     }
 
+    private void onXpostsSettingsCapability(boolean isXpostsCapable) {
+        mIsXPostsCapable = isXpostsCapable;
+        if (mEditorFragment instanceof GutenbergEditorFragment) {
+            ((GutenbergEditorFragment) mEditorFragment).updateCapabilities(getGutenbergPropsBuilder());
+        }
+    }
+
     private GutenbergPropsBuilder getGutenbergPropsBuilder() {
         String postType = mIsPage ? "page" : "post";
+        int featuredImageId = (int) mEditPostRepository.getFeaturedImageId();
         String languageString = LocaleManager.getLanguage(EditPostActivity.this);
         String wpcomLocaleSlug = languageString.replace("_", "-").toLowerCase(Locale.ENGLISH);
 
-        boolean isSiteUsingWpComRestApi = mSite.isUsingWpComRestApi();
-        boolean enableMentions = isSiteUsingWpComRestApi && mGutenbergMentionsFeatureConfig.isEnabled();
+        // If this.mIsXPostsCapable has not been set, default to allowing xPosts
+        boolean enableXPosts = mIsXPostsCapable == null || mIsXPostsCapable;
 
         EditorTheme editorTheme = mEditorThemeStore.getEditorThemeForSite(mSite);
         Bundle themeBundle = (editorTheme != null) ? editorTheme.getThemeSupport().toBundle() : null;
@@ -2304,16 +2289,25 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() {
 
         boolean unsupportedBlockEditorSwitch = !mIsJetpackSsoEnabled && "gutenberg".equals(mSite.getWebEditor());
 
+        boolean isFreeWPCom = mSite.isWPCom() && SiteUtils.onFreePlan(mSite);
+
+        boolean canViewEditorOnboarding = (
+                mAccountStore.getAccount().getUserId() % 100 >= (100 - EDITOR_ONBOARDING_PHASE_PERCENTAGE)
+                || BuildConfig.DEBUG) && !AppPrefs.hasLaunchedGutenbergEditor();
+
         return new GutenbergPropsBuilder(
-                mWPStoriesFeatureConfig.isEnabled(),
-                enableMentions,
+                mContactInfoBlockFeatureConfig.isEnabled() && SiteUtils.supportsContactInfoFeature(mSite),
+                SiteUtils.supportsStoriesFeature(mSite),
+                mSite.isUsingWpComRestApi(),
+                enableXPosts,
                 isUnsupportedBlockEditorEnabled,
                 unsupportedBlockEditorSwitch,
-                mIsPreview,
-                mModalLayoutPickerFeatureConfig.isEnabled(),
+                !isFreeWPCom, // Disable audio block until it's usable on free sites via "Insert from URL" capability
                 wpcomLocaleSlug,
                 postType,
-                themeBundle
+                featuredImageId,
+                themeBundle,
+                canViewEditorOnboarding
         );
     }
 
@@ -2490,6 +2484,9 @@ protected void setPostContentFromShareAction() {
     private void setFeaturedImageId(final long mediaId, final boolean imagePicked) {
         if (mEditPostSettingsFragment != null) {
             mEditPostSettingsFragment.updateFeaturedImage(mediaId, imagePicked);
+            if (mEditorFragment instanceof GutenbergEditorFragment) {
+                ((GutenbergEditorFragment) mEditorFragment).sendToJSFeaturedImageId((int) mediaId);
+            }
         }
     }
 
@@ -2569,6 +2566,9 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 case RequestCodes.STOCK_MEDIA_PICKER_SINGLE_SELECT_FOR_GUTENBERG_BLOCK:
                     mEditorFragment.mediaSelectionCancelled();
                     return;
+                case RequestCodes.EDIT_STORY:
+                    mStoryEditingCancelled = true;
+                    return;
                 default:
                     // noop
                     return;
@@ -2576,6 +2576,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
         }
 
         if (requestCode == RequestCodes.EDIT_STORY) {
+            mStoryEditingCancelled = false;
             if (mEditorFragment instanceof GutenbergEditorFragment) {
                 mEditorFragment.onActivityResult(requestCode, resultCode, data);
                 return;
@@ -2598,32 +2599,30 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         long mediaId = data.getLongExtra(MediaPickerConstants.EXTRA_MEDIA_ID, 0);
                         setFeaturedImageId(mediaId, true);
                     } else if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_QUEUED_URIS)) {
-                        if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
-                            List<Uri> uris = convertStringArrayIntoUrisList(
-                                    data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_QUEUED_URIS));
-                            int postId = getImmutablePost().getId();
-                            mFeaturedImageHelper.trackFeaturedImageEvent(
-                                    FeaturedImageHelper.TrackableEvent.IMAGE_PICKED,
-                                    postId
-                            );
-                            for (Uri mediaUri : uris) {
-                                String mimeType = getContentResolver().getType(mediaUri);
-                                EnqueueFeaturedImageResult queueImageResult = mFeaturedImageHelper
-                                        .queueFeaturedImageForUpload(
-                                                postId, getSite(), mediaUri,
-                                                mimeType
-                                        );
-                                if (queueImageResult == EnqueueFeaturedImageResult.FILE_NOT_FOUND) {
-                                    Toast.makeText(
-                                            this,
-                                            R.string.file_not_found, Toast.LENGTH_SHORT
-                                    ).show();
-                                } else if (queueImageResult == EnqueueFeaturedImageResult.INVALID_POST_ID) {
-                                    Toast.makeText(
-                                            this,
-                                            R.string.error_generic, Toast.LENGTH_SHORT
-                                    ).show();
-                                }
+                        List<Uri> uris = convertStringArrayIntoUrisList(
+                                data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_QUEUED_URIS));
+                        int postId = getImmutablePost().getId();
+                        mFeaturedImageHelper.trackFeaturedImageEvent(
+                                FeaturedImageHelper.TrackableEvent.IMAGE_PICKED,
+                                postId
+                        );
+                        for (Uri mediaUri : uris) {
+                            String mimeType = getContentResolver().getType(mediaUri);
+                            EnqueueFeaturedImageResult queueImageResult = mFeaturedImageHelper
+                                    .queueFeaturedImageForUpload(
+                                            postId, getSite(), mediaUri,
+                                            mimeType
+                                    );
+                            if (queueImageResult == EnqueueFeaturedImageResult.FILE_NOT_FOUND) {
+                                Toast.makeText(
+                                        this,
+                                        R.string.file_not_found, Toast.LENGTH_SHORT
+                                ).show();
+                            } else if (queueImageResult == EnqueueFeaturedImageResult.INVALID_POST_ID) {
+                                Toast.makeText(
+                                        this,
+                                        R.string.error_generic, Toast.LENGTH_SHORT
+                                ).show();
                             }
                         }
                         if (mEditPostSettingsFragment != null) {
@@ -2677,10 +2676,7 @@ postId, getSite(), mediaUri,
                     }
                     break;
                 case RequestCodes.STOCK_MEDIA_PICKER_MULTI_SELECT:
-                    String key = StockMediaPickerActivity.KEY_UPLOADED_MEDIA_IDS;
-                    if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
-                        key = MediaBrowserActivity.RESULT_IDS;
-                    }
+                    String key = MediaBrowserActivity.RESULT_IDS;
                     if (data.hasExtra(key)) {
                         long[] mediaIds = data.getLongArrayExtra(key);
                         mEditorMedia
@@ -2711,11 +2707,22 @@ postId, getSite(), mediaUri,
                     }
                     break;
                 case RequestCodes.SELECTED_USER_MENTION:
-                    if (mOnGetMentionResult != null) {
-                        String selectedMention = data.getStringExtra(SuggestUsersActivity.SELECTED_USER_ID);
-                        mOnGetMentionResult.accept(selectedMention);
+                    if (mOnGetSuggestionResult != null) {
+                        String selectedMention = data.getStringExtra(SuggestionActivity.SELECTED_VALUE);
+                        mOnGetSuggestionResult.accept(selectedMention);
                         // Clear the callback once we have gotten a result
-                        mOnGetMentionResult = null;
+                        mOnGetSuggestionResult = null;
+                    }
+                    break;
+                case RequestCodes.FILE_LIBRARY:
+                case RequestCodes.AUDIO_LIBRARY:
+                    if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)) {
+                        List<Uri> uriResults = convertStringArrayIntoUrisList(
+                                Objects.requireNonNull(
+                                        data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)));
+                        for (Uri uri : uriResults) {
+                            mEditorMedia.addNewMediaToEditorAsync(uri, false);
+                        }
                     }
                     break;
             }
@@ -2757,14 +2764,10 @@ private void handleMediaPickerResult(Intent data) {
         // TODO move this to EditorMedia
         ArrayList<Long> ids = ListUtils.fromLongArray(data.getLongArrayExtra(MediaBrowserActivity.RESULT_IDS));
         if (ids == null || ids.size() == 0) {
-            if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
-                if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_ID)) {
-                    long mediaId = data.getLongExtra(MediaPickerConstants.EXTRA_MEDIA_ID, 0);
-                    ids = new ArrayList<>();
-                    ids.add(mediaId);
-                } else {
-                    return;
-                }
+            if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_ID)) {
+                long mediaId = data.getLongExtra(MediaPickerConstants.EXTRA_MEDIA_ID, 0);
+                ids = new ArrayList<>();
+                ids.add(mediaId);
             } else {
                 return;
             }
@@ -2882,6 +2885,12 @@ public void onEditPostPublishedSettingsClick() {
      * EditorFragmentListener methods
      */
 
+    @Override public void clearFeaturedImage() {
+        if (mEditorFragment instanceof GutenbergEditorFragment) {
+            ((GutenbergEditorFragment) mEditorFragment).sendToJSFeaturedImageId(0);
+        }
+    }
+
     @Override
     public void onAddMediaClicked() {
         if (mEditorPhotoPicker.isPhotoPickerShowing()) {
@@ -2917,6 +2926,17 @@ public void onAddLibraryMediaClicked(boolean allowMultipleSelection) {
         }
     }
 
+    @Override public void onAddLibraryFileClicked(boolean allowMultipleSelection) {
+        mEditorPhotoPicker.setAllowMultipleSelection(allowMultipleSelection);
+        mMediaPickerLauncher
+                .viewWPMediaLibraryPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_SINGLE_FILE_PICKER);
+    }
+
+    @Override public void onAddLibraryAudioFileClicked(boolean allowMultipleSelection) {
+        mMediaPickerLauncher
+                .viewWPMediaLibraryPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_SINGLE_AUDIO_FILE_PICKER);
+    }
+
     @Override
     public void onAddPhotoClicked(boolean allowMultipleSelection) {
         if (allowMultipleSelection) {
@@ -2966,9 +2986,22 @@ public void onAddGifClicked(boolean allowMultipleSelection) {
     }
 
     @Override
-    public void onPerformFetch(String path, Consumer<String> onResult, Consumer<Bundle> onError) {
+    public void onAddFileClicked(boolean allowMultipleSelection) {
+        mMediaPickerLauncher.showFilePicker(this, allowMultipleSelection, getSite());
+    }
+
+    @Override public void onAddAudioFileClicked(boolean allowMultipleSelection) {
+        mMediaPickerLauncher.showAudioFilePicker(this, allowMultipleSelection, getSite());
+    }
+
+    @Override public void onPerformFetch(
+            String path,
+            boolean enableCaching,
+            Consumer<String> onResult,
+            Consumer<Bundle> onError
+    ) {
         if (mSite != null) {
-            mReactNativeRequestHandler.performGetRequest(path, mSite, onResult, onError);
+            mReactNativeRequestHandler.performGetRequest(path, mSite, enableCaching, onResult, onError);
         }
     }
 
@@ -3189,13 +3222,35 @@ private void onEditorFinalTouchesBeforeShowing() {
     }
 
     @Override
-    public void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocksList) {
+    public void onEditorFragmentContentReady(
+            ArrayList<Object> unsupportedBlocksList,
+            boolean replaceBlockActionWaiting
+    ) {
         // Note that this method is also used to track startup performance
         // It assumes this is being called when the editor has finished loading
         // If you need to refactor this, please ensure that the startup_time_ms property
         // is still reflecting the actual startup time of the editor
         mPostEditorAnalyticsSession.start(unsupportedBlocksList);
         presentNewPageNoticeIfNeeded();
+
+        // don't start listening for Story events just now if we're waiting for a block to be replaced,
+        // unless the user cancelled editing in which case we should continue as normal and attach the listener
+        if (!replaceBlockActionWaiting || mStoryEditingCancelled) {
+            mStoriesEventListener.startListening();
+        }
+    }
+
+    @Override
+    public void onReplaceStoryEditedBlockActionSent() {
+        // when a replaceBlock signal has been sent, it uses the DeferredEventEmitter so we have to wait for
+        // the block replacement to be completed before we can start throwing block-related events at it
+        // otherwise these events will miss their target
+        mStoriesEventListener.pauseListening();
+    }
+
+    @Override
+    public void onReplaceStoryEditedBlockActionReceived() {
+        mStoriesEventListener.startListening();
     }
 
     private void logTemplateSelection() {
@@ -3203,32 +3258,28 @@ private void logTemplateSelection() {
         if (template == null) {
             return;
         }
-        if (mIsPreview) {
-            mPostEditorAnalyticsSession.previewTemplate(template);
-        } else {
-            mPostEditorAnalyticsSession.applyTemplate(template);
-        }
+        mPostEditorAnalyticsSession.applyTemplate(template);
     }
 
-    @Override public void onGutenbergEditorSessionTemplateApplyTracked(String template) {
-        mPostEditorAnalyticsSession.applyTemplate(template);
+    @Override public void showUserSuggestions(Consumer<String> onResult) {
+        showSuggestions(SuggestionType.Users, onResult);
     }
 
-    @Override public void onGutenbergEditorSessionTemplatePreviewTracked(String template) {
-        mPostEditorAnalyticsSession.previewTemplate(template);
+    @Override public void showXpostSuggestions(Consumer<String> onResult) {
+        showSuggestions(SuggestionType.XPosts, onResult);
     }
 
-    @Override public void getMention(Consumer<String> onResult) {
-        mOnGetMentionResult = onResult;
-        ActivityLauncher.viewSuggestUsersForResult(this, mSite);
+    private void showSuggestions(SuggestionType type, Consumer<String> onResult) {
+        mOnGetSuggestionResult = onResult;
+        ActivityLauncher.viewSuggestionsForResult(this, mSite, type);
     }
 
-    @Override public void onGutenbergEditorSetStarterPageTemplatesTooltipShown(boolean tooltipShown) {
-        AppPrefs.setGutenbergStarterPageTemplatesTooltipShown(tooltipShown);
+    @Override public void onGutenbergEditorSetFocalPointPickerTooltipShown(boolean tooltipShown) {
+        AppPrefs.setGutenbergFocalPointPickerTooltipShown(tooltipShown);
     }
 
-    @Override public boolean onGutenbergEditorRequestStarterPageTemplatesTooltipShown() {
-        return AppPrefs.getGutenbergStarterPageTemplatesTooltipShown();
+    @Override public boolean onGutenbergEditorRequestFocalPointPickerTooltipShown() {
+        return AppPrefs.getGutenbergFocalPointPickerTooltipShown();
     }
 
     @Override
@@ -3259,18 +3310,21 @@ public void onTrackableEvent(TrackableEvent event, Map<String, String> propertie
     }
 
     @Override public void onStoryComposerLoadRequested(ArrayList<Object> mediaFiles, String blockId) {
-        boolean noSlidesLoaded = mStoriesEventListener.onRequestMediaFilesEditorLoad(
-                this,
-                new LocalId(mEditPostRepository.getId()),
-                mNetworkErrorOnLastMediaFetchAttempt,
-                mediaFiles,
-                blockId
-        );
+        // we need to save the latest before editing
+        updateAndSavePostAsync(updatePostResult -> {
+            boolean noSlidesLoaded = mStoriesEventListener.onRequestMediaFilesEditorLoad(
+                    EditPostActivity.this,
+                    new LocalId(mEditPostRepository.getId()),
+                    mNetworkErrorOnLastMediaFetchAttempt,
+                    mediaFiles,
+                    blockId
+            );
 
-        if (mNetworkErrorOnLastMediaFetchAttempt && noSlidesLoaded) {
-            // try another fetchMedia request
-            fetchMediaList();
-        }
+            if (mNetworkErrorOnLastMediaFetchAttempt && noSlidesLoaded) {
+                // try another fetchMedia request
+                fetchMediaList();
+            }
+        });
     }
 
     @Override public void onRetryUploadForMediaCollection(ArrayList<Object> mediaFiles) {
@@ -3301,6 +3355,14 @@ public void onMediaUploaded(OnMediaUploaded event) {
         }
 
         if (event.isError()) {
+            View view = mEditorFragment.getView();
+            if (view != null) {
+                mUploadUtilsWrapper.showSnackbarError(
+                        view,
+                        getString(R.string.error_media_upload_failed_for_reason,
+                                UploadUtils.getErrorMessageFromMedia(this, event.media))
+                );
+            }
             mEditorMedia.onMediaUploadError(mEditorMediaUploadListener, event.media, event.error);
         } else if (event.completed) {
             // if the remote url on completed is null, we consider this upload wasn't successful
@@ -3348,7 +3410,10 @@ public void onPostChanged(OnPostChanged event) {
                 AppLog.e(T.POSTS, "REMOTE_AUTO_SAVE_POST failed: " + event.error.type + " - " + event.error.message);
             }
             mEditPostRepository.loadPostByLocalPostId(mEditPostRepository.getId());
-            mEditPostRepository.replace(postModel -> handleRemoteAutoSave(event.isError(), postModel));
+            if (isRemotePreviewingFromEditor()) {
+                handleRemotePreviewUploadResult(event.isError(),
+                        RemotePreviewType.REMOTE_PREVIEW_WITH_REMOTE_AUTO_SAVE);
+            }
         }
     }
 
@@ -3374,30 +3439,25 @@ private boolean isRemoteAutoSaveError() {
     }
 
     @Nullable
-    private PostModel handleRemoteAutoSave(boolean isError, PostModel post) {
-        mViewModel.hideSavingDialog();
+    private void handleRemotePreviewUploadResult(boolean isError, RemotePreviewLogicHelper.RemotePreviewType param) {
         // We are in the process of remote previewing a post from the editor
         if (!isError && isUploadingPostForPreview()) {
-            mViewModel.hideSavingDialog();
             // We were uploading post for preview and we got no error:
             // update post status and preview it in the internal browser
             updateOnSuccessfulUpload();
             ActivityLauncher.previewPostOrPageForResult(
                     EditPostActivity.this,
                     mSite,
-                    post,
-                    mPostLoadingState == PostLoadingState.UPLOADING_FOR_PREVIEW
-                            ? RemotePreviewLogicHelper.RemotePreviewType.REMOTE_PREVIEW
-                            : RemotePreviewLogicHelper.RemotePreviewType.REMOTE_PREVIEW_WITH_REMOTE_AUTO_SAVE
+                    mEditPostRepository.getPost(),
+                    param
             );
-            updatePostLoadingAndDialogState(PostLoadingState.PREVIEWING, post);
+            updatePostLoadingAndDialogState(PostLoadingState.PREVIEWING, mEditPostRepository.getPost());
         } else if (isError || isRemoteAutoSaveError()) {
             // We got an error from the uploading or from the remote auto save of a post: show snackbar error
             updatePostLoadingAndDialogState(PostLoadingState.NONE);
             mUploadUtilsWrapper.showSnackbarError(findViewById(R.id.editor_activity),
                     getString(R.string.remote_preview_operation_error));
         }
-        return post;
     }
 
     @SuppressWarnings("unused")
@@ -3408,8 +3468,8 @@ public void onPostUploaded(OnPostUploaded event) {
             if (!isRemotePreviewingFromEditor()) {
                 // We are not remote previewing a post: show snackbar and update post status if needed
                 View snackbarAttachView = findViewById(R.id.editor_activity);
-                mUploadUtilsWrapper.onPostUploadedSnackbarHandler(this, snackbarAttachView, event.isError(), post,
-                        event.isError() ? event.error.message : null, getSite());
+                mUploadUtilsWrapper.onPostUploadedSnackbarHandler(this, snackbarAttachView, event.isError(),
+                        event.isFirstTimePublish, post, event.isError() ? event.error.message : null, getSite());
                 if (!event.isError()) {
                     mEditPostRepository.set(() -> {
                         updateOnSuccessfulUpload();
@@ -3417,7 +3477,8 @@ public void onPostUploaded(OnPostUploaded event) {
                     });
                 }
             } else {
-                mEditPostRepository.set(() -> handleRemoteAutoSave(event.isError(), post));
+                mEditPostRepository.set(() -> post);
+                handleRemotePreviewUploadResult(event.isError(), RemotePreviewType.REMOTE_PREVIEW);
             }
         }
     }
@@ -3566,9 +3627,7 @@ public String getErrorMessageFromMedia(int mediaId) {
 
     @Override
     public void showJetpackSettings() {
-        Intent intent = new Intent(this, JetpackSecuritySettingsActivity.class);
-        intent.putExtra(WordPress.SITE, mSite);
-        startActivityForResult(intent, JetpackSecuritySettingsActivity.JETPACK_SECURITY_SETTINGS_REQUEST_CODE);
+        ActivityLauncher.viewJetpackSecuritySettingsForResult(this, mSite);
     }
 
     @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsFragment.kt
index c96a1d744944..6bbccdd50cba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsFragment.kt
@@ -2,7 +2,7 @@ package org.wordpress.android.ui.posts
 
 import android.os.Bundle
 import android.view.ViewGroup
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.posts.PublishSettingsFragmentType.EDIT_POST
@@ -15,7 +15,7 @@ class EditPostPublishSettingsFragment : PublishSettingsFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().applicationContext as WordPress).component().inject(this)
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(EditPostPublishSettingsViewModel::class.java)
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
index b46bbfc8c062..aaf155a037bb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
@@ -4,8 +4,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.location.Address;
-import android.os.AsyncTask;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.ContextMenu;
@@ -22,22 +20,11 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.view.menu.MenuPopupHelper;
-import androidx.appcompat.widget.PopupMenu;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
-
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
-import com.google.android.gms.common.GooglePlayServicesRepairableException;
-import com.google.android.gms.location.places.Place;
-import com.google.android.gms.location.places.ui.PlacePicker;
-import com.google.android.gms.maps.model.LatLng;
-import com.google.android.gms.maps.model.LatLngBounds;
 
 import org.apache.commons.text.StringEscapeUtils;
 import org.greenrobot.eventbus.Subscribe;
@@ -54,7 +41,6 @@
 import org.wordpress.android.fluxc.model.PostImmutableModel;
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.model.TermModel;
-import org.wordpress.android.fluxc.model.post.PostLocation;
 import org.wordpress.android.fluxc.model.post.PostStatus;
 import org.wordpress.android.fluxc.store.MediaStore.OnMediaUploaded;
 import org.wordpress.android.fluxc.store.SiteStore;
@@ -77,17 +63,12 @@
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DateTimeUtils;
-import org.wordpress.android.util.GeocoderUtils;
 import org.wordpress.android.util.StringUtils;
-import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper;
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageManager.RequestListener;
 import org.wordpress.android.util.image.ImageType;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -106,8 +87,6 @@ public class EditPostSettingsFragment extends Fragment {
 
     private static final int ACTIVITY_REQUEST_CODE_SELECT_CATEGORIES = 5;
     private static final int ACTIVITY_REQUEST_CODE_SELECT_TAGS = 6;
-    private static final int ACTIVITY_REQUEST_CODE_PICK_LOCATION = 7;
-    private static final int ACTIVITY_REQUEST_PLAY_SERVICES_RESOLUTION = 8;
 
     private static final int CHOOSE_FEATURED_IMAGE_MENU_ID = 100;
     private static final int REMOVE_FEATURED_IMAGE_MENU_ID = 101;
@@ -123,7 +102,6 @@ public class EditPostSettingsFragment extends Fragment {
     private LinearLayout mPublishDateContainer;
     private TextView mExcerptTextView;
     private TextView mSlugTextView;
-    private TextView mLocationTextView;
     private TextView mCategoriesTextView;
     private TextView mTagsTextView;
     private TextView mStatusTextView;
@@ -141,8 +119,6 @@ public class EditPostSettingsFragment extends Fragment {
     private ViewGroup mFeaturedImageRetryOverlay;
     private ViewGroup mFeaturedImageProgressOverlay;
 
-    private PostLocation mPostLocation;
-
     private ArrayList<String> mDefaultPostFormatKeys;
     private ArrayList<String> mDefaultPostFormatNames;
     private ArrayList<String> mPostFormatKeys;
@@ -158,7 +134,6 @@ public class EditPostSettingsFragment extends Fragment {
     @Inject AnalyticsTrackerWrapper mAnalyticsTrackerWrapper;
     @Inject UpdatePostStatusUseCase mUpdatePostStatusUseCase;
     @Inject MediaPickerLauncher mMediaPickerLauncher;
-    @Inject ConsolidatedMediaPickerFeatureConfig mConsolidatedMediaPickerFeatureConfig;
 
     @Inject ViewModelProvider.Factory mViewModelFactory;
     private EditPostPublishSettingsViewModel mPublishedViewModel;
@@ -186,8 +161,8 @@ public void onCreate(Bundle savedInstanceState) {
                 new ArrayList<>(Arrays.asList(getResources().getStringArray(R.array.post_format_keys)));
         mDefaultPostFormatNames = new ArrayList<>(Arrays.asList(getResources()
                 .getStringArray(R.array.post_format_display_names)));
-        mPublishedViewModel =
-                ViewModelProviders.of(getActivity(), mViewModelFactory).get(EditPostPublishSettingsViewModel.class);
+        mPublishedViewModel = new ViewModelProvider(getActivity(), mViewModelFactory)
+                .get(EditPostPublishSettingsViewModel.class);
     }
 
     @Override
@@ -270,7 +245,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 
         mExcerptTextView = rootView.findViewById(R.id.post_excerpt);
         mSlugTextView = rootView.findViewById(R.id.post_slug);
-        mLocationTextView = rootView.findViewById(R.id.post_location);
         mCategoriesTextView = rootView.findViewById(R.id.post_categories);
         mTagsTextView = rootView.findViewById(R.id.post_tags);
         mStatusTextView = rootView.findViewById(R.id.post_status);
@@ -330,14 +304,6 @@ public void onClick(View view) {
             }
         });
 
-        final LinearLayout locationContainer = rootView.findViewById(R.id.post_location_container);
-        locationContainer.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                showLocationPickerOrPopupMenu(view);
-            }
-        });
-
         mCategoriesContainer = rootView.findViewById(R.id.post_categories_container);
         mCategoriesContainer.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -464,7 +430,6 @@ private void setupSettingHintsForAccessibility() {
         AccessibilityUtils.disableHintAnnouncement(mPasswordTextView);
         AccessibilityUtils.disableHintAnnouncement(mSlugTextView);
         AccessibilityUtils.disableHintAnnouncement(mExcerptTextView);
-        AccessibilityUtils.disableHintAnnouncement(mLocationTextView);
     }
 
     private void applyAccessibilityHeadingToSettings() {
@@ -503,7 +468,6 @@ public void refreshViews() {
         updatePublishDateTextView(postModel);
         mPublishedViewModel.start(getEditPostRepository());
         updateCategoriesTextView(postModel);
-        initLocation();
         updateFeaturedImageView(postModel);
     }
 
@@ -516,13 +480,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
             Bundle extras;
 
             switch (requestCode) {
-                case ACTIVITY_REQUEST_CODE_PICK_LOCATION:
-                    if (isAdded() && resultCode == RESULT_OK) {
-                        Place place = PlacePicker.getPlace(getActivity(), data);
-                        mAnalyticsTrackerWrapper.track(Stat.EDITOR_POST_LOCATION_CHANGED);
-                        setLocation(place);
-                    }
-                    break;
                 case ACTIVITY_REQUEST_CODE_SELECT_CATEGORIES:
                     extras = data.getExtras();
                     if (extras != null && extras.containsKey(KEY_SELECTED_CATEGORY_IDS)) {
@@ -610,12 +567,16 @@ private void showTagsActivity() {
      * called by the activity when the user taps OK on a PostSettingsDialogFragment
      */
     public void onPostSettingsFragmentPositiveButtonClicked(@NonNull PostSettingsListDialogFragment fragment) {
+        int index;
+        PostStatus status = null;
         switch (fragment.getDialogType()) {
+            case HOMEPAGE_STATUS:
+                index = fragment.getCheckedIndex();
+                status = getHomepageStatusAtIndex(index);
+                break;
             case POST_STATUS:
-                int index = fragment.getCheckedIndex();
-                PostStatus status = getPostStatusAtIndex(index);
-                updatePostStatus(status);
-                PostAnalyticsUtilsKt.trackPostSettings(mAnalyticsTrackerWrapper, Stat.EDITOR_POST_VISIBILITY_CHANGED);
+                index = fragment.getCheckedIndex();
+                status = getPostStatusAtIndex(index);
                 break;
             case POST_FORMAT:
                 String formatName = fragment.getSelectedItem();
@@ -623,6 +584,11 @@ public void onPostSettingsFragmentPositiveButtonClicked(@NonNull PostSettingsLis
                 mAnalyticsTrackerWrapper.track(Stat.EDITOR_POST_FORMAT_CHANGED);
                 break;
         }
+
+        if (status != null) {
+            updatePostStatus(status);
+            PostAnalyticsUtilsKt.trackPostSettings(mAnalyticsTrackerWrapper, Stat.EDITOR_POST_VISIBILITY_CHANGED);
+        }
     }
 
     private void showStatusDialog() {
@@ -630,13 +596,25 @@ private void showStatusDialog() {
             return;
         }
 
-        int index = getCurrentPostStatusIndex();
+        boolean isSiteHomepage = isSiteHomepage();
+        int index = isSiteHomepage ? getCurrentHomepageStatusIndex() : getCurrentPostStatusIndex();
         FragmentManager fm = getActivity().getSupportFragmentManager();
+
+        DialogType statusType = isSiteHomepage ? DialogType.HOMEPAGE_STATUS : DialogType.POST_STATUS;
         PostSettingsListDialogFragment fragment =
-                PostSettingsListDialogFragment.newInstance(DialogType.POST_STATUS, index);
+                PostSettingsListDialogFragment.newInstance(statusType, index);
         fragment.show(fm, PostSettingsListDialogFragment.TAG);
     }
 
+    private boolean isSiteHomepage() {
+        EditPostRepository postRepository = getEditPostRepository();
+        boolean isPage = postRepository.isPage();
+        boolean isPublishedPage = postRepository.getStatus() == PostStatus.PUBLISHED
+                                  || postRepository.getStatus() == PostStatus.PRIVATE;
+        boolean isHomepage = postRepository.getRemotePostId() == getSite().getPageOnFront();
+        return isPage && isPublishedPage && isHomepage;
+    }
+
     private void showPostFormatDialog() {
         if (!isAdded()) {
             return;
@@ -943,6 +921,32 @@ private int getCurrentPostStatusIndex() {
         return 0;
     }
 
+    private PostStatus getHomepageStatusAtIndex(int index) {
+        switch (index) {
+            case 0:
+                return PostStatus.PUBLISHED;
+            case 1:
+                return PostStatus.PRIVATE;
+            default:
+                return PostStatus.UNKNOWN;
+        }
+    }
+
+    private int getCurrentHomepageStatusIndex() {
+        switch (getEditPostRepository().getStatus()) {
+            case PRIVATE:
+                return 1;
+            case DRAFT:
+            case PENDING:
+            case TRASHED:
+            case UNKNOWN:
+            case PUBLISHED:
+            case SCHEDULED:
+                return 0;
+        }
+        return 0;
+    }
+
     // Post Format Helpers
 
     private void updatePostFormatKeysAndNames() {
@@ -993,7 +997,7 @@ private String getPostFormatNameFromKey(String postFormatKey) {
     // Featured Image Helpers
 
     public void updateFeaturedImage(long featuredImageId, boolean imagePicked) {
-        if (isAdded() && imagePicked && mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
+        if (isAdded() && imagePicked) {
             int postId = getEditPostRepository().getId();
             mFeaturedImageHelper.trackFeaturedImageEvent(
                     TrackableEvent.IMAGE_PICKED,
@@ -1017,6 +1021,10 @@ public void updateFeaturedImage(long featuredImageId, boolean imagePicked) {
 
     private void clearFeaturedImage() {
         updateFeaturedImage(0, false);
+
+        if (getActivity() instanceof EditPostSettingsCallback) {
+            ((EditPostSettingsCallback) getActivity()).clearFeaturedImage();
+        }
     }
 
     private void updateFeaturedImageView(PostImmutableModel postModel) {
@@ -1104,155 +1112,6 @@ public void onPostFormatsChanged(OnPostFormatsChanged event) {
         updatePostFormatKeysAndNames();
     }
 
-    /**
-     * retrieves and displays the friendly address for a lat/long location
-     */
-    private class FetchAndSetAddressAsyncTask extends AsyncTask<Double, Void, Address> {
-        @Override
-        protected void onPreExecute() {
-        }
-
-        @Override
-        protected Address doInBackground(Double... args) {
-            if (getActivity() == null) {
-                return null;
-            }
-            // args will be the latitude, longitude to look up
-            double latitude = args[0];
-            double longitude = args[1];
-            try {
-                return GeocoderUtils.getAddressFromCoords(getActivity(), latitude, longitude);
-            } catch (IllegalArgumentException iae) {
-                return null;
-            }
-        }
-
-        protected void onPostExecute(@Nullable Address address) {
-            if (address == null || address.getMaxAddressLineIndex() == 0) {
-                // Do nothing (keep the "lat, long" format).
-                return;
-            }
-            StringBuilder sb = new StringBuilder();
-            for (int i = 0; ; ++i) {
-                sb.append(address.getAddressLine(i));
-                if (i == address.getMaxAddressLineIndex()) {
-                    sb.append(".");
-                    break;
-                } else {
-                    sb.append(", ");
-                }
-            }
-            mLocationTextView.setText(sb.toString());
-        }
-    }
-
-    private void showLocationPicker() {
-        if (!isAdded()) {
-            return;
-        }
-        PlacePicker.IntentBuilder builder = new PlacePicker.IntentBuilder();
-        // Pre-pick the previous selected location if any
-        LatLng latLng = null;
-        if (mPostLocation != null) {
-            latLng = new LatLng(mPostLocation.getLatitude(), mPostLocation.getLongitude());
-        } else if (getEditPostRepository().hasLocation()) {
-            PostLocation location = getEditPostRepository().getLocation();
-            latLng = new LatLng(location.getLatitude(), location.getLongitude());
-        }
-        if (latLng != null) {
-            builder.setLatLngBounds(new LatLngBounds(latLng, latLng));
-        }
-        // Show the picker
-        try {
-            startActivityForResult(builder.build(getActivity()), ACTIVITY_REQUEST_CODE_PICK_LOCATION);
-        } catch (GooglePlayServicesNotAvailableException nae) {
-            ToastUtils.showToast(getActivity(), R.string.post_settings_error_placepicker_missing_play_services);
-        } catch (GooglePlayServicesRepairableException re) {
-            GoogleApiAvailability.getInstance().getErrorDialog(getActivity(), re.getConnectionStatusCode(),
-                    ACTIVITY_REQUEST_PLAY_SERVICES_RESOLUTION);
-        }
-    }
-
-    private void setLocation(@Nullable Place place) {
-        EditPostRepository postRepository = getEditPostRepository();
-        if (postRepository == null) {
-            return;
-        }
-        postRepository.updateAsync(postModel -> {
-            if (place == null) {
-                postModel.clearLocation();
-                mPostLocation = null;
-                return false;
-            }
-            mPostLocation = new PostLocation(place.getLatLng().latitude, place.getLatLng().longitude);
-            postModel.setLocation(mPostLocation);
-            return true;
-        }, (postModel, result) -> {
-            if (result == UpdatePostResult.Updated.INSTANCE) {
-                if (place == null) {
-                    mLocationTextView.setText("");
-                } else {
-                    mLocationTextView.setText(place.getAddress());
-                }
-            }
-            return null;
-        });
-    }
-
-    private void initLocation() {
-        if (!getEditPostRepository().hasLocation()) {
-            mPostLocation = null;
-        } else {
-            mPostLocation = getEditPostRepository().getLocation();
-            mLocationTextView.setText(getString(
-                    R.string.latitude_longitude, mPostLocation.getLatitude(), mPostLocation.getLongitude()));
-            // Asynchronously get the address from the location coordinates
-            new FetchAndSetAddressAsyncTask().execute(mPostLocation.getLatitude(), mPostLocation.getLongitude());
-        }
-    }
-
-    private void showLocationPickerOrPopupMenu(@NonNull final View view) {
-        if (!isAdded()) {
-            return;
-        }
-
-        // If the post doesn't have location set, show the picker directly
-        if (!getEditPostRepository().hasLocation()) {
-            showLocationPicker();
-            return;
-        }
-
-        // If the post have a location set, show a context menu to change or remove the location
-        PopupMenu popupMenu = new PopupMenu(getActivity(), view);
-        popupMenu.inflate(R.menu.post_settings_location_popup);
-        popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem menuItem) {
-                if (menuItem.getItemId() == R.id.menu_change_location) {
-                    showLocationPicker();
-                } else if (menuItem.getItemId() == R.id.menu_remove_location) {
-                    mAnalyticsTrackerWrapper.track(Stat.EDITOR_POST_LOCATION_CHANGED);
-                    setLocation(null);
-                }
-                return true;
-            }
-        });
-
-        // Using android internal MenuPopupHelper class trick to show the icons
-        try {
-            Field fieldPopup = popupMenu.getClass().getDeclaredField("mPopup");
-            fieldPopup.setAccessible(true);
-            Object menuPopupHelper = fieldPopup.get(popupMenu);
-            MenuPopupHelper popupHelper = (MenuPopupHelper) fieldPopup.get(popupMenu);
-            Class<?> classPopupHelper = Class.forName(popupHelper.getClass().getName());
-            Method setForceIcons = classPopupHelper.getMethod("setForceShowIcon", boolean.class);
-            setForceIcons.invoke(menuPopupHelper, true);
-        } catch (Exception e) {
-            // no op, icons won't show
-        }
-        popupMenu.show();
-    }
-
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onMediaUploaded(OnMediaUploaded event) {
         if (event.media.getMarkedLocallyAsFeatured()) {
@@ -1273,5 +1132,6 @@ private void updateFeaturedImageViews(FeaturedImageState state) {
 
     interface EditPostSettingsCallback {
         void onEditPostPublishedSettingsClick();
+        void clearFeaturedImage();
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/GetCategoriesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/GetCategoriesUseCase.kt
index 453c718a31ac..35cafdebb193 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/GetCategoriesUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/GetCategoriesUseCase.kt
@@ -37,7 +37,7 @@ class GetCategoriesUseCase @Inject constructor(
         return formatCategories(categories)
     }
 
-    fun getPostCategories(editPostRepository: EditPostRepository, siteModel: SiteModel) =
+    fun getPostCategories(editPostRepository: EditPostRepository) =
             editPostRepository.getPost()?.categoryIdList ?: listOf()
 
     fun getSiteCategories(siteModel: SiteModel): ArrayList<CategoryNode> {
@@ -48,7 +48,7 @@ class GetCategoriesUseCase @Inject constructor(
     }
 
     fun fetchSiteCategories(siteModel: SiteModel) {
-            dispatcher.dispatch(TaxonomyActionBuilder.newFetchCategoriesAction(siteModel))
+        dispatcher.dispatch(TaxonomyActionBuilder.newFetchCategoriesAction(siteModel))
     }
 
     private fun formatCategories(categoryList: List<TermModel>): String {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/HistoryListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/HistoryListFragment.kt
index dd4f78f1b967..e3f96e3cab0c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/HistoryListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/HistoryListFragment.kt
@@ -2,19 +2,16 @@ package org.wordpress.android.ui.posts
 
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.annotation.NonNull
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.history_list_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.HistoryListFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.history.HistoryAdapter
 import org.wordpress.android.ui.history.HistoryListItem
@@ -25,7 +22,7 @@ import org.wordpress.android.viewmodel.history.HistoryViewModel
 import org.wordpress.android.viewmodel.history.HistoryViewModel.HistoryListStatus
 import javax.inject.Inject
 
-class HistoryListFragment : Fragment() {
+class HistoryListFragment : Fragment(R.layout.history_list_fragment) {
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
     private lateinit var viewModel: HistoryViewModel
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -48,10 +45,6 @@ class HistoryListFragment : Fragment() {
         fun onHistoryItemClicked(revision: Revision, revisions: List<Revision>)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.history_list_fragment, container, false)
-    }
-
     private fun onItemClicked(item: HistoryListItem) {
         viewModel.onItemClicked(item)
     }
@@ -61,7 +54,7 @@ class HistoryListFragment : Fragment() {
 
         (requireActivity().application as WordPress).component()?.inject(this)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(HistoryViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(HistoryViewModel::class.java)
     }
 
     override fun onAttach(context: Context) {
@@ -75,53 +68,54 @@ class HistoryListFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
+        with(HistoryListFragmentBinding.bind(view)) {
+            emptyRecyclerView.layoutManager = LinearLayoutManager(nonNullActivity, RecyclerView.VERTICAL, false)
+            emptyRecyclerView.setEmptyView(actionableEmptyView)
+            actionableEmptyView.button.setText(R.string.button_retry)
+            actionableEmptyView.button.setOnClickListener {
+                viewModel.onPullToRefresh()
+            }
 
-        empty_recycler_view.layoutManager = LinearLayoutManager(nonNullActivity, RecyclerView.VERTICAL, false)
-        empty_recycler_view.setEmptyView(actionable_empty_view)
-        actionable_empty_view.button.setText(R.string.button_retry)
-        actionable_empty_view.button.setOnClickListener {
-            viewModel.onPullToRefresh()
-        }
-
-        swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(swipe_refresh_layout) {
-            viewModel.onPullToRefresh()
-        }
+            swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(swipeRefreshLayout) {
+                viewModel.onPullToRefresh()
+            }
 
-        (nonNullActivity.application as WordPress).component()?.inject(this)
+            (nonNullActivity.application as WordPress).component()?.inject(this@HistoryListFragment)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(HistoryViewModel::class.java)
-        viewModel.create(
-                localPostId = arguments?.getInt(KEY_POST_LOCAL_ID) ?: 0,
-                site = arguments?.get(KEY_SITE) as SiteModel
-        )
-        updatePostOrPageEmptyView()
-        setObservers()
+            viewModel = ViewModelProvider(this@HistoryListFragment, viewModelFactory).get(HistoryViewModel::class.java)
+            viewModel.create(
+                    localPostId = arguments?.getInt(KEY_POST_LOCAL_ID) ?: 0,
+                    site = arguments?.get(KEY_SITE) as SiteModel
+            )
+            updatePostOrPageEmptyView()
+            setObservers()
+        }
     }
 
-    private fun updatePostOrPageEmptyView() {
-        actionable_empty_view.title.text = getString(R.string.history_empty_title)
-        actionable_empty_view.button.visibility = View.GONE
-        actionable_empty_view.subtitle.visibility = View.VISIBLE
+    private fun HistoryListFragmentBinding.updatePostOrPageEmptyView() {
+        actionableEmptyView.title.text = getString(R.string.history_empty_title)
+        actionableEmptyView.button.visibility = View.GONE
+        actionableEmptyView.subtitle.visibility = View.VISIBLE
     }
 
-    private fun reloadList(data: List<HistoryListItem>) {
+    private fun HistoryListFragmentBinding.reloadList(data: List<HistoryListItem>) {
         setList(data)
     }
 
-    private fun setList(list: List<HistoryListItem>) {
+    private fun HistoryListFragmentBinding.setList(list: List<HistoryListItem>) {
         val adapter: HistoryAdapter
 
-        if (empty_recycler_view.adapter == null) {
-            adapter = HistoryAdapter(requireActivity(), this::onItemClicked)
-            empty_recycler_view.adapter = adapter
+        if (emptyRecyclerView.adapter == null) {
+            adapter = HistoryAdapter(requireActivity(), this@HistoryListFragment::onItemClicked)
+            emptyRecyclerView.adapter = adapter
         } else {
-            adapter = empty_recycler_view.adapter as HistoryAdapter
+            adapter = emptyRecyclerView.adapter as HistoryAdapter
         }
 
         adapter.updateList(list)
     }
 
-    private fun setObservers() {
+    private fun HistoryListFragmentBinding.setObservers() {
         viewModel.revisions.observe(viewLifecycleOwner, Observer {
             reloadList(it ?: emptyList())
         })
@@ -136,21 +130,21 @@ class HistoryListFragment : Fragment() {
                         updatePostOrPageEmptyView()
                     }
                     HistoryListStatus.FETCHING -> {
-                        actionable_empty_view.title.setText(R.string.history_fetching_revisions)
-                        actionable_empty_view.subtitle.visibility = View.GONE
-                        actionable_empty_view.button.visibility = View.GONE
+                        actionableEmptyView.title.setText(R.string.history_fetching_revisions)
+                        actionableEmptyView.subtitle.visibility = View.GONE
+                        actionableEmptyView.button.visibility = View.GONE
                     }
                     HistoryListStatus.NO_NETWORK -> {
-                        actionable_empty_view.title.setText(R.string.no_network_title)
-                        actionable_empty_view.subtitle.setText(R.string.no_network_message)
-                        actionable_empty_view.subtitle.visibility = View.VISIBLE
-                        actionable_empty_view.button.visibility = View.VISIBLE
+                        actionableEmptyView.title.setText(R.string.no_network_title)
+                        actionableEmptyView.subtitle.setText(R.string.no_network_message)
+                        actionableEmptyView.subtitle.visibility = View.VISIBLE
+                        actionableEmptyView.button.visibility = View.VISIBLE
                     }
                     HistoryListStatus.ERROR -> {
-                        actionable_empty_view.title.setText(R.string.no_network_title)
-                        actionable_empty_view.subtitle.setText(R.string.error_generic_network)
-                        actionable_empty_view.subtitle.visibility = View.VISIBLE
-                        actionable_empty_view.button.visibility = View.VISIBLE
+                        actionableEmptyView.title.setText(R.string.no_network_title)
+                        actionableEmptyView.subtitle.setText(R.string.error_generic_network)
+                        actionableEmptyView.subtitle.visibility = View.VISIBLE
+                        actionableEmptyView.button.visibility = View.VISIBLE
                     }
                 }
             }
@@ -166,7 +160,7 @@ class HistoryListFragment : Fragment() {
         })
 
         viewModel.post.observe(viewLifecycleOwner, Observer { post ->
-            actionable_empty_view.subtitle.text = if (post?.isPage == true) {
+            actionableEmptyView.subtitle.text = if (post?.isPage == true) {
                 getString(R.string.history_empty_subtitle_page)
             } else {
                 getString(R.string.history_empty_subtitle_post)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt
index ae29191808cf..d8e18537455b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostActionHandler.kt
@@ -34,6 +34,7 @@ import org.wordpress.android.util.ToastUtils.Duration
 import org.wordpress.android.viewmodel.helpers.ToastMessageHolder
 import org.wordpress.android.widgets.PostListButtonType
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_CANCEL_PENDING_AUTO_UPLOAD
+import org.wordpress.android.widgets.PostListButtonType.BUTTON_COPY
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE_PERMANENTLY
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_EDIT
@@ -67,7 +68,8 @@ class PostActionHandler(
     private val checkNetworkConnection: () -> Boolean,
     private val showSnackbar: (SnackbarMessageHolder) -> Unit,
     private val showToast: (ToastMessageHolder) -> Unit,
-    private val triggerPreviewStateUpdate: (PostListRemotePreviewState, PostInfoType) -> Unit
+    private val triggerPreviewStateUpdate: (PostListRemotePreviewState, PostInfoType) -> Unit,
+    private val copyPost: (SiteModel, PostModel, Boolean) -> Unit
 ) {
     private val criticalPostActionTracker = CriticalPostActionTracker(onStateChanged = {
         invalidateList.invoke()
@@ -112,6 +114,7 @@ class PostActionHandler(
                     else -> trashPost(post)
                 }
             }
+            BUTTON_COPY -> copyPost(site, post, true)
             BUTTON_DELETE, BUTTON_DELETE_PERMANENTLY -> {
                 postListDialogHelper.showDeletePostConfirmationDialog(post)
             }
@@ -168,6 +171,13 @@ class PostActionHandler(
         triggerPostUploadAction.invoke(PublishPost(dispatcher, site, post))
     }
 
+    fun resolveConflictsAndEditPost(localPostId: Int) {
+        val post = postStore.getPostByLocalPostId(localPostId)
+        if (post != null) {
+            performChecksAndEdit(site, post)
+        }
+    }
+
     fun moveTrashedPostToDraft(localPostId: Int) {
         val post = postStore.getPostByLocalPostId(localPostId)
         if (post != null) {
@@ -198,7 +208,9 @@ class PostActionHandler(
         showSnackbar.invoke(snackBarHolder)
     }
 
-    private fun editPostButtonAction(site: SiteModel, post: PostModel) {
+    private fun editPostButtonAction(site: SiteModel, post: PostModel) = performChecksAndEdit(site, post)
+
+    private fun performChecksAndEdit(site: SiteModel, post: PostModel) {
         // first of all, check whether this post is in Conflicted state with a more recent remote version
         if (doesPostHaveUnhandledConflict.invoke(post)) {
             postListDialogHelper.showConflictedPostResolutionDialog(post)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostDatePickerDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostDatePickerDialogFragment.kt
index 2b56bfff126d..a69d6d0baf24 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostDatePickerDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostDatePickerDialogFragment.kt
@@ -7,7 +7,6 @@ import android.content.DialogInterface
 import android.os.Bundle
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.posts.PublishSettingsFragmentType.EDIT_POST
@@ -25,9 +24,9 @@ class PostDatePickerDialogFragment : DialogFragment() {
         )
 
         when (publishSettingsFragmentType) {
-            EDIT_POST -> viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+            EDIT_POST -> viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                     .get(EditPostPublishSettingsViewModel::class.java)
-            PREPUBLISHING_NUDGES -> viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+            PREPUBLISHING_NUDGES -> viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                     .get(PrepublishingPublishSettingsViewModel::class.java)
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
index 1428c5005cc1..677b721366ad 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
@@ -34,7 +34,6 @@ public class PostEditorAnalyticsSession implements Serializable {
     private String mBlogType;
     private String mContentType;
     private boolean mStarted = false;
-    private boolean mIsPreview = false;
     private Editor mCurrentEditor;
     private boolean mHasUnsupportedBlocks = false;
     private Outcome mOutcome = null;
@@ -95,10 +94,6 @@ public static PostEditorAnalyticsSession getNewPostEditorAnalyticsSession(
         return new PostEditorAnalyticsSession(editor, post, site, isNewPost);
     }
 
-    public void setPreview(boolean preview) {
-        mIsPreview = preview;
-    }
-
     public void start(ArrayList<Object> unsupportedBlocksList) {
         if (!mStarted) {
             mHasUnsupportedBlocks = unsupportedBlocksList != null && unsupportedBlocksList.size() > 0;
@@ -113,7 +108,7 @@ public void start(ArrayList<Object> unsupportedBlocksList) {
             // difference to be significant enough, and doing that would add more complexity to how we are initializing
             // the session.
             properties.put(KEY_STARTUP_TIME, System.currentTimeMillis() - mStartTime);
-            track(Stat.EDITOR_SESSION_START, properties);
+            AnalyticsTracker.track(Stat.EDITOR_SESSION_START, properties);
             mStarted = true;
         } else {
             AppLog.w(T.EDITOR, "An editor session cannot be attempted to be started more than once, "
@@ -124,7 +119,7 @@ public void start(ArrayList<Object> unsupportedBlocksList) {
     public void switchEditor(Editor editor) {
         mCurrentEditor = editor;
         Map<String, Object> properties = getCommonProperties();
-        track(Stat.EDITOR_SESSION_SWITCH_EDITOR, properties);
+        AnalyticsTracker.track(Stat.EDITOR_SESSION_SWITCH_EDITOR, properties);
     }
 
     public void setOutcome(Outcome newOutcome) {
@@ -136,17 +131,11 @@ public void setOutcome(Outcome newOutcome) {
         mOutcome = newOutcome;
     }
 
-    public void previewTemplate(String template) {
-        final Map<String, Object> properties = getCommonProperties();
-        properties.put(KEY_TEMPLATE, template);
-        track(Stat.EDITOR_SESSION_TEMPLATE_PREVIEW, properties);
-    }
-
     public void applyTemplate(String template) {
         mTemplate = template;
         final Map<String, Object> properties = getCommonProperties();
         properties.put(KEY_TEMPLATE, template);
-        track(Stat.EDITOR_SESSION_TEMPLATE_APPLY, properties);
+        AnalyticsTracker.track(Stat.EDITOR_SESSION_TEMPLATE_APPLY, properties);
     }
 
     public void end() {
@@ -159,7 +148,7 @@ public void end() {
             }
             Map<String, Object> properties = getCommonProperties();
             properties.put(KEY_OUTCOME, mOutcome.toString().toLowerCase(Locale.ROOT));
-            track(Stat.EDITOR_SESSION_END, properties);
+            AnalyticsTracker.track(Stat.EDITOR_SESSION_END, properties);
         } else {
             AppLog.e(T.EDITOR, "A non-started editor session cannot be attempted to be ended");
         }
@@ -181,12 +170,4 @@ private Map<String, Object> getCommonProperties() {
 
         return properties;
     }
-
-    private void track(Stat stat, Map<String, ?> properties) {
-        if (mIsPreview && stat != Stat.EDITOR_SESSION_TEMPLATE_PREVIEW) {
-            // In Preview mode we only track editor_session_template_preview
-            return;
-        }
-        AnalyticsTracker.track(stat, properties);
-    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListActionTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListActionTracker.kt
index 3002502577a9..32b7c13b95da 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListActionTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListActionTracker.kt
@@ -6,6 +6,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.widgets.PostListButtonType
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_CANCEL_PENDING_AUTO_UPLOAD
+import org.wordpress.android.widgets.PostListButtonType.BUTTON_COPY
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE_PERMANENTLY
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_EDIT
@@ -39,6 +40,7 @@ fun trackPostListAction(site: SiteModel, buttonType: PostListButtonType, postDat
         BUTTON_PREVIEW -> "preview"
         BUTTON_STATS -> "stats"
         BUTTON_TRASH -> "trash"
+        BUTTON_COPY -> "copy"
         BUTTON_DELETE,
         BUTTON_DELETE_PERMANENTLY -> "delete"
         BUTTON_PUBLISH -> "publish"
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListCreateMenuFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListCreateMenuFragment.kt
index eb5f8416abc5..a4294a164a08 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListCreateMenuFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListCreateMenuFragment.kt
@@ -6,16 +6,14 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import kotlinx.android.synthetic.main.add_content_bottom_sheet.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.AddContentBottomSheetBinding
 import org.wordpress.android.ui.main.AddContentAdapter
 import org.wordpress.android.viewmodel.posts.PostListCreateMenuViewModel
 import javax.inject.Inject
@@ -35,25 +33,27 @@ class PostListCreateMenuFragment : BottomSheetDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        content_recycler_view.layoutManager = LinearLayoutManager(requireActivity())
-        content_recycler_view.adapter = AddContentAdapter(requireActivity())
+        with(AddContentBottomSheetBinding.bind(view)) {
+            contentRecyclerView.layoutManager = LinearLayoutManager(requireActivity())
+            contentRecyclerView.adapter = AddContentAdapter(requireActivity())
 
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
-                .get(PostListCreateMenuViewModel::class.java)
-        viewModel.mainActions.observe(this, Observer {
-            (dialog?.content_recycler_view?.adapter as? AddContentAdapter)?.update(it ?: listOf())
-        })
+            viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
+                    .get(PostListCreateMenuViewModel::class.java)
+            viewModel.mainActions.observe(this@PostListCreateMenuFragment, {
+                (contentRecyclerView.adapter as? AddContentAdapter)?.update(it ?: listOf())
+            })
 
-        dialog?.setOnShowListener { dialogInterface ->
-            val sheetDialog = dialogInterface as? BottomSheetDialog
+            dialog?.setOnShowListener { dialogInterface ->
+                val sheetDialog = dialogInterface as? BottomSheetDialog
 
-            val bottomSheet = sheetDialog?.findViewById<View>(
-                    com.google.android.material.R.id.design_bottom_sheet
-            ) as? FrameLayout
+                val bottomSheet = sheetDialog?.findViewById<View>(
+                        com.google.android.material.R.id.design_bottom_sheet
+                ) as? FrameLayout
 
-            bottomSheet?.let {
-                val behavior = BottomSheetBehavior.from(it)
-                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                bottomSheet?.let {
+                    val behavior = BottomSheetBehavior.from(it)
+                    behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                }
             }
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListDialogHelper.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListDialogHelper.kt
index 5a9136a3fee2..c9a6f86982cc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListDialogHelper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListDialogHelper.kt
@@ -18,6 +18,7 @@ private const val CONFIRM_TRASH_POST_WITH_UNSAVED_CHANGES_DIALOG_TAG =
 private const val CONFIRM_ON_CONFLICT_LOAD_REMOTE_POST_DIALOG_TAG = "CONFIRM_ON_CONFLICT_LOAD_REMOTE_POST_DIALOG_TAG"
 private const val CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG = "CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG"
 private const val CONFIRM_SYNC_SCHEDULED_POST_DIALOG_TAG = "CONFIRM_SYNC_SCHEDULED_POST_DIALOG_TAG"
+private const val COPY_CONFLICT_DIALOG_TAG = "COPY_CONFLICT_DIALOG_TAG"
 private const val POST_TYPE = "post_type"
 
 /**
@@ -37,6 +38,7 @@ class PostListDialogHelper(
     private var localPostIdForConflictResolutionDialog: Int? = null
     private var localPostIdForAutosaveRevisionResolutionDialog: Int? = null
     private var localPostIdForScheduledPostSyncDialog: Int? = null
+    private var localPostIdForCopyConflictDialog: Int? = null
 
     fun showMoveTrashedPostToDraftDialog(post: PostModel) {
         val dialogHolder = DialogHolder(
@@ -137,6 +139,18 @@ class PostListDialogHelper(
         showDialog.invoke(dialogHolder)
     }
 
+    fun showCopyConflictDialog(post: PostModel) {
+        val dialogHolder = DialogHolder(
+                tag = COPY_CONFLICT_DIALOG_TAG,
+                title = UiStringRes(R.string.dialog_confirm_copy_local_title),
+                message = UiStringRes(R.string.dialog_confirm_copy_local_message),
+                positiveButton = UiStringRes(R.string.dialog_confirm_copy_local_edit_button),
+                negativeButton = UiStringRes(R.string.dialog_confirm_copy_local_copy_button)
+        )
+        localPostIdForCopyConflictDialog = post.id
+        showDialog.invoke(dialogHolder)
+    }
+
     fun onPositiveClickedForBasicDialog(
         instanceTag: String,
         trashPostWithLocalChanges: (Int) -> Unit,
@@ -145,7 +159,8 @@ class PostListDialogHelper(
         publishPost: (Int) -> Unit,
         updateConflictedPostWithRemoteVersion: (Int) -> Unit,
         editRestoredAutoSavePost: (Int) -> Unit,
-        moveTrashedPostToDraft: (Int) -> Unit
+        moveTrashedPostToDraft: (Int) -> Unit,
+        resolveConflictsAndEditPost: (Int) -> Unit
     ) {
         when (instanceTag) {
             CONFIRM_DELETE_POST_DIALOG_TAG -> localPostIdForDeleteDialog?.let {
@@ -181,6 +196,10 @@ class PostListDialogHelper(
                         UNPUBLISHED_REVISION_DIALOG_LOAD_UNPUBLISHED_VERSION_CLICKED,
                         mapOf(POST_TYPE to "post"))
             }
+            COPY_CONFLICT_DIALOG_TAG -> localPostIdForCopyConflictDialog?.let {
+                localPostIdForCopyConflictDialog = null
+                resolveConflictsAndEditPost(it)
+            }
             else -> throw IllegalArgumentException("Dialog's positive button click is not handled: $instanceTag")
         }
     }
@@ -188,7 +207,8 @@ class PostListDialogHelper(
     fun onNegativeClickedForBasicDialog(
         instanceTag: String,
         updateConflictedPostWithLocalVersion: (Int) -> Unit,
-        editLocalPost: (Int) -> Unit
+        editLocalPost: (Int) -> Unit,
+        copyLocalPost: (Int) -> Unit
     ) {
         when (instanceTag) {
             CONFIRM_DELETE_POST_DIALOG_TAG -> localPostIdForDeleteDialog = null
@@ -207,6 +227,10 @@ class PostListDialogHelper(
                 )
             }
             CONFIRM_RESTORE_TRASHED_POST_DIALOG_TAG -> localPostIdForMoveTrashedPostToDraftDialog = null
+            COPY_CONFLICT_DIALOG_TAG -> localPostIdForCopyConflictDialog?.let {
+                localPostIdForCopyConflictDialog = null
+                copyLocalPost(it)
+            }
             else -> throw IllegalArgumentException("Dialog's negative button click is not handled: $instanceTag")
         }
     }
@@ -214,7 +238,8 @@ class PostListDialogHelper(
     fun onDismissByOutsideTouchForBasicDialog(
         instanceTag: String,
         updateConflictedPostWithLocalVersion: (Int) -> Unit,
-        editLocalPost: (Int) -> Unit
+        editLocalPost: (Int) -> Unit,
+        copyLocalPost: (Int) -> Unit
     ) {
         // Cancel and outside touch dismiss works the same way for all, except for conflict and autosave revision
         // dialogs, for which tapping outside and actively tapping the "edit local" have different meanings
@@ -223,7 +248,8 @@ class PostListDialogHelper(
             onNegativeClickedForBasicDialog(
                     instanceTag = instanceTag,
                     updateConflictedPostWithLocalVersion = updateConflictedPostWithLocalVersion,
-                    editLocalPost = editLocalPost
+                    editLocalPost = editLocalPost,
+                    copyLocalPost = copyLocalPost
             )
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListEventListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListEventListener.kt
index b21ddc8e3327..d85c1a277ec5 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListEventListener.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListEventListener.kt
@@ -181,7 +181,16 @@ class PostListEventListener(
     fun onPostUploaded(event: OnPostUploaded) {
         if (event.post != null && event.post.localSiteId == site.id) {
             if (!isRemotePreviewingFromPostsList.invoke() && !isRemotePreviewingFromEditor(event.post)) {
-                triggerPostUploadAction.invoke(PostUploadedSnackbar(dispatcher, site, event.post, event.isError, null))
+                triggerPostUploadAction.invoke(
+                        PostUploadedSnackbar(
+                                dispatcher,
+                                site,
+                                event.post,
+                                event.isError,
+                                event.isFirstTimePublish,
+                                null
+                        )
+                )
             }
 
             uploadStatusChanged(event.post.id)
@@ -216,7 +225,16 @@ class PostListEventListener(
     fun onEventBackgroundThread(event: UploadService.UploadErrorEvent) {
         EventBus.getDefault().removeStickyEvent(event)
         if (event.post != null) {
-            triggerPostUploadAction.invoke(PostUploadedSnackbar(dispatcher, site, event.post, true, event.errorMessage))
+            triggerPostUploadAction.invoke(
+                    PostUploadedSnackbar(
+                            dispatcher,
+                            site,
+                            event.post,
+                            true,
+                            false,
+                            event.errorMessage
+                    )
+            )
         } else if (event.mediaModelList != null && !event.mediaModelList.isEmpty()) {
             triggerPostUploadAction.invoke(MediaUploadedSnackbar(site, event.mediaModelList, true, event.errorMessage))
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt
index 587532dab992..c759abe4c807 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListFragment.kt
@@ -10,7 +10,6 @@ import android.widget.ProgressBar
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.wordpress.android.R
@@ -99,7 +98,7 @@ class PostListFragment : ViewPagerFragment() {
             recyclerView?.id = R.id.posts_search_recycler_view_id
         }
 
-        mainViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        mainViewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(PostListMainViewModel::class.java)
 
         mainViewModel.viewLayoutType.observe(viewLifecycleOwner, Observer { optionaLayoutType ->
@@ -134,7 +133,7 @@ class PostListFragment : ViewPagerFragment() {
 
         val postListViewModelConnector = mainViewModel.getPostListViewModelConnector(postListType)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(PostListViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(PostListViewModel::class.java)
 
         val displayWidth = DisplayUtils.getDisplayPixelWidth(context)
         val contentSpacing = nonNullActivity.resources.getDimensionPixelSize(R.dimen.content_margin)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
index 547c39d97e4b..d268073290fd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt
@@ -52,7 +52,6 @@ import org.wordpress.android.util.SiteUtils
 import org.wordpress.android.util.ToastUtils.Duration
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtils
-import org.wordpress.android.util.config.WPStoriesFeatureConfig
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import org.wordpress.android.viewmodel.helpers.DialogHolder
@@ -84,7 +83,6 @@ class PostListMainViewModel @Inject constructor(
     private val previewStateHelper: PreviewStateHelper,
     private val analyticsTracker: AnalyticsTrackerWrapper,
     private val savePostToDbUseCase: SavePostToDbUseCase,
-    private val wpStoriesFeatureConfig: WPStoriesFeatureConfig,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     private val uploadStarter: UploadStarter
@@ -203,8 +201,28 @@ class PostListMainViewModel @Inject constructor(
                 checkNetworkConnection = this::checkNetworkConnection,
                 showSnackbar = { _snackBarMessage.postValue(it) },
                 showToast = { _toastMessage.postValue(it) },
-                triggerPreviewStateUpdate = this::updatePreviewAndDialogState
+                triggerPreviewStateUpdate = this::updatePreviewAndDialogState,
+                copyPost = this::copyPost
+        )
+    }
+
+    fun copyPost(site: SiteModel, postToCopy: PostModel, performChecks: Boolean = false) {
+        if (performChecks && (postConflictResolver.doesPostHaveUnhandledConflict(postToCopy) ||
+                        postConflictResolver.hasUnhandledAutoSave(postToCopy))) {
+            postListDialogHelper.showCopyConflictDialog(postToCopy)
+            return
+        }
+        val post = postStore.instantiatePostModel(
+                site,
+                false,
+                postToCopy.title,
+                postToCopy.content,
+                PostStatus.DRAFT.toString(),
+                postToCopy.categoryIdList,
+                postToCopy.postFormat,
+                true
         )
+        _postListAction.postValue(PostListAction.EditPost(site, post, loadAutoSaveRevision = false))
     }
 
     /**
@@ -359,7 +377,7 @@ class PostListMainViewModel @Inject constructor(
     }
 
     fun fabClicked() {
-        if (wpStoriesFeatureConfig.isEnabled() && SiteUtils.supportsStoriesFeature(site)) {
+        if (SiteUtils.supportsStoriesFeature(site)) {
             _onFabClicked.postValue(Event(Unit))
         } else {
             newPost()
@@ -437,6 +455,15 @@ class PostListMainViewModel @Inject constructor(
         }
     }
 
+    private fun copyLocalPost(localPostId: Int) {
+        val post = postStore.getPostByLocalPostId(localPostId)
+        if (post != null) {
+            copyPost(site, post)
+        } else {
+            _snackBarMessage.value = SnackbarMessageHolder(UiStringRes(R.string.error_post_does_not_exist))
+        }
+    }
+
     // BasicFragmentDialog Events
 
     fun onPositiveClickedForBasicDialog(instanceTag: String) {
@@ -448,7 +475,8 @@ class PostListMainViewModel @Inject constructor(
                 publishPost = postActionHandler::publishPost,
                 updateConflictedPostWithRemoteVersion = postConflictResolver::updateConflictedPostWithRemoteVersion,
                 editRestoredAutoSavePost = this::editRestoredAutoSavePost,
-                moveTrashedPostToDraft = postActionHandler::moveTrashedPostToDraft
+                moveTrashedPostToDraft = postActionHandler::moveTrashedPostToDraft,
+                resolveConflictsAndEditPost = postActionHandler::resolveConflictsAndEditPost
         )
     }
 
@@ -456,7 +484,8 @@ class PostListMainViewModel @Inject constructor(
         postListDialogHelper.onNegativeClickedForBasicDialog(
                 instanceTag = instanceTag,
                 updateConflictedPostWithLocalVersion = postConflictResolver::updateConflictedPostWithLocalVersion,
-                editLocalPost = this::editLocalPost
+                editLocalPost = this::editLocalPost,
+                copyLocalPost = this::copyLocalPost
         )
     }
 
@@ -464,7 +493,8 @@ class PostListMainViewModel @Inject constructor(
         postListDialogHelper.onDismissByOutsideTouchForBasicDialog(
                 instanceTag = instanceTag,
                 updateConflictedPostWithLocalVersion = postConflictResolver::updateConflictedPostWithLocalVersion,
-                editLocalPost = this::editLocalPost
+                editLocalPost = this::editLocalPost,
+                copyLocalPost = this::copyLocalPost
         )
     }
 
@@ -588,7 +618,7 @@ class PostListMainViewModel @Inject constructor(
     }
 
     fun onFabLongPressed() {
-        if (wpStoriesFeatureConfig.isEnabled() && SiteUtils.supportsStoriesFeature(site)) {
+        if (SiteUtils.supportsStoriesFeature(site)) {
             _onFabLongPressedForCreateMenu.postValue(Event(Unit))
         } else {
             _onFabLongPressedForPostList.postValue(Event(Unit))
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostNotificationScheduleTimeDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostNotificationScheduleTimeDialogFragment.kt
index 9d04c7a95b4f..48b952a6945a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostNotificationScheduleTimeDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostNotificationScheduleTimeDialogFragment.kt
@@ -6,7 +6,6 @@ import android.os.Bundle
 import android.widget.RadioGroup
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
@@ -30,9 +29,9 @@ class PostNotificationScheduleTimeDialogFragment : DialogFragment() {
         )
 
         when (publishSettingsFragmentType) {
-            EDIT_POST -> viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+            EDIT_POST -> viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                     .get(EditPostPublishSettingsViewModel::class.java)
-            PREPUBLISHING_NUDGES -> viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+            PREPUBLISHING_NUDGES -> viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                     .get(PrepublishingPublishSettingsViewModel::class.java)
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsListDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsListDialogFragment.java
index f2be8f084059..844aec67c95e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsListDialogFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostSettingsListDialogFragment.java
@@ -23,6 +23,7 @@ public class PostSettingsListDialogFragment extends DialogFragment {
     public static final String TAG = "post_list_settings_dialog_fragment";
 
     enum DialogType {
+        HOMEPAGE_STATUS,
         POST_STATUS,
         POST_FORMAT
     }
@@ -82,6 +83,13 @@ public void onClick(DialogInterface dialog, int which) {
         };
 
         switch (mDialogType) {
+            case HOMEPAGE_STATUS:
+                builder.setTitle(R.string.post_settings_status);
+                builder.setSingleChoiceItems(
+                        R.array.post_settings_homepage_statuses,
+                        mCheckedIndex,
+                        clickListener);
+                break;
             case POST_STATUS:
                 builder.setTitle(R.string.post_settings_status);
                 builder.setSingleChoiceItems(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostTimePickerDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostTimePickerDialogFragment.kt
index 6ec808e963c3..57051f3c9907 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostTimePickerDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostTimePickerDialogFragment.kt
@@ -8,7 +8,6 @@ import android.os.Bundle
 import android.text.format.DateFormat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.posts.PublishSettingsFragmentType.EDIT_POST
 import org.wordpress.android.ui.posts.PublishSettingsFragmentType.PREPUBLISHING_NUDGES
@@ -26,9 +25,9 @@ class PostTimePickerDialogFragment : DialogFragment() {
         )
 
         when (publishSettingsFragmentType) {
-            EDIT_POST -> viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+            EDIT_POST -> viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                     .get(EditPostPublishSettingsViewModel::class.java)
-            PREPUBLISHING_NUDGES -> viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+            PREPUBLISHING_NUDGES -> viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                     .get(PrepublishingPublishSettingsViewModel::class.java)
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUploadAction.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUploadAction.kt
index dc67f726d451..c4963148928a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUploadAction.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUploadAction.kt
@@ -27,6 +27,7 @@ sealed class PostUploadAction {
         val site: SiteModel,
         val post: PostModel,
         val isError: Boolean,
+        val isFirstTimePublish: Boolean,
         val errorMessage: String?
     ) : PostUploadAction()
 
@@ -79,6 +80,7 @@ fun handleUploadAction(
                     activity,
                     snackbarAttachView,
                     action.isError,
+                    action.isFirstTimePublish,
                     action.post,
                     action.errorMessage,
                     action.site
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
index 37f75b6e63b9..65922b791961 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
@@ -444,8 +444,8 @@ public static String replaceMediaFileWithUrlInGutenbergPost(@NonNull String post
     public static boolean isMediaInGutenbergPostBody(@NonNull String postContent,
                                             String localMediaId) {
         List<String> patterns = new ArrayList<>();
-        // Regex for Image and Video blocks
-        patterns.add("<!-- wp:(?:image|video){1} \\{[^\\}]*\"id\":%s([^\\d\\}][^\\}]*)*\\} -->");
+        // Regex for Image, Video, Audio and File blocks
+        patterns.add("<!-- wp:(?:image|video|audio|file){1} \\{[^\\}]*\"id\":%s([^\\d\\}][^\\}]*)*\\} -->");
         // Regex for Media&Text block
         patterns.add("<!-- wp:media-text \\{[^\\}]*\"mediaId\":%s([^\\d\\}][^\\}]*)*\\} -->");
         // Regex for Gallery block
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt
index 8a6b1abaa36c..1361827b5e83 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostsListActivity.kt
@@ -14,20 +14,14 @@ import android.view.View.OnClickListener
 import android.widget.AdapterView
 import android.widget.Toast
 import androidx.annotation.DrawableRes
-import androidx.appcompat.widget.AppCompatSpinner
 import androidx.appcompat.widget.SearchView
 import androidx.appcompat.widget.Toolbar
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener
-import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.tabs.TabLayout
-import kotlinx.android.synthetic.main.main_activity.fab_tooltip
-import kotlinx.android.synthetic.main.post_list_activity.appbar_main
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PostListActivityBinding
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
 import org.wordpress.android.fluxc.model.SiteModel
@@ -37,6 +31,7 @@ import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATIO
 import org.wordpress.android.ui.ActivityId
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.LocaleAwareActivity
+import org.wordpress.android.ui.PagePostCreationSourcesDetail.STORY_FROM_POSTS_LIST
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.ScrollableViewInitializedListener
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_POST
@@ -60,9 +55,9 @@ import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.SnackbarItem
 import org.wordpress.android.util.SnackbarSequencer
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig
 import org.wordpress.android.util.redirectContextClickToLongPressListener
 import org.wordpress.android.util.setLiftOnScrollTargetViewIdAndRequestLayout
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.viewmodel.posts.PostListCreateMenuViewModel
 import javax.inject.Inject
 
@@ -91,9 +86,9 @@ class PostsListActivity : LocaleAwareActivity(),
     @Inject internal lateinit var editPostRepository: EditPostRepository
     @Inject internal lateinit var mediaPickerLauncher: MediaPickerLauncher
     @Inject internal lateinit var storiesMediaPickerResultHandler: StoriesMediaPickerResultHandler
-    @Inject internal lateinit var consolidatedMediaPickerFeatureConfig: ConsolidatedMediaPickerFeatureConfig
 
     private lateinit var site: SiteModel
+    private var binding: PostListActivityBinding? = null
 
     override fun getSite() = site
     override fun getEditPostRepository() = editPostRepository
@@ -101,15 +96,7 @@ class PostsListActivity : LocaleAwareActivity(),
     private lateinit var viewModel: PostListMainViewModel
     private lateinit var postListCreateMenuViewModel: PostListCreateMenuViewModel
 
-    private lateinit var authorSelectionAdapter: AuthorSelectionAdapter
-    private lateinit var authorSelection: AppCompatSpinner
-
-    private lateinit var tabLayout: TabLayout
-    private lateinit var tabLayoutFadingEdge: View
-
     private lateinit var postsPagerAdapter: PostsPagerAdapter
-    private lateinit var pager: androidx.viewpager.widget.ViewPager
-    private lateinit var fab: FloatingActionButton
     private lateinit var searchActionButton: MenuItem
     private lateinit var toggleViewLayoutMenuItem: MenuItem
 
@@ -150,7 +137,9 @@ class PostsListActivity : LocaleAwareActivity(),
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
-        setContentView(R.layout.post_list_activity)
+        val binding = PostListActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        this.binding = binding
         site = if (savedInstanceState == null) {
             checkNotNull(intent.getSerializableExtra(WordPress.SITE) as? SiteModel) {
                 "SiteModel cannot be null, check the PendingIntent starting PostsListActivity"
@@ -172,11 +161,18 @@ class PostsListActivity : LocaleAwareActivity(),
             LocalId(savedInstanceState.getInt(STATE_KEY_BOTTOMSHEET_POST_ID, 0))
         }
 
-        setupActionBar()
-        setupContent()
-        initViewModel(initPreviewState, currentBottomSheetPostId)
-        initCreateMenuViewModel()
-        loadIntentData(intent)
+        with(binding) {
+            setupActionBar()
+            setupContent()
+            initViewModel(initPreviewState, currentBottomSheetPostId)
+            initCreateMenuViewModel()
+            loadIntentData(intent)
+        }
+    }
+
+    override fun onDestroy() {
+        binding = null
+        super.onDestroy()
     }
 
     private fun setupActionBar() {
@@ -188,14 +184,11 @@ class PostsListActivity : LocaleAwareActivity(),
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }
 
-    private fun setupContent() {
-        authorSelection = findViewById(R.id.post_list_author_selection)
-        tabLayoutFadingEdge = findViewById(R.id.post_list_tab_layout_fading_edge)
+    private fun PostListActivityBinding.setupContent() {
+        val authorSelectionAdapter = AuthorSelectionAdapter(this@PostsListActivity)
+        postListAuthorSelection.adapter = authorSelectionAdapter
 
-        authorSelectionAdapter = AuthorSelectionAdapter(this)
-        authorSelection.adapter = authorSelectionAdapter
-
-        authorSelection.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        postListAuthorSelection.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>) {}
 
             override fun onItemSelected(parent: AdapterView<*>, view: View?, position: Int, id: Long) {
@@ -203,70 +196,64 @@ class PostsListActivity : LocaleAwareActivity(),
             }
         }
 
-        pager = findViewById(R.id.postPager)
-
         // Just a safety measure - there shouldn't by any existing listeners since this method is called just once.
-        pager.clearOnPageChangeListeners()
+        postPager.clearOnPageChangeListeners()
 
-        tabLayout = findViewById(R.id.tabLayout)
         // this method call needs to be below `clearOnPageChangeListeners` as it internally adds an OnPageChangeListener
-        tabLayout.setupWithViewPager(pager)
-        pager.addOnPageChangeListener(onPageChangeListener)
-        fab = findViewById(R.id.fab_button)
-        fab.setOnClickListener {
+        tabLayout.setupWithViewPager(postPager)
+        postPager.addOnPageChangeListener(onPageChangeListener)
+        fabButton.setOnClickListener {
             viewModel.fabClicked()
         }
 
-        fab.setOnLongClickListener {
+        fabButton.setOnLongClickListener {
             viewModel.onFabLongPressed()
             return@setOnLongClickListener true
         }
 
-        fab.redirectContextClickToLongPressListener()
+        fabButton.redirectContextClickToLongPressListener()
 
-        fab_tooltip.setOnClickListener {
+        fabTooltip.setOnClickListener {
             postListCreateMenuViewModel.onTooltipTapped()
         }
 
         postsPagerAdapter = PostsPagerAdapter(POST_LIST_PAGES, site, supportFragmentManager)
-        pager.adapter = postsPagerAdapter
+        postPager.adapter = postsPagerAdapter
     }
 
-    private fun initCreateMenuViewModel() {
-        postListCreateMenuViewModel = ViewModelProviders.of(this, viewModelFactory)
+    private fun PostListActivityBinding.initCreateMenuViewModel() {
+        postListCreateMenuViewModel = ViewModelProvider(this@PostsListActivity, viewModelFactory)
                 .get(PostListCreateMenuViewModel::class.java)
 
-        postListCreateMenuViewModel.isBottomSheetShowing.observe(this, Observer { event ->
-            event.getContentIfNotHandled()?.let { isBottomSheetShowing ->
-                var createMenuFragment = supportFragmentManager.findFragmentByTag(PostListCreateMenuFragment.TAG)
-                if (createMenuFragment == null) {
-                    if (isBottomSheetShowing) {
-                        createMenuFragment = PostListCreateMenuFragment.newInstance()
-                        createMenuFragment.show(supportFragmentManager, PostListCreateMenuFragment.TAG)
-                    }
-                } else {
-                    if (!isBottomSheetShowing) {
-                        createMenuFragment as PostListCreateMenuFragment
-                        createMenuFragment.dismiss()
-                    }
+        postListCreateMenuViewModel.isBottomSheetShowing.observeEvent(this@PostsListActivity, { isBottomSheetShowing ->
+            var createMenuFragment = supportFragmentManager.findFragmentByTag(PostListCreateMenuFragment.TAG)
+            if (createMenuFragment == null) {
+                if (isBottomSheetShowing) {
+                    createMenuFragment = PostListCreateMenuFragment.newInstance()
+                    createMenuFragment.show(supportFragmentManager, PostListCreateMenuFragment.TAG)
+                }
+            } else {
+                if (!isBottomSheetShowing) {
+                    createMenuFragment as PostListCreateMenuFragment
+                    createMenuFragment.dismiss()
                 }
             }
         })
 
-        postListCreateMenuViewModel.fabUiState.observe(this, Observer { fabUiState ->
+        postListCreateMenuViewModel.fabUiState.observe(this@PostsListActivity, { fabUiState ->
             val message = resources.getString(fabUiState.CreateContentMessageId)
 
             if (fabUiState.isFabTooltipVisible) {
-                fab_tooltip.setMessage(message)
-                fab_tooltip.show()
+                fabTooltip.setMessage(message)
+                fabTooltip.show()
             } else {
-                fab_tooltip.hide()
+                fabTooltip.hide()
             }
 
-            fab.contentDescription = message
+            fabButton.contentDescription = message
         })
 
-        postListCreateMenuViewModel.createAction.observe(this, Observer { createAction ->
+        postListCreateMenuViewModel.createAction.observe(this@PostsListActivity, { createAction ->
             when (createAction) {
                 CREATE_NEW_POST -> viewModel.newPost()
                 CREATE_NEW_STORY -> viewModel.newStoryPost()
@@ -276,37 +263,20 @@ class PostsListActivity : LocaleAwareActivity(),
         postListCreateMenuViewModel.start(site)
     }
 
-    private fun initViewModel(initPreviewState: PostListRemotePreviewState, currentBottomSheetPostId: LocalId) {
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(PostListMainViewModel::class.java)
-        viewModel.start(site, initPreviewState, currentBottomSheetPostId, editPostRepository, this)
+    private fun PostListActivityBinding.initViewModel(
+        initPreviewState: PostListRemotePreviewState,
+        currentBottomSheetPostId: LocalId
+    ) {
+        viewModel = ViewModelProvider(this@PostsListActivity, viewModelFactory).get(PostListMainViewModel::class.java)
+        viewModel.start(site, initPreviewState, currentBottomSheetPostId, editPostRepository, this@PostsListActivity)
 
-        viewModel.viewState.observe(this, Observer { state ->
+        viewModel.viewState.observe(this@PostsListActivity, { state ->
             state?.let {
-                if (state.isFabVisible) {
-                    fab.show()
-                } else {
-                    fab.hide()
-                }
-
-                val authorSelectionVisibility = if (state.isAuthorFilterVisible) View.VISIBLE else View.GONE
-                authorSelection.visibility = authorSelectionVisibility
-                tabLayoutFadingEdge.visibility = authorSelectionVisibility
-
-                val tabLayoutPaddingStart =
-                        if (state.isAuthorFilterVisible)
-                            resources.getDimensionPixelSize(R.dimen.posts_list_tab_layout_fading_edge_width)
-                        else 0
-                tabLayout.setPaddingRelative(tabLayoutPaddingStart, 0, 0, 0)
-
-                authorSelectionAdapter.updateItems(state.authorFilterItems)
-
-                authorSelectionAdapter.getIndexOfSelection(state.authorFilterSelection)?.let { selectionIndex ->
-                    authorSelection.setSelection(selectionIndex)
-                }
+                loadViewState(state)
             }
         })
 
-        viewModel.postListAction.observe(this, Observer { postListAction ->
+        viewModel.postListAction.observe(this@PostsListActivity, { postListAction ->
             postListAction?.let { action ->
                 handlePostListAction(
                         this@PostsListActivity,
@@ -317,34 +287,51 @@ class PostsListActivity : LocaleAwareActivity(),
                 )
             }
         })
-        viewModel.selectTab.observe(this, Observer { tabIndex ->
+        viewModel.selectTab.observe(this@PostsListActivity, { tabIndex ->
             tabIndex?.let {
                 tabLayout.getTabAt(tabIndex)?.select()
             }
         })
-        viewModel.scrollToLocalPostId.observe(this, Observer { targetLocalPostId ->
+        viewModel.scrollToLocalPostId.observe(this@PostsListActivity, { targetLocalPostId ->
             targetLocalPostId?.let {
-                postsPagerAdapter.getItemAtPosition(pager.currentItem)?.scrollToTargetPost(targetLocalPostId)
+                postsPagerAdapter.getItemAtPosition(postPager.currentItem)?.scrollToTargetPost(targetLocalPostId)
             }
         })
-        viewModel.snackBarMessage.observe(this, Observer {
+        viewModel.snackBarMessage.observe(this@PostsListActivity, {
             it?.let { snackBarHolder -> showSnackBar(snackBarHolder) }
         })
-        viewModel.previewState.observe(this, Observer {
+        viewModel.toastMessage.observe(this@PostsListActivity, {
+            it?.show(this@PostsListActivity)
+        })
+        viewModel.previewState.observe(this@PostsListActivity, {
             progressDialog = progressDialogHelper.updateProgressDialogState(
-                    this,
+                    this@PostsListActivity,
                     progressDialog,
                     it.progressDialogUiState,
                     uiHelpers
             )
         })
-        viewModel.dialogAction.observe(this, Observer {
-            it?.show(this, supportFragmentManager, uiHelpers)
+        setupActions()
+        viewModel.openPrepublishingBottomSheet.observeEvent(this@PostsListActivity, {
+            val fragment = supportFragmentManager.findFragmentByTag(PrepublishingBottomSheetFragment.TAG)
+            if (fragment == null) {
+                val prepublishingFragment = newInstance(
+                        site = site,
+                        isPage = editPostRepository.isPage,
+                        isStoryPost = false
+                )
+                prepublishingFragment.show(supportFragmentManager, PrepublishingBottomSheetFragment.TAG)
+            }
         })
-        viewModel.toastMessage.observe(this, Observer {
-            it?.show(this)
+
+        setupFabEvents()
+    }
+
+    private fun setupActions() {
+        viewModel.dialogAction.observe(this@PostsListActivity, {
+            it?.show(this@PostsListActivity, supportFragmentManager, uiHelpers)
         })
-        viewModel.postUploadAction.observe(this, Observer {
+        viewModel.postUploadAction.observe(this@PostsListActivity, {
             it?.let { uploadAction ->
                 handleUploadAction(
                         uploadAction,
@@ -355,54 +342,63 @@ class PostsListActivity : LocaleAwareActivity(),
                 )
             }
         })
-        viewModel.openPrepublishingBottomSheet.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                val fragment = supportFragmentManager.findFragmentByTag(PrepublishingBottomSheetFragment.TAG)
-                if (fragment == null) {
-                    val prepublishingFragment = newInstance(
-                            site = site,
-                            isPage = editPostRepository.isPage,
-                            isStoryPost = false
-                    )
-                    prepublishingFragment.show(supportFragmentManager, PrepublishingBottomSheetFragment.TAG)
-                }
-            }
-        })
+    }
 
-        viewModel.onFabClicked.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                postListCreateMenuViewModel.onFabClicked()
-            }
+    private fun PostListActivityBinding.setupFabEvents() {
+        viewModel.onFabClicked.observeEvent(this@PostsListActivity, {
+            postListCreateMenuViewModel.onFabClicked()
         })
 
-        viewModel.onFabLongPressedForCreateMenu.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                postListCreateMenuViewModel.onFabLongPressed()
-            }
-            Toast.makeText(fab.context, R.string.create_post_story_fab_tooltip, Toast.LENGTH_SHORT).show()
+        viewModel.onFabLongPressedForCreateMenu.observeEvent(this@PostsListActivity, {
+            postListCreateMenuViewModel.onFabLongPressed()
+            Toast.makeText(fabButton.context, R.string.create_post_story_fab_tooltip, Toast.LENGTH_SHORT).show()
         })
 
-        viewModel.onFabLongPressedForPostList.observe(this, Observer {
-            if (fab.isHapticFeedbackEnabled) {
-                fab.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+        viewModel.onFabLongPressedForPostList.observe(this@PostsListActivity, {
+            if (fabButton.isHapticFeedbackEnabled) {
+                fabButton.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
             }
-            Toast.makeText(fab.context, R.string.create_post_fab_tooltip, Toast.LENGTH_SHORT).show()
+            Toast.makeText(fabButton.context, R.string.create_post_fab_tooltip, Toast.LENGTH_SHORT).show()
         })
     }
 
+    private fun PostListActivityBinding.loadViewState(state: PostListMainViewState) {
+        if (state.isFabVisible) {
+            fabButton.show()
+        } else {
+            fabButton.hide()
+        }
+
+        val authorSelectionVisibility = if (state.isAuthorFilterVisible) View.VISIBLE else View.GONE
+        postListAuthorSelection.visibility = authorSelectionVisibility
+        postListTabLayoutFadingEdge.visibility = authorSelectionVisibility
+
+        val tabLayoutPaddingStart =
+                if (state.isAuthorFilterVisible) {
+                    resources.getDimensionPixelSize(R.dimen.posts_list_tab_layout_fading_edge_width)
+                } else 0
+        tabLayout.setPaddingRelative(tabLayoutPaddingStart, 0, 0, 0)
+        val authorSelectionAdapter = postListAuthorSelection.adapter as AuthorSelectionAdapter
+        authorSelectionAdapter.updateItems(state.authorFilterItems)
+
+        authorSelectionAdapter.getIndexOfSelection(state.authorFilterSelection)?.let { selectionIndex ->
+            postListAuthorSelection.setSelection(selectionIndex)
+        }
+    }
+
     private fun showSnackBar(holder: SnackbarMessageHolder) {
         findViewById<View>(R.id.coordinator)?.let { parent ->
             snackbarSequencer.enqueue(
                     SnackbarItem(
                             SnackbarItem.Info(
-                                view = parent,
-                                textRes = holder.message,
-                                duration = Snackbar.LENGTH_LONG
+                                    view = parent,
+                                    textRes = holder.message,
+                                    duration = Snackbar.LENGTH_LONG
                             ),
                             holder.buttonTitle?.let {
                                 SnackbarItem.Action(
-                                    textRes = holder.buttonTitle,
-                                    clickListener = OnClickListener { holder.buttonAction() }
+                                        textRes = holder.buttonTitle,
+                                        clickListener = OnClickListener { holder.buttonAction() }
                                 )
                             },
                             dismissCallback = { _, _ -> holder.onDismissAction() }
@@ -447,16 +443,10 @@ class PostsListActivity : LocaleAwareActivity(),
             viewModel.handleEditPostResult(data)
         } else if (requestCode == RequestCodes.REMOTE_PREVIEW_POST) {
             viewModel.handleRemotePreviewClosing()
-        } else if (!consolidatedMediaPickerFeatureConfig.isEnabled() &&
-                requestCode == RequestCodes.PHOTO_PICKER &&
+        } else if (requestCode == RequestCodes.PHOTO_PICKER &&
                 resultCode == Activity.RESULT_OK &&
                 data != null) {
-            storiesMediaPickerResultHandler.handleMediaPickerResultForStories(data, this, site)
-        } else if (consolidatedMediaPickerFeatureConfig.isEnabled() &&
-                requestCode == RequestCodes.STORIES_PHOTO_PICKER &&
-                resultCode == Activity.RESULT_OK &&
-                data != null) {
-            storiesMediaPickerResultHandler.handleMediaPickerResultForStories(data, this, site)
+            storiesMediaPickerResultHandler.handleMediaPickerResultForStories(data, this, site, STORY_FROM_POSTS_LIST)
         }
     }
 
@@ -476,7 +466,7 @@ class PostsListActivity : LocaleAwareActivity(),
         menu?.let {
             menuInflater.inflate(R.menu.posts_list_toggle_view_layout, it)
             toggleViewLayoutMenuItem = it.findItem(R.id.toggle_post_list_item_layout)
-            viewModel.viewLayoutTypeMenuUiState.observe(this, Observer { menuUiState ->
+            viewModel.viewLayoutTypeMenuUiState.observe(this, { menuUiState ->
                 menuUiState?.let {
                     updateMenuIcon(menuUiState.iconRes, toggleViewLayoutMenuItem)
                     updateMenuTitle(menuUiState.title, toggleViewLayoutMenuItem)
@@ -486,7 +476,7 @@ class PostsListActivity : LocaleAwareActivity(),
             searchActionButton = it.findItem(R.id.toggle_post_search)
 
             initSearchFragment()
-            initSearchView()
+            binding!!.initSearchView()
         }
         return true
     }
@@ -505,7 +495,7 @@ class PostsListActivity : LocaleAwareActivity(),
         }
     }
 
-    private fun initSearchView() {
+    private fun PostListActivityBinding.initSearchView() {
         searchActionButton.setOnActionExpandListener(object : OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                 viewModel.onSearchExpanded(restorePreviousSearch)
@@ -536,33 +526,33 @@ class PostsListActivity : LocaleAwareActivity(),
             }
         })
 
-        viewModel.isSearchExpanded.observe(this, Observer { isExpanded ->
+        viewModel.isSearchExpanded.observe(this@PostsListActivity, { isExpanded ->
             toggleViewLayoutMenuItem.isVisible = !isExpanded
             toggleSearch(isExpanded)
         })
     }
 
-    private fun toggleSearch(isExpanded: Boolean) {
+    private fun PostListActivityBinding.toggleSearch(isExpanded: Boolean) {
         val tabContainer = findViewById<View>(R.id.tabContainer)
         val searchContainer = findViewById<View>(R.id.search_container)
 
         if (isExpanded) {
-            pager.visibility = View.GONE
+            postPager.visibility = View.GONE
             tabContainer.visibility = View.GONE
             searchContainer.visibility = View.VISIBLE
             if (!searchActionButton.isActionViewExpanded) {
                 searchActionButton.expandActionView()
             }
-            appbar_main.setLiftOnScrollTargetViewIdAndRequestLayout(R.id.posts_search_recycler_view_id)
+            appbarMain.setLiftOnScrollTargetViewIdAndRequestLayout(R.id.posts_search_recycler_view_id)
         } else {
-            pager.visibility = View.VISIBLE
+            postPager.visibility = View.VISIBLE
             tabContainer.visibility = View.VISIBLE
             searchContainer.visibility = View.GONE
             if (searchActionButton.isActionViewExpanded) {
                 searchActionButton.collapseActionView()
             }
-            appbar_main.getTag(R.id.posts_non_search_recycler_view_id_tag_key)?.let {
-                appbar_main.setLiftOnScrollTargetViewIdAndRequestLayout(it as Int)
+            appbarMain.getTag(R.id.posts_non_search_recycler_view_id_tag_key)?.let {
+                appbarMain.setLiftOnScrollTargetViewIdAndRequestLayout(it as Int)
             }
         }
     }
@@ -609,8 +599,10 @@ class PostsListActivity : LocaleAwareActivity(),
     }
 
     override fun onScrollableViewInitialized(containerId: Int) {
-        appbar_main.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
-        appbar_main.setTag(R.id.posts_non_search_recycler_view_id_tag_key, containerId)
+        with(binding!!) {
+            appbarMain.setLiftOnScrollTargetViewIdAndRequestLayout(containerId)
+            appbarMain.setTag(R.id.posts_non_search_recycler_view_id_tag_key, containerId)
+        }
     }
 
     companion object {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryFragment.kt
index caf831664546..204627684b00 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingAddCategoryFragment.kt
@@ -7,13 +7,12 @@ import android.text.TextWatcher
 import android.view.View
 import android.widget.AdapterView
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.add_category.*
-import kotlinx.android.synthetic.main.prepublishing_toolbar.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.AddCategoryBinding
+import org.wordpress.android.databinding.PrepublishingAddCategoryFragmentBinding
+import org.wordpress.android.databinding.PrepublishingToolbarBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.models.CategoryNode
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
@@ -22,6 +21,7 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.ActivityUtils
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.ToastUtils.Duration.SHORT
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class PrepublishingAddCategoryFragment : Fragment(R.layout.prepublishing_add_category_fragment) {
@@ -60,29 +60,31 @@ class PrepublishingAddCategoryFragment : Fragment(R.layout.prepublishing_add_cat
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initBackButton()
-        initSubmitButton()
-        initAdapter()
-        initSpinner()
-        initInputText()
-        initViewModel()
+        with(PrepublishingAddCategoryFragmentBinding.bind(view)) {
+            prepublishingToolbar.initBackButton()
+            addCategory.initSubmitButton()
+            addCategory.initAdapter()
+            addCategory.initSpinner()
+            addCategory.initInputText()
+            initViewModel()
+        }
     }
 
-    private fun initBackButton() {
-        back_button.setOnClickListener {
+    private fun PrepublishingToolbarBinding.initBackButton() {
+        backButton.setOnClickListener {
             viewModel.onBackButtonClick()
         }
     }
 
-    private fun initSubmitButton() {
-        submit_button.setOnClickListener {
+    private fun AddCategoryBinding.initSubmitButton() {
+        submitButton.setOnClickListener {
             viewModel.onSubmitButtonClick()
         }
     }
 
-    private fun initInputText() {
-        category_name.requestFocus()
-        category_name.addTextChangedListener(object : TextWatcher {
+    private fun AddCategoryBinding.initInputText() {
+        categoryName.requestFocus()
+        categoryName.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
             }
 
@@ -94,26 +96,26 @@ class PrepublishingAddCategoryFragment : Fragment(R.layout.prepublishing_add_cat
             }
         })
 
-        ActivityUtils.showKeyboard(category_name)
+        ActivityUtils.showKeyboard(categoryName)
     }
 
-    private fun initAdapter() {
+    private fun AddCategoryBinding.initAdapter() {
         val categoryAdapter = ParentCategorySpinnerAdapter(
                 activity,
                 R.layout.categories_row_parent,
                 arrayListOf<CategoryNode>()
         )
-        parent_category.adapter = categoryAdapter
+        parentCategory.adapter = categoryAdapter
     }
 
-    private fun initSpinner() {
-        parent_category.setOnTouchListener { v, _ ->
+    private fun AddCategoryBinding.initSpinner() {
+        parentCategory.setOnTouchListener { v, _ ->
             spinnerTouched = true
             v.performClick()
             false
         }
 
-        parent_category.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+        parentCategory.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
             override fun onNothingSelected(parent: AdapterView<*>?) {
             }
 
@@ -131,10 +133,10 @@ class PrepublishingAddCategoryFragment : Fragment(R.layout.prepublishing_add_cat
         }
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+    private fun PrepublishingAddCategoryFragmentBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@PrepublishingAddCategoryFragment, viewModelFactory)
                 .get(PrepublishingAddCategoryViewModel::class.java)
-        parentViewModel = ViewModelProviders.of(requireParentFragment(), viewModelFactory)
+        parentViewModel = ViewModelProvider(requireParentFragment(), viewModelFactory)
                 .get(PrepublishingViewModel::class.java)
 
         startObserving()
@@ -144,14 +146,12 @@ class PrepublishingAddCategoryFragment : Fragment(R.layout.prepublishing_add_cat
         viewModel.start(siteModel, !needsRequestLayout)
     }
 
-    private fun startObserving() {
-        viewModel.dismissKeyboard.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
-                ActivityUtils.hideKeyboardForced(category_name)
-            }
+    private fun PrepublishingAddCategoryFragmentBinding.startObserving() {
+        viewModel.dismissKeyboard.observeEvent(viewLifecycleOwner, {
+            ActivityUtils.hideKeyboardForced(addCategory.categoryName)
         })
 
-        viewModel.navigateBack.observe(viewLifecycleOwner, Observer { bundle ->
+        viewModel.navigateBack.observe(viewLifecycleOwner, { bundle ->
             val newBundle = Bundle()
             newBundle.putAll(arguments)
             bundle?.let {
@@ -160,42 +160,38 @@ class PrepublishingAddCategoryFragment : Fragment(R.layout.prepublishing_add_cat
             closeListener?.onBackClicked(newBundle)
         })
 
-        viewModel.toolbarTitleUiState.observe(viewLifecycleOwner, Observer { uiString ->
-            toolbar_title.text = uiHelpers.getTextOfUiString(requireContext(), uiString)
+        viewModel.toolbarTitleUiState.observe(viewLifecycleOwner, { uiString ->
+            prepublishingToolbar.toolbarTitle.text = uiHelpers.getTextOfUiString(requireContext(), uiString)
         })
 
-        viewModel.snackbarEvents.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                showToast()
-            }
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, {
+            it.showToast()
         })
 
-        viewModel.uiState.observe(viewLifecycleOwner, Observer { uiState ->
-            loadCategories(uiState.categories)
-            if (uiState.selectedParentCategoryPosition != parent_category.selectedItemPosition) {
-                parent_category.setSelection(uiState.selectedParentCategoryPosition)
+        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            addCategory.loadCategories(uiState.categories)
+            if (uiState.selectedParentCategoryPosition != addCategory.parentCategory.selectedItemPosition) {
+                addCategory.parentCategory.setSelection(uiState.selectedParentCategoryPosition)
             }
-            updateSubmitButton(uiState.submitButtonUiState)
+            addCategory.updateSubmitButton(uiState.submitButtonUiState)
         })
 
-        parentViewModel.triggerOnDeviceBackPressed.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let {
-                closeListener?.onBackClicked(arguments)
-            }
+        parentViewModel.triggerOnDeviceBackPressed.observeEvent(viewLifecycleOwner, {
+            closeListener?.onBackClicked(arguments)
         })
     }
 
-    private fun updateSubmitButton(submitButtonUiState: SubmitButtonUiState) {
-        with(submit_button) {
+    private fun AddCategoryBinding.updateSubmitButton(submitButtonUiState: SubmitButtonUiState) {
+        with(submitButton) {
             isEnabled = submitButtonUiState.enabled
         }
         with(uiHelpers) {
-            updateVisibility(submit_button, submitButtonUiState.visibility)
+            updateVisibility(submitButton, submitButtonUiState.visibility)
         }
     }
 
-    private fun loadCategories(categoryLevels: ArrayList<CategoryNode>) {
-        (parent_category.adapter as? ParentCategorySpinnerAdapter)?.replaceItems(categoryLevels)
+    private fun AddCategoryBinding.loadCategories(categoryLevels: ArrayList<CategoryNode>) {
+        (parentCategory.adapter as? ParentCategorySpinnerAdapter)?.replaceItems(categoryLevels)
     }
 
     private fun SnackbarMessageHolder.showToast() {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt
index c58906daeee8..52626cb944f8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingBottomSheetFragment.kt
@@ -12,17 +12,15 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import androidx.annotation.NonNull
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import kotlinx.android.synthetic.main.post_prepublishing_bottom_sheet.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.databinding.PostPrepublishingBottomSheetBinding
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.login.widgets.WPBottomSheetDialogFragment
+import org.wordpress.android.ui.WPBottomSheetDialogFragment
 import org.wordpress.android.ui.posts.PrepublishingHomeItemUiState.ActionType
 import org.wordpress.android.ui.posts.PrepublishingScreen.ADD_CATEGORY
 import org.wordpress.android.ui.posts.PrepublishingScreen.CATEGORIES
@@ -32,6 +30,7 @@ import org.wordpress.android.ui.posts.prepublishing.PrepublishingPublishSettings
 import org.wordpress.android.util.ActivityUtils
 import org.wordpress.android.util.KeyboardResizeViewUtil
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class PrepublishingBottomSheetFragment : WPBottomSheetDialogFragment(),
@@ -95,21 +94,23 @@ class PrepublishingBottomSheetFragment : WPBottomSheetDialogFragment(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initViewModel(savedInstanceState)
-        dialog?.setOnShowListener { dialogInterface ->
-            val sheetDialog = dialogInterface as? BottomSheetDialog
+        with(PostPrepublishingBottomSheetBinding.bind(view)) {
+            initViewModel(savedInstanceState)
+            dialog?.setOnShowListener { dialogInterface ->
+                val sheetDialog = dialogInterface as? BottomSheetDialog
 
-            val bottomSheet = sheetDialog?.findViewById<View>(
-                    com.google.android.material.R.id.design_bottom_sheet
-            ) as? FrameLayout
+                val bottomSheet = sheetDialog?.findViewById<View>(
+                        com.google.android.material.R.id.design_bottom_sheet
+                ) as? FrameLayout
 
-            bottomSheet?.let {
-                val behavior = BottomSheetBehavior.from(it)
-                behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                bottomSheet?.let {
+                    val behavior = BottomSheetBehavior.from(it)
+                    behavior.state = BottomSheetBehavior.STATE_EXPANDED
+                }
             }
+            setupMinimumHeightForFragmentContainer()
+            addWindowInsetToFragmentContainer()
         }
-        setupMinimumHeightForFragmentContainer()
-        addWindowInsetToFragmentContainer()
     }
 
     override fun onDismiss(dialog: DialogInterface) {
@@ -121,54 +122,48 @@ class PrepublishingBottomSheetFragment : WPBottomSheetDialogFragment(),
      * On Android 10, the bottom sheet is not above the window inset so that leads to the publish button being cut
      * off. To fix this, we add the bottom inset as the margin bottom of the fragment container.
      */
-    private fun addWindowInsetToFragmentContainer() {
-        if (VERSION.SDK_INT == VERSION_CODES.Q) {
+    private fun PostPrepublishingBottomSheetBinding.addWindowInsetToFragmentContainer() {
+        if (VERSION.SDK_INT >= VERSION_CODES.Q) {
             activity?.window?.decorView?.rootWindowInsets?.systemWindowInsetBottom?.let { bottomInset ->
-                val param = prepublishing_content_fragment.layoutParams as ViewGroup.MarginLayoutParams
+                val param = prepublishingContentFragment.layoutParams as ViewGroup.MarginLayoutParams
                 param.setMargins(0, 0, 0, bottomInset)
-                prepublishing_content_fragment.layoutParams = param
+                prepublishingContentFragment.layoutParams = param
             }
         }
     }
 
-    private fun setupMinimumHeightForFragmentContainer() {
+    private fun PostPrepublishingBottomSheetBinding.setupMinimumHeightForFragmentContainer() {
         val isPage = checkNotNull(arguments?.getBoolean(IS_PAGE)) {
             "arguments can't be null."
         }
 
         if (isPage) {
-            prepublishing_content_fragment.minimumHeight =
+            prepublishingContentFragment.minimumHeight =
                     resources.getDimensionPixelSize(R.dimen.prepublishing_fragment_container_min_height_for_page)
         } else {
-            prepublishing_content_fragment.minimumHeight =
+            prepublishingContentFragment.minimumHeight =
                     resources.getDimensionPixelSize(R.dimen.prepublishing_fragment_container_min_height)
         }
     }
 
     private fun initViewModel(savedInstanceState: Bundle?) {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(PrepublishingViewModel::class.java)
 
-        viewModel.navigationTarget.observe(this, Observer { event ->
-            event.getContentIfNotHandled()?.let { navigationState ->
-                navigateToScreen(navigationState)
-            }
+        viewModel.navigationTarget.observeEvent(this, { navigationState ->
+            navigateToScreen(navigationState)
         })
 
-        viewModel.dismissBottomSheet.observe(this, Observer { event ->
-            event.applyIfNotHandled { dismiss() }
+        viewModel.dismissBottomSheet.observeEvent(this, {
+            dismiss()
         })
 
-        viewModel.triggerOnSubmitButtonClickedListener.observe(this, Observer { event ->
-            event.getContentIfNotHandled()?.let { publishPost ->
-                prepublishingBottomSheetListener?.onSubmitButtonClicked(publishPost)
-            }
+        viewModel.triggerOnSubmitButtonClickedListener.observeEvent(this, { publishPost ->
+            prepublishingBottomSheetListener?.onSubmitButtonClicked(publishPost)
         })
 
-        viewModel.dismissKeyboard.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                ActivityUtils.hideKeyboardForced(view)
-            }
+        viewModel.dismissKeyboard.observeEvent(this, {
+            ActivityUtils.hideKeyboardForced(view)
         })
 
         val prepublishingScreenState = savedInstanceState?.getParcelable<PrepublishingScreen>(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesAdapter.kt
index fac3e2a97519..1bf09d48fcea 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesAdapter.kt
@@ -9,13 +9,13 @@ import org.wordpress.android.ui.posts.PrepublishingCategoriesViewModel.Prepublis
 import org.wordpress.android.ui.utils.UiHelpers
 
 class PrepublishingCategoriesAdapter(private val uiHelpers: UiHelpers) :
-        RecyclerView.Adapter<PrepublishingCategoriesViewHolder>() {
+        RecyclerView.Adapter<PrepublishingCategoriesViewHolder<*>>() {
     private val items = mutableListOf<PrepublishingCategoriesListItemUiState>()
 
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
-    ): PrepublishingCategoriesViewHolder {
+    ): PrepublishingCategoriesViewHolder<*> {
         return PrepublishingCategoriesListItemViewHolder(parent, uiHelpers)
     }
 
@@ -25,8 +25,8 @@ class PrepublishingCategoriesAdapter(private val uiHelpers: UiHelpers) :
         return position.toLong()
     }
 
-    override fun onBindViewHolder(holder: PrepublishingCategoriesViewHolder, position: Int) {
-        holder.onBind(items[position])
+    override fun onBindViewHolder(holder: PrepublishingCategoriesViewHolder<*>, position: Int) {
+        holder.onBind(items[position], position)
     }
 
     @MainThread
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesFragment.kt
index 1773ab740f22..7b44d87935fd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesFragment.kt
@@ -4,20 +4,19 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.prepublishing_categories_fragment.*
-import kotlinx.android.synthetic.main.prepublishing_toolbar.*
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode.MAIN
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PrepublishingCategoriesFragmentBinding
+import org.wordpress.android.databinding.PrepublishingToolbarBinding
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.TaxonomyStore.OnTaxonomyChanged
 import org.wordpress.android.fluxc.store.TaxonomyStore.OnTermUploaded
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.posts.EditPostSettingsFragment.EditPostActivityHook
@@ -25,6 +24,7 @@ import org.wordpress.android.ui.posts.PrepublishingHomeItemUiState.ActionType.AD
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.ToastUtils.Duration.SHORT
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class PrepublishingCategoriesFragment : Fragment(R.layout.prepublishing_categories_fragment) {
@@ -75,43 +75,45 @@ class PrepublishingCategoriesFragment : Fragment(R.layout.prepublishing_categori
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initBackButton()
-        initAddCategoryButton()
-        initRecyclerView()
-        initViewModel()
+        with(PrepublishingCategoriesFragmentBinding.bind(view)) {
+            includePrepublishingToolbar.initBackButton()
+            includePrepublishingToolbar.initAddCategoryButton()
+            initRecyclerView()
+            initViewModel()
+        }
     }
 
-    private fun initBackButton() {
-        back_button.setOnClickListener {
+    private fun PrepublishingToolbarBinding.initBackButton() {
+        backButton.setOnClickListener {
             viewModel.onBackButtonClick()
         }
     }
 
-    private fun initAddCategoryButton() {
-        add_action_button.setOnClickListener {
+    private fun PrepublishingToolbarBinding.initAddCategoryButton() {
+        addActionButton.setOnClickListener {
             viewModel.onAddCategoryClick()
         }
     }
 
-    private fun initRecyclerView() {
-        recycler_view.layoutManager = LinearLayoutManager(
+    private fun PrepublishingCategoriesFragmentBinding.initRecyclerView() {
+        recyclerView.layoutManager = LinearLayoutManager(
                 context,
                 RecyclerView.VERTICAL,
                 false
         )
-        recycler_view.adapter = PrepublishingCategoriesAdapter(uiHelpers)
-        recycler_view.addItemDecoration(
+        recyclerView.adapter = PrepublishingCategoriesAdapter(uiHelpers)
+        recyclerView.addItemDecoration(
                 DividerItemDecoration(
-                        recycler_view.context,
+                        recyclerView.context,
                         DividerItemDecoration.VERTICAL
                 )
         )
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+    private fun PrepublishingCategoriesFragmentBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@PrepublishingCategoriesFragment, viewModelFactory)
                 .get(PrepublishingCategoriesViewModel::class.java)
-        parentViewModel = ViewModelProviders.of(requireParentFragment(), viewModelFactory)
+        parentViewModel = ViewModelProvider(requireParentFragment(), viewModelFactory)
                 .get(PrepublishingViewModel::class.java)
         startObserving()
         val siteModel = requireArguments().getSerializable(WordPress.SITE) as SiteModel
@@ -123,42 +125,36 @@ class PrepublishingCategoriesFragment : Fragment(R.layout.prepublishing_categori
         viewModel.start(getEditPostRepository(), siteModel, addCategoryRequest, selectedCategoryIds)
     }
 
-    private fun startObserving() {
-        viewModel.navigateToHomeScreen.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
-                closeListener?.onBackClicked()
-            }
+    private fun PrepublishingCategoriesFragmentBinding.startObserving() {
+        viewModel.navigateToHomeScreen.observeEvent(viewLifecycleOwner, {
+            closeListener?.onBackClicked()
         })
 
-        viewModel.navigateToAddCategoryScreen.observe(viewLifecycleOwner, Observer { bundle ->
+        viewModel.navigateToAddCategoryScreen.observe(viewLifecycleOwner, { bundle ->
             actionListener?.onActionClicked(ADD_CATEGORY, bundle)
         }
         )
 
-        viewModel.toolbarTitleUiState.observe(viewLifecycleOwner, Observer { uiString ->
-            toolbar_title.text = uiHelpers.getTextOfUiString(requireContext(), uiString)
+        viewModel.toolbarTitleUiState.observe(viewLifecycleOwner, { uiString ->
+            includePrepublishingToolbar.toolbarTitle.text = uiHelpers.getTextOfUiString(requireContext(), uiString)
         })
 
-        viewModel.snackbarEvents.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
-                showToast()
-            }
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, {
+            it.showToast()
         })
 
-        viewModel.uiState.observe(viewLifecycleOwner, Observer {
-            (recycler_view.adapter as PrepublishingCategoriesAdapter).update(
+        viewModel.uiState.observe(viewLifecycleOwner, {
+            (recyclerView.adapter as PrepublishingCategoriesAdapter).update(
                     it.categoriesListItemUiState
             )
             with(uiHelpers) {
-                updateVisibility(add_action_button, it.addCategoryActionButtonVisibility)
-                updateVisibility(progress_loading, it.progressVisibility)
-                updateVisibility(recycler_view, it.categoryListVisibility)
+                updateVisibility(includePrepublishingToolbar.addActionButton, it.addCategoryActionButtonVisibility)
+                updateVisibility(progressLoading, it.progressVisibility)
+                updateVisibility(recyclerView, it.categoryListVisibility)
             }
         })
-        parentViewModel.triggerOnDeviceBackPressed.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let {
-                viewModel.onBackButtonClick()
-            }
+        parentViewModel.triggerOnDeviceBackPressed.observeEvent(viewLifecycleOwner, {
+            viewModel.onBackButtonClick()
         })
     }
 
@@ -214,4 +210,10 @@ class PrepublishingCategoriesFragment : Fragment(R.layout.prepublishing_categori
     fun onTermUploaded(event: OnTermUploaded) {
         viewModel.onTermUploadedComplete(event)
     }
+
+    @SuppressWarnings("unused")
+    @Subscribe(threadMode = MAIN)
+    fun onTaxonomyChanged(event: OnTaxonomyChanged) {
+        viewModel.onTaxonomyChanged(event)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewHolder.kt
index 9d2b10cb477e..141c1016234a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewHolder.kt
@@ -1,58 +1,46 @@
 package org.wordpress.android.ui.posts
 
-import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.prepublishing_categories_row.view.*
+import androidx.viewbinding.ViewBinding
 import org.apache.commons.text.StringEscapeUtils
-import org.wordpress.android.R
+import org.wordpress.android.databinding.PrepublishingCategoriesRowBinding
 import org.wordpress.android.ui.posts.PrepublishingCategoriesViewModel.PrepublishingCategoriesListItemUiState
 import org.wordpress.android.ui.utils.UiDimen.UIDimenRes
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.viewBinding
 
-sealed class PrepublishingCategoriesViewHolder(
-    internal val parent: ViewGroup,
-    @LayoutRes layout: Int
-) : RecyclerView.ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
-    abstract fun onBind(uiState: PrepublishingCategoriesListItemUiState)
+sealed class PrepublishingCategoriesViewHolder<T : ViewBinding>(
+    internal val binding: T
+) : RecyclerView.ViewHolder(binding.root) {
+    abstract fun onBind(uiState: PrepublishingCategoriesListItemUiState, position: Int)
 
     class PrepublishingCategoriesListItemViewHolder(
         parentView: ViewGroup,
         private val uiHelpers: UiHelpers
-    ) : PrepublishingCategoriesViewHolder(
-            parentView,
-            R.layout.prepublishing_categories_row
+    ) : PrepublishingCategoriesViewHolder<PrepublishingCategoriesRowBinding>(
+            parentView.viewBinding(PrepublishingCategoriesRowBinding::inflate)
     ) {
-        private val container = itemView.prepublishing_category_row_layout
-        private val categoryName = itemView.prepublishing_category_text
-        private val categoryCheckBox = itemView.prepublishing_category_check
-        private var onCategorySelected: ((Int) -> Unit)? = null
-
-        init {
-            container.setOnClickListener {
-                onCategorySelected?.invoke(adapterPosition)
+        override fun onBind(uiState: PrepublishingCategoriesListItemUiState, position: Int) = with(binding) {
+            prepublishingCategoryRowLayout.setOnClickListener {
+                uiState.onItemTapped(position)
             }
-            categoryCheckBox.setOnClickListener {
-                onCategorySelected?.invoke(adapterPosition)
+            prepublishingCategoryText.text = StringEscapeUtils.unescapeHtml4(uiState.categoryNode.name)
+            prepublishingCategoryCheck.isChecked = uiState.checked
+            prepublishingCategoryCheck.setOnClickListener {
+                uiState.onItemTapped(position)
             }
-        }
-
-        override fun onBind(uiState: PrepublishingCategoriesListItemUiState) {
-            onCategorySelected = requireNotNull(uiState.onItemTapped) { "OnItemTapped is required" }
-            categoryName.text = StringEscapeUtils.unescapeHtml4(uiState.categoryNode.name)
-            categoryCheckBox.isChecked = uiState.checked
             val verticalPadding: Int = uiHelpers.getPxOfUiDimen(
-                    categoryName.context,
+                    prepublishingCategoryText.context,
                     UIDimenRes(uiState.verticalPaddingResId)
             )
             val horizontalPadding: Int = uiHelpers.getPxOfUiDimen(
-                    categoryName.context,
+                    prepublishingCategoryText.context,
                     UIDimenRes(uiState.horizontalPaddingResId)
             )
             ViewCompat.setPaddingRelative(
-                    categoryName,
+                    prepublishingCategoryText,
                     horizontalPadding * uiState.categoryNode.level,
                     verticalPadding,
                     horizontalPadding,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewModel.kt
index 1e2744dadcf0..57504a1fd18e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingCategoriesViewModel.kt
@@ -7,12 +7,13 @@ import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.fluxc.action.TaxonomyAction
 import org.wordpress.android.fluxc.model.PostImmutableModel
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.TaxonomyStore.OnTaxonomyChanged
 import org.wordpress.android.fluxc.store.TaxonomyStore.OnTermUploaded
 import org.wordpress.android.models.CategoryNode
 import org.wordpress.android.modules.BG_THREAD
@@ -21,6 +22,8 @@ import org.wordpress.android.ui.posts.EditPostRepository.UpdatePostResult
 import org.wordpress.android.ui.posts.EditPostRepository.UpdatePostResult.Updated
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.Event
@@ -40,6 +43,7 @@ class PrepublishingCategoriesViewModel @Inject constructor(
     private lateinit var siteModel: SiteModel
     private var updateCategoriesJob: Job? = null
     private var addCategoryJob: Job? = null
+    private lateinit var selectedCategoryIds: List<Long>
 
     private val _navigateToHomeScreen = MutableLiveData<Event<Unit>>()
     val navigateToHomeScreen: LiveData<Event<Unit>> = _navigateToHomeScreen
@@ -64,19 +68,32 @@ class PrepublishingCategoriesViewModel @Inject constructor(
     ) {
         this.editPostRepository = editPostRepository
         this.siteModel = siteModel
+        this.selectedCategoryIds = selectedCategoryIds
 
         if (isStarted) return
         isStarted = true
 
-        initialize(addCategoryRequest, selectedCategoryIds)
+        initialize(addCategoryRequest)
     }
 
     private fun initialize(
-        addCategoryRequest: PrepublishingAddCategoryRequest?,
-        selectedCategoryIds: List<Long>
+        addCategoryRequest: PrepublishingAddCategoryRequest?
     ) {
         setToolbarTitleUiState()
 
+        updateCategoriesListItemUiState(addCategoryRequest)
+
+        addCategoryRequest?.let {
+            addCategoryJob?.cancel()
+            addCategoryJob = launch(bgDispatcher) {
+                addCategoryUseCase.addCategory(it.categoryText, it.categoryParentId, siteModel)
+            }
+        } ?: run {
+            getCategoriesUseCase.fetchSiteCategories(siteModel)
+        }
+    }
+
+    private fun updateCategoriesListItemUiState(addCategoryRequest: PrepublishingAddCategoryRequest? = null) {
         val selectedIds = if (selectedCategoryIds.isNotEmpty()) {
             selectedCategoryIds
         } else {
@@ -90,13 +107,6 @@ class PrepublishingCategoriesViewModel @Inject constructor(
                         selectedCategoryIds = selectedIds
                 ), progressVisibility = addCategoryRequest != null
         )
-
-        addCategoryRequest?.let {
-            addCategoryJob?.cancel()
-            addCategoryJob = launch(bgDispatcher) {
-                addCategoryUseCase.addCategory(it.categoryText, it.categoryParentId, siteModel)
-            }
-        }
     }
 
     private fun setToolbarTitleUiState() {
@@ -155,7 +165,7 @@ class PrepublishingCategoriesViewModel @Inject constructor(
             getCategoriesUseCase.getSiteCategories(siteModel)
 
     private fun getPostCategories() =
-            getCategoriesUseCase.getPostCategories(editPostRepository, siteModel)
+            getCategoriesUseCase.getPostCategories(editPostRepository)
 
     private fun hasChanges(): Boolean {
         val postCategories = getPostCategories()
@@ -217,6 +227,17 @@ class PrepublishingCategoriesViewModel @Inject constructor(
         }
     }
 
+    fun onTaxonomyChanged(event: OnTaxonomyChanged) {
+        if (event.isError) {
+            AppLog.e(T.POSTS, "An error occurred while updating taxonomy with type: " + event.error.type)
+            return
+        }
+
+        if (event.causeOfChange == TaxonomyAction.FETCH_CATEGORIES) {
+            updateCategoriesListItemUiState()
+        }
+    }
+
     // State UI modifiers
     private fun getUpdatedListState(
         position: Int,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeFragment.kt
index 3bd0dd8b789e..a4bcbe0b6133 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeFragment.kt
@@ -2,24 +2,21 @@ package org.wordpress.android.ui.posts
 
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
-import kotlinx.android.synthetic.main.post_prepublishing_home_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.PostPrepublishingHomeFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.posts.EditPostSettingsFragment.EditPostActivityHook
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
-class PrepublishingHomeFragment : Fragment() {
+class PrepublishingHomeFragment : Fragment(R.layout.post_prepublishing_home_fragment) {
     @Inject lateinit var uiHelpers: UiHelpers
     @Inject lateinit var imageManager: ImageManager
 
@@ -43,21 +40,14 @@ class PrepublishingHomeFragment : Fragment() {
         actionClickedListener = null
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.post_prepublishing_home_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        actions_recycler_view.layoutManager = LinearLayoutManager(requireActivity())
-        actions_recycler_view.adapter = PrepublishingHomeAdapter(requireActivity())
+        with(PostPrepublishingHomeFragmentBinding.bind(view)) {
+            actionsRecyclerView.layoutManager = LinearLayoutManager(requireActivity())
+            actionsRecyclerView.adapter = PrepublishingHomeAdapter(requireActivity())
 
-        initViewModel()
+            initViewModel()
+        }
     }
 
     override fun onResume() {
@@ -70,29 +60,25 @@ class PrepublishingHomeFragment : Fragment() {
         super.onResume()
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+    private fun PostPrepublishingHomeFragmentBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@PrepublishingHomeFragment, viewModelFactory)
                 .get(PrepublishingHomeViewModel::class.java)
 
-        viewModel.storyTitleUiState.observe(viewLifecycleOwner, Observer { storyTitleUiState ->
-            uiHelpers.updateVisibility(story_title_header_view, true)
-            story_title_header_view.init(uiHelpers, imageManager, storyTitleUiState)
+        viewModel.storyTitleUiState.observe(viewLifecycleOwner, { storyTitleUiState ->
+            uiHelpers.updateVisibility(storyTitleHeaderView, true)
+            storyTitleHeaderView.init(uiHelpers, imageManager, storyTitleUiState)
         })
 
-        viewModel.uiState.observe(viewLifecycleOwner, Observer { uiState ->
-            (actions_recycler_view.adapter as PrepublishingHomeAdapter).update(uiState)
+        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            (actionsRecyclerView.adapter as PrepublishingHomeAdapter).update(uiState)
         })
 
-        viewModel.onActionClicked.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let { actionType ->
-                actionClickedListener?.onActionClicked(actionType)
-            }
+        viewModel.onActionClicked.observeEvent(viewLifecycleOwner, { actionType ->
+            actionClickedListener?.onActionClicked(actionType)
         })
 
-        viewModel.onSubmitButtonClicked.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let { publishPost ->
-                actionClickedListener?.onSubmitButtonClicked(publishPost)
-            }
+        viewModel.onSubmitButtonClicked.observeEvent(viewLifecycleOwner, { publishPost ->
+            actionClickedListener?.onSubmitButtonClicked(publishPost)
         })
 
         val isStoryPost = checkNotNull(arguments?.getBoolean(IS_STORY_POST)) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModel.kt
index bf9498c14262..0bf8a86610d0 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModel.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.model.SiteModel
@@ -134,8 +133,9 @@ class PrepublishingHomeViewModel @Inject constructor(
                         editPostRepository,
                         site
                 )
-                if (categoryString.isNotEmpty())
+                if (categoryString.isNotEmpty()) {
                     UiStringText(categoryString)
+                }
             } else {
                 UiStringRes(R.string.prepublishing_nudges_home_categories_not_set)
             }
@@ -157,8 +157,9 @@ class PrepublishingHomeViewModel @Inject constructor(
             ))
 
             add(getButtonUiStateUseCase.getUiState(editPostRepository, site) { publishPost ->
-                analyticsTrackerWrapper.trackPrepublishingNudges(Stat.EDITOR_POST_PUBLISH_NOW_TAPPED)
-                _onSubmitButtonClicked.postValue(Event(publishPost))
+                launch(bgDispatcher) {
+                    waitForStoryTitleJobAndSubmit(publishPost)
+                }
             })
         }.toList()
 
@@ -176,6 +177,12 @@ class PrepublishingHomeViewModel @Inject constructor(
         }
     }
 
+    private suspend fun waitForStoryTitleJobAndSubmit(publishPost: PublishPost) {
+        updateStoryTitleJob?.join()
+        analyticsTrackerWrapper.trackPrepublishingNudges(Stat.EDITOR_POST_PUBLISH_NOW_TAPPED)
+        _onSubmitButtonClicked.postValue(Event(publishPost))
+    }
+
     override fun onCleared() {
         super.onCleared()
         updateStoryTitleJob?.cancel()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingTagsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingTagsFragment.kt
index 6d589b60792c..498127009a81 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingTagsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PrepublishingTagsFragment.kt
@@ -3,19 +3,17 @@ package org.wordpress.android.ui.posts
 import android.content.Context
 import android.os.Bundle
 import android.view.View
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.fragment_post_settings_tags.*
-import kotlinx.android.synthetic.main.prepublishing_toolbar.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.databinding.PrepublishingTagsFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.posts.EditPostSettingsFragment.EditPostActivityHook
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.ActivityUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class PrepublishingTagsFragment : TagsFragment(), TagsSelectedListener {
@@ -60,11 +58,13 @@ class PrepublishingTagsFragment : TagsFragment(), TagsSelectedListener {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        back_button.setOnClickListener {
-            trackTagsChangedEvent()
-            viewModel.onBackButtonClicked()
+        with(PrepublishingTagsFragmentBinding.bind(view)) {
+            prepublishingToolbar.backButton.setOnClickListener {
+                trackTagsChangedEvent()
+                viewModel.onBackButtonClicked()
+            }
+            initViewModel()
         }
-        initViewModel()
         super.onViewCreated(view, savedInstanceState)
     }
 
@@ -82,24 +82,20 @@ class PrepublishingTagsFragment : TagsFragment(), TagsSelectedListener {
         super.onResume()
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+    private fun PrepublishingTagsFragmentBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@PrepublishingTagsFragment, viewModelFactory)
                 .get(PrepublishingTagsViewModel::class.java)
 
-        viewModel.dismissKeyboard.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
-                ActivityUtils.hideKeyboardForced(tags_edit_text)
-            }
+        viewModel.dismissKeyboard.observeEvent(viewLifecycleOwner, {
+            ActivityUtils.hideKeyboardForced(fragmentPostSettingsTags.tagsEditText)
         })
 
-        viewModel.navigateToHomeScreen.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
-                closeListener?.onBackClicked()
-            }
+        viewModel.navigateToHomeScreen.observeEvent(viewLifecycleOwner, {
+            closeListener?.onBackClicked()
         })
 
-        viewModel.toolbarTitleUiState.observe(viewLifecycleOwner, Observer { uiString ->
-            toolbar_title.text = uiHelpers.getTextOfUiString(requireContext(), uiString)
+        viewModel.toolbarTitleUiState.observe(viewLifecycleOwner, { uiString ->
+            prepublishingToolbar.toolbarTitle.text = uiHelpers.getTextOfUiString(requireContext(), uiString)
         })
 
         val needsRequestLayout = requireArguments().getBoolean(NEEDS_REQUEST_LAYOUT)
@@ -107,8 +103,10 @@ class PrepublishingTagsFragment : TagsFragment(), TagsSelectedListener {
     }
 
     private fun getEditPostRepository(): EditPostRepository {
-        val editPostActivityHook = requireNotNull(getEditPostActivityHook()) { "This is possibly null because it's " +
-                "called during config changes." }
+        val editPostActivityHook = requireNotNull(getEditPostActivityHook()) {
+            "This is possibly null because it's " +
+                    "called during config changes."
+        }
 
         return editPostActivityHook.editPostRepository
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishNotificationReceiver.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishNotificationReceiver.kt
index 60fe3814ef3d..7cbc5085ca08 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishNotificationReceiver.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishNotificationReceiver.kt
@@ -28,7 +28,7 @@ class PublishNotificationReceiver : BroadcastReceiver() {
                     .setContentTitle(uiModel.title)
                     .setContentText(uiModel.message)
                     .setAutoCancel(true)
-                    .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
+                    .setSmallIcon(R.drawable.ic_app_white_24dp)
                     .setDeleteIntent(
                             NotificationsProcessingService.getPendingIntentForNotificationDismiss(
                                     context,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsFragment.kt
index c71a85c2c506..6cf5c9057c8e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsFragment.kt
@@ -17,7 +17,6 @@ import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.core.app.NotificationManagerCompat
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
 import kotlinx.android.parcel.Parcelize
 import org.wordpress.android.R
@@ -29,6 +28,7 @@ import org.wordpress.android.util.AccessibilityUtils
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.ToastUtils.Duration.SHORT
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 abstract class PublishSettingsFragment : Fragment() {
@@ -62,25 +62,21 @@ abstract class PublishSettingsFragment : Fragment() {
 
         setupContent(rootView, viewModel)
 
-        viewModel.onDatePicked.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                showPostTimeSelectionDialog()
-            }
+        viewModel.onDatePicked.observeEvent(viewLifecycleOwner, {
+            showPostTimeSelectionDialog()
         })
-        viewModel.onPublishedDateChanged.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let { date ->
-                viewModel.updatePost(date, getPostRepository())
-                trackPostScheduled()
-            }
+        viewModel.onPublishedDateChanged.observeEvent(viewLifecycleOwner, { date ->
+            viewModel.updatePost(date, getPostRepository())
+            trackPostScheduled()
         })
-        viewModel.onNotificationTime.observe(viewLifecycleOwner, Observer {
+        viewModel.onNotificationTime.observe(viewLifecycleOwner, {
             it?.let { notificationTime ->
                 getPostRepository()?.let { postRepository ->
                     viewModel.scheduleNotification(postRepository, notificationTime)
                 }
             }
         })
-        viewModel.onUiModel.observe(viewLifecycleOwner, Observer {
+        viewModel.onUiModel.observe(viewLifecycleOwner, {
             it?.let { uiModel ->
                 dateAndTime.text = uiModel.publishDateLabel
                 publishNotificationTitle.isEnabled = uiModel.notificationEnabled
@@ -108,53 +104,45 @@ abstract class PublishSettingsFragment : Fragment() {
                 addToCalendarContainer.visibility = if (uiModel.notificationVisible) View.VISIBLE else View.GONE
             }
         })
-        viewModel.onShowNotificationDialog.observe(viewLifecycleOwner, Observer {
-            it?.getContentIfNotHandled()?.let { notificationTime ->
-                showNotificationTimeSelectionDialog(notificationTime)
-            }
+        viewModel.onShowNotificationDialog.observeEvent(viewLifecycleOwner, { notificationTime ->
+            showNotificationTimeSelectionDialog(notificationTime)
         })
-        viewModel.onToast.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                ToastUtils.showToast(
-                        context,
-                        this,
-                        SHORT,
-                        Gravity.TOP
-                )
-            }
+        viewModel.onToast.observeEvent(viewLifecycleOwner, {
+            ToastUtils.showToast(
+                    context,
+                    it,
+                    SHORT,
+                    Gravity.TOP
+            )
         })
-        viewModel.onNotificationAdded.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let { notification ->
-                activity?.let {
-                    NotificationManagerCompat.from(it).cancel(notification.id)
-                    val notificationIntent = Intent(it, PublishNotificationReceiver::class.java)
-                    notificationIntent.putExtra(PublishNotificationReceiver.NOTIFICATION_ID, notification.id)
-                    val pendingIntent = PendingIntent.getBroadcast(
-                            it,
-                            notification.id,
-                            notificationIntent,
-                            PendingIntent.FLAG_CANCEL_CURRENT
-                    )
-
-                    val alarmManager = it.getSystemService(ALARM_SERVICE) as AlarmManager
-                    alarmManager.set(
-                            AlarmManager.RTC_WAKEUP,
-                            notification.scheduledTime,
-                            pendingIntent
-                    )
-                }
+        viewModel.onNotificationAdded.observeEvent(viewLifecycleOwner, { notification ->
+            activity?.let {
+                NotificationManagerCompat.from(it).cancel(notification.id)
+                val notificationIntent = Intent(it, PublishNotificationReceiver::class.java)
+                notificationIntent.putExtra(PublishNotificationReceiver.NOTIFICATION_ID, notification.id)
+                val pendingIntent = PendingIntent.getBroadcast(
+                        it,
+                        notification.id,
+                        notificationIntent,
+                        PendingIntent.FLAG_CANCEL_CURRENT
+                )
+
+                val alarmManager = it.getSystemService(ALARM_SERVICE) as AlarmManager
+                alarmManager.set(
+                        AlarmManager.RTC_WAKEUP,
+                        notification.scheduledTime,
+                        pendingIntent
+                )
             }
         })
-        viewModel.onAddToCalendar.observe(viewLifecycleOwner, Observer {
-            it?.getContentIfNotHandled()?.let { calendarEvent ->
-                val calIntent = Intent(Intent.ACTION_INSERT)
-                calIntent.data = Events.CONTENT_URI
-                calIntent.type = "vnd.android.cursor.item/event"
-                calIntent.putExtra(Events.TITLE, calendarEvent.title)
-                calIntent.putExtra(Events.DESCRIPTION, calendarEvent.description)
-                calIntent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, calendarEvent.startTime)
-                startActivity(calIntent)
-            }
+        viewModel.onAddToCalendar.observeEvent(viewLifecycleOwner, { calendarEvent ->
+            val calIntent = Intent(Intent.ACTION_INSERT)
+            calIntent.data = Events.CONTENT_URI
+            calIntent.type = "vnd.android.cursor.item/event"
+            calIntent.putExtra(Events.TITLE, calendarEvent.title)
+            calIntent.putExtra(Events.DESCRIPTION, calendarEvent.description)
+            calIntent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, calendarEvent.startTime)
+            startActivity(calIntent)
         })
         viewModel.start(getPostRepository())
         return rootView
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/ImageEditorInitializer.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/ImageEditorInitializer.kt
index 6d3b7778acb7..d3715dabcd0f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/ImageEditorInitializer.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/ImageEditorInitializer.kt
@@ -35,11 +35,11 @@ class ImageEditorInitializer {
             imageManager: ImageManager,
             imageEditorTracker: ImageEditorTracker,
             imageEditorFileUtils: ImageEditorFileUtils,
-            defaultScope: CoroutineScope
+            appScope: CoroutineScope
         ) {
             // Delete old output images
             val mediaEditingDirectoryPath = WordPress.getContext().cacheDir.path + "/" + MEDIA_EDITING
-            defaultScope.launch {
+            appScope.launch {
                 imageEditorFileUtils.deleteFilesOlderThanDurationFromDirectory(mediaEditingDirectoryPath, ONE_WEEK)
             }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StorePostViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StorePostViewModel.kt
index 212a203e605d..b972ba70c006 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StorePostViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StorePostViewModel.kt
@@ -7,13 +7,17 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
 import org.wordpress.android.editor.gutenberg.DialogVisibility
 import org.wordpress.android.editor.gutenberg.DialogVisibility.Hidden
 import org.wordpress.android.editor.gutenberg.DialogVisibility.Showing
 import org.wordpress.android.editor.gutenberg.DialogVisibilityProvider
+import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.PostImmutableModel
 import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.PostStore.OnPostChanged
+import org.wordpress.android.fluxc.store.PostStore.OnPostUploaded
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.posts.EditPostRepository
@@ -37,13 +41,14 @@ private const val MAX_UNSAVED_POSTS = 50
 
 class StorePostViewModel
 @Inject constructor(
-    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
+    @Named(UI_THREAD) private val uiCoroutineDispatcher: CoroutineDispatcher,
     private val siteStore: SiteStore,
     private val postUtils: PostUtilsWrapper,
     private val uploadService: UploadServiceFacade,
     private val savePostToDbUseCase: SavePostToDbUseCase,
-    private val networkUtils: NetworkUtilsWrapper
-) : ScopedViewModel(mainDispatcher), DialogVisibilityProvider {
+    private val networkUtils: NetworkUtilsWrapper,
+    private val dispatcher: Dispatcher
+) : ScopedViewModel(uiCoroutineDispatcher), DialogVisibilityProvider {
     private var debounceCounter = 0
     private var saveJob: Job? = null
     private val _onSavePostTriggered = MutableLiveData<Event<Unit>>()
@@ -57,6 +62,15 @@ class StorePostViewModel
     }
     override val savingInProgressDialogVisibility: LiveData<DialogVisibility> = _savingProgressDialogVisibility
 
+    init {
+        dispatcher.register(this)
+    }
+
+    override fun onCleared() {
+        dispatcher.unregister(this)
+        super.onCleared()
+    }
+
     fun savePostOnline(
         isFirstTimePublish: Boolean,
         context: Context,
@@ -160,17 +174,29 @@ class StorePostViewModel
         return titleChanged || contentChanged
     }
 
-    fun showSaveProgressDialog() {
+    fun showSavingProgressDialog() {
         _savingProgressDialogVisibility.postValue(Showing)
     }
 
-    fun finish(state: ActivityFinishState) {
+    fun hideSavingProgressDialog() {
         _savingProgressDialogVisibility.postValue(Hidden)
+    }
+
+    fun finish(state: ActivityFinishState) {
+        hideSavingProgressDialog()
         _onFinish.postValue(Event(state))
     }
 
-    fun hideSavingDialog() {
-        _savingProgressDialogVisibility.postValue(Hidden)
+    @SuppressWarnings("unused")
+    @Subscribe
+    fun onPostUploaded(event: OnPostUploaded) {
+        hideSavingProgressDialog()
+    }
+
+    @SuppressWarnings("unused")
+    @Subscribe
+    fun onPostChanged(event: OnPostChanged) {
+        hideSavingProgressDialog()
     }
 
     sealed class UpdateResult {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StoriesEventListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StoriesEventListener.kt
index b8559f5a8bf0..32bd2a32961c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StoriesEventListener.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StoriesEventListener.kt
@@ -1,7 +1,6 @@
 package org.wordpress.android.ui.posts.editor
 
 import android.app.Activity
-import android.content.DialogInterface
 import android.net.Uri
 import androidx.appcompat.app.AlertDialog.Builder
 import androidx.lifecycle.Lifecycle
@@ -13,7 +12,9 @@ import com.wordpress.stories.compose.frame.StorySaveEvents.FrameSaveCompleted
 import com.wordpress.stories.compose.frame.StorySaveEvents.FrameSaveFailed
 import com.wordpress.stories.compose.frame.StorySaveEvents.FrameSaveProgress
 import com.wordpress.stories.compose.frame.StorySaveEvents.FrameSaveStart
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveProcessStart
 import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult
+import com.wordpress.stories.compose.story.StoryIndex
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
@@ -24,6 +25,7 @@ import org.wordpress.android.editor.EditorMediaUploadListener
 import org.wordpress.android.editor.gutenberg.StorySaveMediaListener
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.MediaModel
 import org.wordpress.android.fluxc.model.MediaModel.MediaUploadState.UPLOADED
 import org.wordpress.android.fluxc.model.SiteModel
@@ -31,9 +33,10 @@ import org.wordpress.android.fluxc.store.MediaStore
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.posts.EditPostRepository
 import org.wordpress.android.ui.posts.editor.media.EditorMedia
-import org.wordpress.android.ui.stories.SaveStoryGutenbergBlockUseCase.Companion.TEMPORARY_ID_PREFIX
+import org.wordpress.android.ui.posts.editor.media.EditorMediaListener
 import org.wordpress.android.ui.stories.StoryRepositoryWrapper
 import org.wordpress.android.ui.stories.media.StoryMediaSaveUploadBridge.StoryFrameMediaModelCreatedEvent
+import org.wordpress.android.ui.stories.prefs.StoriesPrefs
 import org.wordpress.android.ui.stories.usecase.LoadStoryFromStoriesPrefsUseCase
 import org.wordpress.android.ui.uploads.UploadService
 import org.wordpress.android.util.AppLog
@@ -41,7 +44,6 @@ import org.wordpress.android.util.AppLog.T.MEDIA
 import org.wordpress.android.util.EventBusWrapper
 import org.wordpress.android.util.FluxCUtils
 import org.wordpress.android.util.StringUtils
-import org.wordpress.android.util.helpers.MediaFile
 import java.util.ArrayList
 import java.util.HashMap
 import javax.inject.Inject
@@ -52,17 +54,35 @@ class StoriesEventListener @Inject constructor(
     private val eventBusWrapper: EventBusWrapper,
     private val editorMedia: EditorMedia,
     private val loadStoryFromStoriesPrefsUseCase: LoadStoryFromStoriesPrefsUseCase,
+    private val storiesPrefs: StoriesPrefs,
     private val storyRepositoryWrapper: StoryRepositoryWrapper
 ) : LifecycleObserver {
     private lateinit var lifecycle: Lifecycle
     private lateinit var site: SiteModel
     private lateinit var editPostRepository: EditPostRepository
     private var storySaveMediaListener: StorySaveMediaListener? = null
+    var storiesSavingInProgress = HashSet<StoryIndex>()
+        private set
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_CREATE)
-    private fun onCreate() {
-        dispatcher.register(this)
-        eventBusWrapper.register(this)
+    data class StoryFrameMediaUploadedEvent(
+        val localId: LocalId,
+        val assignedMediaId: RemoteId,
+        val oldUrl: String,
+        val newUrl: String
+    )
+
+    fun startListening() {
+        if (!eventBusWrapper.isRegistered(this)) {
+            dispatcher.register(this)
+            eventBusWrapper.register(this)
+        }
+    }
+
+    fun pauseListening() {
+        if (eventBusWrapper.isRegistered(this)) {
+            dispatcher.unregister(this)
+            eventBusWrapper.unregister(this)
+        }
     }
 
     /**
@@ -72,21 +92,53 @@ class StoriesEventListener @Inject constructor(
     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     private fun onDestroy() {
         lifecycle.removeObserver(this)
-        dispatcher.unregister(this)
-        eventBusWrapper.unregister(this)
+        pauseListening()
     }
 
-    fun start(lifecycle: Lifecycle, site: SiteModel, editPostRepository: EditPostRepository) {
+    fun start(
+        lifecycle: Lifecycle,
+        site: SiteModel,
+        editPostRepository: EditPostRepository,
+        editorMediaListener: EditorMediaListener
+    ) {
         this.site = site
         this.editPostRepository = editPostRepository
         this.lifecycle = lifecycle
         this.lifecycle.addObserver(this)
+        this.editorMedia.start(site, editorMediaListener)
     }
 
     fun setSaveMediaListener(newListener: StorySaveMediaListener) {
         storySaveMediaListener = newListener
     }
 
+    fun postStoryMediaUploadedEvent(mediaModel: MediaModel) {
+        // if this is a Story media item, then make sure to keep up with the StoriesPrefs serialized slides
+        // this looks for the slide saved with the local id key (media.getId()), and re-converts it to
+        // mediaId.
+        // Also: we don't need to worry about checking if this mediaModel corresponds to a media upload
+        // within a story block in this post: we will only replace items for which a local-keyed frame has
+        // been created before, which can only happen when using the Story Creator.
+        storiesPrefs.replaceLocalMediaIdKeyedSlideWithRemoteMediaIdKeyedSlide(
+                mediaModel.getId(),
+                mediaModel.getMediaId(),
+                mediaModel.localSiteId.toLong()
+        )
+
+        // also, let's post a sticky event for StoriesEventListener to catch - if the listener is not yet
+        // registered, it will be listening to this event as needed when Gutenberg is re-attached and ready
+        // to process events
+        // see subscriber method fun onStoryFrameMediaUploadedEvent(event: StoryFrameMediaUploadedEvent) below
+        eventBusWrapper.postSticky(
+                StoryFrameMediaUploadedEvent(
+                        LocalId(mediaModel.id),
+                        RemoteId(mediaModel.mediaId),
+                        "",
+                        mediaModel.url
+                )
+        )
+    }
+
     // Story Frame Save Service events
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onStoryFrameSaveStart(event: FrameSaveStart) {
@@ -111,50 +163,48 @@ class StoriesEventListener @Inject constructor(
         storySaveMediaListener?.onMediaSaveProgress(localMediaId, progress)
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
     fun onStoryFrameSaveCompleted(event: FrameSaveCompleted) {
+        eventBusWrapper.removeStickyEvent(event)
+        // in onStoryFrameSaveCompleted we should always get a frameId that has the TEMPORARY_ID_PREFIX prefix
+        // for Stories being edited only
+        // otherwise we can exit
+        if (event.frameId == null) return
+
         if (!lifecycle.currentState.isAtLeast(CREATED)) {
             return
         }
-        val localMediaId = requireNotNull(event.frameId)
+        val localMediaId = event.frameId
 
-        // check whether this is a temporary file being just saved (so we don't have a proper local MediaModel yet)
-        // catch ( NumberFormatException e)
-        if (localMediaId.startsWith(TEMPORARY_ID_PREFIX)) {
-            val (frames) = storyRepositoryWrapper.getStoryAtIndex(event.storyIndex)
+        val (frames) = storyRepositoryWrapper.getStoryAtIndex(event.storyIndex)
 
-            // first, update the media's url
-            val frame = frames[event.frameIndex]
-            storySaveMediaListener?.onMediaSaveSucceeded(
-                    localMediaId,
-                    Uri.fromFile(frame.composedFrameFile).toString()
-            )
+        // first, update the media's url
+        val frame = frames[event.frameIndex]
+        storySaveMediaListener?.onMediaSaveSucceeded(
+                localMediaId,
+                Uri.fromFile(frame.composedFrameFile).toString()
+        )
 
-            // now update progress
-            val totalProgress: Float = storyRepositoryWrapper.getCurrentStorySaveProgress(
-                    event.storyIndex,
-                    0.0f
-            )
-            storySaveMediaListener?.onMediaSaveProgress(localMediaId, totalProgress)
-        } else {
-            val mediaModel: MediaModel = mediaStore.getSiteMediaWithId(site, localMediaId.toLong())
-            if (mediaModel != null) {
-                val mediaFile: MediaFile = FluxCUtils.mediaFileFromMediaModel(mediaModel)
-                storySaveMediaListener?.onMediaSaveSucceeded(localMediaId, mediaFile.getFileURL())
-            }
-        }
+        // now update progress
+        val totalProgress: Float = storyRepositoryWrapper.getCurrentStorySaveProgress(
+                event.storyIndex,
+                0.0f
+        )
+        storySaveMediaListener?.onMediaSaveProgress(localMediaId, totalProgress)
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
     fun onStoryFrameMediaIdChanged(event: StoryFrameMediaModelCreatedEvent) {
+        eventBusWrapper.removeStickyEvent(event)
         if (!lifecycle.currentState.isAtLeast(CREATED)) {
             return
         }
         storySaveMediaListener?.onMediaModelCreatedForFile(event.oldId, event.newId.toString(), event.oldUrl)
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
     fun onStoryFrameSaveFailed(event: FrameSaveFailed) {
+        eventBusWrapper.removeStickyEvent(event)
         if (!lifecycle.currentState.isAtLeast(CREATED)) {
             return
         }
@@ -166,8 +216,10 @@ class StoriesEventListener @Inject constructor(
         // storySaveMediaListener?.onMediaSaveFailed(localMediaId)
     }
 
-    @Subscribe(threadMode = ThreadMode.MAIN)
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
     fun onStorySaveProcessFinished(event: StorySaveResult) {
+        eventBusWrapper.removeStickyEvent(event)
+        storiesSavingInProgress.remove(event.storyIndex)
         if (!lifecycle.currentState.isAtLeast(CREATED)) {
             return
         }
@@ -179,6 +231,27 @@ class StoriesEventListener @Inject constructor(
         }
     }
 
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    fun onStorySaveStart(event: StorySaveProcessStart) {
+        storiesSavingInProgress.add(event.storyIndex)
+    }
+
+    // Story media Upload specific event - we trigger this from within this class so it can be handled appropriately
+    // and doesn't miss the target as regular FluxC upload events would if Gutenberg is not yet prepared
+    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
+    fun onStoryFrameMediaUploadedEvent(event: StoryFrameMediaUploadedEvent) {
+        eventBusWrapper.removeStickyEvent(event)
+        if (!lifecycle.currentState.isAtLeast(CREATED)) {
+            return
+        }
+        storySaveMediaListener?.onStoryMediaSavedToRemote(
+                event.localId.value.toString(),
+                event.assignedMediaId.value.toString(),
+                event.oldUrl,
+                event.newUrl
+        )
+    }
+
     // Editor load / cancel events
     fun onRequestMediaFilesEditorLoad(
         activity: Activity,
@@ -265,7 +338,7 @@ class StoriesEventListener @Inject constructor(
                     (mediaFile as HashMap<String?, Any?>)["id"].toString(), 0
             )
             if (localMediaId != 0) {
-                val media: MediaModel = mediaStore.getMediaWithLocalId(localMediaId)
+                val media: MediaModel? = mediaStore.getMediaWithLocalId(localMediaId)
                 // if we find at least one item in the mediaFiles collection passed
                 // for which we don't have a local MediaModel, just tell the user and bail
                 if (media == null) {
@@ -277,10 +350,7 @@ class StoriesEventListener @Inject constructor(
                             activity
                     )
                     builder.setTitle(activity.getString(string.cannot_retry_deleted_media_item_fatal))
-                    builder.setPositiveButton(string.yes) { dialog, id -> dialog.dismiss() }
-                    builder.setNegativeButton(activity.getString(string.no),
-                            DialogInterface.OnClickListener { dialog: DialogInterface, id: Int -> dialog.dismiss() }
-                    )
+                    builder.setPositiveButton(string.ok) { dialog, id -> dialog.dismiss() }
                     val dialog = builder.create()
                     dialog.show()
                     return
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/XPostsCapabilityChecker.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/XPostsCapabilityChecker.kt
new file mode 100644
index 000000000000..e3629aafb000
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/XPostsCapabilityChecker.kt
@@ -0,0 +1,52 @@
+package org.wordpress.android.ui.posts.editor
+
+import androidx.core.util.Consumer
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.XPostsResult
+import org.wordpress.android.fluxc.store.XPostsStore
+import javax.inject.Inject
+
+class XPostsCapabilityChecker @Inject constructor(
+    private val xPostsStore: XPostsStore
+) {
+    fun retrieveCapability(site: SiteModel, callback: Consumer<Boolean>) {
+        GlobalScope.launch(Dispatchers.IO) {
+            val capability = isCapable(site)
+            callback.accept(capability)
+        }
+    }
+
+    private suspend fun fetchingReturnsXposts(site: SiteModel): Boolean =
+            when (val fetched = xPostsStore.fetchXPosts(site)) {
+                is XPostsResult.Result -> fetched.xPosts.isNotEmpty()
+                is XPostsResult.Unknown ->
+                    // We don't know whether the site has any xposts, so default to true
+                    true
+            }
+
+    suspend fun isCapable(site: SiteModel): Boolean =
+            // Check db first in order to reduce unnecessary network calls
+            when (val saved = xPostsStore.getXPostsFromDb(site)) {
+                is XPostsResult.Result ->
+                    if (saved.xPosts.isEmpty()) {
+                        // Db was empty, so let's make the api call and ensure there aren't any new xpost suggestions.
+                        // This call will be made every time the editor opens on sites that don't have any xpost
+                        // suggestions, but because the response will almost always be empty, it's not an expensive call.
+                        fetchingReturnsXposts(site)
+                    } else {
+                        // We have xposts saved in the db, so set capability to true even though
+                        // it is possible that the site no longer has any xpost suggestions. We're doing
+                        // this because it is an edge case for a site to have removed all its xpost
+                        // suggestions since the last time we checked, and by not making the call here
+                        // we avoid making an expensive call that probably will return many xpost suggestions
+                        // every time the editor is opened.
+                        true
+                    }
+                is XPostsResult.Unknown ->
+                    // We don't know whether the site has any xposts, so make the api call to try to find out
+                    fetchingReturnsXposts(site)
+            }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCase.kt
index 6deae0e3139f..f74e9db9c07d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCase.kt
@@ -48,7 +48,8 @@ class AddLocalMediaToPostUseCase @Inject constructor(
         site: SiteModel,
         freshlyTaken: Boolean,
         editorMediaListener: EditorMediaListener,
-        doUploadAfterAdding: Boolean = true
+        doUploadAfterAdding: Boolean = true,
+        trackEvent: Boolean = true
     ): Boolean {
         // Copy files to apps storage to make sure they are permanently accessible.
         val copyFilesResult: CopyMediaResult = copyMediaToAppStorageUseCase.copyFilesToAppStorageIfNecessary(uriList)
@@ -58,7 +59,8 @@ class AddLocalMediaToPostUseCase @Inject constructor(
                 .optimizeMediaIfSupportedAsync(
                         site,
                         freshlyTaken,
-                        copyFilesResult.permanentlyAccessibleUris
+                        copyFilesResult.permanentlyAccessibleUris,
+                        trackEvent
                 )
 
         // Transform Uris to MediaModels
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCase.kt
index 2fe6c8246314..68e36d7c7d75 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCase.kt
@@ -4,7 +4,7 @@ import android.net.Uri
 import dagger.Reusable
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
-import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.UTILS
 import org.wordpress.android.util.MediaUtilsWrapper
@@ -14,18 +14,23 @@ import javax.inject.Named
 @Reusable
 class CopyMediaToAppStorageUseCase @Inject constructor(
     private val mediaUtilsWrapper: MediaUtilsWrapper,
-    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) {
     /*
    * Some media providers (eg. Google Photos) give us a limited access to media files just so we can copy them and then
    * they revoke the access. Copying these files must be performed on the UI thread, otherwise the access might be
    * revoked before the action completes. See https://github.com/wordpress-mobile/WordPress-Android/issues/5818
+   * they revoke the access. Copying these files must be performed within the context (Activity) that requested the
+   * files, otherwise the access might be revoked before the action completes.
+   * See https://github.com/wordpress-mobile/WordPress-Android/issues/5818
    */
     suspend fun copyFilesToAppStorageIfNecessary(uriList: List<Uri>): CopyMediaResult {
-        return withContext(mainDispatcher) {
+        return withContext(bgDispatcher) {
             uriList
                     .map { mediaUri ->
-                        if (!mediaUtilsWrapper.isInMediaStore(mediaUri)) {
+                        if (!mediaUtilsWrapper.isInMediaStore(mediaUri) &&
+                                // don't copy existing local files
+                                !mediaUtilsWrapper.isFile(mediaUri)) {
                             copyToAppStorage(mediaUri)
                         } else {
                             mediaUri
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/OptimizeMediaUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/OptimizeMediaUseCase.kt
index 481e45ef5d63..17c487a08b47 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/OptimizeMediaUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/OptimizeMediaUseCase.kt
@@ -26,11 +26,12 @@ class OptimizeMediaUseCase @Inject constructor(
     suspend fun optimizeMediaIfSupportedAsync(
         site: SiteModel,
         freshlyTaken: Boolean,
-        uriList: List<Uri>
+        uriList: List<Uri>,
+        trackEvent: Boolean = true
     ): OptimizeMediaResult {
         return withContext(bgDispatcher) {
             uriList
-                    .map { async { optimizeMediaAndTrackEvent(it, freshlyTaken, site) } }
+                    .map { async { optimizeMedia(it, freshlyTaken, site, trackEvent) } }
                     .map { it.await() }
                     .let {
                         OptimizeMediaResult(
@@ -41,7 +42,7 @@ class OptimizeMediaUseCase @Inject constructor(
         }
     }
 
-    private fun optimizeMediaAndTrackEvent(mediaUri: Uri, freshlyTaken: Boolean, site: SiteModel): Uri? {
+    private fun optimizeMedia(mediaUri: Uri, freshlyTaken: Boolean, site: SiteModel, trackEvent: Boolean): Uri? {
         val path = mediaUtilsWrapper.getRealPathFromURI(mediaUri) ?: return null
         val isVideo = mediaUtilsWrapper.isVideo(mediaUri.toString())
         /**
@@ -56,7 +57,9 @@ class OptimizeMediaUseCase @Inject constructor(
                     mediaUri
                 }
 
-        editorTracker.trackAddMediaFromDevice(site, freshlyTaken, isVideo, updatedMediaUri)
+        if (trackEvent) {
+            editorTracker.trackAddMediaFromDevice(site, freshlyTaken, isVideo, updatedMediaUri)
+        }
 
         return updatedMediaUri
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessor.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessor.kt
new file mode 100644
index 000000000000..679f3a92f939
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessor.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.posts.mediauploadcompletionprocessors
+
+import com.google.gson.JsonObject
+import org.jsoup.nodes.Document
+import org.wordpress.android.util.helpers.MediaFile
+
+class AudioBlockProcessor(localId: String?, mediaFile: MediaFile?) : BlockProcessor(localId, mediaFile) {
+    override fun processBlockContentDocument(document: Document?): Boolean {
+        val audioElements = document?.select(AUDIO_TAG)
+
+        audioElements?.let { elements ->
+            for (element in elements) {
+                // replaces the src attribute's local url with the remote counterpart.
+                element.attr(SRC_ATTRIBUTE, mRemoteUrl)
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun processBlockJsonAttributes(jsonAttributes: JsonObject?): Boolean {
+        val id = jsonAttributes?.get(ID_ATTRIBUTE)
+
+        return if (id != null && !id.isJsonNull && id.asString == mLocalId) {
+            jsonAttributes.apply {
+                addProperty(ID_ATTRIBUTE, Integer.parseInt(mRemoteId))
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    companion object {
+        const val AUDIO_TAG = "audio"
+        const val SRC_ATTRIBUTE = "src"
+        const val ID_ATTRIBUTE = "id"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessor.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessor.java
index 80129877df69..60f370ff3132 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessor.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessor.java
@@ -16,7 +16,7 @@
 /**
  * Abstract class to be extended for each enumerated {@link MediaBlockType}.
  */
-abstract class BlockProcessor {
+public abstract class BlockProcessor {
     /**
      * HTML output used by the parser
      */
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessorFactory.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessorFactory.java
index b33568c3c850..4258b5a3ee48 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessorFactory.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/BlockProcessorFactory.java
@@ -5,7 +5,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.wordpress.android.ui.posts.mediauploadcompletionprocessors.MediaBlockType.AUDIO;
 import static org.wordpress.android.ui.posts.mediauploadcompletionprocessors.MediaBlockType.COVER;
+import static org.wordpress.android.ui.posts.mediauploadcompletionprocessors.MediaBlockType.FILE;
 import static org.wordpress.android.ui.posts.mediauploadcompletionprocessors.MediaBlockType.GALLERY;
 import static org.wordpress.android.ui.posts.mediauploadcompletionprocessors.MediaBlockType.IMAGE;
 import static org.wordpress.android.ui.posts.mediauploadcompletionprocessors.MediaBlockType.MEDIA_TEXT;
@@ -37,6 +39,8 @@ BlockProcessorFactory init(String localId, MediaFile mediaFile, String siteUrl)
         mMediaBlockTypeBlockProcessorMap.put(GALLERY, new GalleryBlockProcessor(localId, mediaFile, siteUrl));
         mMediaBlockTypeBlockProcessorMap.put(COVER, new CoverBlockProcessor(localId, mediaFile,
                 mMediaUploadCompletionProcessor));
+        mMediaBlockTypeBlockProcessorMap.put(FILE, new FileBlockProcessor(localId, mediaFile));
+        mMediaBlockTypeBlockProcessorMap.put(AUDIO, new AudioBlockProcessor(localId, mediaFile));
 
         return this;
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/FileBlockProcessor.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/FileBlockProcessor.kt
new file mode 100644
index 000000000000..dfbaf83e2555
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/FileBlockProcessor.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.ui.posts.mediauploadcompletionprocessors
+
+import com.google.gson.JsonObject
+import org.jsoup.nodes.Document
+import org.wordpress.android.util.helpers.MediaFile
+
+/**
+ * When a File Block's upload is complete, this processor replaces the href pointing to a local file url with a
+ * remote url for all a tags present within the wp:file block.
+ */
+class FileBlockProcessor(localId: String?, mediaFile: MediaFile?) : BlockProcessor(localId, mediaFile) {
+    override fun processBlockContentDocument(document: Document?): Boolean {
+        val hyperLinkTargets = document?.select(HYPERLINK_TAG)
+
+        hyperLinkTargets?.let {
+            for (target in hyperLinkTargets) {
+                // replaces the href attribute's local url with the remote counterpart.
+                target.attr(HREF_ATTRIBUTE, mRemoteUrl)
+            }
+            return true
+        }
+        return false
+    }
+
+    override fun processBlockJsonAttributes(jsonAttributes: JsonObject?): Boolean {
+        val id = jsonAttributes?.get(ID_ATTRIBUTE)
+
+        return if (id != null && !id.isJsonNull && id.asString == mLocalId) {
+            jsonAttributes.apply {
+                addProperty(ID_ATTRIBUTE, Integer.parseInt(mRemoteId))
+                addProperty(HREF_ATTRIBUTE, mRemoteUrl)
+            }
+            true
+        } else {
+            false
+        }
+    }
+
+    companion object {
+        const val HYPERLINK_TAG = "a"
+        const val HREF_ATTRIBUTE = "href"
+        const val ID_ATTRIBUTE = "id"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/GalleryBlockProcessor.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/GalleryBlockProcessor.java
index 392c19c4e85e..44425bec409c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/GalleryBlockProcessor.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/GalleryBlockProcessor.java
@@ -48,10 +48,10 @@ public GalleryBlockProcessor(String localId, MediaFile mediaFile, String siteUrl
             Element parent = targetImg.parent();
             if (parent != null && parent.is("a") && mLinkTo != null) {
                 switch (mLinkTo) {
-                    case "media":
+                    case "file":
                         parent.attr("href", mRemoteUrl);
                         break;
-                    case "attachment":
+                    case "post":
                         parent.attr("href", mAttachmentPageUrl);
                         break;
                     default:
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/MediaBlockType.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/MediaBlockType.java
index 7de0bf67305b..e5eefff16d05 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/MediaBlockType.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/MediaBlockType.java
@@ -15,7 +15,9 @@ enum MediaBlockType {
     VIDEO("video"),
     MEDIA_TEXT("media-text"),
     GALLERY("gallery"),
-    COVER("cover");
+    COVER("cover"),
+    FILE("file"),
+    AUDIO("audio");
 
     private static final Map<String, MediaBlockType> MAP = new HashMap<>();
     private static final String MATCHING_GROUP;
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingPublishSettingsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingPublishSettingsFragment.kt
index f00db534e63d..ca98536decb9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingPublishSettingsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingPublishSettingsFragment.kt
@@ -5,8 +5,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.posts.PrepublishingScreenClosedListener
@@ -14,6 +13,7 @@ import org.wordpress.android.ui.posts.PublishSettingsFragment
 import org.wordpress.android.ui.posts.PublishSettingsFragmentType.PREPUBLISHING_NUDGES
 import org.wordpress.android.ui.posts.PublishSettingsViewModel
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class PrepublishingPublishSettingsFragment : PublishSettingsFragment() {
@@ -26,7 +26,7 @@ class PrepublishingPublishSettingsFragment : PublishSettingsFragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().applicationContext as WordPress).component().inject(this)
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(PrepublishingPublishSettingsViewModel::class.java)
     }
 
@@ -47,13 +47,11 @@ class PrepublishingPublishSettingsFragment : PublishSettingsFragment() {
         (viewModel as PrepublishingPublishSettingsViewModel).let {
             backButton.setOnClickListener { viewModel.onBackButtonClicked() }
 
-            viewModel.navigateToHomeScreen.observe(this, Observer { event ->
-                event?.applyIfNotHandled {
-                    closeListener?.onBackClicked()
-                }
+            viewModel.navigateToHomeScreen.observeEvent(this, {
+                closeListener?.onBackClicked()
             })
 
-            viewModel.updateToolbarTitle.observe(this, Observer { uiString ->
+            viewModel.updateToolbarTitle.observe(this, { uiString ->
                 toolbarTitle.text = uiHelpers.getTextOfUiString(
                         requireContext(),
                         uiString
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt
index 145c89f32554..446bdb0f63c4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandler.kt
@@ -26,11 +26,12 @@ class ReactNativeRequestHandler @Inject constructor(
     fun performGetRequest(
         pathWithParams: String,
         mSite: SiteModel,
+        enableCaching: Boolean,
         onSuccess: Consumer<String>,
         onError: Consumer<Bundle>
     ) {
         launch {
-            val response = reactNativeStore.executeRequest(mSite, pathWithParams)
+            val response = reactNativeStore.executeRequest(mSite, pathWithParams, enableCaching)
             handleResponse(response, onSuccess::accept, onError::accept)
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
index 62d05f3ce9ef..b6be6df0fa77 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.prefs;
 
 import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
@@ -10,13 +11,13 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
+import org.wordpress.android.fluxc.model.JetpackCapability;
 import org.wordpress.android.fluxc.model.PostModel;
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask;
 import org.wordpress.android.models.PeopleListFilter;
 import org.wordpress.android.models.ReaderTag;
 import org.wordpress.android.models.ReaderTagType;
 import org.wordpress.android.ui.ActivityId;
-import org.wordpress.android.ui.comments.CommentsListFragment.CommentStatusCriteria;
 import org.wordpress.android.ui.posts.AuthorFilterSelection;
 import org.wordpress.android.ui.posts.PostListViewLayoutType;
 import org.wordpress.android.ui.reader.tracker.ReaderTab;
@@ -81,9 +82,6 @@ public enum DeletablePrefKey implements PrefKey {
         // Store the number of times Stats are loaded without errors. It's used to show the Widget promo dialog.
         STATS_WIDGET_PROMO_ANALYTICS,
 
-        // index of the last active status type in Comments activity
-        COMMENTS_STATUS_TYPE_INDEX,
-
         // index of the last active people list filter in People Management activity
         PEOPLE_LIST_FILTER_INDEX,
 
@@ -126,7 +124,7 @@ public enum DeletablePrefKey implements PrefKey {
         SHOULD_AUTO_ENABLE_GUTENBERG_FOR_THE_NEW_POSTS,
         SHOULD_AUTO_ENABLE_GUTENBERG_FOR_THE_NEW_POSTS_PHASE_2,
         GUTENBERG_OPT_IN_DIALOG_SHOWN,
-        GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN,
+        GUTENBERG_FOCAL_POINT_PICKER_TOOLTIP_SHOWN,
 
         IS_QUICK_START_NOTICE_REQUIRED,
         LAST_SKIPPED_QUICK_START_TASK,
@@ -155,7 +153,10 @@ public enum DeletablePrefKey implements PrefKey {
         READER_RECOMMENDED_TAGS_DELETED_FOR_LOGGED_OUT_USER,
 
         READER_DISCOVER_WELCOME_BANNER_SHOWN,
-        MANUAL_FEATURE_CONFIG
+        MANUAL_FEATURE_CONFIG,
+        SITE_JETPACK_CAPABILITIES,
+        REMOVED_QUICK_START_CARD_TYPE,
+        PINNED_DYNAMIC_CARD
     }
 
     /**
@@ -246,6 +247,12 @@ public enum UndeletablePrefKey implements PrefKey {
 
         // Used to indicate whether or not the stories intro screen must be shown
         SHOULD_SHOW_STORIES_INTRO,
+
+        // Used to determine if editor onboarding features should be displayed
+        HAS_LAUNCHED_GUTENBERG_EDITOR,
+
+        // Used to indicate whether or not the device running out of storage warning should be shown
+        SHOULD_SHOW_STORAGE_WARNING,
     }
 
     private static SharedPreferences prefs() {
@@ -406,26 +413,6 @@ public static void setReaderSubsPageTitle(String pageTitle) {
         setString(DeletablePrefKey.READER_SUBS_PAGE_TITLE, pageTitle);
     }
 
-    public static CommentStatusCriteria getCommentsStatusFilter() {
-        int idx = getInt(DeletablePrefKey.COMMENTS_STATUS_TYPE_INDEX);
-        CommentStatusCriteria[] commentStatusValues = CommentStatusCriteria.values();
-        if (commentStatusValues.length < idx) {
-            return commentStatusValues[0];
-        } else {
-            return commentStatusValues[idx];
-        }
-    }
-
-    public static void setCommentsStatusFilter(CommentStatusCriteria commentStatus) {
-        if (commentStatus != null) {
-            setInt(DeletablePrefKey.COMMENTS_STATUS_TYPE_INDEX, commentStatus.ordinal());
-        } else {
-            prefs().edit()
-                   .remove(DeletablePrefKey.COMMENTS_STATUS_TYPE_INDEX.name())
-                   .apply();
-        }
-    }
-
     public static PeopleListFilter getPeopleListFilter() {
         int idx = getInt(DeletablePrefKey.PEOPLE_LIST_FILTER_INDEX);
         PeopleListFilter[] values = PeopleListFilter.values();
@@ -882,12 +869,12 @@ public static void removeSupportName() {
         remove(DeletablePrefKey.SUPPORT_NAME);
     }
 
-    public static void setGutenbergStarterPageTemplatesTooltipShown(boolean tooltipShown) {
-        setBoolean(DeletablePrefKey.GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, tooltipShown);
+    public static void setGutenbergFocalPointPickerTooltipShown(boolean tooltipShown) {
+        setBoolean(DeletablePrefKey.GUTENBERG_FOCAL_POINT_PICKER_TOOLTIP_SHOWN, tooltipShown);
     }
 
-    public static boolean getGutenbergStarterPageTemplatesTooltipShown() {
-        return getBoolean(DeletablePrefKey.GUTENBERG_STARTER_PAGE_TEMPLATES_TOOLTIP_SHOWN, false);
+    public static boolean getGutenbergFocalPointPickerTooltipShown() {
+        return getBoolean(DeletablePrefKey.GUTENBERG_FOCAL_POINT_PICKER_TOOLTIP_SHOWN, false);
     }
 
     /*
@@ -1205,6 +1192,22 @@ public static boolean shouldShowStoriesIntro() {
         return getBoolean(UndeletablePrefKey.SHOULD_SHOW_STORIES_INTRO, true);
     }
 
+    public static void setHasLaunchedGutenbergEditor(boolean hasLaunched) {
+        setBoolean(UndeletablePrefKey.HAS_LAUNCHED_GUTENBERG_EDITOR, hasLaunched);
+    }
+
+    public static boolean hasLaunchedGutenbergEditor() {
+        return getBoolean(UndeletablePrefKey.HAS_LAUNCHED_GUTENBERG_EDITOR, false);
+    }
+
+    public static void setShouldShowStorageWarning(boolean shouldShow) {
+        setBoolean(UndeletablePrefKey.SHOULD_SHOW_STORAGE_WARNING, shouldShow);
+    }
+
+    public static boolean shouldShowStorageWarning() {
+        return getBoolean(UndeletablePrefKey.SHOULD_SHOW_STORAGE_WARNING, true);
+    }
+
     public static QuickStartTask getLastSkippedQuickStartTask() {
         String taskName = getString(DeletablePrefKey.LAST_SKIPPED_QUICK_START_TASK);
         if (TextUtils.isEmpty(taskName)) {
@@ -1263,4 +1266,30 @@ public static boolean isPostWithHWAccelerationOff(int localSiteId, int localPost
         }
         return false;
     }
+
+    public static void setSiteJetpackCapabilities(long remoteSiteId, List<JetpackCapability> capabilities) {
+        HashSet<String> capabilitiesSet = new HashSet(capabilities.size());
+        for (JetpackCapability item : capabilities) {
+            capabilitiesSet.add(item.toString());
+        }
+
+        Editor editor = prefs().edit();
+        editor.putStringSet(
+                DeletablePrefKey.SITE_JETPACK_CAPABILITIES + String.valueOf(remoteSiteId),
+                capabilitiesSet
+        );
+        editor.apply();
+    }
+
+    public static List<JetpackCapability> getSiteJetpackCapabilities(long remoteSiteId) {
+        List<JetpackCapability> capabilities = new ArrayList<>();
+        Set<String> strings = prefs().getStringSet(
+                DeletablePrefKey.SITE_JETPACK_CAPABILITIES + String.valueOf(remoteSiteId),
+                new HashSet<>()
+        );
+        for (String item : strings) {
+            capabilities.add(JetpackCapability.Companion.fromString(item));
+        }
+        return capabilities;
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt
index b5863a9d391d..3ac86d7c9644 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefsWrapper.kt
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.prefs
 
+import org.wordpress.android.fluxc.model.JetpackCapability
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.ui.posts.AuthorFilterSelection
 import org.wordpress.android.ui.posts.PostListViewLayoutType
@@ -174,6 +175,14 @@ class AppPrefsWrapper @Inject constructor() {
         return AppPrefs.getManualFeatureConfig(featureKey)
     }
 
+    fun setSiteJetpackCapabilities(remoteSiteId: Long, capabilities: List<JetpackCapability>) =
+            AppPrefs.setSiteJetpackCapabilities(remoteSiteId, capabilities)
+
+    fun getSiteJetpackCapabilities(remoteSiteId: Long): List<JetpackCapability> =
+            AppPrefs.getSiteJetpackCapabilities(remoteSiteId)
+
+    fun setMainPageIndex(index: Int) = AppPrefs.setMainPageIndex(index)
+
     companion object {
         private const val LIGHT_MODE_ID = 0
         private const val DARK_MODE_ID = 1
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
index 58e8bb8e7cfd..08aca954fce6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -53,6 +53,7 @@
 import org.apache.commons.text.StringEscapeUtils;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
+import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -76,6 +77,7 @@
 import org.wordpress.android.ui.prefs.EditTextPreferenceWithValidation.ValidationType;
 import org.wordpress.android.ui.prefs.SiteSettingsFormatDialog.FormatType;
 import org.wordpress.android.ui.prefs.homepage.HomepageSettingsDialog;
+import org.wordpress.android.ui.prefs.timezone.SiteSettingsTimezoneBottomSheet;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.ContextExtensionsKt;
 import org.wordpress.android.util.ContextUtilsKt;
@@ -114,7 +116,8 @@ public class SiteSettingsFragment extends PreferenceFragment
         Preference.OnPreferenceClickListener,
         AdapterView.OnItemLongClickListener,
         Dialog.OnDismissListener,
-        SiteSettingsInterface.SiteSettingsListener {
+        SiteSettingsInterface.SiteSettingsListener,
+        SiteSettingsTimezoneBottomSheet.TimezoneSelectionCallback {
     /**
      * When the user removes a site (by selecting Delete Site) the parent {@link Activity} result
      * is set to this value and {@link Activity#finish()} is invoked.
@@ -143,6 +146,8 @@ public class SiteSettingsFragment extends PreferenceFragment
      */
     private static final int UNCATEGORIZED_CATEGORY_ID = 1;
 
+    private static final String TIMEZONE_BOTTOM_SHEET_TAG = "timezone-dialog-tag";
+
     /**
      * Request code used when creating the {@link RelatedPostsDialog}.
      */
@@ -155,7 +160,6 @@ public class SiteSettingsFragment extends PreferenceFragment
     private static final int DATE_FORMAT_REQUEST_CODE = 7;
     private static final int TIME_FORMAT_REQUEST_CODE = 8;
     private static final int POSTS_PER_PAGE_REQUEST_CODE = 9;
-    private static final int TIMEZONE_REQUEST_CODE = 10;
 
     private static final String DELETE_SITE_TAG = "delete-site";
     private static final String PURCHASE_ORIGINAL_RESPONSE_KEY = "originalResponse";
@@ -228,10 +232,10 @@ public class SiteSettingsFragment extends PreferenceFragment
     private DetailListPreference mSortByPref;
     private Preference mThreadingPref;
     private Preference mPagingPref;
-    private DetailListPreference mWhitelistPref;
+    private DetailListPreference mAllowlistPref;
     private Preference mMultipleLinksPref;
     private Preference mModerationHoldPref;
-    private Preference mBlacklistPref;
+    private Preference mDenylistPref;
 
     // Advanced settings
     private Preference mStartOverPref;
@@ -244,7 +248,7 @@ public class SiteSettingsFragment extends PreferenceFragment
     private WPSwitchPreference mJpMonitorEmailNotesPref;
     private WPSwitchPreference mJpMonitorWpNotesPref;
     private WPSwitchPreference mJpBruteForcePref;
-    private WPPreference mJpWhitelistPref;
+    private WPPreference mJpAllowlistPref;
     private WPSwitchPreference mJpSsoPref;
     private WPSwitchPreference mJpMatchEmailPref;
     private WPSwitchPreference mJpUseTwoFactorPref;
@@ -276,7 +280,7 @@ public class SiteSettingsFragment extends PreferenceFragment
     // Reference to the state of the fragment
     private boolean mIsFragmentPaused = false;
 
-    // Hold for Moderation and Blacklist settings
+    // Hold for Moderation and Denylist settings
     private Dialog mDialog;
     private ActionMode mActionMode;
     private MultiSelectRecyclerViewAdapter mAdapter;
@@ -441,11 +445,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                         onPreferenceChange(mPostsPerPagePref, numPosts);
                     }
                     break;
-                case TIMEZONE_REQUEST_CODE:
-                    String timezone = data.getStringExtra(SiteSettingsTimezoneDialog.KEY_TIMEZONE);
-                    mSiteSettings.setTimezone(timezone);
-                    onPreferenceChange(mTimezonePref, timezone);
-                    break;
             }
         } else {
             if (requestCode == DELETE_SITE_REQUEST_CODE) {
@@ -492,6 +491,13 @@ public void onActivityCreated(Bundle savedInstanceState) {
         if (savedInstanceState != null) {
             setupMorePreferenceScreen();
             setupJetpackSecurityScreen();
+
+            SiteSettingsTimezoneBottomSheet bottomSheet =
+                    (SiteSettingsTimezoneBottomSheet) ((AppCompatActivity) getActivity())
+                            .getSupportFragmentManager().findFragmentByTag(TIMEZONE_BOTTOM_SHEET_TAG);
+            if (bottomSheet != null) {
+                bottomSheet.setTimezoneSettingCallback(this);
+            }
         }
     }
 
@@ -507,6 +513,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
 
             return setupMorePreferenceScreen();
         } else if (preference == mJpSecuritySettings) {
+            AnalyticsTracker.track(Stat.SITE_SETTINGS_JETPACK_SECURITY_SETTINGS_VIEWED);
             setupJetpackSecurityScreen();
         } else if (preference == mSiteAcceleratorSettings) {
             setupSiteAcceleratorScreen();
@@ -538,7 +545,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference prefere
         } else if (preference == mPostsPerPagePref) {
             showPostsPerPageDialog();
         } else if (preference == mTimezonePref) {
-            showTimezoneDialog();
+            setupTimezoneBottomSheet();
         } else if (preference == mHomepagePref) {
             showHomepageSettings();
         }
@@ -556,14 +563,15 @@ public boolean onPreferenceClick(Preference preference) {
             mEditingList = mSiteSettings.getModerationKeys();
             showListEditorDialog(R.string.site_settings_moderation_hold_title,
                     R.string.site_settings_hold_for_moderation_description);
-        } else if (preference == mBlacklistPref) {
-            mEditingList = mSiteSettings.getBlacklistKeys();
-            showListEditorDialog(R.string.site_settings_blacklist_title,
-                    R.string.site_settings_blacklist_description);
-        } else if (preference == mJpWhitelistPref) {
-            mEditingList = mSiteSettings.getJetpackWhitelistKeys();
-            showListEditorDialog(R.string.jetpack_brute_force_whitelist_title,
-                    R.string.site_settings_jetpack_whitelist_description);
+        } else if (preference == mDenylistPref) {
+            mEditingList = mSiteSettings.getDenylistKeys();
+            showListEditorDialog(R.string.site_settings_denylist_title,
+                    R.string.site_settings_denylist_description);
+        } else if (preference == mJpAllowlistPref) {
+            AnalyticsTracker.track(Stat.SITE_SETTINGS_JETPACK_ALLOWLISTED_IPS_VIEWED);
+            mEditingList = mSiteSettings.getJetpackAllowlistKeys();
+            showListEditorDialog(R.string.jetpack_brute_force_allowlist_title,
+                    R.string.site_settings_jetpack_allowlist_description);
         } else if (preference == mStartOverPref) {
             handleStartOver();
         } else if (preference == mCloseAfterPref) {
@@ -613,8 +621,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             return false;
         }
 
-        if (preference == mJpWhitelistPref) {
-            mJpWhitelistPref.setSummary(mSiteSettings.getJetpackProtectWhitelistSummary());
+        if (preference == mJpAllowlistPref) {
+            if (mJpAllowlistPref.getSummary() != mSiteSettings.getJetpackProtectAllowlistSummary()) {
+                AnalyticsTracker.track(Stat.SITE_SETTINGS_JETPACK_ALLOWLISTED_IPS_CHANGED);
+            }
+            mJpAllowlistPref.setSummary(mSiteSettings.getJetpackProtectAllowlistSummary());
         } else if (preference == mJpMonitorActivePref) {
             mJpMonitorActivePref.setChecked((Boolean) newValue);
             mSiteSettings.enableJetpackMonitor((Boolean) newValue);
@@ -704,8 +715,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             mSiteSettings.setIdentityRequired((Boolean) newValue);
         } else if (preference == mUserAccountRequiredPref) {
             mSiteSettings.setUserAccountRequired((Boolean) newValue);
-        } else if (preference == mWhitelistPref) {
-            updateWhitelistSettings(Integer.parseInt(newValue.toString()));
+        } else if (preference == mAllowlistPref) {
+            updateAllowlistSettings(Integer.parseInt(newValue.toString()));
         } else if (preference == mMultipleLinksPref) {
             mSiteSettings.setMultipleLinks(Integer.parseInt(newValue.toString()));
             String s = StringUtils.getQuantityString(getActivity(), R.string.site_settings_multiple_links_summary_zero,
@@ -733,8 +744,8 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             mRelatedPostsPref.setSummary(newValue.toString());
         } else if (preference == mModerationHoldPref) {
             mModerationHoldPref.setSummary(mSiteSettings.getModerationHoldDescription());
-        } else if (preference == mBlacklistPref) {
-            mBlacklistPref.setSummary(mSiteSettings.getBlacklistDescription());
+        } else if (preference == mDenylistPref) {
+            mDenylistPref.setSummary(mSiteSettings.getDenylistDescription());
         } else if (preference == mWeekStartPref) {
             mSiteSettings.setStartOfWeek(newValue.toString());
             mWeekStartPref.setValue(newValue.toString());
@@ -801,10 +812,10 @@ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, l
     public void onDismiss(DialogInterface dialog) {
         if (mEditingList == mSiteSettings.getModerationKeys()) {
             onPreferenceChange(mModerationHoldPref, mEditingList.size());
-        } else if (mEditingList == mSiteSettings.getBlacklistKeys()) {
-            onPreferenceChange(mBlacklistPref, mEditingList.size());
-        } else if (mEditingList == mSiteSettings.getJetpackWhitelistKeys()) {
-            onPreferenceChange(mJpWhitelistPref, mEditingList.size());
+        } else if (mEditingList == mSiteSettings.getDenylistKeys()) {
+            onPreferenceChange(mDenylistPref, mEditingList.size());
+        } else if (mEditingList == mSiteSettings.getJetpackAllowlistKeys()) {
+            onPreferenceChange(mJpAllowlistPref, mEditingList.size());
         }
         mEditingList = null;
     }
@@ -901,7 +912,7 @@ public void initPreferences() {
         mIdentityRequiredPreference = (WPSwitchPreference) getChangePref(R.string.pref_key_site_identity_required);
         mUserAccountRequiredPref = (WPSwitchPreference) getChangePref(R.string.pref_key_site_user_account_required);
         mSortByPref = (DetailListPreference) getChangePref(R.string.pref_key_site_sort_by);
-        mWhitelistPref = (DetailListPreference) getChangePref(R.string.pref_key_site_whitelist);
+        mAllowlistPref = (DetailListPreference) getChangePref(R.string.pref_key_site_allowlist);
         mMorePreference = (PreferenceScreen) getClickPref(R.string.pref_key_site_more_discussion);
         mRelatedPostsPref = getClickPref(R.string.pref_key_site_related_posts);
         mCloseAfterPref = getClickPref(R.string.pref_key_site_close_after);
@@ -909,7 +920,7 @@ public void initPreferences() {
         mThreadingPref = getClickPref(R.string.pref_key_site_threading);
         mMultipleLinksPref = getClickPref(R.string.pref_key_site_multiple_links);
         mModerationHoldPref = getClickPref(R.string.pref_key_site_moderation_hold);
-        mBlacklistPref = getClickPref(R.string.pref_key_site_blacklist);
+        mDenylistPref = getClickPref(R.string.pref_key_site_denylist);
         mStartOverPref = getClickPref(R.string.pref_key_site_start_over);
         mExportSitePref = getClickPref(R.string.pref_key_site_export_site);
         mDeleteSitePref = getClickPref(R.string.pref_key_site_delete_site);
@@ -922,7 +933,7 @@ public void initPreferences() {
         mJpBruteForcePref = (WPSwitchPreference) getChangePref(R.string.pref_key_jetpack_prevent_brute_force);
         mJpMatchEmailPref = (WPSwitchPreference) getChangePref(R.string.pref_key_jetpack_match_via_email);
         mJpUseTwoFactorPref = (WPSwitchPreference) getChangePref(R.string.pref_key_jetpack_require_two_factor);
-        mJpWhitelistPref = (WPPreference) getClickPref(R.string.pref_key_jetpack_brute_force_whitelist);
+        mJpAllowlistPref = (WPPreference) getClickPref(R.string.pref_key_jetpack_brute_force_allowlist);
         mWeekStartPref = (DetailListPreference) getChangePref(R.string.pref_key_site_week_start);
         mDateFormatPref = (WPPreference) getChangePref(R.string.pref_key_site_date_format);
         mTimeFormatPref = (WPPreference) getChangePref(R.string.pref_key_site_time_format);
@@ -995,6 +1006,11 @@ public void initPreferences() {
                                             && mSite.getPlanId() != PlansConstants.JETPACK_PREMIUM_PLAN_ID)) {
             removeJetpackMediaSettings();
         }
+
+        // Simple WPCom Sites now always default to Gutenberg Editor
+        if (SiteUtils.alwaysDefaultToGutenberg(mSite)) {
+            removeEditorPreferences();
+        }
     }
 
     private void updateHomepageSummary() {
@@ -1029,11 +1045,11 @@ public void setEditingEnabled(boolean enabled) {
                 mPasswordPref, mCategoryPref, mTagsPref, mFormatPref, mAllowCommentsPref,
                 mAllowCommentsNested, mSendPingbacksPref, mSendPingbacksNested, mReceivePingbacksPref,
                 mReceivePingbacksNested, mIdentityRequiredPreference, mUserAccountRequiredPref,
-                mSortByPref, mWhitelistPref, mRelatedPostsPref, mCloseAfterPref, mPagingPref,
-                mThreadingPref, mMultipleLinksPref, mModerationHoldPref, mBlacklistPref, mWeekStartPref,
+                mSortByPref, mAllowlistPref, mRelatedPostsPref, mCloseAfterPref, mPagingPref,
+                mThreadingPref, mMultipleLinksPref, mModerationHoldPref, mDenylistPref, mWeekStartPref,
                 mDateFormatPref, mTimeFormatPref, mTimezonePref, mPostsPerPagePref, mAmpPref,
                 mDeleteSitePref, mJpMonitorActivePref, mJpMonitorEmailNotesPref, mJpSsoPref,
-                mJpMonitorWpNotesPref, mJpBruteForcePref, mJpWhitelistPref, mJpMatchEmailPref, mJpUseTwoFactorPref,
+                mJpMonitorWpNotesPref, mJpBruteForcePref, mJpAllowlistPref, mJpMatchEmailPref, mJpUseTwoFactorPref,
                 mGutenbergDefaultForNewPosts, mHomepagePref
         };
 
@@ -1133,10 +1149,14 @@ private void showDateOrTimeFormatDialog(@NonNull FormatType formatType) {
         dialog.show(getFragmentManager(), "format-dialog-tag");
     }
 
-    private void showTimezoneDialog() {
-        SiteSettingsTimezoneDialog dialog = SiteSettingsTimezoneDialog.newInstance(mSiteSettings.getTimezone());
-        dialog.setTargetFragment(this, TIMEZONE_REQUEST_CODE);
-        dialog.show(getFragmentManager(), "timezone-dialog-tag");
+    private void setupTimezoneBottomSheet() {
+        if (mTimezonePref == null || !isAdded()) {
+            return;
+        }
+
+        SiteSettingsTimezoneBottomSheet bottomSheet = SiteSettingsTimezoneBottomSheet.newInstance();
+        bottomSheet.setTimezoneSettingCallback(this);
+        bottomSheet.show(((AppCompatActivity) getActivity()).getSupportFragmentManager(), TIMEZONE_BOTTOM_SHEET_TAG);
     }
 
     private void showHomepageSettings() {
@@ -1289,9 +1309,9 @@ public void setPreferencesFromSiteSettings() {
                 String.valueOf(mSiteSettings.getCommentSorting()),
                 mSiteSettings.getSortingDescription());
         int approval = mSiteSettings.getManualApproval()
-                ? mSiteSettings.getUseCommentWhitelist() ? 0
+                ? mSiteSettings.getUseCommentAllowlist() ? 0
                 : -1 : 1;
-        setDetailListPreferenceValue(mWhitelistPref, String.valueOf(approval), getWhitelistSummary(approval));
+        setDetailListPreferenceValue(mAllowlistPref, String.valueOf(approval), getAllowlistSummary(approval));
         String s = StringUtils.getQuantityString(getActivity(), R.string.site_settings_multiple_links_summary_zero,
                 R.string.site_settings_multiple_links_summary_one,
                 R.string.site_settings_multiple_links_summary_other,
@@ -1304,7 +1324,7 @@ public void setPreferencesFromSiteSettings() {
         mPagingPref.setSummary(mSiteSettings.getPagingDescription());
         mRelatedPostsPref.setSummary(mSiteSettings.getRelatedPostsDescription());
         mModerationHoldPref.setSummary(mSiteSettings.getModerationHoldDescription());
-        mBlacklistPref.setSummary(mSiteSettings.getBlacklistDescription());
+        mDenylistPref.setSummary(mSiteSettings.getDenylistDescription());
         mJpMonitorActivePref.setChecked(mSiteSettings.isJetpackMonitorEnabled());
         mJpMonitorEmailNotesPref.setChecked(mSiteSettings.shouldSendJetpackMonitorEmailNotifications());
         mJpMonitorWpNotesPref.setChecked(mSiteSettings.shouldSendJetpackMonitorWpNotifications());
@@ -1312,7 +1332,7 @@ public void setPreferencesFromSiteSettings() {
         mJpSsoPref.setChecked(mSiteSettings.isJetpackSsoEnabled());
         mJpMatchEmailPref.setChecked(mSiteSettings.isJetpackSsoMatchEmailEnabled());
         mJpUseTwoFactorPref.setChecked(mSiteSettings.isJetpackSsoTwoFactorEnabled());
-        mJpWhitelistPref.setSummary(mSiteSettings.getJetpackProtectWhitelistSummary());
+        mJpAllowlistPref.setSummary(mSiteSettings.getJetpackProtectAllowlistSummary());
         mWeekStartPref.setValue(mSiteSettings.getStartOfWeek());
         mWeekStartPref.setSummary(mWeekStartPref.getEntry());
         mGutenbergDefaultForNewPosts.setChecked(SiteUtils.isBlockEditorDefaultForNewPost(mSite));
@@ -1560,26 +1580,26 @@ private void sortLanguages() {
         }
     }
 
-    private String getWhitelistSummary(int value) {
+    private String getAllowlistSummary(int value) {
         if (isAdded()) {
             switch (value) {
                 case -1:
-                    return getString(R.string.site_settings_whitelist_none_summary);
+                    return getString(R.string.site_settings_allowlist_none_summary);
                 case 0:
-                    return getString(R.string.site_settings_whitelist_known_summary);
+                    return getString(R.string.site_settings_allowlist_known_summary);
                 case 1:
-                    return getString(R.string.site_settings_whitelist_all_summary);
+                    return getString(R.string.site_settings_allowlist_all_summary);
             }
         }
         return "";
     }
 
-    private void updateWhitelistSettings(int val) {
+    private void updateAllowlistSettings(int val) {
         mSiteSettings.setManualApproval(val == -1);
-        mSiteSettings.setUseCommentWhitelist(val == 0);
-        setDetailListPreferenceValue(mWhitelistPref,
+        mSiteSettings.setUseCommentAllowlist(val == 0);
+        setDetailListPreferenceValue(mAllowlistPref,
                 String.valueOf(val),
-                getWhitelistSummary(val));
+                getAllowlistSummary(val));
     }
 
     private void handleStartOver() {
@@ -1667,8 +1687,8 @@ public void onLongItemClick(View view, int position) {
             builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
                 String entry = input.getText().toString();
                 if (!TextUtils.isEmpty(entry) && !mEditingList.contains(entry)) {
-                    // don't modify mEditingList if it's not a reference to the JP whitelist keys
-                    if (mEditingList == mSiteSettings.getJetpackWhitelistKeys() && !isValidIpOrRange(entry)) {
+                    // don't modify mEditingList if it's not a reference to the JP allowlist keys
+                    if (mEditingList == mSiteSettings.getJetpackAllowlistKeys() && !isValidIpOrRange(entry)) {
                         ToastUtils.showToast(getActivity(), R.string.invalid_ip_or_range);
                         return;
                     }
@@ -1883,6 +1903,13 @@ private void removeNonWPComPreferences() {
                 R.string.pref_key_jetpack_performance_settings);
     }
 
+    private void removeEditorPreferences() {
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_editor,
+                R.string.pref_key_gutenberg_default_for_new_posts);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen,
+                R.string.pref_key_site_editor);
+    }
+
     private Preference getChangePref(int id) {
         return WPPrefUtils.getPrefAndSetChangeListener(this, id, this);
     }
@@ -1972,6 +1999,14 @@ public void onSiteChanged(OnSiteChanged event) {
         }
     }
 
+    // Using an interface callback, cause this SiteSettingsFragment is a extending deprecated PreferenceFragment.  So,
+    // can't use neither setTargetFragment nor onActivityResult before re-writing this!
+    @Override
+    public void onSelectTimezone(@NotNull String timezone) {
+        mSiteSettings.setTimezone(timezone);
+        onPreferenceChange(mTimezonePref, timezone);
+    }
+
     private final class ActionModeCallback implements ActionMode.Callback {
         @Override
         public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
index 593641d4fdb9..c0ca164b3374 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterface.java
@@ -36,6 +36,7 @@
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.viewmodel.ResourceProvider;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -69,10 +70,10 @@
  * - Comment Sort Order
  * - Comment Threading
  * - Comment Paging
- * - Comment User Whitelist
+ * - Comment User Allowlist
  * - Comment Link Limit
  * - Comment Moderation Hold Filter
- * - Comment Blacklist Filter
+ * - Comment Denylist Filter
  * <p>
  * This class is marked abstract. This is due to the fact that .org (self-hosted) and .com sites
  * expose different API's to query and edit their respective settings (even though the options
@@ -165,7 +166,6 @@ public interface SiteSettingsListener {
      */
     protected abstract void fetchRemoteData();
 
-    protected Context mContext;
     protected final SiteModel mSite;
     protected final SiteSettingsListener mListener;
     protected final SiteSettingsModel mSettings;
@@ -177,11 +177,11 @@ public interface SiteSettingsListener {
     @Inject SiteStore mSiteStore;
     @Inject Dispatcher mDispatcher;
     @Inject AccountStore mAccountStore;
+    @Inject ResourceProvider mResourceProvider;
 
     protected SiteSettingsInterface(Context host, SiteModel site, SiteSettingsListener listener) {
         ((WordPress) host.getApplicationContext()).component().inject(this);
         mDispatcher.register(this);
-        mContext = host;
         mSite = site;
         mListener = listener;
         mSettings = new SiteSettingsModel();
@@ -199,7 +199,6 @@ protected void finalize() throws Throwable {
 
     public void clear() {
         mDispatcher.unregister(this);
-        mContext = null;
     }
 
     public void saveSettings() {
@@ -231,15 +230,13 @@ public int getPrivacy() {
     }
 
     public @NonNull String getPrivacyDescription() {
-        if (mContext != null) {
-            switch (getPrivacy()) {
-                case -1:
-                    return mContext.getString(R.string.site_settings_privacy_private_summary);
-                case 0:
-                    return mContext.getString(R.string.site_settings_privacy_hidden_summary);
-                case 1:
-                    return mContext.getString(R.string.site_settings_privacy_public_summary);
-            }
+        switch (getPrivacy()) {
+            case -1:
+                return mResourceProvider.getString(R.string.site_settings_privacy_private_summary);
+            case 0:
+                return mResourceProvider.getString(R.string.site_settings_privacy_hidden_summary);
+            case 1:
+                return mResourceProvider.getString(R.string.site_settings_privacy_public_summary);
         }
         return "";
     }
@@ -258,8 +255,8 @@ public int getPrivacy() {
 
     public @NonNull Map<String, String> getFormats() {
         mSettings.postFormats = new HashMap<>();
-        String[] postFormatDisplayNames = mContext.getResources().getStringArray(R.array.post_format_display_names);
-        String[] postFormatKeys = mContext.getResources().getStringArray(R.array.post_format_keys);
+        String[] postFormatDisplayNames = mResourceProvider.getStringArray(R.array.post_format_display_names);
+        String[] postFormatKeys = mResourceProvider.getStringArray(R.array.post_format_keys);
         // Add standard post format (only for .com)
         mSettings.postFormats.put(STANDARD_POST_FORMAT_KEY, STANDARD_POST_FORMAT);
         // Add default post formats
@@ -337,10 +334,7 @@ public boolean getShowRelatedPostImages() {
     }
 
     public @NonNull String getRelatedPostsDescription() {
-        if (mContext == null) {
-            return "";
-        }
-        String desc = mContext.getString(getShowRelatedPosts() ? R.string.on : R.string.off);
+        String desc = mResourceProvider.getString(getShowRelatedPosts() ? R.string.on : R.string.off);
         return StringUtils.capitalize(desc);
     }
 
@@ -377,16 +371,12 @@ public int getCloseAfterPeriodForDescription() {
     }
 
     public @NonNull String getCloseAfterDescriptionForPeriod(int period) {
-        if (mContext == null) {
-            return "";
-        }
-
         if (!getShouldCloseAfter()) {
-            return mContext.getString(R.string.never);
+            return mResourceProvider.getString(R.string.never);
         }
 
-        return StringUtils.getQuantityString(mContext, R.string.never, R.string.days_quantity_one,
-                                             R.string.days_quantity_other, period);
+        return mResourceProvider.getQuantityString(R.string.never, R.string.days_quantity_one,
+                R.string.days_quantity_other, period);
     }
 
     public int getCommentSorting() {
@@ -394,18 +384,14 @@ public int getCommentSorting() {
     }
 
     public @NonNull String getSortingDescription() {
-        if (mContext == null) {
-            return "";
-        }
-
         int order = getCommentSorting();
         switch (order) {
             case SiteSettingsInterface.ASCENDING_SORT:
-                return mContext.getString(R.string.oldest_first);
+                return mResourceProvider.getString(R.string.oldest_first);
             case SiteSettingsInterface.DESCENDING_SORT:
-                return mContext.getString(R.string.newest_first);
+                return mResourceProvider.getString(R.string.newest_first);
             default:
-                return mContext.getString(R.string.unknown);
+                return mResourceProvider.getString(R.string.unknown);
         }
     }
 
@@ -426,14 +412,14 @@ public int getThreadingLevelsForDescription() {
     }
 
     public @NonNull String getThreadingDescriptionForLevel(int level) {
-        if (mContext == null) {
+        if (mResourceProvider == null) {
             return "";
         }
 
         if (level <= 1) {
-            return mContext.getString(R.string.none);
+            return mResourceProvider.getString(R.string.none);
         }
-        return String.format(mContext.getString(R.string.site_settings_threading_summary), level);
+        return String.format(mResourceProvider.getString(R.string.site_settings_threading_summary), level);
     }
 
     public boolean getShouldPageComments() {
@@ -449,17 +435,13 @@ public int getPagingCountForDescription() {
     }
 
     public @NonNull String getPagingDescription() {
-        if (mContext == null) {
-            return "";
-        }
-
         if (!getShouldPageComments()) {
-            return mContext.getString(R.string.disabled);
+            return mResourceProvider.getString(R.string.disabled);
         }
 
         int count = getPagingCountForDescription();
-        return StringUtils.getQuantityString(mContext, R.string.none, R.string.site_settings_paging_summary_one,
-                                             R.string.site_settings_paging_summary_other, count);
+        return mResourceProvider.getQuantityString(R.string.none, R.string.site_settings_paging_summary_one,
+                R.string.site_settings_paging_summary_other, count);
     }
 
     public boolean getManualApproval() {
@@ -474,7 +456,7 @@ public boolean getUserAccountRequired() {
         return mSettings.commentsRequireUserAccount;
     }
 
-    public boolean getUseCommentWhitelist() {
+    public boolean getUseCommentAllowlist() {
         return mSettings.commentAutoApprovalKnownUsers;
     }
 
@@ -493,19 +475,19 @@ public int getMultipleLinks() {
         return getKeysDescription(getModerationKeys().size());
     }
 
-    public @NonNull List<String> getBlacklistKeys() {
-        if (mSettings.blacklist == null) {
-            mSettings.blacklist = new ArrayList<>();
+    public @NonNull List<String> getDenylistKeys() {
+        if (mSettings.denylist == null) {
+            mSettings.denylist = new ArrayList<>();
         }
-        return mSettings.blacklist;
+        return mSettings.denylist;
     }
 
-    public @NonNull String getBlacklistDescription() {
-        return getKeysDescription(getBlacklistKeys().size());
+    public @NonNull String getDenylistDescription() {
+        return getKeysDescription(getDenylistKeys().size());
     }
 
-    public @NonNull String getJetpackProtectWhitelistSummary() {
-        return getKeysDescription(getJetpackWhitelistKeys().size());
+    public @NonNull String getJetpackProtectAllowlistSummary() {
+        return getKeysDescription(getJetpackAllowlistKeys().size());
     }
 
     public String getSharingLabel() {
@@ -554,13 +536,13 @@ public boolean getAllowCommentLikes() {
     }
 
     public @NonNull String getKeysDescription(int count) {
-        if (mContext == null) {
+        if (mResourceProvider == null) {
             return "";
         }
 
-        return StringUtils.getQuantityString(mContext, R.string.site_settings_list_editor_no_items_text,
-                                             R.string.site_settings_list_editor_summary_one,
-                                             R.string.site_settings_list_editor_summary_other, count);
+        return mResourceProvider.getQuantityString(R.string.site_settings_list_editor_no_items_text,
+                R.string.site_settings_list_editor_summary_one,
+                R.string.site_settings_list_editor_summary_other, count);
     }
 
     public String getStartOfWeek() {
@@ -667,13 +649,13 @@ public void enableJetpackProtect(boolean enabled) {
         mJpSettings.jetpackProtectEnabled = enabled;
     }
 
-    public @NonNull List<String> getJetpackWhitelistKeys() {
-        return mJpSettings.jetpackProtectWhitelist;
+    public @NonNull List<String> getJetpackAllowlistKeys() {
+        return mJpSettings.jetpackProtectAllowlist;
     }
 
-    public void setJetpackWhitelistKeys(@NonNull List<String> whitelistKeys) {
-        mJpSettings.jetpackProtectWhitelist.clear();
-        mJpSettings.jetpackProtectWhitelist.addAll(whitelistKeys);
+    public void setJetpackAllowlistKeys(@NonNull List<String> allowlistKeys) {
+        mJpSettings.jetpackProtectAllowlist.clear();
+        mJpSettings.jetpackProtectAllowlist.addAll(allowlistKeys);
     }
 
     public void enableJetpackSsoMatchEmail(boolean enabled) {
@@ -847,8 +829,8 @@ public void setUserAccountRequired(boolean required) {
         mSettings.commentsRequireUserAccount = required;
     }
 
-    public void setUseCommentWhitelist(boolean useWhitelist) {
-        mSettings.commentAutoApprovalKnownUsers = useWhitelist;
+    public void setUseCommentAllowlist(boolean useAllowlist) {
+        mSettings.commentAutoApprovalKnownUsers = useAllowlist;
     }
 
     public void setMultipleLinks(int count) {
@@ -859,8 +841,8 @@ public void setModerationKeys(List<String> keys) {
         mSettings.holdForModeration = keys;
     }
 
-    public void setBlacklistKeys(List<String> keys) {
-        mSettings.blacklist = keys;
+    public void setDenylistKeys(List<String> keys) {
+        mSettings.denylist = keys;
     }
 
     public void setSharingLabel(String sharingLabel) {
@@ -933,10 +915,10 @@ public boolean moderationHoldListContains(String value) {
     }
 
     /**
-     * Determines if the current Blacklist list contains a given value.
+     * Determines if the current Denylist list contains a given value.
      */
-    public boolean blacklistListContains(String value) {
-        return getBlacklistKeys().contains(value);
+    public boolean denylistListContains(String value) {
+        return getDenylistKeys().contains(value);
     }
 
     /**
@@ -1069,21 +1051,23 @@ private void loadCachedSettings() {
         // Quota information always comes from the main site table
         if (mSite.hasDiskSpaceQuotaInformation()) {
             String percentage = FormatUtils.formatPercentage(mSite.getSpacePercentUsed() / 100);
-            final String[] units = new String[] {mContext.getString(R.string.file_size_in_bytes),
-                    mContext.getString(R.string.file_size_in_kilobytes),
-                    mContext.getString(R.string.file_size_in_megabytes),
-                    mContext.getString(R.string.file_size_in_gigabytes),
-                    mContext.getString(R.string.file_size_in_terabytes) };
+            final String[] units = new String[]{mResourceProvider.getString(R.string.file_size_in_bytes),
+                    mResourceProvider.getString(R.string.file_size_in_kilobytes),
+                    mResourceProvider.getString(R.string.file_size_in_megabytes),
+                    mResourceProvider.getString(R.string.file_size_in_gigabytes),
+                    mResourceProvider.getString(R.string.file_size_in_terabytes)};
 
             String quotaAvailableSentence;
             if (mSite.getPlanId() == PlansConstants.BUSINESS_PLAN_ID) {
                 String usedSpace = FormatUtils.formatFileSize(mSite.getSpaceUsed(), units);
-                quotaAvailableSentence = String.format(mContext.getString(R.string.site_settings_quota_space_unlimited),
-                        usedSpace);
+                quotaAvailableSentence =
+                        String.format(mResourceProvider.getString(R.string.site_settings_quota_space_unlimited),
+                                usedSpace);
             } else {
                 String spaceAllowed = FormatUtils.formatFileSize(mSite.getSpaceAllowed(), units);
-                quotaAvailableSentence = String.format(mContext.getString(R.string.site_settings_quota_space_value),
-                        percentage, spaceAllowed);
+                quotaAvailableSentence =
+                        String.format(mResourceProvider.getString(R.string.site_settings_quota_space_value),
+                                percentage, spaceAllowed);
             }
             setQuotaDiskSpace(quotaAvailableSentence);
         }
@@ -1103,7 +1087,7 @@ private void loadCachedSettings() {
      * Notifies listener that credentials have been validated or are incorrect.
      */
     private void notifyCredentialsVerifiedOnUiThread(final Exception error) {
-        if (mContext == null || mListener == null) {
+        if (mResourceProvider == null || mListener == null) {
             return;
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterfaceWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterfaceWrapper.kt
new file mode 100644
index 000000000000..834584a2e658
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsInterfaceWrapper.kt
@@ -0,0 +1,69 @@
+package org.wordpress.android.ui.prefs
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+class SiteSettingsInterfaceWrapper(private val siteSettingsInterface: SiteSettingsInterface) {
+    val localSiteId: Int
+        get() = siteSettingsInterface.localSiteId
+
+    var title: String
+        get() = siteSettingsInterface.title
+        set(value) {
+            siteSettingsInterface.title = value
+        }
+
+    fun setSiteIconMediaId(mediaId: Int) = siteSettingsInterface.setSiteIconMediaId(mediaId)
+
+    fun saveSettings() = siteSettingsInterface.saveSettings()
+    fun clear() {
+        siteSettingsInterface.clear()
+    }
+
+    fun init(fetchRemote: Boolean) {
+        siteSettingsInterface.init(fetchRemote)
+    }
+
+    class Factory
+    @Inject constructor(private val contextProvider: ContextProvider) {
+        fun build(
+            site: SiteModel,
+            onSaveError: ((error: Exception?) -> Unit)? = null,
+            onFetchError: ((error: Exception?) -> Unit)? = null,
+            onSettingsUpdated: (() -> Unit)? = null,
+            onSettingsSaved: (() -> Unit)? = null,
+            onCredentialsValidated: ((error: Exception?) -> Unit)? = null
+        ): SiteSettingsInterfaceWrapper? {
+            val siteSettingsInterface = SiteSettingsInterface.getInterface(
+                    contextProvider.getContext(),
+                    site,
+                    object : SiteSettingsInterface.SiteSettingsListener {
+                        override fun onSaveError(error: Exception?) {
+                            onSaveError?.invoke(error)
+                        }
+
+                        override fun onFetchError(error: Exception?) {
+                            onFetchError?.invoke(error)
+                        }
+
+                        override fun onSettingsUpdated() {
+                            onSettingsUpdated?.invoke()
+                        }
+
+                        override fun onSettingsSaved() {
+                            onSettingsSaved?.invoke()
+                        }
+
+                        override fun onCredentialsValidated(error: Exception?) {
+                            onCredentialsValidated?.invoke(error)
+                        }
+                    })
+            return siteSettingsInterface?.let {
+                SiteSettingsInterfaceWrapper(
+                        it
+                )
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java
deleted file mode 100644
index 9b67df7808b8..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package org.wordpress.android.ui.prefs;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.EditText;
-import android.widget.Filter;
-import android.widget.Filterable;
-import android.widget.ListView;
-import android.widget.SearchView;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
-import androidx.core.graphics.ColorUtils;
-
-import com.android.volley.RequestQueue;
-import com.android.volley.Response;
-import com.android.volley.toolbox.StringRequest;
-import com.android.volley.toolbox.Volley;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.wordpress.android.Constants;
-import org.wordpress.android.R;
-import org.wordpress.android.networking.RestClientUtils;
-import org.wordpress.android.util.ActivityUtils;
-import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.ContextExtensionsKt;
-import org.wordpress.android.util.StringUtils;
-import org.wordpress.android.util.ToastUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-public class SiteSettingsTimezoneDialog extends DialogFragment implements DialogInterface.OnClickListener {
-    public static final String KEY_TIMEZONE = "timezone";
-
-    private class Timezone {
-        private final String mLabel;
-        private final String mValue;
-
-        private Timezone(String label, String value) {
-            mLabel = label;
-            mValue = value;
-        }
-    }
-
-    private boolean mConfirmed;
-    private String mSelectedTimezone;
-
-    private ListView mListView;
-    private SearchView mSearchView;
-    private View mEmptyView;
-    private View mProgressView;
-
-    private TimezoneAdapter mAdapter;
-    private LayoutInflater mInflater;
-
-    public static SiteSettingsTimezoneDialog newInstance(@NonNull String timezone) {
-        Bundle args = new Bundle();
-        args.putString(KEY_TIMEZONE, timezone);
-
-        SiteSettingsTimezoneDialog dialog = new SiteSettingsTimezoneDialog();
-        dialog.setArguments(args);
-        return dialog;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        mInflater = LayoutInflater.from(getActivity());
-        //noinspection InflateParams
-        View view = mInflater.inflate(R.layout.site_settings_timezone_dialog, null);
-
-        mListView = view.findViewById(R.id.list);
-        mListView.setOnItemClickListener((parent, view1, position, id) -> {
-            Timezone tz = (Timezone) mAdapter.getItem(position);
-            mSelectedTimezone = tz.mValue;
-            mAdapter.notifyDataSetChanged();
-            hideSearchKeyboard();
-        });
-
-        mSearchView = view.findViewById(R.id.search_view);
-        mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
-            @Override
-            public boolean onQueryTextSubmit(String query) {
-                if (mAdapter != null) {
-                    mAdapter.getFilter().filter(query);
-                }
-                return true;
-            }
-
-            @Override
-            public boolean onQueryTextChange(String newText) {
-                if (mAdapter != null) {
-                    mAdapter.getFilter().filter(newText);
-                }
-                return true;
-            }
-        });
-
-        mSearchView.setEnabled(false);
-        mSearchView.setIconifiedByDefault(false);
-        setSearchViewContentDescription(mSearchView);
-
-
-        mEmptyView = view.findViewById(R.id.empty_view);
-        mProgressView = view.findViewById(R.id.progress_view);
-
-        int topOffset = getResources().getDimensionPixelOffset(R.dimen.settings_fragment_dialog_vertical_inset);
-
-        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity())
-                .setBackgroundInsetTop(topOffset)
-                .setBackgroundInsetBottom(topOffset);
-        builder.setPositiveButton(android.R.string.ok, this);
-        builder.setNegativeButton(R.string.cancel, this);
-        builder.setView(view);
-
-        mSelectedTimezone = getArguments().getString(KEY_TIMEZONE);
-        requestTimezones();
-
-        return builder.create();
-    }
-
-    private void requestTimezones() {
-        Response.Listener<String> listener = response -> {
-            AppLog.d(AppLog.T.SETTINGS, "timezones requested");
-            if (isAdded()) {
-                showProgressView(false);
-                if (!TextUtils.isEmpty(response)) {
-                    loadTimezones(response);
-                } else {
-                    AppLog.w(AppLog.T.SETTINGS, "empty response requesting timezones");
-                    dismissWithError();
-                }
-            }
-        };
-
-        Response.ErrorListener errorListener = error -> {
-            AppLog.e(AppLog.T.SETTINGS, "Error requesting timezones", error);
-            if (isAdded()) {
-                dismissWithError();
-            }
-        };
-
-        StringRequest request = new StringRequest(Constants.URL_TIMEZONE_ENDPOINT, listener, errorListener) {
-            @Override
-            protected Map<String, String> getParams() {
-                return RestClientUtils.getRestLocaleParams(getActivity());
-            }
-        };
-
-        showProgressView(true);
-        RequestQueue queue = Volley.newRequestQueue(getActivity());
-        queue.add(request);
-    }
-
-    private void setSearchViewContentDescription(ViewGroup group) {
-        for (int i = 0; i < group.getChildCount(); i++) {
-            View child = group.getChildAt(i);
-            if (child instanceof EditText) {
-                child.setContentDescription(getString(R.string.search));
-            } else if (child instanceof ViewGroup) {
-                setSearchViewContentDescription((ViewGroup) child);
-            }
-        }
-    }
-
-    private void loadTimezones(@NonNull String responseJson) {
-        ArrayList<Timezone> timezones = new ArrayList<>();
-        try {
-            JSONObject jsonResponse = new JSONObject(responseJson);
-            JSONArray jsonTimezones = jsonResponse.getJSONArray("timezones");
-            for (int i = 0; i < jsonTimezones.length(); i++) {
-                JSONObject json = jsonTimezones.getJSONObject(i);
-                timezones.add(
-                        new Timezone(json.getString("label"), json.getString("value"))
-                );
-            }
-
-            // sort by label
-            Collections.sort(timezones, (t1, t2) -> StringUtils.compare(t1.mLabel, t2.mLabel));
-
-            mAdapter = new TimezoneAdapter(timezones, mListView.getContext());
-            mListView.setAdapter(mAdapter);
-            mSearchView.setEnabled(true);
-
-            // give the list time to load before making the selection
-            new Handler().postDelayed(() -> {
-                if (isAdded()) {
-                    int index = mAdapter.indexOfValue(mSelectedTimezone);
-                    if (index > -1) {
-                        mListView.setSelection(index);
-                    }
-                }
-            }, 100);
-        } catch (JSONException e) {
-            AppLog.e(AppLog.T.SETTINGS, "Error parsing timezones", e);
-            dismissWithError();
-        }
-    }
-
-    private void dismissWithError() {
-        ToastUtils.showToast(getActivity(), R.string.site_settings_timezones_error);
-        dismiss();
-    }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        mConfirmed = which == DialogInterface.BUTTON_POSITIVE;
-        dismiss();
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        // TODO: android.app.Fragment  is deprecated since Android P.
-        // Needs to be replaced with android.support.v4.app.Fragment
-        // See https://developer.android.com/reference/android/app/Fragment
-        android.app.Fragment target = getTargetFragment();
-        if (mConfirmed && target != null && !TextUtils.isEmpty(mSelectedTimezone)) {
-            Intent intent = new Intent().putExtra(KEY_TIMEZONE, mSelectedTimezone);
-            target.onActivityResult(getTargetRequestCode(), Activity.RESULT_OK, intent);
-        }
-
-        super.onDismiss(dialog);
-    }
-
-    private void showEmptyView(boolean show) {
-        if (isAdded()) {
-            mEmptyView.setVisibility(show ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    private void showProgressView(boolean show) {
-        if (isAdded()) {
-            mProgressView.setVisibility(show ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    private void hideSearchKeyboard() {
-        if (isAdded()) {
-            ActivityUtils.hideKeyboardForced(mSearchView);
-        }
-    }
-
-    private class TimezoneViewHolder {
-        private final TextView mTxtLabel;
-
-        TimezoneViewHolder(View view) {
-            mTxtLabel = view.findViewById(android.R.id.text1);
-        }
-    }
-
-    private class TimezoneAdapter extends BaseAdapter implements Filterable {
-        private final List<Timezone> mAllTimezones = new ArrayList<>();
-        private final List<Timezone> mFilteredTimezones = new ArrayList<>();
-
-        private int mSelectedRowColor;
-        private int mUnselectedColor;
-
-        private TimezoneAdapter(@NonNull List<Timezone> timezones, Context context) {
-            mAllTimezones.addAll(timezones);
-            mFilteredTimezones.addAll(timezones);
-
-            mSelectedRowColor = ColorUtils
-                    .setAlphaComponent(
-                            ContextExtensionsKt.getColorFromAttribute(context, R.attr.colorOnSurface),
-                            context.getResources()
-                                   .getInteger(R.integer.custom_popup_selected_list_item_opacity_dec)
-                    );
-
-            mUnselectedColor = context.getResources().getColor(android.R.color.transparent);
-        }
-
-        @Override
-        public int getCount() {
-            return mFilteredTimezones.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mFilteredTimezones.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        public int indexOfValue(String timezoneValue) {
-            if (!TextUtils.isEmpty(timezoneValue)) {
-                for (int i = 0; i < mFilteredTimezones.size(); i++) {
-                    if (timezoneValue.equals(mFilteredTimezones.get(i).mValue)) {
-                        return i;
-                    }
-                }
-            }
-            return -1;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            TimezoneViewHolder holder;
-            if (convertView == null || convertView.getTag() == null) {
-                convertView = mInflater.inflate(android.R.layout.simple_list_item_1, parent, false);
-                holder = new TimezoneViewHolder(convertView);
-                convertView.setTag(holder);
-            } else {
-                holder = (TimezoneViewHolder) convertView.getTag();
-            }
-
-            boolean isSelected = mSelectedTimezone != null
-                                 && mSelectedTimezone.equals(mFilteredTimezones.get(position).mValue);
-
-
-            int bgColor = isSelected ? mSelectedRowColor : mUnselectedColor;
-            holder.mTxtLabel.setBackgroundColor(bgColor);
-            holder.mTxtLabel.setText(mFilteredTimezones.get(position).mLabel);
-
-            return convertView;
-        }
-
-        @Override
-        public Filter getFilter() {
-            return new Filter() {
-                @SuppressWarnings("unchecked")
-                @Override
-                protected void publishResults(CharSequence constraint, FilterResults results) {
-                    mFilteredTimezones.clear();
-                    mFilteredTimezones.addAll((List<Timezone>) results.values);
-                    showEmptyView(mFilteredTimezones.isEmpty());
-                    TimezoneAdapter.this.notifyDataSetChanged();
-                }
-
-                @Override
-                protected FilterResults performFiltering(CharSequence constraint) {
-                    List<Timezone> filtered = new ArrayList<>();
-                    if (TextUtils.isEmpty(constraint)) {
-                        filtered.addAll(mAllTimezones);
-                    } else {
-                        String lcConstraint = constraint.toString().toLowerCase(Locale.ROOT);
-                        for (Timezone tz : mAllTimezones) {
-                            if (tz.mLabel.toLowerCase(Locale.ROOT).contains(lcConstraint)) {
-                                filtered.add(tz);
-                            }
-                        }
-                    }
-
-                    FilterResults results = new FilterResults();
-                    results.values = filtered;
-
-                    return results;
-                }
-            };
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPComSiteSettings.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPComSiteSettings.java
index 2fb4ebc3343b..5915ea9929e7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPComSiteSettings.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPComSiteSettings.java
@@ -53,10 +53,10 @@ class WPComSiteSettings extends SiteSettingsInterface {
     private static final String COMMENT_MODERATION_KEY = "comment_moderation";
     private static final String REQUIRE_IDENTITY_KEY = "require_name_email";
     private static final String REQUIRE_USER_ACCOUNT_KEY = "comment_registration";
-    private static final String WHITELIST_KNOWN_USERS_KEY = "comment_whitelist";
+    private static final String ALLOWLIST_KNOWN_USERS_KEY = "comment_whitelist";
     private static final String MAX_LINKS_KEY = "comment_max_links";
     private static final String MODERATION_KEYS_KEY = "moderation_keys";
-    private static final String BLACKLIST_KEYS_KEY = "blacklist_keys";
+    private static final String DENYLIST_KEYS_KEY = "blacklist_keys";
     private static final String SHARING_LABEL_KEY = "sharing_label";
     private static final String SHARING_BUTTON_STYLE_KEY = "sharing_button_style";
     private static final String SHARING_REBLOGS_DISABLED_KEY = "disabled_reblogs";
@@ -65,7 +65,7 @@ class WPComSiteSettings extends SiteSettingsInterface {
     private static final String TWITTER_USERNAME_KEY = "twitter_via";
     private static final String JP_MONITOR_EMAIL_NOTES_KEY = "email_notifications";
     private static final String JP_MONITOR_WP_NOTES_KEY = "wp_note_notifications";
-    private static final String JP_PROTECT_WHITELIST_KEY = "jetpack_protect_whitelist";
+    private static final String JP_PROTECT_ALLOWLIST_KEY = "jetpack_protect_whitelist";
     // Jetpack modules
     private static final String SERVE_IMAGES_FROM_OUR_SERVERS = "photon";
     private static final String SERVE_STATIC_FILES_FROM_OUR_SERVERS = "photon-cdn";
@@ -79,6 +79,7 @@ class WPComSiteSettings extends SiteSettingsInterface {
     private static final String DATE_FORMAT_KEY = "date_format";
     private static final String TIME_FORMAT_KEY = "time_format";
     private static final String TIMEZONE_KEY = "timezone_string";
+    private static final String GMT_OFFSET_KEY = "gmt_offset";
     private static final String POSTS_PER_PAGE_KEY = "posts_per_page";
     private static final String AMP_SUPPORTED_KEY = "amp_is_supported";
     private static final String AMP_ENABLED_KEY = "amp_is_enabled";
@@ -257,17 +258,17 @@ public void onResponse(JSONObject response) {
                 mRemoteJpSettings.ssoRequireTwoFactor = data.optBoolean("jetpack_sso_require_two_step", false);
                 mRemoteJpSettings.commentLikes = data.optBoolean(COMMENT_LIKES, false);
 
-                JSONObject jetpackProtectWhitelist = data.optJSONObject("jetpack_protect_global_whitelist");
-                if (jetpackProtectWhitelist != null) {
-                    // clear existing whitelist entries before adding items from response
-                    mRemoteJpSettings.jetpackProtectWhitelist.clear();
-
-                    JSONArray whitelistItems = jetpackProtectWhitelist.optJSONArray("local");
-                    if (whitelistItems != null) {
-                        for (int i = 0; i < whitelistItems.length(); ++i) {
-                            String item = whitelistItems.optString(i, "");
-                            if (!item.isEmpty() && !mRemoteJpSettings.jetpackProtectWhitelist.contains(item)) {
-                                mRemoteJpSettings.jetpackProtectWhitelist.add(item);
+                JSONObject jetpackProtectAllowlist = data.optJSONObject("jetpack_protect_global_whitelist");
+                if (jetpackProtectAllowlist != null) {
+                    // clear existing allowlist entries before adding items from response
+                    mRemoteJpSettings.jetpackProtectAllowlist.clear();
+
+                    JSONArray allowlistItems = jetpackProtectAllowlist.optJSONArray("local");
+                    if (allowlistItems != null) {
+                        for (int i = 0; i < allowlistItems.length(); ++i) {
+                            String item = allowlistItems.optString(i, "");
+                            if (!item.isEmpty() && !mRemoteJpSettings.jetpackProtectAllowlist.contains(item)) {
+                                mRemoteJpSettings.jetpackProtectAllowlist.add(item);
                             }
                         }
                     }
@@ -275,8 +276,8 @@ public void onResponse(JSONObject response) {
 
                 mJpSettings.monitorActive = mRemoteJpSettings.monitorActive;
                 mJpSettings.jetpackProtectEnabled = mRemoteJpSettings.jetpackProtectEnabled;
-                mJpSettings.jetpackProtectWhitelist.clear();
-                mJpSettings.jetpackProtectWhitelist.addAll(mRemoteJpSettings.jetpackProtectWhitelist);
+                mJpSettings.jetpackProtectAllowlist.clear();
+                mJpSettings.jetpackProtectAllowlist.addAll(mRemoteJpSettings.jetpackProtectAllowlist);
                 mJpSettings.ssoActive = mRemoteJpSettings.ssoActive;
                 mJpSettings.ssoMatchEmail = mRemoteJpSettings.ssoMatchEmail;
                 mJpSettings.ssoRequireTwoFactor = mRemoteJpSettings.ssoRequireTwoFactor;
@@ -445,8 +446,8 @@ public void onResponse(JSONObject response) {
                         AppLog.d(AppLog.T.API, "Jetpack settings updated");
                         mRemoteJpSettings.monitorActive = sentJpData.monitorActive;
                         mRemoteJpSettings.jetpackProtectEnabled = sentJpData.jetpackProtectEnabled;
-                        mRemoteJpSettings.jetpackProtectWhitelist.clear();
-                        mRemoteJpSettings.jetpackProtectWhitelist.addAll(sentJpData.jetpackProtectWhitelist);
+                        mRemoteJpSettings.jetpackProtectAllowlist.clear();
+                        mRemoteJpSettings.jetpackProtectAllowlist.addAll(sentJpData.jetpackProtectAllowlist);
                         mRemoteJpSettings.ssoActive = sentJpData.ssoActive;
                         mRemoteJpSettings.ssoMatchEmail = sentJpData.ssoMatchEmail;
                         mRemoteJpSettings.ssoRequireTwoFactor = sentJpData.ssoRequireTwoFactor;
@@ -681,10 +682,10 @@ private void deserializeWpComRestResponse(SiteModel site, JSONObject response) {
         mRemoteSettings.commentApprovalRequired = settingsObject.optBoolean(COMMENT_MODERATION_KEY, false);
         mRemoteSettings.commentsRequireIdentity = settingsObject.optBoolean(REQUIRE_IDENTITY_KEY, false);
         mRemoteSettings.commentsRequireUserAccount = settingsObject.optBoolean(REQUIRE_USER_ACCOUNT_KEY, true);
-        mRemoteSettings.commentAutoApprovalKnownUsers = settingsObject.optBoolean(WHITELIST_KNOWN_USERS_KEY, false);
+        mRemoteSettings.commentAutoApprovalKnownUsers = settingsObject.optBoolean(ALLOWLIST_KNOWN_USERS_KEY, false);
         mRemoteSettings.maxLinks = settingsObject.optInt(MAX_LINKS_KEY, 0);
         mRemoteSettings.holdForModeration = new ArrayList<>();
-        mRemoteSettings.blacklist = new ArrayList<>();
+        mRemoteSettings.denylist = new ArrayList<>();
         mRemoteSettings.sharingLabel = settingsObject.optString(SHARING_LABEL_KEY, "");
         mRemoteSettings.sharingButtonStyle = settingsObject.optString(SHARING_BUTTON_STYLE_KEY,
                                                                       DEFAULT_SHARING_BUTTON_STYLE);
@@ -693,7 +694,15 @@ private void deserializeWpComRestResponse(SiteModel site, JSONObject response) {
         mRemoteSettings.startOfWeek = settingsObject.optString(START_OF_WEEK_KEY, "");
         mRemoteSettings.dateFormat = settingsObject.optString(DATE_FORMAT_KEY, "");
         mRemoteSettings.timeFormat = settingsObject.optString(TIME_FORMAT_KEY, "");
-        mRemoteSettings.timezone = settingsObject.optString(TIMEZONE_KEY, "");
+
+        // Android returns manual offsets as gmt_offset and not as UTC
+        String remoteTimezone = settingsObject.optString(TIMEZONE_KEY, "");
+        String remoteGmtOffset = settingsObject.optString(GMT_OFFSET_KEY, "");
+        // UTC-7 comes back as gmt_offset: -7, UTC+7 as just gmt_offset: 7 without the +, hence adding prefix
+        String remoteGmtTimezone = remoteGmtOffset.startsWith("-") ? "UTC" + remoteGmtOffset : "UTC+" + remoteGmtOffset;
+        
+        mRemoteSettings.timezone = !TextUtils.isEmpty(remoteTimezone) ? remoteTimezone : remoteGmtTimezone;
+
         mRemoteSettings.postsPerPage = settingsObject.optInt(POSTS_PER_PAGE_KEY, 0);
         mRemoteSettings.ampSupported = settingsObject.optBoolean(AMP_SUPPORTED_KEY, false);
         mRemoteSettings.ampEnabled = settingsObject.optBoolean(AMP_ENABLED_KEY, false);
@@ -709,9 +718,9 @@ private void deserializeWpComRestResponse(SiteModel site, JSONObject response) {
         if (modKeys.length() > 0) {
             Collections.addAll(mRemoteSettings.holdForModeration, modKeys.split("\n"));
         }
-        String blacklistKeys = settingsObject.optString(BLACKLIST_KEYS_KEY, "");
-        if (blacklistKeys.length() > 0) {
-            Collections.addAll(mRemoteSettings.blacklist, blacklistKeys.split("\n"));
+        String denylistKeys = settingsObject.optString(DENYLIST_KEYS_KEY, "");
+        if (denylistKeys.length() > 0) {
+            Collections.addAll(mRemoteSettings.denylist, denylistKeys.split("\n"));
         }
 
         if (settingsObject.optString(COMMENT_SORT_ORDER_KEY, "").equals("asc")) {
@@ -720,14 +729,14 @@ private void deserializeWpComRestResponse(SiteModel site, JSONObject response) {
             mRemoteSettings.sortCommentsBy = DESCENDING_SORT;
         }
 
-        JSONObject jetpackProtectWhitelist = settingsObject.optJSONObject(JP_PROTECT_WHITELIST_KEY);
-        if (jetpackProtectWhitelist != null) {
-            JSONArray whitelistItems = jetpackProtectWhitelist.optJSONArray("local");
-            if (whitelistItems != null) {
-                for (int i = 0; i < whitelistItems.length(); ++i) {
-                    String item = whitelistItems.optString(i, "");
-                    if (!item.isEmpty() && !mRemoteJpSettings.jetpackProtectWhitelist.contains(item)) {
-                        mRemoteJpSettings.jetpackProtectWhitelist.add(item);
+        JSONObject jetpackProtectAllowlist = settingsObject.optJSONObject(JP_PROTECT_ALLOWLIST_KEY);
+        if (jetpackProtectAllowlist != null) {
+            JSONArray allowlistItems = jetpackProtectAllowlist.optJSONArray("local");
+            if (allowlistItems != null) {
+                for (int i = 0; i < allowlistItems.length(); ++i) {
+                    String item = allowlistItems.optString(i, "");
+                    if (!item.isEmpty() && !mRemoteJpSettings.jetpackProtectAllowlist.contains(item)) {
+                        mRemoteJpSettings.jetpackProtectAllowlist.add(item);
                     }
                 }
             }
@@ -741,7 +750,7 @@ private void deserializeWpComRestResponse(SiteModel site, JSONObject response) {
     }
 
     /**
-     * Need to use JSONObject's instead of HashMap<String, String> to serialize array values (Jetpack Whitelist)
+     * Need to use JSONObject's instead of HashMap<String, String> to serialize array values (Jetpack Allowlist)
      */
     private JSONObject serializeWpComParamsToJSONObject() throws JSONException {
         JSONObject params = new JSONObject();
@@ -816,7 +825,7 @@ private JSONObject serializeWpComParamsToJSONObject() throws JSONException {
             params.put(REQUIRE_USER_ACCOUNT_KEY, String.valueOf(mSettings.commentsRequireUserAccount));
         }
         if (mSettings.commentAutoApprovalKnownUsers != mRemoteSettings.commentAutoApprovalKnownUsers) {
-            params.put(WHITELIST_KNOWN_USERS_KEY, String.valueOf(mSettings.commentAutoApprovalKnownUsers));
+            params.put(ALLOWLIST_KNOWN_USERS_KEY, String.valueOf(mSettings.commentAutoApprovalKnownUsers));
         }
         if (mSettings.maxLinks != mRemoteSettings.maxLinks) {
             params.put(MAX_LINKS_KEY, String.valueOf(mSettings.maxLinks));
@@ -834,16 +843,16 @@ private JSONObject serializeWpComParamsToJSONObject() throws JSONException {
                 params.put(MODERATION_KEYS_KEY, "");
             }
         }
-        if (mSettings.blacklist != null && !mSettings.blacklist.equals(mRemoteSettings.blacklist)) {
+        if (mSettings.denylist != null && !mSettings.denylist.equals(mRemoteSettings.denylist)) {
             StringBuilder builder = new StringBuilder();
-            for (String key : mSettings.blacklist) {
+            for (String key : mSettings.denylist) {
                 builder.append(key);
                 builder.append("\n");
             }
             if (builder.length() > 1) {
-                params.put(BLACKLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
+                params.put(DENYLIST_KEYS_KEY, builder.substring(0, builder.length() - 1));
             } else {
-                params.put(BLACKLIST_KEYS_KEY, "");
+                params.put(DENYLIST_KEYS_KEY, "");
             }
         }
         if (mSettings.sharingLabel != null && !mSettings.sharingLabel.equals(mRemoteSettings.sharingLabel)) {
@@ -918,9 +927,9 @@ private Map<String, Object> serializeJetpackProtectAndSsoParams() {
         if (mJpSettings.jetpackProtectEnabled != mRemoteJpSettings.jetpackProtectEnabled) {
             params.put("protect", mJpSettings.jetpackProtectEnabled);
         }
-        if (!mJpSettings.whitelistMatches(mRemoteJpSettings.jetpackProtectWhitelist)) {
-            String whitelistArray = TextUtils.join(",", mJpSettings.jetpackProtectWhitelist);
-            params.put("jetpack_protect_global_whitelist", whitelistArray);
+        if (!mJpSettings.allowlistMatches(mRemoteJpSettings.jetpackProtectAllowlist)) {
+            String allowlistArray = TextUtils.join(",", mJpSettings.jetpackProtectAllowlist);
+            params.put("jetpack_protect_global_whitelist", allowlistArray);
         }
         if (mJpSettings.ssoActive != mRemoteJpSettings.ssoActive) {
             params.put("sso", mJpSettings.ssoActive);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/homepage/HomepageSettingsDialog.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/homepage/HomepageSettingsDialog.kt
index 30941f756dbe..05c70d62b1f2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/homepage/HomepageSettingsDialog.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/homepage/HomepageSettingsDialog.kt
@@ -13,16 +13,15 @@ import android.widget.TextView
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.android.synthetic.main.site_settings_homepage_dialog.view.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.SiteSettingsHomepageDialogBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.getColorResIdFromAttribute
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class HomepageSettingsDialog : DialogFragment() {
@@ -41,71 +40,62 @@ class HomepageSettingsDialog : DialogFragment() {
             pageOnFrontId = bundle.get(KEY_PAGE_ON_FRONT)?.let { it as Long }
             pageForPostsId = bundle.get(KEY_PAGE_FOR_POSTS)?.let { it as Long }
         } ?: throw IllegalArgumentException("Site has to be initialized")
-        val view = View.inflate(
-                activity,
-                R.layout.site_settings_homepage_dialog,
-                null
-        )
-        view.apply {
-            homepage_settings_radio_group.setOnCheckedChangeListener { _, checkedId ->
+        val builder = MaterialAlertDialogBuilder(requireActivity())
+        builder.setPositiveButton(R.string.site_settings_accept_homepage) { _, _ -> }
+        builder.setNegativeButton(R.string.cancel) { _, _ -> }
+        with(SiteSettingsHomepageDialogBinding.inflate(requireActivity().layoutInflater)) {
+            homepageSettingsRadioGroup.setOnCheckedChangeListener { _, checkedId ->
                 when (checkedId) {
                     R.id.classic_blog -> viewModel.classicBlogSelected()
                     R.id.static_homepage -> viewModel.staticHomepageSelected()
                 }
             }
-        }
-        val builder = MaterialAlertDialogBuilder(requireActivity())
-        builder.setPositiveButton(R.string.site_settings_accept_homepage) { _, _ -> }
-        builder.setNegativeButton(R.string.cancel) { _, _ -> }
-        builder.setView(view)
+            builder.setView(root)
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
-                .get(HomepageSettingsViewModel::class.java)
-        viewModel.uiState.observe(this, Observer { uiState ->
-            uiState?.let {
-                view.apply {
-                    loading_pages.visibility = if (uiState.isLoading) View.VISIBLE else View.GONE
+            viewModel = ViewModelProvider(this@HomepageSettingsDialog, viewModelFactory)
+                    .get(HomepageSettingsViewModel::class.java)
+            viewModel.uiState.observe(this@HomepageSettingsDialog, { uiState ->
+                uiState?.let {
+                    loadingPages.visibility = if (uiState.isLoading) View.VISIBLE else View.GONE
                     enablePositiveButton(uiState.isSaveEnabled)
                     if (uiState.error != null) {
-                        loading_error.visibility = View.VISIBLE
-                        loading_error.setText(uiState.error)
+                        loadingError.visibility = View.VISIBLE
+                        loadingError.setText(uiState.error)
                     } else {
-                        loading_error.visibility = View.GONE
-                        loading_error.text = null
+                        loadingError.visibility = View.GONE
+                        loadingError.text = null
                     }
                     when (uiState.isClassicBlogState) {
                         true -> {
-                            homepage_settings_radio_group.checkIfNotChecked(R.id.classic_blog)
-                            dropdown_container.visibility = View.GONE
+                            homepageSettingsRadioGroup.checkIfNotChecked(R.id.classic_blog)
+                            dropdownContainer.visibility = View.GONE
                         }
                         false -> {
-                            homepage_settings_radio_group.checkIfNotChecked(R.id.static_homepage)
+                            homepageSettingsRadioGroup.checkIfNotChecked(R.id.static_homepage)
                             if (uiState.pageForPostsState != null && uiState.pageOnFrontState != null) {
-                                dropdown_container.visibility = View.VISIBLE
+                                dropdownContainer.visibility = View.VISIBLE
                                 setupDropdownItem(
                                         uiState.pageOnFrontState,
-                                        selected_homepage,
+                                        selectedHomepage,
                                         viewModel::onPageOnFrontDialogOpened,
                                         viewModel::onPageOnFrontSelected
                                 )
                                 setupDropdownItem(
                                         uiState.pageForPostsState,
-                                        selected_posts_page,
+                                        selectedPostsPage,
                                         viewModel::onPageForPostsDialogOpened,
                                         viewModel::onPageForPostsSelected
                                 )
                             } else {
-                                dropdown_container.visibility = View.GONE
+                                dropdownContainer.visibility = View.GONE
                             }
                         }
                     }
                 }
-            }
-        })
-        viewModel.dismissDialogEvent.observe(this, Observer {
-            it?.applyIfNotHandled {
-                requireDialog().dismiss()
-            }
+            })
+        }
+        viewModel.dismissDialogEvent.observeEvent(this, {
+            requireDialog().dismiss()
         })
         viewModel.start(requireNotNull(siteId), isClassicBlog, pageForPostsId, pageOnFrontId)
         return builder.create()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.java
index 32fe88422c12..9e3588ab1889 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsActivity.java
@@ -22,11 +22,11 @@
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.ui.LocaleAwareActivity;
 import org.wordpress.android.ui.notifications.NotificationEvents;
-import org.wordpress.android.ui.prefs.notifications.PrefMasterSwitchToolbarView.MasterSwitchToolbarListener;
+import org.wordpress.android.ui.prefs.notifications.PrefMainSwitchToolbarView.MainSwitchToolbarListener;
 
 // Simple wrapper activity for NotificationsSettingsFragment
 public class NotificationsSettingsActivity extends LocaleAwareActivity
-        implements MasterSwitchToolbarListener {
+        implements MainSwitchToolbarListener {
     private TextView mMessageTextView;
     private View mMessageContainer;
 
@@ -39,14 +39,14 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.notifications_settings_activity);
         mFragmentContainer = findViewById(R.id.fragment_container);
 
-        // Get shared preferences for master switch.
+        // Get shared preferences for main switch.
         mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(NotificationsSettingsActivity.this);
 
         // Set up primary toolbar
         setUpToolbar();
 
-        // Set up master switch
-        setUpMasterSwitch();
+        // Set up main switch
+        setUpMainSwitch();
 
         FragmentManager fragmentManager = getFragmentManager();
         if (savedInstanceState == null) {
@@ -112,24 +112,24 @@ private void setUpToolbar() {
     }
 
     /**
-     * Sets up master switch to disable/enable all notification settings
+     * Sets up main switch to disable/enable all notification settings
      */
-    private void setUpMasterSwitch() {
-        PrefMasterSwitchToolbarView masterSwitchToolBarView = findViewById(R.id.master_switch);
-        masterSwitchToolBarView.setMasterSwitchToolbarListener(this);
-
-        // Set master switch state from shared preferences.
-        boolean isMasterChecked = mSharedPreferences.getBoolean(getString(R.string.wp_pref_notifications_master), true);
-        masterSwitchToolBarView.loadInitialState(isMasterChecked);
-        hideDisabledView(isMasterChecked);
+    private void setUpMainSwitch() {
+        PrefMainSwitchToolbarView mainSwitchToolBarView = findViewById(R.id.main_switch);
+        mainSwitchToolBarView.setMainSwitchToolbarListener(this);
+
+        // Set main switch state from shared preferences.
+        boolean isMainChecked = mSharedPreferences.getBoolean(getString(R.string.wp_pref_notifications_main), true);
+        mainSwitchToolBarView.loadInitialState(isMainChecked);
+        hideDisabledView(isMainChecked);
     }
 
     @Override
-    public void onMasterSwitchCheckedChanged(
+    public void onMainSwitchCheckedChanged(
             CompoundButton buttonView,
             boolean isChecked
     ) {
-        mSharedPreferences.edit().putBoolean(getString(R.string.wp_pref_notifications_master), isChecked)
+        mSharedPreferences.edit().putBoolean(getString(R.string.wp_pref_notifications_main), isChecked)
                           .apply();
 
         hideDisabledView(isChecked);
@@ -142,13 +142,13 @@ public void onMasterSwitchCheckedChanged(
     }
 
     /**
-     * Hide view when Notification Settings are disabled by toggling the master switch off.
+     * Hide view when Notification Settings are disabled by toggling the main switch off.
      *
-     * @param isMasterChecked TRUE to hide disabled view, FALSE to show disabled view
+     * @param isMainChecked TRUE to hide disabled view, FALSE to show disabled view
      */
-    protected void hideDisabledView(boolean isMasterChecked) {
+    protected void hideDisabledView(boolean isMainChecked) {
         LinearLayout notificationsDisabledView = findViewById(R.id.notification_settings_disabled_view);
-        notificationsDisabledView.setVisibility(isMasterChecked ? View.INVISIBLE : View.VISIBLE);
-        mFragmentContainer.setVisibility(isMasterChecked ? View.VISIBLE : View.GONE);
+        notificationsDisabledView.setVisibility(isMainChecked ? View.INVISIBLE : View.VISIBLE);
+        mFragmentContainer.setVisibility(isMainChecked ? View.VISIBLE : View.GONE);
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsDialogPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsDialogPreference.java
index 0f91fe2a67a4..59d64e378438 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsDialogPreference.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsDialogPreference.java
@@ -25,7 +25,7 @@
 import org.wordpress.android.models.NotificationsSettings;
 import org.wordpress.android.models.NotificationsSettings.Channel;
 import org.wordpress.android.models.NotificationsSettings.Type;
-import org.wordpress.android.ui.prefs.notifications.PrefMasterSwitchToolbarView.MasterSwitchToolbarListener;
+import org.wordpress.android.ui.prefs.notifications.PrefMainSwitchToolbarView.MainSwitchToolbarListener;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.ContextUtilsKt;
@@ -35,7 +35,7 @@
 
 // A dialog preference that displays settings for a NotificationSettings Channel and Type
 public class NotificationsSettingsDialogPreference extends DialogPreference
-        implements MasterSwitchToolbarListener {
+        implements MainSwitchToolbarListener {
     private static final String SETTING_VALUE_ACHIEVEMENT = "achievement";
 
     private NotificationsSettings.Channel mChannel;
@@ -44,15 +44,15 @@ public class NotificationsSettingsDialogPreference extends DialogPreference
     private JSONObject mUpdatedJson = new JSONObject();
     private long mBlogId;
 
-    private ViewGroup mTitleViewWithMasterSwitch;
+    private ViewGroup mTitleViewWithMainSwitch;
 
-    // view to display when master switch is on
+    // view to display when main switch is on
     private View mDisabledView;
-    // view to display when master switch is off
+    // view to display when main switch is off
     private LinearLayout mOptionsView;
 
-    private PrefMasterSwitchToolbarView mMasterSwitchToolbarView;
-    private boolean mShouldDisplayMasterSwitch;
+    private PrefMainSwitchToolbarView mMainSwitchToolbarView;
+    private boolean mShouldDisplayMainSwitch;
 
     private String[] mSettingsArray = new String[0], mSettingsValues = new String[0];
 
@@ -72,26 +72,26 @@ public NotificationsSettingsDialogPreference(Context context, AttributeSet attrs
         mBlogId = blogId;
         mSettings = settings;
         mOnNotificationsSettingsChangedListener = listener;
-        mShouldDisplayMasterSwitch = mSettings.shouldDisplayMasterSwitch(mChannel, mType);
+        mShouldDisplayMainSwitch = mSettings.shouldDisplayMainSwitch(mChannel, mType);
     }
 
     @Override
     protected void onBindDialogView(@NonNull View view) {
         super.onBindDialogView(view);
-        if (mShouldDisplayMasterSwitch) {
-            setupTitleViewWithMasterSwitch(view);
+        if (mShouldDisplayMainSwitch) {
+            setupTitleViewWithMainSwitch(view);
         }
     }
 
     @Override
     protected void onPrepareDialogBuilder(Builder builder) {
         super.onPrepareDialogBuilder(builder);
-        if (mShouldDisplayMasterSwitch) {
-            if (mTitleViewWithMasterSwitch == null) {
-                AppLog.e(T.NOTIFS, "Master switch enabled but layout not set");
+        if (mShouldDisplayMainSwitch) {
+            if (mTitleViewWithMainSwitch == null) {
+                AppLog.e(T.NOTIFS, "Main switch enabled but layout not set");
                 return;
             }
-            builder.setCustomTitle(mTitleViewWithMasterSwitch);
+            builder.setCustomTitle(mTitleViewWithMainSwitch);
         }
     }
 
@@ -106,7 +106,7 @@ protected View onCreateDialogView() {
                 LinearLayout.LayoutParams.MATCH_PARENT));
         innerView.setOrientation(LinearLayout.VERTICAL);
 
-        if (mShouldDisplayMasterSwitch) {
+        if (mShouldDisplayMainSwitch) {
             View dividerView = new View(getContext());
             int dividerHeight = getContext().getResources().getDimensionPixelSize(
                     R.dimen.notifications_settings_dialog_divider_height
@@ -206,7 +206,7 @@ private View configureLayoutForView(LinearLayout view) {
                     }
                 });
 
-                if (mShouldDisplayMasterSwitch && i == mSettingsArray.length - 1) {
+                if (mShouldDisplayMainSwitch && i == mSettingsArray.length - 1) {
                     View divider = commentsSetting.findViewById(R.id.notifications_list_divider);
                     if (divider != null) {
                         MarginLayoutParams mlp = (MarginLayoutParams) divider.getLayoutParams();
@@ -230,12 +230,12 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean isChecked) {
                     try {
                         mUpdatedJson.put(compoundButton.getTag().toString(), isChecked);
 
-                        // Switch off master switch if all current settings switches are off
-                        if (mMasterSwitchToolbarView != null
+                        // Switch off main switch if all current settings switches are off
+                        if (mMainSwitchToolbarView != null
                             && !isChecked
                             && areAllSettingsSwitchesUnchecked()
                         ) {
-                            mMasterSwitchToolbarView.setChecked(false);
+                            mMainSwitchToolbarView.setChecked(false);
                         }
                     } catch (JSONException e) {
                         AppLog.e(AppLog.T.NOTIFS, "Could not add notification setting change to JSONObject");
@@ -260,11 +260,11 @@ protected void onDialogClosed(boolean positiveResult) {
         }
     }
 
-    private void setupTitleViewWithMasterSwitch(View view) {
+    private void setupTitleViewWithMainSwitch(View view) {
         switch (mChannel) {
             case BLOGS:
                 if (mType == Type.TIMELINE) {
-                    mTitleViewWithMasterSwitch = (ViewGroup) LayoutInflater
+                    mTitleViewWithMainSwitch = (ViewGroup) LayoutInflater
                             .from(getContext())
                             .inflate(R.layout.notifications_tab_for_blog_title_layout, (ViewGroup) view, false);
                 }
@@ -275,36 +275,36 @@ private void setupTitleViewWithMasterSwitch(View view) {
                 break;
         }
 
-        if (mTitleViewWithMasterSwitch != null) {
-            TextView titleView = mTitleViewWithMasterSwitch.findViewById(R.id.title);
+        if (mTitleViewWithMainSwitch != null) {
+            TextView titleView = mTitleViewWithMainSwitch.findViewById(R.id.title);
             CharSequence dialogTitle = getDialogTitle();
             if (dialogTitle != null) {
                 titleView.setText(dialogTitle);
             }
 
-            mMasterSwitchToolbarView = mTitleViewWithMasterSwitch.findViewById(R.id.master_switch);
+            mMainSwitchToolbarView = mTitleViewWithMainSwitch.findViewById(R.id.main_switch);
 
-            mMasterSwitchToolbarView.setMasterSwitchToolbarListener(this);
-            mMasterSwitchToolbarView
+            mMainSwitchToolbarView.setMainSwitchToolbarListener(this);
+            mMainSwitchToolbarView
                     .setBackgroundColor(ContextCompat.getColor(getContext(), android.R.color.transparent));
 
-            // Master Switch initial state:
+            // Main Switch initial state:
             // On: If at least one of the settings options is on
             // Off: If all settings options are off
             JSONObject settingsJson = mSettings.getSettingsJsonForChannelAndType(mChannel, mType, mBlogId);
-            boolean checkMasterSwitch = mSettings.isAtLeastOneSettingsEnabled(
+            boolean checkMainSwitch = mSettings.isAtLeastOneSettingsEnabled(
                     settingsJson,
                     mSettingsArray,
                     mSettingsValues
             );
-            mMasterSwitchToolbarView.loadInitialState(checkMasterSwitch);
+            mMainSwitchToolbarView.loadInitialState(checkMainSwitch);
 
-            hideDisabledView(mMasterSwitchToolbarView.isMasterChecked());
+            hideDisabledView(mMainSwitchToolbarView.isMainChecked());
         }
     }
 
     @Override
-    public void onMasterSwitchCheckedChanged(
+    public void onMainSwitchCheckedChanged(
             CompoundButton buttonView,
             boolean isChecked) {
         setSettingsSwitchesChecked(isChecked);
@@ -312,26 +312,26 @@ public void onMasterSwitchCheckedChanged(
     }
 
     /**
-     * Hide view when Notifications Tab Settings are disabled by toggling the master switch off.
+     * Hide view when Notifications Tab Settings are disabled by toggling the main switch off.
      *
-     * @param isMasterChecked TRUE to hide disabled view, FALSE to show disabled view
+     * @param isMainChecked TRUE to hide disabled view, FALSE to show disabled view
      */
-    private void hideDisabledView(boolean isMasterChecked) {
-        mDisabledView.setVisibility(isMasterChecked ? View.GONE : View.VISIBLE);
-        mOptionsView.setVisibility(isMasterChecked ? View.VISIBLE : View.GONE);
+    private void hideDisabledView(boolean isMainChecked) {
+        mDisabledView.setVisibility(isMainChecked ? View.GONE : View.VISIBLE);
+        mOptionsView.setVisibility(isMainChecked ? View.VISIBLE : View.GONE);
     }
 
     /**
-     * Updates Notifications current settings switches state based on the master switch state
+     * Updates Notifications current settings switches state based on the main switch state
      *
-     * @param isMasterChecked TRUE to switch on the settings switches.
+     * @param isMainChecked TRUE to switch on the settings switches.
      *                        FALSE to switch off the settings switches.
      */
-    private void setSettingsSwitchesChecked(boolean isMasterChecked) {
+    private void setSettingsSwitchesChecked(boolean isMainChecked) {
         for (String settingValue : mSettingsValues) {
             final SwitchCompat toggleSwitch = mOptionsView.findViewWithTag(settingValue);
             if (toggleSwitch != null) {
-                toggleSwitch.setChecked(isMasterChecked);
+                toggleSwitch.setChecked(isMainChecked);
             }
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/PrefMasterSwitchToolbarView.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/PrefMainSwitchToolbarView.kt
similarity index 65%
rename from WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/PrefMasterSwitchToolbarView.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/PrefMainSwitchToolbarView.kt
index 44deb5fde5ea..a53a06dac992 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/PrefMasterSwitchToolbarView.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/PrefMainSwitchToolbarView.kt
@@ -22,9 +22,9 @@ import org.wordpress.android.util.getColorFromAttribute
 import org.wordpress.android.util.redirectContextClickToLongPressListener
 
 /**
- * Custom view for master switch in toolbar for preferences.
+ * Custom view for main switch in toolbar for preferences.
  */
-class PrefMasterSwitchToolbarView @JvmOverloads constructor(
+class PrefMainSwitchToolbarView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyle: Int = 0,
@@ -34,7 +34,7 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
         OnLongClickListener,
         OnClickListener {
     // We should refactor this part to use style attributes, since enum is not too theming friendly
-    enum class PrefMasterSwitchToolbarViewStyle constructor(
+    enum class PrefMainSwitchToolbarViewStyle constructor(
         val value: Int,
         @AttrRes val titleColorResId: Int,
         @AttrRes val backgroundColorResId: Int
@@ -51,88 +51,80 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
         );
 
         companion object {
-            fun fromInt(value: Int): PrefMasterSwitchToolbarViewStyle? =
+            fun fromInt(value: Int): PrefMainSwitchToolbarViewStyle? =
                     values().firstOrNull { it.value == value }
         }
     }
 
     private var hintOn: String? = null
     private var hintOff: String? = null
-    private var masterSwitch: SwitchCompat
-    private var masterSwitchToolbarListener: MasterSwitchToolbarListener? = null
+    private var mainSwitch: SwitchCompat
+    private var mainSwitchToolbarListener: MainSwitchToolbarListener? = null
     private var toolbarSwitch: Toolbar
     private var titleOff: String? = null
     private var titleOn: String? = null
-    private var viewStyle: PrefMasterSwitchToolbarViewStyle? = null
+    private var viewStyle: PrefMainSwitchToolbarViewStyle? = null
     private var titleContentDescription: String? = null
 
-    val isMasterChecked: Boolean
-        get() = masterSwitch.isChecked
+    val isMainChecked: Boolean
+        get() = mainSwitch.isChecked
 
     /**
-     * Interface definition for callbacks to be invoked on interaction with master switch toolbar.
+     * Interface definition for callbacks to be invoked on interaction with main switch toolbar.
      */
-    interface MasterSwitchToolbarListener {
+    interface MainSwitchToolbarListener {
         /**
-         * Called when the checked state of master switch is changed.
+         * Called when the checked state of main switch is changed.
          *
-         * @param buttonView The master switch whose state has changed.
-         * @param isChecked The new checked state of master switch.
+         * @param buttonView The main switch whose state has changed.
+         * @param isChecked The new checked state of main switch.
          */
-        fun onMasterSwitchCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean)
+        fun onMainSwitchCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean)
     }
 
     init {
-        inflate(context, R.layout.preferences_master_switch_toolbar, this)
+        inflate(context, R.layout.preferences_main_switch_toolbar, this)
 
         toolbarSwitch = findViewById(R.id.toolbar_with_switch)
         toolbarSwitch.inflateMenu(R.menu.notifications_settings_secondary)
 
-        val menuItem = toolbarSwitch.menu.findItem(R.id.master_switch)
-        masterSwitch = menuItem.actionView as SwitchCompat
+        val menuItem = toolbarSwitch.menu.findItem(R.id.main_switch)
+        mainSwitch = menuItem.actionView as SwitchCompat
         setChecked(true)
 
         attrs?.let {
             val typedArray = context.obtainStyledAttributes(
                     it,
-                    R.styleable.PrefMasterSwitchToolbarView, 0, 0
+                    R.styleable.PrefMainSwitchToolbarView, 0, 0
             )
             try {
                 titleContentDescription = typedArray
-                        .getString(R.styleable.PrefMasterSwitchToolbarView_masterContentDescription)
+                        .getString(R.styleable.PrefMainSwitchToolbarView_mainContentDescription)
 
-                val titleOn = typedArray.getString(R.styleable.PrefMasterSwitchToolbarView_masterTitleOn)
-                val titleOff = typedArray.getString(R.styleable.PrefMasterSwitchToolbarView_masterTitleOff)
-                val hintOn = typedArray.getString(R.styleable.PrefMasterSwitchToolbarView_masterHintOn)
-                val hintOff = typedArray.getString(R.styleable.PrefMasterSwitchToolbarView_masterHintOff)
+                val titleOn = typedArray.getString(R.styleable.PrefMainSwitchToolbarView_mainTitleOn)
+                val titleOff = typedArray.getString(R.styleable.PrefMainSwitchToolbarView_mainTitleOff)
+                val hintOn = typedArray.getString(R.styleable.PrefMainSwitchToolbarView_mainHintOn)
+                val hintOff = typedArray.getString(R.styleable.PrefMainSwitchToolbarView_mainHintOff)
 
                 val contentInsetStart = resources.getDimensionPixelSize(
                         typedArray.getResourceId(
-                                R.styleable.PrefMasterSwitchToolbarView_masterContentInsetStart,
+                                R.styleable.PrefMainSwitchToolbarView_mainContentInsetStart,
                                 R.dimen.toolbar_content_offset
                         )
                 )
-                val masterOffsetEndResId = typedArray.getResourceId(
-                        R.styleable.PrefMasterSwitchToolbarView_masterOffsetEnd,
-                        -1
-                )
-                var masterOffsetEnd = -1
-                if (masterOffsetEndResId != -1) {
-                    masterOffsetEnd = resources.getDimensionPixelSize(
-                            masterOffsetEndResId
-                    )
+                val offsetEndResId = typedArray.getResourceId(R.styleable.PrefMainSwitchToolbarView_mainOffsetEnd, -1)
+                var offsetEnd = -1
+                if (offsetEndResId != -1) {
+                    offsetEnd = resources.getDimensionPixelSize(offsetEndResId)
                 }
-                val viewStyle = typedArray.getInt(
-                        R.styleable.PrefMasterSwitchToolbarView_masterViewStyle,
-                        -1
-                )
+                val viewStyle = typedArray.getInt(R.styleable.PrefMainSwitchToolbarView_mainViewStyle, -1)
 
                 setTitleOn(titleOn)
                 setTitleOff(titleOff)
                 setHintOn(hintOn)
                 setHintOff(hintOff)
                 setContentOffset(contentInsetStart)
-                setMasterOffsetEnd(masterOffsetEnd)
+                setOffsetEnd(offsetEnd)
 
                 if (viewStyle != -1) {
                     setViewStyle(viewStyle)
@@ -142,11 +134,11 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
             }
         }
 
-        masterSwitch.setOnCheckedChangeListener(this)
+        mainSwitch.setOnCheckedChangeListener(this)
         toolbarSwitch.setOnLongClickListener(this)
         toolbarSwitch.setOnClickListener(this)
 
-        ViewCompat.setLabelFor(toolbarSwitch, masterSwitch.id)
+        ViewCompat.setLabelFor(toolbarSwitch, mainSwitch.id)
         setupFocusabilityForTalkBack()
         toolbarSwitch.redirectContextClickToLongPressListener()
     }
@@ -171,43 +163,43 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
      * Applies end padding to the switch menu
      */
     @Suppress("MemberVisibilityCanBePrivate")
-    fun setMasterOffsetEnd(offsetEnd: Int) {
+    fun setOffsetEnd(offsetEnd: Int) {
         if (offsetEnd != -1) {
-            masterSwitch.setPaddingRelative(
-                    masterSwitch.left,
-                    masterSwitch.top,
+            mainSwitch.setPaddingRelative(
+                    mainSwitch.left,
+                    mainSwitch.top,
                     offsetEnd,
-                    masterSwitch.bottom
+                    mainSwitch.bottom
             )
         }
     }
 
     private fun setupFocusabilityForTalkBack() {
-        masterSwitch.isFocusable = false
-        masterSwitch.isClickable = false
+        mainSwitch.isFocusable = false
+        mainSwitch.isClickable = false
         toolbarSwitch.isFocusableInTouchMode = false
         toolbarSwitch.isFocusable = true
         toolbarSwitch.isClickable = true
     }
 
     /**
-     * Loads initial state of the master switch and toolbar
+     * Loads initial state of the main switch and toolbar
      */
-    fun loadInitialState(checkMaster: Boolean) {
-        setChecked(checkMaster)
-        setToolbarTitle(checkMaster)
+    fun loadInitialState(checkMain: Boolean) {
+        setChecked(checkMain)
+        setToolbarTitle(checkMain)
         toolbarSwitch.visibility = View.VISIBLE
         updateToolbarSwitchForAccessibility()
     }
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun setTitleOn(titleOn: String?) {
-        this.titleOn = titleOn ?: resources.getString(R.string.master_switch_default_title_on)
+        this.titleOn = titleOn ?: resources.getString(R.string.main_switch_default_title_on)
     }
 
     @Suppress("MemberVisibilityCanBePrivate")
     fun setTitleOff(titleOff: String?) {
-        this.titleOff = titleOff ?: resources.getString(R.string.master_switch_default_title_off)
+        this.titleOff = titleOff ?: resources.getString(R.string.main_switch_default_title_off)
     }
 
     @Suppress("MemberVisibilityCanBePrivate")
@@ -225,7 +217,7 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
         if (viewStyleInt == this.viewStyle?.value) {
             return
         }
-        val nullableType = PrefMasterSwitchToolbarViewStyle.fromInt(viewStyleInt)
+        val nullableType = PrefMainSwitchToolbarViewStyle.fromInt(viewStyleInt)
         nullableType?.let {
             updateViewStyle(nullableType)
         } ?: if (BuildConfig.DEBUG) {
@@ -233,13 +225,13 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
         } else {
             AppLog.e(
                     AppLog.T.SETTINGS,
-                    "PrefMasterSwitchToolbarView.setViewStyle called from xml with an unknown viewStyle."
+                    "PrefMainSwitchToolbarView.setViewStyle called from xml with an unknown viewStyle."
             )
         }
     }
 
     @Suppress("MemberVisibilityCanBePrivate")
-    fun updateViewStyle(viewStyle: PrefMasterSwitchToolbarViewStyle) {
+    fun updateViewStyle(viewStyle: PrefMainSwitchToolbarViewStyle) {
         if (viewStyle == this.viewStyle) {
             return
         }
@@ -247,7 +239,7 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
         loadResourcesForViewStyle(viewStyle)
     }
 
-    private fun loadResourcesForViewStyle(viewStyle: PrefMasterSwitchToolbarViewStyle) {
+    private fun loadResourcesForViewStyle(viewStyle: PrefMainSwitchToolbarViewStyle) {
         val titleColor = context.getColorFromAttribute(viewStyle.titleColorResId)
         val backgroundColor = context.getColorFromAttribute(viewStyle.backgroundColorResId)
 
@@ -263,7 +255,7 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
      * User long clicked the toolbar
      */
     override fun onLongClick(v: View?): Boolean {
-        val toastText = if (masterSwitch.isChecked) {
+        val toastText = if (mainSwitch.isChecked) {
             hintOn
         } else {
             hintOff
@@ -283,15 +275,15 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
     * User clicked the toolbar
     */
     override fun onClick(v: View?) {
-        setChecked(!masterSwitch.isChecked)
+        setChecked(!mainSwitch.isChecked)
     }
 
     fun setChecked(isChecked: Boolean) {
-        masterSwitch.isChecked = isChecked
+        mainSwitch.isChecked = isChecked
     }
 
-    private fun setToolbarTitle(checkMaster: Boolean) {
-        toolbarSwitch.title = if (checkMaster) {
+    private fun setToolbarTitle(checkMain: Boolean) {
+        toolbarSwitch.title = if (checkMain) {
             titleOn
         } else {
             titleOff
@@ -299,14 +291,14 @@ class PrefMasterSwitchToolbarView @JvmOverloads constructor(
     }
 
     /*
-     * User toggled the master switch
+     * User toggled the main switch
      */
     override fun onCheckedChanged(buttonView: CompoundButton?, isChecked: Boolean) {
         setToolbarTitle(isChecked)
-        masterSwitchToolbarListener?.onMasterSwitchCheckedChanged(buttonView, isChecked)
+        mainSwitchToolbarListener?.onMainSwitchCheckedChanged(buttonView, isChecked)
     }
 
-    fun setMasterSwitchToolbarListener(masterSwitchToolbarListener: MasterSwitchToolbarListener) {
-        this.masterSwitchToolbarListener = masterSwitchToolbarListener
+    fun setMainSwitchToolbarListener(mainSwitchToolbarListener: MainSwitchToolbarListener) {
+        this.mainSwitchToolbarListener = mainSwitchToolbarListener
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneBottomSheet.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneBottomSheet.kt
new file mode 100644
index 000000000000..0a656ce84418
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneBottomSheet.kt
@@ -0,0 +1,198 @@
+package org.wordpress.android.ui.prefs.timezone
+
+import android.content.res.Configuration
+import android.os.Bundle
+import android.view.KeyEvent
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.EditorInfo
+import android.widget.FrameLayout
+import androidx.core.widget.doOnTextChanged
+import androidx.lifecycle.ViewModelProvider
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import com.google.android.material.button.MaterialButton
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.SiteSettingsTimezoneBottomSheetListBinding
+import org.wordpress.android.util.ActivityUtils
+import org.wordpress.android.util.ToastUtils
+import javax.inject.Inject
+
+class SiteSettingsTimezoneBottomSheet : BottomSheetDialogFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var timezoneViewModel: SiteSettingsTimezoneViewModel
+
+    private val timezoneAdapter = TimezoneAdapter { timezone ->
+        timezoneViewModel.onTimezoneSelected(timezone.value)
+    }
+
+    private var _binding: SiteSettingsTimezoneBottomSheetListBinding? = null
+    private val binding get() = _binding
+
+    private var bottomSheet: FrameLayout? = null
+
+    private var callback: TimezoneSelectionCallback? = null
+
+    fun setTimezoneSettingCallback(callback: TimezoneSelectionCallback?) {
+        this.callback = callback
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+        timezoneViewModel = ViewModelProvider(requireActivity(), viewModelFactory)
+                .get(SiteSettingsTimezoneViewModel::class.java)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = SiteSettingsTimezoneBottomSheetListBinding.inflate(inflater, container, false)
+        return binding?.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        setupUI()
+        setupLiveData()
+        timezoneViewModel.getTimezones(requireContext())
+    }
+
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+
+        if (newConfig.orientation == Configuration.ORIENTATION_LANDSCAPE) expandBottomSheet()
+    }
+
+    override fun onDestroyView() {
+        _binding = null
+        callback = null
+        super.onDestroyView()
+    }
+
+    private fun setupUI() {
+        binding?.apply {
+            dialog?.setOnShowListener { dialogInterface ->
+                val sheetDialog = dialogInterface as? BottomSheetDialog
+
+                bottomSheet = sheetDialog?.findViewById<View>(
+                        com.google.android.material.R.id.design_bottom_sheet
+                ) as? FrameLayout
+
+                if (resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE) expandBottomSheet()
+            }
+
+            list.adapter = timezoneAdapter
+            list.run {
+                addItemDecoration(DividerItemDecoration(requireContext(), RecyclerView.VERTICAL))
+
+                addOnScrollListener(object : RecyclerView.OnScrollListener() {
+                    override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                        super.onScrollStateChanged(recyclerView, newState)
+                        if (newState == RecyclerView.SCROLL_STATE_DRAGGING) {
+                            ActivityUtils.hideKeyboardForced(binding?.searchInputLayout)
+                        }
+                    }
+                })
+            }
+
+            searchInputLayout.editText?.doOnTextChanged { _, _, _, _ ->
+                searchTimezones()
+            }
+
+            searchInputLayout.editText?.onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
+                if (hasFocus) expandBottomSheet()
+            }
+
+            searchInputLayout.editText?.setOnKeyListener { _, keyCode, event ->
+                if (event.action == KeyEvent.ACTION_DOWN && keyCode == KeyEvent.KEYCODE_ENTER) {
+                    searchTimezones()
+                    true
+                } else {
+                    false
+                }
+            }
+
+            searchInputLayout.editText?.setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_GO) {
+                    searchTimezones()
+                    true
+                } else {
+                    false
+                }
+            }
+
+            searchInputLayout.setEndIconOnClickListener {
+                searchInputLayout.editText?.text?.clear()
+                searchInputLayout.editText?.clearFocus()
+                timezoneViewModel.onSearchCancelled()
+                ActivityUtils.hideKeyboardForced(binding?.searchInputLayout)
+            }
+
+            btnTimezoneSuggestion.setOnClickListener { it as MaterialButton
+                timezoneViewModel.onTimezoneSelected(it.text.toString())
+            }
+        }
+    }
+
+    private fun setupLiveData() {
+        timezoneViewModel.showEmptyView.observe(viewLifecycleOwner, {
+            binding?.emptyView?.visibility = if (it) View.VISIBLE else View.GONE
+        })
+
+        timezoneViewModel.showProgressView.observe(viewLifecycleOwner, {
+            binding?.progressView?.visibility = if (it) View.VISIBLE else View.GONE
+        })
+
+        timezoneViewModel.timezones.observe(viewLifecycleOwner, {
+            timezoneAdapter.submitList(it)
+        })
+
+        timezoneViewModel.suggestedTimezone.observe(viewLifecycleOwner, {
+            binding?.btnTimezoneSuggestion?.text = it
+        })
+
+        timezoneViewModel.dismissWithError.observe(viewLifecycleOwner, {
+            ToastUtils.showToast(activity, R.string.site_settings_timezones_error)
+            dismiss()
+        })
+
+        timezoneViewModel.selectedTimezone.observe(viewLifecycleOwner, {
+            callback?.onSelectTimezone(it)
+        })
+
+        timezoneViewModel.dismissBottomSheet.observe(viewLifecycleOwner, {
+            dismiss()
+        })
+    }
+
+    private fun expandBottomSheet() {
+        bottomSheet?.let {
+            val behavior = BottomSheetBehavior.from(it)
+            behavior.state = BottomSheetBehavior.STATE_EXPANDED
+        }
+    }
+
+    private fun searchTimezones() {
+        binding?.searchInputLayout?.editText?.text?.trim().let {
+            if (it?.isNotEmpty() == true) {
+                timezoneViewModel.searchTimezones(it)
+            }
+        }
+    }
+
+    companion object {
+        @JvmStatic
+        fun newInstance(): SiteSettingsTimezoneBottomSheet = SiteSettingsTimezoneBottomSheet()
+    }
+
+    interface TimezoneSelectionCallback {
+        fun onSelectTimezone(timezone: String)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneViewModel.kt
new file mode 100644
index 000000000000..41b665238ae4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneViewModel.kt
@@ -0,0 +1,200 @@
+package org.wordpress.android.ui.prefs.timezone
+
+import android.content.Context
+import android.text.TextUtils
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.Transformations
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.distinctUntilChanged
+import com.android.volley.Response
+import com.android.volley.VolleyError
+import com.android.volley.toolbox.StringRequest
+import com.android.volley.toolbox.Volley
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
+import org.wordpress.android.Constants
+import org.wordpress.android.R
+import org.wordpress.android.networking.RestClientUtils
+import org.wordpress.android.ui.prefs.timezone.TimezonesList.TimezoneHeader
+import org.wordpress.android.ui.prefs.timezone.TimezonesList.TimezoneItem
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.SETTINGS
+import org.wordpress.android.viewmodel.ResourceProvider
+import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+import java.util.TimeZone
+import javax.inject.Inject
+
+class SiteSettingsTimezoneViewModel @Inject constructor(
+    private val resourceProvider: ResourceProvider
+) : ViewModel() {
+    private val timezonesList = mutableListOf<TimezonesList>()
+
+    private val _showEmptyView = SingleLiveEvent<Boolean>()
+    val showEmptyView: LiveData<Boolean> = _showEmptyView
+
+    private val _showProgressView = SingleLiveEvent<Boolean>()
+    val showProgressView: LiveData<Boolean> = _showProgressView
+
+    private val _dismissWithError = SingleLiveEvent<Unit>()
+    val dismissWithError: LiveData<Unit> = _dismissWithError
+
+    private val _dismissBottomSheet = SingleLiveEvent<Unit>()
+    val dismissBottomSheet: LiveData<Unit> = _dismissBottomSheet
+
+    private val _suggestedTimezone = MutableLiveData<String>()
+    val suggestedTimezone = _suggestedTimezone
+
+    private val _selectedTimezone = SingleLiveEvent<String>()
+    val selectedTimezone = _selectedTimezone
+
+    private val _timezones = MutableLiveData<List<TimezonesList>>()
+
+    private val searchInput = MutableLiveData<String>()
+    private val timezoneSearch: LiveData<List<TimezonesList>> = Transformations.switchMap(searchInput) { term ->
+        filterTimezones(term)
+    }
+
+    val timezones = MediatorLiveData<List<TimezonesList>>().apply {
+        addSource(_timezones) {
+            value = it
+        }
+        addSource(timezoneSearch) {
+            value = it
+        }
+    }.distinctUntilChanged()
+
+    fun searchTimezones(query: CharSequence) {
+        searchInput.value = query.toString()
+    }
+
+    fun onTimezoneSelected(timezone: String) {
+        _selectedTimezone.value = timezone
+        _dismissBottomSheet.asyncCall()
+    }
+
+    @VisibleForTesting
+    fun filterTimezones(query: String): LiveData<List<TimezonesList>> {
+        val filteredTimezones = MutableLiveData<List<TimezonesList>>()
+
+        timezonesList.filter { timezone ->
+            when (timezone) {
+                is TimezoneItem -> {
+                    timezone.label.contains(query, true) or timezone.offset.contains(query, true)
+                }
+                else -> false
+            }
+        }.also {
+            _showEmptyView.value = it.isEmpty()
+            filteredTimezones.value = it
+        }
+
+        return filteredTimezones
+    }
+
+    fun onSearchCancelled() {
+        _showEmptyView.value = false
+        _timezones.postValue(timezonesList)
+    }
+
+    fun getTimezones(context: Context) {
+        _suggestedTimezone.postValue(TimeZone.getDefault().id)
+
+        requestTimezones(context)
+    }
+
+    private fun requestTimezones(context: Context) {
+        val listener = Response.Listener { response: String? ->
+            AppLog.d(SETTINGS, "timezones requested")
+            _showProgressView.postValue(false)
+
+            if (!TextUtils.isEmpty(response)) {
+                timezonesList.clear()
+                loadTimezones(response)
+            } else {
+                AppLog.w(SETTINGS, "empty response requesting timezones")
+                _dismissWithError.call()
+            }
+        }
+
+        val errorListener = Response.ErrorListener { error: VolleyError? ->
+            AppLog.e(SETTINGS, "Error requesting timezones", error)
+            _dismissWithError.call()
+        }
+
+        val request: StringRequest = object : StringRequest(Constants.URL_TIMEZONE_ENDPOINT, listener, errorListener) {
+            override fun getParams(): Map<String, String> {
+                return RestClientUtils.getRestLocaleParams(context)
+            }
+        }
+
+        _showProgressView.postValue(true)
+        val queue = Volley.newRequestQueue(context)
+        queue.add(request)
+    }
+
+    private fun loadTimezones(responseJson: String?) {
+        try {
+            val jsonResponse = JSONObject(responseJson.orEmpty())
+            val jsonTimezonesByContinent = jsonResponse.getJSONObject("timezones_by_continent")
+            val jsonTimezonesManualOffsets = jsonResponse.getJSONArray("manual_utc_offsets")
+
+            jsonTimezonesByContinent.keys().forEach {
+                timezonesList.add(TimezoneHeader(it))
+                addTimezoneItems(jsonTimezonesByContinent.getJSONArray(it))
+            }
+
+            timezonesList.add(TimezoneHeader(
+                    resourceProvider.getString(R.string.site_settings_timezones_manual_offsets)
+            ))
+            for (i in 0 until jsonTimezonesManualOffsets.length()) {
+                val timezone = jsonTimezonesManualOffsets.getJSONObject(i)
+                timezonesList.add(TimezoneItem(timezone.getString("label"), timezone.getString("value")))
+            }
+
+            AppLog.d(SETTINGS, timezonesList.toString())
+            _timezones.postValue(timezonesList)
+        } catch (e: JSONException) {
+            AppLog.e(SETTINGS, "Error parsing timezones", e)
+            _dismissWithError.call()
+        }
+    }
+
+    private fun addTimezoneItems(jsonTimezones: JSONArray) {
+        for (i in 0 until jsonTimezones.length()) {
+            val timezone = jsonTimezones.getJSONObject(i)
+            val city = timezone.getString("label")
+            val zone = timezone.getString("value")
+            val zoneOffset = getZoneOffset(zone)
+            val zoneTime = getTimeAtZone(zone)
+            timezonesList.add(TimezoneItem(city, zone, zoneOffset, zoneTime))
+        }
+    }
+
+    private fun getZoneOffset(zone: String): String {
+        val timezone = TimeZone.getTimeZone(zone)
+
+        val cal = Calendar.getInstance(timezone)
+        val sdf = SimpleDateFormat("z", Locale.getDefault())
+        sdf.timeZone = timezone
+        val offset = sdf.format(cal.time)
+
+        return "${timezone.displayName} ($offset)"
+    }
+
+    private fun getTimeAtZone(zone: String): String {
+        val timezone = TimeZone.getTimeZone(zone)
+
+        val cal = Calendar.getInstance(timezone)
+        val sdf = SimpleDateFormat("h:mm a", Locale.getDefault())
+        sdf.timeZone = timezone
+
+        return sdf.format(cal.time)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneAdapter.kt
new file mode 100644
index 000000000000..fe13bde3ac44
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneAdapter.kt
@@ -0,0 +1,44 @@
+package org.wordpress.android.ui.prefs.timezone
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import org.wordpress.android.R
+import org.wordpress.android.ui.prefs.timezone.TimezonesList.TimezoneHeader
+import org.wordpress.android.ui.prefs.timezone.TimezonesList.TimezoneItem
+
+class TimezoneAdapter(
+    private val onClick: (timezone: TimezoneItem) -> Unit
+) : ListAdapter<TimezonesList, ViewHolder>(DIFF_CALLBACK) {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        return when (viewType) {
+            R.layout.site_settings_timezone_bottom_sheet_list_header -> TimezoneHeaderViewHolder.from(parent)
+            else -> TimezoneViewHolder.from(parent)
+        }
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val item = getItem(position)
+        when (holder) {
+            is TimezoneHeaderViewHolder -> holder.bind(item as TimezoneHeader)
+            is TimezoneViewHolder -> holder.bind(item as TimezoneItem, onClick)
+        }
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return when (getItem(position)) {
+            is TimezoneHeader -> R.layout.site_settings_timezone_bottom_sheet_list_header
+            else -> R.layout.site_settings_timezone_bottom_sheet_list_item
+        }
+    }
+
+    companion object {
+        val DIFF_CALLBACK = object : DiffUtil.ItemCallback<TimezonesList>() {
+            override fun areItemsTheSame(oldItem: TimezonesList, newItem: TimezonesList) =
+                    oldItem.label == newItem.label
+            override fun areContentsTheSame(oldItem: TimezonesList, newItem: TimezonesList) =
+                    oldItem == newItem
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneHeaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneHeaderViewHolder.kt
new file mode 100644
index 000000000000..ed27944e35f7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneHeaderViewHolder.kt
@@ -0,0 +1,28 @@
+package org.wordpress.android.ui.prefs.timezone
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import org.wordpress.android.databinding.SiteSettingsTimezoneBottomSheetListHeaderBinding
+import org.wordpress.android.ui.prefs.timezone.TimezonesList.TimezoneHeader
+
+class TimezoneHeaderViewHolder(
+    private val binding: SiteSettingsTimezoneBottomSheetListHeaderBinding
+) : ViewHolder(binding.root) {
+    fun bind(header: TimezoneHeader) {
+        binding.apply {
+            headerTimeZone.text = header.label
+        }
+    }
+
+    companion object {
+        fun from(parent: ViewGroup): TimezoneHeaderViewHolder {
+            val binding = SiteSettingsTimezoneBottomSheetListHeaderBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+            )
+            return TimezoneHeaderViewHolder(binding)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneViewHolder.kt
new file mode 100644
index 000000000000..dab5437902c4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezoneViewHolder.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.ui.prefs.timezone
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import org.wordpress.android.databinding.SiteSettingsTimezoneBottomSheetListItemBinding
+import org.wordpress.android.ui.prefs.timezone.TimezonesList.TimezoneItem
+
+class TimezoneViewHolder(
+    private val binding: SiteSettingsTimezoneBottomSheetListItemBinding
+) : ViewHolder(binding.root) {
+    fun bind(timezone: TimezoneItem, onClick: (timezone: TimezoneItem) -> Unit) {
+        binding.apply {
+            timeZone.text = timezone.label
+
+            if (timezone.offset.isNotBlank()) {
+                zoneOffset.text = timezone.offset
+                zoneOffset.visibility = View.VISIBLE
+            } else {
+                zoneOffset.visibility = View.GONE
+            }
+
+            if (timezone.time.isNotBlank()) {
+                zoneTime.text = timezone.time
+                zoneTime.visibility = View.VISIBLE
+            } else {
+                zoneTime.visibility = View.GONE
+            }
+
+            itemTimeZone.setOnClickListener {
+                onClick(timezone)
+            }
+        }
+    }
+
+    companion object {
+        fun from(parent: ViewGroup): TimezoneViewHolder {
+            val binding = SiteSettingsTimezoneBottomSheetListItemBinding.inflate(
+                    LayoutInflater.from(parent.context),
+                    parent,
+                    false
+            )
+            return TimezoneViewHolder(binding)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezonesList.kt b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezonesList.kt
new file mode 100644
index 000000000000..96de338ad836
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/timezone/TimezonesList.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.ui.prefs.timezone
+
+sealed class TimezonesList {
+    abstract val label: String
+
+    data class TimezoneHeader(
+        override val label: String
+    ) : TimezonesList()
+
+    data class TimezoneItem(
+        override val label: String,
+        val value: String,
+        val offset: String = "",
+        val time: String = ""
+    ) : TimezonesList()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java
index 70b4060e7d4e..dcdb10141f30 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeListFragment.java
@@ -18,19 +18,20 @@
 import org.jetbrains.annotations.NotNull;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.store.AccountStore;
-import org.wordpress.android.fluxc.store.QuickStartStore;
 import org.wordpress.android.ui.ScrollableViewInitializedListener;
+import org.wordpress.android.ui.mysite.QuickStartRepository;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter.OnAdapterLoadedListener;
 import org.wordpress.android.ui.publicize.adapters.PublicizeServiceAdapter.OnServiceClickListener;
 import org.wordpress.android.ui.quickstart.QuickStartEvent;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.QuickStartUtils;
+import org.wordpress.android.util.QuickStartUtilsWrapper;
 import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.ToastUtils;
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig;
 import org.wordpress.android.widgets.WPDialogSnackbar;
 
 import javax.inject.Inject;
@@ -52,8 +53,9 @@ public interface PublicizeButtonPrefsListener {
     private QuickStartEvent mQuickStartEvent;
 
     @Inject AccountStore mAccountStore;
-    @Inject QuickStartStore mQuickStartStore;
-    @Inject Dispatcher mDispatcher;
+    @Inject QuickStartUtilsWrapper mQuickStartUtilsWrapper;
+    @Inject QuickStartRepository mQuickStartRepository;
+    @Inject MySiteImprovementsFeatureConfig mMySiteImprovementsFeatureConfig;
 
     public static PublicizeListFragment newInstance(@NonNull SiteModel site) {
         Bundle args = new Bundle();
@@ -94,7 +96,7 @@ public void onResume() {
         setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
 
         if (getActivity() instanceof ScrollableViewInitializedListener) {
-           ((ScrollableViewInitializedListener) getActivity()).onScrollableViewInitialized(mNestedScrollView.getId());
+            ((ScrollableViewInitializedListener) getActivity()).onScrollableViewInitialized(mNestedScrollView.getId());
         }
     }
 
@@ -140,7 +142,7 @@ public void onEvent(final QuickStartEvent event) {
         if (mQuickStartEvent.getTask() == ENABLE_POST_SHARING) {
             showQuickStartFocusPoint();
 
-            Spannable title = QuickStartUtils.stylizeQuickStartPrompt(getActivity(),
+            Spannable title = mQuickStartUtilsWrapper.stylizeQuickStartPrompt(requireContext(),
                     R.string.quick_start_dialog_enable_sharing_message_short_connections);
 
             WPDialogSnackbar.make(getView(), title,
@@ -227,8 +229,13 @@ private PublicizeServiceAdapter getAdapter() {
             mAdapter.setOnAdapterLoadedListener(mAdapterLoadedListener);
             if (getActivity() instanceof OnServiceClickListener) {
                 mAdapter.setOnServiceClickListener(service -> {
-                    QuickStartUtils.completeTaskAndRemindNextOne(mQuickStartStore, ENABLE_POST_SHARING,
-                            mDispatcher, mSite, mQuickStartEvent, getContext());
+                    if (mMySiteImprovementsFeatureConfig.isEnabled()) {
+                        mQuickStartRepository.completeTask(ENABLE_POST_SHARING);
+                    } else {
+                        mQuickStartUtilsWrapper
+                                .completeTaskAndRemindNextOne(ENABLE_POST_SHARING, mSite, mQuickStartEvent,
+                                        getContext());
+                    }
                     if (getView() != null) {
                         QuickStartUtils.removeQuickStartFocusPoint((ViewGroup) getView());
                     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeWebViewFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeWebViewFragment.java
index 4abb649881cd..2a284e76a5e4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeWebViewFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/publicize/PublicizeWebViewFragment.java
@@ -6,7 +6,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebChromeClient;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -26,6 +25,7 @@
 import org.wordpress.android.ui.WPWebViewActivity;
 import org.wordpress.android.ui.publicize.PublicizeConstants.ConnectAction;
 import org.wordpress.android.util.WebViewUtils;
+import org.wordpress.android.util.helpers.WebChromeClientWithVideoPoster;
 
 import javax.inject.Inject;
 
@@ -192,9 +192,9 @@ public void onPageFinished(WebView view, String url) {
         }
     }
 
-    private class PublicizeWebChromeClient extends WebChromeClient {
+    private class PublicizeWebChromeClient extends WebChromeClientWithVideoPoster {
         PublicizeWebChromeClient() {
-            super();
+            super(mWebView, R.drawable.media_movieclip);
         }
 
         @Override
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartEvent.kt b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartEvent.kt
index 89f9665492d6..8c537e091a69 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartEvent.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartEvent.kt
@@ -10,7 +10,7 @@ import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
  **/
 @Parcelize
 @SuppressLint("ParcelCreator")
-class QuickStartEvent(val task: QuickStartTask) : Parcelable {
+data class QuickStartEvent(val task: QuickStartTask) : Parcelable {
     companion object {
         const val KEY = "quick_start_event"
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartMySitePrompts.kt b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartMySitePrompts.kt
index 70df34be3f72..294f6b83aff7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartMySitePrompts.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartMySitePrompts.kt
@@ -28,20 +28,6 @@ enum class QuickStartMySitePrompts constructor(
             R.string.quick_start_dialog_view_site_message_short,
             R.drawable.ic_globe_white_24dp
     ),
-    CHOSE_THEME_TUTORIAL(
-            QuickStartTask.CHOOSE_THEME,
-            R.id.my_site_scroll_view_root,
-            R.id.row_themes,
-            R.string.quick_start_dialog_browse_themes_message_short,
-            R.drawable.ic_themes_white_24dp
-    ),
-    CUSTOMIZE_SITE_TUTORIAL(
-            QuickStartTask.CUSTOMIZE_SITE,
-            R.id.my_site_scroll_view_root,
-            R.id.row_themes,
-            R.string.quick_start_dialog_customize_site_message_short_themes,
-            R.drawable.ic_themes_white_24dp
-    ),
     SHARE_SITE_TUTORIAL(
             QuickStartTask.ENABLE_POST_SHARING,
             R.id.my_site_scroll_view_root,
@@ -70,13 +56,6 @@ enum class QuickStartMySitePrompts constructor(
             R.string.quick_start_dialog_upload_site_icon_message_short,
             ICON_NOT_SET
     ),
-    CREATE_NEW_PAGE(
-            QuickStartTask.CREATE_NEW_PAGE,
-            R.id.my_site_scroll_view_root,
-            R.id.quick_action_pages_button,
-            R.string.quick_start_dialog_create_new_page_message_short,
-            ICON_NOT_SET
-    ),
     CHECK_STATS(
             QuickStartTask.CHECK_STATS,
             R.id.my_site_scroll_view_root,
@@ -90,6 +69,20 @@ enum class QuickStartMySitePrompts constructor(
             R.id.row_plan,
             R.string.quick_start_dialog_explore_plans_message_short,
             R.drawable.ic_plans_white_24dp
+    ),
+    REVIEW_PAGES(
+            QuickStartTask.REVIEW_PAGES,
+            R.id.my_site_scroll_view_root,
+            R.id.quick_action_pages_button,
+            R.string.quick_start_dialog_review_pages_message_short,
+            R.drawable.ic_pages_white_24dp
+    ),
+    EDIT_HOMEPAGE(
+            QuickStartTask.EDIT_HOMEPAGE,
+            R.id.my_site_scroll_view_root,
+            R.id.quick_action_pages_button,
+            R.string.quick_start_dialog_edit_homepage_message_short,
+            R.drawable.ic_pages_white_24dp
     );
 
     companion object {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartNoticeDetails.java b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartNoticeDetails.java
index 16557481d467..e3396b311bca 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartNoticeDetails.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartNoticeDetails.java
@@ -18,16 +18,6 @@ public enum QuickStartNoticeDetails {
             R.string.quick_start_dialog_view_site_title,
             R.string.quick_start_dialog_view_site_message
     ),
-    CHOSE_THEME_TUTORIAL(
-            QuickStartTask.CHOOSE_THEME,
-            R.string.quick_start_dialog_choose_theme_title,
-            R.string.quick_start_dialog_choose_theme_message
-    ),
-    CUSTOMIZE_SITE_TUTORIAL(
-            QuickStartTask.CUSTOMIZE_SITE,
-            R.string.quick_start_dialog_customize_site_title,
-            R.string.quick_start_dialog_customize_site_message
-    ),
     SHARE_SITE_TUTORIAL(
             QuickStartTask.ENABLE_POST_SHARING,
             R.string.quick_start_dialog_share_site_title,
@@ -48,11 +38,6 @@ public enum QuickStartNoticeDetails {
             R.string.quick_start_dialog_upload_icon_title,
             R.string.quick_start_dialog_upload_icon_message
     ),
-    CREATE_NEW_PAGE(
-            QuickStartTask.CREATE_NEW_PAGE,
-            R.string.quick_start_dialog_create_page_title,
-            R.string.quick_start_dialog_create_page_message
-    ),
     CHECK_STATS(
             QuickStartTask.CHECK_STATS,
             R.string.quick_start_dialog_check_stats_title,
@@ -62,6 +47,16 @@ public enum QuickStartNoticeDetails {
             QuickStartTask.EXPLORE_PLANS,
             R.string.quick_start_dialog_explore_plans_title,
             R.string.quick_start_dialog_explore_plans_message
+    ),
+    EDIT_HOMEPAGE(
+            QuickStartTask.EDIT_HOMEPAGE,
+            R.string.quick_start_dialog_edit_homepage_title,
+            R.string.quick_start_dialog_edit_homepage_message
+    ),
+    REVIEW_PAGES(
+            QuickStartTask.REVIEW_PAGES,
+            R.string.quick_start_dialog_review_pages_title,
+            R.string.quick_start_dialog_review_pages_message
     );
 
     QuickStartNoticeDetails(QuickStartTask task, int titleResId, int messageResId) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartReminderReceiver.java b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartReminderReceiver.java
index e16fe4ed10e1..6649bf77c657 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartReminderReceiver.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartReminderReceiver.java
@@ -72,7 +72,7 @@ public void onReceive(Context context, Intent intent) {
         NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
         Notification notification = new NotificationCompat.Builder(context,
                 context.getString(R.string.notification_channel_reminder_id))
-                .setSmallIcon(R.drawable.ic_my_sites_white_24dp)
+                .setSmallIcon(R.drawable.ic_app_white_24dp)
                 .setContentTitle(context.getString(quickStartTaskDetails.getTitleResId()))
                 .setContentText(context.getString(quickStartTaskDetails.getSubtitleResId()))
                 .setOnlyAlertOnce(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartTaskDetails.java b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartTaskDetails.java
index 6aa0230b7714..8b0a5952ba61 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartTaskDetails.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartTaskDetails.java
@@ -25,18 +25,6 @@ public enum QuickStartTaskDetails {
             R.string.quick_start_list_view_site_subtitle,
             R.drawable.ic_external_white_24dp
     ),
-    CHOSE_THEME_TUTORIAL(
-            QuickStartTask.CHOOSE_THEME,
-            R.string.quick_start_list_browse_themes_title,
-            R.string.quick_start_list_browse_themes_subtitle,
-            R.drawable.ic_themes_white_24dp
-    ),
-    CUSTOMIZE_SITE_TUTORIAL(
-            QuickStartTask.CUSTOMIZE_SITE,
-            R.string.quick_start_list_customize_site_title,
-            R.string.quick_start_list_customize_site_subtitle,
-            R.drawable.ic_customize_white_24dp
-    ),
     SHARE_SITE_TUTORIAL(
             QuickStartTask.ENABLE_POST_SHARING,
             R.string.quick_start_list_enable_sharing_title,
@@ -61,12 +49,6 @@ public enum QuickStartTaskDetails {
             R.string.quick_start_list_upload_icon_subtitle,
             R.drawable.ic_globe_white_24dp
     ),
-    CREATE_NEW_PAGE(
-            QuickStartTask.CREATE_NEW_PAGE,
-            R.string.quick_start_list_create_page_title,
-            R.string.quick_start_list_create_page_subtitle,
-            R.drawable.ic_pages_white_24dp
-    ),
     CHECK_STATS(
             QuickStartTask.CHECK_STATS,
             R.string.quick_start_list_check_stats_title,
@@ -78,6 +60,18 @@ public enum QuickStartTaskDetails {
             R.string.quick_start_list_explore_plans_title,
             R.string.quick_start_list_explore_plans_subtitle,
             R.drawable.ic_plans_white_24dp
+    ),
+    EDIT_HOMEPAGE(
+            QuickStartTask.EDIT_HOMEPAGE,
+            R.string.quick_start_list_edit_homepage_title,
+            R.string.quick_start_list_edit_homepage_subtitle,
+            R.drawable.ic_homepage_16dp
+    ),
+    REVIEW_PAGES(
+            QuickStartTask.REVIEW_PAGES,
+            R.string.quick_start_list_review_pages_title,
+            R.string.quick_start_list_review_pages_subtitle,
+            R.drawable.ic_pages_white_24dp
     );
 
     QuickStartTaskDetails(QuickStartTask task, int titleResId, int subtitleResId, int iconResId) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/FollowCommentsUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/FollowCommentsUiState.kt
new file mode 100644
index 000000000000..8677a805a609
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/FollowCommentsUiState.kt
@@ -0,0 +1,16 @@
+package org.wordpress.android.ui.reader
+
+data class FollowCommentsUiState(
+    val type: FollowCommentsUiStateType,
+    val showFollowButton: Boolean = false,
+    val isFollowing: Boolean = false,
+    val animate: Boolean = false,
+    val onFollowButtonClick: ((Boolean) -> Unit)? = null
+)
+
+enum class FollowCommentsUiStateType {
+    DISABLED,
+    LOADING,
+    GONE,
+    VISIBLE_WITH_STATE
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/NoSiteToReblogActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/NoSiteToReblogActivity.kt
index b26b9e87e90b..84d759296781 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/NoSiteToReblogActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/NoSiteToReblogActivity.kt
@@ -4,9 +4,7 @@ import android.R.id
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import kotlinx.android.synthetic.main.reader_no_site_to_reblog.noSiteToReblogView
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.ReaderNoSiteToReblogBinding
 import org.wordpress.android.ui.ActivityLauncher
 
 /*
@@ -15,16 +13,19 @@ import org.wordpress.android.ui.ActivityLauncher
 class NoSiteToReblogActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.reader_no_site_to_reblog)
 
-        setSupportActionBar(toolbar_main)
+        val binding = ReaderNoSiteToReblogBinding.inflate(layoutInflater)
+
+        setContentView(binding.root)
+
+        setSupportActionBar(binding.includeToolbarMain.toolbarMain)
 
         supportActionBar?.apply {
             setDisplayShowTitleEnabled(false)
             setDisplayHomeAsUpEnabled(true)
         }
 
-        noSiteToReblogView.button.setOnClickListener {
+        binding.noSiteToReblogView.button.setOnClickListener {
             ActivityLauncher.viewMySiteInNewStack(this@NoSiteToReblogActivity)
             setResult(RESULT_OK)
             finish()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java
index 6de3fb804786..47e4dc3180f7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderActivityLauncher.java
@@ -8,9 +8,11 @@
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
 
+import org.jetbrains.annotations.NotNull;
 import org.wordpress.android.R;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.models.ReaderPost;
@@ -20,12 +22,15 @@
 import org.wordpress.android.ui.WPWebViewActivity;
 import org.wordpress.android.ui.reader.ReaderPostPagerActivity.DirectOperation;
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType;
+import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsActivity;
+import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsFragment.EntryPoint;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.util.WPUrlUtils;
 
 import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.Map;
+
+import static org.wordpress.android.ui.reader.discover.interests.ReaderInterestsFragment.READER_INTEREST_ENTRY_POINT;
 
 public class ReaderActivityLauncher {
     /*
@@ -33,7 +38,7 @@ public class ReaderActivityLauncher {
      * with a single post
      */
     public static void showReaderPostDetail(Context context, long blogId, long postId) {
-        showReaderPostDetail(context, false, blogId, postId, null, 0, null);
+        showReaderPostDetail(context, false, blogId, postId, null, 0, false, null);
     }
 
     public static void showReaderPostDetail(Context context,
@@ -42,7 +47,18 @@ public static void showReaderPostDetail(Context context,
                                             long postId,
                                             DirectOperation directOperation,
                                             int commentId,
+                                            boolean isRelatedPost,
                                             String interceptedUri) {
+        Intent intent =
+                buildReaderPostDetailIntent(context, isFeed, blogId, postId, directOperation, commentId, isRelatedPost,
+                        interceptedUri);
+        context.startActivity(intent);
+    }
+
+    @NotNull
+    public static Intent buildReaderPostDetailIntent(Context context, boolean isFeed, long blogId, long postId,
+                                                      DirectOperation directOperation, int commentId,
+                                                      boolean isRelatedPost, String interceptedUri) {
         Intent intent = new Intent(context, ReaderPostPagerActivity.class);
         intent.putExtra(ReaderConstants.ARG_IS_FEED, isFeed);
         intent.putExtra(ReaderConstants.ARG_BLOG_ID, blogId);
@@ -50,8 +66,9 @@ public static void showReaderPostDetail(Context context,
         intent.putExtra(ReaderConstants.ARG_DIRECT_OPERATION, directOperation);
         intent.putExtra(ReaderConstants.ARG_COMMENT_ID, commentId);
         intent.putExtra(ReaderConstants.ARG_IS_SINGLE_POST, true);
+        intent.putExtra(ReaderConstants.ARG_IS_RELATED_POST, isRelatedPost);
         intent.putExtra(ReaderConstants.ARG_INTERCEPTED_URI, interceptedUri);
-        context.startActivity(intent);
+        return intent;
     }
 
     /*
@@ -91,13 +108,22 @@ public static void showReaderPostPagerForBlog(Context context,
     /*
      * show a list of posts in a specific blog or feed
      */
-    public static void showReaderBlogOrFeedPreview(Context context, long siteId, long feedId) {
+    public static void showReaderBlogOrFeedPreview(Context context, long siteId, long feedId,
+                                                   @Nullable Boolean isFollowed, String source,
+                                                   ReaderTracker readerTracker) {
         if (siteId == 0 && feedId == 0) {
             return;
         }
 
-        AnalyticsTracker.track(AnalyticsTracker.Stat.READER_BLOG_PREVIEWED);
+        readerTracker.trackBlog(
+                AnalyticsTracker.Stat.READER_BLOG_PREVIEWED,
+                siteId,
+                feedId,
+                isFollowed,
+                source
+        );
         Intent intent = new Intent(context, ReaderPostListActivity.class);
+        intent.putExtra(ReaderConstants.ARG_SOURCE, source);
 
         if (ReaderUtils.isExternalFeed(siteId, feedId)) {
             intent.putExtra(ReaderConstants.ARG_FEED_ID, feedId);
@@ -110,28 +136,48 @@ public static void showReaderBlogOrFeedPreview(Context context, long siteId, lon
         context.startActivity(intent);
     }
 
-    public static void showReaderBlogPreview(Context context, ReaderPost post) {
+    public static void showReaderBlogPreview(Context context, ReaderPost post,
+                                             String source,
+                                             ReaderTracker readerTracker) {
         if (post == null) {
             return;
         }
-        showReaderBlogOrFeedPreview(context, post.blogId, post.feedId);
+        showReaderBlogOrFeedPreview(
+                context,
+                post.blogId,
+                post.feedId,
+                post.isFollowedByCurrentUser,
+                source,
+                readerTracker
+        );
     }
 
-    public static void showReaderBlogPreview(Context context, long siteId) {
-        showReaderBlogOrFeedPreview(context, siteId, 0);
+    public static void showReaderBlogPreview(Context context, long siteId,
+                                             @Nullable Boolean isFollowed, String source,
+                                             ReaderTracker readerTracker) {
+        showReaderBlogOrFeedPreview(
+                context,
+                siteId,
+                0,
+                isFollowed,
+                source,
+                readerTracker
+        );
     }
 
     /*
      * show a list of posts with a specific tag
      */
-    public static void showReaderTagPreview(Context context, ReaderTag tag) {
-        if (tag == null) {
-            return;
-        }
-        Map<String, String> properties = new HashMap<>();
-        properties.put("tag", tag.getTagSlug());
-        AnalyticsTracker.track(AnalyticsTracker.Stat.READER_TAG_PREVIEWED, properties);
+    public static void showReaderTagPreview(Context context, @NonNull ReaderTag tag,
+                                            String source,
+                                            ReaderTracker readerTracker) {
+        readerTracker.trackTag(
+                AnalyticsTracker.Stat.READER_TAG_PREVIEWED,
+                tag.getTagSlug(),
+                source
+        );
         Intent intent = new Intent(context, ReaderPostListActivity.class);
+        intent.putExtra(ReaderConstants.ARG_SOURCE, source);
         intent.putExtra(ReaderConstants.ARG_TAG, tag);
         intent.putExtra(ReaderConstants.ARG_POST_LIST_TYPE, ReaderPostListType.TAG_PREVIEW);
         context.startActivity(intent);
@@ -160,12 +206,12 @@ public static void showReaderComments(Context context, long blogId, long postId,
     /**
      * Show comments for passed Ids and directly perform an action on a specifc comment
      *
-     * @param context context to use to start the activity
-     * @param blogId blog id
-     * @param postId post id
+     * @param context         context to use to start the activity
+     * @param blogId          blog id
+     * @param postId          post id
      * @param directOperation operation to perform on the specific comment. Can be null for no operation.
-     * @param commentId specific comment id to perform an action on
-     * @param interceptedUri URI to fall back into (i.e. to be able to open in external browser)
+     * @param commentId       specific comment id to perform an action on
+     * @param interceptedUri  URI to fall back into (i.e. to be able to open in external browser)
      */
     public static void showReaderComments(Context context, long blogId, long postId, DirectOperation
             directOperation, long commentId, String interceptedUri) {
@@ -212,6 +258,12 @@ public static void showReaderSubs(Context context, int selectPosition) {
         context.startActivity(intent);
     }
 
+    public static void showReaderInterests(Activity activity) {
+        Intent intent = new Intent(activity, ReaderInterestsActivity.class);
+        intent.putExtra(READER_INTEREST_ENTRY_POINT, EntryPoint.SETTINGS);
+        activity.startActivityForResult(intent, RequestCodes.READER_INTERESTS);
+    }
+
     /*
      * play an external video
      */
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java
index 645f3dbeb545..cfecbc81c54f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderBlogFragment.java
@@ -15,6 +15,7 @@
 import androidx.fragment.app.Fragment;
 
 import org.wordpress.android.R;
+import org.wordpress.android.WordPress;
 import org.wordpress.android.datasets.ReaderTagTable;
 import org.wordpress.android.models.ReaderBlog;
 import org.wordpress.android.models.ReaderTag;
@@ -22,10 +23,13 @@
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.reader.adapters.ReaderBlogAdapter;
 import org.wordpress.android.ui.reader.adapters.ReaderBlogAdapter.ReaderBlogType;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.ui.reader.views.ReaderRecyclerView;
 import org.wordpress.android.util.AppLog;
 
+import javax.inject.Inject;
+
 /*
  * fragment hosted by ReaderSubsActivity which shows followed blogs
  */
@@ -37,6 +41,8 @@ public class ReaderBlogFragment extends Fragment
     private String mSearchFilter;
     private boolean mIgnoreNextSearch;
 
+    @Inject ReaderTracker mReaderTracker;
+
     private static final String ARG_BLOG_TYPE = "blog_type";
     private static final String KEY_SEARCH_FILTER = "search_filter";
 
@@ -58,6 +64,7 @@ public void setArguments(Bundle args) {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        ((WordPress) getActivity().getApplication()).component().inject(this);
         if (savedInstanceState != null) {
             AppLog.d(AppLog.T.READER, "reader blog fragment > restoring instance state");
             mIgnoreNextSearch = true;
@@ -235,7 +242,12 @@ private boolean hasBlogAdapter() {
 
     private ReaderBlogAdapter getBlogAdapter() {
         if (mAdapter == null) {
-            mAdapter = new ReaderBlogAdapter(getActivity(), getBlogType(), mSearchFilter);
+            mAdapter = new ReaderBlogAdapter(
+                    getActivity(),
+                    getBlogType(),
+                    mSearchFilter,
+                    ReaderTracker.SOURCE_SETTINGS
+            );
             mAdapter.setBlogClickListener(this);
             mAdapter.setDataLoadedListener(new ReaderInterfaces.DataLoadedListener() {
                 @Override
@@ -255,7 +267,14 @@ public ReaderBlogType getBlogType() {
     public void onBlogClicked(Object item) {
         if (item instanceof ReaderBlog) {
             ReaderBlog blog = (ReaderBlog) item;
-            ReaderActivityLauncher.showReaderBlogOrFeedPreview(getActivity(), blog.blogId, blog.feedId);
+            ReaderActivityLauncher.showReaderBlogOrFeedPreview(
+                    getActivity(),
+                    blog.blogId,
+                    blog.feedId,
+                    blog.isFollowing,
+                    ReaderTracker.SOURCE_SETTINGS,
+                    mReaderTracker
+            );
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java
index 0e52588cb978..40a6a595e2ed 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListActivity.java
@@ -7,11 +7,8 @@
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.view.HapticFeedbackConstants;
-import android.view.KeyEvent;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ImageView;
@@ -40,13 +37,11 @@
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.ReaderCommentTable;
 import org.wordpress.android.datasets.ReaderPostTable;
-import org.wordpress.android.datasets.SuggestionTable;
-import org.wordpress.android.fluxc.model.SiteModel;
+import org.wordpress.android.datasets.UserSuggestionTable;
 import org.wordpress.android.fluxc.store.AccountStore;
-import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.models.ReaderComment;
 import org.wordpress.android.models.ReaderPost;
-import org.wordpress.android.models.Suggestion;
+import org.wordpress.android.models.UserSuggestion;
 import org.wordpress.android.ui.ActivityLauncher;
 import org.wordpress.android.ui.CollapseFullScreenDialogFragment;
 import org.wordpress.android.ui.CollapseFullScreenDialogFragment.Builder;
@@ -62,11 +57,14 @@
 import org.wordpress.android.ui.reader.actions.ReaderPostActions;
 import org.wordpress.android.ui.reader.adapters.ReaderCommentAdapter;
 import org.wordpress.android.ui.reader.services.ReaderCommentService;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.views.ReaderRecyclerView;
+import org.wordpress.android.ui.suggestion.Suggestion;
 import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter;
 import org.wordpress.android.ui.suggestion.service.SuggestionEvents;
 import org.wordpress.android.ui.suggestion.util.SuggestionServiceConnectionManager;
 import org.wordpress.android.ui.suggestion.util.SuggestionUtils;
+import org.wordpress.android.ui.utils.UiHelpers;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DisplayUtils;
@@ -75,9 +73,8 @@
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.ViewUtilsKt;
 import org.wordpress.android.util.WPActivityUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper;
-import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout;
 import org.wordpress.android.widgets.RecyclerItemDecoration;
 import org.wordpress.android.widgets.SuggestionAutoCompleteText;
 import org.wordpress.android.widgets.WPSnackbar;
@@ -92,7 +89,10 @@
 import static org.wordpress.android.ui.CommentFullScreenDialogFragment.RESULT_SELECTION_START;
 import static org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper;
 
-public class ReaderCommentListActivity extends LocaleAwareActivity {
+import kotlin.Unit;
+
+public class ReaderCommentListActivity extends LocaleAwareActivity implements OnConfirmListener,
+        OnCollapseListener {
     private static final String KEY_REPLY_TO_COMMENT_ID = "reply_to_comment_id";
     private static final String KEY_HAS_UPDATED_COMMENTS = "has_updated_comments";
 
@@ -119,11 +119,12 @@ public class ReaderCommentListActivity extends LocaleAwareActivity {
     private long mCommentId;
     private int mRestorePosition;
     private String mInterceptedUri;
-    private SiteModel mSite;
 
-    @Inject SiteStore mSiteStore;
     @Inject AccountStore mAccountStore;
+    @Inject UiHelpers mUiHelpers;
     @Inject ViewModelProvider.Factory mViewModelFactory;
+    @Inject ReaderTracker mReaderTracker;
+
     private ReaderCommentListViewModel mViewModel;
 
     @Override
@@ -143,7 +144,7 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         ((WordPress) getApplication()).component().inject(this);
         setContentView(R.layout.reader_activity_comment_list);
-        mViewModel = mViewModelFactory.create(ReaderCommentListViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory).get(ReaderCommentListViewModel.class);
 
         AppBarLayout appBarLayout = findViewById(R.id.appbar_main);
 
@@ -166,6 +167,23 @@ public void onCreate(Bundle savedInstanceState) {
             }
         });
 
+        mViewModel.getSnackbarEvents().observe(this, event ->
+                event.applyIfNotHandled(holder -> {
+                    WPSnackbar.make(mRecyclerView,
+                            mUiHelpers.getTextOfUiString(this, holder.getMessage()),
+                            Snackbar.LENGTH_LONG)
+                              .show();
+                    return Unit.INSTANCE;
+                })
+        );
+
+        mViewModel.getUpdateFollowUiState().observe(this, uiState -> {
+                    if (mCommentAdapter != null) {
+                        mCommentAdapter.updateFollowingState(uiState);
+                    }
+                }
+        );
+
         Toolbar toolbar = findViewById(R.id.toolbar_main);
         setSupportActionBar(toolbar);
 
@@ -189,24 +207,24 @@ public void onCreate(Bundle savedInstanceState) {
             mCommentId = getIntent().getLongExtra(ReaderConstants.ARG_COMMENT_ID, 0);
             mInterceptedUri = getIntent().getStringExtra(ReaderConstants.ARG_INTERCEPTED_URI);
         }
+        mViewModel.start(mBlogId, mPostId);
 
         mSwipeToRefreshHelper = buildSwipeToRefreshHelper(
-                (CustomSwipeRefreshLayout) findViewById(R.id.swipe_to_refresh),
-                new SwipeToRefreshHelper.RefreshListener() {
-                    @Override
-                    public void onRefreshStarted() {
-                        updatePostAndComments();
-                    }
+                findViewById(R.id.swipe_to_refresh),
+                () -> {
+                    mViewModel.onSwipeToRefresh();
+                    updatePostAndComments();
                 }
         );
 
-        mRecyclerView = (ReaderRecyclerView) findViewById(R.id.recycler_view);
+        mRecyclerView = findViewById(R.id.recycler_view);
         int spacingHorizontal = 0;
         int spacingVertical = DisplayUtils.dpToPx(this, 1);
         mRecyclerView.addItemDecoration(new RecyclerItemDecoration(spacingHorizontal, spacingVertical));
 
-        mCommentBox = (ViewGroup) findViewById(R.id.layout_comment_box);
-        mEditComment = (SuggestionAutoCompleteText) mCommentBox.findViewById(R.id.edit_comment);
+        mCommentBox = findViewById(R.id.layout_comment_box);
+        mEditComment = mCommentBox.findViewById(R.id.edit_comment);
+        mEditComment.initializeWithPrefix('@');
         mEditComment.getAutoSaveTextHelper().setUniqueId(String.format(Locale.US, "%d%d", mPostId, mBlogId));
 
         mEditComment.addTextChangedListener(new TextWatcher() {
@@ -225,15 +243,13 @@ public void afterTextChanged(Editable s) {
         });
         mSubmitReplyBtn = mCommentBox.findViewById(R.id.btn_submit_reply);
         mSubmitReplyBtn.setEnabled(false);
-        mSubmitReplyBtn.setOnLongClickListener(new OnLongClickListener() {
-            @Override public boolean onLongClick(View view) {
-                if (view.isHapticFeedbackEnabled()) {
-                    view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                }
-
-                Toast.makeText(view.getContext(), R.string.send, Toast.LENGTH_SHORT).show();
-                return true;
+        mSubmitReplyBtn.setOnLongClickListener(view -> {
+            if (view.isHapticFeedbackEnabled()) {
+                view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             }
+
+            Toast.makeText(view.getContext(), R.string.send, Toast.LENGTH_SHORT).show();
+            return true;
         });
         ViewUtilsKt.redirectContextClickToLongPressListener(mSubmitReplyBtn);
 
@@ -253,70 +269,81 @@ public void afterTextChanged(Editable s) {
         mUpdateOnResume = (savedInstanceState == null);
 
         mSuggestionServiceConnectionManager = new SuggestionServiceConnectionManager(this, mBlogId);
-        mSuggestionAdapter = SuggestionUtils.setupSuggestions(mBlogId, this, mSuggestionServiceConnectionManager,
-                                                              mPost.isWP());
+        mSuggestionAdapter = SuggestionUtils.setupUserSuggestions(
+                mBlogId,
+                this,
+                mSuggestionServiceConnectionManager,
+                mPost.isWP()
+        );
         if (mSuggestionAdapter != null) {
             mEditComment.setAdapter(mSuggestionAdapter);
         }
 
-        AnalyticsUtils.trackWithReaderPostDetails(AnalyticsTracker.Stat.READER_ARTICLE_COMMENTS_OPENED, mPost);
-
-        mSite = mSiteStore.getSiteBySiteId(mBlogId);
+        mReaderTracker.trackPost(AnalyticsTracker.Stat.READER_ARTICLE_COMMENTS_OPENED, mPost);
 
         ImageView buttonExpand = findViewById(R.id.button_expand);
         buttonExpand.setOnClickListener(
-            new OnClickListener() {
-                @Override
-                public void onClick(View v) {
+                v -> {
                     Bundle bundle = CommentFullScreenDialogFragment.Companion
-                            .newBundle(mEditComment.getText().toString(),
+                            .newBundle(
+                                    mEditComment.getText().toString(),
                                     mEditComment.getSelectionStart(),
                                     mEditComment.getSelectionEnd(),
                                     mBlogId
                             );
 
                     new Builder(ReaderCommentListActivity.this)
-                        .setTitle(R.string.comment)
-                        .setOnCollapseListener(new OnCollapseListener() {
-                            @Override
-                            public void onCollapse(@Nullable Bundle result) {
-                                if (result != null) {
-                                    mEditComment.setText(result.getString(RESULT_REPLY));
-                                    mEditComment.setSelection(result.getInt(RESULT_SELECTION_START),
-                                            result.getInt(RESULT_SELECTION_END));
-                                    mEditComment.requestFocus();
-                                }
-                            }
-                        })
-                        .setOnConfirmListener(new OnConfirmListener() {
-                            @Override
-                            public void onConfirm(@Nullable Bundle result) {
-                                if (result != null) {
-                                    mEditComment.setText(result.getString(RESULT_REPLY));
-                                    submitComment();
-                                }
-                            }
-                        })
-                        .setContent(CommentFullScreenDialogFragment.class, bundle)
-                        .setAction(R.string.send)
-                        .setHideActivityBar(true)
-                        .build()
-                        .show(getSupportFragmentManager(), CollapseFullScreenDialogFragment.TAG);
+                            .setTitle(R.string.comment)
+                            .setOnCollapseListener(this)
+                            .setOnConfirmListener(this)
+                            .setContent(CommentFullScreenDialogFragment.class, bundle)
+                            .setAction(R.string.send)
+                            .setHideActivityBar(true)
+                            .build()
+                            .show(getSupportFragmentManager(), CollapseFullScreenDialogFragment.TAG);
                 }
-            }
         );
 
-        buttonExpand.setOnLongClickListener(new OnLongClickListener() {
-            @Override public boolean onLongClick(View view) {
-                if (view.isHapticFeedbackEnabled()) {
-                    view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
-                }
-
-                Toast.makeText(view.getContext(), R.string.description_expand, Toast.LENGTH_SHORT).show();
-                return true;
+        buttonExpand.setOnLongClickListener(view -> {
+            if (view.isHapticFeedbackEnabled()) {
+                view.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
             }
+
+            Toast.makeText(view.getContext(), R.string.description_expand, Toast.LENGTH_SHORT).show();
+            return true;
         });
         ViewUtilsKt.redirectContextClickToLongPressListener(buttonExpand);
+
+        // reattach listeners to collapsible reply dialog
+        CollapseFullScreenDialogFragment fragment =
+                (CollapseFullScreenDialogFragment) getSupportFragmentManager().findFragmentByTag(
+                        CollapseFullScreenDialogFragment.TAG);
+
+        if (fragment != null && fragment.isAdded()) {
+            fragment.setOnCollapseListener(this);
+            fragment.setOnConfirmListener(this);
+        }
+    }
+
+
+    @Override
+    public void onCollapse(@Nullable Bundle result) {
+        if (result != null) {
+            mEditComment.setText(result.getString(RESULT_REPLY));
+            mEditComment.setSelection(
+                    result.getInt(RESULT_SELECTION_START),
+                    result.getInt(RESULT_SELECTION_END)
+            );
+            mEditComment.requestFocus();
+        }
+    }
+
+    @Override
+    public void onConfirm(@Nullable Bundle result) {
+        if (result != null) {
+            mEditComment.setText(result.getString(RESULT_REPLY));
+            submitComment();
+        }
     }
 
     private final View.OnClickListener mSignInClickListener = new View.OnClickListener() {
@@ -326,23 +353,20 @@ public void onClick(View v) {
                 return;
             }
 
-            AnalyticsUtils.trackWithInterceptedUri(AnalyticsTracker.Stat.READER_SIGN_IN_INITIATED, mInterceptedUri);
+            mReaderTracker.trackUri(AnalyticsTracker.Stat.READER_SIGN_IN_INITIATED, mInterceptedUri);
             ActivityLauncher.loginWithoutMagicLink(ReaderCommentListActivity.this);
         }
     };
 
     // to do a complete refresh we need to get updated post and new comments
     private void updatePostAndComments() {
-        ReaderPostActions.updatePost(mPost, new ReaderActions.UpdateResultListener() {
-            @Override
-            public void onUpdateResult(ReaderActions.UpdateResult result) {
-                if (!isFinishing() && result.isNewOrChanged()) {
-                    // get the updated post and pass it to the adapter
-                    ReaderPost post = ReaderPostTable.getBlogPost(mBlogId, mPostId, false);
-                    if (post != null) {
-                        getCommentAdapter().setPost(post);
-                        mPost = post;
-                    }
+        ReaderPostActions.updatePost(mPost, result -> {
+            if (!isFinishing() && result.isNewOrChanged()) {
+                // get the updated post and pass it to the adapter
+                ReaderPost post = ReaderPostTable.getBlogPost(mBlogId, mPostId, false);
+                if (post != null) {
+                    getCommentAdapter().setPost(post);
+                    mPost = post;
                 }
             }
         });
@@ -369,7 +393,8 @@ public void onResume() {
     public void onEventMainThread(SuggestionEvents.SuggestionNameListUpdated event) {
         // check if the updated suggestions are for the current blog and update the suggestions
         if (event.mRemoteBlogId != 0 && event.mRemoteBlogId == mBlogId && mSuggestionAdapter != null) {
-            List<Suggestion> suggestions = SuggestionTable.getSuggestionsForSite(event.mRemoteBlogId);
+            List<UserSuggestion> userSuggestions = UserSuggestionTable.getSuggestionsForSite(event.mRemoteBlogId);
+            List<Suggestion> suggestions = Suggestion.Companion.fromUserSuggestions(userSuggestions);
             mSuggestionAdapter.setSuggestionList(suggestions);
         }
     }
@@ -393,21 +418,20 @@ public void onPause() {
     private void setReplyToCommentId(long commentId, boolean doFocus) {
         mReplyToCommentId = commentId;
         mEditComment.setHint(mReplyToCommentId == 0
-                                     ? R.string.reader_hint_comment_on_post : R.string.reader_hint_comment_on_comment);
+                ? R.string.reader_hint_comment_on_post
+                : R.string.reader_hint_comment_on_comment
+        );
 
         if (doFocus) {
-            mEditComment.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    final boolean isFocusableInTouchMode = mEditComment.isFocusableInTouchMode();
+            mEditComment.postDelayed(() -> {
+                final boolean isFocusableInTouchMode = mEditComment.isFocusableInTouchMode();
 
-                    mEditComment.setFocusableInTouchMode(true);
-                    EditTextUtils.showSoftInput(mEditComment);
+                mEditComment.setFocusableInTouchMode(true);
+                EditTextUtils.showSoftInput(mEditComment);
 
-                    mEditComment.setFocusableInTouchMode(isFocusableInTouchMode);
+                mEditComment.setFocusableInTouchMode(isFocusableInTouchMode);
 
-                    setupReplyToComment();
-                }
+                setupReplyToComment();
             }, 200);
         } else {
             setupReplyToComment();
@@ -425,12 +449,9 @@ private void setupReplyToComment() {
 
             // reset to replying to the post when user hasn't entered any text and hits
             // the back button in the editText to hide the soft keyboard
-            mEditComment.setOnBackListener(new SuggestionAutoCompleteText.OnEditTextBackListener() {
-                @Override
-                public void onEditTextBack() {
-                    if (EditTextUtils.isEmpty(mEditComment)) {
-                        setReplyToCommentId(0, false);
-                    }
+            mEditComment.setOnBackListener(() -> {
+                if (EditTextUtils.isEmpty(mEditComment)) {
+                    setReplyToCommentId(0, false);
                 }
             });
         } else {
@@ -451,7 +472,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
     }
 
     private void showCommentsClosedMessage(boolean show) {
-        TextView txtCommentsClosed = (TextView) findViewById(R.id.text_comments_closed);
+        TextView txtCommentsClosed = findViewById(R.id.text_comments_closed);
         if (txtCommentsClosed != null) {
             txtCommentsClosed.setVisibility(show ? View.VISIBLE : View.GONE);
         }
@@ -463,7 +484,6 @@ private boolean loadPost() {
             return false;
         }
 
-        TextView txtCommentsClosed = (TextView) findViewById(R.id.text_comments_closed);
         if (!mAccountStore.hasAccessToken()) {
             mCommentBox.setVisibility(View.GONE);
             showCommentsClosedMessage(false);
@@ -471,22 +491,14 @@ private boolean loadPost() {
             mCommentBox.setVisibility(View.VISIBLE);
             showCommentsClosedMessage(false);
 
-            mEditComment.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-                @Override
-                public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                    if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEND) {
-                        submitComment();
-                    }
-                    return false;
-                }
-            });
-
-            mSubmitReplyBtn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
+            mEditComment.setOnEditorActionListener((v, actionId, event) -> {
+                if (actionId == EditorInfo.IME_ACTION_DONE || actionId == EditorInfo.IME_ACTION_SEND) {
                     submitComment();
                 }
+                return false;
             });
+
+            mSubmitReplyBtn.setOnClickListener(v -> submitComment());
         } else {
             mCommentBox.setVisibility(View.GONE);
             mEditComment.setEnabled(false);
@@ -513,12 +525,7 @@ private ReaderCommentAdapter getCommentAdapter() {
             mCommentAdapter = new ReaderCommentAdapter(WPActivityUtils.getThemedContext(this), getPost());
 
             // adapter calls this when user taps reply icon
-            mCommentAdapter.setReplyListener(new ReaderCommentAdapter.RequestReplyListener() {
-                @Override
-                public void onRequestReply(long commentId) {
-                    setReplyToCommentId(commentId, true);
-                }
-            });
+            mCommentAdapter.setReplyListener(commentId -> setReplyToCommentId(commentId, true));
 
             // Enable post title click if we came here directly from notifications or deep linking
             if (mDirectOperation != null) {
@@ -526,37 +533,31 @@ public void onRequestReply(long commentId) {
             }
 
             // adapter calls this when data has been loaded & displayed
-            mCommentAdapter.setDataLoadedListener(new ReaderInterfaces.DataLoadedListener() {
-                @Override
-                public void onDataLoaded(boolean isEmpty) {
-                    if (!isFinishing()) {
-                        if (isEmpty || !mHasUpdatedComments) {
-                            updateComments(isEmpty, false);
-                        } else if (mCommentId > 0 || mDirectOperation != null) {
-                            if (mCommentId > 0) {
-                                // Scroll to the commentId once if it was passed to this activity
-                                smoothScrollToCommentId(mCommentId);
-                            }
-
-                            doDirectOperation();
-                        } else if (mRestorePosition > 0) {
-                            mViewModel.scrollToPosition(mRestorePosition, false);
+            mCommentAdapter.setDataLoadedListener(isEmpty -> {
+                if (!isFinishing()) {
+                    if (isEmpty || !mHasUpdatedComments) {
+                        updateComments(isEmpty, false);
+                    } else if (mCommentId > 0 || mDirectOperation != null) {
+                        if (mCommentId > 0) {
+                            // Scroll to the commentId once if it was passed to this activity
+                            smoothScrollToCommentId(mCommentId);
                         }
-                        mRestorePosition = 0;
-                        checkEmptyView();
+
+                        doDirectOperation();
+                    } else if (mRestorePosition > 0) {
+                        mViewModel.scrollToPosition(mRestorePosition, false);
                     }
+                    mRestorePosition = 0;
+                    checkEmptyView();
                 }
             });
 
             // adapter uses this to request more comments from server when it reaches the end and
             // detects that more comments exist on the server than are stored locally
-            mCommentAdapter.setDataRequestedListener(new ReaderActions.DataRequestedListener() {
-                @Override
-                public void onRequestData() {
-                    if (!mIsUpdatingComments) {
-                        AppLog.i(T.READER, "reader comments > requesting next page of comments");
-                        updateComments(true, true);
-                    }
+            mCommentAdapter.setDataRequestedListener(() -> {
+                if (!mIsUpdatingComments) {
+                    AppLog.i(T.READER, "reader comments > requesting next page of comments");
+                    updateComments(true, true);
                 }
             });
         }
@@ -584,29 +585,42 @@ private void doDirectOperation() {
                     getCommentAdapter().setHighlightCommentId(mCommentId, false);
                     if (!mAccountStore.hasAccessToken()) {
                         WPSnackbar.make(mRecyclerView,
-                                      R.string.reader_snackbar_err_cannot_like_post_logged_out,
-                                      Snackbar.LENGTH_INDEFINITE)
-                                .setAction(R.string.sign_in, mSignInClickListener)
-                                .show();
+                                R.string.reader_snackbar_err_cannot_like_post_logged_out,
+                                Snackbar.LENGTH_INDEFINITE)
+                                  .setAction(R.string.sign_in, mSignInClickListener)
+                                  .show();
                     } else {
                         ReaderComment comment = ReaderCommentTable.getComment(mPost.blogId, mPost.postId, mCommentId);
                         if (comment == null) {
-                            ToastUtils.showToast(ReaderCommentListActivity.this,
-                                                 R.string.reader_toast_err_comment_not_found);
+                            ToastUtils.showToast(
+                                    ReaderCommentListActivity.this,
+                                    R.string.reader_toast_err_comment_not_found
+                            );
                         } else if (comment.isLikedByCurrentUser) {
-                            ToastUtils.showToast(ReaderCommentListActivity.this,
-                                                 R.string.reader_toast_err_already_liked);
+                            ToastUtils.showToast(
+                                    ReaderCommentListActivity.this,
+                                    R.string.reader_toast_err_already_liked
+                            );
                         } else {
                             long wpComUserId = mAccountStore.getAccount().getUserId();
                             if (ReaderCommentActions.performLikeAction(comment, true, wpComUserId)
                                 && getCommentAdapter().refreshComment(mCommentId)) {
                                 getCommentAdapter().setAnimateLikeCommentId(mCommentId);
 
-                                AnalyticsUtils.trackWithReaderPostDetails(
-                                        AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_LIKED, mPost);
+                                mReaderTracker.trackPost(
+                                        AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_LIKED,
+                                        mPost
+                                );
+                                mReaderTracker.trackPost(
+                                        AnalyticsTracker.Stat.COMMENT_LIKED,
+                                        mPost,
+                                        AnalyticsCommentActionSource.READER.toString()
+                                );
                             } else {
-                                ToastUtils.showToast(ReaderCommentListActivity.this,
-                                                     R.string.reader_toast_err_generic);
+                                ToastUtils.showToast(
+                                        ReaderCommentListActivity.this,
+                                        R.string.reader_toast_err_generic
+                                );
                             }
                         }
 
@@ -628,14 +642,14 @@ private ReaderPost getPost() {
     }
 
     private void showProgress() {
-        ProgressBar progress = (ProgressBar) findViewById(R.id.progress_loading);
+        ProgressBar progress = findViewById(R.id.progress_loading);
         if (progress != null) {
             progress.setVisibility(View.VISIBLE);
         }
     }
 
     private void hideProgress() {
-        ProgressBar progress = (ProgressBar) findViewById(R.id.progress_loading);
+        ProgressBar progress = findViewById(R.id.progress_loading);
         if (progress != null) {
             progress.setVisibility(View.GONE);
         }
@@ -690,7 +704,7 @@ private void updateComments(boolean showProgress, boolean requestNextPage) {
     }
 
     private void checkEmptyView() {
-        TextView txtEmpty = (TextView) findViewById(R.id.text_empty);
+        TextView txtEmpty = findViewById(R.id.text_empty);
         if (txtEmpty == null) {
             return;
         }
@@ -750,8 +764,11 @@ private void submitComment() {
             return;
         }
 
-        AnalyticsUtils.trackWithReaderPostDetails(
-                AnalyticsTracker.Stat.READER_ARTICLE_COMMENTED_ON, mPost);
+        if (mReplyToCommentId != 0) {
+            mReaderTracker.trackPost(AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_REPLIED_TO, mPost);
+        } else {
+            mReaderTracker.trackPost(AnalyticsTracker.Stat.READER_ARTICLE_COMMENTED_ON, mPost);
+        }
 
         mSubmitReplyBtn.setEnabled(false);
         mEditComment.setEnabled(false);
@@ -761,32 +778,29 @@ private void submitComment() {
         // and reflect it in the adapter before the API call returns
         final long fakeCommentId = ReaderCommentActions.generateFakeCommentId();
 
-        ReaderActions.CommentActionListener actionListener = new ReaderActions.CommentActionListener() {
-            @Override
-            public void onActionResult(boolean succeeded, ReaderComment newComment) {
-                if (isFinishing()) {
-                    return;
-                }
-                mIsSubmittingComment = false;
-                mEditComment.setEnabled(true);
-                if (succeeded) {
-                    mSubmitReplyBtn.setEnabled(false);
-                    // stop highlighting the fake comment and replace it with the real one
-                    getCommentAdapter().setHighlightCommentId(0, false);
-                    getCommentAdapter().replaceComment(fakeCommentId, newComment);
-                    getCommentAdapter().refreshPost();
-                    setReplyToCommentId(0, false);
-                    mEditComment.getAutoSaveTextHelper().clearSavedText(mEditComment);
-                } else {
-                    mEditComment.setText(commentText);
-                    mSubmitReplyBtn.setEnabled(true);
-                    getCommentAdapter().removeComment(fakeCommentId);
-                    ToastUtils.showToast(
-                            ReaderCommentListActivity.this, R.string.reader_toast_err_comment_failed,
-                            ToastUtils.Duration.LONG);
-                }
-                checkEmptyView();
+        ReaderActions.CommentActionListener actionListener = (succeeded, newComment) -> {
+            if (isFinishing()) {
+                return;
             }
+            mIsSubmittingComment = false;
+            mEditComment.setEnabled(true);
+            if (succeeded) {
+                mSubmitReplyBtn.setEnabled(false);
+                // stop highlighting the fake comment and replace it with the real one
+                getCommentAdapter().setHighlightCommentId(0, false);
+                getCommentAdapter().replaceComment(fakeCommentId, newComment);
+                getCommentAdapter().refreshPost();
+                setReplyToCommentId(0, false);
+                mEditComment.getAutoSaveTextHelper().clearSavedText(mEditComment);
+            } else {
+                mEditComment.setText(commentText);
+                mSubmitReplyBtn.setEnabled(true);
+                getCommentAdapter().removeComment(fakeCommentId);
+                ToastUtils.showToast(
+                        ReaderCommentListActivity.this, R.string.reader_toast_err_comment_failed,
+                        ToastUtils.Duration.LONG);
+            }
+            checkEmptyView();
         };
 
         long wpComUserId = mAccountStore.getAccount().getUserId();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListViewModel.kt
index 5f2c776578b6..2df089dc38d7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderCommentListViewModel.kt
@@ -1,24 +1,52 @@
 package org.wordpress.android.ui.reader
 
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.FollowCommentsUiStateType.DISABLED
+import org.wordpress.android.ui.reader.FollowCommentsUiStateType.GONE
+import org.wordpress.android.ui.reader.FollowCommentsUiStateType.LOADING
+import org.wordpress.android.ui.reader.FollowCommentsUiStateType.VISIBLE_WITH_STATE
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.Failure
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowCommentsNotAllowed
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowStateChanged
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.Loading
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.UserNotAuthenticated
 import org.wordpress.android.util.distinct
+import org.wordpress.android.util.map
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
 
 class ReaderCommentListViewModel
-@Inject constructor(@Named(UI_THREAD) mainDispatcher: CoroutineDispatcher) : ScopedViewModel(
-        mainDispatcher
-) {
+@Inject constructor(
+    private val followCommentsHandler: ReaderFollowCommentsHandler,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) : ScopedViewModel(mainDispatcher) {
+    private var isStarted = false
+    private var followStatusGetJob: Job? = null
+    private var followStatusSetJob: Job? = null
+
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _updateFollowStatus = MediatorLiveData<FollowCommentsState>()
+    val updateFollowUiState: LiveData<FollowCommentsUiState> =
+            _updateFollowStatus.map { state -> buildFollowCommentsUiState(state) }
+
     private val _scrollTo = MutableLiveData<Event<ScrollPosition>>()
     val scrollTo: LiveData<Event<ScrollPosition>> = _scrollTo.distinct()
+    private var blogId: Long = 0
+    private var postId: Long = 0
 
     private var scrollJob: Job? = null
 
@@ -31,4 +59,79 @@ class ReaderCommentListViewModel
     }
 
     data class ScrollPosition(val position: Int, val isSmooth: Boolean)
+
+    fun start(blogId: Long, postId: Long) {
+        if (isStarted) return
+        isStarted = true
+
+        this.blogId = blogId
+        this.postId = postId
+
+        _updateFollowStatus.value = FollowCommentsNotAllowed
+
+        init()
+    }
+
+    fun onSwipeToRefresh() {
+        getFollowConversationStatus(blogId, postId, false)
+    }
+
+    private fun init() {
+        _snackbarEvents.addSource(followCommentsHandler.snackbarEvents) { event ->
+            _snackbarEvents.value = event
+        }
+
+        _updateFollowStatus.addSource(followCommentsHandler.followStatusUpdate) { event ->
+            _updateFollowStatus.value = event
+        }
+
+        getFollowConversationStatus(blogId, postId, true)
+    }
+
+    private fun onFollowConversationClicked(askSubscribe: Boolean) {
+        followStatusSetJob?.cancel()
+        followStatusSetJob = launch(bgDispatcher) {
+            followCommentsHandler.handleFollowCommentsClicked(blogId, postId, askSubscribe)
+        }
+    }
+
+    private fun getFollowConversationStatus(blogId: Long, postId: Long, isInit: Boolean) {
+        followStatusGetJob?.cancel()
+        followStatusGetJob = launch(bgDispatcher) {
+            followCommentsHandler.handleFollowCommentsStatusRequest(blogId, postId, isInit)
+        }
+    }
+
+    private fun buildFollowCommentsUiState(followCommentsState: FollowCommentsState): FollowCommentsUiState {
+        return FollowCommentsUiState(
+                    type = when (followCommentsState) {
+                        Loading -> LOADING
+                        is FollowStateChanged -> VISIBLE_WITH_STATE
+                        is Failure, FollowCommentsNotAllowed -> DISABLED
+                        UserNotAuthenticated -> GONE
+                    },
+                    showFollowButton = followCommentsState !is UserNotAuthenticated,
+                    isFollowing = if (followCommentsState is FollowStateChanged) {
+                        followCommentsState.isFollowing
+                    } else {
+                        false
+                    },
+                    animate = if (followCommentsState is FollowStateChanged) {
+                        !followCommentsState.isInit
+                    } else {
+                        false
+                    },
+                    onFollowButtonClick = if (followCommentsState !is UserNotAuthenticated) {
+                        ::onFollowConversationClicked
+                    } else {
+                        null
+                    }
+        )
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        followStatusGetJob?.cancel()
+        followStatusSetJob?.cancel()
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java
index 69efd12e1221..a43811a053d1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderConstants.java
@@ -32,13 +32,14 @@ public class ReaderConstants {
     public static final String HTTP_REFERER_URL = "https://wordpress.com";
 
     // intent arguments / keys
+    static final String ARG_SOURCE = "source";
     static final String ARG_TAG = "tag";
     static final String ARG_ORIGINAL_TAG = "original_tag";
-    static final String ARG_IS_FEED = "is_feed";
+    public static final String ARG_IS_FEED = "is_feed";
     static final String ARG_BLOG_ID = "blog_id";
     static final String ARG_FEED_ID = "feed_id";
     static final String ARG_POST_ID = "post_id";
-    static final String ARG_INTERCEPTED_URI = "intercepted_uri";
+    public static final String ARG_INTERCEPTED_URI = "intercepted_uri";
     static final String ARG_COMMENT_ID = "comment_id";
     static final String ARG_DIRECT_OPERATION = "direct_operation";
     static final String ARG_IMAGE_URL = "image_url";
@@ -47,6 +48,7 @@ public class ReaderConstants {
     static final String ARG_POST_LIST_TYPE = "post_list_type";
     static final String ARG_CONTENT = "content";
     static final String ARG_IS_SINGLE_POST = "is_single_post";
+    static final String ARG_IS_RELATED_POST = "is_related_post";
     static final String ARG_SEARCH_QUERY = "search_query";
     static final String ARG_VIDEO_URL = "video_url";
     static final String ARG_IS_TOP_LEVEL = "is_top_level";
@@ -54,7 +56,6 @@ public class ReaderConstants {
 
     static final String KEY_POST_SLUGS_RESOLUTION_UNDERWAY = "post_slugs_resolution_underway";
     static final String KEY_ALREADY_UPDATED = "already_updated";
-    static final String KEY_ALREADY_REQUESTED = "already_requested";
     static final String KEY_RESTORE_POSITION = "restore_position";
     static final String KEY_SITE_SEARCH_RESTORE_POSITION = "site_search_restore_position";
     static final String KEY_WAS_PAUSED = "was_paused";
@@ -96,4 +97,7 @@ public class ReaderConstants {
     // JSON Recommended blog key names
     public static final String RECOMMENDED_BLOG_ID = "ID";
     public static final String RECOMMENDED_FEED_ID = "feed_ID";
+
+    // Custom action to handle post deeplinks
+    public static final String ACTION_VIEW_POST = "org.wordpress.android.action.VIEW_POST";
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java
index 0cbc74a1593e..065d279cff05 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderEvents.java
@@ -207,14 +207,19 @@ public static class RelatedPostsUpdated {
         private final long mSourceSiteId;
         private final ReaderSimplePostList mLocalRelatedPosts;
         private final ReaderSimplePostList mGlobalRelatedPosts;
+        private final boolean mDidSucceed;
 
-        public RelatedPostsUpdated(@NonNull ReaderPost sourcePost,
-                                   @NonNull ReaderSimplePostList localRelatedPosts,
-                                   @NonNull ReaderSimplePostList globalRelatedPosts) {
+        public RelatedPostsUpdated(
+            @NonNull ReaderPost sourcePost,
+            @NonNull ReaderSimplePostList localRelatedPosts,
+            @NonNull ReaderSimplePostList globalRelatedPosts,
+            boolean didSucceed
+        ) {
             mSourcePostId = sourcePost.postId;
             mSourceSiteId = sourcePost.blogId;
             mLocalRelatedPosts = localRelatedPosts;
             mGlobalRelatedPosts = globalRelatedPosts;
+            mDidSucceed = didSucceed;
         }
 
         public long getSourcePostId() {
@@ -240,6 +245,10 @@ public boolean hasLocalRelatedPosts() {
         public boolean hasGlobalRelatedPosts() {
             return mGlobalRelatedPosts.size() > 0;
         }
+
+        public boolean didSucceed() {
+            return mDidSucceed;
+        }
     }
 
     public static class PostSlugsRequestCompleted {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFollowCommentsHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFollowCommentsHandler.kt
new file mode 100644
index 000000000000..53ab76fc8f87
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFollowCommentsHandler.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.ui.reader
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState
+import org.wordpress.android.viewmodel.Event
+import javax.inject.Inject
+import javax.inject.Named
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOn
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.Failure
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowCommentsNotAllowed
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowStateChanged
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.Loading
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.UserNotAuthenticated
+
+class ReaderFollowCommentsHandler @Inject constructor(
+    private val readerCommentsFollowUseCase: ReaderCommentsFollowUseCase,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
+    val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
+
+    private val _followStatusUpdate = MediatorLiveData<FollowCommentsState>()
+    val followStatusUpdate: LiveData<FollowCommentsState> = _followStatusUpdate
+
+    suspend fun handleFollowCommentsClicked(blogId: Long, postId: Long, askSubscribe: Boolean) {
+        readerCommentsFollowUseCase.setMySubscriptionToPost(blogId, postId, askSubscribe)
+                .flowOn(bgDispatcher).collect { state ->
+            manageState(state)
+        }
+    }
+
+    suspend fun handleFollowCommentsStatusRequest(blogId: Long, postId: Long, isInit: Boolean) {
+        readerCommentsFollowUseCase.getMySubscriptionToPost(blogId, postId, isInit)
+                .flowOn(bgDispatcher).collect { state ->
+            manageState(state)
+        }
+    }
+
+    private fun manageState(state: FollowCommentsState) {
+        when (state) {
+            is FollowStateChanged -> {
+                _followStatusUpdate.postValue(state)
+                state.userMessage?.let {
+                    _snackbarEvents.postValue(Event(SnackbarMessageHolder(it)))
+                }
+            }
+            is Failure -> {
+                _followStatusUpdate.postValue(state)
+                _snackbarEvents.postValue(Event(SnackbarMessageHolder(state.error)))
+            }
+            Loading -> {
+                _followStatusUpdate.postValue(state)
+            }
+            FollowCommentsNotAllowed -> {
+                _followStatusUpdate.postValue(state)
+            }
+            UserNotAuthenticated -> {
+                _followStatusUpdate.postValue(state)
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFragment.kt
index f2487158965b..f2c5bd3f9fba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderFragment.kt
@@ -7,16 +7,14 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
-import kotlinx.android.synthetic.main.reader_fragment_layout.*
 import org.wordpress.android.R
 import org.wordpress.android.R.string
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderFragmentLayoutBinding
 import org.wordpress.android.models.ReaderTagList
 import org.wordpress.android.ui.ScrollableViewInitializedListener
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
@@ -28,6 +26,7 @@ import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarte
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel.ReaderUiState.ContentUiState
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.viewmodel.observeEvent
 import java.util.EnumSet
 import javax.inject.Inject
 
@@ -39,6 +38,8 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), ScrollableView
     private var searchMenuItem: MenuItem? = null
     private var settingsMenuItem: MenuItem? = null
 
+    private var binding: ReaderFragmentLayoutBinding? = null
+
     private val viewPagerCallback = object : ViewPager2.OnPageChangeCallback() {
         override fun onPageSelected(position: Int) {
             super.onPageSelected(position)
@@ -58,15 +59,18 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), ScrollableView
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         setHasOptionsMenu(true)
-        initToolbar()
-        initViewPager()
-        initViewModel()
+        binding = ReaderFragmentLayoutBinding.bind(view).apply {
+            initToolbar()
+            initViewPager()
+            initViewModel()
+        }
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
         searchMenuItem = null
         settingsMenuItem = null
+        binding = null
     }
 
     override fun onResume() {
@@ -107,78 +111,66 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), ScrollableView
         }
     }
 
-    private fun initToolbar() {
+    private fun ReaderFragmentLayoutBinding.initToolbar() {
         toolbar.title = getString(string.reader_screen_title)
         (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
     }
 
-    private fun initViewPager() {
-        view_pager.registerOnPageChangeCallback(viewPagerCallback)
+    private fun ReaderFragmentLayoutBinding.initViewPager() {
+        viewPager.registerOnPageChangeCallback(viewPagerCallback)
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(ReaderViewModel::class.java)
+    private fun ReaderFragmentLayoutBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@ReaderFragment, viewModelFactory).get(ReaderViewModel::class.java)
         startObserving()
     }
 
-    private fun startObserving() {
-        viewModel.uiState.observe(viewLifecycleOwner, Observer { uiState ->
+    private fun ReaderFragmentLayoutBinding.startObserving() {
+        viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             uiState?.let {
                 when (it) {
                     is ContentUiState -> {
                         updateTabs(it)
                     }
                 }
-                uiHelpers.updateVisibility(tab_layout, uiState.tabLayoutVisible)
+                uiHelpers.updateVisibility(tabLayout, uiState.tabLayoutVisible)
                 searchMenuItem?.isVisible = uiState.searchIconVisible
                 settingsMenuItem?.isVisible = uiState.settingsIconVisible
             }
-        })
+        }
 
-        viewModel.updateTags.observe(viewLifecycleOwner, Observer { updateAcion ->
-            updateAcion?.getContentIfNotHandled()?.let {
-                ReaderUpdateServiceStarter.startService(context, EnumSet.of(TAGS, FOLLOWED_BLOGS))
-            }
-        })
+        viewModel.updateTags.observeEvent(viewLifecycleOwner) {
+            ReaderUpdateServiceStarter.startService(context, EnumSet.of(TAGS, FOLLOWED_BLOGS))
+        }
 
-        viewModel.selectTab.observe(viewLifecycleOwner, Observer { selectTabAction ->
-            selectTabAction.getContentIfNotHandled()?.let { navTarget ->
-                view_pager.setCurrentItem(navTarget.position, navTarget.smoothAnimation)
-            }
-        })
+        viewModel.selectTab.observeEvent(viewLifecycleOwner) { navTarget ->
+            viewPager.setCurrentItem(navTarget.position, navTarget.smoothAnimation)
+        }
 
-        viewModel.showSearch.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let {
-                ReaderActivityLauncher.showReaderSearch(context)
-            }
-        })
+        viewModel.showSearch.observeEvent(viewLifecycleOwner) {
+            ReaderActivityLauncher.showReaderSearch(context)
+        }
 
-        viewModel.showSettings.observe(viewLifecycleOwner, Observer { event ->
-            event.getContentIfNotHandled()?.let {
-                ReaderActivityLauncher.showReaderSubs(context)
-            }
-        })
+        viewModel.showSettings.observeEvent(viewLifecycleOwner) {
+            ReaderActivityLauncher.showReaderSubs(context)
+        }
 
-        viewModel.showReaderInterests.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let {
-                showReaderInterests()
-            }
-        })
+        viewModel.showReaderInterests.observeEvent(viewLifecycleOwner) {
+            showReaderInterests()
+        }
 
-        viewModel.closeReaderInterests.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let {
-                closeReaderInterests()
-            }
-        })
+        viewModel.closeReaderInterests.observeEvent(viewLifecycleOwner) {
+            closeReaderInterests()
+        }
 
         viewModel.start()
     }
 
-    private fun updateTabs(uiState: ContentUiState) {
-        val adapter = TabsAdapter(this, uiState.readerTagList)
-        view_pager.adapter = adapter
+    private fun ReaderFragmentLayoutBinding.updateTabs(uiState: ContentUiState) {
+        val adapter = TabsAdapter(this@ReaderFragment, uiState.readerTagList)
+        viewPager.adapter = adapter
 
-        TabLayoutMediator(tab_layout, view_pager) { tab, position ->
+        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
             tab.text = uiState.tabTitles[position]
         }.attach()
     }
@@ -194,7 +186,11 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), ScrollableView
             return if (tags[position].isDiscover) {
                 ReaderDiscoverFragment()
             } else {
-                ReaderPostListFragment.newInstanceForTag(tags[position], ReaderPostListType.TAG_FOLLOWED, true)
+                ReaderPostListFragment.newInstanceForTag(
+                        tags[position],
+                        ReaderPostListType.TAG_FOLLOWED,
+                        true
+                )
             }
         }
     }
@@ -222,6 +218,6 @@ class ReaderFragment : Fragment(R.layout.reader_fragment_layout), ScrollableView
     }
 
     override fun onScrollableViewInitialized(containerId: Int) {
-        app_bar.liftOnScrollTargetViewId = containerId
+        binding?.appBar?.liftOnScrollTargetViewId = containerId
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderInterfaces.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderInterfaces.java
index ef51e3bcceec..74f553f31782 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderInterfaces.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderInterfaces.java
@@ -32,7 +32,7 @@ public interface DataLoadedListener {
      * used by adapters to notify when follow button has been tapped
      */
     public interface OnFollowListener {
-        void onFollowTapped(View view, String blogName, long blogId);
+        void onFollowTapped(View view, String blogName, long blogId, long feedId);
 
         void onFollowingTapped();
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt
index e9ed2c4a3020..bf96c432e19b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.kt
@@ -1,18 +1,16 @@
 package org.wordpress.android.ui.reader
 
-import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.DownloadManager
 import android.content.Intent
 import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.content.res.Resources
+import android.graphics.Rect
 import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.os.AsyncTask
 import android.os.Bundle
-import android.text.Html
-import android.text.TextUtils
+import android.os.Parcelable
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.Menu
@@ -22,7 +20,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.webkit.CookieManager
 import android.webkit.WebView
-import android.widget.ImageView
 import android.widget.ImageView.ScaleType.CENTER_CROP
 import android.widget.ProgressBar
 import android.widget.TextView
@@ -35,28 +32,22 @@ import androidx.core.graphics.BlendModeColorFilterCompat
 import androidx.core.graphics.BlendModeCompat
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
-import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProvider.Factory
-import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.elevation.ElevationOverlayProvider
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.reader_fragment_post_detail.*
-import kotlinx.android.synthetic.main.reader_include_post_detail_footer.*
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
-import org.wordpress.android.analytics.AnalyticsTracker.Stat
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.DEEP_LINKED_FALLBACK
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_RENDERED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_USER_UNAUTHORIZED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_WPCOM_SIGN_IN_NEEDED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.SHARED_ITEM
+import org.wordpress.android.databinding.ReaderFragmentPostDetailBinding
 import org.wordpress.android.datasets.ReaderPostTable
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.SiteActionBuilder
@@ -66,64 +57,61 @@ import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.fluxc.store.SiteStore.FetchPrivateAtomicCookiePayload
 import org.wordpress.android.fluxc.store.SiteStore.OnPrivateAtomicCookieFetched
 import org.wordpress.android.models.ReaderPost
-import org.wordpress.android.models.ReaderPostDiscoverData
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.PrivateAtCookieRefreshProgressDialog
 import org.wordpress.android.ui.PrivateAtCookieRefreshProgressDialog.PrivateAtCookieProgressDialogOnDismissListener
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.ViewPagerFragment
+import org.wordpress.android.ui.engagement.EngageItem
+import org.wordpress.android.ui.engagement.EngagedPeopleListViewModel.EngagedPeopleListUiState
+import org.wordpress.android.ui.engagement.EngagementNavigationSource
 import org.wordpress.android.ui.main.SitePickerActivity
 import org.wordpress.android.ui.main.WPMainActivity
 import org.wordpress.android.ui.media.MediaPreviewActivity
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.reader.ReaderActivityLauncher.OpenUrlType
 import org.wordpress.android.ui.reader.ReaderActivityLauncher.PhotoViewerOption
-import org.wordpress.android.ui.reader.ReaderActivityLauncher.PhotoViewerOption.IS_PRIVATE_IMAGE
 import org.wordpress.android.ui.reader.ReaderPostPagerActivity.DirectOperation
-import org.wordpress.android.ui.reader.ReaderPostPagerActivity.DirectOperation.COMMENT_JUMP
-import org.wordpress.android.ui.reader.ReaderPostPagerActivity.DirectOperation.COMMENT_LIKE
-import org.wordpress.android.ui.reader.ReaderPostPagerActivity.DirectOperation.COMMENT_REPLY
-import org.wordpress.android.ui.reader.ReaderPostPagerActivity.DirectOperation.POST_LIKE
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
 import org.wordpress.android.ui.reader.actions.ReaderActions
 import org.wordpress.android.ui.reader.actions.ReaderPostActions
 import org.wordpress.android.ui.reader.adapters.ReaderMenuAdapter
+import org.wordpress.android.ui.reader.adapters.ReaderPostLikersAdapter
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents
-import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenEditorForReblog
-import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBlogPreview
-import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBookmarkedSavedOnlyLocallyDialog
-import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBookmarkedTab
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryAction
-import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType
-import org.wordpress.android.ui.reader.utils.FeaturedImageUtils
+import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.utils.ReaderUtils
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.reader.utils.ReaderVideoUtils
+import org.wordpress.android.ui.reader.viewholders.PostLikerItemDecorator
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel
-import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.ReaderPostDetailsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.LoadingUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState
 import org.wordpress.android.ui.reader.views.ReaderIconCountView
 import org.wordpress.android.ui.reader.views.ReaderPostDetailsHeaderViewUiStateBuilder
+import org.wordpress.android.ui.reader.views.ReaderSimplePostContainerView
 import org.wordpress.android.ui.reader.views.ReaderWebView
 import org.wordpress.android.ui.reader.views.ReaderWebView.ReaderCustomViewListener
 import org.wordpress.android.ui.reader.views.ReaderWebView.ReaderWebViewPageFinishedListener
 import org.wordpress.android.ui.reader.views.ReaderWebView.ReaderWebViewUrlClickListener
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.util.AniUtils
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
-import org.wordpress.android.util.AppLog.T.READER
-import org.wordpress.android.util.DisplayUtils
-import org.wordpress.android.util.HtmlUtils
 import org.wordpress.android.util.NetworkUtils
 import org.wordpress.android.util.PermissionUtils
+import org.wordpress.android.util.RtlUtils
 import org.wordpress.android.util.StringUtils
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.UrlUtils
 import org.wordpress.android.util.WPPermissionUtils.READER_FILE_DOWNLOAD_PERMISSION_REQUEST_CODE
 import org.wordpress.android.util.WPSwipeToRefreshHelper.buildSwipeToRefreshHelper
-import org.wordpress.android.util.WPUrlUtils
-import org.wordpress.android.util.analytics.AnalyticsUtils
+import org.wordpress.android.util.config.LikesEnhancementsFeatureConfig
 import org.wordpress.android.util.getColorFromAttribute
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import org.wordpress.android.util.image.ImageManager
@@ -131,14 +119,19 @@ import org.wordpress.android.util.image.ImageType.PHOTO
 import org.wordpress.android.util.isDarkTheme
 import org.wordpress.android.util.setVisible
 import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPScrollView
+import org.wordpress.android.widgets.WPScrollView.ScrollDirectionListener
 import org.wordpress.android.widgets.WPSnackbar
 import org.wordpress.android.widgets.WPTextView
+import java.net.HttpURLConnection
 import java.util.EnumSet
 import javax.inject.Inject
 
 class ReaderPostDetailFragment : ViewPagerFragment(),
         WPMainActivity.OnActivityBackPressedListener,
+        ScrollDirectionListener,
         ReaderCustomViewListener,
         ReaderWebViewPageFinishedListener,
         ReaderWebViewUrlClickListener,
@@ -148,9 +141,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     private var blogId: Long = 0
     private var directOperation: DirectOperation? = null
     private var commentId: Int = 0
-    private var isFeed: Boolean = false
     private var interceptedUri: String? = null
-    private var post: ReaderPost? = null
     private var renderer: ReaderPostRenderer? = null
     private var postListType: ReaderPostListType = ReaderTypes.DEFAULT_POST_LIST_TYPE
 
@@ -163,18 +154,33 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     private lateinit var layoutFooter: ViewGroup
     private lateinit var readerWebView: ReaderWebView
 
+    private lateinit var likeFacesTrain: View
+    private lateinit var facesBlock: View
+    private lateinit var likeProgressBar: ProgressBar
+    private lateinit var likeEmptyStateText: TextView
+    private lateinit var likeFacesRecycler: RecyclerView
+    private lateinit var likeNumBloggers: TextView
+
+    private lateinit var excerptFooter: ViewGroup
+    private lateinit var textExcerptFooter: TextView
+
     private lateinit var signInButton: WPTextView
-    private lateinit var readerBookmarkButton: ImageView
-    private lateinit var featuredImageView: ImageView
 
     private lateinit var appBar: AppBarLayout
     private lateinit var toolBar: Toolbar
 
+    private lateinit var globalRelatedPostsView: ReaderSimplePostContainerView
+    private lateinit var localRelatedPostsView: ReaderSimplePostContainerView
+
     private var postSlugsResolutionUnderway: Boolean = false
     private var hasAlreadyUpdatedPost: Boolean = false
-    private var hasAlreadyRequestedPost: Boolean = false
     private var isWebViewPaused: Boolean = false
 
+    private var isRelatedPost: Boolean = false
+
+    private var hasTrackedGlobalRelatedPosts: Boolean = false
+    private var hasTrackedLocalRelatedPosts: Boolean = false
+
     private var errorMessage: String? = null
 
     private var fileForDownload: String? = null
@@ -185,7 +191,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     @Inject internal lateinit var siteStore: SiteStore
     @Inject internal lateinit var dispatcher: Dispatcher
     @Inject internal lateinit var readerFileDownloadManager: ReaderFileDownloadManager
-    @Inject internal lateinit var featuredImageUtils: FeaturedImageUtils
     @Inject internal lateinit var privateAtomicCookie: PrivateAtomicCookie
     @Inject internal lateinit var readerCssProvider: ReaderCssProvider
     @Inject internal lateinit var imageManager: ImageManager
@@ -193,54 +198,52 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     @Inject lateinit var readerUtilsWrapper: ReaderUtilsWrapper
     @Inject lateinit var viewModelFactory: Factory
     @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var readerTracker: ReaderTracker
+    @Inject lateinit var likesEnhancementsFeatureConfig: LikesEnhancementsFeatureConfig
+    @Inject lateinit var contextProvider: ContextProvider
 
     private val mSignInClickListener = View.OnClickListener {
         EventBus.getDefault()
                 .post(ReaderEvents.DoSignIn())
     }
 
-    /*
-     * AsyncTask to retrieve this post from SQLite and display it
-     */
-    private var isPostTaskRunning = false
-
     val isCustomViewShowing: Boolean
         get() = view != null && readerWebView.isCustomViewShowing
 
-    private val appBarLayoutOffsetChangedListener = AppBarLayout.OnOffsetChangedListener {
-        appBarLayout, verticalOffset ->
-        val collapsingToolbarLayout = appBarLayout
-                .findViewById<CollapsingToolbarLayout>(R.id.collapsing_toolbar)
-        val toolbar = appBarLayout.findViewById<Toolbar>(R.id.toolbar_main)
-
-        context?.let { context ->
-            val menu: Menu = toolbar.menu
-            val menuBrowse: MenuItem? = menu.findItem(R.id.menu_browse)
-            val menuShare: MenuItem? = menu.findItem(R.id.menu_share)
-            val menuMore: MenuItem? = menu.findItem(R.id.menu_more)
-
-            val collapsingToolbarHeight = collapsingToolbarLayout.height
-            val isCollapsed = (collapsingToolbarHeight + verticalOffset) <=
-                    collapsingToolbarLayout.scrimVisibleHeightTrigger
-            val isDarkTheme = context.resources.configuration.isDarkTheme()
-
-            val colorAttr = if (isCollapsed || isDarkTheme) {
-                R.attr.colorOnSurface
-            } else {
-                R.attr.colorSurface
-            }
-            val color = context.getColorFromAttribute(colorAttr)
-            val colorFilter = BlendModeColorFilterCompat
-                    .createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_ATOP)
+    private val appBarLayoutOffsetChangedListener =
+            AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
+                val collapsingToolbarLayout = appBarLayout
+                        .findViewById<CollapsingToolbarLayout>(R.id.collapsing_toolbar)
+                val toolbar = appBarLayout.findViewById<Toolbar>(R.id.toolbar_main)
+
+                context?.let { context ->
+                    val menu: Menu = toolbar.menu
+                    val menuBrowse: MenuItem? = menu.findItem(R.id.menu_browse)
+                    val menuShare: MenuItem? = menu.findItem(R.id.menu_share)
+                    val menuMore: MenuItem? = menu.findItem(R.id.menu_more)
+
+                    val collapsingToolbarHeight = collapsingToolbarLayout.height
+                    val isCollapsed = (collapsingToolbarHeight + verticalOffset) <=
+                            collapsingToolbarLayout.scrimVisibleHeightTrigger
+                    val isDarkTheme = context.resources.configuration.isDarkTheme()
+
+                    val colorAttr = if (isCollapsed || isDarkTheme) {
+                        R.attr.colorOnSurface
+                    } else {
+                        R.attr.colorSurface
+                    }
+                    val color = context.getColorFromAttribute(colorAttr)
+                    val colorFilter = BlendModeColorFilterCompat
+                            .createBlendModeColorFilterCompat(color, BlendModeCompat.SRC_ATOP)
 
-            toolbar.setTitleTextColor(color)
-            toolbar.navigationIcon?.colorFilter = colorFilter
+                    toolbar.setTitleTextColor(color)
+                    toolbar.navigationIcon?.colorFilter = colorFilter
 
-            menuBrowse?.icon?.colorFilter = colorFilter
-            menuShare?.icon?.colorFilter = colorFilter
-            menuMore?.icon?.colorFilter = colorFilter
-        }
-    }
+                    menuBrowse?.icon?.colorFilter = colorFilter
+                    menuShare?.icon?.colorFilter = colorFilter
+                    menuMore?.icon?.colorFilter = colorFilter
+                }
+            }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -253,11 +256,11 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     override fun setArguments(args: Bundle?) {
         super.setArguments(args)
         if (args != null) {
-            isFeed = args.getBoolean(ReaderConstants.ARG_IS_FEED)
             blogId = args.getLong(ReaderConstants.ARG_BLOG_ID)
             postId = args.getLong(ReaderConstants.ARG_POST_ID)
             directOperation = args.getSerializable(ReaderConstants.ARG_DIRECT_OPERATION) as? DirectOperation
             commentId = args.getInt(ReaderConstants.ARG_COMMENT_ID)
+            isRelatedPost = args.getBoolean(ReaderConstants.ARG_IS_RELATED_POST)
             interceptedUri = args.getString(ReaderConstants.ARG_INTERCEPTED_URI)
             if (args.containsKey(ReaderConstants.ARG_POST_LIST_TYPE)) {
                 this.postListType = args.getSerializable(ReaderConstants.ARG_POST_LIST_TYPE) as ReaderPostListType
@@ -277,6 +280,21 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     ): View? {
         val view = inflater.inflate(R.layout.reader_fragment_post_detail, container, false)
 
+        initSwipeRefreshLayout(view)
+        initAppBar(view)
+        initScrollView(view)
+        initWebView(view)
+        initLikeFacesTrain(view)
+        initExcerptFooter(view)
+        initRelatedPostsView(view)
+        initLayoutFooter(view)
+        initSignInButton(view)
+        initProgressView(view)
+
+        return view
+    }
+
+    private fun initSwipeRefreshLayout(view: View) {
         val swipeRefreshLayout = view.findViewById<CustomSwipeRefreshLayout>(R.id.swipe_to_refresh)
 
         // this fragment hides/shows toolbar with scrolling, which messes up ptr animation position
@@ -284,16 +302,10 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         val swipeToRefreshOffset = resources.getDimensionPixelSize(R.dimen.toolbar_content_offset)
         swipeRefreshLayout.setProgressViewOffset(false, 0, swipeToRefreshOffset)
 
-        swipeToRefreshHelper = buildSwipeToRefreshHelper(
-                swipeRefreshLayout
-        ) {
-            if (isAdded) {
-                updatePost()
-            }
-        }
-
-        scrollView = view.findViewById(R.id.scroll_view_reader)
+        swipeToRefreshHelper = buildSwipeToRefreshHelper(swipeRefreshLayout) { if (isAdded) updatePost() }
+    }
 
+    private fun initAppBar(view: View) {
         appBar = view.findViewById(R.id.appbar_with_collapsing_toolbar_layout)
         toolBar = appBar.findViewById(R.id.toolbar_main)
 
@@ -312,44 +324,72 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         // Fixes viewpager not displaying menu items for first fragment
         toolBar.inflateMenu(R.menu.reader_detail)
 
-        toolBar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-        toolBar.setNavigationOnClickListener { requireActivity().onBackPressed() }
+        // for related posts, show an X in the toolbar which closes the activity
+        if (isRelatedPost) {
+            toolBar.setNavigationIcon(R.drawable.ic_cross_white_24dp)
+            toolBar.setNavigationOnClickListener { requireActivity().finish() }
+            toolBar.setTitle(R.string.reader_title_related_post_detail)
+        } else {
+            toolBar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+            toolBar.setNavigationOnClickListener { requireActivity().onBackPressed() }
+        }
+    }
 
-        featuredImageView = appBar.findViewById(R.id.featured_image)
-        featuredImageView.setOnClickListener { showFullScreen() }
+    private fun initScrollView(view: View) {
+        scrollView = view.findViewById(R.id.scroll_view_reader)
+        scrollView.setScrollDirectionListener(this)
+        scrollView.visibility = View.INVISIBLE
+    }
 
-        layoutFooter = view.findViewById(R.id.layout_post_detail_footer)
+    private fun initWebView(view: View) {
+        // setup the ReaderWebView
+        readerWebView = view.findViewById(R.id.reader_webview)
+        readerWebView.setCustomViewListener(this)
+        readerWebView.setUrlClickListener(this)
+        readerWebView.setPageFinishedListener(this)
+    }
+
+    private fun initLikeFacesTrain(view: View) {
+        likeFacesTrain = view.findViewById(R.id.liker_faces_container)
+        facesBlock = view.findViewById(R.id.faces_block)
+        likeFacesRecycler = view.findViewById(R.id.likes_recycler)
+        likeNumBloggers = view.findViewById(R.id.num_bloggers)
+        likeProgressBar = view.findViewById(R.id.progress_bar)
+        likeEmptyStateText = view.findViewById(R.id.empty_state_text)
+    }
+
+    private fun initExcerptFooter(view: View) {
+        excerptFooter = view.findViewById(R.id.excerpt_footer)
+        textExcerptFooter = excerptFooter.findViewById(R.id.text_excerpt_footer)
+    }
+
+    private fun initRelatedPostsView(view: View) {
+        val relatedPostsContainer = view.findViewById<View>(R.id.container_related_posts)
+        globalRelatedPostsView = relatedPostsContainer.findViewById(R.id.related_posts_view_global)
+        localRelatedPostsView = relatedPostsContainer.findViewById(R.id.related_posts_view_local)
+    }
 
+    private fun initLayoutFooter(view: View) {
+        layoutFooter = view.findViewById(R.id.layout_post_detail_footer)
         val elevationOverlayProvider = ElevationOverlayProvider(layoutFooter.context)
         val appbarElevation = resources.getDimension(R.dimen.appbar_elevation)
         val elevatedSurfaceColor = elevationOverlayProvider.compositeOverlayWithThemeSurfaceColorIfNeeded(
                 appbarElevation
         )
         layoutFooter.setBackgroundColor(elevatedSurfaceColor)
-
-        // setup the ReaderWebView
-        readerWebView = view.findViewById(R.id.reader_webview)
-        readerWebView.setCustomViewListener(this)
-        readerWebView.setUrlClickListener(this)
-        readerWebView.setPageFinishedListener(this)
-
-        // hide footer and scrollView until the post is loaded
         layoutFooter.visibility = View.INVISIBLE
-        scrollView.visibility = View.INVISIBLE
+    }
 
+    private fun initSignInButton(view: View) {
         signInButton = view.findViewById(R.id.nux_sign_in_button)
         signInButton.setOnClickListener(mSignInClickListener)
+    }
 
-        readerBookmarkButton = view.findViewById(R.id.bookmark)
-
+    private fun initProgressView(view: View) {
         val progress = view.findViewById<ProgressBar>(R.id.progress_loading)
         if (postSlugsResolutionUnderway) {
             progress.visibility = View.VISIBLE
         }
-
-        showPost()
-
-        return view
     }
 
     override fun onResume() {
@@ -366,84 +406,252 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         toolBar.setVisible(true)
         activity?.setSupportActionBar(toolBar)
 
-        activity?.supportActionBar?.setDisplayShowTitleEnabled(false)
+        activity?.supportActionBar?.setDisplayShowTitleEnabled(isRelatedPost)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initViewModel()
+        val binding = ReaderFragmentPostDetailBinding.bind(view)
+
+        initLikeFacesRecycler(savedInstanceState)
+        initViewModel(binding, savedInstanceState)
+
+        showPost()
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(ReaderPostDetailViewModel::class.java)
+    private fun initLikeFacesRecycler(savedInstanceState: Bundle?) {
+        if (!likesEnhancementsFeatureConfig.isEnabled()) return
+        val layoutManager = LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
+        savedInstanceState?.getParcelable<Parcelable>(ReaderPostDetailFragment.KEY_LIKERS_LIST_STATE)?.let {
+            layoutManager.onRestoreInstanceState(it)
+        }
 
-        viewModel.uiState.observe(
-                viewLifecycleOwner,
-                Observer<ReaderPostDetailsUiState> { state ->
-                    header_view.updatePost(state.headerUiState)
-                    showOrHideMoreMenu(state)
+        likeFacesRecycler.addItemDecoration(PostLikerItemDecorator(
+                RtlUtils.isRtl(activity),
+                contextProvider.getContext(),
+                R.dimen.margin_small_medium)
+        )
+        likeFacesRecycler.layoutManager = layoutManager
+        likeFacesRecycler.itemAnimator = null
+    }
 
-                    updateActionButton(state.postId, state.blogId, state.actions.likeAction, count_likes)
-                    updateActionButton(state.postId, state.blogId, state.actions.reblogAction, reblog)
-                    updateActionButton(state.postId, state.blogId, state.actions.commentsAction, count_comments)
-                    updateActionButton(state.postId, state.blogId, state.actions.bookmarkAction, bookmark)
+    private fun initViewModel(binding: ReaderFragmentPostDetailBinding, savedInstanceState: Bundle?) {
+        viewModel = ViewModelProvider(this, viewModelFactory).get(ReaderPostDetailViewModel::class.java)
+
+        viewModel.uiState.observe(viewLifecycleOwner, {
+            uiHelpers.updateVisibility(binding.textError, it.errorVisible)
+            uiHelpers.updateVisibility(binding.progressLoading, it.loadingVisible)
+            when (it) {
+                is LoadingUiState -> Unit // Do Nothing
+                is ReaderPostDetailsUiState -> renderUiState(it, binding)
+                is ErrorUiState -> {
+                    uiHelpers.updateVisibility(signInButton, it.signInButtonVisibility)
+                    val message = it.message?.let { msg -> uiHelpers.getTextOfUiString(requireContext(), msg) }
+                    showError(message?.toString())
                 }
-        )
+            }
+        })
 
-        viewModel.refreshPost.observe(viewLifecycleOwner, Observer { // Do nothing
+        if (likesEnhancementsFeatureConfig.isEnabled()) {
+            viewModel.likesUiState.observe(viewLifecycleOwner, { state ->
+                manageLikesUiState(state)
+            })
         }
-        )
 
-        viewModel.snackbarEvents.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                showSnackbar()
+        viewModel.refreshPost.observeEvent(viewLifecycleOwner, {} /* Do nothing */)
+
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, { it.showSnackbar(binding) })
+
+        viewModel.navigationEvents.observeEvent(viewLifecycleOwner, { it.handleNavigationEvent() })
+
+        val bundle = savedInstanceState ?: arguments
+        val isFeed = bundle?.getBoolean(ReaderConstants.ARG_IS_FEED) ?: false
+        val interceptedUri = bundle?.getString(ReaderConstants.ARG_INTERCEPTED_URI)
+
+        viewModel.start(isRelatedPost = isRelatedPost, isFeed = isFeed, interceptedUri = interceptedUri)
+    }
+
+    private fun manageLikesUiState(state: EngagedPeopleListUiState) {
+        if (!isAdded) return
+
+        with(requireActivity()) {
+            if (this.isFinishing) return@with
+
+            setupLikeFacesTrain(state.engageItemsList, state.numLikes, state.showLoading, state.likersFacesText)
+            likeProgressBar.visibility = if (state.showLoading) View.VISIBLE else View.GONE
+            likeFacesTrain.visibility = if (state.showLikeFacesTrainContainer) View.VISIBLE else View.GONE
+
+            if (state.showEmptyState) {
+                uiHelpers.setTextOrHide(likeEmptyStateText, state.emptyStateTitle?.let {
+                    getString(R.string.like_faces_error_loading_message, uiHelpers.getTextOfUiString(this, it))
+                })
+                likeEmptyStateText.visibility = View.VISIBLE
+            } else {
+                likeEmptyStateText.visibility = View.GONE
+            }
+
+            likeFacesTrain.setOnClickListener {
+                if (!isAdded) return@setOnClickListener
+
+                viewModel.onLikeFacesClicked()
             }
         }
-        )
+    }
 
-        viewModel.navigationEvents.observe(viewLifecycleOwner, Observer {
-            it.applyIfNotHandled {
-                when (this) {
-                    is ReaderNavigationEvents.ShowPostsByTag -> {
-                        ReaderActivityLauncher.showReaderTagPreview(context, this.tag)
-                    }
-                    is ShowBlogPreview -> ReaderActivityLauncher.showReaderBlogOrFeedPreview(
-                            context,
-                            this.siteId,
-                            this.feedId
-                    )
-                    is ReaderNavigationEvents.SharePost -> ReaderActivityLauncher.sharePost(context, post)
-                    is ReaderNavigationEvents.OpenPost -> ReaderActivityLauncher.openPost(context, post)
-                    is ReaderNavigationEvents.ShowReportPost -> {
-                        ReaderActivityLauncher.openUrl(
-                                context,
-                                readerUtilsWrapper.getReportPostUrl(url),
-                                OpenUrlType.INTERNAL
-                        )
-                    }
-                    is ReaderNavigationEvents.ShowReaderComments -> {
-                        ReaderActivityLauncher.showReaderComments(context, blogId, postId)
-                    }
-                    is ReaderNavigationEvents.ShowNoSitesToReblog -> {
-                        ReaderActivityLauncher.showNoSiteToReblog(activity)
-                    }
-                    is ReaderNavigationEvents.ShowSitePickerForResult -> {
-                        ActivityLauncher
-                                .showSitePickerForResult(this@ReaderPostDetailFragment, this.preselectedSite, this.mode)
-                    }
-                    is OpenEditorForReblog -> {
-                        ActivityLauncher.openEditorForReblog(activity, this.site, this.post, this.source)
-                    }
-                    is ShowBookmarkedTab -> {
-                        ActivityLauncher.viewSavedPostsListInReader(activity)
-                    }
-                    is ShowBookmarkedSavedOnlyLocallyDialog -> {
-                        showBookmarkSavedLocallyDialog(this)
-                    }
+    private fun setupLikeFacesTrain(items: List<EngageItem>, numLikes: Int, loading: Boolean, likersText: UiString?) {
+        facesBlock.visibility = if (loading) View.GONE else View.VISIBLE
+
+        var adapter = likeFacesRecycler.adapter as? ReaderPostLikersAdapter
+
+        if (adapter == null) {
+            adapter = ReaderPostLikersAdapter(
+                    imageManager,
+                    contextProvider.getContext()
+            )
+
+            likeFacesRecycler.adapter = adapter
+        }
+
+        val recyclerViewState = likeFacesRecycler.layoutManager?.onSaveInstanceState()
+        adapter.loadData(items)
+        likeFacesRecycler.layoutManager?.onRestoreInstanceState(recyclerViewState)
+
+        uiHelpers.setTextOrHide(likeNumBloggers, likersText)
+    }
+
+    private fun renderUiState(state: ReaderPostDetailsUiState, binding: ReaderFragmentPostDetailBinding) {
+        onPostExecuteShowPost()
+        binding.headerView.updatePost(state.headerUiState)
+        showOrHideMoreMenu(state)
+
+        updateFeaturedImage(state.featuredImageUiState, binding)
+        updateExcerptFooter(state.excerptFooterUiState)
+
+        with(binding.layoutPostDetailFooter) {
+            updateActionButton(state.postId, state.blogId, state.actions.likeAction, countLikes)
+            updateActionButton(state.postId, state.blogId, state.actions.reblogAction, reblog)
+            updateActionButton(state.postId, state.blogId, state.actions.commentsAction, countComments)
+            updateActionButton(state.postId, state.blogId, state.actions.bookmarkAction, bookmark)
+        }
+
+        state.localRelatedPosts?.let { showRelatedPosts(it) }
+        state.globalRelatedPosts?.let { showRelatedPosts(it) }
+    }
+
+    // TODO: Update using UiState/ NavigationEvent
+    private fun onPostExecuteShowPost() {
+        // make sure options menu reflects whether we now have a post
+        activity?.invalidateOptionsMenu()
+
+        viewModel.post?.let {
+            if (handleDirectOperation()) return
+
+            scrollView.visibility = View.VISIBLE
+            layoutFooter.visibility = View.VISIBLE
+        }
+    }
+
+    private fun ReaderNavigationEvents.handleNavigationEvent() {
+        when (this) {
+            is ReaderNavigationEvents.ShowMediaPreview -> MediaPreviewActivity
+                    .showPreview(requireContext(), site, featuredImage)
+
+            is ReaderNavigationEvents.ShowPostsByTag -> ReaderActivityLauncher.showReaderTagPreview(
+                    context,
+                    this.tag,
+                    ReaderTracker.SOURCE_POST_DETAIL,
+                    readerTracker
+            )
+
+            is ReaderNavigationEvents.ShowBlogPreview -> ReaderActivityLauncher.showReaderBlogOrFeedPreview(
+                    context,
+                    this.siteId,
+                    this.feedId,
+                    this.isFollowed,
+                    ReaderTracker.SOURCE_POST_DETAIL,
+                    readerTracker
+            )
+
+            is ReaderNavigationEvents.SharePost -> ReaderActivityLauncher.sharePost(context, post)
+
+            is ReaderNavigationEvents.OpenPost -> ReaderActivityLauncher.openPost(context, post)
+
+            is ReaderNavigationEvents.ShowReportPost ->
+                ReaderActivityLauncher.openUrl(
+                        context,
+                        readerUtilsWrapper.getReportPostUrl(url),
+                        OpenUrlType.INTERNAL
+                )
+
+            is ReaderNavigationEvents.ShowReaderComments ->
+                ReaderActivityLauncher.showReaderComments(context, blogId, postId)
+
+            is ReaderNavigationEvents.ShowNoSitesToReblog -> ReaderActivityLauncher.showNoSiteToReblog(activity)
+
+            is ReaderNavigationEvents.ShowSitePickerForResult ->
+                ActivityLauncher
+                        .showSitePickerForResult(this@ReaderPostDetailFragment, this.preselectedSite, this.mode)
+
+            is ReaderNavigationEvents.OpenEditorForReblog ->
+                ActivityLauncher.openEditorForReblog(activity, this.site, this.post, this.source)
+
+            is ReaderNavigationEvents.ShowBookmarkedTab -> ActivityLauncher.viewSavedPostsListInReader(activity)
+
+            is ReaderNavigationEvents.ShowBookmarkedSavedOnlyLocallyDialog -> showBookmarkSavedLocallyDialog(this)
+
+            is ReaderNavigationEvents.OpenUrl -> ReaderActivityLauncher.openUrl(requireContext(), url)
+
+            is ReaderNavigationEvents.ShowRelatedPostDetails ->
+                showRelatedPostDetail(postId = this.postId, blogId = this.blogId)
+
+            is ReaderNavigationEvents.ReplaceRelatedPostDetailsWithHistory ->
+                replaceRelatedPostDetailWithHistory(
+                        postId = this.postId,
+                        blogId = this.blogId
+                )
+
+            is ReaderNavigationEvents.ShowPostInWebView -> showPostInWebView(post)
+            is ReaderNavigationEvents.ShowEngagedPeopleList -> {
+                ActivityLauncher.viewPostLikesListActivity(
+                        activity,
+                        this.siteId,
+                        this.postId,
+                        this.headerData,
+                        EngagementNavigationSource.LIKE_READER_LIST
+                )
+            }
+            is ReaderNavigationEvents.ShowPostDetail,
+            is ReaderNavigationEvents.ShowVideoViewer,
+            is ReaderNavigationEvents.ShowReaderSubs -> Unit // Do Nothing
+        }
+    }
+
+    private fun updateFeaturedImage(
+        state: ReaderPostDetailsUiState.ReaderPostFeaturedImageUiState?,
+        binding: ReaderFragmentPostDetailBinding
+    ) {
+        val featuredImage = binding.appbarWithCollapsingToolbarLayout.featuredImage
+        featuredImage.setVisible(state != null)
+        state?.let {
+            featuredImage.layoutParams.height = it.height
+            it.url?.let { url ->
+                imageManager.load(featuredImage, PHOTO, url, CENTER_CROP)
+                featuredImage.setOnClickListener {
+                    viewModel.onFeaturedImageClicked(blogId = state.blogId, featuredImageUrl = url)
                 }
             }
-        })
-        viewModel.start()
+        }
+    }
+
+    private fun updateExcerptFooter(state: ReaderPostDetailsUiState.ExcerptFooterUiState?) {
+        // if we're showing just the excerpt, show a footer which links to the full post
+        excerptFooter.setVisible(state != null)
+        state?.let {
+            uiHelpers.setTextOrHide(textExcerptFooter, state.visitPostExcerptFooterLinkText)
+            textExcerptFooter.setOnClickListener {
+                state.postLink?.let { link -> viewModel.onVisitPostExcerptFooterClicked(postLink = link) }
+            }
+        }
     }
 
     private fun updateActionButton(postId: Long, blogId: Long, state: PrimaryAction, view: View) {
@@ -456,7 +664,9 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         view.setOnClickListener { state.onClicked?.invoke(postId, blogId, state.type) }
     }
 
-    private fun showBookmarkSavedLocallyDialog(bookmarkDialog: ShowBookmarkedSavedOnlyLocallyDialog) {
+    private fun showBookmarkSavedLocallyDialog(
+        bookmarkDialog: ReaderNavigationEvents.ShowBookmarkedSavedOnlyLocallyDialog
+    ) {
         if (bookmarksSavedLocallyDialog == null) {
             MaterialAlertDialogBuilder(requireActivity())
                     .setTitle(getString(bookmarkDialog.title))
@@ -490,8 +700,8 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
     }
 
-    private fun createMoreMenuPopup(actions: List<SecondaryAction>, v: View) {
-        AnalyticsTracker.track(Stat.READER_ARTICLE_DETAIL_MORE_TAPPED)
+    private fun createMoreMenuPopup(actions: List<ReaderPostCardAction>, v: View) {
+        readerTracker.track(AnalyticsTracker.Stat.READER_ARTICLE_DETAIL_MORE_TAPPED)
         moreMenuPopup = ListPopupWindow(v.context)
         moreMenuPopup?.let {
             it.width = v.context.resources.getDimensionPixelSize(R.dimen.menu_item_width)
@@ -509,9 +719,9 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
     }
 
-    private fun SnackbarMessageHolder.showSnackbar() {
+    private fun SnackbarMessageHolder.showSnackbar(binding: ReaderFragmentPostDetailBinding) {
         val snackbar = WPSnackbar.make(
-                layout_post_detail_container,
+                binding.layoutPostDetailContainer,
                 uiHelpers.getTextOfUiString(requireContext(), this.message),
                 Snackbar.LENGTH_LONG
         )
@@ -532,10 +742,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         moreMenuPopup?.dismiss()
     }
 
-    private fun hasPost(): Boolean {
-        return post != null
-    }
-
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         menu.clear()
@@ -546,10 +752,10 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         super.onPrepareOptionsMenu(menu)
 
         // browse & share require the post to have a URL (some feed-based posts don't have one)
-        val postHasUrl = hasPost() && post!!.hasUrl()
+        val postHasUrl = viewModel.post?.hasUrl() == true
         val mnuBrowse = menu.findItem(R.id.menu_browse)
         if (mnuBrowse != null) {
-            mnuBrowse.isVisible = postHasUrl || interceptedUri != null
+            mnuBrowse.isVisible = postHasUrl || viewModel.interceptedUri != null
         }
         val mnuShare = menu.findItem(R.id.menu_share)
         if (mnuShare != null) {
@@ -560,22 +766,19 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menu_browse -> {
-                if (hasPost()) {
-                    AnalyticsTracker.track(Stat.READER_ARTICLE_VISITED)
-                    ReaderActivityLauncher.openPost(context, post)
-                } else if (interceptedUri != null) {
-                    AnalyticsUtils.trackWithInterceptedUri(
-                            DEEP_LINKED_FALLBACK,
-                            interceptedUri
-                    )
-                    ReaderActivityLauncher.openUrl(activity, interceptedUri, OpenUrlType.EXTERNAL)
+                if (viewModel.hasPost) {
+                    readerTracker.track(AnalyticsTracker.Stat.READER_ARTICLE_VISITED)
+                    ReaderActivityLauncher.openPost(context, viewModel.post)
+                } else if (viewModel.interceptedUri != null) {
+                    readerTracker.trackUri(AnalyticsTracker.Stat.DEEP_LINKED_FALLBACK, viewModel.interceptedUri!!)
+                    ReaderActivityLauncher.openUrl(activity, viewModel.interceptedUri, OpenUrlType.EXTERNAL)
                     requireActivity().finish()
                 }
                 return true
             }
             R.id.menu_share -> {
-                AnalyticsTracker.track(SHARED_ITEM)
-                ReaderActivityLauncher.sharePost(context, post)
+                readerTracker.track(AnalyticsTracker.Stat.SHARED_ITEM)
+                ReaderActivityLauncher.sharePost(context, viewModel.post)
                 return true
             }
             R.id.menu_more -> {
@@ -587,19 +790,28 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
-        outState.putBoolean(ReaderConstants.ARG_IS_FEED, isFeed)
+        outState.putBoolean(ReaderConstants.ARG_IS_FEED, viewModel.isFeed)
         outState.putLong(ReaderConstants.ARG_BLOG_ID, blogId)
         outState.putLong(ReaderConstants.ARG_POST_ID, postId)
         outState.putSerializable(ReaderConstants.ARG_DIRECT_OPERATION, directOperation)
         outState.putInt(ReaderConstants.ARG_COMMENT_ID, commentId)
 
-        outState.putString(ReaderConstants.ARG_INTERCEPTED_URI, interceptedUri)
+        outState.putBoolean(ReaderConstants.ARG_IS_RELATED_POST, isRelatedPost)
+        outState.putString(ReaderConstants.ARG_INTERCEPTED_URI, viewModel.interceptedUri)
         outState.putBoolean(
                 ReaderConstants.KEY_POST_SLUGS_RESOLUTION_UNDERWAY,
                 postSlugsResolutionUnderway
         )
         outState.putBoolean(ReaderConstants.KEY_ALREADY_UPDATED, hasAlreadyUpdatedPost)
-        outState.putBoolean(ReaderConstants.KEY_ALREADY_REQUESTED, hasAlreadyRequestedPost)
+
+        outState.putBoolean(
+                ReaderConstants.KEY_ALREADY_TRACKED_GLOBAL_RELATED_POSTS,
+                hasTrackedGlobalRelatedPosts
+        )
+        outState.putBoolean(
+                ReaderConstants.KEY_ALREADY_TRACKED_LOCAL_RELATED_POSTS,
+                hasTrackedLocalRelatedPosts
+        )
 
         outState.putSerializable(
                 ReaderConstants.ARG_POST_LIST_TYPE,
@@ -623,16 +835,17 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
 
     private fun restoreState(savedInstanceState: Bundle?) {
         savedInstanceState?.let {
-            isFeed = it.getBoolean(ReaderConstants.ARG_IS_FEED)
             blogId = it.getLong(ReaderConstants.ARG_BLOG_ID)
             postId = it.getLong(ReaderConstants.ARG_POST_ID)
             directOperation = it
                     .getSerializable(ReaderConstants.ARG_DIRECT_OPERATION) as? DirectOperation
             commentId = it.getInt(ReaderConstants.ARG_COMMENT_ID)
+            isRelatedPost = it.getBoolean(ReaderConstants.ARG_IS_RELATED_POST)
             interceptedUri = it.getString(ReaderConstants.ARG_INTERCEPTED_URI)
             postSlugsResolutionUnderway = it.getBoolean(ReaderConstants.KEY_POST_SLUGS_RESOLUTION_UNDERWAY)
             hasAlreadyUpdatedPost = it.getBoolean(ReaderConstants.KEY_ALREADY_UPDATED)
-            hasAlreadyRequestedPost = it.getBoolean(ReaderConstants.KEY_ALREADY_REQUESTED)
+            hasTrackedGlobalRelatedPosts = it.getBoolean(ReaderConstants.KEY_ALREADY_TRACKED_GLOBAL_RELATED_POSTS)
+            hasTrackedLocalRelatedPosts = it.getBoolean(ReaderConstants.KEY_ALREADY_TRACKED_LOCAL_RELATED_POSTS)
             if (it.containsKey(ReaderConstants.ARG_POST_LIST_TYPE)) {
                 this.postListType = it.getSerializable(ReaderConstants.ARG_POST_LIST_TYPE) as ReaderPostListType
             }
@@ -671,7 +884,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
      * replace the current post with the passed one
      */
     private fun replacePost(blogId: Long, postId: Long, clearCommentOperation: Boolean) {
-        isFeed = false
+        viewModel.isFeed = false
         this.blogId = blogId
         this.postId = postId
 
@@ -680,8 +893,17 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             commentId = 0
         }
 
-        hasAlreadyRequestedPost = false
         hasAlreadyUpdatedPost = false
+        hasTrackedGlobalRelatedPosts = false
+        hasTrackedLocalRelatedPosts = false
+
+        // hide views that would show info for the previous post - these will be re-displayed
+        // with the correct info once the new post loads
+        globalRelatedPostsView.visibility = View.GONE
+        localRelatedPostsView.visibility = View.GONE
+        if (likesEnhancementsFeatureConfig.isEnabled()) {
+            likeFacesTrain.visibility = View.GONE
+        }
 
         // clear the webView - otherwise it will remain scrolled to where the user scrolled to
         readerWebView.clearContent()
@@ -690,6 +912,72 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         showPost()
     }
 
+    /*
+     * show the passed list of related posts - can be either global (related posts from
+     * across wp.com) or local (related posts from the same site as the current post)
+     */
+    private fun showRelatedPosts(state: ReaderPostDetailsUiState.RelatedPostsUiState) {
+        // different container views for global/local related posts
+        val relatedPostsView = if (state.isGlobal) globalRelatedPostsView else localRelatedPostsView
+        relatedPostsView.showPosts(state)
+
+        // fade in this related posts view
+        if (relatedPostsView.visibility != View.VISIBLE) {
+            AniUtils.fadeIn(relatedPostsView, AniUtils.Duration.MEDIUM)
+        }
+
+        trackRelatedPostsIfShowing()
+    }
+
+    /*
+     * track that related posts have loaded and are scrolled into view if we haven't
+     * already tracked it
+     */
+    private fun trackRelatedPostsIfShowing() {
+        if (!hasTrackedGlobalRelatedPosts && isVisibleAndScrolledIntoView(globalRelatedPostsView)) {
+            hasTrackedGlobalRelatedPosts = true
+            AppLog.d(T.READER, "reader post detail > global related posts rendered")
+            globalRelatedPostsView.trackRailcarRender()
+        }
+
+        if (!hasTrackedLocalRelatedPosts && isVisibleAndScrolledIntoView(localRelatedPostsView)) {
+            hasTrackedLocalRelatedPosts = true
+            AppLog.d(T.READER, "reader post detail > local related posts rendered")
+            localRelatedPostsView.trackRailcarRender()
+        }
+    }
+
+    /*
+     * returns True if the passed view is visible and has been scrolled into view - assumes
+     * that the view is a child of mScrollView
+     */
+    private fun isVisibleAndScrolledIntoView(view: View?): Boolean {
+        if (view != null && view.visibility == View.VISIBLE) {
+            val scrollBounds = Rect()
+            scrollView.getHitRect(scrollBounds)
+            return view.getLocalVisibleRect(scrollBounds)
+        }
+        return false
+    }
+
+    private fun showRelatedPostDetail(postId: Long, blogId: Long) {
+        ReaderActivityLauncher.showReaderPostDetail(
+                activity,
+                false,
+                blogId,
+                postId, null,
+                0,
+                true, null
+        )
+    }
+
+    private fun replaceRelatedPostDetailWithHistory(postId: Long, blogId: Long) {
+        viewModel.post?.let {
+            postHistory.push(ReaderBlogIdPostId(it.blogId, it.postId))
+            replacePost(blogId, postId, true)
+        }
+    }
+
     /*
      * if the fragment is maintaining a backstack of posts, navigate to the previous one
      */
@@ -707,30 +995,33 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
      * get the latest version of this post
      */
     private fun updatePost() {
-        if (!hasPost() || !post!!.isWP) {
+        if (!viewModel.hasPost || viewModel.post?.isWP == false) {
             setRefreshing(false)
             return
         }
 
         val resultListener = ReaderActions.UpdateResultListener { result ->
-            val post = this.post
+            val post = viewModel.post
             if (isAdded && post != null) {
                 // if the post has changed, reload it from the db and update the like/comment counts
                 if (result.isNewOrChanged) {
-                    this.post = ReaderPostTable.getBlogPost(post.blogId, post.postId, false)
-                    this.post?.let {
+                    viewModel.post = ReaderPostTable.getBlogPost(post.blogId, post.postId, false)
+                    viewModel.post?.let {
+                        if (likesEnhancementsFeatureConfig.isEnabled()) {
+                            viewModel.onRefreshLikersData(it)
+                        }
                         viewModel.onUpdatePost(it)
                     }
                 }
 
                 setRefreshing(false)
 
-                if (directOperation != null && directOperation == POST_LIKE) {
+                if (directOperation != null && directOperation == DirectOperation.POST_LIKE) {
                     doLikePost()
                 }
             }
         }
-        ReaderPostActions.updatePost(post!!, resultListener)
+        viewModel.post?.let { ReaderPostActions.updatePost(it, resultListener) }
     }
 
     private fun doLikePost() {
@@ -746,7 +1037,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             return
         }
 
-        post?.let {
+        viewModel.post?.let {
             if (!it.canLikePost()) {
                 ToastUtils.showToast(activity, R.string.reader_toast_err_cannot_like_post)
                 return
@@ -785,11 +1076,11 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             return false
         }
 
-        val postContent = post?.text
-        val isPrivatePost = post?.isPrivate == true
+        val postContent = viewModel.post?.text
+        val isPrivatePost = viewModel.post?.isPrivate == true
         val options = EnumSet.noneOf(PhotoViewerOption::class.java)
         if (isPrivatePost) {
-            options.add(IS_PRIVATE_IMAGE)
+            options.add(PhotoViewerOption.IS_PRIVATE_IMAGE)
         }
 
         ReaderActivityLauncher.showReaderPhotoViewer(
@@ -805,40 +1096,6 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         return true
     }
 
-    /*
-     * called when the post doesn't exist in local db, need to get it from server
-     */
-    private fun requestPost() {
-        val progress = requireView().findViewById<ProgressBar>(R.id.progress_loading)
-        progress.visibility = View.VISIBLE
-        progress.bringToFront()
-
-        val listener = object : ReaderActions.OnRequestListener {
-            override fun onSuccess() {
-                hasAlreadyRequestedPost = true
-                if (isAdded) {
-                    progress.visibility = View.GONE
-                    showPost()
-                    EventBus.getDefault().post(ReaderEvents.SinglePostDownloaded())
-                }
-            }
-
-            override fun onFailure(statusCode: Int) {
-                hasAlreadyRequestedPost = true
-                if (isAdded) {
-                    progress.visibility = View.GONE
-                    onRequestFailure(statusCode)
-                }
-            }
-        }
-
-        if (isFeed) {
-            ReaderPostActions.requestFeedPost(blogId, postId, listener)
-        } else {
-            ReaderPostActions.requestBlogPost(blogId, postId, listener)
-        }
-    }
-
     /*
      * post slugs resolution to IDs has completed
      */
@@ -853,7 +1110,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         val progress = requireView().findViewById<ProgressBar>(R.id.progress_loading)
         progress.visibility = View.GONE
 
-        if (event.statusCode == 200) {
+        if (event.statusCode == HttpURLConnection.HTTP_OK) {
             replacePost(event.blogId, event.postId, false)
         } else {
             onRequestFailure(event.statusCode)
@@ -861,41 +1118,17 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
     }
 
     private fun onRequestFailure(statusCode: Int) {
-        val errMsgResId: Int
         if (!NetworkUtils.isNetworkAvailable(activity)) {
-            errMsgResId = R.string.no_network_message
+            showError(getString(R.string.no_network_message))
         } else {
             when (statusCode) {
-                401, 403 -> {
-                    val offerSignIn = WPUrlUtils.isWordPressCom(interceptedUri) && !accountStore.hasAccessToken()
-
-                    if (!offerSignIn) {
-                        errMsgResId = if (interceptedUri == null)
-                            R.string.reader_err_get_post_not_authorized
-                        else
-                            R.string.reader_err_get_post_not_authorized_fallback
-                        signInButton.visibility = View.GONE
-                    } else {
-                        errMsgResId = if (interceptedUri == null)
-                            R.string.reader_err_get_post_not_authorized_signin
-                        else
-                            R.string.reader_err_get_post_not_authorized_signin_fallback
-                        signInButton.visibility = View.VISIBLE
-                        AnalyticsUtils.trackWithReaderPostDetails(
-                                READER_WPCOM_SIGN_IN_NEEDED,
-                                post
-                        )
-                    }
-                    AnalyticsUtils.trackWithReaderPostDetails(
-                            READER_USER_UNAUTHORIZED,
-                            post
-                    )
-                }
-                404 -> errMsgResId = R.string.reader_err_get_post_not_found
-                else -> errMsgResId = R.string.reader_err_get_post_generic
+                HttpURLConnection.HTTP_UNAUTHORIZED, HttpURLConnection.HTTP_FORBIDDEN ->
+                    viewModel.onNotAuthorisedRequestFailure()
+
+                HttpURLConnection.HTTP_NOT_FOUND -> showError(getString(R.string.reader_err_get_post_not_found))
+                else -> showError(getString(R.string.reader_err_get_post_generic))
             }
         }
-        showError(getString(errMsgResId))
     }
 
     /*
@@ -913,7 +1146,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             val icon: Drawable? = try {
                 ContextCompat.getDrawable(it, R.drawable.ic_notice_48dp)
             } catch (e: Resources.NotFoundException) {
-                AppLog.e(READER, "Drawable not found. See issue #11576", e)
+                AppLog.e(T.READER, "Drawable not found. See issue #11576", e)
                 null
             }
             icon?.let {
@@ -935,14 +1168,10 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             return
         }
 
-        if (isPostTaskRunning) {
-            AppLog.w(T.READER, "reader post detail > show post task already running")
-            return
-        }
-
-        ShowPostTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+        viewModel.onShowPost(blogId = blogId, postId = postId)
     }
 
+    @Suppress("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onPrivateAtomicCookieFetched(event: OnPrivateAtomicCookieFetched) {
         if (!isAdded) {
@@ -950,10 +1179,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
 
         if (event.isError) {
-            AppLog.e(
-                    READER,
-                    "Failed to load private AT cookie. $event.error.type - $event.error.message"
-            )
+            AppLog.e(T.READER, "Failed to load private AT cookie. $event.error.type - $event.error.message")
             WPSnackbar.make(
                     requireView(),
                     R.string.media_accessing_failed,
@@ -966,9 +1192,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
 
         PrivateAtCookieRefreshProgressDialog.dismissIfNecessary(fragmentManager)
-        if (renderer != null) {
-            renderer!!.beginRender()
-        }
+        renderer?.beginRender()
     }
 
     override fun onCookieProgressDialogCancelled() {
@@ -981,186 +1205,63 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
                 R.string.media_accessing_failed,
                 Snackbar.LENGTH_LONG
         ).show()
-        if (renderer != null) {
-            renderer!!.beginRender()
-        }
+        renderer?.beginRender()
     }
 
-    // TODO replace this inner async task with a coroutine
-    @SuppressLint("StaticFieldLeak")
-    private inner class ShowPostTask : AsyncTask<Void, Void, Boolean>() {
-        override fun onPreExecute() {
-            isPostTaskRunning = true
-        }
-
-        override fun onCancelled() {
-            isPostTaskRunning = false
-        }
-
-        override fun doInBackground(vararg params: Void): Boolean? {
-            post = if (isFeed)
-                ReaderPostTable.getFeedPost(blogId, postId, false)
-            else
-                ReaderPostTable.getBlogPost(blogId, postId, false)
-            if (post == null) {
-                return false
-            }
-
-            // "discover" Editor Pick posts should open the original (source) post
-            if (post!!.isDiscoverPost) {
-                val discoverData = post!!.discoverData
-                if (discoverData != null &&
-                        discoverData.discoverType == ReaderPostDiscoverData.DiscoverType.EDITOR_PICK &&
-                        discoverData.blogId != 0L &&
-                        discoverData.postId != 0L
-                ) {
-                    isFeed = false
-                    blogId = discoverData.blogId
-                    postId = discoverData.postId
-                    post = ReaderPostTable.getBlogPost(blogId, postId, false)
-                    if (post == null) {
-                        return false
-                    }
-                }
-            }
-
-            return true
-        }
-
-        override fun onPostExecute(result: Boolean) {
-            isPostTaskRunning = false
-
-            if (!isAdded) {
-                return
-            }
-
-            // make sure options menu reflects whether we now have a post
-            activity!!.invalidateOptionsMenu()
-
-            if (!result) {
-                // post couldn't be loaded which means it doesn't exist in db, so request it from
-                // the server if it hasn't already been requested
-                if (!hasAlreadyRequestedPost) {
-                    AppLog.i(T.READER, "reader post detail > post not found, requesting it")
-                    requestPost()
-                } else if (!TextUtils.isEmpty(errorMessage)) {
-                    // post has already been requested and failed, so restore previous error message
-                    showError(errorMessage)
-                }
-                return
-            } else {
-                showError(null)
-            }
-
-            if (directOperation != null) {
-                when (directOperation) {
-                    COMMENT_JUMP, COMMENT_REPLY, COMMENT_LIKE -> {
+    private fun handleDirectOperation(): Boolean {
+        if (directOperation != null) {
+            when (directOperation) {
+                DirectOperation.COMMENT_JUMP, DirectOperation.COMMENT_REPLY, DirectOperation.COMMENT_LIKE -> {
+                    viewModel.post?.let {
                         ReaderActivityLauncher.showReaderComments(
-                                activity, post!!.blogId, post!!.postId,
-                                directOperation, commentId.toLong(), interceptedUri
+                                activity, it.blogId, it.postId,
+                                directOperation, commentId.toLong(), viewModel.interceptedUri
                         )
-                        activity?.finish()
-                        activity?.overridePendingTransition(0, 0)
-                        return
-                    }
-                    POST_LIKE -> {
                     }
-                }
-                // Liking needs to be handled "later" after the post has been updated from the server so,
-                // nothing special to do here
-            }
 
-            AnalyticsUtils.trackWithReaderPostDetails(
-                    READER_ARTICLE_RENDERED,
-                    post
-            )
-
-            readerWebView.setIsPrivatePost(post!!.isPrivate)
-            readerWebView.setBlogSchemeIsHttps(UrlUtils.isHttps(post!!.blogUrl))
-
-            // scrollView was hidden in onCreateView, show it now that we have the post
-            scrollView.visibility = View.VISIBLE
-
-            post?.let {
-                if (featuredImageUtils.shouldAddFeaturedImage(it)) {
-                    val displayWidth = DisplayUtils.getDisplayPixelWidth(context)
-                    val imageUrl = ReaderUtils.getResizedImageUrl(
-                            it.featuredImage,
-                            displayWidth,
-                            0,
-                            it.isPrivate,
-                            it.isPrivateAtomic
-                    )
-
-                    val displayHeight = DisplayUtils.getDisplayPixelHeight(requireContext())
-                    val imageHeight = (displayHeight * FEATURED_IMAGE_HEIGHT_PERCENT).toInt()
-                    featuredImageView.layoutParams.height = imageHeight
-
-                    imageManager.load(
-                            featuredImageView,
-                            PHOTO,
-                            imageUrl,
-                            CENTER_CROP
-                    )
+                    activity?.finish()
+                    activity?.overridePendingTransition(0, 0)
+                    return true
                 }
-            }
-
-            // render the post in the webView
-            renderer = ReaderPostRenderer(readerWebView, post, featuredImageUtils, readerCssProvider)
-
-            // if the post is from private atomic site postpone render until we have a special access cookie
-            if (post!!.isPrivateAtomic && privateAtomicCookie.isCookieRefreshRequired()) {
-                PrivateAtCookieRefreshProgressDialog.showIfNecessary(fragmentManager, this@ReaderPostDetailFragment)
-                dispatcher.dispatch(
-                        SiteActionBuilder.newFetchPrivateAtomicCookieAction(
-                                FetchPrivateAtomicCookiePayload(post!!.blogId)
-                        )
-                )
-            } else if (post!!.isPrivateAtomic && privateAtomicCookie.exists()) {
-                // make sure we add cookie to the cookie manager if it exists before starting render
-                CookieManager.getInstance().setCookie(
-                        privateAtomicCookie.getDomain(), privateAtomicCookie.getCookieContent()
-                )
-                renderer!!.beginRender()
-            } else {
-                renderer!!.beginRender()
-            }
-
-            // if we're showing just the excerpt, also show a footer which links to the full post
-            if (post!!.shouldShowExcerpt()) {
-                val excerptFooter = view!!.findViewById<ViewGroup>(R.id.excerpt_footer)
-                excerptFooter.visibility = View.VISIBLE
-
-                val blogName = "<font color='" + HtmlUtils.colorResToHtmlColor(
-                        activity!!, R.color
-                        .link_reader
-                ) + "'>" + post!!.blogName + "</font>"
-                val linkText = String.format(
-                        WordPress.getContext().getString(R.string.reader_excerpt_link),
-                        blogName
-                )
-
-                val txtExcerptFooter = excerptFooter.findViewById<TextView>(R.id.text_excerpt_footer)
-                txtExcerptFooter.text = Html.fromHtml(linkText)
-
-                txtExcerptFooter.setOnClickListener { v ->
-                    ReaderActivityLauncher.openUrl(
-                            v.context,
-                            post!!.url
-                    )
+                DirectOperation.POST_LIKE -> {
                 }
             }
+            // Liking needs to be handled "later" after the post has been updated from the server so,
+            // nothing special to do here
+        }
+        return false
+    }
 
-            post?.let {
-                viewModel.onShowPost(it)
-            }
-
-            layoutFooter.visibility = View.VISIBLE
+    private fun ReaderPostDetailFragment.showPostInWebView(post: ReaderPost) {
+        readerWebView.setIsPrivatePost(post.isPrivate)
+        readerWebView.setBlogSchemeIsHttps(UrlUtils.isHttps(post.blogUrl))
+        renderer = ReaderPostRenderer(readerWebView, viewModel.post, readerCssProvider)
+
+        // if the post is from private atomic site postpone render until we have a special access cookie
+        if (post.isPrivateAtomic && privateAtomicCookie.isCookieRefreshRequired()) {
+            PrivateAtCookieRefreshProgressDialog.showIfNecessary(fragmentManager, this@ReaderPostDetailFragment)
+            requestPrivateAtomicCookie()
+        } else if (post.isPrivateAtomic && privateAtomicCookie.exists()) {
+            // make sure we add cookie to the cookie manager if it exists before starting render
+            CookieManager.getInstance().setCookie(
+                    privateAtomicCookie.getDomain(), privateAtomicCookie.getCookieContent()
+            )
+            renderer?.beginRender()
+        } else {
+            renderer?.beginRender()
         }
     }
 
+    private fun requestPrivateAtomicCookie() {
+        dispatcher.dispatch(
+                viewModel.post?.let {
+                    SiteActionBuilder.newFetchPrivateAtomicCookieAction(FetchPrivateAtomicCookiePayload(it.blogId))
+                }
+        )
+    }
+
     /*
-     * called by the web view when the content finishes loading - likes aren't displayed
+     * called by the web view when the content finishes loading - related posts aren't displayed
      * until this is triggered, to avoid having them appear before the webView content
      */
     override fun onPageFinished(view: WebView, url: String?) {
@@ -1169,7 +1270,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
 
         if (url != null && url == "about:blank") {
-            // brief delay before showing comments/likes to give page time to render
+            // brief delay before showing related posts to give page time to render
             view.postDelayed(Runnable {
                 if (!isAdded) {
                     return@Runnable
@@ -1178,9 +1279,15 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
                     hasAlreadyUpdatedPost = true
                     updatePost()
                 }
+                viewModel.post?.let {
+                    if (likesEnhancementsFeatureConfig.isEnabled()) {
+                        viewModel.onRefreshLikersData(it)
+                    }
+                    viewModel.onRelatedPostsRequested(it)
+                }
             }, 300)
         } else {
-            AppLog.w(T.READER, "reader post detail > page finished - " + url!!)
+            url?.let { AppLog.w(T.READER, "reader post detail > page finished - $it") }
         }
     }
 
@@ -1228,7 +1335,13 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         if (ReaderUtils.isBlogPreviewUrl(url)) {
             val siteId = ReaderUtils.getBlogIdFromBlogPreviewUrl(url)
             if (siteId != 0L) {
-                ReaderActivityLauncher.showReaderBlogPreview(activity, siteId)
+                ReaderActivityLauncher.showReaderBlogPreview(
+                        activity,
+                        siteId,
+                        viewModel.post?.isFollowedByCurrentUser,
+                        ReaderTracker.SOURCE_POST_DETAIL,
+                        readerTracker
+                )
             }
             return true
         }
@@ -1318,7 +1431,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
                 requestCode == READER_FILE_DOWNLOAD_PERMISSION_REQUEST_CODE &&
                 grantResults.isNotEmpty() &&
                 grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            readerFileDownloadManager.downloadFile(fileForDownload!!)
+            fileForDownload?.let { readerFileDownloadManager.downloadFile(it) }
         }
         fileForDownload = null
     }
@@ -1344,6 +1457,16 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
     }
 
+    override fun onScrollUp(distanceY: Float) {
+    }
+
+    override fun onScrollDown(distanceY: Float) {
+    }
+
+    override fun onScrollCompleted() {
+        trackRelatedPostsIfShowing()
+    }
+
     private fun setRefreshing(refreshing: Boolean) {
         swipeToRefreshHelper.isRefreshing = refreshing
     }
@@ -1354,18 +1477,11 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
         }
     }
 
-    private fun showFullScreen() {
-        post?.let {
-            val site = siteStore.getSiteBySiteId(it.blogId)
-            MediaPreviewActivity.showPreview(requireContext(), site, it.featuredImage)
-        }
-    }
-
     companion object {
-        private const val FEATURED_IMAGE_HEIGHT_PERCENT = 0.4
+        private const val KEY_LIKERS_LIST_STATE = "likers_list_state"
 
         fun newInstance(blogId: Long, postId: Long): ReaderPostDetailFragment {
-            return newInstance(false, blogId, postId, null, 0, null, null, false)
+            return newInstance(false, blogId, postId, null, 0, false, null, null, false)
         }
 
         fun newInstance(
@@ -1374,6 +1490,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             postId: Long,
             directOperation: DirectOperation?,
             commentId: Int,
+            isRelatedPost: Boolean,
             interceptedUri: String?,
             postListType: ReaderPostListType?,
             postSlugsResolutionUnderway: Boolean
@@ -1384,6 +1501,7 @@ class ReaderPostDetailFragment : ViewPagerFragment(),
             args.putBoolean(ReaderConstants.ARG_IS_FEED, isFeed)
             args.putLong(ReaderConstants.ARG_BLOG_ID, blogId)
             args.putLong(ReaderConstants.ARG_POST_ID, postId)
+            args.putBoolean(ReaderConstants.ARG_IS_RELATED_POST, isRelatedPost)
             args.putSerializable(ReaderConstants.ARG_DIRECT_OPERATION, directOperation)
             args.putInt(ReaderConstants.ARG_COMMENT_ID, commentId)
             args.putString(ReaderConstants.ARG_INTERCEPTED_URI, interceptedUri)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailUiStateBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailUiStateBuilder.kt
new file mode 100644
index 000000000000..ba39ad926219
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailUiStateBuilder.kt
@@ -0,0 +1,174 @@
+package org.wordpress.android.ui.reader
+
+import dagger.Reusable
+import org.wordpress.android.R
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType
+import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder
+import org.wordpress.android.ui.reader.models.ReaderSimplePost
+import org.wordpress.android.ui.reader.models.ReaderSimplePostList
+import org.wordpress.android.ui.reader.utils.FeaturedImageUtils
+import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.ExcerptFooterUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.ReaderPostFeaturedImageUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState.ReaderRelatedPostUiState
+import org.wordpress.android.ui.reader.views.ReaderPostDetailsHeaderViewUiStateBuilder
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.HtmlUtilsWrapper
+import org.wordpress.android.ui.utils.UiDimen.UIDimenRes
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DisplayUtilsWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+const val READER_POST_FEATURED_IMAGE_HEIGHT_PERCENT = 0.4
+const val RELATED_POST_IMAGE_HEIGHT_WIDTH_RATION = 0.56 // 9:16
+
+@Reusable
+class ReaderPostDetailUiStateBuilder @Inject constructor(
+    private val postDetailsHeaderViewUiStateBuilder: ReaderPostDetailsHeaderViewUiStateBuilder,
+    private val postUiStateBuilder: ReaderPostUiStateBuilder,
+    private val featuredImageUtils: FeaturedImageUtils,
+    private val readerUtilsWrapper: ReaderUtilsWrapper,
+    private val displayUtilsWrapper: DisplayUtilsWrapper,
+    private val contextProvider: ContextProvider,
+    private val htmlUtilsWrapper: HtmlUtilsWrapper,
+    private val htmlMessageUtils: HtmlMessageUtils,
+    resourceProvider: ResourceProvider
+) {
+    private val relatedPostFeaturedImageWidth: Int = resourceProvider
+            .getDimensionPixelSize(R.dimen.reader_related_post_image_width)
+    private val relatedPostFeaturedImageHeight: Int = (relatedPostFeaturedImageWidth
+            * RELATED_POST_IMAGE_HEIGHT_WIDTH_RATION).toInt()
+
+    fun mapPostToUiState(
+        post: ReaderPost,
+        moreMenuItems: List<SecondaryAction>? = null,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit,
+        onBlogSectionClicked: (Long, Long) -> Unit,
+        onFollowClicked: () -> Unit,
+        onTagItemClicked: (String) -> Unit
+    ) = ReaderPostDetailsUiState(
+            postId = post.postId,
+            blogId = post.blogId,
+            featuredImageUiState = buildReaderPostFeaturedImageUiState(post),
+            headerUiState = buildPostDetailsHeaderUiState(
+                    post,
+                    onBlogSectionClicked,
+                    onFollowClicked,
+                    onTagItemClicked
+            ),
+            excerptFooterUiState = buildExcerptFooterUiState(post),
+            moreMenuItems = moreMenuItems,
+            actions = buildPostActions(post, onButtonClicked)
+    )
+
+    fun mapRelatedPostsToUiState(
+        sourcePost: ReaderPost,
+        relatedPosts: ReaderSimplePostList,
+        isGlobal: Boolean,
+        onItemClicked: (Long, Long, Boolean) -> Unit
+    ) = RelatedPostsUiState(
+            cards = relatedPosts.map {
+                mapRelatedPostToUiState(
+                        post = it,
+                        isGlobal = isGlobal,
+                        onItemClicked = onItemClicked
+                )
+            },
+            isGlobal = isGlobal,
+            headerLabel = buildRelatedPostsHeaderLabel(blogName = sourcePost.blogName, isGlobal = isGlobal),
+            railcarJsonStrings = relatedPosts.map { it.railcarJson }
+    )
+
+    private fun mapRelatedPostToUiState(
+        post: ReaderSimplePost,
+        isGlobal: Boolean,
+        onItemClicked: (Long, Long, Boolean) -> Unit
+    ) = ReaderRelatedPostUiState(
+            postId = post.postId,
+            blogId = post.siteId,
+            isGlobal = isGlobal,
+            title = post.takeIf { it.hasTitle() }?.let { UiStringText(it.title) },
+            excerpt = post.takeIf { it.hasExcerpt() }?.let { UiStringText(it.excerpt) },
+            featuredImageUrl = buildFeaturedImageUrl(
+                    post,
+                    relatedPostFeaturedImageWidth,
+                    relatedPostFeaturedImageHeight
+            ),
+            featuredImageVisibility = post.featuredImageUrl?.isNotEmpty() == true,
+            featuredImageCornerRadius = UIDimenRes(R.dimen.reader_featured_image_corner_radius),
+            onItemClicked = onItemClicked
+    )
+
+    private fun buildReaderPostFeaturedImageUiState(post: ReaderPost) =
+            post.takeIf { featuredImageUtils.shouldAddFeaturedImage(post) }?.let {
+                ReaderPostFeaturedImageUiState(
+                        blogId = post.blogId,
+                        url = buildReaderPostFeaturedImageUrl(post),
+                        height = (displayUtilsWrapper.getDisplayPixelHeight() *
+                                READER_POST_FEATURED_IMAGE_HEIGHT_PERCENT).toInt()
+                )
+            }
+
+    private fun buildReaderPostFeaturedImageUrl(post: ReaderPost) = readerUtilsWrapper.getResizedImageUrl(
+            post.featuredImage,
+            displayUtilsWrapper.getDisplayPixelWidth(),
+            0,
+            post.isPrivate,
+            post.isPrivateAtomic
+    )
+
+    private fun buildPostDetailsHeaderUiState(
+        post: ReaderPost,
+        onBlogSectionClicked: (Long, Long) -> Unit,
+        onFollowClicked: () -> Unit,
+        onTagItemClicked: (String) -> Unit
+    ) = postDetailsHeaderViewUiStateBuilder.mapPostToUiState(
+            post,
+            onBlogSectionClicked,
+            onFollowClicked,
+            onTagItemClicked
+    )
+
+    private fun buildExcerptFooterUiState(post: ReaderPost): ExcerptFooterUiState? =
+            post.takeIf { post.shouldShowExcerpt() }?.let {
+                ExcerptFooterUiState(
+                        visitPostExcerptFooterLinkText = buildPostExcerptFooterLinkText(post),
+                        postLink = post.url
+                )
+            }
+
+    private fun buildPostExcerptFooterLinkText(post: ReaderPost) = UiStringText(
+            htmlMessageUtils.getHtmlMessageFromStringFormatResId(
+                    R.string.reader_excerpt_link,
+                    "<font color='" +
+                            htmlUtilsWrapper
+                                    .colorResToHtmlColor(contextProvider.getContext(), R.color.link_reader) + "'>" +
+                            post.blogName + "</font>"
+            )
+    )
+
+    fun buildPostActions(
+        post: ReaderPost,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
+    ) = postUiStateBuilder.mapPostToActions(post, onButtonClicked)
+
+    private fun buildRelatedPostsHeaderLabel(blogName: String, isGlobal: Boolean): UiString {
+        return if (isGlobal) {
+            UiStringRes(R.string.reader_label_global_related_posts)
+        } else {
+            UiStringResWithParams(R.string.reader_label_local_related_posts, listOf(UiStringText(blogName)))
+        }
+    }
+
+    private fun buildFeaturedImageUrl(post: ReaderSimplePost, imageWidth: Int, imageHeight: Int) =
+            post.getFeaturedImageForDisplay(imageWidth, imageHeight)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java
index b1505000c5bb..6cef8974103a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListActivity.java
@@ -21,7 +21,6 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
-import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.datasets.ReaderBlogTable;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.model.PostModel;
@@ -31,12 +30,13 @@
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.models.ReaderBlog;
 import org.wordpress.android.models.ReaderTag;
-import org.wordpress.android.ui.LocaleAwareActivity;
 import org.wordpress.android.ui.ActivityLauncher;
+import org.wordpress.android.ui.LocaleAwareActivity;
 import org.wordpress.android.ui.RequestCodes;
 import org.wordpress.android.ui.posts.EditPostActivity;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.uploads.UploadActionUseCase;
 import org.wordpress.android.ui.uploads.UploadUtils;
 import org.wordpress.android.ui.uploads.UploadUtilsWrapper;
@@ -48,6 +48,7 @@
  * serves as the host for ReaderPostListFragment when showing blog preview & tag preview
  */
 public class ReaderPostListActivity extends LocaleAwareActivity {
+    private String mSource;
     private ReaderPostListType mPostListType;
     private long mSiteId;
 
@@ -56,6 +57,7 @@ public class ReaderPostListActivity extends LocaleAwareActivity {
     @Inject Dispatcher mDispatcher;
     @Inject UploadActionUseCase mUploadActionUseCase;
     @Inject UploadUtilsWrapper mUploadUtilsWrapper;
+    @Inject ReaderTracker mReaderTracker;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -72,6 +74,7 @@ public void onCreate(Bundle savedInstanceState) {
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
+        mSource = getIntent().getStringExtra(ReaderConstants.ARG_SOURCE);
         if (getIntent().hasExtra(ReaderConstants.ARG_POST_LIST_TYPE)) {
             mPostListType = (ReaderPostListType) getIntent().getSerializableExtra(ReaderConstants.ARG_POST_LIST_TYPE);
         } else {
@@ -143,8 +146,8 @@ protected void onPause() {
     }
 
     /*
-    * This method hides the FilteredRecyclerView toolbar with spinner so to disable content filtering, for reusability
-    * */
+     * This method hides the FilteredRecyclerView toolbar with spinner so to disable content filtering, for reusability
+     */
     private void disableFilteredRecyclerViewToolbar() {
         // make it invisible - setting height to zero here because setting visibility to View.GONE wouldn't take the
         // occupied space, as otherwise expected
@@ -228,7 +231,13 @@ private void shareSite() {
             }
 
             try {
-                AnalyticsTracker.track(Stat.READER_SITE_SHARED);
+                mReaderTracker.trackBlog(
+                        AnalyticsTracker.Stat.READER_SITE_SHARED,
+                        blog.blogId,
+                        blog.feedId,
+                        blog.isFollowing,
+                        mSource
+                );
                 startActivity(Intent.createChooser(intent, getString(R.string.share_link)));
             } catch (ActivityNotFoundException exception) {
                 ToastUtils.showToast(ReaderPostListActivity.this, R.string.reader_toast_err_share_intent);
@@ -241,7 +250,7 @@ private void shareSite() {
     /*
      * show fragment containing list of latest posts for a specific tag
      */
-    private void showListFragmentForTag(final ReaderTag tag, ReaderPostListType listType) {
+    private void showListFragmentForTag(@NonNull final ReaderTag tag, ReaderPostListType listType) {
         if (isFinishing()) {
             return;
         }
@@ -356,6 +365,7 @@ public void onPostUploaded(OnPostUploaded event) {
                     this,
                     findViewById(R.id.coordinator),
                     event.isError(),
+                    event.isFirstTimePublish,
                     event.post,
                     null,
                     site);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
index c6d270a6bd0b..b2b559757fc3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
@@ -27,7 +27,6 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.ViewModelProvider;
-import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -43,7 +42,6 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
-import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.datasets.ReaderBlogTable;
 import org.wordpress.android.datasets.ReaderDatabase;
 import org.wordpress.android.datasets.ReaderPostTable;
@@ -58,7 +56,6 @@
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload;
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction;
 import org.wordpress.android.fluxc.store.AccountStore.OnSubscriptionUpdated;
-import org.wordpress.android.fluxc.store.QuickStartStore;
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask;
 import org.wordpress.android.fluxc.store.ReaderStore;
 import org.wordpress.android.fluxc.store.ReaderStore.OnReaderSitesSearched;
@@ -78,6 +75,9 @@
 import org.wordpress.android.ui.main.BottomNavController;
 import org.wordpress.android.ui.main.SitePickerActivity;
 import org.wordpress.android.ui.main.WPMainActivity;
+import org.wordpress.android.ui.main.WPMainNavigationView;
+import org.wordpress.android.ui.main.WPMainNavigationView.PageType;
+import org.wordpress.android.ui.mysite.QuickStartRepository;
 import org.wordpress.android.ui.pages.SnackbarMessageHolder;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.quickstart.QuickStartEvent;
@@ -99,12 +99,15 @@
 import org.wordpress.android.ui.reader.services.post.ReaderPostServiceStarter;
 import org.wordpress.android.ui.reader.services.post.ReaderPostServiceStarter.UpdateAction;
 import org.wordpress.android.ui.reader.services.search.ReaderSearchServiceStarter;
+import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
 import org.wordpress.android.ui.reader.services.update.TagUpdateClientUtilsProvider;
 import org.wordpress.android.ui.reader.subfilter.ActionType.OpenSubsAtPage;
+import org.wordpress.android.ui.reader.subfilter.BottomSheetUiState.BottomSheetVisible;
 import org.wordpress.android.ui.reader.subfilter.SubFilterViewModel;
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Site;
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.SiteAll;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.ui.reader.viewmodels.ReaderModeInfo;
@@ -117,11 +120,12 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.DisplayUtils;
 import org.wordpress.android.util.NetworkUtils;
-import org.wordpress.android.util.QuickStartUtils;
+import org.wordpress.android.util.QuickStartUtilsWrapper;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.WPActivityUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig;
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.viewmodel.main.WPMainActivityViewModel;
 import org.wordpress.android.widgets.AppRatingDialog;
@@ -130,14 +134,12 @@
 import org.wordpress.android.widgets.WPSnackbar;
 
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.EnumSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Stack;
 
 import javax.inject.Inject;
 
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST;
 import static org.wordpress.android.fluxc.generated.AccountActionBuilder.newUpdateSubscriptionNotificationPostAction;
 import static org.wordpress.android.ui.reader.ReaderActivityLauncher.OpenUrlType.INTERNAL;
 
@@ -215,9 +217,13 @@ public class ReaderPostListFragment extends ViewPagerFragment
     @Inject ReaderStore mReaderStore;
     @Inject Dispatcher mDispatcher;
     @Inject ImageManager mImageManager;
-    @Inject QuickStartStore mQuickStartStore;
     @Inject UiHelpers mUiHelpers;
     @Inject TagUpdateClientUtilsProvider mTagUpdateClientUtilsProvider;
+    @Inject QuickStartUtilsWrapper mQuickStartUtilsWrapper;
+    @Inject SeenUnseenWithCounterFeatureConfig mSeenUnseenWithCounterFeatureConfig;
+    @Inject QuickStartRepository mQuickStartRepository;
+    @Inject MySiteImprovementsFeatureConfig mMySiteImprovementsFeatureConfig;
+    @Inject ReaderTracker mReaderTracker;
 
     private enum ActionableEmptyViewButtonType {
         DISCOVER,
@@ -250,22 +256,18 @@ void saveInstance(Bundle bundle) {
         }
     }
 
-    public static ReaderPostListFragment newInstance(boolean isTopLevel) {
-        ReaderTag tag = AppPrefs.getReaderTag();
-        if (tag == null) {
-            tag = ReaderUtils.getDefaultTag();
-        }
-        return newInstanceForTag(tag, ReaderPostListType.TAG_FOLLOWED, isTopLevel);
-    }
-
     /*
      * show posts with a specific tag (either TAG_FOLLOWED or TAG_PREVIEW)
      */
-    static ReaderPostListFragment newInstanceForTag(ReaderTag tag, ReaderPostListType listType) {
+    static ReaderPostListFragment newInstanceForTag(@NonNull ReaderTag tag, ReaderPostListType listType) {
         return newInstanceForTag(tag, listType, false);
     }
 
-    static ReaderPostListFragment newInstanceForTag(ReaderTag tag, ReaderPostListType listType, boolean isTopLevel) {
+    static ReaderPostListFragment newInstanceForTag(
+            @NonNull ReaderTag tag,
+            ReaderPostListType listType,
+            boolean isTopLevel
+    ) {
         AppLog.d(T.READER, "reader post list > newInstance (tag)");
 
         Bundle args = new Bundle();
@@ -392,6 +394,11 @@ public void onCreate(Bundle savedInstanceState) {
                 mIsTopLevel = savedInstanceState.getBoolean(ReaderConstants.ARG_IS_TOP_LEVEL);
             }
 
+            if (savedInstanceState.containsKey(ReaderConstants.ARG_ORIGINAL_TAG)) {
+                mTagFragmentStartedWith =
+                        (ReaderTag) savedInstanceState.getSerializable(ReaderConstants.ARG_ORIGINAL_TAG);
+            }
+
             mRestorePosition = savedInstanceState.getInt(ReaderConstants.KEY_RESTORE_POSITION);
             mSiteSearchRestorePosition = savedInstanceState.getInt(ReaderConstants.KEY_SITE_SEARCH_RESTORE_POSITION);
             mWasPaused = savedInstanceState.getBoolean(ReaderConstants.KEY_WAS_PAUSED);
@@ -404,15 +411,15 @@ public void onCreate(Bundle savedInstanceState) {
 
     @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mViewModel = ViewModelProviders.of(this, mViewModelFactory)
-                                       .get(ReaderPostListViewModel.class);
+        mViewModel = new ViewModelProvider(this, mViewModelFactory)
+                .get(ReaderPostListViewModel.class);
         if (mIsTopLevel) {
-            mReaderViewModel = ViewModelProviders.of(getParentFragment(), mViewModelFactory)
-                                                 .get(ReaderViewModel.class);
+            mReaderViewModel = new ViewModelProvider(getParentFragment(), mViewModelFactory)
+                    .get(ReaderViewModel.class);
         }
 
-        if (isFollowingScreen()) {
-            initSubFilterViewModel();
+        if (isFilterableScreen()) {
+            initSubFilterViewModel(savedInstanceState);
         }
 
         mViewModel.getNavigationEvents().observe(getViewLifecycleOwner(),
@@ -441,9 +448,9 @@ public void onCreate(Bundle savedInstanceState) {
                     } else if (navTarget instanceof ShowReportPost) {
                         ShowReportPost data = (ShowReportPost) navTarget;
                         ReaderActivityLauncher.openUrl(
-                            getContext(),
-                            ReaderUtils.getReportPostUrl(data.getUrl()),
-                            INTERNAL);
+                                getContext(),
+                                ReaderUtils.getReportPostUrl(data.getUrl()),
+                                INTERNAL);
                     } else {
                         throw new IllegalStateException("Action not supported in ReaderPostListFragment " + navTarget);
                     }
@@ -494,7 +501,7 @@ private void setFollowStatusForBlog(FollowStatusChanged readerData) {
     }
 
     private void showSnackbar(SnackbarMessageHolder holder) {
-        WPSnackbar snackbar = WPSnackbar.make(
+        Snackbar snackbar = WPSnackbar.make(
                 getSnackbarParent(),
                 mUiHelpers.getTextOfUiString(requireContext(), holder.getMessage()),
                 Snackbar.LENGTH_LONG
@@ -513,16 +520,18 @@ private void addWebViewCachingFragment(Long blogId, Long postId) {
 
         if (getParentFragmentManager().findFragmentByTag(tag) == null) {
             getParentFragmentManager().beginTransaction()
-                                 .add(ReaderPostWebViewCachingFragment.newInstance(blogId, postId), tag)
-                                 .commit();
+                                      .add(ReaderPostWebViewCachingFragment.newInstance(blogId, postId), tag)
+                                      .commit();
         }
     }
 
-    private void initSubFilterViewModel() {
-        WPMainActivityViewModel wpMainActivityViewModel = ViewModelProviders.of(requireActivity(), mViewModelFactory)
-                                                     .get(WPMainActivityViewModel.class);
-        mSubFilterViewModel = ViewModelProviders.of(requireActivity(), mViewModelFactory)
-                                                     .get(SubFilterViewModel.class);
+    private void initSubFilterViewModel(@Nullable Bundle savedInstanceState) {
+        WPMainActivityViewModel wpMainActivityViewModel = new ViewModelProvider(requireActivity(), mViewModelFactory)
+                .get(WPMainActivityViewModel.class);
+        mSubFilterViewModel = new ViewModelProvider(this, mViewModelFactory).get(
+                SubFilterViewModel.SUBFILTER_VM_BASE_KEY + mTagFragmentStartedWith.getKeyString(),
+                SubFilterViewModel.class
+        );
 
         mSubFilterViewModel.getCurrentSubFilter().observe(getViewLifecycleOwner(), subfilterListItem -> {
             if (getPostListType() != ReaderPostListType.SEARCH_RESULTS) {
@@ -555,17 +564,22 @@ private void initSubFilterViewModel() {
             }
         });
 
-        mSubFilterViewModel.getChangeBottomSheetVisibility().observe(getViewLifecycleOwner(), event -> {
-            event.applyIfNotHandled(isShowing -> {
-                FragmentManager fm = getFragmentManager();
+        mSubFilterViewModel.getBottomSheetUiState().observe(getViewLifecycleOwner(), event -> {
+            event.applyIfNotHandled(uiState -> {
+                FragmentManager fm = getChildFragmentManager();
                 if (fm != null) {
                     SubfilterBottomSheetFragment bottomSheet =
                             (SubfilterBottomSheetFragment) fm.findFragmentByTag(SUBFILTER_BOTTOM_SHEET_TAG);
-                    if (isShowing && bottomSheet == null) {
+                    if (uiState.isVisible() && bottomSheet == null) {
                         mSubFilterViewModel.loadSubFilters();
-                        bottomSheet = new SubfilterBottomSheetFragment();
-                        bottomSheet.show(getFragmentManager(), SUBFILTER_BOTTOM_SHEET_TAG);
-                    } else if (!isShowing && bottomSheet != null) {
+                        BottomSheetVisible visibleState = (BottomSheetVisible) uiState;
+                        bottomSheet = SubfilterBottomSheetFragment.newInstance(
+                                SubFilterViewModel.SUBFILTER_VM_BASE_KEY + mTagFragmentStartedWith.getKeyString(),
+                                visibleState.getCategories(),
+                                mUiHelpers.getTextOfUiString(requireContext(), visibleState.getTitle())
+                        );
+                        bottomSheet.show(getChildFragmentManager(), SUBFILTER_BOTTOM_SHEET_TAG);
+                    } else if (!uiState.isVisible() && bottomSheet != null) {
                         bottomSheet.dismiss();
                     }
                 }
@@ -581,7 +595,9 @@ private void initSubFilterViewModel() {
                             ((OpenSubsAtPage) action).getTabIndex()
                     );
                 } else {
-                    wpMainActivityViewModel.onOpenLoginPage();
+                    wpMainActivityViewModel.onOpenLoginPage(
+                            WPMainNavigationView.Companion.getPosition(PageType.MY_SITE)
+                    );
                 }
 
                 return null;
@@ -596,7 +612,8 @@ private void initSubFilterViewModel() {
                 return null;
             });
         });
-        mSubFilterViewModel.start(mCurrentTag);
+
+        mSubFilterViewModel.start(mTagFragmentStartedWith, mCurrentTag, savedInstanceState);
     }
 
     private void initSubFilterViews(ViewGroup rootView, LayoutInflater inflater) {
@@ -614,7 +631,7 @@ private void initSubFilterViews(ViewGroup rootView, LayoutInflater inflater) {
         mRemoveFilterButton.setOnClickListener(v -> {
             mSubFilterViewModel.setDefaultSubfilter();
         });
-        mSubFilterComponent.setVisibility(isFollowingScreen() ? View.VISIBLE : View.GONE);
+        mSubFilterComponent.setVisibility(isFilterableScreen() ? View.VISIBLE : View.GONE);
 
         ElevationOverlayProvider elevationOverlayProvider = new ElevationOverlayProvider(mRecyclerView.getContext());
         float cardElevation = getResources().getDimension(R.dimen.card_elevation);
@@ -665,7 +682,7 @@ public void onPause() {
         mWasPaused = true;
 
         mViewModel.onFragmentPause(mIsTopLevel, getPostListType() == ReaderPostListType.SEARCH_RESULTS,
-                isFollowingScreen());
+                isFilterableScreen());
     }
 
     @Override
@@ -713,7 +730,7 @@ public void onResume() {
         }
 
         mViewModel.onFragmentResume(mIsTopLevel, getPostListType() == ReaderPostListType.SEARCH_RESULTS,
-                isFollowingScreen(), isFollowingScreen() ? mSubFilterViewModel.getCurrentSubfilterValue() : null);
+                isFilterableScreen(), isFilterableScreen() ? mSubFilterViewModel.getCurrentSubfilterValue() : null);
     }
 
     /*
@@ -741,7 +758,7 @@ private void resumeFollowedTag() {
     private Site getSiteIfBlogPreview() {
         Site currentSite = null;
 
-        if (isFollowingScreen() && getPostListType() == ReaderPostListType.BLOG_PREVIEW) {
+        if (isFilterableScreen() && getPostListType() == ReaderPostListType.BLOG_PREVIEW) {
             currentSite = mSubFilterViewModel.getCurrentSubfilterValue() instanceof Site ? (Site) (mSubFilterViewModel
                     .getCurrentSubfilterValue()) : null;
         }
@@ -763,7 +780,7 @@ private void resumeFollowedSite(Site currentSite) {
         if (isSiteStillAvailable) {
             refreshPosts();
         } else {
-            if (isFollowingScreen()) {
+            if (isFilterableScreen()) {
                 mSubFilterViewModel.setDefaultSubfilter();
             }
         }
@@ -879,7 +896,8 @@ public void onEvent(final QuickStartEvent event) {
 
         if (mQuickStartEvent.getTask() == QuickStartTask.FOLLOW_SITE
             && isAdded() && getActivity() instanceof WPMainActivity) {
-            Spannable title = QuickStartUtils.stylizeQuickStartPrompt(getActivity(),
+            Spannable title = mQuickStartUtilsWrapper.stylizeQuickStartPrompt(
+                    requireContext(),
                     R.string.quick_start_dialog_follow_sites_message_short_search,
                     R.drawable.ic_search_white_24dp);
 
@@ -889,8 +907,12 @@ && isAdded() && getActivity() instanceof WPMainActivity) {
             ((WPMainActivity) getActivity()).showQuickStartSnackBar(snackbar);
 
             if (getSelectedSite() != null) {
-                QuickStartUtils.completeTaskAndRemindNextOne(mQuickStartStore, QuickStartTask.FOLLOW_SITE,
-                        mDispatcher, getSelectedSite(), mQuickStartEvent, getContext());
+                if (mMySiteImprovementsFeatureConfig.isEnabled()) {
+                    mQuickStartRepository.completeTask(QuickStartTask.FOLLOW_SITE);
+                } else {
+                    mQuickStartUtilsWrapper.completeTaskAndRemindNextOne(QuickStartTask.FOLLOW_SITE,
+                            getSelectedSite(), mQuickStartEvent, getContext());
+                }
             }
         }
     }
@@ -903,6 +925,10 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
             outState.putSerializable(ReaderConstants.ARG_TAG, mCurrentTag);
         }
 
+        if (mTagFragmentStartedWith != null) {
+            outState.putSerializable(ReaderConstants.ARG_ORIGINAL_TAG, mTagFragmentStartedWith);
+        }
+
         if (getPostListType() == ReaderPostListType.TAG_PREVIEW) {
             mTagPreviewHistory.saveInstance(outState);
         } else if (getPostListType() == ReaderPostListType.SEARCH_RESULTS
@@ -932,6 +958,10 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
             outState.putInt(ReaderConstants.KEY_SITE_SEARCH_RESTORE_POSITION, siteSearchPosition);
         }
 
+        if (isFilterableTag(mTagFragmentStartedWith) && mSubFilterViewModel != null) {
+            mSubFilterViewModel.onSaveInstanceState(outState);
+        }
+
         super.onSaveInstanceState(outState);
     }
 
@@ -953,6 +983,12 @@ private void updatePosts(boolean forced) {
             return;
         }
 
+        if (forced) {
+            // Update the tags on post refresh since following some sites (like P2) will change followed tags and blogs
+            ReaderUpdateServiceStarter.startService(getContext(),
+                    EnumSet.of(UpdateTask.TAGS, UpdateTask.FOLLOWED_BLOGS));
+        }
+
         if (mFirstLoad) {
             // let onResume() take care of this logic, as the FilteredRecyclerView.FilterListener onLoadData
             // method is called on two moments: once for first time load, and then each time the swipe to
@@ -1007,7 +1043,7 @@ public void onLoadFilterCriteriaOptionsAsync(
             @Override
             public void onLoadData(boolean forced) {
                 if (forced) {
-                    AnalyticsTracker.track(Stat.READER_PULL_TO_REFRESH);
+                    mReaderTracker.track(AnalyticsTracker.Stat.READER_PULL_TO_REFRESH);
                 }
                 updatePosts(forced);
             }
@@ -1103,8 +1139,7 @@ public void onClick(View view) {
         }
 
 
-
-        if (isFollowingScreen()) {
+        if (isFilterableScreen()) {
             initSubFilterViews(rootView, inflater);
         }
 
@@ -1141,7 +1176,7 @@ private void setupRecyclerToolbar() {
             @Override
             public boolean onMenuItemActionExpand(MenuItem item) {
                 if (getPostListType() != ReaderPostListType.SEARCH_RESULTS) {
-                    AnalyticsTracker.track(AnalyticsTracker.Stat.READER_SEARCH_LOADED);
+                    mReaderTracker.track(AnalyticsTracker.Stat.READER_SEARCH_LOADED);
                 }
                 resetPostAdapter(ReaderPostListType.SEARCH_RESULTS);
                 populateSearchSuggestions(null);
@@ -1268,9 +1303,7 @@ private void submitSearchQuery(@NonNull String query) {
 
         // track that the user performed a search
         if (!trimQuery.equals("")) {
-            Map<String, Object> properties = new HashMap<>();
-            properties.put("query", trimQuery);
-            AnalyticsTracker.track(AnalyticsTracker.Stat.READER_SEARCH_PERFORMED, properties);
+            mReaderTracker.trackQuery(AnalyticsTracker.Stat.READER_SEARCH_PERFORMED, trimQuery);
         }
     }
 
@@ -1703,7 +1736,7 @@ private void setEmptyTitleAndDescriptionForBookmarksList() {
     }
 
     private boolean shouldShowEmptyViewForSelfHostedCta() {
-        return isFollowingScreen() && !mAccountStore.hasAccessToken() && mSubFilterViewModel
+        return isFilterableScreen() && !mAccountStore.hasAccessToken() && mSubFilterViewModel
                 .getCurrentSubfilterValue() instanceof SiteAll;
     }
 
@@ -1782,21 +1815,21 @@ private void hideEmptyView() {
     }
 
     private void setCurrentTagFromEmptyViewButton(ActionableEmptyViewButtonType button) {
-            ReaderTag tag = null;
+        ReaderTag tag = null;
 
-            switch (button) {
-                case DISCOVER:
-                    tag = ReaderUtils.getTagFromEndpoint(ReaderTag.DISCOVER_PATH);
-                    break;
-                case FOLLOWED:
-                    tag = ReaderUtils.getTagFromEndpoint(ReaderTag.FOLLOWING_PATH);
-                    break;
-            }
-            if (tag == null) {
-                tag = ReaderUtils.getDefaultTag();
-            }
+        switch (button) {
+            case DISCOVER:
+                tag = ReaderUtils.getTagFromEndpoint(ReaderTag.DISCOVER_PATH);
+                break;
+            case FOLLOWED:
+                tag = ReaderUtils.getTagFromEndpoint(ReaderTag.FOLLOWING_PATH);
+                break;
+        }
+        if (tag == null) {
+            tag = ReaderUtils.getDefaultTag();
+        }
 
-            mViewModel.onEmptyStateButtonTapped(tag);
+        mViewModel.onEmptyStateButtonTapped(tag);
     }
 
     /*
@@ -1873,7 +1906,7 @@ public void onRequestData() {
                                 < ReaderConstants.READER_MAX_POSTS_TO_DISPLAY) {
                                 // request older posts
                                 updatePostsWithTag(getCurrentTag(), UpdateAction.REQUEST_OLDER);
-                                AnalyticsTracker.track(AnalyticsTracker.Stat.READER_INFINITE_SCROLL);
+                                mReaderTracker.track(AnalyticsTracker.Stat.READER_INFINITE_SCROLL);
                             }
                             break;
 
@@ -1886,7 +1919,7 @@ public void onRequestData() {
                             }
                             if (numPosts < ReaderConstants.READER_MAX_POSTS_TO_DISPLAY) {
                                 updatePostsInCurrentBlogOrFeed(UpdateAction.REQUEST_OLDER);
-                                AnalyticsTracker.track(AnalyticsTracker.Stat.READER_INFINITE_SCROLL);
+                                mReaderTracker.track(AnalyticsTracker.Stat.READER_INFINITE_SCROLL);
                             }
                             break;
 
@@ -1895,7 +1928,7 @@ public void onRequestData() {
                             int offset = ReaderPostTable.getNumPostsWithTag(searchTag);
                             if (offset < ReaderConstants.READER_MAX_POSTS_TO_DISPLAY) {
                                 updatePostsInCurrentSearch(offset);
-                                AnalyticsTracker.track(AnalyticsTracker.Stat.READER_INFINITE_SCROLL);
+                                mReaderTracker.track(AnalyticsTracker.Stat.READER_INFINITE_SCROLL);
                             }
                             break;
                     }
@@ -1940,7 +1973,13 @@ private ReaderSiteSearchAdapter getSiteSearchAdapter() {
                 public void onSiteClicked(@NonNull ReaderSiteModel site) {
                     mLastTappedSiteSearchResult = site;
                     ReaderActivityLauncher.showReaderBlogOrFeedPreview(
-                            getActivity(), site.getSiteId(), site.getFeedId());
+                            getActivity(),
+                            site.getSiteId(),
+                            site.getFeedId(),
+                            site.isFollowing(),
+                            mPostAdapter.getSource(),
+                            mReaderTracker
+                    );
                 }
 
                 @Override
@@ -1995,8 +2034,8 @@ && getPostAdapter().isCurrentTag(tag)) {
 
         mCurrentTag = tag;
 
-        if (isFollowingScreen()) {
-            if (mCurrentTag.isFollowedSites() || mCurrentTag.isDefaultInMemoryTag()) {
+        if (isFilterableScreen()) {
+            if (isFilterableTag(mCurrentTag) || mCurrentTag.isDefaultInMemoryTag()) {
                 mSubFilterViewModel.onSubfilterReselected();
             } else {
                 changeReaderMode(new ReaderModeInfo(
@@ -2385,13 +2424,27 @@ public void onPostSelected(ReaderPost post) {
             return;
         }
 
-        AppRatingDialog.INSTANCE.incrementInteractions(APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST);
+        AppRatingDialog.INSTANCE.incrementInteractions(
+                AnalyticsTracker.Stat.APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST
+        );
 
         if (post.isBookmarked) {
             if (isBookmarksList()) {
-                AnalyticsTracker.track(AnalyticsTracker.Stat.READER_SAVED_POST_OPENED_FROM_SAVED_POST_LIST);
+                mReaderTracker.trackBlog(
+                        AnalyticsTracker.Stat.READER_SAVED_POST_OPENED_FROM_SAVED_POST_LIST,
+                        post.blogId,
+                        post.feedId,
+                        post.isFollowedByCurrentUser,
+                        mPostAdapter.getSource()
+                );
             } else {
-                AnalyticsTracker.track(AnalyticsTracker.Stat.READER_SAVED_POST_OPENED_FROM_OTHER_POST_LIST);
+                mReaderTracker.trackBlog(
+                        AnalyticsTracker.Stat.READER_SAVED_POST_OPENED_FROM_OTHER_POST_LIST,
+                        post.blogId,
+                        post.feedId,
+                        post.isFollowedByCurrentUser,
+                        mPostAdapter.getSource()
+                );
             }
         }
 
@@ -2407,6 +2460,9 @@ public void onPostSelected(ReaderPost post) {
                             discoverData.getPostId());
                     return;
                 } else if (discoverData.hasPermalink()) {
+                    if (mSeenUnseenWithCounterFeatureConfig.isEnabled()) {
+                        mViewModel.onExternalPostOpened(post);
+                    }
                     // if we don't have a blogId/postId, we sadly resort to showing the post
                     // in a WebView activity - this will happen for non-JP self-hosted
                     ReaderActivityLauncher.openUrl(getActivity(), discoverData.getPermaLink());
@@ -2441,7 +2497,7 @@ public void onPostSelected(ReaderPost post) {
                         post.postId);
                 break;
             case SEARCH_RESULTS:
-                AnalyticsUtils.trackWithReaderPostDetails(AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED, post);
+                mReaderTracker.trackPost(AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED, post);
                 ReaderActivityLauncher.showReaderPostDetail(getActivity(), post.blogId, post.postId);
                 break;
         }
@@ -2450,7 +2506,7 @@ public void onPostSelected(ReaderPost post) {
     /*
      * called when user selects a tag from the tag toolbar
      */
-    private void onTagChanged(ReaderTag tag) {
+    private void onTagChanged(@NonNull ReaderTag tag) {
         if (!isAdded() || isCurrentTag(tag)) {
             return;
         }
@@ -2464,7 +2520,16 @@ private void onTagChanged(ReaderTag tag) {
         setCurrentTag(tag);
     }
 
-    private void trackTagLoaded(ReaderTag tag) {
+    /**
+     * WARNING: Do not replace the static reader tracker with the corresponding instance reader tracker
+     * as this will result into a {@link NullPointerException} crash on specific scenarios.
+     * <p>
+     * This is because this method is also being triggered through the static
+     * {@link ReaderPostListFragment#newInstanceForTag} method, which means that the
+     * {@link ReaderPostListFragment#mReaderTracker} field instance will not be yet available, and
+     * as thus cannot be used, or else it will result in a {@link NullPointerException}.
+     */
+    private void trackTagLoaded(@Nullable ReaderTag tag) {
         if (tag == null) {
             return;
         }
@@ -2478,52 +2543,96 @@ private void trackTagLoaded(ReaderTag tag) {
             return;
         }
 
-        Map<String, String> properties = new HashMap<>();
-        properties.put("tag", tag.getTagSlug());
-
-        AnalyticsTracker.track(stat, properties);
+        ReaderTracker.trackTag(stat, tag.getTagSlug());
     }
 
     @Override
     public void onButtonClicked(ReaderPost post, ReaderPostCardActionType actionType) {
         switch (actionType) {
             case FOLLOW:
-                mViewModel.onFollowSiteClicked(post, isBookmarksList());
+                mViewModel.onFollowSiteClicked(
+                        post,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case SITE_NOTIFICATIONS:
-                mViewModel.onSiteNotificationMenuClicked(post.blogId, post.postId, isBookmarksList());
+                mViewModel.onSiteNotificationMenuClicked(
+                        post.blogId,
+                        post.postId,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case SHARE:
-                AnalyticsUtils.trackWithSiteId(Stat.SHARED_ITEM_READER, post.blogId);
+                mReaderTracker.trackBlog(
+                        AnalyticsTracker.Stat.SHARED_ITEM_READER,
+                        post.blogId,
+                        post.feedId,
+                        post.isFollowedByCurrentUser,
+                        mPostAdapter.getSource()
+                );
                 sharePost(post);
                 break;
             case VISIT_SITE:
-                AnalyticsTracker.track(Stat.READER_ARTICLE_VISITED);
+                mReaderTracker.track(AnalyticsTracker.Stat.READER_ARTICLE_VISITED);
                 ReaderActivityLauncher.openPost(getContext(), post);
                 break;
             case LIKE:
-                mViewModel.onLikeButtonClicked(post, isBookmarksList());
+                mViewModel.onLikeButtonClicked(
+                        post,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case REBLOG:
-                mViewModel.onReblogButtonClicked(post, isBookmarksList());
+                mViewModel.onReblogButtonClicked(
+                        post,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case REPORT_POST:
-                mViewModel.onReportPostButtonClicked(post, isBookmarksList());
+                mViewModel.onReportPostButtonClicked(
+                        post,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case BLOCK_SITE:
-                mViewModel.onBlockSiteButtonClicked(post, isBookmarksList());
+                mViewModel.onBlockSiteButtonClicked(
+                        post,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case BOOKMARK:
-                mViewModel.onBookmarkButtonClicked(post.blogId, post.postId, isBookmarksList());
+                mViewModel.onBookmarkButtonClicked(
+                        post.blogId,
+                        post.postId,
+                        isBookmarksList(),
+                        mPostAdapter.getSource()
+                );
                 break;
             case COMMENTS:
                 ReaderActivityLauncher.showReaderComments(requireContext(), post.blogId, post.postId);
                 break;
+            case TOGGLE_SEEN_STATUS:
+                if (mSeenUnseenWithCounterFeatureConfig.isEnabled()) {
+                    mViewModel.onToggleSeenStatusClicked(
+                            post,
+                            isBookmarksList(),
+                            mPostAdapter.getSource()
+                    );
+                }
+                break;
+            case SPACER_NO_ACTION:
+                break;
         }
     }
 
     @Override
-    public void onFollowTapped(View view, String blogName, final long blogId) {
+    public void onFollowTapped(View view, String blogName, final long blogId, final long feedId) {
         mDispatcher.dispatch(AccountActionBuilder.newFetchSubscriptionsAction());
 
         String blog = TextUtils.isEmpty(blogName)
@@ -2536,8 +2645,11 @@ public void onFollowTapped(View view, String blogName, final long blogId) {
                       .setAction(getString(R.string.reader_followed_blog_notifications_action),
                               new View.OnClickListener() {
                                   @Override public void onClick(View view) {
-                                      AnalyticsUtils
-                                              .trackWithSiteId(Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_ENABLED, blogId);
+                                      mReaderTracker.trackBlog(
+                                              AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_ENABLED,
+                                              blogId,
+                                              feedId
+                                      );
                                       AddOrDeleteSubscriptionPayload payload = new AddOrDeleteSubscriptionPayload(
                                               String.valueOf(blogId), SubscriptionAction.NEW);
                                       mDispatcher.dispatch(newUpdateSubscriptionNotificationPostAction(payload));
@@ -2609,4 +2721,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
     private boolean isFollowingScreen() {
         return mTagFragmentStartedWith != null && mTagFragmentStartedWith.isFollowedSites();
     }
+
+    private boolean isFilterableScreen() {
+        return isFilterableTag(mTagFragmentStartedWith);
+    }
+
+    private boolean isFilterableTag(ReaderTag tag) {
+        return tag != null && tag.isFilterable();
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java
index 7c6cee9f8fb0..f1092641de55 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostPagerActivity.java
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.reader;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
@@ -25,6 +26,7 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.datasets.ReaderPostTable;
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.model.PostModel;
 import org.wordpress.android.fluxc.model.SiteModel;
@@ -47,6 +49,7 @@
 import org.wordpress.android.ui.reader.services.post.ReaderPostServiceStarter;
 import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.tracker.ReaderTrackerType;
+import org.wordpress.android.ui.reader.utils.ReaderPostSeenStatusWrapper;
 import org.wordpress.android.ui.uploads.UploadActionUseCase;
 import org.wordpress.android.ui.uploads.UploadUtils;
 import org.wordpress.android.ui.uploads.UploadUtilsWrapper;
@@ -55,7 +58,8 @@
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.UrlUtilsWrapper;
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig;
 import org.wordpress.android.widgets.WPSwipeSnackbar;
 import org.wordpress.android.widgets.WPViewPager;
 import org.wordpress.android.widgets.WPViewPagerTransformer;
@@ -119,6 +123,7 @@ public enum DirectOperation {
     private boolean mPostSlugsResolutionUnderway;
     private boolean mIsRequestingMorePosts;
     private boolean mIsSinglePostView;
+    private boolean mIsRelatedPostView;
 
     private boolean mBackFromLogin;
 
@@ -126,10 +131,14 @@ public enum DirectOperation {
 
     @Inject SiteStore mSiteStore;
     @Inject ReaderTracker mReaderTracker;
+    @Inject ReaderPostTableWrapper mReaderPostTableWrapper;
     @Inject PostStore mPostStore;
     @Inject Dispatcher mDispatcher;
     @Inject UploadActionUseCase mUploadActionUseCase;
     @Inject UploadUtilsWrapper mUploadUtilsWrapper;
+    @Inject ReaderPostSeenStatusWrapper mPostSeenStatusWrapper;
+    @Inject SeenUnseenWithCounterFeatureConfig mSeenUnseenWithCounterFeatureConfig;
+    @Inject UrlUtilsWrapper mUrlUtilsWrapper;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -149,6 +158,7 @@ public void onCreate(Bundle savedInstanceState) {
                     .getSerializable(ReaderConstants.ARG_DIRECT_OPERATION);
             mCommentId = savedInstanceState.getInt(ReaderConstants.ARG_COMMENT_ID);
             mIsSinglePostView = savedInstanceState.getBoolean(ReaderConstants.ARG_IS_SINGLE_POST);
+            mIsRelatedPostView = savedInstanceState.getBoolean(ReaderConstants.ARG_IS_RELATED_POST);
             mInterceptedUri = savedInstanceState.getString(ReaderConstants.ARG_INTERCEPTED_URI);
             if (savedInstanceState.containsKey(ReaderConstants.ARG_POST_LIST_TYPE)) {
                 mPostListType =
@@ -173,6 +183,7 @@ public void onCreate(Bundle savedInstanceState) {
                     .getSerializableExtra(ReaderConstants.ARG_DIRECT_OPERATION);
             mCommentId = getIntent().getIntExtra(ReaderConstants.ARG_COMMENT_ID, 0);
             mIsSinglePostView = getIntent().getBooleanExtra(ReaderConstants.ARG_IS_SINGLE_POST, false);
+            mIsRelatedPostView = getIntent().getBooleanExtra(ReaderConstants.ARG_IS_RELATED_POST, false);
             mInterceptedUri = getIntent().getStringExtra(ReaderConstants.ARG_INTERCEPTED_URI);
             if (getIntent().hasExtra(ReaderConstants.ARG_POST_LIST_TYPE)) {
                 mPostListType =
@@ -212,8 +223,10 @@ public void onPageSelected(int position) {
             }
         });
 
-        mViewPager.setPageTransformer(false,
-                                      new WPViewPagerTransformer(WPViewPagerTransformer.TransformType.SLIDE_OVER));
+        mViewPager.setPageTransformer(
+                false,
+                new WPViewPagerTransformer(WPViewPagerTransformer.TransformType.SLIDE_OVER)
+        );
     }
 
     private void handleDeepLinking() {
@@ -225,7 +238,7 @@ private void handleDeepLinking() {
             host = uri.getHost();
         }
 
-        AnalyticsUtils.trackWithDeepLinkData(AnalyticsTracker.Stat.DEEP_LINKED, action, host, uri);
+        mReaderTracker.trackDeepLink(AnalyticsTracker.Stat.DEEP_LINKED, action, host, uri);
 
         if (uri == null) {
             // invalid uri so, just show the entry screen
@@ -295,12 +308,16 @@ private void showPost(@NonNull InterceptType interceptType, final String blogIde
             postIdentifier) {
         if (!TextUtils.isEmpty(blogIdentifier) && !TextUtils.isEmpty(postIdentifier)) {
             mIsSinglePostView = true;
+            mIsRelatedPostView = false;
 
             switch (interceptType) {
                 case READER_BLOG:
                     if (parseIds(blogIdentifier, postIdentifier)) {
-                        AnalyticsUtils.trackWithBlogPostDetails(AnalyticsTracker.Stat.READER_BLOG_POST_INTERCEPTED,
-                                                                mBlogId, mPostId);
+                        mReaderTracker.trackBlogPost(
+                                AnalyticsTracker.Stat.READER_BLOG_POST_INTERCEPTED,
+                                mBlogId,
+                                mPostId
+                        );
                         // IDs have now been set so, let ReaderPostPagerActivity normally display the post
                     } else {
                         ToastUtils.showToast(this, R.string.error_generic);
@@ -308,17 +325,23 @@ private void showPost(@NonNull InterceptType interceptType, final String blogIde
                     break;
                 case READER_FEED:
                     if (parseIds(blogIdentifier, postIdentifier)) {
-                        AnalyticsUtils.trackWithFeedPostDetails(AnalyticsTracker.Stat.READER_FEED_POST_INTERCEPTED,
-                                                                mBlogId, mPostId);
+                        mReaderTracker.trackFeedPost(
+                                AnalyticsTracker.Stat.READER_FEED_POST_INTERCEPTED,
+                                mBlogId,
+                                mPostId
+                        );
                         // IDs have now been set so, let ReaderPostPagerActivity normally display the post
                     } else {
                         ToastUtils.showToast(this, R.string.error_generic);
                     }
                     break;
                 case WPCOM_POST_SLUG:
-                    AnalyticsUtils.trackWithBlogPostDetails(
-                            AnalyticsTracker.Stat.READER_WPCOM_BLOG_POST_INTERCEPTED, blogIdentifier,
-                            postIdentifier, mCommentId);
+                    mReaderTracker.trackBlogPost(
+                            AnalyticsTracker.Stat.READER_WPCOM_BLOG_POST_INTERCEPTED,
+                            blogIdentifier,
+                            postIdentifier,
+                            mCommentId
+                    );
 
                     // try to get the post from the local db
                     ReaderPost post = ReaderPostTable.getBlogPost(blogIdentifier, postIdentifier, true);
@@ -329,33 +352,45 @@ private void showPost(@NonNull InterceptType interceptType, final String blogIde
                     } else {
                         // not stored locally, so request it
                         ReaderPostActions.requestBlogPost(
-                            blogIdentifier, postIdentifier,
-                            new ReaderActions.OnRequestListener() {
-                                @Override
-                                public void onSuccess() {
-                                    mPostSlugsResolutionUnderway = false;
-                                    ReaderPost post = ReaderPostTable.getBlogPost(blogIdentifier, postIdentifier,
-                                                                                  true);
-                                    ReaderEvents.PostSlugsRequestCompleted slugsResolved = (post != null)
-                                            ? new ReaderEvents.PostSlugsRequestCompleted(200, post.blogId, post.postId)
-                                            : new ReaderEvents.PostSlugsRequestCompleted(200, 0, 0);
-                                    // notify that the slug resolution request has completed
-                                    EventBus.getDefault().post(slugsResolved);
-
-                                    // post wasn't available locally earlier so, track it now
-                                    if (post != null) {
-                                        trackPost(post.blogId, post.postId);
+                                blogIdentifier, postIdentifier,
+                                new ReaderActions.OnRequestListener<String>() {
+                                    @Override
+                                    public void onSuccess(String blogUrl) {
+                                        mPostSlugsResolutionUnderway = false;
+
+                                        // the scheme is removed to match the query pattern in ReaderPostTable
+                                        // .getBlogPost
+                                        String primaryBlogIdentifier = mUrlUtilsWrapper.removeScheme(blogUrl);
+
+                                        // getBlogPost utilizes the primaryBlogIdentifier instead of blogIdentifier
+                                        // since
+                                        // the custom and *.wordpress.com domains need to be used interchangeably since
+                                        // they can both be used as the primary domain when identifying the blog_url
+                                        // in the ReaderPostTable query.
+                                        ReaderPost post =
+                                                ReaderPostTable.getBlogPost(primaryBlogIdentifier, postIdentifier,
+                                                        true);
+                                        ReaderEvents.PostSlugsRequestCompleted slugsResolved = (post != null)
+                                                ? new ReaderEvents.PostSlugsRequestCompleted(200, post.blogId,
+                                                post.postId)
+                                                : new ReaderEvents.PostSlugsRequestCompleted(200, 0, 0);
+                                        // notify that the slug resolution request has completed
+                                        EventBus.getDefault().post(slugsResolved);
+
+                                        // post wasn't available locally earlier so, track it now
+                                        if (post != null) {
+                                            trackPost(post.blogId, post.postId);
+                                        }
                                     }
-                                }
-
-                                @Override
-                                public void onFailure(int statusCode) {
-                                    mPostSlugsResolutionUnderway = false;
-                                    // notify that the slug resolution request has completed
-                                    EventBus.getDefault()
-                                            .post(new ReaderEvents.PostSlugsRequestCompleted(statusCode, 0, 0));
-                                }
-                            });
+
+                                    @Override
+                                    public void onFailure(int statusCode) {
+                                        mPostSlugsResolutionUnderway = false;
+                                        // notify that the slug resolution request has completed
+                                        EventBus.getDefault()
+                                                .post(new ReaderEvents.PostSlugsRequestCompleted(statusCode, 0, 0));
+                                    }
+                                });
                         mPostSlugsResolutionUnderway = true;
                     }
 
@@ -469,7 +504,8 @@ protected void onResume() {
         mDispatcher.register(this);
 
         if (!hasPagerAdapter() || mBackFromLogin) {
-            if (ActivityUtils.isDeepLinking(getIntent())) {
+            if (ActivityUtils.isDeepLinking(getIntent()) || ReaderConstants.ACTION_VIEW_POST
+                    .equals(getIntent().getAction())) {
                 handleDeepLinking();
             }
 
@@ -514,6 +550,7 @@ private PostPagerAdapter getPagerAdapter() {
     @Override
     protected void onSaveInstanceState(@NonNull Bundle outState) {
         outState.putBoolean(ReaderConstants.ARG_IS_SINGLE_POST, mIsSinglePostView);
+        outState.putBoolean(ReaderConstants.ARG_IS_RELATED_POST, mIsRelatedPostView);
         outState.putString(ReaderConstants.ARG_INTERCEPTED_URI, mInterceptedUri);
 
         outState.putSerializable(ReaderConstants.ARG_DIRECT_OPERATION, mDirectOperation);
@@ -563,11 +600,12 @@ public void onBackPressed() {
         if (fragment != null && fragment.isCustomViewShowing()) {
             // if full screen video is showing, hide the custom view rather than navigate back
             fragment.hideCustomView();
-        } else //noinspection StatementWithEmptyBody
-            if (fragment != null && fragment.goBackInPostHistory()) {
-            // noop - fragment moved back to a previous post
         } else {
-            super.onBackPressed();
+            if (fragment != null && fragment.goBackInPostHistory()) {
+                // noop - fragment moved back to a previous post
+            } else {
+                super.onBackPressed();
+            }
         }
     }
 
@@ -598,10 +636,18 @@ private void trackPost(long blogId, long postId) {
         // bump the page view
         ReaderPostActions.bumpPageViewForPost(mSiteStore, blogId, postId);
 
+        if (mSeenUnseenWithCounterFeatureConfig.isEnabled()) {
+            ReaderPost currentPost = ReaderPostTable.getBlogPost(blogId, postId, true);
+            if (currentPost != null) {
+                mPostSeenStatusWrapper.markPostAsSeenSilently(currentPost);
+            }
+        }
+
         // analytics tracking
-        AnalyticsUtils.trackWithReaderPostDetails(
+        mReaderTracker.trackPost(
                 AnalyticsTracker.Stat.READER_ARTICLE_OPENED,
-                ReaderPostTable.getBlogPost(blogId, postId, true));
+                mReaderPostTableWrapper.getBlogPost(blogId, postId, true)
+        );
     }
 
     /*
@@ -636,30 +682,27 @@ public void run() {
                 final int currentPosition = mViewPager.getCurrentItem();
                 final int newPosition = idList.indexOf(blogId, postId);
 
-                runOnUiThread(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (isFinishing()) {
-                            return;
-                        }
-
-                        AppLog.d(AppLog.T.READER, "reader pager > creating adapter");
-                        PostPagerAdapter adapter =
-                                new PostPagerAdapter(getSupportFragmentManager(), idList);
-                        mViewPager.setAdapter(adapter);
-                        if (adapter.isValidPosition(newPosition)) {
-                            mViewPager.setCurrentItem(newPosition);
-                            trackPostAtPositionIfNeeded(newPosition);
-                        } else if (adapter.isValidPosition(currentPosition)) {
-                            mViewPager.setCurrentItem(currentPosition);
-                            trackPostAtPositionIfNeeded(currentPosition);
-                        }
-
-                        // let the user know they can swipe between posts
-                        if (adapter.getCount() > 1 && !AppPrefs.isReaderSwipeToNavigateShown()) {
-                            WPSwipeSnackbar.show(mViewPager);
-                            AppPrefs.setReaderSwipeToNavigateShown(true);
-                        }
+                runOnUiThread(() -> {
+                    if (isFinishing()) {
+                        return;
+                    }
+
+                    AppLog.d(T.READER, "reader pager > creating adapter");
+                    PostPagerAdapter adapter =
+                            new PostPagerAdapter(getSupportFragmentManager(), idList);
+                    mViewPager.setAdapter(adapter);
+                    if (adapter.isValidPosition(newPosition)) {
+                        mViewPager.setCurrentItem(newPosition);
+                        trackPostAtPositionIfNeeded(newPosition);
+                    } else if (adapter.isValidPosition(currentPosition)) {
+                        mViewPager.setCurrentItem(currentPosition);
+                        trackPostAtPositionIfNeeded(currentPosition);
+                    }
+
+                    // let the user know they can swipe between posts
+                    if (adapter.getCount() > 1 && !AppPrefs.isReaderSwipeToNavigateShown()) {
+                        WPSwipeSnackbar.show(mViewPager);
+                        AppPrefs.setReaderSwipeToNavigateShown(true);
                     }
                 });
             }
@@ -737,6 +780,8 @@ private void requestMorePosts() {
                         mBlogId,
                         ReaderPostServiceStarter.UpdateAction.REQUEST_OLDER);
                 break;
+            case SEARCH_RESULTS:
+                break;
         }
     }
 
@@ -786,7 +831,7 @@ public void onEventMainThread(ReaderEvents.DoSignIn event) {
             return;
         }
 
-        AnalyticsUtils.trackWithInterceptedUri(AnalyticsTracker.Stat.READER_SIGN_IN_INITIATED, mInterceptedUri);
+        mReaderTracker.trackUri(AnalyticsTracker.Stat.READER_SIGN_IN_INITIATED, mInterceptedUri);
         ActivityLauncher.loginWithoutMagicLink(this);
     }
 
@@ -794,7 +839,7 @@ public void onEventMainThread(ReaderEvents.DoSignIn event) {
      * pager adapter containing post detail fragments
      **/
     private class PostPagerAdapter extends FragmentStatePagerAdapter {
-        private ReaderBlogIdPostIdList mIdList;
+        private final ReaderBlogIdPostIdList mIdList;
         private boolean mAllPostsLoaded;
 
         // this is used to retain created fragments so we can access them in
@@ -804,7 +849,7 @@ private class PostPagerAdapter extends FragmentStatePagerAdapter {
         // retain *every* fragment
         private final SparseArray<Fragment> mFragmentMap = new SparseArray<>();
 
-        PostPagerAdapter(FragmentManager fm, ReaderBlogIdPostIdList ids) {
+        @SuppressLint("WrongConstant") PostPagerAdapter(FragmentManager fm, ReaderBlogIdPostIdList ids) {
             super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
             mIdList = (ReaderBlogIdPostIdList) ids.clone();
         }
@@ -856,6 +901,7 @@ public Fragment getItem(int position) {
                     mIdList.get(position).getPostId(),
                     mDirectOperation,
                     mCommentId,
+                    mIsRelatedPostView,
                     mInterceptedUri,
                     getPostListType(),
                     mPostSlugsResolutionUnderway);
@@ -930,12 +976,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                             post,
                             site,
                             mUploadActionUseCase.getUploadAction(post),
-                            new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    UploadUtils.publishPost(ReaderPostPagerActivity.this, post, site, mDispatcher);
-                                }
-                            });
+                            v -> UploadUtils.publishPost(ReaderPostPagerActivity.this, post, site, mDispatcher));
                 }
                 break;
             case RequestCodes.DO_LOGIN:
@@ -961,6 +1002,7 @@ public void onPostUploaded(OnPostUploaded event) {
                     this,
                     findViewById(R.id.coordinator),
                     event.isError(),
+                    event.isFirstTimePublish,
                     event.post,
                     null,
                     site);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostRenderer.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostRenderer.java
index 2674dc140783..1a8c2033b426 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostRenderer.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostRenderer.java
@@ -8,7 +8,6 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.models.ReaderPost;
 import org.wordpress.android.models.ReaderPostDiscoverData;
-import org.wordpress.android.ui.reader.utils.FeaturedImageUtils;
 import org.wordpress.android.ui.reader.utils.ImageSizeMap;
 import org.wordpress.android.ui.reader.utils.ImageSizeMap.ImageSize;
 import org.wordpress.android.ui.reader.utils.ReaderEmbedScanner;
@@ -48,12 +47,10 @@ public class ReaderPostRenderer {
     private StringBuilder mRenderBuilder;
     private String mRenderedHtml;
     private ImageSizeMap mAttachmentSizes;
-    private FeaturedImageUtils mFeaturedImageUtils;
     private ReaderCssProvider mCssProvider;
 
     @SuppressLint("SetJavaScriptEnabled")
-    public ReaderPostRenderer(ReaderWebView webView, ReaderPost post, FeaturedImageUtils featuredImageUtils,
-                              ReaderCssProvider cssProvider) {
+    public ReaderPostRenderer(ReaderWebView webView, ReaderPost post, ReaderCssProvider cssProvider) {
         if (webView == null) {
             throw new IllegalArgumentException("ReaderPostRenderer requires a webView");
         }
@@ -64,7 +61,6 @@ public ReaderPostRenderer(ReaderWebView webView, ReaderPost post, FeaturedImageU
         mPost = post;
         mWeakWebView = new WeakReference<>(webView);
         mResourceVars = new ReaderResourceVars(webView.getContext());
-        mFeaturedImageUtils = featuredImageUtils;
         mCssProvider = cssProvider;
 
         mMinFullSizeWidthDp = pxToDp(mResourceVars.mFullSizeImageWidthPx / 3);
@@ -492,6 +488,10 @@ private String formatPostContentForWebView(final String content, final Set<Strin
                 "(gallery-group) ([\\s\"'])",
                 "(tiled-gallery-item) ([\\s\"'])");
         String contentCustomised = content;
+
+        // removes background-color property from original content
+        contentCustomised = contentCustomised.replaceAll("\\s*(background-color)\\s*:\\s*.+?\\s*;\\s*", "");
+
         for (String classToAmend : classAmendRegexes) {
             contentCustomised = contentCustomised.replaceAll(classToAmend, "$1 " + galleryOnlyClass + "$2");
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostWebViewCachingFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostWebViewCachingFragment.java
index 7491cca2f71f..89c214c6c53c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostWebViewCachingFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostWebViewCachingFragment.java
@@ -12,7 +12,6 @@
 
 import org.wordpress.android.datasets.ReaderPostTable;
 import org.wordpress.android.models.ReaderPost;
-import org.wordpress.android.ui.reader.utils.FeaturedImageUtils;
 import org.wordpress.android.ui.reader.views.ReaderWebView;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -34,7 +33,6 @@ public class ReaderPostWebViewCachingFragment extends DaggerFragment {
     private long mBlogId;
     private long mPostId;
 
-    @Inject FeaturedImageUtils mFeaturedImageUtils;
     @Inject ReaderCssProvider mReaderCssProvider;
 
     public static ReaderPostWebViewCachingFragment newInstance(long blogId, long postId) {
@@ -58,24 +56,29 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
         return new ReaderWebView(getActivity());
     }
 
-    @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+    @Override
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
         // check network again to detect disconnects during loading + configuration change
         if (NetworkUtils.isNetworkAvailable(view.getContext())) {
             ReaderPost post = ReaderPostTable.getBlogPost(mBlogId, mPostId, false);
-
-            ((ReaderWebView) view).setIsPrivatePost(post.isPrivate);
-            ((ReaderWebView) view).setBlogSchemeIsHttps(UrlUtils.isHttps(post.getBlogUrl()));
-            ((ReaderWebView) view).setPageFinishedListener(new ReaderWebView.ReaderWebViewPageFinishedListener() {
-                @Override public void onPageFinished(WebView view, String url) {
-                    selfRemoveFragment();
-                }
-            });
-
-            ReaderPostRenderer rendered =
-                    new ReaderPostRenderer((ReaderWebView) view, post, mFeaturedImageUtils, mReaderCssProvider);
-            rendered.beginRender(); // rendering will cache post content using native WebView implementation.
+            if (post != null) {
+                ((ReaderWebView) view).setIsPrivatePost(post.isPrivate);
+                ((ReaderWebView) view).setBlogSchemeIsHttps(UrlUtils.isHttps(post.getBlogUrl()));
+                ((ReaderWebView) view).setPageFinishedListener(new ReaderWebView.ReaderWebViewPageFinishedListener() {
+                    @Override public void onPageFinished(WebView view, String url) {
+                        selfRemoveFragment();
+                    }
+                });
+
+                ReaderPostRenderer rendered =
+                        new ReaderPostRenderer((ReaderWebView) view, post, mReaderCssProvider);
+                rendered.beginRender(); // rendering will cache post content using native WebView implementation.
+            } else {
+                // abort mission if post is not available
+                selfRemoveFragment();
+            }
         } else {
             // abort mission if no network is available
             selfRemoveFragment();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java
index 8fe0b96b61c5..4f6872273c04 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java
@@ -1,16 +1,17 @@
 package org.wordpress.android.ui.reader;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.view.KeyEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.webkit.URLUtil;
 import android.widget.EditText;
 import android.widget.ProgressBar;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
@@ -20,6 +21,7 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.elevation.ElevationOverlayProvider;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 import com.google.android.material.tabs.TabLayout;
 
@@ -35,6 +37,7 @@
 import org.wordpress.android.models.ReaderTag;
 import org.wordpress.android.models.ReaderTagType;
 import org.wordpress.android.ui.LocaleAwareActivity;
+import org.wordpress.android.ui.RequestCodes;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions;
@@ -43,6 +46,7 @@
 import org.wordpress.android.ui.reader.adapters.ReaderTagAdapter;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask;
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.ui.reader.views.ReaderFollowButton;
 import org.wordpress.android.util.AppLog;
@@ -54,7 +58,6 @@
 
 import java.util.ArrayList;
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -66,6 +69,7 @@
 public class ReaderSubsActivity extends LocaleAwareActivity
         implements ReaderTagAdapter.TagDeletedListener {
     private EditText mEditAdd;
+    private FloatingActionButton mFabButton;
     private ReaderFollowButton mBtnAdd;
     private WPViewPager mViewPager;
     private SubsPageAdapter mPageAdapter;
@@ -81,6 +85,7 @@ public class ReaderSubsActivity extends LocaleAwareActivity
     public static final int TAB_IDX_FOLLOWED_BLOGS = 1;
 
     @Inject AccountStore mAccountStore;
+    @Inject ReaderTracker mReaderTracker;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -90,23 +95,18 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.reader_activity_subs);
         restoreState(savedInstanceState);
 
-        mViewPager = (WPViewPager) findViewById(R.id.viewpager);
+        mViewPager = findViewById(R.id.viewpager);
         mViewPager.setOffscreenPageLimit(NUM_TABS - 1);
         mViewPager.setAdapter(getPageAdapter());
 
-        TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout);
+        TabLayout tabLayout = findViewById(R.id.tab_layout);
         tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
         tabLayout.setupWithViewPager(mViewPager);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_main);
+        Toolbar toolbar = findViewById(R.id.toolbar_main);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
-            toolbar.setNavigationOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    onBackPressed();
-                }
-            });
+            toolbar.setNavigationOnClickListener(v -> onBackPressed());
         }
 
         ActionBar actionBar = getSupportActionBar();
@@ -124,24 +124,19 @@ public void onClick(View v) {
 
         bottomBar.setBackgroundColor(elevatedColor);
 
-        mEditAdd = (EditText) findViewById(R.id.edit_add);
-        mEditAdd.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-                if (actionId == EditorInfo.IME_ACTION_DONE) {
-                    addCurrentEntry();
-                }
-                return false;
+        mEditAdd = findViewById(R.id.edit_add);
+        mEditAdd.setOnEditorActionListener((v, actionId, event) -> {
+            if (actionId == EditorInfo.IME_ACTION_DONE) {
+                addCurrentEntry();
             }
+            return false;
         });
 
+        mFabButton = findViewById(R.id.fab_button);
+        mFabButton.setOnClickListener(view -> ReaderActivityLauncher.showReaderInterests(this));
+
         mBtnAdd = findViewById(R.id.btn_add);
-        mBtnAdd.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                addCurrentEntry();
-            }
-        });
+        mBtnAdd.setOnClickListener(v -> addCurrentEntry());
 
         if (savedInstanceState == null) {
             // return to the page the user was on the last time they viewed this activity
@@ -332,25 +327,25 @@ private void performAddTag(final String tagName) {
         showProgress();
         final ReaderTag tag = ReaderUtils.createTagFromTagName(tagName, ReaderTagType.FOLLOWED);
 
-        ReaderActions.ActionListener actionListener = new ReaderActions.ActionListener() {
-            @Override
-            public void onActionResult(boolean succeeded) {
-                if (isFinishing()) {
-                    return;
-                }
+        ReaderActions.ActionListener actionListener = succeeded -> {
+            if (isFinishing()) {
+                return;
+            }
 
-                hideProgress();
-                getPageAdapter().refreshFollowedTagFragment();
-
-                if (succeeded) {
-                    showInfoSnackbar(getString(R.string.reader_label_added_tag, tag.getLabel()));
-                    mLastAddedTagName = tag.getTagSlug();
-                    AnalyticsTracker.track(AnalyticsTracker.Stat.READER_TAG_FOLLOWED,
-                            new HashMap<String, String>() { { put("tag", mLastAddedTagName); }});
-                } else {
-                    showInfoSnackbar(getString(R.string.reader_toast_err_add_tag));
-                    mLastAddedTagName = null;
-                }
+            hideProgress();
+            getPageAdapter().refreshFollowedTagFragment();
+
+            if (succeeded) {
+                showInfoSnackbar(getString(R.string.reader_label_added_tag, tag.getLabel()));
+                mLastAddedTagName = tag.getTagSlug();
+                mReaderTracker.trackTag(
+                        AnalyticsTracker.Stat.READER_TAG_FOLLOWED,
+                        mLastAddedTagName,
+                        ReaderTracker.SOURCE_SETTINGS
+                );
+            } else {
+                showInfoSnackbar(getString(R.string.reader_toast_err_add_tag));
+                mLastAddedTagName = null;
             }
         };
 
@@ -370,9 +365,9 @@ private void performAddUrl(final String blogUrl) {
 
         showProgress();
 
-        ReaderActions.OnRequestListener requestListener = new ReaderActions.OnRequestListener() {
+        ReaderActions.OnRequestListener<Void> requestListener = new ReaderActions.OnRequestListener<Void>() {
             @Override
-            public void onSuccess() {
+            public void onSuccess(Void result) {
                 if (!isFinishing()) {
                     followBlogUrl(blogUrl);
                 }
@@ -392,8 +387,7 @@ public void onFailure(int statusCode) {
                             errMsg = getString(R.string.reader_toast_err_follow_blog_not_found);
                             break;
                         default:
-                            errMsg = getString(R.string.reader_toast_err_follow_blog) + " (" + Integer
-                                    .toString(statusCode) + ")";
+                            errMsg = getString(R.string.reader_toast_err_follow_blog) + " (" + statusCode + ")";
                             break;
                     }
                     showInfoSnackbar(errMsg);
@@ -404,35 +398,41 @@ public void onFailure(int statusCode) {
     }
 
     private void followBlogUrl(String normUrl) {
-        ReaderActions.ActionListener followListener = new ReaderActions.ActionListener() {
-            @Override
-            public void onActionResult(boolean succeeded) {
-                if (isFinishing()) {
-                    return;
-                }
-                hideProgress();
-                if (succeeded) {
-                    // clear the edit text and hide the soft keyboard
-                    mEditAdd.setText(null);
-                    EditTextUtils.hideSoftInput(mEditAdd);
-                    showInfoSnackbar(getString(R.string.reader_label_followed_blog));
-                    getPageAdapter().refreshBlogFragments(ReaderBlogType.FOLLOWED);
-                } else {
-                    showInfoSnackbar(getString(R.string.reader_toast_err_follow_blog));
-                }
+        ReaderActions.ActionListener followListener = succeeded -> {
+            if (isFinishing()) {
+                return;
+            }
+            hideProgress();
+            if (succeeded) {
+                // clear the edit text and hide the soft keyboard
+                mEditAdd.setText(null);
+                EditTextUtils.hideSoftInput(mEditAdd);
+                showInfoSnackbar(getString(R.string.reader_label_followed_blog));
+                getPageAdapter().refreshBlogFragments(ReaderBlogType.FOLLOWED);
+                // update tags if the site we added belongs to a tag we don't yet have
+                // also update followed blogs so lists are ready in case we need to present them
+                // in bottom sheet reader filtering
+                performUpdate(EnumSet.of(UpdateTask.TAGS, UpdateTask.FOLLOWED_BLOGS));
+            } else {
+                showInfoSnackbar(getString(R.string.reader_toast_err_follow_blog));
             }
         };
         // note that this uses the endpoint to follow as a feed since typed URLs are more
         // likely to point to a feed than a wp blog (and the endpoint should internally
         // follow it as a blog if it is one)
-        ReaderBlogActions.followFeedByUrl(normUrl, followListener);
+        ReaderBlogActions.followFeedByUrl(
+                normUrl,
+                followListener,
+                ReaderTracker.SOURCE_SETTINGS,
+                mReaderTracker
+        );
     }
 
     /*
      * called prior to following to show progress and disable controls
      */
     private void showProgress() {
-        final ProgressBar progress = (ProgressBar) findViewById(R.id.progress_follow);
+        final ProgressBar progress = findViewById(R.id.progress_follow);
         progress.setVisibility(View.VISIBLE);
         mEditAdd.setEnabled(false);
         mBtnAdd.setEnabled(false);
@@ -442,7 +442,7 @@ private void showProgress() {
      * called after following to hide progress and re-enable controls
      */
     private void hideProgress() {
-        final ProgressBar progress = (ProgressBar) findViewById(R.id.progress_follow);
+        final ProgressBar progress = findViewById(R.id.progress_follow);
         progress.setVisibility(View.GONE);
         mEditAdd.setEnabled(true);
         mBtnAdd.setEnabled(true);
@@ -454,7 +454,7 @@ private void hideProgress() {
     private void showInfoSnackbar(String text) {
         View bottomView = findViewById(R.id.layout_bottom);
 
-        WPSnackbar snackbar = WPSnackbar.make(bottomView, text, Snackbar.LENGTH_LONG);
+        Snackbar snackbar = WPSnackbar.make(bottomView, text, Snackbar.LENGTH_LONG);
         snackbar.setAnchorView(bottomView);
         snackbar.show();
     }
@@ -465,8 +465,11 @@ private void showInfoSnackbar(String text) {
      */
     @Override
     public void onTagDeleted(ReaderTag tag) {
-        AnalyticsTracker.track(AnalyticsTracker.Stat.READER_TAG_UNFOLLOWED,
-                new HashMap<String, String>() { { put("tag", tag.getTagSlug()); }});
+        mReaderTracker.trackTag(
+                AnalyticsTracker.Stat.READER_TAG_UNFOLLOWED,
+                tag.getTagSlug(),
+                ReaderTracker.SOURCE_SETTINGS
+        );
         if (mLastAddedTagName != null && mLastAddedTagName.equalsIgnoreCase(tag.getTagSlug())) {
             mLastAddedTagName = null;
         }
@@ -505,6 +508,14 @@ private void restorePreviousPage() {
         }
     }
 
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == RequestCodes.READER_INTERESTS) {
+            performUpdate(EnumSet.of(UpdateTask.TAGS));
+        }
+    }
+
     private class SubsPageAdapter extends FragmentPagerAdapter {
         private final List<Fragment> mFragments;
 
@@ -535,6 +546,13 @@ public int getCount() {
             return mFragments.size();
         }
 
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            Object ret = super.instantiateItem(container, position);
+            mFragments.set(position, (Fragment) ret);
+            return ret;
+        }
+
         private void refreshFollowedTagFragment() {
             for (Fragment fragment : mFragments) {
                 if (fragment instanceof ReaderTagFragment) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTypes.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTypes.java
index e7abe388eea7..28376be451dd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTypes.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderTypes.java
@@ -1,17 +1,28 @@
 package org.wordpress.android.ui.reader;
 
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 
 public class ReaderTypes {
     public static final ReaderPostListType DEFAULT_POST_LIST_TYPE = ReaderPostListType.TAG_FOLLOWED;
 
     public enum ReaderPostListType {
-        TAG_FOLLOWED, // list posts in a followed tag
-        TAG_PREVIEW, // list posts in a specific tag
-        BLOG_PREVIEW, // list posts in a specific blog/feed
-        SEARCH_RESULTS; // list posts matching a specific search keyword or phrase
+        TAG_FOLLOWED(ReaderTracker.SOURCE_FOLLOWING), // list posts in a followed tag
+        TAG_PREVIEW(ReaderTracker.SOURCE_TAG_PREVIEW), // list posts in a specific tag
+        BLOG_PREVIEW(ReaderTracker.SOURCE_SITE_PREVIEW), // list posts in a specific blog/feed
+        SEARCH_RESULTS(ReaderTracker.SOURCE_SEARCH); // list posts matching a specific search keyword or phrase
+
+        private final String mSource;
+
+        ReaderPostListType(String source) {
+            mSource = source;
+        }
 
         public boolean isTagType() {
             return this.equals(TAG_FOLLOWED) || this.equals(TAG_PREVIEW);
         }
+
+        public String getSource() {
+            return mSource;
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java
index e0e8a3f94acf..e7f47bf31dca 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderUserListActivity.java
@@ -13,6 +13,7 @@
 import org.wordpress.android.datasets.ReaderCommentTable;
 import org.wordpress.android.datasets.ReaderPostTable;
 import org.wordpress.android.datasets.ReaderUserTable;
+import org.wordpress.android.models.ReaderPost;
 import org.wordpress.android.models.ReaderUserList;
 import org.wordpress.android.ui.LocaleAwareActivity;
 import org.wordpress.android.ui.reader.adapters.ReaderUserAdapter;
@@ -37,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.reader_activity_userlist);
         setTitle(null);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_main);
+        Toolbar toolbar = findViewById(R.id.toolbar_main);
         if (toolbar != null) {
             setSupportActionBar(toolbar);
             toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@@ -60,7 +61,7 @@ public void onClick(View v) {
 
         int spacingHorizontal = 0;
         int spacingVertical = DisplayUtils.dpToPx(this, 1);
-        mRecyclerView = (ReaderRecyclerView) findViewById(R.id.recycler_view);
+        mRecyclerView = findViewById(R.id.recycler_view);
         mRecyclerView.addItemDecoration(new RecyclerItemDecoration(spacingHorizontal, spacingVertical));
 
         mAppBarLayout = findViewById(R.id.appbar_main);
@@ -126,6 +127,10 @@ public void run() {
                     public void run() {
                         if (!isFinishing()) {
                             setTitle(title);
+                            ReaderPost post = ReaderPostTable.getBlogPost(blogId, postId, true);
+                            if (post != null) {
+                                getAdapter().setIsFollowed(post.isFollowedByCurrentUser);
+                            }
                             getAdapter().setUsers(users);
                         }
                     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java
index 979c045357ac..49437736da92 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderVideoViewerActivity.java
@@ -3,7 +3,6 @@
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.widget.ProgressBar;
 
@@ -12,6 +11,7 @@
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.ui.LocaleAwareActivity;
+import org.wordpress.android.util.helpers.WebChromeClientWithVideoPoster;
 
 /**
  * Full screen landscape video player for the reader
@@ -33,7 +33,7 @@ public void onCreate(Bundle savedInstanceState) {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setUserAgentString(WordPress.getUserAgent());
 
-        mWebView.setWebChromeClient(new WebChromeClient() {
+        mWebView.setWebChromeClient(new WebChromeClientWithVideoPoster(mWebView, R.drawable.media_movieclip) {
             public void onProgressChanged(WebView view, int progress) {
                 if (progress == 100) {
                     mProgress.setVisibility(View.GONE);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/SubfilterBottomSheetFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/SubfilterBottomSheetFragment.kt
index 4a80933d7b69..552932c5b588 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/SubfilterBottomSheetFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/SubfilterBottomSheetFragment.kt
@@ -7,9 +7,10 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
+import android.widget.TextView
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelStoreOwner
 import androidx.viewpager.widget.ViewPager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
@@ -18,6 +19,7 @@ import com.google.android.material.tabs.TabLayout
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.reader.subfilter.SubFilterViewModel
+import org.wordpress.android.ui.reader.subfilter.SubfilterCategory
 import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.SITES
 import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.TAGS
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Tag
@@ -28,6 +30,28 @@ class SubfilterBottomSheetFragment : BottomSheetDialogFragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: SubFilterViewModel
 
+    companion object {
+        const val SUBFILTER_VIEW_MODEL_KEY = "subfilter_view_model_key"
+        const val SUBFILTER_TITLE_KEY = "subfilter_title_key"
+        const val SUBFILTER_CATEGORIES_KEY = "subfilter_categories_key"
+
+        @JvmStatic
+        fun newInstance(
+            subfilterViewModelKey: String,
+            categories: List<SubfilterCategory>,
+            title: CharSequence
+        ): SubfilterBottomSheetFragment {
+            val fragment = SubfilterBottomSheetFragment()
+            val bundle = Bundle()
+            bundle.putString(SUBFILTER_VIEW_MODEL_KEY, subfilterViewModelKey)
+            bundle.putCharSequence(SUBFILTER_TITLE_KEY, title)
+            bundle.putParcelableArrayList(SUBFILTER_CATEGORIES_KEY, ArrayList(categories))
+
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -39,12 +63,24 @@ class SubfilterBottomSheetFragment : BottomSheetDialogFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
-                .get(SubFilterViewModel::class.java)
+        val subfilterVmKey = requireArguments().getString(SUBFILTER_VIEW_MODEL_KEY)!!
+        val bottomSheetTitle = requireArguments().getCharSequence(SUBFILTER_TITLE_KEY)!!
+        val categories: ArrayList<SubfilterCategory> = requireArguments()
+                .getParcelableArrayList(SUBFILTER_CATEGORIES_KEY)!!
+
+        viewModel = ViewModelProvider(parentFragment as ViewModelStoreOwner, viewModelFactory)
+                .get(subfilterVmKey, SubFilterViewModel::class.java)
 
         val pager = view.findViewById<ViewPager>(R.id.view_pager)
         val tabLayout = view.findViewById<TabLayout>(R.id.tab_layout)
-        pager.adapter = SubfilterPagerAdapter(requireActivity(), childFragmentManager)
+        val title = view.findViewById<TextView>(R.id.title)
+        title.text = bottomSheetTitle
+        pager.adapter = SubfilterPagerAdapter(
+                requireActivity(),
+                childFragmentManager,
+                subfilterVmKey,
+                categories.toList()
+        )
         tabLayout.setupWithViewPager(pager)
         pager.currentItem = when (viewModel.getCurrentSubfilterValue()) {
             is Tag -> TAGS.ordinal
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderActions.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderActions.java
index f9119ea64e5f..1fb8c3713e39 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderActions.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderActions.java
@@ -1,5 +1,7 @@
 package org.wordpress.android.ui.reader.actions;
 
+import androidx.annotation.Nullable;
+
 import org.wordpress.android.models.ReaderBlog;
 import org.wordpress.android.models.ReaderComment;
 
@@ -44,8 +46,8 @@ public static void callActionListener(ActionListener actionListener, boolean suc
     /*
      * listener when the failure status code is required
      */
-    public interface OnRequestListener {
-        void onSuccess();
+    public interface OnRequestListener<T> {
+        void onSuccess(@Nullable T result);
 
         void onFailure(int statusCode);
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActions.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActions.java
index 0d28a8dd0b5d..ada82097f483 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActions.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActions.java
@@ -21,12 +21,12 @@
 import org.wordpress.android.models.ReaderTagType;
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener;
 import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateBlogInfoListener;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.UrlUtils;
 import org.wordpress.android.util.VolleyUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
 
 import java.net.HttpURLConnection;
 import java.util.Map;
@@ -34,6 +34,7 @@
 public class ReaderBlogActions {
     public static class BlockedBlogResult {
         public long blogId;
+        public long feedId;
         // Key: Pair<ReaderTagSlug, ReaderTagType>, Value: ReaderPostList
         public Map<Pair<String, ReaderTagType>, ReaderPostList> deletedRows;
         public boolean wasFollowing;
@@ -44,8 +45,11 @@ private static String jsonToString(JSONObject json) {
     }
 
     public static boolean followBlogById(final long blogId,
+                                         final long feedId,
                                          final boolean isAskingToFollow,
-                                         final ActionListener actionListener) {
+                                         final ActionListener actionListener,
+                                         final String source,
+                                         final ReaderTracker readerTracker) {
         if (blogId == 0) {
             ReaderActions.callActionListener(actionListener, false);
             return false;
@@ -55,9 +59,19 @@ public static boolean followBlogById(final long blogId,
         ReaderPostTable.setFollowStatusForPostsInBlog(blogId, isAskingToFollow);
 
         if (isAskingToFollow) {
-            AnalyticsUtils.trackWithSiteId(AnalyticsTracker.Stat.READER_BLOG_FOLLOWED, blogId);
+            readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.READER_BLOG_FOLLOWED,
+                    blogId,
+                    feedId,
+                    source
+            );
         } else {
-            AnalyticsUtils.trackWithSiteId(AnalyticsTracker.Stat.READER_BLOG_UNFOLLOWED, blogId);
+            readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.READER_BLOG_UNFOLLOWED,
+                    blogId,
+                    feedId,
+                    source
+            );
         }
 
         final String actionName = (isAskingToFollow ? "follow" : "unfollow");
@@ -125,12 +139,23 @@ public void onErrorResponse(VolleyError error) {
         WordPress.getRestClientUtilsV1_1().post(path, listener, errorListener);
     }
 
-    public static boolean followFeedById(final long feedId,
+    public static boolean followFeedById(@SuppressWarnings("unused") final long blogId,
+                                         final long feedId,
                                          final boolean isAskingToFollow,
-                                         final ActionListener actionListener) {
+                                         final ActionListener actionListener,
+                                         final String source,
+                                         final ReaderTracker readerTracker) {
         ReaderBlog blogInfo = ReaderBlogTable.getFeedInfo(feedId);
         if (blogInfo != null) {
-            return internalFollowFeed(blogInfo.feedId, blogInfo.getFeedUrl(), isAskingToFollow, actionListener);
+            return internalFollowFeed(
+                    blogInfo.blogId,
+                    blogInfo.feedId,
+                    blogInfo.getFeedUrl(),
+                    isAskingToFollow,
+                    actionListener,
+                    source,
+                    readerTracker
+            );
         }
 
         updateFeedInfo(feedId, null, new UpdateBlogInfoListener() {
@@ -138,10 +163,14 @@ public static boolean followFeedById(final long feedId,
             public void onResult(ReaderBlog blogInfo) {
                 if (blogInfo != null) {
                     internalFollowFeed(
+                            blogInfo.blogId,
                             blogInfo.feedId,
                             blogInfo.getFeedUrl(),
                             isAskingToFollow,
-                            actionListener);
+                            actionListener,
+                            source,
+                            readerTracker
+                    );
                 } else {
                     ReaderActions.callActionListener(actionListener, false);
                 }
@@ -152,7 +181,9 @@ public void onResult(ReaderBlog blogInfo) {
     }
 
     public static void followFeedByUrl(final String feedUrl,
-                                       final ActionListener actionListener) {
+                                       final ActionListener actionListener,
+                                       final String source,
+                                       final ReaderTracker readerTracker) {
         if (TextUtils.isEmpty(feedUrl)) {
             ReaderActions.callActionListener(actionListener, false);
             return;
@@ -161,7 +192,15 @@ public static void followFeedByUrl(final String feedUrl,
         // use existing blog info if we can
         ReaderBlog blogInfo = ReaderBlogTable.getFeedInfo(ReaderBlogTable.getFeedIdFromUrl(feedUrl));
         if (blogInfo != null) {
-            internalFollowFeed(blogInfo.feedId, blogInfo.getFeedUrl(), true, actionListener);
+            internalFollowFeed(
+                    blogInfo.blogId,
+                    blogInfo.feedId,
+                    blogInfo.getFeedUrl(),
+                    true,
+                    actionListener,
+                    source,
+                    readerTracker
+            );
             return;
         }
 
@@ -171,22 +210,31 @@ public static void followFeedByUrl(final String feedUrl,
             public void onResult(ReaderBlog blogInfo) {
                 // note we attempt to follow even when the look up fails (blogInfo = null) because that
                 // endpoint doesn't perform feed discovery, whereas the endpoint to follow a feed does
+                long blogIdToFollow = blogInfo != null ? blogInfo.blogId : 0;
                 long feedIdToFollow = blogInfo != null ? blogInfo.feedId : 0;
                 String feedUrlToFollow = (blogInfo != null && blogInfo.hasFeedUrl()) ? blogInfo.getFeedUrl() : feedUrl;
                 internalFollowFeed(
+                        blogIdToFollow,
                         feedIdToFollow,
                         feedUrlToFollow,
                         true,
-                        actionListener);
+                        actionListener,
+                        source,
+                        readerTracker
+                );
             }
         });
     }
 
     private static boolean internalFollowFeed(
+            final long blogId,
             final long feedId,
             final String feedUrl,
             final boolean isAskingToFollow,
-            final ActionListener actionListener) {
+            final ActionListener actionListener,
+            final String source,
+            final ReaderTracker readerTracker
+    ) {
         // feedUrl is required
         if (TextUtils.isEmpty(feedUrl)) {
             ReaderActions.callActionListener(actionListener, false);
@@ -199,9 +247,19 @@ private static boolean internalFollowFeed(
         }
 
         if (isAskingToFollow) {
-            AnalyticsTracker.track(AnalyticsTracker.Stat.READER_BLOG_FOLLOWED);
+            readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.READER_BLOG_FOLLOWED,
+                    blogId,
+                    feedId,
+                    source
+            );
         } else {
-            AnalyticsTracker.track(AnalyticsTracker.Stat.READER_BLOG_UNFOLLOWED);
+            readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.READER_BLOG_UNFOLLOWED,
+                    blogId,
+                    feedId,
+                    source
+            );
         }
 
         final String actionName = (isAskingToFollow ? "follow" : "unfollow");
@@ -242,11 +300,13 @@ public void onErrorResponse(VolleyError volleyError) {
     public static boolean followBlog(final Long blogId,
                                      final Long feedId,
                                      boolean isAskingToFollow,
-                                     ActionListener actionListener) {
+                                     ActionListener actionListener,
+                                     final String source,
+                                     ReaderTracker readerTracker) {
         if (ReaderUtils.isExternalFeed(blogId, feedId)) {
-            return followFeedById(feedId, isAskingToFollow, actionListener);
+            return followFeedById(blogId, feedId, isAskingToFollow, actionListener, source, readerTracker);
         } else {
-            return followBlogById(blogId, isAskingToFollow, actionListener);
+            return followBlogById(blogId, feedId, isAskingToFollow, actionListener, source, readerTracker);
         }
     }
 
@@ -394,7 +454,7 @@ private static void handleUpdateBlogInfoResponse(JSONObject jsonObject, UpdateBl
      * account for 404 replacement pages used by ISPs such as Charter
      */
     public static void checkUrlReachable(final String blogUrl,
-                                         final ReaderActions.OnRequestListener requestListener) {
+                                         final ReaderActions.OnRequestListener<Void> requestListener) {
         // listener is required
         if (requestListener == null) {
             return;
@@ -403,7 +463,7 @@ public static void checkUrlReachable(final String blogUrl,
         Response.Listener<String> listener = new Response.Listener<String>() {
             @Override
             public void onResponse(String response) {
-                requestListener.onSuccess();
+                requestListener.onSuccess(null);
             }
         };
         Response.ErrorListener errorListener = new Response.ErrorListener() {
@@ -421,7 +481,7 @@ public void onErrorResponse(VolleyError volleyError) {
                 // Volley treats a 301 redirect as a failure here, we should treat it as
                 // success since it means the blog url is reachable
                 if (statusCode == 301) {
-                    requestListener.onSuccess();
+                    requestListener.onSuccess(null);
                 } else {
                     requestListener.onFailure(statusCode);
                 }
@@ -438,9 +498,10 @@ public void onErrorResponse(VolleyError volleyError) {
         WordPress.sRequestQueue.add(request);
     }
 
-    public static BlockedBlogResult blockBlogFromReaderLocal(final long blogId) {
+    public static BlockedBlogResult blockBlogFromReaderLocal(final long blogId, final long feedId) {
         final BlockedBlogResult blockResult = new BlockedBlogResult();
         blockResult.blogId = blogId;
+        blockResult.feedId = feedId;
         blockResult.deletedRows = ReaderPostTable.getTagPostMap(blogId);
         blockResult.wasFollowing = ReaderBlogTable.isFollowedBlog(blogId);
 
@@ -473,11 +534,13 @@ public void onErrorResponse(VolleyError volleyError) {
         };
 
         AppLog.i(T.READER, "blocking blog " + blockResult.blogId);
-        String path = "me/block/sites/" + Long.toString(blockResult.blogId) + "/new";
+        String path = "me/block/sites/" + blockResult.blogId + "/new";
         WordPress.getRestClientUtilsV1_1().post(path, listener, errorListener);
     }
 
-    public static void undoBlockBlogFromReader(final BlockedBlogResult blockResult) {
+    public static void undoBlockBlogFromReader(final BlockedBlogResult blockResult,
+                                               final String source,
+                                               final ReaderTracker readerTracker) {
         if (blockResult == null) {
             return;
         }
@@ -489,7 +552,14 @@ public void onResponse(JSONObject jsonObject) {
                 boolean success = (jsonObject != null && jsonObject.optBoolean("success"));
                 // re-follow the blog if it was being followed prior to the block
                 if (success && blockResult.wasFollowing) {
-                    followBlogById(blockResult.blogId, true, null);
+                    followBlogById(
+                            blockResult.blogId,
+                            blockResult.feedId,
+                            true,
+                            null,
+                            source,
+                            readerTracker
+                    );
                 } else if (!success) {
                     AppLog.w(T.READER, "failed to unblock blog " + blockResult.blogId);
                 }
@@ -503,7 +573,7 @@ public void onErrorResponse(VolleyError volleyError) {
         };
 
         AppLog.i(T.READER, "unblocking blog " + blockResult.blogId);
-        String path = "me/block/sites/" + Long.toString(blockResult.blogId) + "/delete";
+        String path = "me/block/sites/" + blockResult.blogId + "/delete";
         WordPress.getRestClientUtilsV1_1().post(path, listener, errorListener);
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActionsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActionsWrapper.kt
index 24d8dab356f6..3286eed2ac3f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActionsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderBlogActionsWrapper.kt
@@ -1,17 +1,47 @@
 package org.wordpress.android.ui.reader.actions
 
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener
+import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateBlogInfoListener
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions.BlockedBlogResult
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import javax.inject.Inject
 
-class ReaderBlogActionsWrapper @Inject constructor() {
-    fun blockBlogFromReaderLocal(blogId: Long): BlockedBlogResult = ReaderBlogActions.blockBlogFromReaderLocal(blogId)
+class ReaderBlogActionsWrapper @Inject constructor(
+    private val readerUtilsWrapper: ReaderUtilsWrapper
+) {
+    fun blockBlogFromReaderLocal(
+        blogId: Long,
+        feedId: Long
+    ): BlockedBlogResult = ReaderBlogActions.blockBlogFromReaderLocal(
+            blogId,
+            feedId
+    )
 
     fun blockBlogFromReaderRemote(blockedBlogResult: BlockedBlogResult, actionListener: ActionListener?): Unit =
             ReaderBlogActions.blockBlogFromReaderRemote(blockedBlogResult, actionListener)
 
-    fun undoBlockBlogFromReader(blocked: BlockedBlogResult) = ReaderBlogActions.undoBlockBlogFromReader(blocked)
+    @Suppress("LongParameterList")
+    fun followBlog(
+        blogId: Long,
+        feedId: Long,
+        isAskingToFollow: Boolean,
+        actionListener: ActionListener,
+        source: String,
+        readerTracker: ReaderTracker
+    ) = ReaderBlogActions.followBlog(
+            blogId,
+            feedId,
+            isAskingToFollow,
+            actionListener,
+            source,
+            readerTracker
+    )
 
-    fun followBlog(blogId: Long, feedId: Long, isAskingToFollow: Boolean, actionListener: ActionListener) =
-            ReaderBlogActions.followBlog(blogId, feedId, isAskingToFollow, actionListener)
+    fun updateBlogInfo(blogId: Long, feedId: Long, blogUrl: String?, infoListener: UpdateBlogInfoListener) =
+            if (readerUtilsWrapper.isExternalFeed(blogId, feedId)) {
+                ReaderBlogActions.updateFeedInfo(blogId, blogUrl, infoListener)
+            } else {
+                ReaderBlogActions.updateBlogInfo(blogId, blogUrl, infoListener)
+            }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java
index 99de1acafd96..0a87285e19b7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActions.java
@@ -272,7 +272,7 @@ public static void requestBlogPost(final long blogId,
      * similar to updatePost, but used when post doesn't already exist in local db
      **/
     public static void requestFeedPost(final long feedId, final long feedItemId,
-                                       final ReaderActions.OnRequestListener requestListener) {
+                                       final ReaderActions.OnRequestListener<String> requestListener) {
         String path = "read/feed/" + feedId + "/posts/" + feedItemId + "/?meta=site,likes";
         requestPost(WordPress.getRestClientUtilsV1_3(), path, requestListener);
     }
@@ -282,13 +282,13 @@ public static void requestFeedPost(final long feedId, final long feedItemId,
      **/
     public static void requestBlogPost(final String blogSlug,
                                        final String postSlug,
-                                       final ReaderActions.OnRequestListener requestListener) {
+                                       final ReaderActions.OnRequestListener<String> requestListener) {
         String path = "sites/" + blogSlug + "/posts/slug:" + postSlug + "/?meta=site,likes";
         requestPost(WordPress.getRestClientUtilsV1_1(), path, requestListener);
     }
 
     private static void requestPost(RestClientUtils restClientUtils, String path, final ReaderActions
-            .OnRequestListener requestListener) {
+            .OnRequestListener<String> requestListener) {
         com.wordpress.rest.RestRequest.Listener listener = new RestRequest.Listener() {
             @Override
             public void onResponse(JSONObject jsonObject) {
@@ -296,7 +296,7 @@ public void onResponse(JSONObject jsonObject) {
                 ReaderPostTable.addPost(post);
                 handlePostLikes(post, jsonObject);
                 if (requestListener != null) {
-                    requestListener.onSuccess();
+                    requestListener.onSuccess(post.getBlogUrl());
                 }
             }
         };
@@ -403,6 +403,13 @@ public void onResponse(JSONObject jsonObject) {
             public void onErrorResponse(VolleyError volleyError) {
                 AppLog.w(T.READER, "updateRelatedPosts failed");
                 AppLog.e(T.READER, volleyError);
+                EventBus.getDefault().post(new ReaderEvents.RelatedPostsUpdated(
+                        sourcePost,
+                        new ReaderSimplePostList(),
+                        new ReaderSimplePostList(),
+                        false
+                    )
+                );
             }
         };
 
@@ -438,7 +445,7 @@ public void run() {
                         }
                     }
                     EventBus.getDefault().post(new ReaderEvents.RelatedPostsUpdated(sourcePost, localRelatedPosts,
-                                                                                    globalRelatedPosts));
+                                                                                    globalRelatedPosts, true));
                 }
             }
         }.start();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActionsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActionsWrapper.kt
index a020111b130a..50507015f6d1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActionsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/actions/ReaderPostActionsWrapper.kt
@@ -23,4 +23,18 @@ class ReaderPostActionsWrapper @Inject constructor(private val siteStore: SiteSt
     ) = ReaderPostActions.performLikeActionRemote(post, isAskingToLike, wpComUserId, actionListener)
 
     fun bumpPageViewForPost(post: ReaderPost) = ReaderPostActions.bumpPageViewForPost(siteStore, post)
+
+    fun requestRelatedPosts(sourcePost: ReaderPost) = ReaderPostActions.requestRelatedPosts(sourcePost)
+
+    fun requestFeedPost(
+        feedId: Long,
+        postId: Long,
+        requestListener: ReaderActions.OnRequestListener<String>
+    ) = ReaderPostActions.requestFeedPost(feedId, postId, requestListener)
+
+    fun requestBlogPost(
+        blogId: Long,
+        postId: Long,
+        requestListener: ReaderActions.OnRequestListener<String>
+    ) = ReaderPostActions.requestBlogPost(blogId, postId, requestListener)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderBlogAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderBlogAdapter.java
index 3d625cf95770..a8208ecd5b8b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderBlogAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderBlogAdapter.java
@@ -19,6 +19,9 @@
 import org.wordpress.android.ui.reader.ReaderInterfaces;
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener;
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions;
+import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask;
+import org.wordpress.android.ui.reader.services.update.ReaderUpdateServiceStarter;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.views.ReaderFollowButton;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -31,6 +34,7 @@
 
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.EnumSet;
 import java.util.Locale;
 
 import javax.inject.Inject;
@@ -58,15 +62,23 @@ public interface BlogClickListener {
     private ReaderBlogList mFollowedBlogs = new ReaderBlogList();
 
     private String mSearchFilter;
+    private final String mSource;
 
     @Inject protected ImageManager mImageManager;
-
-    public ReaderBlogAdapter(Context context, ReaderBlogType blogType, String searchFilter) {
+    @Inject ReaderTracker mReaderTracker;
+
+    public ReaderBlogAdapter(
+            Context context,
+            ReaderBlogType blogType,
+            String searchFilter,
+            String source
+    ) {
         super();
         ((WordPress) context.getApplicationContext()).component().inject(this);
         setHasStableIds(false);
         mBlogType = blogType;
         mSearchFilter = searchFilter;
+        mSource = source;
     }
 
     public void setDataLoadedListener(ReaderInterfaces.DataLoadedListener listener) {
@@ -217,15 +229,31 @@ private void toggleFollow(Context context, ReaderFollowButton followButton, Read
                 ToastUtils.showToast(context, errResId);
                 followButton.setIsFollowed(!isAskingToFollow);
                 blog.isFollowing = !isAskingToFollow;
+            } else {
+                ReaderUpdateServiceStarter.startService(followButton.getContext(), EnumSet.of(UpdateTask.TAGS));
             }
         };
 
         final boolean result;
 
         if (blog.feedId != 0) {
-            result = ReaderBlogActions.followFeedById(blog.feedId, isAskingToFollow, listener);
+            result = ReaderBlogActions.followFeedById(
+                    blog.blogId,
+                    blog.feedId,
+                    isAskingToFollow,
+                    listener,
+                    mSource,
+                    mReaderTracker
+            );
         } else {
-            result = ReaderBlogActions.followBlogById(blog.blogId, isAskingToFollow, listener);
+            result = ReaderBlogActions.followBlogById(
+                    blog.blogId,
+                    blog.feedId,
+                    isAskingToFollow,
+                    listener,
+                    mSource,
+                    mReaderTracker
+            );
         }
 
         if (result) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java
index 215f77ca6076..3c0c7b6f1cbf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java
@@ -24,11 +24,13 @@
 import org.wordpress.android.models.ReaderCommentList;
 import org.wordpress.android.models.ReaderPost;
 import org.wordpress.android.ui.comments.CommentUtils;
+import org.wordpress.android.ui.reader.FollowCommentsUiState;
 import org.wordpress.android.ui.reader.ReaderActivityLauncher;
 import org.wordpress.android.ui.reader.ReaderAnim;
 import org.wordpress.android.ui.reader.ReaderInterfaces;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.actions.ReaderCommentActions;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderCommentLeveler;
 import org.wordpress.android.ui.reader.utils.ReaderLinkMovementMethod;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
@@ -42,7 +44,7 @@
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsCommentActionSource;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
 
@@ -79,6 +81,7 @@ public class ReaderCommentAdapter extends RecyclerView.Adapter<RecyclerView.View
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
     @Inject ImageManager mImageManager;
+    @Inject ReaderTracker mReaderTracker;
 
     public interface RequestReplyListener {
         void onRequestReply(long commentId);
@@ -88,6 +91,8 @@ public interface RequestReplyListener {
     private RequestReplyListener mReplyListener;
     private ReaderInterfaces.DataLoadedListener mDataLoadedListener;
     private ReaderActions.DataRequestedListener mDataRequestedListener;
+    private PostHeaderHolder mHeaderHolder;
+    private FollowCommentsUiState mFollowButtonState;
 
     class CommentHolder extends RecyclerView.ViewHolder {
         private final ViewGroup mContainer;
@@ -175,6 +180,13 @@ public void enableHeaderClicks() {
         mIsHeaderClickEnabled = true;
     }
 
+    public void updateFollowingState(FollowCommentsUiState followButtonState) {
+        mFollowButtonState = followButtonState;
+        if (mHeaderHolder != null && mHeaderHolder.mHeaderView != null) {
+            mHeaderHolder.mHeaderView.setFollowButtonState(followButtonState);
+        }
+    }
+
     @Override
     public int getItemViewType(int position) {
         return position == 0 ? VIEW_TYPE_HEADER : VIEW_TYPE_COMMENT;
@@ -214,10 +226,10 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
     @Override
     public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
         if (holder instanceof PostHeaderHolder) {
-            PostHeaderHolder headerHolder = (PostHeaderHolder) holder;
-            headerHolder.mHeaderView.setPost(mPost);
+            mHeaderHolder = (PostHeaderHolder) holder;
+            mHeaderHolder.mHeaderView.setPost(mPost, mFollowButtonState);
             if (mIsHeaderClickEnabled) {
-                headerHolder.mHeaderView.setOnClickListener(new View.OnClickListener() {
+                mHeaderHolder.mHeaderView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         ReaderActivityLauncher.showReaderPostDetail(view.getContext(), mPost.blogId, mPost.postId);
@@ -251,7 +263,13 @@ public void onClick(View view) {
             View.OnClickListener authorListener = new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    ReaderActivityLauncher.showReaderBlogPreview(view.getContext(), comment.authorBlogId);
+                    ReaderActivityLauncher.showReaderBlogPreview(
+                            view.getContext(),
+                            comment.authorBlogId,
+                            mPost.isFollowedByCurrentUser,
+                            ReaderTracker.SOURCE_COMMENT,
+                            mReaderTracker
+                    );
                 }
             };
             commentHolder.mAuthorContainer.setOnClickListener(authorListener);
@@ -411,9 +429,16 @@ private void toggleLike(Context context, CommentHolder holder, int position) {
             showLikeStatus(holder, position);
         }
 
-        AnalyticsUtils.trackWithReaderPostDetails(isAskingToLike
-                ? AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_LIKED
-                : AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_UNLIKED, mPost);
+        mReaderTracker.trackPost(isAskingToLike
+                        ? AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_LIKED
+                        : AnalyticsTracker.Stat.READER_ARTICLE_COMMENT_UNLIKED,
+                mPost
+        );
+        mReaderTracker.trackPost(
+                isAskingToLike ? AnalyticsTracker.Stat.COMMENT_LIKED : AnalyticsTracker.Stat.COMMENT_UNLIKED,
+                mPost,
+                AnalyticsCommentActionSource.READER.toString()
+        );
     }
 
     public boolean refreshComment(long commentId) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java
index 15fd1d693a33..bc353d64ae73 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java
@@ -6,13 +6,17 @@
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Space;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 
 import org.wordpress.android.R;
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction;
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction;
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType;
 import org.wordpress.android.ui.utils.UiHelpers;
 import org.wordpress.android.util.ColorUtils;
 import org.wordpress.android.util.ContextExtensionsKt;
@@ -25,10 +29,14 @@
  */
 public class ReaderMenuAdapter extends BaseAdapter {
     private final LayoutInflater mInflater;
-    private final List<SecondaryAction> mMenuItems = new ArrayList<>();
+    private final List<ReaderPostCardAction> mMenuItems = new ArrayList<>();
     private final UiHelpers mUiHelpers;
 
-    public ReaderMenuAdapter(Context context, @NonNull UiHelpers uiHelpers, @NonNull List<SecondaryAction> menuItems) {
+    private static final int TYPE_SPACER = 0;
+    private static final int TYPE_CONTENT = 1;
+
+    public ReaderMenuAdapter(Context context, @NonNull UiHelpers uiHelpers,
+                             @NonNull List<ReaderPostCardAction> menuItems) {
         super();
         mInflater = LayoutInflater.from(context);
         mMenuItems.addAll(menuItems);
@@ -50,8 +58,43 @@ public long getItemId(int position) {
         return mMenuItems.get(position).getType().ordinal();
     }
 
+    @Override
+    public int getViewTypeCount() {
+        return 2;
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return (mMenuItems.get(position).getType() == ReaderPostCardActionType.SPACER_NO_ACTION)
+                ? TYPE_SPACER : TYPE_CONTENT;
+    }
+
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
+        ReaderPostCardAction cardAction = mMenuItems.get(position);
+        if (getItemViewType(position) == TYPE_SPACER) {
+            return handleSpacer(convertView, parent);
+        } else {
+            return handleSecondaryAction((SecondaryAction) cardAction, convertView, parent);
+        }
+    }
+
+    private View handleSpacer(View convertView, ViewGroup parent) {
+        ReaderMenuSpacerHolder holder;
+        if (convertView == null) {
+            convertView = mInflater.inflate(R.layout.reader_popup_menu_spacer_item, parent, false);
+            holder = new ReaderMenuSpacerHolder(convertView);
+            convertView.setTag(holder);
+        } else {
+            holder = (ReaderMenuSpacerHolder) convertView.getTag();
+        }
+        holder.mSpacer.setVisibility(View.VISIBLE);
+        holder.mContainer.setEnabled(false);
+        holder.mContainer.setClickable(false);
+        return convertView;
+    }
+
+    private View handleSecondaryAction(SecondaryAction item, View convertView, ViewGroup parent) {
         ReaderMenuHolder holder;
         if (convertView == null) {
             convertView = mInflater.inflate(R.layout.reader_popup_menu_item, parent, false);
@@ -61,7 +104,6 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder = (ReaderMenuHolder) convertView.getTag();
         }
 
-        SecondaryAction item = mMenuItems.get(position);
         CharSequence textRes = mUiHelpers.getTextOfUiString(convertView.getContext(), item.getLabel());
         int textColorRes =
                 ContextExtensionsKt.getColorResIdFromAttribute(convertView.getContext(), item.getLabelColor());
@@ -71,12 +113,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         holder.mText.setText(textRes);
         holder.mText.setTextColor(AppCompatResources.getColorStateList(convertView.getContext(), textColorRes));
-        ColorUtils.INSTANCE.setImageResourceWithTint(holder.mIcon, iconRes, iconColorRes);
-
+        ColorUtils.setImageResourceWithTint(holder.mIcon, iconRes, iconColorRes);
         return convertView;
     }
 
-    class ReaderMenuHolder {
+    static class ReaderMenuHolder {
         private final TextView mText;
         private final ImageView mIcon;
 
@@ -85,4 +126,13 @@ class ReaderMenuHolder {
             mIcon = view.findViewById(R.id.image);
         }
     }
+
+    static class ReaderMenuSpacerHolder {
+        private final Space mSpacer;
+        private final LinearLayout mContainer;
+        ReaderMenuSpacerHolder(View view) {
+            mSpacer = view.findViewById(R.id.reader_popup_menu_item_spacer);
+            mContainer = view.findViewById(R.id.reader_popup_menu_item_spacer_container);
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java
index 2bf6fcc6693d..3ae6104a93ca 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java
@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.reader.adapters;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
@@ -44,6 +45,8 @@
 import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder;
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderPostViewHolder;
 import org.wordpress.android.ui.reader.models.ReaderBlogIdPostId;
+import org.wordpress.android.ui.reader.tracker.ReaderTab;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderXPostUtils;
 import org.wordpress.android.ui.reader.views.ReaderGapMarkerView;
 import org.wordpress.android.ui.reader.views.ReaderSiteHeaderView;
@@ -58,12 +61,12 @@
 import org.wordpress.android.util.DisplayUtils;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.NetworkUtils;
+import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
+import org.wordpress.android.util.image.BlavatarShape;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
 
-import java.util.HashMap;
 import java.util.HashSet;
 
 import javax.inject.Inject;
@@ -88,7 +91,8 @@ public class ReaderPostAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private boolean mCanRequestMorePosts;
 
-    private final ReaderTypes.ReaderPostListType mPostListType;
+    @NonNull private final ReaderTypes.ReaderPostListType mPostListType;
+    @NonNull private String mSource;
     private final ReaderPostList mPosts = new ReaderPostList();
     private final HashSet<String> mRenderedIds = new HashSet<>();
 
@@ -112,16 +116,20 @@ public class ReaderPostAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private static final long ITEM_ID_HEADER = -1L;
     private static final long ITEM_ID_GAP_MARKER = -2L;
-    private static final long ITEM_ID_NEWS_CARD = -3L;
 
     private static final float READER_FEATURED_IMAGE_ASPECT_RATIO = 16 / 9f;
 
-    private boolean mIsMainReader;
+    private final boolean mIsMainReader;
 
     @Inject AccountStore mAccountStore;
     @Inject SiteStore mSiteStore;
     @Inject ReaderPostUiStateBuilder mReaderPostUiStateBuilder;
     @Inject ReaderPostMoreButtonUiStateBuilder mReaderPostMoreButtonUiStateBuilder;
+    @Inject ReaderTracker mReaderTracker;
+
+    public String getSource() {
+        return mSource;
+    }
 
     /*
      * cross-post
@@ -242,7 +250,7 @@ public int getItemViewType(int position) {
                 postView = LayoutInflater.from(context).inflate(R.layout.reader_cardview_removed_post, parent, false);
                 return new ReaderRemovedPostViewHolder(postView);
             default:
-                return new ReaderPostViewHolder(mUiHelpers, mImageManager, parent);
+                return new ReaderPostViewHolder(mUiHelpers, mImageManager, mReaderTracker, parent);
         }
     }
 
@@ -258,9 +266,17 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             SiteHeaderViewHolder siteHolder = (SiteHeaderViewHolder) holder;
             siteHolder.mSiteHeaderView.setOnBlogInfoLoadedListener(mBlogInfoLoadedListener);
             if (isDiscover()) {
-                siteHolder.mSiteHeaderView.loadBlogInfo(ReaderConstants.DISCOVER_SITE_ID, 0);
+                siteHolder.mSiteHeaderView.loadBlogInfo(
+                        ReaderConstants.DISCOVER_SITE_ID,
+                        0,
+                        mSource
+                );
             } else {
-                siteHolder.mSiteHeaderView.loadBlogInfo(mCurrentBlogId, mCurrentFeedId);
+                siteHolder.mSiteHeaderView.loadBlogInfo(
+                        mCurrentBlogId,
+                        mCurrentFeedId,
+                        mSource
+                );
             }
         } else if (holder instanceof TagHeaderViewHolder) {
             TagHeaderViewHolder tagHolder = (TagHeaderViewHolder) holder;
@@ -272,9 +288,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
     }
 
     private void renderTagHeader(
-        ReaderTag currentTag,
-        TagHeaderViewHolder tagHolder,
-        Boolean isFollowButtonEnabled
+            ReaderTag currentTag,
+            TagHeaderViewHolder tagHolder,
+            Boolean isFollowButtonEnabled
     ) {
         if (currentTag == null) {
             return;
@@ -285,21 +301,21 @@ private void renderTagHeader(
         };
 
         ReaderTagHeaderUiState uiState = new ReaderTagHeaderUiState(
-            currentTag.getLabel(),
-            new FollowButtonUiState(
-                onFollowButtonClicked,
-                ReaderTagTable.isFollowedTagName(currentTag.getTagSlug()),
-                isFollowButtonEnabled,
-                true
-            )
+                currentTag.getLabel(),
+                new FollowButtonUiState(
+                        onFollowButtonClicked,
+                        ReaderTagTable.isFollowedTagName(currentTag.getTagSlug()),
+                        isFollowButtonEnabled,
+                        true
+                )
         );
         tagHolder.onBind(uiState);
     }
 
     private void toggleFollowButton(
-        Context context,
-        @NotNull ReaderTag currentTag,
-        TagHeaderViewHolder tagHolder
+            Context context,
+            @NotNull ReaderTag currentTag,
+            TagHeaderViewHolder tagHolder
     ) {
         if (!NetworkUtils.checkConnection(context)) {
             return;
@@ -316,11 +332,17 @@ private void toggleFollowButton(
                 ToastUtils.showToast(context, errResId);
             } else {
                 if (isAskingToFollow) {
-                    AnalyticsTracker.track(AnalyticsTracker.Stat.READER_TAG_FOLLOWED,
-                        new HashMap<String, String>() { { put("tag", slugForTracking); }});
+                    mReaderTracker.trackTag(
+                            AnalyticsTracker.Stat.READER_TAG_FOLLOWED,
+                            slugForTracking,
+                            mSource
+                    );
                 } else {
-                    AnalyticsTracker.track(AnalyticsTracker.Stat.READER_TAG_UNFOLLOWED,
-                        new HashMap<String, String>() { { put("tag", slugForTracking); }});
+                    mReaderTracker.trackTag(
+                            AnalyticsTracker.Stat.READER_TAG_UNFOLLOWED,
+                            slugForTracking,
+                            mSource
+                    );
                 }
             }
             renderTagHeader(currentTag, tagHolder, true);
@@ -349,7 +371,8 @@ private void renderXPost(int position, ReaderXPostViewHolder holder) {
                 .loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR,
                         GravatarUtils.fixGravatarUrl(post.getPostAvatar(), mAvatarSzSmall));
 
-        mImageManager.loadIntoCircle(holder.mImgBlavatar, ImageType.BLAVATAR_CIRCULAR,
+        mImageManager.loadIntoCircle(holder.mImgBlavatar,
+                SiteUtils.getSiteImageType(post.isP2orA8C(), BlavatarShape.CIRCULAR),
                 GravatarUtils.fixGravatarUrl(post.getBlogImageUrl(), mAvatarSzSmall));
 
         holder.mTxtTitle.setText(ReaderXPostUtils.getXPostTitle(post));
@@ -363,13 +386,13 @@ private void renderRemovedPost(final int position, final ReaderRemovedPostViewHo
         final Context context = holder.mRemovedPostContainer.getContext();
         holder.mTxtRemovedPostTitle.setText(createTextForRemovedPostContainer(post, context));
         Drawable drawable =
-                ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_undo_white_24dp,
+                ColorUtils.applyTintToDrawable(context, R.drawable.ic_undo_white_24dp,
                         ContextExtensionsKt.getColorResIdFromAttribute(context, R.attr.colorPrimary));
         holder.mUndoRemoveAction.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
-        holder.mPostContainer.setOnClickListener(v -> undoPostUnbookmarked(post, position));
+        holder.mPostContainer.setOnClickListener(v -> undoPostUnbookmarked(post));
     }
 
-    private void undoPostUnbookmarked(final ReaderPost post, final int position) {
+    private void undoPostUnbookmarked(final ReaderPost post) {
         if (!post.isBookmarked) {
             mOnPostListItemButtonListener.onButtonClicked(post, ReaderPostCardActionType.BOOKMARK);
         }
@@ -401,7 +424,7 @@ private void renderPost(final int position, final ReaderPostViewHolder holder, b
             // to the rendered list and record the TrainTracks render event
             if (post.hasRailcar() && !mRenderedIds.contains(post.getPseudoId())) {
                 mRenderedIds.add(post.getPseudoId());
-                AnalyticsUtils.trackRailcarRender(post.getRailcarJson());
+                mReaderTracker.trackRailcar(post.getRailcarJson());
             }
             return Unit.INSTANCE;
         };
@@ -415,7 +438,13 @@ private void renderPost(final int position, final ReaderPostViewHolder holder, b
                     break;
                 case SITE_PICK:
                     if (discoverData.getBlogId() != 0) {
-                        ReaderActivityLauncher.showReaderBlogPreview(ctx, discoverData.getBlogId());
+                        ReaderActivityLauncher.showReaderBlogPreview(
+                                ctx,
+                                discoverData.getBlogId(),
+                                post.isFollowedByCurrentUser,
+                                mSource,
+                                mReaderTracker
+                        );
                     } else if (discoverData.hasBlogUrl()) {
                         ReaderActivityLauncher.openUrl(ctx, discoverData.getBlogUrl());
                     }
@@ -442,7 +471,12 @@ private void renderPost(final int position, final ReaderPostViewHolder holder, b
         };
 
         Function2<Long, Long, Unit> onPostHeaderClicked = (postId, blogId) -> {
-            ReaderActivityLauncher.showReaderBlogPreview(ctx, post);
+            ReaderActivityLauncher.showReaderBlogPreview(
+                    ctx,
+                    post,
+                    mSource,
+                    mReaderTracker
+            );
             return Unit.INSTANCE;
         };
 
@@ -453,6 +487,7 @@ private void renderPost(final int position, final ReaderPostViewHolder holder, b
 
         ReaderPostUiState uiState = mReaderPostUiStateBuilder
                 .mapPostToUiStateBlocking(
+                        mSource,
                         post,
                         false,
                         mPhotonWidth,
@@ -468,7 +503,7 @@ private void renderPost(final int position, final ReaderPostViewHolder holder, b
                         onPostHeaderClicked,
                         onTagItemClicked,
                         showMoreMenu ? mReaderPostMoreButtonUiStateBuilder
-                                .buildMoreMenuItemsBlocking(post, postListType, onButtonClicked) : null
+                                .buildMoreMenuItemsBlocking(post, onButtonClicked) : null
                 );
         holder.onBind(uiState);
     }
@@ -497,6 +532,7 @@ public ReaderPostAdapter(
         ((WordPress) context.getApplicationContext()).component().inject(this);
         this.mImageManager = imageManager;
         mPostListType = postListType;
+        mSource = mReaderTracker.getSource(mPostListType);
         mUiHelpers = uiHelpers;
         mAvatarSzSmall = context.getResources().getDimensionPixelSize(R.dimen.avatar_sz_small);
         mIsMainReader = isMainReader;
@@ -555,6 +591,7 @@ private ReaderTypes.ReaderPostListType getPostListType() {
 
     // used when the viewing tagged posts
     public void setCurrentTag(ReaderTag tag) {
+        mSource = mReaderTracker.getSource(mPostListType, ReaderTab.transformTagToTab(tag));
         if (!ReaderTag.isSameTag(tag, mCurrentTag)) {
             mCurrentTag = tag;
             mRenderedIds.clear();
@@ -596,21 +633,6 @@ public void reload() {
         loadPosts();
     }
 
-    public void removePostsInBlog(long blogId) {
-        int numRemoved = 0;
-        ReaderPostList postsInBlog = mPosts.getPostsInBlog(blogId);
-        for (ReaderPost post : postsInBlog) {
-            int index = mPosts.indexOfPost(post);
-            if (index > -1) {
-                numRemoved++;
-                mPosts.remove(index);
-            }
-        }
-        if (numRemoved > 0) {
-            notifyDataSetChanged();
-        }
-    }
-
     private void loadPosts() {
         if (mIsTaskRunning) {
             AppLog.w(AppLog.T.READER, "reader posts task already running");
@@ -642,8 +664,7 @@ private ReaderPost getItem(int position) {
     }
 
     private int getItemPositionOffset() {
-        int headersOffset = hasHeader() ? 1 : 0;
-        return headersOffset;
+        return hasHeader() ? 1 : 0;
     }
 
     private int getHeaderPosition() {
@@ -727,6 +748,7 @@ public void removeGapMarker() {
      */
     private boolean mIsTaskRunning = false;
 
+    @SuppressLint("StaticFieldLeak")
     private class LoadPostsTask extends AsyncTask<Void, Void, Boolean> {
         private ReaderPostList mAllPosts;
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostLikersAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostLikersAdapter.kt
new file mode 100644
index 000000000000..a4c778c4339f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostLikersAdapter.kt
@@ -0,0 +1,51 @@
+package org.wordpress.android.ui.reader.adapters
+
+import android.content.Context
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.engagement.EngageItem
+import org.wordpress.android.ui.engagement.EngageItem.EngageItemType.LIKER
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagedPeopleAdapterDiffCallback
+import org.wordpress.android.ui.engagement.EngagedPeopleViewHolder
+import org.wordpress.android.ui.reader.viewholders.PostLikerViewHolder
+import org.wordpress.android.util.image.ImageManager
+
+class ReaderPostLikersAdapter(
+    private val imageManager: ImageManager,
+    private val context: Context
+) : Adapter<EngagedPeopleViewHolder>() {
+    private var itemsList = listOf<EngageItem>()
+
+    fun loadData(items: List<EngageItem>) {
+        val diffResult = DiffUtil.calculateDiff(
+                EngagedPeopleAdapterDiffCallback(itemsList, items)
+        )
+        itemsList = items
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EngagedPeopleViewHolder {
+        return when (viewType) {
+            LIKER.ordinal -> PostLikerViewHolder(parent, imageManager, context)
+            else -> throw IllegalArgumentException("Illegal view type $viewType")
+        }
+    }
+
+    override fun onBindViewHolder(holder: EngagedPeopleViewHolder, position: Int) {
+        val item = itemsList[position]
+        when (item) {
+            is Liker -> (holder as PostLikerViewHolder).bind(item)
+            else -> throw IllegalArgumentException("Illegal EngageItem $item")
+        }
+    }
+
+    override fun getItemCount(): Int {
+        return itemsList.size
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return itemsList[position].type.ordinal
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderRelatedPostsAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderRelatedPostsAdapter.kt
new file mode 100644
index 000000000000..de95fe23171a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderRelatedPostsAdapter.kt
@@ -0,0 +1,57 @@
+package org.wordpress.android.ui.reader.adapters
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView.Adapter
+import org.wordpress.android.ui.reader.discover.viewholders.ReaderRelatedPostViewHolder
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState.ReaderRelatedPostUiState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+
+class ReaderRelatedPostsAdapter(
+    private val uiHelpers: UiHelpers,
+    private val imageManager: ImageManager
+) : Adapter<ReaderRelatedPostViewHolder>() {
+    private val items = mutableListOf<ReaderRelatedPostUiState>()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ReaderRelatedPostViewHolder(
+            uiHelpers,
+            imageManager,
+            parent
+    )
+
+    override fun onBindViewHolder(holder: ReaderRelatedPostViewHolder, position: Int) {
+        holder.onBind(items[position])
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    fun update(newItems: List<ReaderRelatedPostUiState>) {
+        val diffResult = DiffUtil.calculateDiff(RelatedPostsDiffUtil(items, newItems))
+        items.clear()
+        items.addAll(newItems)
+        diffResult.dispatchUpdatesTo(this)
+    }
+
+    private class RelatedPostsDiffUtil(
+        val oldItems: List<ReaderRelatedPostUiState>,
+        val newItems: List<ReaderRelatedPostUiState>
+    ) : DiffUtil.Callback() {
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            val oldItem = oldItems[oldItemPosition]
+            val newItem = newItems[newItemPosition]
+            if (oldItem::class != newItem::class) {
+                return false
+            }
+            return oldItem.postId == newItem.postId && oldItem.blogId == newItem.blogId
+        }
+
+        override fun getOldListSize(): Int = oldItems.size
+
+        override fun getNewListSize(): Int = newItems.size
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldItems[oldItemPosition] == newItems[newItemPosition]
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderUserAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderUserAdapter.java
index 0f45a8b02827..844ac7e670f3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderUserAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderUserAdapter.java
@@ -7,6 +7,7 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
 import org.wordpress.android.R;
@@ -15,6 +16,7 @@
 import org.wordpress.android.models.ReaderUserList;
 import org.wordpress.android.ui.reader.ReaderActivityLauncher;
 import org.wordpress.android.ui.reader.ReaderInterfaces.DataLoadedListener;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
@@ -26,11 +28,13 @@
  * users to display
  */
 public class ReaderUserAdapter extends RecyclerView.Adapter<ReaderUserAdapter.UserViewHolder> {
+    @Nullable private Boolean mIsFollowed;
     private final ReaderUserList mUsers = new ReaderUserList();
     private DataLoadedListener mDataLoadedListener;
     private final int mAvatarSz;
 
     @Inject ImageManager mImageManager;
+    @Inject ReaderTracker mReaderTracker;
 
     public ReaderUserAdapter(Context context) {
         super();
@@ -70,7 +74,13 @@ public void onBindViewHolder(UserViewHolder holder, int position) {
                 holder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        ReaderActivityLauncher.showReaderBlogPreview(v.getContext(), user.blogId);
+                        ReaderActivityLauncher.showReaderBlogPreview(
+                                v.getContext(),
+                                user.blogId,
+                                mIsFollowed,
+                                ReaderTracker.SOURCE_USER,
+                                mReaderTracker
+                        );
                     }
                 });
                 holder.mRootView.setEnabled(true);
@@ -108,6 +118,10 @@ class UserViewHolder extends RecyclerView.ViewHolder {
         }
     }
 
+    public void setIsFollowed(@Nullable Boolean isFollowed) {
+        mIsFollowed = isFollowed;
+    }
+
     public void setUsers(final ReaderUserList users) {
         mUsers.clear();
         if (users != null && users.size() > 0) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderCardUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderCardUiState.kt
index 044ccd597eae..39bebe4a6911 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderCardUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderCardUiState.kt
@@ -2,11 +2,12 @@ package org.wordpress.android.ui.reader.discover
 
 import android.text.Spanned
 import androidx.annotation.AttrRes
+import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import org.wordpress.android.R
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryAction
-import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SPACER_NO_ACTION
 import org.wordpress.android.ui.reader.discover.interests.TagUiState
 import org.wordpress.android.ui.reader.models.ReaderImageList
 import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState
@@ -19,8 +20,11 @@ sealed class ReaderCardUiState {
     data class ReaderWelcomeBannerCardUiState(@StringRes val titleRes: Int) : ReaderCardUiState()
 
     data class ReaderPostUiState(
+        val source: String,
         val postId: Long,
         val blogId: Long,
+        val feedId: Long,
+        val isFollowed: Boolean,
         val blogSection: ReaderBlogSectionUiState,
         val title: UiString?,
         val excerpt: String?, // mTxtText
@@ -40,7 +44,7 @@ sealed class ReaderCardUiState {
         val likeAction: PrimaryAction,
         val reblogAction: PrimaryAction,
         val commentsAction: PrimaryAction,
-        val moreMenuItems: List<SecondaryAction>? = null,
+        val moreMenuItems: List<ReaderPostCardAction>? = null,
         val onItemClicked: (Long, Long) -> Unit,
         val onItemRendered: (ReaderCardUiState) -> Unit,
         val onMoreButtonClicked: (ReaderPostUiState) -> Unit,
@@ -64,9 +68,43 @@ sealed class ReaderCardUiState {
     data class ReaderInterestsCardUiState(val interest: List<ReaderInterestUiState>) : ReaderCardUiState() {
         data class ReaderInterestUiState(
             val interest: String,
-            val isDividerVisible: Boolean,
-            val onClicked: ((String) -> Unit)
+            val onClicked: ((String) -> Unit),
+            val chipStyle: ChipStyle
         )
+
+        sealed class ChipStyle(
+            @ColorRes val chipStrokeColorResId: Int,
+            @ColorRes val chipFontColorResId: Int,
+            @ColorRes val chipFillColorResId: Int
+        ) {
+            object ChipStyleGreen : ChipStyle(
+                    chipStrokeColorResId = R.color.reader_topics_you_might_like_chip_green_stroke,
+                    chipFontColorResId = R.color.reader_topics_you_might_like_chip_green_font,
+                    chipFillColorResId = R.color.reader_topics_you_might_like_chip_green_fill
+            )
+            object ChipStylePurple : ChipStyle(
+                    chipStrokeColorResId = R.color.reader_topics_you_might_like_chip_purple_stroke,
+                    chipFontColorResId = R.color.reader_topics_you_might_like_chip_purple_font,
+                    chipFillColorResId = R.color.reader_topics_you_might_like_chip_purple_fill
+            )
+            object ChipStyleYellow : ChipStyle(
+                    chipStrokeColorResId = R.color.reader_topics_you_might_like_chip_yellow_stroke,
+                    chipFontColorResId = R.color.reader_topics_you_might_like_chip_yellow_font,
+                    chipFillColorResId = R.color.reader_topics_you_might_like_chip_yellow_fill
+            )
+            object ChipStyleOrange : ChipStyle(
+                    chipStrokeColorResId = R.color.reader_topics_you_might_like_chip_orange_stroke,
+                    chipFontColorResId = R.color.reader_topics_you_might_like_chip_orange_font,
+                    chipFillColorResId = R.color.reader_topics_you_might_like_chip_orange_fill
+            )
+        }
+    }
+
+    enum class ReaderInterestChipStyleColor(val id: Int) {
+        GREEN(0),
+        PURPLE(1),
+        YELLOW(2),
+        ORANGE(3)
     }
 
     data class ReaderRecommendedBlogsCardUiState(
@@ -80,7 +118,7 @@ sealed class ReaderCardUiState {
             val description: String?,
             val iconUrl: String?,
             val isFollowed: Boolean,
-            val onItemClicked: (Long, Long) -> Unit,
+            val onItemClicked: (Long, Long, Boolean) -> Unit,
             val onFollowClicked: (ReaderRecommendedBlogUiState) -> Unit
         ) {
             val followContentDescription: UiStringRes by lazy {
@@ -123,6 +161,12 @@ sealed class ReaderPostCardAction {
         override val type: ReaderPostCardActionType,
         override val onClicked: (Long, Long, ReaderPostCardActionType) -> Unit
     ) : ReaderPostCardAction()
+
+    data class SpacerNoAction(
+        override val isSelected: Boolean = false,
+        override val type: ReaderPostCardActionType = SPACER_NO_ACTION,
+        override val onClicked: ((Long, Long, ReaderPostCardActionType) -> Unit)? = null
+    ) : ReaderPostCardAction()
 }
 
 enum class ReaderPostCardActionType {
@@ -135,5 +179,7 @@ enum class ReaderPostCardActionType {
     BOOKMARK,
     REBLOG,
     COMMENTS,
-    REPORT_POST
+    REPORT_POST,
+    TOGGLE_SEEN_STATUS,
+    SPACER_NO_ACTION
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt
index 5500e3b23855..c11c8a359a16 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverAdapter.kt
@@ -12,6 +12,7 @@ import org.wordpress.android.ui.reader.discover.viewholders.ReaderPostViewHolder
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderRecommendedBlogsCardViewHolder
 import org.wordpress.android.ui.reader.discover.viewholders.ReaderViewHolder
 import org.wordpress.android.ui.reader.discover.viewholders.WelcomeBannerViewHolder
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.image.ImageManager
 
@@ -22,17 +23,14 @@ private const val recommendedBlogsViewType: Int = 4
 
 class ReaderDiscoverAdapter(
     private val uiHelpers: UiHelpers,
-    private val imageManager: ImageManager
-) : Adapter<ReaderViewHolder>() {
+    private val imageManager: ImageManager,
+    private val readerTracker: ReaderTracker
+) : Adapter<ReaderViewHolder<*>>() {
     private val items = mutableListOf<ReaderCardUiState>()
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReaderViewHolder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReaderViewHolder<*> {
         return when (viewType) {
             welcomeBannerViewType -> WelcomeBannerViewHolder(parent)
-            postViewType -> ReaderPostViewHolder(
-                    uiHelpers,
-                    imageManager,
-                    parent
-            )
+            postViewType -> ReaderPostViewHolder(uiHelpers, imageManager, readerTracker, parent)
             interestViewType -> ReaderInterestsCardViewHolder(uiHelpers, parent)
             recommendedBlogsViewType -> ReaderRecommendedBlogsCardViewHolder(parent, imageManager, uiHelpers)
             else -> throw NotImplementedError("Unknown ViewType")
@@ -41,7 +39,7 @@ class ReaderDiscoverAdapter(
 
     override fun getItemCount(): Int = items.size
 
-    override fun onBindViewHolder(holder: ReaderViewHolder, position: Int) {
+    override fun onBindViewHolder(holder: ReaderViewHolder<*>, position: Int) {
         holder.onBind(items[position])
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt
index 0c5c5e9c2645..2350e376dc7f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverFragment.kt
@@ -5,20 +5,15 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.main_activity.*
-import kotlinx.android.synthetic.main.reader_discover_fragment_layout.*
-import kotlinx.android.synthetic.main.reader_fullscreen_empty_with_action.*
-import kotlinx.android.synthetic.main.reader_fullscreen_error_with_retry.*
 import org.wordpress.android.R
 import org.wordpress.android.R.dimen
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderDiscoverFragmentLayoutBinding
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.ViewPagerFragment
@@ -29,7 +24,6 @@ import org.wordpress.android.ui.reader.ReaderActivityLauncher.OpenUrlType
 import org.wordpress.android.ui.reader.ReaderPostWebViewCachingFragment
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.ContentUiState
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState
-import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.ErrorUiState
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenEditorForReblog
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenPost
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.SharePost
@@ -40,16 +34,18 @@ import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowNoSit
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostDetail
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostsByTag
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderComments
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderSubs
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReportPost
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowVideoViewer
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.WPSwipeToRefreshHelper
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.RecyclerItemDecoration
 import org.wordpress.android.widgets.WPSnackbar
 import javax.inject.Inject
@@ -60,10 +56,12 @@ class ReaderDiscoverFragment : ViewPagerFragment(R.layout.reader_discover_fragme
     @Inject lateinit var uiHelpers: UiHelpers
     @Inject lateinit var imageManager: ImageManager
     private lateinit var viewModel: ReaderDiscoverViewModel
-    @Inject lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
     @Inject lateinit var readerUtilsWrapper: ReaderUtilsWrapper
+    @Inject lateinit var readerTracker: ReaderTracker
     private lateinit var parentViewModel: ReaderViewModel
 
+    private var binding: ReaderDiscoverFragmentLayoutBinding? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (requireActivity().application as WordPress).component().inject(this)
@@ -71,102 +69,95 @@ class ReaderDiscoverFragment : ViewPagerFragment(R.layout.reader_discover_fragme
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupViews()
-        initViewModel()
-    }
+        binding = ReaderDiscoverFragmentLayoutBinding.bind(view).apply {
+            recyclerView.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
+            recyclerView.adapter = ReaderDiscoverAdapter(uiHelpers, imageManager, readerTracker)
 
-    private fun setupViews() {
-        recycler_view.layoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, false)
-        recycler_view.adapter = ReaderDiscoverAdapter(uiHelpers, imageManager)
+            val spacingHorizontal = resources.getDimensionPixelSize(dimen.reader_card_margin)
+            val spacingVertical = resources.getDimensionPixelSize(dimen.reader_card_gutters)
+            recyclerView.addItemDecoration(RecyclerItemDecoration(spacingHorizontal, spacingVertical, false))
 
-        val spacingHorizontal = resources.getDimensionPixelSize(dimen.reader_card_margin)
-        val spacingVertical = resources.getDimensionPixelSize(dimen.reader_card_gutters)
-        recycler_view.addItemDecoration(RecyclerItemDecoration(spacingHorizontal, spacingVertical, false))
+            WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(ptrLayout) { viewModel.swipeToRefresh() }
 
-        WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(ptr_layout) {
-            viewModel.swipeToRefresh()
-        }
-        error_retry.setOnClickListener {
-            viewModel.onRetryButtonClick()
-        }
-        empty_action.setOnClickListener {
-            viewModel.onEmptyActionClick()
+            initViewModel()
         }
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(ReaderDiscoverViewModel::class.java)
-        parentViewModel = ViewModelProviders.of(requireParentFragment()).get(ReaderViewModel::class.java)
-        viewModel.uiState.observe(viewLifecycleOwner, Observer {
+    private fun ReaderDiscoverFragmentLayoutBinding.initViewModel() {
+        viewModel = ViewModelProvider(this@ReaderDiscoverFragment, viewModelFactory)
+                .get(ReaderDiscoverViewModel::class.java)
+        parentViewModel = ViewModelProvider(requireParentFragment()).get(ReaderViewModel::class.java)
+
+        viewModel.uiState.observe(viewLifecycleOwner, {
             when (it) {
                 is ContentUiState -> {
-                    (recycler_view.adapter as ReaderDiscoverAdapter).update(it.cards)
+                    (recyclerView.adapter as ReaderDiscoverAdapter).update(it.cards)
                     if (it.scrollToTop) {
-                        recycler_view.scrollToPosition(0)
+                        recyclerView.scrollToPosition(0)
                     }
                 }
-                is ErrorUiState -> {
-                    uiHelpers.setTextOrHide(error_title, it.titleResId)
-                }
                 is EmptyUiState -> {
-                    uiHelpers.setTextOrHide(empty_title, it.titleResId)
-                }
-            }
-            uiHelpers.updateVisibility(recycler_view, it.contentVisiblity)
-            uiHelpers.updateVisibility(progress_bar, it.fullscreenProgressVisibility)
-            uiHelpers.updateVisibility(progress_text, it.fullscreenProgressVisibility)
-            uiHelpers.updateVisibility(error_layout, it.fullscreenErrorVisibility)
-            uiHelpers.updateVisibility(progress_loading_more, it.loadMoreProgressVisibility)
-            uiHelpers.updateVisibility(empty_layout, it.fullscreenEmptyVisibility)
-            ptr_layout.isEnabled = it.swipeToRefreshEnabled
-            ptr_layout.isRefreshing = it.reloadProgressVisibility
-        })
-        viewModel.navigationEvents.observe(viewLifecycleOwner, Observer {
-            it.applyIfNotHandled {
-                when (this) {
-                    is ShowPostDetail -> ReaderActivityLauncher.showReaderPostDetail(context, post.blogId, post.postId)
-                    is SharePost -> ReaderActivityLauncher.sharePost(context, post)
-                    is OpenPost -> ReaderActivityLauncher.openPost(context, post)
-                    is ShowReaderComments -> ReaderActivityLauncher.showReaderComments(context, blogId, postId)
-                    is ShowNoSitesToReblog -> ReaderActivityLauncher.showNoSiteToReblog(activity)
-                    is ShowSitePickerForResult -> ActivityLauncher
-                            .showSitePickerForResult(this@ReaderDiscoverFragment, this.preselectedSite, this.mode)
-                    is OpenEditorForReblog -> ActivityLauncher
-                            .openEditorForReblog(activity, this.site, this.post, this.source)
-                    is ShowBookmarkedTab -> {
-                        ActivityLauncher.viewSavedPostsListInReader(activity)
-                    }
-                    is ShowBookmarkedSavedOnlyLocallyDialog -> showBookmarkSavedLocallyDialog(this)
-                    is ShowPostsByTag -> ReaderActivityLauncher.showReaderTagPreview(context, this.tag)
-                    is ShowVideoViewer -> ReaderActivityLauncher.showReaderVideoViewer(context, this.videoUrl)
-                    is ShowBlogPreview -> ReaderActivityLauncher.showReaderBlogOrFeedPreview(
-                            context,
-                            this.siteId,
-                            this.feedId
-                    )
-                    is ShowReportPost -> {
-                        ReaderActivityLauncher.openUrl(
-                                context,
-                                readerUtilsWrapper.getReportPostUrl(url),
-                                OpenUrlType.INTERNAL
-                        )
-                    }
+                    uiHelpers.setTextOrHide(actionableEmptyView.title, it.titleResId)
+                    uiHelpers.setTextOrHide(actionableEmptyView.subtitle, it.subTitleRes)
+                    uiHelpers.setImageOrHide(actionableEmptyView.image, it.illustrationResId)
+                    uiHelpers.setTextOrHide(actionableEmptyView.button, it.buttonResId)
+                    actionableEmptyView.button.setOnClickListener { _ -> it.action.invoke() }
                 }
             }
+
+            uiHelpers.updateVisibility(recyclerView, it.contentVisiblity)
+            uiHelpers.updateVisibility(progressBar, it.fullscreenProgressVisibility)
+            uiHelpers.updateVisibility(progressText, it.fullscreenProgressVisibility)
+            uiHelpers.updateVisibility(progressLoadingMore, it.loadMoreProgressVisibility)
+            uiHelpers.updateVisibility(actionableEmptyView, it.fullscreenEmptyVisibility)
+            ptrLayout.isEnabled = it.swipeToRefreshEnabled
+            ptrLayout.isRefreshing = it.reloadProgressVisibility
         })
-        viewModel.snackbarEvents.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                showSnackbar()
-            }
-        })
-        viewModel.preloadPostEvents.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                addWebViewCachingFragment()
-            }
-        })
+        viewModel.navigationEvents.observeEvent(viewLifecycleOwner) { handleNavigation(it) }
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner, { it.showSnackbar() })
+        viewModel.preloadPostEvents.observeEvent(viewLifecycleOwner, { it.addWebViewCachingFragment() })
         viewModel.start(parentViewModel)
     }
 
+    @Suppress("ComplexMethod")
+    private fun handleNavigation(event: ReaderNavigationEvents) = when (event) {
+        is ShowPostDetail -> ReaderActivityLauncher.showReaderPostDetail(context, event.post.blogId, event.post.postId)
+        is SharePost -> ReaderActivityLauncher.sharePost(context, event.post)
+        is OpenPost -> ReaderActivityLauncher.openPost(context, event.post)
+        is ShowReaderComments -> ReaderActivityLauncher.showReaderComments(context, event.blogId, event.postId)
+        is ShowNoSitesToReblog -> ReaderActivityLauncher.showNoSiteToReblog(activity)
+        is ShowSitePickerForResult -> ActivityLauncher.showSitePickerForResult(
+                this@ReaderDiscoverFragment,
+                event.preselectedSite,
+                event.mode
+        )
+        is OpenEditorForReblog -> ActivityLauncher.openEditorForReblog(activity, event.site, event.post, event.source)
+        is ShowBookmarkedTab -> ActivityLauncher.viewSavedPostsListInReader(activity)
+        is ShowBookmarkedSavedOnlyLocallyDialog -> showBookmarkSavedLocallyDialog(event)
+        is ShowPostsByTag -> ReaderActivityLauncher.showReaderTagPreview(
+                context,
+                event.tag,
+                ReaderTracker.SOURCE_DISCOVER,
+                readerTracker
+        )
+        is ShowVideoViewer -> ReaderActivityLauncher.showReaderVideoViewer(context, event.videoUrl)
+        is ShowBlogPreview -> ReaderActivityLauncher.showReaderBlogOrFeedPreview(
+                context,
+                event.siteId,
+                event.feedId,
+                event.isFollowed,
+                ReaderTracker.SOURCE_DISCOVER,
+                readerTracker
+        )
+        is ShowReportPost -> ReaderActivityLauncher.openUrl(
+                context,
+                readerUtilsWrapper.getReportPostUrl(event.url),
+                OpenUrlType.INTERNAL
+        )
+        is ShowReaderSubs -> ReaderActivityLauncher.showReaderSubs(context)
+        else -> Unit // Do Nothing
+    }
+
     private fun showBookmarkSavedLocallyDialog(bookmarkDialog: ShowBookmarkedSavedOnlyLocallyDialog) {
         if (bookmarksSavedLocallyDialog == null) {
             MaterialAlertDialogBuilder(requireActivity())
@@ -216,10 +207,11 @@ class ReaderDiscoverFragment : ViewPagerFragment(R.layout.reader_discover_fragme
     override fun onDestroyView() {
         super.onDestroyView()
         bookmarksSavedLocallyDialog?.dismiss()
+        binding = null
     }
 
-    override fun getScrollableViewForUniqueIdProvision(): View {
-        return recycler_view
+    override fun getScrollableViewForUniqueIdProvision(): View? {
+        return binding?.recyclerView
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModel.kt
index a6d64fc001a9..b957441c0612 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModel.kt
@@ -3,14 +3,10 @@ package org.wordpress.android.ui.reader.discover
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Observer
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
 import org.wordpress.android.R
-import org.wordpress.android.R.string
 import org.wordpress.android.analytics.AnalyticsTracker
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_DISCOVER_PAGINATED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_DISCOVER_TOPIC_TAPPED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_PULL_TO_REFRESH
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.models.ReaderTagType.FOLLOWED
 import org.wordpress.android.models.discover.ReaderDiscoverCard.InterestsYouMayLikeCard
@@ -27,11 +23,13 @@ import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiSt
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderWelcomeBannerCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.ContentUiState
-import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.ShowFollowInterestsEmptyUiState
-import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.ErrorUiState.RequestFailedErrorUiState
+import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.RequestFailedUiState
+import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.ShowNoFollowedTagsUiState
+import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.ShowNoPostsUiState
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.LoadingUiState
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBlogPreview
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostsByTag
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderSubs
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
 import org.wordpress.android.ui.reader.repository.ReaderDiscoverCommunication
@@ -42,19 +40,19 @@ import org.wordpress.android.ui.reader.repository.ReaderDiscoverDataProvider
 import org.wordpress.android.ui.reader.repository.usecases.tags.GetFollowedTagsUseCase
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.DiscoverTasks.REQUEST_FIRST_PAGE
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.DiscoverTasks.REQUEST_MORE
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.DisplayUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
 
 const val INITIATE_LOAD_MORE_OFFSET = 3
-const val PHOTON_WIDTH_QUALITY_RATION = 0.5 // load images in 1/2 screen width to save users's data
+const val PHOTON_WIDTH_QUALITY_RATION = 0.5 // load images in 1/2 screen width to save users' data
 const val FEATURED_IMAGE_HEIGHT_WIDTH_RATION = 0.56 // 9:16
 
 class ReaderDiscoverViewModel @Inject constructor(
@@ -65,7 +63,7 @@ class ReaderDiscoverViewModel @Inject constructor(
     private val reblogUseCase: ReblogUseCase,
     private val readerUtilsWrapper: ReaderUtilsWrapper,
     private val appPrefsWrapper: AppPrefsWrapper,
-    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val readerTracker: ReaderTracker,
     displayUtilsWrapper: DisplayUtilsWrapper,
     private val getFollowedTagsUseCase: GetFollowedTagsUseCase,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
@@ -120,6 +118,8 @@ class ReaderDiscoverViewModel @Inject constructor(
         // Start with loading state
         _uiState.value = LoadingUiState
 
+        readerPostCardActionsHandler.initScope(viewModelScope)
+
         // Get the correct repository
         readerDiscoverDataProvider.start()
 
@@ -128,19 +128,19 @@ class ReaderDiscoverViewModel @Inject constructor(
             launch {
                 val userTags = getFollowedTagsUseCase.get()
                 if (userTags.isEmpty()) {
-                    _uiState.value = ShowFollowInterestsEmptyUiState
+                    _uiState.value = ShowNoFollowedTagsUiState { parentViewModel.onShowReaderInterests() }
                 } else {
                     if (posts != null && posts.cards.isNotEmpty()) {
-                        val discoverFeedContainsOnlyWelcomeCard = posts.cards.size == 1 &&
-                                posts.cards.filterIsInstance<WelcomeBannerCard>().isNotEmpty()
-                        if (!discoverFeedContainsOnlyWelcomeCard) {
-                            _uiState.value = ContentUiState(
-                                    convertCardsToUiStates(posts),
-                                    reloadProgressVisibility = false,
-                                    loadMoreProgressVisibility = false,
-                                    scrollToTop = swipeToRefreshTriggered
-                            )
-                            swipeToRefreshTriggered = false
+                        _uiState.value = ContentUiState(
+                                convertCardsToUiStates(posts),
+                                reloadProgressVisibility = false,
+                                loadMoreProgressVisibility = false,
+                                scrollToTop = swipeToRefreshTriggered
+                        )
+                        swipeToRefreshTriggered = false
+                    } else {
+                        _uiState.value = ShowNoPostsUiState {
+                            _navigationEvents.value = Event(ShowReaderSubs)
                         }
                     }
                 }
@@ -171,9 +171,10 @@ class ReaderDiscoverViewModel @Inject constructor(
         return posts.cards.map { card ->
             when (card) {
                 is WelcomeBannerCard -> ReaderWelcomeBannerCardUiState(
-                        titleRes = string.reader_welcome_banner
+                        titleRes = R.string.reader_welcome_banner
                 )
                 is ReaderPostCard -> postUiStateBuilder.mapPostToUiState(
+                        source = ReaderTracker.SOURCE_DISCOVER,
                         post = card.post,
                         isDiscover = true,
                         photonWidth = photonWidth,
@@ -240,7 +241,7 @@ class ReaderDiscoverViewModel @Inject constructor(
             when (uiState) {
                 is LoadingUiState -> {
                     // show fullscreen error
-                    _uiState.value = RequestFailedErrorUiState
+                    _uiState.value = RequestFailedUiState { onRetryButtonClick() }
                 }
                 is ContentUiState -> {
                     _uiState.value = uiState.copy(
@@ -251,7 +252,7 @@ class ReaderDiscoverViewModel @Inject constructor(
                     _snackbarEvents.postValue(
                             Event(
                                     SnackbarMessageHolder(
-                                            UiStringRes(string.reader_error_request_failed_title)
+                                            UiStringRes(R.string.reader_error_request_failed_title)
                                     )
                             )
                     )
@@ -262,7 +263,7 @@ class ReaderDiscoverViewModel @Inject constructor(
 
     private fun onReaderTagClicked(tag: String) {
         launch(ioDispatcher) {
-            analyticsTrackerWrapper.track(READER_DISCOVER_TOPIC_TAPPED)
+            readerTracker.track(AnalyticsTracker.Stat.READER_DISCOVER_TOPIC_TAPPED)
             val readerTag = readerUtilsWrapper.getTagFromTagName(tag, FOLLOWED)
             _navigationEvents.postValue(Event(ShowPostsByTag(readerTag)))
         }
@@ -271,7 +272,12 @@ class ReaderDiscoverViewModel @Inject constructor(
     private fun onButtonClicked(postId: Long, blogId: Long, type: ReaderPostCardActionType) {
         launch {
             findPost(postId, blogId)?.let {
-                readerPostCardActionsHandler.onAction(it, type, isBookmarkList = false)
+                readerPostCardActionsHandler.onAction(
+                        it,
+                        type,
+                        isBookmarkList = false,
+                        source = ReaderTracker.SOURCE_DISCOVER
+                )
             }
         }
     }
@@ -287,7 +293,11 @@ class ReaderDiscoverViewModel @Inject constructor(
     private fun onPostHeaderClicked(postId: Long, blogId: Long) {
         launch {
             findPost(postId, blogId)?.let {
-                readerPostCardActionsHandler.handleHeaderClicked(it.blogId, it.feedId)
+                readerPostCardActionsHandler.handleHeaderClicked(
+                        it.blogId,
+                        it.feedId,
+                        it.isFollowedByCurrentUser
+                )
             }
         }
     }
@@ -302,24 +312,35 @@ class ReaderDiscoverViewModel @Inject constructor(
     private fun onPostItemClicked(postId: Long, blogId: Long) {
         launch {
             findPost(postId, blogId)?.let {
-                readerPostCardActionsHandler.handleOnItemClicked(it)
+                readerPostCardActionsHandler.handleOnItemClicked(
+                        it,
+                        ReaderTracker.SOURCE_DISCOVER
+                )
             }
         }
     }
 
-    private fun onRecommendedSiteItemClicked(blogId: Long, feedId: Long) {
-        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_SUGGESTED_SITE_VISITED, mapOf("blog_id" to blogId))
-        _navigationEvents.postValue(Event(ShowBlogPreview(blogId, feedId)))
+    private fun onRecommendedSiteItemClicked(blogId: Long, feedId: Long, isFollowed: Boolean) {
+        readerTracker.trackBlog(
+                AnalyticsTracker.Stat.READER_SUGGESTED_SITE_VISITED,
+                blogId,
+                feedId
+        )
+        _navigationEvents.postValue(Event(ShowBlogPreview(blogId, feedId, isFollowed)))
     }
 
     private fun onFollowSiteClicked(recommendedBlogUiState: ReaderRecommendedBlogUiState) {
         launch {
-            val properties = mapOf(
-                "blog_id" to recommendedBlogUiState.blogId,
-                "follow" to !recommendedBlogUiState.isFollowed
+            readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.READER_SUGGESTED_SITE_TOGGLE_FOLLOW,
+                    recommendedBlogUiState.blogId,
+                    recommendedBlogUiState.feedId,
+                    !recommendedBlogUiState.isFollowed
+            )
+            readerPostCardActionsHandler.handleFollowRecommendedSiteClicked(
+                    recommendedBlogUiState,
+                    ReaderTracker.SOURCE_DISCOVER
             )
-            analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_SUGGESTED_SITE_TOGGLE_FOLLOW, properties)
-            readerPostCardActionsHandler.handleFollowRecommendedSiteClicked(recommendedBlogUiState)
         }
     }
 
@@ -341,7 +362,7 @@ class ReaderDiscoverViewModel @Inject constructor(
             if (closeToEndIndex > 0) {
                 val isCardCloseToEnd: Boolean = it.getOrNull(closeToEndIndex) == item
                 if (isCardCloseToEnd) {
-                    analyticsTrackerWrapper.track(READER_DISCOVER_PAGINATED)
+                    readerTracker.track(AnalyticsTracker.Stat.READER_DISCOVER_PAGINATED)
                     launch(ioDispatcher) { readerDiscoverDataProvider.loadMoreCards() }
                 }
             }
@@ -365,7 +386,7 @@ class ReaderDiscoverViewModel @Inject constructor(
             findPost(currentUiState.postId, currentUiState.blogId)?.let { post ->
                 val moreMenuItems = if (show) {
                     readerPostMoreButtonUiStateBuilder.buildMoreMenuItems(
-                            post, TAG_FOLLOWED, this@ReaderDiscoverViewModel::onButtonClicked
+                            post, this@ReaderDiscoverViewModel::onButtonClicked
                     )
                 } else {
                     null
@@ -410,7 +431,7 @@ class ReaderDiscoverViewModel @Inject constructor(
     }
 
     fun swipeToRefresh() {
-        analyticsTrackerWrapper.track(READER_PULL_TO_REFRESH)
+        readerTracker.track(AnalyticsTracker.Stat.READER_PULL_TO_REFRESH)
         swipeToRefreshTriggered = true
         launch {
             readerDiscoverDataProvider.refreshCards()
@@ -425,14 +446,9 @@ class ReaderDiscoverViewModel @Inject constructor(
         }
     }
 
-    fun onEmptyActionClick() {
-        parentViewModel.onShowReaderInterests()
-    }
-
     sealed class DiscoverUiState(
         val contentVisiblity: Boolean = false,
         val fullscreenProgressVisibility: Boolean = false,
-        open val fullscreenErrorVisibility: Boolean = false,
         val swipeToRefreshEnabled: Boolean = false,
         open val fullscreenEmptyVisibility: Boolean = false,
         open val scrollToTop: Boolean = false
@@ -448,15 +464,32 @@ class ReaderDiscoverViewModel @Inject constructor(
         ) : DiscoverUiState(contentVisiblity = true, swipeToRefreshEnabled = true)
 
         object LoadingUiState : DiscoverUiState(fullscreenProgressVisibility = true)
-        sealed class ErrorUiState constructor(val titleResId: Int) : DiscoverUiState(fullscreenErrorVisibility = true) {
-            object RequestFailedErrorUiState : ErrorUiState(
-                    titleResId = R.string.reader_error_request_failed_title
-            )
-        }
-        sealed class EmptyUiState constructor(val titleResId: Int) : DiscoverUiState(fullscreenEmptyVisibility = true) {
-            object ShowFollowInterestsEmptyUiState : EmptyUiState(
-                    titleResId = R.string.reader_discover_empty_title
-            )
+
+        sealed class EmptyUiState : DiscoverUiState(fullscreenEmptyVisibility = true) {
+            abstract val titleResId: Int
+            abstract val buttonResId: Int
+            open val subTitleRes: Int? = null
+            abstract val action: () -> Unit
+            open val illustrationResId: Int? = null
+
+            data class RequestFailedUiState(override val action: () -> Unit) : EmptyUiState() {
+                override val titleResId = R.string.connection_error
+                override val subTitleRes = R.string.reader_error_request_failed_title
+                override val buttonResId = R.string.retry
+            }
+
+            data class ShowNoFollowedTagsUiState(override val action: () -> Unit) : EmptyUiState() {
+                override val titleResId = R.string.reader_discover_empty_title
+                override val subTitleRes = R.string.reader_discover_empty_subtitle
+                override val buttonResId = R.string.reader_discover_empty_button_text
+            }
+
+            data class ShowNoPostsUiState(override val action: () -> Unit) : EmptyUiState() {
+                override val titleResId = R.string.reader_discover_no_posts_title
+                override val buttonResId = R.string.reader_discover_no_posts_button_text
+                override val subTitleRes = R.string.reader_discover_no_posts_subtitle
+                override val illustrationResId = R.drawable.img_illustration_empty_results_216dp
+            }
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderNavigationEvents.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderNavigationEvents.kt
index eff4174b261f..19871ed0330d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderNavigationEvents.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderNavigationEvents.kt
@@ -6,6 +6,7 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.ui.PagePostCreationSourcesDetail
+import org.wordpress.android.ui.engagement.HeaderData
 import org.wordpress.android.ui.main.SitePickerAdapter.SitePickerMode
 
 sealed class ReaderNavigationEvents {
@@ -30,7 +31,28 @@ sealed class ReaderNavigationEvents {
         @StringRes val message: Int = R.string.reader_save_posts_locally_dialog_message
         @StringRes val buttonLabel: Int = R.string.dialog_button_ok
     }
+
     data class ShowVideoViewer(val videoUrl: String) : ReaderNavigationEvents()
-    data class ShowBlogPreview(val siteId: Long, val feedId: Long) : ReaderNavigationEvents()
+    data class ShowBlogPreview(
+        val siteId: Long,
+        val feedId: Long,
+        val isFollowed: Boolean
+    ) : ReaderNavigationEvents()
+
     data class ShowReportPost(val url: String) : ReaderNavigationEvents()
+    object ShowReaderSubs : ReaderNavigationEvents()
+    data class ShowRelatedPostDetails(val postId: Long, val blogId: Long) :
+            ReaderNavigationEvents()
+
+    data class ReplaceRelatedPostDetailsWithHistory(val postId: Long, val blogId: Long, val isGlobal: Boolean) :
+            ReaderNavigationEvents()
+
+    data class ShowMediaPreview(val site: SiteModel?, val featuredImage: String) : ReaderNavigationEvents()
+    data class OpenUrl(val url: String) : ReaderNavigationEvents()
+    data class ShowPostInWebView(val post: ReaderPost) : ReaderNavigationEvents()
+    data class ShowEngagedPeopleList(
+        val siteId: Long,
+        val postId: Long,
+        val headerData: HeaderData
+    ) : ReaderNavigationEvents()
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt
index f3f787fa9b84..580428b6bd38 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandler.kt
@@ -6,23 +6,17 @@ import androidx.lifecycle.MediatorLiveData
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_ENABLED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_VISITED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_REPORTED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SAVED_LIST_SHOWN
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SAVED_POST_OPENED_FROM_OTHER_POST_LIST
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.SHARED_ITEM_READER
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction.DELETE
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction.NEW
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.modules.BG_THREAD
-import org.wordpress.android.modules.DEFAULT_SCOPE
-import org.wordpress.android.modules.UI_SCOPE
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
@@ -44,6 +38,8 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REBLOG
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REPORT_POST
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SHARE
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SITE_NOTIFICATIONS
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SPACER_NO_ACTION
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.TOGGLE_SEEN_STATUS
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.VISIT_SITE
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
 import org.wordpress.android.ui.reader.repository.usecases.BlockBlogUseCase
@@ -51,9 +47,18 @@ import org.wordpress.android.ui.reader.repository.usecases.BlockSiteState
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState
 import org.wordpress.android.ui.reader.repository.usecases.UndoBlockBlogUseCase
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.Success
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase.FetchSiteState
 import org.wordpress.android.ui.reader.usecases.ReaderPostBookmarkUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.Error
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.PostSeenStateChanged
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.UserNotAuthenticated
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.ReaderPostSeenToggleSource.READER_POST_CARD
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.ReaderPostSeenToggleSource.READER_POST_DETAILS
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged
@@ -62,7 +67,8 @@ import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.S
 import org.wordpress.android.ui.utils.HtmlMessageUtils
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.widgets.AppRatingDialogWrapper
@@ -70,7 +76,7 @@ import javax.inject.Inject
 import javax.inject.Named
 
 class ReaderPostCardActionsHandler @Inject constructor(
-    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val readerTracker: ReaderTracker,
     private val reblogUseCase: ReblogUseCase,
     private val bookmarkUseCase: ReaderPostBookmarkUseCase,
     private val followUseCase: ReaderSiteFollowUseCase,
@@ -78,15 +84,18 @@ class ReaderPostCardActionsHandler @Inject constructor(
     private val likeUseCase: PostLikeUseCase,
     private val siteNotificationsUseCase: ReaderSiteNotificationsUseCase,
     private val undoBlockBlogUseCase: UndoBlockBlogUseCase,
+    private val fetchSiteUseCase: ReaderFetchSiteUseCase,
     private val appPrefsWrapper: AppPrefsWrapper,
     private val dispatcher: Dispatcher,
     private val resourceProvider: ResourceProvider,
     private val htmlMessageUtils: HtmlMessageUtils,
     private val appRatingDialogWrapper: AppRatingDialogWrapper,
-    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
-    @Named(UI_SCOPE) private val uiScope: CoroutineScope,
-    @Named(DEFAULT_SCOPE) private val defaultScope: CoroutineScope
+    private val seenStatusToggleUseCase: ReaderSeenStatusToggleUseCase,
+    private val readerBlogTableWrapper: ReaderBlogTableWrapper,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) {
+    private lateinit var coroutineScope: CoroutineScope
+
     private val _navigationEvents = MediatorLiveData<Event<ReaderNavigationEvents>>()
     val navigationEvents: LiveData<Event<ReaderNavigationEvents>> = _navigationEvents
 
@@ -108,34 +117,96 @@ class ReaderPostCardActionsHandler @Inject constructor(
         dispatcher.register(siteNotificationsUseCase)
     }
 
+    fun initScope(coroutineScope: CoroutineScope) {
+        this.coroutineScope = coroutineScope
+    }
+
     suspend fun onAction(
         post: ReaderPost,
         type: ReaderPostCardActionType,
         isBookmarkList: Boolean,
-        fromPostDetails: Boolean = false
+        source: String
     ) {
         withContext(bgDispatcher) {
-            when (type) {
-                FOLLOW -> handleFollowClicked(post)
-                SITE_NOTIFICATIONS -> handleSiteNotificationsClicked(post.blogId)
-                SHARE -> handleShareClicked(post)
-                VISIT_SITE -> handleVisitSiteClicked(post)
-                BLOCK_SITE -> handleBlockSiteClicked(post.blogId)
-                LIKE -> handleLikeClicked(post, fromPostDetails)
-                BOOKMARK -> handleBookmarkClicked(post.postId, post.blogId, isBookmarkList, fromPostDetails)
-                REBLOG -> handleReblogClicked(post)
-                COMMENTS -> handleCommentsClicked(post.postId, post.blogId)
-                REPORT_POST -> handleReportPostClicked(post)
+            if (type == FOLLOW || type == SITE_NOTIFICATIONS) {
+                val readerBlog = readerBlogTableWrapper.getReaderBlog(post.blogId, post.feedId)
+                if (readerBlog == null) {
+                    val isSiteFetched = preFetchSite(post)
+                    if (!isSiteFetched) {
+                        return@withContext
+                    }
+                }
             }
+            handleAction(
+                    post,
+                    type,
+                    isBookmarkList,
+                    source
+            )
         }
     }
 
-    suspend fun handleOnItemClicked(post: ReaderPost) {
+    private suspend fun preFetchSite(post: ReaderPost): Boolean {
+        var isSiteFetched = false
+        when (fetchSiteUseCase.fetchSite(post.blogId, post.feedId, null)) {
+            FetchSiteState.AlreadyRunning -> { // Do Nothing
+            }
+            FetchSiteState.Success -> {
+                isSiteFetched = true
+            }
+            FetchSiteState.Failed.NoNetwork -> {
+                _snackbarEvents.postValue(
+                        Event(SnackbarMessageHolder((UiStringRes(R.string.error_network_connection))))
+                )
+            }
+            FetchSiteState.Failed.RequestFailed -> {
+                _snackbarEvents.postValue(
+                        Event(SnackbarMessageHolder((UiStringRes(R.string.reader_error_request_failed_title))))
+                )
+            }
+        }
+        return isSiteFetched
+    }
+
+    private suspend fun handleAction(
+        post: ReaderPost,
+        type: ReaderPostCardActionType,
+        isBookmarkList: Boolean,
+        source: String
+    ) {
+        when (type) {
+            FOLLOW -> handleFollowClicked(post, source)
+            SITE_NOTIFICATIONS -> handleSiteNotificationsClicked(post.blogId, post.feedId)
+            SHARE -> handleShareClicked(post, source)
+            VISIT_SITE -> handleVisitSiteClicked(post)
+            BLOCK_SITE -> handleBlockSiteClicked(post.blogId, post.feedId, source)
+            LIKE -> handleLikeClicked(post, source)
+            BOOKMARK -> handleBookmarkClicked(post, isBookmarkList, source)
+            REBLOG -> handleReblogClicked(post)
+            COMMENTS -> handleCommentsClicked(post.postId, post.blogId)
+            REPORT_POST -> handleReportPostClicked(post)
+            TOGGLE_SEEN_STATUS -> handleToggleSeenStatusClicked(post, source)
+            SPACER_NO_ACTION -> Unit // Do nothing
+        }
+    }
+
+    suspend fun handleOnItemClicked(
+        post: ReaderPost,
+        source: String
+    ) {
         withContext(bgDispatcher) {
-            appRatingDialogWrapper.incrementInteractions(APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST)
+            appRatingDialogWrapper.incrementInteractions(
+                    AnalyticsTracker.Stat.APP_REVIEWS_EVENT_INCREMENTED_BY_OPENING_READER_POST
+            )
 
             if (post.isBookmarked) {
-                analyticsTrackerWrapper.track(READER_SAVED_POST_OPENED_FROM_OTHER_POST_LIST)
+                readerTracker.trackBlog(
+                        AnalyticsTracker.Stat.READER_SAVED_POST_OPENED_FROM_OTHER_POST_LIST,
+                        post.blogId,
+                        post.feedId,
+                        post.isFollowedByCurrentUser,
+                        source
+                )
             }
             _navigationEvents.postValue(Event(ShowPostDetail(post)))
         }
@@ -147,38 +218,86 @@ class ReaderPostCardActionsHandler @Inject constructor(
         }
     }
 
-    suspend fun handleHeaderClicked(siteId: Long, feedId: Long) {
+    suspend fun handleHeaderClicked(siteId: Long, feedId: Long, isFollowed: Boolean) {
         withContext(bgDispatcher) {
-            _navigationEvents.postValue(Event(ShowBlogPreview(siteId, feedId)))
+            _navigationEvents.postValue(Event(ShowBlogPreview(siteId, feedId, isFollowed)))
         }
     }
 
     suspend fun handleReportPostClicked(post: ReaderPost) {
         withContext(bgDispatcher) {
-            val properties: MutableMap<String, Any> = HashMap()
-            properties["blog_id"] = post.blogId
-            properties["is_jetpack"] = post.isJetpack
-            properties["post_id"] = post.postId
-            analyticsTrackerWrapper.track(READER_POST_REPORTED, properties)
+            readerTracker.trackBlogPost(
+                    AnalyticsTracker.Stat.READER_POST_REPORTED,
+                    post.blogId,
+                    post.postId,
+                    post.isJetpack
+            )
             _navigationEvents.postValue(Event(ShowReportPost(post.blogUrl)))
         }
     }
 
-    suspend fun handleFollowRecommendedSiteClicked(recommendedBlogUiState: ReaderRecommendedBlogUiState) {
+    private suspend fun handleToggleSeenStatusClicked(post: ReaderPost, source: String) {
+        val actionSource = if (source == ReaderTracker.SOURCE_POST_DETAIL) {
+            READER_POST_DETAILS
+        } else {
+            READER_POST_CARD
+        }
+        seenStatusToggleUseCase.toggleSeenStatus(post, actionSource).flowOn(bgDispatcher).collect { state ->
+            when (state) {
+                is Error -> {
+                    state.message?.let {
+                        _snackbarEvents.postValue(
+                                Event(SnackbarMessageHolder(it))
+                        )
+                    }
+                }
+                is PostSeenStateChanged -> {
+                    state.userMessage?.let {
+                        _snackbarEvents.postValue(
+                                Event(SnackbarMessageHolder(it))
+                        )
+                    }
+                }
+                is UserNotAuthenticated -> { // should not happen with current implementation
+                    AppLog.e(
+                            T.READER,
+                            "User was not authenticated when attempting to toggle Seen/Unseen status of the post"
+                    )
+                }
+            }
+        }
+    }
+
+    suspend fun handleFollowRecommendedSiteClicked(
+        recommendedBlogUiState: ReaderRecommendedBlogUiState,
+        source: String
+    ) {
         val param = ReaderSiteFollowUseCase.Param(
                 blogId = recommendedBlogUiState.blogId,
                 blogName = recommendedBlogUiState.name,
                 feedId = recommendedBlogUiState.feedId
         )
-        followSite(param)
+        followSite(param, source)
     }
 
-    private suspend fun handleFollowClicked(post: ReaderPost) {
-        followSite(ReaderSiteFollowUseCase.Param(post.blogId, post.feedId, post.blogName))
+    private suspend fun handleFollowClicked(
+        post: ReaderPost,
+        source: String
+    ) {
+        followSite(
+                ReaderSiteFollowUseCase.Param(
+                        post.blogId,
+                        post.feedId,
+                        post.blogName
+                ), source
+        )
     }
 
-    private suspend fun followSite(followSiteParam: ReaderSiteFollowUseCase.Param) {
-        followUseCase.toggleFollow(followSiteParam).collect {
+    private suspend fun followSite(
+        followSiteParam: ReaderSiteFollowUseCase.Param,
+        source: String
+    ) {
+        followUseCase.toggleFollow(followSiteParam, source).collect {
             when (it) {
                 is FollowSiteState.Failed.NoNetwork -> {
                     _snackbarEvents.postValue(
@@ -190,13 +309,17 @@ class ReaderPostCardActionsHandler @Inject constructor(
                             Event(SnackbarMessageHolder((UiStringRes(R.string.reader_error_request_failed_title))))
                     )
                 }
-                is FollowSiteState.Success -> Unit // Do nothing
+                is FollowSiteState.AlreadyRunning, FollowSiteState.Success -> Unit // Do nothing
                 is FollowStatusChanged -> {
                     _followStatusUpdated.postValue(it)
                     siteNotificationsUseCase.fetchSubscriptions()
 
                     if (it.showEnableNotification) {
-                        val action = prepareEnableNotificationSnackbarAction(followSiteParam.blogName, it.blogId)
+                        val action = prepareEnableNotificationSnackbarAction(
+                                followSiteParam.blogName,
+                                it.blogId,
+                                it.feedId
+                        )
                         action.invoke()
                     } else if (it.deleteNotificationSubscription) {
                         siteNotificationsUseCase.updateSubscription(it.blogId, DELETE)
@@ -207,8 +330,8 @@ class ReaderPostCardActionsHandler @Inject constructor(
         }
     }
 
-    private suspend fun handleSiteNotificationsClicked(blogId: Long) {
-        when (siteNotificationsUseCase.toggleNotification(blogId)) {
+    private suspend fun handleSiteNotificationsClicked(blogId: Long, feedId: Long) {
+        when (siteNotificationsUseCase.toggleNotification(blogId, feedId)) {
             is SiteNotificationState.Success, SiteNotificationState.Failed.AlreadyRunning -> { // Do Nothing
             }
             is SiteNotificationState.Failed.NoNetwork -> {
@@ -224,8 +347,17 @@ class ReaderPostCardActionsHandler @Inject constructor(
         }
     }
 
-    private fun handleShareClicked(post: ReaderPost) {
-        analyticsTrackerWrapper.track(SHARED_ITEM_READER, post.blogId)
+    private fun handleShareClicked(
+        post: ReaderPost,
+        source: String
+    ) {
+        readerTracker.trackBlog(
+                AnalyticsTracker.Stat.SHARED_ITEM_READER,
+                post.blogId,
+                post.feedId,
+                post.isFollowedByCurrentUser,
+                source
+        )
         try {
             _navigationEvents.postValue(Event(SharePost(post)))
         } catch (ex: ActivityNotFoundException) {
@@ -234,12 +366,16 @@ class ReaderPostCardActionsHandler @Inject constructor(
     }
 
     private fun handleVisitSiteClicked(post: ReaderPost) {
-        analyticsTrackerWrapper.track(READER_ARTICLE_VISITED)
+        readerTracker.track(AnalyticsTracker.Stat.READER_ARTICLE_VISITED)
         _navigationEvents.postValue(Event(OpenPost(post)))
     }
 
-    private suspend fun handleBlockSiteClicked(blogId: Long) {
-        blockBlogUseCase.blockBlog(blogId).collect {
+    private suspend fun handleBlockSiteClicked(
+        blogId: Long,
+        feedId: Long,
+        source: String
+    ) {
+        blockBlogUseCase.blockBlog(blogId, feedId).collect {
             when (it) {
                 is BlockSiteState.SiteBlockedInLocalDb -> {
                     _refreshPosts.postValue(Event(Unit))
@@ -249,8 +385,8 @@ class ReaderPostCardActionsHandler @Inject constructor(
                                             UiStringRes(R.string.reader_toast_blog_blocked),
                                             UiStringRes(R.string.undo),
                                             {
-                                                uiScope.launch {
-                                                    undoBlockBlogUseCase.undoBlockBlog(it.blockedBlogData)
+                                                coroutineScope.launch {
+                                                    undoBlockBlogUseCase.undoBlockBlog(it.blockedBlogData, source)
                                                     _refreshPosts.postValue(Event(Unit))
                                                 }
                                             })
@@ -273,8 +409,8 @@ class ReaderPostCardActionsHandler @Inject constructor(
         }
     }
 
-    private suspend fun handleLikeClicked(post: ReaderPost, fromPostDetails: Boolean) {
-        likeUseCase.perform(post, !post.isLikedByCurrentUser, fromPostDetails).collect {
+    private suspend fun handleLikeClicked(post: ReaderPost, source: String) {
+        likeUseCase.perform(post, !post.isLikedByCurrentUser, source).collect {
             when (it) {
                 is PostLikeState.PostLikedInLocalDb -> {
                     _refreshPosts.postValue(Event(Unit))
@@ -295,14 +431,15 @@ class ReaderPostCardActionsHandler @Inject constructor(
     }
 
     private suspend fun handleBookmarkClicked(
-        postId: Long,
-        blogId: Long,
+        post: ReaderPost,
         isBookmarkList: Boolean,
-        fromPostDetails: Boolean
+        source: String
     ) {
-        bookmarkUseCase.toggleBookmark(blogId, postId, isBookmarkList, fromPostDetails).collect {
+        bookmarkUseCase.toggleBookmark(post, isBookmarkList, source).collect {
             when (it) {
-                is PreLoadPostContent -> _preloadPostEvents.postValue(Event(PreLoadPostContent(blogId, postId)))
+                is PreLoadPostContent -> _preloadPostEvents.postValue(
+                        Event(PreLoadPostContent(post.blogId, post.postId))
+                )
                 is Success -> {
                     // Content needs to be manually refreshed in the legacy ReaderPostListAdapter and
                     // ReaderPostDetailFragment
@@ -315,9 +452,9 @@ class ReaderPostCardActionsHandler @Inject constructor(
                                                 UiStringRes(R.string.reader_bookmark_snack_title),
                                                 UiStringRes(R.string.reader_bookmark_snack_btn),
                                                 buttonAction = {
-                                                    analyticsTrackerWrapper.track(
-                                                            READER_SAVED_LIST_SHOWN,
-                                                            mapOf("source" to "post_list_saved_post_notice")
+                                                    readerTracker.track(
+                                                            AnalyticsTracker.Stat.READER_SAVED_LIST_SHOWN,
+                                                            ReaderTracker.SOURCE_POST_LIST_SAVED_POST_NOTICE
                                                     )
                                                     _navigationEvents.postValue(Event(ShowBookmarkedTab))
                                                 })
@@ -358,7 +495,11 @@ class ReaderPostCardActionsHandler @Inject constructor(
         _navigationEvents.postValue(Event(ShowReaderComments(blogId, postId)))
     }
 
-    private fun prepareEnableNotificationSnackbarAction(blogName: String?, blogId: Long): () -> Unit {
+    private fun prepareEnableNotificationSnackbarAction(
+        blogName: String?,
+        blogId: Long,
+        feedId: Long
+    ): () -> Unit {
         return {
             val thisSite = resourceProvider.getString(R.string.reader_followed_blog_notifications_this)
             val blog = if (blogName?.isEmpty() == true) thisSite else blogName
@@ -375,9 +516,12 @@ class ReaderPostCardActionsHandler @Inject constructor(
                                     UiStringText(notificationMessage),
                                     UiStringRes(R.string.reader_followed_blog_notifications_action),
                                     buttonAction = {
-                                        defaultScope.launch {
-                                            analyticsTrackerWrapper
-                                                    .track(FOLLOWED_BLOG_NOTIFICATIONS_READER_ENABLED, blogId)
+                                        coroutineScope.launch(bgDispatcher) {
+                                            readerTracker.trackBlog(
+                                                    AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_ENABLED,
+                                                    blogId,
+                                                    feedId
+                                            )
                                             siteNotificationsUseCase.updateSubscription(blogId, NEW)
                                             siteNotificationsUseCase.updateNotificationEnabledForBlogInDb(blogId, true)
                                         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilder.kt
index c3d7ec57ad3f..998d3c2da583 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilder.kt
@@ -8,138 +8,202 @@ import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.modules.BG_THREAD
-import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
-import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType.TAG_FOLLOWED
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SpacerNoAction
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.BLOCK_SITE
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.FOLLOW
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REPORT_POST
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SHARE
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SITE_NOTIFICATIONS
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.TOGGLE_SEEN_STATUS
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.VISIT_SITE
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig
 import javax.inject.Inject
 import javax.inject.Named
 
+@Suppress("TooManyFunctions")
 @Reusable
 class ReaderPostMoreButtonUiStateBuilder @Inject constructor(
     private val readerPostTableWrapper: ReaderPostTableWrapper,
     private val readerBlogTableWrapper: ReaderBlogTableWrapper,
     private val readerUtilsWrapper: ReaderUtilsWrapper,
+    private val seenUnseenWithCounterFeatureConfig: SeenUnseenWithCounterFeatureConfig,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) {
     suspend fun buildMoreMenuItems(
         post: ReaderPost,
-        postListType: ReaderPostListType,
         onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
-    ): List<SecondaryAction> {
+    ): List<ReaderPostCardAction> {
         return withContext(bgDispatcher) {
-            buildMoreMenuItemsBlocking(post, postListType, onButtonClicked)
+            buildMoreMenuItemsBlocking(post, onButtonClicked)
         }
     }
 
     fun buildMoreMenuItemsBlocking(
         post: ReaderPost,
-        postListType: ReaderPostListType,
         onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
-    ): MutableList<SecondaryAction> {
-        val menuItems = mutableListOf<SecondaryAction>()
-        if (readerPostTableWrapper.isPostFollowed(post)) {
-            menuItems.add(
-                    SecondaryAction(
-                            type = FOLLOW,
-                            label = UiStringRes(R.string.reader_btn_unfollow),
-                            labelColor = R.attr.wpColorOnSurfaceMedium,
-                            iconRes = R.drawable.ic_reader_following_white_24dp,
-                            isSelected = true,
-                            onClicked = onButtonClicked
-                    )
+    ): MutableList<ReaderPostCardAction> {
+        val menuItems = mutableListOf<ReaderPostCardAction>()
+        val isPostFollowed = readerPostTableWrapper.isPostFollowed(post)
+
+        menuItems.add(buildVisitSite(onButtonClicked))
+        checkAndAddMenuItemForSiteNotifications(menuItems, isPostFollowed, post, onButtonClicked)
+        checkAndAddMenuItemForPostSeenUnseen(menuItems, post, onButtonClicked)
+        menuItems.add(buildShare(onButtonClicked))
+        menuItems.add(buildFollow(isPostFollowed, onButtonClicked))
+        menuItems.add(SpacerNoAction())
+        checkAndAddMenuItemForBlockSite(menuItems, isPostFollowed, onButtonClicked)
+        menuItems.add(buildReportPost(onButtonClicked))
+
+        return menuItems
+    }
+
+    private fun buildVisitSite(onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit) =
+            SecondaryAction(
+                    type = VISIT_SITE,
+                    label = UiStringRes(R.string.reader_label_visit),
+                    labelColor = R.attr.colorOnSurface,
+                    iconRes = R.drawable.ic_globe_white_24dp,
+                    iconColor = R.attr.wpColorOnSurfaceMedium,
+                    onClicked = onButtonClicked
             )
 
+    private fun checkAndAddMenuItemForSiteNotifications(
+        menuItems: MutableList<ReaderPostCardAction>,
+        isPostFollowed: Boolean,
+        post: ReaderPost,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
+    ) {
+        if (isPostFollowed) {
             // When post not from external feed then show notifications option.
             if (!readerUtilsWrapper.isExternalFeed(post.blogId, post.feedId)) {
-                if (readerBlogTableWrapper.isNotificationsEnabled(post.blogId)) {
-                    menuItems.add(
-                            SecondaryAction(
-                                    type = SITE_NOTIFICATIONS,
-                                    label = UiStringRes(R.string.reader_btn_notifications_off),
-                                    labelColor = R.attr.wpColorOnSurfaceMedium,
-                                    iconRes = R.drawable.ic_bell_white_24dp,
-                                    isSelected = true,
-                                    onClicked = onButtonClicked
-                            )
-                    )
-                } else {
-                    menuItems.add(
-                            SecondaryAction(
-                                    type = SITE_NOTIFICATIONS,
-                                    label = UiStringRes(R.string.reader_btn_notifications_on),
-                                    labelColor = R.attr.colorOnSurface,
-                                    iconRes = R.drawable.ic_bell_white_24dp,
-                                    iconColor = R.attr.wpColorOnSurfaceMedium,
-                                    isSelected = false,
-                                    onClicked = onButtonClicked
-                            )
-                    )
-                }
+                menuItems.add(buildSiteNotifications(
+                        readerBlogTableWrapper.isNotificationsEnabled(post.blogId), onButtonClicked))
             }
-        } else {
-            menuItems.add(
-                    SecondaryAction(
-                            type = FOLLOW,
-                            label = UiStringRes(R.string.reader_btn_follow),
-                            labelColor = R.attr.colorSecondary,
-                            iconRes = R.drawable.ic_reader_follow_white_24dp,
-                            isSelected = false,
-                            onClicked = onButtonClicked
-                    )
-            )
         }
+    }
 
-        menuItems.add(
+    private fun buildSiteNotifications(
+        isNotificationsEnabled: Boolean,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
+    ): SecondaryAction =
+            if (isNotificationsEnabled) {
                 SecondaryAction(
-                        type = SHARE,
-                        label = UiStringRes(R.string.reader_btn_share),
-                        labelColor = R.attr.colorOnSurface,
-                        iconRes = R.drawable.ic_share_white_24dp,
-                        iconColor = R.attr.wpColorOnSurfaceMedium,
+                        type = SITE_NOTIFICATIONS,
+                        label = UiStringRes(R.string.reader_btn_notifications_off),
+                        labelColor = R.attr.wpColorOnSurfaceMedium,
+                        iconRes = R.drawable.ic_bell_white_24dp,
+                        isSelected = true,
                         onClicked = onButtonClicked
                 )
-        )
-        menuItems.add(
+            } else {
                 SecondaryAction(
-                        type = VISIT_SITE,
-                        label = UiStringRes(R.string.reader_label_visit),
+                        type = SITE_NOTIFICATIONS,
+                        label = UiStringRes(R.string.reader_btn_notifications_on),
                         labelColor = R.attr.colorOnSurface,
-                        iconRes = R.drawable.ic_globe_white_24dp,
+                        iconRes = R.drawable.ic_bell_white_24dp,
                         iconColor = R.attr.wpColorOnSurfaceMedium,
+                        isSelected = false,
                         onClicked = onButtonClicked
                 )
-        )
+            }
 
-        if (postListType == TAG_FOLLOWED) {
-            menuItems.add(
-                    SecondaryAction(
-                            type = BLOCK_SITE,
-                            label = UiStringRes(R.string.reader_menu_block_blog),
-                            labelColor = R.attr.colorOnSurface,
-                            iconRes = R.drawable.ic_block_white_24dp,
-                            iconColor = R.attr.wpColorOnSurfaceMedium,
-                            onClicked = onButtonClicked
-                    )
+    private fun checkAndAddMenuItemForPostSeenUnseen(
+        menuItems: MutableList<ReaderPostCardAction>,
+        post: ReaderPost,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
+    ) {
+        if (seenUnseenWithCounterFeatureConfig.isEnabled()) {
+            if (post.isSeenSupported) {
+                menuItems.add(buildPostSeenUnseen(readerPostTableWrapper.isPostSeen(post), onButtonClicked))
+            }
+        }
+    }
+
+    private fun buildPostSeenUnseen(
+        isPostSeen: Boolean,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
+    ): SecondaryAction =
+        if (isPostSeen) {
+            SecondaryAction(
+                    type = TOGGLE_SEEN_STATUS,
+                    label = UiStringRes(R.string.reader_menu_mark_as_unseen),
+                    labelColor = R.attr.colorOnSurface,
+                    iconRes = R.drawable.ic_not_visible_white_24dp,
+                    iconColor = R.attr.wpColorOnSurfaceMedium,
+                    isSelected = false,
+                    onClicked = onButtonClicked
             )
-            menuItems.add(
-                    SecondaryAction(
-                            type = REPORT_POST,
-                            label = UiStringRes(R.string.reader_menu_report_post),
-                            labelColor = R.attr.colorOnSurface,
-                            iconRes = R.drawable.ic_block_white_24dp,
-                            iconColor = R.attr.wpColorOnSurfaceMedium,
-                            onClicked = onButtonClicked
-                    )
+        } else {
+            SecondaryAction(
+                    type = TOGGLE_SEEN_STATUS,
+                    label = UiStringRes(R.string.reader_menu_mark_as_seen),
+                    labelColor = R.attr.colorOnSurface,
+                    iconRes = R.drawable.ic_visible_white_24dp,
+                    iconColor = R.attr.wpColorOnSurfaceMedium,
+                    isSelected = false,
+                    onClicked = onButtonClicked
             )
         }
-        return menuItems
+
+    private fun buildShare(onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit) =
+        SecondaryAction(
+        type = SHARE,
+        label = UiStringRes(R.string.reader_btn_share),
+        labelColor = R.attr.colorOnSurface,
+        iconRes = R.drawable.ic_share_white_24dp,
+        iconColor = R.attr.wpColorOnSurfaceMedium,
+        onClicked = onButtonClicked
+    )
+
+    private fun buildFollow(isPostFollowed: Boolean, onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit) =
+        if (isPostFollowed) {
+            SecondaryAction(
+                    type = FOLLOW,
+                    label = UiStringRes(R.string.reader_btn_unfollow),
+                    labelColor = R.attr.wpColorOnSurfaceMedium,
+                    iconRes = R.drawable.ic_reader_following_white_24dp,
+                    isSelected = true,
+                    onClicked = onButtonClicked
+            )
+        } else {
+            SecondaryAction(
+                    type = FOLLOW,
+                    label = UiStringRes(R.string.reader_btn_follow),
+                    labelColor = R.attr.colorSecondary,
+                    iconRes = R.drawable.ic_reader_follow_white_24dp,
+                    isSelected = false,
+                    onClicked = onButtonClicked
+            )
+        }
+
+    private fun checkAndAddMenuItemForBlockSite(
+        menuItems: MutableList<ReaderPostCardAction>,
+        isPostFollowed: Boolean,
+        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
+    ) {
+        if (!isPostFollowed) menuItems.add(buildBlockSite(onButtonClicked))
     }
+
+    private fun buildBlockSite(onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit) =
+            SecondaryAction(
+                    type = BLOCK_SITE,
+                    label = UiStringRes(R.string.reader_menu_block_blog),
+                    labelColor = R.attr.wpColorError,
+                    iconRes = R.drawable.ic_block_white_24dp,
+                    iconColor = R.attr.wpColorError,
+                    onClicked = onButtonClicked
+            )
+
+    private fun buildReportPost(onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit) =
+            SecondaryAction(
+                    type = REPORT_POST,
+                    label = UiStringRes(R.string.reader_menu_report_post),
+                    labelColor = R.attr.wpColorError,
+                    iconRes = R.drawable.ic_block_white_24dp,
+                    iconColor = R.attr.wpColorError,
+                    onClicked = onButtonClicked
+            )
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilder.kt
index 8be3064a99ee..05f0db811948 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilder.kt
@@ -20,12 +20,17 @@ import org.wordpress.android.models.ReaderTagList
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.ui.reader.ReaderConstants
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestChipStyleColor
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStyleGreen
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStyleOrange
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStylePurple
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStyleYellow
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ReaderInterestUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiState.DiscoverLayoutUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiState.GalleryThumbnailStripData
-
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryAction
@@ -40,10 +45,13 @@ import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState.R
 import org.wordpress.android.ui.utils.UiDimen.UIDimenRes
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.DateTimeUtilsWrapper
 import org.wordpress.android.util.GravatarUtilsWrapper
+import org.wordpress.android.util.SiteUtils
 import org.wordpress.android.util.UrlUtilsWrapper
+import org.wordpress.android.util.image.BlavatarShape.CIRCULAR
 import org.wordpress.android.util.image.ImageType.AVATAR
 import org.wordpress.android.util.image.ImageType.BLAVATAR
 import javax.inject.Inject
@@ -64,6 +72,7 @@ class ReaderPostUiStateBuilder @Inject constructor(
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) {
     suspend fun mapPostToUiState(
+        source: String,
         post: ReaderPost,
         isDiscover: Boolean = false,
         photonWidth: Int,
@@ -82,6 +91,7 @@ class ReaderPostUiStateBuilder @Inject constructor(
     ): ReaderPostUiState {
         return withContext(bgDispatcher) {
             mapPostToUiStateBlocking(
+                    source,
                     post,
                     isDiscover,
                     photonWidth,
@@ -101,7 +111,9 @@ class ReaderPostUiStateBuilder @Inject constructor(
         }
     }
 
+    @Suppress("LongParameterList")
     fun mapPostToUiStateBlocking(
+        source: String,
         post: ReaderPost,
         isDiscover: Boolean = false,
         photonWidth: Int,
@@ -116,12 +128,15 @@ class ReaderPostUiStateBuilder @Inject constructor(
         onVideoOverlayClicked: (Long, Long) -> Unit,
         onPostHeaderViewClicked: (Long, Long) -> Unit,
         onTagItemClicked: (String) -> Unit,
-        moreMenuItems: List<SecondaryAction>? = null
+        moreMenuItems: List<ReaderPostCardAction>? = null
     ): ReaderPostUiState {
         return ReaderPostUiState(
+                source = source,
                 postId = post.postId,
                 blogId = post.blogId,
-                blogSection = buildBlogSection(post, onPostHeaderViewClicked, postListType),
+                feedId = post.feedId,
+                isFollowed = post.isFollowedByCurrentUser,
+                blogSection = buildBlogSection(post, onPostHeaderViewClicked, postListType, post.isP2orA8C),
                 excerpt = buildExcerpt(post),
                 title = buildTitle(post),
                 tagItems = buildTagItems(post, onTagItemClicked),
@@ -133,7 +148,7 @@ class ReaderPostUiStateBuilder @Inject constructor(
                 expandableTagsViewVisibility = buildExpandedTagsViewVisibility(post, isDiscover),
                 videoOverlayVisibility = buildVideoOverlayVisibility(post),
                 featuredImageVisibility = buildFeaturedImageVisibility(post),
-                moreMenuVisibility = accountStore.hasAccessToken() && postListType == ReaderPostListType.TAG_FOLLOWED,
+                moreMenuVisibility = accountStore.hasAccessToken(),
                 moreMenuItems = moreMenuItems,
                 fullVideoUrl = buildFullVideoUrl(post),
                 discoverSection = buildDiscoverSection(post, onDiscoverSectionClicked),
@@ -178,13 +193,12 @@ class ReaderPostUiStateBuilder @Inject constructor(
             } else {
                 READER_INTEREST_LIST_SIZE_LIMIT
             }
-            val lastIndex = listSize - 1
 
             return@withContext ReaderInterestsCardUiState(interests.take(listSize).map { interest ->
                 ReaderInterestUiState(
-                        interest.tagTitle,
-                        buildIsDividerVisible(interest, interests, lastIndex),
-                        onClicked
+                        interest = interest.tagTitle,
+                        onClicked = onClicked,
+                        chipStyle = buildChipStyle(interest, interests)
                 )
             })
         }
@@ -192,7 +206,7 @@ class ReaderPostUiStateBuilder @Inject constructor(
 
     suspend fun mapRecommendedBlogsToReaderRecommendedBlogsCardUiState(
         recommendedBlogs: List<ReaderBlog>,
-        onItemClicked: (Long, Long) -> Unit,
+        onItemClicked: (Long, Long, Boolean) -> Unit,
         onFollowClicked: (ReaderRecommendedBlogUiState) -> Unit
     ): ReaderRecommendedBlogsCardUiState = withContext(bgDispatcher) {
         recommendedBlogs.take(READER_RECOMMENDED_BLOGS_LIST_SIZE_LIMIT)
@@ -214,28 +228,33 @@ class ReaderPostUiStateBuilder @Inject constructor(
     private fun buildBlogSection(
         post: ReaderPost,
         onBlogSectionClicked: (Long, Long) -> Unit,
-        postListType: ReaderPostListType? = null
-    ) = buildBlogSectionUiState(post, onBlogSectionClicked, postListType)
+        postListType: ReaderPostListType? = null,
+        isP2Post: Boolean = false
+    ) = buildBlogSectionUiState(post, onBlogSectionClicked, postListType, isP2Post)
 
     private fun buildBlogSectionUiState(
         post: ReaderPost,
         onBlogSectionClicked: (Long, Long) -> Unit,
-        postListType: ReaderPostListType?
+        postListType: ReaderPostListType?,
+        isP2Post: Boolean = false
     ): ReaderBlogSectionUiState {
         return ReaderBlogSectionUiState(
                 postId = post.postId,
                 blogId = post.blogId,
-                blogName = buildBlogName(post),
+                blogName = buildBlogName(post, isP2Post),
                 blogUrl = buildBlogUrl(post),
                 dateLine = buildDateLine(post),
                 avatarOrBlavatarUrl = buildAvatarOrBlavatarUrl(post),
+                isAuthorAvatarVisible = isP2Post,
+                blavatarType = SiteUtils.getSiteImageType(isP2Post, CIRCULAR),
+                authorAvatarUrl = gravatarUtilsWrapper.fixGravatarUrlWithResource(
+                        post.postAvatar,
+                        R.dimen.avatar_sz_medium
+                ),
                 blogSectionClickData = buildOnBlogSectionClicked(onBlogSectionClicked, postListType)
         )
     }
 
-    private fun buildIsDividerVisible(readerTag: ReaderTag, readerTagList: ReaderTagList, lastIndex: Int) =
-            readerTagList.indexOf(readerTag) != lastIndex
-
     private fun buildOnBlogSectionClicked(
         onBlogSectionClicked: (Long, Long) -> Unit,
         postListType: ReaderPostListType?
@@ -304,8 +323,22 @@ class ReaderPostUiStateBuilder @Inject constructor(
     private fun buildExcerpt(post: ReaderPost) =
             post.takeIf { post.cardType != PHOTO && post.hasExcerpt() }?.excerpt
 
-    private fun buildBlogName(post: ReaderPost) = post.takeIf { it.hasBlogName() }?.blogName?.let { UiStringText(it) }
-            ?: UiStringRes(R.string.untitled_in_parentheses)
+    private fun buildBlogName(post: ReaderPost, isP2Post: Boolean = false): UiString {
+        val blogName = post.takeIf { it.hasBlogName() }?.blogName?.let { UiStringText(it) }
+                ?: UiStringRes(R.string.untitled_in_parentheses)
+
+        if (!isP2Post) {
+            return blogName
+        }
+
+        val authorName = if (post.hasAuthorFirstName()) {
+            UiStringText(post.authorFirstName)
+        } else {
+            UiStringText(post.authorName)
+        }
+
+        return UiStringResWithParams(R.string.reader_author_with_blog_name, listOf(authorName, blogName))
+    }
 
     private fun buildAvatarOrBlavatarUrl(post: ReaderPost) =
             post.takeIf { it.hasBlogImageUrl() }
@@ -422,4 +455,17 @@ class ReaderPostUiStateBuilder @Inject constructor(
             )
         }
     }
+
+    private fun buildChipStyle(readerTag: ReaderTag, readerTagList: ReaderTagList): ChipStyle {
+        val colorCount = ReaderInterestChipStyleColor.values().size
+        val index = readerTagList.indexOf(readerTag)
+
+        return when (index % colorCount) {
+            ReaderInterestChipStyleColor.GREEN.id -> ChipStyleGreen
+            ReaderInterestChipStyleColor.PURPLE.id -> ChipStylePurple
+            ReaderInterestChipStyleColor.YELLOW.id -> ChipStyleYellow
+            ReaderInterestChipStyleColor.ORANGE.id -> ChipStyleOrange
+            else -> ChipStyleGreen
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt
new file mode 100644
index 000000000000..b90d9001d191
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsActivity.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.ui.reader.discover.interests
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import org.wordpress.android.databinding.ReaderInterestsActivityBinding
+
+class ReaderInterestsActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val binding = ReaderInterestsActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        setSupportActionBar(binding.toolbarMain)
+        supportActionBar?.let {
+            it.setHomeButtonEnabled(true)
+            it.setDisplayHomeAsUpEnabled(true)
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsFragment.kt
index bc1c394dd965..5e53890e7816 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsFragment.kt
@@ -3,15 +3,12 @@ package org.wordpress.android.ui.reader.discover.interests
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.chip.Chip
 import com.google.android.material.snackbar.Snackbar
-import kotlinx.android.synthetic.main.reader_fullscreen_error_with_retry.*
-import kotlinx.android.synthetic.main.reader_interests_fragment_layout.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderInterestsFragmentLayoutBinding
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.UiState.ContentUiState
@@ -20,6 +17,7 @@ import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewMod
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.LocaleManager
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPSnackbar
 import javax.inject.Inject
 
@@ -27,7 +25,7 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
     @Inject lateinit var uiHelpers: UiHelpers
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: ReaderInterestsViewModel
-    private lateinit var parentViewModel: ReaderViewModel
+    private var parentViewModel: ReaderViewModel? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,38 +34,50 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        initDoneButton()
-        initRetryButton()
-        initBackButton()
-        initViewModel()
+        val entryPoint = requireActivity().intent.getSerializableExtra(READER_INTEREST_ENTRY_POINT) as? EntryPoint
+                ?: EntryPoint.DISCOVER
+        with(ReaderInterestsFragmentLayoutBinding.bind(view)) {
+            initDoneButton()
+            initRetryButton()
+            initBackButton(entryPoint)
+            initViewModel(entryPoint)
+        }
     }
 
-    private fun initDoneButton() {
-        done_button.setOnClickListener {
+    private fun ReaderInterestsFragmentLayoutBinding.initDoneButton() {
+        doneButton.setOnClickListener {
             viewModel.onDoneButtonClick()
         }
     }
 
-    private fun initRetryButton() {
-        error_retry.setOnClickListener {
+    private fun ReaderInterestsFragmentLayoutBinding.initRetryButton() {
+        includeErrorLayout.errorRetry.setOnClickListener {
             viewModel.onRetryButtonClick()
         }
     }
 
-    private fun initBackButton() {
-        back_button.setOnClickListener {
-            viewModel.onBackButtonClick()
+    private fun ReaderInterestsFragmentLayoutBinding.initBackButton(entryPoint: EntryPoint) {
+        if (entryPoint == EntryPoint.DISCOVER) {
+            backButton.visibility = View.VISIBLE
+            backButton.setOnClickListener {
+                viewModel.onBackButtonClick()
+            }
         }
     }
 
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(ReaderInterestsViewModel::class.java)
-        parentViewModel = ViewModelProviders.of(requireParentFragment()).get(ReaderViewModel::class.java)
-        startObserving()
+    private fun ReaderInterestsFragmentLayoutBinding.initViewModel(entryPoint: EntryPoint) {
+        viewModel = ViewModelProvider(
+                this@ReaderInterestsFragment,
+                viewModelFactory
+        ).get(ReaderInterestsViewModel::class.java)
+        if (entryPoint == EntryPoint.DISCOVER) {
+            parentViewModel = ViewModelProvider(requireParentFragment()).get(ReaderViewModel::class.java)
+        }
+        startObserving(entryPoint)
     }
 
-    private fun startObserving() {
-        viewModel.uiState.observe(viewLifecycleOwner, Observer { uiState ->
+    private fun ReaderInterestsFragmentLayoutBinding.startObserving(entryPoint: EntryPoint) {
+        viewModel.uiState.observe(viewLifecycleOwner) { uiState ->
             when (uiState) {
                 is InitialLoadingUiState -> {
                 }
@@ -80,33 +90,39 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
             }
             updateDoneButton(uiState.doneButtonUiState)
             with(uiHelpers) {
-                updateVisibility(progress_bar, uiState.progressBarVisible)
+                updateVisibility(progressBar, uiState.progressBarVisible)
                 updateVisibility(title, uiState.titleVisible)
-                updateVisibility(error_layout, uiState.errorLayoutVisible)
+                updateVisibility(includeErrorLayout.errorLayout, uiState.errorLayoutVisible)
             }
-        })
+        }
 
-        viewModel.snackbarEvents.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
-                showSnackbar()
-            }
-        })
+        viewModel.snackbarEvents.observeEvent(viewLifecycleOwner) {
+            it.showSnackbar(bottomBar)
+        }
 
-        viewModel.start(parentViewModel, LocaleManager.getLanguage(WordPress.getContext()))
+        viewModel.closeReaderInterests.observeEvent(viewLifecycleOwner) {
+            requireActivity().finish()
+        }
+
+        viewModel.start(
+                LocaleManager.getLanguage(WordPress.getContext()),
+                parentViewModel,
+                entryPoint
+        )
     }
 
-    private fun updateDoneButton(doneButtonUiState: DoneButtonUiState) {
-        with(done_button) {
+    private fun ReaderInterestsFragmentLayoutBinding.updateDoneButton(doneButtonUiState: DoneButtonUiState) {
+        with(doneButton) {
             isEnabled = doneButtonUiState.enabled
             text = getString(doneButtonUiState.titleRes)
         }
-        uiHelpers.updateVisibility(done_button, doneButtonUiState.visible)
+        uiHelpers.updateVisibility(doneButton, doneButtonUiState.visible)
     }
 
-    private fun updateInterests(interestsUiState: List<TagUiState>) {
+    private fun ReaderInterestsFragmentLayoutBinding.updateInterests(interestsUiState: List<TagUiState>) {
         interestsUiState.forEachIndexed { index, interestTagUiState ->
-            val chip = interests_chip_group.findViewWithTag(interestTagUiState.slug)
-                ?: createChipView(interestTagUiState.slug, index)
+            val chip = interestsChipGroup.findViewWithTag(interestTagUiState.slug)
+                    ?: createChipView(interestTagUiState.slug, index)
             with(chip) {
                 text = interestTagUiState.title
                 isChecked = interestTagUiState.isChecked
@@ -114,15 +130,15 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
         }
     }
 
-    private fun updateErrorLayout(uiState: ErrorUiState) {
+    private fun ReaderInterestsFragmentLayoutBinding.updateErrorLayout(uiState: ErrorUiState) {
         with(uiHelpers) {
-            setTextOrHide(error_title, uiState.titleResId)
+            setTextOrHide(includeErrorLayout.errorTitle, uiState.titleRes)
         }
     }
 
-    private fun SnackbarMessageHolder.showSnackbar() {
+    private fun SnackbarMessageHolder.showSnackbar(anchorView: View) {
         val snackbar = WPSnackbar.make(
-                bottom_bar,
+                anchorView,
                 uiHelpers.getTextOfUiString(requireContext(), this.message),
                 Snackbar.LENGTH_LONG
         )
@@ -131,15 +147,15 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
                 this.buttonAction.invoke()
             }
         }
-        snackbar.setAnchorView(bottom_bar)
+        snackbar.anchorView = anchorView
         snackbar.show()
     }
 
-    private fun createChipView(slug: String, index: Int): Chip {
+    private fun ReaderInterestsFragmentLayoutBinding.createChipView(slug: String, index: Int): Chip {
         val chip = layoutInflater.inflate(
-            R.layout.reader_interest_filter_chip,
-            interests_chip_group,
-            false
+                R.layout.reader_interest_filter_chip,
+                interestsChipGroup,
+                false
         ) as Chip
         with(chip) {
             tag = slug
@@ -148,12 +164,18 @@ class ReaderInterestsFragment : Fragment(R.layout.reader_interests_fragment_layo
                     viewModel.onInterestAtIndexToggled(index, isChecked)
                 }
             }
-            interests_chip_group.addView(chip)
+            interestsChipGroup.addView(this)
         }
         return chip
     }
 
     companion object {
         const val TAG = "reader_interests_fragment_tag"
+        const val READER_INTEREST_ENTRY_POINT = "reader_interest_entry_point"
+    }
+
+    enum class EntryPoint {
+        DISCOVER,
+        SETTINGS
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModel.kt
index 58cfc870e6b0..8f724246a09e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModel.kt
@@ -8,13 +8,11 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
-import org.wordpress.android.R.string
-import org.wordpress.android.analytics.AnalyticsTracker.Stat
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_TAG_FOLLOWED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.SELECT_INTERESTS_PICKED
+import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.ReaderTagList
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsFragment.EntryPoint
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState.DoneButtonDisabledUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState.DoneButtonEnabledUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState.DoneButtonHiddenUiState
@@ -28,19 +26,22 @@ import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.Success
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.SuccessWithData
 import org.wordpress.android.ui.reader.repository.ReaderTagRepository
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
 import org.wordpress.android.ui.utils.UiString.UiStringRes
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 
 class ReaderInterestsViewModel @Inject constructor(
     private val readerTagRepository: ReaderTagRepository,
-    private val trackerWrapper: AnalyticsTrackerWrapper
+    private val readerTracker: ReaderTracker
 ) : ViewModel() {
     private var isStarted = false
     private lateinit var currentLanguage: String
-    private lateinit var parentViewModel: ReaderViewModel
+    private var parentViewModel: ReaderViewModel? = null
+
+    private var entryPoint = EntryPoint.DISCOVER
+    private var userTags = ReaderTagList()
 
     private val _uiState: MutableLiveData<UiState> = MutableLiveData()
     val uiState: LiveData<UiState> = _uiState
@@ -48,31 +49,36 @@ class ReaderInterestsViewModel @Inject constructor(
     private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
     val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
 
+    private val _closeReaderInterests = MutableLiveData<Event<Unit>>()
+    val closeReaderInterests: LiveData<Event<Unit>> = _closeReaderInterests
+
     private var userTagsFetchedSuccessfully = false
 
-    fun start(parentViewModel: ReaderViewModel, currentLanguage: String) {
-        this.parentViewModel = parentViewModel
-        if (isStarted && isLanguageSame(currentLanguage)) {
+    fun start(
+        currentLanguage: String,
+        parentViewModel: ReaderViewModel?,
+        entryPoint: EntryPoint
+    ) {
+        if (isStarted && this.currentLanguage == currentLanguage) {
             return
         }
-        loadUserTags()
-        this.currentLanguage = currentLanguage
         isStarted = true
+        this.currentLanguage = currentLanguage
+        this.parentViewModel = parentViewModel
+        this.entryPoint = entryPoint
+        loadUserTags()
     }
 
-    private fun isLanguageSame(currentLanguage: String) = this.currentLanguage == currentLanguage
-
     private fun loadUserTags() {
         updateUiState(InitialLoadingUiState)
         viewModelScope.launch {
             when (val result = readerTagRepository.getUserTags()) {
                 is SuccessWithData<*> -> {
                     userTagsFetchedSuccessfully = true
-                    val userTags = result.data as ReaderTagList
-                    if (userTags.isEmpty()) {
-                        loadInterests()
-                    } else {
-                        parentViewModel.onCloseReaderInterests()
+                    userTags = result.data as ReaderTagList
+                    when (entryPoint) {
+                        EntryPoint.DISCOVER -> checkAndLoadInterests(userTags)
+                        EntryPoint.SETTINGS -> loadInterests(userTags)
                     }
                 }
                 is Error -> {
@@ -86,19 +92,37 @@ class ReaderInterestsViewModel @Inject constructor(
         }
     }
 
-    private fun loadInterests() {
+    private fun checkAndLoadInterests(userTags: ReaderTagList) {
+        if (userTags.isEmpty()) {
+            loadInterests(userTags)
+        } else {
+            parentViewModel?.onCloseReaderInterests()
+        }
+    }
+
+    private fun loadInterests(userTags: ReaderTagList) {
         updateUiState(InitialLoadingUiState)
         viewModelScope.launch {
             val newUiState: UiState? = when (val result = readerTagRepository.getInterests()) {
                 is SuccessWithData<*> -> {
-                    trackerWrapper.track(Stat.SELECT_INTERESTS_SHOWN)
+                    readerTracker.track(AnalyticsTracker.Stat.SELECT_INTERESTS_SHOWN)
 
-                    val tags = result.data as ReaderTagList
+                    val tags = (result.data as ReaderTagList).filter { checkAndExcludeTag(userTags, it) }
                     val distinctTags = ReaderTagList().apply { addAll(tags.distinctBy { it.tagSlug }) }
-                    ContentUiState(
-                            interestsUiState = transformToInterestsUiState(distinctTags),
-                            interests = distinctTags
-                    )
+                    when (entryPoint) {
+                        EntryPoint.DISCOVER -> ContentUiState(
+                                interestsUiState = transformToInterestsUiState(distinctTags),
+                                interests = distinctTags,
+                                doneButtonUiState = DoneButtonDisabledUiState(),
+                                titleVisible = true
+                        )
+                        EntryPoint.SETTINGS -> ContentUiState(
+                                interestsUiState = transformToInterestsUiState(distinctTags),
+                                interests = distinctTags,
+                                doneButtonUiState = DoneButtonDisabledUiState(R.string.reader_btn_done),
+                                titleVisible = false
+                        )
+                    }
                 }
                 is NetworkUnavailable -> {
                     ConnectionErrorUiState
@@ -117,6 +141,17 @@ class ReaderInterestsViewModel @Inject constructor(
         }
     }
 
+    private fun checkAndExcludeTag(userTags: ReaderTagList, tag: ReaderTag): Boolean {
+        var contain = false
+        userTags.forEach { excludedTag ->
+            if (excludedTag.tagSlug.equals(tag.tagSlug)) {
+                contain = true
+                return@forEach
+            }
+        }
+        return !contain
+    }
+
     fun onInterestAtIndexToggled(index: Int, isChecked: Boolean) {
         uiState.value?.let {
             val currentUiState = uiState.value as ContentUiState
@@ -125,7 +160,10 @@ class ReaderInterestsViewModel @Inject constructor(
             updateUiState(
                     currentUiState.copy(
                             interestsUiState = updatedInterestsUiState,
-                            doneButtonUiState = currentUiState.getDoneButtonState(isInterestChecked = isChecked)
+                            doneButtonUiState = currentUiState.getDoneButtonState(
+                                    entryPoint = entryPoint,
+                                    isInterestChecked = isChecked
+                            )
                     )
             )
         }
@@ -137,7 +175,7 @@ class ReaderInterestsViewModel @Inject constructor(
         updateUiState(
                 contentUiState.copy(
                         progressBarVisible = true,
-                        doneButtonUiState = DoneButtonDisabledUiState(titleRes = R.string.reader_btn_done)
+                        doneButtonUiState = DoneButtonDisabledUiState(R.string.reader_btn_done)
                 )
         )
 
@@ -147,22 +185,25 @@ class ReaderInterestsViewModel @Inject constructor(
             readerTagRepository.clearTagLastUpdated(ReaderTag.createDiscoverPostCardsTag())
             when (val result = readerTagRepository.saveInterests(contentUiState.getSelectedInterests())) {
                 is Success -> {
-                    parentViewModel.onCloseReaderInterests()
+                    when (entryPoint) {
+                        EntryPoint.DISCOVER -> parentViewModel?.onCloseReaderInterests()
+                        EntryPoint.SETTINGS -> _closeReaderInterests.value = Event(Unit)
+                    }
                 }
                 is Error -> {
                     if (result is NetworkUnavailable) {
                         _snackbarEvents.postValue(
-                            Event(SnackbarMessageHolder(UiStringRes(string.no_network_message)))
+                                Event(SnackbarMessageHolder(UiStringRes(R.string.no_network_message)))
                         )
                     } else if (result is RemoteRequestFailure) {
                         _snackbarEvents.postValue(
-                            Event(SnackbarMessageHolder(UiStringRes(R.string.reader_error_request_failed_title)))
+                                Event(SnackbarMessageHolder(UiStringRes(R.string.reader_error_request_failed_title)))
                         )
                     }
                     updateUiState(
                             contentUiState.copy(
                                     progressBarVisible = false,
-                                    doneButtonUiState = DoneButtonEnabledUiState(titleRes = R.string.reader_btn_done)
+                                    doneButtonUiState = DoneButtonEnabledUiState(R.string.reader_btn_done)
                             )
                     )
                 }
@@ -174,7 +215,7 @@ class ReaderInterestsViewModel @Inject constructor(
         if (!userTagsFetchedSuccessfully) {
             loadUserTags()
         } else {
-            loadInterests()
+            loadInterests(userTags)
         }
     }
 
@@ -195,20 +236,31 @@ class ReaderInterestsViewModel @Inject constructor(
     }
 
     private fun trackInterests(tags: List<ReaderTag>) {
-        tags.forEach { it ->
-            trackerWrapper.track(READER_TAG_FOLLOWED, mapOf("tag" to it.tagSlug))
+        tags.forEach {
+            val source = when (entryPoint) {
+                EntryPoint.DISCOVER -> ReaderTracker.SOURCE_DISCOVER
+                EntryPoint.SETTINGS -> ReaderTracker.SOURCE_SETTINGS
+            }
+            readerTracker.trackTag(
+                    AnalyticsTracker.Stat.READER_TAG_FOLLOWED,
+                    it.tagSlug,
+                    source
+            )
         }
-        trackerWrapper.track(SELECT_INTERESTS_PICKED, mapOf("quantity" to tags.size))
+        readerTracker.trackTagQuantity(AnalyticsTracker.Stat.SELECT_INTERESTS_PICKED, tags.size)
     }
 
     fun onBackButtonClick() {
-        parentViewModel.onCloseReaderInterests()
+        when (entryPoint) {
+            EntryPoint.DISCOVER -> parentViewModel?.onCloseReaderInterests()
+            EntryPoint.SETTINGS -> _closeReaderInterests.value = Event(Unit)
+        }
     }
 
     sealed class UiState(
         open val doneButtonUiState: DoneButtonUiState = DoneButtonHiddenUiState,
         open val progressBarVisible: Boolean = false,
-        val titleVisible: Boolean = false,
+        open val titleVisible: Boolean = false,
         val errorLayoutVisible: Boolean = false
     ) {
         object InitialLoadingUiState : UiState(
@@ -219,26 +271,23 @@ class ReaderInterestsViewModel @Inject constructor(
             val interestsUiState: List<TagUiState>,
             val interests: ReaderTagList,
             override val progressBarVisible: Boolean = false,
-            override val doneButtonUiState: DoneButtonUiState = DoneButtonDisabledUiState()
+            override val doneButtonUiState: DoneButtonUiState,
+            override val titleVisible: Boolean
         ) : UiState(
                 progressBarVisible = false,
-                titleVisible = true,
+                titleVisible = titleVisible,
                 errorLayoutVisible = false
         )
 
         sealed class ErrorUiState constructor(
-            val titleResId: Int
+            val titleRes: Int
         ) : UiState(
                 progressBarVisible = false,
                 errorLayoutVisible = true
         ) {
-            object ConnectionErrorUiState : ErrorUiState(
-                    titleResId = R.string.no_network_message
-            )
+            object ConnectionErrorUiState : ErrorUiState(R.string.no_network_message)
 
-            object RequestFailedErrorUiState : ErrorUiState(
-                    titleResId = R.string.reader_error_request_failed_title
-            )
+            object RequestFailedErrorUiState : ErrorUiState(R.string.reader_error_request_failed_title)
         }
 
         private fun getCheckedInterestsUiState(): List<TagUiState> {
@@ -262,13 +311,17 @@ class ReaderInterestsViewModel @Inject constructor(
         }
 
         fun getDoneButtonState(
+            entryPoint: EntryPoint,
             isInterestChecked: Boolean = false
         ): DoneButtonUiState {
             return if (this is ContentUiState) {
                 val disableDoneButton = interests.isEmpty() ||
                         (getCheckedInterestsUiState().size == 1 && !isInterestChecked)
                 if (disableDoneButton) {
-                    DoneButtonDisabledUiState()
+                    when (entryPoint) {
+                        EntryPoint.DISCOVER -> DoneButtonDisabledUiState()
+                        EntryPoint.SETTINGS -> DoneButtonDisabledUiState(R.string.reader_btn_done)
+                    }
                 } else {
                     DoneButtonEnabledUiState()
                 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestViewHolder.kt
index 1d780009b37d..3c2e0fbf5e32 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestViewHolder.kt
@@ -1,24 +1,26 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
-import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.content.res.AppCompatResources.getColorStateList
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.reader_interest_item.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.ReaderInterestItemBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ReaderInterestUiState
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.viewBinding
 
 class ReaderInterestViewHolder(
     private val uiHelpers: UiHelpers,
-    internal val parent: ViewGroup,
-    override val containerView: View = LayoutInflater.from(parent.context)
-            .inflate(R.layout.reader_interest_item, parent, false)
-) : RecyclerView.ViewHolder(containerView), LayoutContainer {
-    fun onBind(uiState: ReaderInterestUiState) {
+    parent: ViewGroup,
+    private val binding: ReaderInterestItemBinding = parent.viewBinding(ReaderInterestItemBinding::inflate)
+) : RecyclerView.ViewHolder(binding.root) {
+    fun onBind(uiState: ReaderInterestUiState) = with(binding) {
         uiHelpers.setTextOrHide(interest, uiState.interest)
-        uiHelpers.updateVisibility(divider, uiState.isDividerVisible)
-        reader_interest_container.setOnClickListener { uiState.onClicked.invoke(uiState.interest) }
+        interest.setOnClickListener { uiState.onClicked.invoke(uiState.interest) }
+
+        with(uiState.chipStyle) {
+            interest.setChipStrokeColorResource(chipStrokeColorResId)
+            interest.setChipBackgroundColorResource(chipFillColorResId)
+            interest.setTextColor(getColorStateList(interest.context, chipFontColorResId))
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestsCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestsCardViewHolder.kt
index 325f9534efed..1a05925ed3d8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestsCardViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderInterestsCardViewHolder.kt
@@ -1,29 +1,82 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
+import android.view.GestureDetector
+import android.view.MotionEvent
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.reader_interest_card.*
-import org.wordpress.android.R
+import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener
+import org.wordpress.android.databinding.ReaderInterestCardBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderInterestAdapter
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.viewBinding
+
+private const val Y_BUFFER = 10
 
 class ReaderInterestsCardViewHolder(
     uiHelpers: UiHelpers,
     parentView: ViewGroup
-) : ReaderViewHolder(parentView, R.layout.reader_interest_card) {
+) : ReaderViewHolder<ReaderInterestCardBinding>(parentView.viewBinding(ReaderInterestCardBinding::inflate)) {
     init {
-        if (interests_list.adapter == null) {
-            interests_list.layoutManager = LinearLayoutManager(interests_list.context, RecyclerView.VERTICAL, false)
-            val readerInterestAdapter = ReaderInterestAdapter(uiHelpers)
-            interests_list.adapter = readerInterestAdapter
+        with(binding.interestsList) {
+            if (adapter == null) {
+                layoutManager = LinearLayoutManager(context, RecyclerView.HORIZONTAL, false)
+                val readerInterestAdapter = ReaderInterestAdapter(uiHelpers)
+                adapter = readerInterestAdapter
+            }
         }
     }
 
-    override fun onBind(uiState: ReaderCardUiState) {
+    override fun onBind(uiState: ReaderCardUiState) = with(binding) {
         uiState as ReaderInterestsCardUiState
-        (interests_list.adapter as ReaderInterestAdapter).update(uiState.interest)
+        setOnTouchItemListener()
+        (interestsList.adapter as ReaderInterestAdapter).update(uiState.interest)
+    }
+
+    private fun setOnTouchItemListener() = with(binding) {
+        val gestureDetector = GestureDetector(interestsList.context, GestureListener())
+        interestsList.addOnItemTouchListener(object : OnItemTouchListener {
+            override fun onInterceptTouchEvent(recyclerView: RecyclerView, e: MotionEvent): Boolean {
+                return gestureDetector.onTouchEvent(e)
+            }
+
+            override fun onTouchEvent(recyclerView: RecyclerView, e: MotionEvent) {
+                // NO OP
+            }
+
+            override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
+                // NO OP
+            }
+        })
+    }
+
+    private inner class GestureListener : GestureDetector.SimpleOnGestureListener() {
+        /**
+         * Capture the DOWN as soon as it's detected to prevent the viewPager from intercepting touch events
+         * We need to do this immediately, because if we don't, then the next move event could potentially
+         * trigger the viewPager to switch tabs
+         */
+        override fun onDown(e: MotionEvent?): Boolean = with(binding) {
+            interestsList.parent.requestDisallowInterceptTouchEvent(true)
+            return super.onDown(e)
+        }
+
+        override fun onScroll(
+            e1: MotionEvent?,
+            e2: MotionEvent?,
+            distanceX: Float,
+            distanceY: Float
+        ): Boolean = with(binding) {
+            if (kotlin.math.abs(distanceX) > kotlin.math.abs(distanceY)) {
+                // Detected a horizontal scroll, prevent the viewpager from switching tabs
+                interestsList.parent.requestDisallowInterceptTouchEvent(true)
+            } else if (kotlin.math.abs(distanceY) > Y_BUFFER) {
+                // Detected a vertical scroll allow the viewpager to switch tabs
+                interestsList.parent.requestDisallowInterceptTouchEvent(false)
+            }
+            return super.onScroll(e1, e2, distanceX, distanceY)
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderPostViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderPostViewHolder.kt
index a7365ce9d0cc..d3a3ada86134 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderPostViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderPostViewHolder.kt
@@ -5,19 +5,17 @@ import android.view.Gravity
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.widget.ListPopupWindow
-import kotlinx.android.synthetic.main.reader_cardview_post.*
-import kotlinx.android.synthetic.main.reader_blog_section_view.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
-import org.wordpress.android.analytics.AnalyticsTracker.Stat
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_CARD_TAPPED
+import org.wordpress.android.databinding.ReaderCardviewPostBinding
 import org.wordpress.android.datasets.ReaderThumbnailTable
 import org.wordpress.android.ui.reader.adapters.ReaderMenuAdapter
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiState
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryAction
-import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.utils.ReaderVideoUtils
 import org.wordpress.android.ui.reader.utils.ReaderVideoUtils.VideoThumbnailUrlListener
 import org.wordpress.android.ui.reader.views.ReaderIconCountView
@@ -28,49 +26,59 @@ import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
 import org.wordpress.android.util.image.ImageType.PHOTO_ROUNDED_CORNERS
 import org.wordpress.android.util.image.ImageType.VIDEO
+import org.wordpress.android.util.viewBinding
 
 class ReaderPostViewHolder(
     private val uiHelpers: UiHelpers,
     private val imageManager: ImageManager,
+    private val readerTracker: ReaderTracker,
     parentView: ViewGroup
-) : ReaderViewHolder(parentView, R.layout.reader_cardview_post) {
-    val viewContext: Context = post_container.context
+) : ReaderViewHolder<ReaderCardviewPostBinding>(parentView.viewBinding(ReaderCardviewPostBinding::inflate)) {
+    val viewContext: Context = binding.postContainer.context
 
     init {
-        layout_discover.expandTouchTargetArea(R.dimen.reader_discover_layout_extra_padding, true)
-        image_more.expandTouchTargetArea(R.dimen.reader_more_image_extra_padding, false)
+        with(binding) {
+            layoutDiscover.expandTouchTargetArea(R.dimen.reader_discover_layout_extra_padding, true)
+            imageMore.expandTouchTargetArea(R.dimen.reader_more_image_extra_padding, false)
+        }
     }
 
-    override fun onBind(uiState: ReaderCardUiState) {
+    override fun onBind(uiState: ReaderCardUiState) = with(binding) {
         val state = uiState as ReaderPostUiState
 
         // Expandable tags section
-        uiHelpers.updateVisibility(expandable_tags_view, state.expandableTagsViewVisibility)
-        expandable_tags_view.updateUi(state.tagItems)
+        uiHelpers.updateVisibility(expandableTagsView, state.expandableTagsViewVisibility)
+        expandableTagsView.updateUi(state.tagItems)
 
         // Blog section
         updateBlogSection(state)
 
         // More menu
-        uiHelpers.updateVisibility(image_more, state.moreMenuVisibility)
-        image_more.setOnClickListener { uiState.onMoreButtonClicked.invoke(state) }
+        uiHelpers.updateVisibility(imageMore, state.moreMenuVisibility)
+        imageMore.setOnClickListener { uiState.onMoreButtonClicked.invoke(state) }
 
         // Featured image section
         updateFeaturedImage(state)
-        uiHelpers.updateVisibility(image_video_overlay, state.videoOverlayVisibility)
-        uiHelpers.setTextOrHide(text_photo_title, state.photoTitle)
-        uiHelpers.updateVisibility(thumbnail_strip, state.thumbnailStripSection != null)
+        uiHelpers.updateVisibility(imageVideoOverlay, state.videoOverlayVisibility)
+        uiHelpers.setTextOrHide(textPhotoTitle, state.photoTitle)
+        uiHelpers.updateVisibility(thumbnailStrip, state.thumbnailStripSection != null)
         state.thumbnailStripSection?.let {
-            thumbnail_strip.loadThumbnails(it.images, it.isPrivate, it.content)
+            thumbnailStrip.loadThumbnails(it.images, it.isPrivate, it.content)
         }
         loadVideoThumbnail(state)
-        image_video_overlay.setOnClickListener { state.onVideoOverlayClicked(uiState.postId, uiState.blogId) }
+        imageVideoOverlay.setOnClickListener { state.onVideoOverlayClicked(uiState.postId, uiState.blogId) }
 
         // Content section
-        uiHelpers.setTextOrHide(text_title, state.title)
-        uiHelpers.setTextOrHide(text_excerpt, state.excerpt)
-        post_container.setOnClickListener {
-            AnalyticsTracker.track(READER_POST_CARD_TAPPED)
+        uiHelpers.setTextOrHide(textTitle, state.title)
+        uiHelpers.setTextOrHide(textExcerpt, state.excerpt)
+        postContainer.setOnClickListener {
+            readerTracker.trackBlog(
+                    AnalyticsTracker.Stat.READER_POST_CARD_TAPPED,
+                    state.blogId,
+                    state.feedId,
+                    state.isFollowed,
+                    state.source
+            )
             state.onItemClicked(uiState.postId, uiState.blogId)
         }
 
@@ -78,47 +86,47 @@ class ReaderPostViewHolder(
         updateDiscoverSection(state)
 
         // Action buttons section
-        updateActionButton(uiState.postId, uiState.blogId, uiState.likeAction, count_likes)
+        updateActionButton(uiState.postId, uiState.blogId, uiState.likeAction, countLikes)
         updateActionButton(uiState.postId, uiState.blogId, uiState.reblogAction, reblog)
-        updateActionButton(uiState.postId, uiState.blogId, uiState.commentsAction, count_comments)
+        updateActionButton(uiState.postId, uiState.blogId, uiState.commentsAction, countComments)
         updateActionButton(uiState.postId, uiState.blogId, uiState.bookmarkAction, bookmark)
 
         state.moreMenuItems?.let {
-            renderMoreMenu(state, state.moreMenuItems, image_more)
+            renderMoreMenu(state, state.moreMenuItems, imageMore)
         }
 
         state.onItemRendered.invoke(uiState)
     }
 
-    private fun updateBlogSection(state: ReaderPostUiState) {
+    private fun updateBlogSection(state: ReaderPostUiState) = with(binding.layoutBlogSection) {
         updateAvatarOrBlavatar(state)
-        uiHelpers.setTextOrHide(text_author_and_blog_name, state.blogSection.blogName)
-        uiHelpers.setTextOrHide(text_blog_url, state.blogSection.blogUrl)
-        uiHelpers.updateVisibility(dot_separator, state.blogSection.dotSeparatorVisibility)
-        uiHelpers.setTextOrHide(text_dateline, state.blogSection.dateLine)
+        uiHelpers.setTextOrHide(textAuthorAndBlogName, state.blogSection.blogName)
+        uiHelpers.setTextOrHide(textBlogUrl, state.blogSection.blogUrl)
+        uiHelpers.updateVisibility(dotSeparator, state.blogSection.dotSeparatorVisibility)
+        uiHelpers.setTextOrHide(textDateline, state.blogSection.dateLine)
 
-        layout_blog_section.setBackgroundResource(
-                layout_blog_section.context.getDrawableResIdFromAttribute(
+        root.setBackgroundResource(
+                root.context.getDrawableResIdFromAttribute(
                         state.blogSection.blogSectionClickData?.background ?: 0
                 )
         )
         state.blogSection.blogSectionClickData?.onBlogSectionClicked?.let {
-            layout_blog_section.setOnClickListener {
+            root.setOnClickListener {
                 state.blogSection.blogSectionClickData.onBlogSectionClicked.invoke(state.postId, state.blogId)
             }
         } ?: run {
-            layout_blog_section.setOnClickListener(null)
-            layout_blog_section.isClickable = false
+            root.setOnClickListener(null)
+            root.isClickable = false
         }
     }
 
-    private fun updateFeaturedImage(state: ReaderPostUiState) {
-        uiHelpers.updateVisibility(image_featured, state.featuredImageVisibility)
+    private fun updateFeaturedImage(state: ReaderPostUiState) = with(binding) {
+        uiHelpers.updateVisibility(imageFeatured, state.featuredImageVisibility)
         if (state.featuredImageUrl == null) {
-            imageManager.cancelRequestAndClearImageView(image_featured)
+            imageManager.cancelRequestAndClearImageView(imageFeatured)
         } else {
             imageManager.loadImageWithCorners(
-                    image_featured,
+                    imageFeatured,
                     PHOTO_ROUNDED_CORNERS,
                     state.featuredImageUrl,
                     uiHelpers.getPxOfUiDimen(WordPress.getContext(), state.featuredImageCornerRadius)
@@ -126,33 +134,42 @@ class ReaderPostViewHolder(
         }
     }
 
-    private fun updateAvatarOrBlavatar(state: ReaderPostUiState) {
-        uiHelpers.updateVisibility(image_avatar_or_blavatar, state.blogSection.avatarOrBlavatarUrl != null)
+    private fun updateAvatarOrBlavatar(state: ReaderPostUiState) = with(binding.layoutBlogSection) {
+        uiHelpers.updateVisibility(imageAvatarOrBlavatar, state.blogSection.avatarOrBlavatarUrl != null)
         if (state.blogSection.avatarOrBlavatarUrl == null) {
-            imageManager.cancelRequestAndClearImageView(image_avatar_or_blavatar)
+            imageManager.cancelRequestAndClearImageView(imageAvatarOrBlavatar)
         } else {
             imageManager.loadIntoCircle(
-                    image_avatar_or_blavatar,
-                    BLAVATAR_CIRCULAR, state.blogSection.avatarOrBlavatarUrl
+                    imageAvatarOrBlavatar,
+                    state.blogSection.blavatarType, state.blogSection.avatarOrBlavatarUrl
             )
         }
+
+        val canShowAuthorsAvatar = state.blogSection.authorAvatarUrl != null && state.blogSection.isAuthorAvatarVisible
+        uiHelpers.updateVisibility(authorsAvatar, canShowAuthorsAvatar)
+
+        if (!canShowAuthorsAvatar) {
+            imageManager.cancelRequestAndClearImageView(authorsAvatar)
+        } else {
+            imageManager.loadIntoCircle(authorsAvatar, BLAVATAR_CIRCULAR, state.blogSection.authorAvatarUrl!!)
+        }
     }
 
-    private fun updateDiscoverSection(state: ReaderPostUiState) {
-        uiHelpers.updateVisibility(image_discover_avatar, state.discoverSection?.discoverAvatarUrl != null)
-        uiHelpers.updateVisibility(layout_discover, state.discoverSection != null)
-        uiHelpers.setTextOrHide(text_discover, state.discoverSection?.discoverText)
+    private fun updateDiscoverSection(state: ReaderPostUiState) = with(binding) {
+        uiHelpers.updateVisibility(imageDiscoverAvatar, state.discoverSection?.discoverAvatarUrl != null)
+        uiHelpers.updateVisibility(layoutDiscover, state.discoverSection != null)
+        uiHelpers.setTextOrHide(textDiscover, state.discoverSection?.discoverText)
         if (state.discoverSection?.discoverAvatarUrl == null) {
-            imageManager.cancelRequestAndClearImageView(image_discover_avatar)
+            imageManager.cancelRequestAndClearImageView(imageDiscoverAvatar)
         } else {
             // TODO do we need to use `imagemanager.load` for blavatar?
             imageManager.loadIntoCircle(
-                    image_discover_avatar,
+                    imageDiscoverAvatar,
                     state.discoverSection.imageType,
                     state.discoverSection.discoverAvatarUrl
             )
         }
-        layout_discover.setOnClickListener {
+        layoutDiscover.setOnClickListener {
             state.discoverSection?.onDiscoverClicked?.invoke(state.postId, state.blogId)
         }
     }
@@ -167,14 +184,14 @@ class ReaderPostViewHolder(
         view.setOnClickListener { state.onClicked?.invoke(postId, blogId, state.type) }
     }
 
-    private fun loadVideoThumbnail(state: ReaderPostUiState) {
+    private fun loadVideoThumbnail(state: ReaderPostUiState) = with(binding) {
         /* TODO ideally, we'd be passing just a thumbnail url in the UiState. However, the code for retrieving
             thumbnail from full video URL needs to be fully refactored. */
         state.fullVideoUrl?.let { videoUrl ->
             ReaderVideoUtils.retrieveVideoThumbnailUrl(videoUrl, object : VideoThumbnailUrlListener {
                 override fun showThumbnail(thumbnailUrl: String) {
                     imageManager.loadImageWithCorners(
-                            image_featured,
+                            imageFeatured,
                             PHOTO_ROUNDED_CORNERS,
                             thumbnailUrl,
                             uiHelpers.getPxOfUiDimen(WordPress.getContext(), state.featuredImageCornerRadius)
@@ -182,7 +199,7 @@ class ReaderPostViewHolder(
                 }
 
                 override fun showPlaceholder() {
-                    imageManager.load(image_featured, VIDEO)
+                    imageManager.load(imageFeatured, VIDEO)
                 }
 
                 override fun cacheThumbnailUrl(thumbnailUrl: String) {
@@ -192,8 +209,8 @@ class ReaderPostViewHolder(
         }
     }
 
-    private fun renderMoreMenu(uiState: ReaderPostUiState, actions: List<SecondaryAction>, v: View) {
-        AnalyticsTracker.track(Stat.POST_CARD_MORE_TAPPED)
+    private fun renderMoreMenu(uiState: ReaderPostUiState, actions: List<ReaderPostCardAction>, v: View) {
+        readerTracker.track(AnalyticsTracker.Stat.POST_CARD_MORE_TAPPED)
         val listPopup = ListPopupWindow(v.context)
         listPopup.width = v.context.resources.getDimensionPixelSize(R.dimen.menu_item_width)
         listPopup.setAdapter(ReaderMenuAdapter(v.context, uiHelpers, actions))
@@ -203,7 +220,7 @@ class ReaderPostViewHolder(
         listPopup.setOnItemClickListener { _, _, position, _ ->
             listPopup.dismiss()
             val item = actions[position]
-            item.onClicked.invoke(uiState.postId, uiState.blogId, item.type)
+            item.onClicked?.invoke(uiState.postId, uiState.blogId, item.type)
         }
         listPopup.setOnDismissListener { uiState.onMoreDismissed.invoke(uiState) }
         listPopup.show()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogViewHolder.kt
index bcd87dea25c6..55dc9782d620 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogViewHolder.kt
@@ -1,30 +1,27 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
-import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.extensions.LayoutContainer
-import kotlinx.android.synthetic.main.reader_recommended_blog_item.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.ReaderRecommendedBlogItemBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState.ReaderRecommendedBlogUiState
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
+import org.wordpress.android.util.viewBinding
 
 class ReaderRecommendedBlogViewHolder(
-    internal val parent: ViewGroup,
+    parent: ViewGroup,
     private val imageManager: ImageManager,
     private val uiHelpers: UiHelpers,
-    override val containerView: View = LayoutInflater.from(parent.context)
-            .inflate(R.layout.reader_recommended_blog_item, parent, false)
-) : RecyclerView.ViewHolder(containerView), LayoutContainer {
-    fun onBind(uiState: ReaderRecommendedBlogUiState) {
+    private val binding: ReaderRecommendedBlogItemBinding =
+            parent.viewBinding(ReaderRecommendedBlogItemBinding::inflate)
+) : RecyclerView.ViewHolder(binding.root) {
+    fun onBind(uiState: ReaderRecommendedBlogUiState) = with(binding) {
         with(uiState) {
-            site_name.text = name
-            site_url.text = url
-            uiHelpers.setTextOrHide(site_description, description)
-            site_follow_icon.apply {
+            siteName.text = name
+            siteUrl.text = url
+            uiHelpers.setTextOrHide(siteDescription, description)
+            siteFollowIcon.apply {
                 setIsFollowed(isFollowed)
                 contentDescription = context.getString(followContentDescription.stringRes)
                 setOnClickListener {
@@ -32,21 +29,21 @@ class ReaderRecommendedBlogViewHolder(
                 }
             }
             updateBlogImage(iconUrl)
-            containerView.setOnClickListener {
-                onItemClicked(blogId, feedId)
+            root.setOnClickListener {
+                onItemClicked(blogId, feedId, isFollowed)
             }
         }
     }
 
-    private fun updateBlogImage(iconUrl: String?) {
+    private fun updateBlogImage(iconUrl: String?) = with(binding) {
         if (iconUrl != null) {
             imageManager.loadIntoCircle(
-                    imageView = site_icon,
+                    imageView = siteIcon,
                     imageType = BLAVATAR_CIRCULAR,
                     imgUrl = iconUrl
             )
         } else {
-            imageManager.cancelRequestAndClearImageView(site_icon)
+            imageManager.cancelRequestAndClearImageView(siteIcon)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogsCardViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogsCardViewHolder.kt
index d63ed08d6fe0..b718f475749d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogsCardViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRecommendedBlogsCardViewHolder.kt
@@ -1,8 +1,8 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
 import android.view.ViewGroup
-import kotlinx.android.synthetic.main.reader_recommended_blogs_card.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.ReaderRecommendedBlogsCardBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommendedBlogsCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderRecommendedBlogsAdapter
@@ -10,19 +10,24 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.ui.utils.addItemDivider
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.viewBinding
 
 class ReaderRecommendedBlogsCardViewHolder(
     parentView: ViewGroup,
     imageManager: ImageManager,
     uiHelpers: UiHelpers
-) : ReaderViewHolder(parentView, R.layout.reader_recommended_blogs_card) {
+) : ReaderViewHolder<ReaderRecommendedBlogsCardBinding>(
+        parentView.viewBinding(ReaderRecommendedBlogsCardBinding::inflate)
+) {
     private val recommendedBlogsAdapter = ReaderRecommendedBlogsAdapter(imageManager, uiHelpers)
 
     init {
-        recommended_blogs.adapter = recommendedBlogsAdapter
-        parentView.context.getDrawable(R.drawable.discover_list_divider)?.let {
-            recommended_blogs.addItemDivider(it)
-        } ?: AppLog.w(AppLog.T.READER, "Discover list divider null")
+        with(binding) {
+            recommendedBlogs.adapter = recommendedBlogsAdapter
+            parentView.context.getDrawable(R.drawable.default_list_divider)?.let {
+                recommendedBlogs.addItemDivider(it)
+            } ?: AppLog.w(AppLog.T.READER, "Discover list divider null")
+        }
     }
 
     override fun onBind(uiState: ReaderCardUiState) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRelatedPostViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRelatedPostViewHolder.kt
new file mode 100644
index 000000000000..1b90ed38beb6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderRelatedPostViewHolder.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.reader.discover.viewholders
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderCardviewRelatedPostBinding
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState.ReaderRelatedPostUiState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType.PHOTO
+import org.wordpress.android.util.viewBinding
+
+class ReaderRelatedPostViewHolder(
+    private val uiHelpers: UiHelpers,
+    private val imageManager: ImageManager,
+    private val parent: ViewGroup,
+    private val binding: ReaderCardviewRelatedPostBinding =
+            parent.viewBinding(ReaderCardviewRelatedPostBinding::inflate)
+) : RecyclerView.ViewHolder(binding.root) {
+    fun onBind(state: ReaderRelatedPostUiState) = with(binding) {
+        updateFeaturedImage(state)
+        uiHelpers.setTextOrHide(textTitle, state.title)
+        uiHelpers.setTextOrHide(textExcerpt, state.excerpt)
+        itemView.setOnClickListener { state.onItemClicked.invoke(state.postId, state.blogId, state.isGlobal) }
+    }
+
+    private fun updateFeaturedImage(state: ReaderRelatedPostUiState) = with(binding) {
+        uiHelpers.updateVisibility(imageFeatured, state.featuredImageVisibility)
+        if (state.featuredImageUrl == null) {
+            imageManager.cancelRequestAndClearImageView(imageFeatured)
+        } else {
+            imageManager.loadImageWithCorners(
+                    imageFeatured,
+                    PHOTO,
+                    state.featuredImageUrl,
+                    uiHelpers.getPxOfUiDimen(WordPress.getContext(), state.featuredImageCornerRadius)
+            )
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderViewHolder.kt
index d67fdc8012fa..0f950d879e6d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/ReaderViewHolder.kt
@@ -1,18 +1,9 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.extensions.LayoutContainer
+import androidx.viewbinding.ViewBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
 
-abstract class ReaderViewHolder(
-    internal val parent: ViewGroup,
-    @LayoutRes private val layout: Int,
-    override val containerView: View = LayoutInflater.from(parent.context).inflate(layout, parent, false)
-) : RecyclerView.ViewHolder(containerView),
-        LayoutContainer {
+abstract class ReaderViewHolder<T : ViewBinding>(protected val binding: T) : RecyclerView.ViewHolder(binding.root) {
     abstract fun onBind(uiState: ReaderCardUiState)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/WelcomeBannerViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/WelcomeBannerViewHolder.kt
index e9e271697034..f89f77c2143c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/WelcomeBannerViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/discover/viewholders/WelcomeBannerViewHolder.kt
@@ -1,16 +1,18 @@
 package org.wordpress.android.ui.reader.discover.viewholders
 
 import android.view.ViewGroup
-import kotlinx.android.synthetic.main.reader_cardview_welcome_banner.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.ReaderCardviewWelcomeBannerBinding
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderWelcomeBannerCardUiState
+import org.wordpress.android.util.viewBinding
 
 class WelcomeBannerViewHolder(
     parentView: ViewGroup
-) : ReaderViewHolder(parentView, R.layout.reader_cardview_welcome_banner) {
-    override fun onBind(uiState: ReaderCardUiState) {
+) : ReaderViewHolder<ReaderCardviewWelcomeBannerBinding>(
+        parentView.viewBinding(ReaderCardviewWelcomeBannerBinding::inflate)
+) {
+    override fun onBind(uiState: ReaderCardUiState) = with(binding) {
         val state = uiState as ReaderWelcomeBannerCardUiState
-        welcome_title.setText(state.titleRes)
+        welcomeTitle.setText(state.titleRes)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/models/ReaderSimplePost.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/models/ReaderSimplePost.java
index 423b1c3e187e..899ef8cf17ea 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/models/ReaderSimplePost.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/models/ReaderSimplePost.java
@@ -7,6 +7,7 @@
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.HtmlUtils;
 import org.wordpress.android.util.JSONUtils;
+import org.wordpress.android.util.PhotonUtils;
 
 /**
  * simplified version of a reader post
@@ -14,14 +15,11 @@
 public class ReaderSimplePost {
     private long mPostId;
     private long mSiteId;
-    private boolean mIsFollowing;
-
     private String mTitle;
-    private String mAuthorName;
-    private String mAuthorAvatarUrl;
     private String mExcerpt;
     private String mSiteName;
     private String mFeaturedImageUrl;
+    private transient String mFeaturedImageForDisplay;
 
     private String mRailcarJson;
 
@@ -31,7 +29,7 @@ public class ReaderSimplePost {
        that makes the call much heavier
     */
     public static final String SIMPLE_POST_FIELDS =
-            "ID,site_ID,title,excerpt,site_name,is_following,author,featured_image,featured_media,railcar";
+            "ID,site_ID,title,excerpt,site_name,featured_image,featured_media,railcar";
 
     public static ReaderSimplePost fromJson(JSONObject json) {
         if (json == null) {
@@ -49,22 +47,11 @@ public static ReaderSimplePost fromJson(JSONObject json) {
             return null;
         }
 
-        post.mIsFollowing = JSONUtils.getBool(json, "is_following");
-
         post.mTitle = JSONUtils.getStringDecoded(json, "title");
         post.mExcerpt = HtmlUtils.fastStripHtml(JSONUtils.getString(json, "excerpt")).trim();
         post.mSiteName = JSONUtils.getStringDecoded(json, "site_name");
         post.mFeaturedImageUrl = JSONUtils.getString(json, "featured_image");
 
-        JSONObject jsonAuthor = json.optJSONObject("author");
-        if (jsonAuthor != null) {
-            post.mAuthorName = JSONUtils.getStringDecoded(jsonAuthor, "name");
-            // don't read the avatar field unless "has_avatar" is true
-            if (JSONUtils.getBool(jsonAuthor, "has_avatar")) {
-                post.mAuthorAvatarUrl = JSONUtils.getString(jsonAuthor, "avatar_URL");
-            }
-        }
-
         // if there's no featured image, check if featured media has been set to an image
         if (!post.hasFeaturedImageUrl() && json.has("featured_media")) {
             JSONObject jsonMedia = json.optJSONObject("featured_media");
@@ -102,13 +89,6 @@ public String getSiteName() {
         return mSiteName;
     }
 
-    public String getAuthorName() {
-        return mAuthorName;
-    }
-
-    public String getAuthorAvatarUrl() {
-        return mAuthorAvatarUrl;
-    }
 
     public String getFeaturedImageUrl() {
         return mFeaturedImageUrl;
@@ -118,23 +98,26 @@ public String getRailcarJson() {
         return mRailcarJson;
     }
 
-    public boolean isFollowing() {
-        return mIsFollowing;
-    }
-
-    public void setIsFollowing(boolean isFollowing) {
-        mIsFollowing = isFollowing;
-    }
-
     public boolean hasExcerpt() {
         return !TextUtils.isEmpty(mExcerpt);
     }
 
-    public boolean hasAuthorAvatarUrl() {
-        return !TextUtils.isEmpty(mAuthorAvatarUrl);
+    public boolean hasTitle() {
+        return !TextUtils.isEmpty(mTitle);
     }
 
     public boolean hasFeaturedImageUrl() {
         return !TextUtils.isEmpty(mFeaturedImageUrl);
     }
+
+    public String getFeaturedImageForDisplay(int width, int height) {
+        if (mFeaturedImageForDisplay == null) {
+            if (!hasFeaturedImageUrl()) {
+                mFeaturedImageForDisplay = "";
+            } else {
+                mFeaturedImageForDisplay = PhotonUtils.getPhotonImageUrl(getFeaturedImageUrl(), width, height);
+            }
+        }
+        return mFeaturedImageForDisplay;
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProvider.kt
index 3723fea6f94a..f706afc42f7f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProvider.kt
@@ -12,6 +12,7 @@ import org.greenrobot.eventbus.ThreadMode.BACKGROUND
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.discover.ReaderDiscoverCards
 import org.wordpress.android.modules.IO_THREAD
+import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.reader.ReaderEvents.FetchDiscoverCardsEnded
 import org.wordpress.android.ui.reader.ReaderEvents.FollowedTagsChanged
 import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateResult.CHANGED
@@ -33,6 +34,7 @@ import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.READER
 import org.wordpress.android.util.EventBusWrapper
 import org.wordpress.android.util.perform
+import org.wordpress.android.util.throttle
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ReactiveMutableLiveData
 import java.util.concurrent.atomic.AtomicBoolean
@@ -40,8 +42,11 @@ import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
+private const val DISCOVER_FEED_THROTTLE = 500L
+
 class ReaderDiscoverDataProvider @Inject constructor(
     @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
+    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val eventBusWrapper: EventBusWrapper,
     private val readerTagWrapper: ReaderTagWrapper,
     private val getDiscoverCardsUseCase: GetDiscoverCardsUseCase,
@@ -60,6 +65,16 @@ class ReaderDiscoverDataProvider @Inject constructor(
     private val _discoverFeed = ReactiveMutableLiveData<ReaderDiscoverCards>(
             onActive = { onActiveDiscoverFeed() }, onInactive = { onInactiveDiscoverFeed() })
     val discoverFeed: LiveData<ReaderDiscoverCards> = _discoverFeed
+            /* Since we listen to all updates of the database the feed is sometimes updated several times within a few
+            ms. For example, when we are about to insert posts, we delete them first. However, we don't need/want
+            to propagate this state to the VM. */
+            .throttle(
+                    this,
+                    offset = DISCOVER_FEED_THROTTLE,
+                    backgroundDispatcher = ioDispatcher,
+                    mainDispatcher = mainDispatcher
+            )
+
     private var hasMoreCards = true
 
     private val _communicationChannel = MutableLiveData<Event<ReaderDiscoverCommunication>>()
@@ -117,7 +132,9 @@ class ReaderDiscoverDataProvider @Inject constructor(
             val refresh = shouldAutoUpdateTagUseCase.get(readerTag)
             if (forceReload || !existsInMemory) {
                 val result = getDiscoverCardsUseCase.get()
-                _discoverFeed.postValue(result)
+                if (result.cards.isNotEmpty()) {
+                    _discoverFeed.postValue(result)
+                }
             }
 
             if (refresh) {
@@ -193,10 +210,8 @@ class ReaderDiscoverDataProvider @Inject constructor(
 
     @Subscribe(threadMode = BACKGROUND)
     fun onFollowedTagsChanged(event: FollowedTagsChanged) {
-        if (event.didSucceed()) {
-            launch {
-                refreshCards()
-            }
+        launch {
+            refreshCards()
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCase.kt
index 696bb853d330..b4f65f98f820 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCase.kt
@@ -2,7 +2,7 @@ package org.wordpress.android.ui.reader.repository.usecases
 
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_BLOG_BLOCKED
+import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions.BlockedBlogResult
 import org.wordpress.android.ui.reader.actions.ReaderBlogActionsWrapper
@@ -11,8 +11,8 @@ import org.wordpress.android.ui.reader.repository.usecases.BlockSiteState.Failed
 import org.wordpress.android.ui.reader.repository.usecases.BlockSiteState.Failed.RequestFailed
 import org.wordpress.android.ui.reader.repository.usecases.BlockSiteState.SiteBlockedInLocalDb
 import org.wordpress.android.ui.reader.repository.usecases.BlockSiteState.Success
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 import javax.inject.Inject
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -20,29 +20,39 @@ import kotlin.coroutines.suspendCoroutine
 
 class BlockBlogUseCase @Inject constructor(
     private val networkUtilsWrapper: NetworkUtilsWrapper,
-    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
+    private val readerTracker: ReaderTracker,
     private val readerBlogActionsWrapper: ReaderBlogActionsWrapper
 ) {
     private var continuation: Continuation<Boolean>? = null
 
     // TODO use .flowOn(ioDispatcher) when the experimental flag is removed
-    suspend fun blockBlog(blogId: Long) = flow<BlockSiteState> {
+    suspend fun blockBlog(
+        blogId: Long,
+        feedId: Long
+    ) = flow {
         // Blocking multiple sites in parallel isn't supported as the user would lose the ability to undo the action
         if (continuation == null) {
             if (!networkUtilsWrapper.isNetworkAvailable()) {
                 emit(NoNetwork)
             } else {
-                performAction(blogId)
+                performAction(blogId, feedId)
             }
         } else {
             emit(AlreadyRunning)
         }
     }
 
-    private suspend fun FlowCollector<BlockSiteState>.performAction(blogId: Long) {
+    private suspend fun FlowCollector<BlockSiteState>.performAction(
+        blogId: Long,
+        feedId: Long
+    ) {
         // We want to track the action no matter the result
-        analyticsUtilsWrapper.trackWithSiteId(READER_BLOG_BLOCKED, blogId)
-        val blockedBlogData = readerBlogActionsWrapper.blockBlogFromReaderLocal(blogId)
+        readerTracker.trackBlog(
+                AnalyticsTracker.Stat.READER_BLOG_BLOCKED,
+                blogId,
+                feedId
+        )
+        val blockedBlogData = readerBlogActionsWrapper.blockBlogFromReaderLocal(blogId, feedId)
         emit(SiteBlockedInLocalDb(blockedBlogData))
 
         val succeeded = blockBlogAndWaitForResult(blockedBlogData)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCase.kt
index 7ad5f24c079b..5dbdc45b6327 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCase.kt
@@ -39,10 +39,6 @@ class GetDiscoverCardsUseCase @Inject constructor(
                     cardJsonList
             )
 
-            if (!appPrefsWrapper.readerDiscoverWelcomeBannerShown) {
-                cards.add(WelcomeBannerCard)
-            }
-
             forLoop@ for (i in 0 until jsonObjects.length()) {
                 val cardJson = jsonObjects.getJSONObject(i)
                 when (cardJson.getString(ReaderConstants.JSON_CARD_TYPE)) {
@@ -72,6 +68,10 @@ class GetDiscoverCardsUseCase @Inject constructor(
                     }
                 }
             }
+
+            if (cards.isNotEmpty() && !appPrefsWrapper.readerDiscoverWelcomeBannerShown) {
+                cards.add(0, WelcomeBannerCard)
+            }
         }
         return@withContext ReaderDiscoverCards(cards)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCase.kt
index 91ae65973bbd..dabc189a9dde 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCase.kt
@@ -1,16 +1,11 @@
 package org.wordpress.android.ui.reader.repository.usecases
 
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.suspendCancellableCoroutine
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_DETAIL_LIKED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_DETAIL_UNLIKED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_LIKED
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_UNLIKED
+import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.models.ReaderPost
-import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener
 import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.AlreadyRunning
@@ -18,19 +13,17 @@ import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostL
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.Failed.RequestFailed
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.Success
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.Unchanged
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 import javax.inject.Inject
-import javax.inject.Named
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 
 class PostLikeUseCase @Inject constructor(
     private val readerPostActionsWrapper: ReaderPostActionsWrapper,
-    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
+    private val readerTracker: ReaderTracker,
     private val accountStore: AccountStore,
-    private val networkUtilsWrapper: NetworkUtilsWrapper,
-    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+    private val networkUtilsWrapper: NetworkUtilsWrapper
 ) {
     private val continuations:
             MutableMap<PostLikeRequest, Continuation<PostLikeState>?> = mutableMapOf()
@@ -38,8 +31,8 @@ class PostLikeUseCase @Inject constructor(
     suspend fun perform(
         post: ReaderPost,
         isAskingToLike: Boolean,
-        fromPostDetails: Boolean = false
-    ) = flow<PostLikeState> {
+        source: String
+    ) = flow {
         val wpComUserId = accountStore.account.userId
         val request = PostLikeRequest(post.postId, post.blogId, isAskingToLike, wpComUserId)
 
@@ -55,7 +48,7 @@ class PostLikeUseCase @Inject constructor(
         }
 
         // track like event
-        trackEvent(request, post, fromPostDetails)
+        trackEvent(request, post, source)
 
         handleLocalDb(post, request)
     }
@@ -63,25 +56,25 @@ class PostLikeUseCase @Inject constructor(
     private fun trackEvent(
         request: PostLikeRequest,
         post: ReaderPost,
-        fromPostDetails: Boolean
+        source: String
     ) {
         if (request.isAskingToLike) {
-            val likedStat = if (fromPostDetails) {
-                READER_ARTICLE_DETAIL_LIKED
+            val likedStat = if (source == ReaderTracker.SOURCE_POST_DETAIL) {
+                AnalyticsTracker.Stat.READER_ARTICLE_DETAIL_LIKED
             } else {
-                READER_ARTICLE_LIKED
+                AnalyticsTracker.Stat.READER_ARTICLE_LIKED
             }
-            analyticsUtilsWrapper.trackWithReaderPostDetails(likedStat, post)
+            readerTracker.trackPost(likedStat, post, source)
             // Consider a like to be enough to push a page view - solves a long-standing question
             // from folks who ask 'why do I have more likes than page views?'.
             readerPostActionsWrapper.bumpPageViewForPost(post)
         } else {
-            val unLikedStat = if (fromPostDetails) {
-                READER_ARTICLE_DETAIL_UNLIKED
+            val unLikedStat = if (source == ReaderTracker.SOURCE_POST_DETAIL) {
+                AnalyticsTracker.Stat.READER_ARTICLE_DETAIL_UNLIKED
             } else {
-                READER_ARTICLE_UNLIKED
+                AnalyticsTracker.Stat.READER_ARTICLE_UNLIKED
             }
-            analyticsUtilsWrapper.trackWithReaderPostDetails(unLikedStat, post)
+            readerTracker.trackPost(unLikedStat, post, source)
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/UndoBlockBlogUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/UndoBlockBlogUseCase.kt
index ed70de17e5d1..fa16d63c0b62 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/UndoBlockBlogUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/repository/usecases/UndoBlockBlogUseCase.kt
@@ -5,13 +5,24 @@ import kotlinx.coroutines.withContext
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions.BlockedBlogResult
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import javax.inject.Inject
 import javax.inject.Named
 
-class UndoBlockBlogUseCase @Inject constructor(@Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher) {
-    suspend fun undoBlockBlog(blockedBlogData: BlockedBlogResult) {
+class UndoBlockBlogUseCase @Inject constructor(
+    private val readerTracker: ReaderTracker,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    suspend fun undoBlockBlog(
+        blockedBlogData: BlockedBlogResult,
+        source: String
+    ) {
         withContext(bgDispatcher) {
-            ReaderBlogActions.undoBlockBlogFromReader(blockedBlogData)
+            ReaderBlogActions.undoBlockBlogFromReader(
+                    blockedBlogData,
+                    source,
+                    readerTracker
+            )
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt
index 9b54ec0ebf41..023188f2a4ff 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt
@@ -150,7 +150,11 @@ class ReaderDiscoverLogic(
         val nextPageHandle = parseDiscoverCardsJsonUseCase.parseNextPageHandle(json)
         appPrefsWrapper.readerCardsPageHandle = nextPageHandle
 
-        readerTagTableWrapper.setTagLastUpdated(ReaderTag.createDiscoverPostCardsTag())
+        if (cards.isEmpty()) {
+            readerTagTableWrapper.clearTagLastUpdated(ReaderTag.createDiscoverPostCardsTag())
+        } else {
+            readerTagTableWrapper.setTagLastUpdated(ReaderTag.createDiscoverPostCardsTag())
+        }
 
         resultListener.onUpdateResult(HAS_NEW)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java
index 7471155a4348..911fff9bb797 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/ReaderUpdateLogic.java
@@ -312,7 +312,7 @@ public void onErrorResponse(VolleyError volleyError) {
 
         AppLog.d(AppLog.T.READER, "reader service > updating followed blogs");
         // request using ?meta=site,feed to get extra info
-        WordPress.getRestClientUtilsV1_1().get("read/following/mine?meta=site%2Cfeed", listener, errorListener);
+        WordPress.getRestClientUtilsV1_2().get("read/following/mine?meta=site%2Cfeed", listener, errorListener);
     }
 
     private void handleFollowedBlogsResponse(final JSONObject jsonObject) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/TagUpdateClientUtilsProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/TagUpdateClientUtilsProvider.kt
index 27a480ac664a..cf1c425ed1cc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/TagUpdateClientUtilsProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/services/update/TagUpdateClientUtilsProvider.kt
@@ -6,11 +6,11 @@ import javax.inject.Inject
 
 class TagUpdateClientUtilsProvider @Inject constructor() {
     fun getRestClientForTagUpdate(): RestClientUtils {
-        return WordPress.getRestClientUtilsV1_2()
+        return WordPress.getRestClientUtilsV1_3()
     }
 
     fun getTagUpdateEndpointURL(): String {
-        return WordPress.getRestClientUtilsV1_2().restClient.endpointURL
+        return WordPress.getRestClientUtilsV1_3().restClient.endpointURL
     }
 
     fun getRestClientForInterestTags(): RestClientUtils {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterBottomSheetEmptyUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/BottomSheetPageEmptyUiState.kt
similarity index 100%
rename from WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterBottomSheetEmptyUiState.kt
rename to WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/BottomSheetPageEmptyUiState.kt
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/BottomSheetUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/BottomSheetUiState.kt
new file mode 100644
index 000000000000..c4e8ff7ef203
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/BottomSheetUiState.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.ui.reader.subfilter
+
+import org.wordpress.android.ui.utils.UiString
+
+sealed class BottomSheetUiState(val isVisible: Boolean) {
+    data class BottomSheetVisible(
+        val title: UiString,
+        val categories: List<SubfilterCategory>
+    ) : BottomSheetUiState(true)
+    object BottomSheetHidden : BottomSheetUiState(false)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt
index a5a4ed42d979..e89783eeb0dd 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModel.kt
@@ -1,5 +1,7 @@
 package org.wordpress.android.ui.reader.subfilter
 
+import android.os.Bundle
+import androidx.annotation.VisibleForTesting
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
@@ -7,16 +9,22 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.R
 import org.wordpress.android.datasets.ReaderBlogTable
 import org.wordpress.android.datasets.ReaderTagTable
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.Organization.NO_ORGANIZATION
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.reader.ReaderEvents
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask
+import org.wordpress.android.ui.reader.subfilter.BottomSheetUiState.BottomSheetHidden
+import org.wordpress.android.ui.reader.subfilter.BottomSheetUiState.BottomSheetVisible
+import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.SITES
+import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.TAGS
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Site
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.SiteAll
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Tag
@@ -24,6 +32,8 @@ import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.tracker.ReaderTrackerType
 import org.wordpress.android.ui.reader.utils.ReaderUtils
 import org.wordpress.android.ui.reader.viewmodels.ReaderModeInfo
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.EventBusWrapper
@@ -49,14 +59,11 @@ class SubFilterViewModel @Inject constructor(
     private val _currentSubFilter = MutableLiveData<SubfilterListItem>()
     val currentSubFilter: LiveData<SubfilterListItem> = _currentSubFilter
 
-    private val _shouldShowSubFilters = MutableLiveData<Boolean>()
-    val shouldShowSubFilters: LiveData<Boolean> = _shouldShowSubFilters
-
     private val _readerModeInfo = SingleLiveEvent<ReaderModeInfo>()
     val readerModeInfo: LiveData<ReaderModeInfo> = _readerModeInfo
 
-    private val _changeBottomSheetVisibility = MutableLiveData<Event<Boolean>>()
-    val changeBottomSheetVisibility: LiveData<Event<Boolean>> = _changeBottomSheetVisibility
+    private val _bottomSheetUiState = MutableLiveData<Event<BottomSheetUiState>>()
+    val bottomSheetUiState: LiveData<Event<BottomSheetUiState>> = _bottomSheetUiState
 
     private val _filtersMatchCount = MutableLiveData<HashMap<SubfilterCategory, Int>>()
     val filtersMatchCount: LiveData<HashMap<SubfilterCategory, Int>> = _filtersMatchCount
@@ -72,25 +79,42 @@ class SubFilterViewModel @Inject constructor(
 
     private var isStarted = false
     private var isFirstLoad = true
+    private var mTagFragmentStartedWith: ReaderTag? = null
 
     /**
      * Tag may be null for Blog previews for instance.
      */
-    fun start(tag: ReaderTag?) {
+    fun start(mTagFragmentStartedWith: ReaderTag?, tag: ReaderTag?, savedInstanceState: Bundle?) {
         if (isStarted) {
             return
         }
 
+        isStarted = true
+
+        this.mTagFragmentStartedWith = mTagFragmentStartedWith
+
+        var subfilterJson: String? = null
+
+        savedInstanceState?.let {
+            isFirstLoad = it.getBoolean(ARG_IS_FIRST_LOAD)
+            subfilterJson = it.getString(ARG_CURRENT_SUBFILTER_JSON)
+        }
+
         eventBusWrapper.register(this)
 
         tag?.let {
-            updateSubfilter(getCurrentSubfilterValue())
-            changeSubfiltersVisibility(tag.isFollowedSites)
+            val currentSubfilter = subfilterJson?.let { json ->
+                subfilterListItemMapper.fromJson(
+                        json = json,
+                        onClickAction = ::onSubfilterClicked,
+                        isSelected = true
+                )
+            }
+            updateSubfilter(currentSubfilter ?: getCurrentSubfilterValue())
+            initSubfiltersTracking(tag.isFilterable)
         }
 
         _filtersMatchCount.value = hashMapOf()
-
-        isStarted = true
     }
 
     fun loadSubFilters() {
@@ -98,20 +122,26 @@ class SubFilterViewModel @Inject constructor(
             val filterList = ArrayList<SubfilterListItem>()
 
             if (accountStore.hasAccessToken()) {
-                // Filtering Discover out
+                val organization = mTagFragmentStartedWith?.organization
+
                 val followedBlogs = ReaderBlogTable.getFollowedBlogs().let { blogList ->
+                    // Filtering out all blogs not belonging to this VM organization if valid
                     blogList.filter { blog ->
-                        !(blog.url.startsWith("https://discover.wordpress.com"))
+                        organization?.let {
+                            blog.organizationId == organization.orgId
+                        } ?: false
                     }
                 }
 
-                for (blog in followedBlogs) {
-                    filterList.add(Site(
+                filterList.addAll(
+                    followedBlogs.map { blog ->
+                        Site(
                             onClickAction = ::onSubfilterClicked,
                             blog = blog,
                             isSelected = false
-                    ))
-                }
+                        )
+                    }
+                )
             }
 
             val tags = ReaderTagTable.getFollowedTags()
@@ -131,11 +161,12 @@ class SubFilterViewModel @Inject constructor(
     }
 
     private fun onSubfilterClicked(filter: SubfilterListItem) {
-        _changeBottomSheetVisibility.postValue(Event(false))
+        _bottomSheetUiState.postValue(Event(BottomSheetHidden))
         updateSubfilter(filter)
     }
 
-    fun changeSubfiltersVisibility(show: Boolean) {
+    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    fun initSubfiltersTracking(show: Boolean) {
         val isCurrentSubfilterTracked = getCurrentSubfilterValue().isTrackedItem
 
         if (show) {
@@ -147,18 +178,17 @@ class SubFilterViewModel @Inject constructor(
         } else {
             readerTracker.stop(ReaderTrackerType.SUBFILTERED_LIST)
         }
-
-        _shouldShowSubFilters.postValue(show)
     }
 
     fun getCurrentSubfilterValue(): SubfilterListItem {
-        return _currentSubFilter.value ?: appPrefsWrapper.getReaderSubfilter().let {
-            subfilterListItemMapper.fromJson(
-                    json = it,
-                    onClickAction = ::onSubfilterClicked,
-                    isSelected = true
-            )
-        }
+        return _currentSubFilter.value ?: SiteAll(
+                onClickAction = ::onSubfilterClicked,
+                isSelected = true
+        )
+    }
+
+    private fun getCurrentSubfilterJson(): String {
+        return subfilterListItemMapper.toJson(getCurrentSubfilterValue())
     }
 
     fun setSubfilterFromTag(tag: ReaderTag) {
@@ -183,16 +213,22 @@ class SubFilterViewModel @Inject constructor(
                 UpdateTask.TAGS,
                 UpdateTask.FOLLOWED_BLOGS
         ))
-        _changeBottomSheetVisibility.value = Event(true)
+        _bottomSheetUiState.value = Event(BottomSheetVisible(
+                mTagFragmentStartedWith?.let {
+                    UiStringText(it.label)
+                } ?: UiStringRes(R.string.reader_filter_main_title),
+                if (mTagFragmentStartedWith?.organization == NO_ORGANIZATION) listOf(SITES, TAGS) else listOf(SITES)
+        ))
     }
 
     fun onBottomSheetCancelled() {
-        _changeBottomSheetVisibility.value = Event(false)
+        _bottomSheetUiState.value = Event(BottomSheetHidden)
     }
 
     private fun changeSubfilter(
         subfilterListItem: SubfilterListItem,
-        requestNewerPosts: Boolean
+        requestNewerPosts: Boolean,
+        streamTag: ReaderTag?
     ) {
         when (subfilterListItem.type) {
             SubfilterListItem.ItemType.SECTION_TITLE,
@@ -200,7 +236,7 @@ class SubFilterViewModel @Inject constructor(
                 // nop
             }
             SubfilterListItem.ItemType.SITE_ALL -> _readerModeInfo.value = (ReaderModeInfo(
-                    ReaderUtils.getDefaultTag(),
+                    streamTag ?: ReaderUtils.getDefaultTag(),
                     ReaderPostListType.TAG_FOLLOWED,
                     0,
                     0,
@@ -242,11 +278,11 @@ class SubFilterViewModel @Inject constructor(
     }
 
     fun onSubfilterSelected(subfilterListItem: SubfilterListItem) {
-        changeSubfilter(subfilterListItem, true)
+        changeSubfilter(subfilterListItem, true, mTagFragmentStartedWith)
     }
 
     fun onSubfilterReselected() {
-        changeSubfilter(getCurrentSubfilterValue(), false)
+        changeSubfilter(getCurrentSubfilterValue(), false, mTagFragmentStartedWith)
     }
 
     fun onSubfilterPageUpdated(category: SubfilterCategory, count: Int) {
@@ -260,7 +296,7 @@ class SubFilterViewModel @Inject constructor(
     }
 
     fun onBottomSheetActionClicked(action: ActionType) {
-        _changeBottomSheetVisibility.postValue(Event(false))
+        _bottomSheetUiState.postValue(Event(BottomSheetHidden))
         _bottomSheetEmptyViewAction.postValue(Event(action))
     }
 
@@ -271,8 +307,6 @@ class SubFilterViewModel @Inject constructor(
             readerTracker.stop(ReaderTrackerType.SUBFILTERED_LIST)
         }
         _currentSubFilter.value = filter
-        val json = subfilterListItemMapper.toJson(filter)
-        appPrefsWrapper.setReaderSubfilter(json)
     }
 
     fun onUserComesToReader() {
@@ -309,6 +343,13 @@ class SubFilterViewModel @Inject constructor(
         }
     }
 
+    fun onSaveInstanceState(outState: Bundle) {
+        outState.putString(
+                ARG_CURRENT_SUBFILTER_JSON, getCurrentSubfilterJson()
+        )
+        outState.putBoolean(ARG_IS_FIRST_LOAD, isFirstLoad)
+    }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onEventMainThread(event: ReaderEvents.FollowedTagsChanged) {
         AppLog.d(T.READER, "Subfilter bottom sheet > followed tags changed")
@@ -325,4 +366,11 @@ class SubFilterViewModel @Inject constructor(
         super.onCleared()
         eventBusWrapper.unregister(this)
     }
+
+    companion object {
+        const val SUBFILTER_VM_BASE_KEY = "SUBFILTER_VIEW_MODEL_BASE_KEY"
+
+        const val ARG_CURRENT_SUBFILTER_JSON = "current_subfilter_json"
+        const val ARG_IS_FIRST_LOAD = "is_first_load"
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterListItem.kt
index f69af60f3727..97222730c836 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterListItem.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterListItem.kt
@@ -66,6 +66,8 @@ sealed class SubfilterListItem(val type: ItemType, val isTrackedItem: Boolean =
         } else {
             UiStringRes(R.string.reader_untitled_post)
         }
+        val showUnseenCount: Boolean = blog.numUnseenPosts > 0
+        val unseenCount: Int = blog.numUnseenPosts
     }
 
     data class Tag(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterPageFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterPageFragment.kt
index e208391715bd..1f8356090f53 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterPageFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/SubfilterPageFragment.kt
@@ -2,6 +2,9 @@ package org.wordpress.android.ui.reader.subfilter
 
 import android.content.Context
 import android.os.Bundle
+import android.os.Parcel
+import android.os.Parcelable
+import android.os.Parcelable.Creator
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -13,15 +16,13 @@ import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelStoreOwner
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
 import org.wordpress.android.R
 import org.wordpress.android.ui.reader.subfilter.SubfilterBottomSheetEmptyUiState.HiddenEmptyUiState
 import org.wordpress.android.ui.reader.subfilter.SubfilterBottomSheetEmptyUiState.VisibleEmptyUiState
-import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.SITES
-import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.TAGS
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.ItemType
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.ItemType.SITE
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.ItemType.TAG
@@ -29,7 +30,9 @@ import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Site
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Tag
 import org.wordpress.android.ui.reader.subfilter.adapters.SubfilterListAdapter
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel
+import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig
 import org.wordpress.android.widgets.WPTextView
 import java.lang.ref.WeakReference
 import javax.inject.Inject
@@ -37,6 +40,8 @@ import javax.inject.Inject
 class SubfilterPageFragment : DaggerFragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var seenUnseenWithCounterFeatureConfig: SeenUnseenWithCounterFeatureConfig
+    @Inject lateinit var statsUtils: StatsUtils
 
     private lateinit var subFilterViewModel: SubFilterViewModel
     private lateinit var viewModel: SubfilterPageViewModel
@@ -47,11 +52,13 @@ class SubfilterPageFragment : DaggerFragment() {
 
     companion object {
         const val CATEGORY_KEY = "category_key"
+        const val SUBFILTER_VIEW_MODEL_KEY = "subfilter_view_model_key"
 
-        fun newInstance(category: SubfilterCategory): SubfilterPageFragment {
+        fun newInstance(category: SubfilterCategory, subfilterViewModelKey: String): SubfilterPageFragment {
             val fragment = SubfilterPageFragment()
             val bundle = Bundle()
             bundle.putSerializable(CATEGORY_KEY, category)
+            bundle.putString(SUBFILTER_VIEW_MODEL_KEY, subfilterViewModelKey)
             fragment.arguments = bundle
             return fragment
         }
@@ -64,21 +71,24 @@ class SubfilterPageFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val category = arguments?.getSerializable(CATEGORY_KEY) as SubfilterCategory
+        val category = requireArguments().getSerializable(CATEGORY_KEY) as SubfilterCategory
+        val subfilterVmKey = requireArguments().getString(SUBFILTER_VIEW_MODEL_KEY)!!
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory).get(SubfilterPageViewModel::class.java)
+        viewModel = ViewModelProvider(this, viewModelFactory).get(SubfilterPageViewModel::class.java)
         viewModel.start(category)
 
         recyclerView = view.findViewById(R.id.content_recycler_view)
         recyclerView.layoutManager = LinearLayoutManager(requireActivity())
-        recyclerView.adapter = SubfilterListAdapter(uiHelpers)
+        recyclerView.adapter = SubfilterListAdapter(uiHelpers, statsUtils, seenUnseenWithCounterFeatureConfig)
 
         emptyStateContainer = view.findViewById(R.id.empty_state_container)
         title = emptyStateContainer.findViewById(R.id.title)
         actionButton = emptyStateContainer.findViewById(R.id.action_button)
 
-        subFilterViewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
-                .get(SubFilterViewModel::class.java)
+        subFilterViewModel = ViewModelProvider(
+                requireParentFragment().parentFragment as ViewModelStoreOwner,
+                viewModelFactory
+        ).get(subfilterVmKey, SubFilterViewModel::class.java)
 
         subFilterViewModel.subFilters.observe(viewLifecycleOwner, Observer {
             (recyclerView.adapter as? SubfilterListAdapter)?.let { adapter ->
@@ -123,14 +133,19 @@ class SubfilterPageFragment : DaggerFragment() {
     }
 }
 
-class SubfilterPagerAdapter(val context: Context, val fm: FragmentManager) : FragmentPagerAdapter(fm) {
-    private val filterCategory = listOf(SITES, TAGS)
+class SubfilterPagerAdapter(
+    val context: Context,
+    val fm: FragmentManager,
+    val subfilterViewModelKey: String,
+    categories: List<SubfilterCategory>
+) : FragmentPagerAdapter(fm) {
+    private val filterCategory = categories
     private val fragments = mutableMapOf<SubfilterCategory, WeakReference<SubfilterPageFragment>>()
 
     override fun getCount(): Int = filterCategory.size
 
     override fun getItem(position: Int): Fragment {
-        val fragment = SubfilterPageFragment.newInstance(filterCategory[position])
+        val fragment = SubfilterPageFragment.newInstance(filterCategory[position], subfilterViewModelKey)
         fragments[filterCategory[position]] = WeakReference(fragment)
         return fragment
     }
@@ -149,7 +164,25 @@ class SubfilterPagerAdapter(val context: Context, val fm: FragmentManager) : Fra
     }
 }
 
-enum class SubfilterCategory(@StringRes val titleRes: Int, val type: ItemType) {
+enum class SubfilterCategory(@StringRes val titleRes: Int, val type: ItemType) : Parcelable {
     SITES(R.string.reader_filter_sites_title, SITE),
-    TAGS(R.string.reader_filter_tags_title, TAG)
+    TAGS(R.string.reader_filter_tags_title, TAG);
+
+    override fun writeToParcel(parcel: Parcel, flags: Int) {
+        parcel.writeInt(type.ordinal)
+    }
+
+    override fun describeContents(): Int {
+        return 0
+    }
+
+    companion object CREATOR : Creator<SubfilterCategory> {
+        override fun createFromParcel(parcel: Parcel): SubfilterCategory {
+            return values()[parcel.readInt()]
+        }
+
+        override fun newArray(size: Int): Array<SubfilterCategory?> {
+            return arrayOfNulls(size)
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/adapters/SubfilterListAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/adapters/SubfilterListAdapter.kt
index 868281d54b4e..ebe27c0ee6b2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/adapters/SubfilterListAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/adapters/SubfilterListAdapter.kt
@@ -21,10 +21,17 @@ import org.wordpress.android.ui.reader.subfilter.viewholders.SiteViewHolder
 import org.wordpress.android.ui.reader.subfilter.viewholders.SubFilterDiffCallback
 import org.wordpress.android.ui.reader.subfilter.viewholders.SubfilterListItemViewHolder
 import org.wordpress.android.ui.reader.subfilter.viewholders.TagViewHolder
+import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig
 
-class SubfilterListAdapter(val uiHelpers: UiHelpers) : Adapter<SubfilterListItemViewHolder>() {
+class SubfilterListAdapter(
+    val uiHelpers: UiHelpers,
+    val statsUtils: StatsUtils,
+    val seenUnseenWithCounterFeatureConfig: SeenUnseenWithCounterFeatureConfig
+) : Adapter<SubfilterListItemViewHolder>() {
     private var items: List<SubfilterListItem> = listOf()
+
     fun update(newItems: List<SubfilterListItem>) {
         val diffResult = DiffUtil.calculateDiff(
                 SubFilterDiffCallback(
@@ -42,7 +49,12 @@ class SubfilterListAdapter(val uiHelpers: UiHelpers) : Adapter<SubfilterListItem
         val item = items[position]
         when (holder) {
             is SectionTitleViewHolder -> holder.bind(item as SectionTitle, uiHelpers)
-            is SiteViewHolder -> holder.bind(item as Site, uiHelpers)
+            is SiteViewHolder -> holder.bind(
+                    item as Site,
+                    uiHelpers,
+                    statsUtils,
+                    seenUnseenWithCounterFeatureConfig.isEnabled()
+            )
             is SiteAllViewHolder -> holder.bind(item as SiteAll, uiHelpers)
             is TagViewHolder -> holder.bind(item as Tag, uiHelpers)
             is DividerViewHolder -> {}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SiteViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SiteViewHolder.kt
index 0fb59b8e158a..695f59d4a01a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SiteViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SiteViewHolder.kt
@@ -5,6 +5,8 @@ import android.view.ViewGroup
 import android.widget.TextView
 import org.wordpress.android.R
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Site
+import org.wordpress.android.ui.stats.refresh.utils.ONE_THOUSAND
+import org.wordpress.android.ui.stats.refresh.utils.StatsUtils
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.UrlUtils
 
@@ -13,8 +15,9 @@ class SiteViewHolder(
 ) : SubfilterListItemViewHolder(parent, R.layout.subfilter_list_item) {
     private val itemTitle = itemView.findViewById<TextView>(R.id.item_title)
     private val itemUrl = itemView.findViewById<TextView>(R.id.item_url)
+    private val itemUnseenCount = itemView.findViewById<TextView>(R.id.unseen_count)
 
-    fun bind(site: Site, uiHelpers: UiHelpers) {
+    fun bind(site: Site, uiHelpers: UiHelpers, statsUtils: StatsUtils, showUnreadpostsCount: Boolean) {
         super.bind(site, uiHelpers)
         this.itemTitle.text = uiHelpers.getTextOfUiString(parent.context, site.label)
         this.itemUrl.visibility = View.VISIBLE
@@ -26,5 +29,12 @@ class SiteViewHolder(
             blog.hasFeedUrl() -> UrlUtils.getHost(blog.feedUrl)
             else -> ""
         }
+
+        if (showUnreadpostsCount && site.showUnseenCount) {
+            this.itemUnseenCount.text = statsUtils.toFormattedString(site.unseenCount, ONE_THOUSAND)
+            this.itemUnseenCount.visibility = View.VISIBLE
+        } else {
+            this.itemUnseenCount.visibility = View.GONE
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubFilterDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubFilterDiffCallback.kt
index 496378b0edb0..33fee9ac7683 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubFilterDiffCallback.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubFilterDiffCallback.kt
@@ -38,5 +38,19 @@ class SubFilterDiffCallback(
     override fun areContentsTheSame(
         oldItemPosition: Int,
         newItemPosition: Int
-    ): Boolean = oldList[oldItemPosition].isSelected == newList[newItemPosition].isSelected
+    ): Boolean {
+        val areBothSites = oldList[oldItemPosition].type == SITE && newList[newItemPosition].type == SITE
+        val isSelectedStateSame = oldList[oldItemPosition].isSelected == newList[newItemPosition].isSelected
+
+        return if (areBothSites) {
+            val oldSiteContent = oldList[oldItemPosition] as Site
+            val newSiteContent = newList[newItemPosition] as Site
+
+            isSelectedStateSame &&
+            oldSiteContent.showUnseenCount == newSiteContent.showUnseenCount &&
+            oldSiteContent.unseenCount == newSiteContent.unseenCount
+        } else {
+            isSelectedStateSame
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubfilterListItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubfilterListItemViewHolder.kt
index 0407bf8ba25c..12afdaabbcef 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubfilterListItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/subfilter/viewholders/SubfilterListItemViewHolder.kt
@@ -1,9 +1,7 @@
 package org.wordpress.android.ui.reader.subfilter.viewholders
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.LayoutRes
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
@@ -17,10 +15,6 @@ open class SubfilterListItemViewHolder(
     @LayoutRes layout: Int
 ) : ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
     open fun bind(filter: SubfilterListItem, uiHelpers: UiHelpers) {
-        val selectedTick: ImageView? = this.itemView.findViewById(R.id.item_selected)
-        selectedTick?.let {
-            it.visibility = if (filter.isSelected) View.VISIBLE else View.GONE
-        }
         val itemText: TextView? = this.itemView.findViewById(R.id.item_title)
         itemText?.let {
             it.setTextColor(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/tracker/ReaderTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/tracker/ReaderTracker.kt
index ba5bd5c94385..82c7d3ecdcc3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/tracker/ReaderTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/tracker/ReaderTracker.kt
@@ -1,33 +1,28 @@
 package org.wordpress.android.ui.reader.tracker
 
+import android.net.Uri
 import androidx.annotation.MainThread
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_CUSTOM_TAB_SHOWN
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_DISCOVER_SHOWN
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_FOLLOWING_SHOWN
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_LIKED_SHOWN
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SAVED_LIST_SHOWN
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
-import org.wordpress.android.ui.reader.tracker.ReaderTab.CUSTOM
-import org.wordpress.android.ui.reader.tracker.ReaderTab.DISCOVER
-import org.wordpress.android.ui.reader.tracker.ReaderTab.FOLLOWING
-import org.wordpress.android.ui.reader.tracker.ReaderTab.LIKED
-import org.wordpress.android.ui.reader.tracker.ReaderTab.SAVED
+import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
 import org.wordpress.android.ui.reader.utils.DateProvider
 import org.wordpress.android.util.AppLog
-import org.wordpress.android.util.AppLog.T
-import org.wordpress.android.util.AppLog.T.MAIN
 import org.wordpress.android.util.DateTimeUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 @MainThread
+@Suppress("TooManyFunctions")
 class ReaderTracker @Inject constructor(
     private val dateProvider: DateProvider,
     private val appPrefsWrapper: AppPrefsWrapper,
-    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper
 ) {
     // TODO: evaluate to use something like Dispatchers.Main.Immediate in the fun(s)
     // to sync the access to trackers; so to remove the @MainThread and make the
@@ -49,7 +44,7 @@ class ReaderTracker @Inject constructor(
     fun start(type: ReaderTrackerType) {
         trackers[type]?.let {
             if (!isRunning(type)) {
-                AppLog.d(MAIN, "ReaderTracker: started $type")
+                AppLog.d(AppLog.T.MAIN, "ReaderTracker: started $type")
                 trackers[type] = it.copy(startDate = dateProvider.getCurrentDate())
             }
         }
@@ -58,13 +53,13 @@ class ReaderTracker @Inject constructor(
     fun stop(type: ReaderTrackerType) {
         trackers[type]?.let { trackerInfo ->
             if (isRunning(type)) {
-                AppLog.d(MAIN, "ReaderTracker: stopped $type")
+                AppLog.d(AppLog.T.MAIN, "ReaderTracker: stopped $type")
                 trackerInfo.startDate?.let { startDate ->
                     val accumulatedTime = trackerInfo.accumulatedTime +
                             DateTimeUtils.secondsBetween(dateProvider.getCurrentDate(), startDate)
                     // let reset the startDate to null
                     trackers[type] = ReaderTrackerInfo(accumulatedTime = accumulatedTime)
-                } ?: AppLog.e(T.READER, "ReaderTracker > stop found a null startDate")
+                } ?: AppLog.e(AppLog.T.READER, "ReaderTracker > stop found a null startDate")
             }
         }
     }
@@ -80,11 +75,16 @@ class ReaderTracker @Inject constructor(
     fun trackReaderTabIfNecessary(readerTab: ReaderTab) {
         if (readerTab != appPrefsWrapper.getReaderActiveTab()) {
             when (readerTab) {
-                FOLLOWING -> analyticsTrackerWrapper.track(READER_FOLLOWING_SHOWN)
-                DISCOVER -> analyticsTrackerWrapper.track(READER_DISCOVER_SHOWN)
-                LIKED -> analyticsTrackerWrapper.track(READER_LIKED_SHOWN)
-                SAVED -> analyticsTrackerWrapper.track(READER_SAVED_LIST_SHOWN, mapOf("source" to "reader_filter"))
-                CUSTOM -> analyticsTrackerWrapper.track(READER_CUSTOM_TAB_SHOWN)
+                ReaderTab.FOLLOWING -> analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_FOLLOWING_SHOWN)
+                ReaderTab.DISCOVER -> analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_DISCOVER_SHOWN)
+                ReaderTab.LIKED -> analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_LIKED_SHOWN)
+                ReaderTab.SAVED -> analyticsTrackerWrapper.track(
+                        AnalyticsTracker.Stat.READER_SAVED_LIST_SHOWN,
+                        mapOf("source" to "reader_filter")
+                )
+                ReaderTab.A8C -> analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_A8C_SHOWN)
+                ReaderTab.P2 -> analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_P2_SHOWN)
+                ReaderTab.CUSTOM -> analyticsTrackerWrapper.track(AnalyticsTracker.Stat.READER_CUSTOM_TAB_SHOWN)
             }
             appPrefsWrapper.setReaderActiveTab(readerTab)
         }
@@ -97,10 +97,351 @@ class ReaderTracker @Inject constructor(
     fun onBottomNavigationTabChanged() {
         appPrefsWrapper.setReaderActiveTab(null)
     }
+
+    /* TRACK */
+
+    fun track(
+        stat: AnalyticsTracker.Stat
+    ) {
+        analyticsTrackerWrapper.track(stat)
+    }
+
+    fun track(
+        stat: AnalyticsTracker.Stat,
+        source: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                SOURCE_KEY to source
+        )
+        track(stat, properties)
+    }
+
+    private fun track(
+        stat: AnalyticsTracker.Stat,
+        properties: MutableMap<String, *>
+    ) {
+        analyticsTrackerWrapper.track(stat, properties)
+    }
+
+    /* BLOG */
+
+    fun trackBlog(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        feedId: Long
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId(blogId, feedId),
+                FEED_ID_KEY to feedId
+        )
+        track(stat, properties)
+    }
+
+    fun trackBlog(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        feedId: Long,
+        isFollowed: Boolean?
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId(blogId, feedId),
+                FEED_ID_KEY to feedId,
+                FOLLOW_KEY to (isFollowed ?: UNKNOWN_VALUE)
+        )
+        track(stat, properties)
+    }
+
+    fun trackBlog(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        feedId: Long,
+        source: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId(blogId, feedId),
+                FEED_ID_KEY to feedId,
+                SOURCE_KEY to source
+        )
+        track(stat, properties)
+    }
+
+    fun trackBlog(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        feedId: Long,
+        isFollowed: Boolean?,
+        source: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId(blogId, feedId),
+                FEED_ID_KEY to feedId,
+                FOLLOW_KEY to (isFollowed ?: UNKNOWN_VALUE),
+                SOURCE_KEY to source
+        )
+        track(stat, properties)
+    }
+
+    /**
+     * The [org.wordpress.android.models.ReaderBlog.fromJson] method within this model class has a logic where it
+     * checks whether the blogs 'blogId' is 0, if it is, then it checks whether the 'feedId' is not 0. If both
+     * conditions are met then it assigns the 'feedId' to 'blogId'. It does that in order to keep consistency with the
+     * '/read/' endpoints.
+     *
+     * This tracking function captures that and does the opposite in order to make sure that the tracking is done to the
+     * absolute. As such, it check whether the 'feedId' is equal to the 'blogId' and if so it assigns 0 to the 'blog_id'
+     * tracking property. Else, as should, it assigns the actual 'blogId' to the 'blog_id' tracking property.
+     */
+    private fun blogId(blogId: Long, feedId: Long) = if (feedId == blogId) 0 else blogId
+
+    /* TAG */
+
+    fun trackTag(
+        stat: AnalyticsTracker.Stat,
+        tag: String,
+        source: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                TAG_KEY to tag,
+                SOURCE_KEY to source
+        )
+        track(stat, properties)
+    }
+
+    fun trackTagQuantity(
+        stat: AnalyticsTracker.Stat,
+        quantity: Int
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                QUANTITY_KEY to quantity
+        )
+        track(stat, properties)
+    }
+
+    /* POST */
+
+    fun trackBlogPost(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        postId: Long
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId,
+                POST_ID_KEY to postId
+        )
+        track(stat, properties)
+    }
+
+    fun trackBlogPost(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        postId: Long,
+        isJetpack: Boolean
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId,
+                POST_ID_KEY to postId,
+                IS_JETPACK_KEY to isJetpack
+        )
+        track(stat, properties)
+    }
+
+    fun trackBlogPost(
+        stat: AnalyticsTracker.Stat,
+        blogId: String,
+        postId: String,
+        commentId: Int
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                BLOG_ID_KEY to blogId,
+                POST_ID_KEY to postId,
+                COMMENT_ID_KEY to commentId
+        )
+        track(stat, properties)
+    }
+
+    fun trackFeedPost(
+        stat: AnalyticsTracker.Stat,
+        feedId: Long,
+        feedItemId: Long
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                FEED_ID_KEY to feedId,
+                FEED_ITEM_ID_KEY to feedItemId
+        )
+        track(stat, properties)
+    }
+
+    fun trackPost(
+        stat: AnalyticsTracker.Stat,
+        post: ReaderPost?
+    ) {
+        trackPost(stat, post, mutableMapOf<String, Any>())
+    }
+
+    fun trackPost(
+        stat: AnalyticsTracker.Stat,
+        post: ReaderPost?,
+        source: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                SOURCE_KEY to source
+        )
+        trackPost(stat, post, properties)
+    }
+
+    private fun trackPost(
+        stat: AnalyticsTracker.Stat,
+        post: ReaderPost?,
+        properties: MutableMap<String, *>
+    ) {
+        analyticsUtilsWrapper.trackWithReaderPostDetails(
+                stat,
+                post,
+                properties
+        )
+    }
+
+    fun trackPostComments(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        postId: Long,
+        post: ReaderPost?,
+        properties: MutableMap<String, *>
+    ) {
+        analyticsUtilsWrapper.trackFollowCommentsWithReaderPostDetails(
+                stat,
+                blogId,
+                postId,
+                post,
+                properties
+        )
+    }
+
+    /* OTHER */
+
+    /**
+     * Track when app launched via deep-linking but then fell back to external browser
+     *
+     * @param stat The Stat to bump
+     * @param interceptedUri The fallback URI the app was started with
+     */
+    fun trackUri(
+        stat: AnalyticsTracker.Stat,
+        interceptedUri: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                INTERCEPTED_URI_KEY to interceptedUri
+        )
+        track(stat, properties)
+    }
+
+    fun trackQuery(
+        stat: AnalyticsTracker.Stat,
+        query: String
+    ) {
+        val properties = mutableMapOf<String, Any>(
+                QUERY_KEY to query
+        )
+        track(stat, properties)
+    }
+
+    fun trackDeepLink(
+        stat: AnalyticsTracker.Stat,
+        action: String,
+        host: String,
+        uri: Uri?
+    ) {
+        analyticsUtilsWrapper.trackWithDeepLinkData(stat, action, host, uri)
+    }
+
+    fun trackRailcar(
+        railcarJson: String
+    ) {
+        analyticsUtilsWrapper.trackRailcarRender(railcarJson)
+    }
+
+    /* HELPER */
+
+    @JvmOverloads
+    fun getSource(
+        postListType: ReaderPostListType,
+        readerTab: ReaderTab? = null
+    ): String = if (postListType == ReaderPostListType.TAG_FOLLOWED) {
+        readerTab?.source ?: UNKNOWN_VALUE
+    } else {
+        postListType.source
+    }
+
+    companion object {
+        private const val BLOG_ID_KEY = "blog_id"
+        private const val POST_ID_KEY = "post_id"
+        private const val IS_JETPACK_KEY = "is_jetpack"
+        private const val COMMENT_ID_KEY = "comment_id"
+        private const val FEED_ID_KEY = "feed_id"
+        private const val FEED_ITEM_ID_KEY = "feed_item_id"
+        private const val FOLLOW_KEY = "follow"
+        private const val TAG_KEY = "tag"
+        private const val QUANTITY_KEY = "quantity"
+        private const val INTERCEPTED_URI_KEY = "intercepted_uri"
+        private const val QUERY_KEY = "query"
+
+        private const val SOURCE_KEY = "source"
+        const val SOURCE_FOLLOWING = "following"
+        const val SOURCE_DISCOVER = "discover"
+        const val SOURCE_LIKED = "liked"
+        const val SOURCE_SAVED = "saved"
+        const val SOURCE_CUSTOM = "custom"
+        const val SOURCE_A8C = "a8c"
+        const val SOURCE_P2 = "p2"
+        const val SOURCE_SETTINGS = "subscriptions"
+        const val SOURCE_SEARCH = "search"
+        const val SOURCE_SITE_PREVIEW = "site_preview"
+        const val SOURCE_TAG_PREVIEW = "tag_preview"
+        const val SOURCE_POST_DETAIL = "post_detail"
+        const val SOURCE_COMMENT = "comment"
+        const val SOURCE_USER = "user"
+        const val SOURCE_STATS = "stats"
+        const val SOURCE_NOTIFICATION = "notification"
+        const val SOURCE_READER_LIKE_LIST = "reader_like_list"
+        const val SOURCE_READER_LIKE_LIST_USER_PROFILE = "reader_like_list_user_profile"
+        const val SOURCE_NOTIF_LIKE_LIST_USER_PROFILE = "notif_like_list_user_profile"
+        const val SOURCE_USER_PROFILE_UNKNOWN = "user_profile_source_unknown"
+        const val SOURCE_ACTIVITY_LOG_DETAIL = "activity_log_detail"
+
+        const val SOURCE_POST_LIST_SAVED_POST_NOTICE = "post_list_saved_post_notice"
+
+        private const val UNKNOWN_VALUE = "unknown"
+
+        @JvmStatic
+        fun trackTag(
+            stat: AnalyticsTracker.Stat,
+            tag: String
+        ) {
+            val properties = mutableMapOf<String, Any>(
+                    TAG_KEY to tag
+            )
+            AnalyticsTracker.track(stat, properties)
+        }
+
+        fun isUserProfileSource(source: String): Boolean {
+            return (source == SOURCE_READER_LIKE_LIST_USER_PROFILE ||
+                    source == SOURCE_NOTIF_LIKE_LIST_USER_PROFILE ||
+                    source == SOURCE_USER_PROFILE_UNKNOWN)
+        }
+    }
 }
 
-enum class ReaderTab(val id: Int) {
-    FOLLOWING(1), DISCOVER(2), LIKED(3), SAVED(4), CUSTOM(5);
+enum class ReaderTab(
+    val id: Int,
+    val source: String
+) {
+    FOLLOWING(1, ReaderTracker.SOURCE_FOLLOWING),
+    DISCOVER(2, ReaderTracker.SOURCE_DISCOVER),
+    LIKED(3, ReaderTracker.SOURCE_LIKED),
+    SAVED(4, ReaderTracker.SOURCE_SAVED),
+    CUSTOM(5, ReaderTracker.SOURCE_CUSTOM),
+    A8C(6, ReaderTracker.SOURCE_A8C),
+    P2(7, ReaderTracker.SOURCE_P2);
 
     companion object {
         fun fromId(id: Int): ReaderTab {
@@ -109,17 +450,22 @@ enum class ReaderTab(val id: Int) {
                 DISCOVER.id -> DISCOVER
                 LIKED.id -> LIKED
                 SAVED.id -> SAVED
+                A8C.id -> A8C
+                P2.id -> P2
                 CUSTOM.id -> CUSTOM
                 else -> throw RuntimeException("Unexpected ReaderTab id")
             }
         }
 
+        @JvmStatic
         fun transformTagToTab(readerTag: ReaderTag): ReaderTab {
             return when {
                 readerTag.isFollowedSites -> FOLLOWING
                 readerTag.isPostsILike -> LIKED
                 readerTag.isBookmarked -> SAVED
                 readerTag.isDiscover -> DISCOVER
+                readerTag.isA8C -> A8C
+                readerTag.isP2 -> P2
                 else -> CUSTOM
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderCommentsFollowUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderCommentsFollowUseCase.kt
new file mode 100644
index 000000000000..89e9b0015781
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderCommentsFollowUseCase.kt
@@ -0,0 +1,184 @@
+package org.wordpress.android.ui.reader.usecases
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.AnalyticsFollowCommentsAction.FOLLOW_COMMENTS
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.AnalyticsFollowCommentsAction.UNFOLLOW_COMMENTS
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.AnalyticsFollowCommentsActionResult.ERROR
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.AnalyticsFollowCommentsActionResult.SUCCEEDED
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.AnalyticsFollowCommentsGenericError.NO_NETWORK
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.UserNotAuthenticated
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider.PostSubscribersCallResult.Failure
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider.PostSubscribersCallResult.Success
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+
+class ReaderCommentsFollowUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val postSubscribersApiCallsProvider: PostSubscribersApiCallsProvider,
+    private val accountStore: AccountStore,
+    private val readerTracker: ReaderTracker,
+    private val readerPostTableWrapper: ReaderPostTableWrapper
+) {
+    private val FOLLOW_COMMENT_ACTION = "follow_action"
+    private val FOLLOW_COMMENT_ACTION_RESULT = "follow_action_result"
+    private val FOLLOW_COMMENT_ACTION_ERROR = "follow_action_error"
+
+    suspend fun getMySubscriptionToPost(blogId: Long, postId: Long, isInit: Boolean) = flow {
+        if (!accountStore.hasAccessToken()) {
+            emit(UserNotAuthenticated)
+        } else {
+            emit(FollowCommentsState.Loading)
+
+            if (!networkUtilsWrapper.isNetworkAvailable()) {
+                emit(FollowCommentsState.Failure(blogId, postId, UiStringRes(R.string.error_network_connection)))
+            } else {
+                val canFollowComments = postSubscribersApiCallsProvider.getCanFollowComments(blogId)
+
+                if (!canFollowComments) {
+                    emit(FollowCommentsState.FollowCommentsNotAllowed)
+                } else {
+                    val status = postSubscribersApiCallsProvider.getMySubscriptionToPost(blogId, postId)
+
+                    when (status) {
+                        is Success -> {
+                            emit(
+                                    FollowCommentsState.FollowStateChanged(
+                                            blogId,
+                                            postId,
+                                            status.isFollowing,
+                                            isInit
+                                    )
+                            )
+                        }
+                        is Failure -> {
+                            emit(FollowCommentsState.Failure(blogId, postId, UiStringText(status.error)))
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    suspend fun setMySubscriptionToPost(
+        blogId: Long,
+        postId: Long,
+        subscribe: Boolean
+    ): Flow<FollowCommentsState> = flow {
+        val properties = mutableMapOf<String, Any?>()
+
+        properties.addFollowAction(subscribe)
+
+        emit(FollowCommentsState.Loading)
+
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            emit(FollowCommentsState.Failure(blogId, postId, UiStringRes(R.string.error_network_connection)))
+            properties.addFollowActionResult(ERROR, NO_NETWORK.errorMessage)
+        } else {
+            val status = if (subscribe) {
+                postSubscribersApiCallsProvider.subscribeMeToPost(blogId, postId)
+            } else {
+                postSubscribersApiCallsProvider.unsubscribeMeFromPost(blogId, postId)
+            }
+
+            when (status) {
+                is Success -> {
+                    emit(
+                            FollowCommentsState.FollowStateChanged(
+                                    blogId,
+                                    postId,
+                                    status.isFollowing,
+                                    false,
+                                    UiStringRes(
+                                        if (status.isFollowing)
+                                            R.string.reader_follow_comments_subscribe_success
+                                        else
+                                            R.string.reader_follow_comments_unsubscribe_success
+                                    )
+                            )
+                    )
+                    properties.addFollowActionResult(SUCCEEDED)
+                }
+                is Failure -> {
+                    emit(FollowCommentsState.Failure(blogId, postId, UiStringText(status.error)))
+                    properties.addFollowActionResult(ERROR, status.error)
+                }
+            }
+        }
+
+        val post = readerPostTableWrapper.getBlogPost(blogId, postId, true)
+
+        readerTracker.trackPostComments(
+                Stat.COMMENT_FOLLOW_CONVERSATION,
+                blogId,
+                postId,
+                post,
+                properties
+        )
+    }
+
+    sealed class FollowCommentsState {
+        object Loading : FollowCommentsState()
+
+        data class FollowStateChanged(
+            val blogId: Long,
+            val postId: Long,
+            val isFollowing: Boolean,
+            val isInit: Boolean = false,
+            val userMessage: UiString? = null
+        ) : FollowCommentsState()
+
+        data class Failure(
+            val blogId: Long,
+            val postId: Long,
+            val error: UiString
+        ) : FollowCommentsState()
+
+        object FollowCommentsNotAllowed : FollowCommentsState()
+
+        object UserNotAuthenticated : FollowCommentsState()
+    }
+
+    private enum class AnalyticsFollowCommentsAction(val action: String) {
+        FOLLOW_COMMENTS("followed"),
+        UNFOLLOW_COMMENTS("unfollowed")
+    }
+
+    private enum class AnalyticsFollowCommentsActionResult(val actionResult: String) {
+        SUCCEEDED("succeeded"),
+        ERROR("error")
+    }
+
+    private enum class AnalyticsFollowCommentsGenericError(val errorMessage: String) {
+        NO_NETWORK("no_network")
+    }
+
+    private fun MutableMap<String, Any?>.addFollowAction(subscribe: Boolean): MutableMap<String, Any?> {
+        this[FOLLOW_COMMENT_ACTION] = if (subscribe) {
+            FOLLOW_COMMENTS.action
+        } else {
+            UNFOLLOW_COMMENTS.action
+        }
+        return this
+    }
+
+    private fun MutableMap<String, Any?>.addFollowActionResult(
+        result: AnalyticsFollowCommentsActionResult,
+        errorMessage: String? = null
+    ): MutableMap<String, Any?> {
+        this[FOLLOW_COMMENT_ACTION_RESULT] = result.actionResult
+        errorMessage?.also {
+            this[FOLLOW_COMMENT_ACTION_ERROR] = errorMessage
+        }
+        return this
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchPostUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchPostUseCase.kt
new file mode 100644
index 000000000000..f4d331770261
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchPostUseCase.kt
@@ -0,0 +1,91 @@
+package org.wordpress.android.ui.reader.usecases
+
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.wordpress.android.ui.reader.actions.ReaderActions
+import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.AlreadyRunning
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Failed.NoNetwork
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Failed.RequestFailed
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Success
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Failed.NotAuthorised
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Failed.PostNotFound
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.net.HttpURLConnection
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+class ReaderFetchPostUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val readerPostActionsWrapper: ReaderPostActionsWrapper
+) {
+    private val continuations: MutableMap<FetchPostRequestParams, Continuation<Int>?> = mutableMapOf()
+
+    suspend fun fetchPost(blogId: Long, postId: Long, isFeed: Boolean): FetchReaderPostState {
+        return if (!networkUtilsWrapper.isNetworkAvailable()) {
+            NoNetwork
+        } else {
+            val requestParams = FetchPostRequestParams(blogId, postId, isFeed)
+            // There is already an action running for this request
+            if (continuations[requestParams] != null) {
+                AlreadyRunning
+            } else {
+                when (fetchPostAndWaitForResult(requestParams)) {
+                    HttpURLConnection.HTTP_OK -> Success
+                    HttpURLConnection.HTTP_UNAUTHORIZED, HttpURLConnection.HTTP_FORBIDDEN -> NotAuthorised
+                    HttpURLConnection.HTTP_NOT_FOUND -> PostNotFound
+                    else -> RequestFailed
+                }
+            }
+        }
+    }
+
+    private suspend fun fetchPostAndWaitForResult(requestParams: FetchPostRequestParams): Int {
+        val listener = object : ReaderActions.OnRequestListener<String> {
+            override fun onSuccess(result: String?) {
+                continuations[requestParams]?.resume(HttpURLConnection.HTTP_OK)
+                continuations[requestParams] = null
+            }
+
+            override fun onFailure(statusCode: Int) {
+                continuations[requestParams]?.resume(statusCode)
+                continuations[requestParams] = null
+            }
+        }
+
+        return suspendCancellableCoroutine { cont ->
+            continuations[requestParams] = cont
+
+            if (requestParams.isFeed) {
+                readerPostActionsWrapper.requestFeedPost(
+                        feedId = requestParams.blogId,
+                        postId = requestParams.postId,
+                        requestListener = listener
+                )
+            } else {
+                readerPostActionsWrapper.requestBlogPost(
+                        blogId = requestParams.blogId,
+                        postId = requestParams.postId,
+                        requestListener = listener
+                )
+            }
+        }
+    }
+
+    sealed class FetchReaderPostState {
+        object Success : FetchReaderPostState()
+        object AlreadyRunning : FetchReaderPostState()
+        sealed class Failed : FetchReaderPostState() {
+            object NoNetwork : Failed()
+            object NotAuthorised : Failed()
+            object PostNotFound : Failed()
+            object RequestFailed : Failed()
+        }
+    }
+
+    data class FetchPostRequestParams(
+        val blogId: Long,
+        val postId: Long,
+        val isFeed: Boolean
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchRelatedPostsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchRelatedPostsUseCase.kt
new file mode 100644
index 000000000000..cefee5f14768
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchRelatedPostsUseCase.kt
@@ -0,0 +1,76 @@
+package org.wordpress.android.ui.reader.usecases
+
+import kotlinx.coroutines.suspendCancellableCoroutine
+import org.greenrobot.eventbus.Subscribe
+import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.ui.reader.ReaderEvents.RelatedPostsUpdated
+import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
+import org.wordpress.android.ui.reader.models.ReaderSimplePostList
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState.AlreadyRunning
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState.Failed.NoNetwork
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState.Failed.RequestFailed
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+
+class ReaderFetchRelatedPostsUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val readerPostActionsWrapper: ReaderPostActionsWrapper
+) {
+    private val continuations: MutableMap<RelatedPostsRequest, Continuation<FetchRelatedPostsState>?> = mutableMapOf()
+
+    suspend fun fetchRelatedPosts(sourcePost: ReaderPost): FetchRelatedPostsState {
+        val request = RelatedPostsRequest(postId = sourcePost.postId, blogId = sourcePost.blogId)
+
+        return when {
+            continuations[request] != null -> AlreadyRunning
+
+            !networkUtilsWrapper.isNetworkAvailable() -> NoNetwork
+
+            else -> {
+                suspendCancellableCoroutine { cont ->
+                    continuations[request] = cont
+                    readerPostActionsWrapper.requestRelatedPosts(sourcePost)
+                }
+            }
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.BACKGROUND)
+    @SuppressWarnings("unused")
+    fun onRelatedPostUpdated(event: RelatedPostsUpdated) {
+        val result = if (event.didSucceed()) {
+            Success(
+                    localRelatedPosts = event.localRelatedPosts,
+                    globalRelatedPosts = event.globalRelatedPosts
+            )
+        } else {
+            RequestFailed
+        }
+
+        val request = RelatedPostsRequest(postId = event.sourcePostId, blogId = event.sourceSiteId)
+        continuations[request]?.resume(result)
+        continuations[request] = null
+    }
+
+    sealed class FetchRelatedPostsState {
+        data class Success(
+            val localRelatedPosts: ReaderSimplePostList,
+            val globalRelatedPosts: ReaderSimplePostList
+        ) : FetchRelatedPostsState()
+
+        object AlreadyRunning : FetchRelatedPostsState()
+        sealed class Failed : FetchRelatedPostsState() {
+            object NoNetwork : Failed()
+            object RequestFailed : Failed()
+        }
+    }
+
+    data class RelatedPostsRequest(
+        val postId: Long,
+        val blogId: Long
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchSiteUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchSiteUseCase.kt
new file mode 100644
index 000000000000..eb8a9d91f344
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderFetchSiteUseCase.kt
@@ -0,0 +1,67 @@
+package org.wordpress.android.ui.reader.usecases
+
+import org.wordpress.android.models.ReaderBlog
+import org.wordpress.android.ui.reader.actions.ReaderActions.UpdateBlogInfoListener
+import org.wordpress.android.ui.reader.actions.ReaderBlogActionsWrapper
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase.FetchSiteState.AlreadyRunning
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase.FetchSiteState.Failed.NoNetwork
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase.FetchSiteState.Failed.RequestFailed
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase.FetchSiteState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+import kotlin.coroutines.Continuation
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class ReaderFetchSiteUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val readerBlogActionsWrapper: ReaderBlogActionsWrapper
+) {
+    private val continuations: MutableMap<FetchSiteRequestParams, Continuation<ReaderBlog?>?> = mutableMapOf()
+
+    suspend fun fetchSite(blogId: Long, feedId: Long, blogUrl: String? = null): FetchSiteState {
+        return if (!networkUtilsWrapper.isNetworkAvailable()) {
+            NoNetwork
+        } else {
+            val requestParams = FetchSiteRequestParams(blogId, feedId, blogUrl)
+            // There is already an action running for this request
+            if (continuations[requestParams] != null) {
+                AlreadyRunning
+            } else {
+                fetchSiteAndWaitForResult(requestParams)?.let { Success } ?: RequestFailed
+            }
+        }
+    }
+
+    private suspend fun fetchSiteAndWaitForResult(requestParams: FetchSiteRequestParams): ReaderBlog? {
+        val actionListener = UpdateBlogInfoListener { readerBlog ->
+            continuations[requestParams]?.resume(readerBlog)
+            continuations[requestParams] = null
+        }
+
+        return suspendCoroutine { cont ->
+            continuations[requestParams] = cont
+            readerBlogActionsWrapper.updateBlogInfo(
+                requestParams.blogId,
+                requestParams.feedId,
+                requestParams.blogUrl,
+                actionListener
+            )
+        }
+    }
+
+    sealed class FetchSiteState {
+        object Success : FetchSiteState()
+        object AlreadyRunning : FetchSiteState()
+        sealed class Failed : FetchSiteState() {
+            object NoNetwork : Failed()
+            object RequestFailed : Failed()
+        }
+    }
+
+    data class FetchSiteRequestParams(
+        val blogId: Long,
+        val feedId: Long,
+        val blogUrl: String?
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderGetPostUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderGetPostUseCase.kt
new file mode 100644
index 000000000000..9a3bd76de44a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderGetPostUseCase.kt
@@ -0,0 +1,43 @@
+package org.wordpress.android.ui.reader.usecases
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.models.ReaderPostDiscoverData
+import org.wordpress.android.models.ReaderPostDiscoverData.DiscoverType.EDITOR_PICK
+import org.wordpress.android.modules.IO_THREAD
+import javax.inject.Inject
+import javax.inject.Named
+
+class ReaderGetPostUseCase @Inject constructor(
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
+    private val readerPostTableWrapper: ReaderPostTableWrapper
+) {
+    suspend fun get(blogId: Long, postId: Long, isFeed: Boolean): Pair<ReaderPost?, Boolean> =
+            withContext(ioDispatcher) {
+                val readerPost = if (isFeed) {
+                    readerPostTableWrapper.getFeedPost(blogId = blogId, postId = postId, excludeTextColumn = false)
+                } else {
+                    readerPostTableWrapper.getBlogPost(blogId = blogId, postId = postId, excludeTextColumn = false)
+                }
+
+                // "discover" Editor Pick posts should open the original (source) post
+                val discoverEditorPost = readerPost?.let { getDiscoverEditorPickSourcePost(it) }
+
+                val post = discoverEditorPost ?: readerPost
+                val isFeedPost = if (discoverEditorPost != null) false else isFeed
+
+                Pair(post, isFeedPost)
+            }
+
+    private fun getDiscoverEditorPickSourcePost(post: ReaderPost) =
+            post.takeIf { it.isDiscoverPost && isDiscoverEditorPickPost(it.discoverData) }?.let {
+                readerPostTableWrapper.getBlogPost(it.discoverData.blogId, it.discoverData.postId, false)
+            }
+
+    private fun isDiscoverEditorPickPost(discoverPostData: ReaderPostDiscoverData?) =
+            discoverPostData?.discoverType == EDITOR_PICK &&
+                    discoverPostData.blogId != 0L &&
+                    discoverPostData.postId != 0L
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCase.kt
index 754c1b6d85c4..370dcfeead2e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCase.kt
@@ -2,17 +2,14 @@ package org.wordpress.android.ui.reader.usecases
 
 import kotlinx.coroutines.flow.FlowCollector
 import kotlinx.coroutines.flow.flow
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_SAVED_FROM_OTHER_POST_LIST
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_SAVED_FROM_SAVED_POST_LIST
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_UNSAVED_FROM_SAVED_POST_LIST
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_SAVED_FROM_DETAILS
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_POST_UNSAVED_FROM_DETAILS
+import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.Success
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import javax.inject.Inject
 
 /**
@@ -20,20 +17,19 @@ import javax.inject.Inject
  * It updates the post in the database, tracks events, initiates pre-load content and shows snackbar/dialog.
  */
 class ReaderPostBookmarkUseCase @Inject constructor(
-    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val readerTracker: ReaderTracker,
     private val networkUtilsWrapper: NetworkUtilsWrapper,
     private val readerPostActionsWrapper: ReaderPostActionsWrapper,
     private val readerPostTableWrapper: ReaderPostTableWrapper
 ) {
     suspend fun toggleBookmark(
-        blogId: Long,
-        postId: Long,
+        post: ReaderPost,
         isBookmarkList: Boolean,
-        fromPostDetails: Boolean = false
-    ) = flow<BookmarkPostState> {
-        val bookmarked = updatePostInDb(blogId, postId)
-        trackEvent(bookmarked, isBookmarkList, fromPostDetails)
-        preloadPostContentIfNecessary(bookmarked, isBookmarkList, blogId, postId)
+        source: String
+    ) = flow {
+        val bookmarked = updatePostInDb(post.blogId, post.postId)
+        trackEvent(bookmarked, isBookmarkList, post, source)
+        preloadPostContentIfNecessary(bookmarked, isBookmarkList, post.blogId, post.postId)
         emit(Success(bookmarked))
     }
 
@@ -63,17 +59,29 @@ class ReaderPostBookmarkUseCase @Inject constructor(
         return setToBookmarked
     }
 
-    private fun trackEvent(bookmarked: Boolean, isBookmarkList: Boolean, fromPostDetails: Boolean) {
+    private fun trackEvent(
+        bookmarked: Boolean,
+        isBookmarkList: Boolean,
+        post: ReaderPost,
+        source: String
+    ) {
+        val fromPostDetails = source == ReaderTracker.SOURCE_POST_DETAIL
         val trackingEvent = when {
-            !fromPostDetails && bookmarked && isBookmarkList -> READER_POST_SAVED_FROM_SAVED_POST_LIST
-            !fromPostDetails && bookmarked && !isBookmarkList -> READER_POST_SAVED_FROM_OTHER_POST_LIST
-            !fromPostDetails && !bookmarked && isBookmarkList -> READER_POST_UNSAVED_FROM_SAVED_POST_LIST
-            !fromPostDetails && !bookmarked && !isBookmarkList -> READER_POST_SAVED_FROM_OTHER_POST_LIST
-            fromPostDetails && bookmarked && !isBookmarkList -> READER_POST_SAVED_FROM_DETAILS
-            fromPostDetails && !bookmarked && !isBookmarkList -> READER_POST_UNSAVED_FROM_DETAILS
+            !fromPostDetails && bookmarked && isBookmarkList ->
+                AnalyticsTracker.Stat.READER_POST_SAVED_FROM_SAVED_POST_LIST
+            !fromPostDetails && bookmarked && !isBookmarkList ->
+                AnalyticsTracker.Stat.READER_POST_SAVED_FROM_OTHER_POST_LIST
+            !fromPostDetails && !bookmarked && isBookmarkList ->
+                AnalyticsTracker.Stat.READER_POST_UNSAVED_FROM_SAVED_POST_LIST
+            !fromPostDetails && !bookmarked && !isBookmarkList ->
+                AnalyticsTracker.Stat.READER_POST_UNSAVED_FROM_OTHER_POST_LIST
+            fromPostDetails && bookmarked && !isBookmarkList ->
+                AnalyticsTracker.Stat.READER_POST_SAVED_FROM_DETAILS
+            fromPostDetails && !bookmarked && !isBookmarkList ->
+                AnalyticsTracker.Stat.READER_POST_UNSAVED_FROM_DETAILS
             else -> throw IllegalStateException("Developer error: This code should be unreachable.")
         }
-        analyticsTrackerWrapper.track(trackingEvent)
+        readerTracker.trackBlog(trackingEvent, post.blogId, post.feedId, post.isFollowedByCurrentUser, source)
     }
 }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSeenStatusToggleUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSeenStatusToggleUseCase.kt
new file mode 100644
index 000000000000..babcce6f5ec2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSeenStatusToggleUseCase.kt
@@ -0,0 +1,138 @@
+package org.wordpress.android.ui.reader.usecases
+
+import kotlinx.coroutines.flow.flow
+import org.wordpress.android.R.string
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.datasets.ReaderBlogTableWrapper
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.Error
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.PostSeenStateChanged
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.UserNotAuthenticated
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.ReaderPostSeenToggleSource.READER_POST_DETAILS
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider.SeenStatusToggleCallResult.Failure
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider.SeenStatusToggleCallResult.Success
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.NetworkUtilsWrapper
+import javax.inject.Inject
+
+class ReaderSeenStatusToggleUseCase @Inject constructor(
+    private val networkUtilsWrapper: NetworkUtilsWrapper,
+    private val apiCallsProvider: PostSeenStatusApiCallsProvider,
+    private val accountStore: AccountStore,
+    private val readerTracker: ReaderTracker,
+    private val readerPostTableWrapper: ReaderPostTableWrapper,
+    private val readerBlogTableWrapper: ReaderBlogTableWrapper
+) {
+    /**
+     * Convenience method for toggling seen status based on the current state in local DB
+     */
+    suspend fun toggleSeenStatus(post: ReaderPost, actionSource: ReaderPostSeenToggleSource) = flow {
+        if (!networkUtilsWrapper.isNetworkAvailable()) {
+            emit(Error(UiStringRes(string.error_network_connection)))
+            return@flow
+        }
+
+        if (!accountStore.hasAccessToken()) {
+            emit(UserNotAuthenticated)
+            return@flow
+        }
+
+        if (!post.isSeenSupported) {
+            emit(Error(UiStringRes(string.reader_error_changing_seen_status_of_unsupported_post)))
+            return@flow
+        }
+
+        val isAskingToMarkAsSeen = !readerPostTableWrapper.isPostSeen(post)
+        val status = if (isAskingToMarkAsSeen) {
+            markPostAsSeen(post, actionSource)
+        } else {
+            markPostAsUnseen(post, actionSource)
+        }
+
+        emit(status)
+    }
+
+    suspend fun markPostAsSeenIfNecessary(post: ReaderPost) {
+        if (!networkUtilsWrapper.isNetworkAvailable() || !accountStore.hasAccessToken() || !post.isSeenSupported) {
+            return
+        }
+
+        if (!readerPostTableWrapper.isPostSeen(post)) {
+            markPostAsSeen(post, READER_POST_DETAILS, true)
+        }
+    }
+
+    private suspend fun markPostAsSeen(
+        post: ReaderPost,
+        actionSource: ReaderPostSeenToggleSource,
+        doNotTrack: Boolean = false
+    ): PostSeenState {
+        return when (val status = apiCallsProvider.markPostAsSeen(post)) {
+            is Success -> {
+                readerPostTableWrapper.setPostSeenStatusInDb(post, true)
+                readerBlogTableWrapper.decrementUnseenCount(post.blogId)
+                if (!doNotTrack) {
+                    readerTracker.trackPost(
+                            AnalyticsTracker.Stat.READER_POST_MARKED_AS_SEEN,
+                            post,
+                            actionSource.toString()
+                    )
+                }
+                PostSeenStateChanged(true, UiStringRes(string.reader_marked_post_as_seen))
+            }
+            is Failure -> {
+                Error(UiStringText(status.error))
+            }
+        }
+    }
+
+    private suspend fun markPostAsUnseen(post: ReaderPost, actionSource: ReaderPostSeenToggleSource): PostSeenState {
+        return when (val status = apiCallsProvider.markPostAsUnseen(post)) {
+            is Success -> {
+                readerPostTableWrapper.setPostSeenStatusInDb(post, false)
+                readerBlogTableWrapper.incrementUnseenCount(post.blogId)
+                readerTracker.trackPost(
+                        AnalyticsTracker.Stat.READER_POST_MARKED_AS_UNSEEN,
+                        post,
+                        actionSource.toString()
+                )
+                PostSeenStateChanged(false, UiStringRes(string.reader_marked_post_as_unseen))
+            }
+            is Failure -> {
+                Error(UiStringText(status.error))
+            }
+        }
+    }
+
+    sealed class PostSeenState {
+        data class PostSeenStateChanged(
+            val isSeen: Boolean,
+            val userMessage: UiString? = null
+        ) : PostSeenState()
+
+        data class Error(
+            val message: UiString? = null
+        ) : PostSeenState()
+
+        object UserNotAuthenticated : PostSeenState()
+    }
+
+    enum class ReaderPostSeenToggleSource {
+        READER_POST_CARD {
+            override fun toString(): String {
+                return "post_card"
+            }
+        },
+        READER_POST_DETAILS {
+            override fun toString(): String {
+                return "post_details"
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCase.kt
index f03f7213a47b..ba77484fae83 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCase.kt
@@ -5,6 +5,8 @@ import kotlinx.coroutines.flow.flow
 import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener
 import org.wordpress.android.ui.reader.actions.ReaderBlogActionsWrapper
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.AlreadyRunning
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.Failed.NoNetwork
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.Failed.RequestFailed
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged
@@ -23,38 +25,48 @@ class ReaderSiteFollowUseCase @Inject constructor(
     private val networkUtilsWrapper: NetworkUtilsWrapper,
     private val readerBlogActionsWrapper: ReaderBlogActionsWrapper,
     private val readerBlogTableWrapper: ReaderBlogTableWrapper,
-    private val readerUtilsWrapper: ReaderUtilsWrapper
+    private val readerUtilsWrapper: ReaderUtilsWrapper,
+    private val readerTracker: ReaderTracker
 ) {
-    private var continuation: Continuation<Boolean>? = null
+    private val continuations: MutableMap<Param, Continuation<Boolean>?> = mutableMapOf()
 
-    suspend fun toggleFollow(param: Param) = flow<FollowSiteState> {
+    suspend fun toggleFollow(
+        param: Param,
+        source: String
+    ) = flow {
         val (blogId, feedId) = param
         if (!networkUtilsWrapper.isNetworkAvailable()) {
             emit(NoNetwork)
         } else {
+            // There is already an action running for this request
+            if (continuations[param] != null) {
+                emit(AlreadyRunning)
+                return@flow
+            }
             val isAskingToFollow = !readerBlogTableWrapper.isSiteFollowed(blogId, feedId)
             val showEnableNotification = !readerUtilsWrapper.isExternalFeed(blogId, feedId) && isAskingToFollow
 
-            emit(FollowStatusChanged(blogId, isAskingToFollow, showEnableNotification))
-            performAction(blogId, feedId, isAskingToFollow)
+            emit(FollowStatusChanged(blogId, feedId, isAskingToFollow, showEnableNotification))
+            performAction(param, isAskingToFollow, source)
         }
     }
 
     private suspend fun FlowCollector<FollowSiteState>.performAction(
-        blogId: Long,
-        feedId: Long,
-        isAskingToFollow: Boolean
+        param: Param,
+        isAskingToFollow: Boolean,
+        source: String
     ) {
-        val succeeded = followSiteAndWaitForResult(blogId, feedId, isAskingToFollow)
+        val succeeded = followSiteAndWaitForResult(param, isAskingToFollow, source)
         if (!succeeded) {
-            emit(FollowStatusChanged(blogId, !isAskingToFollow))
+            emit(FollowStatusChanged(param.blogId, param.feedId, !isAskingToFollow))
             emit(RequestFailed)
         } else {
-            val deleteNotificationSubscription = !readerUtilsWrapper.isExternalFeed(blogId, feedId) &&
+            val deleteNotificationSubscription = !readerUtilsWrapper.isExternalFeed(param.blogId, param.feedId) &&
                     !isAskingToFollow
             emit(
                     FollowStatusChanged(
-                            blogId,
+                            param.blogId,
+                            param.feedId,
                             isAskingToFollow,
                             deleteNotificationSubscription = deleteNotificationSubscription
                     )
@@ -63,27 +75,40 @@ class ReaderSiteFollowUseCase @Inject constructor(
         }
     }
 
-    private suspend fun followSiteAndWaitForResult(blogId: Long, feedId: Long, isAskingToFollow: Boolean): Boolean {
+    private suspend fun followSiteAndWaitForResult(
+        param: Param,
+        isAskingToFollow: Boolean,
+        source: String
+    ): Boolean {
         val actionListener = ActionListener { succeeded ->
-            continuation?.resume(succeeded)
-            continuation = null
+            continuations[param]?.resume(succeeded)
+            continuations[param] = null
         }
 
         return suspendCoroutine { cont ->
-            continuation = cont
-            readerBlogActionsWrapper.followBlog(blogId, feedId, isAskingToFollow, actionListener)
+            continuations[param] = cont
+            readerBlogActionsWrapper.followBlog(
+                    param.blogId,
+                    param.feedId,
+                    isAskingToFollow,
+                    actionListener,
+                    source,
+                    readerTracker
+            )
         }
     }
 
     sealed class FollowSiteState {
         data class FollowStatusChanged(
             val blogId: Long,
+            val feedId: Long,
             val following: Boolean,
             val showEnableNotification: Boolean = false,
             val deleteNotificationSubscription: Boolean = false
         ) : FollowSiteState()
 
         object Success : FollowSiteState()
+        object AlreadyRunning : FollowSiteState()
         sealed class Failed : FollowSiteState() {
             object NoNetwork : Failed()
             object RequestFailed : Failed()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCase.kt
index 102ea920221f..6abdf288adae 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCase.kt
@@ -2,8 +2,7 @@ package org.wordpress.android.ui.reader.usecases
 
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_MENU_OFF
-import org.wordpress.android.analytics.AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_MENU_ON
+import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.AccountActionBuilder
@@ -12,6 +11,7 @@ import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPay
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction.DELETE
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction.NEW
 import org.wordpress.android.fluxc.store.AccountStore.OnSubscriptionUpdated
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState.Failed.AlreadyRunning
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState.Failed.NoNetwork
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState.Failed.RequestFailed
@@ -19,7 +19,6 @@ import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.S
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.API
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 import javax.inject.Inject
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -30,13 +29,16 @@ import kotlin.coroutines.suspendCoroutine
  */
 class ReaderSiteNotificationsUseCase @Inject constructor(
     private val dispatcher: Dispatcher,
-    private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
+    private val readerTracker: ReaderTracker,
     private val readerBlogTableWrapper: ReaderBlogTableWrapper,
     private val networkUtilsWrapper: NetworkUtilsWrapper
 ) {
     private var continuation: Continuation<Boolean>? = null
 
-    suspend fun toggleNotification(blogId: Long): SiteNotificationState {
+    suspend fun toggleNotification(
+        blogId: Long,
+        feedId: Long
+    ): SiteNotificationState {
         if (continuation != null) {
             return AlreadyRunning
         }
@@ -45,7 +47,7 @@ class ReaderSiteNotificationsUseCase @Inject constructor(
         }
 
         // We want to track the action no matter the result
-        trackEvent(blogId)
+        trackEvent(blogId, feedId)
 
         val succeeded = suspendCoroutine<Boolean> { cont ->
             continuation = cont
@@ -67,14 +69,14 @@ class ReaderSiteNotificationsUseCase @Inject constructor(
         }
     }
 
-    private fun trackEvent(blogId: Long) {
+    private fun trackEvent(blogId: Long, feedId: Long) {
         val trackingEvent = if (readerBlogTableWrapper.isNotificationsEnabled(blogId)) {
-            FOLLOWED_BLOG_NOTIFICATIONS_READER_MENU_OFF
+            AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_MENU_OFF
         } else {
-            FOLLOWED_BLOG_NOTIFICATIONS_READER_MENU_ON
+            AnalyticsTracker.Stat.FOLLOWED_BLOG_NOTIFICATIONS_READER_MENU_ON
         }
 
-        analyticsUtilsWrapper.trackWithSiteId(trackingEvent, blogId)
+        readerTracker.trackBlog(trackingEvent, blogId, feedId)
     }
 
     fun updateNotificationEnabledForBlogInDb(blogId: Long, isNotificationEnabledForBlog: Boolean) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtils.kt
index c1677122d44e..cc929858fc34 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtils.kt
@@ -19,10 +19,10 @@ class FeaturedImageUtils
     ): Boolean {
         return try {
             val featuredImageUrl = URL(featuredImage)
-            val endIndex = featuredImageUrl.path.lastIndexOf("-", featuredImageUrl.path.lastIndexOf("/"))
+            val endIndex = getLastIndexOfDashInUrl(featuredImageUrl)
             val featuredImageFile = featuredImageUrl.file
             val featuredImagePath = if (endIndex > 0 && !featuredImageFile.startsWith("-")) {
-                featuredImageUrl.path.substring(0, endIndex)
+                featuredImageUrl.path.substring(0, endIndex + 1)
             } else {
                 featuredImageUrl.path
             }
@@ -37,6 +37,10 @@ class FeaturedImageUtils
         }
     }
 
+    private fun getLastIndexOfDashInUrl(url: URL) = url.path.split("/").last()
+            .lastIndexOf("-").takeIf { it > 0 }
+            ?.let { it + url.path.lastIndexOf("/") } ?: -1
+
     /*
      * returns true if the post has a featured image and the featured image is not found in the post body
      */
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/PostSeenStatusApiCallsProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/PostSeenStatusApiCallsProvider.kt
new file mode 100644
index 000000000000..19d0f5e5bd4d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/PostSeenStatusApiCallsProvider.kt
@@ -0,0 +1,99 @@
+package org.wordpress.android.ui.reader.utils
+
+import com.wordpress.rest.RestRequest.ErrorListener
+import com.wordpress.rest.RestRequest.Listener
+import org.json.JSONArray
+import org.json.JSONObject
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider.SeenStatusToggleCallResult.Failure
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider.SeenStatusToggleCallResult.Success
+import org.wordpress.android.util.StringUtils
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+const val ANDROID_READER_SOURCE_PARAMETER_VALUE = "reader-android"
+
+class PostSeenStatusApiCallsProvider @Inject constructor(
+    private val contextProvider: ContextProvider
+) {
+    suspend fun markPostAsSeen(post: ReaderPost): SeenStatusToggleCallResult = suspendCoroutine { cont ->
+        val params = SeenStatusToggleRequestParameters.fromReaderPost(post, true)
+
+        val listener = Listener { responseJson ->
+            val result = seenStatusToggleSuccessful(responseJson, true)
+            cont.resume(result)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            cont.resume(Failure(StringUtils.notNullStr(volleyError.message)))
+        }
+        WordPress.getRestClientUtilsV2().post(params.endpoint, params.parameters, null, listener, errorListener)
+    }
+
+    suspend fun markPostAsUnseen(post: ReaderPost): SeenStatusToggleCallResult = suspendCoroutine { cont ->
+        val params = SeenStatusToggleRequestParameters.fromReaderPost(post, false)
+
+        val listener = Listener { responseJson ->
+            val result = seenStatusToggleSuccessful(responseJson, false)
+            cont.resume(result)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            cont.resume(Failure(StringUtils.notNullStr(volleyError.message)))
+        }
+        WordPress.getRestClientUtilsV2().post(params.endpoint, params.parameters, null, listener, errorListener)
+    }
+
+    private fun seenStatusToggleSuccessful(json: JSONObject?, askedToMarkAsSeen: Boolean): SeenStatusToggleCallResult {
+        return json?.let {
+            val success = it.optBoolean("status", false)
+            if (success) {
+                Success(askedToMarkAsSeen)
+            } else {
+                Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_bad_format_response))
+            }
+        } ?: Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_null_response))
+    }
+
+    sealed class SeenStatusToggleCallResult {
+        data class Success(val isSeen: Boolean) : SeenStatusToggleCallResult()
+        data class Failure(val error: String) : SeenStatusToggleCallResult()
+    }
+
+    data class SeenStatusToggleRequestParameters(val parameters: JSONObject, val endpoint: String) {
+        companion object {
+            fun fromReaderPost(post: ReaderPost, askingToMarkAsSeen: Boolean): SeenStatusToggleRequestParameters {
+                val requestJson = JSONObject()
+                val endpoint: String
+
+                if (askingToMarkAsSeen) {
+                    endpoint = if (post.isExternal) {
+                        requestJson.put("feed_id", post.feedId.toString())
+                        requestJson.put("feed_item_ids", JSONArray(arrayListOf(post.feedItemId)))
+                        "/seen-posts/seen/new"
+                    } else {
+                        requestJson.put("blog_id", post.blogId.toString())
+                        requestJson.put("post_ids", JSONArray(arrayListOf(post.postId)))
+                        "/seen-posts/seen/blog/new"
+                    }
+                } else {
+                    endpoint = if (post.isExternal) {
+                        requestJson.put("feed_id", post.feedId.toString())
+                        requestJson.put("feed_item_ids", JSONArray(arrayListOf(post.feedItemId)))
+                        "/seen-posts/seen/delete"
+                    } else {
+                        requestJson.put("blog_id", post.blogId.toString())
+                        requestJson.put("post_ids", JSONArray(arrayListOf(post.postId)))
+                        "/seen-posts/seen/blog/delete"
+                    }
+                }
+
+                requestJson.put("source", ANDROID_READER_SOURCE_PARAMETER_VALUE)
+
+                return SeenStatusToggleRequestParameters(requestJson, endpoint)
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/PostSubscribersApiCallsProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/PostSubscribersApiCallsProvider.kt
new file mode 100644
index 000000000000..0bfc83a8f6ba
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/PostSubscribersApiCallsProvider.kt
@@ -0,0 +1,208 @@
+package org.wordpress.android.ui.reader.utils
+
+import com.android.volley.VolleyError
+import com.wordpress.rest.RestRequest.ErrorListener
+import com.wordpress.rest.RestRequest.Listener
+import org.json.JSONObject
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider.PostSubscribersCallResult.Failure
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider.PostSubscribersCallResult.Success
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.VolleyUtils
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+class PostSubscribersApiCallsProvider @Inject constructor(
+    private val contextProvider: ContextProvider
+) {
+    suspend fun getCanFollowComments(blogId: Long): Boolean = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/"
+
+        val listener = Listener { jsonObject ->
+            val result = canFollowComments(blogId, jsonObject)
+            AppLog.d(
+                    T.READER,
+                    "getCanFollowComments > Succeeded [blogId=$blogId - result = $result]"
+            )
+            cont.resume(result is Success)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            AppLog.d(
+                    T.READER,
+                    "getCanFollowComments > Failed [blogId=$blogId - volleyError = $volleyError]"
+            )
+            cont.resume(false)
+        }
+
+        WordPress.getRestClientUtilsV1_1().get(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    suspend fun getMySubscriptionToPost(
+        blogId: Long,
+        postId: Long
+    ): PostSubscribersCallResult = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/posts/$postId/subscribers/mine"
+
+        val listener = Listener { jsonObject ->
+            val result = isFollowing(jsonObject)
+            AppLog.d(
+                    T.READER,
+                    "getMySubscriptionToPost > Succeeded [blogId=$blogId - postId=$postId - result = $result]"
+            )
+            cont.resume(result)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            val error = getErrorStringAndLog("getMySubscriptionToPost", blogId, postId, volleyError)
+            cont.resume(Failure(error))
+        }
+
+        WordPress.getRestClientUtilsV1_1().get(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    suspend fun subscribeMeToPost(blogId: Long, postId: Long): PostSubscribersCallResult = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/posts/$postId/subscribers/new"
+
+        val listener = Listener { jsonObject ->
+            val result = wasSubscribed(jsonObject)
+            AppLog.d(
+                    T.READER,
+                    "subscribeMeToPost > Succeeded [blogId=$blogId - postId=$postId - result = $result]"
+            )
+            cont.resume(result)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            val error = getErrorStringAndLog("subscribeMeToPost", blogId, postId, volleyError)
+            cont.resume(Failure(error))
+        }
+
+        WordPress.getRestClientUtilsV1_1().post(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    suspend fun unsubscribeMeFromPost(
+        blogId: Long,
+        postId: Long
+    ): PostSubscribersCallResult = suspendCoroutine { cont ->
+        val endPointPath = "/sites/$blogId/posts/$postId/subscribers/mine/delete"
+
+        val listener = Listener { jsonObject ->
+            val result = wasUnsubscribed(jsonObject)
+            AppLog.d(
+                    T.READER,
+                    "unsubscribeMeFromPost > Succeeded [blogId=$blogId - postId=$postId - result = $result]"
+            )
+            cont.resume(result)
+        }
+        val errorListener = ErrorListener { volleyError ->
+            val error = getErrorStringAndLog("unsubscribeMeFromPost", blogId, postId, volleyError)
+            cont.resume(Failure(error))
+        }
+
+        WordPress.getRestClientUtilsV1_1().post(
+                endPointPath,
+                listener,
+                errorListener
+        )
+    }
+
+    private fun getErrorStringAndLog(
+        functionName: String,
+        blogId: Long,
+        postId: Long,
+        volleyError: VolleyError?
+    ): String {
+        var error = VolleyUtils.errStringFromVolleyError(volleyError)
+        return if (error.isNullOrEmpty()) {
+            AppLog.d(
+                    T.READER,
+                    "$functionName > Failed with empty string " +
+                            "[blogId=$blogId - postId=$postId - volleyError = $volleyError]"
+            )
+            contextProvider.getContext().getString(R.string.reader_follow_comments_get_status_error)
+        } else {
+            AppLog.d(
+                    T.READER,
+                    "$functionName > Failed [blogId=$blogId - postId=$postId - error = $error]"
+            )
+            error
+        }
+    }
+
+    private fun isFollowing(json: JSONObject?): PostSubscribersCallResult {
+        return json?.let {
+            if (it.has("i_subscribe")) {
+                Success(it.optBoolean("i_subscribe", false))
+            } else {
+                Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_bad_format_response))
+            }
+        } ?: Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_null_response))
+    }
+
+    private fun canFollowComments(blogId: Long, json: JSONObject?): PostSubscribersCallResult {
+        return json?.let {
+            if (it.has("ID") && it.optLong("ID", -1) == blogId) {
+                Success(false)
+            } else {
+                Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_bad_format_response))
+            }
+        } ?: Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_null_response))
+    }
+
+    private fun wasSubscribed(json: JSONObject?): PostSubscribersCallResult {
+        return json?.let {
+            val success = it.optBoolean("success", false)
+            val subscribed = it.optBoolean("i_subscribe", false)
+
+            if (success) {
+                if (subscribed) {
+                    Success(true)
+                } else {
+                    Failure(contextProvider.getContext().getString(
+                            R.string.reader_follow_comments_could_not_subscribe_error
+                    ))
+                }
+            } else {
+                Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_bad_format_response))
+            }
+        } ?: Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_null_response))
+    }
+
+    private fun wasUnsubscribed(json: JSONObject?): PostSubscribersCallResult {
+        return json?.let {
+            val success = it.optBoolean("success", false)
+            val subscribed = it.optBoolean("i_subscribe", true)
+
+            if (success) {
+                if (!subscribed) {
+                    Success(false)
+                } else {
+                    Failure(contextProvider.getContext().getString(
+                            R.string.reader_follow_comments_could_not_unsubscribe_error
+                    ))
+                }
+            } else {
+                Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_bad_format_response))
+            }
+        } ?: Failure(contextProvider.getContext().getString(R.string.reader_follow_comments_null_response))
+    }
+
+    sealed class PostSubscribersCallResult {
+        data class Success(val isFollowing: Boolean) : PostSubscribersCallResult()
+        data class Failure(val error: String) : PostSubscribersCallResult()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderPostSeenStatusWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderPostSeenStatusWrapper.kt
new file mode 100644
index 000000000000..fce05d7f119c
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderPostSeenStatusWrapper.kt
@@ -0,0 +1,32 @@
+package org.wordpress.android.ui.reader.utils
+
+import dagger.Reusable
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase
+import javax.inject.Inject
+import javax.inject.Named
+import kotlinx.coroutines.launch
+
+/**
+ * Injectable wrapper around ReaderSeenStatusToggleUseCase.
+ *
+ * ReaderSeenStatusToggleUseCase uses suspended functions and flows, which makes calling if from Java clunky.
+ *
+ */
+@Reusable
+class ReaderPostSeenStatusWrapper @Inject constructor(
+    private val seenStatusToggleUseCase: ReaderSeenStatusToggleUseCase,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) : CoroutineScope {
+    override val coroutineContext = bgDispatcher + Job()
+
+    fun markPostAsSeenSilently(post: ReaderPost) {
+        launch(bgDispatcher) {
+            seenStatusToggleUseCase.markPostAsSeenIfNecessary(post)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java
index 980a830bd2d8..300c603a209b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java
@@ -124,7 +124,7 @@ private static String getImageForDisplayWithoutPhoton(
 
     /*
      * returns the passed string formatted for use with our API - see sanitize_title_with_dashes
-     * https://github.com/WordPress/WordPress/blob/master/wp-includes/formatting.php#L1258
+     * https://git.io/JqUEP
      * http://stackoverflow.com/a/1612015/1673548
      */
     public static String sanitizeWithDashes(final String title) {
@@ -497,7 +497,7 @@ public static ReaderTagList getTagsFromCommaSeparatedSlugs(@NotNull String comma
     /**
     * isExternalFeed identifies an external RSS feed
      * blogId will be empty for feeds and in some instances, it is explicitly
-     * setting blogId equal to the feedId  
+     * setting blogId equal to the feedId
      */
     public static boolean isExternalFeed(long blogId, long feedId) {
          return (blogId == 0 && feedId != 0) || blogId == feedId;
@@ -506,4 +506,12 @@ public static boolean isExternalFeed(long blogId, long feedId) {
     public static String getReportPostUrl(String blogUrl) {
         return "https://wordpress.com/abuse/?report_url=" + blogUrl;
     }
+
+    public static boolean postExists(long blogId, long postId) {
+        return ReaderPostTable.postExists(blogId, postId);
+    }
+
+    public static boolean commentExists(long blogId, long postId, long commentId) {
+        return ReaderCommentTable.commentExists(blogId, postId, commentId);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtilsWrapper.kt
index 371dac9a1d4c..40efd9f8a4e1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtilsWrapper.kt
@@ -41,4 +41,16 @@ class ReaderUtilsWrapper @Inject constructor(
     fun isExternalFeed(blogId: Long, feedId: Long): Boolean = ReaderUtils.isExternalFeed(blogId, feedId)
 
     fun getReportPostUrl(blogUrl: String): String = ReaderUtils.getReportPostUrl(blogUrl)
+
+    fun postAndCommentExists(blogId: Long, postId: Long, commentId: Long): Boolean {
+        return ReaderUtils.postAndCommentExists(blogId, postId, commentId)
+    }
+
+    fun postExists(blogId: Long, postId: Long) = ReaderUtils.postExists(blogId, postId)
+
+    fun commentExists(
+        blogId: Long,
+        postId: Long,
+        commentId: Long
+    ) = ReaderUtils.commentExists(blogId, postId, commentId)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewholders/PostLikerItemDecorator.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewholders/PostLikerItemDecorator.kt
new file mode 100644
index 000000000000..fc333ce3ed18
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewholders/PostLikerItemDecorator.kt
@@ -0,0 +1,27 @@
+package org.wordpress.android.ui.reader.viewholders
+
+import android.content.Context
+import android.graphics.Rect
+import android.view.View
+import androidx.annotation.DimenRes
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+import androidx.recyclerview.widget.RecyclerView.State
+
+class PostLikerItemDecorator(isRtl: Boolean, context: Context, @DimenRes leftOffsetResId: Int) : ItemDecoration() {
+    private val isRtl = isRtl
+    private val offset: Int = context.resources.getDimensionPixelSize(leftOffsetResId)
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: State) {
+        super.getItemOffsets(outRect, view, parent, state)
+        val position = parent.getChildAdapterPosition(view)
+
+        if (position > 0) {
+            if (isRtl) {
+                outRect.set(outRect.left, outRect.top, outRect.right - offset, outRect.bottom)
+            } else {
+                outRect.set(outRect.left - offset, outRect.top, outRect.right, outRect.bottom)
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewholders/PostLikerViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewholders/PostLikerViewHolder.kt
new file mode 100644
index 000000000000..7a77f209509a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewholders/PostLikerViewHolder.kt
@@ -0,0 +1,29 @@
+package org.wordpress.android.ui.reader.viewholders
+
+import android.content.Context
+import android.view.ViewGroup
+import android.widget.ImageView
+import org.wordpress.android.R
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagedPeopleViewHolder
+import org.wordpress.android.util.GravatarUtils
+import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.util.image.ImageType
+
+class PostLikerViewHolder(
+    parent: ViewGroup,
+    private val imageManager: ImageManager,
+    private val context: Context
+) : EngagedPeopleViewHolder(parent, R.layout.liker_face_item) {
+    private val likerAvatar = itemView.findViewById<ImageView>(R.id.liker_avatar)
+
+    fun bind(liker: Liker) {
+        val likerAvatarUrl = GravatarUtils.fixGravatarUrl(
+                liker.userAvatarUrl,
+                context.resources.getDimensionPixelSize(R.dimen.avatar_sz_small)
+        )
+
+        this.likerAvatar.setOnClickListener(null)
+        imageManager.loadIntoCircle(this.likerAvatar, ImageType.AVATAR_WITH_BACKGROUND, likerAvatarUrl)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailUiStateBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailUiStateBuilder.kt
deleted file mode 100644
index 1c1464c22997..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailUiStateBuilder.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.wordpress.android.ui.reader.viewmodels
-
-import dagger.Reusable
-import org.wordpress.android.models.ReaderPost
-import org.wordpress.android.ui.reader.discover.ReaderPostActions
-import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
-import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType
-import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder
-import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.ReaderPostDetailsUiState
-import org.wordpress.android.ui.reader.views.ReaderPostDetailsHeaderViewUiStateBuilder
-import org.wordpress.android.ui.reader.views.uistates.ReaderPostDetailsHeaderViewUiState.ReaderPostDetailsHeaderUiState
-import javax.inject.Inject
-
-@Reusable
-class ReaderPostDetailUiStateBuilder @Inject constructor(
-    private val postDetailsHeaderViewUiStateBuilder: ReaderPostDetailsHeaderViewUiStateBuilder,
-    private val postUiStateBuilder: ReaderPostUiStateBuilder
-) {
-    fun mapPostToUiState(
-        post: ReaderPost,
-        moreMenuItems: List<SecondaryAction>? = null,
-        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit,
-        onBlogSectionClicked: (Long, Long) -> Unit,
-        onFollowClicked: () -> Unit,
-        onTagItemClicked: (String) -> Unit
-    ): ReaderPostDetailsUiState {
-            return ReaderPostDetailsUiState(
-                postId = post.postId,
-                blogId = post.blogId,
-                headerUiState = buildPostDetailsHeaderUiState(
-                        post,
-                        onBlogSectionClicked,
-                        onFollowClicked,
-                        onTagItemClicked
-                ),
-                moreMenuItems = moreMenuItems,
-                actions = buildPostActions(post, onButtonClicked)
-        )
-    }
-
-    private fun buildPostDetailsHeaderUiState(
-        post: ReaderPost,
-        onBlogSectionClicked: (Long, Long) -> Unit,
-        onFollowClicked: () -> Unit,
-        onTagItemClicked: (String) -> Unit
-    ): ReaderPostDetailsHeaderUiState {
-        return postDetailsHeaderViewUiStateBuilder.mapPostToUiState(
-                post,
-                onBlogSectionClicked,
-                onFollowClicked,
-                onTagItemClicked
-        )
-    }
-
-    private fun buildPostActions(
-        post: ReaderPost,
-        onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit
-    ): ReaderPostActions {
-        return postUiStateBuilder.mapPostToActions(post, onButtonClicked)
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModel.kt
index f3117fe45b76..fcc5cb996b43 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModel.kt
@@ -2,29 +2,73 @@ package org.wordpress.android.ui.reader.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
-import org.wordpress.android.R.string
+import kotlinx.coroutines.Job
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.models.ReaderTagType.FOLLOWED
+import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.IO_THREAD
 import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.engagement.AuthorName.AuthorNameString
+import org.wordpress.android.ui.engagement.EngageItem
+import org.wordpress.android.ui.engagement.EngagedPeopleListViewModel.EngagedPeopleListUiState
+import org.wordpress.android.ui.engagement.EngagementUtils
+import org.wordpress.android.ui.engagement.GetLikesHandler
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.DONT_CARE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.REQUIRE_TO_BE_THERE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.REQUIRE_TO_NOT_BE_THERE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Loading
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeGroupFingerPrint
+import org.wordpress.android.ui.engagement.HeaderData
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
-import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType.TAG_FOLLOWED
+import org.wordpress.android.ui.reader.ReaderPostDetailUiStateBuilder
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ReplaceRelatedPostDetailsWithHistory
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowEngagedPeopleList
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostInWebView
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostsByTag
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowRelatedPostDetails
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.discover.ReaderPostActions
-import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.FOLLOW
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionsHandler
 import org.wordpress.android.ui.reader.discover.ReaderPostMoreButtonUiStateBuilder
+import org.wordpress.android.ui.reader.models.ReaderSimplePostList
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState
+import org.wordpress.android.ui.reader.usecases.ReaderGetPostUseCase
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.LoadingUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState
 import org.wordpress.android.ui.reader.views.uistates.ReaderPostDetailsHeaderViewUiState.ReaderPostDetailsHeaderUiState
+import org.wordpress.android.ui.utils.UiDimen
+import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.WpUrlUtilsWrapper
+import org.wordpress.android.util.config.LikesEnhancementsFeatureConfig
+import org.wordpress.android.util.map
+import org.wordpress.android.viewmodel.ContextProvider
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
@@ -37,11 +81,26 @@ class ReaderPostDetailViewModel @Inject constructor(
     private val readerPostMoreButtonUiStateBuilder: ReaderPostMoreButtonUiStateBuilder,
     private val postDetailUiStateBuilder: ReaderPostDetailUiStateBuilder,
     private val reblogUseCase: ReblogUseCase,
+    private val readerFetchRelatedPostsUseCase: ReaderFetchRelatedPostsUseCase,
+    private val readerGetPostUseCase: ReaderGetPostUseCase,
+    private val readerFetchPostUseCase: ReaderFetchPostUseCase,
+    private val siteStore: SiteStore,
+    private val accountStore: AccountStore,
+    private val readerTracker: ReaderTracker,
+    private val eventBusWrapper: EventBusWrapper,
+    private val wpUrlUtilsWrapper: WpUrlUtilsWrapper,
+    private val contextProvider: ContextProvider,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
-    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher
+    @Named(IO_THREAD) private val ioDispatcher: CoroutineDispatcher,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val getLikesHandler: GetLikesHandler,
+    private val likesEnhancementsFeatureConfig: LikesEnhancementsFeatureConfig,
+    private val engagementUtils: EngagementUtils
 ) : ScopedViewModel(mainDispatcher) {
-    private val _uiState = MediatorLiveData<ReaderPostDetailsUiState>()
-    val uiState: LiveData<ReaderPostDetailsUiState> = _uiState
+    private var getLikesJob: Job? = null
+
+    private val _uiState = MediatorLiveData<UiState>()
+    val uiState: LiveData<UiState> = _uiState
 
     private val _refreshPost = MediatorLiveData<Event<Unit>>()
     val refreshPost: LiveData<Event<Unit>> = _refreshPost
@@ -52,39 +111,83 @@ class ReaderPostDetailViewModel @Inject constructor(
     private val _snackbarEvents = MediatorLiveData<Event<SnackbarMessageHolder>>()
     val snackbarEvents: LiveData<Event<SnackbarMessageHolder>> = _snackbarEvents
 
+    private val _updateLikesState = MediatorLiveData<GetLikesState>()
+    val likesUiState: LiveData<EngagedPeopleListUiState> = _updateLikesState.map {
+        state -> buildLikersUiState(state)
+    }
+
     /**
      * Post which is about to be reblogged after the user selects a target site.
      */
     private var pendingReblogPost: ReaderPost? = null
 
     private var isStarted = false
+    private var isRelatedPost: Boolean = false
+
+    var isFeed: Boolean = false
+    var interceptedUri: String? = null
+
+    var post: ReaderPost? = null
+    val hasPost: Boolean
+        get() = post != null
+
+    private data class RenderedLikesData(val blogId: Long, val postId: Long, val numLikes: Int) {
+        fun isMatchingPost(post: ReaderPost): Boolean {
+            return blogId != post.blogId || postId != post.postId || numLikes != post.numLikes
+        }
+    }
+    private var lastRenderedLikesData: RenderedLikesData? = null
 
-    fun start() {
+    private val shouldOfferSignIn: Boolean
+        get() = wpUrlUtilsWrapper.isWordPressCom(interceptedUri) && !accountStore.hasAccessToken()
+
+    init {
+        eventBusWrapper.register(readerFetchRelatedPostsUseCase)
+    }
+
+    fun start(isRelatedPost: Boolean, isFeed: Boolean, interceptedUri: String?) {
         if (isStarted) {
             return
         }
         isStarted = true
+        this.isRelatedPost = isRelatedPost
+        this.isFeed = isFeed
+        this.interceptedUri = interceptedUri
 
         init()
     }
 
     private fun init() {
+        readerPostCardActionsHandler.initScope(viewModelScope)
         _uiState.addSource(readerPostCardActionsHandler.followStatusUpdated) { data ->
-            val currentUiState: ReaderPostDetailsUiState? = _uiState.value
+            val currentUiState: ReaderPostDetailsUiState? = (_uiState.value as? ReaderPostDetailsUiState)
 
             currentUiState?.let {
                 findPost(currentUiState.postId, currentUiState.blogId)?.let { post ->
                     post.isFollowedByCurrentUser = data.following
-                    _uiState.value = convertPostToUiState(post)
+                    updateFollowButtonUiState(
+                            currentUiState = currentUiState,
+                            isFollowed = post.isFollowedByCurrentUser
+                    )
                 }
             }
         }
 
         _refreshPost.addSource(readerPostCardActionsHandler.refreshPosts) {
-            val currentUiState: ReaderPostDetailsUiState? = _uiState.value
+            val currentUiState: ReaderPostDetailsUiState? = (_uiState.value as? ReaderPostDetailsUiState)
             currentUiState?.let {
                 findPost(currentUiState.postId, currentUiState.blogId)?.let { post ->
-                    _uiState.value = convertPostToUiState(post)
+                    if (likesEnhancementsFeatureConfig.isEnabled()) {
+                        onRefreshLikersData(
+                                post,
+                                if (post.isLikedByCurrentUser) {
+                                    REQUIRE_TO_BE_THERE
+                                } else {
+                                    REQUIRE_TO_NOT_BE_THERE
+                                }
+                        )
+                    }
+                    updatePostActions(post)
                 }
             }
         }
@@ -93,6 +196,12 @@ class ReaderPostDetailViewModel @Inject constructor(
             _snackbarEvents.value = event
         }
 
+        if (likesEnhancementsFeatureConfig.isEnabled()) {
+            _snackbarEvents.addSource(getLikesHandler.snackbarEvents) { event ->
+                _snackbarEvents.value = event
+            }
+        }
+
         _navigationEvents.addSource(readerPostCardActionsHandler.navigationEvents) { event ->
             val target = event.peekContent()
             if (target is ShowSitePickerForResult) {
@@ -100,6 +209,82 @@ class ReaderPostDetailViewModel @Inject constructor(
             }
             _navigationEvents.value = event
         }
+
+        if (likesEnhancementsFeatureConfig.isEnabled()) {
+            _updateLikesState.addSource(getLikesHandler.likesStatusUpdate) { state ->
+                _updateLikesState.value = state
+            }
+        }
+    }
+
+    fun onRefreshLikersData(post: ReaderPost, expectingToBeThere: CurrentUserInListRequirement = DONT_CARE) {
+        if (!likesEnhancementsFeatureConfig.isEnabled()) return
+        if (readerUtilsWrapper.isExternalFeed(post.blogId, post.feedId)) return
+        val isLikeDataChanged = lastRenderedLikesData?.isMatchingPost(post) ?: true
+
+        if (isLikeDataChanged) {
+            lastRenderedLikesData = RenderedLikesData(post.blogId, post.postId, post.numLikes)
+            getLikesJob?.cancel()
+            getLikesJob = launch(bgDispatcher) {
+                getLikesHandler.handleGetLikesForPost(
+                        LikeGroupFingerPrint(
+                                post.blogId,
+                                post.postId,
+                                post.numLikes
+                        ),
+                        requestNextPage = false,
+                        pageLength = MAX_NUM_LIKES_FACES,
+                        limit = MAX_NUM_LIKES_FACES,
+                        expectingToBeThere = expectingToBeThere
+                )
+            }
+        }
+    }
+
+    fun onShowPost(blogId: Long, postId: Long) {
+        launch { getOrFetchReaderPost(blogId = blogId, postId = postId) }
+    }
+
+    private suspend fun getOrFetchReaderPost(blogId: Long, postId: Long) {
+        _uiState.value = LoadingUiState
+
+        getReaderPostFromDb(blogId = blogId, postId = postId)
+        if (post == null) {
+            when (readerFetchPostUseCase.fetchPost(blogId = blogId, postId = postId, isFeed = isFeed)) {
+                FetchReaderPostState.Success -> {
+                    getReaderPostFromDb(blogId, postId)
+                    updatePostDetailsUi()
+                }
+
+                FetchReaderPostState.AlreadyRunning -> {
+                    AppLog.i(T.READER, "reader post detail > fetch post already running")
+                    _uiState.value = ErrorUiState(null)
+                }
+
+                FetchReaderPostState.Failed.NoNetwork ->
+                    _uiState.value = ErrorUiState(UiStringRes(R.string.no_network_message))
+
+                FetchReaderPostState.Failed.RequestFailed ->
+                    _uiState.value = ErrorUiState(UiStringRes(R.string.reader_err_get_post_generic))
+
+                FetchReaderPostState.Failed.NotAuthorised -> trackAndUpdateNotAuthorisedErrorState()
+
+                FetchReaderPostState.Failed.PostNotFound ->
+                    _uiState.value = ErrorUiState(UiStringRes(R.string.reader_err_get_post_not_found))
+            }
+        } else {
+            updatePostDetailsUi()
+        }
+    }
+
+    private suspend fun getReaderPostFromDb(blogId: Long, postId: Long) {
+        val (readerPost, isFeedPost) = readerGetPostUseCase.get(blogId = blogId, postId = postId, isFeed = this.isFeed)
+        this.post = readerPost
+        this.isFeed = isFeedPost
+    }
+
+    fun onNotAuthorisedRequestFailure() {
+        trackAndUpdateNotAuthorisedErrorState()
     }
 
     fun onMoreButtonClicked() {
@@ -111,7 +296,7 @@ class ReaderPostDetailViewModel @Inject constructor(
     }
 
     fun onMoreMenuItemClicked(type: ReaderPostCardActionType) {
-        val currentUiState = uiState.value
+        val currentUiState = (_uiState.value as? ReaderPostDetailsUiState)
         currentUiState?.let {
             onButtonClicked(currentUiState.postId, currentUiState.blogId, type)
         }
@@ -119,12 +304,12 @@ class ReaderPostDetailViewModel @Inject constructor(
     }
 
     private fun changeMoreMenuVisibility(show: Boolean) {
-        val currentUiState = uiState.value
+        val currentUiState = (_uiState.value as? ReaderPostDetailsUiState)
         currentUiState?.let {
             findPost(it.postId, it.blogId)?.let { post ->
                 val moreMenuItems = if (show) {
                     readerPostMoreButtonUiStateBuilder.buildMoreMenuItemsBlocking(
-                            post, TAG_FOLLOWED, this@ReaderPostDetailViewModel::onButtonClicked
+                            post, this@ReaderPostDetailViewModel::onButtonClicked
                     )
                 } else {
                     null
@@ -135,10 +320,22 @@ class ReaderPostDetailViewModel @Inject constructor(
         }
     }
 
+    fun onFeaturedImageClicked(blogId: Long, featuredImageUrl: String) {
+        val site = siteStore.getSiteBySiteId(blogId)
+        _navigationEvents.value = Event(
+                ReaderNavigationEvents.ShowMediaPreview(site = site, featuredImage = featuredImageUrl)
+        )
+    }
+
     fun onButtonClicked(postId: Long, blogId: Long, type: ReaderPostCardActionType) {
         launch {
             findPost(postId, blogId)?.let {
-                readerPostCardActionsHandler.onAction(it, type, isBookmarkList = false, fromPostDetails = true)
+                readerPostCardActionsHandler.onAction(
+                        it,
+                        type,
+                        isBookmarkList = false,
+                        source = ReaderTracker.SOURCE_POST_DETAIL
+                )
             }
         }
     }
@@ -150,16 +347,12 @@ class ReaderPostDetailViewModel @Inject constructor(
             if (navigationTarget != null) {
                 _navigationEvents.value = Event(navigationTarget)
             } else {
-                _snackbarEvents.value = Event(SnackbarMessageHolder(UiStringRes(string.reader_reblog_error)))
+                _snackbarEvents.value = Event(SnackbarMessageHolder(UiStringRes(R.string.reader_reblog_error)))
             }
             pendingReblogPost = null
         }
     }
 
-    fun onShowPost(post: ReaderPost) {
-        _uiState.value = convertPostToUiState(post)
-    }
-
     fun onUpdatePost(post: ReaderPost) {
         _uiState.value = convertPostToUiState(post)
     }
@@ -174,11 +367,51 @@ class ReaderPostDetailViewModel @Inject constructor(
     private fun onBlogSectionClicked(postId: Long, blogId: Long) {
         launch {
             findPost(postId, blogId)?.let {
-                readerPostCardActionsHandler.handleHeaderClicked(blogId, it.feedId)
+                readerPostCardActionsHandler.handleHeaderClicked(
+                        blogId,
+                        it.feedId,
+                        it.isFollowedByCurrentUser
+                )
             }
         }
     }
 
+    fun onVisitPostExcerptFooterClicked(postLink: String) {
+        _navigationEvents.value = Event(ReaderNavigationEvents.OpenUrl(url = postLink))
+    }
+
+    private fun onRelatedPostItemClicked(postId: Long, blogId: Long, isGlobal: Boolean) {
+        trackRelatedPostClickAction(postId, blogId, isGlobal)
+        _navigationEvents.value = if (isRelatedPost) {
+            Event(ReplaceRelatedPostDetailsWithHistory(postId = postId, blogId = blogId, isGlobal = isGlobal))
+        } else {
+            Event(ShowRelatedPostDetails(postId = postId, blogId = blogId))
+        }
+    }
+
+    fun onRelatedPostsRequested(sourcePost: ReaderPost) {
+        /* Related posts only available for wp.com */
+        if (!sourcePost.isWP) return
+
+        launch {
+            when (val fetchRelatedPostsState = readerFetchRelatedPostsUseCase.fetchRelatedPosts(sourcePost)) {
+                is FetchRelatedPostsState.AlreadyRunning,
+                is FetchRelatedPostsState.Failed.NoNetwork,
+                is FetchRelatedPostsState.Failed.RequestFailed -> Unit // Do Nothing
+                is FetchRelatedPostsState.Success -> updateRelatedPostsUiState(sourcePost, fetchRelatedPostsState)
+            }
+        }
+    }
+
+    private fun trackRelatedPostClickAction(postId: Long, blogId: Long, isGlobal: Boolean) {
+        val stat = if (isGlobal) {
+            AnalyticsTracker.Stat.READER_GLOBAL_RELATED_POST_CLICKED
+        } else {
+            AnalyticsTracker.Stat.READER_LOCAL_RELATED_POST_CLICKED
+        }
+        readerTracker.trackPost(stat, findPost(blogId, postId))
+    }
+
     private fun findPost(postId: Long, blogId: Long): ReaderPost? {
         return readerPostTableWrapper.getBlogPost(
                 blogId,
@@ -199,16 +432,233 @@ class ReaderPostDetailViewModel @Inject constructor(
         )
     }
 
-    data class ReaderPostDetailsUiState(
-        val postId: Long,
-        val blogId: Long,
-        val headerUiState: ReaderPostDetailsHeaderUiState,
-        val moreMenuItems: List<SecondaryAction>? = null,
-        val actions: ReaderPostActions
+    private fun convertRelatedPostsToUiState(
+        sourcePost: ReaderPost,
+        relatedPosts: ReaderSimplePostList,
+        isGlobal: Boolean
+    ) = postDetailUiStateBuilder.mapRelatedPostsToUiState(
+            sourcePost = sourcePost,
+            relatedPosts = relatedPosts,
+            isGlobal = isGlobal,
+            onItemClicked = this@ReaderPostDetailViewModel::onRelatedPostItemClicked
     )
 
+    private fun updatePostDetailsUi() {
+        post?.let {
+            readerTracker.trackPost(AnalyticsTracker.Stat.READER_ARTICLE_RENDERED, it)
+            _navigationEvents.postValue(Event(ShowPostInWebView(it)))
+            _uiState.value = convertPostToUiState(it)
+        }
+    }
+
+    private fun updateFollowButtonUiState(
+        currentUiState: ReaderPostDetailsUiState,
+        isFollowed: Boolean
+    ) {
+        val updatedFollowButtonUiState = currentUiState
+                .headerUiState
+                .followButtonUiState
+                .copy(isFollowed = isFollowed)
+
+        val updatedHeaderUiState = currentUiState
+                .headerUiState
+                .copy(followButtonUiState = updatedFollowButtonUiState)
+
+        _uiState.value = currentUiState.copy(headerUiState = updatedHeaderUiState)
+    }
+
+    private fun updatePostActions(post: ReaderPost) {
+        _uiState.value = (_uiState.value as? ReaderPostDetailsUiState)?.copy(
+                actions = postDetailUiStateBuilder.buildPostActions(
+                        post,
+                        this@ReaderPostDetailViewModel::onButtonClicked
+                )
+        )
+    }
+
+    private fun updateRelatedPostsUiState(sourcePost: ReaderPost, state: FetchRelatedPostsState.Success) {
+        _uiState.value = (_uiState.value as? ReaderPostDetailsUiState)?.copy(
+                localRelatedPosts = convertRelatedPostsToUiState(
+                        sourcePost = sourcePost,
+                        relatedPosts = state.localRelatedPosts,
+                        isGlobal = false
+                ),
+                globalRelatedPosts = convertRelatedPostsToUiState(
+                        sourcePost = sourcePost,
+                        relatedPosts = state.globalRelatedPosts,
+                        isGlobal = true
+                )
+        )
+    }
+
+    private fun trackAndUpdateNotAuthorisedErrorState() {
+        trackNotAuthorisedState()
+
+        _uiState.value = ErrorUiState(
+                message = UiStringRes(getNotAuthorisedErrorMessageRes()),
+                signInButtonVisibility = shouldOfferSignIn
+        )
+    }
+
+    private fun trackNotAuthorisedState() {
+        if (shouldOfferSignIn) {
+            post?.let { readerTracker.trackPost(AnalyticsTracker.Stat.READER_WPCOM_SIGN_IN_NEEDED, it) }
+        }
+        post?.let { readerTracker.trackPost(AnalyticsTracker.Stat.READER_USER_UNAUTHORIZED, it) }
+    }
+
+    private fun getNotAuthorisedErrorMessageRes() = if (!shouldOfferSignIn) {
+        if (interceptedUri == null) {
+            R.string.reader_err_get_post_not_authorized
+        } else {
+            R.string.reader_err_get_post_not_authorized_fallback
+        }
+    } else {
+        if (interceptedUri == null) {
+            R.string.reader_err_get_post_not_authorized_signin
+        } else {
+            R.string.reader_err_get_post_not_authorized_signin_fallback
+        }
+    }
+
+    private fun buildLikersUiState(updateLikesState: GetLikesState?): EngagedPeopleListUiState {
+        val (likers, numLikes) = getLikersEssentials(updateLikesState)
+
+        val showLoading = updateLikesState is Loading
+        var showEmptyState = false
+        var emptyStateTitle: UiString? = null
+
+        if (updateLikesState is Failure && !showLoading) {
+            updateLikesState.emptyStateData?.let {
+                showEmptyState = it.showEmptyState
+                emptyStateTitle = it.title
+            }
+        }
+
+        val showLikeFacesTrainContainer = post?.let {
+            it.isWP && ((numLikes > 0 && (likers.isNotEmpty() || showEmptyState)) || showLoading)
+        } ?: false
+
+        return EngagedPeopleListUiState(
+                showLikeFacesTrainContainer = showLikeFacesTrainContainer,
+                showLoading = showLoading,
+                engageItemsList = if (showLikeFacesTrainContainer) likers else listOf(),
+                numLikes = post?.let { numLikes } ?: 0,
+                showEmptyState = showEmptyState,
+                emptyStateTitle = emptyStateTitle,
+                likersFacesText = getLikersFacesText(showEmptyState, numLikes)
+        )
+    }
+
+    private fun getLikersFacesText(showEmptyState: Boolean, numLikes: Int): UiString? {
+        return when {
+            showEmptyState -> {
+                null
+            }
+            numLikes == 1 -> {
+                UiStringRes(R.string.like_faces_singular_text)
+            }
+            numLikes > 1 -> {
+                UiStringText(contextProvider.getContext().getString(R.string.like_faces_plural_text, numLikes))
+            }
+            else -> {
+                null
+            }
+        }
+    }
+
+    private fun getLikersEssentials(updateLikesState: GetLikesState?): Pair<List<EngageItem>, Int> {
+        return when (updateLikesState) {
+            is LikesData -> {
+                Pair(
+                        engagementUtils.likesToEngagedPeople(updateLikesState.likes),
+                        updateLikesState.expectedNumLikes
+                )
+            }
+            is Failure -> {
+                Pair(
+                        engagementUtils.likesToEngagedPeople(updateLikesState.cachedLikes),
+                        updateLikesState.expectedNumLikes
+                )
+            }
+            Loading, null -> Pair(listOf(), 0)
+        }
+    }
+
+    fun onLikeFacesClicked() {
+        post?.let { readerPost ->
+            _navigationEvents.value = Event(ShowEngagedPeopleList(
+                    readerPost.blogId,
+                    readerPost.postId,
+                    HeaderData(
+                            AuthorNameString(readerPost.authorName),
+                            readerPost.title,
+                            readerPost.postAvatar,
+                            readerPost.authorId,
+                            readerPost.authorBlogId,
+                            readerPost.authorBlogUrl,
+                            lastRenderedLikesData?.numLikes ?: readerPost.numLikes
+                    )
+            ))
+        }
+    }
+
+    sealed class UiState(
+        val loadingVisible: Boolean = false,
+        val errorVisible: Boolean = false
+    ) {
+        object LoadingUiState : UiState(loadingVisible = true)
+
+        data class ErrorUiState(
+            val message: UiString?,
+            val signInButtonVisibility: Boolean = false
+        ) : UiState(errorVisible = true)
+
+        data class ReaderPostDetailsUiState(
+            val postId: Long,
+            val blogId: Long,
+            val featuredImageUiState: ReaderPostFeaturedImageUiState? = null,
+            val headerUiState: ReaderPostDetailsHeaderUiState,
+            val excerptFooterUiState: ExcerptFooterUiState?,
+            val moreMenuItems: List<ReaderPostCardAction>? = null,
+            val actions: ReaderPostActions,
+            val localRelatedPosts: RelatedPostsUiState? = null,
+            val globalRelatedPosts: RelatedPostsUiState? = null
+        ) : UiState() {
+            data class ReaderPostFeaturedImageUiState(val blogId: Long, val url: String? = null, val height: Int)
+
+            data class ExcerptFooterUiState(val visitPostExcerptFooterLinkText: UiString? = null, val postLink: String?)
+
+            data class RelatedPostsUiState(
+                val cards: List<ReaderRelatedPostUiState>?,
+                val isGlobal: Boolean,
+                val headerLabel: UiString?,
+                val railcarJsonStrings: List<String?>
+            ) {
+                data class ReaderRelatedPostUiState(
+                    val postId: Long,
+                    val blogId: Long,
+                    val isGlobal: Boolean,
+                    val title: UiString?,
+                    val excerpt: UiString?,
+                    val featuredImageUrl: String?,
+                    val featuredImageVisibility: Boolean,
+                    val featuredImageCornerRadius: UiDimen,
+                    val onItemClicked: (Long, Long, Boolean) -> Unit
+                )
+            }
+        }
+    }
+
     override fun onCleared() {
         super.onCleared()
+        getLikesJob?.cancel()
+        getLikesHandler.clear()
         readerPostCardActionsHandler.onCleared()
+        eventBusWrapper.unregister(readerFetchRelatedPostsUseCase)
+    }
+
+    companion object {
+        private const val MAX_NUM_LIKES_FACES = 5
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostListViewModel.kt
index 92af04cbc707..476bfcc66794 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostListViewModel.kt
@@ -2,8 +2,8 @@ package org.wordpress.android.ui.reader.viewmodels
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.datasets.ReaderPostTable
 import org.wordpress.android.models.ReaderPost
@@ -20,12 +20,14 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.LIKE
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REBLOG
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REPORT_POST
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.SITE_NOTIFICATIONS
+import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.TOGGLE_SEEN_STATUS
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionsHandler
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.tracker.ReaderTrackerType
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.AppLog
@@ -39,6 +41,7 @@ class ReaderPostListViewModel @Inject constructor(
     private val readerPostCardActionsHandler: ReaderPostCardActionsHandler,
     private val reblogUseCase: ReblogUseCase,
     private val readerTracker: ReaderTracker,
+    private val seenStatusToggleUseCase: ReaderSeenStatusToggleUseCase,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(mainDispatcher) {
@@ -78,6 +81,7 @@ class ReaderPostListViewModel @Inject constructor(
     }
 
     private fun init() {
+        readerPostCardActionsHandler.initScope(viewModelScope)
         _navigationEvents.addSource(readerPostCardActionsHandler.navigationEvents) { event ->
             val target = event.peekContent()
             if (target is ShowSitePickerForResult) {
@@ -108,47 +112,135 @@ class ReaderPostListViewModel @Inject constructor(
      *
      * @param post post to reblog
      */
-    fun onReblogButtonClicked(post: ReaderPost, bookmarksList: Boolean) {
+    fun onReblogButtonClicked(
+        post: ReaderPost,
+        bookmarksList: Boolean,
+        source: String
+    ) {
         launch {
-            readerPostCardActionsHandler.onAction(post, REBLOG, bookmarksList)
+            readerPostCardActionsHandler.onAction(
+                    post,
+                    REBLOG,
+                    bookmarksList,
+                    source = source
+            )
         }
     }
 
-    fun onBlockSiteButtonClicked(post: ReaderPost, bookmarksList: Boolean) {
+    fun onBlockSiteButtonClicked(
+        post: ReaderPost,
+        bookmarksList: Boolean,
+        source: String
+    ) {
         launch {
-            readerPostCardActionsHandler.onAction(post, BLOCK_SITE, bookmarksList)
+            readerPostCardActionsHandler.onAction(
+                    post,
+                    BLOCK_SITE,
+                    bookmarksList,
+                    source = source
+            )
+        }
+    }
+
+    fun onBookmarkButtonClicked(
+        blogId: Long,
+        postId: Long,
+        isBookmarkList: Boolean,
+        source: String
+    ) {
+        launch(bgDispatcher) {
+            ReaderPostTable.getBlogPost(blogId, postId, true)?.let {
+                readerPostCardActionsHandler.onAction(
+                        it,
+                        BOOKMARK,
+                        isBookmarkList,
+                        source = source
+                )
+            }
+        }
+    }
+
+    fun onFollowSiteClicked(
+        post: ReaderPost,
+        bookmarksList: Boolean,
+        source: String
+    ) {
+        launch(bgDispatcher) {
+            readerPostCardActionsHandler.onAction(
+                    post,
+                    FOLLOW,
+                    bookmarksList,
+                    source = source
+            )
         }
     }
 
-    fun onBookmarkButtonClicked(blogId: Long, postId: Long, isBookmarkList: Boolean) {
+    fun onSiteNotificationMenuClicked(
+        blogId: Long,
+        postId: Long,
+        isBookmarkList: Boolean,
+        source: String
+    ) {
         launch(bgDispatcher) {
-            val post = ReaderPostTable.getBlogPost(blogId, postId, true)
-            readerPostCardActionsHandler.onAction(post, BOOKMARK, isBookmarkList)
+            ReaderPostTable.getBlogPost(blogId, postId, true)?.let {
+                readerPostCardActionsHandler.onAction(
+                        it,
+                        SITE_NOTIFICATIONS,
+                        isBookmarkList,
+                        source = source
+                )
+            }
         }
     }
 
-    fun onFollowSiteClicked(post: ReaderPost, bookmarksList: Boolean) {
+    fun onLikeButtonClicked(
+        post: ReaderPost,
+        bookmarksList: Boolean,
+        source: String
+    ) {
         launch(bgDispatcher) {
-            readerPostCardActionsHandler.onAction(post, FOLLOW, bookmarksList)
+            readerPostCardActionsHandler.onAction(
+                    post,
+                    LIKE,
+                    bookmarksList,
+                    source = source
+            )
         }
     }
 
-    fun onSiteNotificationMenuClicked(blogId: Long, postId: Long, isBookmarkList: Boolean) {
+    fun onReportPostButtonClicked(
+        post: ReaderPost,
+        bookmarksList: Boolean,
+        source: String
+    ) {
         launch(bgDispatcher) {
-            val post = ReaderPostTable.getBlogPost(blogId, postId, true)
-            readerPostCardActionsHandler.onAction(post, SITE_NOTIFICATIONS, isBookmarkList)
+            readerPostCardActionsHandler.onAction(
+                    post,
+                    REPORT_POST,
+                    bookmarksList,
+                    source = source
+            )
         }
     }
 
-    fun onLikeButtonClicked(post: ReaderPost, bookmarksList: Boolean) {
+    fun onToggleSeenStatusClicked(
+        post: ReaderPost,
+        bookmarksList: Boolean,
+        source: String
+    ) {
         launch(bgDispatcher) {
-            readerPostCardActionsHandler.onAction(post, LIKE, bookmarksList)
+            readerPostCardActionsHandler.onAction(
+                    post,
+                    TOGGLE_SEEN_STATUS,
+                    bookmarksList,
+                    source = source
+            )
         }
     }
 
-    fun onReportPostButtonClicked(post: ReaderPost, bookmarksList: Boolean) {
+    fun onExternalPostOpened(post: ReaderPost) {
         launch(bgDispatcher) {
-            readerPostCardActionsHandler.onAction(post, REPORT_POST, bookmarksList)
+            seenStatusToggleUseCase.markPostAsSeenIfNecessary(post)
         }
     }
 
@@ -178,7 +270,7 @@ class ReaderPostListViewModel @Inject constructor(
     fun onFragmentResume(
         isTopLevelFragment: Boolean,
         isSearch: Boolean,
-        isFollowing: Boolean,
+        isFilterable: Boolean,
         subfilterListItem: SubfilterListItem?
     ) {
         AppLog.d(
@@ -191,13 +283,13 @@ class ReaderPostListViewModel @Inject constructor(
         }
         // TODO check if the subfilter is set to a value and uncomment this code
 
-        if (isFollowing && subfilterListItem?.isTrackedItem == true) {
+        if (isFilterable && subfilterListItem?.isTrackedItem == true) {
             AppLog.d(T.READER, "TRACK READER ReaderPostListFragment > START Count SUBFILTERED_LIST")
             readerTracker.start(ReaderTrackerType.SUBFILTERED_LIST)
         }
     }
 
-    fun onFragmentPause(isTopLevelFragment: Boolean, isSearch: Boolean, isFollowing: Boolean) {
+    fun onFragmentPause(isTopLevelFragment: Boolean, isSearch: Boolean, isFilterable: Boolean) {
         AppLog.d(
                 T.READER,
                 "TRACK READER ReaderPostListFragment > STOP Count [mIsTopLevel = $isTopLevelFragment]"
@@ -207,7 +299,7 @@ class ReaderPostListViewModel @Inject constructor(
             readerTracker.stop(ReaderTrackerType.FILTERED_LIST)
         }
 
-        if (isFollowing) {
+        if (isFilterable) {
             readerTracker.stop(ReaderTrackerType.SUBFILTERED_LIST)
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderViewModel.kt
index b383a92ff74c..0ecc8f4cbce1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/viewmodels/ReaderViewModel.kt
@@ -30,7 +30,7 @@ import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
 
-const val UPDATE_TAGS_THRESHOLD = 1000 * 60 * 60
+const val UPDATE_TAGS_THRESHOLD = 1000 * 60 * 60 // 1 hr
 const val TRACK_TAB_CHANGED_THROTTLE = 100L
 
 class ReaderViewModel @Inject constructor(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/InterceptingFrameLayout.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/InterceptingFrameLayout.kt
new file mode 100644
index 000000000000..0d81a9bcf37d
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/InterceptingFrameLayout.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.ui.reader.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.widget.FrameLayout
+
+class InterceptingFrameLayout @JvmOverloads constructor (
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+    // NOTE: Intercepting touch event to avoid inner views (first use case was with an inner RecyclerView in
+    // reader_post_likers_faces_list.xml)
+    override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
+        return true
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderBookmarkButton.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderBookmarkButton.kt
deleted file mode 100644
index 884be2e8aa6c..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderBookmarkButton.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.wordpress.android.ui.reader.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.widget.LinearLayout
-import kotlinx.android.synthetic.main.reader_bookmark_button.view.*
-import org.wordpress.android.R
-import java.util.Locale
-
-/**
- * Bookmark button used in reader post detail
- */
-class ReaderBookmarkButton : LinearLayout {
-    constructor(context: Context) : super(context) {
-        initView(context)
-    }
-
-    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        initView(context)
-    }
-
-    constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
-        initView(context)
-    }
-
-    private fun initView(context: Context) {
-        View.inflate(context, R.layout.reader_bookmark_button, this)
-    }
-
-    override fun setEnabled(enabled: Boolean) {
-        super.setEnabled(enabled)
-
-        label_bookmark_button.isEnabled = enabled
-        icon_bookmark_button.isEnabled = enabled
-    }
-
-    fun updateIsBookmarkedState(isBookmarked: Boolean) {
-        val bookmarkButtonLabel = if (isBookmarked) R.string.reader_btn_bookmarked else R.string.reader_btn_bookmark
-
-        label_bookmark_button.text = context.getString(bookmarkButtonLabel).toUpperCase(Locale.getDefault())
-
-        label_bookmark_button.isSelected = isBookmarked
-        icon_bookmark_button.isSelected = isBookmarked
-
-        contentDescription = if (isBookmarked) {
-            context.getString(R.string.reader_remove_bookmark)
-        } else {
-            context.getString(R.string.reader_add_bookmark)
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderCommentsPostHeaderView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderCommentsPostHeaderView.java
index 0050cefd6d3c..899a42734b29 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderCommentsPostHeaderView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderCommentsPostHeaderView.java
@@ -2,15 +2,21 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.Nullable;
 import androidx.core.graphics.ColorUtils;
 
+import com.facebook.shimmer.ShimmerFrameLayout;
+
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.models.ReaderPost;
+import org.wordpress.android.ui.reader.FollowCommentsUiState;
+import org.wordpress.android.ui.reader.FollowCommentsUiStateType;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.util.ContextExtensionsKt;
 import org.wordpress.android.util.DateTimeUtils;
@@ -38,6 +44,7 @@ public ReaderCommentsPostHeaderView(Context context, AttributeSet attrs, int def
     }
 
     private void initView(Context context) {
+        ((WordPress) context.getApplicationContext()).component().inject(this);
         inflate(context, R.layout.reader_comments_post_header_view, this);
 
         setBackgroundColor(ColorUtils
@@ -45,7 +52,10 @@ private void initView(Context context) {
                         getResources().getInteger(R.integer.selected_list_item_opacity)));
     }
 
-    public void setPost(final ReaderPost post) {
+    public void setPost(
+            final ReaderPost post,
+            final FollowCommentsUiState followButtonState
+    ) {
         if (post == null) {
             return;
         }
@@ -81,5 +91,52 @@ public void setPost(final ReaderPost post) {
             avatarUrl = post.getPostAvatarForDisplay(avatarSz);
             ImageManager.getInstance().loadIntoCircle(imgAvatar, ImageType.AVATAR, avatarUrl);
         }
+
+        setFollowButtonState(followButtonState);
+    }
+
+    public void setFollowButtonState(@Nullable final FollowCommentsUiState followButtonState) {
+        if (null == followButtonState) return;
+
+        ReaderFollowButton followCommentsButton = findViewById(R.id.button_follow_comments);
+        ShimmerFrameLayout container = findViewById(R.id.shimmer_view_container);
+        View skeleton = findViewById(R.id.button_skeleton);
+
+        boolean isButtonEnabled = followButtonState.getType() != FollowCommentsUiStateType.DISABLED
+                                  && followButtonState.getType() != FollowCommentsUiStateType.LOADING;
+
+        followCommentsButton.setEnabled(isButtonEnabled);
+
+        boolean isContainerVisible = container.getVisibility() == View.VISIBLE;
+        if (isContainerVisible != followButtonState.getShowFollowButton()) {
+            container.setVisibility(followButtonState.getShowFollowButton() ? View.VISIBLE : View.GONE);
+        }
+
+        if (followButtonState.getType() == FollowCommentsUiStateType.LOADING) {
+            if (skeleton.getVisibility() != View.VISIBLE) {
+                skeleton.setVisibility(View.VISIBLE);
+                followCommentsButton.setVisibility(View.GONE);
+                container.showShimmer(true);
+            }
+        } else {
+            skeleton.setVisibility(View.GONE);
+            followCommentsButton.setVisibility(View.VISIBLE);
+            container.hideShimmer();
+        }
+
+        if (followButtonState.getType() == FollowCommentsUiStateType.VISIBLE_WITH_STATE) {
+            if (followButtonState.getAnimate()) {
+                followCommentsButton.setIsFollowedAnimated(followButtonState.isFollowing());
+            } else {
+                followCommentsButton.setIsFollowed(followButtonState.isFollowing());
+            }
+        }
+
+        if (followButtonState.getOnFollowButtonClick() != null) {
+            followCommentsButton.setOnClickListener(
+                    v -> followButtonState.getOnFollowButtonClick().invoke(!followButtonState.isFollowing()));
+        } else {
+            followCommentsButton.setOnClickListener(null);
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderExpandableTagsView.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderExpandableTagsView.kt
index 87e29a8fca50..50ecb8c19dc3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderExpandableTagsView.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderExpandableTagsView.kt
@@ -11,8 +11,8 @@ import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.ui.reader.discover.interests.TagUiState
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import javax.inject.Inject
 
 class ReaderExpandableTagsView @JvmOverloads constructor(
@@ -21,7 +21,7 @@ class ReaderExpandableTagsView @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ChipGroup(context, attrs, defStyleAttr) {
     @Inject lateinit var uiHelpers: UiHelpers
-    @Inject lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Inject lateinit var readerTracker: ReaderTracker
 
     private var tagsUiState: List<TagUiState>? = null
 
@@ -63,7 +63,7 @@ class ReaderExpandableTagsView @JvmOverloads constructor(
         val inflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
         val chip = inflater.inflate(R.layout.reader_expandable_tags_view_overflow_chip, this, false) as Chip
         chip.setOnCheckedChangeListener { _, isChecked ->
-            analyticsTrackerWrapper.track(Stat.READER_CHIPS_MORE_TOGGLED)
+            readerTracker.track(Stat.READER_CHIPS_MORE_TOGGLED)
             expandLayout(isChecked)
         }
         addView(chip)
@@ -96,7 +96,9 @@ class ReaderExpandableTagsView @JvmOverloads constructor(
         requestLayout()
     }
 
-    private fun showAllTagChips() { tagChips.forEach { uiHelpers.updateVisibility(it, true) } }
+    private fun showAllTagChips() {
+        tagChips.forEach { uiHelpers.updateVisibility(it, true) }
+    }
 
     private fun hideTagChipsOutsideBounds() {
         tagChips.forEach { uiHelpers.updateVisibility(it, isChipWithinBounds(it)) }
@@ -130,8 +132,8 @@ class ReaderExpandableTagsView @JvmOverloads constructor(
 
         overflowIndicatorChip.text = if (isSingleLine) {
             String.format(
-                resources.getString(R.string.reader_expandable_tags_view_overflow_indicator_expand_title),
-                hiddenTagChipsCount
+                    resources.getString(R.string.reader_expandable_tags_view_overflow_indicator_expand_title),
+                    hiddenTagChipsCount
             )
         } else {
             resources.getString(R.string.reader_expandable_tags_view_overflow_indicator_collapse_title)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.kt
index a650764ba3f1..adfd861d7dfb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.kt
@@ -12,6 +12,7 @@ import android.view.View
 import android.view.animation.AccelerateDecelerateInterpolator
 import com.google.android.material.button.MaterialButton
 import org.wordpress.android.R
+import org.wordpress.android.ui.reader.views.ReaderFollowButtonType.FOLLOW_SITE
 
 /**
  * Follow button used in reader detail
@@ -23,6 +24,7 @@ class ReaderFollowButton @JvmOverloads constructor(
 ) : MaterialButton(context, attrs, defStyleAttr) {
     private var isFollowed = false
     private var showCaption = false
+    private var followButtonType = FOLLOW_SITE
 
     init {
         initView(context, attrs)
@@ -34,10 +36,21 @@ class ReaderFollowButton @JvmOverloads constructor(
         attrs?.let {
             val array = context.theme.obtainStyledAttributes(attrs, R.styleable.ReaderFollowButton, 0, 0)
             showCaption = array.getBoolean(R.styleable.ReaderFollowButton_wpShowFollowButtonCaption, true)
+
+            try {
+                val buttonTypeValue = array.getInteger(R.styleable.ReaderFollowButton_wpReaderFollowButtonType, -1)
+                if (buttonTypeValue != -1) {
+                    followButtonType = ReaderFollowButtonType.fromInt(buttonTypeValue)
+                }
+            } finally {
+                array.recycle()
+            }
         }
         if (!showCaption) {
             hideCaptionAndEnlargeIcon(context)
         }
+
+        updateFollowTextAndIcon()
     }
 
     private fun hideCaptionAndEnlargeIcon(context: Context) {
@@ -49,13 +62,13 @@ class ReaderFollowButton @JvmOverloads constructor(
 
     private fun updateFollowTextAndIcon() {
         if (showCaption) {
-            setText(if (isFollowed) R.string.reader_btn_unfollow else R.string.reader_btn_follow)
+            setText(if (isFollowed) followButtonType.captionFollowing else followButtonType.captionFollow)
         }
         isSelected = isFollowed
         val drawableId = if (isFollowed) {
-            R.drawable.ic_reader_following_white_24dp
+            followButtonType.iconFollowing
         } else {
-            R.drawable.ic_reader_follow_white_24dp
+            followButtonType.iconFollow
         }
         icon = context.resources.getDrawable(drawableId, context.theme)
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButtonType.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButtonType.kt
new file mode 100644
index 000000000000..d4a2a558c3d8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButtonType.kt
@@ -0,0 +1,37 @@
+package org.wordpress.android.ui.reader.views
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import org.wordpress.android.R
+
+enum class ReaderFollowButtonType(
+    val value: Int,
+    @StringRes val captionFollow: Int,
+    @StringRes val captionFollowing: Int,
+    @DrawableRes val iconFollow: Int,
+    @DrawableRes val iconFollowing: Int
+) {
+    FOLLOW_SITE(
+            0,
+            R.string.reader_btn_follow,
+            R.string.reader_btn_unfollow,
+            R.drawable.ic_reader_follow_white_24dp,
+            R.drawable.ic_reader_following_white_24dp
+    ),
+    // Note: even though AS does not catch it and it says it is not used, FOLLOW_COMMENTS is actually used currently
+    // by fromInt function to evaluate wpReaderFollowButtonType attr for example in the ReaderFollowButton that
+    // is placed in reader_comments_post_header_view.xml. Mind of this before to remove!
+    FOLLOW_COMMENTS(
+            1,
+            R.string.reader_btn_follow_comments,
+            R.string.reader_btn_following_comments,
+            R.drawable.ic_reader_follow_conversation_white_24dp,
+            R.drawable.ic_reader_following_conversation_white_24dp
+    );
+
+    companion object {
+        fun fromInt(value: Int): ReaderFollowButtonType =
+                values().firstOrNull { it.value == value }
+                        ?: throw IllegalArgumentException("ReaderFollowButtonType wrong value $value")
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.kt
index f9a0ba77c99e..397aff0cf014 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.kt
@@ -2,19 +2,17 @@ package org.wordpress.android.ui.reader.views
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.View
+import android.view.LayoutInflater
 import android.widget.LinearLayout
-import kotlinx.android.synthetic.main.reader_post_detail_header_view.view.*
-import kotlinx.android.synthetic.main.reader_blog_section_view.view.*
-import org.wordpress.android.R.layout
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderBlogSectionViewBinding
+import org.wordpress.android.databinding.ReaderPostDetailHeaderViewBinding
 import org.wordpress.android.ui.reader.views.uistates.FollowButtonUiState
 import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState
 import org.wordpress.android.ui.reader.views.uistates.ReaderPostDetailsHeaderViewUiState.ReaderPostDetailsHeaderUiState
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.getDrawableResIdFromAttribute
 import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
 import org.wordpress.android.util.setVisible
 import javax.inject.Inject
 
@@ -26,72 +24,63 @@ class ReaderPostDetailHeaderView @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : LinearLayout(context, attrs, defStyleAttr) {
+    private val binding = ReaderPostDetailHeaderViewBinding.inflate(LayoutInflater.from(context), this, true)
+
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var uiHelpers: UiHelpers
 
     init {
         (context.applicationContext as WordPress).component().inject(this)
-        View.inflate(context, layout.reader_post_detail_header_view, this)
     }
 
-    fun updatePost(uiState: ReaderPostDetailsHeaderUiState) {
-        expandable_tags_view.setVisible(uiState.tagItemsVisibility)
-        expandable_tags_view.updateUi(uiState.tagItems)
+    fun updatePost(uiState: ReaderPostDetailsHeaderUiState) = with(binding) {
+        expandableTagsView.setVisible(uiState.tagItemsVisibility)
+        expandableTagsView.updateUi(uiState.tagItems)
 
-        uiHelpers.setTextOrHide(text_title, uiState.title)
+        uiHelpers.setTextOrHide(textTitle, uiState.title)
 
-        updateBlogSection(uiState.blogSectionUiState)
+        layoutBlogSection.updateBlogSection(uiState.blogSectionUiState)
         updateFollowButton(uiState.followButtonUiState)
 
-        uiHelpers.setTextOrHide(text_author, uiState.authorName)
-        text_by.setVisible(uiState.authorName != null)
+        uiHelpers.setTextOrHide(textAuthor, uiState.authorName)
+        textBy.setVisible(uiState.authorName != null)
 
-        uiHelpers.updateVisibility(post_detail_dot_separator, uiState.dotSeparatorVisibility)
-        uiHelpers.setTextOrHide(post_detail_text_dateline, uiState.dateLine)
+        uiHelpers.updateVisibility(postDetailDotSeparator, uiState.dotSeparatorVisibility)
+        uiHelpers.setTextOrHide(postDetailTextDateline, uiState.dateLine)
     }
 
-    private fun updateBlogSection(
-        blogSectionUiState: ReaderBlogSectionUiState
-    ) {
-        updateBlavatar(blogSectionUiState)
+    private fun ReaderBlogSectionViewBinding.updateBlogSection(state: ReaderBlogSectionUiState) {
+        updateBlavatar(state)
 
-        uiHelpers.setTextOrHide(text_author_and_blog_name, blogSectionUiState.blogName)
-        uiHelpers.setTextOrHide(text_blog_url, blogSectionUiState.blogUrl)
+        uiHelpers.setTextOrHide(textAuthorAndBlogName, state.blogName)
+        uiHelpers.setTextOrHide(textBlogUrl, state.blogUrl)
 
-        layout_blog_section.setBackgroundResource(
-                layout_blog_section.context.getDrawableResIdFromAttribute(
-                        blogSectionUiState.blogSectionClickData?.background ?: 0
-                )
-        )
-        blogSectionUiState.blogSectionClickData?.onBlogSectionClicked?.let {
-            layout_blog_section.setOnClickListener {
-                blogSectionUiState.blogSectionClickData.onBlogSectionClicked.invoke(
-                        blogSectionUiState.postId,
-                        blogSectionUiState.blogId
-                )
+        root.apply {
+            setBackgroundResource(context.getDrawableResIdFromAttribute(state.blogSectionClickData?.background ?: 0))
+            state.blogSectionClickData?.onBlogSectionClicked?.let { onClick ->
+                setOnClickListener { onClick.invoke(state.postId, state.blogId) }
+            } ?: run {
+                setOnClickListener(null)
+                isClickable = false
             }
-        } ?: run {
-            layout_blog_section.setOnClickListener(null)
-            layout_blog_section.isClickable = false
         }
     }
 
-    private fun updateBlavatar(state: ReaderBlogSectionUiState) {
-        uiHelpers.updateVisibility(image_avatar_or_blavatar, state.avatarOrBlavatarUrl != null)
+    private fun ReaderBlogSectionViewBinding.updateBlavatar(state: ReaderBlogSectionUiState) {
+        uiHelpers.updateVisibility(imageAvatarOrBlavatar, state.avatarOrBlavatarUrl != null)
         if (state.avatarOrBlavatarUrl == null) {
-            imageManager.cancelRequestAndClearImageView(image_avatar_or_blavatar)
+            imageManager.cancelRequestAndClearImageView(imageAvatarOrBlavatar)
         } else {
-            imageManager.loadIntoCircle(
-                    image_avatar_or_blavatar,
-                    BLAVATAR_CIRCULAR, state.avatarOrBlavatarUrl
-            )
+            imageManager.loadIntoCircle(imageAvatarOrBlavatar, state.blavatarType, state.avatarOrBlavatarUrl)
         }
+        // we don't show the p2 style of header in post details yet
+        uiHelpers.updateVisibility(authorsAvatar, state.isAuthorAvatarVisible)
     }
 
-    private fun updateFollowButton(followButtonUiState: FollowButtonUiState) {
-        header_follow_button.isEnabled = followButtonUiState.isEnabled
-        header_follow_button.setVisible(followButtonUiState.isVisible)
-        header_follow_button.setIsFollowed(followButtonUiState.isFollowed)
-        header_follow_button.setOnClickListener { followButtonUiState.onFollowButtonClicked?.invoke() }
+    private fun ReaderPostDetailHeaderViewBinding.updateFollowButton(followButtonUiState: FollowButtonUiState) {
+        headerFollowButton.isEnabled = followButtonUiState.isEnabled
+        headerFollowButton.setVisible(followButtonUiState.isVisible)
+        headerFollowButton.setIsFollowed(followButtonUiState.isFollowed)
+        headerFollowButton.setOnClickListener { followButtonUiState.onFollowButtonClicked?.invoke() }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostContainerView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostContainerView.java
deleted file mode 100644
index 188f34250916..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostContainerView.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.wordpress.android.ui.reader.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.wordpress.android.R;
-import org.wordpress.android.ui.reader.ReaderInterfaces.OnFollowListener;
-import org.wordpress.android.ui.reader.models.ReaderSimplePost;
-import org.wordpress.android.ui.reader.models.ReaderSimplePostList;
-import org.wordpress.android.util.analytics.AnalyticsUtils;
-
-/**
- * used by the detail view to display related posts, which can be either local (related posts
- * from the same site as the source post) or global (related posts from across wp.com)
- */
-public class ReaderSimplePostContainerView extends LinearLayout {
-    private OnFollowListener mFollowListener;
-
-    private final ReaderSimplePostList mSimplePostList = new ReaderSimplePostList();
-
-    public ReaderSimplePostContainerView(Context context) {
-        super(context);
-        initView(context);
-    }
-
-    public ReaderSimplePostContainerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView(context);
-    }
-
-    public ReaderSimplePostContainerView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context);
-    }
-
-    public ReaderSimplePostContainerView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        initView(context);
-    }
-
-    private void initView(Context context) {
-        inflate(context, R.layout.reader_simple_posts_container_view, this);
-    }
-
-    public void showPosts(ReaderSimplePostList posts,
-                          String siteName,
-                          boolean isGlobal,
-                          ReaderSimplePostView.OnSimplePostClickListener listener) {
-        mSimplePostList.clear();
-        mSimplePostList.addAll(posts);
-
-        ViewGroup container = (ViewGroup) findViewById(R.id.container_related_posts);
-        container.removeAllViews();
-
-        // nothing more to do if passed list is empty
-        if (mSimplePostList.size() == 0) {
-            return;
-        }
-
-        // add a view for each post
-        for (int index = 0; index < mSimplePostList.size(); index++) {
-            ReaderSimplePost relatedPost = mSimplePostList.get(index);
-            ReaderSimplePostView postView = new ReaderSimplePostView(getContext());
-            postView.setOnFollowListener(mFollowListener);
-            postView.showPost(relatedPost, container, isGlobal, listener);
-        }
-
-        // make sure the label for these posts has the correct caption
-        TextView label = findViewById(R.id.text_related_posts_label);
-        if (isGlobal) {
-            label.setText(getContext().getString(R.string.reader_label_global_related_posts));
-        } else {
-            label.setText(String.format(getContext().getString(R.string.reader_label_local_related_posts), siteName));
-        }
-    }
-
-    public void setOnFollowListener(OnFollowListener listener) {
-        mFollowListener = listener;
-    }
-
-    /*
-     * called by reader detail when scrolled into view, tracks railcar events for each post
-     */
-    public void trackRailcarRender() {
-        for (ReaderSimplePost post : mSimplePostList) {
-            AnalyticsUtils.trackRailcarRender(post.getRailcarJson());
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostContainerView.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostContainerView.kt
new file mode 100644
index 000000000000..e0a155793472
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostContainerView.kt
@@ -0,0 +1,61 @@
+package org.wordpress.android.ui.reader.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import androidx.recyclerview.widget.LinearLayoutManager
+import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderSimplePostsContainerViewBinding
+import org.wordpress.android.ui.reader.adapters.ReaderRelatedPostsAdapter
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState
+import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.image.ImageManager
+import javax.inject.Inject
+
+/**
+ * used by the detail view to display related posts, which can be either local (related posts
+ * from the same site as the source post) or global (related posts from across wp.com)
+ */
+class ReaderSimplePostContainerView @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : LinearLayout(context, attrs, defStyleAttr) {
+    private val binding = ReaderSimplePostsContainerViewBinding.inflate(LayoutInflater.from(context), this, true)
+    private val railcarJsonStrings = mutableListOf<String?>()
+
+    @Inject lateinit var uiHelpers: UiHelpers
+    @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var readerTracker: ReaderTracker
+
+    init {
+        (context.applicationContext as WordPress).component().inject(this)
+        binding.initRecyclerView(context)
+    }
+
+    private fun ReaderSimplePostsContainerViewBinding.initRecyclerView(context: Context) {
+        recyclerView.layoutManager = LinearLayoutManager(context)
+        recyclerView.adapter = ReaderRelatedPostsAdapter(uiHelpers, imageManager)
+    }
+
+    fun showPosts(state: RelatedPostsUiState) = with(binding) {
+        if (state.cards?.size == 0) return
+
+        railcarJsonStrings.clear()
+        railcarJsonStrings.addAll(state.railcarJsonStrings)
+
+        state.cards?.let { (recyclerView.adapter as ReaderRelatedPostsAdapter).update(it) }
+        uiHelpers.setTextOrHide(textRelatedPostsLabel, state.headerLabel)
+    }
+
+    /*
+     * called by reader detail when scrolled into view, tracks railcar events for each post
+     */
+    fun trackRailcarRender() { // TODO: move tracking to view model
+        for (railcarJson in railcarJsonStrings) {
+            railcarJson?.let { readerTracker.trackRailcar(it) }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostView.java
deleted file mode 100644
index 0734356c834b..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSimplePostView.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.wordpress.android.ui.reader.views;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.ImageView;
-import android.widget.ImageView.ScaleType;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import org.wordpress.android.R;
-import org.wordpress.android.ui.reader.ReaderInterfaces.OnFollowListener;
-import org.wordpress.android.ui.reader.actions.ReaderActions;
-import org.wordpress.android.ui.reader.actions.ReaderBlogActions;
-import org.wordpress.android.ui.reader.models.ReaderSimplePost;
-import org.wordpress.android.util.DisplayUtils;
-import org.wordpress.android.util.GravatarUtils;
-import org.wordpress.android.util.NetworkUtils;
-import org.wordpress.android.util.PhotonUtils;
-import org.wordpress.android.util.ToastUtils;
-import org.wordpress.android.util.image.ImageManager;
-import org.wordpress.android.util.image.ImageType;
-
-/**
- * single simple post view
- */
-public class ReaderSimplePostView extends LinearLayout {
-    public interface OnSimplePostClickListener {
-        void onSimplePostClick(View v, long siteId, long postId);
-    }
-
-    private OnFollowListener mFollowListener;
-    private ReaderSimplePost mSimplePost;
-
-    public ReaderSimplePostView(Context context) {
-        super(context);
-        initView(context);
-    }
-
-    public ReaderSimplePostView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        initView(context);
-    }
-
-    public ReaderSimplePostView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        initView(context);
-    }
-
-    public ReaderSimplePostView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        initView(context);
-    }
-
-    private void initView(Context context) {
-        inflate(context, R.layout.reader_simple_post_view, this);
-    }
-
-    public void setOnFollowListener(OnFollowListener listener) {
-        mFollowListener = listener;
-    }
-
-    public void showPost(ReaderSimplePost simplePost,
-                         ViewGroup parent,
-                         boolean isGlobal,
-                         final OnSimplePostClickListener listener) {
-        mSimplePost = simplePost;
-        int avatarSize =
-                DisplayUtils.dpToPx(getContext(), getResources().getDimensionPixelSize(R.dimen.avatar_sz_extra_small));
-
-        LayoutInflater inflater = LayoutInflater.from(getContext());
-
-        View postView = inflater.inflate(R.layout.reader_simple_post_view, parent, false);
-        TextView txtTitle = postView.findViewById(R.id.text_simple_post_title);
-        TextView txtExcerpt = postView.findViewById(R.id.text_simple_post_excerpt);
-        View siteHeader = postView.findViewById(R.id.layout_simple_post_site_header);
-
-        txtTitle.setText(mSimplePost.getTitle());
-
-        if (mSimplePost.hasExcerpt()) {
-            txtExcerpt.setText(mSimplePost.getExcerpt());
-            txtExcerpt.setVisibility(View.VISIBLE);
-        } else {
-            txtExcerpt.setVisibility(View.GONE);
-        }
-
-        // site header only appears for global related posts
-        if (isGlobal) {
-            ImageView imgAvatar = siteHeader.findViewById(R.id.image_avatar);
-            TextView txtSiteName = siteHeader.findViewById(R.id.text_site_name);
-            TextView txtAuthorName = siteHeader.findViewById(R.id.text_author_name);
-            txtSiteName.setText(mSimplePost.getSiteName());
-            txtAuthorName.setText(mSimplePost.getAuthorName());
-            if (mSimplePost.hasAuthorAvatarUrl()) {
-                imgAvatar.setVisibility(View.VISIBLE);
-                String avatarUrl = GravatarUtils.fixGravatarUrl(mSimplePost.getAuthorAvatarUrl(), avatarSize);
-                ImageManager.getInstance().loadIntoCircle(imgAvatar, ImageType.AVATAR, avatarUrl);
-            } else {
-                ImageManager.getInstance().cancelRequestAndClearImageView(imgAvatar);
-                imgAvatar.setVisibility(View.GONE);
-            }
-
-            ReaderFollowButton btnFollow = siteHeader.findViewById(R.id.simple_post_follow_button);
-            btnFollow.setIsFollowed(mSimplePost.isFollowing());
-            btnFollow.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    toggleFollowStatus((ReaderFollowButton) v);
-                }
-            });
-
-            siteHeader.setVisibility(View.VISIBLE);
-        } else {
-            siteHeader.setVisibility(View.GONE);
-        }
-
-        showFeaturedImage(postView);
-
-        postView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (listener != null) {
-                    listener.onSimplePostClick(view,
-                                               mSimplePost.getSiteId(),
-                                               mSimplePost.getPostId());
-                }
-            }
-        });
-
-        parent.addView(postView);
-    }
-
-    private void toggleFollowStatus(final ReaderFollowButton btnFollow) {
-        if (!NetworkUtils.checkConnection(getContext())) {
-            return;
-        }
-
-        final boolean isAskingToFollow = !mSimplePost.isFollowing();
-
-        if (mFollowListener != null) {
-            if (isAskingToFollow) {
-                mFollowListener.onFollowTapped(btnFollow, mSimplePost.getSiteName(), mSimplePost.getSiteId());
-            } else {
-                mFollowListener.onFollowingTapped();
-            }
-        }
-
-        ReaderActions.ActionListener listener = new ReaderActions.ActionListener() {
-            @Override
-            public void onActionResult(boolean succeeded) {
-                if (getContext() == null) {
-                    return;
-                }
-
-                btnFollow.setEnabled(true);
-                if (succeeded) {
-                    mSimplePost.setIsFollowing(isAskingToFollow);
-                } else {
-                    int errResId = isAskingToFollow ? R.string.reader_toast_err_follow_blog
-                            : R.string.reader_toast_err_unfollow_blog;
-                    ToastUtils.showToast(getContext(), errResId);
-                    btnFollow.setIsFollowed(!isAskingToFollow);
-                }
-            }
-        };
-
-        // disable follow button until call completes
-        btnFollow.setEnabled(false);
-
-        ReaderBlogActions.followBlogById(mSimplePost.getSiteId(), isAskingToFollow, listener);
-        btnFollow.setIsFollowedAnimated(isAskingToFollow);
-    }
-
-    private void showFeaturedImage(final View postView) {
-        final ImageView imgFeatured = postView.findViewById(R.id.image_featured);
-
-        // post must have an excerpt in order to show featured image (not enough space otherwise)
-        if (!mSimplePost.hasFeaturedImageUrl() || !mSimplePost.hasExcerpt()) {
-            imgFeatured.setVisibility(View.GONE);
-            return;
-        }
-        // featured image has height set to MATCH_PARENT so wait for parent view's layout to complete
-        // before loading image so we can set the image height correctly, then tell the imageView
-        // to crop the downloaded image to fit the exact width/height of the view
-        postView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                postView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                int cropWidth =
-                        getContext().getResources().getDimensionPixelSize(R.dimen.reader_simple_post_image_width);
-                int cropHeight = postView.getHeight();
-                String photonUrl = PhotonUtils.getPhotonImageUrl(
-                        mSimplePost.getFeaturedImageUrl(), cropWidth, cropHeight);
-                ViewGroup.LayoutParams layoutParams = imgFeatured.getLayoutParams();
-                layoutParams.height = cropHeight;
-
-                ImageManager.getInstance().load(imgFeatured, ImageType.PHOTO, photonUrl, ScaleType.CENTER_CROP);
-            }
-        });
-
-        imgFeatured.setVisibility(View.VISIBLE);
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java
index a0715b88e413..071814dd08cc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteHeaderView.java
@@ -16,15 +16,17 @@
 import org.wordpress.android.ui.reader.ReaderInterfaces.OnFollowListener;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.ui.reader.utils.ReaderUtils;
 import org.wordpress.android.util.LocaleManager;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.PhotonUtils;
 import org.wordpress.android.util.PhotonUtils.Quality;
+import org.wordpress.android.util.SiteUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.UrlUtils;
+import org.wordpress.android.util.image.BlavatarShape;
 import org.wordpress.android.util.image.ImageManager;
-import org.wordpress.android.util.image.ImageType;
 
 import javax.inject.Inject;
 
@@ -50,6 +52,7 @@ public interface OnBlogInfoLoadedListener {
 
     @Inject AccountStore mAccountStore;
     @Inject ImageManager mImageManager;
+    @Inject ReaderTracker mReaderTracker;
 
     public ReaderSiteHeaderView(Context context) {
         this(context, null);
@@ -79,7 +82,11 @@ public void setOnBlogInfoLoadedListener(OnBlogInfoLoadedListener listener) {
         mBlogInfoListener = listener;
     }
 
-    public void loadBlogInfo(long blogId, long feedId) {
+    public void loadBlogInfo(
+            final long blogId,
+            final long feedId,
+            final String source
+    ) {
         mBlogId = blogId;
         mFeedId = feedId;
 
@@ -98,7 +105,7 @@ public void loadBlogInfo(long blogId, long feedId) {
         }
 
         if (localBlogInfo != null) {
-            showBlogInfo(localBlogInfo);
+            showBlogInfo(localBlogInfo, source);
         }
 
         // then get from server if doesn't exist locally or is time to update it
@@ -107,7 +114,7 @@ public void loadBlogInfo(long blogId, long feedId) {
                 @Override
                 public void onResult(ReaderBlog serverBlogInfo) {
                     if (isAttachedToWindow()) {
-                        showBlogInfo(serverBlogInfo);
+                        showBlogInfo(serverBlogInfo, source);
                     }
                 }
             };
@@ -120,7 +127,7 @@ public void onResult(ReaderBlog serverBlogInfo) {
         }
     }
 
-    private void showBlogInfo(ReaderBlog blogInfo) {
+    private void showBlogInfo(ReaderBlog blogInfo, String source) {
         // do nothing if unchanged
         if (blogInfo == null || blogInfo.isSameAs(mBlogInfo)) {
             return;
@@ -155,10 +162,9 @@ private void showBlogInfo(ReaderBlog blogInfo) {
             txtDescription.setVisibility(View.GONE);
         }
 
-        if (blogInfo.hasImageUrl()) {
-            mImageManager.loadIntoCircle(blavatarImg, ImageType.BLAVATAR_CIRCULAR,
-                    PhotonUtils.getPhotonImageUrl(blogInfo.getImageUrl(), mBlavatarSz, mBlavatarSz, Quality.HIGH));
-        }
+        mImageManager.loadIntoCircle(blavatarImg,
+                SiteUtils.getSiteImageType(blogInfo.isP2orA8C(), BlavatarShape.CIRCULAR),
+                PhotonUtils.getPhotonImageUrl(blogInfo.getImageUrl(), mBlavatarSz, mBlavatarSz, Quality.HIGH));
 
         txtFollowCount.setText(String.format(
                 LocaleManager.getSafeLocale(getContext()),
@@ -173,7 +179,7 @@ private void showBlogInfo(ReaderBlog blogInfo) {
             mFollowButton.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    toggleFollowStatus(v);
+                    toggleFollowStatus(v, source);
                 }
             });
         }
@@ -187,7 +193,7 @@ public void onClick(View v) {
         }
     }
 
-    private void toggleFollowStatus(final View followButton) {
+    private void toggleFollowStatus(final View followButton, final String source) {
         if (!NetworkUtils.checkConnection(getContext())) {
             return;
         }
@@ -204,7 +210,8 @@ private void toggleFollowStatus(final View followButton) {
                 mFollowListener.onFollowTapped(
                         followButton,
                         mBlogInfo.getName(),
-                        mIsFeed ? 0 : mBlogInfo.blogId);
+                        mIsFeed ? 0 : mBlogInfo.blogId,
+                        mBlogInfo.feedId);
             } else {
                 mFollowListener.onFollowingTapped();
             }
@@ -231,9 +238,23 @@ public void onActionResult(boolean succeeded) {
 
         boolean result;
         if (mIsFeed) {
-            result = ReaderBlogActions.followFeedById(mFeedId, isAskingToFollow, listener);
+            result = ReaderBlogActions.followFeedById(
+                    mBlogId,
+                    mFeedId,
+                    isAskingToFollow,
+                    listener,
+                    source,
+                    mReaderTracker
+            );
         } else {
-            result = ReaderBlogActions.followBlogById(mBlogId, isAskingToFollow, listener);
+            result = ReaderBlogActions.followBlogById(
+                    mBlogId,
+                    mFeedId,
+                    isAskingToFollow,
+                    listener,
+                    source,
+                    mReaderTracker
+            );
         }
 
         if (result) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteSearchResultView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteSearchResultView.java
index 5abacce658f2..89d259af6e0a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteSearchResultView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderSiteSearchResultView.java
@@ -11,9 +11,11 @@
 import androidx.annotation.NonNull;
 
 import org.wordpress.android.R;
+import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.model.ReaderSiteModel;
 import org.wordpress.android.ui.reader.actions.ReaderActions;
 import org.wordpress.android.ui.reader.actions.ReaderBlogActions;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
@@ -21,12 +23,15 @@
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
 
+import javax.inject.Inject;
+
 /**
  * single feed search result
  */
 public class ReaderSiteSearchResultView extends LinearLayout {
     public interface OnSiteFollowedListener {
         void onSiteFollowed(@NonNull ReaderSiteModel site);
+
         void onSiteUnFollowed(@NonNull ReaderSiteModel site);
     }
 
@@ -34,6 +39,8 @@ public interface OnSiteFollowedListener {
     private ReaderSiteModel mSite;
     private OnSiteFollowedListener mFollowListener;
 
+    @Inject ReaderTracker mReaderTracker;
+
     public ReaderSiteSearchResultView(Context context) {
         this(context, null);
     }
@@ -44,6 +51,7 @@ public ReaderSiteSearchResultView(Context context, AttributeSet attrs) {
 
     public ReaderSiteSearchResultView(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
+        ((WordPress) context.getApplicationContext()).component().inject(this);
         initView(context);
     }
 
@@ -103,7 +111,14 @@ public void onActionResult(boolean succeeded) {
         // disable follow button until API call returns
         mFollowButton.setEnabled(false);
 
-        boolean result = ReaderBlogActions.followFeedById(mSite.getFeedId(), isAskingToFollow, listener);
+        boolean result = ReaderBlogActions.followFeedById(
+                mSite.getSiteId(),
+                mSite.getFeedId(),
+                isAskingToFollow,
+                listener,
+                ReaderTracker.SOURCE_SEARCH,
+                mReaderTracker
+        );
         if (result) {
             mFollowButton.setIsFollowedAnimated(isAskingToFollow);
             mSite.setFollowing(isAskingToFollow);
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderTagHeaderView.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderTagHeaderView.kt
index baad443059f8..6bc3e95b7530 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderTagHeaderView.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderTagHeaderView.kt
@@ -2,10 +2,10 @@ package org.wordpress.android.ui.reader.views
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.LayoutInflater
 import android.widget.RelativeLayout
-import kotlinx.android.synthetic.main.reader_tag_header_view.view.*
-import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.ReaderTagHeaderViewBinding
 import org.wordpress.android.ui.reader.views.ReaderTagHeaderViewUiState.ReaderTagHeaderUiState
 import org.wordpress.android.ui.utils.UiHelpers
 import javax.inject.Inject
@@ -18,25 +18,22 @@ class ReaderTagHeaderView @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
 ) : RelativeLayout(context, attrs, defStyleAttr) {
+    private val binding = ReaderTagHeaderViewBinding.inflate(LayoutInflater.from(context), this, true)
+
     @Inject lateinit var uiHelpers: UiHelpers
 
     private var onFollowBtnClicked: (() -> Unit)? = null
 
     init {
         (context.applicationContext as WordPress).component().inject(this)
-        initView(context)
-    }
-
-    private fun initView(context: Context) {
-        inflate(context, R.layout.reader_tag_header_view, this)
-        follow_button.setOnClickListener { onFollowBtnClicked?.invoke() }
+        binding.followButton.setOnClickListener { onFollowBtnClicked?.invoke() }
     }
 
-    fun updateUi(uiState: ReaderTagHeaderUiState) {
-        text_tag.text = uiState.title
+    fun updateUi(uiState: ReaderTagHeaderUiState) = with(binding) {
+        textTag.text = uiState.title
         with(uiState.followButtonUiState) {
-            follow_button.setIsFollowed(isFollowed)
-            follow_button.isEnabled = isEnabled
+            followButton.setIsFollowed(isFollowed)
+            followButton.isEnabled = isEnabled
             onFollowBtnClicked = onFollowButtonClicked
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderWebView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderWebView.java
index ed775561bcbb..f8e7375c44ac 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderWebView.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderWebView.java
@@ -11,17 +11,18 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.CookieManager;
-import android.webkit.WebChromeClient;
 import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.fluxc.store.AccountStore;
 import org.wordpress.android.ui.WPWebView;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.UrlUtils;
 import org.wordpress.android.util.WPUrlUtils;
+import org.wordpress.android.util.helpers.WebChromeClientWithVideoPoster;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
@@ -192,13 +193,18 @@ public void hideCustomView() {
     }
 
     /***
-     * isValidInstagramImageClick checks if this is an embedded instragram situation.
-     * If so, we want to ignore image click so that the iframe src gets handled
-     * The additional URL grab is an additional check for the instagram.com host
+     * Checks if the tapped image is a child of an anchor tag we want to respect.
+     * If so, we want to ignore the image click so that the wrapping src gets handled.
+     * The additional URL grab is an additional check for the appropriate host or URL structure.
+     *
+     * Cases:
+     * 1. Instagram
+     * 2. The Story block
+     *
      * @param hr - the HitTestResult
-     * @return true if is instagram or false otherwise
+     * @return true if the image click should be ignored and deferred to the parent anchor tag
      */
-    private boolean isValidInstagramImageClick(HitTestResult hr) {
+    private boolean isValidEmbeddedImageClick(HitTestResult hr) {
         // Referenced https://pacheco.dev/posts/android/webview-image-anchor/
         if (hr.getType() == WebView.HitTestResult.SRC_IMAGE_ANCHOR_TYPE) {
             Handler handler = new Handler();
@@ -210,7 +216,7 @@ private boolean isValidInstagramImageClick(HitTestResult hr) {
                 return false;
             }
 
-            return url.contains("ig_embed");
+            return url.contains("ig_embed") || url.contains("wp-story");
         } else {
             return false;
         }
@@ -227,7 +233,7 @@ public boolean onTouchEvent(MotionEvent event) {
             if (hr != null) {
                 if (isValidClickedUrl(hr.getExtra())) {
                     if (UrlUtils.isImageUrl(hr.getExtra())) {
-                        if (isValidInstagramImageClick(hr)) {
+                        if (isValidEmbeddedImageClick(hr)) {
                             return super.onTouchEvent(event);
                         } else {
                             return mUrlClickListener.onImageUrlClick(
@@ -260,6 +266,8 @@ private static class ReaderWebViewClient extends WebViewClient {
             mReaderWebView = readerWebView;
         }
 
+
+
         @Override
         public void onPageFinished(WebView view, String url) {
             if (mReaderWebView.hasPageFinishedListener()) {
@@ -312,12 +320,13 @@ public WebResourceResponse shouldInterceptRequest(WebView view, String url) {
         }
     }
 
-    private static class ReaderWebChromeClient extends WebChromeClient {
+    private static class ReaderWebChromeClient extends WebChromeClientWithVideoPoster {
         private final ReaderWebView mReaderWebView;
         private View mCustomView;
         private CustomViewCallback mCustomViewCallback;
 
         ReaderWebChromeClient(ReaderWebView readerWebView) {
+            super(readerWebView, R.drawable.media_movieclip);
             if (readerWebView == null) {
                 throw new IllegalArgumentException("ReaderWebChromeClient requires readerWebView");
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/uistates/ReaderBlogSectionUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/uistates/ReaderBlogSectionUiState.kt
index 607fbfed9732..fc1d80db6c59 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/uistates/ReaderBlogSectionUiState.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/uistates/ReaderBlogSectionUiState.kt
@@ -2,6 +2,7 @@ package org.wordpress.android.ui.reader.views.uistates
 
 import androidx.annotation.AttrRes
 import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.util.image.ImageType
 
 data class ReaderBlogSectionUiState(
     val postId: Long,
@@ -10,6 +11,9 @@ data class ReaderBlogSectionUiState(
     val blogName: UiString,
     val blogUrl: String?,
     val avatarOrBlavatarUrl: String?,
+    val authorAvatarUrl: String?,
+    val isAuthorAvatarVisible: Boolean,
+    val blavatarType: ImageType,
     val blogSectionClickData: ReaderBlogSectionClickData?
 ) {
     data class ReaderBlogSectionClickData(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
index 97f305414ed3..6c31aef30f6c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationActivity.kt
@@ -7,7 +7,6 @@ import android.view.MenuItem
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.ui.ActivityLauncher
@@ -31,16 +30,14 @@ import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.Creat
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteCreationCompleted
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteNotCreated
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteNotInLocalDb
-import org.wordpress.android.ui.sitecreation.segments.SegmentsScreenListener
-import org.wordpress.android.ui.sitecreation.segments.SiteCreationSegmentsFragment
 import org.wordpress.android.ui.sitecreation.theme.HomePagePickerFragment
+import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel
 import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.config.HomePagePickerFeatureConfig
 import org.wordpress.android.util.wizard.WizardNavigationTarget
 import javax.inject.Inject
 
+@Suppress("TooManyFunctions")
 class SiteCreationActivity : LocaleAwareActivity(),
-        SegmentsScreenListener,
         DomainsScreenListener,
         SitePreviewScreenListener,
         OnHelpClickedListener,
@@ -48,15 +45,17 @@ class SiteCreationActivity : LocaleAwareActivity(),
         BasicDialogNegativeClickInterface {
     @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
-    @Inject internal lateinit var homePagePickerFeatureConfig: HomePagePickerFeatureConfig
     private lateinit var mainViewModel: SiteCreationMainVM
+    private lateinit var hppViewModel: HomePagePickerViewModel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
         setContentView(R.layout.site_creation_activity)
-        mainViewModel = ViewModelProviders.of(this, viewModelFactory).get(SiteCreationMainVM::class.java)
+        mainViewModel = ViewModelProvider(this, viewModelFactory).get(SiteCreationMainVM::class.java)
+        hppViewModel = ViewModelProvider(this, viewModelFactory).get(HomePagePickerViewModel::class.java)
         mainViewModel.start(savedInstanceState)
+        hppViewModel.loadSavedState(savedInstanceState)
 
         observeVMState()
     }
@@ -64,6 +63,7 @@ class SiteCreationActivity : LocaleAwareActivity(),
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
         mainViewModel.writeToBundle(outState)
+        hppViewModel.writeToBundle(outState)
     }
 
     private fun observeVMState() {
@@ -103,10 +103,12 @@ class SiteCreationActivity : LocaleAwareActivity(),
         mainViewModel.onBackPressedObservable.observe(this, Observer {
             super.onBackPressed()
         })
-    }
-
-    override fun onSegmentSelected(segmentId: Long) {
-        mainViewModel.onSegmentSelected(segmentId)
+        hppViewModel.onBackButtonPressed.observe(this, Observer {
+            mainViewModel.onBackPressed()
+        })
+        hppViewModel.onDesignActionPressed.observe(this, Observer { design ->
+            mainViewModel.onSiteDesignSelected(design.template)
+        })
     }
 
     override fun onDomainSelected(domain: String) {
@@ -128,11 +130,9 @@ class SiteCreationActivity : LocaleAwareActivity(),
     private fun showStep(target: WizardNavigationTarget<SiteCreationStep, SiteCreationState>) {
         val screenTitle = getScreenTitle(target.wizardStep)
         val fragment = when (target.wizardStep) {
-            SEGMENTS -> if (homePagePickerFeatureConfig.isEnabled()) HomePagePickerFragment() // FIXME: Only for #13192
-            else SiteCreationSegmentsFragment.newInstance(screenTitle)
+            SEGMENTS -> HomePagePickerFragment()
             DOMAINS -> SiteCreationDomainsFragment.newInstance(
-                    screenTitle,
-                    target.wizardState.segmentId!!
+                    screenTitle
             )
             SITE_PREVIEW -> SiteCreationPreviewFragment.newInstance(screenTitle, target.wizardState)
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
index 180efd580be3..7a8ee52a4d53 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVM.kt
@@ -28,12 +28,14 @@ import javax.inject.Inject
 
 const val TAG_WARNING_DIALOG = "back_pressed_warning_dialog"
 const val KEY_CURRENT_STEP = "key_current_step"
+const val KEY_SITE_CREATION_COMPLETED = "key_site_creation_completed"
 const val KEY_SITE_CREATION_STATE = "key_site_creation_state"
 
 @Parcelize
 @SuppressLint("ParcelCreator")
 data class SiteCreationState(
     val segmentId: Long? = null,
+    val siteDesign: String? = null,
     val domain: String? = null
 ) : WizardState, Parcelable
 
@@ -75,6 +77,7 @@ class SiteCreationMainVM @Inject constructor(
             tracker.trackSiteCreationAccessed()
             siteCreationState = SiteCreationState()
         } else {
+            siteCreationCompleted = savedInstanceState.getBoolean(KEY_SITE_CREATION_COMPLETED, false)
             siteCreationState = requireNotNull(savedInstanceState.getParcelable(KEY_SITE_CREATION_STATE))
             val currentStepIndex = savedInstanceState.getInt(KEY_CURRENT_STEP)
             wizardManager.setCurrentStepIndex(currentStepIndex)
@@ -87,12 +90,13 @@ class SiteCreationMainVM @Inject constructor(
     }
 
     fun writeToBundle(outState: Bundle) {
+        outState.putBoolean(KEY_SITE_CREATION_COMPLETED, siteCreationCompleted)
         outState.putInt(KEY_CURRENT_STEP, wizardManager.currentStep)
         outState.putParcelable(KEY_SITE_CREATION_STATE, siteCreationState)
     }
 
-    fun onSegmentSelected(segmentId: Long) {
-        siteCreationState = siteCreationState.copy(segmentId = segmentId)
+    fun onSiteDesignSelected(siteDesign: String) {
+        siteCreationState = siteCreationState.copy(siteDesign = siteDesign)
         wizardManager.showNextStep()
     }
 
@@ -117,10 +121,10 @@ class SiteCreationMainVM @Inject constructor(
 
     private fun clearOldSiteCreationState(wizardStep: SiteCreationStep) {
         when (wizardStep) {
-            SEGMENTS -> siteCreationState.segmentId?.let {
-                siteCreationState = siteCreationState.copy(segmentId = null) }
+            SEGMENTS -> { }
             DOMAINS -> siteCreationState.domain?.let {
-                siteCreationState = siteCreationState.copy(domain = null) }
+                siteCreationState = siteCreationState.copy(domain = null)
+            }
             SITE_PREVIEW -> {} // intentionally left empty
         }
     }
@@ -140,7 +144,7 @@ class SiteCreationMainVM @Inject constructor(
         return when {
             firstStep -> ScreenTitleGeneral(R.string.new_site_creation_screen_title_general)
             lastStep -> ScreenTitleEmpty
-            singleInBetweenStepDomains -> ScreenTitleGeneral(R.string.my_site_select_domains_page_title)
+            singleInBetweenStepDomains -> ScreenTitleGeneral(R.string.new_site_creation_domain_header_title)
             else -> ScreenTitleStepCount(
                     R.string.new_site_creation_screen_title_step_count,
                     stepCount - 2, // -2 -> first = general title (Create Site), last item = empty title
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizer.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizer.kt
index 6e23aad6cf51..7068e24b35b7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizer.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizer.kt
@@ -5,20 +5,35 @@ import javax.inject.Inject
 
 class SiteCreationDomainSanitizer
 @Inject constructor() {
+    private val String.removeProtocol: String
+        get() = this.replace("http://", "").replace("https://", "")
+
+    private val String.removeNonAlphanumeric: String
+        get() = this.replace("[^a-zA-Z0-9]".toRegex(), "")
+
+    private val String.firstPeriodIndex: Int?
+        get() = this.indexOf(".").let { return if (it > 0) it else null }
+
+    private val String.firstPart: String
+        get() = this.firstPeriodIndex?.let { return substring(0, it) } ?: this
+
+    private val String.lastPart: String
+        get() = this.firstPeriodIndex?.let { return substring(it) } ?: this
+
+    /**
+     * Returns the first part of the domain
+     */
+    fun getName(url: String) = url.firstPart.removeProtocol
+
+    /**
+     * Returns the last part of the domain (after the first .)
+     */
+    fun getDomain(url: String) = url.lastPart
+
     /**
      * Sanitizes a query by taking the value before it's first period if it's present,
      * removes it's scheme and finally, removes any characters that aren't alphanumeric.
      */
     fun sanitizeDomainQuery(query: String) =
-            query.run {
-                val periodIndex = indexOf(".")
-                if (periodIndex > 0) {
-                    substring(0, periodIndex)
-                } else {
-                    this
-                }
-            }.replace("http://", "")
-                    .replace("https://", "")
-                    .replace("[^a-zA-Z0-9]".toRegex(), "")
-                    .toLowerCase(Locale.ROOT)
+            query.firstPart.removeProtocol.removeNonAlphanumeric.toLowerCase(Locale.ROOT)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt
index 7bac0f6295f5..b46b891c4188 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainViewHolder.kt
@@ -29,7 +29,8 @@ sealed class SiteCreationDomainViewHolder(internal val parent: ViewGroup, @Layou
         private val uiHelpers: UiHelpers
     ) : SiteCreationDomainViewHolder(parentView, R.layout.site_creation_domains_item) {
         private val container = itemView.findViewById<ViewGroup>(R.id.container)
-        private val suggestion = itemView.findViewById<TextView>(R.id.domain_suggestion)
+        private val nameSuggestion = itemView.findViewById<TextView>(R.id.name_suggestion)
+        private val domainSuggestion = itemView.findViewById<TextView>(R.id.domain_suggestion)
         private val suggestionRadioButton = itemView.findViewById<RadioButton>(R.id.domain_suggestion_radio_button)
         private val domainUnavailability = itemView.findViewById<TextView>(R.id.domain_unavailability)
         private var onDomainSelected: (() -> Unit)? = null
@@ -49,7 +50,8 @@ sealed class SiteCreationDomainViewHolder(internal val parent: ViewGroup, @Layou
             if (uiState.clickable) {
                 onDomainSelected = requireNotNull(uiState.onItemTapped) { "OnItemTapped is required." }
             }
-            suggestion.text = uiState.name
+            nameSuggestion.text = uiState.name
+            domainSuggestion.text = uiState.domain
             suggestionRadioButton.isChecked = uiState.checked
             suggestionRadioButton.visibility = if (uiState.radioButtonVisibility) View.VISIBLE else View.INVISIBLE
             container.isEnabled = uiState.clickable
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
index 6fe9820b0544..f450e71bb51f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsFragment.kt
@@ -4,11 +4,11 @@ import android.content.Context
 import android.os.Bundle
 import android.view.ViewGroup
 import androidx.annotation.LayoutRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatButton
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.site_creation_domains_screen.*
@@ -20,6 +20,7 @@ import org.wordpress.android.ui.sitecreation.domains.SiteCreationDomainsViewMode
 import org.wordpress.android.ui.sitecreation.misc.OnHelpClickedListener
 import org.wordpress.android.ui.sitecreation.misc.SearchInputWithHeader
 import org.wordpress.android.ui.utils.UiHelpers
+import org.wordpress.android.util.DisplayUtilsWrapper
 import javax.inject.Inject
 
 class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
@@ -29,6 +30,7 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
 
     @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject internal lateinit var uiHelpers: UiHelpers
+    @Inject internal lateinit var displayUtils: DisplayUtilsWrapper
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -91,7 +93,7 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
     }
 
     private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(SiteCreationDomainsViewModel::class.java)
 
         viewModel.uiState.observe(this, Observer { uiState ->
@@ -100,6 +102,8 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
                 searchInputWithHeader?.updateSearchInput(nonNullActivity, uiState.searchInputUiState)
                 updateContentUiState(uiState.contentState)
                 uiHelpers.updateVisibility(create_site_button_container, uiState.createSiteButtonContainerVisibility)
+                uiHelpers.updateVisibility(create_site_button_shaddow, uiState.createSiteButtonContainerVisibility)
+                updateTitleVisibility(uiState.headerUiState == null)
             }
         })
         viewModel.clearBtnClicked.observe(this, Observer {
@@ -111,21 +115,21 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
         viewModel.onHelpClicked.observe(this, Observer {
             (requireActivity() as OnHelpClickedListener).onHelpClicked(HelpActivity.Origin.SITE_CREATION_DOMAINS)
         })
-        viewModel.start(getSegmentIdFromArguments())
+        viewModel.start()
     }
 
     private fun updateContentUiState(contentState: DomainsUiContentState) {
         uiHelpers.updateVisibility(domain_list_empty_view, contentState.emptyViewVisibility)
+        uiHelpers.updateVisibility(domain_list_example, contentState.exampleViewVisibility)
         if (contentState.items.isNotEmpty()) {
             view?.announceForAccessibility(getString(R.string.suggestions_updated_content_description))
         }
         (recycler_view.adapter as SiteCreationDomainsAdapter).update(contentState.items)
     }
 
-    private fun getSegmentIdFromArguments(): Long {
-        return requireNotNull(arguments?.getLong(EXTRA_SEGMENT_ID)) {
-            "SegmentId is missing. Have you created the fragment using SiteCreationDomainsFragment.newInstance(..)?"
-        }
+    private fun updateTitleVisibility(visible: Boolean) {
+        val actionBar = (requireActivity() as? AppCompatActivity)?.supportActionBar
+        actionBar?.setDisplayShowTitleEnabled(displayUtils.isLandscapeBySize() || visible)
     }
 
     override fun onDestroyView() {
@@ -135,13 +139,11 @@ class SiteCreationDomainsFragment : SiteCreationBaseFormFragment() {
 
     companion object {
         const val TAG = "site_creation_domains_fragment_tag"
-        private const val EXTRA_SEGMENT_ID = "extra_segment_id"
 
-        fun newInstance(screenTitle: String, segmentId: Long): SiteCreationDomainsFragment {
+        fun newInstance(screenTitle: String): SiteCreationDomainsFragment {
             val fragment = SiteCreationDomainsFragment()
             val bundle = Bundle()
             bundle.putString(EXTRA_SCREEN_TITLE, screenTitle)
-            bundle.putLong(EXTRA_SEGMENT_ID, segmentId)
             fragment.arguments = bundle
             return fragment
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
index 4d6a955a85e8..f13ab3792903 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt
@@ -59,7 +59,6 @@ class SiteCreationDomainsViewModel @Inject constructor(
     override val coroutineContext: CoroutineContext
         get() = bgDispatcher + job
     private var isStarted = false
-    private var segmentId by Delegates.notNull<Long>()
 
     private val _uiState: MutableLiveData<DomainsUiState> = MutableLiveData()
     val uiState: LiveData<DomainsUiState> = _uiState
@@ -90,11 +89,10 @@ class SiteCreationDomainsViewModel @Inject constructor(
         dispatcher.unregister(fetchDomainsUseCase)
     }
 
-    fun start(segmentId: Long) {
+    fun start() {
         if (isStarted) {
             return
         }
-        this.segmentId = segmentId
         isStarted = true
         tracker.trackDomainsAccessed()
         resetUiState()
@@ -140,7 +138,10 @@ class SiteCreationDomainsViewModel @Inject constructor(
             updateUiStateToContent(query, Loading(Ready(emptyList()), false))
             fetchDomainsJob = launch {
                 delay(THROTTLE_DELAY)
-                val onSuggestedDomains = fetchDomainsUseCase.fetchDomains(query.value, segmentId)
+                val onSuggestedDomains: OnSuggestedDomains = fetchDomainsUseCase.fetchDomains(query.value,
+                            includeVendorDot = true,
+                            includeDotBlog = true)
+
                 withContext(mainDispatcher) {
                     onDomainsFetched(query, onSuggestedDomains)
                 }
@@ -253,7 +254,8 @@ class SiteCreationDomainsViewModel @Inject constructor(
 
             data.forEach { domainName ->
                 val itemUiState = DomainsModelAvailableUiState(
-                        domainName,
+                        domainSanitizer.getName(domainName),
+                        domainSanitizer.getDomain(domainName),
                         checked = domainName == selectedDomain
                 )
                 itemUiState.onItemTapped = { setSelectedDomainName(domainName) }
@@ -279,7 +281,8 @@ class SiteCreationDomainsViewModel @Inject constructor(
 
         return if (isDomainUnavailable) {
             DomainsModelUnavailabilityUiState(
-                    "$sanitizedQuery.wordpress.com",
+                    sanitizedQuery,
+                    ".wordpress.com",
                     UiStringRes(R.string.new_site_creation_unavailable_domain)
             )
         } else {
@@ -327,20 +330,24 @@ class SiteCreationDomainsViewModel @Inject constructor(
     ) {
         sealed class DomainsUiContentState(
             val emptyViewVisibility: Boolean,
+            val exampleViewVisibility: Boolean,
             val items: List<DomainsListItemUiState>
         ) {
             object Initial : DomainsUiContentState(
                     emptyViewVisibility = false,
+                    exampleViewVisibility = true,
                     items = emptyList()
             )
 
             object Empty : DomainsUiContentState(
                     emptyViewVisibility = true,
+                    exampleViewVisibility = false,
                     items = emptyList()
             )
 
             class VisibleItems(items: List<DomainsListItemUiState>) : DomainsUiContentState(
                     emptyViewVisibility = false,
+                    exampleViewVisibility = false,
                     items = items
             )
         }
@@ -352,6 +359,7 @@ class SiteCreationDomainsViewModel @Inject constructor(
 
         sealed class DomainsModelUiState(
             open val name: String,
+            open val domain: String,
             open val checked: Boolean,
             val radioButtonVisibility: Boolean,
             open val subTitle: UiString? = null,
@@ -359,13 +367,15 @@ class SiteCreationDomainsViewModel @Inject constructor(
         ) : DomainsListItemUiState() {
             data class DomainsModelAvailableUiState(
                 override val name: String,
+                override val domain: String,
                 override val checked: Boolean
-            ) : DomainsModelUiState(name, checked, true, clickable = true)
+            ) : DomainsModelUiState(name, domain, checked, true, clickable = true)
 
             data class DomainsModelUnavailabilityUiState(
                 override val name: String,
+                override val domain: String,
                 override val subTitle: UiString
-            ) : DomainsModelUiState(name, false, false, subTitle, false)
+            ) : DomainsModelUiState(name, domain, false, false, subTitle, false)
         }
 
         data class DomainsFetchSuggestionsErrorUiState(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt
index c7c97468a2ec..f6c7cb5367da 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt
@@ -10,6 +10,7 @@ import android.widget.TextView
 import org.wordpress.android.R
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.ActivityUtils
+import android.os.Handler
 
 class SearchInputWithHeader(private val uiHelpers: UiHelpers, rootView: View, onClear: () -> Unit) {
     private val headerLayout = rootView.findViewById<ViewGroup>(R.id.header_layout)
@@ -19,6 +20,7 @@ class SearchInputWithHeader(private val uiHelpers: UiHelpers, rootView: View, on
     private val progressBar = rootView.findViewById<View>(R.id.progress_bar)
     private val clearAllLayout = rootView.findViewById<View>(R.id.clear_all_layout)
     private val divider = rootView.findViewById<View>(R.id.divider)
+    private val showKeyboardHandler = Handler()
 
     var onTextChanged: ((String) -> Unit)? = null
 
@@ -68,7 +70,13 @@ class SearchInputWithHeader(private val uiHelpers: UiHelpers, rootView: View, on
     private fun showKeyboard(shouldShow: Boolean) {
         if (shouldShow) {
             searchInput.requestFocus()
-            ActivityUtils.showKeyboard(searchInput)
+            /**
+             * This workaround handles the case where the SiteCreationDomainsFragment appears after the
+             * DesignPreviewFragment dismisses and the keyboard fails to appear
+             */
+            showKeyboardHandler.postDelayed({
+                ActivityUtils.showKeyboard(searchInput)
+            }, 200)
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
index 0e891818b59e..00acb95d5757 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SiteCreationTracker.kt
@@ -1,7 +1,21 @@
 package org.wordpress.android.ui.sitecreation.misc
 
 import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.ui.layoutpicker.LayoutPickerTracker
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.UNKNOWN
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.CHOSEN_DOMAIN
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.FILTER
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.LOCATION
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.PREVIEW_MODE
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SEARCH_TERM
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SEGMENT_ID
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SEGMENT_NAME
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.SELECTED_FILTERS
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.TEMPLATE
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker.PROPERTY.THUMBNAIL_MODE
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -11,8 +25,29 @@ enum class SiteCreationErrorType {
     UNKNOWN;
 }
 
+private const val DESIGN_ERROR_CONTEXT = "design"
+private const val SITE_CREATION_LOCATION = "site_creation"
+
 @Singleton
-class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapper) {
+class SiteCreationTracker @Inject constructor(
+    val tracker: AnalyticsTrackerWrapper,
+    private val mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig
+) : LayoutPickerTracker {
+    private enum class PROPERTY(val key: String) {
+        TEMPLATE("template"),
+        SEGMENT_NAME("segment_name"),
+        SEGMENT_ID("segment_id"),
+        CHOSEN_DOMAIN("chosen_domain"),
+        SEARCH_TERM("search_term"),
+        THUMBNAIL_MODE("thumbnail_mode"),
+        PREVIEW_MODE("preview_mode"),
+        LOCATION("location"),
+        FILTER("filter"),
+        SELECTED_FILTERS("selected_filters")
+    }
+
+    private var designSelectionSkipped: Boolean = false
+
     fun trackSiteCreationAccessed() {
         tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_ACCESSED)
     }
@@ -25,8 +60,8 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
         tracker.track(
                 AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SEGMENTS_SELECTED,
                 mapOf(
-                        "segment_name" to segmentName,
-                        "segment_id" to segmentId
+                        SEGMENT_NAME.key to segmentName,
+                        SEGMENT_ID.key to segmentId
                 )
         )
     }
@@ -39,22 +74,43 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
         tracker.track(
                 AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_DOMAINS_SELECTED,
                 mapOf(
-                        "chosen_domain" to chosenDomain,
-                        "search_term" to searchTerm
+                        CHOSEN_DOMAIN.key to chosenDomain,
+                        SEARCH_TERM.key to searchTerm
                 )
         )
     }
 
-    fun trackPreviewLoading() {
-        tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_LOADING)
+    fun trackPreviewLoading(template: String?) {
+        if (template == null || designSelectionSkipped) {
+            tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_LOADING)
+        } else {
+            tracker.track(
+                    AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_LOADING,
+                    mapOf(TEMPLATE.key to template)
+            )
+        }
     }
 
-    fun trackPreviewWebviewShown() {
-        tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_VIEWED)
+    fun trackPreviewWebviewShown(template: String?) {
+        if (template == null || designSelectionSkipped) {
+            tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_VIEWED)
+        } else {
+            tracker.track(
+                    AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_VIEWED,
+                    mapOf(TEMPLATE.key to template)
+            )
+        }
     }
 
-    fun trackPreviewWebviewFullyLoaded() {
-        tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_LOADED)
+    fun trackPreviewWebviewFullyLoaded(template: String?) {
+        if (template == null || designSelectionSkipped) {
+            tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_LOADED)
+        } else {
+            tracker.track(
+                    AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SUCCESS_PREVIEW_LOADED,
+                    mapOf(TEMPLATE.key to template)
+            )
+        }
     }
 
     fun trackPreviewOkButtonTapped() {
@@ -65,8 +121,16 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
      * This stat is part of a funnel that provides critical information.  Before
      * making ANY modification to this stat please refer to: p4qSXL-35X-p2
      */
-    fun trackSiteCreated() {
-        tracker.track(AnalyticsTracker.Stat.SITE_CREATED)
+    fun trackSiteCreated(template: String?) {
+        if (template == null || designSelectionSkipped) {
+            tracker.track(AnalyticsTracker.Stat.SITE_CREATED, mySiteImprovementsFeatureConfig)
+        } else {
+            tracker.track(
+                    AnalyticsTracker.Stat.SITE_CREATED,
+                    mapOf(TEMPLATE.key to template),
+                    mySiteImprovementsFeatureConfig
+            )
+        }
     }
 
     fun trackFlowExited() {
@@ -89,4 +153,93 @@ class SiteCreationTracker @Inject constructor(val tracker: AnalyticsTrackerWrapp
     fun trackSiteCreationServiceStateUpdated(props: Map<String, *>) {
         tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_BACKGROUND_SERVICE_UPDATED, props)
     }
+
+    fun trackSiteDesignViewed(previewMode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED,
+                mapOf(THUMBNAIL_MODE.key to previewMode)
+        )
+    }
+
+    override fun trackThumbnailModeTapped(mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED,
+                mapOf(PREVIEW_MODE.key to mode)
+        )
+    }
+
+    fun trackSiteDesignSkipped() {
+        designSelectionSkipped = true
+        tracker.track(AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED)
+    }
+
+    fun trackSiteDesignSelected(template: String) {
+        designSelectionSkipped = false
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED,
+                mapOf(TEMPLATE.key to template)
+        )
+    }
+
+    override fun trackPreviewViewed(template: String, mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_VIEWED,
+                mapOf(TEMPLATE.key to template, PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewLoading(template: String, mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADING,
+                mapOf(TEMPLATE.key to template, PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewLoaded(template: String, mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADED,
+                mapOf(TEMPLATE.key to template, PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewModeTapped(mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_MODE_BUTTON_TAPPED,
+                mapOf(PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackPreviewModeChanged(mode: String) {
+        tracker.track(
+                AnalyticsTracker.Stat.ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_MODE_CHANGED,
+                mapOf(PREVIEW_MODE.key to mode)
+        )
+    }
+
+    override fun trackNoNetworkErrorShown(message: String) =
+            trackErrorShown(DESIGN_ERROR_CONTEXT, INTERNET_UNAVAILABLE_ERROR, message)
+
+    override fun trackErrorShown(message: String) = trackErrorShown(DESIGN_ERROR_CONTEXT, UNKNOWN, message)
+
+    override fun filterSelected(filter: String, selectedFilters: List<String>) {
+        tracker.track(
+                AnalyticsTracker.Stat.CATEGORY_FILTER_SELECTED,
+                mapOf(
+                        LOCATION.key to SITE_CREATION_LOCATION,
+                        FILTER.key to filter,
+                        SELECTED_FILTERS.key to selectedFilters.joinToString()
+                )
+        )
+    }
+
+    override fun filterDeselected(filter: String, selectedFilters: List<String>) {
+        tracker.track(
+                AnalyticsTracker.Stat.CATEGORY_FILTER_DESELECTED,
+                mapOf(
+                        LOCATION.key to SITE_CREATION_LOCATION,
+                        FILTER.key to filter,
+                        SELECTED_FILTERS.key to selectedFilters.joinToString()
+                )
+        )
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
index fc91872fc2d9..f63588ab2084 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SiteCreationPreviewFragment.kt
@@ -4,7 +4,6 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
 import android.text.Spannable
@@ -14,13 +13,11 @@ import android.view.View
 import android.view.View.OnLayoutChangeListener
 import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.webkit.WebView
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import kotlinx.android.synthetic.main.fullscreen_error_with_retry.*
 import kotlinx.android.synthetic.main.site_creation_preview_header_item.*
 import kotlinx.android.synthetic.main.site_creation_preview_screen_default.*
@@ -45,7 +42,6 @@ import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AutoForeground.ServiceEventConnection
 import org.wordpress.android.util.ErrorManagedWebViewClient.ErrorManagedWebViewClientListener
 import org.wordpress.android.util.URLFilteredWebViewClient
-import org.wordpress.android.util.getColorFromAttribute
 import javax.inject.Inject
 
 private const val ARG_DATA = "arg_site_creation_data"
@@ -81,6 +77,11 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         serviceEventConnection = ServiceEventConnection(context, SiteCreationService::class.java, viewModel)
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        viewModel.writeToBundle(outState)
+    }
+
     override fun onPause() {
         super.onPause()
         serviceEventConnection?.disconnect(context, viewModel)
@@ -100,7 +101,7 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
     }
 
     private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(SitePreviewViewModel::class.java)
         viewModel.uiState.observe(this, Observer { uiState ->
             uiState?.let {
@@ -122,12 +123,10 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         viewModel.preloadPreview.observe(this, Observer { url ->
             url?.let {
                 sitePreviewWebView.webViewClient = URLFilteredWebViewClient(url, this@SiteCreationPreviewFragment)
+                sitePreviewWebView.settings.userAgentString = WordPress.getUserAgent()
                 sitePreviewWebView.loadUrl(url)
             }
         })
-        viewModel.hideGetStartedBar.observe(this, Observer<Unit> {
-            hideGetStartedBar(sitePreviewWebView)
-        })
         viewModel.startCreateSiteService.observe(this, Observer { startServiceData ->
             startServiceData?.let {
                 SiteCreationService.createSite(
@@ -153,8 +152,6 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
                 (requireActivity() as SitePreviewScreenListener).onSitePreviewScreenDismissed(createSiteState)
             }
         })
-
-        viewModel.start(requireArguments()[ARG_DATA] as SiteCreationState)
     }
 
     private fun initRetryButton() {
@@ -279,7 +276,7 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
         )
         spannableTitle.setSpan(
-                ForegroundColorSpan(context.getColorFromAttribute(R.attr.wpColorOnSurfaceMedium)),
+                ForegroundColorSpan(ContextCompat.getColor(context, R.color.neutral_40)),
                 domainSpan.first,
                 domainSpan.second,
                 Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -291,6 +288,8 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         super.onActivityCreated(savedInstanceState)
 
         (requireActivity() as AppCompatActivity).supportActionBar?.hide()
+
+        viewModel.start(requireArguments()[ARG_DATA] as SiteCreationState, savedInstanceState)
     }
 
     override fun onWebViewPageLoaded() {
@@ -301,19 +300,6 @@ class SiteCreationPreviewFragment : SiteCreationBaseFormFragment(),
         viewModel.onWebViewError()
     }
 
-    // Hacky solution to https://github.com/wordpress-mobile/WordPress-Android/issues/8233
-    // Ideally we would hide "get started" bar on server side
-    @SuppressLint("SetJavaScriptEnabled")
-    private fun hideGetStartedBar(webView: WebView) {
-        webView.settings.javaScriptEnabled = true
-        val javascript = "document.querySelector('html').style.cssText += '; margin-top: 0 !important;';\n" +
-                "document.getElementById('wpadminbar').style.display = 'none';\n"
-
-        webView.evaluateJavascript(
-                javascript
-        ) { webView.settings.javaScriptEnabled = false }
-    }
-
     override fun onHelp() {
         viewModel.onHelpClicked()
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt
index 908c1c03f2f4..2ff12474c830 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModel.kt
@@ -1,8 +1,11 @@
 package org.wordpress.android.ui.sitecreation.previews
 
+import android.os.Bundle
+import android.os.Parcelable
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import kotlinx.android.parcel.Parcelize
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -14,6 +17,7 @@ import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.store.QuickStartStore
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
@@ -21,6 +25,8 @@ import org.wordpress.android.ui.sitecreation.SiteCreationState
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.UNKNOWN
 import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
+import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteCreationCompleted
+import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteNotCreated
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.CreateSiteState.SiteNotInLocalDb
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.SitePreviewUiState.SitePreviewContentUiState
 import org.wordpress.android.ui.sitecreation.previews.SitePreviewViewModel.SitePreviewUiState.SitePreviewFullscreenErrorUiState.SitePreviewConnectionErrorUiState
@@ -47,6 +53,7 @@ import javax.inject.Inject
 import javax.inject.Named
 import kotlin.coroutines.CoroutineContext
 
+const val KEY_CREATE_SITE_STATE = "CREATE_SITE_STATE"
 private const val CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE = 1000L
 private const val DELAY_TO_SHOW_WEB_VIEW_LOADING_SHIMMER = 1000L
 const val LOADING_STATE_TEXT_ANIMATION_DELAY = 2000L
@@ -62,6 +69,7 @@ private val loadingTexts = listOf(
 class SitePreviewViewModel @Inject constructor(
     private val dispatcher: Dispatcher,
     private val siteStore: SiteStore,
+    private val quickStartStore: QuickStartStore,
     private val fetchWpComSiteUseCase: FetchWpComSiteUseCase,
     private val networkUtils: NetworkUtilsWrapper,
     private val urlUtils: UrlUtilsWrapper,
@@ -80,7 +88,7 @@ class SitePreviewViewModel @Inject constructor(
     private lateinit var urlWithoutScheme: String
     private var lastReceivedServiceState: SiteCreationServiceState? = null
     private var serviceStateForRetry: SiteCreationServiceState? = null
-    private var createSiteState: CreateSiteState = CreateSiteState.SiteNotCreated
+    private var createSiteState: CreateSiteState = SiteNotCreated
 
     private val _uiState: MutableLiveData<SitePreviewUiState> = MutableLiveData()
     val uiState: LiveData<SitePreviewUiState> = _uiState
@@ -91,9 +99,6 @@ class SitePreviewViewModel @Inject constructor(
     private val _startCreateSiteService: SingleLiveEvent<SitePreviewStartServiceData> = SingleLiveEvent()
     val startCreateSiteService: LiveData<SitePreviewStartServiceData> = _startCreateSiteService
 
-    private val _hideGetStartedBar: SingleLiveEvent<Unit> = SingleLiveEvent()
-    val hideGetStartedBar: LiveData<Unit> = _hideGetStartedBar
-
     private val _onHelpClicked = SingleLiveEvent<Unit>()
     val onHelpClicked: LiveData<Unit> = _onHelpClicked
 
@@ -117,7 +122,11 @@ class SitePreviewViewModel @Inject constructor(
         loadingAnimationJob?.cancel()
     }
 
-    fun start(siteCreationState: SiteCreationState) {
+    fun writeToBundle(outState: Bundle) {
+        outState.putParcelable(KEY_CREATE_SITE_STATE, createSiteState)
+    }
+
+    fun start(siteCreationState: SiteCreationState, savedState: Bundle?) {
         if (isStarted) {
             return
         }
@@ -125,15 +134,38 @@ class SitePreviewViewModel @Inject constructor(
         this.siteCreationState = siteCreationState
         urlWithoutScheme = requireNotNull(siteCreationState.domain)
 
-        showFullscreenProgress()
-        startCreateSiteService()
+        val restoredState = savedState?.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE)
+
+        init(restoredState ?: SiteNotCreated)
+    }
+
+    private fun init(state: CreateSiteState) {
+        createSiteState = state
+        when (state) {
+            SiteNotCreated -> {
+                showFullscreenProgress()
+                startCreateSiteService()
+            }
+            is SiteNotInLocalDb -> {
+                showFullscreenProgress()
+                startPreLoadingWebView()
+                fetchNewlyCreatedSiteModel(state.remoteSiteId)
+            }
+            is SiteCreationCompleted -> {
+                startPreLoadingWebView(skipDelay = true)
+            }
+        }
     }
 
     private fun startCreateSiteService(previousState: SiteCreationServiceState? = null) {
         if (networkUtils.isNetworkAvailable()) {
             siteCreationState.apply {
+                // A non-null [segmentId] may invalidate the [siteDesign] selection
+                // https://github.com/wordpress-mobile/WordPress-Android/issues/13749
+                val segmentIdentifier = if (siteDesign != null) null else segmentId
                 val serviceData = SiteCreationServiceData(
-                        segmentId,
+                        segmentIdentifier,
+                        siteDesign,
                         urlWithoutScheme
                 )
                 _startCreateSiteService.value = SitePreviewStartServiceData(serviceData, previousState)
@@ -222,21 +254,23 @@ class SitePreviewViewModel @Inject constructor(
         }
     }
 
-    private fun startPreLoadingWebView() {
-        tracker.trackPreviewLoading()
+    private fun startPreLoadingWebView(skipDelay: Boolean = false) {
+        tracker.trackPreviewLoading(siteCreationState.siteDesign)
         launch {
-            /**
-             * Keep showing the full screen loading screen for 1 more second or until the webview is loaded whichever
-             * happens first. This will give us some more time to fetch the newly created site.
-             */
-            delay(DELAY_TO_SHOW_WEB_VIEW_LOADING_SHIMMER)
+            if (!skipDelay) {
+                /**
+                 * Keep showing the full screen loading screen for 1 more second or until the webview is loaded
+                 * whichever happens first. This will give us some more time to fetch the newly created site.
+                 */
+                delay(DELAY_TO_SHOW_WEB_VIEW_LOADING_SHIMMER)
+            }
             /**
              * If the webview is still not loaded after some delay, we'll show the loading shimmer animation instead
              * of the full screen progress, so the user is not blocked for taking actions.
              */
             withContext(mainDispatcher) {
                 if (uiState.value !is SitePreviewContentUiState) {
-                    tracker.trackPreviewWebviewShown()
+                    tracker.trackPreviewWebviewShown(siteCreationState.siteDesign)
                     updateUiState(SitePreviewLoadingShimmerState(createSitePreviewData()))
                 }
             }
@@ -251,13 +285,9 @@ class SitePreviewViewModel @Inject constructor(
     }
 
     fun onUrlLoaded() {
-        _hideGetStartedBar.call()
         if (!webviewFullyLoadedTracked) {
             webviewFullyLoadedTracked = true
-            tracker.trackPreviewWebviewFullyLoaded()
-        }
-        if (uiState.value is SitePreviewFullscreenProgressUiState) {
-            tracker.trackPreviewWebviewShown()
+            tracker.trackPreviewWebviewFullyLoaded(siteCreationState.siteDesign)
         }
         /**
          * Update the ui state if the loading or error screen is being shown.
@@ -382,10 +412,11 @@ class SitePreviewViewModel @Inject constructor(
         val previousState: SiteCreationServiceState?
     )
 
-    sealed class CreateSiteState {
+    sealed class CreateSiteState : Parcelable {
         /**
          * CreateSite request haven't finished yet or failed.
          */
+        @Parcelize
         object SiteNotCreated : CreateSiteState()
 
         /**
@@ -393,11 +424,13 @@ class SitePreviewViewModel @Inject constructor(
          * Since we fetch the site without user awareness in background, the user may potentially leave the screen
          * before the request is finished.
          */
+        @Parcelize
         data class SiteNotInLocalDb(val remoteSiteId: Long) : CreateSiteState()
 
         /**
          * The site has been successfully created and stored into local db.
          */
+        @Parcelize
         data class SiteCreationCompleted(val localSiteId: Int) : CreateSiteState()
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SegmentsScreenListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SegmentsScreenListener.kt
deleted file mode 100644
index 9508e82ab7a0..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SegmentsScreenListener.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.wordpress.android.ui.sitecreation.segments
-
-interface SegmentsScreenListener {
-    fun onSegmentSelected(segmentId: Long)
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentViewHolder.kt
deleted file mode 100644
index 2e92367af419..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentViewHolder.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.wordpress.android.ui.sitecreation.segments
-
-import android.graphics.drawable.Drawable
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.ImageView.ScaleType
-import android.widget.TextView
-import androidx.annotation.LayoutRes
-import androidx.recyclerview.widget.RecyclerView
-import org.wordpress.android.R
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.HeaderUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.SegmentUiState
-import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.util.image.ImageManager.RequestListener
-import org.wordpress.android.util.image.ImageType.ICON
-
-sealed class SiteCreationSegmentViewHolder(internal val parent: ViewGroup, @LayoutRes layout: Int) :
-        RecyclerView.ViewHolder(
-                LayoutInflater.from(parent.context).inflate(
-                        layout,
-                        parent,
-                        false
-                )
-        ) {
-    abstract fun onBind(uiState: SegmentsItemUiState)
-
-    class SegmentsItemViewHolder(
-        parentView: ViewGroup,
-        private val imageManager: ImageManager
-    ) : SiteCreationSegmentViewHolder(parentView, R.layout.site_creation_segment_item) {
-        private val container = itemView.findViewById<ViewGroup>(R.id.container)
-        private val icon = itemView.findViewById<ImageView>(R.id.icon)
-        private val title = itemView.findViewById<TextView>(R.id.title)
-        private val subtitle = itemView.findViewById<TextView>(R.id.subtitle)
-        private val divider = itemView.findViewById<View>(R.id.divider)
-
-        override fun onBind(uiState: SegmentsItemUiState) {
-            uiState as SegmentUiState
-            title.text = uiState.title
-            subtitle.text = uiState.subtitle
-            imageManager.loadWithResultListener(
-                    icon,
-                    ICON,
-                    uiState.iconUrl,
-                    ScaleType.CENTER,
-                    null,
-                    object : RequestListener<Drawable> {
-                        override fun onLoadFailed(e: Exception?, model: Any?) {
-                        }
-
-                        override fun onResourceReady(resource: Drawable, model: Any?) {
-                            // At the moment, we should not use colors that come from server to style our icons,
-                            // since they interfere with themes. We should uncomment this when ability to request icon
-                            // colors based on current app theme will be implemented.
-                            // try {
-                            //    icon.setColorFilter(Color.parseColor(uiState.iconColor), PorterDuff.Mode.SRC_IN)
-                            // } catch (e: IllegalArgumentException) {
-                            //    AppLog.e(
-                            //            AppLog.T.SITE_CREATION,
-                            //            "Error parsing segment icon color: ${uiState.iconColor}"
-                            //    )
-                            // }
-                        }
-                    }
-            )
-            requireNotNull(uiState.onItemTapped) { "OnItemTapped is required." }
-            container.setOnClickListener {
-                uiState.onItemTapped!!.invoke()
-            }
-            divider.visibility = if (uiState.showDivider) View.VISIBLE else View.GONE
-        }
-    }
-
-    class SegmentsHeaderViewHolder(
-        parentView: ViewGroup
-    ) : SiteCreationSegmentViewHolder(parentView, R.layout.site_creation_header_item) {
-        private val title = itemView.findViewById<TextView>(R.id.title)
-        private val subtitle = itemView.findViewById<TextView>(R.id.subtitle)
-
-        override fun onBind(uiState: SegmentsItemUiState) {
-            uiState as HeaderUiState
-            title.text = parent.context.getText(uiState.titleResId)
-            subtitle.text = parent.context.getText(uiState.subtitleResId)
-        }
-    }
-
-    class SegmentsProgressViewHolder(
-        parentView: ViewGroup
-    ) : SiteCreationSegmentViewHolder(parentView, R.layout.site_creation_segments_progress) {
-        override fun onBind(uiState: SegmentsItemUiState) {}
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsAdapter.kt
deleted file mode 100644
index 02193bbedd86..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsAdapter.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.wordpress.android.ui.sitecreation.segments
-
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView.Adapter
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.HeaderUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.ProgressUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.SegmentUiState
-import org.wordpress.android.ui.sitecreation.segments.SiteCreationSegmentViewHolder.SegmentsHeaderViewHolder
-import org.wordpress.android.ui.sitecreation.segments.SiteCreationSegmentViewHolder.SegmentsItemViewHolder
-import org.wordpress.android.ui.sitecreation.segments.SiteCreationSegmentViewHolder.SegmentsProgressViewHolder
-import org.wordpress.android.util.image.ImageManager
-
-private const val headerViewType: Int = 1
-private const val progressViewType: Int = 2
-private const val segmentViewType: Int = 3
-
-class SiteCreationSegmentsAdapter(
-    private val imageManager: ImageManager
-) : Adapter<SiteCreationSegmentViewHolder>() {
-    private val items = mutableListOf<SegmentsItemUiState>()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SiteCreationSegmentViewHolder {
-        return when (viewType) {
-            headerViewType -> SegmentsHeaderViewHolder(parent)
-            progressViewType -> SegmentsProgressViewHolder(parent)
-            segmentViewType -> SegmentsItemViewHolder(parent, imageManager)
-            else -> throw NotImplementedError("Unknown ViewType")
-        }
-    }
-
-    override fun getItemCount(): Int = items.size
-
-    override fun onBindViewHolder(holder: SiteCreationSegmentViewHolder, position: Int) {
-        holder.onBind(items[position])
-    }
-
-    fun update(newItems: List<SegmentsItemUiState>) {
-        val diffResult = DiffUtil.calculateDiff(SegmentsDiffUtils(items.toList(), newItems))
-        items.clear()
-        items.addAll(newItems)
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return when (items[position]) {
-            is HeaderUiState -> headerViewType
-            is ProgressUiState -> progressViewType
-            is SegmentUiState -> segmentViewType
-        }
-    }
-
-    private class SegmentsDiffUtils(
-        val oldItems: List<SegmentsItemUiState>,
-        val newItems: List<SegmentsItemUiState>
-    ) : DiffUtil.Callback() {
-        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            val oldItem = oldItems[oldItemPosition]
-            val newItem = newItems[newItemPosition]
-            if (oldItem::class != newItem::class) {
-                return false
-            }
-            return when (oldItem) {
-                is HeaderUiState -> true // it's an object
-                is ProgressUiState -> true // it's an object
-                is SegmentUiState -> oldItem.segmentId == (newItem as SegmentUiState).segmentId
-            }
-        }
-
-        override fun getOldListSize(): Int = oldItems.size
-
-        override fun getNewListSize(): Int = newItems.size
-
-        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-            return oldItems[oldItemPosition] == newItems[newItemPosition]
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsFragment.kt
deleted file mode 100644
index b7821b31d1a1..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsFragment.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.wordpress.android.ui.sitecreation.segments
-
-import android.content.Context
-import android.os.Bundle
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.LayoutRes
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.fullscreen_error_with_retry.*
-import kotlinx.android.synthetic.main.site_creation_segments_screen.*
-import org.wordpress.android.R
-import org.wordpress.android.WordPress
-import org.wordpress.android.ui.accounts.HelpActivity
-import org.wordpress.android.ui.sitecreation.SiteCreationBaseFormFragment
-import org.wordpress.android.ui.sitecreation.misc.OnHelpClickedListener
-import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsContentUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsErrorUiState
-import org.wordpress.android.ui.utils.UiHelpers
-import org.wordpress.android.util.image.ImageManager
-import javax.inject.Inject
-
-class SiteCreationSegmentsFragment : SiteCreationBaseFormFragment() {
-    private lateinit var viewModel: SiteCreationSegmentsViewModel
-
-    @Inject internal lateinit var imageManager: ImageManager
-    @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory
-    @Inject internal lateinit var uiHelpers: UiHelpers
-
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-        if (context !is OnHelpClickedListener) {
-            throw IllegalStateException("Parent activity must implement OnHelpClickedListener.")
-        }
-        if (context !is SegmentsScreenListener) {
-            throw IllegalStateException("Parent activity must implement SegmentsScreenListener.")
-        }
-    }
-
-    @LayoutRes
-    override fun getContentLayout(): Int {
-        return R.layout.site_creation_segments_screen
-    }
-
-    override fun setupContent(rootView: ViewGroup) {
-        initRecyclerView()
-        initViewModel()
-        initRetryButton()
-    }
-
-    private fun initRecyclerView() {
-        recycler_view.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
-        initAdapter()
-    }
-
-    private fun initAdapter() {
-        val adapter = SiteCreationSegmentsAdapter(imageManager = imageManager)
-        recycler_view.adapter = adapter
-    }
-
-    private fun initViewModel() {
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
-                .get(SiteCreationSegmentsViewModel::class.java)
-
-        viewModel.segmentsUiState.observe(this, Observer { state ->
-            state?.let { uiState ->
-                when (uiState) {
-                    is SegmentsContentUiState -> {
-                        recycler_view.visibility = View.VISIBLE
-                        error_layout.visibility = View.GONE
-                        updateContentLayout(uiState)
-                    }
-                    is SegmentsErrorUiState -> {
-                        recycler_view.visibility = View.GONE
-                        error_layout.visibility = View.VISIBLE
-                        updateErrorLayout(uiState)
-                    }
-                }
-            }
-        })
-        viewModel.segmentSelected.observe(
-                this,
-                Observer { segmentId ->
-                    segmentId?.let {
-                        (requireActivity() as SegmentsScreenListener).onSegmentSelected(segmentId)
-                    }
-                })
-        viewModel.onHelpClicked.observe(this, Observer {
-            (requireActivity() as OnHelpClickedListener).onHelpClicked(HelpActivity.Origin.SITE_CREATION_SEGMENTS)
-        })
-        viewModel.start()
-    }
-
-    private fun updateErrorLayout(errorUiStateState: SegmentsErrorUiState) {
-        uiHelpers.setTextOrHide(error_title, errorUiStateState.titleResId)
-        uiHelpers.setTextOrHide(error_subtitle, errorUiStateState.subtitleResId)
-    }
-
-    private fun initRetryButton() {
-        error_retry.setOnClickListener { viewModel.onRetryClicked() }
-    }
-
-    override fun onHelp() {
-        viewModel.onHelpClicked()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        (requireActivity().application as WordPress).component().inject(this)
-    }
-
-    private fun updateContentLayout(segments: SegmentsContentUiState) {
-        (recycler_view.adapter as SiteCreationSegmentsAdapter).update(segments.items)
-    }
-
-    override fun getScreenTitle(): String {
-        return arguments?.getString(EXTRA_SCREEN_TITLE)
-                ?: throw IllegalStateException("Required argument screen title is missing.")
-    }
-
-    companion object {
-        const val TAG = "site_creation_segment_fragment_tag"
-
-        fun newInstance(screenTitle: String): SiteCreationSegmentsFragment {
-            val fragment = SiteCreationSegmentsFragment()
-            val bundle = Bundle()
-            bundle.putString(EXTRA_SCREEN_TITLE, screenTitle)
-            fragment.arguments = bundle
-            return fragment
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsViewModel.kt
deleted file mode 100644
index 01470d99846c..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsViewModel.kt
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.wordpress.android.ui.sitecreation.segments
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.R
-import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.model.vertical.VerticalSegmentModel
-import org.wordpress.android.fluxc.store.VerticalStore.OnSegmentsFetched
-import org.wordpress.android.models.networkresource.ListState
-import org.wordpress.android.models.networkresource.ListState.Loading
-import org.wordpress.android.modules.BG_THREAD
-import org.wordpress.android.modules.UI_THREAD
-import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType
-import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.HeaderUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.ProgressUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.SegmentUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsContentUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsErrorUiState
-import org.wordpress.android.ui.sitecreation.usecases.FetchSegmentsUseCase
-import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.viewmodel.SingleLiveEvent
-import javax.inject.Inject
-import javax.inject.Named
-import kotlin.coroutines.CoroutineContext
-
-private const val CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE = 1000L
-private const val ERROR_CONTEXT = "segments"
-
-class SiteCreationSegmentsViewModel
-@Inject constructor(
-    private val networkUtils: NetworkUtilsWrapper,
-    private val dispatcher: Dispatcher,
-    private val fetchSegmentsUseCase: FetchSegmentsUseCase,
-    private val tracker: SiteCreationTracker,
-    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
-    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
-) : ViewModel(), CoroutineScope {
-    private val fetchCategoriesJob: Job = Job()
-    override val coroutineContext: CoroutineContext
-        get() = bgDispatcher + fetchCategoriesJob
-
-    private var isStarted = false
-    /* Should be updated only within updateUIState(). */
-    private var listState: ListState<VerticalSegmentModel> = ListState.Ready(emptyList())
-
-    private val _segmentsUiState: MutableLiveData<SegmentsUiState> = MutableLiveData()
-    val segmentsUiState: LiveData<SegmentsUiState> = _segmentsUiState
-
-    private val _segmentSelected = SingleLiveEvent<Long>()
-    val segmentSelected: LiveData<Long> = _segmentSelected
-
-    private val _onHelpClicked = SingleLiveEvent<Unit>()
-    val onHelpClicked: LiveData<Unit> = _onHelpClicked
-
-    fun start() {
-        if (isStarted) return
-        isStarted = true
-        fetchCategories()
-    }
-
-    init {
-        dispatcher.register(fetchSegmentsUseCase)
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        fetchCategoriesJob.cancel() // cancels all coroutines with the default coroutineContext
-        dispatcher.unregister(fetchSegmentsUseCase)
-    }
-
-    private fun fetchCategories() {
-        if (!listState.shouldFetch(loadMore = false)) {
-            if (BuildConfig.DEBUG) {
-                throw IllegalStateException("Fetch already in progress.")
-            } else {
-                return
-            }
-        }
-        if (networkUtils.isNetworkAvailable()) {
-            updateUiStateToContent(Loading(listState))
-            launch {
-                val event = fetchSegmentsUseCase.fetchCategories()
-                withContext(mainDispatcher) {
-                    onCategoriesFetched(event)
-                }
-            }
-        } else {
-            updateUiStateToContent(Loading(listState))
-            launch {
-                // We show the loading screen for a bit so the user has some feedback when they press the retry button
-                delay(CONNECTION_ERROR_DELAY_TO_SHOW_LOADING_STATE)
-                tracker.trackErrorShown(ERROR_CONTEXT, SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR)
-                withContext(mainDispatcher) {
-                    updateUiStateToError(
-                            ListState.Error(listState, null),
-                            SegmentsErrorUiState.SegmentsConnectionErrorUiState
-                    )
-                }
-            }
-        }
-    }
-
-    private fun onCategoriesFetched(event: OnSegmentsFetched) {
-        if (event.isError) {
-            tracker.trackErrorShown(
-                    ERROR_CONTEXT,
-                    event.error.type.toString(),
-                    event.error.message
-            )
-            updateUiStateToError(
-                    ListState.Error(listState, event.error.message),
-                    SegmentsErrorUiState.SegmentsGenericErrorUiState
-            )
-        } else {
-            tracker.trackSegmentsViewed()
-            val segments = event.segmentList.filter { it.isMobileSegment }
-            updateUiStateToContent(ListState.Success(segments))
-        }
-    }
-
-    fun onRetryClicked() {
-        fetchCategories()
-    }
-
-    fun onHelpClicked() {
-        _onHelpClicked.call()
-    }
-
-    private fun onSegmentSelected(segmentTitle: String, segmentId: Long) {
-        tracker.trackSegmentSelected(segmentTitle, segmentId)
-        _segmentSelected.value = segmentId
-    }
-
-    private fun updateUiStateToError(state: ListState<VerticalSegmentModel>, segmentError: SegmentsErrorUiState) {
-        listState = state
-        _segmentsUiState.value = segmentError
-    }
-
-    private fun updateUiStateToContent(state: ListState<VerticalSegmentModel>) {
-        listState = state
-        _segmentsUiState.value = SegmentsContentUiState(
-                createUiStatesForItems(
-                        showProgress = state is Loading,
-                        segments = state.data
-                )
-        )
-    }
-
-    private fun createUiStatesForItems(
-        showProgress: Boolean,
-        segments: List<VerticalSegmentModel>
-    ): List<SegmentsItemUiState> {
-        val items: ArrayList<SegmentsItemUiState> = ArrayList()
-        addHeader(items)
-        if (showProgress) {
-            addProgress(items)
-        }
-        addSegments(segments, items)
-        return items
-    }
-
-    private fun addHeader(items: ArrayList<SegmentsItemUiState>) {
-        items.add(HeaderUiState)
-    }
-
-    private fun addProgress(items: ArrayList<SegmentsItemUiState>) {
-        items.add(ProgressUiState)
-    }
-
-    private fun addSegments(
-        segments: List<VerticalSegmentModel>,
-        items: ArrayList<SegmentsItemUiState>
-    ) {
-        val segmentsCount = segments.size
-        segments.forEachIndexed { index, model ->
-            val isLastItem = segmentsCount - 1 == index
-            val segment = SegmentUiState(
-                    model.segmentId,
-                    model.title,
-                    model.subtitle,
-                    model.iconUrl,
-                    model.iconColor,
-                    showDivider = !isLastItem
-            )
-            segment.onItemTapped = { onSegmentSelected(model.title, model.segmentId) }
-            items.add(segment)
-        }
-    }
-}
-
-sealed class SegmentsUiState {
-    data class SegmentsContentUiState(val items: List<SegmentsItemUiState>) : SegmentsUiState()
-    sealed class SegmentsErrorUiState constructor(
-        val titleResId: Int,
-        val subtitleResId: Int? = null
-    ) : SegmentsUiState() {
-        object SegmentsGenericErrorUiState : SegmentsErrorUiState(
-                R.string.site_creation_error_generic_title,
-                R.string.site_creation_error_generic_subtitle
-        )
-
-        object SegmentsConnectionErrorUiState : SegmentsErrorUiState(R.string.no_network_message)
-    }
-}
-
-sealed class SegmentsItemUiState {
-    object HeaderUiState : SegmentsItemUiState() {
-        const val titleResId: Int = R.string.site_creation_segments_title
-        const val subtitleResId: Int = R.string.site_creation_segments_subtitle
-    }
-
-    object ProgressUiState : SegmentsItemUiState()
-
-    data class SegmentUiState(
-        val segmentId: Long,
-        val title: String,
-        val subtitle: String,
-        val iconUrl: String,
-        val iconColor: String,
-        val showDivider: Boolean
-    ) : SegmentsItemUiState() {
-        var onItemTapped: (() -> Unit)? = null
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceData.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceData.kt
index edef246e6d90..d6fcfc12f7e4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceData.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceData.kt
@@ -8,5 +8,6 @@ import kotlinx.android.parcel.Parcelize
 @SuppressLint("ParcelCreator")
 data class SiteCreationServiceData(
     val segmentId: Long?,
+    val siteDesign: String?,
     val domain: String
 ) : Parcelable
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManager.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManager.kt
index 26558e6b453c..9b013d6f224b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManager.kt
@@ -84,7 +84,7 @@ class SiteCreationServiceManager @Inject constructor(
                 updateServiceState(SUCCESS, newSiteRemoteId)
                 // This stat is part of a funnel that provides critical information.  Before
                 // making ANY modification to this stat please refer to: p4qSXL-35X-p2
-                tracker.trackSiteCreated()
+                tracker.trackSiteCreated(siteData.siteDesign)
             }
             FAILURE -> {
                 val currentState = serviceListener.getCurrentState()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceNotification.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceNotification.kt
index efae578de59b..28f685a6a2be 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceNotification.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceNotification.kt
@@ -8,7 +8,7 @@ import org.wordpress.android.util.AutoForegroundNotification
 object SiteCreationServiceNotification {
     private const val channelResId = R.string.notification_channel_normal_id
     private const val colorResId = R.color.primary_50
-    private const val drawableResId = R.drawable.ic_my_sites_white_24dp
+    private const val drawableResId = R.drawable.ic_app_white_24dp
 
     fun createCreatingSiteNotification(context: Context): Notification {
         return AutoForegroundNotification.progressIndeterminate(
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/DesignPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/DesignPreviewFragment.kt
new file mode 100644
index 000000000000..54726a6ee1d7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/DesignPreviewFragment.kt
@@ -0,0 +1,39 @@
+package org.wordpress.android.ui.sitecreation.theme
+
+import android.content.Context
+import android.os.Bundle
+import android.view.View
+import androidx.lifecycle.ViewModelProvider
+import kotlinx.android.synthetic.main.layout_picker_preview_fragment.*
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.ui.layoutpicker.LayoutPreviewFragment
+import javax.inject.Inject
+
+/**
+ * Implements the Home Page Picker Design Preview UI
+ */
+class DesignPreviewFragment : LayoutPreviewFragment() {
+    @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
+    private lateinit var viewModel: HomePagePickerViewModel
+
+    companion object {
+        const val DESIGN_PREVIEW_TAG = "DESIGN_PREVIEW_TAG"
+
+        fun newInstance() = DesignPreviewFragment()
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        chooseButton.setText(R.string.hpp_choose_button)
+
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory).get(HomePagePickerViewModel::class.java)
+        setViewModel(viewModel)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+        (requireActivity().applicationContext as WordPress).component().inject(this)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerAdapter.kt
deleted file mode 100644
index 674fa1f2b874..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerAdapter.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.wordpress.android.ui.sitecreation.theme
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView.Adapter
-import org.wordpress.android.R
-import org.wordpress.android.util.image.ImageManager
-
-class HomePagePickerAdapter(val imageManager: ImageManager, val thumbDimensionProvider: ThumbDimensionProvider) :
-        Adapter<HomePagePickerViewHolder>() {
-    private var layouts: List<LayoutGridItemUiState> = listOf()
-
-    fun setData(data: List<LayoutGridItemUiState>) {
-        val diffResult = DiffUtil.calculateDiff(LayoutsDiffCallback(layouts, data))
-        layouts = data
-        diffResult.dispatchUpdatesTo(this)
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): HomePagePickerViewHolder {
-        val view = LayoutInflater.from(parent.context).inflate(R.layout.home_page_picker_item, parent, false)
-        val height = thumbDimensionProvider.height
-        val width = thumbDimensionProvider.width
-        val image = view.findViewById<View>(R.id.preview)
-        image.minimumHeight = height
-        image.minimumWidth = width
-        view.minimumHeight = height
-        view.minimumWidth = width
-        return HomePagePickerViewHolder(view, parent)
-    }
-
-    override fun onBindViewHolder(holder: HomePagePickerViewHolder, position: Int) {
-        holder.onBind(layouts[position], imageManager)
-    }
-
-    override fun getItemCount(): Int = layouts.size
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
index e97f19cdfdd4..f5e9e5f804c4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerFragment.kt
@@ -2,31 +2,38 @@ package org.wordpress.android.ui.sitecreation.theme
 
 import android.content.Context
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.lifecycle.Observer
+import androidx.core.view.ViewCompat
+import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout
 import kotlinx.android.synthetic.main.home_page_picker_bottom_toolbar.*
 import kotlinx.android.synthetic.main.home_page_picker_fragment.*
-import kotlinx.android.synthetic.main.home_page_picker_loading_skeleton.*
 import kotlinx.android.synthetic.main.home_page_picker_titlebar.*
+import kotlinx.android.synthetic.main.modal_layout_picker_categories_skeleton.*
+import kotlinx.android.synthetic.main.modal_layout_picker_layouts_skeleton.*
 import kotlinx.android.synthetic.main.modal_layout_picker_subtitle_row.*
 import kotlinx.android.synthetic.main.modal_layout_picker_title_row.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
-import org.wordpress.android.fluxc.model.StarterDesignModel
-import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel.UiState
+import org.wordpress.android.ui.PreviewModeSelectorPopup
+import org.wordpress.android.ui.layoutpicker.CategoriesAdapter
+import org.wordpress.android.ui.layoutpicker.LayoutCategoryAdapter
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
+import org.wordpress.android.ui.sitecreation.theme.DesignPreviewFragment.Companion.DESIGN_PREVIEW_TAG
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Dismiss
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Show
+import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.AniUtils
-import org.wordpress.android.util.AniUtils.Duration
 import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.setVisible
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 /**
@@ -35,41 +42,42 @@ import javax.inject.Inject
 class HomePagePickerFragment : Fragment() {
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var displayUtils: DisplayUtilsWrapper
-    @Inject lateinit var thumbDimensionProvider: ThumbDimensionProvider
+    @Inject internal lateinit var uiHelper: UiHelpers
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: HomePagePickerViewModel
-
-    companion object {
-        const val FETCHED_LAYOUTS = "FETCHED_LAYOUTS"
-        const val SELECTED_LAYOUT = "SELECTED_LAYOUT"
-    }
+    private lateinit var previewModeSelectorPopup: PreviewModeSelectorPopup
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        val view = inflater.inflate(R.layout.home_page_picker_fragment, container, false)
-        val skeletonCardView = view.findViewById<View>(R.id.skeletonCardView)
-        skeletonCardView.minimumHeight = thumbDimensionProvider.height
-        skeletonCardView.minimumWidth = thumbDimensionProvider.width
-        (skeletonCardView.layoutParams as? ViewGroup.MarginLayoutParams)?.let {
-            it.marginStart = thumbDimensionProvider.calculatedStartMargin
-        }
-        return view
+        return inflater.inflate(R.layout.home_page_picker_fragment, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        categoriesRecyclerView.apply {
+            layoutManager = LinearLayoutManager(
+                    context,
+                    RecyclerView.HORIZONTAL,
+                    false
+            )
+            setRecycledViewPool(RecyclerView.RecycledViewPool())
+            adapter = CategoriesAdapter()
+            ViewCompat.setNestedScrollingEnabled(this, false)
+        }
+
         layoutsRecyclerView.apply {
-            adapter = HomePagePickerAdapter(imageManager, thumbDimensionProvider)
-            layoutManager = GridLayoutManager(activity, thumbDimensionProvider.columns)
+            layoutManager = LinearLayoutManager(requireActivity())
+            adapter = LayoutCategoryAdapter()
         }
 
         setupUi()
+        setupViewModel()
         setupActionListeners()
-        setupViewModel(savedInstanceState)
+        previewModeSelectorPopup = PreviewModeSelectorPopup(requireActivity(), previewTypeSelectorButton)
     }
 
     override fun onAttach(context: Context) {
@@ -77,47 +85,63 @@ class HomePagePickerFragment : Fragment() {
         (requireActivity().applicationContext as WordPress).component().inject(this)
     }
 
-    override fun onSaveInstanceState(outState: Bundle) {
-        (viewModel.uiState.value as? UiState.Content)?.let {
-            outState.putParcelableArrayList(FETCHED_LAYOUTS, ArrayList(viewModel.layouts))
-            outState.putString(SELECTED_LAYOUT, it.selectedLayoutSlug)
-        }
-        super.onSaveInstanceState(outState)
+    private fun setContentVisibility(skeleton: Boolean, error: Boolean) {
+        categoriesSkeleton.setVisible(skeleton)
+        categoriesRecyclerView.setVisible(!skeleton && !error)
+        layoutsSkeleton.setVisible(skeleton)
+        layoutsRecyclerView.setVisible(!skeleton && !error)
+        errorView.setVisible(error)
     }
 
-    private fun setupViewModel(savedInstanceState: Bundle?) {
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+    private fun setupViewModel() {
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(HomePagePickerViewModel::class.java)
 
-        viewModel.uiState.observe(viewLifecycleOwner, Observer { uiState ->
-            setTitleVisibility(uiState.isHeaderVisible)
+        viewModel.uiState.observe(viewLifecycleOwner, { uiState ->
+            uiHelper.fadeInfadeOutViews(title, header, uiState.isHeaderVisible)
             description?.visibility = if (uiState.isDescriptionVisible) View.VISIBLE else View.INVISIBLE
-            loadingIndicator.setVisible(uiState.loadingIndicatorVisible)
-            errorView.setVisible(uiState.errorViewVisible)
-            layoutsRecyclerView.setVisible(!uiState.loadingIndicatorVisible && !uiState.errorViewVisible)
+            setContentVisibility(uiState.loadingSkeletonVisible, uiState.errorViewVisible)
             AniUtils.animateBottomBar(bottomToolbar, uiState.isToolbarVisible)
             when (uiState) {
-                is UiState.Loading -> {}
-                is UiState.Content -> {
-                    (layoutsRecyclerView.adapter as? HomePagePickerAdapter)?.setData(uiState.layouts)
+                is LayoutPickerUiState.Loading -> { // Nothing more to do here
+                }
+                is LayoutPickerUiState.Content -> {
+                    (categoriesRecyclerView.adapter as CategoriesAdapter).setData(uiState.categories)
+                    (layoutsRecyclerView?.adapter as? LayoutCategoryAdapter)?.update(uiState.layoutCategories)
                 }
-                is UiState.Error -> {
+                is LayoutPickerUiState.Error -> {
                     uiState.toast?.let { ToastUtils.showToast(requireContext(), it) }
                 }
             }
         })
 
-        savedInstanceState?.let {
-            val layouts = it.getParcelableArrayList<StarterDesignModel>(FETCHED_LAYOUTS)
-            val selected = it.getString(SELECTED_LAYOUT)
-            viewModel.loadSavedState(layouts, selected)
-        } ?: run {
-            viewModel.start()
-        }
+        viewModel.onPreviewActionPressed.observe(viewLifecycleOwner, { action ->
+            activity?.supportFragmentManager?.let { fm ->
+                when (action) {
+                    is Show -> {
+                        val previewFragment = DesignPreviewFragment.newInstance()
+                        previewFragment.show(fm, DESIGN_PREVIEW_TAG)
+                    }
+                    is Dismiss -> {
+                        (fm.findFragmentByTag(DESIGN_PREVIEW_TAG) as? DesignPreviewFragment)?.dismiss()
+                    }
+                }
+            }
+        })
+
+        viewModel.onThumbnailModeButtonPressed.observe(viewLifecycleOwner, {
+            previewModeSelectorPopup.show(viewModel)
+        })
+
+        viewModel.onCategorySelectionChanged.observeEvent(viewLifecycleOwner, {
+                layoutsRecyclerView?.smoothScrollToPosition(0)
+        })
+
+        viewModel.start(displayUtils.isTablet())
     }
 
     private fun setupUi() {
-        title?.setVisible(isPhoneLandscape())
+        title?.visibility = if (isPhoneLandscape()) View.VISIBLE else View.INVISIBLE
         header?.setText(R.string.hpp_title)
         description?.setText(R.string.hpp_subtitle)
     }
@@ -127,10 +151,8 @@ class HomePagePickerFragment : Fragment() {
         chooseButton.setOnClickListener { viewModel.onChooseTapped() }
         skipButton.setOnClickListener { viewModel.onSkippedTapped() }
         errorView.button.setOnClickListener { viewModel.onRetryClicked() }
-        backButton.setOnClickListener {
-            requireActivity().onBackPressed() // FIXME: This is temporary for PR #13192
-            viewModel.onBackPressed()
-        }
+        backButton.setOnClickListener { viewModel.onBackPressed() }
+        previewTypeSelectorButton.setOnClickListener { viewModel.onThumbnailModePressed() }
         setScrollListener()
     }
 
@@ -140,18 +162,8 @@ class HomePagePickerFragment : Fragment() {
         appBarLayout.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { _, verticalOffset ->
             viewModel.onAppBarOffsetChanged(verticalOffset, scrollThreshold)
         })
+        viewModel.onAppBarOffsetChanged(0, scrollThreshold)
     }
 
-    private fun setTitleVisibility(visible: Boolean) {
-        if (title == null || header == null || visible == (title.visibility == View.VISIBLE)) return // No change
-        if (visible) {
-            AniUtils.fadeIn(title, Duration.SHORT)
-            AniUtils.fadeOut(header, Duration.SHORT, View.INVISIBLE)
-        } else {
-            AniUtils.fadeIn(header, Duration.SHORT)
-            AniUtils.fadeOut(title, Duration.SHORT, View.INVISIBLE)
-        }
-    }
-
-    private fun isPhoneLandscape() = displayUtils.isLandscape() && !displayUtils.isTablet()
+    private fun isPhoneLandscape() = displayUtils.isLandscapeBySize() && !displayUtils.isTablet()
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewHolder.kt
deleted file mode 100644
index d91e1e57c239..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewHolder.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.wordpress.android.ui.sitecreation.theme
-
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import android.widget.ImageView.ScaleType.FIT_CENTER
-import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.home_page_picker_item.view.*
-import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.util.image.ImageManager.RequestListener
-import org.wordpress.android.util.image.ImageType
-import org.wordpress.android.util.setVisible
-
-class HomePagePickerViewHolder(view: View, val parent: ViewGroup) : RecyclerView.ViewHolder(view) {
-    private val container: View = itemView.layout_container
-    private val preview: ImageView = itemView.preview
-    private val selected: ImageView = itemView.selected_overlay
-
-    fun onBind(
-        uiState: LayoutGridItemUiState,
-        imageManager: ImageManager
-    ) {
-        imageManager.loadWithResultListener(preview, ImageType.THEME, uiState.preview, FIT_CENTER, null,
-                object : RequestListener<Drawable> {
-                    override fun onLoadFailed(e: Exception?, model: Any?) {
-                    }
-
-                    override fun onResourceReady(resource: Drawable, model: Any?) {
-                        uiState.onThumbnailReady()
-                    }
-                })
-
-        selected.setVisible(uiState.selectedOverlayVisible)
-        preview.contentDescription = parent.context.getString(uiState.contentDescriptionResId, uiState.title)
-        container.setOnClickListener {
-            uiState.onItemTapped()
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
index 22683d864cac..94a7d9c0449d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModel.kt
@@ -1,40 +1,52 @@
 package org.wordpress.android.ui.sitecreation.theme
 
-import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.model.StarterDesignModel
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.INTERNET_UNAVAILABLE_ERROR
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationErrorType.UNKNOWN
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Loading
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel
+import org.wordpress.android.ui.layoutpicker.toLayoutCategories
+import org.wordpress.android.ui.layoutpicker.toLayoutModels
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
 import javax.inject.Named
-import kotlin.coroutines.CoroutineContext
+
+const val defaultTemplateSlug = "default"
+
+private const val ERROR_CONTEXT = "design"
 
 class HomePagePickerViewModel @Inject constructor(
-    private val networkUtils: NetworkUtilsWrapper,
+    override val networkUtils: NetworkUtilsWrapper,
     private val dispatcher: Dispatcher,
     private val fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase,
-    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
-    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
-) : ViewModel(), CoroutineScope {
-    private val fetchHomePageLayoutsJob = Job()
-    override val coroutineContext: CoroutineContext
-        get() = bgDispatcher + fetchHomePageLayoutsJob
+    private val analyticsTracker: SiteCreationTracker,
+    @Named(BG_THREAD) override val bgDispatcher: CoroutineDispatcher,
+    @Named(UI_THREAD) override val mainDispatcher: CoroutineDispatcher
+) : LayoutPickerViewModel(mainDispatcher, bgDispatcher, networkUtils, analyticsTracker) {
+    private val _onDesignActionPressed = SingleLiveEvent<DesignSelectionAction>()
+    val onDesignActionPressed: LiveData<DesignSelectionAction> = _onDesignActionPressed
+
+    private val _onBackButtonPressed = SingleLiveEvent<Unit>()
+    val onBackButtonPressed: LiveData<Unit> = _onBackButtonPressed
 
-    lateinit var layouts: List<StarterDesignModel>
+    override val useCachedData: Boolean = false
 
-    private val _uiState: MutableLiveData<UiState> = MutableLiveData()
-    val uiState: LiveData<UiState> = _uiState
+    sealed class DesignSelectionAction(val template: String) {
+        object Skip : DesignSelectionAction(defaultTemplateSlug)
+        class Choose(template: String) : DesignSelectionAction(template)
+    }
 
     init {
         dispatcher.register(fetchHomePageLayoutsUseCase)
@@ -42,147 +54,58 @@ class HomePagePickerViewModel @Inject constructor(
 
     override fun onCleared() {
         super.onCleared()
-        fetchHomePageLayoutsJob.cancel()
         dispatcher.unregister(fetchHomePageLayoutsUseCase)
     }
 
-    fun start() {
-        fetchLayouts()
+    fun start(isTablet: Boolean = false) {
+        initializePreviewMode(isTablet)
+        if (uiState.value !is Content) {
+            analyticsTracker.trackSiteDesignViewed(selectedPreviewMode().key)
+            fetchLayouts()
+        }
     }
 
-    private fun fetchLayouts() {
-        updateUiState(UiState.Loading)
+    override fun fetchLayouts(preferCache: Boolean) {
+        if (!networkUtils.isNetworkAvailable()) {
+            analyticsTracker.trackErrorShown(ERROR_CONTEXT, INTERNET_UNAVAILABLE_ERROR, "Retry error")
+            updateUiState(Error(toast = R.string.hpp_retry_error))
+            return
+        }
+        if (isLoading) return
+        updateUiState(Loading)
         launch {
             val event = fetchHomePageLayoutsUseCase.fetchStarterDesigns()
             withContext(mainDispatcher) {
                 if (event.isError) {
-                    updateUiState(UiState.Error())
+                    analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error fetching designs")
+                    updateUiState(Error())
                 } else {
-                    layouts = event.designs
-                    loadLayouts()
+                    handleResponse(event.designs.toLayoutModels(), event.categories.toLayoutCategories())
                 }
             }
         }
     }
 
-    private fun loadLayouts() {
-        val state = uiState.value as? UiState.Content ?: UiState.Content()
-        launch(bgDispatcher) {
-            val designs = layouts.filter { it.slug != null && it.screenshot != null }.map {
-                LayoutGridItemUiState(
-                        slug = it.slug!!,
-                        title = it.title ?: "",
-                        preview = it.screenshot!!,
-                        selected = it.slug == state.selectedLayoutSlug,
-                        onItemTapped = { onLayoutTapped(layoutSlug = it.slug!!) },
-                        onThumbnailReady = { onThumbnailReady(layoutSlug = it.slug!!) }
-                )
-            }
-            withContext(mainDispatcher) {
-                updateUiState(state.copy(layouts = designs))
-            }
-        }
-    }
-
-    /**
-     * Appbar scrolled event
-     * @param verticalOffset the scroll state vertical offset
-     * @param scrollThreshold the scroll threshold
-     */
-    fun onAppBarOffsetChanged(verticalOffset: Int, scrollThreshold: Int) {
-        setHeaderTitleVisibility(verticalOffset < scrollThreshold)
-    }
-
-    fun onPreviewTapped() {
-        // TODO
+    override fun onPreviewChooseTapped() {
+        super.onPreviewChooseTapped()
+        onChooseTapped()
     }
 
     fun onChooseTapped() {
-        // TODO
-    }
-
-    fun onSkippedTapped() {
-        // TODO
-    }
-
-    fun onBackPressed() {
-        // TODO
-    }
-
-    fun onRetryClicked() {
-        if (networkUtils.isNetworkAvailable()) {
-            fetchLayouts()
-        } else {
-            updateUiState(UiState.Error(toast = R.string.hpp_retry_error))
-        }
-    }
-
-    fun loadSavedState(layouts: List<StarterDesignModel>?, selected: String?) {
-        if (layouts == null || layouts.isEmpty()) {
-            fetchLayouts()
+        selectedLayout?.let { layout ->
+            val template = layout.slug
+            analyticsTracker.trackSiteDesignSelected(template)
+            _onDesignActionPressed.value = DesignSelectionAction.Choose(template)
             return
         }
-        val state = uiState.value as? UiState.Content ?: UiState.Content()
-        updateUiState(state.copy(selectedLayoutSlug = selected))
-        this.layouts = layouts
-        loadLayouts()
-    }
-
-    private fun updateUiState(uiState: UiState) {
-        _uiState.value = uiState
+        analyticsTracker.trackErrorShown(ERROR_CONTEXT, UNKNOWN, "Error choosing design")
+        updateUiState(Error(toast = R.string.hpp_choose_error))
     }
 
-    /**
-     * Layout tapped
-     * @param layoutSlug the slug of the tapped layout
-     */
-    fun onLayoutTapped(layoutSlug: String) {
-        (uiState.value as? UiState.Content)?.let { state ->
-            if (!state.loadedThumbnailSlugs.contains(layoutSlug)) return // No action
-            if (layoutSlug == state.selectedLayoutSlug) { // deselect
-                updateUiState(state.copy(selectedLayoutSlug = null, isToolbarVisible = false))
-            } else {
-                updateUiState(state.copy(selectedLayoutSlug = layoutSlug, isToolbarVisible = true))
-            }
-            loadLayouts()
-        }
-    }
-
-    /**
-     * Layout thumbnail is ready
-     * @param layoutSlug the slug of the tapped layout
-     */
-    fun onThumbnailReady(layoutSlug: String) {
-        (uiState.value as? UiState.Content)?.let { state ->
-            updateUiState(state.copy(loadedThumbnailSlugs = state.loadedThumbnailSlugs.apply { add(layoutSlug) }))
-        }
-    }
-
-    private fun setHeaderTitleVisibility(headerShouldBeVisible: Boolean) {
-        (uiState.value as? UiState.Content)?.let { state ->
-            if (state.isHeaderVisible == headerShouldBeVisible) return // No change
-            updateUiState(state.copy(isHeaderVisible = headerShouldBeVisible))
-        }
+    fun onSkippedTapped() {
+        analyticsTracker.trackSiteDesignSkipped()
+        _onDesignActionPressed.value = DesignSelectionAction.Skip
     }
 
-    sealed class UiState(
-        open val isHeaderVisible: Boolean = false,
-        open val isToolbarVisible: Boolean = false,
-        val isDescriptionVisible: Boolean = true,
-        val loadingIndicatorVisible: Boolean = false,
-        val errorViewVisible: Boolean = false
-    ) {
-        object Loading : UiState(loadingIndicatorVisible = true)
-
-        data class Content(
-            override val isHeaderVisible: Boolean = false,
-            override val isToolbarVisible: Boolean = false,
-            val selectedLayoutSlug: String? = null,
-            val loadedThumbnailSlugs: ArrayList<String> = arrayListOf(),
-            val layouts: List<LayoutGridItemUiState> = listOf()
-        ) : UiState()
-
-        class Error(@StringRes val toast: Int? = null) :
-                UiState(errorViewVisible = true, isHeaderVisible = true, isDescriptionVisible = false)
-    }
+    fun onBackPressed() = _onBackButtonPressed.call()
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/LayoutGridItemUiState.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/LayoutGridItemUiState.kt
deleted file mode 100644
index 0fbf84158140..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/LayoutGridItemUiState.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.wordpress.android.ui.sitecreation.theme
-
-import org.wordpress.android.R
-
-/**
- * The layout grid item
- */
-data class LayoutGridItemUiState(
-    val slug: String,
-    val title: String,
-    val preview: String,
-    val selected: Boolean,
-    val onItemTapped: () -> Unit,
-    val onThumbnailReady: () -> Unit
-) {
-    val contentDescriptionResId: Int
-        get() = if (selected) R.string.mlp_selected_description else R.string.mlp_notselected_description
-
-    val selectedOverlayVisible: Boolean
-        get() = selected
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/LayoutsDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/LayoutsDiffCallback.kt
deleted file mode 100644
index 5644d06bf3f3..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/LayoutsDiffCallback.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.wordpress.android.ui.sitecreation.theme
-
-import androidx.recyclerview.widget.DiffUtil.Callback
-
-class LayoutsDiffCallback(
-    private val oldList: List<LayoutGridItemUiState>,
-    private val newList: List<LayoutGridItemUiState>
-) : Callback() {
-    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int) =
-            newList[newItemPosition].slug == oldList[oldItemPosition].slug
-
-    override fun getOldListSize(): Int = oldList.size
-
-    override fun getNewListSize(): Int = newList.size
-
-    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
-        val new = newList[newItemPosition]
-        val old = oldList[oldItemPosition]
-        return new.selected == old.selected && new.preview == old.preview && new.title == old.title
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/ThumbDimensionProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/ThumbDimensionProvider.kt
deleted file mode 100644
index 54693f3ba6e4..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/theme/ThumbDimensionProvider.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.wordpress.android.ui.sitecreation.theme
-
-import androidx.annotation.DimenRes
-import org.wordpress.android.R.dimen
-import org.wordpress.android.util.DisplayUtilsWrapper
-import org.wordpress.android.viewmodel.ContextProvider
-import javax.inject.Inject
-import kotlin.math.min
-
-/**
- * Width to height thumbnail dimension ratio
- */
-private const val ratio = 0.75
-
-class ThumbDimensionProvider @Inject constructor(
-    private val contextProvider: ContextProvider,
-    private val displayUtilsWrapper: DisplayUtilsWrapper
-) {
-    private val containerWidth: Int
-        get() = min(getPixels(dimen.hpp_maximum_container_width), displayUtilsWrapper.getDisplayPixelWidth())
-
-    private val isTabletOrLandscape: Boolean
-        get() = displayUtilsWrapper.isTablet() || displayUtilsWrapper.isLandscape()
-
-    /**
-     * We calculate the columns by dividing the container width (without the margins) by the card width. The horizontal
-     * margin between thumbnails is taken into account
-     */
-    private val largeScreenColumns: Int
-        get() = (containerWidth - (2 * getPixels(dimen.hpp_card_margin_outer)) - getPixels(dimen.hpp_card_padding)) /
-                (getPixels(dimen.hpp_card_width) + getPixels(dimen.hpp_card_padding))
-
-    private val phoneColumns: Int = 2
-
-    private val largeScreenWidth: Int
-        get() = getPixels(dimen.hpp_card_width)
-
-    /**
-     * On phones we want the thumbnails to resize to cover the whole screen width. We calculate this by dividing the
-     * container width (without the margins and spacing between thumbnails) by the number of columns
-     */
-    private val phoneWidth: Int
-        get() = (containerWidth - ((phoneColumns + 1) * getPixels(dimen.hpp_card_padding))) / phoneColumns
-
-    val columns: Int
-        get() = if (isTabletOrLandscape) largeScreenColumns else phoneColumns
-
-    val width: Int
-        get() = if (isTabletOrLandscape) largeScreenWidth else phoneWidth
-
-    val height: Int
-        get() = (width / ratio).toInt()
-
-    /**
-     * The start margin can be calculated by dividing the space remaining after placing the thumbnails by two
-     */
-    val calculatedStartMargin: Int
-        get() = (displayUtilsWrapper.getDisplayPixelWidth() -
-                ((columns * width) + ((columns - 1) * getPixels(dimen.hpp_card_padding)))) / 2
-
-    val scale: Double = 1.0
-
-    private fun getPixels(@DimenRes id: Int) = contextProvider.getContext().resources.getDimensionPixelSize(id)
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt
index 3c301a5ec8b3..f80f6deb8f76 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt
@@ -53,7 +53,7 @@ class CreateSiteUseCase @Inject constructor(
                     languageWordPressId,
                     siteVisibility,
                     siteData.segmentId,
-                    null,
+                    siteData.siteDesign,
                     dryRun
             )
             continuation = cont
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt
index 58eb4e6a2a47..cc30bf88957c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt
@@ -33,8 +33,9 @@ class FetchDomainsUseCase @Inject constructor(
 
     suspend fun fetchDomains(
         query: String,
-        segmentId: Long,
+        segmentId: Long? = null,
         includeVendorDot: Boolean = FETCH_DOMAINS_SHOULD_INCLUDE_DOT_BLOG_VENDOR,
+        includeDotBlog: Boolean = false,
         size: Int = FETCH_DOMAINS_SIZE
     ): OnSuggestedDomains {
         val payload = SuggestDomainsPayload(
@@ -43,6 +44,15 @@ class FetchDomainsUseCase @Inject constructor(
                 size,
                 includeVendorDot
         )
+
+        /**
+         * Depending on the payload the server may override the following values. Setting this values here to get
+         * reasonable results in case SKIP button is pressed ("default" template)
+         */
+        payload.includeWordpressCom = true
+        payload.onlyWordpressCom = true
+        payload.includeDotBlogSubdomain = includeDotBlog
+
         return suspendCancellableCoroutine { cont ->
             pair = Pair(payload.query, cont)
             dispatcher.dispatch(SiteActionBuilder.newSuggestDomainsAction(payload))
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt
index efa8c33cfc02..5be0c0a5f270 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchHomePageLayoutsUseCase.kt
@@ -7,7 +7,7 @@ import org.wordpress.android.fluxc.generated.ThemeActionBuilder
 import org.wordpress.android.fluxc.store.ThemeStore
 import org.wordpress.android.fluxc.store.ThemeStore.FetchStarterDesignsPayload
 import org.wordpress.android.fluxc.store.ThemeStore.OnStarterDesignsFetched
-import org.wordpress.android.ui.sitecreation.theme.ThumbDimensionProvider
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
 import javax.inject.Inject
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
@@ -25,7 +25,8 @@ class FetchHomePageLayoutsUseCase @Inject constructor(
             throw IllegalStateException("Fetch already in progress.")
         }
         val payload = FetchStarterDesignsPayload(
-                thumbDimensionProvider.width.toFloat(),
+                thumbDimensionProvider.previewWidth.toFloat(),
+                thumbDimensionProvider.previewHeight.toFloat(),
                 thumbDimensionProvider.scale.toFloat()
         )
         return suspendCoroutine { cont ->
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java
index b4c433723187..b99a9b50ce89 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtils.java
@@ -6,8 +6,11 @@
 import androidx.annotation.Nullable;
 
 import org.wordpress.android.R;
+import org.wordpress.android.datasets.ReaderPostTable;
+import org.wordpress.android.models.ReaderPost;
 import org.wordpress.android.ui.WPWebViewActivity;
 import org.wordpress.android.ui.reader.ReaderActivityLauncher;
+import org.wordpress.android.ui.reader.tracker.ReaderTracker;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.viewmodel.ResourceProvider;
@@ -71,7 +74,8 @@ public static void openPostInReaderOrInAppWebview(Context ctx,
                                                       final long remoteBlogID,
                                                       final String remoteItemID,
                                                       @Nullable final String itemType,
-                                                      final String itemURL) {
+                                                      final String itemURL,
+                                                      final ReaderTracker readerTracker) {
         final long blogID = remoteBlogID;
         final long itemID = Long.parseLong(remoteItemID);
         if (itemType == null) {
@@ -82,9 +86,13 @@ public static void openPostInReaderOrInAppWebview(Context ctx,
             // If the post/page has ID == 0 is the home page, and we need to load the blog preview,
             // otherwise 404 is returned if we try to show the post in the reader
             if (itemID == 0) {
+                ReaderPost post = ReaderPostTable.getBlogPost(blogID, itemID, true);
                 ReaderActivityLauncher.showReaderBlogPreview(
                         ctx,
-                        blogID
+                        blogID,
+                        post != null ? post.isFollowedByCurrentUser : null,
+                        ReaderTracker.SOURCE_STATS,
+                        readerTracker
                 );
             } else {
                 ReaderActivityLauncher.showReaderPostDetail(
@@ -94,9 +102,13 @@ public static void openPostInReaderOrInAppWebview(Context ctx,
                 );
             }
         } else if (itemType.equals(StatsConstants.ITEM_TYPE_HOME_PAGE)) {
+            ReaderPost post = ReaderPostTable.getBlogPost(blogID, itemID, true);
             ReaderActivityLauncher.showReaderBlogPreview(
                     ctx,
-                    blogID
+                    blogID,
+                    post != null ? post.isFollowedByCurrentUser : null,
+                    ReaderTracker.SOURCE_STATS,
+                    readerTracker
             );
         } else {
             // For now, itemType.ATTACHMENT falls down this path. No need to repeat unless we
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtilsWrapper.kt
index 801a59bb36e0..ff5f00777927 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUtilsWrapper.kt
@@ -1,24 +1,14 @@
 package org.wordpress.android.ui.stats
 
-import android.content.Context
 import org.wordpress.android.viewmodel.ResourceProvider
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
 
-class StatsUtilsWrapper
-@Inject constructor(val resourceProvider: ResourceProvider) {
+class StatsUtilsWrapper @Inject constructor(
+    val resourceProvider: ResourceProvider
+) {
     fun getSinceLabelLowerCase(date: Date): String {
         return StatsUtils.getSinceLabel(resourceProvider, date).toLowerCase(Locale.getDefault())
     }
-
-    fun openPostInReaderOrInAppWebview(context: Context, siteId: Long, postId: String, itemURL: String) {
-        StatsUtils.openPostInReaderOrInAppWebview(
-                context,
-                siteId,
-                postId,
-                StatsConstants.ITEM_TYPE_POST,
-                itemURL
-        )
-    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/AppBarUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/AppBarUtils.kt
new file mode 100644
index 000000000000..f72191788d58
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/AppBarUtils.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.ui.stats.refresh
+
+import android.animation.StateListAnimator
+import com.google.android.material.appbar.AppBarLayout
+import org.wordpress.android.R
+
+private const val DELAY: Long = 100
+
+fun AppBarLayout.showShadow(hasShadow: Boolean) {
+    this.postDelayed(
+            {
+                val originalStateListAnimator = this.stateListAnimator
+                if (originalStateListAnimator != null) {
+                    this.setTag(
+                            R.id.appbar_layout_original_animator_tag_key,
+                            originalStateListAnimator
+                    )
+                }
+
+                if (hasShadow) {
+                    this.stateListAnimator = this.getTag(
+                            R.id.appbar_layout_original_animator_tag_key
+                    ) as StateListAnimator
+                } else {
+                    this.stateListAnimator = null
+                }
+            },
+            DELAY
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt
index a6a3b992cee6..e02b1bba30aa 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsActivity.kt
@@ -5,10 +5,8 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.stats_fragment.*
-import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.StatsListActivityBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.stats.StatsTimeframe
@@ -22,13 +20,7 @@ class StatsActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
-        setContentView(R.layout.stats_list_activity)
-
-        setSupportActionBar(toolbar)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-        }
+        setContentView(StatsListActivityBinding.inflate(layoutInflater).root)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -43,7 +35,7 @@ class StatsActivity : LocaleAwareActivity() {
         intent?.let {
             val siteId = intent.getIntExtra(WordPress.LOCAL_SITE_ID, -1)
             if (siteId > -1) {
-                viewModel = ViewModelProviders.of(this, viewModelFactory).get(StatsViewModel::class.java)
+                viewModel = ViewModelProvider(this, viewModelFactory).get(StatsViewModel::class.java)
                 viewModel.start(intent, restart = true)
             }
         }
@@ -54,12 +46,16 @@ class StatsActivity : LocaleAwareActivity() {
         const val INITIAL_SELECTED_PERIOD_KEY = "INITIAL_SELECTED_PERIOD_KEY"
         const val ARG_LAUNCHED_FROM = "ARG_LAUNCHED_FROM"
         const val ARG_DESIRED_TIMEFRAME = "ARG_DESIRED_TIMEFRAME"
-        const val ARG_LOCAL_TABLE_SITE_ID = "ARG_LOCAL_TABLE_SITE_ID"
         @JvmStatic
         fun start(context: Context, site: SiteModel) {
             context.startActivity(buildIntent(context, site))
         }
 
+        @JvmStatic
+        fun start(context: Context, site: SiteModel, statsTimeframe: StatsTimeframe) {
+            context.startActivity(buildIntent(context, site, statsTimeframe))
+        }
+
         fun start(context: Context, localSiteId: Int, statsTimeframe: StatsTimeframe, period: String?) {
             val intent = buildIntent(context, localSiteId, statsTimeframe, period)
             context.startActivity(intent)
@@ -70,6 +66,11 @@ class StatsActivity : LocaleAwareActivity() {
             return buildIntent(context, site.id)
         }
 
+        @JvmStatic
+        fun buildIntent(context: Context, site: SiteModel, statsTimeframe: StatsTimeframe): Intent {
+            return buildIntent(context, site.id, statsTimeframe)
+        }
+
         private fun buildIntent(
             context: Context,
             localSiteId: Int,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt
index 4babb0b951cf..a57297530991 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsFragment.kt
@@ -1,28 +1,27 @@
 package org.wordpress.android.ui.stats.refresh
 
-import android.animation.StateListAnimator
+import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
-import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentPagerAdapter
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayout.Tab
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.stats_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.StatsFragmentBinding
 import org.wordpress.android.ui.ScrollableViewInitializedListener
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment
+import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.ANNUAL_STATS
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.DAYS
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.DETAIL
@@ -34,12 +33,13 @@ import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider.SiteUpdate
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.WPSwipeToRefreshHelper
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPSnackbar
 import javax.inject.Inject
 
 private val statsSections = listOf(INSIGHTS, DAYS, WEEKS, MONTHS, YEARS)
 
-class StatsFragment : DaggerFragment(), ScrollableViewInitializedListener {
+class StatsFragment : DaggerFragment(R.layout.stats_fragment), ScrollableViewInitializedListener {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var uiHelpers: UiHelpers
     private lateinit var viewModel: StatsViewModel
@@ -49,18 +49,26 @@ class StatsFragment : DaggerFragment(), ScrollableViewInitializedListener {
 
     private var restorePreviousSearch = false
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
         setHasOptionsMenu(true)
-        return inflater.inflate(R.layout.stats_fragment, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
-
-        initializeViewModels(nonNullActivity, savedInstanceState == null, savedInstanceState)
-        initializeViews(nonNullActivity)
+        with(StatsFragmentBinding.bind(view)) {
+            with(nonNullActivity as AppCompatActivity) {
+                setSupportActionBar(toolbar)
+                supportActionBar?.let {
+                    it.setHomeButtonEnabled(true)
+                    it.setDisplayHomeAsUpEnabled(true)
+                }
+            }
+            initializeViewModels(nonNullActivity, savedInstanceState == null, savedInstanceState)
+            initializeViews(nonNullActivity)
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
@@ -69,7 +77,7 @@ class StatsFragment : DaggerFragment(), ScrollableViewInitializedListener {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViews(activity: FragmentActivity) {
+    private fun StatsFragmentBinding.initializeViews(activity: FragmentActivity) {
         statsPager.adapter = StatsPagerAdapter(activity, childFragmentManager)
         tabLayout.setupWithViewPager(statsPager)
         statsPager.pageMargin = resources.getDimensionPixelSize(R.dimen.margin_extra_large)
@@ -80,12 +88,13 @@ class StatsFragment : DaggerFragment(), ScrollableViewInitializedListener {
         }
     }
 
-    private fun initializeViewModels(
+    @SuppressLint("ClickableViewAccessibility")
+    private fun StatsFragmentBinding.initializeViewModels(
         activity: FragmentActivity,
         isFirstStart: Boolean,
         savedInstanceState: Bundle?
     ) {
-        viewModel = ViewModelProviders.of(activity, viewModelFactory).get(StatsViewModel::class.java)
+        viewModel = ViewModelProvider(activity, viewModelFactory).get(StatsViewModel::class.java)
 
         viewModel.onRestoreInstanceState(savedInstanceState)
 
@@ -106,100 +115,88 @@ class StatsFragment : DaggerFragment(), ScrollableViewInitializedListener {
         }
     }
 
-    private fun setupObservers(activity: FragmentActivity) {
-        viewModel.isRefreshing.observe(viewLifecycleOwner, Observer {
+    private fun StatsFragmentBinding.setupObservers(activity: FragmentActivity) {
+        viewModel.isRefreshing.observe(viewLifecycleOwner, {
             it?.let { isRefreshing ->
                 swipeToRefreshHelper.isRefreshing = isRefreshing
             }
         })
 
-        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, Observer { holder ->
-            val parent = activity.findViewById<View>(R.id.coordinatorLayout)
-            if (holder != null && parent != null) {
-                if (holder.buttonTitle == null) {
-                    WPSnackbar.make(
-                            parent,
-                            uiHelpers.getTextOfUiString(requireContext(), holder.message),
-                            Snackbar.LENGTH_LONG
-                    ).show()
-                } else {
-                    val snackbar = WPSnackbar.make(
-                            parent,
-                            uiHelpers.getTextOfUiString(requireContext(), holder.message),
-                            Snackbar.LENGTH_LONG
-                    )
-                    snackbar.setAction(uiHelpers.getTextOfUiString(requireContext(), holder.buttonTitle)) {
-                        holder.buttonAction()
-                    }
-                    snackbar.show()
-                }
-            }
+        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, { holder ->
+            showSnackbar(activity, holder)
         })
 
-        viewModel.toolbarHasShadow.observe(viewLifecycleOwner, Observer { hasShadow ->
-            app_bar_layout.postDelayed(
-                    {
-                        if (app_bar_layout != null) {
-                            val originalStateListAnimator = app_bar_layout.stateListAnimator
-                            if (originalStateListAnimator != null) {
-                                app_bar_layout.setTag(
-                                        R.id.appbar_layout_original_animator_tag_key,
-                                        originalStateListAnimator
-                                )
-                            }
-
-                            if (hasShadow == true) {
-                                app_bar_layout.stateListAnimator = app_bar_layout.getTag(
-                                        R.id.appbar_layout_original_animator_tag_key
-                                ) as StateListAnimator
-                            } else {
-                                app_bar_layout.stateListAnimator = null
-                            }
-                        }
-                    },
-                    100
-            )
+        viewModel.toolbarHasShadow.observe(viewLifecycleOwner, { hasShadow ->
+            appBarLayout.showShadow(hasShadow == true)
         })
 
-        viewModel.siteChanged.observe(viewLifecycleOwner, Observer { siteChangedEvent ->
-            siteChangedEvent?.applyIfNotHandled {
-                when (this) {
-                    is SiteUpdateResult.SiteConnected -> viewModel.onSiteChanged()
-                    is SiteUpdateResult.NotConnectedJetpackSite -> getActivity()?.finish()
-                }
+        viewModel.siteChanged.observeEvent(viewLifecycleOwner, { siteUpdateResult ->
+            when (siteUpdateResult) {
+                is SiteUpdateResult.SiteConnected -> viewModel.onSiteChanged()
+                is SiteUpdateResult.NotConnectedJetpackSite -> getActivity()?.finish()
             }
         })
 
-        viewModel.hideToolbar.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let { hideToolbar ->
-                app_bar_layout.setExpanded(!hideToolbar, true)
-            }
+        viewModel.hideToolbar.observeEvent(viewLifecycleOwner, { hideToolbar ->
+            appBarLayout.setExpanded(!hideToolbar, true)
         })
 
-        viewModel.selectedSection.observe(viewLifecycleOwner, Observer { selectedSection ->
+        viewModel.selectedSection.observe(viewLifecycleOwner, { selectedSection ->
             selectedSection?.let {
-                val position = when (selectedSection) {
-                    INSIGHTS -> 0
-                    DAYS -> 1
-                    WEEKS -> 2
-                    MONTHS -> 3
-                    YEARS -> 4
-                    DETAIL -> null
-                    ANNUAL_STATS -> null
-                }
-                position?.let {
-                    if (statsPager.currentItem != position) {
-                        tabLayout.removeOnTabSelectedListener(selectedTabListener)
-                        statsPager.setCurrentItem(position, false)
-                        tabLayout.addOnTabSelectedListener(selectedTabListener)
-                    }
-                }
+                handleSelectedSection(selectedSection)
             }
         })
     }
 
+    private fun StatsFragmentBinding.handleSelectedSection(
+        selectedSection: StatsSection
+    ) {
+        val position = when (selectedSection) {
+            INSIGHTS -> 0
+            DAYS -> 1
+            WEEKS -> 2
+            MONTHS -> 3
+            YEARS -> 4
+            DETAIL -> null
+            ANNUAL_STATS -> null
+        }
+        position?.let {
+            if (statsPager.currentItem != position) {
+                tabLayout.removeOnTabSelectedListener(selectedTabListener)
+                statsPager.setCurrentItem(position, false)
+                tabLayout.addOnTabSelectedListener(selectedTabListener)
+            }
+        }
+    }
+
+    private fun showSnackbar(
+        activity: FragmentActivity,
+        holder: SnackbarMessageHolder?
+    ) {
+        val parent = activity.findViewById<View>(R.id.coordinatorLayout)
+        if (holder != null && parent != null) {
+            if (holder.buttonTitle == null) {
+                WPSnackbar.make(
+                        parent,
+                        uiHelpers.getTextOfUiString(requireContext(), holder.message),
+                        Snackbar.LENGTH_LONG
+                ).show()
+            } else {
+                val snackbar = WPSnackbar.make(
+                        parent,
+                        uiHelpers.getTextOfUiString(requireContext(), holder.message),
+                        Snackbar.LENGTH_LONG
+                )
+                snackbar.setAction(uiHelpers.getTextOfUiString(requireContext(), holder.buttonTitle)) {
+                    holder.buttonAction()
+                }
+                snackbar.show()
+            }
+        }
+    }
+
     override fun onScrollableViewInitialized(containerId: Int) {
-        app_bar_layout.liftOnScrollTargetViewId = containerId
+        StatsFragmentBinding.bind(requireView()).appBarLayout.liftOnScrollTargetViewId = containerId
     }
 }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt
index 71ab08ada80f..ee070223d926 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllActivity.kt
@@ -4,11 +4,10 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.stats_view_all_fragment.*
-import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.databinding.StatsViewAllActivityBinding
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.stats.StatsViewType
@@ -18,13 +17,8 @@ class StatsViewAllActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        setContentView(R.layout.stats_view_all_activity)
-
-        setSupportActionBar(toolbar)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-        }
+        val binding = StatsViewAllActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
index 7980a6423c16..e3f02368bb62 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllFragment.kt
@@ -1,15 +1,11 @@
 package org.wordpress.android.ui.stats.refresh
 
-import android.animation.StateListAnimator
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.appbar.AppBarLayout.LayoutParams
@@ -17,19 +13,17 @@ import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.tabs.TabLayout.OnTabSelectedListener
 import com.google.android.material.tabs.TabLayout.Tab
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.stats_date_selector.*
-import kotlinx.android.synthetic.main.stats_empty_view.*
-import kotlinx.android.synthetic.main.stats_error_view.*
-import kotlinx.android.synthetic.main.stats_list_fragment.*
-import kotlinx.android.synthetic.main.stats_view_all_fragment.app_bar_layout
-import kotlinx.android.synthetic.main.stats_view_all_fragment.pullToRefresh
-import kotlinx.android.synthetic.main.stats_view_all_fragment.tabLayout
-import kotlinx.android.synthetic.main.stats_view_all_fragment.toolbar
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.StatsViewAllFragmentBinding
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.stats.StatsViewType
-import org.wordpress.android.ui.stats.refresh.lists.StatsBlock
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.EmptyBlock
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Error
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Loading
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Success
+import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type
 import org.wordpress.android.ui.stats.refresh.lists.StatsBlock.Type.LOADING
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListAdapter
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
@@ -42,10 +36,11 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.WPSwipeToRefreshHelper
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPSnackbar
 import javax.inject.Inject
 
-class StatsViewAllFragment : DaggerFragment() {
+class StatsViewAllFragment : DaggerFragment(R.layout.stats_view_all_fragment) {
     @Inject lateinit var viewModelFactoryBuilder: StatsViewAllViewModelFactory.Builder
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var navigator: StatsNavigator
@@ -53,6 +48,7 @@ class StatsViewAllFragment : DaggerFragment() {
     @Inject lateinit var uiHelpers: UiHelpers
     private lateinit var viewModel: StatsViewAllViewModel
     private lateinit var swipeToRefreshHelper: SwipeToRefreshHelper
+    private var binding: StatsViewAllFragmentBinding? = null
 
     private val listStateKey = "list_state"
 
@@ -63,12 +59,8 @@ class StatsViewAllFragment : DaggerFragment() {
         const val ARGS_SELECTED_DATE = "ARGS_SELECTED_DATE"
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.stats_view_all_fragment, container, false)
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
-        recyclerView.layoutManager?.let {
+        binding?.statsListFragment?.recyclerView?.layoutManager?.let {
             outState.putParcelable(listStateKey, it.onSaveInstanceState())
         }
 
@@ -92,25 +84,28 @@ class StatsViewAllFragment : DaggerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+    private fun StatsViewAllFragmentBinding.initializeViews(savedInstanceState: Bundle?) {
         val layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
 
         savedInstanceState?.getParcelable<Parcelable>(listStateKey)?.let {
             layoutManager.onRestoreInstanceState(it)
         }
-
-        recyclerView.layoutManager = layoutManager
-        loadingRecyclerView.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
+        with(statsListFragment) {
+            recyclerView.layoutManager = layoutManager
+            loadingRecyclerView.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
+        }
 
         swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(pullToRefresh) {
             viewModel.onPullToRefresh()
         }
 
-        nextDateButton.setOnClickListener {
-            viewModel.onNextDateSelected()
-        }
-        previousDateButton.setOnClickListener {
-            viewModel.onPreviousDateSelected()
+        with(statsListFragment.dateSelector) {
+            nextDateButton.setOnClickListener {
+                viewModel.onNextDateSelected()
+            }
+            previousDateButton.setOnClickListener {
+                viewModel.onPreviousDateSelected()
+            }
         }
     }
 
@@ -118,9 +113,23 @@ class StatsViewAllFragment : DaggerFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
+        with(StatsViewAllFragmentBinding.bind(view)) {
+            this@StatsViewAllFragment.binding = this
+            with(nonNullActivity as AppCompatActivity) {
+                setSupportActionBar(toolbar)
+                supportActionBar?.let {
+                    it.setHomeButtonEnabled(true)
+                    it.setDisplayHomeAsUpEnabled(true)
+                }
+            }
+            initializeViews(savedInstanceState)
+            initializeViewModels(nonNullActivity, savedInstanceState)
+        }
+    }
 
-        initializeViews(savedInstanceState)
-        initializeViewModels(nonNullActivity, savedInstanceState)
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
@@ -129,7 +138,10 @@ class StatsViewAllFragment : DaggerFragment() {
         (activity as AppCompatActivity).supportActionBar?.title = getString(viewModel.title)
     }
 
-    private fun initializeViewModels(activity: FragmentActivity, savedInstanceState: Bundle?) {
+    private fun StatsViewAllFragmentBinding.initializeViewModels(
+        activity: FragmentActivity,
+        savedInstanceState: Bundle?
+    ) {
         val nonNullIntent = checkNotNull(activity.intent)
         val type = if (savedInstanceState == null) {
             nonNullIntent.getSerializableExtra(ARGS_VIEW_TYPE) as StatsViewType
@@ -148,7 +160,7 @@ class StatsViewAllFragment : DaggerFragment() {
         statsSiteProvider.start(siteId)
 
         val viewModelFactory = viewModelFactoryBuilder.build(type, granularity)
-        viewModel = ViewModelProviders.of(activity, viewModelFactory).get(StatsViewAllViewModel::class.java)
+        viewModel = ViewModelProvider(activity, viewModelFactory).get(StatsViewAllViewModel::class.java)
 
         val selectedDate = if (savedInstanceState == null) {
             nonNullIntent.getParcelableExtra(ARGS_SELECTED_DATE) as SelectedDate?
@@ -160,107 +172,93 @@ class StatsViewAllFragment : DaggerFragment() {
         viewModel.start(selectedDate)
     }
 
-    private fun setupObservers(activity: FragmentActivity) {
-        viewModel.isRefreshing.observe(viewLifecycleOwner, Observer {
+    private fun StatsViewAllFragmentBinding.setupObservers(activity: FragmentActivity) {
+        viewModel.isRefreshing.observe(viewLifecycleOwner, {
             it?.let { isRefreshing ->
                 swipeToRefreshHelper.isRefreshing = isRefreshing
             }
         })
 
-        viewModel.showSnackbarMessage.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let { holder ->
-                val parent = activity.findViewById<View>(R.id.coordinatorLayout)
-                if (parent != null) {
-                    if (holder.buttonTitle == null) {
-                        WPSnackbar.make(
-                                parent,
-                                uiHelpers.getTextOfUiString(requireContext(), holder.message),
-                                Snackbar.LENGTH_LONG
-                        ).show()
-                    } else {
-                        val snackbar = WPSnackbar.make(
-                                parent,
-                                uiHelpers.getTextOfUiString(requireContext(), holder.message),
-                                Snackbar.LENGTH_LONG
-                        )
-                        snackbar.setAction(
-                                uiHelpers.getTextOfUiString(requireContext(), holder.buttonTitle)
-                        ) { holder.buttonAction() }
-                        snackbar.show()
-                    }
-                }
-            }
+        viewModel.showSnackbarMessage.observeEvent(viewLifecycleOwner, { holder ->
+            showSnackbar(activity, holder)
         })
 
-        viewModel.data.observe(viewLifecycleOwner, Observer {
+        viewModel.data.observe(viewLifecycleOwner, {
             if (it != null) {
-                recyclerView.visibility = if (it is StatsBlock.Success) View.VISIBLE else View.GONE
-                loadingContainer.visibility = if (it is StatsBlock.Loading) View.VISIBLE else View.GONE
-                statsErrorView.visibility = if (it is StatsBlock.Error) View.VISIBLE else View.GONE
-                statsEmptyView.visibility = if (it is StatsBlock.EmptyBlock) View.VISIBLE else View.GONE
-                when (it) {
-                    is StatsBlock.Success -> {
-                        loadData(recyclerView, prepareLayout(it.data, it.type))
-                    }
-                    is StatsBlock.Loading -> {
-                        loadData(loadingRecyclerView, prepareLayout(it.data, it.type))
-                    }
-                    is StatsBlock.Error -> {
-                        statsErrorView.button.setOnClickListener {
-                            viewModel.onRetryClick()
+                with(statsListFragment) {
+                    recyclerView.visibility = if (it is Success) View.VISIBLE else View.GONE
+                    loadingContainer.visibility = if (it is Loading) View.VISIBLE else View.GONE
+                    val showErrorView = if (it is Error) View.VISIBLE else View.GONE
+                    errorView.statsErrorView.visibility = showErrorView
+                    val showEmptyView = if (it is EmptyBlock) View.VISIBLE else View.GONE
+                    emptyView.statsEmptyView.visibility = showEmptyView
+                    when (it) {
+                        is Success -> {
+                            loadData(recyclerView, prepareLayout(it.data, it.type))
+                        }
+                        is Loading -> {
+                            loadData(loadingRecyclerView, prepareLayout(it.data, it.type))
+                        }
+                        is Error -> {
+                            errorView.statsErrorView.button.setOnClickListener {
+                                viewModel.onRetryClick()
+                            }
+                        }
+                        is EmptyBlock -> {
                         }
                     }
                 }
             }
         })
-        viewModel.navigationTarget.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let { target ->
-                navigator.navigate(activity, target)
-            }
+        viewModel.navigationTarget.observeEvent(viewLifecycleOwner, { target ->
+            navigator.navigate(activity, target)
         })
 
-        viewModel.dateSelectorData.observe(viewLifecycleOwner, Observer { dateSelectorUiModel ->
-            drawDateSelector(dateSelectorUiModel)
+        viewModel.dateSelectorData.observe(viewLifecycleOwner, { dateSelectorUiModel ->
+            statsListFragment.drawDateSelector(dateSelectorUiModel)
         })
 
-        viewModel.navigationTarget.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let { target ->
-                navigator.navigate(activity, target)
-            }
+        viewModel.navigationTarget.observeEvent(viewLifecycleOwner, { target ->
+            navigator.navigate(activity, target)
         })
 
-        viewModel.selectedDate.observe(viewLifecycleOwner, Observer { event ->
+        viewModel.selectedDate.observe(viewLifecycleOwner, { event ->
             if (event != null) {
                 viewModel.onDateChanged()
             }
         })
 
-        viewModel.toolbarHasShadow.observe(viewLifecycleOwner, Observer { hasShadow ->
-            app_bar_layout.postDelayed(
-                    {
-                        if (app_bar_layout != null) {
-                            val originalStateListAnimator = app_bar_layout.stateListAnimator
-                            if (originalStateListAnimator != null) {
-                                app_bar_layout.setTag(
-                                        R.id.appbar_layout_original_animator_tag_key,
-                                        originalStateListAnimator
-                                )
-                            }
-
-                            if (hasShadow == true) {
-                                app_bar_layout.stateListAnimator = app_bar_layout.getTag(
-                                        R.id.appbar_layout_original_animator_tag_key
-                                ) as StateListAnimator
-                            } else {
-                                app_bar_layout.stateListAnimator = null
-                            }
-                        }
-                    },
-                    100
-            )
+        viewModel.toolbarHasShadow.observe(viewLifecycleOwner, { hasShadow ->
+            appBarLayout.showShadow(hasShadow == true)
         })
     }
 
+    private fun showSnackbar(
+        activity: FragmentActivity,
+        holder: SnackbarMessageHolder
+    ) {
+        val parent = activity.findViewById<View>(R.id.coordinatorLayout)
+        if (parent != null) {
+            if (holder.buttonTitle == null) {
+                WPSnackbar.make(
+                        parent,
+                        uiHelpers.getTextOfUiString(requireContext(), holder.message),
+                        Snackbar.LENGTH_LONG
+                ).show()
+            } else {
+                val snackbar = WPSnackbar.make(
+                        parent,
+                        uiHelpers.getTextOfUiString(requireContext(), holder.message),
+                        Snackbar.LENGTH_LONG
+                )
+                snackbar.setAction(
+                        uiHelpers.getTextOfUiString(requireContext(), holder.buttonTitle)
+                ) { holder.buttonAction() }
+                snackbar.show()
+            }
+        }
+    }
+
     private fun loadData(recyclerView: RecyclerView, data: List<BlockListItem>) {
         val adapter: BlockListAdapter
         if (recyclerView.adapter == null) {
@@ -275,11 +273,32 @@ class StatsViewAllFragment : DaggerFragment() {
         recyclerView.layoutManager?.onRestoreInstanceState(recyclerViewState)
     }
 
-    private fun prepareLayout(data: List<BlockListItem>, type: StatsBlock.Type): List<BlockListItem> {
+    private fun StatsViewAllFragmentBinding.prepareLayout(
+        data: List<BlockListItem>,
+        type: Type
+    ): List<BlockListItem> {
         val tabs = data.firstOrNull { it is TabsItem } as? TabsItem
         return if (tabs != null) {
             if (tabLayout.tabCount == 0) {
-                setupTabs(tabs)
+                tabLayout.clearOnTabSelectedListeners()
+                tabLayout.removeAllTabs()
+                tabs.tabs.forEach { tabItem ->
+                    tabLayout.addTab(tabLayout.newTab().setText(tabItem))
+                }
+                tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
+                    override fun onTabReselected(tab: Tab) {
+                    }
+
+                    override fun onTabUnselected(tab: Tab) {
+                    }
+
+                    override fun onTabSelected(tab: Tab) {
+                        tabs.onTabSelected(tab.position)
+                        activity?.intent?.putExtra(SELECTED_TAB_KEY, tab.position)
+                    }
+                })
+                val selectedTab = activity?.intent?.getIntExtra(SELECTED_TAB_KEY, 0) ?: 0
+                tabLayout.getTabAt(selectedTab)?.select()
             } else if (tabLayout.selectedTabPosition != tabs.selectedTabPosition) {
                 tabLayout.getTabAt(tabs.selectedTabPosition)?.select()
             }
@@ -297,28 +316,4 @@ class StatsViewAllFragment : DaggerFragment() {
             data
         }
     }
-
-    private fun setupTabs(item: TabsItem) {
-        tabLayout.clearOnTabSelectedListeners()
-        tabLayout.removeAllTabs()
-        item.tabs.forEach { tabItem ->
-            tabLayout.addTab(tabLayout.newTab().setText(tabItem))
-        }
-
-        tabLayout.addOnTabSelectedListener(object : OnTabSelectedListener {
-            override fun onTabReselected(tab: Tab) {
-            }
-
-            override fun onTabUnselected(tab: Tab) {
-            }
-
-            override fun onTabSelected(tab: Tab) {
-                item.onTabSelected(tab.position)
-                activity?.intent?.putExtra(SELECTED_TAB_KEY, tab.position)
-            }
-        })
-
-        val selectedTab = activity?.intent?.getIntExtra(SELECTED_TAB_KEY, 0) ?: 0
-        tabLayout.getTabAt(selectedTab)?.select()
-    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt
index c22620fda1ac..fbbae1bfd576 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewAllViewModel.kt
@@ -3,9 +3,8 @@ package org.wordpress.android.ui.stats.refresh
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.wordpress.android.R
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
@@ -51,7 +50,7 @@ class StatsViewAllViewModel(
             LOADING -> StatsBlock.Loading(useCaseModel.type, useCaseModel.data ?: useCaseModel.stateData ?: listOf())
             EMPTY -> StatsBlock.EmptyBlock(useCaseModel.type, useCaseModel.stateData ?: useCaseModel.data ?: listOf())
         }
-    }.throttle(this, true)
+    }.throttle(viewModelScope, true)
 
     private val _isRefreshing = MutableLiveData<Boolean>()
     val isRefreshing: LiveData<Boolean> = _isRefreshing
@@ -76,7 +75,7 @@ class StatsViewAllViewModel(
         refreshData()
     }
 
-    private fun CoroutineScope.loadData(executeLoading: suspend () -> Unit) = launch {
+    private fun loadData(executeLoading: suspend () -> Unit) = launch {
         _isRefreshing.value = true
 
         executeLoading()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt
index 88b99dde7fec..b608beaf2871 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/StatsViewModel.kt
@@ -5,8 +5,6 @@ import android.os.Bundle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
@@ -151,7 +149,7 @@ class StatsViewModel
         }
     }
 
-    private fun CoroutineScope.loadData(executeLoading: suspend () -> Unit) = launch {
+    private fun loadData(executeLoading: suspend () -> Unit) = launch {
         _isRefreshing.value = true
 
         executeLoading()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
index ba0cf1169eba..70501f975b18 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt
@@ -2,35 +2,32 @@ package org.wordpress.android.ui.stats.refresh.lists
 
 import android.os.Bundle
 import android.os.Parcelable
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
-import kotlinx.android.synthetic.main.stats_date_selector.*
-import kotlinx.android.synthetic.main.stats_empty_view.*
-import kotlinx.android.synthetic.main.stats_error_view.*
-import kotlinx.android.synthetic.main.stats_list_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.StatsListFragmentBinding
 import org.wordpress.android.ui.ViewPagerFragment
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel
+import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel.Empty
+import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel.Error
+import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.UiModel.Success
 import org.wordpress.android.ui.stats.refresh.lists.detail.DetailListViewModel
 import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.StatsNavigator
 import org.wordpress.android.ui.stats.refresh.utils.drawDateSelector
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.setVisible
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
-class StatsListFragment : ViewPagerFragment() {
+class StatsListFragment : ViewPagerFragment(R.layout.stats_list_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var statsDateFormatter: StatsDateFormatter
@@ -38,6 +35,7 @@ class StatsListFragment : ViewPagerFragment() {
     private lateinit var viewModel: StatsListViewModel
 
     private var layoutManager: LayoutManager? = null
+    private var binding: StatsListFragmentBinding? = null
 
     private val listStateKey = "list_state"
 
@@ -58,10 +56,6 @@ class StatsListFragment : ViewPagerFragment() {
         (requireActivity().application as WordPress).component().inject(this)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.stats_list_fragment, container, false)
-    }
-
     override fun onSaveInstanceState(outState: Bundle) {
         layoutManager?.let {
             outState.putParcelable(listStateKey, it.onSaveInstanceState())
@@ -72,7 +66,7 @@ class StatsListFragment : ViewPagerFragment() {
         super.onSaveInstanceState(outState)
     }
 
-    private fun initializeViews(savedInstanceState: Bundle?) {
+    private fun StatsListFragmentBinding.initializeViews(savedInstanceState: Bundle?) {
         val columns = resources.getInteger(R.integer.stats_number_of_columns)
         val layoutManager: LayoutManager = if (columns == 1) {
             LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
@@ -83,8 +77,8 @@ class StatsListFragment : ViewPagerFragment() {
             layoutManager.onRestoreInstanceState(it)
         }
 
-        this.layoutManager = layoutManager
-        recyclerView.layoutManager = this.layoutManager
+        this@StatsListFragment.layoutManager = layoutManager
+        recyclerView.layoutManager = this@StatsListFragment.layoutManager
         recyclerView.addItemDecoration(
                 StatsListItemDecoration(
                         resources.getDimensionPixelSize(R.dimen.stats_list_card_horizontal_spacing),
@@ -96,7 +90,7 @@ class StatsListFragment : ViewPagerFragment() {
                 )
         )
 
-        statsEmptyView.button.setOnClickListener {
+        emptyView.statsEmptyView.button.setOnClickListener {
             viewModel.onEmptyInsightsButtonClicked()
         }
 
@@ -108,33 +102,40 @@ class StatsListFragment : ViewPagerFragment() {
             }
         })
 
-        nextDateButton.setOnClickListener {
+        dateSelector.nextDateButton.setOnClickListener {
             viewModel.onNextDateSelected()
         }
 
-        previousDateButton.setOnClickListener {
+        dateSelector.previousDateButton.setOnClickListener {
             viewModel.onPreviousDateSelected()
         }
 
-        statsErrorView.button.setOnClickListener {
+        errorView.statsErrorView.button.setOnClickListener {
             viewModel.onRetryClick()
         }
     }
 
-    override fun getScrollableViewForUniqueIdProvision(): View? {
-        return recyclerView
+    override fun getScrollableViewForUniqueIdProvision(): View {
+        return binding!!.recyclerView
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
+        with(StatsListFragmentBinding.bind(view)) {
+            binding = this
+            initializeViews(savedInstanceState)
+            initializeViewModels(nonNullActivity)
+        }
+    }
 
-        initializeViews(savedInstanceState)
-        initializeViewModels(nonNullActivity)
+    override fun onDestroyView() {
+        super.onDestroyView()
+        binding = null
     }
 
-    private fun initializeViewModels(activity: FragmentActivity) {
+    private fun StatsListFragmentBinding.initializeViewModels(activity: FragmentActivity) {
         val statsSection = arguments?.getSerializable(LIST_TYPE) as? StatsSection
                 ?: activity.intent?.getSerializableExtra(LIST_TYPE) as? StatsSection
                 ?: StatsSection.INSIGHTS
@@ -149,85 +150,83 @@ class StatsListFragment : ViewPagerFragment() {
             StatsSection.YEARS -> YearsListViewModel::class.java
         }
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this@StatsListFragment, viewModelFactory)
                 .get(statsSection.name, viewModelClass)
 
         setupObservers(activity)
         viewModel.start()
     }
 
-    private fun setupObservers(activity: FragmentActivity) {
-        viewModel.uiModel.observe(viewLifecycleOwner, Observer {
-            when (it) {
-                is UiModel.Success -> {
-                    updateInsights(it.data)
-                }
-                is UiModel.Error, null -> {
-                    recyclerView.visibility = View.GONE
-                    statsErrorView.visibility = View.VISIBLE
-                    statsEmptyView.visibility = View.GONE
-                }
-                is UiModel.Empty -> {
-                    recyclerView.visibility = View.GONE
-                    statsEmptyView.visibility = View.VISIBLE
-                    statsErrorView.visibility = View.GONE
-                    statsEmptyView.title.setText(it.title)
-                    if (it.subtitle != null) {
-                        statsEmptyView.subtitle.setText(it.subtitle)
-                    } else {
-                        statsEmptyView.subtitle.text = ""
-                    }
-                    if (it.image != null) {
-                        statsEmptyView.image.setImageResource(it.image)
-                    } else {
-                        statsEmptyView.image.setImageDrawable(null)
-                    }
-                    statsEmptyView.button.setVisible(it.showButton)
-                }
-            }
+    private fun StatsListFragmentBinding.setupObservers(activity: FragmentActivity) {
+        viewModel.uiModel.observe(viewLifecycleOwner, {
+            showUiModel(it)
         })
 
-        viewModel.dateSelectorData.observe(viewLifecycleOwner, Observer { dateSelectorUiModel ->
+        viewModel.dateSelectorData.observe(viewLifecycleOwner, { dateSelectorUiModel ->
             drawDateSelector(dateSelectorUiModel)
         })
 
-        viewModel.navigationTarget.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let { target ->
-                navigator.navigate(activity, target)
-            }
+        viewModel.navigationTarget.observeEvent(viewLifecycleOwner, { target ->
+            navigator.navigate(activity, target)
         })
 
-        viewModel.selectedDate.observe(viewLifecycleOwner, Observer { event ->
+        viewModel.selectedDate.observe(viewLifecycleOwner, { event ->
             if (event != null) {
                 viewModel.onDateChanged(event.selectedSection)
             }
         })
 
-        viewModel.listSelected.observe(viewLifecycleOwner, Observer {
+        viewModel.listSelected.observe(viewLifecycleOwner, {
             viewModel.onListSelected()
         })
 
-        viewModel.typesChanged.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let {
-                viewModel.onTypesChanged()
+        viewModel.typesChanged.observeEvent(viewLifecycleOwner, {
+            viewModel.onTypesChanged()
+        })
+
+        viewModel.scrollTo?.observeEvent(viewLifecycleOwner, { statsType ->
+            (recyclerView.adapter as? StatsBlockAdapter)?.let { adapter ->
+                recyclerView.smoothScrollToPosition(adapter.positionOf(statsType))
             }
         })
+    }
 
-        viewModel.scrollTo?.observe(viewLifecycleOwner, Observer { event ->
-            if (event != null) {
-                (recyclerView.adapter as? StatsBlockAdapter)?.let { adapter ->
-                    event.getContentIfNotHandled()?.let { statsType ->
-                        recyclerView.smoothScrollToPosition(adapter.positionOf(statsType))
-                    }
+    private fun StatsListFragmentBinding.showUiModel(
+        it: UiModel?
+    ) {
+        when (it) {
+            is Success -> {
+                updateInsights(it.data)
+            }
+            is Error, null -> {
+                recyclerView.visibility = View.GONE
+                errorView.statsErrorView.visibility = View.VISIBLE
+                emptyView.statsEmptyView.visibility = View.GONE
+            }
+            is Empty -> {
+                recyclerView.visibility = View.GONE
+                emptyView.statsEmptyView.visibility = View.VISIBLE
+                errorView.statsErrorView.visibility = View.GONE
+                emptyView.statsEmptyView.title.setText(it.title)
+                if (it.subtitle != null) {
+                    emptyView.statsEmptyView.subtitle.setText(it.subtitle)
+                } else {
+                    emptyView.statsEmptyView.subtitle.text = ""
+                }
+                if (it.image != null) {
+                    emptyView.statsEmptyView.image.setImageResource(it.image)
+                } else {
+                    emptyView.statsEmptyView.image.setImageDrawable(null)
                 }
+                emptyView.statsEmptyView.button.setVisible(it.showButton)
             }
-        })
+        }
     }
 
-    private fun updateInsights(statsState: List<StatsBlock>) {
+    private fun StatsListFragmentBinding.updateInsights(statsState: List<StatsBlock>) {
         recyclerView.visibility = View.VISIBLE
-        statsErrorView.visibility = View.GONE
-        statsEmptyView.visibility = View.GONE
+        errorView.statsErrorView.visibility = View.GONE
+        emptyView.statsEmptyView.visibility = View.GONE
 
         val adapter: StatsBlockAdapter
         if (recyclerView.adapter == null) {
@@ -237,7 +236,7 @@ class StatsListFragment : ViewPagerFragment() {
             adapter = recyclerView.adapter as StatsBlockAdapter
         }
 
-        val layoutManager = recyclerView?.layoutManager
+        val layoutManager = recyclerView.layoutManager
         val recyclerViewState = layoutManager?.onSaveInstanceState()
         adapter.update(statsState)
         layoutManager?.onRestoreInstanceState(recyclerViewState)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
index 233d4952e33b..32a1b81e91e1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListViewModel.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.ui.stats.refresh.lists
 import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -43,7 +44,7 @@ abstract class StatsListViewModel(
     defaultDispatcher: CoroutineDispatcher,
     private val statsUseCase: BaseListUseCase,
     private val analyticsTracker: AnalyticsTrackerWrapper,
-    private val dateSelector: StatsDateSelector,
+    protected val dateSelector: StatsDateSelector,
     popupMenuHandler: ItemPopupMenuHandler? = null,
     private val newsCardHandler: NewsCardHandler? = null
 ) : ScopedViewModel(defaultDispatcher) {
@@ -70,7 +71,7 @@ abstract class StatsListViewModel(
     val listSelected = statsUseCase.listSelected
 
     val uiModel: LiveData<UiModel> by lazy {
-        statsUseCase.data.throttle(this, distinct = true)
+        statsUseCase.data.throttle(viewModelScope, distinct = true)
     }
 
     val dateSelectorData: LiveData<DateSelectorUiModel> = dateSelector.dateSelectorData.mapNullable {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/DetailListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/DetailListViewModel.kt
index 39c1faea7430..553ff06d2997 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/DetailListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/DetailListViewModel.kt
@@ -17,4 +17,9 @@ class DetailListViewModel
     @Named(BLOCK_DETAIL_USE_CASE) private val detailUseCase: BaseListUseCase,
     analyticsTracker: AnalyticsTrackerWrapper,
     dateSelectorFactory: StatsDateSelector.Factory
-) : StatsListViewModel(mainDispatcher, detailUseCase, analyticsTracker, dateSelectorFactory.build(DETAIL))
+) : StatsListViewModel(mainDispatcher, detailUseCase, analyticsTracker, dateSelectorFactory.build(DETAIL)) {
+    override fun onCleared() {
+        super.onCleared()
+        dateSelector.clear()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt
index d0dc57baf149..cb4e2081c605 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostAverageViewsPerDayUseCase.kt
@@ -17,7 +17,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.Us
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.utils.StatsPostProvider
@@ -89,7 +89,7 @@ class PostAverageViewsPerDayUseCase(
             items.add(
                     Link(
                             text = R.string.stats_insights_view_more,
-                            navigateAction = NavigationAction.create(this::onLinkClick)
+                            navigateAction = ListItemInteraction.create(this::onLinkClick)
                     )
             )
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt
index 8fb0de7f2070..f98f35e6b1ee 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostHeaderUseCase.kt
@@ -11,7 +11,7 @@ import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewAttachment
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewPost
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ReferredItem
 import org.wordpress.android.ui.stats.refresh.utils.StatsPostProvider
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt
index 29ba0a54bed5..5728e01c0725 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostMonthsAndYearsUseCase.kt
@@ -17,7 +17,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.Us
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.utils.StatsPostProvider
@@ -89,7 +89,7 @@ class PostMonthsAndYearsUseCase(
             items.add(
                     Link(
                             text = R.string.stats_insights_view_more,
-                            navigateAction = NavigationAction.create(this::onLinkClick)
+                            navigateAction = ListItemInteraction.create(this::onLinkClick)
                     )
             )
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt
index 1fa1d6870fd9..a30454ed5e08 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/PostRecentWeeksUseCase.kt
@@ -17,7 +17,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.Us
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.utils.StatsPostProvider
@@ -89,7 +89,7 @@ class PostRecentWeeksUseCase(
             items.add(
                     Link(
                             text = R.string.stats_insights_view_more,
-                            navigateAction = NavigationAction.create(this::onLinkClick)
+                            navigateAction = ListItemInteraction.create(this::onLinkClick)
                     )
             )
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt
index 19db85c00b36..5dcc609fc987 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailActivity.kt
@@ -4,10 +4,9 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.stats_detail_fragment.*
-import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.databinding.StatsDetailActivityBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.LocaleAwareActivity
 import org.wordpress.android.ui.stats.refresh.lists.StatsListFragment
@@ -22,12 +21,8 @@ const val POST_URL = "POST_URL"
 class StatsDetailActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.stats_detail_activity)
-        setSupportActionBar(toolbar)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-        }
+        val binding = StatsDetailActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt
index 033aeb774d4a..0bad628ff5c7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailFragment.kt
@@ -1,25 +1,22 @@
 package org.wordpress.android.ui.stats.refresh.lists.detail
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.stats_detail_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.StatsDetailFragmentBinding
 import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
-import org.wordpress.android.ui.stats.refresh.utils.drawDateSelector
 import org.wordpress.android.util.WPSwipeToRefreshHelper
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper
 import javax.inject.Inject
 
-class StatsDetailFragment : DaggerFragment() {
+class StatsDetailFragment : DaggerFragment(R.layout.stats_detail_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var statsSiteProvider: StatsSiteProvider
     private lateinit var viewModel: StatsDetailViewModel
@@ -30,20 +27,24 @@ class StatsDetailFragment : DaggerFragment() {
         setHasOptionsMenu(true)
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.stats_detail_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
         val nonNullActivity = requireActivity()
-
-        initializeViewModels(nonNullActivity)
-        initializeViews()
+        with(StatsDetailFragmentBinding.bind(view)) {
+            with(nonNullActivity as AppCompatActivity) {
+                setSupportActionBar(toolbar)
+                supportActionBar?.let {
+                    it.setHomeButtonEnabled(true)
+                    it.setDisplayHomeAsUpEnabled(true)
+                }
+            }
+            initializeViewModels(nonNullActivity)
+            initializeViews()
+        }
     }
 
-    private fun initializeViews() {
+    private fun StatsDetailFragmentBinding.initializeViews() {
         swipeToRefreshHelper = WPSwipeToRefreshHelper.buildSwipeToRefreshHelper(pullToRefresh) {
             viewModel.onPullToRefresh()
         }
@@ -58,7 +59,7 @@ class StatsDetailFragment : DaggerFragment() {
         val postTitle = activity.intent?.getSerializableExtra(POST_TITLE) as String?
         val postUrl = activity.intent?.getSerializableExtra(POST_URL) as String?
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(StatsSection.DETAIL.name, StatsDetailViewModel::class.java)
         viewModel.init(
                 checkNotNull(postId),
@@ -76,15 +77,5 @@ class StatsDetailFragment : DaggerFragment() {
                 swipeToRefreshHelper.isRefreshing = isRefreshing
             }
         })
-
-        viewModel.selectedDateChanged.observe(viewLifecycleOwner, Observer { event ->
-            if (event != null) {
-                viewModel.onDateChanged(event.selectedSection)
-            }
-        })
-
-        viewModel.showDateSelector.observe(viewLifecycleOwner, Observer { dateSelectorUiModel ->
-            drawDateSelector(dateSelectorUiModel)
-        })
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt
index aa80e0bdfc2a..781140346985 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/detail/StatsDetailViewModel.kt
@@ -3,15 +3,11 @@ package org.wordpress.android.ui.stats.refresh.lists.detail
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.stats.refresh.BLOCK_DETAIL_USE_CASE
 import org.wordpress.android.ui.stats.refresh.lists.BaseListUseCase
-import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection
-import org.wordpress.android.ui.stats.refresh.lists.StatsListViewModel.StatsSection.DETAIL
-import org.wordpress.android.ui.stats.refresh.utils.StatsDateSelector
 import org.wordpress.android.ui.stats.refresh.utils.StatsPostProvider
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
 import org.wordpress.android.ui.utils.UiString.UiStringRes
@@ -27,13 +23,10 @@ class StatsDetailViewModel
     @Named(BLOCK_DETAIL_USE_CASE) private val detailUseCase: BaseListUseCase,
     private val statsSiteProvider: StatsSiteProvider,
     private val statsPostProvider: StatsPostProvider,
-    private val networkUtilsWrapper: NetworkUtilsWrapper,
-    dateSelectorFactory: StatsDateSelector.Factory
+    private val networkUtilsWrapper: NetworkUtilsWrapper
 ) : ScopedViewModel(mainDispatcher) {
-    private val dateSelector = dateSelectorFactory.build(DETAIL)
     private val _isRefreshing = MutableLiveData<Boolean>()
     val isRefreshing: LiveData<Boolean> = _isRefreshing
-    val selectedDateChanged = dateSelector.selectedDate
 
     private val _showSnackbarMessage = mergeNotNull(
             detailUseCase.snackbarMessage,
@@ -41,7 +34,6 @@ class StatsDetailViewModel
             singleEvent = true
     )
     val showSnackbarMessage: LiveData<SnackbarMessageHolder> = _showSnackbarMessage
-    val showDateSelector = dateSelector.dateSelectorData
 
     fun init(
         postId: Long,
@@ -52,12 +44,6 @@ class StatsDetailViewModel
         statsPostProvider.init(postId, postType, postTitle, postUrl)
     }
 
-    fun onDateChanged(selectedSection: StatsSection) {
-        launch {
-            detailUseCase.onDateChanged(selectedSection)
-        }
-    }
-
     fun refresh() {
         launch {
             detailUseCase.refreshData(true)
@@ -67,7 +53,6 @@ class StatsDetailViewModel
 
     override fun onCleared() {
         super.onCleared()
-        dateSelector.clear()
         detailUseCase.onCleared()
         statsPostProvider.clear()
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt
index 1b3ed8643d45..b27fb1e215e7 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListItem.kt
@@ -31,6 +31,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.TITLE
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.VALUE_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ValueItem.State.POSITIVE
+import org.wordpress.android.ui.utils.ListItemInteraction
 
 sealed class BlockListItem(val type: Type) {
     fun id(): Int {
@@ -88,7 +89,7 @@ sealed class BlockListItem(val type: Type) {
     data class ReferredItem(
         @StringRes val label: Int,
         val itemTitle: String,
-        val navigationAction: NavigationAction? = null
+        val navigationAction: ListItemInteraction? = null
     ) : BlockListItem(REFERRED_ITEM)
 
     data class ValueItem(
@@ -123,7 +124,7 @@ sealed class BlockListItem(val type: Type) {
         val barWidth: Int? = null,
         val showDivider: Boolean = true,
         val textStyle: TextStyle = TextStyle.NORMAL,
-        val navigationAction: NavigationAction? = null,
+        val navigationAction: ListItemInteraction? = null,
         val longClickAction: ((View) -> Boolean)? = null,
         val contentDescription: String,
         @ColorRes val tint: Int? = null
@@ -156,7 +157,7 @@ sealed class BlockListItem(val type: Type) {
             BlockListItem(TEXT) {
         data class Clickable(
             val link: String,
-            val navigationAction: NavigationAction
+            val navigationAction: ListItemInteraction
         )
     }
 
@@ -174,14 +175,14 @@ sealed class BlockListItem(val type: Type) {
     data class Link(
         @DrawableRes val icon: Int? = null,
         @StringRes val text: Int,
-        val navigateAction: NavigationAction
+        val navigateAction: ListItemInteraction
     ) : BlockListItem(LINK)
 
     data class DialogButtons(
         @StringRes val positiveButtonText: Int,
-        val positiveAction: NavigationAction,
+        val positiveAction: ListItemInteraction,
         @StringRes val negativeButtonText: Int,
-        val negativeAction: NavigationAction
+        val negativeAction: ListItemInteraction
     ) : BlockListItem(DIALOG_BUTTONS)
 
     data class BarChartItem(
@@ -244,35 +245,4 @@ sealed class BlockListItem(val type: Type) {
         override val itemId: Int
             get() = blocks.fold(0) { acc, block -> acc + block.label.hashCode() }
     }
-
-    interface NavigationAction {
-        fun click()
-
-        companion object {
-            fun create(action: () -> Unit): NavigationAction {
-                return NoParams(action)
-            }
-
-            fun <T> create(data: T, action: (T) -> Unit): NavigationAction {
-                return OneParam(data, action)
-            }
-        }
-
-        private data class OneParam<T>(
-            val data: T,
-            val action: (T) -> Unit
-        ) : NavigationAction {
-            override fun click() {
-                action(data)
-            }
-        }
-
-        private data class NoParams(
-            val action: () -> Unit
-        ) : NavigationAction {
-            override fun click() {
-                action()
-            }
-        }
-    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt
index 6e88dd7781a4..a7607d6f9b13 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt
@@ -29,7 +29,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListI
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.IconStyle.EMPTY_SPACE
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.IconStyle.NORMAL
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle.LIGHT
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion.create
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatefulUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt
index bf179f1304bf..8c8dcc5806d9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt
@@ -25,7 +25,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Heade
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle.LIGHT
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion.create
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatefulUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt
index 13bea4f97d5c..af993741ccd1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt
@@ -23,7 +23,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.MapItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.MapLegend
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion.create
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/FileDownloadsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/FileDownloadsUseCase.kt
index e8dd4a27d18d..63b5645b08ca 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/FileDownloadsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/FileDownloadsUseCase.kt
@@ -21,7 +21,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
@@ -137,7 +137,7 @@ constructor(
                 items.add(
                         Link(
                                 text = R.string.stats_insights_view_more,
-                                navigateAction = NavigationAction.create(statsGranularity, this::onViewMoreClick)
+                                navigateAction = ListItemInteraction.create(statsGranularity, this::onViewMoreClick)
                         )
                 )
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt
index fc7fba04378f..ea21786fbe90 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCase.kt
@@ -3,6 +3,8 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases
 import kotlinx.coroutines.CoroutineDispatcher
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_OVERVIEW_ERROR
+import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.time.VisitsAndViewsModel
 import org.wordpress.android.fluxc.network.utils.StatsGranularity
@@ -23,10 +25,13 @@ import org.wordpress.android.ui.stats.refresh.utils.toStatsSection
 import org.wordpress.android.ui.stats.refresh.utils.trackGranular
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.ResourceProvider
+import java.util.Calendar
 import javax.inject.Inject
 import javax.inject.Named
+import kotlin.math.ceil
 
 const val OVERVIEW_ITEMS_TO_LOAD = 15
 
@@ -42,6 +47,7 @@ constructor(
     @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher,
     private val analyticsTracker: AnalyticsTrackerWrapper,
     private val statsWidgetUpdaters: StatsWidgetUpdaters,
+    private val localeManagerWrapper: LocaleManagerWrapper,
     private val resourceProvider: ResourceProvider
 ) : BaseStatsUseCase<VisitsAndViewsModel, UiState>(
         OVERVIEW,
@@ -68,6 +74,7 @@ constructor(
                 LimitMode.All
         )
         if (cachedData != null) {
+            logIfIncorrectData(cachedData, statsGranularity, statsSiteProvider.siteModel, false)
             selectedDateProvider.onDateLoadingSucceeded(statsGranularity)
         }
         return cachedData
@@ -89,6 +96,7 @@ constructor(
                 State.Error(error.message ?: error.type.name)
             }
             model != null && model.dates.isNotEmpty() -> {
+                logIfIncorrectData(model, statsGranularity, statsSiteProvider.siteModel, true)
                 selectedDateProvider.onDateLoadingSucceeded(statsGranularity)
                 State.Data(model)
             }
@@ -99,6 +107,38 @@ constructor(
         }
     }
 
+    /**
+     * Track the incorrect data shown for some users
+     * see https://github.com/wordpress-mobile/WordPress-Android/issues/11412
+     */
+    private fun logIfIncorrectData(
+        model: VisitsAndViewsModel,
+        granularity: StatsGranularity,
+        site: SiteModel,
+        fetched: Boolean
+    ) {
+        model.dates.lastOrNull()?.let { lastDayData ->
+            val yesterday = localeManagerWrapper.getCurrentCalendar()
+            yesterday.add(Calendar.DAY_OF_YEAR, -1)
+            val lastDayDate = statsDateFormatter.parseStatsDate(granularity, lastDayData.period)
+            if (lastDayDate.before(yesterday.time)) {
+                val currentCalendar = localeManagerWrapper.getCurrentCalendar()
+                val lastItemAge = ceil((currentCalendar.timeInMillis - lastDayDate.time) / 86400000.0)
+                analyticsTracker.track(
+                        STATS_OVERVIEW_ERROR,
+                        mapOf(
+                                "stats_last_date" to statsDateFormatter.printStatsDate(lastDayDate),
+                                "stats_current_date" to statsDateFormatter.printStatsDate(currentCalendar.time),
+                                "stats_age_in_days" to lastItemAge.toInt(),
+                                "is_jetpack_connected" to site.isJetpackConnected,
+                                "is_atomic" to site.isWPComAtomic,
+                                "action_source" to if (fetched) "remote" else "cached"
+                        )
+                )
+            }
+        }
+    }
+
     override fun buildUiModel(
         domainModel: VisitsAndViewsModel,
         uiState: UiState
@@ -195,6 +235,7 @@ constructor(
         private val visitsAndViewsStore: VisitsAndViewsStore,
         private val analyticsTracker: AnalyticsTrackerWrapper,
         private val statsWidgetUpdaters: StatsWidgetUpdaters,
+        private val localeManagerWrapper: LocaleManagerWrapper,
         private val resourceProvider: ResourceProvider
     ) : GranularUseCaseFactory {
         override fun build(granularity: StatsGranularity, useCaseMode: UseCaseMode) =
@@ -209,6 +250,7 @@ constructor(
                         backgroundDispatcher,
                         analyticsTracker,
                         statsWidgetUpdaters,
+                        localeManagerWrapper,
                         resourceProvider
                 )
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt
index fbbb6cb1f82e..f758fbf6f6b6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/PostsAndPagesUseCase.kt
@@ -30,7 +30,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion.create
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt
index 5dd078ea9d76..fef1a107541b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ReferrersUseCase.kt
@@ -31,7 +31,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListI
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.IconStyle.NORMAL
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle.LIGHT
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion.create
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatefulUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt
index c88374125f9f..104e2b78969a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/SearchTermsUseCase.kt
@@ -21,7 +21,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion.create
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion.create
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt
index 8562aa511ab1..aa0b5e5c56fb 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/VideoPlaysUseCase.kt
@@ -22,7 +22,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularUseCaseFactory
@@ -104,7 +104,7 @@ constructor(
                         text = videoPlays.title,
                         value = statsUtils.toFormattedString(videoPlays.plays),
                         showDivider = index < domainModel.plays.size - 1,
-                        navigationAction = videoPlays.url?.let { NavigationAction.create(it, this::onItemClick) },
+                        navigationAction = videoPlays.url?.let { ListItemInteraction.create(it, this::onItemClick) },
                         contentDescription = contentDescriptionHelper.buildContentDescription(
                                 header,
                                 videoPlays.title,
@@ -117,7 +117,7 @@ constructor(
                 items.add(
                         Link(
                                 text = R.string.stats_insights_view_more,
-                                navigateAction = NavigationAction.create(statsGranularity, this::onViewMoreClick)
+                                navigateAction = ListItemInteraction.create(statsGranularity, this::onViewMoreClick)
                         )
                 )
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt
index 0ffc1ccf8451..fbb3d52ec2a1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementActivity.kt
@@ -2,17 +2,18 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.insights.managemen
 
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.InsightsManagementActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class InsightsManagementActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        with(InsightsManagementActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
 
-        setContentView(R.layout.insights_management_activity)
-
-        setSupportActionBar(toolbar_main)
+            setSupportActionBar(toolbarMain)
+        }
 
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt
index e52a5f0a1f1e..7314f971a9ac 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementFragment.kt
@@ -1,49 +1,42 @@
 package org.wordpress.android.ui.stats.refresh.lists.sections.insights.management
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.insights_management_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.InsightsManagementFragmentBinding
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem
 import javax.inject.Inject
 
-class InsightsManagementFragment : DaggerFragment() {
+class InsightsManagementFragment : DaggerFragment(R.layout.insights_management_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: InsightsManagementViewModel
 
     private var menu: Menu? = null
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        setHasOptionsMenu(true)
-        return inflater.inflate(R.layout.insights_management_fragment, container, false)
-    }
-
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-
         inflater.inflate(R.menu.menu_insights_management, menu)
         this.menu = menu
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        setHasOptionsMenu(true)
         super.onViewCreated(view, savedInstanceState)
-
-        val siteId = activity?.intent?.getIntExtra(WordPress.LOCAL_SITE_ID, 0)
-        initializeViews()
-        initializeViewModels(requireActivity(), siteId)
+        with(InsightsManagementFragmentBinding.bind(view)) {
+            val siteId = activity?.intent?.getIntExtra(WordPress.LOCAL_SITE_ID, 0)
+            initializeViews()
+            initializeViewModels(requireActivity(), siteId)
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -53,19 +46,19 @@ class InsightsManagementFragment : DaggerFragment() {
         return true
     }
 
-    private fun initializeViews() {
+    private fun InsightsManagementFragmentBinding.initializeViews() {
         insightCards.layoutManager = LinearLayoutManager(requireActivity(), RecyclerView.VERTICAL, false)
     }
 
-    private fun initializeViewModels(activity: FragmentActivity, siteId: Int?) {
-        viewModel = ViewModelProviders.of(activity, viewModelFactory).get(InsightsManagementViewModel::class.java)
+    private fun InsightsManagementFragmentBinding.initializeViewModels(activity: FragmentActivity, siteId: Int?) {
+        viewModel = ViewModelProvider(activity, viewModelFactory).get(InsightsManagementViewModel::class.java)
 
         viewModel.start(siteId)
 
         setupObservers()
     }
 
-    private fun setupObservers() {
+    private fun InsightsManagementFragmentBinding.setupObservers() {
         viewModel.addedInsights.observe(viewLifecycleOwner, Observer {
             it?.let { items ->
                 updateAddedInsights(items)
@@ -89,7 +82,7 @@ class InsightsManagementFragment : DaggerFragment() {
         })
     }
 
-    private fun updateAddedInsights(insights: List<InsightListItem>) {
+    private fun InsightsManagementFragmentBinding.updateAddedInsights(insights: List<InsightListItem>) {
         var adapter = insightCards.adapter as? InsightsManagementAdapter
         if (adapter == null) {
             adapter = InsightsManagementAdapter()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt
index 6e4c3b91bd7e..37b3f551311d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementMapper.kt
@@ -17,12 +17,12 @@ import org.wordpress.android.fluxc.store.StatsStore.InsightType.PUBLICIZE
 import org.wordpress.android.fluxc.store.StatsStore.InsightType.TAGS_AND_CATEGORIES
 import org.wordpress.android.fluxc.store.StatsStore.InsightType.TODAY_STATS
 import org.wordpress.android.modules.BG_THREAD
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem.InsightModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem.InsightModel.Status.ADDED
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem.InsightModel.Status.REMOVED
+import org.wordpress.android.ui.utils.ListItemInteraction
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -71,7 +71,7 @@ class InsightsManagementMapper
                 type,
                 toName(type),
                 if (addedInsightTypes.any { it == type }) ADDED else REMOVED,
-                NavigationAction.create { onClick(type) }
+                ListItemInteraction.create(type, onClick)
         )
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt
index 888ea9d6825b..6ab299b14440 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/management/InsightsManagementViewModel.kt
@@ -12,7 +12,7 @@ import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.INSIGHTS_USE_CASE
 import org.wordpress.android.ui.stats.refresh.lists.BaseListUseCase
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem.Type.HEADER
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.management.InsightsManagementViewModel.InsightListItem.Type.INSIGHT
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
@@ -111,7 +111,7 @@ class InsightsManagementViewModel @Inject constructor(
             val insightType: InsightType,
             val name: Int,
             val status: Status,
-            val onClick: NavigationAction
+            val onClick: ListItemInteraction
         ) : InsightListItem(INSIGHT) {
             enum class Status {
                 ADDED,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt
index ed9312565325..ecfbc9d15b7d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/AnnualSiteStatsUseCase.kt
@@ -15,7 +15,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.Us
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.UseCaseMode.VIEW_ALL
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
@@ -78,7 +78,7 @@ class AnnualSiteStatsUseCase(
                     items.add(
                             Link(
                                     text = R.string.stats_insights_view_more,
-                                    navigateAction = NavigationAction.create(this::onViewMoreClicked)
+                                    navigateAction = ListItemInteraction.create(this::onViewMoreClicked)
                             )
                     )
                 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCase.kt
index 77eacd89a089..ad32b5a0289b 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCase.kt
@@ -126,7 +126,7 @@ class FollowerTotalsUseCase
 
     private fun getIcon(type: FollowerType): Int {
         return when (type) {
-            WP_COM -> R.drawable.ic_my_sites_white_24dp
+            WP_COM -> R.drawable.ic_wordpress_white_24dp
             EMAIL -> R.drawable.ic_mail_white_24dp
             SOCIAL -> R.drawable.ic_share_white_24dp
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
index e646c3fc941a..353c1d38d734 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowersUseCase.kt
@@ -28,7 +28,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.IconStyle.AVATAR
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LoadingItem
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.TabsItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
@@ -162,7 +162,7 @@ class FollowersUseCase(
                     items.add(
                             Link(
                                     text = buttonText,
-                                    navigateAction = NavigationAction.create(uiState.selectedTab, this::onLinkClick)
+                                    navigateAction = ListItemInteraction.create(uiState.selectedTab, this::onLinkClick)
                             )
                     )
                 } else if (wpComModel.followers.size >= VIEW_ALL_PAGE_SIZE && uiState.selectedTab == 0 ||
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryMapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryMapper.kt
index 2b0be6a040b2..432e1de66f64 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryMapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryMapper.kt
@@ -5,7 +5,7 @@ import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.stats.InsightsLatestPostModel
 import org.wordpress.android.ui.stats.StatsUtilsWrapper
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.BarChartItem
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Text
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Text.Clickable
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.LatestPostSummaryUseCase.LinkClickParams
@@ -52,7 +52,7 @@ class LatestPostSummaryMapper
                 links = listOf(
                         Clickable(
                                 postTitle,
-                                navigationAction = NavigationAction.create(
+                                navigationAction = ListItemInteraction.create(
                                         LinkClickParams(model.postId, model.postURL),
                                         action = navigationAction
                                 )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt
index bbeb49ff6170..48306c28fa65 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/LatestPostSummaryUseCase.kt
@@ -20,7 +20,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.St
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ValueItem
 import org.wordpress.android.ui.stats.refresh.utils.ContentDescriptionHelper
@@ -131,11 +131,11 @@ class LatestPostSummaryUseCase
             model == null -> Link(
                     R.drawable.ic_create_white_24dp,
                     R.string.stats_insights_create_post,
-                    navigateAction = NavigationAction.create(this::onAddNewPostClick)
+                    navigateAction = ListItemInteraction.create(this::onAddNewPostClick)
             )
             model.hasData() -> Link(
                     text = R.string.stats_insights_view_more,
-                    navigateAction = NavigationAction.create(
+                    navigateAction = ListItemInteraction.create(
                             ViewMoreParams(model.postId, model.postTitle, model.postURL),
                             this::onViewMore
                     )
@@ -143,7 +143,7 @@ class LatestPostSummaryUseCase
             else -> Link(
                     R.drawable.ic_share_white_24dp,
                     R.string.stats_insights_share_post,
-                    navigateAction = NavigationAction.create(
+                    navigateAction = ListItemInteraction.create(
                             SharePostParams(model.postURL, model.postTitle),
                             this::onSharePost
                     )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementControlUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementControlUseCase.kt
index 5dcb60b12c0e..69323d9967f1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementControlUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementControlUseCase.kt
@@ -9,7 +9,7 @@ import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.stats.refresh.NavigationTarget.ViewInsightsManagement
 import org.wordpress.android.ui.stats.refresh.lists.sections.BaseStatsUseCase.StatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction.Companion
+import org.wordpress.android.ui.utils.ListItemInteraction.Companion
 import org.wordpress.android.ui.stats.refresh.utils.NewsCardHandler
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.ResourceProvider
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementNewsCardUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementNewsCardUseCase.kt
index ba2ad95e3d78..2c98dd8c6b17 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementNewsCardUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/ManagementNewsCardUseCase.kt
@@ -11,7 +11,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.BigTitle
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.DialogButtons
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ImageItem
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Tag
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Text
 import org.wordpress.android.ui.stats.refresh.utils.NewsCardHandler
@@ -44,9 +44,9 @@ class ManagementNewsCardUseCase
                 Text(text = newsCardMessage, bolds = listOf(highlightedText)),
                 DialogButtons(
                         R.string.stats_management_try_it_now,
-                        NavigationAction.create(this::onEditInsights),
+                        ListItemInteraction.create(this::onEditInsights),
                         R.string.stats_management_dismiss_insights_news_card,
-                        NavigationAction.create(this::onDismiss)
+                        ListItemInteraction.create(this::onDismiss)
                 )
         )
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
index cf7383be569b..1df867a1dc17 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/PublicizeUseCase.kt
@@ -19,7 +19,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Header
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.utils.ItemPopupMenuHandler
@@ -94,7 +94,7 @@ class PublicizeUseCase
                 items.add(
                         Link(
                                 text = R.string.stats_insights_view_more,
-                                navigateAction = NavigationAction.create(this::onLinkClick)
+                                navigateAction = ListItemInteraction.create(this::onLinkClick)
                         )
                 )
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt
index 3c3109eff8bc..4d6b66589009 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/TagsAndCategoriesUseCase.kt
@@ -26,7 +26,7 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Heade
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon.TextStyle.LIGHT
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.NavigationAction
+import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightUseCaseFactory
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.usecases.TagsAndCategoriesUseCase.TagsAndCategoriesUiState
@@ -127,7 +127,7 @@ class TagsAndCategoriesUseCase
                 items.add(
                         Link(
                                 text = R.string.stats_insights_view_more,
-                                navigateAction = NavigationAction.create(this::onLinkClick)
+                                navigateAction = ListItemInteraction.create(this::onLinkClick)
                         )
                 )
             }
@@ -149,7 +149,7 @@ class TagsAndCategoriesUseCase
                 value = statsUtils.toFormattedString(tag.views),
                 barWidth = getBarWidth(tag.views, maxViews),
                 showDivider = index < listSize - 1,
-                navigationAction = NavigationAction.create(item.link, this::onTagClick),
+                navigationAction = ListItemInteraction.create(item.link, this::onTagClick),
                 contentDescription = contentDescriptionHelper.buildContentDescription(
                         header,
                         item.name,
@@ -191,7 +191,7 @@ class TagsAndCategoriesUseCase
                 textStyle = LIGHT,
                 text = item.name,
                 showDivider = false,
-                navigationAction = NavigationAction.create(item.link, this::onTagClick),
+                navigationAction = ListItemInteraction.create(item.link, this::onTagClick),
                 contentDescription = contentDescriptionHelper.buildContentDescription(
                         header.startLabel,
                         item.name
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ActivityViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ActivityViewHolder.kt
index e6c766f14c5e..95ea4c1171de 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ActivityViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ActivityViewHolder.kt
@@ -3,62 +3,60 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.viewholders
 import android.graphics.Rect
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.stats_block_single_activity.view.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsBlockActivityItemBinding
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ActivityItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ActivityItem.Box
 import org.wordpress.android.util.ContentDescriptionListAnnouncer
+import org.wordpress.android.util.viewBinding
 
 private const val SIZE_PADDING = 32
 private const val GAP = 8
 private const val BLOCK_WIDTH = 104
 private const val SPAN_COUNT = 7
 
-class ActivityViewHolder(val parent: ViewGroup) : BlockListItemViewHolder(
-        parent,
-        R.layout.stats_block_activity_item
+class ActivityViewHolder(
+    parent: ViewGroup,
+    val binding: StatsBlockActivityItemBinding = parent.viewBinding(StatsBlockActivityItemBinding::inflate)
+) : BlockListItemViewHolder(
+        binding.root
 ) {
     private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
-    private val firstBlock = itemView.findViewById<LinearLayout>(R.id.first_activity)
-    private val secondBlock = itemView.findViewById<LinearLayout>(R.id.second_activity)
-    private val thirdBlock = itemView.findViewById<LinearLayout>(R.id.third_activity)
-
     fun bind(
         item: ActivityItem
-    ) {
-        drawBlock(firstBlock.activity, item.blocks[0].boxes)
-        firstBlock.label.text = item.blocks[0].label
+    ) = with(binding) {
+        drawBlock(firstActivity.activity, item.blocks[0].boxes)
+        firstActivity.label.text = item.blocks[0].label
         if (item.blocks.size > 1) {
-            drawBlock(secondBlock.activity, item.blocks[1].boxes)
-            secondBlock.label.text = item.blocks[1].label
+            drawBlock(secondActivity.activity, item.blocks[1].boxes)
+            secondActivity.label.text = item.blocks[1].label
         }
         if (item.blocks.size > 2) {
-            drawBlock(thirdBlock.activity, item.blocks[2].boxes)
-            thirdBlock.label.text = item.blocks[2].label
+            drawBlock(thirdActivity.activity, item.blocks[2].boxes)
+            thirdActivity.label.text = item.blocks[2].label
         }
-        val widthInDp = parent.width / parent.context.resources.displayMetrics.density
+        val widthInDp = root.width / root.context.resources.displayMetrics.density
         if (widthInDp > BLOCK_WIDTH + 2 * GAP) {
             updateVisibility(item, widthInDp)
         } else {
             coroutineScope.launch {
                 delay(50)
-                updateVisibility(item, parent.width / parent.context.resources.displayMetrics.density)
+                updateVisibility(item, root.width / root.context.resources.displayMetrics.density)
             }
         }
 
         setupBlocksForAccessibility(item)
     }
 
-    private fun setupBlocksForAccessibility(item: ActivityItem) {
-        val blocks = listOf(firstBlock, secondBlock, thirdBlock)
+    private fun StatsBlockActivityItemBinding.setupBlocksForAccessibility(item: ActivityItem) {
+        val blocks = listOf(firstActivity, secondActivity, thirdActivity)
 
         blocks.forEachIndexed { index, block ->
             block.label.contentDescription = item.blocks[index].contentDescription
@@ -68,26 +66,26 @@ class ActivityViewHolder(val parent: ViewGroup) : BlockListItemViewHolder(
                     R.string.stats_posting_activity_empty_description,
                     R.string.stats_posting_activity_end_description,
                     R.string.stats_posting_activity_action,
-                    requireNotNull(item.blocks[index].activityContentDescriptions), block
+                    requireNotNull(item.blocks[index].activityContentDescriptions), block.root
             )
         }
     }
 
-    private fun updateVisibility(
+    private fun StatsBlockActivityItemBinding.updateVisibility(
         item: ActivityItem,
         widthInDp: Float
     ) {
         val canFitTwoBlocks = widthInDp > 2 * BLOCK_WIDTH + GAP + SIZE_PADDING
         if (canFitTwoBlocks && item.blocks.size > 1) {
-            secondBlock.visibility = View.VISIBLE
+            secondActivity.root.visibility = View.VISIBLE
         } else {
-            secondBlock.visibility = View.GONE
+            secondActivity.root.visibility = View.GONE
         }
         val canFitThreeBlocks = widthInDp > 3 * BLOCK_WIDTH + 2 * GAP + SIZE_PADDING
         if (canFitThreeBlocks && item.blocks.size > 2) {
-            firstBlock.visibility = View.VISIBLE
+            firstActivity.root.visibility = View.VISIBLE
         } else {
-            firstBlock.visibility = View.GONE
+            firstActivity.root.visibility = View.GONE
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt
index 4d54dc345d6f..665592e5e1c9 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt
@@ -27,7 +27,7 @@ import org.wordpress.android.ui.stats.refresh.utils.LargeValueFormatter
 import org.wordpress.android.util.DisplayUtils
 
 private const val MIN_COLUMN_COUNT = 5
-private const val MIN_VALUE = 5f
+private const val MIN_VALUE = 4f
 
 private typealias BarCount = Int
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt
index b7699c68af7c..1fcfe845fa85 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt
@@ -20,9 +20,13 @@ import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND
 import org.wordpress.android.util.image.ImageType.ICON
 
 open class BlockListItemViewHolder(
-    parent: ViewGroup,
-    @LayoutRes layout: Int
-) : ViewHolder(LayoutInflater.from(parent.context).inflate(layout, parent, false)) {
+    view: View
+) : ViewHolder(view) {
+    constructor(parent: ViewGroup, @LayoutRes layout: Int) : this(
+            LayoutInflater.from(parent.context)
+                    .inflate(layout, parent, false)
+    )
+
     protected fun TextView.setTextOrHide(@StringRes resource: Int?, value: String?) {
         this.visibility = View.VISIBLE
         when {
@@ -83,7 +87,7 @@ open class BlockListItemViewHolder(
                 this.visibility = View.VISIBLE
                 when (item.iconStyle) {
                     NORMAL -> {
-                        findViewById<ImageView>(R.id.avatar).visibility = View.GONE
+                        avatar.visibility = View.GONE
                         icon.setImageOrLoad(item, imageManager)
                     }
                     AVATAR -> {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt
index 7fcb20b5f4b5..99269981d050 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.ui.stats.refresh.lists.sections.viewholders
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.net.http.SslError
 import android.util.Base64
 import android.view.View
@@ -11,6 +12,8 @@ import android.webkit.WebResourceRequest
 import android.webkit.WebSettings
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.coroutines.CoroutineScope
@@ -18,6 +21,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
+import org.wordpress.android.R.attr
+import org.wordpress.android.R.color
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.MapItem
 import org.wordpress.android.util.getColorFromAttribute
 
@@ -27,41 +32,22 @@ class MapViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
 ) {
     private val coroutineScope = CoroutineScope(Dispatchers.Default)
     private val webView: WebView = itemView.findViewById(R.id.web_view)
+
     @SuppressLint("SetJavaScriptEnabled")
     fun bind(item: MapItem) {
         coroutineScope.launch {
             delay(100)
-            // See: https://developers.google.com/chart/interactive/docs/gallery/geochart
-            // Loading the v42 of the Google Charts API, since the latest stable version has a problem with
-            // the legend. https://github.com/wordpress-mobile/WordPress-Android/issues/4131
-            // https://developers.google.com/chart/interactive/docs/release_notes#release-candidate-details
-            val colorLow = Integer.toHexString(
-                    ContextCompat.getColor(
-                            itemView.context,
-                            R.color.stats_map_activity_low
-                    ) and 0xffffff
-            )
-            val colorHigh = Integer.toHexString(
-                    ContextCompat.getColor(
-                            itemView.context,
-                            R.color.stats_map_activity_high
-                    ) and 0xffffff
-            )
-            val backgroundColor = Integer.toHexString(
-                    itemView.context.getColorFromAttribute(R.attr.colorSurface) and 0xffffff
-            )
-            val emptyColor = Integer.toHexString(
-                    ContextCompat.getColor(
-                            itemView.context,
-                            R.color.stats_map_activity_empty
-                    ) and 0xffffff
-            )
+            val context = itemView.context
+            val colorLow = toHexString(color.stats_map_activity_low, context)
+            val colorHigh = toHexString(color.stats_map_activity_high, context)
+            val backgroundColor = toHexString(context.getColorFromAttribute(attr.colorSurface))
+            val emptyColor = toHexString(color.stats_map_activity_empty, context)
             val htmlPage = ("<html>" +
                     "<head>" +
                     "<script type=\"text/javascript\" src=\"https://www.gstatic.com/charts/loader.js\"></script>" +
                     "<script type=\"text/javascript\" src=\"https://www.google.com/jsapi\"></script>" +
                     "<script type=\"text/javascript\">" +
-                    " google.charts.load('42', {'packages':['geochart']});" +
+                    " google.charts.load('current', {'packages':['geochart']});" +
                     " google.charts.setOnLoadCallback(drawRegionsMap);" +
                     " function drawRegionsMap() {" +
                     " var data = google.visualization.arrayToDataTable(" +
@@ -125,4 +111,12 @@ class MapViewHolder(parent: ViewGroup) : BlockListItemViewHolder(
             }
         }
     }
+
+    private fun toHexString(@ColorRes colorId: Int, context: Context): String {
+        return toHexString(ContextCompat.getColor(context, colorId))
+    }
+
+    private fun toHexString(@ColorInt color: Int): String {
+        return String.format("%06X", (color and 0xffffff))
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt
index d8d9cbc01a15..2d8364d7ce9a 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/alltime/StatsAllTimeWidgetConfigureActivity.kt
@@ -2,17 +2,17 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.alltime
 
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsAllTimeWidgetConfigureActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class StatsAllTimeWidgetConfigureActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        with(StatsAllTimeWidgetConfigureActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
 
-        setContentView(R.layout.stats_all_time_widget_configure_activity)
-
-        setSupportActionBar(toolbar_main)
+            setSupportActionBar(toolbar.toolbarMain)
+        }
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetColorSelectionDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetColorSelectionDialogFragment.kt
index 0404610d0bd6..7d0b9ee28440 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetColorSelectionDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetColorSelectionDialogFragment.kt
@@ -7,7 +7,6 @@ import android.widget.RadioGroup
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.android.support.AndroidSupportInjection
 import org.wordpress.android.R
@@ -23,7 +22,7 @@ class StatsWidgetColorSelectionDialogFragment : AppCompatDialogFragment() {
     private lateinit var viewModel: StatsColorSelectionViewModel
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(StatsColorSelectionViewModel::class.java)
         val alertDialogBuilder = MaterialAlertDialogBuilder(requireActivity())
         val view = requireActivity().layoutInflater.inflate(R.layout.stats_color_selector, null) as RadioGroup
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetConfigureFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetConfigureFragment.kt
index 6e7c29695a79..49d1ea6b8b28 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetConfigureFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetConfigureFragment.kt
@@ -10,13 +10,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.stats_widget_configure_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_WIDGET_ADDED
+import org.wordpress.android.databinding.StatsWidgetConfigureFragmentBinding
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.stats.refresh.lists.widget.alltime.AllTimeWidgetUpdater
@@ -30,6 +28,7 @@ import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.merge
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class StatsWidgetConfigureFragment : DaggerFragment() {
@@ -70,11 +69,11 @@ class StatsWidgetConfigureFragment : DaggerFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val nonNullActivity = requireActivity()
-        viewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        viewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsWidgetConfigureViewModel::class.java)
-        siteSelectionViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        siteSelectionViewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsSiteSelectionViewModel::class.java)
-        colorSelectionViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        colorSelectionViewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsColorSelectionViewModel::class.java)
         nonNullActivity.setResult(AppCompatActivity.RESULT_CANCELED)
 
@@ -89,53 +88,46 @@ class StatsWidgetConfigureFragment : DaggerFragment() {
         }
 
         viewModel.start(appWidgetId, widgetType, siteSelectionViewModel, colorSelectionViewModel)
+        with(StatsWidgetConfigureFragmentBinding.bind(view)) {
+            siteContainer.setOnClickListener {
+                siteSelectionViewModel.openSiteDialog()
+            }
+            colorContainer.setOnClickListener {
+                colorSelectionViewModel.openColorDialog()
+            }
 
-        site_container.setOnClickListener {
-            siteSelectionViewModel.openSiteDialog()
-        }
-        color_container.setOnClickListener {
-            colorSelectionViewModel.openColorDialog()
-        }
-
-        add_widget_button.setOnClickListener {
-            viewModel.addWidget()
-        }
+            addWidgetButton.setOnClickListener {
+                viewModel.addWidget()
+            }
 
-        siteSelectionViewModel.dialogOpened.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
+            siteSelectionViewModel.dialogOpened.observeEvent(viewLifecycleOwner, {
                 StatsWidgetSiteSelectionDialogFragment().show(requireFragmentManager(), "stats_site_selection_fragment")
-            }
-        })
+            })
 
-        colorSelectionViewModel.dialogOpened.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
+            colorSelectionViewModel.dialogOpened.observeEvent(viewLifecycleOwner, {
                 StatsWidgetColorSelectionDialogFragment().show(
                         requireFragmentManager(),
                         "stats_view_mode_selection_fragment"
                 )
-            }
-        })
-
-        merge(siteSelectionViewModel.notification, colorSelectionViewModel.notification).observe(
-                viewLifecycleOwner,
-                Observer { event ->
-                    event?.applyIfNotHandled {
-                        ToastUtils.showToast(activity, this)
+            })
+
+            merge(siteSelectionViewModel.notification, colorSelectionViewModel.notification).observeEvent(
+                    viewLifecycleOwner,
+                    {
+                        ToastUtils.showToast(activity, it)
+                    })
+
+            viewModel.settingsModel.observe(viewLifecycleOwner, { uiModel ->
+                uiModel?.let {
+                    if (uiModel.siteTitle != null) {
+                        siteValue.text = uiModel.siteTitle
                     }
-                })
-
-        viewModel.settingsModel.observe(viewLifecycleOwner, Observer { uiModel ->
-            uiModel?.let {
-                if (uiModel.siteTitle != null) {
-                    site_value.text = uiModel.siteTitle
+                    colorValue.setText(uiModel.color.title)
+                    addWidgetButton.isEnabled = uiModel.buttonEnabled
                 }
-                color_value.setText(uiModel.color.title)
-                add_widget_button.isEnabled = uiModel.buttonEnabled
-            }
-        })
+            })
 
-        viewModel.widgetAdded.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let {
+            viewModel.widgetAdded.observeEvent(viewLifecycleOwner, {
                 analyticsTrackerWrapper.trackWithWidgetType(STATS_WIDGET_ADDED, it.widgetType)
                 when (it.widgetType) {
                     WEEK_VIEWS -> {
@@ -152,8 +144,8 @@ class StatsWidgetConfigureFragment : DaggerFragment() {
                 resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
                 activity?.setResult(RESULT_OK, resultValue)
                 activity?.finish()
-            }
-        })
+            })
+        }
     }
 
     enum class WidgetType { WEEK_VIEWS, ALL_TIME_VIEWS, TODAY_VIEWS }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetDataTypeSelectionDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetDataTypeSelectionDialogFragment.kt
index c5592e690370..53c4afc13dd6 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetDataTypeSelectionDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetDataTypeSelectionDialogFragment.kt
@@ -7,7 +7,6 @@ import android.widget.RadioGroup
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.android.support.AndroidSupportInjection
 import org.wordpress.android.R
@@ -26,7 +25,7 @@ class StatsWidgetDataTypeSelectionDialogFragment : AppCompatDialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val nonNullActivity = requireActivity()
-        viewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        viewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsDataTypeSelectionViewModel::class.java)
         val alertDialogBuilder = MaterialAlertDialogBuilder(nonNullActivity)
         val view = nonNullActivity.layoutInflater.inflate(R.layout.stats_data_type_selector, null) as RadioGroup
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteSelectionDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteSelectionDialogFragment.kt
index e8bc65437e7d..ac10ae00828d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteSelectionDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteSelectionDialogFragment.kt
@@ -5,23 +5,22 @@ import android.content.Context
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatDialogFragment
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.stats_widget_site_selector.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsWidgetSiteSelectorBinding
 import org.wordpress.android.util.image.ImageManager
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
 class StatsWidgetSiteSelectionDialogFragment : AppCompatDialogFragment() {
     @Inject lateinit var imageManager: ImageManager
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: StatsSiteSelectionViewModel
-    private fun buildView(): View? {
+    private fun buildView(): View {
         val rootView = requireActivity().layoutInflater.inflate(R.layout.stats_widget_site_selector, null)
         val recyclerView = rootView.findViewById<RecyclerView>(R.id.recycler_view)
         recyclerView.layoutManager = LinearLayoutManager(activity)
@@ -31,21 +30,22 @@ class StatsWidgetSiteSelectionDialogFragment : AppCompatDialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val alertDialogBuilder = MaterialAlertDialogBuilder(requireActivity())
-        alertDialogBuilder.setView(buildView())
+        val view = buildView()
+        alertDialogBuilder.setView(view)
         alertDialogBuilder.setTitle(R.string.stats_widget_select_your_site)
         alertDialogBuilder.setNegativeButton(R.string.cancel) { _, _ -> }
         alertDialogBuilder.setCancelable(true)
 
-        viewModel = ViewModelProviders.of(requireActivity(), viewModelFactory)
+        viewModel = ViewModelProvider(requireActivity(), viewModelFactory)
                 .get(StatsSiteSelectionViewModel::class.java)
-        viewModel.sites.observe(this, Observer {
-            (requireDialog().recycler_view.adapter as? StatsWidgetSiteAdapter)?.update(it ?: listOf())
+        viewModel.sites.observe(this, {
+            with(StatsWidgetSiteSelectorBinding.bind(view)) {
+                (recyclerView.adapter as? StatsWidgetSiteAdapter)?.update(it ?: listOf())
+            }
         })
-        viewModel.hideSiteDialog.observe(this, Observer {
-            it?.applyIfNotHandled {
-                if (dialog?.isShowing == true) {
-                    requireDialog().dismiss()
-                }
+        viewModel.hideSiteDialog.observeEvent(this, {
+            if (dialog?.isShowing == true) {
+                requireDialog().dismiss()
             }
         })
         viewModel.loadSites()
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteViewHolder.kt
index 715f996041fd..eacf51fd4c64 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteViewHolder.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/configuration/StatsWidgetSiteViewHolder.kt
@@ -1,41 +1,41 @@
 package org.wordpress.android.ui.stats.refresh.lists.widget.configuration
 
-import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
-import kotlinx.android.synthetic.main.stats_widget_site_selector_item.view.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsWidgetSiteSelectorItemBinding
 import org.wordpress.android.ui.stats.refresh.lists.widget.configuration.StatsSiteSelectionViewModel.SiteUiModel
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.image.ImageType.BLAVATAR
+import org.wordpress.android.util.viewBinding
 
-class StatsWidgetSiteViewHolder(parent: ViewGroup, val imageManager: ImageManager) : ViewHolder(
-        LayoutInflater.from(parent.context).inflate(
-                R.layout.stats_widget_site_selector_item,
-                parent,
-                false
-        )
+class StatsWidgetSiteViewHolder(
+    parent: ViewGroup,
+    val imageManager: ImageManager,
+    val binding: StatsWidgetSiteSelectorItemBinding = parent.viewBinding(StatsWidgetSiteSelectorItemBinding::inflate)
+) : ViewHolder(
+        binding.root
 ) {
-    fun bind(site: SiteUiModel) {
+    fun bind(site: SiteUiModel) = with(binding) {
         if (site.iconUrl != null) {
-            imageManager.load(itemView.site_icon, BLAVATAR, site.iconUrl)
+            imageManager.load(siteIcon, BLAVATAR, site.iconUrl)
         } else {
             imageManager.load(
-                    itemView.site_icon,
+                    siteIcon,
                     R.drawable.ic_placeholder_blavatar_grey_lighten_20_40dp
             )
         }
         if (site.title != null) {
-            itemView.site_title.text = site.title
+            siteTitle.text = site.title
         } else {
-            itemView.site_title.setText(R.string.unknown)
+            siteTitle.setText(R.string.unknown)
         }
         if (site.url != null) {
-            itemView.site_url.text = site.url
+            siteUrl.text = site.url
         } else {
-            itemView.site_url.setText(R.string.unknown)
+            siteUrl.setText(R.string.unknown)
         }
-        itemView.site_container.setOnClickListener {
+        siteContainer.setOnClickListener {
             site.click()
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt
index f9958e4dfb11..4402a1769655 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureActivity.kt
@@ -2,17 +2,17 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.minified
 
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsMinifiedWidgetConfigureActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class StatsMinifiedWidgetConfigureActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        with(StatsMinifiedWidgetConfigureActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
 
-        setContentView(R.layout.stats_minified_widget_configure_activity)
-
-        setSupportActionBar(toolbar_main)
+            setSupportActionBar(toolbar.toolbarMain)
+        }
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureFragment.kt
index 0d0a4673882a..bf21fa91db5e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/minified/StatsMinifiedWidgetConfigureFragment.kt
@@ -4,17 +4,13 @@ import android.app.Activity.RESULT_OK
 import android.appwidget.AppWidgetManager
 import android.content.Intent
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.stats_widget_configure_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_WIDGET_ADDED
+import org.wordpress.android.databinding.StatsWidgetConfigureFragmentBinding
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.stats.refresh.lists.widget.configuration.StatsColorSelectionViewModel
@@ -28,9 +24,10 @@ import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.mergeNotNull
+import org.wordpress.android.viewmodel.observeEvent
 import javax.inject.Inject
 
-class StatsMinifiedWidgetConfigureFragment : DaggerFragment() {
+class StatsMinifiedWidgetConfigureFragment : DaggerFragment(R.layout.stats_widget_configure_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var minifiedWidgetUpdater: MinifiedWidgetUpdater
     @Inject lateinit var appPrefsWrapper: AppPrefsWrapper
@@ -42,20 +39,16 @@ class StatsMinifiedWidgetConfigureFragment : DaggerFragment() {
     private lateinit var colorSelectionViewModel: StatsColorSelectionViewModel
     private lateinit var dataTypeSelectionViewModel: StatsDataTypeSelectionViewModel
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.stats_widget_configure_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         val nonNullActivity = requireActivity()
-        viewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        viewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsMinifiedWidgetConfigureViewModel::class.java)
-        siteSelectionViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        siteSelectionViewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsSiteSelectionViewModel::class.java)
-        colorSelectionViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        colorSelectionViewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsColorSelectionViewModel::class.java)
-        dataTypeSelectionViewModel = ViewModelProviders.of(nonNullActivity, viewModelFactory)
+        dataTypeSelectionViewModel = ViewModelProvider(nonNullActivity, viewModelFactory)
                 .get(StatsDataTypeSelectionViewModel::class.java)
         nonNullActivity.setResult(AppCompatActivity.RESULT_CANCELED)
 
@@ -70,78 +63,68 @@ class StatsMinifiedWidgetConfigureFragment : DaggerFragment() {
         }
 
         viewModel.start(appWidgetId, siteSelectionViewModel, colorSelectionViewModel, dataTypeSelectionViewModel)
+        with(StatsWidgetConfigureFragmentBinding.bind(view)) {
+            siteContainer.setOnClickListener {
+                siteSelectionViewModel.openSiteDialog()
+            }
+            colorContainer.setOnClickListener {
+                colorSelectionViewModel.openColorDialog()
+            }
+            dataTypeContainer.visibility = View.VISIBLE
+            dataTypeContainer.setOnClickListener {
+                dataTypeSelectionViewModel.openDataTypeDialog()
+            }
 
-        site_container.setOnClickListener {
-            siteSelectionViewModel.openSiteDialog()
-        }
-        color_container.setOnClickListener {
-            colorSelectionViewModel.openColorDialog()
-        }
-        data_type_container.visibility = View.VISIBLE
-        data_type_container.setOnClickListener {
-            dataTypeSelectionViewModel.openDataTypeDialog()
-        }
-
-        add_widget_button.setOnClickListener {
-            viewModel.addWidget()
-        }
+            addWidgetButton.setOnClickListener {
+                viewModel.addWidget()
+            }
 
-        siteSelectionViewModel.dialogOpened.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
+            siteSelectionViewModel.dialogOpened.observeEvent(viewLifecycleOwner, {
                 StatsWidgetSiteSelectionDialogFragment().show(requireFragmentManager(), "stats_site_selection_fragment")
-            }
-        })
+            })
 
-        colorSelectionViewModel.dialogOpened.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
+            colorSelectionViewModel.dialogOpened.observeEvent(viewLifecycleOwner, {
                 StatsWidgetColorSelectionDialogFragment().show(
                         requireFragmentManager(),
                         "stats_view_mode_selection_fragment"
                 )
-            }
-        })
+            })
 
-        dataTypeSelectionViewModel.dialogOpened.observe(viewLifecycleOwner, Observer { event ->
-            event?.applyIfNotHandled {
+            dataTypeSelectionViewModel.dialogOpened.observeEvent(viewLifecycleOwner, {
                 StatsWidgetDataTypeSelectionDialogFragment().show(
                         requireFragmentManager(),
                         "stats_data_type_selection_fragment"
                 )
-            }
-        })
+            })
 
-        mergeNotNull(
-                siteSelectionViewModel.notification,
-                colorSelectionViewModel.notification,
-                dataTypeSelectionViewModel.notification
-        ).observe(
-                viewLifecycleOwner,
-                Observer { event ->
-                    event?.applyIfNotHandled {
-                        ToastUtils.showToast(activity, this)
-                    }
-                })
+            mergeNotNull(
+                    siteSelectionViewModel.notification,
+                    colorSelectionViewModel.notification,
+                    dataTypeSelectionViewModel.notification
+            ).observeEvent(
+                    viewLifecycleOwner,
+                    {
+                        ToastUtils.showToast(activity, it)
+                    })
 
-        viewModel.settingsModel.observe(viewLifecycleOwner, Observer { uiModel ->
-            uiModel?.let {
-                if (uiModel.siteTitle != null) {
-                    site_value.text = uiModel.siteTitle
+            viewModel.settingsModel.observe(viewLifecycleOwner, { uiModel ->
+                uiModel?.let {
+                    if (uiModel.siteTitle != null) {
+                        siteValue.text = uiModel.siteTitle
+                    }
+                    colorValue.setText(uiModel.color.title)
+                    dataTypeValue.setText(uiModel.dataType.title)
+                    addWidgetButton.isEnabled = uiModel.buttonEnabled
                 }
-                color_value.setText(uiModel.color.title)
-                data_type_value.setText(uiModel.dataType.title)
-                add_widget_button.isEnabled = uiModel.buttonEnabled
-            }
-        })
-
-        viewModel.widgetAdded.observe(viewLifecycleOwner, Observer { event ->
-            event?.getContentIfNotHandled()?.let {
-                analyticsTrackerWrapper.trackMinifiedWidget(STATS_WIDGET_ADDED)
-                minifiedWidgetUpdater.updateAppWidget(requireContext(), appWidgetId = appWidgetId)
-                val resultValue = Intent()
-                resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
-                activity?.setResult(RESULT_OK, resultValue)
-                activity?.finish()
-            }
+            })
+        }
+        viewModel.widgetAdded.observeEvent(viewLifecycleOwner, {
+            analyticsTrackerWrapper.trackMinifiedWidget(STATS_WIDGET_ADDED)
+            minifiedWidgetUpdater.updateAppWidget(requireContext(), appWidgetId = appWidgetId)
+            val resultValue = Intent()
+            resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId)
+            activity?.setResult(RESULT_OK, resultValue)
+            activity?.finish()
         })
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt
index 620a48db738a..6f8cadff4fb2 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/today/StatsTodayWidgetConfigureActivity.kt
@@ -2,17 +2,17 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.today
 
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsTodayWidgetConfigureActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class StatsTodayWidgetConfigureActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        with(StatsTodayWidgetConfigureActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
 
-        setContentView(R.layout.stats_today_widget_configure_activity)
-
-        setSupportActionBar(toolbar_main)
+            setSupportActionBar(toolbar.toolbarMain)
+        }
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt
index 78e079cf0856..057ea12aaa37 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/widget/views/StatsViewsWidgetConfigureActivity.kt
@@ -2,17 +2,17 @@ package org.wordpress.android.ui.stats.refresh.lists.widget.views
 
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.toolbar_main.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.StatsViewsWidgetConfigureActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class StatsViewsWidgetConfigureActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        with(StatsViewsWidgetConfigureActivityBinding.inflate(layoutInflater)) {
+            setContentView(root)
 
-        setContentView(R.layout.stats_views_widget_configure_activity)
-
-        setSupportActionBar(toolbar_main)
+            setSupportActionBar(toolbar.toolbarMain)
+        }
         supportActionBar?.let {
             it.setHomeButtonEnabled(true)
             it.setDisplayHomeAsUpEnabled(true)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateSelectorViewUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateSelectorViewUtils.kt
index 3f1c6003bb65..859c6d076845 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateSelectorViewUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateSelectorViewUtils.kt
@@ -1,30 +1,30 @@
 package org.wordpress.android.ui.stats.refresh.utils
 
 import android.view.View
-import androidx.fragment.app.Fragment
-import kotlinx.android.synthetic.main.stats_date_selector.*
-import kotlinx.android.synthetic.main.stats_list_fragment.*
+import org.wordpress.android.databinding.StatsListFragmentBinding
 import org.wordpress.android.ui.stats.refresh.StatsViewModel.DateSelectorUiModel
 
-fun Fragment.drawDateSelector(dateSelectorUiModel: DateSelectorUiModel?) {
+fun StatsListFragmentBinding.drawDateSelector(dateSelectorUiModel: DateSelectorUiModel?) {
     val dateSelectorVisibility = if (dateSelectorUiModel?.isVisible == true) View.VISIBLE else View.GONE
-    if (date_selection_toolbar.visibility != dateSelectorVisibility) {
-        date_selection_toolbar.visibility = dateSelectorVisibility
+    if (dateSelectionToolbar.visibility != dateSelectorVisibility) {
+        dateSelectionToolbar.visibility = dateSelectorVisibility
     }
-    selectedDateTextView.text = dateSelectorUiModel?.date ?: ""
-    val timeZone = dateSelectorUiModel?.timeZone
-    if (currentSiteTimeZone.visibility == View.GONE && timeZone != null) {
-        currentSiteTimeZone.visibility = View.VISIBLE
-        currentSiteTimeZone.text = timeZone
-    } else if (currentSiteTimeZone.visibility == View.VISIBLE && timeZone == null) {
-        currentSiteTimeZone.visibility = View.GONE
-    }
-    val enablePreviousButton = dateSelectorUiModel?.enableSelectPrevious == true
-    if (previousDateButton.isEnabled != enablePreviousButton) {
-        previousDateButton.isEnabled = enablePreviousButton
-    }
-    val enableNextButton = dateSelectorUiModel?.enableSelectNext == true
-    if (nextDateButton.isEnabled != enableNextButton) {
-        nextDateButton.isEnabled = enableNextButton
+    with(dateSelector) {
+        selectedDateTextView.text = dateSelectorUiModel?.date ?: ""
+        val timeZone = dateSelectorUiModel?.timeZone
+        if (currentSiteTimeZone.visibility == View.GONE && timeZone != null) {
+            currentSiteTimeZone.visibility = View.VISIBLE
+            currentSiteTimeZone.text = timeZone
+        } else if (currentSiteTimeZone.visibility == View.VISIBLE && timeZone == null) {
+            currentSiteTimeZone.visibility = View.GONE
+        }
+        val enablePreviousButton = dateSelectorUiModel?.enableSelectPrevious == true
+        if (previousDateButton.isEnabled != enablePreviousButton) {
+            previousDateButton.isEnabled = enablePreviousButton
+        }
+        val enableNextButton = dateSelectorUiModel?.enableSelectNext == true
+        if (nextDateButton.isEnabled != enableNextButton) {
+            nextDateButton.isEnabled = enableNextButton
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateUtils.kt
index 6ca16374b7d4..34012a694c99 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/DateUtils.kt
@@ -8,6 +8,7 @@ import org.wordpress.android.util.capitalizeWithLocaleWithoutLint
 import org.wordpress.android.viewmodel.ContextProvider
 import java.text.SimpleDateFormat
 import java.util.Calendar
+import java.util.Formatter
 import javax.inject.Inject
 
 class DateUtils @Inject constructor(
@@ -49,6 +50,18 @@ class DateUtils @Inject constructor(
         )
     }
 
+    fun formatDateRange(from: Long, to: Long, timezone: String): String {
+        val formatter = Formatter(StringBuilder(50), localeManagerWrapper.getLocale())
+        return DateUtils.formatDateRange(
+                contextProvider.getContext(),
+                formatter,
+                from,
+                to,
+                DateUtils.FORMAT_ABBREV_MONTH,
+                timezone
+        ).toString()
+    }
+
     private fun getDateTimeFlags(): Int {
         var flags = 0
         flags = flags or DateUtils.FORMAT_SHOW_DATE
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsNavigator.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsNavigator.kt
index ee738940090e..3e037f8e08c1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsNavigator.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/utils/StatsNavigator.kt
@@ -7,6 +7,7 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity.YEARS
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.PagePostCreationSourcesDetail.POST_FROM_STATS
 import org.wordpress.android.ui.WPWebViewActivity
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.stats.StatsUtils
 import org.wordpress.android.ui.stats.StatsViewType.ANNUAL_STATS
 import org.wordpress.android.ui.stats.StatsViewType.AUTHORS
@@ -54,10 +55,10 @@ import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class StatsNavigator
-@Inject constructor(
+class StatsNavigator @Inject constructor(
     private val siteProvider: StatsSiteProvider,
-    private val selectedDateProvider: SelectedDateProvider
+    private val selectedDateProvider: SelectedDateProvider,
+    private val readerTracker: ReaderTracker
 ) {
     fun navigate(activity: FragmentActivity, target: NavigationTarget) {
         when (target) {
@@ -70,7 +71,8 @@ class StatsNavigator
                         siteProvider.siteModel.siteId,
                         target.postId.toString(),
                         target.postType,
-                        target.postUrl
+                        target.postUrl,
+                        readerTracker
                 )
             }
             is SharePost -> {
@@ -218,7 +220,8 @@ class StatsNavigator
                         siteProvider.siteModel.siteId,
                         target.postId.toString(),
                         target.postType,
-                        target.postUrl
+                        target.postUrl,
+                        readerTracker
                 )
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCase.kt
index 8dae05f35665..d3b5c884bba3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCase.kt
@@ -1,20 +1,26 @@
 package org.wordpress.android.ui.stories
 
+import android.text.TextUtils
 import com.google.gson.Gson
 import com.wordpress.stories.compose.frame.FrameIndex
 import com.wordpress.stories.compose.story.StoryFrameItem
 import com.wordpress.stories.compose.story.StoryIndex
 import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.post.PostStatus.PRIVATE
 import org.wordpress.android.ui.posts.EditPostRepository
 import org.wordpress.android.ui.stories.prefs.StoriesPrefs
 import org.wordpress.android.ui.stories.prefs.StoriesPrefs.TempId
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T.EDITOR
+import org.wordpress.android.util.CrashLogging
 import org.wordpress.android.util.StringUtils
 import org.wordpress.android.util.helpers.MediaFile
 import javax.inject.Inject
 
 class SaveStoryGutenbergBlockUseCase @Inject constructor(
-    private val storiesPrefs: StoriesPrefs
+    private val storiesPrefs: StoriesPrefs,
+    private val crashLogging: CrashLogging
 ) {
     fun buildJetpackStoryBlockInPost(
         editPostRepository: EditPostRepository,
@@ -44,7 +50,7 @@ class SaveStoryGutenbergBlockUseCase @Inject constructor(
 
     private fun buildMediaFileData(mediaFile: MediaFile): StoryMediaFileData {
         return StoryMediaFileData(
-                alt = "",
+                alt = mediaFile.alt,
                 id = mediaFile.id.toString(),
                 link = StringUtils.notNullStr(mediaFile.fileURL),
                 type = if (mediaFile.isVideo) "video" else "image",
@@ -56,7 +62,7 @@ class SaveStoryGutenbergBlockUseCase @Inject constructor(
 
     fun buildMediaFileDataWithTemporaryId(mediaFile: MediaFile, temporaryId: String): StoryMediaFileData {
         return StoryMediaFileData(
-                alt = "",
+                alt = mediaFile.alt,
                 id = temporaryId, // mediaFile.id,
                 link = StringUtils.notNullStr(mediaFile.fileURL),
                 type = if (mediaFile.isVideo) "video" else "image",
@@ -88,6 +94,7 @@ class SaveStoryGutenbergBlockUseCase @Inject constructor(
 
     fun findAllStoryBlocksInPostAndPerformOnEachMediaFilesJson(
         postModel: PostModel,
+        siteModel: SiteModel?,
         listener: DoWithMediaFilesListener
     ) {
         var content = postModel.content
@@ -98,24 +105,61 @@ class SaveStoryGutenbergBlockUseCase @Inject constructor(
         // --> remove mediaFiles entirely
         // set start index and go up.
         var storyBlockStartIndex = 0
-        while (storyBlockStartIndex > -1 && storyBlockStartIndex < content.length) {
+        var hasMediaFiles = true
+        while (storyBlockStartIndex > -1 && storyBlockStartIndex < content.length && hasMediaFiles) {
             storyBlockStartIndex = content.indexOf(HEADING_START, storyBlockStartIndex)
             if (storyBlockStartIndex > -1) {
-                val jsonString: String = content.substring(
-                        storyBlockStartIndex + HEADING_START.length,
-                        content.indexOf(HEADING_END))
-                content = listener.doWithMediaFilesJson(content, jsonString)
-                storyBlockStartIndex += HEADING_START.length
+                val storyBlockEndIndex = content.indexOf(HEADING_END_NO_NEW_LINE, storyBlockStartIndex)
+                val mediaFilesStartIndex = storyBlockStartIndex + HEADING_START.length
+                hasMediaFiles = mediaFilesStartIndex < storyBlockEndIndex
+                if (!hasMediaFiles) {
+                    break
+                }
+                try {
+                    val jsonString: String = content.substring(
+                            mediaFilesStartIndex,
+                            storyBlockEndIndex
+                    )
+                    content = listener.doWithMediaFilesJson(content, jsonString)
+                    storyBlockStartIndex += HEADING_START.length
+                } catch (exception: StringIndexOutOfBoundsException) {
+                    logException(exception, postModel, siteModel)
+                }
             }
         }
 
         postModel.setContent(content)
     }
 
-    fun replaceLocalMediaIdsWithRemoteMediaIdsInPost(postModel: PostModel, mediaFile: MediaFile) {
+    private fun logException(exception: Throwable, postModel: PostModel, siteModel: SiteModel?) {
+        AppLog.e(EDITOR, "Error while parsing Story blocks: ${exception.message}")
+        if (shouldLogContent(siteModel, postModel)) {
+            AppLog.e(EDITOR, "HTML content of the post before the crash: ${postModel.content}")
+        }
+        crashLogging.reportException(exception, EDITOR.toString())
+    }
+
+    // See: https://git.io/JqfhK
+    private fun shouldLogContent(siteModel: SiteModel?, postModel: PostModel) = siteModel != null &&
+            siteModel.isWPCom &&
+            !siteModel.isPrivate &&
+            postModel.password.isEmpty() &&
+            postModel.status != PRIVATE.toString()
+
+    fun replaceLocalMediaIdsWithRemoteMediaIdsInPost(
+        postModel: PostModel,
+        siteModel: SiteModel?,
+        mediaFile: MediaFile
+    ) {
+        if (TextUtils.isEmpty(mediaFile.mediaId)) {
+            // if for any reason we couldn't obtain a remote mediaId, it's not worth spending time
+            // looking to replace anything in the Post. Skip processing for later in error handling.
+            return
+        }
         val gson = Gson()
         findAllStoryBlocksInPostAndPerformOnEachMediaFilesJson(
                 postModel,
+                siteModel,
                 object : DoWithMediaFilesListener {
                     override fun doWithMediaFilesJson(content: String, mediaFilesJsonString: String): String {
                         var processedContent = content
@@ -170,6 +214,19 @@ class SaveStoryGutenbergBlockUseCase @Inject constructor(
         }
     }
 
+    fun assignAltOnEachMediaFile(
+        frames: List<StoryFrameItem>,
+        mediaFiles: ArrayList<MediaFile>
+    ): List<MediaFile> {
+        return mediaFiles.mapIndexed { index, mediaFile ->
+            run {
+                mediaFile.alt = StoryFrameItem.getAltTextFromFrameAddedViews(frames[index])
+                mediaFile
+            }
+            mediaFile
+        }
+    }
+
     private fun createGBStoryBlockStringFromJson(storyBlock: StoryBlockData): String {
         val gson = Gson()
         return HEADING_START + gson.toJson(storyBlock) + HEADING_END + DIV_PART + CLOSING_TAG
@@ -197,6 +254,7 @@ class SaveStoryGutenbergBlockUseCase @Inject constructor(
         const val TEMPORARY_ID_PREFIX = "tempid-"
         const val HEADING_START = "<!-- wp:jetpack/story "
         const val HEADING_END = " -->\n"
+        const val HEADING_END_NO_NEW_LINE = " -->"
         const val DIV_PART = "<div class=\"wp-story wp-block-jetpack-story\"></div>\n"
         const val CLOSING_TAG = "<!-- /wp:jetpack/story -->"
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoriesMediaPickerResultHandler.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoriesMediaPickerResultHandler.kt
index 8c17b60d2ce0..854bb695850f 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoriesMediaPickerResultHandler.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoriesMediaPickerResultHandler.kt
@@ -2,43 +2,89 @@ package org.wordpress.android.ui.stories
 
 import android.app.Activity
 import android.content.Intent
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.PagePostCreationSourcesDetail
 import org.wordpress.android.ui.media.MediaBrowserActivity
 import org.wordpress.android.ui.media.MediaBrowserType
+import org.wordpress.android.ui.mysite.SiteNavigationAction
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewStory
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewStoryWithMediaIds
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewStoryWithMediaUris
 import org.wordpress.android.ui.photopicker.MediaPickerConstants
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.UTILS
-import org.wordpress.android.util.config.ConsolidatedMediaPickerFeatureConfig
+import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
 
 class StoriesMediaPickerResultHandler
-@Inject constructor(private val consolidatedMediaPickerFeatureConfig: ConsolidatedMediaPickerFeatureConfig) {
-    /* return true if MediaPickerResult was handled */
+@Inject constructor() {
+    private val _onNavigation = MutableLiveData<Event<SiteNavigationAction>>()
+    val onNavigation = _onNavigation as LiveData<Event<SiteNavigationAction>>
+
+    @Deprecated("Use rather the other handle method and the live data navigation.")
     fun handleMediaPickerResultForStories(
         data: Intent,
         activity: Activity?,
-        selectedSite: SiteModel?
+        selectedSite: SiteModel?,
+        source: PagePostCreationSourcesDetail
     ): Boolean {
-        if (data.getBooleanExtra(MediaPickerConstants.EXTRA_LAUNCH_WPSTORIES_CAMERA_REQUESTED, false)) {
-            ActivityLauncher.addNewStoryForResult(
+        if (selectedSite == null) {
+            return false
+        }
+        when (val navigationAction = buildNavigationAction(data, selectedSite, source)) {
+            is AddNewStory -> ActivityLauncher.addNewStoryForResult(
+                    activity,
+                    navigationAction.site,
+                    navigationAction.source
+            )
+            is AddNewStoryWithMediaIds -> ActivityLauncher.addNewStoryWithMediaIdsForResult(
+                    activity,
+                    navigationAction.site,
+                    navigationAction.source,
+                    navigationAction.mediaIds.toLongArray()
+            )
+            is AddNewStoryWithMediaUris -> ActivityLauncher.addNewStoryWithMediaUrisForResult(
                     activity,
-                    selectedSite,
-                    PagePostCreationSourcesDetail.STORY_FROM_MY_SITE
+                    navigationAction.site,
+                    navigationAction.source,
+                    navigationAction.mediaUris.toTypedArray()
             )
-            return true
-        } else if (consolidatedMediaPickerFeatureConfig.isEnabled() || isWPStoriesMediaBrowserTypeResult(data)) {
+            else -> {
+                return false
+            }
+        }
+
+        return true
+    }
+
+    fun handleMediaPickerResultForStories(
+        data: Intent,
+        selectedSite: SiteModel,
+        source: PagePostCreationSourcesDetail
+    ): Boolean {
+        val navigationAction = buildNavigationAction(data, selectedSite, source)
+        return if (navigationAction != null) {
+            _onNavigation.postValue(Event(navigationAction))
+            true
+        } else {
+            false
+        }
+    }
+
+    private fun buildNavigationAction(
+        data: Intent,
+        selectedSite: SiteModel,
+        source: PagePostCreationSourcesDetail
+    ): SiteNavigationAction? {
+        if (data.getBooleanExtra(MediaPickerConstants.EXTRA_LAUNCH_WPSTORIES_CAMERA_REQUESTED, false)) {
+            return AddNewStory(selectedSite, source)
+        } else if (isWPStoriesMediaBrowserTypeResult(data)) {
             if (data.hasExtra(MediaBrowserActivity.RESULT_IDS)) {
-                ActivityLauncher.addNewStoryWithMediaIdsForResult(
-                        activity,
-                        selectedSite,
-                        PagePostCreationSourcesDetail.STORY_FROM_MY_SITE,
-                        data.getLongArrayExtra(
-                                MediaBrowserActivity.RESULT_IDS
-                        )
-                )
-                return true
+                val mediaIds = data.getLongArrayExtra(MediaBrowserActivity.RESULT_IDS)?.asList() ?: listOf()
+                return AddNewStoryWithMediaIds(selectedSite, source, mediaIds)
             } else {
                 val mediaUriStringsArray = data.getStringArrayExtra(
                         MediaPickerConstants.EXTRA_MEDIA_URIS
@@ -48,18 +94,17 @@ class StoriesMediaPickerResultHandler
                             UTILS,
                             "Can't resolve picked or captured image"
                     )
-                    return false
+                    return null
                 }
-                ActivityLauncher.addNewStoryWithMediaUrisForResult(
-                        activity,
-                        selectedSite,
-                        PagePostCreationSourcesDetail.STORY_FROM_MY_SITE,
-                        mediaUriStringsArray
-                )
-                return true
+                val mediaUris = mediaUriStringsArray.asList()
+                return AddNewStoryWithMediaUris(
+                                        selectedSite,
+                                        source,
+                                        mediaUris = mediaUris
+                                )
             }
         }
-        return false
+        return null
     }
 
     private fun isWPStoriesMediaBrowserTypeResult(data: Intent): Boolean {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt
index 1b91eba4fa3e..780387c68c63 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt
@@ -6,10 +6,10 @@ import android.app.ProgressDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import com.google.android.material.snackbar.Snackbar
 import com.wordpress.stories.compose.AuthenticationHeadersProvider
 import com.wordpress.stories.compose.ComposeLoopFrameActivity
@@ -51,7 +51,6 @@ import org.wordpress.android.push.NotificationsProcessingService
 import org.wordpress.android.push.NotificationsProcessingService.ARG_NOTIFICATION_TYPE
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.media.MediaBrowserActivity
-import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.photopicker.MediaPickerConstants
 import org.wordpress.android.ui.photopicker.MediaPickerLauncher
 import org.wordpress.android.ui.posts.EditPostActivity.OnPostUpdatedFromUIListener
@@ -75,12 +74,13 @@ import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.FluxCUtilsWrapper
 import org.wordpress.android.util.ListUtils
 import org.wordpress.android.util.MediaUtils
+import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.WPMediaUtils
 import org.wordpress.android.util.WPPermissionUtils
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 import org.wordpress.android.util.helpers.MediaFile
-import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.WPSnackbar
 import java.util.Objects
 import javax.inject.Inject
@@ -128,6 +128,7 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
         protected const val FRAGMENT_ANNOUNCEMENT_DIALOG = "story_announcement_dialog"
         const val STATE_KEY_POST_LOCAL_ID = "state_key_post_model_local_id"
         const val STATE_KEY_EDITOR_SESSION_DATA = "stateKeyEditorSessionData"
+        const val STATE_KEY_ORIGINAL_STORY_SAVE_RESULT = "stateKeyOriginalSaveResult"
         const val KEY_POST_LOCAL_ID = "key_post_model_local_id"
         const val KEY_LAUNCHED_FROM_GUTENBERG = "key_launched_from_gutenberg"
         const val KEY_ALL_UNFLATTENED_LOADED_SLIDES = "key_all_unflattened_laoded_slides"
@@ -139,8 +140,8 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
         // convert our WPAndroid KEY_LAUNCHED_FROM_GUTENBERG flag into Stories general purpose EDIT_MODE flag
         intent.putExtra(KEY_STORY_EDIT_MODE, intent.getBooleanExtra(KEY_LAUNCHED_FROM_GUTENBERG, false))
         setMediaPickerProvider(this)
-        super.onCreate(savedInstanceState)
         (application as WordPress).component().inject(this)
+        initSite(savedInstanceState)
         setSnackbarProvider(this)
         setAuthenticationProvider(this)
         setNotificationExtrasLoader(this)
@@ -151,43 +152,64 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
         setPrepublishingEventProvider(this)
         setPermissionDialogProvider(this)
         setGenericAnnouncementDialogProvider(this)
-        setUseTempCaptureFile(false) // we need to keep the captured files for later Story editing
 
         initViewModel(savedInstanceState)
+        super.onCreate(savedInstanceState)
+
+        setUseTempCaptureFile(false) // we need to keep the captured files for later Story editing
+    }
+
+    private fun initSite(savedInstanceState: Bundle?) {
+        if (savedInstanceState == null) {
+            site = intent.getSerializableExtra(WordPress.SITE) as SiteModel
+        } else {
+            site = savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
+        }
     }
 
     private fun initViewModel(savedInstanceState: Bundle?) {
         var localPostId = 0
         var notificationType: NotificationType? = null
+        var originalStorySaveResult: StorySaveResult? = null
 
         if (savedInstanceState == null) {
             localPostId = getBackingPostIdFromIntent()
-            site = intent.getSerializableExtra(WordPress.SITE) as SiteModel
+            originalStorySaveResult = intent.getParcelableExtra(KEY_STORY_SAVE_RESULT) as StorySaveResult?
 
             if (intent.hasExtra(ARG_NOTIFICATION_TYPE)) {
                 notificationType = intent.getSerializableExtra(ARG_NOTIFICATION_TYPE) as NotificationType
             }
         } else {
-            site = savedInstanceState.getSerializable(WordPress.SITE) as SiteModel
             if (savedInstanceState.containsKey(STATE_KEY_POST_LOCAL_ID)) {
                 localPostId = savedInstanceState.getInt(STATE_KEY_POST_LOCAL_ID)
             }
+            if (savedInstanceState.containsKey(STATE_KEY_ORIGINAL_STORY_SAVE_RESULT)) {
+                originalStorySaveResult =
+                        savedInstanceState.getParcelable(STATE_KEY_ORIGINAL_STORY_SAVE_RESULT) as StorySaveResult?
+            }
         }
 
         val postEditorAnalyticsSession =
                 savedInstanceState?.getSerializable(STATE_KEY_EDITOR_SESSION_DATA) as PostEditorAnalyticsSession?
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(StoryComposerViewModel::class.java)
 
         site?.let {
-            viewModel.start(
+            val postInitialized = viewModel.start(
                     it,
                     editPostRepository,
                     LocalId(localPostId),
                     postEditorAnalyticsSession,
-                    notificationType
+                    notificationType,
+                    originalStorySaveResult
             )
+
+            // Ensure we have a valid post
+            if (!postInitialized) {
+                showErrorAndFinish(R.string.post_not_found)
+                return@let
+            }
         }
 
         storyEditorMedia.start(requireNotNull(site), this)
@@ -196,7 +218,7 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
     }
 
     private fun setupViewModelObservers() {
-        viewModel.mediaFilesUris.observe(this, Observer { uriList ->
+        viewModel.mediaFilesUris.observe(this, { uriList ->
             val filteredList = uriList.filterNot { MediaUtils.isGif(it.toString()) }
             if (filteredList.isNotEmpty()) {
                 addFramesToStoryFromMediaUriList(filteredList)
@@ -222,34 +244,37 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
             }
         })
 
-        viewModel.openPrepublishingBottomSheet.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                analyticsTrackerWrapper.track(PREPUBLISHING_BOTTOM_SHEET_OPENED)
-                openPrepublishingBottomSheet()
-            }
+        viewModel.openPrepublishingBottomSheet.observeEvent(this, {
+            analyticsTrackerWrapper.track(PREPUBLISHING_BOTTOM_SHEET_OPENED)
+            openPrepublishingBottomSheet()
         })
 
-        viewModel.submitButtonClicked.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                analyticsTrackerWrapper.track(Stat.STORY_POST_PUBLISH_TAPPED)
-                processStorySaving()
-            }
+        viewModel.submitButtonClicked.observeEvent(this, {
+            analyticsTrackerWrapper.track(Stat.STORY_POST_PUBLISH_TAPPED)
+            processStorySaving()
         })
 
-        viewModel.trackEditorCreatedPost.observe(this, Observer { event ->
-            event.applyIfNotHandled {
-                site?.let {
-                    analyticsUtilsWrapper.trackEditorCreatedPost(
-                            intent.action,
-                            intent,
-                            it,
-                            editPostRepository.getPost()
-                    )
-                }
+        viewModel.trackEditorCreatedPost.observeEvent(this, {
+            site?.let {
+                analyticsUtilsWrapper.trackEditorCreatedPost(
+                        intent.action,
+                        intent,
+                        it,
+                        editPostRepository.getPost()
+                )
             }
         })
     }
 
+    private fun showErrorAndFinish(errorMessageId: Int) {
+        ToastUtils.showToast(
+                this,
+                errorMessageId,
+                ToastUtils.Duration.LONG
+        )
+        finish()
+    }
+
     override fun onLoadFromIntent(intent: Intent) {
         super.onLoadFromIntent(intent)
         // now see if we need to handle information coming from the MediaPicker to populate
@@ -311,19 +336,17 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
         requestCodes.PHOTO_PICKER = RequestCodes.PHOTO_PICKER
         requestCodes.EXTRA_LAUNCH_WPSTORIES_CAMERA_REQUESTED =
                 MediaPickerConstants.EXTRA_LAUNCH_WPSTORIES_CAMERA_REQUESTED
+        requestCodes.EXTRA_LAUNCH_WPSTORIES_MEDIA_PICKER_REQUESTED =
+                MediaPickerConstants.EXTRA_LAUNCH_WPSTORIES_MEDIA_PICKER_REQUESTED
         // we're handling EXTRA_MEDIA_URIS at the app level (not at the Stories library level)
         // hence we set the requestCode to UNUSED
         requestCodes.EXTRA_MEDIA_URIS = UNUSED_KEY
     }
 
     override fun showProvidedMediaPicker() {
-        // the ComposeLoopFrameActivity currently only knows about RequestCodes.PHOTO_PICKER and not about
-        // RequestCodes.STORIES_PHOTO_PICKER; as a temporary solution we are feeding the ComposeLoopFragmentActivity
-        // with the PHOTO_PICKER. We should add the STORIES_PHOTO_PICKER to the stories lib
         mediaPickerLauncher.showStoriesPhotoPickerForResult(
                 this,
-                site,
-                RequestCodes.PHOTO_PICKER
+                site
         )
     }
 
@@ -370,13 +393,12 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
                     }
                 }
         )
-        storyEditorMedia.snackBarMessage.observe(this,
-                Observer<Event<SnackbarMessageHolder>> { event: Event<SnackbarMessageHolder?> ->
-                    val messageHolder = event.getContentIfNotHandled()
-                    if (messageHolder != null) {
+        storyEditorMedia.snackBarMessage.observeEvent(this,
+                { messageHolder ->
+                    findViewById<View>(R.id.compose_loop_frame_layout)?.let {
                         WPSnackbar
                                 .make(
-                                        findViewById(org.wordpress.android.R.id.editor_activity),
+                                        it,
                                         uiHelpers.getTextOfUiString(this, messageHolder.message),
                                         Snackbar.LENGTH_SHORT
                                 )
@@ -455,12 +477,12 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
 
     override fun onStoryDiscarded() {
         val launchedFromGutenberg = intent.getBooleanExtra(KEY_LAUNCHED_FROM_GUTENBERG, false)
-        viewModel.onStoryDiscarded(!launchedFromGutenberg)
+        val storyDiscardedFromRetry = viewModel.onStoryDiscarded(!launchedFromGutenberg)
 
-        if (launchedFromGutenberg) {
+        if (launchedFromGutenberg || storyDiscardedFromRetry) {
             setResult(Activity.RESULT_CANCELED)
-            finish()
         }
+        finish()
     }
 
     override fun onFrameRemove(storyIndex: StoryIndex, storyFrameIndex: Int) {
@@ -504,6 +526,10 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
                 }
             }
 
+            viewModel.onStorySaved()
+            // TODO add tracks
+            processStorySaving()
+
             val savedContentIntent = Intent()
             val blockId = intent.extras?.getString(ARG_STORY_BLOCK_ID)
             savedContentIntent.putExtra(ARG_STORY_BLOCK_ID, blockId)
@@ -514,6 +540,7 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
                 // if not, let's use the current Story
                 storyIndex = storyRepositoryWrapper.getCurrentStoryIndex()
             }
+
             // if we are editing this Story Block, then the id is assured to be a remote media file id, but
             // the frame no longer points to such media Id on the site given we are just about to save a
             // new flattened media. Hence, we need to set a new temporary Id we can use to identify
@@ -528,10 +555,6 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
 
             savedContentIntent.putExtra(ARG_STORY_BLOCK_UPDATED_CONTENT, updatedStoryBlock)
             setResult(Activity.RESULT_OK, savedContentIntent)
-
-            // TODO add tracks
-            processStorySaving()
-
             finish()
         } else {
             // assume this is a new Post, and proceed to PrePublish bottom sheet
@@ -576,6 +599,8 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
                             val mediaModel = mediaStore.getSiteMediaWithId(site, it.toLong())
                             val mediaFile = fluxCUtilsWrapper.mediaFileFromMediaModel(mediaModel)
                             mediaFile?.let { mediafile ->
+                                mediaFile.alt = StoryFrameItem.getAltTextFromFrameAddedViews(frame)
+                                mediaModel.alt = mediaFile.alt
                                 val storyMediaFileData =
                                         saveStoryGutenbergBlockUseCase.buildMediaFileDataWithTemporaryId(
                                                 mediaFile = mediafile,
@@ -594,14 +619,14 @@ class StoryComposerActivity : ComposeLoopFrameActivity(),
 
     private fun buildStoryMediaFileDataForTemporarySlide(frame: StoryFrameItem, tempId: String): StoryMediaFileData {
         return saveStoryGutenbergBlockUseCase.buildMediaFileDataWithTemporaryIdNoMediaFile(
-                        temporaryId = tempId,
-                        url = if (frame.source is FileBackgroundSource) {
-                            (frame.source as FileBackgroundSource).file.toString()
-                        } else {
-                            (frame.source as UriBackgroundSource).contentUri.toString()
-                        },
-                        isVideo = (frame.frameItemType is VIDEO)
-                )
+                temporaryId = tempId,
+                url = if (frame.source is FileBackgroundSource) {
+                    (frame.source as FileBackgroundSource).file.toString()
+                } else {
+                    (frame.source as UriBackgroundSource).contentUri.toString()
+                },
+                isVideo = (frame.frameItemType is VIDEO)
+        )
     }
 
     override fun onSubmitButtonClicked(publishPost: PublishPost) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerViewModel.kt
index 04f82f03f678..0dbda4417f79 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerViewModel.kt
@@ -10,6 +10,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModel
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult
+import org.wordpress.android.viewmodel.SingleLiveEvent
 import org.wordpress.android.WordPress
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.PostActionBuilder
@@ -21,9 +23,14 @@ import org.wordpress.android.ui.notifications.SystemNotificationsTracker
 import org.wordpress.android.ui.posts.EditPostRepository
 import org.wordpress.android.ui.posts.PostEditorAnalyticsSession
 import org.wordpress.android.ui.posts.PostEditorAnalyticsSession.Outcome.CANCEL
+import org.wordpress.android.ui.posts.PostEditorAnalyticsSession.Outcome.PUBLISH
+import org.wordpress.android.ui.posts.PostEditorAnalyticsSession.Outcome.SAVE
 import org.wordpress.android.ui.posts.PostEditorAnalyticsSessionWrapper
 import org.wordpress.android.ui.posts.SavePostToDbUseCase
+import org.wordpress.android.ui.stories.StoryComposerActivity.Companion.STATE_KEY_ORIGINAL_STORY_SAVE_RESULT
 import org.wordpress.android.ui.stories.usecase.SetUntitledStoryTitleIfTitleEmptyUseCase
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.helpers.MediaFile
 import org.wordpress.android.viewmodel.Event
 import javax.inject.Inject
@@ -43,16 +50,17 @@ class StoryComposerViewModel @Inject constructor(
 
     private lateinit var editPostRepository: EditPostRepository
     private lateinit var site: SiteModel
-    private lateinit var postEditorAnalyticsSession: PostEditorAnalyticsSession
+    private var postEditorAnalyticsSession: PostEditorAnalyticsSession? = null
+    private var originalIntentStorySaveResult: StorySaveResult? = null
 
     private val _mediaFilesUris = MutableLiveData<List<Uri>>()
     val mediaFilesUris: LiveData<List<Uri>> = _mediaFilesUris
 
-    private val _openPrepublishingBottomSheet = MutableLiveData<Event<Unit>>()
-    val openPrepublishingBottomSheet: LiveData<Event<Unit>> = _openPrepublishingBottomSheet
+    private val _openPrepublishingBottomSheet = SingleLiveEvent<Event<Unit>>()
+    val openPrepublishingBottomSheet = _openPrepublishingBottomSheet
 
-    private val _submitButtonClicked = MutableLiveData<Event<Unit>>()
-    val submitButtonClicked: LiveData<Event<Unit>> = _submitButtonClicked
+    private val _submitButtonClicked = SingleLiveEvent<Event<Unit>>()
+    val submitButtonClicked = _submitButtonClicked
 
     init {
         lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.CREATED
@@ -61,15 +69,22 @@ class StoryComposerViewModel @Inject constructor(
     private val _trackEditorCreatedPost = MutableLiveData<Event<Unit>>()
     val trackEditorCreatedPost: LiveData<Event<Unit>> = _trackEditorCreatedPost
 
+    @Suppress("LongParameterList")
     fun start(
         site: SiteModel,
         editPostRepository: EditPostRepository,
         postId: LocalId,
         postEditorAnalyticsSession: PostEditorAnalyticsSession?,
-        notificationType: NotificationType?
-    ) {
+        notificationType: NotificationType?,
+        originalStorySaveResult: StorySaveResult?
+    ): Boolean {
         this.editPostRepository = editPostRepository
         this.site = site
+        this.originalIntentStorySaveResult = originalStorySaveResult
+
+        notificationType?.let {
+            systemNotificationsTracker.trackTappedNotification(it)
+        }
 
         if (postId.value == 0) {
             // Create a new post
@@ -80,14 +95,18 @@ class StoryComposerViewModel @Inject constructor(
             editPostRepository.loadPostByLocalPostId(postId.value)
         }
 
-        setupPostEditorAnalyticsSession(postEditorAnalyticsSession)
-
-        notificationType?.let {
-            systemNotificationsTracker.trackTappedNotification(it)
+        // Ensure we have a valid post
+        if (!editPostRepository.hasPost()) {
+            AppLog.e(T.EDITOR, "StoryComposerViewModel's EditPostRepository has no Post loaded: " + postId.value)
+            return false
         }
 
+        setupPostEditorAnalyticsSession(postEditorAnalyticsSession)
+
         lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.STARTED
         updateStoryPostWithChanges()
+
+        return true
     }
 
     private fun setupPostEditorAnalyticsSession(postEditorAnalyticsSession: PostEditorAnalyticsSession?) {
@@ -95,7 +114,7 @@ class StoryComposerViewModel @Inject constructor(
                 editPostRepository.getPost(),
                 site
         )
-        this.postEditorAnalyticsSession.start(null)
+        this.postEditorAnalyticsSession?.start(null)
     }
 
     private fun createPostEditorAnalyticsSessionTracker(
@@ -112,14 +131,25 @@ class StoryComposerViewModel @Inject constructor(
         outState.putSerializable(WordPress.SITE, site)
         outState.putInt(StoryComposerActivity.STATE_KEY_POST_LOCAL_ID, editPostRepository.id)
         outState.putSerializable(StoryComposerActivity.STATE_KEY_EDITOR_SESSION_DATA, postEditorAnalyticsSession)
+        outState.putParcelable(STATE_KEY_ORIGINAL_STORY_SAVE_RESULT, originalIntentStorySaveResult)
     }
 
-    fun onStoryDiscarded(deleteDiscardedPost: Boolean) {
+    fun onStorySaved() {
+        postEditorAnalyticsSession?.setOutcome(SAVE)
+    }
+
+    // returns true if user is discarding a Story out of a save retry (error handling state)
+    // returns false otherwise
+    fun onStoryDiscarded(deleteDiscardedPost: Boolean): Boolean {
         if (deleteDiscardedPost) {
             // delete empty post from database
             dispatcher.dispatch(PostActionBuilder.newRemovePostAction(editPostRepository.getEditablePost()))
         }
-        postEditorAnalyticsSession.setOutcome(CANCEL)
+        postEditorAnalyticsSession?.setOutcome(CANCEL)
+
+        originalIntentStorySaveResult?.let {
+            return (!it.isSuccess() || it.isRetry)
+        } ?: return false
     }
 
     private fun updateStoryPostWithChanges() {
@@ -148,12 +178,13 @@ class StoryComposerViewModel @Inject constructor(
 
     fun onSubmitButtonClicked() {
         setUntitledStoryTitleIfTitleEmptyUseCase.setUntitledStoryTitleIfTitleEmpty(editPostRepository)
+        postEditorAnalyticsSession?.setOutcome(PUBLISH)
         _submitButtonClicked.postValue(Event(Unit))
     }
 
     override fun onCleared() {
         super.onCleared()
         lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
-        postEditorAnalyticsSession.end()
+        postEditorAnalyticsSession?.end()
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryTitleHeaderView.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryTitleHeaderView.kt
index 5f4580b976dd..8ae9201f56fc 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryTitleHeaderView.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryTitleHeaderView.kt
@@ -6,8 +6,8 @@ import android.text.TextWatcher
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.widget.FrameLayout
-import kotlinx.android.synthetic.main.prepublishing_story_title_list_item.view.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.PrepublishingStoryTitleListItemBinding
 import org.wordpress.android.ui.posts.PrepublishingHomeItemUiState.StoryTitleUiState
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.focusAndShowKeyboard
@@ -24,34 +24,34 @@ class StoryTitleHeaderView @JvmOverloads constructor(
                     .toInt()
 
     fun init(uiHelpers: UiHelpers, imageManager: ImageManager, uiState: StoryTitleUiState) {
-        LayoutInflater.from(context).inflate(R.layout.prepublishing_story_title_list_item, this, true)
-
-        imageManager.loadImageWithCorners(
-                story_thumbnail,
-                ImageType.IMAGE,
-                uiState.storyThumbnailUrl,
-                thumbnailCornerRadius
-        )
-
-        uiState.storyTitle?.let { title ->
-            story_title.setText(uiHelpers.getTextOfUiString(context, title))
-            story_title.setSelection(title.text.length)
-        }
+        with(PrepublishingStoryTitleListItemBinding.inflate(LayoutInflater.from(context), this, true)) {
+            imageManager.loadImageWithCorners(
+                    storyThumbnail,
+                    ImageType.IMAGE,
+                    uiState.storyThumbnailUrl,
+                    thumbnailCornerRadius
+            )
+
+            uiState.storyTitle?.let { title ->
+                storyTitle.setText(uiHelpers.getTextOfUiString(context, title))
+                storyTitle.setSelection(title.text.length)
+            }
 
-        story_title.focusAndShowKeyboard()
+            storyTitle.focusAndShowKeyboard()
 
-        story_title_content.setOnClickListener {
-            story_title.focusAndShowKeyboard()
-        }
+            storyTitleContent.setOnClickListener {
+                storyTitle.focusAndShowKeyboard()
+            }
 
-        story_title.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
-            override fun afterTextChanged(view: Editable?) {
-                view?.let {
-                    uiState.onStoryTitleChanged.invoke(it.toString())
+            storyTitle.addTextChangedListener(object : TextWatcher {
+                override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                override fun afterTextChanged(view: Editable?) {
+                    view?.let {
+                        uiState.onStoryTitleChanged.invoke(it.toString())
+                    }
                 }
-            }
-        })
+            })
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroDialogFragment.kt
index 31e1c1a7c0e3..1e4ceab0e9a1 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroDialogFragment.kt
@@ -12,11 +12,10 @@ import android.view.Window
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
-import kotlinx.android.synthetic.main.stories_intro_dialog_fragment.*
 import org.wordpress.android.R
 import org.wordpress.android.R.attr
 import org.wordpress.android.WordPress
+import org.wordpress.android.databinding.StoriesIntroDialogFragmentBinding
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.ActivityLauncher
 import org.wordpress.android.ui.photopicker.MediaPickerLauncher
@@ -48,7 +47,7 @@ class StoriesIntroDialogFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = super.onCreateDialog(savedInstanceState)
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(StoriesIntroViewModel::class.java)
 
         if (VERSION.SDK_INT >= VERSION_CODES.M) {
@@ -72,13 +71,13 @@ class StoriesIntroDialogFragment : DialogFragment() {
         super.onViewCreated(view, savedInstanceState)
 
         val site = requireArguments().getSerializable(WordPress.SITE) as SiteModel
+        with(StoriesIntroDialogFragmentBinding.bind(view)) {
+            createStoryIntroButton.setOnClickListener { viewModel.onCreateStoryButtonPressed() }
+            storiesIntroBackButton.setOnClickListener { viewModel.onBackButtonPressed() }
 
-        create_story_intro_button.setOnClickListener { viewModel.onCreateStoryButtonPressed() }
-        stories_intro_back_button.setOnClickListener { viewModel.onBackButtonPressed() }
-
-        story_image_first.setOnClickListener { viewModel.onStoryPreviewTapped1() }
-        story_image_second.setOnClickListener { viewModel.onStoryPreviewTapped2() }
-
+            storyImageFirst.setOnClickListener { viewModel.onStoryPreviewTapped1() }
+            storyImageSecond.setOnClickListener { viewModel.onStoryPreviewTapped2() }
+        }
         viewModel.onCreateButtonClicked.observe(this, Observer {
             activity?.let {
                 mediaPickerLauncher.showStoriesPhotoPickerForResultAndTrack(it, site)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroViewModel.kt
index de217a9e9816..a2d64f8343a3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/intro/StoriesIntroViewModel.kt
@@ -56,8 +56,8 @@ class StoriesIntroViewModel @Inject constructor(
     }
 
     companion object {
-        private const val STORY_URL_1 = "https://wpstories.wordpress.com/2020/10/12/patagonia-2/"
-        private const val STORY_URL_2 = "https://wpstories.wordpress.com/2020/10/12/hiking-in-the-southwest/"
+        private const val STORY_URL_1 = "https://wpstories.wordpress.com/2020/12/02/story-demo-01/"
+        private const val STORY_URL_2 = "https://wpstories.wordpress.com/2020/12/02/story-demo-02/"
         private const val STORY_FULLSCREEN_URL_PARAMS = "?wp-story-load-in-fullscreen=true&wp-story-play-on-load=true"
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt
index 51917328a1a5..600dd4519f50 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
-import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode.MAIN
 import org.wordpress.android.WordPress
@@ -96,16 +95,22 @@ class StoryMediaSaveUploadBridge @Inject constructor(
     private fun addNewStoryFrameMediaItemsToPostAndUploadAsync(site: SiteModel, saveResult: StorySaveResult) {
         // let's invoke the UploadService and enqueue all the files that were saved by the FrameSaveService
         val frames = storyRepositoryWrapper.getStoryAtIndex(saveResult.storyIndex).frames
-        val uriList = frames.map { Uri.fromFile(it.composedFrameFile) }
-        addNewMediaItemsToPostAsync(site, uriList, saveResult.isEditMode)
+        addNewMediaItemsInStoryFramesToPostAsync(site, frames, saveResult.isEditMode)
     }
 
-    private fun addNewMediaItemsToPostAsync(site: SiteModel, uriList: List<Uri>, isEditMode: Boolean) {
+    private fun addNewMediaItemsInStoryFramesToPostAsync(
+        site: SiteModel,
+        frames: List<StoryFrameItem>,
+        isEditMode: Boolean
+    ) {
+        val uriList = frames.map { Uri.fromFile(it.composedFrameFile) }
+
         // this is similar to addNewMediaItemsToEditorAsync in EditorMedia
         launch {
             val localEditorMediaListener = object : EditorMediaListener {
                 override fun appendMediaFiles(mediaFiles: Map<String, MediaFile>) {
                     if (!isEditMode) {
+                        saveStoryGutenbergBlockUseCase.assignAltOnEachMediaFile(frames, ArrayList(mediaFiles.values))
                         saveStoryGutenbergBlockUseCase.buildJetpackStoryBlockInPost(
                                 editPostRepository,
                                 ArrayList(mediaFiles.values)
@@ -135,44 +140,45 @@ class StoryMediaSaveUploadBridge @Inject constructor(
 
                     // here we change the ids on the actual StoryFrameItems, and also update the flattened / composed image
                     // urls with the new URLs which may have been replaced after image optimization
-                    for (story in storyRepositoryWrapper.getImmutableStories()) {
-                        // find the MediaModel for a given Uri from composedFrameFile
-                        for (frame in story.frames) {
-                            // if the old URI in frame.composedFrameFile exists as a key in the passed map, then update that
-                            // value with the new (probably optimized) URL and also keep track of the new id.
-                            val oldUri = Uri.fromFile(frame.composedFrameFile)
-                            val mediaModel = oldUriToMediaFiles.get(oldUri)
-                            mediaModel?.let {
-                                val oldTemporaryId = frame.id ?: ""
-                                frame.id = it.id.toString()
+                    // find the MediaModel for a given Uri from composedFrameFile
+                    for (frame in frames) {
+                        // if the old URI in frame.composedFrameFile exists as a key in the passed map, then update that
+                        // value with the new (probably optimized) URL and also keep track of the new id.
+                        val oldUri = Uri.fromFile(frame.composedFrameFile)
+                        val mediaModel = oldUriToMediaFiles.get(oldUri)
+                        mediaModel?.let {
+                            val oldTemporaryId = frame.id ?: ""
+                            frame.id = it.id.toString()
 
-                                // if prefs has this Slide with the temporary key, replace it
-                                // if not, let's now save the new slide with the local key
-                                storiesPrefs.replaceTempMediaIdKeyedSlideWithLocalMediaIdKeyedSlide(
-                                        TempId(oldTemporaryId),
-                                        LocalId(it.id),
-                                        it.localSiteId.toLong()
-                                ) ?: storiesPrefs.saveSlideWithLocalId(
-                                        it.localSiteId.toLong(),
-                                        // use the local id to save the original, will be replaced later
-                                        // with mediaModel.mediaId after uploading to the remote site
-                                        LocalId(it.id),
-                                        frame
-                                )
+                            // set alt text on MediaModel too
+                            mediaModel.alt = StoryFrameItem.getAltTextFromFrameAddedViews(frame)
+
+                            // if prefs has this Slide with the temporary key, replace it
+                            // if not, let's now save the new slide with the local key
+                            storiesPrefs.replaceTempMediaIdKeyedSlideWithLocalMediaIdKeyedSlide(
+                                    TempId(oldTemporaryId),
+                                    LocalId(it.id),
+                                    it.localSiteId.toLong()
+                            ) ?: storiesPrefs.saveSlideWithLocalId(
+                                    it.localSiteId.toLong(),
+                                    // use the local id to save the original, will be replaced later
+                                    // with mediaModel.mediaId after uploading to the remote site
+                                    LocalId(it.id),
+                                    frame
+                            )
 
-                                // for editMode, we'll need to tell the Gutenberg Editor to replace their mediaFiles
-                                // ids with the new MediaModel local ids are created so, broadcasting the event.
-                                if (isEditMode) {
-                                    // finally send the event that this frameId has changed
-                                    EventBus.getDefault().post(
-                                            StoryFrameMediaModelCreatedEvent(
-                                                    oldTemporaryId,
-                                                    it.id,
-                                                    oldUri.toString(),
-                                                    frame
-                                            )
-                                    )
-                                }
+                            // for editMode, we'll need to tell the Gutenberg Editor to replace their mediaFiles
+                            // ids with the new MediaModel local ids are created so, broadcasting the event.
+                            if (isEditMode) {
+                                // finally send the event that this frameId has changed
+                                eventBusWrapper.postSticky(
+                                        StoryFrameMediaModelCreatedEvent(
+                                                oldTemporaryId,
+                                                it.id,
+                                                oldUri.toString(),
+                                                frame
+                                        )
+                                )
                             }
                         }
                     }
@@ -184,7 +190,8 @@ class StoryMediaSaveUploadBridge @Inject constructor(
                     site,
                     freshlyTaken = false, // we don't care about this
                     editorMediaListener = localEditorMediaListener,
-                    doUploadAfterAdding = true
+                    doUploadAfterAdding = true,
+                    trackEvent = false // Already tracked event when media were first added to the story
             )
 
             // only save this post if we're not currently in edit mode
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/Suggestion.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/Suggestion.kt
new file mode 100644
index 000000000000..d87afac47c29
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/Suggestion.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui.suggestion
+
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.models.UserSuggestion
+
+data class Suggestion(val avatarUrl: String, val value: String, val displayValue: String) {
+    companion object {
+        fun fromUserSuggestions(userSuggestions: List<UserSuggestion>): List<Suggestion> =
+                userSuggestions.map {
+                    Suggestion(it.imageUrl, it.userLogin, it.displayName)
+                }
+
+        fun fromXpost(xpost: XPostSiteModel): Suggestion = Suggestion(xpost.blavatar, xpost.subdomain, xpost.title)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt
new file mode 100644
index 000000000000..327aa9b8d817
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionActivity.kt
@@ -0,0 +1,258 @@
+package org.wordpress.android.ui.suggestion
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
+import android.database.DataSetObserver
+import android.os.Bundle
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.KeyEvent
+import android.view.inputmethod.EditorInfo
+import kotlinx.android.synthetic.main.suggest_users_activity.*
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
+import org.wordpress.android.R
+import org.wordpress.android.WordPress
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChangeEvent
+import org.wordpress.android.ui.LocaleAwareActivity
+import org.wordpress.android.ui.suggestion.FinishAttempt.NotExactlyOneAvailable
+import org.wordpress.android.ui.suggestion.FinishAttempt.OnlyOneAvailable
+import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.ToastUtils
+import org.wordpress.android.widgets.SuggestionAutoCompleteText
+import javax.inject.Inject
+
+class SuggestionActivity : LocaleAwareActivity() {
+    private var suggestionAdapter: SuggestionAdapter? = null
+    private var siteId: Long? = null
+    @Inject lateinit var viewModel: SuggestionViewModel
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        (application as WordPress).component().inject(this)
+        setContentView(R.layout.suggest_users_activity)
+
+        val siteModel = intent.getSerializableExtra(INTENT_KEY_SITE_MODEL) as? SiteModel
+        val suggestionType = intent.getSerializableExtra(INTENT_KEY_SUGGESTION_TYPE) as? SuggestionType
+        when {
+            siteModel == null -> abortDueToMissingIntentExtra(INTENT_KEY_SITE_MODEL)
+            suggestionType == null -> abortDueToMissingIntentExtra(INTENT_KEY_SUGGESTION_TYPE)
+            else -> initializeActivity(siteModel, suggestionType)
+        }
+    }
+
+    private fun abortDueToMissingIntentExtra(key: String) {
+        val message = "${this.javaClass.simpleName} started without $key. Finishing Activity."
+        AppLog.e(T.EDITOR, message)
+        finish()
+    }
+
+    override fun onBackPressed() {
+        viewModel.trackExit(false)
+        super.onBackPressed()
+    }
+
+    private fun initializeActivity(siteModel: SiteModel, suggestionType: SuggestionType) {
+        siteId = siteModel.siteId
+        viewModel.init(suggestionType, siteModel).let { supportsSuggestions ->
+            if (!supportsSuggestions) {
+                finish()
+                return
+            }
+        }
+
+        initializeSuggestionAdapter()
+
+        // The previous activity is visible "behind" this Activity if the list of Suggestions does not fill
+        // the entire screen. If the user taps a part of the screen showing the still-visible previous
+        // Activity, then finish this Activity and return the user to the previous Activity.
+        rootView.setOnClickListener {
+            viewModel.trackExit(false)
+            finish()
+        }
+
+        autocompleteText.apply {
+            initializeWithPrefix(viewModel.suggestionPrefix)
+            setOnItemClickListener { _, _, position, _ ->
+                val suggestionUserId = suggestionAdapter?.getItem(position)?.value
+                finishWithValue(suggestionUserId)
+            }
+
+            setOnKeyListener { _, keyCode, event ->
+                if (event.action == KeyEvent.ACTION_UP) {
+                    if (keyCode == KeyEvent.KEYCODE_ENTER) {
+                        exitIfOnlyOneMatchingUser()
+                        return@setOnKeyListener true
+                    }
+                }
+                false
+            }
+
+            setOnEditorActionListener { _, actionId, _ ->
+                if (actionId == EditorInfo.IME_ACTION_DONE) {
+                    exitIfOnlyOneMatchingUser()
+                    true
+                } else {
+                    false
+                }
+            }
+
+            setOnFocusChangeListener { _, _ ->
+                // The purpose of this Activity is to allow the user to select a user, so we want
+                // the dropdown to always be visible.
+                post { showDropDown() }
+            }
+
+            viewModel.suggestionPrefix.let { prefix ->
+
+                // Ensure the text always starts with appropriate prefix
+                addTextChangedListener(object : TextWatcher {
+                    var matchesPrefixBeforeChanged: Boolean? = null
+
+                    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {
+                        matchesPrefixBeforeChanged = s?.let { it.length == 1 && it[0] == prefix }
+                    }
+
+                    override fun afterTextChanged(s: Editable?) {}
+                    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
+                        if (s == null) {
+                            return
+                        } else if (s.isEmpty() && matchesPrefixBeforeChanged == true) {
+                            // Tapping delete when only the prefix is shown exits the suggestions UI
+                            viewModel.trackExit(false)
+                            finish()
+                        } else if (!s.startsWith(prefix)) {
+                            // Re-insert prefix if it was deleted
+                            val string = "$prefix$s"
+                            autocompleteText.setText(string)
+                            autocompleteText.setSelection(1)
+                            showDropDown()
+                        }
+                        matchesPrefixBeforeChanged = null
+                    }
+                })
+
+                if (text.isEmpty()) {
+                    setText("$prefix")
+                    setSelection(1)
+                }
+            }
+
+            updateEmptyView()
+            post { requestFocus() }
+            showDropdownOnTouch()
+        }
+
+        viewModel.suggestionData.observe(this, { suggestionResult ->
+            suggestionAdapter?.suggestionList = suggestionResult.suggestions
+
+            // Calling forceFiltering is needed to force the suggestions list to always
+            // immediately refresh when there is new data
+            autocompleteText.forceFiltering(autocompleteText.text)
+
+            // Ensure that the suggestions list is displayed wth the new data. This is particularly needed when
+            // suggestion list was empty before the new data was received, otherwise the no-longer-empty
+            // suggestion list will not display when it is updated. Wrapping this in the isAttachedToWindow
+            // check avoids a crash if the suggestions are loaded when the view is not attached.
+            if (autocompleteText.isAttachedToWindow) {
+                autocompleteText.showDropDown()
+            }
+
+            updateEmptyView()
+        })
+    }
+
+    private fun exitIfOnlyOneMatchingUser() {
+        when (val finishAttempt = viewModel.onAttemptToFinish(
+                suggestionAdapter?.filteredSuggestions,
+                autocompleteText.text.toString()
+        )) {
+            is OnlyOneAvailable -> {
+                finishWithValue(finishAttempt.onlySelectedValue)
+            }
+            is NotExactlyOneAvailable -> {
+                ToastUtils.showToast(this@SuggestionActivity, finishAttempt.errorMessage)
+            }
+        }
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private fun SuggestionAutoCompleteText.showDropdownOnTouch() {
+        setOnTouchListener { _, _ ->
+            // Prevent touching the view from dismissing the suggestion list if it's not empty
+            if (!adapter.isEmpty) {
+                showDropDown()
+            }
+            false
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        overridePendingTransition(R.anim.do_nothing, R.anim.do_nothing)
+    }
+
+    private fun finishWithValue(value: String?) {
+        viewModel.trackExit(true)
+        setResult(Activity.RESULT_OK, Intent().apply {
+            putExtra(SELECTED_VALUE, value)
+        })
+        finish()
+    }
+
+    private fun initializeSuggestionAdapter() {
+        suggestionAdapter = SuggestionAdapter(this, viewModel.suggestionPrefix).apply {
+            setBackgroundColorAttr(R.attr.colorGutenbergBackground)
+
+            registerDataSetObserver(object : DataSetObserver() {
+                override fun onChanged() {
+                    updateEmptyView()
+                }
+
+                override fun onInvalidated() {
+                    updateEmptyView()
+                }
+            })
+        }
+
+        autocompleteText.setAdapter(suggestionAdapter)
+    }
+
+    private fun updateEmptyView() {
+        empty_view.apply {
+            val (newText, newVisibility) = viewModel.getEmptyViewState(suggestionAdapter?.filteredSuggestions)
+            text = newText
+            visibility = newVisibility
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        EventBus.getDefault().register(this)
+        if (autocompleteText.isAttachedToWindow) {
+            autocompleteText.showDropDown()
+        }
+    }
+
+    override fun onPause() {
+        EventBus.getDefault().unregister(this)
+        super.onPause()
+    }
+
+    @Subscribe
+    fun onEventMainThread(event: ConnectionChangeEvent) {
+        viewModel.onConnectionChanged(event)
+        updateEmptyView()
+    }
+
+    companion object {
+        const val SELECTED_VALUE = "SELECTED_VALUE"
+
+        const val INTENT_KEY_SUGGESTION_TYPE = "INTENT_KEY_SUGGESTION_TYPE"
+        const val INTENT_KEY_SITE_MODEL = "INTENT_KEY_SITE_MODEL"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSource.kt
new file mode 100644
index 000000000000..9487c3853eb1
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSource.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui.suggestion
+
+import androidx.lifecycle.LiveData
+import org.wordpress.android.fluxc.model.SiteModel
+
+interface SuggestionSource {
+    val site: SiteModel
+    val suggestionData: LiveData<SuggestionResult>
+    fun initialize()
+    fun refreshSuggestions()
+    fun isFetchInProgress(): Boolean
+    fun onCleared()
+}
+
+data class SuggestionResult(val suggestions: List<Suggestion>, val hadFetchError: Boolean)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSourceProvider.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSourceProvider.kt
new file mode 100644
index 000000000000..93cae9e1f0d7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSourceProvider.kt
@@ -0,0 +1,18 @@
+package org.wordpress.android.ui.suggestion
+
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.suggestion.SuggestionType.Users
+import org.wordpress.android.ui.suggestion.SuggestionType.XPosts
+import javax.inject.Inject
+
+class SuggestionSourceProvider @Inject constructor(
+    private val suggestionSourceSubcomponentFactory: SuggestionSourceSubcomponent.Factory
+) {
+    fun get(type: SuggestionType, site: SiteModel): SuggestionSource {
+        val factory = suggestionSourceSubcomponentFactory.create(site)
+        return when (type) {
+            XPosts -> factory.xPostSuggestionSource()
+            Users -> factory.userSuggestionSource()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSourceSubcomponent.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSourceSubcomponent.kt
new file mode 100644
index 000000000000..b5c5c23f1936
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionSourceSubcomponent.kt
@@ -0,0 +1,22 @@
+package org.wordpress.android.ui.suggestion
+
+import dagger.BindsInstance
+import dagger.Module
+import dagger.Subcomponent
+import org.wordpress.android.fluxc.model.SiteModel
+
+@Subcomponent
+interface SuggestionSourceSubcomponent {
+    fun userSuggestionSource(): UserSuggestionSource
+    fun xPostSuggestionSource(): XPostsSuggestionSource
+
+    @Subcomponent.Factory
+    interface Factory {
+        fun create(
+            @BindsInstance site: SiteModel
+        ): SuggestionSourceSubcomponent
+    }
+
+    @Module(subcomponents = [ SuggestionSourceSubcomponent::class ])
+    interface SuggestionSourceModule
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionType.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionType.kt
new file mode 100644
index 000000000000..aa4d128de3c3
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionType.kt
@@ -0,0 +1,3 @@
+package org.wordpress.android.ui.suggestion
+
+enum class SuggestionType { XPosts, Users }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionViewModel.kt
new file mode 100644
index 000000000000..bf9348711267
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/SuggestionViewModel.kt
@@ -0,0 +1,154 @@
+package org.wordpress.android.ui.suggestion
+
+import android.view.View
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.ViewModel
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChangeEvent
+import org.wordpress.android.ui.suggestion.SuggestionType.Users
+import org.wordpress.android.ui.suggestion.SuggestionType.XPosts
+import org.wordpress.android.ui.suggestion.FinishAttempt.NotExactlyOneAvailable
+import org.wordpress.android.ui.suggestion.FinishAttempt.OnlyOneAvailable
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
+import javax.inject.Inject
+
+class SuggestionViewModel @Inject constructor(
+    private val suggestionSourceProvider: SuggestionSourceProvider,
+    private val resourceProvider: ResourceProvider,
+    private val networkUtils: NetworkUtilsWrapper,
+    private val analyticsTracker: AnalyticsTrackerWrapper
+) : ViewModel() {
+    private lateinit var suggestionSource: SuggestionSource
+    private lateinit var type: SuggestionType
+    val suggestionData: LiveData<SuggestionResult>
+        get() = suggestionSource.suggestionData
+
+    val suggestionPrefix: Char by lazy {
+        when (type) {
+            XPosts -> '+'
+            Users -> '@'
+        }
+    }
+
+    val suggestionTypeString: String by lazy {
+        resourceProvider.getString(
+                when (type) {
+                    XPosts -> R.string.suggestion_xpost
+                    Users -> R.string.suggestion_user
+                }
+        )
+    }
+
+    fun init(type: SuggestionType, site: SiteModel) =
+            if (supportsSuggestions(site)) {
+                this.type = type
+                suggestionSource = suggestionSourceProvider.get(type, site)
+                suggestionSource.initialize()
+                true
+            } else {
+                AppLog.e(T.EDITOR, "Attempting to initialize suggestions for an unsupported site")
+                false
+            }
+
+    private fun supportsSuggestions(site: SiteModel): Boolean = SiteUtils.isAccessedViaWPComRest(site)
+
+    fun onConnectionChanged(event: ConnectionChangeEvent) {
+        if (event.isConnected) {
+            suggestionSource.refreshSuggestions()
+        }
+    }
+
+    fun getEmptyViewState(displayedSuggestions: List<Suggestion>?): EmptyViewState {
+        val hasSuggestions = suggestionData.value?.suggestions?.isNotEmpty() == true
+
+        val text = when {
+            hasSuggestions -> {
+                // Displaying the empty view even though we have suggestions means that the user is filtering out
+                // all the suggestions.
+                resourceProvider.getString(R.string.suggestion_no_matching, suggestionTypeString)
+            }
+            networkUtils.isNetworkAvailable() -> when {
+                suggestionSource.isFetchInProgress() -> {
+                    resourceProvider.getString(R.string.loading)
+                }
+                suggestionData.value?.hadFetchError == true -> {
+                    resourceProvider.getString(R.string.suggestion_problem)
+                }
+                else -> {
+                    // We have a suggestion update that we know was empty (because we already checked
+                    // `hasSuggestions` in the parent when statement), and there wasn't a fetch error,
+                    // so notify the user that there are no suggestions available
+                    resourceProvider.getString(R.string.suggestion_none, suggestionTypeString)
+                }
+            }
+            else -> {
+                // Only provide this error message if we cannot provide any better information
+                resourceProvider.getString(R.string.suggestion_no_connection)
+            }
+        }
+
+        val visibility = if (displayedSuggestions?.isNotEmpty() == true) View.GONE else View.VISIBLE
+
+        return EmptyViewState(text, visibility)
+    }
+
+    fun onAttemptToFinish(
+        selections: List<Suggestion>?,
+        currentUserInput: String
+    ): FinishAttempt {
+        val onlyDisplayedSuggestion = if (selections?.size == 1) {
+            selections.first()
+        } else {
+            null
+        }
+
+        return if (onlyDisplayedSuggestion != null) {
+            OnlyOneAvailable(onlyDisplayedSuggestion.value)
+        } else {
+            // Provide different message depending on whether the user has tried to "submit" a suggestion
+            // based on no filter text versus tried to submit a suggestion based on text that just doesn't
+            // match a single suggestion.
+            val message = if (currentUserInput == suggestionPrefix.toString()) {
+                resourceProvider.getString(R.string.suggestion_selection_needed)
+            } else {
+                resourceProvider.getString(
+                        R.string.suggestion_invalid,
+                        currentUserInput,
+                        suggestionTypeString
+                )
+            }
+            NotExactlyOneAvailable(message)
+        }
+    }
+
+    fun trackExit(withSuggestion: Boolean) {
+        val trackingSuggestionType = when (type) {
+            XPosts -> "xpost"
+            Users -> "user"
+        }
+        val properties = mapOf(
+                "did_select_suggestion" to withSuggestion,
+                "suggestion_type" to trackingSuggestionType
+        )
+        analyticsTracker.track(AnalyticsTracker.Stat.SUGGESTION_SESSION_FINISHED, properties)
+    }
+
+    override fun onCleared() {
+        suggestionSource.onCleared()
+        super.onCleared()
+    }
+}
+
+data class EmptyViewState(val string: String, val visibility: Int)
+
+sealed class FinishAttempt {
+    data class OnlyOneAvailable(val onlySelectedValue: String) : FinishAttempt()
+    data class NotExactlyOneAvailable(val errorMessage: String) : FinishAttempt()
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/UserSuggestionSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/UserSuggestionSource.kt
new file mode 100644
index 000000000000..39a84bff9bac
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/UserSuggestionSource.kt
@@ -0,0 +1,77 @@
+package org.wordpress.android.ui.suggestion
+
+import android.content.Context
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.greenrobot.eventbus.Subscribe
+import org.wordpress.android.datasets.UserSuggestionTable
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.suggestion.service.SuggestionEvents.SuggestionNameListUpdated
+import org.wordpress.android.ui.suggestion.util.SuggestionServiceConnectionManager
+import org.wordpress.android.util.EventBusWrapper
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.coroutines.CoroutineContext
+
+class UserSuggestionSource @Inject constructor(
+    context: Context,
+    override val site: SiteModel,
+    private val eventBusWrapper: EventBusWrapper,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) : SuggestionSource, CoroutineScope {
+    override val coroutineContext: CoroutineContext = bgDispatcher + Job()
+    private val connectionManager = SuggestionServiceConnectionManager(context, site.siteId)
+
+    private val _suggestions = MutableLiveData<SuggestionResult>()
+    override val suggestionData: LiveData<SuggestionResult> = _suggestions
+
+    private var isFetching: Boolean = false
+
+    override fun initialize() {
+        postSavedSuggestions(false)
+        isFetching = true
+        connectionManager.bindToService()
+        eventBusWrapper.register(this)
+    }
+
+    private fun postSavedSuggestions(suggestionsWereJustUpdated: Boolean) {
+        launch {
+            val suggestions = Suggestion.fromUserSuggestions(
+                    UserSuggestionTable.getSuggestionsForSite(site.siteId)
+            )
+
+            // Only send empty suggestions if they are recent
+            if (suggestions.isNotEmpty() || suggestionsWereJustUpdated) {
+                _suggestions.postValue(SuggestionResult(suggestions, false))
+            }
+        }
+    }
+
+    override fun refreshSuggestions() {
+        isFetching = true
+        connectionManager.apply {
+            unbindFromService()
+            bindToService()
+        }
+    }
+
+    @Subscribe
+    fun onEventMainThread(event: SuggestionNameListUpdated) {
+        if (event.mRemoteBlogId == site.siteId) {
+            isFetching = false
+            postSavedSuggestions(true)
+        }
+    }
+
+    override fun isFetchInProgress(): Boolean = isFetching
+
+    override fun onCleared() {
+        eventBusWrapper.unregister(this)
+        connectionManager.unbindFromService()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/XPostsSuggestionSource.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/XPostsSuggestionSource.kt
new file mode 100644
index 000000000000..28689854f582
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/XPostsSuggestionSource.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.ui.suggestion
+
+import androidx.annotation.VisibleForTesting
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.XPostsResult
+import org.wordpress.android.fluxc.store.XPostsStore
+import org.wordpress.android.modules.BG_THREAD
+import javax.inject.Inject
+import javax.inject.Named
+import kotlin.coroutines.CoroutineContext
+
+class XPostsSuggestionSource @Inject constructor(
+    private val xPostsStore: XPostsStore,
+    override val site: SiteModel,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) : SuggestionSource, CoroutineScope {
+    override val coroutineContext: CoroutineContext = bgDispatcher + Job()
+
+    private val _suggestions = MutableLiveData<SuggestionResult>()
+    override val suggestionData: LiveData<SuggestionResult> = _suggestions
+
+    @VisibleForTesting
+    var fetchJob: Job? = null
+
+    override fun initialize() {
+        launch {
+            when (val result = xPostsStore.getXPostsFromDb(site)) {
+                is XPostsResult.Result -> {
+                    val xPostSuggestions = suggestionsFromResult(result)
+                    if (xPostSuggestions.isNotEmpty()) {
+                        _suggestions.postValue(SuggestionResult(xPostSuggestions, false))
+                    }
+                }
+            }
+        }
+        refreshSuggestions()
+    }
+
+    private fun suggestionsFromResult(result: XPostsResult.Result): List<Suggestion> =
+            result.xPosts
+                    .map { Suggestion.fromXpost(it) }
+                    .sortedBy { it.value }
+
+    override fun refreshSuggestions() {
+        if (fetchJob?.isActive != true) {
+            fetchJob = launch {
+                val result = when (val fetchResult = xPostsStore.fetchXPosts(site)) {
+                    is XPostsResult.Result -> {
+                        val xPosts = suggestionsFromResult(fetchResult)
+                        SuggestionResult(xPosts, false)
+                    }
+                    XPostsResult.Unknown -> {
+                        val previousXposts = suggestionData.value?.suggestions ?: emptyList()
+                        SuggestionResult(previousXposts, true)
+                    }
+                }
+                _suggestions.postValue(result)
+            }
+        }
+    }
+
+    override fun isFetchInProgress(): Boolean = fetchJob?.isActive == true
+
+    override fun onCleared() { /* Do nothing */ }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java
index ae2be6b3e1bf..41b005e9664e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/adapters/SuggestionAdapter.java
@@ -17,7 +17,7 @@
 
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.models.Suggestion;
+import org.wordpress.android.ui.suggestion.Suggestion;
 import org.wordpress.android.util.GravatarUtils;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.util.image.ImageType;
@@ -34,12 +34,15 @@ public class SuggestionAdapter extends BaseAdapter implements Filterable {
     private Filter mSuggestionFilter;
     private List<Suggestion> mSuggestionList;
     private List<Suggestion> mOrigSuggestionList;
-    private int mAvatarSz;
+    private final int mAvatarSz;
     private @Nullable @AttrRes Integer mBackgroundColor;
 
     @Inject protected ImageManager mImageManager;
 
-    public SuggestionAdapter(Context context) {
+    private final char mPrefix;
+
+    public SuggestionAdapter(Context context, char prefix) {
+        this.mPrefix = prefix;
         ((WordPress) context.getApplicationContext()).component().inject(this);
         mAvatarSz = context.getResources().getDimensionPixelSize(R.dimen.avatar_sz_small);
         mInflater = LayoutInflater.from(context);
@@ -57,6 +60,10 @@ public List<Suggestion> getSuggestionList() {
         return mOrigSuggestionList;
     }
 
+    public List<Suggestion> getFilteredSuggestions() {
+        return mSuggestionList;
+    }
+
     @Override
     public int getCount() {
         if (mSuggestionList == null) {
@@ -99,11 +106,11 @@ public View getView(int position, View convertView, ViewGroup parent) {
         Suggestion suggestion = getItem(position);
 
         if (suggestion != null) {
-            String avatarUrl = GravatarUtils.fixGravatarUrl(suggestion.getImageUrl(), mAvatarSz);
+            String avatarUrl = GravatarUtils.fixGravatarUrl(suggestion.getAvatarUrl(), mAvatarSz);
             mImageManager.loadIntoCircle(holder.mImgAvatar, ImageType.AVATAR_WITH_BACKGROUND, avatarUrl);
-            holder.mTxtUserLogin
-                    .setText(convertView.getResources().getString(R.string.at_username, suggestion.getUserLogin()));
-            holder.mTxtDisplayName.setText(suggestion.getDisplayName());
+            String value = mPrefix + suggestion.getValue();
+            holder.mValue.setText(value);
+            holder.mDisplayValue.setText(suggestion.getDisplayValue());
         }
 
         return convertView;
@@ -118,15 +125,15 @@ public Filter getFilter() {
         return mSuggestionFilter;
     }
 
-    private class SuggestionViewHolder {
+    private static class SuggestionViewHolder {
         private final ImageView mImgAvatar;
-        private final TextView mTxtUserLogin;
-        private final TextView mTxtDisplayName;
+        private final TextView mValue;
+        private final TextView mDisplayValue;
 
         SuggestionViewHolder(View row) {
             mImgAvatar = row.findViewById(R.id.suggest_list_row_avatar);
-            mTxtUserLogin = row.findViewById(R.id.suggestion_list_row_user_login_label);
-            mTxtDisplayName = row.findViewById(R.id.suggestion_list_row_display_name_label);
+            mValue = row.findViewById(R.id.suggestion_list_row_raw_value_label);
+            mDisplayValue = row.findViewById(R.id.suggestion_list_row_display_value_label);
         }
     }
 
@@ -151,10 +158,10 @@ private List<Suggestion> getFilteredSuggestions(CharSequence constraint) {
                 for (Suggestion suggestion : mOrigSuggestionList) {
                     String lowerCaseConstraint = constraint.toString().toLowerCase(Locale.getDefault());
                     boolean suggestionMatchesConstraint =
-                            suggestion.getUserLogin().toLowerCase(Locale.ROOT).startsWith(lowerCaseConstraint)
-                            || suggestion.getDisplayName().toLowerCase(Locale.getDefault())
+                            suggestion.getValue().toLowerCase(Locale.ROOT).startsWith(lowerCaseConstraint)
+                            || suggestion.getDisplayValue().toLowerCase(Locale.getDefault())
                                          .startsWith(lowerCaseConstraint)
-                            || suggestion.getDisplayName().toLowerCase(Locale.getDefault())
+                            || suggestion.getDisplayValue().toLowerCase(Locale.getDefault())
                                          .contains(" " + lowerCaseConstraint);
                     if (suggestionMatchesConstraint) {
                         filteredSuggestions.add(suggestion);
@@ -179,7 +186,7 @@ protected void publishResults(CharSequence constraint,
         @Override
         public CharSequence convertResultToString(Object resultValue) {
             Suggestion suggestion = (Suggestion) resultValue;
-            return suggestion.getUserLogin();
+            return suggestion.getValue();
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/service/SuggestionService.java b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/service/SuggestionService.java
index 498413b80a98..7853bb5dba14 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/service/SuggestionService.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/service/SuggestionService.java
@@ -11,8 +11,8 @@
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.wordpress.android.WordPress;
-import org.wordpress.android.datasets.SuggestionTable;
-import org.wordpress.android.models.Suggestion;
+import org.wordpress.android.datasets.UserSuggestionTable;
+import org.wordpress.android.models.UserSuggestion;
 import org.wordpress.android.models.Tag;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -103,9 +103,9 @@ public void run() {
                 }
 
                 JSONArray jsonSuggestions = jsonObject.optJSONArray("suggestions");
-                List<Suggestion> suggestions = Suggestion.suggestionListFromJSON(jsonSuggestions, siteId);
+                List<UserSuggestion> suggestions = UserSuggestion.suggestionListFromJSON(jsonSuggestions, siteId);
                 if (suggestions != null) {
-                    SuggestionTable.insertSuggestionsForSite(siteId, suggestions);
+                    UserSuggestionTable.insertSuggestionsForSite(siteId, suggestions);
                     EventBus.getDefault().post(new SuggestionEvents.SuggestionNameListUpdated(siteId));
                 }
             }
@@ -150,7 +150,7 @@ public void run() {
                 JSONArray jsonTags = jsonObject.optJSONArray("tags");
                 List<Tag> tags = Tag.tagListFromJSON(jsonTags, siteId);
                 if (tags != null) {
-                    SuggestionTable.insertTagsForSite(siteId, tags);
+                    UserSuggestionTable.insertTagsForSite(siteId, tags);
                     EventBus.getDefault().post(new SuggestionEvents.SuggestionTagListUpdated(siteId));
                 }
             }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionTokenizer.java b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionTokenizer.java
index cd80fb30c8d8..a9c1f645b1db 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionTokenizer.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionTokenizer.java
@@ -6,6 +6,12 @@
 import android.widget.MultiAutoCompleteTextView;
 
 public class SuggestionTokenizer implements MultiAutoCompleteTextView.Tokenizer {
+    private final char mPrefix;
+
+    public SuggestionTokenizer(char prefix) {
+        this.mPrefix = prefix;
+    }
+
     @Override
     public CharSequence terminateToken(CharSequence text) {
         int i = text.length();
@@ -24,11 +30,11 @@ public CharSequence terminateToken(CharSequence text) {
     @Override
     public int findTokenStart(CharSequence text, int cursor) {
         int i = cursor;
-        while (i > 0 && text.charAt(i - 1) != '@') {
+        while (i > 0 && text.charAt(i - 1) != mPrefix) {
             i--;
         }
 
-        if (i < 1 || text.charAt(i - 1) != '@') {
+        if (i < 1 || text.charAt(i - 1) != mPrefix) {
             return cursor;
         }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionUtils.java
deleted file mode 100644
index 57750d877db5..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.wordpress.android.ui.suggestion.util;
-
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import org.wordpress.android.datasets.SuggestionTable;
-import org.wordpress.android.fluxc.model.SiteModel;
-import org.wordpress.android.models.Suggestion;
-import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter;
-import org.wordpress.android.util.SiteUtils;
-
-import java.util.List;
-
-public class SuggestionUtils {
-    @Nullable
-    public static SuggestionAdapter setupSuggestions(
-            SiteModel site,
-            Context context,
-            @NonNull SuggestionServiceConnectionManager serviceConnectionManager
-    ) {
-        return SuggestionUtils.setupSuggestions(site.getSiteId(), context, serviceConnectionManager,
-                                                SiteUtils.isAccessedViaWPComRest(site));
-    }
-
-    @Nullable
-    public static SuggestionAdapter setupSuggestions(
-            final long siteId,
-            Context context,
-            @NonNull SuggestionServiceConnectionManager serviceConnectionManager,
-            boolean isWPComFlag
-    ) {
-        if (!isWPComFlag) {
-            return null;
-        }
-
-
-        serviceConnectionManager.bindToService();
-
-        List<Suggestion> suggestions = SuggestionTable.getSuggestionsForSite(siteId);
-        SuggestionAdapter suggestionAdapter = new SuggestionAdapter(context);
-        suggestionAdapter.setSuggestionList(suggestions);
-
-        return suggestionAdapter;
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionUtils.kt
new file mode 100644
index 000000000000..7919785f91bb
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/suggestion/util/SuggestionUtils.kt
@@ -0,0 +1,50 @@
+package org.wordpress.android.ui.suggestion.util
+
+import android.content.Context
+import org.wordpress.android.datasets.UserSuggestionTable
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.models.UserSuggestion
+import org.wordpress.android.ui.suggestion.Suggestion
+import org.wordpress.android.ui.suggestion.adapters.SuggestionAdapter
+import org.wordpress.android.util.SiteUtils
+
+object SuggestionUtils {
+    @JvmStatic
+    fun setupUserSuggestions(
+        site: SiteModel,
+        context: Context,
+        connectionManager: SuggestionServiceConnectionManager
+    ): SuggestionAdapter = setupUserSuggestions(
+            site.siteId,
+            context,
+            connectionManager,
+            SiteUtils.isAccessedViaWPComRest(site)
+    )
+
+    @JvmStatic
+    fun setupUserSuggestions(
+        siteId: Long,
+        context: Context,
+        connectionManager: SuggestionServiceConnectionManager,
+        isWPCom: Boolean
+    ): SuggestionAdapter {
+        val initialSuggestions = setupUserSuggestions(siteId, connectionManager, isWPCom)
+        return SuggestionAdapter(context, '@').apply {
+            suggestionList = Suggestion.fromUserSuggestions(initialSuggestions)
+        }
+    }
+
+    private fun setupUserSuggestions(
+        siteId: Long,
+        serviceConnectionManager: SuggestionServiceConnectionManager,
+        isWPCom: Boolean
+    ): List<UserSuggestion> {
+        if (!isWPCom) {
+            return emptyList()
+        }
+        serviceConnectionManager.bindToService()
+
+        // Immediately return any already saved suggestions
+        return UserSuggestionTable.getSuggestionsForSite(siteId) ?: emptyList()
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java
index e3668f9a13a1..1c0196c506b8 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserActivity.java
@@ -46,11 +46,6 @@
 import javax.inject.Inject;
 
 public class ThemeBrowserActivity extends LocaleAwareActivity implements ThemeBrowserFragmentCallback {
-    public static boolean isAccessible(SiteModel site) {
-        // themes are only accessible to admin wordpress.com users
-        return site != null && site.isUsingWpComRestApi() && site.getHasCapabilityEditThemeOptions();
-    }
-
     public static final int ACTIVATE_THEME = 1;
     public static final String THEME_ID = "theme_id";
 
@@ -161,9 +156,6 @@ public void onActivateSelected(String themeId) {
 
     @Override
     public void onTryAndCustomizeSelected(String themeId) {
-        if (mThemeBrowserFragment != null) {
-            mThemeBrowserFragment.completeQuickStartCustomizeTask();
-        }
         startWebActivity(themeId, ThemeWebActivity.ThemeWebActivityType.PREVIEW);
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserFragment.java
index 00fe0b93622f..d902064eaab4 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserFragment.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserFragment.java
@@ -4,7 +4,6 @@
 import android.app.Activity;
 import android.database.DataSetObserver;
 import android.os.Bundle;
-import android.text.Spannable;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -18,15 +17,11 @@
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.elevation.ElevationOverlayProvider;
 
-import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 import org.jetbrains.annotations.NotNull;
 import org.wordpress.android.R;
 import org.wordpress.android.WordPress;
@@ -35,20 +30,19 @@
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.model.ThemeModel;
 import org.wordpress.android.fluxc.store.QuickStartStore;
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask;
 import org.wordpress.android.fluxc.store.ThemeStore;
 import org.wordpress.android.ui.ActionableEmptyView;
 import org.wordpress.android.ui.plans.PlansConstants;
 import org.wordpress.android.ui.quickstart.QuickStartEvent;
 import org.wordpress.android.util.NetworkUtils;
 import org.wordpress.android.util.QuickStartUtils;
+import org.wordpress.android.util.QuickStartUtilsWrapper;
 import org.wordpress.android.util.StringUtils;
 import org.wordpress.android.util.ToastUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.helpers.SwipeToRefreshHelper;
 import org.wordpress.android.util.image.ImageManager;
 import org.wordpress.android.widgets.HeaderGridView;
-import org.wordpress.android.widgets.WPDialogSnackbar;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -113,6 +107,7 @@ interface ThemeBrowserFragmentCallback {
     @Inject QuickStartStore mQuickStartStore;
     @Inject Dispatcher mDispatcher;
     @Inject ImageManager mImageManager;
+    @Inject QuickStartUtilsWrapper mQuickStartUtilsWrapper;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -166,15 +161,6 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         return view;
     }
 
-    @Override
-    public void onViewCreated(@NotNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        if (mQuickStartEvent != null && mQuickStartEvent.getTask() == QuickStartTask.CUSTOMIZE_SITE) {
-            showQuickStartFocusPoint();
-        }
-    }
-
     private void showQuickStartFocusPoint() {
         if (getView() == null) {
             return;
@@ -192,30 +178,6 @@ private void showQuickStartFocusPoint() {
         });
     }
 
-    @SuppressWarnings("unused")
-    @Subscribe(sticky = true, threadMode = ThreadMode.MAIN)
-    public void onEvent(final QuickStartEvent event) {
-        if (!isAdded() || getView() == null) {
-            return;
-        }
-
-        EventBus.getDefault().removeStickyEvent(event);
-        mQuickStartEvent = event;
-
-        if (mQuickStartEvent.getTask() == QuickStartTask.CUSTOMIZE_SITE) {
-            getView().post(() -> {
-                showQuickStartFocusPoint();
-
-                Spannable title = QuickStartUtils.stylizeQuickStartPrompt(getActivity(),
-                        R.string.quick_start_dialog_customize_site_message_short_customize,
-                        R.drawable.ic_customize_white_24dp);
-
-                WPDialogSnackbar.make(getView(), title,
-                        getResources().getInteger(R.integer.quick_start_snackbar_duration_ms)).show();
-            });
-        }
-    }
-
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -348,17 +310,6 @@ private void addMainHeader(LayoutInflater inflater) {
         mGridView.addHeaderView(header);
     }
 
-    void completeQuickStartCustomizeTask() {
-        QuickStartUtils.completeTaskAndRemindNextOne(mQuickStartStore, QuickStartTask.CUSTOMIZE_SITE,
-                mDispatcher, mSite, mQuickStartEvent, getContext());
-        if (mQuickStartEvent != null && mQuickStartEvent.getTask() == QuickStartTask.CUSTOMIZE_SITE) {
-            if (getView() != null) {
-                QuickStartUtils.removeQuickStartFocusPoint((ViewGroup) getView());
-            }
-            mQuickStartEvent = null;
-        }
-    }
-
 
     private void setThemeNameIfAlreadyAvailable() {
         ThemeModel currentTheme = mThemeStore.getActiveThemeForSite(mSite);
@@ -514,16 +465,6 @@ private boolean shouldShowPremiumThemes() {
                || planId == PlansConstants.JETPACK_BUSINESS_PLAN_ID;
     }
 
-    @Override public void onStart() {
-        super.onStart();
-        EventBus.getDefault().register(this);
-    }
-
-    @Override public void onStop() {
-        super.onStop();
-        EventBus.getDefault().unregister(this);
-    }
-
     private class ThemeDataSetObserver extends DataSetObserver {
         @Override public void onChanged() {
             updateDisplay();
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserUtils.kt
new file mode 100644
index 000000000000..a80b0c3154ea
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserUtils.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.ui.themes
+
+import org.wordpress.android.fluxc.model.SiteModel
+import javax.inject.Inject
+
+class ThemeBrowserUtils
+@Inject constructor() {
+    fun isAccessible(site: SiteModel?): Boolean {
+        // themes are only accessible to admin wordpress.com users
+        return site != null &&
+                site.isUsingWpComRestApi &&
+                site.hasCapabilityEditThemeOptions &&
+                !site.isWpForTeamsSite
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/MediaUploadReadyProcessor.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/MediaUploadReadyProcessor.java
index 7eb3180df08d..86a4da36d608 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/MediaUploadReadyProcessor.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/MediaUploadReadyProcessor.java
@@ -5,6 +5,7 @@
 import org.wordpress.android.WordPress;
 import org.wordpress.android.editor.AztecEditorFragment;
 import org.wordpress.android.fluxc.model.PostModel;
+import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.ui.media.services.MediaUploadReadyListener;
 import org.wordpress.android.ui.posts.PostUtils;
 import org.wordpress.android.ui.prefs.AppPrefs;
@@ -23,15 +24,16 @@ public class MediaUploadReadyProcessor implements MediaUploadReadyListener {
 
     @Override
     public PostModel replaceMediaFileWithUrlInPost(@Nullable PostModel post, String localMediaId, MediaFile mediaFile,
-                                                   String siteUrl) {
+                                                   @Nullable SiteModel site) {
         if (post != null) {
             boolean showAztecEditor = AppPrefs.isAztecEditorEnabled();
             boolean showGutenbergEditor = AppPrefs.isGutenbergEditorEnabled();
 
             if (PostUtils.contentContainsWPStoryGutenbergBlocks(post.getContent())) {
                 mSaveStoryGutenbergBlockUseCase
-                    .replaceLocalMediaIdsWithRemoteMediaIdsInPost(post, mediaFile);
+                    .replaceLocalMediaIdsWithRemoteMediaIdsInPost(post, site, mediaFile);
             } else if (showGutenbergEditor && PostUtils.contentContainsGutenbergBlocks(post.getContent())) {
+                String siteUrl = site != null ? site.getUrl() : "";
                 post.setContent(
                         PostUtils.replaceMediaFileWithUrlInGutenbergPost(post.getContent(), localMediaId, mediaFile,
                                 siteUrl));
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
index 447a2f62be58..a6ceec7b148d 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadHandler.java
@@ -277,6 +277,7 @@ protected UploadPostTaskResult doInBackground(PostModel... posts) {
             EventBus.getDefault().post(new PostUploadStarted(mPost));
 
             RemotePostPayload payload = new RemotePostPayload(mPost, mSite);
+            payload.isFirstTimePublish = sFirstPublishPosts.contains(mPost.getId());
 
             switch (mUploadActionUseCase.getUploadAction(mPost)) {
                 case UPLOAD:
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java
index c9da711c2820..4bed3a67e913 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java
@@ -127,6 +127,11 @@ private void updateNotificationBuilder(@Nullable PostImmutableModel post) {
     }
 
     private synchronized void startOrUpdateForegroundNotification(@Nullable PostImmutableModel post) {
+        boolean isTotalPostsAndMediaItemsCountZero = sNotificationData.mTotalPostItems == 0
+                                                     && sNotificationData.mTotalMediaItems == 0;
+        if (isTotalPostsAndMediaItemsCountZero) {
+            return;
+        }
         updateNotificationBuilder(post);
         if (sNotificationData.mNotificationId == 0) {
             sNotificationData.mNotificationId = (new Random()).nextInt();
@@ -331,7 +336,7 @@ void updateNotificationSuccessForPost(@NonNull PostImmutableModel post, @NonNull
                 break;
         }
 
-        notificationBuilder.setSmallIcon(R.drawable.ic_my_sites_white_24dp);
+        notificationBuilder.setSmallIcon(R.drawable.ic_app_white_24dp);
         notificationBuilder.setColor(mContext.getResources().getColor(R.color.primary_50));
 
         notificationBuilder.setContentTitle(notificationTitle);
@@ -412,7 +417,7 @@ void updateNotificationSuccessForMedia(@NonNull List<MediaModel> mediaList, @Non
                                                                 (int) notificationId,
                                                                 notificationIntent, PendingIntent.FLAG_ONE_SHOT);
 
-        notificationBuilder.setSmallIcon(R.drawable.ic_my_sites_white_24dp);
+        notificationBuilder.setSmallIcon(R.drawable.ic_app_white_24dp);
         notificationBuilder.setColor(mContext.getResources().getColor(R.color.primary_50));
 
         String notificationTitle = buildSuccessMessageForMedia(mediaList.size());
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
index 684b4f545cd1..65a05ca0470e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadService.java
@@ -205,10 +205,25 @@ private void unpackMediaIntent(@NonNull Intent intent) {
             // if this media belongs to some post, register such Post
             registerPostModelsForMedia(mediaList, intent.getBooleanExtra(KEY_SHOULD_RETRY, false));
 
+            ArrayList<MediaModel> toBeUploadedMediaList = new ArrayList<>();
             for (MediaModel media : mediaList) {
+                MediaModel localMedia = mMediaStore.getMediaWithLocalId(media.getId());
+                boolean notUploadedYet = localMedia != null
+                                         && (localMedia.getUploadState() == null
+                                             || MediaUploadState.fromString(localMedia.getUploadState())
+                                                != MediaUploadState.UPLOADED);
+                if (notUploadedYet) {
+                    toBeUploadedMediaList.add(media);
+                }
+            }
+
+            for (MediaModel media : toBeUploadedMediaList) {
                 mMediaUploadHandler.upload(media);
             }
-            mPostUploadNotifier.addMediaInfoToForegroundNotification(mediaList);
+
+            if (!toBeUploadedMediaList.isEmpty()) {
+                mPostUploadNotifier.addMediaInfoToForegroundNotification(toBeUploadedMediaList);
+            }
         }
     }
 
@@ -609,7 +624,7 @@ private static synchronized PostModel updatePostWithMediaUrl(PostModel post, Med
 
             // actually replace the media ID with the media uri
             processor.replaceMediaFileWithUrlInPost(post, String.valueOf(media.getId()),
-                    FluxCUtils.mediaFileFromMediaModel(media), site.getUrl());
+                    FluxCUtils.mediaFileFromMediaModel(media), site);
 
             // we changed the post, so let’s mark this down
             if (!post.isLocalDraft()) {
@@ -1099,13 +1114,13 @@ public static class UploadErrorEvent {
         public final List<MediaModel> mediaModelList;
         public final String errorMessage;
 
-        UploadErrorEvent(PostModel post, String errorMessage) {
+        public UploadErrorEvent(PostModel post, String errorMessage) {
             this.post = post;
             this.mediaModelList = null;
             this.errorMessage = errorMessage;
         }
 
-        UploadErrorEvent(List<MediaModel> mediaModelList, String errorMessage) {
+        public UploadErrorEvent(List<MediaModel> mediaModelList, String errorMessage) {
             this.post = null;
             this.mediaModelList = mediaModelList;
             this.errorMessage = errorMessage;
@@ -1116,7 +1131,7 @@ public static class UploadMediaSuccessEvent {
         public final List<MediaModel> mediaModelList;
         public final String successMessage;
 
-        UploadMediaSuccessEvent(List<MediaModel> mediaModelList, String successMessage) {
+        public UploadMediaSuccessEvent(List<MediaModel> mediaModelList, String successMessage) {
             this.mediaModelList = mediaModelList;
             this.successMessage = successMessage;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java
index a34cb9c5fc39..c09ee864809c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java
@@ -457,6 +457,7 @@ public static boolean userCanPublish(SiteModel site) {
 
     public static void onPostUploadedSnackbarHandler(final Activity activity, View snackbarAttachView,
                                                      boolean isError,
+                                                     boolean isFirstTimePublish,
                                                      final PostModel post,
                                                      final String errorMessage,
                                                      final SiteModel site, final Dispatcher dispatcher,
@@ -511,9 +512,9 @@ public void onClick(View v) {
                         snackbarButtonRes = R.string.button_view;
 
                         if (post.isPage()) {
-                            snackbarMessageRes = R.string.page_published;
+                            snackbarMessageRes = isFirstTimePublish ? R.string.page_published : R.string.page_updated;
                         } else if (userCanPublish) {
-                            snackbarMessageRes = R.string.post_published;
+                            snackbarMessageRes = isFirstTimePublish ? R.string.post_published : R.string.post_updated;
                         } else {
                             snackbarMessageRes = R.string.post_submitted;
                         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtilsWrapper.kt
index 959b04bd0392..cc4b7ac7d14c 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtilsWrapper.kt
@@ -51,6 +51,7 @@ class UploadUtilsWrapper @Inject constructor(
         activity: Activity?,
         snackbarAttachView: View?,
         isError: Boolean,
+        isFirstTimePublish: Boolean,
         post: PostModel?,
         errorMessage: String?,
         site: SiteModel?
@@ -58,6 +59,7 @@ class UploadUtilsWrapper @Inject constructor(
             activity,
             snackbarAttachView,
             isError,
+            isFirstTimePublish,
             post,
             errorMessage,
             site,
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java
index 02b21cc02445..bb4d6d7730ba 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/VideoOptimizer.java
@@ -85,18 +85,31 @@ public void start() {
 
         mOutputPath = mCacheDir.getPath() + "/" + mFilename;
 
-        MediaComposer mediaComposer = WPVideoUtils.getVideoOptimizationComposer(
-                getContext(),
-                mInputPath,
-                mOutputPath,
-                this,
-                AppPrefs.getVideoOptimizeWidth(),
-                AppPrefs.getVideoOptimizeQuality());
+        MediaComposer mediaComposer = null;
+        boolean wasNpeDetected = false;
+
+        try {
+            mediaComposer = WPVideoUtils.getVideoOptimizationComposer(
+                    getContext(),
+                    mInputPath,
+                    mOutputPath,
+                    this,
+                    AppPrefs.getVideoOptimizeWidth(),
+                    AppPrefs.getVideoOptimizeQuality());
+        } catch (NullPointerException npe) {
+            AppLog.w(
+                    AppLog.T.MEDIA,
+                    "VideoOptimizer > NullPointerException while getting composer " + npe.getMessage()
+            );
+            wasNpeDetected = true;
+        }
 
         if (mediaComposer == null) {
             AppLog.w(AppLog.T.MEDIA, "VideoOptimizer > null composer");
-            AnalyticsTracker.track(MEDIA_VIDEO_CANT_OPTIMIZE, AnalyticsUtils.getMediaProperties(getContext(), true,
-                    null, mInputPath));
+            Map<String, Object> properties = AnalyticsUtils.getMediaProperties(getContext(), true,
+                    null, mInputPath);
+            properties.put("was_npe_detected", wasNpeDetected);
+            AnalyticsTracker.track(MEDIA_VIDEO_CANT_OPTIMIZE, properties);
             mListener.onVideoOptimizationCompleted(mMedia);
             return;
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlMessageUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlMessageUtils.kt
index b75a485fd6e4..a6bd4180d8c3 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlMessageUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlMessageUtils.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.ui.utils
 
-import android.text.Spanned
 import androidx.annotation.StringRes
 import androidx.core.text.HtmlCompat
 import org.wordpress.android.viewmodel.ResourceProvider
@@ -8,7 +7,7 @@ import javax.inject.Inject
 
 class HtmlMessageUtils
 @Inject constructor(private val resourceProvider: ResourceProvider) {
-    fun getHtmlMessageFromStringFormatResId(@StringRes formatResId: Int, vararg args: Any?): Spanned {
+    fun getHtmlMessageFromStringFormatResId(@StringRes formatResId: Int, vararg args: Any?): CharSequence {
         return HtmlCompat.fromHtml(
                 String.format(resourceProvider.getString(formatResId), *args),
                 HtmlCompat.FROM_HTML_MODE_LEGACY
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlUtilsWrapper.kt
new file mode 100644
index 000000000000..b89aea6cf4f4
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/HtmlUtilsWrapper.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.ui.utils
+
+import android.content.Context
+import androidx.annotation.ColorRes
+import org.wordpress.android.util.HtmlUtils
+import javax.inject.Inject
+
+class HtmlUtilsWrapper @Inject constructor() {
+    fun colorResToHtmlColor(context: Context, @ColorRes colorRes: Int): String =
+            HtmlUtils.colorResToHtmlColor(context, colorRes)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/IntentUtils.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/IntentUtils.kt
new file mode 100644
index 000000000000..12ec80e47fa8
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/IntentUtils.kt
@@ -0,0 +1,17 @@
+package org.wordpress.android.ui.utils
+
+import android.content.Intent
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import javax.inject.Inject
+
+class IntentUtils @Inject constructor(
+    private val contextProvider: ContextProvider
+) {
+    /**
+     * This function checks if we can find any Activity that can handle an [Intent] with the given action and URI.
+     * If so, it returns true. Otherwise, it returns false.
+     */
+    fun canResolveWith(action: String, uri: UriWrapper): Boolean =
+            Intent(action, uri.uri).resolveActivity(contextProvider.getContext().packageManager) != null
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/ListItemInteraction.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/ListItemInteraction.kt
new file mode 100644
index 000000000000..87f2234fce25
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/ListItemInteraction.kt
@@ -0,0 +1,41 @@
+package org.wordpress.android.ui.utils
+
+interface ListItemInteraction {
+    fun click()
+
+    companion object {
+        /**
+         * Use this creator only with function pointer. If you use it with a lambda, the created `ListItemInteraction`
+         * equals method will always fail because two lambdas are never equal. If you need a parametrized function call,
+         * use the other creator method.
+         */
+        fun create(action: () -> Unit): ListItemInteraction {
+            return NoParams(action)
+        }
+
+        /**
+         * Use this creator only with function pointer. If you use it with a lambda, the created `ListItemInteraction`
+         * equals method will always fail because two lambdas are never equal.
+         */
+        fun <T> create(data: T, action: (T) -> Unit): ListItemInteraction {
+            return OneParam(data, action)
+        }
+    }
+
+    private data class OneParam<T>(
+        val data: T,
+        val action: (T) -> Unit
+    ) : ListItemInteraction {
+        override fun click() {
+            action(data)
+        }
+    }
+
+    private data class NoParams(
+        val action: () -> Unit
+    ) : ListItemInteraction {
+        override fun click() {
+            action()
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/PaddingBackgroundColorSpan.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/PaddingBackgroundColorSpan.kt
new file mode 100644
index 000000000000..726d8564229e
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/PaddingBackgroundColorSpan.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.utils
+
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Rect
+import android.text.style.LineBackgroundSpan
+import kotlin.math.roundToInt
+
+/**
+ * Creates BackgroundColorSpan with padding
+ * Credits: https://medium.com/@tokudu/android-adding-padding-to-backgroundcolorspan-179ab4fae187
+ */
+class PaddingBackgroundColorSpan(private val backgroundColor: Int, private val padding: Int) : LineBackgroundSpan {
+    private val bgRect: Rect = Rect()
+    override fun drawBackground(
+        canvas: Canvas,
+        paint: Paint,
+        left: Int,
+        right: Int,
+        top: Int,
+        baseline: Int,
+        bottom: Int,
+        text: CharSequence,
+        start: Int,
+        end: Int,
+        lnum: Int
+    ) {
+        val textWidth = paint.measureText(text, start, end).roundToInt()
+        val paintColor = paint.color
+        bgRect.set(
+            left - padding,
+            top - if (lnum == 0) padding / 2 else -(padding / 2),
+            left + textWidth + padding,
+            bottom + padding / 2
+        )
+        paint.color = backgroundColor
+        canvas.drawRect(bgRect, paint)
+        paint.color = paintColor
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt
index fc0e923a4fe6..89ce44879d92 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt
@@ -17,6 +17,8 @@ import org.wordpress.android.util.DisplayUtils
 import javax.inject.Inject
 import android.graphics.Point
 import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.util.AniUtils
+import org.wordpress.android.util.AniUtils.Duration
 
 class UiHelpers @Inject constructor() {
     fun getPxOfUiDimen(context: Context, uiDimen: UiDimen): Int =
@@ -68,6 +70,21 @@ class UiHelpers @Inject constructor() {
         }
     }
 
+    /**
+     * Sets the [firstView] visible and the [secondView] invisible with a fade in/out animation and vice versa
+     * @param visible if true the [firstView] is shown and the [secondView] is hidden else the other way round
+     */
+    fun fadeInfadeOutViews(firstView: View?, secondView: View?, visible: Boolean) {
+        if (firstView == null || secondView == null || visible == (firstView.visibility == View.VISIBLE)) return
+        if (visible) {
+            AniUtils.fadeIn(firstView, Duration.SHORT)
+            AniUtils.fadeOut(secondView, Duration.SHORT, View.INVISIBLE)
+        } else {
+            AniUtils.fadeIn(secondView, Duration.SHORT)
+            AniUtils.fadeOut(firstView, Duration.SHORT, View.INVISIBLE)
+        }
+    }
+
     companion object {
         fun adjustDialogSize(dialog: Dialog) {
             val window = requireNotNull(dialog.window)
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt
index 95f34f3a1b7e..c4ff53c7f50e 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementDialogFragment.kt
@@ -13,7 +13,6 @@ import android.widget.TextView
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import org.wordpress.android.R
@@ -38,7 +37,7 @@ class FeatureAnnouncementDialogFragment : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = super.onCreateDialog(savedInstanceState)
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
+        viewModel = ViewModelProvider(this, viewModelFactory)
                 .get(FeatureAnnouncementViewModel::class.java)
 
         if (VERSION.SDK_INT >= VERSION_CODES.M) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementListAdapter.kt b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementListAdapter.kt
index 2437c0673b63..17e188622180 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementListAdapter.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/whatsnew/FeatureAnnouncementListAdapter.kt
@@ -7,7 +7,6 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import org.wordpress.android.R
@@ -28,7 +27,7 @@ class FeatureAnnouncementListAdapter(
 
     init {
         (fragment.requireActivity().applicationContext as WordPress).component().inject(this)
-        viewModel = ViewModelProviders.of(fragment, viewModelFactory)
+        viewModel = ViewModelProvider(fragment, viewModelFactory)
                 .get(FeatureAnnouncementViewModel::class.java)
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/util/AutolinkUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AutolinkUtils.java
index 02cb3ac6fdd4..8eed9dda07df 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/AutolinkUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/AutolinkUtils.java
@@ -80,16 +80,16 @@ public static String autoCreateLinks(String text) {
         while (matcher.find()) {
             String whitespaces = matcher.group(1);
             String url = matcher.group(2);
-            boolean blacklisted = false;
-            // Check if the URL is blacklisted
+            boolean denylisted = false;
+            // Check if the URL is denylisted
             for (Pattern providerPattern : PROVIDERS) {
                 Matcher providerMatcher = providerPattern.matcher(url);
                 if (providerMatcher.matches()) {
-                    blacklisted = true;
+                    denylisted = true;
                 }
             }
             // Create a <a href> HTML tag for the link
-            if (!blacklisted) {
+            if (!denylisted) {
                 matcher.appendReplacement(stringBuffer, whitespaces + "<a href=\"" + url + "\">" + url + "</a>");
             } else {
                 matcher.appendReplacement(stringBuffer, whitespaces + url);
diff --git a/WordPress/src/main/java/org/wordpress/android/util/BuildConfigWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/BuildConfigWrapper.kt
index 6168e5b5f02c..28ff478cbe30 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/BuildConfigWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/BuildConfigWrapper.kt
@@ -13,4 +13,6 @@ class BuildConfigWrapper @Inject constructor() {
     }
 
     fun isManualFeatureConfigEnabled(): Boolean = BuildConfig.ENABLE_FEATURE_CONFIGURATION
+
+    val isJetpackApp = BuildConfig.IS_JETPACK_APP
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/ColorUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/ColorUtils.kt
index e9a37dc91c56..fe7125542838 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/ColorUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/ColorUtils.kt
@@ -4,12 +4,16 @@ import android.content.Context
 import android.graphics.PorterDuff
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
+import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
+import androidx.annotation.FloatRange
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.core.content.ContextCompat
+import androidx.core.graphics.ColorUtils
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.widget.ImageViewCompat
+import kotlin.math.roundToInt
 
 object ColorUtils {
     @JvmStatic
@@ -29,4 +33,11 @@ object ColorUtils {
                 AppCompatResources.getColorStateList(imageView.context, colorResId)
         )
     }
+
+    @JvmStatic
+    @ColorInt
+    fun applyEmphasisToColor(
+        @ColorInt color: Int,
+        @FloatRange(from = 0.0, to = 1.0) emphasisAlpha: Float
+    ) = ColorUtils.setAlphaComponent(color, (emphasisAlpha * 255).roundToInt())
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DateFormatWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/DateFormatWrapper.kt
new file mode 100644
index 000000000000..6b096a79cb81
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/DateFormatWrapper.kt
@@ -0,0 +1,13 @@
+package org.wordpress.android.util
+
+import android.content.Context
+import android.text.format.DateFormat
+import dagger.Reusable
+import javax.inject.Inject
+
+@Reusable
+class DateFormatWrapper @Inject constructor(
+    private val appContext: Context
+) {
+    fun getLongDateFormat(): java.text.DateFormat = DateFormat.getLongDateFormat(appContext)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DateTimeUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/DateTimeUtilsWrapper.kt
index 41106c9709f7..1fa415b348b7 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DateTimeUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/DateTimeUtilsWrapper.kt
@@ -14,4 +14,8 @@ class DateTimeUtilsWrapper @Inject constructor(
     fun javaDateToTimeSpan(date: Date?): String = DateTimeUtils.javaDateToTimeSpan(date, appContext)
 
     fun dateFromIso8601(date: String) = DateTimeUtils.dateFromIso8601(date)
+
+    fun daysBetween(start: Date, end: Date) = DateTimeUtils.daysBetween(start, end)
+
+    fun dateFromTimestamp(timestamp: Long) = DateTimeUtils.dateFromTimestamp(timestamp)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DisplayUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/DisplayUtilsWrapper.kt
index 9566a367501e..e1843ebf5ce0 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DisplayUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/DisplayUtilsWrapper.kt
@@ -8,8 +8,12 @@ import javax.inject.Inject
 class DisplayUtilsWrapper @Inject constructor(private val contextProvider: ContextProvider) {
     fun getDisplayPixelWidth() = DisplayUtils.getDisplayPixelWidth()
 
+    fun isLandscapeBySize() = getDisplayPixelWidth() > DisplayUtils.getDisplayPixelHeight(contextProvider.getContext())
+
     fun isLandscape() = DisplayUtils.isLandscape(contextProvider.getContext())
 
     fun isTablet() = DisplayUtils.isTablet(contextProvider.getContext()) ||
             DisplayUtils.isXLargeTablet(contextProvider.getContext())
+
+    fun getDisplayPixelHeight() = DisplayUtils.getDisplayPixelHeight(contextProvider.getContext())
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/DomainRegistrationUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/DomainRegistrationUtils.kt
index 587fa4c0615f..36e6943d1fb1 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/DomainRegistrationUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/DomainRegistrationUtils.kt
@@ -4,6 +4,9 @@ import android.content.Context
 import android.text.TextUtils
 import android.view.Gravity
 import org.wordpress.android.R
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.ToastUtils.Duration
 
 fun requestEmailValidation(context: Context, email: String?) {
@@ -22,3 +25,9 @@ fun requestEmailValidation(context: Context, email: String?) {
             context.resources.getDimensionPixelOffset(R.dimen.smart_toast_offset_y)
     )
 }
+
+fun getEmailValidationMessage(email: String?) = if (email.isNullOrEmpty()) {
+    UiStringRes(R.string.my_site_verify_your_email_without_email)
+} else {
+    UiStringResWithParams(R.string.my_site_verify_your_email, listOf(UiStringText(email)))
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/EventBusWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/EventBusWrapper.kt
index 778731450d73..7ac9ae36436b 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/EventBusWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/EventBusWrapper.kt
@@ -20,4 +20,16 @@ class EventBusWrapper @Inject constructor() {
     fun removeStickyEvent(event: Any) {
         EventBus.getDefault().removeStickyEvent(event)
     }
+
+    fun isRegistered(subscriber: Any): Boolean {
+        return EventBus.getDefault().isRegistered(subscriber)
+    }
+
+    fun postSticky(event: Any) {
+        EventBus.getDefault().postSticky(event)
+    }
+
+    fun post(event: Any) {
+        EventBus.getDefault().post(event)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/FormattableContentUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/FormattableContentUtils.kt
index 08ce187b3f6b..4604232fb457 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/FormattableContentUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/FormattableContentUtils.kt
@@ -40,6 +40,18 @@ fun FormattableContent?.getMediaOrNull(mediaIndex: Int): FormattableMedia? {
     }
 }
 
+fun FormattableContent?.isMobileButton(): Boolean {
+    return this?.meta?.isMobileButton == true
+}
+
+fun FormattableContent?.getMobileButtonRange(): FormattableRange? {
+    return if (isMobileButton()) {
+        this?.ranges?.firstOrNull()
+    } else {
+        null
+    }
+}
+
 fun FormattableContent?.getMetaTitlesHomeOrEmpty(): String {
     return this?.meta?.titles?.home ?: ""
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/HtmlCompatWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/HtmlCompatWrapper.kt
new file mode 100644
index 000000000000..cb236d4ec1a6
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/HtmlCompatWrapper.kt
@@ -0,0 +1,9 @@
+package org.wordpress.android.util
+
+import androidx.core.text.HtmlCompat
+import javax.inject.Inject
+
+class HtmlCompatWrapper @Inject constructor() {
+    fun fromHtml(source: String, flags: Int = HtmlCompat.FROM_HTML_MODE_COMPACT): CharSequence =
+            HtmlCompat.fromHtml(source, flags)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt
index 195d35e08fd9..3622ce5ffb85 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/LiveDataUtils.kt
@@ -4,7 +4,9 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.Transformations
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import org.wordpress.android.viewmodel.SingleMediatorLiveEvent
 
@@ -65,16 +67,17 @@ fun <T, U, V> mergeAsyncNotNull(
     scope: CoroutineScope,
     sourceA: LiveData<T>,
     sourceB: LiveData<U>,
+    distinct: Boolean = true,
     merger: suspend (T, U) -> V
 ): LiveData<V> {
     val mediator = MediatorLiveData<Pair<T?, U?>>()
     mediator.addSource(sourceA) {
-        if (mediator.value?.first != it) {
+        if (!distinct || mediator.value?.first != it) {
             mediator.value = it to mediator.value?.second
         }
     }
     mediator.addSource(sourceB) {
-        if (mediator.value?.second != it) {
+        if (!distinct || mediator.value?.second != it) {
             mediator.value = mediator.value?.first to it
         }
     }
@@ -105,21 +108,17 @@ fun <T, U, V> merge(sourceA: LiveData<T>, sourceB: LiveData<U>, merger: (T?, U?)
 }
 
 /**
- * Merges two LiveData sources using a given function. The function returns an object of a new type.
- * @param sourceA first source
- * @param sourceB second source
+ * Merges LiveData sources using a given function. The function returns an object of a new type.
+ * @param sources all source
  * @return new data source
  */
-fun <T> merge(sourceA: LiveData<T>?, sourceB: LiveData<T>?): MediatorLiveData<T> {
+fun <T> merge(vararg sources: LiveData<T>?): MediatorLiveData<T> {
     val mediator = MediatorLiveData<T>()
-    if (sourceA != null) {
-        mediator.addSource(sourceA) {
-            mediator.value = it
-        }
-    }
-    if (sourceB != null) {
-        mediator.addSource(sourceB) {
-            mediator.value = it
+    for (source in sources) {
+        if (source != null) {
+            mediator.addSource(source) {
+                mediator.value = it
+            }
         }
     }
     return mediator
@@ -376,9 +375,16 @@ fun <T> LiveData<T>.fold(action: (previous: T, current: T) -> T): MediatorLiveDa
 fun <T> LiveData<T>.throttle(
     coroutineScope: CoroutineScope,
     distinct: Boolean = false,
-    offset: Long = 100
+    offset: Long = 100,
+    backgroundDispatcher: CoroutineDispatcher = Dispatchers.Default,
+    mainDispatcher: CoroutineDispatcher = Dispatchers.Main
 ): ThrottleLiveData<T> {
-    val mediatorLiveData: ThrottleLiveData<T> = ThrottleLiveData(coroutineScope = coroutineScope, offset = offset)
+    val mediatorLiveData: ThrottleLiveData<T> = ThrottleLiveData(
+            coroutineScope = coroutineScope,
+            offset = offset,
+            backgroundDispatcher = backgroundDispatcher,
+            mainDispatcher = mainDispatcher
+    )
     mediatorLiveData.addSource(this) {
         if ((it != mediatorLiveData.value || !distinct) && it != null) {
             mediatorLiveData.postValue(it)
@@ -431,3 +437,29 @@ fun <T> LiveData<T>.skip(times: Int): LiveData<T> {
 
     return mediator
 }
+
+/**
+ * A helper function that scans sources into a single state
+ * @param initialState the initial state passed into the scan function
+ * @param sources producing partial states to be merged into a single state
+ * @param distinct true if all the emitted items should be distinct
+ * @param scanFunction merges the partial state into the single state
+ * @return merged partial states into the single state
+ */
+fun <T, U> scan(
+    initialState: U,
+    vararg sources: LiveData<T>,
+    distinct: Boolean = true,
+    scanFunction: (U, T) -> U
+): MediatorLiveData<U> {
+    val mediator = MediatorLiveData<U>().also { it.value = initialState }
+    for (source in sources) {
+        mediator.addSource(source) {
+            val currentState = mediator.value ?: initialState
+            if (it != null && currentState != it || !distinct) {
+                mediator.value = scanFunction(currentState, it)
+            }
+        }
+    }
+    return mediator
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt
index ed5be3b2e539..2ddfd0bc64e7 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.net.Uri
 import dagger.Reusable
 import org.wordpress.android.editor.EditorMediaUtils
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan
 import javax.inject.Inject
 
 /**
@@ -49,4 +51,11 @@ class MediaUtilsWrapper @Inject constructor(private val appContext: Context) {
     fun isLocalFile(uploadState: String): Boolean = MediaUtils.isLocalFile(uploadState)
 
     fun getExtensionForMimeType(mimeType: String?): String = MediaUtils.getExtensionForMimeType(mimeType)
+
+    fun isFile(mediaUri: Uri): Boolean = MediaUtils.isFile(mediaUri)
+
+    fun getSitePlanForMimeTypes(site: SiteModel?): Plan = WPMediaUtils.getSitePlanForMimeTypes(site)
+
+    fun isMimeTypeSupportedBySitePlan(site: SiteModel?, mimeType: String): Boolean =
+            WPMediaUtils.isMimeTypeSupportedBySitePlan(site, mimeType)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt
index 0d8fc1febf00..ce47c637e16f 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt
@@ -19,38 +19,32 @@ import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.text.HtmlCompat
 import org.wordpress.android.R
-import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
-import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.generated.SiteActionBuilder
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.QuickStartStore
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHECK_STATS
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHOOSE_THEME
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_NEW_PAGE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_SITE
-import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CUSTOMIZE_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.ENABLE_POST_SHARING
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EXPLORE_PLANS
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.FOLLOW_SITE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.REVIEW_PAGES
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPLOAD_SITE_ICON
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.VIEW_SITE
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType
 import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.UNKNOWN
-import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartPayload
-import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartVariant.NEXT_STEPS
 import org.wordpress.android.ui.RequestCodes
 import org.wordpress.android.ui.prefs.AppPrefs
-import org.wordpress.android.ui.quickstart.QuickStartEvent
 import org.wordpress.android.ui.quickstart.QuickStartReminderReceiver
 import org.wordpress.android.ui.quickstart.QuickStartTaskDetails
-import org.wordpress.android.ui.themes.ThemeBrowserActivity
+import org.wordpress.android.ui.themes.ThemeBrowserUtils
 
 class QuickStartUtils {
     companion object {
+        private val themeBrowserUtils = ThemeBrowserUtils()
         private const val QUICK_START_REMINDER_INTERVAL = (24 * 60 * 60 * 1000 * 2).toLong() // two days
         const val ICON_NOT_SET = -1
 
@@ -66,13 +60,14 @@ class QuickStartUtils {
         @JvmStatic
         @JvmOverloads
         fun stylizeQuickStartPrompt(
-            context: Context,
+            activityContext: Context,
             messageId: Int,
+            isThemedSnackbar: Boolean = true,
             iconId: Int = ICON_NOT_SET
         ): Spannable {
-            val spanTagOpen = context.resources.getString(R.string.quick_start_span_start)
-            val spanTagEnd = context.resources.getString(R.string.quick_start_span_end)
-            var formattedMessage = context.resources.getString(messageId, spanTagOpen, spanTagEnd)
+            val spanTagOpen = activityContext.getString(R.string.quick_start_span_start)
+            val spanTagEnd = activityContext.getString(R.string.quick_start_span_end)
+            var formattedMessage = activityContext.getString(messageId, spanTagOpen, spanTagEnd)
 
             val startOfHighlight = formattedMessage.indexOf(spanTagOpen)
 
@@ -96,7 +91,11 @@ class QuickStartUtils {
             )
             // nothing to highlight
             if (startOfHighlight != -1 && endOfHighlight != -1) {
-                val highlightColor = ContextCompat.getColor(context, android.R.color.white)
+                val highlightColor = if (isThemedSnackbar) {
+                    activityContext.getColorFromAttribute(R.attr.colorSurface)
+                } else {
+                    ContextCompat.getColor(activityContext, android.R.color.white)
+                }
                 mutableSpannedMessage.setSpan(
                         ForegroundColorSpan(highlightColor),
                         startOfHighlight, endOfHighlight, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -104,13 +103,14 @@ class QuickStartUtils {
 
                 val icon: Drawable? = try {
                     // .mutate() allows us to avoid sharing the state of drawables
-                    ContextCompat.getDrawable(context, iconId)?.mutate()
+                    activityContext.getDrawable(iconId)?.mutate()
                 } catch (e: Resources.NotFoundException) {
                     null
                 }
 
                 if (icon != null) {
-                    val iconSize = context.resources.getDimensionPixelOffset(R.dimen.dialog_snackbar_max_icons_size)
+                    val iconSize = activityContext.resources
+                            .getDimensionPixelOffset(R.dimen.dialog_snackbar_max_icons_size)
                     icon.setBounds(0, 0, iconSize, iconSize)
 
                     DrawableCompat.setTint(icon, highlightColor)
@@ -196,64 +196,30 @@ class QuickStartUtils {
         @JvmStatic
         fun isQuickStartAvailableForTheSite(siteModel: SiteModel): Boolean {
             return (siteModel.hasCapabilityManageOptions &&
-                    ThemeBrowserActivity.isAccessible(siteModel) &&
+                    themeBrowserUtils.isAccessible(siteModel) &&
                     SiteUtils.isAccessedViaWPComRest(siteModel))
         }
 
         @JvmStatic
         fun isQuickStartInProgress(quickStartStore: QuickStartStore): Boolean {
-            return !quickStartStore.getQuickStartCompleted(AppPrefs.getSelectedSite().toLong()) &&
-                    quickStartStore.hasDoneTask(AppPrefs.getSelectedSite().toLong(), CREATE_SITE)
+            return isQuickStartInProgress(quickStartStore, AppPrefs.getSelectedSite())
         }
 
         @JvmStatic
-        fun isEveryQuickStartTaskDone(quickStartStore: QuickStartStore): Boolean {
-            return quickStartStore.getDoneCount(AppPrefs.getSelectedSite().toLong()) == QuickStartTask.values().size
+        fun isQuickStartInProgress(quickStartStore: QuickStartStore, selectedSiteId: Int): Boolean {
+            return !quickStartStore.getQuickStartCompleted(selectedSiteId.toLong()) &&
+                    quickStartStore.hasDoneTask(selectedSiteId.toLong(), CREATE_SITE)
         }
 
         @JvmStatic
-        @JvmOverloads
-        fun completeTaskAndRemindNextOne(
-            quickStartStore: QuickStartStore,
-            task: QuickStartTask,
-            dispatcher: Dispatcher,
-            site: SiteModel,
-            quickStartEvent: QuickStartEvent? = null,
-            context: Context?
-        ) {
-            val siteId = site.id.toLong()
-
-            if (quickStartStore.getQuickStartCompleted(siteId) || isEveryQuickStartTaskDone(quickStartStore) ||
-                    quickStartStore.hasDoneTask(siteId, task) || !isQuickStartAvailableForTheSite(site)) {
-                return
-            }
-
-            if (context != null) {
-                cancelQuickStartReminder(context)
-            }
-
-            quickStartStore.setDoneTask(siteId, task, true)
-            AnalyticsTracker.track(getTaskCompletedTracker(task))
+        fun isEveryQuickStartTaskDone(quickStartStore: QuickStartStore): Boolean {
+            return isEveryQuickStartTaskDone(quickStartStore, AppPrefs.getSelectedSite())
+        }
 
-            if (isEveryQuickStartTaskDone(quickStartStore)) {
-                AnalyticsTracker.track(Stat.QUICK_START_ALL_TASKS_COMPLETED)
-                val payload = CompleteQuickStartPayload(site, NEXT_STEPS.toString())
-                dispatcher.dispatch(SiteActionBuilder.newCompleteQuickStartAction(payload))
-            } else if (quickStartEvent?.task == task) {
-                AppPrefs.setQuickStartNoticeRequired(true)
-            } else {
-                if (context != null && quickStartStore.hasDoneTask(siteId, CREATE_SITE)) {
-                    val nextTask =
-                            getNextUncompletedQuickStartTaskForReminderNotification(
-                                    quickStartStore,
-                                    siteId,
-                                    task.taskType
-                            )
-                    if (nextTask != null) {
-                        startQuickStartReminderTimer(context, nextTask)
-                    }
-                }
-            }
+        @JvmStatic
+        fun isEveryQuickStartTaskDone(quickStartStore: QuickStartStore, selectedSiteId: Int): Boolean {
+            return quickStartStore.getDoneCount(selectedSiteId.toLong()) >= QuickStartTask.values()
+                    .filter { it.taskType != UNKNOWN }.size
         }
 
         @JvmStatic
@@ -262,15 +228,14 @@ class QuickStartUtils {
                 CREATE_SITE -> Stat.QUICK_START_LIST_CREATE_SITE_TAPPED
                 UPDATE_SITE_TITLE -> Stat.QUICK_START_LIST_CREATE_SITE_TAPPED
                 VIEW_SITE -> Stat.QUICK_START_LIST_VIEW_SITE_TAPPED
-                CHOOSE_THEME -> Stat.QUICK_START_LIST_BROWSE_THEMES_TAPPED
-                CUSTOMIZE_SITE -> Stat.QUICK_START_LIST_CUSTOMIZE_SITE_TAPPED
                 ENABLE_POST_SHARING -> Stat.QUICK_START_LIST_ADD_SOCIAL_TAPPED
                 PUBLISH_POST -> Stat.QUICK_START_LIST_PUBLISH_POST_TAPPED
                 FOLLOW_SITE -> Stat.QUICK_START_LIST_FOLLOW_SITE_TAPPED
                 UPLOAD_SITE_ICON -> Stat.QUICK_START_LIST_UPLOAD_ICON_TAPPED
-                CREATE_NEW_PAGE -> Stat.QUICK_START_LIST_CREATE_PAGE_TAPPED
                 CHECK_STATS -> Stat.QUICK_START_LIST_CHECK_STATS_TAPPED
                 EXPLORE_PLANS -> Stat.QUICK_START_LIST_EXPLORE_PLANS_TAPPED
+                EDIT_HOMEPAGE -> Stat.QUICK_START_LIST_EDIT_HOMEPAGE_TAPPED
+                REVIEW_PAGES -> Stat.QUICK_START_LIST_REVIEW_PAGES_TAPPED
                 else -> throw IllegalStateException("The task '$task' is not valid")
             }
         }
@@ -284,38 +249,36 @@ class QuickStartUtils {
                 CREATE_SITE -> Stat.QUICK_START_LIST_CREATE_SITE_SKIPPED
                 UPDATE_SITE_TITLE -> Stat.QUICK_START_LIST_CREATE_SITE_SKIPPED
                 VIEW_SITE -> Stat.QUICK_START_LIST_VIEW_SITE_SKIPPED
-                CHOOSE_THEME -> Stat.QUICK_START_LIST_BROWSE_THEMES_SKIPPED
-                CUSTOMIZE_SITE -> Stat.QUICK_START_LIST_CUSTOMIZE_SITE_SKIPPED
                 ENABLE_POST_SHARING -> Stat.QUICK_START_LIST_ADD_SOCIAL_SKIPPED
                 PUBLISH_POST -> Stat.QUICK_START_LIST_PUBLISH_POST_SKIPPED
                 FOLLOW_SITE -> Stat.QUICK_START_LIST_FOLLOW_SITE_SKIPPED
                 UPLOAD_SITE_ICON -> Stat.QUICK_START_LIST_UPLOAD_ICON_SKIPPED
-                CREATE_NEW_PAGE -> Stat.QUICK_START_LIST_CREATE_PAGE_SKIPPED
                 CHECK_STATS -> Stat.QUICK_START_LIST_CHECK_STATS_SKIPPED
                 EXPLORE_PLANS -> Stat.QUICK_START_LIST_EXPLORE_PLANS_SKIPPED
+                EDIT_HOMEPAGE -> Stat.QUICK_START_LIST_EDIT_HOMEPAGE_SKIPPED
+                REVIEW_PAGES -> Stat.QUICK_START_LIST_REVIEW_PAGES_SKIPPED
                 else -> throw IllegalStateException("The task '$task' is not valid")
             }
         }
 
-        private fun getTaskCompletedTracker(task: QuickStartTask): Stat {
+        fun getTaskCompletedTracker(task: QuickStartTask): Stat {
             return when (task) {
                 CREATE_SITE -> Stat.QUICK_START_CREATE_SITE_TASK_COMPLETED
                 UPDATE_SITE_TITLE -> Stat.QUICK_START_UPDATE_SITE_TITLE_COMPLETED
                 VIEW_SITE -> Stat.QUICK_START_VIEW_SITE_TASK_COMPLETED
-                CHOOSE_THEME -> Stat.QUICK_START_BROWSE_THEMES_TASK_COMPLETED
-                CUSTOMIZE_SITE -> Stat.QUICK_START_CUSTOMIZE_SITE_TASK_COMPLETED
                 ENABLE_POST_SHARING -> Stat.QUICK_START_SHARE_SITE_TASK_COMPLETED
                 PUBLISH_POST -> Stat.QUICK_START_PUBLISH_POST_TASK_COMPLETED
                 FOLLOW_SITE -> Stat.QUICK_START_FOLLOW_SITE_TASK_COMPLETED
                 UPLOAD_SITE_ICON -> Stat.QUICK_START_UPLOAD_ICON_COMPLETED
-                CREATE_NEW_PAGE -> Stat.QUICK_START_CREATE_PAGE_COMPLETED
                 CHECK_STATS -> Stat.QUICK_START_CHECK_STATS_COMPLETED
                 EXPLORE_PLANS -> Stat.QUICK_START_EXPLORE_PLANS_COMPLETED
+                EDIT_HOMEPAGE -> Stat.QUICK_START_EDIT_HOMEPAGE_TASK_COMPLETED
+                REVIEW_PAGES -> Stat.QUICK_START_REVIEW_PAGES_TASK_COMPLETED
                 else -> throw IllegalStateException("The task '$task' is not valid")
             }
         }
 
-        private fun startQuickStartReminderTimer(context: Context, quickStartTask: QuickStartTask) {
+        fun startQuickStartReminderTimer(context: Context, quickStartTask: QuickStartTask) {
             val intent = Intent(context, QuickStartReminderReceiver::class.java)
 
             // for some reason we have to use a bundle to pass serializable to broadcast receiver
diff --git a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtilsWrapper.kt
new file mode 100644
index 000000000000..6487c4fa7a79
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtilsWrapper.kt
@@ -0,0 +1,130 @@
+package org.wordpress.android.util
+
+import android.content.Context
+import android.text.Spannable
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.QUICK_START_STARTED
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.generated.SiteActionBuilder
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.QuickStartStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType
+import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartPayload
+import org.wordpress.android.fluxc.store.SiteStore.CompleteQuickStartVariant.NEXT_STEPS
+import org.wordpress.android.ui.prefs.AppPrefs
+import org.wordpress.android.ui.quickstart.QuickStartEvent
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
+import javax.inject.Inject
+
+class QuickStartUtilsWrapper
+@Inject constructor(
+    private val quickStartStore: QuickStartStore,
+    private val dispatcher: Dispatcher,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    private val mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig
+) {
+    fun isQuickStartInProgress(siteId: Int): Boolean {
+        return QuickStartUtils.isQuickStartInProgress(quickStartStore, siteId)
+    }
+
+    @JvmOverloads
+    fun stylizeQuickStartPrompt(
+        activityContext: Context,
+        messageId: Int,
+        iconId: Int = QuickStartUtils.ICON_NOT_SET
+    ): Spannable {
+        return QuickStartUtils.stylizeQuickStartPrompt(
+                activityContext = activityContext,
+                messageId = messageId,
+                isThemedSnackbar = false,
+                iconId = iconId
+        )
+    }
+
+    @JvmOverloads
+    fun stylizeThemedQuickStartPrompt(
+        activityContext: Context,
+        messageId: Int,
+        iconId: Int = QuickStartUtils.ICON_NOT_SET
+    ): Spannable {
+        return QuickStartUtils.stylizeQuickStartPrompt(
+                activityContext = activityContext,
+                messageId = messageId,
+                isThemedSnackbar = true,
+                iconId = iconId
+        )
+    }
+
+    fun isEveryQuickStartTaskDone(siteId: Int): Boolean {
+        return QuickStartUtils.isEveryQuickStartTaskDone(quickStartStore, siteId)
+    }
+
+    fun isEveryQuickStartTaskDoneForType(siteId: Int, type: QuickStartTaskType): Boolean {
+        return quickStartStore.getUncompletedTasksByType(siteId.toLong(), type).isEmpty()
+    }
+
+    fun getTaskCompletedTracker(task: QuickStartTask): Stat {
+        return QuickStartUtils.getTaskCompletedTracker(task)
+    }
+
+    @JvmOverloads
+    fun completeTaskAndRemindNextOne(
+        task: QuickStartTask,
+        site: SiteModel,
+        quickStartEvent: QuickStartEvent? = null,
+        context: Context?
+    ) {
+        val siteId = site.id.toLong()
+
+        if (shouldCancelCompleteAction(siteId, site, task)) {
+            return
+        }
+
+        if (context != null) {
+            QuickStartUtils.cancelQuickStartReminder(context)
+        }
+
+        quickStartStore.setDoneTask(siteId, task, true)
+        analyticsTrackerWrapper.track(QuickStartUtils.getTaskCompletedTracker(task), mySiteImprovementsFeatureConfig)
+
+        if (QuickStartUtils.isEveryQuickStartTaskDone(quickStartStore, site.id)) {
+            quickStartStore.setQuickStartCompleted(siteId, true)
+            analyticsTrackerWrapper.track(Stat.QUICK_START_ALL_TASKS_COMPLETED, mySiteImprovementsFeatureConfig)
+            val payload = CompleteQuickStartPayload(site, NEXT_STEPS.toString())
+            dispatcher.dispatch(SiteActionBuilder.newCompleteQuickStartAction(payload))
+        } else if (quickStartEvent?.task == task) {
+            AppPrefs.setQuickStartNoticeRequired(true)
+        } else {
+            if (context != null && quickStartStore.hasDoneTask(siteId, CREATE_SITE)) {
+                val nextTask =
+                        QuickStartUtils.getNextUncompletedQuickStartTaskForReminderNotification(
+                                quickStartStore,
+                                siteId,
+                                task.taskType
+                        )
+                if (nextTask != null) {
+                    QuickStartUtils.startQuickStartReminderTimer(context, nextTask)
+                }
+            }
+        }
+    }
+
+    private fun shouldCancelCompleteAction(
+        siteId: Long,
+        site: SiteModel,
+        task: QuickStartTask
+    ): Boolean {
+        return quickStartStore.getQuickStartCompleted(siteId) ||
+                QuickStartUtils.isEveryQuickStartTaskDone(quickStartStore, site.id) ||
+                quickStartStore.hasDoneTask(siteId, task) ||
+                !QuickStartUtils.isQuickStartAvailableForTheSite(site)
+    }
+
+    fun startQuickStart(siteId: Int) {
+        quickStartStore.setDoneTask(siteId.toLong(), CREATE_SITE, true)
+        analyticsTrackerWrapper.track(QUICK_START_STARTED, mySiteImprovementsFeatureConfig)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/ScanFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/ScanFeatureConfig.kt
deleted file mode 100644
index 26ed0f19cc35..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/ScanFeatureConfig.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.wordpress.android.util
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
-import org.wordpress.android.util.config.AppConfig
-import org.wordpress.android.util.config.FeatureConfig
-import javax.inject.Inject
-
-/**
- * Configuration of the Scan feature.
- */
-@FeatureInDevelopment
-class ScanFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(
-        appConfig,
-        BuildConfig.SCAN_AVAILABLE
-)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java b/WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java
index a28116123296..e628a1c8bb47 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/SiteUtils.java
@@ -6,6 +6,7 @@
 import androidx.annotation.Nullable;
 
 import org.jetbrains.annotations.NotNull;
+import org.wordpress.android.BuildConfig;
 import org.wordpress.android.WordPress;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.fluxc.Dispatcher;
@@ -15,6 +16,8 @@
 import org.wordpress.android.fluxc.store.SiteStore;
 import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorForAllSitesPayload;
 import org.wordpress.android.fluxc.store.SiteStore.DesignateMobileEditorPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.SiteFilter;
 import org.wordpress.android.ui.plans.PlansConstants;
 import org.wordpress.android.ui.prefs.AppPrefs;
 import org.wordpress.android.ui.reader.utils.SiteAccessibilityInfo;
@@ -22,6 +25,8 @@
 import org.wordpress.android.util.analytics.AnalyticsUtils;
 import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource;
 import org.wordpress.android.util.helpers.Version;
+import org.wordpress.android.util.image.BlavatarShape;
+import org.wordpress.android.util.image.ImageType;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,8 +35,8 @@ public class SiteUtils {
     public static final String GB_EDITOR_NAME = "gutenberg";
     public static final String AZTEC_EDITOR_NAME = "aztec";
     public static final String WP_STORIES_CREATOR_NAME = "wp_stories_creator";
-    // TODO Update to the first version with the story block as a production and not a beta block
-    public static final String WP_STORIES_JETPACK_VERSION = "8.8";
+    public static final String WP_STORIES_JETPACK_VERSION = "9.1";
+    public static final String WP_CONTACT_INFO_JETPACK_VERSION = "8.5";
     private static final int GB_ROLLOUT_PERCENTAGE_PHASE_1 = 100;
     private static final int GB_ROLLOUT_PERCENTAGE_PHASE_2 = 100;
 
@@ -209,10 +214,14 @@ public static boolean isBlockEditorDefaultForNewPost(SiteModel site) {
             // Default to block editor when mobile editor setting is empty
             return true;
         } else {
-            return site.getMobileEditor().equals(SiteUtils.GB_EDITOR_NAME);
+            return alwaysDefaultToGutenberg(site) || site.getMobileEditor().equals(SiteUtils.GB_EDITOR_NAME);
         }
     }
 
+    public static boolean alwaysDefaultToGutenberg(SiteModel site) {
+        return site.isWPCom() && !site.isWPComAtomic();
+    }
+
     public static String getSiteNameOrHomeURL(SiteModel site) {
         String siteName = site.getName();
         if (siteName == null) {
@@ -249,6 +258,36 @@ public static String getSiteIconUrl(SiteModel site, int size) {
                 site.isPrivateWPComAtomic());
     }
 
+    public static ImageType getSiteImageType(boolean isP2, BlavatarShape shape) {
+        ImageType type = ImageType.BLAVATAR;
+        if (isP2) {
+            switch (shape) {
+                case SQUARE:
+                    type = ImageType.P2_BLAVATAR;
+                    break;
+                case SQUARE_WITH_ROUNDED_CORNERES:
+                    type = ImageType.P2_BLAVATAR_ROUNDED_CORNERS;
+                    break;
+                case CIRCULAR:
+                    type = ImageType.P2_BLAVATAR_CIRCULAR;
+                    break;
+            }
+        } else {
+            switch (shape) {
+                case SQUARE:
+                    type = ImageType.BLAVATAR;
+                    break;
+                case SQUARE_WITH_ROUNDED_CORNERES:
+                    type = ImageType.BLAVATAR_ROUNDED_CORNERS;
+                    break;
+                case CIRCULAR:
+                    type = ImageType.BLAVATAR_CIRCULAR;
+                    break;
+            }
+        }
+        return type;
+    }
+
     public static SiteAccessibilityInfo getAccessibilityInfoFromSite(@NotNull SiteModel site) {
         SiteVisibility siteVisibility;
 
@@ -310,6 +349,10 @@ public static boolean supportsStoriesFeature(SiteModel site) {
         return site != null && (site.isWPCom() || checkMinimalJetpackVersion(site, WP_STORIES_JETPACK_VERSION));
     }
 
+    public static boolean supportsContactInfoFeature(SiteModel site) {
+        return site != null & (site.isWPCom() || checkMinimalJetpackVersion(site, WP_CONTACT_INFO_JETPACK_VERSION));
+    }
+
     public static boolean isNonAtomicBusinessPlanSite(@Nullable SiteModel site) {
         return site != null && !site.isAutomatedTransfer() && SiteUtils.hasNonJetpackBusinessPlan(site);
     }
@@ -328,10 +371,22 @@ public static boolean onBloggerPlan(@NonNull SiteModel site) {
     }
 
     public static boolean hasCustomDomain(@NonNull SiteModel site) {
-        return !site.getUrl().contains(".wordpress.com");
+        return !site.getUrl().contains(".wordpress.com") && !site.getUrl().contains(".wpcomstaging.com");
     }
 
     public static boolean hasFullAccessToContent(@Nullable SiteModel site) {
         return site != null && (site.isSelfHostedAdmin() || site.getHasCapabilityEditPages());
     }
+
+    // TODO: Inline this method when the legacy 'MySiteFragment' class is removed.
+    public static boolean isScanEnabled(boolean scanPurchased, SiteModel site) {
+        return scanPurchased && !site.isWPCom() && !site.isWPComAtomic();
+    }
+
+    @NonNull
+    public static FetchSitesPayload getFetchSitesPayload() {
+        ArrayList<SiteFilter> siteFilters = new ArrayList<>();
+        if (BuildConfig.IS_JETPACK_APP) siteFilters.add(SiteFilter.JETPACK);
+        return new FetchSitesPayload(siteFilters);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/SiteUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/SiteUtilsWrapper.kt
index 6d4a7f21d214..489f4d159016 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/SiteUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/SiteUtilsWrapper.kt
@@ -17,4 +17,8 @@ class SiteUtilsWrapper @Inject constructor() {
     fun isPhotonCapable(site: SiteModel): Boolean = SiteUtils.isPhotonCapable(site)
     fun getAccessibilityInfoFromSite(site: SiteModel): SiteAccessibilityInfo =
             SiteUtils.getAccessibilityInfoFromSite(site)
+
+    fun isAccessedViaWPComRest(site: SiteModel): Boolean = SiteUtils.isAccessedViaWPComRest(site)
+    fun onFreePlan(site: SiteModel): Boolean = SiteUtils.onFreePlan(site)
+    fun hasCustomDomain(site: SiteModel): Boolean = SiteUtils.hasCustomDomain(site)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/SnackbarSequencer.kt b/WordPress/src/main/java/org/wordpress/android/util/SnackbarSequencer.kt
index 61c2d0a115c7..85e919b007cf 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/SnackbarSequencer.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/SnackbarSequencer.kt
@@ -2,6 +2,7 @@ package org.wordpress.android.util
 
 import android.app.Activity
 import android.content.Context
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -10,7 +11,6 @@ import kotlinx.coroutines.launch
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.util.AppLog.T
-import org.wordpress.android.widgets.WPSnackbar
 import org.wordpress.android.widgets.WPSnackbarWrapper
 import java.util.LinkedList
 import java.util.Queue
@@ -77,7 +77,7 @@ class SnackbarSequencer @Inject constructor(
         return !activity.isFinishing
     }
 
-    private fun prepareSnackBar(context: Context, item: SnackbarItem): WPSnackbar? {
+    private fun prepareSnackBar(context: Context, item: SnackbarItem): Snackbar? {
         return item.info.view.get()?.let { view ->
             val message = uiHelper.getTextOfUiString(context, item.info.textRes)
 
diff --git a/WordPress/src/main/java/org/wordpress/android/util/StorageUtilsProvider.kt b/WordPress/src/main/java/org/wordpress/android/util/StorageUtilsProvider.kt
new file mode 100644
index 000000000000..4efbb982c565
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/StorageUtilsProvider.kt
@@ -0,0 +1,63 @@
+package org.wordpress.android.util
+
+import android.content.Intent
+import android.provider.Settings
+import androidx.fragment.app.FragmentManager
+import org.wordpress.android.R
+import org.wordpress.android.R.string
+import org.wordpress.android.ui.prefs.AppPrefs
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.widgets.StorageNotificationDialogFragment
+import org.wordpress.android.widgets.StorageNotificationDialogFragment.DialogLabels
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class StorageUtilsProvider @Inject constructor(
+    private val contextProvider: ContextProvider
+) {
+    // Add more sources here for tracking purposes if using this class from other places than the editor
+    enum class Source(val description: String) {
+        EDITOR("editor")
+    }
+
+    fun notifyOnLowStorageSpace(fm: FragmentManager, source: Source) {
+        if (
+                isDeviceRunningOutOfSpace() &&
+                AppPrefs.shouldShowStorageWarning() &&
+                fm.findFragmentByTag(DIALOG_FRAGMENT_TAG) == null
+        ) {
+            val intent = Intent(Settings.ACTION_INTERNAL_STORAGE_SETTINGS)
+            val context = contextProvider.getContext()
+            val isInternalStorageSettingsResolved = intent.resolveActivity(context.packageManager) != null
+
+            StorageNotificationDialogFragment.newInstance(
+                    dialogLabels = DialogLabels(
+                            title = context.getString(string.storage_utils_dialog_title),
+                            message = context.getString(string.storage_utils_dialog_message),
+                            okLabel = if (isInternalStorageSettingsResolved) {
+                                context.getString(string.storage_utils_dialog_ok_button)
+                            } else {
+                                context.getString(android.R.string.ok)
+                            },
+                            dontShowAgainLabel = context.getString(string.storage_utils_dialog_dont_show_button)
+                    ),
+                    isInternalStorageSettingsResolved = isInternalStorageSettingsResolved,
+                    source = source.description
+            ).show(fm, DIALOG_FRAGMENT_TAG)
+        }
+    }
+
+    private fun isDeviceRunningOutOfSpace(): Boolean {
+        // if available space is at or below 10%, consider it low
+        val appContext = contextProvider.getContext().applicationContext
+        return (appContext.cacheDir.usableSpace * FULL_STORAGE_PERCENTAGE /
+                appContext.cacheDir.totalSpace <= LOW_STORAGE_THRESHOLD)
+    }
+
+    companion object {
+        private const val DIALOG_FRAGMENT_TAG = "storage-utils-dialog-fragment"
+        private const val FULL_STORAGE_PERCENTAGE = 100
+        private const val LOW_STORAGE_THRESHOLD = 10
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/URLFilteredWebViewClient.java b/WordPress/src/main/java/org/wordpress/android/util/URLFilteredWebViewClient.java
index 2fb0141bf3c0..f3cb89424ef4 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/URLFilteredWebViewClient.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/URLFilteredWebViewClient.java
@@ -43,6 +43,12 @@ private boolean isAllURLsAllowed() {
         return mAllowedURLs.size() == 0;
     }
 
+    private boolean isHttpUrlAllowed(String url) {
+        return mAllowedURLs.contains(url.replace("https://", "http://"))
+               || mAllowedURLs.contains(StringUtils.removeTrailingSlash(url)
+                                                   .replace("https://", "http://"));
+    }
+
     @Override
     public boolean shouldOverrideUrlLoading(WebView view, String url) {
         // Found a bug on some pages where there is an incorrect
@@ -52,6 +58,7 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
         }
 
         if (isAllURLsAllowed() || mAllowedURLs.contains(url)
+            || isHttpUrlAllowed(url) // Allow https redirection
             // If a url is allowed without the trailing `/`, it should be allowed with it as well
             || mAllowedURLs.contains(StringUtils.removeTrailingSlash(url))) {
             boolean isComingFromLoginUrl =
diff --git a/WordPress/src/main/java/org/wordpress/android/util/UploadWorker.kt b/WordPress/src/main/java/org/wordpress/android/util/UploadWorker.kt
index 0306e474d39e..6d0e3189f694 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/UploadWorker.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/UploadWorker.kt
@@ -69,7 +69,7 @@ fun enqueueUploadWorkRequestForSite(site: SiteModel): Pair<WorkRequest, Operatio
             .setConstraints(getUploadConstraints())
             .setInputData(workDataOf(WordPress.LOCAL_SITE_ID to site.id))
             .build()
-    val operation = WorkManager.getInstance().enqueueUniqueWork(
+    val operation = WorkManager.getInstance(WordPress.getContext()).enqueueUniqueWork(
             "auto-upload-" + site.id,
             ExistingWorkPolicy.KEEP, request
     )
@@ -80,7 +80,7 @@ fun enqueuePeriodicUploadWorkRequestForAllSites(): Pair<WorkRequest, Operation>
     val request = PeriodicWorkRequestBuilder<UploadWorker>(8, HOURS, 6, HOURS)
             .setConstraints(getUploadConstraints())
             .build()
-    val operation = WorkManager.getInstance().enqueueUniquePeriodicWork(
+    val operation = WorkManager.getInstance(WordPress.getContext()).enqueueUniquePeriodicWork(
             "periodic auto-upload",
             ExistingPeriodicWorkPolicy.KEEP, request
     )
diff --git a/WordPress/src/main/java/org/wordpress/android/util/UriWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/UriWrapper.kt
index 339f718aba6f..6bbbea153188 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/UriWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/UriWrapper.kt
@@ -6,5 +6,16 @@ import android.net.Uri
  * This class is necessary because standard Uri doesn't work in unit tests (it's always null)
  */
 data class UriWrapper(val uri: Uri) {
+    constructor(uriString: String) : this(Uri.parse(uriString))
+
+    val lastPathSegment: String? = uri.lastPathSegment
+    val pathSegments: List<String> = uri.pathSegments
+    val host: String? = uri.host
+
     override fun toString() = uri.toString()
+    fun getQueryParameter(key: String): String? = uri.getQueryParameter(key)
+    fun copy(path: String): UriWrapper {
+        val newUri = uri.buildUpon().path(path).build()
+        return this.copy(uri = newUri)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/ViewBindingUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/ViewBindingUtils.kt
new file mode 100644
index 000000000000..a641b4406fee
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/ViewBindingUtils.kt
@@ -0,0 +1,8 @@
+package org.wordpress.android.util
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.viewbinding.ViewBinding
+
+inline fun <T : ViewBinding> ViewGroup.viewBinding(inflateBinding: (LayoutInflater, ViewGroup, Boolean) -> T) =
+        inflateBinding(LayoutInflater.from(context), this, false)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
index b11e8653b41c..6ee5df3a9c24 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPActivityUtils.java
@@ -6,15 +6,19 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
+import android.view.Window;
 import android.widget.ListView;
 
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 
 import com.google.android.material.appbar.AppBarLayout;
@@ -164,4 +168,40 @@ public static void enableReaderDeeplinks(Context context) {
         pm.setComponentEnabledSetting(new ComponentName(context, READER_DEEPLINK_ACTIVITY_ALIAS),
                 PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
     }
+
+    public static void setLightStatusBar(Window window, boolean showInLightMode) {
+        Context context = window.getContext();
+        boolean isDarkTheme = ConfigurationExtensionsKt.isDarkTheme(context.getResources().getConfiguration());
+        if (!isDarkTheme) {
+            if (VERSION.SDK_INT >= VERSION_CODES.M) {
+                int systemVisibility = window.getDecorView().getSystemUiVisibility();
+                int newSystemVisibility = showInLightMode ? systemVisibility | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                        : systemVisibility & ~View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
+                window.getDecorView().setSystemUiVisibility(newSystemVisibility);
+            }
+        }
+    }
+
+    public static void setLightNavigationBar(Window window, boolean showInLightMode) {
+        Context context = window.getContext();
+        boolean isDarkTheme = ConfigurationExtensionsKt.isDarkTheme(context.getResources().getConfiguration());
+        if (!isDarkTheme) {
+            if (VERSION.SDK_INT >= VERSION_CODES.O) {
+                int systemVisibility = window.getDecorView().getSystemUiVisibility();
+                int newSystemVisibility = showInLightMode ? systemVisibility | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                        : systemVisibility & ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+                window.getDecorView().setSystemUiVisibility(newSystemVisibility);
+
+                int newColor = showInLightMode ? ContextExtensionsKt.getColorFromAttribute(context, R.attr.colorSurface)
+                        : ContextCompat.getColor(context, R.color.black);
+                window.setNavigationBarColor(newColor);
+            }
+        }
+    }
+
+    public static void showFullScreen(View decorView) {
+        int flags = decorView.getSystemUiVisibility();
+        flags = flags | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
+        decorView.setSystemUiVisibility(flags);
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPMeShortlinks.java b/WordPress/src/main/java/org/wordpress/android/util/WPMeShortlinks.java
index dc60676f4860..c25b33f3a554 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPMeShortlinks.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPMeShortlinks.java
@@ -6,7 +6,7 @@
  * Shortlinks are a quick way to get short and simple links to your posts, pages, and blogs.
  * They use the wp.me domain so you can have more space to write on social media sites.
  * <p/>
- * See: https://github.com/Automattic/jetpack/blob/master/modules/shortlinks.php
+ * See: https://git.io/JqUEl
  */
 
 import android.text.TextUtils;
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java
index cdff312a43d1..fde91687b6d0 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java
@@ -16,6 +16,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
@@ -28,6 +29,7 @@
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.store.MediaStore.MediaError;
 import org.wordpress.android.fluxc.utils.MimeTypes;
+import org.wordpress.android.fluxc.utils.MimeTypes.Plan;
 import org.wordpress.android.imageeditor.preview.PreviewImageFragment;
 import org.wordpress.android.imageeditor.preview.PreviewImageFragment.Companion.EditImageData;
 import org.wordpress.android.ui.RequestCodes;
@@ -40,6 +42,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class WPMediaUtils {
@@ -209,7 +212,7 @@ String getErrorMessage(final Context context, final MediaModel media, final Medi
             case GENERIC_ERROR:
                 return context.getString(R.string.error_generic_error);
             case EXCEEDS_SITE_SPACE_QUOTA_LIMIT:
-                return context.getString(R.string.error_media_quota_exceeded);
+                return context.getString(R.string.error_media_not_enough_storage);
             case XMLRPC_OPERATION_NOT_ALLOWED:
                 return context.getString(R.string.error_media_xmlrpc_not_allowed);
             case XMLRPC_UPLOAD_ERROR:
@@ -241,9 +244,20 @@ public static void launchMediaLibrary(Activity activity, boolean multiSelect) {
                 RequestCodes.MEDIA_LIBRARY);
     }
 
-    public static void launchFileLibrary(Activity activity, boolean multiSelect) {
-        activity.startActivityForResult(prepareFileLibraryIntent(activity, multiSelect),
-                RequestCodes.FILE_LIBRARY);
+    public static Plan getSitePlanForMimeTypes(SiteModel site) {
+        if (site.isWPCom()) {
+            if (SiteUtils.onFreePlan(site)) {
+                return Plan.WP_COM_FREE;
+            } else {
+                return Plan.WP_COM_PAID;
+            }
+        } else {
+            return Plan.SELF_HOSTED;
+        }
+    }
+
+    public static boolean isMimeTypeSupportedBySitePlan(SiteModel site, String mimeType) {
+        return Arrays.asList(new MimeTypes().getAllTypes(getSitePlanForMimeTypes(site))).contains(mimeType);
     }
 
     public static void launchChooserWithContext(
@@ -256,34 +270,30 @@ public static void launchChooserWithContext(
                 requestCode);
     }
 
+    private static Intent preparePictureLibraryIntent(Context context, boolean multiSelect) {
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "image/*",
+                new MimeTypes().getImageTypesOnly(), R.string.pick_photo);
+    }
+
     private static Intent prepareVideoLibraryIntent(Context context, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("video/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getVideoTypesOnly());
-        if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        }
-        return Intent.createChooser(intent, context.getString(R.string.pick_video));
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "video/*",
+                new MimeTypes().getVideoTypesOnly(), R.string.pick_video);
     }
 
     private static Intent prepareMediaLibraryIntent(Context context, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("*/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getVideoAndImageTypesOnly());
-        if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        }
-        return Intent.createChooser(intent, context.getString(R.string.pick_media));
+        return prepareIntent(context, multiSelect, Intent.ACTION_GET_CONTENT, "*/*",
+                new MimeTypes().getVideoAndImageTypesOnly(), R.string.pick_media);
     }
 
-    private static Intent prepareFileLibraryIntent(Context context, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-        intent.setType("*/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getAllTypes());
+    private static Intent prepareIntent(Context context, boolean multiSelect, String action, String intentType,
+                                        String[] mimeTypes, @StringRes int title) {
+        Intent intent = new Intent(action);
+        intent.setType(intentType);
+        intent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
         if (multiSelect) {
             intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
         }
-        return Intent.createChooser(intent, context.getString(R.string.pick_file));
+        return Intent.createChooser(intent, context.getString(title));
     }
 
     private static Intent prepareChooserIntent(
@@ -311,20 +321,10 @@ private static Intent prepareVideoCameraIntent() {
 
     public static void launchPictureLibrary(Activity activity, boolean multiSelect) {
         activity.startActivityForResult(
-                preparePictureLibraryIntent(activity.getString(R.string.pick_photo), multiSelect),
+                preparePictureLibraryIntent(activity, multiSelect),
                 RequestCodes.PICTURE_LIBRARY);
     }
 
-    private static Intent preparePictureLibraryIntent(String title, boolean multiSelect) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        intent.putExtra(Intent.EXTRA_MIME_TYPES, new MimeTypes().getImageTypesOnly());
-        if (multiSelect) {
-            intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
-        }
-        return Intent.createChooser(intent, title);
-    }
-
     private static Intent prepareGalleryIntent(String title) {
         Intent intent = new Intent(Intent.ACTION_PICK);
         intent.setType("image/*");
diff --git a/WordPress/src/main/java/org/wordpress/android/util/WpUrlUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/WpUrlUtilsWrapper.kt
new file mode 100644
index 000000000000..b47726b9b4f7
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/WpUrlUtilsWrapper.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.util
+
+import javax.inject.Inject
+
+class WpUrlUtilsWrapper @Inject constructor() {
+    fun isWordPressCom(interceptedUri: String?) = WPUrlUtils.isWordPressCom(interceptedUri)
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/ActivityLogTracker.kt b/WordPress/src/main/java/org/wordpress/android/util/analytics/ActivityLogTracker.kt
new file mode 100644
index 000000000000..9513c1b3a9e5
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/ActivityLogTracker.kt
@@ -0,0 +1,87 @@
+package org.wordpress.android.util.analytics
+
+import androidx.core.util.Pair
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_SELECTED
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
+import org.wordpress.android.util.DateTimeUtilsWrapper
+import java.util.Date
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ActivityLogTracker @Inject constructor(
+    private val tracker: AnalyticsTrackerWrapper,
+    private val dateTimeUtilsWrapper: DateTimeUtilsWrapper
+) {
+    fun trackDateRangeFilterButtonClicked(rewindableOnly: Boolean) {
+        if (rewindableOnly) {
+            tracker.track(Stat.JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_BUTTON_TAPPED)
+        } else {
+            tracker.track(Stat.ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_BUTTON_TAPPED)
+        }
+    }
+
+    fun trackDateRangeFilterSelected(dateRange: Pair<Long, Long>?, rewindableOnly: Boolean) {
+        val start = dateRange?.first
+        val end = dateRange?.second
+        if (start == null || end == null) {
+            trackDateRangeFilterCleared(rewindableOnly)
+        } else {
+            val map = mutableMapOf<String, Any>()
+            // Number of selected days
+            map["duration"] = dateTimeUtilsWrapper.daysBetween(Date(start), Date(end)) + 1
+            // Distance from the startDate to today (in days)
+            map["distance"] = dateTimeUtilsWrapper.daysBetween(Date(start), Date())
+            if (rewindableOnly) {
+                tracker.track(Stat.JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_SELECTED, map)
+            } else {
+                tracker.track(Stat.ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_SELECTED, map)
+            }
+        }
+    }
+
+    fun trackDateRangeFilterCleared(rewindableOnly: Boolean) {
+        if (rewindableOnly) {
+            tracker.track(Stat.JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_RESET)
+        } else {
+            tracker.track(Stat.ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_RESET)
+        }
+    }
+
+    fun trackActivityTypeFilterButtonClicked() {
+        tracker.track(Stat.ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_BUTTON_TAPPED)
+    }
+
+    fun trackActivityTypeFilterSelected(selectedTypes: List<ActivityTypeModel>) {
+        if (selectedTypes.isEmpty()) {
+            trackActivityTypeFilterCleared()
+        } else {
+            val map = mutableMapOf<String, Any>()
+            map["num_groups_selected"] = selectedTypes.size.toString()
+            map["num_total_activities_selected"] = selectedTypes.map { it.count }.reduce { acc, count -> acc + count }
+            selectedTypes.forEach { map["group_${it.key}"] = true }
+            tracker.track(ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_SELECTED, map)
+        }
+    }
+
+    fun trackActivityTypeFilterCleared() {
+        tracker.track(Stat.ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_RESET)
+    }
+
+    fun trackDownloadBackupDownloadButtonClicked(rewindableOnly: Boolean) {
+        if (rewindableOnly) {
+            tracker.track(Stat.JETPACK_BACKUP_DOWNLOAD_FILE_NOTICE_DOWNLOAD_TAPPED)
+        } else {
+            tracker.track(Stat.ACTIVITY_LOG_DOWNLOAD_FILE_NOTICE_DOWNLOAD_TAPPED)
+        }
+    }
+
+    fun trackDownloadBackupDismissButtonClicked(rewindableOnly: Boolean) {
+        if (rewindableOnly) {
+            tracker.track(Stat.JETPACK_BACKUP_DOWNLOAD_FILE_NOTICE_DISMISSED_TAPPED)
+        } else {
+            tracker.track(Stat.ACTIVITY_LOG_DOWNLOAD_FILE_NOTICE_DISMISSED_TAPPED)
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsTrackerWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsTrackerWrapper.kt
index dd43ffae0721..c42f318544f1 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsTrackerWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsTrackerWrapper.kt
@@ -4,6 +4,7 @@ import dagger.Reusable
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.util.config.AppConfig.FeatureState
 import org.wordpress.android.util.config.ExperimentConfig
 import org.wordpress.android.util.config.FeatureConfig
 import javax.inject.Inject
@@ -16,23 +17,33 @@ class AnalyticsTrackerWrapper
     }
 
     fun track(stat: Stat, feature: FeatureConfig) {
-        AnalyticsTracker.track(stat, mapOf(feature.remoteField to feature.isEnabled()))
+        AnalyticsTracker.track(stat, feature.toParams())
+    }
+
+    fun track(stat: Stat, remoteField: String, featureState: FeatureState) {
+        AnalyticsTracker.track(
+                stat,
+                mapOf(
+                        remoteField to featureState.isEnabled,
+                        "${remoteField}_state" to featureState.name
+                )
+        )
     }
 
     fun track(stat: Stat, experimentConfig: ExperimentConfig) {
         AnalyticsTracker.track(stat, mapOf(experimentConfig.remoteField to experimentConfig.getVariant().value))
     }
 
-    fun track(stat: Stat, properties: Map<String, *>) {
+    fun track(stat: Stat, properties: Map<String, Any?>) {
         AnalyticsTracker.track(stat, properties)
     }
 
-    fun track(stat: Stat, site: SiteModel) {
-        AnalyticsUtils.trackWithSiteDetails(stat, site)
+    fun track(stat: Stat, properties: Map<String, *>, feature: FeatureConfig) {
+        AnalyticsTracker.track(stat, properties + feature.toParams())
     }
 
-    fun track(stat: Stat, siteId: Long) {
-        AnalyticsUtils.trackWithSiteId(stat, siteId)
+    fun track(stat: Stat, site: SiteModel) {
+        AnalyticsUtils.trackWithSiteDetails(stat, site)
     }
 
     /**
@@ -45,4 +56,14 @@ class AnalyticsTrackerWrapper
     fun track(stat: Stat, errorContext: String, errorType: String, errorDescription: String) {
         AnalyticsTracker.track(stat, errorContext, errorType, errorDescription)
     }
+
+    fun trackWithSiteDetails(
+        stat: Stat,
+        siteModel: SiteModel?,
+        feature: FeatureConfig
+    ) {
+        AnalyticsUtils.trackWithSiteDetails(stat, siteModel, feature.toParams().toMutableMap<String, Any>())
+    }
+
+    private fun FeatureConfig.toParams() = mapOf(name() to isEnabled())
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java
index 4765e0f4e2dd..3035563c70a8 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtils.java
@@ -10,16 +10,17 @@
 import android.webkit.MimeTypeMap;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.wordpress.android.BuildConfig;
 import org.wordpress.android.R;
 import org.wordpress.android.analytics.AnalyticsMetadata;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
 import org.wordpress.android.analytics.AnalyticsTrackerNosara;
-import org.wordpress.android.datasets.ReaderPostTable;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.generated.AccountActionBuilder;
 import org.wordpress.android.fluxc.model.CommentModel;
@@ -47,20 +48,13 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_COMMENTED_ON;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_LIKED;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_ARTICLE_OPENED;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_GLOBAL_RELATED_POST_CLICKED;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_LOCAL_RELATED_POST_CLICKED;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_INTERACT;
-import static org.wordpress.android.analytics.AnalyticsTracker.Stat.TRAIN_TRACKS_RENDER;
 import static org.wordpress.android.ui.PagePostCreationSourcesDetail.CREATED_POST_SOURCE_DETAIL_KEY;
 import static org.wordpress.android.ui.posts.EditPostActivity.EXTRA_IS_QUICKPRESS;
 
 public class AnalyticsUtils {
     private static final String BLOG_ID_KEY = "blog_id";
     private static final String POST_ID_KEY = "post_id";
+    private static final String FOLLOW_KEY = "follow";
     private static final String COMMENT_ID_KEY = "comment_id";
     private static final String FEED_ID_KEY = "feed_id";
     private static final String FEED_ITEM_ID_KEY = "feed_item_id";
@@ -71,10 +65,14 @@ public class AnalyticsUtils {
     private static final String INTENT_ACTION = "intent_action";
     private static final String INTENT_HOST = "intent_host";
     private static final String INTENT_DATA = "intent_data";
-    private static final String INTERCEPTED_URI = "intercepted_uri";
     private static final String INTERCEPTOR_CLASSNAME = "interceptor_classname";
     private static final String NEWS_CARD_ORIGIN = "origin";
     private static final String NEWS_CARD_VERSION = "version";
+    private static final String SITE_TYPE_KEY = "site_type";
+    private static final String COMMENT_ACTION_SOURCE = "source";
+    private static final String SOURCE_KEY = "source";
+    private static final String LIST_TYPE_KEY = "list_type";
+    private static final String IS_STORAGE_SETTINGS_RESOLVED_KEY = "is_storage_settings_resolved";
 
     public static final String HAS_GUTENBERG_BLOCKS_KEY = "has_gutenberg_blocks";
     public static final String HAS_WP_STORIES_BLOCKS_KEY = "has_wp_stories_blocks";
@@ -174,6 +172,8 @@ public static void refreshMetadata(AccountStore accountStore, SiteStore siteStor
         metadata.setNumBlogs(siteStore.getSitesCount());
         metadata.setUsername(accountStore.getAccount().getUserName());
         metadata.setEmail(accountStore.getAccount().getEmail());
+        String scheme = BuildConfig.DEBUG ? "debug" : BuildConfig.FLAVOR;
+        metadata.setAppScheme(scheme);
         if (siteStore.hasSite()) {
             metadata.setGutenbergEnabled(isGutenbergEnabledOnAnySite(siteStore.getSites()));
         }
@@ -231,8 +231,8 @@ public static void trackWithSiteDetails(AnalyticsTracker.Stat stat, SiteModel si
     /**
      * Bump Analytics for the passed Stat and add blog details into properties.
      *
-     * @param stat The Stat to bump
-     * @param site The site object
+     * @param stat       The Stat to bump
+     * @param site       The site object
      * @param properties Properties to attach to the event
      */
     public static void trackWithSiteDetails(AnalyticsTracker.Stat stat, SiteModel site,
@@ -250,6 +250,7 @@ public static void trackWithSiteDetails(AnalyticsTracker.Stat stat, SiteModel si
             }
             properties.put(BLOG_ID_KEY, site.getSiteId());
             properties.put(IS_JETPACK_KEY, site.isJetpackConnected());
+            properties.put(SITE_TYPE_KEY, AnalyticsSiteType.toStringFromSiteModel(site));
         }
 
         if (properties == null) {
@@ -287,6 +288,7 @@ public static void trackQuickActionTouched(QuickActionTrackPropertyValue type,
         if (site != null) {
             properties.put(BLOG_ID_KEY, site.getSiteId());
             properties.put(IS_JETPACK_KEY, site.isJetpackConnected());
+            properties.put(SITE_TYPE_KEY, AnalyticsSiteType.toStringFromSiteModel(site));
         }
 
         if (comment != null) {
@@ -302,17 +304,29 @@ public static void trackQuickActionTouched(QuickActionTrackPropertyValue type,
      * Bump Analytics for comment reply, and add blog and comment details into properties.
      *
      * @param isQuickReply Whether is a quick reply or not
-     * @param site The site object
-     * @param comment The comment object
+     * @param site         The site object
+     * @param comment      The comment object
+     * @param source       The source of the comment action
      */
     public static void trackCommentReplyWithDetails(boolean isQuickReply, SiteModel site,
-                                                    CommentModel comment) {
-        AnalyticsTracker.Stat stat = isQuickReply ? AnalyticsTracker.Stat.NOTIFICATION_QUICK_ACTIONS_REPLIED_TO
-                : AnalyticsTracker.Stat.NOTIFICATION_REPLIED_TO;
+                                                    CommentModel comment, AnalyticsCommentActionSource source) {
+        AnalyticsTracker.Stat legacyTracker = null;
+        if (source == AnalyticsCommentActionSource.NOTIFICATIONS) {
+            legacyTracker = isQuickReply ? AnalyticsTracker.Stat.NOTIFICATION_QUICK_ACTIONS_REPLIED_TO
+                    : AnalyticsTracker.Stat.NOTIFICATION_REPLIED_TO;
+        }
+
+        AnalyticsTracker.Stat stat = isQuickReply
+                ? AnalyticsTracker.Stat.COMMENT_QUICK_ACTION_REPLIED_TO
+                : AnalyticsTracker.Stat.COMMENT_REPLIED_TO;
         if (site == null || !SiteUtils.isAccessedViaWPComRest(site)) {
             AppLog.w(AppLog.T.STATS, "The passed blog obj is null or it's not a wpcom or Jetpack."
                                      + " Tracking analytics without blog info");
             AnalyticsTracker.track(stat);
+
+            if (legacyTracker != null) {
+                AnalyticsTracker.track(legacyTracker);
+            }
             return;
         }
 
@@ -321,15 +335,21 @@ public static void trackCommentReplyWithDetails(boolean isQuickReply, SiteModel
         properties.put(IS_JETPACK_KEY, site.isJetpackConnected());
         properties.put(POST_ID_KEY, comment.getRemotePostId());
         properties.put(COMMENT_ID_KEY, comment.getRemoteCommentId());
+        properties.put(SITE_TYPE_KEY, AnalyticsSiteType.toStringFromSiteModel(site));
+        properties.put(COMMENT_ACTION_SOURCE, source.toString());
 
         AnalyticsTracker.track(stat, properties);
+
+        if (legacyTracker != null) {
+            AnalyticsTracker.track(legacyTracker, properties);
+        }
     }
 
 
     /**
      * Bump Analytics and add blog_id into properties
      *
-     * @param stat The Stat to bump
+     * @param stat   The Stat to bump
      * @param blogID The REMOTE blog ID.
      */
     public static void trackWithSiteId(AnalyticsTracker.Stat stat, long blogID) {
@@ -340,27 +360,24 @@ public static void trackWithSiteId(AnalyticsTracker.Stat stat, long blogID) {
         AnalyticsTracker.track(stat, properties);
     }
 
-    /**
-     * Bump Analytics for a reader post
-     *
-     * @param stat The Stat to bump
-     * @param post The reader post to track
-     */
-    public static void trackWithReaderPostDetails(AnalyticsTracker.Stat stat, ReaderPost post) {
+    public static void trackWithReaderPostDetails(AnalyticsTracker.Stat stat,
+                                                  @Nullable ReaderPost post,
+                                                  @NonNull Map<String, Object> properties) {
         if (post == null) {
             return;
         }
 
         // wpcom/jetpack posts should pass: feed_id, feed_item_id, blog_id, post_id, is_jetpack
         // RSS pass should pass: feed_id, feed_item_id, is_jetpack
-        Map<String, Object> properties = new HashMap<>();
         if (post.isWP() || post.isJetpack) {
             properties.put(BLOG_ID_KEY, post.blogId);
             properties.put(POST_ID_KEY, post.postId);
         }
+        properties.put(FOLLOW_KEY, post.isFollowedByCurrentUser);
         properties.put(FEED_ID_KEY, post.feedId);
         properties.put(FEED_ITEM_ID_KEY, post.feedItemId);
         properties.put(IS_JETPACK_KEY, post.isJetpack);
+        properties.put(SITE_TYPE_KEY, AnalyticsSiteType.toStringFromReaderPost(post));
 
         AnalyticsTracker.track(stat, properties);
 
@@ -371,10 +388,6 @@ public static void trackWithReaderPostDetails(AnalyticsTracker.Stat stat, Reader
         }
     }
 
-    public static void trackWithReaderPostDetails(AnalyticsTracker.Stat stat, long blogId, long postId) {
-        trackWithReaderPostDetails(stat, ReaderPostTable.getBlogPost(blogId, postId, true));
-    }
-
     public static void trackWithBlogPostDetails(AnalyticsTracker.Stat stat, long blogId, long postId) {
         Map<String, Object> properties = new HashMap<>();
         properties.put(BLOG_ID_KEY, blogId);
@@ -383,24 +396,6 @@ public static void trackWithBlogPostDetails(AnalyticsTracker.Stat stat, long blo
         AnalyticsTracker.track(stat, properties);
     }
 
-    public static void trackWithBlogPostDetails(AnalyticsTracker.Stat stat, String blogId, String postId, int
-            commentId) {
-        Map<String, Object> properties = new HashMap<>();
-        properties.put(BLOG_ID_KEY, blogId);
-        properties.put(POST_ID_KEY, postId);
-        properties.put(COMMENT_ID_KEY, commentId);
-
-        AnalyticsTracker.track(stat, properties);
-    }
-
-    public static void trackWithFeedPostDetails(AnalyticsTracker.Stat stat, long feedId, long feedItemId) {
-        Map<String, Object> properties = new HashMap<>();
-        properties.put(FEED_ID_KEY, feedId);
-        properties.put(FEED_ITEM_ID_KEY, feedItemId);
-
-        AnalyticsTracker.track(stat, properties);
-    }
-
     public static void trackWithReblogDetails(
             AnalyticsTracker.Stat stat,
             long sourceBlogId,
@@ -419,10 +414,10 @@ public static void trackWithReblogDetails(
     /**
      * Track when app launched via deep-linking
      *
-     * @param stat The Stat to bump
+     * @param stat   The Stat to bump
      * @param action The Intent action the app was started with
-     * @param host The host if applicable
-     * @param data The data URI the app was started with
+     * @param host   The host if applicable
+     * @param data   The data URI the app was started with
      */
     public static void trackWithDeepLinkData(AnalyticsTracker.Stat stat, String action, String host, Uri data) {
         Map<String, Object> properties = new HashMap<>();
@@ -436,20 +431,7 @@ public static void trackWithDeepLinkData(AnalyticsTracker.Stat stat, String acti
     /**
      * Track when app launched via deep-linking but then fell back to external browser
      *
-     * @param stat The Stat to bump
-     * @param interceptedUri The fallback URI the app was started with
-     */
-    public static void trackWithInterceptedUri(AnalyticsTracker.Stat stat, String interceptedUri) {
-        Map<String, Object> properties = new HashMap<>();
-        properties.put(INTERCEPTED_URI, interceptedUri);
-
-        AnalyticsTracker.track(stat, properties);
-    }
-
-    /**
-     * Track when app launched via deep-linking but then fell back to external browser
-     *
-     * @param stat The Stat to bump
+     * @param stat                 The Stat to bump
      * @param interceptorClassname The name of the class that handles the intercept by default
      */
     public static void trackWithDefaultInterceptor(AnalyticsTracker.Stat stat, String interceptorClassname) {
@@ -469,13 +451,13 @@ public static void trackRailcarRender(String railcarJson) {
             return;
         }
 
-        AnalyticsTracker.track(TRAIN_TRACKS_RENDER, railcarJsonToProperties(railcarJson));
+        AnalyticsTracker.track(AnalyticsTracker.Stat.TRAIN_TRACKS_RENDER, railcarJsonToProperties(railcarJson));
     }
 
     /**
      * Track when a railcar item has been interacted with
      *
-     * @param stat The event that caused the interaction
+     * @param stat        The event that caused the interaction
      * @param railcarJson The JSON string of the railcar
      */
     private static void trackRailcarInteraction(AnalyticsTracker.Stat stat, String railcarJson) {
@@ -485,7 +467,7 @@ private static void trackRailcarInteraction(AnalyticsTracker.Stat stat, String r
 
         Map<String, Object> properties = railcarJsonToProperties(railcarJson);
         properties.put("action", AnalyticsTrackerNosara.getEventNameForStat(stat));
-        AnalyticsTracker.track(TRAIN_TRACKS_INTERACT, properties);
+        AnalyticsTracker.track(AnalyticsTracker.Stat.TRAIN_TRACKS_INTERACT, properties);
     }
 
     /**
@@ -493,12 +475,12 @@ private static void trackRailcarInteraction(AnalyticsTracker.Stat stat, String r
      * @return True if the passed stat event can be recorded as a railcar interaction
      */
     private static boolean canTrackRailcarInteraction(AnalyticsTracker.Stat stat) {
-        return stat == READER_ARTICLE_LIKED
-               || stat == READER_ARTICLE_OPENED
-               || stat == READER_SEARCH_RESULT_TAPPED
-               || stat == READER_ARTICLE_COMMENTED_ON
-               || stat == READER_GLOBAL_RELATED_POST_CLICKED
-               || stat == READER_LOCAL_RELATED_POST_CLICKED;
+        return stat == AnalyticsTracker.Stat.READER_ARTICLE_LIKED
+               || stat == AnalyticsTracker.Stat.READER_ARTICLE_OPENED
+               || stat == AnalyticsTracker.Stat.READER_SEARCH_RESULT_TAPPED
+               || stat == AnalyticsTracker.Stat.READER_ARTICLE_COMMENTED_ON
+               || stat == AnalyticsTracker.Stat.READER_GLOBAL_RELATED_POST_CLICKED
+               || stat == AnalyticsTracker.Stat.READER_LOCAL_RELATED_POST_CLICKED;
     }
 
     /*
@@ -545,7 +527,7 @@ public static Map<String, Object> getMediaProperties(Context context, boolean is
         try {
             if (!file.exists()) {
                 AppLog.e(AppLog.T.MEDIA,
-                         "Can't access the media file. It doesn't exists anymore!! Properties are not being tracked.");
+                        "Can't access the media file. It doesn't exists anymore!! Properties are not being tracked.");
                 return properties;
             }
 
@@ -601,7 +583,7 @@ public static void trackAnalyticsAccountCreated(String username, String email, M
         AnalyticsUtils.refreshMetadataNewUser(username, email);
         // This stat is part of a funnel that provides critical information.  Before
         // making ANY modification to this stat please refer to: p4qSXL-35X-p2
-        AnalyticsTracker.track(Stat.CREATED_ACCOUNT, properties);
+        AnalyticsTracker.track(AnalyticsTracker.Stat.CREATED_ACCOUNT, properties);
     }
 
     public static void trackAnalyticsPostListToggleLayout(PostListViewLayoutType viewLayoutType) {
@@ -620,6 +602,131 @@ private static Map<String, String> createNewsCardProperties(String origin, int v
     public static void trackLoginProloguePages(int page) {
         Map<String, Integer> properties = new HashMap<>();
         properties.put("page_number", page);
-        AnalyticsTracker.track(Stat.LOGIN_PROLOGUE_PAGED, properties);
+        AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_PROLOGUE_PAGED, properties);
+    }
+
+    @VisibleForTesting
+    protected enum AnalyticsSiteType {
+        BLOG {
+            public String toString() {
+                return "blog";
+            }
+        },
+        P2 {
+            public String toString() {
+                return "p2";
+            }
+        };
+
+        static AnalyticsSiteType fromSiteModel(SiteModel siteModel) {
+            if (siteModel.isWpForTeamsSite()) {
+                return P2;
+            }
+
+            return BLOG;
+        }
+
+        static AnalyticsSiteType fromReaderPost(ReaderPost readerPost) {
+            if (readerPost.isP2orA8C()) {
+                return P2;
+            }
+
+            return BLOG;
+        }
+
+        static String toStringFromSiteModel(SiteModel siteModel) {
+            return fromSiteModel(siteModel).toString();
+        }
+
+        static String toStringFromReaderPost(ReaderPost readerPost) {
+            return fromReaderPost(readerPost).toString();
+        }
+    }
+
+    public enum AnalyticsCommentActionSource {
+        NOTIFICATIONS {
+            public String toString() {
+                return "notifications";
+            }
+        },
+        SITE_COMMENTS {
+            public String toString() {
+                return "site_comments";
+            }
+        },
+        READER {
+            public String toString() {
+                return "reader";
+            }
+        }
+    }
+
+    public static void trackCommentActionWithSiteDetails(AnalyticsTracker.Stat stat,
+                                                         AnalyticsCommentActionSource actionSource, SiteModel site) {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(COMMENT_ACTION_SOURCE, actionSource.toString());
+
+        AnalyticsUtils.trackWithSiteDetails(stat, site, properties);
+    }
+
+    public static void trackFollowCommentsWithReaderPostDetails(
+            AnalyticsTracker.Stat stat,
+            long blogId,
+            long postId,
+            @Nullable ReaderPost post,
+            @NonNull Map<String, Object> properties
+    ) {
+        if (post != null) {
+            AnalyticsUtils.trackWithReaderPostDetails(stat, post, properties);
+        } else {
+            AppLog.w(AppLog.T.READER, "The passed post obj is null. Tracking analytics without post details info");
+
+            properties.put(BLOG_ID_KEY, blogId);
+            properties.put(POST_ID_KEY, postId);
+
+            AnalyticsTracker.track(stat, properties);
+        }
+    }
+
+    public static void trackInviteLinksAction(
+            AnalyticsTracker.Stat stat,
+            @Nullable SiteModel site,
+            @Nullable Map<String, Object> properties
+    ) {
+        AnalyticsUtils.trackWithSiteDetails(stat, site, properties);
+    }
+
+    public static void trackUserProfileShown(String source) {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(SOURCE_KEY, source);
+
+        AnalyticsTracker.track(Stat.USER_PROFILE_SHEET_SHOWN, properties);
+    }
+
+    public static void trackUserProfileSiteShown() {
+        AnalyticsTracker.track(Stat.USER_PROFILE_SHEET_SITE_SHOWN);
+    }
+
+    public static void trackBlogPreviewedByUrl(String source) {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(SOURCE_KEY, source);
+
+        AnalyticsTracker.track(Stat.BLOG_URL_PREVIEWED, properties);
+    }
+
+    public static void trackLikeListOpened(String source, String listType) {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(SOURCE_KEY, source);
+        properties.put(LIST_TYPE_KEY, listType);
+
+        AnalyticsTracker.track(Stat.LIKE_LIST_OPENED, properties);
+    }
+
+    public static void trackStorageWarningDialogEvent(Stat stat, String source, Boolean isStorageSettingsResolved) {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(SOURCE_KEY, source);
+        properties.put(IS_STORAGE_SETTINGS_RESOLVED_KEY, isStorageSettingsResolved ? "true" : "false");
+
+        AnalyticsTracker.track(stat, properties);
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtilsWrapper.kt
index b3375e00e272..28fdd76f0e28 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtilsWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/AnalyticsUtilsWrapper.kt
@@ -2,8 +2,10 @@ package org.wordpress.android.util.analytics
 
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import dagger.Reusable
 import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.model.PostImmutableModel
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.models.ReaderPost
@@ -15,18 +17,66 @@ import javax.inject.Inject
  *
  * AnalyticsUtils interface is consisted of static methods, which make the client code difficult to test/mock.
  * Main purpose of this wrapper is to make testing easier.
- *
  */
 @Reusable
-class AnalyticsUtilsWrapper @Inject constructor(private val appContext: Context) {
-    fun getMediaProperties(isVideo: Boolean, mediaURI: UriWrapper?, path: String?): MutableMap<String, Any?> =
-            AnalyticsUtils.getMediaProperties(appContext, isVideo, mediaURI?.uri, path)
+@SuppressWarnings("TooManyFunctions")
+class AnalyticsUtilsWrapper @Inject constructor(
+    private val appContext: Context
+) {
+    fun getMediaProperties(
+        isVideo: Boolean,
+        mediaURI: UriWrapper?,
+        path: String?
+    ): MutableMap<String, Any?> = AnalyticsUtils.getMediaProperties(appContext, isVideo, mediaURI?.uri, path)
+
+    fun trackEditorCreatedPost(
+        action: String?,
+        intent: Intent,
+        site: SiteModel,
+        post: PostImmutableModel?
+    ) = AnalyticsUtils.trackEditorCreatedPost(action, intent, site, post)
+
+    fun trackInviteLinksAction(
+        stat: AnalyticsTracker.Stat,
+        site: SiteModel?,
+        properties: Map<String, Any?>?
+    ) = AnalyticsUtils.trackInviteLinksAction(stat, site, properties)
+
+    fun trackUserProfileShown(source: String) = AnalyticsUtils.trackUserProfileShown(source)
+
+    fun trackUserProfileSiteShown() = AnalyticsUtils.trackUserProfileSiteShown()
+
+    fun trackBlogPreviewedByUrl(source: String) = AnalyticsUtils.trackBlogPreviewedByUrl(source)
+
+    fun trackLikeListOpened(source: String, listType: String) = AnalyticsUtils.trackLikeListOpened(source, listType)
+
+    /* READER */
+
+    fun trackWithReaderPostDetails(
+        stat: AnalyticsTracker.Stat,
+        post: ReaderPost?,
+        properties: Map<String, Any?>
+    ) = AnalyticsUtils.trackWithReaderPostDetails(stat, post, properties)
+
+    fun trackFollowCommentsWithReaderPostDetails(
+        stat: AnalyticsTracker.Stat,
+        blogId: Long,
+        postId: Long,
+        post: ReaderPost?,
+        properties: Map<String, Any?>
+    ) = AnalyticsUtils.trackFollowCommentsWithReaderPostDetails(stat, blogId, postId, post, properties)
 
-    fun trackEditorCreatedPost(action: String?, intent: Intent, site: SiteModel, post: PostImmutableModel?) =
-            AnalyticsUtils.trackEditorCreatedPost(action, intent, site, post)
+    fun trackWithDeepLinkData(
+        stat: AnalyticsTracker.Stat,
+        action: String,
+        host: String,
+        data: Uri?
+    ) = AnalyticsUtils.trackWithDeepLinkData(stat, action, host, data)
 
-    fun trackWithSiteId(stat: AnalyticsTracker.Stat, blogId: Long) = AnalyticsUtils.trackWithSiteId(stat, blogId)
+    fun trackRailcarRender(
+        railcarJson: String
+    ) = AnalyticsUtils.trackRailcarRender(railcarJson)
 
-    fun trackWithReaderPostDetails(stat: AnalyticsTracker.Stat, post: ReaderPost) =
-            AnalyticsUtils.trackWithReaderPostDetails(stat, post)
+    fun trackWithBlogPostDetails(stat: Stat, blogId: Long, postId: Long) =
+            AnalyticsUtils.trackWithBlogPostDetails(stat, blogId, postId)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/ScanTracker.kt b/WordPress/src/main/java/org/wordpress/android/util/analytics/ScanTracker.kt
new file mode 100644
index 000000000000..daf0a974b12a
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/ScanTracker.kt
@@ -0,0 +1,108 @@
+package org.wordpress.android.util.analytics
+
+import dagger.Reusable
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+@Reusable
+class ScanTracker @Inject constructor(
+    private val scanStore: ScanStore,
+    private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
+) {
+    fun trackOnGetFreeEstimateButtonClicked() {
+        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_THREAT_CODEABLE_ESTIMATE_TAPPED)
+    }
+
+    fun trackOnScanHistoryTabSelected(tab: ScanHistoryViewModel.ScanHistoryTabType) {
+        val props = mapOf(
+                "filter" to when (tab) {
+                    ScanHistoryViewModel.ScanHistoryTabType.ALL -> ""
+                    ScanHistoryViewModel.ScanHistoryTabType.FIXED -> "fixed"
+                    ScanHistoryViewModel.ScanHistoryTabType.IGNORED -> "ignored"
+                }
+        )
+        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_HISTORY_FILTER, props)
+    }
+
+    suspend fun trackOnThreatItemClicked(threatId: Long, source: OnThreatItemClickSource) {
+        withContext(bgDispatcher) {
+            scanStore.getThreatModelByThreatId(threatId)?.let {
+                val props = mapOf(
+                        "section" to source.section,
+                        "threat_signature" to it.baseThreatModel.signature
+                )
+                analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_THREAT_LIST_ITEM_TAPPED, props)
+            }
+        }
+    }
+
+    fun trackOnScanButtonClicked() {
+        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_RUN_TAPPED)
+    }
+
+    fun trackOnIgnoreThreatButtonClicked(signature: String) {
+        analyticsTrackerWrapper.track(
+                AnalyticsTracker.Stat.JETPACK_SCAN_IGNORE_THREAT_DIALOG_OPEN,
+                mapOf("threat_signature" to signature)
+        )
+    }
+
+    fun trackOnIgnoreThreatConfirmed(signature: String) {
+        analyticsTrackerWrapper.track(
+                AnalyticsTracker.Stat.JETPACK_SCAN_THREAT_IGNORE_TAPPED,
+                mapOf("threat_signature" to signature)
+        )
+    }
+
+    fun trackOnFixThreatButtonClicked(signature: String) {
+        analyticsTrackerWrapper.track(
+                AnalyticsTracker.Stat.JETPACK_SCAN_FIX_THREAT_DIALOG_OPEN,
+                mapOf("threat_signature" to signature)
+        )
+    }
+
+    fun trackOnFixThreatConfirmed(signature: String) {
+        analyticsTrackerWrapper.track(
+                AnalyticsTracker.Stat.JETPACK_SCAN_THREAT_FIX_TAPPED,
+                mapOf("threat_signature" to signature)
+        )
+    }
+
+    fun trackOnFixAllThreatsButtonClicked() {
+        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_ALL_THREATS_OPEN)
+    }
+
+    fun trackOnFixAllThreatsConfirmed() {
+        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_ALL_THREATS_FIX_TAPPED)
+    }
+
+    fun trackOnError(action: ErrorAction, cause: ErrorCause) {
+        val props = mapOf("action" to action.value, "cause" to cause.value)
+        analyticsTrackerWrapper.track(AnalyticsTracker.Stat.JETPACK_SCAN_ERROR, props)
+    }
+
+    enum class OnThreatItemClickSource(val section: String) {
+        HISTORY("history"), SCANNER("scanner")
+    }
+
+    enum class ErrorAction(val value: String) {
+        FIX_ALL("fix_all"),
+        FIX("fix"),
+        SCAN("scan"),
+        IGNORE("ignore"),
+        FETCH_SCAN_STATE("fetch_scan_state"),
+        FETCH_FIX_THREAT_STATUS("fetch_fix_threat_status"),
+        FETCH_SCAN_HISTORY("fetch_scan_history")
+    }
+
+    enum class ErrorCause(val value: String) {
+        OFFLINE("offline"), REMOTE("remote"), ALL_THREATS_NOT_FIXED("all_threats_not_fixed"), OTHER("other")
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java
index 940bdff5a12e..3f4c4c0e4171 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java
+++ b/WordPress/src/main/java/org/wordpress/android/util/analytics/service/InstallationReferrerServiceLogic.java
@@ -104,6 +104,12 @@ public void onInstallReferrerSetupFinished(int responseCode) {
                         // if this is retried but the error persists
                         AppLog.i(T.UTILS, "installation referrer: service unavailable");
                         break;
+                    case InstallReferrerResponse.PERMISSION_ERROR:
+                        // Fix for this issue https://github.com/wordpress-mobile/WordPress-Android/issues/10532 was
+                        // added to Referrer Service library, and currently instead of crashing we should get this
+                        // response. For now we will ignore it and log for informational purposes.
+                        AppLog.i(T.UTILS, "installation referrer: app is not allowed to bind to the Service");
+                        break;
                     case InstallReferrerResponse.DEVELOPER_ERROR:
                         break;
                     case InstallReferrerResponse.SERVICE_DISCONNECTED:
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/AnyFileUploadFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/AnyFileUploadFeatureConfig.kt
deleted file mode 100644
index 0077e24c5d6f..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/AnyFileUploadFeatureConfig.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.Feature
-import org.wordpress.android.util.config.AnyFileUploadFeatureConfig.Companion.ANY_FILE_UPLOAD_REMOTE_FIELD
-import javax.inject.Inject
-
-@Feature(ANY_FILE_UPLOAD_REMOTE_FIELD)
-class AnyFileUploadFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(
-        appConfig,
-        BuildConfig.ANY_FILE_UPLOAD,
-        ANY_FILE_UPLOAD_REMOTE_FIELD
-) {
-    companion object {
-        const val ANY_FILE_UPLOAD_REMOTE_FIELD = "any_file_upload_enabled"
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/AppConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/AppConfig.kt
index 21bbe7ad955c..ebe04f17f2cb 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/AppConfig.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/AppConfig.kt
@@ -1,7 +1,10 @@
 package org.wordpress.android.util.config
 
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.FEATURE_FLAG_VALUE
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.AppConfig.FeatureState.BuildConfigValue
+import org.wordpress.android.util.config.AppConfig.FeatureState.ManuallyOverriden
 import org.wordpress.android.util.config.ExperimentConfig.Variant
 import org.wordpress.android.util.config.manual.ManualFeatureConfig
 import javax.inject.Inject
@@ -18,16 +21,22 @@ class AppConfig
      * We need to keep the value of an already loaded feature flag to make sure the value is not changed while using the app.
      * We should only reload the flags when the application is created.
      */
-    private val enabledFeatures = mutableMapOf<String, Boolean>()
     private val experimentValues = mutableMapOf<String, String>()
     private val remoteConfigCheck = RemoteConfigCheck(this)
 
     /**
-     * This method initialized the config and triggers refresh of remote configuration.
+     * This method initialized the config
+     */
+    fun init() {
+        remoteConfig.init()
+        remoteConfigCheck.checkRemoteFields()
+    }
+
+    /**
+     * This method triggers refresh of remote configuration.
      */
     fun refresh() {
         remoteConfig.refresh()
-        remoteConfigCheck.checkRemoteFields()
     }
 
     /**
@@ -37,17 +46,39 @@ class AppConfig
      * @param feature feature which we're checking remotely
      */
     fun isEnabled(feature: FeatureConfig): Boolean {
-        if (manualFeatureConfig.hasManualSetup(feature)) {
-            return manualFeatureConfig.isManuallyEnabled(feature)
-        }
-        if (feature.remoteField == null) {
-            return feature.buildConfigValue
+        return featureState(feature).isEnabled
+    }
+
+    /**
+     * Get the enabled flag and the source where it came from.
+     * @param feature feature we're checking remotely
+     */
+    fun featureState(feature: FeatureConfig): FeatureState {
+        return buildFeatureState(feature).also { state ->
+            feature.remoteField?.let {
+                analyticsTracker.track(
+                        FEATURE_FLAG_VALUE,
+                        feature.remoteField,
+                        state
+                )
+            }
         }
-        return enabledFeatures.getOrPut(feature.remoteField) {
-            val loadedValue = feature.buildConfigValue || remoteConfig.isEnabled(feature.remoteField)
-            enabledFeatures[feature.remoteField] = loadedValue
-            analyticsTracker.track(Stat.FEATURE_FLAG_SET, mapOf(feature.remoteField to loadedValue))
-            loadedValue
+    }
+
+    private fun buildFeatureState(feature: FeatureConfig): FeatureState {
+        return when {
+            manualFeatureConfig.hasManualSetup(feature) -> {
+                ManuallyOverriden(manualFeatureConfig.isManuallyEnabled(feature))
+            }
+            feature.remoteField == null -> {
+                BuildConfigValue(feature.buildConfigValue)
+            }
+            feature.buildConfigValue -> {
+                BuildConfigValue(feature.buildConfigValue)
+            }
+            else -> {
+                remoteConfig.getFeatureState(feature.remoteField)
+            }
         }
     }
 
@@ -67,4 +98,12 @@ class AppConfig
         return experiment.variants.find { it.value == value }
                 ?: throw IllegalArgumentException("Remote variant does not match local value: $value")
     }
+
+    sealed class FeatureState(open val isEnabled: Boolean, val name: String) {
+        data class ManuallyOverriden(override val isEnabled: Boolean) : FeatureState(isEnabled, "manually_overriden")
+        data class BuildConfigValue(override val isEnabled: Boolean) : FeatureState(isEnabled, "build_config_value")
+        data class RemoteValue(override val isEnabled: Boolean) : FeatureState(isEnabled, "remote_source_value")
+        data class StaticValue(override val isEnabled: Boolean) : FeatureState(isEnabled, "static_source_value")
+        data class DefaultValue(override val isEnabled: Boolean) : FeatureState(isEnabled, "default_source_value")
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/ConsolidatedMediaPickerFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/ConsolidatedMediaPickerFeatureConfig.kt
deleted file mode 100644
index 72b19eac6453..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/ConsolidatedMediaPickerFeatureConfig.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
-import javax.inject.Inject
-
-/**
- * Configuration of the Consolidated media picker
- */
-@FeatureInDevelopment
-class ConsolidatedMediaPickerFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(
-        appConfig,
-        BuildConfig.CONSOLIDATED_MEDIA_PICKER
-)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/WPStoriesFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/ContactInfoBlockFeatureConfig.kt
similarity index 75%
rename from WordPress/src/main/java/org/wordpress/android/util/config/WPStoriesFeatureConfig.kt
rename to WordPress/src/main/java/org/wordpress/android/util/config/ContactInfoBlockFeatureConfig.kt
index 8c32bebc5e1c..c508dc9dd744 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/WPStoriesFeatureConfig.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/ContactInfoBlockFeatureConfig.kt
@@ -5,5 +5,5 @@ import org.wordpress.android.annotation.FeatureInDevelopment
 import javax.inject.Inject
 
 @FeatureInDevelopment
-class WPStoriesFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.WP_STORIES_AVAILABLE)
+class ContactInfoBlockFeatureConfig
+@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.CONTACT_INFO_BLOCK_AVAILABLE)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/ExampleRemoteFeature.kt b/WordPress/src/main/java/org/wordpress/android/util/config/ExampleRemoteFeature.kt
index a3986d76c008..6ca82f3e536c 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/ExampleRemoteFeature.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/ExampleRemoteFeature.kt
@@ -1,6 +1,5 @@
 package org.wordpress.android.util.config
 
-import org.wordpress.android.BuildConfig
 import org.wordpress.android.annotation.Feature
 import org.wordpress.android.util.config.ExampleRemoteFeature.Companion.EXAMPLE_REMOTE_FEATURE_FIELD
 import javax.inject.Inject
@@ -13,7 +12,7 @@ import javax.inject.Inject
 class ExampleRemoteFeature
 @Inject constructor(appConfig: AppConfig) : FeatureConfig(
         appConfig,
-        BuildConfig.TENOR_AVAILABLE,
+        false,
         EXAMPLE_REMOTE_FEATURE_FIELD
 ) {
     companion object {
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/FeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/FeatureConfig.kt
index 32072a98baa9..9ecc5af9bfea 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/FeatureConfig.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/FeatureConfig.kt
@@ -14,7 +14,10 @@ open class FeatureConfig(
     val buildConfigValue: Boolean,
     val remoteField: String? = null
 ) {
-    fun isEnabled(): Boolean {
+    open fun isEnabled(): Boolean {
         return appConfig.isEnabled(this)
     }
+    open fun name() = remoteField ?: this.javaClass.name
+
+    fun featureState() = appConfig.featureState(this)
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/GutenbergMentionsFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/GutenbergMentionsFeatureConfig.kt
deleted file mode 100644
index a2181c2b49c5..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/GutenbergMentionsFeatureConfig.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
-import javax.inject.Inject
-
-@FeatureInDevelopment
-class GutenbergMentionsFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.GUTENBERG_MENTIONS)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/HomePagePickerFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/HomePagePickerFeatureConfig.kt
deleted file mode 100644
index 0933d10a0b6a..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/HomePagePickerFeatureConfig.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
-import javax.inject.Inject
-
-/**
- * Configuration of the Home Page Picker feature
- */
-@FeatureInDevelopment
-class HomePagePickerFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.HOME_PAGE_PICKER)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/LikesEnhancementsFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/LikesEnhancementsFeatureConfig.kt
new file mode 100644
index 000000000000..7973184b43b9
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/LikesEnhancementsFeatureConfig.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.BuildConfig
+import org.wordpress.android.annotation.Feature
+import org.wordpress.android.util.config.LikesEnhancementsFeatureConfig.Companion.LIKES_ENHANCEMENTS_REMOTE_FIELD
+import javax.inject.Inject
+
+/**
+ * Configuration of the Likes Enhancements feature
+ */
+@Feature(LIKES_ENHANCEMENTS_REMOTE_FIELD, true)
+class LikesEnhancementsFeatureConfig
+@Inject constructor(appConfig: AppConfig) : FeatureConfig(
+        appConfig,
+        BuildConfig.LIKES_ENHANCEMENTS,
+        LIKES_ENHANCEMENTS_REMOTE_FIELD
+) {
+    companion object {
+        const val LIKES_ENHANCEMENTS_REMOTE_FIELD = "likes_enhancements_enabled"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt
deleted file mode 100644
index 43e14bf1cf74..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/ModalLayoutPickerFeatureConfig.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.FeatureInDevelopment
-import javax.inject.Inject
-
-/**
- * Configuration of the Modal Layout Picker (MLP) feature
- */
-@FeatureInDevelopment
-class ModalLayoutPickerFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(appConfig, BuildConfig.MODAL_LAYOUT_PICKER)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/ActivityLogFiltersFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/MySiteImprovementsFeatureConfig.kt
similarity index 52%
rename from WordPress/src/main/java/org/wordpress/android/util/config/ActivityLogFiltersFeatureConfig.kt
rename to WordPress/src/main/java/org/wordpress/android/util/config/MySiteImprovementsFeatureConfig.kt
index 33bd8fe19a9d..0b705c9a7080 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/ActivityLogFiltersFeatureConfig.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/MySiteImprovementsFeatureConfig.kt
@@ -5,11 +5,13 @@ import org.wordpress.android.annotation.FeatureInDevelopment
 import javax.inject.Inject
 
 /**
- * Configuration of the Activity Log Filters feature.
+ * Configuration of the my site infrastructure improvements
  */
 @FeatureInDevelopment
-class ActivityLogFiltersFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(
+class MySiteImprovementsFeatureConfig
+@Inject constructor(
+    appConfig: AppConfig
+) : FeatureConfig(
         appConfig,
-        BuildConfig.ACTIVITY_LOG_FILTERS
+        BuildConfig.MY_SITE_IMPROVEMENTS
 )
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfig.kt
index 9cef58a8f8c4..ee69180a0411 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfig.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/RemoteConfig.kt
@@ -2,10 +2,16 @@ package org.wordpress.android.util.config
 
 import com.google.android.gms.tasks.Task
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig.VALUE_SOURCE_DEFAULT
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig.VALUE_SOURCE_REMOTE
+import com.google.firebase.remoteconfig.FirebaseRemoteConfig.VALUE_SOURCE_STATIC
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings.Builder
 import org.wordpress.android.BuildConfig
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.UTILS
+import org.wordpress.android.util.config.AppConfig.FeatureState
 import javax.inject.Inject
 
 /**
@@ -13,29 +19,57 @@ import javax.inject.Inject
  */
 class RemoteConfig
 @Inject constructor() {
-    fun refresh() {
+    fun init() {
         val firebaseRemoteConfig = FirebaseRemoteConfig.getInstance()
         val configSettings = Builder()
                 .setMinimumFetchIntervalInSeconds(BuildConfig.REMOTE_CONFIG_FETCH_INTERVAL)
                 .build()
         firebaseRemoteConfig.setConfigSettingsAsync(configSettings)
         firebaseRemoteConfig.setDefaultsAsync(RemoteConfigDefaults.remoteConfigDefaults)
-        firebaseRemoteConfig.fetchAndActivate()
-                .addOnCompleteListener { task: Task<Boolean?> ->
-                    if (task.isSuccessful) {
-                        AppLog.d(
-                                UTILS,
-                                "Remote config updated: ${task.result}"
-                        )
-                    } else {
-                        AppLog.e(
-                                UTILS,
-                                "Remote config fetch failed"
-                        )
-                    }
+        firebaseRemoteConfig.activate().addOnCompleteListener { task ->
+            onComplete(task, "activate")
+        }
+        firebaseRemoteConfig.fetchAndActivate().addOnCompleteListener { task ->
+            onComplete(task, "fetchAndActivate")
+        }
+    }
+
+    fun refresh() {
+        val firebaseRemoteConfig = FirebaseRemoteConfig.getInstance()
+        firebaseRemoteConfig.fetch()
+                .addOnCompleteListener { task ->
+                    onComplete(task, "fetch")
                 }
     }
 
+    private fun onComplete(task: Task<*>, functionName: String) {
+        if (task.isSuccessful) {
+            val configValues = FirebaseRemoteConfig.getInstance().all.mapValues { it.value.asString() }
+            AnalyticsTracker.track(
+                    Stat.FEATURE_FLAGS_SYNCED_STATE,
+                    configValues + mapOf("function_name" to functionName)
+            )
+            AppLog.d(
+                    UTILS,
+                    "Remote config $functionName: ${task.result}"
+            )
+        } else {
+            AppLog.e(
+                    UTILS,
+                    "Remote config $functionName failed"
+            )
+        }
+    }
+
     fun isEnabled(field: String): Boolean = FirebaseRemoteConfig.getInstance().getBoolean(field)
     fun getString(field: String): String = FirebaseRemoteConfig.getInstance().getString(field)
+    fun getFeatureState(remoteField: String): FeatureState {
+        val value = FirebaseRemoteConfig.getInstance().getValue(remoteField)
+        return when (value.source) {
+            VALUE_SOURCE_DEFAULT -> FeatureState.DefaultValue(value.asBoolean())
+            VALUE_SOURCE_REMOTE -> FeatureState.RemoteValue(value.asBoolean())
+            VALUE_SOURCE_STATIC -> FeatureState.StaticValue(value.asBoolean())
+            else -> FeatureState.StaticValue(value.asBoolean())
+        }
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/SeenUnseenWithCounterFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/SeenUnseenWithCounterFeatureConfig.kt
new file mode 100644
index 000000000000..d967fc998f3f
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/SeenUnseenWithCounterFeatureConfig.kt
@@ -0,0 +1,21 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.BuildConfig.SEEN_UNSEEN_WITH_COUNTER
+import org.wordpress.android.annotation.Feature
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig.Companion.SEEN_UNSEEN_WITH_COUNTER_REMOTE_FIELD
+import javax.inject.Inject
+
+/**
+ * Configuration of the Unread Posts Count and Seen Status Toggle
+ */
+@Feature(SEEN_UNSEEN_WITH_COUNTER_REMOTE_FIELD, true)
+class SeenUnseenWithCounterFeatureConfig
+@Inject constructor(appConfig: AppConfig) : FeatureConfig(
+        appConfig,
+        SEEN_UNSEEN_WITH_COUNTER,
+        SEEN_UNSEEN_WITH_COUNTER_REMOTE_FIELD
+) {
+    companion object {
+        const val SEEN_UNSEEN_WITH_COUNTER_REMOTE_FIELD = "seen_unseen_with_counter"
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/TenorFeatureConfig.kt b/WordPress/src/main/java/org/wordpress/android/util/config/TenorFeatureConfig.kt
deleted file mode 100644
index d27a35712f08..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/config/TenorFeatureConfig.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.wordpress.android.util.config
-
-import org.wordpress.android.BuildConfig
-import org.wordpress.android.annotation.Feature
-import org.wordpress.android.util.config.TenorFeatureConfig.Companion.TENOR_REMOTE_FIELD
-import javax.inject.Inject
-
-/**
- * Configuration of the Tenor gif selection.
- */
-@Feature(TENOR_REMOTE_FIELD)
-class TenorFeatureConfig
-@Inject constructor(appConfig: AppConfig) : FeatureConfig(
-        appConfig,
-        BuildConfig.TENOR_AVAILABLE,
-        TENOR_REMOTE_FIELD
-) {
-    companion object {
-        const val TENOR_REMOTE_FIELD = "tenor_enabled"
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigActivity.kt b/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigActivity.kt
index b477b18c6a64..e5c4d2764489 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigActivity.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigActivity.kt
@@ -2,20 +2,13 @@ package org.wordpress.android.util.config.manual
 
 import android.os.Bundle
 import android.view.MenuItem
-import kotlinx.android.synthetic.main.manual_feature_config_fragment.*
-import org.wordpress.android.R
+import org.wordpress.android.databinding.ManualFeatureConfigActivityBinding
 import org.wordpress.android.ui.LocaleAwareActivity
 
 class ManualFeatureConfigActivity : LocaleAwareActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.manual_feature_config_activity)
-
-        setSupportActionBar(toolbar)
-        supportActionBar?.let {
-            it.setHomeButtonEnabled(true)
-            it.setDisplayHomeAsUpEnabled(true)
-        }
+        setContentView(ManualFeatureConfigActivityBinding.inflate(layoutInflater).root)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigFragment.kt b/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigFragment.kt
index 796e134e6990..19236f69081e 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/config/manual/ManualFeatureConfigFragment.kt
@@ -1,59 +1,59 @@
 package org.wordpress.android.util.config.manual
 
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
-import androidx.lifecycle.Observer
+import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModelProvider
-import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import dagger.android.support.DaggerFragment
-import kotlinx.android.synthetic.main.manual_feature_config_fragment.*
 import org.wordpress.android.R
+import org.wordpress.android.databinding.ManualFeatureConfigFragmentBinding
 import org.wordpress.android.util.DisplayUtils
+import org.wordpress.android.viewmodel.observeEvent
 import org.wordpress.android.widgets.RecyclerItemDecoration
 import javax.inject.Inject
 import kotlin.system.exitProcess
 
-class ManualFeatureConfigFragment : DaggerFragment() {
+class ManualFeatureConfigFragment : DaggerFragment(R.layout.manual_feature_config_fragment) {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     private lateinit var viewModel: ManualFeatureConfigViewModel
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.manual_feature_config_fragment, container, false)
-    }
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        with(ManualFeatureConfigFragmentBinding.bind(view)) {
+            with(requireActivity() as AppCompatActivity) {
+                setSupportActionBar(toolbar)
+                supportActionBar?.let {
+                    it.setHomeButtonEnabled(true)
+                    it.setDisplayHomeAsUpEnabled(true)
+                }
+            }
+            recyclerView.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
+            recyclerView.addItemDecoration(RecyclerItemDecoration(0, DisplayUtils.dpToPx(activity, 1)))
 
-        recycler_view.layoutManager = LinearLayoutManager(activity, RecyclerView.VERTICAL, false)
-        recycler_view.addItemDecoration(RecyclerItemDecoration(0, DisplayUtils.dpToPx(activity, 1)))
+            viewModel = ViewModelProvider(this@ManualFeatureConfigFragment, viewModelFactory)
+                    .get(ManualFeatureConfigViewModel::class.java)
+            viewModel.uiState.observe(viewLifecycleOwner, {
+                it?.let { uiState ->
+                    val adapter: FeatureAdapter
+                    if (recyclerView.adapter == null) {
+                        adapter = FeatureAdapter()
+                        recyclerView.adapter = adapter
+                    } else {
+                        adapter = recyclerView.adapter as FeatureAdapter
+                    }
 
-        viewModel = ViewModelProviders.of(this, viewModelFactory)
-                .get(ManualFeatureConfigViewModel::class.java)
-        viewModel.uiState.observe(viewLifecycleOwner, Observer {
-            it?.let { uiState ->
-                val adapter: FeatureAdapter
-                if (recycler_view.adapter == null) {
-                    adapter = FeatureAdapter()
-                    recycler_view.adapter = adapter
-                } else {
-                    adapter = recycler_view.adapter as FeatureAdapter
+                    val layoutManager = recyclerView.layoutManager
+                    val recyclerViewState = layoutManager?.onSaveInstanceState()
+                    adapter.update(uiState.uiItems)
+                    layoutManager?.onRestoreInstanceState(recyclerViewState)
                 }
-
-                val layoutManager = recycler_view?.layoutManager
-                val recyclerViewState = layoutManager?.onSaveInstanceState()
-                adapter.update(uiState.uiItems)
-                layoutManager?.onRestoreInstanceState(recyclerViewState)
-            }
-        })
-        viewModel.restartAction.observe(viewLifecycleOwner, Observer {
-            it?.applyIfNotHandled {
+            })
+            viewModel.restartAction.observeEvent(viewLifecycleOwner, {
                 exitProcess(0)
-            }
-        })
-        viewModel.start()
+            })
+            viewModel.start()
+        }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedLogReader.kt b/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedLogReader.kt
deleted file mode 100644
index f518b09bc4b8..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedLogReader.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.wordpress.android.util.encryptedlogging
-
-import android.util.Base64
-import android.util.Base64.DEFAULT
-
-import com.goterl.lazycode.lazysodium.interfaces.SecretStream
-import com.goterl.lazycode.lazysodium.utils.KeyPair
-import org.json.JSONObject
-import java.io.File
-
-/**
- * EncryptedStream represents the encrypted stream once the key has been decrypted. It exists to separate
- *  the key decryption from the stream decryption while decoding.
- *
- * @param key An unencrypted SecretStreamKey used to decrypt the remainder of the log.
- * @param header A `ByteArray` representing the stream header – it's used to initialize the decryption stream.
- * @param messages A `List<ByteArray>` of encrypted messages
- */
-class EncryptedStream(val key: SecretStreamKey, val header: ByteArray, val messages: List<ByteArray>)
-
-private const val JSON_KEYED_WITH_KEY = "keyedWith"
-private const val JSON_UUID_KEY = "uuid"
-private const val JSON_HEADER_KEY = "header"
-private const val JSON_ENCRYPTED_KEY_KEY = "encryptedKey"
-private const val JSON_MESSAGES_KEY = "messages"
-
-/**
- * EncryptedLogReader allows decrypting encrypted log files.
- *
- * This implementation isn't particularly efficient – it loads the entire file into memory to decrypt it. Given
- * that it's currently only used for tests, this isn't a problem, but if it were to be used in production, it'd likely
- * make sense to implement a streaming JSON parser for this purpose.
- *
- * @param file The encrypted log file to read.
- * @param keyPair The public and secret key pair associated with this file. Both are required to decrypt the file.
- */
-class EncryptedLogReader(file: File, keyPair: KeyPair) {
-    private val sodium = EncryptionUtils.sodium
-    private val state = SecretStream.State.ByReference()
-    private val encryptedStream: EncryptedStream
-
-    /**
-     * The Encrypted Log File's UUID
-     */
-    val uuid: String
-
-    init {
-        val json = JSONObject(file.readText())
-
-        require(json.getString(JSON_KEYED_WITH_KEY) == "v1") {
-            "This class can only parse files keyedWith the v1 implementation"
-        }
-
-        this.uuid = json.getString(JSON_UUID_KEY)
-        val header = json.getString(JSON_HEADER_KEY).base64Decode()
-        val encryptedKey = EncryptedSecretStreamKey(json.getString(JSON_ENCRYPTED_KEY_KEY).base64Decode())
-        val messagesJson = json.getJSONArray(JSON_MESSAGES_KEY)
-
-        val messages = (0 until messagesJson.length()).map { messagesJson.getString(it).base64Decode() }
-
-        this.encryptedStream = EncryptedStream(encryptedKey.decrypt(keyPair), header, messages)
-        check(sodium.cryptoSecretStreamInitPull(state, encryptedStream.header, encryptedStream.key.bytes))
-    }
-
-    /**
-     * Decrypts and returns the log file as a String.
-     */
-    fun decrypt(): String {
-        return encryptedStream.messages.fold("") { accumulated: String, cipherBytes: ByteArray -> String
-            val plainBytes = ByteArray(cipherBytes.size - SecretStream.ABYTES)
-
-            val tag = ByteArray(1) // Stores the extracted tag. This implementation doesn't do anything with it.
-            check(sodium.cryptoSecretStreamPull(state, plainBytes, tag, cipherBytes, cipherBytes.size.toLong()))
-
-            accumulated + String(plainBytes)
-        }
-    }
-}
-
-// On Android base64 has lots of options, so define an extension to make it easier to avoid decoding issues.
-private fun String.base64Decode(): ByteArray {
-    return Base64.decode(this, DEFAULT)
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedLogWriter.kt b/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedLogWriter.kt
deleted file mode 100644
index 80addb92f604..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedLogWriter.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.wordpress.android.util.encryptedlogging
-
-import android.util.Base64
-import com.goterl.lazycode.lazysodium.interfaces.SecretStream
-import com.goterl.lazycode.lazysodium.utils.Key
-import java.io.File
-import java.io.FileWriter
-import java.util.UUID
-
-/**
- * EncryptedLogWriter creates encrypted logs.
- **
- * @param file A file object representing the log file destination.
- * @param publicKey The public key used to encrypt the log.
- * @param uuid (Optional) The UUID string associated with the encrypted log. If one is not provided, it is generated for you.
- * @constructor Creates the `EncryptedLogWriter`. Call `write` to append data, and `close` when to write out the postamble.
- *
- */
-class EncryptedLogWriter(
-    val file: File,
-    publicKey: Key,
-    private val uuid: String = UUID.randomUUID().toString()
-) {
-    private val fileWriter: FileWriter = FileWriter(file)
-    private val sodium = EncryptionUtils.sodium
-    private val state = SecretStream.State.ByReference()
-
-    init {
-        val header = ByteArray(SecretStream.HEADERBYTES)
-        val key = SecretStreamKey.generate()
-        check(sodium.cryptoSecretStreamInitPush(state, header, key.bytes))
-        writeHeader(key.encrypt(publicKey), header)
-    }
-
-    /**
-     * Encrypt and write the provided string to the encrypted log file.
-     * @param string: The string to be written to the file.
-     */
-    fun write(string: String) {
-        val encryptedString = encryptMessage(string, SecretStream.TAG_MESSAGE)
-        fileWriter.write("\t\t\"$encryptedString\",\n")
-    }
-
-    /**
-     * Add the closing file tag, and ensure that all buffers are flushed to disk.
-     */
-    fun close() {
-        val encryptedClosingTag = encryptMessage("", SecretStream.TAG_FINAL)
-        fileWriter.write("\t\t\"$encryptedClosingTag\"\n")
-        fileWriter.write("\t]\n")
-        fileWriter.write("}")
-        fileWriter.flush()
-    }
-
-    /**
-     * An internal convenience function to push more data into the sodium secret stream.
-     */
-    private fun encryptMessage(string: String, tag: Byte): String {
-        val plainBytes = string.toByteArray()
-
-        val encryptedBytes = ByteArray(SecretStream.ABYTES + plainBytes.size) // Stores the encrypted bytes
-        check(sodium.cryptoSecretStreamPush(this.state, encryptedBytes, plainBytes, plainBytes.size.toLong(), tag)) {
-            "Unable to encrypt message: $string"
-        }
-
-        return base64Encode(encryptedBytes)
-    }
-
-    /**
-     * An internal convenience function to extract the header writing process.
-     */
-    private fun writeHeader(key: EncryptedSecretStreamKey, header: ByteArray) {
-        require(SecretStream.Checker.headerCheck(header.size)) {
-            "The secret stream header must be the correct length"
-        }
-
-        val encodedEncryptedKey = base64Encode(key.bytes)
-        check(encodedEncryptedKey.length == 108) {
-            "The encoded, encrypted key must always be 108 bytes long"
-        }
-
-        val encodedHeader = base64Encode(header)
-        check(encodedHeader.length == 32) {
-            "The encoded header must always be 32 bytes long"
-        }
-
-        fileWriter.write("{")
-        fileWriter.write("\t\"keyedWith\": \"v1\",\n")
-        fileWriter.write("\t\"encryptedKey\": \"$encodedEncryptedKey\",\n")
-        fileWriter.write("\t\"header\": \"$encodedHeader\",\n")
-        fileWriter.write("\t\"uuid\": \"$uuid\",\n")
-        fileWriter.write("\t\"messages\": [\n")
-    }
-}
-
-// On Android base64 has lots of options, so define a helper to make it easier to
-// avoid encoding issues.
-private fun base64Encode(byteArray: ByteArray): String {
-    return Base64.encodeToString(byteArray, Base64.NO_WRAP)
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedSecretStreamKey.kt b/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedSecretStreamKey.kt
deleted file mode 100644
index cff5d52d5dc0..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptedSecretStreamKey.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.wordpress.android.util.encryptedlogging
-
-import com.goterl.lazycode.lazysodium.interfaces.Box
-import com.goterl.lazycode.lazysodium.interfaces.SecretStream
-import com.goterl.lazycode.lazysodium.utils.KeyPair
-
-/**
- * A class representing an Encrypted Secret Stream Key.
- *
- * It can be decrypted to provide an SecretStreamKey, which is used to
- * decrypted the messages within an Encrypted Log File
- *
- * @see SecretStreamKey
- */
-class EncryptedSecretStreamKey(val bytes: ByteArray) {
-    companion object {
-        /**
-         * The expected size (in bytes) of an Encrypted Secret Stream Key.
-         */
-        const val size: Int = SecretStream.KEYBYTES + Box.SEALBYTES
-    }
-
-    init {
-        require(bytes.size == size) {
-            "An Encrypted Secret Stream Key must be exactly $size bytes"
-        }
-    }
-
-    /**
-     * Decrypt the key using the assocaited KeyPair (the `publicKey` originally used to encrypt it, and its
-     * corresponding `secretKey`).
-     */
-    fun decrypt(keyPair: KeyPair): SecretStreamKey {
-        val sodium = EncryptionUtils.sodium
-
-        val publicKeyBytes = keyPair.publicKey.asBytes
-        val secretKeyBytes = keyPair.secretKey.asBytes
-
-        require(Box.Checker.checkPublicKey(publicKeyBytes.size)) {
-            "The public key size is incorrect (should be ${Box.PUBLICKEYBYTES} bytes)"
-        }
-
-        require(Box.Checker.checkSecretKey(secretKeyBytes.size)) {
-            "The secret key size is incorrect (should be ${Box.SECRETKEYBYTES} bytes)"
-        }
-
-        val decryptedBytes = ByteArray(SecretStream.KEYBYTES) // Stores the decrypted bytes
-        check(sodium.cryptoBoxSealOpen(decryptedBytes, bytes, bytes.size.toLong(), publicKeyBytes, secretKeyBytes)) {
-            "The message key couldn't be decrypted – it's likely the wrong key pair is being used for decryption"
-        }
-
-        return SecretStreamKey(decryptedBytes)
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptionUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptionUtils.kt
deleted file mode 100644
index a86b6379b18e..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/EncryptionUtils.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.wordpress.android.util.encryptedlogging
-
-import com.goterl.lazycode.lazysodium.LazySodiumAndroid
-import com.goterl.lazycode.lazysodium.SodiumAndroid
-
-/**
- * Convenience helpers for Encrypted Logging
- */
-class EncryptionUtils {
-    companion object {
-        /**
-         * Use a single shared instance of the Sodium library.
-         *
-         * The initialization is inexpensive, but verbose, so this is just syntactic sugar.
-         */
-        val sodium = LazySodiumAndroid(SodiumAndroid())
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/SecretStreamKey.kt b/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/SecretStreamKey.kt
deleted file mode 100644
index 76af3f6567c9..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/util/encryptedlogging/SecretStreamKey.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.wordpress.android.util.encryptedlogging
-
-import com.goterl.lazycode.lazysodium.interfaces.Box
-import com.goterl.lazycode.lazysodium.interfaces.SecretStream
-import com.goterl.lazycode.lazysodium.utils.Key
-
-/**
- * A class representing an unencrypted Secret Stream Key.
- *
- * It can be encrypted to provide an EncryptedSecretStreamKey, which is used to secure
- * an Encrypted Log file.
- *
- * @see EncryptedSecretStreamKey
- */
-class SecretStreamKey(val bytes: ByteArray) {
-    companion object {
-        /**
-         * Generate a new (and securely random) secret stream key
-         */
-        fun generate(): SecretStreamKey {
-            return SecretStreamKey(EncryptionUtils.sodium.cryptoSecretStreamKeygen().asBytes)
-        }
-    }
-
-    init {
-        require(bytes.size == SecretStream.KEYBYTES) {
-            "A Secret Stream Key must be exactly ${SecretStream.KEYBYTES} bytes"
-        }
-    }
-
-    val size: Long = bytes.size.toLong()
-
-    fun encrypt(publicKey: Key): EncryptedSecretStreamKey {
-        val sodium = EncryptionUtils.sodium
-
-        require(Box.Checker.checkPublicKey(publicKey.asBytes.size)) {
-            "The public key must be the right length"
-        }
-
-        val encryptedBytes = ByteArray(EncryptedSecretStreamKey.size) // Stores the encrypted bytes
-        check(sodium.cryptoBoxSeal(encryptedBytes, bytes, size, publicKey.asBytes)) {
-            "Encrypting the message key must not fail"
-        }
-
-        return EncryptedSecretStreamKey(encryptedBytes)
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/experiments/ExPlat.kt b/WordPress/src/main/java/org/wordpress/android/util/experiments/ExPlat.kt
new file mode 100644
index 000000000000..1403c4a5c670
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/experiments/ExPlat.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.util.experiments
+
+import dagger.Lazy
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import org.wordpress.android.BuildConfig
+import org.wordpress.android.fluxc.model.experiments.Assignments
+import org.wordpress.android.fluxc.model.experiments.Variation
+import org.wordpress.android.fluxc.model.experiments.Variation.Control
+import org.wordpress.android.fluxc.store.ExperimentStore
+import org.wordpress.android.fluxc.store.ExperimentStore.Platform
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.modules.APPLICATION_SCOPE
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.experiments.ExPlat.RefreshStrategy.ALWAYS
+import org.wordpress.android.util.experiments.ExPlat.RefreshStrategy.IF_STALE
+import org.wordpress.android.util.experiments.ExPlat.RefreshStrategy.NEVER
+import javax.inject.Inject
+import javax.inject.Named
+import javax.inject.Singleton
+
+@Singleton
+class ExPlat
+@Inject constructor(
+    private val experiments: Lazy<Set<Experiment>>,
+    private val experimentStore: ExperimentStore,
+    private val appLog: AppLogWrapper,
+    @Named(APPLICATION_SCOPE) private val coroutineScope: CoroutineScope
+) {
+    private val platform = Platform.WORDPRESS_ANDROID
+    private val activeVariations = mutableMapOf<String, Variation>()
+    private val experimentNames by lazy { experiments.get().map { it.name } }
+
+    fun refreshIfNeeded() {
+        refresh(refreshStrategy = IF_STALE)
+    }
+
+    fun forceRefresh() {
+        refresh(refreshStrategy = ALWAYS)
+    }
+
+    fun clear() {
+        appLog.d(T.API, "ExPlat: clearing cached assignments and active variations")
+        activeVariations.clear()
+        experimentStore.clearCachedAssignments()
+    }
+
+    /**
+     * This returns the current active [Variation] for the provided [Experiment].
+     *
+     * If no active [Variation] is found, we can assume this is the first time this method is being
+     * called for the provided [Experiment] during the current session. In this case, the [Variation]
+     * is returned from the cached [Assignments] and then set as active. If the cached [Assignments]
+     * is stale and [shouldRefreshIfStale] is `true`, then new [Assignments] are fetched and their
+     * variations are going to be returned by this method on the next session.
+     *
+     * If the provided [Experiment] was not included in [ExPlat.start], then [Control] is returned.
+     * If [BuildConfig.DEBUG] is `true`, an [IllegalArgumentException] is thrown instead.
+     */
+    internal fun getVariation(experiment: Experiment, shouldRefreshIfStale: Boolean): Variation {
+        if (!experimentNames.contains(experiment.name)) {
+            val message = "ExPlat: experiment not found: \"${experiment.name}\"! " +
+                    "Make sure to include it in the set provided via constructor."
+            appLog.e(T.API, message)
+            if (BuildConfig.DEBUG) throw IllegalArgumentException(message) else return Control
+        }
+        return activeVariations.getOrPut(experiment.name) {
+            getAssignments(if (shouldRefreshIfStale) IF_STALE else NEVER).getVariationForExperiment(experiment.name)
+        }
+    }
+
+    private fun refresh(refreshStrategy: RefreshStrategy) {
+        if (experimentNames.isNotEmpty()) {
+            getAssignments(refreshStrategy)
+        }
+    }
+
+    private fun getAssignments(refreshStrategy: RefreshStrategy): Assignments {
+        val cachedAssignments = experimentStore.getCachedAssignments() ?: Assignments()
+        if (refreshStrategy == ALWAYS || (refreshStrategy == IF_STALE && cachedAssignments.isStale())) {
+            coroutineScope.launch { fetchAssignments() }
+        }
+        return cachedAssignments
+    }
+
+    private suspend fun fetchAssignments() = experimentStore.fetchAssignments(platform, experimentNames).also {
+        if (it.isError) {
+            appLog.d(T.API, "ExPlat: fetching assignments failed with result: ${it.error}")
+        } else {
+            appLog.d(T.API, "ExPlat: fetching assignments successful with result: ${it.assignments}")
+        }
+    }
+
+    private enum class RefreshStrategy { ALWAYS, IF_STALE, NEVER }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/experiments/ExampleExperiment.kt b/WordPress/src/main/java/org/wordpress/android/util/experiments/ExampleExperiment.kt
new file mode 100644
index 000000000000..203c3c5ed370
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/experiments/ExampleExperiment.kt
@@ -0,0 +1,11 @@
+package org.wordpress.android.util.experiments
+
+import javax.inject.Inject
+
+class ExampleExperiment
+@Inject constructor(
+    exPlat: ExPlat
+) : Experiment(
+        "example_experiment",
+        exPlat
+)
diff --git a/WordPress/src/main/java/org/wordpress/android/util/experiments/Experiment.kt b/WordPress/src/main/java/org/wordpress/android/util/experiments/Experiment.kt
new file mode 100644
index 000000000000..5e77411c7f91
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/experiments/Experiment.kt
@@ -0,0 +1,12 @@
+package org.wordpress.android.util.experiments
+
+import org.wordpress.android.fluxc.model.experiments.Variation
+
+open class Experiment(
+    val name: String,
+    private val exPlat: ExPlat
+) {
+    @JvmOverloads fun getVariation(shouldRefreshIfStale: Boolean = false): Variation {
+        return exPlat.getVariation(this, shouldRefreshIfStale)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/BlavatarShape.kt b/WordPress/src/main/java/org/wordpress/android/util/image/BlavatarShape.kt
new file mode 100644
index 000000000000..5f0b1ccdc436
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/BlavatarShape.kt
@@ -0,0 +1,7 @@
+package org.wordpress.android.util.image
+
+enum class BlavatarShape {
+    SQUARE,
+    SQUARE_WITH_ROUNDED_CORNERES,
+    CIRCULAR
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
index e6451d537db5..43e502565c7c 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt
@@ -25,6 +25,7 @@ import com.bumptech.glide.load.engine.GlideException
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.DownsampleStrategy
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestOptions
 import com.bumptech.glide.request.target.AppWidgetTarget
 import com.bumptech.glide.request.target.BaseTarget
 import com.bumptech.glide.request.target.CustomTarget
@@ -32,10 +33,14 @@ import com.bumptech.glide.request.target.Target
 import com.bumptech.glide.request.target.ViewTarget
 import com.bumptech.glide.request.transition.Transition
 import com.bumptech.glide.signature.ObjectKey
+import kotlinx.coroutines.CoroutineScope
 import org.wordpress.android.WordPress
 import org.wordpress.android.modules.GlideApp
 import org.wordpress.android.modules.GlideRequest
+import org.wordpress.android.networking.MShot
+import org.wordpress.android.ui.media.VideoLoader
 import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.image.ImageType.VIDEO
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -45,7 +50,10 @@ import javax.inject.Singleton
  */
 
 @Singleton
-class ImageManager @Inject constructor(private val placeholderManager: ImagePlaceholderManager) {
+class ImageManager @Inject constructor(
+    private val placeholderManager: ImagePlaceholderManager,
+    private val videoLoader: VideoLoader?
+) {
     interface RequestListener<T> {
         /**
          * Called when an exception occurs during a load
@@ -54,6 +62,7 @@ class ImageManager @Inject constructor(private val placeholderManager: ImagePlac
          * @param model The model we were trying to load when the exception occurred.
          */
         fun onLoadFailed(e: Exception?, model: Any?)
+
         /**
          * Called when a load completes successfully
          *
@@ -101,6 +110,48 @@ class ImageManager @Inject constructor(private val placeholderManager: ImagePlac
                 .clearOnDetach()
     }
 
+    /**
+     * Loads the first frame from the "videoUrl" as an image into the ImageView.
+     * Adds a placeholder and an error placeholder depending on the ImageType.
+     *
+     * If no URL is provided, it only loads the placeholder
+     */
+    @JvmOverloads
+    fun loadThumbnailFromVideoUrl(
+        scope: CoroutineScope,
+        imageView: ImageView,
+        videoUrl: String = "",
+        scaleType: ScaleType = CENTER,
+        requestListener: RequestListener<Drawable>? = null
+    ) {
+        val context = imageView.context
+        val imageType = VIDEO
+        if (!context.isAvailable()) return
+        videoLoader?.runIfMediaNotTooBig(scope,
+                videoUrl,
+                loadAction = {
+                    if (!context.isAvailable()) return@runIfMediaNotTooBig
+                    GlideApp.with(context)
+                            .load(videoUrl)
+                            .addFallback(imageType)
+                            .addPlaceholder(imageType)
+                            .applyScaleType(scaleType)
+                            .attachRequestListener(requestListener)
+                            .apply(RequestOptions().frame(0))
+                            .into(imageView)
+                            .clearOnDetach()
+                },
+                fallbackAction = {
+                    if (!context.isAvailable()) return@runIfMediaNotTooBig
+                    GlideApp.with(context)
+                            .load(placeholderManager.getErrorResource(imageType))
+                            .addPlaceholder(imageType)
+                            .addFallback(imageType)
+                            .into(imageView)
+                            .clearOnDetach()
+                }) ?: throw java.lang.IllegalArgumentException("Video loader has to be set")
+    }
+
     /**
      * Loads an image from the "imgUrl" into the AppWidgetTarget. Adds a placeholder and an error placeholder depending
      * on the ImageType.
@@ -241,6 +292,25 @@ class ImageManager @Inject constructor(private val placeholderManager: ImagePlac
                 .clearOnDetach()
     }
 
+    /**
+     * Loads an [MShot] into an [ImageView] and attaches a [RequestListener].
+     *
+     * This is needed because the mshot service redirects to a loading gif image when the thumbnail is not ready.
+     * The loading is handled by [org.wordpress.android.networking.GlideMShotsLoader]
+     */
+    fun loadWithResultListener(view: ImageView, design: MShot, requestListener: RequestListener<Drawable>) {
+        val context = view.context
+        if (!context.isAvailable()) return
+        GlideApp.with(context)
+                .load(design)
+                .addFallback(ImageType.THEME)
+                .addPlaceholder(ImageType.THEME)
+                .applyScaleType(FIT_CENTER)
+                .attachRequestListener(requestListener)
+                .into(view)
+                .clearOnDetach()
+    }
+
     /**
      * Loads an image from the "imgUri" into the ImageView. Doing this allows content and remote URIs to interchangeable.
      * Adds a placeholder and an error placeholder depending
@@ -506,6 +576,6 @@ class ImageManager @Inject constructor(private val placeholderManager: ImagePlac
     companion object {
         @JvmStatic
         @Deprecated("Use injected ImageManager")
-        val instance: ImageManager by lazy { ImageManager(ImagePlaceholderManager()) }
+        val instance: ImageManager by lazy { ImageManager(ImagePlaceholderManager(), null) }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
index 3f5d326c0e67..5ece81fef7f8 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt
@@ -12,8 +12,11 @@ class ImagePlaceholderManager @Inject constructor() {
             ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_placeholder_user_32dp
             ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_no_padding_grey_24dp
             ImageType.BLAVATAR -> R.drawable.bg_rectangle_placeholder_globe_32dp
+            ImageType.P2_BLAVATAR -> R.drawable.bg_rectangle_placeholder_p2_32dp
             ImageType.BLAVATAR_ROUNDED_CORNERS -> R.drawable.bg_rectangle_placeholder_radius_4dp_globe_32dp
+            ImageType.P2_BLAVATAR_ROUNDED_CORNERS -> R.drawable.bg_rectangle_placeholder_radius_4dp_p2_32dp
             ImageType.BLAVATAR_CIRCULAR -> R.drawable.bg_oval_placeholder_globe_32dp
+            ImageType.P2_BLAVATAR_CIRCULAR -> R.drawable.bg_oval_placeholder_p2_32dp
             ImageType.IMAGE -> null // don't display any error drawable
             ImageType.PHOTO -> R.color.placeholder
             ImageType.PHOTO_ROUNDED_CORNERS -> R.drawable.bg_rectangle_placeholder_radius_4dp
@@ -34,8 +37,11 @@ class ImagePlaceholderManager @Inject constructor() {
             ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_placeholder_user_32dp
             ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_no_padding_grey_24dp
             ImageType.BLAVATAR -> R.color.placeholder
+            ImageType.P2_BLAVATAR -> R.color.placeholder
             ImageType.BLAVATAR_ROUNDED_CORNERS -> R.drawable.bg_rectangle_placeholder_radius_4dp
+            ImageType.P2_BLAVATAR_ROUNDED_CORNERS -> R.drawable.bg_rectangle_placeholder_radius_4dp_p2_32dp
             ImageType.BLAVATAR_CIRCULAR -> R.drawable.bg_oval_placeholder_globe_32dp
+            ImageType.P2_BLAVATAR_CIRCULAR -> R.drawable.bg_oval_placeholder_p2_32dp
             ImageType.IMAGE -> null // don't display any placeholder
             ImageType.PHOTO -> R.color.placeholder
             ImageType.PHOTO_ROUNDED_CORNERS -> R.drawable.bg_rectangle_placeholder_radius_4dp
diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt
index 63ac1f1e6ea4..ff5a79fd62c0 100644
--- a/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt
+++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImageType.kt
@@ -10,8 +10,11 @@ enum class ImageType {
     AVATAR_WITH_BACKGROUND,
     AVATAR_WITHOUT_BACKGROUND,
     BLAVATAR,
+    P2_BLAVATAR,
     BLAVATAR_ROUNDED_CORNERS,
+    P2_BLAVATAR_ROUNDED_CORNERS,
     BLAVATAR_CIRCULAR,
+    P2_BLAVATAR_CIRCULAR,
     IMAGE,
     PHOTO,
     PHOTO_ROUNDED_CORNERS,
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/Event.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/Event.kt
index 6c3641a736cd..792cac20bc03 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/Event.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/Event.kt
@@ -1,5 +1,8 @@
 package org.wordpress.android.viewmodel
 
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LiveData
+
 /**
  * Used as a wrapper for data that is exposed via a LiveData that represents an event.
  */
@@ -28,3 +31,7 @@ open class Event<out T>(private val content: T) {
      */
     fun peekContent(): T = content
 }
+
+fun <T> LiveData<Event<T>>.observeEvent(owner: LifecycleOwner, block: (T) -> Unit) {
+    this.observe(owner, { it?.getContentIfNotHandled()?.let(block) })
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/ResourceProvider.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/ResourceProvider.kt
index 5067ed5114a8..8b79f5412963 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/ResourceProvider.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/ResourceProvider.kt
@@ -1,5 +1,6 @@
 package org.wordpress.android.viewmodel
 
+import android.graphics.drawable.Drawable
 import androidx.annotation.ColorRes
 import androidx.annotation.DimenRes
 import androidx.annotation.StringRes
@@ -15,6 +16,8 @@ class ResourceProvider @Inject constructor(private val contextProvider: ContextP
         return contextProvider.getContext().getString(resourceId, *formatArgs)
     }
 
+    fun getStringArray(id: Int): Array<String> = contextProvider.getContext().resources.getStringArray(id)
+
     fun getColor(@ColorRes resourceId: Int): Int {
         return ContextCompat.getColor(contextProvider.getContext(), resourceId)
     }
@@ -28,4 +31,30 @@ class ResourceProvider @Inject constructor(private val contextProvider: ContextP
         val resources = contextProvider.getContext().resources
         return resources.getDimension(dimen)
     }
+
+    /**
+     * Formats the string for the given quantity, using the given arguments.
+     * We need this because our translation platform doesn't support Android plurals.
+     *
+     * @param zero The desired string identifier to get when quantity is exactly 0
+     * @param one The desired string identifier to get when quantity is exactly 1
+     * @param other The desired string identifier to get when quantity is not (0 or 1)
+     * @param quantity The number used to get the correct string
+     */
+    fun getQuantityString(@StringRes zero: Int, @StringRes one: Int, @StringRes other: Int, quantity: Int): String? {
+        if (quantity == 0) {
+            return contextProvider.getContext().getString(zero)
+        }
+        return if (quantity == 1) {
+            contextProvider.getContext().getString(one)
+        } else String.format(contextProvider.getContext().getString(other), quantity)
+    }
+
+    fun getDimensionPixelOffset(id: Int): Int {
+        return contextProvider.getContext().resources.getDimensionPixelOffset(id)
+    }
+
+    fun getDrawable(iconId: Int): Drawable? {
+        return ContextCompat.getDrawable(contextProvider.getContext(), iconId)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/ScopedViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/ScopedViewModel.kt
index 0d22d6298cdd..346ac838d5ee 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/ScopedViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/ScopedViewModel.kt
@@ -1,20 +1,20 @@
 package org.wordpress.android.viewmodel
 
 import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineStart
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
 import kotlin.coroutines.CoroutineContext
 
-abstract class ScopedViewModel(private val defaultDispatcher: CoroutineDispatcher) : ViewModel(), CoroutineScope {
-    protected var job: Job = Job()
-
-    override val coroutineContext: CoroutineContext
-        get() = defaultDispatcher + job
-
-    override fun onCleared() {
-        super.onCleared()
-
-        job.cancel()
+abstract class ScopedViewModel(private val defaultDispatcher: CoroutineDispatcher) : ViewModel() {
+    fun launch(
+        context: CoroutineContext = defaultDispatcher,
+        start: CoroutineStart = CoroutineStart.DEFAULT,
+        block: suspend CoroutineScope.() -> Unit
+    ): Job {
+        return viewModelScope.launch(context, start, block)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModel.kt
index 24ab6d41c7c7..61d0c7c32ae5 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModel.kt
@@ -1,39 +1,38 @@
 package org.wordpress.android.viewmodel.activitylog
 
 import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Transformations
 import androidx.lifecycle.ViewModel
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.activity.ActivityLogModel.ActivityActor
 import org.wordpress.android.fluxc.store.ActivityLogStore
 import org.wordpress.android.fluxc.tools.FormattableRange
-import org.wordpress.android.ui.activitylog.RewindStatusService
 import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailModel
+import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailNavigationEvents
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.ACTIVITY_LOG
 import org.wordpress.android.util.toFormattedDateString
 import org.wordpress.android.util.toFormattedTimeString
+import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import javax.inject.Inject
 
 const val ACTIVITY_LOG_ID_KEY: String = "activity_log_id_key"
-const val ACTIVITY_LOG_REWIND_ID_KEY: String = "activity_log_rewind_id_key"
+const val ACTIVITY_LOG_ARE_BUTTONS_VISIBLE_KEY: String = "activity_log_are_buttons_visible_key"
 
 class ActivityLogDetailViewModel
 @Inject constructor(
     val dispatcher: Dispatcher,
-    private val activityLogStore: ActivityLogStore,
-    private val rewindStatusService: RewindStatusService
+    private val activityLogStore: ActivityLogStore
 ) : ViewModel() {
     lateinit var site: SiteModel
     lateinit var activityLogId: String
+    var areButtonsVisible = false
 
-    private val _showRewindDialog = SingleLiveEvent<ActivityLogDetailModel>()
-    val showRewindDialog: LiveData<ActivityLogDetailModel>
-        get() = _showRewindDialog
+    private val _navigationEvents = MutableLiveData<Event<ActivityLogDetailNavigationEvents>>()
+    val navigationEvents: LiveData<Event<ActivityLogDetailNavigationEvents>>
+        get() = _navigationEvents
 
     private val _handleFormattableRangeClick = SingleLiveEvent<FormattableRange>()
     val handleFormattableRangeClick: LiveData<FormattableRange>
@@ -43,24 +42,21 @@ class ActivityLogDetailViewModel
     val activityLogItem: LiveData<ActivityLogDetailModel>
         get() = _item
 
-    private val mediatorRewindAvailable = MediatorLiveData<Boolean>()
+    private val _restoreVisible = MutableLiveData<Boolean>()
+    val restoreVisible: LiveData<Boolean>
+        get() = _restoreVisible
 
-    val rewindAvailable: LiveData<Boolean>
-        get() = mediatorRewindAvailable
+    private val _downloadBackupVisible = MutableLiveData<Boolean>()
+    val downloadBackupVisible: LiveData<Boolean>
+        get() = _downloadBackupVisible
 
-    init {
-        val itemRewindAvailable = Transformations.map(_item) { it?.isRewindButtonVisible ?: false }
-        mediatorRewindAvailable.addSource(itemRewindAvailable) {
-            mediatorRewindAvailable.value = it == true && mediatorRewindAvailable.value != false
-        }
-        mediatorRewindAvailable.addSource(rewindStatusService.rewindAvailable) {
-            mediatorRewindAvailable.value = it == true && mediatorRewindAvailable.value != false
-        }
-    }
-
-    fun start(site: SiteModel, activityLogId: String) {
+    fun start(site: SiteModel, activityLogId: String, areButtonsVisible: Boolean) {
         this.site = site
         this.activityLogId = activityLogId
+        this.areButtonsVisible = areButtonsVisible
+
+        _restoreVisible.value = areButtonsVisible
+        _downloadBackupVisible.value = areButtonsVisible
 
         if (activityLogId != _item.value?.activityID) {
             _item.value = activityLogStore
@@ -82,25 +78,25 @@ class ActivityLogDetailViewModel
                         )
                     }
         }
-        rewindStatusService.start(site)
-    }
-
-    fun stop() {
-        rewindStatusService.stop()
     }
 
     fun onRangeClicked(range: FormattableRange) {
         _handleFormattableRangeClick.value = range
     }
 
-    fun onRewindClicked(model: ActivityLogDetailModel) {
+    fun onRestoreClicked(model: ActivityLogDetailModel) {
+        if (model.rewindId != null) {
+            _navigationEvents.value = Event(ActivityLogDetailNavigationEvents.ShowRestore(model))
+        } else {
+            AppLog.e(ACTIVITY_LOG, "Trying to restore activity without rewind ID")
+        }
+    }
+
+    fun onDownloadBackupClicked(model: ActivityLogDetailModel) {
         if (model.rewindId != null) {
-            _showRewindDialog.value = model
+            _navigationEvents.value = Event(ActivityLogDetailNavigationEvents.ShowBackupDownload(model))
         } else {
-            AppLog.e(
-                    ACTIVITY_LOG,
-                    "Trying to rewind activity without rewind ID"
-            )
+            AppLog.e(ACTIVITY_LOG, "Trying to download backup activity without rewind ID")
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModel.kt
index d140ef1a7ee7..5fad36d83c64 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModel.kt
@@ -1,42 +1,76 @@
 package org.wordpress.android.viewmodel.activitylog
 
+import androidx.annotation.VisibleForTesting
+import androidx.core.util.Pair
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.Observer
-import kotlinx.coroutines.CoroutineDispatcher
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.activity.ActivityLogModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.RUNNING
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
 import org.wordpress.android.fluxc.store.ActivityLogStore
 import org.wordpress.android.fluxc.store.ActivityLogStore.OnActivityLogFetched
-import org.wordpress.android.modules.UI_THREAD
-import org.wordpress.android.ui.activitylog.RewindStatusService
-import org.wordpress.android.ui.activitylog.RewindStatusService.RewindProgress
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Event
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Footer
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Header
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Loading
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState
+import org.wordpress.android.ui.jetpack.backup.download.usecases.GetBackupDownloadStatusUseCase
+import org.wordpress.android.ui.jetpack.backup.download.usecases.PostDismissBackupDownloadUseCase
+import org.wordpress.android.ui.jetpack.common.JetpackBackupDownloadActionState.PROGRESS
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState
+import org.wordpress.android.ui.jetpack.restore.usecases.GetRestoreStatusUseCase
+import org.wordpress.android.ui.stats.refresh.utils.DateUtils
+import org.wordpress.android.ui.utils.UiString
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.AppLog
-import org.wordpress.android.util.config.ActivityLogFiltersFeatureConfig
+import org.wordpress.android.util.analytics.ActivityLogTracker
+import org.wordpress.android.util.toFormattedDateString
+import org.wordpress.android.util.toFormattedTimeString
+import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ResourceProvider
-import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
-import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus.DONE
-import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus.LOADING_MORE
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.FiltersUiState.FiltersHidden
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.FiltersUiState.FiltersShown
+import java.util.Date
 import javax.inject.Inject
-import javax.inject.Named
 
+const val ACTIVITY_LOG_REWINDABLE_ONLY_KEY = "activity_log_rewindable_only"
+
+private const val DAY_IN_MILLIS = 1000 * 60 * 60 * 24
+private const val ONE_SECOND_IN_MILLIS = 1000
+private const val TIMEZONE_GMT_0 = "GMT+0"
+
+typealias DateRange = Pair<Long, Long>
+
+/**
+ * It was decided to reuse the 'Activity Log' screen instead of creating a new 'Backup' screen. This was due to the
+ * fact that there will be lots of code that would need to be duplicated for the new 'Backup' screen. On the other
+ * hand, not much more complexity would be introduced if the 'Activity Log' screen is reused (mainly some 'if/else'
+ * code branches here and there).
+ *
+ * However, should more 'Backup' related additions are added to the 'Activity Log' screen, then it should become a
+ * necessity to split those features in separate screens in order not to increase further the complexity of this
+ * screen's architecture.
+ */
+@Suppress("LargeClass", "LongParameterList")
 class ActivityLogViewModel @Inject constructor(
     private val activityLogStore: ActivityLogStore,
-    private val rewindStatusService: RewindStatusService,
+    private val getRestoreStatusUseCase: GetRestoreStatusUseCase,
+    private val getBackupDownloadStatusUseCase: GetBackupDownloadStatusUseCase,
+    private val postDismissBackupDownloadUseCase: PostDismissBackupDownloadUseCase,
     private val resourceProvider: ResourceProvider,
-    private val activityLogFiltersFeatureConfig: ActivityLogFiltersFeatureConfig,
-    @param:Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher
-) : ScopedViewModel(uiDispatcher) {
+    private val dateUtils: DateUtils,
+    private val activityLogTracker: ActivityLogTracker,
+    private val jetpackCapabilitiesUseCase: JetpackCapabilitiesUseCase
+) : ViewModel() {
     enum class ActivityLogListStatus {
         CAN_LOAD_MORE,
         DONE,
@@ -55,13 +89,20 @@ class ActivityLogViewModel @Inject constructor(
     val eventListStatus: LiveData<ActivityLogListStatus>
         get() = _eventListStatus
 
-    private val _dateRangePickerVisibility = MutableLiveData<Boolean>()
-    val dateRangePickerVisibility: LiveData<Boolean>
-        get() = _dateRangePickerVisibility
+    private val _filtersUiState = MutableLiveData<FiltersUiState>(FiltersHidden)
+    val filtersUiState: LiveData<FiltersUiState>
+        get() = _filtersUiState
 
-    private val _showRewindDialog = SingleLiveEvent<ActivityLogListItem>()
-    val showRewindDialog: LiveData<ActivityLogListItem>
-        get() = _showRewindDialog
+    private val _emptyUiState = MutableLiveData<EmptyUiState>(EmptyUiState.ActivityLog.EmptyFilters)
+    val emptyUiState: LiveData<EmptyUiState> = _emptyUiState
+
+    private val _showActivityTypeFilterDialog = SingleLiveEvent<ShowActivityTypePicker>()
+    val showActivityTypeFilterDialog: LiveData<ShowActivityTypePicker>
+        get() = _showActivityTypeFilterDialog
+
+    private val _showDateRangePicker = SingleLiveEvent<ShowDateRangePicker>()
+    val showDateRangePicker: LiveData<ShowDateRangePicker>
+        get() = _showDateRangePicker
 
     private val _moveToTop = SingleLiveEvent<Unit>()
     val moveToTop: SingleLiveEvent<Unit>
@@ -75,222 +116,650 @@ class ActivityLogViewModel @Inject constructor(
     val showSnackbarMessage: LiveData<String>
         get() = _showSnackbarMessage
 
-    private val isLoadingInProgress: Boolean
-        get() = eventListStatus.value == LOADING_MORE ||
-                eventListStatus.value == ActivityLogListStatus.FETCHING
+    private val _navigationEvents =
+            MutableLiveData<Event<ActivityLogNavigationEvents>>()
+    val navigationEvents: LiveData<Event<ActivityLogNavigationEvents>>
+        get() = _navigationEvents
+
+    private val isRestoreProgressItemShown: Boolean
+        get() = events.value?.find {
+            it is ActivityLogListItem.Progress &&
+                    it.progressType == ActivityLogListItem.Progress.Type.RESTORE
+        } != null
 
-    private val isRewindProgressItemShown: Boolean
-        get() = _events.value?.containsProgressItem() == true
+    private val isBackupDownloadProgressItemShown: Boolean
+        get() = events.value?.find {
+            it is ActivityLogListItem.Progress &&
+                    it.progressType == ActivityLogListItem.Progress.Type.BACKUP_DOWNLOAD
+        } != null
 
     private val isDone: Boolean
-        get() = eventListStatus.value == DONE
+        get() = eventListStatus.value == ActivityLogListStatus.DONE
+
+    private var fetchActivitiesJob: Job? = null
+    private var restoreStatusJob: Job? = null
+    private var backupDownloadStatusJob: Job? = null
+
+    private var currentDateRangeFilter: DateRange? = null
+    private var currentActivityTypeFilter: List<ActivityTypeModel> = listOf()
+
+    lateinit var site: SiteModel
+    var rewindableOnly: Boolean = false
 
-    private var areActionsEnabled: Boolean = true
+    private var currentRestoreEvent = RestoreEvent(false)
+    private var currentBackupDownloadEvent = BackupDownloadEvent(displayProgress = false, displayNotice = false)
 
-    private var lastRewindActivityId: String? = null
-    private var lastRewindStatus: Status? = null
-    private val rewindProgressObserver = Observer<RewindProgress> {
-        if (it?.activityLogItem?.activityID != lastRewindActivityId || it?.status != lastRewindStatus) {
-            lastRewindActivityId = it?.activityLogItem?.activityID
-            updateRewindState(it?.status)
+    fun start(site: SiteModel, rewindableOnly: Boolean) {
+        if (isStarted) {
+            return
         }
+        isStarted = true
+
+        this.site = site
+        this.rewindableOnly = rewindableOnly
+
+        reloadEvents(true)
+        requestEventsUpdate(false)
+
+        showFiltersIfSupported()
     }
 
-    private val rewindAvailableObserver = Observer<Boolean> { isRewindAvailable ->
-        if (areActionsEnabled != isRewindAvailable) {
-            isRewindAvailable?.let {
-                reloadEvents(!isRewindAvailable)
+    @Suppress("LongMethod", "ComplexMethod")
+    @VisibleForTesting
+    fun reloadEvents(
+        done: Boolean = isDone,
+        restoreEvent: RestoreEvent = currentRestoreEvent,
+        backupDownloadEvent: BackupDownloadEvent = currentBackupDownloadEvent
+    ) {
+        currentRestoreEvent = restoreEvent
+        currentBackupDownloadEvent = backupDownloadEvent
+        val eventList = activityLogStore.getActivityLogForSite(
+                site = site,
+                ascending = false,
+                rewindableOnly = rewindableOnly
+        )
+        val items = mutableListOf<ActivityLogListItem>()
+        var moveToTop = false
+        val withRestoreProgressItem = restoreEvent.displayProgress && !restoreEvent.isCompleted
+        val withBackupDownloadProgressItem = backupDownloadEvent.displayProgress && !backupDownloadEvent.isCompleted
+        val withBackupDownloadNoticeItem = backupDownloadEvent.displayNotice
+        if (withRestoreProgressItem || withBackupDownloadProgressItem) {
+            items.add(ActivityLogListItem.Header(resourceProvider.getString(R.string.now)))
+            moveToTop = eventListStatus.value != ActivityLogListStatus.LOADING_MORE
+        }
+        if (withRestoreProgressItem) {
+            items.add(getRestoreProgressItem(restoreEvent.rewindId, restoreEvent.published))
+        }
+        if (withBackupDownloadProgressItem) {
+            items.add(getBackupDownloadProgressItem(backupDownloadEvent.rewindId, backupDownloadEvent.published))
+        }
+        if (withBackupDownloadNoticeItem) {
+            getBackupDownloadNoticeItem(backupDownloadEvent)?.let {
+                items.add(it)
+                moveToTop = true
             }
         }
+        eventList.forEach { model ->
+            val currentItem = ActivityLogListItem.Event(
+                    model,
+                    withRestoreProgressItem || withBackupDownloadProgressItem
+            )
+            val lastItem = items.lastOrNull() as? ActivityLogListItem.Event
+            if (lastItem == null || lastItem.formattedDate != currentItem.formattedDate) {
+                items.add(ActivityLogListItem.Header(currentItem.formattedDate))
+            }
+            items.add(currentItem)
+        }
+        if (eventList.isNotEmpty() && !done) {
+            items.add(ActivityLogListItem.Loading)
+        }
+        if (eventList.isNotEmpty() && site.hasFreePlan && done) {
+            items.add(ActivityLogListItem.Footer)
+        }
+
+        _events.value = items
+        if (moveToTop) {
+            _moveToTop.call()
+        }
+        if (restoreEvent.isCompleted) {
+            showRestoreFinishedMessage(restoreEvent.rewindId, restoreEvent.published)
+            currentRestoreEvent = RestoreEvent(false)
+        }
     }
 
-    lateinit var site: SiteModel
+    private fun getRestoreProgressItem(rewindId: String?, published: Date?): ActivityLogListItem.Progress {
+        val rewindDate = published ?: rewindId?.let { activityLogStore.getActivityLogItemByRewindId(it)?.published }
+        return rewindDate?.let {
+            ActivityLogListItem.Progress(
+                    resourceProvider.getString(R.string.activity_log_currently_restoring_title),
+                    resourceProvider.getString(
+                            R.string.activity_log_currently_restoring_message,
+                            rewindDate.toFormattedDateString(),
+                            rewindDate.toFormattedTimeString()
+                    ),
+                    ActivityLogListItem.Progress.Type.RESTORE
+            )
+        } ?: ActivityLogListItem.Progress(
+                resourceProvider.getString(R.string.activity_log_currently_restoring_title),
+                resourceProvider.getString(R.string.activity_log_currently_restoring_message_no_dates),
+                ActivityLogListItem.Progress.Type.RESTORE
+        )
+    }
 
-    fun start(site: SiteModel) {
-        if (isStarted) {
-            return
+    private fun getBackupDownloadProgressItem(rewindId: String?, published: Date?): ActivityLogListItem.Progress {
+        val rewindDate = published ?: rewindId?.let { activityLogStore.getActivityLogItemByRewindId(it)?.published }
+        return rewindDate?.let {
+            ActivityLogListItem.Progress(
+                    resourceProvider.getString(R.string.activity_log_currently_backing_up_title),
+                    resourceProvider.getString(
+                            R.string.activity_log_currently_backing_up_message,
+                            rewindDate.toFormattedDateString(), rewindDate.toFormattedTimeString()
+                    ),
+                    ActivityLogListItem.Progress.Type.BACKUP_DOWNLOAD
+            )
+        } ?: ActivityLogListItem.Progress(
+                resourceProvider.getString(R.string.activity_log_currently_backing_up_title),
+                resourceProvider.getString(R.string.activity_log_currently_backing_up_message_no_dates),
+                ActivityLogListItem.Progress.Type.BACKUP_DOWNLOAD
+        )
+    }
+
+    private fun getBackupDownloadNoticeItem(backupDownloadEvent: BackupDownloadEvent): ActivityLogListItem.Notice? {
+        val rewindDate = backupDownloadEvent.published
+                ?: backupDownloadEvent.rewindId?.let { activityLogStore.getActivityLogItemByRewindId(it)?.published }
+        return rewindDate?.let {
+            ActivityLogListItem.Notice(
+                    label = resourceProvider.getString(
+                            R.string.activity_log_backup_download_notice_description_with_two_params,
+                            rewindDate.toFormattedDateString(), rewindDate.toFormattedTimeString()
+                    ),
+                    primaryAction = { onDownloadBackupFileClicked(backupDownloadEvent.url as String) },
+                    secondaryAction = { dismissNoticeClicked(backupDownloadEvent.downloadId as Long) }
+            )
+        }
+    }
+
+    private fun showRestoreFinishedMessage(rewindId: String?, published: Date?) {
+        val rewindDate = published ?: rewindId?.let { activityLogStore.getActivityLogItemByRewindId(it)?.published }
+        if (rewindDate != null) {
+            _showSnackbarMessage.value =
+                    resourceProvider.getString(
+                            R.string.activity_log_rewind_finished_snackbar_message,
+                            rewindDate.toFormattedDateString(),
+                            rewindDate.toFormattedTimeString()
+                    )
+        } else {
+            _showSnackbarMessage.value =
+                    resourceProvider.getString(R.string.activity_log_rewind_finished_snackbar_message_no_dates)
         }
+    }
 
-        this.site = site
+    private fun showBackupDownloadFinishedMessage(rewindId: String?) {
+        val rewindDate = rewindId?.let { activityLogStore.getActivityLogItemByRewindId(it)?.published }
+        if (rewindDate != null) {
+            _showSnackbarMessage.value =
+                    resourceProvider.getString(
+                            R.string.activity_log_backup_finished_snackbar_message,
+                            rewindDate.toFormattedDateString(),
+                            rewindDate.toFormattedTimeString()
+                    )
+        } else {
+            _showSnackbarMessage.value =
+                    resourceProvider.getString(R.string.activity_log_backup_finished_snackbar_message_no_dates)
+        }
+    }
 
-        rewindStatusService.start(site)
-        rewindStatusService.rewindProgress.observeForever(rewindProgressObserver)
-        rewindStatusService.rewindAvailable.observeForever(rewindAvailableObserver)
+    private fun requestEventsUpdate(
+        loadMore: Boolean,
+        restoreEvent: RestoreEvent = currentRestoreEvent,
+        backupDownloadEvent: BackupDownloadEvent = currentBackupDownloadEvent
+    ) {
+        val isLoadingMore = fetchActivitiesJob != null && eventListStatus.value == ActivityLogListStatus.LOADING_MORE
+        val canLoadMore = eventListStatus.value == ActivityLogListStatus.CAN_LOAD_MORE
+        if (loadMore && (isLoadingMore || !canLoadMore)) {
+            // Ignore loadMore request when already loading more items or there are no more items to load
+            return
+        }
+        fetchActivitiesJob?.cancel()
+        val newStatus = if (loadMore) ActivityLogListStatus.LOADING_MORE else ActivityLogListStatus.FETCHING
+        _eventListStatus.value = newStatus
+        val payload = ActivityLogStore.FetchActivityLogPayload(
+                site,
+                loadMore,
+                currentDateRangeFilter?.first?.let { Date(it) },
+                currentDateRangeFilter?.second?.let { Date(it) },
+                currentActivityTypeFilter.map { it.key }
+        )
+        fetchActivitiesJob = viewModelScope.launch {
+            val result = activityLogStore.fetchActivities(payload)
+            if (isActive) {
+                onActivityLogFetched(result, loadMore, restoreEvent, backupDownloadEvent)
+                fetchActivitiesJob = null
+            }
+        }
+    }
 
-        activityLogStore.getRewindStatusForSite(site)
+    private fun onActivityLogFetched(
+        event: OnActivityLogFetched,
+        loadingMore: Boolean,
+        restoreEvent: RestoreEvent,
+        backupDownloadEvent: BackupDownloadEvent
+    ) {
+        if (event.isError) {
+            _eventListStatus.value = ActivityLogListStatus.ERROR
+            AppLog.e(AppLog.T.ACTIVITY_LOG, "An error occurred while fetching the Activity log events")
+            return
+        }
 
-        reloadEvents(done = true)
-        requestEventsUpdate(false)
+        if (event.rowsAffected > 0) {
+            reloadEvents(
+                    done = !event.canLoadMore,
+                    restoreEvent = restoreEvent,
+                    backupDownloadEvent = backupDownloadEvent
+            )
+            if (!loadingMore) {
+                moveToTop.call()
+            }
+            if (!restoreEvent.isCompleted) queryRestoreStatus()
+            if (!backupDownloadEvent.isCompleted) queryBackupDownloadStatus()
+        }
 
-        _dateRangePickerVisibility.value = activityLogFiltersFeatureConfig.isEnabled()
+        if (event.canLoadMore) {
+            _eventListStatus.value = ActivityLogListStatus.CAN_LOAD_MORE
+        } else {
+            _eventListStatus.value = ActivityLogListStatus.DONE
+        }
+    }
 
-        isStarted = true
+    private fun showFiltersIfSupported() {
+        when {
+            !site.hasFreePlan -> refreshFiltersUiState()
+            else -> {
+                viewModelScope.launch {
+                    val purchasedProducts = jetpackCapabilitiesUseCase.getCachedJetpackPurchasedProducts(site.siteId)
+                    if (purchasedProducts.backup) {
+                        refreshFiltersUiState()
+                    }
+                }
+            }
+        }
     }
 
     override fun onCleared() {
-        rewindStatusService.rewindAvailable.removeObserver(rewindAvailableObserver)
-        rewindStatusService.rewindProgress.removeObserver(rewindProgressObserver)
-        rewindStatusService.stop()
+        if (currentDateRangeFilter != null || currentActivityTypeFilter.isNotEmpty()) {
+            /**
+             * Clear cache when filters are not empty. Filters are not retained across sessions, therefore the data is
+             * not relevant when the screen is accessed next time.
+             */
+            activityLogStore.clearActivityLogCache(site)
+        }
+        jetpackCapabilitiesUseCase.clear()
 
         super.onCleared()
     }
 
-    fun onPullToRefresh() {
-        requestEventsUpdate(false)
+    private fun refreshFiltersUiState() {
+        val (activityTypeLabel, activityTypeLabelContentDescription) = createActivityTypeFilterLabel()
+        val (dateRangeLabel, dateRangeLabelContentDescription) = createDateRangeFilterLabel()
+        _filtersUiState.value = FiltersShown(
+                dateRangeLabel,
+                dateRangeLabelContentDescription,
+                activityTypeLabel,
+                activityTypeLabelContentDescription,
+                currentDateRangeFilter?.let { ::onClearDateRangeFilterClicked },
+                currentActivityTypeFilter.takeIf { it.isNotEmpty() }?.let { ::onClearActivityTypeFilterClicked }
+        )
+        refreshEmptyUiState()
     }
 
-    fun onItemClicked(item: ActivityLogListItem) {
-        if (item is Event) {
-            _showItemDetail.value = item
+    private fun refreshEmptyUiState() {
+        if (rewindableOnly) {
+            refreshBackupEmptyUiState()
+        } else {
+            refreshActivityLogEmptyUiState()
         }
     }
 
-    fun onActionButtonClicked(item: ActivityLogListItem) {
-        if (item is Event) {
-            _showRewindDialog.value = item
+    private fun refreshBackupEmptyUiState() {
+        if (currentDateRangeFilter != null) {
+            _emptyUiState.value = EmptyUiState.Backup.ActiveFilters
+        } else {
+            _emptyUiState.value = EmptyUiState.Backup.EmptyFilters
+        }
+    }
+
+    private fun refreshActivityLogEmptyUiState() {
+        if (currentDateRangeFilter != null || currentActivityTypeFilter.isNotEmpty()) {
+            _emptyUiState.value = EmptyUiState.ActivityLog.ActiveFilters
+        } else {
+            _emptyUiState.value = EmptyUiState.ActivityLog.EmptyFilters
         }
     }
 
-    fun onRewindConfirmed(rewindId: String) {
-        rewindStatusService.rewind(rewindId, site)
-        showRewindStartedMessage()
+    private fun createDateRangeFilterLabel(): kotlin.Pair<UiString, UiString> {
+        return currentDateRangeFilter?.let {
+            val label = UiStringText(
+                    dateUtils.formatDateRange(requireNotNull(it.first), requireNotNull(it.second), TIMEZONE_GMT_0)
+            )
+            kotlin.Pair(label, label)
+        } ?: kotlin.Pair(
+                UiStringRes(R.string.activity_log_date_range_filter_label),
+                UiStringRes(R.string.activity_log_date_range_filter_label_content_description)
+        )
+    }
+
+    private fun createActivityTypeFilterLabel(): kotlin.Pair<UiString, UiString> {
+        return currentActivityTypeFilter.takeIf { it.isNotEmpty() }?.let {
+            if (it.size == 1) {
+                kotlin.Pair(
+                        UiStringText(it[0].name),
+                        UiStringResWithParams(
+                                R.string.activity_log_activity_type_filter_single_item_selected_content_description,
+                                listOf(UiStringText(it[0].name), UiStringText(it[0].count.toString()))
+                        )
+                )
+            } else {
+                kotlin.Pair(
+                        UiStringResWithParams(
+                                R.string.activity_log_activity_type_filter_active_label,
+                                listOf(UiStringText("${it.size}"))
+                        ),
+                        UiStringResWithParams(
+                                R.string.activity_log_activity_type_filter_multiple_items_selected_content_description,
+                                listOf(UiStringText("${it.size}"))
+                        )
+                )
+            }
+        } ?: kotlin.Pair(
+                UiStringRes(R.string.activity_log_activity_type_filter_label),
+                UiStringRes(R.string.activity_log_activity_type_filter_no_item_selected_content_description)
+        )
     }
 
     fun onScrolledToBottom() {
         requestEventsUpdate(true)
     }
 
-    private fun updateRewindState(status: Status?) {
-        lastRewindStatus = status
-        if (status == RUNNING && !isRewindProgressItemShown) {
-            reloadEvents(disableActions = true, displayProgressItem = true)
-        } else if (status != RUNNING && isRewindProgressItemShown) {
-            requestEventsUpdate(false)
-        }
+    fun onPullToRefresh() {
+        requestEventsUpdate(false)
     }
 
-    private fun reloadEvents(
-        disableActions: Boolean = areActionsEnabled,
-        displayProgressItem: Boolean = isRewindProgressItemShown,
-        done: Boolean = isDone
-    ) {
-        val eventList = activityLogStore.getActivityLogForSite(site, false)
-        val items = mutableListOf<ActivityLogListItem>()
-        var moveToTop = false
-        val rewindFinished = isRewindProgressItemShown && !displayProgressItem
-        if (displayProgressItem) {
-            val activityLogModel = rewindStatusService.rewindProgress.value?.activityLogItem
-            items.add(Header(resourceProvider.getString(R.string.now)))
-            items.add(getRewindProgressItem(activityLogModel))
-            moveToTop = eventListStatus.value != LOADING_MORE
+    fun onItemClicked(item: ActivityLogListItem) {
+        if (item is ActivityLogListItem.Event) {
+            _showItemDetail.value = item
         }
-        eventList.forEach { model ->
-            val currentItem = Event(model, disableActions)
-            val lastItem = items.lastOrNull() as? Event
-            if (lastItem == null || lastItem.formattedDate != currentItem.formattedDate) {
-                items.add(Header(currentItem.formattedDate))
+    }
+
+    fun onSecondaryActionClicked(
+        secondaryAction: ActivityLogListItem.SecondaryAction,
+        item: ActivityLogListItem
+    ): Boolean {
+        if (item is ActivityLogListItem.Event) {
+            val navigationEvent = when (secondaryAction) {
+                ActivityLogListItem.SecondaryAction.RESTORE -> {
+                    ActivityLogNavigationEvents.ShowRestore(item)
+                }
+                ActivityLogListItem.SecondaryAction.DOWNLOAD_BACKUP -> {
+                    ActivityLogNavigationEvents.ShowBackupDownload(item)
+                }
             }
-            items.add(currentItem)
-        }
-        if (eventList.isNotEmpty() && !done) {
-            items.add(Loading)
+            _navigationEvents.value = Event(navigationEvent)
         }
-        if (eventList.isNotEmpty() && site.hasFreePlan && done) {
-            items.add(Footer)
-        }
-        areActionsEnabled = !disableActions
+        return true
+    }
 
-        _events.value = items
-        if (moveToTop) {
-            _moveToTop.call()
-        }
-        if (rewindFinished) {
-            showRewindFinishedMessage()
+    private fun onDownloadBackupFileClicked(url: String) {
+        activityLogTracker.trackDownloadBackupDownloadButtonClicked(rewindableOnly)
+        _navigationEvents.value = Event(ActivityLogNavigationEvents.DownloadBackupFile(url))
+    }
+    /**
+    Reload events first to remove the notice item, as it shows progress to the user. Then
+    trigger the dismiss (this is an optimistic call). If the dismiss fails it will show
+    again on the next reload.
+    */
+    private fun dismissNoticeClicked(downloadId: Long) {
+        activityLogTracker.trackDownloadBackupDismissButtonClicked(rewindableOnly)
+        reloadEvents(backupDownloadEvent = BackupDownloadEvent(displayNotice = false, displayProgress = false))
+        viewModelScope.launch { postDismissBackupDownloadUseCase.dismissBackupDownload(downloadId, site) }
+    }
+
+    fun dateRangePickerClicked() {
+        activityLogTracker.trackDateRangeFilterButtonClicked(rewindableOnly)
+        _showDateRangePicker.value = ShowDateRangePicker(initialSelection = currentDateRangeFilter)
+    }
+
+    fun onDateRangeSelected(dateRange: DateRange?) {
+        val adjustedDateRange = dateRange?.let {
+            // adjust time of the end of the date range to 23:59:59
+            Pair(dateRange.first, dateRange.second?.let { it + DAY_IN_MILLIS - ONE_SECOND_IN_MILLIS })
         }
+        activityLogTracker.trackDateRangeFilterSelected(dateRange, rewindableOnly)
+        currentDateRangeFilter = adjustedDateRange
+        refreshFiltersUiState()
+        requestEventsUpdate(false)
     }
 
-    private fun List<ActivityLogListItem>.containsProgressItem(): Boolean {
-        return this.find { it is ActivityLogListItem.Progress } != null
+    fun onClearDateRangeFilterClicked() {
+        activityLogTracker.trackDateRangeFilterCleared(rewindableOnly)
+        currentDateRangeFilter = null
+        refreshFiltersUiState()
+        requestEventsUpdate(false)
     }
 
-    private fun getRewindProgressItem(activityLogModel: ActivityLogModel?): ActivityLogListItem.Progress {
-        return activityLogModel?.let {
-            val rewoundEvent = ActivityLogListItem.Event(it)
-            ActivityLogListItem.Progress(resourceProvider.getString(R.string.activity_log_currently_restoring_title),
-                    resourceProvider.getString(R.string.activity_log_currently_restoring_message,
-                            rewoundEvent.formattedDate, rewoundEvent.formattedTime))
-        } ?: ActivityLogListItem.Progress(resourceProvider.getString(R.string.activity_log_currently_restoring_title),
-                resourceProvider.getString(R.string.activity_log_currently_restoring_message_no_dates))
+    fun onActivityTypeFilterClicked() {
+        activityLogTracker.trackActivityTypeFilterButtonClicked()
+        _showActivityTypeFilterDialog.value = ShowActivityTypePicker(
+                RemoteId(site.siteId),
+                currentActivityTypeFilter.map { it.key },
+                currentDateRangeFilter
+        )
     }
 
-    private fun requestEventsUpdate(isLoadingMore: Boolean) {
-        if (canRequestEventsUpdate(isLoadingMore)) {
-            val newStatus = if (isLoadingMore) ActivityLogListStatus.LOADING_MORE else ActivityLogListStatus.FETCHING
-            _eventListStatus.value = newStatus
-            val payload = ActivityLogStore.FetchActivityLogPayload(site, isLoadingMore)
-            launch {
-                val result = activityLogStore.fetchActivities(payload)
-                onActivityLogFetched(result, isLoadingMore)
-            }
+    fun onActivityTypesSelected(selectedTypes: List<ActivityTypeModel>) {
+        activityLogTracker.trackActivityTypeFilterSelected(selectedTypes)
+        currentActivityTypeFilter = selectedTypes
+        refreshFiltersUiState()
+        requestEventsUpdate(false)
+    }
+
+    fun onClearActivityTypeFilterClicked() {
+        activityLogTracker.trackActivityTypeFilterCleared()
+        currentActivityTypeFilter = listOf()
+        refreshFiltersUiState()
+        requestEventsUpdate(false)
+    }
+
+    fun onQueryRestoreStatus(rewindId: String, restoreId: Long) {
+        queryRestoreStatus(restoreId)
+        showRestoreStartedMessage(rewindId)
+    }
+
+    private fun queryRestoreStatus(restoreId: Long? = null) {
+        restoreStatusJob?.cancel()
+        restoreStatusJob = viewModelScope.launch {
+            getRestoreStatusUseCase.getRestoreStatus(site, restoreId)
+                    .collect { handleRestoreStatus(it) }
         }
     }
 
-    private fun canRequestEventsUpdate(isLoadingMore: Boolean): Boolean {
-        return when {
-            isLoadingInProgress -> false
-            isLoadingMore -> _eventListStatus.value == ActivityLogListStatus.CAN_LOAD_MORE
-            else -> true
+    private fun handleRestoreStatus(state: RestoreRequestState) {
+        when (state) {
+            is RestoreRequestState.Progress -> handleRestoreStatusForProgress(state)
+            is RestoreRequestState.Complete -> handleRestoreStatusForComplete(state)
+            else -> Unit // Do nothing
         }
     }
 
-    private fun showRewindStartedMessage() {
-        rewindStatusService.rewindingActivity?.let {
-            val event = Event(it)
+    private fun handleRestoreStatusForProgress(state: RestoreRequestState.Progress) {
+        if (!isRestoreProgressItemShown) {
+            reloadEvents(
+                    restoreEvent = RestoreEvent(
+                            displayProgress = true,
+                            isCompleted = false,
+                            rewindId = state.rewindId,
+                            published = state.published
+                    )
+            )
+        }
+    }
+
+    private fun handleRestoreStatusForComplete(state: RestoreRequestState.Complete) {
+        if (isRestoreProgressItemShown) {
+            requestEventsUpdate(
+                    loadMore = false,
+                    restoreEvent = RestoreEvent(
+                            displayProgress = false,
+                            isCompleted = true,
+                            rewindId = state.rewindId,
+                            published = state.published
+                    )
+            )
+        }
+    }
+
+    private fun showRestoreStartedMessage(rewindId: String) {
+        activityLogStore.getActivityLogItemByRewindId(rewindId)?.published?.let {
             _showSnackbarMessage.value = resourceProvider.getString(
                     R.string.activity_log_rewind_started_snackbar_message,
-                    event.formattedDate,
-                    event.formattedTime
+                    it.toFormattedDateString(),
+                    it.toFormattedTimeString()
             )
         }
     }
 
-    private fun showRewindFinishedMessage() {
-        val item = rewindStatusService.rewindingActivity
-        if (item != null) {
-            val event = Event(item)
-            _showSnackbarMessage.value =
-                    resourceProvider.getString(R.string.activity_log_rewind_finished_snackbar_message,
-                            event.formattedDate,
-                            event.formattedTime)
+    fun onQueryBackupDownloadStatus(rewindId: String, downloadId: Long, actionState: Int) {
+        queryBackupDownloadStatus(downloadId)
+
+        if (actionState == PROGRESS.id) {
+            showBackupDownloadStartedMessage(rewindId)
         } else {
-            _showSnackbarMessage.value =
-                    resourceProvider.getString(R.string.activity_log_rewind_finished_snackbar_message_no_dates)
+            showBackupDownloadFinishedMessage(rewindId)
         }
     }
 
-    private fun onActivityLogFetched(event: OnActivityLogFetched, loadingMore: Boolean) {
-        if (event.isError) {
-            _eventListStatus.value = ActivityLogListStatus.ERROR
-            AppLog.e(AppLog.T.ACTIVITY_LOG, "An error occurred while fetching the Activity log events")
-            return
+    private fun queryBackupDownloadStatus(downloadId: Long? = null) {
+        backupDownloadStatusJob?.cancel()
+        backupDownloadStatusJob = viewModelScope.launch {
+            getBackupDownloadStatusUseCase.getBackupDownloadStatus(site, downloadId)
+                    .collect { state -> handleBackupDownloadStatus(state) }
+        }
+    }
+
+    private fun handleBackupDownloadStatus(state: BackupDownloadRequestState) {
+        when (state) {
+            is BackupDownloadRequestState.Progress -> handleBackupDownloadStatusForProgress(state)
+            is BackupDownloadRequestState.Complete -> handleBackupDownloadStatusForComplete(state)
+            else -> Unit // Do nothing
         }
+    }
 
-        if (event.rowsAffected > 0) {
+    private fun handleBackupDownloadStatusForProgress(state: BackupDownloadRequestState.Progress) {
+        if (!isBackupDownloadProgressItemShown) {
             reloadEvents(
-                    !rewindStatusService.isRewindAvailable,
-                    rewindStatusService.isRewindInProgress,
-                    !event.canLoadMore
+                    backupDownloadEvent = BackupDownloadEvent(
+                            displayProgress = true,
+                            displayNotice = false,
+                            isCompleted = false,
+                            rewindId = state.rewindId,
+                            published = state.published
+                    )
             )
-            if (!loadingMore) {
-                moveToTop.call()
-            }
-            rewindStatusService.requestStatusUpdate()
         }
+    }
 
-        if (event.canLoadMore) {
-            _eventListStatus.value = ActivityLogListStatus.CAN_LOAD_MORE
+    private fun handleBackupDownloadStatusForComplete(state: BackupDownloadRequestState.Complete) {
+        val backupDownloadEvent = BackupDownloadEvent(
+                displayProgress = false,
+                displayNotice = state.isValid,
+                isCompleted = true,
+                rewindId = state.rewindId,
+                published = state.published,
+                url = state.url,
+                validUntil = state.validUntil,
+                downloadId = state.downloadId
+        )
+
+        if (isBackupDownloadProgressItemShown) {
+            requestEventsUpdate(loadMore = false, backupDownloadEvent = backupDownloadEvent)
         } else {
-            _eventListStatus.value = DONE
+            reloadEvents(backupDownloadEvent = backupDownloadEvent)
+        }
+    }
+
+    private fun showBackupDownloadStartedMessage(rewindId: String) {
+        activityLogStore.getActivityLogItemByRewindId(rewindId)?.published?.let {
+            _showSnackbarMessage.value = resourceProvider.getString(
+                    R.string.activity_log_backup_started_snackbar_message,
+                    it.toFormattedDateString(),
+                    it.toFormattedTimeString()
+            )
+        }
+    }
+
+    data class ShowDateRangePicker(val initialSelection: DateRange?)
+    data class ShowActivityTypePicker(
+        val siteId: RemoteId,
+        val initialSelection: List<String>,
+        val dateRange: DateRange?
+    )
+
+    data class RestoreEvent(
+        val displayProgress: Boolean,
+        val isCompleted: Boolean = false,
+        val rewindId: String? = null,
+        val published: Date? = null
+    )
+
+    data class BackupDownloadEvent(
+        val displayProgress: Boolean,
+        val displayNotice: Boolean,
+        val isCompleted: Boolean = false,
+        val rewindId: String? = null,
+        val published: Date? = null,
+        val downloadId: Long? = null,
+        val url: String? = null,
+        val validUntil: Date? = null
+    )
+
+    sealed class FiltersUiState(val visibility: Boolean) {
+        object FiltersHidden : FiltersUiState(visibility = false)
+
+        data class FiltersShown(
+            val dateRangeLabel: UiString,
+            val dateRangeLabelContentDescription: UiString,
+            val activityTypeLabel: UiString,
+            val activityTypeLabelContentDescription: UiString,
+            val onClearDateRangeFilterClicked: (() -> Unit)?,
+            val onClearActivityTypeFilterClicked: (() -> Unit)?
+        ) : FiltersUiState(visibility = true)
+    }
+
+    sealed class EmptyUiState {
+        abstract val emptyScreenTitle: UiString
+        abstract val emptyScreenSubtitle: UiString
+
+        object ActivityLog {
+            object EmptyFilters : EmptyUiState() {
+                override val emptyScreenTitle = UiStringRes(R.string.activity_log_empty_title)
+                override val emptyScreenSubtitle = UiStringRes(R.string.activity_log_empty_subtitle)
+            }
+
+            object ActiveFilters : EmptyUiState() {
+                override val emptyScreenTitle = UiStringRes(R.string.activity_log_active_filter_empty_title)
+                override val emptyScreenSubtitle = UiStringRes(R.string.activity_log_active_filter_empty_subtitle)
+            }
+        }
+
+        object Backup {
+            object EmptyFilters : EmptyUiState() {
+                override val emptyScreenTitle = UiStringRes(R.string.backup_empty_title)
+                override val emptyScreenSubtitle = UiStringRes(R.string.backup_empty_subtitle)
+            }
+
+            object ActiveFilters : EmptyUiState() {
+                override val emptyScreenTitle = UiStringRes(R.string.backup_active_filter_empty_title)
+                override val emptyScreenSubtitle = UiStringRes(R.string.backup_active_filter_empty_subtitle)
+            }
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt
index 46619c4cf189..e0340acfa9aa 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt
@@ -2,11 +2,15 @@ package org.wordpress.android.viewmodel.main
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.distinctUntilChanged
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.delay
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.FOLLOW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.main.MainActionListItem
 import org.wordpress.android.ui.main.MainActionListItem.ActionType
@@ -16,32 +20,49 @@ import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_ST
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.NO_ACTION
 import org.wordpress.android.ui.main.MainActionListItem.CreateAction
 import org.wordpress.android.ui.main.MainFabUiState
+import org.wordpress.android.ui.mysite.QuickStartRepository
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncementProvider
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.SiteUtils
 import org.wordpress.android.util.SiteUtils.hasFullAccessToContent
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
-import org.wordpress.android.util.config.WPStoriesFeatureConfig
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
+import org.wordpress.android.util.map
+import org.wordpress.android.util.mapNullable
 import org.wordpress.android.util.merge
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Named
 
+private const val SWITCH_TO_MY_SITE_DELAY = 500L
+
 class WPMainActivityViewModel @Inject constructor(
     private val featureAnnouncementProvider: FeatureAnnouncementProvider,
     private val buildConfigWrapper: BuildConfigWrapper,
     private val appPrefsWrapper: AppPrefsWrapper,
     private val analyticsTracker: AnalyticsTrackerWrapper,
-    private val wpStoriesFeatureConfig: WPStoriesFeatureConfig,
+    private val mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig,
+    private val quickStartRepository: QuickStartRepository,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
 ) : ScopedViewModel(mainDispatcher) {
     private var isStarted = false
 
     private val _fabUiState = MutableLiveData<MainFabUiState>()
-    val fabUiState: LiveData<MainFabUiState> = _fabUiState
+    val fabUiState: LiveData<MainFabUiState> = merge(
+            _fabUiState,
+            quickStartRepository.activeTask
+    ) { fabUiState, activeTask ->
+        val isFocusPointVisible = activeTask == PUBLISH_POST && fabUiState?.isFabVisible == true
+        if (isFocusPointVisible != fabUiState?.isFocusPointVisible) {
+            fabUiState?.copy(isFocusPointVisible = isFocusPointVisible)
+        } else {
+            fabUiState
+        }
+    }
 
     private val _showQuickStarInBottomSheet = MutableLiveData<Boolean>()
 
@@ -66,8 +87,11 @@ class WPMainActivityViewModel @Inject constructor(
     private val _isBottomSheetShowing = MutableLiveData<Event<Boolean>>()
     val isBottomSheetShowing: LiveData<Event<Boolean>> = _isBottomSheetShowing
 
-    private val _startLoginFlow = MutableLiveData<Event<Boolean>>()
-    val startLoginFlow: LiveData<Event<Boolean>> = _startLoginFlow
+    private val _startLoginFlow = MutableLiveData<Event<Unit>>()
+    val startLoginFlow: LiveData<Event<Unit>> = _startLoginFlow
+
+    private val _switchToMySite = MutableLiveData<Event<Unit>>()
+    val switchToMySite: LiveData<Event<Unit>> = _switchToMySite
 
     private val _onFeatureAnnouncementRequested = SingleLiveEvent<Unit>()
     val onFeatureAnnouncementRequested: LiveData<Unit> = _onFeatureAnnouncementRequested
@@ -75,6 +99,11 @@ class WPMainActivityViewModel @Inject constructor(
     private val _completeBottomSheetQuickStartTask = SingleLiveEvent<Unit>()
     val completeBottomSheetQuickStartTask: LiveData<Unit> = _completeBottomSheetQuickStartTask
 
+    val onFocusPointVisibilityChange = quickStartRepository.activeTask
+            .mapNullable { getExternalFocusPointInfo(it) }
+            .distinctUntilChanged()
+            .map { Event(it) } as LiveData<Event<List<FocusPointInfo>>>
+
     fun start(site: SiteModel?) {
         if (isStarted) return
         isStarted = true
@@ -89,46 +118,60 @@ class WPMainActivityViewModel @Inject constructor(
     private fun loadMainActions(site: SiteModel?) {
         val actionsList = ArrayList<MainActionListItem>()
 
-        actionsList.add(CreateAction(
-                actionType = NO_ACTION,
-                iconRes = 0,
-                labelRes = R.string.my_site_bottom_sheet_title,
-                onClickAction = null
-        ))
-        actionsList.add(CreateAction(
-                actionType = CREATE_NEW_POST,
-                iconRes = R.drawable.ic_posts_white_24dp,
-                labelRes = R.string.my_site_bottom_sheet_add_post,
-                onClickAction = ::onCreateActionClicked
-        ))
-        if (hasFullAccessToContent(site)) {
-            actionsList.add(CreateAction(
-                    actionType = CREATE_NEW_PAGE,
-                    iconRes = R.drawable.ic_pages_white_24dp,
-                    labelRes = R.string.my_site_bottom_sheet_add_page,
-                    onClickAction = ::onCreateActionClicked
-            ))
+        actionsList.add(
+                CreateAction(
+                        actionType = NO_ACTION,
+                        iconRes = 0,
+                        labelRes = R.string.my_site_bottom_sheet_title,
+                        onClickAction = null
+                )
+        )
+        if (SiteUtils.supportsStoriesFeature(site)) {
+            actionsList.add(
+                    CreateAction(
+                            actionType = CREATE_NEW_STORY,
+                            iconRes = R.drawable.ic_story_icon_24dp,
+                            labelRes = R.string.my_site_bottom_sheet_add_story,
+                            onClickAction = ::onCreateActionClicked
+                    )
+            )
         }
-        if (shouldShowStories(site)) {
-            actionsList.add(CreateAction(
-                    actionType = CREATE_NEW_STORY,
-                    iconRes = R.drawable.ic_story_icon_24dp,
-                    labelRes = R.string.my_site_bottom_sheet_add_story,
-                    onClickAction = ::onCreateActionClicked
-            ))
+        actionsList.add(
+                CreateAction(
+                        actionType = CREATE_NEW_POST,
+                        iconRes = R.drawable.ic_posts_white_24dp,
+                        labelRes = R.string.my_site_bottom_sheet_add_post,
+                        onClickAction = ::onCreateActionClicked
+                )
+        )
+        if (hasFullAccessToContent(site)) {
+            actionsList.add(
+                    CreateAction(
+                            actionType = CREATE_NEW_PAGE,
+                            iconRes = R.drawable.ic_pages_white_24dp,
+                            labelRes = R.string.my_site_bottom_sheet_add_page,
+                            onClickAction = ::onCreateActionClicked
+                    )
+            )
         }
 
         _mainActions.postValue(actionsList)
     }
 
     private fun onCreateActionClicked(actionType: ActionType) {
+        val properties = mapOf("action" to actionType.name.toLowerCase(Locale.ROOT))
+        analyticsTracker.track(Stat.MY_SITE_CREATE_SHEET_ACTION_TAPPED, properties)
         _isBottomSheetShowing.postValue(Event(false))
         _createAction.postValue(actionType)
 
         _showQuickStarInBottomSheet.value?.let { showQuickStart ->
             if (showQuickStart) {
                 if (actionType == CREATE_NEW_POST) {
-                    _completeBottomSheetQuickStartTask.call()
+                    if (mySiteImprovementsFeatureConfig.isEnabled()) {
+                        quickStartRepository.completeTask(PUBLISH_POST)
+                    } else {
+                        _completeBottomSheetQuickStartTask.call()
+                    }
                 }
                 _showQuickStarInBottomSheet.postValue(false)
             }
@@ -152,32 +195,29 @@ class WPMainActivityViewModel @Inject constructor(
         appPrefsWrapper.setMainFabTooltipDisabled(true)
         setMainFabUiState(true, site)
 
-        _showQuickStarInBottomSheet.postValue(shouldShowQuickStartFocusPoint)
+        val quickStartFromImprovedMySiteFragment = mySiteImprovementsFeatureConfig.isEnabled() &&
+                quickStartRepository.activeTask.value == PUBLISH_POST
+        _showQuickStarInBottomSheet.postValue(shouldShowQuickStartFocusPoint || quickStartFromImprovedMySiteFragment)
 
-        if (shouldShowStories(site)) {
+        if (SiteUtils.supportsStoriesFeature(site) || hasFullAccessToContent(site)) {
+            // The user has at least two create options available for this site (pages and/or story posts),
+            // so we should show a bottom sheet.
+            // Creation options added in the future should also be weighed here.
+
+            // Reload main actions, since the first time this is initialized the SiteModel may not contain the
+            // latest info.
             loadMainActions(site)
+
+            analyticsTracker.track(Stat.MY_SITE_CREATE_SHEET_SHOWN)
             _isBottomSheetShowing.value = Event(true)
         } else {
-            // NOTE: this whole piece of code and comment below to be removed when we remove the feature flag.
-            // Also note: This comment below and code as is is in `develop` at the time of writing the feature
-            // flag, so bringing it all back in. See https://github.com/wordpress-mobile/WordPress-Android/pull/11930
-            // ----------------------
-            // Currently this bottom sheet has only 2 options.
-            // We should evaluate to re-introduce the bottom sheet also for users without full access to content
-            // if user has at least 2 options (eventually filtering the content not accessible like pages in this case)
-            // See p5T066-1cA-p2/#comment-4463
-            if (hasFullAccessToContent(site)) {
-                // reload main actions given the first time this is initialized, the SiteModel may not contain the
-                // latest info
-                loadMainActions(site)
-                _isBottomSheetShowing.value = Event(true)
-            } else {
-                _createAction.postValue(CREATE_NEW_POST)
-            }
+            // User only has one option - creating a post. Skip the bottom sheet and go straight to that action.
+            _createAction.postValue(CREATE_NEW_POST)
         }
     }
 
-    fun onPageChanged(showFab: Boolean, site: SiteModel?) {
+    fun onPageChanged(isOnMySitePageWithValidSite: Boolean, site: SiteModel?) {
+        val showFab = if (buildConfigWrapper.isJetpackApp) false else isOnMySitePageWithValidSite
         setMainFabUiState(showFab, site)
     }
 
@@ -189,11 +229,15 @@ class WPMainActivityViewModel @Inject constructor(
         disableTooltip(site)
     }
 
-    fun onOpenLoginPage() {
-        _startLoginFlow.value = Event(true)
+    fun onOpenLoginPage(mySitePosition: Int) = launch {
+        _startLoginFlow.value = Event(Unit)
+        appPrefsWrapper.setMainPageIndex(mySitePosition)
+        delay(SWITCH_TO_MY_SITE_DELAY)
+        _switchToMySite.value = Event(Unit)
     }
 
-    fun onResume(site: SiteModel?, showFab: Boolean) {
+    fun onResume(site: SiteModel?, isOnMySitePageWithValidSite: Boolean) {
+        val showFab = if (buildConfigWrapper.isJetpackApp) false else isOnMySitePageWithValidSite
         setMainFabUiState(showFab, site)
 
         launch {
@@ -223,25 +267,28 @@ class WPMainActivityViewModel @Inject constructor(
     }
 
     fun getCreateContentMessageId(site: SiteModel?): Int {
-        return if (shouldShowStories(site))
+        return if (SiteUtils.supportsStoriesFeature(site)) {
             getCreateContentMessageId_StoriesFlagOn(hasFullAccessToContent(site))
-        else
+        } else {
             getCreateContentMessageId_StoriesFlagOff(hasFullAccessToContent(site))
+        }
     }
 
     // create_post_page_fab_tooltip_stories_feature_flag_on
     private fun getCreateContentMessageId_StoriesFlagOn(hasFullAccessToContent: Boolean): Int {
-        return if (hasFullAccessToContent)
+        return if (hasFullAccessToContent) {
             R.string.create_post_page_fab_tooltip_stories_enabled
-        else
+        } else {
             R.string.create_post_page_fab_tooltip_contributors_stories_enabled
+        }
     }
 
     private fun getCreateContentMessageId_StoriesFlagOff(hasFullAccessToContent: Boolean): Int {
-        return if (hasFullAccessToContent)
+        return if (hasFullAccessToContent) {
             R.string.create_post_page_fab_tooltip
-        else
+        } else {
             R.string.create_post_page_fab_tooltip_contributors
+        }
     }
 
     private fun updateFeatureAnnouncements() {
@@ -258,7 +305,14 @@ class WPMainActivityViewModel @Inject constructor(
                 appPrefsWrapper.featureAnnouncementShownVersion < cachedAnnouncement.announcementVersion
     }
 
-    private fun shouldShowStories(site: SiteModel?): Boolean {
-        return wpStoriesFeatureConfig.isEnabled() && SiteUtils.supportsStoriesFeature(site)
+    private fun getExternalFocusPointInfo(task: QuickStartTask?): List<FocusPointInfo> {
+        // For now, we only do this for the FOLLOW_SITE task.
+        val followSitesTaskFocusPointInfo = FocusPointInfo(FOLLOW_SITE, task == FOLLOW_SITE)
+        return listOf(followSitesTaskFocusPointInfo)
     }
+
+    data class FocusPointInfo(
+        val task: QuickStartTask,
+        val isVisible: Boolean
+    )
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
index d01c6dc062e1..cfdd3c3dcf35 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
@@ -1,13 +1,11 @@
 package org.wordpress.android.viewmodel.mlp
 
-import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.wordpress.android.BuildConfig
 import org.wordpress.android.R.string
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.generated.SiteActionBuilder
@@ -17,22 +15,22 @@ import org.wordpress.android.fluxc.store.SiteStore.FetchBlockLayoutsPayload
 import org.wordpress.android.fluxc.store.SiteStore.OnBlockLayoutsFetched
 import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
-import org.wordpress.android.ui.mlp.CategoryListItemUiState
-import org.wordpress.android.ui.mlp.ButtonsUiState
-import org.wordpress.android.ui.mlp.GutenbergPageLayouts
-import org.wordpress.android.ui.mlp.LayoutListItemUiState
-import org.wordpress.android.ui.mlp.LayoutCategoryUiState
+import org.wordpress.android.ui.layoutpicker.LayoutModel
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Loading
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
+import org.wordpress.android.ui.layoutpicker.toLayoutCategories
+import org.wordpress.android.ui.layoutpicker.toLayoutModels
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker
 import org.wordpress.android.ui.mlp.SupportedBlocksProvider
-import org.wordpress.android.ui.mlp.ThumbDimensionProvider
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.SiteUtils
 import org.wordpress.android.viewmodel.Event
-import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.ContentUiState
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.ErrorUiState
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.LoadingUiState
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -45,40 +43,40 @@ class ModalLayoutPickerViewModel @Inject constructor(
     private val appPrefsWrapper: AppPrefsWrapper,
     private val supportedBlocksProvider: SupportedBlocksProvider,
     private val thumbDimensionProvider: ThumbDimensionProvider,
-    private val networkUtils: NetworkUtilsWrapper,
-    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
-    @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
-) : ScopedViewModel(mainDispatcher) {
-    private lateinit var layouts: GutenbergPageLayouts
-
+    private val displayUtilsWrapper: DisplayUtilsWrapper,
+    override val networkUtils: NetworkUtilsWrapper,
+    private val analyticsTracker: ModalLayoutPickerTracker,
+    @Named(BG_THREAD) override val bgDispatcher: CoroutineDispatcher,
+    @Named(UI_THREAD) override val mainDispatcher: CoroutineDispatcher
+) : LayoutPickerViewModel(mainDispatcher, bgDispatcher, networkUtils, analyticsTracker) {
     /**
      * Tracks the Modal Layout Picker visibility state
      */
     private val _isModalLayoutPickerShowing = MutableLiveData<Event<Boolean>>()
     val isModalLayoutPickerShowing: LiveData<Event<Boolean>> = _isModalLayoutPickerShowing
 
-    private val _onCategorySelected = MutableLiveData<Event<Unit>>()
-    val onCategorySelected: LiveData<Event<Unit>> = _onCategorySelected
-
-    private val _uiState: MutableLiveData<UiState> = MutableLiveData()
-    val uiState: LiveData<UiState> = _uiState
-
     /**
      * Create new page event
      */
     private val _onCreateNewPageRequested = SingleLiveEvent<PageRequest.Create>()
     val onCreateNewPageRequested: LiveData<PageRequest.Create> = _onCreateNewPageRequested
 
-    /**
-     * Preview page event
-     */
-    private val _onPreviewPageRequested = SingleLiveEvent<PageRequest.Preview>()
-    val onPreviewPageRequested: LiveData<PageRequest.Preview> = _onPreviewPageRequested
+    private val site: SiteModel by lazy { siteStore.getSiteByLocalId(appPrefsWrapper.getSelectedSite()) }
+
+    override val useCachedData: Boolean = true
+
+    override val selectedLayout: LayoutModel?
+        get() = (uiState.value as? Content)?.let { state ->
+            state.selectedLayoutSlug?.let { siteStore.getBlockLayout(site, it) }?.let { LayoutModel(it) }
+        }
 
     sealed class PageRequest(val template: String?, val content: String) {
         open class Create(template: String?, content: String, val title: String) : PageRequest(template, content)
         object Blank : Create(null, "", "")
-        class Preview(template: String?, content: String, val site: SiteModel) : PageRequest(template, content)
+        class Preview(template: String?, content: String, val site: SiteModel, val demoUrl: String?) : PageRequest(
+                template,
+                content
+        )
     }
 
     init {
@@ -90,16 +88,23 @@ class ModalLayoutPickerViewModel @Inject constructor(
         super.onCleared()
     }
 
-    private fun fetchLayouts() {
-        updateUiState(LoadingUiState)
-        launch(bgDispatcher) {
-            val siteId = appPrefsWrapper.getSelectedSite()
-            val site = siteStore.getSiteByLocalId(siteId)
+    override fun fetchLayouts(preferCache: Boolean) {
+        if (!networkUtils.isNetworkAvailable()) {
+            setErrorState()
+            return
+        }
+        if (!preferCache) {
+            updateUiState(Loading)
+        }
+        launch {
             val payload = FetchBlockLayoutsPayload(
                     site,
                     supportedBlocksProvider.fromAssets().supported,
                     thumbDimensionProvider.previewWidth.toFloat(),
-                    thumbDimensionProvider.scale.toFloat()
+                    thumbDimensionProvider.previewHeight.toFloat(),
+                    thumbDimensionProvider.scale.toFloat(),
+                    BuildConfig.DEBUG,
+                    preferCache
             )
             dispatcher.dispatch(SiteActionBuilder.newFetchBlockLayoutsAction(payload))
         }
@@ -110,73 +115,15 @@ class ModalLayoutPickerViewModel @Inject constructor(
         if (event.isError) {
             setErrorState()
         } else {
-            handleBlockLayoutsResponse(GutenbergPageLayouts(event.layouts, event.categories))
+            handleResponse(event.layouts.toLayoutModels(), event.categories.toLayoutCategories())
         }
     }
 
-    fun fetchedLayouts(): GutenbergPageLayouts = if (::layouts.isInitialized) layouts else GutenbergPageLayouts()
-
-    private fun handleBlockLayoutsResponse(response: GutenbergPageLayouts) {
-        layouts = response
-        loadCategories()
-    }
-
     private fun setErrorState() {
         if (networkUtils.isNetworkAvailable()) {
-            updateUiState(ErrorUiState(string.mlp_error_title, string.mlp_error_subtitle))
+            updateUiState(Error(string.mlp_error_title, string.mlp_error_subtitle))
         } else {
-            updateUiState(ErrorUiState(string.mlp_network_error_title, string.mlp_network_error_subtitle))
-        }
-    }
-
-    private fun loadLayouts() {
-        val state = uiState.value as? ContentUiState ?: ContentUiState()
-        launch(bgDispatcher) {
-            val listItems = ArrayList<LayoutCategoryUiState>()
-
-            val selectedCategories = if (state.selectedCategoriesSlugs.isNotEmpty())
-                layouts.categories.filter { state.selectedCategoriesSlugs.contains(it.slug) }
-            else layouts.categories
-
-            selectedCategories.sortedBy { it.title }.forEach { category ->
-
-                val layouts = layouts.getFilteredLayouts(category.slug).map { layout ->
-                    val selected = layout.slug == state.selectedLayoutSlug
-                    LayoutListItemUiState(layout.slug, layout.title, layout.preview, selected,
-                            onItemTapped = { onLayoutTapped(layoutSlug = layout.slug) },
-                            onThumbnailReady = { onThumbnailReady(layoutSlug = layout.slug) }
-                    )
-                }
-                listItems.add(
-                        LayoutCategoryUiState(
-                                category.slug,
-                                category.title,
-                                category.description,
-                                layouts
-                        )
-                )
-            }
-            withContext(mainDispatcher) {
-                updateUiState(state.copy(layoutCategories = listItems))
-            }
-        }
-    }
-
-    private fun loadCategories() {
-        val state = uiState.value as? ContentUiState ?: ContentUiState()
-        launch(bgDispatcher) {
-            val listItems: List<CategoryListItemUiState> = layouts.categories.sortedBy { it.title }.map {
-                CategoryListItemUiState(
-                        it.slug,
-                        it.title,
-                        it.emoji,
-                        state.selectedCategoriesSlugs.contains(it.slug)
-                ) { onCategoryTapped(it.slug) }
-            }
-            withContext(mainDispatcher) {
-                updateUiState(state.copy(categories = listItems))
-            }
-            loadLayouts()
+            updateUiState(Error(string.mlp_network_error_title, string.mlp_network_error_subtitle))
         }
     }
 
@@ -185,104 +132,23 @@ class ModalLayoutPickerViewModel @Inject constructor(
      * at this point the only requirement is to have the block editor enabled
      * @return true if the Modal Layout Picker can be shown
      */
-    fun canShowModalLayoutPicker(): Boolean {
-        val siteId = appPrefsWrapper.getSelectedSite()
-        val site = siteStore.getSiteByLocalId(siteId)
-        return SiteUtils.isBlockEditorDefaultForNewPost(site)
-    }
+    fun canShowModalLayoutPicker() = SiteUtils.isBlockEditorDefaultForNewPost(site)
 
     /**
      * Triggers the create page flow and shows the MLP
      */
     fun createPageFlowTriggered() {
         _isModalLayoutPickerShowing.value = Event(true)
+        initializePreviewMode(displayUtilsWrapper.isTablet())
         fetchLayouts()
     }
 
-    /**
-     * Retries data fetching
-     */
-    fun onRetryClicked() {
-        if (networkUtils.isNetworkAvailable()) {
-            fetchLayouts()
-        }
-    }
-
     /**
      * Dismisses the MLP
      */
     fun dismiss() {
         _isModalLayoutPickerShowing.postValue(Event(false))
-        updateUiState(ContentUiState())
-    }
-
-    /**
-     * Sets the header and title visibility
-     * @param headerShouldBeVisible if true the header is shown and the title hidden
-     */
-    private fun setHeaderTitleVisibility(headerShouldBeVisible: Boolean) {
-        (uiState.value as? ContentUiState)?.let { state ->
-            if (state.isHeaderVisible == headerShouldBeVisible) return // No change
-            updateUiState(state.copy(isHeaderVisible = headerShouldBeVisible))
-        }
-    }
-
-    /**
-     * Layout thumbnail is ready
-     * @param layoutSlug the slug of the tapped layout
-     */
-    fun onThumbnailReady(layoutSlug: String) {
-        (uiState.value as? ContentUiState)?.let { state ->
-            updateUiState(state.copy(loadedThumbnailSlugs = state.loadedThumbnailSlugs.apply { add(layoutSlug) }))
-        }
-    }
-
-    /**
-     * Appbar scrolled event
-     * @param verticalOffset the scroll state vertical offset
-     * @param scrollThreshold the scroll threshold
-     */
-    fun onAppBarOffsetChanged(verticalOffset: Int, scrollThreshold: Int) {
-        setHeaderTitleVisibility(verticalOffset < scrollThreshold)
-    }
-
-    /**
-     * Category tapped
-     * @param categorySlug the slug of the tapped category
-     */
-    fun onCategoryTapped(categorySlug: String) {
-        (uiState.value as? ContentUiState)?.let { state ->
-            if (state.selectedCategoriesSlugs.contains(categorySlug)) { // deselect
-                updateUiState(
-                        state.copy(selectedCategoriesSlugs = state.selectedCategoriesSlugs.apply {
-                            remove(categorySlug)
-                        })
-                )
-            } else {
-                updateUiState(
-                        state.copy(selectedCategoriesSlugs = state.selectedCategoriesSlugs.apply { add(categorySlug) })
-                )
-            }
-            loadCategories()
-            _onCategorySelected.postValue(Event(Unit))
-        }
-    }
-
-    /**
-     * Layout tapped
-     * @param layoutSlug the slug of the tapped layout
-     */
-    fun onLayoutTapped(layoutSlug: String) {
-        (uiState.value as? ContentUiState)?.let { state ->
-            if (!state.loadedThumbnailSlugs.contains(layoutSlug)) return // No action
-            if (layoutSlug == state.selectedLayoutSlug) { // deselect
-                updateUiState(state.copy(selectedLayoutSlug = null))
-            } else {
-                updateUiState(state.copy(selectedLayoutSlug = layoutSlug))
-            }
-            updateButtonsUiState()
-            loadLayouts()
-        }
+        updateUiState(Content())
     }
 
     /**
@@ -293,81 +159,20 @@ class ModalLayoutPickerViewModel @Inject constructor(
         dismiss()
     }
 
-    /**
-     * Preview page tapped
-     */
-    fun onPreviewPageClicked() {
-        (uiState.value as? ContentUiState)?.let { state ->
-            layouts.layouts.firstOrNull { it.slug == state.selectedLayoutSlug }?.let { layout ->
-                val site = siteStore.getSiteByLocalId(appPrefsWrapper.getSelectedSite())
-                _onPreviewPageRequested.value = PageRequest.Preview(layout.slug, layout.content, site)
-            }
-        }
-    }
-
-    /**
-     * Updates the buttons UiState
-     */
-    private fun updateButtonsUiState() {
-        (uiState.value as? ContentUiState)?.let { state ->
-            val selection = state.selectedLayoutSlug != null
-            updateUiState(state.copy(buttonsUiState = ButtonsUiState(!selection, selection, selection)))
-        }
+    override fun onPreviewChooseTapped() {
+        super.onPreviewChooseTapped()
+        onCreatePageClicked()
     }
 
     /**
      * Triggers the creation of a new page
      */
     private fun createPage() {
-        (uiState.value as? ContentUiState)?.let { state ->
-            layouts.layouts.firstOrNull { it.slug == state.selectedLayoutSlug }?.let { layout ->
-                _onCreateNewPageRequested.value = PageRequest.Create(layout.slug, layout.content, layout.title)
-                return
-            }
-        }
-        _onCreateNewPageRequested.value = PageRequest.Blank
-    }
-
-    private fun updateUiState(uiState: UiState) {
-        _uiState.value = uiState
-    }
-
-    fun loadSavedState(layouts: GutenbergPageLayouts?, selectedLayout: String?, selectedCategories: List<String>?) {
-        if (layouts == null || layouts.isEmpty) {
-            setErrorState()
+        selectedLayout?.let { layout ->
+            val content: String = siteStore.getBlockLayoutContent(site, layout.slug) ?: ""
+            _onCreateNewPageRequested.value = PageRequest.Create(layout.slug, content, layout.title)
             return
         }
-        val state = uiState.value as? ContentUiState ?: ContentUiState()
-        val categories = ArrayList(selectedCategories ?: listOf())
-        updateUiState(state.copy(selectedLayoutSlug = selectedLayout, selectedCategoriesSlugs = categories))
-        updateButtonsUiState()
-        handleBlockLayoutsResponse(layouts)
-    }
-
-    sealed class UiState(
-        open val isHeaderVisible: Boolean = false,
-        val isDescriptionVisible: Boolean = true,
-        val loadingSkeletonVisible: Boolean = false,
-        val errorViewVisible: Boolean = false,
-        open val buttonsUiState: ButtonsUiState = ButtonsUiState()
-    ) {
-        object LoadingUiState : UiState(loadingSkeletonVisible = true)
-
-        data class ContentUiState(
-            override val isHeaderVisible: Boolean = false,
-            val selectedCategoriesSlugs: ArrayList<String> = arrayListOf(),
-            val selectedLayoutSlug: String? = null,
-            val loadedThumbnailSlugs: ArrayList<String> = arrayListOf(),
-            val categories: List<CategoryListItemUiState> = listOf(),
-            val layoutCategories: List<LayoutCategoryUiState> = listOf(),
-            override val buttonsUiState: ButtonsUiState = ButtonsUiState()
-        ) : UiState()
-
-        data class ErrorUiState(@StringRes val title: Int, @StringRes val subtitle: Int) : UiState(
-                errorViewVisible = true,
-                isHeaderVisible = true,
-                isDescriptionVisible = false,
-                buttonsUiState = ButtonsUiState(retryVisible = true)
-        )
+        _onCreateNewPageRequested.value = PageRequest.Blank
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCase.kt
index da8469341109..c14e75ecefe0 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCase.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCase.kt
@@ -4,6 +4,7 @@ import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.pages.PageItem.Action
 import org.wordpress.android.ui.pages.PageItem.Action.CANCEL_AUTO_UPLOAD
+import org.wordpress.android.ui.pages.PageItem.Action.COPY
 import org.wordpress.android.ui.pages.PageItem.Action.DELETE_PERMANENTLY
 import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_DRAFT
 import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_TRASH
@@ -43,6 +44,7 @@ class CreatePageListItemActionsUseCase @Inject constructor() {
             PUBLISHED -> {
                 mutableSetOf(
                         VIEW_PAGE,
+                        COPY,
                         SET_PARENT
                 ).apply {
                     if (siteModel.isUsingWpComRestApi &&
@@ -55,14 +57,18 @@ class CreatePageListItemActionsUseCase @Inject constructor() {
                             add(SET_AS_POSTS_PAGE)
                         }
                     }
-                    add(MOVE_TO_DRAFT)
-                    add(MOVE_TO_TRASH)
+
+                    if (siteModel.pageOnFront != remoteId && listType == PUBLISHED) {
+                        add(MOVE_TO_DRAFT)
+                        add(MOVE_TO_TRASH)
+                    }
+
                     if (canCancelPendingAutoUpload(uploadUiState)) {
                         add(CANCEL_AUTO_UPLOAD)
                     }
                 }
             }
-            DRAFTS -> mutableSetOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH).apply {
+            DRAFTS -> mutableSetOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH, COPY).apply {
                 if (canCancelPendingAutoUpload(uploadUiState)) {
                     add(CANCEL_AUTO_UPLOAD)
                 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListDialogHelper.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListDialogHelper.kt
index d5a05636e5c9..fc2e7bda4731 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListDialogHelper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListDialogHelper.kt
@@ -16,6 +16,7 @@ import java.lang.NullPointerException
 
 private const val CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG = "CONFIRM_ON_AUTOSAVE_REVISION_DIALOG_TAG"
 private const val CONFIRM_DELETE_PAGE_DIALOG_TAG = "CONFIRM_DELETE_PAGE_DIALOG_TAG"
+private const val CONFIRM_COPY_CONFLICT_DIALOG_TAG = "CONFIRM_COPY_CONFLICT_DIALOG_TAG"
 private const val POST_TYPE = "post_type"
 
 class PageListDialogHelper(
@@ -24,6 +25,7 @@ class PageListDialogHelper(
 ) {
     private var pageIdForAutosaveRevisionResolutionDialog: RemoteId? = null
     private var pageIdForDeleteDialog: RemoteId? = null
+    private var pageIdForCopyDialog: RemoteId? = null
 
     fun showAutoSaveRevisionDialog(page: PostModel) {
         analyticsTracker.track(UNPUBLISHED_REVISION_DIALOG_SHOWN, mapOf(POST_TYPE to "page"))
@@ -53,10 +55,23 @@ class PageListDialogHelper(
         showDialog.invoke(dialogHolder)
     }
 
+    fun showCopyConflictDialog(page: PostModel) {
+        val dialogHolder = DialogHolder(
+                tag = CONFIRM_COPY_CONFLICT_DIALOG_TAG,
+                title = UiStringRes(R.string.dialog_confirm_copy_local_title),
+                message = UiStringRes(R.string.dialog_confirm_copy_local_message),
+                positiveButton = UiStringRes(R.string.dialog_confirm_copy_local_edit_button),
+                negativeButton = UiStringRes(R.string.dialog_confirm_copy_local_copy_button)
+        )
+        pageIdForCopyDialog = RemoteId(page.remotePostId)
+        showDialog.invoke(dialogHolder)
+    }
+
     fun onPositiveClickedForBasicDialog(
         instanceTag: String,
         deletePage: (RemoteId) -> Unit,
-        editPage: (RemoteId, LoadAutoSaveRevision) -> Unit
+        editPage: (RemoteId, LoadAutoSaveRevision) -> Unit,
+        editPageFirst: (RemoteId) -> Unit
     ) {
         when (instanceTag) {
             CONFIRM_DELETE_PAGE_DIALOG_TAG -> pageIdForDeleteDialog?.let {
@@ -73,14 +88,18 @@ class PageListDialogHelper(
                 )
             }
                     ?: throw NullPointerException("pageIdForAutosaveRevisionResolutionDialog shouldn't be null.")
-
+            CONFIRM_COPY_CONFLICT_DIALOG_TAG -> pageIdForCopyDialog?.let {
+                pageIdForCopyDialog = null
+                editPageFirst(it)
+            } ?: throw NullPointerException("pageIdForCopyDialog shouldn't be null.")
             else -> throw IllegalArgumentException("Dialog's positive button click is not handled: $instanceTag")
         }
     }
 
     fun onNegativeClickedForBasicDialog(
         instanceTag: String,
-        editPage: (RemoteId, LoadAutoSaveRevision) -> Unit
+        editPage: (RemoteId, LoadAutoSaveRevision) -> Unit,
+        copyPage: (RemoteId) -> Unit
     ) {
         when (instanceTag) {
             CONFIRM_DELETE_PAGE_DIALOG_TAG -> pageIdForDeleteDialog = null
@@ -93,7 +112,10 @@ class PageListDialogHelper(
                 )
             }
                     ?: throw NullPointerException("pageIdForAutosaveRevisionResolutionDialog shouldn't be null.")
-
+            CONFIRM_COPY_CONFLICT_DIALOG_TAG -> pageIdForCopyDialog?.let {
+                pageIdForCopyDialog = null
+                copyPage(it)
+            } ?: throw NullPointerException("pageIdForCopyDialog shouldn't be null.")
             else -> throw IllegalArgumentException("Dialog's negative button click is not handled: $instanceTag")
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
index 63ed50e5d836..08a4b37a6ff7 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
@@ -41,7 +41,7 @@ class PageListEventListener(
     private val siteStore: SiteStore,
     private val site: SiteModel,
     private val handleRemoteAutoSave: (LocalId, Boolean) -> Unit,
-    private val handlePostUploadFinished: (RemoteId, Boolean) -> Unit,
+    private val handlePostUploadFinished: (RemoteId, Boolean, Boolean) -> Unit,
     private val invalidateUploadStatus: (List<LocalId>) -> Unit,
     private val handleHomepageSettingsChange: (SiteModel) -> Unit
 ) : CoroutineScope {
@@ -118,7 +118,7 @@ class PageListEventListener(
     fun onPostUploaded(event: OnPostUploaded) {
         if (event.post != null && event.post.isPage && event.post.localSiteId == site.id) {
             uploadStatusChanged(LocalId(event.post.id))
-            handlePostUploadFinished(RemoteId(event.post.remotePostId), event.isError)
+            handlePostUploadFinished(RemoteId(event.post.remotePostId), event.isError, event.isFirstTimePublish)
         }
     }
 
@@ -197,7 +197,7 @@ class PageListEventListener(
             site: SiteModel,
             invalidateUploadStatus: (List<LocalId>) -> Unit,
             handleRemoteAutoSave: (LocalId, Boolean) -> Unit,
-            handlePostUploadFinished: (RemoteId, Boolean) -> Unit,
+            handlePostUploadFinished: (RemoteId, Boolean, Boolean) -> Unit,
             handleHomepageSettingsChange: (SiteModel) -> Unit
         ): PageListEventListener {
             return PageListEventListener(
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
index 553df462e2f1..ffef7dbc08ab 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListViewModel.kt
@@ -1,5 +1,6 @@
 package org.wordpress.android.viewmodel.pages
 
+import android.content.Context
 import androidx.annotation.ColorRes
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
@@ -20,7 +21,9 @@ import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.MediaStore
 import org.wordpress.android.fluxc.store.MediaStore.MediaPayload
 import org.wordpress.android.fluxc.store.MediaStore.OnMediaChanged
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
 import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.ui.mysite.QuickStartRepository
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Action
 import org.wordpress.android.ui.pages.PageItem.Divider
@@ -32,10 +35,13 @@ import org.wordpress.android.ui.pages.PageItem.ScheduledPage
 import org.wordpress.android.ui.pages.PageItem.TrashedPage
 import org.wordpress.android.ui.posts.AuthorFilterSelection
 import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
+import org.wordpress.android.ui.quickstart.QuickStartEvent
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.QuickStartUtilsWrapper
 import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
 import org.wordpress.android.util.toFormattedDateString
 import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.SingleLiveEvent
@@ -60,22 +66,31 @@ class PageListViewModel @Inject constructor(
     private val dispatcher: Dispatcher,
     private val localeManagerWrapper: LocaleManagerWrapper,
     private val accountStore: AccountStore,
-    @Named(BG_THREAD) private val coroutineDispatcher: CoroutineDispatcher
+    @Named(BG_THREAD) private val coroutineDispatcher: CoroutineDispatcher,
+    private val mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig,
+    private val quickStartRepository: QuickStartRepository,
+    private val quickStartUtilsWrapper: QuickStartUtilsWrapper
 ) : ScopedViewModel(coroutineDispatcher) {
     private val _pages: MutableLiveData<List<PageItem>> = MutableLiveData()
     val pages: LiveData<Triple<List<PageItem>, Boolean, Boolean>> = Transformations.map(_pages) {
         Triple(it, isSitePhotonCapable, isSitePrivateAt)
     }
-
+    private val _quickStartEvent: MutableLiveData<QuickStartEvent?> = MutableLiveData()
+    val quickStartEvent: LiveData<QuickStartEvent?> = _quickStartEvent
     private val _scrollToPosition = SingleLiveEvent<Int>()
     val scrollToPosition: LiveData<Int> = _scrollToPosition
-
     private var retryScrollToPage: LocalId? = null
     private var isStarted: Boolean = false
     private lateinit var listType: PageListType
 
     private lateinit var pagesViewModel: PagesViewModel
 
+    private val PageModel.isHomepage: Boolean
+        get() = remoteId == pagesViewModel.site.pageOnFront
+
+    private val PageModel.isPostsPage: Boolean
+        get() = remoteId == pagesViewModel.site.pageForPosts
+
     private val featuredImageMap = mutableMapOf<Long, String>()
 
     private val isSitePhotonCapable: Boolean by lazy {
@@ -142,16 +157,44 @@ class PageListViewModel @Inject constructor(
         dispatcher.unregister(this)
     }
 
-    fun onMenuAction(action: Action, pageItem: Page): Boolean {
+    fun onMenuAction(action: Action, pageItem: Page, context: Context): Boolean {
+        completeEditHomePageTour(pageItem, context)
         return pagesViewModel.onMenuAction(action, pageItem)
     }
 
-    fun onItemTapped(pageItem: Page) {
+    fun onItemTapped(pageItem: Page, context: Context) {
+        completeEditHomePageTour(pageItem, context)
+        _quickStartEvent.postValue(null)
         if (pageItem.tapActionEnabled) {
             pagesViewModel.onItemTapped(pageItem)
         }
     }
 
+    private fun completeEditHomePageTour(pageItem: Page, context: Context) {
+        if (isHomepage(pageItem)) {
+            if (mySiteImprovementsFeatureConfig.isEnabled()) {
+                quickStartRepository.completeTask(EDIT_HOMEPAGE)
+            } else {
+                quickStartUtilsWrapper.completeTaskAndRemindNextOne(
+                        EDIT_HOMEPAGE,
+                        pagesViewModel.site,
+                        _quickStartEvent.value,
+                        context
+                )
+            }
+        }
+    }
+
+    fun onQuickStartEvent(event: QuickStartEvent) {
+        if (event.task == EDIT_HOMEPAGE) {
+            _quickStartEvent.postValue(event)
+        }
+    }
+
+    private fun isHomepage(pageItem: Page): Boolean {
+        return pageItem.remoteId == pagesViewModel.site.pageOnFront
+    }
+
     fun onEmptyListNewPageButtonTapped() {
         pagesViewModel.onNewPageButtonTapped()
     }
@@ -259,16 +302,18 @@ class PageListViewModel @Inject constructor(
     }
 
     private fun preparePublishedPages(pages: List<PageModel>, actionsEnabled: Boolean): List<PageItem> {
-        val filteredPages = if (pagesViewModel.shouldFilterByAuthor())
+        val filteredPages = if (pagesViewModel.shouldFilterByAuthor()) {
             pages.filter { it.post.authorId == accountStore.account.userId }
-        else pages
+        } else {
+            pages
+        }
 
         val shouldSortTopologically = filteredPages.size < MAX_TOPOLOGICAL_PAGE_COUNT
-        val sortedPages = if (shouldSortTopologically) {
-            topologicalSort(filteredPages, listType = PUBLISHED)
+        val sortedPages = (if (shouldSortTopologically) {
+            topologicalSort(filteredPages.sortedBy { !(it.isHomepage && it.parent == null) }, listType = PUBLISHED)
         } else {
-            filteredPages.sortedByDescending { it.date }
-        }
+            filteredPages.sortedByDescending { it.date }.sortedBy { !it.isHomepage }
+        })
 
         return sortedPages
                 .map {
@@ -278,11 +323,17 @@ class PageListViewModel @Inject constructor(
                         DEFAULT_INDENT
                     }
                     val itemUiStateData = createItemUiStateData(it)
+                    val author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME) {
+                        null
+                    } else {
+                        it.post.authorDisplayName
+                    }
                     PublishedPage(
                             remoteId = it.remoteId,
                             localId = it.pageId,
                             title = it.title,
                             subtitle = itemUiStateData.subtitle,
+                            icon = itemUiStateData.icon,
                             date = it.date,
                             labels = itemUiStateData.labels,
                             labelsColor = itemUiStateData.labelsColor,
@@ -292,8 +343,8 @@ class PageListViewModel @Inject constructor(
                             actionsEnabled = actionsEnabled,
                             progressBarUiState = itemUiStateData.progressBarUiState,
                             showOverlay = itemUiStateData.showOverlay,
-                            author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME)
-                                null else it.post.authorDisplayName
+                            author = author,
+                            showQuickStartFocusPoint = itemUiStateData.showQuickStartFocusPoint
                     )
                 }
     }
@@ -302,16 +353,23 @@ class PageListViewModel @Inject constructor(
         pages: List<PageModel>,
         actionsEnabled: Boolean
     ): List<PageItem> {
-        val filteredPages = if (pagesViewModel.shouldFilterByAuthor())
+        val filteredPages = if (pagesViewModel.shouldFilterByAuthor()) {
             pages.filter { it.post.authorId == accountStore.account.userId }
-        else pages
+        } else {
+            pages
+        }
 
-        return filteredPages.asSequence().groupBy { it.date.toFormattedDateString() }
+        return filteredPages.groupBy { it.date.toFormattedDateString() }
                 .map { (date, results) ->
                     listOf(Divider(date)) +
                             results.map {
                                 val itemUiStateData = createItemUiStateData(it)
 
+                                val author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME) {
+                                    null
+                                } else {
+                                    it.post.authorDisplayName
+                                }
                                 ScheduledPage(
                                         remoteId = it.remoteId,
                                         localId = it.pageId,
@@ -324,8 +382,8 @@ class PageListViewModel @Inject constructor(
                                         actionsEnabled = actionsEnabled,
                                         progressBarUiState = itemUiStateData.progressBarUiState,
                                         showOverlay = itemUiStateData.showOverlay,
-                                        author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME)
-                                            null else it.post.authorDisplayName
+                                        author = author,
+                                        showQuickStartFocusPoint = itemUiStateData.showQuickStartFocusPoint
                                 )
                             }
                 }
@@ -336,58 +394,68 @@ class PageListViewModel @Inject constructor(
     }
 
     private fun prepareDraftPages(pages: List<PageModel>, actionsEnabled: Boolean): List<PageItem> {
-        val filteredPages = if (pagesViewModel.shouldFilterByAuthor())
+        val filteredPages = if (pagesViewModel.shouldFilterByAuthor()) {
             pages.filter { it.post.authorId == accountStore.account.userId }
-        else pages
+        } else {
+            pages
+        }
 
         return filteredPages
                 .map {
-            val itemUiStateData = createItemUiStateData(it)
-            DraftPage(
-                    remoteId = it.remoteId,
-                    localId = it.pageId,
-                    title = it.title,
-                    date = it.date,
-                    labels = itemUiStateData.labels,
-                    labelsColor = itemUiStateData.labelsColor,
-                    imageUrl = getFeaturedImageUrl(it.featuredImageId),
-                    actions = itemUiStateData.actions,
-                    actionsEnabled = actionsEnabled,
-                    progressBarUiState = itemUiStateData.progressBarUiState,
-                    showOverlay = itemUiStateData.showOverlay,
-                    author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME)
-                        null else it.post.authorDisplayName
-            )
-        }
+                    val itemUiStateData = createItemUiStateData(it)
+                    DraftPage(
+                            remoteId = it.remoteId,
+                            localId = it.pageId,
+                            title = it.title,
+                            date = it.date,
+                            labels = itemUiStateData.labels,
+                            labelsColor = itemUiStateData.labelsColor,
+                            imageUrl = getFeaturedImageUrl(it.featuredImageId),
+                            actions = itemUiStateData.actions,
+                            actionsEnabled = actionsEnabled,
+                            progressBarUiState = itemUiStateData.progressBarUiState,
+                            showOverlay = itemUiStateData.showOverlay,
+                            author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME)
+                                null else it.post.authorDisplayName,
+                            showQuickStartFocusPoint = itemUiStateData.showQuickStartFocusPoint
+                    )
+                }
     }
 
     private fun prepareTrashedPages(
         pages: List<PageModel>,
         actionsEnabled: Boolean
     ): List<PageItem> {
-        val filteredPages = if (pagesViewModel.shouldFilterByAuthor())
+        val filteredPages = if (pagesViewModel.shouldFilterByAuthor()) {
             pages.filter { it.post.authorId == accountStore.account.userId }
-        else pages
+        } else {
+            pages
+        }
 
         return filteredPages
-                    .map {
-            val itemUiStateData = createItemUiStateData(it)
-            TrashedPage(
-                    remoteId = it.remoteId,
-                    localId = it.pageId,
-                    title = it.title,
-                    date = it.date,
-                    labels = itemUiStateData.labels,
-                    labelsColor = itemUiStateData.labelsColor,
-                    imageUrl = getFeaturedImageUrl(it.featuredImageId),
-                    actions = itemUiStateData.actions,
-                    actionsEnabled = actionsEnabled,
-                    progressBarUiState = itemUiStateData.progressBarUiState,
-                    showOverlay = itemUiStateData.showOverlay,
-                    author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME)
-                        null else it.post.authorDisplayName
-            )
-        }
+                .map {
+                    val itemUiStateData = createItemUiStateData(it)
+                    val author = if (pagesViewModel.authorUIState.value?.authorFilterSelection == ME) {
+                        null
+                    } else {
+                        it.post.authorDisplayName
+                    }
+                    TrashedPage(
+                            remoteId = it.remoteId,
+                            localId = it.pageId,
+                            title = it.title,
+                            date = it.date,
+                            labels = itemUiStateData.labels,
+                            labelsColor = itemUiStateData.labelsColor,
+                            imageUrl = getFeaturedImageUrl(it.featuredImageId),
+                            actions = itemUiStateData.actions,
+                            actionsEnabled = actionsEnabled,
+                            progressBarUiState = itemUiStateData.progressBarUiState,
+                            showOverlay = itemUiStateData.showOverlay,
+                            author = author,
+                            showQuickStartFocusPoint = itemUiStateData.showQuickStartFocusPoint
+                    )
+                }
     }
 
     private fun topologicalSort(
@@ -407,10 +475,11 @@ class PageListViewModel @Inject constructor(
     }
 
     private fun getPageItemIndent(page: PageModel?): Int {
-        return if (page == null || !PageListType.PUBLISHED.pageStatuses.contains(page.status))
+        return if (page == null || !PUBLISHED.pageStatuses.contains(page.status)) {
             -1
-        else
+        } else {
             getPageItemIndent(page.parent) + 1
+        }
     }
 
     private fun invalidateFeaturedMedia(vararg featuredImageIds: Long) {
@@ -441,12 +510,28 @@ class PageListViewModel @Inject constructor(
                 pagesViewModel.site,
                 pageModel.remoteId
         )
-        val subtitle = when (pageModel.remoteId) {
-            pagesViewModel.site.pageOnFront -> R.string.site_settings_homepage
-            pagesViewModel.site.pageForPosts -> R.string.site_settings_posts_page
+        val subtitle = when {
+            pageModel.isHomepage -> R.string.site_settings_homepage
+            pageModel.isPostsPage -> R.string.site_settings_posts_page
+            else -> null
+        }
+        val icon = when {
+            pageModel.isHomepage -> R.drawable.ic_homepage_16dp
+            pageModel.isPostsPage -> R.drawable.ic_posts_16dp
             else -> null
         }
-        return ItemUiStateData(labels, labelColor, progressBarUiState, showOverlay, actions, subtitle)
+        val showQuickStartFocusPoint: Boolean = pageModel.isHomepage &&
+                _quickStartEvent.value?.task == EDIT_HOMEPAGE
+        return ItemUiStateData(
+                labels,
+                labelColor,
+                progressBarUiState,
+                showOverlay,
+                actions,
+                subtitle,
+                icon,
+                showQuickStartFocusPoint
+        )
     }
 
     private data class ItemUiStateData(
@@ -455,6 +540,8 @@ class PageListViewModel @Inject constructor(
         val progressBarUiState: ProgressBarUiState,
         val showOverlay: Boolean,
         val actions: Set<Action>,
-        val subtitle: Int? = null
+        val subtitle: Int? = null,
+        val icon: Int? = null,
+        val showQuickStartFocusPoint: Boolean = false
     )
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt
index 42613572df06..45a41d595a5a 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModel.kt
@@ -3,21 +3,21 @@ package org.wordpress.android.viewmodel.pages
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
-import org.wordpress.android.modules.UI_SCOPE
+import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Empty
 import org.wordpress.android.ui.pages.PageItem.ParentPage
+import org.wordpress.android.viewmodel.ScopedViewModel
 import javax.inject.Inject
 import javax.inject.Named
 
 class PageParentSearchViewModel
 @Inject constructor(
-    @Named(UI_SCOPE) private val uiScope: CoroutineScope
-) : ViewModel() {
+    @Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher
+) : ScopedViewModel(uiDispatcher) {
     private val _searchResult: MutableLiveData<List<PageItem>> = MutableLiveData()
     val searchResult: LiveData<List<PageItem>> = _searchResult
 
@@ -50,7 +50,7 @@ class PageParentSearchViewModel
         pageParentViewModel.onParentSelected(page)
     }
 
-    private fun loadFoundPages(pageItems: List<PageItem>) = uiScope.launch {
+    private fun loadFoundPages(pageItems: List<PageItem>) = launch {
         if (pageItems.isNotEmpty()) {
             _searchResult.value = pageItems
         } else {
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
index 1bff072e1ef9..22bfff5cd7a1 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PagesViewModel.kt
@@ -24,6 +24,7 @@ import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront.PAGE
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus
+import org.wordpress.android.fluxc.model.post.PostStatus
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.PageStore
 import org.wordpress.android.fluxc.store.PostStore
@@ -34,6 +35,7 @@ import org.wordpress.android.modules.BG_THREAD
 import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.PageItem.Action
 import org.wordpress.android.ui.pages.PageItem.Action.CANCEL_AUTO_UPLOAD
+import org.wordpress.android.ui.pages.PageItem.Action.COPY
 import org.wordpress.android.ui.pages.PageItem.Action.DELETE_PERMANENTLY
 import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_DRAFT
 import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_TRASH
@@ -157,8 +159,8 @@ class PagesViewModel
     private val _postUploadAction = SingleLiveEvent<Triple<PostModel, SiteModel, Intent>>()
     val postUploadAction: LiveData<Triple<PostModel, SiteModel, Intent>> = _postUploadAction
 
-    private val _uploadFinishedAction = SingleLiveEvent<Pair<PageModel, Boolean>>()
-    val uploadFinishedAction: LiveData<Pair<PageModel, Boolean>> = _uploadFinishedAction
+    private val _uploadFinishedAction = SingleLiveEvent<Triple<PageModel, Boolean, Boolean>>()
+    val uploadFinishedAction: LiveData<Triple<PageModel, Boolean, Boolean>> = _uploadFinishedAction
 
     private val _publishAction = SingleLiveEvent<PageModel>()
     val publishAction = _publishAction
@@ -440,6 +442,7 @@ class PagesViewModel
             CANCEL_AUTO_UPLOAD -> cancelPendingAutoUpload(LocalId(page.localId))
             SET_AS_HOMEPAGE -> setHomepage(page.remoteId)
             SET_AS_POSTS_PAGE -> setPostsPage(page.remoteId)
+            COPY -> onCopyPage(page)
         }
         return true
     }
@@ -531,6 +534,43 @@ class PagesViewModel
         }
     }
 
+    private fun onCopyPage(page: Page) {
+        launch(defaultDispatcher) {
+            trackMenuSelectionEvent(COPY)
+            copyPage(page.remoteId, performChecks = true)
+        }
+    }
+
+    private fun copyPage(pageId: Long, performChecks: Boolean = false) {
+        pageMap[pageId]?.let {
+            if (performChecks && autoSaveConflictResolver.hasUnhandledAutoSave(it.post)) {
+                pageListDialogHelper.showCopyConflictDialog(it.post)
+                return
+            }
+
+            val post = postStore.instantiatePostModel(
+                    site,
+                    true,
+                    it.title,
+                    it.post.content,
+                    PostStatus.DRAFT.toString(),
+                    it.post.categoryIdList,
+                    it.post.postFormat,
+                    false
+            )
+
+            _editPage.postValue(Triple(site, post, false))
+        }
+    }
+
+    private fun onCopyPageLocal(pageId: RemoteId) {
+        copyPage(pageId.value, performChecks = false)
+    }
+
+    private fun onEditPageFirst(pageId: RemoteId) {
+        pageMap[pageId.value]?.let { checkAndEdit(it) }
+    }
+
     private fun performIfNetworkAvailable(performAction: () -> Unit): Boolean {
         return if (networkUtils.isNetworkAvailable()) {
             performAction()
@@ -557,6 +597,7 @@ class PagesViewModel
             SET_PARENT -> "set_parent"
             MOVE_TO_DRAFT -> "move_to_draft"
             MOVE_TO_TRASH -> "move_to_bin"
+            COPY -> "copy"
             else -> return
         }
         val properties = mutableMapOf("option_name" to menu as Any)
@@ -580,14 +621,16 @@ class PagesViewModel
     }
 
     fun onItemTapped(pageItem: Page) {
-        pageMap[pageItem.remoteId]?.let {
-            if (autoSaveConflictResolver.hasUnhandledAutoSave(it.post)) {
-                pageListDialogHelper.showAutoSaveRevisionDialog(it.post)
-                return
-            }
+        pageMap[pageItem.remoteId]?.let { checkAndEdit(it) }
+    }
 
-            editPage(RemoteId(it.remoteId))
+    private fun checkAndEdit(page: PageModel) {
+        if (autoSaveConflictResolver.hasUnhandledAutoSave(page.post)) {
+            pageListDialogHelper.showAutoSaveRevisionDialog(page.post)
+            return
         }
+
+        editPage(RemoteId(page.remoteId))
     }
 
     fun onNewPageButtonTapped() {
@@ -874,14 +917,16 @@ class PagesViewModel
         pageListDialogHelper.onPositiveClickedForBasicDialog(
                 instanceTag = instanceTag,
                 editPage = this::editPage,
-                deletePage = this::onDeleteConfirmed
+                deletePage = this::onDeleteConfirmed,
+                editPageFirst = this::onEditPageFirst
         )
     }
 
     fun onNegativeClickedForBasicDialog(instanceTag: String) {
         pageListDialogHelper.onNegativeClickedForBasicDialog(
                 instanceTag = instanceTag,
-                editPage = this::editPage
+                editPage = this::editPage,
+                copyPage = this::onCopyPageLocal
         )
     }
 
@@ -922,9 +967,9 @@ class PagesViewModel
         }
     }
 
-    private fun postUploadedFinished(remoteId: RemoteId, isError: Boolean) {
+    private fun postUploadedFinished(remoteId: RemoteId, isError: Boolean, isFirstTimePublish: Boolean) {
         pageMap[remoteId.value]?.let {
-            _uploadFinishedAction.postValue(Pair(it, isError))
+            _uploadFinishedAction.postValue(Triple(it, isError, isFirstTimePublish))
         }
     }
 
@@ -935,7 +980,7 @@ class PagesViewModel
         }
     }
 
-    private suspend fun <T> MutableLiveData<T>.setOnUi(value: T) = withContext(coroutineContext) {
+    private suspend fun <T> MutableLiveData<T>.setOnUi(value: T) = withContext(uiDispatcher) {
         setValue(value)
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt
index 3ed7bca5f8c0..4ad7398833b0 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/SearchListViewModel.kt
@@ -3,13 +3,12 @@ package org.wordpress.android.viewmodel.pages
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModel
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus
-import org.wordpress.android.modules.UI_SCOPE
+import org.wordpress.android.modules.UI_THREAD
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Action
 import org.wordpress.android.ui.pages.PageItem.Divider
@@ -20,6 +19,7 @@ import org.wordpress.android.ui.pages.PageItem.PublishedPage
 import org.wordpress.android.ui.pages.PageItem.ScheduledPage
 import org.wordpress.android.ui.pages.PageItem.TrashedPage
 import org.wordpress.android.viewmodel.ResourceProvider
+import org.wordpress.android.viewmodel.ScopedViewModel
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.DRAFTS
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.PUBLISHED
@@ -36,8 +36,8 @@ class SearchListViewModel
     private val pageListItemActionsUseCase: CreatePageListItemActionsUseCase,
     private val pageItemProgressUiStateUseCase: PageItemProgressUiStateUseCase,
     private val resourceProvider: ResourceProvider,
-    @Named(UI_SCOPE) private val uiScope: CoroutineScope
-) : ViewModel() {
+    @Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher
+) : ScopedViewModel(uiDispatcher) {
     private val _searchResult: MutableLiveData<List<PageItem>> = MutableLiveData()
     val searchResult: LiveData<List<PageItem>> = _searchResult
 
@@ -76,7 +76,7 @@ class SearchListViewModel
         pagesViewModel.onItemTapped(pageItem)
     }
 
-    private fun loadFoundPages(pages: SortedMap<PageListType, List<PageModel>>) = uiScope.launch {
+    private fun loadFoundPages(pages: SortedMap<PageListType, List<PageModel>>) = launch {
         if (pages.isNotEmpty()) {
             val pageItems = pages
                     .map { (listType, results) ->
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModel.kt
index 7e01b0493260..95753a5d25c9 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModel.kt
@@ -3,8 +3,8 @@ package org.wordpress.android.viewmodel.posts
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import org.wordpress.android.R.drawable
-import org.wordpress.android.R.string
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.main.MainActionListItem
 import org.wordpress.android.ui.main.MainActionListItem.ActionType
@@ -15,14 +15,15 @@ import org.wordpress.android.ui.main.MainActionListItem.CreateAction
 import org.wordpress.android.ui.main.MainFabUiState
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.util.SiteUtils
-import org.wordpress.android.util.config.WPStoriesFeatureConfig
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.util.Locale
 import javax.inject.Inject
 
 class PostListCreateMenuViewModel @Inject constructor(
     private val appPrefsWrapper: AppPrefsWrapper,
-    private val wpStoriesFeatureConfig: WPStoriesFeatureConfig
+    private val analyticsTracker: AnalyticsTrackerWrapper
 ) : ViewModel() {
     private var isStarted = false
     private lateinit var site: SiteModel
@@ -57,26 +58,25 @@ class PostListCreateMenuViewModel @Inject constructor(
                 CreateAction(
                         actionType = NO_ACTION,
                         iconRes = 0,
-                        labelRes = string.my_site_bottom_sheet_title,
+                        labelRes = R.string.my_site_bottom_sheet_title,
                         onClickAction = null
                 )
         )
         actionsList.add(
                 CreateAction(
-                        actionType = CREATE_NEW_POST,
-                        iconRes = drawable.ic_posts_white_24dp,
-                        labelRes = string.my_site_bottom_sheet_add_post,
+                        actionType = CREATE_NEW_STORY,
+                        iconRes = R.drawable.ic_story_icon_24dp,
+                        labelRes = R.string.my_site_bottom_sheet_add_story,
                         onClickAction = ::onCreateActionClicked
+
                 )
         )
-
         actionsList.add(
                 CreateAction(
-                        actionType = CREATE_NEW_STORY,
-                        iconRes = drawable.ic_story_icon_24dp,
-                        labelRes = string.my_site_bottom_sheet_add_story,
+                        actionType = CREATE_NEW_POST,
+                        iconRes = R.drawable.ic_posts_white_24dp,
+                        labelRes = R.string.my_site_bottom_sheet_add_post,
                         onClickAction = ::onCreateActionClicked
-
                 )
         )
 
@@ -84,6 +84,8 @@ class PostListCreateMenuViewModel @Inject constructor(
     }
 
     private fun onCreateActionClicked(actionType: ActionType) {
+        val properties = mapOf("action" to actionType.name.toLowerCase(Locale.ROOT))
+        analyticsTracker.track(Stat.POST_LIST_CREATE_SHEET_ACTION_TAPPED, properties)
         _isBottomSheetShowing.postValue(Event(false))
         _createAction.postValue(actionType)
     }
@@ -101,6 +103,7 @@ class PostListCreateMenuViewModel @Inject constructor(
     fun onFabClicked() {
         appPrefsWrapper.setPostListFabTooltipDisabled(true)
         setMainFabUiState()
+        analyticsTracker.track(Stat.POST_LIST_CREATE_SHEET_SHOWN)
         _isBottomSheetShowing.value = Event(true)
     }
 
@@ -137,10 +140,10 @@ class PostListCreateMenuViewModel @Inject constructor(
     }
 
     private fun getCreateContentMessageId(): Int {
-        return if (wpStoriesFeatureConfig.isEnabled() && SiteUtils.supportsStoriesFeature(site)) {
-            string.create_post_story_fab_tooltip
+        return if (SiteUtils.supportsStoriesFeature(site)) {
+            R.string.create_post_story_fab_tooltip
         } else {
-            string.create_post_fab_tooltip
+            R.string.create_post_fab_tooltip
         }
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelper.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelper.kt
index 16ee92234bc3..70a9295d3b88 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelper.kt
@@ -44,6 +44,7 @@ import org.wordpress.android.viewmodel.posts.PostListItemType.PostListItemUiStat
 import org.wordpress.android.viewmodel.uistate.ProgressBarUiState
 import org.wordpress.android.widgets.PostListButtonType
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_CANCEL_PENDING_AUTO_UPLOAD
+import org.wordpress.android.widgets.PostListButtonType.BUTTON_COPY
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_DELETE_PERMANENTLY
 import org.wordpress.android.widgets.PostListButtonType.BUTTON_EDIT
@@ -60,6 +61,7 @@ import org.wordpress.android.widgets.PostListButtonType.BUTTON_VIEW
 import javax.inject.Inject
 
 private const val MAX_NUMBER_OF_VISIBLE_ACTIONS_STANDARD = 3
+
 /**
  * Helper class which encapsulates logic for creating UiStates for items in the PostsList.
  */
@@ -351,6 +353,7 @@ class PostListItemUiStateHelper @Inject constructor(
                 postStatus == PUBLISHED &&
                 !isLocalDraft &&
                 !isLocallyChanged
+        val canShowCopy = postStatus == PUBLISHED || postStatus == DRAFT
         val canShowViewButton = !canRetryUpload && postStatus != PostStatus.TRASHED
         val canShowPublishButton = canRetryUpload || canPublishPost
         val buttonTypes = ArrayList<PostListButtonType>()
@@ -387,22 +390,35 @@ class PostListItemUiStateHelper @Inject constructor(
             )
         }
 
+        if (canShowStats) {
+            buttonTypes.add(BUTTON_STATS)
+        }
+
+        if (canShowCopy) {
+            buttonTypes.add(BUTTON_COPY)
+        }
+
+        buttonTypes.addMoveToDraftActionIfAvailable(postStatus)
+
         when {
             isLocalDraft -> buttonTypes.add(BUTTON_DELETE)
             postStatus == TRASHED -> {
-                buttonTypes.add(BUTTON_MOVE_TO_DRAFT)
                 buttonTypes.add(BUTTON_DELETE_PERMANENTLY)
             }
             postStatus != TRASHED -> buttonTypes.add(BUTTON_TRASH)
         }
 
-        if (canShowStats) {
-            buttonTypes.add(BUTTON_STATS)
-        }
-
         return buttonTypes
     }
 
+    private fun MutableList<PostListButtonType>.addMoveToDraftActionIfAvailable(postStatus: PostStatus) {
+        val canMovePostToDraft = postStatus == PUBLISHED || postStatus == TRASHED
+
+        if (canMovePostToDraft) {
+            add(BUTTON_MOVE_TO_DRAFT)
+        }
+    }
+
     private fun createDefaultViewActions(
         buttonTypes: List<PostListButtonType>,
         onButtonClicked: (PostListButtonType) -> Unit
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
index 31bd86d90471..9686ed38c962 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt
@@ -7,6 +7,7 @@ import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.Observer
+import androidx.lifecycle.viewModelScope
 import androidx.paging.PagedList
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
@@ -102,7 +103,7 @@ class PostListViewModel @Inject constructor(
 
     private val _emptyViewState = ThrottleLiveData<PostListEmptyUiState>(
             offset = EMPTY_VIEW_THROTTLE,
-            coroutineScope = this,
+            coroutineScope = viewModelScope,
             mainDispatcher = uiDispatcher,
             backgroundDispatcher = bgDispatcher
     )
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/storage/StorageUtilsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/storage/StorageUtilsViewModel.kt
new file mode 100644
index 000000000000..f70c453960b9
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/storage/StorageUtilsViewModel.kt
@@ -0,0 +1,42 @@
+package org.wordpress.android.viewmodel.storage
+
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import org.wordpress.android.modules.BG_THREAD
+import org.wordpress.android.util.StorageUtilsProvider
+import org.wordpress.android.util.StorageUtilsProvider.Source
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ScopedViewModel
+import javax.inject.Inject
+import javax.inject.Named
+
+class StorageUtilsViewModel @Inject constructor(
+    @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
+    private val storageUtilsProvider: StorageUtilsProvider
+) : ScopedViewModel(bgDispatcher) {
+    private val _checkStorageWarning = MutableLiveData<Event<Unit>>()
+    val checkStorageWarning: LiveData<Event<Unit>> = _checkStorageWarning
+
+    fun start(isFirstStart: Boolean) {
+        if (!isFirstStart) return
+
+        launch(bgDispatcher) {
+            // This delay is inserted to mitigate a possible visual glitch with dialog and keyboard that appears when
+            // opening the editor randomly overlapping on each other. Some more information available on this comment
+            // https://github.com/wordpress-mobile/WordPress-Android/pull/14642#discussion_r634264494
+            delay(DIALOG_CHECK_DELAY)
+            _checkStorageWarning.postValue(Event(Unit))
+        }
+    }
+
+    fun onStorageWarningCheck(fm: FragmentManager, source: Source) {
+        storageUtilsProvider.notifyOnLowStorageSpace(fm, source)
+    }
+
+    companion object {
+        private const val DIALOG_CHECK_DELAY = 1000L
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/wpwebview/WPWebViewViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/wpwebview/WPWebViewViewModel.kt
index 6cd256da0a57..ccdaaa98dbe9 100644
--- a/WordPress/src/main/java/org/wordpress/android/viewmodel/wpwebview/WPWebViewViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/viewmodel/wpwebview/WPWebViewViewModel.kt
@@ -15,8 +15,12 @@ import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.viewmodel.SingleLiveEvent
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus.AVAILABLE
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode.DEFAULT
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode.DESKTOP
+import org.wordpress.android.ui.PreviewMode
+import org.wordpress.android.ui.PreviewMode.DESKTOP
+import org.wordpress.android.ui.PreviewMode.MOBILE
+import org.wordpress.android.ui.PreviewMode.TABLET
+import org.wordpress.android.ui.PreviewModeHandler
+import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewContentUiState
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewFullscreenProgressUiState
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewFullscreenUiState.WebPreviewFullscreenErrorUiState
@@ -24,9 +28,10 @@ import javax.inject.Inject
 
 class WPWebViewViewModel
 @Inject constructor(
+    private val displayUtils: DisplayUtilsWrapper,
     private val networkUtils: NetworkUtilsWrapper,
     connectionStatus: LiveData<ConnectionStatus>
-) : ViewModel() {
+) : ViewModel(), PreviewModeHandler {
     private var isStarted = false
     private var wpWebViewUsageCategory: WPWebViewUsageCategory = WPWebViewUsageCategory.WEBVIEW_STANDARD
 
@@ -61,6 +66,9 @@ class WPWebViewViewModel
         override fun getLifecycle(): Lifecycle = lifecycleRegistry
     }
 
+    private val defaultPreviewMode: PreviewMode
+        get() = if (displayUtils.isTablet()) TABLET else MOBILE
+
     init {
         lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.CREATED
         connectionStatus.observe(lifecycleOwner, Observer {
@@ -79,13 +87,14 @@ class WPWebViewViewModel
         _navbarUiState.value = NavBarUiState(
                 forwardNavigationEnabled = false,
                 backNavigationEnabled = false,
-                desktopPreviewHintVisible = false
+                previewModeHintVisible = false,
+                reviewHintResId = getPreviewHintResId(defaultPreviewMode)
         )
-        _previewMode.value = DEFAULT
+        _previewMode.value = defaultPreviewMode
         _previewModeSelector.value = PreviewModeSelectorStatus(
                 isVisible = false,
                 isEnabled = false,
-                selectedPreviewMode = DEFAULT
+                selectedPreviewMode = defaultPreviewMode
         )
 
         if (WPWebViewUsageCategory.isActionableDirectUsage(wpWebViewUsageCategory)) {
@@ -179,22 +188,27 @@ class WPWebViewViewModel
         if (previewMode.value != selectedPreviewMode) {
             _previewMode.value = selectedPreviewMode
             _navbarUiState.value =
-                    navbarUiState.value!!.copy(desktopPreviewHintVisible = selectedPreviewMode == DESKTOP)
+                    navbarUiState.value!!.copy(
+                            previewModeHintVisible = selectedPreviewMode != MOBILE,
+                            reviewHintResId = getPreviewHintResId(selectedPreviewMode)
+                    )
             updateUiState(WebPreviewFullscreenProgressUiState)
         }
     }
 
+    private fun getPreviewHintResId(previewMode: PreviewMode) = when (previewMode) {
+        MOBILE -> R.string.web_preview_mobile
+        TABLET -> R.string.web_preview_tablet
+        DESKTOP -> R.string.web_preview_desktop
+    }
+
     data class NavBarUiState(
         val forwardNavigationEnabled: Boolean,
         val backNavigationEnabled: Boolean,
-        val desktopPreviewHintVisible: Boolean
+        val previewModeHintVisible: Boolean,
+        val reviewHintResId: Int
     )
 
-    enum class PreviewMode {
-        DEFAULT,
-        DESKTOP
-    }
-
     data class PreviewModeSelectorStatus(
         val isVisible: Boolean,
         val isEnabled: Boolean,
@@ -234,4 +248,11 @@ class WPWebViewViewModel
             }
         }
     }
+
+    override fun selectedPreviewMode(): PreviewMode = _previewMode.value ?: defaultPreviewMode
+
+    override fun onPreviewModeChanged(mode: PreviewMode) {
+        togglePreviewModeSelectorVisibility(false)
+        selectPreviewMode(mode)
+    }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/MultiUsernameEditText.java b/WordPress/src/main/java/org/wordpress/android/widgets/MultiUsernameEditText.java
deleted file mode 100644
index ec79738c7334..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/widgets/MultiUsernameEditText.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.wordpress.android.widgets;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.view.View;
-import android.view.inputmethod.BaseInputConnection;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-
-import com.google.android.material.textfield.TextInputEditText;
-
-/**
- * Used to handle backspace in People Management username field
- */
-public class MultiUsernameEditText extends TextInputEditText {
-    private OnBackspacePressedListener mOnBackspacePressedListener;
-
-
-    public MultiUsernameEditText(Context context) {
-        super(context);
-    }
-
-    public MultiUsernameEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MultiUsernameEditText(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public void setOnBackspacePressedListener(OnBackspacePressedListener onBackspacePressedListener) {
-        this.mOnBackspacePressedListener = onBackspacePressedListener;
-    }
-
-    public interface OnBackspacePressedListener {
-        boolean onBackspacePressed();
-    }
-
-    @Override
-    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-        // in this case it makes sense to not change EditText to fullscreen mode at landscape
-        outAttrs.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI;
-        return new MultiUsernameEditTextInputConnection(this, false);
-    }
-
-
-    private class MultiUsernameEditTextInputConnection extends BaseInputConnection {
-        MultiUsernameEditTextInputConnection(View targetView, boolean fullEditor) {
-            super(targetView, fullEditor);
-        }
-
-        @Override
-        public boolean sendKeyEvent(KeyEvent event) {
-            if (event.getAction() == KeyEvent.ACTION_DOWN && event.getKeyCode() == KeyEvent.KEYCODE_DEL) {
-                if (mOnBackspacePressedListener != null) {
-                    // if username was not deleted pass event to parent method and return the result
-                    return !mOnBackspacePressedListener.onBackspacePressed() && super.sendKeyEvent(event);
-                }
-            }
-            return super.sendKeyEvent(event);
-        }
-
-        @Override
-        public boolean deleteSurroundingText(int beforeLength, int afterLength) {
-            if (beforeLength == 1 && afterLength == 0) {
-                return sendKeyEvent(new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL))
-                       && sendKeyEvent(new KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL));
-            }
-
-            return super.deleteSurroundingText(beforeLength, afterLength);
-        }
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
index a058f64bfdbc..a8291b9a07ab 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButtonType.kt
@@ -36,7 +36,8 @@ enum class PostListButtonType constructor(
             R.drawable.ic_undo_white_24dp,
             R.attr.wpColorWarningDark
     ),
-    BUTTON_SHOW_MOVE_TRASHED_POST_TO_DRAFT_DIALOG(15, 0, 0, 0);
+    BUTTON_SHOW_MOVE_TRASHED_POST_TO_DRAFT_DIALOG(15, 0, 0, 0),
+    BUTTON_COPY(16, R.string.button_copy, R.drawable.ic_copy_white_24dp, R.attr.colorOnSurface);
 
     companion object {
         fun fromInt(value: Int): PostListButtonType? = values().firstOrNull { it.value == value }
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/QuickStartFocusPoint.kt b/WordPress/src/main/java/org/wordpress/android/widgets/QuickStartFocusPoint.kt
index f2529827aac4..524ae82e2a24 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/QuickStartFocusPoint.kt
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/QuickStartFocusPoint.kt
@@ -7,8 +7,8 @@ import android.view.animation.Animation
 import android.view.animation.Animation.AnimationListener
 import android.view.animation.AnimationUtils
 import android.widget.FrameLayout
-
 import org.wordpress.android.R
+import org.wordpress.android.R.styleable
 
 /**
  * Perpetually animated quick start focus point (hint)
@@ -22,6 +22,10 @@ class QuickStartFocusPoint : FrameLayout {
     companion object {
         const val OUTER_CIRCLE_ANIMATION_START_OFFSET_MS = 1000L
         const val INNER_CIRCLE_ANIMATION_START_OFFSET_MS = OUTER_CIRCLE_ANIMATION_START_OFFSET_MS + 50L
+
+        // these must match the same values in attrs.xml
+        private const val SIZE_SMALL = 0
+        private const val SIZE_NORMAL = 1
     }
 
     constructor(context: Context) : super(context) {
@@ -29,16 +33,45 @@ class QuickStartFocusPoint : FrameLayout {
     }
 
     constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
-        initView()
+        initView(readSize(attrs))
     }
 
     constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) {
-        initView()
+        initView(readSize(attrs))
     }
 
-    private fun initView() {
-        View.inflate(context, R.layout.quick_start_focus_circle, this)
+    private fun initView(readSize: Int = SIZE_NORMAL) {
+        val layout = when (readSize) {
+            SIZE_SMALL -> R.layout.quick_start_focus_circle_small
+            else -> R.layout.quick_start_focus_circle
+        }
+        View.inflate(context, layout, this)
+        startAnimation()
+    }
+
+    private fun readSize(attrs: AttributeSet): Int {
+        val a = context.theme.obtainStyledAttributes(
+                attrs,
+                styleable.QuickStartFocusPoint,
+                0, 0
+        )
+        try {
+            return a.getInteger(styleable.QuickStartFocusPoint_size, SIZE_NORMAL)
+        } finally {
+            a.recycle()
+        }
+    }
+
+    fun setVisibleOrGone(visible: Boolean) {
+        if (visible) {
+            this.visibility = View.VISIBLE
+            startAnimation()
+        } else {
+            this.visibility = View.GONE
+        }
+    }
 
+    private fun startAnimation() {
         val outerCircle = findViewById<View>(R.id.quick_start_focus_outer_circle)
         val innerCircle = findViewById<View>(R.id.quick_start_focus_inner_circle)
 
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/StorageNotificationDialogFragment.kt b/WordPress/src/main/java/org/wordpress/android/widgets/StorageNotificationDialogFragment.kt
new file mode 100644
index 000000000000..f0c6b725f4b2
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/StorageNotificationDialogFragment.kt
@@ -0,0 +1,118 @@
+package org.wordpress.android.widgets
+
+import android.app.Dialog
+import android.content.DialogInterface
+import android.content.Intent
+import android.os.Bundle
+import android.provider.Settings
+import androidx.fragment.app.DialogFragment
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.ui.prefs.AppPrefs
+import org.wordpress.android.util.analytics.AnalyticsUtils
+
+class StorageNotificationDialogFragment : DialogFragment() {
+    data class DialogLabels(
+        val title: String,
+        val message: String,
+        val okLabel: String,
+        val dontShowAgainLabel: String
+    )
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val args = requireArguments()
+
+        val title = args.getString(ARG_DIALOG_TITLE)
+        val message = args.getString(ARG_DIALOG_MESSAGE)
+        val okLabel = args.getString(ARG_DIALOG_OK_LABEL)
+        val dontShowAgainLabel = args.getString(ARG_DIALOG_DONT_SHOW_LABEL)
+        val isInternalStorageSettingsResolved = args.getBoolean(ARG_DIALOG_IS_SETTINGS_RESOLVED)
+        val sourceDescription = args.getString(ARG_DIALOG_SOURCE_DESCRIPTION)
+
+        val builder = MaterialAlertDialogBuilder(requireContext())
+
+        builder.apply {
+            setTitle(title)
+            setMessage(message)
+            setPositiveButton(okLabel) { _, _ ->
+                dismiss()
+                if (isInternalStorageSettingsResolved) {
+                    val settingsIntent = Intent(Settings.ACTION_INTERNAL_STORAGE_SETTINGS)
+                    val dialogContext = this@StorageNotificationDialogFragment.context
+                    dialogContext?.startActivity(settingsIntent)
+                }
+                AnalyticsUtils.trackStorageWarningDialogEvent(
+                        Stat.STORAGE_WARNING_ACKNOWLEDGED,
+                        sourceDescription,
+                        isInternalStorageSettingsResolved
+                )
+            }
+            setNeutralButton(dontShowAgainLabel) { _, _ ->
+                dismiss()
+                AppPrefs.setShouldShowStorageWarning(false)
+                AnalyticsUtils.trackStorageWarningDialogEvent(
+                        Stat.STORAGE_WARNING_DONT_SHOW_AGAIN,
+                        sourceDescription,
+                        isInternalStorageSettingsResolved
+                )
+            }
+            if (isInternalStorageSettingsResolved) {
+                setNegativeButton(android.R.string.cancel) { _, _ ->
+                    dismiss()
+                    AnalyticsUtils.trackStorageWarningDialogEvent(
+                            Stat.STORAGE_WARNING_CANCELED,
+                            sourceDescription,
+                            isInternalStorageSettingsResolved
+                    )
+                }
+            }
+        }
+
+        return builder.create()
+    }
+
+    override fun onCancel(dialog: DialogInterface) {
+        val args = requireArguments()
+        val isInternalStorageSettingsResolved = args.getBoolean(ARG_DIALOG_IS_SETTINGS_RESOLVED)
+        val sourceDescription = args.getString(ARG_DIALOG_SOURCE_DESCRIPTION)
+
+        AnalyticsUtils.trackStorageWarningDialogEvent(
+                Stat.STORAGE_WARNING_CANCELED,
+                sourceDescription,
+                isInternalStorageSettingsResolved
+        )
+        super.onCancel(dialog)
+    }
+
+    companion object {
+        private const val ARG_DIALOG_TITLE = "dialog_title"
+        private const val ARG_DIALOG_MESSAGE = "dialog_message"
+        private const val ARG_DIALOG_OK_LABEL = "dialog_ok_label"
+        private const val ARG_DIALOG_DONT_SHOW_LABEL = "dialog_dont_show_label"
+        private const val ARG_DIALOG_IS_SETTINGS_RESOLVED = "dialog_is_settings_resolved"
+        private const val ARG_DIALOG_SOURCE_DESCRIPTION = "dialog_source_description"
+
+        fun newInstance(
+            dialogLabels: DialogLabels,
+            isInternalStorageSettingsResolved: Boolean,
+            source: String
+        ): StorageNotificationDialogFragment {
+            AnalyticsUtils.trackStorageWarningDialogEvent(
+                    Stat.STORAGE_WARNING_SHOWN,
+                    source,
+                    isInternalStorageSettingsResolved
+            )
+
+            return StorageNotificationDialogFragment().apply {
+                arguments = Bundle().apply {
+                    putString(ARG_DIALOG_TITLE, dialogLabels.title)
+                    putString(ARG_DIALOG_MESSAGE, dialogLabels.message)
+                    putString(ARG_DIALOG_OK_LABEL, dialogLabels.okLabel)
+                    putString(ARG_DIALOG_DONT_SHOW_LABEL, dialogLabels.dontShowAgainLabel)
+                    putBoolean(ARG_DIALOG_IS_SETTINGS_RESOLVED, isInternalStorageSettingsResolved)
+                    putString(ARG_DIALOG_SOURCE_DESCRIPTION, source)
+                }
+            }
+        }
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/SuggestionAutoCompleteText.java b/WordPress/src/main/java/org/wordpress/android/widgets/SuggestionAutoCompleteText.java
index cc1f6f766435..91c740c34d68 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/SuggestionAutoCompleteText.java
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/SuggestionAutoCompleteText.java
@@ -21,6 +21,7 @@ public class SuggestionAutoCompleteText extends AppCompatMultiAutoCompleteTextVi
     PersistentEditTextHelper mPersistentEditTextHelper;
     private OnEditTextBackListener mBackListener;
     private SuggestionTokenizer mSuggestionTokenizer;
+    private char mPrefix;
 
     public interface OnEditTextBackListener {
         void onEditTextBack();
@@ -42,14 +43,18 @@ public SuggestionAutoCompleteText(Context context, AttributeSet attrs, int defSt
     }
 
     private void init(Context context) {
-        mSuggestionTokenizer = new SuggestionTokenizer();
-        setTokenizer(mSuggestionTokenizer);
-        setThreshold(1);
         mPersistentEditTextHelper = new PersistentEditTextHelper(context);
         // When TYPE_TEXT_FLAG_AUTO_COMPLETE is set, autocorrection is disabled.
         setRawInputType(getInputType() & ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE);
     }
 
+    public void initializeWithPrefix(char prefix) {
+        mPrefix = prefix;
+        mSuggestionTokenizer = new SuggestionTokenizer(mPrefix);
+        setTokenizer(mSuggestionTokenizer);
+        setThreshold(1);
+    }
+
     @Override
     public boolean enoughToFilter() {
         Editable text = getText();
@@ -63,7 +68,7 @@ public boolean enoughToFilter() {
 
         return start > 0
                && (end - start >= 1
-                             || (start == end && text.charAt(start - 1) == '@'));
+                             || (start == end && text.charAt(start - 1) == mPrefix));
     }
 
     public void forceFiltering(CharSequence text) {
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbar.java b/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbar.java
deleted file mode 100644
index 194cbbd2d255..000000000000
--- a/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbar.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.wordpress.android.widgets;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.StringRes;
-
-import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.snackbar.Snackbar.SnackbarLayout;
-
-import org.wordpress.android.R;
-import org.wordpress.android.util.AccessibilityUtils;
-
-/**
- * {@link Snackbar} with custom colors and layout mimicking the updated design pattern defined in the Material Design
- * guidelines <a href="https://material.io/design/components/snackbars.html#spec">specifications</a>.  The views include
- * message and action button.  Any empty or null view is hidden.  The only required view is message.
- */
-public class WPSnackbar {
-    private Snackbar mSnackbar;
-    private View mContentView;
-
-    private WPSnackbar(@NonNull View view, @NonNull CharSequence text, int duration) {
-        mSnackbar = Snackbar.make(view, "", // CHECKSTYLE IGNORE
-                AccessibilityUtils.getSnackbarDuration(view.getContext(), duration));
-
-        // Set underlying snackbar layout.
-        SnackbarLayout snackbarLayout = (SnackbarLayout) mSnackbar.getView();
-        ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) snackbarLayout.getLayoutParams();
-        Context context = view.getContext();
-        int margin = (int) context.getResources().getDimension(R.dimen.margin_medium);
-        params.setMargins(margin, margin, margin, margin);
-        snackbarLayout.setLayoutParams(params);
-        snackbarLayout.setPadding(0, 0, 0, 0);
-        snackbarLayout.setBackgroundResource(R.drawable.bg_snackbar);
-
-        // Hide underlying snackbar text and action.
-        TextView snackbarText = snackbarLayout.findViewById(com.google.android.material.R.id.snackbar_text);
-        snackbarText.setVisibility(View.INVISIBLE);
-        TextView snackbarAction = snackbarLayout.findViewById(com.google.android.material.R.id.snackbar_action);
-        snackbarAction.setVisibility(View.INVISIBLE);
-
-        mContentView = LayoutInflater.from(context).inflate(R.layout.snackbar, null);
-
-        TextView message = mContentView.findViewById(R.id.message);
-
-        // Hide message view when text is empty.
-        if (TextUtils.isEmpty(text)) {
-            message.setVisibility(View.GONE);
-        } else {
-            message.setVisibility(View.VISIBLE);
-            message.setText(text);
-        }
-
-        snackbarLayout.addView(mContentView, 0);
-    }
-
-    public WPSnackbar addCallback(Snackbar.Callback callback) {
-        mSnackbar.addCallback(callback);
-        return this;
-    }
-
-     public WPSnackbar setAnchorView(View anchorView) {
-        mSnackbar.setAnchorView(anchorView);
-        return this;
-    }
-
-    public void dismiss() {
-        if (mSnackbar != null) {
-            mSnackbar.dismiss();
-        }
-    }
-
-    public boolean isShowing() {
-        return mSnackbar != null && mSnackbar.isShown();
-    }
-
-    public static WPSnackbar make(@NonNull View view, @NonNull CharSequence text, int duration) {
-        return new WPSnackbar(view, text, duration);
-    }
-
-    public static WPSnackbar make(@NonNull View view, @StringRes int textRes, int duration) {
-        CharSequence text = view.getResources().getString(textRes);
-        return new WPSnackbar(view, text, duration);
-    }
-
-    private void setButtonTextAndVisibility(Button button, CharSequence text, final View.OnClickListener listener) {
-        // Hide button when text is empty or listener is null.
-        if (TextUtils.isEmpty(text) || listener == null) {
-            button.setVisibility(View.GONE);
-            button.setOnClickListener(null);
-        } else {
-            button.setVisibility(View.VISIBLE);
-            button.setText(text);
-            button.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View view) {
-                    listener.onClick(view);
-                    dismiss();
-                }
-            });
-        }
-    }
-
-    public WPSnackbar setAction(CharSequence text, View.OnClickListener listener) {
-        setButtonTextAndVisibility((Button) mContentView.findViewById(R.id.action), text, listener);
-        return this;
-    }
-
-    public WPSnackbar setAction(@StringRes int textRes, View.OnClickListener listener) {
-        CharSequence text = mContentView.getResources().getString(textRes);
-        setButtonTextAndVisibility((Button) mContentView.findViewById(R.id.action), text, listener);
-        return this;
-    }
-
-    public WPSnackbar setCallback(Snackbar.Callback callback) {
-        mSnackbar.addCallback(callback);
-        return this;
-    }
-
-    public void show() {
-        mSnackbar.show();
-    }
-}
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbar.kt b/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbar.kt
new file mode 100644
index 000000000000..ca6bd7283c96
--- /dev/null
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbar.kt
@@ -0,0 +1,19 @@
+package org.wordpress.android.widgets
+
+import android.view.View
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
+import org.wordpress.android.util.AccessibilityUtils
+
+class WPSnackbar {
+    companion object {
+        @JvmStatic fun make(view: View, @StringRes textRes: Int, duration: Int): Snackbar {
+            val text: CharSequence = view.resources.getString(textRes)
+            return make(view, text, duration)
+        }
+
+        @JvmStatic fun make(view: View, text: CharSequence, duration: Int) = Snackbar.make(view, // CHECKSTYLE IGNORE
+                text, AccessibilityUtils.getSnackbarDuration(view.context, duration)
+        )
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbarWrapper.kt b/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbarWrapper.kt
index 96dbb78e4f91..969072e8f78a 100644
--- a/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbarWrapper.kt
+++ b/WordPress/src/main/java/org/wordpress/android/widgets/WPSnackbarWrapper.kt
@@ -1,6 +1,7 @@
 package org.wordpress.android.widgets
 
 import android.view.View
+import com.google.android.material.snackbar.Snackbar
 import dagger.Reusable
 import javax.inject.Inject
 
@@ -12,5 +13,5 @@ import javax.inject.Inject
  */
 @Reusable
 class WPSnackbarWrapper @Inject constructor() {
-    fun make(view: View, text: CharSequence, duration: Int): WPSnackbar = WPSnackbar.make(view, text, duration)
+    fun make(view: View, text: CharSequence, duration: Int): Snackbar = WPSnackbar.make(view, text, duration)
 }
diff --git a/WordPress/src/main/res/anim/cab_deselect.xml b/WordPress/src/main/res/anim/cab_deselect.xml
deleted file mode 100644
index 6f586aa5fc19..000000000000
--- a/WordPress/src/main/res/anim/cab_deselect.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    Counterpart to cab_select.xml
--->
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_shortAnimTime"
-    android:interpolator="@android:anim/accelerate_interpolator"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:fromXScale="1.0"
-    android:toXScale="0.0"
-    android:fromYScale="1.0"
-    android:toYScale="0.0" />
diff --git a/WordPress/src/main/res/anim/cab_select.xml b/WordPress/src/main/res/anim/cab_select.xml
deleted file mode 100644
index a8d0a10ed03a..000000000000
--- a/WordPress/src/main/res/anim/cab_select.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-    animation used on checkbox when selecting a list item in CAB mode
-    see ui/Comments/CommentAdapter for example
--->
-<scale xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="@android:integer/config_shortAnimTime"
-    android:interpolator="@android:anim/decelerate_interpolator"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:fromXScale="0.0"
-    android:toXScale="1.0"
-    android:fromYScale="0.0"
-    android:toYScale="1.0" />
diff --git a/WordPress/src/main/res/color/on_surface_button_selector.xml b/WordPress/src/main/res/color/on_surface_button_selector.xml
new file mode 100644
index 000000000000..d367807dca45
--- /dev/null
+++ b/WordPress/src/main/res/color/on_surface_button_selector.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@dimen/material_emphasis_disabled" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+    <item android:color="?attr/colorOnSurface" android:state_selected="true" />
+    <item android:color="?attr/colorOnSurface" />
+</selector>
diff --git a/WordPress/src/main/res/color/on_surface_medium_primary_selector.xml b/WordPress/src/main/res/color/on_surface_medium_primary_selector.xml
deleted file mode 100644
index c3752776bbbc..000000000000
--- a/WordPress/src/main/res/color/on_surface_medium_primary_selector.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector
-    xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item android:color="?attr/colorPrimary" android:state_enabled="false" />
-    <item android:color="?attr/colorPrimary" android:state_selected="true" />
-    <item android:color="?attr/colorOnSurface" android:alpha="@dimen/material_emphasis_medium" />
-
-</selector>
diff --git a/WordPress/src/main/res/color/accent_neutral_30_selector.xml b/WordPress/src/main/res/color/primary_neutral_30_selector.xml
similarity index 82%
rename from WordPress/src/main/res/color/accent_neutral_30_selector.xml
rename to WordPress/src/main/res/color/primary_neutral_30_selector.xml
index 660365844919..01d952a382a9 100644
--- a/WordPress/src/main/res/color/accent_neutral_30_selector.xml
+++ b/WordPress/src/main/res/color/primary_neutral_30_selector.xml
@@ -4,6 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:color="@color/neutral_30" android:state_enabled="false" />
-    <item android:color="@color/accent" />
+    <item android:color="@color/primary" />
 
 </selector>
diff --git a/WordPress/src/main/res/color/primary_on_surface_selector.xml b/WordPress/src/main/res/color/primary_on_surface_selector.xml
deleted file mode 100644
index ebf741102749..000000000000
--- a/WordPress/src/main/res/color/primary_on_surface_selector.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:color="?attr/colorOnSurface" android:state_selected="false" />
-    <item android:color="?attr/colorPrimary" />
-
-</selector>
diff --git a/WordPress/src/main/res/color/quick_start_task_card_foreground_selector.xml b/WordPress/src/main/res/color/quick_start_task_card_foreground_selector.xml
new file mode 100644
index 000000000000..558db33c9e29
--- /dev/null
+++ b/WordPress/src/main/res/color/quick_start_task_card_foreground_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@dimen/quick_start_task_card_overlay_alpha" android:color="?attr/colorSurface" android:state_checked="true" />
+    <item android:color="@android:color/transparent" android:state_checked="false" />
+</selector>
diff --git a/WordPress/src/main/res/color/quick_start_task_card_ripple_selector.xml b/WordPress/src/main/res/color/quick_start_task_card_ripple_selector.xml
new file mode 100644
index 000000000000..4d281474fa76
--- /dev/null
+++ b/WordPress/src/main/res/color/quick_start_task_card_ripple_selector.xml
@@ -0,0 +1,4 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/transparent" android:state_checked="true" />
+    <item android:alpha="@dimen/emphasis_low" android:color="?attr/colorOnSurface" android:state_checked="false" />
+</selector>
diff --git a/WordPress/src/main/res/color/secondary_gray_20_disabled_selector.xml b/WordPress/src/main/res/color/secondary_gray_20_disabled_selector.xml
new file mode 100644
index 000000000000..7cabda4fc734
--- /dev/null
+++ b/WordPress/src/main/res/color/secondary_gray_20_disabled_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:alpha="@dimen/disabled_alpha" android:color="?attr/colorOnSurface" android:state_enabled="false" android:state_selected="false" />
+    <item android:alpha="@dimen/disabled_alpha" android:color="?attr/colorOnSurface" android:state_enabled="false" android:state_selected="true" />
+    <item android:color="?attr/wpColorOnSurfaceMedium" android:state_enabled="true" android:state_selected="true" />
+    <item android:color="?attr/colorSecondary" />
+</selector>
diff --git a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png b/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png
index fb0f763f0735..9a8f74d1815a 100644
Binary files a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png and b/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_1.png differ
diff --git a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png b/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png
index c53bc1adb94a..a6c71d049118 100644
Binary files a/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png and b/WordPress/src/main/res/drawable-hdpi/stories_intro_cover_2.png differ
diff --git a/WordPress/src/main/res/drawable-night/img_jetpack_empty_state.xml b/WordPress/src/main/res/drawable-night/img_jetpack_empty_state.xml
new file mode 100644
index 000000000000..8a91e65ac0bc
--- /dev/null
+++ b/WordPress/src/main/res/drawable-night/img_jetpack_empty_state.xml
@@ -0,0 +1,456 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="229dp"
+    android:height="143dp"
+    android:viewportWidth="229"
+    android:viewportHeight="143">
+  <path
+      android:pathData="M19.8,82.9C19.55,82.25 19.6,80.7 19.5,79.7C19.4,78.6 19.4,77.5 19.3,76.4C19.3,75.3 19.3,74.2 19.4,73.1C19.4,73 19.5,72.9 19.6,72.9C19.7,72.9 19.8,73 19.8,73.1C20,74.2 20.2,75.2 20.3,76.3C20.4,77.4 20.5,78.5 20.6,79.5C20.7,80.6 20.7,81.7 20.8,82.8C20.8,83.9 20.8,82.3 20.6,83.4C20.6,83.5 20.25,83.5 20.05,83.4C19.75,82.3 20.05,83.55 19.8,82.9Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M22.456,83.4C22.356,82.3 22.5,83.6 22.5,82.6C22.5,81.5 22.5,80.4 22.5,79.3C22.5,78.2 22.6,77.1 22.7,76C22.7,75.9 22.8,75.8 22.9,75.8C23,75.8 23.1,75.9 23.1,76C23.3,77.1 23.4,78.2 23.4,79.2C23.5,80.3 23.5,81.4 23.5,82.4C23.5,83.5 23.9,82.978 23.5,83.189C23.1,83.4 22.7,83.55 22.456,83.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M25.9,83.5C26,82.4 26.2,81.4 26.4,80.3C26.6,79.2 26.8,78.2 27.1,77.1C27.1,77 27.2,76.9 27.4,77C27.5,77 27.5,77.1 27.5,77.2C27.5,78.3 27.5,79.4 27.4,80.5C27.3,81.6 27.2,82.7 27.1,83.7C26.87,83.25 26.55,83.25 25.9,83.5Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M28.2,99.2L28.2,99.2C24.7,99.4 21,99.5 17.3,99.6C17.1,99.6 16.9,99.4 16.8,99.2L16.8,99.2C16.4,93.9 16,88.6 15.6,83.3C15.6,83 15.8,82.7 16.1,82.7L16.1,82.7L16.1,82.7C20.4,82.6 24.7,82.7 29,82.7L29,82.7C29.3,82.7 29.5,82.9 29.5,83.2L29.5,83.2C29.2,88.7 28.7,94 28.2,99.2ZM27.9,99.1L27.9,99.1C28.1,93.6 28.4,88.4 28.6,83.2L29.1,83.7C24.8,83.7 20.5,83.8 16.2,83.7L16.7,83.1C17,88.4 17.4,93.7 17.7,99L17.2,98.6C20.7,98.8 24.2,98.9 27.9,99.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M20.1,72.2L20.1,72.2C19.8,72.5 19.3,72.6 19,72.3L19,72.3C18.7,72 18.8,71.4 18.9,71.2C19,71 19.4,70.3 19.4,70.3C19.4,70.3 19.8,70.7 20,71.1C20.2,71.5 20.3,71.8 20.1,72.2Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M23.5,75L23.5,75C23.2,75.3 22.7,75.4 22.4,75.1L22.4,75.1C22.1,74.8 22.2,74.2 22.3,74C22.4,73.8 22.8,73.1 22.8,73.1C22.8,73.1 23.2,73.5 23.4,73.9C23.7,74.3 23.8,74.6 23.5,75Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M28.1,76.3L28.1,76.3C27.8,76.6 27.3,76.5 27,76.2L27,76.2C26.7,75.9 27,75.3 27.1,75.1C27.3,74.9 27.7,74.3 27.7,74.3C27.7,74.3 28,74.8 28.2,75.2C28.3,75.6 28.4,76 28.1,76.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M210.964,99.583C209.674,99.833 208.303,99.917 207.013,99.917C205.723,99.917 204.353,100 203.063,100C200.402,99.917 197.822,100 195.161,99.667C195.081,99.667 195,99.583 195,99.5C195,99.417 195.081,99.333 195.161,99.333C197.822,99.083 200.402,99.083 203.063,99C204.353,99 205.723,99 207.013,99.083C208.303,99.083 209.674,99.167 210.964,99.417C210.964,99.417 211.045,99.417 210.964,99.583C211.045,99.5 210.964,99.583 210.964,99.583Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M207.7,138.1C207.4,134.9 207.4,131.6 207.3,128.4L207.2,118.7C207.3,112.2 207.2,105.7 207.6,99.2C207.6,99.1 207.7,99 207.8,99C207.9,99 208,99.1 208,99.2C208.3,105.7 208.3,112.2 208.4,118.7L208.3,128.4C208.2,131.6 208.2,134.9 207.9,138.1C207.8,138.1 207.8,138.1 207.7,138.1L207.7,138.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M11.9,83.5L11.9,83.5C10.6,83.6 9.3,83.7 7.9,83.8C7.7,83.8 7.6,83.7 7.6,83.5L7.6,83.5C7.4,79.8 7.4,76 7.3,72.3L7.2,61.1C7.2,60.7 7.5,60.5 7.8,60.5L7.8,60.5L11.6,60.5L11.6,60.5C11.9,60.5 12.2,60.8 12.2,61.1L12.2,61.1C12.2,64.9 12.2,68.8 12.1,72.5L11.9,83.5ZM11.5,83.3L11.5,83.3L11.2,72C11.1,68.3 11.1,64.6 11.1,61L11.7,61.6L7.9,61.6L8.5,61L8.4,72.2C8.4,75.9 8.3,79.7 8.1,83.4L7.8,83.1C9.1,83.1 10.3,83.2 11.5,83.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M12.8,61L12.8,61C10.9,61.2 8.9,61.3 6.8,61.4C5.8,61.4 4.7,61.5 3.7,61.5L2.1,61.5L1.7,61.5L1.6,61.5L1.6,61.5L1.6,61.5C0.3,60.2 1.2,61.1 1,60.9L1,60.9L1,60.9L1,60.7C1,60.4 1.1,60.1 1.2,59.8C1.4,59.2 1.7,58.7 2.2,58.3C2.4,58.1 2.7,57.9 2.9,57.8C3.2,57.7 3.4,57.6 3.6,57.5C4.6,57.1 5.5,56.8 6.5,56.5C8.5,56 10.5,55.7 12.6,55.7L12.6,55.7C12.9,55.7 13,55.9 13,56.2C13.1,57.8 12.9,59.5 12.8,61ZM12.5,60.8L12.5,60.8C12.4,59.1 12.2,57.6 12.2,56.1L12.7,56.6C10.7,56.7 8.8,57 6.9,57.6C6,57.9 5,58.2 4.2,58.6C3.7,58.8 3.4,59 3.1,59.2C2.8,59.5 2.6,59.8 2.4,60.2C2.3,60.4 2.3,60.6 2.3,60.8L2.3,60.9L2.3,60.9L2.3,60.9C2,60.6 2.9,61.5 1.7,60.3L1.7,60.3L1.7,60.3L1.8,60.3L2.2,60.3L3.6,60.3C4.6,60.3 5.5,60.3 6.5,60.4C8.4,60.5 10.4,60.7 12.5,60.8Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M16,61C15.4,61.1 14.8,61.3 14.2,61.3C14,61.3 13.8,61.2 13.8,61L13.8,60.9C13.7,60.1 13.7,59.3 13.6,58.5C13.6,57.7 13.6,56.9 13.5,56.1C13.5,55.7 13.8,55.5 14.1,55.5L14.1,55.5L15.1,55.5L15.6,55.5C15.8,55.5 15.9,55.5 16.2,55.5C16.7,55.6 17.2,55.9 17.4,56.4C17.5,56.6 17.6,56.9 17.6,57.1L17.6,57.6C17.6,58.2 17.5,58.9 17.5,59.5C17.5,59.7 17.5,59.8 17.4,60C17.4,60.2 17.3,60.4 17.1,60.6C16.8,60.9 16.4,61.1 16,61.1C16,61.1 16,61 16,61ZM16,60.7C16.3,60.7 16.5,60.5 16.6,60.3C16.7,60.1 16.7,59.9 16.6,59.6C16.5,59 16.5,58.3 16.5,57.7L16.5,57.2C16.5,57.1 16.5,57.1 16.4,57C16.3,56.9 16.2,56.8 16.1,56.8L14.2,56.8L14.8,56.2C14.8,57 14.8,57.8 14.7,58.6C14.7,59.4 14.6,60.2 14.5,61L14.1,60.6C14.7,60.7 15.3,60.8 15.9,60.9L15.9,60.7C15.9,60.7 16,60.7 16,60.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M4.557,98.917C8.046,98.667 11.535,98.667 15.024,98.583L25.491,98.5C32.468,98.583 39.37,98.5 46.348,98.833C46.424,98.833 46.5,98.917 46.5,99C46.5,99.083 46.424,99.167 46.348,99.167C39.37,99.417 32.468,99.417 25.491,99.5L15.024,99.417C11.535,99.333 8.046,99.333 4.557,99.083C4.481,99.083 4.481,99 4.557,98.917C4.481,98.917 4.481,98.917 4.557,98.917Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M38.3,108.1C38.5,111.6 38.6,115.1 38.7,118.6C38.7,118.8 38.5,119 38.3,119L38.3,119C35.4,119.1 32.5,119.1 29.7,119.1L21.1,119.1C15.3,119.1 9.6,119.1 3.8,119L3.8,119C3.6,119 3.4,118.8 3.4,118.6C3.4,115.1 3.5,111.6 3.6,108.1C3.6,108 3.7,107.9 3.8,107.9C3.9,107.9 4,108 4,108.1C4.1,111.6 4.2,115.1 4.2,118.6L3.8,118.2C9.6,118.1 15.3,118.1 21.1,118.1L29.7,118.1C32.6,118.1 35.5,118.1 38.3,118.2L37.8,118.7C37.8,115.2 38,111.7 38.3,108.1C38.1,108 38.2,108 38.3,108.1C38.3,108 38.3,108 38.3,108.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M45,45.8C45.8,45.8 46.1,45.7 46.9,45.4C50.1,44.3 51.6,41.6 51.5,38.5C51.5,37.6 53,37 52.7,36.1C52.3,34.9 50.2,35 49.2,32.8C48,30.3 44.9,29.6 42,30.6C37.9,32 35.7,36.4 37.1,40.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:fillType="nonZero"
+      android:strokeColor="#A7AAAD"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M44.1,36.1C45.2,38.9 45,43.7 42,44.8C39.1,45.9 37,40.5 37,40.5L44.1,36.1Z"
+      android:strokeWidth="1"
+      android:fillColor="#50575E"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M35.9,77.3C33.3,97.1 35.5,139.3 35.5,139.3L45.2,139.3L46.1,103.9"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M35.5,138.3C38.4,138.4 47.3,139 48.7,139.4C50,139.9 50.1,140.1 48.5,140.4C46.9,140.8 35.5,140.4 35.5,140.4L35.5,138.3Z"
+      android:strokeWidth="0.7347"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/neutral"/>
+  <path
+      android:pathData="M51.7,76.9C51.7,76.9 52.8,91.9 53.3,107.3C53.7,120.2 52.2,133.8 52.3,139.3L41.8,139.3C41.9,107.8 35.7,94.7 36,77.3"
+      android:strokeWidth="1"
+      android:fillColor="#A7AAAD"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M35.1,55.5C33.9,66.3 35.9,77.3 35.9,77.3L51.8,76.9L51.6,67.1L47.9,65.1L52.4,56.4L49.4,53.3L44.9,48.6C40.2,47.5 35.6,50.7 35.1,55.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#A7AAAD"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M46.4,64.4l0.8,51.7l6.6,0l-1,-48.6z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M44.6,62.2C50.9,67.6 57,69.2 59.5,67C63.3,63.8 56.5,51.2 56.1,49.4C54.5,43 51,43 50.1,43.7C49.2,44.4 51,48.4 51,48.4L52.6,56.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:fillType="nonZero"
+      android:strokeColor="#A7AAAD"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M48.9,53.6L54.7,59.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M41.8,138.3C44.7,138.4 53.6,139 55,139.4C56.4,139.8 56.4,140.6 54.8,141C53.2,141.4 41.8,141 41.8,141L41.8,138.3Z"
+      android:strokeWidth="1"
+      android:fillColor="#A7AAAD"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M46.3,46l-0.9,2.6l-0.6,-2.7z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M49.1,76.6C44.3,78.7 34.9,77.6 34.9,77.6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M54.6,91C53,91.3 51.1,91.2 49.2,90.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#3C434A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M41.3,48.9C43.8,48 38.4,45.1 38,47.1C37.7,49 39.2,49.6 41.3,48.9Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M42.5,48.5C42.5,48.5 45.6,48.9 47.2,50.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M36.5,41.2L52.1,30.6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M49.6,41C50.3,41.1 50.9,40.8 50.9,40.8"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M48.9,37.7L48.9,37.7C48.7,37.7 48.4,37.6 48.4,37.3L48.3,36.6C48.3,36.4 48.4,36.1 48.7,36.1L48.7,36.1C48.9,36.1 49.2,36.2 49.2,36.5L49.3,37.2C49.3,37.4 49.1,37.7 48.9,37.7Z"
+      android:strokeWidth="1"
+      android:fillColor="#A7AAAD"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M17.9,111.4C18.4,111.1 18.9,111 19.4,111C19.9,111 20.4,110.9 20.9,110.9C21.4,110.9 21.9,110.9 22.4,111C22.9,111 23.4,111.1 23.9,111.3C24,111.3 24.1,111.5 24,111.6C24,111.7 23.9,111.7 23.9,111.7C23.4,111.9 22.9,111.9 22.4,112C21.9,112 21.4,112.1 20.9,112.1C20.4,112.1 19.9,112.1 19.4,112C18.9,112 18.4,111.9 17.9,111.6C17.8,111.5 17.8,111.5 17.9,111.4C17.8,111.4 17.9,111.4 17.9,111.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2.298,141.609C21.123,141.336 39.849,141.291 58.674,141.245L115.05,141.2C152.602,141.245 190.153,141.245 227.704,141.518C227.902,141.518 228.1,141.609 228.1,141.7C228.1,141.791 227.902,141.882 227.704,141.882C190.153,142.2 152.602,142.155 115.05,142.2L58.674,142.155C39.849,142.109 21.123,142.018 2.298,141.791C2.199,141.791 2.1,141.745 2.1,141.7C2.1,141.655 2.199,141.609 2.298,141.609Z"
+      android:strokeWidth="1"
+      android:fillColor="#3C434A"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M56.8,22.2L56.7,19.7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M56.6,14.6L56.6,14.4L56.6,9.2C56.6,4.7 60.3,1 64.8,1L186,1C190.5,1 194.2,4.7 194.2,9.2L194.2,17.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M194.2,19.7L194.2,22.2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M201,23.4C188.4,24.2 175.8,24.2 163.2,24.2L125.4,24.3L87.6,24.2C75,24.2 62.4,24.2 49.8,23.4L49.8,22.9C62.4,22.1 75,22.1 87.6,22.1L125.4,22L163.2,22.1C175.8,22.1 188.4,22.1 201,22.9L201,23.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M73.8,65h57.4v36.9h-57.4z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M131.2,54.4L73.8,54.4L73.8,46.2C73.8,40.3 78.6,35.5 84.5,35.5L131.2,35.5L131.2,54.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M122.2,73.3C115.2,73.3 112.8,76.5 111.3,79.2C109.9,81.7 106.8,85.1 102,86.4C97.2,87.7 95.2,90.5 95.2,93.2L122.4,93.2L122.2,73.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M59.8,127.8l0,-96.1l137.6,0l0,96.1l-103,0z"
+      android:strokeWidth="1"
+      android:fillColor="#3C434A"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M131.6,105.6l0,2.5l-2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M124.5,108.1L80.7,108.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M78.4,108.1l-2.5,0l0,-2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M75.9,100.3L75.9,60.8"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M75.9,58.2l0,-2.5l2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M83,55.7L126.8,55.7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M129.1,55.7l2.5,0l0,2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M131.6,63.4L131.6,102.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#787C82"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M128.3,81.4L84.6,81.4L84.6,71.5L136.5,71.5L136.5,73.2C136.5,77.7 132.8,81.4 128.3,81.4Z"
+      android:strokeWidth="1"
+      android:fillColor="#1D2327"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M108.8,99.8L84.6,99.8L84.6,89.9L117,89.9L117,91.6C117,96.1 113.3,99.8 108.8,99.8Z"
+      android:strokeWidth="1"
+      android:fillColor="#8C8F94"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M185.4,118.7L145.7,118.7L145.7,90.8C145.7,86.9 148.8,83.8 152.7,83.8L185.4,83.8L185.4,118.7L185.4,118.7Z"
+      android:strokeWidth="1"
+      android:fillColor="#00BE28"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M204.7,72.2l0,2.5l-2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M196.9,74.7L167.9,74.7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M165.3,74.7l-2.5,0l0,-2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M162.8,66.5L162.8,46.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M162.8,43.6l0,-2.5l2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M170.5,41.1L198.9,41.1C202.1,41.1 204.7,43.7 204.7,46.9L204.7,69.6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M162.6,41.3L164.5,42.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M168.7,46.2L199.6,71.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M201.6,72.7L203.6,74.3"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/neutral"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M71.8,11.6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M82.5,11.6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M93.3,11.6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png b/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png
index 869d01a24c4b..12260bf4b1a7 100644
Binary files a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png and b/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_1.png differ
diff --git a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png b/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png
index bc84edec4be2..c76abd7dc35d 100644
Binary files a/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png and b/WordPress/src/main/res/drawable-xhdpi/stories_intro_cover_2.png differ
diff --git a/WordPress/src/main/res/drawable/app_icon_background.xml b/WordPress/src/main/res/drawable/app_icon_background.xml
index 51820e3aaeb9..917d2263e181 100644
--- a/WordPress/src/main/res/drawable/app_icon_background.xml
+++ b/WordPress/src/main/res/drawable/app_icon_background.xml
@@ -1,13 +1,24 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="108dp"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
-    android:viewportHeight="108.0"
-    android:viewportWidth="108.0" >
-
-    <path
-        android:fillColor="@color/primary"
-        android:pathData="M0,0h108v108H0V0z" >
-    </path>
-
+    android:height="108dp"
+    android:viewportWidth="432"
+    android:viewportHeight="432">
+  <path
+      android:pathData="M0,0h432v432h-432z"
+      android:strokeWidth="1"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="0"
+          android:startX="133.87831"
+          android:endY="435.6443"
+          android:endX="293.90695"
+          android:type="linear">
+        <item android:offset="0" android:color="@color/primary_30"/>
+        <item android:offset="1" android:color="@color/primary_50"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/WordPress/src/main/res/drawable/app_icon_foreground.xml b/WordPress/src/main/res/drawable/app_icon_foreground.xml
index dba705ac48a1..d1ae21fa29da 100644
--- a/WordPress/src/main/res/drawable/app_icon_foreground.xml
+++ b/WordPress/src/main/res/drawable/app_icon_foreground.xml
@@ -1,9 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="108dp"
-        android:height="108dp"
-        android:viewportHeight="108.0"
-        android:viewportWidth="108.0">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M54 22c-17.6 0-32 14.4-32 32s14.4 32 32 32 32-14.4 32-32-14.4-32-32-32zM25.2 54c0-4.2 0.9-8.1 2.5-11.7l13.7 37.6C31.8 75.2 25.2 65.4 25.2 54zM54 82.8c-2.8 0-5.5-0.4-8.1-1.2l8.6-25.1 8.8 24.2c0.1 0.2 0.2 0.3 0.3 0.4-3 1.1-6.3 1.7-9.6 1.7zm4-42.3c1.7-0.1 3.3-0.3 3.3-0.3 1.6-0.2 1.4-2.5-0.2-2.4 0 0-4.7 0.4-7.7 0.4-2.8 0-7.6-0.4-7.6-0.4-1.6-0.1-1.7 2.3-0.2 2.4 0 0 1.5 0.2 3 0.3l4.5 12.3-6.3 18.9-10.5-31.2c1.7-0.1 3.3-0.3 3.3-0.3 1.5-0.2 1.4-2.5-0.2-2.4 0 0-4.7 0.4-7.7 0.4h-1.9c5.1-7.8 14-13 24-13 7.5 0 14.3 2.9 19.4 7.6h-0.4c-2.8 0-4.8 2.5-4.8 5.1 0 2.4 1.4 4.4 2.8 6.7 1.1 1.9 2.4 4.4 2.4 7.9 0 2.5-0.7 5.6-2.2 9.3l-2.9 9.6L58 40.5zm21.2-0.3c2.2 4.1 3.5 8.8 3.5 13.8 0.1 10.6-5.7 19.9-14.2 24.9l8.8-25.4c1.6-4.1 2.2-7.4 2.2-10.3-0.1-1.1-0.1-2.1-0.3-3z"/>
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="432"
+    android:viewportHeight="432">
+  <path
+      android:pathData="M215.997,88C145.421,88 88,145.419 88,215.995C88,286.576 145.421,344 215.997,344C286.579,344 344,286.576 344,215.995C344,145.419 286.579,88 215.997,88L215.997,88ZM100.917,215.995C100.917,199.309 104.496,183.472 110.883,169.16L165.779,319.568C127.387,300.915 100.917,261.547 100.917,215.995L100.917,215.995ZM215.997,331.085C204.704,331.085 193.8,329.429 183.485,326.395L218.021,226.061L253.389,322.973C253.624,323.544 253.909,324.067 254.216,324.56C242.256,328.773 229.4,331.085 215.997,331.085L215.997,331.085ZM231.861,162.04C238.787,161.675 245.029,160.944 245.029,160.944C251.229,160.213 250.501,151.099 244.296,151.461C244.296,151.461 225.656,152.925 213.621,152.925C202.315,152.925 183.315,151.461 183.315,151.461C177.107,151.099 176.381,160.579 182.584,160.944C182.584,160.944 188.453,161.675 194.653,162.04L212.584,211.165L187.395,286.696L145.491,162.04C152.421,161.675 158.659,160.944 158.659,160.944C164.856,160.213 164.123,151.099 157.923,151.461C157.923,151.461 139.285,152.925 127.251,152.925C125.093,152.925 122.547,152.869 119.845,152.784C140.424,121.544 175.792,100.915 215.997,100.915C245.957,100.915 273.237,112.368 293.712,131.131C293.216,131.099 292.731,131.037 292.221,131.037C280.917,131.037 272.896,140.883 272.896,151.461C272.896,160.944 278.365,168.968 284.2,178.453C288.579,186.117 293.688,195.963 293.688,210.192C293.688,220.04 290.765,232.44 284.931,247.395L273.448,285.747L231.861,162.04L231.861,162.04ZM316.987,160.787C325.965,177.176 331.08,195.987 331.08,215.995C331.08,258.451 308.072,295.52 273.859,315.467L309.005,213.837C315.573,197.421 317.76,184.293 317.76,172.619C317.76,168.384 317.48,164.451 316.987,160.787L316.987,160.787Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/transparent"/>
 </vector>
diff --git a/WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml b/WordPress/src/main/res/drawable/bg_nav_badge.xml
similarity index 100%
rename from WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml
rename to WordPress/src/main/res/drawable/bg_nav_badge.xml
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml b/WordPress/src/main/res/drawable/bg_note_avatar_badge.xml
similarity index 57%
rename from libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml
rename to WordPress/src/main/res/drawable/bg_note_avatar_badge.xml
index de3dbf83a696..11123c08e037 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_green.xml
+++ b/WordPress/src/main/res/drawable/bg_note_avatar_badge.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/alert_green" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid
+        android:color="@color/primary"/>
 </shape>
diff --git a/WordPress/src/main/res/drawable/bg_oval_pink_50_multiple_users_white_40dp.xml b/WordPress/src/main/res/drawable/bg_oval_blue_50_multiple_users_white_40dp.xml
similarity index 90%
rename from WordPress/src/main/res/drawable/bg_oval_pink_50_multiple_users_white_40dp.xml
rename to WordPress/src/main/res/drawable/bg_oval_blue_50_multiple_users_white_40dp.xml
index f95ecf3a40e3..69b9311d26e3 100644
--- a/WordPress/src/main/res/drawable/bg_oval_pink_50_multiple_users_white_40dp.xml
+++ b/WordPress/src/main/res/drawable/bg_oval_blue_50_multiple_users_white_40dp.xml
@@ -8,7 +8,7 @@
             android:shape="oval" >
 
             <solid
-                android:color="@color/pink_50" >
+                android:color="@color/blue_50" >
             </solid>
 
         </shape>
diff --git a/WordPress/src/main/res/drawable/bg_oval_pink_50_multiple_users_white_40dp_selector.xml b/WordPress/src/main/res/drawable/bg_oval_blue_50_multiple_users_white_40dp_selector.xml
similarity index 80%
rename from WordPress/src/main/res/drawable/bg_oval_pink_50_multiple_users_white_40dp_selector.xml
rename to WordPress/src/main/res/drawable/bg_oval_blue_50_multiple_users_white_40dp_selector.xml
index 7e81acd650a5..9a2c08c47599 100644
--- a/WordPress/src/main/res/drawable/bg_oval_pink_50_multiple_users_white_40dp_selector.xml
+++ b/WordPress/src/main/res/drawable/bg_oval_blue_50_multiple_users_white_40dp_selector.xml
@@ -4,6 +4,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item android:drawable="@drawable/bg_oval_neutral_30_multiple_users_white_40dp" android:state_enabled="false" />
-    <item android:drawable="@drawable/bg_oval_pink_50_multiple_users_white_40dp" />
+    <item android:drawable="@drawable/bg_oval_blue_50_multiple_users_white_40dp" />
 
 </selector>
diff --git a/WordPress/src/main/res/drawable/bg_oval_placeholder_p2_32dp.xml b/WordPress/src/main/res/drawable/bg_oval_placeholder_p2_32dp.xml
new file mode 100644
index 000000000000..8b89197adebb
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_oval_placeholder_p2_32dp.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+
+        <shape
+            android:shape="oval">
+
+            <solid
+                android:color="@color/placeholder" >
+            </solid>
+
+        </shape>
+
+    </item>
+
+    <item
+        android:drawable="@drawable/ic_p2_white_24dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp">
+    </item>
+
+</layer-list>
diff --git a/WordPress/src/main/res/drawable/bg_oval_stroke_liker_2dp.xml b/WordPress/src/main/res/drawable/bg_oval_stroke_liker_2dp.xml
new file mode 100644
index 000000000000..4ceac5085925
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_oval_stroke_liker_2dp.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <stroke
+        android:width="2dp"
+        android:color="@color/p2_author_bg_stroke"/>
+</shape>
diff --git a/WordPress/src/main/res/drawable/bg_oval_stroke_placeholder_1dp.xml b/WordPress/src/main/res/drawable/bg_oval_stroke_p2_author_1dp.xml
similarity index 77%
rename from WordPress/src/main/res/drawable/bg_oval_stroke_placeholder_1dp.xml
rename to WordPress/src/main/res/drawable/bg_oval_stroke_p2_author_1dp.xml
index 477fababd1ea..38a0fa2b97ca 100644
--- a/WordPress/src/main/res/drawable/bg_oval_stroke_placeholder_1dp.xml
+++ b/WordPress/src/main/res/drawable/bg_oval_stroke_p2_author_1dp.xml
@@ -3,5 +3,5 @@
     android:shape="oval">
     <stroke
         android:width="1dp"
-        android:color="@color/placeholder"/>
+        android:color="@color/p2_author_bg_stroke"/>
 </shape>
diff --git a/WordPress/src/main/res/drawable/bg_oval_surface_overlay_emphasis_lowest.xml b/WordPress/src/main/res/drawable/bg_oval_surface_overlay_emphasis_lowest.xml
new file mode 100644
index 000000000000..79e84b36d1dd
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_oval_surface_overlay_emphasis_lowest.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="rectangle">
+    <solid android:color="@color/on_surface_emphasis_lowest"/>
+
+    <!--  arbitrary high number  -->
+     <corners android:radius="15dp" />
+</shape>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml b/WordPress/src/main/res/drawable/bg_oval_warning_light.xml
similarity index 57%
rename from libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml
rename to WordPress/src/main/res/drawable/bg_oval_warning_light.xml
index c04efe4258dc..ca312e7ca809 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/shape_oval_red.xml
+++ b/WordPress/src/main/res/drawable/bg_oval_warning_light.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval" >
-    <solid android:color="@color/alert_red" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <solid android:color="?attr/wpColorWarningLight" />
 </shape>
diff --git a/WordPress/src/main/res/drawable/bg_rectangle_on_surface_emphasis_lowest.xml b/WordPress/src/main/res/drawable/bg_rectangle_on_surface_emphasis_lowest.xml
new file mode 100644
index 000000000000..b34db066ae2e
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_rectangle_on_surface_emphasis_lowest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/on_surface_emphasis_lowest"/>
+</shape>
+
diff --git a/WordPress/src/main/res/drawable/bg_rectangle_placeholder_p2_32dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_placeholder_p2_32dp.xml
new file mode 100644
index 000000000000..5bd431bfcf4f
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_rectangle_placeholder_p2_32dp.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+
+        <shape
+            android:shape="rectangle">
+
+            <solid
+                android:color="@color/placeholder" >
+            </solid>
+
+        </shape>
+
+    </item>
+
+    <item
+        android:drawable="@drawable/ic_p2_white_24dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp">
+    </item>
+
+</layer-list>
diff --git a/WordPress/src/main/res/drawable/bg_rectangle_placeholder_radius_4dp_p2_32dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_placeholder_radius_4dp_p2_32dp.xml
new file mode 100644
index 000000000000..d90f24c04694
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_rectangle_placeholder_radius_4dp_p2_32dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/bg_rectangle_placeholder_radius_4dp" />
+
+    <item
+        android:drawable="@drawable/ic_p2_white_24dp"
+        android:bottom="4dp"
+        android:left="4dp"
+        android:right="4dp"
+        android:top="4dp" />
+
+</layer-list>
diff --git a/WordPress/src/main/res/drawable/bg_site_creation_domain_example.xml b/WordPress/src/main/res/drawable/bg_site_creation_domain_example.xml
new file mode 100644
index 000000000000..c6bb2b086e71
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_site_creation_domain_example.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:bottom="-2dp">
+        <shape android:shape="rectangle">
+            <corners
+                android:topLeftRadius="@dimen/margin_medium"
+                android:topRightRadius="@dimen/margin_medium" />
+            <stroke
+                android:width="@dimen/margin_extra_extra_small"
+                android:color="@color/gray_5" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/WordPress/src/main/res/drawable/bg_site_creation_domain_example_bottomcell.xml b/WordPress/src/main/res/drawable/bg_site_creation_domain_example_bottomcell.xml
new file mode 100644
index 000000000000..47210feaedc3
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_site_creation_domain_example_bottomcell.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="@dimen/margin_medium"
+        android:topRightRadius="@dimen/margin_medium" />
+    <solid android:color="@color/gray_0" />
+</shape>
diff --git a/WordPress/src/main/res/drawable/bg_site_creation_domain_example_cell.xml b/WordPress/src/main/res/drawable/bg_site_creation_domain_example_cell.xml
new file mode 100644
index 000000000000..dbfd5a236bd9
--- /dev/null
+++ b/WordPress/src/main/res/drawable/bg_site_creation_domain_example_cell.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="@dimen/margin_medium" />
+    <solid android:color="@color/gray_0" />
+</shape>
diff --git a/WordPress/src/main/res/drawable/box_with_pages_top.xml b/WordPress/src/main/res/drawable/box_with_pages_top.xml
deleted file mode 100644
index 02294ecb79c6..000000000000
--- a/WordPress/src/main/res/drawable/box_with_pages_top.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="54dp"
-    android:width="86dp"
-    android:viewportHeight="54.0"
-    android:viewportWidth="86.0" >
-
-    <path
-        android:fillColor="@color/neutral_50"
-        android:pathData="M0,0v54h66V0H0zM57.7,24H44.8c-3.4,0 -6.2,-3.1 -6.2,-6.5s2.8,-6.5 6.2,-6.5h12.9c3.4,0 6.2,3.1 6.2,6.5S61.1,24 57.7,24z" >
-    </path>
-
-    <path
-        android:fillColor="@color/neutral_40"
-        android:pathData="M17,0v54h69V0H17zM57.7,24H44.8c-3.4,0 -6.2,-3.1 -6.2,-6.5s2.8,-6.5 6.2,-6.5h12.9c3.4,0 6.2,3.1 6.2,6.5S61.1,24 57.7,24z" >
-    </path>
-
-    <path
-        android:fillAlpha="0.5"
-        android:fillColor="@color/neutral_30"
-        android:pathData="M39.1,20c-0.3,-0.8 -0.5,-1.6 -0.5,-2.5c0,-3.4 2.8,-6.5 6.2,-6.5h12.9c3.4,0 6.2,3.1 6.2,6.5c0,0.9 -0.2,1.7 -0.5,2.5c-0.9,-2.3 -3.1,-4 -5.6,-4H44.8C42.2,16 40.1,17.7 39.1,20z" >
-    </path>
-
-</vector>
diff --git a/WordPress/src/main/res/drawable/discover_list_divider.xml b/WordPress/src/main/res/drawable/default_list_divider.xml
similarity index 100%
rename from WordPress/src/main/res/drawable/discover_list_divider.xml
rename to WordPress/src/main/res/drawable/default_list_divider.xml
diff --git a/WordPress/src/main/res/drawable/ic_app_white_24dp.xml b/WordPress/src/main/res/drawable/ic_app_white_24dp.xml
new file mode 100644
index 000000000000..d465146d983a
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_app_white_24dp.xml
@@ -0,0 +1,14 @@
+<!-- This asset is a copy of ic_my_sites_white_24dp. It is the WordPress grid icon -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="UnusedResources">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zM3.5 12c0-1.2 0.3-2.4 0.7-3.5l4.1 11.1c-2.8-1.3-4.8-4.2-4.8-7.6zm8.5 8.5c-0.8 0-1.6-0.1-2.4-0.3l2.6-7.4 2.6 7.2s0 0.1 0.1 0.1c-1 0.2-1.9 0.4-2.9 0.4zM13.2 8c0.5 0 1-0.1 1-0.1 0.5-0.1 0.4-0.7-0.1-0.7 0 0-1.4 0.1-2.3 0.1-0.8 0-2.2-0.1-2.2-0.1-0.5 0-0.5 0.7-0.1 0.7 0 0 0.4 0.1 0.9 0.1l1.3 3.6-1.9 5.6-3-9.2c0.5 0 1-0.1 1-0.1 0.5-0.1 0.4-0.7-0.1-0.7 0 0-1.4 0.1-2.3 0.1H4.9C6.4 5 9 3.5 12 3.5c2.2 0 4.2 0.8 5.7 2.2h-0.1c-0.8 0-1.4 0.7-1.4 1.5 0 0.7 0.4 1.3 0.8 2 0.3 0.6 0.7 1.3 0.7 2.3 0 0.7-0.3 1.6-0.6 2.7L16.3 17c-0.1 0.2-3.1-9-3.1-9zm3.1 11.3l2.6-7.5c0.5-1.2 0.6-2.2 0.6-3 0-0.3 0-0.6-0.1-0.9 0.7 1.2 1 2.6 1 4.1 0.1 3.1-1.6 5.9-4.1 7.3z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_baseline_security_white_24dp.xml b/WordPress/src/main/res/drawable/ic_baseline_security_white_24dp.xml
new file mode 100644
index 000000000000..f50cd43a9c5d
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_baseline_security_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12L21,5l-9,-4zM12,11.99h7c-0.53,4.12 -3.28,7.79 -7,8.94L12,12L5,12L5,6.3l7,-3.11v8.8z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_cloud_done_white_24dp.xml b/WordPress/src/main/res/drawable/ic_cloud_done_white_24dp.xml
new file mode 100644
index 000000000000..6274e4dfac31
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_cloud_done_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17 15.18,9l1.41,1.41L10,17z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_cloud_off_white_24dp.xml b/WordPress/src/main/res/drawable/ic_cloud_off_white_24dp.xml
new file mode 100644
index 000000000000..290c1150bd14
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_cloud_off_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_get_app_white_24dp.xml b/WordPress/src/main/res/drawable/ic_get_app_white_24dp.xml
new file mode 100644
index 000000000000..b4e7af0405d3
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_get_app_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_gridicons_checkmark_circle.xml b/WordPress/src/main/res/drawable/ic_gridicons_checkmark_circle.xml
new file mode 100644
index 000000000000..1d8a099c2364
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_gridicons_checkmark_circle.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/black"
+      android:pathData="M11,17.768l-4.884,-4.884 1.768,-1.768L11,14.232l8.658,-8.658C17.823,3.39 15.075,2 12,2 6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10c0,-1.528 -0.353,-2.97 -0.966,-4.266L11,17.768z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_gridicons_clipboard_white_24dp.xml b/WordPress/src/main/res/drawable/ic_gridicons_clipboard_white_24dp.xml
new file mode 100644
index 000000000000..9af541732578
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_gridicons_clipboard_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,18L8,18v-2h8v2zM16,12L8,12v2h8v-2zM18,3h-2v2h2v15L6,20L6,5h2L8,3L6,3c-1.105,0 -2,0.895 -2,2v15c0,1.105 0.895,2 2,2h12c1.105,0 2,-0.895 2,-2L20,5c0,-1.105 -0.895,-2 -2,-2zM14,5L14,4c0,-1.105 -0.895,-2 -2,-2s-2,0.895 -2,2v1c-1.105,0 -2,0.895 -2,2v1h8L16,7c0,-1.105 -0.895,-2 -2,-2z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_gridicons_cloud_upload_white_24dp.xml b/WordPress/src/main/res/drawable/ic_gridicons_cloud_upload_white_24dp.xml
new file mode 100644
index 000000000000..70ad5ab58188
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_gridicons_cloud_upload_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,9c-0.01,0 -0.017,0.002 -0.025,0.003C17.72,5.646 14.922,3 11.5,3 7.91,3 5,5.91 5,9.5c0,0.524 0.07,1.03 0.186,1.52C5.123,11.015 5.064,11 5,11c-2.21,0 -4,1.79 -4,4 0,1.202 0.54,2.267 1.38,3h18.593C22.196,17.09 23,15.643 23,14c0,-2.76 -2.24,-5 -5,-5zM13,13v3h-2v-3L8,13l4,-5 4,5h-3z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_gridicons_lock.xml b/WordPress/src/main/res/drawable/ic_gridicons_lock.xml
new file mode 100644
index 000000000000..28f80f108ac3
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_gridicons_lock.xml
@@ -0,0 +1,4 @@
+<vector android:height="16dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/gray_40" android:pathData="M18,8h-1L17,7c0,-2.757 -2.243,-5 -5,-5S7,4.243 7,7v1L6,8c-1.105,0 -2,0.895 -2,2v10c0,1.105 0.895,2 2,2h12c1.105,0 2,-0.895 2,-2L20,10c0,-1.105 -0.895,-2 -2,-2zM9,7c0,-1.654 1.346,-3 3,-3s3,1.346 3,3v1L9,8L9,7zM13,15.723L13,18h-2v-2.277c-0.595,-0.346 -1,-0.984 -1,-1.723 0,-1.105 0.895,-2 2,-2s2,0.895 2,2c0,0.738 -0.405,1.376 -1,1.723z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_help_outline_domain_24dp.xml b/WordPress/src/main/res/drawable/ic_help_outline_domain_24dp.xml
new file mode 100644
index 000000000000..5ee5d120db74
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_help_outline_domain_24dp.xml
@@ -0,0 +1,13 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0" >
+
+    <path
+        android:fillColor="?attr/colorOnSurface"
+        android:pathData="M12 4c4.41 0 8 3.59 8 8s-3.59 8-8 8-8-3.59-8-8 3.59-8 8-8m0-2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zm4 8c0-2.21-1.79-4-4-4s-4 1.79-4 4h2c0-1.103 0.897-2 2-2s2 0.897 2 2-0.897 2-2 2c-0.552 0-1 0.448-1 1v2h2v-1.14c1.722-0.447 3-1.998 3-3.86zm-3 6h-2v2h2v-2z" >
+    </path>
+
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml b/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml
deleted file mode 100644
index 60fbca6cb38c..000000000000
--- a/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M2.12,13.526c0.742,4.781 4.902,8.47 9.881,8.47c5.499,0 9.998,-4.499 9.998,-9.998S17.501,2 12.002,2C8.704,2 5.802,3.601 4,6l0,0V2.001L2.003,2L2,9h7V7L5.801,6.999l0,0C7.2,5.201 9.502,4 12.002,4C16.4,4 20,7.6 20,11.998s-3.6,7.999 -7.999,7.999c-3.878,0 -7.132,-2.794 -7.849,-6.471L2.12,13.526z" >
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M11.002,6.999l0,5.302l3.201,4.297l1.6,-1.197l-2.801,-3.701l0,-4.701z" >
-    </path>
-
-</vector>
diff --git a/WordPress/src/main/res/drawable/ic_homepage_16dp.xml b/WordPress/src/main/res/drawable/ic_homepage_16dp.xml
new file mode 100644
index 000000000000..644be3c109e5
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_homepage_16dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <group>
+    <clip-path
+        android:pathData="M14.6666,6.0001L8,0.6667L1.3333,6.0001V7.3334H2.6667V14.0001H6V11.3334C6,10.2287 6.8953,9.3334 8,9.3334C9.1046,9.3334 10,10.2287 10,11.3334V14.0001H13.3333V7.3334H14.6666V6.0001Z"/>
+    <path
+        android:pathData="M0,0h16v16h-16z"
+        android:fillColor="#787C82"/>
+  </group>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_layout_selection_check_24dp.xml b/WordPress/src/main/res/drawable/ic_layout_selection_check_24dp.xml
new file mode 100644
index 000000000000..e4287dc460cc
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_layout_selection_check_24dp.xml
@@ -0,0 +1,6 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@color/white" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z"/>
+    <path android:fillColor="@color/accent_50" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_layout_selection_overlay_153dp.xml b/WordPress/src/main/res/drawable/ic_layout_selection_overlay_153dp.xml
deleted file mode 100644
index 65a797a638ba..000000000000
--- a/WordPress/src/main/res/drawable/ic_layout_selection_overlay_153dp.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector android:autoMirrored="true" android:height="204dp"
-    android:viewportHeight="204" android:viewportWidth="153"
-    android:width="153dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M133,20m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"/>
-    <path android:fillColor="#00000000"
-        android:pathData="M4.2,1H149c1.7,0 3,1.3 3,3v196c0,1.7 -1.3,3 -3,3H4.2c-1.7,0 -3,-1.3 -3,-3V4C1.2,2.3 2.5,1 4.2,1z"
-        android:strokeColor="@color/accent_50" android:strokeWidth="2"/>
-    <group>
-        <clip-path android:fillType="evenOdd" android:pathData="M123,20c0,-5.5 4.5,-10 10,-10c5.5,0 10,4.5 10,10s-4.5,10 -10,10C127.4,30 123,25.5 123,20zM126,20l5,5l9,-9l-1.4,-1.4l-7.6,7.6l-3.6,-3.6L126,20z"/>
-        <path android:fillColor="@color/accent_50" android:pathData="M121,8h24v24h-24z"/>
-    </group>
-</vector>
diff --git a/WordPress/src/main/res/drawable/ic_location_white_24dp.xml b/WordPress/src/main/res/drawable/ic_location_white_24dp.xml
deleted file mode 100644
index beebda9110ad..000000000000
--- a/WordPress/src/main/res/drawable/ic_location_white_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19 9c0-3.866-3.134-7-7-7S5 5.134 5 9c0 1.387 0.41 2.677 1.105 3.765h -0.008C8.457 16.46 12 22 12 22l5.903-9.235h -0.007C18.59 11.677 19 10.387 19 9zm-7 3c-1.657 0-3-1.343-3-3s1.343-3 3-3 3 1.343 3 3-1.343 3-3 3z" >
-    </path>
-
-</vector>
diff --git a/WordPress/src/main/res/drawable/ic_not_visible_white_24dp.xml b/WordPress/src/main/res/drawable/ic_not_visible_white_24dp.xml
new file mode 100644
index 000000000000..cdc3e319f7a3
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_not_visible_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M1,12s4.188,-6 11,-6c0.947,0 1.84,0.12 2.678,0.322L8.36,12.64C8.133,12.14 8,11.586 8,11c0,-0.937 0.335,-1.787 0.875,-2.47C6.483,9.344 4.66,10.917 3.62,12c0.68,0.707 1.696,1.62 2.98,2.398L5.15,15.85C2.498,14.13 1,12 1,12zM23,12s-4.188,6 -11,6c-0.946,0 -1.836,-0.124 -2.676,-0.323L5,22l-1.5,-1.5 17,-17L22,5l-3.147,3.147C21.5,9.87 23,12 23,12zM20.385,12.006c-0.678,-0.708 -1.697,-1.624 -2.987,-2.403L16,11c0,2.21 -1.79,4 -4,4l-0.947,0.947c0.31,0.03 0.624,0.053 0.947,0.053 3.978,0 6.943,-2.478 8.385,-3.994z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_p2_white_24dp.xml b/WordPress/src/main/res/drawable/ic_p2_white_24dp.xml
new file mode 100644
index 000000000000..511b20364015
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_p2_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M13,14L13,18L7,18L7,14L13,14ZM17,6L17,12L7,12L7,6L17,6Z"
+      android:strokeWidth="1"
+      android:fillColor="@android:color/white"
+      android:fillType="evenOdd"
+      android:strokeColor="@android:color/white"/>
+</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_placeholder_blavatar_grey_lighten_20_40dp.xml b/WordPress/src/main/res/drawable/ic_placeholder_blavatar_grey_lighten_20_40dp.xml
similarity index 100%
rename from libs/login/WordPressLoginFlow/src/main/res/drawable/ic_placeholder_blavatar_grey_lighten_20_40dp.xml
rename to WordPress/src/main/res/drawable/ic_placeholder_blavatar_grey_lighten_20_40dp.xml
diff --git a/WordPress/src/main/res/drawable/ic_posts_16dp.xml b/WordPress/src/main/res/drawable/ic_posts_16dp.xml
new file mode 100644
index 000000000000..3c85637ad054
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_posts_16dp.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <group>
+    <clip-path
+        android:pathData="M2,3.3333V4.6666H9.3333V3.3333H2ZM2,5.9999H14V7.3333H2V5.9999ZM2,12.6666H10.6667V11.3333H2V12.6666ZM11.3333,4.6666V3.3333H14V4.6666H11.3333ZM7.3333,8.6666V9.9999H14V8.6666H7.3333ZM2,9.9999V8.6666H5.3333V9.9999H2Z"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M0,0h16v16h-16z"
+        android:fillColor="#787C82"/>
+  </group>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_push_pin_24.xml b/WordPress/src/main/res/drawable/ic_push_pin_24.xml
new file mode 100644
index 000000000000..9fd971b16c47
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_push_pin_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M16,9V4l1,0c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3v0c0,0.55 0.45,1 1,1l1,0v5c0,1.66 -1.34,3 -3,3h0v2h5.97v7l1,1l1,-1v-7H19v-2h0C17.34,12 16,10.66 16,9z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_query_builder_white_24dp.xml b/WordPress/src/main/res/drawable/ic_query_builder_white_24dp.xml
new file mode 100644
index 000000000000..2817c5564a7e
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_query_builder_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"
+      android:fillColor="@android:color/white"/>
+  <path
+      android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_reader_follow_conversation_white_24dp.xml b/WordPress/src/main/res/drawable/ic_reader_follow_conversation_white_24dp.xml
new file mode 100644
index 000000000000..1cda78fc35e4
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_reader_follow_conversation_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,14v-3h-2v3h-3v2h3v3h2v-3h3v-2"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M13,16h-2l-5,5v-5H4c-1.1,0 -2,-0.9 -2,-2V5c0,-1.1 0.9,-2 2,-2h14c1.1,0 2,0.9 2,2v4h-4v3h-3v4z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_reader_following_conversation_white_24dp.xml b/WordPress/src/main/res/drawable/ic_reader_following_conversation_white_24dp.xml
new file mode 100644
index 000000000000..e72fceb38ec4
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_reader_following_conversation_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M16.8,14.5l3.2,-3.2V5c0,-1.1 -0.9,-2 -2,-2H4c-1.1,0 -2,0.9 -2,2v9c0,1.1 0.9,2 2,2h2v5l8.7,-8.7 2.1,2.2z"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M22.6,11.1l-6.1,6.1 -2.1,-2.2 -1.4,1.4 3.5,3.6 7.5,-7.6"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_scan_alt_white_24dp.xml b/WordPress/src/main/res/drawable/ic_scan_alt_white_24dp.xml
deleted file mode 100644
index 23bfd937c8de..000000000000
--- a/WordPress/src/main/res/drawable/ic_scan_alt_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="22dp"
-    android:viewportWidth="18"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M18,10C18,15.55 14.16,20.74 9,22C3.84,20.74 0,15.55 0,10V4L9,0L18,4V10ZM9,20C12.75,19 16,14.54 16,10.22V5.3L9,2.18V20Z"
-      android:fillColor="#50575E"/>
-</vector>
diff --git a/WordPress/src/main/res/drawable/ic_shield_tick_white.xml b/WordPress/src/main/res/drawable/ic_shield_tick_white.xml
new file mode 100644
index 000000000000..81546e3b757f
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_shield_tick_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="29dp"
+    android:viewportWidth="138"
+    android:viewportHeight="162">
+  <path
+      android:pathData="M56.333,108.063L31,83.047L39.93,74.229L56.333,90.364L98.07,49.151L107,58.031L56.333,108.063ZM69,8L12,33.016V70.539C12,105.248 36.32,137.706 69,145.586C101.68,137.706 126,105.248 126,70.539V33.016L69,8Z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_shield_warning_white.xml b/WordPress/src/main/res/drawable/ic_shield_warning_white.xml
new file mode 100644
index 000000000000..c87a52daaeaa
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_shield_warning_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="138dp"
+    android:height="162dp"
+    android:viewportWidth="138"
+    android:viewportHeight="162">
+  <path
+      android:pathData="M69,8L12,33.046V70.614C12,105.364 36.32,137.861 69,145.75C101.68,137.861 126,105.364 126,70.614V33.046L69,8ZM62.667,45.568H75.333V83.136H62.667V45.568ZM62.667,95.659H75.333V108.182H62.667"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_shield_white.xml b/WordPress/src/main/res/drawable/ic_shield_white.xml
new file mode 100644
index 000000000000..fed85de3bedd
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_shield_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="123dp"
+    android:height="150dp"
+    android:viewportWidth="123"
+    android:viewportHeight="150">
+  <path
+      android:pathData="M6,68.182v-37.01L61.365,6.566l55.365,24.606v37.01c0,34.803 -23.808,67.143 -55.365,75.624C29.808,135.325 6,102.985 6,68.182z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_visibility_off_24.xml b/WordPress/src/main/res/drawable/ic_visibility_off_24.xml
new file mode 100644
index 000000000000..7fc602dcef87
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_visibility_off_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_visible_white_24dp.xml b/WordPress/src/main/res/drawable/ic_visible_white_24dp.xml
new file mode 100644
index 000000000000..a32d275c7a39
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_visible_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,6C5.188,6 1,12 1,12s4.188,6 11,6 11,-6 11,-6 -4.188,-6 -11,-6zM12,16c-3.943,0 -6.926,-2.484 -8.38,-4 1.04,-1.085 2.863,-2.657 5.255,-3.47C8.335,9.214 8,10.064 8,11c0,2.21 1.79,4 4,4s4,-1.79 4,-4c0,-0.937 -0.335,-1.787 -0.875,-2.47 2.393,0.813 4.216,2.386 5.254,3.47 -1.456,1.518 -4.438,4 -8.38,4z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/ic_wordpress_white_24dp.xml b/WordPress/src/main/res/drawable/ic_wordpress_white_24dp.xml
new file mode 100644
index 000000000000..d465146d983a
--- /dev/null
+++ b/WordPress/src/main/res/drawable/ic_wordpress_white_24dp.xml
@@ -0,0 +1,14 @@
+<!-- This asset is a copy of ic_my_sites_white_24dp. It is the WordPress grid icon -->
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    tools:ignore="UnusedResources">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12 2C6.5 2 2 6.5 2 12s4.5 10 10 10 10-4.5 10-10S17.5 2 12 2zM3.5 12c0-1.2 0.3-2.4 0.7-3.5l4.1 11.1c-2.8-1.3-4.8-4.2-4.8-7.6zm8.5 8.5c-0.8 0-1.6-0.1-2.4-0.3l2.6-7.4 2.6 7.2s0 0.1 0.1 0.1c-1 0.2-1.9 0.4-2.9 0.4zM13.2 8c0.5 0 1-0.1 1-0.1 0.5-0.1 0.4-0.7-0.1-0.7 0 0-1.4 0.1-2.3 0.1-0.8 0-2.2-0.1-2.2-0.1-0.5 0-0.5 0.7-0.1 0.7 0 0 0.4 0.1 0.9 0.1l1.3 3.6-1.9 5.6-3-9.2c0.5 0 1-0.1 1-0.1 0.5-0.1 0.4-0.7-0.1-0.7 0 0-1.4 0.1-2.3 0.1H4.9C6.4 5 9 3.5 12 3.5c2.2 0 4.2 0.8 5.7 2.2h-0.1c-0.8 0-1.4 0.7-1.4 1.5 0 0.7 0.4 1.3 0.8 2 0.3 0.6 0.7 1.3 0.7 2.3 0 0.7-0.3 1.6-0.6 2.7L16.3 17c-0.1 0.2-3.1-9-3.1-9zm3.1 11.3l2.6-7.5c0.5-1.2 0.6-2.2 0.6-3 0-0.3 0-0.6-0.1-0.9 0.7 1.2 1 2.6 1 4.1 0.1 3.1-1.6 5.9-4.1 7.3z"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml b/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml
deleted file mode 100644
index 240923e34c09..000000000000
--- a/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml
+++ /dev/null
@@ -1,270 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="120dp"
-    android:width="120dp"
-    android:viewportHeight="160.0"
-    android:viewportWidth="160.0">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M96.5,22.1c-9.3,0 -15,2.6 -16.9,6.2s-4.4,48.9 -1.3,50.3c3.1,1.4 25.9,4.1 29.6,1.2c3.8,-2.9 9.4,-38.4 3.6,-47.8C105.8,22.6 99.4,22.1 96.5,22.1z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M51.8,116.7l-1,35.3l22.8,0.2l-0.5,-35.9z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M119.1,115.9l4.9,37.9c0,0 7.9,1.8 12.1,-2.3c4.2,-4.1 7.5,-11.5 8,-15.6s-0.7,-20.5 -1.3,-23.7C142.2,109 119.1,115.9 119.1,115.9z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_40"
-        android:pathData="M145.6,118.8c0,0 -3.7,-42.3 -37.7,-48.5c0,0 -5.5,7.9 -14,7.9s-12.8,-7.9 -12.8,-7.9C47.1,81 49,119.3 49,119.3h21.2L69.6,152h55.3l-1.5,-32.8L145.6,118.8z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20.1,151.5L118.2,151.5">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M20.1,151.1c8.2,-0.5 16.4,-0.6 24.5,-0.6l24.5,-0.1l24.5,0.1c8.2,0 16.4,0.1 24.5,0.3c0.4,0 0.7,0.3 0.6,0.7c0,0.4 -0.3,0.6 -0.6,0.6c-8.2,0.3 -16.4,0.3 -24.5,0.3l-24.5,0.1l-24.5,-0.1c-8.2,0 -16.4,-0.1 -24.5,-0.6c-0.2,0 -0.4,-0.2 -0.4,-0.4C19.8,151.3 19.9,151.1 20.1,151.1z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M136.1,151.5L153.6,151.5">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M136.1,151.1c1.5,-0.5 2.9,-0.6 4.4,-0.6c1.5,-0.1 2.9,-0.1 4.4,-0.1l4.4,0.1c1.5,0 2.9,0.1 4.4,0.3c0.4,0.1 0.6,0.4 0.5,0.8c-0.1,0.3 -0.3,0.5 -0.5,0.5c-1.5,0.3 -2.9,0.3 -4.4,0.3l-4.4,0.1c-1.5,0 -2.9,0 -4.4,-0.1c-1.5,0 -2.9,-0.1 -4.4,-0.6c-0.2,-0.1 -0.4,-0.3 -0.3,-0.6C135.9,151.2 136,151.1 136.1,151.1z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M95.2,121.1H79.2l-2.2,-29.4c-0.1,-1.5 1.1,-2.8 2.6,-2.8h15.1c1.5,0 2.7,1.3 2.6,2.8L95.2,121.1z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_40"
-        android:pathData="M95.4,121.6l-3.7,0.3c-1.3,0.1 -2.7,0.1 -4.1,0.2c-2.8,0.1 -5.6,0.1 -8.3,0.1c-0.5,0 -1,-0.4 -1,-0.9l0,0l-1.6,-20.6l-0.4,-5.1L76,92.9l0,-0.6l0,-0.3l0,-0.2l0,-0.2c0,-0.6 0.1,-1.2 0.4,-1.8c0.6,-1.1 1.7,-1.8 3,-1.9c0.3,0 0.5,0 0.7,0l0.6,0l1.3,0l5.2,0l5.2,0l1.3,0l0.6,0c0.2,0 0.4,0 0.7,0c1.2,0.1 2.4,0.8 2.9,1.9c0.3,0.5 0.4,1.1 0.4,1.7c0,0.3 0,0.5 0,0.7l-0.1,0.7l-0.2,2.6l-0.4,5.3c-0.6,7 -1.4,14 -2.2,20.5L95.4,121.6zM94.9,120.6c0.1,-7.1 0.3,-13.8 0.8,-20.4l0.3,-5l0.2,-2.5l0,-0.6c0,-0.2 0,-0.5 0,-0.6c0,-0.3 -0.1,-0.5 -0.2,-0.7c-0.2,-0.5 -0.7,-0.8 -1.2,-0.8l-2.5,0l-5.2,0L82,90l-2.5,0c-0.5,0 -0.9,0.3 -1.2,0.8c-0.1,0.2 -0.2,0.5 -0.2,0.7l0,0.1l0,0.2l0,0.3l0,0.6l0.2,2.6l0.4,5.1l1.4,20.6l-1,-1c2.5,0 5.1,0 7.6,0.1c1.3,0 2.5,0.1 3.9,0.2l4,0.3L94.9,120.6z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M101.6,63.5v-4c-5.1,0.9 -9.6,1.3 -13.5,0C84.1,58.2 94.2,63.6 101.6,63.5z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M88.1,45.3L88.1,45.3c-0.7,0 -1.2,-0.5 -1.2,-1.2v-1.9c0,-0.7 0.5,-1.2 1.2,-1.2l0,0c0.7,0 1.2,0.5 1.2,1.2v1.9C89.4,44.8 88.8,45.3 88.1,45.3z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_20"
-        android:pathData="M115.6,44.1c-0.6,-6.4 1.6,-9.4 -1.7,-18.6c-2.1,-5.8 -12.1,-12.5 -22.4,-10C80.5,17 75.7,27.1 75.7,38.4c0,15.1 -9.2,14.7 -9.2,25.3s7.3,12.2 7.3,12.2s3.6,0.6 7.3,-0.4v-5.3h0c2.9,-0.3 5.2,-2.6 5.5,-5.5l0.7,-5.8c-9.1,-5.2 -7.9,-19.1 -7.9,-19.1c11.9,0.8 14.5,-8 17.2,-13.2c1,1.9 3.4,4.8 6.5,7c6.8,5.1 6.2,14.4 3.4,19.7c-2.7,5 -5.2,5.6 -5.2,5.6l-0.3,5.9c0.1,2.6 2.1,4.8 4.7,5.2l1.3,0.2l3.8,1l4.1,1.6c0,0 3,0.1 5.7,-7.5C123.4,57.6 116,48 115.6,44.1z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M80.2,39.5c0.1,2.4 0.2,4.8 0.5,7.2c0.3,2.4 0.9,4.7 2,6.8c1.1,2 2.8,3.6 4.9,4.5c2.1,0.9 4.5,1.2 6.8,1.3c2.4,0 4.8,-0.1 6.8,-1c2.1,-0.9 3.7,-2.6 4.6,-4.7c0.9,-2.1 1.3,-4.5 1.6,-6.9c0.2,-2.4 0.3,-4.8 0.3,-7.2c0,-0.3 0.2,-0.5 0.5,-0.5c0.3,0 0.5,0.2 0.5,0.5c0,2.4 0.1,4.9 -0.1,7.3c-0.2,2.5 -0.5,5 -1.5,7.3c-1,2.4 -2.9,4.4 -5.3,5.5c-2.4,1.1 -5,1.2 -7.5,1.1c-2.5,-0.1 -5,-0.4 -7.4,-1.5c-0.6,-0.3 -1.2,-0.5 -1.7,-0.9c-0.3,-0.2 -0.5,-0.4 -0.8,-0.6l-0.7,-0.7c-0.5,-0.4 -0.9,-1 -1.3,-1.5c-0.4,-0.5 -0.7,-1.1 -1,-1.6c-1.1,-2.3 -1.7,-4.8 -2,-7.2c-0.3,-2.5 -0.3,-4.9 -0.3,-7.4c0,-0.3 0.2,-0.5 0.5,-0.5C79.9,39 80.1,39.2 80.2,39.5L80.2,39.5z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M95.7,41.1c0.2,1.1 0.3,2.3 0.4,3.4c0,0.6 0,1.1 0,1.7c0,0.6 -0.1,1.1 -0.2,1.7c-0.1,0.3 -0.3,0.5 -0.6,0.4c-0.2,0 -0.4,-0.2 -0.4,-0.4c-0.1,-0.6 -0.1,-1.1 -0.2,-1.7c0,-0.6 0,-1.1 0,-1.7c0,-1.1 0.1,-2.3 0.4,-3.4c0,-0.2 0.2,-0.3 0.5,-0.3C95.5,40.8 95.7,41 95.7,41.1z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M102.2,45.3L102.2,45.3c-0.7,0 -1.2,-0.5 -1.2,-1.2v-1.9c0,-0.7 0.5,-1.2 1.2,-1.2l0,0c0.7,0 1.2,0.5 1.2,1.2v1.9C103.5,44.8 102.9,45.3 102.2,45.3z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M92.3,51.7c0.4,0.1 0.9,0.3 1.5,0.3c0.5,0.1 1.1,0.1 1.6,0.1c0.5,0 1.1,0 1.6,-0.1c0.5,-0.1 1,-0.2 1.4,-0.3l0.1,0c0.2,-0.1 0.5,0 0.7,0.2c0.1,0.2 0,0.4 -0.1,0.6c-0.5,0.5 -1.2,0.8 -1.8,0.9c-0.6,0.2 -1.2,0.2 -1.9,0.2c-0.6,0 -1.2,-0.1 -1.8,-0.2c-0.6,-0.2 -1.2,-0.4 -1.8,-0.9c-0.2,-0.2 -0.2,-0.5 0,-0.7C91.8,51.7 92,51.6 92.3,51.7L92.3,51.7z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M99.1,35.9c0.4,-0.5 1,-0.7 1.4,-0.8c0.5,-0.1 1,-0.2 1.5,-0.1c0.5,0 1,0.1 1.4,0.2c0.5,0.2 1,0.4 1.3,0.8c0.2,0.2 0.2,0.5 0,0.7c-0.1,0.1 -0.4,0.2 -0.5,0.1l-0.1,0c-0.3,-0.1 -0.7,-0.2 -1.1,-0.3c-0.4,0 -0.8,-0.1 -1.2,-0.1c-0.4,0 -0.8,0 -1.2,0c-0.4,0 -0.8,0.1 -1,0.1l-0.2,0c-0.3,0.1 -0.5,-0.1 -0.6,-0.4C98.9,36.1 99,36 99.1,35.9z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M90.5,36.6c-0.2,-0.1 -0.6,-0.1 -1,-0.1c-0.4,0 -0.8,0 -1.2,0c-0.4,0 -0.8,0 -1.2,0.1c-0.4,0.1 -0.7,0.1 -1.1,0.3l-0.1,0c-0.3,0.1 -0.6,0 -0.6,-0.3c-0.1,-0.2 0,-0.4 0.1,-0.5c0.4,-0.4 0.9,-0.6 1.3,-0.8c0.5,-0.2 1,-0.2 1.4,-0.2c0.5,0 1,0 1.5,0.1c0.5,0.1 1,0.3 1.4,0.8c0.2,0.2 0.2,0.5 0,0.7c-0.1,0.1 -0.3,0.1 -0.4,0.1L90.5,36.6z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M149.7,145.1c0,-4.5 0.3,-9.1 0.6,-13.6l1.1,-13.5c0.4,-4.5 0.8,-9 1.2,-13.5l1.2,-13.5l1,1.1c-2.4,0 -4.9,0 -7.3,-0.1c-2.4,0 -4.9,-0.1 -7.3,-0.2c-0.4,0 -0.7,-0.3 -0.6,-0.7c0,-0.3 0.3,-0.6 0.6,-0.6c2.4,-0.1 4.9,-0.2 7.3,-0.2c2.4,-0.1 4.9,-0.1 7.3,-0.1c0.5,0 1,0.4 1,1l0,0.1l0,0l-1.1,13.5c-0.4,4.5 -0.7,9 -1.1,13.5l-1.3,13.5c-0.5,4.5 -1,9 -1.7,13.5c0,0.2 -0.3,0.4 -0.5,0.3C149.8,145.5 149.7,145.4 149.7,145.1z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M94.5,84.8m-1.3,0a1.3,1.3 0,1 1,2.6 0a1.3,1.3 0,1 1,-2.6 0">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M128.1,154.3c-19.2,0 -26.5,-32.1 -26.5,-32.1s-3.4,-0.6 -6.8,-2.8c-3,-2 -3.4,-6.2 -3.4,-6.2s-4.6,-0.4 -8.5,0.6c-1.3,0.3 -1.7,-0.6 -2.3,-2.3c-0.6,-1.7 0.6,-3.9 3.4,-4.5c10,-5.6 12.7,-1.7 14.7,0c4.5,3.9 26.5,21.4 26.5,21.4">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M88.4,52.1c0,-0.2 0,-0.3 0,-0.5c0,-0.1 0.1,-0.3 0.1,-0.4c0.1,-0.3 0.2,-0.5 0.5,-0.7l0.4,0.2c0.1,0.3 0,0.6 -0.1,0.9c-0.1,0.1 -0.1,0.3 -0.2,0.4c-0.1,0.1 -0.2,0.2 -0.3,0.3L88.4,52.1z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M101.9,52.3c-0.1,-0.1 -0.2,-0.2 -0.3,-0.3c-0.1,-0.1 -0.1,-0.2 -0.2,-0.4c-0.1,-0.3 -0.2,-0.5 -0.1,-0.9l0.4,-0.2c0.3,0.2 0.4,0.5 0.5,0.7c0,0.1 0.1,0.3 0.1,0.4c0,0.1 0,0.3 0,0.5L101.9,52.3z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M103.8,128.8c-0.1,0 -0.3,-0.1 -0.4,-0.2c-0.2,-0.2 -0.2,-0.5 0,-0.7l9,-8.5c0.2,-0.2 0.5,-0.2 0.7,0c0.2,0.2 0.2,0.5 0,0.7l-9,8.5C104.1,128.8 103.9,128.8 103.8,128.8z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M83.3,106.6c1.6,-1.4 3.6,-2.5 5.8,-2.9c2.2,-0.5 4.5,-0.3 6.7,0.4c1.1,0.4 2.1,0.9 3.1,1.6c0.5,0.4 0.9,0.7 1.3,1l1.2,1l4.9,4l9.7,8c3.3,2.6 6.5,5.3 9.6,8.1c0.3,0.2 0.3,0.7 0,0.9c-0.2,0.3 -0.6,0.3 -0.9,0.1c-3.5,-2.4 -6.8,-5 -10.1,-7.6l-9.9,-7.8l-4.9,-4l-1.2,-1c-0.4,-0.3 -0.8,-0.7 -1.1,-1c-0.7,-0.6 -1.6,-1 -2.5,-1.3c-1.8,-0.7 -3.8,-0.9 -5.7,-0.6c-1.9,0.2 -3.9,0.8 -5.8,1.8c-0.2,0.1 -0.4,0 -0.4,-0.2C83.2,106.9 83.2,106.7 83.3,106.6z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M82.1,113.1c2-1,5-2.3,9.7-0.8c0.4,0.1,0.6,0.4,0.6,0.8v0.1c0.1,1,0.5,2.2,1,3.1c0.5,1,1.2,1.8,2,2.3c1,0.6,2,1.2,3.1,1.6s2.2,0.8,3.3,1c0.4,0.1,0.8,0.4,0.9,0.8l0,0c1.7,6.7,4.3,13.4,8,19.3c1.9,2.9,4,5.7,6.6,7.8c2.6,2.2,5.7,3.7,9,4.1c1.7,0.2,3.3,0.1,4.9-0.2c1.6-0.4,3.1-1.1,4.4-2.1c2.6-2,4.3-5.1,5.3-8.4c1.1-3.3,1.7-6.7,2-10.2c0.2-1.7,0.3-3.5,0.4-5.3c0.1-1.8,0.1-3.5,0-5.3l0,0c0-0.2,0.1-0.3,0.3-0.3s0.3,0.1,0.3,0.3c0.6,3.6,0.7,7.1,0.6,10.7c-0.2,3.6-0.7,7.2-1.8,10.7s-2.9,6.9-6,9.4c-1.5,1.2-3.3,2-5.2,2.5c-1.9,0.4-3.8,0.5-5.7,0.3c-3.8-0.4-7.3-2.2-10.2-4.5c-6.5-5.4-10.6-14.6-12-18c-1.3-3.4-2.4-6.1-3.2-9.7l0,0c-1.4-0.3-1.7-0.5-2.9-1s-2.3-1.1-3.4-1.8c-1.2-0.8-2.1-1.9-2.7-3.1s-0.9-1.7-1.1-3.1l0,0c-2.6-0.7-5.5-0.6-7.8,0.3l0,0c-0.4,0.1-0.7-0.1-0.8-0.4C81.7,113.6,81.8,113.2,82.1,113.1z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M81.1,110.2c0.9,-0.5 2,-0.8 3,-1c1,-0.2 2.1,-0.3 3.1,-0.3c1.1,0 2.1,0.2 3.1,0.4c1,0.2 2,0.6 3,1c0.3,0.1 0.4,0.4 0.2,0.7c-0.1,0.2 -0.3,0.3 -0.6,0.3c-1,-0.2 -1.9,-0.4 -2.9,-0.6c-1,-0.2 -1.9,-0.2 -2.9,-0.3c-1,0 -1.9,0 -2.9,0.1c-1,0.1 -1.9,0.3 -2.9,0.6c-0.3,0.1 -0.5,-0.1 -0.6,-0.3C80.8,110.6 80.9,110.3 81.1,110.2z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M81,108.2c0.9,-0.6 1.9,-1 2.9,-1.3c1,-0.3 2.1,-0.4 3.2,-0.5c1.1,0 2.1,0 3.2,0.2c1,0.2 2.1,0.5 3,0.9c0.3,0.1 0.4,0.4 0.2,0.7c-0.1,0.2 -0.3,0.3 -0.6,0.3l0,0c-1,-0.2 -1.9,-0.4 -2.9,-0.5c-1,-0.1 -1.9,-0.1 -2.9,-0.1c-1,0 -1.9,0.1 -2.9,0.3c-0.9,0.2 -1.9,0.5 -2.7,0.9l0,0c-0.3,0.1 -0.5,0 -0.7,-0.2C80.7,108.6 80.8,108.3 81,108.2z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_20"
-        android:pathData="M87.2,47.7c-2.6,0 -4.7,-1.9 -4.9,-4.4l-0.1,-1.1c-0.1,-0.9 0.2,-1.8 0.9,-2.5c0.7,-0.7 1.6,-1.1 2.6,-1.1l3.5,0.1c1.1,0 2.2,0.5 3,1.3c0.7,0.8 1.1,1.8 1.1,2.8c-0.1,2.6 -2.3,4.7 -5.1,4.8l0,0L87.2,47.7C87.2,47.7 87.2,47.7 87.2,47.7zM88.1,47.1L88.1,47.1L88.1,47.1zM85.6,39.8c-0.6,0 -1.3,0.3 -1.7,0.7c-0.4,0.4 -0.6,1 -0.6,1.6l0.1,1.1c0.1,1.9 1.8,3.3 3.8,3.3c0,0 0,0 0.1,0l0.9,0c2.2,0 3.9,-1.6 4,-3.7c0,-0.7 -0.2,-1.4 -0.8,-2c-0.6,-0.6 -1.3,-0.9 -2.2,-1L85.6,39.8C85.6,39.8 85.6,39.8 85.6,39.8z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_20"
-        android:pathData="M103.2,48.3c-0.1,0 -0.3,0 -0.4,0l-0.9,-0.1l0,0c-2.8,-0.2 -4.8,-2.5 -4.7,-5.1c0.1,-2.2 2,-3.9 4.3,-3.9l3.5,0.1c1,0 1.9,0.5 2.6,1.2c0.6,0.7 0.8,1.6 0.7,2.5l-0.2,1.1C107.8,46.5 105.7,48.3 103.2,48.3zM102.1,47l0.9,0.1c2,0.2 3.8,-1.2 4.1,-3.1l0.2,-1.1c0.1,-0.6 -0.1,-1.2 -0.5,-1.6c-0.4,-0.5 -1,-0.8 -1.7,-0.8l-3.5,-0.1c-1.7,-0.1 -3.1,1.2 -3.2,2.8C98.3,45.1 99.9,46.9 102.1,47L102.1,47z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_20"
-        android:pathData="M97.9,41.9C97.9,41.9 97.9,41.9 97.9,41.9l-5.4,-0.2c-0.3,0 -0.6,-0.3 -0.5,-0.6c0,-0.3 0.3,-0.5 0.6,-0.5l5.4,0.2c0.3,0 0.6,0.3 0.5,0.6C98.4,41.7 98.2,41.9 97.9,41.9z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M52.2,121.7c0.4,1.2 0.2,2.4 0.2,3.5l0,3.5c0,2.4 0,4.7 -0.1,7.1c-0.1,2.4 -0.2,4.7 -0.3,7.1c-0.1,2.4 -0.2,4.7 -0.8,7.1c0,0.1 -0.2,0.2 -0.3,0.2c-0.1,0 -0.2,-0.1 -0.2,-0.2c-0.3,-2.4 -0.3,-4.7 -0.2,-7.1l0.1,-7.1l0.2,-7.1l0.1,-3.5c0.1,-1.2 -0.1,-2.4 0.3,-3.5c0.1,-0.3 0.4,-0.4 0.6,-0.4C52,121.4 52.1,121.5 52.2,121.7z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M62.5,134.8c0.2,0.2 0.4,0.4 0.6,0.6c0.2,0.2 0.3,0.4 0.5,0.7c0.2,0.2 0.3,0.5 0.4,0.7c0.1,0.3 0.2,0.5 0.2,0.8c0,0.3 -0.2,0.6 -0.5,0.6c-0.1,0 -0.3,0 -0.4,-0.1c-0.2,-0.2 -0.4,-0.4 -0.6,-0.6c-0.2,-0.2 -0.3,-0.4 -0.5,-0.7c-0.1,-0.2 -0.3,-0.5 -0.4,-0.7c-0.1,-0.3 -0.2,-0.5 -0.3,-0.8c-0.1,-0.3 0.1,-0.6 0.4,-0.6C62.2,134.7 62.4,134.7 62.5,134.8z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M102.2,59.5l0.1,2.9l0,1.5c0,0.5 0,1 0.1,1.4c0.2,1.6 1.4,3.1 2.9,3.7c0.2,0.1 0.4,0.1 0.6,0.2l0.3,0.1l0.4,0.1c0.5,0.1 1,0.2 1.5,0.3c1,0.2 1.9,0.4 2.9,0.7c1.9,0.5 3.8,1.2 5.6,1.9c3.7,1.5 7.2,3.5 10.3,5.9c3.1,2.5 5.9,5.4 8.1,8.7c0.2,0.3 0.1,0.7 -0.2,0.9c-0.3,0.2 -0.7,0.1 -0.9,-0.1c-2.4,-3 -5.1,-5.7 -8.1,-8c-3,-2.3 -6.4,-4.1 -9.9,-5.6c-1.8,-0.7 -3.6,-1.4 -5.4,-1.9c-0.9,-0.3 -1.8,-0.5 -2.8,-0.7l-1.4,-0.3l-0.4,-0.1l-0.4,-0.1c-0.3,-0.1 -0.5,-0.2 -0.8,-0.3c-2.1,-0.9 -3.6,-2.9 -3.8,-5.2c0,-0.3 0,-0.6 0,-0.8l0,-0.7l0,-1.5l0.1,-2.9c0,-0.4 0.3,-0.7 0.7,-0.6C101.9,58.9 102.2,59.2 102.2,59.5z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M50.8,42.7l-45.5,0l-0.1,-28.9l45.5,0z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M51.1,42.9l-0.1,0l-11.2,0.3l-11.4,0.3l-11.5,0.2L5.3,43.8c-0.6,0 -1,-0.4 -1,-1l0,0c-0.1,-9.7 -0.2,-19.3 -0.2,-29l0,0c0,-0.6 0.5,-1.1 1.1,-1.1l0,0L28,12.7l11.4,0l11.4,0.1l0,0c0.5,0 0.9,0.4 0.9,0.9C51.5,23.6 51.2,33.4 51.1,42.9zM50.5,42.6l0,-0.1c-0.2,-9.7 -0.6,-19.2 -0.7,-28.7l0.9,0.9l-11.4,0.1l-11.4,0L5.2,14.9l1.1,-1.1c0,9.7 0,19.3 0,29l-1,-1c3.7,0 7.5,0.1 11.2,0.1L27.8,42L50.5,42.6z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,16.6l20.5,12.4l21.6,-13.2">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M7.1,16.4c3.7,1.5 7.2,3.5 10.7,5.5c1.7,1 3.5,2 5.2,3c1.7,1 3.4,2.1 5.1,3.1l-1.1,0c3.6,-2.2 7.2,-4.4 10.9,-6.5c1.8,-1.1 3.7,-2.1 5.5,-3.1c1.8,-1 3.7,-2 5.6,-3c0.2,-0.1 0.4,0 0.5,0.2c0.1,0.2 0,0.4 -0.1,0.5c-1.7,1.2 -3.5,2.4 -5.2,3.6c-1.8,1.2 -3.5,2.3 -5.3,3.5c-3.6,2.3 -7.2,4.5 -10.7,6.7c-0.3,0.2 -0.8,0.2 -1.1,0l0,0c-1.7,-1 -3.5,-2 -5.1,-3.1c-1.7,-1 -3.4,-2.1 -5.1,-3.2c-3.4,-2.1 -6.7,-4.3 -9.8,-6.9c-0.1,-0.1 -0.1,-0.2 0,-0.3C6.9,16.4 7,16.4 7.1,16.4z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M7,16.6l20.5,12.4l21.6,-13.2">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_dark"
-        android:pathData="M7.1,16.4c3.7,1.5 7.2,3.5 10.7,5.5c1.7,1 3.5,2 5.2,3c1.7,1 3.4,2.1 5.1,3.1l-1.1,0c3.6,-2.2 7.2,-4.4 10.9,-6.5c1.8,-1.1 3.7,-2.1 5.5,-3.1c1.8,-1 3.7,-2 5.6,-3c0.2,-0.1 0.4,0 0.5,0.2c0.1,0.2 0,0.4 -0.1,0.5c-1.7,1.2 -3.5,2.4 -5.2,3.6c-1.8,1.2 -3.5,2.3 -5.3,3.5c-3.6,2.3 -7.2,4.5 -10.7,6.7c-0.3,0.2 -0.8,0.2 -1.1,0l0,0c-1.7,-1 -3.5,-2 -5.1,-3.1c-1.7,-1 -3.4,-2.1 -5.1,-3.2c-3.4,-2.1 -6.7,-4.3 -9.8,-6.9c-0.1,-0.1 -0.1,-0.2 0,-0.3C6.9,16.4 7,16.4 7.1,16.4z">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,73.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,64.3m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,54.6m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,73.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,83.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M37.5,83.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,64.3m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/primary_10"
-        android:pathData="M27.5,54.6m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0">
-    </path>
-
-    <path
-        android:fillColor="@color/success_30"
-        android:pathData="M50.5,14.3m-8.5,0a8.5,8.5 0,1 1,17 0a8.5,8.5 0,1 1,-17 0">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M50.5,5.7c4.7,0 8.5,3.8 8.5,8.5s-3.8,8.5 -8.5,8.5c-4.7,0 -8.5,-3.8 -8.5,-8.5S45.8,5.7 50.5,5.7M50.5,4.2c-5.5,0 -10,4.5 -10,10s4.5,10 10,10s10,-4.5 10,-10S56,4.2 50.5,4.2L50.5,4.2z">
-    </path>
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M49.4,17.8c0,-0.3 0.1,-0.6 0.3,-0.7s0.4,-0.3 0.8,-0.3c0.3,0 0.6,0.1 0.8,0.3s0.3,0.4 0.3,0.7c0,0.3 -0.1,0.6 -0.3,0.7s-0.4,0.3 -0.8,0.3c-0.3,0 -0.6,-0.1 -0.8,-0.3S49.4,18.1 49.4,17.8zM51.1,15.8h-1.4l-0.3,-5.7h2L51.1,15.8z">
-    </path>
-
-</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_check_site_stats.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_check_site_stats.xml
new file mode 100644
index 000000000000..4165c437b928
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_check_site_stats.xml
@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:pathData="M47.88 72.75l24.24-34.6L84.2 46.6l12.1 8.47 22.8-32.58"
+        android:strokeWidth="3"
+        android:strokeColor="@color/quick_start_task_card_illustration_check_site_stats_stroke"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/pink_40"
+        android:pathData="M47.89 69.3a3 3 0 1 0 1.04 5.9 3 3 0 1 0-1.04-5.9zm71.18-50.5a3 3 0 1 0 1.04 5.9 3 3 0 1 0-1.04-5.9zM71.7 35.69a3 3 0 1 0 1.04 5.9 3 3 0 1 0-1.04-5.9zm24.04 16.19a3 3 0 1 0 1.04 5.9 3 3 0 1 0-1.04-5.9z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_create_site.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_create_site.xml
new file mode 100644
index 000000000000..91a950a6bb45
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_create_site.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="#64D2FF"
+        android:pathData="M143.99 52.39l0.2 7.91-7.99 0.2 4.06-4.06 3.73-4.05z" />
+    <path
+        android:fillColor="#FFD60A"
+        android:pathData="M52.38 34.03a3.27 3.24 0 1 0 0 6.48 3.27 3.24 0 1 0 0-6.48z" />
+    <path
+        android:fillColor="#FF9500"
+        android:pathData="M105.93 69.87a3.27 3.24 0 1 0 0 6.48 3.27 3.24 0 1 0 0-6.48z" />
+    <path
+        android:fillColor="#32D74B"
+        android:pathData="M25.43 17.35a2.43 2.4 0 1 0 0 4.8 2.43 2.4 0 1 0 0-4.8z" />
+    <path
+        android:fillColor="#0A84FF"
+        android:pathData="M115.61 20.35a3.42 3.38 0 1 0 0 6.76 3.42 3.38 0 1 0 0-6.76z" />
+    <path
+        android:fillColor="#FF375F"
+        android:pathData="M82.35 45.4l-1.32-2.65c-0.24-0.48 0.25-0.96 0.74-0.64l2.63 1.44 2.3-2c0.42-0.32 1 0 0.9 0.48L87.04 45l2.63 1.44c0.5 0.24 0.33 0.88-0.24 0.96l-2.88 0.24-0.57 3.13c-0.09 0.48-0.83 0.56-1 0.08l-1.3-2.89-3.21 0.4c-0.5 0.09-0.82-0.56-0.41-0.88l2.3-2.08z" />
+    <path
+        android:fillColor="#007AFF"
+        android:pathData="M34.43 68.26l-0.78-1.57c-0.14-0.29 0.15-0.57 0.44-0.38l1.57 0.86 1.36-1.2c0.25-0.19 0.59 0 0.54 0.29l-0.34 1.76 1.56 0.86c0.3 0.14 0.2 0.53-0.14 0.57l-1.71 0.15-0.35 1.86c-0.04 0.28-0.48 0.33-0.58 0.04l-0.78-1.71-1.9 0.24c-0.3 0.04-0.5-0.34-0.25-0.53l1.36-1.24z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_edit_site_icon.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_edit_site_icon.xml
new file mode 100644
index 000000000000..83dd406a1979
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_edit_site_icon.xml
@@ -0,0 +1,44 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_edit_site_icon_area"
+        android:pathData="M58.5 29.5c0-4.42 3.58-8 8-8h35c4.42 0 8 3.58 8 8v35c0 4.42-3.58 8-8 8h-35c-4.42 0-8-3.58-8-8z" />
+    <group>
+        <clip-path android:pathData="M58.5 29.5c0-4.42 3.58-8 8-8h35c4.42 0 8 3.58 8 8v35c0 4.42-3.58 8-8 8h-35c-4.42 0-8-3.58-8-8z" />
+        <path
+            android:fillColor="@color/quick_start_task_card_illustration_edit_site_icon_mountain_fill"
+            android:pathData="M78.96 45.57L40.84 76.35h104.32v-8.03l-32.1-35.46L89 54.94l-10.03-9.37z" />
+        <path
+            android:pathData="M42.17 75.68l36.79-30.1 18.72 17.39"
+            android:strokeWidth="1"
+            android:strokeColor="@color/quick_start_task_card_illustration_edit_site_icon_mountain_stroke"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M72.94 55.6l-4.02-2 10.04-8.03 8.02 7.36-1.34 1.34-4.68-0.67-8.02 2z"
+            android:strokeWidth="1"
+            android:strokeColor="@color/quick_start_task_card_illustration_edit_site_icon_mountain_stroke"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
+        <path
+            android:pathData="M88.99 54.94l24.08-22.08 31.43 34.8"
+            android:strokeWidth="1"
+            android:strokeColor="@color/quick_start_task_card_illustration_edit_site_icon_mountain_stroke"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
+        <path
+            android:fillColor="@color/white"
+            android:pathData="M108.38 42.9l-4.01-2.01 8.7-8.03 7.35 8.03-4.01 2-4.02-1.33-4 1.34z"
+            android:strokeWidth="0.63"
+            android:strokeColor="@color/quick_start_task_card_illustration_edit_site_icon_mountain_stroke"
+            android:strokeLineCap="round"
+            android:strokeLineJoin="round" />
+    </group>
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_edit_your_homepage.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_edit_your_homepage.xml
new file mode 100644
index 000000000000..c5f779bf3748
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_edit_your_homepage.xml
@@ -0,0 +1,38 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_surface"
+        android:pathData="M49.26 24.48c0-4.42 3.58-8 8-8h53.48c4.42 0 8 3.58 8 8V96.5c0 4.42-3.58 8-8 8H57.26c-4.42 0-8-3.58-8-8z" />
+    <path
+        android:pathData="M104.71 27.5h5.98m-5.98 3h5.98m-5.98 3h5.98"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_details"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_details"
+        android:pathData="M57 28c0-0.28 0.22-0.5 0.5-0.5h6c0.28 0 0.5 0.22 0.5 0.5v6c0 0.28-0.22 0.5-0.5 0.5h-6c-0.28 0-0.5-0.22-0.5-0.5z"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_details" />
+    <path
+        android:pathData="M57 44.5h54m-54 5h31"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_line"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_area"
+        android:pathData="M56.5 56h54.42v33.99H56.5z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_mountain"
+        android:pathData="M105.74 73.36l-20.6 16.63h26.02V78.42l-5.42-5.06z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_sun_fill"
+        android:pathData="M69.23 69.33c1.77 0 3.2-1.43 3.2-3.2 0-1.78-1.43-3.21-3.2-3.21-1.77 0-3.2 1.43-3.2 3.2 0 1.78 1.43 3.21 3.2 3.21z"
+        android:strokeWidth="0.63"
+        android:strokeColor="@color/quick_start_task_card_illustration_sun_stroke" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_enable_post_sharing.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_enable_post_sharing.xml
new file mode 100644
index 000000000000..15a0e9581575
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_enable_post_sharing.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="#4285F4"
+        android:pathData="M52.8 48.5c0-0.6-0.07-1.2-0.13-1.74h-8.15v3.36h4.62c-0.18 1.08-0.78 2.04-1.74 2.64v2.16h2.75c1.68-1.56 2.64-3.78 2.64-6.42z" />
+    <path
+        android:fillColor="#34A853"
+        android:pathData="M44.52 56.95c2.34 0 4.26-0.78 5.7-2.1l-2.76-2.15c-0.78 0.54-1.74 0.84-2.94 0.84-2.22 0-4.13-1.56-4.8-3.6h-2.8v2.22c1.43 2.94 4.37 4.8 7.6 4.8z" />
+    <path
+        android:fillColor="#FBBC04"
+        android:pathData="M39.73 49.94c-0.36-1.08-0.36-2.28 0-3.36v-2.22H36.9c-1.2 2.46-1.2 5.34 0 7.8l2.82-2.22z" />
+    <path
+        android:fillColor="#EA4335"
+        android:pathData="M44.52 43.04c1.2 0 2.4 0.42 3.3 1.32l2.45-2.46c-1.55-1.56-3.6-2.33-5.75-2.33-3.23 0-6.17 1.85-7.67 4.8l2.82 2.21c0.78-2.04 2.63-3.54 4.85-3.54z" />
+    <path
+        android:fillColor="#1DA1F2"
+        android:pathData="M117.28 56.96c8.08 0 12.5-6.72 12.5-12.51V43.9c0.84-0.6 1.6-1.37 2.2-2.29-0.75 0.39-1.6 0.61-2.5 0.7 0.9-0.54 1.6-1.38 1.9-2.45-0.84 0.53-1.75 0.84-2.82 1.07-0.84-0.84-1.98-1.37-3.2-1.37-2.44 0-4.42 1.98-4.42 4.42 0 0.38 0 0.69 0.15 0.99-3.66-0.15-6.94-1.9-9.07-4.58-0.38 0.7-0.61 1.38-0.61 2.22 0 1.52 0.76 2.9 1.98 3.66-0.69 0-1.37-0.23-1.98-0.54v0.08c0 2.13 1.52 3.89 3.5 4.35-0.38 0.07-0.76 0.15-1.14 0.15-0.3 0-0.53 0-0.84-0.08 0.54 1.76 2.21 3.05 4.12 3.05-1.53 1.15-3.43 1.91-5.49 1.91-0.38 0-0.69 0-1.07-0.08 1.98 1.07 4.27 1.84 6.79 1.84z" />
+    <path
+        android:fillColor="#1877F2"
+        android:pathData="M81.3 56.47v-6.84h-2.7v-2.94h2.7v-2.25c0-2.53 1.6-3.95 4.06-3.95 1.2 0 2.41 0.18 2.41 0.18v2.48h-1.35c-1.3 0-1.74 0.78-1.74 1.6v1.94h2.95l-0.49 2.94h-2.46v6.84c4.88-0.76 8.6-4.79 8.6-9.64 0-5.4-4.61-9.79-10.29-9.79-5.67 0-10.27 4.38-10.27 9.79 0 4.85 3.71 8.88 8.58 9.64z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_explore_plans.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_explore_plans.xml
new file mode 100644
index 000000000000..6b2c11dc9913
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_explore_plans.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/green_30"
+        android:pathData="M84 22.833c13.292 0 24.167 10.875 24.167 24.167 0 13.292-10.875 24.167-24.167 24.167-13.292 0-24.167-10.875-24.167-24.167 0-13.292 10.875-24.167 24.167-24.167zm14.5 19.334H86.417v24.166L98.5 42.167zm-16.917-14.5L69.5 51.833h12.083V27.667z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_follow_other_sites.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_follow_other_sites.xml
new file mode 100644
index 000000000000..0828818d2b24
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_follow_other_sites.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/pink_40"
+        android:pathData="M108.26 57.75c0.5 0 0.9 0.4 0.9 0.91v3.1c0 0.5-0.4 0.9-0.9 0.9h-5.43c-0.5 0-0.91 0.41-0.91 0.92v5.55c0 0.5-0.41 0.91-0.91 0.91h-3.02c-0.5 0-0.9-0.4-0.9-0.9v-5.56c0-0.5-0.41-0.91-0.92-0.91h-5.43c-0.5 0-0.9-0.41-0.9-0.91v-3.1c0-0.5 0.4-0.91 0.9-0.91h5.43c0.5 0 0.91-0.4 0.91-0.91v-5.56c0-0.5 0.41-0.9 0.91-0.9h3.02c0.5 0 0.9 0.4 0.9 0.9v5.56c0 0.5 0.41 0.91 0.92 0.91h5.43z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_follow_other_sites_fill"
+        android:pathData="M101.42 23.96c0.5 0 0.91 0.4 0.91 0.9v20.31c0 0.5-0.4 0.91-0.9 0.91h-7.85c-0.5 0-0.91 0.41-0.91 0.91v5.56c0 0.5-0.41 0.9-0.91 0.9h-5.43c-0.5 0-0.91 0.42-0.91 0.92v8.01c0 0.5-0.41 0.91-0.91 0.91H63.67c-2.66 0-4.84-2.21-4.84-4.91V24.87c0-0.5 0.41-0.91 0.91-0.91h41.68z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M73.42 53.12c0.5 0 0.91-0.4 0.91-0.9v-0.64c0-0.5-0.4-0.91-0.9-0.91h-7.85c-0.5 0-0.91 0.4-0.91 0.9v0.64c0 0.5 0.4 0.91 0.9 0.91h7.85zm8.16-6.46c0-0.5-0.4-0.91-0.9-0.91h-15.1c-0.5 0-0.91 0.4-0.91 0.91v0.64c0 0.5 0.4 0.9 0.9 0.9h15.1c0.5 0 0.91-0.4 0.91-0.9v-0.64zm0-4.92c0-0.5-0.4-0.9-0.9-0.9h-15.1c-0.5 0-0.91 0.4-0.91 0.9v0.64c0 0.5 0.4 0.91 0.9 0.91h15.1c0.5 0 0.91-0.4 0.91-0.9v-0.65zM98.5 30.91c0-0.5-0.4-0.91-0.91-0.91H65.58c-0.5 0-0.91 0.4-0.91 0.91v3.1c0 0.5 0.4 0.9 0.9 0.9H97.6c0.5 0 0.91-0.4 0.91-0.9v-3.1z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_placeholder.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_placeholder.xml
new file mode 100644
index 000000000000..0759d98d9e77
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_placeholder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/quick_start_task_card_illustration_background" />
+    <size
+        android:width="168dp"
+        android:height="94dp" />
+</shape>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_publish_post.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_publish_post.xml
new file mode 100644
index 000000000000..ffed4e912a92
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_publish_post.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_surface"
+        android:pathData="M49.26 26.98c0-4.42 3.58-8 8-8h53.48c4.42 0 8 3.58 8 8V99c0 4.42-3.58 8-8 8H57.26c-4.42 0-8-3.58-8-8z" />
+    <path
+        android:pathData="M57 29h54m-54 6h28"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_line"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_area"
+        android:pathData="M56.5 43.5h54.42v33.99H56.5z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_mountain"
+        android:pathData="M105.5 60.86L84.9 77.49h26.02V65.92l-5.42-5.06z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_sun_fill"
+        android:pathData="M69.23 56.83c1.77 0 3.2-1.43 3.2-3.2 0-1.78-1.43-3.21-3.2-3.21-1.77 0-3.2 1.43-3.2 3.2 0 1.78 1.43 3.21 3.2 3.21z"
+        android:strokeWidth="0.63"
+        android:strokeColor="@color/quick_start_task_card_illustration_sun_stroke" />
+    <path
+        android:pathData="M57 84.99h54m-54 6h54"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_line"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_review_site_pages.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_review_site_pages.xml
new file mode 100644
index 000000000000..8009062001e5
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_review_site_pages.xml
@@ -0,0 +1,45 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillAlpha="0.5"
+        android:fillColor="@color/quick_start_task_card_illustration_surface"
+        android:pathData="M41.23 24c0-4.42 3.58-8 8-8h53.48c4.42 0 8 3.58 8 8v94.16c0 4.42-3.58 8-8 8H49.23c-4.42 0-8-3.58-8-8z" />
+    <path
+        android:fillAlpha="0.6"
+        android:fillColor="@color/quick_start_task_card_illustration_surface"
+        android:pathData="M49.23 32c0-4.42 3.58-8 8-8h53.48c4.42 0 8 3.58 8 8v94.16c0 4.42-3.58 8-8 8H57.23c-4.42 0-8-3.58-8-8z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_surface"
+        android:pathData="M57.29 40c0-4.42 3.58-8 8-8h53.48c4.42 0 8 3.58 8 8v94.16c0 4.42-3.58 8-8 8H65.29c-4.42 0-8-3.58-8-8z" />
+    <path
+        android:pathData="M68.04 50.16h12.72m5.77 0h29.41m-47.8 6.79h29.22m4.77 0h9.54"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_line"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/blue_0"
+        android:pathData="M86.62 81.73L67.54 97.81h52.2v-4.2L103.7 75.1 91.64 86.63l-5.02-4.9z" />
+    <path
+        android:pathData="M68.21 97.46l18.4-15.73 9.38 9.1"
+        android:strokeWidth="1"
+        android:strokeColor="@color/gray_40"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:pathData="M91.64 86.63l12.05-11.54 15.73 18.18"
+        android:strokeWidth="1"
+        android:strokeColor="@color/gray_40"
+        android:strokeLineCap="round"
+        android:strokeLineJoin="round" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_sun_fill"
+        android:pathData="M70.22 74.8c1.64 0 2.94-1.38 2.94-3.06 0-1.68-1.3-3.06-2.94-3.06s-2.95 1.38-2.95 3.06c0 1.68 1.31 3.07 2.95 3.07z"
+        android:strokeWidth="0.54"
+        android:strokeColor="@color/quick_start_task_card_illustration_sun_stroke" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_set_site_title.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_set_site_title.xml
new file mode 100644
index 000000000000..0221081d7495
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_set_site_title.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_set_site_title_body"
+        android:pathData="M30.5 46.5c0-6.08 4.92-11 11-11h85c6.07 0 11 4.92 11 11V94h-107V46.5z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_set_site_title_header"
+        android:pathData="M30.5 42.88c0-4.42 3.58-8 8-8h91c4.42 0 8 3.58 8 8v16.74h-107V42.89z" />
+    <group>
+        <clip-path android:pathData="M45.65 51.44L43 48.78l-2.65 2.66-0.6-0.6 2.66-2.64-2.65-2.65 0.59-0.6L43 47.62l2.65-2.65 0.59 0.59-2.65 2.65 2.65 2.65-0.59 0.59z" />
+        <path
+            android:fillColor="@color/gray_70"
+            android:pathData="M38 43.2h10v10H38z" />
+    </group>
+    <group>
+        <clip-path android:pathData="M127.7 47.49c0.51 0 0.92 0.41 0.92 0.92 0 0.5-0.4 0.91-0.91 0.91-0.5 0-0.92-0.4-0.92-0.91s0.41-0.92 0.92-0.92zm-7.33 0.92c0 0.5 0.42 0.91 0.92 0.91s0.92-0.4 0.92-0.91-0.41-0.92-0.92-0.92c-0.5 0-0.92 0.41-0.92 0.92zm3.21 0c0 0.5 0.41 0.91 0.92 0.91 0.5 0 0.92-0.4 0.92-0.91s-0.41-0.92-0.92-0.92c-0.5 0-0.92 0.41-0.92 0.92z" />
+        <path
+            android:fillColor="@color/gray_40"
+            android:pathData="M119 53.9v-11h11v11z" />
+    </group>
+    <path
+        android:fillColor="@color/white"
+        android:pathData="M55.12 47.91c0-1.93 1.57-3.5 3.5-3.5h51.76c1.93 0 3.5 1.57 3.5 3.5v0.36c0 1.93-1.57 3.5-3.5 3.5H58.62c-1.93 0-3.5-1.57-3.5-3.5z"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_set_site_title_box_stroke" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_illustration_quick_start_task_visit_your_site.xml b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_visit_your_site.xml
new file mode 100644
index 000000000000..801739610254
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_illustration_quick_start_task_visit_your_site.xml
@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="168dp"
+    android:height="94dp"
+    android:viewportWidth="168"
+    android:viewportHeight="94">
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_background"
+        android:pathData="M0 0h168v94H0z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_surface"
+        android:pathData="M49.26 24.48c0-4.42 3.58-8 8-8h53.48c4.42 0 8 3.58 8 8V96.5c0 4.42-3.58 8-8 8H57.26c-4.42 0-8-3.58-8-8z" />
+    <path
+        android:pathData="M104.71 27.5h5.98m-5.98 3h5.98m-5.98 3h5.98"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_details"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_details"
+        android:pathData="M57 28c0-0.28 0.22-0.5 0.5-0.5h6c0.28 0 0.5 0.22 0.5 0.5v6c0 0.28-0.22 0.5-0.5 0.5h-6c-0.28 0-0.5-0.22-0.5-0.5z"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_details" />
+    <path
+        android:pathData="M57 44.5h54m-54 5h31"
+        android:strokeWidth="1"
+        android:strokeColor="@color/quick_start_task_card_illustration_line"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_area"
+        android:pathData="M56.5 56h54.42v33.99H56.5z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_mountain"
+        android:pathData="M105.74 73.36l-20.6 16.63h26.02V78.42l-5.42-5.06z" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_sun_fill"
+        android:pathData="M69.23 69.33c1.77 0 3.2-1.43 3.2-3.2 0-1.78-1.43-3.21-3.2-3.21-1.77 0-3.2 1.43-3.2 3.2 0 1.78 1.43 3.21 3.2 3.21z"
+        android:strokeWidth="0.63"
+        android:strokeColor="@color/quick_start_task_card_illustration_sun_stroke" />
+    <path
+        android:fillColor="@color/quick_start_task_card_illustration_visit_your_site_star"
+        android:pathData="M113.8 23.94c-0.54-0.8-1.68-1.32-2.56-1.18l-7.62 0.36c-0.89 0.15-1.06-0.3-0.42-1.11l5.6-5.72c0.8-0.36 1.26-1.62 1.12-2.6l-0.37-8.48c-0.14-0.98 0.26-1.16 1-0.46l5.18 6.26c0.54 0.8 1.68 1.33 2.56 1.18l7.62-0.36c0.89-0.15 1.05 0.3 0.42 1.12l-5.88 5.58c-0.72 0.59-1.18 1.85-1.05 2.84l0.38 8.46c0.14 0.99-0.27 1.17-1 0.46l-4.98-6.35zm14.67 7.54c-0.26-0.39-0.81-0.64-1.24-0.57l-3.69 0.17c-0.43 0.07-0.51-0.14-0.2-0.54l2.7-2.76c0.4-0.18 0.62-0.8 0.55-1.27l-0.18-4.1c-0.06-0.47 0.13-0.56 0.49-0.22l2.5 3.03c0.26 0.39 0.82 0.64 1.24 0.57l3.7-0.17c0.42-0.07 0.5 0.14 0.2 0.54l-2.85 2.7c-0.35 0.29-0.57 0.9-0.5 1.37l0.17 4.1c0.07 0.48-0.12 0.57-0.48 0.22l-2.41-3.07z" />
+</vector>
diff --git a/WordPress/src/main/res/drawable/img_jetpack_empty_state.xml b/WordPress/src/main/res/drawable/img_jetpack_empty_state.xml
new file mode 100644
index 000000000000..a1cb0b768e09
--- /dev/null
+++ b/WordPress/src/main/res/drawable/img_jetpack_empty_state.xml
@@ -0,0 +1,462 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="229dp"
+    android:height="143dp"
+    android:viewportWidth="229"
+    android:viewportHeight="143">
+  <path
+      android:pathData="M19.8,82.9C19.55,82.25 19.6,80.7 19.5,79.7C19.4,78.6 19.4,77.5 19.3,76.4C19.3,75.3 19.3,74.2 19.4,73.1C19.4,73 19.5,72.9 19.6,72.9C19.7,72.9 19.8,73 19.8,73.1C20,74.2 20.2,75.2 20.3,76.3C20.4,77.4 20.5,78.5 20.6,79.5C20.7,80.6 20.7,81.7 20.8,82.8C20.8,83.9 20.8,82.3 20.6,83.4C20.6,83.5 20.25,83.5 20.05,83.4C19.75,82.3 20.05,83.55 19.8,82.9Z"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M22.456,83.4C22.356,82.3 22.5,83.6 22.5,82.6C22.5,81.5 22.5,80.4 22.5,79.3C22.5,78.2 22.6,77.1 22.7,76C22.7,75.9 22.8,75.8 22.9,75.8C23,75.8 23.1,75.9 23.1,76C23.3,77.1 23.4,78.2 23.4,79.2C23.5,80.3 23.5,81.4 23.5,82.4C23.5,83.5 23.9,82.978 23.5,83.189C23.1,83.4 22.7,83.55 22.456,83.4Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M25.9,83.5C26,82.4 26.2,81.4 26.4,80.3C26.6,79.2 26.8,78.2 27.1,77.1C27.1,77 27.2,76.9 27.4,77C27.5,77 27.5,77.1 27.5,77.2C27.5,78.3 27.5,79.4 27.4,80.5C27.3,81.6 27.2,82.7 27.1,83.7C26.87,83.25 26.55,83.25 25.9,83.5Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M28.2,99.2L28.2,99.2C24.7,99.4 21,99.5 17.3,99.6C17.1,99.6 16.9,99.4 16.8,99.2L16.8,99.2C16.4,93.9 16,88.6 15.6,83.3C15.6,83 15.8,82.7 16.1,82.7L16.1,82.7L16.1,82.7C20.4,82.6 24.7,82.7 29,82.7L29,82.7C29.3,82.7 29.5,82.9 29.5,83.2L29.5,83.2C29.2,88.7 28.7,94 28.2,99.2ZM27.9,99.1L27.9,99.1C28.1,93.6 28.4,88.4 28.6,83.2L29.1,83.7C24.8,83.7 20.5,83.8 16.2,83.7L16.7,83.1C17,88.4 17.4,93.7 17.7,99L17.2,98.6C20.7,98.8 24.2,98.9 27.9,99.1Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M20.1,72.2L20.1,72.2C19.8,72.5 19.3,72.6 19,72.3L19,72.3C18.7,72 18.8,71.4 18.9,71.2C19,71 19.4,70.3 19.4,70.3C19.4,70.3 19.8,70.7 20,71.1C20.2,71.5 20.3,71.8 20.1,72.2Z"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M23.5,75L23.5,75C23.2,75.3 22.7,75.4 22.4,75.1L22.4,75.1C22.1,74.8 22.2,74.2 22.3,74C22.4,73.8 22.8,73.1 22.8,73.1C22.8,73.1 23.2,73.5 23.4,73.9C23.7,74.3 23.8,74.6 23.5,75Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M28.1,76.3L28.1,76.3C27.8,76.6 27.3,76.5 27,76.2L27,76.2C26.7,75.9 27,75.3 27.1,75.1C27.3,74.9 27.7,74.3 27.7,74.3C27.7,74.3 28,74.8 28.2,75.2C28.3,75.6 28.4,76 28.1,76.3Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M210.964,99.583C209.674,99.833 208.303,99.917 207.013,99.917C205.723,99.917 204.353,100 203.063,100C200.402,99.917 197.822,100 195.161,99.667C195.081,99.667 195,99.583 195,99.5C195,99.417 195.081,99.333 195.161,99.333C197.822,99.083 200.402,99.083 203.063,99C204.353,99 205.723,99 207.013,99.083C208.303,99.083 209.674,99.167 210.964,99.417C210.964,99.417 211.045,99.417 210.964,99.583C211.045,99.5 210.964,99.583 210.964,99.583Z"
+      android:strokeWidth="1"
+      android:fillColor="#F6F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M207.7,138.1C207.4,134.9 207.4,131.6 207.3,128.4L207.2,118.7C207.3,112.2 207.2,105.7 207.6,99.2C207.6,99.1 207.7,99 207.8,99C207.9,99 208,99.1 208,99.2C208.3,105.7 208.3,112.2 208.4,118.7L208.3,128.4C208.2,131.6 208.2,134.9 207.9,138.1C207.8,138.1 207.8,138.1 207.7,138.1L207.7,138.1Z"
+      android:strokeWidth="1"
+      android:fillColor="#F6F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M11.9,83.5L11.9,83.5C10.6,83.6 9.3,83.7 7.9,83.8C7.7,83.8 7.6,83.7 7.6,83.5L7.6,83.5C7.4,79.8 7.4,76 7.3,72.3L7.2,61.1C7.2,60.7 7.5,60.5 7.8,60.5L7.8,60.5L11.6,60.5L11.6,60.5C11.9,60.5 12.2,60.8 12.2,61.1L12.2,61.1C12.2,64.9 12.2,68.8 12.1,72.5L11.9,83.5ZM11.5,83.3L11.5,83.3L11.2,72C11.1,68.3 11.1,64.6 11.1,61L11.7,61.6L7.9,61.6L8.5,61L8.4,72.2C8.4,75.9 8.3,79.7 8.1,83.4L7.8,83.1C9.1,83.1 10.3,83.2 11.5,83.3Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M12.8,61L12.8,61C10.9,61.2 8.9,61.3 6.8,61.4C5.8,61.4 4.7,61.5 3.7,61.5L2.1,61.5L1.7,61.5L1.6,61.5L1.6,61.5L1.6,61.5C0.3,60.2 1.2,61.1 1,60.9L1,60.9L1,60.9L1,60.7C1,60.4 1.1,60.1 1.2,59.8C1.4,59.2 1.7,58.7 2.2,58.3C2.4,58.1 2.7,57.9 2.9,57.8C3.2,57.7 3.4,57.6 3.6,57.5C4.6,57.1 5.5,56.8 6.5,56.5C8.5,56 10.5,55.7 12.6,55.7L12.6,55.7C12.9,55.7 13,55.9 13,56.2C13.1,57.8 12.9,59.5 12.8,61ZM12.5,60.8L12.5,60.8C12.4,59.1 12.2,57.6 12.2,56.1L12.7,56.6C10.7,56.7 8.8,57 6.9,57.6C6,57.9 5,58.2 4.2,58.6C3.7,58.8 3.4,59 3.1,59.2C2.8,59.5 2.6,59.8 2.4,60.2C2.3,60.4 2.3,60.6 2.3,60.8L2.3,60.9L2.3,60.9L2.3,60.9C2,60.6 2.9,61.5 1.7,60.3L1.7,60.3L1.7,60.3L1.8,60.3L2.2,60.3L3.6,60.3C4.6,60.3 5.5,60.3 6.5,60.4C8.4,60.5 10.4,60.7 12.5,60.8Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M16,61C15.4,61.1 14.8,61.3 14.2,61.3C14,61.3 13.8,61.2 13.8,61L13.8,60.9C13.7,60.1 13.7,59.3 13.6,58.5C13.6,57.7 13.6,56.9 13.5,56.1C13.5,55.7 13.8,55.5 14.1,55.5L14.1,55.5L15.1,55.5L15.6,55.5C15.8,55.5 15.9,55.5 16.2,55.5C16.7,55.6 17.2,55.9 17.4,56.4C17.5,56.6 17.6,56.9 17.6,57.1L17.6,57.6C17.6,58.2 17.5,58.9 17.5,59.5C17.5,59.7 17.5,59.8 17.4,60C17.4,60.2 17.3,60.4 17.1,60.6C16.8,60.9 16.4,61.1 16,61.1C16,61.1 16,61 16,61ZM16,60.7C16.3,60.7 16.5,60.5 16.6,60.3C16.7,60.1 16.7,59.9 16.6,59.6C16.5,59 16.5,58.3 16.5,57.7L16.5,57.2C16.5,57.1 16.5,57.1 16.4,57C16.3,56.9 16.2,56.8 16.1,56.8L14.2,56.8L14.8,56.2C14.8,57 14.8,57.8 14.7,58.6C14.7,59.4 14.6,60.2 14.5,61L14.1,60.6C14.7,60.7 15.3,60.8 15.9,60.9L15.9,60.7C15.9,60.7 16,60.7 16,60.7Z"
+      android:strokeWidth="1"
+      android:fillColor="#E8E9EA"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M4.557,98.917C8.046,98.667 11.535,98.667 15.024,98.583L25.491,98.5C32.468,98.583 39.37,98.5 46.348,98.833C46.424,98.833 46.5,98.917 46.5,99C46.5,99.083 46.424,99.167 46.348,99.167C39.37,99.417 32.468,99.417 25.491,99.5L15.024,99.417C11.535,99.333 8.046,99.333 4.557,99.083C4.481,99.083 4.481,99 4.557,98.917C4.481,98.917 4.481,98.917 4.557,98.917Z"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M38.3,108.1C38.5,111.6 38.6,115.1 38.7,118.6C38.7,118.8 38.5,119 38.3,119L38.3,119C35.4,119.1 32.5,119.1 29.7,119.1L21.1,119.1C15.3,119.1 9.6,119.1 3.8,119L3.8,119C3.6,119 3.4,118.8 3.4,118.6C3.4,115.1 3.5,111.6 3.6,108.1C3.6,108 3.7,107.9 3.8,107.9C3.9,107.9 4,108 4,108.1C4.1,111.6 4.2,115.1 4.2,118.6L3.8,118.2C9.6,118.1 15.3,118.1 21.1,118.1L29.7,118.1C32.6,118.1 35.5,118.1 38.3,118.2L37.8,118.7C37.8,115.2 38,111.7 38.3,108.1C38.1,108 38.2,108 38.3,108.1C38.3,108 38.3,108 38.3,108.1Z"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M45,45.8C45.8,45.8 46.1,45.7 46.9,45.4C50.1,44.3 51.6,41.6 51.5,38.5C51.5,37.6 53,37 52.7,36.1C52.3,34.9 50.2,35 49.2,32.8C48,30.3 44.9,29.6 42,30.6C37.9,32 35.7,36.4 37.1,40.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="#3C434A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M44.1,36.1C45.2,38.9 45,43.7 42,44.8C39.1,45.9 37,40.5 37,40.5L44.1,36.1Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M35.9,77.3C33.3,97.1 35.5,139.3 35.5,139.3L45.2,139.3L46.1,103.9"
+      android:strokeWidth="1"
+      android:fillColor="#1D2327"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M35.5,138.3C38.4,138.4 47.3,139 48.7,139.4C50,139.9 50.1,140.1 48.5,140.4C46.9,140.8 35.5,140.4 35.5,140.4L35.5,138.3Z"
+      android:strokeWidth="0.7347"
+      android:fillColor="#1D2327"
+      android:fillType="nonZero"
+      android:strokeColor="#1D2327"/>
+  <path
+      android:pathData="M51.7,76.9C51.7,76.9 52.8,91.9 53.3,107.3C53.7,120.2 52.2,133.8 52.3,139.3L41.8,139.3C41.9,107.8 35.7,94.7 36,77.3"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M35.1,55.5C33.9,66.3 35.9,77.3 35.9,77.3L51.8,76.9L51.6,67.1L47.9,65.1L52.4,56.4L49.4,53.3L44.9,48.6C40.2,47.5 35.6,50.7 35.1,55.5Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M46.4,64.4l0.8,51.7l6.6,0l-1,-48.6z"
+      android:strokeWidth="1"
+      android:fillColor="#A7AAAD"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M44.6,62.2C50.9,67.6 57,69.2 59.5,67C63.3,63.8 56.5,51.2 56.1,49.4C54.5,43 51,43 50.1,43.7C49.2,44.4 51,48.4 51,48.4L52.6,56.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="#3C434A"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M48.9,53.6L54.7,59.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#3C434A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M41.8,138.3C44.7,138.4 53.6,139 55,139.4C56.4,139.8 56.4,140.6 54.8,141C53.2,141.4 41.8,141 41.8,141L41.8,138.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M46.3,46l-0.9,2.6l-0.6,-2.7z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#3C434A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M49.1,76.6C44.3,78.7 34.9,77.6 34.9,77.6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M54.6,91C53,91.3 51.1,91.2 49.2,90.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M41.3,48.9C43.8,48 38.4,45.1 38,47.1C37.7,49 39.2,49.6 41.3,48.9Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M42.5,48.5C42.5,48.5 45.6,48.9 47.2,50.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M36.5,41.2L52.1,30.6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#3C434A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M49.6,41C50.3,41.1 50.9,40.8 50.9,40.8"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#3C434A"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M48.9,37.7L48.9,37.7C48.7,37.7 48.4,37.6 48.4,37.3L48.3,36.6C48.3,36.4 48.4,36.1 48.7,36.1L48.7,36.1C48.9,36.1 49.2,36.2 49.2,36.5L49.3,37.2C49.3,37.4 49.1,37.7 48.9,37.7Z"
+      android:strokeWidth="1"
+      android:fillColor="#1D2327"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M17.9,111.4C18.4,111.1 18.9,111 19.4,111C19.9,111 20.4,110.9 20.9,110.9C21.4,110.9 21.9,110.9 22.4,111C22.9,111 23.4,111.1 23.9,111.3C24,111.3 24.1,111.5 24,111.6C24,111.7 23.9,111.7 23.9,111.7C23.4,111.9 22.9,111.9 22.4,112C21.9,112 21.4,112.1 20.9,112.1C20.4,112.1 19.9,112.1 19.4,112C18.9,112 18.4,111.9 17.9,111.6C17.8,111.5 17.8,111.5 17.9,111.4C17.8,111.4 17.9,111.4 17.9,111.4Z"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M2.298,141.609C21.123,141.336 39.849,141.291 58.674,141.245L115.05,141.2C152.602,141.245 190.153,141.245 227.704,141.518C227.902,141.518 228.1,141.609 228.1,141.7C228.1,141.791 227.902,141.882 227.704,141.882C190.153,142.2 152.602,142.155 115.05,142.2L58.674,142.155C39.849,142.109 21.123,142.018 2.298,141.791C2.199,141.791 2.1,141.745 2.1,141.7C2.1,141.655 2.199,141.609 2.298,141.609Z"
+      android:strokeWidth="1"
+      android:fillColor="#F6F7F7"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M56.8,22.2L56.7,19.7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#DCDCDE"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M56.6,14.6L56.6,14.4L56.6,9.2C56.6,4.7 60.3,1 64.8,1L186,1C190.5,1 194.2,4.7 194.2,9.2L194.2,17.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#DCDCDE"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M194.2,19.7L194.2,22.2"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#DCDCDE"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M201,23.4C188.4,24.2 175.8,24.2 163.2,24.2L125.4,24.3L87.6,24.2C75,24.2 62.4,24.2 49.8,23.4L49.8,22.9C62.4,22.1 75,22.1 87.6,22.1L125.4,22L163.2,22.1C175.8,22.1 188.4,22.1 201,22.9L201,23.4Z"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M73.8,65h57.4v36.9h-57.4z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M131.2,54.4L73.8,54.4L73.8,46.2C73.8,40.3 78.6,35.5 84.5,35.5L131.2,35.5L131.2,54.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M122.2,73.3C115.2,73.3 112.8,76.5 111.3,79.2C109.9,81.7 106.8,85.1 102,86.4C97.2,87.7 95.2,90.5 95.2,93.2L122.4,93.2L122.2,73.3Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M59.8,127.8l0,-96.1l137.6,0l0,96.1l-103,0z"
+      android:strokeWidth="1"
+      android:fillColor="#C3C4C7"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M131.6,105.6l0,2.5l-2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M124.5,108.1L80.7,108.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M78.4,108.1l-2.5,0l0,-2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M75.9,100.3L75.9,60.8"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M75.9,58.2l0,-2.5l2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M83,55.7L126.8,55.7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M129.1,55.7l2.5,0l0,2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M131.6,63.4L131.6,102.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="@color/white"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M128.3,81.4L84.6,81.4L84.6,71.5L136.5,71.5L136.5,73.2C136.5,77.7 132.8,81.4 128.3,81.4Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M108.8,99.8L84.6,99.8L84.6,89.9L117,89.9L117,91.6C117,96.1 113.3,99.8 108.8,99.8Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/neutral"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M185.4,118.7L145.7,118.7L145.7,90.8C145.7,86.9 148.8,83.8 152.7,83.8L185.4,83.8L185.4,118.7L185.4,118.7Z"
+      android:strokeWidth="1"
+      android:fillColor="#00BE28"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M204.7,74.7L162.7,74.7L162.7,41.1L198.8,41.1C202,41.1 204.6,43.7 204.6,46.9L204.6,74.7L204.7,74.7Z"
+      android:strokeWidth="1"
+      android:fillColor="@color/white"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M204.7,72.2l0,2.5l-2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M196.9,74.7L167.9,74.7"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M165.3,74.7l-2.5,0l0,-2.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M162.8,66.5L162.8,46.5"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M162.8,43.6l0,-2.5l2.5,0"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M170.5,41.1L198.9,41.1C202.1,41.1 204.7,43.7 204.7,46.9L204.7,69.6"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M162.6,41.3L164.5,42.9"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M168.7,46.2L199.6,71.1"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M201.6,72.7L203.6,74.3"
+      android:strokeLineJoin="round"
+      android:strokeWidth="2"
+      android:fillColor="@color/transparent"
+      android:strokeColor="#A7AAAD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M71.8,11.6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M82.5,11.6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+  <path
+      android:pathData="M93.3,11.6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:strokeWidth="1"
+      android:fillColor="#DCDCDE"
+      android:fillType="nonZero"
+      android:strokeColor="@color/transparent"/>
+</vector>
diff --git a/WordPress/src/main/res/drawable/invites_border.xml b/WordPress/src/main/res/drawable/invites_border.xml
deleted file mode 100644
index 6773a46a7af4..000000000000
--- a/WordPress/src/main/res/drawable/invites_border.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-        android:shape="rectangle">
-    <stroke android:width="1dp" android:color="@color/neutral_20"/>
-    <solid android:color="@android:color/transparent"/>
-</shape>
diff --git a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml
index 2129cccdb2ee..003c854c0051 100644
--- a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml
+++ b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml
@@ -2,7 +2,7 @@
 <selector
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:color="?attr/colorPrimary" android:state_selected="true"/>
+    <item android:color="?attr/wpColorNavBar" android:state_selected="true" />
     <item android:color="?attr/colorOnSurface"/>
 
 </selector>
diff --git a/WordPress/src/main/res/drawable/quick_start_card_progress_drawable.xml b/WordPress/src/main/res/drawable/quick_start_card_progress_drawable.xml
new file mode 100644
index 000000000000..728ed29dc445
--- /dev/null
+++ b/WordPress/src/main/res/drawable/quick_start_card_progress_drawable.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape
+            android:shape="ring"
+            android:useLevel="false">
+            <solid android:color="?colorSurface" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <rotate
+            android:fromDegrees="270"
+            android:toDegrees="270">
+            <shape
+                android:shape="ring"
+                android:useLevel="true">
+                <solid android:color="?colorPrimary" />
+            </shape>
+        </rotate>
+    </item>
+</layer-list>
diff --git a/WordPress/src/main/res/layout-land/home_page_picker_header_section.xml b/WordPress/src/main/res/layout-land/home_page_picker_header_section.xml
deleted file mode 100644
index 0e3162218a5e..000000000000
--- a/WordPress/src/main/res/layout-land/home_page_picker_header_section.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- In landscape mode the title is hidden -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <include
-        layout="@layout/modal_layout_picker_subtitle_row"
-        android:layout_width="@dimen/hpp_subtitle_width"
-        android:layout_gravity="center"
-        android:layout_height="wrap_content" />
-</LinearLayout>
-
diff --git a/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_unified.xml b/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container.xml
similarity index 79%
rename from WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_unified.xml
rename to WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container.xml
index f3dd6412f0e3..343c65560c3d 100644
--- a/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_unified.xml
+++ b/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.LoginFlow.Prologue"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clipToPadding="false"
@@ -11,8 +12,8 @@
     android:paddingTop="@dimen/margin_medium_large">
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/first_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
+        android:id="@+id/continue_with_wpcom_button"
+        style="@style/Widget.LoginFlow.Button.Primary.Prologue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/margin_medium"
@@ -20,8 +21,8 @@
         android:text="@string/continue_with_wpcom" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/second_button"
-        style="@style/Widget.LoginFlow.Button.Secondary"
+        android:id="@+id/enter_your_site_address_button"
+        style="@style/Widget.LoginFlow.Button.Secondary.Prologue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_medium"
diff --git a/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_default.xml b/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_default.xml
deleted file mode 100644
index 45734fa62cf0..000000000000
--- a/WordPress/src/main/res/layout-land/login_prologue_bottom_buttons_container_default.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clipToPadding="false"
-    android:gravity="center"
-    android:orientation="horizontal"
-    android:paddingBottom="@dimen/margin_medium_large"
-    android:paddingEnd="@dimen/margin_extra_large"
-    android:paddingStart="@dimen/margin_extra_large"
-    android:paddingTop="@dimen/margin_medium_large">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/second_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_medium"
-        android:layout_weight="1"
-        android:text="@string/sign_up" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/first_button"
-        style="@style/Widget.LoginFlow.Button.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_medium"
-        android:layout_weight="1"
-        android:text="@string/log_in" />
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout-land/modal_layout_picker_titlebar.xml b/WordPress/src/main/res/layout-land/modal_layout_picker_titlebar.xml
index ac5f485007b6..7d23020ebbd2 100644
--- a/WordPress/src/main/res/layout-land/modal_layout_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout-land/modal_layout_picker_titlebar.xml
@@ -11,7 +11,7 @@
         android:backgroundTint="@color/transparent"
         android:contentDescription="@string/navigate_back_desc"
         android:src="@drawable/ic_arrow_left_white_24dp"
-        android:tint="?attr/colorControlNormal" />
+        android:tint="?attr/colorOnSurface" />
 
     <TextView
         android:id="@+id/title"
@@ -23,4 +23,14 @@
         style="@style/ModalLayoutPickerHeader"
         android:layout_marginEnd="@dimen/margin_medium"
         android:text="@string/mlp_choose_layout_title" />
+
+    <ImageButton
+        android:id="@+id/previewTypeSelectorButton"
+        style="@style/WebPreviewNavbarButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:contentDescription="@string/preview_type_desc"
+        android:src="@drawable/ic_devices_white_24dp" />
 </FrameLayout>
diff --git a/WordPress/src/main/res/layout-land/post_signup_interstitial_activity.xml b/WordPress/src/main/res/layout-land/post_signup_interstitial_activity.xml
index b848c4443665..f0e486ca355c 100644
--- a/WordPress/src/main/res/layout-land/post_signup_interstitial_activity.xml
+++ b/WordPress/src/main/res/layout-land/post_signup_interstitial_activity.xml
@@ -6,5 +6,6 @@
     android:fillViewport="true"
     tools:context=".ui.accounts.PostSignupInterstitialActivity">
 
-    <include layout="@layout/post_signup_interstitial_landscape" />
+    <include
+        layout="@layout/post_signup_interstitial_landscape" />
 </ScrollView>
diff --git a/WordPress/src/main/res/layout-land/site_creation_header_item.xml b/WordPress/src/main/res/layout-land/site_creation_header_item.xml
new file mode 100644
index 000000000000..e3e0131ca2e9
--- /dev/null
+++ b/WordPress/src/main/res/layout-land/site_creation_header_item.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/SiteCreationHeaderLinearLayoutStyle"
+    android:paddingStart="@dimen/site_creation_segments_content_padding_horizontal"
+    android:paddingEnd="@dimen/site_creation_segments_content_padding_horizontal"
+    android:paddingBottom="@dimen/site_creation_segments_content_padding_vertical">
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/title"
+        style="@style/ModalLayoutPickerTitle"
+        android:visibility="gone" />
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/subtitle"
+        style="@style/ModalLayoutPickerSubtitle"
+        app:fixWidowWords="true"
+        tools:text="We’ll use your answer to add sections to your website." />
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
index 25d356e64ef1..b9ea6d9eb1b5 100644
--- a/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
+++ b/WordPress/src/main/res/layout-sw600dp/home_page_picker_bottom_toolbar.xml
@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
diff --git a/WordPress/src/main/res/layout-sw600dp/home_page_picker_header_section.xml b/WordPress/src/main/res/layout-sw600dp/home_page_picker_header_section.xml
deleted file mode 100644
index 793c45eea197..000000000000
--- a/WordPress/src/main/res/layout-sw600dp/home_page_picker_header_section.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <include
-        layout="@layout/modal_layout_picker_title_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <include
-        layout="@layout/modal_layout_picker_subtitle_row"
-        android:layout_width="@dimen/hpp_subtitle_width"
-        android:layout_gravity="center"
-        android:layout_height="wrap_content" />
-</LinearLayout>
-
diff --git a/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_unified.xml b/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container.xml
similarity index 79%
rename from WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_unified.xml
rename to WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container.xml
index f73733c13c8e..435c29e2ab88 100644
--- a/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_unified.xml
+++ b/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.LoginFlow.Prologue"
     android:layout_width="@dimen/prologue_intro_content_max_width"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
@@ -11,16 +12,16 @@
     android:paddingTop="@dimen/margin_large">
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/first_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
+        android:id="@+id/continue_with_wpcom_button"
+        style="@style/Widget.LoginFlow.Button.Primary.Prologue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
         android:text="@string/continue_with_wpcom" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/second_button"
-        style="@style/Widget.LoginFlow.Button.Secondary"
+        android:id="@+id/enter_your_site_address_button"
+        style="@style/Widget.LoginFlow.Button.Secondary.Prologue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"
diff --git a/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_default.xml b/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_default.xml
deleted file mode 100644
index aa0ad8baf167..000000000000
--- a/WordPress/src/main/res/layout-sw600dp/login_prologue_bottom_buttons_container_default.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/prologue_intro_content_max_width"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center_horizontal"
-    android:clipToPadding="false"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/margin_large"
-    android:paddingEnd="@dimen/margin_extra_large"
-    android:paddingStart="@dimen/margin_extra_large"
-    android:paddingTop="@dimen/margin_large">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/first_button"
-        style="@style/Widget.LoginFlow.Button.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_extra_small"
-        android:text="@string/log_in" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/second_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_small"
-        android:text="@string/sign_up" />
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout-sw600dp/post_signup_interstitial_activity.xml b/WordPress/src/main/res/layout-sw600dp/post_signup_interstitial_activity.xml
index 160f4d4f16ff..5f6f9d759687 100644
--- a/WordPress/src/main/res/layout-sw600dp/post_signup_interstitial_activity.xml
+++ b/WordPress/src/main/res/layout-sw600dp/post_signup_interstitial_activity.xml
@@ -6,5 +6,6 @@
     android:fillViewport="true"
     tools:context=".ui.accounts.PostSignupInterstitialActivity">
 
-    <include layout="@layout/post_signup_interstitial_default" />
+    <include
+        layout="@layout/post_signup_interstitial_default" />
 </ScrollView>
diff --git a/WordPress/src/main/res/layout/about_activity.xml b/WordPress/src/main/res/layout/about_activity.xml
index b3aa4fc38575..84fae2b720cd 100644
--- a/WordPress/src/main/res/layout/about_activity.xml
+++ b/WordPress/src/main/res/layout/about_activity.xml
@@ -49,7 +49,7 @@
                     android:layout_height="50dp"
                     android:layout_marginTop="@dimen/margin_medium"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_my_sites_white_24dp" />
+                    android:src="@drawable/ic_app_white_24dp" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/about_first_line"
diff --git a/WordPress/src/main/res/layout/activity_log_detail_activity.xml b/WordPress/src/main/res/layout/activity_log_detail_activity.xml
index d687a95fca1c..7f8da9ef4ec2 100644
--- a/WordPress/src/main/res/layout/activity_log_detail_activity.xml
+++ b/WordPress/src/main/res/layout/activity_log_detail_activity.xml
@@ -20,7 +20,7 @@
 
     </com.google.android.material.appbar.AppBarLayout>
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="org.wordpress.android.ui.activitylog.detail.ActivityLogDetailFragment"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/activity_log_item_detail.xml b/WordPress/src/main/res/layout/activity_log_item_detail.xml
index fb363740049c..181a6d84694a 100644
--- a/WordPress/src/main/res/layout/activity_log_item_detail.xml
+++ b/WordPress/src/main/res/layout/activity_log_item_detail.xml
@@ -87,22 +87,50 @@
                     android:textColor="?attr/colorOnSurface"
                     tools:ignore="RelativeOverlap"
                     tools:text="11:32 PM" />
+
             </LinearLayout>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="24dp"
+            android:layout_marginTop="32dp"
+            android:orientation="vertical">
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/activityType"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:textAppearance="?attr/textAppearanceBody1"
+                android:textColor="?attr/wpColorOnSurfaceMedium"
+                tools:text="Plugin autoupdated" />
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/activityMessage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="8dp"
+                android:focusable="true"
+                android:linksClickable="true"
+                android:textAppearance="?attr/textAppearanceBody1"
+                tools:text="Jetpack by WordPress.com autoupdated to 5.6" />
+
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/activityRewindButton"
+            android:id="@+id/activityRestoreButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:contentDescription="@string/rewind"
+            android:contentDescription="@string/restore"
             android:orientation="horizontal">
 
             <ImageView
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center"
-                android:layout_marginEnd="6dp"
+                android:layout_marginEnd="12dp"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@null"
                 android:importantForAccessibility="no"
@@ -113,29 +141,43 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:text="@string/rewind"
+                android:text="@string/restore"
                 android:textAllCaps="true"
                 android:textAppearance="?attr/textAppearanceBody2"
                 android:textColor="?attr/colorPrimary" />
+
         </LinearLayout>
 
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/activityType"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:id="@+id/activityDownloadBackupButton"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textAppearance="?attr/textAppearanceSubtitle1"
-            android:textColor="?attr/wpColorOnSurfaceMedium"
-            tools:text="Plugin autoupdated" />
+            android:layout_marginTop="16dp"
+            android:contentDescription="@string/backup_download_details_page_title"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="12dp"
+                android:background="?attr/selectableItemBackgroundBorderless"
+                android:contentDescription="@null"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_download_white_24dp"
+                app:tint="?attr/colorPrimary" />
+
+            <org.wordpress.android.widgets.WPTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/backup_download_details_page_title"
+                android:textAllCaps="true"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="?attr/colorPrimary" />
+
+        </LinearLayout>
 
-        <org.wordpress.android.widgets.WPTextView
-            android:id="@+id/activityMessage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:focusable="true"
-            android:linksClickable="true"
-            android:textAppearance="?attr/textAppearanceSubtitle1"
-            tools:text="Jetpack by WordPress.com autoupdated to 5.6" />
     </LinearLayout>
+
 </androidx.core.widget.NestedScrollView>
diff --git a/WordPress/src/main/res/layout/activity_log_list_activity.xml b/WordPress/src/main/res/layout/activity_log_list_activity.xml
index 4b7bbd69390e..0648d351929c 100644
--- a/WordPress/src/main/res/layout/activity_log_list_activity.xml
+++ b/WordPress/src/main/res/layout/activity_log_list_activity.xml
@@ -2,6 +2,7 @@
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,16 +10,71 @@
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_main"
+        android:animateLayoutChanges="true"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:liftOnScrollTargetViewId="@+id/log_list_view">
+        android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_main"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            app:layout_scrollFlags="scroll|enterAlways"
             app:theme="@style/WordPress.ActionBar" />
 
+        <HorizontalScrollView
+            android:id="@+id/filters_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/margin_medium"
+            android:paddingTop="@dimen/margin_medium"
+            android:scrollIndicators="none"
+            android:visibility="gone"
+            app:layout_scrollFlags="noScroll"
+            android:scrollbars="none"
+            tools:targetApi="m">
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/filter_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:importantForAccessibility="no"
+                    android:paddingEnd="@dimen/margin_extra_extra_medium_large"
+                    android:paddingStart="@dimen/margin_extra_large"
+                    android:src="@drawable/ic_filter_list_white_24dp"
+                    app:tint="?attr/wpColorOnSurfaceMedium" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/date_range_picker"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginEnd="@dimen/margin_medium"
+                    app:chipBackgroundColor="?attr/colorSurface"
+                    app:chipStrokeColor="@color/neutral_10"
+                    app:chipStrokeWidth="@dimen/divider_size" />
+
+                <com.google.android.material.chip.Chip
+                    android:id="@+id/activity_type_filter"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:chipBackgroundColor="?attr/colorSurface"
+                    app:chipStrokeColor="@color/neutral_10"
+                    app:chipStrokeWidth="@dimen/divider_size" />
+            </LinearLayout>
+        </HorizontalScrollView>
+
+        <View
+            android:id="@+id/filters_bar_divider"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/divider_size"
+            android:background="?attr/wpColorSurfaceSecondary"
+            android:visibility="gone" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <fragment
diff --git a/WordPress/src/main/res/layout/activity_log_list_event_item.xml b/WordPress/src/main/res/layout/activity_log_list_event_item.xml
index b602d73f59d4..d96ef71e7bef 100644
--- a/WordPress/src/main/res/layout/activity_log_list_event_item.xml
+++ b/WordPress/src/main/res/layout/activity_log_list_event_item.xml
@@ -31,7 +31,7 @@
         android:background="?attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/activity_log_button"
         android:padding="@dimen/activity_log_icon_margin"
-        android:src="@drawable/ic_history_white_24dp"
+        tools:src="@drawable/ic_ellipsis_vertical_white_24dp"
         app:tint="?attr/colorPrimary" />
 
     <LinearLayout
diff --git a/WordPress/src/main/res/layout/activity_log_list_fragment.xml b/WordPress/src/main/res/layout/activity_log_list_fragment.xml
index 20d0a7a07bd9..0d70dc379e1c 100644
--- a/WordPress/src/main/res/layout/activity_log_list_fragment.xml
+++ b/WordPress/src/main/res/layout/activity_log_list_fragment.xml
@@ -5,19 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.chip.Chip
-        android:id="@+id/date_range_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        android:text="Date Range - hardcoded"
-        tools:ignore="HardcodedText" />
-
     <org.wordpress.android.ui.ActionableEmptyView
         android:id="@+id/actionable_empty_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/date_range_picker"
         android:visibility="gone"
         app:aevImage="@drawable/img_illustration_empty_results_216dp"
         app:aevSubtitle="@string/activity_log_empty_subtitle"
@@ -27,8 +18,7 @@
     <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
         android:id="@+id/swipe_refresh_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/date_range_picker">
+        android:layout_height="match_parent">
 
         <org.wordpress.android.ui.prefs.EmptyViewRecyclerView
             android:id="@+id/log_list_view"
diff --git a/WordPress/src/main/res/layout/activity_log_list_item_menu_item.xml b/WordPress/src/main/res/layout/activity_log_list_item_menu_item.xml
new file mode 100644
index 000000000000..5717aa23ba2b
--- /dev/null
+++ b/WordPress/src/main/res/layout/activity_log_list_item_menu_item.xml
@@ -0,0 +1,28 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/menu_item_height"
+    android:gravity="start|center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="@dimen/menu_item_margin"
+    android:paddingEnd="@dimen/menu_item_margin">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:tintMode="multiply"
+        android:layout_marginEnd="@dimen/margin_large"
+        tools:src="@drawable/ic_history_white_24dp"
+        tools:tint="@color/primary" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?textAppearanceSmallPopupMenu"
+        tools:text="@string/activity_log_item_menu_download_backup_label"
+        tools:textColor="@color/primary" />
+
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/activity_log_list_notice_item.xml b/WordPress/src/main/res/layout/activity_log_list_notice_item.xml
new file mode 100644
index 000000000000..cc1a7c35076b
--- /dev/null
+++ b/WordPress/src/main/res/layout/activity_log_list_notice_item.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/label"
+        style="@style/ActivityLogList.Notice.Item.Label"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/button_wrapper"
+        android:text="@string/activity_log_backup_download_notice_description_with_two_params"/>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/button_wrapper"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/primary_button"
+            style="@style/ActivityLogList.Notice.Item.PrimaryButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/secondary_button"
+            app:layout_constraintHorizontal_chainStyle="packed"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            android:text="@string/activity_log_backup_download_notice_download_action"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/secondary_button"
+            style="@style/ActivityLogList.Notice.Item.SecondaryButton"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/primary_button"
+            app:layout_constraintTop_toTopOf="parent"
+            android:text="@string/activity_log_backup_download_notice_dismiss_action"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/list_divider_height"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="parent"
+        android:background="?android:attr/listDivider" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml
index fa1d5f7a5461..21aa547de08b 100644
--- a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml
+++ b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml
@@ -1,90 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_content_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@android:color/white"
+    android:background="?attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
     android:minHeight="?attr/listPreferredItemHeight"
     tools:layout_height="?attr/listPreferredItemHeightLarge">
 
-    <RelativeLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/selectableItemBackground">
+        android:layout_height="@dimen/activity_progress_bar_height"
+        android:layout_alignParentBottom="true">
 
-        <ImageView
-            android:id="@+id/action_icon"
-            android:layout_width="@dimen/activity_log_icon_size"
-            android:layout_height="@dimen/activity_log_icon_size"
-            android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:layout_margin="@dimen/activity_log_icon_margin"
-            android:background="@drawable/bg_oval_primary_50"
-            android:contentDescription="@string/activity_log_icon"
-            android:padding="@dimen/margin_medium"
-            android:src="@drawable/ic_notice_outline_white_24dp" />
-
-        <LinearLayout
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
+        <ProgressBar
+            android:id="@+id/rewind_progress_bar"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_marginEnd="@dimen/activity_log_icon_margin"
-            android:layout_toEndOf="@id/action_icon"
-            android:orientation="vertical">
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/action_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:gravity="start"
-                android:singleLine="true"
-                android:textAlignment="viewStart"
-                android:textAppearance="?attr/textAppearanceSubtitle1"
-                tools:text="Rewinding to June 1 2018 12:22PM" />
+            android:layout_marginBottom="@dimen/activity_progress_bar_margin_vertical"
+            android:layout_marginTop="@dimen/activity_progress_bar_margin_vertical"
+            android:background="@color/neutral_10"
+            android:indeterminate="true"
+            android:theme="@style/LinearProgress" />
 
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/action_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1"
-                android:textColor="?attr/wpColorOnSurfaceMedium"
-                tools:text="Rewind in progress" />
+    </FrameLayout>
 
-        </LinearLayout>
+    <ImageView
+        android:id="@+id/action_icon"
+        android:layout_width="@dimen/activity_log_icon_size"
+        android:layout_height="@dimen/activity_log_icon_size"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_margin="@dimen/activity_log_icon_margin"
+        android:background="@drawable/bg_oval_primary_50"
+        android:contentDescription="@string/activity_log_icon"
+        android:padding="@dimen/margin_medium"
+        android:src="@drawable/ic_notice_outline_white_24dp" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/list_divider_height"
-            android:layout_alignParentBottom="true"
-            android:background="?android:attr/listDivider" />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="@dimen/activity_log_icon_margin"
+        android:layout_toEndOf="@id/action_icon"
+        android:orientation="vertical">
 
-        <FrameLayout
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/action_text"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/activity_progress_bar_height"
-            android:layout_alignParentBottom="true">
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:gravity="start"
+            android:singleLine="true"
+            android:textAlignment="viewStart"
+            android:textAppearance="?attr/textAppearanceSubtitle1"
+            tools:text="Rewinding to June 1 2018 12:22PM" />
 
-            <ProgressBar
-                android:id="@+id/rewind_progress_bar"
-                style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical"
-                android:layout_marginTop="@dimen/activity_progress_bar_margin_vertical"
-                android:layout_marginBottom="@dimen/activity_progress_bar_margin_vertical"
-                android:background="@color/neutral_10"
-                android:indeterminate="true"
-                android:theme="@style/LinearProgress" />
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/action_summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1"
+            android:textColor="?attr/wpColorOnSurfaceMedium"
+            tools:text="Rewind in progress" />
 
-        </FrameLayout>
+    </LinearLayout>
 
-    </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/list_divider_height"
+        android:layout_alignParentBottom="true"
+        android:background="?android:attr/listDivider" />
 
-</FrameLayout>
+</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/activity_log_type_filter_fragment.xml b/WordPress/src/main/res/layout/activity_log_type_filter_fragment.xml
new file mode 100644
index 000000000000..db749f77f099
--- /dev/null
+++ b/WordPress/src/main/res/layout/activity_log_type_filter_fragment.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginTop="@dimen/toolbar_height" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        style="@style/WordPress.AppBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:liftOnScrollTargetViewId="@+id/recycler_view">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            style="@style/WordPress.ToolBar"
+            android:theme="@style/Base.Wordpress"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_divider_height"
+            android:background="?attr/wpColorSurfaceSecondary" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <include android:id="@+id/progress" layout="@layout/progress_layout" />
+
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/actionable_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:aevButton="@string/retry"
+        app:aevImage="@drawable/img_illustration_cloud_off_152dp"
+        app:aevTitle="@string/error"
+        tools:visibility="visible" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/activity_log_type_filter_header.xml b/WordPress/src/main/res/layout/activity_log_type_filter_header.xml
new file mode 100644
index 000000000000..f87e544e29d8
--- /dev/null
+++ b/WordPress/src/main/res/layout/activity_log_type_filter_header.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/listPreferredItemHeight">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/header_title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif-medium"
+        android:textColor="?attr/colorOnSurface"
+        android:textSize="@dimen/text_sz_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/activity_log_type_filter_item.xml b/WordPress/src/main/res/layout/activity_log_type_filter_item.xml
new file mode 100644
index 000000000000..fe22f8b1d07b
--- /dev/null
+++ b/WordPress/src/main/res/layout/activity_log_type_filter_item.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="?attr/listPreferredItemHeightSmall"
+    android:background="?attr/selectableItemBackground"
+    android:focusable="true">
+
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+        android:clickable="false"
+        android:focusable="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/activity_type"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/activity_type"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/text_sz_large"
+        android:textColor="?attr/colorOnSurface"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/checkbox"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/backup_download_activity.xml b/WordPress/src/main/res/layout/backup_download_activity.xml
new file mode 100644
index 000000000000..fada92bc499d
--- /dev/null
+++ b/WordPress/src/main/res/layout/backup_download_activity.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <fragment
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="org.wordpress.android.ui.jetpack.backup.download.BackupDownloadFragment"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    </fragment>
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar"
+            app:layout_scrollFlags="scroll|enterAlways"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_divider_height"
+            android:background="?attr/wpColorSurfaceSecondary"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/comment_activity.xml b/WordPress/src/main/res/layout/comment_activity.xml
index 257619d074ce..f707387f02cc 100644
--- a/WordPress/src/main/res/layout/comment_activity.xml
+++ b/WordPress/src/main/res/layout/comment_activity.xml
@@ -2,7 +2,6 @@
 
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -12,22 +11,28 @@
         android:id="@+id/appbar_main"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScrollTargetViewId="@+id/recycler_view">
+        android:layout_alignParentTop="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar_main"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="?attr/actionBarSize"
             app:theme="@style/WordPress.ActionBar" />
 
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/tab_height"
+            android:layout_below="@+id/toolbar"
+            android:elevation="@dimen/tabs_elevation"
+            app:tabMode="scrollable" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-        android:id="@+id/layout_fragment_container"
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:context="org.wordpress.android.ui.comments.CommentsActivity" />
-
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/comment_list_fragment.xml b/WordPress/src/main/res/layout/comment_list_fragment.xml
index bd2fc12ba086..1b1481e1e784 100644
--- a/WordPress/src/main/res/layout/comment_list_fragment.xml
+++ b/WordPress/src/main/res/layout/comment_list_fragment.xml
@@ -1,23 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.wordpress.android.ui.ActionableEmptyView
-        android:id="@+id/actionable_empty_view"
+    <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
+        android:id="@+id/ptr_layout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="match_parent">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/comments_recycler_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+            <org.wordpress.android.ui.ActionableEmptyView
+                android:id="@+id/actionable_empty_view"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:visibility="gone"
+                app:aevImage="@drawable/img_illustration_empty_results_216dp"
+                app:aevTitle="@string/comments_empty_list"
+                tools:visibility="visible" />
+
+        </RelativeLayout>
+
+    </org.wordpress.android.util.widgets.CustomSwipeRefreshLayout>
+
+    <ProgressBar
+        android:id="@+id/progress"
+        style="?android:attr/progressBarStyleInverse"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="@dimen/margin_large"
         android:visibility="gone"
-        app:aevImage="@drawable/img_illustration_empty_results_216dp"
-        app:aevTitle="@string/comments_empty_list"
         tools:visibility="visible" />
 
-    <org.wordpress.android.ui.FilteredRecyclerView
-        android:id="@+id/filtered_recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</FrameLayout>
+</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/comment_listitem.xml b/WordPress/src/main/res/layout/comment_list_item.xml
similarity index 51%
rename from WordPress/src/main/res/layout/comment_listitem.xml
rename to WordPress/src/main/res/layout/comment_list_item.xml
index 8a861310c513..e3d503482c0f 100644
--- a/WordPress/src/main/res/layout/comment_listitem.xml
+++ b/WordPress/src/main/res/layout/comment_list_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -10,29 +10,45 @@
         android:id="@+id/layout_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/content_margin"
-        android:paddingTop="@dimen/margin_large"
-        android:paddingEnd="@dimen/content_margin"
-        android:paddingBottom="@dimen/margin_large">
+        android:paddingBottom="@dimen/margin_extra_large"
+        android:paddingEnd="@dimen/margin_extra_large"
+        android:paddingTop="@dimen/margin_extra_large"
+        tools:ignore="RtlSymmetry,UselessParent">
+
+        <RelativeLayout
+            android:id="@+id/status_indicator_container"
+            android:layout_width="@dimen/comment_status_dot_sz"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@+id/frame_avatar"
+            android:layout_alignTop="@+id/frame_avatar"
+            android:layout_marginEnd="@dimen/margin_small_medium"
+            android:layout_marginStart="@dimen/margin_small_medium">
+
+            <View
+                android:id="@+id/status_indicator"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/comment_status_dot_sz"
+                android:layout_centerVertical="true"
+                android:background="@drawable/bg_oval_warning_light" />
+        </RelativeLayout>
 
         <FrameLayout
             android:id="@+id/frame_avatar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/margin_large"
-            android:layout_marginTop="@dimen/margin_extra_small"
-            android:layout_marginEnd="@dimen/margin_large">
+            android:layout_marginEnd="@dimen/margin_large"
+            android:layout_toEndOf="@+id/status_indicator_container">
 
             <ImageView
                 android:id="@+id/avatar"
-                android:layout_width="@dimen/notifications_avatar_sz"
-                android:layout_height="@dimen/notifications_avatar_sz"
+                android:layout_width="@dimen/comment_avatar_sz"
+                android:layout_height="@dimen/comment_avatar_sz"
                 android:contentDescription="@null" />
 
             <ImageView
                 android:id="@+id/image_checkmark"
-                android:layout_width="@dimen/notifications_avatar_sz"
-                android:layout_height="@dimen/notifications_avatar_sz"
+                android:layout_width="@dimen/comment_avatar_sz"
+                android:layout_height="@dimen/comment_avatar_sz"
                 android:background="@drawable/bg_oval_primary_40"
                 android:contentDescription="@string/comment_checkmark_desc"
                 android:padding="@dimen/margin_medium"
@@ -41,45 +57,14 @@
 
         </FrameLayout>
 
-        <LinearLayout
-            android:id="@+id/layout_date_status"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="@dimen/margin_medium"
-            android:layout_marginTop="@dimen/margin_small"
-            android:layout_marginEnd="@dimen/margin_large"
-            android:gravity="end"
-            android:orientation="vertical">
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/text_date"
-                style="@style/ReaderTextView.Date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                tools:text="date" />
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_small"
-                android:textAllCaps="true"
-                android:textSize="@dimen/text_sz_small"
-                android:visibility="gone"
-                tools:text="status"
-                tools:visibility="visible" />
-        </LinearLayout>
-
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/title"
+            android:includeFontPadding="false"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_toStartOf="@+id/layout_date_status"
             android:layout_toEndOf="@+id/frame_avatar"
             android:ellipsize="end"
             android:gravity="start"
-            android:lines="2"
             android:maxLines="2"
             android:textAlignment="viewStart"
             android:textAppearance="?attr/textAppearanceSubtitle1"
@@ -92,15 +77,14 @@
             android:layout_below="@+id/title"
             android:layout_marginTop="@dimen/margin_extra_small"
             android:layout_toEndOf="@+id/frame_avatar"
-            android:alpha="@dimen/material_emphasis_medium"
+            android:alpha="@dimen/material_emphasis_high_type"
             android:ellipsize="end"
             android:importantForAccessibility="no"
             android:maxLines="2"
-            android:paddingEnd="@dimen/margin_large"
             android:textAppearance="?attr/textAppearanceBody2"
             tools:ignore="RtlSymmetry"
-            tools:text="comment" />
+            tools:text="comment " />
 
     </RelativeLayout>
 
-</FrameLayout>
+</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/comment_list_subheader.xml b/WordPress/src/main/res/layout/comment_list_subheader.xml
new file mode 100644
index 000000000000..273659a583f7
--- /dev/null
+++ b/WordPress/src/main/res/layout/comment_list_subheader.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/label"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/margin_extra_large"
+    android:paddingStart="@dimen/comment_list_divider_start_offset"
+    android:paddingEnd="@dimen/margin_extra_large"
+    android:includeFontPadding="false"
+    android:textAllCaps="true"
+    android:textAppearance="?attr/textAppearanceOverline"
+    tools:text="January 8" />
diff --git a/WordPress/src/main/res/layout/domain_registration_block.xml b/WordPress/src/main/res/layout/domain_registration_block.xml
new file mode 100644
index 000000000000..6b511301bfc4
--- /dev/null
+++ b/WordPress/src/main/res/layout/domain_registration_block.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/my_site_register_domain_cta"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/margin_large">
+
+    <!--Register Domain-->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            style="@style/MySiteListRowLayout"
+            android:foreground="@null"
+            tools:ignore="UnusedAttribute">
+
+            <ImageView
+                android:id="@+id/my_site_register_domain_icon"
+                style="@style/MySiteListRowAlertIcon"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_notice_white_24dp" />
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/my_site_register_domain_text_view"
+                style="@style/MySiteListRowTextView"
+                android:text="@string/register_domain" />
+        </LinearLayout>
+
+        <com.google.android.material.textview.MaterialTextView
+            style="@style/MySiteListRowDescription"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/my_site_custom_domain_name" />
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/layout/domain_suggestions_activity.xml b/WordPress/src/main/res/layout/domain_suggestions_activity.xml
index 4e3a3eca6e74..75e2edf8a713 100644
--- a/WordPress/src/main/res/layout/domain_suggestions_activity.xml
+++ b/WordPress/src/main/res/layout/domain_suggestions_activity.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content">
 
         <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar_main"
+            android:id="@+id/toolbar_domain"
             app:navigationIcon="@drawable/ic_cross_white_24dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/WordPress/src/main/res/layout/edit_post_settings_fragment.xml b/WordPress/src/main/res/layout/edit_post_settings_fragment.xml
index b581fc8708bd..1a30fce06511 100644
--- a/WordPress/src/main/res/layout/edit_post_settings_fragment.xml
+++ b/WordPress/src/main/res/layout/edit_post_settings_fragment.xml
@@ -278,23 +278,6 @@
 
             </LinearLayout>
 
-            <View style="@style/PostSettingsDivider" />
-
-            <LinearLayout
-                android:id="@+id/post_location_container"
-                style="@style/PostSettingsContainer">
-
-                <com.google.android.material.textview.MaterialTextView
-                    style="@style/PostSettingsTitle"
-                    android:text="@string/post_settings_location" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/post_location"
-                    style="@style/PostSettingsSubtitle"
-                    android:hint="@string/post_settings_not_set" />
-
-            </LinearLayout>
-
         </LinearLayout>
 
     </LinearLayout>
diff --git a/WordPress/src/main/res/layout/engaged_people_list_activity.xml b/WordPress/src/main/res/layout/engaged_people_list_activity.xml
new file mode 100644
index 000000000000..391a8a09c311
--- /dev/null
+++ b/WordPress/src/main/res/layout/engaged_people_list_activity.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/engaged_people_list_fragment.xml b/WordPress/src/main/res/layout/engaged_people_list_fragment.xml
new file mode 100644
index 000000000000..9821e66aab93
--- /dev/null
+++ b/WordPress/src/main/res/layout/engaged_people_list_fragment.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/root_layout"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:fadeScrollbars="true"
+        android:scrollbars="vertical" />
+
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/actionable_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recycler"
+        app:aevButton="@string/retry"
+        app:aevTitle="@string/media_empty_list"
+        tools:visibility="visible" />
+
+    <LinearLayout
+        android:id="@+id/loading_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone"
+        tools:visibility="visible">
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/progress_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_extra_large"
+            android:text="@string/loading"
+            android:textColor="?wpColorOnSurfaceMedium"
+            android:textSize="@dimen/text_sz_double_extra_large" />
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/fragment_jetpack_security_settings.xml b/WordPress/src/main/res/layout/fragment_jetpack_security_settings.xml
index 5e68a17a2a34..8096621df632 100644
--- a/WordPress/src/main/res/layout/fragment_jetpack_security_settings.xml
+++ b/WordPress/src/main/res/layout/fragment_jetpack_security_settings.xml
@@ -16,12 +16,7 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/status_bar_color"
-            app:titleTextColor="@color/white"
-            app:contentInsetEnd="@dimen/toolbar_content_offset_end"
-            app:contentInsetLeft="@dimen/toolbar_content_offset"
-            app:contentInsetRight="@dimen/toolbar_content_offset_end"
-            app:contentInsetStart="@dimen/toolbar_content_offset" />
+            app:theme="@style/WordPress.ActionBar" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/WordPress/src/main/res/layout/fullscreen_error_with_retry.xml b/WordPress/src/main/res/layout/fullscreen_error_with_retry.xml
index 4d9b3ca60be7..f52d58196002 100644
--- a/WordPress/src/main/res/layout/fullscreen_error_with_retry.xml
+++ b/WordPress/src/main/res/layout/fullscreen_error_with_retry.xml
@@ -18,6 +18,19 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <ImageView
+        android:id="@+id/error_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:src="@drawable/img_illustration_cloud_off_152dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/error_title"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.8" />
+
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/error_title"
         android:layout_width="0dp"
diff --git a/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
index a9ea56c4de5b..b937dd3838f2 100644
--- a/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_bottom_toolbar.xml
@@ -13,7 +13,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
diff --git a/WordPress/src/main/res/layout/home_page_picker_fragment.xml b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
index 2c08e8b98c9c..e6d1531ce0de 100644
--- a/WordPress/src/main/res/layout/home_page_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     android:fitsSystemWindows="false"
     android:focusableInTouchMode="true">
 
@@ -11,7 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:fitsSystemWindows="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -22,7 +22,7 @@
             app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
             <include
-                layout="@layout/home_page_picker_header_section"
+                layout="@layout/modal_layout_picker_header_section"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
@@ -32,13 +32,14 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/categoriesBackground"
+                android:background="?attr/layoutPickerBackground"
                 android:elevation="0dp"
                 app:layout_collapseMode="pin">
 
                 <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/toolbar_height"
+                    android:layout_marginTop="@dimen/margin_extra_small"
                     android:orientation="vertical">
 
                     <include
@@ -53,27 +54,40 @@
 
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
+        <include
+            layout="@layout/modal_layout_picker_categories_skeleton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/categoriesRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/mlp_categories_bar_height"
+            android:background="?attr/layoutPickerBackground"
+            android:clipToPadding="false"
+            android:descendantFocusability="beforeDescendants"
+            android:orientation="horizontal"
+            android:paddingEnd="@dimen/mlp_layout_card_margin_end"
+            android:paddingStart="@dimen/mlp_layout_card_margin_start"
+            android:scrollbars="none" />
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <include
-        layout="@layout/home_page_picker_loading_skeleton"
+        layout="@layout/modal_layout_picker_layouts_skeleton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/layoutsRecyclerView"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:maxWidth="@dimen/hpp_maximum_container_width"
-        android:layout_gravity="center|top"
-        android:paddingStart="@dimen/hpp_card_padding"
-        android:paddingEnd="0dp"
-        android:paddingBottom="@dimen/toolbar_height"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
+        android:paddingBottom="@dimen/toolbar_content_offset"
         android:clipToPadding="false"
         android:descendantFocusability="beforeDescendants"
-        android:scrollbars="none"
+        android:scrollbars="vertical"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     <org.wordpress.android.ui.ActionableEmptyView
diff --git a/WordPress/src/main/res/layout/home_page_picker_header_section.xml b/WordPress/src/main/res/layout/home_page_picker_header_section.xml
deleted file mode 100644
index 586bcb9f0aa0..000000000000
--- a/WordPress/src/main/res/layout/home_page_picker_header_section.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <include
-        layout="@layout/modal_layout_picker_title_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <include
-        layout="@layout/modal_layout_picker_subtitle_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout/home_page_picker_item.xml b/WordPress/src/main/res/layout/home_page_picker_item.xml
deleted file mode 100644
index a19e7f2c6ea3..000000000000
--- a/WordPress/src/main/res/layout/home_page_picker_item.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/layout_container"
-    style="@style/LayoutCardView"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_medium"
-    android:layout_marginBottom="@dimen/margin_medium"
-    android:layout_marginEnd="@dimen/margin_extra_large">
-
-    <ImageView
-        android:id="@+id/preview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/white"
-        tools:ignore="ContentDescription" />
-
-    <ImageView
-        android:id="@+id/selected_overlay"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_layout_selection_overlay_153dp"
-        tools:ignore="ContentDescription" />
-
-</com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/layout/home_page_picker_loading_skeleton.xml b/WordPress/src/main/res/layout/home_page_picker_loading_skeleton.xml
deleted file mode 100644
index db6726520887..000000000000
--- a/WordPress/src/main/res/layout/home_page_picker_loading_skeleton.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/loadingIndicator"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_medium"
-    android:background="?attr/categoriesBackground"
-    app:shimmer_base_alpha="@dimen/skeleton_shimmer_base_alpha"
-    app:shimmer_highlight_alpha="@dimen/skeleton_shimmer_highlight_alpha">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/skeletonCardView"
-        style="@style/LayoutCardView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/mlp_layout_card_margin_start"
-        android:layout_marginTop="@dimen/margin_medium"
-        app:cardBackgroundColor="?attr/categoriesButtonBackground">
-
-    </com.google.android.material.card.MaterialCardView>
-
-</com.facebook.shimmer.ShimmerFrameLayout>
diff --git a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
index 3b4a0325bd4a..1760038d3b36 100644
--- a/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/home_page_picker_titlebar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -11,14 +11,27 @@
         android:backgroundTint="@color/transparent"
         android:contentDescription="@string/navigate_back_desc"
         android:src="@drawable/ic_arrow_left_white_24dp"
-        android:tint="?attr/colorControlNormal" />
+        android:tint="?attr/colorOnSurface" />
 
     <TextView
         android:id="@+id/title"
         style="@style/ModalLayoutPickerHeader"
-        android:layout_marginEnd="@dimen/margin_medium"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:paddingStart="@dimen/hpp_title_padding_start"
+        android:paddingEnd="0dp"
         android:text="@string/hpp_title" />
 
+    <ImageButton
+        android:id="@+id/previewTypeSelectorButton"
+        style="@style/WebPreviewNavbarButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_weight="0"
+        android:contentDescription="@string/preview_type_desc"
+        android:src="@drawable/ic_devices_white_24dp" />
+
     <Button
         android:id="@+id/skipButton"
         style="@style/HomePagePickerSkipButton"
@@ -26,4 +39,4 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:text="@string/hpp_skip_button" />
-</FrameLayout>
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/invite_username_button.xml b/WordPress/src/main/res/layout/invite_username_button.xml
deleted file mode 100644
index 3e1e8de5c26d..000000000000
--- a/WordPress/src/main/res/layout/invite_username_button.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:paddingTop="@dimen/margin_large"
-    android:paddingStart="6dp"
-    android:paddingEnd="12dp">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/username"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical"
-        android:gravity="center_vertical"
-        android:textAppearance="?attr/textAppearanceBody2"
-        android:layout_marginEnd="5dp"/>
-
-    <ImageButton
-        android:id="@+id/username_delete"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/remove"
-        android:src="@drawable/ic_cross_white_24dp"
-        app:tint="@color/gray_60"/>
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_backup_restore_fragment.xml b/WordPress/src/main/res/layout/jetpack_backup_restore_fragment.xml
new file mode 100644
index 000000000000..5f7fb249924d
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_backup_restore_fragment.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="@dimen/margin_extra_large">
+
+    <org.wordpress.android.ui.prefs.EmptyViewRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_backup_restore_list_bullet_item.xml b/WordPress/src/main/res/layout/jetpack_backup_restore_list_bullet_item.xml
new file mode 100644
index 000000000000..94b10a9af1d0
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_backup_restore_list_bullet_item.xml
@@ -0,0 +1,33 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:background="?attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="0dp"
+    android:paddingEnd="@dimen/margin_medium"
+    android:paddingTop="@dimen/margin_medium"
+    android:paddingBottom="@dimen/margin_medium">
+
+    <ImageView
+        style="@style/Jetpack.ListItem.Bullet.Icon"
+        android:id="@+id/icon"
+        android:contentDescription="@string/jetpack_icon_content_description"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/bullet_label"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_get_app_white_24dp" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/bullet_label"
+        style="@style/Jetpack.ListItem.Bullet.Label"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="This is a bullet point"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_backup_restore_list_footnote_item.xml b/WordPress/src/main/res/layout/jetpack_backup_restore_list_footnote_item.xml
new file mode 100644
index 000000000000..303e5477dd24
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_backup_restore_list_footnote_item.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="0dp"
+    android:paddingEnd="@dimen/margin_medium"
+    android:paddingTop="@dimen/margin_medium"
+    android:paddingBottom="@dimen/margin_medium">
+
+    <ImageView
+        style="@style/Jetpack.Backup.ListItem.Footnote.Icon"
+        android:id="@+id/icon"
+        android:contentDescription="@string/jetpack_icon_content_description"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/footnote"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_info_outline_white_24dp"
+        android:visibility="gone"/>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/footnote"
+        style="@style/Jetpack.Backup.ListItem.Footnote"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Additional information"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_backup_restore_list_subheader_item.xml b/WordPress/src/main/res/layout/jetpack_backup_restore_list_subheader_item.xml
new file mode 100644
index 000000000000..37956ef4cd18
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_backup_restore_list_subheader_item.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/subheader"
+        style="@style/Jetpack.SecondaryHeader"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="This is the subheader"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_button_primary_item.xml b/WordPress/src/main/res/layout/jetpack_list_button_primary_item.xml
new file mode 100644
index 000000000000..34a08e5eb118
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_button_primary_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button"
+        style="@style/Jetpack.PrimaryButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="@string/backup_download_details_action_button"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_button_secondary_item.xml b/WordPress/src/main/res/layout/jetpack_list_button_secondary_item.xml
new file mode 100644
index 000000000000..0588e1b8eb8b
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_button_secondary_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/button"
+        style="@style/Jetpack.SecondaryButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="@string/scan_again"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_checkbox_item.xml b/WordPress/src/main/res/layout/jetpack_list_checkbox_item.xml
new file mode 100644
index 000000000000..4b61672f155f
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_checkbox_item.xml
@@ -0,0 +1,33 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:background="?attr/selectableItemBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:focusable="true"
+    android:paddingStart="0dp"
+    android:paddingEnd="@dimen/margin_medium"
+    android:paddingTop="@dimen/margin_medium"
+    android:paddingBottom="@dimen/margin_medium">
+
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:id="@+id/checkbox"
+        style="@style/Jetpack.ListItem.Checkbox"
+        android:clickable="false"
+        android:focusable="false"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/checkbox_label"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/checkbox_label"
+        style="@style/Jetpack.ListItem.Checkbox.Label"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/checkbox"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_description_item.xml b/WordPress/src/main/res/layout/jetpack_list_description_item.xml
new file mode 100644
index 000000000000..b4a96b71423d
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_description_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/description"
+        style="@style/Jetpack.Description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="October 21, 2020 at 3:40 AM is the selected point to create a downloadable backup."
+        android:text="@string/backup_download_details_description_with_two_parameters"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_header_item.xml b/WordPress/src/main/res/layout/jetpack_list_header_item.xml
new file mode 100644
index 000000000000..4563d332d436
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_header_item.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/header"
+        style="@style/Jetpack.Header"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="Create downloadable backup"
+        android:text="@string/backup_download_details_header"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_icon_item.xml b/WordPress/src/main/res/layout/jetpack_list_icon_item.xml
new file mode 100644
index 000000000000..da9975549e09
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_icon_item.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        style="@style/Jetpack.Icon"
+        android:id="@+id/icon"
+        android:contentDescription="@string/jetpack_icon_content_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:src="@drawable/ic_get_app_white_24dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_list_progress_item.xml b/WordPress/src/main/res/layout/jetpack_list_progress_item.xml
new file mode 100644
index 000000000000..351f8fb3577d
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_list_progress_item.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/margin_extra_medium_large">
+
+    <FrameLayout
+        android:id="@+id/progress_container"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/activity_progress_bar_height"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="@dimen/activity_progress_bar_margin_vertical"
+            android:layout_marginTop="@dimen/activity_progress_bar_margin_vertical"
+            android:background="@color/neutral_10"
+            android:indeterminate="true"
+            android:theme="@style/LinearProgress" />
+
+    </FrameLayout>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/progress_state_label"
+        style="@style/Jetpack.ListItem.Progress.Label"
+        android:textAlignment="viewEnd"
+        app:layout_constraintBottom_toTopOf="@id/progress_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/progress_label"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/threat_fixing" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/progress_label"
+        style="@style/Jetpack.ListItem.Progress.Label"
+        android:layout_width="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/progress_container"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="40%" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/progress_info_label"
+        style="@style/Jetpack.ListItem.Progress.Label.Info"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/progress_container"
+        tools:text="@string/threat_item_header_vulnerable_plugin" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_login_empty_view.xml b/WordPress/src/main/res/layout/jetpack_login_empty_view.xml
new file mode 100644
index 000000000000..0c9382f8747e
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_login_empty_view.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/user_cardView"
+            style="@style/Widget.EmptyView.CardView.BottomBar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="invisible"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:layout_constraintBottom_toTopOf="@+id/login_empty_view_illustration"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:visibility="visible">
+
+            <include
+                android:id="@+id/user_container"
+                layout="@layout/jetpack_login_include_user_container" />
+        </com.google.android.material.card.MaterialCardView>
+
+        <ImageView
+            android:id="@+id/login_empty_view_illustration"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/login_no_jetpack_sites"
+            android:gravity="center_horizontal"
+            android:padding="@dimen/margin_extra_large"
+            android:src="@drawable/img_jetpack_empty_state"
+            app:layout_constraintBottom_toTopOf="@+id/login_error_message_title"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/login_error_message_title"
+            style="@style/Login.EmptyView.Title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingBottom="@dimen/margin_medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/login_empty_view_illustration"
+            tools:text="@string/login_no_jetpack_sites" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/login_error_message_text"
+            style="@style/Login.EmptyView.SubTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/login_error_message_title"
+            tools:text="@string/login_no_jetpack_sites_error_message" />
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/bottom_buttons_cardView"
+            style="@style/Widget.EmptyView.CardView.BottomBar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:cardCornerRadius="0dp"
+            app:cardElevation="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/login_error_message_text">
+
+            <include
+                android:id="@+id/bottom_buttons_container"
+                layout="@layout/jetpack_login_include_empty_buttons_container" />
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_default.xml b/WordPress/src/main/res/layout/jetpack_login_include_empty_buttons_container.xml
similarity index 77%
rename from WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_default.xml
rename to WordPress/src/main/res/layout/jetpack_login_include_empty_buttons_container.xml
index 80107105a9f7..c5ff8e6e84e3 100644
--- a/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_default.xml
+++ b/WordPress/src/main/res/layout/jetpack_login_include_empty_buttons_container.xml
@@ -7,21 +7,21 @@
     android:paddingBottom="@dimen/margin_large"
     android:paddingEnd="@dimen/margin_extra_large"
     android:paddingStart="@dimen/margin_extra_large"
-    android:paddingTop="@dimen/margin_large">
+    android:paddingTop="@dimen/margin_extra_medium_large">
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/first_button"
-        style="@style/Widget.LoginFlow.Button.Secondary"
+        android:id="@+id/button_primary"
+        style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
-        android:text="@string/log_in" />
+        android:text="@string/login_empty_view_see_instructions" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/second_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
+        android:id="@+id/button_secondary"
+        style="@style/Widget.LoginFlow.Button.Secondary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"
-        android:text="@string/sign_up" />
+        android:text="@string/login_empty_view_try_another_account" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/jetpack_login_include_user_container.xml b/WordPress/src/main/res/layout/jetpack_login_include_user_container.xml
new file mode 100644
index 000000000000..0a4977e40529
--- /dev/null
+++ b/WordPress/src/main/res/layout/jetpack_login_include_user_container.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:clipToPadding="false"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/margin_extra_large"
+    android:paddingEnd="@dimen/margin_extra_large"
+    android:paddingStart="@dimen/margin_extra_large"
+    android:paddingTop="@dimen/margin_extra_large">
+
+    <ImageView
+        android:id="@+id/image_avatar"
+        android:layout_width="@dimen/login_empty_view_avatar_width"
+        android:layout_height="@dimen/login_empty_view_avatar_height"
+        android:layout_marginBottom="@dimen/login_empty_view_avatar_margin_bottom"
+        android:contentDescription="@string/login_empty_view_avatar_content_description"
+        tools:srcCompat="@drawable/ic_user_circle_no_padding_grey_24dp" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text_display_name"
+        style="@style/Login.EmptyView.TextView.DisplayName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/margin_small"
+        tools:text="Droid Tester" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text_username"
+        style="@style/Login.EmptyView.TextView.Username"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="\@droidtester2021" />
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/layout_picker_preview_fragment.xml b/WordPress/src/main/res/layout/layout_picker_preview_fragment.xml
new file mode 100644
index 000000000000..e9a554eb36d0
--- /dev/null
+++ b/WordPress/src/main/res/layout/layout_picker_preview_fragment.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/toolbar_height"
+        android:orientation="vertical">
+
+        <include
+            layout="@layout/bottom_sheet_handle_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_marginEnd="@dimen/margin_extra_large" />
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="@dimen/margin_small_medium">
+
+            <ImageButton
+                android:id="@+id/backButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/margin_medium"
+                android:backgroundTint="@color/transparent"
+                android:contentDescription="@string/navigate_back_desc"
+                android:src="@drawable/ic_arrow_left_white_24dp"
+                android:tint="?attr/colorOnSurface" />
+
+            <TextView
+                android:id="@+id/title"
+                style="@style/ModalLayoutPickerHeader"
+                android:layout_marginEnd="@dimen/margin_medium"
+                android:text="@string/mlp_preview_page" />
+
+            <ImageButton
+                android:id="@+id/previewTypeSelectorButton"
+                style="@style/WebPreviewNavbarButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center|end"
+                android:layout_marginEnd="@dimen/margin_extra_large"
+                android:contentDescription="@string/preview_type_desc"
+                android:src="@drawable/ic_devices_white_24dp" />
+        </FrameLayout>
+
+    </FrameLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="@dimen/negative_margin_medium"
+        android:layout_weight="1">
+
+        <org.wordpress.android.widgets.NestedWebView
+            android:id="@+id/webView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <TextView
+            android:id="@+id/desktopPreviewHint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:background="@drawable/preview_mode_indicator_background"
+            android:padding="@dimen/margin_medium"
+            android:text="@string/web_preview_desktop"
+            android:textColor="?attr/colorOnPrimarySurface"
+            android:visibility="gone" />
+    </FrameLayout>
+
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/errorView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="gone"
+        app:aevButton="@string/retry"
+        app:aevImage="@drawable/img_illustration_empty_results_216dp"
+        app:aevImageHiddenInLandscape="true"
+        app:aevSubtitle="@string/hpp_error_subtitle"
+        app:aevTitle="@string/hpp_error_title" />
+
+    <FrameLayout
+        android:id="@+id/progressBar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="gone">
+
+        <ProgressBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/mlp_bottom_shadow_height"
+            android:background="@drawable/modal_layout_picker_bottom_shadow" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?attr/layoutPickerBackground"
+            android:gravity="center"
+            android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
+            android:paddingTop="@dimen/picker_bottom_button_vertical_margin">
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/chooseButton"
+                style="@style/Widget.ModalLayoutPicker.Button.Primary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
+                android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin" />
+        </FrameLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/liker_face_item.xml b/WordPress/src/main/res/layout/liker_face_item.xml
new file mode 100644
index 000000000000..379773c5909a
--- /dev/null
+++ b/WordPress/src/main/res/layout/liker_face_item.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <ImageView
+        android:id="@+id/liker_avatar"
+        style="@style/ReaderImageView.Avatar.Small"
+        android:background="@drawable/bg_oval_stroke_liker_2dp"
+        android:importantForAccessibility="no"
+        android:padding="@dimen/reader_like_faces_padding"
+        tools:ignore="RtlSymmetry"
+        tools:src="@drawable/img_illustration_add_media_150dp"/>
+
+</FrameLayout>
diff --git a/WordPress/src/main/res/layout/liker_user.xml b/WordPress/src/main/res/layout/liker_user.xml
new file mode 100644
index 000000000000..86fa4a32ffe9
--- /dev/null
+++ b/WordPress/src/main/res/layout/liker_user.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/liker_root_view"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:selectableItemBackground"
+    android:clickable="true"
+    android:contentDescription="@null"
+    android:focusable="true"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
+
+    <ImageView
+        android:id="@+id/user_avatar"
+        android:layout_width="@dimen/avatar_sz_extra_large"
+        android:layout_height="@dimen/avatar_sz_extra_large"
+        android:padding="@dimen/margin_extra_large"
+        android:importantForAccessibility="no"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <LinearLayout
+        android:id="@+id/user_data"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintStart_toEndOf="@+id/user_avatar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:gravity="center_vertical">
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/user_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:includeFontPadding="true"
+            android:singleLine="true"
+            android:textAppearance="?attr/textAppearanceBody1"
+            android:textColor="@color/material_on_surface_emphasis_high_type"
+            tools:text="Bob Ross" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/user_login"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:includeFontPadding="true"
+            android:layout_marginTop="2dp"
+            android:singleLine="true"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="@color/material_on_surface_emphasis_medium"
+            tools:text="bobross" />
+
+    </LinearLayout>
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="@dimen/divider_size"
+        android:background="@drawable/notifications_list_divider_full_width"
+        app:layout_constraintStart_toStartOf="@+id/user_data"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/load_or_action_item.xml b/WordPress/src/main/res/layout/load_or_action_item.xml
new file mode 100644
index 000000000000..9531a244827e
--- /dev/null
+++ b/WordPress/src/main/res/layout/load_or_action_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent"
+    android:foregroundGravity="center">
+
+    <ProgressBar
+        android:id="@+id/progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:indeterminate="true"
+        android:progressTint="?attr/colorPrimary" />
+
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/action_button"
+        style="@style/WordPress.Button.Primary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:layout_margin="@dimen/margin_extra_large"
+        android:text="@string/retry"
+        android:visibility="gone" />
+
+</FrameLayout>
diff --git a/WordPress/src/main/res/layout/login_epilogue_screen.xml b/WordPress/src/main/res/layout/login_epilogue_screen.xml
index 569ad1bef001..f1f3b3ff9ea8 100644
--- a/WordPress/src/main/res/layout/login_epilogue_screen.xml
+++ b/WordPress/src/main/res/layout/login_epilogue_screen.xml
@@ -8,7 +8,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/primary_button"
+        android:layout_above="@+id/bottom_button"
         android:scrollbars="vertical" />
 
     <ProgressBar
@@ -24,11 +24,11 @@
         android:id="@+id/bottom_shadow"
         android:layout_width="match_parent"
         android:layout_height="@dimen/button_container_shadow_height"
-        android:layout_above="@+id/primary_button"
+        android:layout_above="@+id/bottom_button"
         android:background="@drawable/login_shadow" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/primary_button"
+        android:id="@+id/bottom_button"
         style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_unified.xml b/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container.xml
similarity index 77%
rename from WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_unified.xml
rename to WordPress/src/main/res/layout/login_prologue_bottom_buttons_container.xml
index 9a942a0c2814..9c5efb86cae4 100644
--- a/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container_unified.xml
+++ b/WordPress/src/main/res/layout/login_prologue_bottom_buttons_container.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/Widget.LoginFlow.Prologue"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clipToPadding="false"
@@ -10,16 +11,16 @@
     android:paddingTop="@dimen/margin_large">
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/first_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
+        android:id="@+id/continue_with_wpcom_button"
+        style="@style/Widget.LoginFlow.Button.Primary.Prologue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_extra_small"
         android:text="@string/continue_with_wpcom" />
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/second_button"
-        style="@style/Widget.LoginFlow.Button.Secondary"
+        android:id="@+id/enter_your_site_address_button"
+        style="@style/Widget.LoginFlow.Button.Secondary.Prologue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_small"
diff --git a/WordPress/src/main/res/layout/me_activity.xml b/WordPress/src/main/res/layout/me_activity.xml
index 1a47855c2520..85b29fb737d4 100644
--- a/WordPress/src/main/res/layout/me_activity.xml
+++ b/WordPress/src/main/res/layout/me_activity.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/coordinator"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="org.wordpress.android.ui.main.MeFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </FrameLayout>
diff --git a/WordPress/src/main/res/layout/mlp_editor_preview_toolbar.xml b/WordPress/src/main/res/layout/mlp_editor_preview_toolbar.xml
deleted file mode 100644
index c847f07372bd..000000000000
--- a/WordPress/src/main/res/layout/mlp_editor_preview_toolbar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/createPageButtonContainer"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:orientation="vertical"
-    android:visibility="gone">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/mlp_bottom_shadow_height"
-        android:background="@drawable/modal_layout_picker_bottom_shadow" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
-        android:paddingTop="@dimen/picker_bottom_button_vertical_margin">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/createPageButton"
-            style="@style/Widget.ModalLayoutPicker.Button.Primary"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
-            android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin"
-            android:layout_weight="1"
-            android:text="@string/mlp_create_page" />
-
-    </LinearLayout>
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_bottom_toolbar.xml b/WordPress/src/main/res/layout/modal_layout_picker_bottom_toolbar.xml
index 612c2dd4b2fb..e72a0a3ce0ad 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_bottom_toolbar.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_bottom_toolbar.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     android:gravity="center"
     android:orientation="horizontal"
     android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_categories_skeleton.xml b/WordPress/src/main/res/layout/modal_layout_picker_categories_skeleton.xml
index 6b9a0a5a1499..32d2f756390c 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_categories_skeleton.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_categories_skeleton.xml
@@ -4,7 +4,7 @@
     android:id="@+id/categoriesSkeleton"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mlp_categories_bar_height"
-    android:background="?attr/categoriesBackground"
+    android:background="?attr/layoutPickerBackground"
     android:paddingEnd="@dimen/mlp_layout_card_margin_end"
     android:paddingStart="@dimen/mlp_layout_card_margin_start">
 
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_error.xml b/WordPress/src/main/res/layout/modal_layout_picker_error.xml
index 251a9f782f5f..97f20eeedbc8 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_error.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_error.xml
@@ -4,7 +4,7 @@
     android:id="@+id/errorLayout"
     android:layout_width="match_parent"
     android:layout_height="@dimen/mlp_layouts_row_height"
-    android:background="?attr/categoriesBackground">
+    android:background="?attr/layoutPickerBackground">
 
     <org.wordpress.android.ui.ActionableEmptyView
         android:id="@+id/actionableEmptyView"
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_fragment.xml b/WordPress/src/main/res/layout/modal_layout_picker_fragment.xml
index 0b051ed38dac..430bdd40a139 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_fragment.xml
@@ -11,7 +11,7 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:fitsSystemWindows="false">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
@@ -32,7 +32,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:background="?attr/categoriesBackground"
+                android:background="?attr/layoutPickerBackground"
                 android:elevation="0dp"
                 app:layout_collapseMode="pin">
 
@@ -69,7 +69,7 @@
             android:id="@+id/categoriesRecyclerView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/mlp_categories_bar_height"
-            android:background="?attr/categoriesBackground"
+            android:background="?attr/layoutPickerBackground"
             android:clipToPadding="false"
             android:descendantFocusability="beforeDescendants"
             android:orientation="horizontal"
@@ -89,7 +89,7 @@
         android:id="@+id/layoutsRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/categoriesBackground"
+        android:background="?attr/layoutPickerBackground"
         android:layout_marginBottom="@dimen/toolbar_content_offset"
         android:clipToPadding="false"
         android:descendantFocusability="beforeDescendants"
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_card.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_card.xml
index f831b6f3cf27..e4ae2a8967d5 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_card.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_card.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_container"
     style="@style/LayoutCardView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
+    app:strokeColor="@color/accent_50"
     android:layout_marginEnd="@dimen/margin_extra_large"
     android:layout_marginTop="@dimen/margin_medium">
 
@@ -17,10 +19,12 @@
 
     <ImageView
         android:id="@+id/selected_overlay"
-        android:layout_width="@dimen/mlp_layout_card_width"
-        android:layout_height="@dimen/mlp_layout_card_height"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_layout_selection_overlay_153dp"
+        android:layout_gravity="top|end"
+        android:layout_marginTop="@dimen/margin_medium_large"
+        android:layout_marginEnd="@dimen/margin_medium_large"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_layout_selection_check_24dp"
         tools:ignore="ContentDescription" />
 
 </com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml b/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
index dd14fe391a29..795383146ef1 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_layouts_skeleton.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="@dimen/mlp_layouts_row_height"
     android:layout_marginTop="@dimen/margin_extra_large"
-    android:background="?attr/categoriesBackground">
+    android:background="?attr/layoutPickerBackground">
 
     <com.facebook.shimmer.ShimmerFrameLayout
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/modal_layout_picker_titlebar.xml b/WordPress/src/main/res/layout/modal_layout_picker_titlebar.xml
index c1039c8c4529..2774ab16d6c9 100644
--- a/WordPress/src/main/res/layout/modal_layout_picker_titlebar.xml
+++ b/WordPress/src/main/res/layout/modal_layout_picker_titlebar.xml
@@ -11,7 +11,7 @@
         android:backgroundTint="@color/transparent"
         android:contentDescription="@string/navigate_back_desc"
         android:src="@drawable/ic_arrow_left_white_24dp"
-        android:tint="?attr/colorControlNormal" />
+        android:tint="?attr/colorOnSurface" />
 
     <TextView
         android:id="@+id/title"
@@ -19,4 +19,14 @@
         android:layout_marginEnd="@dimen/margin_medium"
         android:text="@string/mlp_choose_layout_title"
         android:visibility="gone" />
+
+    <ImageButton
+        android:id="@+id/previewTypeSelectorButton"
+        style="@style/WebPreviewNavbarButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|end"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        android:contentDescription="@string/preview_type_desc"
+        android:src="@drawable/ic_devices_white_24dp" />
 </FrameLayout>
diff --git a/WordPress/src/main/res/layout/my_site_category_header_block.xml b/WordPress/src/main/res/layout/my_site_category_header_block.xml
new file mode 100644
index 000000000000..92d530c5ba83
--- /dev/null
+++ b/WordPress/src/main/res/layout/my_site_category_header_block.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.wordpress.android.widgets.WPTextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/MySiteListHeader"
+    android:id="@+id/category" />
diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml
index 7550589c10a4..b22081b342c3 100644
--- a/WordPress/src/main/res/layout/my_site_fragment.xml
+++ b/WordPress/src/main/res/layout/my_site_fragment.xml
@@ -152,7 +152,8 @@
                             <com.google.android.material.floatingactionbutton.FloatingActionButton
                                 android:id="@+id/quick_action_stats_button"
                                 style="@style/MySiteQuickActionButton"
-                                android:src="@drawable/ic_stats_alt_white_24dp" />
+                                android:src="@drawable/ic_stats_alt_white_24dp"
+                                android:contentDescription="@string/stats"/>
 
                             <org.wordpress.android.widgets.WPTextView
                                 style="@style/MySiteQuickActionButtonLabel"
@@ -166,23 +167,21 @@
                             android:layout_height="match_parent"
                             android:layout_weight="1" />
 
-                        <RelativeLayout
-                            android:id="@+id/quick_action_pages_container"
-                            style="@style/MySiteQuickActionButtonContainer">
+                        <RelativeLayout style="@style/MySiteQuickActionButtonContainer">
 
                             <com.google.android.material.floatingactionbutton.FloatingActionButton
-                                android:id="@+id/quick_action_pages_button"
+                                android:id="@+id/quick_action_posts_button"
                                 style="@style/MySiteQuickActionButton"
-                                android:src="@drawable/ic_pages_white_24dp" />
+                                android:src="@drawable/ic_posts_white_24dp"
+                                android:contentDescription="@string/posts"/>
 
                             <org.wordpress.android.widgets.WPTextView
                                 style="@style/MySiteQuickActionButtonLabel"
-                                android:layout_below="@+id/quick_action_pages_button"
-                                android:text="@string/pages" />
+                                android:layout_below="@+id/quick_action_posts_button"
+                                android:text="@string/posts" />
                         </RelativeLayout>
 
                         <Space
-                            android:id="@+id/middle_quick_action_spacing"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_weight="1" />
@@ -190,32 +189,37 @@
                         <RelativeLayout style="@style/MySiteQuickActionButtonContainer">
 
                             <com.google.android.material.floatingactionbutton.FloatingActionButton
-                                android:id="@+id/quick_action_posts_button"
+                                android:id="@+id/quick_action_media_button"
                                 style="@style/MySiteQuickActionButton"
-                                android:src="@drawable/ic_posts_white_24dp" />
+                                android:src="@drawable/ic_media_white_24dp"
+                                android:contentDescription="@string/media"/>
 
                             <org.wordpress.android.widgets.WPTextView
                                 style="@style/MySiteQuickActionButtonLabel"
-                                android:layout_below="@+id/quick_action_posts_button"
-                                android:text="@string/posts" />
+                                android:layout_below="@+id/quick_action_media_button"
+                                android:text="@string/media" />
                         </RelativeLayout>
 
                         <Space
+                            android:id="@+id/middle_quick_action_spacing"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
                             android:layout_weight="1" />
 
-                        <RelativeLayout style="@style/MySiteQuickActionButtonContainer">
+                        <RelativeLayout
+                            android:id="@+id/quick_action_pages_container"
+                            style="@style/MySiteQuickActionButtonContainer">
 
                             <com.google.android.material.floatingactionbutton.FloatingActionButton
-                                android:id="@+id/quick_action_media_button"
+                                android:id="@+id/quick_action_pages_button"
                                 style="@style/MySiteQuickActionButton"
-                                android:src="@drawable/ic_media_white_24dp" />
+                                android:src="@drawable/ic_pages_white_24dp"
+                                android:contentDescription="@string/pages"/>
 
                             <org.wordpress.android.widgets.WPTextView
                                 style="@style/MySiteQuickActionButtonLabel"
-                                android:layout_below="@+id/quick_action_media_button"
-                                android:text="@string/media" />
+                                android:layout_below="@+id/quick_action_pages_button"
+                                android:text="@string/pages" />
                         </RelativeLayout>
 
                     </LinearLayout>
@@ -309,7 +313,7 @@
                                 <ImageView
                                     android:id="@+id/quick_start_grow_icon"
                                     style="@style/QuickStartTypeIcon"
-                                    android:background="@drawable/bg_oval_pink_50_multiple_users_white_40dp_selector"
+                                    android:background="@drawable/bg_oval_blue_50_multiple_users_white_40dp_selector"
                                     android:importantForAccessibility="no" />
 
                                 <com.google.android.material.textview.MaterialTextView
@@ -372,6 +376,39 @@
 
                     </com.google.android.material.card.MaterialCardView>
 
+                    <!--Plan-->
+                    <LinearLayout
+                        android:id="@+id/row_plan"
+                        style="@style/MySiteListRowLayout">
+
+                        <ImageView
+                            android:id="@+id/my_site_plan_icon"
+                            style="@style/MySiteListRowIcon"
+                            android:importantForAccessibility="no"
+                            android:src="@drawable/ic_plans_white_24dp" />
+
+                        <org.wordpress.android.widgets.WPTextView
+                            android:id="@+id/my_site_plan_text_view"
+                            style="@style/MySiteListRowTextView"
+                            android:text="@string/plan" />
+
+                        <org.wordpress.android.widgets.WPTextView
+                            android:id="@+id/my_site_current_plan_text_view"
+                            style="@style/MySiteListRowSecondaryTextView"
+                            android:gravity="end"
+                            android:paddingStart="0dp"
+                            android:text="@string/plan"
+                            android:textAlignment="viewEnd"
+                            tools:ignore="RtlSymmetry" />
+
+                    </LinearLayout>
+
+                    <!--Jetpack-->
+                    <org.wordpress.android.widgets.WPTextView
+                        android:id="@+id/row_label_jetpack"
+                        style="@style/MySiteListHeader"
+                        android:text="@string/my_site_header_jetpack" />
+
                     <!--Stats-->
                     <LinearLayout
                         android:id="@+id/row_stats"
@@ -399,83 +436,76 @@
                             android:id="@+id/my_site_activity_log_icon"
                             style="@style/MySiteListRowIcon"
                             android:importantForAccessibility="no"
-                            android:src="@drawable/ic_history_alt_white_24dp" />
+                            android:src="@drawable/ic_gridicons_clipboard_white_24dp" />
 
                         <org.wordpress.android.widgets.WPTextView
                             android:id="@+id/my_site_activity_log_text_view"
                             style="@style/MySiteListRowTextView"
-                            android:text="@string/activity" />
+                            android:text="@string/activity_log" />
 
                     </LinearLayout>
 
-                    <!--Scan-->
+                    <!--Backup-->
                     <LinearLayout
-                        android:id="@+id/row_scan"
+                        android:id="@+id/row_backup"
+                        android:visibility="gone"
                         style="@style/MySiteListRowLayout">
 
                         <ImageView
-                            android:id="@+id/my_site_scan_icon"
+                            android:id="@+id/my_site_backup_icon"
                             style="@style/MySiteListRowIcon"
                             android:importantForAccessibility="no"
-                            android:src="@drawable/ic_scan_alt_white_24dp" />
+                            android:src="@drawable/ic_gridicons_cloud_upload_white_24dp" />
 
                         <org.wordpress.android.widgets.WPTextView
-                            android:id="@+id/my_site_scan_text_view"
+                            android:id="@+id/my_site_backup_text_view"
                             style="@style/MySiteListRowTextView"
-                            android:text="@string/scan" />
+                            android:text="@string/backup" />
 
                     </LinearLayout>
 
-                    <!--Plan-->
+                    <!--Scan-->
                     <LinearLayout
-                        android:id="@+id/row_plan"
+                        android:id="@+id/row_scan"
+                        android:visibility="gone"
                         style="@style/MySiteListRowLayout">
 
                         <ImageView
-                            android:id="@+id/my_site_plan_icon"
+                            android:id="@+id/my_site_scan_icon"
                             style="@style/MySiteListRowIcon"
                             android:importantForAccessibility="no"
-                            android:src="@drawable/ic_plans_white_24dp" />
+                            android:src="@drawable/ic_baseline_security_white_24dp" />
 
                         <org.wordpress.android.widgets.WPTextView
-                            android:id="@+id/my_site_plan_text_view"
+                            android:id="@+id/my_site_scan_text_view"
                             style="@style/MySiteListRowTextView"
-                            android:text="@string/plan" />
-
-                        <org.wordpress.android.widgets.WPTextView
-                            android:id="@+id/my_site_current_plan_text_view"
-                            style="@style/MySiteListRowSecondaryTextView"
-                            android:gravity="end"
-                            android:paddingStart="0dp"
-                            android:text="@string/plan"
-                            android:textAlignment="viewEnd"
-                            tools:ignore="RtlSymmetry" />
+                            android:text="@string/scan" />
 
                     </LinearLayout>
 
-                    <!--Publish-->
-                    <org.wordpress.android.widgets.WPTextView
-                        style="@style/MySiteListHeader"
-                        android:text="@string/my_site_header_publish" />
-
-                    <!--Pages-->
+                    <!--Jetpack Settings-->
                     <LinearLayout
-                        android:id="@+id/row_pages"
+                        android:id="@+id/row_jetpack_settings"
                         style="@style/MySiteListRowLayout">
 
                         <ImageView
-                            android:id="@+id/my_site_pages_icon"
+                            android:id="@+id/my_site_jetpack_settings_icon"
                             style="@style/MySiteListRowIcon"
                             android:importantForAccessibility="no"
-                            android:src="@drawable/ic_pages_white_24dp" />
+                            android:src="@drawable/ic_cog_white_24dp" />
 
                         <org.wordpress.android.widgets.WPTextView
-                            android:id="@+id/my_site_pages_text_view"
+                            android:id="@+id/my_site_jetpack_settings_text_view"
                             style="@style/MySiteListRowTextView"
-                            android:text="@string/my_site_btn_site_pages" />
+                            android:text="@string/my_site_btn_jetpack_settings" />
 
                     </LinearLayout>
 
+                    <!--Publish-->
+                    <org.wordpress.android.widgets.WPTextView
+                        style="@style/MySiteListHeader"
+                        android:text="@string/my_site_header_publish" />
+
                     <!--Blog Posts-->
                     <LinearLayout
                         android:id="@+id/row_blog_posts"
@@ -512,6 +542,24 @@
 
                     </LinearLayout>
 
+                    <!--Pages-->
+                    <LinearLayout
+                        android:id="@+id/row_pages"
+                        style="@style/MySiteListRowLayout">
+
+                        <ImageView
+                            android:id="@+id/my_site_pages_icon"
+                            style="@style/MySiteListRowIcon"
+                            android:importantForAccessibility="no"
+                            android:src="@drawable/ic_pages_white_24dp" />
+
+                        <org.wordpress.android.widgets.WPTextView
+                            android:id="@+id/my_site_pages_text_view"
+                            style="@style/MySiteListRowTextView"
+                            android:text="@string/my_site_btn_site_pages" />
+
+                    </LinearLayout>
+
                     <!--Comments-->
                     <LinearLayout
                         android:id="@+id/row_comments"
@@ -672,7 +720,7 @@
                             android:id="@+id/my_site_view_admin_icon"
                             style="@style/MySiteListRowIcon"
                             android:importantForAccessibility="no"
-                            android:src="@drawable/ic_my_sites_white_24dp" />
+                            android:src="@drawable/ic_wordpress_white_24dp" />
 
                         <org.wordpress.android.widgets.WPTextView
                             android:id="@+id/my_site_view_admin_text_view"
diff --git a/WordPress/src/main/res/layout/my_site_info_block.xml b/WordPress/src/main/res/layout/my_site_info_block.xml
new file mode 100644
index 000000000000..d339a926d012
--- /dev/null
+++ b/WordPress/src/main/res/layout/my_site_info_block.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="@dimen/margin_medium"
+    android:paddingEnd="@dimen/margin_medium_large"
+    tools:ignore="RtlSymmetry">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/blavatar_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="@dimen/content_margin_site_row_start"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:layout_marginBottom="@dimen/margin_extra_medium_large"
+        app:cardCornerRadius="@dimen/my_site_blavatar_container_corner_radius"
+        app:cardElevation="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/on_surface_emphasis_lowest"
+        app:strokeWidth="@dimen/my_site_blavatar_container_border_width">
+
+        <com.google.android.material.card.MaterialCardView
+            android:layout_width="@dimen/my_site_blavatar_sz"
+            android:layout_height="@dimen/my_site_blavatar_sz"
+            app:cardCornerRadius="@dimen/my_site_blavatar_corner_radius"
+            app:cardElevation="0dp">
+
+            <ImageView
+                android:id="@+id/my_site_blavatar"
+                style="@style/MySiteBlavatarImageView"
+                android:layout_width="@dimen/my_site_blavatar_sz"
+                android:layout_height="@dimen/my_site_blavatar_sz"
+                android:contentDescription="@string/my_site_icon_content_description"
+                android:foreground="?attr/selectableItemBackgroundBorderless"
+                android:gravity="center_vertical"
+                tools:ignore="UnusedAttribute"
+                tools:src="@drawable/bg_rectangle_placeholder_globe_32dp" />
+
+            <ProgressBar
+                android:id="@+id/my_site_icon_progress"
+                android:layout_width="@dimen/my_site_blavatar_sz"
+                android:layout_height="@dimen/my_site_blavatar_sz"
+                android:layout_centerVertical="true"
+                android:layout_marginEnd="@dimen/margin_large"
+                android:gravity="center_vertical"
+                android:indeterminate="true"
+                android:visibility="gone" />
+        </com.google.android.material.card.MaterialCardView>
+    </com.google.android.material.card.MaterialCardView>
+
+    <org.wordpress.android.widgets.QuickStartFocusPoint
+        android:id="@+id/quick_start_icon_focus_point"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:size="small"
+        android:translationX="@dimen/quick_start_focus_point_small_offset_negative"
+        android:translationY="@dimen/quick_start_focus_point_small_offset_negative"
+        android:elevation="@dimen/quick_start_focus_point_elevation"
+        android:layout_gravity="center_vertical|center"
+        android:contentDescription="@string/quick_start_focus_point_description"
+        app:layout_constraintStart_toStartOf="@id/blavatar_container"
+        app:layout_constraintTop_toTopOf="@id/blavatar_container"
+        tools:ignore="RtlSymmetry"/>
+
+    <org.wordpress.android.widgets.MySiteTitleAndSubtitleLabelView
+        android:id="@+id/site_info_container"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/my_site_blavatar_sz"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/switch_site"
+        app:layout_constraintStart_toEndOf="@id/blavatar_container"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <org.wordpress.android.widgets.QuickStartFocusPoint
+        android:id="@+id/quick_start_title_focus_point"
+        android:layout_width="@dimen/quick_start_focus_point_size"
+        android:layout_height="@dimen/quick_start_focus_point_size"
+        android:elevation="@dimen/quick_start_focus_point_elevation"
+        android:layout_gravity="center_vertical|center"
+        android:contentDescription="@string/quick_start_focus_point_description"
+        app:layout_constraintEnd_toEndOf="@id/site_info_container"
+        app:layout_constraintTop_toTopOf="@id/site_info_container"
+        tools:ignore="RtlSymmetry"/>
+
+    <ImageButton
+        android:id="@+id/switch_site"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_small"
+        android:background="@drawable/ripple_oval"
+        android:contentDescription="@string/my_site_btn_switch_site"
+        android:padding="@dimen/margin_large"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:src="@drawable/ic_chevron_down_white_24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?attr/wpColorOnSurfaceMedium" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/my_site_item_block.xml b/WordPress/src/main/res/layout/my_site_item_block.xml
new file mode 100644
index 000000000000..d3dc155d7fde
--- /dev/null
+++ b/WordPress/src/main/res/layout/my_site_item_block.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?><!--Publish-->
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/MySiteListRowLayout"
+    android:gravity="center_vertical">
+
+    <ImageView
+        android:id="@+id/my_site_item_primary_icon"
+        style="@style/UpdatedMySiteListRowIcon"
+        android:layout_marginBottom="@dimen/margin_large"
+        android:layout_marginEnd="@dimen/my_site_list_row_icon_margin_right"
+        android:layout_marginTop="@dimen/margin_large"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/my_site_item_primary_text"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@drawable/ic_plans_white_24dp" />
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/my_site_item_primary_text"
+        style="@style/UpdatedMySiteListRowTextView"
+        android:layout_marginBottom="@dimen/margin_large"
+        android:layout_marginTop="@dimen/margin_large"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/my_site_item_secondary_icon"
+        app:layout_constraintStart_toEndOf="@+id/my_site_item_primary_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/plan" />
+    <ImageView
+        android:id="@+id/my_site_item_secondary_icon"
+        style="@style/MySiteListRowSecondaryIcon"
+        android:layout_marginStart="@dimen/margin_medium"
+        android:importantForAccessibility="no"
+        android:src="@drawable/ic_external_white_24dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/guideline2"
+        app:layout_constraintStart_toEndOf="@+id/my_site_item_primary_text"/>
+    <org.wordpress.android.widgets.QuickStartFocusPoint
+        android:id="@+id/my_site_item_quick_start_focus_point"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|center"
+        android:contentDescription="@string/quick_start_focus_point_description"
+        android:elevation="@dimen/quick_start_focus_point_elevation"
+        android:gravity="end"
+        android:textAlignment="viewEnd"
+        android:layout_marginEnd="@dimen/design_fab_size"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:size="small" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" />
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/my_site_item_secondary_text"
+        style="@style/MySiteListRowSecondaryTextView"
+        android:layout_marginEnd="32dp"
+        android:paddingEnd="0dp"
+        android:paddingStart="0dp"
+        android:textAlignment="viewEnd"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/guideline2"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/plan" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/navbar_item.xml b/WordPress/src/main/res/layout/navbar_item.xml
index ef628f96212a..be1dea967da9 100644
--- a/WordPress/src/main/res/layout/navbar_item.xml
+++ b/WordPress/src/main/res/layout/navbar_item.xml
@@ -23,11 +23,11 @@
             tools:src="@drawable/ic_create_white_24dp" />
 
         <View
-            android:id="@+id/badge"
+            android:id="@+id/nav_badge"
             android:layout_width="@dimen/bottom_nav_bar_badge_size"
             android:layout_height="@dimen/bottom_nav_bar_badge_size"
             android:layout_gravity="top"
-            android:background="@drawable/bg_oval_accent_stroke_white"
+            android:background="@drawable/bg_nav_badge"
             android:visibility="gone"
             tools:visibility="visible" />
 
diff --git a/WordPress/src/main/res/layout/new_edit_post_activity.xml b/WordPress/src/main/res/layout/new_edit_post_activity.xml
index 5f173a1ae5a7..756c86114851 100644
--- a/WordPress/src/main/res/layout/new_edit_post_activity.xml
+++ b/WordPress/src/main/res/layout/new_edit_post_activity.xml
@@ -60,5 +60,4 @@
 
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-    <include layout="@layout/mlp_editor_preview_toolbar"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/new_my_site_fragment.xml b/WordPress/src/main/res/layout/new_my_site_fragment.xml
new file mode 100644
index 000000000000..9e0ba700fae8
--- /dev/null
+++ b/WordPress/src/main/res/layout/new_my_site_fragment.xml
@@ -0,0 +1,64 @@
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/prominent_toolbar_height"
+        android:fitsSystemWindows="true"
+        app:liftOnScroll="false">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsing_toolbar"
+            style="@style/WordPress.CollapsedToolbarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:title="@string/my_site_section_screen_title">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar_main"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:layout_collapseMode="pin"
+                app:theme="@style/WordPress.ActionBar" />
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/recycler_view_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingBottom="@dimen/my_site_bottom_spacing"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintWidth_max="@dimen/my_site_content_area" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/actionable_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/toolbar_height"
+        android:visibility="gone"
+        app:aevButton="@string/my_site_add_new_site"
+        app:aevImage="@drawable/img_illustration_site_wordpress_camera_pencils_226dp"
+        app:aevSubtitle="@string/my_site_create_new_site"
+        app:aevTitle="@string/my_site_create_new_site_title"
+        tools:visibility="visible" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/note_block_basic.xml b/WordPress/src/main/res/layout/note_block_basic.xml
index caf8475095e0..aa4c92bf26f7 100644
--- a/WordPress/src/main/res/layout/note_block_basic.xml
+++ b/WordPress/src/main/res/layout/note_block_basic.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:layout_gravity="center"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,6 +33,18 @@
             android:text="@string/comment_read_source_post"
             android:textColor="@color/primary_40"
             android:visibility="gone"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/note_material_button"
+            style="@style/WordPress.Button.Primary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:text="@string/comment_read_source_post"
+            android:visibility="gone"/>
     </LinearLayout>
 
     <View
diff --git a/WordPress/src/main/res/layout/notifications_detail_activity.xml b/WordPress/src/main/res/layout/notifications_detail_activity.xml
index 386e0634571d..09298cae7368 100644
--- a/WordPress/src/main/res/layout/notifications_detail_activity.xml
+++ b/WordPress/src/main/res/layout/notifications_detail_activity.xml
@@ -33,4 +33,14 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         tools:visibility="visible" />
 
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/confetti"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="top"
+        app:lottie_rawRes="@raw/confetti"
+        android:scaleType="centerCrop"
+        app:lottie_autoPlay="false"
+        app:lottie_loop="false"/>
+
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/notifications_list_item.xml b/WordPress/src/main/res/layout/notifications_list_item.xml
index 27421a804644..4f2a38b62c9e 100644
--- a/WordPress/src/main/res/layout/notifications_list_item.xml
+++ b/WordPress/src/main/res/layout/notifications_list_item.xml
@@ -51,7 +51,7 @@
                 android:layout_marginEnd="@dimen/activity_log_icon_margin"
                 android:layout_marginTop="@dimen/margin_small"
                 android:contentDescription="@null"
-                app:badgeBackground="@drawable/bg_oval_primary"
+                app:badgeBackground="@drawable/bg_note_avatar_badge"
                 app:badgeBackgroundBorderWidth="@dimen/notification_icon_bg_border_width"
                 app:badgeBackgroundSize="@dimen/note_icon_sz"
                 app:badgeHorizontalOffset="@dimen/notifications_note_icon_horizontal_offset"
diff --git a/WordPress/src/main/res/layout/notifications_settings_activity.xml b/WordPress/src/main/res/layout/notifications_settings_activity.xml
index 2241a56c71d4..0feb9d185fcf 100644
--- a/WordPress/src/main/res/layout/notifications_settings_activity.xml
+++ b/WordPress/src/main/res/layout/notifications_settings_activity.xml
@@ -27,16 +27,16 @@
                 android:focusableInTouchMode="true"
                 app:theme="@style/WordPress.ActionBar" />
 
-            <org.wordpress.android.ui.prefs.notifications.PrefMasterSwitchToolbarView
-                android:id="@+id/master_switch"
+            <org.wordpress.android.ui.prefs.notifications.PrefMainSwitchToolbarView
+                android:id="@+id/main_switch"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/toolbar_height"
 
-                app:masterContentDescription="@string/notification_settings_switch_desc"
-                app:masterHintOff="@string/notification_settings_master_hint_off"
-                app:masterHintOn="@string/notification_settings_master_hint_on"
-                app:masterTitleOff="@string/notification_settings_master_status_off"
-                app:masterTitleOn="@string/notification_settings_master_status_on" />
+                app:mainContentDescription="@string/notification_settings_switch_desc"
+                app:mainHintOff="@string/notification_settings_main_hint_off"
+                app:mainHintOn="@string/notification_settings_main_hint_on"
+                app:mainTitleOff="@string/notification_settings_main_status_off"
+                app:mainTitleOn="@string/notification_settings_main_status_on" />
 
 
         </LinearLayout>
@@ -70,7 +70,7 @@
                 android:layout_marginTop="@dimen/margin_extra_medium_large"
                 android:paddingStart="@dimen/toolbar_content_offset"
                 android:paddingEnd="@dimen/margin_extra_large"
-                android:text="@string/notification_settings_master_off_title" />
+                android:text="@string/notification_settings_main_off_title" />
 
             <TextView
                 style="@style/TextAppearance.AppCompat.Body1"
@@ -80,7 +80,7 @@
                 android:layout_marginBottom="@dimen/margin_extra_large"
                 android:paddingStart="@dimen/toolbar_content_offset"
                 android:paddingEnd="@dimen/margin_extra_large"
-                android:text="@string/notification_settings_master_off_message" />
+                android:text="@string/notification_settings_main_off_message" />
 
         </LinearLayout>
 
diff --git a/WordPress/src/main/res/layout/notifications_tab_disabled_text_layout.xml b/WordPress/src/main/res/layout/notifications_tab_disabled_text_layout.xml
index 7598a642aa0e..ee847e8f105d 100644
--- a/WordPress/src/main/res/layout/notifications_tab_disabled_text_layout.xml
+++ b/WordPress/src/main/res/layout/notifications_tab_disabled_text_layout.xml
@@ -15,7 +15,7 @@
         android:layout_marginTop="@dimen/margin_extra_large"
         android:paddingStart="@dimen/notifications_tab_dialog_toolbar_content_offset"
         android:paddingEnd="@dimen/margin_extra_large"
-        android:text="@string/notifications_tab_dialog_master_off_title"
+        android:text="@string/notifications_tab_dialog_main_off_title"
         android:textAppearance="?attr/textAppearanceSubtitle1" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -25,7 +25,7 @@
         android:layout_marginBottom="@dimen/margin_extra_large"
         android:paddingStart="@dimen/notifications_tab_dialog_toolbar_content_offset"
         android:paddingEnd="@dimen/margin_extra_large"
-        android:text="@string/notifications_tab_dialog_master_off_message"
+        android:text="@string/notifications_tab_dialog_main_off_message"
         android:textAppearance="?attr/textAppearanceBody2" />
 
     <View
diff --git a/WordPress/src/main/res/layout/notifications_tab_for_blog_title_layout.xml b/WordPress/src/main/res/layout/notifications_tab_for_blog_title_layout.xml
index 62ce642796cb..ee79db3697a6 100644
--- a/WordPress/src/main/res/layout/notifications_tab_for_blog_title_layout.xml
+++ b/WordPress/src/main/res/layout/notifications_tab_for_blog_title_layout.xml
@@ -8,18 +8,18 @@
 
     <include layout="@layout/preference_dialog_title" />
 
-    <org.wordpress.android.ui.prefs.notifications.PrefMasterSwitchToolbarView
-        android:id="@+id/master_switch"
+    <org.wordpress.android.ui.prefs.notifications.PrefMainSwitchToolbarView
+        android:id="@+id/main_switch"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:masterContentDescription="@string/notifications_tab_dialog_switch_desc"
-        app:masterContentInsetStart="@dimen/notifications_tab_dialog_toolbar_content_offset"
-        app:masterHintOff="@string/notifications_tab_dialog_master_hint_off"
-        app:masterHintOn="@string/notifications_tab_dialog_master_hint_on"
-        app:masterOffsetEnd="@dimen/notifications_tab_dialog_toolbar_content_offset"
-        app:masterTitleOff="@string/notifications_tab_dialog_master_status_off"
-        app:masterTitleOn="@string/notifications_tab_dialog_master_status_on"
-        app:masterViewStyle="normal" />
+        app:mainContentDescription="@string/notifications_tab_dialog_switch_desc"
+        app:mainContentInsetStart="@dimen/notifications_tab_dialog_toolbar_content_offset"
+        app:mainHintOff="@string/notifications_tab_dialog_main_hint_off"
+        app:mainHintOn="@string/notifications_tab_dialog_main_hint_on"
+        app:mainOffsetEnd="@dimen/notifications_tab_dialog_toolbar_content_offset"
+        app:mainTitleOff="@string/notifications_tab_dialog_main_status_off"
+        app:mainTitleOn="@string/notifications_tab_dialog_main_status_on"
+        app:mainViewStyle="normal" />
 
 </LinearLayout>
 
diff --git a/WordPress/src/main/res/layout/number_picker_dialog.xml b/WordPress/src/main/res/layout/number_picker_dialog.xml
index 9fc9b363c56f..ca67d4568945 100644
--- a/WordPress/src/main/res/layout/number_picker_dialog.xml
+++ b/WordPress/src/main/res/layout/number_picker_dialog.xml
@@ -13,8 +13,7 @@
         android:layout_marginEnd="24dp"
         android:gravity="start"
         android:textAlignment="viewStart"
-        android:textAppearance="?attr/textAppearanceSubtitle1"
-        android:theme="@style/SwitchBlueMedium" />
+        android:textAppearance="?attr/textAppearanceSubtitle1" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/number_picker_text"
diff --git a/WordPress/src/main/res/layout/page_list_item.xml b/WordPress/src/main/res/layout/page_list_item.xml
index 1783f1837355..ea46316e87ce 100644
--- a/WordPress/src/main/res/layout/page_list_item.xml
+++ b/WordPress/src/main/res/layout/page_list_item.xml
@@ -52,11 +52,41 @@
             android:textColor="?attr/wpColorOnSurfaceMedium"
             app:layout_goneMarginBottom="@dimen/margin_large"
             app:layout_constraintBottom_toTopOf="@+id/labels"
-            app:layout_constraintEnd_toStartOf="@+id/featured_image"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/page_title"
-            tools:text="99 days ago • Eulah Kuvalis"/>
+            tools:text="99 days ago • Eulah Kuvalis •" />
+
+        <ImageView
+            android:id="@+id/page_subtitle_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            app:layout_constraintBottom_toTopOf="@+id/labels"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@+id/page_subtitle"
+            app:layout_constraintTop_toBottomOf="@+id/page_title"
+            app:layout_goneMarginBottom="@dimen/margin_large"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_posts_16dp" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/page_subtitle_suffix"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginTop="@dimen/margin_extra_small"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="?attr/wpColorOnSurfaceMedium"
+            app:layout_constraintBottom_toTopOf="@+id/labels"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@+id/page_subtitle_icon"
+            app:layout_constraintEnd_toStartOf="@+id/featured_image"
+            app:layout_constraintTop_toBottomOf="@+id/page_title"
+            app:layout_goneMarginBottom="@dimen/margin_large"
+            tools:text="@string/site_settings_posts_page" />
 
         <ImageView
             android:id="@+id/featured_image"
diff --git a/WordPress/src/main/res/layout/pages_activity.xml b/WordPress/src/main/res/layout/pages_activity.xml
index 9e0449140835..edecb0fa4bea 100644
--- a/WordPress/src/main/res/layout/pages_activity.xml
+++ b/WordPress/src/main/res/layout/pages_activity.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="org.wordpress.android.ui.pages.PagesFragment"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/pages_fragment.xml b/WordPress/src/main/res/layout/pages_fragment.xml
index 604bca1013af..4c0b287c4833 100644
--- a/WordPress/src/main/res/layout/pages_fragment.xml
+++ b/WordPress/src/main/res/layout/pages_fragment.xml
@@ -9,7 +9,8 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:clipChildren="false">
 
         <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
             android:id="@+id/pullToRefresh"
@@ -89,17 +90,26 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/newPageButton"
+        <FrameLayout
+            android:id="@+id/fab_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|bottom"
             android:layout_marginBottom="@dimen/fab_margin"
             android:layout_marginEnd="@dimen/fab_margin"
-            android:contentDescription="@string/fab_create_desc"
-            android:src="@drawable/ic_create_white_24dp"
-            android:visibility="gone"
-            app:borderWidth="0dp" />
+            android:clipChildren="false"
+            android:clipToPadding="false"
+            app:layout_dodgeInsetEdges="bottom">
+
+            <com.google.android.material.floatingactionbutton.FloatingActionButton
+                android:id="@+id/newPageButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/fab_create_desc"
+                android:src="@drawable/ic_create_white_24dp"
+                android:visibility="gone"
+                app:borderWidth="0dp" />
+        </FrameLayout>
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/WordPress/src/main/res/layout/pages_list_fragment.xml b/WordPress/src/main/res/layout/pages_list_fragment.xml
index 9a36f58dbaba..4cd91bc71632 100644
--- a/WordPress/src/main/res/layout/pages_list_fragment.xml
+++ b/WordPress/src/main/res/layout/pages_list_fragment.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:id="@+id/page_list_layout">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
diff --git a/WordPress/src/main/res/layout/pages_parent_activity.xml b/WordPress/src/main/res/layout/pages_parent_activity.xml
index 9505923de545..c30ca54440bd 100644
--- a/WordPress/src/main/res/layout/pages_parent_activity.xml
+++ b/WordPress/src/main/res/layout/pages_parent_activity.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/toolbar_main" />
+    <include android:id="@+id/toolbar" layout="@layout/toolbar_main" />
 
     <fragment
         android:id="@+id/fragment_container"
diff --git a/WordPress/src/main/res/layout/people_invite_fragment.xml b/WordPress/src/main/res/layout/people_invite_fragment.xml
index ee93018733b0..d9778aab9ee5 100644
--- a/WordPress/src/main/res/layout/people_invite_fragment.xml
+++ b/WordPress/src/main/res/layout/people_invite_fragment.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/coordinator_layout"
@@ -28,8 +29,6 @@
         android:clipToPadding="false"
         android:fillViewport="true"
         android:focusable="true"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
         android:id="@+id/nested_scroll_view"
         android:scrollbarStyle="outsideInset"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
@@ -39,167 +38,269 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/usernames_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_large"
-                android:labelFor="@+id/invite_usernames"
-                android:text="@string/invite_names_title"
-                android:textAppearance="?attr/textAppearanceSubtitle1" />
-
             <LinearLayout
-                android:id="@+id/usernames_container"
+                android:id="@+id/invite_people_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="@dimen/margin_extra_large"
-                android:animateLayoutChanges="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingStart="@dimen/margin_extra_large"
+                android:paddingEnd="@dimen/margin_extra_large">
 
-                <org.wordpress.android.widgets.FlowLayout
-                    android:id="@+id/usernames"
+                <LinearLayout
+                    android:id="@+id/usernames_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_large"
+                    android:layout_marginBottom="@dimen/margin_extra_large"
                     android:animateLayoutChanges="true"
-                    android:background="@drawable/invites_border"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="2dp"
-                    android:paddingBottom="@dimen/margin_large">
+                    android:orientation="vertical">
 
-                    <org.wordpress.android.widgets.MultiUsernameEditText
-                        android:id="@+id/invite_usernames"
-                        android:layout_width="wrap_content"
+                    <org.wordpress.android.ui.people.WPEditTextWithChipsOutlined
+                        android:id="@+id/user_names_emails"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@android:color/transparent"
-                        android:gravity="start"
-                        android:imeOptions="actionDone"
-                        android:inputType="text"
-                        android:minWidth="40dp"
-                        android:paddingStart="@dimen/margin_medium"
-                        android:paddingTop="@dimen/margin_large"
-                        android:paddingEnd="@dimen/margin_medium"
-                        android:paddingBottom="0dp"
-                        android:singleLine="true"
-                        android:textAlignment="viewStart"
-                        android:textAppearance="?attr/textAppearanceBody2"
-                        tools:text="username 1" />
-                </org.wordpress.android.widgets.FlowLayout>
+                        app:wpHint="@string/invite_names_title"
+                        app:wpChipifyEnabled="true"
+                        app:wpMaxNumberChips="10"/>
 
-                <org.wordpress.android.widgets.WPTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:padding="5dp"
-                    android:text="@string/invite_message_usernames_limit"
-                    android:textAppearance="?attr/textAppearanceCaption"
-                    android:textStyle="italic" />
+                    <org.wordpress.android.widgets.WPTextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="@dimen/margin_large"
+                        android:paddingEnd="@dimen/margin_large"
+                        android:text="@string/invite_message_usernames_limit"
+                        android:textAppearance="?attr/textAppearanceCaption" />
 
-                <LinearLayout
-                    android:id="@+id/username_errors_container"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="5dp"
-                    android:animateLayoutChanges="true"
-                    android:orientation="vertical" />
-            </LinearLayout>
+                    <LinearLayout
+                        android:id="@+id/username_errors_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/people_default_margin_top"
+                        android:animateLayoutChanges="true"
+                        android:orientation="vertical" />
 
-            <LinearLayout
-                android:id="@+id/role_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_medium"
-                android:layout_marginBottom="@dimen/margin_extra_large"
-                android:orientation="vertical">
+                </LinearLayout>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_marginTop="@dimen/margin_medium"
+                    android:layout_marginBottom="@dimen/margin_extra_large"
+                    android:orientation="vertical">
 
-                    <org.wordpress.android.widgets.WPTextView
-                        android:layout_width="0dp"
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/role_container"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:ellipsize="end"
-                        android:gravity="center_vertical"
-                        android:labelFor="@+id/role"
-                        android:text="@string/role"
-                        android:textAppearance="?attr/textAppearanceSubtitle1"
-                        tools:text="@string/role" />
-
-                    <ImageView
-                        android:id="@+id/imgRoleInfo"
+                        android:hint="@string/role"
+                        app:hintAnimationEnabled="false"
+                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu">
+
+                        <AutoCompleteTextView
+                            android:id="@+id/role"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:inputType="none"
+                            android:cursorVisible="false"
+                            android:ellipsize="end" />
+
+                    </com.google.android.material.textfield.TextInputLayout>
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/learn_more"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:text="@string/people_learn_more_about_roles"
                         android:contentDescription="@string/people_invite_role_info_desc"
-                        android:paddingStart="@dimen/margin_small"
-                        android:paddingEnd="@dimen/margin_small"
-                        android:src="@drawable/ic_info_outline_white_24dp"
-                        app:tint="?attr/wpColorOnSurfaceMedium" />
+                        android:paddingTop="@dimen/margin_extra_small"
+                        android:paddingBottom="@dimen/margin_extra_small"
+                        android:paddingStart="@dimen/margin_large"
+                        android:paddingEnd="@dimen/margin_large"
+                        android:background="?android:selectableItemBackground"
+                        android:gravity="center_vertical|start"
+                        android:textAlignment="viewStart"
+                        android:textAppearance="?attr/textAppearanceCaption"
+                        android:textColor="?attr/colorPrimary"/>
+
                 </LinearLayout>
 
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/message_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/margin_medium"
+                    android:hint="@string/invite_message_title"
+                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                    android:textAlignment="viewStart"
+                    app:counterEnabled="true"
+                    app:counterMaxLength="@integer/invite_message_char_limit">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:id="@+id/message"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="top"
+                        android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
+                        android:maxLength="@integer/invite_message_char_limit"
+                        android:minLines="4" />
+
+                </com.google.android.material.textfield.TextInputLayout>
+
                 <org.wordpress.android.widgets.WPTextView
-                    android:id="@+id/role"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/message_info"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="1dp"
-                    android:layout_marginTop="5dp"
-                    android:drawableEnd="@drawable/ic_dropdown_primary_30_24dp"
-                    android:drawableTint="?attr/colorPrimary"
-                    android:ellipsize="end"
-                    android:gravity="center_vertical"
-                    android:maxLines="1"
-                    android:textAppearance="?attr/textAppearanceBody2"
-                    tools:text="@string/role" />
+                    android:paddingStart="@dimen/margin_large"
+                    android:paddingEnd="@dimen/margin_large"
+                    android:paddingBottom="@dimen/margin_extra_medium_large"
+                    android:text="@string/people_optional_custom_message_helper_text"
+                    android:textAppearance="?attr/textAppearanceCaption" />
 
             </LinearLayout>
 
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/message_title"
+            <LinearLayout
+                android:id="@+id/invite_links_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/margin_medium"
-                android:labelFor="@+id/message"
-                android:text="@string/invite_message_title"
-                android:textAppearance="?attr/textAppearanceSubtitle1" />
+                android:orientation="vertical"
+                android:visibility="visible"
+                tools:visibility="visible"
+                android:animateLayoutChanges="true">
 
-            <RelativeLayout
-                android:id="@+id/message_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:background="@drawable/invites_border"
-                android:padding="2dp">
+                <View
+                    android:id="@+id/divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_size"
+                    android:layout_marginBottom="@dimen/margin_extra_medium_large"
+                    android:background="?android:attr/listDivider" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?attr/textAppearanceSubtitle2"
+                    android:text="@string/invite_links_section_title"
+                    android:textAlignment="viewStart"
+                    android:paddingStart="@dimen/margin_extra_large"
+                    android:paddingEnd="@dimen/margin_extra_large"/>
 
-                <EditText
-                    android:id="@+id/message"
+                <com.facebook.shimmer.ShimmerFrameLayout
+                    android:id="@+id/shimmer_view_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="0dp"
-                    android:background="@color/transparent"
-                    android:gravity="top"
-                    android:inputType="textCapSentences|textAutoCorrect|textMultiLine"
-                    android:maxLength="@integer/invite_message_char_limit"
-                    android:minLines="4" />
+                    android:layout_marginTop="@dimen/margin_medium"
+                    app:shimmer_auto_start="false"
+                    android:paddingStart="@dimen/margin_extra_large"
+                    android:paddingEnd="@dimen/margin_extra_large"
+                    android:animateLayoutChanges="true">
 
-                <org.wordpress.android.widgets.WPTextView
-                    android:id="@+id/message_remaining"
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/generate_links"
+                        style="@style/WordPress.Invite.Button.Secondary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/invite_links_generate"
+                        android:visibility="visible"/>
+
+                    <RelativeLayout
+                        android:id="@+id/manage_links_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        android:animateLayoutChanges="true">
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/share_links"
+                            style="@style/WordPress.Invite.Button.Primary"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginBottom="@dimen/margin_extra_small"
+                            android:text="@string/invite_links_share_invite_link"
+                            app:icon="@drawable/ic_share_white_24dp"
+                            app:iconGravity="textStart"/>
+
+                        <com.google.android.material.textfield.TextInputLayout
+                            android:id="@+id/links_role_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:hint="@string/role"
+                            app:hintAnimationEnabled="false"
+                            android:layout_marginTop="@dimen/margin_medium"
+                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
+                            android:layout_below="@+id/share_links">
+
+                            <AutoCompleteTextView
+                                android:id="@+id/links_role"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:inputType="none"
+                                android:cursorVisible="false"
+                                android:ellipsize="end" />
+
+                        </com.google.android.material.textfield.TextInputLayout>
+
+                        <com.google.android.material.button.MaterialButton
+                            android:id="@+id/disable_button"
+                            style="@style/WordPress.Button.Invite.DisruptiveAction"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/margin_large"
+                            android:text="@string/invite_links_disable_invite_link"
+                            android:layout_below="@+id/links_role_container"/>
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/expire_date"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginStart="@dimen/margin_extra_large"
+                            android:text="@string/invite_links_expire_date"
+                            tools:text="Expires 1/10/2021"
+                            android:layout_below="@+id/links_role_container"
+                            android:layout_toEndOf="@+id/disable_button"
+                            android:layout_alignBaseline="@+id/disable_button"
+                            android:textAppearance="?attr/textAppearanceCaption"/>
+
+                    </RelativeLayout>
+
+                </com.facebook.shimmer.ShimmerFrameLayout>
+
+                <FrameLayout
+                    android:id="@+id/load_and_retry_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <ProgressBar
+                        android:id="@+id/get_links_status_progress"
+                        style="@style/Widget.AppCompat.ProgressBar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:indeterminate="true"
+                        android:visibility="gone"
+                        />
+
+                    <com.google.android.material.button.MaterialButton
+                        android:id="@+id/get_status_retry"
+                        style="@style/WordPress.Invite.Button.Secondary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/invite_links_get_status_retry"
+                        android:visibility="gone"
+                        android:layout_marginStart="@dimen/margin_extra_large"
+                        android:layout_marginEnd="@dimen/margin_extra_large"/>
+                </FrameLayout>
+
+                <com.google.android.material.textview.MaterialTextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_below="@+id/message"
-                    android:gravity="end"
-                    android:padding="5dp"
-                    android:textAppearance="?attr/textAppearanceCaption" />
-            </RelativeLayout>
+                    android:text="@string/invite_links_helper_text"
+                    android:textAppearance="?attr/textAppearanceCaption"
+                    android:paddingTop="@dimen/margin_medium"
+                    android:paddingBottom="@dimen/margin_extra_large"
+                    android:paddingStart="@dimen/margin_extra_large"
+                    android:paddingEnd="@dimen/margin_extra_large" />
 
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/message_info"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="5dp"
-                android:text="@string/invite_message_info"
-                android:textAppearance="?attr/textAppearanceCaption"
-                android:textStyle="italic" />
+            </LinearLayout>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/photo_picker_fragment.xml b/WordPress/src/main/res/layout/photo_picker_fragment.xml
index 770c0df187be..abf4a4e9f797 100644
--- a/WordPress/src/main/res/layout/photo_picker_fragment.xml
+++ b/WordPress/src/main/res/layout/photo_picker_fragment.xml
@@ -14,7 +14,8 @@
         android:layout_gravity="end|bottom"
         android:visibility="gone"
         android:src="@drawable/ic_photo_camera_24px"
-        android:layout_margin="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:layout_marginBottom="@dimen/fab_margin_stories"
         tools:ignore="InconsistentLayout"/>
 
     <RelativeLayout
diff --git a/WordPress/src/main/res/layout/plugin_detail_activity.xml b/WordPress/src/main/res/layout/plugin_detail_activity.xml
index de795e8107b5..e864a8ad33df 100644
--- a/WordPress/src/main/res/layout/plugin_detail_activity.xml
+++ b/WordPress/src/main/res/layout/plugin_detail_activity.xml
@@ -225,8 +225,7 @@
 
                             <androidx.appcompat.widget.SwitchCompat
                                 android:id="@+id/plugin_state_active"
-                                style="@style/PluginCardViewSecondaryElement"
-                                android:theme="@style/SwitchBlueMedium" />
+                                style="@style/PluginCardViewSecondaryElement" />
 
                         </RelativeLayout>
 
@@ -244,8 +243,7 @@
 
                         <androidx.appcompat.widget.SwitchCompat
                             android:id="@+id/plugin_state_autoupdates"
-                            style="@style/PluginCardViewSecondaryElement"
-                            android:theme="@style/SwitchBlueMedium" />
+                            style="@style/PluginCardViewSecondaryElement" />
                     </RelativeLayout>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/layout/post_signup_interstitial_activity.xml b/WordPress/src/main/res/layout/post_signup_interstitial_activity.xml
index 160f4d4f16ff..5f6f9d759687 100644
--- a/WordPress/src/main/res/layout/post_signup_interstitial_activity.xml
+++ b/WordPress/src/main/res/layout/post_signup_interstitial_activity.xml
@@ -6,5 +6,6 @@
     android:fillViewport="true"
     tools:context=".ui.accounts.PostSignupInterstitialActivity">
 
-    <include layout="@layout/post_signup_interstitial_default" />
+    <include
+        layout="@layout/post_signup_interstitial_default" />
 </ScrollView>
diff --git a/WordPress/src/main/res/layout/preferences_master_switch_toolbar.xml b/WordPress/src/main/res/layout/preferences_main_switch_toolbar.xml
similarity index 100%
rename from WordPress/src/main/res/layout/preferences_master_switch_toolbar.xml
rename to WordPress/src/main/res/layout/preferences_main_switch_toolbar.xml
diff --git a/WordPress/src/main/res/layout/prepublishing_add_category_fragment.xml b/WordPress/src/main/res/layout/prepublishing_add_category_fragment.xml
index 5d5608388208..2c4d19d03da5 100644
--- a/WordPress/src/main/res/layout/prepublishing_add_category_fragment.xml
+++ b/WordPress/src/main/res/layout/prepublishing_add_category_fragment.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:id="@+id/add_category_content">
 
-    <include layout="@layout/prepublishing_toolbar" />
+    <include android:id="@+id/prepublishing_toolbar" layout="@layout/prepublishing_toolbar" />
 
-    <include layout="@layout/add_category" />
+    <include android:id="@+id/add_category" layout="@layout/add_category" />
 
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/prepublishing_tags_fragment.xml b/WordPress/src/main/res/layout/prepublishing_tags_fragment.xml
index 9710bfd94700..ea7032e62393 100644
--- a/WordPress/src/main/res/layout/prepublishing_tags_fragment.xml
+++ b/WordPress/src/main/res/layout/prepublishing_tags_fragment.xml
@@ -4,8 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <include layout="@layout/prepublishing_toolbar"/>
-
     <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -16,5 +14,11 @@
         android:textAppearance="?attr/textAppearanceBody1"
         android:textColor="?wpColorOnSurfaceMedium" />
 
-    <include layout="@layout/fragment_post_settings_tags" />
+    <include
+        android:id="@+id/prepublishing_toolbar"
+        layout="@layout/prepublishing_toolbar" />
+
+    <include
+        android:id="@+id/fragment_post_settings_tags"
+        layout="@layout/fragment_post_settings_tags" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/progress_layout.xml b/WordPress/src/main/res/layout/progress_layout.xml
index 9b5c2d8e9758..92adc150db49 100644
--- a/WordPress/src/main/res/layout/progress_layout.xml
+++ b/WordPress/src/main/res/layout/progress_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/progress_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
diff --git a/WordPress/src/main/res/layout/quick_actions_block.xml b/WordPress/src/main/res/layout/quick_actions_block.xml
new file mode 100644
index 000000000000..9fbd3480dd25
--- /dev/null
+++ b/WordPress/src/main/res/layout/quick_actions_block.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/quick_actions_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/margin_my_site_quick_actions_bottom"
+    android:paddingEnd="@dimen/content_margin_site_row_start"
+    android:paddingStart="@dimen/content_margin_site_row_start"
+    android:paddingTop="@dimen/margin_extra_small"
+    android:clipChildren="false"
+    android:clipToPadding="false">
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/quick_action_posts_button"
+        app:layout_constraintBottom_toTopOf="@+id/quick_actions_stats_label"
+        android:id="@+id/quick_action_stats_button"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        style="@style/MySiteQuickActionButton"
+        android:src="@drawable/ic_stats_alt_white_24dp"
+        android:contentDescription="@string/stats"/>
+
+    <org.wordpress.android.widgets.WPTextView
+        app:layout_constraintTop_toBottomOf="@+id/quick_action_stats_button"
+        app:layout_constraintStart_toStartOf="@+id/quick_action_stats_button"
+        app:layout_constraintEnd_toEndOf="@+id/quick_action_stats_button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/quick_actions_stats_label"
+        style="@style/ImprovedMySiteQuickActionButtonLabel"
+        android:layout_below="@+id/quick_action_stats_button"
+        android:text="@string/stats" />
+
+    <org.wordpress.android.widgets.QuickStartFocusPoint
+        android:id="@+id/quick_start_stats_focus_point"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/quick_start_focus_point_description"
+        android:elevation="@dimen/quick_start_focus_point_elevation"
+        app:layout_constraintBottom_toBottomOf="@+id/quick_action_stats_button"
+        app:layout_constraintEnd_toEndOf="@+id/quick_action_stats_button"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="@+id/quick_action_stats_button"
+        app:layout_constraintTop_toTopOf="@+id/quick_action_stats_button"
+        app:layout_constraintVertical_bias="0.0"
+        app:size="small"
+        tools:ignore="RtlSymmetry" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        app:layout_constraintStart_toEndOf="@+id/quick_action_stats_button"
+        app:layout_constraintEnd_toStartOf="@+id/quick_action_media_button"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/quick_action_posts_label"
+        android:id="@+id/quick_action_posts_button"
+        style="@style/MySiteQuickActionButton"
+        android:src="@drawable/ic_posts_white_24dp"
+        android:contentDescription="@string/posts"/>
+
+    <org.wordpress.android.widgets.WPTextView
+        app:layout_constraintTop_toBottomOf="@+id/quick_action_posts_button"
+        app:layout_constraintStart_toStartOf="@+id/quick_action_posts_button"
+        app:layout_constraintEnd_toEndOf="@+id/quick_action_posts_button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/quick_action_posts_label"
+        style="@style/ImprovedMySiteQuickActionButtonLabel"
+        android:ellipsize="end"
+        android:layout_below="@+id/quick_action_posts_button"
+        android:text="@string/posts" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        app:layout_constraintStart_toEndOf="@+id/quick_action_posts_button"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/quick_action_pages_button"
+        app:layout_constraintBottom_toTopOf="@+id/quick_action_media_label"
+        android:id="@+id/quick_action_media_button"
+        style="@style/MySiteQuickActionButton"
+        android:src="@drawable/ic_media_white_24dp"
+        android:contentDescription="@string/media"/>
+
+    <org.wordpress.android.widgets.WPTextView
+        app:layout_constraintTop_toBottomOf="@+id/quick_action_media_button"
+        app:layout_constraintStart_toStartOf="@+id/quick_action_media_button"
+        app:layout_constraintEnd_toEndOf="@+id/quick_action_media_button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/quick_action_media_label"
+        style="@style/ImprovedMySiteQuickActionButtonLabel"
+        android:layout_below="@+id/quick_action_media_button"
+        android:text="@string/media" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/quick_action_media_button"
+        app:layout_constraintBottom_toTopOf="@+id/quick_action_pages_label"
+        android:id="@+id/quick_action_pages_button"
+        style="@style/MySiteQuickActionButton"
+        android:src="@drawable/ic_pages_white_24dp"
+        android:contentDescription="@string/pages"/>
+
+    <org.wordpress.android.widgets.WPTextView
+        app:layout_constraintTop_toBottomOf="@+id/quick_action_pages_button"
+        app:layout_constraintStart_toStartOf="@+id/quick_action_pages_button"
+        app:layout_constraintEnd_toEndOf="@+id/quick_action_pages_button"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:id="@+id/quick_action_pages_label"
+        style="@style/ImprovedMySiteQuickActionButtonLabel"
+        android:layout_below="@+id/quick_action_pages_button"
+        android:text="@string/pages" />
+
+    <org.wordpress.android.widgets.QuickStartFocusPoint
+        android:id="@+id/quick_start_pages_focus_point"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@+id/quick_action_pages_button"
+        app:layout_constraintEnd_toEndOf="@+id/quick_action_pages_button"
+        app:layout_constraintStart_toStartOf="@+id/quick_action_pages_button"
+        app:layout_constraintBottom_toBottomOf="@+id/quick_action_pages_button"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintVertical_bias="0.0"
+        android:contentDescription="@string/quick_start_focus_point_description"
+        android:elevation="@dimen/quick_start_focus_point_elevation"
+        app:size="small"
+        tools:ignore="RtlSymmetry" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/quick_start_card.xml b/WordPress/src/main/res/layout/quick_start_card.xml
new file mode 100644
index 000000000000..57b12718de7c
--- /dev/null
+++ b/WordPress/src/main/res/layout/quick_start_card.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/margin_extra_medium_large">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <!-- The ProgressBar component does not support determinate mode when using a
+        circular progress bar style. To work around this, we set a horizontal style
+        coupled with a custom circular drawable that has an equivalent structure,
+        which allow us to tint both its background and foreground layers programmatically. -->
+        <ProgressBar
+            android:id="@+id/quick_start_card_progress"
+            style="?android:progressBarStyleHorizontal"
+            android:layout_width="@dimen/quick_start_card_progress_indicator_size"
+            android:layout_height="@dimen/quick_start_card_progress_indicator_size"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/content_margin_site_row_start"
+            android:indeterminate="false"
+            android:progressDrawable="@drawable/quick_start_card_progress_drawable"
+            tools:progress="75"
+            tools:progressBackgroundTint="@color/green_0"
+            tools:progressTint="@color/green_20" />
+
+        <TextView
+            android:id="@+id/quick_start_card_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:fontFamily="serif"
+            android:maxLines="1"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+            tools:text="Quick Start card" />
+
+        <ImageButton
+            android:id="@+id/quick_start_card_more_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/actionBarItemBackground"
+            android:contentDescription="@string/more"
+            android:padding="@dimen/margin_medium_large"
+            android:src="@drawable/ic_more_vert_white_24dp"
+            app:tint="?attr/wpColorOnSurfaceMedium" />
+    </LinearLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/quick_start_card_recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:requiresFadingEdge="horizontal" />
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/quick_start_focus_circle_small.xml b/WordPress/src/main/res/layout/quick_start_focus_circle_small.xml
new file mode 100644
index 000000000000..ad45760b3c48
--- /dev/null
+++ b/WordPress/src/main/res/layout/quick_start_focus_circle_small.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="@dimen/quick_start_focus_point_small_size"
+                android:layout_height="@dimen/quick_start_focus_point_small_size"
+                android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/quick_start_focus_outer_circle"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@null"
+        android:src="@drawable/bg_oval_primary_10"/>
+
+    <ImageView
+        android:id="@+id/quick_start_focus_inner_circle"
+        android:layout_width="12dp"
+        android:layout_height="12dp"
+        android:layout_centerInParent="true"
+        android:contentDescription="@null"
+        android:src="@drawable/bg_oval_primary"/>
+
+</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/quick_start_focus_point_view.xml b/WordPress/src/main/res/layout/quick_start_focus_point_view.xml
index 5c07094ed64d..3c156a5051ef 100644
--- a/WordPress/src/main/res/layout/quick_start_focus_point_view.xml
+++ b/WordPress/src/main/res/layout/quick_start_focus_point_view.xml
@@ -5,7 +5,7 @@
     android:id="@+id/quick_start_focus_point"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:elevation="100dp"
+    android:elevation="@dimen/quick_start_focus_point_elevation"
     android:layout_gravity="center_vertical|center"
     android:contentDescription="@string/quick_start_focus_point_description"
     tools:ignore="RtlSymmetry"/>
diff --git a/WordPress/src/main/res/layout/quick_start_menu_fragment.xml b/WordPress/src/main/res/layout/quick_start_menu_fragment.xml
new file mode 100644
index 000000000000..a875509b72c9
--- /dev/null
+++ b/WordPress/src/main/res/layout/quick_start_menu_fragment.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/bottom_sheet_handle_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <LinearLayout
+        android:id="@+id/pin_action"
+        style="@style/MainBottomSheetRowLayout"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            style="@style/MainBottomSheetRowIcon"
+            android:contentDescription="@null"
+            android:visibility="visible"
+            android:src="@drawable/ic_push_pin_24" />
+
+        <TextView
+            style="@style/MainBottomSheetRowTextView"
+            android:id="@+id/quick_start_pin_text"
+            android:gravity="start"
+            android:text="@string/quick_start_card_menu_pin" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/hide_action"
+        style="@style/MainBottomSheetRowLayout"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            style="@style/MainBottomSheetRowIcon"
+            android:contentDescription="@null"
+            android:visibility="visible"
+            android:src="@drawable/ic_visibility_off_24" />
+
+        <TextView
+            style="@style/MainBottomSheetRowTextView"
+            android:gravity="start"
+            android:text="@string/quick_start_card_menu_hide" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/remove_action"
+        style="@style/MainBottomSheetRowLayout"
+        tools:ignore="UseCompoundDrawables">
+
+        <ImageView
+            style="@style/MainBottomSheetRowIcon"
+            android:contentDescription="@null"
+            android:visibility="visible"
+            android:src="@drawable/ic_close_24px" />
+
+        <TextView
+            style="@style/MainBottomSheetRowTextView"
+            android:gravity="start"
+            android:text="@string/quick_start_card_menu_remove" />
+    </LinearLayout>
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/quick_start_task_card.xml b/WordPress/src/main/res/layout/quick_start_task_card.xml
new file mode 100644
index 000000000000..2af0ce2074f8
--- /dev/null
+++ b/WordPress/src/main/res/layout/quick_start_task_card.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/task_card_view"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:checkable="true"
+    android:clickable="true"
+    android:focusable="true"
+    app:cardCornerRadius="@dimen/quick_start_task_card_corner_radius"
+    app:cardElevation="@dimen/quick_start_task_card_elevation"
+    app:cardForegroundColor="@color/quick_start_task_card_foreground_selector"
+    app:contentPadding="@dimen/margin_medium"
+    app:rippleColor="@color/quick_start_task_card_ripple_selector">
+
+    <LinearLayout
+        android:layout_width="@dimen/quick_start_task_card_width"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <com.google.android.material.imageview.ShapeableImageView
+            android:id="@+id/task_card_illustration"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:shapeAppearance="@style/ShapeAppearance.QuickStartTaskCardIllustration"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/img_illustration_quick_start_task_set_site_title" />
+
+        <TextView
+            android:id="@+id/task_card_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_large"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+            android:textSize="@dimen/text_sz_large"
+            tools:text="Lorem ipsum" />
+
+        <TextView
+            android:id="@+id/task_card_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_small"
+            android:ellipsize="end"
+            android:lines="3"
+            tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Mauris ac erat." />
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/layout/reader_activity_subs.xml b/WordPress/src/main/res/layout/reader_activity_subs.xml
index ef3c3b41b072..c83deaa3a903 100644
--- a/WordPress/src/main/res/layout/reader_activity_subs.xml
+++ b/WordPress/src/main/res/layout/reader_activity_subs.xml
@@ -30,6 +30,18 @@
         android:layout_above="@+id/divider_list"
         android:layout_below="@+id/appbar" />
 
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/fab_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/divider_list"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="@dimen/fab_margin"
+        android:layout_marginEnd="@dimen/fab_margin"
+        android:contentDescription="@string/add"
+        android:src="@drawable/ic_plus_white_24dp"
+        app:borderWidth="0dp" />
+
     <View
         android:id="@+id/divider_list"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/reader_blog_section_view.xml b/WordPress/src/main/res/layout/reader_blog_section_view.xml
index 8b8d49848486..4ee82c5824fa 100644
--- a/WordPress/src/main/res/layout/reader_blog_section_view.xml
+++ b/WordPress/src/main/res/layout/reader_blog_section_view.xml
@@ -5,17 +5,45 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
-    <ImageView
-        android:id="@+id/image_avatar_or_blavatar"
-        style="@style/ReaderImageView.Avatar"
-        android:importantForAccessibility="no"
-        android:background="@drawable/bg_oval_stroke_placeholder_1dp"
-        android:padding="@dimen/reader_image_avatar_or_blavatar_border_width"
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_marginEnd="@dimen/margin_medium"
-        app:layout_constraintStart_toStartOf="parent"
+        android:id="@+id/author_and_site_imagery_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintEnd_toStartOf="@id/text_author_and_blog_name"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlSymmetry" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/image_avatar_or_blavatar"
+            style="@style/ReaderImageView.Avatar"
+            android:background="@drawable/bg_oval_placeholder"
+            android:importantForAccessibility="no"
+            android:padding="@dimen/reader_image_avatar_or_blavatar_border_width"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <ViewStub
+            android:id="@+id/dynamic_center_point"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="@+id/image_avatar_or_blavatar"
+            app:layout_constraintLeft_toLeftOf="@+id/image_avatar_or_blavatar"
+            app:layout_constraintRight_toRightOf="@+id/image_avatar_or_blavatar"
+            app:layout_constraintTop_toTopOf="@+id/image_avatar_or_blavatar" />
+
+        <ImageView
+            android:id="@+id/authors_avatar"
+            style="@style/ReaderImageView.Avatar"
+            android:background="@drawable/bg_oval_stroke_p2_author_1dp"
+            android:importantForAccessibility="no"
+            android:padding="@dimen/reader_image_avatar_or_blavatar_border_width"
+            app:layout_constraintStart_toEndOf="@+id/dynamic_center_point"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text_author_and_blog_name"
@@ -25,7 +53,7 @@
         android:layout_marginTop="@dimen/margin_small"
         android:layout_marginEnd="@dimen/margin_medium"
         android:includeFontPadding="false"
-        app:layout_constraintStart_toEndOf="@id/image_avatar_or_blavatar"
+        app:layout_constraintStart_toEndOf="@id/author_and_site_imagery_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="text_blog_nametext_blog_name text_blog_name" />
diff --git a/WordPress/src/main/res/layout/reader_bookmark_button.xml b/WordPress/src/main/res/layout/reader_bookmark_button.xml
deleted file mode 100644
index 8b92ad71f200..000000000000
--- a/WordPress/src/main/res/layout/reader_bookmark_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="?attr/selectableItemBackground"
-    android:minHeight="@dimen/reader_button_minimum_height"
-    android:orientation="horizontal"
-    android:paddingStart="@dimen/margin_medium"
-    android:paddingEnd="@dimen/margin_medium">
-
-    <ImageView
-        android:id="@+id/icon_bookmark_button"
-        android:layout_width="@dimen/reader_count_icon"
-        android:layout_height="@dimen/reader_count_icon"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@null"
-        android:src="@drawable/ic_bookmark_outline_bookmark_selector_24dp"
-        app:tint="@color/on_surface_primary_selector" />
-
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/label_bookmark_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/margin_small"
-        android:textColor="@color/on_surface_medium_primary_selector"
-        android:importantForAccessibility="no"
-        android:text="@string/reader_btn_bookmark"
-        android:textAppearance="?attr/textAppearanceBody2" />
-
-</LinearLayout>
diff --git a/WordPress/src/main/res/layout/reader_cardview_post.xml b/WordPress/src/main/res/layout/reader_cardview_post.xml
index dac346050ae5..fef333fcb9e7 100644
--- a/WordPress/src/main/res/layout/reader_cardview_post.xml
+++ b/WordPress/src/main/res/layout/reader_cardview_post.xml
@@ -52,7 +52,8 @@
         <include layout="@layout/reader_blog_section_view"
             android:id="@+id/layout_blog_section"
             android:layout_width="0dp"
-            android:layout_height="@dimen/reader_post_header_height"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/reader_post_header_height"
             android:importantForAccessibility="no"
             android:layout_marginEnd="@dimen/margin_medium"
             android:background="?android:selectableItemBackground"
diff --git a/WordPress/src/main/res/layout/reader_cardview_related_post.xml b/WordPress/src/main/res/layout/reader_cardview_related_post.xml
new file mode 100644
index 000000000000..1d18f3831976
--- /dev/null
+++ b/WordPress/src/main/res/layout/reader_cardview_related_post.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:cardBackgroundColor="@color/transparent"
+    app:cardElevation="0dp">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/margin_extra_large">
+
+        <ImageView
+            android:id="@+id/image_featured"
+            android:layout_width="@dimen/reader_related_post_image_width"
+            android:layout_height="0dp"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginTop="@dimen/margin_extra_large"
+            android:background="@drawable/bg_rectangle_stroke_placeholder_radius_4dp"
+            android:contentDescription="@null"
+            android:cropToPadding="true"
+            android:padding="@dimen/reader_image_featured_border_width"
+            app:layout_constraintBottom_toTopOf="@id/text_title"
+            app:layout_constraintDimensionRatio="16:9"
+            app:layout_constraintEnd_toStartOf="@id/text_title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text_title"
+            style="@style/ReaderTextView.RelatedPost.Title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/image_featured"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="text title" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text_excerpt"
+            style="@style/ReaderTextView.RelatedPost.Excerpt"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/margin_medium"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/text_title"
+            app:layout_constraintTop_toBottomOf="@id/text_title"
+            tools:text="text excerpt" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</com.google.android.material.card.MaterialCardView>
diff --git a/WordPress/src/main/res/layout/reader_cardview_xpost.xml b/WordPress/src/main/res/layout/reader_cardview_xpost.xml
index ebcab084983d..de653cf66d98 100644
--- a/WordPress/src/main/res/layout/reader_cardview_xpost.xml
+++ b/WordPress/src/main/res/layout/reader_cardview_xpost.xml
@@ -13,11 +13,22 @@
         android:layout_height="wrap_content"
         android:padding="@dimen/reader_card_content_padding">
 
+        <ImageView
+            android:id="@+id/image_blavatar"
+            style="@style/ReaderImageView.Avatar.ExtraSmall"
+            android:background="@drawable/bg_oval_placeholder"
+            android:importantForAccessibility="no"
+            android:padding="@dimen/reader_image_avatar_or_blavatar_border_width"
+            android:src="@drawable/bg_rectangle_placeholder_globe_32dp"
+            app:layout_constraintBottom_toBottomOf="@+id/image_avatar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/image_avatar" />
+
         <ImageView
             android:id="@+id/image_avatar"
             style="@style/ReaderImageView.Avatar.ExtraSmall"
             android:layout_marginStart="@dimen/reader_xpost_avatar_margin_start"
-            android:background="@drawable/bg_oval_stroke_placeholder_1dp"
+            android:background="@drawable/bg_oval_stroke_p2_author_1dp"
             android:importantForAccessibility="no"
             android:padding="@dimen/reader_image_avatar_or_blavatar_border_width"
             android:src="@drawable/bg_rectangle_placeholder_user_32dp"
@@ -25,17 +36,6 @@
             app:layout_constraintStart_toStartOf="@id/image_blavatar"
             app:layout_constraintTop_toTopOf="@+id/text_subtitle" />
 
-        <ImageView
-            android:id="@+id/image_blavatar"
-            style="@style/ReaderImageView.Avatar.ExtraSmall"
-            android:background="@drawable/bg_oval_stroke_placeholder_1dp"
-            android:importantForAccessibility="no"
-            android:padding="@dimen/reader_image_avatar_or_blavatar_border_width"
-            android:src="@drawable/bg_rectangle_placeholder_globe_32dp"
-            app:layout_constraintBottom_toBottomOf="@+id/image_avatar"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/image_avatar" />
-
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/text_subtitle"
             android:layout_width="0dp"
diff --git a/WordPress/src/main/res/layout/reader_comments_post_header_view.xml b/WordPress/src/main/res/layout/reader_comments_post_header_view.xml
index 23547cda64ea..2ab4f56e57f8 100644
--- a/WordPress/src/main/res/layout/reader_comments_post_header_view.xml
+++ b/WordPress/src/main/res/layout/reader_comments_post_header_view.xml
@@ -5,6 +5,7 @@
 -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_blog_section"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -18,6 +19,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_medium"
         android:layout_marginEnd="@dimen/margin_medium"
+        android:layout_marginBottom="@dimen/margin_large"
         android:orientation="vertical"
         android:paddingStart="@dimen/reader_card_content_padding"
         android:paddingEnd="@dimen/reader_card_content_padding">
@@ -65,11 +67,47 @@
             android:id="@+id/text_post_dateline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_large"
             android:ellipsize="end"
             android:maxLines="2"
             android:textAppearance="?attr/textAppearanceCaption"
             tools:text="text_post_date" />
 
+        <com.facebook.shimmer.ShimmerFrameLayout
+            android:id="@+id/shimmer_view_container"
+            app:shimmer_auto_start="false"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <org.wordpress.android.ui.reader.views.ReaderFollowButton
+                android:id="@+id/button_follow_comments"
+                style="@style/Reader.Follow.Button.Comments"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+            <LinearLayout
+                android:id="@+id/button_skeleton"
+                android:layout_width="@dimen/reader_follow_button_skeleton_width"
+                android:layout_height="@dimen/reader_follow_button_min_height"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:visibility="gone"
+                tools:visibility="visible" >
+
+                <View
+                    android:layout_width="@dimen/reader_follow_button_skeleton_icon_size"
+                    android:layout_height="@dimen/reader_follow_button_skeleton_icon_size"
+                    android:background="@color/gray_30" />
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/reader_follow_button_skeleton_icon_size"
+                    android:layout_marginStart="@dimen/reader_follow_button_skeleton_icon_text_margin"
+                    android:background="@color/gray_30" />
+
+            </LinearLayout>
+
+        </com.facebook.shimmer.ShimmerFrameLayout>
     </LinearLayout>
 </FrameLayout>
diff --git a/WordPress/src/main/res/layout/reader_discover_fragment_layout.xml b/WordPress/src/main/res/layout/reader_discover_fragment_layout.xml
index bc49dbcea2f9..d12002d82d5a 100644
--- a/WordPress/src/main/res/layout/reader_discover_fragment_layout.xml
+++ b/WordPress/src/main/res/layout/reader_discover_fragment_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/constraint_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -28,9 +29,16 @@
         app:layout_constraintTop_toBottomOf="@+id/progress_bar"
         app:layout_constraintVertical_bias="0" />
 
-    <include layout="@layout/reader_fullscreen_error_with_retry"/>
-
-    <include layout="@layout/reader_fullscreen_empty_with_action"/>
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/actionable_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:aevButton="@string/reader_discover_no_posts_button_text"
+        app:aevImage="@drawable/img_illustration_empty_results_216dp"
+        app:aevSubtitle="@string/reader_discover_no_posts_subtitle"
+        app:aevTitle="@string/reader_discover_no_posts_title"
+        tools:visibility="visible" />
 
     <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
         android:id="@+id/ptr_layout"
diff --git a/WordPress/src/main/res/layout/reader_fragment_post_detail.xml b/WordPress/src/main/res/layout/reader_fragment_post_detail.xml
index 867489e844bd..76c932a59eca 100644
--- a/WordPress/src/main/res/layout/reader_fragment_post_detail.xml
+++ b/WordPress/src/main/res/layout/reader_fragment_post_detail.xml
@@ -46,15 +46,46 @@
                         android:layout_below="@+id/header_view"
                         android:layout_centerHorizontal="true"
                         android:layout_marginEnd="@dimen/reader_detail_margin"
-                        android:layout_marginStart="@dimen/reader_detail_margin"
-                        android:layout_marginBottom="@dimen/margin_extra_large"
-                        />
+                        android:layout_marginStart="@dimen/reader_detail_margin" />
+
+                    <include
+                        layout="@layout/reader_post_likers_faces_list"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/layout_post_detail_content" />
+
+                    <LinearLayout
+                        android:id="@+id/container_related_posts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/liker_faces_container"
+                        android:orientation="vertical"
+                        android:layout_alignEnd="@+id/layout_post_detail_content"
+                        android:layout_alignStart="@+id/layout_post_detail_content"
+                        tools:ignore="UnknownIdInLayout">
+
+                        <org.wordpress.android.ui.reader.views.ReaderSimplePostContainerView
+                            android:id="@+id/related_posts_view_local"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:visibility="gone"
+                            tools:visibility="visible" />
+
+                        <org.wordpress.android.ui.reader.views.ReaderSimplePostContainerView
+                            android:id="@+id/related_posts_view_global"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:visibility="gone"
+                            tools:visibility="visible" />
+
+                    </LinearLayout>
 
                     <View
                         android:id="@+id/footer_spacer"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/toolbar_height"
-                        android:layout_below="@id/layout_post_detail_content" />
+                        android:layout_marginBottom="@dimen/margin_extra_large"
+                        android:layout_below="@id/container_related_posts" />
 
                 </RelativeLayout>
 
diff --git a/WordPress/src/main/res/layout/reader_fullscreen_empty_with_action.xml b/WordPress/src/main/res/layout/reader_fullscreen_empty_with_action.xml
deleted file mode 100644
index 9da9ec696253..000000000000
--- a/WordPress/src/main/res/layout/reader_fullscreen_empty_with_action.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.wordpress.android.widgets.WPNestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/empty_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_marginTop="@dimen/margin_extra_extra_extra_large"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/empty_action"
-            style="@style/Reader.Button.Error"
-            android:text="@string/reader_discover_empty_button_text"
-            app:layout_constraintVertical_bias="0.25"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/empty_title" />
-
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/empty_title"
-            style="@style/Reader.TextView.Error"
-            app:layout_constraintBottom_toTopOf="@+id/empty_action"
-            app:layout_constraintEnd_toEndOf="parent"
-            android:fontFamily="serif"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="You have reached an empty view. Go for it." />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</org.wordpress.android.widgets.WPNestedScrollView>
diff --git a/WordPress/src/main/res/layout/reader_include_comment_box.xml b/WordPress/src/main/res/layout/reader_include_comment_box.xml
index c481ffcbe210..d6a09d26b84a 100644
--- a/WordPress/src/main/res/layout/reader_include_comment_box.xml
+++ b/WordPress/src/main/res/layout/reader_include_comment_box.xml
@@ -66,7 +66,7 @@
             android:contentDescription="@string/send"
             android:enabled="false"
             android:padding="@dimen/margin_medium"
-            app:tint="@color/accent_neutral_30_selector"
+            app:tint="@color/primary_neutral_30_selector"
             android:src="@drawable/ic_send_white_24dp" />
     </LinearLayout>
 
diff --git a/WordPress/src/main/res/layout/reader_interest_card.xml b/WordPress/src/main/res/layout/reader_interest_card.xml
index 1110d952861c..3714b62b67a6 100644
--- a/WordPress/src/main/res/layout/reader_interest_card.xml
+++ b/WordPress/src/main/res/layout/reader_interest_card.xml
@@ -13,7 +13,8 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/interests_list"
-            android:layout_marginTop="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_small"
+            android:layout_marginEnd="@dimen/margin_medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/WordPress/src/main/res/layout/reader_interest_item.xml b/WordPress/src/main/res/layout/reader_interest_item.xml
index 7b67e2c4c02c..95c3296904fb 100644
--- a/WordPress/src/main/res/layout/reader_interest_item.xml
+++ b/WordPress/src/main/res/layout/reader_interest_item.xml
@@ -3,31 +3,21 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/reader_interest_container"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground">
+    android:layout_marginStart="@dimen/margin_small"
+    android:layout_marginEnd="@dimen/margin_small"
+    android:layout_marginBottom="@dimen/margin_extra_large"
+    android:layout_marginTop="@dimen/margin_extra_large">
 
-    <View
-        android:id="@+id/divider"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/divider_size"
-        android:alpha="@dimen/material_emphasis_disabled"
-        android:background="?android:attr/listDivider"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/interest"
-        tools:visibility="visible" />
-
-    <org.wordpress.android.widgets.WPTextView
+    <com.google.android.material.chip.Chip
         android:id="@+id/interest"
-        style="@style/ReaderTextView.Interests.ListItem.Text"
-        app:layout_constraintBottom_toTopOf="@+id/divider"
-        app:layout_constraintHorizontal_bias="0.0"
+        style="@style/ReaderTextView.Interests.ListItem.Chip"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0"
-        tools:text="Photography" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:chipStrokeWidth="@dimen/divider_size"
+        app:chipStartPadding="@dimen/margin_large"
+        app:chipEndPadding="@dimen/margin_large"
+        tools:text="Photography"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/reader_interests_activity.xml b/WordPress/src/main/res/layout/reader_interests_activity.xml
new file mode 100644
index 000000000000..9e509548397f
--- /dev/null
+++ b/WordPress/src/main/res/layout/reader_interests_activity.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <fragment
+        android:id="@+id/fragment_container_view"
+        android:name="org.wordpress.android.ui.reader.discover.interests.ReaderInterestsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/reader_interests_fragment_layout.xml b/WordPress/src/main/res/layout/reader_interests_fragment_layout.xml
index d5b57a3df153..96546afa2bb4 100644
--- a/WordPress/src/main/res/layout/reader_interests_fragment_layout.xml
+++ b/WordPress/src/main/res/layout/reader_interests_fragment_layout.xml
@@ -10,12 +10,14 @@
 
     <RelativeLayout
         android:id="@+id/back_button"
+        android:visibility="gone"
         android:layout_width="@dimen/min_touch_target_sz"
         android:layout_height="@dimen/min_touch_target_sz"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toLeftOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/scroll_view">
+        app:layout_constraintBottom_toTopOf="@+id/scroll_view"
+        tools:visibility="visible">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -65,18 +67,20 @@
                 style="@style/ReaderTextView.Interests.Title"
                 android:id="@+id/title"
                 android:text="@string/reader_label_choose_your_interests"
+                android:visibility="gone"
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toStartOf="@id/guideline_beginning"
                 app:layout_constraintEnd_toEndOf="@id/guideline_end"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toTopOf="@+id/interests_chip_group"
                 app:layout_constraintVertical_chainStyle="packed"
-                tools:text="Choose your interests" />
+                tools:text="Choose your interests"
+                tools:visibility="visible" />
 
             <com.google.android.material.chip.ChipGroup
                 android:id="@+id/interests_chip_group"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_marginBottom="@dimen/margin_extra_large"
                 android:layoutDirection="locale"
                 app:chipSpacing="@dimen/margin_small_medium"
@@ -125,6 +129,7 @@
     </com.google.android.material.card.MaterialCardView>
 
     <include
+        android:id="@+id/include_error_layout"
         layout="@layout/reader_fullscreen_error_with_retry"
         android:visibility="gone"/>
 
diff --git a/WordPress/src/main/res/layout/reader_listitem_tag.xml b/WordPress/src/main/res/layout/reader_listitem_tag.xml
index 704002dc5507..2193e6095a04 100644
--- a/WordPress/src/main/res/layout/reader_listitem_tag.xml
+++ b/WordPress/src/main/res/layout/reader_listitem_tag.xml
@@ -35,6 +35,6 @@
         android:background="?attr/selectableItemBackground"
         android:contentDescription="@string/remove"
         android:padding="@dimen/margin_small"
-        android:src="@drawable/ic_cross_white_24dp"
+        android:src="@drawable/ic_reader_following_white_24dp"
         app:tint="?attr/wpColorOnSurfaceMedium" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/reader_no_site_to_reblog.xml b/WordPress/src/main/res/layout/reader_no_site_to_reblog.xml
index d390dbd6c039..d23907b027c2 100644
--- a/WordPress/src/main/res/layout/reader_no_site_to_reblog.xml
+++ b/WordPress/src/main/res/layout/reader_no_site_to_reblog.xml
@@ -4,7 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/toolbar_main" />
+    <include
+        android:id="@+id/include_toolbar_main"
+        layout="@layout/toolbar_main" />
 
     <org.wordpress.android.ui.ActionableEmptyView
         android:id="@+id/noSiteToReblogView"
diff --git a/WordPress/src/main/res/layout/reader_popup_menu_item.xml b/WordPress/src/main/res/layout/reader_popup_menu_item.xml
index 2a4088bbafa7..44c43aaed833 100644
--- a/WordPress/src/main/res/layout/reader_popup_menu_item.xml
+++ b/WordPress/src/main/res/layout/reader_popup_menu_item.xml
@@ -1,11 +1,12 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/reader_popup_menu_item_container"
     android:layout_width="match_parent"
     android:layout_height="@dimen/menu_item_height"
     android:gravity="start|center_vertical"
     android:orientation="horizontal"
     android:paddingStart="@dimen/menu_item_margin"
-    android:paddingEnd="@dimen/menu_item_margin">
+    android:paddingEnd="@dimen/menu_item_margin" >
 
     <ImageView
         android:id="@+id/image"
diff --git a/WordPress/src/main/res/layout/reader_popup_menu_spacer_item.xml b/WordPress/src/main/res/layout/reader_popup_menu_spacer_item.xml
new file mode 100644
index 000000000000..a558b084546a
--- /dev/null
+++ b/WordPress/src/main/res/layout/reader_popup_menu_spacer_item.xml
@@ -0,0 +1,11 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/reader_popup_menu_item_spacer_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="start|center_vertical"
+    android:orientation="horizontal">
+    <android.widget.Space
+        android:id="@+id/reader_popup_menu_item_spacer"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/reader_more_menu_spacer_height"/>
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/reader_post_likers_faces_list.xml b/WordPress/src/main/res/layout/reader_post_likers_faces_list.xml
new file mode 100644
index 000000000000..967780a4926e
--- /dev/null
+++ b/WordPress/src/main/res/layout/reader_post_likers_faces_list.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.wordpress.android.ui.reader.views.InterceptingFrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/liker_faces_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:visibility="gone"
+    tools:visibility="visible"
+    android:clipChildren="true"
+    android:animateLayoutChanges="true"
+    android:minHeight="@dimen/liker_faces_section_min_height">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/faces_block"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:paddingBottom="@dimen/margin_extra_medium_large"
+        android:paddingEnd="@dimen/reader_detail_margin"
+        android:paddingStart="@dimen/reader_detail_margin"
+        android:paddingTop="@dimen/margin_extra_medium_large"
+        app:alignItems="center"
+        app:flexWrap="wrap"
+        app:maxLine="2">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/likes_recycler"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_large"
+            android:clipChildren="false"
+            tools:itemCount="5"
+            tools:layoutManager="LinearLayoutManager"
+            tools:listitem="@layout/liker_face_item"
+            tools:orientation="horizontal" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/num_bloggers"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?attr/textAppearanceCaption"
+            android:textColor="@color/material_on_surface_emphasis_medium"
+            tools:text="19 bloggers like this." />
+
+    </com.google.android.flexbox.FlexboxLayout>
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"
+        tools:visibility="visible"/>
+
+    <org.wordpress.android.widgets.WPTextView
+        android:id="@+id/empty_state_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:layout_gravity="center"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?attr/textAppearanceCaption"
+        android:visibility="gone"
+        tools:text="There was an issue loading people who liked this post."
+        tools:visibility="gone"/>
+
+</org.wordpress.android.ui.reader.views.InterceptingFrameLayout>
diff --git a/WordPress/src/main/res/layout/reader_simple_post_view.xml b/WordPress/src/main/res/layout/reader_simple_post_view.xml
deleted file mode 100644
index c5aeb5a43e06..000000000000
--- a/WordPress/src/main/res/layout/reader_simple_post_view.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_extra_large"
-    android:background="?android:selectableItemBackground">
-
-    <ImageView
-        android:id="@+id/image_featured"
-        android:layout_width="@dimen/reader_simple_post_image_width"
-        android:layout_height="match_parent"
-        android:layout_marginEnd="@dimen/margin_large"
-        android:contentDescription="@null"
-        android:visibility="gone"
-        tools:src="@drawable/box_with_pages_top"
-        tools:visibility="visible" />
-
-    <RelativeLayout
-        android:id="@+id/layout_simple_post_site_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_medium"
-        android:layout_toEndOf="@+id/image_featured"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <org.wordpress.android.ui.reader.views.ReaderFollowButton
-            android:id="@+id/simple_post_follow_button"
-            style="@style/Reader.Follow.Button.Icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:layout_marginStart="@dimen/margin_medium"
-            android:contentDescription="@string/reader_btn_follow"
-            android:padding="@dimen/reader_follow_button_padding" />
-
-        <ImageView
-            android:id="@+id/image_avatar"
-            style="@style/ReaderImageView.Avatar.ExtraSmall"
-            android:layout_centerVertical="true"
-            android:layout_marginEnd="@dimen/margin_medium"
-            android:contentDescription="@null"
-            tools:src="@drawable/bg_rectangle_placeholder_user_32dp" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@+id/simple_post_follow_button"
-            android:layout_toEndOf="@+id/image_avatar"
-            android:orientation="vertical">
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/text_author_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:gravity="start"
-                android:maxLines="1"
-                android:textAlignment="viewStart"
-                android:textAppearance="?attr/textAppearanceSubtitle2"
-                tools:text="text_author_name" />
-
-            <org.wordpress.android.widgets.WPTextView
-                android:id="@+id/text_site_name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:gravity="start"
-                android:maxLines="1"
-                android:textAlignment="viewStart"
-                android:textAppearance="?attr/textAppearanceCaption"
-                tools:text="text_site_name" />
-        </LinearLayout>
-
-    </RelativeLayout>
-
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/text_simple_post_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/layout_simple_post_site_header"
-        android:layout_toEndOf="@+id/image_featured"
-        android:ellipsize="end"
-        android:fontFamily="serif"
-        android:maxLines="2"
-        android:textAppearance="?attr/textAppearanceSubtitle2"
-        tools:text="text_simple_post_title" />
-
-    <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/text_simple_post_excerpt"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/text_simple_post_title"
-        android:layout_marginTop="@dimen/margin_small"
-        android:layout_toEndOf="@+id/image_featured"
-        android:ellipsize="end"
-        android:fontFamily="serif"
-        android:maxLines="3"
-        android:textAppearance="?attr/textAppearanceBody2"
-        android:textColor="?attr/wpColorOnSurfaceMedium"
-        tools:text="text_simple_post_excerpt\ntext_simple_post_excerpt\ntext_simple_post_excerpt" />
-
-</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/reader_simple_posts_container_view.xml b/WordPress/src/main/res/layout/reader_simple_posts_container_view.xml
index 62ae3c910093..185b0fed2fd2 100644
--- a/WordPress/src/main/res/layout/reader_simple_posts_container_view.xml
+++ b/WordPress/src/main/res/layout/reader_simple_posts_container_view.xml
@@ -6,11 +6,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/divider_size"
-        android:background="?android:attr/listDivider" />
-
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/text_related_posts_label"
         style="@style/ReaderTextView.MetaHeader"
@@ -20,10 +15,9 @@
         android:layout_marginBottom="@dimen/margin_extra_large"
         tools:text="@string/reader_label_global_related_posts" />
 
-    <LinearLayout
-        android:id="@+id/container_related_posts"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical" />
+        android:layout_height="wrap_content"/>
 
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/reader_site_header_view.xml b/WordPress/src/main/res/layout/reader_site_header_view.xml
index be2be1c65ff5..fee2d8ba8124 100644
--- a/WordPress/src/main/res/layout/reader_site_header_view.xml
+++ b/WordPress/src/main/res/layout/reader_site_header_view.xml
@@ -29,9 +29,9 @@
                 android:id="@+id/image_blavatar"
                 style="@style/ReaderImageView.Avatar.ExtraLarge"
                 android:layout_marginEnd="@dimen/reader_site_header_avatar_margin_end"
-                android:padding="@dimen/reader_site_header_avatar_padding"
+                android:background="@drawable/bg_oval_placeholder"
                 android:contentDescription="@null"
-                android:background="@drawable/bg_oval_stroke_placeholder_1dp"
+                android:padding="@dimen/reader_site_header_avatar_padding"
                 android:src="@drawable/bg_oval_placeholder_globe_no_border_24dp" />
 
             <com.google.android.material.textview.MaterialTextView
diff --git a/WordPress/src/main/res/layout/restore_activity.xml b/WordPress/src/main/res/layout/restore_activity.xml
new file mode 100644
index 000000000000..f46cc595b9bf
--- /dev/null
+++ b/WordPress/src/main/res/layout/restore_activity.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <fragment
+        android:id="@+id/fragment_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="org.wordpress.android.ui.jetpack.restore.RestoreFragment"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    </fragment>
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar"
+            app:layout_scrollFlags="scroll|enterAlways"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/list_divider_height"
+            android:background="?attr/wpColorSurfaceSecondary"/>
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/scan_activity.xml b/WordPress/src/main/res/layout/scan_activity.xml
new file mode 100644
index 000000000000..225db7f5a416
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_activity.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <fragment
+        android:id="@+id/fragment_container_view"
+        android:name="org.wordpress.android.ui.jetpack.scan.ScanFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
diff --git a/WordPress/src/main/res/layout/scan_fragment.xml b/WordPress/src/main/res/layout/scan_fragment.xml
new file mode 100644
index 000000000000..9f95381402d1
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_fragment.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/actionable_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:aevImage="@drawable/img_illustration_empty_results_216dp"
+        app:aevTitle="@string/loading"
+        tools:visibility="visible" />
+
+    <org.wordpress.android.ui.prefs.EmptyViewRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/WordPress/src/main/res/layout/scan_history_activity.xml b/WordPress/src/main/res/layout/scan_history_activity.xml
new file mode 100644
index 000000000000..2a1f74b68de5
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_history_activity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container_view"
+    android:name="org.wordpress.android.ui.jetpack.scan.history.ScanHistoryFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/WordPress/src/main/res/layout/scan_history_fragment.xml b/WordPress/src/main/res/layout/scan_history_fragment.xml
new file mode 100644
index 000000000000..95d111363b16
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_history_fragment.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        app:liftOnScroll="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar"
+            app:layout_scrollFlags="scroll|enterAlways" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tab_layout"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_gravity="bottom"
+            android:visibility="visible"
+            app:tabMode="scrollable" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <include
+        android:id="@+id/fullscreen_error_with_retry"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        layout="@layout/fullscreen_error_with_retry" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/WordPress/src/main/res/layout/scan_history_list_fragment.xml b/WordPress/src/main/res/layout/scan_history_list_fragment.xml
new file mode 100644
index 000000000000..51a8a7e88f25
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_history_list_fragment.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <org.wordpress.android.ui.prefs.EmptyViewRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <org.wordpress.android.ui.ActionableEmptyView
+        android:id="@+id/actionable_empty_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:visibility="gone"
+        app:aevImage="@drawable/img_illustration_empty_results_216dp"
+        app:aevSubtitle=""
+        app:aevTitle="@string/scan_history_no_threats_found" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/scan_list_threat_item.xml b/WordPress/src/main/res/layout/scan_list_threat_item.xml
new file mode 100644
index 000000000000..60dfbe741365
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_list_threat_item.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:minHeight="?attr/listPreferredItemHeight"
+    tools:layout_height="?attr/listPreferredItemHeightLarge">
+
+    <ImageView
+        android:id="@+id/threat_icon"
+        style="@style/Scan.Threat.Icon"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/icon_wrapper"
+        app:layout_constraintStart_toStartOf="@id/icon_wrapper"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ProgressBar
+        android:id="@+id/loading"
+        style="@style/Scan.Threat.Icon"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="@id/icon_wrapper"
+        app:layout_constraintStart_toStartOf="@id/icon_wrapper"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@id/icon_wrapper"
+        style="@style/Scan.Threat.Icon"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/threat_header"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/threat_header"
+        style="@style/Scan.Threat.Header"
+        app:layout_constraintBottom_toTopOf="@id/threat_sub_header"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/icon_wrapper"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"
+        tools:text="@string/threat_item_header_vulnerable_plugin" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/threat_sub_header"
+        style="@style/Scan.Threat.SecondaryHeader"
+        app:layout_constraintBottom_toTopOf="@id/divider"
+        app:layout_constraintEnd_toEndOf="@+id/threat_header"
+        app:layout_constraintStart_toStartOf="@+id/threat_header"
+        app:layout_constraintTop_toBottomOf="@+id/threat_header"
+        tools:text="@string/threat_item_sub_header_vulnerable_plugin" />
+
+    <View
+        android:id="@+id/divider"
+        android:layout_width="0dp"
+        android:layout_height="@dimen/list_divider_height"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/scan_list_threat_item_loading_skeleton.xml b/WordPress/src/main/res/layout/scan_list_threat_item_loading_skeleton.xml
new file mode 100644
index 000000000000..fc20155e9a52
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_list_threat_item_loading_skeleton.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.facebook.shimmer.ShimmerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    app:shimmer_base_alpha="@dimen/skeleton_shimmer_base_alpha"
+    app:shimmer_highlight_alpha="@dimen/skeleton_shimmer_highlight_alpha">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:minHeight="?attr/listPreferredItemHeight"
+        tools:layout_height="?attr/listPreferredItemHeightLarge">
+
+        <View
+            android:id="@+id/skeleton_icon"
+            style="@style/Scan.Threat.Icon"
+            android:background="@color/gray_30"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/skeleton_title"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/skeleton_title"
+            style="@style/Scan.Threat.Header"
+            android:layout_height="@dimen/scan_list_threat_skeleton_text_height"
+            android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+            android:background="@color/gray_30"
+            app:layout_constraintBottom_toTopOf="@+id/skeleton_subtitle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/skeleton_icon"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+        <View
+            android:id="@+id/skeleton_subtitle"
+            style="@style/Scan.Threat.SecondaryHeader"
+            android:layout_height="@dimen/scan_list_threat_skeleton_text_height"
+            android:layout_marginEnd="@dimen/margin_extra_extra_extra_large"
+            android:background="@color/gray_30"
+            android:layout_marginTop="@dimen/margin_medium"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/skeleton_title"
+            app:layout_constraintTop_toBottomOf="@+id/skeleton_title"
+            app:layout_constraintVertical_chainStyle="packed" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.facebook.shimmer.ShimmerFrameLayout>
diff --git a/WordPress/src/main/res/layout/scan_list_threats_date_item.xml b/WordPress/src/main/res/layout/scan_list_threats_date_item.xml
new file mode 100644
index 000000000000..41c94c108024
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_list_threats_date_item.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/date_text"
+        style="@style/Scan.Threats.Date"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/threats_found" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/scan_list_threats_header_item.xml b/WordPress/src/main/res/layout/scan_list_threats_header_item.xml
new file mode 100644
index 000000000000..b2694eaf956d
--- /dev/null
+++ b/WordPress/src/main/res/layout/scan_list_threats_header_item.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/header_text"
+        style="@style/Scan.Threats.Header"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/threats_found_plural" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/signup_epilogue.xml b/WordPress/src/main/res/layout/signup_epilogue.xml
index 4861782e7454..1d00992ce9ec 100644
--- a/WordPress/src/main/res/layout/signup_epilogue.xml
+++ b/WordPress/src/main/res/layout/signup_epilogue.xml
@@ -77,7 +77,7 @@
     </FrameLayout>
 
     <com.google.android.material.button.MaterialButton
-        android:id="@+id/primary_button"
+        android:id="@+id/bottom_button"
         style="@style/Widget.LoginFlow.Button.Primary"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/WordPress/src/main/res/layout/site_creation_activity.xml b/WordPress/src/main/res/layout/site_creation_activity.xml
index 4fc2787e3437..37fc3d13c814 100644
--- a/WordPress/src/main/res/layout/site_creation_activity.xml
+++ b/WordPress/src/main/res/layout/site_creation_activity.xml
@@ -3,7 +3,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:baselineAligned="true"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:background="?attr/layoutPickerBackground">
 
     <FrameLayout
         android:id="@+id/fragment_container"
diff --git a/WordPress/src/main/res/layout/site_creation_domains_item.xml b/WordPress/src/main/res/layout/site_creation_domains_item.xml
index 09b44984be2f..5a792e75fd9d 100644
--- a/WordPress/src/main/res/layout/site_creation_domains_item.xml
+++ b/WordPress/src/main/res/layout/site_creation_domains_item.xml
@@ -22,29 +22,39 @@
         android:paddingBottom="@dimen/margin_medium"
         android:textAlignment="viewStart"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/domain_suggestion"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="RtlSymmetry" />
 
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/name_suggestion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingTop="@dimen/margin_medium"
+        android:paddingBottom="@dimen/margin_medium"
+        android:textAlignment="viewStart"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        app:layout_constraintStart_toEndOf="@+id/domain_suggestion_radio_button"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="johndoe" />
+
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/domain_suggestion"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/margin_medium"
         android:paddingEnd="@dimen/margin_extra_large"
         android:paddingBottom="@dimen/margin_medium"
         android:textAlignment="viewStart"
         android:textAppearance="?attr/textAppearanceSubtitle1"
-        app:layout_constraintBottom_toTopOf="@+id/domain_unavailability"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/domain_suggestion_radio_button"
+        android:textColor="?attr/wpColorOnSurfaceMedium"
+        app:layout_constraintStart_toEndOf="@+id/name_suggestion"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="johndoe.wordpress.com" />
+        tools:text=".wordpress.com" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/domain_unavailability"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingBottom="@dimen/margin_medium"
         android:textAlignment="viewStart"
@@ -52,7 +62,7 @@
         android:textColor="?attr/wpColorOnSurfaceMedium"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/domain_suggestion"
-        app:layout_constraintTop_toBottomOf="@+id/domain_suggestion" />
+        app:layout_constraintStart_toStartOf="@+id/name_suggestion"
+        app:layout_constraintTop_toBottomOf="@+id/name_suggestion"
+        tools:text="This domain is unavailable" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/site_creation_domains_screen.xml b/WordPress/src/main/res/layout/site_creation_domains_screen.xml
index 8e3242d2b22c..d40e2da59c78 100644
--- a/WordPress/src/main/res/layout/site_creation_domains_screen.xml
+++ b/WordPress/src/main/res/layout/site_creation_domains_screen.xml
@@ -43,11 +43,36 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/search_input_layout" />
 
-    <com.google.android.material.card.MaterialCardView
+    <include
+        android:id="@+id/domain_list_example"
+        layout="@layout/site_creation_domains_screen_example"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+        android:layout_marginStart="@dimen/margin_extra_extra_medium_large"
+        android:layout_marginTop="@dimen/site_creation_domains_example_top_margin"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/search_input_layout" />
+
+    <View
+        android:id="@+id/create_site_button_shaddow"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/mlp_bottom_shadow_height"
+        android:background="@drawable/modal_layout_picker_bottom_shadow"
+        app:layout_constraintBottom_toTopOf="@id/create_site_button_container"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <FrameLayout
         android:id="@+id/create_site_button_container"
-        style="@style/Widget.LoginFlow.CardView.BottomBar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:background="?attr/layoutPickerBackground"
+        android:gravity="center"
+        android:paddingBottom="@dimen/picker_bottom_button_vertical_margin"
+        android:paddingTop="@dimen/picker_bottom_button_vertical_margin"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -56,13 +81,13 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/create_site_button"
-            style="@style/Widget.LoginFlow.Button.Primary"
-            android:layout_width="wrap_content"
+            style="@style/Widget.ModalLayoutPicker.Button.Primary"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_margin="@dimen/margin_extra_large"
+            android:layout_marginEnd="@dimen/mlp_bottom_button_horizontal_margin"
+            android:layout_marginStart="@dimen/mlp_bottom_button_horizontal_margin"
             android:text="@string/new_site_creation_create_site_button" />
-    </com.google.android.material.card.MaterialCardView>
+    </FrameLayout>
 
     <FrameLayout
         android:id="@+id/domain_list_empty_view"
diff --git a/WordPress/src/main/res/layout/site_creation_domains_screen_example.xml b/WordPress/src/main/res/layout/site_creation_domains_screen_example.xml
new file mode 100644
index 000000000000..762f87e791e5
--- /dev/null
+++ b/WordPress/src/main/res/layout/site_creation_domains_screen_example.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_marginEnd="@dimen/margin_extra_extra_medium_large"
+    android:layout_marginStart="@dimen/margin_extra_extra_medium_large"
+    android:layout_marginTop="@dimen/site_creation_domains_example_top_margin"
+    android:background="@drawable/bg_site_creation_domain_example"
+    android:paddingEnd="@dimen/margin_medium"
+    android:paddingStart="@dimen/margin_medium">
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/site_creation_domains_example_top_cell_height"
+        android:layout_gravity="start"
+        android:layout_marginTop="@dimen/margin_medium"
+        android:background="@drawable/bg_site_creation_domain_example_cell" />
+    <TextView
+        style="@style/SiteCreationDomainExample"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/margin_large"
+        android:text="@string/new_site_creation_search_domain_example" />
+    <View
+        android:layout_width="@dimen/site_creation_domains_example_right_cell_width"
+        android:layout_height="@dimen/site_creation_domains_example_middle_cell_height"
+        android:layout_gravity="end"
+        android:layout_marginTop="@dimen/site_creation_domains_example_middle_cell_top_margin"
+        android:background="@drawable/bg_site_creation_domain_example_cell" />
+    <View
+        android:layout_width="@dimen/site_creation_domains_example_left_cell_width"
+        android:layout_height="@dimen/site_creation_domains_example_middle_cell_height"
+        android:layout_marginTop="@dimen/site_creation_domains_example_middle_cell_top_margin"
+        android:background="@drawable/bg_site_creation_domain_example_cell" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/site_creation_domains_example_bottom_cell_top_margin"
+        android:background="@drawable/bg_site_creation_domain_example_bottomcell" />
+</FrameLayout>
diff --git a/WordPress/src/main/res/layout/site_creation_form_screen.xml b/WordPress/src/main/res/layout/site_creation_form_screen.xml
index 31c06179cced..c8fd86f69919 100644
--- a/WordPress/src/main/res/layout/site_creation_form_screen.xml
+++ b/WordPress/src/main/res/layout/site_creation_form_screen.xml
@@ -9,6 +9,7 @@
         android:id="@+id/appbar_main"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/layoutPickerBackground"
         app:liftOnScrollTargetViewId="@+id/site_creation_nested_scroll_view">
 
         <com.google.android.material.appbar.MaterialToolbar
diff --git a/WordPress/src/main/res/layout/site_creation_header_item.xml b/WordPress/src/main/res/layout/site_creation_header_item.xml
index ada46a36ac39..859c00efb9be 100644
--- a/WordPress/src/main/res/layout/site_creation_header_item.xml
+++ b/WordPress/src/main/res/layout/site_creation_header_item.xml
@@ -4,19 +4,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/SiteCreationHeaderLinearLayoutStyle"
     android:paddingStart="@dimen/site_creation_segments_content_padding_horizontal"
-    android:paddingTop="@dimen/site_creation_segments_content_padding_vertical"
     android:paddingEnd="@dimen/site_creation_segments_content_padding_horizontal"
     android:paddingBottom="@dimen/site_creation_segments_content_padding_vertical">
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/title"
-        style="@style/SiteCreationHeaderTitle"
+        style="@style/ModalLayoutPickerTitle"
         app:fixWidowWords="true"
         tools:text="What's the focus of your business?" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/subtitle"
-        style="@style/SiteCreationHeaderSubtitle"
+        style="@style/ModalLayoutPickerSubtitle"
         app:fixWidowWords="true"
         tools:text="We’ll use your answer to add sections to your website." />
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/site_creation_preview_web_view_container.xml b/WordPress/src/main/res/layout/site_creation_preview_web_view_container.xml
index 47593f019883..33c56761b49a 100644
--- a/WordPress/src/main/res/layout/site_creation_preview_web_view_container.xml
+++ b/WordPress/src/main/res/layout/site_creation_preview_web_view_container.xml
@@ -42,7 +42,7 @@
             </FrameLayout>
         </com.google.android.material.card.MaterialCardView>
 
-        <org.wordpress.android.ui.WPWebView
+        <org.wordpress.android.widgets.NestedWebView
             android:id="@+id/sitePreviewWebView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/WordPress/src/main/res/layout/site_creation_search_input_item.xml b/WordPress/src/main/res/layout/site_creation_search_input_item.xml
index 96e7e2357cdb..47eb4cd8d607 100644
--- a/WordPress/src/main/res/layout/site_creation_search_input_item.xml
+++ b/WordPress/src/main/res/layout/site_creation_search_input_item.xml
@@ -21,12 +21,15 @@
             android:id="@+id/input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_small"
+            android:drawablePadding="@dimen/margin_extra_large"
             android:background="@android:color/transparent"
             android:imeOptions="actionSearch"
             android:importantForAutofill="noExcludeDescendants"
             android:inputType="text"
             android:singleLine="true"
             android:textAlignment="viewStart"
+            android:textAppearance="?attr/textAppearanceSubtitle1"
             tools:hint="Type a keyword for more ideas"
             tools:ignore="RtlSymmetry"
             tools:targetApi="o" />
@@ -37,7 +40,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:background="?attr/colorSurface"
+        android:background="?attr/layoutPickerBackground"
         tools:visibility="invisible">
 
         <ProgressBar
@@ -68,7 +71,7 @@
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/divider_size"
+        android:layout_height="0dp"
         android:layout_alignBottom="@+id/input_container"
         android:layout_marginStart="@dimen/margin_extra_large"
         android:layout_marginEnd="@dimen/margin_extra_large"
diff --git a/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list.xml b/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list.xml
new file mode 100644
index 000000000000..c2096dc905b6
--- /dev/null
+++ b/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ProgressBar
+        android:id="@+id/progress_view"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/empty_view"
+        style="@style/EmptyListText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:text="@string/empty_list_default"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        android:minHeight="512dp"
+        android:scrollbars="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/margin_extra_medium_large"
+        android:clipToPadding="false"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constrainedHeight="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_timezone_suggestion"
+        tools:context=".ui.prefs.timezone.SiteSettingsTimezoneBottomSheet"
+        tools:listitem="@layout/site_settings_timezone_bottom_sheet_list_item" />
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/search_input_layout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_extra_large"
+        android:hint="@string/search"
+        app:endIconMode="clear_text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:startIconDrawable="@drawable/ic_search_white_24dp"
+        app:startIconTint="?attr/wpColorOnSurfaceMedium">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionSearch"
+            android:inputType="textNoSuggestions"
+            android:selectAllOnFocus="true"
+            />
+
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text_timezone_suggestion"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/margin_extra_large"
+        android:text="@string/suggestion"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/search_input_layout"
+        />
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_timezone_suggestion"
+        style="@style/Widget.MaterialComponents.Button.TextButton"
+        android:layout_marginTop="@dimen/margin_small_medium"
+        android:gravity="start"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAllCaps="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/text_timezone_suggestion"
+        app:layout_constraintTop_toBottomOf="@id/search_input_layout"
+        tools:text="America/Los Angeles"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list_header.xml b/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list_header.xml
new file mode 100644
index 000000000000..4692ee4023f9
--- /dev/null
+++ b/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list_header.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/header_time_zone"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:paddingStart="@dimen/margin_extra_large"
+    android:paddingEnd="@dimen/margin_extra_large"
+    android:paddingBottom="@dimen/margin_medium"
+    android:paddingTop="@dimen/margin_extra_medium_large"
+    android:textAppearance="?attr/textAppearanceHeadline6"
+    tools:text="Africa" />
diff --git a/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list_item.xml b/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list_item.xml
new file mode 100644
index 000000000000..13a87250a047
--- /dev/null
+++ b/WordPress/src/main/res/layout/site_settings_timezone_bottom_sheet_list_item.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/item_time_zone"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:padding="@dimen/margin_extra_large">
+
+    <TextView
+        android:id="@+id/time_zone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/margin_small"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        android:maxLines="1"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Abidjan" />
+
+    <TextView
+        android:id="@+id/zone_offset"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:maxLines="1"
+        android:textColor="?attr/wpColorOnSurfaceMedium"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/time_zone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/zone_time"
+        tools:text="Australian Central Western Time (GMT-9:00)" />
+
+    <TextView
+        android:id="@+id/zone_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?attr/wpColorOnSurfaceMedium"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/time_zone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="8:00 AM" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
diff --git a/WordPress/src/main/res/layout/snackbar.xml b/WordPress/src/main/res/layout/snackbar.xml
deleted file mode 100644
index ecbbe5a5ed82..000000000000
--- a/WordPress/src/main/res/layout/snackbar.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/snackbar"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:minHeight="@dimen/snackbar_height_minimum"
-    android:paddingEnd="@dimen/margin_medium"
-    android:paddingStart="@dimen/margin_medium"
-    tools:background="@drawable/bg_snackbar"
-    tools:layout_margin="@dimen/margin_medium">
-
-    <Button
-        android:id="@+id/action"
-        android:fontFamily="sans-serif-medium"
-        android:layout_alignParentEnd="true"
-        android:layout_centerVertical="true"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:minHeight="@dimen/min_touch_target_sz"
-        android:minWidth="@dimen/min_touch_target_sz"
-        android:textColor="@color/accent_30"
-        android:visibility="gone"
-        tools:text="Action"
-        tools:visibility="visible"
-        style="@android:style/Widget.Material.Button.Borderless">
-    </Button>
-
-    <TextView
-        android:id="@+id/message"
-        android:ellipsize="end"
-        android:gravity="center_vertical"
-        android:layout_alignParentStart="true"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/action"
-        android:layout_width="wrap_content"
-        android:maxLines="2"
-        android:paddingBottom="@dimen/margin_large"
-        android:paddingEnd="@dimen/margin_medium"
-        android:paddingStart="@dimen/margin_medium"
-        android:paddingTop="@dimen/margin_large"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/text_sz_medium"
-        android:visibility="gone"
-        tools:text="Message that is limited to two lines of text with an ellipsis is shown when there is more text"
-        tools:visibility="visible">
-    </TextView>
-
-</RelativeLayout>
diff --git a/WordPress/src/main/res/layout/stats_all_time_widget_configure_activity.xml b/WordPress/src/main/res/layout/stats_all_time_widget_configure_activity.xml
index 2dfe606402fd..5ebea8400ce8 100644
--- a/WordPress/src/main/res/layout/stats_all_time_widget_configure_activity.xml
+++ b/WordPress/src/main/res/layout/stats_all_time_widget_configure_activity.xml
@@ -19,7 +19,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:viewType="allTime" />
 
-        <include layout="@layout/toolbar_main" />
+        <include android:id="@+id/toolbar" layout="@layout/toolbar_main" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/WordPress/src/main/res/layout/stats_block_dialog_buttons_item.xml b/WordPress/src/main/res/layout/stats_block_dialog_buttons_item.xml
index e6c3e43ad675..1561b37067cc 100644
--- a/WordPress/src/main/res/layout/stats_block_dialog_buttons_item.xml
+++ b/WordPress/src/main/res/layout/stats_block_dialog_buttons_item.xml
@@ -2,28 +2,25 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/stats_insights_button_container_height"
-    android:gravity="end">
+    android:layout_height="wrap_content"
+    android:gravity="end"
+    android:minHeight="@dimen/stats_insights_button_container_height">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button_negative"
         style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="@dimen/margin_medium"
-        android:layout_marginBottom="@dimen/margin_medium"
         tools:text="Cancel" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button_positive"
         style="@style/Widget.MaterialComponents.Button.TextButton"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="@dimen/margin_medium"
         android:layout_marginEnd="@dimen/margin_medium"
-        android:layout_marginBottom="@dimen/margin_medium"
         tools:text="OK" />
 
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/stats_detail_activity.xml b/WordPress/src/main/res/layout/stats_detail_activity.xml
index 12cfea7ae1f3..733188e8e9cf 100644
--- a/WordPress/src/main/res/layout/stats_detail_activity.xml
+++ b/WordPress/src/main/res/layout/stats_detail_activity.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="org.wordpress.android.ui.stats.refresh.lists.detail.StatsDetailFragment"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/stats_detail_fragment.xml b/WordPress/src/main/res/layout/stats_detail_fragment.xml
index 8f1e7de5401f..8a9186d69e38 100644
--- a/WordPress/src/main/res/layout/stats_detail_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_detail_fragment.xml
@@ -16,7 +16,7 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <fragment
+            <androidx.fragment.app.FragmentContainerView
                 android:id="@+id/fragment_container"
                 android:name="org.wordpress.android.ui.stats.refresh.lists.StatsListFragment"
                 android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/stats_list_activity.xml b/WordPress/src/main/res/layout/stats_list_activity.xml
index 55e21d8fb729..864cc83da569 100644
--- a/WordPress/src/main/res/layout/stats_list_activity.xml
+++ b/WordPress/src/main/res/layout/stats_list_activity.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="org.wordpress.android.ui.stats.refresh.StatsFragment"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/stats_list_fragment.xml b/WordPress/src/main/res/layout/stats_list_fragment.xml
index c155d15226c9..eaeb723d09b3 100644
--- a/WordPress/src/main/res/layout/stats_list_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_list_fragment.xml
@@ -19,8 +19,9 @@
             android:layout_height="wrap_content">
 
             <include
-                   android:duplicateParentState="true"
-                layout="@layout/stats_date_selector" />
+                android:id="@+id/date_selector"
+                layout="@layout/stats_date_selector"
+                android:duplicateParentState="true" />
         </com.google.android.material.appbar.MaterialToolbar>
     </com.google.android.material.appbar.AppBarLayout>
 
@@ -33,12 +34,13 @@
 
 
         <include
+            android:id="@+id/error_view"
             layout="@layout/stats_error_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_weight="1" />
 
-        <include layout="@layout/stats_empty_view" />
+        <include android:id="@+id/empty_view" layout="@layout/stats_empty_view" />
 
         <com.facebook.shimmer.ShimmerFrameLayout
             android:id="@+id/loadingContainer"
diff --git a/WordPress/src/main/res/layout/stats_minified_widget_configure_activity.xml b/WordPress/src/main/res/layout/stats_minified_widget_configure_activity.xml
index 25703e70cee2..2b833d70c3c0 100644
--- a/WordPress/src/main/res/layout/stats_minified_widget_configure_activity.xml
+++ b/WordPress/src/main/res/layout/stats_minified_widget_configure_activity.xml
@@ -18,7 +18,7 @@
             android:layout_below="@id/toolbar"
             app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-        <include layout="@layout/toolbar_main" />
+        <include android:id="@+id/toolbar" layout="@layout/toolbar_main" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/WordPress/src/main/res/layout/stats_today_widget_configure_activity.xml b/WordPress/src/main/res/layout/stats_today_widget_configure_activity.xml
index 01829263cea9..0255cbafe7f8 100644
--- a/WordPress/src/main/res/layout/stats_today_widget_configure_activity.xml
+++ b/WordPress/src/main/res/layout/stats_today_widget_configure_activity.xml
@@ -19,7 +19,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:viewType="today" />
 
-        <include layout="@layout/toolbar_main" />
+        <include android:id="@+id/toolbar" layout="@layout/toolbar_main" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/WordPress/src/main/res/layout/stats_view_all_activity.xml b/WordPress/src/main/res/layout/stats_view_all_activity.xml
index 3c11456f5eda..4d2bfae70b54 100644
--- a/WordPress/src/main/res/layout/stats_view_all_activity.xml
+++ b/WordPress/src/main/res/layout/stats_view_all_activity.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/fragment_container"
         android:name="org.wordpress.android.ui.stats.refresh.StatsViewAllFragment"
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/stats_view_all_fragment.xml b/WordPress/src/main/res/layout/stats_view_all_fragment.xml
index a21d1625be94..c548237e9ccc 100644
--- a/WordPress/src/main/res/layout/stats_view_all_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_view_all_fragment.xml
@@ -13,15 +13,18 @@
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:fillViewport="true">
+            android:fillViewport="true"
+            android:layout_below="@id/toolbar"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             <org.wordpress.android.util.widgets.CustomSwipeRefreshLayout
                 android:id="@+id/pullToRefresh"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+                android:layout_height="match_parent">
 
-                <include layout="@layout/stats_list_fragment" />
+                <include
+                    android:id="@+id/stats_list_fragment"
+                    layout="@layout/stats_list_fragment" />
 
             </org.wordpress.android.util.widgets.CustomSwipeRefreshLayout>
 
diff --git a/WordPress/src/main/res/layout/stats_views_widget_configure_activity.xml b/WordPress/src/main/res/layout/stats_views_widget_configure_activity.xml
index 804c62d3b96c..f4084046260f 100644
--- a/WordPress/src/main/res/layout/stats_views_widget_configure_activity.xml
+++ b/WordPress/src/main/res/layout/stats_views_widget_configure_activity.xml
@@ -19,7 +19,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:viewType="views" />
 
-        <include layout="@layout/toolbar_main" />
+        <include android:id="@+id/toolbar" layout="@layout/toolbar_main" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/WordPress/src/main/res/layout/subfilter_bottom_sheet.xml b/WordPress/src/main/res/layout/subfilter_bottom_sheet.xml
index 50e521045888..b378fe80bfd2 100644
--- a/WordPress/src/main/res/layout/subfilter_bottom_sheet.xml
+++ b/WordPress/src/main/res/layout/subfilter_bottom_sheet.xml
@@ -33,8 +33,7 @@
             app:tabIndicatorColor="?attr/colorPrimary"
             app:tabMode="scrollable"
             app:tabPaddingEnd="@dimen/content_bottom_sheet_tab_padding"
-            app:tabPaddingStart="@dimen/content_bottom_sheet_tab_padding"
-            app:tabTextColor="@color/primary_on_surface_selector" />
+            app:tabPaddingStart="@dimen/content_bottom_sheet_tab_padding" />
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/view_pager"
diff --git a/WordPress/src/main/res/layout/subfilter_list_item.xml b/WordPress/src/main/res/layout/subfilter_list_item.xml
index 8e65d63b1c66..b1210de07c9b 100644
--- a/WordPress/src/main/res/layout/subfilter_list_item.xml
+++ b/WordPress/src/main/res/layout/subfilter_list_item.xml
@@ -10,11 +10,12 @@
         style="@style/SiteTagFilteredTitle"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintEnd_toStartOf="@+id/item_selected"
+        app:layout_constraintEnd_toStartOf="@+id/unseen_count"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/item_url"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_goneMarginBottom="@dimen/margin_large"
+        app:layout_goneMarginEnd="0dp"
         tools:text="Unknown" />
 
     <TextView
@@ -23,23 +24,32 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/item_selected"
+        app:layout_constraintEnd_toStartOf="@+id/unseen_count"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/item_title"
         android:visibility="visible"
+        app:layout_goneMarginEnd="0dp"
         tools:text="www.unknown.com" />
 
-    <ImageView
-        android:id="@+id/item_selected"
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/unseen_count"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_done_white_24dp"
-        app:tint="?attr/colorPrimary"
+        android:layout_height="@dimen/reader_subfilter_unseen_count_height"
+        android:background="@drawable/bg_oval_surface_overlay_emphasis_lowest"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:importantForAccessibility="no"
+        android:includeFontPadding="false"
+        android:maxLines="1"
+        android:paddingEnd="@dimen/margin_large"
+        android:paddingStart="@dimen/margin_large"
+        android:textAppearance="?attr/textAppearanceCaption"
+        android:textColor="@color/material_on_surface_emphasis_high_type"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:visibility="gone"
-        tools:visibility="visible"
-        android:contentDescription="@string/reader_btn_selected_filter_tick_content_description" />
+        tools:text="10"
+        tools:visibility="visible"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/suggest_users_activity.xml b/WordPress/src/main/res/layout/suggest_users_activity.xml
index 03aea22f2a7b..a44924591aae 100644
--- a/WordPress/src/main/res/layout/suggest_users_activity.xml
+++ b/WordPress/src/main/res/layout/suggest_users_activity.xml
@@ -32,7 +32,7 @@
         android:paddingStart="@dimen/margin_extra_large"
         android:paddingEnd="@dimen/margin_extra_large"
         android:dropDownWidth="match_parent"
-        android:imeOptions="actionDone"
+        android:imeOptions="actionDone|flagNoExtractUi"
         android:inputType="text"
         android:background="?attr/colorGutenbergBackground"
         android:textAppearance="?attr/textAppearanceBody1"
diff --git a/WordPress/src/main/res/layout/suggestion_list_row.xml b/WordPress/src/main/res/layout/suggestion_list_row.xml
index d8c58810fb42..823bee2941d2 100644
--- a/WordPress/src/main/res/layout/suggestion_list_row.xml
+++ b/WordPress/src/main/res/layout/suggestion_list_row.xml
@@ -18,7 +18,7 @@
         android:contentDescription="@null"/>
 
     <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/suggestion_list_row_user_login_label"
+        android:id="@+id/suggestion_list_row_raw_value_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1"
@@ -26,11 +26,11 @@
         android:gravity="center_vertical"
         android:maxLines="1"
         android:textAppearance="?attr/textAppearanceBody2"
-        tools:text="user_login"
+        tools:text="raw_value"
         android:layout_marginStart="@dimen/margin_medium"/>
 
     <org.wordpress.android.widgets.WPTextView
-        android:id="@+id/suggestion_list_row_display_name_label"
+        android:id="@+id/suggestion_list_row_display_value_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="2"
@@ -39,7 +39,7 @@
         android:maxLines="1"
         android:textColor="@color/neutral_30"
         android:textSize="@dimen/text_sz_medium"
-        tools:text="display_name"
+        tools:text="display_value"
         android:layout_marginStart="@dimen/margin_medium"/>
 
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/threat_context_lines_list_context_line_item.xml b/WordPress/src/main/res/layout/threat_context_lines_list_context_line_item.xml
new file mode 100644
index 000000000000..34afab073eb0
--- /dev/null
+++ b/WordPress/src/main/res/layout/threat_context_lines_list_context_line_item.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/line_number"
+        style="@style/Scan.ThreatDetails.ContextLine.LineNumber"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="4" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/content"
+        style="@style/Scan.ThreatDetails.ContextLine.Content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/line_number"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="X5O!P%@AP" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
+
+
diff --git a/WordPress/src/main/res/layout/threat_details_activity.xml b/WordPress/src/main/res/layout/threat_details_activity.xml
new file mode 100644
index 000000000000..0f43db6e04b0
--- /dev/null
+++ b/WordPress/src/main/res/layout/threat_details_activity.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/coordinator_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <fragment
+        android:id="@+id/fragment_container_view"
+        android:name="org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appbar_main"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar_main"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:theme="@style/WordPress.ActionBar" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
diff --git a/WordPress/src/main/res/layout/threat_details_fragment.xml b/WordPress/src/main/res/layout/threat_details_fragment.xml
new file mode 100644
index 000000000000..11e8fd7f116d
--- /dev/null
+++ b/WordPress/src/main/res/layout/threat_details_fragment.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <org.wordpress.android.ui.prefs.EmptyViewRecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="@dimen/margin_extra_large"
+        android:layout_marginEnd="@dimen/margin_extra_large"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/threat_details_list_context_lines_item.xml b/WordPress/src/main/res/layout/threat_details_list_context_lines_item.xml
new file mode 100644
index 000000000000..bb5b5c23bce6
--- /dev/null
+++ b/WordPress/src/main/res/layout/threat_details_list_context_lines_item.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/margin_medium"
+    android:layout_marginBottom="@dimen/margin_extra_large"
+    android:scrollbars="none">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+
+</HorizontalScrollView>
+
diff --git a/WordPress/src/main/res/layout/threat_details_list_file_name_item.xml b/WordPress/src/main/res/layout/threat_details_list_file_name_item.xml
new file mode 100644
index 000000000000..12b801ba194b
--- /dev/null
+++ b/WordPress/src/main/res/layout/threat_details_list_file_name_item.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/item_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/file_name"
+        style="@style/Scan.ThreatDetails.FileName"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="/var/html/www/index.php" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/threat_details_list_header.xml b/WordPress/src/main/res/layout/threat_details_list_header.xml
new file mode 100644
index 000000000000..69b27b08a65e
--- /dev/null
+++ b/WordPress/src/main/res/layout/threat_details_list_header.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:minHeight="?attr/listPreferredItemHeight"
+    tools:layout_height="?attr/listPreferredItemHeightLarge">
+
+    <ImageView
+        android:id="@+id/icon"
+        style="@style/Scan.ThreatDetails.Icon"
+        android:importantForAccessibility="no"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/header"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/header"
+        style="@style/Scan.ThreatDetails.Header"
+        app:layout_constraintBottom_toTopOf="@+id/description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/icon"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/threat_item_header_vulnerable_plugin" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/description"
+        style="@style/Scan.ThreatDetails.Description"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/header"
+        app:layout_constraintTop_toBottomOf="@+id/header"
+        tools:text="@string/threat_item_sub_header_vulnerable_plugin" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/user_profile_bottom_sheet.xml b/WordPress/src/main/res/layout/user_profile_bottom_sheet.xml
new file mode 100644
index 000000000000..0e7981446bd3
--- /dev/null
+++ b/WordPress/src/main/res/layout/user_profile_bottom_sheet.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:animateLayoutChanges="true"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/bottom_sheet_handle_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/user_data_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="@dimen/margin_extra_large"
+        android:paddingEnd="@dimen/margin_extra_large"
+        android:paddingStart="@dimen/margin_extra_large"
+        android:paddingTop="@dimen/margin_extra_medium_large">
+
+        <ImageView
+            android:id="@+id/user_avatar"
+            android:layout_width="@dimen/user_profile_bottom_sheet_avatar_sz"
+            android:layout_height="@dimen/user_profile_bottom_sheet_avatar_sz"
+            android:importantForAccessibility="no"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:src="@drawable/img_illustration_magician_hat_128" />
+
+        <ImageView
+            android:id="@+id/user_site_blavatar"
+            android:layout_width="@dimen/avatar_sz_medium"
+            android:layout_height="@dimen/avatar_sz_medium"
+            android:importantForAccessibility="no"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:src="@drawable/img_illustration_magician_hat_128"/>
+
+        <LinearLayout
+            android:id="@+id/user_data"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingEnd="0dp"
+            android:paddingStart="@dimen/margin_extra_large"
+            app:layout_constraintBottom_toBottomOf="@+id/user_avatar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/user_avatar"
+            app:layout_constraintTop_toTopOf="@+id/user_avatar">
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/user_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:fontFamily="serif"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:layout_marginBottom="@dimen/margin_small"
+                android:textAppearance="?attr/textAppearanceHeadline6"
+                android:textColor="@color/material_on_surface_emphasis_high_type"
+                android:textSize="@dimen/user_profile_bottom_sheet_user_name_text_size"
+                android:textStyle="bold"
+                tools:text="Pamela Nguyen" />
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/user_login"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceBody1"
+                android:textColor="@color/material_on_surface_emphasis_medium"
+                tools:text="\@pamelanguyen" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/site_data"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="@dimen/margin_extra_large"
+            android:paddingEnd="0dp"
+            android:background="?attr/selectableItemBackground"
+            app:layout_constraintBottom_toBottomOf="@+id/user_site_blavatar"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/user_site_blavatar"
+            app:layout_constraintTop_toTopOf="@+id/user_site_blavatar">
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/site_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                android:layout_marginBottom="@dimen/margin_small"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceBody1"
+                android:textColor="@color/material_on_surface_emphasis_high_type"
+                tools:text="Around the World with Pam" />
+
+            <org.wordpress.android.widgets.WPTextView
+                android:id="@+id/site_url"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:includeFontPadding="false"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceBody2"
+                android:textColor="@color/material_on_surface_emphasis_medium"
+                tools:text="pamelanguyen.com" />
+
+        </LinearLayout>
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/user_bio"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/margin_extra_large"
+            android:ellipsize="end"
+            android:maxLines="5"
+            android:textAlignment="viewStart"
+            android:lineSpacingMultiplier="1.2"
+            android:textAppearance="?attr/textAppearanceBody2"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/user_avatar"
+            tools:text="I live in Houston, by way of Taiwan, France, and Canada, and love to travel the world. Follow me as I try to visit 75 countries by the time I'm 75!" />
+
+        <org.wordpress.android.widgets.WPTextView
+            android:id="@+id/site_section_header"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_large"
+            android:layout_marginTop="@dimen/margin_extra_large"
+            android:ellipsize="end"
+            android:includeFontPadding="true"
+            android:text="@string/user_profile_site_section_header"
+            android:textAlignment="viewStart"
+            android:textAppearance="?attr/textAppearanceSubtitle2"
+            android:textSize="@dimen/text_sz_medium"
+            app:layout_constraintBottom_toTopOf="@+id/user_site_blavatar"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/user_bio" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/WordPress/src/main/res/layout/wp_edit_text_with_chips_outlined.xml b/WordPress/src/main/res/layout/wp_edit_text_with_chips_outlined.xml
new file mode 100644
index 000000000000..a5c2c137dbdc
--- /dev/null
+++ b/WordPress/src/main/res/layout/wp_edit_text_with_chips_outlined.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/constraint_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.google.android.flexbox.FlexboxLayout
+        android:id="@+id/flexbox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:flexWrap="wrap"
+        app:alignItems="stretch"
+        app:alignContent="space_around"
+        android:layout_marginTop="@dimen/edit_text_with_chips_margin_top"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:padding="@dimen/edit_text_with_chips_padding">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/flexbox_editor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_flexGrow="1"
+            android:background="@android:color/transparent"
+            android:imeOptions="actionDone|flagNoExtractUi"
+            android:inputType="text|textNoSuggestions|textEmailAddress"
+            android:textAlignment="viewStart"
+            android:textAppearance="?attr/textAppearanceSubtitle1"
+            android:minWidth="@dimen/min_touch_target_sz"
+            android:minHeight="@dimen/edit_text_with_chips_edit_view_min_height"/>
+
+    </com.google.android.flexbox.FlexboxLayout>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/flexbox_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_medium"
+        android:paddingStart="@dimen/margin_small"
+        android:paddingEnd="@dimen/margin_small"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/edit_text_with_chips_label_text_size"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        android:background="?attr/colorSurface"
+        android:textColor="?attr/colorSurface"
+        app:layout_constraintStart_toStartOf="@+id/flexbox"
+        app:layout_constraintTop_toTopOf="@+id/flexbox"
+        app:layout_constraintBottom_toTopOf="@+id/flexbox"
+        android:visibility="invisible"/>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/flexbox_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/margin_large"
+        android:paddingStart="0dp"
+        android:paddingEnd="@dimen/margin_small"
+        android:gravity="center_vertical"
+        android:textSize="@dimen/edit_text_with_chips_hint_text_size"
+        android:textAppearance="?attr/textAppearanceSubtitle1"
+        app:layout_constraintStart_toStartOf="@+id/flexbox"
+        app:layout_constraintTop_toTopOf="@+id/flexbox"
+        app:layout_constraintBottom_toBottomOf="@+id/flexbox" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/WordPress/src/main/res/layout/wpwebview_activity.xml b/WordPress/src/main/res/layout/wpwebview_activity.xml
index 44853d93fc46..0330a8c58c5f 100644
--- a/WordPress/src/main/res/layout/wpwebview_activity.xml
+++ b/WordPress/src/main/res/layout/wpwebview_activity.xml
@@ -45,10 +45,10 @@
                 android:layout_height="match_parent" />
 
             <include
+                android:id="@+id/progress_layout"
                 layout="@layout/progress_layout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_above="@+id/navbar_container"
                 android:layout_alignParentTop="true"
                 tools:visibility="gone" />
 
diff --git a/WordPress/src/main/res/menu/edit_post.xml b/WordPress/src/main/res/menu/edit_post.xml
index 86dbc0950bea..6d0d3e1e11c4 100644
--- a/WordPress/src/main/res/menu/edit_post.xml
+++ b/WordPress/src/main/res/menu/edit_post.xml
@@ -13,11 +13,6 @@
     <group
         android:orderInCategory="1" >
 
-        <item
-            android:id="@+id/menu_switch_to_aztec"
-            android:title="@string/menu_switch_to_aztec_editor">
-        </item>
-
         <item
             android:id="@+id/menu_switch_to_gutenberg"
             android:title="@string/menu_switch_to_gutenberg_editor">
diff --git a/WordPress/src/main/res/menu/menu_media_picker.xml b/WordPress/src/main/res/menu/menu_media_picker.xml
index 920c599ba032..e239ab7d7fd2 100644
--- a/WordPress/src/main/res/menu/menu_media_picker.xml
+++ b/WordPress/src/main/res/menu/menu_media_picker.xml
@@ -17,7 +17,7 @@
 
     <item
         android:id="@+id/mnu_choose_from_media_library"
-        android:icon="@drawable/ic_my_sites_white_24dp"
+        android:icon="@drawable/ic_wordpress_white_24dp"
         android:title="@string/photo_picker_wordpress_media_library"
         app:showAsAction="ifRoom|collapseActionView"
         app:tint="?attr/wpColorOnSurfaceMedium" />
diff --git a/WordPress/src/main/res/menu/menu_site_creation.xml b/WordPress/src/main/res/menu/menu_site_creation.xml
index 84886dd82216..9e6ec384e9c5 100644
--- a/WordPress/src/main/res/menu/menu_site_creation.xml
+++ b/WordPress/src/main/res/menu/menu_site_creation.xml
@@ -5,6 +5,7 @@
 
     <item
         android:id="@+id/help"
+        android:icon="@drawable/ic_help_outline_domain_24dp"
         android:title="@string/help"
         app:showAsAction="always">
     </item>
diff --git a/WordPress/src/main/res/menu/notifications_settings_secondary.xml b/WordPress/src/main/res/menu/notifications_settings_secondary.xml
index 5bfed727f8b0..7b487c10203d 100644
--- a/WordPress/src/main/res/menu/notifications_settings_secondary.xml
+++ b/WordPress/src/main/res/menu/notifications_settings_secondary.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
-        android:id="@+id/master_switch"
+        android:id="@+id/main_switch"
         android:checkable="true"
         android:enabled="true"
         android:title=""
diff --git a/WordPress/src/main/res/menu/page_more.xml b/WordPress/src/main/res/menu/page_more.xml
index 171bfd665406..6d3bbd2dd7a3 100644
--- a/WordPress/src/main/res/menu/page_more.xml
+++ b/WordPress/src/main/res/menu/page_more.xml
@@ -27,6 +27,11 @@
         android:orderInCategory="100"
         android:title="@string/pages_set_as_posts_page"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/copy"
+        android:orderInCategory="100"
+        android:title="@string/button_copy"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/publish_now"
         android:orderInCategory="100"
diff --git a/WordPress/src/main/res/menu/post_settings_location_popup.xml b/WordPress/src/main/res/menu/post_settings_location_popup.xml
deleted file mode 100644
index dff42c58e8d9..000000000000
--- a/WordPress/src/main/res/menu/post_settings_location_popup.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/menu_change_location"
-        android:icon="@drawable/ic_location_white_24dp"
-        android:title="@string/change_location"
-        app:iconTint="@color/gray_60">
-    </item>
-
-    <item
-        android:id="@+id/menu_remove_location"
-        android:icon="@drawable/ic_cross_white_24dp"
-        android:title="@string/remove_location"
-        app:iconTint="@color/gray_60">
-    </item>
-
-</menu>
diff --git a/WordPress/src/main/res/menu/scan_menu.xml b/WordPress/src/main/res/menu/scan_menu.xml
new file mode 100644
index 000000000000..905152de47b1
--- /dev/null
+++ b/WordPress/src/main/res/menu/scan_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_scan_history"
+        android:title="@string/scan_history_menu_title"
+        app:showAsAction="always" />
+</menu>
diff --git a/WordPress/src/main/res/mipmap-hdpi/app_icon.png b/WordPress/src/main/res/mipmap-hdpi/app_icon.png
index 11505f7ebd21..37d6ab802d54 100644
Binary files a/WordPress/src/main/res/mipmap-hdpi/app_icon.png and b/WordPress/src/main/res/mipmap-hdpi/app_icon.png differ
diff --git a/WordPress/src/main/res/mipmap-xhdpi/app_icon.png b/WordPress/src/main/res/mipmap-xhdpi/app_icon.png
index a0a132106b12..0a8e4e0fc147 100644
Binary files a/WordPress/src/main/res/mipmap-xhdpi/app_icon.png and b/WordPress/src/main/res/mipmap-xhdpi/app_icon.png differ
diff --git a/WordPress/src/main/res/mipmap-xxhdpi/app_icon.png b/WordPress/src/main/res/mipmap-xxhdpi/app_icon.png
index 08c5fd2ddf69..0517734c4dc6 100644
Binary files a/WordPress/src/main/res/mipmap-xxhdpi/app_icon.png and b/WordPress/src/main/res/mipmap-xxhdpi/app_icon.png differ
diff --git a/WordPress/src/main/res/mipmap-xxxhdpi/app_icon.png b/WordPress/src/main/res/mipmap-xxxhdpi/app_icon.png
index 31f309d28179..c84fe997c745 100644
Binary files a/WordPress/src/main/res/mipmap-xxxhdpi/app_icon.png and b/WordPress/src/main/res/mipmap-xxxhdpi/app_icon.png differ
diff --git a/WordPress/src/main/res/raw/confetti.json b/WordPress/src/main/res/raw/confetti.json
new file mode 100644
index 000000000000..a52307e82792
--- /dev/null
+++ b/WordPress/src/main/res/raw/confetti.json
@@ -0,0 +1 @@
+{"v":"5.5.6","fr":60,"ip":0,"op":300,"w":1200,"h":1600,"nm":"lottie (mobile)","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"_small-side","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[218,320,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[-100,100,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":15,"op":234,"st":15,"bm":0}]},{"id":"comp_1","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"streamer b","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":166,"ix":10},"p":{"a":0,"k":[554,664,0],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.929411768913,0.745098054409,0.196078434587,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":9,"s":[4]},{"t":57,"s":[0.5]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":14,"s":[0]},{"t":57,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":9,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":14,"s":[35]},{"t":57,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":9,"op":58,"st":9,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"streamer a","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":167,"ix":10},"p":{"a":0,"k":[532,582,0],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[-100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.196078434587,0.380392163992,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[4]},{"t":48,"s":[0.5]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[0]},{"t":48,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[35]},{"t":48,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":5,"op":49,"st":5,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"circle a","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":29,"s":[321.019]},{"t":158,"s":[1800]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":1,"s":[599.5,838,0],"to":[-30,-106.667,0],"ti":[46.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":29,"s":[419.5,198,0],"to":[-46.667,0,0],"ti":[0,0,0]},{"t":158,"s":[319.5,838,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":1,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":29,"s":[100,100,100]},{"t":128,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.960784316063,0.572549045086,0.180392161012,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1,"op":159,"st":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"circle b","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[0]},{"t":128,"s":[1440]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":3,"s":[599.5,838,0],"to":[-26.667,-93.333,0],"ti":[66.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":21,"s":[439.5,278,0],"to":[-66.667,0,0],"ti":[0,0,0]},{"t":128,"s":[199.5,838,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":3,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[100,100,100]},{"t":98,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.196078434587,0.588235318661,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3,"op":129,"st":3,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"star a","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":31,"s":[343.949]},{"t":158,"s":[1800]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":1,"s":[596.087,836.292,0],"to":[-36.098,-100,0],"ti":[52.765,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":31,"s":[379.5,236.292,0],"to":[-52.765,0,0],"ti":[0,0,0]},{"t":158,"s":[279.5,836.292,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":1,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":31,"s":[100,100,100]},{"t":128,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.745098054409,0.196078434587,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1,"op":159,"st":1,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"star b","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":23,"s":[288]},{"t":128,"s":[1800]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":3,"s":[596.087,836.292,0],"to":[-39.431,-113.333,0],"ti":[66.098,1.667,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":23,"s":[359.5,156.292,0],"to":[-66.098,-1.667,0],"ti":[0,0,0]},{"t":128,"s":[199.5,826.292,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":3,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":23,"s":[100,100,100]},{"t":98,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.537254929543,0.196078434587,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3,"op":129,"st":3,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"rec a","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":33,"s":[381.468]},{"t":218,"s":[2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":0,"s":[599.5,842,0],"to":[-23.333,-100,0],"ti":[41.333,1.333,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[459.5,242,0],"to":[-41.333,-1.333,0],"ti":[0,0,0]},{"t":218,"s":[351.5,834,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":0,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":188,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.305882364511,0.831372559071,0.411764711142,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":219,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"rec b","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[262.857]},{"t":191,"s":[2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":2,"s":[599.5,842,0],"to":[-23.333,-113.333,0],"ti":[74,5,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":25,"s":[459.5,162,0],"to":[-74,-5,0],"ti":[0,0,0]},{"t":191,"s":[155.5,812,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":2,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":25,"s":[100,100,100]},{"t":161,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.196078434587,0.784313738346,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":192,"st":2,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"square a","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":35,"s":[462.385]},{"t":218,"s":[2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":0,"s":[599.5,838,0],"to":[-43.333,-123.333,0],"ti":[60,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":35,"s":[339.5,98,0],"to":[-60,0,0],"ti":[0,0,0]},{"t":218,"s":[239.5,838,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":0,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":35,"s":[100,100,100]},{"t":188,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.588235318661,0.831372559071,0.305882364511,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":219,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"square b","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[285.714]},{"t":191,"s":[2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":2,"s":[599.5,838,0],"to":[-30,-120,0],"ti":[75,3.333,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":27,"s":[419.5,118,0],"to":[-75,-3.333,0],"ti":[0,0,0]},{"t":191,"s":[149.5,818,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0,0]},"t":2,"s":[50,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":27,"s":[100,100,100]},{"t":161,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.196078434587,0.380392163992,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":192,"st":2,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"streamer b 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":171,"ix":10},"p":{"a":0,"k":[543,427,0],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.929411768913,0.196078434587,0.317647069693,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":13,"s":[4]},{"t":61,"s":[0.5]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":18,"s":[0]},{"t":61,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":13,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":18,"s":[35]},{"t":61,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":13,"op":62,"st":13,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"streamer a 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":151,"ix":10},"p":{"a":0,"k":[454,444,0],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[-100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.305882364511,0.831372559071,0.803921580315,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[4]},{"t":53,"s":[0.5]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":15,"s":[0]},{"t":53,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[0]},{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":15,"s":[35]},{"t":53,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":10,"op":54,"st":10,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"circle a 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":29,"s":[-371.368]},{"t":191,"s":[-2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":1,"s":[599.5,838,0],"to":[-53.333,-113.333,0],"ti":[56.667,-3.333,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":29,"s":[279.5,158,0],"to":[-56.667,3.333,0],"ti":[0,0,0]},{"t":191,"s":[259.5,858,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":1,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":29,"s":[100,100,100]},{"t":161,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.305882364511,0.831372559071,0.411764711142,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1,"op":192,"st":1,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"circle b 2","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":21,"s":[-250.839]},{"t":158,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":3,"s":[599.5,838,0],"to":[-53.333,-100,0],"ti":[63,-7,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":21,"s":[279.5,238,0],"to":[-63,7,0],"ti":[0,0,0]},{"t":158,"s":[221.5,880,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":3,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":21,"s":[100,100,100]},{"t":128,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.537254929543,0.196078434587,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3,"op":159,"st":3,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"star a 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":1,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":31,"s":[-397.895]},{"t":191,"s":[-2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":1,"s":[596.087,836.292,0],"to":[-9.431,-113.333,0],"ti":[42.765,-3.333,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":31,"s":[539.5,156.292,0],"to":[-42.765,3.333,0],"ti":[0,0,0]},{"t":191,"s":[339.5,856.292,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":1,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":31,"s":[100,100,100]},{"t":161,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.305882364511,0.831372559071,0.803921580315,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":1,"op":192,"st":1,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"star b 2","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":3,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":23,"s":[-278.71]},{"t":158,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":3,"s":[596.087,836.292,0],"to":[-12.765,-96.667,0],"ti":[52.765,-3.333,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":23,"s":[519.5,256.292,0],"to":[-52.765,3.333,0],"ti":[0,0,0]},{"t":158,"s":[279.5,856.292,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":3,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":23,"s":[100,100,100]},{"t":128,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.196078434587,0.784313738346,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":3,"op":159,"st":3,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"rec a 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":33,"s":[-556.875]},{"t":128,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":0,"s":[599.5,842,0],"to":[-16.667,-120,0],"ti":[66.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":33,"s":[499.5,122,0],"to":[-66.667,0,0],"ti":[0,0,0]},{"t":128,"s":[199.5,842,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":0,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,0.833,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":33,"s":[100,100,100]},{"t":98,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.588235318661,0.831372559071,0.305882364511,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":129,"st":0,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"rec b 2","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":25,"s":[-306.667]},{"t":218,"s":[-2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":2,"s":[599.5,842,0],"to":[-22.62,-109.87,0],"ti":[2.877,-2.055,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":25,"s":[339.5,262,0],"to":[-51.333,36.667,0],"ti":[0,0,0]},{"t":218,"s":[219.5,862,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":2,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":25,"s":[100,100,100]},{"t":188,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.196078434587,0.317647069693,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":219,"st":2,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"square a 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":35,"s":[-590.625]},{"t":128,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":0,"s":[599.5,838,0],"to":[-20,-90,0],"ti":[36.667,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":35,"s":[479.5,298,0],"to":[-36.667,0,0],"ti":[0,0,0]},{"t":128,"s":[379.5,838,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":0,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":35,"s":[100,100,100]},{"t":98,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.960784316063,0.572549045086,0.180392161012,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":129,"st":0,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"square b 2","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.333],"y":[0]},"t":27,"s":[-333.333]},{"t":218,"s":[-2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.667,"y":1},"o":{"x":0.167,"y":0.167},"t":2,"s":[599.5,838,0],"to":[-10,-103.333,0],"ti":[50,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.333,"y":0},"t":27,"s":[539.5,218,0],"to":[-50,0,0],"ti":[0,0,0]},{"t":218,"s":[299.5,838,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0.167,0]},"t":2,"s":[100,50,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":27,"s":[100,100,100]},{"t":188,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.196078434587,0.588235318661,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":219,"st":2,"bm":0}]},{"id":"comp_2","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"_small-side","refId":"comp_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[260,320,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":0,"op":219,"st":0,"bm":0}]},{"id":"comp_3","layers":[{"ddd":0,"ind":1,"ty":0,"nm":"left","refId":"comp_4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[400,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":13,"op":313,"st":13,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"right","refId":"comp_4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[400,400,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[-100,100,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":30,"op":330,"st":30,"bm":0}]},{"id":"comp_4","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"streamer a 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":14,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":13,"s":[219.178,-190.096,0],"to":[-95.333,426.667,0],"ti":[167.333,-560.667,0]},{"t":173,"s":[179.178,989.904,0]}],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[-100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.196078434587,0.380392163992,0.929411768913,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":13,"s":[4]},{"t":176,"s":[0.5]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":18,"s":[0]},{"t":176,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":13,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":18,"s":[40]},{"t":176,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":13,"op":174,"st":13,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"streamer b 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":-1.458,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[269.863,-175.455,0],"to":[-110,415.333,0],"ti":[216,-599.333,0]},{"t":173,"s":[69.863,984.545,0]}],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.929411768913,0.745098054409,0.196078434587,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[4]},{"t":173,"s":[0.5]}],"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[0]},{"t":173,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[40]},{"t":173,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":5,"op":174,"st":5,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"circle a 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"t":155,"s":[1800]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[325.643,-26.292,0],"to":[-101.333,75.667,0],"ti":[15.333,-507.667,0]},{"t":155,"s":[125.643,835.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[50,100,100]},{"t":155,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.960784316063,0.572549045086,0.180392161012,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":156,"st":-7,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"circle b 4","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"t":215,"s":[2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[619.5,-26.292,0],"to":[-138,77.667,0],"ti":[-2,-497.667,0]},{"t":215,"s":[259.5,835.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":2,"s":[50,100,100]},{"t":215,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.196078434587,0.588235318661,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":216,"st":-13,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"star a 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":6,"s":[0]},{"t":245,"s":[2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[376.929,-28,0],"to":[-213.333,157.667,0],"ti":[173.333,-127.667,0]},{"t":245,"s":[116.929,834,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":6,"s":[50,100,100]},{"t":245,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.745098054409,0.196078434587,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":6,"op":246,"st":-9,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"star b 4","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"t":125,"s":[1800]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[171.786,-28,0],"to":[0,0,0],"ti":[-161.333,-275.667,0]},{"t":125,"s":[251.786,834,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":2,"s":[50,100,100]},{"t":125,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.537254929543,0.196078434587,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":126,"st":-13,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"rec a 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"t":185,"s":[2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[428.214,-22.292,0],"to":[-167.333,119.667,0],"ti":[-130.667,-315.667,0]},{"t":185,"s":[228.214,839.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[50,100,100]},{"t":185,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.305882364511,0.831372559071,0.411764711142,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":186,"st":-11,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"rec b 4","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":6,"s":[0]},{"t":245,"s":[2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[223.071,-22.292,0],"to":[0,0,0],"ti":[-92.571,-383.708,0]},{"t":245,"s":[223.071,839.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":6,"s":[50,100,100]},{"t":245,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.196078434587,0.784313738346,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":6,"op":246,"st":-9,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"square a 4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"t":217,"s":[2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[120.5,-26.292,0],"to":[13,430.305,0],"ti":[52.221,-418.892,0]},{"t":217,"s":[198.5,833.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[50,100,100]},{"t":217,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.588235318661,0.831372559071,0.305882364511,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":218,"st":-11,"bm":0},{"ddd":0,"ind":10,"ty":4,"nm":"square b 4","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"t":215,"s":[2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[274.357,-26.292,0],"to":[157.333,415.667,0],"ti":[22.667,-253.667,0]},{"t":215,"s":[114.357,835.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[50,100,100]},{"t":215,"s":[100,50,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.588235318661,0.831372559071,0.305882364511,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":216,"st":-7,"bm":0},{"ddd":0,"ind":11,"ty":4,"nm":"streamer a 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":3,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":0,"s":[275.178,-173.096,0],"to":[-87.333,413.333,0],"ti":[177.333,-643.333,0]},{"t":185,"s":[219.178,974.904,0]}],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[-100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.305882364511,0.831372559071,0.803921580315,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[4]},{"t":177,"s":[0.5]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0]},{"t":177,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[40]},{"t":177,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":186,"st":0,"bm":0},{"ddd":0,"ind":12,"ty":4,"nm":"streamer b 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":9,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[199.863,74.545,0],"to":[-13.363,405.455,0],"ti":[179.333,-430.667,0]},{"t":217,"s":[139.863,834.545,0]}],"ix":2},"a":{"a":0,"k":[-157,-245,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[-1.685,-13.314],[0,-14.907],[0,-15.206],[0,-14.907],[0,-14.907],[0,-15.206],[1.754,-14.206],[-3.934,-9.465]],"o":[[-3.895,8.562],[1.872,14.789],[0,15.206],[0,14.907],[0,14.907],[0,15.206],[0,14.314],[-1.803,14.605],[0,0]],"v":[[-156.5,-406],[-166.5,-367],[-146.5,-327],[-166.5,-286],[-146.5,-246],[-166.5,-206],[-146.5,-165],[-166.5,-127],[-156.5,-84]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.929411768913,0.196078434587,0.317647069693,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11,"s":[4]},{"t":199,"s":[0.5]}],"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[0]},{"t":199,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11,"s":[0]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":16,"s":[40]},{"t":199,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":11,"op":218,"st":11,"bm":0},{"ddd":0,"ind":13,"ty":4,"nm":"circle a 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"t":125,"s":[-1800]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[365.643,-26.292,0],"to":[-101.333,75.667,0],"ti":[15.333,-507.667,0]},{"t":125,"s":[165.643,835.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":2,"s":[100,50,100]},{"t":125,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.305882364511,0.831372559071,0.411764711142,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":126,"st":-13,"bm":0},{"ddd":0,"ind":14,"ty":4,"nm":"circle b 3","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"t":245,"s":[-2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[519.5,-26.292,0],"to":[-138,77.667,0],"ti":[-2,-497.667,0]},{"t":245,"s":[159.5,835.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[100,50,100]},{"t":245,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"Ellipse Path 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"fl","c":{"a":0,"k":[0.537254929543,0.196078434587,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Ellipse 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":246,"st":-7,"bm":0},{"ddd":0,"ind":15,"ty":4,"nm":"star a 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":6,"s":[0]},{"t":245,"s":[-2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[416.929,-28,0],"to":[-213.333,157.667,0],"ti":[173.333,-127.667,0]},{"t":245,"s":[156.929,834,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":6,"s":[100,50,100]},{"t":245,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.305882364511,0.831372559071,0.803921580315,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":6,"op":246,"st":-9,"bm":0},{"ddd":0,"ind":16,"ty":4,"nm":"star b 3","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":8,"s":[0]},{"t":155,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[211.786,-28,0],"to":[0,0,0],"ti":[-161.333,-275.667,0]},{"t":155,"s":[291.786,834,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":8,"s":[100,50,100]},{"t":155,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"sr","sy":1,"d":1,"pt":{"a":0,"k":5,"ix":3},"p":{"a":0,"k":[0,0],"ix":4},"r":{"a":0,"k":0,"ix":5},"ir":{"a":0,"k":5,"ix":6},"is":{"a":0,"k":0,"ix":8},"or":{"a":0,"k":12,"ix":7},"os":{"a":0,"k":0,"ix":9},"ix":1,"nm":"Polystar Path 1","mn":"ADBE Vector Shape - Star","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.196078434587,0.784313738346,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Polystar 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":8,"op":156,"st":-7,"bm":0},{"ddd":0,"ind":17,"ty":4,"nm":"rec a 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"t":185,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[468.214,-22.292,0],"to":[-167.333,119.667,0],"ti":[-130.667,-315.667,0]},{"t":185,"s":[268.214,839.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[100,50,100]},{"t":185,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.588235318661,0.831372559071,0.305882364511,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":186,"st":-11,"bm":0},{"ddd":0,"ind":18,"ty":4,"nm":"rec b 3","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":6,"s":[0]},{"t":245,"s":[-2880]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[263.071,-22.292,0],"to":[0,143.667,0],"ti":[-114.571,-267.708,0]},{"t":245,"s":[263.071,839.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":6,"s":[100,50,100]},{"t":245,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,8],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.929411768913,0.196078434587,0.317647069693,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":6,"op":246,"st":-9,"bm":0},{"ddd":0,"ind":19,"ty":4,"nm":"square a 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"t":217,"s":[-2520]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[160.5,-26.292,0],"to":[13,430.305,0],"ti":[52.221,-418.892,0]},{"t":217,"s":[238.5,833.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":2,"s":[100,50,100]},{"t":217,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.960784316063,0.572549045086,0.180392161012,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":2,"op":218,"st":-13,"bm":0},{"ddd":0,"ind":20,"ty":4,"nm":"square b 3","sr":1,"ks":{"o":{"a":0,"k":50,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":4,"s":[0]},{"t":185,"s":[-2160]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[314.357,-26.292,0],"to":[157.333,415.667,0],"ti":[22.667,-253.667,0]},{"t":185,"s":[154.357,835.708,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":4,"s":[100,50,100]},{"t":185,"s":[50,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"rc","d":1,"s":{"a":0,"k":[16,16],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"r":{"a":0,"k":0,"ix":4},"nm":"Rectangle Path 1","mn":"ADBE Vector Shape - Rect","hd":false},{"ty":"fl","c":{"a":0,"k":[0.196078434587,0.588235318661,0.929411768913,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":4,"op":186,"st":-11,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"cannon (small - left)","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[149.7536945812808,890.64039408867,0],"ix":2},"a":{"a":0,"k":[0,360,0],"ix":1},"s":{"a":0,"k":[197.04433497536945,197.04433497536945,100],"ix":6}},"ao":0,"w":480,"h":720,"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":0,"nm":"cannon (small - right)","refId":"comp_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[1050.2463054187192,890.64039408867,0],"ix":2},"a":{"a":0,"k":[479.994,360,0],"ix":1},"s":{"a":0,"k":[197.04433497536945,197.04433497536945,100],"ix":6}},"ao":0,"w":480,"h":720,"ip":0,"op":300,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"cannon (small - top)","refId":"comp_3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[599.0147783251232,803.9408866995075,0],"ix":2},"a":{"a":0,"k":[400,400,0],"ix":1},"s":{"a":0,"k":[200.98522167487687,200.98522167487687,100],"ix":6}},"ao":0,"w":800,"h":800,"ip":0,"op":300,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml
index 06d3e0aa80bb..ad7a9c09b10e 100644
--- a/WordPress/src/main/res/values-ar/strings.xml
+++ b/WordPress/src/main/res/values-ar/strings.xml
@@ -1,24 +1,490 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-29 00:36:27+0000
+Translation-Revision-Date: 2021-05-12 22:54:09+0000
 Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ((n == 1) ? 1 : ((n == 2) ? 2 : ((n % 100 >= 3 && n % 100 <= 10) ? 3 : ((n % 100 >= 11 && n % 100 <= 99) ? 4 : 5))));
 Generator: GlotPress/3.0.0-alpha.2
 Language: ar
 -->
 <resources>
+    <string name="gutenberg_native_audio_settings">إعدادات الصوت</string>
+    <string name="gutenberg_native_image_settings">إعدادات الصورة</string>
+    <string name="gutenberg_native_size">حجم</string>
+    <string name="user_profile_site_section_header">الموقع</string>
+    <string name="user_profile_untitled_site">(بدون عنوان)</string>
+    <string name="user_profile_bottom_sheet_description">معلومات الورقة السفلية لملف المستخدم الشخصي</string>
+    <string name="likes_list_screen_title">قائمة الإعجابات %s</string>
+    <string name="gutenberg_native_write_code">كتابة كود…</string>
+    <string name="gutenberg_native_sorting_and_filtering">الفرز والتصفية</string>
+    <string name="gutenberg_native_show_download_button">عرض زر التنزيل</string>
+    <string name="gutenberg_native_shortcode">الكود القصير</string>
+    <string name="gutenberg_native_read_more">قراءة المزيد</string>
+    <string name="gutenberg_native_post_content_settings">إعدادات محتوى المقالة</string>
+    <string name="gutenberg_native_post_meta_settings">إعدادات البيانات الوصفية للمقالة</string>
+    <string name="gutenberg_native_preload">تحميل مسبق</string>
+    <string name="gutenberg_native_media_area">منطقة الوسائط</string>
+    <string name="gutenberg_native_media_file">ملف الوسائط</string>
+    <string name="gutenberg_native_metadata">البيانات الوصفية</string>
+    <string name="gutenberg_native_loop">حلقة</string>
+    <string name="gutenberg_native_link_to_12d6f96a">رابط لـ</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">صورة %1$d من %2$d في المعرض</string>
+    <string name="gutenberg_native_heading_d">العنوان %d</string>
+    <string name="gutenberg_native_featured">مميز</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">أدخل الرابط لتضمينه هنا…</string>
+    <string name="gutenberg_native_edit_image">تحرير الصورة</string>
+    <string name="gutenberg_native_display_post_date">عرض تاريخ النشر</string>
+    <string name="gutenberg_native_change_heading_level">تغيير مستوى العنوان</string>
+    <string name="gutenberg_native_code">شفرة</string>
+    <string name="gutenberg_native_browser_default">المتصفح الافتراضي</string>
+    <string name="gutenberg_native_attachment_page">صفحة المرفق</string>
+    <string name="gutenberg_native_auto">تلقائي</string>
+    <string name="gutenberg_native_autoplay">تشغيل تلقائي</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">لا يمكن تقديم المكوّن داخل نفسه.</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">لقد تم حذف المكوّن أو أنه غير متاح.</string>
+    <string name="gutenberg_native_add_text">إضافة نص…</string>
+    <string name="gutenberg_native_add_caption">إضاقة تسمية توضيحية</string>
+    <string name="gutenberg_native_what_is_alt_text">ماهو النص البديل؟</string>
+    <string name="gutenberg_native_transform_block">تحويل مكوّن…</string>
+    <string name="gutenberg_native_transform_s_to">تحويل %s إلى</string>
+    <string name="gutenberg_native_failed_to_insert_media">فشل في إدراج وسائط.</string>
+    <string name="like_title_plural">%d إعجابات</string>
+    <string name="like_faces_singular_text">مدوّن واحد معجب بهذا.</string>
+    <string name="like_faces_plural_text">%d مدوِّنون معجبون بهذا.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">فشل في إدراج ملف صوتي.</string>
+    <string name="like_faces_error_loading_message">خطأ أثناء تحميل بيانات \"الإعجابات\". %s</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">تم تحويل %1$s إلى %2$s</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">وصف الغرض من الصورة. اتركه فارغًا إذا كانت الصورة زخرفية أو عنصر تزيين بشكل عام. </string>
+    <string name="suggestion">اقتراح:</string>
+    <string name="like_title_singular">إعجاب واحد</string>
+    <string name="threat_fix_enter_server_creds_message_singular">أدخل بيانات اعتماد الخادم الخاص بك لإصلاح التهديد.</string>
+    <string name="threat_fix_enter_server_creds_message_plural">أدخل بيانات اعتماد الخادم الخاص بك لإصلاح التهديدات.</string>
+    <string name="gutenberg_native_search_blocks">البحث في المكوّنات</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">أنقر نقرًا مزدوجًا لتغيير الوحدة</string>
+    <string name="gutenberg_native_search_block">مكوّن بحث</string>
+    <string name="gutenberg_native_clear_search">مسح البحث</string>
+    <string name="gutenberg_native_cancel_search">إلغاء البحث</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s - %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">حدث خطأ أثناء الحصول على بيانات الإعجابات</string>
+    <string name="get_likes_unknown_error">حدث خطأ غير معروف أثناء الحصول على الإعجابات.</string>
+    <string name="comments_empty_list_filtered_unreplied">لا توجد تعليقات لم يتم الرد عليها</string>
+    <string name="comment_status_unreplied">لم يتم الرد عليها</string>
+    <string name="get_likes_no_network_error">لا توجد شبكة متاحة.</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">تلخيص مقالتك بقائمة من العناوين. أضف روابط القفز HTML إلى مكوّنات العناوين لربطها هنا.</string>
+    <string name="gutenberg_native_summary">ملخّص (موجز)</string>
+    <string name="gutenberg_native_table_of_contents">جدول المحتويات</string>
+    <string name="gutenberg_native_buttongroup">مجموعة أزرار</string>
+    <string name="gutenberg_native_document_outline">ملخص عناوين المستند</string>
+    <string name="site_settings_denylist_title">التعليقات غير المسموح بها</string>
+    <string name="jetpack_brute_force_allowlist_title">عناوين IP المسموح بها دائمًا</string>
+    <string name="reader_title_interests">متابعة المواضيع</string>
+    <string name="activity_log_backup_download_notice_download_action">تنزيل</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">تجاهل</string>
+    <string name="stories_intro_main_subtitle">طريقة جديدة لإنشاء ونشر محتوى جذّاب على موقعك.</string>
+    <string name="threat_fix_all_confirmation_message_plural">يرجى التأكيد على رغبتك في معالجة جميع التهديدات النشطة التي تصل إلى %s.</string>
+    <string name="threat_fix_all_status_success_message_plural">تم معالجة التهديدات بنجاح.</string>
+    <string name="scan_idle_threats_description_plural">عثر الفحص على %1$s من التهديدات المحتملة من خلال %2$s. يرجى مراجعتها أدناه واتخاذ الإجراءات أو الضغط على زر إصلاح الكل. نحن ⁦%3$s⁩ إذا كنت بحاجة إلينا.</string>
+    <string name="scan_fixing_threats_description_plural">We\'re hard at work in the background fixing these threats. في هذه الأثناء، لا تتردد في الاستمرار في استخدام موقعك كالمعتاد، ويمكنك التحقُّق من التقدُّم في أي وقت.</string>
+    <string name="gutenberg_native_edit_focal_point">Edit focal point</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Double tap to open Bottom Sheet to edit, replace, or clear the image</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Double tap to open Action Sheet to edit, replace, or clear the image</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ll reach more people. Nice job!</string>
+    <string name="new_site_creation_search_domain_input_hint">اكتب اسمًا لموقعك (اسم للنطاق)</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ve customized your site. أحسنت!</string>
+    <string name="invite_links_disable_dialog_message">بمجرد تعطيل رابط الدعوة هذا، لن يتمكن أي شخص من استخدامه للانضمام إلى فريقك. هل أنتَ متأكد؟</string>
+    <string name="magic_link_not_meaning_to_create_account">ألم تقصد إنشاء حساب جديد؟ العودة للخلف لإعادة إدخال عنوان بريدك الإلكتروني.</string>
+    <string name="quick_start_card_menu_hide">إخفاء حاليًا</string>
+    <string name="invite_links_null_response">لم يتم تلقي أي ردّ</string>
+    <string name="invite_links_bad_format_response">تم تلقي ردّ غير صالح</string>
+    <string name="invite_links_disable_dialog_title">تعطيل رابط الدعوة</string>
+    <string name="invite_links_cannot_get_role_data_error">There was an error getting data for role %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">There was an error getting roles</string>
+    <string name="invite_links_generic_get_data_error">Unknown error fetching invite links data</string>
+    <string name="invite_links_helper_text">استخدم هذا الرابط لضم أعضاء فريقك من دون دعوتهم واحدًا تلو الآخر. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted people.</string>
+    <string name="invite_links_section_title">رابط الدعوة</string>
+    <string name="invite_links_get_status_retry">تحديث حالة الروابط</string>
+    <string name="invite_links_generate">إنشاء رابط جديد</string>
+    <string name="invite_links_share_invite_link">مشاركة رابط الدعوة</string>
+    <string name="invite_links_disable_invite_link">تعطيل رابط الدعوة</string>
+    <string name="invite_links_expire_date">تنتهي الصلاحية في %1$s</string>
+    <string name="threats_found_plural">تم العثور على تهديدات</string>
+    <string name="threats_found_singular">تم العثور على تهديد</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;انتهى الفحص&lt;/b&gt; &lt;br&gt; تم العثور على %s تهديد محتمل</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;انتهى الفحص&lt;/b&gt; &lt;br&gt; تم العثور على تهديد واحد محتمل</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;انتهى الفحص&lt;/b&gt; &lt;br&gt; لم يتم العثور على تهديدات</string>
+    <string name="disable">تعطيل</string>
+    <string name="scan_fixing_threats_title_singular">جاري معالجة التهديد</string>
+    <string name="quick_start_list_review_pages_subtitle">تحقّق من صفحاتك وقم بإجراء تغييرات، أو إضافة الصفحات أو إزالتها.</string>
+    <string name="quick_start_card_menu_unpin">إلغاء تثبيت هذا</string>
+    <string name="quick_start_list_enable_sharing_subtitle">شارك المقالات الجديدة تلقائيًّا على وسائل التواصل الاجتماعي الخاصة بك.</string>
+    <string name="quick_start_list_view_site_title">زيارة موقعك</string>
+    <string name="quick_start_list_enable_sharing_title">تمكين المشاركة</string>
+    <string name="quick_start_list_follow_site_subtitle">استكشف وتابع المواقع التي تُلهمك.</string>
+    <string name="quick_start_list_upload_icon_subtitle">أضف أيقونة موقع للحصول على مظهر جذاب واحترافي.</string>
+    <string name="quick_start_list_update_site_title_subtitle">حدِّد اسمًا لموقعك يعكس هويته وموضوعه.</string>
+    <string name="quick_start_list_check_stats_title">تحقّق من احصائياتك</string>
+    <string name="backup_download_status_failure_bullet2">سنستمر في محاولة إنشاء ملف النسخ الاحتياطي القابل للتنزيل.</string>
+    <string name="backup_download_status_failure_bullet1">يتعذر علينا العثور على الحالة حتى نخبرك بالمدة التي ستستغرقها عملية النسخة الاحتياطية القابلة للتنزيل لديك.</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">أيقونة الساعة</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">رمز علامة الاختيار</string>
+    <string name="restore_status_failure_bullet3">سنقوم بإعلامك عند الانتهاء.</string>
+    <string name="backup_download_status_failure_heading">حسنًا، لم نتمكن من العثور على حالة النسخ الاحتياطي القابلة للتنزيل</string>
+    <string name="restore_status_failure_bullet2">سنستمر في محاولة استعادة موقعك.</string>
+    <string name="restore_status_failure_bullet1">يتعذر علينا العثور على الحالة حتى نخبرك بالمدة التي ستستغرقها عملية الاستعادة الخاصة بك.</string>
+    <string name="restore_status_failure_heading">ممم، يتعذر علينا العثور على حالة الاستعادة الخاصة بك</string>
+    <string name="restore_complete_failed_description">يتعذر علينا استعادة موقعك</string>
+    <string name="backup_item_content_hint">(استثناء القوالب والإضافات، وملفات الوسائط المرفوعة)</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="restore_warning_action_button">تأكيد</string>
+    <string name="backup_download_complete_failed_description">لم نتمكن من إنشاء النسخة الاحتياطية الخاصة بك</string>
+    <string name="restore_warning_description_with_two_parameters">هل تريد بالتأكيد إرجاع موقعك مرة أخرى إلى ⁦%1$s⁩ في ⁦%2$s⁩؟\n        سيتم فقدان أي شيء قمت بتغييره من ذلك الحين.</string>
+    <string name="gutenberg_native_uploading">جاري الرفع…</string>
+    <string name="backup_item_roots">جذر ووردبريس</string>
+    <string name="backup_item_contents">دليل WP-content</string>
+    <string name="backup_download_details_choose_items_header">العناصر المضمنة في هذا التنزيل</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">تُعد المكوِّنات القابلة لإعادة الاستخدام غير قابلة للتحرير على ووردبريس بالنسبة إلى نظام تشغيل iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">تُعد المكوِّنات القابلة لإعادة الاستخدام غير قابلة للتحرير على ووردبريس بالنسبة إلى نظام تشغيل Android</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">فشل إدراج الملف الصوتي. يرجى النقر على الخيارات.</string>
+    <string name="gutenberg_native_lock_icon">أيقونة القفل</string>
+    <string name="gutenberg_native_open">فتح</string>
+    <string name="gutenberg_native_problem_opening_the_audio">ثمَّة مشكلة أثناء فتح ملف الصوت</string>
+    <string name="gutenberg_native_replace_audio">استبدال الصوت</string>
+    <string name="gutenberg_native_replace_file">استبدال الملف</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">الضغط المزدوج لتحديد ملف صوت</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">لا يوجد تطبيق يمكنه معالجة هذا الطلب.</string>
+    <string name="photo_picker_choose_audio">اختيار ملف صوتي من الجهاز</string>
+    <string name="photo_picker_use_audio">استخدام هذا الصوت</string>
+    <string name="continue_with_wpcom">تسجيل الدخول أو إنشاء حساب على WordPress.com</string>
+    <string name="gutenberg_native_add_audio">أضف ملف صوتي</string>
+    <string name="gutenberg_native_audio_caption_empty">تسمية الملف الصوتي. فارغة</string>
+    <string name="gutenberg_native_audio_caption_s">تسمية الملف الصوتي. %s</string>
+    <string name="gutenberg_native_audio_file">ملف صوت</string>
+    <string name="gutenberg_native_audio_player">مشغل الصوت</string>
+    <string name="gutenberg_native_choose_audio">اختيار الصوت</string>
+    <string name="people_optional_custom_message_helper_text">اختياري: أدخل رسالة مخصصة يتم إرسالها مع دعوتك.</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">أنقر نقرًا مزدوجًا للاستماع إلى ملف الصوت</string>
+    <string name="scan_here_to_help">نحن هنا لمساعدتك</string>
+    <string name="threat_found_header">المعثور عليه</string>
+    <string name="threat_status_fixed">تمت المعالجة</string>
+    <string name="people_learn_more_about_roles">معرفة المزيد عن الأدوار (الرُتب)</string>
+    <string name="scan_idle_threats_description_singular">عثر الفحص على تهديد واحد محتمل من خلال %1$s. يرجى مراجعة التهديد أدناه واتخاذ إجراء أو الضغط على زر معالجة الكل. نحن %2$s⁩ إذا كنت بحاجة إلينا.</string>
+    <string name="scan_provisioning_description">مرحبًا بك في فحص Jetpack! سنُحدِّد نطاق موقعك، وسنقوم بإعداده لإجراء فحص كامل. سنخبرك إذا اكتشفنا أي مشاكل قد تؤثر على الفحص، فسيبدأ حينها أول فحص كامل لك.</string>
+    <string name="scan_idle_manual_scan_description">لمراجعة مواقعك مرة أخرى، قم بتشغيل فحص يدوي أو انتظر Jetpack حتى يقوم بفحص موقعك لاحقًا اليوم.</string>
+    <string name="scan_scanning_is_initial_description">مرحبًا بك في \"فحص Jetpack\"، نلقي نظرة أولية على موقعك الآن وستكون النتائج معك قريبًا.</string>
+    <string name="scan_scanning_description">سنرسل إليك إشعارًا بمجرد انتهاء الفحص. في هذه الأثناء لا تتردد في الاستمرار في استخدام موقعك كالمعتاد، ويمكنك التحقُّق مجددًا من حالة التقدُّم في أي وقت.</string>
+    <string name="scan_fixing_threats_description_singular">نعمل بجد على إصلاح هذا التهديد في الخلفية. في هذه الأثناء، لا تتردد في الاستمرار في استخدام موقعك كالمعتاد، ويمكنك التحقُّق من التقدُّم في أي وقت.</string>
+    <string name="scan_start_request_failed_subtitle">يتعذر على \"فحص Jetpack\" إكمال فحص موقعك. يرجى التحقُّق لمعرفة ما إذا كان موقعك معطَّلاً أم لا، وإذا لم يكن كذلك، فحاول مرة أخرى. إذا كان الأمر كذلك، أو إذا كان \"فحص Jetpack\" لا يزال يواجه مشكلات، فاتصل بفريق الدعم لدينا.</string>
+    <string name="scan_fixing_threats_title_plural">جاري معالجة التهديدات</string>
+    <string name="activity_log_currently_backing_up_title">جاري إنشاء نسخة احتياطية قابلة للتنزيل</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">نسخ الموقع احتياطيًا</string>
+    <string name="scan_request_failed_title">حدث خطأ ما</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">تم نسخ موقعك احتياطيًا بنجاح</string>
+    <string name="activity_log_currently_backing_up_message">نسخ الموقع احتياطيًا من %1$s %2$s</string>
+    <string name="pick_audio">تحديد الصوت</string>
+    <string name="activity_log_backup_started_snackbar_message">جاري نسخ موقعك احتياطيًا\nالنسخ الاحتياطي من %1$s %2$s</string>
+    <string name="activity_log_backup_finished_snackbar_message">تم نسخ موقعك احتياطيًا بنجاح\nالنسخ الاحتياطي من %1$s %2$s</string>
+    <string name="restore_complete_failed_icon_content_description">أيقونة الخطأ</string>
+    <string name="restore_complete_failed_action_button_content_description">زر الانتهاء</string>
+    <string name="restore_another_process_running">هناك عملية استعادة أخرى قيد التشغيل.</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_complete_visit_site_action_button">زيارة الموقع</string>
+    <string name="restore_complete_icon_content_description">أيقونة الاستعادة</string>
+    <string name="restore_complete_done_button_content_description">زر الانتهاء</string>
+    <string name="restore_complete_visit_site_button_content_description">زر زيارة الموقع</string>
+    <string name="restore_complete_failed_title">فشلت الاستعادة</string>
+    <string name="restore_complete_header">تمت استعادة موقعك</string>
+    <string name="restore_progress_footnote">لا داعي للانتظار هنا. سنقوم بإعلامك عندما تتم استعادة موقعك.</string>
+    <string name="restore_complete_description_with_two_parameters">تمت الآن استعادة كافة العناصر التي قمت بتحديدها إلى %1$s %2$s.</string>
+    <string name="restore_progress_header">جاري استعادة الموقع حاليًا</string>
+    <string name="restore_warning_action_button_content_description">زر تأكيد استعادة الموقع</string>
+    <string name="restore_progress_description_with_two_parameters">نحن بصدد استعادة موقعك إلى %1$s %2$s.</string>
+    <string name="restore_progress_icon_content_description">أيقونة استعادة الموقع</string>
+    <string name="restore_details_action_button_content_description">زر استعادة الموقع</string>
+    <string name="restore_warning_header">تحذير</string>
+    <string name="restore_warning_icon_content_description">صورة دائرة حمراء مع علامة تعجب</string>
+    <string name="backup_download_complete_failed_action_button">تمّ</string>
+    <string name="backup_download_complete_failed_action_button_content_description">زر الانتهاء</string>
+    <string name="restore">استعادة</string>
+    <string name="restore_details_choose_items_header">اختر العناصر المراد استعادتها:</string>
+    <string name="restore_details_header">استعادة الموقع</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s هي النقطة المُحدَّدة لاستعادة موقعك.</string>
+    <string name="restore_details_action_button">استعادة الموقع</string>
+    <string name="restore_details_icon_content_description">أيقونة الاستعادة</string>
+    <string name="backup_download_complete_failed_icon_content_description">سحابة مع أيقونة X</string>
+    <string name="quick_start_card_menu_remove">عدم العرض مرة أخرى</string>
+    <string name="web_preview_mobile">الجوال</string>
+    <string name="web_preview_tablet">الأجهزة اللوحية</string>
+    <string name="backup_download_complete_failed_title">فشل في التنزيل</string>
+    <string name="quick_start_dialog_review_pages_title">مراجعة صفحات الموقع</string>
+    <string name="quick_start_dialog_review_pages_message">تغيير أو إضافة أو إزالة صفحات موقعك.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">حدّد %1$s الصفحات %2$s لرؤية قائمة صفحاتك.</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">حدّد %1$s الصفحة الرئيسية %2$s لتحرير صفحتك الرئيسية.</string>
+    <string name="quick_start_dialog_review_pages_message_short">حدّد %1$s الصفحات %2$s لرؤية قائمة صفحاتك.</string>
+    <string name="quick_start_card_menu_pin">تثبيت هذا</string>
+    <string name="quick_start_dialog_edit_homepage_title">تحرير صفحتك الرئيسية</string>
+    <string name="quick_start_dialog_edit_homepage_message">تغيير أو إضافة أو إزالة المحتوى من الصفحة الرئيسية لموقعك.</string>
+    <string name="error_media_not_enough_storage">لا توجد مساحة تخزين كافية في الموقع</string>
+    <string name="error_media_upload_failed_for_reason">فشل رفع الوسائط.\n%1$s</string>
+    <string name="reader_menu_mark_as_seen">وضع علامة تمت المشاهدة</string>
+    <string name="reader_menu_mark_as_unseen">وضع علامة لم تتم المشاهدة</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">يتعذر التبديل إلى الحالة المرئية لهذه المقالة.</string>
+    <string name="reader_marked_post_as_unseen">تم وضع علامة على المقالة بوصفها لم يتم الاطلاع عليها</string>
+    <string name="reader_marked_post_as_seen">تم وضع علامة على المقالة بوصفها تم الاطلاع عليها</string>
+    <string name="threat_fix_all_error_message">خطأ في معالجة التهديدات. يرجى الاتصال بالدعم الفني الخاص بنا.</string>
+    <string name="threat_fix_all_status_error_message">خطأ في الحصول على حالة المعالجة. يرجى الاتصال بالدعم الفني الخاص بنا.</string>
+    <string name="threat_fix_all_status_success_message_singular">تم معالجة التهديد بنجاح.</string>
+    <string name="threat_fix_all_confirmation_message_singular">يرجى التأكيد على رغبتك في معالجة تهديد واحد نشط.</string>
+    <string name="threat_ignore_success_message">تم تجاهل التهديد.</string>
+    <string name="threat_ignore_error_message">خطأ في تجاهل التهديد. يرجى الاتصال بالدعم الفني الخاص بنا.</string>
+    <string name="threat_fix_all_warning_title">معالجة كل التهديدات</string>
+    <string name="threat_ignore_warning">لا ينبغي أن تتجاهل مشكلة الأمان إلا إذا كنت متأكدًا تمامًا من أنه غير ضار. إذا اخترت تجاهل هذا التهديد، فسيبقى على موقعك &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">خطأ في معالجة التهديد. يرجى الاتصال بالدعم الفني الخاص بنا.</string>
+    <string name="backup_empty_subtitle">ستظهر نسختك الاحتياطية الأولى هنا في غضون 24 ساعة وستتلقى إشعارًا بمجرد اكتمال النسخ الاحتياطي</string>
+    <string name="backup_active_filter_empty_title">لم يتم العثور على نسخ احتياطية مطابقة</string>
+    <string name="scan_history_menu_title">السّجل</string>
+    <string name="scan_preparing_to_scan_title">الإعداد للفحص</string>
+    <string name="scan_scanning_title">ملفات الفحص</string>
+    <string name="scan_history_all_threats_tab">الكل</string>
+    <string name="scan_history_no_threats_found">لم يتم العثور على عناصر</string>
+    <string name="scan_history_ignored_threats_tab">تم التجاهل</string>
+    <string name="scan_history_fixed_threats_tab">تمت المعالجة</string>
+    <string name="threat_fixing">جاري معالجة التهديد</string>
+    <string name="threat_item_sub_header_status_ignored">تهديد تم تجاهله</string>
+    <string name="backup_active_filter_empty_subtitle">حاول ضبط مدى التاريخ الخاص بك</string>
+    <string name="threat_item_sub_header_status_fixed_on">تهديد تمت معالجته في %s</string>
+    <string name="scan_history">سجلّ الفحص</string>
+    <string name="request_failed_message">حدثت مشكلة أثناء معالجة الطلب. يرجى المحاولة مرة أخرى لاحقاً.</string>
+    <string name="backup_empty_title">ستكون نسختك الاحتياطية الأولى جاهزة قريبًا</string>
+    <string name="gutenberg_native_move_to_bottom">تحريك للأسفل</string>
+    <string name="gutenberg_native_change_block_position">تغيير موضع المكوّن</string>
+    <string name="jetpack_icon_content_description">أيقونة</string>
+    <string name="label_control_upload">رفع</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">زر رابط المشاركة</string>
+    <string name="backup_download_complete_info">أرسلنا إليك أيضًا رابطًا إلى ملفك عبر البريد الإلكتروني.</string>
+    <string name="backup_download_complete_download_action_button">تنزيل</string>
+    <string name="backup_download_complete_download_share_action_button">رابط المشاركة</string>
+    <string name="backup_download_complete_header">أصبحت نسختك الاحتياطية متاحة للتنزيل الآن</string>
+    <string name="backup_download_complete_download_action_button_content_description">زر التنزيل</string>
+    <string name="backup_download_complete_description_with_two_parameters">أنشأنا نسخة احتياطية من موقعك بنجاح من %1$s %2$s.</string>
+    <string name="backup_download_complete_icon_content_description">أيقونة جاهزية النسخ الاحتياطية القابلة للتنزيل</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_complete_page_title">نسختك الاحتياطية</string>
+    <string name="backup_download_progress_header">إنشاء نسخة احتياطية قابلة للتنزيل من موقعك في الوقت الحالي</string>
+    <string name="backup_download_progress_icon_content_description">جاري إنشاء أيقونة نسخة احتياطية قابلة للتنزيل</string>
+    <string name="backup_download_progress_description_with_two_parameters">سنُنشئ نسخة احتياطية قابلة للتنزيل من موقعك من %1$s %2$s.</string>
+    <string name="backup_download_progress_footnote">لا داعي للانتظار هنا. سنقوم بإعلامك عندما تكون نسختك الاحتياطية جاهزة.</string>
+    <string name="backup_download_details_description_with_two_parameters">تمثِّل ⁦%1$s %2$s⁩ النقطة المُحدَّدة لإنشاء نسخة احتياطية قابلة للتنزيل.</string>
+    <string name="backup_download_details_action_button_content_description">إنشاء زر نسخة احتياطية قابلة للتنزيل</string>
+    <string name="backup_download_generic_failure">حدثت مشكلة أثناء معالجة الطلب. يرجى المحاولة مرة أخرى لاحقاً.</string>
+    <string name="backup_download_another_download_running">هناك عملية تنزيل قيد التشغيل.</string>
+    <string name="backup_download_progress_page_title">تنزيل النسخة الاحتياطية</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="gutenberg_native_image_link_url">رابط الصورة URL</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="threat_fix">إصلاح التهديد</string>
+    <string name="threat_ignore">تجاهل التهديد</string>
+    <string name="threat_get_free_estimate">احصل على عرض سعر مجاني</string>
+    <string name="suggestion_user">مستخدم</string>
+    <string name="threat_fix_fixable_edit">سيقوم Jetpack Scan بتحرير الملف أو الدليل المتضرر.</string>
+    <string name="threat_fix_fixable_update">سيقوم فحص Jetpack بالتحديث إلى إصدار أحدث (%s).</string>
+    <string name="threat_fix_fixable_default">سيحل فحص Jetpack مشكلة التهديد.</string>
+    <string name="threat_fix_fixable_delete">سيحذف فحص Jetpack الملف أو الدليل المتضرر.</string>
+    <string name="suggestion_xpost">النشر المتعدد</string>
+    <string name="suggestion_problem">حدثت مشكلة أثناء تحميل الاقتراحات.</string>
+    <string name="suggestion_no_matching">لا يوجد تطابق %s.</string>
+    <string name="suggestion_none">لا توجد اقتراحات %s متوفرة.</string>
+    <string name="suggestion_selection_needed">يرجى الكتابة لتصفية قائمة الاقتراحات.</string>
+    <string name="threat_fix_fixable_replace">سيستبدل فحص Jetpack الملف أو الدليل المتضرر.</string>
+    <string name="threat_fix_current_not_fixable_description">يتعذر على \"فحص Jetpack\" إصلاح هذا التهديد تلقائيًا.\n نقترح عليك إصلاح التهديد يدويًا: تأكَّد من تحديث ووردبريس، وقالبك، وجميع إضافاتك، وقم بإزالة الشفرة أو القالب أو الإضافة المزعجة من موقعك. \n \n\n إذا كنت بحاجة إلى مزيد من المساعدة لإصلاح هذا التهديد، فإننا نوصي بـ &lt;b&gt;Codeable&lt;/b&gt;، وهو سوق مستقلة موثوق بها لخبراء ووردبريس الذين تم فحصهم بدقة.\n لقد حدَّدوا مجموعة مختارة من خبراء الأمن للمساعدة على هذه المشروعات. تتراوح الأسعار بين 70 دولارًا و120 دولارًا في الساعة، ويمكنك الحصول على تقدير مجاني من دون التزام بالتعيين.</string>
+    <string name="threat_problem_header">ما المشكلة؟</string>
+    <string name="threat_technical_details_header">التفاصيل الفنية</string>
+    <string name="threat_file_description">تم العثور على تهديد في الملف:</string>
+    <string name="threat_fix_default_header">كيف سنقوم بإصلاحه؟</string>
+    <string name="threat_fix_fixed_header">كيف أصلح Jetpack هذا الأمر؟</string>
+    <string name="threat_fix_current_not_fixable_header">إصلاح التهديد</string>
+    <string name="threat_details">تفاصيل التهديد</string>
+    <string name="threat_item_sub_header_vulnerable_theme">تم العثور على ثغرة أمنية في قالب</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">تم العثور على ثغرة أمنية في إضافة</string>
+    <string name="threat_item_sub_header_file_signature">تم العثور على تهديد %s</string>
+    <string name="threat_item_sub_header_core_file">تم العثور على ثغرة أمنية في ووردبريس</string>
+    <string name="threat_item_sub_header_misc_vulnerability">ثغرات أمنية متنوعة</string>
+    <string name="threat_item_header_vulnerable_theme">القالب المعرض للاختراق: %s (النسخة %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">الإضافة المعرضة للاختراق: %s (النسخة %s)</string>
+    <string name="threat_item_header_database_threat">تهديدات قاعدة البيانات %s</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: نمط شفرة برمجية ضارة</string>
+    <string name="scan_this_site">هذا الموقع</string>
+    <string name="threat_item_header_threat_found">تم العثور على تهديد</string>
+    <string name="threat_item_header_infected_core_file">%s: ملف أساسي (core file) مصاب</string>
+    <string name="threats_fix_all">إصلاح الكل</string>
+    <string name="scan_idle_last_scan_description">تم تشغيل Jetpack scan آخر مرة في %s وكل شيء على ما يُرام. %s</string>
+    <string name="scan_in_few_seconds">قبل بضع ثوانٍ</string>
+    <string name="scan_in_minutes_ago">قبل %s دقيقة</string>
+    <string name="scan_in_hours_ago">قبل %s ساعة</string>
+    <string name="backup">النسخ الاحتياطي</string>
+    <string name="scan_state_icon">أيقونة حالة الفحص</string>
+    <string name="scan_now">الفحص الآن</string>
+    <string name="scan_again">إعادة الفحص مرة أخرى</string>
+    <string name="scan_idle_no_threats_found_title">لا داعي للقلق تجاه أي شيء</string>
+    <string name="scan_idle_threats_found_title">قد يكون موقعك معرَّضًا للخطر</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">عامل تصفية نوع النشاط (تم تحديد %s من الأنواع)</string>
+    <string name="activity_log_activity_type_error_subtitle">يرجى التحقق من اتصالك بالإنترنت وإعادة المحاولة.</string>
+    <string name="activity_log_activity_type_empty_title">لا توجد أنشطة متاحة</string>
+    <string name="activity_log_activity_type_empty_subtitle">لم تُسجّل أي أنشطة في مدى التاريخ المحدد.</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">عامل تصفية نوع النشاط</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (عرض %s من العناصر)</string>
+    <string name="activity_log_activity_type_error_title">لا يوجد اتصال</string>
+    <string name="activity_log_activity_type_filter_active_label">نوع النشاط (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">عامل تصفية نطاق التاريخ</string>
+    <string name="activity_log_active_filter_empty_title">لم يتم العثور على أحداث متطابقة</string>
+    <string name="activity_log_active_filter_empty_subtitle">حاول ضبط مدى التاريخ أو مرشحات نوع النشاط</string>
+    <string name="backup_download_details_icon_content_description">إنشاء أيقونة نسخة احتياطية قابلة للتنزيل</string>
+    <string name="backup_item_themes">قوالب ووردبريس</string>
+    <string name="backup_item_plugins">إضافات ووردبريس</string>
+    <string name="backup_item_media_uploads">رفع الوسائط</string>
+    <string name="backup_item_sqls">قاعدة بيانات الموقع</string>
+    <string name="backup_item_roots_hint">(يتضمن wp-config.php وأي ملفات لا تنتمي إلى ووردبريس)</string>
+    <string name="activity_log_date_range_filter_label">نطاق التاريخ</string>
+    <string name="activity_log_activity_type_filter_label">نوع النشاط</string>
+    <string name="activity_log_item_menu_restore_label">استعادة إلى هذه النقطة</string>
+    <string name="activity_log_item_menu_download_backup_label">تنزيل النسخة الاحتياطية</string>
+    <string name="gutenberg_native_choose_file">اختيار ملف</string>
+    <string name="gutenberg_native_error">خطأ</string>
+    <string name="backup_download">تنزيل النسخ الاحتياطي</string>
+    <string name="backup_download_details_header">إنشاء نسخة احتياطية قابلة للتنزيل</string>
+    <string name="backup_download_details_action_button">إنشاء ملف قابل للتنزيل</string>
+    <string name="backup_download_details_page_title">تنزيل النسخة الاحتياطية</string>
+    <string name="button_copy">تكرار</string>
+    <string name="activity_log_activity_type_filter_header">تصفية حسب نوع النشاط</string>
+    <string name="dialog_confirm_copy_local_copy_button">نسخ الإصدار من هذا التطبيق</string>
+    <string name="dialog_confirm_copy_local_edit_button">تحرير المقالة أولاً</string>
+    <string name="dialog_confirm_copy_local_message">تحتوي المقالة التي تحاول نسخها على إصدارين متعارضين أو أنك قمت بإجراء تغييرات مؤخرًا لكنك لم تحفظها.\nقم بتحرير المقالة أولاً لحل أي تعارض أو استمر في نسخ الإصدار من هذا التطبيق.</string>
+    <string name="dialog_confirm_copy_local_title">تعارض مزامنة المقالة</string>
+    <string name="toast_edit_story_update_in_progress_title">جاري حفظ القصة، يرجى الانتظار…</string>
+    <string name="gutenberg_native_choose_a_file">اختيار ملف</string>
+    <string name="gutenberg_native_copy_file_url">نسخ رابط الملف</string>
+    <string name="gutenberg_native_edit_file">تحرير الملف</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">فشل حفظ الملفات.\nيرجى النقر على الخيارات.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">فشل رفع الملفات.\nيرجى النقر على الخيارات.</string>
+    <string name="gutenberg_native_file_block_settings">إعدادات مكوّن ملف</string>
+    <string name="gutenberg_native_file_name">اسم الملف</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="my_site_btn_jetpack_settings">إعدادات Jetpack</string>
+    <string name="new_site_creation_domain_header_title">اختيار نطاق</string>
+    <string name="reader_follow_comments_unsubscribe_success">تم إلغاء الاشتراك من التعليقات بنجاح</string>
+    <string name="reader_follow_comments_get_status_error">خطأ في جلب حالة الاشتراك للمقالة</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">لا يمكن الاشتراك في التعليقات لهذه المقالة</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">لا يمكن إلغاء الاشتراك في التعليقات لهذه المقالة</string>
+    <string name="reader_btn_following_comments">متابعة المحادثة عبر البريد الإلكتروني</string>
+    <string name="reader_btn_follow_comments">تابع المحادثة عبر البريد الإلكتروني</string>
+    <string name="activity_log_activity_type_filter_apply">تطبيق</string>
+    <string name="activity_log_activity_type_filter_clear">مسح</string>
+    <string name="reader_follow_comments_subscribe_success">لقد اشتركت بالتعليقات بنجاح</string>
+    <string name="reader_follow_comments_null_response">لم يتم تلقي أي ردّ</string>
+    <string name="reader_follow_comments_bad_format_response">تم تلقي ردّ غير صالح</string>
+    <string name="dialog_edit_story_unsupported_format_message">لم تتم إضافة شريحة واحدة أو أكثر إلى قصتك لأن القصص لا تدعم ملفات GIF في الوقت الحالي. الرجاء اختيار صورة ثابتة أو خلفية فيديو بدلاً من ذلك.</string>
+    <string name="dialog_edit_story_unrecoverable_title">لا يمكن تحرير القصة</string>
+    <string name="dialog_edit_story_unavailable_title">لا يمكن تحرير القصة</string>
+    <string name="dialog_edit_story_unsupported_format_title">ملفات GIF غير مدعومة</string>
+    <string name="dialog_edit_story_limited_message">تم تحرير هذه القصة على جهاز مختلف وقد تكون القدرة محدودة على تحرير كائنات معينة.</string>
+    <string name="dialog_edit_story_unavailable_message">تعذر تحميل الوسائط لهذه القصة. تحقق من اتصالك بالإنترنت وحاول مرة أخرى بعد لحظات.</string>
+    <string name="dialog_edit_story_unrecoverable_message">لم نتمكن من العثور على ملفات وسائط لهذه القصة على الموقع.</string>
+    <string name="dialog_edit_story_limited_title">تحرير قصة محدودة</string>
+    <string name="cannot_retry_deleted_media_item_fatal">تمت إزالة الوسائط. حاول إعادة إنشاء قصتك.</string>
+    <string name="hpp_error_title">التخطيطات غير متوفرة دون اتصال انترنت</string>
+    <string name="hpp_retry_error">يرجى التحقق من اتصالك بالإنترنت وإعادة المحاولة.</string>
+    <string name="delete_button_alt">حذف</string>
+    <string name="label_next_button">التالي</string>
+    <string name="label_done_button">تمّ</string>
+    <string name="dialog_discard_story_title_edit">تجاهل التغييرات؟</string>
+    <string name="dialog_discard_story_message_edit">لن يتم حفظ أي تغييرات تم إجراؤها.</string>
+    <string name="dialog_discard_story_ok_button_edit">تجاهل</string>
+    <string name="color_picker_label_text">النص</string>
+    <string name="color_picker_label_background">الخلفية</string>
+    <string name="hpp_error_subtitle">اضغط على إعادة المحاولة عند معاودة الاتصال بالإنترنت.</string>
+    <string name="hpp_choose_error">حدث خطأ أثناء تحديد التصميم.</string>
+    <string name="scan">فحص</string>
+    <string name="reader_discover_empty_title">مرحبًا!</string>
+    <string name="reader_discover_no_posts_title">لا توجد مقالات حديثة</string>
+    <string name="login_find_your_connected_email">العثور على بريدك الإلكتروني المتصل</string>
+    <string name="continue_site_credentials">الاستمرار في تخزين بيانات الاعتماد</string>
+    <string name="reader_discover_no_posts_subtitle">حاول متابعة المزيد من المواضيع لتوسيع البحث</string>
+    <string name="reader_discover_no_posts_button_text">متابعة المواضيع</string>
+    <string name="login_prologue_third_subtitle_one">أُعجب &lt;b&gt;Madison Ruiz&lt;/b&gt; بمقالتك</string>
+    <string name="login_prologue_third_subtitle_two">لقد تلقيت &lt;b&gt;50 إعجاب&lt;/b&gt; على موقعك اليوم</string>
+    <string name="login_prologue_third_subtitle_three">قام &lt;b&gt;Johan Brandt&lt;/b&gt; بالردّ على مقالتك</string>
+    <string name="hpp_skip_button">تخطي</string>
+    <string name="hpp_choose_button">اختيار</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">تم فتح قائمة المكوّن القابلة للتمرير. حدد مكوّنًا.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">تم قفل قائمة المكوّن القابلة للتمرير.</string>
+    <string name="hpp_subtitle">اختر تخطيط الصفحة الرئيسية المفضَّل لديك. يمكنك تعديله أو تخصيصه لاحقًا.</string>
+    <string name="hpp_title">اختيار تصميم</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">أضف تصنيفاً جديداً</string>
+    <string name="prepublishing_nudges_categories_action">التصنيفات</string>
+    <string name="prepublishing_nudges_home_categories_not_set">لم يتم التعيين</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">التصنيفات</string>
+    <string name="prepublishing_nudges_add_category_button">إضافة تصنيف</string>
+    <string name="mlp_error_title">التخطيطات غير متوفرة بسبب خطأ</string>
+    <string name="mlp_network_error_title">التخطيطات غير متوفرة دون اتصال انترنت</string>
+    <string name="mlp_network_error_subtitle">انقر على إعادة المحاولة عند الاتصال بالإنترنت مرة أخرى أو إنشاء صفحة فارغة باستخدام الزر أدناه.</string>
+    <string name="mlp_error_subtitle">انقر على إعادة المحاولة أو إنشاء صفحة فارغة باستخدام الزر أدناه.</string>
+    <string name="login_prologue_fifth_subtitle_two">أخبار الويب</string>
+    <string name="login_prologue_fifth_subtitle_one">باميلا نجوين</string>
+    <string name="login_prologue_fifth_tag_two">الطهي</string>
+    <string name="login_prologue_fifth_tag_one">الفن</string>
+    <string name="login_prologue_fifth_tag_four">زراعة الحدائق</string>
+    <string name="login_prologue_fifth_tag_five">الموسيقى</string>
+    <string name="login_prologue_fifth_tag_six">السياسة</string>
+    <string name="login_prologue_fifth_caption_one">أفضل عشرة مقاهي</string>
+    <string name="login_prologue_fifth_caption_two">أفضل المعجبين بالعالم</string>
+    <string name="login_prologue_fifth_caption_three">المتاحف في لندن</string>
+    <string name="login_prologue_fifth_tag_three">كرة القدم</string>
+    <string name="login_prologue_fifth_subtitle_three">موسيقى Rock n\' Roll الأسبوعية</string>
+    <string name="login_prologue_second_subtitle_two">لقد ألهمتني أعمال المصور كاميرون كارستن. سأجرِّب هذه التقنيات في المحاولة التالية</string>
+    <string name="login_prologue_second_subtitle_one">الحصول على الإلهام</string>
+    <string name="login_prologue_title_first">مرحبًا بك في أداة إنشاء مواقع الويب الأكثر رواجًا في العالم.</string>
+    <string name="login_prologue_title_second">باستخدام المحرر الضخم والقوي، يمكنك النشر أثناء التنقّل.</string>
+    <string name="login_prologue_title_third">شاهد التعليقات والإشعارات في الوقت الفعلي.</string>
+    <string name="login_prologue_title_fourth">شاهد جمهورك يتزايد من خلال التحليلات المتعمقة.</string>
+    <string name="login_prologue_title_fifth">تابع مواقعك المفضَّلة واكتشف مدوّنات جديدة.</string>
+    <string name="reader_discover_recommended_blogs_header">مواقع لمتابعتها</string>
+    <string name="media_loading_failed">فشل تحميل الوسائط</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">نعمل بجد لإضافة المزيد من المكوِّنات مع كل إصدار.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">لم يتم دعم \"%s\" بالكامل</string>
     <string name="gutenberg_native_help_button">زر المساعدة</string>
     <string name="gutenberg_native_edit_using_web_editor">تحرير باستخدام محرر الويب</string>
     <string name="gutenberg_native_choose_images">اختيار الصور</string>
+    <string name="stories_intro_create_story_post_label">إنشاء مقالة قصة</string>
+    <string name="stories_intro_description_second">تُنشر المقالة كمقالة جديدة على موقعك حتى لا يفوِّت جمهورك أي شيء.</string>
+    <string name="stories_intro_description_first">اجمع بين الصور ومقاطع الفيديو والنصوص لإنشاء مقالات قصة جذابة وقابلة للنقر سيحبها زائروك.</string>
+    <string name="stories_intro_title_second">مقالات القصة لا تختفي</string>
+    <string name="stories_intro_title_first">تتوافر القصص الآن للجميع</string>
+    <string name="stories_intro_image_caption_second">مثال لعنوان قصة</string>
+    <string name="stories_intro_image_caption_first">كيفية إنشاء مقالة قصة</string>
+    <string name="stories_intro_main_title">مقدمة لمقالات القصص</string>
+    <string name="mlp_notice_blank_page_created">تم إنشاء صفحة فارغة</string>
+    <string name="mlp_notice_page_created">تم إنشاء صفحة</string>
+    <string name="media_picker_soft_ask_permissions_denied">⁦%1$s⁩ تم رفض الوصول إلى صورك. لإصلاح هذا، حرِّر صلاحياتك وشغِّل ⁦%2$s⁩ و⁦%3$s⁩.</string>
+    <string name="media_insert_failed">فشل إدراج الوسائط.</string>
+    <string name="media_insert_failed_with_reason">فشل إدراج الوسائط: %s</string>
+    <string name="photo_picker_wordpress_media_library">الاختيار من مكتبة وسائط ووردبريس </string>
     <string name="reader_label_toolbar_back">رجوع</string>
     <string name="reader_discover_empty_button_text">البدء</string>
     <string name="reader_post_details_header_by_author_name">بواسطة</string>
+    <string name="reader_discover_empty_subtitle">متابعة المواضيع لاكتشاف مدونات جديدة</string>
     <string name="stats_referrer_popup_menu_open_website">فتح الموقع الإلكتروني</string>
-    <string name="gutenberg_native_search_or_type_url">ابحث أو اكتب رابطاً</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">يتعر وسم هذا المرجع بأنه بريد مزعج</string>
+    <string name="stats_referrer_popup_unmark_as_spam">عدم الوسم بأنه بريد مزعج</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">وضع علامة مزعج</string>
+    <string name="media_uploading_gif_library_photo">رفع وسائط بتنسيق gif</string>
+    <string name="media_uploading_stock_library_photo">رفع وسائط المخزون</string>
+    <string name="media_uploading_default">رفع الوسائط</string>
     <string name="gutenberg_native_select_item">تحديد عنصر</string>
+    <string name="gutenberg_native_search_or_type_url">ابحث أو اكتب رابطًا</string>
+    <string name="gutenberg_native_page_break">فاصل الصفحة</string>
     <string name="gutenberg_native_add_this_telephone_link">أضف رابط الهاتف هذا</string>
     <string name="gutenberg_native_add_this_link">إضافة هذا الرابط</string>
     <string name="gutenberg_native_add_this_email_link">إضافة رابط البريد الإلكتروني هذا</string>
-    <string name="suggestion_no_connection">\"لا يوجد اتصال بالإنترنت.\nالاقتراحات غير متوفرة.\"</string>
+    <string name="suggestion_no_connection">لا يوجد اتصال بالإنترنت.\nالاقتراحات غير متوفرة.</string>
     <string name="mlp_selected_description">%s محدد</string>
     <string name="mlp_notselected_description">%s </string>
     <string name="typeface_label_libre_baskerville">تقليدي</string>
@@ -34,7 +500,6 @@ Language: ar
     <string name="login_get_link_by_email">الحصول على رابط تسجيل الدخول عن طريق البريد الإلكتروني</string>
     <string name="email_not_registered_wpcom">حسناً، لا يمكننا العثور على حساب WordPress.com متصلاً بعنوان البريد الإلكتروني هذا.</string>
     <string name="reader_menu_report_post">الإبلاغ عن هذه المقالة</string>
-    <string name="gutenberg_native_angle">زاوية</string>
     <string name="reader_welcome_banner">مرحبًا بك في القارئ. اكتشف ملايين المدونات في متناول يديك.</string>
     <string name="error_media_xmlrcp_server_error">حدث خطأ داخلي في الخادم</string>
     <string name="error_media_xmlrpc_not_allowed">إجراؤك غير مسموح به</string>
@@ -46,7 +511,6 @@ Language: ar
     <string name="create_post_story_fab_tooltip">إنشاء مقالة أو قصة</string>
     <string name="create_page_fab_tooltip">إنشاء صفحة</string>
     <string name="create_post_fab_tooltip">إنشاء مقالة</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="dialog_insufficient_device_storage_error_ok_button">عرض مساحة التخزين</string>
     <string name="toast_error_saving_image">حدث خطأ أثناء حفظ الصورة</string>
     <string name="gutenberg_native_page_title_empty">عنوان الصفحة. فارغ</string>
@@ -80,7 +544,6 @@ Language: ar
     <string name="label_frame_errored">خطأ</string>
     <string name="label_text_alignment_button">تغيير محاذاة النص</string>
     <string name="label_text_color_button">تغيير لون النص</string>
-    <string name="menu_delete_page">حذف الشريحة</string>
     <string name="dialog_discard_page_title">حذف شريحة القصة؟</string>
     <string name="dialog_discard_story_ok_button">تجاهل</string>
     <string name="story_saving_untitled">بدون عنوان</string>
@@ -94,13 +557,10 @@ Language: ar
     <string name="mlp_preview_page">معاينة</string>
     <string name="capture_button_alt">إلتقاط</string>
     <string name="stickers_button_alt">الملصقات</string>
-    <string name="more_button_alt">المزيد</string>
     <string name="sound_button_alt">صوت</string>
     <string name="text_button_alt">نصّ</string>
     <string name="label_control_saved">تم الحفظ</string>
     <string name="label_control_saving">جاري الحفظ</string>
-    <string name="label_done">تمّ</string>
-    <string name="label_control_publish">التالي</string>
     <string name="label_close_button">إغلاق</string>
     <string name="label_saved_icon">تم الحفظ</string>
     <string name="label_retry_icon">إعادة المحاولة</string>
@@ -115,7 +575,7 @@ Language: ar
     <string name="label_control_flash">فلاش</string>
     <string name="prepublishing_nudges_story_title_hint">امنح قصتك عنواناً</string>
     <string name="mlp_choose_layout_subtitle">ابدأ بالاختيار من بين مجموعة متنوعة من تخطيطات الصفحات المعدَّة سابقًا. أو ما عليك سوى البدء بصفحة فارغة.</string>
-    <string name="quick_start_dialog_create_new_post_message_short">اضغط على إنشاء ⁦%1$s⁩. ⁦%2$s⁩ بعدها، حدِّد &lt;b>مقالة&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">اضغط على إنشاء ⁦%1$s⁩. ⁦%2$s⁩ بعدها، حدِّد &lt;b&gt;مقالة&lt;/b&gt;</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">إنشاء مقالة، صفحة أو قصة</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">إنشاء مقالة أو قصة</string>
     <string name="mlp_choose_layout_title">اختيار تخطيط</string>
@@ -128,17 +588,14 @@ Language: ar
     <string name="pick_file">إضافة ملف</string>
     <string name="gutenberg_native_replace_image_or_video">استبدال صورة أو فيديو</string>
     <string name="gutenberg_native_replace_video">استبدال الفيديو</string>
-    <string name="continue_with_wpcom">المتابعة باستخدام WordPress.com</string>
-    <string name="enter_your_site_address">أدخل رابط موقعك</string>
-    <string name="content_description_logo">شعار ووردبريس</string>
     <string name="gutenberg_native_block_removed">تم إزالة المكوّن</string>
     <string name="gutenberg_native_choose_image">اختيار صورة</string>
     <string name="gutenberg_native_choose_image_or_video">اختيار صورة أو فيديو</string>
     <string name="gutenberg_native_choose_video">اختيار فيديو</string>
     <string name="continue_with_google_terms_of_service_text">إذا تابعت مع Google وليس لديك حساب WordPress.com بالفعل، فأنت تقوم بإنشاء حساب وتوافق على %1$sشروط الخدمة%2$s.</string>
     <string name="signup_confirmation_title">تأكيد التسجيل</string>
+    <string name="enter_your_site_address">أدخل رابط موقعك الحالي</string>
     <string name="continue_terms_of_service_text">بالمتابعة، أنت توافق على %1$sشروط الخدمة%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">سنرسل لك عبر البريد الإلكتروني رابطًا لإنشاء حسابك الجديد على WordPress.com.</string>
     <string name="signup_confirmation_message">سنستخدم عنوان البريد الإلكتروني هذا لإنشاء حسابك الجديد على WordPress.com.</string>
     <string name="signup_magic_link_message">أرسلنا لك عبر البريد الإلكتروني رسالة تتضمن رابط التسجيل لإنشاء حسابك الجديد على WordPress.com. تحقَّق من بريدك الإلكتروني على هذا الجهاز، وانقر على الرابط الموجود في الرسالة التي تم تلقيها عبر البريد الإلكتروني من WordPress.com.</string>
     <string name="enter_account_info_for_site">أدخل معلومات حسابك لـ %1$s.</string>
@@ -150,8 +607,6 @@ Language: ar
     <string name="magic_link_not_seeing_email_message">لم تشاهد البريد الإلكتروني؟ تحقّق من مجلد البريد المزعج أو البريد العشوائي.</string>
     <string name="login_magic_links_label">سنرسل لك عبر البريد الإلكتروني رابطًا يسجّل دخولك على الفور، دون الحاجة إلى كلمة مرور.</string>
     <string name="reset_your_password">إعادة تعيين كلمة المرور الخاصة بك</string>
-    <string name="login_promo_title_37_percent">37\% من مواقع الويب مبنية على ووردبريس.</string>
-    <string name="login_promo_text_unlock_the_power">أطلق العنان لقدرات منشئ المواقع الأكثر مرونة.</string>
     <string name="send_link_by_email">إرسال الرابط عبر البريد الإلكتروني</string>
     <string name="create_account">إنشاء حساب</string>
     <string name="or_type_your_password">أو اكتب كلمة المرور الخاصة بك</string>
@@ -159,15 +614,13 @@ Language: ar
     <string name="get_started">البدء</string>
     <string name="check_email">التحقق من البريد الإلكتروني</string>
     <string name="reader_error_request_failed_title">حدثت مشكلة أثناء معالجة الطلب. يرجى المحاولة مرة أخرى لاحقاً.</string>
-    <string name="quick_start_list_update_site_title_subtitle">حدِّد اسمًا لموقعك يعكس هويته وموضوعه. الاعتماد على الانطباعات الأولى!</string>
     <string name="quick_start_list_update_site_title_title">تعيين عنوان موقعك</string>
-    <string name="quick_start_dialog_update_site_title_message_short">انقر على &lt;b>⁦%1$s⁩&lt;/b> لتعيين عنوان جديد</string>
+    <string name="quick_start_dialog_update_site_title_message_short">انقر على &lt;b&gt;⁦%1$s⁩&lt;/b&gt; لتعيين عنوان جديد</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">سيؤدي نقل هذه المقالة إلى سلة المهملات إلى تجاهل التغييرات المحلية كذلك، هل ترغب بالتأكيد في المتابعة؟</string>
     <string name="gutenberg_native_s_block_options">%s خيارات المكوِّن</string>
     <string name="gutenberg_native_duplicate_block">تكرار المكوِّن</string>
     <string name="gutenberg_native_copy_block">نسخ المكوِّن</string>
     <string name="gutenberg_native_copied_block">المكوِّن الذي تم نسخه</string>
-    <string name="gutenberg_native_block_settings">إعدادات المكوِّن</string>
     <string name="gutenberg_native_block_pasted">المكوِّن الذي تم لصقه</string>
     <string name="gutenberg_native_block_duplicated">المكوِّن الذي تم تكراره</string>
     <string name="gutenberg_native_block_cut">المكوِّن الذي تم قصه</string>
@@ -183,13 +636,12 @@ Language: ar
     <string name="gutenberg_native_gradient_type">نوع التدرج</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">الضغط ضغطًا مزدوجًا لتحديد الخيار</string>
     <string name="gutenberg_native_customize_gradient">تخصيص التدرج</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="everyone">الجميع</string>
     <string name="photo_picker_use_gif">استخدام تنسيق GIF هذا</string>
     <string name="error_media_thumbnail_not_loaded">تعذر تحميل الصورة المصغَّرة للوسائط</string>
-    <string name="menu_content_info">هيكل المحتوى</string>
     <string name="me">أنا</string>
     <string name="pages_list_author">كاتب الصفحة</string>
+    <string name="menu_content_info">بنية المحتوى</string>
     <string name="gutenberg_native_dismiss">تجاهل</string>
     <string name="prepublishing_nudges_home_tags_not_set">لم يتم التعيين</string>
     <string name="prepublishing_nudges_back_button">رجوع</string>
@@ -207,8 +659,6 @@ Language: ar
     <string name="prepublishing_nudges_toolbar_title_publish">تاريخ النشر</string>
     <string name="publish_date">تاريخ النشر</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">هل تريد نقل المقالة إلى المسودات؟</string>
-    <string name="reader_label_choose_your_interests">اختيار اهتماماتك</string>
-    <string name="reader_choose_interests_content_description">اختيار اهتماماتك</string>
     <string name="reader_btn_done">انتهى</string>
     <string name="reader_btn_select_few_interests">تحديد القليل للاستمرار</string>
     <string name="post_status_post_published">منشور</string>
@@ -216,13 +666,13 @@ Language: ar
     <string name="ccpa_privacy_notice_read">قراءة إشعار الخصوصية لقانون خصوصية المستهلك في كاليفورنيا</string>
     <string name="ccpa_privacy_notice_caption">يتطلب قانون خصوصية المستهلك في كاليفورنيا (\"CCPA\") منا تزويد سكان كاليفورنيا ببعض المعلومات الإضافية حول تصنيفات المعلومات الشخصية التي نقوم بتجميعها ومشاركتها، مع تحديد المصدر الذي نحصل على تلك المعلومات الشخصية منه، وكيف نستخدمها ولماذا.</string>
     <string name="post_status_post_scheduled">مجدولة</string>
+    <string name="reader_choose_interests_content_description">اختر مواضيعك</string>
+    <string name="reader_label_choose_your_interests">اختر مواضيعك</string>
     <string name="status_and_visibility">الحالة والظهور</string>
     <string name="ccpa_privacy_notice_header">إشعار الخصوصية الخاص بالمستخدمين في كاليفورنيا</string>
     <string name="update_now">قم بالتحديث الآن</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
     <string name="gutenberg_native_open_block_actions_menu">فتح قائمة إجراءات المكوِّن</string>
-    <string name="gutenberg_native_try_a_starter_layout">تجربة تخطيط بدء العمل</string>
-    <string name="gutenberg_native_insert_mention">إدراج إشارة</string>
+    <string name="gutenberg_native_move_to_top">تحريك للأعلى</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">النقر المزدوج لفتح الورقة السفلية التي تحتوي على خيارات متوافرة</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">النقر المزدوج لفتح ورقة الإجراءات التي تحتوي على خيارات متوافرة</string>
     <string name="site_settings_static_homepage">الصفحة الرئيسية الثابتة</string>
@@ -230,11 +680,10 @@ Language: ar
     <string name="pages_cannot_be_started">يتعذر علينا فتح الصفحات في الوقت الحالي. يرجى المحاولة مجددًا في وقت لاحق</string>
     <string name="pages_set_as_posts_page">تعيين كصفحة مقالات</string>
     <string name="pages_set_as_homepage">تعيين كصفحة رئيسية</string>
-    <string name="suggestion_no_matching_users">\"لا يتوافر أي مستخدمين متطابقين\".</string>
-    <string name="suggestion_invalid_user">\"إنَّ %s مستخدم غير صالح\"</string>
     <string name="site_settings_select_page">تحديد صفحة</string>
     <string name="site_settings_classic_blog">المدونة التقليدية</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">يتعذر أن تتشابه الصفحة الرئيسية المحدَّدة مع صفحة المقالات.</string>
+    <string name="suggestion_invalid">%s ليس %s صالح</string>
     <string name="site_settings_accept_homepage">موافقة</string>
     <string name="site_settings_failed_update_homepage_settings">فشل تحديث إعدادات الصفحة الرئيسية، تحقَّق من اتصالك بالإنترنت</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">يتعذر حفظ إعدادات الصفحة الرئيسية قبل تحميل الصفحات</string>
@@ -249,7 +698,6 @@ Language: ar
     <string name="page_homepage_successfully_updated">تم تحديث الصفحة الرئيسية بنجاح</string>
     <string name="page_cannot_set_posts_page">لتعيين صفحة المقالات، قم بتمكين \"الصفحة الرئيسية الثابتة\" في إعدادات الموقع</string>
     <string name="page_cannot_set_homepage">لتعيين صفحة رئيسية، قم بتمكين \"الصفحة الرئيسية الثابتة\" في إعدادات الموقع</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">مرحبًا بك في مدونتنا الجديدة</string>
     <string name="gutenberg_native_select_a_color">تحديد لون</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">الضغط ضغطًا مزدوجًا للانتقال إلى إعدادات الألوان</string>
     <string name="reader_empty_followed_blogs_description">عندما تتابع المواقع، سترى محتواها هنا</string>
@@ -283,7 +731,6 @@ Language: ar
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">الضغط المزدوج لنقل المكوِّن إلى اليسار</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">نقل المكوِّن إلى اليمين من الموضع %1$s إلى الموضع %2$s</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">نقل المكوِّن إلى اليسار من الموضع %1$s إلى الموضع %2$s</string>
-    <string name="gutenberg_native_blog">المدوّنة</string>
     <string name="new_site_creation_creating_site_loading_4">إنشاء لوحة التحكم</string>
     <string name="new_site_creation_creating_site_loading_3">إعداد القالب</string>
     <string name="new_site_creation_creating_site_loading_2">إضافة ميزات الموقع</string>
@@ -339,51 +786,14 @@ Language: ar
     <string name="quickpress_shortcut_activity_label">اختر مدونة لاختصار QuickPress</string>
     <string name="app_theme_default">تعيين بواسطة موفّر البطارية</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">لقد أجريت مؤخرًا تغييرات على هذه الصفحة ولكن لم نحفظها. اختيار إصدار لتحميله:\n</string>
-    <string name="gutenberg_native_what_people_say">ماذا يقول الناس</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">نوفِّر مجموعة من الخدمات لمساعدتك على تحقيق النتائج التي تسعى إليها. ألستَ متأكِّدًا مما تحتاج إليه؟، أو كم تبلغ تكلفته؟ يمكننا توضيح الخدمات المناسبة لك، وإبلاغك بالمزيد عن الرسوم التي نطلبها. ابق على اتصال من خلال المعلومات الواردة ادناه.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">نحن فريق صغير من الاحترافيين الموهوبين الذين يتمتعون بمجموعة كبيرة من المهارات والخبرات. نحب ما نفعله ونقوم به بشغف. نتطلع إلى العمل معك.</string>
-    <string name="gutenberg_native_walt_disney">والت ديزني</string>
-    <string name="gutenberg_native_want_to_work_with_us">ترغب بالعمل معنا؟</string>
-    <string name="gutenberg_native_warning_message">رسالة التحذير</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">سيرغب الزائرون في معرفة الموجودين على الجانب الآخر من الصفحة. استخدم هذه المساحة للكتابة عن نفسك أو موقعك أو شركتك أو أي شيء تريده. استعن بالتوصيات الواردة أدناه للاقتباس من الآخرين الذين يتحدثون حول الأمر نفسه بأسلوبهم الخاص.</string>
-    <string name="gutenberg_native_position_or_job_title">المنصب أو المسمى الوظيفي</string>
-    <string name="gutenberg_native_project_name">اسم المشروع</string>
-    <string name="gutenberg_native_sally_smith">سالي سميث</string>
-    <string name="gutenberg_native_samuel_the_dog">القطّ فروزن</string>
-    <string name="gutenberg_native_services">الخدمات</string>
     <string name="gutenberg_native_show_post_content">إظهار محتوى المقالة</string>
-    <string name="gutenberg_native_strategy">الإستراتيجية</string>
-    <string name="gutenberg_native_success_message">رسالة النجاح</string>
-    <string name="gutenberg_native_team">الفريق</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">طريقة البدء هي التوقف عن الحديث والبدء في القيام به.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">هذا هو محتوى النموذج المُضمَّن مع القالب لتوضيح ميزاته. يمكنك إزالته أو استبدال كلماتك ووسائطك الخاصة به.</string>
-    <string name="gutenberg_native_usa">USA</string>
     <string name="gutenberg_native_link_to">رابط لـ</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">يعرض معرض أعمالي المشاريع المختلفة التي تم إنشاؤها طوال مسيرتي المهنية. شاهد معلومات الاتصال الخاصة بي أدناه لنبق على تواصل.</string>
     <string name="gutenberg_native_only_show_excerpt">إظهار المقتطف فقط</string>
-    <string name="gutenberg_native_portfolio">معرض أعمال</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">فلنتحدث 👋 لا تتردد في التواصل باستخدام معلومات الاتصال أدناه، أو إرسال رسالة باستخدام النموذج.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">دعونا نبني شيئًا معًا!</string>
-    <string name="gutenberg_native_let_s_build_something_together">دعونا نبني شيئًا معًا!</string>
-    <string name="gutenberg_native_juan_p_rez">خوان بيريز</string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">راسلني عبر البريد: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
+    <string name="gutenberg_native_link_settings">إعدادات الرابط</string>
     <string name="gutenberg_native_excerpt_length_words">طول المقتطف (كلمات)</string>
-    <string name="gutenberg_native_get_in_touch">ابق على اتصال</string>
-    <string name="gutenberg_native_inspiration">الإلهام</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">هاري، إن اختياراتنا هي التي تظهر ما نحن عليه بالفعل، أكثر بكثير من قدراتنا.</string>
-    <string name="gutenberg_native_j_k_rowling">ج.ك. رولينج</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">لا تبكي لأنه انتهى، ابتسم لأنه حدث.</string>
-    <string name="gutenberg_native_city_10100">المدينة، 10100</string>
     <string name="gutenberg_native_customize">تخصيص</string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">وصف المشروع والأعمال المقدَّمة.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">سيرة ذاتية قصيرة مع التاريخ الشخصي والإنجازات الرئيسية، أو حقيقة مثيرة للاهتمام.</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">وصف موجز للخدمات التي تقدمها.</string>
     <string name="gutenberg_native_add_paragraph_block">إضافة مكوّن فقرة</string>
-    <string name="gutenberg_native_555_555_1234">+96692000000</string>
-    <string name="gutenberg_native_10_street_road">شارع 10 العام</string>
-    <string name="my_site_select_domains_page_title">رابط الموقع</string>
+    <string name="gutenberg_native_video_settings">إعدادات الفيديو</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">غير متصل</string>
     <string name="sharing_facebook_account_must_have_pages">يتعذر الاتصال بـ Facebook العثور على أي صفحات. لا يمكن لآلية النشر الاتصال بملفات تعريف Facebook الشخصية، فقط للصفحات المنشورة.</string>
     <string name="post_list_tab_published_posts">منشور</string>
@@ -404,13 +814,11 @@ Language: ar
     <string name="reader_filter_self_hosted_empty_sites_tags_action">تسجيل الدخول إلى WordPress.com</string>
     <string name="reader_btn_remove_filter_content_description">إزالة الفلتر الحالي</string>
     <string name="reader_btn_select_filter_content_description">تحديد موقع أو وسم لفلترة المقالات</string>
-    <string name="reader_btn_selected_filter_tick_content_description">مُحدَّد</string>
     <string name="reader_bottom_sheet_content_description">تحديد وسم أو موقع، نافذة منبثقة</string>
     <string name="reader_self_hosted_select_filter">استخدام زر الفلترة للعثور على مقالات في مواضيع معينة</string>
     <string name="reader_title_subs">إدارة المواضيع والمواقع</string>
     <string name="reader_filter_self_hosted_empty_sites_list">تسجيل الدخول إلى WordPress.com للاطلاع على أحدث المقالات من المواقع التي تتابعها</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">تسجيل الدخول إلى WordPress.com للاطلاع على أحدث المقالات من المواضيع التي تتابعها</string>
-    <string name="gutenberg_native_template_preview">معاينة القالب</string>
     <string name="gutenberg_native_replace_current_block">استبدال المكوِّن الحالي</string>
     <string name="gutenberg_native_add_to_end">إضافة إلى النهاية</string>
     <string name="gutenberg_native_add_to_beginning">إضافة إلى البداية</string>
@@ -424,7 +832,6 @@ Language: ar
     <string name="reader_filter_cta">عامل التصفية</string>
     <string name="gutenberg_native_video_caption_s">تسمية الفيديو. %s</string>
     <string name="gutenberg_native_edit_video">تحرير الفيديو</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">انقر نقرًا مزدوجًا لتحديد المخطط</string>
     <string name="gutenberg_native_add_a_shortcode">إضافة كود قصير…</string>
     <string name="fab_create_desc">إنشاء مقالة</string>
     <string name="stats_posting_activity_end_description">لقد استمعت إلى جميع الإحصاءت لهذه الفترة.\n بالنقر مرة أخرى سيجرى إعادة التشغيل من البداية.</string>
@@ -439,11 +846,9 @@ Language: ar
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="post_list_author">كاتب المقالة</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s، %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">تحريك الصورة إلى الأمام</string>
-    <string name="gutenberg_native_move_image_backward">تحريك الصورة إلى الخلف</string>
     <string name="gutenberg_native_gallery_caption_s">التسمية التوضيحية لمعرض الصور. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. القيمة الحالية هي %2$s</string>
     <string name="create_post_page_fab_tooltip">إنشاء مقالة أو صفحة</string>
+    <string name="gutenberg_native_replace_image">استبدال الصورة</string>
     <string name="content_description_person_building_website">شخص ينشئ موقعًا على الويب</string>
     <string name="post_signup_interstitial_not_right_now">ليس الآن</string>
     <string name="post_signup_interstitial_subtitle">سواء أرغبتَ في الإنشاء أو المشاركة، فإنَّنا سنساعدك على القيام بذلك بشكل صحيح.</string>
@@ -456,25 +861,20 @@ Language: ar
     <string name="my_site_bottom_sheet_add_post">مقالة المدونة</string>
     <string name="my_site_bottom_sheet_title">إضافة جديد</string>
     <string name="post_settings_publish">نشر</string>
-    <string name="dialog_gutenberg_informative_description_v2">أجرينا تحسينات هائلة في محرِّر المكوّن، ونظن أنها تستحق عناء المحاولة! قمنا بتمكينها في المقالات والصفحات الجديدة، ولكن إذا رغبتَ في التغيير إلى المحرِّر التقليدي فانتقل إلى \"موقعي\" > \"إعدادات الموقع\".</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">المزامنة الآن</string>
     <string name="dialog_confirm_scheduled_post_sync_message">ستتم مزامنة هذه المقالة فورًا.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">هل أنت جاهز للمزامنة؟</string>
     <string name="new_site_creation_unavailable_domain">هذا النطاق غير متاح.</string>
-    <string name="login_promo_viewpager_content_description">المقدمة</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">تعذر علينا الوصول إلى موقعك. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
-    <string name="login_discovery_error_ssl">تعذر علينا الوصول إلى موقعك بسبب حدوث مشكلة في &lt;b>شهادة SSL&lt;/b>. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
-    <string name="login_discovery_error_http_auth">تعذر علينا الوصول إلى موقعك لأنه يتطلب &lt;b>مصادقة HTTP&lt;/b>. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
-    <string name="login_discovery_error_xmlrpc">تعذر علينا الوصول إلى &lt;b>ملف XMLRPC&lt;/b> على موقعك. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
-    <string name="login_site_credentials_magic_link_label">تقريبًا هناك! يتعين علينا فقط التحقق من صحة عنوان بريدك الإلكتروني المتصل بـ Jetpack &lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">تعذر علينا الوصول إلى موقعك بسبب حدوث مشكلة في &lt;b&gt;شهادة SSL&lt;/b&gt;. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
+    <string name="login_discovery_error_http_auth">تعذر علينا الوصول إلى موقعك لأنه يتطلب &lt;b&gt;مصادقة HTTP&lt;/b&gt;. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
+    <string name="login_discovery_error_xmlrpc">تعذر علينا الوصول إلى &lt;b&gt;ملف XMLRPC&lt;/b&gt; على موقعك. سيتعين عليك الوصول إلى مضيفك لحل هذا الأمر.</string>
+    <string name="login_site_credentials_magic_link_label">تقريبًا هناك! يتعين علينا فقط التحقق من صحة عنوان بريدك الإلكتروني المتصل بـ Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">تسجيل الدخول باستخدام بيانات اعتماد الموقع %1$s الخاصة بك</string>
-    <string name="send_verification_email">إرسال رسالة تحقق عبر البريد الإلكتروني</string>
     <string name="reader_following_display_name">المتابعة</string>
     <string name="my_site_bottom_sheet_add_page">صفحة الموقع</string>
-    <string name="enter_site_credentials_instead">تسجيل الدخول باستخدام بيانات اعتماد الموقع.</string>
     <string name="posts_cannot_be_started">يتعذر علينا فتح هذه المقالات الآن. يرجى المحاولة مجددًا في وقت لاحق</string>
-    <string name="suffix_1_000">%sk</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
@@ -486,24 +886,21 @@ Language: ar
     <string name="reader_my_likes_display_name">الإعجابات</string>
     <string name="site_cannot_be_loaded">يتعذر علينا تحميل بيانات موقعك الآن. يرجى المحاولة مجددًا في وقت لاحق</string>
     <string name="reader_filter_tags_title">المواضيع</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="gutenberg_native_wordpress_media_library">مكتبة وسائط ووردبريس</string>
     <string name="gutenberg_native_start_writing">بدء الكتابة…</string>
     <string name="gutenberg_native_take_a_video">تسجيل مقطع فيديو</string>
     <string name="gutenberg_native_take_a_photo_or_video">التقاط صورة أو تسجيل فيديو</string>
     <string name="gutenberg_native_take_a_photo">التقاط صورة</string>
-    <string name="gutenberg_native_title">العنوان:</string>
     <string name="gutenberg_native_translate">الترجمة</string>
     <string name="gutenberg_native_ungroup">فكّ التجميع</string>
     <string name="gutenberg_native_tap_here_to_show_help">أنقر هنا لإظهار المساعدة</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">أنقر لإخفاء لوحة المفاتيح</string>
-    <string name="gutenberg_native_size">الحجم</string>
-    <string name="gutenberg_native_sidebar_title_plugin">إضافة عنوان الشريط الجانبي</string>
+    <string name="gutenberg_native_unsupported">غير مدعوم</string>
     <string name="gutenberg_native_show_section">إظهار القسم</string>
-    <string name="gutenberg_native_reset_block">إعادة تعيين المكوِّن</string>
     <string name="gutenberg_native_s_block_empty">مكوِّن %s. فارغ</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">مكوِّن %s. يحتوي هذا المكوِّن على محتوى غير صالح</string>
     <string name="gutenberg_native_cut_block">قص المكوِّن</string>
-    <string name="gutenberg_native_remove_annotations">إزالة التعليقات التوضيحية</string>
     <string name="gutenberg_native_problem_opening_the_video">ثمَّة مشكلة أثناء فتح مقطع الفيديو</string>
     <string name="gutenberg_native_problem_displaying_block">ثمَّة مشكلة أثناء عرض المكوِّن</string>
     <string name="gutenberg_native_post_title_s">عنوان المقالة. %s</string>
@@ -513,11 +910,7 @@ Language: ar
     <string name="gutenberg_native_open_settings">فتح الإعدادات</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">لا يتوفر تطبيق لمعالجة هذا الطلب. يرجى تثبيت متصفح ويب.</string>
     <string name="gutenberg_native_navigate_up">الانتقال إلى الأعلى</string>
-    <string name="gutenberg_native_my_pre_publish_panel">لوحة النشر المُسبق الخاصة بي</string>
-    <string name="gutenberg_native_my_post_status_info">معلومات حالة المقالة الخاصة بي</string>
     <string name="gutenberg_native_move_block_up">تحريك المكوّن لأعلى</string>
-    <string name="gutenberg_native_my_post_publish_panel">لوحة النشر اللاحق الخاصة بي</string>
-    <string name="gutenberg_native_my_document_setting_panel">لوحة تعيين مستنداتي</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">نقل المكوِّن إلى أعلى من الصف %1$s إلى الصف %2$s</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">نقل المكوِّن إلى أسفل من الصف %1$s إلى الصف %2$s</string>
     <string name="gutenberg_native_help_icon">أيقونة المساعدة</string>
@@ -525,7 +918,6 @@ Language: ar
     <string name="gutenberg_native_move_block_down">تحريك المكوّن لأسفل</string>
     <string name="gutenberg_native_image_caption_s">تسمية توضيحية للصورة. %s</string>
     <string name="gutenberg_native_hide_keyboard">إخفاء لوحة المفاتيح</string>
-    <string name="gutenberg_native_here_is_the_panel_content">فيما يأتي محتوى اللوحة!</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">الضغط المزدوج للتراجع عن آخر تغيير</string>
     <string name="gutenberg_native_double_tap_to_toggle_setting">الضغط المزدوج لتبديل الإعداد</string>
     <string name="gutenberg_native_double_tap_to_select_an_image">الضغط المزدوج لتحديد صورة</string>
@@ -535,34 +927,28 @@ Language: ar
     <string name="gutenberg_native_double_tap_to_move_the_block_up">الضغط المزدوج لنقل المكوِّن إلى أعلى</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">الضغط المزدوج لنقل المكوِّن إلى أسفل</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">الضغط المزدوج لتحرير هذه القيمة</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">الضغط المزدوج لتغيير القيمة باستخدام شريط التمرير</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">الضغط المزدوج لإضافة مكوِّن</string>
     <string name="gutenberg_native_choose_from_device">الاختيار من الجهاز</string>
-    <string name="gutenberg_native_content">المحتوى…</string>
     <string name="gutenberg_native_current_value_is_s">القيمة الحالية هي %s</string>
-    <string name="gutenberg_native_annotations_sidebar">الشريط الجانبي للتعليقات التوضيحية</string>
     <string name="gutenberg_native_add_image">إضافة صورة</string>
     <string name="gutenberg_native_add_image_or_video">إضافة صورة أو فيديو</string>
     <string name="gutenberg_native_add_url">إضافة رابط</string>
     <string name="gutenberg_native_add_video">إضافة فيديو</string>
     <string name="gutenberg_native_alt_text">النص البديل</string>
-    <string name="gutenberg_native_add_a_description">إضافة وصف</string>
     <string name="gutenberg_native_add_block_here">إضافة مكوّن هنا</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">حدث خطأ غير معروف. يُرجى المحاولة مرة أخرى.</string>
-    <string name="gutenberg_native_add_annotation">إضافة تعليق توضيحي</string>
+    <string name="gutenberg_native_add_alt_text">إضافة نصّ بديل للرابط</string>
     <string name="reader_acessibility_list_loaded">\"تم تحميل القائمة بعناصر %1$d.\"</string>
     <string name="reader_empty_saved_posts_content_description">أنقر فوق الزرّ \"حفظ المقالات\" لحفظ مقالةٍ في قائمتك.</string>
-    <string name="master_switch_default_title_off">إيقاف التشغيل</string>
-    <string name="master_switch_default_title_on">تشغيل</string>
-    <string name="notifications_tab_dialog_master_off_message">يؤدي إيقاف تشغيل تنبيهات هذا الموقع إلى تعطيل التنبيهات المعروضة في علامة تبويب \"التنبيهات\" في هذا الموقع. يمكنك ضبط نوع التنبيه الذي تراه بعد تشغيل التنبيهات لهذا الموقع.</string>
+    <string name="main_switch_default_title_off">إيقاف التشغيل</string>
+    <string name="main_switch_default_title_on">تشغيل</string>
     <string name="notifications_tab_dialog_switch_desc">الإشعارات</string>
-    <string name="notifications_tab_dialog_master_off_title">لرؤية التنبيهات في علامة تبويب \"التنبيهات\" في هذا الموقع، شغِّل التنبيهات لهذا الموقع.</string>
-    <string name="notifications_tab_dialog_master_hint_off">تمكين التنبيهات المعروضة في علامة تبويب \"التنبيهات\" في هذا الموقع</string>
-    <string name="notifications_tab_dialog_master_hint_on">تعطيل التنبيهات المعروضة في علامة تبويب \"التنبيهات\" في هذا الموقع</string>
-    <string name="notifications_tab_dialog_master_status_off">التنبيهات لهذا الموقع</string>
-    <string name="notifications_tab_dialog_master_status_on">التنبيهات لهذا الموقع</string>
-    <string name="dialog_gutenberg_informative_description_page">أنت الآن تستخدم محرِّر المكوّنات للصفحات الجديدة، رائع! إذا كنت ترغب بالتغيير إلى المحرِّر التقليدي، فانتقل إلى \"موقعي\" > \"إعدادات الموقع\".</string>
-    <string name="dialog_gutenberg_informative_description_post">أنت الآن تستخدم محرِّر المكوّنات للمقالات الجديدة،رائع! إذا كنت ترغب بالتغيير إلى المحرِّر التقليدي، فانتقل إلى \"موقعي\" > \"إعدادات الموقع\".</string>
+    <string name="notifications_tab_dialog_main_off_message">يؤدي إيقاف تشغيل الإشعارات لهذا الموقع إلى تعطيل الإشعارات المعروضة في علامة تبويب \"الإشعارات\" في هذا الموقع. يمكنك ضبط نوع الإشعار الذي تراه بعد تشغيل الإشعارات لهذا الموقع.</string>
+    <string name="notifications_tab_dialog_main_status_off">الإشعارات لهذا الموقع</string>
+    <string name="notifications_tab_dialog_main_status_on">الإشعارات لهذا الموقع</string>
+    <string name="notifications_tab_dialog_main_off_title">لرؤية الإشعارات في علامة تبويب \"الإشعارات\" في هذا الموقع، شغِّل الإشعارات لهذا الموقع.</string>
+    <string name="notifications_tab_dialog_main_hint_off">تمكين الإشعارات المعروضة في علامة تبويب \"الإشعارات\" في هذا الموقع</string>
+    <string name="notifications_tab_dialog_main_hint_on">تعطيل الإشعارات المعروضة في علامة تبويب \"الإشعارات\" في هذا الموقع</string>
     <string name="pick_media">إضافة صورة أو فيديو</string>
     <string name="error_post_not_submitted_retrying">لم نتمكن من إرسال هذه المقالة للمراجعة، ولكننا سنحاول مرة أخرى لاحقًا. </string>
     <string name="error_post_not_scheduled_retrying">لم نتمكن من جدولة هذه المقالة، ولكننا سنحاول مرة أخرى لاحقًا.</string>
@@ -656,8 +1042,6 @@ Language: ar
     <string name="post_notification_ten_minutes_before">قبل 10 دقائق</string>
     <string name="post_settings_time_and_date">التاريخ والوقت</string>
     <string name="login_invalid_site_url">يرجى إدخال عنوان موقع ويب كامل، مثل example.com.</string>
-    <string name="enter_wordpress_site">موقع الويب على هذا العنوان ليس موقع ووردبريس. بالنسبة لنا للاتصال به، يجب أن يكون الموقع مُنصّبًا ووردبريس.</string>
-    <string name="login_need_help_finding_connected_email">هل تريد مساعدة في العثور على البريد الإلكتروني الذي أنت متصلاً به؟</string>
     <string name="site_settings_editor">المُحرر</string>
     <string name="stats_collapse_content_description">طيّ</string>
     <string name="stats_expand_content_description">توسيع</string>
@@ -685,12 +1069,12 @@ Language: ar
     <string name="stats_widget_error_no_access_token">لعرض إحصائياتك، سجّل الدخول إلى حساب WordPress.com.</string>
     <string name="post_list_search_nothing_found">لا تتطابق أي مقالة مع بحثك</string>
     <string name="post_list_search_prompt">بحث في المقالات</string>
-    <string name="domains_suggestions_intro_description">هذا هو المكان الذي سيجده الأشخاص على الإنترنت.</string>
     <string name="domains_suggestions_intro_title">اختيار اسم نطاق متميز</string>
     <string name="stats_widget_minified_name">نبذة سريعة</string>
     <string name="stats_widget_today_insights_name">اليوم</string>
     <string name="stats_widget_all_time_insights_name">كل الوقت</string>
     <string name="my_site_custom_domain_name">تتضمن جميع خطط WordPress.com اسم نطاق مخصص. سجّل نطاقك المميز المجاني الآن.</string>
+    <string name="domains_suggestions_intro_description">هذا هو المكان الذي سيجدك فيه الأشخاص على الإنترنت.</string>
     <string name="stats_widget_weekly_views_name">المشاهدات هذا الأسبوع</string>
     <string name="stats_widget_log_in_message">الرجاء تسجيل الدخول إلى تطبيق ووردبريس لإضافة ودجت.</string>
     <string name="stats_widget_error_no_network">لا توجد شبكة متاحة</string>
@@ -732,7 +1116,7 @@ Language: ar
     <string name="domain_contact_information_register_domain_button">تسجيل اسم نطاق</string>
     <string name="domain_registration_result_title">تهانينا</string>
     <string name="domain_registration_result_continue_button">متابعة</string>
-    <string name="domain_registration_result_description">يجري إعداد نطاقك الجديد &lt;b>%s&lt;/b>. يقوم موقعك\n القيام بحركات بهلوانية من أجل الإثارة!</string>
+    <string name="domain_registration_result_description">يجري إعداد نطاقك الجديد &lt;b&gt;%s&lt;/b&gt;. يقوم موقعك\n القيام بحركات بهلوانية من أجل الإثارة!</string>
     <string name="domain_contact_information_description">قمنا بتعبئة معلومات جهات الاتصال الخاصة بك مسبقًا على حسابك في WordPress.com من أجل راحتك.\n        يرجى المراجعة للتأكد من صحة المعلومات التي ترغب في استخدامها لهذا النطاق.</string>
     <string name="domain_contact_information_organization_hint">المؤسسة (اختياري)</string>
     <string name="domain_registration_privacy_protection_description">يتعين على مالكي النطاق مشاركة معلومات الاتصال في قاعدة بيانات عامة لجميع النطاقات.\n        مع ميزة حماية الخصوصية، ننشر معلوماتنا الخاصة بدلاً من معلوماتك، وإعادة توجيه أي اتصال إليك بشكل سري.</string>
@@ -833,9 +1217,7 @@ Language: ar
     <string name="stats_loading_error">لم يتم تحميل البيانات</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">تحرير المقالات والصفحات الجديدة باستخدام مُحرر المكوّنات</string>
     <string name="site_settings_gutenberg_default_for_new_posts">استخدام مُحرر المكوّنات</string>
-    <string name="menu_switch_to_aztec_editor">التبديل إلى المحرر التقليدي</string>
     <string name="menu_switch_to_gutenberg_editor">التبديل إلى مُحرر المكوّنات</string>
-    <string name="dialog_gutenberg_informative_title">تم تمكين محرر المكوّنات</string>
     <string name="exit">خروج</string>
     <string name="quick_start_sites_type_subtitle">تم استكمال %1$d من %2$d</string>
     <string name="quick_start_sites_type_customize">تخصيص موقعك</string>
@@ -843,7 +1225,6 @@ Language: ar
     <string name="quick_start_complete_tasks_header">مكتمل (%d)</string>
     <string name="quick_start_dialog_view_site_message">استمتع بمنتجك النهائي!</string>
     <string name="quick_start_dialog_upload_icon_title">رفع أيقونة للموقع</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">أنقر على %1$s إضافة صفحة %2$s لإنشاء صفحة جديدة.</string>
     <string name="quick_start_dialog_explore_plans_message_short">أنقر على %1$s الخطة %2$s لمشاهدة خطتك الحالية والخطط الأخرى المتاحة</string>
     <string name="quick_start_dialog_upload_icon_message">سيرى زائروك أيقونتك في متصفحهم. أضف أيقونة مخصصة للحصول على مظهر جذّاب واحترافي.</string>
     <string name="quick_start_sites_type_grow">تنمية جمهورك</string>
@@ -852,21 +1233,15 @@ Language: ar
     <string name="quick_start_dialog_publish_post_message">قم بنشر مسودّة مقالتك الأولى.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">أنقر على %1$s أيقونة موقعك %2$s لرفع أيقونة جديدة</string>
     <string name="quick_start_dialog_check_stats_message_short">أنقر على %1$s الإحصائيات %2$s لمشاهدة مستوى أداء موقعك.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">انقر على ⁦%1$s⁩ الصفحات ⁦%2$s⁩ للمتابعة.</string>
     <string name="quick_start_dialog_enable_sharing_title">تمكين مشاركة المقالة</string>
     <string name="quick_start_dialog_explore_plans_message">معرفة المزيد عن أدوات التسويق وتحسين محركات البحث SEO في خططنا المدفوعة.</string>
     <string name="quick_start_dialog_explore_plans_title">استكشاف الخطط</string>
     <string name="quick_start_dialog_migration_message">لقد أضفنا المزيد من المهام لمساعدتك على تنمية جمهورك.</string>
-    <string name="quick_start_dialog_create_page_title">إنشاء صفحة جديدة</string>
-    <string name="quick_start_dialog_customize_site_message">ضبط الخطوط، إضافة صور، والمزيد.</string>
     <string name="quick_start_dialog_enable_sharing_message">شارك المقالات الجديدة تلقائيًّا على حساباتك على وسائل التواصل الاجتماعي.</string>
-    <string name="quick_start_dialog_create_page_message">أضف صفحة للمحتوى الأساسي — تعتبر صفحة \"حول\" بداية رائعة.</string>
     <string name="quick_start_dialog_remove_next_steps_title">إزالة الخطوات التالية</string>
     <string name="quick_start_remove_next_steps_menu_title">إزالة هذا</string>
-    <string name="quick_start_dialog_browse_themes_title">تصفّح القوالب</string>
     <string name="quick_start_dialog_check_stats_message">واكب التحديثات لأداء موقعك.</string>
     <string name="quick_start_dialog_check_stats_title">التحقّق من إحصاءات موقعك</string>
-    <string name="quick_start_dialog_browse_themes_message">استكشف العشرات من خيارات التنسيق واعثر على لياقتك المثالية.</string>
     <string name="quick_start_dialog_remove_next_steps_message">ستؤدي إزالة الخطوات التالية إلى إخفاء جميع الجولات على هذا الموقع. لا يمكن التراجع عن هذا الإجراء.</string>
     <string name="quick_start_complete_view_subtitle">تهانينا لك على إكمال قائمتك. عمل متقن.</string>
     <string name="quick_start_complete_view_title">جميع المهام مكتملة!</string>
@@ -888,15 +1263,11 @@ Language: ar
     <string name="notification_new_site_creation_failed">حدثت مشكلة</string>
     <string name="notification_new_site_creation_title">إنشاء موقع</string>
     <string name="new_site_creation_create_site_button">إنشاء موقع</string>
-    <string name="new_site_creation_search_domain_input_hint">البحث عن نطاقات</string>
-    <string name="new_site_creation_domain_header_subtitle">هذا هو المكان الذي سيجده الأشخاص على الإنترنت.</string>
-    <string name="new_site_creation_domain_header_title">اختيار اسم نطاق لموقعك</string>
+    <string name="new_site_creation_domain_header_subtitle">هذا هو المكان الذي سيجدك فيه الأشخاص على الإنترنت.</string>
     <string name="new_site_creation_empty_domain_list_message">لا توجد عناوين متاحة مطابقة لبحثك</string>
     <string name="site_creation_error_generic_subtitle">حدث خطأ أثناء الاتصال بالخادم، يرجى المحاولة مجددًا</string>
     <string name="site_creation_error_generic_title">حدثت مشكلة</string>
     <string name="site_creation_fetch_suggestions_error_unknown">حدثت مشكلة</string>
-    <string name="site_creation_segments_subtitle">يساعدنا هذا على إجراء توصيات. لكن هذا الأمر لا يتوقف أبدًا — فجميع المواقع تتطور!</string>
-    <string name="site_creation_segments_title">أخبرنا بنوع الموقع الذي ترغب في إنشائه</string>
     <string name="new_site_creation_preview_title">تم إنشاء موقعك!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d من %2$d</string>
     <string name="new_site_creation_screen_title_general">إنشاء موقع</string>
@@ -913,7 +1284,7 @@ Language: ar
     <string name="dialog_confirm_load_remote_post_discard_local">تجاهل محلي</string>
     <string name="dialog_confirm_load_remote_post_body_2">محلي\nتم الحفظ على %s\n\nالويب\nتم الحفظ على %s\n</string>
     <string name="dialog_confirm_load_remote_post_body">تحتوي هذه المقالة على إصدارين متعارضين. حدّد الإصدار الذي ترغب في تجاهله.\n\n</string>
-    <string name="dialog_confirm_load_remote_post_title">حل مزامنة التعارض</string>
+    <string name="dialog_confirm_load_remote_post_title">حل تعارض المزامنة</string>
     <string name="stats_no_data_for_period">لا توجد بيانات لهذه الفترة</string>
     <string name="preference_strip_image_location">إزالة موقع من الوسائط</string>
     <string name="stats_cannot_be_started">يتعذر علينا فتح الإحصاءات في الوقت الحالي. يرجى المحاولة مجددًا في وقت لاحق</string>
@@ -1050,20 +1421,14 @@ Language: ar
     <string name="quick_start_dialog_need_help_button_positive">موافقة</string>
     <string name="quick_start_dialog_need_help_button_neutral">أبدًا</string>
     <string name="quick_start_dialog_follow_sites_title">متابعة مواقع أخرى</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">انقر على %1$sبحث%2$s للبحث عن مواقع ذات اهتمامات مماثلة</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">انقر على %1$sالقاريء%2$s للمتابعة</string>
-    <string name="quick_start_dialog_customize_site_title">تخصيص موقعك</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">انقر على %1$sالقوالب%2$s للمتابعة</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">انقر على %1$sتخصيص%2$s للبدء في تخصيص موقعك</string>
     <string name="quick_start_dialog_need_help_button_negative">لا، شكرًا</string>
     <string name="quick_start_dialog_follow_sites_message">يمكنك العثور على المواقع التي تلهمك، ومتابعتها للحصول على التحديثات عندما تقوم بالنشر.</string>
-    <string name="quick_start_dialog_choose_theme_title">اختيار قالب</string>
-    <string name="quick_start_dialog_choose_theme_message">تصفّح جميع قوالبنا للعثور على ما يناسبك.</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">أنقر على %1$s بحث %2$s للبحث عن مواقع ذات مواضيع مماثلة</string>
     <string name="quick_start_button_positive">انتقال</string>
     <string name="quick_start_button_negative_short">إلغاء</string>
     <string name="quick_start_button_negative">ليس الآن</string>
     <string name="my_site_create_new_site_title">ليس لديك أي مواقع</string>
-    <string name="quick_start_dialog_browse_themes_message_short">أنقر على %1$s القوالب %2$s لاكتشاف قوالب جديدة</string>
     <string name="content_description_more">المزيد</string>
     <string name="reader_empty_followed_tags_subtitle">أضف موضوعًا هنا للعثور على مقالات حول موضوعاتك المفضلة</string>
     <string name="reader_empty_followed_tags_title">لا توجد مواضيع تمت متابعتها</string>
@@ -1122,16 +1487,14 @@ Language: ar
     <string name="support_contact_email">البريد الإلكتروني الخاص بجهة الاتصال</string>
     <string name="application_log_button">سجل التطبيق</string>
     <string name="my_tickets">تذاكري</string>
-    <string name="activity_log_rewind_site">إرجاع الموقع</string>
-    <string name="activity_log_currently_restoring_message_no_dates">الإرجاع قيد التقدّم</string>
-    <string name="activity_log_currently_restoring_message">الإرجاع إلى %1$s %2$s</string>
-    <string name="activity_log_rewind_dialog_message">هل أنت متأكد من رغبتك في استرجاع موقعك مرة أخرى إلى  %1$s في %2$s؟ سيؤدي هذا الإجراء إلى حذف كل المحتوى والخيارات التي تم إنشاؤها أو تغييرها من ذلك الحين.</string>
     <string name="support_push_notification_title">ووردبريس</string>
+    <string name="activity_log_currently_restoring_message">الاستعادة إلى %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">الاستعادة قيد التقدّم</string>
     <string name="activity_log_currently_restoring_title">استعادة موقعك حاليًا</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">تمت استعادة موقعك بنجاح</string>
     <string name="activity_log_button">زر الإجراء في سجل النشاط</string>
-    <string name="activity_log_rewind_finished_snackbar_message">تمت استعادة موقعك بنجاح\nتم الإرجاع إلى %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">يتم الآن استعادة موقعك\nالاسترجاع إلى %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">جاري الآن استعادة موقعك\nالاستعادة إلى %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">تمت استعادة موقعك بنجاح\nتمت الاستعادة إلى %1$s %2$s</string>
     <string name="plugin_auto_managed">إدارة تلقائية</string>
     <string name="reader_save_posts_locally_dialog_message">احفظ هذه المقالة، وعُد إلى قراءتها وقتما تشاء. لن تتوافر إلا على هذا الجهاز — لا تقوم المقالات المحفوظة بالمزامنة إلى أجهزتك الأخرى.</string>
     <string name="reader_save_posts_locally_dialog_title">حفظ المقالات لوقت لاحق</string>
@@ -1139,9 +1502,7 @@ Language: ar
     <string name="reader_empty_search_title">لم يتم العثور على نتائج</string>
     <string name="comment_read_source_post">قراءة مقالة المصدر</string>
     <string name="sites">المواقع</string>
-    <string name="signup_email_screen_title">تسجيل البريد الإلكتروني</string>
     <string name="signup_magic_link_title">تمّ إرسال الرابط السحري</string>
-    <string name="alternatively">بدلاً من ذلك:</string>
     <string name="verification_2fa_screen_title">رمز التحقق</string>
     <string name="email_address_login_title">عنوان البريد الإلكتروني للدخول</string>
     <string name="site_address_login_title">عنوان تسجيل الدخول للموقع</string>
@@ -1151,13 +1512,11 @@ Language: ar
     <string name="reader_empty_saved_posts_description">انقر على %s لحفظ مقالة في القائمة لديك.</string>
     <string name="reader_bookmark_snack_title">تم حفظ المقالة</string>
     <string name="reader_bookmark_snack_btn">عرض الكل</string>
-    <string name="reader_btn_bookmarked">تم الحفظ</string>
-    <string name="reader_btn_bookmark">حفظ</string>
     <string name="reader_remove_bookmark">حذف من المقالات المحفوظة</string>
     <string name="reader_add_bookmark">إضافة إلى المقالات المحفوظة</string>
     <string name="reader_save_for_later_title">المقالات المحفوظة</string>
-    <string name="removed">تم الحذف</string>
     <string name="reader_empty_saved_posts_title">لم يتم حفظ أي مقالات — حتى الآن!</string>
+    <string name="removed">تمت الإزالة</string>
     <string name="my_site_icon_content_description">تغيير رمز الموقع</string>
     <string name="my_site_icon_dialog_cancel_button">إلغاء</string>
     <string name="my_site_icon_dialog_remove_button">إزالة</string>
@@ -1173,11 +1532,9 @@ Language: ar
     <string name="reader_btn_notifications_on">تشغيل التنبيهات في الموقع</string>
     <string name="reader_btn_notifications_off">إيقاف تشغيل التنبيهات في الموقع</string>
     <string name="activity_log_jetpack_icon">أيقونة Jetpack</string>
-    <string name="rewind">إرجاع</string>
     <string name="activity_log_event">الحدث</string>
     <string name="activity_log_icon">أيقونة النشاط</string>
     <string name="activity_log">سجل النشاط</string>
-    <string name="activity">النشاط</string>
     <string name="privacy_policy_read">قراءة سياسة الخصوصية</string>
     <string name="third_party_policy_learn_more_caption">نستخدم أدوات تتبع أخرى، بما في ذلك بعض الأدوات التي تنتمي إلى أطراف ثالثة. اقرأ عن هذه الأدوات وكيفية التحكم فيها.</string>
     <string name="third_party_policy_learn_more_header">سياسة الطرف الثالث</string>
@@ -1190,7 +1547,6 @@ Language: ar
     <string name="post_submitted">تم إرسال المقالة</string>
     <string name="plugin_install_site_ineligible_site_graylisted">تتطلب ميزة المكوّن الإضافي أن يكون الموقع في وضع جيد.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">تتطلب ميزة المكوّن الإضافي ربط اشترك النطاق الأساسي بهذا المستخدم.</string>
-    <string name="login_email_button_signup">ليس لديك حساب؟ %1$sالتسجيل%2$s</string>
     <string name="plugin_install_site_ineligible_non_admin_user">تتطلب ميزة المكوّن الإضافي مزايا المسؤول.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">يتعذر تثبيت المكوّن الإضافي على مواقع VIP.</string>
     <string name="plugin_install_site_ineligible_excessive_disk_space">يتعذر تثبيت المكوّن الإضافي بسبب قيود مساحة القرص.</string>
@@ -1212,11 +1568,11 @@ Language: ar
     <string name="plugin_install_first_plugin_confirmation_dialog_title">تثبيت الإضافة</string>
     <string name="notification_settings_followed_dialog_title">الإشعارات</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">جميع المواقع التي أتابعها</string>
-    <string name="notification_settings_category_followed_sites">المواقع التي تمت متابعتها</string>
     <string name="content_description_person_reading_device_notification">جهاز قراءة الشخصيات مع وجود إخطارات</string>
     <string name="content_description_people_looking_charts">الأشخاص الذين ينظرون إلى الرسومات والمخططات</string>
     <string name="comment_title">%s في %s</string>
     <string name="dialog_confirm_delete_permanently_post">هل ترغب بالتأكيد في حذف هذه المقالة بشكل دائم؟</string>
+    <string name="notification_settings_category_followed_sites">مواقع تمّت متابعتها</string>
     <string name="notification_channel_important_title">مهم</string>
     <string name="notification_channel_general_title">عام</string>
     <string name="photo_picker_use_photo">استخدام هذه الصورة</string>
@@ -1286,7 +1642,6 @@ Language: ar
     <string name="edit_photo_screen_title">تحرير الصورة</string>
     <string name="share_intent_screen_title">اختيار الموقع</string>
     <string name="signup_epilogue_screen_title">حساب جديد</string>
-    <string name="login_prologue_screen_title">تسجيل الدخول</string>
     <string name="site_settings_quota_space_hint">إذا كنت بحاجة إلى مزيد من المساحة، ففكر في ترقية خطة ووردبريس الخاصة بك.</string>
     <string name="login_epilogue_screen_title">تم تسجيل الدخول كـ</string>
     <string name="person_detail_screen_title">تفاصيل الشخص</string>
@@ -1301,7 +1656,7 @@ Language: ar
     <string name="release_notes_screen_title">ملاحظات الإصدار</string>
     <string name="notifications_screen_title">الإشعارات</string>
     <string name="signup_epilogue_error_avatar_view">تم رفع الصورة الرمزية الخاصة بك وستصبح متاحة قريبًا.</string>
-    <string name="permissions_denied_message">يبدو أنك أوقفت الأذونات المطلوبة لهذه الميزة.&lt;br/>&lt;br/>لتغيير هذا، قم بتحرير أذوناتك وتأكد من تمكين &lt;strong>%s&lt;/strong>.</string>
+    <string name="permissions_denied_message">يبدو أنك أوقفت الأذونات المطلوبة لهذه الميزة.&lt;br/&gt;&lt;br/&gt;لتغيير هذا، قم بتحرير أذوناتك وتأكد من تمكين &lt;strong&gt;%s&lt;/strong&gt;.</string>
     <string name="permissions_denied_title">أذونات</string>
     <string name="plugin_caption_featured">بارز</string>
     <string name="sharing_disabled_description">لا يمكنك الوصول إلى إعدادات المشاركة الخاصة بك بسبب تعطيل وحدة Jetpack النمطية للمشاركة الخاصة بك.</string>
@@ -1342,7 +1697,6 @@ Language: ar
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">لم يتم رفع مقالة واحدة مع ملف واحد</string>
     <string name="untitled_in_parentheses">(بدون عنوان)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f، %2$f</string>
     <string name="site_creation_domain_finish_button">إنشاء موقع</string>
     <string name="notification_site_creation_created">انقر للمتابعة.</string>
     <string name="notification_site_creation_title_success">تم إنشاء الموقع!</string>
@@ -1355,12 +1709,9 @@ Language: ar
     <string name="username_changer_dismiss_message">هل ترغب في تجاهل تغيير اسم المستخدم؟</string>
     <string name="username_changer_action">حفظ</string>
     <string name="content_description_add_avatar">إضافة صورة رمزية</string>
-    <string name="signup_with_google_button">تسجيل الدخول باستخدام Google</string>
-    <string name="signup_with_email_button">تسجيل الدخول باستخدام البريد الإلكتروني</string>
     <string name="username_changer_dismiss_button_positive">تجاهل</string>
     <string name="signup_user_exists">البريد الإلكتروني موجود بالفعل على WordPress.com.\nالمتابعة لتسجيل الدخول.</string>
     <string name="signup_magic_link_progress">إرسال البريد الإلكتروني</string>
-    <string name="signup_terms_of_service_text">يعني تسجيل الدخول موافقتك على %1$sشروط الخدمة%2$s.</string>
     <string name="signup_updating_account">جاري تحديث الحساب…</string>
     <string name="signup_magic_link_error_button_positive">إعادة المحاولة</string>
     <string name="signup_magic_link_error_button_negative">إغلاق</string>
@@ -1371,13 +1722,8 @@ Language: ar
     <string name="signup_epilogue_error_button_negative">إلغاء</string>
     <string name="signup_epilogue_error_generic">حدثت بعض المشكلات أثناء تحديث حسابك. يمكنك المحاولة مرة أخرى أو استرداد التغييرات للمتابعة.</string>
     <string name="signup_epilogue_error_avatar">حدثت بعض المشكلات أثناء تحميل صورتك الرمزية.</string>
-    <string name="signup_email_error_generic">حدثت بعض المشكلات أثناء التحقق من عنوان البريد الإلكتروني.</string>
     <string name="signup_magic_link_error">حدثت بعض المشكلات في إرسال البريد الإلكتروني. يمكنك إعادة المحاولة الآن أو الإغلاق والمحاولة مرة أخرى لاحقًا.</string>
-    <string name="signup_email_header">لإنشاء حسابك الجديد على WordPress.com، يرجى إدخال عنوان بريدك الإلكتروني.</string>
     <string name="signup_epilogue_hint_password_detail">يمكنك دائمًا تسجيل الدخول باستخدام رابط مثل الرابط الذي استخدمته للتو، ولكن يمكنك أيضًا إعداد كلمة مرور إذا كنت تفضل ذلك.</string>
-    <string name="enter_username_instead">قم بتسجيل الدخول باستخدام اسم المستخدم الخاص بك.</string>
-    <string name="enter_site_address_instead">قم بتسجيل الدخول عن طريق إدخال عنوان الموقع.</string>
-    <string name="sign_up">تسجيل الدخول إلى WordPress.com</string>
     <string name="plugin_caption_new">جديد</string>
     <string name="plugin_caption_popular">شائع</string>
     <string name="plugins_empty_search_list">لا توجد مطابقات</string>
@@ -1498,10 +1844,9 @@ Language: ar
     <string name="login_error_suffix">\nهل يمكن أن تجرّب حسابًا مختلفًا؟</string>
     <string name="login_error_generic">حدثت مشكلة أثناء الاتصال بحساب Google.</string>
     <string name="login_error_button">إغلاق</string>
-    <string name="login_google_button_suffix">سجّل الدخول إلى Google.</string>
     <string name="enter_wpcom_password_google">للمتابعة باستخدام حساب Google هذا، يرجى إدخال كلمة مرور متطابقة في WordPress.com. ستتم المطالبة بها لمرة واحدة.</string>
     <string name="error_generic_network">حدثت مشكلة في الشبكة. يرجى التحقق من اتصالك والمحاولة لاحقًا.</string>
-    <string name="post_settings_remove_featured_image">إزالة صورة مميزة</string>
+    <string name="post_settings_remove_featured_image">إزالة الصورة البارزة</string>
     <string name="post_settings_choose_featured_image">اختيار صورة مميزة</string>
     <string name="login_log_in_for_share_intent">سجّل الدخول إلى WordPress.com لمشاركة المحتوى.</string>
     <string name="enter_site_address_share_intent">أدخل عنوان موقع ووردبريس الذي تود مشاركة المحتوى معه.</string>
@@ -1510,12 +1855,11 @@ Language: ar
     <string name="jetpack_disconnect_confirm">قطع الاتصال</string>
     <string name="jetpack_disconnect_confirmation_message">هل تريد بالتأكيد قطع اتصال Jetpack بهذا الموقع؟</string>
     <string name="jetpack_disconnect_pref_title">\"قطع الاتصال بـ WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">يمكنك إدراج عنوان IP أو سلسلة عناوين في قائمة السماح مما يعمل على منع حظرها بواسطة Jetpack. IPv4 وIPv6 مقبولان. لتحديد نطاق، أدخل القيمة المنخفضة والقيمة المرتفعة مفصولاً بينهما بشرطة. على سبيل المثال: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">يمكنك وضع علامة على عنوان IP أو (مجموعة من العناوين) كـ \"غير مسموح دائمًا\"، ما يمنع حظرها بواسطة Jetpack. IPv4 وIPv6 مقبولان. لتحديد نطاق، أدخل القيمة المنخفضة والقيمة المرتفعة مفصولاً بينهما بشرطة. على سبيل المثال: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">يلزم إجراء مصادقة من خطوتين</string>
     <string name="jetpack_match_wpcom_via_email_title">مطابقة الحسابات باستخدام البريد الإلكتروني</string>
     <string name="jetpack_allow_wpcom_sign_in_title">السماح بتسجيل الدخول إلى WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">تسجيل الدخول إلى WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">عناوين IP المدرجة في قائمة السماح</string>
     <string name="jetpack_prevent_brute_force_title">حظر محاولات تسجيل الدخول الضارة</string>
     <string name="jetpack_prevent_brute_force_category_title">الحماية من هجمات القوة الغاشمة</string>
     <string name="jetpack_send_wp_notifications_title">إرسال تنبيهات الدفع</string>
@@ -1556,13 +1900,13 @@ Language: ar
     <string name="notification_settings_category_other">أخرى</string>
     <string name="notification_settings_item_your_sites_all_your_sites">كل مواقعي</string>
     <string name="notification_settings_category_your_sites">مواقعك</string>
-    <string name="notification_settings_master_off_message">سيؤدي إيقاف تشغيل إعدادات التنبيهات إلى تعطيل جميع التنبيهات الصادرة عن هذا التطبيق، بغض النظر عن النوع. يمكنك ضبط نوع التنبيه الذي تحصل عليه بعد تشغيل إعدادات التنبيهات.</string>
-    <string name="notification_settings_master_off_title">لتلقي تنبيهات على هذا الجهاز، شغّل إعدادات التنبيهات.</string>
-    <string name="notification_settings_master_hint_off">تمكين الإشعارات</string>
-    <string name="notification_settings_master_hint_on">تعطيل التنبيهات</string>
-    <string name="notification_settings_master_status_off">إيقاف التشغيل</string>
-    <string name="notification_settings_master_status_on">تشغيل</string>
+    <string name="notification_settings_main_off_message">سيؤدي إيقاف تشغيل إعدادات الإشعارات إلى تعطيل جميع الإشعارات الصادرة عن هذا التطبيق، بغض النظر عن النوع. يمكنك ضبط نوع الإشعار الذي تحصل عليه بعد تشغيل إعدادات الإشعارات.</string>
+    <string name="notification_settings_main_off_title">لتلقي إشعارات على هذا الجهاز، شغّل إعدادات الإشعارات.</string>
+    <string name="notification_settings_main_hint_off">تمكين الإشعارات</string>
+    <string name="notification_settings_main_hint_on">تعطيل الإشعارات</string>
+    <string name="notification_settings_main_status_off">إيقاف التشغيل</string>
     <string name="max_video_resolution">أقصى حجم للفيديو</string>
+    <string name="notification_settings_main_status_on">تشغيل</string>
     <string name="max_thumbnail_px_size">أقصى حجم للصورة</string>
     <string name="error_upload_post_media_param">حدث خطأ عند رفع الوسائط في هذه المقالة: %s.</string>
     <string name="error_upload_post_param">حدث خطأ عند رفع هذه المقالة: %s.</string>
@@ -1598,7 +1942,6 @@ Language: ar
     <string name="login_site_address_more_help">هل تحتاج إلى مزيد من المساعدة؟</string>
     <string name="login_site_address_help_content">يظهر عنوان موقعك في الشريط الموجود في أعلى الشاشة عندما تدخل إلى موقعك من متصفح Chrome.</string>
     <string name="login_site_address_help_title">ما عنوان الموقع الخاص بي؟</string>
-    <string name="login_site_address_help">هل تحتاج إلى المساعدة في العثور على عنوان موقعك؟</string>
     <string name="enter_site_address">أدخل العنوان لموقع ووردبريس الذي تود الاتصال به.</string>
     <string name="login_site_address">رابط الموقع</string>
     <string name="login_already_logged_in_wpcom">تم تسجيل الدخول بالفعل إلى WordPress.com</string>
@@ -1610,7 +1953,6 @@ Language: ar
     <string name="requesting_otp">طلب رمز تحقق عن طريق رسالة نصية قصيرة (SMS).</string>
     <string name="login_text_otp">أرسل إليّ رمزًا بدلاً من ذلك.</string>
     <string name="enter_verification_code">تقريبًا هناك! يرجى إدخال رمز التحقق من تطبيق الموثق الخاص بك.</string>
-    <string name="open_mail">فتح البريد</string>
     <string name="next">التالي</string>
     <string name="enter_email_wordpress_com">سجِّل الدخول إلى WordPress.com باستخدام عنوان بريد إلكتروني لإدارة جميع مواقع ووردبريس الخاصة بك.</string>
     <string name="image_optimization_promo_desc">يقلل تحسين الصورة حجم الصور لتحميلها بسرعة.\n\nيمكنك تغيير هذا في أي وقت في إعدادات الموقع.</string>
@@ -1633,10 +1975,6 @@ Language: ar
     <string name="post_status_draft">مسودة</string>
     <string name="post_status_pending_review">في انتظار المراجعة</string>
     <string name="post_status_publish_post">نشر</string>
-    <string name="change_location">تغيير الموقع</string>
-    <string name="remove_location">إزالة الموقع</string>
-    <string name="post_settings_error_placepicker_missing_play_services">يتعذر فتح منتقي الموقع، خدمات Google Play غير متوفرة</string>
-    <string name="post_settings_location">الموقع</string>
     <string name="now">الآن</string>
     <string name="post_settings_password_dialog_hint">لا يمكن عرض هذه المقالة إلا لمن لديهم كلمة المرور هذه</string>
     <string name="post_settings_excerpt_dialog_hint">المقتطفات هي ملخصات يدوية اختيارية لمحتواك.</string>
@@ -1819,8 +2157,8 @@ Language: ar
     <string name="comment_liked">تم تسجيل إعجاب بالتعليق</string>
     <string name="signout">تسجيل الخروج</string>
     <string name="sign_in_wpcom">تسجيل الدخول إلى WordPress.com</string>
-    <string name="reader_label_global_related_posts">يمكنك الحصول على المزيد على WordPress.com</string>
-    <string name="reader_label_local_related_posts">المزيد في %s</string>
+    <string name="reader_label_global_related_posts">المزيد على WordPress.com</string>
+    <string name="reader_label_local_related_posts">المزيد من %s</string>
     <string name="preference_open_device_settings">فتح إعدادات الجهاز</string>
     <string name="invite_invalid_email">%s: البريد الإلكتروني غير صالح</string>
     <string name="invite_user_blocked_invites">%s: الدعوات التي حظرها المستخدم</string>
@@ -1868,20 +2206,16 @@ Language: ar
     <string name="invite_error_invalid_usernames_multiple">لا يمكن الإرسال: هناك اسم مستخدم أو بريد إلكتروني غير صالح</string>
     <string name="invite_error_invalid_usernames_one">لا يمكن الإرسال: اسم المستخدم أو البريد الإلكتروني غير صالح</string>
     <string name="invite_error_no_usernames">الرجاء إضافة اسم مستخدم واحد على الأقل</string>
-    <string name="invite_message_info">(اختياري) يمكنك إدخال رسالة مخصصة ﻻ تزيد عن 500 حرف والتي سوف يتم تضمينها في دعوتك للمستخدمين.</string>
-    <string name="invite_message_remaining_other">الأحرف المتبقية %d</string>
-    <string name="invite_message_remaining_one">1 حرف متبقي</string>
-    <string name="invite_message_remaining_zero">0 حرف متبقي</string>
     <string name="invite_message_title">رسالة مخصصة</string>
     <string name="invite">دعوة</string>
-    <string name="invite_names_title">اسم المستخدم أو البريد الإلكتروني</string>
+    <string name="invite_names_title">أسماء المستخدمين أو عناوين البريد الإلكتروني</string>
     <string name="my_site_header_external">خارجي</string>
     <string name="invite_people">دعوة أشخاص</string>
-    <string name="send_link">إرسال رابط</string>
     <string name="label_clear_search_history">مسح محفوظات البحث</string>
     <string name="dlg_confirm_clear_search_history">مسح محفوظات البحث؟</string>
     <string name="reader_empty_search_description">لم يتم العثور على نتائج تتعلق بـ %s بلغتك</string>
     <string name="reader_hint_post_search">البحث في ووردبريس</string>
+    <string name="reader_title_related_post_detail">مقالة ذات صلة</string>
     <string name="preview_screen_links_disabled">تم تعطيل الروابط في شاشة المعاينة</string>
     <string name="send">إرسال</string>
     <string name="user_remove_confirmation_message">إذا قمت بإزالة %1$s، فلن يعود هذا المستخدم قادرًا على الوصول إلى هذا الموقع، ومع ذلك سيبقى أي محتوى تم إنشاؤه بواسطة %1$s على الموقع.\n\nهل لا تزال ترغب في إزالة هذا المستخدم؟</string>
@@ -1900,7 +2234,6 @@ Language: ar
     <string name="checking_email">التحقق من البريد الإلكتروني</string>
     <string name="magic_link_unavailable_error_message">غير متاح حاليًا. يُرجى إدخال كلمة مرورك</string>
     <string name="logging_in">تسجيل الدخول</string>
-    <string name="enter_your_password_instead">أدخل كلمة مرورك بدلاً من ذلك</string>
     <string name="web_address_dialog_hint">تظهر للعامة أثناء تعليقك.</string>
     <string name="capture_or_pick_photo">التقاط صورة أو تحديدها</string>
     <string name="export_your_content_message">سيتم إرسال مقالاتك وصفحاتك وإعداداتك إليك عبر البريد الإلكتروني على %s.</string>
@@ -1979,7 +2312,7 @@ Language: ar
     <string name="web_address">عنوان موقع ويب</string>
     <string name="editor_toast_uploading_please_wait">أنت تقوم حاليًا برفع وسائط. يُرجى الانتظار حتى تكتمل هذه العملية.</string>
     <string name="error_refresh_comments_showing_older">يتعذر تحديث التعليقات في الوقت الحالي - إظهار تعليقات أقدم</string>
-    <string name="post_settings_set_featured_image">تعيين صورة مميزة</string>
+    <string name="post_settings_set_featured_image">تعيين صورة بارزة</string>
     <string name="post_settings_featured_image">الصورة المميزة</string>
     <string name="email_address">عنوان البريد الإلكتروني</string>
     <string name="dlg_sure_to_delete_comments">هل ترغب في إزالة هذه التعليقات نهائيًا؟</string>
@@ -2021,7 +2354,7 @@ Language: ar
     <string name="site_settings_paging_dialog_description">تحديد مناقشات التعليقات في صفحات متعددة.</string>
     <string name="site_settings_paging_dialog_header">التعليقات لكل صفحة</string>
     <string name="site_settings_close_after_dialog_title">إغلاق التعليق</string>
-    <string name="site_settings_blacklist_description">عندما يحتوي تعليق على أي من هذه الكلمات في محتواه أو اسمه أو عنوان URL أو عنوان البريد الإلكتروني أو بروتوكول IP الخاص به، سيتم وضع علامة عليه باعتباره تعليقًا مزعجًا. يمكنك إدخال كلمات غير مكتملة، إذ ستطابق كلمة \"بريس\" كلمة \"ووردبريس\".</string>
+    <string name="site_settings_denylist_description">عندما يحتوي تعليق على أي من هذه الكلمات في محتواه أو اسمه أو عنوان URL أو عنوان البريد الإلكتروني أو بروتوكول IP الخاص به، سيتم وضع علامة عليه باعتباره تعليقًا مزعجًا. يمكنك إدخال كلمات غير مكتملة، إذ ستطابق كلمة \"بريس\" كلمة \"ووردبريس\".</string>
     <string name="site_settings_hold_for_moderation_description">عندما يحتوي تعليق على أي من هذه الكلمات في محتواه أو اسمه أو عنوان URL أو عنوان البريد الإلكتروني أو بروتوكول IP الخاص به، سيتم حجزه في قائمة انتظار الإدارة. يمكنك إدخال كلمات غير مكتملة، إذ ستطابق كلمة \"بريس\" كلمة \"ووردبريس\".</string>
     <string name="site_settings_list_editor_input_hint">أدخل كلمة أو عبارة</string>
     <string name="site_settings_list_editor_no_items_text">لا توجد عناصر</string>
@@ -2036,10 +2369,10 @@ Language: ar
     <string name="site_settings_rp_show_header_title">عرض الترويسة</string>
     <string name="site_settings_rp_switch_summary">تعرض المقالات ذات الصلة المحتوى ذا الصلة من موقعك أسفل مقالاتك.</string>
     <string name="site_settings_rp_switch_title">عرض المقالات ذات الصلة</string>
-    <string name="site_settings_blacklist_hint">يتم وضع علامة على التعليقات التي تتطابق مع عامل التصفية باعتبارها بريدًا مزعجًا</string>
+    <string name="site_settings_denylist_hint">يتم وضع علامة على التعليقات التي تتطابق مع عامل التصفية باعتبارها محتوى مزعجًا</string>
     <string name="site_settings_moderation_hold_hint">يتم وضع التعليقات التي تتطابق مع عامل التصفية في قائمة انتظار الإدارة</string>
     <string name="site_settings_multiple_links_hint">يتجاهل حد الرابط من المستخدمين المعروفين</string>
-    <string name="site_settings_whitelist_hint">يجب أن يملك صاحب التعليق تعليقات سابقة</string>
+    <string name="site_settings_allowlist_hint">صاحب التعليق يجب أن يملك تعليقات سابقة</string>
     <string name="site_settings_user_account_required_hint">يجب على الزوار التسجيل ليتمكنوا من التعليق</string>
     <string name="site_settings_identity_required_hint">يجب على كاتب التعليق كتابة الاسم والبريد الإلكتروني</string>
     <string name="site_settings_paging_hint">عرض التعليقات في أجزاء من الحجم المحدد</string>
@@ -2062,17 +2395,16 @@ Language: ar
     <string name="site_settings_address_hint">تغيير عنوانك غير مدعوم حاليًا</string>
     <string name="site_settings_tagline_hint">وصف موجز أو عبارة جذابة يراد بها وصف مدونتك</string>
     <string name="site_settings_title_hint">بكلمات قليلة، اكتب نبذة موجزة عن هذا الموقع</string>
-    <string name="site_settings_whitelist_known_summary">تعليقات من مستخدمين معروفين</string>
-    <string name="site_settings_whitelist_all_summary">تعليقات من جميع المستخدمين</string>
+    <string name="site_settings_allowlist_known_summary">تعليقات من مستخدمين معروفين</string>
+    <string name="site_settings_allowlist_all_summary">تعليقات من جميع المستخدمين</string>
     <string name="site_settings_threading_summary">مستويات %d</string>
     <string name="site_settings_privacy_private_summary">خاص</string>
     <string name="site_settings_privacy_hidden_summary">مخفي</string>
     <string name="site_settings_delete_site_title">حذف الموقع</string>
     <string name="site_settings_privacy_public_summary">عام</string>
-    <string name="site_settings_blacklist_title">قائمة الحظر</string>
     <string name="site_settings_moderation_hold_title">احتجاز من أجل الإدارة</string>
     <string name="site_settings_multiple_links_title">الروابط في التعليقات</string>
-    <string name="site_settings_whitelist_title">الموافقة تلقائيًا</string>
+    <string name="site_settings_allowlist_title">الموافقة تلقائيًا</string>
     <string name="site_settings_threading_title">مؤشر الترابط</string>
     <string name="site_settings_paging_title">ترقيم الصفحات</string>
     <string name="site_settings_sort_by_title">فرز حسب</string>
@@ -2221,7 +2553,6 @@ Language: ar
     <string name="logs_copied_to_clipboard">تم نسخ سجلات التطبيق إلى الحافظة</string>
     <string name="reader_label_new_posts">مقالات جديدة</string>
     <string name="error_copy_to_clipboard">حدث خطأ أثناء نسخ النص إلى الحافظة</string>
-    <string name="reader_page_recommended_blogs">مواقع قد تحوز إعجابك</string>
     <string name="reader_empty_posts_in_blog">هذا الموقع فارغ</string>
     <string name="post_uploading">جاري رفع المقالة</string>
     <string name="stats_followers_months">%1$d من الشهور</string>
@@ -2274,7 +2605,6 @@ Language: ar
     <string name="reader_toast_blog_blocked">لن تظهر المقالات من هذا الموقع بعد الآن</string>
     <string name="update_verb">تحديث</string>
     <string name="schedule_verb">جدولة</string>
-    <string name="reader_page_followed_blogs">المواقع المتابَعة</string>
     <string name="reader_label_followed_blog">تمت متابعة الموقع</string>
     <string name="reader_toast_err_already_follow_blog">أنت تتابع هذا الموقع بالفعل</string>
     <string name="reader_toast_err_get_blog_info">تعذر إظهار هذا الموقع</string>
@@ -2282,9 +2612,9 @@ Language: ar
     <string name="reader_toast_err_unfollow_blog">تعذر إلغاء متابعة هذا الموقع</string>
     <string name="reader_empty_recommended_blogs">لا توجد مواقع موصى بها</string>
     <string name="reader_title_blog_preview">موقع القارئ</string>
-    <string name="reader_page_followed_tags">مواضيع تمت متابعتها</string>
     <string name="reader_hint_add_tag_or_url">أدخل رابط URL أو موضوعًا للمتابعة</string>
-    <string name="forgot_password">نسيت كلمة المرور؟</string>
+    <string name="reader_page_followed_tags">مواضيع تمّت متابعتها</string>
+    <string name="reader_page_followed_blogs">مواقع تمّت متابعتها</string>
     <string name="help">المساعدة</string>
     <string name="ssl_certificate_error">شهادة SSL غير صالحة</string>
     <string name="ssl_certificate_ask_trust">إذا كنت عادة تتصل بهذا الموقع بدون أي مشاكل، فربما يعني هذا الخطأ أن شخصًا ما يحاول سرقة هذا الموقع, وينبغي ألا تقوم بالاستمرار. هل ترغب في الوثوق بالشهادة على أي حال؟</string>
@@ -2343,7 +2673,6 @@ Language: ar
     <string name="local_changes">التغيرات المحلية</string>
     <string name="post_settings">إعدادات المقالة</string>
     <string name="comment_status_approved">تمت الموافقة</string>
-    <string name="http_authorization_required">مطلوب ترخيص</string>
     <string name="error_blog_hidden">هذه المدونة مخفية و لايمكن تحميلها . قم بتفعيلها مرة اخرى من الإعدادات وأعد المحاولة.</string>
     <string name="fatal_db_error">حدث خطأ اثناء إنشاء قاعدة بيانات التطبيق. حاول إعادة تنصيب التطبيق.</string>
     <string name="trash">سلة المهملات</string>
@@ -2366,7 +2695,8 @@ Language: ar
     <string name="cancel_edit">إلغاء التحرير</string>
     <string name="reader_toast_err_remove_tag">غير قادر على إزالة هذا الموضوع</string>
     <string name="reader_toast_err_add_tag">غير قادر على إضافة هذا الموضوع</string>
-    <string name="share_link">مشاركة الرابط</string>
+    <string name="http_authorization_required">التخويل مطلوب</string>
+    <string name="share_link">رابط المشاركة</string>
     <string name="reader_empty_posts_in_tag_updating">يتم الآن جلب المقالات …</string>
     <string name="reader_label_reply">رد</string>
     <string name="comment_spammed">تم وضع علامة إزعاج على التعليق</string>
@@ -2413,9 +2743,9 @@ Language: ar
     <string name="stats_timeframe_months">الشهور</string>
     <string name="media_edit_failure">فشل التحديث</string>
     <string name="media_gallery_type_slideshow">عارض الشرائح</string>
-    <string name="share_action">المشاركة</string>
     <string name="stats_view_referrers">إحالة الدعوات</string>
     <string name="media_gallery_type_tiled">متجانب</string>
+    <string name="share_action">مشاركة</string>
     <string name="discard">تجاهل</string>
     <string name="manage">إدارة</string>
     <string name="note_reply_successful">تم نشر الرد</string>
diff --git a/WordPress/src/main/res/values-az/strings.xml b/WordPress/src/main/res/values-az/strings.xml
index 5a46e8457002..b8fad23a2265 100644
--- a/WordPress/src/main/res/values-az/strings.xml
+++ b/WordPress/src/main/res/values-az/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2015-12-08 01:00:08+0000
 Plural-Forms: nplurals=2; plural=n != 1;
@@ -115,7 +115,6 @@ Language: az
     <string name="reader_page_followed_blogs">İzlənilən saytlar</string>
     <string name="ssl_certificate_error">Yanlış SSL sertifikatı</string>
     <string name="help">Yardım</string>
-    <string name="forgot_password">Parolunuzu itirdinizmi?</string>
     <string name="ssl_certificate_ask_trust">Əgər bu sayta əsasən problemsiz şəkildə qoşula bilirsinizsə, bu xəta başqalarının saytı təqlid etdiyi mənasına gəlir. yenə də sertifikata etibar etmək istəyirsinizmi?</string>
     <string name="mnu_comment_unspam">Spam deyil</string>
     <string name="no_network_message">Uyğun vəziyyətdə şəbəkə yoxdur</string>
diff --git a/WordPress/src/main/res/values-bg/strings.xml b/WordPress/src/main/res/values-bg/strings.xml
index 6dc094a03946..26a24e090bd8 100644
--- a/WordPress/src/main/res/values-bg/strings.xml
+++ b/WordPress/src/main/res/values-bg/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2018-12-10 19:56:03+0000
 Plural-Forms: nplurals=2; plural=n != 1;
@@ -65,7 +65,6 @@ Language: bg
     <string name="quick_start_dialog_need_help_title">Искате ли малко помощ, за да започнете?</string>
     <string name="login_error_suffix">\nЗащо не пробвате с друг профил?</string>
     <string name="login_error_generic">Възникна проблем при опит за връзка с Google профила.</string>
-    <string name="login_google_button_suffix">Вход с Google.</string>
     <string name="login_error_button">Затваряне</string>
     <string name="post_settings_remove_featured_image">Премахване картинката на публикацията</string>
     <string name="post_settings_choose_featured_image">Избор на картинка за публикацията</string>
@@ -92,13 +91,7 @@ Language: bg
     <string name="notification_settings_category_other">Други</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Всички мои сайтове</string>
     <string name="notification_settings_category_your_sites">Вашите сайтове</string>
-    <string name="notification_settings_master_off_message">Изключване на състемата за известия, ще спре изпращането на известия, независимо от типа им. Може да донастройте системата за известия като я включите.</string>
-    <string name="notification_settings_master_off_title">За да получавате известия на устройството, активирайте системата за известия.</string>
-    <string name="notification_settings_master_hint_off">Включване на известията</string>
-    <string name="notification_settings_master_hint_on">Изключване на известията</string>
-    <string name="notification_settings_master_status_off">Изключено</string>
     <string name="max_video_resolution">Максимален размер на видеото</string>
-    <string name="notification_settings_master_status_on">Включено</string>
     <string name="max_thumbnail_px_size">Максимален размер на изображенията</string>
     <string name="error_upload_post_media_param">Възникна грешка при качване на медиата в тази публикация %s.</string>
     <string name="error_upload_post_param">Възникна грешка при качването на тази публикация: %s.</string>
@@ -124,7 +117,6 @@ Language: bg
     <string name="login_checking_site_address">Проверяване на адреса на сайта</string>
     <string name="login_site_address_more_help">Имате нужда от помощ?</string>
     <string name="login_site_address_help_title">Какъв е адресът на сайта ми?</string>
-    <string name="login_site_address_help">Трябва ви помощ, за да намерите адреса на сайта си?</string>
     <string name="login_site_address">Адрес на сайта</string>
     <string name="login_already_logged_in_wpcom">Вече сте влезли в WordPress.com</string>
     <string name="enter_wpcom_password">Въведете вашата WordPress.com парола.</string>
@@ -144,11 +136,7 @@ Language: bg
     <string name="post_status_pending_review">Очаква коментар</string>
     <string name="post_status_post_private">Лична</string>
     <string name="post_status_draft">Чернова</string>
-    <string name="change_location">Промяна на местоположението</string>
-    <string name="remove_location">Премахване на местоположението</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Не мога да отворя избора на местоположение, Google Play Services не са достъпни.</string>
     <string name="post_status_publish_post">Публикуване</string>
-    <string name="post_settings_location">Местоположение</string>
     <string name="now">Сега</string>
     <string name="post_settings_password_dialog_hint">Само тези с паролата ще могат да видят публикацията</string>
     <string name="post_settings_excerpt_dialog_hint">Откъсът е незадължително кратко резюме на текста.</string>
@@ -284,7 +272,6 @@ Language: bg
     <string name="sign_in_wpcom">Влизане в WordPress.com</string>
     <string name="signout">Излизане</string>
     <string name="reader_label_global_related_posts">Още на WordPress.com</string>
-    <string name="reader_label_local_related_posts">Още в %s</string>
     <string name="preference_open_device_settings">Настройки на устройството</string>
     <string name="invite_invalid_email">%s: Невалиден имейл</string>
     <string name="invite_user_blocked_invites">%s: потребителят е забранил поканите</string>
@@ -332,18 +319,12 @@ Language: bg
     <string name="invite_error_invalid_usernames_multiple">Има невалидни имена или имейл адреси.</string>
     <string name="invite_error_invalid_usernames_one">Неуспешно изпращане: Невалиден имейл адрес или име</string>
     <string name="invite_error_no_usernames">Нужно е поне едно потребителско име</string>
-    <string name="invite_message_info">(По желание) Тук може да добавите съобщение до 500 символа, което ще бъде включено в поканата до потербителите.</string>
-    <string name="invite_message_remaining_other">Оставащи символи: %d</string>
-    <string name="invite_message_remaining_one">Оставащи символи: 1</string>
-    <string name="invite_message_remaining_zero">0 оставащи символи</string>
-    <string name="invite_message_title">Съобщение</string>
     <string name="invite">Покана</string>
-    <string name="invite_names_title">Имена или имейл адреси</string>
     <string name="my_site_header_external">Външна</string>
     <string name="invite_people">Покана</string>
-    <string name="send_link">Изпращане на връзка</string>
     <string name="label_clear_search_history">Изчистване на историята на търсенето</string>
     <string name="dlg_confirm_clear_search_history">Изчистване на историята на търсенето?</string>
+    <string name="reader_title_related_post_detail">Свързана публикация</string>
     <string name="preview_screen_links_disabled">Връзките на екрана за преглед са деактивирани</string>
     <string name="send">Изпращане</string>
     <string name="person_removed">%1$s бе успешно премахнат</string>
@@ -362,7 +343,6 @@ Language: bg
     <string name="checking_email">Проверяване на имейл</string>
     <string name="magic_link_unavailable_error_message">В момента не е налично. Въведете вашата парола</string>
     <string name="logging_in">Влизане</string>
-    <string name="enter_your_password_instead">Въведете паролата си</string>
     <string name="web_address_dialog_hint">Ще се показва когато коментирате.</string>
     <string name="capture_or_pick_photo">Заснемане или избор на снимка</string>
     <string name="plan">План</string>
@@ -476,7 +456,6 @@ Language: bg
     <string name="site_settings_paging_dialog_description">Разделяне на коментарите на няколко страници.</string>
     <string name="site_settings_paging_dialog_header">Коментари на страница</string>
     <string name="site_settings_close_after_dialog_title">Затваряне на коментарите</string>
-    <string name="site_settings_blacklist_description">Когато коментар съдържа която и да е от тези думи в съдържанието, името, адрес или IP адреса си, той ще бъде отбелязан като спам. Частични думи също работят, може да въведете „press“, което ще съвпадне с „WordPress“.</string>
     <string name="site_settings_hold_for_moderation_description">Когато коментар съдържа която и да е от тези думи в съдържанието, името, адрес или IP адреса си, той ще бъде изпращан за модерация. Частични думи също работят, може да въведете „press“, което ще съвпадне с „WordPress“.</string>
     <string name="site_settings_list_editor_input_hint">Въведете дума или фраза</string>
     <string name="site_settings_list_editor_no_items_text">Няма елементи</string>
@@ -491,10 +470,8 @@ Language: bg
     <string name="site_settings_rp_show_header_title">Показване на заглавката</string>
     <string name="site_settings_rp_switch_summary">Показва подобно съдържание от вашия сайт под вашите публикации.</string>
     <string name="site_settings_rp_switch_title">Показване на подобни публикации</string>
-    <string name="site_settings_blacklist_hint">Коментарите, които съвпаднат с термин за филтриране, ще бъдат отбелязани като спам.</string>
     <string name="site_settings_moderation_hold_hint">Коментарите, които отговарят на този филтър, ще бъдат добавени в опашката за модериране.</string>
     <string name="site_settings_multiple_links_hint">Игнорира лимита за връзки от познати потребители</string>
-    <string name="site_settings_whitelist_hint">Авторът на коментара трябва да има поне един одобрен коментар</string>
     <string name="site_settings_user_account_required_hint">Потребителите трябва да са регистрирани и влезли за да коментират</string>
     <string name="site_settings_identity_required_hint">Авторът на коментара трябва да попълни своите име и имейл</string>
     <string name="site_settings_paging_hint">Показване на коментарите в части с определен размер</string>
@@ -517,17 +494,13 @@ Language: bg
     <string name="site_settings_address_hint">В момента не можете да променяте вашия адрес</string>
     <string name="site_settings_tagline_hint">Кратък текст или привлекателна фраза, описваща вашия блог</string>
     <string name="site_settings_title_hint">Описание на сайта</string>
-    <string name="site_settings_whitelist_known_summary">Коментари от познати потребители</string>
-    <string name="site_settings_whitelist_all_summary">Коментари от всички потребители</string>
     <string name="site_settings_threading_summary">%d нива</string>
     <string name="site_settings_privacy_private_summary">Частен</string>
     <string name="site_settings_privacy_hidden_summary">Скрит</string>
     <string name="site_settings_delete_site_title">Изтриване на сайт</string>
     <string name="site_settings_privacy_public_summary">Публичен</string>
-    <string name="site_settings_blacklist_title">Черен списък</string>
     <string name="site_settings_moderation_hold_title">За модерация</string>
     <string name="site_settings_multiple_links_title">Връзки в коментарите</string>
-    <string name="site_settings_whitelist_title">Автоматично одобряване</string>
     <string name="site_settings_paging_title">Страниране</string>
     <string name="site_settings_threading_title">Опашка</string>
     <string name="site_settings_sort_by_title">Сортиране по</string>
@@ -663,7 +636,6 @@ Language: bg
     <string name="reader_label_new_posts">Нови публикации</string>
     <string name="post_uploading">Качване</string>
     <string name="error_copy_to_clipboard">Възникна грешка при копиране на текста в clipboard-а</string>
-    <string name="reader_page_recommended_blogs">Блогове които бихте харесали</string>
     <string name="logs_copied_to_clipboard">Логовете на приложението бяха копирани в буфера за обмен на данни</string>
     <string name="stats_view_videos">Видеа</string>
     <string name="stats_followers_a_day">Ден</string>
@@ -714,7 +686,6 @@ Language: bg
     <string name="reader_page_followed_blogs">Следени сайтове</string>
     <string name="help">Помощ</string>
     <string name="ssl_certificate_error">Невалиден SSL сертификат</string>
-    <string name="forgot_password">Изгубена парола?</string>
     <string name="ssl_certificate_ask_trust">Ако обикновено се свързвате с този сайт без проблеми, тази грешка може да означава, че някой се опитва да имитира този сайт и не трябва да продължавате. Искате ли да се доверите на този сертификат въпреки това?</string>
     <string name="mnu_comment_unspam">Не е спам</string>
     <string name="error_refresh_pages">Страниците не могат да бъдат обновени в момента</string>
diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml
index 22d128f6ccf2..1e8ef1c354c4 100644
--- a/WordPress/src/main/res/values-cs/strings.xml
+++ b/WordPress/src/main/res/values-cs/strings.xml
@@ -1,18 +1,1077 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 08:20:33+0000
+Translation-Revision-Date: 2021-05-19 08:54:34+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: cs_CZ
 -->
 <resources>
-    <string name="send_verification_email">Poslat ověřovací email</string>
-    <string name="gutenberg_native_translate">Přeložit</string>
-    <string name="gutenberg_native_title">Název:</string>
+    <string name="gutenberg_native_add_link">Přidat odkaz</string>
+    <string name="login_empty_view_try_another_account">Zkuste to s jiným účtem</string>
+    <string name="login_empty_view_avatar_content_description">Vaše profilová fotka</string>
     <string name="gutenberg_native_size">Velikost</string>
+    <string name="gutenberg_native_what_is_alt_text">Co je alternativní text?</string>
+    <string name="gutenberg_native_transform_s_to">Změnit %s na</string>
+    <string name="gutenberg_native_transform_block">Změnit blok…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Vložení média se nezdařilo.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Vložení zvukového souboru se nezdařilo.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Popište účel obrázku. Pokud je obrázek čistě dekorativní, ponechte toto pole prázdné.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s změnit na %2$s</string>
+    <string name="like_faces_error_loading_message">Chyba při načítání podobných dat. %s.</string>
+    <string name="like_faces_plural_text">%d blogerům se to líbí.</string>
+    <string name="like_faces_singular_text">1 blogerovi se to líbí.</string>
+    <string name="like_title_plural">%d to se mi líbí</string>
+    <string name="like_title_singular">1 to se mi libí</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Chcete-li opravit hrozby, zadejte pověření serveru.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Chcete-li opravit hrozbu, zadejte pověření serveru.</string>
+    <string name="suggestion">Doporučení:</string>
+    <string name="gutenberg_native_search_blocks">Hledat bloky</string>
+    <string name="gutenberg_native_search_block">Hledat blok</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">dvojitým klepnutím změníte jednotku</string>
+    <string name="gutenberg_native_clear_search">Vymazat vyhledávání</string>
+    <string name="gutenberg_native_cancel_search">Zrušit vyhledávání</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s is %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Při získávání údajů o lajcích došlo k chybě</string>
+    <string name="get_likes_unknown_error">Při získávání lajků došlo k neznámé chybě.</string>
+    <string name="get_likes_no_network_error">Síť není dostupná.</string>
+    <string name="comments_empty_list_filtered_unreplied">Žádné nezodpovězené komentáře</string>
+    <string name="comment_status_unreplied">Bez odpovědi</string>
+    <string name="gutenberg_native_table_of_contents">Tabulka obsahu</string>
+    <string name="gutenberg_native_summary">souhrn</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Shrňte svůj příspěvek se seznamem nadpisů. Přidejte HTML kotvy do nadpisových bloků a propojte je zde.</string>
+    <string name="gutenberg_native_document_outline">osnova dokumentu</string>
+    <string name="gutenberg_native_buttongroup">Skupina tlačítek</string>
+    <string name="jetpack_brute_force_allowlist_title">Vždy povolené adresy IP</string>
+    <string name="site_settings_denylist_title">Nepovolené komentáře</string>
+    <string name="reader_title_interests">Sledujte témata</string>
+    <string name="stories_intro_main_subtitle">Nový způsob vytváření a publikování poutavého obsahu na vašem webu.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Zamítnout</string>
+    <string name="activity_log_backup_download_notice_download_action">Stáhnout</string>
+    <string name="threat_fix_all_status_success_message_plural">Hrozby byly úspěšně opraveny.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Potvrďte, že chcete opravit všechny aktivní hrozby %s.</string>
+    <string name="scan_idle_threats_description_plural">Prohledávání zjistilo %1$s potenciálních hrozeb s %2$s. Zkontrolujte je prosím níže a proveďte akci nebo klepněte na tlačítko opravit vše. Jsme %3$s, pokud nás potřebujete.</string>
+    <string name="scan_fixing_threats_description_plural">Na pozadí tyto hrozby tvrdě pracujeme. Mezitím můžete svůj web nadále používat jako obvykle. Průběh můžete kdykoli zkontrolovat.</string>
+    <string name="gutenberg_native_edit_focal_point">Změňte zaostřovací pole</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Dvojitým klepnutím otevřete spodní list, kde můžete obrázek upravit, nahradit nebo vymazat</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Dvojitým klepnutím otevřete akční list, kde můžete obrázek upravit, nahradit nebo vymazat</string>
+    <string name="new_site_creation_search_domain_example">priklad.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Zadejte název svého webu</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Všechny úkoly dokončeny&lt;/b&gt;&lt;br/&gt;Oslovíte více lidí. Dobrá práce!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Všechny úkoly dokončeny&lt;/b&gt;&lt;br/&gt;Svůj web jste si přizpůsobili. Výborně!</string>
+    <string name="quick_start_card_menu_hide">Prozatím skrýt</string>
+    <string name="magic_link_not_meaning_to_create_account">Nechtěli jste vytvořit nový účet? Vraťte se zpět a znovu zadejte svou emailovou adresu.</string>
+    <string name="invite_links_disable_dialog_message">Jakmile je tento odkaz s pozvánkou deaktivován, nikdo ho nebude moci použít k připojení k vašemu týmu. Jsi si jistý?</string>
+    <string name="invite_links_disable_dialog_title">Zakázat zvací odkaz</string>
+    <string name="invite_links_bad_format_response">Přijata neplatná odpověď</string>
+    <string name="invite_links_null_response">Žádná odpověď přijata</string>
+    <string name="invite_links_cannot_get_role_data_error">Při načítání dat pro uživatelskou úroveň %1$s došlo k chybě</string>
+    <string name="invite_links_cannot_get_roles_error">Došlo k chybě při získávání uživatelských úrovní</string>
+    <string name="invite_links_generic_get_data_error">Při načítání dat odkazů na pozvánky došlo k neznámé chybě</string>
+    <string name="invite_links_helper_text">Pomocí tohoto odkazu můžete připojit členy svého týmu, aniž byste je museli pozvat jeden po druhém. Kdokoli, kdo navštíví tuto adresu URL, se bude moci zaregistrovat do vaší organizace, i když obdržel odkaz od někoho jiného, takže se ujistěte, že jej sdílíte s důvěryhodnými lidmi.</string>
+    <string name="invite_links_expire_date">Platnost do %1$s</string>
+    <string name="invite_links_disable_invite_link">Zakázat zvací odkaz</string>
+    <string name="invite_links_share_invite_link">Sdílet zvací odkaz</string>
+    <string name="invite_links_generate">Generovat nový odkaz</string>
+    <string name="invite_links_get_status_retry">Obnovit stav odkazů</string>
+    <string name="invite_links_section_title">Zvací odkaz</string>
+    <string name="threats_found_singular">Nalezena hrozba</string>
+    <string name="threats_found_plural">Nalezeny hrozby</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Skenování dokončeno&lt;/b&gt;&lt;br&gt;Nalezeny %s potenciální hrozby</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Skenování dokončeno&lt;/b&gt;&lt;br&gt;Nalezena 1 potenciální hrozba</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Skenování dokončeno&lt;/b&gt;&lt;br&gt;Nebyly nalezeny žádné hrozby</string>
+    <string name="scan_fixing_threats_title_singular">Oprava hrozby</string>
+    <string name="disable">Zakázat</string>
+    <string name="quick_start_card_menu_unpin">Uvolněte to</string>
+    <string name="quick_start_list_review_pages_subtitle">Zkontrolujte své stránky a proveďte změny nebo je přidejte nebo odeberte.</string>
+    <string name="quick_start_list_view_site_title">Navštívit váš web</string>
+    <string name="quick_start_list_upload_icon_subtitle">Přidejte ikonu webu pro vyleštěný profesionální vzhled.</string>
+    <string name="quick_start_list_follow_site_subtitle">Objevujte a sledujte weby, které vás inspirují.</string>
+    <string name="quick_start_list_enable_sharing_title">Povolit sdílení</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Automaticky sdílejte nové příspěvky na svých sociálních médiích.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Pojmenujte svůj web podle jeho osobnosti a tématu.</string>
+    <string name="quick_start_list_check_stats_title">Zkontrolujte své statistiky</string>
+    <string name="backup_download_status_failure_bullet2">Stále se pokusíme vytvořit váš záložní soubor ke stažení.</string>
+    <string name="backup_download_status_failure_bullet1">Nepodařilo se nám najít stav, který by říkal, jak dlouho bude vaše zálohování ke stažení trvat.</string>
+    <string name="backup_download_status_failure_heading">Hmm, nemohli jsme najít váš stav zálohy ke stažení</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Zaškrtnutí ikony</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Ikona hodin</string>
+    <string name="restore_status_failure_bullet3">Až bude hotovo, upozorníme vás.</string>
+    <string name="restore_status_failure_bullet2">Stále se pokoušíme obnovit váš web.</string>
+    <string name="restore_status_failure_bullet1">Nepodařilo se nám najít stav, který by říkal, jak dlouho bude obnovení trvat.</string>
+    <string name="restore_status_failure_heading">Hmm, nemohli jsme najít stav obnovení</string>
+    <string name="restore_complete_failed_description">Váš web jsme nemohli obnovit</string>
+    <string name="restore_warning_action_button">Potvrdit</string>
+    <string name="restore_warning_description_with_two_parameters">Opravdu chcete vrátit svůj web zpět na %1$s o %2$s? ↵ \nCokoli, co jste od té doby změnili, bude ztraceno.</string>
+    <string name="backup_download_complete_failed_description">Vaši zálohu jsme nemohli vytvořit</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(Nezahrnuje šablony, pluginy a obrázky)</string>
+    <string name="backup_item_contents">WP-content adresář</string>
+    <string name="backup_item_roots">WordPress root</string>
+    <string name="backup_download_details_choose_items_header">Položky obsažené v tomto stažení</string>
+    <string name="gutenberg_native_uploading">Nahrávání…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Opakovaně použitelné bloky nelze upravovat na WordPress pro iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Opakovaně použitelné bloky nelze upravovat na WordPress pro Android</string>
+    <string name="gutenberg_native_replace_file">Nahradit soubor</string>
+    <string name="gutenberg_native_replace_audio">Nahradit zvuk</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problém s otevřením zvuku</string>
+    <string name="gutenberg_native_open">OTEVŘENO</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Aplikace nedokáže zpracovat tento požadavek. </string>
+    <string name="gutenberg_native_lock_icon">Ikona zámku</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Vložení zvukového souboru se nezdařilo. Klepněte pro možnosti.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Dvojitým klepnutím vyberte audio soubor</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Dvojitým klepnutním poslechnete zvukový soubor</string>
+    <string name="gutenberg_native_choose_audio">Zvolit zvuk</string>
+    <string name="gutenberg_native_audio_player">Audio přehrávač</string>
+    <string name="gutenberg_native_audio_file">zvukový soubor</string>
+    <string name="gutenberg_native_audio_caption_s">Zvukový titulek. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Zvukový titulek. Prázdný</string>
+    <string name="gutenberg_native_add_audio">PŘIDAT ZVUK</string>
+    <string name="continue_with_wpcom">Přihlaste se nebo se zaregistrujte pomocí WordPress.com </string>
+    <string name="photo_picker_use_audio">Použijte tento zvuk</string>
+    <string name="photo_picker_choose_audio">Vyberte zvuk ze zařízení</string>
+    <string name="people_optional_custom_message_helper_text">Volitelné: Vložte vlastní vzkaz, který bude odeslán s pozvánkou.</string>
+    <string name="people_learn_more_about_roles">Dozvědět se více o uživatelských úrovních</string>
+    <string name="threat_status_fixed">Fixní</string>
+    <string name="threat_found_header">Nalezeno</string>
+    <string name="scan_here_to_help">tady pro pomoc</string>
+    <string name="scan_idle_threats_description_singular">Skenování našlo 1 potenciální hrozbu s %1$s. Zkontrolujte prosím hrozbu níže a proveďte akci nebo klepněte na tlačítko opravit vše. Jsme %2$s, pokud nás potřebujete.</string>
+    <string name="scan_idle_manual_scan_description">Chcete-li znovu zkontrolovat svůj web, spusťte ruční skenování nebo počkejte, až Jetpack prohledá váš web ještě dnes.</string>
+    <string name="scan_provisioning_description">Vítejte v Jetpack Scan! Vyhodnocujeme váš web a nastavujeme úplné skenování. Pokud zjistíme jakékoli problémy, které by mohly ovlivnit skenování, dáme vám vědět, poté se spustí vaše první úplné skenování.</string>
+    <string name="scan_scanning_is_initial_description">Vítejte v Jetpack Scan, nyní se nejprve podíváme na vaše stránky a výsledky budou brzy k dispozici.</string>
+    <string name="scan_fixing_threats_description_singular">Na pozadí tuto hrozbu tvrdě pracujeme. Mezitím můžete svůj web nadále používat jako obvykle. Průběh můžete kdykoli zkontrolovat.</string>
+    <string name="scan_scanning_description">Po dokončení skenování vám zašleme oznámení. Mezitím můžete svůj web nadále používat jako obvykle. Průběh můžete kdykoli zkontrolovat.</string>
+    <string name="scan_fixing_threats_title_plural">Oprava hrozby</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan nemohl dokončit skenování vašeho webu. Zkontrolujte, zda váš web nefunguje - pokud není, zkuste to znovu. Pokud ano, nebo pokud má Jetpack Scan stále problémy, obraťte se na náš tým podpory.</string>
+    <string name="scan_request_failed_title">Něco se pokazilo</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Zálohování webu</string>
+    <string name="activity_log_currently_backing_up_message">Zálohuje se web z %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Vytváření zálohy ke stažení</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Stránka úspěšně za zálohována</string>
+    <string name="activity_log_backup_finished_snackbar_message">Váš web byl úspěšně zálohován↵\nZálohováno z %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Váš web se zálohuje↵\nZálohuje se z %1$s %2$s</string>
+    <string name="pick_audio">Vybrat zvuk</string>
+    <string name="restore_another_process_running">Probíhá další obnovení.</string>
+    <string name="restore_complete_failed_icon_content_description">Ikona chyby</string>
+    <string name="restore_complete_failed_action_button_content_description">Tlačítko hotovo</string>
+    <string name="restore_complete_failed_title">Obnovení se nezdařilo</string>
+    <string name="restore_complete_visit_site_button_content_description">Tlačítko zobrazit web</string>
+    <string name="restore_complete_done_button_content_description">Tlačítko hotovo</string>
+    <string name="restore_complete_icon_content_description">Ikona obnovení</string>
+    <string name="restore_complete_visit_site_action_button">Zobrazit web</string>
+    <string name="restore_complete_description_with_two_parameters">Všechny vaše vybrané položky jsou nyní obnoveny zpět na %1$s %2$s.</string>
+    <string name="restore_complete_header">Váš web byl obnoven</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Není třeba čekat. Až bude váš web obnoven, upozorníme vás.</string>
+    <string name="restore_progress_icon_content_description">Ikona obnovení webu</string>
+    <string name="restore_progress_description_with_two_parameters">Obnovujeme váš web zpět na %1$s %2$s.</string>
+    <string name="restore_progress_header">Aktuálně se obnovuje web</string>
+    <string name="restore_warning_action_button_content_description">Tlačítko potvrdit obnovení webu</string>
+    <string name="restore_warning_icon_content_description">Obrázek červeného kruhu s vykřičníkem</string>
+    <string name="restore_warning_header">Varování</string>
+    <string name="restore_details_action_button_content_description">Tlačítko obnovit web</string>
+    <string name="restore_details_icon_content_description">Ikona obnovení</string>
+    <string name="restore_details_action_button">Obnovit web</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s je vybraný bod pro obnovení.</string>
+    <string name="restore_details_header">Obnovit web</string>
+    <string name="restore_details_choose_items_header">Vyberte položky, které chcete obnovit:</string>
+    <string name="restore">Obnovit</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud s ikonou X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Tlačítko hotovo</string>
+    <string name="backup_download_complete_failed_action_button">Hotovo</string>
+    <string name="backup_download_complete_failed_title">Stažení se nezdařilo</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Mobil</string>
+    <string name="quick_start_card_menu_remove">Příště nezobrazovat</string>
+    <string name="quick_start_card_menu_pin">Připnout to</string>
+    <string name="quick_start_dialog_review_pages_message_short">Chcete-li zobrazit seznam stránek, vyberte %1$s stránky %2$s.</string>
+    <string name="quick_start_dialog_review_pages_message">Změňte, přidejte nebo odeberte stránky svého webu.</string>
+    <string name="quick_start_dialog_review_pages_title">Zkontrolujte stránky webu</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Vyberte domovskou stránku %1$s a upravte svou domovskou stránku %2$s.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Chcete-li zobrazit seznam stránek, vyberte %1$s stránky %2$s.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Změňte, přidejte nebo odeberte obsah z domovské stránky svého webu.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Upravte svou domovskou stránku</string>
+    <string name="reader_menu_mark_as_unseen">Označit jako neviditelné</string>
+    <string name="reader_menu_mark_as_seen">Označit jako viditelné</string>
+    <string name="error_media_upload_failed_for_reason">Nahrávání médií se nezdařilo.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Nedostatek dostupného úložiště na webu</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Stav viditelnosti tohoto příspěvku nelze přepnout</string>
+    <string name="reader_marked_post_as_unseen">Příspěvek byl označen jako neviditelný</string>
+    <string name="reader_marked_post_as_seen">Označený příspěvek jako viděný</string>
+    <string name="threat_fix_all_status_error_message">Chyba při získávání stavu opravy. Kontaktujte naši podporu.</string>
+    <string name="threat_fix_all_status_success_message_singular">Hrozby byly úspěšně opraveny.</string>
+    <string name="threat_fix_all_error_message">Chyba při opravě hrozeb. Kontaktujte naši podporu.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Potvrďte, že chcete opravit 1 aktivní hrozbu.</string>
+    <string name="threat_fix_all_warning_title">Opravte všechny hrozby</string>
+    <string name="threat_ignore_error_message">Chyba při ignorování hrozby. Kontaktujte podporu.</string>
+    <string name="threat_ignore_success_message">Hrozba ignorována.</string>
+    <string name="threat_ignore_warning">Zabezpečení byste neměli ignorovat, pokud si nejste absolutně jisti, že je neškodný. Pokud se rozhodnete tuto hrozbu ignorovat, zůstane na vašem webu &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Chyba při opravě hrozby. Kontaktujte naši podporu.</string>
+    <string name="threat_item_sub_header_status_ignored">Hrozba ignorována</string>
+    <string name="threat_item_sub_header_status_fixed_on">Hrozba opravena v %s</string>
+    <string name="threat_fixing">Oprava hrozby</string>
+    <string name="scan_history_ignored_threats_tab">Ignorováno</string>
+    <string name="scan_history_no_threats_found">Nebyly nalezeny žádné položky</string>
+    <string name="scan_history_fixed_threats_tab">Opraveno</string>
+    <string name="scan_history_all_threats_tab">Vše</string>
+    <string name="scan_scanning_title">Skenování souborů</string>
+    <string name="scan_preparing_to_scan_title">Příprava na skenování</string>
+    <string name="scan_history_menu_title">Historie</string>
+    <string name="scan_history">Historie skenování</string>
+    <string name="backup_active_filter_empty_subtitle">Zkuste upravit časové období</string>
+    <string name="backup_active_filter_empty_title">Nebyly nalezeny žádné odpovídající zálohy</string>
+    <string name="backup_empty_subtitle">Vaše první záloha se zde zobrazí do 24 hodin a po dokončení zálohy obdržíte oznámení</string>
+    <string name="backup_empty_title">Vaše první záloha bude brzy připravena</string>
+    <string name="request_failed_message">Při zpracování požadavku došlo k problému. Prosím zkuste to znovu později.</string>
+    <string name="gutenberg_native_move_to_bottom">Přesunout dolů</string>
+    <string name="gutenberg_native_change_block_position">Změňte pozici bloku</string>
+    <string name="label_control_upload">Nahrát</string>
+    <string name="jetpack_icon_content_description">ikona</string>
+    <string name="backup_download_complete_info">Také jsme vám zaslali e-mailem odkaz na váš soubor.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Tlačítko sdílet odkaz</string>
+    <string name="backup_download_complete_download_action_button_content_description">Tlačítko stáhnout</string>
+    <string name="backup_download_complete_icon_content_description">Ikona připravena k zálohování</string>
+    <string name="backup_download_complete_download_share_action_button">Sdílet odkaz</string>
+    <string name="backup_download_complete_download_action_button">Stáhnout</string>
+    <string name="backup_download_complete_description_with_two_parameters">Úspěšně jsme vytvořili zálohu vašeho webu z %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Vaše záloha je nyní k dispozici ke stažení</string>
+    <string name="backup_download_complete_page_title">Vaše záloha</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Není třeba čekat. Až bude vaše záloha připravena, upozorníme vás</string>
+    <string name="backup_download_progress_icon_content_description">Vytváření ikony zálohy ke stažení</string>
+    <string name="backup_download_progress_description_with_two_parameters">Vytváříme zálohu vašeho webu ke stažení z %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Aktuálně se vytváří záloha vašeho webu ke stažení</string>
+    <string name="backup_download_progress_page_title">Stáhnout zálohu</string>
+    <string name="backup_download_another_download_running">Probíhá další stahování.</string>
+    <string name="backup_download_generic_failure">Při zpracování požadavku došlo k problému. Prosím zkuste to znovu později.</string>
+    <string name="backup_download_details_action_button_content_description">Vytvořit tlačítko pro stažení zálohy</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s je vybraný bod pro vytvoření zálohy ke stažení.</string>
+    <string name="gutenberg_native_image_link_url">URL odkaz na obrázek</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">crosspost</string>
+    <string name="suggestion_user">uživatel</string>
+    <string name="suggestion_no_matching">Bez shody %s.</string>
+    <string name="suggestion_problem">Při načítání návrhů došlo k problému.</string>
+    <string name="suggestion_none">Nejsou k dispozici žádné návrhy %s.</string>
+    <string name="suggestion_selection_needed">Zadejte prosím filtrování seznamu návrhů.</string>
+    <string name="threat_get_free_estimate">Získejte odhad zdarma</string>
+    <string name="threat_ignore">Ignorovat hrozbu</string>
+    <string name="threat_fix">Opravte hrozbu</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan tuto hrozbu vyřeší.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan upraví ovlivněný soubor nebo adresář.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan se aktualizuje na novější verzi (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan odstraní ovlivněný soubor nebo adresář.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan nahradí ovlivněný soubor nebo adresář.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan nemůže tuto hrozbu automaticky opravit.\n         Doporučujeme hrozbu vyřešit ručně: ujistěte se, že WordPress, vaše téma a všechny vaše doplňky jsou aktuální, a odstraňte z webu nevhodný kód, téma nebo plugin.\n \n\n         Pokud potřebujete další pomoc při řešení této hrozby, doporučujeme &lt;b&gt;Codeable+&lt;/b&gt;, důvěryhodné tržiště nezávislých odborníků s vysoce prověřenými odborníky na WordPress.\n         Identifikovali vybranou skupinu bezpečnostních odborníků, kteří s těmito projekty pomohli. Ceny se pohybují od 70–120 USD / hodinu a můžete získat bezplatný odhad bez povinnosti najmout.</string>
+    <string name="threat_fix_current_not_fixable_header">Řešení hrozby</string>
+    <string name="threat_fix_fixed_header">Jak to Jetpack opravil?</string>
+    <string name="threat_fix_default_header">Jak to napravíme?</string>
+    <string name="threat_file_description">V souboru nalezena hrozba:</string>
+    <string name="threat_technical_details_header">Technické podrobnosti</string>
+    <string name="threat_problem_header">Jaký byl problém?</string>
+    <string name="threat_details">Podrobnosti o hrozbě</string>
+    <string name="threat_item_sub_header_vulnerable_theme">V šabloně byla nalezena chyba zabezpečení</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">V pluginu byla nalezena chyba zabezpečení</string>
+    <string name="threat_item_sub_header_file_signature">Threat found %s</string>
+    <string name="threat_item_sub_header_core_file">Zranitelnost nalezená ve WordPressu</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Různé zranitelnosti</string>
+    <string name="threat_item_header_vulnerable_theme">Zranitelné šablona: %s (verze %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Zranitelný plugin: %s (verze %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: vzor škodlivého kódu</string>
+    <string name="threat_item_header_database_threat">%s hrozby databáze</string>
+    <string name="threat_item_header_infected_core_file">%s: infikovaný soubor v jádru</string>
+    <string name="threat_item_header_threat_found">Hrozba nalezena</string>
+    <string name="threats_fix_all">Opravit vše</string>
+    <string name="scan_in_few_seconds">během několika sekund</string>
+    <string name="scan_in_minutes_ago">před %s minutami</string>
+    <string name="scan_in_hours_ago">před %s hodinami</string>
+    <string name="scan_this_site">tento web</string>
+    <string name="scan_idle_last_scan_description">Poslední skenování Jetpack proběhlo %s a všechno vypadalo skvěle. %s</string>
+    <string name="scan_idle_threats_found_title">Váš web může být ohrožen</string>
+    <string name="scan_idle_no_threats_found_title">O nic se nestarejte</string>
+    <string name="scan_again">Skenovat znovu</string>
+    <string name="scan_now">Skenovat nyní</string>
+    <string name="scan_state_icon">Ikona stavu skenování</string>
+    <string name="backup">Záloha</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtr typu aktivity (%s vybrané typy)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (zobrazeno %s položek)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtr typu aktivity</string>
+    <string name="activity_log_activity_type_empty_subtitle">Ve vybraném časovém období nebyly zaznamenány žádné aktivity.</string>
+    <string name="activity_log_activity_type_empty_title">Nejsou k dispozici žádné aktivity</string>
+    <string name="activity_log_activity_type_error_subtitle">Zkontrolujte prosím připojení k internetu a zkuste to znovu.</string>
+    <string name="activity_log_activity_type_error_title">Žádné spojení </string>
+    <string name="activity_log_activity_type_filter_active_label">Typ aktivity (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtr časového období</string>
+    <string name="activity_log_active_filter_empty_subtitle">Zkuste upravit filtry časového období nebo typu aktivity</string>
+    <string name="activity_log_active_filter_empty_title">Nebyly nalezeny žádné odpovídající události</string>
+    <string name="backup_item_sqls">Databáze stránek (SQL)</string>
+    <string name="backup_item_roots_hint">Kořen WordPressu (zahrnuje wp-config.php a všechny soubory, které nejsou WordPress)</string>
+    <string name="backup_item_media_uploads">Nahrávání médií</string>
+    <string name="backup_item_plugins">WordPress pluginy</string>
+    <string name="backup_item_themes">WordPress šablony </string>
+    <string name="backup_download_details_icon_content_description">Vytvořit ikonu zálohy ke stažení</string>
+    <string name="backup_download_details_action_button">Vytvořte soubor ke stažení</string>
+    <string name="backup_download_details_header">Vytvořit zálohu ke stažení</string>
+    <string name="backup_download_details_page_title">Stáhnout zálohu</string>
+    <string name="backup_download">Stáhnout zálohu</string>
+    <string name="gutenberg_native_error">Chyba</string>
+    <string name="gutenberg_native_choose_file">Zvolit soubor</string>
+    <string name="activity_log_item_menu_download_backup_label">Stáhnout zálohu</string>
+    <string name="activity_log_item_menu_restore_label">Obnovte do tohoto bodu</string>
+    <string name="activity_log_activity_type_filter_label">Typ aktivit</string>
+    <string name="activity_log_date_range_filter_label">Časové období</string>
+    <string name="activity_log_activity_type_filter_header">Filtrovat podle typu aktivity</string>
+    <string name="dialog_confirm_copy_local_copy_button">Zkopírujte verzi z této aplikace</string>
+    <string name="dialog_confirm_copy_local_edit_button">Nejprve upravte příspěvek</string>
+    <string name="dialog_confirm_copy_local_message">Příspěvek, který se pokoušíte zkopírovat, má dvě verze, které jsou v konfliktu, nebo jste nedávno provedli změny, ale neuložili jste je.\nNejprve upravte příspěvek, abyste vyřešili jakýkoli konflikt, nebo pokračujte v kopírování verze z této aplikace.</string>
+    <string name="dialog_confirm_copy_local_title">Konflikt synchronizace článku</string>
+    <string name="button_copy">Duplikát</string>
+    <string name="toast_edit_story_update_in_progress_title">Příběh se ukládá, prosím čekejte…</string>
+    <string name="gutenberg_native_file_name">Název souboru</string>
+    <string name="gutenberg_native_file_block_settings">Nastavení blok souboru</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Nepodařilo se nahrát soubory.\nMožnosti zobrazíte klepnutím.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Uložení souborů se nezdařilo.\nMožnosti zobrazíte klepnutím.</string>
+    <string name="gutenberg_native_edit_file">Upravit soubor</string>
+    <string name="gutenberg_native_copy_file_url">Zkopírujte adresu URL souboru</string>
+    <string name="gutenberg_native_choose_a_file">ZVOLIT SOUBOR</string>
+    <string name="new_site_creation_domain_header_title">Vyberte doménu</string>
+    <string name="my_site_btn_jetpack_settings">Nastavení Jetpacku</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Konverzace sledována na e-mailu</string>
+    <string name="reader_btn_follow_comments">Sledovat konverzaci na e-mailu</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Nelze zrušit odběr komentářů k tomuto příspěvku</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Nelze se přihlásit k odběru komentářů k tomuto příspěvku</string>
+    <string name="reader_follow_comments_get_status_error">Chyba při načítání stavu předplatného příspěvku</string>
+    <string name="reader_follow_comments_unsubscribe_success">Komentář byl úspěšně odhlášen</string>
+    <string name="reader_follow_comments_subscribe_success">Úspěšně jste se přihlásili k odběru komentářů</string>
+    <string name="reader_follow_comments_bad_format_response">Přijata neplatná odpověď</string>
+    <string name="reader_follow_comments_null_response">Žádná odpověď přijata</string>
+    <string name="activity_log_activity_type_filter_clear">Zrušit</string>
+    <string name="activity_log_activity_type_filter_apply">Potvrdit</string>
+    <string name="dialog_edit_story_unsupported_format_message">Jeden nebo více snímků nebylo přidáno do vašeho příběhu, protože příběhy momentálně nepodporují soubory GIF. Místo toho zvolte statický obrázek nebo pozadí videa.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Soubory GIF nejsou podporovány</string>
+    <string name="dialog_edit_story_unrecoverable_message">Na webu jsme nenašli média tohoto příběhu.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Příběh nelze upravit</string>
+    <string name="dialog_edit_story_unavailable_message">Nelze načíst média pro tento příběh. Zkontrolujte své připojení k internetu a zkuste to za chvíli znovu.</string>
+    <string name="dialog_edit_story_unavailable_title">Příběh nelze upravit</string>
+    <string name="dialog_edit_story_limited_message">Tento příběh byl upraven na jiném zařízení a schopnost upravovat určité objekty může být omezená.</string>
+    <string name="dialog_edit_story_limited_title">Omezená úprava příběhu</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Média byla odstraněna. Zkuste svůj příběh vytvořit znovu.</string>
+    <string name="color_picker_label_background">Pozadí</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="dialog_discard_story_ok_button_edit">Zahodit</string>
+    <string name="dialog_discard_story_message_edit">Jakékoli provedené změny nebudou uloženy.</string>
+    <string name="dialog_discard_story_title_edit">Zrušit změny?</string>
+    <string name="label_done_button">Hotovo</string>
+    <string name="label_next_button">Další</string>
+    <string name="delete_button_alt">Smazat</string>
+    <string name="hpp_choose_error">Při výběru designu došlo k chybě.</string>
+    <string name="hpp_retry_error">Zkontrolujte prosím připojení k internetu a zkuste to znovu.</string>
+    <string name="hpp_error_subtitle">Až budete znovu online, klepněte na opakovat.</string>
+    <string name="hpp_error_title">Rozložení nejsou k dispozici v režimu offline</string>
+    <string name="continue_site_credentials">Pokračujte s přihlašovacími údaji úložiště</string>
+    <string name="login_find_your_connected_email">Najděte svůj připojený e-mail</string>
+    <string name="reader_discover_no_posts_button_text">Sledujte témata</string>
+    <string name="reader_discover_no_posts_subtitle">Zkuste rozšířit vyhledávání podle dalších témat</string>
+    <string name="reader_discover_no_posts_title">Žádné nedávné příspěvky</string>
+    <string name="reader_discover_empty_title">Vítejte!</string>
+    <string name="scan">Prohledat</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; odpověděl na váš příspěvek</string>
+    <string name="login_prologue_third_subtitle_two">Dnes jste na svém webu obdrželi &lt;b&gt;50 lajků&lt;/b&gt;</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; lajkoval váš příspěvek</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Bylo otevřeno rolovací blok menu. Vyberte blok.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Nabídka rolovatelného bloku uzavřena.</string>
+    <string name="hpp_skip_button">Přeskočit</string>
+    <string name="hpp_choose_button">Vybrat</string>
+    <string name="hpp_subtitle">Vyberte si své oblíbené rozvržení domovské stránky. Později jej můžete upravit a přizpůsobit.</string>
+    <string name="hpp_title">Vyberte si design</string>
+    <string name="mlp_network_error_subtitle">Když jste zpět online, klepněte na opakovat nebo pomocí tlačítka níže vytvořte prázdnou stránku.</string>
+    <string name="mlp_network_error_title">Rozložení nejsou k dispozici v režimu offline</string>
+    <string name="mlp_error_subtitle">Klepněte na opakovat nebo vytvořte prázdnou stránku pomocí tlačítka níže.</string>
+    <string name="mlp_error_title">Rozložení nejsou k dispozici kvůli chybě</string>
+    <string name="prepublishing_nudges_add_category_button">Přidat rubriku</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Vytvořit novou rubriku</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorie</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Nenastaveno</string>
+    <string name="prepublishing_nudges_categories_action">Kategorie</string>
+    <string name="login_prologue_fifth_caption_three">Muzea v Londýně</string>
+    <string name="login_prologue_fifth_caption_two">Nejlepší fanoušci světa</string>
+    <string name="login_prologue_fifth_caption_one">Moje top desítka kaváren</string>
+    <string name="login_prologue_fifth_tag_six">Politika</string>
+    <string name="login_prologue_fifth_tag_five">Hudba</string>
+    <string name="login_prologue_fifth_tag_four">Zahradničení</string>
+    <string name="login_prologue_fifth_tag_three">Fotbal</string>
+    <string name="login_prologue_fifth_tag_two">Vaření</string>
+    <string name="login_prologue_fifth_tag_one">Umění</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n \'Roll každý týden</string>
+    <string name="login_prologue_fifth_subtitle_two">Novinky na webu</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Práce fotografa Camerona Karstena mě tak inspirovala. Tyto techniky budu zkoušet při příštím</string>
+    <string name="login_prologue_second_subtitle_one">Inspirovat se</string>
+    <string name="login_prologue_title_fifth">Sledujte své oblíbené weby a objevujte nové blogy.</string>
+    <string name="login_prologue_title_fourth">Sledujte, jak vaše publikum roste pomocí hloubkové analýzy.</string>
+    <string name="login_prologue_title_third">Podívejte se na komentáře a oznámení v reálném čase.</string>
+    <string name="login_prologue_title_second">Díky výkonnému editoru můžete psát příspěvky i na cestách.</string>
+    <string name="login_prologue_title_first">Vítejte v nejpopulárnějším nástroji na tvorbu webových stránek na světě.</string>
+    <string name="media_loading_failed">Načítání média se nezdařilo</string>
+    <string name="reader_discover_recommended_blogs_header">Weby, které je třeba sledovat</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Usilovně pracujeme na přidání dalších bloků s každým vydáním.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' není plně podporován</string>
+    <string name="gutenberg_native_help_button">Tlačítko nápověda</string>
+    <string name="gutenberg_native_edit_using_web_editor">Upravit pomocí webového editoru</string>
+    <string name="gutenberg_native_choose_images">Vyberte obrázky</string>
+    <string name="stories_intro_create_story_post_label">Vytvořit příběhový příspěvek</string>
+    <string name="stories_intro_description_second">Jsou publikovány jako nový blogový příspěvek na vašem webu, takže vašemu publiku nikdy nic neunikne.</string>
+    <string name="stories_intro_title_second">Příběhový příspěvek nezmizí</string>
+    <string name="stories_intro_description_first">Zkombinujte fotografie, videa a text a vytvořte poutavé příběhy příspěvků, na které lze klepnout, které se vašim návštěvníkům budou líbit.</string>
+    <string name="stories_intro_title_first">Nyní jsou příběhy pro každého</string>
+    <string name="stories_intro_image_caption_second">Příklad názvu příběhu</string>
+    <string name="stories_intro_image_caption_first">Jak vytvořit příběhový příspěvek</string>
+    <string name="stories_intro_main_title">Představujeme příběhy</string>
+    <string name="mlp_notice_blank_page_created">Prázdná stránka vytvořena</string>
+    <string name="mlp_notice_page_created">Stránka byla vytvořena</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s byl odepřen přístup k vašim fotkám. Chcete-li to opravit, upravte svá oprávnění a zapněte %2$s a %3$s.</string>
+    <string name="media_insert_failed">Vložení média se nezdařilo.</string>
+    <string name="media_insert_failed_with_reason">Vložení média se nezdařilo: %s</string>
+    <string name="photo_picker_wordpress_media_library">Vyberte si z knihovny médií WordPress</string>
+    <string name="reader_label_toolbar_back">Zpět</string>
+    <string name="reader_discover_empty_button_text">Začínáme</string>
+    <string name="reader_discover_empty_subtitle">Sledujte témata a objevujte nové blogy</string>
+    <string name="reader_post_details_header_by_author_name">Od</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Tento odkazující server nemůže být označen jako spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Zrušit označení jako spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Označit jako spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Otevřít web</string>
+    <string name="media_uploading_gif_library_photo">Nahrávání médií ve formátu GIF</string>
+    <string name="media_uploading_stock_library_photo">Nahrávání skladových médií</string>
+    <string name="media_uploading_default">Nahrávání médií</string>
+    <string name="gutenberg_native_select_item">Vyberte položku</string>
+    <string name="gutenberg_native_search_or_type_url">Vyhledejte nebo zadejte URL</string>
+    <string name="gutenberg_native_add_this_telephone_link">Přidejte tento telefonní odkaz</string>
+    <string name="gutenberg_native_add_this_link">Přidejte tento odkaz</string>
+    <string name="gutenberg_native_add_this_email_link">Přidejte tento e-mailový odkaz</string>
+    <string name="suggestion_no_connection">Žádné internetové připojení.\nNávrhy nejsou k dispozici.</string>
+    <string name="typeface_label_shrikhand">Tučně</string>
+    <string name="typeface_label_space_mono">Moderní</string>
+    <string name="typeface_label_pacifico">Hravý</string>
+    <string name="typeface_label_oswald">Silné</string>
+    <string name="typeface_label_libre_baskerville">Klasický</string>
+    <string name="typeface_label_nunito">Neformální</string>
+    <string name="toast_capture_operation_permission_needed">Abyste mohli nahrávat video, musíte aplikaci udělit oprávnění k nahrávání zvuku</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s vybrat</string>
+    <string name="login_get_link_by_email">Získejte odkaz pro přihlášení e-mailem</string>
+    <string name="email_not_registered_wpcom">Hmm, nemůžeme najít účet WordPress.com připojený k této e-mailové adrese.</string>
+    <string name="permission_microphone">Mikrofon</string>
+    <string name="comment_unable_to_show_error">Tento komentář nelze zobrazit</string>
+    <string name="media_browse_for_items">Vyhledejte položky</string>
+    <string name="reader_menu_report_post">Oznámit tento příspěvek</string>
+    <string name="reader_welcome_banner">Vítejte v aplikaci Reader. Objevte miliony blogů na dosah ruky.</string>
+    <string name="error_media_xmlrcp_server_error">Došlo k interní chybě serveru</string>
+    <string name="error_media_xmlrpc_not_allowed">Vaše akce není povolena</string>
+    <string name="show_n_hidden_items_desc">%1$s více položek</string>
+    <string name="gutenberg_native_select_a_layout">Vyberte rozložení</string>
+    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Poznámka: Rozložení sloupců se může u různých šablon a velikostí obrazovky lišit</string>
+    <string name="create_post_story_fab_tooltip">Vytvořte příspěvek nebo příběh</string>
+    <string name="create_page_fab_tooltip">Vytvořit stránku</string>
+    <string name="create_post_fab_tooltip">Vytvořit příspěvek</string>
+    <string name="reader_discover_interests_header">Možná se vám bude líbit</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Skrýt</string>
+    <string name="gutenberg_native_video_caption_empty">Titulek videa. Prázdný</string>
+    <string name="gutenberg_native_updates_the_title">Aktualizuje název.</string>
+    <string name="gutenberg_native_paste_block_after">Vložte blok za</string>
+    <string name="gutenberg_native_page_title_s">Název stránky. %s</string>
+    <string name="gutenberg_native_page_title_empty">Název stránky. Prázdný</string>
+    <string name="toast_error_playing_video">Při přehrávání videa došlo k chybě</string>
+    <string name="camera_error">Toto zařízení nepodporuje API Camera2.</string>
+    <string name="toast_error_saving_video">Video se nepodařilo uložit</string>
+    <string name="toast_error_saving_image">Chyba při ukládání obrázku</string>
+    <string name="toast_capture_operation_in_progress">Probíhá operace, zkuste to znovu</string>
+    <string name="toast_story_page_not_found">Nepodařilo se najít snímek příběhu</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Zobrazit úložiště</string>
+    <string name="dialog_insufficient_device_storage_error_message">Před publikováním musíme příběh uložit do zařízení. Zkontrolujte své nastavení úložiště a odeberte soubory, abyste uvolnili místo.</string>
+    <string name="dialog_insufficient_device_storage_error_title">Nedostatečné úložiště zařízení</string>
+    <string name="dialog_story_saving_error_message">Opakujte uložení nebo smazání snímků a zkuste svůj příběh znovu publikovat.</string>
+    <string name="dialog_story_saving_error_title_plural">Nelze uložit %1$d snímků</string>
+    <string name="dialog_story_saving_error_title_singular">Nelze uložit 1 snímek</string>
+    <string name="story_saving_failed_quick_action_manage">Spravovat</string>
+    <string name="story_saving_failed_message_plural">%1$d snímků vyžaduje akci</string>
+    <string name="story_saving_failed_message_singular">1 snímek vyžaduje akci</string>
+    <string name="story_saving_failed_title">Nelze nahrát \"%1$s\"</string>
+    <string name="story_saving_snackbar_finished_with_error">Nelze nahrát \"%1$s\"</string>
+    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" zveřejněno</string>
+    <string name="story_saving_snackbar_started">Nahrávám \"%1$s\"…</string>
+    <string name="story_saving_subtitle_frames_remaining_plural">%1$d zbývající snímky</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">Zbývá 1 snímek</string>
+    <string name="story_saving_title_several">několik příběhů</string>
+    <string name="story_saving_title">Ukládání \"%1$s\"…</string>
+    <string name="story_saving_untitled">Nepojmenované</string>
+    <string name="dialog_discard_story_ok_button">Vyřadit</string>
+    <string name="dialog_discard_story_message">Váš příběhový příspěvek nebude uložen jako koncept.</string>
+    <string name="dialog_discard_story_title">Zahodit příspěvek příběhu?</string>
+    <string name="dialog_discard_page_ok_button">Odstranit</string>
+    <string name="dialog_discard_errored_page_message">Tento snímek ještě nebyl uložen. Pokud tento snímek odstraníte, přijdete o všechny provedené úpravy.</string>
+    <string name="dialog_discard_page_message">Tento snímek bude z vašeho příběhu odstraněn.</string>
+    <string name="dialog_discard_page_title">Smazat snímek příběhu?</string>
+    <string name="label_text_color_button">Změnit barvu textu</string>
+    <string name="label_text_alignment_button">Změnit zarovnání textu</string>
+    <string name="label_frame_errored">chybných</string>
+    <string name="label_frame_selected_border">vybráno</string>
+    <string name="label_frame_unselected_border">nevybraný</string>
+    <string name="label_frame_image">Posuvník</string>
+    <string name="label_retry_icon">Zkusit znovu</string>
+    <string name="label_saved_icon">Uloženo</string>
+    <string name="label_close_button">Zavřít</string>
+    <string name="label_share_to">Sdílet s</string>
+    <string name="label_snackbar_share">SDÍLET</string>
+    <string name="label_snackbar_loop_frame_saved">Uloženo do fotek</string>
+    <string name="label_control_retry">Zkusit znovu</string>
+    <string name="label_control_saved">Uloženo</string>
+    <string name="label_control_saving">Ukládání</string>
+    <string name="label_control_flash">Flash</string>
+    <string name="label_control_flip_camera">Překlopit</string>
+    <string name="sound_button_alt">Zvuk</string>
+    <string name="text_button_alt">Text</string>
+    <string name="stickers_button_alt">Samolepky</string>
+    <string name="flash_button_alt">Flash</string>
+    <string name="flip_button_alt">Překlopit fotoaparát</string>
+    <string name="capture_button_alt">Zachytit</string>
+    <string name="mlp_preview_page">Náhled</string>
+    <string name="mlp_create_page">Vytvořit stránku</string>
+    <string name="mlp_create_blank_page">Vytvořit prázdnou stránku</string>
+    <string name="mlp_choose_layout_subtitle">Začněte výběrem z široké škály předem připravených rozvržení stránky. Nebo jen začněte s prázdnou stránkou.</string>
+    <string name="mlp_choose_layout_title">Vyberte rozložení</string>
+    <string name="prepublishing_nudges_story_title_hint">Dejte svému příběhu název</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Vytvořte příspěvek nebo příběh</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Vytvořte příspěvek, stránku nebo příběh</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Klepněte na %1$s Vytvořit. %2$s Poté vyberte &lt;b&gt;Blogový příspěvek&lt;/b&gt;</string>
+    <string name="photo_picker_choose_file">Vyberte si ze zařízení</string>
+    <string name="my_site_bottom_sheet_add_story">Příběhový příspěvek</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">Úpravy ikon webů na webech WordPress, které hostuje sám, vyžadují plugin Jetpack.</string>
+    <string name="reader_toast_err_page_jump_not_found">Nelze najít propojený odkaz na stránku</string>
+    <string name="error_media_quota_exceeded_toast">Soubor nelze nahrát.\nByla překročena kvóta úložiště.</string>
+    <string name="error_media_quota_exceeded">Byla překročena kvóta úložiště</string>
+    <string name="pick_file">Přidat soubor</string>
+    <string name="gutenberg_native_replace_video">Nahradit video</string>
+    <string name="gutenberg_native_replace_image_or_video">Vyměňte obrázek nebo video</string>
+    <string name="gutenberg_native_choose_video">Zvolit video</string>
+    <string name="gutenberg_native_choose_image_or_video">Zvolit obrázek nebo video</string>
+    <string name="gutenberg_native_choose_image">Zvolit obrázek</string>
+    <string name="gutenberg_native_block_removed">Blok odstraněn</string>
+    <string name="enter_your_site_address">Zadejte svou stávající adresu</string>
+    <string name="signup_confirmation_title">Potvrzení registrace</string>
+    <string name="continue_with_google_terms_of_service_text">Pokud budete pokračovat se společností Google a ještě nemáte účet WordPress.com, vytváříte si účet a souhlasíte s našimi %1$sSmluvními podmínkami%2$s..</string>
+    <string name="continue_terms_of_service_text">Pokračováním vyjadřujete souhlas s našimi %1$spodmínkami služby%2$s.</string>
+    <string name="signup_confirmation_message">Tuto e-mailovou adresu použijeme k vytvoření vašeho nového účtu WordPress.com.</string>
+    <string name="signup_magic_link_message">Poslali jsme vám e-mailem odkaz na přihlášení k vytvoření nového účtu WordPress.com. Zkontrolujte svůj e-mail v tomto zařízení a klepněte na odkaz v e-mailu, který obdržíte z WordPress.com.</string>
+    <string name="enter_account_info_for_site">Zadejte informace o svém účtu pro %1$s.</string>
+    <string name="login_or">nebo</string>
+    <string name="continue_google_button_suffix">Pokračovat s Google</string>
+    <string name="login_find_your_site_adress">Najděte adresu svého webu</string>
+    <string name="login_done">Hotovo</string>
+    <string name="magic_link_not_seeing_email_message">Nevidíte e-mail? Zkontrolujte složku spamu nebo nevyžádané pošty.</string>
+    <string name="login_magic_links_sent_label">Zkontrolujte svůj e-mail v tomto zařízení a klepněte na odkaz v e-mailu, který obdržíte z WordPress.com.</string>
+    <string name="login_magic_links_label">Zašleme vám e-mailem odkaz, který vás okamžitě přihlásí, není třeba žádné heslo.</string>
+    <string name="check_email">Zkontrolovat e-mail</string>
+    <string name="get_started">Začínáme</string>
+    <string name="enter_email_to_continue_wordpress_com">Zadejte svou e-mailovou adresu pro přihlášení nebo vytvořte účet WordPress.com.</string>
+    <string name="or_type_your_password">Nebo zadejte své heslo</string>
+    <string name="create_account">Vytvořit účet</string>
+    <string name="send_link_by_email">Odeslat odkaz e-mailem</string>
+    <string name="reset_your_password">Resetovat vaše heslo</string>
+    <string name="reader_error_request_failed_title">Při zpracování požadavku došlo k problému. Prosím zkuste to znovu později.</string>
+    <string name="quick_start_list_update_site_title_title">Zadejte název svého webu</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Klepnutím na &lt;b&gt;%1$s&lt;/b&gt; nastavíte nový název</string>
+    <string name="dialog_confirm_trash_losing_local_changes_message">Vymazáním tohoto příspěvku také zrušíte místní změny. Opravdu chcete pokračovat?</string>
+    <string name="gutenberg_native_s_block_options">%s možnosti bloku</string>
+    <string name="gutenberg_native_duplicate_block">Duplikovat blok</string>
+    <string name="gutenberg_native_copy_block">Kopírovat blok</string>
+    <string name="gutenberg_native_copied_block">Zkopírovaný blok</string>
+    <string name="gutenberg_native_block_pasted">Blok byl vložen</string>
+    <string name="gutenberg_native_block_duplicated">Blok byl zduplikován</string>
+    <string name="gutenberg_native_block_cut">Vyjmout blok</string>
+    <string name="gutenberg_native_block_copied">Blok zkopírován</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">Název webu může změnit pouze uživatel s rolí správce.</string>
+    <string name="my_site_title_changer_dialog_hint">Název webu se zobrazuje v záhlaví webového prohlížeče a u většiny šablon se zobrazuje v záhlaví.</string>
+    <string name="reader_title_tag_preview">Téma</string>
+    <string name="error_update_site_title_network">Název webu se nepodařilo aktualizovat. Zkontrolujte připojení k síti a zkuste to znovu.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Neuložené změny</string>
+    <string name="gutenberg_native_open_link_in_a_browser">Otevřít odkaz v prohlížeči</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Přejde k přizpůsobení přechodu</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Přejde na vlastní výběr barev</string>
+    <string name="gutenberg_native_gradient_type">Typ přechodu</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Dvojitým klepnutím vyberte možnost</string>
+    <string name="gutenberg_native_customize_gradient">Přizpůsobte přechod</string>
+    <string name="pages_list_author">Autor stránky</string>
+    <string name="photo_picker_use_gif">Použít tento GIF</string>
+    <string name="error_media_thumbnail_not_loaded">Nelze načíst miniaturu média</string>
+    <string name="menu_content_info">Struktura obsahu</string>
+    <string name="everyone">Každý</string>
+    <string name="me">Já</string>
+    <string name="gutenberg_native_dismiss">Zamítnout</string>
+    <string name="prepublishing_nudges_home_tags_not_set">Nenastaveno</string>
+    <string name="prepublishing_tags_description">Štítky pomáhají čtenářům říct, o čem je příspěvek.</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Datum publikování</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Přidat štítky</string>
+    <string name="prepublishing_nudges_back_button">Zpět</string>
+    <string name="prepublishing_nudges_home_save_button">Uložit nyní</string>
+    <string name="prepublishing_nudges_home_submit_button">Odeslat nyní</string>
+    <string name="prepublishing_nudges_home_schedule_button">Naplánovat nyní</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Publikování do</string>
+    <string name="prepublishing_nudges_tags_action">Štítky</string>
+    <string name="prepublishing_nudges_publish_action">Datum zveřejnění</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Zrušit</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Přesunout mezi koncepty</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_message">Příspěvky v koši nelze upravovat. Chcete změnit stav tohoto příspěvku na „koncept“, abyste na něm mohli pracovat?</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">Přesunout příspěvek do konceptů?</string>
+    <string name="reader_label_choose_your_interests">Vyberte si svá témata</string>
+    <string name="reader_choose_interests_content_description">Vyberte si svá témata</string>
+    <string name="reader_btn_done">Hotovo</string>
+    <string name="reader_btn_select_few_interests">Chcete-li pokračovat, vyberte několik</string>
+    <string name="post_status_post_published">Publikováno</string>
+    <string name="post_status_post_trashed">Smazáno</string>
+    <string name="post_status_post_scheduled">Naplánováno</string>
+    <string name="publish_date">Datum zveřejnění</string>
+    <string name="ccpa_privacy_notice_read">Přečtěte si oznámení o ochraně osobních údajů CCPA</string>
+    <string name="ccpa_privacy_notice_caption">Kalifornský zákon o ochraně osobních údajů spotřebitelů („CCPA“) vyžaduje, abychom obyvatelům Kalifornie poskytli některé další informace o kategoriích osobních údajů, které shromažďujeme a sdílíme, kde tyto osobní údaje získáváme a jak a proč je používáme.</string>
+    <string name="ccpa_privacy_notice_header">Oznámení o ochraně osobních údajů pro uživatele Kalifornie</string>
+    <string name="status_and_visibility">Stav &amp; Viditelnost</string>
+    <string name="update_now">Aktualizovat nyní</string>
+    <string name="gutenberg_native_open_block_actions_menu">Otevřete nabídku blokovat akce</string>
+    <string name="gutenberg_native_move_to_top">Přesunout nahoru</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Dvojitým klepnutím otevřete spodní list s dostupnými možnostmi</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Dvojitým klepnutím otevřete akční list s dostupnými možnostmi</string>
+    <string name="pages_cannot_be_started">V tuto chvíli nemůžeme otevřít stránky. Prosím zkuste to znovu později</string>
+    <string name="pages_set_as_posts_page">Nastavit jako stránku příspěvků</string>
+    <string name="pages_set_as_homepage">Nastavit jako domovskou stránku</string>
+    <string name="suggestion_invalid">%s není platný %s</string>
+    <string name="site_settings_select_page">Vyberte stránku</string>
+    <string name="site_settings_posts_page">Stránka příspěvků</string>
+    <string name="site_settings_static_homepage">Statická domovská stránka</string>
+    <string name="site_settings_classic_blog">Klasický blog</string>
+    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Vybraná domovská stránka a stránka pro příspěvky nemohou být stejné.</string>
+    <string name="site_settings_failed_update_homepage_settings">Aktualizace nastavení domovské stránky se nezdařila, zkontrolujte připojení k internetu</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Před načtením stránek nelze uložit nastavení domovské stránky</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Nelze uložit nastavení domovské stránky</string>
+    <string name="site_settings_accept_homepage">Příjmout</string>
+    <string name="site_settings_failed_to_load_pages">Načítání stránek se nezdařilo</string>
+    <string name="site_settings_homepage_settings_description">Vyberte si z domovské stránky, která zobrazuje vaše nejnovější příspěvky (klasický blog), nebo pevné / statické stránky.</string>
+    <string name="site_settings_homepage_settings">Nastavení domovské stránky</string>
+    <string name="site_settings_homepage">Domovská stránka</string>
+    <string name="page_posts_page_update_failed">Aktualizace stránky příspěvků se nezdařila</string>
+    <string name="page_posts_page_successfully_updated">Stránka příspěvků byla úspěšně aktualizována</string>
+    <string name="page_homepage_update_failed">Aktualizace domovské stránky se nezdařila</string>
+    <string name="page_homepage_successfully_updated">Domovská stránka byla úspěšně aktualizována</string>
+    <string name="page_cannot_set_posts_page">Chcete-li nastavit stránku Příspěvky, povolte v nastavení webu možnost „Statická domovská stránka“</string>
+    <string name="page_cannot_set_homepage">Chcete-li nastavit domovskou stránku, povolte v nastavení webu možnost „Statická domovská stránka“</string>
+    <string name="gutenberg_native_select_a_color">Zvolit barvu</string>
+    <string name="gutenberg_native_double_tap_to_go_to_color_settings">Dvojitým klepnutím přejdete do nastavení barev</string>
+    <string name="reader_empty_followed_blogs_description">Když sledujete weby, uvidíte jejich obsah zde.</string>
+    <string name="feature_announcement_find_out_mode">Zjistit více</string>
+    <string name="feature_announcement_dialog_label">Co je nového na WordPressu</string>
+    <string name="insert_label_with_count">Vložit %d</string>
+    <string name="crop">oříznutí</string>
+    <string name="error_failed_to_load_into_file">Načtení do souboru se nezdařilo, zkuste to znovu.</string>
+    <string name="preview_image_thumbnail_description">Náhled miniatury obrázku</string>
+    <string name="photo_picker_use_media">Použijte toto médium</string>
+    <string name="photo_picker_use_video">Použijte toto video</string>
+    <string name="photo_picker_photo_or_video_title">Vybrat média</string>
+    <string name="photo_picker_video_title">Zvolit video</string>
+    <string name="site_picker_ask_site_select">Web se nepodařilo vybrat. Prosím zkuste to znovu.</string>
+    <string name="sitepicker_continue_flow">Pokračovat</string>
+    <string name="reader_reblog_error">Reblog se nezdařil</string>
+    <string name="reader_no_site_to_reblog_action">Spravovat weby</string>
+    <string name="reader_no_site_to_reblog_detail">Jakmile vytvoříte web na WordPress.com, můžete přesdílet obsah, který se vám líbí, na svůj vlastní web.</string>
+    <string name="reader_no_site_to_reblog_title">Žádné dostupné weby WordPress.com</string>
+    <string name="whats_new_in_version_title">Co je nového</string>
+    <string name="comment_q_action_copied_url">Adresa odkazu byla zkopírována</string>
+    <string name="copy_link_address">Kopírovat adresu odkazu</string>
+    <string name="comment_share_link_via">Sdílet přes</string>
+    <string name="comment_toast_err_share_intent">Nelze sdílet</string>
+    <string name="button_insert">Vložit</string>
+    <string name="continue_label">Pokračovat</string>
+    <string name="copy_text">Kopírovat</string>
+    <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Přesuňte blok doprava z pozice %1$s do polohy %2$s</string>
+    <string name="gutenberg_native_move_block_right">Přesuňte blok doprava</string>
+    <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Přesuňte blok doleva z pozice %1$s do polohy %2$s</string>
+    <string name="gutenberg_native_move_block_left">Přesuňte blok doleva</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Dvojitým klepnutím přesunete blok doprava</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Dvojitým klepnutím přesunete blok doleva</string>
+    <string name="new_site_creation_creating_site_loading_4">Vytváření řídicího panelu</string>
+    <string name="new_site_creation_creating_site_loading_3">Nastavení šablony</string>
+    <string name="new_site_creation_creating_site_loading_2">Přidávání funkcí webu</string>
+    <string name="new_site_creation_creating_site_loading_1">Získání adresy URL webových stránek</string>
+    <string name="new_site_creation_creating_site_loading_subtitle">Váš web bude brzy připraven</string>
+    <string name="new_site_creation_creating_site_loading_title">Hurá!\nSkoro hotovo</string>
+    <string name="pages_and_posts_cancel_auto_upload">Zrušit nahrávání</string>
+    <string name="gif_list_search_returned_unknown_error">Při zpracování požadavku došlo k problému</string>
+    <string name="gif_powered_by_tenor">Běží na Tenor</string>
+    <string name="gif_picker_search_hint">Hledat Tenor</string>
+    <string name="photo_picker_gif">Vyberte si z nabídky Tenor</string>
+    <string name="weekday_saturday">Sobota</string>
+    <string name="weekday_friday">Pátek</string>
+    <string name="weekday_thursday">Čtvrtek</string>
+    <string name="weekday_wednesday">Středa</string>
+    <string name="weekday_tuesday">Úterý</string>
+    <string name="weekday_monday">Pondělí</string>
+    <string name="weekday_sunday">Neděle</string>
+    <string name="media_accessing_failed">Přístup k obsahu soukromého webu se nezdařil. Některá média nemusí být k dispozici</string>
+    <string name="media_accessing_progress">Přístup k obsahu soukromé stránky</string>
+    <string name="error_failed_to_crop_and_save_image">Oříznutí a uložení obrázku se nezdařilo, zkuste to znovu.</string>
+    <string name="failed_to_load_image_tap_to_retry">Načtení obrázku se nezdařilo.\nProsím, klikněte pro opakování.</string>
+    <string name="preview_image_description">Náhledový obrázek</string>
+    <string name="error_unknown_page_type">Neznámý formát stránky</string>
+    <string name="error_page_not_submitted">Tuto akci jsme nemohli dokončit a tuto stránku jsme neposlali ke kontrole.</string>
+    <string name="error_page_not_scheduled">Tuto akci jsme nemohli dokončit a tuto stránku jsme nenaplánovali.</string>
+    <string name="error_page_not_published_private">Tuto akci jsme nemohli dokončit a tuto soukromou stránku jsme nezveřejnili.</string>
+    <string name="error_page_not_published">Tuto akci jsme nemohli dokončit a tuto stránku jsme nezveřejnili.</string>
+    <string name="error_page_not_submitted_retrying">Tuto stránku jsme nemohli odeslat ke kontrole, ale zkusíme to znovu později.</string>
+    <string name="error_page_not_scheduled_retrying">Tuto stránku jsme nemohli naplánovat, ale zkusíme to znovu později.</string>
+    <string name="error_page_not_published_retrying_private">Tuto soukromou stránku jsme nemohli zveřejnit, ale zkusíme to znovu později.</string>
+    <string name="error_page_not_published_retrying">Tuto stránku jsme nemohli zveřejnit, ale zkusíme to znovu později.</string>
+    <string name="error_media_recover_page_not_submitted">Toto médium jsme nemohli nahrát a tuto stránku jsme neposlali ke kontrole.</string>
+    <string name="error_media_recover_page_not_scheduled">Toto médium jsme nemohli nahrát a tuto stránku jsme nenaplánovali.</string>
+    <string name="error_media_recover_page_not_published_private">Toto médium jsme nemohli nahrát a tuto soukromou stránku jsme nezveřejnili.</string>
+    <string name="error_media_recover_page_not_published">Toto médium jsme nemohli nahrát a stránku jsme nezveřejnili.</string>
+    <string name="page_waiting_for_connection_draft">Váš koncept uložíme, až bude zařízení zpět online.</string>
+    <string name="page_waiting_for_connection_private">Až bude zařízení zpět online, zveřejníme vaši soukromou stránku.</string>
+    <string name="page_waiting_for_connection_scheduled">Naplánujeme vaši stránku, až bude zařízení zpět online.</string>
+    <string name="page_waiting_for_connection_pending">Až bude zařízení znovu online, odešleme vaši stránku ke kontrole.</string>
+    <string name="page_waiting_for_connection_publish">Stránku zveřejníme, až bude zařízení zpět online.</string>
+    <string name="page_queued">Stránka ve frontě</string>
+    <string name="page_uploading">Stránka se nahrává</string>
+    <string name="error_publish_page_no_network">Zařízení je offline. Stránka uložena lokálně.</string>
+    <string name="local_page_autosave_revision_available">Na této stránce jste provedli neuložené změny</string>
+    <string name="editor_uploading_page">Vaše stránka se nahrává</string>
+    <string name="editor_page_saved_locally_failed_media">Příspěvek selhal při nahrávání médií a byl uložen lokálně na zařízení</string>
+    <string name="editor_page_saved_locally">Stránka byla uložena v zařízení</string>
+    <string name="editor_page_saved_online">Stránka uložena online</string>
+    <string name="quickpress_shortcut_activity_label">Vyberte web pro zkrácený odkaz QuickPress</string>
+    <string name="app_theme_default">Nastaveno spořičem baterie</string>
+    <string name="app_theme_dark">Tmavé</string>
+    <string name="app_theme_light">Světlé</string>
+    <string name="app_theme">Vzhled</string>
+    <string name="dialog_confirm_autosave_body_first_part_for_page">Nedávno jste provedli změny na této stránce, ale neuložili jste je. Vyberte verzi, kterou chcete načíst:\n\n\n</string>
+    <string name="gutenberg_native_show_post_content">Zobrazit obsah příspěvku</string>
+    <string name="gutenberg_native_only_show_excerpt">Zobrazit pouze výňatek</string>
+    <string name="gutenberg_native_link_to">Odkaz na</string>
+    <string name="gutenberg_native_link_settings">Nastavení odkazu</string>
+    <string name="gutenberg_native_excerpt_length_words">Délka výňatku (slova)</string>
+    <string name="gutenberg_native_customize">PŘIZPŮSOBIT</string>
+    <string name="gutenberg_native_add_paragraph_block">Přidat blok odstavců</string>
+    <string name="create_post_page_fab_tooltip_contributors">Vytvořit příspěvek</string>
+    <string name="post_list_tab_trashed_posts">Smazané</string>
+    <string name="post_list_tab_scheduled_posts">Naplánováno</string>
+    <string name="post_list_tab_published_posts">Publikováno</string>
+    <string name="sharing_facebook_account_must_have_pages">Připojení k Facebooku nemůže najít žádné stránky. Publicita se nemůže připojit k profilům Facebooku, pouze k publikovaným stránkám.</string>
+    <string name="dialog_title_sharing_facebook_account_must_have_pages">Nepřipojeno</string>
+    <string name="notifications_tab_title_likes">Líbí se</string>
+    <string name="notifications_tab_title_follows">Odběry</string>
+    <string name="notifications_tab_title_comments">Komentáře</string>
+    <string name="notifications_tab_title_unread_notifications">Nepřečteno</string>
+    <string name="dlg_cancel_action_dont_trash">Ponechat</string>
+    <string name="dlg_confirm_action_trash">Odstranit</string>
+    <string name="stats_insights_management_activity">Aktivita</string>
+    <string name="stats_insights_management_posts_and_pages">Příspěvky a Stránky</string>
+    <string name="stats_insights_management_general">Obecné</string>
+    <string name="stats_management_screen_title">Přidat novou kartu</string>
+    <string name="stats_management_add_new_stats_card">Přidejte novou kartu statistik</string>
+    <string name="reader_self_hosted_select_filter">Pomocí tlačítka filtru vyhledejte příspěvky týkající se konkrétních témat</string>
+    <string name="reader_bottom_sheet_content_description">Vyberte značku nebo web, vyskakovací okno</string>
+    <string name="reader_btn_select_filter_content_description">Chcete-li filtrovat příspěvky, vyberte web nebo značku</string>
+    <string name="reader_btn_remove_filter_content_description">Odstraňte aktuální filtr</string>
+    <string name="reader_title_subs">Spravujte témata a weby</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">Přihlásit se k WordPress.com</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Přihlaste se na WordPress.com a podívejte se na nejnovější příspěvky z témat, která sledujete</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Přihlaste se na WordPress.com a podívejte se na nejnovější příspěvky z webů, které sledujete</string>
+    <string name="gutenberg_native_replace_current_block">Vyměňte aktuální blok</string>
+    <string name="gutenberg_native_add_to_end">Přidat na konec</string>
+    <string name="gutenberg_native_add_to_beginning">Přidat na začátek</string>
+    <string name="gutenberg_native_add_block_before">Přidat blok před</string>
+    <string name="gutenberg_native_add_block_after">Přidat blok po</string>
+    <string name="reader_filter_empty_tags_action">Přidejte téma</string>
+    <string name="reader_filter_empty_sites_action">Sledujte web</string>
+    <string name="reader_filter_empty_tags_list">Přidáním tématu můžete sledovat příspěvky na konkrétní téma.</string>
+    <string name="reader_filter_empty_sites_list">Podívejte se na nejnovější příspěvky z webů, které sledujete</string>
+    <string name="reader_filter_main_title">Sleduji</string>
+    <string name="reader_filter_cta">Filtr</string>
+    <string name="gutenberg_native_video_caption_s">Titulek videa. %s</string>
+    <string name="gutenberg_native_edit_video">Upravit video</string>
+    <string name="gutenberg_native_add_a_shortcode">Přidat krátký kód …</string>
+    <string name="post_list_author">Autor příspěvku</string>
+    <string name="fab_create_desc">Vytvořit příspěvek</string>
+    <string name="stats_posting_activity_end_description">Slyšeli jste všechny statistiky za toto období.\n         Opětovným klepnutím se restartuje od začátku.</string>
+    <string name="stats_posting_activity_empty_description">V tomto období nejsou žádné statistiky.</string>
+    <string name="stats_posting_activity_label_content_description">Zveřejňování aktivity pro %1$s</string>
+    <string name="stats_posting_activity_content_description">Dny s %1$s zhlédnutím pro %2$s jsou: %2$s %3$s. Klepnutím zobrazíte další.</string>
+    <string name="stats_posting_activity_action">procházet všechny statistiky pro toto období</string>
+    <string name="stats_box_type_very_high">velmi vysoký</string>
+    <string name="stats_box_type_high">vysoký</string>
+    <string name="stats_box_type_medium">střední</string>
+    <string name="stats_box_type_low">nízký</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
+    <string name="gutenberg_native_gallery_caption_s">Titulek galerie. %s</string>
+    <string name="create_post_page_fab_tooltip">Vytvořte příspěvek nebo stránku</string>
+    <string name="content_description_person_building_website">Web pro budování osob</string>
+    <string name="post_signup_interstitial_not_right_now">Teď ne</string>
+    <string name="post_signup_interstitial_subtitle">Cokoli chcete vytvořit nebo sdílet, pomůžeme vám to udělat tady.</string>
+    <string name="post_signup_interstitial_title">Vítejte ve WordPressu!</string>
+    <string name="stock_media_picker_list_content_description">Knihovna fotek</string>
+    <string name="photo_picker_image_thumbnail_unselected">Obrázek nebyl vybrán</string>
+    <string name="photo_picker_image_selected">,Vybrané</string>
+    <string name="photo_picker_image_thumbnail_selected">Obrázek vybrán</string>
+    <string name="photo_picker_image_thumbnail_content_description">Náhled obrázku</string>
+    <string name="my_site_bottom_sheet_add_post">Blogový příspěvek</string>
+    <string name="my_site_bottom_sheet_title">Přidat nový</string>
+    <string name="post_settings_publish">Publikovat</string>
+    <string name="dialog_confirm_scheduled_post_sync_yes">Nyní synchronizovat</string>
+    <string name="dialog_confirm_scheduled_post_sync_message">Tento příspěvek bude okamžitě synchronizován.</string>
+    <string name="dialog_confirm_scheduled_post_sync_title">Jste připraveni k synchronizaci?</string>
+    <string name="new_site_creation_unavailable_domain">Tato doména není k dispozici</string>
+    <string name="negative_prefix">-%s</string>
+    <string name="login_discovery_error_generic">Nepodařilo se nám získat přístup na váš web. K vyřešení tohoto problému budete muset kontaktovat svého hostitele.</string>
+    <string name="login_discovery_error_ssl">Nepodařilo se nám získat přístup na váš web z důvodu problému s &lt;b&gt;certifikátem SSL&lt;/b&gt;. K vyřešení tohoto problému budete muset kontaktovat svého hostitele.</string>
+    <string name="login_discovery_error_http_auth">Nepodařilo se nám získat přístup na váš web, protože vyžaduje &lt;b&gt;Ověření HTTP&lt;/b&gt;. K vyřešení tohoto problému budete muset kontaktovat svého hostitele.</string>
+    <string name="login_discovery_error_xmlrpc">Nepodařilo se nám získat přístup k &lt;b&gt;souboru XMLRPC&lt;/b&gt; na vašem webu. K vyřešení tohoto problému budete muset kontaktovat svého hostitele.</string>
+    <string name="login_site_credentials_magic_link_label">Téměř tam! Musíme jen ověřit vaši e-mailovou adresu připojenou k Jetpacku &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="enter_credentials_for_site">Přihlaste se pomocí svých přihlašovacích údajů %1$s </string>
+    <string name="my_site_bottom_sheet_add_page">Stránka webu</string>
+    <string name="reader_following_display_name">Sleduji</string>
+    <string name="reader_my_likes_display_name">Líbí se</string>
+    <string name="reader_discover_display_name">Objevujte</string>
+    <string name="reader_save_for_later_display_name">Uložené</string>
+    <string name="reader_filter_tags_title">Témata</string>
+    <string name="reader_filter_sites_title">Weby</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="posts_cannot_be_started">Právě nemůžeme otevřít příspěvky. Prosím zkuste to znovu později</string>
+    <string name="site_cannot_be_loaded">Momentálně nemůžeme načíst data pro váš web. Prosím zkuste to znovu později</string>
+    <string name="gutenberg_native_wordpress_media_library">WordPress knihovna médií</string>
+    <string name="gutenberg_native_unsupported">Nepodporováno</string>
+    <string name="gutenberg_native_ungroup">Rozdělit</string>
+    <string name="gutenberg_native_translate">Přeložit</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">Klepnutím skryjete klávesnici</string>
+    <string name="gutenberg_native_tap_here_to_show_help">Klepnutím sem zobrazíte nápovědu</string>
+    <string name="gutenberg_native_take_a_video">Pořiďte video</string>
+    <string name="gutenberg_native_take_a_photo_or_video">Pořiďte fotografii nebo video</string>
+    <string name="gutenberg_native_take_a_photo">Vyfoť</string>
+    <string name="gutenberg_native_start_writing">Začněte psát…</string>
+    <string name="gutenberg_native_show_section">Zobrazit sekci</string>
+    <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s blok. Tento blok má neplatný obsah</string>
+    <string name="gutenberg_native_s_block_empty">%s blok. Prázdný</string>
+    <string name="gutenberg_native_cut_block">Vyjmout blok</string>
+    <string name="gutenberg_native_problem_opening_the_video">Problém s otevřením videa</string>
+    <string name="gutenberg_native_problem_displaying_block">Blok se zobrazením problému</string>
+    <string name="gutenberg_native_post_title_s">Název příspěvku. %s</string>
+    <string name="gutenberg_native_post_title_empty">Název příspěvku. Prázdný</string>
+    <string name="gutenberg_native_paste_url">Vložit URL</string>
+    <string name="gutenberg_native_page_break_block_s">Blok zalomení stránky. %s</string>
+    <string name="gutenberg_native_open_settings">Otevřít nastavení</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Žádost nedokáže zpracovat tento požadavek. Nainstalujte si prosím webový prohlížeč.</string>
+    <string name="gutenberg_native_navigate_up">Přejděte nahoru</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Přesunout blok nahoru z řádku %1$s do řádku %2$s</string>
+    <string name="gutenberg_native_move_block_up">Posunout blok nahoru</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Přesunout blok dolů z řádku %1$s do řádku %2$s</string>
+    <string name="gutenberg_native_move_block_down">Přesuňte blok dolů</string>
+    <string name="gutenberg_native_image_caption_s">Titulek obrázku. %s</string>
+    <string name="gutenberg_native_hide_keyboard">Skrýt klávesnici</string>
+    <string name="gutenberg_native_help_icon">Ikona nápovědy</string>
+    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Vložení média se nezdařilo .\nKlepněte na nastavení.</string>
+    <string name="gutenberg_native_double_tap_to_undo_last_change">Poslední změnu vrátíte dvojitým klepnutím</string>
+    <string name="gutenberg_native_double_tap_to_toggle_setting">Dvojitým klepnutím přepnete nastavení</string>
+    <string name="gutenberg_native_double_tap_to_select_an_image">Dvojitým klepnutím vyberte obrázek</string>
+    <string name="gutenberg_native_double_tap_to_select_a_video">Dvojitým klepnutím vyberte video</string>
+    <string name="gutenberg_native_double_tap_to_select">Vyberte dvojitým klepnutím</string>
+    <string name="gutenberg_native_double_tap_to_redo_last_change">Poslední změnu provedete dvojitým klepnutím</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_up">Dvojitým klepnutím posunete blok nahoru</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_down">Dvojitým klepnutím přesunete blok dolů</string>
+    <string name="gutenberg_native_double_tap_to_edit_this_value">Tuto hodnotu upravíte dvojitým klepnutím</string>
+    <string name="gutenberg_native_double_tap_to_add_a_block">Dvojitým klepnutím přidáte blok</string>
+    <string name="gutenberg_native_current_value_is_s">Aktuální hodnota je %s</string>
+    <string name="gutenberg_native_choose_from_device">Vyberte si ze zařízení</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Nastala neznámá chyba. Prosím zkuste to znovu.</string>
+    <string name="gutenberg_native_alt_text">Alternativní text</string>
+    <string name="gutenberg_native_add_video">PŘIDAT VIDEO</string>
+    <string name="gutenberg_native_add_url">Přidat URL</string>
+    <string name="gutenberg_native_add_alt_text">Přidejte alternativní text</string>
+    <string name="gutenberg_native_add_image_or_video">PŘIDAT OBRÁZEK NEBO VIDEO</string>
+    <string name="gutenberg_native_add_image">PŘIDAT OBRÁZEK</string>
+    <string name="gutenberg_native_add_block_here">PŘIDAT BLOK TADY</string>
+    <string name="reader_empty_saved_posts_content_description">Klepnutím na tlačítko Přidat k uložení příspěvků uložíte příspěvek do svého seznamu.</string>
+    <string name="reader_acessibility_list_loaded">\"Seznam má načteno %1$d položek.\"</string>
+    <string name="notifications_tab_dialog_switch_desc">Oznámení</string>
+    <string name="main_switch_default_title_off">Vypnuto</string>
+    <string name="main_switch_default_title_on">Zapnuto</string>
+    <string name="notifications_tab_dialog_main_off_message">Vypnutím oznámení pro tento web zakážete zobrazování oznámení na kartě oznámení pro tento web. Po zapnutí oznámení pro tento web můžete doladit, jaký druh oznámení se vám zobrazí.</string>
+    <string name="notifications_tab_dialog_main_off_title">Chcete-li zobrazit oznámení na kartě oznámení pro tento web, zapněte Oznámení pro tento web.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Povolit zobrazení oznámení na kartě oznámení pro tento web</string>
+    <string name="notifications_tab_dialog_main_hint_on">Zakázat zobrazení oznámení na kartě oznámení pro tento web</string>
+    <string name="notifications_tab_dialog_main_status_off">Oznámení pro tento web</string>
+    <string name="notifications_tab_dialog_main_status_on">Oznámení pro tento web</string>
+    <string name="pick_media">Přidat obrázek nebo video</string>
+    <string name="error_post_not_submitted_retrying">We couldn\'t submit this post for review, but we\'ll try again later.</string>
+    <string name="error_post_not_scheduled_retrying">Tento příspěvek jsme nemohli naplánovat, ale zkusíme to znovu později.</string>
+    <string name="error_post_not_published_retrying_private">Tento příspěvek jsme nemohli zveřejnit, ale zkusíme to znovu později.</string>
+    <string name="error_post_not_published_retrying">We couldn\'t publish this post, but we\'ll try again later.</string>
+    <string name="error_post_not_submitted">Tuto akci jsme nemohli dokončit a tento příspěvek jsme neposlali ke kontrole.</string>
+    <string name="error_post_not_scheduled">Tuto akci jsme nemohli dokončit a tento příspěvek jsme nenaplánovali.</string>
+    <string name="error_post_not_published_private">Tuto akci jsme nemohli dokončit a tento soukromý příspěvek jsme nezveřejnili.</string>
+    <string name="error_post_not_published">Tuto akci jsme nemohli dokončit a tento příspěvek jsme nezveřejnili.</string>
+    <string name="error_media_recover_post_not_submitted">Toto médium jsme nemohli nahrát a tento příspěvek jsme neposlali ke kontrole.</string>
+    <string name="error_media_recover_post_not_scheduled">Toto médium jsme nemohli nahrát a tento příspěvek jsme nenaplánovali.</string>
+    <string name="error_media_recover_post_not_published_private">Toto médium jsme nemohli nahrát a tento soukromý příspěvek jsme nezveřejnili.</string>
+    <string name="error_media_recover_post_not_published">Toto médium jsme nemohli nahrát a příspěvek jsme nezveřejnili.</string>
+    <string name="error_media_recover_post">Toto médium se nám nepodařilo nahrát.</string>
+    <string name="error_generic_error_retrying">Tuto akci jsme nemohli dokončit, ale zkusíme to znovu později.</string>
+    <string name="error_generic_error">Tuto akci jsme nemohli dokončit.</string>
+    <string name="error_preview_empty_draft">Nelze zobrazit náhled prázdného konceptu</string>
+    <string name="error_preview_empty_page">Nelze zobrazit náhled prázdné stránky</string>
+    <string name="error_preview_empty_post">Nelze zobrazit náhled prázdného příspěvku</string>
+    <string name="preview_unavailable_self_hosted_sites">Náhled není k dispozici</string>
+    <string name="remote_preview_operation_error">Při pokusu o uložení příspěvku před zobrazením náhledu došlo k chybě</string>
+    <string name="post_preview_remote_auto_saving_post">Generování náhledu…</string>
+    <string name="post_preview_saving_draft">Ukládání…</string>
+    <string name="local_post_autosave_revision_available">V tomto příspěvku jste provedli neuložené změny</string>
+    <string name="dialog_confirm_autosave_dont_restore_button">Verze z této aplikace</string>
+    <string name="dialog_confirm_autosave_restore_button">Verze z jiného zařízení</string>
+    <string name="dialog_confirm_autosave_body_second_part">Z této aplikace\nUloženo na %s\n\nZ jiného zařízení\nUloženo na %s\n</string>
+    <string name="dialog_confirm_autosave_body_first_part">V tomto příspěvku jste nedávno provedli změny, ale neuložili jste je. Vyberte verzi, kterou chcete načíst:\n\n</string>
+    <string name="dialog_confirm_autosave_title">Kterou verzi chcete upravit?</string>
+    <string name="button_delete_permanently">Trvale odstranit</string>
+    <string name="post_waiting_for_connection_draft_cancel">Nebudeme ukládat nejnovější změny vašeho konceptu.</string>
+    <string name="post_waiting_for_connection_scheduled_cancel">Tyto změny nebudeme plánovat.</string>
+    <string name="post_waiting_for_connection_pending_cancel">Tyto změny nebudeme odesílat ke kontrole.</string>
+    <string name="post_waiting_for_connection_publish_cancel">Tyto změny nebudeme publikovat.</string>
+    <string name="post_waiting_for_connection_draft">Váš koncept uložíme, až bude zařízení zpět online.</string>
+    <string name="post_waiting_for_connection_private">Až bude zařízení zpět online, zveřejníme váš soukromý příspěvek.</string>
+    <string name="post_waiting_for_connection_scheduled">Naplánujeme váš příspěvek, až bude zařízení zpět online.</string>
+    <string name="post_waiting_for_connection_pending">Až bude zařízení zpět online, odešleme váš příspěvek ke kontrole.</string>
+    <string name="post_waiting_for_connection_publish">Příspěvek zveřejníme, až bude zařízení zpět online.</string>
+    <string name="settings_username_changer_snackbar_cancel">Tuto akci nelze zrušit. Uživatelské jméno již mohlo být aktualizováno.</string>
+    <string name="settings_username_changer_toast_content">Vaše nové uživatelské jméno je %1$s</string>
+    <string name="settings_username_changer_progress_dialog">Ukládání uživatelského jména…</string>
+    <string name="settings_username_changer_confirm_dialog_positive_action">Změnit uživatelské jméno</string>
+    <string name="settings_username_changer_confirm_dialog_content">Měníte své uživatelské jméno na %1$s%2$s%3$s. Změna vašeho uživatelského jména také ovlivní váš profil Gravatar a adresy profilu Intense Debate. Chcete-li pokračovat, potvrďte své nové uživatelské jméno.</string>
+    <string name="settings_username_changer_confirm_dialog_title">Opatrně!</string>
+    <string name="settings_username_changer_header">Chystáte se změnit své uživatelské jméno, které je aktuálně %1$s%2$s%3$s. Vaše uživatelské jméno již nebudete moci změnit zpět.</string>
+    <string name="site_settings_jetpack_performance_settings_hint">Zobrazte a změňte nastavení výkonu Jetpack</string>
+    <string name="site_settings_performance_and_speed">Výkon a rychlost</string>
+    <string name="site_settings_more">Více</string>
+    <string name="site_settings_improved_search_summary">Nahraďte integrované vyhledávání WordPress vylepšeným vyhledáváním</string>
+    <string name="site_settings_improved_search">Vylepšené vyhledávání</string>
+    <string name="site_settings_jetpack_search">Jetpack vyhledávání</string>
+    <string name="site_settings_ad_free_video_hosting">Hosting videa bez reklam</string>
+    <string name="site_settings_media">Média</string>
+    <string name="site_settings_site_accelerator_summary">Načtěte stránky rychleji povolením Jetpack optimalizovat vaše obrázky a statické soubory (jako CSS a JavaScript).</string>
+    <string name="site_settings_faster_static_files">Rychlejší statické soubory</string>
+    <string name="site_settings_faster_images">Rychlejší obrázky</string>
+    <string name="site_settings_site_accelerator_off">Vypnuto</string>
+    <string name="site_settings_site_accelerator_on">Zapnout</string>
+    <string name="site_settings_site_accelerator">Akcelerátor stránek</string>
+    <string name="site_settings_lazy_load_images_summary">Zvyšte rychlost svého webu pouze načítáním obrázků viditelných na obrazovce.</string>
+    <string name="site_settings_performance">Výkon</string>
+    <string name="stats_file_downloads_value_label">Stahování</string>
+    <string name="stats_file_downloads_title_label">Soubor</string>
+    <string name="stats_file_downloads">Stahování souborů</string>
+    <string name="stats_data_not_recorded_for_period">Statistiky stahování souborů nebyly zaznamenány před 28. červnem 2019.</string>
+    <string name="stats_site_negative_utc">Časová zóna stránek (UTC - %s)</string>
+    <string name="stats_site_positive_utc">Časová zóna stránek (UTC + %s)</string>
+    <string name="stats_site_neutral_utc">Časová zóna stránek (UTC)</string>
+    <string name="web_preview_desktop">Počítač</string>
+    <string name="web_preview_default">Výchozí</string>
+    <string name="close_dialog_button_desc">Zavřít dialogové okno</string>
+    <string name="preview_type_desc">Vyberte typ náhledu</string>
+    <string name="share_desc">Sdílet</string>
+    <string name="navigate_back_desc">Jít zpět</string>
+    <string name="navigate_forward_desc">Jít vpřed</string>
+    <string name="calendar_scheduled_post_description">Publikování \"%s\" je naplánováno na \"%s\" ve vaší aplikaci WordPress \"%s\"</string>
+    <string name="calendar_scheduled_post_title">Naplánovaný příspěvek WordPress: \"%s\"</string>
+    <string name="notification_post_will_be_published_in_ten_minutes">\"%s\" bude publikován za 10 minut</string>
+    <string name="notification_post_will_be_published_in_one_hour">\"%s\" budou zveřejněny za 1 hodinu</string>
+    <string name="notification_post_has_been_published">\"%s\" byl publikován</string>
+    <string name="notification_scheduled_post_ten_minute_reminder">Naplánovaný příspěvek: 10 minutové připomenutí</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Naplánovaný příspěvek: 1 hodina připomenutí</string>
+    <string name="notification_scheduled_post">Naplánovaný příspěvek</string>
+    <string name="post_notification_error">Nelze vytvořit oznámení, pokud je datum publikování v minulosti.</string>
+    <string name="post_notification_when_published">Při zveřejnění</string>
+    <string name="post_notification_ten_minutes_before">Před 10 minutami</string>
+    <string name="post_notification_one_hour_before">Před hodinou</string>
+    <string name="post_notification_off">Off</string>
+    <string name="post_settings_add_to_calendar">Přidat do kalendáře</string>
+    <string name="post_settings_notification">Oznámení</string>
+    <string name="post_settings_time_and_date">Datum a čas</string>
+    <string name="login_invalid_site_url">Zadejte úplnou adresu webu, například example.com.</string>
+    <string name="enter_email_for_site">Přihlaste se přes WordPress.com a připojte se k %1$s</string>
+    <string name="stats_post_views_label">Zobrazení</string>
+    <string name="stats_post_label">Příspěvek</string>
+    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
+    <string name="stats_item_collapsed">Položka byla sbalena</string>
+    <string name="stats_item_expanded">Položka byla rozbalena</string>
+    <string name="stats_collapse_content_description">Sbalit</string>
+    <string name="stats_expand_content_description">Rozbalit</string>
+    <string name="stats_graph_updated">Graf aktualizován.</string>
+    <string name="stats_overview_content_description">%1$s %2$s pro období: %3$s, změna z předchozího období - %4$s</string>
+    <string name="stats_loading_card">Načítání vybraných údajů o kartě</string>
+    <string name="site_settings_editor">Editor</string>
+    <string name="description_expand">Rozšířit</string>
+    <string name="description_collapse">Kolaps</string>
+    <string name="my_site_verify_your_email_without_email">Ověřte svou e-mailovou adresu - pokyny zaslané na váš e-mail</string>
+    <string name="my_site_verify_your_email">Ověřte svou e-mailovou adresu - pokyny zaslané na %s</string>
+    <string name="link_dialog_button_cancel">Zrušit</string>
+    <string name="link_dialog_button_ok">Ok</string>
+    <string name="link_dialog_edit_hint">http(s)://</string>
+    <string name="link_dialog_button_remove_link">Odebrat odkaz</string>
+    <string name="link_dialog_title">Vložte odkaz</string>
+    <string name="post_settings_retry_featured_image">Opakujte nahrávání</string>
+    <string name="post_settings_featured_image_uploading_tap_for_options">Nahrávání médií.\nMožnosti zobrazíte klepnutím.</string>
+    <string name="link_open_new_window">Otevřít odkaz v novém okně/záložce</string>
+    <string name="stats_widget_error_no_access_token">Chcete-li zobrazit své statistiky, přihlaste se k účtu WordPress.com.</string>
+    <string name="post_list_search_nothing_found">Vyhledávání neodpovídají žádné příspěvky</string>
+    <string name="post_list_search_prompt">Hledat příspěvky</string>
+    <string name="domains_suggestions_intro_description">Toto je místo, kde vás lidé najdou na internetu</string>
+    <string name="domains_suggestions_intro_title">Vyberte si prémiový název domény</string>
+    <string name="my_site_custom_domain_name">Všechny plány WordPress.com obsahují vlastní název domény. Zaregistrujte si zdarma svou prémiovou doménu hned teď.</string>
+    <string name="stats_widget_minified_name">Na první pohled</string>
+    <string name="stats_widget_today_insights_name">Dnes</string>
+    <string name="stats_widget_all_time_insights_name">Pořád</string>
+    <string name="stats_widget_weekly_views_name">Pohledy tento týden</string>
+    <string name="stats_widget_log_in_message">Chcete-li přidat widget, přihlaste se do aplikace WordPress.</string>
+    <string name="stats_widget_error_no_network">Síť není dostupná</string>
+    <string name="stats_widget_error_no_data">Nelze načíst data</string>
+    <string name="stats_widget_select_type">Typ</string>
+    <string name="stats_widget_select_color">Barva</string>
+    <string name="stats_widget_select_your_site">Vyberte svůj web</string>
+    <string name="stats_widget_color_dark">Tmavé</string>
+    <string name="stats_widget_color_light">Světlé</string>
+    <string name="stats_widget_color">Barevné</string>
+    <string name="stats_widget_site_caption">Vyberte svůj web</string>
+    <string name="stats_widget_site">Stránka</string>
+    <string name="stats_widget_all_time_title">Pořád</string>
+    <string name="stats_widget_views_title">Zobrazení tento týden</string>
+    <string name="stats_widget_add">Přidat widget</string>
+    <string name="plugin_fetching_error_after_at">Obnovení podrobností o pluginu trvá déle než obvykle. Zkontrolujte to znovu později.</string>
+    <string name="plugin_install_site_ineligible_default_error">Pokud jste právě zaregistrovali doménové jméno, počkejte prosím, dokud jej nedokončíme a zkuste to znovu.\n\nPokud ne, vypadá to, že se něco pokazilo a funkce pluginu nemusí být pro tento web k dispozici.</string>
+    <string name="domain_contact_information_state_not_available_hint">Stav (není k dispozici)</string>
+    <string name="domain_registration_privacy_protection_tos">Registrací této domény souhlasíte s našimi %1$spodmínkami%2$s</string>
+    <string name="error_network_connection">Zkontrolujte připojení k síti a zkuste to znovu.</string>
+    <string name="error_browser_no_network">Tuto stránku teď nelze načíst.</string>
+    <string name="error_disabled_apis">Nastavení se nepodařilo načíst: Některá rozhraní API nejsou pro tuto kombinaci aplikace ID a OAuth aplikace k dispozici.</string>
+    <string name="jetpack_connection_terms_and_conditions">Nastavením Jetpack souhlasíte s našimi %1$spodmínkami%2$s</string>
+    <string name="site_settings_disconnected_toast">Žádné připojení. Úpravy jsou zakázány.</string>
+    <string name="site_settings_update_password_message">Chcete-li aplikaci znovu připojit k vašemu hostitelskému webu, zde zadejte nové heslo.</string>
+    <string name="site_settings_password_updated">Heslo bylo aktualizováno</string>
+    <string name="site_settings_password_dialog_title">Aktualizovat heslo</string>
+    <string name="domain_registration_registering_domain_name_progress_dialog_message">Registrace názvu domény…</string>
     <string name="domain_registration_state_picker_dialog_title">Vybrat stát</string>
     <string name="domain_registration_country_picker_dialog_title">Vybrat zemi</string>
     <string name="domain_registration_result_continue_button">Další</string>
+    <string name="domain_registration_result_description">nastavuje se vaše nová doména &lt;b&gt;%s&lt;/b&gt;. Váš web bude\n         dělat kotrmelce vzrušením!</string>
     <string name="domain_registration_result_title">Gratulace!</string>
     <string name="domain_contact_information_register_domain_button">Registrovat doménu</string>
     <string name="domain_contact_information_postal_code_hint">PSČ</string>
@@ -24,10 +1083,54 @@ Language: cs_CZ
     <string name="domain_contact_information_country_code_hint">Předvolba země</string>
     <string name="domain_contact_information_phone_number_hint">Telefon</string>
     <string name="domain_contact_information_organization_hint">Organizace (volitelné)</string>
+    <string name="domain_contact_information_description">Pro vaše pohodlí jsme předvyplnili vaše kontaktní informace na WordPress.com. Zkontrolujte prosím, zda jsou to správné informace, které chcete pro tuto doménu použít.</string>
+    <string name="domain_contact_information_title">Kontaktní údaje domény</string>
+    <string name="domain_privacy_option_off_title">Zaregistrujte se veřejně</string>
+    <string name="domain_privacy_option_on_title">Zaregistrujte se soukromě s ochranou soukromí</string>
+    <string name="domain_registration_privacy_protection_description">Vlastníci domén musí sdílet kontaktní informace ve veřejné databázi všech domén. Díky ochraně soukromí zveřejňujeme namísto vašich vlastních vlastních informací a soukromě vám předáváme veškerou komunikaci.</string>
+    <string name="domain_registration_privacy_protection_title">Ochrana soukromí</string>
+    <string name="domain_registration_contact_form_input_error">Zadejte platné %s</string>
+    <string name="domains_suggestions_choose_domain">Vyberte doménu</string>
     <string name="stats_management_new">Nový</string>
     <string name="stats_management_dismiss_insights_news_card">Skrýt</string>
     <string name="stats_management_try_it_now">Vyzkoušet</string>
+    <string name="stats_management_news_card_message">Vyberte, jaké statistiky chcete zobrazit, a zaměřte se na data, na kterých vám nejvíce záleží. Klepnutím na %1$s ve spodní části Statistik můžete upravit své statistiky.</string>
+    <string name="stats_manage_your_stats">Spravujte své statistiky</string>
+    <string name="history_fetching_revisions">Načítání revizí …</string>
+    <string name="editor_failed_to_insert_media_tap_to_retry">Vložení média se nezdařilo.\nProsím, klikněte pro opakování.</string>
+    <string name="editor_uploading_draft">Váš koncept se nahrává</string>
+    <string name="post_uploading_draft">Nahrávám koncept</string>
     <string name="post_list_tab_drafts">Koncepty</string>
+    <string name="error_restoring_post">Při obnovování příspěvku došlo k chybě</string>
+    <string name="backdated_for">Zpětné pro: %s</string>
+    <string name="stats_insights_management_title">Zobrazují se pouze nejrelevantnější statistiky. Níže přidejte a uspořádejte své statistiky.</string>
+    <string name="stats_insights_social">Sociální</string>
+    <string name="stats_insights_annual_site_stats">Roční statistiky stránek</string>
+    <string name="stats_view_follower_totals">Odběratelé celkem</string>
+    <string name="domain_suggestions_fetch_error">Návrhy domén nelze načíst</string>
+    <string name="domain_suggestions_search_hint">Napište klíčové slovo pro více nápadů</string>
+    <string name="domains_suggestions_empty_list">Nebyly nalezeny žádné návrhy</string>
+    <string name="register_domain">Registrovat doménu</string>
+    <string name="jetpack_installed_message">Nyní, když je nainstalován Jetpack, musíme vás ho nechat nastavit. Bude to trvat jen minutu.</string>
+    <string name="stats_menu_remove">Odebrat z přehledů</string>
+    <string name="stats_menu_move_down">Posunout dolů</string>
+    <string name="stats_menu_move_up">Posunout nahoru</string>
+    <string name="stats_item_settings">Nastavení položky statistiky</string>
+    <string name="post_moving_to_draft">Příspěvek se přesouvá do konceptu</string>
+    <string name="post_restoring">Příspěvek se obnovuje</string>
+    <string name="post_restored">Příspěvek byl obnoven</string>
+    <string name="post_trashing">Příspěvek je přesunut do koše</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">Vymazáním tohoto příspěvku také zrušíte neuložené změny. Opravdu chcete pokračovat?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Místní změny</string>
+    <string name="button_move_to_draft">Přesunout do konceptu</string>
+    <string name="post_list_toggle_item_layout_list_view">Přepnout na zobrazení seznamu</string>
+    <string name="post_list_toggle_item_layout_cards_view">Přepnout do zobrazení karet</string>
+    <string name="posts_trashed_empty">Nemáte žádné příspěvky v koši</string>
+    <string name="posts_draft_empty">Nemáte žádné koncepční příspěvky</string>
+    <string name="posts_scheduled_empty">Zatím nemáte žádné naplánované příspěvky</string>
+    <string name="posts_published_empty">Zatím jste nepublikovali žádné příspěvky.</string>
+    <string name="notification_wpcom_username_needed">Přihlaste se prosím pomocí svého uživatelského jména a hesla.</string>
+    <string name="error_user_username_instead_of_email">Přihlaste se prosím pomocí svého uživatelského jména WordPress.com místo vaší e-mailové adresy.</string>
     <string name="stats_insights_average_words">Průměr slov/příspěvek</string>
     <string name="stats_insights_total_words">Celkem slov</string>
     <string name="stats_insights_average_likes">Průměr to se mi líbí/příspěvek</string>
@@ -37,7 +1140,11 @@ Language: cs_CZ
     <string name="stats_insights_posts">Příspěvky</string>
     <string name="stats_insights_year">Rok</string>
     <string name="stats_insights_this_year_site_stats">Tento rok</string>
+    <string name="no_site_error">Web na této adrese není web WordPress. Abychom se k němu mohli připojit, musí web používat WordPress.</string>
+    <string name="plugin_check_domain_credit_error">Nepodařilo se zkontrolovat dostupné kredity domény</string>
+    <string name="plugin_check_domain_credits_progress_dialog_message">Kontrola kreditů domény</string>
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Registrace domény</string>
+    <string name="plugin_install_custom_domain_required_dialog_message">Chcete-li nainstalovat pluginy, musíte mít k vašemu webu přidruženou vlastní doménu.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Instalovat plugin</string>
     <string name="new_site_creation_preview_subtitle">Později budete moci přizpůsobit zobrazení a vzhled svých stránek</string>
     <string name="publish_on">Publikovat na: %s</string>
@@ -66,17 +1173,89 @@ Language: cs_CZ
     <string name="stats_fewer_posts">Méně příspěvků</string>
     <string name="new_site_creation_preview_back_pressed_warning">Můžete ztratit svůj pokrok. Opravdu chcete skončit?</string>
     <string name="plans_loading_error_with_cache_button">Zobrazit plány stejně</string>
+    <string name="plans_loading_error_with_cache_subtitle">K zobrazení plánů je vyžadováno připojení k internetu, takže podrobnosti mohou být zastaralé.</string>
+    <string name="plans_loading_error_no_cache_subtitle">K prohlížení plánů je vyžadováno připojení k internetu.</string>
+    <string name="plans_loading_error_no_plans_subtitle">V tuto chvíli nemůžeme načíst plány. Prosím zkuste to znovu později.</string>
+    <string name="plans_loading_error_no_plans_title">Nelze načíst plány</string>
+    <string name="plans_loading_error_network_title">Bez připojení</string>
+    <string name="menu_switch_to_gutenberg_editor">Přepnout na blokový editor</string>
+    <string name="stats_loading_block_error">Při načítání dat došlo k potížím. Obnovte stránku a zkuste to znovu.</string>
+    <string name="stats_loading_error">Data nebyla načtena</string>
+    <string name="site_settings_gutenberg_default_for_new_posts_summary">Upravujte nové příspěvky a stránky pomocí editoru bloků.</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Použijte Editor bloků</string>
     <string name="exit">exit</string>
+    <string name="quick_start_sites_type_subtitle">%1$d z %2$d dokončeno</string>
+    <string name="quick_start_sites_type_grow">Rozšiřte své publikum</string>
+    <string name="quick_start_sites_type_customize">Přizpůsobte si svůj web</string>
+    <string name="quick_start_sites">Další kroky</string>
+    <string name="quick_start_complete_tasks_header">Kompletní (%d)</string>
+    <string name="quick_start_dialog_view_site_message">Užijte si svůj hotový výrobek!</string>
+    <string name="quick_start_dialog_upload_icon_title">Nahrát ikonu webu</string>
+    <string name="quick_start_dialog_upload_icon_message">Návštěvníci uvidí vaši ikonu ve svém prohlížeči. Přidejte vlastní ikonu pro vyleštěný profesionální vzhled.</string>
+    <string name="quick_start_dialog_explore_plans_message_short">Klepnutím na plán %1$s %2$s zobrazíte aktuální plán a další dostupné plány</string>
+    <string name="quick_start_dialog_check_stats_message_short">Klepnutím na %1$s Statistiky %2$s zobrazíte výkon svého webu.</string>
+    <string name="quick_start_dialog_upload_site_icon_message_short">Klepnutím na ikonu %1$s vašeho webu %2$s nahrajte novou</string>
+    <string name="quick_start_dialog_publish_post_message">Navrhněte a publikujte svůj první příspěvek.</string>
+    <string name="quick_start_dialog_need_help_message">Provedeme vás základy budování a rozšiřování vašeho webu</string>
+    <string name="quick_start_dialog_migration_title">Ve vašem kontrolním seznamu jsme provedli několik změn</string>
+    <string name="quick_start_dialog_migration_message">Přidali jsme další úkoly, abychom vám pomohli rozšířit publikum.</string>
+    <string name="quick_start_dialog_explore_plans_title">Prozkoumejte plány</string>
+    <string name="quick_start_dialog_explore_plans_message">Zjistěte více o marketingových a SEO nástrojích v našich placených plánech.</string>
+    <string name="quick_start_dialog_enable_sharing_title">Povolit sdílení příspěvků</string>
+    <string name="quick_start_dialog_enable_sharing_message">Automaticky sdílejte nové příspěvky se svými účty sociálních médií.</string>
+    <string name="quick_start_dialog_check_stats_title">Zkontrolujte statistiky svého webu</string>
+    <string name="quick_start_dialog_check_stats_message">Mějte aktuální informace o výkonu svého webu.</string>
+    <string name="quick_start_dialog_remove_next_steps_message">Odebráním dalších kroků skryjete všechny prohlídky na tomto webu. Tuto akci nelze vrátit zpět.</string>
+    <string name="quick_start_dialog_remove_next_steps_title">Odebrat další kroky</string>
+    <string name="quick_start_remove_next_steps_menu_title">Odebrat toto</string>
+    <string name="quick_start_complete_view_subtitle">Gratulujeme k dokončení vašeho seznamu. Dobře odvedená práce.</string>
+    <string name="quick_start_complete_view_title">Všechny úkoly jsou dokončeny!</string>
+    <string name="quick_start_task_skip_menu_title">Přeskočit úkol</string>
+    <string name="quick_start_completed_tasks_header_chevron_collapse_desc">sbalit</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">rozbalit</string>
+    <string name="notification_channel_reminder_title">Připomenutí</string>
+    <string name="stats_select_next_period_description">Vyberte další období</string>
+    <string name="stats_select_previous_period_description">Vyberte předchozí období</string>
+    <string name="stats_most_popular_percent_views">%1$d%% shlédnutí</string>
+    <string name="stats_insights_popular">Nejoblíbenější čas</string>
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
+    <string name="new_site_creation_site_preview_content_description">Zobrazuje se náhled webu</string>
     <string name="new_site_creation_clear_all_content_description">Vyčistit</string>
+    <string name="site_created_but_not_fetched_snackbar_message">Vypadá to, že máte pomalé připojení. Pokud svůj nový web v seznamu nevidíte, zkuste to obnovit.</string>
+    <string name="cancel_new_site_wizard_content_description">Zrušte průvodce vytvořením webu</string>
+    <string name="notification_new_site_creation_creating_site_subtitle">Vytváříme nové stránky.</string>
+    <string name="notification_new_site_creation_failed">Vyskytl se problém</string>
     <string name="notification_new_site_creation_title">Vytvořit stránku</string>
     <string name="new_site_creation_create_site_button">Vytvořit stránku</string>
-    <string name="new_site_creation_search_domain_input_hint">Prohledat domény</string>
+    <string name="new_site_creation_domain_header_subtitle">Toto je místo, kde vás lidé najdou na internetu</string>
+    <string name="new_site_creation_empty_domain_list_message">Žádné adresy, které odpovídají vašemu vyhledávání, nejsou k dispozici</string>
+    <string name="site_creation_error_generic_subtitle">Chyba při komunikaci se serverem, zkuste to znovu</string>
+    <string name="site_creation_error_generic_title">Vyskytl se problém</string>
+    <string name="site_creation_fetch_suggestions_error_unknown">Vyskytl se problém</string>
+    <string name="new_site_creation_preview_title">Váš web byl vytvořen!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d z %2$d</string>
     <string name="new_site_creation_screen_title_general">Vytvořit webovou stránku</string>
+    <string name="suggestions_updated_content_description">Návrhy aktualizovány</string>
+    <string name="site_picker_failed_selecting_added_site">Nelze vybrat nově přidaný web s vlastním hostitelem.</string>
+    <string name="local_post_is_conflicted">Konflikt verzí</string>
+    <string name="preference_crash_reports_summary">Povolte automatické zprávy o selhání, které nám pomohou zlepšit výkon aplikace.</string>
+    <string name="preference_crash_reports">Crash zprávy</string>
+    <string name="snackbar_conflict_undo">Vrátit</string>
+    <string name="snackbar_conflict_web_version_discarded">Webová verze zahozena</string>
+    <string name="snackbar_conflict_local_version_discarded">Místní verze zahozena</string>
+    <string name="toast_conflict_updating_post">Aktualizace příspěvku</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Zahodit web</string>
+    <string name="dialog_confirm_load_remote_post_discard_local">Zahodit místní</string>
+    <string name="dialog_confirm_load_remote_post_body_2">Místní\nUloženo na %s\n\nWeb\nUloženo na %s\n</string>
+    <string name="dialog_confirm_load_remote_post_body">Tento příspěvek má dvě verze, které jsou v konfliktu. Vyberte verzi, kterou chcete zahodit.\n\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Vyřešte konflikt synchronizace</string>
+    <string name="stats_no_data_for_period">Pro toto období nejsou k dispozici žádné údaje</string>
     <string name="preference_strip_image_location">Odstranit polohu z médií</string>
+    <string name="stats_cannot_be_started">Statistiku v tuto chvíli nemůžeme otevřít. Prosím zkuste to znovu později</string>
+    <string name="gif_picker_endless_scroll_network_error">Některá média se nepodařilo načíst kvůli chybě sítě.</string>
+    <string name="gif_picker_empty_search_list">Vašemu vyhledávání neodpovídají žádná média</string>
+    <string name="gif_picker_initial_empty_text">Vyhledejte GIF a přidejte jej do knihovny médií!</string>
     <string name="stats_author_views_label">Zobrazení</string>
     <string name="stats_author_label">Autor</string>
     <string name="stats_authors">Autoři</string>
@@ -105,6 +1284,9 @@ Language: cs_CZ
     <string name="stats_insights_view_more">Zobrazit více</string>
     <string name="stats_insights_share_post">Sdílet příspěvek</string>
     <string name="stats_insights_create_post">Vytvořit příspěvek</string>
+    <string name="stats_insights_latest_post_message">Bylo to %1$s od %2$s publikován. Zde je návod, jak byl příspěvek doposud upravován…</string>
+    <string name="stats_insights_latest_post_with_no_engagement">Od zveřejnění %2$s s uplynulo %1$s. Zvyšte počet zobrazení příspěvku tím, že ho budete sdílet:</string>
+    <string name="stats_insights_latest_post_empty">Dosud jste nezveřejnili žádné příspěvky. Jakmile začnete publikovat, zobrazí se zde souhrn nejnovějších příspěvků.</string>
     <string name="stats_insights_tags_and_categories">Štítky a Rubriky</string>
     <string name="stats_insights_all_time_stats">Pořád</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
@@ -123,13 +1305,15 @@ Language: cs_CZ
     <string name="stats_follower_since_label">Od té doby</string>
     <string name="stats_follower_label">Fanoušek</string>
     <string name="stats_followers_count_message">Celkem %1$s fanoušků: %2$s</string>
-    <string name="stats_followers_email">Email</string>
+    <string name="stats_followers_email">E-mail</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_manage_insights">Správa přehledů</string>
+    <string name="stats_empty_insights_title">Zatím nebyly přidány žádné statistiky</string>
     <string name="stats_no_data_yet">Zatím žádná data</string>
     <string name="menu_debug">Debug Menu</string>
     <string name="change_password_dialog_message">Změna hesla…</string>
     <string name="change_password_dialog_hint">Heslo musí mít alespoň 6 znaků. Pro zvýšení bezpečnosti použijte kombinaci malých a velkých písmen a speciálních znaků ! \" ? $ % ^ &amp; ).</string>
+    <string name="change_password_confirmation">Heslo bylo úspěšně změněno</string>
     <string name="change_password">Změnit heslo</string>
     <string name="support_identity_input_dialog_name_label">Jméno</string>
     <string name="history_no_title">(žádný název)</string>
@@ -189,6 +1373,7 @@ Language: cs_CZ
     <string name="set_parent">Nastavit nadřazenou stránku</string>
     <string name="quick_start_focus_point_description">kliknout zde</string>
     <string name="quick_start_list_create_site_title">Vytvořit stránku</string>
+    <string name="quick_start_list_create_site_subtitle">Zprovozněte svůj web</string>
     <string name="quick_start_dialog_view_site_title">Zobrazit stránku</string>
     <string name="quick_start_dialog_view_site_message_short">Klikněte na %1$s Zobrazit web %2$s pro zobrazení náhledu.</string>
     <string name="quick_start_dialog_share_site_title">Sdílení stránky</string>
@@ -202,25 +1387,25 @@ Language: cs_CZ
     <string name="quick_start_dialog_need_help_button_neutral">Nikdy</string>
     <string name="quick_start_dialog_need_help_button_negative">Ne</string>
     <string name="quick_start_dialog_follow_sites_title">Sledujte další stránky</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Klikněte na %1$s Prohledat %2$s pro nalezení stránek s podobným zaměřením</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Klikněte na %1$s Prohledat %2$s pro nalezení stránek s podobnými tématy</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Klikněte na %1$s Čtečka %2$s</string>
     <string name="quick_start_dialog_follow_sites_message">Přidáním stránky do sledovaných budete vždy vědět o nových příspěvcích.</string>
-    <string name="quick_start_dialog_customize_site_title">Přizpůsobte si stránku</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Klikněte na %1$s Šablony %2$s</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Klikněte na %1$s Přizpůsobit %2$s</string>
-    <string name="quick_start_dialog_choose_theme_title">Volba šablony</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Klikněte na %1$s Šablony %2$s a prozkoumejte možnosti </string>
-    <string name="quick_start_dialog_choose_theme_message">Prozkoumejte seznam šablon a nejděte tu co se hodí nejvíce.</string>
     <string name="quick_start_button_positive">Go</string>
     <string name="quick_start_button_negative_short">Zrušit</string>
     <string name="quick_start_button_negative">Né teď</string>
     <string name="content_description_more">Hotovo</string>
+    <string name="my_site_create_new_site_title">Nemáte žádné stránky</string>
     <string name="reader_empty_followed_tags_title">Žádné sledované štítky</string>
+    <string name="reader_empty_followed_tags_subtitle">Sem přidejte témata a vyhledejte příspěvky o svých oblíbených tématech</string>
+    <string name="login_to_to_connect_jetpack">Přihlaste se k účtu WordPress.com, který jste použili k připojení Jetpack.</string>
     <string name="install_jetpack_retry">Odpověď</string>
     <string name="install_jetpack_continue">Pokračovat</string>
+    <string name="jetpack_installation_problem_message">Jetpack v tuto chvíli nelze nainstalovat.</string>
     <string name="jetpack_installation_problem">Vyskytl se problém</string>
     <string name="jetpack_installed">Jetpack nainstalován</string>
+    <string name="installing_jetpack_message">Instalace Jetpack na vaše stránky. To může trvat až několik minut.</string>
     <string name="installing_jetpack">Instalování Jetpacku</string>
+    <string name="install_jetpack_message">Pověření na vašem webu nebudou uložena a budou použita pouze za účelem instalace Jetpack.</string>
     <string name="install_jetpack">Instalovat Jetpack</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
@@ -231,14 +1416,27 @@ Language: cs_CZ
     <string name="site_settings_tags_empty_title">Nemáte žádné vlastní štítky</string>
     <string name="site_settings_tags_empty_subtitle">Přidejte si sem nejčastěji používané štítky, abyste je měli po ruce.</string>
     <string name="site_settings_tags_empty_button">Vytvořit štítek</string>
+    <string name="media_empty_search_list">Vašemu vyhledávání neodpovídají žádná média</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">Odhlásit se z WordPressu?</string>
+    <string name="sign_out_wpcom_confirm_with_changes">U příspěvků, které nebyly nahrány na váš web, došlo ke změnám. Odhlášením se tyto změny ze zařízení smažou. Odhlásit se?</string>
     <string name="people_empty_list_filtered_viewers">Zatím žádné zobrazení</string>
+    <string name="people_empty_list_filtered_email_followers">Zatím žádné e-mailové následovníci</string>
     <string name="people_empty_list_filtered_followers">Zatím žádní fanoušci</string>
     <string name="people_empty_list_filtered_users">Zatím žádní uživatelé</string>
+    <string name="reader_empty_posts_liked_description">Příspěvky, kterým jste dali líbí se mi se zobrazí zde.</string>
+    <string name="reader_empty_posts_liked_title">Zatím se nic nelíbilo</string>
+    <string name="reader_empty_followed_blogs_button_followed">Přejít na sledování</string>
+    <string name="reader_empty_followed_blogs_button_discover">Objevte weby</string>
+    <string name="reader_empty_followed_blogs_title">Žádné sledované weby</string>
+    <string name="notifications_empty_likes">Zatím žádné to se mi líbí</string>
+    <string name="notifications_empty_followers">Zatím žádní fanoušci</string>
+    <string name="activity_log_limited_content_on_free_plan">Jelikož máte bezplatný plán, uvidíte ve své aktivitě omezené události.</string>
+    <string name="activity_log_empty_subtitle">Když na svém webu provedete změny, uvidíte zde svoji historii aktivit.</string>
     <string name="activity_log_empty_title">Zatím žádná aktivita</string>
     <string name="posts_empty_list_button">Vytvořit příspěvek</string>
     <string name="pages_empty_list_button">Vytvořit stránku</string>
     <string name="media_empty_upload_media">Nahrát média</string>
+    <string name="media_empty_list">Nemáte žádné média</string>
     <string name="reader_gallery_images_desc">galerie obrázků</string>
     <string name="blavatar_desc">ikona stránky</string>
     <string name="theme_image_desc">obrázek šablony</string>
@@ -246,19 +1444,17 @@ Language: cs_CZ
     <string name="button_discard">Zahodit</string>
     <string name="reader_avatar_desc">profilový obrázek</string>
     <string name="notification_channel_transient_title">Přechodný</string>
-    <string name="support_identity_input_dialog_email_label">Email</string>
-    <string name="support_identity_input_dialog_enter_email">Zadejte emailovou adresu</string>
-    <string name="support_identity_input_dialog_enter_email_and_name">Pro pokračování je třeba nejprve zadat emailovou adresu a jméno</string>
+    <string name="support_identity_input_dialog_email_label">E-mail</string>
+    <string name="support_identity_input_dialog_enter_email">Zadejte e-mailovou adresu</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Pro pokračování je třeba nejprve zadat e-mailovou adresu a jméno</string>
     <string name="support_push_notification_message">Nová zpráva od \"Pomoc a Podpora\"</string>
     <string name="support_push_notification_title">WordPress</string>
     <string name="support_contact_email_not_set">Nezadán</string>
-    <string name="support_contact_email">Kontaktní email</string>
+    <string name="support_contact_email">Kontaktní e-mail</string>
     <string name="application_log_button">Aplikační log</string>
     <string name="my_tickets">Moje konverzace</string>
-    <string name="activity_log_rewind_dialog_message">Opravdu chcete obnovit stav stránky z %1$s na %2$s? Akce nenávratně odstraní vše, včetně obsahu a změn nastavení, co jste od té doby udělali.</string>
-    <string name="activity_log_rewind_site">Obnovit</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Obnovuji</string>
-    <string name="activity_log_currently_restoring_message">Obnovuji k %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Probíhá obnovení</string>
+    <string name="activity_log_currently_restoring_message">Obnovování k %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Obnovuji stránku</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Stránka úspěšně obnovena</string>
     <string name="activity_log_rewind_finished_snackbar_message">Vaše stránka byla úspěšně obnovena\nObnovit na %1$s %2$s</string>
@@ -272,20 +1468,16 @@ Language: cs_CZ
     <string name="comment_read_source_post">Přečtěte si zdrojový příspěvek</string>
     <string name="sites">Stránky</string>
     <string name="signup_magic_link_title">Magický odkaz odeslán</string>
-    <string name="signup_email_screen_title">Registrace emailem</string>
     <string name="verification_2fa_screen_title">Ověřovací kód</string>
     <string name="selfhosted_site_login_title">Přihlašovací údaje</string>
     <string name="magic_link_sent_login_title">Magický odkaz odeslán</string>
     <string name="magic_link_login_title">Přihlašení magickým odkazem</string>
     <string name="site_address_login_title">Přihlášení k webu</string>
-    <string name="email_address_login_title">Emailová adresa přihlášení</string>
-    <string name="alternatively">Alternativní způsoby přihlášení:</string>
+    <string name="email_address_login_title">E-mailová adresa přihlášení</string>
     <string name="reader_empty_saved_posts_description">Kliknutím na %s přispěvek uložíte.</string>
     <string name="reader_empty_saved_posts_title">Zatím jste neuložili žádné příspěvky.</string>
     <string name="reader_bookmark_snack_title">Příspěvek uložen</string>
     <string name="reader_bookmark_snack_btn">Zobrazit všechny</string>
-    <string name="reader_btn_bookmarked">Uložen</string>
-    <string name="reader_btn_bookmark">Uložit</string>
     <string name="reader_remove_bookmark">Odstranit z uložených</string>
     <string name="reader_add_bookmark">Přidat do uložených příspěvků</string>
     <string name="reader_save_for_later_title">Uložené příspěvky</string>
@@ -305,11 +1497,9 @@ Language: cs_CZ
     <string name="reader_btn_notifications_on">Zapnout notifikace</string>
     <string name="reader_btn_notifications_off">Vypnout notifikace</string>
     <string name="activity_log_jetpack_icon">Ikona Jetpack</string>
-    <string name="rewind">Přetočit</string>
     <string name="activity_log_event">Událost</string>
     <string name="activity_log_icon">Ikona aktivit</string>
     <string name="activity_log">Activity Log</string>
-    <string name="activity">Aktivity</string>
     <string name="privacy_policy_read">Přečtěte si zásady ochrany soukromí</string>
     <string name="third_party_policy_learn_more_caption">Používáme další nástroje pro měření, včetně některých nástrojů od třetích stran. Přečtěte si více o těchto nástrojích a jak je ovládat.</string>
     <string name="third_party_policy_learn_more_header">Zásady třetích stran</string>
@@ -320,13 +1510,12 @@ Language: cs_CZ
     <string name="preference_privacy_settings">Nastavení ochrany osobních údajů</string>
     <string name="preference_collect_information">Sbírat informace</string>
     <string name="post_submitted">Příspěvek odeslán</string>
-    <string name="login_email_button_signup">Ještě nemáte svůj účet? %1$sRegistrujte se%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Funkce pluginu vyžaduje, aby stránka byla v dobrém stavu.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Funkce tohoto pluginu vyžadují, aby byl tento uživatel přiřazen k odběru primární domény.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Plugin funkce vyžaduje administrátorská práva.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">plugin nemůže být instalován na VIP stránky.</string>
     <string name="plugin_install_site_ineligible_excessive_disk_space">Plugin nelze nainstalovat z důvodu omezení místa na disku.</string>
-    <string name="plugin_install_site_ineligible_email_unverified">Funkce pluginu vyžaduje ověřenou emailovou adresu.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">Funkce pluginu vyžaduje ověřenou e-mailovou adresu.</string>
     <string name="plugin_install_site_ineligible_site_private">Funkce pluginu vyžaduje, aby byl web veřejný.</string>
     <string name="plugin_install_site_ineligible_no_business_plan">Funkce pluginu vyžaduje business plán.</string>
     <string name="plugin_install_site_ineligible_not_using_custom_domain">Funkce pluginu vyžaduje vlastní doménu.</string>
@@ -336,13 +1525,13 @@ Language: cs_CZ
     <string name="plugin_install_first_plugin_confirmation_dialog_message">Instalace prvního pluginu na webu může trvat až 1 minutu. Během této doby nebudete moci provádět změny na webu.</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Instalovat plugin</string>
     <string name="notification_settings_followed_dialog_title">Oznámení</string>
-    <string name="notification_settings_followed_dialog_email_comments">Pošlete mi email, když přibude nový komentář</string>
+    <string name="notification_settings_followed_dialog_email_comments">Pošlete mi e-mail, když přibude nový komentář</string>
     <string name="notification_settings_followed_dialog_email_posts_weekly">Týdně</string>
     <string name="notification_settings_followed_dialog_email_posts_instantly">Ihned</string>
     <string name="notification_settings_followed_dialog_email_posts_daily">Denně</string>
     <string name="notification_settings_followed_dialog_notification_posts_switch">Nový příspěvek</string>
     <string name="notification_settings_followed_dialog_notification_posts_description">Získejte oznámení o nových příspěvcích z tohoto webu</string>
-    <string name="notification_settings_followed_dialog_email_posts_switch">Pošlete mi email, když bude publikovaný nový příspěvek</string>
+    <string name="notification_settings_followed_dialog_email_posts_switch">Pošlete mi e-mail, když bude publikovaný nový příspěvek</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">Všechny moje sledované weby</string>
     <string name="notification_settings_category_followed_sites">Sledované weby </string>
     <string name="content_description_person_reading_device_notification">Čtecí zařízení s upozorněním</string>
@@ -419,7 +1608,6 @@ Language: cs_CZ
     <string name="edit_photo_screen_title">Upravit fotku</string>
     <string name="share_intent_screen_title">Vybrat stránku</string>
     <string name="signup_epilogue_screen_title">Nový účet</string>
-    <string name="login_prologue_screen_title">Přihlášení</string>
     <string name="login_epilogue_screen_title">Přihlášen jako</string>
     <string name="person_detail_screen_title">Osobní profil</string>
     <string name="media_settings_screen_title">Detail souboru</string>
@@ -433,7 +1621,7 @@ Language: cs_CZ
     <string name="license_screen_title">Licence</string>
     <string name="release_notes_screen_title">Poznámky k vydání</string>
     <string name="signup_epilogue_error_avatar_view">Váš avatar byl nahrán a bude brzy k dispozici.</string>
-    <string name="permissions_denied_message">Vypadá to že jste si deaktivoval práva pro tuto funkci. &lt;br/>&lt;br/>Pokud to chcete změnit, ověřte si že máte povolená práva na funkci &lt;strong>%s&lt;/strong>.</string>
+    <string name="permissions_denied_message">Vypadá to že jste si deaktivoval práva pro tuto funkci. &lt;br/&gt;&lt;br/&gt;Pokud to chcete změnit, ověřte si že máte povolená práva na funkci &lt;strong&gt;%s&lt;/strong&gt;.</string>
     <string name="permissions_denied_title">Oprávnění</string>
     <string name="plugin_caption_featured">Doporučené</string>
     <string name="sharing_disabled_description">Nemůžete se dostat do nastavení sdílení, protože váš Jetpack modul Sdílení je vypnutý.</string>
@@ -474,7 +1662,6 @@ Language: cs_CZ
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 příspěvek s 1 souborem nenahrán </string>
     <string name="untitled_in_parentheses">(bez názvu)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Vytvořit stránku</string>
     <string name="notification_site_creation_created">Dotkněte se pro pokračování.</string>
     <string name="notification_site_creation_title_success">Web vytvořen!</string>
@@ -488,15 +1675,12 @@ Language: cs_CZ
     <string name="username_changer_dismiss_button_positive">Vyřadit</string>
     <string name="username_changer_action">Uložit</string>
     <string name="content_description_add_avatar">Přidat avatar</string>
-    <string name="signup_with_google_button">Přihlásit se pomocí účtu Google</string>
-    <string name="signup_with_email_button">Přihlásit se pomocí emailu</string>
-    <string name="signup_user_exists">Email je již registrovaný na WordPress.com.\nPokračujte na přihlášení.</string>
+    <string name="signup_user_exists">E-mail je již registrovaný na WordPress.com.\nPokračujte na přihlášení.</string>
     <string name="signup_updating_account">Probíhá aktualizace účtu…</string>
-    <string name="signup_terms_of_service_text">Registrací zároveň souhlasíte se %1$sSmluvními podmínkami%2$s.</string>
-    <string name="signup_magic_link_progress">Odesílání emailu</string>
+    <string name="signup_magic_link_progress">Odesílání e-mailu</string>
     <string name="signup_magic_link_error_button_positive">Opakovat</string>
     <string name="signup_magic_link_error_button_negative">Zavřít</string>
-    <string name="signup_magic_link_error">Při odesílání emailu došlo k určitým potížím. Můžete zkusit znovu nebo zavřít a zkusit to později.</string>
+    <string name="signup_magic_link_error">Při odesílání e-mailu došlo k určitým potížím. Můžete zkusit znovu nebo zavřít a zkusit to později.</string>
     <string name="signup_epilogue_hint_username">Uživatelské jméno</string>
     <string name="signup_epilogue_hint_password_detail">Vždy se můžete přihlásit pomocí odkazu, jako je ten, který jste právě používali, ale pokud chcete, můžete také nastavit heslo.</string>
     <string name="signup_epilogue_hint_password">Heslo (volitelné)</string>
@@ -505,11 +1689,6 @@ Language: cs_CZ
     <string name="signup_epilogue_error_button_negative">Zpět</string>
     <string name="signup_epilogue_error_generic">Objevili se potíže při aktualizaci vašeho účtu. Můžete to zkusit znovu nebo vrátit změny.</string>
     <string name="signup_epilogue_error_avatar">Při nahrávání vašeho avataru došlo k potížím.</string>
-    <string name="signup_email_header">Chcete-li vytvořit svůj nový účet WordPress.com, zadejte svou emailovou adresu.</string>
-    <string name="signup_email_error_generic">Při kontrole emailové adresy došlo k určitým potížím.</string>
-    <string name="sign_up">Registrace na WordPress.com</string>
-    <string name="enter_username_instead">Přihlásit se svým uživatelským jménem.</string>
-    <string name="enter_site_address_instead">Přihlaste se zadáním adresy Vašeho webu.</string>
     <string name="plugin_needs_update">Jsou vyžadovány aktualizace</string>
     <string name="plugin_caption_search">Hledat pluginy</string>
     <string name="plugin_caption_new">Nový</string>
@@ -609,6 +1788,7 @@ Language: cs_CZ
     <string name="notification_login_title_success">Přihlášeno!</string>
     <string name="login_error_generic_start">Přihlášení pomocí Google nemůže být spuštěno.</string>
     <string name="login_empty_password">Zadejte heslo</string>
+    <string name="login_text_otp_another">Pošlete mi nový kód</string>
     <string name="enter_verification_code_sms">Na telefonní číslo končící na %s byla zaslána textová zpráva. Zadejte prosím ověřovací kód z SMS.</string>
     <string name="image_size">Velikost</string>
     <string name="uploading_subtitle_media_only_one">1 zbývající soubor</string>
@@ -629,7 +1809,6 @@ Language: cs_CZ
     <string name="login_error_suffix">Možná zkuste jiný účet?</string>
     <string name="login_error_generic">Při připojování ke Google účtu se objevily nějaké potíže.</string>
     <string name="login_error_button">Zavřít</string>
-    <string name="login_google_button_suffix">Přihlásit se pomocí Google.</string>
     <string name="enter_wpcom_password_google">Abyste mohli pokračovat s tímto Google účtem, zadejte odpovídající heslo k WordPress.com. Tato žádost bude pouze jednou.</string>
     <string name="error_generic_network">Vyskytla se chyba sítě. Zkontrolujte připojení a zkuste znovu.</string>
     <string name="post_settings_remove_featured_image">Odstranit náhledový obrázek</string>
@@ -641,16 +1820,15 @@ Language: cs_CZ
     <string name="jetpack_disconnect_confirm">Odpojit</string>
     <string name="jetpack_disconnect_confirmation_message">Opravdu chcete odpojit Jetpack od webové stránky?</string>
     <string name="jetpack_disconnect_pref_title">\"Odpojit z WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Do whitelistu můžete přidat IP adresy nebo série IP adres a vyhnout se tak blokování IP adress ze strany Jetpack. Můžete zadat IPv4 a IPv6. Chcete-li určit rozsah, zadejte nízkou hodnotu a vysokou hodnotu oddělenou pomlčkou. Příklad: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Do whitelistu můžete přidat IP adresy nebo série IP adres a vyhnout se tak blokování IP adress ze strany Jetpack. Můžete zadat IPv4 a IPv6. Chcete-li určit rozsah, zadejte nízkou hodnotu a vysokou hodnotu oddělenou pomlčkou. Příklad: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Vyžadovat dvoustupňové ověření</string>
-    <string name="jetpack_match_wpcom_via_email_title">Spárovat účty pomocí emailu</string>
+    <string name="jetpack_match_wpcom_via_email_title">Spárovat účty pomocí e-mailu</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Povolit přihlášení pomocí WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Přihlášení přes WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Seznam povolených IP adres</string>
     <string name="jetpack_prevent_brute_force_title">Blokovat škodlivé pokusy o přihlášení</string>
     <string name="jetpack_prevent_brute_force_category_title">Ochrana před útokem hrubou silou</string>
     <string name="jetpack_send_wp_notifications_title">Odesílání nabízených oznámení</string>
-    <string name="jetpack_send_email_notifications_title">Posílat oznámení emailem</string>
+    <string name="jetpack_send_email_notifications_title">Posílat oznámení e-mailem</string>
     <string name="jetpack_monitor_uptime_title">Sledovat dobu provozu webu</string>
     <string name="jetpack_security_setting_title">Zabezpečení</string>
     <string name="jetpack_site_settings_category_title">Nastavení Jetpack</string>
@@ -676,22 +1854,23 @@ Language: cs_CZ
     <string name="media_edit_filename_caption">Jméno souboru</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alternativní text</string>
+    <string name="connect_site">Připojit web</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blikat světlem</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibrovat zařízením</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Zvolit zvuk</string>
     <string name="notification_settings_category_sights_and_sounds">Zobrazení a zvuky</string>
-    <string name="notification_settings_item_other_account_emails">Email z WordPress.com</string>
+    <string name="notification_settings_item_other_account_emails">E-mail z WordPress.com</string>
     <string name="notification_settings_item_other_pending_drafts">Upozorňovat jestliže jsou nevyřízené koncepty</string>
     <string name="notification_settings_item_other_comments_other_blogs">Komentáře na jiných webech</string>
     <string name="notification_settings_category_other">Jiné</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Všechny moje weby</string>
     <string name="notification_settings_category_your_sites">Weby</string>
-    <string name="notification_settings_master_off_message">Pokud vypnete Nastavení oznámení, zakáží se všechna oznámení z této aplikace. Můžete detailně nastavit, jaký typ upozornění chcete obdržet po zapnutí nastavení oznámení.</string>
-    <string name="notification_settings_master_off_title">Chcete-li dostávat oznámení na tomto zařízení, zapněte Nastavení oznámení.</string>
-    <string name="notification_settings_master_hint_off">Povolit oznámení</string>
-    <string name="notification_settings_master_hint_on">Zakázat oznámení</string>
-    <string name="notification_settings_master_status_off">Vypnuto</string>
-    <string name="notification_settings_master_status_on">Zapnuto</string>
+    <string name="notification_settings_main_off_message">Pokud vypnete Nastavení oznámení, zakáží se všechna oznámení z této aplikace. Můžete detailně nastavit, jaký typ upozornění chcete obdržet po zapnutí nastavení oznámení.</string>
+    <string name="notification_settings_main_off_title">Chcete-li dostávat oznámení na tomto zařízení, zapněte Nastavení oznámení.</string>
+    <string name="notification_settings_main_hint_off">Povolit oznámení</string>
+    <string name="notification_settings_main_hint_on">Zakázat oznámení</string>
+    <string name="notification_settings_main_status_off">Vypnuto</string>
+    <string name="notification_settings_main_status_on">Zapnuto</string>
     <string name="max_video_resolution">Maximální velikost videa</string>
     <string name="max_thumbnail_px_size">Maximální velikost obrázku</string>
     <string name="error_upload_post_media_param">Při nahrávání média k příspěvku se vyskytla chyba: %s.</string>
@@ -719,7 +1898,7 @@ Language: cs_CZ
     <string name="connection_to_server_lost">Připojení k serveru bylo ztraceno</string>
     <string name="login_epilogue_mysites_other">Moje weby</string>
     <string name="login_epilogue_mysites_one">Můj web</string>
-    <string name="login_email_client_not_found">Nepodařilo se najít emailovou aplikaci</string>
+    <string name="login_email_client_not_found">Nepodařilo se najít e-mailovou aplikaci</string>
     <string name="login_empty_2fa">Vložte ověřovací kód</string>
     <string name="login_empty_username">Vložte uživatelské jméno</string>
     <string name="login_log_in_for_deeplink">Pro přístup k příspěvku se přihlaste na WordPress.com.</string>
@@ -728,19 +1907,19 @@ Language: cs_CZ
     <string name="login_site_address_more_help">Potřebujete poradit?</string>
     <string name="login_site_address_help_content">Pokud navštívíte web v Chrome, adresa webu se objeví v řádku nahoře na obrazovce.</string>
     <string name="login_site_address_help_title">Jaká je adresa mého webu?</string>
-    <string name="login_site_address_help">Potřebujete poradit jak najít adresu webu?</string>
     <string name="login_site_address">Adresa webu</string>
     <string name="enter_site_address">Zadejte adresu WordPress webu, ke kterému se chcete připojit.</string>
     <string name="login_already_logged_in_wpcom">Již jste přihlášeni na WordPress.com</string>
     <string name="login_continue">Pokračovat</string>
+    <string name="connect_more">Připojit se k jinému webu</string>
     <string name="enter_wpcom_password">Zadejte heslo k WordPress.com.</string>
-    <string name="login_magic_link_email_requesting">Je vyžadován přihlašovací email</string>
+    <string name="login_magic_link_email_requesting">Je vyžadován přihlašovací e-mail</string>
     <string name="password_incorrect">Zdá se, že zadané heslo je nesprávné. Zkontrolujte prosím své údaje a zkuste to znovu.</string>
     <string name="requesting_otp">Vyžádání ověřovacího kódu pomocí SMS.</string>
+    <string name="login_text_otp">Pošlete mi raději kód.</string>
     <string name="enter_verification_code">Téměř hotovo! Zadejte ověřovací kód z aplikace Authenticator.</string>
-    <string name="open_mail">Otevřít email</string>
     <string name="next">Další</string>
-    <string name="enter_email_wordpress_com">Přihlaste se na stránku WordPress.com pomocí emailové adresy pro správu všech vašich stránek na WordPress.</string>
+    <string name="enter_email_wordpress_com">Přihlaste se na stránku WordPress.com pomocí e-mailové adresy pro správu všech vašich stránek na WordPress.</string>
     <string name="image_optimization_promo_desc">Optimalizace obrazu mírně sníží kvalitu obrázků pro rychlejší nahrávání\n\nToto nastavení můžete kdykoli změnit v nastavení webu.</string>
     <string name="image_optimization_promo_title">Zapnout optimalizaci obrázků?</string>
     <string name="leave_off">Vypnout</string>
@@ -761,10 +1940,6 @@ Language: cs_CZ
     <string name="post_status_draft">Koncept</string>
     <string name="post_status_pending_review">Čeká na schválení</string>
     <string name="post_status_publish_post">Publikovat</string>
-    <string name="change_location">Změnit polohu</string>
-    <string name="remove_location">Odstranit polohu</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Nelze otevřít výběr místa, služby Google Play nejsou k dispozici</string>
-    <string name="post_settings_location">Poloha</string>
     <string name="now">Teď</string>
     <string name="post_settings_password_dialog_hint">Pouze čtenáři s tímto heslem si mohou tento příspěvek přečíst</string>
     <string name="post_settings_excerpt_dialog_hint">Stručný obsah je volitelný ručně vytvořený souhrn obsahu.</string>
@@ -865,19 +2040,19 @@ Language: cs_CZ
     <string name="media_insert_title">Přidat více fotek</string>
     <string name="media_gallery_column_count_multi">%d sloupců</string>
     <string name="media_gallery_column_count_single">1 sloupec</string>
-    <string name="editor_confirm_email_prompt_negative">Znovu odeslat email</string>
-    <string name="editor_confirm_email_prompt_message_with_email">Poslali jsme vám email na %s, když jste se poprvé přihlásil. Otevřete email a klikněte na tlačítko zapnout publikování.</string>
-    <string name="editor_confirm_email_prompt_message">Při prvním přihlášení jsme vám poslali email. Otevřete zprávu a kliknutím na modré tlačítko povolte publikování.</string>
-    <string name="editor_confirm_email_prompt_title">Prosím potvrďte emailovou adresu</string>
-    <string name="toast_verification_email_send_error">Při posílání ověřovacího emailu došlo k chybě. Není už ověřený?</string>
-    <string name="toast_verification_email_sent">Ověřovací email byl poslán, zkontrolujte prosím obsah zvolené emailové schránky.</string>
+    <string name="editor_confirm_email_prompt_negative">Znovu odeslat e-mail</string>
+    <string name="editor_confirm_email_prompt_message_with_email">Poslali jsme vám e-mail na %s, když jste se poprvé přihlásil. Otevřete e-mail a klikněte na tlačítko zapnout publikování.</string>
+    <string name="editor_confirm_email_prompt_message">Při prvním přihlášení jsme vám poslali e-mail. Otevřete zprávu a kliknutím na modré tlačítko povolte publikování.</string>
+    <string name="editor_confirm_email_prompt_title">Prosím potvrďte e-mailovou adresu</string>
+    <string name="toast_verification_email_send_error">Při posílání ověřovacího e-mailu došlo k chybě. Není už ověřený?</string>
+    <string name="toast_verification_email_sent">Ověřovací e-mail byl poslán, zkontrolujte prosím obsah zvolené e-mailové schránky.</string>
     <string name="toast_saving_post_as_draft">Ukládání příspěvku jako koncept</string>
     <string name="photo_picker_capture_video">Nahrát video</string>
     <string name="photo_picker_capture_photo">Vyfotit</string>
     <string name="delete_site_warning_subtitle">Buď opatrný! Jakmile bude stránka smazána, nemůže být obnovena. Jste si jistí že chcete pokračovat?</string>
     <string name="delete_site_warning">Všechny vaše příspěvky, obrázky a data budou smazány. A adresa tohoto webu (%s) se ztratí</string>
     <string name="delete_site_warning_title">Smazat web?</string>
-    <string name="start_over_email_intent_error">Nelze odeslat email</string>
+    <string name="start_over_email_intent_error">Nelze odeslat e-mail</string>
     <string name="start_over_email_body">Chci začít znovu s touto stránkou %s</string>
     <string name="start_over_email_subject">Začít znovu s touto stránkou %s </string>
     <string name="site_picker_remove_site_error">Chyba při odstraňování webu, zkuste to později</string>
@@ -916,6 +2091,7 @@ Language: cs_CZ
     <string name="media_upload_error">Došlo k chybě nahrávání médií</string>
     <string name="retry">Znovu</string>
     <string name="confirm">Potvrdit</string>
+    <string name="xmlrpc_endpoint_forbidden_error">Nelze se připojit. Při pokusu o přístup k vašemu nám došlo k chybě 403\n         koncový bod XMLRPC webu. Aplikace to potřebuje, aby mohla komunikovat s vaším webem. Požádejte svého hostitele o řešení\n         tento problém.</string>
     <string name="xmlrpc_post_blocked_error">Nepodařilo se připojit. Váš hostitel blokuje požadavky POST, které jsou potřeba ke komunikaci s webovou stránkou. Pro vyřešení toho problému kontaktujte svého hostitele.</string>
     <string name="reader_hint_search_followed_sites">Prohledat sledované stránky</string>
     <string name="pending_draft_one_generic">Nenechávejte ho čekat! \'%1$s\' čeká na zveřejnění.</string>
@@ -949,7 +2125,7 @@ Language: cs_CZ
     <string name="reader_label_global_related_posts">Více informací o WordPress.com</string>
     <string name="reader_label_local_related_posts">Více na %s</string>
     <string name="preference_open_device_settings">Otevřít nastavení v zařízení</string>
-    <string name="invite_invalid_email">%s je neplatný email</string>
+    <string name="invite_invalid_email">%s je neplatný e-mail</string>
     <string name="invite_user_blocked_invites">Uživatel %s má zablokované pozvánky</string>
     <string name="invite_already_following">Uživatel %s již sleduje</string>
     <string name="invite_already_a_member">%s je již uživatel</string>
@@ -965,20 +2141,20 @@ Language: cs_CZ
     <string name="alignment_none">Žádné</string>
     <string name="site_settings_list_editor_action_mode_title">Vybraný %1$d</string>
     <string name="error_fetch_users_list">Nelze načíst uživatele webu</string>
-    <string name="title_email_follower">Email fanouška</string>
+    <string name="title_email_follower">E-mail fanouška</string>
     <string name="title_follower">Fanoušek</string>
     <string name="people_fetching">Načítání uživatelů…</string>
     <string name="people_dropdown_item_viewers">Zobrazení</string>
-    <string name="people_dropdown_item_email_followers">Emaily fanoušků</string>
+    <string name="people_dropdown_item_email_followers">E-maily fanoušků</string>
     <string name="people_dropdown_item_followers">Fanoušci</string>
     <string name="people_dropdown_item_team">Tým</string>
-    <string name="invite_message_usernames_limit">Pozvěte uživatele pomocí až 10 emailů / nebo WordPress.com uživatelských jmen. Ty, kteří si budou chtít uživatelské jméno vytvořit, dostanou pokynu pro vytvoření.</string>
+    <string name="invite_message_usernames_limit">Pozvěte uživatele pomocí až 10 e-mailů / nebo WordPress.com uživatelských jmen. Ty, kteří si budou chtít uživatelské jméno vytvořit, dostanou pokynu pro vytvoření.</string>
     <string name="viewer_remove_confirmation_message">Chcete odstranit tento prohlížeč, pak už nikdo nebude moct navštívit tuto webovou stránku.\n\nChcete určitě odstranit tento prohlížeč?</string>
     <string name="follower_remove_confirmation_message">Pokud odstraníte tohoto fanouška, nebude už dostávat žádné upozornění z tohoto webu..\n\nChcete určitě odstranit tohoto fanouška?</string>
     <string name="follower_subscribed_since">Od %1$s</string>
     <string name="error_remove_viewer">Nepodařilo se odstranit zobrazení</string>
     <string name="error_remove_follower">Nepodařilo se odstranit fanouška</string>
-    <string name="error_fetch_email_followers_list">Nepodařilo se načít emaily fanoušků</string>
+    <string name="error_fetch_email_followers_list">Nepodařilo se načít e-maily fanoušků</string>
     <string name="error_fetch_followers_list">Nepodařilo se načít webové stránky fanoušků</string>
     <string name="editor_failed_uploads_switch_html">Některá média se nenahrála. Nelze přepnout do režimu HTML\n        v tomhle stavu. Chcete odstranit všechny neúspěšně nahrané soubory a pak pokračovat?</string>
     <string name="image_width">Šířka</string>
@@ -992,23 +2168,19 @@ Language: cs_CZ
     <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_some_failed">Pozvánka odeslána, ale vyskytla se chyba(y)!</string>
     <string name="invite_error_sending">Během pokusu o odeslání pozvánky se vyskytla chyba!</string>
-    <string name="invite_error_invalid_usernames_multiple">Nelze odeslat: Uživatelská jména nebo emaily jsou neplatné</string>
-    <string name="invite_error_invalid_usernames_one">Nelze odeslat: Uživatelské jméno nebo email je neplatné</string>
+    <string name="invite_error_invalid_usernames_multiple">Nelze odeslat: Uživatelská jména nebo e-maily jsou neplatné</string>
+    <string name="invite_error_invalid_usernames_one">Nelze odeslat: Uživatelské jméno nebo e-mail je neplatné</string>
     <string name="invite_error_no_usernames">Přidejte alespoň jedno uživatelské jméno</string>
-    <string name="invite_message_info">(nepovinné) Můžete zadat vlastní zprávu (max 500 znaků), která bude součástí pozvánky uživatele/uživatelů.</string>
-    <string name="invite_message_remaining_other">%d zbývajících znaků</string>
-    <string name="invite_message_remaining_one">1 zbývající znak</string>
-    <string name="invite_message_remaining_zero">Žádný zbývající znak</string>
     <string name="invite_message_title">Vlastní zpráva</string>
     <string name="invite">Pozvat</string>
-    <string name="invite_names_title">Uživatelská jména nebo emaily</string>
+    <string name="invite_names_title">Uživatelská jména nebo e-maily</string>
     <string name="invite_people">Přidat uživatele</string>
     <string name="my_site_header_external">Externí</string>
-    <string name="send_link">Poslat URL</string>
     <string name="label_clear_search_history">Smazat historii prohlížení</string>
     <string name="dlg_confirm_clear_search_history">Smazat historii prohlížení?</string>
     <string name="reader_empty_search_description">Žádný příspěvek nebyl nalezen %s pro váš jazyk.</string>
     <string name="reader_hint_post_search">Prohledat WordPress.com</string>
+    <string name="reader_title_related_post_detail">Související příspěvky </string>
     <string name="preview_screen_links_disabled">Odkazy jsou zakázány v náhledu na obrazovce</string>
     <string name="send">Poslat</string>
     <string name="person_removed">%1$s úspěšně odstraněno</string>
@@ -1024,17 +2196,16 @@ Language: cs_CZ
     <string name="error_refreshing_gravatar">Chyba při znovu nahrání vašeho Gravataru</string>
     <string name="error_locating_image">Chyba při umístění oříznutého obrázku</string>
     <string name="error_cropping_image">Chyba při oříznutí obrázku</string>
-    <string name="checking_email">Ověřuji email</string>
+    <string name="checking_email">Ověřuji e-mail</string>
     <string name="magic_link_unavailable_error_message">Momentálně nedostupné. Prosím zadejte své heslo</string>
     <string name="logging_in">Přihlašování</string>
-    <string name="enter_your_password_instead">Zadejte vaše heslo místo tohoto</string>
     <string name="web_address_dialog_hint">Veřejně se zobrazí při komentování.</string>
     <string name="capture_or_pick_photo">Vyfoťte nebo vyberte fotku</string>
     <string name="plans">Plány</string>
     <string name="plan">Plán</string>
     <string name="export_your_content_message">Vaše příspěvky, stránky a nastavení budou zaslány na %s.</string>
     <string name="export_your_content">Exportovat svůj obsah</string>
-    <string name="export_email_sent">Export odeslán do emailu!</string>
+    <string name="export_email_sent">Export odeslán do e-mailu!</string>
     <string name="exporting_content_progress">Exportování obsahu…</string>
     <string name="checking_purchases">Ověřuji platby</string>
     <string name="show_purchases">Zobrazit nákupy</string>
@@ -1103,12 +2274,12 @@ Language: cs_CZ
     <string name="days_quantity_one">1 den</string>
     <string name="web_address">Webová adresa</string>
     <string name="primary_site">Hlavní web</string>
-    <string name="pending_email_change_snackbar">Kliknutím na ověřovací odkaz v emailu zaslaném na %1$s musíte potvrdit tuto adresu</string>
+    <string name="pending_email_change_snackbar">Kliknutím na ověřovací odkaz v e-mailu zaslaném na %1$s musíte potvrdit tuto adresu</string>
     <string name="editor_toast_uploading_please_wait">Právě teď se nahrávají média. Počkejte, dokud se to nedokončí.</string>
     <string name="error_refresh_comments_showing_older">Komentáře nemohou být v tuto chvíli aktualizonány - zobrazující se starší komentáře</string>
     <string name="post_settings_set_featured_image">Nastavit náhledový obrázek</string>
     <string name="post_settings_featured_image">Náhledový obrázek</string>
-    <string name="email_address">Emailová adresa</string>
+    <string name="email_address">E-mailová adresa</string>
     <string name="dlg_sure_to_delete_comments">Smazat trvale tyto komentáře?</string>
     <string name="dlg_sure_to_delete_comment">Smazat trvale tento komentář?</string>
     <string name="mnu_comment_delete_permanently">Smazat</string>
@@ -1148,7 +2319,7 @@ Language: cs_CZ
     <string name="site_settings_paging_dialog_description">Rozdělit vlákna komentářů do více stránek.</string>
     <string name="site_settings_paging_dialog_header">Komentářů na stránku</string>
     <string name="site_settings_close_after_dialog_title">Uzavřít komentování</string>
-    <string name="site_settings_blacklist_description">Pokud komentář obsahuje jakékoliv z těchto slov ve svém obsahu, jméně, URL, e-mailu, nebo IP, bude označen jako spam. Můžete také zadat části slov, takže podmínce \"press\" bude odpovídat \"WordPress\".</string>
+    <string name="site_settings_denylist_description">Pokud komentář obsahuje jakékoliv z těchto slov ve svém obsahu, jméně, URL, e-mailu, nebo IP, bude označen jako spam. Můžete také zadat části slov, takže podmínce \"press\" bude odpovídat \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Pokud komentář obsahuje jakékoliv z těchto slov ve svém obsahu, jméně, URL, e-mailu, nebo IP, tento komentář bude pozdržen a moderován. Můžete také zadat části slov, takže podmínce \"press\" bude odpovídat \"WordPress\".</string>
     <string name="site_settings_list_editor_input_hint">Zadejte slovo nebo frázi</string>
     <string name="site_settings_list_editor_no_items_text">Žádné položky</string>
@@ -1163,10 +2334,10 @@ Language: cs_CZ
     <string name="site_settings_rp_show_header_title">Zobrazit hlavičku</string>
     <string name="site_settings_rp_switch_summary">Podobné příspěvky zobrazí relevantní obsah vašeho webu, přímo pod příspěvky.</string>
     <string name="site_settings_rp_switch_title">Zobrazit podobné příspěvky</string>
-    <string name="site_settings_blacklist_hint">Komentáře odpovídající filtru jsou označeny jako spam</string>
+    <string name="site_settings_denylist_hint">Komentáře odpovídající filtru jsou označeny jako spam</string>
     <string name="site_settings_moderation_hold_hint">Komentáře odpovídající filtru jsou přesunuty do fronty pro moderaci</string>
     <string name="site_settings_multiple_links_hint">Ignorovat limit množství odkazů pro známé uživatele</string>
-    <string name="site_settings_whitelist_hint">Autor komentáře musí mít dříve schválený komentář</string>
+    <string name="site_settings_allowlist_hint">Autor komentáře musí mít dříve schválený komentář</string>
     <string name="site_settings_user_account_required_hint">Pro přidávání komentářů, musí být uživatelé registrovaní a přihlášeni</string>
     <string name="site_settings_identity_required_hint">Autor komentáře musí vyplnit své jméno a e-mail</string>
     <string name="site_settings_paging_hint">Zobrazovat komentáře v bloku o specifické velikosti</string>
@@ -1189,22 +2360,21 @@ Language: cs_CZ
     <string name="site_settings_address_hint">Změna vaší adresy momentálně není k dispozici</string>
     <string name="site_settings_tagline_hint">Několika slovy popište, čím se budete na webu zabývat.</string>
     <string name="site_settings_title_hint">Několika slovy popište, čím se budete na webu zabývat</string>
-    <string name="site_settings_whitelist_known_summary">Komentáře pro známé uživatele</string>
-    <string name="site_settings_whitelist_all_summary">Komentáře pro všechny uživatele</string>
+    <string name="site_settings_allowlist_known_summary">Komentáře pro známé uživatele</string>
+    <string name="site_settings_allowlist_all_summary">Komentáře pro všechny uživatele</string>
     <string name="site_settings_threading_summary">%d úrovní</string>
     <string name="site_settings_privacy_private_summary">Soukromé</string>
     <string name="site_settings_privacy_hidden_summary">Skrytý</string>
     <string name="site_settings_privacy_public_summary">Publikovat</string>
     <string name="site_settings_delete_site_title">Smazat stránku</string>
-    <string name="site_settings_blacklist_title">Černá listina</string>
     <string name="site_settings_moderation_hold_title">Podržet pro moderaci</string>
     <string name="site_settings_multiple_links_title">Odkazy v komentářích</string>
-    <string name="site_settings_whitelist_title">Schválit automaticky</string>
+    <string name="site_settings_allowlist_title">Schválit automaticky</string>
     <string name="site_settings_paging_title">Stránkování</string>
     <string name="site_settings_threading_title">Posloupnosti</string>
     <string name="site_settings_sort_by_title">Řadit dle</string>
     <string name="site_settings_account_required_title">Uživatel musí být přihlášen</string>
-    <string name="site_settings_identity_required_title">Musí obsahovat jméno a email</string>
+    <string name="site_settings_identity_required_title">Musí obsahovat jméno a e-mail</string>
     <string name="site_settings_receive_pingbacks_title">Přijímat pingbacky</string>
     <string name="site_settings_send_pingbacks_title">Odesílat pingbacky</string>
     <string name="site_settings_allow_comments_title">Povolit komentáře</string>
@@ -1279,16 +2449,16 @@ Language: cs_CZ
     <string name="reader_menu_tags">Upravit štítky a weby</string>
     <string name="reader_title_post_detail">Čtenáři příspěvku</string>
     <string name="notifications_push_summary">Nastavení upozornění, které se objeví na vašem přístroji.</string>
-    <string name="notifications_email_summary">Nastavení upozornění, které jsou odesílány na email vázaný na váš účet.</string>
+    <string name="notifications_email_summary">Nastavení upozornění, které jsou odesílány na e-mail vázaný na váš účet.</string>
     <string name="notifications_tab_summary">Nastavení upozornění, které se zobrazí v záložce oznámení.</string>
     <string name="notifications_disabled">Oznámení z aplikace byly zakázány. Klepnutě sem a budete je moct nastavit.</string>
     <string name="notification_types">Typ upozornění</string>
     <string name="error_loading_notifications">Nelze načíst nastavení oznámení</string>
     <string name="comment_likes">Oblíbené komentáře</string>
     <string name="app_notifications">Upozornění aplikace</string>
-    <string name="email">Email</string>
+    <string name="email">E-mail</string>
     <string name="notifications_tab">Karta oznámení</string>
-    <string name="notification_settings_item_other_account_emails_summary">Budeme vždy odesílat důležité emaily týkající se vašeho účtu, ale můžete také získat některé zajímavé bonusy.</string>
+    <string name="notification_settings_item_other_account_emails_summary">Budeme vždy odesílat důležité e-maily týkající se vašeho účtu, ale můžete také získat některé zajímavé bonusy.</string>
     <string name="stats_insights_latest_post_summary">Přehled posledních příspěvků</string>
     <string name="connectionbar_no_connection">Bez připojení</string>
     <string name="post_trashed">Příspěvek byl přesunut do koše</string>
@@ -1348,7 +2518,6 @@ Language: cs_CZ
     <string name="logs_copied_to_clipboard">Aplikační protokoly byly zkopírovány do schránky</string>
     <string name="reader_empty_posts_in_blog">Tento web je prázdný</string>
     <string name="reader_label_new_posts">Nové příspěvky</string>
-    <string name="reader_page_recommended_blogs">Stránky které by se vám mohly líbit</string>
     <string name="error_copy_to_clipboard">Při kopírování textu do schránky nastala chyba</string>
     <string name="post_uploading">Nahrávám příspěvek</string>
     <string name="stats_followers_years">%1$d roky</string>
@@ -1399,7 +2568,7 @@ Language: cs_CZ
     <string name="reader_toast_err_block_blog">Nepodařilo se zablokovat tento web</string>
     <string name="reader_toast_blog_blocked">Příspěvky z tohoto webu se již nebudou zobrazovat</string>
     <string name="reader_menu_block_blog">Zablokovat tento web</string>
-    <string name="schedule_verb">Rozvrh</string>
+    <string name="schedule_verb">Naplánovat</string>
     <string name="update_verb">Aktualizovat</string>
     <string name="reader_empty_recommended_blogs">Nejsou k dispozici žádné doporučené weby</string>
     <string name="reader_toast_err_unfollow_blog">Zrušení sledování tohoto webu se nezdařilo</string>
@@ -1415,8 +2584,8 @@ Language: cs_CZ
     <string name="ssl_certificate_error">Neplatný SSL certifikát</string>
     <string name="help">Nápověda</string>
     <string name="username_or_password_incorrect">Vložené uživatelské jméno nebo heslo je neplatné</string>
-    <string name="email_invalid">Vlož platnou emailovou adresu</string>
-    <string name="invalid_email_message">Tvoje emailová adresa není platná</string>
+    <string name="email_invalid">Vlož platnou e-mailovou adresu</string>
+    <string name="invalid_email_message">Tvoje e-mailová adresa není platná</string>
     <string name="error_downloading_image">Chyba při stahování obrázku</string>
     <string name="error_load_comment">Nemohl nahrát komentář</string>
     <string name="error_edit_comment">Nastala chyba při opravě komentáře</string>
@@ -1503,6 +2672,7 @@ Language: cs_CZ
     <string name="reader_likes_you_and_one">To se líbí vám a jedné další osobě</string>
     <string name="pick_video">Vyberte video</string>
     <string name="pick_photo">Vyberte fotku</string>
+    <string name="sign_up_label">Zaregistrovat se</string>
     <string name="reader_toast_err_url_intent">Nelze otevřít %s</string>
     <string name="reader_toast_err_view_image">Nelze zobrazit obrázek</string>
     <string name="reader_toast_err_share_intent">Nelze sdílet</string>
@@ -1517,6 +2687,7 @@ Language: cs_CZ
     <string name="reader_btn_unfollow">Sleduji</string>
     <string name="reader_btn_follow">Sledovat</string>
     <string name="reader_btn_share">Sdílet</string>
+    <string name="reader_view_reblog">Reblog</string>
     <string name="reader_untitled_post">(bez názvu)</string>
     <string name="comments_empty_list">Zatím žádné komentáře</string>
     <string name="empty_list_default">Tento seznam je prázdný</string>
@@ -1560,6 +2731,7 @@ Language: cs_CZ
     <string name="posts">Příspěvky</string>
     <string name="anonymous">Anonymní</string>
     <string name="no_network_title">Síť není dostupná</string>
+    <string name="done">hotovo</string>
     <string name="ok">OK</string>
     <string name="link_enter_url">URL</string>
     <string name="tos">Podmínky služby</string>
diff --git a/WordPress/src/main/res/values-cy/strings.xml b/WordPress/src/main/res/values-cy/strings.xml
index d467024f85b7..b1a0dc8a4c5a 100644
--- a/WordPress/src/main/res/values-cy/strings.xml
+++ b/WordPress/src/main/res/values-cy/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2017-03-25 17:35:05+0000
 Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;
@@ -48,7 +48,6 @@ Language: cy_GB
     <string name="signout">Allgofnodi</string>
     <string name="sign_in_wpcom">Mewngofnodi i WordPress.com</string>
     <string name="reader_label_global_related_posts">Rhagor am WordPress.com</string>
-    <string name="reader_label_local_related_posts">Rhagor yn %s</string>
     <string name="preference_open_device_settings">Agor gosodiadau\'r ddyfais</string>
     <string name="invite_invalid_email">%s: E-bost annilys</string>
     <string name="invite_user_blocked_invites">%s: Mae\'r defnyddiwr wedi rhwystro gwahoddiadau</string>
@@ -96,18 +95,12 @@ Language: cy_GB
     <string name="invite_error_invalid_usernames_multiple">Methu anfon: Mae yna enwau defnyddwyr neu e-bost annilys</string>
     <string name="invite_error_invalid_usernames_one">Methu anfon: Mae yna enw defnyddiwr neu e-bost annilys</string>
     <string name="invite_error_no_usernames">Ychwanegwch o leiaf un enw defnyddiwr</string>
-    <string name="invite_message_info">(Dewisol) Gallwch gynnwys neges bersonol o hyd at 500 nod a fydd yn cael ei gynnwys yn y gwahoddiad i\'r defnyddiwr.</string>
-    <string name="invite_message_remaining_other">%d nod yn weddill</string>
-    <string name="invite_message_remaining_one">1 nod yn weddill</string>
-    <string name="invite_message_remaining_zero">0 nod yn weddill</string>
-    <string name="invite_message_title">Neges Bersonol</string>
     <string name="invite">Gwahodd</string>
-    <string name="invite_names_title">Enwau defnyddwyr neu E-byst</string>
-    <string name="send_link">Anfon dolen</string>
     <string name="my_site_header_external">Allanol</string>
     <string name="invite_people">Gwahodd Pobl</string>
     <string name="label_clear_search_history">Clirio hanes chwilio</string>
     <string name="dlg_confirm_clear_search_history">Clirio hanes chwilio?</string>
+    <string name="reader_title_related_post_detail">Cofnodion Perthnasol</string>
     <string name="preview_screen_links_disabled">Mae dolenni wedi eu hanalluogi ar y sgrin rhagolwg</string>
     <string name="send">Anfon</string>
     <string name="user_remove_confirmation_message">Os ydych am dynnu %1$s, ni fydd y defnyddiwr yn gallu cael mynediad at y wefan, ond bydd unrhyw gynnwys crëwyd gan %1$s yn aros ar y wefan.\n\nYdych chi dal eisiau tynnu\'r defnyddiwr yma?</string>
@@ -126,7 +119,6 @@ Language: cy_GB
     <string name="checking_email">Gwirio e-bost</string>
     <string name="magic_link_unavailable_error_message">Ddim ar gael ar hyn o bryd. Rhowch eich cyfrinair</string>
     <string name="logging_in">Mewngofnodi</string>
-    <string name="enter_your_password_instead">Rhowch eich cyfrinair yn hytrach</string>
     <string name="web_address_dialog_hint">Dangos yn gyhoeddus pan fyddwch yn gwneud sylw</string>
     <string name="capture_or_pick_photo">Cipio neu ddewis llun</string>
     <string name="export_your_content_message">Bydd cofnodion, tudalennau a gosodiadau yn cael eu e-bost atoch i %s.</string>
@@ -238,7 +230,6 @@ Language: cy_GB
     <string name="site_settings_paging_dialog_description">Torri\'r edefyn sylw i dudalennau lluosog.</string>
     <string name="site_settings_paging_dialog_header">Sylwadau fesul tudalen</string>
     <string name="site_settings_close_after_dialog_title">Cau sylwadau</string>
-    <string name="site_settings_blacklist_description">Pan fydd sylw yn cynnwys unrhyw un o\'r geiriau hyn yn ei gynnwys, enw, URL, e-bost, neu IP, bydd yn cael ei farcio fel sbam. Gallwch gynnig geiriau rhannol, felly bydd \"press\" yn canfod \"WordPress\"</string>
     <string name="site_settings_hold_for_moderation_description">Pan fydd sylw yn cynnwys unrhyw un o\'r geiriau hyn yn ei gynnwys, enw, URL, e-bost neu IP, bydd yn cael ei gadw yn y rhes cymedroli. Gallwch gynnig geiriau rhannol, felly bydd \"press\" yn canfod \"WordPress\"</string>
     <string name="site_settings_list_editor_input_hint">Teipiwch air neu ymadrodd</string>
     <string name="site_settings_list_editor_no_items_text">Dim eitemau</string>
@@ -253,10 +244,8 @@ Language: cy_GB
     <string name="site_settings_rp_show_header_title">Dangos Pennyn</string>
     <string name="site_settings_rp_switch_summary">Mae Cofnodion Perthynol yn dangos cynnwys perthnasol o\'ch gwefan islaw eich cofnodion.</string>
     <string name="site_settings_rp_switch_title">Dangos Cofnodion sy\'n Perthyn</string>
-    <string name="site_settings_blacklist_hint">Mae sylwadau sy\'n cyfateb i hidl yn cael eu marcio fel sbam</string>
     <string name="site_settings_moderation_hold_hint">Mae sylwadau sy\'n cyfateb i hidl yn cael gosod yn y rhes cymedroli</string>
     <string name="site_settings_multiple_links_hint">Anwybyddu terfyn dolen gan ddefnyddwyr hysbys</string>
-    <string name="site_settings_whitelist_hint">Rhaid i awdur y sylw fod wedi cyfrannu sylw cymeradwy yn y gorffennol</string>
     <string name="site_settings_user_account_required_hint">Rhaid i ddefnyddwyr fod wedi\'u cofrestru ac wedi mewngofnodi cyn cynnig sylw</string>
     <string name="site_settings_identity_required_hint">Rhaid i awdur sylw rhoi enw ac e-bost</string>
     <string name="site_settings_paging_hint">Dangos sylwadau mewn darnau o faint penodol</string>
@@ -279,17 +268,13 @@ Language: cy_GB
     <string name="site_settings_address_hint">Nid yw newid eich cyfeiriad yn cael ei gynnal ar hyn o bryd</string>
     <string name="site_settings_tagline_hint">Disgrifiad byr neu ymadrodd bachog i ddisgrifio eich blog</string>
     <string name="site_settings_title_hint">Mewn ychydig eiriau, yn esboniwch beth yw natur y wefan hon</string>
-    <string name="site_settings_whitelist_known_summary">Sylwadau gan ddefnyddwyr hysbys</string>
-    <string name="site_settings_whitelist_all_summary">Sylwadau gan pob defnyddiwr</string>
     <string name="site_settings_threading_summary">%d lefel</string>
     <string name="site_settings_privacy_private_summary">Preifat</string>
     <string name="site_settings_privacy_hidden_summary">Cudd</string>
     <string name="site_settings_delete_site_title">Dileu Gwefan</string>
     <string name="site_settings_privacy_public_summary">Cyhoeddus</string>
-    <string name="site_settings_blacklist_title">Rhestr ddu</string>
     <string name="site_settings_moderation_hold_title">Dal ar gyfer Cymedroli</string>
     <string name="site_settings_multiple_links_title">Dolenni mewn sylwadau</string>
-    <string name="site_settings_whitelist_title">Gymeradwyo\'n awtomatig</string>
     <string name="site_settings_threading_title">Edafu</string>
     <string name="site_settings_paging_title">Tudalennu</string>
     <string name="site_settings_sort_by_title">Trefnu yn ôl</string>
@@ -422,7 +407,6 @@ Language: cy_GB
     <string name="logs_copied_to_clipboard">Cofnodion y rhaglen wedi\'u copïo i\'r clipfwrdd</string>
     <string name="reader_label_new_posts">Cofnodion newydd</string>
     <string name="error_copy_to_clipboard">Digwyddodd gwall wrth gopïo testun i\'r clipfwrdd</string>
-    <string name="reader_page_recommended_blogs">Gwefannau fyddech chi\'n eu hoffi</string>
     <string name="stats_followers_months">%1$d mis</string>
     <string name="stats_followers_a_year">Blwyddyn</string>
     <string name="stats_followers_years">%1$d blwyddyn</string>
@@ -471,7 +455,6 @@ Language: cy_GB
     <string name="schedule_verb">Amserlen</string>
     <string name="reader_page_followed_blogs">Gwefannau sy\'n cael eu dilyn</string>
     <string name="help">Cymorth</string>
-    <string name="forgot_password">Wedi colli eich cyfrinair?</string>
     <string name="ssl_certificate_error">Tystysgrif SSL annilys</string>
     <string name="ssl_certificate_ask_trust">Os ydych fel arfer yn cysylltu â\'r wefan hon heb broblemau, gall y gwall hwn olygu bod rhywun yn ceisio dynwared y wefan a dylech chi beidio parhau. Hoffech chi ymddiried yn y dystysgrif beth bynnag?</string>
     <string name="no_network_message">Nid oes rhwydwaith ar gael</string>
diff --git a/WordPress/src/main/res/values-da/strings.xml b/WordPress/src/main/res/values-da/strings.xml
index 2cb09b1f779d..86e4e7417e45 100644
--- a/WordPress/src/main/res/values-da/strings.xml
+++ b/WordPress/src/main/res/values-da/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2018-06-14 08:40:50+0000
+Translation-Revision-Date: 2021-04-09 15:19:07+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: da_DK
@@ -27,12 +27,11 @@ Language: da_DK
     <string name="comment_q_action_done_generic">Det er udført!</string>
     <string name="signout">Log ud</string>
     <string name="sign_in_wpcom">Log ind i WordPress.com</string>
-    <string name="reader_label_local_related_posts">Se mere i %s</string>
     <string name="invite_invalid_email">%s: ugyldig e-mail</string>
     <string name="error_post_my_profile_no_connection">Der er ingen forbindelse, din profil kunne ikke gemmes</string>
     <string name="alignment_left">Venstre</string>
     <string name="error_fetch_users_list">Kunne ikke hente sidens brugere</string>
-    <string name="people_dropdown_item_team">Gruppe</string>
+    <string name="people_dropdown_item_team">Hold</string>
     <string name="plan">Plan</string>
     <string name="plans">Planer</string>
     <string name="export_your_content">Eksporter dit indhold</string>
@@ -105,7 +104,6 @@ Language: da_DK
     <string name="reader_label_new_posts">Nye indlæg</string>
     <string name="logs_copied_to_clipboard">Log-filerne er kopieret til udklipsholderen</string>
     <string name="error_copy_to_clipboard">Der skete en fejl under kopieringen af teksten til udklipsholderen</string>
-    <string name="reader_page_recommended_blogs">Websteder du måske vil synes om</string>
     <string name="stats_followers_seconds_ago">sekunder siden</string>
     <string name="stats_followers_a_minute_ago">et minut siden</string>
     <string name="stats_followers_a_day">En dag</string>
@@ -154,7 +152,6 @@ Language: da_DK
     <string name="schedule_verb">Planlæg</string>
     <string name="reader_page_followed_blogs">Fulgte websteder</string>
     <string name="help">Hjælp</string>
-    <string name="forgot_password">Mistet din adgangskode?</string>
     <string name="ssl_certificate_error">Dette er ikke et gyldigt SLL certifikat</string>
     <string name="ssl_certificate_ask_trust">Hvis du plejer at tilgå dit websted på denne måde uden problemer, kan denne fejl betyde at nogen forsøger udgive sig for at være dit websted, og du burde ikke fortsætte. Vælger du at stole på certifikatet alligevel?</string>
     <string name="mnu_comment_unspam">Ikke spam</string>
diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml
index e58ca2dcde5c..39b0446254f9 100644
--- a/WordPress/src/main/res/values-de/strings.xml
+++ b/WordPress/src/main/res/values-de/strings.xml
@@ -1,26 +1,490 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-22 19:18:40+0000
+Translation-Revision-Date: 2021-05-12 12:54:54+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: de
 -->
 <resources>
+    <string name="gutenberg_native_audio_settings">Audio-Einstellungen</string>
+    <string name="gutenberg_native_image_settings">Bild-Einstellungen</string>
+    <string name="gutenberg_native_size">Größe</string>
+    <string name="user_profile_site_section_header">Website</string>
+    <string name="user_profile_untitled_site">(Ohne Titel)</string>
+    <string name="user_profile_bottom_sheet_description">Benutzerprofil Bottom Sheet-Informationen</string>
+    <string name="likes_list_screen_title">Liste der Likes %s</string>
+    <string name="gutenberg_native_write_code">Schreibe etwas Code…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sortieren und filtern</string>
+    <string name="gutenberg_native_show_download_button">Download-Button anzeigen</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Weiterlesen</string>
+    <string name="gutenberg_native_post_content_settings">Einstellungen für Beitragsinhalte</string>
+    <string name="gutenberg_native_post_meta_settings">Beitrags-Meta-Einstellungen</string>
+    <string name="gutenberg_native_preload">Vorladen</string>
+    <string name="gutenberg_native_media_area">Medienbereich</string>
+    <string name="gutenberg_native_media_file">Mediendatei</string>
+    <string name="gutenberg_native_metadata">Metadaten</string>
+    <string name="gutenberg_native_loop">Schleife</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Link zu</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">Bild %1$d von %2$d in der Galerie</string>
+    <string name="gutenberg_native_heading_d">Überschrift %d</string>
+    <string name="gutenberg_native_featured">Vorgestellt</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">URL zum Einbetten hier eingeben…</string>
+    <string name="gutenberg_native_edit_image">Bild bearbeiten</string>
+    <string name="gutenberg_native_display_post_date">Beitragsdatum anzeigen</string>
+    <string name="gutenberg_native_change_heading_level">Überschriften-Ebene ändern</string>
+    <string name="gutenberg_native_code">Code</string>
+    <string name="gutenberg_native_browser_default">Browser-Standard</string>
+    <string name="gutenberg_native_attachment_page">Anhang-Seite</string>
+    <string name="gutenberg_native_auto">Automatisch</string>
+    <string name="gutenberg_native_autoplay">Autoplay</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Ein Block kann nicht in sich selbst ausgeführt werden.</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Block wurde gelöscht oder ist nicht verfügbar.</string>
+    <string name="gutenberg_native_add_text">Text hinzufügen…</string>
+    <string name="gutenberg_native_add_caption">Überschrift hinzufügen</string>
+    <string name="gutenberg_native_what_is_alt_text">Was ist Alt-Text?</string>
+    <string name="gutenberg_native_transform_s_to">%s umwandeln in</string>
+    <string name="gutenberg_native_transform_block">Block umwandeln …</string>
+    <string name="gutenberg_native_failed_to_insert_media">Das Medium konnte nicht eingefügt werden.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Audiodatei kann nicht eingefügt werden.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Beschreibe den Zweck des Bildes. Lass dieses Feld frei, falls das Bild rein dekorativ ist. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s umgewandelt in %2$s</string>
+    <string name="like_faces_error_loading_message">Fehler beim Laden der „Like“-Daten. %s.</string>
+    <string name="like_faces_plural_text">%d Bloggern gefällt das.</string>
+    <string name="like_faces_singular_text">1 Blogger gefällt das.</string>
+    <string name="like_title_plural">%d Gefällt mir</string>
+    <string name="like_title_singular">1 Like</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Gib deine Server-Anmeldedaten ein, um Bedrohungen zu beheben.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Gib deine Server-Anmeldedaten ein, um die Bedrohung zu beheben.</string>
+    <string name="suggestion">Vorschlag:</string>
+    <string name="gutenberg_native_search_blocks">Blöcke suchen</string>
+    <string name="gutenberg_native_search_block">Block suchen</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">Zum Wechseln der Einheit zweimal tippen</string>
+    <string name="gutenberg_native_clear_search">Suche löschen</string>
+    <string name="gutenberg_native_cancel_search">Suche abbrechen</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s ist %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Beim Abrufen der „Gefällt mir“-Daten ist ein Fehler aufgetreten.</string>
+    <string name="get_likes_unknown_error">Beim Abrufen der „Gefällt mir“-Angaben ist ein unbekannter Fehler aufgetreten.</string>
+    <string name="get_likes_no_network_error">Kein Netzwerk verfügbar</string>
+    <string name="comments_empty_list_filtered_unreplied">Keine unbeantworteten Kommentare</string>
+    <string name="comment_status_unreplied">Unbeantwortet</string>
+    <string name="gutenberg_native_table_of_contents">Inhaltsverzeichnis</string>
+    <string name="gutenberg_native_summary">Zusammenfassung</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Fasse deinen Beitrag mit einer Liste an Überschriften zusammen. Füge HTML-Anker zu Überschriftenblöcken hinzu, um sie hier zu verknüpfen.</string>
+    <string name="gutenberg_native_document_outline">Gliederung des Dokuments</string>
+    <string name="gutenberg_native_buttongroup">Schaltflächengruppe</string>
+    <string name="jetpack_brute_force_allowlist_title">IP-Adressen auf der Liste „Immer zulassen“</string>
+    <string name="site_settings_denylist_title">Gesperrte Kommentare</string>
+    <string name="reader_title_interests">Themen folgen</string>
+    <string name="activity_log_backup_download_notice_download_action">Herunterladen</string>
+    <string name="stories_intro_main_subtitle">Eine neue Möglichkeit, ansprechende Inhalte auf deiner Website zu erstellen und zu veröffentlichen.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Ausblenden</string>
+    <string name="threat_fix_all_status_success_message_plural">Bedrohungen wurden erfolgreich behoben.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Bitte bestätige, dass du alle %s aktiven Bedrohungen beheben möchtest.</string>
+    <string name="scan_idle_threats_description_plural">Beim Scan wurden %1$s mögliche Bedrohungen bei %2$s gefunden. Prüfe diese bitte unten und führe die erforderliche Aktion aus oder tippe auf den Button „Alle beheben“. Wir sind %3$s, wenn du uns brauchst.</string>
+    <string name="scan_fixing_threats_description_plural">Wir arbeiten im Hintergrund daran, diese Bedrohungen zu beheben. In der Zwischenzeit kannst du deine Website ganz normal verwenden und jederzeit nachsehen, wie weit der Scan schon ist.</string>
+    <string name="gutenberg_native_edit_focal_point">Fokuspunkt bearbeiten</string>
+    <string name="new_site_creation_search_domain_example">beispiel.com</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Tippe zweimal, um das Bottom Sheet zu öffnen und das Bild zu bearbeiten, auszutauschen oder zu löschen</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Tippe zweimal, um das Action Sheet zu öffnen und das Bild zu bearbeiten, auszutauschen oder zu löschen</string>
+    <string name="new_site_creation_search_domain_input_hint">Gib einen Namen für deine Website ein</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Alle Aufgaben abgeschlossen&lt;/b&gt;&lt;br/&gt;Du wirst nun mehr Personen erreichen. Gute Arbeit!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Alle Aufgaben abgeschlossen&lt;/b&gt;&lt;br/&gt;Du hast deine Website angepasst. Gut gemacht!</string>
+    <string name="quick_start_card_menu_hide">Vorerst ausblenden</string>
+    <string name="magic_link_not_meaning_to_create_account">Du wolltest kein neues Konto erstellen? Gehe zurück und gib deine E-Mail-Adresse noch einmal ein.</string>
+    <string name="invite_links_disable_dialog_message">Wenn dieser Einladungslink deaktiviert ist, kann ihn niemand verwenden, um deinem Team beizutreten. Bist du dir sicher?</string>
+    <string name="invite_links_disable_dialog_title">Einladungslink deaktivieren</string>
+    <string name="invite_links_bad_format_response">Ungültige Antwort erhalten</string>
+    <string name="invite_links_null_response">Keine Antwort erhalten</string>
+    <string name="invite_links_cannot_get_role_data_error">Beim Abrufen von Daten für Rolle %1$s ist ein Fehler aufgetreten</string>
+    <string name="invite_links_cannot_get_roles_error">Beim Abrufen von Rollen ist ein Fehler aufgetreten</string>
+    <string name="invite_links_generic_get_data_error">Unbekannter Fehler beim Abrufen von Daten zu Einladungs-Links</string>
+    <string name="invite_links_helper_text">Verwende diesen Link, um deine Teammitglieder einzuladen. Jeder, der diese URL besucht, kann sich bei deiner Organisation registrieren, auch wenn er oder sie den Link von jemand anderem erhalten hat. Teile ihn also nur mit vertrauenswürdigen Personen.</string>
+    <string name="invite_links_section_title">Einladungslink</string>
+    <string name="invite_links_expire_date">Läuft ab %1$s</string>
+    <string name="invite_links_disable_invite_link">Einladungslink deaktivieren</string>
+    <string name="invite_links_share_invite_link">Einladungs-Link teilen</string>
+    <string name="invite_links_generate">Neuen Link generieren</string>
+    <string name="invite_links_get_status_retry">Link-Status aktualisieren</string>
+    <string name="threats_found_plural">Bedrohungen gefunden</string>
+    <string name="threats_found_singular">Bedrohung gefunden</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scan abgeschlossen&lt;/b&gt; &lt;br&gt; %s potenzielle Bedrohungen gefunden</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scan abgeschlossen&lt;/b&gt; &lt;br&gt; Eine potenzielle Bedrohung gefunden</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scan abgeschlossen&lt;/b&gt; &lt;br&gt; Keine Bedrohungen gefunden</string>
+    <string name="disable">Deaktivieren</string>
+    <string name="scan_fixing_threats_title_singular">Bedrohung wird behoben</string>
+    <string name="quick_start_list_review_pages_subtitle">Prüfe deine Seiten und nimm Änderungen vor. Du kannst auch Seiten hinzufügen oder entfernen.</string>
+    <string name="quick_start_card_menu_unpin">Dies lösen</string>
+    <string name="quick_start_list_view_site_title">Besuche deine Website</string>
+    <string name="quick_start_list_upload_icon_subtitle">Füge ein Website-Icon hinzu, um einen eleganten, professionellen Look zu erhalten.</string>
+    <string name="quick_start_list_follow_site_subtitle">Entdecke und folge Websites, die dich inspirieren.</string>
+    <string name="quick_start_list_enable_sharing_title">Teilen aktivieren</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Neue Beiträge automatisch in deinen sozialen Medien teilen.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Wähle einen Namen für deine Website, der am besten zu ihrer Persönlichkeit und Ausrichtung passt.</string>
+    <string name="quick_start_list_check_stats_title">Deine Statistiken prüfen</string>
+    <string name="backup_download_status_failure_bullet2">Wir versuchen weiterhin, deine Backup-Datei zum Herunterladen zu erstellen.</string>
+    <string name="backup_download_status_failure_bullet1">Wir konnten den Status nicht finden, der angibt, wie lange dein Backup zum Herunterladen dauert.</string>
+    <string name="backup_download_status_failure_heading">Wir konnten den Status deines Backups zum Herunterladen leider nicht finden.</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Häkchen-Icon</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Uhr-Icon</string>
+    <string name="restore_status_failure_bullet3">Wir benachrichtigen dich, wenn es fertig ist.</string>
+    <string name="restore_status_failure_bullet2">Wir versuchen trotzdem, deine Website wiederherzustellen.</string>
+    <string name="restore_status_failure_bullet1">Wir konnten den Status nicht finden, um anzugeben, wie lange deine Wiederherstellung dauert.</string>
+    <string name="restore_status_failure_heading">Wir konnten den Status deiner Wiederherstellung leider nicht finden.</string>
+    <string name="restore_complete_failed_description">Wir konnten deine Website nicht wiederherstellen</string>
+    <string name="restore_warning_action_button">Bestätigen</string>
+    <string name="restore_warning_description_with_two_parameters">Möchtest du deine Website wirklich auf %1$s um %2$s zurücksetzen?\n        Alle Änderungen, die du seitdem vorgenommen hast, gehen verloren.</string>
+    <string name="backup_download_complete_failed_description">Dein Backup konnte nicht erstellt werden</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(enthält keine Themes, Plugins und Uploads)</string>
+    <string name="backup_item_contents">WP-content-Verzeichnis</string>
+    <string name="backup_item_roots">WordPress-Root</string>
+    <string name="backup_download_details_choose_items_header">In diesem Download enthaltene Elemente</string>
+    <string name="gutenberg_native_uploading">Wird hochgeladen …</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Wiederverwendbare Blöcke können auf WordPress für iOS nicht bearbeitet werden</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Wiederverwendbare Blöcke können auf WordPress für Android nicht bearbeitet werden</string>
+    <string name="gutenberg_native_replace_file">Datei ersetzen</string>
+    <string name="gutenberg_native_replace_audio">Audio ersetzen</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problem beim Öffnen der Audiodatei</string>
+    <string name="gutenberg_native_open">ÖFFNEN</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Diese Anfrage kann von keiner Anwendung verarbeitet werden.</string>
+    <string name="gutenberg_native_lock_icon">Schloss-Icon</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Audiodatei kann nicht eingefügt werden. Für Optionen hier tippen.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Doppeltippen, um eine Audiodatei auszuwählen</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Doppeltippen, um die Audiodatei anzuhören</string>
+    <string name="gutenberg_native_choose_audio">Audio-Datei wählen</string>
+    <string name="gutenberg_native_audio_player">Audio-Player</string>
+    <string name="gutenberg_native_audio_file">Audiodatei</string>
+    <string name="gutenberg_native_audio_caption_s">Audiountertitel. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Audiountertitel. Leer</string>
+    <string name="gutenberg_native_add_audio">AUDIO HINZUFÜGEN</string>
+    <string name="continue_with_wpcom">Mit WordPress.com anmelden oder registrieren</string>
+    <string name="photo_picker_use_audio">Diese Audiodatei verwenden</string>
+    <string name="photo_picker_choose_audio">Audio auf Gerät auswählen</string>
+    <string name="people_optional_custom_message_helper_text">Optional: Gib eine individuelle Nachricht ein, die zusammen mit deiner Einladung gesendet wird.</string>
+    <string name="people_learn_more_about_roles">Weiter Informationen zu Rollen</string>
+    <string name="threat_status_fixed">Fixiert</string>
+    <string name="threat_found_header">Gefunden</string>
+    <string name="scan_here_to_help">hier, um zu helfen</string>
+    <string name="scan_idle_threats_description_singular">Beim Scan wurde eine mögliche Bedrohung bei %1$s gefunden. Prüfe die Bedrohung bitte unten und führe die erforderliche Aktion aus oder tippe auf den Button „Alle beheben“. Wir sind %2$s, wenn du uns brauchst.</string>
+    <string name="scan_idle_manual_scan_description">Um deine Website noch einmal zu prüfen, führe einen manuellen Scan aus oder warte, bis deine Website heute zu einem späteren Zeitpunkt von Jetpack gescannt wird.</string>
+    <string name="scan_provisioning_description">Willkommen bei Jetpack Scan! Wir bereiten gerade einen vollständigen Scan vor und sehen uns deine Website genau an. Wir geben dir Bescheid, wenn wir etwas sehen, das den Scan beeinträchtigen könnte. Anschließend beginnt dein erster vollständiger Scan.</string>
+    <string name="scan_scanning_is_initial_description">Willkommen bei Jetpack Scan! Wir sehen uns deine Website jetzt an und teilen dir die Ergebnisse bald mit.</string>
+    <string name="scan_scanning_description">Wir werden dir eine Benachrichtigung schicken, sobald der Scan abgeschlossen ist. In der Zwischenzeit kannst du deine Website ganz normal verwenden und jederzeit nachsehen, wie weit der Scan schon ist.</string>
+    <string name="scan_fixing_threats_description_singular">Wir arbeiten im Hintergrund daran, die Bedrohung zu beheben. In der Zwischenzeit kannst du deine Website ganz normal verwenden und jederzeit nachsehen, wie weit der Scan schon ist.</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan konnte einen Scan deiner Website ausführen. Schau bitte nach, ob deine Website erreichbar ist. Wenn ja, versuche es erneut. Wenn sie nicht erreichbar ist oder wenn mit Jetpack Scan weiterhin Probleme auftreten, wende dich bitte an unser Support-Team.</string>
+    <string name="scan_fixing_threats_title_plural">Bedrohungen werden behoben</string>
+    <string name="scan_request_failed_title">Etwas ist schiefgelaufen</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Erstellung eines Backups der Website</string>
+    <string name="activity_log_currently_backing_up_message">Erstellung eines Backups der Website von %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Erstellung eines herunterladbaren Backups</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Deine Website wurde erfolgreich gesichert</string>
+    <string name="activity_log_backup_finished_snackbar_message">Deine Website wurde erfolgreich gesichert\nBackup erstellt von %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Deine Website wird gesichert\nBackup wird erstellt von %1$s %2$s</string>
+    <string name="pick_audio">Audio-Datei auswählen</string>
+    <string name="restore_complete_failed_icon_content_description">Fehler-Icon</string>
+    <string name="restore_complete_failed_action_button_content_description">Fertig-Button</string>
+    <string name="restore_another_process_running">Es wird gerade eine andere Wiederherstellung durchgeführt.</string>
+    <string name="restore_complete_visit_site_action_button">Website besuchen</string>
+    <string name="restore_complete_failed_title">Wiederherstellungsfehler</string>
+    <string name="restore_complete_visit_site_button_content_description">Website besuchen-Button</string>
+    <string name="restore_complete_done_button_content_description">Fertig-Button</string>
+    <string name="restore_complete_icon_content_description">Wiederherstellen-Button</string>
+    <string name="restore_complete_description_with_two_parameters">Alle deine ausgewählten Elemente werden jetzt auf den Stand von %1$s %2$s wiederhergestellt.</string>
+    <string name="restore_complete_header">Deine Website wurde wiederhergestellt.</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Du brauchst nicht zu warten. Wir benachrichtigen dich, wenn deine Website wiederhergestellt wurde.</string>
+    <string name="restore_progress_icon_content_description">Website wiederherstellen-Button</string>
+    <string name="restore_progress_description_with_two_parameters">Wir stellen deine Website auf %1$s %2$s wieder her.</string>
+    <string name="restore_progress_header">Website wird derzeit wiederhergestellt</string>
+    <string name="restore_warning_action_button_content_description">Button für Websitewiederherstellung bestätigen</string>
+    <string name="restore_warning_header">Warnung</string>
+    <string name="restore_warning_icon_content_description">Bild mit rotem Kreis und Ausrufezeichen</string>
+    <string name="restore_details_action_button_content_description">Button für Websitewiederherstellung</string>
+    <string name="restore_details_action_button">Website wiederherstellen</string>
+    <string name="restore">Wiederherstellen</string>
+    <string name="backup_download_complete_failed_action_button">Fertig</string>
+    <string name="restore_details_icon_content_description">Wiederherstellen-Button</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s ist der ausgewählten Punkt für deine Wiederherstellung.</string>
+    <string name="restore_details_header">Website wiederherstellen</string>
+    <string name="restore_details_choose_items_header">Auswahl der Elemente zur Wiederherstellung:</string>
+    <string name="backup_download_complete_failed_icon_content_description">Button für Wolke mit X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Fertig-Button</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Mobil</string>
+    <string name="backup_download_complete_failed_title">Download fehlgeschlagen</string>
+    <string name="quick_start_card_menu_remove">Nicht erneut anzeigen</string>
+    <string name="quick_start_card_menu_pin">Anheften</string>
+    <string name="quick_start_dialog_review_pages_message_short">Wähle %1$s Seiten %2$s aus, um deine Seitenliste anzuzeigen.</string>
+    <string name="quick_start_dialog_review_pages_message">Du kannst die Seiten deiner Website ändern, hinzufügen oder entfernen.</string>
+    <string name="quick_start_dialog_review_pages_title">Website-Seiten prüfen</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Wähle %1$s Startseite %2$s aus, um deine Homepage zu bearbeiten.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Wähle %1$s Seiten %2$s aus, um deine Seitenliste anzuzeigen.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Du kannst Inhalte auf der Startseite deiner Website ändern, hinzufügen oder entfernen.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Startseite bearbeiten</string>
+    <string name="reader_menu_mark_as_seen">Als gesehen markieren</string>
+    <string name="reader_menu_mark_as_unseen">Als nicht gesehen markieren</string>
+    <string name="error_media_upload_failed_for_reason">Medien-Upload fehlgeschlagen.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Nicht genügend verfügbarer Websitespeicher</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Gesehen-Status dieses Beitrags kann nicht umgeschaltet werden</string>
+    <string name="reader_marked_post_as_unseen">Als nicht gesehen markiert</string>
+    <string name="reader_marked_post_as_seen">Beitrag als gesehen markiert</string>
+    <string name="threat_fix_all_status_error_message">Fehler beim Abrufen des Behebungsstatus. Bitte kontaktiere den Support.</string>
+    <string name="threat_fix_all_error_message">Fehler beim Beheben von Bedrohungen. Bitte kontaktiere den Support.</string>
+    <string name="threat_fix_all_status_success_message_singular">Die Bedrohung wurde erfolgreich behoben.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Bitte bestätige, dass du eine aktive Bedrohung beheben möchtest.</string>
+    <string name="threat_fix_all_warning_title">Alle Bedrohungen beheben</string>
+    <string name="threat_ignore_error_message">Fehler beim Ignorieren der Bedrohung. Bitte kontaktiere den Support.</string>
+    <string name="threat_ignore_success_message">Bedrohung ignoriert.</string>
+    <string name="threat_ignore_warning">Ein Sicherheitsproblem solltest du nur ignorieren, wenn du dir absolut sicher bist, dass es harmlos ist. Wenn du diese Bedrohung ignorieren möchtest, wird sie auf deiner Website &lt;b&gt;%s&lt;/b&gt; verbleiben.</string>
+    <string name="threat_fix_error_message">Fehler beim Beheben der Bedrohung. Bitte kontaktiere den Support.</string>
+    <string name="scan_history_ignored_threats_tab">Ignoriert</string>
+    <string name="threat_item_sub_header_status_ignored">Bedrohung ignoriert</string>
+    <string name="threat_fixing">Bedrohung wird behoben</string>
+    <string name="scan_history_no_threats_found">Keine Elemente gefunden</string>
+    <string name="scan_history_fixed_threats_tab">Fixiert</string>
+    <string name="scan_history_all_threats_tab">Alle</string>
+    <string name="scan_scanning_title">Dateien werden gescannt</string>
+    <string name="scan_preparing_to_scan_title">Scannen wird vorbereitet</string>
+    <string name="scan_history_menu_title">Verlauf</string>
+    <string name="scan_history">Scanverlauf</string>
+    <string name="backup_active_filter_empty_subtitle">Versuche, den Datumsbereich anzupassen</string>
+    <string name="backup_active_filter_empty_title">Keine passenden Backups gefunden</string>
+    <string name="backup_empty_subtitle">Dein erstes Backup wird innerhalb von 24 Stunden hier bereitgestellt. Du erhältst eine Benachrichtigung, wenn das Backup abgeschlossen ist.</string>
+    <string name="threat_item_sub_header_status_fixed_on">Bedrohung behoben am %s</string>
+    <string name="backup_empty_title">Dein erstes Backup ist bald fertig</string>
+    <string name="request_failed_message">Bei der Bearbeitung der Anfrage ist ein Problem aufgetreten. Bitte versuche es später erneut.</string>
+    <string name="gutenberg_native_move_to_bottom">Nach unten verschieben</string>
+    <string name="gutenberg_native_change_block_position">Block-Position ändern</string>
+    <string name="jetpack_icon_content_description">Icon</string>
+    <string name="backup_download_complete_info">Wir haben dir auch einen Link zu deiner Datei per E-Mail geschickt.</string>
+    <string name="label_control_upload">Upload</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">„Link teilen“-Button</string>
+    <string name="backup_download_complete_download_action_button_content_description">Download-Button</string>
+    <string name="backup_download_complete_download_action_button">Herunterladen</string>
+    <string name="backup_download_complete_header">Du kannst dein Backup nun herunterladen</string>
+    <string name="backup_download_complete_download_share_action_button">Link teilen</string>
+    <string name="backup_download_complete_icon_content_description">Herunterladbares Backup fertig-Icon</string>
+    <string name="backup_download_complete_description_with_two_parameters">Wir haben erfolgreich ein Backup deiner Website vom %1$s %2$s erstellt.</string>
+    <string name="backup_download_complete_page_title">Dein Backup</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_icon_content_description">Herunterladbares Backup-Icon erstellen</string>
+    <string name="backup_download_progress_description_with_two_parameters">Wir erstellen ein herunterladbares Backup deiner Website vom %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Wir erstellen momentan ein herunterladbares Backup deiner Website</string>
+    <string name="backup_download_progress_footnote">Du brauchst nicht zu warten. Wir teilen dir mit, wenn dein Backup fertig ist.</string>
+    <string name="backup_download_progress_page_title">Backup herunterladen</string>
+    <string name="backup_download_generic_failure">Bei der Bearbeitung der Anfrage ist ein Problem aufgetreten. Bitte versuche es später erneut.</string>
+    <string name="backup_download_another_download_running">Ein anderer Download läuft gerade.</string>
+    <string name="backup_download_details_action_button_content_description">Herunterladbares Backup-Button erstellen</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s ist der ausgewählte Punkt, um ein herunterladbares Backup zu erstellen.</string>
+    <string name="gutenberg_native_image_link_url">Bild-Link-URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_user">Benutzer</string>
+    <string name="threat_ignore">Bedrohung ignorieren</string>
+    <string name="threat_fix">Bedrohung beheben</string>
+    <string name="threat_get_free_estimate">Kostenloses Angebot einholen</string>
+    <string name="suggestion_xpost">auch veröffentlichen</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan beseitigt die Bedrohung.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan bearbeitet die betroffene Datei bzw. das betroffene Verzeichnis.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan wird auf eine neuere Version (%s) aktualisiert.</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan löscht die betroffene Datei bzw. das betroffene Verzeichnis.</string>
+    <string name="suggestion_no_matching">Keine passenden %s.</string>
+    <string name="suggestion_problem">Beim Laden von Vorschlägen ist ein Fehler aufgetreten.</string>
+    <string name="suggestion_none">Keine %s Vorschläge verfügbar.</string>
+    <string name="suggestion_selection_needed">Nimm eine Eingabe vor, um die Liste der Vorschläge zu filtern.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan ersetzt die betroffene Datei bzw. das betroffene Verzeichnis.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan kann diese Bedrohung nicht automatisch beheben.\n Wir empfehlen dir, die Bedrohung manuell zu entfernen: Stelle sicher, dass WordPress, dein Theme und alle deine Plugins auf dem neuesten Stand sind und entferne anschließend den betroffenen Code, das betroffene Theme oder das betroffene Plugin von deiner Website. \n \n\n Wenn du weitere Hilfe benötigst, um diese Bedrohung zu beheben, empfehlen wir dir &lt;b&gt;Codeable&lt;/b&gt;, einen Marktplatz für vertrauenswürdige Freiberufler mit sorgfältig geprüften WordPress-Experten.\n Von Codeable wurde eine Gruppe ausgewählter Sicherheitsexperten zusammengestellt, um bei diesen Projekten Unterstützung zu leisten. Die Preise reichen von 70 bis 120 USD/Stunde und du kannst kostenlos ein unverbindliches Angebot einholen.</string>
+    <string name="threat_fix_current_not_fixable_header">Beseitigen der Bedrohung</string>
+    <string name="threat_fix_fixed_header">Wie hat Jetpack es behoben?</string>
+    <string name="threat_fix_default_header">Wie beheben wir es?</string>
+    <string name="threat_file_description">Bedrohung in Datei gefunden:</string>
+    <string name="threat_technical_details_header">Die technischen Details</string>
+    <string name="threat_problem_header">Was war das Problem?</string>
+    <string name="threat_details">Bedrohungsdetails</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Schwachstelle im Theme gefunden</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Schwachstelle im Plugin gefunden</string>
+    <string name="threat_item_sub_header_file_signature">Bedrohung gefunden %s</string>
+    <string name="threat_item_sub_header_core_file">Schwachstelle in WordPress gefunden</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Verschiedene Schwachstellen</string>
+    <string name="threat_item_header_vulnerable_theme">Gefährdetes Theme: %s (Version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Gefährdetes Plugin: %s (Version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: bösartiges Codemuster</string>
+    <string name="threat_item_header_database_threat">Datenbankbedrohung %s</string>
+    <string name="scan_this_site">diese Website</string>
+    <string name="threat_item_header_threat_found">Bedrohung gefunden</string>
+    <string name="threat_item_header_infected_core_file">%s: infizierte Core-Datei</string>
+    <string name="scan_idle_last_scan_description">Der letzte Jetpack Scan wurde ausgeführt am %s. Dabei wurden keine Risiken festgestellt. %s</string>
+    <string name="scan_in_few_seconds">vor einigen Sekunden</string>
+    <string name="scan_in_hours_ago">vor %s Stunde(n)</string>
+    <string name="scan_in_minutes_ago">vor %s Minute(n)</string>
+    <string name="threats_fix_all">Alle beheben</string>
+    <string name="backup">Backup</string>
+    <string name="scan_now">Jetzt scannen</string>
+    <string name="scan_again">Erneut scannen</string>
+    <string name="scan_idle_no_threats_found_title">Mach dir keine Sorgen</string>
+    <string name="scan_idle_threats_found_title">Deine Website ist möglicherweise gefährdet</string>
+    <string name="scan_state_icon">Icon für Scan-Status</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Aktivitätstyp-Filter (%s Typen ausgewählt)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (%s Elemente werden angezeigt)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Aktivitätstyp-Filter</string>
+    <string name="activity_log_activity_type_empty_subtitle">Keine Aktivitäten im ausgewählten Zeitraum aufgezeichnet.</string>
+    <string name="activity_log_activity_type_empty_title">Keine Aktivitäten verfügbar</string>
+    <string name="activity_log_activity_type_error_subtitle">Bitte überprüfe deine Internetverbindung und versuche es erneut.</string>
+    <string name="activity_log_activity_type_error_title">Keine Verbindung</string>
+    <string name="activity_log_activity_type_filter_active_label">Aktivitätstyp (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Datumsbereich-Filter</string>
+    <string name="activity_log_active_filter_empty_title">Keine passenden Ereignisse gefunden</string>
+    <string name="activity_log_active_filter_empty_subtitle">Versuche, deinen Zeitraum oder Aktivitätsfilter zu ändern</string>
+    <string name="backup_item_media_uploads">Medien-Uploads</string>
+    <string name="backup_item_themes">WordPress-Themes</string>
+    <string name="backup_item_plugins">WordPress-Plugins</string>
+    <string name="backup_download_details_icon_content_description">Herunterladbares Backup-Icon erstellen</string>
+    <string name="backup_item_sqls">Website-Datenbank</string>
+    <string name="backup_item_roots_hint">(beinhaltet wp-config.php und alle Nicht-WordPress-Dateien)</string>
+    <string name="activity_log_activity_type_filter_label">Aktivitätstyp</string>
+    <string name="activity_log_item_menu_download_backup_label">Backup herunterladen</string>
+    <string name="gutenberg_native_choose_file">Datei auswählen</string>
+    <string name="activity_log_item_menu_restore_label">Zu diesem Punkt wiederherstellen</string>
+    <string name="gutenberg_native_error">Fehler</string>
+    <string name="backup_download_details_page_title">Backup herunterladen</string>
+    <string name="backup_download_details_header">Herunterladbares Backup erstellen</string>
+    <string name="backup_download">Backup-Download</string>
+    <string name="backup_download_details_action_button">Herunterladbare Datei erstellen</string>
+    <string name="activity_log_date_range_filter_label">Zeitraum</string>
+    <string name="button_copy">Duplizieren</string>
+    <string name="activity_log_activity_type_filter_header">Nach Aktivitätstyp filtern</string>
+    <string name="dialog_confirm_copy_local_copy_button">Die Version von dieser App kopieren</string>
+    <string name="dialog_confirm_copy_local_edit_button">Den Beitrag zuerst bearbeiten</string>
+    <string name="dialog_confirm_copy_local_title">Synchronisierungskonflikt des Beitrags</string>
+    <string name="dialog_confirm_copy_local_message">Der Beitrag, den du zu kopieren versuchst, hat zwei Versionen, die miteinander in Konflikt stehen, oder du hast kürzlich Änderungen vorgenommen, diese aber nicht gespeichert.\nBearbeite zuerst den Beitrag, um den Konflikt zu lösen, oder fahre mit dem Kopieren der Version aus dieser App fort.</string>
+    <string name="toast_edit_story_update_in_progress_title">Die Story wird gespeichert, bitte warten…</string>
+    <string name="gutenberg_native_file_name">Dateiname</string>
+    <string name="gutenberg_native_file_block_settings">Blockeinstellungen der Datei</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Dateien konnten nicht hochgeladen werden.\nFür Optionen hier tippen.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Dateien konnten nicht gespeichert werden.\nFür Optionen hier tippen.</string>
+    <string name="gutenberg_native_edit_file">Datei bearbeiten</string>
+    <string name="gutenberg_native_copy_file_url">Datei-URL kopieren</string>
+    <string name="gutenberg_native_choose_a_file">Datei auswählen</string>
+    <string name="new_site_creation_domain_header_title">Domain auswählen</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack-Einstellungen</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Abmeldung von den Kommentaren für diesen Beitrag fehlgeschlagen</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Abonnement für Kommentare in diesem Beitrag fehlgeschlagen</string>
+    <string name="reader_follow_comments_get_status_error">Fehler beim Abrufen des Abonnementstatus für den Beitrag</string>
+    <string name="reader_follow_comments_unsubscribe_success">Erfolgreich von den Kommentaren abgemeldet</string>
+    <string name="reader_btn_following_comments">Du folgst der Unterhaltung per E-Mail</string>
+    <string name="reader_btn_follow_comments">Unterhaltung per E-Mail folgen</string>
+    <string name="reader_follow_comments_subscribe_success">Kommentare erfolgreich abonniert</string>
+    <string name="reader_follow_comments_bad_format_response">Ungültige Antwort erhalten</string>
+    <string name="reader_follow_comments_null_response">Keine Antwort erhalten</string>
+    <string name="activity_log_activity_type_filter_clear">Löschen</string>
+    <string name="activity_log_activity_type_filter_apply">Übernehmen</string>
+    <string name="dialog_edit_story_unsupported_format_message">Mindestens eine Folie wurde nicht zu deiner Story hinzugefügt, da Stories derzeit keine GIF-Dateien unterstützen. Bitte wähle stattdessen ein statisches Bild oder einen Videohintergrund aus.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF-Dateien werden nicht unterstützt</string>
+    <string name="dialog_edit_story_unrecoverable_message">Wir konnten die Medien für diese Story auf der Website nicht finden.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Story kann nicht bearbeitet werden</string>
+    <string name="dialog_edit_story_unavailable_message">Medien für diese Story können nicht geladen werden. Überprüfe deine Internetverbindung und versuche es dann erneut.</string>
+    <string name="dialog_edit_story_unavailable_title">Story kann nicht bearbeitet werden</string>
+    <string name="dialog_edit_story_limited_message">Diese Story wurde auf einem anderen Gerät bearbeitet und die Möglichkeiten, bestimmte Objekte zu bearbeiten, sind ggfs. eingeschränkt.</string>
+    <string name="dialog_edit_story_limited_title">Eingeschränkte Story-Bearbeitung</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Die Medien wurden entfernt. Versuche, deine Story neu zu erstellen.</string>
+    <string name="delete_button_alt">Löschen</string>
+    <string name="hpp_choose_error">Beim Auswählen des Designs ist ein Fehler aufgetreten.</string>
+    <string name="label_next_button">Weiter</string>
+    <string name="label_done_button">Fertig</string>
+    <string name="dialog_discard_story_title_edit">Änderungen verwerfen?</string>
+    <string name="dialog_discard_story_ok_button_edit">Verwerfen</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="color_picker_label_background">Hintergrund</string>
+    <string name="hpp_error_title">Layouts sind offline nicht verfügbar</string>
+    <string name="dialog_discard_story_message_edit">Änderungen werden nicht gespeichert.</string>
+    <string name="hpp_retry_error">Bitte überprüfe deine Internetverbindung und versuche es erneut.</string>
+    <string name="hpp_error_subtitle">Tippe auf „Erneut versuchen“, wenn du wieder online bist.</string>
+    <string name="reader_discover_empty_title">Willkommen!</string>
+    <string name="scan">Scannen</string>
+    <string name="reader_discover_no_posts_title">Keine aktuellen Beiträge</string>
+    <string name="continue_site_credentials">Mit Store-Anmeldedaten fortfahren</string>
+    <string name="login_find_your_connected_email">Verbundene E-Mail-Adresse suchen</string>
+    <string name="reader_discover_no_posts_button_text">Themen folgen</string>
+    <string name="reader_discover_no_posts_subtitle">Folge mehreren Themen, um deine Suche zu erweitern</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; hat auf deinen Beitrag geantwortet</string>
+    <string name="login_prologue_third_subtitle_two">Heute hast du auf deiner Website &lt;b&gt;50 \"Gefällt mir\"-Angaben&lt;/b&gt; erhalten:</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; gefällt dein Beitrag</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Scrollbares Block-Menü geöffnet. Wähle einen Block aus.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Scrollbares Block-Menü geschlossen.</string>
+    <string name="hpp_skip_button">Überspringen</string>
+    <string name="hpp_choose_button">Auswählen</string>
+    <string name="hpp_subtitle">Wähle ein Layout für deine Startseite aus, das dir gefällt. Du kannst es später bearbeiten und anpassen.</string>
+    <string name="hpp_title">Wähle ein Design</string>
+    <string name="mlp_network_error_subtitle">Tippe auf „erneut versuchen“, wenn du wieder online bist oder erstelle über den Button unten eine leere Seite.</string>
+    <string name="mlp_network_error_title">Layouts sind offline nicht verfügbar</string>
+    <string name="mlp_error_subtitle">Tippe auf „erneut versuchen“ oder erstelle über den Button unten eine leere Seite.</string>
+    <string name="mlp_error_title">Layouts sind aufgrund eines Fehlers nicht verfügbar</string>
+    <string name="prepublishing_nudges_add_category_button">Kategorie hinzufügen</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Neue Kategorie erstellen</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorien</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Nicht festgelegt</string>
+    <string name="prepublishing_nudges_categories_action">Kategorien</string>
+    <string name="login_prologue_fifth_caption_three">Museen in London</string>
+    <string name="login_prologue_fifth_caption_two">Die weltbesten Fans</string>
+    <string name="login_prologue_fifth_caption_one">Meine Top 10 Cafés</string>
+    <string name="login_prologue_fifth_tag_six">Politik</string>
+    <string name="login_prologue_fifth_tag_five">Musik</string>
+    <string name="login_prologue_fifth_tag_four">Gärtnern</string>
+    <string name="login_prologue_fifth_tag_three">American Football</string>
+    <string name="login_prologue_fifth_tag_two">Kochen</string>
+    <string name="login_prologue_fifth_tag_one">Kunst</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock\'n\'Roll wöchentlich</string>
+    <string name="login_prologue_fifth_subtitle_two">Web-Nachrichten</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Ich finde die Arbeit von Fotograf Cameron Karsten sehr inspirierend. Das nächste Mal probiere ich diese Techniken auch aus</string>
+    <string name="login_prologue_second_subtitle_one">Inspiration</string>
+    <string name="login_prologue_title_fourth">Sieh mithilfe von umfassenden Analysen dabei zu, wie deine Zielgruppe wächst.</string>
+    <string name="login_prologue_title_second">Mit dem leistungsstarken Editor kannst du auch von unterwegs aus Beiträge veröffentlichen.</string>
+    <string name="login_prologue_title_first">Willkommen beim beliebtesten Website-Baukasten der Welt.</string>
+    <string name="login_prologue_title_third">Kommentare und Benachrichtigungen in Echtzeit anzeigen.</string>
+    <string name="login_prologue_title_fifth">Folge deinen Lieblingswebsites und entdecke neue Blogs.</string>
+    <string name="media_loading_failed">Laden der Medien fehlgeschlagen</string>
+    <string name="reader_discover_recommended_blogs_header">Websites, denen du folgen möchtest</string>
     <string name="gutenberg_native_s_is_not_fully_supported">„%s“ wird nicht vollständig unterstützt</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Wir arbeiten hart daran, mit jeder Veröffentlichung weitere Blöcke hinzuzufügen.</string>
     <string name="gutenberg_native_help_button">Hilfe-Button</string>
     <string name="gutenberg_native_choose_images">Bilder auswählen</string>
-    <string name="mlp_preview_title">Layout-Vorschau</string>
+    <string name="gutenberg_native_edit_using_web_editor">Mit dem Webeditor bearbeiten</string>
+    <string name="stories_intro_create_story_post_label">Story-Beitrag erstellen</string>
+    <string name="stories_intro_description_second">Sie werden auf deiner Website als ein neuer Blogbeitrag veröffentlicht, damit deine Leserschaft nie etwas verpasst.</string>
+    <string name="stories_intro_title_second">Story-Beiträge verschwinden nicht</string>
+    <string name="stories_intro_description_first">Kombiniere Fotos, Videos und Text, um ansprechende und antippbare Story-Beiträge zu erstellen, die deine Besucher begeistern.</string>
+    <string name="stories_intro_title_first">Storys sind jetzt für alle verfügbar</string>
+    <string name="stories_intro_image_caption_second">Beispieltitel für Story</string>
+    <string name="stories_intro_image_caption_first">So erstellst du einen Story-Beitrag</string>
+    <string name="stories_intro_main_title">Neu: Story-Beiträge</string>
+    <string name="mlp_notice_blank_page_created">Leere Seite erstellt</string>
+    <string name="mlp_notice_page_created">Seite erstellt</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s wurde der Zugriff auf deine Fotos verweigert. Um das zu korrigieren, bearbeite deine Rechte und aktiviere %2$s und %3$s.</string>
+    <string name="media_insert_failed">Fehler beim Einfügen von Medien.</string>
+    <string name="media_insert_failed_with_reason">Fehler beim Einfügen von Medien: %s</string>
+    <string name="photo_picker_wordpress_media_library">Wähle aus der WordPress-Mediathek</string>
     <string name="reader_label_toolbar_back">Zurück</string>
     <string name="reader_discover_empty_button_text">Erste Schritte</string>
     <string name="reader_post_details_header_by_author_name">Von</string>
+    <string name="reader_discover_empty_subtitle">Folge Themen, um neue Blogs zu entdecken</string>
     <string name="stats_referrer_popup_menu_mark_as_spam">Als Spam markieren</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Dieser Referrer kann nicht als Spam markiert werden</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Spam-Markierung aufheben</string>
+    <string name="stats_referrer_popup_menu_open_website">Website öffnen</string>
+    <string name="media_uploading_gif_library_photo">Gif-Medien werden hochgeladen</string>
+    <string name="media_uploading_stock_library_photo">Archivmedien werden hochgeladen</string>
+    <string name="media_uploading_default">Medien werden hochgeladen …</string>
     <string name="gutenberg_native_select_item">Artikel auswählen</string>
     <string name="gutenberg_native_search_or_type_url">URL suchen oder eingeben</string>
+    <string name="gutenberg_native_page_break">Seitenumbruch</string>
     <string name="gutenberg_native_add_this_telephone_link">Diesen Telefonlink hinzufügen</string>
     <string name="gutenberg_native_add_this_link">Diesen Link hinzufügen</string>
     <string name="gutenberg_native_add_this_email_link">Diesen E-Mail-Link hinzufügen</string>
-    <string name="suggestion_no_connection">„Keine Internverbindung.\nKeine Vorschläge verfügbar.“</string>
+    <string name="suggestion_no_connection">Keine Internetverbindung.\nKeine Vorschläge verfügbar.</string>
     <string name="typeface_label_shrikhand">Fett</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_pacifico">Verspielt</string>
@@ -36,16 +500,17 @@ Language: de
     <string name="comment_unable_to_show_error">Dieser Kommentar kann nicht angezeigt werden</string>
     <string name="media_browse_for_items">Artikel durchsuchen</string>
     <string name="reader_menu_report_post">Diesen Beitrag melden</string>
-    <string name="gutenberg_native_angle">Winkel</string>
     <string name="reader_welcome_banner">Willkommen beim Reader. Entdecke mit nur einem Klick Millionen von Blogs.</string>
     <string name="error_media_xmlrcp_server_error">Es ist ein interner Serverfehler aufgetreten</string>
     <string name="error_media_xmlrpc_not_allowed">Deine Aktion ist nicht zulässig</string>
     <string name="show_n_hidden_items_desc">%1$s weitere Elemente</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Hinweis: Das Spaltenlayout kann je nach Theme und Bildschirmgröße variieren</string>
     <string name="gutenberg_native_select_a_layout">Layout auswählen</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
+    <string name="create_page_fab_tooltip">Eine Seite erstellen</string>
+    <string name="create_post_fab_tooltip">Einen Beitrag erstellen</string>
     <string name="reader_discover_interests_header">Das gefällt dir vielleicht</string>
     <string name="create_post_story_fab_tooltip">Erstelle einen Beitrag oder eine Story</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ausblenden</string>
     <string name="dialog_insufficient_device_storage_error_ok_button">Speicher anzeigen</string>
     <string name="toast_capture_operation_in_progress">Operation läuft, versuche es erneut</string>
     <string name="toast_error_saving_image">Fehler beim Speichern des Bilds</string>
@@ -79,7 +544,6 @@ Language: de
     <string name="label_frame_errored">fehlerhaft</string>
     <string name="label_text_alignment_button">Textausrichtung ändern</string>
     <string name="label_text_color_button">Textfarbe ändern</string>
-    <string name="menu_delete_page">Slide löschen</string>
     <string name="dialog_discard_story_ok_button">Verwerfen</string>
     <string name="dialog_discard_page_ok_button">Löschen</string>
     <string name="story_saving_untitled">Ohne Titel</string>
@@ -90,19 +554,16 @@ Language: de
     <string name="dialog_discard_page_title">Story-Slide entfernen?</string>
     <string name="mlp_preview_page">Vorschau</string>
     <string name="text_button_alt">Text</string>
-    <string name="more_button_alt">Mehr</string>
     <string name="sound_button_alt">Ton</string>
     <string name="label_control_saved">Gespeichert</string>
     <string name="label_snackbar_share">TEILEN</string>
     <string name="label_control_retry">Erneut versuchen</string>
     <string name="label_saved_icon">Gespeichert</string>
     <string name="label_close_button">Schließen</string>
-    <string name="label_control_publish">Weiter</string>
     <string name="label_retry_icon">Erneut versuchen</string>
     <string name="mlp_create_page">Seite erstellen</string>
     <string name="mlp_create_blank_page">Leere Seite erstellen</string>
     <string name="label_frame_image">Folie</string>
-    <string name="label_done">Fertig</string>
     <string name="label_share_to">Teilen auf</string>
     <string name="label_snackbar_loop_frame_saved">In Fotos gespeichert</string>
     <string name="label_control_saving">Wird gespeichert …</string>
@@ -114,7 +575,7 @@ Language: de
     <string name="capture_button_alt">Erfassen</string>
     <string name="mlp_choose_layout_subtitle">Beginne mit der Auswahl eines der vielen vorgefertigten Seitenlayouts. Oder beginne einfach mit einer leeren Seite.</string>
     <string name="prepublishing_nudges_story_title_hint">Gib deiner Website einen Titel</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Tippe auf %1$s Erstellen. %2$s Wähle anschließend &lt;b>Blogbeitrag&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Tippe auf %1$s Erstellen. %2$s Wähle anschließend &lt;b&gt;Blogbeitrag&lt;/b&gt;</string>
     <string name="mlp_choose_layout_title">Layout auswählen</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Erstelle einen Beitrag, eine Seite oder eine Story</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Erstelle einen Beitrag oder eine Story</string>
@@ -131,13 +592,10 @@ Language: de
     <string name="gutenberg_native_choose_image_or_video">Bild oder Video auswählen</string>
     <string name="gutenberg_native_choose_image">Bild wählen</string>
     <string name="gutenberg_native_block_removed">Block entfernt</string>
-    <string name="content_description_logo">WordPress-Logo</string>
-    <string name="enter_your_site_address">Gib deine Website-Adresse ein</string>
-    <string name="continue_with_wpcom">Weiter mit WordPress.com</string>
     <string name="signup_confirmation_title">Registrierungsbestätigung</string>
     <string name="continue_with_google_terms_of_service_text">Wenn du mit Google fortfährst und noch kein WordPress.com-Konto hast, erstellst du damit ein Konto und stimmst unseren %1$sGeschäftsbedingungen%2$s zu.</string>
+    <string name="enter_your_site_address">Gib deine bestehende Website-Adresse ein</string>
     <string name="continue_terms_of_service_text">Wenn du fortfährst, stimmst du unseren %1$sGeschäftsbedingungen%2$s zu.</string>
-    <string name="signup_confirmation_magic_link_message">Wir senden dir einen Anmeldelink per E-Mail, um dein neues WordPress.com-Konto zu erstellen.</string>
     <string name="signup_confirmation_message">Wir werden diese E-Mail-Adresse verwenden, um dein neues WordPress.com-Konto zu erstellen.</string>
     <string name="signup_magic_link_message">Wir haben dir einen Anmeldelink per E-Mail gesendet, um dein neues WordPress.com-Konto zu erstellen. Überprüfe deine E-Mails auf diesem Gerät und tippe auf den Link in der E-Mail, die du von WordPress.com erhalten hast.</string>
     <string name="enter_account_info_for_site">Gib deine Kontodetails für %1$s ein.</string>
@@ -154,19 +612,15 @@ Language: de
     <string name="or_type_your_password">Oder gib dein Passwort ein</string>
     <string name="create_account">Konto erstellen</string>
     <string name="send_link_by_email">Link per E-Mail senden</string>
-    <string name="login_promo_text_unlock_the_power">Nutze alle Vorteile des flexibelsten Website-Baukastens.</string>
     <string name="reset_your_password">Dein Passwort zurücksetzen</string>
-    <string name="login_promo_title_37_percent">37\% des Webs wurde mit WordPress erstellt.</string>
     <string name="reader_error_request_failed_title">Bei der Bearbeitung der Anfrage ist ein Problem aufgetreten. Bitte versuche es später erneut.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Wähle einen Namen für deine Website, der am besten zu ihrer Persönlichkeit und Ausrichtung passt. Erste Eindrücke zählen!</string>
     <string name="quick_start_list_update_site_title_title">Lege deinen Website-Titel fest</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Tippe auf &lt;b>%1$s&lt;/b>, um einen neuen Titel festzulegen.</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Tippe auf &lt;b&gt;%1$s&lt;/b&gt;, um einen neuen Titel festzulegen.</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Wenn dieser Beitrag in den Papierkorb verschoben wird, werden auch lokale Änderungen verworfen. Möchtest du wirklich fortfahren?</string>
     <string name="gutenberg_native_s_block_options">%s Blockoptionen</string>
     <string name="gutenberg_native_duplicate_block">Block duplizieren</string>
     <string name="gutenberg_native_copy_block">Block kopieren</string>
     <string name="gutenberg_native_copied_block">Kopierter Block</string>
-    <string name="gutenberg_native_block_settings">Blockeinstellungen</string>
     <string name="gutenberg_native_block_pasted">Bock wurde eingefügt</string>
     <string name="gutenberg_native_block_duplicated">Block wurde dupliziert</string>
     <string name="gutenberg_native_block_cut">Block wurde ausgeschnitten</string>
@@ -182,7 +636,6 @@ Language: de
     <string name="gutenberg_native_gradient_type">Verlaufstyp</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Zum Auswählen der Option zweimal tippen</string>
     <string name="gutenberg_native_customize_gradient">Verlauf anpassen</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Seitenautor</string>
     <string name="photo_picker_use_gif">Dieses GIF verwenden</string>
     <string name="error_media_thumbnail_not_loaded">Medien-Vorschaubild konnte nicht geladen werden</string>
@@ -209,19 +662,17 @@ Language: de
     <string name="post_status_post_trashed">Im Papierkorb</string>
     <string name="post_status_post_published">Veröffentlicht</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Beitrag zu \"Entwürfe\" verschieben?</string>
-    <string name="reader_label_choose_your_interests">Wähle deine Interessengebiete aus</string>
-    <string name="reader_choose_interests_content_description">Wähle deine Interessengebiete aus</string>
     <string name="reader_btn_done">Fertig</string>
     <string name="reader_btn_select_few_interests">Wähle ein paar aus, um fortzufahren</string>
     <string name="ccpa_privacy_notice_read">CCPA-Datenschutzhinweis lesen</string>
     <string name="ccpa_privacy_notice_caption">Nach dem California Consumer Privacy Act („CCPA“) sind wir verpflichtet, den Einwohnern Kaliforniens zusätzliche Informationen zu den Kategorien personenbezogener Daten mitzuteilen, die wir sammeln und weitergeben. Außerdem müssen wir Auskunft darüber erteilen, woher wir diese personenbezogenen Daten erhalten und wie und warum wir sie verwenden.</string>
+    <string name="reader_label_choose_your_interests">Wähle deine Themen</string>
+    <string name="reader_choose_interests_content_description">Wähle deine Themen</string>
     <string name="update_now">Jetzt aktualisieren</string>
     <string name="status_and_visibility">Status und Sichtbarkeit</string>
     <string name="ccpa_privacy_notice_header">Datenschutzhinweis für Benutzer in Kalifornien</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
     <string name="gutenberg_native_open_block_actions_menu">Öffne das Menü mit den Blockaktionen</string>
-    <string name="gutenberg_native_try_a_starter_layout">Probiere ein Layout für Neueinsteiger aus</string>
-    <string name="gutenberg_native_insert_mention">Erwähnung einfügen</string>
+    <string name="gutenberg_native_move_to_top">Nach oben verschieben</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Tippe zweimal, um das Bottom Sheet mit den verfügbaren Optionen zu öffnen</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Tippe zweimal, um das Action Sheet mit den verfügbaren Optionen zu öffnen</string>
     <string name="site_settings_classic_blog">Klassischer Blog</string>
@@ -230,10 +681,9 @@ Language: de
     <string name="pages_set_as_homepage">Als Homepage festlegen</string>
     <string name="pages_set_as_posts_page">Als Beitragsseite festlegen</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Die ausgewählte Homepage und die Seite für Beiträge können nicht identisch sein.</string>
-    <string name="suggestion_invalid_user">„%s ist ist kein gültiger Benutzer“</string>
-    <string name="suggestion_no_matching_users">„Keine passenden Benutzer verfügbar.“</string>
     <string name="pages_cannot_be_started">Wir können die Seiten momentan nicht öffnen. Bitte versuche es später erneut</string>
     <string name="site_settings_static_homepage">Statische Seite</string>
+    <string name="suggestion_invalid">%s ist kein gültiger %s</string>
     <string name="site_settings_homepage_settings">Homepage-Einstellungen</string>
     <string name="site_settings_accept_homepage">Akzeptieren</string>
     <string name="site_settings_failed_to_save_homepage_settings">Homepage-Einstellungen können nicht gespeichert werden</string>
@@ -249,7 +699,6 @@ Language: de
     <string name="page_cannot_set_homepage">Um eine Homepage festzulegen, aktiviere „Statische Seite“ in den Website-Einstellungen</string>
     <string name="page_posts_page_update_failed">Aktualisierung der Beitragsseite fehlgeschlagen</string>
     <string name="gutenberg_native_select_a_color">Wähle eine Farbe aus</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Willkommen in unserem neuen Blog</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Zum Wechseln zu den Farbeinstellungen zweimal tippen</string>
     <string name="reader_empty_followed_blogs_description">Wenn du Websites folgst, wirst du ihren Inhalt hier sehen</string>
     <string name="crop">zuschneiden</string>
@@ -282,7 +731,6 @@ Language: de
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Zum Verschieben des Blocks nach links zweimal tippen</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Block von Position %1$s nach rechts zur Position %2$s verschieben</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Block von Position %1$s nach links zur Position %2$s verschieben</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Das Dashboard wird erstellt</string>
     <string name="new_site_creation_creating_site_loading_3">Das Theme wird eingerichtet</string>
     <string name="new_site_creation_creating_site_loading_2">Die Website-Funktionen werden hinzugefügt</string>
@@ -338,56 +786,19 @@ Language: de
     <string name="editor_page_saved_locally">Die Seite wurde auf dem Gerät gespeichert</string>
     <string name="editor_page_saved_locally_failed_media">Es befinden sich nicht fertiggestellte Medien-Uploads in der Seite; sie wurde lokal gespeichert.</string>
     <string name="editor_uploading_page">Deine Seite wird hochgeladen</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Wir bieten eine Reihe von Dienstleistungen an, die dir helfen, die gewünschten Ergebnisse zu erzielen. Du bist dir nicht sicher, was du brauchst oder was es kostet? Wir können dir erklären, welche Dienstleistungen für dich die richtigen sind und dir mehr über unsere Preise sagen. Nimm unten Kontakt mit uns auf.</string>
-    <string name="gutenberg_native_what_people_say">Was die Leute sagen</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Wir sind ein kleines Team von talentierten Fachleuten mit einem breiten Spektrum an Fähigkeiten und Erfahrungen. Wir lieben, was wir tun, und wir tun es mit Leidenschaft. Wir freuen uns auf die Zusammenarbeit mit dir.</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Die Besucher werden wissen wollen, wer auf der anderen Seite der Website steht. Nutze diesen Platz, um über dich selbst, deine Website, dein Unternehmen oder alles, was du willst zu schreiben. Verwende die unten stehenden Testimonials, um andere zu zitieren, die über dasselbe sprechen&amp;nbsp;– in ihren eigenen Worten.</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_want_to_work_with_us">Möchtest du mit uns arbeiten?</string>
-    <string name="gutenberg_native_warning_message">Warnmeldung</string>
-    <string name="gutenberg_native_position_or_job_title">Position oder Stellenbezeichnung</string>
-    <string name="gutenberg_native_project_name">Projektname</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel der Hund</string>
-    <string name="gutenberg_native_services">Dienstleistungen</string>
     <string name="gutenberg_native_show_post_content">Beitragsinhalt anzeigen</string>
-    <string name="gutenberg_native_strategy">Strategie</string>
-    <string name="gutenberg_native_success_message">Erfolgsmeldung</string>
-    <string name="gutenberg_native_team">Team</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Der Weg, um anzufangen, ist, mit dem Reden aufzuhören und mit dem Handeln zu beginnen.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Dies ist Beispielinhalt, der dem Template enthalten ist, um die Funktionen zu veranschaulichen. Entferne oder ersetze ihn durch deine eigenen Worte und Medien.</string>
-    <string name="gutenberg_native_usa">Deutschland</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Lass uns reden. 👋 Zögere nicht, dich mit den untenstehenden Kontaktinformationen zu melden oder eine Nachricht über das Formular zu senden.</string>
     <string name="gutenberg_native_link_to">Link zu</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Mein Portfolio zeigt verschiedene Projekte, die im Laufe meiner Karriere entstanden sind. Meine Kontaktinformationen findest du unten. Setz dich mit mir in Verbindung.</string>
     <string name="gutenberg_native_only_show_excerpt">Nur Textauszug anzeigen</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Lasst uns gemeinsam etwas aufbauen!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Lasst uns gemeinsam etwas aufbauen!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Schreib eine E-Mail: &lt;a href=\"mailto:mail@beispiel.de\">mail@beispiel.de&lt;/a></string>
+    <string name="gutenberg_native_link_settings">Link-Einstellungen</string>
     <string name="gutenberg_native_excerpt_length_words">Länge des Textauszugs (in Wörtern)</string>
-    <string name="gutenberg_native_get_in_touch">Kontakt aufnehmen</string>
-    <string name="gutenberg_native_inspiration">Inspiration</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Es sind unsere Entscheidungen, Harry, die zeigen, was wir wirklich sind, weit mehr als unsere Fähigkeiten.</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Weine nicht, weil es vorbei ist, lächle, weil es passiert ist.</string>
-    <string name="gutenberg_native_city_10100">12345 Musterstadt</string>
     <string name="gutenberg_native_customize">ANPASSEN</string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Eine Beschreibung des Projekts und der vorgestellten Arbeiten.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@beispiel.de\">mail@beispiel.de&lt;/a></string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Eine kurze Biografie mit persönlicher Geschichte, Schlüsselerfolgen oder einem interessanten Fakt.</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Eine kurze Beschreibung der Dienstleistungen, die du anbietest.</string>
     <string name="gutenberg_native_add_paragraph_block">Absatz-Block hinzufügen</string>
-    <string name="gutenberg_native_555_555_1234">+49 (0)123 456789</string>
-    <string name="gutenberg_native_10_street_road">Hauptstraße 10</string>
+    <string name="gutenberg_native_video_settings">Video-Einstellungen</string>
     <string name="create_post_page_fab_tooltip_contributors">Erstelle einen Beitrag</string>
     <string name="post_list_tab_trashed_posts">Im Papierkorb</string>
     <string name="post_list_tab_scheduled_posts">Geplant</string>
     <string name="post_list_tab_published_posts">Veröffentlicht</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Nicht verbunden</string>
-    <string name="my_site_select_domains_page_title">Website-Adresse</string>
     <string name="sharing_facebook_account_must_have_pages">Die Facebook-Verbindung findet keine Seiten. Publicize kann keine Verbindung zu Facebook-Profilen herstellen, nur zu öffentlichen Seiten.</string>
     <string name="notifications_tab_title_unread_notifications">Ungelesen</string>
     <string name="dlg_confirm_action_trash">Papierkorb</string>
@@ -403,7 +814,6 @@ Language: de
     <string name="reader_bottom_sheet_content_description">Wähle ein Schlagwort oder eine Website, ein Popup-Fenster aus</string>
     <string name="reader_btn_remove_filter_content_description">Entferne den aktuellen Filter</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Melde dich bei WordPress.com an</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Ausgewählt</string>
     <string name="reader_btn_select_filter_content_description">Wähle eine Website oder ein Schlagwort aus, um Beiträge zu filtern</string>
     <string name="reader_self_hosted_select_filter">Verwende den Filter-Button, um Beiträge zu bestimmten Themen zu finden</string>
     <string name="reader_title_subs">Themen und Websites verwalten</string>
@@ -414,7 +824,6 @@ Language: de
     <string name="gutenberg_native_replace_current_block">Aktuellen Block ersetzen</string>
     <string name="gutenberg_native_add_to_beginning">Am Anfang hinzufügen</string>
     <string name="gutenberg_native_add_to_end">Am Ende hinzufügen</string>
-    <string name="gutenberg_native_template_preview">Template-Vorschau</string>
     <string name="reader_filter_empty_sites_action">Einer Website folgen</string>
     <string name="reader_filter_empty_sites_list">Die neuesten Beiträge von Websites anzeigen, denen du folgst</string>
     <string name="reader_filter_empty_tags_action">Ein Thema hinzufügen</string>
@@ -423,7 +832,6 @@ Language: de
     <string name="reader_filter_main_title">Folgen</string>
     <string name="gutenberg_native_edit_video">Video bearbeiten</string>
     <string name="gutenberg_native_video_caption_s">Videountertitel. %s</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Zum Auswählen des Layouts zweimal tippen</string>
     <string name="gutenberg_native_add_a_shortcode">Füge einen Shortcode hinzu…</string>
     <string name="post_list_author">Beitragsautor</string>
     <string name="fab_create_desc">Einen Beitrag erstellen</string>
@@ -438,11 +846,9 @@ Language: de
     <string name="stats_posting_activity_content_description">Tage mit %1$s Aufrufen von %2$s: %2$s %3$s.Tippe für weitere Informationen.</string>
     <string name="stats_posting_activity_action">Navigiere zu allen Statistiken für diesen Zeitraum</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Bild nach vorne verschieben</string>
-    <string name="gutenberg_native_move_image_backward">Bild nach hinten verschieben</string>
     <string name="gutenberg_native_gallery_caption_s">Bildunterschrift der Galerie. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Aktueller Wert ist %2$s</string>
     <string name="create_post_page_fab_tooltip">Seite oder Beitrag erstellen</string>
+    <string name="gutenberg_native_replace_image">Bild ersetzen</string>
     <string name="post_signup_interstitial_not_right_now">Nicht jetzt</string>
     <string name="content_description_person_building_website">Ersteller der Website</string>
     <string name="post_signup_interstitial_subtitle">Was immer du erstellen oder teilen möchtest, wir helfen dir dabei, es genau hier zu tun.</string>
@@ -455,23 +861,19 @@ Language: de
     <string name="photo_picker_image_thumbnail_content_description">Vorschaubild</string>
     <string name="my_site_bottom_sheet_title">Erstellen</string>
     <string name="post_settings_publish">Veröffentlichen</string>
-    <string name="dialog_gutenberg_informative_description_v2">Wir haben große Verbesserungen am Block-Editor vorgenommen und denken, dass es sich lohnt, ihn auszuprobieren! Wir haben ihn für neue Beiträge und Seiten aktiviert, aber wenn du zum klassischen Editor wechseln möchtest, gehe zu „Meine Website“ > „Website-Einstellungen“.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Jetzt synchronisieren</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Bereit für die Synchronisation?</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Dieser Beitrag wird umgehend synchronisiert.</string>
-    <string name="login_promo_viewpager_content_description">Einführung</string>
     <string name="negative_prefix">-%s</string>
     <string name="new_site_creation_unavailable_domain">Diese Domain ist nicht verfügbar</string>
     <string name="login_discovery_error_generic">Wir konnten nicht auf deine Website zugreifen. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
-    <string name="login_discovery_error_ssl">Wir konnten wegen eines Problems mit dem &lt;b>SSL-Zertifikat&lt;/b> nicht auf deine Website zugreifen. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
-    <string name="login_discovery_error_http_auth">Wir konnten nicht auf deine Website zugreifen, da &lt;b>HTTP-Authentifizierung&lt;/b> erforderlich ist. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
+    <string name="login_discovery_error_ssl">Wir konnten wegen eines Problems mit dem &lt;b&gt;SSL-Zertifikat&lt;/b&gt; nicht auf deine Website zugreifen. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
+    <string name="login_discovery_error_http_auth">Wir konnten nicht auf deine Website zugreifen, da &lt;b&gt;HTTP-Authentifizierung&lt;/b&gt; erforderlich ist. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
     <string name="reader_following_display_name">Folgen</string>
-    <string name="send_verification_email">Bestätigungs-E-Mail senden</string>
-    <string name="login_site_credentials_magic_link_label">Fast geschafft! Wir müssen nur noch deine mit Jetpack verbundene E-Mail-Adresse bestätigen &lt;b>%1$s&lt;/b></string>
+    <string name="login_site_credentials_magic_link_label">Fast geschafft! Wir müssen nur noch deine mit Jetpack verbundene E-Mail-Adresse bestätigen &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Mit deinen Anmeldedaten der Website %1$s anmelden</string>
-    <string name="login_discovery_error_xmlrpc">Wir konnten nicht auf die &lt;b>XMLRPC-Datei&lt;/b> deiner Website zugreifen. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
+    <string name="login_discovery_error_xmlrpc">Wir konnten nicht auf die &lt;b&gt;XMLRPC-Datei&lt;/b&gt; deiner Website zugreifen. Du musst dich an deinen Host wenden, um dies zu beheben.</string>
     <string name="my_site_bottom_sheet_add_page">Website-Seite</string>
-    <string name="enter_site_credentials_instead">Melde dich mit deinen Website-Anmeldedaten an.</string>
     <string name="reader_save_for_later_display_name">Gespeichert</string>
     <string name="reader_filter_sites_title">Websites</string>
     <string name="reader_discover_display_name">Entdecken</string>
@@ -486,8 +888,8 @@ Language: de
     <string name="site_cannot_be_loaded">Wir können die Daten deiner Website momentan nicht laden. Bitte versuche es später erneut</string>
     <string name="reader_filter_tags_title">Themen</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress-Mediathek</string>
-    <string name="gutenberg_native_title">Titel:</string>
     <string name="gutenberg_native_ungroup">Gruppierung aufheben</string>
+    <string name="gutenberg_native_unsupported">Nicht unterstützt</string>
     <string name="gutenberg_native_take_a_photo">Ein Foto aufnehmen</string>
     <string name="gutenberg_native_take_a_photo_or_video">Ein Foto oder Video aufnehmen</string>
     <string name="gutenberg_native_take_a_video">Ein Video aufnehmen</string>
@@ -495,14 +897,10 @@ Language: de
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Zum Ausblenden der Tastatur hier tippen</string>
     <string name="gutenberg_native_tap_here_to_show_help">Zum Anzeigen der Hilfe hier tippen</string>
     <string name="gutenberg_native_start_writing">Fang an zu schreiben…</string>
-    <string name="gutenberg_native_size">Größe</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Plugin für Seitenleisten-Titel</string>
     <string name="gutenberg_native_show_section">Abschnitt anzeigen</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Block %s. Dieser Block hat ungültigen Inhalt</string>
     <string name="gutenberg_native_s_block_empty">Block %s. Leer</string>
-    <string name="gutenberg_native_reset_block">Block zurücksetzen</string>
     <string name="gutenberg_native_cut_block">Block ausschneiden</string>
-    <string name="gutenberg_native_remove_annotations">Anmerkungen entfernen</string>
     <string name="gutenberg_native_problem_opening_the_video">Problem beim Öffnen des Videos</string>
     <string name="gutenberg_native_problem_displaying_block">Problem beim Anzeigen des Blocks</string>
     <string name="gutenberg_native_post_title_s">Beitragstitel. %s</string>
@@ -512,17 +910,12 @@ Language: de
     <string name="gutenberg_native_open_settings">Einstellungen öffnen</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Diese Anfrage kann von keiner Anwendung verarbeitet werden. Installiere bitte einen Webbrowser.</string>
     <string name="gutenberg_native_navigate_up">Nach oben</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mein Bedienfeld nach der Beitragsveröffentlichung</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mein Bedienfeld vor der Beitragsveröffentlichung</string>
-    <string name="gutenberg_native_my_post_status_info">Meine Beitragsstatus-Info</string>
-    <string name="gutenberg_native_my_document_setting_panel">Mein Bedienfeld für Dokumenteinstellungen</string>
     <string name="gutenberg_native_move_block_up">Block nach oben verschieben</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Block von Zeile %1$s nach unten in Zeile %2$s verschieben</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Block von Zeile %1$s nach oben in Zeile %2$s verschieben</string>
     <string name="gutenberg_native_move_block_down">Block nach unten verschieben</string>
     <string name="gutenberg_native_image_caption_s">Bildunterschrift. %s</string>
     <string name="gutenberg_native_hide_keyboard">Tastatur ausblenden</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Hier ist der Bedienfeldinhalt!</string>
     <string name="gutenberg_native_help_icon">Hilfe-Icon</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Zum Rückgängigmachen der letzten Änderung zweimal tippen</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Das Einfügen von Medien ist fehlgeschlagen.\nFür Optionen bitte hier tippen.</string>
@@ -534,13 +927,9 @@ Language: de
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Zum Verschieben des Blocks nach oben zweimal tippen</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Zum Verschieben des Blocks nach unten zweimal tippen</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Zum Bearbeiten dieses Werts zweimal tippen</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Zum Ändern des Werts mit dem Slider zweimal tippen</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Zum Hinzufügen eines Blocks zweimal tippen</string>
     <string name="gutenberg_native_current_value_is_s">Der aktuelle Wert ist %s</string>
-    <string name="gutenberg_native_content">Inhalt…</string>
     <string name="gutenberg_native_choose_from_device">Vom Gerät auswählen</string>
-    <string name="gutenberg_native_annotations_sidebar">Seitenleiste für Anmerkungen</string>
-    <string name="gutenberg_native_add_a_description">Eine Beschreibung hinzufügen</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ein unbekannter Fehler ist aufgetreten. Bitte versuche es erneut.</string>
     <string name="gutenberg_native_alt_text">Alt-Text</string>
     <string name="gutenberg_native_add_video">VIDEO HINZUFÜGEN</string>
@@ -548,20 +937,18 @@ Language: de
     <string name="gutenberg_native_add_image_or_video">BILD ODER VIDEO HINZUFÜGEN</string>
     <string name="gutenberg_native_add_image">BILD HINZUFÜGEN</string>
     <string name="gutenberg_native_add_block_here">HIER BLOCK HINZUFÜGEN</string>
-    <string name="gutenberg_native_add_annotation">Anmerkung hinzufügen</string>
+    <string name="gutenberg_native_add_alt_text">Alt-Text hinzufügen</string>
     <string name="reader_acessibility_list_loaded">„Die Liste wurde mit %1$d Einträgen geladen.“</string>
     <string name="reader_empty_saved_posts_content_description">Tippe auf den Button „Hinzufügen, um Beiträge zu speichern“, um einen Beitrag in deiner Liste zu speichern.</string>
     <string name="notifications_tab_dialog_switch_desc">Benachrichtigungen</string>
-    <string name="master_switch_default_title_off">Aus</string>
-    <string name="master_switch_default_title_on">Ein</string>
-    <string name="notifications_tab_dialog_master_off_message">Wenn du die Benachrichtigungen für diese Website deaktivierst, wird auch die Benachrichtigungsanzeige auf dem Tab „Benachrichtigungen“ für diese Website deaktiviert. Du kannst detailliert festlegen, welche Art von Benachrichtigung du siehst, nachdem du die Benachrichtigungen für diese Website aktiviert hast.</string>
-    <string name="notifications_tab_dialog_master_status_off">Benachrichtigungen für diese Website</string>
-    <string name="notifications_tab_dialog_master_status_on">Benachrichtigungen für diese Website</string>
-    <string name="notifications_tab_dialog_master_off_title">Aktiviere die Benachrichtigungen für diese Website, um Benachrichtigungen auf dem Tab „Benachrichtigungen“ zu sehen.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Benachrichtigungsanzeige auf dem Tab „Benachrichtigungen“ für diese Website aktivieren</string>
-    <string name="notifications_tab_dialog_master_hint_on">Benachrichtigungsanzeige auf dem Tab „Benachrichtigungen“ für diese Website deaktivieren</string>
-    <string name="dialog_gutenberg_informative_description_page">Großartig! Du nutzt jetzt den Block-Editor für neue Seiten! Wenn du zum klassischen Editor wechseln möchtest, gehe zu „Meine Website“ > „Website-Einstellungen“.</string>
-    <string name="dialog_gutenberg_informative_description_post">Großartig! Du nutzt jetzt den Block-Editor für neue Beiträge! Wenn du zum klassischen Editor wechseln möchtest, gehe zu „Meine Website“ > „Website-Einstellungen“.</string>
+    <string name="notifications_tab_dialog_main_off_message">Wenn du die Benachrichtigungen für diese Website deaktivierst, wird auch die Benachrichtigungsanzeige auf dem Tab „Benachrichtigungen“ für diese Website deaktiviert. Du kannst detailliert festlegen, welche Art von Benachrichtigung du siehst, nachdem du die Benachrichtigungen für diese Website aktiviert hast.</string>
+    <string name="main_switch_default_title_on">Aktiviert</string>
+    <string name="main_switch_default_title_off">Deaktiviert</string>
+    <string name="notifications_tab_dialog_main_status_on">Benachrichtigungen für diese Website</string>
+    <string name="notifications_tab_dialog_main_status_off">Benachrichtigungen für diese Website</string>
+    <string name="notifications_tab_dialog_main_hint_on">Benachrichtigungsanzeige auf dem Tab „Benachrichtigungen“ für diese Website deaktivieren</string>
+    <string name="notifications_tab_dialog_main_hint_off">Benachrichtigungsanzeige auf dem Tab „Benachrichtigungen“ für diese Website aktivieren</string>
+    <string name="notifications_tab_dialog_main_off_title">Aktiviere die Benachrichtigungen für diese Website, um Benachrichtigungen auf dem Tab „Benachrichtigungen“ zu sehen.</string>
     <string name="pick_media">Bild oder Video hinzufügen</string>
     <string name="error_post_not_submitted_retrying">Wir konnten diesen Beitrag nicht zur Überprüfung einreichen, aber wir werden es später erneut versuchen.</string>
     <string name="error_post_not_published_retrying_private">Wir konnten diesen privaten Beitrag nicht veröffentlichen, aber wir werden es später erneut versuchen.</string>
@@ -654,8 +1041,6 @@ Language: de
     <string name="post_settings_add_to_calendar">Zu Kalender hinzufügen</string>
     <string name="post_settings_notification">Benachrichtigung</string>
     <string name="post_settings_time_and_date">Datum und Uhrzeit</string>
-    <string name="login_need_help_finding_connected_email">Brauchst du Hilfe beim Finden der E-Mail, mit der du dich angemeldet hast?</string>
-    <string name="enter_wordpress_site">Die Website unter dieser Adresse ist keine WordPress-Site. Damit wir uns damit verbinden können, muss auf der Website WordPress installiert sein.</string>
     <string name="login_invalid_site_url">Bitte gib eine vollständige Website-Adresse ein, wie z.&amp;nbsp;B. example.com.</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
     <string name="stats_post_label">Beitrag</string>
@@ -721,7 +1106,7 @@ Language: de
     <string name="domain_registration_state_picker_dialog_title">Bundesstaat auswählen</string>
     <string name="domain_registration_country_picker_dialog_title">Land wählen</string>
     <string name="domain_registration_result_continue_button">Weiter</string>
-    <string name="domain_registration_result_description">Deine neue Domain &lt;b>%s&lt;/b> wird eingerichtet. Deine Website macht\n Luftsprünge vor Begeisterung!</string>
+    <string name="domain_registration_result_description">Deine neue Domain &lt;b&gt;%s&lt;/b&gt; wird eingerichtet. Deine Website macht\n Luftsprünge vor Begeisterung!</string>
     <string name="domain_registration_result_title">Glückwunsch</string>
     <string name="domain_contact_information_register_domain_button">Domain registrieren</string>
     <string name="domain_contact_information_postal_code_hint">Postleitzahl</string>
@@ -831,39 +1216,30 @@ Language: de
     <string name="stats_loading_error">Daten nicht geladen</string>
     <string name="menu_switch_to_gutenberg_editor">Zum Block-Editor wechseln</string>
     <string name="plans_loading_error_network_title">Keine Verbindung</string>
-    <string name="menu_switch_to_aztec_editor">Zum klassischen Editor wechseln</string>
     <string name="stats_loading_block_error">Beim Laden deiner Daten ist ein Problem aufgetreten. Aktualisiere deine Seite, um es erneut zu versuchen.</string>
     <string name="plans_loading_error_no_plans_title">Tarife können nicht geladen werden</string>
     <string name="exit">beenden</string>
-    <string name="dialog_gutenberg_informative_title">Block-Editor aktiviert</string>
     <string name="quick_start_sites">Nächste Schritte</string>
     <string name="quick_start_sites_type_subtitle">%1$d von %2$d komplett</string>
-    <string name="quick_start_sites_type_grow">Erweitere deinen Nutzerkreis</string>
-    <string name="quick_start_sites_type_customize">Deine Website anpassen</string>
     <string name="quick_start_complete_tasks_header">(%d) komplett</string>
     <string name="quick_start_dialog_view_site_message">Genieße dein fertiges Produkt!</string>
     <string name="quick_start_dialog_upload_icon_title">Hochladen eines Website-Icons</string>
     <string name="quick_start_dialog_upload_icon_message">Deine Besucher sehen dein Symbol in ihrem Browser. Füge ein individuelles Symbol hinzu, um einen eleganten, professionellen Look zu erhalten.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Tippe auf %1$s Plan %2$s, um deinen aktuellen Plan und andere verfügbare Pläne anzuzeigen</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tippe auf %1$s Seite hinzufügen %2$s, um eine neue Seite zu erstellen.</string>
+    <string name="quick_start_sites_type_grow">Vergrößere deine Reichweite</string>
+    <string name="quick_start_sites_type_customize">Passe deine Website an</string>
     <string name="quick_start_dialog_check_stats_message_short">Tippe auf %1$s Statistiken %2$s, um zu sehen, wie deine Website funktioniert.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tippe auf %1$s Dein Website-Icon %2$s, um ein neues hochzuladen.</string>
     <string name="quick_start_dialog_publish_post_message">Entwirf und veröffentliche deinen ersten Beitrag.</string>
     <string name="quick_start_dialog_need_help_message">Wir werden dich durch die Grundlagen des Aufbaus und der Erweiterung deiner Website führen.</string>
     <string name="quick_start_dialog_migration_title">Wir haben einige Änderungen an deiner Checkliste vorgenommen.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Tippe auf %1$s Seiten %2$s, um fortzufahren.</string>
     <string name="quick_start_dialog_migration_message">Wir haben weitere Aufgaben hinzugefügt, um dir zu helfen, deinen Leserkreis zu erweitern.</string>
     <string name="quick_start_dialog_enable_sharing_title">Teilen der Beiträge aktivieren</string>
     <string name="quick_start_dialog_explore_plans_title">Tarife erkunden</string>
     <string name="quick_start_dialog_explore_plans_message">Erfahre mehr über die Marketing- und SEO-Tools in unseren kostenpflichtigen Tarifen.</string>
     <string name="quick_start_dialog_enable_sharing_message">Neue Beiträge automatisch für deine Social-Media-Konten freigeben.</string>
-    <string name="quick_start_dialog_customize_site_message">Schriften optimieren, Bilder hinzufügen und vieles mehr.</string>
-    <string name="quick_start_dialog_create_page_title">Eine neue Seite erstellen</string>
-    <string name="quick_start_dialog_create_page_message">Eine Seite für wichtige Inhalte hinzufügen – eine „Über“-Seite ist ein guter Anfang.</string>
     <string name="quick_start_dialog_check_stats_title">Die Statistiken deiner Website überprüfen</string>
     <string name="quick_start_dialog_check_stats_message">Bleibe auf dem Laufenden über die Leistung deiner Website.</string>
-    <string name="quick_start_dialog_browse_themes_title">Themes durchsuchen</string>
-    <string name="quick_start_dialog_browse_themes_message">Entdecke Dutzende von Layoutoptionen und finde deine perfekte Lösung.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Das Entfernen der nächsten Schritte blendet alle Touren auf dieser Seite aus. Diese Aktion kann nicht rückgängig gemacht werden.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Nächste Schritte entfernen</string>
     <string name="quick_start_remove_next_steps_menu_title">Das entfernen</string>
@@ -880,7 +1256,6 @@ Language: de
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
     <string name="new_site_creation_domain_header_subtitle">Hier wirst du im Internet gefunden.</string>
-    <string name="new_site_creation_search_domain_input_hint">Domains durchsuchen</string>
     <string name="new_site_creation_create_site_button">Website erstellen</string>
     <string name="notification_new_site_creation_title">Website erstellen</string>
     <string name="notification_new_site_creation_creating_site_subtitle">Wir erstellen deine neue Website.</string>
@@ -890,12 +1265,9 @@ Language: de
     <string name="new_site_creation_site_preview_content_description">Vorschau der Website anzeigen</string>
     <string name="notification_new_site_creation_failed">Es ist ein Problem aufgetreten</string>
     <string name="new_site_creation_empty_domain_list_message">Keine verfügbaren Adressen, die deiner Suche entsprechen.</string>
-    <string name="new_site_creation_domain_header_title">Wähl einen Domainnamen für deine Website aus.</string>
     <string name="site_creation_error_generic_subtitle">Fehler bei der Kommunikation mit dem Server, bitte versuche es erneut.</string>
     <string name="site_creation_error_generic_title">Es ist ein Problem aufgetreten</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Ein Problem ist aufgetreten</string>
-    <string name="site_creation_segments_subtitle">Dies hilft uns, Empfehlungen zu geben. Aber du bist nie gebunden – alle Seiten entwickeln sich weiter!</string>
-    <string name="site_creation_segments_title">Sag uns, welche Art von Website du erstellen möchtest.</string>
     <string name="new_site_creation_screen_title_step_count">%1$d von %2$d</string>
     <string name="local_post_is_conflicted">Versionskonflikt</string>
     <string name="site_picker_failed_selecting_added_site">Es konnte keine neu hinzugefügte, selbst gehostete Website ausgewählt werden.</string>
@@ -1049,16 +1421,10 @@ Language: de
     <string name="quick_start_dialog_need_help_button_positive">Akzeptieren</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nie</string>
     <string name="quick_start_dialog_follow_sites_title">Anderen Websites folgen</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tippe auf %1$s Suche %2$s, um Websites zu ähnlichen Themen zu finden</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tippe auf %1$s Reader %2$s, um fortzufahren</string>
     <string name="quick_start_dialog_follow_sites_message">Suche Websites, die dich ansprechen, und folge diesen, um informiert zu werden, wenn auf diesen Inhalte veröffentlicht werden.</string>
-    <string name="quick_start_dialog_customize_site_title">Passe deine Website an</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tippe auf %1$s Themes %2$s, um fortzufahren</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tippe auf %1$s Anpassen %2$s, um mit der Personalisierung deiner Website zu beginnen</string>
     <string name="quick_start_dialog_need_help_button_negative">Nein, Danke</string>
-    <string name="quick_start_dialog_choose_theme_title">Wähle ein Theme</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tippe auf %1$s Themes %2$s, um neue Themes zu entdecken</string>
-    <string name="quick_start_dialog_choose_theme_message">Durchsuche alle unsere Themes, um das für dich perfekte Theme zu finden.</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tippe auf  %1$sSuche%2$s, um Websites zu ähnlichen Themen zu finden</string>
     <string name="quick_start_button_positive">Los</string>
     <string name="quick_start_button_negative_short">Abbrechen</string>
     <string name="quick_start_button_negative">Später</string>
@@ -1122,15 +1488,13 @@ Language: de
     <string name="support_contact_email">Kontakt-E-Mail-Adresse</string>
     <string name="application_log_button">Anwendungsprotokoll</string>
     <string name="my_tickets">Meine Tickets</string>
-    <string name="activity_log_rewind_site">Website zurücksetzen</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Zurücksetzung in Bearbeitung</string>
-    <string name="activity_log_currently_restoring_message">Wird zurückgesetzt auf %1$s %2$s</string>
-    <string name="activity_log_rewind_dialog_message">Bist du sicher, dass du deine Website auf %1$s um %2$s zurücksetzen willst? Damit werden alle Inhalte und Optionen, die seit diesem Zeitpunkt erstellt oder geändert wurden, entfernt.</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Wiederherstellung in Bearbeitung</string>
+    <string name="activity_log_currently_restoring_message">Wird wiederhergestellt auf %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Deine Website wird derzeit wiederhergestellt</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Deine Website wurde erfolgreich wiederhergestellt</string>
     <string name="activity_log_button">Aktions-Button für Aktivitätsprotokoll</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Deine Website wurde erfolgreich wiederhergestellt\nZurückgesetzt auf %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Deine Website wird wiederhergestellt\nWird zurückgesetzt auf %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Deine Website wurde erfolgreich wiederhergestellt\nWiederhergestellt auf %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Deine Website wird wiederhergestellt\nWird wiederhergestellt auf %1$s %2$s</string>
     <string name="plugin_auto_managed">Automatisch verwaltet</string>
     <string name="reader_save_posts_locally_dialog_message">Speichere diesen Beitrag, um ihn später zu lesen. Er wird nur auf diesem Gerät zur Verfügung stehen – gespeicherte Beiträge werden nicht mit deinen anderen Geräten synchronisiert.</string>
     <string name="reader_save_posts_locally_dialog_title">Beiträge für später speichern</string>
@@ -1139,20 +1503,16 @@ Language: de
     <string name="comment_read_source_post">Den ursprünglichen Beitrag lesen</string>
     <string name="sites">Websites</string>
     <string name="signup_magic_link_title">Magischer Link gesendet</string>
-    <string name="signup_email_screen_title">E-Mail-Registrierung</string>
     <string name="verification_2fa_screen_title">Code-Verifizierung</string>
     <string name="selfhosted_site_login_title">Anmeldedaten</string>
     <string name="magic_link_sent_login_title">Magischer Link gesendet</string>
     <string name="magic_link_login_title">Magischer Link – Login</string>
     <string name="site_address_login_title">Website-Adresse – Login</string>
     <string name="email_address_login_title">E-Mail-Adresse – Login</string>
-    <string name="alternatively">Alternativ:</string>
     <string name="reader_empty_saved_posts_description">Tippe auf %s, um einen Beitrag in deiner Liste zu speichern.</string>
     <string name="reader_empty_saved_posts_title">Keine Beiträge gespeichert – noch!</string>
     <string name="reader_bookmark_snack_title">Beitrag gespeichert</string>
     <string name="reader_bookmark_snack_btn">Alles anzeigen</string>
-    <string name="reader_btn_bookmarked">Gespeichert</string>
-    <string name="reader_btn_bookmark">Speichern</string>
     <string name="reader_remove_bookmark">Aus gespeicherten Beiträgen entfernen</string>
     <string name="reader_add_bookmark">Zu gespeicherten Beiträgen hinzufügen</string>
     <string name="reader_save_for_later_title">Gespeicherte Beiträge</string>
@@ -1172,11 +1532,9 @@ Language: de
     <string name="reader_btn_notifications_on">Website-Benachrichtigungen aktivieren</string>
     <string name="reader_btn_notifications_off">Website-Benachrichtigungen deaktivieren</string>
     <string name="activity_log_jetpack_icon">Jetpack-Symbol</string>
-    <string name="rewind">Zurücksetzen</string>
     <string name="activity_log_event">Ereignis</string>
     <string name="activity_log_icon">Aktivitätssymbol</string>
     <string name="activity_log">Aktivitätsprotokoll</string>
-    <string name="activity">Aktivität</string>
     <string name="privacy_policy_read">Datenschutzerklärung lesen</string>
     <string name="third_party_policy_learn_more_caption">Wir verwenden andere Werkzeuge zum Tracking, darunter auch welche von Drittanbietern. Hier erhältst du weitere Informationen und Tipps, wie du sie kontrollierst.</string>
     <string name="third_party_policy_learn_more_header">Richtlinie für Drittanbieter</string>
@@ -1187,7 +1545,6 @@ Language: de
     <string name="preference_privacy_settings">Datenschutzeinstellungen</string>
     <string name="preference_collect_information">Informationen erfassen</string>
     <string name="post_submitted">Beitrag übermittelt</string>
-    <string name="login_email_button_signup">Du hast noch kein Konto? %1$sRegistrieren%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Für das Plugin-Feature ist eine einwandfreie Historie der Website erforderlich.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Für das Plugin-Feature muss dieser Benutzer dem Abonnement für die Hauptdomain zugeordnet sein.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Das Plugin-Feature erfordert Administratorrechte.</string>
@@ -1286,7 +1643,6 @@ Language: de
     <string name="edit_photo_screen_title">Foto bearbeiten</string>
     <string name="share_intent_screen_title">Website auswählen</string>
     <string name="signup_epilogue_screen_title">Neues Konto</string>
-    <string name="login_prologue_screen_title">Anmeldung</string>
     <string name="login_epilogue_screen_title">Angemeldet als</string>
     <string name="person_detail_screen_title">Persönliches Detail</string>
     <string name="media_settings_screen_title">Datei-Details</string>
@@ -1300,7 +1656,7 @@ Language: de
     <string name="release_notes_screen_title">Versionshinweise</string>
     <string name="my_site_section_screen_title">Meine Webseite</string>
     <string name="signup_epilogue_error_avatar_view">Dein Avatar wurde hochgeladen und ist in Kürze verfügbar.</string>
-    <string name="permissions_denied_message">Scheinbar hast du die Rechte, die für diese Funktion erforderlich sind, deaktiviert.&lt;br/>&lt;br/>Bearbeite deine Rechte, um dies zu ändern, und stelle sicher, dass &lt;strong>%s&lt;/strong> aktiviert ist.</string>
+    <string name="permissions_denied_message">Scheinbar hast du die Rechte, die für diese Funktion erforderlich sind, deaktiviert.&lt;br/&gt;&lt;br/&gt;Bearbeite deine Rechte, um dies zu ändern, und stelle sicher, dass &lt;strong&gt;%s&lt;/strong&gt; aktiviert ist.</string>
     <string name="permissions_denied_title">Berechtigungen</string>
     <string name="plugin_caption_featured">Vorgestellt</string>
     <string name="sharing_disabled_description">Du kannst nicht auf deine Teilen-Einstellungen zugreifen, da dein Sharing Jetpack-Modul deaktiviert ist.</string>
@@ -1341,7 +1697,6 @@ Language: de
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 Beitrag mit 1 Datei nicht hochgeladen</string>
     <string name="untitled_in_parentheses">(Ohne Titel)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Website erstellen</string>
     <string name="notification_site_creation_created">Zum Fortfahren tippen.</string>
     <string name="notification_site_creation_title_success">Die Website wurde erstellt!</string>
@@ -1355,11 +1710,8 @@ Language: de
     <string name="username_changer_dismiss_button_positive">Verwerfen</string>
     <string name="username_changer_action">Speichern</string>
     <string name="content_description_add_avatar">Avatar hinzufügen</string>
-    <string name="signup_with_google_button">Mit Google registrieren</string>
-    <string name="signup_with_email_button">Mit E-Mail-Adresse registrieren</string>
     <string name="signup_user_exists">Die E-Mail-Adresse existiert bereits auf WordPress.com.\nMit Anmeldung fortfahren.</string>
     <string name="signup_updating_account">Konto wird aktualisiert …</string>
-    <string name="signup_terms_of_service_text">Durch die Registrierung stimmst du unseren %1$sGeschäftsbedingungen%2$s zu.</string>
     <string name="signup_magic_link_progress">E-Mail senden</string>
     <string name="signup_magic_link_error_button_positive">Erneut versuchen</string>
     <string name="signup_magic_link_error_button_negative">Schließen</string>
@@ -1371,12 +1723,7 @@ Language: de
     <string name="signup_epilogue_error_button_negative">Rückgängig machen</string>
     <string name="signup_epilogue_error_generic">Es gab Probleme bei der Aktualisierung deines Kontos. Du kannst es erneut versuchen oder deine Änderungen rückgängig machen, um fortzufahren.</string>
     <string name="signup_epilogue_error_avatar">Es gab Probleme beim Hochladen deines Avatars.</string>
-    <string name="signup_email_header">Bitte gib deine E-Mail-Adresse ein, um dein neues WordPress.com-Konto zu erstellen.</string>
-    <string name="signup_email_error_generic">Es gab Probleme beim Überprüfen der E-Mail-Adresse.</string>
     <string name="signup_epilogue_hint_password_detail">Du kannst dich immer mit einem Link wie dem gerade verwendeten anmelden, du kannst aber auch ein Passwort einrichten, wenn du dies bevorzugst.</string>
-    <string name="sign_up">Registriere dich bei WordPress.com</string>
-    <string name="enter_username_instead">Melde dich mit deinem Benutzernamen an.</string>
-    <string name="enter_site_address_instead">Melde dich an, indem du deine Website-Adresse eingibst.</string>
     <string name="plugin_needs_update">Benötigt Update</string>
     <string name="plugin_caption_search">Plugins suchen</string>
     <string name="plugin_caption_new">Neu</string>
@@ -1497,7 +1844,6 @@ Language: de
     <string name="login_error_suffix">\nVielleicht probierst du es mit einem anderen Konto?</string>
     <string name="login_error_generic">Beim Verbinden mit dem Google-Konto ist ein Problem aufgetreten.</string>
     <string name="login_error_button">Schließen</string>
-    <string name="login_google_button_suffix">Mit Google anmelden.</string>
     <string name="enter_wpcom_password_google">Bitte melde dich mit dem WordPress.com-Passwort an, um mit diesem Google-Konto fortzufahren. Es wird nur einmal benötigt.</string>
     <string name="error_generic_network">Es ist ein Netzwerkfehler aufgetreten. Bitte überprüfe deine Verbindung und versuche es erneut.</string>
     <string name="post_settings_remove_featured_image">Beitragsbild entfernen</string>
@@ -1509,12 +1855,11 @@ Language: de
     <string name="jetpack_disconnect_confirm">Trennen</string>
     <string name="jetpack_disconnect_confirmation_message">Möchtest du die Verbindung von Jetpack mit der Website wirklich trennen?</string>
     <string name="jetpack_disconnect_pref_title">\"Verbindung mit WordPress.com trennen\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Du kannst eine IP-Adresse oder eine Serie von Adressen auf die Positivliste setzen und so dafür sorgen, dass diese niemals von Jetpack blockiert werden. IPv4 und IPv6 sind zulässig. Gib für einen Bereich den unteren und oberen Wert ein (getrennt durch einen Bindestrich). Beispiel: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Du kannst eine IP-Adresse oder eine Reihe von IP-Adressen als „Immer zulassen“ markieren und so dafür sorgen, dass diese niemals von Jetpack blockiert werden. IPv4 und IPv6 sind zulässig. Gib für einen Bereich den unteren und oberen Wert ein (getrennt durch einen Bindestrich). Beispiel: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Zwei-Faktor-Authentifizierung erforderlich</string>
     <string name="jetpack_allow_wpcom_sign_in_title">WordPress.com-Anmeldung zulassen</string>
     <string name="jetpack_match_wpcom_via_email_title">Konten anhand der E-Mail-Adresse abgleichen</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com-Anmeldung</string>
-    <string name="jetpack_brute_force_whitelist_title">IP-Adressen auf der Positivliste</string>
     <string name="jetpack_prevent_brute_force_title">Bösartige Anmeldeversuche blockieren</string>
     <string name="jetpack_prevent_brute_force_category_title">Schutz vor Brute-Force-Angriffen</string>
     <string name="jetpack_send_wp_notifications_title">Push-Benachrichtigungen senden</string>
@@ -1545,6 +1890,7 @@ Language: de
     <string name="media_edit_filename_caption">Dateiname</string>
     <string name="media_edit_alttext_text">Alternativtext</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blinklicht</string>
+    <string name="connect_site">Eine Website verbinden</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Gerät vibrieren lassen</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Ton auswählen</string>
     <string name="notification_settings_category_sights_and_sounds">Anzeige und Töne</string>
@@ -1554,13 +1900,13 @@ Language: de
     <string name="notification_settings_item_your_sites_all_your_sites">Alle meine Websites</string>
     <string name="notification_settings_category_other">Sonstige</string>
     <string name="notification_settings_category_your_sites">Deine Websites</string>
-    <string name="notification_settings_master_off_message">Wenn du Benachrichtigungs-Einstellungen deaktivierst, werden alle Benachrichtigungen von dieser App, unabhängig vom Typ, deaktiviert. Du kannst detailliert festlegen, welche Art von Benachrichtigung du erhältst, nachdem du die Benachrichtigungs-Einstellungen aktiviert hast.</string>
-    <string name="notification_settings_master_off_title">Um auf diesem Gerät Benachrichtigungen zu erhalten, musst du Benachrichtigungs-Einstellungen aktivieren.</string>
-    <string name="notification_settings_master_hint_off">Benachrichtigungen aktivieren</string>
-    <string name="notification_settings_master_hint_on">Benachrichtigungen deaktivieren</string>
-    <string name="notification_settings_master_status_off">Aus</string>
-    <string name="notification_settings_master_status_on">Ein</string>
+    <string name="notification_settings_main_off_message">Wenn du Benachrichtigungseinstellungen deaktivierst, werden alle Benachrichtigungen von dieser App, unabhängig vom Typ, deaktiviert. Du kannst detailliert festlegen, welche Art von Benachrichtigung du erhältst, nachdem du die Benachrichtigungseinstellungen aktiviert hast.</string>
+    <string name="notification_settings_main_off_title">Um auf diesem Gerät Benachrichtigungen zu erhalten, musst du Benachrichtigungs-Einstellungen aktivieren.</string>
+    <string name="notification_settings_main_hint_off">Benachrichtigungen aktivieren</string>
+    <string name="notification_settings_main_hint_on">Benachrichtigungen deaktivieren</string>
+    <string name="notification_settings_main_status_off">Deaktiviert</string>
     <string name="max_video_resolution">Maximale Videogröße</string>
+    <string name="notification_settings_main_status_on">Aktiviert</string>
     <string name="max_thumbnail_px_size">Maximale Bildgröße</string>
     <string name="error_upload_post_media_param">Es gab einen Fehler beim Hochladen der Medien in diesem Beitrag: %s.</string>
     <string name="error_upload_post_param">Es gab einen Fehler beim Hochladen dieses Beitrags: %s.</string>
@@ -1596,18 +1942,17 @@ Language: de
     <string name="login_site_address_more_help">Brauchst du weitere Hilfe?</string>
     <string name="login_site_address_help_content">Wenn du deine Website in Chrome aufrufst, wird die Adresse deiner Website oben in der Leiste angezeigt.</string>
     <string name="login_site_address_help_title">Wie lautet meine Website-Adresse?</string>
-    <string name="login_site_address_help">Brauchst du Hilfe, um deine Website-Adresse zu finden?</string>
     <string name="login_site_address">Website-Adresse</string>
     <string name="enter_site_address">Gib die Adresse der WordPress-Website ein, die du verbinden möchtest.</string>
     <string name="login_already_logged_in_wpcom">Bereits bei WordPress.com angemeldet</string>
     <string name="login_continue">Weiter</string>
     <string name="enter_wpcom_password">Gib dein WordPress.com-Passwort ein.</string>
+    <string name="connect_more">Andere Website verbinden</string>
     <string name="login_magic_link_email_requesting">Anmelde-E-Mail wird angefordert</string>
     <string name="password_incorrect">Dieses Passwort ist anscheinend falsch. Prüfe bitte deine Angaben und versuche es erneut.</string>
     <string name="requesting_otp">Verifizierungscode wird per SMS angefordert.</string>
     <string name="login_text_otp">Code per SMS senden</string>
     <string name="enter_verification_code">Fast geschafft! Gib bitte den Verifizierungscode aus deiner Authenticator-App ein.</string>
-    <string name="open_mail">E-Mail öffnen</string>
     <string name="next">Weiter</string>
     <string name="enter_email_wordpress_com">Melde dich auf WordPress.com mit einer E-Mail-Adresse an, um alle deine WordPress-Websites zu verwalten.</string>
     <string name="image_optimization_promo_desc">Bildoptimierung schrumpft Bilder für schnelleres Hochladen.\n\nDies kannst du in den Website-Einstellungen jederzeit ändern.</string>
@@ -1630,10 +1975,6 @@ Language: de
     <string name="post_status_draft">Entwurf</string>
     <string name="post_status_pending_review">Ausstehender Review</string>
     <string name="post_status_publish_post">Veröffentlichen</string>
-    <string name="change_location">Ort ändern</string>
-    <string name="remove_location">Ort entfernen</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Die Ortsauswahl kann nicht geöffnet werden, Google Play ist nicht verfügbar</string>
-    <string name="post_settings_location">Ort</string>
     <string name="now">Jetzt</string>
     <string name="post_settings_password_dialog_hint">Dieser Beitrag kann nur mithilfe dieses Passworts angezeigt werden.</string>
     <string name="post_settings_excerpt_dialog_hint">Auszüge sind optionale, selbst verfasste Zusammenfassungen deiner Inhalte.</string>
@@ -1718,7 +2059,7 @@ Language: de
     <string name="tabbar_accessibility_label_my_site">Meine Website. Zeige deine Website an und verwalte sie, einschließlich Statistiken.</string>
     <string name="button_not_now">Nicht jetzt</string>
     <string name="my_site_btn_sharing">Teilen</string>
-    <string name="media_error_internal_server_error">Fehler beim Hochladen. Versuche es mit der Funktion Optimize Images unter Site->Settings</string>
+    <string name="media_error_internal_server_error">Fehler beim Hochladen. Versuche es mit der Funktion Optimize Images unter Site-&gt;Settings</string>
     <string name="media_downloading">Mediendatei auf diesem Gerät speichern</string>
     <string name="error_media_save">Medien konnten nicht gespeichert werden</string>
     <string name="editor_draft_saved_locally">Entwurf auf Gerät gespeichert</string>
@@ -1817,7 +2158,7 @@ Language: de
     <string name="sign_in_wpcom">Bei WordPress.com anmelden</string>
     <string name="comment_liked">Kommentar gefällt mir</string>
     <string name="reader_label_global_related_posts">Mehr auf WordPress.com</string>
-    <string name="reader_label_local_related_posts">Mehr zu %s</string>
+    <string name="reader_label_local_related_posts">Mehr von %s</string>
     <string name="preference_open_device_settings">Geräte-Einstellungen öffnen</string>
     <string name="invite_user_blocked_invites">%s: Benutzer blockiert Einladungen</string>
     <string name="invite_invalid_email">%s: Ungültige E-Mail</string>
@@ -1865,20 +2206,16 @@ Language: de
     <string name="invite_error_invalid_usernames_multiple">Senden fehlgeschlagen: Es wurden ungültige Benutzernamen oder E-Mail-Adressen angegeben</string>
     <string name="invite_error_invalid_usernames_one">Senden fehlgeschlagen: Benutzername oder E-Mail-Adresse sind ungültig</string>
     <string name="invite_error_no_usernames">Bitte trage mindestens einen Benutzernamen ein</string>
-    <string name="invite_message_info">(Optional) Du kannst eine individuelle Nachricht mit bis zu 500 Zeichen eintragen, die in der Einladung an die Benutzer mitgesendet wird.</string>
-    <string name="invite_message_remaining_other">Noch %d weitere Zeichen möglich</string>
-    <string name="invite_message_remaining_one">1 weiteres Zeichen möglich</string>
-    <string name="invite_message_remaining_zero">Keine weiteren Zeichen möglich</string>
     <string name="invite_message_title">Individuelle Nachricht</string>
     <string name="invite">Einladen</string>
     <string name="invite_names_title">Benutzernamen oder E-Mail-Adressen</string>
-    <string name="send_link">Link senden</string>
     <string name="invite_people">Personen einladen</string>
     <string name="my_site_header_external">Extern</string>
     <string name="label_clear_search_history">Lösche Suchverlauf</string>
     <string name="dlg_confirm_clear_search_history">Suchverlauf löschen?</string>
     <string name="reader_empty_search_description">Keine Ergebnisse zu %s in deiner Sprache gefunden</string>
     <string name="reader_hint_post_search">WordPress.com durchsuchen</string>
+    <string name="reader_title_related_post_detail">Ähnliche Beiträge</string>
     <string name="preview_screen_links_disabled">Im Vorschaubildschirm sind Links deaktiviert.</string>
     <string name="send">Senden</string>
     <string name="user_remove_confirmation_message">Falls du %1$s entfernst, kann dieser Benutzer nicht länger auf die Website zugreifen, aber alle von %1$s erstellten Beiträge verbleiben auf der Website.\n\nMöchtest du diesen Benutzter noch immer entfernen?</string>
@@ -1897,7 +2234,6 @@ Language: de
     <string name="checking_email">Überprüfe E-Mail-Adresse</string>
     <string name="magic_link_unavailable_error_message">Zur Zeit nicht verfügbar. Bitte gib dein Passwort ein</string>
     <string name="logging_in">Anmeldung läuft</string>
-    <string name="enter_your_password_instead">Gib stattdessen dein Passwort ein</string>
     <string name="web_address_dialog_hint">Wird mit deinem Kommentar veröffentlicht.</string>
     <string name="capture_or_pick_photo">Foto aufnehmen oder auswählen</string>
     <string name="plan">Tarif</string>
@@ -2018,7 +2354,7 @@ Language: de
     <string name="site_settings_paging_dialog_description">Kommentar-Threads auf mehrere Seiten aufteilen.</string>
     <string name="site_settings_paging_dialog_header">Kommentare pro Seite</string>
     <string name="site_settings_close_after_dialog_title">Kommentarbereich schließen</string>
-    <string name="site_settings_blacklist_description">Wenn ein Kommentar eines dieser Wörter im Inhalt, Namen, in der URL, E-Mail-Adresse oder IP-Adresse enthält, wird er als Spam gekennzeichnet. Du kannst auch Teilbegriffe eingeben. So wird beispielsweise bei Eingabe von „press“ als Ergebnis „WordPress“ angezeigt.</string>
+    <string name="site_settings_denylist_description">Wenn ein Kommentar eines dieser Wörter im Inhalt, Namen, in der URL, E-Mail-Adresse oder IP-Adresse enthält, wird er als Spam gekennzeichnet. Du kannst auch Teilbegriffe eingeben. So wird beispielsweise bei Eingabe von „press“ als Ergebnis „WordPress“ angezeigt.</string>
     <string name="site_settings_hold_for_moderation_description">Wenn ein Kommentar eines dieser Wörter im Inhalt, Namen, in der URL, E-Mail-Adresse oder IP-Adresse enthält, wird er in die Warteschlange zur Freischaltung verschoben. Du kannst auch Teilbegriffe eingeben. So wird beispielsweise bei Eingabe von „press“ als Ergebnis „WordPress“ angezeigt.</string>
     <string name="site_settings_list_editor_input_hint">Gib ein Wort oder einen Begriff ein.</string>
     <string name="site_settings_list_editor_no_items_text">Keine Einträge</string>
@@ -2033,10 +2369,10 @@ Language: de
     <string name="site_settings_rp_show_header_title">Header anzeigen</string>
     <string name="site_settings_rp_switch_summary">Als „Ähnliche Beiträge“ werden relevante Inhalte von deiner Website unter deinen Beiträgen angezeigt.</string>
     <string name="site_settings_rp_switch_title">„Ähnliche Beiträge“ anzeigen</string>
-    <string name="site_settings_blacklist_hint">Kommentare, die einem Filterkriterium entsprechen, werden als Spam gekennzeichnet.</string>
+    <string name="site_settings_denylist_hint">Kommentare, die einem Filterkriterium entsprechen, werden als Spam gekennzeichnet.</string>
     <string name="site_settings_moderation_hold_hint">Kommentare, die einem Filterkriterium entsprechen, werden in die Warteschlange zur Freischaltung verschoben.</string>
     <string name="site_settings_multiple_links_hint">Bei bekannten Benutzern wird die Beschränkung der Linkanzahl ignoriert.</string>
-    <string name="site_settings_whitelist_hint">Der Autor muss bereits einen genehmigten Kommentar geschrieben haben.</string>
+    <string name="site_settings_allowlist_hint">Der Autor muss bereits einen genehmigten Kommentar geschrieben haben.</string>
     <string name="site_settings_user_account_required_hint">Benutzer müssen zum Kommentieren registriert und angemeldet sein.</string>
     <string name="site_settings_identity_required_hint">Benutzer müssen zum Kommentieren Name und E-Mail-Adresse angeben.</string>
     <string name="site_settings_paging_hint">Kommentare in Blöcken mit einer festgelegten Größe anzeigen</string>
@@ -2059,17 +2395,16 @@ Language: de
     <string name="site_settings_address_hint">Adressänderungen werden aktuell nicht unterstützt.</string>
     <string name="site_settings_tagline_hint">Eine kurze Beschreibung oder ein treffender Spruch, um dein Blog zu beschreiben</string>
     <string name="site_settings_title_hint">Erkläre in ein paar Worten, worum es auf deiner Website geht.</string>
-    <string name="site_settings_whitelist_known_summary">Kommentare von bekannten Benutzern</string>
-    <string name="site_settings_whitelist_all_summary">Kommentare von allen Benutzern</string>
+    <string name="site_settings_allowlist_known_summary">Kommentare von bekannten Benutzern</string>
+    <string name="site_settings_allowlist_all_summary">Kommentare von allen Benutzern</string>
     <string name="site_settings_threading_summary">%d Ebenen</string>
     <string name="site_settings_privacy_private_summary">Privat</string>
     <string name="site_settings_privacy_hidden_summary">Versteckt</string>
     <string name="site_settings_delete_site_title">Website löschen</string>
     <string name="site_settings_privacy_public_summary">Öffentlich</string>
-    <string name="site_settings_blacklist_title">Sperrliste</string>
     <string name="site_settings_moderation_hold_title">Zur Freischaltung überprüfen</string>
     <string name="site_settings_multiple_links_title">Links in Kommentaren</string>
-    <string name="site_settings_whitelist_title">Automatisch genehmigen</string>
+    <string name="site_settings_allowlist_title">Automatisch genehmigen</string>
     <string name="site_settings_paging_title">Seitennummerierung</string>
     <string name="site_settings_threading_title">Verschachtelung</string>
     <string name="site_settings_sort_by_title">Sortieren nach</string>
@@ -2218,7 +2553,6 @@ Language: de
     <string name="logs_copied_to_clipboard">Anwendungsprotokolle wurden in die Zwischenablage kopiert</string>
     <string name="reader_label_new_posts">Neue Beiträge</string>
     <string name="error_copy_to_clipboard">Beim Kopieren von Text in die Zwischenablage ist ein Fehler aufgetreten</string>
-    <string name="reader_page_recommended_blogs">Websites, die dir gefallen könnten</string>
     <string name="post_uploading">Beitrag wird hochgeladen</string>
     <string name="reader_empty_posts_in_blog">Diese Website ist leer</string>
     <string name="themes_fetching">Themes werden abgerufen…</string>
@@ -2280,8 +2614,8 @@ Language: de
     <string name="reader_label_followed_blog">Website wird verfolgt</string>
     <string name="reader_title_blog_preview">Reader-Website</string>
     <string name="reader_page_followed_tags">Abonnierte Themen</string>
+    <string name="reader_hint_add_tag_or_url">Gib eine URL oder ein Thema ein, der/dem du folgen möchtest</string>
     <string name="help">Hilfe</string>
-    <string name="forgot_password">Passwort vergessen?</string>
     <string name="ssl_certificate_error">Ungültiges SSL Zertifikat</string>
     <string name="ssl_certificate_ask_trust">Wenn du dich üblicherweise ohne Probleme mit dieser Website verbinden kannst, könnte dieser Fehler bedeute, dass sich jemand als diese Website ausgibt und du daher nicht weitermachen solltest. Möchtest du dem Zertifikat trotzdem vertrauen?</string>
     <string name="no_network_message">Es ist kein Netzwerk verfügbar</string>
diff --git a/WordPress/src/main/res/values-el/strings.xml b/WordPress/src/main/res/values-el/strings.xml
index e84e3af4b48d..5c4a30fa4153 100644
--- a/WordPress/src/main/res/values-el/strings.xml
+++ b/WordPress/src/main/res/values-el/strings.xml
@@ -1,36 +1,58 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-07-06 12:41:50+0000
+Translation-Revision-Date: 2021-05-19 07:26:52+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: el_GR
 -->
 <resources>
+    <string name="gutenberg_native_size">Μέγεθος</string>
     <string name="gutenberg_native_move_image_forward">Μετακίνηση εικόνας εμπρός</string>
     <string name="gutenberg_native_move_image_backward">Μετακίνηση εικόνας πίσω</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Η τρέχουσα τιμή είναι %2$s</string>
+    <string name="gutenberg_native_image_settings">Ρυθμίσεις εικόνας</string>
+    <string name="gutenberg_native_audio_settings">Ρυθμίσεις ήχου</string>
+    <string name="user_profile_untitled_site">(Χωρίς τίτλο)</string>
+    <string name="user_profile_site_section_header">Ιστότοπος</string>
+    <string name="gutenberg_native_error">Σφάλμα </string>
+    <string name="gutenberg_native_choose_file">Επιλέξτε αρχείο</string>
+    <string name="button_copy">Διπλότυπο</string>
+    <string name="toast_edit_story_update_in_progress_title">Η ιστορία αποθηκευεται, παρακαλούμε περιμένετε…</string>
+    <string name="gutenberg_native_file_name">Όνομα αρχείου</string>
+    <string name="gutenberg_native_choose_a_file">ΕΠΙΛΕΞΤΕ ΕΝΑ ΑΡΧΕΙΟ</string>
+    <string name="activity_log_activity_type_filter_apply">Εκτέλεση</string>
+    <string name="activity_log_activity_type_filter_clear">Καθαρισμός</string>
+    <string name="label_done_button">Ολοκληρώθηκε</string>
+    <string name="dialog_discard_story_title_edit">Απόρριψη αλλαγών;</string>
+    <string name="dialog_discard_story_ok_button_edit">Απόρριψη</string>
+    <string name="color_picker_label_background">Φόντο</string>
+    <string name="prepublishing_nudges_add_category_button">Προσθήκη κατηγορίας</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Προσθήκη Νέας Κατηγορίας</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Κατηγορίες</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Δεν έχει οριστεί</string>
+    <string name="prepublishing_nudges_categories_action">Κατηγορίες</string>
+    <string name="login_prologue_fifth_caption_three">Μουσεία στο Λονδίνο</string>
+    <string name="gutenberg_native_help_button">Κουμπί Βοήθειας</string>
+    <string name="gutenberg_native_choose_images">Επιλέξτε εικόνες</string>
+    <string name="stories_intro_create_story_post_label">Δημιουργήστε μια ιστορία</string>
+    <string name="gutenberg_native_replace_image">Αντικατάσταση εικόνας</string>
     <string name="post_signup_interstitial_not_right_now">Όχι τώρα</string>
     <string name="post_signup_interstitial_title">Καλώς ήρθατε στο WordPress!</string>
     <string name="photo_picker_image_selected">, Επιλεγμένο</string>
     <string name="my_site_bottom_sheet_title">Προσθήκη νέου</string>
     <string name="post_settings_publish">Δημοσίευση</string>
     <string name="negative_prefix">-%s</string>
-    <string name="login_promo_viewpager_content_description">Εισαγωγή</string>
     <string name="my_site_bottom_sheet_add_page">Σελίδες του ιστότοπου</string>
     <string name="reader_filter_sites_title">Ιστότοποι</string>
     <string name="reader_save_for_later_display_name">Αποθηκεύτηκε</string>
+    <string name="reader_filter_tags_title">Θέματα</string>
     <string name="gutenberg_native_translate">Μετάφραση</string>
-    <string name="gutenberg_native_title">Τίτλος:</string>
     <string name="gutenberg_native_take_a_video">Λήψη βίντεο</string>
     <string name="gutenberg_native_take_a_photo">Λήψη φωτογραφίας</string>
     <string name="gutenberg_native_start_writing">Ξεκινήστε να γράφετε …</string>
-    <string name="gutenberg_native_size">Μέγεθος</string>
     <string name="gutenberg_native_show_section">Εμφάνιση ενότητας</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s μπλοκ. Αυτό το μπλοκ έχει μη έγκυρο περιεχόμενο</string>
     <string name="gutenberg_native_s_block_empty">%s μπλοκ. Είναι άδειο</string>
-    <string name="gutenberg_native_reset_block">Επαναφορά μπλοκ</string>
     <string name="gutenberg_native_help_icon">Εικονίδιο βοήθειας</string>
-    <string name="gutenberg_native_content">Περιεχόμενο…</string>
     <string name="post_list_tab_drafts">Προσχέδια</string>
     <string name="plans_loading_error_network_title">Δεν υπάρχει σύνδεση</string>
     <string name="quick_start_sites">Επόμενα βήματα</string>
@@ -149,15 +171,13 @@ Language: el_GR
     <string name="quick_start_dialog_need_help_button_positive">Αποδοχή</string>
     <string name="quick_start_dialog_need_help_button_neutral">Ποτέ</string>
     <string name="quick_start_dialog_follow_sites_title">Ακολουθήστε άλλους ιστότοπους</string>
-    <string name="quick_start_dialog_customize_site_title">Προσαρμόστε τον ιστότοπο σας</string>
     <string name="quick_start_dialog_follow_sites_message">Βρείτε ιστοτόπους που σας ενδιαφέρουν και ακολουθήστε τους ώστε να λαμβάνετε ενημερώσεις όταν δημοσιεύουν.</string>
     <string name="quick_start_button_negative_short">Άκυρο</string>
     <string name="quick_start_button_positive">Μετάβαση</string>
-    <string name="quick_start_dialog_choose_theme_title">Επιλέξτε θέμα εμφάνισης</string>
     <string name="quick_start_button_negative">Οχι τώρα</string>
     <string name="my_site_create_new_site_title">Δεν έχετε ιστότοπους</string>
-    <string name="quick_start_dialog_choose_theme_message">Περιηγηθείτε σε όλα μας τα θέματα για να βρείτε το ιδανικό για εσάς.</string>
     <string name="content_description_more">Περισσότερα</string>
+    <string name="reader_empty_followed_tags_title">Μη ακολουθούμενα θέματα</string>
     <string name="install_jetpack">Εγκατάσταση Jetpack</string>
     <string name="install_jetpack_retry">Προσπαθήστε ξανά</string>
     <string name="jetpack">Jetpack</string>
@@ -195,14 +215,10 @@ Language: el_GR
     <string name="support_identity_input_dialog_enter_email">Παρακαλώ συμπληρώστε το email σας</string>
     <string name="reader_empty_search_title">Δεν βρέθηκαν αποτελέσματα</string>
     <string name="sites">Ιστότοποι</string>
-    <string name="signup_email_screen_title">Εγγραφή με Email</string>
     <string name="signup_magic_link_title">Ο μαγικός σύνδεσμος στάλθηκε</string>
     <string name="selfhosted_site_login_title">Στοιχεία εισόδου</string>
-    <string name="alternatively">Εναλλακτικά:</string>
     <string name="magic_link_sent_login_title">Ο μαγικός σύνδεσμος στάλθηκε</string>
     <string name="reader_bookmark_snack_btn">Προβολή όλων</string>
-    <string name="reader_btn_bookmark">Αποθήκευση</string>
-    <string name="reader_btn_bookmarked">Αποθηκεύτηκε</string>
     <string name="removed">Αφαιρέθηκε</string>
     <string name="reader_save_for_later_title">Αποθηκευμένα άρθρα</string>
     <string name="my_site_icon_dialog_cancel_button">Άκυρο</string>
@@ -212,7 +228,6 @@ Language: el_GR
     <string name="reader_followed_blog_notifications_action">Ενεργοποίηση</string>
     <string name="my_site_icon_content_description">Αλλαγή εικονιδίου ιστότοπου</string>
     <string name="my_site_icon_dialog_add_message">Θα θέλατε να προσθέσετε ένα εικονίδιο ιστότοπου;</string>
-    <string name="activity">Δραστηριότητα</string>
     <string name="cookie_policy_learn_more_header">Πολιτική Cookies</string>
     <string name="privacy_policy_learn_more_header">Πολιτική Απορρήτου</string>
     <string name="activity_log_jetpack_icon">Εικονίδιο Jetpack</string>
@@ -223,7 +238,6 @@ Language: el_GR
     <string name="privacy_policy_read">Διαβάστε την πολιτική απορρήτου</string>
     <string name="activity_log_event">Συμβάν</string>
     <string name="post_submitted">Το άρθρο υποβλήθηκε</string>
-    <string name="login_email_button_signup">Δεν έχετε λογαριασμό; %1$sΕγγραφείτε%2$s</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Εγκατάσταση</string>
     <string name="notification_settings_followed_dialog_email_posts_daily">Hμερήσια</string>
     <string name="notification_settings_followed_dialog_email_posts_weekly">Μία φορά την εβδομάδα</string>
@@ -260,7 +274,6 @@ Language: el_GR
     <string name="comment_spam_talkback">Το σχόλιο αυτό έχει σημειωθεί ως ανεπιθύμητο</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
-    <string name="login_prologue_screen_title">Είσοδος</string>
     <string name="signup_epilogue_screen_title">Νέος λογαριασμός</string>
     <string name="site_settings_quota_header">Εικόνες και Βίντεο</string>
     <string name="edit_photo_screen_title">Επεξεργασία φωτογραφίας</string>
@@ -276,6 +289,7 @@ Language: el_GR
     <string name="notifications_screen_title">Ειδοποιήσεις</string>
     <string name="reader_screen_title">Αναγνώστης</string>
     <string name="media_settings_screen_title">Λεπτομέρειες αρχείου</string>
+    <string name="my_site_section_screen_title">Ο ιστότοπος μου</string>
     <string name="release_notes_screen_title">Σημειώσεις έκδοσης</string>
     <string name="permissions_denied_title">Δικαιώματα</string>
     <string name="plugin_caption_featured">Προτεινόμενα</string>
@@ -287,7 +301,6 @@ Language: el_GR
     <string name="uploading_subtitle_mixed_page_singular_media_one">1 σελίδα και 1 αρχείο απομένουν</string>
     <string name="untitled_in_parentheses">(Χωρίς τίτλο)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Δημιουργία ενός ιστότοπου</string>
     <string name="username_changer_action">Αποθήκευση</string>
     <string name="username_changer_dismiss_button_positive">Απόρριψη</string>
@@ -302,8 +315,6 @@ Language: el_GR
     <string name="signup_epilogue_hint_username">Όνομα χρήστη  </string>
     <string name="signup_magic_link_error_button_negative">Κλείσιμο</string>
     <string name="signup_magic_link_error_button_positive">Προσπαθήστε ξανά</string>
-    <string name="sign_up">Εγγραφείτε για WordPress.com</string>
-    <string name="enter_username_instead">Συνδεθείτε με το όνομα χρήστη σας.</string>
     <string name="my_site_add_new_site">Προσθήκη ιστότοπου</string>
     <string name="plugin_caption_new">Νέο</string>
     <string name="plugin_caption_popular">Δημοφιλή</string>
@@ -391,7 +402,6 @@ Language: el_GR
     <string name="media_edit_file_details_card_caption">Λεπτομέρειες αρχείου</string>
     <string name="login_error_suffix">\nΊσως να δοκιμάσετε ένα διαφορετικό λογαριασμό;</string>
     <string name="login_error_button">Κλείσιμο</string>
-    <string name="login_google_button_suffix">Σύνδεση με Google.</string>
     <string name="post_settings_remove_featured_image">Αφαίρεση χαρακτηριστικής εικόνας</string>
     <string name="post_settings_choose_featured_image">Επιλέξτε χαρακτηρισμένη εικόνα</string>
     <string name="login_log_in_for_share_intent">Συνδεθείτε στο WordPress.com για να μοιραστείτε το περιεχόμενο.</string>
@@ -418,6 +428,7 @@ Language: el_GR
     <string name="media_edit_filename_caption">Όνομα Αρχείου</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Ενναλακτικό κείμενο</string>
+    <string name="connect_site">Σύνδεση ιστότοπου</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Δόνηση συσκευής</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Επιλογή ήχου</string>
     <string name="notification_settings_category_sights_and_sounds">Εικόνες και Ήχοι</string>
@@ -426,9 +437,9 @@ Language: el_GR
     <string name="notification_settings_category_other">Άλλο</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Όλοι οι ιστότοποι μου</string>
     <string name="notification_settings_category_your_sites">Οι ιστότοποί σας</string>
-    <string name="notification_settings_master_hint_off">Ενεργοποίηση ενημερώσεων</string>
-    <string name="notification_settings_master_hint_on">Απενεργοποίηση ενημερώσεων</string>
-    <string name="notification_settings_master_status_off">Κλείσιμο</string>
+    <string name="notification_settings_main_hint_off">Ενεργοποίηση ενημερώσεων</string>
+    <string name="notification_settings_main_hint_on">Απενεργοποίηση ενημερώσεων</string>
+    <string name="notification_settings_main_status_off">Κλείσιμο</string>
     <string name="max_video_resolution">Μέγιστο μέγεθος βίντεο</string>
     <string name="max_thumbnail_px_size">Μέγιστο μέγεθος εικόνας</string>
     <string name="add_media_progress">Προσθήκη πολυμέσων</string>
@@ -445,6 +456,7 @@ Language: el_GR
     <string name="login_site_address_more_help">Χρειάζεστε περισσότερη βοήθεια;</string>
     <string name="login_site_address">Διεύθυνση ιστότοπου</string>
     <string name="login_continue">Συνέχεια</string>
+    <string name="connect_more">Συνδέστε Έναν Άλλο Ιστότοπο</string>
     <string name="next">Επόμενο</string>
     <string name="me_profile_photo">Φωτογραφία προφίλ</string>
     <string name="post_title">Τίτλος</string>
@@ -454,10 +466,7 @@ Language: el_GR
     <string name="post_status_draft">Προσχέδιο</string>
     <string name="post_status_pending_review">Εκκρεμής αναθεώρηση</string>
     <string name="post_status_post_private">Ιδιωτικό</string>
-    <string name="remove_location">Αφαίρεση Τοποθεσίας</string>
-    <string name="change_location">Αλλαγή Τοποθεσίας</string>
     <string name="post_status_publish_post">Δημοσίευση</string>
-    <string name="post_settings_location">Τοποθεσία</string>
     <string name="now">Τώρα</string>
     <string name="post_settings_tags">Ετικέτες</string>
     <string name="post_settings_slug">Σύντομο Όνομα</string>
@@ -652,20 +661,16 @@ Language: el_GR
     <string name="invite_error_invalid_usernames_multiple">Αδυναμία αποστολής: Υπάρχουν μη έγκυρα ονόματα χρήστη ή ηλ. διευθύνσεις</string>
     <string name="invite_error_invalid_usernames_one">Αδυναμία αποστολής: Μη έγκυρο όνομα χρήστη ή ηλ. διεύθυνση</string>
     <string name="invite_error_no_usernames">Παρακαλώ προσθέστε τουλάχιστον ένα όνομα χρήστη</string>
-    <string name="invite_message_info">(Προαιρετικό) Μπορείτε να εισάγετε ένα προσαρμοσμένο μήνυμα με έως 500 χαρακτήρες που θα συμπεριλαμβάνεται στην πρόσκληση των χρηστών.</string>
-    <string name="invite_message_remaining_other">Απομένουν %d χαρακτήρες</string>
-    <string name="invite_message_remaining_one">Απομένει 1 χαρακτήρας</string>
-    <string name="invite_message_remaining_zero">Απομένουν 0 χαρακτήρες</string>
     <string name="invite_message_title">Προσαρμοσμένο Μήνυμα</string>
     <string name="invite">Πρόσκληση</string>
     <string name="invite_names_title">Ονόματα Χρήστη ή Ηλ. Διευθύνσεις</string>
-    <string name="send_link">Αποστολή συνδέσμου</string>
     <string name="my_site_header_external">Εξωτερική</string>
     <string name="invite_people">Πρόσκαλέστε Άτομα</string>
     <string name="label_clear_search_history">Καθαρισμός ιστορικού αναζήτησης</string>
     <string name="dlg_confirm_clear_search_history">Καθαρισμός ιστορικού αναζήτησης;</string>
     <string name="reader_empty_search_description">Δεν βρέθηκαν άρθρα στην γλώσσα σας για %s</string>
     <string name="reader_hint_post_search">Αναζήτηση στο WordPress</string>
+    <string name="reader_title_related_post_detail">Σχετικό Άρθρο</string>
     <string name="preview_screen_links_disabled">Οι σύνδεσμοι είναι απενεργοποιημένοι στην οθόνη προεπισκόπησης</string>
     <string name="send">Αποστολή</string>
     <string name="user_remove_confirmation_message">Αν αφαιρέσετε τον %1$s, αυτός ο χρήστης δεν θα μπορεί πλέον να συνδεθεί σε αυτό τον ιστότοπο αλλά ό,τι περιεχόμενο δημιουργήθηκε από τον %1$s θα παραμείνει στον ιστότοπο.\n\nΘέλετε ακόμη να αφαιρέσετε το χρήστη;</string>
@@ -684,7 +689,6 @@ Language: el_GR
     <string name="checking_email">Έλεγχος e-mail</string>
     <string name="magic_link_unavailable_error_message">Μη διαθέσιμο αυτή τη στιγμή. Παρακαλούμε εισάγετε το συνθηματικό σας</string>
     <string name="logging_in">Γίνεται σύνδεση</string>
-    <string name="enter_your_password_instead">Εναλλακτικά, εισάγετε το συνθηματικό σας</string>
     <string name="web_address_dialog_hint">Εμφανίζεται δημοσίως όταν σχολιάζετε.</string>
     <string name="capture_or_pick_photo">Τραβήξτε ή επιλέξτε φωτογραφία</string>
     <string name="export_your_content_message">Τα άρθρα, οι σελίδες και οι ρυθμίσεις σας θα σας αποσταλούν με ηλ. ταχυδρομείο στο %s.</string>
@@ -707,6 +711,7 @@ Language: el_GR
     <string name="confirm_delete_site_prompt">Παρακαλούμε πληκτρολογήστε %1$s στο παρακάτω πεδίο για επιβεβαίωση. Ο ιστότοπός σας μετά θα εξαφανιστεί για πάντα.</string>
     <string name="site_settings_export_content_title">Εξαγωγή περιεχομένου</string>
     <string name="confirm_delete_site">Επιβεβαίωση Διαγραφής Ιστοτόπου</string>
+    <string name="contact_support">Επικοινωνήστε με την υποστήριξη</string>
     <string name="start_over_text">Αν θέλετε να διατηρήσετε έναν ιστότοπο αλλά δεν θέλετε κανένα από τα άρθρα και τις σελίδες που έχετε τώρα, η ομάδα υποστήριξής μας μπορεί να διαγράψει τα άρθρα, τις σελίδες τα πολυμέσα και τα σχόλια για λογαριασμό σας.\n\nΑυτό θα διατηρήσει ενεργά τον ιστότοπο και το URL σας αλλά θα σας επιτρέψει ένα νέο ξεκίνημα στη δημιουργία περιεχομένου. Απλά επικοινωνήστε μαζί μας για να γίνει εκκαθάριση του τρέχοντος περιεχομένου σας.</string>
     <string name="site_settings_start_over_hint">Ξεκινήστε τον ιστότοπό σας από την αρχή</string>
     <string name="let_us_help">Αφήστε μας να βοηθήσουμε</string>
@@ -804,7 +809,7 @@ Language: el_GR
     <string name="site_settings_paging_dialog_description">Σπάσιμο των συζητήσεων με σχόλια σε πολλαπλές σελίδες.</string>
     <string name="site_settings_paging_dialog_header">Σχόλια ανά σελίδα</string>
     <string name="site_settings_close_after_dialog_title">Κλείσιμο σχολιασμού</string>
-    <string name="site_settings_blacklist_description">Όταν ένα σχόλιο περιέχει οποιαδήποτε από αυτές τις λέξεις σε περιεχόμενο, όνομα, URL, e-mail ή IP, θα σημειώνεται ως ανεπιθύμητο. Μπορείτε να εισάγετε μέρη λέξεων, έτσι το \"press\" θα πιάσει και το \"WordPress.\"</string>
+    <string name="site_settings_denylist_description">Όταν ένα σχόλιο περιέχει οποιαδήποτε από αυτές τις λέξεις σε περιεχόμενο, όνομα, URL, e-mail ή IP, θα σημειώνεται ως ανεπιθύμητο. Μπορείτε να εισάγετε μέρη λέξεων, έτσι το \"press\" θα πιάσει και το \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">Όταν ένα σχόλιο περιέχει οποιαδήποτε από αυτές τις λέξεις σε περιεχόμενο, όνομα, URL, e-mail ή IP, θα παραμένει στην αναμονή προς έγκριση. Μπορείτε να εισάγετε μέρη λέξεων, έτσι το \"press\" θα πιάσει και το \"WordPress.\" </string>
     <string name="site_settings_list_editor_input_hint">Εισάγετε μια λέξη ή φράση</string>
     <string name="site_settings_list_editor_no_items_text">Δεν υπάρχουν αντικείμενα</string>
@@ -819,10 +824,10 @@ Language: el_GR
     <string name="site_settings_rp_show_header_title">Προβολή Κεφαλίδας</string>
     <string name="site_settings_rp_switch_summary">Στα Σχετικά Άρθρα εμφανίζεται σχετικό περιεχόμενο από τον ιστότοπό σας κάτω από τα άρθρα σας.</string>
     <string name="site_settings_rp_switch_title">Εμφάνιση Σχετικών Άρθρων</string>
-    <string name="site_settings_blacklist_hint">Σχόλια που εμπίπτουν σε ένα φίλτρο σημειώνονται ως ανεπιθύμητα</string>
+    <string name="site_settings_denylist_hint">Σχόλια που εμπίπτουν σε ένα φίλτρο σημειώνονται ως ανεπιθύμητα</string>
     <string name="site_settings_moderation_hold_hint">Σχόλια που εμπίπτουν σε ένα φίλτρο τοποθετούνται στην αναμονή προς έγκριση</string>
     <string name="site_settings_multiple_links_hint">Αγνόηση του ορίου συνδέσμου για γνωστούς χρήστες</string>
-    <string name="site_settings_whitelist_hint">Ο συντάκτης του σχολίου πρέπει να έχει προηγουμένως εγκεκριμένο σχόλιο</string>
+    <string name="site_settings_allowlist_hint">Ο συντάκτης του σχολίου πρέπει να έχει προηγουμένως εγκεκριμένο σχόλιο</string>
     <string name="site_settings_user_account_required_hint">Οι χρήστες πρέπει να είναι εγγεγραμμένοι και συνδεδεμένοι για να σχολιάσουν</string>
     <string name="site_settings_identity_required_hint">Ο συντάκτης του σχολίου θα πρέπει να συμπληρώσει όνομα και e-mail</string>
     <string name="site_settings_paging_hint">Εμφάνιση σχολίων σε ομάδες καθορισμένου μεγέθους</string>
@@ -845,17 +850,16 @@ Language: el_GR
     <string name="site_settings_address_hint">Η αλλαγή της διεύθυνσής σας δεν υποστηρίζεται προς το παρόν</string>
     <string name="site_settings_tagline_hint">Μια μικρή περιγραφή ή μια πιασάρικη φράση που περιγράφει το ιστολόγιό σας</string>
     <string name="site_settings_title_hint">Με λίγες λέξεις, εξηγήστε τι αφορά αυτός ο ιστότοπος</string>
-    <string name="site_settings_whitelist_known_summary">Σχόλια από γνωστούς χρήστες</string>
-    <string name="site_settings_whitelist_all_summary">Σχόλια από όλους τους χρήστες</string>
+    <string name="site_settings_allowlist_known_summary">Σχόλια από γνωστούς χρήστες</string>
+    <string name="site_settings_allowlist_all_summary">Σχόλια από όλους τους χρήστες</string>
     <string name="site_settings_threading_summary">%d επίπεδα</string>
     <string name="site_settings_privacy_private_summary">Ιδιωτικό</string>
     <string name="site_settings_privacy_hidden_summary">Κρυμμένο</string>
     <string name="site_settings_delete_site_title">Διαγραφή ιστοτόπου</string>
     <string name="site_settings_privacy_public_summary">Δημόσιο</string>
-    <string name="site_settings_blacklist_title">Μαύρη λίστα</string>
     <string name="site_settings_moderation_hold_title">Αναμονή για έλεγχο</string>
     <string name="site_settings_multiple_links_title">Σύνδεσμοι στα σχόλια</string>
-    <string name="site_settings_whitelist_title">Αυτόματη έγκριση</string>
+    <string name="site_settings_allowlist_title">Αυτόματη έγκριση</string>
     <string name="site_settings_paging_title">Σελιδοποίηση</string>
     <string name="site_settings_threading_title">Νήματα</string>
     <string name="site_settings_sort_by_title">Ταξινόμηση κατά</string>
@@ -930,7 +934,9 @@ Language: el_GR
     <string name="reader_discover_attribution_author_and_blog">Δημοσιεύτηκε αρχικά από %1$s στο %2$s</string>
     <string name="reader_short_like_count_multi">%s \"Like\"</string>
     <string name="reader_short_like_count_one">1 \"Like\"</string>
+    <string name="reader_label_follow_count">%,d ακόλουθοι</string>
     <string name="reader_short_like_count_none">\"Like\"</string>
+    <string name="reader_menu_tags">Επεξεργασία ετικετών και ιστότοπων</string>
     <string name="reader_title_post_detail">Άρθρο Αναγνώστη</string>
     <string name="notifications_push_summary">Ρυθμίσεις για τις ειδοποιήσεις που εμφανίζονται στη συσκευή σας.</string>
     <string name="notifications_email_summary">Ρυθμίσεις για τις ειδοποιήσεις που στέλνονται στο email που είναι συνδεδεμένο με το λογαριασμό σας.</string>
@@ -999,7 +1005,6 @@ Language: el_GR
     <string name="pages_fetching">Ανάκτηση σελίδων…</string>
     <string name="posts_fetching">Λήψη άρθρων…</string>
     <string name="media_fetching">Λήψη πολυμέσων…</string>
-    <string name="reader_page_recommended_blogs">Ιστολόγια που μπορεί να σας αρέσουν</string>
     <string name="logs_copied_to_clipboard">Τα αρχεία καταγραφής της εφαρμογής έχουν αντιγραφεί στο πρόχειρο</string>
     <string name="reader_label_new_posts">Νέα άρθρα</string>
     <string name="error_copy_to_clipboard">Προέκυψε σφάλμα κατά την αντιγραφή κειμένου στο πρόχειρο</string>
@@ -1043,6 +1048,7 @@ Language: el_GR
     <string name="older_month">Παλαιότερο από ένα μήνα</string>
     <string name="browse_our_faq_button">Περιηγηθείτε στις Συχνές Ερωτήσεις</string>
     <string name="reader_empty_comments">Δεν υπάρχουν σχόλια ακόμη</string>
+    <string name="reader_empty_posts_in_tag">Δεν υπάρχουν άρθρα με αυτή την ετικέτα</string>
     <string name="reader_label_view_original">Προβολή αρχικού άρθρου</string>
     <string name="comment_trashed">Το σχόλιο διαγράφηκε</string>
     <string name="posts_empty_list">Δεν υπάρχουν άρθρα ακόμη. Γιατί να μη δημιουργήσετε ένα;</string>
@@ -1054,7 +1060,9 @@ Language: el_GR
     <string name="reader_toast_blog_blocked">Δεν εμφανίζονται πλέον άρθρα από αυτόν τον Ιστότοπο</string>
     <string name="update_verb">Ενημέρωση</string>
     <string name="schedule_verb">Προγραμματισμός</string>
+    <string name="reader_page_followed_tags">Παρακολουθούμενες ετικέτες</string>
     <string name="reader_page_followed_blogs">Παρακολουθούμενα ιστολόγια</string>
+    <string name="reader_hint_add_tag_or_url">Εισάγετε μια ετικέτα ή URL για παρακολούθηση</string>
     <string name="reader_label_followed_blog">Παρακολουθούμενος Ιστότοπος</string>
     <string name="reader_toast_err_get_blog_info">Αδυναμία εμφάνισης αυτού του Ιστότοπου</string>
     <string name="reader_toast_err_already_follow_blog">Ακολουθείτε ήδη τον Ιστότοπο</string>
@@ -1062,7 +1070,6 @@ Language: el_GR
     <string name="reader_toast_err_unfollow_blog">Αδυναμία διακοπής παρακολούθησης αυτού του Ιστότοπου</string>
     <string name="reader_empty_recommended_blogs">Δεν υπάρχουν προτεινόμενοι Ιστότοποι</string>
     <string name="help">Βοήθεια</string>
-    <string name="forgot_password">Έχασες τον κωδικό σου;</string>
     <string name="ssl_certificate_error">Μη έγκυρο πιστοποιητικό SSL</string>
     <string name="ssl_certificate_ask_trust">Αν συνήθως δεν έχετε προβλήματα σύνδεσης σε αυτό τον ιστότοπο, αυτό το σφάλμα θα μπορούσε να σημαίνει ότι κάποιος προσπαθεί να μιμηθεί τον ιστότοπο και δεν θα πρέπει να συνεχίσετε. Θα θέλατε να εμπιστευτείτε το πιστοποιητικό όπως και να\'χει;</string>
     <string name="no_network_message">Δεν υπάρχει διαθέσιμο δίκτυο</string>
@@ -1135,6 +1142,8 @@ Language: el_GR
     <string name="error_blog_hidden">Αυτό το ιστολόγιο είναι κρυφό και δεν μπόρεσε να φορτωθεί. Ενεργοποιήστε το ξανά στις ρυθμίσεις και δοκιμάστε ξανά.</string>
     <string name="fatal_db_error">Προέκυψε σφάλμα κατά τη δημιουργία της βάσης δεδομένων της εφαρμογής. Δοκιμάστε να την εγκαταστήσετε ξανά.</string>
     <string name="reader_title_applog">Αρχείο καταγραφής εφαρμογής</string>
+    <string name="reader_toast_err_add_tag">Αδυναμία προσθήκης αυτής της ετικέτας</string>
+    <string name="reader_toast_err_remove_tag">Αδυναμία αφαίρεσης αυτής της ετικέτας</string>
     <string name="notifications_empty_all">Καμία ειδοποίηση…ακόμα.</string>
     <string name="invalid_site_url_message">Βεβαιωθείτε ότι το URL του ιστότοπου που δώσατε είναι έγκυρο</string>
     <string name="plugin_not_found">Ένα σφάλμα παρουσιάστηκε κατά την πρόσβαση σε αυτό το πρόσθετο</string>
@@ -1163,10 +1172,13 @@ Language: el_GR
     <string name="reader_view_reblog">Αναμετάδοση</string>
     <string name="reader_toast_err_view_image">Αδυναμία προβολής της εικόνας</string>
     <string name="reader_label_added_tag">Προστέθηκε η %s</string>
+    <string name="reader_toast_err_tag_exists">Ακολουθείτε ήδη αυτή την ετικέτα</string>
+    <string name="reader_toast_err_tag_invalid">Αυτή η ετικέτα δεν είναι έγκυρη</string>
     <string name="reader_toast_err_url_intent">Δε στάθηκε δυνατό να ανοιχθεί το %s</string>
     <string name="empty_list_default">Αυτή η λίστα είναι κενή</string>
     <string name="reader_hint_comment_on_comment">Απάντηση σ\' αυτό το σχόλιο…</string>
     <string name="reader_label_removed_tag">Αφαιρέθηκε το %s</string>
+    <string name="sign_up_label">Εγγραφή</string>
     <string name="stats">Στατιστικά</string>
     <string name="themes">Θέμα</string>
     <string name="media_gallery_type_squares">Τετράγωνα</string>
diff --git a/WordPress/src/main/res/values-en-rAU/strings.xml b/WordPress/src/main/res/values-en-rAU/strings.xml
index 9db775096745..f0809fc7a532 100644
--- a/WordPress/src/main/res/values-en-rAU/strings.xml
+++ b/WordPress/src/main/res/values-en-rAU/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2019-11-20 03:34:20+0000
 Plural-Forms: nplurals=2; plural=n != 1;
@@ -9,14 +9,6 @@ Language: en_AU
     <string name="reader_empty_saved_posts_content_description">Tap the Add to Save Posts button to save a post to your list.</string>
     <string name="reader_acessibility_list_loaded">\"The list has loaded with %1$d items.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Notifications</string>
-    <string name="master_switch_default_title_off">Off</string>
-    <string name="master_switch_default_title_on">On</string>
-    <string name="notifications_tab_dialog_master_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Enable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Disable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_status_on">Notifications for this site</string>
     <string name="pick_media">Add image or video</string>
     <string name="error_post_not_submitted_retrying">We couldn\'t submit this post for review, but we\'ll try again later. </string>
     <string name="error_post_not_scheduled_retrying">We couldn\'t schedule this post, but we\'ll try again later.</string>
@@ -108,8 +100,6 @@ Language: en_AU
     <string name="post_notification_off">Off</string>
     <string name="post_settings_add_to_calendar">Add to calendar</string>
     <string name="post_settings_notification">Notification</string>
-    <string name="login_need_help_finding_connected_email">Need help finding the email you connected with?</string>
-    <string name="enter_wordpress_site">The website at this address is not a WordPress site. For us to connect to it, the site must have WordPress installed.</string>
     <string name="login_invalid_site_url">Please enter a complete website address, like example.com.</string>
     <string name="enter_email_for_site">Log in with WordPress.com to connect to %1$s</string>
     <string name="stats_post_views_label">Views</string>
@@ -175,7 +165,7 @@ Language: en_AU
     <string name="domain_registration_state_picker_dialog_title">Select State</string>
     <string name="domain_registration_country_picker_dialog_title">Select Country</string>
     <string name="domain_registration_result_continue_button">continue</string>
-    <string name="domain_registration_result_description">your new domain &lt;b>%s&lt;/b> is being set up. Your site is\n        doing somersaults in excitement!</string>
+    <string name="domain_registration_result_description">your new domain &lt;b&gt;%s&lt;/b&gt; is being set up. Your site is\n        doing somersaults in excitement!</string>
     <string name="domain_registration_result_title">Congratulations</string>
     <string name="domain_contact_information_register_domain_button">Register Domain</string>
     <string name="domain_contact_information_postal_code_hint">Postal code</string>
@@ -281,23 +271,18 @@ Language: en_AU
     <string name="plans_loading_error_no_plans_title">Cannot load Plans</string>
     <string name="plans_loading_error_network_title">No connection</string>
     <string name="menu_switch_to_gutenberg_editor">Switch to block editor</string>
-    <string name="menu_switch_to_aztec_editor">Switch to classic editor</string>
     <string name="stats_loading_block_error">There was a problem loading your data, refresh your page to try again.</string>
     <string name="stats_loading_error">Data not loaded</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edit new posts and pages with the Block Editor</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Use Block Editor</string>
-    <string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
     <string name="exit">exit</string>
     <string name="quick_start_sites_type_subtitle">%1$d of %2$d complete</string>
-    <string name="quick_start_sites_type_grow">Grow Your Audience</string>
-    <string name="quick_start_sites_type_customize">Customise Your Site</string>
     <string name="quick_start_sites">Next Steps</string>
     <string name="quick_start_complete_tasks_header">Complete (%d)</string>
     <string name="quick_start_dialog_view_site_message">Enjoy your finished product!</string>
     <string name="quick_start_dialog_upload_icon_title">Upload a site icon</string>
     <string name="quick_start_dialog_upload_icon_message">Your visitors will see your icon in their browser. Add a custom icon for a polished, pro look.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Tap %1$s Plan %2$s to see your current plan and other available plans</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tap %1$s Add Page %2$s to create a new page.</string>
     <string name="quick_start_dialog_check_stats_message_short">Tap %1$s Stats %2$s to see how your site is performing.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tap %1$s Your Site Icon %2$s to upload a new one</string>
     <string name="quick_start_dialog_publish_post_message">Draft and publish your first post.</string>
@@ -308,13 +293,8 @@ Language: en_AU
     <string name="quick_start_dialog_explore_plans_message">Learn about the marketing and SEO tools in our paid plans.</string>
     <string name="quick_start_dialog_enable_sharing_title">Enable post sharing</string>
     <string name="quick_start_dialog_enable_sharing_message">Automatically share new posts to your social media accounts.</string>
-    <string name="quick_start_dialog_customize_site_message">Tweak fonts, add images, and more.</string>
-    <string name="quick_start_dialog_create_page_title">Create a new page</string>
-    <string name="quick_start_dialog_create_page_message">Add a page for key content — an \"About\" page is a great start.</string>
     <string name="quick_start_dialog_check_stats_title">Check your site stats</string>
     <string name="quick_start_dialog_check_stats_message">Keep up to date on your site\'s performance.</string>
-    <string name="quick_start_dialog_browse_themes_title">Browse themes</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore dozens of layout options and find your perfect fit.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Removing Next Steps will hide all tours on this site. This action cannot be undone.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Remove Next Steps</string>
     <string name="quick_start_remove_next_steps_menu_title">Remove this</string>
@@ -338,15 +318,11 @@ Language: en_AU
     <string name="notification_new_site_creation_failed">There was a problem</string>
     <string name="notification_new_site_creation_title">Create Site</string>
     <string name="new_site_creation_create_site_button">Create Site</string>
-    <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="site_creation_error_generic_title">There was a problem</string>
     <string name="site_creation_fetch_suggestions_error_unknown">There was a problem</string>
-    <string name="site_creation_segments_subtitle">This helps us make recommendations. But you’re never locked in — all sites evolve!</string>
-    <string name="site_creation_segments_title">Tell us what kind of site you’d like to make</string>
     <string name="new_site_creation_preview_title">Your site has been created!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d of %2$d</string>
     <string name="new_site_creation_screen_title_general">Create Site</string>
@@ -498,15 +474,8 @@ Language: en_AU
     <string name="quick_start_dialog_need_help_button_neutral">Never</string>
     <string name="quick_start_dialog_need_help_button_negative">No Thanks</string>
     <string name="quick_start_dialog_follow_sites_title">Follow other sites</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar interests</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tap %1$s Reader %2$s to continue</string>
     <string name="quick_start_dialog_follow_sites_message">Find sites that inspire you, and follow them to get updates when they post.</string>
-    <string name="quick_start_dialog_customize_site_title">Customise your site</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tap %1$s Themes %2$s to continue</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tap %1$s Customise %2$s to start personalising your site</string>
-    <string name="quick_start_dialog_choose_theme_title">Choose a theme</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tap %1$s Themes %2$s to discover new themes</string>
-    <string name="quick_start_dialog_choose_theme_message">Browse all our themes to find your perfect fit.</string>
     <string name="quick_start_button_positive">Go</string>
     <string name="quick_start_button_negative_short">Cancel</string>
     <string name="quick_start_button_negative">Not now</string>
@@ -568,14 +537,8 @@ Language: en_AU
     <string name="support_contact_email">Contact email</string>
     <string name="application_log_button">Application log</string>
     <string name="my_tickets">My Tickets</string>
-    <string name="activity_log_rewind_dialog_message">Are you sure you want to rewind your site back to %1$s at %2$s? This will remove all content and options created or changed since then.</string>
-    <string name="activity_log_rewind_site">Rewind Site</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rewind in progress</string>
-    <string name="activity_log_currently_restoring_message">Rewinding to %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Currently restoring your site</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Your site has been successfully restored</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRewound to %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRewinding to %1$s %2$s</string>
     <string name="activity_log_button">Activity Log action button</string>
     <string name="plugin_auto_managed">Auto-managed</string>
     <string name="reader_save_posts_locally_dialog_title">Save Posts for Later</string>
@@ -584,20 +547,16 @@ Language: en_AU
     <string name="comment_read_source_post">Read the source post</string>
     <string name="sites">Sites</string>
     <string name="signup_magic_link_title">Magic link sent</string>
-    <string name="signup_email_screen_title">Email signup</string>
     <string name="verification_2fa_screen_title">Code verification</string>
     <string name="selfhosted_site_login_title">Login credentials</string>
     <string name="magic_link_sent_login_title">Magic link sent</string>
     <string name="magic_link_login_title">Magic link login</string>
     <string name="site_address_login_title">Site address login</string>
     <string name="email_address_login_title">Email address login</string>
-    <string name="alternatively">Alternatively:</string>
     <string name="reader_empty_saved_posts_description">Tap %s to save a post to your list.</string>
     <string name="reader_empty_saved_posts_title">No posts saved — yet!</string>
     <string name="reader_bookmark_snack_title">Post saved</string>
     <string name="reader_bookmark_snack_btn">View All</string>
-    <string name="reader_btn_bookmarked">Saved</string>
-    <string name="reader_btn_bookmark">Save</string>
     <string name="reader_remove_bookmark">Remove from saved posts</string>
     <string name="reader_add_bookmark">Add to saved posts</string>
     <string name="reader_save_for_later_title">Saved posts</string>
@@ -617,11 +576,9 @@ Language: en_AU
     <string name="reader_btn_notifications_on">Turn on site notifications</string>
     <string name="reader_btn_notifications_off">Turn off site notifications</string>
     <string name="activity_log_jetpack_icon">Jetpack icon</string>
-    <string name="rewind">Rewind</string>
     <string name="activity_log_event">Event</string>
     <string name="activity_log_icon">Activity icon</string>
     <string name="activity_log">Activity Log</string>
-    <string name="activity">Activity</string>
     <string name="privacy_policy_read">Read privacy policy</string>
     <string name="third_party_policy_learn_more_caption">We use other tracking tools, including some from third parties. Read about these and how to control them.</string>
     <string name="third_party_policy_learn_more_header">Third Party Policy</string>
@@ -632,7 +589,6 @@ Language: en_AU
     <string name="preference_privacy_settings">Privacy settings</string>
     <string name="preference_collect_information">Collect information</string>
     <string name="post_submitted">Post submitted</string>
-    <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Plugin feature requires the site to be in good standing.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Plugin feature requires primary domain subscription to be associated with this user.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Plugin feature requires admin privileges.</string>
@@ -731,7 +687,6 @@ Language: en_AU
     <string name="edit_photo_screen_title">Edit Photo</string>
     <string name="share_intent_screen_title">Pick site</string>
     <string name="signup_epilogue_screen_title">New account</string>
-    <string name="login_prologue_screen_title">Login</string>
     <string name="login_epilogue_screen_title">Logged in as</string>
     <string name="person_detail_screen_title">Person detail</string>
     <string name="media_settings_screen_title">File details</string>
@@ -744,7 +699,7 @@ Language: en_AU
     <string name="license_screen_title">License</string>
     <string name="release_notes_screen_title">Release notes</string>
     <string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
-    <string name="permissions_denied_message">It looks like you turned off permissions required for this feature.&lt;br/>&lt;br/>To change this, edit your permissions and make sure &lt;strong>%s&lt;/strong> is enabled.</string>
+    <string name="permissions_denied_message">It looks like you turned off permissions required for this feature.&lt;br/&gt;&lt;br/&gt;To change this, edit your permissions and make sure &lt;strong&gt;%s&lt;/strong&gt; is enabled.</string>
     <string name="permissions_denied_title">Permissions</string>
     <string name="plugin_caption_featured">Featured</string>
     <string name="sharing_disabled_description">You cannot access your sharing settings because your Sharing Jetpack module is disabled.</string>
@@ -785,7 +740,6 @@ Language: en_AU
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 post with 1 file not uploaded</string>
     <string name="untitled_in_parentheses">(Untitled)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Create site</string>
     <string name="notification_site_creation_created">Tap to continue.</string>
     <string name="notification_site_creation_title_success">Site created!</string>
@@ -799,11 +753,8 @@ Language: en_AU
     <string name="username_changer_dismiss_button_positive">Discard</string>
     <string name="username_changer_action">Save</string>
     <string name="content_description_add_avatar">Add avatar</string>
-    <string name="signup_with_google_button">Sign Up with Google</string>
-    <string name="signup_with_email_button">Sign Up with Email</string>
     <string name="signup_user_exists">Email already exists on WordPress.com.\nProceeding with login.</string>
     <string name="signup_updating_account">Updating account…</string>
-    <string name="signup_terms_of_service_text">By signing up, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="signup_magic_link_progress">Sending email</string>
     <string name="signup_magic_link_error_button_positive">Retry</string>
     <string name="signup_magic_link_error_button_negative">Close</string>
@@ -815,11 +766,6 @@ Language: en_AU
     <string name="signup_epilogue_error_button_negative">Revert</string>
     <string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
     <string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
-    <string name="signup_email_header">To create your new WordPress.com account, please enter your email address.</string>
-    <string name="signup_email_error_generic">There was some trouble checking the email address.</string>
-    <string name="sign_up">Sign Up for WordPress.com</string>
-    <string name="enter_username_instead">Log in with your username.</string>
-    <string name="enter_site_address_instead">Log in by entering your site address.</string>
     <string name="plugin_needs_update">Needs update</string>
     <string name="plugin_caption_search">Search Plugins</string>
     <string name="plugin_caption_new">New</string>
@@ -939,7 +885,6 @@ Language: en_AU
     <string name="login_error_suffix">\nMaybe try a different account?</string>
     <string name="login_error_generic">There was some trouble connecting with the Google account.</string>
     <string name="login_error_button">Close</string>
-    <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
     <string name="error_generic_network">A network error occurred. Please check your connection and try again.</string>
     <string name="post_settings_remove_featured_image">Remove featured image</string>
@@ -951,12 +896,10 @@ Language: en_AU
     <string name="jetpack_disconnect_confirm">Disconnect</string>
     <string name="jetpack_disconnect_confirmation_message">Are you sure you want to disconnect Jetpack from the site?</string>
     <string name="jetpack_disconnect_pref_title">\"Disconnect from WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">You may whitelist an IP address or series of addresses preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Require two-step authentication</string>
     <string name="jetpack_match_wpcom_via_email_title">Match accounts using email</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Allow WordPress.com login</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com login</string>
-    <string name="jetpack_brute_force_whitelist_title">Whitelisted IP addresses</string>
     <string name="jetpack_prevent_brute_force_title">Block malicious login attempts</string>
     <string name="jetpack_prevent_brute_force_category_title">Brute force attack protection</string>
     <string name="jetpack_send_wp_notifications_title">Send push notifications</string>
@@ -996,12 +939,6 @@ Language: en_AU
     <string name="notification_settings_category_other">Other</string>
     <string name="notification_settings_item_your_sites_all_your_sites">All My Sites</string>
     <string name="notification_settings_category_your_sites">Your Sites</string>
-    <string name="notification_settings_master_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
-    <string name="notification_settings_master_off_title">To receive notifications on this device, turn Notification Settings on.</string>
-    <string name="notification_settings_master_hint_off">Enable notifications</string>
-    <string name="notification_settings_master_hint_on">Disable notifications</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_status_on">On</string>
     <string name="max_video_resolution">Maximum Video Size</string>
     <string name="max_thumbnail_px_size">Maximum Image Size</string>
     <string name="error_upload_post_media_param">There was an error uploading the media in this post: %s.</string>
@@ -1038,7 +975,6 @@ Language: en_AU
     <string name="login_site_address_more_help">Need more help?</string>
     <string name="login_site_address_help_content">Your site address appears in the bar at the top of the screen when you visit your site in Chrome.</string>
     <string name="login_site_address_help_title">What\'s my site address?</string>
-    <string name="login_site_address_help">Need help finding your site address?</string>
     <string name="login_site_address">Site address</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
@@ -1048,7 +984,6 @@ Language: en_AU
     <string name="password_incorrect">It looks like this password is incorrect. Please double check your information and try again.</string>
     <string name="requesting_otp">Requesting a verification code via SMS.</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
-    <string name="open_mail">Open mail</string>
     <string name="next">Next</string>
     <string name="enter_email_wordpress_com">Log in to WordPress.com using an email address to manage all your WordPress sites.</string>
     <string name="image_optimization_promo_desc">Image optimisation shrinks images for quicker uploading.\n\nYou can change this any time in site settings.</string>
@@ -1071,10 +1006,6 @@ Language: en_AU
     <string name="post_status_draft">Draft</string>
     <string name="post_status_pending_review">Pending review</string>
     <string name="post_status_publish_post">Publish</string>
-    <string name="change_location">Change Location</string>
-    <string name="remove_location">Remove Location</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Can\'t open the Location Picker, Google Play Services is not available</string>
-    <string name="post_settings_location">Location</string>
     <string name="now">Now</string>
     <string name="post_settings_password_dialog_hint">Only those with this password can view this post</string>
     <string name="post_settings_excerpt_dialog_hint">Excerpts are optional hand-crafted summaries of your content.</string>
@@ -1257,7 +1188,6 @@ Language: en_AU
     <string name="signout">Log out</string>
     <string name="sign_in_wpcom">Log in to WordPress.com</string>
     <string name="reader_label_global_related_posts">More on WordPress.com</string>
-    <string name="reader_label_local_related_posts">More in %s</string>
     <string name="preference_open_device_settings">Open device settings</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
@@ -1305,20 +1235,14 @@ Language: en_AU
     <string name="invite_error_invalid_usernames_multiple">Cannot send: There are invalid usernames or emails</string>
     <string name="invite_error_invalid_usernames_one">Cannot send: A username or email is invalid</string>
     <string name="invite_error_no_usernames">Please add at least one username</string>
-    <string name="invite_message_info">(Optional) You can enter a custom message of up to 500 characters that will be included in the invitation to the user(s).</string>
-    <string name="invite_message_remaining_other">%d characters remaining</string>
-    <string name="invite_message_remaining_one">1 character remaining</string>
-    <string name="invite_message_remaining_zero">0 characters remaining</string>
-    <string name="invite_message_title">Custom Message</string>
     <string name="invite">Invite</string>
-    <string name="invite_names_title">Usernames or Emails</string>
     <string name="invite_people">Invite People</string>
     <string name="my_site_header_external">External</string>
-    <string name="send_link">Send link</string>
     <string name="label_clear_search_history">Clear search history</string>
     <string name="dlg_confirm_clear_search_history">Clear search history?</string>
     <string name="reader_empty_search_description">No results found for %s for your language</string>
     <string name="reader_hint_post_search">Search WordPress</string>
+    <string name="reader_title_related_post_detail">Related Post</string>
     <string name="preview_screen_links_disabled">Links are disabled on the preview screen</string>
     <string name="send">Send</string>
     <string name="person_removed">Successfully removed %1$s</string>
@@ -1337,7 +1261,6 @@ Language: en_AU
     <string name="checking_email">Checking email</string>
     <string name="magic_link_unavailable_error_message">Currently unavailable. Please enter your password</string>
     <string name="logging_in">Logging in</string>
-    <string name="enter_your_password_instead">Enter your password instead</string>
     <string name="web_address_dialog_hint">Shown publicly when you comment.</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
     <string name="plans">Plans</string>
@@ -1457,7 +1380,6 @@ Language: en_AU
     <string name="site_settings_paging_dialog_description">Break comment threads into multiple pages.</string>
     <string name="site_settings_paging_dialog_header">Comments per page</string>
     <string name="site_settings_close_after_dialog_title">Close commenting</string>
-    <string name="site_settings_blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
     <string name="site_settings_list_editor_no_items_text">No items</string>
@@ -1472,10 +1394,8 @@ Language: en_AU
     <string name="site_settings_rp_show_header_title">Show Header</string>
     <string name="site_settings_rp_switch_summary">Related Posts displays relevant content from your site below your posts.</string>
     <string name="site_settings_rp_switch_title">Show Related Posts</string>
-    <string name="site_settings_blacklist_hint">Comments that match a filter are marked as spam</string>
     <string name="site_settings_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
     <string name="site_settings_multiple_links_hint">Ignores link limit from known users</string>
-    <string name="site_settings_whitelist_hint">Comment author must have a previously approved comment</string>
     <string name="site_settings_user_account_required_hint">Users must be registered and logged in to comment</string>
     <string name="site_settings_identity_required_hint">Comment author must fill out name and email</string>
     <string name="site_settings_paging_hint">Display comments in chunks of a specified size</string>
@@ -1498,17 +1418,13 @@ Language: en_AU
     <string name="site_settings_address_hint">Changing your address is not currently supported</string>
     <string name="site_settings_tagline_hint">A short description or catchy phrase to describe your blog</string>
     <string name="site_settings_title_hint">In a few words, explain what this site is about</string>
-    <string name="site_settings_whitelist_known_summary">Comments from known users</string>
-    <string name="site_settings_whitelist_all_summary">Comments from all users</string>
     <string name="site_settings_threading_summary">%d levels</string>
     <string name="site_settings_privacy_private_summary">Private</string>
     <string name="site_settings_privacy_hidden_summary">Hidden</string>
     <string name="site_settings_privacy_public_summary">Public</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
     <string name="site_settings_moderation_hold_title">Hold for Moderation</string>
     <string name="site_settings_multiple_links_title">Links in comments</string>
-    <string name="site_settings_whitelist_title">Automatically approve</string>
     <string name="site_settings_paging_title">Paging</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_sort_by_title">Sort by</string>
@@ -1655,7 +1571,6 @@ Language: en_AU
     <string name="logs_copied_to_clipboard">Application logs have been copied to the clipboard</string>
     <string name="reader_empty_posts_in_blog">This site is empty</string>
     <string name="reader_label_new_posts">New posts</string>
-    <string name="reader_page_recommended_blogs">Sites you may like</string>
     <string name="error_copy_to_clipboard">An error occurred while copying text to clipboard</string>
     <string name="post_uploading">Uploading post</string>
     <string name="stats_followers_years">%1$d years</string>
@@ -1717,7 +1632,6 @@ Language: en_AU
     <string name="reader_title_blog_preview">Reader Site</string>
     <string name="ssl_certificate_ask_trust">If you usually connect to this site without problems, this error could mean that someone is trying to impersonate the site, and you shouldn\'t continue. Would you like to trust the certificate anyway?</string>
     <string name="ssl_certificate_error">Invalid SSL certificate</string>
-    <string name="forgot_password">Lost your password?</string>
     <string name="help">Help</string>
     <string name="username_or_password_incorrect">The username or password you entered is incorrect</string>
     <string name="email_invalid">Enter a valid email address</string>
diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml
index e8fee9e82294..970e62fcc112 100644
--- a/WordPress/src/main/res/values-en-rCA/strings.xml
+++ b/WordPress/src/main/res/values-en-rCA/strings.xml
@@ -1,17 +1,500 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-10 02:43:17+0000
+Translation-Revision-Date: 2021-05-19 05:40:17+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: en_CA
 -->
 <resources>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Double tap to add a link.</string>
+    <string name="gutenberg_native_add_link">ADD LINK</string>
+    <string name="login_empty_view_try_another_account">Try with another account</string>
+    <string name="login_empty_view_see_instructions">See instructions</string>
+    <string name="login_no_jetpack_sites_error_message">If you already have a site, you\'ll need to install the free Jetpack plugin and connect it to your WordPress account.</string>
+    <string name="login_empty_view_avatar_content_description">Your profile photo</string>
+    <string name="login_not_a_jetpack_site">To use this app for %1$s you\'ll need to have the Jetpack plugin installed and connected to your WordPress.com account.</string>
+    <string name="gutenberg_native_size">Size</string>
+    <string name="gutenberg_native_image_settings">Image settings</string>
+    <string name="gutenberg_native_audio_settings">Audio settings</string>
+    <string name="gutenberg_native_move_image_forward">Move Image Forward</string>
+    <string name="gutenberg_native_move_image_backward">Move Image Backward</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">User profile bottom sheet information</string>
+    <string name="user_profile_untitled_site">(Untitled)</string>
+    <string name="likes_list_screen_title">Likes list %s</string>
+    <string name="gutenberg_native_write_code">Write code…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sorting and filtering</string>
+    <string name="gutenberg_native_show_download_button">Show download button</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Read more</string>
+    <string name="gutenberg_native_preload">Preload</string>
+    <string name="gutenberg_native_post_meta_settings">Post meta settings</string>
+    <string name="gutenberg_native_post_content_settings">Post content settings</string>
+    <string name="gutenberg_native_media_area">Media area</string>
+    <string name="gutenberg_native_metadata">Metadata</string>
+    <string name="gutenberg_native_media_file">Media file</string>
+    <string name="gutenberg_native_loop">Loop</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Link to</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">image %1$d of %2$d in gallery</string>
+    <string name="gutenberg_native_heading_d">Heading %d</string>
+    <string name="gutenberg_native_featured">Featured</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Enter URL to embed here…</string>
+    <string name="gutenberg_native_edit_image">Edit image</string>
+    <string name="gutenberg_native_display_post_date">Display post date</string>
+    <string name="gutenberg_native_change_heading_level">Change heading level</string>
+    <string name="gutenberg_native_code">Code</string>
+    <string name="gutenberg_native_browser_default">Browser default</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Block has been deleted or is unavailable.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Block cannot be rendered inside itself.</string>
+    <string name="gutenberg_native_autoplay">Autoplay</string>
+    <string name="gutenberg_native_auto">Auto</string>
+    <string name="gutenberg_native_attachment_page">Attachment page</string>
+    <string name="gutenberg_native_add_text">Add text…</string>
+    <string name="gutenberg_native_add_caption">Add caption</string>
+    <string name="login_no_jetpack_sites">No Jetpack sites found</string>
+    <string name="gutenberg_native_what_is_alt_text">What is alt text?</string>
+    <string name="gutenberg_native_transform_s_to">Transform %s to</string>
+    <string name="gutenberg_native_transform_block">Transform block…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Failed to insert media.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Failed to insert audio file.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Describe the purpose of the image. Leave empty if the image is purely decorative. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s transformed to %2$s</string>
+    <string name="like_faces_error_loading_message">Error loading like data. %s.</string>
+    <string name="like_faces_plural_text">%d bloggers like this.</string>
+    <string name="like_faces_singular_text">One blogger likes this.</string>
+    <string name="like_title_plural">%d Likes</string>
+    <string name="like_title_singular">One Like</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Enter your server credentials to fix threats.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Enter your server credentials to fix threat.</string>
+    <string name="suggestion">Suggestion:</string>
+    <string name="gutenberg_native_search_blocks">Search blocks</string>
+    <string name="gutenberg_native_search_block">Search block</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">double–tap to change unit</string>
+    <string name="gutenberg_native_clear_search">Clear search</string>
+    <string name="gutenberg_native_cancel_search">Cancel search</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s is %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">An error occurred while getting likes data</string>
+    <string name="get_likes_unknown_error">An unknown error occurred while getting likes.</string>
+    <string name="get_likes_no_network_error">No network available.</string>
+    <string name="comments_empty_list_filtered_unreplied">No unreplied comments</string>
+    <string name="comment_status_unreplied">Unreplied</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Summarize your post with a list of headings. Add HTML anchors to Heading blocks to link them here.</string>
+    <string name="gutenberg_native_summary">summary</string>
+    <string name="gutenberg_native_table_of_contents">Table of Contents</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="gutenberg_native_document_outline">document outline</string>
+    <string name="jetpack_brute_force_allowlist_title">Always allowed IP addresses</string>
+    <string name="site_settings_denylist_title">Disallowed comments</string>
+    <string name="reader_title_interests">Follow topics</string>
+    <string name="stories_intro_main_subtitle">A new way to create and publish engaging content on your site.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Dismiss</string>
+    <string name="activity_log_backup_download_notice_download_action">Download</string>
+    <string name="threat_fix_all_status_success_message_plural">Threats were successfully fixed.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Please confirm you want to fix all %s active threats.</string>
+    <string name="scan_idle_threats_description_plural">The scan found %1$s potential threats with %2$s. Please review them below and take action or tap the fix all button. We are %3$s if you need us.</string>
+    <string name="scan_fixing_threats_description_plural">We\'re hard at work in the background fixing these threats. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="gutenberg_native_edit_focal_point">Edit focal point</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Double tap to open Action Sheet to edit, replace, or clear the image</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Double tap to open Bottom Sheet to edit, replace, or clear the image</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Type a name for your site</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ll reach more people. Nice job!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ve customized your site. Well done!</string>
+    <string name="invite_links_disable_dialog_message">Once this invite link is disabled, nobody will be able to use it to join your team. Are you sure?</string>
+    <string name="magic_link_not_meaning_to_create_account">Didn\'t mean to create a new account? Go back to re-enter your email address.</string>
+    <string name="quick_start_card_menu_hide">Hide for now</string>
+    <string name="invite_links_bad_format_response">Invalid response received</string>
+    <string name="invite_links_cannot_get_role_data_error">There was an error getting data for role %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">There was an error getting roles</string>
+    <string name="invite_links_disable_dialog_title">Disable invite link</string>
+    <string name="invite_links_generic_get_data_error">Unknown error fetching invite links data</string>
+    <string name="invite_links_helper_text">Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted people.</string>
+    <string name="invite_links_null_response">No response received</string>
+    <string name="invite_links_disable_invite_link">Disable invite link</string>
+    <string name="invite_links_expire_date">Expires %1$s</string>
+    <string name="invite_links_generate">Generate new link</string>
+    <string name="invite_links_get_status_retry">Refresh links status</string>
+    <string name="invite_links_section_title">Invite Link</string>
+    <string name="invite_links_share_invite_link">Share invite link</string>
+    <string name="threats_found_plural">Threats found</string>
+    <string name="threats_found_singular">Threat found</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; No threats found</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; %s potential threats found</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; One potential threat found</string>
+    <string name="disable">Disable</string>
+    <string name="scan_fixing_threats_title_singular">Fixing Threat</string>
+    <string name="quick_start_list_review_pages_subtitle">Check your pages and make changes, or add or remove pages.</string>
+    <string name="quick_start_card_menu_unpin">Unpin this</string>
+    <string name="quick_start_list_view_site_title">Visit your site</string>
+    <string name="quick_start_list_upload_icon_subtitle">Add a site icon for a polished, pro look.</string>
+    <string name="quick_start_list_follow_site_subtitle">Discover and follow sites that inspire you.</string>
+    <string name="quick_start_list_enable_sharing_title">Enable sharing</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Automatically share new posts to your social media.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic.</string>
+    <string name="quick_start_list_check_stats_title">Check your stats</string>
+    <string name="backup_download_status_failure_bullet2">We\'ll still attempt to create your downloadable backup file.</string>
+    <string name="backup_download_status_failure_bullet1">We couldn\'t find the status to say how long your downloadable backup will take.</string>
+    <string name="backup_download_status_failure_heading">Hmm, we couldn\'t find your downloadable backup status</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Checkmark icon</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Clock icon</string>
+    <string name="restore_status_failure_bullet3">We’ll notify you when its done.</string>
+    <string name="restore_status_failure_bullet2">We\'ll still attempt to restore your site.</string>
+    <string name="restore_status_failure_bullet1">We couldn\'t find the status to say how long your restore will take.</string>
+    <string name="restore_status_failure_heading">Hmm, we couldn\'t find your restore status</string>
+    <string name="restore_complete_failed_description">We couldn\'t restore your site</string>
+    <string name="restore_warning_action_button">Confirm</string>
+    <string name="restore_warning_description_with_two_parameters">Are you sure you want to revert your site back to %1$s at %2$s?\n        Anything you changed since then will be lost.</string>
+    <string name="backup_download_complete_failed_description">We couldn\'t create your backup</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(excludes themes, plugins, and uploads)</string>
+    <string name="backup_item_contents">WP-content directory</string>
+    <string name="backup_item_roots">WordPress root</string>
+    <string name="backup_download_details_choose_items_header">Items included in this download</string>
+    <string name="gutenberg_native_uploading">Uploading…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Reusable blocks aren\'t editable on WordPress for iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Reusable blocks aren\'t editable on WordPress for Android</string>
+    <string name="gutenberg_native_replace_file">Replace file</string>
+    <string name="gutenberg_native_replace_audio">Replace audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problem opening the audio</string>
+    <string name="gutenberg_native_open">OPEN</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">No application can handle this request.</string>
+    <string name="gutenberg_native_lock_icon">Lock icon</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Failed to insert audio file. Please tap for options.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Double tap to select an audio file</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Double tap to listen the audio file</string>
+    <string name="gutenberg_native_choose_audio">Choose audio</string>
+    <string name="gutenberg_native_audio_player">Audio Player</string>
+    <string name="gutenberg_native_audio_file"> audio file</string>
+    <string name="gutenberg_native_audio_caption_s">Audio caption. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Audio caption. Empty</string>
+    <string name="gutenberg_native_add_audio">ADD AUDIO</string>
+    <string name="continue_with_wpcom">Log in or sign up with WordPress.com</string>
+    <string name="photo_picker_use_audio">Use this audio</string>
+    <string name="photo_picker_choose_audio">Choose audio from device</string>
+    <string name="people_optional_custom_message_helper_text">Optional: enter a custom message to be sent with your invitation.</string>
+    <string name="people_learn_more_about_roles">Learn more about roles</string>
+    <string name="threat_status_fixed">Fixed</string>
+    <string name="threat_found_header">Found</string>
+    <string name="scan_here_to_help">here to help</string>
+    <string name="scan_idle_threats_description_singular">The scan found one potential threat with %1$s. Please review the threat below and take action or tap the fix all button. We are %2$s if you need us.</string>
+    <string name="scan_idle_manual_scan_description">To review your site again run a manual scan, or wait for Jetpack to scan your site later today.</string>
+    <string name="scan_provisioning_description">Welcome to Jetpack Scan! We\'re scoping out your site, setting up to do a full scan. We\'ll let you know if we spot any issues that might impact a scan, then your first full scan will start.</string>
+    <string name="scan_scanning_is_initial_description">Welcome to Jetpack Scan, we are taking a first look at your site now and the results will be with you soon.</string>
+    <string name="scan_scanning_description">We will send you a notification once the scan is complete. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_fixing_threats_description_singular">We\'re hard at work in the background fixing this threat. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan couldn\'t complete a scan of your site. Please check to see if your site is down – if it\'s not, try again. If it is, or if Jetpack Scan is still having problems, contact our support team.</string>
+    <string name="scan_fixing_threats_title_plural">Fixing Threats</string>
+    <string name="scan_request_failed_title">Something went wrong</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Backing up site</string>
+    <string name="activity_log_currently_backing_up_message">Backing up site from %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Creating downloadable backup</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Your site has been successfully backed up</string>
+    <string name="activity_log_backup_finished_snackbar_message">Your site has been successfully backed up\nBacked up from %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Your site is being backed up\nBacking up from %1$s %2$s</string>
+    <string name="pick_audio">Select audio</string>
+    <string name="restore_another_process_running">There is another restore running.</string>
+    <string name="restore_complete_failed_icon_content_description">Error icon</string>
+    <string name="restore_complete_failed_action_button_content_description">Done button</string>
+    <string name="restore_complete_failed_title">Restore failed</string>
+    <string name="restore_complete_visit_site_button_content_description">Visit site button</string>
+    <string name="restore_complete_done_button_content_description">Done button</string>
+    <string name="restore_complete_icon_content_description">Restore icon</string>
+    <string name="restore_complete_visit_site_action_button">Visit site</string>
+    <string name="restore_complete_description_with_two_parameters">All of your selected items are now restored back to %1$s %2$s.</string>
+    <string name="restore_complete_header">Your site has been restored</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">No need to wait around. We\'ll notify you when your site has been restored.</string>
+    <string name="restore_progress_icon_content_description">Restore site icon</string>
+    <string name="restore_progress_description_with_two_parameters">We\'re restoring your site back to %1$s %2$s.</string>
+    <string name="restore_progress_header">Currently restoring site</string>
+    <string name="restore_warning_action_button_content_description">Confirm restore site button</string>
+    <string name="restore_warning_icon_content_description">Red circle image with exclamation point</string>
+    <string name="restore_warning_header">Warning</string>
+    <string name="restore_details_action_button_content_description">Restore site button</string>
+    <string name="restore_details_icon_content_description">Restore icon</string>
+    <string name="restore_details_action_button">Restore site</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s is the selected point for your restore.</string>
+    <string name="restore_details_header">Restore Site</string>
+    <string name="restore_details_choose_items_header">Choose the items to restore:</string>
+    <string name="restore">Restore</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud with X icon</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Done button</string>
+    <string name="backup_download_complete_failed_action_button">Done</string>
+    <string name="backup_download_complete_failed_title">Download failed</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Mobile</string>
+    <string name="quick_start_card_menu_remove">Don\'t show again</string>
+    <string name="quick_start_dialog_review_pages_message_short">Select %1$s Pages %2$s to see your page list.</string>
+    <string name="quick_start_dialog_review_pages_message">Change, add, or remove your site\'s pages.</string>
+    <string name="quick_start_dialog_review_pages_title">Review site pages</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Select %1$s Homepage %2$s to edit your Homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Select %1$s Pages %2$s to see your page list.</string>
+    <string name="quick_start_card_menu_pin">Pin this</string>
+    <string name="quick_start_dialog_edit_homepage_message">Change, add, or remove content from your site\'s homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Edit your homepage</string>
+    <string name="reader_menu_mark_as_unseen">Mark as unseen</string>
+    <string name="reader_menu_mark_as_seen">Mark as seen</string>
+    <string name="error_media_upload_failed_for_reason">Media upload failed.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Not enough available site storage</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Can\'t toggle seen status of this post</string>
+    <string name="reader_marked_post_as_unseen">Marked post as unseen</string>
+    <string name="reader_marked_post_as_seen">Marked post as seen</string>
+    <string name="threat_fix_all_status_error_message">Error getting fix status. Please contact our support.</string>
+    <string name="threat_fix_all_error_message">Error fixing threats. Please contact our support.</string>
+    <string name="threat_fix_all_status_success_message_singular">Threat was successfully fixed.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Please confirm you want to fix one active threat.</string>
+    <string name="threat_fix_all_warning_title">Fix all threats</string>
+    <string name="threat_ignore_error_message">Error ignoring threat. Please contact support.</string>
+    <string name="threat_ignore_success_message">Threat ignored.</string>
+    <string name="threat_ignore_warning">You shouldn’t ignore a security issue unless you are absolute sure it’s harmless. If you choose to ignore this threat, it will remain on your site &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Error fixing threat. Please contact our support.</string>
+    <string name="threat_item_sub_header_status_ignored">Threat ignored</string>
+    <string name="threat_item_sub_header_status_fixed_on">Threat fixed on %s</string>
+    <string name="threat_fixing">Fixing threat</string>
+    <string name="scan_history_ignored_threats_tab">Ignored</string>
+    <string name="scan_history_no_threats_found">No items found</string>
+    <string name="scan_history_fixed_threats_tab">Fixed</string>
+    <string name="scan_history_all_threats_tab">All</string>
+    <string name="scan_scanning_title">Scanning files</string>
+    <string name="scan_preparing_to_scan_title">Preparing to scan</string>
+    <string name="scan_history_menu_title">History</string>
+    <string name="scan_history">Scan History</string>
+    <string name="backup_active_filter_empty_subtitle">Try adjusting your date range</string>
+    <string name="backup_active_filter_empty_title">No matching backups found</string>
+    <string name="backup_empty_subtitle">Your first backup will appear here within 24 hours and you will receive a notification once the backup has been completed</string>
+    <string name="backup_empty_title">Your first backup will be ready soon</string>
+    <string name="request_failed_message">There was a problem handling the request. Please try again later.</string>
+    <string name="gutenberg_native_move_to_bottom">Move to bottom</string>
+    <string name="gutenberg_native_change_block_position">Change block position</string>
+    <string name="label_control_upload">Upload</string>
+    <string name="jetpack_icon_content_description">icon</string>
+    <string name="backup_download_complete_info">We\'ve also emailed you a link to your file.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Share link button</string>
+    <string name="backup_download_complete_download_action_button_content_description">Download button</string>
+    <string name="backup_download_complete_icon_content_description">Downloadable backup ready icon</string>
+    <string name="backup_download_complete_download_share_action_button">Share link</string>
+    <string name="backup_download_complete_download_action_button">Download</string>
+    <string name="backup_download_complete_description_with_two_parameters">We successfully created a backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Your backup is now available for download</string>
+    <string name="backup_download_complete_page_title">Your Backup</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_icon_content_description">Creating downloadable backup icon</string>
+    <string name="backup_download_progress_description_with_two_parameters">We\'re creating a downloadable backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Currently creating a downloadable backup of your site</string>
+    <string name="backup_download_progress_footnote">No need to wait around. We\'ll notify you when your backup is ready.</string>
+    <string name="backup_download_progress_page_title">Download Backup</string>
+    <string name="backup_download_another_download_running">There is another download running.</string>
+    <string name="backup_download_generic_failure">There was a problem handling the request. Please try again later.</string>
+    <string name="backup_download_details_action_button_content_description">Create downloadable backup button</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s is the selected point to create a downloadable backup.</string>
+    <string name="gutenberg_native_image_link_url">Image Link URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">crosspost</string>
+    <string name="suggestion_user">user</string>
+    <string name="suggestion_no_matching">No matching %s.</string>
+    <string name="suggestion_problem">There was a problem loading suggestions.</string>
+    <string name="suggestion_none">No %s suggestions available.</string>
+    <string name="suggestion_selection_needed">Please type to filter the list of suggestions.</string>
+    <string name="threat_get_free_estimate">Get a free estimate</string>
+    <string name="threat_ignore">Ignore threat</string>
+    <string name="threat_fix">Fix threat</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan will resolve the threat.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan will edit the affected file or directory.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan will update to a newer version (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan will delete the affected file or directory.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan will replace the affected file or directory.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan cannot automatically fix this threat.\n        We suggest that you resolve the threat manually: ensure that WordPress, your theme, and all of your plugins are up to date, and remove the offending code, theme, or plugin from your site. \n \n\n        If you need more help to resolve this threat, we recommend &lt;b&gt;Codeable&lt;/b&gt;, a trusted freelancer marketplace of highly vetted WordPress experts.\n        They have identified a select group of security experts to help with these projects. Pricing ranges from $70–120/hour, and you can get a free estimate with no obligation to hire.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Resolving the threat</string>
+    <string name="threat_fix_fixed_header">How did Jetpack fix it?</string>
+    <string name="threat_fix_default_header">How will we fix it?</string>
+    <string name="threat_file_description">Threat found in file:</string>
+    <string name="threat_technical_details_header">The technical details</string>
+    <string name="threat_problem_header">What was the problem?</string>
+    <string name="threat_details">Threat Details</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerability found in theme</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerability found in plugin</string>
+    <string name="threat_item_sub_header_file_signature">Threat found %s</string>
+    <string name="threat_item_sub_header_core_file">Vulnerability found in WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Miscellaneous vulnerability</string>
+    <string name="threat_item_header_vulnerable_theme">Vulnerable Theme: %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Vulnerable Plugin: %s (version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: malicious code pattern</string>
+    <string name="threat_item_header_database_threat">Database %s threats</string>
+    <string name="threat_item_header_infected_core_file">%s: infected core file</string>
+    <string name="threat_item_header_threat_found">Threat found</string>
+    <string name="threats_fix_all">Fix All</string>
+    <string name="scan_this_site">this site</string>
+    <string name="scan_idle_last_scan_description">The last Jetpack scan ran %s and did not find any risks. %s</string>
+    <string name="scan_in_few_seconds">a few seconds ago</string>
+    <string name="scan_in_minutes_ago">%s minute(s) ago</string>
+    <string name="scan_in_hours_ago">%s hour(s) ago</string>
+    <string name="scan_idle_threats_found_title">Your site may be at risk</string>
+    <string name="scan_idle_no_threats_found_title">Don\'t worry about a thing</string>
+    <string name="scan_again">Scan again</string>
+    <string name="scan_now">Scan now</string>
+    <string name="scan_state_icon">Scan state icon</string>
+    <string name="backup">Backup</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Activity Type filter (%s types selected)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (showing %s items)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Activity Type filter</string>
+    <string name="activity_log_activity_type_empty_subtitle">No activities recorded in the selected date range.</string>
+    <string name="activity_log_activity_type_empty_title">No activities available</string>
+    <string name="activity_log_activity_type_error_subtitle">Please check your internet connection and retry.</string>
+    <string name="activity_log_activity_type_error_title">No connection</string>
+    <string name="activity_log_activity_type_filter_active_label">Activity Type (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Date Range filter</string>
+    <string name="activity_log_active_filter_empty_subtitle">Try adjusting your date range or activity type filters</string>
+    <string name="activity_log_active_filter_empty_title">No matching events found</string>
+    <string name="backup_item_sqls">Site database</string>
+    <string name="backup_item_roots_hint">(includes wp-config.php and any non WordPress files)</string>
+    <string name="backup_item_media_uploads">Media Uploads</string>
+    <string name="backup_item_plugins">WordPress Plugins</string>
+    <string name="backup_item_themes">WordPress Themes</string>
+    <string name="backup_download_details_icon_content_description">Create downloadable backup icon</string>
+    <string name="backup_download_details_action_button">Create downloadable file</string>
+    <string name="backup_download_details_header">Create downloadable backup</string>
+    <string name="backup_download_details_page_title">Download Backup</string>
+    <string name="backup_download">Backup Download</string>
+    <string name="gutenberg_native_error">Error</string>
+    <string name="gutenberg_native_choose_file">Choose file</string>
+    <string name="activity_log_item_menu_download_backup_label">Download backup</string>
+    <string name="activity_log_item_menu_restore_label">Restore to this point</string>
+    <string name="activity_log_activity_type_filter_label">Activity Type</string>
+    <string name="activity_log_date_range_filter_label">Date Range</string>
+    <string name="activity_log_activity_type_filter_header">Filter by Activity Type</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copy the version from this app</string>
+    <string name="dialog_confirm_copy_local_edit_button">Edit the post first</string>
+    <string name="dialog_confirm_copy_local_message">The post you are trying to copy has two versions that are in conflict or you recently made changes but didn\'t save them.\nEdit the post first to resolve any conflict or proceed with copying the version from this app.</string>
+    <string name="dialog_confirm_copy_local_title">Post sync conflict</string>
+    <string name="button_copy">Duplicate</string>
+    <string name="toast_edit_story_update_in_progress_title">Story being saved, please wait…</string>
+    <string name="gutenberg_native_file_name">File name</string>
+    <string name="gutenberg_native_file_block_settings">File block settings</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Failed to upload files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Failed to save files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_edit_file">Edit file</string>
+    <string name="gutenberg_native_copy_file_url">Copy file URL</string>
+    <string name="gutenberg_native_choose_a_file">CHOOSE A FILE</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack Settings</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Following conversation by email</string>
+    <string name="reader_btn_follow_comments">Follow conversation by email</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Could not unsubscribe from comments for this post</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Could not subscribe to comments for this post</string>
+    <string name="reader_follow_comments_get_status_error">Error fetching subscription status for post</string>
+    <string name="reader_follow_comments_unsubscribe_success">Successfully unsubscribed from the comments</string>
+    <string name="reader_follow_comments_subscribe_success">Successfully subscribed to the comments</string>
+    <string name="reader_follow_comments_bad_format_response">Invalid response received</string>
+    <string name="reader_follow_comments_null_response">No response received</string>
+    <string name="activity_log_activity_type_filter_clear">Clear</string>
+    <string name="activity_log_activity_type_filter_apply">Apply</string>
+    <string name="dialog_edit_story_unsupported_format_message">One or more slides have not been added to your Story because Stories don\'t support GIF files at the moment. Please choose a static image or video background instead.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF files not supported</string>
+    <string name="dialog_edit_story_unrecoverable_message">We couldn\'t find the media for this story on the site.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Can\'t edit Story</string>
+    <string name="dialog_edit_story_unavailable_message">Unable to load media for this story. Check your internet connection and try again in a moment.</string>
+    <string name="dialog_edit_story_unavailable_title">Can\'t edit Story</string>
+    <string name="dialog_edit_story_limited_message">This story was edited on a different device and the ability to edit certain objects may be limited.</string>
+    <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media has been removed. Try re-creating your Story.</string>
+    <string name="color_picker_label_background">Background</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="dialog_discard_story_ok_button_edit">Discard</string>
+    <string name="dialog_discard_story_message_edit">Any changes made will not be saved.</string>
+    <string name="dialog_discard_story_title_edit">Discard changes?</string>
+    <string name="label_done_button">Done</string>
+    <string name="label_next_button">Next</string>
+    <string name="delete_button_alt">Delete</string>
+    <string name="hpp_choose_error">There was an error while selecting the design.</string>
+    <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
+    <string name="hpp_error_title">Layouts not available while offline</string>
+    <string name="hpp_retry_error">Please check your internet connection and retry.</string>
+    <string name="continue_site_credentials">Continue with store credentials</string>
+    <string name="login_find_your_connected_email">Find your connected email</string>
+    <string name="reader_discover_no_posts_button_text">Follow topics</string>
+    <string name="reader_discover_no_posts_subtitle">Try following more topics to broaden the search</string>
+    <string name="reader_discover_no_posts_title">No recent posts</string>
+    <string name="reader_discover_empty_title">Welcome!</string>
+    <string name="scan">Scan</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; responded to your post</string>
+    <string name="login_prologue_third_subtitle_two">You received &lt;b&gt;50 likes&lt;/b&gt; on your site today</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; liked your post</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Scrollable block menu opened. Select a block.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Scrollable block menu closed.</string>
+    <string name="hpp_skip_button">Skip</string>
+    <string name="hpp_choose_button">Choose</string>
+    <string name="hpp_subtitle">Pick your favourite homepage layout. You can edit and customize it later.</string>
+    <string name="hpp_title">Choose a design</string>
+    <string name="mlp_network_error_subtitle">Tap retry when you\'re back online or create a blank page using the button below.</string>
+    <string name="mlp_network_error_title">Layouts not available while offline</string>
+    <string name="mlp_error_subtitle">Tap retry or create a blank page using the button below.</string>
+    <string name="mlp_error_title">Layouts not available due to an error</string>
+    <string name="prepublishing_nudges_add_category_button">Add Category</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Add New Category</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categories</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Not set</string>
+    <string name="prepublishing_nudges_categories_action">Categories</string>
+    <string name="login_prologue_fifth_caption_three">Museums in London</string>
+    <string name="login_prologue_fifth_caption_two">The World\'s Best Fans</string>
+    <string name="login_prologue_fifth_caption_one">My Top Ten Cafes</string>
+    <string name="login_prologue_fifth_tag_six">Politics</string>
+    <string name="login_prologue_fifth_tag_four">Gardening</string>
+    <string name="login_prologue_fifth_tag_five">Music</string>
+    <string name="login_prologue_fifth_tag_three">Football</string>
+    <string name="login_prologue_fifth_tag_two">Cooking</string>
+    <string name="login_prologue_fifth_tag_one">Art</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' Roll Weekly</string>
+    <string name="login_prologue_fifth_subtitle_two">Web News</string>
+    <string name="login_prologue_second_subtitle_two">I am so inspired by photographer Cameron Karsten’s work. I will be trying these techniques on my next</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_one">Getting Inspired</string>
+    <string name="login_prologue_title_fourth">Watch your audience grow with in-depth analytics.</string>
+    <string name="login_prologue_title_second">With the powerful editor you can post on the go.</string>
+    <string name="login_prologue_title_third">See comments and notifications in real time.</string>
+    <string name="login_prologue_title_first">Welcome to the world’s most popular website builder.</string>
+    <string name="login_prologue_title_fifth">Follow your favourite sites and discover new blogs.</string>
+    <string name="media_loading_failed">Media loading failed</string>
+    <string name="reader_discover_recommended_blogs_header">Sites to follow</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' is not fully–supported</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">We are working hard to add more blocks with each release.</string>
+    <string name="gutenberg_native_help_button">Help button</string>
+    <string name="gutenberg_native_edit_using_web_editor">Edit using web editor</string>
+    <string name="gutenberg_native_choose_images">Choose images</string>
+    <string name="stories_intro_description_second">They’re published as a new blog post on your site so your audience never misses out on a thing.</string>
+    <string name="stories_intro_create_story_post_label">Create Story Post</string>
+    <string name="stories_intro_title_second">Story posts don\'t disappear</string>
+    <string name="stories_intro_description_first">Combine photos, videos, and text to create engaging and tappable story posts that your visitors will love.</string>
+    <string name="mlp_notice_blank_page_created">Blank page created</string>
+    <string name="mlp_notice_page_created">Page created</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s was denied access to your photos. To fix this, edit your permissions and turn on %2$s and %3$s.</string>
+    <string name="stories_intro_title_first">Now stories are for everyone</string>
+    <string name="stories_intro_image_caption_second">Example story title</string>
+    <string name="stories_intro_image_caption_first">How to create a story post</string>
+    <string name="stories_intro_main_title">Introducing Story Posts</string>
+    <string name="media_insert_failed_with_reason">Media insert failed: %s</string>
+    <string name="photo_picker_wordpress_media_library">Choose from WordPress Media Library</string>
+    <string name="media_insert_failed">Media insert failed.</string>
+    <string name="reader_label_toolbar_back">Back</string>
+    <string name="reader_discover_empty_button_text">Get Started</string>
+    <string name="reader_discover_empty_subtitle">Follow topics to discover new blogs</string>
+    <string name="reader_post_details_header_by_author_name">By</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">This referrer can\'t be marked as spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Open Website</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Unmark as Spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Mark as Spam</string>
+    <string name="media_uploading_gif_library_photo">Uploading gif media</string>
+    <string name="media_uploading_stock_library_photo">Uploading stock media</string>
+    <string name="media_uploading_default">Uploading media</string>
     <string name="gutenberg_native_select_item">Select item</string>
     <string name="gutenberg_native_search_or_type_url">Search or type URL</string>
+    <string name="gutenberg_native_page_break">Page break</string>
     <string name="gutenberg_native_add_this_telephone_link">Add this telephone link</string>
     <string name="gutenberg_native_add_this_link">Add this link</string>
     <string name="gutenberg_native_add_this_email_link">Add this email link</string>
-    <string name="suggestion_no_connection">\"No internet connection.\nSuggestions are unavailable.\"</string>
+    <string name="suggestion_no_connection">No internet connection.\nSuggestions are unavailable.</string>
     <string name="typeface_label_shrikhand">Bold</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_pacifico">Playful</string>
@@ -27,19 +510,17 @@ Language: en_CA
     <string name="comment_unable_to_show_error">Unable to show this comment</string>
     <string name="media_browse_for_items">Browse for items</string>
     <string name="reader_menu_report_post">Report this post</string>
-    <string name="gutenberg_native_angle">Angle</string>
     <string name="reader_welcome_banner">Welcome to Reader. Discover millions of blogs at your fingertips.</string>
     <string name="error_media_xmlrcp_server_error">Internal server error occurred</string>
     <string name="error_media_xmlrpc_not_allowed">Your action is not allowed</string>
     <string name="show_n_hidden_items_desc">%1$s more items</string>
-    <string name="gutenberg_native_select_a_layout">Select a layout</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Note: Column layout may vary between themes and screen sizes</string>
-    <string name="create_post_story_fab_tooltip">Create a post or story</string>
-    <string name="create_page_fab_tooltip">Create a page</string>
-    <string name="create_post_fab_tooltip">Create a post</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
+    <string name="gutenberg_native_select_a_layout">Select a layout</string>
     <string name="reader_discover_interests_header">You might like</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Hide</string>
+    <string name="create_page_fab_tooltip">Create a page</string>
+    <string name="create_post_fab_tooltip">Create a post</string>
+    <string name="create_post_story_fab_tooltip">Create a post or story</string>
     <string name="gutenberg_native_video_caption_empty">Video caption. Empty</string>
     <string name="gutenberg_native_updates_the_title">Updates the title.</string>
     <string name="gutenberg_native_paste_block_after">Paste block after</string>
@@ -50,15 +531,15 @@ Language: en_CA
     <string name="toast_error_saving_video">Video could not be saved</string>
     <string name="toast_error_saving_image">Error saving image</string>
     <string name="toast_capture_operation_in_progress">Operation in progress, try again</string>
-    <string name="toast_story_page_not_found">Couldn\'t find Story slide</string>
     <string name="dialog_insufficient_device_storage_error_ok_button">View Storage</string>
-    <string name="dialog_insufficient_device_storage_error_message">We need to save the story on your device before it can be published. Review your storage settings and remove files to free up space.</string>
+    <string name="toast_story_page_not_found">Couldn\'t find Story slide</string>
     <string name="dialog_insufficient_device_storage_error_title">Insufficient device storage</string>
-    <string name="dialog_story_saving_error_message">Retry saving or delete the slides, then try publishing your story again.</string>
-    <string name="dialog_story_saving_error_title_plural">Unable to save %1$d slides</string>
     <string name="dialog_story_saving_error_title_singular">Unable to save 1 slide</string>
     <string name="story_saving_failed_quick_action_manage">Manage</string>
     <string name="story_saving_failed_message_plural">%1$d slides require action</string>
+    <string name="dialog_insufficient_device_storage_error_message">We need to save the story on your device before it can be published. Review your storage settings and remove files to free up space.</string>
+    <string name="dialog_story_saving_error_message">Retry saving or delete the slides, then try publishing your story again.</string>
+    <string name="dialog_story_saving_error_title_plural">Unable to save %1$d slides</string>
     <string name="story_saving_failed_message_singular">1 slide requires action</string>
     <string name="story_saving_failed_title">Unable to upload \"%1$s\"</string>
     <string name="story_saving_snackbar_finished_with_error">Unable to upload \"%1$s\"</string>
@@ -66,39 +547,36 @@ Language: en_CA
     <string name="story_saving_snackbar_started">Uploading \"%1$s\"…</string>
     <string name="story_saving_subtitle_frames_remaining_plural">%1$d slides remaining</string>
     <string name="story_saving_subtitle_frames_remaining_singular">1 slide remaining</string>
-    <string name="story_saving_title_several">several stories</string>
     <string name="story_saving_title">Saving \"%1$s\"…</string>
+    <string name="story_saving_title_several">several stories</string>
+    <string name="dialog_discard_errored_page_message">This slide has not been saved yet. If you delete this slide, you will lose any edits you have made.</string>
+    <string name="label_text_alignment_button">Change text alignment</string>
+    <string name="label_frame_errored">errored</string>
+    <string name="label_frame_selected_border">selected</string>
+    <string name="label_frame_unselected_border">unselected</string>
     <string name="story_saving_untitled">Untitled</string>
     <string name="dialog_discard_story_ok_button">Discard</string>
     <string name="dialog_discard_story_message">Your story post will not be saved as a draft.</string>
     <string name="dialog_discard_story_title">Discard story post?</string>
     <string name="dialog_discard_page_ok_button">Delete</string>
-    <string name="dialog_discard_errored_page_message">This slide has not been saved yet. If you delete this slide, you will lose any edits you have made.</string>
     <string name="dialog_discard_page_message">This slide will be removed from your story.</string>
     <string name="dialog_discard_page_title">Delete story slide?</string>
-    <string name="menu_delete_page">Delete slide</string>
     <string name="label_text_color_button">Change text colour</string>
-    <string name="label_text_alignment_button">Change text alignment</string>
-    <string name="label_frame_errored">errored</string>
-    <string name="label_frame_selected_border">selected</string>
-    <string name="label_frame_unselected_border">unselected</string>
     <string name="label_frame_image">Slide</string>
     <string name="label_retry_icon">Retry</string>
     <string name="label_saved_icon">Saved</string>
     <string name="label_close_button">Close</string>
-    <string name="label_control_publish">Next</string>
-    <string name="label_done">Done</string>
     <string name="label_share_to">Share to</string>
     <string name="label_snackbar_share">SHARE</string>
     <string name="label_snackbar_loop_frame_saved">Saved to photos</string>
     <string name="label_control_retry">Retry</string>
+    <string name="mlp_choose_layout_subtitle">Get started by choosing from a wide variety of pre-made page layouts. Or just start with a blank page.</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Tap %1$s Create. %2$s Then select &lt;b&gt;Blog post&lt;/b&gt;</string>
     <string name="label_control_saved">Saved</string>
     <string name="label_control_saving">Saving</string>
     <string name="label_control_flash">Flash</string>
     <string name="label_control_flip_camera">Flip</string>
-    <string name="sound_button_alt">Sound</string>
     <string name="text_button_alt">Text</string>
-    <string name="more_button_alt">More</string>
     <string name="stickers_button_alt">Stickers</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Flip camera</string>
@@ -106,31 +584,28 @@ Language: en_CA
     <string name="mlp_preview_page">Preview</string>
     <string name="mlp_create_page">Create page</string>
     <string name="mlp_create_blank_page">Create blank page</string>
-    <string name="mlp_choose_layout_subtitle">Get started by choosing from a wide variety of pre-made page layouts. Or just start with a blank page.</string>
     <string name="prepublishing_nudges_story_title_hint">Give your story a title</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Create a post or story</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Create a post, page or story</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Tap %1$s Create. %2$s Then select &lt;b>Blog post&lt;/b></string>
+    <string name="sound_button_alt">Sound</string>
+    <string name="mlp_choose_layout_title">Choose a layout</string>
     <string name="photo_picker_choose_file">Choose from device</string>
-    <string name="my_site_bottom_sheet_add_story">Story post</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Editing site icons on self-hosted WordPress sites requires the Jetpack plugin.</string>
     <string name="reader_toast_err_page_jump_not_found">Unable to find the linked page jump</string>
     <string name="error_media_quota_exceeded_toast">Cannot upload file.\nStorage quota was exceeded.</string>
     <string name="error_media_quota_exceeded">Storage quota exceeded</string>
+    <string name="my_site_bottom_sheet_add_story">Story post</string>
     <string name="pick_file">Add file</string>
     <string name="gutenberg_native_replace_video">Replace video</string>
     <string name="gutenberg_native_replace_image_or_video">Replace image or video</string>
-    <string name="gutenberg_native_choose_video">Choose video</string>
-    <string name="gutenberg_native_choose_image_or_video">Choose image or video</string>
     <string name="gutenberg_native_choose_image">Choose image</string>
+    <string name="gutenberg_native_choose_image_or_video">Choose image or video</string>
+    <string name="gutenberg_native_choose_video">Choose video</string>
     <string name="gutenberg_native_block_removed">Block removed</string>
-    <string name="content_description_logo">WordPress Logo</string>
-    <string name="enter_your_site_address">Enter your site address</string>
-    <string name="continue_with_wpcom">Continue with WordPress.com</string>
     <string name="signup_confirmation_title">Signup confirmation</string>
     <string name="continue_with_google_terms_of_service_text">If you continue with Google and don\'t already have a WordPress.com account, you are creating an account and you agree to our %1$sTerms of Service%2$s.</string>
+    <string name="enter_your_site_address">Enter your existing site address</string>
     <string name="continue_terms_of_service_text">By continuing, you agree to our %1$sTerms of Service%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">We’ll email you a signup link to create your new WordPress.com account.</string>
     <string name="signup_confirmation_message">We’ll use this email address to create your new WordPress.com account.</string>
     <string name="signup_magic_link_message">We’ve emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.</string>
     <string name="enter_account_info_for_site">Enter your account information for %1$s.</string>
@@ -141,25 +616,21 @@ Language: en_CA
     <string name="magic_link_not_seeing_email_message">Not seeing the email? Check your Spam or Junk Mail folder.</string>
     <string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from WordPress.com.</string>
     <string name="login_magic_links_label">We\'ll email you a link that\'ll log you in instantly, no password needed.</string>
-    <string name="check_email">Check email</string>
     <string name="get_started">Get Started</string>
-    <string name="enter_email_to_continue_wordpress_com">Enter your email address to log in or create a WordPress.com account.</string>
     <string name="or_type_your_password">Or type your password</string>
+    <string name="enter_email_to_continue_wordpress_com">Enter your email address to log in or create a WordPress.com account.</string>
     <string name="create_account">Create account</string>
     <string name="send_link_by_email">Send link by email</string>
-    <string name="login_promo_text_unlock_the_power">Unlock the power of the most flexible website builder.</string>
-    <string name="login_promo_title_37_percent">37\% of the web is built on WordPress.</string>
+    <string name="check_email">Check email</string>
     <string name="reset_your_password">Reset your password</string>
     <string name="reader_error_request_failed_title">There was a problem handling the request. Please try again later.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic. First impressions count!</string>
     <string name="quick_start_list_update_site_title_title">Set your site title</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Tap &lt;b>%1$s&lt;/b> to set a new title</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Tap &lt;b&gt;%1$s&lt;/b&gt; to set a new title</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Trashing this post will also discard local changes, are you sure you want to continue?</string>
     <string name="gutenberg_native_s_block_options">%s block options</string>
     <string name="gutenberg_native_duplicate_block">Duplicate block</string>
     <string name="gutenberg_native_copy_block">Copy block</string>
     <string name="gutenberg_native_copied_block">Copied block</string>
-    <string name="gutenberg_native_block_settings">Block settings</string>
     <string name="gutenberg_native_block_pasted">Block pasted</string>
     <string name="gutenberg_native_block_duplicated">Block duplicated</string>
     <string name="gutenberg_native_block_cut">Block cut</string>
@@ -167,21 +638,20 @@ Language: en_CA
     <string name="my_site_title_changer_dialog_not_allowed_hint">The Site Title can only be changed by a user with the administrator role.</string>
     <string name="my_site_title_changer_dialog_hint">The Site Title is displayed in the title bar of a web browser and is displayed in the header for most themes.</string>
     <string name="reader_title_tag_preview">Topic</string>
-    <string name="error_update_site_title_network">Couldn\'t update site title. Check your network connection and try again.</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_title">Unsaved changes</string>
+    <string name="error_update_site_title_network">Couldn\'t update site title. Check your network connection and try again.</string>
     <string name="gutenberg_native_open_link_in_a_browser">Open link in a browser</string>
-    <string name="gutenberg_native_navigates_to_customize_the_gradient">Navigates to customize the gradient</string>
     <string name="gutenberg_native_navigates_to_custom_color_picker">Navigates to custom colour picker</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Navigates to customize the gradient</string>
     <string name="gutenberg_native_gradient_type">Gradient Type</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Double tap to select the option</string>
     <string name="gutenberg_native_customize_gradient">Customize Gradient</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Page author</string>
     <string name="photo_picker_use_gif">Use this GIF</string>
     <string name="error_media_thumbnail_not_loaded">Media thumbnail could not be loaded</string>
+    <string name="me">Me</string>
     <string name="menu_content_info">Content structure</string>
     <string name="everyone">Everyone</string>
-    <string name="me">Me</string>
     <string name="gutenberg_native_dismiss">Dismiss</string>
     <string name="prepublishing_nudges_home_tags_not_set">Not set</string>
     <string name="prepublishing_tags_description">Tags help tell readers what a post is about.</string>
@@ -198,42 +668,39 @@ Language: en_CA
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Move to Draft</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Trashed posts can\'t be edited. Do you want change the status of this post to \"draft\" so you can work on it?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Move post to Drafts?</string>
-    <string name="reader_label_choose_your_interests">Choose your interests</string>
-    <string name="reader_choose_interests_content_description">Choose your interests</string>
     <string name="reader_btn_done">Done</string>
     <string name="reader_btn_select_few_interests">Select a few to continue</string>
     <string name="post_status_post_published">Published</string>
     <string name="post_status_post_trashed">Trashed</string>
     <string name="post_status_post_scheduled">Scheduled</string>
-    <string name="publish_date">Publish Date</string>
     <string name="ccpa_privacy_notice_read">Read CCPA privacy notice</string>
+    <string name="publish_date">Publish Date</string>
     <string name="ccpa_privacy_notice_caption">The California Consumer Privacy Act (\"CCPA\") requires us to provide California residents with some additional information about the categories of personal information we collect and share, where we get that personal information, and how and why we use it.</string>
+    <string name="reader_label_choose_your_interests">Choose your topics</string>
+    <string name="reader_choose_interests_content_description">Choose your topics</string>
     <string name="ccpa_privacy_notice_header">Privacy notice for California users</string>
     <string name="status_and_visibility">Status &amp; Visibility</string>
     <string name="update_now">Update Now</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Try a starter layout</string>
     <string name="gutenberg_native_open_block_actions_menu">Open Block Actions Menu</string>
-    <string name="gutenberg_native_insert_mention">Insert mention</string>
+    <string name="gutenberg_native_move_to_top">Move to top</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Double tap to open Bottom Sheet with available options</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Double tap to open Action Sheet with available options</string>
     <string name="pages_cannot_be_started">We cannot open pages at the moment. Please try again later</string>
     <string name="pages_set_as_posts_page">Set as Posts Page</string>
     <string name="pages_set_as_homepage">Set as Homepage</string>
-    <string name="suggestion_no_matching_users">\"No matching users available.\"</string>
-    <string name="suggestion_invalid_user">\"%s is not a valid user\"</string>
     <string name="site_settings_select_page">Select Page</string>
     <string name="site_settings_posts_page">Posts Page</string>
     <string name="site_settings_static_homepage">Static Homepage</string>
     <string name="site_settings_classic_blog">Classic Blog</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Selected homepage and page for posts cannot be the same.</string>
-    <string name="site_settings_failed_update_homepage_settings">Homepage settings update failed, check your internet connection</string>
+    <string name="suggestion_invalid">%s is not a valid %s</string>
+    <string name="site_settings_homepage_settings">Homepage Settings</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Cannot save homepage settings before pages are loaded</string>
-    <string name="site_settings_failed_to_save_homepage_settings">Cannot save homepage settings</string>
     <string name="site_settings_accept_homepage">Accept</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Cannot save homepage settings</string>
     <string name="site_settings_failed_to_load_pages">Loading of pages failed</string>
     <string name="site_settings_homepage_settings_description">Choose from a homepage that displays your latest posts (classic blog) or a fixed/static page.</string>
-    <string name="site_settings_homepage_settings">Homepage Settings</string>
+    <string name="site_settings_failed_update_homepage_settings">Homepage settings update failed, check your internet connection</string>
     <string name="site_settings_homepage">Homepage</string>
     <string name="page_posts_page_update_failed">Posts Page update failed</string>
     <string name="page_posts_page_successfully_updated">Posts Page successfully updated</string>
@@ -241,7 +708,6 @@ Language: en_CA
     <string name="page_homepage_successfully_updated">Homepage successfully updated</string>
     <string name="page_cannot_set_posts_page">To set Posts page enable \"Static Homepage\" in Site Settings</string>
     <string name="page_cannot_set_homepage">To set Homepage enable \"Static Homepage\" in Site Settings</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Welcome to our new blog</string>
     <string name="gutenberg_native_select_a_color">Select a colour</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Double tap to go to colour settings</string>
     <string name="reader_empty_followed_blogs_description">When you follow sites, you\'ll see their content here</string>
@@ -249,8 +715,8 @@ Language: en_CA
     <string name="feature_announcement_dialog_label">What\'s New In WordPress</string>
     <string name="insert_label_with_count">Insert %d</string>
     <string name="crop">crop</string>
-    <string name="error_failed_to_load_into_file">Failed to load into file, please try again.</string>
     <string name="preview_image_thumbnail_description">Preview Image Thumbnail</string>
+    <string name="error_failed_to_load_into_file">Failed to load into file, please try again.</string>
     <string name="photo_picker_use_media">Use this media</string>
     <string name="photo_picker_use_video">Use this video</string>
     <string name="photo_picker_photo_or_video_title">Choose media</string>
@@ -269,19 +735,19 @@ Language: en_CA
     <string name="button_insert">Insert</string>
     <string name="continue_label">Continue</string>
     <string name="copy_text">Copy</string>
-    <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Move block right from position %1$s to position %2$s</string>
     <string name="gutenberg_native_move_block_right">Move block right</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Move block left from position %1$s to position %2$s</string>
     <string name="gutenberg_native_move_block_left">Move block left</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Double tap to move the block to the right</string>
+    <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Move block right from position %1$s to position %2$s</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Double tap to move the block to the left</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Creating dashboard</string>
-    <string name="new_site_creation_creating_site_loading_3">Setting up theme</string>
     <string name="new_site_creation_creating_site_loading_2">Adding site features</string>
+    <string name="new_site_creation_creating_site_loading_3">Setting up theme</string>
     <string name="new_site_creation_creating_site_loading_1">Grabbing site URL</string>
     <string name="new_site_creation_creating_site_loading_subtitle">Your site will be ready shortly</string>
     <string name="new_site_creation_creating_site_loading_title">Hooray!\nAlmost done</string>
+    <string name="gutenberg_native_block_settings">Block settings</string>
     <string name="pages_and_posts_cancel_auto_upload">Cancel upload</string>
     <string name="gif_list_search_returned_unknown_error">There was a problem handling the request</string>
     <string name="gif_powered_by_tenor">Powered by Tenor</string>
@@ -290,9 +756,9 @@ Language: en_CA
     <string name="weekday_saturday">Saturday</string>
     <string name="weekday_friday">Friday</string>
     <string name="weekday_thursday">Thursday</string>
-    <string name="weekday_wednesday">Wednesday</string>
     <string name="weekday_tuesday">Tuesday</string>
     <string name="weekday_monday">Monday</string>
+    <string name="weekday_wednesday">Wednesday</string>
     <string name="weekday_sunday">Sunday</string>
     <string name="media_accessing_failed">Failed to access content of a private site. Some media might be unavailable</string>
     <string name="media_accessing_progress">Accessing content of a private site</string>
@@ -300,88 +766,51 @@ Language: en_CA
     <string name="failed_to_load_image_tap_to_retry">Failed to load image.\nPlease tap to retry.</string>
     <string name="preview_image_description">Preview Image</string>
     <string name="error_unknown_page_type">Unknown page format</string>
-    <string name="error_page_not_submitted">We couldn\'t complete this action, and didn\'t submit this page for review.</string>
     <string name="error_page_not_scheduled">We couldn\'t complete this action, and didn\'t schedule this page.</string>
     <string name="error_page_not_published_private">We couldn\'t complete this action, and didn\'t publish this private page.</string>
-    <string name="error_page_not_published">We couldn\'t complete this action, and didn\'t publish this page.</string>
+    <string name="error_page_not_submitted">We couldn\'t complete this action, and didn\'t submit this page for review.</string>
     <string name="error_page_not_submitted_retrying">We couldn\'t submit this page for review, but we\'ll try again later. </string>
     <string name="error_page_not_scheduled_retrying">We couldn\'t schedule this page, but we\'ll try again later.</string>
-    <string name="error_page_not_published_retrying_private">We couldn\'t publish this private page, but we\'ll try again later.</string>
     <string name="error_page_not_published_retrying">We couldn\'t publish this page, but we\'ll try again later.</string>
+    <string name="error_page_not_published">We couldn\'t complete this action, and didn\'t publish this page.</string>
+    <string name="error_page_not_published_retrying_private">We couldn\'t publish this private page, but we\'ll try again later.</string>
     <string name="error_media_recover_page_not_submitted">We couldn\'t upload this media, and didn\'t submit this page for review. </string>
     <string name="error_media_recover_page_not_scheduled">We couldn\'t upload this media, and didn\'t schedule this page.</string>
     <string name="error_media_recover_page_not_published_private">We couldn\'t upload this media, and didn\'t publish this private page.</string>
-    <string name="error_media_recover_page_not_published">We couldn\'t upload this media, and didn\'t publish the page.</string>
     <string name="page_waiting_for_connection_draft">We\'ll save your draft when your device is back online</string>
     <string name="page_waiting_for_connection_private">We\'ll publish your private page when your device is back online.</string>
-    <string name="page_waiting_for_connection_scheduled">We\'ll schedule your page when your device is back online.</string>
+    <string name="error_media_recover_page_not_published">We couldn\'t upload this media, and didn\'t publish the page.</string>
     <string name="page_waiting_for_connection_pending">We\'ll submit your page for review when your device is back online.</string>
-    <string name="page_waiting_for_connection_publish">We\'ll publish the page when your device is back online.</string>
+    <string name="page_waiting_for_connection_scheduled">We\'ll schedule your page when your device is back online.</string>
     <string name="page_queued">Queued page</string>
+    <string name="local_page_autosave_revision_available">You\'ve made unsaved changes to this page</string>
     <string name="page_uploading">Uploading page</string>
     <string name="error_publish_page_no_network">Device is offline. Page saved locally.</string>
-    <string name="local_page_autosave_revision_available">You\'ve made unsaved changes to this page</string>
-    <string name="editor_uploading_page">Your page is uploading</string>
-    <string name="editor_page_saved_locally_failed_media">The page has failed media uploads and has been saved locally</string>
+    <string name="page_waiting_for_connection_publish">We\'ll publish the page when your device is back online.</string>
     <string name="editor_page_saved_locally">Page saved on device</string>
-    <string name="editor_page_saved_online">Page saved online</string>
+    <string name="editor_page_saved_locally_failed_media">The page has failed media uploads and has been saved locally</string>
     <string name="quickpress_shortcut_activity_label">Select blog for QuickPress shortcut</string>
+    <string name="editor_uploading_page">Your page is uploading</string>
+    <string name="editor_page_saved_online">Page saved online</string>
     <string name="app_theme_default">Set by Battery Saver</string>
     <string name="app_theme_dark">Dark</string>
     <string name="app_theme_light">Light</string>
-    <string name="app_theme">Appearance</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">You recently made changes to this page but didn\'t save them. Choose a version to load:\n\n</string>
-    <string name="gutenberg_native_what_people_say">What People Say</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.</string>
-    <string name="gutenberg_native_warning_message">Warning Message</string>
-    <string name="gutenberg_native_want_to_work_with_us">Want to work with us?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing – in their own words.</string>
-    <string name="gutenberg_native_usa">USA</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">This is sample content, included with the template to illustrate its features. Remove or replace it with your own words and media.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">The way to get started is to quit talking and begin doing.</string>
-    <string name="gutenberg_native_team">Team</string>
-    <string name="gutenberg_native_success_message">Success Message</string>
-    <string name="gutenberg_native_strategy">Strategy</string>
+    <string name="app_theme">Appearance</string>
     <string name="gutenberg_native_show_post_content">Show post content</string>
-    <string name="gutenberg_native_services">Services</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Project Name</string>
-    <string name="gutenberg_native_position_or_job_title">Position or Job Title</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
-    <string name="gutenberg_native_only_show_excerpt">Only show excerpt</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">My portfolio showcases various projects created throughout my career. See my contact information below and get in touch.</string>
     <string name="gutenberg_native_link_to">Link To</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Let\'s talk 👋 Don\'t hesitate to reach out with the contact information below, or send a message using the form.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Let\'s build something together!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Let’s build something together!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">It is our choices, Harry, that show what we truly are, far more than our abilities.</string>
-    <string name="gutenberg_native_inspiration">Inspiration</string>
-    <string name="gutenberg_native_get_in_touch">Get in Touch</string>
+    <string name="gutenberg_native_only_show_excerpt">Only show excerpt</string>
+    <string name="gutenberg_native_link_settings">Link Settings</string>
     <string name="gutenberg_native_excerpt_length_words">Excerpt length (words)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Email me: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Don’t cry because it’s over, smile because it happened.</string>
     <string name="gutenberg_native_customize">CUSTOMIZE</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
     <string name="gutenberg_native_add_paragraph_block">Add paragraph block</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">A short description of the services you offer.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">A short bio with personal history, key achievements, or an interesting fact.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">A description of the project and the works presented.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
+    <string name="gutenberg_native_video_settings">Video settings</string>
     <string name="create_post_page_fab_tooltip_contributors">Create a post</string>
     <string name="post_list_tab_trashed_posts">Trashed</string>
     <string name="post_list_tab_scheduled_posts">Scheduled</string>
     <string name="post_list_tab_published_posts">Published</string>
     <string name="sharing_facebook_account_must_have_pages">The Facebook connection cannot find any Pages. Publicize cannot connect to Facebook Profiles, only published Pages.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Not Connected</string>
-    <string name="my_site_select_domains_page_title">Site Address</string>
     <string name="notifications_tab_title_likes">Likes</string>
     <string name="notifications_tab_title_follows">Follows</string>
     <string name="notifications_tab_title_comments">Comments</string>
@@ -395,25 +824,27 @@ Language: en_CA
     <string name="stats_management_add_new_stats_card">Add new stats card</string>
     <string name="reader_self_hosted_select_filter">Use the filter button to find posts on specific subjects</string>
     <string name="reader_bottom_sheet_content_description">Select a Tag or Site, Pop Up Window</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selected</string>
     <string name="reader_btn_select_filter_content_description">Select a Site or Tag to filter posts</string>
     <string name="reader_btn_remove_filter_content_description">Remove the current filter</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Log in to WordPress.com</string>
+    <string name="reader_title_subs">Manage Topics &amp; Sites</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Log in to WordPress.com to see the latest posts from sites you follow</string>
-    <string name="gutenberg_native_template_preview">Template Preview</string>
-    <string name="gutenberg_native_replace_current_block">Replace Current Block</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Log in to WordPress.com to see the latest posts from topics you follow</string>
     <string name="gutenberg_native_add_to_end">Add To End</string>
     <string name="gutenberg_native_add_to_beginning">Add To Beginning</string>
     <string name="gutenberg_native_add_block_before">Add Block Before</string>
     <string name="gutenberg_native_add_block_after">Add Block After</string>
     <string name="reader_filter_empty_sites_action">Follow a site</string>
     <string name="reader_filter_empty_sites_list">See the newest posts from sites you follow</string>
-    <string name="reader_filter_main_title">Following</string>
+    <string name="gutenberg_native_replace_current_block">Replace Current Block</string>
+    <string name="reader_filter_empty_tags_action">Add a topic</string>
+    <string name="reader_filter_empty_tags_list">You can follow posts on a specific subject by adding a topic</string>
     <string name="reader_filter_cta">Filter</string>
-    <string name="gutenberg_native_video_caption_s">Video caption. %s</string>
+    <string name="reader_filter_main_title">Following</string>
     <string name="gutenberg_native_edit_video">Edit video</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Double tap to select layout</string>
     <string name="gutenberg_native_add_a_shortcode">Add a shortcode…</string>
+    <string name="gutenberg_native_video_caption_s">Video caption. %s</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="post_list_author">Post author</string>
     <string name="fab_create_desc">Create a post</string>
     <string name="stats_posting_activity_end_description">You have heard all stats for this period.\n        Tapping again will restart from the beginning.</string>
@@ -425,72 +856,62 @@ Language: en_CA
     <string name="stats_box_type_high">high</string>
     <string name="stats_box_type_medium">medium</string>
     <string name="stats_box_type_low">low</string>
-    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Move Image Forward</string>
-    <string name="gutenberg_native_move_image_backward">Move Image Backward</string>
     <string name="gutenberg_native_gallery_caption_s">Gallery caption. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Current value is %2$s</string>
     <string name="create_post_page_fab_tooltip">Create a post or page</string>
+    <string name="gutenberg_native_replace_image">Replace image</string>
     <string name="content_description_person_building_website">Person building website</string>
     <string name="post_signup_interstitial_not_right_now">Not right now</string>
     <string name="post_signup_interstitial_subtitle">Whatever you want to create or share, we’ll help you do it right here.</string>
+    <string name="photo_picker_image_thumbnail_unselected">Image unselected</string>
     <string name="post_signup_interstitial_title">Welcome to WordPress</string>
     <string name="stock_media_picker_list_content_description">Photo library</string>
-    <string name="photo_picker_image_thumbnail_unselected">Image unselected</string>
     <string name="photo_picker_image_selected">, Selected</string>
     <string name="photo_picker_image_thumbnail_selected">Image selected</string>
     <string name="photo_picker_image_thumbnail_content_description">Image Thumbnail</string>
     <string name="my_site_bottom_sheet_add_post">Blog post</string>
     <string name="my_site_bottom_sheet_title">Add new</string>
     <string name="post_settings_publish">Publish</string>
-    <string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages but if you\'d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sync now</string>
     <string name="dialog_confirm_scheduled_post_sync_message">This post will be synced immediately.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Ready to Sync?</string>
     <string name="new_site_creation_unavailable_domain">This domain is unavailable</string>
-    <string name="login_promo_viewpager_content_description">Introduction</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">We were unable to access your site. You will need to reach out to your host to resolve this.</string>
-    <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b>SSL Certificate&lt;/b>. You will need to reach out to your host to resolve this.</string>
-    <string name="login_discovery_error_http_auth">We were unable to access your site because it requires &lt;b>HTTP Authentication&lt;/b>. You will need to reach out to your host to resolve this.</string>
-    <string name="login_discovery_error_xmlrpc">We were unable to access the &lt;b>XMLRPC file&lt;/b> on your site. You will need to reach out to your host to resolve this.</string>
-    <string name="login_site_credentials_magic_link_label">Almost there! We just need to verify your Jetpack connected email address &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Log in with site credentials.</string>
+    <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b&gt;SSL Certificate&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
+    <string name="login_discovery_error_http_auth">We were unable to access your site because it requires &lt;b&gt;HTTP Authentication&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
+    <string name="login_discovery_error_xmlrpc">We were unable to access the &lt;b&gt;XMLRPC file&lt;/b&gt; on your site. You will need to reach out to your host to resolve this.</string>
+    <string name="login_site_credentials_magic_link_label">Almost there! We just need to verify your Jetpack connected email address &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Log in with your %1$s site credentials</string>
-    <string name="send_verification_email">Send verification email</string>
-    <string name="my_site_bottom_sheet_add_page">Site page</string>
     <string name="reader_following_display_name">Following</string>
-    <string name="reader_my_likes_display_name">Likes</string>
-    <string name="reader_discover_display_name">Discover</string>
-    <string name="reader_save_for_later_display_name">Saved</string>
-    <string name="reader_filter_sites_title">Sites</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="suffix_1_000_000_000_000_000">%sQa</string>
-    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="my_site_bottom_sheet_add_page">Site page</string>
+    <string name="posts_cannot_be_started">We cannot open the posts right now. Please try again later</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="posts_cannot_be_started">We cannot open the posts right now. Please try again later</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="reader_filter_sites_title">Sites</string>
+    <string name="reader_save_for_later_display_name">Saved</string>
+    <string name="reader_discover_display_name">Discover</string>
+    <string name="reader_my_likes_display_name">Likes</string>
     <string name="site_cannot_be_loaded">We cannot load the data for your site right now. Please try again later</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="reader_filter_tags_title">Topics</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress Media Library</string>
+    <string name="gutenberg_native_unsupported">Unsupported</string>
     <string name="gutenberg_native_ungroup">Ungroup</string>
     <string name="gutenberg_native_translate">Translate</string>
-    <string name="gutenberg_native_title">Title:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Tap to hide the keyboard</string>
     <string name="gutenberg_native_tap_here_to_show_help">Tap here to show help</string>
     <string name="gutenberg_native_take_a_video">Take a Video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Take a Photo or Video</string>
     <string name="gutenberg_native_take_a_photo">Take a Photo</string>
     <string name="gutenberg_native_start_writing">Start writing…</string>
-    <string name="gutenberg_native_size">Size</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Sidebar title plugin</string>
     <string name="gutenberg_native_show_section">Show section</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s block. This block has invalid content</string>
     <string name="gutenberg_native_s_block_empty">%s block. Empty</string>
     <string name="gutenberg_native_cut_block">Cut block</string>
-    <string name="gutenberg_native_reset_block">Reset Block</string>
-    <string name="gutenberg_native_remove_annotations">Remove annotations</string>
     <string name="gutenberg_native_problem_opening_the_video">Problem opening the video</string>
     <string name="gutenberg_native_problem_displaying_block">Problem displaying block</string>
     <string name="gutenberg_native_post_title_s">Post title. %s</string>
@@ -500,17 +921,12 @@ Language: en_CA
     <string name="gutenberg_native_open_settings">Open Settings</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">No application can handle this request. Please install a Web browser.</string>
     <string name="gutenberg_native_navigate_up">Navigate Up</string>
-    <string name="gutenberg_native_my_pre_publish_panel">My pre publish panel</string>
-    <string name="gutenberg_native_my_post_status_info">My post status info</string>
-    <string name="gutenberg_native_my_post_publish_panel">My post publish panel</string>
-    <string name="gutenberg_native_my_document_setting_panel">My Document Setting Panel</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Move block up from row %1$s to row %2$s</string>
     <string name="gutenberg_native_move_block_up">Move block up</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Move block down from row %1$s to row %2$s</string>
     <string name="gutenberg_native_move_block_down">Move block down</string>
     <string name="gutenberg_native_image_caption_s">Image caption. %s</string>
     <string name="gutenberg_native_hide_keyboard">Hide keyboard</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Here is the panel content!</string>
     <string name="gutenberg_native_help_icon">Help icon</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Failed to insert media.\nPlease tap for options.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Double tap to undo last change</string>
@@ -522,34 +938,28 @@ Language: en_CA
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Double tap to move the block up</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Double tap to move the block down</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Double tap to edit this value</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Double tap to change the value using slider</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Double tap to add a block</string>
     <string name="gutenberg_native_current_value_is_s">Current value is %s</string>
-    <string name="gutenberg_native_content">Content…</string>
     <string name="gutenberg_native_choose_from_device">Choose from device</string>
-    <string name="gutenberg_native_annotations_sidebar">Annotations Sidebar</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">An unknown error occurred. Please try again.</string>
     <string name="gutenberg_native_alt_text">Alt Text</string>
     <string name="gutenberg_native_add_video">ADD VIDEO</string>
-    <string name="gutenberg_native_add_url">Add URL</string>
     <string name="gutenberg_native_add_image_or_video">ADD IMAGE OR VIDEO</string>
     <string name="gutenberg_native_add_image">ADD IMAGE</string>
     <string name="gutenberg_native_add_block_here">ADD BLOCK HERE</string>
-    <string name="gutenberg_native_add_annotation">Add annotation</string>
-    <string name="gutenberg_native_add_a_description">Add a description</string>
+    <string name="gutenberg_native_add_url">Add URL</string>
+    <string name="gutenberg_native_add_alt_text">Add alt text</string>
     <string name="reader_empty_saved_posts_content_description">Tap the Add to Save Posts button to save a post to your list.</string>
     <string name="reader_acessibility_list_loaded">\"The list has loaded with %1$d items.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Notifications</string>
-    <string name="master_switch_default_title_off">Off</string>
-    <string name="master_switch_default_title_on">On</string>
-    <string name="notifications_tab_dialog_master_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Enable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Disable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_status_on">Notifications for this site</string>
-    <string name="dialog_gutenberg_informative_description_page">You’re now using the block editor for new pages, great! If you’d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">You’re now using the block editor for new posts, great! If you’d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
+    <string name="main_switch_default_title_off">Off</string>
+    <string name="main_switch_default_title_on">On</string>
+    <string name="notifications_tab_dialog_main_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Enable notifications display on notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Disable notifications display on notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifications for this site</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifications for this site</string>
     <string name="pick_media">Add image or video</string>
     <string name="error_post_not_submitted_retrying">We couldn\'t submit this post for review, but we\'ll try again later. </string>
     <string name="error_post_not_scheduled_retrying">We couldn\'t schedule this post, but we\'ll try again later.</string>
@@ -621,7 +1031,6 @@ Language: en_CA
     <string name="stats_site_neutral_utc">Site time zone (UTC)</string>
     <string name="web_preview_desktop">Desktop</string>
     <string name="web_preview_default">Default</string>
-    <string name="close_dialog_button_desc">Close Dialogue</string>
     <string name="preview_type_desc">Select preview type</string>
     <string name="share_desc">Share</string>
     <string name="navigate_back_desc">Go back</string>
@@ -629,6 +1038,7 @@ Language: en_CA
     <string name="calendar_scheduled_post_description">\"%s\" scheduled for publishing on \"%s\" in your WordPress app \n %s</string>
     <string name="calendar_scheduled_post_title">WordPress Scheduled Post: \"%s\"</string>
     <string name="notification_post_will_be_published_in_ten_minutes">\"%s\" will be published in 10 minutes</string>
+    <string name="close_dialog_button_desc">Close Dialogue</string>
     <string name="notification_post_will_be_published_in_one_hour">\"%s\" will be published in 1 hour</string>
     <string name="notification_post_has_been_published">\"%s\" has been published</string>
     <string name="notification_scheduled_post_ten_minute_reminder">Scheduled post: 10 minute reminder</string>
@@ -642,8 +1052,6 @@ Language: en_CA
     <string name="post_settings_add_to_calendar">Add to calendar</string>
     <string name="post_settings_notification">Notification</string>
     <string name="post_settings_time_and_date">Date and Time</string>
-    <string name="login_need_help_finding_connected_email">Need help finding the email you connected with?</string>
-    <string name="enter_wordpress_site">The website at this address is not a WordPress site. For us to connect to it, the site must have WordPress installed.</string>
     <string name="login_invalid_site_url">Please enter a complete website address, like example.com.</string>
     <string name="enter_email_for_site">Log in with WordPress.com to connect to %1$s</string>
     <string name="stats_post_views_label">Views</string>
@@ -678,23 +1086,23 @@ Language: en_CA
     <string name="stats_widget_minified_name">At a glance</string>
     <string name="stats_widget_today_insights_name">Today</string>
     <string name="stats_widget_all_time_insights_name">All-time</string>
+    <string name="stats_widget_select_color">Colour</string>
+    <string name="stats_widget_color">Colour</string>
     <string name="stats_widget_weekly_views_name">Views this week</string>
     <string name="stats_widget_log_in_message">Please log in to the WordPress app to add a widget.</string>
     <string name="stats_widget_error_no_network">No network available</string>
     <string name="stats_widget_error_no_data">Couldn\'t load data</string>
     <string name="stats_widget_select_type">Type</string>
-    <string name="stats_widget_select_color">Colour</string>
     <string name="stats_widget_select_your_site">Select your site</string>
     <string name="stats_widget_color_dark">Dark</string>
     <string name="stats_widget_color_light">Light</string>
-    <string name="stats_widget_color">Colour</string>
     <string name="stats_widget_site_caption">Select your site</string>
     <string name="stats_widget_site">Site</string>
     <string name="stats_widget_all_time_title">All-time</string>
     <string name="stats_widget_views_title">Views This Week</string>
     <string name="stats_widget_add">Add widget</string>
-    <string name="plugin_fetching_error_after_at">It takes longer than usual to refresh plugin details. Please check again later.</string>
     <string name="plugin_install_site_ineligible_default_error">If you just registered a domain name, please wait until we finish setting it up and try again.\n\nIf not, looks like something went wrong and plugin feature might not be available for this site.</string>
+    <string name="plugin_fetching_error_after_at">It takes longer than usual to refresh plugin details. Please check again later.</string>
     <string name="domain_contact_information_state_not_available_hint">Province (Not Available)</string>
     <string name="domain_registration_privacy_protection_tos">By registering this domain you agree to our %1$sterms and conditions%2$s</string>
     <string name="error_network_connection">Check your network connection and try again.</string>
@@ -706,20 +1114,20 @@ Language: en_CA
     <string name="site_settings_password_updated">Password updated</string>
     <string name="site_settings_password_dialog_title">Update password</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Registering domain name…</string>
-    <string name="domain_registration_state_picker_dialog_title">Select Province</string>
     <string name="domain_registration_country_picker_dialog_title">Select Country</string>
+    <string name="domain_registration_state_picker_dialog_title">Select Province</string>
     <string name="domain_registration_result_continue_button">continue</string>
-    <string name="domain_registration_result_description">your new domain &lt;b>%s&lt;/b> is being set up. Your site is\n        doing somersaults in excitement!</string>
+    <string name="domain_registration_result_description">your new domain &lt;b&gt;%s&lt;/b&gt; is being set up. Your site is\n        doing somersaults in excitement!</string>
     <string name="domain_registration_result_title">Congratulations</string>
     <string name="domain_contact_information_register_domain_button">Register Domain</string>
     <string name="domain_contact_information_postal_code_hint">Postal code</string>
-    <string name="domain_contact_information_state_hint">Province</string>
     <string name="domain_contact_information_city_hint">City</string>
     <string name="domain_contact_information_address_hint_two">Address 2</string>
     <string name="domain_contact_information_address_hint">Address</string>
     <string name="domain_contact_information_country_hint">Country</string>
     <string name="domain_contact_information_country_code_hint">Country code</string>
     <string name="domain_contact_information_phone_number_hint">Phone</string>
+    <string name="domain_contact_information_state_hint">Province</string>
     <string name="domain_contact_information_organization_hint">Organization (optional)</string>
     <string name="domain_contact_information_description">For your convenience, we have pre-filled your WordPress.com\n        contact information. Please review to be sure it’s the correct information you want to use for this domain.</string>
     <string name="domain_contact_information_title">Domain contact information</string>
@@ -738,18 +1146,18 @@ Language: en_CA
     <string name="editor_failed_to_insert_media_tap_to_retry">Failed to insert media.\nPlease tap to retry.</string>
     <string name="editor_uploading_draft">Your draft is uploading</string>
     <string name="post_uploading_draft">Uploading draft</string>
-    <string name="post_list_tab_drafts">Drafts</string>
     <string name="error_restoring_post">An error occurred while restoring the post</string>
+    <string name="post_list_tab_drafts">Drafts</string>
     <string name="backdated_for">Backdated for: %s</string>
     <string name="stats_insights_management_title">Only see the most relevant stats. Add and organise your insights below.</string>
     <string name="stats_insights_social">Social</string>
     <string name="stats_insights_annual_site_stats">Annual Site Stats</string>
-    <string name="stats_view_follower_totals">Follower Totals</string>
+    <string name="register_domain">Register Domain</string>
+    <string name="jetpack_installed_message">Now that Jetpack is installed, we just need to get you set up. This will only take a minute.</string>
     <string name="domain_suggestions_fetch_error">Domain suggestions couldn\'t be loaded</string>
     <string name="domain_suggestions_search_hint">Type a keyword for more ideas</string>
     <string name="domains_suggestions_empty_list">No suggestions found</string>
-    <string name="register_domain">Register Domain</string>
-    <string name="jetpack_installed_message">Now that Jetpack is installed, we just need to get you set up. This will only take a minute.</string>
+    <string name="stats_view_follower_totals">Follower Totals</string>
     <string name="stats_menu_remove">Remove from insights</string>
     <string name="stats_menu_move_down">Move down</string>
     <string name="stats_menu_move_up">Move up</string>
@@ -758,8 +1166,8 @@ Language: en_CA
     <string name="post_restoring">Post is being restored</string>
     <string name="post_restored">Post restored</string>
     <string name="post_trashing">Post is being trashed</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_message">Trashing this post will also discard unsaved changes, are you sure you want to continue?</string>
     <string name="dialog_confirm_trash_losing_local_changes_title">Local changes</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">Trashing this post will also discard unsaved changes, are you sure you want to continue?</string>
     <string name="button_move_to_draft">Move to Draft</string>
     <string name="post_list_toggle_item_layout_list_view">Switch to list view</string>
     <string name="post_list_toggle_item_layout_cards_view">Switch to cards view</string>
@@ -770,34 +1178,34 @@ Language: en_CA
     <string name="notification_wpcom_username_needed">Please log in with your username and password.</string>
     <string name="error_user_username_instead_of_email">Please log in using your WordPress.com username instead of your email address.</string>
     <string name="stats_insights_average_words">Avg words/post</string>
-    <string name="stats_insights_total_words">Total words</string>
     <string name="stats_insights_average_likes">Avg likes/post</string>
     <string name="stats_insights_total_likes">Total likes</string>
-    <string name="stats_insights_average_comments">Avg comments/post</string>
     <string name="stats_insights_total_comments">Total comments</string>
     <string name="stats_insights_posts">Posts</string>
     <string name="stats_insights_year">Year</string>
-    <string name="stats_insights_this_year_site_stats">This Year</string>
     <string name="no_site_error">The site at this address is not a WordPress site. For us to connect to it, the site must use WordPress.</string>
+    <string name="stats_insights_total_words">Total words</string>
+    <string name="stats_insights_average_comments">Avg comments/post</string>
+    <string name="stats_insights_this_year_site_stats">This Year</string>
     <string name="plugin_check_domain_credit_error">Failed to check available domain credits</string>
     <string name="plugin_check_domain_credits_progress_dialog_message">Checking domain credits</string>
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Register domain</string>
     <string name="plugin_install_custom_domain_required_dialog_message">To install plugins, you need to have a custom domain associated with your site.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Install plugin</string>
-    <string name="new_site_creation_preview_subtitle">You\'ll be able to customize look and feel of your site later</string>
     <string name="publish_on">Publish on: %s</string>
     <string name="schedule_for">Schedule for: %s</string>
     <string name="published_on">Published on: %s</string>
     <string name="scheduled_for">Scheduled for: %s</string>
     <string name="stats_detail_recent_weeks">Recent Weeks</string>
     <string name="stats_detail_average_views_per_day">Avg. Views Per Day</string>
-    <string name="stats_months_and_years_views_label">Views</string>
     <string name="stats_months_and_years_period_label">Period</string>
     <string name="stats_detail_months_and_years">Months and Years</string>
     <string name="stats_insights_load_more">Load more</string>
-    <string name="stats_insights_today_stats">Today</string>
+    <string name="stats_months_and_years_views_label">Views</string>
+    <string name="new_site_creation_preview_subtitle">You\'ll be able to customize look and feel of your site later</string>
     <string name="stats_insights_best_hour">Best Hour</string>
     <string name="stats_insights_best_day">Best Day</string>
+    <string name="stats_insights_today_stats">Today</string>
     <string name="showing_stats_for">Showing stats for:</string>
     <string name="app_rating_rate_never">No thanks</string>
     <string name="app_rating_rate_later">Later</string>
@@ -816,25 +1224,21 @@ Language: en_CA
     <string name="plans_loading_error_no_plans_subtitle">We cannot load Plans at the moment. Please try again later.</string>
     <string name="plans_loading_error_no_plans_title">Cannot load Plans</string>
     <string name="plans_loading_error_network_title">No connection</string>
-    <string name="menu_switch_to_gutenberg_editor">Switch to block editor</string>
-    <string name="menu_switch_to_aztec_editor">Switch to classic editor</string>
     <string name="stats_loading_block_error">There was a problem loading your data, refresh your page to try again.</string>
     <string name="stats_loading_error">Data not loaded</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edit new posts and pages with the Block Editor</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Use Block Editor</string>
-    <string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
+    <string name="menu_switch_to_gutenberg_editor">Switch to block editor</string>
     <string name="exit">exit</string>
     <string name="quick_start_sites_type_subtitle">%1$d of %2$d complete</string>
-    <string name="quick_start_sites_type_grow">Grow Your Audience</string>
-    <string name="quick_start_sites_type_customize">Customize Your Site</string>
     <string name="quick_start_sites">Next Steps</string>
     <string name="quick_start_complete_tasks_header">Complete (%d)</string>
     <string name="quick_start_dialog_view_site_message">Enjoy your finished product!</string>
     <string name="quick_start_dialog_upload_icon_title">Upload a site icon</string>
     <string name="quick_start_dialog_upload_icon_message">Your visitors will see your icon in their browser. Add a custom icon for a polished, pro look.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Tap %1$s Plan %2$s to see your current plan and other available plans</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tap %1$s Add Page %2$s to create a new page.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Tap %1$s Pages %2$s to continue.</string>
+    <string name="quick_start_sites_type_grow">Grow your audience</string>
+    <string name="quick_start_sites_type_customize">Customize your site</string>
     <string name="quick_start_dialog_check_stats_message_short">Tap %1$s Stats %2$s to see how your site is performing.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tap %1$s Your Site Icon %2$s to upload a new one</string>
     <string name="quick_start_dialog_publish_post_message">Draft and publish your first post.</string>
@@ -845,13 +1249,8 @@ Language: en_CA
     <string name="quick_start_dialog_explore_plans_message">Learn about the marketing and SEO tools in our paid plans.</string>
     <string name="quick_start_dialog_enable_sharing_title">Enable post sharing</string>
     <string name="quick_start_dialog_enable_sharing_message">Automatically share new posts to your social media accounts.</string>
-    <string name="quick_start_dialog_customize_site_message">Tweak fonts, add images, and more.</string>
-    <string name="quick_start_dialog_create_page_title">Create a new page</string>
-    <string name="quick_start_dialog_create_page_message">Add a page for key content — an \"About\" page is a great start.</string>
     <string name="quick_start_dialog_check_stats_title">Check your site stats</string>
     <string name="quick_start_dialog_check_stats_message">Keep up to date on your site\'s performance.</string>
-    <string name="quick_start_dialog_browse_themes_title">Browse themes</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore dozens of layout options and find your perfect fit.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Removing Next Steps will hide all tours on this site. This action cannot be undone.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Remove Next Steps</string>
     <string name="quick_start_remove_next_steps_menu_title">Remove this</string>
@@ -875,15 +1274,11 @@ Language: en_CA
     <string name="notification_new_site_creation_failed">There was a problem</string>
     <string name="notification_new_site_creation_title">Create Site</string>
     <string name="new_site_creation_create_site_button">Create Site</string>
-    <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="site_creation_error_generic_title">There was a problem</string>
     <string name="site_creation_fetch_suggestions_error_unknown">There was a problem</string>
-    <string name="site_creation_segments_subtitle">This helps us make recommendations. But you’re never locked in — all sites evolve!</string>
-    <string name="site_creation_segments_title">Tell us what kind of site you’d like to make</string>
     <string name="new_site_creation_preview_title">Your site has been created!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d of %2$d</string>
     <string name="new_site_creation_screen_title_general">Create Site</string>
@@ -904,9 +1299,6 @@ Language: en_CA
     <string name="stats_no_data_for_period">No data for this period</string>
     <string name="preference_strip_image_location">Remove location from media</string>
     <string name="stats_cannot_be_started">We cannot open the statistics at the moment. Please try again later</string>
-    <string name="gif_picker_endless_scroll_network_error">Some media failed to load due to a network error.</string>
-    <string name="gif_picker_empty_search_list">No media matching your search</string>
-    <string name="gif_picker_initial_empty_text">Search to find GIFs to add to your Media Library!</string>
     <string name="stats_author_views_label">Views</string>
     <string name="stats_author_label">Author</string>
     <string name="stats_authors">Authors</string>
@@ -936,9 +1328,12 @@ Language: en_CA
     <string name="stats_insights_share_post">Share post</string>
     <string name="stats_insights_create_post">Create post</string>
     <string name="stats_insights_latest_post_message">It’s been %1$s since %2$s was published. Here’s how the post performed so far:</string>
+    <string name="gif_picker_endless_scroll_network_error">Some media failed to load due to a network error.</string>
+    <string name="gif_picker_empty_search_list">No media matching your search</string>
+    <string name="gif_picker_initial_empty_text">Search to find GIFs to add to your Media Library!</string>
+    <string name="stats_insights_tags_and_categories">Tags and Categories</string>
     <string name="stats_insights_latest_post_with_no_engagement">It\'s been %1$s since %2$s was published. Get the ball rolling and increase your post views by sharing your post:</string>
     <string name="stats_insights_latest_post_empty">You haven\'t published any posts yet. Once you start publishing, your latest post\'s summary will appear here:</string>
-    <string name="stats_insights_tags_and_categories">Tags and Categories</string>
     <string name="stats_insights_all_time_stats">All-time</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">Followers</string>
@@ -989,8 +1384,8 @@ Language: en_CA
     <string name="image_size_medium_label">Medium</string>
     <string name="image_size_thumbnail_label">Thumbnail</string>
     <string name="menu_history">History</string>
-    <string name="pages_open_page_error">The selected page is not available</string>
     <string name="pages_pending">Pending review</string>
+    <string name="pages_open_page_error">The selected page is not available</string>
     <string name="pages_empty_trashed">You don\'t have any trashed pages</string>
     <string name="pages_empty_scheduled">You don\'t have any scheduled pages</string>
     <string name="pages_empty_drafts">You don\'t have any draft pages</string>
@@ -998,15 +1393,15 @@ Language: en_CA
     <string name="pages_search_suggestion">Search pages</string>
     <string name="pages_empty_search_result">No pages matching your search</string>
     <string name="pages_delete_permanently">Delete Permanently</string>
-    <string name="pages_move_to_trash">Move to Trash</string>
     <string name="pages_move_to_draft">Move to Draft</string>
+    <string name="pages_move_to_trash">Move to Trash</string>
     <string name="pages_set_parent">Set parent</string>
     <string name="pages_view">View</string>
-    <string name="pages_trashed">Trashed</string>
     <string name="pages_scheduled">Scheduled</string>
     <string name="pages_drafts">Drafts</string>
     <string name="pages_published">Published</string>
     <string name="login_error_sms_throttled">We\'ve made too many attempts to send an SMS verification code — take a break, and request a new one in a minute.</string>
+    <string name="pages_trashed">Trashed</string>
     <string name="login_error_email_not_found_v2">There\'s no WordPress.com account matching this Google account.</string>
     <string name="site_picker_remove_site_empty">No sites matching your search</string>
     <string name="reader_empty_followed_blogs_search_title">No sites matching your search</string>
@@ -1014,7 +1409,6 @@ Language: en_CA
     <string name="page_permanently_deleted">Page has been permanently deleted</string>
     <string name="page_moved_to_scheduled">Page has been scheduled</string>
     <string name="page_moved_to_published">Page has been published</string>
-    <string name="page_moved_to_trash">Page has been trashed</string>
     <string name="page_moved_to_draft">Page has been moved to Drafts</string>
     <string name="top_level">Top level</string>
     <string name="page_delete_dialog_message">Are you sure you want to delete page %s?</string>
@@ -1022,48 +1416,45 @@ Language: en_CA
     <string name="page_status_change_error">There was a problem changing the page status</string>
     <string name="page_delete_error">There was a problem deleting the page</string>
     <string name="set_parent">Set Parent</string>
+    <string name="page_moved_to_trash">Page has been trashed</string>
     <string name="quick_start_focus_point_description">tap here</string>
     <string name="quick_start_list_create_site_title">Create your site</string>
     <string name="quick_start_list_create_site_subtitle">Get your site up and running.</string>
     <string name="quick_start_dialog_view_site_title">View your site</string>
     <string name="quick_start_dialog_view_site_message_short">Tap %1$s View Site %2$s to preview your site</string>
     <string name="quick_start_dialog_share_site_title">Share your site</string>
+    <string name="quick_start_dialog_share_site_message">Connect to your social media accounts – your site will automatically share new posts.</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">Tap %1$s Sharing %2$s to continue</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Tap the %1$s Connections %2$s to add your social media accounts</string>
-    <string name="quick_start_dialog_share_site_message">Connect to your social media accounts – your site will automatically share new posts.</string>
     <string name="quick_start_dialog_publish_post_title">Publish a post</string>
     <string name="quick_start_dialog_publish_post_message_short">Tap %1$s Create Post %2$s to create a new post</string>
     <string name="quick_start_dialog_need_help_title">Want a little help getting started?</string>
     <string name="quick_start_dialog_need_help_button_positive">Accept</string>
     <string name="quick_start_dialog_need_help_button_neutral">Never</string>
-    <string name="quick_start_dialog_need_help_button_negative">No Thanks</string>
     <string name="quick_start_dialog_follow_sites_title">Follow other sites</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar interests</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tap %1$s Reader %2$s to continue</string>
+    <string name="quick_start_dialog_need_help_button_negative">No Thanks</string>
     <string name="quick_start_dialog_follow_sites_message">Find sites that inspire you, and follow them to get updates when they post.</string>
-    <string name="quick_start_dialog_customize_site_title">Customize your site</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tap %1$s Themes %2$s to continue</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tap %1$s Customize %2$s to start personalizing your site</string>
-    <string name="quick_start_dialog_choose_theme_title">Choose a theme</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tap %1$s Themes %2$s to discover new themes</string>
-    <string name="quick_start_dialog_choose_theme_message">Browse all our themes to find your perfect fit.</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar topics</string>
     <string name="quick_start_button_positive">Go</string>
     <string name="quick_start_button_negative_short">Cancel</string>
     <string name="quick_start_button_negative">Not now</string>
-    <string name="content_description_more">More</string>
     <string name="my_site_create_new_site_title">You don\'t have any sites</string>
+    <string name="content_description_more">More</string>
+    <string name="reader_empty_followed_tags_title">No followed topics</string>
+    <string name="reader_empty_followed_tags_subtitle">Add topics here to find posts about your favourite topics</string>
     <string name="login_to_to_connect_jetpack">Log in to the WordPress.com account you used to connect Jetpack.</string>
     <string name="install_jetpack_retry">Retry</string>
-    <string name="install_jetpack_continue">Set up</string>
-    <string name="jetpack_installation_problem_message">Jetpack could not be installed at this time.</string>
     <string name="jetpack_installation_problem">There was a problem</string>
     <string name="jetpack_installed">Jetpack installed</string>
-    <string name="installing_jetpack_message">Installing Jetpack on your site. This can take up to a few minutes to complete.</string>
     <string name="installing_jetpack">Installing Jetpack</string>
-    <string name="install_jetpack_message">Your website credentials will not be stored and are used only for the purpose of installing Jetpack.</string>
     <string name="install_jetpack">Install Jetpack</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
+    <string name="install_jetpack_continue">Set up</string>
+    <string name="jetpack_installation_problem_message">Jetpack could not be installed at this time.</string>
+    <string name="installing_jetpack_message">Installing Jetpack on your site. This can take up to a few minutes to complete.</string>
+    <string name="install_jetpack_message">Your website credentials will not be stored and are used only for the purpose of installing Jetpack.</string>
     <string name="stats_jetpack_connection_setup_info">To use Stats on your WordPress site, you\'ll need to install the Jetpack plugin.</string>
     <string name="themes_empty_list">No themes matching your search</string>
     <string name="reader_label_post_search_explainer">What would you like to find?</string>
@@ -1108,15 +1499,13 @@ Language: en_CA
     <string name="support_contact_email">Contact email</string>
     <string name="application_log_button">Application log</string>
     <string name="my_tickets">My Tickets</string>
-    <string name="activity_log_rewind_dialog_message">Are you sure you want to rewind your site back to %1$s at %2$s? This will remove all content and options created or changed since then.</string>
-    <string name="activity_log_rewind_site">Rewind Site</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rewind in progress</string>
-    <string name="activity_log_currently_restoring_message">Rewinding to %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restore in progress</string>
+    <string name="activity_log_currently_restoring_message">Restoring to %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Currently restoring your site</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Your site has been successfully restored</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRewound to %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRewinding to %1$s %2$s</string>
     <string name="activity_log_button">Activity Log action button</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRestored to %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRestoring to %1$s %2$s</string>
     <string name="plugin_auto_managed">Auto-managed</string>
     <string name="reader_save_posts_locally_dialog_message">Save this post, and come back to read it whenever you\'d like. It will only be available on this device — saved posts don\'t sync to your other devices.</string>
     <string name="reader_save_posts_locally_dialog_title">Save Posts for Later</string>
@@ -1125,24 +1514,20 @@ Language: en_CA
     <string name="comment_read_source_post">Read the source post</string>
     <string name="sites">Sites</string>
     <string name="signup_magic_link_title">Magic link sent</string>
-    <string name="signup_email_screen_title">Email signup</string>
     <string name="verification_2fa_screen_title">Code verification</string>
     <string name="selfhosted_site_login_title">Login credentials</string>
     <string name="magic_link_sent_login_title">Magic link sent</string>
     <string name="magic_link_login_title">Magic link login</string>
     <string name="site_address_login_title">Site address login</string>
     <string name="email_address_login_title">Email address login</string>
-    <string name="alternatively">Alternatively:</string>
     <string name="reader_empty_saved_posts_description">Tap %s to save a post to your list.</string>
-    <string name="reader_empty_saved_posts_title">No posts saved — yet!</string>
     <string name="reader_bookmark_snack_title">Post saved</string>
     <string name="reader_bookmark_snack_btn">View All</string>
-    <string name="reader_btn_bookmarked">Saved</string>
-    <string name="reader_btn_bookmark">Save</string>
     <string name="reader_remove_bookmark">Remove from saved posts</string>
     <string name="reader_add_bookmark">Add to saved posts</string>
     <string name="reader_save_for_later_title">Saved posts</string>
     <string name="removed">Removed</string>
+    <string name="reader_empty_saved_posts_title">No posts saved — yet!</string>
     <string name="my_site_icon_content_description">Change site icon</string>
     <string name="my_site_icon_dialog_cancel_button">Cancel</string>
     <string name="my_site_icon_dialog_remove_button">Remove</string>
@@ -1158,11 +1543,9 @@ Language: en_CA
     <string name="reader_btn_notifications_on">Turn on site notifications</string>
     <string name="reader_btn_notifications_off">Turn off site notifications</string>
     <string name="activity_log_jetpack_icon">Jetpack icon</string>
-    <string name="rewind">Rewind</string>
     <string name="activity_log_event">Event</string>
     <string name="activity_log_icon">Activity icon</string>
     <string name="activity_log">Activity Log</string>
-    <string name="activity">Activity</string>
     <string name="privacy_policy_read">Read privacy policy</string>
     <string name="third_party_policy_learn_more_caption">We use other tracking tools, including some from third parties. Read about these and how to control them.</string>
     <string name="third_party_policy_learn_more_header">Third Party Policy</string>
@@ -1173,7 +1556,6 @@ Language: en_CA
     <string name="preference_privacy_settings">Privacy settings</string>
     <string name="preference_collect_information">Collect information</string>
     <string name="post_submitted">Post submitted</string>
-    <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Plugin feature requires the site to be in good standing.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Plugin feature requires primary domain subscription to be associated with this user.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Plugin feature requires admin privileges.</string>
@@ -1217,7 +1599,6 @@ Language: en_CA
     <string name="fab_add_tag_desc">Create Tag</string>
     <string name="navigate_up_desc">navigate up</string>
     <string name="notification_settings_switch_desc">Notifications</string>
-    <string name="open_external_link_desc">Open external link</string>
     <string name="show_more_desc">show more</string>
     <string name="reader_photo_view_desc">photo</string>
     <string name="reader_list_item_suggestion_remove_desc">delete</string>
@@ -1241,16 +1622,17 @@ Language: en_CA
     <string name="profile_picture">%s\'s profile picture</string>
     <string name="comment_checkmark_desc">check mark</string>
     <string name="signup_with_google_progress">Signing up with Google…</string>
+    <string name="open_external_link_desc">Open external link</string>
     <string name="jetpack_connection_failed_with_reason">Connection to Jetpack failed: %s</string>
     <string name="jetpack_already_connected_toast">You are already connected to Jetpack</string>
     <string name="menu_undo_snackbar_action">UNDO</string>
-    <string name="menu_visual_mode_done_snackbar">Switched to Visual mode</string>
     <string name="menu_visual_mode">Visual Mode</string>
-    <string name="menu_html_mode_done_snackbar">Switched to HTML mode</string>
     <string name="menu_html_mode">HTML Mode</string>
     <string name="menu_preview">Preview</string>
     <string name="menu_save_as_draft">Save as Draft</string>
     <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_visual_mode_done_snackbar">Switched to Visual mode</string>
+    <string name="menu_html_mode_done_snackbar">Switched to HTML mode</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1272,7 +1654,6 @@ Language: en_CA
     <string name="edit_photo_screen_title">Edit Photo</string>
     <string name="share_intent_screen_title">Pick site</string>
     <string name="signup_epilogue_screen_title">New account</string>
-    <string name="login_prologue_screen_title">Login</string>
     <string name="login_epilogue_screen_title">Logged in as</string>
     <string name="person_detail_screen_title">Person detail</string>
     <string name="media_settings_screen_title">File details</string>
@@ -1280,13 +1661,13 @@ Language: en_CA
     <string name="notifications_screen_title">Notifications</string>
     <string name="reader_screen_title">Reader</string>
     <string name="me_section_screen_title">Me</string>
-    <string name="my_site_section_screen_title">My Site</string>
     <string name="notif_settings_screen_title">Notification settings</string>
     <string name="help_screen_title">Help and Support</string>
     <string name="license_screen_title">Licence</string>
     <string name="release_notes_screen_title">Release notes</string>
+    <string name="my_site_section_screen_title">My Site</string>
     <string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
-    <string name="permissions_denied_message">It looks like you turned off permissions required for this feature.&lt;br/>&lt;br/>To change this, edit your permissions and make sure &lt;strong>%s&lt;/strong> is enabled.</string>
+    <string name="permissions_denied_message">It looks like you turned off permissions required for this feature.&lt;br/&gt;&lt;br/&gt;To change this, edit your permissions and make sure &lt;strong&gt;%s&lt;/strong&gt; is enabled.</string>
     <string name="permissions_denied_title">Permissions</string>
     <string name="plugin_caption_featured">Featured</string>
     <string name="sharing_disabled_description">You cannot access your sharing settings because your Sharing Jetpack module is disabled.</string>
@@ -1327,7 +1708,6 @@ Language: en_CA
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 post with 1 file not uploaded</string>
     <string name="untitled_in_parentheses">(Untitled)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Create site</string>
     <string name="notification_site_creation_created">Tap to continue.</string>
     <string name="notification_site_creation_title_success">Site created!</string>
@@ -1341,28 +1721,20 @@ Language: en_CA
     <string name="username_changer_dismiss_button_positive">Discard</string>
     <string name="username_changer_action">Save</string>
     <string name="content_description_add_avatar">Add avatar</string>
-    <string name="signup_with_google_button">Sign Up with Google</string>
-    <string name="signup_with_email_button">Sign Up with Email</string>
     <string name="signup_user_exists">Email already exists on WordPress.com.\nProceeding with login.</string>
     <string name="signup_updating_account">Updating account…</string>
-    <string name="signup_terms_of_service_text">By signing up, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="signup_magic_link_progress">Sending email</string>
     <string name="signup_magic_link_error_button_positive">Retry</string>
     <string name="signup_magic_link_error_button_negative">Close</string>
-    <string name="signup_magic_link_error">There was some trouble sending the email. You can retry now or close and try again later.</string>
     <string name="signup_epilogue_hint_username">Username</string>
-    <string name="signup_epilogue_hint_password_detail">You can always log in with a link like the one you just used, but you can also set up a password if you prefer.</string>
     <string name="signup_epilogue_hint_password">Password (optional)</string>
     <string name="signup_epilogue_hint_display">Display Name</string>
     <string name="signup_epilogue_error_button_positive">Retry</string>
     <string name="signup_epilogue_error_button_negative">Revert</string>
     <string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
     <string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
-    <string name="signup_email_header">To create your new WordPress.com account, please enter your email address.</string>
-    <string name="signup_email_error_generic">There was some trouble checking the email address.</string>
-    <string name="sign_up">Sign Up for WordPress.com</string>
-    <string name="enter_username_instead">Log in with your username.</string>
-    <string name="enter_site_address_instead">Log in by entering your site address.</string>
+    <string name="signup_magic_link_error">There was some trouble sending the email. You can retry now or close and try again later.</string>
+    <string name="signup_epilogue_hint_password_detail">You can always log in with a link like the one you just used, but you can also set up a password if you prefer.</string>
     <string name="plugin_needs_update">Needs update</string>
     <string name="plugin_caption_search">Search Plugins</string>
     <string name="plugin_caption_new">New</string>
@@ -1483,7 +1855,6 @@ Language: en_CA
     <string name="login_error_suffix">\nMaybe try a different account?</string>
     <string name="login_error_generic">There was some trouble connecting with the Google account.</string>
     <string name="login_error_button">Close</string>
-    <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
     <string name="error_generic_network">A network error occurred. Please check your connection and try again.</string>
     <string name="post_settings_remove_featured_image">Remove featured image</string>
@@ -1495,12 +1866,11 @@ Language: en_CA
     <string name="jetpack_disconnect_confirm">Disconnect</string>
     <string name="jetpack_disconnect_confirmation_message">Are you sure you want to disconnect Jetpack from the site?</string>
     <string name="jetpack_disconnect_pref_title">\"Disconnect from WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">You may whitelist an IP address or series of addresses preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">You may mark an IP address (or series of addresses) as \"Always allowed\", preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Require two-step authentication</string>
     <string name="jetpack_match_wpcom_via_email_title">Match accounts using email</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Allow WordPress.com login</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com login</string>
-    <string name="jetpack_brute_force_whitelist_title">Whitelisted IP addresses</string>
     <string name="jetpack_prevent_brute_force_title">Block malicious login attempts</string>
     <string name="jetpack_prevent_brute_force_category_title">Brute force attack protection</string>
     <string name="jetpack_send_wp_notifications_title">Send push notifications</string>
@@ -1530,8 +1900,8 @@ Language: en_CA
     <string name="media_edit_filename_caption">File Name</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alt text</string>
-    <string name="connect_site">Connect a site</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Blink light</string>
+    <string name="connect_site">Connect a site</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibrate device</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Choose sound</string>
     <string name="notification_settings_category_sights_and_sounds">Sights and Sounds</string>
@@ -1541,13 +1911,13 @@ Language: en_CA
     <string name="notification_settings_category_other">Other</string>
     <string name="notification_settings_item_your_sites_all_your_sites">All My Sites</string>
     <string name="notification_settings_category_your_sites">Your Sites</string>
-    <string name="notification_settings_master_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
-    <string name="notification_settings_master_off_title">To receive notifications on this device, turn Notification Settings on.</string>
-    <string name="notification_settings_master_hint_off">Enable notifications</string>
-    <string name="notification_settings_master_hint_on">Disable notifications</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_status_on">On</string>
+    <string name="notification_settings_main_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
+    <string name="notification_settings_main_off_title">To receive notifications on this device, turn Notification Settings on.</string>
+    <string name="notification_settings_main_hint_off">Enable notifications</string>
+    <string name="notification_settings_main_hint_on">Disable notifications</string>
+    <string name="notification_settings_main_status_off">Off</string>
     <string name="max_video_resolution">Maximum Video Size</string>
+    <string name="notification_settings_main_status_on">On</string>
     <string name="max_thumbnail_px_size">Maximum Image Size</string>
     <string name="error_upload_post_media_param">There was an error uploading the media in this post: %s.</string>
     <string name="error_upload_post_param">There was an error uploading this post: %s.</string>
@@ -1583,19 +1953,17 @@ Language: en_CA
     <string name="login_site_address_more_help">Need more help?</string>
     <string name="login_site_address_help_content">Your site address appears in the bar at the top of the screen when you visit your site in Chrome.</string>
     <string name="login_site_address_help_title">What\'s my site address?</string>
-    <string name="login_site_address_help">Need help finding your site address?</string>
     <string name="login_site_address">Site address</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
     <string name="login_continue">Continue</string>
-    <string name="connect_more">Connect another site</string>
     <string name="enter_wpcom_password">Enter your WordPress.com password.</string>
+    <string name="connect_more">Connect another site</string>
     <string name="login_magic_link_email_requesting">Requesting log-in email</string>
     <string name="password_incorrect">It looks like this password is incorrect. Please double check your information and try again.</string>
     <string name="requesting_otp">Requesting a verification code via SMS.</string>
     <string name="login_text_otp">Text me a code instead</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
-    <string name="open_mail">Open mail</string>
     <string name="next">Next</string>
     <string name="enter_email_wordpress_com">Log in to WordPress.com using an email address to manage all your WordPress sites.</string>
     <string name="image_optimization_promo_desc">Image optimization shrinks images for quicker uploading.\n\nYou can change this any time in site settings.</string>
@@ -1618,10 +1986,6 @@ Language: en_CA
     <string name="post_status_draft">Draft</string>
     <string name="post_status_pending_review">Pending review</string>
     <string name="post_status_publish_post">Publish</string>
-    <string name="change_location">Change Location</string>
-    <string name="remove_location">Remove Location</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Can\'t open the Location Picker, Google Play Services is not available</string>
-    <string name="post_settings_location">Location</string>
     <string name="now">Now</string>
     <string name="post_settings_password_dialog_hint">Only those with this password can view this post</string>
     <string name="post_settings_excerpt_dialog_hint">Excerpts are optional hand-crafted summaries of your content.</string>
@@ -1751,11 +2115,11 @@ Language: en_CA
     <string name="media_encoder_quality_85">Medium</string>
     <string name="media_encoder_quality_80">Low</string>
     <string name="media_upload_state_uploaded">Uploaded</string>
-    <string name="media_upload_state_failed">Upload Failed</string>
     <string name="media_upload_state_deleted">Deleted</string>
     <string name="media_upload_state_deleting">Deleting</string>
     <string name="media_upload_state_uploading">Uploading</string>
     <string name="media_upload_state_queued">Queued</string>
+    <string name="media_upload_state_failed">Upload Failed</string>
     <string name="image_quality">Image Quality</string>
     <string name="error_all_media_upload_canceled">All media uploads have been cancelled due to an unknown error. Please retry uploading</string>
     <string name="error_unknown_post_type">Unknown post format</string>
@@ -1805,7 +2169,7 @@ Language: en_CA
     <string name="signout">Log out</string>
     <string name="sign_in_wpcom">Log in to WordPress.com</string>
     <string name="reader_label_global_related_posts">More on WordPress.com</string>
-    <string name="reader_label_local_related_posts">More in %s</string>
+    <string name="reader_label_local_related_posts">More from %s</string>
     <string name="preference_open_device_settings">Open device settings</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
@@ -1815,88 +2179,83 @@ Language: en_CA
     <string name="comment_moderated_approved">Comment approved!</string>
     <string name="like">Like</string>
     <string name="timespan_now">now</string>
-    <string name="role_viewer">Viewer</string>
     <string name="role_follower">Follower</string>
+    <string name="role_viewer">Viewer</string>
     <string name="error_post_my_profile_no_connection">No connection, couldn\'t save your profile</string>
-    <string name="alignment_right">Right</string>
-    <string name="alignment_left">Left</string>
     <string name="alignment_none">None</string>
+    <string name="alignment_left">Left</string>
+    <string name="alignment_right">Right</string>
     <string name="site_settings_list_editor_action_mode_title">Selected %1$d</string>
     <string name="error_fetch_users_list">Couldn\'t retrieve site users</string>
-    <string name="title_email_follower">Email Follower</string>
     <string name="title_follower">Follower</string>
+    <string name="title_email_follower">Email Follower</string>
     <string name="people_fetching">Fetching users…</string>
-    <string name="people_dropdown_item_viewers">Viewers</string>
     <string name="people_dropdown_item_email_followers">Email Followers</string>
+    <string name="people_dropdown_item_viewers">Viewers</string>
     <string name="people_dropdown_item_followers">Followers</string>
     <string name="people_dropdown_item_team">Team</string>
     <string name="invite_message_usernames_limit">Invite up to 10 email addresses and/or WordPress.com usernames. Those needing a username will be sent instructions on how to create one.</string>
     <string name="viewer_remove_confirmation_message">If you remove this viewer, he or she will not be able to visit this site.\n\nWould you still like to remove this viewer?</string>
     <string name="follower_remove_confirmation_message">If removed, this follower will stop receiving notifications about this site, unless they re-follow.\n\nWould you still like to remove this follower?</string>
     <string name="follower_subscribed_since">Since %1$s</string>
-    <string name="error_remove_viewer">Couldn\'t remove viewer</string>
     <string name="error_remove_follower">Couldn\'t remove follower</string>
+    <string name="error_remove_viewer">Couldn\'t remove viewer</string>
     <string name="error_fetch_email_followers_list">Couldn\'t retrieve site email followers</string>
     <string name="error_fetch_followers_list">Couldn\'t retrieve site followers</string>
     <string name="editor_failed_uploads_switch_html">Some media uploads have failed. You can\'t switch to HTML mode\n        in this state. Remove all failed uploads and continue?</string>
-    <string name="image_width">Width</string>
-    <string name="image_link_to">Link to</string>
-    <string name="image_caption">Caption</string>
     <string name="image_settings_save_toast">Changes saved</string>
+    <string name="image_caption">Caption</string>
+    <string name="image_link_to">Link to</string>
+    <string name="image_width">Width</string>
     <string name="image_settings_dismiss_dialog_title">Discard unsaved changes?</string>
     <string name="stop_upload_dialog_title">Stop uploading?</string>
-    <string name="tap_to_try_again">Tap to try again!</string>
     <string name="invite_sent">Invite sent successfully</string>
-    <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="tap_to_try_again">Tap to try again!</string>
     <string name="invite_error_some_failed">Invite sent but error(s) occurred!</string>
+    <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_sending">An error occurred while trying to send the invite!</string>
     <string name="invite_error_invalid_usernames_multiple">Cannot send: There are invalid usernames or emails</string>
     <string name="invite_error_invalid_usernames_one">Cannot send: A username or email is invalid</string>
     <string name="invite_error_no_usernames">Please add at least one username</string>
-    <string name="invite_message_info">(Optional) You can enter a custom message of up to 500 characters that will be included in the invitation to the user(s).</string>
-    <string name="invite_message_remaining_other">%d characters remaining</string>
-    <string name="invite_message_remaining_one">1 character remaining</string>
-    <string name="invite_message_remaining_zero">0 characters remaining</string>
-    <string name="invite_message_title">Custom Message</string>
+    <string name="invite_message_title">Custom message</string>
     <string name="invite">Invite</string>
-    <string name="invite_names_title">Usernames or Emails</string>
-    <string name="invite_people">Invite People</string>
+    <string name="invite_names_title">Usernames or emails</string>
     <string name="my_site_header_external">External</string>
-    <string name="send_link">Send link</string>
+    <string name="invite_people">Invite People</string>
     <string name="label_clear_search_history">Clear search history</string>
     <string name="dlg_confirm_clear_search_history">Clear search history?</string>
     <string name="reader_empty_search_description">No results found for %s for your language</string>
     <string name="reader_hint_post_search">Search WordPress</string>
+    <string name="reader_title_related_post_detail">Related Post</string>
     <string name="preview_screen_links_disabled">Links are disabled on the preview screen</string>
     <string name="send">Send</string>
-    <string name="person_removed">Successfully removed %1$s</string>
     <string name="user_remove_confirmation_message">If you remove %1$s, that user will no longer be able to access this site, but any content that was created by %1$s will remain on the site.\n\nWould you still like to remove this user?</string>
+    <string name="person_removed">Successfully removed %1$s</string>
     <string name="person_remove_confirmation_title">Remove %1$s</string>
-    <string name="role">Role</string>
-    <string name="people">People</string>
     <string name="reader_empty_posts_in_custom_list">The sites in this list haven\'t posted anything recently</string>
+    <string name="people">People</string>
+    <string name="role">Role</string>
     <string name="error_remove_user">Couldn\'t remove user</string>
     <string name="error_update_role">Couldn\'t update user role</string>
     <string name="error_fetch_viewers_list">Couldn\'t retrieve site viewers</string>
     <string name="error_updating_gravatar">Error updating your Gravatar</string>
-    <string name="error_refreshing_gravatar">Error reloading your Gravatar</string>
     <string name="error_locating_image">Error locating the cropped image</string>
+    <string name="error_refreshing_gravatar">Error reloading your Gravatar</string>
     <string name="error_cropping_image">Error cropping the image</string>
     <string name="checking_email">Checking email</string>
     <string name="magic_link_unavailable_error_message">Currently unavailable. Please enter your password</string>
     <string name="logging_in">Logging in</string>
-    <string name="enter_your_password_instead">Enter your password instead</string>
     <string name="web_address_dialog_hint">Shown publicly when you comment.</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
-    <string name="plans">Plans</string>
-    <string name="plan">Plan</string>
     <string name="export_your_content_message">Your posts, pages, and settings will be emailed to you at %s.</string>
+    <string name="plan">Plan</string>
+    <string name="plans">Plans</string>
     <string name="export_your_content">Export your content</string>
-    <string name="export_email_sent">Export email sent!</string>
     <string name="exporting_content_progress">Exporting content…</string>
-    <string name="checking_purchases">Checking purchases</string>
-    <string name="show_purchases">Show purchases</string>
+    <string name="export_email_sent">Export email sent!</string>
     <string name="premium_upgrades_message">You have active premium upgrades on your site. Please cancel your upgrades prior to deleting your site.</string>
+    <string name="show_purchases">Show purchases</string>
+    <string name="checking_purchases">Checking purchases</string>
     <string name="premium_upgrades_title">Premium Upgrades</string>
     <string name="purchases_request_error">Something went wrong. Could not request purchases.</string>
     <string name="delete_site_progress">Deleting site…</string>
@@ -1905,49 +2264,49 @@ Language: en_CA
     <string name="primary_domain">Primary Domain</string>
     <string name="error_deleting_site_summary">There was an error in deleting your site. Please contact support for more assistance.</string>
     <string name="error_deleting_site">Error deleting site</string>
-    <string name="site_settings_export_content_title">Export content</string>
     <string name="confirm_delete_site_prompt">Please type in %1$s in the field below to confirm. Your site will then be gone forever.</string>
+    <string name="site_settings_export_content_title">Export content</string>
     <string name="confirm_delete_site">Confirm Delete Site</string>
     <string name="contact_support">Contact Support</string>
     <string name="start_over_text">If you want a site but don\'t want any of the posts and pages you have now, our support team can delete your posts, pages, media and comments for you.\n\nThis will keep your site and URL active, but give you a fresh start on your content creation. Just contact us to have your current content cleared out.</string>
-    <string name="let_us_help">Let Us Help</string>
     <string name="site_settings_start_over_hint">Start your site over</string>
-    <string name="start_over">Start Over</string>
+    <string name="let_us_help">Let Us Help</string>
     <string name="me_btn_app_settings">App Settings</string>
+    <string name="start_over">Start Over</string>
     <string name="editor_remove_failed_uploads">Remove failed uploads</string>
     <string name="site_settings_advanced_header">Advanced</string>
     <string name="comments_empty_list_filtered_trashed">No trashed comments</string>
     <string name="comments_empty_list_filtered_pending">No pending comments</string>
     <string name="comments_empty_list_filtered_approved">No approved comments</string>
     <string name="xmlrpc_missing_method_error">Couldn\'t connect. Required XML-RPC methods are missing on the server.</string>
-    <string name="alignment_center">Centre</string>
-    <string name="post_format_video">Video</string>
     <string name="post_format_status">Status</string>
-    <string name="post_format_standard">Standard</string>
-    <string name="post_format_quote">Quote</string>
-    <string name="post_format_link">Link</string>
-    <string name="post_format_image">Image</string>
-    <string name="post_format_gallery">Gallery</string>
+    <string name="post_format_video">Video</string>
+    <string name="alignment_center">Centre</string>
     <string name="post_format_chat">Chat</string>
-    <string name="post_format_audio">Audio</string>
-    <string name="post_format_aside">Aside</string>
+    <string name="post_format_gallery">Gallery</string>
+    <string name="post_format_image">Image</string>
+    <string name="post_format_link">Link</string>
+    <string name="post_format_quote">Quote</string>
+    <string name="post_format_standard">Standard</string>
     <string name="notif_events">Information on WordPress.com courses and events (online &amp; in-person).</string>
+    <string name="post_format_aside">Aside</string>
+    <string name="post_format_audio">Audio</string>
     <string name="notif_surveys">Opportunities to participate in WordPress.com research &amp; surveys.</string>
     <string name="notif_tips">Tips for getting the most out of WordPress.com.</string>
     <string name="notif_community">Community</string>
-    <string name="notif_research">Research</string>
-    <string name="notif_suggestions">Suggestions</string>
     <string name="replies_to_my_comments">Replies to my comments</string>
-    <string name="username_mentions">Username mentions</string>
+    <string name="notif_suggestions">Suggestions</string>
+    <string name="notif_research">Research</string>
     <string name="site_achievements">Site achievements</string>
-    <string name="site_follows">Site follows</string>
+    <string name="username_mentions">Username mentions</string>
     <string name="likes_on_my_posts">Likes on my posts</string>
+    <string name="site_follows">Site follows</string>
     <string name="likes_on_my_comments">Likes on my comments</string>
     <string name="comments_on_my_site">Comments on my site</string>
     <string name="site_settings_list_editor_summary_other">%d items</string>
     <string name="site_settings_list_editor_summary_one">1 item</string>
-    <string name="approve_auto">All users</string>
     <string name="approve_auto_if_previously_approved">Known users\' comments</string>
+    <string name="approve_auto">All users</string>
     <string name="approve_manual">No comments</string>
     <string name="site_settings_paging_summary_other">%d comments per page</string>
     <string name="site_settings_paging_summary_one">1 comment per page</string>
@@ -1957,11 +2316,11 @@ Language: en_CA
     <string name="detail_approve_auto">Automatically approve everyone\'s comments.</string>
     <string name="detail_approve_auto_if_previously_approved">Automatically approve if the user has a previously approved comment</string>
     <string name="detail_approve_manual">Require manual approval for everyone\'s comments.</string>
-    <string name="days_quantity_other">%d days</string>
     <string name="days_quantity_one">1 day</string>
-    <string name="web_address">Web address</string>
-    <string name="primary_site">Primary site</string>
+    <string name="days_quantity_other">%d days</string>
     <string name="pending_email_change_snackbar">Click the verification link in the email sent to %1$s to confirm your new address</string>
+    <string name="primary_site">Primary site</string>
+    <string name="web_address">Web address</string>
     <string name="editor_toast_uploading_please_wait">You are currently uploading media. Please wait until this completes.</string>
     <string name="error_refresh_comments_showing_older">Comments couldn\'t be refreshed at this time - showing older comments</string>
     <string name="post_settings_set_featured_image">Set Featured Image</string>
@@ -1970,13 +2329,13 @@ Language: en_CA
     <string name="dlg_sure_to_delete_comments">Permanently delete these comments?</string>
     <string name="dlg_sure_to_delete_comment">Permanently delete this comment?</string>
     <string name="mnu_comment_delete_permanently">Delete</string>
-    <string name="mnu_comment_untrash">Restore</string>
     <string name="comment_deleted_permanently">Comment deleted</string>
+    <string name="mnu_comment_untrash">Restore</string>
     <string name="comments_empty_list_filtered_spam">No spam comments</string>
-    <string name="comment_status_all">All</string>
     <string name="could_not_load_page">Could not load page</string>
-    <string name="off">Off</string>
+    <string name="comment_status_all">All</string>
     <string name="interface_language">Interface Language</string>
+    <string name="off">Off</string>
     <string name="about_the_app">About the app</string>
     <string name="error_post_account_settings">Couldn\'t save your account settings</string>
     <string name="error_fetch_account_settings">Couldn\'t retrieve your account settings</string>
@@ -1984,20 +2343,20 @@ Language: en_CA
     <string name="site_settings_unknown_language_code_error">Language code not recognised</string>
     <string name="site_settings_threading_dialog_description">Allow comments to be nested in threads.</string>
     <string name="site_settings_threading_dialog_header">Thread up to</string>
-    <string name="disabled">Disabled</string>
-    <string name="search">Search</string>
     <string name="remove">Remove</string>
+    <string name="search">Search</string>
+    <string name="disabled">Disabled</string>
     <string name="site_settings_image_original_size">Original Size</string>
     <string name="privacy_private">Your site is visible only to you and users you approve</string>
     <string name="privacy_public_not_indexed">Your site is visible to everyone but asks search engines not to index it</string>
     <string name="privacy_public">Your site is visible to everyone and may be indexed by search engines</string>
     <string name="about_me_hint">A few words about you…</string>
-    <string name="about_me">About me</string>
     <string name="public_display_name_hint">Display name will default to your username if it is not set</string>
+    <string name="about_me">About me</string>
     <string name="public_display_name">Public display name</string>
-    <string name="last_name">Last name</string>
-    <string name="first_name">First name</string>
     <string name="my_profile">My Profile</string>
+    <string name="first_name">First name</string>
+    <string name="last_name">Last name</string>
     <string name="cd_related_post_preview_image">Related post preview image</string>
     <string name="error_post_remote_site_settings">Couldn\'t save site info</string>
     <string name="error_fetch_remote_site_settings">Couldn\'t retrieve site info</string>
@@ -2006,7 +2365,7 @@ Language: en_CA
     <string name="site_settings_paging_dialog_description">Break comment threads into multiple pages.</string>
     <string name="site_settings_paging_dialog_header">Comments per page</string>
     <string name="site_settings_close_after_dialog_title">Close commenting</string>
-    <string name="site_settings_blacklist_description">When a comment contains any of these words in its content, name, URL, email, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+    <string name="site_settings_denylist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
     <string name="site_settings_list_editor_no_items_text">No items</string>
@@ -2021,10 +2380,10 @@ Language: en_CA
     <string name="site_settings_rp_show_header_title">Show Header</string>
     <string name="site_settings_rp_switch_summary">Related Posts displays relevant content from your site below your posts.</string>
     <string name="site_settings_rp_switch_title">Show Related Posts</string>
-    <string name="site_settings_blacklist_hint">Comments that match a filter are marked as spam</string>
+    <string name="site_settings_denylist_hint">Comments that match a filter are marked as spam</string>
     <string name="site_settings_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
     <string name="site_settings_multiple_links_hint">Ignores link limit from known users</string>
-    <string name="site_settings_whitelist_hint">Comment author must have a previously approved comment</string>
+    <string name="site_settings_allowlist_hint">Comment author must have a previously approved comment</string>
     <string name="site_settings_user_account_required_hint">Users must be registered and logged in to comment</string>
     <string name="site_settings_identity_required_hint">Comment author must fill out name and e-mail</string>
     <string name="site_settings_paging_hint">Display comments in chunks of a specified size</string>
@@ -2047,19 +2406,18 @@ Language: en_CA
     <string name="site_settings_address_hint">Changing your address is not currently supported</string>
     <string name="site_settings_tagline_hint">A short description or catchy phrase to describe your blog</string>
     <string name="site_settings_title_hint">In a few words, explain what this site is about</string>
-    <string name="site_settings_whitelist_known_summary">Comments from known users</string>
-    <string name="site_settings_whitelist_all_summary">Comments from all users</string>
+    <string name="site_settings_allowlist_known_summary">Comments from known users</string>
+    <string name="site_settings_allowlist_all_summary">Comments from all users</string>
     <string name="site_settings_threading_summary">%d levels</string>
     <string name="site_settings_privacy_private_summary">Private</string>
     <string name="site_settings_privacy_hidden_summary">Hidden</string>
-    <string name="site_settings_privacy_public_summary">Public</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
+    <string name="site_settings_privacy_public_summary">Public</string>
     <string name="site_settings_moderation_hold_title">Hold for Moderation</string>
     <string name="site_settings_multiple_links_title">Links in comments</string>
-    <string name="site_settings_whitelist_title">Automatically approve</string>
-    <string name="site_settings_paging_title">Paging</string>
+    <string name="site_settings_allowlist_title">Automatically approve</string>
     <string name="site_settings_threading_title">Threading</string>
+    <string name="site_settings_paging_title">Paging</string>
     <string name="site_settings_sort_by_title">Sort by</string>
     <string name="site_settings_account_required_title">Users must be logged in</string>
     <string name="site_settings_identity_required_title">Must include name and email</string>
@@ -2069,22 +2427,22 @@ Language: en_CA
     <string name="site_settings_default_format_title">Default Format</string>
     <string name="site_settings_default_category_title">Default Category</string>
     <string name="site_settings_address_title">Address</string>
-    <string name="site_settings_tagline_title">Tagline</string>
     <string name="site_settings_title_title">Site Title</string>
+    <string name="site_settings_tagline_title">Tagline</string>
     <string name="site_settings_discussion_new_posts_header">Defaults for new posts</string>
-    <string name="site_settings_writing_header">Writing</string>
     <string name="site_settings_account_header">Account</string>
-    <string name="site_settings_general_header">General</string>
+    <string name="site_settings_writing_header">Writing</string>
     <string name="newest_first">Newest first</string>
-    <string name="oldest_first">Oldest first</string>
-    <string name="close_after">Close after</string>
-    <string name="comments">Comments</string>
-    <string name="related_posts">Related Posts</string>
-    <string name="privacy">Privacy</string>
+    <string name="site_settings_general_header">General</string>
     <string name="discussion">Discussion</string>
+    <string name="privacy">Privacy</string>
+    <string name="related_posts">Related Posts</string>
+    <string name="comments">Comments</string>
+    <string name="close_after">Close after</string>
+    <string name="oldest_first">Oldest first</string>
     <string name="media_error_no_permission_upload">You don\'t have permission to upload media to the site</string>
-    <string name="unknown">Unknown</string>
     <string name="never">Never</string>
+    <string name="unknown">Unknown</string>
     <string name="reader_err_get_post_not_found">This post no longer exists</string>
     <string name="reader_err_get_post_not_authorized">You\'re not authorized to view this post</string>
     <string name="reader_err_get_post_generic">Unable to retrieve this post</string>
@@ -2096,22 +2454,22 @@ Language: en_CA
     <string name="theme_activation_error">Something went wrong. Could not activate theme</string>
     <string name="theme_by_author_prompt_append"> by %1$s</string>
     <string name="theme_prompt">Thanks for choosing %1$s</string>
-    <string name="theme_manage_site">MANAGE SITE</string>
-    <string name="theme_done">DONE</string>
-    <string name="theme_support">Support</string>
-    <string name="theme_details">Details</string>
     <string name="theme_view">View</string>
+    <string name="theme_details">Details</string>
+    <string name="theme_support">Support</string>
+    <string name="theme_done">DONE</string>
+    <string name="theme_manage_site">MANAGE SITE</string>
     <string name="theme_try_and_customize">Try &amp; Customize</string>
     <string name="theme_activate">Activate</string>
-    <string name="active">Active</string>
-    <string name="support">Support</string>
+    <string name="current_theme">Current Theme</string>
     <string name="details">Details</string>
+    <string name="support">Support</string>
+    <string name="active">Active</string>
     <string name="customize">Customize</string>
-    <string name="current_theme">Current Theme</string>
-    <string name="page_updated">Page updated</string>
-    <string name="post_updated">Post updated</string>
-    <string name="page_published">Page published</string>
     <string name="post_published">Post published</string>
+    <string name="page_published">Page published</string>
+    <string name="post_updated">Post updated</string>
+    <string name="page_updated">Page updated</string>
     <string name="theme_no_search_result_found">Sorry, no themes found.</string>
     <string name="reader_label_gap_marker">Load more posts</string>
     <string name="notifications_no_search_results">No sites matched \'%s\'</string>
@@ -2134,6 +2492,7 @@ Language: en_CA
     <string name="reader_short_like_count_one">1 Like</string>
     <string name="reader_short_like_count_none">Like</string>
     <string name="reader_label_follow_count">%,d Followers</string>
+    <string name="reader_menu_tags">Edit topics and sites</string>
     <string name="reader_title_post_detail">Reader Post</string>
     <string name="notifications_push_summary">Settings for notifications that appear on your device.</string>
     <string name="notifications_email_summary">Settings for notifications that are sent to the email tied to your account.</string>
@@ -2143,281 +2502,286 @@ Language: en_CA
     <string name="error_loading_notifications">Couldn\'t load notification settings</string>
     <string name="comment_likes">Comment likes</string>
     <string name="app_notifications">App notifications</string>
-    <string name="email">Email</string>
     <string name="notifications_tab">Notifications tab</string>
+    <string name="email">Email</string>
     <string name="notification_settings_item_other_account_emails_summary">We\'ll always send important emails regarding your account, but you can get some helpful extras, too.</string>
     <string name="stats_insights_latest_post_summary">Latest Post Summary</string>
     <string name="connectionbar_no_connection">No connection</string>
-    <string name="post_trashed">Post sent to trash</string>
-    <string name="button_trash">Trash</string>
     <string name="button_stats">Stats</string>
     <string name="button_preview">Preview</string>
     <string name="button_view">View</string>
-    <string name="button_publish">Publish</string>
     <string name="button_edit">Edit</string>
+    <string name="button_publish">Publish</string>
+    <string name="post_trashed">Post sent to trash</string>
+    <string name="button_trash">Trash</string>
     <string name="reader_toast_err_follow_blog_not_authorized">You are not authorized to access this site</string>
     <string name="reader_toast_err_follow_blog_not_found">This site could not be found</string>
     <string name="undo">Undo</string>
     <string name="push_auth_expired">The request has expired. Log in to WordPress.com to try again.</string>
-    <string name="ignore">Ignore</string>
     <string name="stats_insights_best_ever">Best Views Ever</string>
+    <string name="ignore">Ignore</string>
     <string name="stats_insights_today">Today\'s Stats</string>
     <string name="stats_insights_all_time">All-time posts, views, and visitors</string>
     <string name="stats_insights">Insights</string>
     <string name="me_disconnect_from_wordpress_com">Log out of WordPress.com</string>
-    <string name="me_connect_to_wordpress_com">Log in to WordPress.com</string>
     <string name="me_btn_login_logout">Login/Logout</string>
+    <string name="me_connect_to_wordpress_com">Log in to WordPress.com</string>
     <string name="me_btn_support">Help &amp; Support</string>
-    <string name="account_settings">Account Settings</string>
     <string name="site_picker_cant_hide_current_site">\"%s\" wasn\'t hidden because it\'s the current site</string>
+    <string name="account_settings">Account Settings</string>
     <string name="site_picker_create_wpcom">Create WordPress.com site</string>
     <string name="site_picker_add_self_hosted">Add self-hosted site</string>
-    <string name="site_picker_add_site">Add new site</string>
     <string name="site_picker_edit_visibility">Show/hide sites</string>
-    <string name="site_picker_title">Choose site</string>
-    <string name="my_site_btn_view_site">View Site</string>
+    <string name="site_picker_add_site">Add new site</string>
     <string name="my_site_btn_view_admin">View Admin</string>
+    <string name="my_site_btn_view_site">View Site</string>
+    <string name="site_picker_title">Choose site</string>
     <string name="my_site_btn_switch_site">Switch Site</string>
-    <string name="my_site_btn_site_settings">Settings</string>
     <string name="my_site_btn_blog_posts">Blog Posts</string>
-    <string name="my_site_header_publish">Publish</string>
+    <string name="my_site_btn_site_settings">Settings</string>
     <string name="my_site_header_look_and_feel">Look and Feel</string>
+    <string name="my_site_header_publish">Publish</string>
     <string name="my_site_header_configuration">Configuration</string>
     <string name="reader_label_new_posts_subtitle">Tap to show them</string>
     <string name="deselect_all">Deselect all</string>
-    <string name="select_all">Select all</string>
-    <string name="hide">Hide</string>
     <string name="show">Show</string>
-    <string name="auth_required">Log in again to continue.</string>
-    <string name="invalid_verification_code">Invalid verification code</string>
-    <string name="verification_code">Verification code</string>
+    <string name="hide">Hide</string>
+    <string name="select_all">Select all</string>
     <string name="language">Language</string>
+    <string name="verification_code">Verification code</string>
+    <string name="invalid_verification_code">Invalid verification code</string>
+    <string name="auth_required">Log in again to continue.</string>
+    <string name="stats_view_authors">Authors</string>
     <string name="reader_empty_posts_request_failed">Unable to retrieve posts</string>
     <string name="publisher">Publisher:</string>
     <string name="error_notification_open">Could not open notification</string>
     <string name="stats_search_terms_unknown_search_terms">Unknown Search Terms</string>
     <string name="stats_view_search_terms">Search Terms</string>
-    <string name="stats_view_authors">Authors</string>
     <string name="comments_fetching">Fetching comments…</string>
     <string name="pages_fetching">Fetching pages…</string>
     <string name="posts_fetching">Fetching posts…</string>
     <string name="media_fetching">Fetching media…</string>
     <string name="logs_copied_to_clipboard">Application logs have been copied to the clipboard</string>
-    <string name="reader_empty_posts_in_blog">This site is empty</string>
     <string name="reader_label_new_posts">New posts</string>
-    <string name="reader_page_recommended_blogs">Sites you may like</string>
     <string name="error_copy_to_clipboard">An error occurred while copying text to clipboard</string>
     <string name="post_uploading">Uploading post</string>
-    <string name="stats_followers_years">%1$d years</string>
-    <string name="stats_followers_a_year">A year</string>
+    <string name="reader_empty_posts_in_blog">This site is empty</string>
+    <string name="themes_fetching">Fetching themes…</string>
     <string name="stats_followers_months">%1$d months</string>
+    <string name="stats_followers_a_year">A year</string>
+    <string name="stats_followers_years">%1$d years</string>
     <string name="stats_followers_a_month">A month</string>
-    <string name="stats_followers_days">%1$d days</string>
-    <string name="stats_followers_a_day">A day</string>
-    <string name="stats_followers_hours">%1$d hours</string>
-    <string name="stats_followers_an_hour_ago">an hour ago</string>
     <string name="stats_followers_minutes">%1$d minutes</string>
+    <string name="stats_followers_an_hour_ago">an hour ago</string>
+    <string name="stats_followers_hours">%1$d hours</string>
+    <string name="stats_followers_a_day">A day</string>
+    <string name="stats_followers_days">%1$d days</string>
     <string name="stats_followers_a_minute_ago">a minute ago</string>
     <string name="stats_followers_seconds_ago">seconds ago</string>
-    <string name="stats_view_followers">Followers</string>
-    <string name="stats_view_publicize">Publicize</string>
-    <string name="stats_view_videos">Videos</string>
     <string name="stats_view_top_posts_and_pages">Posts &amp; Pages</string>
+    <string name="stats_view_videos">Videos</string>
+    <string name="stats_view_followers">Followers</string>
     <string name="stats_view_countries">Countries</string>
     <string name="stats_likes">Likes</string>
-    <string name="stats_visitors">Visitors</string>
-    <string name="stats_views">Views</string>
     <string name="stats_timeframe_years">Years</string>
-    <string name="themes_fetching">Fetching themes…</string>
+    <string name="stats_views">Views</string>
+    <string name="stats_visitors">Visitors</string>
+    <string name="stats_view_publicize">Publicize</string>
     <string name="ssl_certificate_details">Details</string>
     <string name="cab_selected">%d selected</string>
+    <string name="error_refresh_unauthorized_posts">You don\'t have permission to view or edit posts</string>
+    <string name="error_refresh_unauthorized_pages">You don\'t have permission to view or edit pages</string>
+    <string name="error_refresh_unauthorized_comments">You don\'t have permission to view or edit comments</string>
     <string name="browse_our_faq_button">Browse our FAQ</string>
     <string name="reader_empty_comments">No comments yet</string>
-    <string name="reader_label_like">Like</string>
     <string name="reader_label_view_original">View original article</string>
+    <string name="reader_label_like">Like</string>
     <string name="reader_label_comments_closed">Comments are closed</string>
     <string name="reader_title_photo_viewer">%1$d of %2$d</string>
     <string name="error_publish_empty_post">Can\'t publish an empty post</string>
-    <string name="error_refresh_unauthorized_posts">You don\'t have permission to view or edit posts</string>
-    <string name="error_refresh_unauthorized_pages">You don\'t have permission to view or edit pages</string>
-    <string name="error_refresh_unauthorized_comments">You don\'t have permission to view or edit comments</string>
-    <string name="more">More</string>
     <string name="older_month">Older than a month</string>
-    <string name="older_last_week">Older than a week</string>
+    <string name="more">More</string>
     <string name="older_two_days">Older than 2 days</string>
+    <string name="older_last_week">Older than a week</string>
     <string name="mnu_comment_liked">Liked</string>
     <string name="comment">Comment</string>
-    <string name="comment_trashed">Comment trashed</string>
-    <string name="comment_reply_to_user">Reply to %s</string>
     <string name="posts_empty_list">No posts yet. Why not create one?</string>
+    <string name="comment_reply_to_user">Reply to %s</string>
+    <string name="comment_trashed">Comment trashed</string>
     <string name="signing_out">Logging out…</string>
+    <string name="reader_empty_posts_in_tag">No posts with this topic</string>
     <string name="reader_toast_err_generic">Unable to perform this action</string>
     <string name="reader_toast_err_block_blog">Unable to block this site</string>
     <string name="reader_toast_blog_blocked">Posts from this site will no longer be shown</string>
     <string name="reader_menu_block_blog">Block this site</string>
-    <string name="schedule_verb">Schedule</string>
     <string name="update_verb">Update</string>
-    <string name="reader_empty_recommended_blogs">No recommended sites</string>
-    <string name="reader_toast_err_unfollow_blog">Unable to unfollow this site</string>
-    <string name="reader_toast_err_follow_blog">Unable to follow this site</string>
-    <string name="reader_toast_err_already_follow_blog">You already follow this site</string>
-    <string name="reader_toast_err_get_blog_info">Unable to show this site</string>
-    <string name="reader_label_followed_blog">Site followed</string>
+    <string name="schedule_verb">Schedule</string>
     <string name="reader_page_followed_blogs">Followed sites</string>
     <string name="reader_title_blog_preview">Reader Site</string>
-    <string name="ssl_certificate_ask_trust">If you usually connect to this site without problems, this error could mean that someone is trying to impersonate the site, and you shouldn\'t continue. Would you like to trust the certificate anyway?</string>
-    <string name="ssl_certificate_error">Invalid SSL certificate</string>
-    <string name="forgot_password">Lost your password?</string>
+    <string name="reader_label_followed_blog">Site followed</string>
+    <string name="reader_toast_err_get_blog_info">Unable to show this site</string>
+    <string name="reader_toast_err_already_follow_blog">You already follow this site</string>
+    <string name="reader_toast_err_follow_blog">Unable to follow this site</string>
+    <string name="reader_toast_err_unfollow_blog">Unable to unfollow this site</string>
+    <string name="reader_empty_recommended_blogs">No recommended sites</string>
+    <string name="reader_page_followed_tags">Followed topics</string>
+    <string name="reader_hint_add_tag_or_url">Enter a URL or topic to follow</string>
     <string name="help">Help</string>
-    <string name="username_or_password_incorrect">The username or password you entered is incorrect</string>
-    <string name="email_invalid">Enter a valid email address</string>
-    <string name="invalid_email_message">Your email address isn\'t valid</string>
-    <string name="error_downloading_image">Error downloading image</string>
-    <string name="error_load_comment">Couldn\'t load the comment</string>
-    <string name="error_edit_comment">An error occurred while editing the comment</string>
-    <string name="error_moderate_comment">An error occurred while moderating</string>
-    <string name="error_generic">An error occurred</string>
-    <string name="error_refresh_comments">Comments couldn\'t be refreshed at this time</string>
-    <string name="error_refresh_pages">Pages couldn\'t be refreshed at this time</string>
+    <string name="ssl_certificate_error">Invalid SSL certificate</string>
+    <string name="ssl_certificate_ask_trust">If you usually connect to this site without problems, this error could mean that someone is trying to impersonate the site, and you shouldn\'t continue. Would you like to trust the certificate anyway?</string>
+    <string name="no_network_message">There is no network available</string>
+    <string name="gallery_error">The media item couldn\'t be retrieved</string>
+    <string name="blog_not_found">An error occurred when accessing this blog</string>
+    <string name="theme_fetch_failed">Failed to fetch themes</string>
+    <string name="mnu_comment_unspam">Not spam</string>
+    <string name="adding_cat_failed">Adding category failed</string>
+    <string name="adding_cat_success">Category added successfully</string>
+    <string name="cat_name_required">The category name field is required</string>
+    <string name="sdcard_message">A mounted SD card is required to upload media</string>
+    <string name="notifications_empty_list">No notifications</string>
     <string name="error_refresh_posts">Posts couldn\'t be refreshed at this time</string>
+    <string name="error_refresh_pages">Pages couldn\'t be refreshed at this time</string>
+    <string name="error_refresh_comments">Comments couldn\'t be refreshed at this time</string>
+    <string name="error_generic">An error occurred</string>
+    <string name="error_moderate_comment">An error occurred while moderating</string>
+    <string name="error_edit_comment">An error occurred while editing the comment</string>
+    <string name="error_load_comment">Couldn\'t load the comment</string>
+    <string name="error_downloading_image">Error downloading image</string>
+    <string name="invalid_email_message">Your email address isn\'t valid</string>
+    <string name="email_invalid">Enter a valid email address</string>
+    <string name="username_or_password_incorrect">The username or password you entered is incorrect</string>
     <string name="error_deleting_post">An error occurred while deleting the post</string>
-    <string name="notifications_empty_list">No notifications</string>
-    <string name="sdcard_message">A mounted SD card is required to upload media</string>
-    <string name="cat_name_required">The category name field is required</string>
-    <string name="adding_cat_success">Category added successfully</string>
-    <string name="adding_cat_failed">Adding category failed</string>
-    <string name="mnu_comment_unspam">Not spam</string>
-    <string name="theme_fetch_failed">Failed to fetch themes</string>
-    <string name="blog_not_found">An error occurred when accessing this blog</string>
-    <string name="gallery_error">The media item couldn\'t be retrieved</string>
-    <string name="no_network_message">There is no network available</string>
-    <string name="reader_title_applog">Application log</string>
-    <string name="fatal_db_error">An error occurred while creating the app database. Try reinstalling the app.</string>
-    <string name="error_blog_hidden">This blog is hidden and couldn\'t be loaded. Enable it again in settings and try again.</string>
-    <string name="error_refresh_media">Media couldn\'t be refreshed at this time</string>
-    <string name="wordpress_blog">WordPress blog</string>
-    <string name="image_settings">Image settings</string>
-    <string name="local_changes">Local changes</string>
-    <string name="privacy_policy">Privacy policy</string>
-    <string name="new_media">New media</string>
-    <string name="new_post">New post</string>
+    <string name="select_categories">Select categories</string>
+    <string name="connection_error">Connection error</string>
+    <string name="cancel_edit">Cancel edit</string>
+    <string name="post_not_found">An error occurred when loading the post. Refresh your posts and try again.</string>
+    <string name="learn_more">Learn more</string>
+    <string name="media_gallery_type_thumbnail_grid">Thumbnail grid</string>
+    <string name="media_error_no_permission">You don\'t have permission to view the media library</string>
+    <string name="cannot_delete_multi_media_items">Some media can\'t be deleted at this time. Try again later.</string>
+    <string name="link_enter_url_text">Link text (optional)</string>
+    <string name="page_settings">Page settings</string>
+    <string name="local_draft">Local draft</string>
+    <string name="post_settings">Post settings</string>
+    <string name="comment_status_approved">Approved</string>
+    <string name="comment_status_unapproved">Pending</string>
+    <string name="comment_status_spam">Spam</string>
+    <string name="edit_comment">Edit comment</string>
+    <string name="mnu_comment_approve">Approve</string>
+    <string name="mnu_comment_unapprove">Unapprove</string>
+    <string name="mnu_comment_spam">Spam</string>
+    <string name="dlg_approving_comments">Approving</string>
+    <string name="dlg_unapproving_comments">Unapproving</string>
+    <string name="dlg_spamming_comments">Marking as spam</string>
+    <string name="saving_changes">Saving changes</string>
+    <string name="sure_to_cancel_edit_comment">Cancel editing this comment?</string>
+    <string name="content_required">Comment is required</string>
+    <string name="toast_comment_unedited">Comment hasn\'t changed</string>
+    <string name="remove_account">Remove site</string>
+    <string name="view_in_browser">View in browser</string>
+    <string name="add_new_category">Add new category</string>
+    <string name="category_name">Category name</string>
+    <string name="file_error_create">Couldn\'t create temp file for media upload. Make sure there is enough free space on your device.</string>
+    <string name="open_source_licenses">Open source licenses</string>
     <string name="notifications_empty_all">No notifications…yet.</string>
+    <string name="new_post">New post</string>
+    <string name="new_media">New media</string>
+    <string name="privacy_policy">Privacy policy</string>
+    <string name="local_changes">Local changes</string>
+    <string name="image_settings">Image settings</string>
+    <string name="wordpress_blog">WordPress blog</string>
+    <string name="error_blog_hidden">This blog is hidden and couldn\'t be loaded. Enable it again in settings and try again.</string>
+    <string name="fatal_db_error">An error occurred while creating the app database. Try reinstalling the app.</string>
+    <string name="reader_title_applog">Application log</string>
     <string name="http_authorization_required">Authorization required</string>
-    <string name="invalid_site_url_message">Check that the site URL entered is valid</string>
-    <string name="open_source_licenses">Open source licenses</string>
-    <string name="file_error_create">Couldn\'t create temp file for media upload. Make sure there is enough free space on your device.</string>
-    <string name="category_name">Category name</string>
-    <string name="add_new_category">Add new category</string>
-    <string name="view_in_browser">View in browser</string>
-    <string name="remove_account">Remove site</string>
-    <string name="toast_comment_unedited">Comment hasn\'t changed</string>
-    <string name="content_required">Comment is required</string>
-    <string name="sure_to_cancel_edit_comment">Cancel editing this comment?</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="trash">Trash</string>
-    <string name="dlg_confirm_trash_comments">Send to trash?</string>
-    <string name="dlg_trashing_comments">Sending to trash</string>
-    <string name="dlg_spamming_comments">Marking as spam</string>
-    <string name="dlg_unapproving_comments">Unapproving</string>
-    <string name="dlg_approving_comments">Approving</string>
-    <string name="mnu_comment_trash">Trash</string>
-    <string name="mnu_comment_spam">Spam</string>
-    <string name="mnu_comment_unapprove">Unapprove</string>
-    <string name="mnu_comment_approve">Approve</string>
-    <string name="edit_comment">Edit comment</string>
     <string name="comment_status_trash">Trashed</string>
-    <string name="comment_status_spam">Spam</string>
-    <string name="comment_status_unapproved">Pending</string>
-    <string name="comment_status_approved">Approved</string>
-    <string name="delete_page">Delete page?</string>
-    <string name="delete_post">Delete post?</string>
-    <string name="post_settings">Post settings</string>
+    <string name="mnu_comment_trash">Trash</string>
+    <string name="dlg_trashing_comments">Sending to trash</string>
+    <string name="dlg_confirm_trash_comments">Send to trash?</string>
+    <string name="trash">Trash</string>
+    <string name="invalid_site_url_message">Check that the site URL entered is valid</string>
+    <string name="error_refresh_media">Media couldn\'t be refreshed at this time</string>
     <string name="file_not_found">Couldn\'t find the file for upload. Was it deleted or moved?</string>
-    <string name="local_draft">Local draft</string>
-    <string name="page_settings">Page settings</string>
-    <string name="link_enter_url_text">Link text (optional)</string>
-    <string name="cannot_delete_multi_media_items">Some media can\'t be deleted at this time. Try again later.</string>
-    <string name="media_error_no_permission">You don\'t have permission to view the media library</string>
-    <string name="media_gallery_type_thumbnail_grid">Thumbnail grid</string>
-    <string name="learn_more">Learn more</string>
-    <string name="post_not_found">An error occurred when loading the post. Refresh your posts and try again.</string>
     <string name="plugin_not_found">An error occurred when accessing this plugin</string>
-    <string name="cancel_edit">Cancel edit</string>
-    <string name="connection_error">Connection error</string>
-    <string name="select_categories">Select categories</string>
+    <string name="delete_post">Delete post?</string>
+    <string name="delete_page">Delete page?</string>
+    <string name="reader_toast_err_add_tag">Unable to add this topic</string>
+    <string name="reader_toast_err_remove_tag">Unable to remove this topic</string>
     <string name="share_link">Share link</string>
     <string name="reader_empty_posts_in_tag_updating">Fetching posts…</string>
     <string name="reader_likes_you_and_multi">You and %,d others like this</string>
     <string name="reader_likes_multi">%,d people like this</string>
     <string name="reader_label_reply">Reply</string>
-    <string name="cant_share_no_visible_blog">You can\'t share to WordPress without a visible blog</string>
     <string name="comment_spammed">Comment marked as spam</string>
-    <string name="reader_toast_err_get_post">Unable to retrieve this post</string>
+    <string name="cant_share_no_visible_blog">You can\'t share to WordPress without a visible blog</string>
     <string name="reader_likes_you_and_one">You and one other like this</string>
-    <string name="pick_video">Select video</string>
     <string name="pick_photo">Select photo</string>
-    <string name="sign_up_label">Sign Up</string>
-    <string name="reader_toast_err_url_intent">Unable to open %s</string>
-    <string name="reader_toast_err_view_image">Unable to view image</string>
-    <string name="reader_toast_err_share_intent">Unable to share</string>
-    <string name="reader_toast_err_comment_failed">Couldn\'t post your comment</string>
-    <string name="reader_likes_only_you">You like this</string>
-    <string name="reader_likes_one">One person likes this</string>
-    <string name="reader_label_removed_tag">Removed %s</string>
-    <string name="reader_label_added_tag">Added %s</string>
-    <string name="reader_hint_comment_on_comment">Reply to comment…</string>
-    <string name="reader_btn_unfollow">Following</string>
-    <string name="reader_btn_follow">Follow</string>
-    <string name="reader_btn_share">Share</string>
-    <string name="reader_view_reblog">Reblog</string>
+    <string name="pick_video">Select video</string>
+    <string name="reader_toast_err_get_post">Unable to retrieve this post</string>
+    <string name="empty_list_default">This list is empty</string>
     <string name="reader_untitled_post">(Untitled)</string>
+    <string name="reader_btn_share">Share</string>
+    <string name="reader_btn_follow">Follow</string>
+    <string name="reader_btn_unfollow">Following</string>
+    <string name="reader_hint_comment_on_comment">Reply to comment…</string>
+    <string name="reader_label_added_tag">Added %s</string>
+    <string name="reader_label_removed_tag">Removed %s</string>
+    <string name="reader_likes_one">One person likes this</string>
+    <string name="reader_likes_only_you">You like this</string>
+    <string name="reader_toast_err_comment_failed">Couldn\'t post your comment</string>
+    <string name="reader_toast_err_share_intent">Unable to share</string>
+    <string name="reader_toast_err_view_image">Unable to view image</string>
+    <string name="reader_toast_err_url_intent">Unable to open %s</string>
     <string name="comments_empty_list">No comments yet</string>
-    <string name="empty_list_default">This list is empty</string>
-    <string name="stats_timeframe_months">Months</string>
-    <string name="stats_timeframe_weeks">Weeks</string>
-    <string name="stats_timeframe_days">Days</string>
-    <string name="stats_timeframe_yesterday">Yesterday</string>
-    <string name="stats_timeframe_today">Today</string>
+    <string name="reader_view_reblog">Reblog</string>
+    <string name="sign_up_label">Sign Up</string>
+    <string name="reader_toast_err_tag_exists">You already follow this topic</string>
+    <string name="reader_toast_err_tag_invalid">That isn\'t a valid topic</string>
+    <string name="themes">Themes</string>
+    <string name="media_gallery_type_squares">Squares</string>
+    <string name="media_gallery_type_tiled">Tiled</string>
+    <string name="media_gallery_type_circles">Circles</string>
+    <string name="media_gallery_type_slideshow">Slideshow</string>
+    <string name="media_edit_title_text">Title</string>
+    <string name="media_edit_caption_text">Caption</string>
+    <string name="media_edit_description_text">Description</string>
+    <string name="media_edit_failure">Failed to update</string>
+    <string name="theme_activate_button">Activate</string>
+    <string name="share_action">Share</string>
+    <string name="stats">Stats</string>
+    <string name="stats_view_clicks">Clicks</string>
     <string name="stats_view_referrers">Referrers</string>
+    <string name="stats_timeframe_today">Today</string>
+    <string name="stats_timeframe_yesterday">Yesterday</string>
+    <string name="stats_timeframe_days">Days</string>
+    <string name="stats_timeframe_weeks">Weeks</string>
+    <string name="stats_timeframe_months">Months</string>
     <string name="stats_view_tags_and_categories">Tags &amp; Categories</string>
-    <string name="stats_view_clicks">Clicks</string>
-    <string name="stats">Stats</string>
-    <string name="share_action">Share</string>
-    <string name="theme_activate_button">Activate</string>
-    <string name="media_edit_failure">Failed to update</string>
-    <string name="media_edit_description_text">Description</string>
-    <string name="media_edit_caption_text">Caption</string>
-    <string name="media_edit_title_text">Title</string>
-    <string name="media_gallery_type_slideshow">Slideshow</string>
-    <string name="media_gallery_type_circles">Circles</string>
-    <string name="media_gallery_type_tiled">Tiled</string>
-    <string name="media_gallery_type_squares">Squares</string>
-    <string name="themes">Themes</string>
     <string name="discard">Discard</string>
     <string name="manage">Manage</string>
-    <string name="more_notifications">and %d more.</string>
-    <string name="new_notifications">%d new notifications</string>
-    <string name="follows">Follows</string>
     <string name="note_reply_successful">Reply published</string>
+    <string name="follows">Follows</string>
+    <string name="new_notifications">%d new notifications</string>
+    <string name="more_notifications">and %d more.</string>
     <string name="sign_in">Log in</string>
     <string name="loading">Loading…</string>
-    <string name="httppassword">HTTP password</string>
     <string name="httpuser">HTTP username</string>
+    <string name="httppassword">HTTP password</string>
     <string name="error_media_upload">An error occurred while uploading media</string>
     <string name="incorrect_credentials">Incorrect username or password.</string>
-    <string name="log_in">Log In</string>
-    <string name="username">Username</string>
     <string name="password">Password</string>
+    <string name="username">Username</string>
+    <string name="log_in">Log In</string>
     <string name="reader">Reader</string>
+    <string name="no_network_title">No network available</string>
     <string name="pages">Pages</string>
     <string name="posts">Posts</string>
     <string name="anonymous">Anonymous</string>
-    <string name="no_network_title">No network available</string>
-    <string name="done">done</string>
     <string name="ok">OK</string>
+    <string name="done">done</string>
     <string name="link_enter_url">URL</string>
-    <string name="tos">Terms of Service</string>
     <string name="version">Version</string>
+    <string name="tos">Terms of Service</string>
     <string name="app_title">WordPress for Android</string>
     <string name="image_alignment">Alignment</string>
     <string name="refresh">Refresh</string>
@@ -2429,24 +2793,24 @@ Language: en_CA
     <string name="quickpress_add_error">Shortcut name can\'t be empty</string>
     <string name="pages_private">Private</string>
     <string name="title">Title</string>
-    <string name="tags_separate_with_commas">Separate tags with commas</string>
     <string name="categories">Categories</string>
+    <string name="tags_separate_with_commas">Separate tags with commas</string>
     <string name="dlg_deleting_comments">Deleting comments</string>
     <string name="sdcard_title">SD Card Required</string>
     <string name="media">Media</string>
-    <string name="approve">Approve</string>
     <string name="delete">Delete</string>
+    <string name="approve">Approve</string>
     <string name="none">None</string>
-    <string name="publish_now">Publish Now</string>
-    <string name="reply">Reply</string>
-    <string name="on">on</string>
-    <string name="preview">Preview</string>
-    <string name="category_refresh_error">Category refresh error</string>
     <string name="error">Error</string>
-    <string name="no">No</string>
-    <string name="yes">Yes</string>
-    <string name="notification_settings">Notification Settings</string>
-    <string name="add">Add</string>
-    <string name="save">Save</string>
     <string name="cancel">Cancel</string>
+    <string name="save">Save</string>
+    <string name="add">Add</string>
+    <string name="category_refresh_error">Category refresh error</string>
+    <string name="preview">Preview</string>
+    <string name="on">on</string>
+    <string name="reply">Reply</string>
+    <string name="notification_settings">Notification Settings</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="publish_now">Publish Now</string>
 </resources>
diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml
index a40909f099f9..d79d82635ac2 100644
--- a/WordPress/src/main/res/values-en-rGB/strings.xml
+++ b/WordPress/src/main/res/values-en-rGB/strings.xml
@@ -1,11 +1,463 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-19 18:07:55+0000
+Translation-Revision-Date: 2021-05-19 07:23:28+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: en_GB
 -->
 <resources>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Double tap to add a link.</string>
+    <string name="gutenberg_native_add_link">ADD LINK</string>
+    <string name="login_empty_view_try_another_account">Try with another account</string>
+    <string name="login_empty_view_see_instructions">See instructions</string>
+    <string name="login_no_jetpack_sites_error_message">If you already have a site, you\'ll need to install the free Jetpack plugin and connect it to your WordPress account.</string>
+    <string name="login_empty_view_avatar_content_description">Your profile photo</string>
+    <string name="login_not_a_jetpack_site">To use this app for %1$s you\'ll need to have the Jetpack plugin installed and connected to your WordPress.com account.</string>
+    <string name="gutenberg_native_size">Size</string>
+    <string name="gutenberg_native_move_image_forward">Move image forwards</string>
+    <string name="gutenberg_native_move_image_backward">Move image backwards</string>
+    <string name="gutenberg_native_image_settings">Image settings</string>
+    <string name="gutenberg_native_audio_settings">Audio settings</string>
+    <string name="user_profile_untitled_site">(Untitled)</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">User profile bottom sheet information</string>
+    <string name="likes_list_screen_title">Likes list %s</string>
+    <string name="gutenberg_native_write_code">Write code…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sorting and filtering</string>
+    <string name="gutenberg_native_show_download_button">Show download button</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Read more</string>
+    <string name="gutenberg_native_preload">Preload</string>
+    <string name="gutenberg_native_post_meta_settings">Post meta settings</string>
+    <string name="gutenberg_native_post_content_settings">Post content settings</string>
+    <string name="gutenberg_native_metadata">Metadata</string>
+    <string name="gutenberg_native_media_file">Media file</string>
+    <string name="gutenberg_native_media_area">Media area</string>
+    <string name="gutenberg_native_loop">Loop</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Link to</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">image %1$d of %2$d in gallery</string>
+    <string name="gutenberg_native_heading_d">Heading %d</string>
+    <string name="gutenberg_native_featured">Featured</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Enter URL to embed here…</string>
+    <string name="gutenberg_native_edit_image">Edit image</string>
+    <string name="gutenberg_native_display_post_date">Display post date</string>
+    <string name="gutenberg_native_code">Code</string>
+    <string name="gutenberg_native_change_heading_level">Change heading level</string>
+    <string name="gutenberg_native_browser_default">Browser default</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Block has been deleted or is unavailable.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Block cannot be rendered inside itself.</string>
+    <string name="gutenberg_native_autoplay">Autoplay</string>
+    <string name="gutenberg_native_auto">Auto</string>
+    <string name="gutenberg_native_attachment_page">Attachment page</string>
+    <string name="gutenberg_native_add_text">Add text…</string>
+    <string name="gutenberg_native_add_caption">Add caption</string>
+    <string name="login_no_jetpack_sites">No Jetpack sites found</string>
+    <string name="gutenberg_native_what_is_alt_text">What is alt text?</string>
+    <string name="gutenberg_native_transform_s_to">Transform %s to</string>
+    <string name="gutenberg_native_transform_block">Transform block…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Failed to insert media.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Failed to insert audio file.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Describe the purpose of the image. Leave empty if the image is purely decorative. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s transformed to %2$s</string>
+    <string name="like_faces_error_loading_message">Error loading like data. %s.</string>
+    <string name="like_faces_plural_text">%d bloggers like this.</string>
+    <string name="like_faces_singular_text">One blogger likes this.</string>
+    <string name="like_title_plural">%d Likes</string>
+    <string name="like_title_singular">One Like</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Enter your server credentials to fix threats.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Enter your server credentials to fix threat.</string>
+    <string name="suggestion">Suggestion:</string>
+    <string name="gutenberg_native_search_blocks">Search blocks</string>
+    <string name="gutenberg_native_search_block">Search block</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">double tap to change unit</string>
+    <string name="gutenberg_native_clear_search">Clear search</string>
+    <string name="gutenberg_native_cancel_search">Cancel search</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s is %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">An error occurred while getting likes data</string>
+    <string name="get_likes_unknown_error">An unknown error occurred while getting likes.</string>
+    <string name="get_likes_no_network_error">No network available.</string>
+    <string name="comments_empty_list_filtered_unreplied">No unreplied comments</string>
+    <string name="comment_status_unreplied">Unreplied</string>
+    <string name="gutenberg_native_table_of_contents">Table of Contents</string>
+    <string name="gutenberg_native_summary">summary</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Summarise your post with a list of headings. Add HTML anchors to Heading blocks to link them here.</string>
+    <string name="gutenberg_native_document_outline">document outline</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">Always allowed IP addresses</string>
+    <string name="site_settings_denylist_title">Disallowed comments</string>
+    <string name="reader_title_interests">Follow topics</string>
+    <string name="stories_intro_main_subtitle">A new way to create and publish engaging content on your site.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Dismiss</string>
+    <string name="activity_log_backup_download_notice_download_action">Download</string>
+    <string name="threat_fix_all_status_success_message_plural">Threats were successfully fixed.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Please confirm you want to fix all %s active threats.</string>
+    <string name="scan_idle_threats_description_plural">The scan found %1$s potential threats with %2$s. Please review them below and take action, or tap the fix all button. We are %3$s if you need us.</string>
+    <string name="scan_fixing_threats_description_plural">We\'re hard at work in the background fixing these threats. In the meantime, feel free to continue to use your site as normal, you can check the progress at any time.</string>
+    <string name="gutenberg_native_edit_focal_point">Edit focal point</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Double tap to open Bottom Sheet to edit, replace, or clear the image</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Double tap to open Action Sheet to edit, replace, or clear the image</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Type a name for your site</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ll reach more people. Nice job!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ve customised your site. Well done!</string>
+    <string name="quick_start_card_menu_hide">Hide for now</string>
+    <string name="magic_link_not_meaning_to_create_account">Didn\'t mean to create a new account? Go back to re-enter your email address.</string>
+    <string name="invite_links_disable_dialog_message">Once this invite link is disabled, nobody will be able to use it to join your team. Are you sure?</string>
+    <string name="invite_links_disable_dialog_title">Disable invite link</string>
+    <string name="invite_links_bad_format_response">Invalid response received</string>
+    <string name="invite_links_null_response">No response received</string>
+    <string name="invite_links_cannot_get_role_data_error">There was an error getting data for role %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">There was an error getting roles</string>
+    <string name="invite_links_generic_get_data_error">Unknown error fetching invite links data</string>
+    <string name="invite_links_helper_text">Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organisation, even if they received the link from somebody else, so make sure that you share it with trusted people.</string>
+    <string name="invite_links_expire_date">Expires %1$s</string>
+    <string name="invite_links_disable_invite_link">Disable invite link</string>
+    <string name="invite_links_share_invite_link">Share invite link</string>
+    <string name="invite_links_generate">Generate new link</string>
+    <string name="invite_links_get_status_retry">Refresh links status</string>
+    <string name="invite_links_section_title">Invite Link</string>
+    <string name="threats_found_singular">Threat found</string>
+    <string name="threats_found_plural">Threats found</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; %s potential threats found</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; One potential threat found</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; No threats found</string>
+    <string name="scan_fixing_threats_title_singular">Fixing Threat</string>
+    <string name="disable">Disable</string>
+    <string name="quick_start_card_menu_unpin">Unpin this</string>
+    <string name="quick_start_list_review_pages_subtitle">Check your pages and make changes, or add or remove pages.</string>
+    <string name="quick_start_list_view_site_title">Visit your site</string>
+    <string name="quick_start_list_upload_icon_subtitle">Add a site icon for a polished, pro look.</string>
+    <string name="quick_start_list_follow_site_subtitle">Discover and follow sites that inspire you.</string>
+    <string name="quick_start_list_enable_sharing_title">Enable sharing</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Automatically share new posts to your social media.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic.</string>
+    <string name="quick_start_list_check_stats_title">Check your stats</string>
+    <string name="backup_download_status_failure_bullet2">We\'ll still attempt to create your downloadable backup file.</string>
+    <string name="backup_download_status_failure_bullet1">We couldn\'t find the status to say how long your downloadable backup will take.</string>
+    <string name="backup_download_status_failure_heading">Hmm, we couldn\'t find your downloadable backup status</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Checkmark icon</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Clock icon</string>
+    <string name="restore_status_failure_bullet3">We’ll notify you when its done.</string>
+    <string name="restore_status_failure_bullet2">We\'ll still attempt to restore your site.</string>
+    <string name="restore_status_failure_bullet1">We couldn\'t find the status to say how long your restore will take.</string>
+    <string name="restore_status_failure_heading">Hmm, we couldn\'t find your restore status</string>
+    <string name="restore_complete_failed_description">We couldn\'t restore your site</string>
+    <string name="restore_warning_action_button">Confirm</string>
+    <string name="restore_warning_description_with_two_parameters">Are you sure you want to revert your site back to %1$s at %2$s?\n        Anything you changed since then will be lost.</string>
+    <string name="backup_download_complete_failed_description">We couldn\'t create your backup</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(excludes themes, plugins, and uploads)</string>
+    <string name="backup_item_contents">WP-content directory</string>
+    <string name="backup_item_roots">WordPress root</string>
+    <string name="backup_download_details_choose_items_header">Items included in this download</string>
+    <string name="gutenberg_native_uploading">Uploading…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Reusable blocks aren\'t editable on WordPress for iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Reusable blocks aren\'t editable on WordPress for Android</string>
+    <string name="gutenberg_native_replace_file">Replace file</string>
+    <string name="gutenberg_native_replace_audio">Replace audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problem opening the audio</string>
+    <string name="gutenberg_native_open">OPEN</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">No application can handle this request.</string>
+    <string name="gutenberg_native_lock_icon">Lock icon</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Failed to insert audio file. Please tap for options.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Double tap to select an audio file</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Double tap to listen to the audio file</string>
+    <string name="gutenberg_native_choose_audio">Choose audio</string>
+    <string name="gutenberg_native_audio_player">Audio Player</string>
+    <string name="gutenberg_native_audio_file"> audio file</string>
+    <string name="gutenberg_native_audio_caption_s">Audio caption. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Audio caption. Empty</string>
+    <string name="gutenberg_native_add_audio">ADD AUDIO</string>
+    <string name="continue_with_wpcom">Log in or sign up with WordPress.com</string>
+    <string name="photo_picker_use_audio">Use this audio</string>
+    <string name="photo_picker_choose_audio">Choose audio from device</string>
+    <string name="people_optional_custom_message_helper_text">Optional: enter a custom message to be sent with your invitation.</string>
+    <string name="people_learn_more_about_roles">Learn more about roles</string>
+    <string name="threat_status_fixed">Fixed</string>
+    <string name="threat_found_header">Found</string>
+    <string name="scan_here_to_help">here to help</string>
+    <string name="scan_idle_threats_description_singular">The scan found one potential threat with %1$s. Please review the threat below and take action, or tap the fix all button. We are %2$s if you need us.</string>
+    <string name="scan_idle_manual_scan_description">To review your site again, run a manual scan, or wait for Jetpack to scan your site later today.</string>
+    <string name="scan_provisioning_description">Welcome to Jetpack Scan! We\'re scoping out your site, setting up to do a full scan. We\'ll let you know if we spot any issues that might impact a scan, then your first full scan will start.</string>
+    <string name="scan_scanning_is_initial_description">Welcome to Jetpack Scan, we are taking a first look at your site now and the results will be with you soon.</string>
+    <string name="scan_fixing_threats_description_singular">We\'re hard at work in the background fixing this threat. In the meantime, feel free to continue to use your site as normal, you can check the progress at any time.</string>
+    <string name="scan_scanning_description">We will send you a notification once the scan is complete. In the meantime, feel free to continue to use your site as normal, you can check the progress at any time.</string>
+    <string name="scan_fixing_threats_title_plural">Fixing Threats</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan couldn\'t complete a scan of your site. Please check to see if your site is down – if it\'s not, try again. If it is, or if Jetpack Scan is still having problems, contact our support team.</string>
+    <string name="scan_request_failed_title">Something went wrong</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Backing up site</string>
+    <string name="activity_log_currently_backing_up_message">Backing up site from %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Creating downloadable backup</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Your site has been successfully backed up</string>
+    <string name="activity_log_backup_finished_snackbar_message">Your site has been successfully backed up\nBacked up from %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Your site is being backed up\nBacking up from %1$s %2$s</string>
+    <string name="pick_audio">Select audio</string>
+    <string name="restore_another_process_running">There is another restore running.</string>
+    <string name="restore_complete_failed_icon_content_description">Error icon</string>
+    <string name="restore_complete_failed_action_button_content_description">Done button</string>
+    <string name="restore_complete_failed_title">Restore failed</string>
+    <string name="restore_complete_visit_site_button_content_description">Visit site button</string>
+    <string name="restore_complete_done_button_content_description">Done button</string>
+    <string name="restore_complete_icon_content_description">Restore icon</string>
+    <string name="restore_complete_visit_site_action_button">Visit site</string>
+    <string name="restore_complete_description_with_two_parameters">All of your selected items are now restored back to %1$s %2$s.</string>
+    <string name="restore_complete_header">Your site has been restored</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">No need to wait around. We\'ll notify you when your site has been restored.</string>
+    <string name="restore_progress_icon_content_description">Restore site icon</string>
+    <string name="restore_progress_description_with_two_parameters">We\'re restoring your site back to %1$s %2$s.</string>
+    <string name="restore_progress_header">Currently restoring site</string>
+    <string name="restore_warning_action_button_content_description">Confirm restore site button</string>
+    <string name="restore_warning_icon_content_description">Red circle image with exclamation point</string>
+    <string name="restore_warning_header">Warning</string>
+    <string name="restore_details_action_button_content_description">Restore site button</string>
+    <string name="restore_details_icon_content_description">Restore icon</string>
+    <string name="restore_details_action_button">Restore site</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s is the selected point for your restore.</string>
+    <string name="restore_details_header">Restore Site</string>
+    <string name="restore_details_choose_items_header">Choose the items to restore:</string>
+    <string name="restore">Restore</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud with X icon</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Done button</string>
+    <string name="backup_download_complete_failed_action_button">Done</string>
+    <string name="backup_download_complete_failed_title">Download failed</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Mobile</string>
+    <string name="quick_start_card_menu_remove">Don\'t show again</string>
+    <string name="quick_start_card_menu_pin">Pin this</string>
+    <string name="quick_start_dialog_review_pages_message_short">Select %1$s Pages %2$s to see your page list.</string>
+    <string name="quick_start_dialog_review_pages_message">Change, add, or remove your site\'s pages.</string>
+    <string name="quick_start_dialog_review_pages_title">Review site pages</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Select %1$s Homepage %2$s to edit your Homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Select %1$s Pages %2$s to see your page list.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Change, add, or remove content from your site\'s homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Edit your homepage</string>
+    <string name="reader_menu_mark_as_unseen">Mark as unseen</string>
+    <string name="reader_menu_mark_as_seen">Mark as seen</string>
+    <string name="error_media_upload_failed_for_reason">Media upload failed.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Not enough available site storage</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Can\'t toggle seen status of this post</string>
+    <string name="reader_marked_post_as_unseen">Marked post as unseen</string>
+    <string name="reader_marked_post_as_seen">Marked post as seen</string>
+    <string name="threat_fix_all_status_error_message">Error getting fix status. Please contact our support.</string>
+    <string name="threat_fix_all_status_success_message_singular">Threat was successfully fixed.</string>
+    <string name="threat_fix_all_error_message">Error fixing threats. Please contact our support.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Please confirm you want to fix one active threat.</string>
+    <string name="threat_fix_all_warning_title">Fix all threats</string>
+    <string name="threat_ignore_error_message">Error ignoring threat. Please contact support.</string>
+    <string name="threat_ignore_success_message">Threat ignored.</string>
+    <string name="threat_ignore_warning">You shouldn’t ignore a security issue unless you are absolute sure it’s harmless. If you choose to ignore this threat, it will remain on your site &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Error fixing threat. Please contact our support.</string>
+    <string name="threat_item_sub_header_status_ignored">Threat ignored</string>
+    <string name="threat_item_sub_header_status_fixed_on">Threat fixed on %s</string>
+    <string name="threat_fixing">Fixing threat</string>
+    <string name="scan_history_ignored_threats_tab">Ignored</string>
+    <string name="scan_history_no_threats_found">No items found</string>
+    <string name="scan_history_fixed_threats_tab">Fixed</string>
+    <string name="scan_history_all_threats_tab">All</string>
+    <string name="scan_scanning_title">Scanning files</string>
+    <string name="scan_preparing_to_scan_title">Preparing to scan</string>
+    <string name="scan_history_menu_title">History</string>
+    <string name="scan_history">Scan History</string>
+    <string name="backup_active_filter_empty_subtitle">Try adjusting your date range</string>
+    <string name="backup_active_filter_empty_title">No matching backups found</string>
+    <string name="backup_empty_subtitle">Your first backup will appear here within 24 hours and you will receive a notification once the backup has been completed</string>
+    <string name="backup_empty_title">Your first backup will be ready soon</string>
+    <string name="request_failed_message">There was a problem handling the request. Please try again later.</string>
+    <string name="gutenberg_native_move_to_bottom">Move to bottom</string>
+    <string name="gutenberg_native_change_block_position">Change block position</string>
+    <string name="label_control_upload">Upload</string>
+    <string name="jetpack_icon_content_description">icon</string>
+    <string name="backup_download_complete_info">We\'ve also emailed you a link to your file.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Share link button</string>
+    <string name="backup_download_complete_download_action_button_content_description">Download button</string>
+    <string name="backup_download_complete_icon_content_description">Downloadable backup ready icon</string>
+    <string name="backup_download_complete_download_share_action_button">Share link</string>
+    <string name="backup_download_complete_download_action_button">Download</string>
+    <string name="backup_download_complete_description_with_two_parameters">We successfully created a backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Your backup is now available for download</string>
+    <string name="backup_download_complete_page_title">Your Backup</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">No need to wait around. We\'ll notify you when your backup is ready.</string>
+    <string name="backup_download_progress_icon_content_description">Creating downloadable backup icon</string>
+    <string name="backup_download_progress_description_with_two_parameters">We\'re creating a downloadable backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Currently creating a downloadable backup of your site</string>
+    <string name="backup_download_progress_page_title">Download Backup</string>
+    <string name="backup_download_another_download_running">There is another download running.</string>
+    <string name="backup_download_generic_failure">There was a problem handling the request. Please try again later.</string>
+    <string name="backup_download_details_action_button_content_description">Create downloadable backup button</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s is the selected point to create a downloadable backup.</string>
+    <string name="gutenberg_native_image_link_url">Image Link URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">crosspost</string>
+    <string name="suggestion_user">user</string>
+    <string name="suggestion_no_matching">No matching %s.</string>
+    <string name="suggestion_problem">There was a problem loading suggestions.</string>
+    <string name="suggestion_none">No %s suggestions available.</string>
+    <string name="suggestion_selection_needed">Please type to filter the list of suggestions.</string>
+    <string name="threat_get_free_estimate">Get a free estimate</string>
+    <string name="threat_ignore">Ignore threat</string>
+    <string name="threat_fix">Fix threat</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan will resolve the threat.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan will edit the affected file or directory.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan will update to a newer version (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan will delete the affected file or directory.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan will replace the affected file or directory.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan cannot automatically fix this threat.\n        We suggest that you resolve the threat manually: ensure that WordPress, your theme, and all of your plugins are up to date, and remove the offending code, theme, or plugin from your site. \n \n\n        If you need more help to resolve this threat, we recommend &lt;b&gt;Codeable&lt;/b&gt;, a trusted freelancer marketplace of highly vetted WordPress experts.\n        They have identified a select group of security experts to help with these projects. Pricing ranges from $70–120/hour, and you can get a free estimate with no obligation to hire.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Resolving the threat</string>
+    <string name="threat_fix_fixed_header">How did Jetpack fix it?</string>
+    <string name="threat_fix_default_header">How will we fix it?</string>
+    <string name="threat_file_description">Threat found in file:</string>
+    <string name="threat_technical_details_header">The technical details</string>
+    <string name="threat_problem_header">What was the problem?</string>
+    <string name="threat_details">Threat Details</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerability found in theme</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerability found in plugin</string>
+    <string name="threat_item_sub_header_file_signature">Threat found %s</string>
+    <string name="threat_item_sub_header_core_file">Vulnerability found in WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Miscellaneous vulnerability</string>
+    <string name="threat_item_header_vulnerable_theme">Vulnerable Theme: %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Vulnerable Plugin: %s (version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: malicious code pattern</string>
+    <string name="threat_item_header_database_threat">Database %s threats</string>
+    <string name="threat_item_header_infected_core_file">%s: infected core file</string>
+    <string name="threat_item_header_threat_found">Threat found</string>
+    <string name="threats_fix_all">Fix All</string>
+    <string name="scan_in_few_seconds">a few seconds ago</string>
+    <string name="scan_in_minutes_ago">%s minute(s) ago</string>
+    <string name="scan_in_hours_ago">%s hour(s) ago</string>
+    <string name="scan_this_site">this site</string>
+    <string name="scan_idle_last_scan_description">The last Jetpack scan ran %s and did not find any risks. %s</string>
+    <string name="scan_idle_threats_found_title">Your site may be at risk</string>
+    <string name="scan_idle_no_threats_found_title">Don\'t worry about a thing</string>
+    <string name="scan_again">Scan again</string>
+    <string name="scan_now">Scan now</string>
+    <string name="scan_state_icon">Scan state icon</string>
+    <string name="backup">Backup</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Activity Type filter (%s types selected)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (showing %s items)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Activity Type filter</string>
+    <string name="activity_log_activity_type_empty_subtitle">No activities recorded in the selected date range.</string>
+    <string name="activity_log_activity_type_empty_title">No activities available</string>
+    <string name="activity_log_activity_type_error_subtitle">Please check your internet connection and retry.</string>
+    <string name="activity_log_activity_type_error_title">No connection</string>
+    <string name="activity_log_activity_type_filter_active_label">Activity Type (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Date Range filter</string>
+    <string name="activity_log_active_filter_empty_subtitle">Try adjusting your date range or activity type filters</string>
+    <string name="activity_log_active_filter_empty_title">No matching events found</string>
+    <string name="backup_item_sqls">Site database</string>
+    <string name="backup_item_roots_hint">(includes wp-config.php and any non-WordPress files)</string>
+    <string name="backup_item_media_uploads">Media Uploads</string>
+    <string name="backup_item_plugins">WordPress Plugins</string>
+    <string name="backup_item_themes">WordPress Themes</string>
+    <string name="backup_download_details_icon_content_description">Create downloadable backup icon</string>
+    <string name="backup_download_details_action_button">Create downloadable file</string>
+    <string name="backup_download_details_header">Create downloadable backup</string>
+    <string name="backup_download_details_page_title">Download Backup</string>
+    <string name="backup_download">Backup Download</string>
+    <string name="gutenberg_native_error">Error</string>
+    <string name="gutenberg_native_choose_file">Choose file</string>
+    <string name="activity_log_item_menu_download_backup_label">Download backup</string>
+    <string name="activity_log_item_menu_restore_label">Restore to this point</string>
+    <string name="activity_log_activity_type_filter_label">Activity Type</string>
+    <string name="activity_log_date_range_filter_label">Date Range</string>
+    <string name="activity_log_activity_type_filter_header">Filter by Activity Type</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copy the version from this app</string>
+    <string name="dialog_confirm_copy_local_edit_button">Edit the post first</string>
+    <string name="dialog_confirm_copy_local_message">The post you are trying to copy has two versions that are in conflict, or you recently made changes but didn\'t save them.\nEdit the post first to resolve any conflict or proceed with copying the version from this app.</string>
+    <string name="dialog_confirm_copy_local_title">Post sync conflict</string>
+    <string name="button_copy">Duplicate</string>
+    <string name="toast_edit_story_update_in_progress_title">Story being saved, please wait…</string>
+    <string name="gutenberg_native_file_name">File name</string>
+    <string name="gutenberg_native_file_block_settings">File block settings</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Failed to upload files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Failed to save files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_edit_file">Edit file</string>
+    <string name="gutenberg_native_copy_file_url">Copy file URL</string>
+    <string name="gutenberg_native_choose_a_file">CHOOSE A FILE</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack Settings</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Following conversation by email</string>
+    <string name="reader_btn_follow_comments">Follow conversation by email</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Could not unsubscribe from comments for this post</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Could not subscribe to comments for this post</string>
+    <string name="reader_follow_comments_get_status_error">Error fetching subscription status for post</string>
+    <string name="reader_follow_comments_unsubscribe_success">Successfully unsubscribed from the comments</string>
+    <string name="reader_follow_comments_subscribe_success">Successfully subscribed to the comments</string>
+    <string name="reader_follow_comments_bad_format_response">Invalid response received</string>
+    <string name="reader_follow_comments_null_response">No response received</string>
+    <string name="activity_log_activity_type_filter_clear">Clear</string>
+    <string name="activity_log_activity_type_filter_apply">Apply</string>
+    <string name="dialog_edit_story_unsupported_format_message">One or more slides have not been added to your Story because Stories don\'t support GIF files at the moment. Please choose a static image or video background instead.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF files not supported</string>
+    <string name="dialog_edit_story_unrecoverable_message">We couldn\'t find the media for this story on the site.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Can\'t edit Story</string>
+    <string name="dialog_edit_story_unavailable_message">Unable to load media for this story. Check your internet connection and try again in a moment.</string>
+    <string name="dialog_edit_story_unavailable_title">Can\'t edit Story</string>
+    <string name="dialog_edit_story_limited_message">This story was edited on a different device and the ability to edit certain objects may be limited.</string>
+    <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media has been removed. Try re-creating your Story.</string>
+    <string name="color_picker_label_background">Background</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="dialog_discard_story_ok_button_edit">Discard</string>
+    <string name="dialog_discard_story_message_edit">Any changes made will not be saved.</string>
+    <string name="dialog_discard_story_title_edit">Discard changes?</string>
+    <string name="label_done_button">Done</string>
+    <string name="label_next_button">Next</string>
+    <string name="delete_button_alt">Delete</string>
+    <string name="hpp_choose_error">There was an error while selecting the design.</string>
+    <string name="hpp_retry_error">Please check your internet connection and retry.</string>
+    <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
+    <string name="hpp_error_title">Layouts not available while offline</string>
+    <string name="continue_site_credentials">Continue with store credentials</string>
+    <string name="login_find_your_connected_email">Find your connected email</string>
+    <string name="reader_discover_no_posts_button_text">Follow topics</string>
+    <string name="reader_discover_no_posts_subtitle">Try following more topics to broaden the search</string>
+    <string name="reader_discover_no_posts_title">No recent posts</string>
+    <string name="reader_discover_empty_title">Welcome!</string>
+    <string name="scan">Scan</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; responded to your post</string>
+    <string name="login_prologue_third_subtitle_two">You received &lt;b&gt;50 likes&lt;/b&gt; on your site today</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; liked your post</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Scrollable block menu opened. Select a block.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Scrollable block menu closed.</string>
+    <string name="hpp_skip_button">Skip</string>
+    <string name="hpp_choose_button">Choose</string>
+    <string name="hpp_subtitle">Pick your favourite homepage layout. You can edit and customise it later.</string>
+    <string name="hpp_title">Choose a design</string>
+    <string name="mlp_network_error_subtitle">Tap retry when you\'re back online, or create a blank page using the button below.</string>
+    <string name="mlp_network_error_title">Layouts not available while offline</string>
+    <string name="mlp_error_subtitle">Tap retry or create a blank page using the button below.</string>
+    <string name="mlp_error_title">Layouts not available due to an error</string>
+    <string name="prepublishing_nudges_add_category_button">Add Category</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Add New Category</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categories</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Not set</string>
+    <string name="prepublishing_nudges_categories_action">Categories</string>
+    <string name="login_prologue_fifth_caption_three">Museums in London</string>
+    <string name="login_prologue_fifth_caption_two">The World\'s Best Fans</string>
+    <string name="login_prologue_fifth_caption_one">My Top Ten Cafés</string>
+    <string name="login_prologue_fifth_tag_six">Politics</string>
+    <string name="login_prologue_fifth_tag_five">Music</string>
+    <string name="login_prologue_fifth_tag_four">Gardening</string>
+    <string name="login_prologue_fifth_tag_three">Football</string>
+    <string name="login_prologue_fifth_tag_two">Cooking</string>
+    <string name="login_prologue_fifth_tag_one">Art</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock ‘n’ Roll Weekly</string>
+    <string name="login_prologue_fifth_subtitle_two">Web News</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">I am so inspired by photographer Cameron Karsten’s work. I will be trying these techniques on my next</string>
+    <string name="login_prologue_second_subtitle_one">Getting Inspired</string>
+    <string name="login_prologue_title_fifth">Follow your favourite sites and discover new blogs.</string>
+    <string name="login_prologue_title_fourth">Watch your audience grow with in-depth analytics.</string>
+    <string name="login_prologue_title_third">See comments and notifications in real time.</string>
+    <string name="login_prologue_title_second">With the powerful editor, you can post on the go.</string>
+    <string name="login_prologue_title_first">Welcome to the world’s most popular website builder.</string>
+    <string name="media_loading_failed">Media loading failed</string>
+    <string name="reader_discover_recommended_blogs_header">Sites to follow</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">We are working hard to add more blocks with each release.</string>
     <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' is not fully supported</string>
     <string name="gutenberg_native_help_button">Help button</string>
@@ -18,19 +470,16 @@ Language: en_GB
     <string name="stories_intro_title_first">Now stories are for everyone</string>
     <string name="stories_intro_image_caption_second">Example story title</string>
     <string name="stories_intro_image_caption_first">How to create a story post</string>
-    <string name="stories_intro_main_subtitle">You\'ve got early access to Story Posts and we\'d love for you to give it a try.</string>
     <string name="stories_intro_main_title">Introducing Story Posts</string>
-    <string name="mlp_generic_error">An error occurred while fetching the layouts</string>
     <string name="mlp_notice_blank_page_created">Blank page created</string>
     <string name="mlp_notice_page_created">Page created</string>
-    <string name="mlp_preview_title">Layout Preview</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s was denied access to your photos. To fix this, edit your permissions and turn on %2$s and %3$s.</string>
     <string name="media_insert_failed">Media insert failed.</string>
     <string name="media_insert_failed_with_reason">Media insert failed: %s</string>
     <string name="photo_picker_wordpress_media_library">Choose from WordPress Media Library</string>
     <string name="reader_label_toolbar_back">Back</string>
     <string name="reader_discover_empty_button_text">Get Started</string>
-    <string name="reader_discover_empty_title">Follow topics to discover new blogs</string>
+    <string name="reader_discover_empty_subtitle">Follow topics to discover new blogs</string>
     <string name="reader_post_details_header_by_author_name">By</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">This referrer can\'t be marked as spam</string>
     <string name="stats_referrer_popup_unmark_as_spam">Unmark as Spam</string>
@@ -41,10 +490,11 @@ Language: en_GB
     <string name="media_uploading_default">Uploading media</string>
     <string name="gutenberg_native_select_item">Select item</string>
     <string name="gutenberg_native_search_or_type_url">Search or type URL</string>
+    <string name="gutenberg_native_page_break">Page break</string>
     <string name="gutenberg_native_add_this_telephone_link">Add this telephone link</string>
     <string name="gutenberg_native_add_this_link">Add this link</string>
     <string name="gutenberg_native_add_this_email_link">Add this email link</string>
-    <string name="suggestion_no_connection">\"No internet connection.\nSuggestions are unavailable.\"</string>
+    <string name="suggestion_no_connection">No internet connection.\nSuggestions are unavailable.</string>
     <string name="typeface_label_shrikhand">Bold</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_pacifico">Playful</string>
@@ -60,7 +510,6 @@ Language: en_GB
     <string name="comment_unable_to_show_error">Unable to show this comment</string>
     <string name="media_browse_for_items">Browse for items</string>
     <string name="reader_menu_report_post">Report this post</string>
-    <string name="gutenberg_native_angle">Angle</string>
     <string name="reader_welcome_banner">Welcome to Reader. Discover millions of blogs at your fingertips.</string>
     <string name="error_media_xmlrcp_server_error">Internal server error occurred</string>
     <string name="error_media_xmlrpc_not_allowed">Your action is not allowed</string>
@@ -70,7 +519,6 @@ Language: en_GB
     <string name="create_post_story_fab_tooltip">Create a post or story</string>
     <string name="create_page_fab_tooltip">Create a page</string>
     <string name="create_post_fab_tooltip">Create a post</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">You might like</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Hide</string>
     <string name="gutenberg_native_video_caption_empty">Video caption. Empty</string>
@@ -109,7 +557,6 @@ Language: en_GB
     <string name="dialog_discard_errored_page_message">This slide has not been saved yet. If you delete this slide, you will lose any edits you have made.</string>
     <string name="dialog_discard_page_message">This slide will be removed from your story.</string>
     <string name="dialog_discard_page_title">Delete story slide?</string>
-    <string name="menu_delete_page">Delete slide</string>
     <string name="label_text_color_button">Change text colour</string>
     <string name="label_text_alignment_button">Change text alignment</string>
     <string name="label_frame_errored">errored</string>
@@ -119,8 +566,6 @@ Language: en_GB
     <string name="label_retry_icon">Retry</string>
     <string name="label_saved_icon">Saved</string>
     <string name="label_close_button">Close</string>
-    <string name="label_control_publish">Next</string>
-    <string name="label_done">Done</string>
     <string name="label_share_to">Share to</string>
     <string name="label_snackbar_share">SHARE</string>
     <string name="label_snackbar_loop_frame_saved">Saved to photos</string>
@@ -131,7 +576,6 @@ Language: en_GB
     <string name="label_control_flip_camera">Flip</string>
     <string name="sound_button_alt">Sound</string>
     <string name="text_button_alt">Text</string>
-    <string name="more_button_alt">More</string>
     <string name="stickers_button_alt">Stickers</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Flip camera</string>
@@ -144,7 +588,7 @@ Language: en_GB
     <string name="prepublishing_nudges_story_title_hint">Give your story a title</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Create a post or story</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Create a post, page, or story</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Tap %1$s Create. %2$s Then select &lt;b>Blog post&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Tap %1$s Create. %2$s Then select &lt;b&gt;Blog post&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Choose from device</string>
     <string name="my_site_bottom_sheet_add_story">Story post</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Editing site icons on self-hosted WordPress sites requires the Jetpack plugin.</string>
@@ -158,13 +602,10 @@ Language: en_GB
     <string name="gutenberg_native_choose_image_or_video">Choose image or video</string>
     <string name="gutenberg_native_choose_image">Choose image</string>
     <string name="gutenberg_native_block_removed">Block removed</string>
-    <string name="content_description_logo">WordPress Logo</string>
-    <string name="enter_your_site_address">Enter your site address</string>
-    <string name="continue_with_wpcom">Continue with WordPress.com</string>
+    <string name="enter_your_site_address">Enter your existing site address</string>
     <string name="signup_confirmation_title">Signup confirmation</string>
     <string name="continue_with_google_terms_of_service_text">If you continue with Google and don\'t already have a WordPress.com account, you are creating an account and you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_terms_of_service_text">By continuing, you agree to our %1$sTerms of Service%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">We’ll email you a signup link to create your new WordPress.com account.</string>
     <string name="signup_confirmation_message">We’ll use this email address to create your new WordPress.com account.</string>
     <string name="signup_magic_link_message">We’ve emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.</string>
     <string name="enter_account_info_for_site">Enter your account information for %1$s.</string>
@@ -181,19 +622,15 @@ Language: en_GB
     <string name="or_type_your_password">Or type your password</string>
     <string name="create_account">Create account</string>
     <string name="send_link_by_email">Send link by email</string>
-    <string name="login_promo_text_unlock_the_power">Unlock the power of the most flexible website builder.</string>
-    <string name="login_promo_title_37_percent">37\% of the web is built on WordPress.</string>
     <string name="reset_your_password">Reset your password</string>
     <string name="reader_error_request_failed_title">There was a problem handling the request. Please try again later.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic. First impressions count!</string>
     <string name="quick_start_list_update_site_title_title">Set your site title</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Tap &lt;b>%1$s&lt;/b> to set a new title</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Tap &lt;b&gt;%1$s&lt;/b&gt; to set a new title</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Binning this post will also discard local changes, are you sure you want to continue?</string>
     <string name="gutenberg_native_s_block_options">%s block options</string>
     <string name="gutenberg_native_duplicate_block">Duplicate block</string>
     <string name="gutenberg_native_copy_block">Copy block</string>
     <string name="gutenberg_native_copied_block">Copied block</string>
-    <string name="gutenberg_native_block_settings">Block settings</string>
     <string name="gutenberg_native_block_pasted">Block pasted</string>
     <string name="gutenberg_native_block_duplicated">Block duplicated</string>
     <string name="gutenberg_native_block_cut">Block cut</string>
@@ -209,7 +646,6 @@ Language: en_GB
     <string name="gutenberg_native_gradient_type">Gradient Type</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Double tap to select the option</string>
     <string name="gutenberg_native_customize_gradient">Customise Gradient</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Page author</string>
     <string name="photo_picker_use_gif">Use this GIF</string>
     <string name="error_media_thumbnail_not_loaded">Media thumbnail could not be loaded</string>
@@ -232,8 +668,8 @@ Language: en_GB
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Move to Draft</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Binned posts can\'t be edited. Do you want to change the status of this post to \"draft\", so you can work on it?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Move post to Drafts?</string>
-    <string name="reader_label_choose_your_interests">Choose your interests</string>
-    <string name="reader_choose_interests_content_description">Choose your interests</string>
+    <string name="reader_label_choose_your_interests">Choose your topics</string>
+    <string name="reader_choose_interests_content_description">Choose your topics</string>
     <string name="reader_btn_done">Done</string>
     <string name="reader_btn_select_few_interests">Select a few to continue</string>
     <string name="post_status_post_published">Published</string>
@@ -245,17 +681,14 @@ Language: en_GB
     <string name="ccpa_privacy_notice_header">Privacy notice for California users</string>
     <string name="status_and_visibility">Status and Visibility</string>
     <string name="update_now">Update Now</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Try a starter layout</string>
     <string name="gutenberg_native_open_block_actions_menu">Open Block Actions Menu</string>
-    <string name="gutenberg_native_insert_mention">Insert mention</string>
+    <string name="gutenberg_native_move_to_top">Move to top</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Double tap to open Bottom Sheet with available options</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Double tap to open Action Sheet with available options</string>
     <string name="pages_cannot_be_started">We cannot open pages at the moment. Please try again later</string>
     <string name="pages_set_as_posts_page">Set as Posts Page</string>
     <string name="pages_set_as_homepage">Set as Homepage</string>
-    <string name="suggestion_no_matching_users">\"No matching users available.\"</string>
-    <string name="suggestion_invalid_user">\"%s is not a valid user\"</string>
+    <string name="suggestion_invalid">%s is not a valid %s</string>
     <string name="site_settings_select_page">Select Page</string>
     <string name="site_settings_posts_page">Posts Page</string>
     <string name="site_settings_static_homepage">Static Homepage</string>
@@ -275,7 +708,6 @@ Language: en_GB
     <string name="page_homepage_successfully_updated">Homepage successfully updated</string>
     <string name="page_cannot_set_posts_page">To set Posts page, enable \"Static Homepage\" in Site Settings</string>
     <string name="page_cannot_set_homepage">To set Homepage, enable \"Static Homepage\" in Site Settings</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Welcome to our new blog</string>
     <string name="gutenberg_native_select_a_color">Select a colour</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Double tap to go to colour settings</string>
     <string name="reader_empty_followed_blogs_description">When you follow sites, you\'ll see their content here</string>
@@ -309,7 +741,7 @@ Language: en_GB
     <string name="gutenberg_native_move_block_left">Move block left</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Double tap to move the block to the right</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Double tap to move the block to the left</string>
-    <string name="gutenberg_native_blog">Blog</string>
+    <string name="gutenberg_native_block_settings">Block settings</string>
     <string name="new_site_creation_creating_site_loading_4">Creating dashboard</string>
     <string name="new_site_creation_creating_site_loading_3">Setting up theme</string>
     <string name="new_site_creation_creating_site_loading_2">Adding site features</string>
@@ -365,57 +797,20 @@ Language: en_GB
     <string name="app_theme_light">Light</string>
     <string name="app_theme">Appearance</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">You recently made changes to this page but didn\'t save them. Choose a version to load:\n\n</string>
-    <string name="gutenberg_native_what_people_say">What People Say</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.</string>
-    <string name="gutenberg_native_warning_message">Warning Message</string>
-    <string name="gutenberg_native_want_to_work_with_us">Want to work with us?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing - in their own words.</string>
-    <string name="gutenberg_native_usa">USA</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">This is sample content, included with the template to illustrate its features. Remove or replace it with your own words and media.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">The way to get started is to quit talking and begin doing.</string>
-    <string name="gutenberg_native_team">Team</string>
-    <string name="gutenberg_native_success_message">Success Message</string>
-    <string name="gutenberg_native_strategy">Strategy</string>
     <string name="gutenberg_native_show_post_content">Show post content</string>
-    <string name="gutenberg_native_services">Services</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Project Name</string>
-    <string name="gutenberg_native_position_or_job_title">Position or Job Title</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Only show excerpt</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">My portfolio showcases various projects created throughout my career. See my contact information below and get in touch.</string>
     <string name="gutenberg_native_link_to">Link To</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Let\'s talk 👋. Don\'t hesitate to reach out with the contact information below, or send a message using the form.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Let\'s build something together!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Let’s build something together!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">It is our choices, Harry, that show what we truly are, far more than our abilities.</string>
-    <string name="gutenberg_native_inspiration">Inspiration</string>
-    <string name="gutenberg_native_get_in_touch">Get in Touch</string>
+    <string name="gutenberg_native_link_settings">Link Settings</string>
     <string name="gutenberg_native_excerpt_length_words">Excerpt length (words)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Email me: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Don’t cry because it’s over, smile because it happened.</string>
     <string name="gutenberg_native_customize">CUSTOMISE</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
+    <string name="gutenberg_native_video_settings">Video settings</string>
     <string name="gutenberg_native_add_paragraph_block">Add Paragraph Block</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">A short description of the services you offer.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">A short bio with personal history, key achievements, or an interesting fact.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">A description of the project and the works presented.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">Create a post</string>
     <string name="post_list_tab_trashed_posts">Binned</string>
     <string name="post_list_tab_scheduled_posts">Scheduled</string>
     <string name="post_list_tab_published_posts">Published</string>
     <string name="sharing_facebook_account_must_have_pages">The Facebook connection cannot find any Pages. Publicise cannot connect to Facebook Profiles, only published Pages.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Not Connected</string>
-    <string name="my_site_select_domains_page_title">Site Address</string>
     <string name="notifications_tab_title_likes">Likes</string>
     <string name="notifications_tab_title_follows">Follows</string>
     <string name="notifications_tab_title_comments">Comments</string>
@@ -429,14 +824,12 @@ Language: en_GB
     <string name="stats_management_add_new_stats_card">Add new stats card</string>
     <string name="reader_self_hosted_select_filter">Use the filter button to find posts on specific subjects</string>
     <string name="reader_bottom_sheet_content_description">Select a Tag or Site, Pop Up Window</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selected</string>
     <string name="reader_btn_select_filter_content_description">Select a Site or Tag to filter posts</string>
     <string name="reader_btn_remove_filter_content_description">Remove the current filter</string>
     <string name="reader_title_subs">Manage Topics and Sites</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Log in to WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Log in to WordPress.com to see the latest posts from topics you follow</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Log in to WordPress.com to see the latest posts from sites you follow</string>
-    <string name="gutenberg_native_template_preview">Template Preview</string>
     <string name="gutenberg_native_replace_current_block">Replace Current Block</string>
     <string name="gutenberg_native_add_to_end">Add To End</string>
     <string name="gutenberg_native_add_to_beginning">Add To Beginning</string>
@@ -450,7 +843,6 @@ Language: en_GB
     <string name="reader_filter_cta">Filter</string>
     <string name="gutenberg_native_video_caption_s">Video caption. %s</string>
     <string name="gutenberg_native_edit_video">Edit video</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Double tap to select layout</string>
     <string name="gutenberg_native_add_a_shortcode">Add a shortcode…</string>
     <string name="post_list_author">Post author</string>
     <string name="fab_create_desc">Create a post</string>
@@ -465,10 +857,8 @@ Language: en_GB
     <string name="stats_box_type_low">low</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Move Image Forward</string>
-    <string name="gutenberg_native_move_image_backward">Move Image Backward</string>
+    <string name="gutenberg_native_replace_image">Replace image</string>
     <string name="gutenberg_native_gallery_caption_s">Gallery caption. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Current value is %2$s</string>
     <string name="create_post_page_fab_tooltip">Create a post or page</string>
     <string name="content_description_person_building_website">Person building website</string>
     <string name="post_signup_interstitial_not_right_now">Not right now</string>
@@ -482,21 +872,17 @@ Language: en_GB
     <string name="my_site_bottom_sheet_add_post">Blog post</string>
     <string name="my_site_bottom_sheet_title">Add new</string>
     <string name="post_settings_publish">Publish</string>
-    <string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages, but, if you\'d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sync now</string>
     <string name="dialog_confirm_scheduled_post_sync_message">This post will be synced immediately.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Ready to Sync?</string>
     <string name="new_site_creation_unavailable_domain">This domain is unavailable</string>
-    <string name="login_promo_viewpager_content_description">Introduction</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">We were unable to access your site. You will need to reach out to your host to resolve this.</string>
-    <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b>SSL Certificate&lt;/b>. You will need to reach out to your host to resolve this.</string>
-    <string name="login_discovery_error_http_auth">We were unable to access your site because it requires &lt;b>HTTP Authentication&lt;/b>. You will need to reach out to your host to resolve this.</string>
-    <string name="login_discovery_error_xmlrpc">We were unable to access the &lt;b>XMLRPC file&lt;/b> on your site. You will need to reach out to your host to resolve this.</string>
-    <string name="login_site_credentials_magic_link_label">Almost there! We just need to verify your Jetpack connected email address &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Log in with site credentials.</string>
+    <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b&gt;SSL Certificate&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
+    <string name="login_discovery_error_http_auth">We were unable to access your site because it requires &lt;b&gt;HTTP Authentication&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
+    <string name="login_discovery_error_xmlrpc">We were unable to access the &lt;b&gt;XMLRPC file&lt;/b&gt; on your site. You will need to reach out to your host to resolve this.</string>
+    <string name="login_site_credentials_magic_link_label">Almost there! We just need to verify your Jetpack connected email address &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Log in with your %1$s site credentials</string>
-    <string name="send_verification_email">Send verification email</string>
     <string name="my_site_bottom_sheet_add_page">Site page</string>
     <string name="reader_following_display_name">Following</string>
     <string name="reader_my_likes_display_name">Likes</string>
@@ -509,27 +895,23 @@ Language: en_GB
     <string name="suffix_1_000_000_000_000">%sT</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">We cannot open the posts right now. Please try again later</string>
     <string name="site_cannot_be_loaded">We cannot load the data for your site right now. Please try again later</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress Media Library</string>
+    <string name="gutenberg_native_unsupported">Unsupported</string>
     <string name="gutenberg_native_ungroup">Ungroup</string>
     <string name="gutenberg_native_translate">Translate</string>
-    <string name="gutenberg_native_title">Title:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Tap to hide the keyboard</string>
     <string name="gutenberg_native_tap_here_to_show_help">Tap here to show help</string>
     <string name="gutenberg_native_take_a_video">Take a Video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Take a Photo or Video</string>
     <string name="gutenberg_native_take_a_photo">Take a Photo</string>
     <string name="gutenberg_native_start_writing">Start writing…</string>
-    <string name="gutenberg_native_size">Size</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Sidebar title plugin</string>
     <string name="gutenberg_native_show_section">Show section</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s block. This block has invalid content</string>
     <string name="gutenberg_native_s_block_empty">%s block. Empty</string>
     <string name="gutenberg_native_cut_block">Cut block</string>
-    <string name="gutenberg_native_reset_block">Reset Block</string>
-    <string name="gutenberg_native_remove_annotations">Remove annotations</string>
     <string name="gutenberg_native_problem_opening_the_video">Problem opening the video</string>
     <string name="gutenberg_native_problem_displaying_block">Problem displaying block</string>
     <string name="gutenberg_native_post_title_s">Post title. %s</string>
@@ -539,17 +921,12 @@ Language: en_GB
     <string name="gutenberg_native_open_settings">Open Settings</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">No application can handle this request. Please install a web browser.</string>
     <string name="gutenberg_native_navigate_up">Navigate Up</string>
-    <string name="gutenberg_native_my_pre_publish_panel">My pre-publish panel</string>
-    <string name="gutenberg_native_my_post_status_info">My post status info</string>
-    <string name="gutenberg_native_my_post_publish_panel">My post publish panel</string>
-    <string name="gutenberg_native_my_document_setting_panel">My Document Setting Panel</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Move block up from row %1$s to row %2$s</string>
     <string name="gutenberg_native_move_block_up">Move block up</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Move block down from row %1$s to row %2$s</string>
     <string name="gutenberg_native_move_block_down">Move block down</string>
     <string name="gutenberg_native_image_caption_s">Image caption. %s</string>
     <string name="gutenberg_native_hide_keyboard">Hide keyboard</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Here is the panel content!</string>
     <string name="gutenberg_native_help_icon">Help icon</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Failed to insert media.\nPlease tap for options.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Double tap to undo last change</string>
@@ -561,34 +938,28 @@ Language: en_GB
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Double tap to move the block up</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Double tap to move the block down</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Double tap to edit this value</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Double tap to change the value using slider</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Double tap to add a block</string>
     <string name="gutenberg_native_current_value_is_s">Current value is %s</string>
-    <string name="gutenberg_native_content">Content…</string>
     <string name="gutenberg_native_choose_from_device">Choose from device</string>
-    <string name="gutenberg_native_annotations_sidebar">Annotations Sidebar</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">An unknown error occurred. Please try again.</string>
     <string name="gutenberg_native_alt_text">Alt Text</string>
     <string name="gutenberg_native_add_video">ADD VIDEO</string>
     <string name="gutenberg_native_add_url">Add URL</string>
+    <string name="gutenberg_native_add_alt_text">Add alt text</string>
     <string name="gutenberg_native_add_image_or_video">ADD IMAGE OR VIDEO</string>
     <string name="gutenberg_native_add_image">ADD IMAGE</string>
     <string name="gutenberg_native_add_block_here">ADD BLOCK HERE</string>
-    <string name="gutenberg_native_add_annotation">Add annotation</string>
-    <string name="gutenberg_native_add_a_description">Add a description</string>
     <string name="reader_empty_saved_posts_content_description">Tap the Add to Save Posts button to save a post to your list.</string>
     <string name="reader_acessibility_list_loaded">The list has loaded with %1$d items.</string>
     <string name="notifications_tab_dialog_switch_desc">Notifications</string>
-    <string name="master_switch_default_title_off">Off</string>
-    <string name="master_switch_default_title_on">On</string>
-    <string name="notifications_tab_dialog_master_off_message">Turning notifications for this site off will disable notifications display on notifications tab for this site. You can fine tune which kind of notification you see after turning notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_off_title">To see notifications on notifications tab for this site, turn notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Enable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Disable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_status_on">Notifications for this site</string>
-    <string name="dialog_gutenberg_informative_description_page">You’re now using the block editor for new pages, great! If you’d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">You’re now using the block editor for new posts, great! If you’d like to change to the classic editor, go to \'My Site\' > \'Site Settings\'.</string>
+    <string name="main_switch_default_title_off">Off</string>
+    <string name="main_switch_default_title_on">On</string>
+    <string name="notifications_tab_dialog_main_off_message">Turning off Notifications for this site will disable the notifications display on the notifications tab for this site. You can fine-tune which kind of notification you see after turning on Notifications for this site.</string>
+    <string name="notifications_tab_dialog_main_off_title">To see notifications on the notifications tab for this site, turn on Notifications for this site.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Enable the notifications display on the notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Disable the notifications display on the notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifications for this site</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifications for this site</string>
     <string name="pick_media">Add image or video</string>
     <string name="error_post_not_submitted_retrying">We couldn\'t submit this post for review, but we\'ll try again later. </string>
     <string name="error_post_not_scheduled_retrying">We couldn\'t schedule this post, but we\'ll try again later.</string>
@@ -681,8 +1052,6 @@ Language: en_GB
     <string name="post_settings_add_to_calendar">Add to calendar</string>
     <string name="post_settings_notification">Notification</string>
     <string name="post_settings_time_and_date">Date and Time</string>
-    <string name="login_need_help_finding_connected_email">Need help finding the email you connected with?</string>
-    <string name="enter_wordpress_site">The website at this address is not a WordPress site. For us to connect to it, the site must have WordPress installed.</string>
     <string name="login_invalid_site_url">Please enter a complete website address, like example.com.</string>
     <string name="enter_email_for_site">Log in with WordPress.com to connect to %1$s</string>
     <string name="stats_post_views_label">Views</string>
@@ -748,7 +1117,7 @@ Language: en_GB
     <string name="domain_registration_state_picker_dialog_title">Select State</string>
     <string name="domain_registration_country_picker_dialog_title">Select Country</string>
     <string name="domain_registration_result_continue_button">continue</string>
-    <string name="domain_registration_result_description">your new domain &lt;b>%s&lt;/b> is being set up. Your site is\n        doing somersaults in excitement!</string>
+    <string name="domain_registration_result_description">your new domain &lt;b&gt;%s&lt;/b&gt; is being set up. Your site is\n        doing somersaults in excitement!</string>
     <string name="domain_registration_result_title">Congratulations</string>
     <string name="domain_contact_information_register_domain_button">Register Domain</string>
     <string name="domain_contact_information_postal_code_hint">Postcode</string>
@@ -856,24 +1225,20 @@ Language: en_GB
     <string name="plans_loading_error_no_plans_title">Cannot load Plans</string>
     <string name="plans_loading_error_network_title">No connection</string>
     <string name="menu_switch_to_gutenberg_editor">Switch to block editor</string>
-    <string name="menu_switch_to_aztec_editor">Switch to classic editor</string>
     <string name="stats_loading_block_error">There was a problem loading your data, refresh your page to try again.</string>
     <string name="stats_loading_error">Data not loaded</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edit new posts and pages with the Block Editor</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Use Block Editor</string>
-    <string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
     <string name="exit">exit</string>
     <string name="quick_start_sites_type_subtitle">%1$d of %2$d complete</string>
-    <string name="quick_start_sites_type_grow">Grow Your Audience</string>
-    <string name="quick_start_sites_type_customize">Customise Your Site</string>
+    <string name="quick_start_sites_type_grow">Grow your audience</string>
+    <string name="quick_start_sites_type_customize">Customise your site</string>
     <string name="quick_start_sites">Next Steps</string>
     <string name="quick_start_complete_tasks_header">Complete (%d)</string>
     <string name="quick_start_dialog_view_site_message">Enjoy your finished product!</string>
     <string name="quick_start_dialog_upload_icon_title">Upload a site icon</string>
     <string name="quick_start_dialog_upload_icon_message">Your visitors will see your icon in their browser. Add a custom icon for a polished, pro look.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Tap %1$s Plan %2$s to see your current plan and other available plans</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tap %1$s Add Page %2$s to create a new page.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Tap %1$s Pages %2$s to continue.</string>
     <string name="quick_start_dialog_check_stats_message_short">Tap %1$s Stats %2$s to see how your site is performing.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tap %1$s Your Site Icon %2$s to upload a new one</string>
     <string name="quick_start_dialog_publish_post_message">Draft and publish your first post.</string>
@@ -884,13 +1249,8 @@ Language: en_GB
     <string name="quick_start_dialog_explore_plans_message">Learn about the marketing and SEO tools in our paid plans.</string>
     <string name="quick_start_dialog_enable_sharing_title">Enable post sharing</string>
     <string name="quick_start_dialog_enable_sharing_message">Automatically share new posts to your social media accounts.</string>
-    <string name="quick_start_dialog_customize_site_message">Tweak fonts, add images, and more.</string>
-    <string name="quick_start_dialog_create_page_title">Create a new page</string>
-    <string name="quick_start_dialog_create_page_message">Add a page for key content — an \"About\" page is a great start.</string>
     <string name="quick_start_dialog_check_stats_title">Check your site stats</string>
     <string name="quick_start_dialog_check_stats_message">Keep up to date on your site\'s performance.</string>
-    <string name="quick_start_dialog_browse_themes_title">Browse themes</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore dozens of layout options and find your perfect fit.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Removing Next Steps will hide all tours on this site. This action cannot be undone.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Remove Next Steps</string>
     <string name="quick_start_remove_next_steps_menu_title">Remove this</string>
@@ -914,15 +1274,11 @@ Language: en_GB
     <string name="notification_new_site_creation_failed">There was a problem</string>
     <string name="notification_new_site_creation_title">Create Site</string>
     <string name="new_site_creation_create_site_button">Create Site</string>
-    <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="site_creation_error_generic_title">There was a problem</string>
     <string name="site_creation_fetch_suggestions_error_unknown">There was a problem</string>
-    <string name="site_creation_segments_subtitle">This helps us make recommendations. But you’re never locked in — all sites evolve!</string>
-    <string name="site_creation_segments_title">Tell us what kind of site you’d like to make</string>
     <string name="new_site_creation_preview_title">Your site has been created!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d of %2$d</string>
     <string name="new_site_creation_screen_title_general">Create Site</string>
@@ -1077,15 +1433,9 @@ Language: en_GB
     <string name="quick_start_dialog_need_help_button_neutral">Never</string>
     <string name="quick_start_dialog_need_help_button_negative">No Thanks</string>
     <string name="quick_start_dialog_follow_sites_title">Follow other sites</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar interests</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar topics</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tap %1$s Reader %2$s to continue</string>
     <string name="quick_start_dialog_follow_sites_message">Find sites that inspire you, and follow them to get updates when they post.</string>
-    <string name="quick_start_dialog_customize_site_title">Customise your site</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tap %1$s Themes %2$s to continue</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tap %1$s Customise %2$s to start personalising your site</string>
-    <string name="quick_start_dialog_choose_theme_title">Choose a theme</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tap %1$s Themes %2$s to discover new themes</string>
-    <string name="quick_start_dialog_choose_theme_message">Browse all our themes to find your perfect fit.</string>
     <string name="quick_start_button_positive">Go</string>
     <string name="quick_start_button_negative_short">Cancel</string>
     <string name="quick_start_button_negative">Not now</string>
@@ -1149,14 +1499,12 @@ Language: en_GB
     <string name="support_contact_email">Contact email</string>
     <string name="application_log_button">Application log</string>
     <string name="my_tickets">My Tickets</string>
-    <string name="activity_log_rewind_dialog_message">Are you sure you want to rewind your site back to %1$s at %2$s? This will remove all content and options created or changed since then.</string>
-    <string name="activity_log_rewind_site">Rewind Site</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rewind in progress</string>
-    <string name="activity_log_currently_restoring_message">Rewinding to %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restore in progress</string>
+    <string name="activity_log_currently_restoring_message">Restoring to %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Currently restoring your site</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Your site has been successfully restored</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRewound to %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRewinding to %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRestored to %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRestoring to %1$s %2$s</string>
     <string name="activity_log_button">Activity Log action button</string>
     <string name="plugin_auto_managed">Auto-managed</string>
     <string name="reader_save_posts_locally_dialog_message">Save this post and come back to read it whenever you like. It will only be available on this device — saved posts don\'t sync to your other devices.</string>
@@ -1166,20 +1514,16 @@ Language: en_GB
     <string name="comment_read_source_post">Read the source post</string>
     <string name="sites">Sites</string>
     <string name="signup_magic_link_title">Magic link sent</string>
-    <string name="signup_email_screen_title">Email signup</string>
     <string name="verification_2fa_screen_title">Code verification</string>
     <string name="selfhosted_site_login_title">Login credentials</string>
     <string name="magic_link_sent_login_title">Magic link sent</string>
     <string name="magic_link_login_title">Magic link login</string>
     <string name="site_address_login_title">Site address login</string>
     <string name="email_address_login_title">Email address login</string>
-    <string name="alternatively">Alternatively:</string>
     <string name="reader_empty_saved_posts_description">Tap %s to save a post to your list.</string>
     <string name="reader_empty_saved_posts_title">No posts saved — yet!</string>
     <string name="reader_bookmark_snack_title">Post saved</string>
     <string name="reader_bookmark_snack_btn">View All</string>
-    <string name="reader_btn_bookmarked">Saved</string>
-    <string name="reader_btn_bookmark">Save</string>
     <string name="reader_remove_bookmark">Remove from saved posts</string>
     <string name="reader_add_bookmark">Add to saved posts</string>
     <string name="reader_save_for_later_title">Saved posts</string>
@@ -1199,11 +1543,9 @@ Language: en_GB
     <string name="reader_btn_notifications_on">Turn on site notifications</string>
     <string name="reader_btn_notifications_off">Turn off site notifications</string>
     <string name="activity_log_jetpack_icon">Jetpack icon</string>
-    <string name="rewind">Rewind</string>
     <string name="activity_log_event">Event</string>
     <string name="activity_log_icon">Activity icon</string>
     <string name="activity_log">Activity Log</string>
-    <string name="activity">Activity</string>
     <string name="privacy_policy_read">Read privacy policy</string>
     <string name="third_party_policy_learn_more_caption">We use other tracking tools, including some from third parties. Read about these and how to control them.</string>
     <string name="third_party_policy_learn_more_header">Third Party Policy</string>
@@ -1214,7 +1556,6 @@ Language: en_GB
     <string name="preference_privacy_settings">Privacy settings</string>
     <string name="preference_collect_information">Collect information</string>
     <string name="post_submitted">Post submitted</string>
-    <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Plugin feature requires the site to be in good standing.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Plugin feature requires primary domain subscription to be associated with this user.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Plugin feature requires admin privileges.</string>
@@ -1313,7 +1654,6 @@ Language: en_GB
     <string name="edit_photo_screen_title">Edit Photo</string>
     <string name="share_intent_screen_title">Pick site</string>
     <string name="signup_epilogue_screen_title">New account</string>
-    <string name="login_prologue_screen_title">Login</string>
     <string name="login_epilogue_screen_title">Logged in as</string>
     <string name="person_detail_screen_title">Person detail</string>
     <string name="media_settings_screen_title">File details</string>
@@ -1327,7 +1667,7 @@ Language: en_GB
     <string name="license_screen_title">Licence</string>
     <string name="release_notes_screen_title">Release notes</string>
     <string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
-    <string name="permissions_denied_message">It looks like you turned off permissions required for this feature.&lt;br/>&lt;br/>To change this, edit your permissions and make sure &lt;strong>%s&lt;/strong> is enabled.</string>
+    <string name="permissions_denied_message">It looks like you turned off permissions required for this feature.&lt;br/&gt;&lt;br/&gt;To change this, edit your permissions and make sure &lt;strong&gt;%s&lt;/strong&gt; is enabled.</string>
     <string name="permissions_denied_title">Permissions</string>
     <string name="plugin_caption_featured">Featured</string>
     <string name="sharing_disabled_description">You cannot access your sharing settings because your Sharing Jetpack module is disabled.</string>
@@ -1368,7 +1708,6 @@ Language: en_GB
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 post with 1 file not uploaded</string>
     <string name="untitled_in_parentheses">(Untitled)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Create site</string>
     <string name="notification_site_creation_created">Tap to continue.</string>
     <string name="notification_site_creation_title_success">Site created!</string>
@@ -1382,11 +1721,8 @@ Language: en_GB
     <string name="username_changer_dismiss_button_positive">Discard</string>
     <string name="username_changer_action">Save</string>
     <string name="content_description_add_avatar">Add avatar</string>
-    <string name="signup_with_google_button">Sign Up with Google</string>
-    <string name="signup_with_email_button">Sign Up with Email</string>
     <string name="signup_user_exists">Email already exists on WordPress.com.\nProceeding with login.</string>
     <string name="signup_updating_account">Updating account…</string>
-    <string name="signup_terms_of_service_text">By signing up, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="signup_magic_link_progress">Sending email</string>
     <string name="signup_magic_link_error_button_positive">Retry</string>
     <string name="signup_magic_link_error_button_negative">Close</string>
@@ -1399,11 +1735,6 @@ Language: en_GB
     <string name="signup_epilogue_error_button_negative">Revert</string>
     <string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
     <string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
-    <string name="signup_email_header">To create your new WordPress.com account, please enter your email address.</string>
-    <string name="signup_email_error_generic">There was some trouble checking the email address.</string>
-    <string name="sign_up">Sign Up for WordPress.com</string>
-    <string name="enter_username_instead">Log in with your username.</string>
-    <string name="enter_site_address_instead">Log in by entering your site address.</string>
     <string name="plugin_needs_update">Needs update</string>
     <string name="plugin_caption_search">Search Plugins</string>
     <string name="plugin_caption_new">New</string>
@@ -1524,7 +1855,6 @@ Language: en_GB
     <string name="login_error_suffix">\nMaybe try a different account?</string>
     <string name="login_error_generic">There was some trouble connecting with the Google account.</string>
     <string name="login_error_button">Close</string>
-    <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
     <string name="error_generic_network">A network error occurred. Please check your connection and try again.</string>
     <string name="post_settings_remove_featured_image">Remove featured image</string>
@@ -1536,12 +1866,11 @@ Language: en_GB
     <string name="jetpack_disconnect_confirm">Disconnect</string>
     <string name="jetpack_disconnect_confirmation_message">Are you sure you want to disconnect Jetpack from the site?</string>
     <string name="jetpack_disconnect_pref_title">\"Disconnect from WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">You may whitelist an IP address or series of addresses preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">You may mark an IP address (or series of addresses) as \"Always allowed\", preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Require two-step authentication</string>
     <string name="jetpack_match_wpcom_via_email_title">Match accounts using email</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Allow WordPress.com login</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com login</string>
-    <string name="jetpack_brute_force_whitelist_title">Whitelisted IP addresses</string>
     <string name="jetpack_prevent_brute_force_title">Block malicious login attempts</string>
     <string name="jetpack_prevent_brute_force_category_title">Brute force attack protection</string>
     <string name="jetpack_send_wp_notifications_title">Send push notifications</string>
@@ -1582,12 +1911,12 @@ Language: en_GB
     <string name="notification_settings_category_other">Other</string>
     <string name="notification_settings_item_your_sites_all_your_sites">All My Sites</string>
     <string name="notification_settings_category_your_sites">Your Sites</string>
-    <string name="notification_settings_master_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
-    <string name="notification_settings_master_off_title">To receive notifications on this device, turn Notification Settings on.</string>
-    <string name="notification_settings_master_hint_off">Enable notifications</string>
-    <string name="notification_settings_master_hint_on">Disable notifications</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_status_on">On</string>
+    <string name="notification_settings_main_off_message">Turning off Notification Settings will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning on Notification Settings.</string>
+    <string name="notification_settings_main_off_title">To receive notifications on this device, turn on Notification Settings.</string>
+    <string name="notification_settings_main_hint_off">Enable notifications</string>
+    <string name="notification_settings_main_hint_on">Disable notifications</string>
+    <string name="notification_settings_main_status_off">Off</string>
+    <string name="notification_settings_main_status_on">On</string>
     <string name="max_video_resolution">Maximum Video Size</string>
     <string name="max_thumbnail_px_size">Maximum Image Size</string>
     <string name="error_upload_post_media_param">There was an error uploading the media in this post: %s.</string>
@@ -1624,7 +1953,6 @@ Language: en_GB
     <string name="login_site_address_more_help">Need more help?</string>
     <string name="login_site_address_help_content">Your site address appears in the bar at the top of the screen when you visit your site in Chrome.</string>
     <string name="login_site_address_help_title">What\'s my site address?</string>
-    <string name="login_site_address_help">Need help finding your site address?</string>
     <string name="login_site_address">Site address</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
@@ -1636,7 +1964,6 @@ Language: en_GB
     <string name="requesting_otp">Requesting a verification code via SMS.</string>
     <string name="login_text_otp">Text me a code instead</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
-    <string name="open_mail">Open mail</string>
     <string name="next">Next</string>
     <string name="enter_email_wordpress_com">Log in to WordPress.com using an email address to manage all your WordPress sites.</string>
     <string name="image_optimization_promo_desc">Image optimisation shrinks images for quicker uploading.\n\nYou can change this any time in site settings.</string>
@@ -1659,10 +1986,6 @@ Language: en_GB
     <string name="post_status_draft">Draft</string>
     <string name="post_status_pending_review">Pending review</string>
     <string name="post_status_publish_post">Publish</string>
-    <string name="change_location">Change Location</string>
-    <string name="remove_location">Remove Location</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Can\'t open the Location Picker, Google Play Services is not available</string>
-    <string name="post_settings_location">Location</string>
     <string name="now">Now</string>
     <string name="post_settings_password_dialog_hint">Only those with this password can view this post</string>
     <string name="post_settings_excerpt_dialog_hint">Excerpts are optional hand-crafted summaries of your content.</string>
@@ -1846,7 +2169,7 @@ Language: en_GB
     <string name="signout">Log out</string>
     <string name="sign_in_wpcom">Log in to WordPress.com</string>
     <string name="reader_label_global_related_posts">More on WordPress.com</string>
-    <string name="reader_label_local_related_posts">More in %s</string>
+    <string name="reader_label_local_related_posts">More from %s</string>
     <string name="preference_open_device_settings">Open device settings</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
@@ -1894,20 +2217,16 @@ Language: en_GB
     <string name="invite_error_invalid_usernames_multiple">Cannot send: There are invalid usernames or emails</string>
     <string name="invite_error_invalid_usernames_one">Cannot send: A username or email is invalid</string>
     <string name="invite_error_no_usernames">Please add at least one username</string>
-    <string name="invite_message_info">(Optional) You can enter a custom message of up to 500 characters that will be included in the invitation to the user(s).</string>
-    <string name="invite_message_remaining_other">%d characters remaining</string>
-    <string name="invite_message_remaining_one">1 character remaining</string>
-    <string name="invite_message_remaining_zero">0 characters remaining</string>
-    <string name="invite_message_title">Custom Message</string>
+    <string name="invite_message_title">Custom message</string>
     <string name="invite">Invite</string>
-    <string name="invite_names_title">Usernames or Emails</string>
+    <string name="invite_names_title">Usernames or emails</string>
     <string name="invite_people">Invite People</string>
     <string name="my_site_header_external">External</string>
-    <string name="send_link">Send link</string>
     <string name="label_clear_search_history">Clear search history</string>
     <string name="dlg_confirm_clear_search_history">Clear search history?</string>
     <string name="reader_empty_search_description">No results found for %s for your language</string>
     <string name="reader_hint_post_search">Search WordPress</string>
+    <string name="reader_title_related_post_detail">Related Post</string>
     <string name="preview_screen_links_disabled">Links are disabled on the preview screen</string>
     <string name="send">Send</string>
     <string name="person_removed">Successfully removed %1$s</string>
@@ -1926,7 +2245,6 @@ Language: en_GB
     <string name="checking_email">Checking email</string>
     <string name="magic_link_unavailable_error_message">Currently unavailable. Please enter your password</string>
     <string name="logging_in">Logging in</string>
-    <string name="enter_your_password_instead">Enter your password instead</string>
     <string name="web_address_dialog_hint">Shown publicly when you comment.</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
     <string name="plans">Plans</string>
@@ -2047,7 +2365,7 @@ Language: en_GB
     <string name="site_settings_paging_dialog_description">Break comment threads into multiple pages.</string>
     <string name="site_settings_paging_dialog_header">Comments per page</string>
     <string name="site_settings_close_after_dialog_title">Close commenting</string>
-    <string name="site_settings_blacklist_description">When a comment contains any of these words in its content, name, URL, email, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+    <string name="site_settings_denylist_description">When a comment contains any of these words in its content, name, URL, email, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
     <string name="site_settings_list_editor_no_items_text">No items</string>
@@ -2062,10 +2380,10 @@ Language: en_GB
     <string name="site_settings_rp_show_header_title">Show Header</string>
     <string name="site_settings_rp_switch_summary">Related Posts displays relevant content from your site below your posts.</string>
     <string name="site_settings_rp_switch_title">Show Related Posts</string>
-    <string name="site_settings_blacklist_hint">Comments that match a filter are marked as spam</string>
+    <string name="site_settings_denylist_hint">Comments that match a filter are marked as spam</string>
     <string name="site_settings_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
     <string name="site_settings_multiple_links_hint">Ignores link limit from known users</string>
-    <string name="site_settings_whitelist_hint">Comment author must have a previously approved comment</string>
+    <string name="site_settings_allowlist_hint">Comment author must have a previously approved comment</string>
     <string name="site_settings_user_account_required_hint">Users must be registered and logged in to comment</string>
     <string name="site_settings_identity_required_hint">Comment author must fill out name and e-mail</string>
     <string name="site_settings_paging_hint">Display comments in chunks of a specified size</string>
@@ -2088,17 +2406,16 @@ Language: en_GB
     <string name="site_settings_address_hint">Changing your address is not currently supported</string>
     <string name="site_settings_tagline_hint">A short description or catchy phrase to describe your blog</string>
     <string name="site_settings_title_hint">In a few words, explain what this site is about</string>
-    <string name="site_settings_whitelist_known_summary">Comments from known users</string>
-    <string name="site_settings_whitelist_all_summary">Comments from all users</string>
+    <string name="site_settings_allowlist_known_summary">Comments from known users</string>
+    <string name="site_settings_allowlist_all_summary">Comments from all users</string>
     <string name="site_settings_threading_summary">%d levels</string>
     <string name="site_settings_privacy_private_summary">Private</string>
     <string name="site_settings_privacy_hidden_summary">Hidden</string>
     <string name="site_settings_privacy_public_summary">Public</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
     <string name="site_settings_moderation_hold_title">Hold for Moderation</string>
     <string name="site_settings_multiple_links_title">Links in comments</string>
-    <string name="site_settings_whitelist_title">Automatically approve</string>
+    <string name="site_settings_allowlist_title">Automatically approve</string>
     <string name="site_settings_paging_title">Paging</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_sort_by_title">Sort by</string>
@@ -2247,7 +2564,6 @@ Language: en_GB
     <string name="logs_copied_to_clipboard">Application logs have been copied to the clipboard</string>
     <string name="reader_empty_posts_in_blog">This site is empty</string>
     <string name="reader_label_new_posts">New posts</string>
-    <string name="reader_page_recommended_blogs">Sites you may like</string>
     <string name="error_copy_to_clipboard">An error occurred while copying text to clipboard</string>
     <string name="post_uploading">Uploading post</string>
     <string name="stats_followers_years">%1$d years</string>
@@ -2312,7 +2628,6 @@ Language: en_GB
     <string name="reader_title_blog_preview">Reader Site</string>
     <string name="ssl_certificate_ask_trust">If you usually connect to this site without problems, this error could mean that someone is trying to impersonate the site, and you shouldn\'t continue. Would you like to trust the certificate anyway?</string>
     <string name="ssl_certificate_error">Invalid SSL certificate</string>
-    <string name="forgot_password">Lost your password?</string>
     <string name="help">Help</string>
     <string name="username_or_password_incorrect">The username or password you entered is incorrect</string>
     <string name="email_invalid">Enter a valid email address</string>
diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml
index 247bd255b33d..a32c9ae261f2 100644
--- a/WordPress/src/main/res/values-es-rCL/strings.xml
+++ b/WordPress/src/main/res/values-es-rCL/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2020-05-09 06:46:56+0000
 Plural-Forms: nplurals=2; plural=n != 1;
@@ -61,18 +61,14 @@ Language: es_CL
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edita nuevas publicaciones y páginas con el editor de bloques</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Utiliza el Editor de Bloques</string>
     <string name="menu_switch_to_gutenberg_editor">Cambiar al editor de bloques</string>
-    <string name="dialog_gutenberg_informative_title">Editor de Bloques Habilitado</string>
     <string name="exit">salir</string>
     <string name="quick_start_sites_type_subtitle">%1$d de %2$d completado</string>
-    <string name="quick_start_sites_type_grow">Haz crecer tu audiencia</string>
-    <string name="quick_start_sites_type_customize">Personaliza Tu Sitio</string>
     <string name="quick_start_sites">Siguientes pasos</string>
     <string name="quick_start_complete_tasks_header">Completo (%d)</string>
     <string name="quick_start_dialog_view_site_message">¡Disfruta de tu producto terminado!</string>
     <string name="quick_start_dialog_upload_icon_title">Carga un icono de sitio</string>
     <string name="quick_start_dialog_upload_icon_message">Tus visitantes verán tu ícono en su navegador. Agrega un ícono personalizado para un look pulido y profesional.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Puntea %1$s Plan %2$s para ver su plan actual y otros planes disponibles</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Punte %1$s Agregar Página %2$s para crear una nueva página.</string>
     <string name="quick_start_dialog_check_stats_message_short">Toca %1$s Estadísticas %2$s para ver cómo está funcionando tu sitio.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Puntea %1$sEl Icono de tu Sitio%2$s para cargar uno nuevo</string>
     <string name="quick_start_dialog_publish_post_message">Redacta y publica tu primera entrada.</string>
@@ -83,13 +79,8 @@ Language: es_CL
     <string name="quick_start_dialog_explore_plans_message">Obtén información sobre las herramientas de marketing y SEO en nuestros planes pagados.</string>
     <string name="quick_start_dialog_enable_sharing_title">Habilita el compartir publicaciones</string>
     <string name="quick_start_dialog_enable_sharing_message">Comparte automáticamente nuevas publicaciones en tus cuentas de redes sociales.</string>
-    <string name="quick_start_dialog_customize_site_message">Modifica fuentes, añade imágenes y mucho más.</string>
-    <string name="quick_start_dialog_create_page_title">Crea una nueva página</string>
-    <string name="quick_start_dialog_create_page_message">Agrega una página para el contenido clave — una página \"acerca de\" es un gran comienzo.</string>
     <string name="quick_start_dialog_check_stats_title">Consulta las estadísticas de tu sitio</string>
     <string name="quick_start_dialog_check_stats_message">Manténte al día sobre el rendimiento de tu sitio.</string>
-    <string name="quick_start_dialog_browse_themes_title">Examina temas</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore docenas de opciones de diseño y encuentra el que más te guste.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Si eliminas los Siguientes Pasos ocultarás todas las guías de este sitio. Esto no se puede deshacer.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Eliminar Siguientes Pasos</string>
     <string name="quick_start_remove_next_steps_menu_title">Quitar esto</string>
@@ -113,15 +104,11 @@ Language: es_CL
     <string name="notification_new_site_creation_creating_site_subtitle">Estamos creando tu nuevo sitio</string>
     <string name="notification_new_site_creation_title">Crear sitio</string>
     <string name="new_site_creation_create_site_button">Crear sitio</string>
-    <string name="new_site_creation_search_domain_input_hint">Buscar Dominios</string>
     <string name="new_site_creation_domain_header_subtitle">Aquí es donde la gente te encontrará en Internet.</string>
     <string name="site_creation_error_generic_title">Hubo un problema</string>
-    <string name="new_site_creation_domain_header_title">Elige un nombre de dominio para tu sitio</string>
     <string name="new_site_creation_empty_domain_list_message">No hay direcciones disponibles que coincidan con tu búsqueda</string>
     <string name="site_creation_error_generic_subtitle">Error al comunicarse con el servidor, inténtalo de nuevo</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Hubo un problema</string>
-    <string name="site_creation_segments_subtitle">Esto nos ayuda a hacer recomendaciones. Pero nunca estás encerrado — ¡todos los sitios evolucionan!</string>
-    <string name="site_creation_segments_title">Dinos qué tipo de sitio te gustaría hacer</string>
     <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
     <string name="new_site_creation_preview_title">¡Tu sitio ha sido creado!</string>
     <string name="new_site_creation_screen_title_general">Crear sitio</string>
@@ -271,20 +258,13 @@ Language: es_CL
     <string name="quick_start_dialog_need_help_button_positive">Aceptar</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
     <string name="quick_start_dialog_follow_sites_title">Seguir otros sitios</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Buscar %2$s para encontrar sitios con intereses similares</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tap %1$s Lector %2$s para continuar</string>
-    <string name="quick_start_dialog_customize_site_title">Personaliza tu sitio</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tap %1$s Temas %2$s para continuar</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tap %1$s Personalizar %2$s para iniciar la personalización de su sitio</string>
     <string name="quick_start_dialog_need_help_button_negative">No Gracias</string>
     <string name="quick_start_dialog_follow_sites_message">Encuentra sitios que te inspiren y síguelos para recibir actualizaciones cuando publiquen.</string>
-    <string name="quick_start_dialog_choose_theme_title">Elija un tema</string>
-    <string name="quick_start_dialog_choose_theme_message">Explora todos nuestros temas para encontrar el que se ajuste a ti.</string>
     <string name="quick_start_button_positive">Ir</string>
     <string name="quick_start_button_negative_short">Cancelar</string>
     <string name="quick_start_button_negative">No ahora</string>
     <string name="my_site_create_new_site_title">No tienes ningún sitio</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Toca %1$s Temas %2$s para descubrir nuevos temas</string>
     <string name="content_description_more">Más</string>
     <string name="login_to_to_connect_jetpack">Inicia sesión en la cuenta WordPress.com que usaste para conectar jetpack.</string>
     <string name="install_jetpack_retry">Reintentar</string>
@@ -331,10 +311,6 @@ Language: es_CL
     <string name="support_identity_input_dialog_email_label">Correo</string>
     <string name="support_push_notification_title">WordPress</string>
     <string name="my_tickets">Mis Tickets</string>
-    <string name="activity_log_currently_restoring_message">Rebobinar a %1$s %2$s</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rebobinado en curso</string>
-    <string name="activity_log_rewind_dialog_message">¿Está seguro de que desea rebobinar tu sitio de vuelta a%1$s en %2$s? Esto eliminará todo el contenido y las opciones creadas o cambiadas desde entonces.</string>
-    <string name="activity_log_rewind_site">Rebobinar Sitio</string>
     <string name="application_log_button">Registro de aplicaciones</string>
     <string name="support_contact_email">Email de contacto</string>
     <string name="support_contact_email_not_set">No establecido</string>
@@ -344,18 +320,14 @@ Language: es_CL
     <string name="notification_channel_transient_title">Pasajero</string>
     <string name="activity_log_button">Botón de acción del Registro de Actividad</string>
     <string name="activity_log_currently_restoring_title">Actualmente restaurando tu sitio</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Su sitio ha sido restaurado con éxito\nRebobinado a %1$s %2$s</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Su sitio ha sido restaurado con éxito</string>
-    <string name="activity_log_rewind_started_snackbar_message">Su sitio se está restaurando\nRebobinando a %1$s %2$s</string>
     <string name="plugin_auto_managed">Auto-administrado</string>
     <string name="reader_empty_search_title">No se encontraron resultados</string>
     <string name="reader_empty_search_request_failed">No se pudo realizar la búsqueda</string>
     <string name="reader_save_posts_locally_dialog_title">Guardar Entrada para Más tarde</string>
     <string name="sites">Sitios</string>
     <string name="comment_read_source_post">Leer la entrada de origen</string>
-    <string name="signup_email_screen_title">Registro de correo electrónico</string>
     <string name="signup_magic_link_title">Enlace mágico enviado</string>
-    <string name="alternatively">Alternativamente:</string>
     <string name="email_address_login_title">Dirección de correo electrónico</string>
     <string name="magic_link_login_title">Inicio de sesión con Enlace Mágico</string>
     <string name="magic_link_sent_login_title">Enlace mágico enviado</string>
@@ -364,8 +336,6 @@ Language: es_CL
     <string name="verification_2fa_screen_title">Verificación de código</string>
     <string name="reader_bookmark_snack_title">Se guardó la entrada</string>
     <string name="reader_bookmark_snack_btn">Ver todas</string>
-    <string name="reader_btn_bookmarked">Guardado</string>
-    <string name="reader_btn_bookmark">Guardar</string>
     <string name="removed">Eliminado</string>
     <string name="reader_add_bookmark">Agregar a entradas guardadas</string>
     <string name="reader_empty_saved_posts_description">Pulse %s para guardar un mensaje en la lista.</string>
@@ -384,7 +354,6 @@ Language: es_CL
     <string name="my_site_icon_dialog_change_message">¿Cómo te gustaría editar el icono?</string>
     <string name="my_site_icon_dialog_change_requires_permission_message">No tienes permiso para editar el icono del sitio.</string>
     <string name="activity_log_jetpack_icon">Icono de jetpack</string>
-    <string name="activity">Actividad</string>
     <string name="privacy_policy_learn_more_header">Política de Privacidad</string>
     <string name="cookie_policy_learn_more_header">Política de Cookies</string>
     <string name="activity_log">Registro de actividades</string>
@@ -398,11 +367,9 @@ Language: es_CL
     <string name="reader_btn_notifications_off">Desactivar notificaciones del sitio</string>
     <string name="reader_btn_notifications_on">Activar notificaciones de sitio</string>
     <string name="reader_followed_blog_notifications">¿Habilitar notificaciones para %1$s%2$s%3$s?</string>
-    <string name="rewind">Rebobinar</string>
     <string name="third_party_policy_learn_more_caption">Usamos otras herramientas de rastreo, incluyendo algunas de terceras partes. Lee acerca de estos y cómo controlarlos.</string>
     <string name="third_party_policy_learn_more_header">Política de Terceras Partes</string>
     <string name="post_submitted">Entrada enviada</string>
-    <string name="login_email_button_signup">¿No tienes una cuenta? %1$sIngresar%2$s</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">La característica del plugin requiere que la suscripción de dominio principal se asocie con este usuario.</string>
     <string name="plugin_install_site_ineligible_site_graylisted">La característica del plugin requiere que el sitio esté en buena forma.</string>
     <string name="plugin_install_site_ineligible_email_unverified">La característica del plugin requiere una dirección de correo electrónico verificada.</string>
@@ -485,7 +452,6 @@ Language: es_CL
     <string name="comment_unspam_talkback">Comentario marcado como no spam</string>
     <string name="comment_spam_talkback">Comentario marcado como spam</string>
     <string name="signup_epilogue_screen_title">Cuenta nueva</string>
-    <string name="login_prologue_screen_title">Iniciar Sesión</string>
     <string name="comment_approved_talkback">Comentario aprobado</string>
     <string name="comment_delete_talkback">Comentario eliminado</string>
     <string name="comment_liked_talkback">Me gusta el comentario</string>
@@ -517,7 +483,7 @@ Language: es_CL
     <string name="plugin_caption_featured">Destacado</string>
     <string name="version_with_name_param">Versión %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
-    <string name="permissions_denied_message">Parece que ha desactivado los permisos requeridos para esta función. &lt;br/>&lt;br/>Para cambiar esto, edita tus permisos y asegúrate de que &lt;strong>%s&lt;/strong> está habilitado.</string>
+    <string name="permissions_denied_message">Parece que ha desactivado los permisos requeridos para esta función. &lt;br/&gt;&lt;br/&gt;Para cambiar esto, edita tus permisos y asegúrate de que &lt;strong&gt;%s&lt;/strong&gt; está habilitado.</string>
     <string name="sharing_disabled">Módulo de uso inhabilitado</string>
     <string name="sharing_disabled_description">No puedes acceder a tu configuración de uso compartido porque tu módulo compartido de Jetpack está deshabilitado.</string>
     <string name="notification_sound_has_invalid_path">El sonido elegido tiene una ruta de acceso no válida. Por favor, elija otro.</string>
@@ -549,7 +515,6 @@ Language: es_CL
     <string name="media_file_posts_plural_only_not_uploaded">%1$d entradas no subidas</string>
     <string name="untitled_in_parentheses">(Sin título)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 página con 1 archivo no subido</string>
     <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d entradas/páginas con 1 archivo no subido</string>
     <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d páginas con 1 archivo no subido</string>
@@ -563,8 +528,6 @@ Language: es_CL
     <string name="google_error_timeout">Google tardó mucho en responder. Es posible que tengas que esperar por una mejor conexión.</string>
     <string name="notification_site_creation_created">Toca para continuar.</string>
     <string name="signup_user_exists">El correo electrónico ya existe en WordPress.com.\nProcedemos a Ingresar.</string>
-    <string name="signup_with_email_button">Regístrate con email</string>
-    <string name="signup_with_google_button">Regístrate con Google</string>
     <string name="username_changer_dismiss_button_positive">Descartar</string>
     <string name="username_changer_dismiss_message">¿Descartar cambiar nombre de usuario?</string>
     <string name="username_changer_error_generic">Se ha producido un error al recuperar sugerencias de nombre de usuario.</string>
@@ -572,23 +535,17 @@ Language: es_CL
     <string name="username_changer_header">Tu nombre de usuario actual es %1$s %2$s %3$s. Con pocas excepciones, otros sólo verán el nombre mostrado, %4$s %5$s %6$s.</string>
     <string name="username_changer_hint">Escribe para obtener más sugerencias</string>
     <string name="signup_magic_link_progress">Enviando correo electrónico</string>
-    <string name="signup_terms_of_service_text">Al registrarse, aceptas nuestros %1$sTérminos de Servicio%2$s.</string>
     <string name="signup_updating_account">Actualizando cuenta…</string>
     <string name="signup_magic_link_error_button_positive">Reintentar</string>
     <string name="signup_magic_link_error_button_negative">Cerrar</string>
     <string name="signup_epilogue_hint_username">Nombre de usuario</string>
     <string name="signup_epilogue_error_button_positive">Reintentar</string>
-    <string name="signup_email_error_generic">Hubo algunos problemas para comprobar la dirección de correo electrónico.</string>
-    <string name="signup_email_header">Para crear tu nueva cuenta WordPress.com, por favor ingresa tu dirección de correo electrónico.</string>
     <string name="signup_epilogue_error_avatar">Hubo algún problema al subir tu avatar.</string>
     <string name="signup_epilogue_error_button_negative">Revertir</string>
     <string name="signup_epilogue_error_generic">Hubo algunos problemas al actualizar tu cuenta. Puedes reintentar o revertir los cambios para continuar.</string>
     <string name="signup_epilogue_hint_display">Nombre para Mostrar</string>
     <string name="signup_epilogue_hint_password">Contraseña (opcional)</string>
     <string name="signup_magic_link_error">Hubo algunos problemas para enviar el correo electrónico. Puedes reintentar ahora o cerrar y volver a intentarlo más tarde.</string>
-    <string name="enter_site_address_instead">Inicia sesión ingresando la dirección de tu sitio.</string>
-    <string name="enter_username_instead">Inicia sesión con tu nombre de usuario.</string>
-    <string name="sign_up">Regístrate en WordPress.com</string>
     <string name="plugin_caption_new">Nuevo</string>
     <string name="plugin_caption_popular">Popular</string>
     <string name="plugin_install">Instalar</string>
@@ -707,7 +664,6 @@ Language: es_CL
     <string name="login_error_suffix">\n¿Tal vez intentar con otra cuenta?</string>
     <string name="login_error_generic">Hubieron algunos problemas para conectar con la cuenta de Google.</string>
     <string name="login_error_button">Cerrar</string>
-    <string name="login_google_button_suffix">Inicia sesión con Google.</string>
     <string name="enter_wpcom_password_google">Para continuar con esta cuenta de Google, por favor proporciona la contraseña de WordPress.com. Esto se te pedirá una vez.</string>
     <string name="error_generic_network">Se ha producido un error de red. Por favor revisa tu conexión e inténtalo de nuevo.</string>
     <string name="post_settings_remove_featured_image">Quitar imagen mostrada</string>
@@ -719,12 +675,10 @@ Language: es_CL
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">¿Estás seguro de que deseas desconectar Jetpack del sitio?</string>
     <string name="jetpack_disconnect_pref_title">“Desconectar de WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Puedes poner en la lista blanca una dirección IP o una serie de direcciones para que no sean bloqueadas por Jetpack. IPv4 e IPv6 son aceptables. Para especificar un rango, introduzca el valor inferior y superior separados por un guión. Ejemplo: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Requerir autenticación de dos pasos</string>
     <string name="jetpack_match_wpcom_via_email_title">Empareja cuentas usando correo electrónico</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir Ingresar con WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Ingreso WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Lista blanca de direcciones IP</string>
     <string name="jetpack_prevent_brute_force_title">Bloquear intentos de inicio de sesión malintencionados</string>
     <string name="jetpack_prevent_brute_force_category_title">Protección contra ataques de fuerza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar notificaciones push</string>
@@ -764,12 +718,6 @@ Language: es_CL
     <string name="notification_settings_category_other">Otros</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos Mis Sitios</string>
     <string name="notification_settings_category_your_sites">Sus Sitios</string>
-    <string name="notification_settings_master_off_message">Al activar la configuración de notificación desactivarás todas las notificaciones de esta aplicación, independientemente del tipo. Puedes afinar el tipo de notificaciones que recibes después de activar la Configuración de Notificación.</string>
-    <string name="notification_settings_master_off_title">Para recibir notificaciones en este dispositivo, activa la Configuración de Notificación.</string>
-    <string name="notification_settings_master_hint_off">Habilitar notificaciones</string>
-    <string name="notification_settings_master_hint_on">Deshabilitar notificaciones</string>
-    <string name="notification_settings_master_status_off">Desactivado</string>
-    <string name="notification_settings_master_status_on">Activado</string>
     <string name="max_video_resolution">Tamaño Máximo del Vídeo</string>
     <string name="max_thumbnail_px_size">Tamaño Máximo de la Imagen</string>
     <string name="error_upload_post_media_param">Hubo un error al subir los medios en esta entrada: %s.</string>
@@ -806,7 +754,6 @@ Language: es_CL
     <string name="login_site_address_help_content">Tu dirección de sitio aparece en la barra en la parte superior de la pantalla cuando visitas tu sitio en Chrome.</string>
     <string name="login_site_address_more_help">¿Necesita más ayuda?</string>
     <string name="login_site_address_help_title">¿Cuál es la dirección de mi sitio?</string>
-    <string name="login_site_address_help">¿Necesita ayuda para encontrar la dirección del sitio?</string>
     <string name="login_site_address">Dirección del sitio</string>
     <string name="login_already_logged_in_wpcom">Ya has iniciado sesión en WordPress.com</string>
     <string name="login_continue">Continuar</string>
@@ -817,7 +764,6 @@ Language: es_CL
     <string name="enter_verification_code">¡Ya casi! Por favor ingresa el código de verificación de tu aplicación de Autenticación.</string>
     <string name="next">Siguiente</string>
     <string name="enter_email_wordpress_com">Inicia sesión en WordPress.com usando una dirección de correo electrónico para administrar todos tus sitios de WordPress.</string>
-    <string name="open_mail">Abrir correo</string>
     <string name="image_optimization_promo_desc">La optimización de imagen reduce las imágenes para una carga más rápida.\n\nPuedes cambiarlo en cualquier momento en la configuración del sitio.</string>
     <string name="image_optimization_promo_title">¿Activar la optimización de imágenes?</string>
     <string name="error_media_parse_error">Respuesta inesperada del servidor</string>
@@ -838,10 +784,6 @@ Language: es_CL
     <string name="post_status_draft">Borrador</string>
     <string name="post_status_pending_review">Revisión pendiente</string>
     <string name="post_status_publish_post">Publicar</string>
-    <string name="change_location">Cambiar Ubicación</string>
-    <string name="post_settings_error_placepicker_missing_play_services">No se puede abrir el selector de ubicación, los servicios de Google Play no están disponibles</string>
-    <string name="remove_location">Quitar Ubicación</string>
-    <string name="post_settings_location">Ubicación</string>
     <string name="now">Ahora</string>
     <string name="post_settings_password_dialog_hint">Sólo aquellos con esta contraseña pueden ver esta entrada</string>
     <string name="post_settings_excerpt_dialog_hint">Los extractos son resúmenes hechos a mano de tu contenido.</string>
@@ -1023,7 +965,6 @@ Language: es_CL
     <string name="comment_liked">Me gusta el comentario</string>
     <string name="sign_in_wpcom">Inicia sesión en WordPress.com</string>
     <string name="reader_label_global_related_posts">Más en WordPress.com</string>
-    <string name="reader_label_local_related_posts">Más en %s</string>
     <string name="preference_open_device_settings">Abrir configuración del dispositivo</string>
     <string name="invite_invalid_email">%s: Correo no válido</string>
     <string name="invite_user_blocked_invites">%s: El usuario bloqueó las invitaciones</string>
@@ -1071,20 +1012,14 @@ Language: es_CL
     <string name="invite_error_invalid_usernames_multiple">No se puede enviar: hay nombres de usuario o correos no válidos</string>
     <string name="invite_error_invalid_usernames_one">No se puede enviar: un nombre de usuario o dirección de correo electrónico no es válido</string>
     <string name="invite_error_no_usernames">Por favor agrega al menos un nombre de usuario</string>
-    <string name="invite_message_info">(Opcional) Puedes escribir un mensaje personalizado de hasta 500 caracteres que serán incluidos en la invitación a lo(s) usuario(s).</string>
-    <string name="invite_message_remaining_other">%d caracteres restantes</string>
-    <string name="invite_message_remaining_one">1 caracter restantes</string>
-    <string name="invite_message_remaining_zero">0 caracteres restantes</string>
-    <string name="invite_message_title">Mensaje Personalizado</string>
     <string name="invite">Invitar</string>
-    <string name="invite_names_title">Nombres de usuario o correo electrónico</string>
     <string name="my_site_header_external">Externos</string>
     <string name="invite_people">Invitar Personas</string>
-    <string name="send_link">Enviar enlace</string>
     <string name="label_clear_search_history">Borrar historial de búsqueda</string>
     <string name="dlg_confirm_clear_search_history">¿Borrar historial de búsqueda?</string>
     <string name="reader_empty_search_description">No se encontraron resultados para %s para tu idioma</string>
     <string name="reader_hint_post_search">Buscar en WordPress</string>
+    <string name="reader_title_related_post_detail">Entradas Relacionadas</string>
     <string name="preview_screen_links_disabled">Los vínculos se desactivan en la pantalla de vista previa</string>
     <string name="send">Enviar</string>
     <string name="person_removed">Eliminado con éxito %1$s</string>
@@ -1103,7 +1038,6 @@ Language: es_CL
     <string name="checking_email">Comprobando email</string>
     <string name="magic_link_unavailable_error_message">Actualmente no disponible. Por favor ingresa tu contraseña</string>
     <string name="logging_in">Ingresando</string>
-    <string name="enter_your_password_instead">En vez introduce tu contraseña</string>
     <string name="web_address_dialog_hint">Se muestra públicamente cuando comentas.</string>
     <string name="capture_or_pick_photo">Capturar o seleccionar foto</string>
     <string name="plan">Plan</string>
@@ -1223,7 +1157,6 @@ Language: es_CL
     <string name="site_settings_paging_dialog_description">Rompe los hilos de comentarios en varias páginas.</string>
     <string name="site_settings_paging_dialog_header">Comentarios por página</string>
     <string name="site_settings_close_after_dialog_title">Cerrar comentarios</string>
-    <string name="site_settings_blacklist_description">Cuando un comentario contiene cualquiera de estas palabras en su contenido, nombre, URL, correo electrónico o IP, se marcará como spam. Puedes introducir palabras parciales, así que “Press” coincidirá con \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Cuando un comentario contiene cualquiera de estas palabras en su contenido, nombre, URL, correo electrónico o IP, se llevará a cabo en la cola de moderación. Puedes introducir palabras parciales, así que “press” coincidirá con \"WordPress\".</string>
     <string name="site_settings_list_editor_input_hint">Escriba una palabra o frase</string>
     <string name="site_settings_list_editor_no_items_text">Sin ítems</string>
@@ -1238,10 +1171,8 @@ Language: es_CL
     <string name="site_settings_rp_show_header_title">Mostrar cabecera</string>
     <string name="site_settings_rp_switch_summary">Las entradas relacionadoa exhiben el contenido relevante de tu sitio debajo de tus entradas.</string>
     <string name="site_settings_rp_switch_title">Mostrar Mensajes Relacionados</string>
-    <string name="site_settings_blacklist_hint">Los comentarios que coinciden con un filtro se marcan como spam</string>
     <string name="site_settings_moderation_hold_hint">Los comentarios que coinciden con un filtro se ponen en la cola de moderación</string>
     <string name="site_settings_multiple_links_hint">Omite el límite de vínculos para usuarios conocidos</string>
-    <string name="site_settings_whitelist_hint">El autor del comentario deberá tener un comentario previamente aprobado</string>
     <string name="site_settings_user_account_required_hint">Los usuarios deben registrarse e iniciar sesión para comentar</string>
     <string name="site_settings_identity_required_hint">El autor del comentario debe completar su nombre y correo electrónico</string>
     <string name="site_settings_paging_hint">Mostrar comentarios en trozos de un tamaño especificado</string>
@@ -1264,17 +1195,13 @@ Language: es_CL
     <string name="site_settings_address_hint">El cambio de dirección no está soportado actualmente</string>
     <string name="site_settings_tagline_hint">Una breve descripción o frase pegadiza para describir tu blog</string>
     <string name="site_settings_title_hint">Explica en pocas palabras de qué trata este sitio</string>
-    <string name="site_settings_whitelist_known_summary">Comentarios de usuarios conocidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentarios de todos los usuarios</string>
     <string name="site_settings_threading_summary">%d niveles</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Eliminar sitio</string>
-    <string name="site_settings_blacklist_title">Lista negra</string>
     <string name="site_settings_moderation_hold_title">Mantener para Moderar</string>
     <string name="site_settings_multiple_links_title">Enlaces en comentarios</string>
-    <string name="site_settings_whitelist_title">Aprobar automáticamente</string>
     <string name="site_settings_paging_title">Paginación</string>
     <string name="site_settings_threading_title">Hilo</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -1421,7 +1348,6 @@ Language: es_CL
     <string name="logs_copied_to_clipboard">Los informes de la aplicación se han copiado al portapapeles</string>
     <string name="reader_label_new_posts">Nuevas entradas</string>
     <string name="error_copy_to_clipboard">Ocurrió un error al copiar el texto en el portapapeles</string>
-    <string name="reader_page_recommended_blogs">Sitios que te podrían gustar</string>
     <string name="reader_empty_posts_in_blog">Este sitio está vacío</string>
     <string name="post_uploading">Subiendo entrada</string>
     <string name="themes_fetching">Obteniendo temas…</string>
@@ -1482,7 +1408,6 @@ Language: es_CL
     <string name="reader_label_followed_blog">Sitio seguido</string>
     <string name="reader_title_blog_preview">Lector del Sitio</string>
     <string name="help">Ayuda</string>
-    <string name="forgot_password">¿Has olvidado la contraseña?</string>
     <string name="ssl_certificate_error">Certificado SSL no válido</string>
     <string name="ssl_certificate_ask_trust">SI normalmente se conecta sin problemas a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
     <string name="gallery_error">El elemento multimedia no ha podido ser recuperado</string>
diff --git a/WordPress/src/main/res/values-es-rCO/strings.xml b/WordPress/src/main/res/values-es-rCO/strings.xml
index 57802f345a9e..9c8528e90e01 100644
--- a/WordPress/src/main/res/values-es-rCO/strings.xml
+++ b/WordPress/src/main/res/values-es-rCO/strings.xml
@@ -1,30 +1,1497 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-09-18 08:02:31+0000
+Translation-Revision-Date: 2020-12-16 14:21:56+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: es_CO
 -->
 <resources>
+    <string name="backup_item_media_uploads">Subidas de medios</string>
+    <string name="backup_item_plugins">Plugins de WordPress</string>
+    <string name="backup_item_themes">Temas de WordPress</string>
+    <string name="backup_download_details_icon_content_description">Crea un ícono de copia de seguridad descargable</string>
+    <string name="backup_download_details_action_button">Crear un archivo descargable</string>
+    <string name="backup_download_details_header">Crear una copia de seguridad descargable</string>
+    <string name="backup_download_details_page_title">Descargar copia de seguridad</string>
+    <string name="backup_download">Descarga de la copia de seguridad</string>
+    <string name="gutenberg_native_error">Error</string>
+    <string name="gutenberg_native_choose_file">Elegir archivo</string>
+    <string name="activity_log_item_menu_download_backup_label">Descargar copia de seguridad</string>
+    <string name="activity_log_item_menu_restore_label">Restaurar hasta este punto</string>
+    <string name="activity_log_activity_type_filter_header">Filtrar por tipo de actividad</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiar la versión de esta aplicación</string>
+    <string name="dialog_confirm_copy_local_edit_button">Editar la entrada primero</string>
+    <string name="dialog_confirm_copy_local_message">La entrada que estás tratando de copiar tiene dos versiones que están en conflicto o has hecho cambios recientemente, pero no los has guardado.\nEdita la entrada primero para resolver cualquier conflicto o procede a copiar la versión de esta aplicación.</string>
+    <string name="dialog_confirm_copy_local_title">Conflicto de sincronización de la entrada</string>
+    <string name="button_copy">Duplicar</string>
+    <string name="toast_edit_story_update_in_progress_title">La historia se está guardando, por favor, espera…</string>
+    <string name="gutenberg_native_file_name">Nombre del archivo</string>
+    <string name="gutenberg_native_file_block_settings">Ajustes del archivo del bloque</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Fallo al subir los archivos.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Fallo al guardar los medios.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_edit_file">Editar el archivo</string>
+    <string name="gutenberg_native_copy_file_url">Copiar la URL del archivo </string>
+    <string name="gutenberg_native_choose_a_file">ELEGIR UN ARCHIVO</string>
+    <string name="new_site_creation_domain_header_title">Elige un dominio</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">No se ha podido anular la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">No se ha podido crear la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_follow_comments_get_status_error">Error al recuperar el estado de suscripción para la entrada</string>
+    <string name="reader_follow_comments_unsubscribe_success">Cancelada correctamente la suscripción a los comentarios</string>
+    <string name="reader_follow_comments_subscribe_success">Suscrito correctamente a los comentarios</string>
+    <string name="reader_follow_comments_bad_format_response">Respuesta recibida no válida</string>
+    <string name="reader_follow_comments_null_response">No se ha recibido ninguna respuesta</string>
+    <string name="activity_log_activity_type_filter_clear">Vaciar</string>
+    <string name="activity_log_activity_type_filter_apply">Aplicar</string>
+    <string name="dialog_edit_story_unsupported_format_message">Una o más diapositivas no se han añadido a tu historia porque en este momento las historias no son compatibles con archivos GIF. Por favor, elige una imagen estática o un vídeo de fondo en su lugar.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Los archivos GIF no son compatibles</string>
+    <string name="dialog_edit_story_unrecoverable_message">No hemos podido encontrar en el sitio los medios para esta historia.</string>
+    <string name="dialog_edit_story_unrecoverable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_unavailable_message">No ha sido posible subir medios a esta historia. Comprueba tu conexión a Internet e inténtalo de nuevo dentro de un momento.</string>
+    <string name="dialog_edit_story_unavailable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_limited_message">Esta historia se ha editado en un dispositivo diferente y la posibilidad de editar ciertos objetos puede estar limitada.</string>
+    <string name="dialog_edit_story_limited_title">Edición limitada de la historia</string>
+    <string name="color_picker_label_background">Fondo</string>
+    <string name="color_picker_label_text">Texto</string>
+    <string name="dialog_discard_story_ok_button_edit">Descartar</string>
+    <string name="dialog_discard_story_message_edit">Cualquier cambio realizado no se guardará.</string>
+    <string name="dialog_discard_story_title_edit">¿Descartar los cambios?</string>
+    <string name="label_done_button">Hecho</string>
+    <string name="label_next_button">Siguiente</string>
+    <string name="delete_button_alt">Borrar</string>
+    <string name="hpp_choose_error">Ha habido un error al seleccionar el diseño.</string>
+    <string name="hpp_retry_error">Por favor, revisa tu conexión a Internet e inténtalo de nuevo.</string>
+    <string name="hpp_error_subtitle">Toca en reintentar cuando vuelvas a estar conectado.</string>
+    <string name="hpp_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="continue_site_credentials">Continuar con las credenciales de la tienda</string>
+    <string name="login_find_your_connected_email">Encuentra tu correo electrónico conectado</string>
+    <string name="reader_discover_no_posts_button_text">Seguir temáticas</string>
+    <string name="reader_discover_no_posts_subtitle">Intenta seguir más temáticas para ampliar la búsqueda</string>
+    <string name="reader_discover_no_posts_title">No hay entradas recientes</string>
+    <string name="reader_discover_empty_title">¡Bienvenido!</string>
+    <string name="scan">Explorar</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Juan Gómez&lt;/b&gt; respondió a tu publicación</string>
+    <string name="login_prologue_third_subtitle_two">Hoy has recibido &lt;b&gt;50 me gusta&lt;/b&gt; en tu sitio</string>
+    <string name="login_prologue_third_subtitle_one">A &lt;b&gt;Madison Ruíz&lt;/b&gt; le ha gustado tu entrada</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Se ha abierto el menú de bloques desplazable. Selecciona un bloque.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Se ha cerrado el menú de bloques desplazable.</string>
+    <string name="hpp_skip_button">Omitir</string>
+    <string name="hpp_choose_button">Elegir</string>
+    <string name="hpp_subtitle">Elige tu diseño favorito de página de inicio. Puedes editarlo y personalizarlo más tarde.</string>
+    <string name="hpp_title">Elige un diseño</string>
+    <string name="mlp_network_error_subtitle">Toca «Reintentar» cuando vuelvas a estar en línea o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_network_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="mlp_error_subtitle">Toca «Reintentar» o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_error_title">Los diseños no están disponibles debido a un error</string>
+    <string name="prepublishing_nudges_add_category_button">Añadir categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Añadir una nueva categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorías</string>
+    <string name="prepublishing_nudges_home_categories_not_set">No establecido</string>
+    <string name="prepublishing_nudges_categories_action">Categorías</string>
+    <string name="login_prologue_fifth_caption_three">Museos en Londres</string>
+    <string name="login_prologue_fifth_caption_two">Los mejores fanáticos del mundo</string>
+    <string name="login_prologue_fifth_caption_one">Mis diez mejores cafés</string>
+    <string name="login_prologue_fifth_tag_six">Política</string>
+    <string name="login_prologue_fifth_tag_five">Música</string>
+    <string name="login_prologue_fifth_tag_four">Jardinería</string>
+    <string name="login_prologue_fifth_tag_three">Fútbol</string>
+    <string name="login_prologue_fifth_tag_two">Cocina</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' roll semanal</string>
+    <string name="login_prologue_fifth_subtitle_two">Noticias web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Estoy muy inspirado por el trabajo del fotógrafo Cameron Karsten. Probaré estas técnicas en mi próximo</string>
+    <string name="login_prologue_second_subtitle_one">Inspírate</string>
+    <string name="login_prologue_title_fourth">Observa cómo crece tu audiencia con analíticas avanzadas.</string>
+    <string name="login_prologue_title_third">Mira los comentarios y avisos en tiempo real.</string>
+    <string name="login_prologue_title_second">Con el potente editor puedes publicar sobre la marcha.</string>
+    <string name="login_prologue_title_first">Bienvenido al maquetador web más popular del mundo.</string>
+    <string name="media_loading_failed">La carga del medio ha fallado</string>
+    <string name="reader_discover_recommended_blogs_header">Sitios a seguir</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos trabajando duro para añadir más bloques con cada versión.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">«%s» no es totalmente compatible</string>
+    <string name="gutenberg_native_help_button">Botón de ayuda</string>
+    <string name="gutenberg_native_edit_using_web_editor">Editar usando el editor web</string>
+    <string name="gutenberg_native_choose_images">Elegir las imágenes</string>
+    <string name="stories_intro_create_story_post_label">Crear una entrada de historia</string>
+    <string name="stories_intro_description_second">Son publicados como una nueva entrada de blog en tu sitio para que tu audiencia nunca se pierda nada.</string>
+    <string name="stories_intro_title_second">Las entradas de historias no desaparecen</string>
+    <string name="stories_intro_description_first">Combina fotos, vídeos y texto para crear entradas de historias atractivas y accesibles que les encantarán a tus visitantes.</string>
+    <string name="stories_intro_title_first">Ahora las historias son para todos</string>
+    <string name="stories_intro_image_caption_second">Título de la entrada de historia</string>
+    <string name="stories_intro_image_caption_first">Cómo crear una entrada de historias</string>
+    <string name="stories_intro_main_title">Presentación de las entradas de historias</string>
+    <string name="mlp_notice_blank_page_created">Página en blanco creada</string>
+    <string name="mlp_notice_page_created">Página creada</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s ha denegado el acceso a tus fotos. Para corregirlo, edita tus permisos y activa %2$s y %3$s.</string>
+    <string name="media_insert_failed">Inserción del medio fallida.</string>
+    <string name="media_insert_failed_with_reason">Ha fallado la inserción del medio: %s</string>
+    <string name="photo_picker_wordpress_media_library">Elige desde la biblioteca de medios de WordPress</string>
+    <string name="reader_label_toolbar_back">Volver</string>
+    <string name="reader_discover_empty_button_text">Primeros pasos</string>
+    <string name="reader_discover_empty_subtitle">Sigue temáticas para descubrir nuevos blogs</string>
+    <string name="reader_post_details_header_by_author_name">Por</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Este referido no puede ser marcado como spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Desmarcar como spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Marcar como spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Abrir la web</string>
+    <string name="media_uploading_gif_library_photo">Subiendo medios GIF</string>
+    <string name="media_uploading_stock_library_photo">Subiendo medios de inventarios</string>
+    <string name="media_uploading_default">Subiendo medios</string>
+    <string name="gutenberg_native_select_item">Seleccionar un elemento</string>
+    <string name="gutenberg_native_search_or_type_url">Busca o escribe la URL</string>
+    <string name="gutenberg_native_add_this_telephone_link">Añadir este enlace de teléfono</string>
+    <string name="gutenberg_native_add_this_link">Añadir este enlace</string>
+    <string name="gutenberg_native_add_this_email_link">Añadir este enlace de correo electrónico</string>
+    <string name="typeface_label_shrikhand">Negrita</string>
+    <string name="typeface_label_space_mono">Moderno</string>
+    <string name="typeface_label_pacifico">Alegre</string>
+    <string name="typeface_label_oswald">Fuerte</string>
+    <string name="typeface_label_libre_baskerville">Clásico</string>
+    <string name="typeface_label_nunito">Casual</string>
+    <string name="toast_capture_operation_permission_needed">Tienes que conceder permisos de grabación de audio a la aplicación para grabar vídeo</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s seleccionado</string>
+    <string name="login_get_link_by_email">Obtener un enlace de acceso por correo electrónico</string>
+    <string name="email_not_registered_wpcom">Vaya, no encontramos una cuenta de WordPress.com conectada a esta dirección de correo electrónico.</string>
+    <string name="permission_microphone">Micrófono</string>
+    <string name="comment_unable_to_show_error">No se puede mostrar este comentario</string>
+    <string name="media_browse_for_items">Navegar por elementos</string>
     <string name="reader_menu_report_post">Informar de esta entrada</string>
-    <string name="gutenberg_native_angle">Ángulo</string>
     <string name="reader_welcome_banner">Bienvenido al Lector. Descubre millones de blogs a tu alcance.</string>
     <string name="error_media_xmlrcp_server_error">Ha ocurrido un error interno del servidor</string>
     <string name="error_media_xmlrpc_not_allowed">Tu acción no está permitida</string>
     <string name="show_n_hidden_items_desc">%1$s elementos más</string>
+    <string name="gutenberg_native_select_a_layout">Seleccionar un diseño</string>
+    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Nota: el diseño de la columna puede variar entre temas y tamaños de pantalla</string>
+    <string name="create_post_story_fab_tooltip">Crear una entrada o historia</string>
+    <string name="create_page_fab_tooltip">Crear una página</string>
+    <string name="create_post_fab_tooltip">Crear una entrada</string>
+    <string name="reader_discover_interests_header">Puede que te guste</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ocultar</string>
+    <string name="gutenberg_native_video_caption_empty">Leyenda del vídeo. Vacía</string>
+    <string name="gutenberg_native_updates_the_title">Actualiza el título.</string>
+    <string name="gutenberg_native_paste_block_after">Pegar el bloque después</string>
+    <string name="gutenberg_native_page_title_s">Título de la página. %s</string>
+    <string name="gutenberg_native_page_title_empty">Título de la página. Vacío</string>
+    <string name="toast_error_playing_video">Ha ocurrido un error al reproducir tu vídeo</string>
+    <string name="camera_error">Este dispositivo no es compatible con la API de Camera2.</string>
+    <string name="toast_error_saving_video">No se ha podido guardar el vídeo</string>
+    <string name="toast_error_saving_image">Error al guardar la imagen</string>
+    <string name="toast_capture_operation_in_progress">Operación en progreso, inténtalo de nuevo</string>
+    <string name="toast_story_page_not_found">No se ha podido encontrar la diapositiva de la historia</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Ver el almacenamiento</string>
+    <string name="dialog_insufficient_device_storage_error_message">Tenemos que guardar la historia en tu dispositivo antes de que pueda ser publicada. Revisa tus ajustes de almacenamiento y elimina archivos para ganar espacio.</string>
+    <string name="dialog_insufficient_device_storage_error_title">Insuficiente almacenamiento en el dispositivo</string>
+    <string name="dialog_story_saving_error_message">Intenta volver a guardar o borrar las diapositivas y, después, intenta volver a publicar tu historia.</string>
+    <string name="dialog_story_saving_error_title_plural">No se han podido guardar %1$d diapositivas</string>
+    <string name="dialog_story_saving_error_title_singular">No se ha podido guardar 1 diapositiva</string>
+    <string name="story_saving_failed_quick_action_manage">Gestionar</string>
+    <string name="story_saving_failed_message_plural">%1$d diapositivas necesitan una acción</string>
+    <string name="story_saving_failed_message_singular">1 diapositiva necesita una acción</string>
+    <string name="story_saving_failed_title">No se ha podido subir «%1$s»</string>
+    <string name="story_saving_snackbar_finished_with_error">No se ha podido subir «%1$s»</string>
+    <string name="story_saving_snackbar_finished_successfully">Publicado «%1$s»</string>
+    <string name="story_saving_snackbar_started">Subiendo «%1$s»…</string>
+    <string name="story_saving_subtitle_frames_remaining_plural">Quedan %1$d diapositivas</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">Queda 1 diapositiva</string>
+    <string name="story_saving_title_several">varias historias</string>
+    <string name="story_saving_title">Guardando «%1$s»…</string>
+    <string name="story_saving_untitled">Sin título</string>
+    <string name="dialog_discard_story_ok_button">Descartar</string>
+    <string name="dialog_discard_story_message">La entrada de tu historia no se guardará como borrador.</string>
+    <string name="dialog_discard_story_title">¿Descartar la entrada de la historia?</string>
+    <string name="dialog_discard_page_ok_button">Borrar</string>
+    <string name="dialog_discard_errored_page_message">Esta diapositiva aún no ha sido guardada. Si borras esta diapositiva, perderás cualquier edición que hayas hecho.</string>
+    <string name="dialog_discard_page_message">Esta diapositiva será eliminada de tu historia.</string>
+    <string name="dialog_discard_page_title">¿Borrar la diapositiva de la historia?</string>
+    <string name="label_text_color_button">Cambiar el color del texto</string>
+    <string name="label_text_alignment_button">Cambiar la alineación del texto</string>
+    <string name="label_frame_errored">con error</string>
+    <string name="label_frame_selected_border">seleccionado</string>
+    <string name="label_frame_unselected_border">sin seleccionar</string>
+    <string name="label_frame_image">Diapositiva</string>
+    <string name="label_retry_icon">Reintentar</string>
+    <string name="label_saved_icon">Guardado</string>
+    <string name="label_close_button">Cerrar</string>
+    <string name="label_share_to">Compartir con</string>
+    <string name="label_snackbar_share">COMPARTIR</string>
+    <string name="label_snackbar_loop_frame_saved">Guardado en fotos</string>
+    <string name="label_control_retry">Reintentar</string>
+    <string name="label_control_saved">Guardado</string>
+    <string name="label_control_saving">Guardando</string>
+    <string name="label_control_flash">Flash</string>
+    <string name="label_control_flip_camera">Girar</string>
+    <string name="sound_button_alt">Sonido</string>
+    <string name="text_button_alt">Texto</string>
+    <string name="stickers_button_alt">Pegatinas</string>
+    <string name="flash_button_alt">Flash</string>
+    <string name="flip_button_alt">Girar la cámara</string>
+    <string name="capture_button_alt">Capturar</string>
+    <string name="mlp_preview_page">Vista previa</string>
+    <string name="mlp_create_page">Crear una página</string>
+    <string name="mlp_create_blank_page">Crear una página en blanco</string>
+    <string name="mlp_choose_layout_subtitle">Empieza eligiendo entre una amplia variedad de diseños de página prefabricados. O simplemente empieza con una página en blanco.</string>
+    <string name="mlp_choose_layout_title">Elegir un diseño</string>
+    <string name="prepublishing_nudges_story_title_hint">Pon un título a tu historia</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Crear una entrada o historia</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Crear una entrada, página o historia</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b&gt;Entrada del blog&lt;/b&gt;</string>
+    <string name="photo_picker_choose_file">Elegir el dispositivo</string>
+    <string name="my_site_bottom_sheet_add_story">Entrada de la historia</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">Para la edición de los iconos del sitio en sitios WordPress autoalojados se necesita el plugin Jetpack.</string>
+    <string name="reader_toast_err_page_jump_not_found">No se ha podido encontrar el salto de página enlazado</string>
+    <string name="error_media_quota_exceeded_toast">No se puede subir el archivo.\nSe ha superado la cuota de almacenamiento.</string>
+    <string name="error_media_quota_exceeded">Cuota de almacenamiento superada</string>
+    <string name="pick_file">Añadir un archivo</string>
+    <string name="gutenberg_native_replace_video">Reemplazar el vídeo</string>
+    <string name="gutenberg_native_replace_image_or_video">Reemplazar la imagen o vídeo</string>
+    <string name="gutenberg_native_choose_video">Elegir un vídeo</string>
+    <string name="gutenberg_native_choose_image_or_video">Elegir una imagen o vídeo</string>
+    <string name="gutenberg_native_choose_image">Elegir una imagen</string>
+    <string name="gutenberg_native_block_removed">Bloque eliminado</string>
+    <string name="enter_your_site_address">Introduce la dirección de tu sitio existente</string>
+    <string name="signup_confirmation_title">Confirmación del registro</string>
+    <string name="continue_with_google_terms_of_service_text">Si continúas con Google y aún no tienes una cuenta de WordPress.com, crearás una cuenta y aceptas nuestros %1$stérminos del servicio%2$s.</string>
+    <string name="continue_terms_of_service_text">Si continúas, aceptas nuestros %1$stérminos del servicio%2$s.</string>
+    <string name="signup_confirmation_message">Usaremos esta dirección de correo electrónico para crear tu nueva cuenta de WordPress.com.</string>
+    <string name="signup_magic_link_message">Te hemos enviado por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com. Comprueba tu correo electrónico en este dispositivo y toca el enlace en el correo electrónico que has recibido de WordPress.com.</string>
+    <string name="enter_account_info_for_site">Introduce la información de tu cuenta para %1$s.</string>
+    <string name="login_or">o</string>
+    <string name="continue_google_button_suffix">Continuar con Google</string>
+    <string name="login_find_your_site_adress">Encuentra la dirección de tu sitio</string>
+    <string name="login_done">Hecho</string>
+    <string name="magic_link_not_seeing_email_message">¿No ves el correo electrónico? Comprueba tu carpeta de spam o correo no deseado.</string>
+    <string name="login_magic_links_sent_label">Comprueba tu correo electrónico en este dispositivo y toca el enlace en el correo electrónico que has recibido de WordPress.com.</string>
+    <string name="login_magic_links_label">Te enviaremos por correo electrónico un enlace que te hará acceder automáticamente, sin necesidad de contraseña.</string>
+    <string name="check_email">Comprobar el correo electrónico</string>
+    <string name="get_started">Primeros pasos</string>
+    <string name="enter_email_to_continue_wordpress_com">Introduce tu dirección de correo electrónico para acceder o crear una cuenta de WordPress.com.</string>
+    <string name="or_type_your_password">O escribe tu contraseña</string>
+    <string name="create_account">Crear una cuenta</string>
+    <string name="send_link_by_email">Enviar el enlace por correo electrónico</string>
+    <string name="reset_your_password">Restablecer tu contraseña</string>
+    <string name="reader_error_request_failed_title">Ha habido un problema al gestionar la solicitud. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="quick_start_list_update_site_title_title">Configura el título de tu sitio</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b&gt;%1$s&lt;/b&gt; para configurar un nuevo título</string>
+    <string name="dialog_confirm_trash_losing_local_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios locales, ¿estás seguro de que quieres continuar?</string>
+    <string name="gutenberg_native_s_block_options">Opciones del bloque %s</string>
+    <string name="gutenberg_native_duplicate_block">Duplicar bloque</string>
+    <string name="gutenberg_native_copy_block">Copiar bloque</string>
+    <string name="gutenberg_native_copied_block">Bloque copiado</string>
+    <string name="gutenberg_native_block_pasted">Bloque pegado</string>
+    <string name="gutenberg_native_block_duplicated">Bloque duplicado</string>
+    <string name="gutenberg_native_block_cut">Bloque cortado</string>
+    <string name="gutenberg_native_block_copied">Bloque copiado</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">El título del sitio solo puede ser cambiado por un usuario con el perfil de administrador.</string>
+    <string name="my_site_title_changer_dialog_hint">El título del sitio se muestra en la barra de título de un navegador web y en la cabecera de la mayoría de los temas.</string>
+    <string name="reader_title_tag_preview">Debate</string>
+    <string name="error_update_site_title_network">No se ha podido actualizar el título del sitio. Comprueba tu conexión de red e inténtalo nuevamente.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Cambios sin guardar</string>
+    <string name="gutenberg_native_open_link_in_a_browser">Abrir el enlace en un navegador</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Navega para personalizar el degradado</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Navega al selector de color personalizado</string>
+    <string name="gutenberg_native_gradient_type">Tipo de degradado</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Toca dos veces para seleccionar la opción</string>
+    <string name="gutenberg_native_customize_gradient">Personalizar el degradado</string>
+    <string name="pages_list_author">Autor de la página</string>
+    <string name="photo_picker_use_gif">Usar este GIF</string>
+    <string name="error_media_thumbnail_not_loaded">La miniatura del medio no se ha podido cargar</string>
+    <string name="menu_content_info">Estructura del contenido</string>
+    <string name="everyone">Todos</string>
+    <string name="me">Yo</string>
+    <string name="gutenberg_native_dismiss">Descartar</string>
+    <string name="prepublishing_nudges_home_tags_not_set">No establecido</string>
+    <string name="prepublishing_tags_description">Las etiquetas ayudan a los lectores diciéndoles de qué se trata la entrada.</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Fecha de publicación</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Añadir etiquetas</string>
+    <string name="prepublishing_nudges_back_button">Volver</string>
+    <string name="prepublishing_nudges_home_save_button">Guardar ahora</string>
+    <string name="prepublishing_nudges_home_submit_button">Enviar ahora</string>
+    <string name="prepublishing_nudges_home_schedule_button">Programar ahora</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Publicando en</string>
+    <string name="prepublishing_nudges_tags_action">Etiquetas</string>
+    <string name="prepublishing_nudges_publish_action">Fecha de publicación</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Cancelar</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Mover a borradores</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_message">Las entradas en la papelera no se pueden editar. ¿Deseas cambiar el estado de esta entrada a «borrador» para poder trabajar en ella?</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">¿Mover entrada a borradores?</string>
+    <string name="reader_btn_done">Hecho</string>
+    <string name="reader_btn_select_few_interests">Selecciona algunos para continuar</string>
+    <string name="post_status_post_published">Publicado</string>
+    <string name="post_status_post_trashed">En la papelera</string>
+    <string name="post_status_post_scheduled">Programada</string>
+    <string name="publish_date">Fecha de publicación</string>
+    <string name="ccpa_privacy_notice_read">Lee el aviso de privacidad de CCPA</string>
+    <string name="ccpa_privacy_notice_caption">La Ley de Privacidad del Consumidor de California («CCPA») nos obliga a que proporcionemos información adicional a los residentes de California sobre las categorías de información personal que recopilamos y compartimos, dónde obtenemos esa información personal y cómo y por qué la usamos.</string>
+    <string name="ccpa_privacy_notice_header">Aviso de privacidad para usuarios de California</string>
+    <string name="status_and_visibility">Estado y visibilidad</string>
+    <string name="update_now">Actualizar ahora</string>
+    <string name="gutenberg_native_open_block_actions_menu">Abrir el menú de acciones de bloques</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toca dos veces para abrir la hoja inferior con las opciones disponibles</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toca dos veces para abrir la hoja de acción con las opciones disponibles</string>
+    <string name="pages_cannot_be_started">No podemos abrir las páginas en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="pages_set_as_posts_page">Establecer como página de entradas</string>
+    <string name="pages_set_as_homepage">Establecer como página de inicio</string>
+    <string name="site_settings_select_page">Seleccionar la página</string>
+    <string name="site_settings_posts_page">Página de entradas</string>
+    <string name="site_settings_static_homepage">Página de inicio estática</string>
+    <string name="site_settings_classic_blog">Blog clásico</string>
+    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">La página de inicio seleccionada y la página de entradas no pueden ser la misma.</string>
+    <string name="site_settings_failed_update_homepage_settings">Ha fallado la actualización de la página de inicio, comprueba tu conexión a internet</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">No se pueden guardar los ajustes de la página de inicio antes de que las páginas estén cargadas</string>
+    <string name="site_settings_failed_to_save_homepage_settings">No se pueden guardar los ajustes de la página de inicio</string>
+    <string name="site_settings_accept_homepage">Aceptar</string>
+    <string name="site_settings_failed_to_load_pages">Ha fallado la carga de las páginas</string>
+    <string name="site_settings_homepage_settings_description">Elige entre una página de inicio que muestre tus últimas publicaciones (blog clásico) o una página fija/estática.</string>
+    <string name="site_settings_homepage_settings">Ajustes de la página de inicio</string>
+    <string name="site_settings_homepage">Página de inicio</string>
+    <string name="page_posts_page_update_failed">Ha fallado la actualización de la página de entradas</string>
+    <string name="page_posts_page_successfully_updated">Página de entradas actualizada correctamente</string>
+    <string name="page_homepage_update_failed">Ha fallado la actualización de la página de inicio</string>
+    <string name="page_homepage_successfully_updated">Página de inicio actualizada correctamente</string>
+    <string name="page_cannot_set_posts_page">Para establecer la página de entradas, activa «Página de inicio estática» en los ajustes del sitio</string>
+    <string name="page_cannot_set_homepage">Para establecer la página de inicio, activa «Página de inicio estática» en los ajustes del sitio</string>
+    <string name="gutenberg_native_select_a_color">Seleccionar un color</string>
+    <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toca dos veces para ir a los ajustes del color</string>
+    <string name="reader_empty_followed_blogs_description">Cuando sigas sitios, verás aquí su contenido</string>
+    <string name="feature_announcement_find_out_mode">Saber más</string>
+    <string name="feature_announcement_dialog_label">Qué hay de nuevo en WordPress</string>
+    <string name="insert_label_with_count">Insertar %d</string>
+    <string name="crop">recortar</string>
+    <string name="error_failed_to_load_into_file">Fallo al cargar en el archivo, por favor, inténtalo de nuevo.</string>
+    <string name="preview_image_thumbnail_description">Vista previa de la miniatura de la imagen</string>
+    <string name="photo_picker_use_media">Usar este medio</string>
+    <string name="photo_picker_use_video">Usar este video</string>
+    <string name="photo_picker_photo_or_video_title">Elegir el medio</string>
+    <string name="photo_picker_video_title">Elegir el video</string>
+    <string name="site_picker_ask_site_select">No se ha podido seleccionar el sitio. Por favor, inténtalo de nuevo.</string>
+    <string name="sitepicker_continue_flow">Continuar</string>
+    <string name="reader_reblog_error">Ha fallado reblog</string>
+    <string name="reader_no_site_to_reblog_action">Gestionar los sitios</string>
+    <string name="reader_no_site_to_reblog_detail">Una vez que crees un sitio en WordPress.com, puedes volver a publicar el contenido que te gusta en tu propio sitio.</string>
+    <string name="reader_no_site_to_reblog_title">No hay disponibles sitios WordPress.com</string>
+    <string name="whats_new_in_version_title">Qué hay de nuevo</string>
+    <string name="comment_q_action_copied_url">Copiada la dirección del enlace</string>
+    <string name="copy_link_address">Copiar la dirección del enlace</string>
+    <string name="comment_share_link_via">Compartir en</string>
+    <string name="comment_toast_err_share_intent">No se ha podido compartir</string>
+    <string name="button_insert">Insertar</string>
+    <string name="continue_label">Continuar</string>
+    <string name="copy_text">Copiar</string>
+    <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Mover el bloque a la derecha desde la posición %1$s a la posición %2$s</string>
+    <string name="gutenberg_native_move_block_right">Mover el bloque a la derecha</string>
+    <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Mover el bloque a la izquierda desde la posición %1$s a la posición %2$s</string>
+    <string name="gutenberg_native_move_block_left">Mover bloque a la izquierda</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toca dos veces para mover el bloque hacia la derecha</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toca dos veces para mover el bloque hacia la izquierda</string>
+    <string name="new_site_creation_creating_site_loading_4">Creando el escritorio</string>
+    <string name="new_site_creation_creating_site_loading_3">Configurar el tema</string>
+    <string name="new_site_creation_creating_site_loading_2">Añadiendo las características del sitio</string>
+    <string name="new_site_creation_creating_site_loading_1">Obteniendo la URL del sitio</string>
+    <string name="new_site_creation_creating_site_loading_subtitle">Tu sitio estará listo en breve</string>
+    <string name="new_site_creation_creating_site_loading_title">¡Hurra!\nCasi está hecho</string>
+    <string name="pages_and_posts_cancel_auto_upload">Cancelar la subida</string>
+    <string name="gif_list_search_returned_unknown_error">Ha habido un problema al gestionar la petición</string>
+    <string name="gif_powered_by_tenor">Funciona con Tenor</string>
+    <string name="gif_picker_search_hint">Buscar en Tenor</string>
+    <string name="photo_picker_gif">Elegir desde Tenor</string>
+    <string name="weekday_saturday">Sábado</string>
+    <string name="weekday_friday">Viernes</string>
+    <string name="weekday_thursday">Jueves</string>
+    <string name="weekday_wednesday">Miércoles</string>
+    <string name="weekday_tuesday">Martes</string>
+    <string name="weekday_monday">Lunes</string>
+    <string name="weekday_sunday">Domingo</string>
+    <string name="media_accessing_failed">Ha fallado el acceso al contenido de un sitio privado. Algunos medios pueden no estar disponibles</string>
+    <string name="media_accessing_progress">Accediendo al contenido de un sitio privado</string>
+    <string name="error_failed_to_crop_and_save_image">No se pudo recortar y guardar la imagen, inténtalo de nuevo.</string>
+    <string name="failed_to_load_image_tap_to_retry">Fallo al cargar la imagen.\nPor favor, toca para volver a intentarlo.</string>
+    <string name="preview_image_description">Previsualizar la imagen</string>
+    <string name="error_unknown_page_type">Formato de página desconocido</string>
+    <string name="error_page_not_submitted">No hemos podido completar esta acción y no se ha enviado esta página a revisión.</string>
+    <string name="error_page_not_scheduled">No hemos podido completar esta acción y no se ha programado esta página.</string>
+    <string name="error_page_not_published_private">No hemos podido completar esta acción y no se ha enviado esta página privada.</string>
+    <string name="error_page_not_published">No hemos podido completar esta acción y no se ha publicado esta página.</string>
+    <string name="error_page_not_submitted_retrying">No hemos podido enviar esta página a revisión, pero lo intentaremos de nuevo más tarde. </string>
+    <string name="error_page_not_scheduled_retrying">No hemos podido programar esta página, pero lo intentaremos de nuevo más tarde.</string>
+    <string name="error_page_not_published_retrying_private">No hemos podido publicar esta página privada, pero lo intentaremos de nuevo más tarde.</string>
+    <string name="error_page_not_published_retrying">No hemos podido publicar esta página, pero lo intentaremos de nuevo más tarde.</string>
+    <string name="error_media_recover_page_not_submitted">No hemos podido subir este medio y no se ha enviado esta página a revisión. </string>
+    <string name="error_media_recover_page_not_scheduled">No hemos podido subir este medio y no se ha programado esta página.</string>
+    <string name="error_media_recover_page_not_published_private">No hemos podido subir este medio y no se ha publicado esta página privada.</string>
+    <string name="error_media_recover_page_not_published">No hemos podido subir este medio y no se ha publicado la página.</string>
+    <string name="page_waiting_for_connection_draft">Guardaremos tu borrador cuando tu dispositivo vuelva a estar online</string>
+    <string name="page_waiting_for_connection_private">Publicaremos tu página privada cuando tu dispositivo vuelva a estar online.</string>
+    <string name="page_waiting_for_connection_scheduled">Programaremos tu página cuando tu dispositivo vuelva a estar online.</string>
+    <string name="page_waiting_for_connection_pending">Enviaremos tu página para revisión cuando tu dispositivo vuelva a estar online.</string>
+    <string name="page_waiting_for_connection_publish">Publicaremos la página cuando tu dispositivo vuelva a estar online.</string>
+    <string name="page_queued">Página a la espera</string>
+    <string name="page_uploading">Subiendo página</string>
+    <string name="error_publish_page_no_network">El dispositivo está desconectado. La página se guardará localmente.</string>
+    <string name="local_page_autosave_revision_available">Has hecho cambios no guardados en esta página</string>
+    <string name="editor_uploading_page">Tu página se está subiendo</string>
+    <string name="editor_page_saved_locally_failed_media">La página falló al subir los medios y se ha guardado localmente</string>
+    <string name="editor_page_saved_locally">Página guardada en el dispositivo</string>
+    <string name="editor_page_saved_online">La página se ha guardado online</string>
+    <string name="quickpress_shortcut_activity_label">Selecciona un blog para el atajo a la publicación rápida</string>
+    <string name="app_theme_default">Establecido por el ahorrador de batería</string>
+    <string name="app_theme_dark">Oscuro</string>
+    <string name="app_theme_light">Claro</string>
+    <string name="app_theme">Apariencia</string>
+    <string name="dialog_confirm_autosave_body_first_part_for_page">Recientemente has hecho cambios en esta página, pero no los has guardado. Elige una versión para cargar:\n\n</string>
+    <string name="gutenberg_native_show_post_content">Mostrar el contenido de la entrada</string>
+    <string name="gutenberg_native_only_show_excerpt">Mostrar solo el extracto</string>
+    <string name="gutenberg_native_link_to">Enlazar a</string>
+    <string name="gutenberg_native_excerpt_length_words">Longitud del extracto (palabras)</string>
+    <string name="gutenberg_native_customize">PERSONALIZAR</string>
+    <string name="gutenberg_native_add_paragraph_block">Añadir un bloque de párrafo</string>
+    <string name="create_post_page_fab_tooltip_contributors">Crear una entrada</string>
+    <string name="post_list_tab_trashed_posts">En la papelera</string>
+    <string name="post_list_tab_scheduled_posts">Programada</string>
+    <string name="post_list_tab_published_posts">Publicada</string>
+    <string name="sharing_facebook_account_must_have_pages">La conexión de Facebook no puede encontrar ninguna página. «Divulgar» no se puede conectar con los perfiles de Facebook, solo con las páginas publicadas.</string>
+    <string name="dialog_title_sharing_facebook_account_must_have_pages">No conectado</string>
+    <string name="notifications_tab_title_likes">Me gusta</string>
+    <string name="notifications_tab_title_follows">Seguimientos</string>
+    <string name="notifications_tab_title_comments">Comentarios</string>
+    <string name="notifications_tab_title_unread_notifications">No leído</string>
+    <string name="dlg_cancel_action_dont_trash">No enviar a la papelera</string>
+    <string name="dlg_confirm_action_trash">Papelera</string>
+    <string name="stats_insights_management_activity">Actividad</string>
+    <string name="stats_insights_management_posts_and_pages">Entradas y páginas</string>
+    <string name="stats_insights_management_general">General</string>
+    <string name="stats_management_screen_title">Añadir una nueva tarjeta</string>
+    <string name="stats_management_add_new_stats_card">Añadir una nueva tarjeta de estadísticas</string>
+    <string name="reader_self_hosted_select_filter">Usa el botón de filtro para encontrar entradas sobre temas específicos</string>
+    <string name="reader_bottom_sheet_content_description">Selecciona una etiqueta o sitio, ventana emergente</string>
+    <string name="reader_btn_select_filter_content_description">Selecciona un sitio o etiqueta para filtrar entradas</string>
+    <string name="reader_btn_remove_filter_content_description">Quitar el filtro actual</string>
+    <string name="reader_title_subs">Gestionar temas y sitios</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">Acceder a WordPress.com</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Accede a WordPress.com para ver las últimas entradas de los temas que sigues</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Accede a WordPress.com para ver las últimas entradas de los sitios que sigues</string>
+    <string name="gutenberg_native_replace_current_block">Reemplazar el bloque actual</string>
+    <string name="gutenberg_native_add_to_end">Añadir al final</string>
+    <string name="gutenberg_native_add_to_beginning">Añadir al principio</string>
+    <string name="gutenberg_native_add_block_before">Añadir el bloque antes</string>
+    <string name="gutenberg_native_add_block_after">Añadir el bloque después</string>
+    <string name="reader_filter_empty_tags_action">Añadir un tema</string>
+    <string name="reader_filter_empty_sites_action">Seguir un sitio</string>
+    <string name="reader_filter_empty_tags_list">Puedes seguir entradas sobre un tema específico añadiendo un tema</string>
+    <string name="reader_filter_empty_sites_list">Mira las entradas más recientes de los sitios que sigues</string>
+    <string name="reader_filter_main_title">Siguiendo</string>
+    <string name="reader_filter_cta">Filtrar</string>
+    <string name="gutenberg_native_video_caption_s">Leyenda del vídeo. %s</string>
+    <string name="gutenberg_native_edit_video">Editar el vídeo</string>
+    <string name="gutenberg_native_add_a_shortcode">Añadir un shortcode…</string>
+    <string name="post_list_author">Autor de la entrada</string>
+    <string name="fab_create_desc">Crear una entrada</string>
+    <string name="stats_posting_activity_end_description">Has escuchado todas las estadísticas de este período.\n        Si vuelves a tocar, se reiniciará desde el principio.</string>
+    <string name="stats_posting_activity_empty_description">No hay estadísticas en este período.</string>
+    <string name="stats_posting_activity_label_content_description">Actividad de publicación para %1$s</string>
+    <string name="stats_posting_activity_content_description">Los días con visitas %1$s para %2$s son: %2$s %3$s. Toca para más.</string>
+    <string name="stats_posting_activity_action">explora todas las estadísticas para este período</string>
+    <string name="stats_box_type_very_high">muy altas</string>
+    <string name="stats_box_type_high">altas</string>
+    <string name="stats_box_type_medium">medias</string>
+    <string name="stats_box_type_low">bajas</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  y %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
+    <string name="gutenberg_native_gallery_caption_s">Leyenda de la galería. %s</string>
+    <string name="create_post_page_fab_tooltip">Crear una entrada o página</string>
+    <string name="content_description_person_building_website">Creador de la web</string>
+    <string name="post_signup_interstitial_not_right_now">Ahora no</string>
+    <string name="post_signup_interstitial_subtitle">Cualquier cosa que quieras crear o compartir, te ayudaremos a hacerlo aquí mismo.</string>
+    <string name="post_signup_interstitial_title">Bienvenido a WordPress</string>
+    <string name="stock_media_picker_list_content_description">Biblioteca de fotos</string>
+    <string name="photo_picker_image_thumbnail_unselected">Imagen no seleccionada</string>
+    <string name="photo_picker_image_selected">, seleccionada</string>
+    <string name="photo_picker_image_thumbnail_selected">Imagen seleccionada</string>
+    <string name="photo_picker_image_thumbnail_content_description">Miniatura de la imagen</string>
+    <string name="my_site_bottom_sheet_add_post">Entrada del blog</string>
+    <string name="my_site_bottom_sheet_title">Añadir nueva</string>
+    <string name="post_settings_publish">Publicar</string>
+    <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizar ahora</string>
+    <string name="dialog_confirm_scheduled_post_sync_message">Esta entrada se sincronizará inmediatamente.</string>
+    <string name="dialog_confirm_scheduled_post_sync_title">¿Preparado para sincronizar?</string>
+    <string name="new_site_creation_unavailable_domain">El dominio no está disponible</string>
+    <string name="negative_prefix">-%s</string>
+    <string name="login_discovery_error_generic">No hemos podido acceder a tu sitio. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b&gt;certificado SSL&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b&gt;identificación HTTP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b&gt;archivo XMLRCP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="enter_credentials_for_site">Accede con las credenciales del sitio %1$s</string>
+    <string name="my_site_bottom_sheet_add_page">Página del sitio</string>
+    <string name="reader_following_display_name">Siguiendo</string>
+    <string name="reader_my_likes_display_name">Me gusta</string>
+    <string name="reader_discover_display_name">Descubrir</string>
+    <string name="reader_save_for_later_display_name">Guardado</string>
+    <string name="reader_filter_tags_title">Temas</string>
+    <string name="reader_filter_sites_title">Sitios</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQ</string>
+    <string name="suffix_1_000_000_000_000_000">%sC</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="posts_cannot_be_started">No podemos abrir las entradas en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="site_cannot_be_loaded">No podemos cargar los datos para tu sitio en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="gutenberg_native_wordpress_media_library">Biblioteca de medios de WordPress</string>
+    <string name="gutenberg_native_ungroup">Desagrupar</string>
+    <string name="gutenberg_native_translate">Traducir</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">Toca para ocultar el teclado</string>
+    <string name="gutenberg_native_tap_here_to_show_help">Toca aquí para mostrar la ayuda</string>
+    <string name="gutenberg_native_take_a_video">Haz un vídeo</string>
+    <string name="gutenberg_native_take_a_photo_or_video">Haz una foto o un vídeo</string>
+    <string name="gutenberg_native_take_a_photo">Haz una foto</string>
+    <string name="gutenberg_native_start_writing">Empieza a escribir…</string>
+    <string name="gutenberg_native_show_section">Mostrar la sección</string>
+    <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloque %s. Este bloque tiene contenido no válido</string>
+    <string name="gutenberg_native_s_block_empty">Bloque %s. Vacío</string>
+    <string name="gutenberg_native_cut_block">Cortar bloque</string>
+    <string name="gutenberg_native_problem_opening_the_video">Problema al abir el video</string>
+    <string name="gutenberg_native_problem_displaying_block">Problema al mostrar el bloque</string>
+    <string name="gutenberg_native_post_title_s">Título de la entrada. %s</string>
+    <string name="gutenberg_native_post_title_empty">Título de la entrada. Vacío</string>
+    <string name="gutenberg_native_paste_url">Pegar la URL</string>
+    <string name="gutenberg_native_page_break_block_s">Bloque de salto de página. %s</string>
+    <string name="gutenberg_native_open_settings">Abrir los ajustes</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ninguna aplicación puede manejar esta petición. Por favor, instala un navegador web.</string>
+    <string name="gutenberg_native_navigate_up">Navegar arriba</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover el bloque hacia arriba, desde la fila %1$s a la fila %2$s</string>
+    <string name="gutenberg_native_move_block_up">Mover el bloque arriba</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover el bloque hacia abajo, desde la fila %1$s a la fila %2$s</string>
+    <string name="gutenberg_native_move_block_down">Mover el bloque abajo</string>
+    <string name="gutenberg_native_image_caption_s">Leyenda de la imagen. %s</string>
+    <string name="gutenberg_native_hide_keyboard">Ocultar el teclado</string>
+    <string name="gutenberg_native_help_icon">Icono de ayuda</string>
+    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Fallo al insertar los medios.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_double_tap_to_undo_last_change">Toca dos veces para deshacer el último cambio</string>
+    <string name="gutenberg_native_double_tap_to_toggle_setting">Toca dos veces para alternar los ajustes</string>
+    <string name="gutenberg_native_double_tap_to_select_an_image">Toca dos veces para seleccionar una imagen</string>
+    <string name="gutenberg_native_double_tap_to_select_a_video">Toca dos veces para seleccionar un vídeo</string>
+    <string name="gutenberg_native_double_tap_to_select">Toca dos veces para seleccionar</string>
+    <string name="gutenberg_native_double_tap_to_redo_last_change">Toca dos veces para rehacer el último cambio</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_up">Toca dos veces para mover el bloque hacia arriba</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_down">Toca dos veces para mover el bloque hacia abajo</string>
+    <string name="gutenberg_native_double_tap_to_edit_this_value">Toca dos veces para editar este valor</string>
+    <string name="gutenberg_native_double_tap_to_add_a_block">Toca dos veces para añadir un bloque</string>
+    <string name="gutenberg_native_current_value_is_s">El valor actual es %s</string>
+    <string name="gutenberg_native_choose_from_device">Elegir desde el dispositivo</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ha ocurrido un error desconocido. Por favor, inténtalo de nuevo.</string>
+    <string name="gutenberg_native_alt_text">Texto alternativo</string>
+    <string name="gutenberg_native_add_video">AÑADIR UN VÍDEO</string>
+    <string name="gutenberg_native_add_url">Añadir la URL</string>
+    <string name="gutenberg_native_add_image_or_video">AÑADIR UNA IMAGEN O UN VÍDEO</string>
+    <string name="gutenberg_native_add_image">AÑADIR UNA IMAGEN</string>
+    <string name="gutenberg_native_add_block_here">AÑADIR EL BLOQUE AQUÍ</string>
+    <string name="reader_empty_saved_posts_content_description">Toca el botón «Añadir a las entradas guardadas» para guardar una entrada en tu lista.</string>
+    <string name="reader_acessibility_list_loaded">La lista se ha cargado con %1$d elementos.</string>
+    <string name="notifications_tab_dialog_switch_desc">Avisos</string>
+    <string name="pick_media">Añadir imagen o video</string>
+    <string name="error_post_not_submitted_retrying">No hemos podido enviar esta entrada a revisión, pero lo intentaremos de nuevo más tarde. </string>
+    <string name="error_post_not_scheduled_retrying">No hemos podido programar esta entrada, pero lo intentaremos de nuevo más tarde.</string>
+    <string name="error_post_not_published_retrying_private">No hemos podido publicar esta entrada privada, pero lo intentaremos de nuevo más tarde.</string>
+    <string name="error_post_not_published_retrying">No hemos podido publicar esta entrada, pero lo intentaremos de nuevo más tarde.</string>
+    <string name="error_post_not_submitted">No hemos podido completar esta acción y no se ha enviado esta entrada a revisión.</string>
+    <string name="error_post_not_scheduled">No hemos podido completar esta acción y no se ha programado esta entrada.</string>
+    <string name="error_post_not_published_private">No hemos podido completar esta acción y no se ha enviado esta entrada privada.</string>
+    <string name="error_post_not_published">No hemos podido completar esta acción y no se ha publicado esta entrada.</string>
+    <string name="error_media_recover_post_not_submitted">No hemos podido subir este medio y no se ha enviado esta entrada a revisión. </string>
+    <string name="error_media_recover_post_not_scheduled">No hemos podido subir este medio y no se ha programado esta entrada.</string>
+    <string name="error_media_recover_post_not_published_private">No hemos podido subir este medio y no se ha publicado esta entrada privada.</string>
+    <string name="error_media_recover_post_not_published">No hemos podido subir este medio y no se ha publicado la entrada.</string>
+    <string name="error_media_recover_post">No hemos podido subir este medio.</string>
+    <string name="error_generic_error_retrying">No hemos podido completar esta acción, pero lo intentaremos de nuevo más tarde. </string>
+    <string name="error_generic_error">No hemos podido completar esta acción.</string>
+    <string name="error_preview_empty_draft">No se puede previsualizar un borrador vacío</string>
+    <string name="error_preview_empty_page">No se puede previsualizar una página vacía</string>
+    <string name="error_preview_empty_post">No se puede previsualizar una entrada vacía</string>
+    <string name="preview_unavailable_self_hosted_sites">Vista previa no disponible</string>
+    <string name="remote_preview_operation_error">Error al intentar guardar la entrada antes de previsualizarla</string>
+    <string name="post_preview_remote_auto_saving_post">Generando la vista previa…</string>
+    <string name="post_preview_saving_draft">Guardando…</string>
+    <string name="local_post_autosave_revision_available">Has hecho cambios no guardados en esta entrada</string>
+    <string name="dialog_confirm_autosave_dont_restore_button">La versión desde esta aplicación</string>
+    <string name="dialog_confirm_autosave_restore_button">La versión desde otro dispositivo</string>
+    <string name="dialog_confirm_autosave_body_second_part">Desde esta aplicación\nGuardado en %s\n\nDesde otro dispositivo\nGuardado en %s\n</string>
+    <string name="dialog_confirm_autosave_body_first_part">Recientemente has hecho cambios en esta entrada, pero no los has guardado. Elige una versión para cargar:\n\n</string>
+    <string name="dialog_confirm_autosave_title">¿Qué versión te gustaría editar?</string>
+    <string name="button_delete_permanently">Borrar permanentemente</string>
+    <string name="post_waiting_for_connection_draft_cancel">No guardaremos los últimos cambios en tu borrador.</string>
+    <string name="post_waiting_for_connection_scheduled_cancel">No programaremos estos cambios.</string>
+    <string name="post_waiting_for_connection_pending_cancel">No enviaremos estos cambios para revisión. </string>
+    <string name="post_waiting_for_connection_publish_cancel"> No publicaremos estos cambios.</string>
+    <string name="post_waiting_for_connection_draft">Guardaremos tu borrador cuando tu dispositivo vuelva a estar online</string>
+    <string name="post_waiting_for_connection_private">Publicaremos tu entrada privada cuando tu dispositivo vuelva a estar online.</string>
+    <string name="post_waiting_for_connection_scheduled">Programaremos tu entrada cuando tu dispositivo vuelva a estar online.</string>
+    <string name="post_waiting_for_connection_pending">Enviaremos tu entrada para revisión cuando tu dispositivo vuelva a estar online.</string>
+    <string name="post_waiting_for_connection_publish">Publicaremos la entrada cuando tu dispositivo vuelva a estar online.</string>
+    <string name="settings_username_changer_snackbar_cancel">Esta acción no puede cancelarse. Es posible que el nombre de usuario ya haya sido actualizado.</string>
+    <string name="settings_username_changer_toast_content">Tu nuevo nombre de usuario es %1$s</string>
+    <string name="settings_username_changer_progress_dialog">Guardando el nombre de usuario…</string>
+    <string name="settings_username_changer_confirm_dialog_positive_action">Cambiar el nombre de usuario</string>
+    <string name="settings_username_changer_confirm_dialog_content">Estás cambiando tu nombre de usuario a %1$s%2$s%3$s. Cambiar tu nombre de usuario también afectará a tu perfil de Gravatar y a las direcciones de perfil de Intense Debate. Para continuar, confirma tu nuevo nombre de usuario.</string>
+    <string name="settings_username_changer_confirm_dialog_title">¡Cuidado!</string>
+    <string name="settings_username_changer_header">Estás a punto de cambiar tu nombre de usuario, que actualmente es %1$s%2$s%3$s. No podrás volver a recuperar tu nombre de usuario.</string>
+    <string name="site_settings_jetpack_performance_settings_hint">Ver y cambiar los ajustes de rendimiento de Jetpack</string>
+    <string name="site_settings_performance_and_speed">Rendimiento y velocidad</string>
+    <string name="site_settings_more">Más</string>
+    <string name="site_settings_improved_search_summary">Reemplaza la búsqueda integrada en WordPress con una experiencia mejorada de búsqueda</string>
+    <string name="site_settings_improved_search">Búsqueda mejorada</string>
+    <string name="site_settings_jetpack_search">Búsqueda de Jetpack</string>
+    <string name="site_settings_ad_free_video_hosting">Alojamiento de vídeo sin anuncios</string>
+    <string name="site_settings_media">Medios</string>
+    <string name="site_settings_site_accelerator_summary">Carga las páginas más rápido al permitir a Jetpack optimizar tus imágenes y archivos estáticos (como CSS y JavaScript).</string>
+    <string name="site_settings_faster_static_files">Archivos estáticos más rápidos</string>
+    <string name="site_settings_faster_images">Imágenes más rápidas</string>
+    <string name="site_settings_site_accelerator_off">Desactivado</string>
+    <string name="site_settings_site_accelerator_on">Activado</string>
+    <string name="site_settings_site_accelerator">Acelerador de sitios</string>
+    <string name="site_settings_lazy_load_images_summary">Mejora la velocidad de tu sitio al cargar solo las imágenes visibles en la pantalla.</string>
+    <string name="site_settings_performance">Rendimiento</string>
+    <string name="stats_file_downloads_value_label">Descargas</string>
+    <string name="stats_file_downloads_title_label">Archivo</string>
+    <string name="stats_file_downloads">Descargas de archivos</string>
+    <string name="stats_data_not_recorded_for_period">Las estadísticas de descarga de archivos no se registraron antes del 28 de Junio de 2019.</string>
+    <string name="stats_site_negative_utc">Zona horaria del sitio (UTC -%s)</string>
+    <string name="stats_site_positive_utc">Zona horaria del sitio (UTC +%s)</string>
+    <string name="stats_site_neutral_utc">Zona horaria del sitio (UTC)</string>
+    <string name="web_preview_desktop">Escritorio</string>
+    <string name="web_preview_default">Por defecto</string>
+    <string name="close_dialog_button_desc">Cerrar el diálogo</string>
+    <string name="preview_type_desc">Seleccionar el tipo de vista previa</string>
+    <string name="share_desc">Compartir</string>
+    <string name="navigate_back_desc">Volver</string>
+    <string name="navigate_forward_desc">Avanzar</string>
+    <string name="calendar_scheduled_post_description">«%s» programado para publicar el «%s» en tu aplicación de WordPress\n%s</string>
+    <string name="calendar_scheduled_post_title">Entrada programada de WordPress: «%s»</string>
+    <string name="notification_post_will_be_published_in_ten_minutes">«%s» se publicará en 10 minutos</string>
+    <string name="notification_post_will_be_published_in_one_hour">«%s» se publicará en 1 hora</string>
+    <string name="notification_post_has_been_published">«%s» ha sido publicado</string>
+    <string name="notification_scheduled_post_ten_minute_reminder">Entrada programada: recordatorio de 10 minutos</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Entrada programada: recordatorio de 1 hora</string>
+    <string name="notification_scheduled_post">Entrada programada</string>
+    <string name="post_notification_error">El aviso no puede crearse cuando la fecha de publicación ha pasado.</string>
+    <string name="post_notification_when_published">Cuando se publique</string>
+    <string name="post_notification_ten_minutes_before">10 minutos antes</string>
+    <string name="post_notification_one_hour_before">1 hora antes</string>
+    <string name="post_notification_off">Desactivado</string>
+    <string name="post_settings_add_to_calendar">Añadir al calendario</string>
+    <string name="post_settings_notification">Aviso</string>
+    <string name="post_settings_time_and_date">Fecha y hora</string>
+    <string name="login_invalid_site_url">Por favor, introduce una dirección completa de una web, como example.com.</string>
+    <string name="enter_email_for_site">Accede con WordPress.com para conectar con %1$s</string>
+    <string name="stats_post_views_label">Visitas</string>
+    <string name="stats_post_label">Entrada</string>
+    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
+    <string name="stats_item_collapsed">Elemento contraído</string>
+    <string name="stats_item_expanded">Elemento expandido</string>
+    <string name="stats_collapse_content_description">Contraer</string>
+    <string name="stats_expand_content_description">Expandir</string>
+    <string name="stats_graph_updated">Gráfico actualizado.</string>
+    <string name="stats_overview_content_description">%1$s %2$s del período: %3$s, cambio desde el período anterior - %4$s</string>
+    <string name="stats_loading_card">Cargando los datos de la tarjeta seleccionada</string>
+    <string name="site_settings_editor">Editor</string>
+    <string name="description_expand">Expandir</string>
+    <string name="description_collapse">Cerrar</string>
+    <string name="my_site_verify_your_email_without_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a tu correo electrónico</string>
+    <string name="my_site_verify_your_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a %s</string>
+    <string name="link_dialog_button_cancel">Cancelar</string>
+    <string name="link_dialog_button_ok">Aceptar</string>
+    <string name="link_dialog_edit_hint">http(s)://</string>
+    <string name="link_dialog_button_remove_link">Quitar enlace</string>
+    <string name="link_dialog_title">Insertar enlace</string>
+    <string name="post_settings_retry_featured_image">Reintentar la subida</string>
+    <string name="post_settings_featured_image_uploading_tap_for_options">Subiendo medios.\nPor favor, toca para ver las opciones.</string>
+    <string name="link_open_new_window">Abrir enlace en una nueva ventana/pestaña</string>
+    <string name="stats_widget_error_no_access_token">Para ver tus estadísticas accede a la cuenta de WordPress.com.</string>
+    <string name="post_list_search_nothing_found">Ninguna entrada coincide con tu búsqueda</string>
+    <string name="post_list_search_prompt">Buscar entradas</string>
+    <string name="domains_suggestions_intro_description">Aquí es donde la gente te encuentra en Internet.</string>
+    <string name="domains_suggestions_intro_title">Elige un nombre de dominio premium</string>
+    <string name="my_site_custom_domain_name">Todos los planes de WordPress.com incluyen un nombre de dominio personalizado. Registra ahora tu dominio premium gratuito.</string>
+    <string name="stats_widget_minified_name">De un vistazo</string>
+    <string name="stats_widget_today_insights_name">Hoy</string>
+    <string name="stats_widget_all_time_insights_name">Histórico</string>
+    <string name="stats_widget_weekly_views_name">Visitas esta semana</string>
+    <string name="stats_widget_log_in_message">Por favor, accede a la aplicación WordPress para añadir un widget.</string>
+    <string name="stats_widget_error_no_network">No hay ninguna red disponible</string>
+    <string name="stats_widget_error_no_data">No se pudieron cargar los datos</string>
+    <string name="stats_widget_select_type">Tipo</string>
+    <string name="stats_widget_select_color">Color</string>
+    <string name="stats_widget_select_your_site">Selecciona tu sitio</string>
+    <string name="stats_widget_color_dark">Oscuro</string>
+    <string name="stats_widget_color_light">Claro</string>
+    <string name="stats_widget_color">Color</string>
+    <string name="stats_widget_site_caption">Selecciona tu sitio</string>
+    <string name="stats_widget_site">Sitio</string>
+    <string name="stats_widget_all_time_title">Histórico</string>
+    <string name="stats_widget_views_title">Visitas esta semana</string>
+    <string name="stats_widget_add">Añadir widget</string>
+    <string name="plugin_fetching_error_after_at">Está tardando más tiempo del normal recargar los detalles del plugin. Por favor, compruébalo de nuevo más tarde.</string>
+    <string name="plugin_install_site_ineligible_default_error">Si acabas de registrar un nombre de dominio, por favor, espera hasta que terminemos de configurarlo e inténtalo de nuevo.\n\nEn caso contrario, parece que algo fue mal y la característica del plugin podría no estar disponible para este sitio.</string>
+    <string name="domain_contact_information_state_not_available_hint">Estado (no disponible)</string>
+    <string name="domain_registration_privacy_protection_tos">Al registrar este dominio aceptas nuestros %1$stérminos y condiciones%2$s</string>
+    <string name="error_network_connection">Comprueba tu conexión a la red e inténtalo de nuevo.</string>
+    <string name="error_browser_no_network">No se ha podido cargar esta página en este momento.</string>
+    <string name="error_disabled_apis">No se pudieron recuperar los ajustes. Algunas APIs no están disponibles para la cuenta e ID de esta aplicación OAuth.</string>
+    <string name="jetpack_connection_terms_and_conditions">Al configurar Jetpack aceptas nuestros %1$stérminos y condiciones%2$s</string>
+    <string name="site_settings_disconnected_toast">No hay ninguna conexión. La edición está desactivada.</string>
+    <string name="site_settings_update_password_message">Para volver a conectar la aplicación a tu sitio alojado, introduce aquí la nueva contraseña del sitio.</string>
+    <string name="site_settings_password_updated">Contraseña actualizada</string>
+    <string name="site_settings_password_dialog_title">Actualizar contraseña</string>
+    <string name="domain_registration_registering_domain_name_progress_dialog_message">Registrando el nombre de dominio…</string>
+    <string name="domain_registration_state_picker_dialog_title">Selecciona la provincia</string>
+    <string name="domain_registration_country_picker_dialog_title">Selecciona el país</string>
+    <string name="domain_registration_result_continue_button">seguir</string>
+    <string name="domain_registration_result_description">tu nuevo dominio &lt;b&gt;%s&lt;/b&gt; se está configurando. ¡Tu sitio está\n    dando saltos mortales de emoción!</string>
+    <string name="domain_registration_result_title">Felicitaciones</string>
+    <string name="domain_contact_information_register_domain_button">Registrar dominio</string>
+    <string name="domain_contact_information_postal_code_hint">Código postal</string>
+    <string name="domain_contact_information_state_hint">Provincia</string>
+    <string name="domain_contact_information_city_hint">Ciudad</string>
+    <string name="domain_contact_information_address_hint_two">Dirección 2</string>
+    <string name="domain_contact_information_address_hint">Dirección</string>
+    <string name="domain_contact_information_country_hint">País</string>
+    <string name="domain_contact_information_country_code_hint">Código del país</string>
+    <string name="domain_contact_information_phone_number_hint">Teléfono</string>
+    <string name="domain_contact_information_organization_hint">Organización (opcional)</string>
+    <string name="domain_contact_information_description">Para tu comodidad, hemos precompletado tu información de contacto\n de WordPress.com. Por favor, comprueba que es la información correcta que quieres usar para este dominio.</string>
+    <string name="domain_contact_information_title">Información de contacto del dominio</string>
+    <string name="domain_privacy_option_off_title">Registrar públicamente</string>
+    <string name="domain_privacy_option_on_title">Registrar privadamente con protección de privacidad</string>
+    <string name="domain_registration_privacy_protection_description">Lo propietarios de dominios tienen que compartir información en una base de datos pública de todos los dominios.\n   Con la protección de privacidad publicamos nuestra propia información en vez de la tuya, y te redirigiremos de forma privada cualquier comunicación dirigida a ti.</string>
+    <string name="domain_registration_privacy_protection_title">Protección de privacidad</string>
+    <string name="domain_registration_contact_form_input_error">Por favor, introduce un %s válido</string>
+    <string name="domains_suggestions_choose_domain">Elegir dominio</string>
+    <string name="stats_management_new">Nuevo</string>
+    <string name="stats_management_dismiss_insights_news_card">Descartar</string>
+    <string name="stats_management_try_it_now">Pruébalo ahora</string>
+    <string name="stats_management_news_card_message">Elige qué estadísticas ver, y céntrate en los datos que más te preocupen. Toca en %1$s al fondo de las estadísticas para personalizarlas.</string>
+    <string name="stats_manage_your_stats">Gestiona tus estadísticas</string>
+    <string name="history_fetching_revisions">Recuperando revisiones…</string>
+    <string name="editor_failed_to_insert_media_tap_to_retry">Fallo al insertar los medios.\nPor favor, toca para volver a intentarlo.</string>
+    <string name="editor_uploading_draft">Tu borrador se está subiendo</string>
+    <string name="post_uploading_draft">Subiendo borrador</string>
+    <string name="post_list_tab_drafts">Borradores</string>
+    <string name="error_restoring_post">Ocurrió un error mientras se restauraba la entrada</string>
+    <string name="backdated_for">Retroceder a: %s</string>
+    <string name="stats_insights_management_title">Solo ves las estadísticas más relevantes. Añade y organiza tus detalles abajo.</string>
+    <string name="stats_insights_social">Social</string>
+    <string name="stats_insights_annual_site_stats">Estadísticas anuales del sitio</string>
+    <string name="stats_view_follower_totals">Seguidores totales</string>
+    <string name="domain_suggestions_fetch_error">No se pudieron cargar las sugerencias de dominios</string>
+    <string name="domain_suggestions_search_hint">Teclea una palabra clave para más ideas</string>
+    <string name="domains_suggestions_empty_list">No se han encontrado sugerencias</string>
+    <string name="register_domain">Registrar dominio</string>
+    <string name="jetpack_installed_message">Ahora que está instalado Jetpack, solo necesitamos que lo configures. Esto solo te llevará un minuto.</string>
+    <string name="stats_menu_remove">Quitar de los detalles</string>
+    <string name="stats_menu_move_down">Mover abajo</string>
+    <string name="stats_menu_move_up">Mover arriba</string>
+    <string name="stats_item_settings">Ajustes de los parámetros de las estadísticas</string>
+    <string name="post_moving_to_draft">La entrada se está moviendo a borradores</string>
+    <string name="post_restoring">La entrada se está restaurando</string>
+    <string name="post_restored">Entrada restaurada</string>
+    <string name="post_trashing">La entrada se está enviando a la papelera</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios sin guardar, ¿estás seguro de querer continuar?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Cambios locales</string>
+    <string name="button_move_to_draft">Mover a borradores</string>
+    <string name="post_list_toggle_item_layout_list_view">Cambiar a la vista de lista</string>
+    <string name="post_list_toggle_item_layout_cards_view">Cambiar a la vista de tarjetas</string>
+    <string name="posts_trashed_empty">No tienes ninguna entrada en la papelera</string>
+    <string name="posts_draft_empty">No tienes ninguna entrada en borrador</string>
+    <string name="posts_scheduled_empty">No tienes ninguna entrada programada</string>
+    <string name="posts_published_empty">Aún no has publicado ninguna entrada</string>
+    <string name="notification_wpcom_username_needed">Por favor, accede con tu nombre de usuario y contraseña.</string>
+    <string name="error_user_username_instead_of_email">Por favor, accede usando tu nombre de usuario de WordPress.com en vez de tu dirección de correo electrónico.</string>
+    <string name="stats_insights_average_words">Promedio de palabras/entrada</string>
+    <string name="stats_insights_total_words">Total de palabras</string>
+    <string name="stats_insights_average_likes">Promedio de me gusta/entrada</string>
+    <string name="stats_insights_total_likes">Total de me gusta</string>
+    <string name="stats_insights_average_comments">Promedio de comentarios/entrada</string>
+    <string name="stats_insights_total_comments">Total de comentarios</string>
+    <string name="stats_insights_posts">Entradas</string>
+    <string name="stats_insights_year">Año</string>
+    <string name="stats_insights_this_year_site_stats">Este año</string>
+    <string name="no_site_error">El sitio de esta dirección no es un sitio WordPress. Para que nos podamos conectar el sitio debe usar WordPress.</string>
+    <string name="plugin_check_domain_credit_error">Fallo al comprobar los créditos de dominio disponibles</string>
+    <string name="plugin_check_domain_credits_progress_dialog_message">Comprobando créditos de dominio</string>
+    <string name="plugin_install_custom_domain_required_dialog_register_btn">Registrar dominio</string>
+    <string name="plugin_install_custom_domain_required_dialog_message">Para instalar plugins necesitas tener un dominio personalizado asociado a tu sitio.</string>
+    <string name="plugin_install_custom_domain_required_dialog_title">Instalar plugin</string>
+    <string name="new_site_creation_preview_subtitle">Podrás personalizar la apariencia de tu sitio más adelante</string>
+    <string name="publish_on">Publicar el: %s</string>
+    <string name="schedule_for">Programa para el: %s</string>
+    <string name="published_on">Publicado el: %s</string>
+    <string name="scheduled_for">Programado para el: %s</string>
+    <string name="stats_detail_recent_weeks">Últimas semanas</string>
+    <string name="stats_detail_average_views_per_day">Vistas medias por dia</string>
+    <string name="stats_months_and_years_views_label">Vistas</string>
+    <string name="stats_months_and_years_period_label">Período</string>
+    <string name="stats_detail_months_and_years">Meses y años</string>
+    <string name="stats_insights_load_more">Cargar más</string>
+    <string name="stats_insights_today_stats">Hoy</string>
+    <string name="stats_insights_best_hour">Mejor hora</string>
+    <string name="stats_insights_best_day">Mejor día</string>
+    <string name="showing_stats_for">Estadísticas del:</string>
+    <string name="app_rating_rate_never">No, gracias</string>
+    <string name="app_rating_rate_later">Más tarde</string>
+    <string name="app_rating_rate_now">Valorar ahora</string>
+    <string name="app_rating_message">¡Qué gusto verte de nuevo! Si estás trabajando con la aplicación nos encantaría que nos puntuases en la Google Play Store.</string>
+    <string name="app_rating_title">¿Estás disfrutando de WordPress?</string>
+    <string name="editor_post_converted_back_to_draft">Entrada devuelta a borrador</string>
+    <string name="stats_insights_posting_activity">Actividad de publicación</string>
+    <string name="stats_site_not_loaded_yet">El sitio no se ha cargado todavía</string>
+    <string name="stats_more_posts">Más entradas</string>
+    <string name="stats_fewer_posts">Menos entradas</string>
+    <string name="new_site_creation_preview_back_pressed_warning">Puedes perder lo que llevas hecho. ¿Estás seguro de que quieres salir?</string>
+    <string name="plans_loading_error_with_cache_button">Ver los planes</string>
+    <string name="plans_loading_error_with_cache_subtitle">Se requiere una conexión a Internet para ver los planes, así que los detalles podrían estar desactualizados.</string>
+    <string name="plans_loading_error_no_cache_subtitle">Se requiere una conexión a Internet para ver los planes.</string>
+    <string name="plans_loading_error_no_plans_subtitle">No podemos cargar los planes en este momento. Por favor, inténtalo de nuevo.</string>
+    <string name="plans_loading_error_no_plans_title">No se pueden cargar los planes</string>
+    <string name="plans_loading_error_network_title">No hay conexión</string>
+    <string name="menu_switch_to_gutenberg_editor">Cambiar al editor de bloques</string>
+    <string name="stats_loading_block_error">Hubo un problema al cargar tus datos, recarga la página e inténtalo de nuevo.</string>
+    <string name="stats_loading_error">Datos no cargados</string>
+    <string name="site_settings_gutenberg_default_for_new_posts_summary">Edita las nuevas entradas y páginas con el editor de bloques</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">Usar editor de bloques</string>
+    <string name="exit">salir</string>
+    <string name="quick_start_sites_type_subtitle">%1$d de %2$d completo</string>
+    <string name="quick_start_sites">Siguientes pasos</string>
+    <string name="quick_start_complete_tasks_header">Completo (%d)</string>
+    <string name="quick_start_dialog_view_site_message">¡Disfruta tu producto terminado!</string>
+    <string name="quick_start_dialog_upload_icon_title">Sube un icono del sitio</string>
+    <string name="quick_start_dialog_upload_icon_message">Tus visitantes verán tu icono en su navegador. Añade un icono personalizado para conseguir un aspecto profesional y refinado.</string>
+    <string name="quick_start_dialog_explore_plans_message_short">Toca en %1$s Plan %2$s para ver tu plan actual y otros planes disponibles</string>
+    <string name="quick_start_dialog_check_stats_message_short">Toca en %1$s Estadísticas %2$s para ver cómo está rindiendo tu sitio.</string>
+    <string name="quick_start_dialog_upload_site_icon_message_short">Toca en %1$s Icono de tu sitio %2$s para subir uno nuevo</string>
+    <string name="quick_start_dialog_publish_post_message">Guarda en borrador y publica tu primera entrada.</string>
+    <string name="quick_start_dialog_need_help_message">Te llevaremos por los básicos sobre cómo crear y hacer crecer tu sitio.</string>
+    <string name="quick_start_dialog_migration_title">Hemos realizado algunos cambios en tu lista de comprobación</string>
+    <string name="quick_start_dialog_migration_message">Hemos añadido más tareas para ayudarte a hacer crecer tu audiencia.</string>
+    <string name="quick_start_dialog_explore_plans_title">Explorar planes</string>
+    <string name="quick_start_dialog_explore_plans_message">Aprende sobre las herramientas de marketing y SEO de nuestros planes de pago.</string>
+    <string name="quick_start_dialog_enable_sharing_title">Activar compartir entradas</string>
+    <string name="quick_start_dialog_enable_sharing_message">Comparte automáticamente las nuevas entradas en tus cuentas de medios sociales.</string>
+    <string name="quick_start_dialog_check_stats_title">Revisa las estadísticas de tu sitio</string>
+    <string name="quick_start_dialog_check_stats_message">Mantente al día sobre el rendimiento de tu sitio.</string>
+    <string name="quick_start_dialog_remove_next_steps_message">Quitar los siguiente pasos ocultará todas las visitas guiadas de este sitio. Esta acción es irreversible.</string>
+    <string name="quick_start_dialog_remove_next_steps_title">Quitar los siguientes pasos</string>
+    <string name="quick_start_remove_next_steps_menu_title">Quitar esto</string>
+    <string name="quick_start_complete_view_subtitle">Enhorabuena por completar tu lista. Un trabajo bien hecho.</string>
+    <string name="quick_start_complete_view_title">¡Todas las tareas están completas!</string>
+    <string name="quick_start_task_skip_menu_title">Saltar tarea</string>
+    <string name="quick_start_completed_tasks_header_chevron_collapse_desc">contraer</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">expandir</string>
+    <string name="notification_channel_reminder_title">Recordatorio</string>
+    <string name="stats_select_next_period_description">Elige el siguiente periodo</string>
+    <string name="stats_select_previous_period_description">Elige el periodo anterior</string>
+    <string name="stats_most_popular_percent_views">%1$d%% de visitas</string>
+    <string name="stats_insights_popular">Hora más popular</string>
+    <string name="stats_traffic_change">%1$s (%2$s%%)</string>
+    <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
+    <string name="new_site_creation_site_preview_content_description">Mostrando la vista previa</string>
+    <string name="new_site_creation_clear_all_content_description">Vaciar</string>
+    <string name="site_created_but_not_fetched_snackbar_message">Parece que tienes una conexión lenta. Si no ves tu nuevo sitio en la lista, inténtalo actualizando.</string>
+    <string name="cancel_new_site_wizard_content_description">Cancelar el asistente de creación de sitios</string>
+    <string name="notification_new_site_creation_creating_site_subtitle">Estamos creando tu nuevo sitio</string>
+    <string name="notification_new_site_creation_failed">Hubo un problema</string>
+    <string name="notification_new_site_creation_title">Creación de un sitio</string>
+    <string name="new_site_creation_create_site_button">Crear sitio</string>
+    <string name="new_site_creation_domain_header_subtitle">Aquí es donde la gente te encontrará en Internet.</string>
+    <string name="new_site_creation_empty_domain_list_message">No hay direcciones disponibles que coincidan con tu búsqueda</string>
+    <string name="site_creation_error_generic_subtitle">Error durante la comunicación con el servidor. Inténtalo de nuevo</string>
+    <string name="site_creation_error_generic_title">Hubo un problema</string>
+    <string name="site_creation_fetch_suggestions_error_unknown">Hubo un problema</string>
+    <string name="new_site_creation_preview_title">¡Se ha creado tu sitio!</string>
+    <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
+    <string name="new_site_creation_screen_title_general">Crear sitio</string>
+    <string name="suggestions_updated_content_description">Sugerencias actualizadas</string>
+    <string name="site_picker_failed_selecting_added_site">No se ha podido seleccionar el sitio auto-hospedado que acabas de añadir.</string>
+    <string name="local_post_is_conflicted">Conflicto de versiones</string>
+    <string name="preference_crash_reports_summary">Activa los informes de errores automáticos para ayudarnos a mejorar el rendimiento de la app.</string>
+    <string name="preference_crash_reports">Informes de errores</string>
+    <string name="snackbar_conflict_undo">Deshacer</string>
+    <string name="snackbar_conflict_web_version_discarded">Versión web descartada</string>
+    <string name="snackbar_conflict_local_version_discarded">Versión local descartada</string>
+    <string name="toast_conflict_updating_post">Actualizando contenido</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Descartar Web</string>
+    <string name="dialog_confirm_load_remote_post_discard_local">Descartar local</string>
+    <string name="dialog_confirm_load_remote_post_body_2">Local\nGuardado el %s\n\nWeb\nGuardado el %s\n</string>
+    <string name="dialog_confirm_load_remote_post_body">Este contenido tiene dos versiones en conflicto. Selecciona qué versión quieres descartar.\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Resolver conflicto de sincronización</string>
+    <string name="stats_no_data_for_period">No hay datos en este periodo</string>
+    <string name="preference_strip_image_location">Eliminar la ubicación de los medios</string>
+    <string name="stats_cannot_be_started">No podemos abrir las estadísticas en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="gif_picker_endless_scroll_network_error">Algunos medios fallan al cargar debido a un error de red.</string>
+    <string name="gif_picker_empty_search_list">Ningún medio coincide con tu búsqueda</string>
+    <string name="gif_picker_initial_empty_text">¡Busca para encontrar GIF para añadir a tu biblioteca de medios!</string>
+    <string name="stats_author_views_label">Vistas</string>
+    <string name="stats_author_label">Autor</string>
+    <string name="stats_authors">Autores</string>
+    <string name="stats_search_terms_views_label">Vistas</string>
+    <string name="stats_search_terms_label">Buscar término</string>
+    <string name="stats_search_terms">Buscar términos</string>
+    <string name="stats_videos_views_label">Vistas</string>
+    <string name="stats_videos_title_label">Título</string>
+    <string name="stats_videos">Videos</string>
+    <string name="stats_country_views_label">Vistas</string>
+    <string name="stats_country_label">País</string>
+    <string name="stats_countries">Paises</string>
+    <string name="stats_clicks_label">Clics</string>
+    <string name="stats_clicks_link_label">Enlace</string>
+    <string name="stats_clicks">Clics</string>
+    <string name="stats_referrer_views_label">Vistas</string>
+    <string name="stats_referrer_label">Referente</string>
+    <string name="stats_referrers">Referentes</string>
+    <string name="stats_posts_and_pages">Entradas y páginas</string>
+    <string name="stats_insights_path">Ruta</string>
+    <string name="stats_insights_linkedin">LinkedIn</string>
+    <string name="stats_insights_google_plus">Google+</string>
+    <string name="stats_insights_tumblr">Tumblr</string>
+    <string name="stats_insights_twitter">Twitter</string>
+    <string name="stats_insights_facebook">Facebook</string>
+    <string name="stats_insights_view_more">Ver más</string>
+    <string name="stats_insights_share_post">Compartir entrada</string>
+    <string name="stats_insights_create_post">Crear entrada</string>
+    <string name="stats_insights_latest_post_message">Han pasado %1$s desde que se publicó %2$s. Así es como ha funcionado la entrada hasta ahora:</string>
+    <string name="stats_insights_latest_post_with_no_engagement">Han pasado %1$s desde que se publicó %2$s. Pon la bola a rodar y aumenta las vistas de las entradas compartiendo tu entrada:</string>
+    <string name="stats_insights_latest_post_empty">Aún no has publicado ninguna entrada. Una vez que empieces a publicar, el resumen de tu última entrada aparecerá aquí:</string>
+    <string name="stats_insights_tags_and_categories">Etiquetas y categorías</string>
+    <string name="stats_insights_all_time_stats">Histórico</string>
+    <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
+    <string name="stats_publicize_followers_label">Seguidores</string>
+    <string name="stats_publicize_service_label">Servicio</string>
+    <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_tags_and_categories_views_label">Vistas</string>
+    <string name="stats_tags_and_categories_title_label">Título</string>
+    <string name="stats_posts_and_pages_views_label">Vistas</string>
+    <string name="stats_posts_and_pages_title_label">Título</string>
+    <string name="stats_comments_label">Comentarios</string>
+    <string name="stats_comments_title_label">Título</string>
+    <string name="stats_comments_author_label">Autor</string>
+    <string name="stats_comments_posts_and_pages">Entradas y páginas</string>
+    <string name="stats_comments_authors">Autores</string>
+    <string name="stats_follower_since_label">Desde</string>
+    <string name="stats_follower_label">Seguidor</string>
+    <string name="stats_followers_count_message">Total %1$s seguidores: %2$s</string>
+    <string name="stats_followers_email">Correo electrónico</string>
+    <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_manage_insights">Gestionar datos</string>
+    <string name="stats_empty_insights_title">Aún no se han añadido impresiones</string>
+    <string name="stats_no_data_yet">Aún no hay datos</string>
+    <string name="menu_debug">Menú de depuración</string>
+    <string name="change_password_dialog_message">Cambiando contraseña…</string>
+    <string name="change_password_dialog_hint">Tu contraseña debe tener al menos seis caracteres de longitud. Para hacerla más fuerte, use letras mayúsculas y minúsculas, números y símbolos como ! \" ? $ % ^ &amp; ).</string>
+    <string name="change_password_confirmation">Contraseña cambiada con éxito</string>
+    <string name="change_password">Cambiar contraseña</string>
+    <string name="support_identity_input_dialog_name_label">Nombre</string>
+    <string name="history_no_title">(sin título)</string>
+    <string name="history_preview_html">Vista previa HTML</string>
+    <string name="history_preview_visual">Vista previa visual</string>
+    <string name="history_detail_title">Revisión</string>
+    <string name="history_detail_button_previous">Anterior</string>
+    <string name="history_detail_button_next">Siguiente</string>
+    <string name="media_space_used">%1$s utilizado</string>
+    <string name="enter_wpcom_or_jetpack_site">Por favor, introduce un sitio WordPress WordPress.com o alojado conectado a Jetpack</string>
+    <string name="history_loading_revision">Cargando revisión</string>
+    <string name="history_loaded_revision">Revisión cargada</string>
+    <string name="history_load_dialog_button_positive">Cargar</string>
+    <string name="history_footer_post">Entrada creada el %1$s a las %2$s</string>
+    <string name="history_footer_page">Página creada el %1$s a las %2$s</string>
+    <string name="history_empty_title">Aún no hay histórico</string>
+    <string name="history_empty_subtitle_post">Cuando haces cambios a tu entrada podrás ver aquí el histórico</string>
+    <string name="history_empty_subtitle_page">Cuando haces cambios a tu página podrás ver aquí el histórico</string>
+    <string name="description_user">Avatar del usuario</string>
+    <string name="image_size_full_label">Tamaño completo</string>
+    <string name="image_size_large_label">Grande</string>
+    <string name="image_size_medium_label">Mediano</string>
+    <string name="image_size_thumbnail_label">Miniatura</string>
+    <string name="menu_history">Historia</string>
+    <string name="pages_open_page_error">La página seleccionada no está disponible</string>
+    <string name="pages_pending">Pendiente de revisión</string>
+    <string name="pages_empty_trashed">No tienes ninguna página en la papelera</string>
+    <string name="pages_empty_scheduled">No tienes ninguna página programada</string>
+    <string name="pages_empty_drafts">No tienes ninguna página en probador</string>
+    <string name="pages_empty_published">Todavía no has publicado ninguna página</string>
+    <string name="pages_search_suggestion">Buscar páginas</string>
+    <string name="pages_empty_search_result">Ninguna página coincide con tu búsqueda</string>
+    <string name="pages_delete_permanently">Borrar permanentemente</string>
+    <string name="pages_move_to_trash">Mover a la papelera</string>
+    <string name="pages_move_to_draft">Mover a borradores</string>
+    <string name="pages_set_parent">Hacer superior</string>
+    <string name="pages_view">Ver</string>
+    <string name="pages_trashed">En la papelera</string>
+    <string name="pages_scheduled">Programada</string>
+    <string name="pages_drafts">Borradores</string>
+    <string name="pages_published">Publicadas</string>
+    <string name="login_error_sms_throttled">Hemos hecho demasiados intentos para enviar un código de verificación por SMS - tómate un descanso y solicita uno nuevo dentro de un minuto.</string>
+    <string name="login_error_email_not_found_v2">No hay ninguna cuenta de WordPress.com que coincida con esta cuenta de Google.</string>
+    <string name="site_picker_remove_site_empty">Ningún sitio coincide con tu búsqueda</string>
+    <string name="reader_empty_followed_blogs_search_title">Ningún sitio coincide con tu búsqueda</string>
+    <string name="page_parent_changed">La página superior ha cambiado</string>
+    <string name="page_permanently_deleted">La página se ha borrado permanentemente</string>
+    <string name="page_moved_to_scheduled">La página se ha programado</string>
+    <string name="page_moved_to_published">La página se ha publicado</string>
+    <string name="page_moved_to_trash">La página se ha enviado a la papelera</string>
+    <string name="page_moved_to_draft">La página se ha movido a borradores</string>
+    <string name="top_level">Nivel superior</string>
+    <string name="page_delete_dialog_message">¿Estás seguro de querer borrar la página %s?</string>
+    <string name="page_parent_change_error">Hubo un problema al cambiar la página superior</string>
+    <string name="page_status_change_error">Hubo un problema al cambiar el estado de la página</string>
+    <string name="page_delete_error">Hubo un problema al borrar la página</string>
+    <string name="set_parent">Hacer superior</string>
+    <string name="quick_start_focus_point_description">toca aquí</string>
+    <string name="quick_start_list_create_site_title">Crea tu sitio</string>
+    <string name="quick_start_list_create_site_subtitle">Pon tu sitio en marcha.</string>
+    <string name="quick_start_dialog_view_site_title">Ver tu sitio</string>
+    <string name="quick_start_dialog_view_site_message_short">Toca en %1$s Ver sitio %2$s para previsualizar tu sitio</string>
+    <string name="quick_start_dialog_share_site_title">Comparte tu sitio</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Toca en %1$s Compartir %2$s para continuar</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_connections">Toca en %1$s Conexiones %2$s para añadir tus cuentas de medios sociales</string>
+    <string name="quick_start_dialog_share_site_message">Conecta a tus cuentas de medios sociales - tu sitio compartirá automáticamente las nuevas entradas.</string>
+    <string name="quick_start_dialog_publish_post_title">Publica una entrada</string>
+    <string name="quick_start_dialog_publish_post_message_short">Toca en %1$s Crear entrada %2$s para crear una nueva entrada</string>
+    <string name="quick_start_dialog_need_help_title">¿Quieres un poco de ayuda para empezar?</string>
+    <string name="quick_start_dialog_need_help_button_positive">Acepto</string>
+    <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
+    <string name="quick_start_dialog_need_help_button_negative">No gracias</string>
+    <string name="quick_start_dialog_follow_sites_title">Sigue otros sitios</string>
+    <string name="quick_start_dialog_follow_sites_message_short_reader">Toca en %1$s Lector %2$s para seguir</string>
+    <string name="quick_start_dialog_follow_sites_message">Descubre sitios que te inspiren, y síguelos para obtener actualizaciones cuando publiquen.</string>
+    <string name="quick_start_button_positive">Ir</string>
+    <string name="quick_start_button_negative_short">Cancelar</string>
+    <string name="quick_start_button_negative">Ahora no</string>
+    <string name="content_description_more">Más</string>
+    <string name="my_site_create_new_site_title">No tienes sitios</string>
+    <string name="reader_empty_followed_tags_title">Temas no seguidos</string>
+    <string name="reader_empty_followed_tags_subtitle">Añade aquí temas para descubrir entradas sobre tus temáticas favoritas</string>
+    <string name="login_to_to_connect_jetpack">Accede a la cuenta de WordPress.com que usaste para conectar Jetpack.</string>
+    <string name="install_jetpack_retry">Reintentar</string>
+    <string name="install_jetpack_continue">Configurar</string>
+    <string name="jetpack_installation_problem_message">Jetpack no se pudo instalar en este momento.</string>
+    <string name="jetpack_installation_problem">Hubo un problema</string>
+    <string name="jetpack_installed">Jetpack instalado</string>
+    <string name="installing_jetpack_message">Instalando Jetpack en tu sitio. Esto puede llevar unos minutos completarse.</string>
+    <string name="installing_jetpack">Instalando Jetpack</string>
+    <string name="install_jetpack_message">Las credenciales de tu web no se almacenarán, y solo se utilizan para instalar Jetpack.</string>
+    <string name="install_jetpack">Instala Jetpack</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">FAQ de Jetpack</string>
+    <string name="stats_jetpack_connection_setup_info">Para usar las estadísticas en tu sitio WordPress necesitas instalar el plugin Jetpack.</string>
+    <string name="themes_empty_list">No hay temas que coincidan con tu búsqueda</string>
+    <string name="reader_label_post_search_explainer">¿Que te gustaría encontrar?</string>
+    <string name="site_settings_tags_empty_title_search">No hay etiquetas que coincidan con tu búsqueda</string>
+    <string name="site_settings_tags_empty_title">No tienes ninguna etiqueta</string>
+    <string name="site_settings_tags_empty_subtitle">Añade aquí las etiquetas que uses frecuentemente para poder seleccionarlas rápidamente al etiquetar tus entradas</string>
+    <string name="site_settings_tags_empty_button">Crea una etiqueta</string>
+    <string name="media_empty_search_list">No hay medios que coincidan con tu búsqueda</string>
+    <string name="sign_out_wpcom_confirm_with_no_changes">¿Salir de WordPress?</string>
+    <string name="sign_out_wpcom_confirm_with_changes">Tienes cambios en entradas que no se han subido a tu sitio. Salir ahora borrará esos cambios de tu dispositivo. ¿Quieres salir de todos modos?</string>
+    <string name="people_empty_list_filtered_viewers">No hay lectores aún</string>
+    <string name="people_empty_list_filtered_email_followers">No hay seguidores por correo electrónico aún</string>
+    <string name="people_empty_list_filtered_followers">No hay seguidores aún</string>
+    <string name="people_empty_list_filtered_users">No hay usuarios aún</string>
+    <string name="reader_empty_posts_liked_description">Las entradas que te gusten aparecerán aquí</string>
+    <string name="reader_empty_posts_liked_title">Nada que te gustó aún</string>
+    <string name="reader_empty_followed_blogs_button_followed">Ir a los siguientes</string>
+    <string name="reader_empty_followed_blogs_button_discover">Descubre sitios</string>
+    <string name="reader_empty_followed_blogs_title">Sitios a los que no sigues</string>
+    <string name="notifications_empty_likes">No hay me gusta aún</string>
+    <string name="notifications_empty_followers">No hay seguidores aún</string>
+    <string name="activity_log_limited_content_on_free_plan">Como estás en un plan gratuito verás eventos limitados en tu actividad.</string>
+    <string name="activity_log_empty_subtitle">Cuando hagas cambios en tu sitio podrás ver el historial de tu actividad aquí</string>
+    <string name="activity_log_empty_title">No hay actividad aún</string>
+    <string name="posts_empty_list_button">Crea una entrada</string>
+    <string name="pages_empty_list_button">Crea una página</string>
+    <string name="media_empty_upload_media">Sube medios</string>
+    <string name="media_empty_list">No tienes ningún medio</string>
+    <string name="reader_gallery_images_desc">galería de imágenes</string>
+    <string name="blavatar_desc">icono del sitio</string>
+    <string name="theme_image_desc">imagen del tema</string>
+    <string name="featured_image_desc">imagen destacada</string>
+    <string name="button_discard">Descartar</string>
+    <string name="reader_avatar_desc">foto de perfil</string>
+    <string name="notification_channel_transient_title">Dato transitorio</string>
+    <string name="support_identity_input_dialog_email_label">Correo electrónico</string>
+    <string name="support_identity_input_dialog_enter_email">Por favor, introduce tu dirección de correo electrónico</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Para continuar, por favor, introduce tu dirección de correo electrónico y nombre</string>
+    <string name="support_push_notification_message">Nuevo mensaje de \'Ayuda y soporte\'</string>
+    <string name="support_push_notification_title">WordPress</string>
+    <string name="support_contact_email_not_set">No establecido</string>
+    <string name="support_contact_email">Correo electrónico de contacto</string>
+    <string name="application_log_button">Registro de la aplicación</string>
+    <string name="my_tickets">Mis tickets</string>
+    <string name="activity_log_currently_restoring_title">Actualmente restaurando tu sitio</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Tu sitio ha sido restaurado satisfactoriamente</string>
+    <string name="activity_log_button">Botón de acción del registro de actividad</string>
+    <string name="plugin_auto_managed">Gestionado automáticamente</string>
+    <string name="reader_save_posts_locally_dialog_message">Guarda esta entrada y vuelve cuando quieras para leerla. Solo estará disponible en este dispositivo — las entradas guardadas no se sincronizan con otros dispositivos.</string>
+    <string name="reader_save_posts_locally_dialog_title">Guardar entradas para más tarde</string>
+    <string name="reader_empty_search_request_failed">No ha sido posible realizar la búsqueda</string>
+    <string name="reader_empty_search_title">No se han encontrado resultados</string>
+    <string name="comment_read_source_post">Lee la entrada de origen</string>
+    <string name="sites">Sitios</string>
+    <string name="signup_magic_link_title">Enlace mágico enviado</string>
+    <string name="verification_2fa_screen_title">Verificación del código</string>
+    <string name="selfhosted_site_login_title">Credenciales de acceso</string>
+    <string name="magic_link_sent_login_title">Enlace mágico enviado</string>
+    <string name="magic_link_login_title">Acceso por enlace mágico</string>
+    <string name="site_address_login_title">Acceso mediante la dirección del sitio</string>
+    <string name="email_address_login_title">Acceso mediante dirección de correo electrónico</string>
+    <string name="reader_empty_saved_posts_description">Toca %s para guardar una entrada en tu lista.</string>
+    <string name="reader_empty_saved_posts_title">¡Aún no hay entradas guardadas!</string>
+    <string name="reader_bookmark_snack_title">Entrada guardada</string>
+    <string name="reader_bookmark_snack_btn">Ver todas</string>
+    <string name="reader_remove_bookmark">Borrada de las entradas guardadas</string>
+    <string name="reader_add_bookmark">Añadir a las entradas guardadas</string>
+    <string name="reader_save_for_later_title">Entradas guardadas</string>
+    <string name="removed">Borrado</string>
+    <string name="my_site_icon_content_description">Cambiar icono del sitio</string>
+    <string name="my_site_icon_dialog_cancel_button">Cancelar</string>
+    <string name="my_site_icon_dialog_remove_button">Eliminar</string>
+    <string name="my_site_icon_dialog_change_button">Cambiar</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">No tienes permiso para editar el icono del sitio.</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">No tienes permiso para añadir un icono al sitio.</string>
+    <string name="my_site_icon_dialog_change_message">¿Cómo te gustaría editar el icono?</string>
+    <string name="my_site_icon_dialog_add_message">¿Te gustaría añadir un icono de sitio?</string>
+    <string name="my_site_icon_dialog_title">Icono del sitio</string>
+    <string name="reader_followed_blog_notifications_this">este sitio</string>
+    <string name="reader_followed_blog_notifications_action">Activar</string>
+    <string name="reader_followed_blog_notifications">¿Activar avisos para %1$s%2$s%3$s?</string>
+    <string name="reader_btn_notifications_on">Activar los avisos del sitio</string>
+    <string name="reader_btn_notifications_off">Desactivar los avisos del sitio</string>
+    <string name="activity_log_jetpack_icon">Icono de Jetpack</string>
+    <string name="activity_log_event">Evento</string>
+    <string name="activity_log_icon">Icono de actividad</string>
+    <string name="activity_log">Registro de actividad</string>
+    <string name="privacy_policy_read">Lee la política de privacidad</string>
+    <string name="third_party_policy_learn_more_caption">Usamos otras herramientas de seguimiento, incluidas algunas de terceros. Lee acerca de estas y cómo controlarlas.</string>
+    <string name="third_party_policy_learn_more_header">Política de terceros</string>
+    <string name="privacy_policy_learn_more_caption">Esta información nos ayuda a mejorar nuestros productos, hacer que el marketing sea más relevante, personalizar tu experiencia en WordPress.com y más, tal como se detalla en nuestra política de privacidad.</string>
+    <string name="privacy_policy_learn_more_header">Política de privacidad</string>
+    <string name="cookie_policy_learn_more_caption">Comparte información con nuestra herramienta de análisis acerca del uso que haces de los servicios mientras estás conectado a tu cuenta de WordPress.com.</string>
+    <string name="cookie_policy_learn_more_header">Política de cookies</string>
+    <string name="preference_privacy_settings">Ajustes de privacidad</string>
+    <string name="preference_collect_information">Recopilar información</string>
+    <string name="post_submitted">Entrada enviada</string>
+    <string name="plugin_install_site_ineligible_site_graylisted">Una característica del plugin requiere que el sitio esté en buen estado.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Una característica del plugin necesita que la suscripción principal del dominio esté asociada con este usuario.</string>
+    <string name="plugin_install_site_ineligible_non_admin_user">Una característica del plugin necesita privilegios de administrador.</string>
+    <string name="plugin_install_site_ineligible_no_vip_sites">El plugin no puede instalarse en sitios VIP.</string>
+    <string name="plugin_install_site_ineligible_excessive_disk_space">El plugin no se puede instalar debido a las limitaciones de espacio del disco.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">Una característica del plugin requiere una dirección de correo electrónico verificada.</string>
+    <string name="plugin_install_site_ineligible_site_private">Una característica del plugin requiere que el sitio sea público.</string>
+    <string name="plugin_install_site_ineligible_no_business_plan">Una característica del plugin requiere un plan business.</string>
+    <string name="plugin_install_site_ineligible_not_using_custom_domain">Una característica del plugin requiere un dominio personalizado.</string>
+    <string name="plugin_install_first_plugin_almost_finished_dialog_message">Estamos haciendo la configuración final, está casi listo…</string>
+    <string name="plugin_install_first_plugin_progress_dialog_message">Instalando plugin…</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Instalar</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_message">Instalar el primer plugin en tu sitio puede tomar hasta 1 minuto. Durante este tiempo, no podrás realizar cambios en tu sitio.</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_title">Instalar plugin</string>
+    <string name="notification_settings_followed_dialog_title">Avisos</string>
+    <string name="notification_settings_followed_dialog_email_comments">Enviarme nuevos comentarios por correo electrónico</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">Semanalmente</string>
+    <string name="notification_settings_followed_dialog_email_posts_instantly">Instantáneamente</string>
+    <string name="notification_settings_followed_dialog_email_posts_daily">Diariamente</string>
+    <string name="notification_settings_followed_dialog_notification_posts_switch">Entradas nuevas</string>
+    <string name="notification_settings_followed_dialog_notification_posts_description">Recibe avisos de las nuevas entradas de este sitio</string>
+    <string name="notification_settings_followed_dialog_email_posts_switch">Enviarme nuevas entradas por correo electrónico</string>
+    <string name="notification_settings_item_your_sites_all_followed_sites">Todos mis sitios seguidos</string>
+    <string name="notification_settings_category_followed_sites">Sitios seguidos</string>
+    <string name="content_description_person_reading_device_notification">Dispositivo de lectura personal con avisos</string>
+    <string name="content_description_people_looking_charts">Gente mirando gráficos y tablas</string>
+    <string name="comment_title">%s en %s</string>
+    <string name="dialog_confirm_delete_permanently_post">¿Seguro que quieres eliminar definitivamente esta publicación?</string>
+    <string name="notification_channel_important_title">Importante</string>
+    <string name="notification_channel_general_title">General</string>
+    <string name="photo_picker_use_photo">Utilizar esta foto</string>
+    <string name="media_preview_title">%1$d de %2$d</string>
+    <string name="stock_media_picker_initial_empty_subtext">Fotografías facilitadas por %s</string>
+    <string name="stock_media_picker_initial_empty_text">Busca para encontrar fotografías gratuitas para añadir a tu biblioteca de medios</string>
+    <string name="stock_media_picker_search_hint">Búsqueda gratuita en la biblioteca de fotos</string>
+    <string name="photo_picker_stock_media">Selecciona de la biblioteca gratuita de fotos</string>
+    <string name="error_save_empty_draft">No se puede guardar un borrador vacío</string>
+    <string name="site_settings_quota_space_unlimited">%1$s de ilimitado</string>
+    <string name="preview_count">Vista previa %d</string>
+    <string name="add_count">Añadir %d</string>
+    <string name="fab_add_tag_desc">Crear etiqueta</string>
+    <string name="navigate_up_desc">navegar hacia arriba</string>
+    <string name="notification_settings_switch_desc">Avisos</string>
+    <string name="open_external_link_desc">Abrir enlace externo</string>
+    <string name="show_more_desc">mostrar más</string>
+    <string name="reader_photo_view_desc">foto</string>
+    <string name="reader_list_item_suggestion_remove_desc">borrar</string>
+    <string name="photo_picker_thumbnail_desc">Reproducir video</string>
+    <string name="reader_cardview_post_play_video_desc">reproducir video destacado</string>
+    <string name="plugin_detail_logo_desc">logo del plugin</string>
+    <string name="plugin_detail_banner_desc">banner del plugin</string>
+    <string name="photo_picker_wpmedia_desc">elige desde medios de WordPress</string>
+    <string name="photo_picker_camera_desc">abrir cámara</string>
+    <string name="photo_picker_device_desc">elige desde el dispositivo</string>
+    <string name="people_invite_role_info_desc">información del perfil</string>
+    <string name="media_settings_play">reproduce</string>
+    <string name="media_settings_image_preview_desc">previsualizar imagen</string>
+    <string name="media_preview_desc">vista previa</string>
+    <string name="media_preview_audio_desc">audio</string>
+    <string name="media_grid_item_play_video_desc">reproducir video</string>
+    <string name="media_grid_item_trash_desc">papelera</string>
+    <string name="media_grid_item_retry_desc">reintentar</string>
+    <string name="media_grid_item_image_desc">vista previa de medios, nombre de archivo %s</string>
+    <string name="invite_user_delete_desc">eliminar %s</string>
+    <string name="profile_picture">Imagen de perfil de %s</string>
+    <string name="comment_checkmark_desc">marca de verificación</string>
+    <string name="signup_with_google_progress">Registrarse con Google…</string>
+    <string name="jetpack_connection_failed_with_reason">Se ha producido un error en la conexión a Jetpack: %s</string>
+    <string name="jetpack_already_connected_toast">Ya estás conectado a Jetpack</string>
+    <string name="menu_undo_snackbar_action">DESHACER</string>
+    <string name="menu_visual_mode_done_snackbar">Cambiado a modo visual</string>
+    <string name="menu_visual_mode">Modo visual</string>
+    <string name="menu_html_mode_done_snackbar">Cambiado a modo HTML</string>
+    <string name="menu_html_mode">Modo HTML</string>
+    <string name="menu_preview">Vista previa</string>
+    <string name="menu_save_as_draft">Guardar como borrador</string>
+    <string name="file_size_in_terabytes">%s TB</string>
+    <string name="file_size_in_gigabytes">%s GB</string>
+    <string name="file_size_in_megabytes">%s MB</string>
+    <string name="file_size_in_kilobytes">%s kB</string>
+    <string name="file_size_in_bytes">%s B</string>
+    <string name="site_settings_quota_space_value">%1$s de %2$s</string>
+    <string name="site_settings_quota_space_hint">Si necesitas más espacio, considera actualizar tu plan de WordPress.</string>
+    <string name="site_settings_quota_space_title">Espacio utilizado</string>
+    <string name="site_settings_quota_header">Medios</string>
+    <string name="comment_unspam_talkback">Comentario marcado como no spam</string>
+    <string name="comment_spam_talkback">Comentario marcado como spam</string>
+    <string name="comment_delete_talkback">Comentario borrado</string>
+    <string name="comment_untrash_talkback">Comentario restaurado</string>
+    <string name="comment_trash_talkback">Comentario enviado a la papelera</string>
+    <string name="comment_unliked_talkback">El comentario no ha gustado</string>
+    <string name="comment_liked_talkback">El comentario ha gustado</string>
+    <string name="comment_unapproved_talkback">Comentario sin aprobar</string>
+    <string name="comment_approved_talkback">Comentario aprobado</string>
+    <string name="notif_detail_screen_title">Detalle de notificación %s</string>
+    <string name="edit_photo_screen_title">Editar foto</string>
+    <string name="share_intent_screen_title">Elige el sitio</string>
+    <string name="signup_epilogue_screen_title">Cuenta nueva</string>
+    <string name="login_epilogue_screen_title">Conectado como</string>
+    <string name="person_detail_screen_title">Detalle de la persona</string>
+    <string name="media_settings_screen_title">Detalles del archivo</string>
+    <string name="publicize_buttons_screen_title">Botones de compartir</string>
+    <string name="notifications_screen_title">Avisos</string>
+    <string name="reader_screen_title">Lector</string>
+    <string name="me_section_screen_title">Yo</string>
+    <string name="my_site_section_screen_title">Mi sitio</string>
+    <string name="notif_settings_screen_title">Ajustes de avisos</string>
+    <string name="help_screen_title">Ayuda y soporte</string>
+    <string name="license_screen_title">Licencia</string>
+    <string name="release_notes_screen_title">Notas de la versión</string>
+    <string name="signup_epilogue_error_avatar_view">Tu avatar se ha subido y estará disponible en breve.</string>
+    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta característica.&lt;br/&gt;&lt;br/&gt;Si deseas usarla, edita tus permisos y comprueba que &lt;strong&gt;%s&lt;/strong&gt; se ha activado.</string>
+    <string name="permissions_denied_title">Permisos</string>
+    <string name="plugin_caption_featured">Destacados</string>
+    <string name="sharing_disabled_description">No puedes acceder a los ajustes compartidos porque el módulo Compartir de Jetpack está desactivado.</string>
+    <string name="sharing_disabled">Módulo Compartir desactivado</string>
+    <string name="version_with_name_param">Versión %s</string>
+    <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
+    <string name="publisher_with_company_param">Editor: %s</string>
+    <string name="notification_sound_has_invalid_path">El sonido escogido tiene una ruta incorrecta. Por favor, elige uno distinto.</string>
+    <string name="quickpress_shortcut_with_account_param">QP %s</string>
+    <string name="uploading_subtitle_pages_posts">quedan %1$d páginas / entradas</string>
+    <string name="uploading_subtitle_pages_only_one">Queda 1 página</string>
+    <string name="uploading_subtitle_pages_only_plural">quedan %1$d páginas</string>
+    <string name="uploading_subtitle_posts_only_plural">quedan %1$d entradas</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d páginas / entradas y 1 archivo restantes</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d entradas y 1 archivo restantes</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d páginas y 1 archivo restantes</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_one">1 entrada y 1 archivo restantes</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_one">1 página y 1 archivo restantes</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d páginas / entradas y %2$d de %3$d archivos restantes</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d entradas y %2$d de %3$d archivos restantes</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_plural">quedan %1$d páginas y %2$d de %3$d archivos</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_plural">queda 1 entrada y %1$d de %2$d archivos</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_plural">queda 1 página y %1$d de %2$d archivos</string>
+    <string name="media_file_pages_and_posts_only_not_uploaded">%1$d entradas / páginas sin subir</string>
+    <string name="media_file_pages_plural_only_not_uploaded">%1$d páginas sin subir</string>
+    <string name="media_file_page_singular_only_not_uploaded">1 página sin subir</string>
+    <string name="media_file_posts_plural_only_not_uploaded">%1$d entradas sin subir</string>
+    <string name="media_file_post_singular_only_not_uploaded">1 entrada sin subir</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%1$d entradas / páginas con %2$d archivos sin subir</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%1$d páginas %2$d archivos sin subir</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">1 página con %1$d archivos sin subir</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%1$d entradas con %2$d archivos sin subir</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">1 entrada con %1$d archivos sin subir</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d entradas / páginas con 1 archivo sin subir</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d páginas con 1 archivo sin subir</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 página con 1 archivo sin subir</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d entradas con 1 archivo sin subir</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 entrada con 1 archivo sin subir</string>
+    <string name="untitled_in_parentheses">(sin título)</string>
+    <string name="at_username">\@%s</string>
+    <string name="site_creation_domain_finish_button">Crear sitio</string>
+    <string name="notification_site_creation_created">Toca para continuar.</string>
+    <string name="notification_site_creation_title_success">¡Sitio creado!</string>
+    <string name="google_error_timeout">A Google le llevó demasiado tiempo responder. Puede que tengas que esperar hasta que tengas una conexión a internet más rápida.</string>
+    <string name="username_changer_title">Cambiar nombre de usuario</string>
+    <string name="username_changer_hint">Teclea para obtener más sugerencias</string>
+    <string name="username_changer_header">Tu nombre de usuario actual es %1$s%2$s%3$s. Con pocas excepciones, otros solo verán tu nombre a mostrar, %4$s%5$s%6$s.</string>
+    <string name="username_changer_error_none">No se ha sugerido ningún nombre de usuario desde %1$s%2$s%3$s. Por favor, introduce más letras o números para obtener sugerencias.</string>
+    <string name="username_changer_error_generic">Ocurrió un error al recuperar sugerencias de nombres de usuario.</string>
+    <string name="username_changer_dismiss_message">¿Descartas cambiar de nombre de usuario?</string>
+    <string name="username_changer_dismiss_button_positive">Descartar</string>
+    <string name="username_changer_action">Guardar</string>
+    <string name="content_description_add_avatar">Añadir avatar</string>
+    <string name="signup_user_exists">El correo electrónico ya existe en WordPress.com.\nAcceder.</string>
+    <string name="signup_updating_account">Actualizando cuenta…</string>
+    <string name="signup_magic_link_progress">Enviando correo</string>
+    <string name="signup_magic_link_error_button_positive">Reintentar</string>
+    <string name="signup_magic_link_error_button_negative">Cerrar</string>
+    <string name="signup_magic_link_error">Hubo algún problema al enviar el correo. Puedes reintentarlo ahora o cerrar e intentarlo más tarde.</string>
+    <string name="signup_epilogue_hint_username">Nombre de usuario</string>
+    <string name="signup_epilogue_hint_password_detail">Siempre puedes acceder con un enlace como el que acabas de usar, pero también puedes configurar una contraseña si lo prefieres.</string>
+    <string name="signup_epilogue_hint_password">Contraseña (opcional)</string>
+    <string name="signup_epilogue_hint_display">Nombre a mostrar</string>
+    <string name="signup_epilogue_error_button_positive">Reintentar</string>
+    <string name="signup_epilogue_error_button_negative">Revertir</string>
+    <string name="signup_epilogue_error_generic">Hubo algún problema al actualizar tu cuenta. Puedes reintentarlo o revertir tus cambios para continuar.</string>
+    <string name="signup_epilogue_error_avatar">Hubo algún problema al subir tu avatar.</string>
+    <string name="plugin_needs_update">Necesita actualizarse</string>
+    <string name="plugin_caption_search">Buscar plugins</string>
+    <string name="plugin_caption_new">Nuevo</string>
+    <string name="plugin_caption_popular">Populares</string>
+    <string name="plugins_empty_search_list">Ninguna coincidencia</string>
+    <string name="plugin_see_all">Ver todos</string>
+    <string name="plugin_manage">Gestionar</string>
+    <string name="plugin_search_error">No ha sido posible buscar plugins</string>
+    <string name="plugin_installed_failed">Error al instalar %s</string>
+    <string name="plugin_installed_successfully">%s instalado con éxito</string>
+    <string name="plugin_install">Instalar</string>
+    <string name="site_settings_like_header">Me gusta</string>
+    <string name="my_site_add_new_site">Añadir nuevo sitio</string>
+    <string name="my_site_create_new_site">Crea un nuevo sitio para tu negocio, revista o blog personal; o conecta con una instalación de WordPress existente.</string>
+    <string name="notifications_jetpack_connection_setup_info">Para obtener avisos útiles en tu dispositivo desde tu sitio WordPress tendrás que instalar el plugin Jetpack. ¿Te gustaría configurar Jetpack?</string>
+    <string name="site_settings_lazy_load_images">Carga diferida de imágenes</string>
+    <string name="stats_jetpack_connection_setup">Instalar Jetpack</string>
+    <string name="plugin_chevron_icon_content_description">Alternar texto</string>
+    <string name="plugin_info_your_version">Tu versión de WordPress</string>
+    <string name="plugin_info_requires_version">Requiere la versión de WordPress</string>
+    <string name="plugin_info_lastupdated">Actualizado por última vez</string>
+    <string name="plugin_info_version">Versión</string>
+    <string name="plugin_five_stars">5 estrellas</string>
+    <string name="plugin_four_stars">4 estrellas</string>
+    <string name="plugin_three_stars">3 estrellas</string>
+    <string name="plugin_two_stars">2 estrellas</string>
+    <string name="plugin_one_stars">1 estrella</string>
+    <string name="plugin_empty_text">Ninguno</string>
+    <string name="plugin_num_downloads">%s descargas</string>
+    <string name="plugin_num_ratings">%s valoraciones</string>
+    <string name="plugin_read_reviews">Leer valoraciones</string>
+    <string name="plugin_faq">Preguntas frecuentes</string>
+    <string name="plugin_whatsnew">Novedades</string>
+    <string name="plugin_installation">Instalación</string>
+    <string name="plugin_description">Descripción</string>
+    <string name="plugin_settings">Ajustes</string>
+    <string name="plugin_installed">Instalado</string>
+    <string name="plugin_installed_version">Versión %s instalada</string>
+    <string name="plugin_version">Versión %s</string>
+    <string name="plugin_byline">por %s</string>
+    <string name="change_photo">Cambiar foto</string>
+    <string name="plugin_fetch_error">No es posible cargar plugins</string>
+    <string name="my_site_btn_site_pages">Páginas del sitio</string>
+    <string name="site_settings_tags_hint">Gestiona las etiquetas de tu sitio</string>
+    <string name="dlg_saving_tag">Guardando</string>
+    <string name="dlg_deleting_tag">Borrando</string>
+    <string name="dlg_confirm_delete_tag">¿Borrar permanentemente la etiqueta \'%s\'?</string>
+    <string name="error_tag_exists">Ya existe una etiqueta con este nombre</string>
+    <string name="add_new_tag">Añadir nueva etiqueta</string>
+    <string name="tag_description_hint">Descripción</string>
+    <string name="tag_name_hint">Etiqueta</string>
+    <string name="site_settings_amp_summary">Tu sitio WordPress.com es compatible con el uso de páginas aceleradas para móviles, una iniciativa de Google que acelera enormemente la carga de las páginas en dispositivos móviles</string>
+    <string name="site_settings_amp_title">Páginas móviles aceleradas (AMP)</string>
+    <string name="site_settings_timezones_error">No es posible cargar las zonas horarias</string>
+    <string name="site_settings_format_help">Aprende más sobre formatos de fecha y hora</string>
+    <string name="site_settings_format_hint_custom">Formato personalizado</string>
+    <string name="site_settings_format_entry_custom">Personalizador</string>
+    <string name="site_settings_posts_per_page_title">Entradas por página</string>
+    <string name="site_settings_timezone_subtitle">Elige una ciudad en tu zona horaria</string>
+    <string name="site_settings_timezone_title">Zona horaria</string>
+    <string name="site_settings_time_format_title">Formato de hora</string>
+    <string name="site_settings_date_format_title">Formato de fecha</string>
+    <string name="site_settings_week_start_title">La semana empieza el</string>
+    <string name="site_settings_tags_title">Etiquetas</string>
+    <string name="site_settings_traffic_header">Tráfico</string>
+    <string name="delete_yes">Borrar</string>
+    <string name="plugin_external_link_icon_content_description">Enlace externo</string>
+    <string name="plugin_icon_content_description">Icono del plugin</string>
+    <string name="plugin_home_page">Web del plugin</string>
+    <string name="wordpress_dot_org_plugin_page">Página del plugin en WordPress.org</string>
+    <string name="plugin_remove_dialog_message">¿Estás seguro de querer borrar %1$s de %2$s?\n\nEsto desactivará el plugin y todos los archivos y datos asociados.</string>
+    <string name="plugin_remove_dialog_title">Borrar plugin</string>
+    <string name="plugin_remove_progress_dialog_message">Borrando %s…</string>
+    <string name="plugin_disable_progress_dialog_message">Desactivando %s…</string>
+    <string name="plugin_configuration_failed">Ocurrió un error al configurar el plugin: %s</string>
+    <string name="plugin_remove_failed">Error al borrar %s</string>
+    <string name="plugin_removed_successfully">%s borrado con éxito</string>
+    <string name="plugin_updated_failed_detailed">Error al actualizar %1$s: %2$s</string>
+    <string name="plugin_updated_failed">Error al actualzar %s.</string>
+    <string name="plugin_updated_successfully">%s se ha actualizado correctamente</string>
+    <string name="plugin_available_version">La versión %s está disponible</string>
+    <string name="plugin_detail_label_state_autoupdates">Actualizaciones automáticas</string>
+    <string name="plugin_detail_label_state_active">Activo</string>
+    <string name="plugin_inactive">Inactivo</string>
+    <string name="plugin_active">Activo</string>
+    <string name="plugins">Plugins</string>
+    <string name="my_site_btn_plugins">Plugins</string>
+    <string name="media_edit_link_hint">Abrir enlace en nueva ventana/pestaña</string>
+    <string name="media_edit_link_text">Enlace a</string>
+    <string name="notification_login_failed">Ocurrió un error.</string>
+    <string name="notification_2fa_needed">Por favor, facilita un código de identificación para continuar.</string>
+    <string name="notification_error_wrong_password">Por favor, vuelve a teclear tu contraseña para continuar.</string>
+    <string name="notification_login_title_stopped">Acceso detenido</string>
+    <string name="notification_logging_in">Por favor, espera mientras se accede.</string>
+    <string name="notification_login_title_in_progress">Acceso en progreso…</string>
+    <string name="notification_logged_in">Toca para continuar.</string>
+    <string name="notification_login_title_success">¡Conectado!</string>
+    <string name="login_error_generic_start">No se pudo iniciar el acceso desde Google.</string>
+    <string name="login_empty_password">Por favor, introduce una contraseña</string>
+    <string name="login_text_otp_another">Envíame un mensaje con otro código en su lugar</string>
+    <string name="enter_verification_code_sms">Hemos enviado un mensaje de texto al número de teléfono terminado en %s. Por favor, introduce el código de verificación del SMS.</string>
+    <string name="image_size">Tamaño</string>
+    <string name="uploading_subtitle_media_only_one">Queda 1 archivo</string>
+    <string name="uploading_subtitle_media_only">Quedan %1$d de %2$d archivos</string>
+    <string name="uploading_subtitle_posts_only_one">Quedan 1 entrada</string>
+    <string name="uploading_title">Subiendo…</string>
+    <string name="media_files_uploaded_write_post">Escribir entrada</string>
+    <string name="media_all_files_uploaded_successfully">%d archivos subidos con éxito</string>
+    <string name="media_files_uploaded_successfully">, %d subido con éxito</string>
+    <string name="media_file_uploaded">1 archivo subido</string>
+    <string name="media_file_not_uploaded">1 archivo no subido</string>
+    <string name="media_files_uploaded">%d archivos subidos</string>
+    <string name="media_files_not_uploaded">%d archivos no subidos</string>
+    <string name="remove_image_from_post">Quitar de la entrada</string>
+    <string name="confirm_remove_media_image">¿Quitamos esta imagen de la entrada?</string>
+    <string name="media_edit_customize_card_caption">Personalizar</string>
+    <string name="media_edit_file_details_card_caption">Detalles del archivo</string>
+    <string name="login_error_suffix">\n¿Quizás probando con otra cuenta?</string>
+    <string name="login_error_generic">Hubo algún problema al conectar con la cuenta de Google.</string>
+    <string name="login_error_button">Cerrar</string>
+    <string name="enter_wpcom_password_google">Para seguir con esta cuenta de Google, por favor, facilita la contraseña correspondiente de WordPress.com. Solo se te pedirá una vez.</string>
+    <string name="error_generic_network">Ocurrió un error en la red. Por favor, revisa tu conexión e inténtalo de nuevo.</string>
+    <string name="post_settings_remove_featured_image">Quitar imagen destacada</string>
+    <string name="post_settings_choose_featured_image">Elegir imagen destacada</string>
     <string name="login_log_in_for_share_intent">Accede a WordPress.com para compartir el contenido.</string>
     <string name="enter_site_address_share_intent">Introduce la dirección de tu sitio WordPress en el que quieras compartir el contenido.</string>
     <string name="jetpack_disconnect_error_toast">Error al desconectar el sitio</string>
     <string name="jetpack_disconnect_success_toast">Sitio desconectado</string>
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">¿Estás seguro de querer desconectar Jetpack del sitio?</string>
-    <string name="jetpack_disconnect_pref_title">\"Desconecta de WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Puedes poner en lista blanca una dirección IP o series de direcciones, evitando que las bloquee Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango introduce  un valor inferior y un valor superior separados por guiones. Ejemplo: 12.12.12.1–12.12.12.100</string>
+    <string name="jetpack_disconnect_pref_title">«Desconecta de WordPress.com»</string>
     <string name="jetpack_require_two_factor_title">Requiere la identificación en dos pasos</string>
     <string name="jetpack_match_wpcom_via_email_title">Relacionar cuentas usando el correo electrónico</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir el acceso con WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Acceso con WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Direcciones IP en lista blanca</string>
     <string name="jetpack_prevent_brute_force_title">Bloquea intentos de acceso malisiosos</string>
     <string name="jetpack_prevent_brute_force_category_title">Protección contra ataques de fuerza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar avisos instantáneos</string>
@@ -43,7 +1510,7 @@ Language: es_CO
     <string name="confirm_delete_media_image">¿Eliminar esta imagen?</string>
     <string name="media_title_document_details">Detalles del documento</string>
     <string name="media_title_audio_details">Detalles del audio</string>
-    <string name="media_title_video_details">Detalles del vídeo:</string>
+    <string name="media_title_video_details">Detalles del video</string>
     <string name="media_title_image_details">Detalles de la imagen</string>
     <string name="fab_content_description_preview">Vista previa</string>
     <string name="media_edit_upload_date_caption">Fecha de actualización</string>
@@ -54,6 +1521,7 @@ Language: es_CO
     <string name="media_edit_filename_caption">Nombre del archivo</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Texto alternativo</string>
+    <string name="connect_site">Conectar un sitio</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Luz parpadeante</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibración del dispositivo</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Elige sonido</string>
@@ -64,12 +1532,6 @@ Language: es_CO
     <string name="notification_settings_category_other">Otros</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos mis sitios</string>
     <string name="notification_settings_category_your_sites">Tus sitios</string>
-    <string name="notification_settings_master_off_message">Desactivando los ajustes de avisos desactivará todos los avisos de esta aplicación, da igual el tipo. Puedes ajustar al detalle que tipo de aviso recibir tras activar los ajustes de avisos.</string>
-    <string name="notification_settings_master_off_title">Para recibir avisos en este dispositivo activa los ajustes de avisos.</string>
-    <string name="notification_settings_master_hint_off">Activar avisos</string>
-    <string name="notification_settings_master_hint_on">Desactivar avisos</string>
-    <string name="notification_settings_master_status_off">Inactivos</string>
-    <string name="notification_settings_master_status_on">Activos</string>
     <string name="max_video_resolution">Tamaño máximo de vídeo</string>
     <string name="max_thumbnail_px_size">Tamaño máximo de imagen</string>
     <string name="error_upload_post_media_param">Hubo un error al subir los medios a esta entrada: %s.</string>
@@ -78,7 +1540,7 @@ Language: es_CO
     <string name="reader_excerpt_link">Vista %s para saber más</string>
     <string name="error_unknown_page">No se pudo encontrar la página en el servidor</string>
     <string name="error_publish_empty_page">No se puede publicar una página vacía</string>
-    <string name="upload_failed_param">La subida de \"%s\" falló</string>
+    <string name="upload_failed_param">La subida de «%s» ha fallado</string>
     <string name="cannot_retry_deleted_media_item">Los medios se han borrados. ¿Los borramos de esta entrada?</string>
     <string name="error_please_choose_browser">Error al abrir el navegador web por defecto. Por favor, elige otra aplicación:</string>
     <string name="cant_open_url">No fue posible abrir el enlace</string>
@@ -88,11 +1550,12 @@ Language: es_CO
     <string name="error_upload_page_media_param">Hubo un error al subir los medios a esta página: %s.</string>
     <string name="error_upload_page_param">Hubo un error al subir esta página: %s.</string>
     <string name="editor_uploading_post">Tu entrada se está subiendo</string>
+    <string name="uploading_media">Subiendo medios…</string>
     <string name="page_scheduled">Página programada</string>
     <string name="post_scheduled">Entrada programada</string>
     <string name="button_retry">Reintentar</string>
     <string name="post_queued">Entrada a la espera</string>
-    <string name="uploading_post">Subiendo \"%s\"</string>
+    <string name="uploading_post">Subiendo «%s»</string>
     <string name="connection_to_server_lost">Se ha perdido la conexión al servidor</string>
     <string name="login_epilogue_mysites_other">Mis sitios</string>
     <string name="login_epilogue_mysites_one">Mi sitio</string>
@@ -105,16 +1568,17 @@ Language: es_CO
     <string name="login_site_address_more_help">¿Necesitas más ayuda?</string>
     <string name="login_site_address_help_content">La dirección de tu sitio aparece en la barra de la parte superior de la pantalla cuando visitas tu sitio en Chrome.</string>
     <string name="login_site_address_help_title">¿Cuál es la dirección de mi sitio?</string>
-    <string name="login_site_address_help">¿Necesitas ayuda para encontrar la dirección de tu sitio?</string>
     <string name="login_site_address">Dirección del sitio</string>
+    <string name="enter_site_address">Introduce la dirección del sitio WordPress con el que te gustaría conectar.</string>
     <string name="login_already_logged_in_wpcom">Ya estás conectado a WordPress.com</string>
     <string name="login_continue">Seguir</string>
-    <string name="enter_wpcom_password">Introduce tu contraseña de WordPress.com</string>
+    <string name="connect_more">Conectar otro sitio</string>
+    <string name="enter_wpcom_password">Introduce tu contraseña de WordPress.com.</string>
     <string name="login_magic_link_email_requesting">Solicitando el correo electrónico de acceso</string>
     <string name="password_incorrect">Parece que esta contraseña es incorrecta. Por favor, vuelve a comprobar tu información e inténtalo de nuevo.</string>
     <string name="requesting_otp">Solicitando un código de verificación por SMS.</string>
+    <string name="login_text_otp">Envíame un mensaje con un código en su lugar</string>
     <string name="enter_verification_code">¡Casi lo tenemos! Por favor, introduce un código de verificación desde tu aplicación Authenticator.</string>
-    <string name="open_mail">Abrir correo electrónico</string>
     <string name="next">Siguiente</string>
     <string name="enter_email_wordpress_com">Accede a WordPress.com usando una dirección de correo electrónico para gestionar todos tus sitios WordPress.</string>
     <string name="image_optimization_promo_desc">La optimización de imagen reduce las imágenes para que suban más rápido.\n\nPuedes cambiar esto en cualquier momento en los ajustes del sitio.</string>
@@ -136,11 +1600,7 @@ Language: es_CO
     <string name="post_status_post_private">Privada</string>
     <string name="post_status_draft">Borrador</string>
     <string name="post_status_pending_review">Pendiente de revisión</string>
-    <string name="post_status_publish_post">Publicada</string>
-    <string name="change_location">Cambiar ubicación</string>
-    <string name="remove_location">Borrar ubicación</string>
-    <string name="post_settings_error_placepicker_missing_play_services">No se ha podido abrir el selector de ubicación, no  disponible Google Play Services</string>
-    <string name="post_settings_location">Ubicación</string>
+    <string name="post_status_publish_post">Publicar</string>
     <string name="now">Ahora</string>
     <string name="post_settings_password_dialog_hint">Solo los que tengan esta contraseña pueden ver esta entrada</string>
     <string name="post_settings_excerpt_dialog_hint">Los extractos son resúmenes opcionales del contenido hechos a mano.</string>
@@ -165,7 +1625,7 @@ Language: es_CO
     <string name="media_error_http_too_large_video_upload">Vídeo demasiado grande para subir</string>
     <string name="media_error_http_too_large_photo_upload">La imagen es demasiado grande para subirla. Trata de cambiar la optimización de imágenes en los ajustes de la aplicación</string>
     <string name="media_audio">Audio</string>
-    <string name="media_videos">Vídeos</string>
+    <string name="media_videos">Videos</string>
     <string name="media_documents">Documentos</string>
     <string name="media_images">Imágenes</string>
     <string name="media_all">Todos</string>
@@ -192,8 +1652,8 @@ Language: es_CO
     <string name="likes">Me gusta</string>
     <string name="sharing_comment_likes_description">Permite que tú y tus lectores den me gusta a todos los comentarios</string>
     <string name="buttons">Botones</string>
-    <string name="sharing_edit_more_buttons">Editar los botones \"Más\"</string>
-    <string name="sharing_more_description">Un botón \"Más\" contiene un desplegable que muestra botones de compartir</string>
+    <string name="sharing_edit_more_buttons">Editar los botones «Más»</string>
+    <string name="sharing_more_description">Un botón «Más» contiene un desplegable que muestra botones de compartir</string>
     <string name="sharing_sharing_buttons_description">Elige qué botones se mostrarán debajo de tus entradas</string>
     <string name="twitter_username">Usuario de Twitter</string>
     <string name="sharing_comment_likes">Me gusta a comentarios</string>
@@ -214,7 +1674,7 @@ Language: es_CO
     <string name="share_btn_reconnect">Reconectar</string>
     <string name="share_btn_disconnect">Desconectar</string>
     <string name="share_btn_connect">Conectar</string>
-    <string name="connection_service_description">Conéctate para compartir automáticamente las entradas de tu blog en %s</string>
+    <string name="connection_service_description">Conéctate para compartir automáticamente las entradas de tu blog en %s.</string>
     <string name="connection_service_label">Divulgar en %s</string>
     <string name="connected_accounts_label">Cuentas conectadas</string>
     <string name="connections_description">Conecta con tus servicios de medios sociales favoritos para compartir automáticamente las nuevas entradas con tus amigos.</string>
@@ -260,6 +1720,7 @@ Language: es_CO
     <string name="editor_post_saved_locally_failed_media">La entrada falló al subir los medios y se ha guardado localmente</string>
     <string name="sure_to_remove_account">¿Borrar este sitio de la aplicación?</string>
     <string name="photo_picker_title">Elegir foto</string>
+    <string name="error_publish_no_network">El dispositivo está desconectado. La entrada se guardará localmente.</string>
     <string name="editor_post_saved_online">La entrada se ha guardado online</string>
     <string name="site_settings_image_quality_hint">Calidad de las imágenes: cuanto más alto es el valor, más calidad tienen las imágenes.</string>
     <string name="site_settings_optimize_images_summary">Activa la opción para cambiar el tamaño de las imágenes y comprimirlas</string>
@@ -269,6 +1730,7 @@ Language: es_CO
     <string name="media_encoder_quality_85">Media</string>
     <string name="media_encoder_quality_80">Baja</string>
     <string name="media_upload_state_uploaded">Se ha subido</string>
+    <string name="media_upload_state_failed">Fallo al subir</string>
     <string name="media_upload_state_deleted">Se ha eliminado</string>
     <string name="media_upload_state_deleting">Eliminando</string>
     <string name="media_upload_state_uploading">Subiendo</string>
@@ -278,8 +1740,8 @@ Language: es_CO
     <string name="error_unknown_post_type">Formato de entrada desconocido</string>
     <string name="submit_for_review">Enviar</string>
     <string name="duplicate_site_detected">Se ha detectado un sitio duplicado.</string>
-    <string name="cannot_add_duplicate_site">Este sitio ya existe en la aplicación, no se puede Agregar.</string>
-    <string name="already_logged_in_wpcom">Ya estás registrado en una cuenta de WordPress.com, no se puede agregar un sitio de WordPress.com a otra cuenta.</string>
+    <string name="cannot_add_duplicate_site">Este sitio ya existe en la aplicación, no puedes añadirlo.</string>
+    <string name="already_logged_in_wpcom">Ya estás registrado en una cuenta de WordPress.com, no se puede añadir un sitio de WordPress.com a otra cuenta.</string>
     <string name="error_media_load">No se puede cargar archivos multimedia</string>
     <string name="error_media_refresh_no_connection">Se necesita estar conectado para actualizar la biblioteca</string>
     <string name="error_media_unauthorized">No tienes permiso para ver o editar archivos multimedia</string>
@@ -290,14 +1752,16 @@ Language: es_CO
     <string name="media_upload_error">Hubo un error al cargar el archivo multimedia</string>
     <string name="retry">Reintentar</string>
     <string name="confirm">Confirmar</string>
+    <string name="xmlrpc_endpoint_forbidden_error">No se pudo conectar. Se ha recibido un error 403 cuando se intenta acceder a \n        tu endpoint del XMLRPC de sitio. La aplicación lo necesita para comunicarse con tu sitio. Ponte en contacto con tu proveedor para solucionar este problema.</string>
     <string name="xmlrpc_post_blocked_error">No se pudo conectar. Su alojamiento está bloqueando las peticiones POST, y la aplicación las necesita \n        para comunicarse con su sitio. Póngase en contacto con su alojamiento para solucionar este problema.</string>
     <string name="reader_hint_search_followed_sites">Busca en los sitios que sigues</string>
-    <string name="pending_draft_one_generic">No dejes el trabajo a medias; \"%1$s\" está pendiente de publicarse.</string>
-    <string name="pending_draft_one_month">No dejes el trabajo a medias; \"%1$s\" está pendiente de publicarse.</string>
-    <string name="pending_draft_one_week_2">\"%1$s\" se ha guardado como borrador. Acuérdate de publicarla.</string>
-    <string name="pending_draft_one_week_1">El borrador \"%1$s\" te está esperando; no te olvides de publicarlo.</string>
-    <string name="pending_draft_one_day_2">¿Sabías que \"%1$s\" aún es un borrador? No esperes más y publícala.</string>
+    <string name="pending_draft_one_generic">¡No dejes el trabajo a medias! «%1$s» está pendiente de publicarse.</string>
+    <string name="pending_draft_one_month">¡No dejes el trabajo a medias! «%1$s» está pendiente de publicarse.</string>
+    <string name="pending_draft_one_week_2">«%1$s» se ha guardado como borrador. ¡Acuérdate de publicarla!</string>
+    <string name="pending_draft_one_week_1">El borrador «%1$s» te está esperando - ¡asegúrate de publicarlo!</string>
+    <string name="pending_draft_one_day_2">¿Sabías que «%1$s» está aún en borrador? ¡Publícala!</string>
     <string name="pending_draft_one_day_1">Ayer guardaste \'%1$s\' como borrador. ¡No olvides publicarla!</string>
+    <string name="reader_label_visit">Visitar el sitio</string>
     <string name="swipe_for_more">Deslizar para ver más</string>
     <string name="reader_err_get_post_not_authorized_signin_fallback">No estás autorizado a ver esta publicación. Prueba a iniciar sesión en WordPress.com primero o en su lugar usa el botón de acción arriba para abrir un navegador.</string>
     <string name="reader_err_get_post_not_authorized_signin">No estás autorizado a ver esta publicación. Prueba a iniciar sesión en WordPress.com primero.</string>
@@ -310,7 +1774,7 @@ Language: es_CO
     <string name="error_notif_q_action_approve">No se pudo aprobar el comentario. Por favor, inténtalo de nuevo más tarde.</string>
     <string name="error_notif_q_action_like">No se puede marcar como me gusta el comentario. Por favor inténtalo de nuevo más tarde.</string>
     <string name="notifications_label_new_notifications_subtitle">Pulsa para mostrarlos</string>
-    <string name="notifications_label_new_notifications">Nuevas notificaciones</string>
+    <string name="notifications_label_new_notifications">Nuevos avisos</string>
     <string name="comment_q_action_replying">Respondiendo…</string>
     <string name="comment_q_action_approving">Aprobando…</string>
     <string name="comment_q_action_liking">Enlazando…</string>
@@ -320,7 +1784,6 @@ Language: es_CO
     <string name="signout">Cerrar sesión</string>
     <string name="sign_in_wpcom">Iniciar sesión en WordPress.com</string>
     <string name="reader_label_global_related_posts">Más en WordPress.com</string>
-    <string name="reader_label_local_related_posts">Más en %s</string>
     <string name="preference_open_device_settings">Abrir ajustes del dispositivo</string>
     <string name="invite_invalid_email">%s: Correo electrónico no válido</string>
     <string name="invite_user_blocked_invites">%s: Invitaciones bloqueadas por el usuario</string>
@@ -347,17 +1810,17 @@ Language: es_CO
     <string name="people_dropdown_item_team">Equipo</string>
     <string name="invite_message_usernames_limit">Invita como máximo a 10 personas con sus correos electrónicos o nombre de usuarios de WordPress.com. A aquellos que necesiten un nombre de usuario se le enviará instrucciones sobre cómo hacerlo.</string>
     <string name="viewer_remove_confirmation_message">Si eliminas a este espectador, no podrá visitar tu sitio\n\n¿Todavía quieres eliminar a este espectador?</string>
-    <string name="follower_remove_confirmation_message">Si lo eliminas, este seguidor dejará de recibir informaciones de tu sitio, a no ser que vuelta a seguirte. \n\n¿Todavía quieres eliminar a este seguidor? </string>
+    <string name="follower_remove_confirmation_message">Si lo eliminas, este seguidor dejará de recibir informaciones de tu sitio, a no ser que vuelta a seguirte. \n\n¿Todavía quieres eliminar a este seguidor?</string>
     <string name="follower_subscribed_since">Desde %1$s</string>
     <string name="error_remove_viewer">No se pudo quitar el espectador</string>
     <string name="error_remove_follower">No se pudo quitar al seguidor</string>
     <string name="error_fetch_email_followers_list">No se pudieron recuperar los correos electrónicos de los seguidores del sitio</string>
     <string name="error_fetch_followers_list">No se pudieron recuperar los seguidores del sitio</string>
     <string name="editor_failed_uploads_switch_html">Algunas subidas de medios han fallado. Puedes cambiar al modo HTML \ncuando esto pasa. ¿Borramos todas las subidas fallidas y seguimos?</string>
-    <string name="image_settings_save_toast">Cambios guardados</string>
     <string name="image_width">Ancho</string>
     <string name="image_link_to">Enlazado a</string>
     <string name="image_caption">Leyenda</string>
+    <string name="image_settings_save_toast">Cambios guardados</string>
     <string name="image_settings_dismiss_dialog_title">¿Descartar cambios sin guardar?</string>
     <string name="stop_upload_dialog_title">¿Parar la subida?</string>
     <string name="tap_to_try_again">¡Toca para probar de nuevo!</string>
@@ -365,29 +1828,25 @@ Language: es_CO
     <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_some_failed">¡Se han enviado las invitaciones pero ha habido errores!</string>
     <string name="invite_error_sending">¡Hubo un error al tratar de enviar la invitación!</string>
-    <string name="invite_error_invalid_usernames_multiple">No se pudo enviar: Hay nombres de usuario o correos electrónicos no válidos.</string>
+    <string name="invite_error_invalid_usernames_multiple">No se pudo enviar: Hay nombres de usuario o correos electrónicos no válidos</string>
     <string name="invite_error_invalid_usernames_one">No se pudo enviar: Un nombre de usuario o correo electrónico no es válido</string>
     <string name="invite_error_no_usernames">Por favor, añade al menos un nombre de usuario</string>
-    <string name="invite_message_info">(Opcional) Puedes introducir un mensaje personalizado de hasta 500 caracteres que se incluirá en la invitación.</string>
-    <string name="invite_message_remaining_other">%d caracteres restantes</string>
-    <string name="invite_message_remaining_one">Queda 1 carácter</string>
-    <string name="invite_message_remaining_zero">Quedan 0 caracteres</string>
-    <string name="invite_message_title">Mensaje personalizado</string>
     <string name="invite">Invitar</string>
-    <string name="invite_names_title">Nombres de usuario o correos electrónicos</string>
     <string name="invite_people">Invitar a gente</string>
     <string name="my_site_header_external">Externo</string>
-    <string name="send_link">Enviar enlace</string>
     <string name="label_clear_search_history">Borrar historial de búsqueda</string>
     <string name="dlg_confirm_clear_search_history">¿Borrar historial de búsqueda?</string>
-    <string name="preview_screen_links_disabled">Los enlaces están inhabilitados en la pantalla de vista previa</string>
+    <string name="reader_empty_search_description">No se han encontrado resultados con %s para tu idioma</string>
+    <string name="reader_hint_post_search">Buscar en WordPress</string>
+    <string name="reader_title_related_post_detail">Entrada relacionada</string>
+    <string name="preview_screen_links_disabled">Los enlaces están desactivados en la pantalla de vista previa</string>
     <string name="send">Enviar</string>
-    <string name="person_removed">\@%1$s eliminado correctamente.</string>
+    <string name="person_removed">%1$s se ha eliminado correctamente</string>
     <string name="user_remove_confirmation_message">Si eliminas %1$s, ese usuario ya no será capaz de acceder a este sitio, pero cualquier contenido que fuera creado por %1$s permanecerá en el sitio.\n\n¿Aún te gustaría eliminar este usuario?</string>
     <string name="person_remove_confirmation_title">Eliminar %1$s</string>
-    <string name="people">Gente</string>
     <string name="role">Rol</string>
-    <string name="reader_empty_posts_in_custom_list">Los sitios de esta lista no han publicado nada últimamente.</string>
+    <string name="people">Gente</string>
+    <string name="reader_empty_posts_in_custom_list">Los sitios de esta lista no han publicado nada últimamente</string>
     <string name="error_remove_user">No se pudo eliminar el usuario</string>
     <string name="error_update_role">No se ha podido actualizar el rol del usuario</string>
     <string name="error_fetch_viewers_list">No se pudieron recuperar los espectadores del sitio</string>
@@ -398,8 +1857,7 @@ Language: es_CO
     <string name="checking_email">Comprobando correo electrónico</string>
     <string name="magic_link_unavailable_error_message">Actualmente no disponible. Por favor, introduce tu contraseña</string>
     <string name="logging_in">Accediendo</string>
-    <string name="enter_your_password_instead">Introduce tu contraseña</string>
-    <string name="web_address_dialog_hint">Cuando comentes se hará público</string>
+    <string name="web_address_dialog_hint">Cuando comentes se hará público.</string>
     <string name="capture_or_pick_photo">Captura o elige imagen</string>
     <string name="plans">Planes</string>
     <string name="plan">Plan</string>
@@ -409,17 +1867,19 @@ Language: es_CO
     <string name="exporting_content_progress">Exportando contenido…</string>
     <string name="checking_purchases">Comprobando compras</string>
     <string name="show_purchases">Mostrar compras</string>
-    <string name="premium_upgrades_message">Tienes mejoras premium en tu sitio. Por favor, cancela tus mejoras antes de eliminar tu sitio. </string>
+    <string name="premium_upgrades_message">Tienes mejoras premium en tu sitio. Por favor, cancela tus mejoras antes de eliminar tu sitio.</string>
     <string name="premium_upgrades_title">Mejoras premium</string>
     <string name="purchases_request_error">Algo fue mal. No se pudo realizar la compra.</string>
     <string name="delete_site_progress">Borrando sitio…</string>
     <string name="delete_site_hint">Eliminar el sitio</string>
     <string name="export_site_hint">Exportar tu sitio a un archivo XML</string>
     <string name="primary_domain">Dominio principal</string>
+    <string name="error_deleting_site_summary">Hubo un error al eliminar tu sitio. Por favor, contacta con el soporte para más asistencia.</string>
     <string name="error_deleting_site">Error borrando sitio</string>
     <string name="site_settings_export_content_title">Exportar contenido</string>
-    <string name="confirm_delete_site_prompt">Por favor, escribe en %1$s en el campo arriba para confirmar. Tu sitio desaparecerá para siempre.</string>
+    <string name="confirm_delete_site_prompt">Por favor, escribe: %1$s en el campo de abajo para confirmar. Tu sitio desaparecerá para siempre.</string>
     <string name="confirm_delete_site">Confirmar borrado del sitio</string>
+    <string name="contact_support">Contactar con el soporte</string>
     <string name="start_over_text">Si quieres un sitio, pero no quieres ninguna de las entradas y las páginas que tiene ahora, nuestro equipo de soporte puede borrar sus mensajes, páginas, archivos multimedia y tus comentarios.\n\nEsto mantendrá su sitio y la URL activos, pero tendrás un nuevo comienzo en la creación de contenidos. Sólo tienes que contactar con nosotros para limpiar tu contenido actual..</string>
     <string name="let_us_help">Déjanos ayudarte</string>
     <string name="site_settings_start_over_hint">Comienza tu sitio encima</string>
@@ -427,21 +1887,24 @@ Language: es_CO
     <string name="me_btn_app_settings">Ajustes de la app</string>
     <string name="editor_remove_failed_uploads">Eliminar subidas fallidas</string>
     <string name="site_settings_advanced_header">Avanzado</string>
+    <string name="comments_empty_list_filtered_trashed">No hay comentarios en la papelera</string>
+    <string name="comments_empty_list_filtered_pending">No hay comentarios pendientes</string>
+    <string name="comments_empty_list_filtered_approved">No hay comentarios aprobados</string>
     <string name="xmlrpc_missing_method_error">No se pudo conectar. Los métodos requeridos en el XML-RPC faltan en el servidor.</string>
-    <string name="post_format_status">Estado</string>
-    <string name="post_format_video">Video</string>
     <string name="alignment_center">Centrado</string>
-    <string name="post_format_chat">Chat</string>
-    <string name="post_format_image">Imagen</string>
-    <string name="post_format_link">Enlace</string>
+    <string name="post_format_video">Video</string>
+    <string name="post_format_status">Estado</string>
     <string name="post_format_standard">Estándar</string>
     <string name="post_format_quote">Cita</string>
+    <string name="post_format_link">Enlace</string>
+    <string name="post_format_image">Imagen</string>
     <string name="post_format_gallery">Galería</string>
+    <string name="post_format_chat">Chat</string>
     <string name="post_format_audio">Audio</string>
     <string name="post_format_aside">Minientrada</string>
     <string name="notif_events">Información sobre cursos y eventos de WordPress.com (online y presenciales).</string>
     <string name="notif_surveys">Oportunidades para participar en investigaciones y encuestas en WordPress.</string>
-    <string name="notif_tips">Consejos para sacar el máximo partido a WordPress.com</string>
+    <string name="notif_tips">Consejos para sacar el máximo partido a WordPress.com.</string>
     <string name="notif_community">Comunidad</string>
     <string name="notif_research">Investigación</string>
     <string name="notif_suggestions">Sugerencias</string>
@@ -449,13 +1912,13 @@ Language: es_CO
     <string name="username_mentions">Menciones del nombre de usuario</string>
     <string name="site_achievements">Logros del sitio</string>
     <string name="site_follows">Seguidores del sitio</string>
-    <string name="likes_on_my_posts">\"Me gusta\" en mis entradas</string>
-    <string name="likes_on_my_comments">\"Me gusta\" en mis comentarios</string>
+    <string name="likes_on_my_posts">«Me gusta» en mis entradas</string>
+    <string name="likes_on_my_comments">«Me gusta» en mis comentarios</string>
     <string name="comments_on_my_site">Comentarios en mi sitio</string>
     <string name="site_settings_list_editor_summary_other">%d elementos</string>
     <string name="site_settings_list_editor_summary_one">1 elemento</string>
-    <string name="approve_auto_if_previously_approved">Comentarios de usuarios conocidos</string>
     <string name="approve_auto">Todos los usuarios</string>
+    <string name="approve_auto_if_previously_approved">Comentarios de usuarios conocidos</string>
     <string name="approve_manual">Sin comentarios</string>
     <string name="site_settings_paging_summary_other">%d comentarios por página</string>
     <string name="site_settings_paging_summary_one">1 comentario por página</string>
@@ -467,6 +1930,7 @@ Language: es_CO
     <string name="detail_approve_manual">Se requiere aprobación manual de los comentarios de todos.</string>
     <string name="days_quantity_other">%d días</string>
     <string name="days_quantity_one">1 día</string>
+    <string name="web_address">Dirección web</string>
     <string name="primary_site">Sitio principal</string>
     <string name="pending_email_change_snackbar">Haz click en el enlace de verificación del correo electrónica enviado a %1$s para confirmar tu nueva dirección</string>
     <string name="editor_toast_uploading_please_wait">Actualmente estás subiendo archivos multimedia. Por favor, espera hasta que se complete.</string>
@@ -477,8 +1941,9 @@ Language: es_CO
     <string name="dlg_sure_to_delete_comments">¿Eliminar de forma permanente estos comentarios?</string>
     <string name="dlg_sure_to_delete_comment">¿Eliminar de forma permanente este comentario?</string>
     <string name="mnu_comment_delete_permanently">Eliminar</string>
-    <string name="comment_deleted_permanently">Comentario eliminado</string>
     <string name="mnu_comment_untrash">Restaurar</string>
+    <string name="comment_deleted_permanently">Comentario eliminado</string>
+    <string name="comments_empty_list_filtered_spam">No hay comentarios spam</string>
     <string name="comment_status_all">Todos</string>
     <string name="could_not_load_page">No se pudo cargar la página</string>
     <string name="off">Off</string>
@@ -508,36 +1973,33 @@ Language: es_CO
     <string name="error_post_remote_site_settings">No pudo guardar la información del sitio</string>
     <string name="error_fetch_remote_site_settings">No pudo recuperar la información del sitio</string>
     <string name="site_settings_close_after_dialog_switch_text">Cierra automáticamente</string>
-    <string name="site_settings_close_after_dialog_description">Cierra automáticamente los comentarios en artículos</string>
-    <string name="site_settings_paging_dialog_description">Rompe los hilos de comentarios en múltiples páginas</string>
+    <string name="site_settings_close_after_dialog_description">Cierra automáticamente los comentarios en artículos.</string>
+    <string name="site_settings_paging_dialog_description">Rompe los hilos de comentarios en múltiples páginas.</string>
     <string name="site_settings_paging_dialog_header">Comentarios por página</string>
     <string name="site_settings_close_after_dialog_title">Cerrar los comentarios</string>
-    <string name="site_settings_blacklist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, así \"press\" coincidirá con \"WordPress.\"</string>
-    <string name="site_settings_hold_for_moderation_description">Cuando un comentario contenga alguna de las estas palabras en su contenido, nombre, URL, correo electrónico o IP, será puesto en la cola para moderar. Puedes introducir palabras parciales, así \"press\" coincidirá como \"Wordpress\"</string>
+    <string name="site_settings_hold_for_moderation_description">Cuando un comentario contenga alguna de las estas palabras en su contenido, nombre, URL, correo electrónico o IP, será puesto en la cola para moderar. Puedes introducir palabras parciales, así «press» coincidirá con «Wordpress».</string>
     <string name="site_settings_list_editor_input_hint">Introduce una palabra o frase</string>
     <string name="site_settings_list_editor_no_items_text">Sin elementos</string>
-    <string name="site_settings_learn_more_caption">Puedes sobreescribir esta configuración para entradas individuales</string>
-    <string name="site_settings_rp_preview3_site">en \"Mejora\"</string>
+    <string name="site_settings_learn_more_caption">Puedes sobrescribir estos ajustes en las entradas individuales.</string>
+    <string name="site_settings_rp_preview3_site">en «Actualización»</string>
     <string name="site_settings_rp_preview3_title">Novedades: VideoPress para bodas</string>
-    <string name="site_settings_rp_preview2_site">en \"Aplicaciones\"</string>
+    <string name="site_settings_rp_preview2_site">en «Aplicaciones»</string>
     <string name="site_settings_rp_preview2_title">La aplicación WordPress para Android consigue un gran lavado de cara</string>
-    <string name="site_settings_rp_preview1_site">en \"Móvil\"</string>
+    <string name="site_settings_rp_preview1_site">en «Móvil»</string>
     <string name="site_settings_rp_preview1_title">Gran actualización disponible ahora para iPhone/iPad</string>
     <string name="site_settings_rp_show_images_title">Mostrar imágenes</string>
     <string name="site_settings_rp_show_header_title">Mostrar cabecera</string>
     <string name="site_settings_rp_switch_summary">Las entradas relacionadas muestran contenido relevante de tu sitio debajo de las entradas.</string>
     <string name="site_settings_rp_switch_title">Mostrar entradas relacionadas</string>
-    <string name="site_settings_blacklist_hint">Los comentarios que coinciden con un filtro, son marcados como spam</string>
     <string name="site_settings_moderation_hold_hint">Los comentarios que coinciden con un filtro, son puestos en la cola para moderar</string>
     <string name="site_settings_multiple_links_hint">Ignorar límite de enlaces de usuarios conocidos</string>
-    <string name="site_settings_whitelist_hint">El autor de un comentario debe tener aprobado un comentario previo</string>
     <string name="site_settings_user_account_required_hint">Los usuarios deben estar registrados e iniciar sesión para comentar</string>
     <string name="site_settings_identity_required_hint">El autor de un comentario debe rellenar el nombre y correo eléctronico</string>
     <string name="site_settings_paging_hint">Mostrar los comentarios en pedazos de un tamaño especificado</string>
     <string name="site_settings_threading_hint">Permitir comentarios anidados hasta cierto nivel</string>
     <string name="site_settings_sort_by_hint">Determina el orden de los comentarios mostrados</string>
     <string name="site_settings_close_after_hint">No permitir los comentarios después de un tiempo</string>
-    <string name="site_settings_receive_pingbacks_hint">Permitir notificaciones de enlace de otros sitios</string>
+    <string name="site_settings_receive_pingbacks_hint">Permitir avisos de enlace de otros sitios</string>
     <string name="site_settings_send_pingbacks_hint">Intenta notificar cualquier sitio enlazado desde el artículo</string>
     <string name="site_settings_allow_comments_hint">Permitir a los lectores publicar comentarios</string>
     <string name="site_settings_discussion_hint">Ver y cambiar la configuración de discusiones de tu sitio</string>
@@ -553,17 +2015,13 @@ Language: es_CO
     <string name="site_settings_address_hint">El cambio de dirección no está soportado en este momento</string>
     <string name="site_settings_tagline_hint">Una descripción corta o frase ingeniosa que describa tu blog</string>
     <string name="site_settings_title_hint">En pocas palabras, explica sobre que es este sitio</string>
-    <string name="site_settings_whitelist_known_summary">Comentarios de usuarios conocidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentarios de todos los usuarios</string>
     <string name="site_settings_threading_summary">%d niveles</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Borrar el sitio</string>
-    <string name="site_settings_blacklist_title">Lista negra</string>
     <string name="site_settings_moderation_hold_title">Mantener para moderación</string>
     <string name="site_settings_multiple_links_title">Enlaces en comentarios</string>
-    <string name="site_settings_whitelist_title">Aprobar automáticamente</string>
     <string name="site_settings_paging_title">Paginación</string>
     <string name="site_settings_threading_title">Comentarios anidados</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -575,7 +2033,7 @@ Language: es_CO
     <string name="site_settings_default_format_title">Formato por defecto</string>
     <string name="site_settings_default_category_title">Categoría por defecto</string>
     <string name="site_settings_address_title">Dirección</string>
-    <string name="site_settings_tagline_title">Lema</string>
+    <string name="site_settings_tagline_title">Descripción corta</string>
     <string name="site_settings_title_title">Título del sitio</string>
     <string name="site_settings_discussion_new_posts_header">Por defecto para nuevas entradas</string>
     <string name="site_settings_writing_header">Escribiendo</string>
@@ -620,8 +2078,15 @@ Language: es_CO
     <string name="post_published">Entrada publicada</string>
     <string name="theme_no_search_result_found">Lo sentimos, no se han encontrados temas.</string>
     <string name="reader_label_gap_marker">Cargar más entradas</string>
-    <string name="notifications_no_search_results">Ningún sitio coincide con \"%s\"</string>
+    <string name="notifications_no_search_results">Ningún sitio coincide con «%s»</string>
     <string name="search_sites">Buscar sitios</string>
+    <string name="notifications_empty_view_reader">Ir al Lector</string>
+    <string name="notifications_empty_action_followers_likes">Recibe avisos: comenta en entradas que has leído</string>
+    <string name="notifications_empty_action_comments">Unirse a una conversación: comentar en entradas de blogs que sigues</string>
+    <string name="notifications_empty_action_unread">Reinicia la conversación: escribe una entrada nueva</string>
+    <string name="notifications_empty_action_all">¡Actívate! Comenta en entradas de blogs que sigues.</string>
+    <string name="notifications_empty_comments">No hay comentarios aún</string>
+    <string name="notifications_empty_unread">¡Te has puesto al día!</string>
     <string name="reader_short_comment_count_multi">%s Comentarios</string>
     <string name="reader_short_comment_count_one">1 Comentario</string>
     <string name="reader_hint_comment_on_post">Responder a la entrada…</string>
@@ -630,29 +2095,33 @@ Language: es_CO
     <string name="reader_discover_attribution_author">Originalmente publicado por %s</string>
     <string name="reader_discover_attribution_author_and_blog">Originalmente publicado por %1$s en %2$s</string>
     <string name="reader_short_like_count_multi">%s Me gusta</string>
-    <string name="reader_short_like_count_none">Me gusta</string>
     <string name="reader_short_like_count_one">1 Me gusta</string>
+    <string name="reader_short_like_count_none">Me gusta</string>
+    <string name="reader_label_follow_count">%,d seguidores</string>
+    <string name="reader_menu_tags">Editar temas y sitios</string>
     <string name="reader_title_post_detail">Entrada del lector</string>
-    <string name="notifications_push_summary">Opciones para las notificaciones que aparecen en tu dispositivo.</string>
-    <string name="notifications_email_summary">Opciones para las notificaciones que se envían al correo electrónico ligado a tu cuenta.</string>
-    <string name="notifications_tab_summary">Opciones para las notificaciones que aparecen en la pestaña de notificaciones.</string>
-    <string name="notifications_disabled">Las notificaciones de la App han sido desativadas. Pulsa aquí para activarlas en Opciones.</string>
-    <string name="notification_types">Tipos de notificaciones</string>
+    <string name="notifications_push_summary">Ajustes para los avisos que aparecen en tu dispositivo.</string>
+    <string name="notifications_email_summary">Ajustes para los avisos que se envían al correo electrónico ligado a tu cuenta.</string>
+    <string name="notifications_tab_summary">Ajustes para las avisos que aparecen en la pestaña de avisos.</string>
+    <string name="notifications_disabled">Los avisos de la aplicación han sido desactivados. Toca aquí para activarlos en los ajustes.</string>
+    <string name="notification_types">Tipos de avisos</string>
     <string name="error_loading_notifications">No se han podido cargar los ajustes de avisos</string>
     <string name="comment_likes">Me gusta al comentario</string>
+    <string name="app_notifications">Avisos de la aplicación</string>
     <string name="email">Correo electrónico</string>
     <string name="notifications_tab">Pestaña de avisos</string>
-    <string name="app_notifications">Avisos de la aplicación</string>
     <string name="notification_settings_item_other_account_emails_summary">Siempre mandamos correos electrónicos importantes relativos a tu cuenta, pero también obtendrás extras útiles.</string>
     <string name="stats_insights_latest_post_summary">Sumario de la última entrada</string>
     <string name="connectionbar_no_connection">Sin conexión</string>
-    <string name="button_publish">Publicar</string>
-    <string name="button_edit">Editar</string>
-    <string name="button_view">Ver</string>
-    <string name="button_preview">Vista previa</string>
+    <string name="post_trashed">Entrada enviada a la papelera</string>
     <string name="button_trash">Papelera</string>
     <string name="button_stats">Estadísticas</string>
-    <string name="post_trashed">Entrada enviada a la papelera</string>
+    <string name="button_preview">Vista previa</string>
+    <string name="button_view">Ver</string>
+    <string name="button_publish">Publicar</string>
+    <string name="button_edit">Editar</string>
+    <string name="reader_toast_err_follow_blog_not_authorized">No tienes autorización para acceder a este sitio</string>
+    <string name="reader_toast_err_follow_blog_not_found">No se pudo encontrar este sitio</string>
     <string name="undo">Deshacer</string>
     <string name="push_auth_expired">La solicitud ha expirado. Accede a WordPress.com para volver a intentarlo.</string>
     <string name="ignore">Ignorar</string>
@@ -661,99 +2130,113 @@ Language: es_CO
     <string name="stats_insights_all_time">Entradas, vistas y visitantes de todos los tiempos</string>
     <string name="stats_insights">Detalles</string>
     <string name="me_disconnect_from_wordpress_com">Salir de WordPress.com</string>
-    <string name="me_btn_login_logout">Iniciar/Cerrar sesión</string>
     <string name="me_connect_to_wordpress_com">Acceder a WordPress.com</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" no se ocultó porque es el sitio actual</string>
+    <string name="me_btn_login_logout">Iniciar/Cerrar sesión</string>
     <string name="me_btn_support">Ayuda y soporte</string>
     <string name="account_settings">Configuración de la cuenta</string>
-    <string name="site_picker_edit_visibility">Mostrar/Ocultar sitios</string>
+    <string name="site_picker_cant_hide_current_site">«%s» no se ha ocultado porque es el sitio actual</string>
+    <string name="site_picker_create_wpcom">Crear sitio en WordPress.com</string>
     <string name="site_picker_add_self_hosted">Añadir sitio autoalojado</string>
-    <string name="my_site_btn_switch_site">Cambiar sitio</string>
+    <string name="site_picker_add_site">Añadir sitio nuevo</string>
+    <string name="site_picker_edit_visibility">Mostrar/Ocultar sitios</string>
     <string name="site_picker_title">Elegir sitio</string>
     <string name="my_site_btn_view_site">Ver sitio</string>
     <string name="my_site_btn_view_admin">Ver Administrador</string>
-    <string name="my_site_header_publish">Publicar</string>
-    <string name="my_site_header_look_and_feel">Aspecto</string>
+    <string name="my_site_btn_switch_site">Cambiar sitio</string>
     <string name="my_site_btn_site_settings">Ajustes</string>
     <string name="my_site_btn_blog_posts">Entradas del blog</string>
-    <string name="reader_label_new_posts_subtitle">Toca para mostrarlos</string>
+    <string name="my_site_header_publish">Publicar</string>
+    <string name="my_site_header_look_and_feel">Aspecto</string>
     <string name="my_site_header_configuration">Configuración</string>
+    <string name="reader_label_new_posts_subtitle">Toca para mostrarlos</string>
+    <string name="deselect_all">Anular todas las selecciones</string>
     <string name="select_all">Seleccionar todo</string>
     <string name="hide">Ocultar</string>
     <string name="show">Mostrar</string>
-    <string name="deselect_all">Anular todas las selecciones</string>
-    <string name="language">Idioma</string>
-    <string name="verification_code">Código de verificación</string>
     <string name="auth_required">Accede de nuevo para continuar.</string>
     <string name="invalid_verification_code">Código de verificación no válido</string>
+    <string name="verification_code">Código de verificación</string>
+    <string name="language">Idioma</string>
+    <string name="reader_empty_posts_request_failed">No se pudieron recuperar las entradas</string>
+    <string name="publisher">Autor:</string>
+    <string name="error_notification_open">No se pudo abrir la notificación</string>
     <string name="stats_search_terms_unknown_search_terms">Términos de búsqueda desconocidos</string>
-    <string name="media_fetching">Recuperando medios…</string>
-    <string name="posts_fetching">Recuperando entradas…</string>
-    <string name="pages_fetching">Recuperando páginas…</string>
-    <string name="comments_fetching">Recuperando comentarios…</string>
     <string name="stats_view_search_terms">Términos de búsqueda</string>
     <string name="stats_view_authors">Autores</string>
-    <string name="error_notification_open">No se pudo abrir la notificación</string>
-    <string name="publisher">Autor:</string>
-    <string name="reader_empty_posts_request_failed">No se pudieron recuperar las entradas</string>
-    <string name="reader_page_recommended_blogs">Sitios que te podrían gustar</string>
-    <string name="error_copy_to_clipboard">Ocurrió un error al copiar el texto en el portapapeles</string>
-    <string name="reader_label_new_posts">Nuevas entradas</string>
+    <string name="comments_fetching">Recuperando comentarios…</string>
+    <string name="pages_fetching">Recuperando páginas…</string>
+    <string name="posts_fetching">Recuperando entradas…</string>
+    <string name="media_fetching">Recuperando medios…</string>
     <string name="logs_copied_to_clipboard">Los informes de la aplicación se han copiado al portapapeles</string>
+    <string name="reader_empty_posts_in_blog">Este sitio está vacío</string>
+    <string name="reader_label_new_posts">Nuevas entradas</string>
+    <string name="error_copy_to_clipboard">Ocurrió un error al copiar el texto en el portapapeles</string>
     <string name="post_uploading">Subiendo entrada</string>
-    <string name="stats_visitors">Visitantes</string>
-    <string name="stats_views">Vistas</string>
-    <string name="stats_timeframe_years">Años</string>
-    <string name="stats_likes">Me gusta</string>
-    <string name="stats_view_countries">Países</string>
-    <string name="stats_view_followers">Seguidores</string>
-    <string name="stats_view_publicize">Difundir</string>
-    <string name="stats_view_videos">Vídeos</string>
-    <string name="stats_view_top_posts_and_pages">Entradas y páginas</string>
-    <string name="stats_followers_seconds_ago">hace unos segundos</string>
-    <string name="stats_followers_a_minute_ago">hace un minuto</string>
+    <string name="stats_followers_years">%1$d años</string>
+    <string name="stats_followers_a_year">Un año</string>
+    <string name="stats_followers_months">%1$d meses</string>
+    <string name="stats_followers_a_month">Un mes</string>
     <string name="stats_followers_days">%1$d días</string>
     <string name="stats_followers_a_day">Un día</string>
     <string name="stats_followers_hours">%1$d horas</string>
     <string name="stats_followers_an_hour_ago">hace una hora</string>
     <string name="stats_followers_minutes">%1$d minutos</string>
-    <string name="stats_followers_a_month">Un mes</string>
-    <string name="stats_followers_years">%1$d años</string>
-    <string name="stats_followers_a_year">Un año</string>
-    <string name="stats_followers_months">%1$d meses</string>
+    <string name="stats_followers_a_minute_ago">hace un minuto</string>
+    <string name="stats_followers_seconds_ago">hace unos segundos</string>
+    <string name="stats_view_followers">Seguidores</string>
+    <string name="stats_view_publicize">Difundir</string>
+    <string name="stats_view_videos">Videos</string>
+    <string name="stats_view_top_posts_and_pages">Entradas y páginas</string>
+    <string name="stats_view_countries">Países</string>
+    <string name="stats_likes">Me gusta</string>
+    <string name="stats_visitors">Visitantes</string>
+    <string name="stats_views">Vistas</string>
+    <string name="stats_timeframe_years">Años</string>
     <string name="themes_fetching">Obteniendo temas…</string>
     <string name="ssl_certificate_details">Detalles</string>
     <string name="cab_selected">%d seleccionados</string>
-    <string name="signing_out">Cerrando sesión…</string>
-    <string name="comment_reply_to_user">Responder a %s</string>
-    <string name="posts_empty_list">Aún no se han publicado entradas. ¿Por qué no crear una?</string>
-    <string name="comment_trashed">El comentario se ha enviado a la papelera.</string>
-    <string name="comment">Comentario</string>
-    <string name="mnu_comment_liked">Me gustó</string>
-    <string name="older_last_week">Hace más de 1 semana</string>
-    <string name="older_two_days">Hace más de 2 días</string>
-    <string name="more">Más</string>
-    <string name="older_month">Hace más de 1 mes</string>
-    <string name="error_refresh_unauthorized_comments">No tienes permiso para ver o editar comentarios.</string>
-    <string name="error_refresh_unauthorized_pages">No tienes permiso para ver o editar páginas.</string>
-    <string name="error_refresh_unauthorized_posts">No tienes permiso para ver o editar entradas.</string>
-    <string name="error_publish_empty_post">No se puede publicar una entrada vacía.</string>
-    <string name="reader_title_photo_viewer">%1$d de %2$d</string>
-    <string name="reader_label_comments_closed">Los comentarios están cerrados</string>
+    <string name="browse_our_faq_button">Explora nuestras Preguntas frecuentes</string>
+    <string name="reader_empty_comments">Aún no hay comentarios</string>
+    <string name="reader_empty_posts_in_tag">No hay entradas con esta temática</string>
     <string name="reader_label_like">Me gusta</string>
     <string name="reader_label_view_original">Ver artículo original</string>
-    <string name="reader_empty_comments">Aún no hay comentarios</string>
-    <string name="browse_our_faq_button">Explora nuestras Preguntas frecuentes.</string>
-    <string name="reader_toast_err_generic">No es posible realizar esta acción</string>
+    <string name="reader_label_comments_closed">Los comentarios están cerrados</string>
+    <string name="reader_title_photo_viewer">%1$d de %2$d</string>
+    <string name="error_publish_empty_post">No se puede publicar una entrada vacía</string>
+    <string name="error_refresh_unauthorized_posts">No tienes permisos para ver o editar entradas</string>
+    <string name="error_refresh_unauthorized_pages">No tienes permisos para ver o editar páginas</string>
+    <string name="error_refresh_unauthorized_comments">No tienes permisos para ver o editar comentarios</string>
+    <string name="more">Más</string>
+    <string name="older_month">Hace más de 1 mes</string>
+    <string name="older_last_week">Hace más de 1 semana</string>
+    <string name="older_two_days">Hace más de 2 días</string>
+    <string name="mnu_comment_liked">Me gustó</string>
+    <string name="comment">Comentario</string>
+    <string name="comment_trashed">El comentario se ha enviado a la papelera</string>
+    <string name="comment_reply_to_user">Responder a %s</string>
+    <string name="posts_empty_list">Aún no se han publicado entradas. ¿Por qué no crear una?</string>
+    <string name="signing_out">Cerrando sesión…</string>
+    <string name="reader_toast_err_generic">No ha sido posible realizar esta acción</string>
+    <string name="reader_toast_err_block_blog">No es posible bloquear este sitio</string>
+    <string name="reader_toast_blog_blocked">Las entradas de este sitio no volverán a mostrarse</string>
+    <string name="reader_menu_block_blog">Bloquear este sitio</string>
     <string name="schedule_verb">Programación</string>
     <string name="update_verb">Actualizar</string>
+    <string name="reader_empty_recommended_blogs">Sin sitios recomendados</string>
+    <string name="reader_toast_err_unfollow_blog">No se puede dejar de seguir este sitio</string>
+    <string name="reader_toast_err_follow_blog">No se puede seguir este sitio</string>
+    <string name="reader_toast_err_already_follow_blog">Ya estás siguiendo este sitio</string>
+    <string name="reader_toast_err_get_blog_info">No se puede mostrar este sitio</string>
+    <string name="reader_label_followed_blog">Sitio seguido</string>
+    <string name="reader_hint_add_tag_or_url">Introduce una URL o tema para seguir</string>
     <string name="reader_page_followed_blogs">Sitios que sigues</string>
-    <string name="ssl_certificate_ask_trust">SI normalmente se conecta sin problemas a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
+    <string name="reader_page_followed_tags">Temas seguidos</string>
+    <string name="reader_title_blog_preview">Sitio del lector</string>
+    <string name="ssl_certificate_ask_trust">Si normalmente se conecta a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
     <string name="ssl_certificate_error">Certificado SSL no válido</string>
-    <string name="forgot_password">¿Has olvidado la contraseña?</string>
     <string name="help">Ayuda</string>
-    <string name="username_or_password_incorrect">El usuario o contraseña que ingresaste no son correctos.</string>
-    <string name="email_invalid">Ingresa una dirección de correo electrónico válida</string>
+    <string name="username_or_password_incorrect">El nombre de usuario o contraseña que has introducido son incorrectos</string>
+    <string name="email_invalid">Introduce una dirección de correo electrónico válida</string>
     <string name="invalid_email_message">Tu dirección de correo electrónico no es válida</string>
     <string name="error_downloading_image">Error al descargar la imagen</string>
     <string name="error_load_comment">No se pudo cargar el comentario</string>
@@ -761,21 +2244,23 @@ Language: es_CO
     <string name="error_moderate_comment">Ocurrió un error al moderar el comentario</string>
     <string name="error_generic">Ocurrió un error</string>
     <string name="error_refresh_comments">No se pudieron actualizar los comentarios</string>
-    <string name="error_refresh_pages">Las páginas no pueden ser actualizadas en este momento.</string>
+    <string name="error_refresh_pages">Las páginas no se pudieron actualizar en este momento</string>
     <string name="error_refresh_posts">Las entradas no pueden ser actualizadas en este momento</string>
     <string name="error_deleting_post">Ocurrió un error al eliminar la entrada</string>
-    <string name="notifications_empty_list">Sin notificaciones</string>
+    <string name="notifications_empty_list">Sin avisos</string>
     <string name="sdcard_message">Se necesita una tarjeta SD montada para subir medios</string>
-    <string name="cat_name_required">El campo nombre de categoría es necesario</string>
-    <string name="adding_cat_success">Categoría agregada correctamente.</string>
+    <string name="cat_name_required">El campo nombre de categoría es obligatorio</string>
+    <string name="adding_cat_success">La categoría se ha añadido correctamente</string>
     <string name="adding_cat_failed">No se pudo añadir la categoría</string>
     <string name="mnu_comment_unspam">No es spam</string>
-    <string name="theme_fetch_failed">Ocurrió un error al obtener los temas.</string>
+    <string name="theme_fetch_failed">Ha ocurrido un error al obtener los temas</string>
     <string name="blog_not_found">Ha ocurrido un error mientras se accedía a este blog</string>
-    <string name="gallery_error">El elemento multimedia no ha podido ser recuperado</string>
-    <string name="no_network_message">No hay ninguna conexión de red disponible</string>
+    <string name="gallery_error">El elemento multimedia no se ha podido recuperar</string>
+    <string name="no_network_message">No hay conexiones de red disponible</string>
+    <string name="reader_toast_err_remove_tag">No se ha podido eliminar este tema</string>
+    <string name="reader_toast_err_add_tag">No se ha podido añadir este tema</string>
     <string name="reader_title_applog">Registro de la aplicación</string>
-    <string name="fatal_db_error">Hubo un error al crear la base de datos de la app. Por favor, intenta reinstalar la app. </string>
+    <string name="fatal_db_error">Ha ocurrido un error al crear la base de datos de la aplicación. Por favor, intenta reinstalar la aplicación.</string>
     <string name="error_blog_hidden">Este blog está oculto y no se puede cargar. Actívalo de nuevo en ajustes y prueba de nuevo.</string>
     <string name="error_refresh_media">No se pueden actualizar los medios en este momento</string>
     <string name="wordpress_blog">Blog de WordPress</string>
@@ -784,17 +2269,17 @@ Language: es_CO
     <string name="privacy_policy">Política de privacidad</string>
     <string name="new_media">Nuevo elemento multimedia</string>
     <string name="new_post">Nueva entrada</string>
-    <string name="notifications_empty_all">No hay notificaciones… todavía.</string>
+    <string name="notifications_empty_all">No hay avisos… aún.</string>
     <string name="http_authorization_required">Se necesita autorización</string>
     <string name="invalid_site_url_message">Comprueba que la URL del sitio introducida es válida</string>
-    <string name="open_source_licenses">Licencias Open source</string>
+    <string name="open_source_licenses">Licencias de código abierto</string>
     <string name="file_error_create">No se pudo crear un archivo temporal para subir el archivo multimedia. Asegúrate que haya suficiente espacio libre en tu dispositivo.</string>
     <string name="category_name">Nombre de la categoría</string>
     <string name="add_new_category">Añadir nueva categoría</string>
     <string name="view_in_browser">Ver en el navegador</string>
     <string name="remove_account">Eliminar sitio</string>
     <string name="toast_comment_unedited">El comentario no ha cambiado</string>
-    <string name="content_required">Comentario obligatorio</string>
+    <string name="content_required">El comentario es obligatorio</string>
     <string name="sure_to_cancel_edit_comment">¿Cancelar la edición de este comentario?</string>
     <string name="saving_changes">Guardando cambios</string>
     <string name="trash">Papelera</string>
@@ -812,114 +2297,126 @@ Language: es_CO
     <string name="comment_status_spam">Spam</string>
     <string name="comment_status_unapproved">Pendiente</string>
     <string name="comment_status_approved">Aprobado</string>
-    <string name="post_settings">Ajustes de entrada</string>
+    <string name="delete_page">¿Borrar página?</string>
+    <string name="delete_post">¿Borrar entrada?</string>
+    <string name="post_settings">Ajustes de la entrada</string>
+    <string name="file_not_found">No ha sido posible encontrar el archivo a cargar. ¿Se ha borrado o cambiado de ubicación?</string>
     <string name="local_draft">Borrador local</string>
     <string name="page_settings">Ajustes de página</string>
     <string name="link_enter_url_text">Texto del enlace (opcional)</string>
-    <string name="cannot_delete_multi_media_items">Algunos elementos multimedia no pudieron ser borrados. Prueba más tarde</string>
+    <string name="cannot_delete_multi_media_items">Algunos elementos multimedia no se pudieron borrar en este momento. Intenta de nuevo más tarde.</string>
     <string name="media_error_no_permission">No tienes permiso para ver la librería multimedia</string>
-    <string name="media_gallery_type_thumbnail_grid">Malla (red) de miniaturas</string>
+    <string name="media_gallery_type_thumbnail_grid">Cuadrícula de miniaturas</string>
     <string name="learn_more">Aprender más</string>
     <string name="post_not_found">Ocurrió un error al cargar la entrada. Actualiza tus entradas e intenta nuevamente.</string>
+    <string name="plugin_not_found">Ocurrió un error al acceder a este plugin</string>
     <string name="cancel_edit">Cancelar edición</string>
     <string name="connection_error">Error de conexión</string>
     <string name="select_categories">Seleccionar categorías</string>
     <string name="share_link">Compartir enlace</string>
     <string name="reader_empty_posts_in_tag_updating">Recuperando entradas…</string>
+    <string name="reader_likes_you_and_multi">A ti, y a %,d personas más les gusta esto</string>
     <string name="reader_likes_multi">A %,d personas les gusta esto</string>
     <string name="reader_label_reply">Responder</string>
     <string name="cant_share_no_visible_blog">No se puede compartir en WordPress si no tienes un blog visible</string>
     <string name="comment_spammed">Comentado marcado como spam</string>
-    <string name="reader_likes_you_and_multi">A ti, y a %,d personas más les gusta esto</string>
     <string name="reader_toast_err_get_post">No fue posible recuperar esta entrada</string>
+    <string name="reader_likes_you_and_one">A ti y a otra persona les gusta esto</string>
     <string name="pick_video">Elige un vídeo</string>
     <string name="pick_photo">Elige una foto</string>
-    <string name="reader_likes_you_and_one">A ti y a otra persona os gusta esto.</string>
-    <string name="reader_label_removed_tag">Eliminado %s</string>
-    <string name="reader_likes_one">A una persona le gusta esto</string>
-    <string name="reader_btn_share">Compartir</string>
-    <string name="reader_btn_follow">Seguir</string>
-    <string name="reader_btn_unfollow">Siguiendo</string>
-    <string name="reader_likes_only_you">Te gusta esto</string>
+    <string name="sign_up_label">Registro</string>
     <string name="reader_toast_err_url_intent">Imposible abrir %s</string>
     <string name="reader_toast_err_view_image">Imposible ver la imágen</string>
     <string name="reader_toast_err_share_intent">Imposible compartir</string>
-    <string name="reader_toast_err_comment_failed">No se pudo publicar tu comentario </string>
+    <string name="reader_toast_err_tag_invalid">Este no es un tema válido</string>
+    <string name="reader_toast_err_tag_exists">Ya estás siguiendo este tema</string>
+    <string name="reader_toast_err_comment_failed">No se pudo publicar tu comentario</string>
+    <string name="reader_likes_only_you">Te gusta esto</string>
+    <string name="reader_likes_one">A una persona le gusta esto</string>
+    <string name="reader_label_removed_tag">Eliminado %s</string>
     <string name="reader_label_added_tag">Añadido %s</string>
-    <string name="reader_hint_comment_on_comment">Contestar al comentario </string>
+    <string name="reader_hint_comment_on_comment">Responder al comentario…</string>
+    <string name="reader_btn_unfollow">Siguiendo</string>
+    <string name="reader_btn_follow">Seguir</string>
+    <string name="reader_btn_share">Compartir</string>
+    <string name="reader_view_reblog">Reblog</string>
     <string name="reader_untitled_post">Sin título</string>
+    <string name="comments_empty_list">No hay comentarios aún</string>
     <string name="empty_list_default">Esta lista esta vacía</string>
-    <string name="stats_timeframe_days">Días</string>
-    <string name="stats_timeframe_weeks">Semanas</string>
     <string name="stats_timeframe_months">Meses</string>
-    <string name="theme_activate_button">Activar</string>
-    <string name="share_action">Compartir</string>
-    <string name="stats">Estadísticas</string>
-    <string name="stats_view_clicks">Clics</string>
-    <string name="stats_timeframe_today">Hoy</string>
+    <string name="stats_timeframe_weeks">Semanas</string>
+    <string name="stats_timeframe_days">Días</string>
     <string name="stats_timeframe_yesterday">Ayer</string>
-    <string name="media_gallery_type_circles">Círculos</string>
-    <string name="media_edit_title_text">Título</string>
-    <string name="media_edit_description_text">Descripción</string>
-    <string name="media_gallery_type_squares">Cuadrados</string>
+    <string name="stats_timeframe_today">Hoy</string>
     <string name="stats_view_referrers">Referentes</string>
     <string name="stats_view_tags_and_categories">Etiquetas y categorías</string>
+    <string name="stats_view_clicks">Clics</string>
+    <string name="stats">Estadísticas</string>
+    <string name="share_action">Compartir</string>
+    <string name="theme_activate_button">Activar</string>
     <string name="media_edit_failure">No se pudo actualizar</string>
+    <string name="media_edit_description_text">Descripción</string>
     <string name="media_edit_caption_text">Leyenda</string>
-    <string name="media_gallery_type_slideshow">Pase de diapositivas </string>
+    <string name="media_edit_title_text">Título</string>
+    <string name="media_gallery_type_slideshow">Presentación de diapositivas</string>
+    <string name="media_gallery_type_circles">Círculos</string>
     <string name="media_gallery_type_tiled">Mosaico</string>
+    <string name="media_gallery_type_squares">Cuadrados</string>
     <string name="themes">Temas</string>
     <string name="discard">Descartar</string>
     <string name="manage">Gestionar</string>
-    <string name="note_reply_successful">Respuesta publicada</string>
-    <string name="new_notifications">%d nuevas notificaciones</string>
     <string name="more_notifications">y %d más.</string>
+    <string name="new_notifications">%d nuevos avisos</string>
     <string name="follows">Seguimientos</string>
+    <string name="note_reply_successful">Respuesta publicada</string>
     <string name="sign_in">Acceder</string>
     <string name="loading">Cargando…</string>
     <string name="httppassword">Contraseña HTTP</string>
     <string name="httpuser">Usuario HTTP</string>
     <string name="error_media_upload">Se ha producido un error al cargar los archivos</string>
-    <string name="incorrect_credentials">Nombre de usuario o contraseña incorrecta</string>
-    <string name="password">Contraseña</string>
-    <string name="username">Nombre de usuario</string>
+    <string name="incorrect_credentials">Nombre de usuario o contraseña incorrecta.</string>
     <string name="log_in">Acceder</string>
+    <string name="username">Nombre de usuario</string>
+    <string name="password">Contraseña</string>
     <string name="reader">Lector</string>
-    <string name="anonymous">Anónimo</string>
     <string name="pages">Páginas</string>
     <string name="posts">Entradas</string>
+    <string name="anonymous">Anónimo</string>
     <string name="no_network_title">No hay red disponible</string>
+    <string name="done">hecho</string>
     <string name="ok">OK</string>
     <string name="link_enter_url">URL</string>
+    <string name="tos">Términos del servicio</string>
     <string name="version">Versión</string>
     <string name="app_title">WordPress para Android</string>
-    <string name="tos">Términos del servicio</string>
-    <string name="image_alignment">Alineamiento</string>
+    <string name="image_alignment">Alineación</string>
     <string name="refresh">Refrescar</string>
-    <string name="untitled">Sin Título</string>
+    <string name="untitled">Sin título</string>
     <string name="edit">Editar</string>
     <string name="immediately">Inmediatamente</string>
-    <string name="quickpress_add_alert_title">Nombre del Acceso Directo</string>
+    <string name="quickpress_add_alert_title">Establecer nombre del atajo</string>
     <string name="settings">Ajustes</string>
-    <string name="quickpress_add_error">El nombre del acceso directo no puede ser vacío.</string>
+    <string name="quickpress_add_error">El nombre del atajo no puede estar vacío</string>
+    <string name="pages_private">Privado</string>
     <string name="title">Título</string>
-    <string name="categories">Categorías</string>
     <string name="tags_separate_with_commas">Separa las etiquetas con comas</string>
+    <string name="categories">Categorías</string>
     <string name="dlg_deleting_comments">Eliminando comentarios</string>
-    <string name="sdcard_title">Requiere tarjeta SD</string>
+    <string name="sdcard_title">Requiere una tarjeta SD</string>
     <string name="media">Multimedia</string>
     <string name="approve">Aprobar</string>
     <string name="delete">Eliminar</string>
     <string name="none">Ninguno</string>
-    <string name="error">Error</string>
-    <string name="cancel">Cancelar</string>
-    <string name="no">No</string>
-    <string name="save">Guardar</string>
-    <string name="preview">Vista previa</string>
+    <string name="publish_now">Publicar ahora</string>
     <string name="reply">Responder</string>
     <string name="on">en</string>
+    <string name="preview">Vista previa</string>
+    <string name="category_refresh_error">Error de actualización de categorías</string>
+    <string name="error">Error</string>
+    <string name="no">No</string>
     <string name="yes">Sí</string>
     <string name="notification_settings">Ajustes de avisos</string>
-    <string name="category_refresh_error">Error de actualización de categorías</string>
     <string name="add">Añadir</string>
+    <string name="save">Guardar</string>
+    <string name="cancel">Cancelar</string>
 </resources>
diff --git a/WordPress/src/main/res/values-es-rMX/strings.xml b/WordPress/src/main/res/values-es-rMX/strings.xml
index db5f4328e364..a34d36b37fd5 100644
--- a/WordPress/src/main/res/values-es-rMX/strings.xml
+++ b/WordPress/src/main/res/values-es-rMX/strings.xml
@@ -1,11 +1,161 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 13:39:30+0000
+Translation-Revision-Date: 2021-05-19 13:13:18+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: es_MX
 -->
 <resources>
+    <string name="gutenberg_native_audio_settings">Ajustes de audio</string>
+    <string name="gutenberg_native_image_settings">Ajustes de imagen</string>
+    <string name="gutenberg_native_move_image_backward">Mover la imagen hacia atrás</string>
+    <string name="gutenberg_native_move_image_forward">Mover la imagen hacia delante</string>
+    <string name="gutenberg_native_size">Tamaño</string>
+    <string name="user_profile_bottom_sheet_description">Información de hoja inferior del perfil de usuario</string>
+    <string name="user_profile_site_section_header">Sitio</string>
+    <string name="user_profile_untitled_site">(Sin título)</string>
+    <string name="likes_list_screen_title">Lista de Me gusta %s</string>
+    <string name="gutenberg_native_write_code">Escribe código…</string>
+    <string name="reader_title_interests">Seguir temáticas</string>
+    <string name="stories_intro_main_subtitle">Una nueva forma de crear y publicar contenido en tu sitio.</string>
+    <string name="activity_log_backup_download_notice_download_action">Descargar</string>
+    <string name="threat_fix_all_status_success_message_plural">Las amenazas se solucionaron con éxito.</string>
+    <string name="gutenberg_native_edit_focal_point">Editar punto focal</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Toca dos veces para abrir la hoja inferior y editar, reemplazar o borrar la imagen</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Toca dos veces para abrir la hoja de acción y editar, reemplazar o borrar la imagen</string>
+    <string name="new_site_creation_search_domain_input_hint">Introduce un nombre para tu sitio</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Todas las tareas completadas&lt;/b&gt;&lt;br/&gt; Llegará a más personas. ¡Buen trabajo! </string>
+    <string name="backup_download_complete_info">También te hemos enviado por correo electrónico un enlace a tu archivo.</string>
+    <string name="jetpack_icon_content_description">icono</string>
+    <string name="label_control_upload">Subir</string>
+    <string name="backup_download_complete_header">Tu copia de seguridad ya está disponible para descargar</string>
+    <string name="backup_download_complete_description_with_two_parameters">Hemos creado con éxito una copia de seguridad de tu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_complete_download_action_button">Descargar</string>
+    <string name="backup_download_complete_download_share_action_button">Compartir enlace</string>
+    <string name="backup_download_progress_header">Actualmente creando una copia de seguridad descargable de tu sitio</string>
+    <string name="backup_download_progress_description_with_two_parameters">Estamos creando una copia de seguridad descargable de tu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_progress_icon_content_description">Creando un icono de copia de seguridad descargable</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_complete_page_title">Tu copia de seguridad</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s es el punto seleccionado para crear una copia de seguridad descargable.</string>
+    <string name="backup_download_details_action_button_content_description">Crear un botón de copia de seguridad descargable</string>
+    <string name="backup_download_generic_failure">Ha habido un problema al gestionar la solicitud. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="backup_download_another_download_running">Se está ejecutando otra descarga.</string>
+    <string name="backup_download_progress_page_title">Descargar copia de seguridad</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan eliminará el archivo o directorio afectado.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan actualizará a una versión más reciente (%s).</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan editará el archivo o directorio afectado.</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan resolverá la amenaza.</string>
+    <string name="threat_fix">Arreglar la amenaza</string>
+    <string name="threat_ignore">Ignorar la amenaza</string>
+    <string name="threat_get_free_estimate">Obtén un presupuesto gratuito</string>
+    <string name="suggestion_user">usuario</string>
+    <string name="backup_item_media_uploads">Subidas de medios</string>
+    <string name="backup_item_plugins">Plugins de WordPress</string>
+    <string name="backup_item_themes">Temas de WordPress</string>
+    <string name="backup_download_details_icon_content_description">Crea un ícono de copia de seguridad descargable</string>
+    <string name="backup_download_details_action_button">Crear un archivo descargable</string>
+    <string name="backup_download_details_header">Crear una copia de seguridad descargable</string>
+    <string name="backup_download_details_page_title">Descargar copia de seguridad</string>
+    <string name="backup_download">Descarga de la copia de seguridad</string>
+    <string name="gutenberg_native_error">Error</string>
+    <string name="gutenberg_native_choose_file">Elegir archivo</string>
+    <string name="activity_log_item_menu_download_backup_label">Descargar copia de seguridad</string>
+    <string name="activity_log_item_menu_restore_label">Restaurar hasta este punto</string>
+    <string name="activity_log_activity_type_filter_header">Filtrar por tipo de actividad</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiar la versión de esta aplicación</string>
+    <string name="dialog_confirm_copy_local_edit_button">Editar la entrada primero</string>
+    <string name="dialog_confirm_copy_local_message">La entrada que estás tratando de copiar tiene dos versiones que están en conflicto o has hecho cambios recientemente, pero no los has guardado.\nEdita la entrada primero para resolver cualquier conflicto o procede a copiar la versión de esta aplicación.</string>
+    <string name="dialog_confirm_copy_local_title">Conflicto de sincronización de la entrada</string>
+    <string name="button_copy">Duplicar</string>
+    <string name="toast_edit_story_update_in_progress_title">La historia está siendo guardada, por favor, espera…</string>
+    <string name="gutenberg_native_choose_a_file">ELEGIR UN ARCHIVO</string>
+    <string name="gutenberg_native_copy_file_url">Copiar la URL del archivo </string>
+    <string name="gutenberg_native_edit_file">Editar el archivo</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Fallo al guardar los medios.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Fallo al subir los archivos.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_file_block_settings">Ajustes del archivo del bloque</string>
+    <string name="gutenberg_native_file_name">Nombre del archivo</string>
+    <string name="reader_follow_comments_unsubscribe_success">Cancelada correctamente la suscripción a los comentarios</string>
+    <string name="reader_follow_comments_get_status_error">Error al recuperar el estado de suscripción para la entrada</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">No se ha podido crear la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">No se ha podido anular la suscripción a los comentarios de esta entrada</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="new_site_creation_domain_header_title">Elige un dominio</string>
+    <string name="activity_log_activity_type_filter_apply">Aplicar </string>
+    <string name="activity_log_activity_type_filter_clear">Vaciar</string>
+    <string name="reader_follow_comments_null_response">No se ha recibido ninguna respuesta</string>
+    <string name="reader_follow_comments_bad_format_response">Respuesta recibida no válida</string>
+    <string name="reader_follow_comments_subscribe_success">Suscrito correctamente a los comentarios</string>
+    <string name="dialog_edit_story_unsupported_format_message">Una o más diapositivas no se han añadido a tu historia porque en este momento las historias no son compatibles con archivos GIF. Por favor, elige una imagen estática o un video de fondo en su lugar.</string>
+    <string name="dialog_edit_story_limited_message">Esta historia se ha editado en un dispositivo diferente y la posibilidad de editar ciertos objetos puede estar limitada.</string>
+    <string name="dialog_edit_story_unavailable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_unavailable_message">No ha sido posible subir medios a esta historia. Comprueba tu conexión a Internet e inténtalo de nuevo dentro de un momento.</string>
+    <string name="dialog_edit_story_unrecoverable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_unrecoverable_message">No hemos podido encontrar en el sitio los medios para esta historia.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Los archivos GIF no son compatibles</string>
+    <string name="dialog_edit_story_limited_title">Edición limitada de la historia</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Los medios han sido eliminados. Intenta volver a crear tu historia.</string>
+    <string name="hpp_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="hpp_error_subtitle">Toca en reintentar cuando vuelvas a estar conectado.</string>
+    <string name="hpp_retry_error">Por favor, revisa tu conexión a Internet e inténtalo de nuevo.</string>
+    <string name="hpp_choose_error">Ha habido un error al seleccionar el diseño.</string>
+    <string name="delete_button_alt">Borrar</string>
+    <string name="label_next_button">Siguiente</string>
+    <string name="label_done_button">Hecho</string>
+    <string name="dialog_discard_story_title_edit">¿Descartar los cambios?</string>
+    <string name="dialog_discard_story_message_edit">Cualquier cambio realizado no se guardará.</string>
+    <string name="dialog_discard_story_ok_button_edit">Descartar</string>
+    <string name="color_picker_label_text">Texto</string>
+    <string name="color_picker_label_background">Fondo</string>
+    <string name="scan">Explorar</string>
+    <string name="reader_discover_empty_title">¡Bienvenido!</string>
+    <string name="reader_discover_no_posts_title">No hay entradas recientes</string>
+    <string name="reader_discover_no_posts_subtitle">Intenta seguir más temáticas para ampliar la búsqueda</string>
+    <string name="reader_discover_no_posts_button_text">Seguir temáticas</string>
+    <string name="login_find_your_connected_email">Encuentra tu correo electrónico conectado</string>
+    <string name="continue_site_credentials">Continuar con las credenciales de la tienda</string>
+    <string name="login_prologue_third_subtitle_one">A &lt;b&gt;Madison Ruíz&lt;/b&gt; le ha gustado tu entrada</string>
+    <string name="login_prologue_third_subtitle_two">Hoy has recibido &lt;b&gt;50 me gusta&lt;/b&gt; en tu sitio</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Juan Gómez&lt;/b&gt; ha respondido en tu entrada</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Se ha abierto el menú de bloques desplazable. Selecciona un bloque.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Se ha cerrado el menú de bloques desplazable.</string>
+    <string name="hpp_skip_button">Omitir</string>
+    <string name="hpp_choose_button">Elegir</string>
+    <string name="hpp_subtitle">Elige tu layout favorito de página de inicio. Puedes editarlo y personalizarlo más tarde.</string>
+    <string name="hpp_title">Elige un diseño</string>
+    <string name="mlp_error_title">Los layouts no están disponibles debido a un error</string>
+    <string name="prepublishing_nudges_add_category_button">Añadir categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Añadir una nueva categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorías</string>
+    <string name="prepublishing_nudges_home_categories_not_set">No establecido</string>
+    <string name="prepublishing_nudges_categories_action">Categorías</string>
+    <string name="mlp_network_error_subtitle">Toca \"Reintentar\" cuando vuelvas a estar en línea o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_error_subtitle">Toca \"Reintentar\" o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_network_error_title">Los layouts no están disponibles offline</string>
+    <string name="login_prologue_fifth_caption_three">Museos en Londres</string>
+    <string name="login_prologue_fifth_caption_two">Los mejores fanáticos del mundo</string>
+    <string name="login_prologue_fifth_caption_one">Mis diez mejores cafés</string>
+    <string name="login_prologue_fifth_tag_six">Política</string>
+    <string name="login_prologue_fifth_tag_five">Música</string>
+    <string name="login_prologue_fifth_tag_four">Jardinería</string>
+    <string name="login_prologue_fifth_tag_three">Fútbol</string>
+    <string name="login_prologue_fifth_tag_two">Cocina</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' roll semanal</string>
+    <string name="login_prologue_fifth_subtitle_two">Noticias web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Estoy muy inspirado por el trabajo del fotógrafo Cameron Karsten. Probaré estas técnicas en mi próximo</string>
+    <string name="login_prologue_second_subtitle_one">Inspírate</string>
+    <string name="login_prologue_title_fourth">Observa cómo crece tu audiencia con analíticas avanzadas.</string>
+    <string name="login_prologue_title_second">Con el potente editor puedes publicar sobre la marcha.</string>
+    <string name="login_prologue_title_first">Bienvenido al maquetador web más popular del mundo.</string>
+    <string name="login_prologue_title_third">Mira los comentarios y avisos en tiempo real.</string>
+    <string name="media_loading_failed">La carga del medio ha fallado</string>
+    <string name="reader_discover_recommended_blogs_header">Sitios a seguir</string>
     <string name="gutenberg_native_s_is_not_fully_supported">\"%s\" no es totalmente compatible</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos trabajando duro para añadir más bloques con cada versión.</string>
     <string name="stories_intro_description_second">Son publicados como una nueva entrada de blog en tu sitio para que tu audiencia nunca se pierda nada.</string>
@@ -16,12 +166,9 @@ Language: es_MX
     <string name="stories_intro_description_first">Combina fotos, vídeos y texto para crear entradas de historias atractivas y accesibles que les encantarán a tus visitantes.</string>
     <string name="stories_intro_title_second">Las entradas de historias no desaparecen</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s ha denegado el acceso a tus fotos. Para corregirlo, edita tus permisos y activa %2$s y %3$s.</string>
-    <string name="mlp_preview_title">Vista previa del layout</string>
     <string name="mlp_notice_page_created">Página creada</string>
     <string name="mlp_notice_blank_page_created">Página en blanco creada</string>
-    <string name="mlp_generic_error">Ha ocurrido un error al obtener los layouts</string>
     <string name="stories_intro_main_title">Presentación de las entradas de historias</string>
-    <string name="stories_intro_main_subtitle">Tienes acceso anticipado a las entradas de historias y nos encantaría que las probaras.</string>
     <string name="stories_intro_image_caption_first">Cómo crear una entrada de historias</string>
     <string name="stories_intro_image_caption_second">Título de la entrada de historia</string>
     <string name="stories_intro_title_first">Ahora las historias son para todos</string>
@@ -30,8 +177,8 @@ Language: es_MX
     <string name="media_insert_failed">Inserción del medio fallida.</string>
     <string name="reader_label_toolbar_back">Volver</string>
     <string name="reader_post_details_header_by_author_name">por</string>
-    <string name="reader_discover_empty_title">Sigue temáticas y descubre nuevos blogs</string>
     <string name="reader_discover_empty_button_text">Primeros pasos</string>
+    <string name="reader_discover_empty_subtitle">Sigue temáticas para descubrir nuevos blogs</string>
     <string name="media_uploading_default">Subiendo medios</string>
     <string name="media_uploading_stock_library_photo">Subiendo medios de inventarios</string>
     <string name="media_uploading_gif_library_photo">Subiendo medios GIF</string>
@@ -44,7 +191,6 @@ Language: es_MX
     <string name="gutenberg_native_add_this_telephone_link">Añadir este enlace de teléfono</string>
     <string name="gutenberg_native_add_this_email_link">Añadir este enlace de correo electrónico</string>
     <string name="gutenberg_native_add_this_link">Añadir este enlace</string>
-    <string name="suggestion_no_connection">\"No hay conexión a Internet.\nNo están disponibles las sugerencias.\"</string>
     <string name="mlp_selected_description">%s seleccionado</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="toast_capture_operation_permission_needed">Tienes que conceder permisos de grabación de audio a la aplicación para grabar video</string>
@@ -64,7 +210,6 @@ Language: es_MX
     <string name="error_media_xmlrpc_not_allowed">Tu acción no está permitida</string>
     <string name="error_media_xmlrcp_server_error">Ha ocurrido un error interno del servidor</string>
     <string name="reader_welcome_banner">Bienvenido al Lector. Descubre millones de blogs a tu alcance.</string>
-    <string name="gutenberg_native_angle">Ángulo</string>
     <string name="gutenberg_native_select_a_layout">Seleccionar un layout</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Nota: el layout de la columna puede variar entre temas y tamaños de pantalla</string>
     <string name="create_post_fab_tooltip">Crear una entrada</string>
@@ -72,7 +217,6 @@ Language: es_MX
     <string name="create_post_story_fab_tooltip">Crear una entrada o historia</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ocultar</string>
     <string name="reader_discover_interests_header">Puede que te guste</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="dialog_insufficient_device_storage_error_ok_button">Ver el almacenamiento</string>
     <string name="toast_story_page_not_found">No se ha podido encontrar la diapositiva de la historia</string>
     <string name="toast_capture_operation_in_progress">Operación en progreso, inténtalo de nuevo</string>
@@ -106,7 +250,6 @@ Language: es_MX
     <string name="label_frame_errored">con error</string>
     <string name="label_text_alignment_button">Cambiar la alineación del texto</string>
     <string name="label_text_color_button">Cambiar el color del texto</string>
-    <string name="menu_delete_page">Borrar la diapositiva</string>
     <string name="dialog_discard_page_title">¿Borrar la diapositiva de la historia?</string>
     <string name="dialog_discard_page_message">Esta diapositiva será eliminada de tu historia.</string>
     <string name="dialog_discard_errored_page_message">Esta diapositiva aún no ha sido guardada. Si borras esta diapositiva, perderás cualquier edición que hayas hecho.</string>
@@ -115,7 +258,7 @@ Language: es_MX
     <string name="dialog_discard_story_message">La entrada de tu historia no se guardará como borrador.</string>
     <string name="dialog_discard_story_ok_button">Descartar</string>
     <string name="story_saving_untitled">Sin título</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b>Entrada del blog&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b&gt;Entrada del blog&lt;/b&gt;</string>
     <string name="prepublishing_nudges_story_title_hint">Pon un título a tu historia</string>
     <string name="mlp_create_blank_page">Crear una página en blanco</string>
     <string name="mlp_create_page">Crear una página</string>
@@ -124,7 +267,6 @@ Language: es_MX
     <string name="flip_button_alt">Girar la cámara</string>
     <string name="flash_button_alt">Flash</string>
     <string name="stickers_button_alt">Pegatinas</string>
-    <string name="more_button_alt">Más</string>
     <string name="text_button_alt">Texto</string>
     <string name="sound_button_alt">Sonido</string>
     <string name="label_control_flip_camera">Girar</string>
@@ -135,8 +277,6 @@ Language: es_MX
     <string name="label_snackbar_loop_frame_saved">Guardado en fotos</string>
     <string name="label_snackbar_share">COMPARTIR</string>
     <string name="label_share_to">Compartir con</string>
-    <string name="label_done">Hecho</string>
-    <string name="label_control_publish">Siguiente</string>
     <string name="label_close_button">Cerrar</string>
     <string name="label_saved_icon">Guardado</string>
     <string name="label_retry_icon">Reintentar</string>
@@ -156,15 +296,12 @@ Language: es_MX
     <string name="gutenberg_native_replace_image_or_video">Reemplazar la imagen o video</string>
     <string name="continue_with_google_terms_of_service_text">Si continúas con Google y aún no tienes una cuenta de WordPress.com, crearás una cuenta y aceptas nuestros %1$stérminos del servicio%2$s.</string>
     <string name="signup_confirmation_title">Confirmación del registro</string>
-    <string name="continue_with_wpcom">Continuar con WordPress.com</string>
-    <string name="enter_your_site_address">Introduce la dirección de tu sitio</string>
-    <string name="content_description_logo">Logotipo de WordPress</string>
     <string name="gutenberg_native_block_removed">Bloque eliminado</string>
     <string name="gutenberg_native_choose_image">Elegir una imagen</string>
     <string name="gutenberg_native_choose_image_or_video">Elegir una imagen o video</string>
     <string name="gutenberg_native_choose_video">Elegir un video</string>
+    <string name="enter_your_site_address">Ingresa la dirección de tu sitio existente</string>
     <string name="continue_terms_of_service_text">Si continúas, aceptas nuestros %1$stérminos del servicio%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Te enviaremos por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com.</string>
     <string name="signup_confirmation_message">Usaremos esta dirección de correo electrónico para crear tu nueva cuenta de WordPress.com.</string>
     <string name="signup_magic_link_message">Te hemos enviado por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com. Comprueba tu correo electrónico en este dispositivo y toca el enlace en el correo electrónico que has recibido de WordPress.com.</string>
     <string name="enter_account_info_for_site">Introduce la información de tu cuenta para %1$s.</string>
@@ -176,8 +313,6 @@ Language: es_MX
     <string name="login_or">o</string>
     <string name="login_magic_links_label">Te enviaremos por correo electrónico un enlace que te hará acceder automáticamente, sin necesidad de contraseña.</string>
     <string name="reset_your_password">Restablecer tu contraseña</string>
-    <string name="login_promo_title_37_percent">El 37\% de la web está creada con WordPress.</string>
-    <string name="login_promo_text_unlock_the_power">Desbloquea el poder del creador de webs más flexible.</string>
     <string name="send_link_by_email">Enviar el enlace por correo electrónico</string>
     <string name="create_account">Crear una cuenta</string>
     <string name="or_type_your_password">O escribe tu contraseña</string>
@@ -185,15 +320,13 @@ Language: es_MX
     <string name="get_started">Primeros pasos</string>
     <string name="check_email">Comprobar el correo electrónico</string>
     <string name="reader_error_request_failed_title">Ha habido un problema al gestionar la solicitud. Por favor, inténtalo de nuevo más tarde.</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b>%1$s&lt;/b> para configurar un nuevo título</string>
-    <string name="quick_start_list_update_site_title_subtitle">Dale a tu sitio un nombre que refleje su personalidad y temática. ¡Las primeras impresiones cuentan!</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b&gt;%1$s&lt;/b&gt; para configurar un nuevo título</string>
     <string name="quick_start_list_update_site_title_title">Establece el título de tu sitio</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios locales, ¿estás seguro de que quieres continuar?</string>
     <string name="gutenberg_native_s_block_options">Opciones del bloque %s</string>
     <string name="gutenberg_native_duplicate_block">Duplicar bloque</string>
     <string name="gutenberg_native_copy_block">Copiar bloque</string>
     <string name="gutenberg_native_copied_block">Bloque copiado</string>
-    <string name="gutenberg_native_block_settings">Ajustes del bloque</string>
     <string name="gutenberg_native_block_pasted">Bloque pegado</string>
     <string name="gutenberg_native_block_duplicated">Bloque duplicado</string>
     <string name="gutenberg_native_block_cut">Bloque cortado</string>
@@ -209,7 +342,6 @@ Language: es_MX
     <string name="gutenberg_native_gradient_type">Tipo de degradado</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Toca dos veces para seleccionar la opción</string>
     <string name="gutenberg_native_customize_gradient">Personalizar el degradado</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autor de la página</string>
     <string name="photo_picker_use_gif">Usar este GIF</string>
     <string name="error_media_thumbnail_not_loaded">La miniatura del medio no se ha podido cargar</string>
@@ -232,8 +364,6 @@ Language: es_MX
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Las entradas en la papelera no se pueden editar. ¿Deseas cambiar el estado de esta entrada a «borrador» para poder trabajar en ella?</string>
     <string name="prepublishing_nudges_toolbar_title_publish">Fecha de publicación</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">¿Mover entrada a borradores?</string>
-    <string name="reader_label_choose_your_interests">Elige tus intereses</string>
-    <string name="reader_choose_interests_content_description">Elige tus intereses</string>
     <string name="reader_btn_done">Hecho</string>
     <string name="reader_btn_select_few_interests">Selecciona algunos para continuar</string>
     <string name="post_status_post_published">Publicado</string>
@@ -245,19 +375,15 @@ Language: es_MX
     <string name="ccpa_privacy_notice_header">Aviso de privacidad para usuarios de California</string>
     <string name="status_and_visibility">Estado y visibilidad</string>
     <string name="update_now">Actualizar ahora</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Prueba un diseño de inicio</string>
     <string name="gutenberg_native_open_block_actions_menu">Abrir el menú de acciones de bloques</string>
+    <string name="gutenberg_native_move_to_top">Mover arriba</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toca dos veces pata abrir la hoja de acción con las opciones disponibles</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toca dos veces para abrir la hoja inferior con las opciones disponibles</string>
-    <string name="gutenberg_native_insert_mention">Insertar una mención</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">La página de inicio seleccionada y la página de entradas no pueden ser la misma.</string>
     <string name="site_settings_classic_blog">Blog clásico</string>
     <string name="site_settings_static_homepage">Página de inicio estática</string>
     <string name="site_settings_posts_page">Página de entradas</string>
     <string name="site_settings_select_page">Seleccionar la página</string>
-    <string name="suggestion_invalid_user">\"%s no es un usuario válido\"</string>
-    <string name="suggestion_no_matching_users">\"No hay disponibles usuarios que coincidan.\"</string>
     <string name="pages_set_as_homepage">Establecer como página de inicio</string>
     <string name="pages_set_as_posts_page">Establecer como página de entradas</string>
     <string name="pages_cannot_be_started">No podemos abrir las páginas en este momento. Por favor, inténtalo de nuevo más tarde</string>
@@ -276,7 +402,6 @@ Language: es_MX
     <string name="site_settings_homepage">Página de inicio</string>
     <string name="page_posts_page_update_failed">Ha fallado la actualización de la página de entradas</string>
     <string name="gutenberg_native_select_a_color">Seleccionar un color</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Bienvenido a nuestro nuevo blog</string>
     <string name="reader_empty_followed_blogs_description">Cuando sigas sitios, verás aquí su contenido</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toca dos veces para ir a los ajustes del color</string>
     <string name="feature_announcement_find_out_mode">Saber más</string>
@@ -309,7 +434,6 @@ Language: es_MX
     <string name="gutenberg_native_move_block_left">Mover bloque a la izquierda</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toca dos veces para mover el bloque hacia la derecha</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toca dos veces para mover el bloque hacia la izquierda</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Creando el escritorio</string>
     <string name="new_site_creation_creating_site_loading_3">Configurar el tema</string>
     <string name="new_site_creation_creating_site_loading_2">Añadiendo las características del sitio</string>
@@ -365,57 +489,18 @@ Language: es_MX
     <string name="app_theme">Apariencia</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Recientemente has hecho cambios en esta página, pero no los has guardado. Elige una versión para cargar:\n\n</string>
     <string name="app_theme_default">Establecido por el ahorrador de batería</string>
-    <string name="gutenberg_native_what_people_say">Lo que dice la gente</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Ofrecemos una gama de servicios para ayudarte a conseguir los resultados que buscas. ¿No estás seguro de lo que necesitas o de lo que cuesta? Podemos explicarte qué servicios son los adecuados para ti y decirte nuestros honorarios. Ponte en contacto con nosotros a continuación.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Somos un pequeño equipo de profesionales con talento con una amplia gama de habilidades y experiencia. Nos encanta lo que hacemos y lo hacemos con pasión. Esperamos poder trabajar contigo.</string>
-    <string name="gutenberg_native_warning_message">Mensaje de advertencia</string>
-    <string name="gutenberg_native_want_to_work_with_us">¿Quieres trabajar con nosotros?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Los visitantes querrán saber quién está al otro lado de la página. Usa este espacio para escribir sobre ti, tu sitio, tu negocio o sobre cualquier cosa que quieras. Usa las recomendaciones que aparecen a continuación para citar a otros hablando de lo mismo - con sus propias palabras.</string>
-    <string name="gutenberg_native_usa">EE.UU.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Este es un contenido de ejemplo, incluido con la plantilla, para ilustrar sus características. Elimínalo o sustitúyelo con tus propias palabras y medios.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">La forma de comenzar es dejar de hablar y empezar a hacer.</string>
-    <string name="gutenberg_native_team">Equipo</string>
-    <string name="gutenberg_native_success_message">Mensaje de éxito</string>
-    <string name="gutenberg_native_strategy">Estrategia</string>
     <string name="gutenberg_native_show_post_content">Mostrar el contenido de la entrada</string>
-    <string name="gutenberg_native_services">Servicios</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel el Perro</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nombre del proyecto</string>
-    <string name="gutenberg_native_position_or_job_title">Puesto o título del trabajo</string>
-    <string name="gutenberg_native_portfolio">Porfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Mostrar solo el extracto</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Mi porfolio presenta varios proyectos creados a lo largo de mi carrera. Mira a continuación mi información de contacto y ponte en contacto.</string>
     <string name="gutenberg_native_link_to">Enlazar a</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Hablemos 👋 No dudes en contactar en la siguiente información de contacto o envía un mensaje usando el formulario.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">¡Vamos a construir algo juntos!</string>
-    <string name="gutenberg_native_let_s_build_something_together">¡Vamos a construir algo juntos!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Son nuestras elecciones, Harry, las que muestran lo que realmente somos, mucho más que nuestras habilidades.</string>
-    <string name="gutenberg_native_inspiration">Inspiración</string>
-    <string name="gutenberg_native_get_in_touch">Ponte en contacto</string>
     <string name="gutenberg_native_excerpt_length_words">Longitud del extracto (palabras)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Envíame un correo electrónico: &lt;a href=\"mailto:correo@ejemplo.mx\">correo@ejemplo.mx&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">No llores porque se ha acabado, sonríe porque ha pasado.</string>
     <string name="gutenberg_native_customize">PERSONALIZAR</string>
-    <string name="gutenberg_native_city_10100">00000, Ciudad</string>
     <string name="gutenberg_native_add_paragraph_block">Añadir un bloque de párrafo</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Una breve descripción de los servicios que ofreces.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Una breve biografía sobre tu historial personal, tus logros clave o un hecho interesante.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:correo@ejemplo.mx\">correo@ejemplo.mx&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Una descripción del proyecto y de los trabajos presentados.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">Calle Mayor, 10</string>
     <string name="create_post_page_fab_tooltip_contributors">Crear una entrada</string>
     <string name="post_list_tab_trashed_posts">En la papelera</string>
     <string name="post_list_tab_scheduled_posts">Programada</string>
     <string name="post_list_tab_published_posts">Publicada</string>
     <string name="sharing_facebook_account_must_have_pages">La conexión de Facebook no puede encontrar ninguna página. «Divulgar» no se puede conectar con los perfiles de Facebook, solo con las páginas publicadas.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">No conectado</string>
-    <string name="my_site_select_domains_page_title">Dirección del sitio</string>
     <string name="notifications_tab_title_likes">Me gusta</string>
     <string name="notifications_tab_title_follows">Seguimientos</string>
     <string name="notifications_tab_title_comments">Comentarios</string>
@@ -429,14 +514,12 @@ Language: es_MX
     <string name="stats_management_add_new_stats_card">Añadir nueva tarjeta de estadísticas</string>
     <string name="reader_self_hosted_select_filter">Usa el botón de filtro para encontrar entradas sobre temas específicos</string>
     <string name="reader_bottom_sheet_content_description">Selecciona una etiqueta o sitio, ventana emergente</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Seleccionado</string>
     <string name="reader_btn_select_filter_content_description">Selecciona un sitio o etiqueta para filtrar entradas</string>
     <string name="reader_btn_remove_filter_content_description">Quitar el filtro actual</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Acceder a WordPress.com</string>
     <string name="reader_title_subs">Gestionar temas y sitios</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Accede a WordPress.com para ver las últimas entradas de los sitios que sigues</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Accede a WordPress.com para ver las últimas entradas de los temas que sigues</string>
-    <string name="gutenberg_native_template_preview">Vista previa de la plantilla</string>
     <string name="gutenberg_native_replace_current_block">Reemplazar el bloque actual</string>
     <string name="gutenberg_native_add_to_end">Añadir al final</string>
     <string name="gutenberg_native_add_to_beginning">Añadir al principio</string>
@@ -450,7 +533,6 @@ Language: es_MX
     <string name="reader_filter_cta">Filtrar</string>
     <string name="gutenberg_native_video_caption_s">Leyenda del video. %s</string>
     <string name="gutenberg_native_edit_video">Editar video</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Toca dos veces para seleccionar el diseño</string>
     <string name="gutenberg_native_add_a_shortcode">Añadir un shortcode…</string>
     <string name="post_list_author">Autor de la entrada</string>
     <string name="fab_create_desc">Crea una entrada</string>
@@ -465,10 +547,7 @@ Language: es_MX
     <string name="stats_box_type_low">bajas</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  y %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Mover la imagen hacia delante</string>
-    <string name="gutenberg_native_move_image_backward">Mover la imagen hacia atrás</string>
     <string name="gutenberg_native_gallery_caption_s">Leyenda de la galería. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. El valor actual es %2$s</string>
     <string name="create_post_page_fab_tooltip">Crear una entrada o página</string>
     <string name="content_description_person_building_website">Creador de la web</string>
     <string name="post_signup_interstitial_not_right_now">Ahorita No</string>
@@ -482,25 +561,20 @@ Language: es_MX
     <string name="my_site_bottom_sheet_add_post">Entrada del blog</string>
     <string name="my_site_bottom_sheet_title">Añadir nuevo</string>
     <string name="post_settings_publish">Publicar</string>
-    <string name="dialog_gutenberg_informative_description_v2">Hemos hecho grandes mejoras en el editor de bloques y creemos que ¡vale la pena probarlo! Lo hemos activado para nuevas entradas y páginas, pero si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincroniza ahora</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Esta entrada se sincronizará inmediatamente.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">¿Preparado para sincronizar?</string>
     <string name="new_site_creation_unavailable_domain">Este dominio no está disponible</string>
-    <string name="login_promo_viewpager_content_description">Introducción</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">No hemos podido acceder a tu sitio. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b>certificado SSL&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b>identificación HTTP&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b>archivo XMLRCP&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b&gt;certificado SSL&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b&gt;identificación HTTP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b&gt;archivo XMLRCP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Accede con las credenciales del sitio %1$s</string>
-    <string name="send_verification_email">Enviar el correo electrónico de verificación</string>
     <string name="reader_following_display_name">Siguiendo</string>
     <string name="my_site_bottom_sheet_add_page">Página del sitio</string>
-    <string name="enter_site_credentials_instead">Accede con las credenciales del sitio.</string>
     <string name="posts_cannot_be_started">No podemos abrir las entradas en este momento. Por favor, inténtalo de nuevo más tarde</string>
-    <string name="suffix_1_000">%sk</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
     <string name="suffix_1_000_000_000_000_000">%sC</string>
@@ -513,35 +587,27 @@ Language: es_MX
     <string name="site_cannot_be_loaded">No podemos cargar los datos para tu sitio en este momento. Por favor, inténtalo de nuevo más tarde</string>
     <string name="reader_filter_tags_title">Temas</string>
     <string name="gutenberg_native_wordpress_media_library">Biblioteca de medios de WordPress</string>
+    <string name="gutenberg_native_unsupported">No compatible</string>
     <string name="gutenberg_native_ungroup">Desagrupar</string>
     <string name="gutenberg_native_translate">Traducir</string>
-    <string name="gutenberg_native_title">Titulo:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Toca para ocultar el teclado</string>
     <string name="gutenberg_native_tap_here_to_show_help">Toca aquí para mostrar la ayuda</string>
     <string name="gutenberg_native_take_a_photo">Toma una foto</string>
     <string name="gutenberg_native_start_writing">Empieza a escribir…</string>
     <string name="gutenberg_native_take_a_video">Toma un video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Toma una foto o un video</string>
-    <string name="gutenberg_native_size">Tamaño</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Título del plugin en la barra lateral</string>
     <string name="gutenberg_native_show_section">Mostrar la sección</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloque %s. Este bloque tiene contenido no válido</string>
     <string name="gutenberg_native_s_block_empty">Bloque %s. Vacío</string>
-    <string name="gutenberg_native_reset_block">Restablecer el bloque</string>
     <string name="gutenberg_native_cut_block">Bloque cortado</string>
-    <string name="gutenberg_native_remove_annotations">Eliminar las notas</string>
     <string name="gutenberg_native_problem_displaying_block">Problema al mostrar el bloque</string>
     <string name="gutenberg_native_post_title_s">Título de la entrada. %s</string>
     <string name="gutenberg_native_post_title_empty">Título de la entrada. Vacío</string>
     <string name="gutenberg_native_paste_url">Pegar URL</string>
-    <string name="gutenberg_native_page_break_block_s">Bloque de salto de página. %s</string>
     <string name="gutenberg_native_open_settings">Abrir los ajustes</string>
-    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ninguna aplicación puede manejar esta petición. Por favor, instala un navegador Web.</string>
     <string name="gutenberg_native_problem_opening_the_video">Problema al abrir el video</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mi panel de prepublicación</string>
-    <string name="gutenberg_native_my_post_status_info">Información del estado de mi entrada</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mi panel de publicación de entradas</string>
-    <string name="gutenberg_native_my_document_setting_panel">Mi panel de ajustes de documentos</string>
+    <string name="gutenberg_native_page_break_block_s">Bloque de separación de página. %s</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ninguna aplicación puede manejar esta petición. Por favor, instala un navegador web.</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover el bloque hacia arriba desde la fila %1$s a la fila %2$s</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover el bloque hacia abajo desde la fila %1$s a la fila %2$s</string>
     <string name="gutenberg_native_move_block_up">Mover el bloque hacia arriba</string>
@@ -549,7 +615,6 @@ Language: es_MX
     <string name="gutenberg_native_move_block_down">Mover el bloque hacia abajo</string>
     <string name="gutenberg_native_image_caption_s">Leyenda de la imagen. %s</string>
     <string name="gutenberg_native_hide_keyboard">Ocultar teclado</string>
-    <string name="gutenberg_native_here_is_the_panel_content">¡Aquí está el contenido del panel!</string>
     <string name="gutenberg_native_help_icon">Icono de ayuda</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Fallo al insertar los medios.\nPor favor, toca para ver las opciones.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Toca dos veces para deshacer el último cambio</string>
@@ -561,34 +626,28 @@ Language: es_MX
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Toca dos veces para mover el bloque hacia arriba</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Toca dos veces para mover el bloque hacia abajo</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Toca dos veces para editar este valor</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Toca dos veces para cambiar el valor usando el control deslizante</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Toca dos veces para añadir un bloque</string>
     <string name="gutenberg_native_current_value_is_s">El valor actual es %s</string>
-    <string name="gutenberg_native_content">Contenido…</string>
     <string name="gutenberg_native_choose_from_device">Elegir desde el dispositivo</string>
-    <string name="gutenberg_native_annotations_sidebar">Barra lateral de notas</string>
-    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ha ocurrido un error desconocido. Por favor inténtalo de nuevo.</string>
     <string name="gutenberg_native_alt_text">Texto alternativo</string>
     <string name="gutenberg_native_add_video">AÑADIR UN VIDEO</string>
     <string name="gutenberg_native_add_url">Añadir URL</string>
     <string name="gutenberg_native_add_image_or_video">AÑADIR UNA IMAGEN O UN VÍDEO</string>
     <string name="gutenberg_native_add_image">AÑADIR UNA IMAGEN</string>
     <string name="gutenberg_native_add_block_here">AÑADIR EL BLOQUE AQUÍ</string>
-    <string name="gutenberg_native_add_annotation">Añadir anotación</string>
-    <string name="gutenberg_native_add_a_description">Añadir una descripción</string>
-    <string name="reader_empty_saved_posts_content_description">Toca el botón Añadir a las Entradas Guardadas para guardar una entrada en tu lista.</string>
-    <string name="reader_acessibility_list_loaded">«La lista se ha cargado con %1$d artículos.»</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ha ocurrido un error desconocido. Por favor, inténtalo de nuevo.</string>
+    <string name="gutenberg_native_add_alt_text">Añadir el texto alternativo</string>
+    <string name="reader_empty_saved_posts_content_description">Toca el botón \"Añadir a las entradas guardadas\" para guardar una entrada en tu lista.</string>
+    <string name="reader_acessibility_list_loaded">\"La lista se ha cargado con %1$d elementos.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Notificaciones</string>
-    <string name="notifications_tab_dialog_master_off_message">Al desactivar las Notificaciones para este sitio, se desactivarán las notificaciones que se muestran en la pestaña de notificaciones de este sitio. Puedes ajustar el tipo de notificación que ves después de activar las Notificaciones para este sitio.</string>
-    <string name="master_switch_default_title_off">Desactivados</string>
-    <string name="master_switch_default_title_on">Activados</string>
-    <string name="notifications_tab_dialog_master_off_title">Para ver las notificaciones en la pestaña de notificaciones de este sitio, activa los Notificaciones para este sitio.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Activar los avisos mostrados en la pestaña de avisos de este sitio</string>
-    <string name="notifications_tab_dialog_master_hint_on">Desactivar los avisos mostrados en la pestaña de avisos de este sitio</string>
-    <string name="notifications_tab_dialog_master_status_off">Avisos para este sitio</string>
-    <string name="notifications_tab_dialog_master_status_on">Avisos para este sitio</string>
-    <string name="dialog_gutenberg_informative_description_page">Ahora estás usando el editor de bloques para las nuevas páginas, ¡genial! Si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
-    <string name="dialog_gutenberg_informative_description_post">Ahora estás usando el editor de bloques para las nuevas entradas, ¡genial! Si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
+    <string name="main_switch_default_title_off">Desactivado</string>
+    <string name="main_switch_default_title_on">Activado</string>
+    <string name="notifications_tab_dialog_main_off_message">Al desactivar los avisos para este sitio, se desactivarán los avisos mostrados en la pestaña de avisos de este sitio. Puedes ajustar qué tipo de aviso ves después de activar los avisos para este sitio.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activar los avisos mostrados en la pestaña de avisos de este sitio</string>
+    <string name="notifications_tab_dialog_main_hint_on">Desactivar los avisos mostrados en la pestaña de avisos de este sitio</string>
+    <string name="notifications_tab_dialog_main_status_off">Avisos para este sitio</string>
+    <string name="notifications_tab_dialog_main_status_on">Avisos para este sitio</string>
+    <string name="notifications_tab_dialog_main_off_title">Para ver los avisos en la pestaña de avisos de este sitio, activa los avisos para este sitio.</string>
     <string name="pick_media">Añadir una imagen o un video</string>
     <string name="error_post_not_published_retrying_private">No hemos podido publicar esta entrada privada, pero lo intentaremos de nuevo más tarde.</string>
     <string name="error_post_not_scheduled_retrying">No hemos podido programar esta entrada, pero lo intentaremos de nuevo más tarde.</string>
@@ -607,10 +666,10 @@ Language: es_MX
     <string name="error_generic_error">No hemos podido completar esta acción.</string>
     <string name="error_preview_empty_draft">No se puede previsualizar un borrador vacío</string>
     <string name="error_preview_empty_page">No se puede previsualizar una página vacía</string>
-    <string name="preview_unavailable_self_hosted_sites">Vista Previa No Disponible</string>
-    <string name="post_preview_remote_auto_saving_post">Generando la Vista Previa…</string>
     <string name="error_preview_empty_post">No se puede previsualizar una entrada vacía</string>
     <string name="remote_preview_operation_error">Error al intentar guardar la entrada antes de previsualizarla</string>
+    <string name="preview_unavailable_self_hosted_sites">Vista previa no disponible</string>
+    <string name="post_preview_remote_auto_saving_post">Generando la vista previa…</string>
     <string name="post_preview_saving_draft">Guardando…</string>
     <string name="local_post_autosave_revision_available">Has hecho cambios no guardados en esta entrada</string>
     <string name="dialog_confirm_autosave_dont_restore_button">La versión desde esta aplicación</string>
@@ -631,15 +690,14 @@ Language: es_MX
     <string name="settings_username_changer_toast_content">Tu nuevo nombre de usuario es %1$s</string>
     <string name="settings_username_changer_progress_dialog">Guardando el nombre de usuario…</string>
     <string name="settings_username_changer_snackbar_cancel">Esta acción no puede ser cancelada. Es posible que el nombre de usuario ya haya sido actualizado.</string>
-    <string name="settings_username_changer_confirm_dialog_positive_action">Cambiar el Nombre de Usuario</string>
     <string name="settings_username_changer_confirm_dialog_content">Estás cambiando tu nombre de usuario a %1$s%2$s%3$s. Cambiar tu nombre de usuario también afectará a tu perfil de Gravatar y a las direcciones de perfil de Intense Debate. Para continuar, confirma tu nuevo nombre de usuario.</string>
     <string name="settings_username_changer_confirm_dialog_title">¡Cuidado!</string>
     <string name="settings_username_changer_header">Estás a punto de cambiar tu nombre de usuario, que actualmente es %1$s%2$s%3$s. No podrás volver a recuperar tu nombre de usuario.</string>
     <string name="site_settings_jetpack_performance_settings_hint">Ver y cambiar los ajustes de rendimiento de Jetpack</string>
-    <string name="site_settings_performance_and_speed">Rendimiento y Velocidad</string>
+    <string name="settings_username_changer_confirm_dialog_positive_action">Cambiar el nombre de usuario</string>
+    <string name="site_settings_performance_and_speed">Rendimiento y velocidad</string>
     <string name="site_settings_more">Más</string>
     <string name="site_settings_improved_search_summary">Reemplaza la búsqueda integrada en WordPress con una experiencia mejorada de búsqueda</string>
-    <string name="site_settings_improved_search">Búsqueda Mejorada</string>
     <string name="site_settings_jetpack_search">Búsqueda de Jetpack</string>
     <string name="site_settings_media">Medios</string>
     <string name="site_settings_site_accelerator_summary">Carga las páginas más rápido al permitir a Jetpack optimizar tus imágenes y archivos estáticos (como CSS y JavaScript).</string>
@@ -647,10 +705,11 @@ Language: es_MX
     <string name="site_settings_faster_images">Imágenes más rápidas</string>
     <string name="site_settings_site_accelerator_off">Desactivado</string>
     <string name="site_settings_ad_free_video_hosting">Alojamiento de Video Sin Anuncios</string>
+    <string name="site_settings_improved_search">Búsqueda mejorada</string>
     <string name="site_settings_site_accelerator_on">Activado</string>
-    <string name="site_settings_site_accelerator">Acelerador de Sitios</string>
     <string name="site_settings_lazy_load_images_summary">Mejora la velocidad de tu sitio al cargar solo las imágenes visibles en la pantalla.</string>
     <string name="site_settings_performance">Rendimiento</string>
+    <string name="site_settings_site_accelerator">Acelerador de sitios</string>
     <string name="stats_file_downloads_value_label">Descargas</string>
     <string name="stats_file_downloads_title_label">Archivo</string>
     <string name="stats_file_downloads">Descargas de archivos</string>
@@ -678,17 +737,14 @@ Language: es_MX
     <string name="post_notification_ten_minutes_before">10 minutos antes</string>
     <string name="post_notification_one_hour_before">1 hora antes</string>
     <string name="post_notification_off">Desactivado</string>
-    <string name="post_settings_add_to_calendar">Agregar al calendario</string>
     <string name="post_settings_notification">Notificación</string>
     <string name="post_settings_time_and_date">Fecha y hora</string>
-    <string name="login_need_help_finding_connected_email">¿Necesitas ayuda para encontrar el correo electrónico con el que te conectaste?</string>
-    <string name="enter_wordpress_site">El sitio web en esa dirección no es un sitio WordPress. Para conectarnos a él, el sitio debe tener instalado WordPress.</string>
+    <string name="post_settings_add_to_calendar">Añadir al calendario</string>
     <string name="login_invalid_site_url">Por favor, introduce una dirección completa de un sitio web, como example.com.</string>
     <string name="enter_email_for_site">Inicia sesión con WordPress.com para conectar con %1$s</string>
     <string name="stats_post_views_label">Visitas</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
     <string name="stats_expand_content_description">Expandir</string>
-    <string name="stats_graph_updated">Gráfico actualizado.</string>
     <string name="stats_overview_content_description">%1$s %2$s del período: %3$s, cambio desde el período anterior - %4$s</string>
     <string name="stats_loading_card">Cargando los datos de la tarjeta seleccionada</string>
     <string name="site_settings_editor">Editor</string>
@@ -696,6 +752,7 @@ Language: es_MX
     <string name="stats_item_collapsed">Elemento contraído</string>
     <string name="stats_item_expanded">Elemento expandido</string>
     <string name="stats_collapse_content_description">Contraer</string>
+    <string name="stats_graph_updated">Se actualizó el gráfico.</string>
     <string name="description_expand">Expandir</string>
     <string name="my_site_verify_your_email_without_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a tu correo electrónico</string>
     <string name="my_site_verify_your_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a %s</string>
@@ -748,7 +805,7 @@ Language: es_MX
     <string name="domain_registration_state_picker_dialog_title">Selecciona el Estado</string>
     <string name="domain_registration_country_picker_dialog_title">Selecciona el País</string>
     <string name="domain_registration_result_continue_button">continuar</string>
-    <string name="domain_registration_result_description">tu nuevo dominio &lt;b>%s&lt;/b> se está configurando. ¡Tu sitio está\n    dando volteretas de emoción!</string>
+    <string name="domain_registration_result_description">tu nuevo dominio &lt;b&gt;%s&lt;/b&gt; se está configurando. ¡Tu sitio está\n    dando volteretas de emoción!</string>
     <string name="domain_registration_result_title">Felicidades</string>
     <string name="domain_contact_information_register_domain_button">Registrar Dominio</string>
     <string name="domain_contact_information_state_hint">Estado</string>
@@ -763,16 +820,16 @@ Language: es_MX
     <string name="domain_contact_information_description">Para tu comodidad, hemos precompletado tu información de contacto\n de WordPress.com. Por favor, comprueba que es la información correcta que quieres usar para este dominio.</string>
     <string name="domain_contact_information_title">Información de contacto del dominio</string>
     <string name="domain_privacy_option_off_title">Registrar públicamente</string>
-    <string name="domain_privacy_option_on_title">Registrar privadamente con Protección de Privacidad</string>
     <string name="domain_registration_privacy_protection_description">Los propietarios de dominios tienen que compartir información en una base de datos pública de todos los dominios.\n   Con la protección de privacidad publicamos nuestra propia información en vez de la tuya, y te redirigiremos de forma privada cualquier comunicación dirigida a ti. </string>
-    <string name="domain_registration_privacy_protection_title">Protección de Privacidad</string>
+    <string name="domain_privacy_option_on_title">Registrar privadamente con protección de privacidad</string>
     <string name="domain_registration_contact_form_input_error">Por favor, introduce un %s válido</string>
-    <string name="domains_suggestions_choose_domain">Elegir Dominio</string>
+    <string name="domain_registration_privacy_protection_title">Protección de privacidad</string>
     <string name="stats_management_new">Nuevo</string>
     <string name="stats_management_dismiss_insights_news_card">Descartar</string>
     <string name="stats_management_try_it_now">Pruébalo ahora</string>
-    <string name="stats_management_news_card_message">Elige qué estadísticas ver, y concéntrate en los datos que más te preocupen. Toca en %1$s al fondo de las estadísticas para personalizarlas.</string>
-    <string name="stats_manage_your_stats">Gestiona Tus Estadísticas</string>
+    <string name="domains_suggestions_choose_domain">Elegir dominio</string>
+    <string name="stats_management_news_card_message">Elige qué estadísticas ver, y céntrate en los datos que más te preocupen. Toca en %1$s al fondo de las estadísticas para personalizarlas.</string>
+    <string name="stats_manage_your_stats">Gestiona tus estadísticas</string>
     <string name="history_fetching_revisions">Recuperando revisiones…</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">Fallo al insertar los medios.\nPor favor, toca para volver a intentarlo.</string>
     <string name="editor_uploading_draft">Tu borrador se está subiendo</string>
@@ -780,15 +837,15 @@ Language: es_MX
     <string name="error_restoring_post">Ocurrió un error mientras se restauraba la entrada</string>
     <string name="post_list_tab_drafts">Borradores</string>
     <string name="backdated_for">Retroceder a: %s</string>
-    <string name="stats_insights_management_title">Solo ves las estadísticas más relevantes. Agrega y organiza tu información abajo.</string>
     <string name="stats_insights_social">Social</string>
-    <string name="stats_insights_annual_site_stats">Estadísticas Anuales del Sitio</string>
-    <string name="stats_view_follower_totals">Seguidores Totales</string>
     <string name="domain_suggestions_fetch_error">No se pudieron cargar las sugerencias de dominios</string>
     <string name="domain_suggestions_search_hint">Teclea una palabra clave para más ideas</string>
     <string name="domains_suggestions_empty_list">No se han encontrado sugerencias</string>
-    <string name="register_domain">Registrar Dominio</string>
-    <string name="jetpack_installed_message">Ahora que está instalado Jetpack, solo necesitamos que lo configures. Esto solo tomará un minuto.</string>
+    <string name="stats_insights_management_title">Solo ves las estadísticas más relevantes. Añade y organiza tus detalles abajo.</string>
+    <string name="stats_insights_annual_site_stats">Estadísticas anuales del sitio</string>
+    <string name="stats_view_follower_totals">Seguidores totales</string>
+    <string name="register_domain">Registrar dominio</string>
+    <string name="jetpack_installed_message">Ahora que está instalado Jetpack, solo necesitamos que lo configures. Esto solo te llevará un minuto.</string>
     <string name="stats_menu_move_down">Mover abajo</string>
     <string name="stats_menu_move_up">Mover arriba</string>
     <string name="stats_item_settings">Ajustes de los parámetros de las estadísticas</string>
@@ -799,13 +856,13 @@ Language: es_MX
     <string name="post_trashing">La entrada se está enviando a la papelera</string>
     <string name="stats_menu_remove">Quitar de la información</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios sin guardar, ¿estás seguro de querer continuar?</string>
-    <string name="button_move_to_draft">Mover a Borradores</string>
     <string name="post_list_toggle_item_layout_list_view">Cambiar a la vista de lista</string>
     <string name="post_list_toggle_item_layout_cards_view">Cambiar a la vista de tarjetas</string>
     <string name="posts_trashed_empty">No tienes ninguna entrada en la papelera</string>
     <string name="posts_draft_empty">No tienes ninguna entrada en borrador</string>
     <string name="posts_scheduled_empty">No tienes ninguna entrada programada</string>
     <string name="posts_published_empty">Aún no has publicado ninguna entrada</string>
+    <string name="button_move_to_draft">Mover a borradores</string>
     <string name="notification_wpcom_username_needed">Por favor inicia sesión con tu nombre de usuario y contraseña.</string>
     <string name="error_user_username_instead_of_email">Por favor, inicia sesión usando tu nombre de usuario de WordPress.com en vez de tu dirección de correo electrónico.</string>
     <string name="stats_insights_total_words">Total de palabras</string>
@@ -855,15 +912,12 @@ Language: es_MX
     <string name="plans_loading_error_no_plans_subtitle">No podemos cargar los Planes en este momento. Por favor, inténtalo de nuevo más tarde.</string>
     <string name="plans_loading_error_network_title">Sin conexión</string>
     <string name="menu_switch_to_gutenberg_editor">Cambiar al editor de bloques</string>
-    <string name="menu_switch_to_aztec_editor">Cambiar al editor clásico</string>
     <string name="stats_loading_block_error">Hubo un problema al cargar tus datos, recarga la página e inténtalo de nuevo.</string>
     <string name="stats_loading_error">Datos no cargados</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edita las nuevas entradas y páginas con el editor de bloques</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Usar Editor de Bloques</string>
     <string name="plans_loading_error_no_plans_title">No se pueden cargar los Planes</string>
-    <string name="dialog_gutenberg_informative_title">Editor de Bloques Activado</string>
     <string name="exit">salir</string>
-    <string name="quick_start_sites_type_customize">Personaliza Tu Sitio</string>
     <string name="quick_start_sites">Siguientes Pasos</string>
     <string name="quick_start_complete_tasks_header">Completo (%d)</string>
     <string name="quick_start_sites_type_subtitle">%1$d de %2$d completo</string>
@@ -871,30 +925,22 @@ Language: es_MX
     <string name="quick_start_dialog_upload_icon_title">Carga un icono del sitio</string>
     <string name="quick_start_dialog_upload_icon_message">Tus visitantes verán tu icono en su navegador. Agrega un icono personalizado para conseguir un aspecto profesional y refinado.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Toca en %1$s Plan %2$s para ver tu plan actual y otros planes disponibles</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Toca en %1$s Agregar Página %2$s para crear una nueva página.</string>
-    <string name="quick_start_sites_type_grow">Haz Crecer Tu Audiencia</string>
     <string name="quick_start_dialog_check_stats_message_short">Toca en %1$s Estadísticas %2$s para ver cómo está rindiendo tu sitio.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Toca en %1$s Icono de Tu Sitio %2$s para subir uno nuevo</string>
     <string name="quick_start_dialog_need_help_message">Te guiaremos por los básicos de la construcción y el crecimiento de tu sitio.</string>
     <string name="quick_start_dialog_migration_title">Hemos realizado algunos cambios en tu lista de comprobación</string>
     <string name="quick_start_dialog_publish_post_message">Guarda en borrador y publica tu primera entrada.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Toca en %1$s Páginas %2$s para continuar.</string>
     <string name="quick_start_dialog_migration_message">Hemos agregado más tareas para ayudarte a hacer crecer tu audiencia.</string>
     <string name="quick_start_dialog_explore_plans_title">Explorar planes</string>
     <string name="quick_start_dialog_explore_plans_message">Aprende sobre las herramientas de mercadotecnia y SEO de nuestros planes de pago.</string>
     <string name="quick_start_dialog_enable_sharing_title">Activar compartir entradas</string>
-    <string name="quick_start_dialog_customize_site_message">Configura tipo de letras, agrega imágenes y más</string>
-    <string name="quick_start_dialog_create_page_title">Crea una nueva página</string>
-    <string name="quick_start_dialog_create_page_message">Agrega una página para contenido clave — una página \"Acerca de\" es un gran comienzo.</string>
     <string name="quick_start_dialog_enable_sharing_message">Comparte automáticamente nuevas entradas en tus cuentas de medios sociales.</string>
     <string name="quick_start_dialog_check_stats_title">Revisa las estadísticas de tu sitio</string>
     <string name="quick_start_dialog_check_stats_message">Mantente al día sobre el rendimiento de tu sitio</string>
-    <string name="quick_start_dialog_browse_themes_title">Explorar temas</string>
     <string name="quick_start_dialog_remove_next_steps_title">Eliminar Siguientes Pasos</string>
     <string name="quick_start_dialog_remove_next_steps_message">Eliminar los Siguientes Pasos ocultará todas las visitas guiadas de este sitio. Esta acción es irreversible.</string>
     <string name="quick_start_remove_next_steps_menu_title">Quitar esto</string>
     <string name="quick_start_complete_view_subtitle">Felicidades por completar tu lista. Un trabajo bien hecho.</string>
-    <string name="quick_start_dialog_browse_themes_message">Explora docenas de opciones de diseño y descubre el que se ajuste a ti.</string>
     <string name="quick_start_complete_view_title">¡Todas las tareas están completas!</string>
     <string name="quick_start_task_skip_menu_title">Saltar tarea</string>
     <string name="quick_start_completed_tasks_header_chevron_collapse_desc">cerrar</string>
@@ -913,16 +959,12 @@ Language: es_MX
     <string name="notification_new_site_creation_failed">Hubo un problema</string>
     <string name="new_site_creation_create_site_button">Crear sitio</string>
     <string name="notification_new_site_creation_title">Creación de un sitio</string>
-    <string name="new_site_creation_search_domain_input_hint">Buscar Dominios</string>
     <string name="new_site_creation_domain_header_subtitle">Aquí es donde la gente te encontrará en el internet.</string>
     <string name="new_site_creation_clear_all_content_description">Limpiar</string>
-    <string name="new_site_creation_domain_header_title">Elige un nombre de dominio para tu sitio</string>
     <string name="new_site_creation_empty_domain_list_message">No hay direcciones disponibles que coincidan con tu búsqueda</string>
     <string name="site_creation_error_generic_subtitle">Error al comunicarse con el servidor, por favor inténtalo de nuevo</string>
     <string name="site_creation_error_generic_title">Hubo un problema</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Hubo un problema</string>
-    <string name="site_creation_segments_subtitle">Esto nos ayuda a hacer recomendaciones. Pero nunca estar siempre ahí — ¡todos los sitios evolucionan!</string>
-    <string name="site_creation_segments_title">Cuéntanos qué tipo de sitio te gustaría crear</string>
     <string name="new_site_creation_preview_title">¡Tu sitio ha sido creado!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
     <string name="new_site_creation_screen_title_general">Crear Sitio</string>
@@ -1076,20 +1118,13 @@ Language: es_MX
     <string name="quick_start_dialog_need_help_button_positive">Aceptar</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
     <string name="quick_start_dialog_follow_sites_title">Sigue otros sitios</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con intereses similares</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Toca en %1$s Lector %2$s para seguir</string>
-    <string name="quick_start_dialog_customize_site_title">Personaliza tu sitio</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Toca en %1$s Temas %2$s para seguir</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Toca en %1$s Personalizar %2$s para empezar a personalizar tu sitio</string>
     <string name="quick_start_dialog_need_help_button_negative">No, gracias</string>
     <string name="quick_start_dialog_follow_sites_message">Descubre sitios que te inspiren, y síguelos para obtener actualizaciones cuando publiquen.</string>
-    <string name="quick_start_dialog_choose_theme_title">Elige un tema</string>
-    <string name="quick_start_dialog_choose_theme_message">Revisa todos nuestros temas para encontrar el que se te ajuste a la perfección</string>
     <string name="quick_start_button_positive">Ir</string>
     <string name="quick_start_button_negative_short">Cancelar</string>
     <string name="quick_start_button_negative">Ahora no</string>
     <string name="my_site_create_new_site_title">No tienes sitios</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Toca en %1$s Temas %2$s para descubrir nuevos temas</string>
     <string name="content_description_more">Más</string>
     <string name="reader_empty_followed_tags_subtitle">Añade aquí temas para descubrir entradas sobre tus temáticas favoritas</string>
     <string name="reader_empty_followed_tags_title">Temas no seguidos</string>
@@ -1149,14 +1184,8 @@ Language: es_MX
     <string name="support_contact_email">Correo electrónico de contacto</string>
     <string name="application_log_button">Registro de la aplicación</string>
     <string name="my_tickets">Mis tickets</string>
-    <string name="activity_log_rewind_dialog_message">¿Quieres rebobinar tu sitio al %1$s a las %2$s? Esto borrará todo el contenido y opciones creadas o cambiadas desde entonces.</string>
-    <string name="activity_log_rewind_site">Rebobinar sitio</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rebobinado en curso</string>
-    <string name="activity_log_currently_restoring_message">Rebobinando a %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Actualmente restaurando tu sitio</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Tu sitio ha sido restaurado satisfactoriamente</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Tu sitio ha sido restaurado satisfactoriamente\nRebobinado a %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Tu sitio está siendo restaurado\nRebobinando a %1$s %2$s</string>
     <string name="activity_log_button">Botón de acción del registro de actividad</string>
     <string name="plugin_auto_managed">Gestionado automáticamente</string>
     <string name="reader_save_posts_locally_dialog_message">Guarda esta entrada y vuelve cuando quieras para leerla. Solo estará disponible en este dispositivo — las entradas guardadas no se sincronizan con otros dispositivos.</string>
@@ -1166,20 +1195,16 @@ Language: es_MX
     <string name="comment_read_source_post">Lee la entrada de origen</string>
     <string name="sites">Sitios</string>
     <string name="signup_magic_link_title">Enlace mágico enviado</string>
-    <string name="signup_email_screen_title">Registro por correo electrónico</string>
     <string name="verification_2fa_screen_title">Verificación del código</string>
     <string name="selfhosted_site_login_title">Credenciales de acceso</string>
     <string name="magic_link_sent_login_title">Enlace mágico enviado</string>
     <string name="magic_link_login_title">Acceso por enlace mágico</string>
     <string name="site_address_login_title">Acceso mediante la dirección del sitio</string>
     <string name="email_address_login_title">Acceso mediante dirección de correo electrónico</string>
-    <string name="alternatively">Alternativamente:</string>
     <string name="reader_empty_saved_posts_description">Toca %s para guardar una entrada en tu lista.</string>
     <string name="reader_empty_saved_posts_title">¡Aún no hay entradas guardadas!</string>
     <string name="reader_bookmark_snack_title">Entrada guardada</string>
     <string name="reader_bookmark_snack_btn">Ver todas</string>
-    <string name="reader_btn_bookmarked">Guardada</string>
-    <string name="reader_btn_bookmark">Guardar</string>
     <string name="reader_remove_bookmark">Borrada de las entradas guardadas</string>
     <string name="reader_add_bookmark">Añadida a las entradas guardadas</string>
     <string name="reader_save_for_later_title">Entradas guardadas</string>
@@ -1199,11 +1224,9 @@ Language: es_MX
     <string name="reader_btn_notifications_on">Activar los avisos del sitio</string>
     <string name="reader_btn_notifications_off">Desactivar los avisos del sitio</string>
     <string name="activity_log_jetpack_icon">Icono de Jetpack</string>
-    <string name="rewind">Rebobinar</string>
     <string name="activity_log_event">Evento</string>
     <string name="activity_log_icon">Icono de actividad</string>
     <string name="activity_log">Registro de actividad</string>
-    <string name="activity">Actividad</string>
     <string name="privacy_policy_read">Lee la política de privacidad</string>
     <string name="third_party_policy_learn_more_caption">Usamos otras herramientas de seguimiento, incluidas algunas de terceros. Lee acerca de estas y cómo controlarlas.</string>
     <string name="third_party_policy_learn_more_header">Política de terceros</string>
@@ -1214,7 +1237,6 @@ Language: es_MX
     <string name="preference_privacy_settings">Ajustes de privacidad</string>
     <string name="preference_collect_information">Recopilar información</string>
     <string name="post_submitted">Entrada enviada</string>
-    <string name="login_email_button_signup">¿No tienes una cuenta? %1$s Regístrate %2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Una característica del plugin requiere que el sitio esté en buen estado.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Una característica del plugin necesita que la suscripción principal del dominio esté asociada con este usuario.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Una característica del plugin necesita privilegios de administrador.</string>
@@ -1313,7 +1335,6 @@ Language: es_MX
     <string name="edit_photo_screen_title">Editar foto</string>
     <string name="share_intent_screen_title">Elige el sitio</string>
     <string name="signup_epilogue_screen_title">Cuenta nueva</string>
-    <string name="login_prologue_screen_title">Iniciar sesión</string>
     <string name="login_epilogue_screen_title">Conectado como</string>
     <string name="person_detail_screen_title">Detalle de la persona</string>
     <string name="media_settings_screen_title">Detalles del archivo</string>
@@ -1327,7 +1348,7 @@ Language: es_MX
     <string name="release_notes_screen_title">Notas de la versión</string>
     <string name="my_site_section_screen_title">Mi sitio</string>
     <string name="signup_epilogue_error_avatar_view">Tu avatar se ha subido y estará disponible en breve.</string>
-    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta funcionalidad.&lt;br/>&lt;br/>Si deseas usarla, edita tus permisos y comprueba que &lt;strong>%s&lt;/strong> se ha habilitado.</string>
+    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta funcionalidad.&lt;br/&gt;&lt;br/&gt;Si deseas usarla, edita tus permisos y comprueba que &lt;strong&gt;%s&lt;/strong&gt; se ha habilitado.</string>
     <string name="permissions_denied_title">Permisos</string>
     <string name="plugin_caption_featured">Destacados</string>
     <string name="sharing_disabled_description">No puedes acceder a los ajustes compartidos porque el módulo Compartir de Jetpack está deshabilitado.</string>
@@ -1368,7 +1389,6 @@ Language: es_MX
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 entrada con 1 archivo sin subir</string>
     <string name="untitled_in_parentheses">(sin título)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Crear sitio</string>
     <string name="notification_site_creation_created">Toca para continuar.</string>
     <string name="notification_site_creation_title_success">¡Sitio creado!</string>
@@ -1382,11 +1402,8 @@ Language: es_MX
     <string name="username_changer_dismiss_button_positive">Descartar</string>
     <string name="username_changer_action">Guardar</string>
     <string name="content_description_add_avatar">Añadir avatar</string>
-    <string name="signup_with_google_button">Registro con Google</string>
-    <string name="signup_with_email_button">Registro con correo electrónico</string>
     <string name="signup_user_exists">El correo electrónico ya existe en WordPress.com.\nAcceder.</string>
     <string name="signup_updating_account">Actualizando cuenta…</string>
-    <string name="signup_terms_of_service_text">Al registrarte aceptas nuestros %1$sTérminos del servicio%2$s.</string>
     <string name="signup_magic_link_progress">Enviando correo</string>
     <string name="signup_magic_link_error_button_positive">Reintentar</string>
     <string name="signup_magic_link_error_button_negative">Cerrar</string>
@@ -1398,12 +1415,7 @@ Language: es_MX
     <string name="signup_epilogue_error_button_negative">Revertir</string>
     <string name="signup_epilogue_error_generic">Hubo algún problema al actualizar tu cuenta. Puedes reintentarlo o revertir tus cambios para continuar.</string>
     <string name="signup_epilogue_error_avatar">Hubo algún problema al subir tu avatar.</string>
-    <string name="signup_email_header">Para crear tu nueva cuenta de WordPress.com, por favor, introduce tu dirección de correo electrónico.</string>
-    <string name="signup_email_error_generic">Hubo algún problema al comprobar la dirección de correo.</string>
     <string name="signup_epilogue_hint_password_detail">Siempre puedes acceder con un enlace como el que acabas de usar, pero también puedes configurar una contraseña si lo prefieres.</string>
-    <string name="sign_up">Registro en WordPress.com</string>
-    <string name="enter_username_instead">Accede con tu nombre de usuario.</string>
-    <string name="enter_site_address_instead">Accede introduciendo la dirección de tu sitio.</string>
     <string name="plugin_needs_update">Necesita actualizarse</string>
     <string name="plugin_caption_search">Buscar plugins</string>
     <string name="plugin_caption_new">Nuevo</string>
@@ -1524,7 +1536,6 @@ Language: es_MX
     <string name="login_error_suffix">\n¿Quizás probando con otra cuenta?</string>
     <string name="login_error_generic">Hubo algún problema al conectar con la cuenta de Google.</string>
     <string name="login_error_button">Cerrar</string>
-    <string name="login_google_button_suffix">Acceder con Google.</string>
     <string name="enter_wpcom_password_google">Para seguir con esta cuenta de Google, por favor, facilita la contraseña correspondiente de WordPress.com. Solo se te pedirá una vez.</string>
     <string name="error_generic_network">Ocurrió un error en la red. Por favor, revisa tu conexión e inténtalo de nuevo.</string>
     <string name="post_settings_remove_featured_image">Quitar imagen destacada</string>
@@ -1536,12 +1547,11 @@ Language: es_MX
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">¿Estás seguro de querer desconectar Jetpack del sitio?</string>
     <string name="jetpack_disconnect_pref_title">\"Desconecta de WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Puedes poner en lista blanca una dirección IP o series de direcciones, evitando que las bloquee Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango introduce  un valor inferior y un valor superior separados por guiones. Ejemplo: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Puedes marcar una dirección IP (o series de direcciones) como \"Siempre permitida\", evitando que sea bloqueada por Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango, introduce un valor inferior y un valor superior separados por un guión. Ejemplo: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Requiere la identificación en dos pasos</string>
     <string name="jetpack_match_wpcom_via_email_title">Relacionar cuentas usando el correo electrónico</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir el acceso con WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Acceso con WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Direcciones IP en lista blanca</string>
     <string name="jetpack_prevent_brute_force_title">Bloquea intentos de acceso malisiosos</string>
     <string name="jetpack_prevent_brute_force_category_title">Protección contra ataques de fuerza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar avisos instantáneos</string>
@@ -1582,13 +1592,13 @@ Language: es_MX
     <string name="notification_settings_category_other">Otros</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos mis sitios</string>
     <string name="notification_settings_category_your_sites">Tus sitios</string>
-    <string name="notification_settings_master_off_message">Desactivando los ajustes de avisos desactivará todos los avisos de esta aplicación, da igual el tipo. Puedes ajustar al detalle que tipo de aviso recibir tras activar los ajustes de avisos.</string>
-    <string name="notification_settings_master_off_title">Para recibir avisos en este dispositivo activa los ajustes de avisos.</string>
-    <string name="notification_settings_master_hint_off">Activar avisos</string>
-    <string name="notification_settings_master_hint_on">Desactivar avisos</string>
-    <string name="notification_settings_master_status_off">Inactivos</string>
-    <string name="notification_settings_master_status_on">Activos</string>
+    <string name="notification_settings_main_off_message">Desactivando los ajustes de avisos se desactivarán todos los avisos de esta aplicación, independientemente del tipo. Puedes ajustar qué tipo de aviso recibes después de activar los ajustes de avisos.</string>
+    <string name="notification_settings_main_off_title">Para recibir avisos en este dispositivo, activa los ajustes de avisos.</string>
+    <string name="notification_settings_main_hint_off">Activar los avisos</string>
+    <string name="notification_settings_main_hint_on">Desactivar los avisos</string>
+    <string name="notification_settings_main_status_off">Desactivado</string>
     <string name="max_video_resolution">Tamaño máximo de video</string>
+    <string name="notification_settings_main_status_on">Activado</string>
     <string name="max_thumbnail_px_size">Tamaño máximo de imagen</string>
     <string name="error_upload_post_media_param">Hubo un error al subir los medios a esta entrada: %s.</string>
     <string name="error_upload_post_param">Hubo un error al subir esta entrada: %s.</string>
@@ -1624,7 +1634,6 @@ Language: es_MX
     <string name="login_site_address_more_help">¿Necesitas más ayuda?</string>
     <string name="login_site_address_help_content">La dirección de tu sitio aparece en la barra de la parte superior de la pantalla cuando visitas tu sitio en Chrome.</string>
     <string name="login_site_address_help_title">¿Cuál es la dirección de mi sitio?</string>
-    <string name="login_site_address_help">¿Necesitas ayuda para encontrar la dirección de tu sitio?</string>
     <string name="login_site_address">Dirección del sitio</string>
     <string name="enter_site_address">Introduce la dirección del sitio WordPress con el que te gustaría conectar.</string>
     <string name="login_already_logged_in_wpcom">Ya estás conectado a WordPress.com</string>
@@ -1637,7 +1646,6 @@ Language: es_MX
     <string name="login_text_otp">Envíame un mensaje con un código en su lugar</string>
     <string name="enter_verification_code">¡Casi lo tenemos! Por favor, introduce un código de verificación desde tu aplicación Authenticator.</string>
     <string name="next">Siguiente</string>
-    <string name="open_mail">Abrir correo electrónico</string>
     <string name="enter_email_wordpress_com">Accede a WordPress.com usando una dirección de correo electrónico para gestionar todos tus sitios WordPress.</string>
     <string name="image_optimization_promo_desc">La optimización de imagen reduce las imágenes para que suban más rápido.\n\nPuedes cambiar esto en cualquier momento en los ajustes del sitio.</string>
     <string name="image_optimization_promo_title">¿Activar optimización de la imagen?</string>
@@ -1659,10 +1667,6 @@ Language: es_MX
     <string name="post_status_post_private">Privada</string>
     <string name="post_status_pending_review">Pendiente de revisión</string>
     <string name="post_status_publish_post">Publicar</string>
-    <string name="change_location">Cambiar ubicación</string>
-    <string name="remove_location">Borrar ubicación</string>
-    <string name="post_settings_error_placepicker_missing_play_services">No se ha podido abrir el selector de ubicación, no  disponible Google Play Services</string>
-    <string name="post_settings_location">Ubicación</string>
     <string name="now">Ahora</string>
     <string name="post_settings_password_dialog_hint">Solo los que tengan esta contraseña pueden ver esta entrada</string>
     <string name="post_settings_excerpt_dialog_hint">Los extractos son resúmenes opcionales del contenido hechos a mano.</string>
@@ -1846,7 +1850,6 @@ Language: es_MX
     <string name="signout">Cerrar sesión</string>
     <string name="sign_in_wpcom">Iniciar sesión en WordPress.com</string>
     <string name="reader_label_global_related_posts">Más en WordPress.com</string>
-    <string name="reader_label_local_related_posts">Más en %s</string>
     <string name="preference_open_device_settings">Abrir ajustes del dispositivo</string>
     <string name="invite_user_blocked_invites">%s: Invitaciones bloqueadas por el usuario</string>
     <string name="invite_invalid_email">%s: Correo electrónico no válido</string>
@@ -1894,20 +1897,14 @@ Language: es_MX
     <string name="invite_error_invalid_usernames_multiple">No se pudo enviar: Hay nombres de usuario o correos electrónicos no válidos.</string>
     <string name="invite_error_invalid_usernames_one">No se pudo enviar: Un nombre de usuario o correo electrónico no es válido</string>
     <string name="invite_error_no_usernames">Por favor, añade al menos un nombre de usuario</string>
-    <string name="invite_message_info">(Opcional) Puedes introducir un mensaje personalizado de hasta 500 caracteres que se incluirá en la invitación.</string>
-    <string name="invite_message_remaining_other">%d caracteres restantes</string>
-    <string name="invite_message_remaining_one">Queda 1 carácter</string>
-    <string name="invite_message_remaining_zero">Quedan 0 caracteres</string>
-    <string name="invite_message_title">Mensaje personalizado</string>
     <string name="invite">Invitar</string>
-    <string name="invite_names_title">Nombres de usuario o correos electrónicos</string>
     <string name="my_site_header_external">Externo</string>
     <string name="invite_people">Invitar a gente</string>
-    <string name="send_link">Enviar enlace</string>
     <string name="label_clear_search_history">Borrar historial de búsqueda</string>
     <string name="dlg_confirm_clear_search_history">¿Borrar historial de búsqueda?</string>
     <string name="reader_empty_search_description">No se han encontrado resultados con %s para tu idioma</string>
     <string name="reader_hint_post_search">Buscar en WordPress</string>
+    <string name="reader_title_related_post_detail">Entrada relacionada</string>
     <string name="preview_screen_links_disabled">Los enlaces están inhabilitados en la pantalla de vista previa</string>
     <string name="send">Enviar</string>
     <string name="person_removed">\@%1$s eliminado correctamente.</string>
@@ -1926,7 +1923,6 @@ Language: es_MX
     <string name="checking_email">Comprobando correo electrónico</string>
     <string name="magic_link_unavailable_error_message">Actualmente no disponible. Por favor, introduce tu contraseña</string>
     <string name="logging_in">Accediendo</string>
-    <string name="enter_your_password_instead">Introduce tu contraseña</string>
     <string name="web_address_dialog_hint">Cuando comentes se hará público</string>
     <string name="capture_or_pick_photo">Captura o elige imagen</string>
     <string name="plan">Plan</string>
@@ -2047,7 +2043,7 @@ Language: es_MX
     <string name="site_settings_paging_dialog_description">Rompe los hilos de comentarios en múltiples páginas</string>
     <string name="site_settings_paging_dialog_header">Comentarios por página</string>
     <string name="site_settings_close_after_dialog_title">Cerrar los comentarios</string>
-    <string name="site_settings_blacklist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, así \"press\" coincidirá con \"WordPress.\"</string>
+    <string name="site_settings_denylist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, así \"press\" coincidirá con \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Cuando un comentario contenga alguna de las estas palabras en su contenido, nombre, URL, correo electrónico o IP, será puesto en la cola para moderar. Puedes introducir palabras parciales, así \"press\" coincidirá como \"Wordpress\"</string>
     <string name="site_settings_list_editor_input_hint">Introduce una palabra o frase</string>
     <string name="site_settings_list_editor_no_items_text">Sin elementos</string>
@@ -2062,10 +2058,10 @@ Language: es_MX
     <string name="site_settings_rp_show_header_title">Mostrar cabecera</string>
     <string name="site_settings_rp_switch_summary">Las entradas relacionadas muestran contenido relevante de tu sitio debajo de las entradas.</string>
     <string name="site_settings_rp_switch_title">Mostrar entradas relacionadas</string>
-    <string name="site_settings_blacklist_hint">Los comentarios que coinciden con un filtro, son marcados como spam</string>
+    <string name="site_settings_denylist_hint">Los comentarios que coincidan con un filtro son marcados como spam</string>
     <string name="site_settings_moderation_hold_hint">Los comentarios que coinciden con un filtro, son puestos en la cola para moderar</string>
     <string name="site_settings_multiple_links_hint">Ignorar límite de enlaces de usuarios conocidos</string>
-    <string name="site_settings_whitelist_hint">El autor de un comentario debe tener aprobado un comentario previo</string>
+    <string name="site_settings_allowlist_hint">El autor del comentario debe tener un comentario aprobado previamente</string>
     <string name="site_settings_user_account_required_hint">Los usuarios deben estar registrados e iniciar sesión para comentar</string>
     <string name="site_settings_identity_required_hint">El autor de un comentario debe rellenar el nombre y correo eléctronico</string>
     <string name="site_settings_paging_hint">Mostrar los comentarios en pedazos de un tamaño especificado</string>
@@ -2088,17 +2084,16 @@ Language: es_MX
     <string name="site_settings_address_hint">El cambio de dirección no está soportado en este momento</string>
     <string name="site_settings_tagline_hint">Una descripción corta o frase ingeniosa que describa tu blog</string>
     <string name="site_settings_title_hint">En pocas palabras, explica sobre que es este sitio</string>
-    <string name="site_settings_whitelist_known_summary">Comentarios de usuarios conocidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentarios de todos los usuarios</string>
+    <string name="site_settings_allowlist_known_summary">Comentarios de usuarios conocidos</string>
+    <string name="site_settings_allowlist_all_summary">Comentarios de todos los usuarios</string>
     <string name="site_settings_threading_summary">%d niveles</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Borrar el sitio</string>
-    <string name="site_settings_blacklist_title">Lista negra</string>
     <string name="site_settings_moderation_hold_title">Mantener para moderación</string>
     <string name="site_settings_multiple_links_title">Enlaces en comentarios</string>
-    <string name="site_settings_whitelist_title">Aprobar automáticamente</string>
+    <string name="site_settings_allowlist_title">Aprobar automáticamente</string>
     <string name="site_settings_paging_title">Paginación</string>
     <string name="site_settings_threading_title">Comentarios anidados</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -2245,7 +2240,6 @@ Language: es_MX
     <string name="stats_search_terms_unknown_search_terms">Términos de búsqueda desconocidos</string>
     <string name="reader_empty_posts_request_failed">No se pudieron recuperar las entradas</string>
     <string name="post_uploading">Subiendo entrada</string>
-    <string name="reader_page_recommended_blogs">Sitios que te podrían gustar</string>
     <string name="error_copy_to_clipboard">Ocurrió un error al copiar el texto en el portapapeles</string>
     <string name="reader_empty_posts_in_blog">Este sitio está vacío</string>
     <string name="reader_label_new_posts">Nuevas entradas</string>
@@ -2313,7 +2307,6 @@ Language: es_MX
     <string name="help">Ayuda</string>
     <string name="ssl_certificate_ask_trust">SI normalmente se conecta sin problemas a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
     <string name="ssl_certificate_error">Certificado SSL no válido</string>
-    <string name="forgot_password">¿Has olvidado la contraseña?</string>
     <string name="adding_cat_failed">No se pudo añadir la categoría</string>
     <string name="error_refresh_comments">No se pudieron actualizar los comentarios</string>
     <string name="error_load_comment">No se pudo cargar el comentario</string>
diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml
index 4b4e3d96e84d..0a251bc58d73 100644
--- a/WordPress/src/main/res/values-es-rVE/strings.xml
+++ b/WordPress/src/main/res/values-es-rVE/strings.xml
@@ -1,11 +1,463 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 06:06:04+0000
+Translation-Revision-Date: 2021-05-20 20:56:34+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: es_VE
 -->
 <resources>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Toca dos veces para añadir un enlace.</string>
+    <string name="gutenberg_native_add_link">AÑADIR ENLACE</string>
+    <string name="login_empty_view_try_another_account">Probar con otra cuenta</string>
+    <string name="login_empty_view_see_instructions">Ver las instrucciones</string>
+    <string name="login_no_jetpack_sites_error_message">Si ya tienes un sitio, tendrás que instalar el plugin gratuito de Jetpack y conectarlo a tu cuenta de WordPress.</string>
+    <string name="login_empty_view_avatar_content_description">Tu foto de perfil</string>
+    <string name="login_not_a_jetpack_site">Si quieres usar esta aplicación para %1$s, deberás tener el plugin de Jetpack configurado y conectado a una cuenta de WordPress.com.</string>
+    <string name="gutenberg_native_size">Tamaño</string>
+    <string name="gutenberg_native_move_image_forward">Mover la imagen hacia delante</string>
+    <string name="gutenberg_native_move_image_backward">Mover la imagen hacia atrás</string>
+    <string name="gutenberg_native_image_settings">Ajustes de imagen</string>
+    <string name="gutenberg_native_audio_settings">Ajustes de audio</string>
+    <string name="user_profile_untitled_site">(Sin título)</string>
+    <string name="user_profile_site_section_header">Sitio</string>
+    <string name="user_profile_bottom_sheet_description">Información de hoja inferior del perfil de usuario</string>
+    <string name="likes_list_screen_title">Lista de Me gusta %s</string>
+    <string name="gutenberg_native_write_code">Escribe código…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Ordenación y filtrado</string>
+    <string name="gutenberg_native_show_download_button">Mostrar el botón de descarga</string>
+    <string name="gutenberg_native_shortcode">Shortcode </string>
+    <string name="gutenberg_native_read_more">Leer más</string>
+    <string name="gutenberg_native_preload">Precarga</string>
+    <string name="gutenberg_native_post_meta_settings">Ajustes meta de la entrada</string>
+    <string name="gutenberg_native_post_content_settings">Ajustes del contenido de la entrada</string>
+    <string name="gutenberg_native_metadata">Metadatos</string>
+    <string name="gutenberg_native_media_file">Archivo de medios</string>
+    <string name="gutenberg_native_media_area">Área de medios</string>
+    <string name="gutenberg_native_loop">Repetir</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Enlazar a</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">imagen %1$d de %2$d en la biblioteca</string>
+    <string name="gutenberg_native_heading_d">Encabezado %d</string>
+    <string name="gutenberg_native_featured">Destacado</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Introduce aquí la URL a incrustar…</string>
+    <string name="gutenberg_native_edit_image">Editar la imagen</string>
+    <string name="gutenberg_native_display_post_date">Mostrar la fecha de la entrada</string>
+    <string name="gutenberg_native_code">Código</string>
+    <string name="gutenberg_native_change_heading_level">Cambiar el nivel del encabezado</string>
+    <string name="gutenberg_native_browser_default">Navegador por defecto</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">El bloque se ha borrado o no está disponible.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">El bloque no se puede procesar dentro de sí mismo.</string>
+    <string name="gutenberg_native_autoplay">Reproducción automática</string>
+    <string name="gutenberg_native_auto">Automático</string>
+    <string name="gutenberg_native_attachment_page">Página de adjuntos</string>
+    <string name="gutenberg_native_add_text">Añade texto…</string>
+    <string name="gutenberg_native_add_caption">Añadir leyenda</string>
+    <string name="login_no_jetpack_sites">No se han encontrado sitios de Jetpack</string>
+    <string name="gutenberg_native_what_is_alt_text">¿Qué es el texto alt?</string>
+    <string name="gutenberg_native_transform_s_to">Transformar %s a</string>
+    <string name="gutenberg_native_transform_block">Transformar bloque…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Fallo al insertar los medios.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Fallo al insertar el archivo de audio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Describe el propósito de la imagen. Déjalo vacío si la imagen es puramente decorativa.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s transformado a %2$s</string>
+    <string name="like_faces_error_loading_message">Error al cargar los datos de me gusta. %s</string>
+    <string name="like_faces_plural_text">A %d blogueros les gusta esto.</string>
+    <string name="like_faces_singular_text">A 1 bloguero le gusta esto.</string>
+    <string name="like_title_plural">%d me gusta</string>
+    <string name="like_title_singular">1 me gusta</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Introduce las credenciales de tu servidor para corregir las amenazas.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Introduce las credenciales de tu servidor para corregir la amenaza.</string>
+    <string name="suggestion">Sugerencia:</string>
+    <string name="gutenberg_native_search_blocks">Bloques de búsqueda</string>
+    <string name="gutenberg_native_search_block">Bloque de búsqueda</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">doble-toque para cambiar la unidad</string>
+    <string name="gutenberg_native_clear_search">Vaciar la búsqueda</string>
+    <string name="gutenberg_native_cancel_search">Cancelar la búsqueda</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s is %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Ocurrió un error al obtener los datos de los me gusta</string>
+    <string name="get_likes_unknown_error">Ocurrió un error al obtener los me gusta.</string>
+    <string name="get_likes_no_network_error">No hay ninguna red disponible.</string>
+    <string name="comments_empty_list_filtered_unreplied">No hay ningún comentario sin responder</string>
+    <string name="comment_status_unreplied">Sin responder</string>
+    <string name="gutenberg_native_table_of_contents">Tabla de contenidos</string>
+    <string name="gutenberg_native_summary">resumen</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Resume tu entrada con una lista de encabezados. Añade anclas HTML a los bloques de encabezados para enlazarlos aquí.</string>
+    <string name="gutenberg_native_document_outline">esquema del documento</string>
+    <string name="gutenberg_native_buttongroup">Grupo de botones</string>
+    <string name="jetpack_brute_force_allowlist_title">Direcciones IP siempre permitidas</string>
+    <string name="site_settings_denylist_title">Palabras rechazadas en comentarios</string>
+    <string name="reader_title_interests">Seguir temas</string>
+    <string name="stories_intro_main_subtitle">Una nueva forma de crear y publicar contenidos atrayentes en tu sitio.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Descartar</string>
+    <string name="activity_log_backup_download_notice_download_action">Descargar</string>
+    <string name="threat_fix_all_status_success_message_plural">Amenazas corregidas correctamente.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Por favor, confirma que quieres corregir todas las %s amenazas activas.</string>
+    <string name="scan_idle_threats_description_plural">La exploración ha encontrado %1$s amenazas potenciales con %2$s. Por favor, revísalas a continuación y lleva a cabo alguna acción o toca el botón de corregir todo. Estamos %3$s si nos necesitas.</string>
+    <string name="scan_fixing_threats_description_plural">Trabajamos duro para corregir estas amenazas en segundo plano. Mientras tanto puedes seguir usando tu sitio como siempre, puedes volver a comprobar el progreso en cualquier momento.</string>
+    <string name="gutenberg_native_edit_focal_point">Editar el punto focal</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Toque doble para abrir la hoja del fondo para editar, reemplazar o vaciar la imagen</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Toque doble para abrir la hoja de acción para editar, reemplazar o vaciar la imagen</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Teclea un nombre para tu sitio</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Se han completado todas las tareas&lt;/b&gt;&lt;br/&gt;Has llegado a más gente. ¡Buen trabajo!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Se han completado todas las tareas&lt;/b&gt;&lt;br/&gt;Has personalizado tu sitio. ¡Bien hecho!</string>
+    <string name="quick_start_card_menu_hide">Ocultar por ahora</string>
+    <string name="magic_link_not_meaning_to_create_account">¿No querías crear una nueva cuenta? Vuelve atrás y vuelve a introducir tu dirección de correo electrónico.</string>
+    <string name="invite_links_disable_dialog_message">Una vez desactivado el enlace de invitación, nadie podrá usarlo para unirse a tu equipo. ¿Seguro que deseas continuar?</string>
+    <string name="invite_links_disable_dialog_title">Desactivar enlace de invitación</string>
+    <string name="invite_links_bad_format_response">Respuesta recibida no válida</string>
+    <string name="invite_links_null_response">No se ha recibido ninguna respuesta</string>
+    <string name="invite_links_cannot_get_role_data_error">Ocurrió un error al recuperar datos para el perfil %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Ha habido un error al obtener los perfiles</string>
+    <string name="invite_links_generic_get_data_error">Error desconocido al obtener los datos de los enlaces de invitación</string>
+    <string name="invite_links_helper_text">Utiliza este enlace para embarcar a los miembros de tu equipo sin tener que invitarlos uno a uno. Cualquiera que visite estas URL podrá registrarse en tu organización, aunque haya recibido el enlace de otra persona, así que asegúrate de que lo compartes con gente de confianza.</string>
+    <string name="invite_links_expire_date">Caduca %1$s</string>
+    <string name="invite_links_disable_invite_link">Desactivar enlace de invitación</string>
+    <string name="invite_links_share_invite_link">Compartir enlace de invitación</string>
+    <string name="invite_links_generate">Generar nuevo enlace de invitación</string>
+    <string name="invite_links_get_status_retry">Refrescar el estado del enlace</string>
+    <string name="invite_links_section_title">Enlace de invitación</string>
+    <string name="threats_found_singular">Se ha encontrado una amenaza</string>
+    <string name="threats_found_plural">Se han encontrado amenazas</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;%s amenazas potenciales encontradas</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;Una amenaza potencial encontrada</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;No se han encontrado amenazas potenciales</string>
+    <string name="scan_fixing_threats_title_singular">Corrigiendo la amenaza</string>
+    <string name="disable">Desactivar</string>
+    <string name="quick_start_card_menu_unpin">Desanclar</string>
+    <string name="quick_start_list_review_pages_subtitle">Revisa tus páginas y haz cambios, o añade o elimina páginas.</string>
+    <string name="quick_start_list_view_site_title">Visita tu sitio</string>
+    <string name="quick_start_list_upload_icon_subtitle">Añade un icono del sitio para un aspecto pulcro, profesional.</string>
+    <string name="quick_start_list_follow_site_subtitle">Descubre y sigue sitios que te inspiren.</string>
+    <string name="quick_start_list_enable_sharing_title">Activar compartir</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Comparte automáticamente las nuevas entradas en tus medios sociales.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Dale un nombre a tu sitio que refleje su personalidad y temática.</string>
+    <string name="quick_start_list_check_stats_title">Revisa tus estadísticas</string>
+    <string name="backup_download_status_failure_bullet2">Trataremos de crear un archivo de copia de seguridad descargable.</string>
+    <string name="backup_download_status_failure_bullet1">No hemos podido encontrar el estado para decir cuánto tardará tu copia de seguridad descargable.</string>
+    <string name="backup_download_status_failure_heading">Vaya, no hemos podido encontrar el estado de tu copia de seguridad descargable</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icono de marca de comprobación</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icono de reloj</string>
+    <string name="restore_status_failure_bullet3">Te avisaremos cuando hayamos terminado.</string>
+    <string name="restore_status_failure_bullet2">Volveremos a intentar restaurar tu sitio.</string>
+    <string name="restore_status_failure_bullet1">No hemos podido encontrar el estado para decir cuánto tardará tu restauración.</string>
+    <string name="restore_status_failure_heading">Vaya, no hemos podido encontrar el estado de tu restauración</string>
+    <string name="restore_complete_failed_description">No hemos podido restaura tu sitio</string>
+    <string name="restore_warning_action_button">Confirmar</string>
+    <string name="restore_warning_description_with_two_parameters">¡Estás seguro de querer revertir tu sitio al %1$s a las %2$s?\nTodo lo que hayas cambiado desde entonces se perderá.</string>
+    <string name="backup_download_complete_failed_description">No hemos podido crear tu copia de seguridad</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(excluye temas, plugins y subidas)</string>
+    <string name="backup_item_contents">Directorio wp-content</string>
+    <string name="backup_item_roots">Raíz de WordPress</string>
+    <string name="backup_download_details_choose_items_header">Elementos incluidos en esta descarga</string>
+    <string name="gutenberg_native_uploading">Subiendo…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Los bloques reutilizables no se pueden editar en WordPress para iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Los bloques reutilizables no se pueden editar en WordPress para Android</string>
+    <string name="gutenberg_native_replace_file">Reemplazar archivo</string>
+    <string name="gutenberg_native_replace_audio">Reemplazar audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problema al abrir el audio</string>
+    <string name="gutenberg_native_open">ABIERTO</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Ninguna aplicación puede gestionar esta solicitud.</string>
+    <string name="gutenberg_native_lock_icon">Icono de candado</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Fallo al insertar el archivo de audio. Por favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Toca dos veces para seleccionar un archivo de audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Toca dos veces para escuchar el archivo de audio</string>
+    <string name="gutenberg_native_choose_audio">Elegir audio</string>
+    <string name="gutenberg_native_audio_player">Reproductor de audio</string>
+    <string name="gutenberg_native_audio_file">archivo de audio</string>
+    <string name="gutenberg_native_audio_caption_s">Leyenda del audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Leyenda del audio. Vacía</string>
+    <string name="gutenberg_native_add_audio">AÑADIR AUDIO</string>
+    <string name="continue_with_wpcom">Accede o regístrate con WordPress.com</string>
+    <string name="photo_picker_use_audio">Usasr este audio</string>
+    <string name="photo_picker_choose_audio">Elige un audio del dispositivo</string>
+    <string name="people_optional_custom_message_helper_text">Opcional: Introduce un mensaje personalizado que enviar con tu invitación.</string>
+    <string name="people_learn_more_about_roles">Aprende más sobre los perfiles</string>
+    <string name="threat_status_fixed">Corregido</string>
+    <string name="threat_found_header">Encontrado</string>
+    <string name="scan_here_to_help">aquí para ayudar</string>
+    <string name="scan_idle_threats_description_singular">La exploración ha encontrado una amenaza potencial con %1$s. Por favor, revísalas a continuación y lleva a cabo alguna acción o toca el botón de corregir todo. Estamos %2$s si nos necesitas.</string>
+    <string name="scan_idle_manual_scan_description">Para revisar tu sitio de nuevo ejecuta una exploración manual, o espera a que Jetpack explore tu sitio más tarde hoy mismo. </string>
+    <string name="scan_provisioning_description">¡Bienvenido a la exploración de Jetpack! Le estamos echando un vistazo a tu web para dejarlo todo a punto para el primer análisis completo. Te informaremos si encontramos algún problema que le pueda afectar y después comenzará tu primer análisis.</string>
+    <string name="scan_scanning_is_initial_description">Bienvenido a la herramienta de exploración de Jetpack, estamos echándole un primer vistazo a tu web en estos momentos, te mostraremos los resultados enseguida.</string>
+    <string name="scan_fixing_threats_description_singular">Trabajamos duro para corregir estas amenazas en segundo plano. Mientras tanto puedes seguir usando tu sitio como siempre, puedes volver a comprobar el progreso en cualquier momento.</string>
+    <string name="scan_scanning_description">Te enviaremos un email cuando se haya completado la exploración. Mientras tanto puedes continuar usando tu web como siempre. Puedes volver a revisar cómo va el proceso de exploración en cualquier momento.</string>
+    <string name="scan_fixing_threats_title_plural">Corrigiendo amenazas</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan no ha podido realizar un análisis de tu sitio. Comprueba si tu sitio está caído. Si no, vuelve a intentarlo. Si tu sitio está caído o si Jetpack Scan sigue teniendo problemas, ponte en contacto con nuestro equipo de soporte.</string>
+    <string name="scan_request_failed_title">Algo ha salido mal</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Haciendo copia de seguridad del sitio</string>
+    <string name="activity_log_currently_backing_up_message">Haciendo copia de seguridad del sitio desde %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Creando una copia de seguridad descargable</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">La copia de seguridad de tu sitio se ha realizado correctamente</string>
+    <string name="activity_log_backup_finished_snackbar_message">La copia de seguridad de tu sitio se ha realizado correctamente\nHecha copia de seguridad desde %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">La copia de seguridad de tu sitio se está realizando\nHaciendo copia de seguridad desde %1$s %2$s</string>
+    <string name="pick_audio">Elegir audio</string>
+    <string name="restore_another_process_running">Hay otra restauración en curso.</string>
+    <string name="restore_complete_failed_icon_content_description">Icono de error</string>
+    <string name="restore_complete_failed_action_button_content_description">Botón Listo</string>
+    <string name="restore_complete_failed_title">No se ha podido restaurar</string>
+    <string name="restore_complete_visit_site_button_content_description">Botón Visitar sitio</string>
+    <string name="restore_complete_done_button_content_description">Botón Listo</string>
+    <string name="restore_complete_icon_content_description">Icono de restaurar</string>
+    <string name="restore_complete_visit_site_action_button">Visitar el sitio</string>
+    <string name="restore_complete_description_with_two_parameters">Todos los elementos seleccionados se han restaurado a la versión del %1$s %2$s.</string>
+    <string name="restore_complete_header">Tu sitio se ha restaurado</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">No hace falta que esperes. Te enviaremos un aviso cuando la restauración se haya completado.</string>
+    <string name="restore_progress_icon_content_description">Icono de restaurar sitio</string>
+    <string name="restore_progress_description_with_two_parameters">Estamos restaurando la versión de tu sitio del %1$s %2$s.</string>
+    <string name="restore_progress_header">Estamos restaurando el sitio</string>
+    <string name="restore_warning_action_button_content_description">Botón Confirmar restauración del sitio</string>
+    <string name="restore_warning_icon_content_description">Imagen de un círculo rojo con un signo de exclamación</string>
+    <string name="restore_warning_header">Advertencia</string>
+    <string name="restore_details_action_button_content_description">Botón Restaurar sitio</string>
+    <string name="restore_details_icon_content_description">Icono de restaurar</string>
+    <string name="restore_details_action_button">Restaurar sitio</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s es el punto seleccionado para la restauración.</string>
+    <string name="restore_details_header">Restaurar sitio</string>
+    <string name="restore_details_choose_items_header">Elige los elementos que quieres restaurar:</string>
+    <string name="restore">Restaurar</string>
+    <string name="backup_download_complete_failed_icon_content_description">Nube con icono de X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Botón Listo</string>
+    <string name="backup_download_complete_failed_action_button">Listo</string>
+    <string name="backup_download_complete_failed_title">La descarga ha fallado</string>
+    <string name="web_preview_tablet">Tableta</string>
+    <string name="web_preview_mobile">Dispositivos móviles</string>
+    <string name="quick_start_card_menu_remove">No mostrar de nuevo</string>
+    <string name="quick_start_card_menu_pin">Anclar</string>
+    <string name="quick_start_dialog_review_pages_message_short">Selecciona %1$s Páginas %2$s para ver tu lista de páginas.</string>
+    <string name="quick_start_dialog_review_pages_message">Cambia, añade o elimina páginas en tu sitio.</string>
+    <string name="quick_start_dialog_review_pages_title">Revisar las páginas del sitio</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Selecciona %1$s Página de inicio %2$s para editar tu página de inicio.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Selecciona %1$s Páginas %2$s para ver tu lista de páginas.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Cambia, añade o elimina contenido en la página de inicio de tu sitio.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Editar la página de inicio</string>
+    <string name="reader_menu_mark_as_unseen">Marcar como no leída</string>
+    <string name="reader_menu_mark_as_seen">Marcar como leída</string>
+    <string name="error_media_upload_failed_for_reason">No se han podido subir los elementos multimedia.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Espacio de almacenamiento del sitio insuficiente</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">No se puede activar o desactivar el estado Es visible de esta entrada</string>
+    <string name="reader_marked_post_as_unseen">Marcar entrada como no leída</string>
+    <string name="reader_marked_post_as_seen">Marcar entrada como leída</string>
+    <string name="threat_fix_all_status_error_message">Se ha producido un error al comprobar el estado de la reparación. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_fix_all_status_success_message_singular">La amenaza se ha corregido correctamente.</string>
+    <string name="threat_fix_all_error_message">Se ha producido un error al corregir las amenazas. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Por favor, confirma que quieres corregir una amenaza activa.</string>
+    <string name="threat_fix_all_warning_title">Corregir todas las amenazas</string>
+    <string name="threat_ignore_error_message">No se ha podido ignorar la amenaza. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_ignore_success_message">Se ha ignorado la amenaza.</string>
+    <string name="threat_ignore_warning">No deberías ignorar un problema de seguridad a menos que estés absolutamente seguro de que no es dañino. Si eliges ignorar esta amenaza seguirá en tu sitio &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">No se ha podido corregir la amenaza. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_item_sub_header_status_ignored">Amenaza ignorada</string>
+    <string name="threat_item_sub_header_status_fixed_on">Amenaza corregida el %s</string>
+    <string name="threat_fixing">Corrigiendo la amenaza</string>
+    <string name="scan_history_ignored_threats_tab">Se ha ignorado</string>
+    <string name="scan_history_no_threats_found">No se encontró ningún elemento</string>
+    <string name="scan_history_fixed_threats_tab">Fijo</string>
+    <string name="scan_history_all_threats_tab">Todos</string>
+    <string name="scan_scanning_title">Analizando archivos</string>
+    <string name="scan_preparing_to_scan_title">Preparando escaneado</string>
+    <string name="scan_history_menu_title">Historia</string>
+    <string name="scan_history">Historial de exploraciones</string>
+    <string name="backup_active_filter_empty_subtitle">Prueba a ajustar el rango de fechas</string>
+    <string name="backup_active_filter_empty_title">No se han encontrado copias de seguridad coincidentes</string>
+    <string name="backup_empty_subtitle">Tu primera copia de seguridad estará disponible aquí en 24 horas y recibirás una notificación una vez que se haya completado</string>
+    <string name="backup_empty_title">Tu primera copia de seguridad estará lista pronto</string>
+    <string name="request_failed_message">Ha ocurrido un problema al gestionar la petición. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="gutenberg_native_move_to_bottom">Mover al final</string>
+    <string name="gutenberg_native_change_block_position">Cambiar la posición del bloque</string>
+    <string name="label_control_upload">Subir</string>
+    <string name="jetpack_icon_content_description">Icono</string>
+    <string name="backup_download_complete_info">También hemos enviado un enlace a tu archivo.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Botón de compartir enlace</string>
+    <string name="backup_download_complete_download_action_button_content_description">Botón de descarga</string>
+    <string name="backup_download_complete_icon_content_description">Icono de copia de seguridad descargable lista</string>
+    <string name="backup_download_complete_download_share_action_button">Compartir enlace</string>
+    <string name="backup_download_complete_download_action_button">Descargar</string>
+    <string name="backup_download_complete_description_with_two_parameters">Hemos creado una copia de seguridad de tu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Tu copia de seguridad ya está disponible para descargarla</string>
+    <string name="backup_download_complete_page_title">Tu copia de seguridad</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">No hace falta que esperes. Te avisaremos cuando la copia de seguridad esté lista</string>
+    <string name="backup_download_progress_icon_content_description">Icono de copia de seguridad descargable en curso</string>
+    <string name="backup_download_progress_description_with_two_parameters">Estamos creando una copia de seguridad descargable de tu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Se está creando una copia de seguridad descargable de tu sitio</string>
+    <string name="backup_download_progress_page_title">Descargar copia de seguridad</string>
+    <string name="backup_download_another_download_running">Hay otra descarga en curso.</string>
+    <string name="backup_download_generic_failure">Ha ocurrido un problema al gestionar la petición. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="backup_download_details_action_button_content_description">Botón Crear copia de seguridad descargable</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s es el punto seleccionado para crear una copia de seguridad descargable.</string>
+    <string name="gutenberg_native_image_link_url">URL del vínculo de la imagen</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">entrada cruzada</string>
+    <string name="suggestion_user">usuario</string>
+    <string name="suggestion_no_matching">No coincide con %s.</string>
+    <string name="suggestion_problem">Ha ocurrido un problema al cargar las sugerencias.</string>
+    <string name="suggestion_none">No hay sugerencias %s disponibles.</string>
+    <string name="suggestion_selection_needed">Escribe algo para filtrar la lista de sugerencias.</string>
+    <string name="threat_get_free_estimate">Consigue un presupuesto gratuito</string>
+    <string name="threat_ignore">Ignorar amenaza</string>
+    <string name="threat_fix">Corregir amenaza</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan solucionará la amenaza.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan editará el archivo o el directorio afectados.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan se actualizará a una versión más reciente (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan borrará el archivo o el directorio afectados.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan reemplazará el archivo o el directorio afectados.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan no puede solucionar automáticamente esta amenaza.\n Te sugerimos que soluciones esta amenaza manualmente: asegúrate de que WordPress, tu tema y todos los plugins están actualizados y elimina el código, tema o plugin que esté causando problemas en tu sitio web. \n \n\n Si necesitas más ayuda para resolver esta amenaza, te recomendamos &lt;b&gt;Codeable&lt;/b&gt;, una plataforma de profesionales de confianza, altamente cualificados, expertos en WordPress.\n Han hecho una selección de expertos en seguridad para ayudarnos con estos proyectos. Los precios oscilan entre 70–120 USD/hora y puedes obtener un presupuesto gratuito sin compromiso.</string>
+    <string name="threat_fix_current_not_fixable_header">Solucionando la amenaza</string>
+    <string name="threat_fix_fixed_header">¿Cómo lo solucionó Jetpack?</string>
+    <string name="threat_fix_default_header">¿Cómo vamos a repararlo?</string>
+    <string name="threat_file_description">Amenaza detectada en el archivo:</string>
+    <string name="threat_technical_details_header">Información técnica</string>
+    <string name="threat_problem_header">¿Cuál fue el problema?</string>
+    <string name="threat_details">Detalles de la amenaza</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Se ha encontrado una vulnerabilidad en un tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Se ha encontrado una vulnerabilidad en un plugin</string>
+    <string name="threat_item_sub_header_file_signature">Amenaza encontrada %s</string>
+    <string name="threat_item_sub_header_core_file">Se ha encontrado una vulnerabilidad en WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Varias vulnerabilidades</string>
+    <string name="threat_item_header_vulnerable_theme">Tema vulnerable: %s (versión %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Plugin vulnerable: %s (versión %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: patrón de código malicioso</string>
+    <string name="threat_item_header_database_threat">Amenazas de base de datos %s</string>
+    <string name="threat_item_header_infected_core_file">%s: archivo principal infectado</string>
+    <string name="threat_item_header_threat_found">Se ha encontrado una amenaza</string>
+    <string name="threats_fix_all">Corregir todo</string>
+    <string name="scan_in_few_seconds">en unos segundos</string>
+    <string name="scan_in_minutes_ago">hace %s minuto(s)</string>
+    <string name="scan_in_hours_ago">hace %s hora(s)</string>
+    <string name="scan_this_site">este sitio</string>
+    <string name="scan_idle_last_scan_description">La última exploración de Jetpack se ejecutó %s y no encontró ningún riesgo. %s</string>
+    <string name="scan_idle_threats_found_title">Puede que tu sitio web esté desprotegido</string>
+    <string name="scan_idle_no_threats_found_title">No te preocupes</string>
+    <string name="scan_again">Analizar de nuevo</string>
+    <string name="scan_now">Analizar ahora</string>
+    <string name="scan_state_icon">Icono de estado del análisis</string>
+    <string name="backup">Copias de seguridad</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtro de tipo de actividad (%s tipos seleccionados)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (mostrando %s elementos)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtro de tipo de actividad</string>
+    <string name="activity_log_activity_type_empty_subtitle">No se han registrado actividades en el rango de fechas seleccionado.</string>
+    <string name="activity_log_activity_type_empty_title">No hay actividades disponibles</string>
+    <string name="activity_log_activity_type_error_subtitle">Revisa tu conexión a Internet e inténtalo de nuevo.</string>
+    <string name="activity_log_activity_type_error_title">Sin conexión</string>
+    <string name="activity_log_activity_type_filter_active_label">Tipo de actividad (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtro de rango de fechas</string>
+    <string name="activity_log_active_filter_empty_subtitle">Intenta ajustar los filtros de rango de fecha o de tipo de actividad</string>
+    <string name="activity_log_active_filter_empty_title">No se han encontrado eventos coincidentes</string>
+    <string name="backup_item_sqls">Base de datos del sitio</string>
+    <string name="backup_item_roots_hint">(incluye wp-config.php y cualquier archivo que no sea de WordPress)</string>
+    <string name="backup_item_media_uploads">Subidas de medios</string>
+    <string name="backup_item_plugins">Plugins de WordPress</string>
+    <string name="backup_item_themes">Temas de WordPress</string>
+    <string name="backup_download_details_icon_content_description">Crea un icono de copia de seguridad descargable</string>
+    <string name="backup_download_details_action_button">Crear un archivo descargable</string>
+    <string name="backup_download_details_header">Crear una copia de seguridad descargable</string>
+    <string name="backup_download_details_page_title">Descargar copia de seguridad</string>
+    <string name="backup_download">Descarga de la copia de seguridad</string>
+    <string name="gutenberg_native_error">Error</string>
+    <string name="gutenberg_native_choose_file">Elegir archivo</string>
+    <string name="activity_log_item_menu_download_backup_label">Descargar copia de seguridad</string>
+    <string name="activity_log_item_menu_restore_label">Restaurar hasta este punto</string>
+    <string name="activity_log_activity_type_filter_label">Tipo de actividad</string>
+    <string name="activity_log_date_range_filter_label">Rango de fechas</string>
+    <string name="activity_log_activity_type_filter_header">Filtrar por tipo de actividad</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiar la versión de esta aplicación</string>
+    <string name="dialog_confirm_copy_local_edit_button">Editar la entrada primero</string>
+    <string name="dialog_confirm_copy_local_message">La entrada que estás tratando de copiar tiene dos versiones que están en conflicto o has hecho cambios recientemente, pero no los has guardado.\nEdita la entrada primero para resolver cualquier conflicto o procede a copiar la versión de esta aplicación.</string>
+    <string name="dialog_confirm_copy_local_title">Conflicto de sincronización de la entrada</string>
+    <string name="button_copy">Duplicar</string>
+    <string name="toast_edit_story_update_in_progress_title">La historia está siendo guardada, por favor, espera…</string>
+    <string name="gutenberg_native_file_name">Nombre del archivo</string>
+    <string name="gutenberg_native_file_block_settings">Ajustes del archivo del bloque</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Fallo al subir los archivos.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Fallo al guardar los medios.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_edit_file">Editar el archivo</string>
+    <string name="gutenberg_native_copy_file_url">Copiar la URL del archivo </string>
+    <string name="gutenberg_native_choose_a_file">ELEGIR UN ARCHIVO</string>
+    <string name="new_site_creation_domain_header_title">Elige un dominio</string>
+    <string name="my_site_btn_jetpack_settings">Ajustes de Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Siguiendo la conversación por correo electrónico</string>
+    <string name="reader_btn_follow_comments">Seguir la conversación por correo electrónico</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">No se ha podido anular la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">No se ha podido crear la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_follow_comments_get_status_error">Error al recuperar el estado de suscripción para la entrada</string>
+    <string name="reader_follow_comments_unsubscribe_success">Cancelada correctamente la suscripción a los comentarios</string>
+    <string name="reader_follow_comments_subscribe_success">Suscrito correctamente a los comentarios</string>
+    <string name="reader_follow_comments_bad_format_response">Respuesta recibida no válida</string>
+    <string name="reader_follow_comments_null_response">No se ha recibido ninguna respuesta</string>
+    <string name="activity_log_activity_type_filter_clear">Vaciar</string>
+    <string name="activity_log_activity_type_filter_apply">Aplicar</string>
+    <string name="dialog_edit_story_unsupported_format_message">Una o más diapositivas no se han añadido a tu historia porque en este momento las historias no son compatibles con archivos GIF. Por favor, elige una imagen estática o un vídeo de fondo en su lugar.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Los archivos GIF no son compatibles</string>
+    <string name="dialog_edit_story_unrecoverable_message">No hemos podido encontrar en el sitio los medios para esta historia.</string>
+    <string name="dialog_edit_story_unrecoverable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_unavailable_message">No ha sido posible subir medios a esta historia. Comprueba tu conexión a Internet e inténtalo de nuevo dentro de un momento.</string>
+    <string name="dialog_edit_story_unavailable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_limited_message">Esta historia se ha editado en un dispositivo diferente y la posibilidad de editar ciertos objetos puede estar limitada.</string>
+    <string name="dialog_edit_story_limited_title">Edición limitada de la historia</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Los medios han sido eliminados. Intenta volver a crear tu historia.</string>
+    <string name="color_picker_label_background">Fondo</string>
+    <string name="color_picker_label_text">Texto</string>
+    <string name="dialog_discard_story_ok_button_edit">Descartar</string>
+    <string name="dialog_discard_story_message_edit">Cualquier cambio realizado no se guardará.</string>
+    <string name="dialog_discard_story_title_edit">¿Descartar cambios?</string>
+    <string name="label_done_button">Hecho</string>
+    <string name="label_next_button">Siguiente</string>
+    <string name="delete_button_alt">Borrar</string>
+    <string name="hpp_choose_error">Ocurrió un error al seleccionar el diseño.</string>
+    <string name="hpp_retry_error">Por favor, revisa tu conexión a Internet e inténtalo de nuevo.</string>
+    <string name="hpp_error_subtitle">Toca en reintentar cuando vuelvas a estar conectado.</string>
+    <string name="hpp_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="continue_site_credentials">Continuar con las credenciales de la tienda</string>
+    <string name="login_find_your_connected_email">Encuentra tu correo electrónico conectado</string>
+    <string name="reader_discover_no_posts_button_text">Seguir temas</string>
+    <string name="reader_discover_no_posts_subtitle">Prueba a seguir más temas para ampliar la búsqueda</string>
+    <string name="reader_discover_no_posts_title">No hay entradas recientes</string>
+    <string name="reader_discover_empty_title">¡Bienvenido!</string>
+    <string name="scan">Explorar</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Juan Gómez&lt;/b&gt; ha respondido en tu entrada</string>
+    <string name="login_prologue_third_subtitle_two">Hoy has recibido &lt;b&gt;50 me gusta&lt;/b&gt; en tu sitio</string>
+    <string name="login_prologue_third_subtitle_one">A &lt;b&gt;Madison Ruíz&lt;/b&gt; le ha gustado tu entrada</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Se ha abierto el menú de bloques desplazable. Selecciona un bloque.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Se ha cerrado el menú de bloques desplazable.</string>
+    <string name="hpp_skip_button">Omitir</string>
+    <string name="hpp_choose_button">Elegir</string>
+    <string name="hpp_subtitle">Elige el diseño de página de inicio que prefieras. Puedes personalizarlo o cambiarlo más tarde.</string>
+    <string name="hpp_title">Elige un diseño</string>
+    <string name="mlp_network_error_subtitle">Toca «Reintentar» cuando vuelvas a estar en línea o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_network_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="mlp_error_subtitle">Toca «Reintentar» o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_error_title">Los diseños no están disponibles debido a un error</string>
+    <string name="prepublishing_nudges_add_category_button">Añadir una categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Añadir una nueva categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorías</string>
+    <string name="prepublishing_nudges_home_categories_not_set">No establecido</string>
+    <string name="prepublishing_nudges_categories_action">Categorías</string>
+    <string name="login_prologue_fifth_caption_three">Museos en Londres</string>
+    <string name="login_prologue_fifth_caption_two">Los mejores fanáticos del mundo</string>
+    <string name="login_prologue_fifth_caption_one">Mis diez mejores cafés</string>
+    <string name="login_prologue_fifth_tag_six">Política</string>
+    <string name="login_prologue_fifth_tag_five">Música</string>
+    <string name="login_prologue_fifth_tag_four">Jardinería</string>
+    <string name="login_prologue_fifth_tag_three">Fútbol</string>
+    <string name="login_prologue_fifth_tag_two">Cocina</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' roll semanal</string>
+    <string name="login_prologue_fifth_subtitle_two">Noticias web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Estoy muy inspirado por el trabajo del fotógrafo Cameron Karsten. Probaré estas técnicas en mi próximo</string>
+    <string name="login_prologue_second_subtitle_one">Inspírate</string>
+    <string name="login_prologue_title_fifth">Sigue tus sitios favoritos y descubre nuevos blogs.</string>
+    <string name="login_prologue_title_fourth">Observa cómo crece tu audiencia con analíticas avanzadas.</string>
+    <string name="login_prologue_title_third">Mira los comentarios y avisos en tiempo real.</string>
+    <string name="login_prologue_title_second">Con el potente editor puedes publicar sobre la marcha.</string>
+    <string name="login_prologue_title_first">Bienvenido al maquetador web más popular del mundo.</string>
+    <string name="media_loading_failed">La carga del medio ha fallado</string>
+    <string name="reader_discover_recommended_blogs_header">Sitios a seguir</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos trabajando duro para añadir más bloques con cada versión.</string>
     <string name="gutenberg_native_s_is_not_fully_supported">«%s» no es totalmente compatible</string>
     <string name="gutenberg_native_help_button">Botón de ayuda</string>
@@ -18,19 +470,16 @@ Language: es_VE
     <string name="stories_intro_title_first">Ahora las historias son para todos</string>
     <string name="stories_intro_image_caption_second">Título de la entrada de historia</string>
     <string name="stories_intro_image_caption_first">Cómo crear una entrada de historias</string>
-    <string name="stories_intro_main_subtitle">Tienes acceso anticipado a las entradas de historias y nos encantaría que las probaras.</string>
     <string name="stories_intro_main_title">Presentación de las entradas de historias</string>
-    <string name="mlp_generic_error">Ha ocurrido un error al obtener los diseños</string>
     <string name="mlp_notice_blank_page_created">Página en blanco creada</string>
     <string name="mlp_notice_page_created">Página creada</string>
-    <string name="mlp_preview_title">Vista previa del diseño</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s ha denegado el acceso a tus fotos. Para corregirlo, edita tus permisos y activa %2$s y %3$s.</string>
     <string name="media_insert_failed">Inserción del medio fallida.</string>
     <string name="media_insert_failed_with_reason">Ha fallado la inserción del medio: %s</string>
     <string name="photo_picker_wordpress_media_library">Elige desde la biblioteca de medios de WordPress</string>
     <string name="reader_label_toolbar_back">Volver</string>
     <string name="reader_discover_empty_button_text">Primeros pasos</string>
-    <string name="reader_discover_empty_title">Sigue temáticas y descubre nuevos blogs</string>
+    <string name="reader_discover_empty_subtitle">Sigue temáticas para descubrir nuevos blogs</string>
     <string name="reader_post_details_header_by_author_name">por</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">Este referido no puede ser marcado como spam</string>
     <string name="stats_referrer_popup_unmark_as_spam">Desmarcar como spam</string>
@@ -41,10 +490,11 @@ Language: es_VE
     <string name="media_uploading_default">Subiendo medios</string>
     <string name="gutenberg_native_select_item">Seleccionar un elemento</string>
     <string name="gutenberg_native_search_or_type_url">Busca o escribe la URL</string>
+    <string name="gutenberg_native_page_break">Salto de página</string>
     <string name="gutenberg_native_add_this_telephone_link">Añadir este enlace de teléfono</string>
     <string name="gutenberg_native_add_this_link">Añadir este enlace</string>
     <string name="gutenberg_native_add_this_email_link">Añadir este enlace de correo electrónico</string>
-    <string name="suggestion_no_connection">«No hay conexión a Internet.\nNo están disponibles las sugerencias.»</string>
+    <string name="suggestion_no_connection">No hay conexión a Internet.\nNo están disponibles las sugerencias.</string>
     <string name="typeface_label_shrikhand">Negrita</string>
     <string name="typeface_label_space_mono">Moderno</string>
     <string name="typeface_label_pacifico">Alegre</string>
@@ -60,7 +510,6 @@ Language: es_VE
     <string name="comment_unable_to_show_error">No se puede mostrar este comentario</string>
     <string name="media_browse_for_items">Navegar por elementos</string>
     <string name="reader_menu_report_post">Informar de esta entrada</string>
-    <string name="gutenberg_native_angle">Ángulo</string>
     <string name="reader_welcome_banner">Bienvenido al Lector. Descubre millones de blogs a tu alcance.</string>
     <string name="error_media_xmlrcp_server_error">Ha ocurrido un error interno del servidor</string>
     <string name="error_media_xmlrpc_not_allowed">Tu acción no está permitida</string>
@@ -70,7 +519,6 @@ Language: es_VE
     <string name="create_post_story_fab_tooltip">Crear una entrada o historia</string>
     <string name="create_page_fab_tooltip">Crear una página</string>
     <string name="create_post_fab_tooltip">Crear una entrada</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">Puede que te guste</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ocultar</string>
     <string name="gutenberg_native_video_caption_empty">Leyenda del vídeo. Vacía</string>
@@ -109,7 +557,6 @@ Language: es_VE
     <string name="dialog_discard_errored_page_message">Esta diapositiva aún no ha sido guardada. Si borras esta diapositiva, perderás cualquier edición que hayas hecho.</string>
     <string name="dialog_discard_page_message">Esta diapositiva será eliminada de tu historia.</string>
     <string name="dialog_discard_page_title">¿Borrar la diapositiva de la historia?</string>
-    <string name="menu_delete_page">Borrar la diapositiva</string>
     <string name="label_text_color_button">Cambiar el color del texto</string>
     <string name="label_text_alignment_button">Cambiar la alineación del texto</string>
     <string name="label_frame_errored">con error</string>
@@ -119,8 +566,6 @@ Language: es_VE
     <string name="label_retry_icon">Reintentar</string>
     <string name="label_saved_icon">Guardado</string>
     <string name="label_close_button">Cerrar</string>
-    <string name="label_control_publish">Siguiente</string>
-    <string name="label_done">Hecho</string>
     <string name="label_share_to">Compartir con</string>
     <string name="label_snackbar_share">COMPARTIR</string>
     <string name="label_snackbar_loop_frame_saved">Guardado en fotos</string>
@@ -131,7 +576,6 @@ Language: es_VE
     <string name="label_control_flip_camera">Girar</string>
     <string name="sound_button_alt">Sonido</string>
     <string name="text_button_alt">Texto</string>
-    <string name="more_button_alt">Más</string>
     <string name="stickers_button_alt">Pegatinas</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Girar la cámara</string>
@@ -144,7 +588,7 @@ Language: es_VE
     <string name="prepublishing_nudges_story_title_hint">Pon un título a tu historia</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Crear una entrada o historia</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Crear una entrada, página o historia</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b>Entrada del blog&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b&gt;Entrada del blog&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Elegir el dispositivo</string>
     <string name="my_site_bottom_sheet_add_story">Entrada de la historia</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Para la edición de los iconos del sitio en sitios WordPress autoalojados se necesita el plugin Jetpack.</string>
@@ -158,13 +602,10 @@ Language: es_VE
     <string name="gutenberg_native_choose_image_or_video">Elegir una imagen o vídeo</string>
     <string name="gutenberg_native_choose_image">Elegir una imagen</string>
     <string name="gutenberg_native_block_removed">Bloque eliminado</string>
-    <string name="content_description_logo">Logotipo de WordPress</string>
-    <string name="enter_your_site_address">Introduce la dirección de tu sitio</string>
-    <string name="continue_with_wpcom">Continuar con WordPress.com</string>
+    <string name="enter_your_site_address">Introduce la dirección de tu sitio existente</string>
     <string name="signup_confirmation_title">Confirmación del registro</string>
     <string name="continue_with_google_terms_of_service_text">Si continúas con Google y aún no tienes una cuenta de WordPress.com, crearás una cuenta y aceptas nuestros %1$stérminos del servicio%2$s.</string>
     <string name="continue_terms_of_service_text">Si continúas, aceptas nuestros %1$stérminos del servicio%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Te enviaremos por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com.</string>
     <string name="signup_confirmation_message">Usaremos esta dirección de correo electrónico para crear tu nueva cuenta de WordPress.com.</string>
     <string name="signup_magic_link_message">Te hemos enviado por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com. Comprueba tu correo electrónico en este dispositivo y toca el enlace en el correo electrónico que has recibido de WordPress.com.</string>
     <string name="enter_account_info_for_site">Introduce la información de tu cuenta para %1$s.</string>
@@ -181,26 +622,22 @@ Language: es_VE
     <string name="or_type_your_password">O escribe tu contraseña</string>
     <string name="create_account">Crear una cuenta</string>
     <string name="send_link_by_email">Enviar el enlace por correo electrónico</string>
-    <string name="login_promo_text_unlock_the_power">Desbloquea el poder del creador de webs más flexible.</string>
-    <string name="login_promo_title_37_percent">El 37\% de la web está creada con WordPress.</string>
     <string name="reset_your_password">Restablecer tu contraseña</string>
     <string name="reader_error_request_failed_title">Ha habido un problema al gestionar la solicitud. Por favor, inténtalo de nuevo más tarde.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Dale a tu sitio un nombre que refleje su personalidad y temática. ¡Las primeras impresiones cuentan!</string>
     <string name="quick_start_list_update_site_title_title">Configura el título de tu sitio</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b>%1$s&lt;/b> para configurar un nuevo título</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b&gt;%1$s&lt;/b&gt; para configurar un nuevo título</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios locales, ¿estás seguro de que quieres continuar?</string>
     <string name="gutenberg_native_s_block_options">Opciones del bloque %s</string>
     <string name="gutenberg_native_duplicate_block">Duplicar bloque</string>
     <string name="gutenberg_native_copy_block">Copiar bloque</string>
     <string name="gutenberg_native_copied_block">Bloque copiado</string>
-    <string name="gutenberg_native_block_settings">Ajustes del bloque</string>
     <string name="gutenberg_native_block_pasted">Bloque pegado</string>
     <string name="gutenberg_native_block_duplicated">Bloque duplicado</string>
     <string name="gutenberg_native_block_cut">Bloque cortado</string>
     <string name="gutenberg_native_block_copied">Bloque copiado</string>
     <string name="my_site_title_changer_dialog_not_allowed_hint">El título del sitio solo puede ser cambiado por un usuario con el perfil de administrador.</string>
     <string name="my_site_title_changer_dialog_hint">El título del sitio se muestra en la barra de título de un navegador web y en la cabecera de la mayoría de los temas.</string>
-    <string name="reader_title_tag_preview">Debate</string>
+    <string name="reader_title_tag_preview">Tema</string>
     <string name="error_update_site_title_network">No se ha podido actualizar el título del sitio. Comprueba tu conexión de red e inténtalo nuevamente.</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_title">Cambios sin guardar</string>
     <string name="gutenberg_native_open_link_in_a_browser">Abrir el enlace en un navegador</string>
@@ -209,7 +646,6 @@ Language: es_VE
     <string name="gutenberg_native_gradient_type">Tipo de degradado</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Toca dos veces para seleccionar la opción</string>
     <string name="gutenberg_native_customize_gradient">Personalizar el degradado</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autor de la página</string>
     <string name="photo_picker_use_gif">Usar este GIF</string>
     <string name="error_media_thumbnail_not_loaded">La miniatura del medio no se ha podido cargar</string>
@@ -229,11 +665,11 @@ Language: es_VE
     <string name="prepublishing_nudges_tags_action">Etiquetas</string>
     <string name="prepublishing_nudges_publish_action">Fecha de publicación</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Cancelar</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Mover a borradores</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Mover a borrador</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Las entradas en la papelera no se pueden editar. ¿Deseas cambiar el estado de esta entrada a «borrador» para poder trabajar en ella?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">¿Mover entrada a borradores?</string>
-    <string name="reader_label_choose_your_interests">Elige tus intereses</string>
-    <string name="reader_choose_interests_content_description">Elige tus intereses</string>
+    <string name="reader_label_choose_your_interests">Elige tus temáticas</string>
+    <string name="reader_choose_interests_content_description">Elige tus temáticas</string>
     <string name="reader_btn_done">Hecho</string>
     <string name="reader_btn_select_few_interests">Selecciona algunos para continuar</string>
     <string name="post_status_post_published">Publicado</string>
@@ -245,17 +681,14 @@ Language: es_VE
     <string name="ccpa_privacy_notice_header">Aviso de privacidad para usuarios de California</string>
     <string name="status_and_visibility">Estado y visibilidad</string>
     <string name="update_now">Actualizar ahora</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Prueba un diseño de inicio</string>
     <string name="gutenberg_native_open_block_actions_menu">Abrir el menú de acciones de bloques</string>
-    <string name="gutenberg_native_insert_mention">Insertar una mención</string>
+    <string name="gutenberg_native_move_to_top">Mover arriba</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toca dos veces para abrir la hoja inferior con las opciones disponibles</string>
-    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toca dos veces para abrir la hoja de acción con las opciones disponibles</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toca dos veces pata abrir la hoja de acción con las opciones disponibles</string>
     <string name="pages_cannot_be_started">No podemos abrir las páginas en este momento. Por favor, inténtalo de nuevo más tarde</string>
     <string name="pages_set_as_posts_page">Establecer como página de entradas</string>
     <string name="pages_set_as_homepage">Establecer como página de inicio</string>
-    <string name="suggestion_no_matching_users">«No hay disponibles usuarios que coincidan.»</string>
-    <string name="suggestion_invalid_user">«%s no es un usuario válido»</string>
+    <string name="suggestion_invalid">%s no es una %s válida</string>
     <string name="site_settings_select_page">Seleccionar la página</string>
     <string name="site_settings_posts_page">Página de entradas</string>
     <string name="site_settings_static_homepage">Página de inicio estática</string>
@@ -275,7 +708,6 @@ Language: es_VE
     <string name="page_homepage_successfully_updated">Página de inicio actualizada correctamente</string>
     <string name="page_cannot_set_posts_page">Para establecer la página de entradas, activa «Página de inicio estática» en los ajustes del sitio</string>
     <string name="page_cannot_set_homepage">Para establecer la página de inicio, activa «Página de inicio estática» en los ajustes del sitio</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Bienvenido a nuestro nuevo blog</string>
     <string name="gutenberg_native_select_a_color">Seleccionar un color</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toca dos veces para ir a los ajustes del color</string>
     <string name="reader_empty_followed_blogs_description">Cuando sigas sitios, verás aquí su contenido</string>
@@ -286,9 +718,9 @@ Language: es_VE
     <string name="error_failed_to_load_into_file">Fallo al cargar en el archivo, por favor, inténtalo de nuevo.</string>
     <string name="preview_image_thumbnail_description">Vista previa de la miniatura de la imagen</string>
     <string name="photo_picker_use_media">Usar este medio</string>
-    <string name="photo_picker_use_video">Usar este video</string>
+    <string name="photo_picker_use_video">Usar este vídeo</string>
     <string name="photo_picker_photo_or_video_title">Elegir el medio</string>
-    <string name="photo_picker_video_title">Elegir el video</string>
+    <string name="photo_picker_video_title">Elegir el vídeo</string>
     <string name="site_picker_ask_site_select">No se ha podido seleccionar el sitio. Por favor, inténtalo de nuevo.</string>
     <string name="sitepicker_continue_flow">Continuar</string>
     <string name="reader_reblog_error">Ha fallado reblog</string>
@@ -309,7 +741,7 @@ Language: es_VE
     <string name="gutenberg_native_move_block_left">Mover bloque a la izquierda</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toca dos veces para mover el bloque hacia la derecha</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toca dos veces para mover el bloque hacia la izquierda</string>
-    <string name="gutenberg_native_blog">Blog</string>
+    <string name="gutenberg_native_block_settings">Ajustes del bloque</string>
     <string name="new_site_creation_creating_site_loading_4">Creando el escritorio</string>
     <string name="new_site_creation_creating_site_loading_3">Configurar el tema</string>
     <string name="new_site_creation_creating_site_loading_2">Añadiendo las características del sitio</string>
@@ -330,13 +762,13 @@ Language: es_VE
     <string name="weekday_sunday">Domingo</string>
     <string name="media_accessing_failed">Ha fallado el acceso al contenido de un sitio privado. Algunos medios pueden no estar disponibles</string>
     <string name="media_accessing_progress">Accediendo al contenido de un sitio privado</string>
-    <string name="error_failed_to_crop_and_save_image">No se pudo recortar y guardar la imagen, inténtalo de nuevo</string>
+    <string name="error_failed_to_crop_and_save_image">Fallo al recortar y guardar la imagen, por favor, inténtalo de nuevo.</string>
     <string name="failed_to_load_image_tap_to_retry">Fallo al cargar la imagen.\nPor favor, toca para volver a intentarlo.</string>
     <string name="preview_image_description">Previsualizar la imagen</string>
     <string name="error_unknown_page_type">Formato de página desconocido</string>
     <string name="error_page_not_submitted">No hemos podido completar esta acción y no se ha enviado esta página a revisión.</string>
     <string name="error_page_not_scheduled">No hemos podido completar esta acción y no se ha programado esta página.</string>
-    <string name="error_page_not_published_private">No hemos podido completar esta acción y no se ha enviado esta página privada.</string>
+    <string name="error_page_not_published_private">No hemos podido completar esta acción y no se ha publicado esta página privada.</string>
     <string name="error_page_not_published">No hemos podido completar esta acción y no se ha publicado esta página.</string>
     <string name="error_page_not_submitted_retrying">No hemos podido enviar esta página a revisión, pero lo intentaremos de nuevo más tarde. </string>
     <string name="error_page_not_scheduled_retrying">No hemos podido programar esta página, pero lo intentaremos de nuevo más tarde.</string>
@@ -351,71 +783,34 @@ Language: es_VE
     <string name="page_waiting_for_connection_scheduled">Programaremos tu página cuando tu dispositivo vuelva a estar online.</string>
     <string name="page_waiting_for_connection_pending">Enviaremos tu página para revisión cuando tu dispositivo vuelva a estar online.</string>
     <string name="page_waiting_for_connection_publish">Publicaremos la página cuando tu dispositivo vuelva a estar online.</string>
-    <string name="page_queued">Página a la espera</string>
-    <string name="page_uploading">Subiendo página</string>
-    <string name="error_publish_page_no_network">El dispositivo está desconectado. La página se guardará localmente.</string>
+    <string name="page_queued">Página en espera</string>
+    <string name="page_uploading">Subiendo la página</string>
+    <string name="error_publish_page_no_network">El dispositivo está desconectado. La página se ha guardado localmente.</string>
     <string name="local_page_autosave_revision_available">Has hecho cambios no guardados en esta página</string>
     <string name="editor_uploading_page">Tu página se está subiendo</string>
-    <string name="editor_page_saved_locally_failed_media">La página falló al subir los medios y se ha guardado localmente</string>
+    <string name="editor_page_saved_locally_failed_media">La página ha fallado al subir los medios y ha sido guardada localmente</string>
     <string name="editor_page_saved_locally">Página guardada en el dispositivo</string>
     <string name="editor_page_saved_online">La página se ha guardado online</string>
-    <string name="quickpress_shortcut_activity_label">Selecciona un blog para el atajo a la publicación rápida</string>
+    <string name="quickpress_shortcut_activity_label">Selecciona un blog para el atajo a QuickPress</string>
     <string name="app_theme_default">Establecido por el ahorrador de batería</string>
     <string name="app_theme_dark">Oscuro</string>
     <string name="app_theme_light">Claro</string>
     <string name="app_theme">Apariencia</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Recientemente has hecho cambios en esta página, pero no los has guardado. Elige una versión para cargar:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Lo que dice la gente</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Ofrecemos una gama de servicios para ayudarte a conseguir los resultados que buscas. ¿No estás seguro de lo que necesitas o de lo que cuesta? Podemos explicarte qué servicios son los adecuados para ti y decirte nuestros honorarios. Ponte en contacto con nosotros a continuación.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Somos un pequeño equipo de profesionales con talento con una amplia gama de habilidades y experiencia. Nos encanta lo que hacemos y lo hacemos con pasión. Esperamos poder trabajar contigo.</string>
-    <string name="gutenberg_native_warning_message">Mensaje de advertencia</string>
-    <string name="gutenberg_native_want_to_work_with_us">¿Quieres trabajar con nosotros?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Los visitantes querrán saber quién está al otro lado de la página. Usa este espacio para escribir sobre ti, tu sitio, tu negocio o sobre cualquier cosa que quieras. Usa las recomendaciones que aparecen a continuación para citar a otros hablando de lo mismo - con sus propias palabras.</string>
-    <string name="gutenberg_native_usa">EE.UU.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Este es un contenido de ejemplo, incluido con la plantilla, para ilustrar sus características. Elimínalo o sustitúyelo con tus propias palabras y medios.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">La forma de comenzar es dejar de hablar y empezar a hacer.</string>
-    <string name="gutenberg_native_team">Equipo</string>
-    <string name="gutenberg_native_success_message">Mensaje de éxito</string>
-    <string name="gutenberg_native_strategy">Estrategia</string>
     <string name="gutenberg_native_show_post_content">Mostrar el contenido de la entrada</string>
-    <string name="gutenberg_native_services">Servicios</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel el Perro</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nombre del proyecto</string>
-    <string name="gutenberg_native_position_or_job_title">Puesto o título del trabajo</string>
-    <string name="gutenberg_native_portfolio">Porfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Mostrar solo el extracto</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Mi porfolio presenta varios proyectos creados a lo largo de mi carrera. Mira a continuación mi información de contacto y ponte en contacto.</string>
     <string name="gutenberg_native_link_to">Enlazar a</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Hablemos 👋 No dudes en contactar en la siguiente información de contacto o envía un mensaje usando el formulario.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">¡Vamos a construir algo juntos!</string>
-    <string name="gutenberg_native_let_s_build_something_together">¡Vamos a construir algo juntos!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Son nuestras elecciones, Harry, las que muestran lo que realmente somos, mucho más que nuestras habilidades.</string>
-    <string name="gutenberg_native_inspiration">Inspiración</string>
-    <string name="gutenberg_native_get_in_touch">Ponte en contacto</string>
+    <string name="gutenberg_native_link_settings">Ajustes de enlace</string>
     <string name="gutenberg_native_excerpt_length_words">Longitud del extracto (palabras)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Envíame un correo electrónico: &lt;a href=\"mailto:correo@ejemplo.com\">correo@ejemplo.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">No llores porque se ha acabado, sonríe porque ha pasado.</string>
     <string name="gutenberg_native_customize">PERSONALIZAR</string>
-    <string name="gutenberg_native_city_10100">00000, Ciudad</string>
+    <string name="gutenberg_native_video_settings">Ajustes de vídeo</string>
     <string name="gutenberg_native_add_paragraph_block">Añadir un bloque de párrafo</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Una breve descripción de los servicios que ofreces.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Una breve biografía sobre tu historial personal, tus logros clave o un hecho interesante.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:correo@ejemplo.ve\">correo@ejemplo.ve&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Una descripción del proyecto y de los trabajos presentados.</string>
-    <string name="gutenberg_native_555_555_1234">(212)123–4567</string>
-    <string name="gutenberg_native_10_street_road">Calle Mayor, 10</string>
     <string name="create_post_page_fab_tooltip_contributors">Crear una entrada</string>
     <string name="post_list_tab_trashed_posts">En la papelera</string>
     <string name="post_list_tab_scheduled_posts">Programada</string>
     <string name="post_list_tab_published_posts">Publicada</string>
-    <string name="sharing_facebook_account_must_have_pages">La conexión de Facebook no puede encontrar ninguna página. «Divulgar» no se puede conectar con los perfiles de Facebook, solo con las páginas publicadas.</string>
+    <string name="sharing_facebook_account_must_have_pages">La conexión con Facebook no puede encontrar ninguna página. «Difundir» no puede conectar con perfiles de Facebook, solo con páginas publicadas.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">No conectado</string>
-    <string name="my_site_select_domains_page_title">Dirección del sitio</string>
     <string name="notifications_tab_title_likes">Me gusta</string>
     <string name="notifications_tab_title_follows">Seguimientos</string>
     <string name="notifications_tab_title_comments">Comentarios</string>
@@ -429,14 +824,12 @@ Language: es_VE
     <string name="stats_management_add_new_stats_card">Añadir una nueva tarjeta de estadísticas</string>
     <string name="reader_self_hosted_select_filter">Usa el botón de filtro para encontrar entradas sobre temas específicos</string>
     <string name="reader_bottom_sheet_content_description">Selecciona una etiqueta o sitio, ventana emergente</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Seleccionado</string>
     <string name="reader_btn_select_filter_content_description">Selecciona un sitio o etiqueta para filtrar entradas</string>
     <string name="reader_btn_remove_filter_content_description">Quitar el filtro actual</string>
     <string name="reader_title_subs">Gestionar temas y sitios</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Acceder a WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Accede a WordPress.com para ver las últimas entradas de los temas que sigues</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Accede a WordPress.com para ver las últimas entradas de los sitios que sigues</string>
-    <string name="gutenberg_native_template_preview">Vista previa de la plantilla</string>
     <string name="gutenberg_native_replace_current_block">Reemplazar el bloque actual</string>
     <string name="gutenberg_native_add_to_end">Añadir al final</string>
     <string name="gutenberg_native_add_to_beginning">Añadir al principio</string>
@@ -450,7 +843,6 @@ Language: es_VE
     <string name="reader_filter_cta">Filtrar</string>
     <string name="gutenberg_native_video_caption_s">Leyenda del vídeo. %s</string>
     <string name="gutenberg_native_edit_video">Editar el vídeo</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Toca dos veces para seleccionar el diseño</string>
     <string name="gutenberg_native_add_a_shortcode">Añadir un shortcode…</string>
     <string name="post_list_author">Autor de la entrada</string>
     <string name="fab_create_desc">Crear una entrada</string>
@@ -465,10 +857,8 @@ Language: es_VE
     <string name="stats_box_type_low">bajas</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  y %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Mover la imagen hacia adelante</string>
-    <string name="gutenberg_native_move_image_backward">Mover la imagen hacia atrás</string>
+    <string name="gutenberg_native_replace_image">Reemplazar imagen</string>
     <string name="gutenberg_native_gallery_caption_s">Leyenda de la galería. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. El valor actual es %2$s</string>
     <string name="create_post_page_fab_tooltip">Crear una entrada o página</string>
     <string name="content_description_person_building_website">Creador de la web</string>
     <string name="post_signup_interstitial_not_right_now">Ahora no</string>
@@ -482,21 +872,17 @@ Language: es_VE
     <string name="my_site_bottom_sheet_add_post">Entrada del blog</string>
     <string name="my_site_bottom_sheet_title">Añadir nueva</string>
     <string name="post_settings_publish">Publicar</string>
-    <string name="dialog_gutenberg_informative_description_v2">Hemos hecho grandes mejoras en el editor de bloques y creemos que ¡vale la pena probarlo! Lo hemos activado para nuevas entradas y páginas, pero si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizar ahora</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Esta entrada se sincronizará inmediatamente.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">¿Preparado para sincronizar?</string>
-    <string name="new_site_creation_unavailable_domain">El dominio no está disponible</string>
-    <string name="login_promo_viewpager_content_description">Introducción</string>
+    <string name="new_site_creation_unavailable_domain">Este dominio no está disponible</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">No hemos podido acceder a tu sitio. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b>certificado SSL&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b>identificación HTTP&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b>archivo XMLRCP&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Accede con las credenciales del sitio.</string>
-    <string name="enter_credentials_for_site">Accede con las credenciales del sitio %1$s</string>
-    <string name="send_verification_email">Enviar el correo electrónico de verificación</string>
+    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b&gt;certificado SSL&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b&gt;identificación HTTP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b&gt;archivo XMLRCP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="enter_credentials_for_site">Accede con las credenciales de tu sitio %1$s</string>
     <string name="my_site_bottom_sheet_add_page">Página del sitio</string>
     <string name="reader_following_display_name">Siguiendo</string>
     <string name="reader_my_likes_display_name">Me gusta</string>
@@ -504,33 +890,29 @@ Language: es_VE
     <string name="reader_save_for_later_display_name">Guardado</string>
     <string name="reader_filter_tags_title">Temas</string>
     <string name="reader_filter_sites_title">Sitios</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQ</string>
-    <string name="suffix_1_000_000_000_000_000">%sC</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sE</string>
+    <string name="suffix_1_000_000_000_000_000">%sP</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
-    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000_000">%sG</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">No podemos abrir las entradas en este momento. Por favor, inténtalo de nuevo más tarde</string>
     <string name="site_cannot_be_loaded">No podemos cargar los datos para tu sitio en este momento. Por favor, inténtalo de nuevo más tarde</string>
     <string name="gutenberg_native_wordpress_media_library">Biblioteca de medios de WordPress</string>
+    <string name="gutenberg_native_unsupported">No compatible</string>
     <string name="gutenberg_native_ungroup">Desagrupar</string>
     <string name="gutenberg_native_translate">Traducir</string>
-    <string name="gutenberg_native_title">Título:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Toca para ocultar el teclado</string>
     <string name="gutenberg_native_tap_here_to_show_help">Toca aquí para mostrar la ayuda</string>
     <string name="gutenberg_native_take_a_video">Haz un vídeo</string>
     <string name="gutenberg_native_take_a_photo_or_video">Haz una foto o un vídeo</string>
     <string name="gutenberg_native_take_a_photo">Haz una foto</string>
     <string name="gutenberg_native_start_writing">Empieza a escribir…</string>
-    <string name="gutenberg_native_size">Tamaño</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Título del plugin en la barra lateral</string>
     <string name="gutenberg_native_show_section">Mostrar la sección</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloque %s. Este bloque tiene contenido no válido</string>
     <string name="gutenberg_native_s_block_empty">Bloque %s. Vacío</string>
     <string name="gutenberg_native_cut_block">Cortar bloque</string>
-    <string name="gutenberg_native_reset_block">Restablecer el bloque</string>
-    <string name="gutenberg_native_remove_annotations">Eliminar las notas</string>
-    <string name="gutenberg_native_problem_opening_the_video">Problema al abir el video</string>
+    <string name="gutenberg_native_problem_opening_the_video">Problema al abrir el vídeo</string>
     <string name="gutenberg_native_problem_displaying_block">Problema al mostrar el bloque</string>
     <string name="gutenberg_native_post_title_s">Título de la entrada. %s</string>
     <string name="gutenberg_native_post_title_empty">Título de la entrada. Vacío</string>
@@ -539,17 +921,12 @@ Language: es_VE
     <string name="gutenberg_native_open_settings">Abrir los ajustes</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ninguna aplicación puede manejar esta petición. Por favor, instala un navegador web.</string>
     <string name="gutenberg_native_navigate_up">Navegar arriba</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mi panel de prepublicación</string>
-    <string name="gutenberg_native_my_post_status_info">Información del estado de mi entrada</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mi panel de publicación de entradas</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panel de ajustes de mis documentos</string>
-    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover el bloque hacia arriba, desde la fila %1$s a la fila %2$s</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover el bloque hacia arriba, de la fila %1$s a la fila %2$s</string>
     <string name="gutenberg_native_move_block_up">Mover el bloque arriba</string>
-    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover el bloque hacia abajo, desde la fila %1$s a la fila %2$s</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover el bloque hacia abajo, de la fila %1$s a la fila %2$s</string>
     <string name="gutenberg_native_move_block_down">Mover el bloque abajo</string>
     <string name="gutenberg_native_image_caption_s">Leyenda de la imagen. %s</string>
     <string name="gutenberg_native_hide_keyboard">Ocultar el teclado</string>
-    <string name="gutenberg_native_here_is_the_panel_content">¡Aquí está el panel de contenido!</string>
     <string name="gutenberg_native_help_icon">Icono de ayuda</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Fallo al insertar los medios.\nPor favor, toca para ver las opciones.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Toca dos veces para deshacer el último cambio</string>
@@ -561,44 +938,38 @@ Language: es_VE
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Toca dos veces para mover el bloque hacia arriba</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Toca dos veces para mover el bloque hacia abajo</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Toca dos veces para editar este valor</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Toca dos veces para cambiar el valor usando el control deslizante</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Toca dos veces para añadir un bloque</string>
     <string name="gutenberg_native_current_value_is_s">El valor actual es %s</string>
-    <string name="gutenberg_native_content">Contenido…</string>
     <string name="gutenberg_native_choose_from_device">Elegir desde el dispositivo</string>
-    <string name="gutenberg_native_annotations_sidebar">Barra lateral de notas</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ha ocurrido un error desconocido. Por favor, inténtalo de nuevo.</string>
     <string name="gutenberg_native_alt_text">Texto alternativo</string>
     <string name="gutenberg_native_add_video">AÑADIR UN VÍDEO</string>
     <string name="gutenberg_native_add_url">Añadir la URL</string>
+    <string name="gutenberg_native_add_alt_text">Añadir el texto alternativo</string>
     <string name="gutenberg_native_add_image_or_video">AÑADIR UNA IMAGEN O UN VÍDEO</string>
     <string name="gutenberg_native_add_image">AÑADIR UNA IMAGEN</string>
     <string name="gutenberg_native_add_block_here">AÑADIR EL BLOQUE AQUÍ</string>
-    <string name="gutenberg_native_add_annotation">Añadir una nota</string>
-    <string name="gutenberg_native_add_a_description">Añadir una descripción</string>
     <string name="reader_empty_saved_posts_content_description">Toca el botón «Añadir a las entradas guardadas» para guardar una entrada en tu lista.</string>
     <string name="reader_acessibility_list_loaded">La lista se ha cargado con %1$d elementos.</string>
     <string name="notifications_tab_dialog_switch_desc">Avisos</string>
-    <string name="master_switch_default_title_off">Desactivados</string>
-    <string name="master_switch_default_title_on">Activados</string>
-    <string name="notifications_tab_dialog_master_off_message">Al desactivar los avisos para este sitio, se desactivarán los avisos que se muestran en la pestaña de avisos de este sitio. Puedes ajustar el tipo de aviso que ves después de activar los avisos para este sitio.</string>
-    <string name="notifications_tab_dialog_master_off_title">Para ver los avisos en la pestaña de avisos de este sitio, activa los avisos para este sitio.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Activar los avisos mostrados en la pestaña de avisos de este sitio</string>
-    <string name="notifications_tab_dialog_master_hint_on">Desactivar los avisos mostrados en la pestaña de avisos de este sitio</string>
-    <string name="notifications_tab_dialog_master_status_off">Avisos para este sitio</string>
-    <string name="notifications_tab_dialog_master_status_on">Avisos para este sitio</string>
-    <string name="dialog_gutenberg_informative_description_page">Ahora estás usando el editor de bloques para las nuevas páginas, ¡genial! Si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
-    <string name="dialog_gutenberg_informative_description_post">Ahora estás usando el editor de bloques para las nuevas entradas, ¡genial! Si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
-    <string name="pick_media">Añadir imagen o video</string>
-    <string name="error_post_not_submitted_retrying">No hemos podido enviar esta entrada a revisión, pero lo intentaremos de nuevo más tarde. </string>
+    <string name="main_switch_default_title_off">Desactivado</string>
+    <string name="main_switch_default_title_on">Activado</string>
+    <string name="notifications_tab_dialog_main_off_message">Al desactivar los avisos para este sitio, se desactivarán los avisos que se muestran en la pestaña de avisos de este sitio. Puedes ajustar el tipo de avisos que ves después de activar los avisos para este sitio.</string>
+    <string name="notifications_tab_dialog_main_off_title">Para ver los avisos en la pestaña de avisos de este sitio, activa los avisos para este sitio.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activar los avisos mostrados en la pestaña de avisos de este sitio</string>
+    <string name="notifications_tab_dialog_main_hint_on">Desactivar los avisos mostrados en la pestaña de avisos de este sitio</string>
+    <string name="notifications_tab_dialog_main_status_off">Avisos para este sitio</string>
+    <string name="notifications_tab_dialog_main_status_on">Avisos para este sitio</string>
+    <string name="pick_media">Añadir una imagen o vídeo</string>
+    <string name="error_post_not_submitted_retrying">No hemos podido enviar esta entrada para revisión, pero lo intentaremos de nuevo más tarde. </string>
     <string name="error_post_not_scheduled_retrying">No hemos podido programar esta entrada, pero lo intentaremos de nuevo más tarde.</string>
     <string name="error_post_not_published_retrying_private">No hemos podido publicar esta entrada privada, pero lo intentaremos de nuevo más tarde.</string>
     <string name="error_post_not_published_retrying">No hemos podido publicar esta entrada, pero lo intentaremos de nuevo más tarde.</string>
-    <string name="error_post_not_submitted">No hemos podido completar esta acción y no se ha enviado esta entrada a revisión.</string>
+    <string name="error_post_not_submitted">No hemos podido completar esta acción y no se ha enviado esta entrada para revisión.</string>
     <string name="error_post_not_scheduled">No hemos podido completar esta acción y no se ha programado esta entrada.</string>
     <string name="error_post_not_published_private">No hemos podido completar esta acción y no se ha enviado esta entrada privada.</string>
     <string name="error_post_not_published">No hemos podido completar esta acción y no se ha publicado esta entrada.</string>
-    <string name="error_media_recover_post_not_submitted">No hemos podido subir este medio y no se ha enviado esta entrada a revisión.</string>
+    <string name="error_media_recover_post_not_submitted">No hemos podido subir este medio y no se ha enviado esta entrada para revisión.</string>
     <string name="error_media_recover_post_not_scheduled">No hemos podido subir este medio y no se ha programado esta entrada.</string>
     <string name="error_media_recover_post_not_published_private">No hemos podido subir este medio y no se ha publicado esta entrada privada.</string>
     <string name="error_media_recover_post_not_published">No hemos podido subir este medio y no se ha publicado la entrada.</string>
@@ -681,8 +1052,6 @@ Language: es_VE
     <string name="post_settings_add_to_calendar">Añadir al calendario</string>
     <string name="post_settings_notification">Aviso</string>
     <string name="post_settings_time_and_date">Fecha y hora</string>
-    <string name="login_need_help_finding_connected_email">¿Necesitas ayuda para encontrar el correo electrónico con el que te conectaste?</string>
-    <string name="enter_wordpress_site">La web en esa dirección no es un sitio WordPress. Para conectarnos a él, el sitio debe tener instalado WordPress.</string>
     <string name="login_invalid_site_url">Por favor, introduce una dirección completa de una web, como example.com.</string>
     <string name="enter_email_for_site">Accede con WordPress.com para conectar con %1$s</string>
     <string name="stats_post_views_label">Visitas</string>
@@ -691,12 +1060,12 @@ Language: es_VE
     <string name="stats_item_collapsed">Elemento contraído</string>
     <string name="stats_item_expanded">Elemento expandido</string>
     <string name="stats_collapse_content_description">Contraer</string>
-    <string name="stats_expand_content_description">Expandir</string>
+    <string name="stats_expand_content_description">Ampliar</string>
     <string name="stats_graph_updated">Gráfico actualizado.</string>
     <string name="stats_overview_content_description">%1$s %2$s del período: %3$s, cambio desde el período anterior - %4$s</string>
     <string name="stats_loading_card">Cargando los datos de la tarjeta seleccionada</string>
     <string name="site_settings_editor">Editor</string>
-    <string name="description_expand">Expandir</string>
+    <string name="description_expand">Ampliar</string>
     <string name="description_collapse">Cerrar</string>
     <string name="my_site_verify_your_email_without_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a tu correo electrónico</string>
     <string name="my_site_verify_your_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a %s</string>
@@ -738,18 +1107,18 @@ Language: es_VE
     <string name="domain_registration_privacy_protection_tos">Al registrar este dominio aceptas nuestros %1$stérminos y condiciones%2$s</string>
     <string name="error_network_connection">Comprueba tu conexión a la red e inténtalo de nuevo.</string>
     <string name="error_browser_no_network">No se ha podido cargar esta página en este momento.</string>
-    <string name="error_disabled_apis">No se pudieron recuperar los ajustes. Algunas APIs no están disponibles para la cuenta e ID de esta aplicación OAuth. </string>
+    <string name="error_disabled_apis">No se pudieron recuperar los ajustes. Algunas APIs no están disponibles para la cuenta e ID de esta aplicación OAuth.</string>
     <string name="jetpack_connection_terms_and_conditions">Al configurar Jetpack aceptas nuestros %1$stérminos y condiciones%2$s</string>
     <string name="site_settings_disconnected_toast">No hay ninguna conexión. La edición está desactivada.</string>
-    <string name="site_settings_update_password_message">Para volver a conectar la aplicación a tu sitio alojado, introduce aquí la nueva contraseña del sitio.</string>
+    <string name="site_settings_update_password_message">Para volver a conectar la aplicación con tu sitio alojado, introduce aquí la nueva contraseña del sitio.</string>
     <string name="site_settings_password_updated">Contraseña actualizada</string>
     <string name="site_settings_password_dialog_title">Actualizar contraseña</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Registrando el nombre de dominio…</string>
     <string name="domain_registration_state_picker_dialog_title">Selecciona la provincia</string>
     <string name="domain_registration_country_picker_dialog_title">Selecciona el país</string>
     <string name="domain_registration_result_continue_button">seguir</string>
-    <string name="domain_registration_result_description">tu nuevo dominio &lt;b>%s&lt;/b> se está configurando. ¡Tu sitio está\n    dando saltos mortales de emoción!</string>
-    <string name="domain_registration_result_title">Felicitaciones</string>
+    <string name="domain_registration_result_description">tu nuevo dominio &lt;b&gt;%s&lt;/b&gt; se está configurando. ¡Tu sitio está\n    dando saltos mortales de emoción!</string>
+    <string name="domain_registration_result_title">Enhorabuena</string>
     <string name="domain_contact_information_register_domain_button">Registrar dominio</string>
     <string name="domain_contact_information_postal_code_hint">Código postal</string>
     <string name="domain_contact_information_state_hint">Provincia</string>
@@ -764,7 +1133,7 @@ Language: es_VE
     <string name="domain_contact_information_title">Información de contacto del dominio</string>
     <string name="domain_privacy_option_off_title">Registrar públicamente</string>
     <string name="domain_privacy_option_on_title">Registrar privadamente con protección de privacidad</string>
-    <string name="domain_registration_privacy_protection_description">Lo propietarios de dominios tienen que compartir información en una base de datos pública de todos los dominios.\n   Con la protección de privacidad publicamos nuestra propia información en vez de la tuya, y te redirigiremos de forma privada cualquier comunicación dirigida a ti. </string>
+    <string name="domain_registration_privacy_protection_description">Los propietarios de dominios tienen que compartir información en una base de datos pública de todos los dominios.\n   Con la protección de privacidad publicamos nuestra propia información en vez de la tuya, y te redirigiremos de forma privada cualquier comunicación dirigida a ti. </string>
     <string name="domain_registration_privacy_protection_title">Protección de privacidad</string>
     <string name="domain_registration_contact_form_input_error">Por favor, introduce un %s válido</string>
     <string name="domains_suggestions_choose_domain">Elegir dominio</string>
@@ -856,12 +1225,10 @@ Language: es_VE
     <string name="plans_loading_error_no_plans_title">No se pueden cargar los planes</string>
     <string name="plans_loading_error_network_title">No hay conexión</string>
     <string name="menu_switch_to_gutenberg_editor">Cambiar al editor de bloques</string>
-    <string name="menu_switch_to_aztec_editor">Cambiar al editor clásico</string>
     <string name="stats_loading_block_error">Hubo un problema al cargar tus datos, recarga la página e inténtalo de nuevo.</string>
     <string name="stats_loading_error">Datos no cargados</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edita las nuevas entradas y páginas con el editor de bloques</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Usar editor de bloques</string>
-    <string name="dialog_gutenberg_informative_title">Editor de bloques activado</string>
     <string name="exit">salir</string>
     <string name="quick_start_sites_type_subtitle">%1$d de %2$d completo</string>
     <string name="quick_start_sites_type_grow">Haz crecer tu audiencia</string>
@@ -872,8 +1239,6 @@ Language: es_VE
     <string name="quick_start_dialog_upload_icon_title">Sube un icono del sitio</string>
     <string name="quick_start_dialog_upload_icon_message">Tus visitantes verán tu icono en su navegador. Añade un icono personalizado para conseguir un aspecto profesional y refinado.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Toca en %1$s Plan %2$s para ver tu plan actual y otros planes disponibles</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Toca en %1$s Añadir página %2$s para crear una nueva página.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Toca en %1$s Páginas %2$s para continuar.</string>
     <string name="quick_start_dialog_check_stats_message_short">Toca en %1$s Estadísticas %2$s para ver cómo está rindiendo tu sitio.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Toca en %1$s Icono de tu sitio %2$s para subir uno nuevo</string>
     <string name="quick_start_dialog_publish_post_message">Guarda en borrador y publica tu primera entrada.</string>
@@ -884,21 +1249,16 @@ Language: es_VE
     <string name="quick_start_dialog_explore_plans_message">Aprende sobre las herramientas de marketing y SEO de nuestros planes de pago.</string>
     <string name="quick_start_dialog_enable_sharing_title">Activar compartir entradas</string>
     <string name="quick_start_dialog_enable_sharing_message">Comparte automáticamente las nuevas entradas en tus cuentas de medios sociales.</string>
-    <string name="quick_start_dialog_customize_site_message">Configura fuentes, añade imágenes, y más.</string>
-    <string name="quick_start_dialog_create_page_title">Crea una nueva página</string>
-    <string name="quick_start_dialog_create_page_message">Añade una página con contenido clave - una página «Acerca de» es un gran comienzo.</string>
     <string name="quick_start_dialog_check_stats_title">Revisa las estadísticas de tu sitio</string>
     <string name="quick_start_dialog_check_stats_message">Mantente al día sobre el rendimiento de tu sitio.</string>
-    <string name="quick_start_dialog_browse_themes_title">Explorar temas</string>
-    <string name="quick_start_dialog_browse_themes_message">Explora docenas de opciones de diseño y descubre el que se ajuste a ti.</string>
-    <string name="quick_start_dialog_remove_next_steps_message">Quitar los siguiente pasos ocultará todas las visitas guiadas de este sitio. Esta acción es irreversible.</string>
+    <string name="quick_start_dialog_remove_next_steps_message">Eliminar los siguientes pasos ocultará todas las visitas guiadas de este sitio. Esta acción es irreversible.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Quitar los siguientes pasos</string>
     <string name="quick_start_remove_next_steps_menu_title">Quitar esto</string>
     <string name="quick_start_complete_view_subtitle">Enhorabuena por completar tu lista. Un trabajo bien hecho.</string>
     <string name="quick_start_complete_view_title">¡Todas las tareas están completas!</string>
     <string name="quick_start_task_skip_menu_title">Saltar tarea</string>
     <string name="quick_start_completed_tasks_header_chevron_collapse_desc">contraer</string>
-    <string name="quick_start_completed_tasks_header_chevron_expand_desc">expandir</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">ampliar</string>
     <string name="notification_channel_reminder_title">Recordatorio</string>
     <string name="stats_select_next_period_description">Elige el siguiente periodo</string>
     <string name="stats_select_previous_period_description">Elige el periodo anterior</string>
@@ -912,17 +1272,13 @@ Language: es_VE
     <string name="cancel_new_site_wizard_content_description">Cancelar el asistente de creación de sitios</string>
     <string name="notification_new_site_creation_creating_site_subtitle">Estamos creando tu nuevo sitio</string>
     <string name="notification_new_site_creation_failed">Hubo un problema</string>
-    <string name="notification_new_site_creation_title">Creación de un sitio</string>
+    <string name="notification_new_site_creation_title">Crear sitio</string>
     <string name="new_site_creation_create_site_button">Crear sitio</string>
-    <string name="new_site_creation_search_domain_input_hint">Buscar dominios</string>
     <string name="new_site_creation_domain_header_subtitle">Aquí es donde la gente te encontrará en Internet.</string>
-    <string name="new_site_creation_domain_header_title">Selecciona un nombre de dominio para tu sitio</string>
     <string name="new_site_creation_empty_domain_list_message">No hay direcciones disponibles que coincidan con tu búsqueda</string>
     <string name="site_creation_error_generic_subtitle">Error durante la comunicación con el servidor. Inténtalo de nuevo</string>
     <string name="site_creation_error_generic_title">Hubo un problema</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Hubo un problema</string>
-    <string name="site_creation_segments_subtitle">Esto nos ayuda a hacer recomendaciones. Pero no tienes que estar siempre ahí; ¡los sitios evolucionan!</string>
-    <string name="site_creation_segments_title">Cuéntanos qué tipo de sitio te gustaría crear</string>
     <string name="new_site_creation_preview_title">¡Se ha creado tu sitio!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
     <string name="new_site_creation_screen_title_general">Crear sitio</string>
@@ -935,7 +1291,7 @@ Language: es_VE
     <string name="snackbar_conflict_web_version_discarded">Versión web descartada</string>
     <string name="snackbar_conflict_local_version_discarded">Versión local descartada</string>
     <string name="toast_conflict_updating_post">Actualizando contenido</string>
-    <string name="dialog_confirm_load_remote_post_discard_web">Descartar Web</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Descartar web</string>
     <string name="dialog_confirm_load_remote_post_discard_local">Descartar local</string>
     <string name="dialog_confirm_load_remote_post_body_2">Local\nGuardado el %s\n\nWeb\nGuardado el %s\n</string>
     <string name="dialog_confirm_load_remote_post_body">Este contenido tiene dos versiones en conflicto. Selecciona qué versión quieres descartar.\n</string>
@@ -954,7 +1310,7 @@ Language: es_VE
     <string name="stats_search_terms">Buscar términos</string>
     <string name="stats_videos_views_label">Vistas</string>
     <string name="stats_videos_title_label">Título</string>
-    <string name="stats_videos">Videos</string>
+    <string name="stats_videos">Vídeos</string>
     <string name="stats_country_views_label">Vistas</string>
     <string name="stats_country_label">País</string>
     <string name="stats_countries">Paises</string>
@@ -1002,7 +1358,7 @@ Language: es_VE
     <string name="stats_no_data_yet">Aún no hay datos</string>
     <string name="menu_debug">Menú de depuración</string>
     <string name="change_password_dialog_message">Cambiando contraseña…</string>
-    <string name="change_password_dialog_hint">Tu contraseña debe tener al menos seis caracteres de longitud. Para hacerla más fuerte, use letras mayúsculas y minúsculas, números y símbolos como ! \" ? $ % ^ &amp; ).</string>
+    <string name="change_password_dialog_hint">Tu contraseña debe tener al menos seis caracteres de longitud. Para hacerla más fuerte, usa letras mayúsculas y minúsculas, números y símbolos como ! \" ? $ % ^ &amp; ).</string>
     <string name="change_password_confirmation">Contraseña cambiada con éxito</string>
     <string name="change_password">Cambiar contraseña</string>
     <string name="support_identity_input_dialog_name_label">Nombre</string>
@@ -1013,7 +1369,7 @@ Language: es_VE
     <string name="history_detail_button_previous">Anterior</string>
     <string name="history_detail_button_next">Siguiente</string>
     <string name="media_space_used">%1$s utilizado</string>
-    <string name="enter_wpcom_or_jetpack_site">Por favor, introduce un sitio WordPress WordPress.com o alojado conectado a Jetpack</string>
+    <string name="enter_wpcom_or_jetpack_site">Por favor, introduce un sitio WordPress WordPress.com o autoalojado conectado a Jetpack</string>
     <string name="history_loading_revision">Cargando revisión</string>
     <string name="history_loaded_revision">Revisión cargada</string>
     <string name="history_load_dialog_button_positive">Cargar</string>
@@ -1032,7 +1388,7 @@ Language: es_VE
     <string name="pages_pending">Pendiente de revisión</string>
     <string name="pages_empty_trashed">No tienes ninguna página en la papelera</string>
     <string name="pages_empty_scheduled">No tienes ninguna página programada</string>
-    <string name="pages_empty_drafts">No tienes ninguna página en probador</string>
+    <string name="pages_empty_drafts">No tienes ninguna página en borrador</string>
     <string name="pages_empty_published">Todavía no has publicado ninguna página</string>
     <string name="pages_search_suggestion">Buscar páginas</string>
     <string name="pages_empty_search_result">Ninguna página coincide con tu búsqueda</string>
@@ -1077,15 +1433,9 @@ Language: es_VE
     <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
     <string name="quick_start_dialog_need_help_button_negative">No gracias</string>
     <string name="quick_start_dialog_follow_sites_title">Sigue otros sitios</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con intereses similares</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con temáticas similares</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Toca en %1$s Lector %2$s para seguir</string>
     <string name="quick_start_dialog_follow_sites_message">Descubre sitios que te inspiren, y síguelos para obtener actualizaciones cuando publiquen.</string>
-    <string name="quick_start_dialog_customize_site_title">Personaliza tu sitio</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Toca en %1$s Temas %2$s para seguir</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Toca en %1$s Personalizar %2$s para empezar a personalizar tu sitio</string>
-    <string name="quick_start_dialog_choose_theme_title">Elige un tema</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Toca en %1$s Temas %2$s para descubrir nuevos temas</string>
-    <string name="quick_start_dialog_choose_theme_message">Revisa todos nuestros temas para encontrar el que se te ajuste a la perfección</string>
     <string name="quick_start_button_positive">Ir</string>
     <string name="quick_start_button_negative_short">Cancelar</string>
     <string name="quick_start_button_negative">Ahora no</string>
@@ -1110,7 +1460,7 @@ Language: es_VE
     <string name="reader_label_post_search_explainer">¿Que te gustaría encontrar?</string>
     <string name="site_settings_tags_empty_title_search">No hay etiquetas que coincidan con tu búsqueda</string>
     <string name="site_settings_tags_empty_title">No tienes ninguna etiqueta</string>
-    <string name="site_settings_tags_empty_subtitle">Añade aquí las etiquetas que uses frecuentemente para poder seleccionarlas rápidamente al etiquetar tus entradas </string>
+    <string name="site_settings_tags_empty_subtitle">Añade aquí las etiquetas que uses frecuentemente para poder seleccionarlas rápidamente al etiquetar tus entradas</string>
     <string name="site_settings_tags_empty_button">Crea una etiqueta</string>
     <string name="media_empty_search_list">No hay medios que coincidan con tu búsqueda</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">¿Salir de WordPress?</string>
@@ -1143,20 +1493,18 @@ Language: es_VE
     <string name="support_identity_input_dialog_email_label">Correo electrónico</string>
     <string name="support_identity_input_dialog_enter_email">Por favor, introduce tu dirección de correo electrónico</string>
     <string name="support_identity_input_dialog_enter_email_and_name">Para continuar, por favor, introduce tu dirección de correo electrónico y nombre</string>
-    <string name="support_push_notification_message">Nuevo mensaje de \'Ayuda y soporte\'</string>
+    <string name="support_push_notification_message">Nuevo mensaje de «Ayuda y soporte»</string>
     <string name="support_push_notification_title">WordPress</string>
     <string name="support_contact_email_not_set">No establecido</string>
     <string name="support_contact_email">Correo electrónico de contacto</string>
     <string name="application_log_button">Registro de la aplicación</string>
     <string name="my_tickets">Mis tickets</string>
-    <string name="activity_log_rewind_dialog_message">¿Quieres rebobinar tu sitio al %1$s a las %2$s? Esto borrará todo el contenido y opciones creadas o cambiadas desde entonces.</string>
-    <string name="activity_log_rewind_site">Rebobinar sitio</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rebobinado en curso</string>
-    <string name="activity_log_currently_restoring_message">Rebobinando a %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restauración en progreso</string>
+    <string name="activity_log_currently_restoring_message">Restaurando a %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Actualmente restaurando tu sitio</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Tu sitio ha sido restaurado satisfactoriamente</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Tu sitio ha sido restaurado satisfactoriamente\nRebobinado a %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Tu sitio está siendo restaurado\nRebobinando a %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Tu sitio ha sido restaurado correctamente\nRestaurado a %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Tu sitio está siendo restaurado\nRestaurando a %1$s %2$s</string>
     <string name="activity_log_button">Botón de acción del registro de actividad</string>
     <string name="plugin_auto_managed">Gestionado automáticamente</string>
     <string name="reader_save_posts_locally_dialog_message">Guarda esta entrada y vuelve cuando quieras para leerla. Solo estará disponible en este dispositivo — las entradas guardadas no se sincronizan con otros dispositivos.</string>
@@ -1166,20 +1514,16 @@ Language: es_VE
     <string name="comment_read_source_post">Lee la entrada de origen</string>
     <string name="sites">Sitios</string>
     <string name="signup_magic_link_title">Enlace mágico enviado</string>
-    <string name="signup_email_screen_title">Registro por correo electrónico</string>
     <string name="verification_2fa_screen_title">Verificación del código</string>
     <string name="selfhosted_site_login_title">Credenciales de acceso</string>
     <string name="magic_link_sent_login_title">Enlace mágico enviado</string>
     <string name="magic_link_login_title">Acceso por enlace mágico</string>
     <string name="site_address_login_title">Acceso mediante la dirección del sitio</string>
     <string name="email_address_login_title">Acceso mediante dirección de correo electrónico</string>
-    <string name="alternatively">Alternativamente:</string>
     <string name="reader_empty_saved_posts_description">Toca %s para guardar una entrada en tu lista.</string>
     <string name="reader_empty_saved_posts_title">¡Aún no hay entradas guardadas!</string>
     <string name="reader_bookmark_snack_title">Entrada guardada</string>
     <string name="reader_bookmark_snack_btn">Ver todas</string>
-    <string name="reader_btn_bookmarked">Guardada</string>
-    <string name="reader_btn_bookmark">Guardar</string>
     <string name="reader_remove_bookmark">Borrada de las entradas guardadas</string>
     <string name="reader_add_bookmark">Añadir a las entradas guardadas</string>
     <string name="reader_save_for_later_title">Entradas guardadas</string>
@@ -1199,11 +1543,9 @@ Language: es_VE
     <string name="reader_btn_notifications_on">Activar los avisos del sitio</string>
     <string name="reader_btn_notifications_off">Desactivar los avisos del sitio</string>
     <string name="activity_log_jetpack_icon">Icono de Jetpack</string>
-    <string name="rewind">Rebobinar</string>
     <string name="activity_log_event">Evento</string>
     <string name="activity_log_icon">Icono de actividad</string>
     <string name="activity_log">Registro de actividad</string>
-    <string name="activity">Actividad</string>
     <string name="privacy_policy_read">Lee la política de privacidad</string>
     <string name="third_party_policy_learn_more_caption">Usamos otras herramientas de seguimiento, incluidas algunas de terceros. Lee acerca de estas y cómo controlarlas.</string>
     <string name="third_party_policy_learn_more_header">Política de terceros</string>
@@ -1214,9 +1556,8 @@ Language: es_VE
     <string name="preference_privacy_settings">Ajustes de privacidad</string>
     <string name="preference_collect_information">Recopilar información</string>
     <string name="post_submitted">Entrada enviada</string>
-    <string name="login_email_button_signup">¿No tienes una cuenta? %1$s Regístrate %2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Una característica del plugin requiere que el sitio esté en buen estado.</string>
-    <string name="plugin_install_site_ineligible_not_domain_owner">Una característica del plugin necesita que la suscripción principal del dominio esté asociada con este usuario.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Una característica del plugin necesita que la suscripción del dominio principal esté asociada con este usuario.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Una característica del plugin necesita privilegios de administrador.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">El plugin no puede instalarse en sitios VIP.</string>
     <string name="plugin_install_site_ineligible_excessive_disk_space">El plugin no se puede instalar debido a las limitaciones de espacio del disco.</string>
@@ -1227,7 +1568,7 @@ Language: es_VE
     <string name="plugin_install_first_plugin_almost_finished_dialog_message">Estamos haciendo la configuración final, está casi listo…</string>
     <string name="plugin_install_first_plugin_progress_dialog_message">Instalando plugin…</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Instalar</string>
-    <string name="plugin_install_first_plugin_confirmation_dialog_message">Instalar el primer plugin en tu sitio puede tomar hasta 1 minuto. Durante este tiempo, no podrás realizar cambios en tu sitio.</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_message">Instalar el primer plugin en tu sitio puede llevar hasta 1 minuto. Durante este tiempo no podrás realizar cambios en tu sitio.</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Instalar plugin</string>
     <string name="notification_settings_followed_dialog_title">Avisos</string>
     <string name="notification_settings_followed_dialog_email_comments">Enviarme nuevos comentarios por correo electrónico</string>
@@ -1249,7 +1590,7 @@ Language: es_VE
     <string name="media_preview_title">%1$d de %2$d</string>
     <string name="stock_media_picker_initial_empty_subtext">Fotografías facilitadas por %s</string>
     <string name="stock_media_picker_initial_empty_text">Busca para encontrar fotografías gratuitas para añadir a tu biblioteca de medios</string>
-    <string name="stock_media_picker_search_hint">Búsqueda gratuita en la biblioteca de fotos</string>
+    <string name="stock_media_picker_search_hint">Búsqueda en la biblioteca de fotos gratuitas</string>
     <string name="photo_picker_stock_media">Selecciona de la biblioteca gratuita de fotos</string>
     <string name="error_save_empty_draft">No se puede guardar un borrador vacío</string>
     <string name="site_settings_quota_space_unlimited">%1$s de ilimitado</string>
@@ -1262,8 +1603,8 @@ Language: es_VE
     <string name="show_more_desc">mostrar más</string>
     <string name="reader_photo_view_desc">foto</string>
     <string name="reader_list_item_suggestion_remove_desc">borrar</string>
-    <string name="photo_picker_thumbnail_desc">Reproducir video</string>
-    <string name="reader_cardview_post_play_video_desc">reproducir video destacado</string>
+    <string name="photo_picker_thumbnail_desc">Reproducir vídeo</string>
+    <string name="reader_cardview_post_play_video_desc">reproducir vídeo destacado</string>
     <string name="plugin_detail_logo_desc">logo del plugin</string>
     <string name="plugin_detail_banner_desc">banner del plugin</string>
     <string name="photo_picker_wpmedia_desc">elige desde medios de WordPress</string>
@@ -1274,7 +1615,7 @@ Language: es_VE
     <string name="media_settings_image_preview_desc">previsualizar imagen</string>
     <string name="media_preview_desc">vista previa</string>
     <string name="media_preview_audio_desc">audio</string>
-    <string name="media_grid_item_play_video_desc">reproducir video</string>
+    <string name="media_grid_item_play_video_desc">reproducir vídeo</string>
     <string name="media_grid_item_trash_desc">papelera</string>
     <string name="media_grid_item_retry_desc">reintentar</string>
     <string name="media_grid_item_image_desc">vista previa de medios, nombre de archivo %s</string>
@@ -1313,7 +1654,6 @@ Language: es_VE
     <string name="edit_photo_screen_title">Editar foto</string>
     <string name="share_intent_screen_title">Elige el sitio</string>
     <string name="signup_epilogue_screen_title">Cuenta nueva</string>
-    <string name="login_prologue_screen_title">Iniciar sesión</string>
     <string name="login_epilogue_screen_title">Conectado como</string>
     <string name="person_detail_screen_title">Detalle de la persona</string>
     <string name="media_settings_screen_title">Detalles del archivo</string>
@@ -1327,11 +1667,11 @@ Language: es_VE
     <string name="license_screen_title">Licencia</string>
     <string name="release_notes_screen_title">Notas de la versión</string>
     <string name="signup_epilogue_error_avatar_view">Tu avatar se ha subido y estará disponible en breve.</string>
-    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta característica.&lt;br/>&lt;br/>Si deseas usarla, edita tus permisos y comprueba que &lt;strong>%s&lt;/strong> se ha activado.</string>
+    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta característica.&lt;br/&gt;&lt;br/&gt;Para cambiarlo, edita tus permisos y asegúrate de que &lt;strong&gt;%s&lt;/strong&gt; está activado.</string>
     <string name="permissions_denied_title">Permisos</string>
     <string name="plugin_caption_featured">Destacados</string>
-    <string name="sharing_disabled_description">No puedes acceder a los ajustes compartidos porque el módulo Compartir de Jetpack está desactivado.</string>
-    <string name="sharing_disabled">Módulo Compartir desactivado.</string>
+    <string name="sharing_disabled_description">No puedes acceder a tus ajustes para compartir porque tu módulo de compartir de Jetpack está desactivado.</string>
+    <string name="sharing_disabled">Módulo para compartir desactivado.</string>
     <string name="version_with_name_param">Versión %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
     <string name="publisher_with_company_param">Editor: %s</string>
@@ -1368,7 +1708,6 @@ Language: es_VE
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 entrada con 1 archivo sin subir</string>
     <string name="untitled_in_parentheses">(sin título)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Crear sitio</string>
     <string name="notification_site_creation_created">Toca para continuar.</string>
     <string name="notification_site_creation_title_success">¡Sitio creado!</string>
@@ -1382,11 +1721,8 @@ Language: es_VE
     <string name="username_changer_dismiss_button_positive">Descartar</string>
     <string name="username_changer_action">Guardar</string>
     <string name="content_description_add_avatar">Añadir avatar</string>
-    <string name="signup_with_google_button">Registro con Google</string>
-    <string name="signup_with_email_button">Registro con correo electrónico</string>
     <string name="signup_user_exists">El correo electrónico ya existe en WordPress.com.\nAcceder.</string>
     <string name="signup_updating_account">Actualizando cuenta…</string>
-    <string name="signup_terms_of_service_text">Al registrarte aceptas nuestros %1$sTérminos del servicio%2$s.</string>
     <string name="signup_magic_link_progress">Enviando correo</string>
     <string name="signup_magic_link_error_button_positive">Reintentar</string>
     <string name="signup_magic_link_error_button_negative">Cerrar</string>
@@ -1399,11 +1735,6 @@ Language: es_VE
     <string name="signup_epilogue_error_button_negative">Revertir</string>
     <string name="signup_epilogue_error_generic">Hubo algún problema al actualizar tu cuenta. Puedes reintentarlo o revertir tus cambios para continuar.</string>
     <string name="signup_epilogue_error_avatar">Hubo algún problema al subir tu avatar.</string>
-    <string name="signup_email_header">Para crear tu nueva cuenta de WordPress.com, por favor, introduce tu dirección de correo electrónico.</string>
-    <string name="signup_email_error_generic">Hubo algún problema al comprobar la dirección de correo.</string>
-    <string name="sign_up">Registro en WordPress.com</string>
-    <string name="enter_username_instead">Accede con tu nombre de usuario.</string>
-    <string name="enter_site_address_instead">Accede introduciendo la dirección de tu sitio.</string>
     <string name="plugin_needs_update">Necesita actualizarse</string>
     <string name="plugin_caption_search">Buscar plugins</string>
     <string name="plugin_caption_new">Nuevo</string>
@@ -1518,13 +1849,12 @@ Language: es_VE
     <string name="media_files_uploaded">%d archivos subidos</string>
     <string name="media_files_not_uploaded">%d archivos no subidos</string>
     <string name="remove_image_from_post">Quitar de la entrada</string>
-    <string name="confirm_remove_media_image">¿Quitamos esta imagen de la entrada?</string>
+    <string name="confirm_remove_media_image">¿Eliminar esta imagen de la entrada?</string>
     <string name="media_edit_customize_card_caption">Personalizar</string>
     <string name="media_edit_file_details_card_caption">Detalles del archivo</string>
     <string name="login_error_suffix">\n¿Quizás probando con otra cuenta?</string>
     <string name="login_error_generic">Hubo algún problema al conectar con la cuenta de Google.</string>
     <string name="login_error_button">Cerrar</string>
-    <string name="login_google_button_suffix">Acceder con Google.</string>
     <string name="enter_wpcom_password_google">Para seguir con esta cuenta de Google, por favor, facilita la contraseña correspondiente de WordPress.com. Solo se te pedirá una vez.</string>
     <string name="error_generic_network">Ocurrió un error en la red. Por favor, revisa tu conexión e inténtalo de nuevo.</string>
     <string name="post_settings_remove_featured_image">Quitar imagen destacada</string>
@@ -1535,14 +1865,13 @@ Language: es_VE
     <string name="jetpack_disconnect_success_toast">Sitio desconectado</string>
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">¿Estás seguro de querer desconectar Jetpack del sitio?</string>
-    <string name="jetpack_disconnect_pref_title">«Desconecta de WordPress.com»</string>
-    <string name="site_settings_jetpack_whitelist_description">Puedes poner en lista blanca una dirección IP o series de direcciones, evitando que las bloquee Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango introduce  un valor inferior y un valor superior separados por guiones. Ejemplo: 12.12.12.1–12.12.12.100</string>
+    <string name="jetpack_disconnect_pref_title">«Desconectar de WordPress.com»</string>
+    <string name="site_settings_jetpack_allowlist_description">Puedes poner una dirección o series de direcciones IP en lista de «siempre permitidas», evitando que las bloquee Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango, introduce un valor inferior y un valor superior separados por guiones. Ejemplo: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Requiere la identificación en dos pasos</string>
     <string name="jetpack_match_wpcom_via_email_title">Relacionar cuentas usando el correo electrónico</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir el acceso con WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Acceso con WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Direcciones IP en lista blanca</string>
-    <string name="jetpack_prevent_brute_force_title">Bloquea intentos de acceso malisiosos</string>
+    <string name="jetpack_prevent_brute_force_title">Bloquea intentos de acceso maliciosos</string>
     <string name="jetpack_prevent_brute_force_category_title">Protección contra ataques de fuerza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar avisos instantáneos</string>
     <string name="jetpack_send_email_notifications_title">Enviar avisos por correo electrónico</string>
@@ -1556,7 +1885,7 @@ Language: es_VE
     <string name="share_media_permission_required">Se requieren permisos para compartir imágenes o vídeos</string>
     <string name="invalid_ip_or_range">IP o rango de IP no válido</string>
     <string name="deleting_media_dlg">Eliminando</string>
-    <string name="confirm_delete_media_video">¿Borrar este video?</string>
+    <string name="confirm_delete_media_video">¿Borrar este vídeo?</string>
     <string name="confirm_delete_media_image">¿Eliminar esta imagen?</string>
     <string name="media_title_document_details">Detalles del documento</string>
     <string name="media_title_audio_details">Detalles del audio</string>
@@ -1582,12 +1911,12 @@ Language: es_VE
     <string name="notification_settings_category_other">Otros</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos mis sitios</string>
     <string name="notification_settings_category_your_sites">Tus sitios</string>
-    <string name="notification_settings_master_off_message">Desactivando los ajustes de avisos desactivará todos los avisos de esta aplicación, da igual el tipo. Puedes ajustar al detalle que tipo de aviso recibir tras activar los ajustes de avisos.</string>
-    <string name="notification_settings_master_off_title">Para recibir avisos en este dispositivo activa los ajustes de avisos.</string>
-    <string name="notification_settings_master_hint_off">Activar avisos</string>
-    <string name="notification_settings_master_hint_on">Desactivar avisos</string>
-    <string name="notification_settings_master_status_off">Inactivos</string>
-    <string name="notification_settings_master_status_on">Activos</string>
+    <string name="notification_settings_main_off_message">Desactivando los ajustes de avisos, se desactivarán todos los avisos de esta aplicación, sin importar el tipo. Puedes ajustar al detalle que tipo de aviso recibir tras activar los ajustes de avisos.</string>
+    <string name="notification_settings_main_off_title">Para recibir avisos en este dispositivo activa los ajustes de avisos.</string>
+    <string name="notification_settings_main_hint_off">Activar avisos</string>
+    <string name="notification_settings_main_hint_on">Desactivar avisos</string>
+    <string name="notification_settings_main_status_off">Inactivos</string>
+    <string name="notification_settings_main_status_on">Activos</string>
     <string name="max_video_resolution">Tamaño máximo de vídeo</string>
     <string name="max_thumbnail_px_size">Tamaño máximo de imagen</string>
     <string name="error_upload_post_media_param">Hubo un error al subir los medios a esta entrada: %s.</string>
@@ -1624,7 +1953,6 @@ Language: es_VE
     <string name="login_site_address_more_help">¿Necesitas más ayuda?</string>
     <string name="login_site_address_help_content">La dirección de tu sitio aparece en la barra de la parte superior de la pantalla cuando visitas tu sitio en Chrome.</string>
     <string name="login_site_address_help_title">¿Cuál es la dirección de mi sitio?</string>
-    <string name="login_site_address_help">¿Necesitas ayuda para encontrar la dirección de tu sitio?</string>
     <string name="login_site_address">Dirección del sitio</string>
     <string name="enter_site_address">Introduce la dirección del sitio WordPress con el que te gustaría conectar.</string>
     <string name="login_already_logged_in_wpcom">Ya estás conectado a WordPress.com</string>
@@ -1636,7 +1964,6 @@ Language: es_VE
     <string name="requesting_otp">Solicitando un código de verificación por SMS.</string>
     <string name="login_text_otp">Envíame un mensaje con un código en su lugar</string>
     <string name="enter_verification_code">¡Casi lo tenemos! Por favor, introduce un código de verificación desde tu aplicación Authenticator.</string>
-    <string name="open_mail">Abrir correo electrónico</string>
     <string name="next">Siguiente</string>
     <string name="enter_email_wordpress_com">Accede a WordPress.com usando una dirección de correo electrónico para gestionar todos tus sitios WordPress.</string>
     <string name="image_optimization_promo_desc">La optimización de imagen reduce las imágenes para que suban más rápido.\n\nPuedes cambiar esto en cualquier momento en los ajustes del sitio.</string>
@@ -1659,10 +1986,6 @@ Language: es_VE
     <string name="post_status_draft">Borrador</string>
     <string name="post_status_pending_review">Pendiente de revisión</string>
     <string name="post_status_publish_post">Publicar</string>
-    <string name="change_location">Cambiar ubicación</string>
-    <string name="remove_location">Borrar ubicación</string>
-    <string name="post_settings_error_placepicker_missing_play_services">No se ha podido abrir el selector de ubicación, no  disponible Google Play Services</string>
-    <string name="post_settings_location">Ubicación</string>
     <string name="now">Ahora</string>
     <string name="post_settings_password_dialog_hint">Solo los que tengan esta contraseña pueden ver esta entrada</string>
     <string name="post_settings_excerpt_dialog_hint">Los extractos son resúmenes opcionales del contenido hechos a mano.</string>
@@ -1687,7 +2010,7 @@ Language: es_VE
     <string name="media_error_http_too_large_video_upload">Vídeo demasiado grande para subir</string>
     <string name="media_error_http_too_large_photo_upload">La imagen es demasiado grande para subirla. Trata de cambiar la optimización de imágenes en los ajustes de la aplicación</string>
     <string name="media_audio">Audio</string>
-    <string name="media_videos">Videos</string>
+    <string name="media_videos">Vídeos</string>
     <string name="media_documents">Documentos</string>
     <string name="media_images">Imágenes</string>
     <string name="media_all">Todos</string>
@@ -1695,7 +2018,7 @@ Language: es_VE
     <string name="reader_view_comments">Ver comentarios</string>
     <string name="site_settings_video_quality_hint">Calidad de los vídeos. Valores más altos implican vídeos de mejor calidad.</string>
     <string name="site_settings_video_width_hint">Redimensiona los vídeos en las entradas a este tamaño</string>
-    <string name="site_settings_optimize_video_summary">Activa la redimensión y compresión de vídeos</string>
+    <string name="site_settings_optimize_video_summary">Activar para redimensionar y comprimir los vídeos</string>
     <string name="site_settings_optimize_videos">Optimizar vídeos</string>
     <string name="draft_uploaded">Borrador subido</string>
     <string name="report_bug">Informar de fallo</string>
@@ -1718,7 +2041,7 @@ Language: es_VE
     <string name="sharing_more_description">Un botón «Más» contiene un desplegable que muestra botones de compartir</string>
     <string name="sharing_sharing_buttons_description">Elige qué botones se mostrarán debajo de tus entradas</string>
     <string name="twitter_username">Usuario de Twitter</string>
-    <string name="sharing_comment_likes">Me gusta a comentarios</string>
+    <string name="sharing_comment_likes">«Me gusta» del comentario</string>
     <string name="button_style">Estilo del botón</string>
     <string name="label">Etiqueta</string>
     <string name="sharing_buttons">Botones de compartir</string>
@@ -1737,7 +2060,7 @@ Language: es_VE
     <string name="share_btn_disconnect">Desconectar</string>
     <string name="share_btn_connect">Conectar</string>
     <string name="connection_service_description">Conéctate para compartir automáticamente las entradas de tu blog en %s</string>
-    <string name="connection_service_label">Divulgar en %s</string>
+    <string name="connection_service_label">Difundir en %s</string>
     <string name="connected_accounts_label">Cuentas conectadas</string>
     <string name="connections_description">Conecta con tus servicios de medios sociales favoritos para compartir automáticamente las nuevas entradas con tus amigos.</string>
     <string name="connections_label">Conexiones</string>
@@ -1791,19 +2114,19 @@ Language: es_VE
     <string name="media_encoder_quality_90">Alta</string>
     <string name="media_encoder_quality_85">Media</string>
     <string name="media_encoder_quality_80">Baja</string>
-    <string name="media_upload_state_uploaded">Se ha subido</string>
+    <string name="media_upload_state_uploaded">Subido</string>
     <string name="media_upload_state_failed">Fallo al subir</string>
     <string name="media_upload_state_deleted">Se ha eliminado</string>
     <string name="media_upload_state_deleting">Eliminando</string>
     <string name="media_upload_state_uploading">Subiendo</string>
     <string name="media_upload_state_queued">En cola</string>
     <string name="image_quality">Calidad de la imagen</string>
-    <string name="error_all_media_upload_canceled">Todos los archivos de multimedia han sido cancelados debido a un error desconocido. Por favor vuelva a intentar cargarlos</string>
+    <string name="error_all_media_upload_canceled">Todos los archivos de medios se han cancelado debido a un error desconocido. Por favor, vuelve a intentar cargarlos</string>
     <string name="error_unknown_post_type">Formato de entrada desconocido</string>
     <string name="submit_for_review">Enviar</string>
     <string name="duplicate_site_detected">Se ha detectado un sitio duplicado.</string>
     <string name="cannot_add_duplicate_site">Este sitio ya existe en la aplicación, no puedes añadirlo.</string>
-    <string name="already_logged_in_wpcom">Ya estás registrado en una cuenta de WordPress.com, no se puede añadir un sitio de WordPress.com a otra cuenta.</string>
+    <string name="already_logged_in_wpcom">Ya estás conectado en una cuenta de WordPress.com, no puedes añadir un sitio de WordPress.com vinculado a otra cuenta.</string>
     <string name="error_media_load">No se puede cargar archivos multimedia</string>
     <string name="error_media_refresh_no_connection">Se necesita estar conectado para actualizar la biblioteca</string>
     <string name="error_media_unauthorized">No tienes permiso para ver o editar archivos multimedia</string>
@@ -1815,7 +2138,7 @@ Language: es_VE
     <string name="retry">Reintentar</string>
     <string name="confirm">Confirmar</string>
     <string name="xmlrpc_endpoint_forbidden_error">No se pudo conectar. Se ha recibido un error 403 cuando se intenta acceder a \n        tu endpoint del XMLRPC de sitio. La aplicación lo necesita para comunicarse con tu sitio. Ponte en contacto con tu proveedor para solucionar este problema.</string>
-    <string name="xmlrpc_post_blocked_error">No se pudo conectar. Su alojamiento está bloqueando las peticiones POST, y la aplicación las necesita \n        para comunicarse con su sitio. Póngase en contacto con su alojamiento para solucionar este problema.</string>
+    <string name="xmlrpc_post_blocked_error">No se pudo conectar. Tu alojamiento está bloqueando las peticiones POST, y la aplicación las necesita \n        para comunicarse con tu sitio. Ponte en contacto con tu alojamiento para solucionar este problema.</string>
     <string name="reader_hint_search_followed_sites">Busca en los sitios que sigues</string>
     <string name="pending_draft_one_generic">¡No dejes el trabajo a medias! «%1$s» está pendiente de publicarse.</string>
     <string name="pending_draft_one_month">¡No dejes el trabajo a medias! «%1$s» está pendiente de publicarse.</string>
@@ -1846,7 +2169,7 @@ Language: es_VE
     <string name="signout">Cerrar sesión</string>
     <string name="sign_in_wpcom">Iniciar sesión en WordPress.com</string>
     <string name="reader_label_global_related_posts">Más en WordPress.com</string>
-    <string name="reader_label_local_related_posts">Más en %s</string>
+    <string name="reader_label_local_related_posts">Más de %s</string>
     <string name="preference_open_device_settings">Abrir ajustes del dispositivo</string>
     <string name="invite_invalid_email">%s: Correo electrónico no válido</string>
     <string name="invite_user_blocked_invites">%s: Invitaciones bloqueadas por el usuario</string>
@@ -1894,26 +2217,22 @@ Language: es_VE
     <string name="invite_error_invalid_usernames_multiple">No se pudo enviar: Hay nombres de usuario o correos electrónicos no válidos.</string>
     <string name="invite_error_invalid_usernames_one">No se pudo enviar: Un nombre de usuario o correo electrónico no es válido</string>
     <string name="invite_error_no_usernames">Por favor, añade al menos un nombre de usuario</string>
-    <string name="invite_message_info">(Opcional) Puedes introducir un mensaje personalizado de hasta 500 caracteres que se incluirá en la invitación.</string>
-    <string name="invite_message_remaining_other">%d caracteres restantes</string>
-    <string name="invite_message_remaining_one">Queda 1 carácter</string>
-    <string name="invite_message_remaining_zero">Quedan 0 caracteres</string>
     <string name="invite_message_title">Mensaje personalizado</string>
     <string name="invite">Invitar</string>
-    <string name="invite_names_title">Nombres de usuario o correos electrónicos</string>
+    <string name="invite_names_title">Nombres de usuarios o correos electrónicos</string>
     <string name="invite_people">Invitar a gente</string>
     <string name="my_site_header_external">Externo</string>
-    <string name="send_link">Enviar enlace</string>
     <string name="label_clear_search_history">Borrar historial de búsqueda</string>
     <string name="dlg_confirm_clear_search_history">¿Borrar historial de búsqueda?</string>
     <string name="reader_empty_search_description">No se han encontrado resultados con %s para tu idioma</string>
     <string name="reader_hint_post_search">Buscar en WordPress</string>
+    <string name="reader_title_related_post_detail">Entrada relacionada</string>
     <string name="preview_screen_links_disabled">Los enlaces están desactivados en la pantalla de vista previa</string>
     <string name="send">Enviar</string>
     <string name="person_removed">\@%1$s eliminado correctamente.</string>
     <string name="user_remove_confirmation_message">Si eliminas %1$s, ese usuario ya no será capaz de acceder a este sitio, pero cualquier contenido que fuera creado por %1$s permanecerá en el sitio.\n\n¿Aún te gustaría eliminar este usuario?</string>
     <string name="person_remove_confirmation_title">Eliminar %1$s</string>
-    <string name="role">Rol</string>
+    <string name="role">Perfil</string>
     <string name="people">Gente</string>
     <string name="reader_empty_posts_in_custom_list">Los sitios de esta lista no han publicado nada últimamente.</string>
     <string name="error_remove_user">No se pudo eliminar el usuario</string>
@@ -1926,7 +2245,6 @@ Language: es_VE
     <string name="checking_email">Comprobando correo electrónico</string>
     <string name="magic_link_unavailable_error_message">Actualmente no disponible. Por favor, introduce tu contraseña</string>
     <string name="logging_in">Accediendo</string>
-    <string name="enter_your_password_instead">Introduce tu contraseña</string>
     <string name="web_address_dialog_hint">Cuando comentes se hará público</string>
     <string name="capture_or_pick_photo">Captura o elige imagen</string>
     <string name="plans">Planes</string>
@@ -1962,7 +2280,7 @@ Language: es_VE
     <string name="comments_empty_list_filtered_approved">No hay comentarios aprobados</string>
     <string name="xmlrpc_missing_method_error">No se pudo conectar. Los métodos requeridos en el XML-RPC faltan en el servidor.</string>
     <string name="alignment_center">Centrado</string>
-    <string name="post_format_video">Video</string>
+    <string name="post_format_video">Vídeo</string>
     <string name="post_format_status">Estado</string>
     <string name="post_format_standard">Estándar</string>
     <string name="post_format_quote">Cita</string>
@@ -2007,7 +2325,7 @@ Language: es_VE
     <string name="error_refresh_comments_showing_older">No se pudieron actualizar los comentarios ahora mismo - se muestran comentarios antiguos</string>
     <string name="post_settings_set_featured_image">Establece la imagen destacada</string>
     <string name="post_settings_featured_image">Imagen destacada</string>
-    <string name="email_address">Correo electrónico</string>
+    <string name="email_address">Dirección de correo electrónico</string>
     <string name="dlg_sure_to_delete_comments">¿Eliminar de forma permanente estos comentarios?</string>
     <string name="dlg_sure_to_delete_comment">¿Eliminar de forma permanente este comentario?</string>
     <string name="mnu_comment_delete_permanently">Eliminar</string>
@@ -2036,7 +2354,7 @@ Language: es_VE
     <string name="about_me">Sobre mí</string>
     <string name="public_display_name_hint">El nombre público mostrará por defecto el nombre de usuario si no está establecido</string>
     <string name="public_display_name">Nombre que se mostrará públicamente</string>
-    <string name="last_name">Apellido</string>
+    <string name="last_name">Apellidos</string>
     <string name="first_name">Nombre</string>
     <string name="my_profile">Mi perfil</string>
     <string name="cd_related_post_preview_image">Imagen de vista previa de entradas relacionadas</string>
@@ -2047,7 +2365,7 @@ Language: es_VE
     <string name="site_settings_paging_dialog_description">Rompe los hilos de comentarios en múltiples páginas</string>
     <string name="site_settings_paging_dialog_header">Comentarios por página</string>
     <string name="site_settings_close_after_dialog_title">Cerrar los comentarios</string>
-    <string name="site_settings_blacklist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, así «press» coincidirá con «WordPress».</string>
+    <string name="site_settings_denylist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, de modo que «press» coincidirá con «WordPress».</string>
     <string name="site_settings_hold_for_moderation_description">Cuando un comentario contenga alguna de las estas palabras en su contenido, nombre, URL, correo electrónico o IP, será puesto en la cola para moderar. Puedes introducir palabras parciales, así «press» coincidirá con «Wordpress».</string>
     <string name="site_settings_list_editor_input_hint">Introduce una palabra o frase</string>
     <string name="site_settings_list_editor_no_items_text">Sin elementos</string>
@@ -2062,10 +2380,10 @@ Language: es_VE
     <string name="site_settings_rp_show_header_title">Mostrar cabecera</string>
     <string name="site_settings_rp_switch_summary">Las entradas relacionadas muestran contenido relevante de tu sitio debajo de las entradas.</string>
     <string name="site_settings_rp_switch_title">Mostrar entradas relacionadas</string>
-    <string name="site_settings_blacklist_hint">Los comentarios que coinciden con un filtro, son marcados como spam</string>
+    <string name="site_settings_denylist_hint">Los comentarios que coinciden con un filtro, son marcados como spam</string>
     <string name="site_settings_moderation_hold_hint">Los comentarios que coinciden con un filtro, son puestos en la cola para moderar</string>
     <string name="site_settings_multiple_links_hint">Ignorar límite de enlaces de usuarios conocidos</string>
-    <string name="site_settings_whitelist_hint">El autor de un comentario debe tener aprobado un comentario previo</string>
+    <string name="site_settings_allowlist_hint">El autor de un comentario debe tener aprobado un comentario previo</string>
     <string name="site_settings_user_account_required_hint">Los usuarios deben estar registrados e iniciar sesión para comentar</string>
     <string name="site_settings_identity_required_hint">El autor de un comentario debe rellenar el nombre y correo eléctronico</string>
     <string name="site_settings_paging_hint">Mostrar los comentarios en pedazos de un tamaño especificado</string>
@@ -2088,17 +2406,16 @@ Language: es_VE
     <string name="site_settings_address_hint">El cambio de dirección no está soportado en este momento</string>
     <string name="site_settings_tagline_hint">Una descripción corta o frase ingeniosa que describa tu blog</string>
     <string name="site_settings_title_hint">En pocas palabras, explica sobre que es este sitio</string>
-    <string name="site_settings_whitelist_known_summary">Comentarios de usuarios conocidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentarios de todos los usuarios</string>
+    <string name="site_settings_allowlist_known_summary">Comentarios de usuarios conocidos</string>
+    <string name="site_settings_allowlist_all_summary">Comentarios de todos los usuarios</string>
     <string name="site_settings_threading_summary">%d niveles</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Borrar el sitio</string>
-    <string name="site_settings_blacklist_title">Lista negra</string>
     <string name="site_settings_moderation_hold_title">Mantener para moderación</string>
     <string name="site_settings_multiple_links_title">Enlaces en comentarios</string>
-    <string name="site_settings_whitelist_title">Aprobar automáticamente</string>
+    <string name="site_settings_allowlist_title">Aprobar automáticamente</string>
     <string name="site_settings_paging_title">Paginación</string>
     <string name="site_settings_threading_title">Comentarios anidados</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -2164,7 +2481,7 @@ Language: es_VE
     <string name="notifications_empty_action_all">¡Actívate! Comenta en entradas de blogs que sigues.</string>
     <string name="notifications_empty_comments">No hay comentarios aún</string>
     <string name="notifications_empty_unread">¡Te has puesto al día!</string>
-    <string name="reader_short_comment_count_multi">%s Comentarios</string>
+    <string name="reader_short_comment_count_multi">%s comentarios</string>
     <string name="reader_short_comment_count_one">1 Comentario</string>
     <string name="reader_hint_comment_on_post">Responder a la entrada…</string>
     <string name="reader_discover_visit_blog">Visita %s</string>
@@ -2178,8 +2495,8 @@ Language: es_VE
     <string name="reader_menu_tags">Editar temas y sitios</string>
     <string name="reader_title_post_detail">Entrada del lector</string>
     <string name="notifications_push_summary">Ajustes para los avisos que aparecen en tu dispositivo.</string>
-    <string name="notifications_email_summary">Ajustes para los avisos que se envían al correo electrónico ligado a tu cuenta.</string>
-    <string name="notifications_tab_summary">Ajustes para las avisos que aparecen en la pestaña de avisos.</string>
+    <string name="notifications_email_summary">Ajustes para los avisos que se envían al correo electrónico enlazado a tu cuenta.</string>
+    <string name="notifications_tab_summary">Ajustes para los avisos que aparecen en la pestaña de avisos.</string>
     <string name="notifications_disabled">Los avisos de la aplicación han sido desactivados. Toca aquí para activarlos en los ajustes.</string>
     <string name="notification_types">Tipos de avisos</string>
     <string name="error_loading_notifications">No se han podido cargar los ajustes de avisos</string>
@@ -2210,7 +2527,7 @@ Language: es_VE
     <string name="me_connect_to_wordpress_com">Acceder a WordPress.com</string>
     <string name="me_btn_login_logout">Iniciar/Cerrar sesión</string>
     <string name="me_btn_support">Ayuda y soporte</string>
-    <string name="account_settings">Configuración de la cuenta</string>
+    <string name="account_settings">Ajustes de la cuenta</string>
     <string name="site_picker_cant_hide_current_site">«%s» no se ha ocultado porque es el sitio actual</string>
     <string name="site_picker_create_wpcom">Crear sitio en WordPress.com</string>
     <string name="site_picker_add_self_hosted">Añadir sitio autoalojado</string>
@@ -2247,8 +2564,7 @@ Language: es_VE
     <string name="logs_copied_to_clipboard">Los informes de la aplicación se han copiado al portapapeles</string>
     <string name="reader_empty_posts_in_blog">Este sitio está vacío</string>
     <string name="reader_label_new_posts">Nuevas entradas</string>
-    <string name="reader_page_recommended_blogs">Sitios que te podrían gustar</string>
-    <string name="error_copy_to_clipboard">Ocurrió un error al copiar el texto en el portapapeles</string>
+    <string name="error_copy_to_clipboard">Ha ocurrido un error al copiar el texto en el portapapeles</string>
     <string name="post_uploading">Subiendo entrada</string>
     <string name="stats_followers_years">%1$d años</string>
     <string name="stats_followers_a_year">Un año</string>
@@ -2263,7 +2579,7 @@ Language: es_VE
     <string name="stats_followers_seconds_ago">hace unos segundos</string>
     <string name="stats_view_followers">Seguidores</string>
     <string name="stats_view_publicize">Difundir</string>
-    <string name="stats_view_videos">Videos</string>
+    <string name="stats_view_videos">Vídeos</string>
     <string name="stats_view_top_posts_and_pages">Entradas y páginas</string>
     <string name="stats_view_countries">Países</string>
     <string name="stats_likes">Me gusta</string>
@@ -2294,7 +2610,7 @@ Language: es_VE
     <string name="comment_reply_to_user">Responder a %s</string>
     <string name="posts_empty_list">Aún no se han publicado entradas. ¿Por qué no crear una?</string>
     <string name="signing_out">Cerrando sesión…</string>
-    <string name="reader_toast_err_generic">No ha sido posible realizar esta acción</string>
+    <string name="reader_toast_err_generic">No es posible realizar esta acción</string>
     <string name="reader_toast_err_block_blog">No es posible bloquear este sitio</string>
     <string name="reader_toast_blog_blocked">Las entradas de este sitio no volverán a mostrarse</string>
     <string name="reader_menu_block_blog">Bloquear este sitio</string>
@@ -2310,9 +2626,8 @@ Language: es_VE
     <string name="reader_page_followed_blogs">Sitios que sigues</string>
     <string name="reader_page_followed_tags">Temas seguidos</string>
     <string name="reader_title_blog_preview">Sitio del lector</string>
-    <string name="ssl_certificate_ask_trust">Si normalmente se conecta a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
+    <string name="ssl_certificate_ask_trust">SI normalmente se conecta sin problemas a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
     <string name="ssl_certificate_error">Certificado SSL no válido</string>
-    <string name="forgot_password">¿Has olvidado la contraseña?</string>
     <string name="help">Ayuda</string>
     <string name="username_or_password_incorrect">El nombre de usuario o contraseña que has introducido son incorrectos</string>
     <string name="email_invalid">Introduce una dirección de correo electrónico válida</string>
@@ -2323,19 +2638,19 @@ Language: es_VE
     <string name="error_moderate_comment">Ocurrió un error al moderar el comentario</string>
     <string name="error_generic">Ocurrió un error</string>
     <string name="error_refresh_comments">No se pudieron actualizar los comentarios</string>
-    <string name="error_refresh_pages">Las páginas no se pudieron actualizar en este momento.</string>
+    <string name="error_refresh_pages">Las páginas no pueden ser actualizadas en este momento.</string>
     <string name="error_refresh_posts">Las entradas no pueden ser actualizadas en este momento</string>
     <string name="error_deleting_post">Ocurrió un error al eliminar la entrada</string>
     <string name="notifications_empty_list">Sin avisos</string>
     <string name="sdcard_message">Se necesita una tarjeta SD montada para subir medios</string>
-    <string name="cat_name_required">El campo nombre de categoría es obligatorio</string>
-    <string name="adding_cat_success">Categoría añadida correctamente.</string>
+    <string name="cat_name_required">El campo nombre de categoría es necesario</string>
+    <string name="adding_cat_success">Categoría añadida correctamente</string>
     <string name="adding_cat_failed">No se pudo añadir la categoría</string>
     <string name="mnu_comment_unspam">No es spam</string>
     <string name="theme_fetch_failed">Ocurrió un error al obtener los temas.</string>
     <string name="blog_not_found">Ha ocurrido un error mientras se accedía a este blog</string>
-    <string name="gallery_error">El elemento multimedia no se ha podido recuperar</string>
-    <string name="no_network_message">No hay conexiones de red disponible</string>
+    <string name="gallery_error">El elemento multimedia no ha podido ser recuperado</string>
+    <string name="no_network_message">No hay ninguna conexión de red disponible</string>
     <string name="reader_toast_err_remove_tag">No se ha podido eliminar este tema</string>
     <string name="reader_toast_err_add_tag">No se ha podido añadir este tema</string>
     <string name="reader_title_applog">Registro de la aplicación</string>
@@ -2358,7 +2673,7 @@ Language: es_VE
     <string name="view_in_browser">Ver en el navegador</string>
     <string name="remove_account">Eliminar sitio</string>
     <string name="toast_comment_unedited">El comentario no ha cambiado</string>
-    <string name="content_required">El comentario es obligatorio</string>
+    <string name="content_required">Comentario obligatorio</string>
     <string name="sure_to_cancel_edit_comment">¿Cancelar la edición de este comentario?</string>
     <string name="saving_changes">Guardando cambios</string>
     <string name="trash">Papelera</string>
@@ -2378,12 +2693,12 @@ Language: es_VE
     <string name="comment_status_approved">Aprobado</string>
     <string name="delete_page">¿Borrar página?</string>
     <string name="delete_post">¿Borrar entrada?</string>
-    <string name="post_settings">Ajustes de la entrada</string>
+    <string name="post_settings">Ajustes de entrada</string>
     <string name="file_not_found">No ha sido posible encontrar el archivo a cargar. ¿Se ha borrado o cambiado de ubicación?</string>
     <string name="local_draft">Borrador local</string>
     <string name="page_settings">Ajustes de página</string>
     <string name="link_enter_url_text">Texto del enlace (opcional)</string>
-    <string name="cannot_delete_multi_media_items">Algunos elementos multimedia no se pudieron borrar en este momento. Intenta de nuevo más tarde.</string>
+    <string name="cannot_delete_multi_media_items">Algunos medios no se han podido borrar en este momento. Inténtalo de nuevo más tarde.</string>
     <string name="media_error_no_permission">No tienes permiso para ver la librería multimedia</string>
     <string name="media_gallery_type_thumbnail_grid">Cuadrícula de miniaturas</string>
     <string name="learn_more">Aprender más</string>
@@ -2400,7 +2715,7 @@ Language: es_VE
     <string name="cant_share_no_visible_blog">No se puede compartir en WordPress si no tienes un blog visible</string>
     <string name="comment_spammed">Comentado marcado como spam</string>
     <string name="reader_toast_err_get_post">No fue posible recuperar esta entrada</string>
-    <string name="reader_likes_you_and_one">A ti y a otra persona les gusta esto</string>
+    <string name="reader_likes_you_and_one">A ti y a otra persona os gusta esto</string>
     <string name="pick_video">Elige un vídeo</string>
     <string name="pick_photo">Elige una foto</string>
     <string name="sign_up_label">Registro</string>
@@ -2437,7 +2752,7 @@ Language: es_VE
     <string name="media_edit_description_text">Descripción</string>
     <string name="media_edit_caption_text">Leyenda</string>
     <string name="media_edit_title_text">Título</string>
-    <string name="media_gallery_type_slideshow">Presentación de diapositivas</string>
+    <string name="media_gallery_type_slideshow">Pase de diapositivas </string>
     <string name="media_gallery_type_circles">Círculos</string>
     <string name="media_gallery_type_tiled">Mosaico</string>
     <string name="media_gallery_type_squares">Cuadrados</string>
@@ -2470,10 +2785,10 @@ Language: es_VE
     <string name="app_title">WordPress para Android</string>
     <string name="image_alignment">Alineación</string>
     <string name="refresh">Refrescar</string>
-    <string name="untitled">Sin título</string>
+    <string name="untitled">Sin Título</string>
     <string name="edit">Editar</string>
     <string name="immediately">Inmediatamente</string>
-    <string name="quickpress_add_alert_title">Establecer nombre del atajo</string>
+    <string name="quickpress_add_alert_title">Establecer el nombre del atajo</string>
     <string name="settings">Ajustes</string>
     <string name="quickpress_add_error">El nombre del atajo no puede estar vacío.</string>
     <string name="pages_private">Privado</string>
@@ -2481,7 +2796,7 @@ Language: es_VE
     <string name="tags_separate_with_commas">Separa las etiquetas con comas</string>
     <string name="categories">Categorías</string>
     <string name="dlg_deleting_comments">Eliminando comentarios</string>
-    <string name="sdcard_title">Requiere una tarjeta SD</string>
+    <string name="sdcard_title">Se necesita una tarjeta SD</string>
     <string name="media">Multimedia</string>
     <string name="approve">Aprobar</string>
     <string name="delete">Eliminar</string>
diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml
index 401d72924172..399cbaf81f94 100644
--- a/WordPress/src/main/res/values-es/strings.xml
+++ b/WordPress/src/main/res/values-es/strings.xml
@@ -1,50 +1,500 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 06:03:11+0000
+Translation-Revision-Date: 2021-05-19 15:52:28+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: es
 -->
 <resources>
-    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos trabajando duro para añadir más bloques con cada versión.</string>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Toca dos veces para añadir un enlace.</string>
+    <string name="gutenberg_native_add_link">AÑADIR ENLACE</string>
+    <string name="login_empty_view_try_another_account">Probar con otra cuenta</string>
+    <string name="login_empty_view_see_instructions">Ver las instrucciones</string>
+    <string name="login_no_jetpack_sites_error_message">Si ya tienes un sitio, tendrás que instalar el plugin gratuito de Jetpack y conectarlo a tu cuenta de WordPress.</string>
+    <string name="login_empty_view_avatar_content_description">Tu foto de perfil</string>
+    <string name="login_not_a_jetpack_site">Si quieres usar esta aplicación para %1$s, deberás tener el plugin de Jetpack configurado y conectado a una cuenta de WordPress.com.</string>
+    <string name="gutenberg_native_size">Tamaño</string>
+    <string name="gutenberg_native_image_settings">Ajustes de imagen</string>
+    <string name="gutenberg_native_audio_settings">Ajustes de audio</string>
+    <string name="gutenberg_native_move_image_forward">Mover la imagen hacia delante</string>
+    <string name="gutenberg_native_move_image_backward">Mover la imagen hacia atrás</string>
+    <string name="user_profile_untitled_site">(Sin título)</string>
+    <string name="user_profile_site_section_header">Sitio</string>
+    <string name="user_profile_bottom_sheet_description">Información de hoja inferior del perfil de usuario</string>
+    <string name="likes_list_screen_title">Lista de Me gusta %s</string>
+    <string name="gutenberg_native_write_code">Escribe código…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Ordenación y filtrado</string>
+    <string name="gutenberg_native_show_download_button">Mostrar el botón de descarga</string>
+    <string name="gutenberg_native_shortcode">Shortcode </string>
+    <string name="gutenberg_native_read_more">Leer más</string>
+    <string name="gutenberg_native_post_content_settings">Ajustes del contenido de la entrada</string>
+    <string name="gutenberg_native_post_meta_settings">Ajustes meta de la entrada</string>
+    <string name="gutenberg_native_preload">Precarga</string>
+    <string name="gutenberg_native_media_area">Área de medios</string>
+    <string name="gutenberg_native_media_file">Archivo de medios</string>
+    <string name="gutenberg_native_metadata">Metadatos</string>
+    <string name="gutenberg_native_loop">Repetir</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Enlazar a</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">imagen %1$d de %2$d en la biblioteca</string>
+    <string name="gutenberg_native_heading_d">Encabezado %d</string>
+    <string name="gutenberg_native_featured">Destacado</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Introduce aquí la URL a incrustar…</string>
+    <string name="gutenberg_native_edit_image">Editar la imagen</string>
+    <string name="gutenberg_native_display_post_date">Mostrar la fecha de la entrada</string>
+    <string name="gutenberg_native_change_heading_level">Cambiar el nivel del encabezado</string>
+    <string name="gutenberg_native_code">Código</string>
+    <string name="gutenberg_native_browser_default">Navegador por defecto</string>
+    <string name="gutenberg_native_attachment_page">Página de adjuntos</string>
+    <string name="gutenberg_native_auto">Automático</string>
+    <string name="gutenberg_native_autoplay">Reproducción automática</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">El bloque no se puede procesar dentro de sí mismo.</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">El bloque se ha borrado o no está disponible.</string>
+    <string name="gutenberg_native_add_text">Añade texto…</string>
+    <string name="gutenberg_native_add_caption">Añadir leyenda</string>
+    <string name="login_no_jetpack_sites">No se han encontrado sitios de Jetpack</string>
+    <string name="gutenberg_native_what_is_alt_text">¿Qué es el texto alt?</string>
+    <string name="gutenberg_native_transform_s_to">Transformar %s a</string>
+    <string name="gutenberg_native_transform_block">Transformar bloque…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Fallo al insertar los medios.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Fallo al insertar el archivo de audio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Describe el propósito de la imagen. Déjalo vacío si la imagen es puramente decorativa.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s transformado a %2$s</string>
+    <string name="like_faces_error_loading_message">Error al cargar los datos de me gusta. %s</string>
+    <string name="like_faces_plural_text">A %d blogueros les gusta esto.</string>
+    <string name="like_faces_singular_text">A 1 bloguero le gusta esto.</string>
+    <string name="like_title_plural">%d me gusta</string>
+    <string name="like_title_singular">1 me gusta</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Introduce las credenciales de tu servidor para corregir las amenazas.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Introduce las credenciales de tu servidor para corregir la amenaza.</string>
+    <string name="suggestion">Sugerencia:</string>
+    <string name="gutenberg_native_search_blocks">Bloques de búsqueda</string>
+    <string name="gutenberg_native_search_block">Bloque de búsqueda</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">doble-toque para cambiar la unidad</string>
+    <string name="gutenberg_native_clear_search">Vaciar la búsqueda</string>
+    <string name="gutenberg_native_cancel_search">Cancelar la búsqueda</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s is %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Ocurrió un error al obtener los datos de los me gusta</string>
+    <string name="get_likes_unknown_error">Ocurrió un error al obtener los me gusta.</string>
+    <string name="get_likes_no_network_error">No hay ninguna red disponible.</string>
+    <string name="comments_empty_list_filtered_unreplied">No hay ningún comentario sin responder</string>
+    <string name="comment_status_unreplied">Sin responder</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Resume tu entrada con una lista de encabezados. Añade anclas HTML a los bloques de encabezados para enlazarlos aquí.</string>
+    <string name="gutenberg_native_summary">resumen</string>
+    <string name="gutenberg_native_table_of_contents">Tabla de contenidos</string>
+    <string name="gutenberg_native_buttongroup">Grupo de botones</string>
+    <string name="gutenberg_native_document_outline">esquema del documento</string>
+    <string name="site_settings_denylist_title">Comentarios no permitidos</string>
+    <string name="jetpack_brute_force_allowlist_title">Direcciones IP permitidas siempre</string>
+    <string name="reader_title_interests">Seguir temas</string>
+    <string name="activity_log_backup_download_notice_download_action">Descargar</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Descartar</string>
+    <string name="stories_intro_main_subtitle">Una nueva forma de crear y publicar contenidos atrayentes en tu sitio.</string>
+    <string name="threat_fix_all_status_success_message_plural">Amenazas corregidas correctamente.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Por favor, confirma que quieres corregir todas las %s amenazas activas.</string>
+    <string name="scan_idle_threats_description_plural">La exploración ha encontrado %1$s amenazas potenciales con %2$s. Por favor, revísalas a continuación y lleva a cabo alguna acción o toca el botón de corregir todo. Estamos %3$s si nos necesitas.</string>
+    <string name="scan_fixing_threats_description_plural">Trabajamos duro para corregir estas amenazas en segundo plano. Mientras tanto puedes seguir usando tu sitio como siempre, puedes volver a comprobar el progreso en cualquier momento.</string>
+    <string name="gutenberg_native_edit_focal_point">Editar el punto focal</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Teclea un nombre para tu sitio</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Toque doble para abrir la hoja del fondo para editar, reemplazar o vaciar la imagen</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Toque doble para abrir la hoja de acción para editar, reemplazar o vaciar la imagen</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Se han completado todas las tareas&lt;/b&gt;&lt;br/&gt;Has llegado a más gente. ¡Buen trabajo!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Se han completado todas las tareas&lt;/b&gt;&lt;br/&gt;Has personalizado tu sitio. ¡Bien hecho!</string>
+    <string name="quick_start_card_menu_hide">Ocultar por ahora</string>
+    <string name="magic_link_not_meaning_to_create_account">¿No querías crear una nueva cuenta? Vuelve atrás y vuelve a introducir tu dirección de correo electrónico.</string>
+    <string name="invite_links_disable_dialog_message">Una vez desactivado el enlace de invitación, nadie podrá usarlo para unirse a tu equipo. ¿Seguro que deseas continuar?</string>
+    <string name="invite_links_disable_dialog_title">Desactivar enlace de invitación</string>
+    <string name="invite_links_bad_format_response">Respuesta recibida no válida</string>
+    <string name="invite_links_null_response">No se ha recibido ninguna respuesta</string>
+    <string name="invite_links_cannot_get_role_data_error">Ocurrió un error al recuperar datos para el perfil %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Ha habido un error al obtener los perfiles</string>
+    <string name="invite_links_generic_get_data_error">Error desconocido al obtener los datos de los enlaces de invitación</string>
+    <string name="invite_links_helper_text">Utiliza este enlace para embarcar a los miembros de tu equipo sin tener que invitarlos uno a uno. Cualquiera que visite estas URL podrá registrarse en tu organización, aunque haya recibido el enlace de otra persona, así que asegúrate de que lo compartes con gente de confianza.</string>
+    <string name="invite_links_expire_date">Caduca %1$s</string>
+    <string name="invite_links_disable_invite_link">Desactivar enlace de invitación</string>
+    <string name="invite_links_share_invite_link">Compartir enlace de invitación</string>
+    <string name="invite_links_generate">Generar nuevo enlace de invitación</string>
+    <string name="invite_links_get_status_retry">Refrescar el estado del enlace</string>
+    <string name="invite_links_section_title">Enlace de invitación</string>
+    <string name="threats_found_singular">Se ha encontrado una amenaza</string>
+    <string name="threats_found_plural">Se han encontrado amenazas</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;No se han encontrado amenazas potenciales</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;%s amenazas potenciales encontradas</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;Una amenaza potencial encontrada</string>
+    <string name="disable">Desactivar</string>
+    <string name="scan_fixing_threats_title_singular">Corrigiendo la amenaza</string>
+    <string name="quick_start_list_review_pages_subtitle">Revisa tus páginas y haz cambios, o añade o elimina páginas.</string>
+    <string name="quick_start_card_menu_unpin">Desanclar</string>
+    <string name="quick_start_list_view_site_title">Visita tu sitio</string>
+    <string name="quick_start_list_upload_icon_subtitle">Añade un icono del sitio para un aspecto pulcro, profesional.</string>
+    <string name="quick_start_list_follow_site_subtitle">Descubre y sigue sitios que te inspiren.</string>
+    <string name="quick_start_list_enable_sharing_title">Activar compartir</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Comparte automáticamente las nuevas entradas en tus medios sociales.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Dale un nombre a tu sitio que refleje su personalidad y temática.</string>
+    <string name="quick_start_list_check_stats_title">Revisa tus estadísticas</string>
+    <string name="backup_download_status_failure_bullet2">Trataremos de crear un archivo de copia de seguridad descargable.</string>
+    <string name="backup_download_status_failure_bullet1">No hemos podido encontrar el estado para decir cuánto tardará tu copia de seguridad descargable.</string>
+    <string name="backup_download_status_failure_heading">Vaya, no hemos podido encontrar el estado de tu copia de seguridad descargable</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icono de marca de comprobación</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icono de reloj</string>
+    <string name="restore_status_failure_bullet3">Te avisaremos cuando hayamos terminado.</string>
+    <string name="restore_status_failure_bullet2">Volveremos a intentar restaurar tu sitio.</string>
+    <string name="restore_status_failure_bullet1">No hemos podido encontrar el estado para decir cuánto tardará tu restauración.</string>
+    <string name="restore_status_failure_heading">Vaya, no hemos podido encontrar el estado de tu restauración</string>
+    <string name="restore_complete_failed_description">No hemos podido restaura tu sitio</string>
+    <string name="restore_warning_action_button">Confirmar</string>
+    <string name="restore_warning_description_with_two_parameters">¡Estás seguro de querer revertir tu sitio al %1$s a las %2$s?\nTodo lo que hayas cambiado desde entonces se perderá.</string>
+    <string name="backup_download_complete_failed_description">No hemos podido crear tu copia de seguridad</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(excluye temas, plugins y subidas)</string>
+    <string name="backup_item_contents">Directorio wp-content</string>
+    <string name="backup_item_roots">Raíz de WordPress</string>
+    <string name="gutenberg_native_uploading">Subiendo…</string>
+    <string name="backup_download_details_choose_items_header">Elementos incluidos en esta descarga</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Los bloques reutilizables no se pueden editar en WordPress para iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Los bloques reutilizables no se pueden editar en WordPress para Android</string>
+    <string name="gutenberg_native_replace_file">Reemplazar archivo</string>
+    <string name="gutenberg_native_replace_audio">Reemplazar audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problema al abrir el audio</string>
+    <string name="gutenberg_native_open">ABIERTO</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Ninguna aplicación puede gestionar esta solicitud.</string>
+    <string name="gutenberg_native_lock_icon">Icono de candado</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Fallo al insertar el archivo de audio. Por favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Toca dos veces para seleccionar un archivo de audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Toca dos veces para escuchar el archivo de audio</string>
+    <string name="gutenberg_native_choose_audio">Elegir audio</string>
+    <string name="gutenberg_native_audio_player">Reproductor de audio</string>
+    <string name="gutenberg_native_audio_file">archivo de audio</string>
+    <string name="gutenberg_native_audio_caption_s">Leyenda del audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Leyenda del audio. Vacía</string>
+    <string name="gutenberg_native_add_audio">AÑADIR AUDIO</string>
+    <string name="continue_with_wpcom">Accede o regístrate con WordPress.com</string>
+    <string name="photo_picker_choose_audio">Elige un audio del dispositivo</string>
+    <string name="people_optional_custom_message_helper_text">Opcional: Introduce un mensaje personalizado que enviar con tu invitación.</string>
+    <string name="photo_picker_use_audio">Usasr este audio</string>
+    <string name="people_learn_more_about_roles">Aprende más sobre los perfiles</string>
+    <string name="threat_status_fixed">Corregido</string>
+    <string name="threat_found_header">Encontrado</string>
+    <string name="scan_here_to_help">aquí para ayudar</string>
+    <string name="scan_idle_threats_description_singular">La exploración ha encontrado una amenaza potencial con %1$s. Por favor, revísalas a continuación y lleva a cabo alguna acción o toca el botón de corregir todo. Estamos %2$s si nos necesitas.</string>
+    <string name="scan_idle_manual_scan_description">Para revisar tu sitio de nuevo ejecuta una exploración manual, o espera a que Jetpack explore tu sitio más tarde hoy mismo. </string>
+    <string name="scan_provisioning_description">¡Bienvenido a la exploración de Jetpack! Le estamos echando un vistazo a tu web para dejarlo todo a punto para el primer análisis completo. Te informaremos si encontramos algún problema que le pueda afectar y después comenzará tu primer análisis.</string>
+    <string name="scan_scanning_is_initial_description">Bienvenido a la herramienta de exploración de Jetpack, estamos echándole un primer vistazo a tu web en estos momentos, te mostraremos los resultados enseguida.</string>
+    <string name="scan_scanning_description">Te enviaremos un email cuando se haya completado la exploración. Mientras tanto puedes continuar usando tu web como siempre. Puedes volver a revisar cómo va el proceso de exploración en cualquier momento.</string>
+    <string name="scan_fixing_threats_description_singular">Trabajamos duro para corregir estas amenazas en segundo plano. Mientras tanto puedes seguir usando tu sitio como siempre, puedes volver a comprobar el progreso en cualquier momento.</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan no ha podido realizar un análisis de tu sitio. Comprueba si tu sitio está caído. Si no, vuelve a intentarlo. Si tu sitio está caído o si Jetpack Scan sigue teniendo problemas, ponte en contacto con nuestro equipo de soporte.</string>
+    <string name="scan_fixing_threats_title_plural">Corrigiendo amenazas</string>
+    <string name="scan_request_failed_title">Algo ha salido mal</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Haciendo copia de seguridad del sitio</string>
+    <string name="activity_log_currently_backing_up_title">Creando una copia de seguridad descargable</string>
+    <string name="activity_log_currently_backing_up_message">Haciendo copia de seguridad del sitio desde %1$s %2$s</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">La copia de seguridad de tu sitio se ha realizado correctamente</string>
+    <string name="pick_audio">Elegir audio</string>
+    <string name="activity_log_backup_finished_snackbar_message">La copia de seguridad de tu sitio se ha realizado correctamente\nHecha copia de seguridad desde %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">La copia de seguridad de tu sitio se está realizando\nHaciendo copia de seguridad desde %1$s %2$s</string>
+    <string name="restore_complete_failed_icon_content_description">Icono de error</string>
+    <string name="restore_complete_failed_action_button_content_description">Botón Listo</string>
+    <string name="restore_another_process_running">Hay otra restauración en curso.</string>
+    <string name="restore_complete_failed_title">No se ha podido restaurar</string>
+    <string name="restore_complete_visit_site_button_content_description">Botón Visitar sitio</string>
+    <string name="restore_complete_done_button_content_description">Botón Listo</string>
+    <string name="restore_complete_icon_content_description">Icono de restaurar</string>
+    <string name="restore_complete_visit_site_action_button">Visitar el sitio</string>
+    <string name="restore_complete_description_with_two_parameters">Todos los elementos seleccionados se han restaurado a la versión del %1$s %2$s.</string>
+    <string name="restore_complete_header">Tu sitio se ha restaurado</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">No hace falta que esperes. Te enviaremos un aviso cuando la restauración se haya completado.</string>
+    <string name="restore_progress_icon_content_description">Icono de restaurar sitio</string>
+    <string name="restore_progress_description_with_two_parameters">Estamos restaurando la versión de tu sitio del %1$s %2$s.</string>
+    <string name="restore_progress_header">Estamos restaurando el sitio</string>
+    <string name="restore_warning_action_button_content_description">Botón Confirmar restauración del sitio</string>
+    <string name="restore_warning_icon_content_description">Imagen de un círculo rojo con un signo de exclamación</string>
+    <string name="restore_warning_header">Advertencia</string>
+    <string name="restore_details_action_button_content_description">Botón Restaurar sitio</string>
+    <string name="restore_details_icon_content_description">Icono de restaurar</string>
+    <string name="restore_details_action_button">Restaurar sitio</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s es el punto seleccionado para la restauración.</string>
+    <string name="restore_details_header">Restaurar sitio</string>
+    <string name="restore_details_choose_items_header">Elige los elementos que quieres restaurar:</string>
+    <string name="restore">Restaurar</string>
+    <string name="backup_download_complete_failed_icon_content_description">Nube con icono de X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Botón Listo</string>
+    <string name="backup_download_complete_failed_action_button">Listo</string>
+    <string name="backup_download_complete_failed_title">La descarga ha fallado</string>
+    <string name="web_preview_tablet">Tableta</string>
+    <string name="web_preview_mobile">Dispositivos móviles</string>
+    <string name="quick_start_card_menu_remove">No mostrar de nuevo</string>
+    <string name="quick_start_dialog_review_pages_message_short">Selecciona %1$s Páginas %2$s para ver tu lista de páginas.</string>
+    <string name="quick_start_dialog_review_pages_message">Cambia, añade o elimina páginas en tu sitio.</string>
+    <string name="quick_start_dialog_review_pages_title">Revisar las páginas del sitio</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Selecciona %1$s Página de inicio %2$s para editar tu página de inicio.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Selecciona %1$s Páginas %2$s para ver tu lista de páginas.</string>
+    <string name="quick_start_card_menu_pin">Anclar</string>
+    <string name="quick_start_dialog_edit_homepage_message">Cambia, añade o elimina contenido en la página de inicio de tu sitio.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Editar la página de inicio</string>
+    <string name="reader_menu_mark_as_unseen">Marcar como no leída</string>
+    <string name="reader_menu_mark_as_seen">Marcar como leída</string>
+    <string name="error_media_upload_failed_for_reason">No se han podido subir los elementos multimedia.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Espacio de almacenamiento del sitio insuficiente</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">No se puede activar o desactivar el estado Es visible de esta entrada</string>
+    <string name="reader_marked_post_as_unseen">Marcar entrada como no leída</string>
+    <string name="reader_marked_post_as_seen">Marcar entrada como leída</string>
+    <string name="threat_fix_all_status_error_message">Se ha producido un error al comprobar el estado de la reparación. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_fix_all_error_message">Se ha producido un error al corregir las amenazas. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_fix_all_status_success_message_singular">La amenaza se ha corregido correctamente.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Por favor, confirma que quieres corregir una amenaza activa.</string>
+    <string name="threat_fix_all_warning_title">Corregir todas las amenazas</string>
+    <string name="threat_ignore_error_message">No se ha podido ignorar la amenaza. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_ignore_success_message">Se ha ignorado la amenaza.</string>
+    <string name="threat_ignore_warning">No deberías ignorar un problema de seguridad a menos que estés absolutamente seguro de que no es dañino. Si eliges ignorar esta amenaza seguirá en tu sitio &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">No se ha podido corregir la amenaza. Ponte en contacto con el servicio de soporte.</string>
+    <string name="threat_item_sub_header_status_ignored">Amenaza ignorada</string>
+    <string name="threat_fixing">Corrigiendo la amenaza</string>
+    <string name="scan_history_ignored_threats_tab">Se ha ignorado</string>
+    <string name="scan_history_no_threats_found">No se encontró ningún elemento</string>
+    <string name="scan_history_fixed_threats_tab">Fijo</string>
+    <string name="scan_history_all_threats_tab">Todos</string>
+    <string name="scan_scanning_title">Analizando archivos</string>
+    <string name="scan_preparing_to_scan_title">Preparando escaneado</string>
+    <string name="scan_history_menu_title">Historia</string>
+    <string name="scan_history">Historial de exploraciones</string>
+    <string name="backup_active_filter_empty_subtitle">Prueba a ajustar el rango de fechas</string>
+    <string name="backup_active_filter_empty_title">No se han encontrado copias de seguridad coincidentes</string>
+    <string name="backup_empty_subtitle">Tu primera copia de seguridad estará disponible aquí en 24 horas y recibirás una notificación una vez que se haya completado</string>
+    <string name="threat_item_sub_header_status_fixed_on">Amenaza corregida el %s</string>
+    <string name="backup_empty_title">Tu primera copia de seguridad estará lista pronto</string>
+    <string name="request_failed_message">Ha ocurrido un problema al gestionar la petición. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="gutenberg_native_move_to_bottom">Mover al final</string>
+    <string name="gutenberg_native_change_block_position">Cambiar la posición del bloque</string>
+    <string name="label_control_upload">Subir</string>
+    <string name="jetpack_icon_content_description">Icono</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Botón de compartir enlace</string>
+    <string name="backup_download_complete_info">También hemos enviado un enlace a tu archivo.</string>
+    <string name="backup_download_complete_download_share_action_button">Compartir enlace</string>
+    <string name="backup_download_complete_download_action_button">Descargar</string>
+    <string name="backup_download_complete_download_action_button_content_description">Botón de descarga</string>
+    <string name="backup_download_complete_icon_content_description">Icono de copia de seguridad descargable lista</string>
+    <string name="backup_download_complete_description_with_two_parameters">Hemos creado una copia de seguridad de tu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Tu copia de seguridad ya está disponible para descargarla</string>
+    <string name="backup_download_complete_page_title">Tu copia de seguridad</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_icon_content_description">Icono de copia de seguridad descargable en curso</string>
+    <string name="backup_download_progress_description_with_two_parameters">Estamos creando una copia de seguridad descargable de tu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Se está creando una copia de seguridad descargable de tu sitio</string>
+    <string name="backup_download_progress_footnote">No hace falta que esperes. Te avisaremos cuando la copia de seguridad esté lista</string>
+    <string name="backup_download_progress_page_title">Descargar copia de seguridad</string>
+    <string name="backup_download_another_download_running">Hay otra descarga en curso.</string>
+    <string name="backup_download_generic_failure">Ha ocurrido un problema al gestionar la petición. Por favor, inténtalo de nuevo más tarde.</string>
+    <string name="backup_download_details_action_button_content_description">Botón Crear copia de seguridad descargable</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s es el punto seleccionado para crear una copia de seguridad descargable.</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="gutenberg_native_image_link_url">URL del vínculo de la imagen</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">entrada cruzada</string>
+    <string name="suggestion_user">usuario</string>
+    <string name="threat_ignore">Ignorar amenaza</string>
+    <string name="threat_fix">Corregir amenaza</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan solucionará la amenaza.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan editará el archivo o el directorio afectados.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan se actualizará a una versión más reciente (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan borrará el archivo o el directorio afectados.</string>
+    <string name="threat_get_free_estimate">Consigue un presupuesto gratuito</string>
+    <string name="suggestion_no_matching">No coincide con %s.</string>
+    <string name="suggestion_problem">Ha ocurrido un problema al cargar las sugerencias.</string>
+    <string name="suggestion_none">No hay sugerencias %s disponibles.</string>
+    <string name="suggestion_selection_needed">Escribe algo para filtrar la lista de sugerencias.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan reemplazará el archivo o el directorio afectados.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan no puede solucionar automáticamente esta amenaza.\n Te sugerimos que soluciones esta amenaza manualmente: asegúrate de que WordPress, tu tema y todos los plugins están actualizados y elimina el código, tema o plugin que esté causando problemas en tu sitio web. \n \n\n Si necesitas más ayuda para resolver esta amenaza, te recomendamos &lt;b&gt;Codeable&lt;/b&gt;, una plataforma de profesionales de confianza, altamente cualificados, expertos en WordPress.\n Han hecho una selección de expertos en seguridad para ayudarnos con estos proyectos. Los precios oscilan entre 70–120 USD/hora y puedes obtener un presupuesto gratuito sin compromiso.</string>
+    <string name="threat_fix_current_not_fixable_header">Solucionando la amenaza</string>
+    <string name="threat_problem_header">¿Cuál fue el problema?</string>
+    <string name="threat_technical_details_header">Información técnica</string>
+    <string name="threat_fix_fixed_header">¿Cómo lo solucionó Jetpack?</string>
+    <string name="threat_fix_default_header">¿Cómo vamos a repararlo?</string>
+    <string name="threat_file_description">Amenaza detectada en el archivo:</string>
+    <string name="threat_details">Detalles de la amenaza</string>
+    <string name="threat_item_sub_header_file_signature">Amenaza encontrada %s</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Se ha encontrado una vulnerabilidad en un tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Se ha encontrado una vulnerabilidad en un plugin</string>
+    <string name="threat_item_sub_header_core_file">Se ha encontrado una vulnerabilidad en WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Varias vulnerabilidades</string>
+    <string name="threat_item_header_vulnerable_theme">Tema vulnerable: %s (versión %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Plugin vulnerable: %s (versión %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: patrón de código malicioso</string>
+    <string name="threat_item_header_database_threat">Amenazas de base de datos %s</string>
+    <string name="threat_item_header_infected_core_file">%s: archivo principal infectado</string>
+    <string name="threat_item_header_threat_found">Se ha encontrado una amenaza</string>
+    <string name="scan_this_site">este sitio</string>
+    <string name="threats_fix_all">Corregir todo</string>
+    <string name="scan_idle_last_scan_description">La última exploración de Jetpack se ejecutó %s y no encontró ningún riesgo. %s</string>
+    <string name="scan_in_few_seconds">en unos segundos</string>
+    <string name="scan_in_minutes_ago">hace %s minuto(s)</string>
+    <string name="scan_in_hours_ago">hace %s hora(s)</string>
+    <string name="backup">Copias de seguridad</string>
+    <string name="scan_idle_threats_found_title">Puede que tu sitio web esté desprotegido</string>
+    <string name="scan_idle_no_threats_found_title">No te preocupes</string>
+    <string name="scan_again">Analizar de nuevo</string>
+    <string name="scan_now">Analizar ahora</string>
+    <string name="scan_state_icon">Icono de estado del análisis</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtro de tipo de actividad (%s tipos seleccionados)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (mostrando %s elementos)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtro de tipo de actividad</string>
+    <string name="activity_log_activity_type_empty_subtitle">No se han registrado actividades en el rango de fechas seleccionado.</string>
+    <string name="activity_log_activity_type_empty_title">No hay actividades disponibles</string>
+    <string name="activity_log_activity_type_error_subtitle">Revisa tu conexión a Internet e inténtalo de nuevo.</string>
+    <string name="activity_log_activity_type_error_title">Sin conexión</string>
+    <string name="activity_log_activity_type_filter_active_label">Tipo de actividad (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtro de rango de fechas</string>
+    <string name="activity_log_active_filter_empty_subtitle">Intenta ajustar los filtros de rango de fecha o de tipo de actividad</string>
+    <string name="activity_log_active_filter_empty_title">No se han encontrado eventos coincidentes</string>
+    <string name="backup_item_media_uploads">Subidas de medios</string>
+    <string name="backup_item_plugins">Plugins de WordPress</string>
+    <string name="backup_item_themes">Temas de WordPress</string>
+    <string name="backup_download_details_icon_content_description">Crea un icono de copia de seguridad descargable</string>
+    <string name="backup_item_roots_hint">(incluye wp-config.php y cualquier archivo que no sea de WordPress)</string>
+    <string name="backup_item_sqls">Base de datos del sitio</string>
+    <string name="backup_download_details_action_button">Crear un archivo descargable</string>
+    <string name="backup_download_details_header">Crear una copia de seguridad descargable</string>
+    <string name="backup_download_details_page_title">Descargar copia de seguridad</string>
+    <string name="backup_download">Descarga de la copia de seguridad</string>
+    <string name="gutenberg_native_error">Error</string>
+    <string name="gutenberg_native_choose_file">Elegir archivo</string>
+    <string name="activity_log_item_menu_download_backup_label">Descargar copia de seguridad</string>
+    <string name="activity_log_item_menu_restore_label">Restaurar hasta este punto</string>
+    <string name="activity_log_activity_type_filter_label">Tipo de actividad</string>
+    <string name="activity_log_date_range_filter_label">Rango de fechas</string>
+    <string name="activity_log_activity_type_filter_header">Filtrar por tipo de actividad</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiar la versión de esta aplicación</string>
+    <string name="dialog_confirm_copy_local_edit_button">Editar la entrada primero</string>
+    <string name="dialog_confirm_copy_local_message">La entrada que estás tratando de copiar tiene dos versiones que están en conflicto o has hecho cambios recientemente, pero no los has guardado.\nEdita la entrada primero para resolver cualquier conflicto o procede a copiar la versión de esta aplicación.</string>
+    <string name="dialog_confirm_copy_local_title">Conflicto de sincronización de la entrada</string>
+    <string name="button_copy">Duplicar</string>
+    <string name="toast_edit_story_update_in_progress_title">La historia está siendo guardada, por favor, espera…</string>
+    <string name="gutenberg_native_file_name">Nombre del archivo</string>
+    <string name="gutenberg_native_choose_a_file">ELEGIR UN ARCHIVO</string>
+    <string name="gutenberg_native_copy_file_url">Copiar la URL del archivo </string>
+    <string name="gutenberg_native_edit_file">Editar el archivo</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Fallo al guardar los medios.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Fallo al subir los archivos.\nPor favor, toca para ver las opciones.</string>
+    <string name="gutenberg_native_file_block_settings">Ajustes del archivo del bloque</string>
+    <string name="new_site_creation_domain_header_title">Elige un dominio</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_unsubscribe_success">Cancelada correctamente la suscripción a los comentarios</string>
+    <string name="reader_follow_comments_get_status_error">Error al recuperar el estado de suscripción para la entrada</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">No se ha podido crear la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">No se ha podido anular la suscripción a los comentarios de esta entrada</string>
+    <string name="reader_btn_following_comments">Siguiendo la conversación por correo electrónico</string>
+    <string name="reader_btn_follow_comments">Seguir la conversación por correo electrónico</string>
+    <string name="my_site_btn_jetpack_settings">Ajustes de Jetpack</string>
+    <string name="reader_follow_comments_subscribe_success">Suscrito correctamente a los comentarios</string>
+    <string name="reader_follow_comments_bad_format_response">Respuesta recibida no válida</string>
+    <string name="reader_follow_comments_null_response">No se ha recibido ninguna respuesta</string>
+    <string name="activity_log_activity_type_filter_clear">Vaciar</string>
+    <string name="activity_log_activity_type_filter_apply">Aplicar</string>
+    <string name="dialog_edit_story_unsupported_format_message">Una o más diapositivas no se han añadido a tu historia porque en este momento las historias no son compatibles con archivos GIF. Por favor, elige una imagen estática o un vídeo de fondo en su lugar.</string>
+    <string name="dialog_edit_story_unrecoverable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_unavailable_message">No ha sido posible subir medios a esta historia. Comprueba tu conexión a Internet e inténtalo de nuevo dentro de un momento.</string>
+    <string name="dialog_edit_story_unavailable_title">No se puede editar la historia</string>
+    <string name="dialog_edit_story_limited_message">Esta historia se ha editado en un dispositivo diferente y la posibilidad de editar ciertos objetos puede estar limitada.</string>
+    <string name="dialog_edit_story_unrecoverable_message">No hemos podido encontrar en el sitio los medios para esta historia.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Los archivos GIF no son compatibles</string>
+    <string name="dialog_edit_story_limited_title">Edición limitada de la historia</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Los medios han sido eliminados. Intenta volver a crear tu historia.</string>
+    <string name="color_picker_label_background">Fondo</string>
+    <string name="color_picker_label_text">Texto</string>
+    <string name="dialog_discard_story_ok_button_edit">Descartar</string>
+    <string name="dialog_discard_story_message_edit">Cualquier cambio realizado no se guardará.</string>
+    <string name="dialog_discard_story_title_edit">¿Descartar cambios?</string>
+    <string name="label_done_button">Hecho</string>
+    <string name="label_next_button">Siguiente</string>
+    <string name="delete_button_alt">Borrar</string>
+    <string name="hpp_choose_error">Ocurrió un error al seleccionar el diseño.</string>
+    <string name="hpp_retry_error">Por favor, revisa tu conexión a Internet e inténtalo de nuevo.</string>
+    <string name="hpp_error_subtitle">Toca en reintentar cuando vuelvas a estar conectado.</string>
+    <string name="hpp_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="continue_site_credentials">Continuar con las credenciales de la tienda</string>
+    <string name="login_find_your_connected_email">Encuentra tu correo electrónico conectado</string>
+    <string name="reader_discover_no_posts_button_text">Seguir temas</string>
+    <string name="reader_discover_no_posts_subtitle">Prueba a seguir más temas para ampliar la búsqueda</string>
+    <string name="reader_discover_no_posts_title">No hay entradas recientes</string>
+    <string name="reader_discover_empty_title">¡Bienvenido!</string>
+    <string name="scan">Explorar</string>
+    <string name="login_prologue_third_subtitle_one">A &lt;b&gt;Madison Ruíz&lt;/b&gt; le ha gustado tu entrada</string>
+    <string name="login_prologue_third_subtitle_two">Hoy has recibido &lt;b&gt;50 me gusta&lt;/b&gt; en tu sitio</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Juan Gómez&lt;/b&gt; ha respondido en tu entrada</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Se ha abierto el menú de bloques desplazable. Selecciona un bloque.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Se ha cerrado el menú de bloques desplazable.</string>
+    <string name="hpp_skip_button">Omitir</string>
+    <string name="hpp_choose_button">Elegir</string>
+    <string name="hpp_subtitle">Elige el diseño de página de inicio que prefieras. Puedes personalizarlo o cambiarlo más tarde.</string>
+    <string name="hpp_title">Elige un diseño</string>
+    <string name="mlp_network_error_subtitle">Toca «Reintentar» cuando vuelvas a estar en línea o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_network_error_title">Los diseños no están disponibles sin conexión</string>
+    <string name="mlp_error_subtitle">Toca «Reintentar» o crea una página en blanco usando el botón a continuación.</string>
+    <string name="mlp_error_title">Los diseños no están disponibles debido a un error</string>
+    <string name="prepublishing_nudges_add_category_button">Añadir una categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Añadir una nueva categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorías</string>
+    <string name="prepublishing_nudges_home_categories_not_set">No establecido</string>
+    <string name="prepublishing_nudges_categories_action">Categorías</string>
+    <string name="login_prologue_fifth_caption_three">Museos en Londres</string>
+    <string name="login_prologue_fifth_caption_two">Los mejores fanáticos del mundo</string>
+    <string name="login_prologue_fifth_caption_one">Mis diez mejores cafés</string>
+    <string name="login_prologue_fifth_tag_six">Política</string>
+    <string name="login_prologue_fifth_tag_five">Música</string>
+    <string name="login_prologue_fifth_tag_four">Jardinería</string>
+    <string name="login_prologue_fifth_tag_three">Fútbol</string>
+    <string name="login_prologue_fifth_tag_two">Cocina</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' roll semanal</string>
+    <string name="login_prologue_fifth_subtitle_two">Noticias web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Estoy muy inspirado por el trabajo del fotógrafo Cameron Karsten. Probaré estas técnicas en mi próximo</string>
+    <string name="login_prologue_second_subtitle_one">Inspírate</string>
+    <string name="login_prologue_title_fourth">Observa cómo crece tu audiencia con analíticas avanzadas.</string>
+    <string name="login_prologue_title_second">Con el potente editor puedes publicar sobre la marcha.</string>
+    <string name="login_prologue_title_first">Bienvenido al maquetador web más popular del mundo.</string>
+    <string name="login_prologue_title_third">Mira los comentarios y avisos en tiempo real.</string>
+    <string name="login_prologue_title_fifth">Sigue tus sitios favoritos y descubre nuevos blogs.</string>
+    <string name="media_loading_failed">La carga del medio ha fallado</string>
+    <string name="reader_discover_recommended_blogs_header">Sitios a seguir</string>
     <string name="gutenberg_native_s_is_not_fully_supported">«%s» no es totalmente compatible</string>
-    <string name="gutenberg_native_help_button">Botón de ayuda</string>
-    <string name="gutenberg_native_edit_using_web_editor">Editar usando el editor web</string>
-    <string name="gutenberg_native_choose_images">Elegir las imágenes</string>
-    <string name="stories_intro_create_story_post_label">Crear una entrada de historia</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos trabajando duro para añadir más bloques con cada versión.</string>
     <string name="stories_intro_description_second">Son publicados como una nueva entrada de blog en tu sitio para que tu audiencia nunca se pierda nada.</string>
-    <string name="stories_intro_title_second">Las entradas de historias no desaparecen</string>
+    <string name="stories_intro_create_story_post_label">Crear una entrada de historia</string>
+    <string name="gutenberg_native_choose_images">Elegir las imágenes</string>
+    <string name="gutenberg_native_edit_using_web_editor">Editar usando el editor web</string>
+    <string name="gutenberg_native_help_button">Botón de ayuda</string>
     <string name="stories_intro_description_first">Combina fotos, vídeos y texto para crear entradas de historias atractivas y accesibles que les encantarán a tus visitantes.</string>
-    <string name="stories_intro_title_first">Ahora las historias son para todos</string>
-    <string name="stories_intro_image_caption_second">Título de la entrada de historia</string>
-    <string name="stories_intro_image_caption_first">Cómo crear una entrada de historias</string>
-    <string name="stories_intro_main_subtitle">Tienes acceso anticipado a las entradas de historias y nos encantaría que las probaras.</string>
-    <string name="stories_intro_main_title">Presentación de las entradas de historias</string>
-    <string name="mlp_generic_error">Ha ocurrido un error al obtener los diseños</string>
-    <string name="mlp_notice_blank_page_created">Página en blanco creada</string>
-    <string name="mlp_notice_page_created">Página creada</string>
-    <string name="mlp_preview_title">Vista previa del diseño</string>
+    <string name="stories_intro_title_second">Las entradas de historias no desaparecen</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s ha denegado el acceso a tus fotos. Para corregirlo, edita tus permisos y activa %2$s y %3$s.</string>
-    <string name="media_insert_failed">Inserción del medio fallida.</string>
-    <string name="media_insert_failed_with_reason">Ha fallado la inserción del medio: %s</string>
+    <string name="mlp_notice_page_created">Página creada</string>
+    <string name="mlp_notice_blank_page_created">Página en blanco creada</string>
+    <string name="stories_intro_main_title">Presentación de las entradas de historias</string>
+    <string name="stories_intro_image_caption_first">Cómo crear una entrada de historias</string>
+    <string name="stories_intro_image_caption_second">Título de la entrada de historia</string>
+    <string name="stories_intro_title_first">Ahora las historias son para todos</string>
     <string name="photo_picker_wordpress_media_library">Elige desde la biblioteca de medios de WordPress</string>
+    <string name="media_insert_failed_with_reason">Ha fallado la inserción del medio: %s</string>
+    <string name="media_insert_failed">Inserción del medio fallida.</string>
     <string name="reader_label_toolbar_back">Volver</string>
-    <string name="reader_discover_empty_button_text">Primeros pasos</string>
-    <string name="reader_discover_empty_title">Sigue temáticas y descubre nuevos blogs</string>
     <string name="reader_post_details_header_by_author_name">por</string>
-    <string name="stats_referrer_snackbar_cant_mark_as_spam">Este referido no puede ser marcado como spam</string>
-    <string name="stats_referrer_popup_unmark_as_spam">Desmarcar como spam</string>
-    <string name="stats_referrer_popup_menu_mark_as_spam">Marcar como spam</string>
-    <string name="stats_referrer_popup_menu_open_website">Abrir la web</string>
-    <string name="media_uploading_gif_library_photo">Subiendo medios GIF</string>
-    <string name="media_uploading_stock_library_photo">Subiendo medios de inventarios</string>
+    <string name="reader_discover_empty_button_text">Primeros pasos</string>
+    <string name="reader_discover_empty_subtitle">Sigue temáticas para descubrir nuevos blogs</string>
     <string name="media_uploading_default">Subiendo medios</string>
-    <string name="gutenberg_native_select_item">Seleccionar un elemento</string>
+    <string name="media_uploading_stock_library_photo">Subiendo medios de inventarios</string>
+    <string name="media_uploading_gif_library_photo">Subiendo medios GIF</string>
+    <string name="stats_referrer_popup_menu_open_website">Abrir la web</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Marcar como spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Desmarcar como spam</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Este referido no puede ser marcado como spam</string>
     <string name="gutenberg_native_search_or_type_url">Busca o escribe la URL</string>
+    <string name="gutenberg_native_select_item">Seleccionar un elemento</string>
+    <string name="gutenberg_native_page_break">Salto de página</string>
     <string name="gutenberg_native_add_this_telephone_link">Añadir este enlace de teléfono</string>
-    <string name="gutenberg_native_add_this_link">Añadir este enlace</string>
     <string name="gutenberg_native_add_this_email_link">Añadir este enlace de correo electrónico</string>
-    <string name="suggestion_no_connection">«No hay conexión a Internet.\nNo están disponibles las sugerencias.»</string>
+    <string name="gutenberg_native_add_this_link">Añadir este enlace</string>
+    <string name="suggestion_no_connection">No hay conexión a Internet.\nNo están disponibles las sugerencias.</string>
     <string name="typeface_label_shrikhand">Negrita</string>
     <string name="typeface_label_space_mono">Moderno</string>
     <string name="typeface_label_pacifico">Alegre</string>
@@ -60,156 +510,142 @@ Language: es
     <string name="comment_unable_to_show_error">No se puede mostrar este comentario</string>
     <string name="media_browse_for_items">Navegar por elementos</string>
     <string name="reader_menu_report_post">Informar de esta entrada</string>
-    <string name="gutenberg_native_angle">Ángulo</string>
-    <string name="reader_welcome_banner">Bienvenido al Lector. Descubre millones de blogs a tu alcance.</string>
-    <string name="error_media_xmlrcp_server_error">Ha ocurrido un error interno del servidor</string>
-    <string name="error_media_xmlrpc_not_allowed">Tu acción no está permitida</string>
     <string name="show_n_hidden_items_desc">%1$s elementos más</string>
+    <string name="error_media_xmlrpc_not_allowed">Tu acción no está permitida</string>
+    <string name="error_media_xmlrcp_server_error">Ha ocurrido un error interno del servidor</string>
+    <string name="reader_welcome_banner">Bienvenido al Lector. Descubre millones de blogs a tu alcance.</string>
     <string name="gutenberg_native_select_a_layout">Seleccionar un diseño</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Nota: el diseño de la columna puede variar entre temas y tamaños de pantalla</string>
-    <string name="create_post_story_fab_tooltip">Crear una entrada o historia</string>
-    <string name="create_page_fab_tooltip">Crear una página</string>
     <string name="create_post_fab_tooltip">Crear una entrada</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">Puede que te guste</string>
+    <string name="create_page_fab_tooltip">Crear una página</string>
+    <string name="create_post_story_fab_tooltip">Crear una entrada o historia</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ocultar</string>
-    <string name="gutenberg_native_video_caption_empty">Leyenda del vídeo. Vacía</string>
-    <string name="gutenberg_native_updates_the_title">Actualiza el título.</string>
-    <string name="gutenberg_native_paste_block_after">Pegar el bloque después</string>
-    <string name="gutenberg_native_page_title_s">Título de la página. %s</string>
-    <string name="gutenberg_native_page_title_empty">Título de la página. Vacío</string>
-    <string name="toast_error_playing_video">Ha ocurrido un error al reproducir tu vídeo</string>
-    <string name="camera_error">Este dispositivo no es compatible con la API de Camera2</string>
-    <string name="toast_error_saving_video">No se ha podido guardar el vídeo</string>
-    <string name="toast_error_saving_image">Error al guardar la imagen</string>
+    <string name="reader_discover_interests_header">Puede que te guste</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Ver el almacenamiento</string>
     <string name="toast_capture_operation_in_progress">Operación en progreso, inténtalo de nuevo</string>
+    <string name="toast_error_saving_image">Error al guardar la imagen</string>
+    <string name="toast_error_saving_video">No se ha podido guardar el vídeo</string>
+    <string name="camera_error">Este dispositivo no es compatible con la API de Camera2</string>
+    <string name="toast_error_playing_video">Ha ocurrido un error al reproducir tu vídeo</string>
+    <string name="gutenberg_native_page_title_empty">Título de la página. Vacío</string>
+    <string name="gutenberg_native_page_title_s">Título de la página. %s</string>
+    <string name="gutenberg_native_paste_block_after">Pegar el bloque después</string>
+    <string name="gutenberg_native_updates_the_title">Actualiza el título.</string>
+    <string name="gutenberg_native_video_caption_empty">Leyenda del vídeo. Vacía</string>
     <string name="toast_story_page_not_found">No se ha podido encontrar la diapositiva de la historia</string>
-    <string name="dialog_insufficient_device_storage_error_ok_button">Ver el almacenamiento</string>
-    <string name="dialog_insufficient_device_storage_error_message">Tenemos que guardar la historia en tu dispositivo antes de que pueda ser publicada. Revisa tus ajustes de almacenamiento y elimina archivos para ganar espacio.</string>
-    <string name="dialog_insufficient_device_storage_error_title">Insuficiente almacenamiento en el dispositivo</string>
-    <string name="dialog_story_saving_error_message">Intenta volver a guardar o borrar las diapositivas y, después, intenta volver a publicar tu historia.</string>
-    <string name="dialog_story_saving_error_title_plural">No se han podido guardar %1$d diapositivas</string>
-    <string name="dialog_story_saving_error_title_singular">No se ha podido guardar 1 diapositiva</string>
-    <string name="story_saving_failed_quick_action_manage">Gestionar</string>
-    <string name="story_saving_failed_message_plural">%1$d diapositivas necesitan una acción</string>
     <string name="story_saving_failed_message_singular">1 diapositiva necesita una acción</string>
-    <string name="story_saving_failed_title">No se ha podido subir «%1$s»</string>
-    <string name="story_saving_snackbar_finished_with_error">No se ha podido subir «%1$s»</string>
-    <string name="story_saving_snackbar_finished_successfully">Publicado «%1$s»</string>
+    <string name="story_saving_failed_message_plural">%1$d diapositivas necesitan una acción</string>
+    <string name="story_saving_failed_quick_action_manage">Gestionar</string>
+    <string name="dialog_story_saving_error_title_singular">No se ha podido guardar 1 diapositiva</string>
+    <string name="dialog_story_saving_error_title_plural">No se han podido guardar %1$d diapositivas</string>
+    <string name="dialog_story_saving_error_message">Intenta volver a guardar o borrar las diapositivas y, después, intenta volver a publicar tu historia.</string>
+    <string name="dialog_insufficient_device_storage_error_title">Insuficiente almacenamiento en el dispositivo</string>
+    <string name="dialog_insufficient_device_storage_error_message">Tenemos que guardar la historia en tu dispositivo antes de que pueda ser publicada. Revisa tus ajustes de almacenamiento y elimina archivos para ganar espacio.</string>
     <string name="story_saving_snackbar_started">Subiendo «%1$s»…</string>
-    <string name="story_saving_subtitle_frames_remaining_plural">Quedan %1$d diapositivas</string>
-    <string name="story_saving_subtitle_frames_remaining_singular">Queda 1 diapositiva</string>
-    <string name="story_saving_title_several">varias historias</string>
+    <string name="story_saving_snackbar_finished_successfully">Publicado «%1$s»</string>
+    <string name="story_saving_snackbar_finished_with_error">No se ha podido subir «%1$s»</string>
+    <string name="story_saving_failed_title">No se ha podido subir «%1$s»</string>
     <string name="story_saving_title">Guardando «%1$s»…</string>
-    <string name="story_saving_untitled">Sin título</string>
-    <string name="dialog_discard_story_ok_button">Descartar</string>
-    <string name="dialog_discard_story_message">La entrada de tu historia no se guardará como borrador.</string>
-    <string name="dialog_discard_story_title">¿Descartar la entrada de la historia?</string>
-    <string name="dialog_discard_page_ok_button">Borrar</string>
-    <string name="dialog_discard_errored_page_message">Esta diapositiva aún no ha sido guardada. Si borras esta diapositiva, perderás cualquier edición que hayas hecho.</string>
-    <string name="dialog_discard_page_message">Esta diapositiva será eliminada de tu historia.</string>
-    <string name="dialog_discard_page_title">¿Borrar la diapositiva de la historia?</string>
-    <string name="menu_delete_page">Borrar la diapositiva</string>
-    <string name="label_text_color_button">Cambiar el color del texto</string>
-    <string name="label_text_alignment_button">Cambiar la alineación del texto</string>
-    <string name="label_frame_errored">con error</string>
-    <string name="label_frame_selected_border">seleccionado</string>
+    <string name="story_saving_title_several">varias historias</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">Queda 1 diapositiva</string>
+    <string name="story_saving_subtitle_frames_remaining_plural">Quedan %1$d diapositivas</string>
     <string name="label_frame_unselected_border">sin seleccionar</string>
-    <string name="label_frame_image">Diapositiva</string>
-    <string name="label_retry_icon">Reintentar</string>
-    <string name="label_saved_icon">Guardado</string>
-    <string name="label_close_button">Cerrar</string>
-    <string name="label_control_publish">Siguiente</string>
-    <string name="label_done">Hecho</string>
-    <string name="label_share_to">Compartir con</string>
-    <string name="label_snackbar_share">COMPARTIR</string>
-    <string name="label_snackbar_loop_frame_saved">Guardado en fotos</string>
-    <string name="label_control_retry">Reintentar</string>
-    <string name="label_control_saved">Guardado</string>
-    <string name="label_control_saving">Guardando</string>
-    <string name="label_control_flash">Flash</string>
-    <string name="label_control_flip_camera">Girar</string>
-    <string name="sound_button_alt">Sonido</string>
-    <string name="text_button_alt">Texto</string>
-    <string name="more_button_alt">Más</string>
-    <string name="stickers_button_alt">Pegatinas</string>
+    <string name="label_frame_selected_border">seleccionado</string>
+    <string name="label_frame_errored">con error</string>
+    <string name="label_text_alignment_button">Cambiar la alineación del texto</string>
+    <string name="label_text_color_button">Cambiar el color del texto</string>
+    <string name="dialog_discard_page_title">¿Borrar la diapositiva de la historia?</string>
+    <string name="dialog_discard_page_message">Esta diapositiva será eliminada de tu historia.</string>
+    <string name="dialog_discard_errored_page_message">Esta diapositiva aún no ha sido guardada. Si borras esta diapositiva, perderás cualquier edición que hayas hecho.</string>
+    <string name="dialog_discard_page_ok_button">Borrar</string>
+    <string name="dialog_discard_story_title">¿Descartar la entrada de la historia?</string>
+    <string name="dialog_discard_story_message">La entrada de tu historia no se guardará como borrador.</string>
+    <string name="dialog_discard_story_ok_button">Descartar</string>
+    <string name="story_saving_untitled">Sin título</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b&gt;Entrada del blog&lt;/b&gt;</string>
+    <string name="prepublishing_nudges_story_title_hint">Pon un título a tu historia</string>
+    <string name="mlp_choose_layout_subtitle">Empieza eligiendo entre una amplia variedad de diseños de página prefabricados. O simplemente empieza con una página en blanco.</string>
+    <string name="mlp_create_blank_page">Crear una página en blanco</string>
+    <string name="mlp_create_page">Crear una página</string>
+    <string name="mlp_preview_page">Vista previa</string>
+    <string name="capture_button_alt">Capturar</string>
     <string name="flash_button_alt">Flash</string>
+    <string name="stickers_button_alt">Pegatinas</string>
+    <string name="text_button_alt">Texto</string>
+    <string name="sound_button_alt">Sonido</string>
     <string name="flip_button_alt">Girar la cámara</string>
-    <string name="capture_button_alt">Capturar</string>
-    <string name="mlp_preview_page">Vista previa</string>
-    <string name="mlp_create_page">Crear una página</string>
-    <string name="mlp_create_blank_page">Crear una página en blanco</string>
-    <string name="mlp_choose_layout_subtitle">Empieza eligiendo entre una amplia variedad de diseños de página prefabricados. O simplemente empieza con una página en blanco.</string>
-    <string name="mlp_choose_layout_title">Elegir un diseño</string>
-    <string name="prepublishing_nudges_story_title_hint">Pon un título a tu historia</string>
-    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Crear una entrada o historia</string>
+    <string name="label_control_flip_camera">Girar</string>
+    <string name="label_control_flash">Flash</string>
+    <string name="label_control_saving">Guardando</string>
+    <string name="label_control_saved">Guardado</string>
+    <string name="label_control_retry">Reintentar</string>
+    <string name="label_snackbar_loop_frame_saved">Guardado en fotos</string>
+    <string name="label_snackbar_share">COMPARTIR</string>
+    <string name="label_share_to">Compartir con</string>
+    <string name="label_close_button">Cerrar</string>
+    <string name="label_saved_icon">Guardado</string>
+    <string name="label_retry_icon">Reintentar</string>
+    <string name="label_frame_image">Diapositiva</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Crear una entrada, página o historia</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Toca crear %1$s. %2$s Después selecciona &lt;b>Entrada del blog&lt;/b></string>
-    <string name="photo_picker_choose_file">Elegir el dispositivo</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Crear una entrada o historia</string>
+    <string name="mlp_choose_layout_title">Elegir un diseño</string>
+    <string name="error_media_quota_exceeded">Cuota de almacenamiento superada</string>
+    <string name="error_media_quota_exceeded_toast">No se puede subir el archivo.\nSe ha superado la cuota de almacenamiento.</string>
+    <string name="reader_toast_err_page_jump_not_found">No se ha podido encontrar el salto de página enlazado</string>
     <string name="my_site_bottom_sheet_add_story">Entrada de la historia</string>
+    <string name="photo_picker_choose_file">Elegir el dispositivo</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Para la edición de los iconos del sitio en sitios WordPress autoalojados se necesita el plugin Jetpack.</string>
-    <string name="reader_toast_err_page_jump_not_found">No se ha podido encontrar el salto de página enlazado</string>
-    <string name="error_media_quota_exceeded_toast">No se puede subir el archivo.\nSe ha superado la cuota de almacenamiento.</string>
-    <string name="error_media_quota_exceeded">Cuota de almacenamiento superada</string>
     <string name="pick_file">Añadir un archivo</string>
-    <string name="gutenberg_native_replace_video">Reemplazar el vídeo</string>
     <string name="gutenberg_native_replace_image_or_video">Reemplazar la imagen o vídeo</string>
-    <string name="gutenberg_native_choose_video">Elegir un vídeo</string>
-    <string name="gutenberg_native_choose_image_or_video">Elegir una imagen o vídeo</string>
-    <string name="gutenberg_native_choose_image">Elegir una imagen</string>
-    <string name="gutenberg_native_block_removed">Bloque eliminado</string>
-    <string name="content_description_logo">Logotipo de WordPress</string>
-    <string name="enter_your_site_address">Introduce la dirección de tu sitio</string>
-    <string name="continue_with_wpcom">Continuar con WordPress.com</string>
-    <string name="signup_confirmation_title">Confirmación del registro</string>
+    <string name="gutenberg_native_replace_video">Reemplazar el vídeo</string>
     <string name="continue_with_google_terms_of_service_text">Si continúas con Google y aún no tienes una cuenta de WordPress.com, crearás una cuenta y aceptas nuestros %1$stérminos del servicio%2$s.</string>
+    <string name="signup_confirmation_title">Confirmación del registro</string>
+    <string name="gutenberg_native_block_removed">Bloque eliminado</string>
+    <string name="gutenberg_native_choose_image">Elegir una imagen</string>
+    <string name="gutenberg_native_choose_image_or_video">Elegir una imagen o vídeo</string>
+    <string name="gutenberg_native_choose_video">Elegir un vídeo</string>
+    <string name="enter_your_site_address">Introduce la dirección de tu sitio existente</string>
     <string name="continue_terms_of_service_text">Si continúas, aceptas nuestros %1$stérminos del servicio%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Te enviaremos por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com.</string>
     <string name="signup_confirmation_message">Usaremos esta dirección de correo electrónico para crear tu nueva cuenta de WordPress.com.</string>
     <string name="signup_magic_link_message">Te hemos enviado por correo electrónico un enlace de registro para crear tu nueva cuenta de WordPress.com. Comprueba tu correo electrónico en este dispositivo y toca el enlace en el correo electrónico que has recibido de WordPress.com.</string>
     <string name="enter_account_info_for_site">Introduce la información de tu cuenta para %1$s.</string>
-    <string name="login_or">o</string>
-    <string name="continue_google_button_suffix">Continuar con Google</string>
-    <string name="login_find_your_site_adress">Encuentra la dirección de tu sitio</string>
-    <string name="login_done">Hecho</string>
-    <string name="magic_link_not_seeing_email_message">¿No ves el correo electrónico? Comprueba tu carpeta de spam o correo no deseado.</string>
     <string name="login_magic_links_sent_label">Comprueba tu correo electrónico en este dispositivo y toca el enlace en el correo electrónico que has recibido de WordPress.com.</string>
+    <string name="magic_link_not_seeing_email_message">¿No ves el correo electrónico? Comprueba tu carpeta de spam o correo no deseado.</string>
+    <string name="login_done">Hecho</string>
+    <string name="login_find_your_site_adress">Encuentra la dirección de tu sitio</string>
+    <string name="continue_google_button_suffix">Continuar con Google</string>
+    <string name="login_or">o</string>
     <string name="login_magic_links_label">Te enviaremos por correo electrónico un enlace que te hará acceder automáticamente, sin necesidad de contraseña.</string>
-    <string name="check_email">Comprobar el correo electrónico</string>
-    <string name="get_started">Primeros pasos</string>
-    <string name="enter_email_to_continue_wordpress_com">Introduce tu dirección de correo electrónico para acceder o crear una cuenta de WordPress.com.</string>
-    <string name="or_type_your_password">O escribe tu contraseña</string>
-    <string name="create_account">Crear una cuenta</string>
-    <string name="send_link_by_email">Enviar el enlace por correo electrónico</string>
-    <string name="login_promo_text_unlock_the_power">Desbloquea el poder del creador de webs más flexible.</string>
-    <string name="login_promo_title_37_percent">El 37\% de la web está creada con WordPress.</string>
     <string name="reset_your_password">Restablecer tu contraseña</string>
+    <string name="send_link_by_email">Enviar el enlace por correo electrónico</string>
+    <string name="create_account">Crear una cuenta</string>
+    <string name="or_type_your_password">O escribe tu contraseña</string>
+    <string name="enter_email_to_continue_wordpress_com">Introduce tu dirección de correo electrónico para acceder o crear una cuenta de WordPress.com.</string>
+    <string name="get_started">Primeros pasos</string>
+    <string name="check_email">Comprobar el correo electrónico</string>
     <string name="reader_error_request_failed_title">Ha habido un problema al gestionar la solicitud. Por favor, inténtalo de nuevo más tarde.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Dale a tu sitio un nombre que refleje su personalidad y temática. ¡Las primeras impresiones cuentan!</string>
     <string name="quick_start_list_update_site_title_title">Configura el título de tu sitio</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b>%1$s&lt;/b> para configurar un nuevo título</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b&gt;%1$s&lt;/b&gt; para configurar un nuevo título</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios locales, ¿estás seguro de que quieres continuar?</string>
     <string name="gutenberg_native_s_block_options">Opciones del bloque %s</string>
     <string name="gutenberg_native_duplicate_block">Duplicar bloque</string>
     <string name="gutenberg_native_copy_block">Copiar bloque</string>
     <string name="gutenberg_native_copied_block">Bloque copiado</string>
-    <string name="gutenberg_native_block_settings">Ajustes del bloque</string>
     <string name="gutenberg_native_block_pasted">Bloque pegado</string>
     <string name="gutenberg_native_block_duplicated">Bloque duplicado</string>
     <string name="gutenberg_native_block_cut">Bloque cortado</string>
     <string name="gutenberg_native_block_copied">Bloque copiado</string>
     <string name="my_site_title_changer_dialog_not_allowed_hint">El título del sitio solo puede ser cambiado por un usuario con el perfil de administrador.</string>
     <string name="my_site_title_changer_dialog_hint">El título del sitio se muestra en la barra de título de un navegador web y en la cabecera de la mayoría de los temas.</string>
-    <string name="reader_title_tag_preview">Tema</string>
     <string name="error_update_site_title_network">No se ha podido actualizar el título del sitio. Comprueba tu conexión de red e inténtalo nuevamente.</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_title">Cambios sin guardar</string>
+    <string name="reader_title_tag_preview">Tema</string>
     <string name="gutenberg_native_open_link_in_a_browser">Abrir el enlace en un navegador</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient">Navega para personalizar el degradado</string>
     <string name="gutenberg_native_navigates_to_custom_color_picker">Navega al selector de color personalizado</string>
     <string name="gutenberg_native_gradient_type">Tipo de degradado</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Toca dos veces para seleccionar la opción</string>
     <string name="gutenberg_native_customize_gradient">Personalizar el degradado</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autor de la página</string>
     <string name="photo_picker_use_gif">Usar este GIF</string>
     <string name="error_media_thumbnail_not_loaded">La miniatura del medio no se ha podido cargar</string>
@@ -219,7 +655,6 @@ Language: es
     <string name="gutenberg_native_dismiss">Descartar</string>
     <string name="prepublishing_nudges_home_tags_not_set">No establecido</string>
     <string name="prepublishing_tags_description">Las etiquetas ayudan a los lectores diciéndoles de qué se trata la entrada.</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">Fecha de publicación</string>
     <string name="prepublishing_nudges_toolbar_title_tags">Añadir etiquetas</string>
     <string name="prepublishing_nudges_back_button">Volver</string>
     <string name="prepublishing_nudges_home_save_button">Guardar ahora</string>
@@ -231,9 +666,8 @@ Language: es
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Cancelar</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Mover a borrador</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Las entradas en la papelera no se pueden editar. ¿Deseas cambiar el estado de esta entrada a «borrador» para poder trabajar en ella?</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Fecha de publicación</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">¿Mover entrada a borradores?</string>
-    <string name="reader_label_choose_your_interests">Elige tus intereses</string>
-    <string name="reader_choose_interests_content_description">Elige tus intereses</string>
     <string name="reader_btn_done">Hecho</string>
     <string name="reader_btn_select_few_interests">Selecciona algunos para continuar</string>
     <string name="post_status_post_published">Publicado</string>
@@ -242,53 +676,51 @@ Language: es
     <string name="publish_date">Fecha de publicación</string>
     <string name="ccpa_privacy_notice_read">Lee el aviso de privacidad de CCPA</string>
     <string name="ccpa_privacy_notice_caption">La Ley de Privacidad del Consumidor de California («CCPA») nos obliga a que proporcionemos información adicional a los residentes de California sobre las categorías de información personal que recopilamos y compartimos, dónde obtenemos esa información personal y cómo y por qué la usamos.</string>
+    <string name="reader_label_choose_your_interests">Elige tus temáticas</string>
+    <string name="reader_choose_interests_content_description">Elige tus temáticas</string>
     <string name="ccpa_privacy_notice_header">Aviso de privacidad para usuarios de California</string>
     <string name="status_and_visibility">Estado y visibilidad</string>
     <string name="update_now">Actualizar ahora</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Prueba un diseño de inicio</string>
     <string name="gutenberg_native_open_block_actions_menu">Abrir el menú de acciones de bloques</string>
-    <string name="gutenberg_native_insert_mention">Insertar una mención</string>
-    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toca dos veces para abrir la hoja inferior con las opciones disponibles</string>
+    <string name="gutenberg_native_move_to_top">Mover arriba</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toca dos veces pata abrir la hoja de acción con las opciones disponibles</string>
-    <string name="pages_cannot_be_started">No podemos abrir las páginas en este momento. Por favor, inténtalo de nuevo más tarde</string>
-    <string name="pages_set_as_posts_page">Establecer como página de entradas</string>
-    <string name="pages_set_as_homepage">Establecer como página de inicio</string>
-    <string name="suggestion_no_matching_users">«No hay disponibles usuarios que coincidan.»</string>
-    <string name="suggestion_invalid_user">«%s no es un usuario válido»</string>
-    <string name="site_settings_select_page">Seleccionar la página</string>
-    <string name="site_settings_posts_page">Página de entradas</string>
-    <string name="site_settings_static_homepage">Página de inicio estática</string>
-    <string name="site_settings_classic_blog">Blog clásico</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toca dos veces para abrir la hoja inferior con las opciones disponibles</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">La página de inicio seleccionada y la página de entradas no pueden ser la misma.</string>
-    <string name="site_settings_failed_update_homepage_settings">Ha fallado la actualización de la página de inicio, comprueba tu conexión a internet</string>
-    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">No se pueden guardar los ajustes de la página de inicio antes de que las páginas estén cargadas</string>
-    <string name="site_settings_failed_to_save_homepage_settings">No se pueden guardar los ajustes de la página de inicio</string>
-    <string name="site_settings_accept_homepage">Aceptar</string>
-    <string name="site_settings_failed_to_load_pages">Ha fallado la carga de las páginas</string>
-    <string name="site_settings_homepage_settings_description">Elige entre una página de inicio que muestre tus últimas publicaciones (blog clásico) o una página fija/estática.</string>
+    <string name="site_settings_classic_blog">Blog clásico</string>
+    <string name="site_settings_static_homepage">Página de inicio estática</string>
+    <string name="site_settings_posts_page">Página de entradas</string>
+    <string name="site_settings_select_page">Seleccionar la página</string>
+    <string name="pages_set_as_homepage">Establecer como página de inicio</string>
+    <string name="pages_set_as_posts_page">Establecer como página de entradas</string>
+    <string name="pages_cannot_be_started">No podemos abrir las páginas en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="suggestion_invalid">%s no es una %s válida</string>
     <string name="site_settings_homepage_settings">Ajustes de la página de inicio</string>
+    <string name="site_settings_homepage_settings_description">Elige entre una página de inicio que muestre tus últimas publicaciones (blog clásico) o una página fija/estática.</string>
+    <string name="site_settings_failed_to_load_pages">Ha fallado la carga de las páginas</string>
+    <string name="site_settings_accept_homepage">Aceptar</string>
+    <string name="site_settings_failed_to_save_homepage_settings">No se pueden guardar los ajustes de la página de inicio</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">No se pueden guardar los ajustes de la página de inicio antes de que las páginas estén cargadas</string>
+    <string name="site_settings_failed_update_homepage_settings">Ha fallado la actualización de la página de inicio, comprueba tu conexión a internet</string>
+    <string name="page_cannot_set_homepage">Para establecer la página de inicio, activa «Página de inicio estática» en los ajustes del sitio</string>
+    <string name="page_cannot_set_posts_page">Para establecer la página de entradas, activa «Página de inicio estática» en los ajustes del sitio</string>
+    <string name="page_homepage_successfully_updated">Página de inicio actualizada correctamente</string>
+    <string name="page_homepage_update_failed">Ha fallado la actualización de la página de inicio</string>
+    <string name="page_posts_page_successfully_updated">Página de entradas actualizada correctamente</string>
     <string name="site_settings_homepage">Página de inicio</string>
     <string name="page_posts_page_update_failed">Ha fallado la actualización de la página de entradas</string>
-    <string name="page_posts_page_successfully_updated">Página de entradas actualizada correctamente</string>
-    <string name="page_homepage_update_failed">Ha fallado la actualización de la página de inicio</string>
-    <string name="page_homepage_successfully_updated">Página de inicio actualizada correctamente</string>
-    <string name="page_cannot_set_posts_page">Para establecer la página de entradas, activa «Página de inicio estática» en los ajustes del sitio</string>
-    <string name="page_cannot_set_homepage">Para establecer la página de inicio, activa «Página de inicio estática» en los ajustes del sitio</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Bienvenido a nuestro nuevo blog</string>
     <string name="gutenberg_native_select_a_color">Seleccionar un color</string>
-    <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toca dos veces para ir a los ajustes del color</string>
     <string name="reader_empty_followed_blogs_description">Cuando sigas sitios, verás aquí su contenido</string>
+    <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toca dos veces para ir a los ajustes del color</string>
     <string name="feature_announcement_find_out_mode">Saber más</string>
     <string name="feature_announcement_dialog_label">Qué hay de nuevo en WordPress</string>
     <string name="insert_label_with_count">Insertar %d</string>
     <string name="crop">recortar</string>
     <string name="error_failed_to_load_into_file">Fallo al cargar en el archivo, por favor, inténtalo de nuevo.</string>
     <string name="preview_image_thumbnail_description">Vista previa de la miniatura de la imagen</string>
-    <string name="photo_picker_use_media">Usar este medio</string>
     <string name="photo_picker_use_video">Usar este vídeo</string>
     <string name="photo_picker_photo_or_video_title">Elegir el medio</string>
     <string name="photo_picker_video_title">Elegir el vídeo</string>
+    <string name="photo_picker_use_media">Usar este medio</string>
     <string name="site_picker_ask_site_select">No se ha podido seleccionar el sitio. Por favor, inténtalo de nuevo.</string>
     <string name="sitepicker_continue_flow">Continuar</string>
     <string name="reader_reblog_error">Ha fallado reblog</string>
@@ -309,17 +741,16 @@ Language: es
     <string name="gutenberg_native_move_block_left">Mover bloque a la izquierda</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toca dos veces para mover el bloque hacia la derecha</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toca dos veces para mover el bloque hacia la izquierda</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Creando el escritorio</string>
     <string name="new_site_creation_creating_site_loading_3">Configurar el tema</string>
     <string name="new_site_creation_creating_site_loading_2">Añadiendo las características del sitio</string>
     <string name="new_site_creation_creating_site_loading_1">Obteniendo la URL del sitio</string>
     <string name="new_site_creation_creating_site_loading_subtitle">Tu sitio estará listo en breve</string>
     <string name="new_site_creation_creating_site_loading_title">¡Hurra!\nCasi está hecho</string>
+    <string name="gutenberg_native_block_settings">Ajustes del bloque</string>
     <string name="pages_and_posts_cancel_auto_upload">Cancelar la subida</string>
     <string name="gif_list_search_returned_unknown_error">Ha habido un problema al gestionar la petición</string>
     <string name="gif_powered_by_tenor">Funciona con Tenor</string>
-    <string name="gif_picker_search_hint">Buscar en Tenor</string>
     <string name="photo_picker_gif">Elegir desde Tenor</string>
     <string name="weekday_saturday">Sábado</string>
     <string name="weekday_friday">Viernes</string>
@@ -328,15 +759,16 @@ Language: es
     <string name="weekday_tuesday">Martes</string>
     <string name="weekday_monday">Lunes</string>
     <string name="weekday_sunday">Domingo</string>
+    <string name="gif_picker_search_hint">Buscar en Tenor</string>
     <string name="media_accessing_failed">Ha fallado el acceso al contenido de un sitio privado. Algunos medios pueden no estar disponibles</string>
     <string name="media_accessing_progress">Accediendo al contenido de un sitio privado</string>
     <string name="error_failed_to_crop_and_save_image">Fallo al recortar y guardar la imagen, por favor, inténtalo de nuevo.</string>
-    <string name="failed_to_load_image_tap_to_retry">Fallo al cargar la imagen.\nPor favor, toca para volver a intentarlo.</string>
     <string name="preview_image_description">Previsualizar la imagen</string>
     <string name="error_unknown_page_type">Formato de página desconocido</string>
     <string name="error_page_not_submitted">No hemos podido completar esta acción y no se ha enviado esta página a revisión.</string>
     <string name="error_page_not_scheduled">No hemos podido completar esta acción y no se ha programado esta página.</string>
     <string name="error_page_not_published_private">No hemos podido completar esta acción y no se ha publicado esta página privada.</string>
+    <string name="failed_to_load_image_tap_to_retry">Fallo al cargar la imagen.\nPor favor, toca para volver a intentarlo.</string>
     <string name="error_page_not_published">No hemos podido completar esta acción y no se ha publicado esta página.</string>
     <string name="error_page_not_submitted_retrying">No hemos podido enviar esta página a revisión, pero lo intentaremos de nuevo más tarde. </string>
     <string name="error_page_not_scheduled_retrying">No hemos podido programar esta página, pero lo intentaremos de nuevo más tarde.</string>
@@ -351,71 +783,34 @@ Language: es
     <string name="page_waiting_for_connection_scheduled">Programaremos tu página cuando tu dispositivo vuelva a estar online.</string>
     <string name="page_waiting_for_connection_pending">Enviaremos tu página para revisión cuando tu dispositivo vuelva a estar online.</string>
     <string name="page_waiting_for_connection_publish">Publicaremos la página cuando tu dispositivo vuelva a estar online.</string>
+    <string name="local_page_autosave_revision_available">Has hecho cambios no guardados en esta página</string>
     <string name="page_queued">Página en espera</string>
     <string name="page_uploading">Subiendo la página</string>
     <string name="error_publish_page_no_network">El dispositivo está desconectado. La página se ha guardado localmente.</string>
-    <string name="local_page_autosave_revision_available">Has hecho cambios no guardados en esta página</string>
     <string name="editor_uploading_page">Tu página se está subiendo</string>
-    <string name="editor_page_saved_locally_failed_media">La página ha fallado al subir los medios y ha sido guardada localmente</string>
     <string name="editor_page_saved_locally">Página guardada en el dispositivo</string>
     <string name="editor_page_saved_online">La página se ha guardado online</string>
-    <string name="quickpress_shortcut_activity_label">Selecciona un blog para el atajo a QuickPress</string>
-    <string name="app_theme_default">Establecido por el ahorrador de batería</string>
     <string name="app_theme_dark">Oscuro</string>
     <string name="app_theme_light">Claro</string>
     <string name="app_theme">Apariencia</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Recientemente has hecho cambios en esta página, pero no los has guardado. Elige una versión para cargar:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Lo que dice la gente</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Ofrecemos una gama de servicios para ayudarte a conseguir los resultados que buscas. ¿No estás seguro de lo que necesitas o de lo que cuesta? Podemos explicarte qué servicios son los adecuados para ti y decirte nuestros honorarios. Ponte en contacto con nosotros a continuación.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Somos un pequeño equipo de profesionales con talento con una amplia gama de habilidades y experiencia. Nos encanta lo que hacemos y lo hacemos con pasión. Esperamos poder trabajar contigo.</string>
-    <string name="gutenberg_native_warning_message">Mensaje de advertencia</string>
-    <string name="gutenberg_native_want_to_work_with_us">¿Quieres trabajar con nosotros?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Los visitantes querrán saber quién está al otro lado de la página. Usa este espacio para escribir sobre ti, tu sitio, tu negocio o sobre cualquier cosa que quieras. Usa las recomendaciones que aparecen a continuación para citar a otros hablando de lo mismo - con sus propias palabras.</string>
-    <string name="gutenberg_native_usa">EE.UU.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Este es un contenido de ejemplo, incluido con la plantilla, para ilustrar sus características. Elimínalo o sustitúyelo con tus propias palabras y medios.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">La forma de comenzar es dejar de hablar y empezar a hacer.</string>
-    <string name="gutenberg_native_team">Equipo</string>
-    <string name="gutenberg_native_success_message">Mensaje de éxito</string>
-    <string name="gutenberg_native_strategy">Estrategia</string>
+    <string name="app_theme_default">Establecido por el ahorrador de batería</string>
+    <string name="editor_page_saved_locally_failed_media">La página ha fallado al subir los medios y ha sido guardada localmente</string>
+    <string name="quickpress_shortcut_activity_label">Selecciona un blog para el atajo a QuickPress</string>
     <string name="gutenberg_native_show_post_content">Mostrar el contenido de la entrada</string>
-    <string name="gutenberg_native_services">Servicios</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nombre del proyecto</string>
-    <string name="gutenberg_native_position_or_job_title">Puesto o título del trabajo</string>
-    <string name="gutenberg_native_portfolio">Porfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Mostrar solo el extracto</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Mi porfolio presenta varios proyectos creados a lo largo de mi carrera. Mira a continuación mi información de contacto y ponte en contacto.</string>
     <string name="gutenberg_native_link_to">Enlazar a</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Hablemos 👋 No dudes en contactar en la siguiente información de contacto o envía un mensaje usando el formulario.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">¡Vamos a construir algo juntos!</string>
-    <string name="gutenberg_native_let_s_build_something_together">¡Vamos a construir algo juntos!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Son nuestras elecciones, Harry, las que muestran lo que realmente somos, mucho más que nuestras habilidades.</string>
-    <string name="gutenberg_native_inspiration">Inspiración</string>
-    <string name="gutenberg_native_get_in_touch">Ponte en contacto</string>
+    <string name="gutenberg_native_link_settings">Ajustes de enlace</string>
     <string name="gutenberg_native_excerpt_length_words">Longitud del extracto (palabras)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Envíame un correo electrónico: &lt;a href=\"mailto:correo@ejemplo.es\">correo@ejemplo.es&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">No llores porque se ha acabado, sonríe porque ha pasado.</string>
     <string name="gutenberg_native_customize">PERSONALIZAR</string>
-    <string name="gutenberg_native_city_10100">00000, Ciudad</string>
     <string name="gutenberg_native_add_paragraph_block">Añadir un bloque de párrafo</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Una breve descripción de los servicios que ofreces.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Una breve biografía sobre tu historial personal, tus logros clave o un hecho interesante.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:correo@ejemplo.es\">correo@ejemplo.es&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Una descripción del proyecto y de los trabajos presentados.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">Calle Mayor, 10</string>
+    <string name="gutenberg_native_video_settings">Ajustes de vídeo</string>
     <string name="create_post_page_fab_tooltip_contributors">Crear una entrada</string>
     <string name="post_list_tab_trashed_posts">En la papelera</string>
     <string name="post_list_tab_scheduled_posts">Programada</string>
     <string name="post_list_tab_published_posts">Publicada</string>
     <string name="sharing_facebook_account_must_have_pages">La conexión con Facebook no puede encontrar ninguna página. «Difundir» no puede conectar con perfiles de Facebook, solo con páginas publicadas.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">No conectado</string>
-    <string name="my_site_select_domains_page_title">Dirección del sitio</string>
     <string name="notifications_tab_title_likes">Me gusta</string>
     <string name="notifications_tab_title_follows">Seguimientos</string>
     <string name="notifications_tab_title_comments">Comentarios</string>
@@ -425,51 +820,46 @@ Language: es
     <string name="stats_insights_management_activity">Actividad</string>
     <string name="stats_insights_management_posts_and_pages">Entradas y páginas</string>
     <string name="stats_insights_management_general">General</string>
-    <string name="stats_management_screen_title">Añadir una nueva tarjeta</string>
     <string name="stats_management_add_new_stats_card">Añadir una nueva tarjeta de estadísticas</string>
+    <string name="stats_management_screen_title">Añadir una nueva tarjeta</string>
     <string name="reader_self_hosted_select_filter">Usa el botón de filtro para encontrar entradas sobre temas específicos</string>
     <string name="reader_bottom_sheet_content_description">Selecciona una etiqueta o sitio, ventana emergente</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Seleccionado</string>
     <string name="reader_btn_select_filter_content_description">Selecciona un sitio o etiqueta para filtrar entradas</string>
     <string name="reader_btn_remove_filter_content_description">Quitar el filtro actual</string>
-    <string name="reader_title_subs">Gestionar temas y sitios</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Acceder a WordPress.com</string>
-    <string name="reader_filter_self_hosted_empty_tagss_list">Accede a WordPress.com para ver las últimas entradas de los temas que sigues</string>
+    <string name="reader_title_subs">Gestionar temas y sitios</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Accede a WordPress.com para ver las últimas entradas de los sitios que sigues</string>
-    <string name="gutenberg_native_template_preview">Vista previa de la plantilla</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Accede a WordPress.com para ver las últimas entradas de los temas que sigues</string>
     <string name="gutenberg_native_replace_current_block">Reemplazar el bloque actual</string>
     <string name="gutenberg_native_add_to_end">Añadir al final</string>
     <string name="gutenberg_native_add_to_beginning">Añadir al principio</string>
     <string name="gutenberg_native_add_block_before">Añadir el bloque antes</string>
     <string name="gutenberg_native_add_block_after">Añadir el bloque después</string>
-    <string name="reader_filter_empty_tags_action">Añadir un tema</string>
     <string name="reader_filter_empty_sites_action">Seguir un sitio</string>
-    <string name="reader_filter_empty_tags_list">Puedes seguir entradas sobre un tema específico añadiendo un tema</string>
     <string name="reader_filter_empty_sites_list">Mira las entradas más recientes de los sitios que sigues</string>
+    <string name="reader_filter_empty_tags_action">Añadir un tema</string>
+    <string name="reader_filter_empty_tags_list">Puedes seguir entradas sobre un tema específico añadiendo un tema</string>
     <string name="reader_filter_main_title">Siguiendo</string>
     <string name="reader_filter_cta">Filtrar</string>
     <string name="gutenberg_native_video_caption_s">Leyenda del vídeo. %s</string>
     <string name="gutenberg_native_edit_video">Editar el vídeo</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Toca dos veces para seleccionar el diseño</string>
     <string name="gutenberg_native_add_a_shortcode">Añadir un shortcode…</string>
     <string name="post_list_author">Autor de la entrada</string>
     <string name="fab_create_desc">Crear una entrada</string>
     <string name="stats_posting_activity_end_description">Has escuchado todas las estadísticas de este período.\n        Si vuelves a tocar, se reiniciará desde el principio.</string>
     <string name="stats_posting_activity_empty_description">No hay estadísticas en este período.</string>
     <string name="stats_posting_activity_label_content_description">Actividad de publicación para %1$s</string>
-    <string name="stats_posting_activity_content_description">Los días con visitas %1$s para %2$s son: %2$s %3$s. Toca para más.</string>
     <string name="stats_posting_activity_action">explora todas las estadísticas para este período</string>
     <string name="stats_box_type_very_high">muy altas</string>
     <string name="stats_box_type_high">altas</string>
+    <string name="stats_posting_activity_content_description">Los días con visitas %1$s para %2$s son: %2$s %3$s. Toca para más.</string>
     <string name="stats_box_type_medium">medias</string>
     <string name="stats_box_type_low">bajas</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  y %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Mover la imagen hacia adelante</string>
-    <string name="gutenberg_native_move_image_backward">Mover la imagen hacia atrás</string>
     <string name="gutenberg_native_gallery_caption_s">Leyenda de la galería. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. El valor actual es %2$s</string>
     <string name="create_post_page_fab_tooltip">Crear una entrada o página</string>
+    <string name="gutenberg_native_replace_image">Reemplazar imagen</string>
     <string name="content_description_person_building_website">Creador de la web</string>
     <string name="post_signup_interstitial_not_right_now">Ahora no</string>
     <string name="post_signup_interstitial_subtitle">Cualquier cosa que quieras crear o compartir, te ayudaremos a hacerlo aquí mismo.</string>
@@ -482,54 +872,46 @@ Language: es
     <string name="my_site_bottom_sheet_add_post">Entrada del blog</string>
     <string name="my_site_bottom_sheet_title">Añadir nueva</string>
     <string name="post_settings_publish">Publicar</string>
-    <string name="dialog_gutenberg_informative_description_v2">Hemos hecho grandes mejoras en el editor de bloques y creemos que ¡vale la pena probarlo! Lo hemos activado para nuevas entradas y páginas, pero si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizar ahora</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Esta entrada se sincronizará inmediatamente.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">¿Preparado para sincronizar?</string>
     <string name="new_site_creation_unavailable_domain">Este dominio no está disponible</string>
-    <string name="login_promo_viewpager_content_description">Introducción</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">No hemos podido acceder a tu sitio. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b>certificado SSL&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b>identificación HTTP&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b>archivo XMLRCP&lt;/b>. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
-    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Accede con las credenciales del sitio.</string>
-    <string name="enter_credentials_for_site">Accede con las credenciales de tu sitio %1$s</string>
-    <string name="send_verification_email">Enviar el correo electrónico de verificación</string>
-    <string name="my_site_bottom_sheet_add_page">Página del sitio</string>
+    <string name="login_discovery_error_ssl">No hemos podido acceder a tu sitio debido a un problema con el &lt;b&gt;certificado SSL&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_http_auth">No hemos podido acceder a tu sitio porque necesita &lt;b&gt;identificación HTTP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_discovery_error_xmlrpc">No hemos podido acceder en tu sitio al &lt;b&gt;archivo XMLRCP&lt;/b&gt;. Tendrás que contactar con tu alojamiento para solucionarlo.</string>
+    <string name="login_site_credentials_magic_link_label">¡Ya casi estamos! Solo necesitamos verificar tu dirección de correo electrónico conectada a Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="reader_following_display_name">Siguiendo</string>
-    <string name="reader_my_likes_display_name">Me gusta</string>
-    <string name="reader_discover_display_name">Descubrir</string>
-    <string name="reader_save_for_later_display_name">Guardado</string>
-    <string name="reader_filter_tags_title">Temas</string>
-    <string name="reader_filter_sites_title">Sitios</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sE</string>
-    <string name="suffix_1_000_000_000_000_000">%sP</string>
-    <string name="suffix_1_000_000_000_000">%sT</string>
-    <string name="suffix_1_000_000_000">%sG</string>
-    <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="my_site_bottom_sheet_add_page">Página del sitio</string>
+    <string name="enter_credentials_for_site">Accede con las credenciales de tu sitio %1$s</string>
     <string name="posts_cannot_be_started">No podemos abrir las entradas en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="reader_filter_sites_title">Sitios</string>
+    <string name="reader_save_for_later_display_name">Guardado</string>
+    <string name="reader_discover_display_name">Descubrir</string>
+    <string name="reader_my_likes_display_name">Me gusta</string>
     <string name="site_cannot_be_loaded">No podemos cargar los datos para tu sitio en este momento. Por favor, inténtalo de nuevo más tarde</string>
+    <string name="suffix_1_000_000_000">%sG</string>
+    <string name="suffix_1_000_000_000_000_000">%sP</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sE</string>
+    <string name="reader_filter_tags_title">Temas</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="gutenberg_native_wordpress_media_library">Biblioteca de medios de WordPress</string>
+    <string name="gutenberg_native_unsupported">No compatible</string>
     <string name="gutenberg_native_ungroup">Desagrupar</string>
     <string name="gutenberg_native_translate">Traducir</string>
-    <string name="gutenberg_native_title">Título:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Toca para ocultar el teclado</string>
     <string name="gutenberg_native_tap_here_to_show_help">Toca aquí para mostrar la ayuda</string>
     <string name="gutenberg_native_take_a_video">Haz un vídeo</string>
     <string name="gutenberg_native_take_a_photo_or_video">Haz una foto o un vídeo</string>
     <string name="gutenberg_native_take_a_photo">Haz una foto</string>
     <string name="gutenberg_native_start_writing">Empieza a escribir…</string>
-    <string name="gutenberg_native_size">Tamaño</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Título del plugin en la barra lateral</string>
     <string name="gutenberg_native_show_section">Mostrar la sección</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloque %s. Este bloque tiene contenido no válido</string>
     <string name="gutenberg_native_s_block_empty">Bloque %s. Vacío</string>
     <string name="gutenberg_native_cut_block">Cortar bloque</string>
-    <string name="gutenberg_native_reset_block">Restablecer el bloque</string>
-    <string name="gutenberg_native_remove_annotations">Eliminar las notas</string>
     <string name="gutenberg_native_problem_opening_the_video">Problema al abrir el vídeo</string>
     <string name="gutenberg_native_problem_displaying_block">Problema al mostrar el bloque</string>
     <string name="gutenberg_native_post_title_s">Título de la entrada. %s</string>
@@ -539,17 +921,12 @@ Language: es
     <string name="gutenberg_native_open_settings">Abrir los ajustes</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ninguna aplicación puede manejar esta petición. Por favor, instala un navegador web.</string>
     <string name="gutenberg_native_navigate_up">Navegar arriba</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mi panel de prepublicación</string>
-    <string name="gutenberg_native_my_post_status_info">Información del estado de mi entrada</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mi panel de publicación de entradas</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panel de ajustes de mis documentos</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover el bloque hacia arriba, de la fila %1$s a la fila %2$s</string>
     <string name="gutenberg_native_move_block_up">Mover el bloque arriba</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover el bloque hacia abajo, de la fila %1$s a la fila %2$s</string>
     <string name="gutenberg_native_move_block_down">Mover el bloque abajo</string>
     <string name="gutenberg_native_image_caption_s">Leyenda de la imagen. %s</string>
     <string name="gutenberg_native_hide_keyboard">Ocultar el teclado</string>
-    <string name="gutenberg_native_here_is_the_panel_content">¡Aquí está el panel de contenido!</string>
     <string name="gutenberg_native_help_icon">Icono de ayuda</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Fallo al insertar los medios.\nPor favor, toca para ver las opciones.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Toca dos veces para deshacer el último cambio</string>
@@ -561,12 +938,9 @@ Language: es
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Toca dos veces para mover el bloque hacia arriba</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Toca dos veces para mover el bloque hacia abajo</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Toca dos veces para editar este valor</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Toca dos veces para cambiar el valor usando el control deslizante</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Toca dos veces para añadir un bloque</string>
     <string name="gutenberg_native_current_value_is_s">El valor actual es %s</string>
-    <string name="gutenberg_native_content">Contenido…</string>
     <string name="gutenberg_native_choose_from_device">Elegir desde el dispositivo</string>
-    <string name="gutenberg_native_annotations_sidebar">Barra lateral de notas</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ha ocurrido un error desconocido. Por favor, inténtalo de nuevo.</string>
     <string name="gutenberg_native_alt_text">Texto alternativo</string>
     <string name="gutenberg_native_add_video">AÑADIR UN VÍDEO</string>
@@ -574,21 +948,18 @@ Language: es
     <string name="gutenberg_native_add_image_or_video">AÑADIR UNA IMAGEN O UN VÍDEO</string>
     <string name="gutenberg_native_add_image">AÑADIR UNA IMAGEN</string>
     <string name="gutenberg_native_add_block_here">AÑADIR EL BLOQUE AQUÍ</string>
-    <string name="gutenberg_native_add_annotation">Añadir una nota</string>
-    <string name="gutenberg_native_add_a_description">Añadir una descripción</string>
+    <string name="gutenberg_native_add_alt_text">Añadir el texto alternativo</string>
     <string name="reader_empty_saved_posts_content_description">Toca el botón «Añadir a las entradas guardadas» para guardar una entrada en tu lista.</string>
     <string name="reader_acessibility_list_loaded">La lista se ha cargado con %1$d elementos.</string>
     <string name="notifications_tab_dialog_switch_desc">Avisos</string>
-    <string name="master_switch_default_title_off">Desactivados</string>
-    <string name="master_switch_default_title_on">Activados</string>
-    <string name="notifications_tab_dialog_master_off_message">Al desactivar los avisos para este sitio, se desactivarán los avisos que se muestran en la pestaña de avisos de este sitio. Puedes ajustar el tipo de aviso que ves después de activar los avisos para este sitio.</string>
-    <string name="notifications_tab_dialog_master_off_title">Para ver los avisos en la pestaña de avisos de este sitio, activa los avisos para este sitio.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Activar los avisos mostrados en la pestaña de avisos de este sitio</string>
-    <string name="notifications_tab_dialog_master_hint_on">Desactivar los avisos mostrados en la pestaña de avisos de este sitio</string>
-    <string name="notifications_tab_dialog_master_status_off">Avisos para este sitio</string>
-    <string name="notifications_tab_dialog_master_status_on">Avisos para este sitio</string>
-    <string name="dialog_gutenberg_informative_description_page">Ahora estás usando el editor de bloques para las nuevas páginas, ¡genial! Si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
-    <string name="dialog_gutenberg_informative_description_post">Ahora estás usando el editor de bloques para las nuevas entradas, ¡genial! Si quieres cambiar al editor clásico, ve a «Mi sitio > Ajustes del sitio».</string>
+    <string name="main_switch_default_title_off">Desactivado</string>
+    <string name="main_switch_default_title_on">Activado</string>
+    <string name="notifications_tab_dialog_main_off_message">Al desactivar los avisos para este sitio, se desactivarán los avisos mostrados en la pestaña de avisos de este sitio. Puedes ajustar qué tipo de aviso ves después de activar los avisos para este sitio.</string>
+    <string name="notifications_tab_dialog_main_off_title">Para ver los avisos en la pestaña de avisos de este sitio, activa los avisos para este sitio.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activar los avisos mostrados en la pestaña de avisos de este sitio</string>
+    <string name="notifications_tab_dialog_main_hint_on">Desactivar los avisos mostrados en la pestaña de avisos de este sitio</string>
+    <string name="notifications_tab_dialog_main_status_off">Avisos para este sitio</string>
+    <string name="notifications_tab_dialog_main_status_on">Avisos para este sitio</string>
     <string name="pick_media">Añadir una imagen o vídeo</string>
     <string name="error_post_not_submitted_retrying">No hemos podido enviar esta entrada para revisión, pero lo intentaremos de nuevo más tarde. </string>
     <string name="error_post_not_scheduled_retrying">No hemos podido programar esta entrada, pero lo intentaremos de nuevo más tarde.</string>
@@ -655,8 +1026,8 @@ Language: es
     <string name="stats_file_downloads_title_label">Archivo</string>
     <string name="stats_file_downloads">Descargas de archivos</string>
     <string name="stats_data_not_recorded_for_period">Las estadísticas de descarga de archivos no se registraron antes del 28 de Junio de 2019.</string>
-    <string name="stats_site_negative_utc">Zona horaria del sitio (UTC -%s)</string>
     <string name="stats_site_positive_utc">Zona horaria del sitio (UTC +%s)</string>
+    <string name="stats_site_negative_utc">Zona horaria del sitio (UTC -%s)</string>
     <string name="stats_site_neutral_utc">Zona horaria del sitio (UTC)</string>
     <string name="web_preview_desktop">Escritorio</string>
     <string name="web_preview_default">Por defecto</string>
@@ -665,9 +1036,9 @@ Language: es
     <string name="share_desc">Compartir</string>
     <string name="navigate_back_desc">Volver</string>
     <string name="navigate_forward_desc">Avanzar</string>
-    <string name="calendar_scheduled_post_description">«%s» programado para publicar el «%s» en tu aplicación de WordPress\n%s</string>
     <string name="calendar_scheduled_post_title">Entrada programada de WordPress: «%s»</string>
     <string name="notification_post_will_be_published_in_ten_minutes">«%s» se publicará en 10 minutos</string>
+    <string name="calendar_scheduled_post_description">«%s» programado para publicar el «%s» en tu aplicación de WordPress\n%s</string>
     <string name="notification_post_will_be_published_in_one_hour">«%s» se publicará en 1 hora</string>
     <string name="notification_post_has_been_published">«%s» ha sido publicado</string>
     <string name="notification_scheduled_post_ten_minute_reminder">Entrada programada: recordatorio de 10 minutos</string>
@@ -677,12 +1048,10 @@ Language: es
     <string name="post_notification_when_published">Cuando se publique</string>
     <string name="post_notification_ten_minutes_before">10 minutos antes</string>
     <string name="post_notification_one_hour_before">1 hora antes</string>
-    <string name="post_notification_off">Desactivado</string>
     <string name="post_settings_add_to_calendar">Añadir al calendario</string>
     <string name="post_settings_notification">Aviso</string>
+    <string name="post_notification_off">Desactivado</string>
     <string name="post_settings_time_and_date">Fecha y hora</string>
-    <string name="login_need_help_finding_connected_email">¿Necesitas ayuda para encontrar el correo electrónico con el que te conectaste?</string>
-    <string name="enter_wordpress_site">La web en esa dirección no es un sitio WordPress. Para conectarnos a él, el sitio debe tener instalado WordPress.</string>
     <string name="login_invalid_site_url">Por favor, introduce una dirección completa de una web, como example.com.</string>
     <string name="enter_email_for_site">Accede con WordPress.com para conectar con %1$s</string>
     <string name="stats_post_views_label">Visitas</string>
@@ -691,15 +1060,15 @@ Language: es
     <string name="stats_item_collapsed">Elemento contraído</string>
     <string name="stats_item_expanded">Elemento expandido</string>
     <string name="stats_collapse_content_description">Contraer</string>
-    <string name="stats_expand_content_description">Ampliar</string>
     <string name="stats_graph_updated">Gráfico actualizado.</string>
     <string name="stats_overview_content_description">%1$s %2$s del período: %3$s, cambio desde el período anterior - %4$s</string>
     <string name="stats_loading_card">Cargando los datos de la tarjeta seleccionada</string>
     <string name="site_settings_editor">Editor</string>
-    <string name="description_expand">Ampliar</string>
+    <string name="stats_expand_content_description">Ampliar</string>
     <string name="description_collapse">Cerrar</string>
     <string name="my_site_verify_your_email_without_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a tu correo electrónico</string>
     <string name="my_site_verify_your_email">Verifica tu dirección de correo electrónico - las instrucciones se enviaron a %s</string>
+    <string name="description_expand">Ampliar</string>
     <string name="link_dialog_button_cancel">Cancelar</string>
     <string name="link_dialog_button_ok">Aceptar</string>
     <string name="link_dialog_edit_hint">http(s)://</string>
@@ -732,23 +1101,23 @@ Language: es
     <string name="stats_widget_all_time_title">Histórico</string>
     <string name="stats_widget_views_title">Visitas esta semana</string>
     <string name="stats_widget_add">Añadir widget</string>
-    <string name="plugin_fetching_error_after_at">Está tardando más tiempo del normal recargar los detalles del plugin. Por favor, compruébalo de nuevo más tarde.</string>
     <string name="plugin_install_site_ineligible_default_error">Si acabas de registrar un nombre de dominio, por favor, espera hasta que terminemos de configurarlo e inténtalo de nuevo.\n\nEn caso contrario, parece que algo fue mal y la característica del plugin podría no estar disponible para este sitio.</string>
+    <string name="plugin_fetching_error_after_at">Está tardando más tiempo del normal recargar los detalles del plugin. Por favor, compruébalo de nuevo más tarde.</string>
     <string name="domain_contact_information_state_not_available_hint">Estado (no disponible)</string>
     <string name="domain_registration_privacy_protection_tos">Al registrar este dominio aceptas nuestros %1$stérminos y condiciones%2$s</string>
     <string name="error_network_connection">Comprueba tu conexión a la red e inténtalo de nuevo.</string>
     <string name="error_browser_no_network">No se ha podido cargar esta página en este momento.</string>
-    <string name="error_disabled_apis">No se pudieron recuperar los ajustes. Algunas APIs no están disponibles para la cuenta e ID de esta aplicación OAuth.</string>
     <string name="jetpack_connection_terms_and_conditions">Al configurar Jetpack aceptas nuestros %1$stérminos y condiciones%2$s</string>
+    <string name="error_disabled_apis">No se pudieron recuperar los ajustes. Algunas APIs no están disponibles para la cuenta e ID de esta aplicación OAuth.</string>
     <string name="site_settings_disconnected_toast">No hay ninguna conexión. La edición está desactivada.</string>
-    <string name="site_settings_update_password_message">Para volver a conectar la aplicación con tu sitio alojado, introduce aquí la nueva contraseña del sitio.</string>
     <string name="site_settings_password_updated">Contraseña actualizada</string>
     <string name="site_settings_password_dialog_title">Actualizar contraseña</string>
+    <string name="site_settings_update_password_message">Para volver a conectar la aplicación con tu sitio alojado, introduce aquí la nueva contraseña del sitio.</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Registrando el nombre de dominio…</string>
     <string name="domain_registration_state_picker_dialog_title">Selecciona la provincia</string>
     <string name="domain_registration_country_picker_dialog_title">Selecciona el país</string>
     <string name="domain_registration_result_continue_button">seguir</string>
-    <string name="domain_registration_result_description">tu nuevo dominio &lt;b>%s&lt;/b> se está configurando. ¡Tu sitio está\n    dando saltos mortales de emoción!</string>
+    <string name="domain_registration_result_description">tu nuevo dominio &lt;b&gt;%s&lt;/b&gt; se está configurando. ¡Tu sitio está\n    dando saltos mortales de emoción!</string>
     <string name="domain_registration_result_title">Enhorabuena</string>
     <string name="domain_contact_information_register_domain_button">Registrar dominio</string>
     <string name="domain_contact_information_postal_code_hint">Código postal</string>
@@ -777,35 +1146,35 @@ Language: es
     <string name="editor_failed_to_insert_media_tap_to_retry">Fallo al insertar los medios.\nPor favor, toca para volver a intentarlo.</string>
     <string name="editor_uploading_draft">Tu borrador se está subiendo</string>
     <string name="post_uploading_draft">Subiendo borrador</string>
-    <string name="post_list_tab_drafts">Borradores</string>
     <string name="error_restoring_post">Ocurrió un error mientras se restauraba la entrada</string>
-    <string name="backdated_for">Retroceder a: %s</string>
-    <string name="stats_insights_management_title">Solo ves las estadísticas más relevantes. Añade y organiza tus detalles abajo.</string>
+    <string name="post_list_tab_drafts">Borradores</string>
     <string name="stats_insights_social">Social</string>
     <string name="stats_insights_annual_site_stats">Estadísticas anuales del sitio</string>
-    <string name="stats_view_follower_totals">Seguidores totales</string>
+    <string name="register_domain">Registrar dominio</string>
+    <string name="jetpack_installed_message">Ahora que está instalado Jetpack, solo necesitamos que lo configures. Esto solo te llevará un minuto.</string>
+    <string name="stats_insights_management_title">Solo ves las estadísticas más relevantes. Añade y organiza tus detalles abajo.</string>
+    <string name="backdated_for">Retroceder a: %s</string>
     <string name="domain_suggestions_fetch_error">No se pudieron cargar las sugerencias de dominios</string>
     <string name="domain_suggestions_search_hint">Teclea una palabra clave para más ideas</string>
     <string name="domains_suggestions_empty_list">No se han encontrado sugerencias</string>
-    <string name="register_domain">Registrar dominio</string>
-    <string name="jetpack_installed_message">Ahora que está instalado Jetpack, solo necesitamos que lo configures. Esto solo te llevará un minuto.</string>
-    <string name="stats_menu_remove">Quitar de los detalles</string>
+    <string name="stats_view_follower_totals">Seguidores totales</string>
     <string name="stats_menu_move_down">Mover abajo</string>
     <string name="stats_menu_move_up">Mover arriba</string>
-    <string name="stats_item_settings">Ajustes de los parámetros de las estadísticas</string>
-    <string name="post_moving_to_draft">La entrada se está moviendo a borradores</string>
-    <string name="post_restoring">La entrada se está restaurando</string>
-    <string name="post_restored">Entrada restaurada</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Cambios locales</string>
     <string name="post_trashing">La entrada se está enviando a la papelera</string>
+    <string name="post_restored">Entrada restaurada</string>
+    <string name="post_restoring">La entrada se está restaurando</string>
+    <string name="post_moving_to_draft">La entrada se está moviendo a borradores</string>
+    <string name="stats_menu_remove">Quitar de los detalles</string>
+    <string name="stats_item_settings">Ajustes de los parámetros de las estadísticas</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Al enviar esta entrada a la papelera también se descartarán los cambios sin guardar, ¿estás seguro de querer continuar?</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Cambios locales</string>
-    <string name="button_move_to_draft">Mover a borradores</string>
-    <string name="post_list_toggle_item_layout_list_view">Cambiar a la vista de lista</string>
-    <string name="post_list_toggle_item_layout_cards_view">Cambiar a la vista de tarjetas</string>
-    <string name="posts_trashed_empty">No tienes ninguna entrada en la papelera</string>
-    <string name="posts_draft_empty">No tienes ninguna entrada en borrador</string>
-    <string name="posts_scheduled_empty">No tienes ninguna entrada programada</string>
     <string name="posts_published_empty">Aún no has publicado ninguna entrada</string>
+    <string name="posts_scheduled_empty">No tienes ninguna entrada programada</string>
+    <string name="posts_draft_empty">No tienes ninguna entrada en borrador</string>
+    <string name="posts_trashed_empty">No tienes ninguna entrada en la papelera</string>
+    <string name="post_list_toggle_item_layout_cards_view">Cambiar a la vista de tarjetas</string>
+    <string name="post_list_toggle_item_layout_list_view">Cambiar a la vista de lista</string>
+    <string name="button_move_to_draft">Mover a borradores</string>
     <string name="notification_wpcom_username_needed">Por favor, accede con tu nombre de usuario y contraseña.</string>
     <string name="error_user_username_instead_of_email">Por favor, accede usando tu nombre de usuario de WordPress.com en vez de tu dirección de correo electrónico.</string>
     <string name="stats_insights_average_words">Promedio de palabras/entrada</string>
@@ -816,17 +1185,16 @@ Language: es
     <string name="stats_insights_total_comments">Total de comentarios</string>
     <string name="stats_insights_posts">Entradas</string>
     <string name="stats_insights_year">Año</string>
-    <string name="stats_insights_this_year_site_stats">Este año</string>
     <string name="no_site_error">El sitio de esta dirección no es un sitio WordPress. Para que nos podamos conectar el sitio debe usar WordPress.</string>
+    <string name="stats_insights_this_year_site_stats">Este año</string>
     <string name="plugin_check_domain_credit_error">Fallo al comprobar los créditos de dominio disponibles</string>
     <string name="plugin_check_domain_credits_progress_dialog_message">Comprobando créditos de dominio</string>
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Registrar dominio</string>
     <string name="plugin_install_custom_domain_required_dialog_message">Para instalar plugins necesitas tener un dominio personalizado asociado a tu sitio.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Instalar plugin</string>
-    <string name="new_site_creation_preview_subtitle">Podrás personalizar la apariencia de tu sitio más adelante</string>
+    <string name="published_on">Publicado el: %s</string>
     <string name="publish_on">Publicar el: %s</string>
     <string name="schedule_for">Programa para el: %s</string>
-    <string name="published_on">Publicado el: %s</string>
     <string name="scheduled_for">Programado para el: %s</string>
     <string name="stats_detail_recent_weeks">Últimas semanas</string>
     <string name="stats_detail_average_views_per_day">Vistas medias por dia</string>
@@ -834,19 +1202,20 @@ Language: es
     <string name="stats_months_and_years_period_label">Período</string>
     <string name="stats_detail_months_and_years">Meses y años</string>
     <string name="stats_insights_load_more">Cargar más</string>
+    <string name="new_site_creation_preview_subtitle">Podrás personalizar la apariencia de tu sitio más adelante</string>
     <string name="stats_insights_today_stats">Hoy</string>
     <string name="stats_insights_best_hour">Mejor hora</string>
     <string name="stats_insights_best_day">Mejor día</string>
     <string name="showing_stats_for">Estadísticas del:</string>
     <string name="app_rating_rate_never">No, gracias</string>
-    <string name="app_rating_rate_later">Más tarde</string>
     <string name="app_rating_rate_now">Valorar ahora</string>
+    <string name="app_rating_rate_later">Más tarde</string>
     <string name="app_rating_message">¡Qué gusto verte de nuevo! Si estás trabajando con la aplicación nos encantaría que nos puntuases en la Google Play Store.</string>
     <string name="app_rating_title">¿Estás disfrutando de WordPress?</string>
-    <string name="editor_post_converted_back_to_draft">Entrada devuelta a borrador</string>
-    <string name="stats_insights_posting_activity">Actividad de publicación</string>
     <string name="stats_site_not_loaded_yet">El sitio no se ha cargado todavía</string>
+    <string name="editor_post_converted_back_to_draft">Entrada devuelta a borrador</string>
     <string name="stats_more_posts">Más entradas</string>
+    <string name="stats_insights_posting_activity">Actividad de publicación</string>
     <string name="stats_fewer_posts">Menos entradas</string>
     <string name="new_site_creation_preview_back_pressed_warning">Puedes perder lo que llevas hecho. ¿Estás seguro de que quieres salir?</string>
     <string name="plans_loading_error_with_cache_button">Ver los planes</string>
@@ -855,25 +1224,21 @@ Language: es
     <string name="plans_loading_error_no_plans_subtitle">No podemos cargar los planes en este momento. Por favor, inténtalo de nuevo.</string>
     <string name="plans_loading_error_no_plans_title">No se pueden cargar los planes</string>
     <string name="plans_loading_error_network_title">No hay conexión</string>
-    <string name="menu_switch_to_gutenberg_editor">Cambiar al editor de bloques</string>
-    <string name="menu_switch_to_aztec_editor">Cambiar al editor clásico</string>
     <string name="stats_loading_block_error">Hubo un problema al cargar tus datos, recarga la página e inténtalo de nuevo.</string>
     <string name="stats_loading_error">Datos no cargados</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edita las nuevas entradas y páginas con el editor de bloques</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Usar editor de bloques</string>
-    <string name="dialog_gutenberg_informative_title">Editor de bloques activado</string>
+    <string name="menu_switch_to_gutenberg_editor">Cambiar al editor de bloques</string>
     <string name="exit">salir</string>
     <string name="quick_start_sites_type_subtitle">%1$d de %2$d completo</string>
-    <string name="quick_start_sites_type_grow">Haz crecer tu audiencia</string>
-    <string name="quick_start_sites_type_customize">Personaliza tu sitio</string>
     <string name="quick_start_sites">Siguientes pasos</string>
     <string name="quick_start_complete_tasks_header">Completo (%d)</string>
     <string name="quick_start_dialog_view_site_message">¡Disfruta tu producto terminado!</string>
     <string name="quick_start_dialog_upload_icon_title">Sube un icono del sitio</string>
     <string name="quick_start_dialog_upload_icon_message">Tus visitantes verán tu icono en su navegador. Añade un icono personalizado para conseguir un aspecto profesional y refinado.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Toca en %1$s Plan %2$s para ver tu plan actual y otros planes disponibles</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Toca en %1$s Añadir página %2$s para crear una nueva página.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Toca en %1$s Páginas %2$s para continuar.</string>
+    <string name="quick_start_sites_type_grow">Haz crecer tu audiencia</string>
+    <string name="quick_start_sites_type_customize">Personaliza tu sitio</string>
     <string name="quick_start_dialog_check_stats_message_short">Toca en %1$s Estadísticas %2$s para ver cómo está rindiendo tu sitio.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Toca en %1$s Icono de tu sitio %2$s para subir uno nuevo</string>
     <string name="quick_start_dialog_publish_post_message">Guarda en borrador y publica tu primera entrada.</string>
@@ -884,22 +1249,17 @@ Language: es
     <string name="quick_start_dialog_explore_plans_message">Aprende sobre las herramientas de marketing y SEO de nuestros planes de pago.</string>
     <string name="quick_start_dialog_enable_sharing_title">Activar compartir entradas</string>
     <string name="quick_start_dialog_enable_sharing_message">Comparte automáticamente las nuevas entradas en tus cuentas de medios sociales.</string>
-    <string name="quick_start_dialog_customize_site_message">Retoca fuentes, añade imágenes y más.</string>
-    <string name="quick_start_dialog_create_page_title">Crea una nueva página</string>
-    <string name="quick_start_dialog_create_page_message">Añade una página con contenido clave - una página «Acerca de» es un gran comienzo.</string>
     <string name="quick_start_dialog_check_stats_title">Revisa las estadísticas de tu sitio</string>
     <string name="quick_start_dialog_check_stats_message">Mantente al día sobre el rendimiento de tu sitio.</string>
-    <string name="quick_start_dialog_browse_themes_title">Explorar temas</string>
-    <string name="quick_start_dialog_browse_themes_message">Explora docenas de opciones de diseño y descubre el que se ajuste a ti.</string>
-    <string name="quick_start_dialog_remove_next_steps_message">Eliminar los siguientes pasos ocultará todas las visitas guiadas de este sitio. Esta acción es irreversible.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Quitar los siguientes pasos</string>
     <string name="quick_start_remove_next_steps_menu_title">Quitar esto</string>
     <string name="quick_start_complete_view_subtitle">Enhorabuena por completar tu lista. Un trabajo bien hecho.</string>
+    <string name="quick_start_dialog_remove_next_steps_message">Eliminar los siguientes pasos ocultará todas las visitas guiadas de este sitio. Esta acción es irreversible.</string>
     <string name="quick_start_complete_view_title">¡Todas las tareas están completas!</string>
     <string name="quick_start_task_skip_menu_title">Saltar tarea</string>
     <string name="quick_start_completed_tasks_header_chevron_collapse_desc">contraer</string>
-    <string name="quick_start_completed_tasks_header_chevron_expand_desc">ampliar</string>
     <string name="notification_channel_reminder_title">Recordatorio</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">ampliar</string>
     <string name="stats_select_next_period_description">Elige el siguiente periodo</string>
     <string name="stats_select_previous_period_description">Elige el periodo anterior</string>
     <string name="stats_most_popular_percent_views">%1$d%% de visitas</string>
@@ -912,23 +1272,19 @@ Language: es
     <string name="cancel_new_site_wizard_content_description">Cancelar el asistente de creación de sitios</string>
     <string name="notification_new_site_creation_creating_site_subtitle">Estamos creando tu nuevo sitio</string>
     <string name="notification_new_site_creation_failed">Hubo un problema</string>
-    <string name="notification_new_site_creation_title">Crear sitio</string>
     <string name="new_site_creation_create_site_button">Crear sitio</string>
-    <string name="new_site_creation_search_domain_input_hint">Buscar dominios</string>
     <string name="new_site_creation_domain_header_subtitle">Aquí es donde la gente te encontrará en Internet.</string>
-    <string name="new_site_creation_domain_header_title">Selecciona un nombre de dominio para tu sitio</string>
+    <string name="notification_new_site_creation_title">Crear sitio</string>
     <string name="new_site_creation_empty_domain_list_message">No hay direcciones disponibles que coincidan con tu búsqueda</string>
     <string name="site_creation_error_generic_subtitle">Error durante la comunicación con el servidor. Inténtalo de nuevo</string>
     <string name="site_creation_error_generic_title">Hubo un problema</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Hubo un problema</string>
-    <string name="site_creation_segments_subtitle">Esto nos ayuda a hacer recomendaciones. Pero no tienes que estar siempre ahí; ¡los sitios evolucionan!</string>
-    <string name="site_creation_segments_title">Cuéntanos qué tipo de sitio te gustaría crear</string>
+    <string name="local_post_is_conflicted">Conflicto de versiones</string>
     <string name="new_site_creation_preview_title">¡Se ha creado tu sitio!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
     <string name="new_site_creation_screen_title_general">Crear sitio</string>
     <string name="suggestions_updated_content_description">Sugerencias actualizadas</string>
     <string name="site_picker_failed_selecting_added_site">No se ha podido seleccionar el sitio auto-hospedado que acabas de añadir</string>
-    <string name="local_post_is_conflicted">Conflicto de versiones</string>
     <string name="preference_crash_reports_summary">Activa los informes de errores automáticos para ayudarnos a mejorar el rendimiento de la app.</string>
     <string name="preference_crash_reports">Informes de errores</string>
     <string name="snackbar_conflict_undo">Deshacer</string>
@@ -936,25 +1292,27 @@ Language: es
     <string name="snackbar_conflict_local_version_discarded">Versión local descartada</string>
     <string name="toast_conflict_updating_post">Actualizando contenido</string>
     <string name="dialog_confirm_load_remote_post_discard_web">Descartar web</string>
-    <string name="dialog_confirm_load_remote_post_discard_local">Descartar local</string>
+    <string name="dialog_confirm_load_remote_post_title">Resolver conflicto de sincronización</string>
     <string name="dialog_confirm_load_remote_post_body_2">Local\nGuardado el %s\n\nWeb\nGuardado el %s\n</string>
     <string name="dialog_confirm_load_remote_post_body">Este contenido tiene dos versiones en conflicto. Selecciona qué versión quieres descartar.\n</string>
-    <string name="dialog_confirm_load_remote_post_title">Resolver conflicto de sincronización</string>
+    <string name="dialog_confirm_load_remote_post_discard_local">Descartar local</string>
     <string name="stats_no_data_for_period">No hay datos en este periodo</string>
     <string name="preference_strip_image_location">Eliminar la ubicación de los medios</string>
     <string name="stats_cannot_be_started">No podemos abrir las estadísticas en este momento. Por favor, inténtalo de nuevo más tarde</string>
-    <string name="gif_picker_endless_scroll_network_error">Algunos medios fallan al cargar debido a un error de red.</string>
-    <string name="gif_picker_empty_search_list">Ningún medio coincide con tu búsqueda</string>
-    <string name="gif_picker_initial_empty_text">¡Busca para encontrar GIF para añadir a tu biblioteca de medios!</string>
-    <string name="stats_author_views_label">Vistas</string>
     <string name="stats_author_label">Autor</string>
     <string name="stats_authors">Autores</string>
+    <string name="stats_insights_linkedin">LinkedIn</string>
+    <string name="stats_insights_google_plus">Google+</string>
+    <string name="stats_insights_tumblr">Tumblr</string>
+    <string name="stats_insights_twitter">Twitter</string>
+    <string name="stats_insights_facebook">Facebook</string>
+    <string name="stats_videos_title_label">Título</string>
+    <string name="stats_insights_path">Ruta</string>
+    <string name="stats_author_views_label">Vistas</string>
     <string name="stats_search_terms_views_label">Vistas</string>
     <string name="stats_search_terms_label">Buscar término</string>
     <string name="stats_search_terms">Buscar términos</string>
     <string name="stats_videos_views_label">Vistas</string>
-    <string name="stats_videos_title_label">Título</string>
-    <string name="stats_videos">Vídeos</string>
     <string name="stats_country_views_label">Vistas</string>
     <string name="stats_country_label">País</string>
     <string name="stats_countries">Paises</string>
@@ -965,46 +1323,44 @@ Language: es
     <string name="stats_referrer_label">Referente</string>
     <string name="stats_referrers">Referentes</string>
     <string name="stats_posts_and_pages">Entradas y páginas</string>
-    <string name="stats_insights_path">Ruta</string>
-    <string name="stats_insights_linkedin">LinkedIn</string>
-    <string name="stats_insights_google_plus">Google+</string>
-    <string name="stats_insights_tumblr">Tumblr</string>
-    <string name="stats_insights_twitter">Twitter</string>
-    <string name="stats_insights_facebook">Facebook</string>
     <string name="stats_insights_view_more">Ver más</string>
     <string name="stats_insights_share_post">Compartir entrada</string>
     <string name="stats_insights_create_post">Crear entrada</string>
     <string name="stats_insights_latest_post_message">Han pasado %1$s desde que se publicó %2$s. Así es como ha funcionado la entrada hasta ahora:</string>
+    <string name="gif_picker_endless_scroll_network_error">Algunos medios fallan al cargar debido a un error de red.</string>
+    <string name="gif_picker_empty_search_list">Ningún medio coincide con tu búsqueda</string>
+    <string name="gif_picker_initial_empty_text">¡Busca para encontrar GIF para añadir a tu biblioteca de medios!</string>
+    <string name="stats_videos">Vídeos</string>
+    <string name="stats_insights_tags_and_categories">Etiquetas y categorías</string>
     <string name="stats_insights_latest_post_with_no_engagement">Han pasado %1$s desde que se publicó %2$s. Pon la bola a rodar y aumenta las vistas de las entradas compartiendo tu entrada:</string>
     <string name="stats_insights_latest_post_empty">Aún no has publicado ninguna entrada. Una vez que empieces a publicar, el resumen de tu última entrada aparecerá aquí:</string>
-    <string name="stats_insights_tags_and_categories">Etiquetas y categorías</string>
     <string name="stats_insights_all_time_stats">Histórico</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
+    <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_comments_author_label">Autor</string>
+    <string name="stats_comments_authors">Autores</string>
+    <string name="stats_followers_email">Correo electrónico</string>
+    <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_posts_and_pages_title_label">Título</string>
+    <string name="stats_comments_title_label">Título</string>
     <string name="stats_publicize_followers_label">Seguidores</string>
+    <string name="stats_follower_label">Seguidor</string>
+    <string name="stats_followers_count_message">Total %1$s seguidores: %2$s</string>
     <string name="stats_publicize_service_label">Servicio</string>
-    <string name="stats_category_folded_name">%1$s | %2$s</string>
     <string name="stats_tags_and_categories_views_label">Vistas</string>
     <string name="stats_tags_and_categories_title_label">Título</string>
     <string name="stats_posts_and_pages_views_label">Vistas</string>
-    <string name="stats_posts_and_pages_title_label">Título</string>
     <string name="stats_comments_label">Comentarios</string>
-    <string name="stats_comments_title_label">Título</string>
-    <string name="stats_comments_author_label">Autor</string>
     <string name="stats_comments_posts_and_pages">Entradas y páginas</string>
-    <string name="stats_comments_authors">Autores</string>
     <string name="stats_follower_since_label">Desde</string>
-    <string name="stats_follower_label">Seguidor</string>
-    <string name="stats_followers_count_message">Total %1$s seguidores: %2$s</string>
-    <string name="stats_followers_email">Correo electrónico</string>
-    <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_manage_insights">Gestionar datos</string>
     <string name="stats_empty_insights_title">Aún no se han añadido impresiones</string>
     <string name="stats_no_data_yet">Aún no hay datos</string>
     <string name="menu_debug">Menú de depuración</string>
     <string name="change_password_dialog_message">Cambiando contraseña…</string>
-    <string name="change_password_dialog_hint">Tu contraseña debe tener al menos seis caracteres de longitud. Para hacerla más fuerte, usa letras mayúsculas y minúsculas, números y símbolos como ! \" ? $ % ^ &amp; ).</string>
     <string name="change_password_confirmation">Contraseña cambiada con éxito</string>
     <string name="change_password">Cambiar contraseña</string>
+    <string name="change_password_dialog_hint">Tu contraseña debe tener al menos seis caracteres de longitud. Para hacerla más fuerte, usa letras mayúsculas y minúsculas, números y símbolos como ! \" ? $ % ^ &amp; ).</string>
     <string name="support_identity_input_dialog_name_label">Nombre</string>
     <string name="history_no_title">(sin título)</string>
     <string name="history_preview_html">Vista previa HTML</string>
@@ -1013,7 +1369,6 @@ Language: es
     <string name="history_detail_button_previous">Anterior</string>
     <string name="history_detail_button_next">Siguiente</string>
     <string name="media_space_used">%1$s utilizado</string>
-    <string name="enter_wpcom_or_jetpack_site">Por favor, introduce un sitio WordPress WordPress.com o autoalojado conectado a Jetpack</string>
     <string name="history_loading_revision">Cargando revisión</string>
     <string name="history_loaded_revision">Revisión cargada</string>
     <string name="history_load_dialog_button_positive">Cargar</string>
@@ -1022,23 +1377,24 @@ Language: es
     <string name="history_empty_title">Aún no hay histórico</string>
     <string name="history_empty_subtitle_post">Cuando haces cambios a tu entrada podrás ver aquí el histórico</string>
     <string name="history_empty_subtitle_page">Cuando haces cambios a tu página podrás ver aquí el histórico</string>
+    <string name="enter_wpcom_or_jetpack_site">Por favor, introduce un sitio WordPress WordPress.com o autoalojado conectado a Jetpack</string>
     <string name="description_user">Avatar del usuario</string>
     <string name="image_size_full_label">Tamaño completo</string>
     <string name="image_size_large_label">Grande</string>
     <string name="image_size_medium_label">Mediano</string>
     <string name="image_size_thumbnail_label">Miniatura</string>
     <string name="menu_history">Historia</string>
-    <string name="pages_open_page_error">La página seleccionada no está disponible</string>
     <string name="pages_pending">Pendiente de revisión</string>
+    <string name="pages_open_page_error">La página seleccionada no está disponible</string>
     <string name="pages_empty_trashed">No tienes ninguna página en la papelera</string>
     <string name="pages_empty_scheduled">No tienes ninguna página programada</string>
-    <string name="pages_empty_drafts">No tienes ninguna página en borrador</string>
     <string name="pages_empty_published">Todavía no has publicado ninguna página</string>
     <string name="pages_search_suggestion">Buscar páginas</string>
     <string name="pages_empty_search_result">Ninguna página coincide con tu búsqueda</string>
     <string name="pages_delete_permanently">Borrar permanentemente</string>
     <string name="pages_move_to_trash">Mover a la papelera</string>
     <string name="pages_move_to_draft">Mover a borradores</string>
+    <string name="pages_empty_drafts">No tienes ninguna página en borrador</string>
     <string name="pages_set_parent">Hacer superior</string>
     <string name="pages_view">Ver</string>
     <string name="pages_trashed">En la papelera</string>
@@ -1067,57 +1423,51 @@ Language: es
     <string name="quick_start_dialog_view_site_title">Ver tu sitio</string>
     <string name="quick_start_dialog_view_site_message_short">Toca en %1$s Ver sitio %2$s para previsualizar tu sitio</string>
     <string name="quick_start_dialog_share_site_title">Comparte tu sitio</string>
+    <string name="quick_start_dialog_share_site_message">Conecta a tus cuentas de medios sociales - tu sitio compartirá automáticamente las nuevas entradas.</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">Toca en %1$s Compartir %2$s para continuar</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Toca en %1$s Conexiones %2$s para añadir tus cuentas de medios sociales</string>
-    <string name="quick_start_dialog_share_site_message">Conecta a tus cuentas de medios sociales - tu sitio compartirá automáticamente las nuevas entradas.</string>
     <string name="quick_start_dialog_publish_post_title">Publica una entrada</string>
     <string name="quick_start_dialog_publish_post_message_short">Toca en %1$s Crear entrada %2$s para crear una nueva entrada</string>
     <string name="quick_start_dialog_need_help_title">¿Quieres un poco de ayuda para empezar?</string>
     <string name="quick_start_dialog_need_help_button_positive">Acepto</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
-    <string name="quick_start_dialog_need_help_button_negative">No gracias</string>
     <string name="quick_start_dialog_follow_sites_title">Sigue otros sitios</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con intereses similares</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Toca en %1$s Lector %2$s para seguir</string>
+    <string name="quick_start_dialog_need_help_button_negative">No gracias</string>
     <string name="quick_start_dialog_follow_sites_message">Descubre sitios que te inspiren, y síguelos para obtener actualizaciones cuando publiquen.</string>
-    <string name="quick_start_dialog_customize_site_title">Personaliza tu sitio</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Toca en %1$s Temas %2$s para seguir</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Toca en %1$s Personalizar %2$s para empezar a personalizar tu sitio</string>
-    <string name="quick_start_dialog_choose_theme_title">Elige un tema</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Toca en %1$s Temas %2$s para descubrir nuevos temas</string>
-    <string name="quick_start_dialog_choose_theme_message">Revisa todos nuestros temas para encontrar el que se te ajuste a la perfección</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con temáticas similares</string>
     <string name="quick_start_button_positive">Ir</string>
     <string name="quick_start_button_negative_short">Cancelar</string>
     <string name="quick_start_button_negative">Ahora no</string>
-    <string name="content_description_more">Más</string>
     <string name="my_site_create_new_site_title">No tienes sitios</string>
+    <string name="content_description_more">Más</string>
     <string name="reader_empty_followed_tags_title">Temas no seguidos</string>
     <string name="reader_empty_followed_tags_subtitle">Añade aquí temas para descubrir entradas sobre tus temáticas favoritas</string>
-    <string name="login_to_to_connect_jetpack">Accede a la cuenta de WordPress.com que usaste para conectar Jetpack.</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">FAQ de Jetpack</string>
+    <string name="install_jetpack">Instala Jetpack</string>
+    <string name="jetpack_installed">Jetpack instalado</string>
+    <string name="installing_jetpack">Instalando Jetpack</string>
     <string name="install_jetpack_retry">Reintentar</string>
-    <string name="install_jetpack_continue">Configurar</string>
-    <string name="jetpack_installation_problem_message">Jetpack no se pudo instalar en este momento.</string>
+    <string name="login_to_to_connect_jetpack">Accede a la cuenta de WordPress.com que usaste para conectar Jetpack.</string>
     <string name="jetpack_installation_problem">Hubo un problema</string>
-    <string name="jetpack_installed">Jetpack instalado</string>
     <string name="installing_jetpack_message">Instalando Jetpack en tu sitio. Esto puede llevar unos minutos completarse.</string>
-    <string name="installing_jetpack">Instalando Jetpack</string>
     <string name="install_jetpack_message">Las credenciales de tu web no se almacenarán, y solo se utilizan para instalar Jetpack.</string>
-    <string name="install_jetpack">Instala Jetpack</string>
-    <string name="jetpack">Jetpack</string>
-    <string name="stats_jetpack_connection_faq">FAQ de Jetpack</string>
+    <string name="install_jetpack_continue">Configurar</string>
+    <string name="jetpack_installation_problem_message">Jetpack no se pudo instalar en este momento.</string>
     <string name="stats_jetpack_connection_setup_info">Para usar las estadísticas en tu sitio WordPress necesitas instalar el plugin Jetpack.</string>
     <string name="themes_empty_list">No hay temas que coincidan con tu búsqueda</string>
     <string name="reader_label_post_search_explainer">¿Que te gustaría encontrar?</string>
     <string name="site_settings_tags_empty_title_search">No hay etiquetas que coincidan con tu búsqueda</string>
     <string name="site_settings_tags_empty_title">No tienes ninguna etiqueta</string>
-    <string name="site_settings_tags_empty_subtitle">Añade aquí las etiquetas que uses frecuentemente para poder seleccionarlas rápidamente al etiquetar tus entradas</string>
     <string name="site_settings_tags_empty_button">Crea una etiqueta</string>
     <string name="media_empty_search_list">No hay medios que coincidan con tu búsqueda</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">¿Salir de WordPress?</string>
+    <string name="site_settings_tags_empty_subtitle">Añade aquí las etiquetas que uses frecuentemente para poder seleccionarlas rápidamente al etiquetar tus entradas</string>
     <string name="sign_out_wpcom_confirm_with_changes">Tienes cambios en entradas que no se han subido a tu sitio. Salir ahora borrará esos cambios de tu dispositivo. ¿Quieres salir de todos modos?</string>
-    <string name="people_empty_list_filtered_viewers">No hay lectores aún</string>
-    <string name="people_empty_list_filtered_email_followers">No hay seguidores por correo electrónico aún</string>
     <string name="people_empty_list_filtered_followers">No hay seguidores aún</string>
+    <string name="people_empty_list_filtered_email_followers">No hay seguidores por correo electrónico aún</string>
+    <string name="people_empty_list_filtered_viewers">No hay lectores aún</string>
     <string name="people_empty_list_filtered_users">No hay usuarios aún</string>
     <string name="reader_empty_posts_liked_description">Las entradas que te gusten aparecerán aquí</string>
     <string name="reader_empty_posts_liked_title">Nada que te gustó aún</string>
@@ -1139,201 +1489,191 @@ Language: es
     <string name="featured_image_desc">imagen destacada</string>
     <string name="button_discard">Descartar</string>
     <string name="reader_avatar_desc">foto de perfil</string>
-    <string name="notification_channel_transient_title">Dato transitorio</string>
+    <string name="support_push_notification_title">WordPress</string>
+    <string name="support_contact_email">Correo electrónico de contacto</string>
     <string name="support_identity_input_dialog_email_label">Correo electrónico</string>
     <string name="support_identity_input_dialog_enter_email">Por favor, introduce tu dirección de correo electrónico</string>
-    <string name="support_identity_input_dialog_enter_email_and_name">Para continuar, por favor, introduce tu dirección de correo electrónico y nombre</string>
-    <string name="support_push_notification_message">Nuevo mensaje de «Ayuda y soporte»</string>
-    <string name="support_push_notification_title">WordPress</string>
     <string name="support_contact_email_not_set">No establecido</string>
-    <string name="support_contact_email">Correo electrónico de contacto</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Para continuar, por favor, introduce tu dirección de correo electrónico y nombre</string>
     <string name="application_log_button">Registro de la aplicación</string>
+    <string name="notification_channel_transient_title">Dato transitorio</string>
     <string name="my_tickets">Mis tickets</string>
-    <string name="activity_log_rewind_dialog_message">¿Quieres rebobinar tu sitio al %1$s a las %2$s? Esto borrará todo el contenido y opciones creadas o cambiadas desde entonces.</string>
-    <string name="activity_log_rewind_site">Rebobinar sitio</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rebobinado en curso</string>
-    <string name="activity_log_currently_restoring_message">Rebobinando a %1$s %2$s</string>
+    <string name="support_push_notification_message">Nuevo mensaje de «Ayuda y soporte»</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restauración en progreso</string>
+    <string name="activity_log_currently_restoring_message">Restaurando a %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Actualmente restaurando tu sitio</string>
-    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Tu sitio ha sido restaurado satisfactoriamente</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Tu sitio ha sido restaurado satisfactoriamente\nRebobinado a %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Tu sitio está siendo restaurado\nRebobinando a %1$s %2$s</string>
     <string name="activity_log_button">Botón de acción del registro de actividad</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Tu sitio ha sido restaurado satisfactoriamente</string>
+    <string name="activity_log_rewind_started_snackbar_message">Tu sitio está siendo restaurado\nRestaurando a %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Tu sitio ha sido restaurado correctamente\nRestaurado a %1$s %2$s</string>
     <string name="plugin_auto_managed">Gestionado automáticamente</string>
     <string name="reader_save_posts_locally_dialog_message">Guarda esta entrada y vuelve cuando quieras para leerla. Solo estará disponible en este dispositivo — las entradas guardadas no se sincronizan con otros dispositivos.</string>
-    <string name="reader_save_posts_locally_dialog_title">Guardar entradas para más tarde</string>
-    <string name="reader_empty_search_request_failed">No ha sido posible realizar la búsqueda</string>
     <string name="reader_empty_search_title">No se han encontrado resultados</string>
-    <string name="comment_read_source_post">Lee la entrada de origen</string>
+    <string name="reader_empty_search_request_failed">No ha sido posible realizar la búsqueda</string>
+    <string name="reader_save_posts_locally_dialog_title">Guardar entradas para más tarde</string>
     <string name="sites">Sitios</string>
+    <string name="comment_read_source_post">Lee la entrada de origen</string>
     <string name="signup_magic_link_title">Enlace mágico enviado</string>
-    <string name="signup_email_screen_title">Registro por correo electrónico</string>
     <string name="verification_2fa_screen_title">Verificación del código</string>
     <string name="selfhosted_site_login_title">Credenciales de acceso</string>
     <string name="magic_link_sent_login_title">Enlace mágico enviado</string>
     <string name="magic_link_login_title">Acceso por enlace mágico</string>
-    <string name="site_address_login_title">Acceso mediante la dirección del sitio</string>
     <string name="email_address_login_title">Acceso mediante dirección de correo electrónico</string>
-    <string name="alternatively">Alternativamente:</string>
+    <string name="site_address_login_title">Acceso mediante la dirección del sitio</string>
     <string name="reader_empty_saved_posts_description">Toca %s para guardar una entrada en tu lista.</string>
-    <string name="reader_empty_saved_posts_title">¡Aún no hay entradas guardadas!</string>
     <string name="reader_bookmark_snack_title">Entrada guardada</string>
     <string name="reader_bookmark_snack_btn">Ver todas</string>
-    <string name="reader_btn_bookmarked">Guardada</string>
-    <string name="reader_btn_bookmark">Guardar</string>
     <string name="reader_remove_bookmark">Borrada de las entradas guardadas</string>
-    <string name="reader_add_bookmark">Añadir a las entradas guardadas</string>
     <string name="reader_save_for_later_title">Entradas guardadas</string>
     <string name="removed">Borrado</string>
-    <string name="my_site_icon_content_description">Cambiar icono del sitio</string>
+    <string name="reader_empty_saved_posts_title">¡Aún no hay entradas guardadas!</string>
+    <string name="reader_add_bookmark">Añadir a las entradas guardadas</string>
     <string name="my_site_icon_dialog_cancel_button">Cancelar</string>
-    <string name="my_site_icon_dialog_remove_button">Eliminar</string>
     <string name="my_site_icon_dialog_change_button">Cambiar</string>
-    <string name="my_site_icon_dialog_change_requires_permission_message">No tienes permiso para editar el icono del sitio.</string>
-    <string name="my_site_icon_dialog_add_requires_permission_message">No tienes permiso para añadir un icono al sitio.</string>
+    <string name="my_site_icon_content_description">Cambiar icono del sitio</string>
+    <string name="reader_followed_blog_notifications_action">Activar</string>
     <string name="my_site_icon_dialog_change_message">¿Cómo te gustaría editar el icono?</string>
-    <string name="my_site_icon_dialog_add_message">¿Te gustaría añadir un icono de sitio?</string>
+    <string name="my_site_icon_dialog_remove_button">Eliminar</string>
     <string name="my_site_icon_dialog_title">Icono del sitio</string>
     <string name="reader_followed_blog_notifications_this">este sitio</string>
-    <string name="reader_followed_blog_notifications_action">Activar</string>
-    <string name="reader_followed_blog_notifications">¿Activar avisos para %1$s%2$s%3$s?</string>
-    <string name="reader_btn_notifications_on">Activar los avisos del sitio</string>
-    <string name="reader_btn_notifications_off">Desactivar los avisos del sitio</string>
-    <string name="activity_log_jetpack_icon">Icono de Jetpack</string>
-    <string name="rewind">Rebobinar</string>
-    <string name="activity_log_event">Evento</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">No tienes permiso para añadir un icono al sitio.</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">No tienes permiso para editar el icono del sitio.</string>
+    <string name="my_site_icon_dialog_add_message">¿Te gustaría añadir un icono de sitio?</string>
     <string name="activity_log_icon">Icono de actividad</string>
     <string name="activity_log">Registro de actividad</string>
-    <string name="activity">Actividad</string>
+    <string name="preference_collect_information">Recopilar información</string>
+    <string name="cookie_policy_learn_more_header">Política de cookies</string>
+    <string name="reader_followed_blog_notifications">¿Activar avisos para %1$s%2$s%3$s?</string>
+    <string name="activity_log_event">Evento</string>
+    <string name="activity_log_jetpack_icon">Icono de Jetpack</string>
+    <string name="privacy_policy_learn_more_header">Política de privacidad</string>
+    <string name="preference_privacy_settings">Ajustes de privacidad</string>
     <string name="privacy_policy_read">Lee la política de privacidad</string>
-    <string name="third_party_policy_learn_more_caption">Usamos otras herramientas de seguimiento, incluidas algunas de terceros. Lee acerca de estas y cómo controlarlas.</string>
     <string name="third_party_policy_learn_more_header">Política de terceros</string>
-    <string name="privacy_policy_learn_more_caption">Esta información nos ayuda a mejorar nuestros productos, hacer que el marketing sea más relevante, personalizar tu experiencia en WordPress.com y más, tal como se detalla en nuestra política de privacidad.</string>
-    <string name="privacy_policy_learn_more_header">Política de privacidad</string>
+    <string name="reader_btn_notifications_off">Desactivar los avisos del sitio</string>
+    <string name="reader_btn_notifications_on">Activar los avisos del sitio</string>
+    <string name="third_party_policy_learn_more_caption">Usamos otras herramientas de seguimiento, incluidas algunas de terceros. Lee acerca de estas y cómo controlarlas.</string>
     <string name="cookie_policy_learn_more_caption">Comparte información con nuestra herramienta de análisis acerca del uso que haces de los servicios mientras estás conectado a tu cuenta de WordPress.com.</string>
-    <string name="cookie_policy_learn_more_header">Política de cookies</string>
-    <string name="preference_privacy_settings">Ajustes de privacidad</string>
-    <string name="preference_collect_information">Recopilar información</string>
+    <string name="privacy_policy_learn_more_caption">Esta información nos ayuda a mejorar nuestros productos, hacer que el marketing sea más relevante, personalizar tu experiencia en WordPress.com y más, tal como se detalla en nuestra política de privacidad.</string>
     <string name="post_submitted">Entrada enviada</string>
-    <string name="login_email_button_signup">¿No tienes una cuenta? %1$s Regístrate %2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Una característica del plugin requiere que el sitio esté en buen estado.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Una característica del plugin necesita que la suscripción del dominio principal esté asociada con este usuario.</string>
-    <string name="plugin_install_site_ineligible_non_admin_user">Una característica del plugin necesita privilegios de administrador.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">El plugin no puede instalarse en sitios VIP.</string>
     <string name="plugin_install_site_ineligible_excessive_disk_space">El plugin no se puede instalar debido a las limitaciones de espacio del disco.</string>
-    <string name="plugin_install_site_ineligible_email_unverified">Una característica del plugin requiere una dirección de correo electrónico verificada.</string>
-    <string name="plugin_install_site_ineligible_site_private">Una característica del plugin requiere que el sitio sea público.</string>
     <string name="plugin_install_site_ineligible_no_business_plan">Una característica del plugin requiere un plan business.</string>
     <string name="plugin_install_site_ineligible_not_using_custom_domain">Una característica del plugin requiere un dominio personalizado.</string>
+    <string name="plugin_install_site_ineligible_non_admin_user">Una característica del plugin necesita privilegios de administrador.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">Una característica del plugin requiere una dirección de correo electrónico verificada.</string>
+    <string name="plugin_install_site_ineligible_site_private">Una característica del plugin requiere que el sitio sea público.</string>
     <string name="plugin_install_first_plugin_almost_finished_dialog_message">Estamos haciendo la configuración final, está casi listo…</string>
     <string name="plugin_install_first_plugin_progress_dialog_message">Instalando plugin…</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Instalar</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_message">Instalar el primer plugin en tu sitio puede llevar hasta 1 minuto. Durante este tiempo no podrás realizar cambios en tu sitio.</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Instalar plugin</string>
-    <string name="notification_settings_followed_dialog_title">Avisos</string>
     <string name="notification_settings_followed_dialog_email_comments">Enviarme nuevos comentarios por correo electrónico</string>
-    <string name="notification_settings_followed_dialog_email_posts_weekly">Semanalmente</string>
     <string name="notification_settings_followed_dialog_email_posts_instantly">Instantáneamente</string>
-    <string name="notification_settings_followed_dialog_email_posts_daily">Diariamente</string>
     <string name="notification_settings_followed_dialog_notification_posts_switch">Entradas nuevas</string>
-    <string name="notification_settings_followed_dialog_notification_posts_description">Recibe avisos de las nuevas entradas de este sitio</string>
     <string name="notification_settings_followed_dialog_email_posts_switch">Enviarme nuevas entradas por correo electrónico</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">Semanalmente</string>
+    <string name="notification_settings_followed_dialog_email_posts_daily">Diariamente</string>
+    <string name="notification_settings_followed_dialog_title">Avisos</string>
+    <string name="notification_settings_followed_dialog_notification_posts_description">Recibe avisos de las nuevas entradas de este sitio</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">Todos mis sitios seguidos</string>
     <string name="notification_settings_category_followed_sites">Sitios seguidos</string>
-    <string name="content_description_person_reading_device_notification">Dispositivo de lectura personal con avisos</string>
     <string name="content_description_people_looking_charts">Gente mirando gráficos y tablas</string>
     <string name="comment_title">%s en %s</string>
     <string name="dialog_confirm_delete_permanently_post">¿Seguro que quieres eliminar definitivamente esta publicación?</string>
+    <string name="content_description_person_reading_device_notification">Dispositivo de lectura personal con avisos</string>
     <string name="notification_channel_important_title">Importante</string>
     <string name="notification_channel_general_title">General</string>
     <string name="photo_picker_use_photo">Utilizar esta foto</string>
     <string name="media_preview_title">%1$d de %2$d</string>
     <string name="stock_media_picker_initial_empty_subtext">Fotografías facilitadas por %s</string>
     <string name="stock_media_picker_initial_empty_text">Busca para encontrar fotografías gratuitas para añadir a tu biblioteca de medios</string>
-    <string name="stock_media_picker_search_hint">Búsqueda en la biblioteca de fotos gratuitas</string>
     <string name="photo_picker_stock_media">Selecciona de la biblioteca gratuita de fotos</string>
     <string name="error_save_empty_draft">No se puede guardar un borrador vacío</string>
-    <string name="site_settings_quota_space_unlimited">%1$s de ilimitado</string>
     <string name="preview_count">Vista previa %d</string>
     <string name="add_count">Añadir %d</string>
+    <string name="site_settings_quota_space_unlimited">%1$s de ilimitado</string>
+    <string name="stock_media_picker_search_hint">Búsqueda en la biblioteca de fotos gratuitas</string>
     <string name="fab_add_tag_desc">Crear etiqueta</string>
+    <string name="profile_picture">Imagen de perfil de %s</string>
+    <string name="media_preview_audio_desc">audio</string>
     <string name="navigate_up_desc">navegar hacia arriba</string>
-    <string name="notification_settings_switch_desc">Avisos</string>
-    <string name="open_external_link_desc">Abrir enlace externo</string>
-    <string name="show_more_desc">mostrar más</string>
+    <string name="photo_picker_camera_desc">abrir cámara</string>
     <string name="reader_photo_view_desc">foto</string>
+    <string name="photo_picker_device_desc">elige desde el dispositivo</string>
+    <string name="photo_picker_wpmedia_desc">elige desde medios de WordPress</string>
+    <string name="media_settings_play">reproduce</string>
+    <string name="media_grid_item_trash_desc">papelera</string>
+    <string name="show_more_desc">mostrar más</string>
     <string name="reader_list_item_suggestion_remove_desc">borrar</string>
-    <string name="photo_picker_thumbnail_desc">Reproducir vídeo</string>
-    <string name="reader_cardview_post_play_video_desc">reproducir vídeo destacado</string>
     <string name="plugin_detail_logo_desc">logo del plugin</string>
     <string name="plugin_detail_banner_desc">banner del plugin</string>
-    <string name="photo_picker_wpmedia_desc">elige desde medios de WordPress</string>
-    <string name="photo_picker_camera_desc">abrir cámara</string>
-    <string name="photo_picker_device_desc">elige desde el dispositivo</string>
     <string name="people_invite_role_info_desc">información del perfil</string>
-    <string name="media_settings_play">reproduce</string>
     <string name="media_settings_image_preview_desc">previsualizar imagen</string>
-    <string name="media_preview_desc">vista previa</string>
-    <string name="media_preview_audio_desc">audio</string>
-    <string name="media_grid_item_play_video_desc">reproducir vídeo</string>
-    <string name="media_grid_item_trash_desc">papelera</string>
     <string name="media_grid_item_retry_desc">reintentar</string>
     <string name="media_grid_item_image_desc">vista previa de medios, nombre de archivo %s</string>
     <string name="invite_user_delete_desc">eliminar %s</string>
-    <string name="profile_picture">Imagen de perfil de %s</string>
-    <string name="comment_checkmark_desc">marca de verificación</string>
     <string name="signup_with_google_progress">Registrarse con Google…</string>
+    <string name="media_preview_desc">vista previa</string>
+    <string name="comment_checkmark_desc">marca de verificación</string>
+    <string name="open_external_link_desc">Abrir enlace externo</string>
+    <string name="notification_settings_switch_desc">Avisos</string>
+    <string name="photo_picker_thumbnail_desc">Reproducir vídeo</string>
+    <string name="reader_cardview_post_play_video_desc">reproducir vídeo destacado</string>
+    <string name="media_grid_item_play_video_desc">reproducir vídeo</string>
     <string name="jetpack_connection_failed_with_reason">Se ha producido un error en la conexión a Jetpack: %s</string>
     <string name="jetpack_already_connected_toast">Ya estás conectado a Jetpack</string>
+    <string name="file_size_in_terabytes">%s TB</string>
     <string name="menu_undo_snackbar_action">DESHACER</string>
-    <string name="menu_visual_mode_done_snackbar">Cambiado a modo visual</string>
     <string name="menu_visual_mode">Modo visual</string>
-    <string name="menu_html_mode_done_snackbar">Cambiado a modo HTML</string>
     <string name="menu_html_mode">Modo HTML</string>
     <string name="menu_preview">Vista previa</string>
     <string name="menu_save_as_draft">Guardar como borrador</string>
-    <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_html_mode_done_snackbar">Cambiado a modo HTML</string>
+    <string name="menu_visual_mode_done_snackbar">Cambiado a modo visual</string>
+    <string name="site_settings_quota_space_value">%1$s de %2$s</string>
+    <string name="file_size_in_bytes">%s B</string>
     <string name="file_size_in_gigabytes">%s GB</string>
-    <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
-    <string name="file_size_in_bytes">%s B</string>
-    <string name="site_settings_quota_space_value">%1$s de %2$s</string>
-    <string name="site_settings_quota_space_hint">Si necesitas más espacio, considera actualizar tu plan de WordPress.</string>
-    <string name="site_settings_quota_space_title">Espacio utilizado</string>
-    <string name="site_settings_quota_header">Medios</string>
+    <string name="file_size_in_megabytes">%s MB</string>
+    <string name="comment_approved_talkback">Comentario aprobado</string>
+    <string name="comment_delete_talkback">Comentario borrado</string>
     <string name="comment_unspam_talkback">Comentario marcado como no spam</string>
     <string name="comment_spam_talkback">Comentario marcado como spam</string>
-    <string name="comment_delete_talkback">Comentario borrado</string>
     <string name="comment_untrash_talkback">Comentario restaurado</string>
     <string name="comment_trash_talkback">Comentario enviado a la papelera</string>
-    <string name="comment_unliked_talkback">El comentario no ha gustado</string>
-    <string name="comment_liked_talkback">El comentario ha gustado</string>
     <string name="comment_unapproved_talkback">Comentario sin aprobar</string>
-    <string name="comment_approved_talkback">Comentario aprobado</string>
+    <string name="signup_epilogue_screen_title">Cuenta nueva</string>
     <string name="notif_detail_screen_title">Detalle de notificación %s</string>
-    <string name="edit_photo_screen_title">Editar foto</string>
     <string name="share_intent_screen_title">Elige el sitio</string>
-    <string name="signup_epilogue_screen_title">Cuenta nueva</string>
-    <string name="login_prologue_screen_title">Iniciar sesión</string>
-    <string name="login_epilogue_screen_title">Conectado como</string>
+    <string name="site_settings_quota_space_title">Espacio utilizado</string>
+    <string name="site_settings_quota_space_hint">Si necesitas más espacio, considera actualizar tu plan de WordPress.</string>
+    <string name="site_settings_quota_header">Medios</string>
+    <string name="comment_unliked_talkback">El comentario no ha gustado</string>
+    <string name="comment_liked_talkback">El comentario ha gustado</string>
+    <string name="edit_photo_screen_title">Editar foto</string>
+    <string name="notif_settings_screen_title">Ajustes de avisos</string>
     <string name="person_detail_screen_title">Detalle de la persona</string>
+    <string name="release_notes_screen_title">Notas de la versión</string>
+    <string name="login_epilogue_screen_title">Conectado como</string>
     <string name="media_settings_screen_title">Detalles del archivo</string>
     <string name="publicize_buttons_screen_title">Botones de compartir</string>
-    <string name="notifications_screen_title">Avisos</string>
     <string name="reader_screen_title">Lector</string>
     <string name="me_section_screen_title">Yo</string>
-    <string name="my_site_section_screen_title">Mi sitio</string>
-    <string name="notif_settings_screen_title">Ajustes de avisos</string>
     <string name="help_screen_title">Ayuda y soporte</string>
     <string name="license_screen_title">Licencia</string>
-    <string name="release_notes_screen_title">Notas de la versión</string>
+    <string name="notifications_screen_title">Avisos</string>
+    <string name="my_site_section_screen_title">Mi sitio</string>
     <string name="signup_epilogue_error_avatar_view">Tu avatar se ha subido y estará disponible en breve.</string>
-    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta característica.&lt;br/>&lt;br/>Para cambiarlo, edita tus permisos y asegúrate de que &lt;strong>%s&lt;/strong> está activado.</string>
     <string name="permissions_denied_title">Permisos</string>
     <string name="plugin_caption_featured">Destacados</string>
-    <string name="sharing_disabled_description">No puedes acceder a tus ajustes para compartir porque tu módulo de compartir de Jetpack está desactivado.</string>
-    <string name="sharing_disabled">Módulo para compartir desactivado.</string>
     <string name="version_with_name_param">Versión %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
+    <string name="permissions_denied_message">Parece que has desactivado los permisos necesarios para esta característica.&lt;br/&gt;&lt;br/&gt;Para cambiarlo, edita tus permisos y asegúrate de que &lt;strong&gt;%s&lt;/strong&gt; está activado.</string>
+    <string name="sharing_disabled_description">No puedes acceder a tus ajustes para compartir porque tu módulo de compartir de Jetpack está desactivado.</string>
+    <string name="sharing_disabled">Módulo para compartir desactivado.</string>
     <string name="publisher_with_company_param">Editor: %s</string>
     <string name="notification_sound_has_invalid_path">El sonido escogido tiene una ruta incorrecta. Por favor, elige uno distinto.</string>
     <string name="quickpress_shortcut_with_account_param">QP %s</string>
@@ -1341,16 +1681,16 @@ Language: es
     <string name="uploading_subtitle_pages_only_one">Queda 1 página</string>
     <string name="uploading_subtitle_pages_only_plural">quedan %1$d páginas</string>
     <string name="uploading_subtitle_posts_only_plural">quedan %1$d entradas</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d páginas / entradas y 1 archivo restantes</string>
     <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d entradas y 1 archivo restantes</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d páginas / entradas y 1 archivo restantes</string>
     <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d páginas y 1 archivo restantes</string>
     <string name="uploading_subtitle_mixed_post_singular_media_one">1 entrada y 1 archivo restantes</string>
     <string name="uploading_subtitle_mixed_page_singular_media_one">1 página y 1 archivo restantes</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d páginas / entradas y %2$d de %3$d archivos restantes</string>
     <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d entradas y %2$d de %3$d archivos restantes</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d páginas / entradas y %2$d de %3$d archivos restantes</string>
     <string name="uploading_subtitle_mixed_pages_plural_media_plural">quedan %1$d páginas y %2$d de %3$d archivos</string>
-    <string name="uploading_subtitle_mixed_post_singular_media_plural">queda 1 entrada y %1$d de %2$d archivos</string>
     <string name="uploading_subtitle_mixed_page_singular_media_plural">queda 1 página y %1$d de %2$d archivos</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_plural">queda 1 entrada y %1$d de %2$d archivos</string>
     <string name="media_file_pages_and_posts_only_not_uploaded">%1$d entradas / páginas sin subir</string>
     <string name="media_file_pages_plural_only_not_uploaded">%1$d páginas sin subir</string>
     <string name="media_file_page_singular_only_not_uploaded">1 página sin subir</string>
@@ -1368,7 +1708,6 @@ Language: es
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 entrada con 1 archivo sin subir</string>
     <string name="untitled_in_parentheses">(sin título)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Crear sitio</string>
     <string name="notification_site_creation_created">Toca para continuar.</string>
     <string name="notification_site_creation_title_success">¡Sitio creado!</string>
@@ -1376,34 +1715,26 @@ Language: es
     <string name="username_changer_title">Cambiar nombre de usuario</string>
     <string name="username_changer_hint">Teclea para obtener más sugerencias</string>
     <string name="username_changer_header">Tu nombre de usuario actual es %1$s%2$s%3$s. Con pocas excepciones, otros solo verán tu nombre a mostrar, %4$s%5$s%6$s.</string>
-    <string name="username_changer_error_none">No se ha sugerido ningún nombre de usuario desde %1$s%2$s%3$s. Por favor, introduce más letras o números para obtener sugerencias.</string>
-    <string name="username_changer_error_generic">Ocurrió un error al recuperar sugerencias de nombres de usuario.</string>
-    <string name="username_changer_dismiss_message">¿Descartas cambiar de nombre de usuario?</string>
     <string name="username_changer_dismiss_button_positive">Descartar</string>
     <string name="username_changer_action">Guardar</string>
     <string name="content_description_add_avatar">Añadir avatar</string>
-    <string name="signup_with_google_button">Registro con Google</string>
-    <string name="signup_with_email_button">Registro con correo electrónico</string>
+    <string name="username_changer_error_none">No se ha sugerido ningún nombre de usuario desde %1$s%2$s%3$s. Por favor, introduce más letras o números para obtener sugerencias.</string>
+    <string name="username_changer_error_generic">Ocurrió un error al recuperar sugerencias de nombres de usuario.</string>
+    <string name="username_changer_dismiss_message">¿Descartas cambiar de nombre de usuario?</string>
     <string name="signup_user_exists">El correo electrónico ya existe en WordPress.com.\nAcceder.</string>
     <string name="signup_updating_account">Actualizando cuenta…</string>
-    <string name="signup_terms_of_service_text">Al registrarte aceptas nuestros %1$sTérminos del servicio%2$s.</string>
     <string name="signup_magic_link_progress">Enviando correo</string>
-    <string name="signup_magic_link_error_button_positive">Reintentar</string>
-    <string name="signup_magic_link_error_button_negative">Cerrar</string>
-    <string name="signup_magic_link_error">Hubo algún problema al enviar el correo. Puedes reintentarlo ahora o cerrar e intentarlo más tarde.</string>
     <string name="signup_epilogue_hint_username">Nombre de usuario</string>
-    <string name="signup_epilogue_hint_password_detail">Siempre puedes acceder con un enlace como el que acabas de usar, pero también puedes configurar una contraseña si lo prefieres.</string>
-    <string name="signup_epilogue_hint_password">Contraseña (opcional)</string>
     <string name="signup_epilogue_hint_display">Nombre a mostrar</string>
     <string name="signup_epilogue_error_button_positive">Reintentar</string>
     <string name="signup_epilogue_error_button_negative">Revertir</string>
+    <string name="signup_magic_link_error_button_positive">Reintentar</string>
+    <string name="signup_magic_link_error_button_negative">Cerrar</string>
+    <string name="signup_epilogue_hint_password">Contraseña (opcional)</string>
     <string name="signup_epilogue_error_generic">Hubo algún problema al actualizar tu cuenta. Puedes reintentarlo o revertir tus cambios para continuar.</string>
     <string name="signup_epilogue_error_avatar">Hubo algún problema al subir tu avatar.</string>
-    <string name="signup_email_header">Para crear tu nueva cuenta de WordPress.com, por favor, introduce tu dirección de correo electrónico.</string>
-    <string name="signup_email_error_generic">Hubo algún problema al comprobar la dirección de correo.</string>
-    <string name="sign_up">Registro en WordPress.com</string>
-    <string name="enter_username_instead">Accede con tu nombre de usuario.</string>
-    <string name="enter_site_address_instead">Accede introduciendo la dirección de tu sitio.</string>
+    <string name="signup_magic_link_error">Hubo algún problema al enviar el correo. Puedes reintentarlo ahora o cerrar e intentarlo más tarde.</string>
+    <string name="signup_epilogue_hint_password_detail">Siempre puedes acceder con un enlace como el que acabas de usar, pero también puedes configurar una contraseña si lo prefieres.</string>
     <string name="plugin_needs_update">Necesita actualizarse</string>
     <string name="plugin_caption_search">Buscar plugins</string>
     <string name="plugin_caption_new">Nuevo</string>
@@ -1524,7 +1855,6 @@ Language: es
     <string name="login_error_suffix">\n¿Quizás probando con otra cuenta?</string>
     <string name="login_error_generic">Hubo algún problema al conectar con la cuenta de Google.</string>
     <string name="login_error_button">Cerrar</string>
-    <string name="login_google_button_suffix">Acceder con Google.</string>
     <string name="enter_wpcom_password_google">Para seguir con esta cuenta de Google, por favor, facilita la contraseña correspondiente de WordPress.com. Solo se te pedirá una vez.</string>
     <string name="error_generic_network">Ocurrió un error en la red. Por favor, revisa tu conexión e inténtalo de nuevo.</string>
     <string name="post_settings_remove_featured_image">Quitar imagen destacada</string>
@@ -1536,12 +1866,11 @@ Language: es
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">¿Estás seguro de querer desconectar Jetpack del sitio?</string>
     <string name="jetpack_disconnect_pref_title">«Desconectar de WordPress.com»</string>
-    <string name="site_settings_jetpack_whitelist_description">Puedes poner en lista blanca una dirección IP o series de direcciones, evitando que las bloquee Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango introduce un valor inferior y un valor superior separados por guiones. Ejemplo: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Puedes marcar una dirección IP (o series de direcciones) como «Siempre permitida», evitando que sea bloqueada por Jetpack. Se aceptan IPv4 y IPv6. Para especificar un rango, introduce un valor inferior y un valor superior separados por un guión. Ejemplo: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Requiere la identificación en dos pasos</string>
-    <string name="jetpack_match_wpcom_via_email_title">Relacionar cuentas usando el correo electrónico</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir el acceso con WordPress.com</string>
+    <string name="jetpack_match_wpcom_via_email_title">Relacionar cuentas usando el correo electrónico</string>
     <string name="jetpack_wpcom_sign_in_category_title">Acceso con WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Direcciones IP en lista blanca</string>
     <string name="jetpack_prevent_brute_force_title">Bloquea intentos de acceso maliciosos</string>
     <string name="jetpack_prevent_brute_force_category_title">Protección contra ataques de fuerza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar avisos instantáneos</string>
@@ -1558,21 +1887,21 @@ Language: es
     <string name="deleting_media_dlg">Eliminando</string>
     <string name="confirm_delete_media_video">¿Borrar este vídeo?</string>
     <string name="confirm_delete_media_image">¿Eliminar esta imagen?</string>
-    <string name="media_title_document_details">Detalles del documento</string>
     <string name="media_title_audio_details">Detalles del audio</string>
+    <string name="media_title_document_details">Detalles del documento</string>
     <string name="media_title_video_details">Detalles del vídeo:</string>
-    <string name="media_title_image_details">Detalles de la imagen</string>
     <string name="fab_content_description_preview">Vista previa</string>
-    <string name="media_edit_upload_date_caption">Fecha de actualización</string>
+    <string name="media_title_image_details">Detalles de la imagen</string>
     <string name="media_edit_duration_caption">Duración</string>
+    <string name="media_edit_upload_date_caption">Fecha de actualización</string>
     <string name="media_edit_video_dimensions_caption">Dimensiones de vídeo</string>
     <string name="media_edit_image_dimensions_caption">Sin imagen</string>
-    <string name="media_edit_filetype_caption">Tipo de archivo</string>
     <string name="media_edit_filename_caption">Nombre del archivo</string>
+    <string name="media_edit_filetype_caption">Tipo de archivo</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Texto alternativo</string>
-    <string name="connect_site">Conectar un sitio</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Luz parpadeante</string>
+    <string name="connect_site">Conectar un sitio</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibración del dispositivo</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Elige sonido</string>
     <string name="notification_settings_category_sights_and_sounds">Vistas y sonidos</string>
@@ -1582,13 +1911,13 @@ Language: es
     <string name="notification_settings_category_other">Otros</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos mis sitios</string>
     <string name="notification_settings_category_your_sites">Tus sitios</string>
-    <string name="notification_settings_master_off_message">Desactivando los ajustes de avisos desactivarás todos los avisos de esta aplicación, da igual el tipo. Puedes ajustar al detalle qué tipo de aviso recibir tras activar los ajustes de avisos.</string>
-    <string name="notification_settings_master_off_title">Para recibir avisos en este dispositivo activa los ajustes de avisos.</string>
-    <string name="notification_settings_master_hint_off">Activar avisos</string>
-    <string name="notification_settings_master_hint_on">Desactivar avisos</string>
-    <string name="notification_settings_master_status_off">Inactivos</string>
-    <string name="notification_settings_master_status_on">Activos</string>
+    <string name="notification_settings_main_off_message">Desactivando los ajustes de avisos se desactivarán todos los avisos de esta aplicación, independientemente del tipo. Puedes ajustar qué tipo de aviso recibes después de activar los ajustes de avisos.</string>
+    <string name="notification_settings_main_off_title">Para recibir avisos en este dispositivo, activa los ajustes de avisos.</string>
+    <string name="notification_settings_main_hint_off">Activar los avisos</string>
+    <string name="notification_settings_main_hint_on">Desactivar los avisos</string>
+    <string name="notification_settings_main_status_off">Desactivado</string>
     <string name="max_video_resolution">Tamaño máximo de vídeo</string>
+    <string name="notification_settings_main_status_on">Activado</string>
     <string name="max_thumbnail_px_size">Tamaño máximo de imagen</string>
     <string name="error_upload_post_media_param">Hubo un error al subir los medios a esta entrada: %s.</string>
     <string name="error_upload_post_param">Hubo un error al subir esta entrada: %s.</string>
@@ -1611,8 +1940,8 @@ Language: es
     <string name="post_scheduled">Entrada programada</string>
     <string name="button_retry">Reintentar</string>
     <string name="post_queued">Entrada a la espera</string>
-    <string name="uploading_post">Subiendo «%s»</string>
     <string name="connection_to_server_lost">Se ha perdido la conexión al servidor</string>
+    <string name="uploading_post">Subiendo «%s»</string>
     <string name="login_epilogue_mysites_other">Mis sitios</string>
     <string name="login_epilogue_mysites_one">Mi sitio</string>
     <string name="login_email_client_not_found">No se pudo detectar una aplicación cliente de correo electrónico</string>
@@ -1624,27 +1953,25 @@ Language: es
     <string name="login_site_address_more_help">¿Necesitas más ayuda?</string>
     <string name="login_site_address_help_content">La dirección de tu sitio aparece en la barra de la parte superior de la pantalla cuando visitas tu sitio en Chrome.</string>
     <string name="login_site_address_help_title">¿Cuál es la dirección de mi sitio?</string>
-    <string name="login_site_address_help">¿Necesitas ayuda para encontrar la dirección de tu sitio?</string>
     <string name="login_site_address">Dirección del sitio</string>
     <string name="enter_site_address">Introduce la dirección del sitio WordPress con el que te gustaría conectar.</string>
     <string name="login_already_logged_in_wpcom">Ya estás conectado a WordPress.com</string>
     <string name="login_continue">Seguir</string>
-    <string name="connect_more">Conectar otro sitio</string>
     <string name="enter_wpcom_password">Introduce tu contraseña de WordPress.com</string>
+    <string name="connect_more">Conectar otro sitio</string>
     <string name="login_magic_link_email_requesting">Solicitando el correo electrónico de acceso</string>
     <string name="password_incorrect">Parece que esta contraseña es incorrecta. Por favor, vuelve a comprobar tu información e inténtalo de nuevo.</string>
     <string name="requesting_otp">Solicitando un código de verificación por SMS.</string>
     <string name="login_text_otp">Envíame un mensaje con un código en su lugar</string>
     <string name="enter_verification_code">¡Casi lo tenemos! Por favor, introduce un código de verificación desde tu aplicación Authenticator.</string>
-    <string name="open_mail">Abrir correo electrónico</string>
     <string name="next">Siguiente</string>
     <string name="enter_email_wordpress_com">Accede a WordPress.com usando una dirección de correo electrónico para gestionar todos tus sitios WordPress.</string>
     <string name="image_optimization_promo_desc">La optimización de imagen reduce las imágenes para que suban más rápido.\n\nPuedes cambiar esto en cualquier momento en los ajustes del sitio.</string>
     <string name="image_optimization_promo_title">¿Activar optimización de la imagen?</string>
-    <string name="leave_off">Detener</string>
-    <string name="turn_on">Activar</string>
     <string name="me_profile_photo">Foto de perfil</string>
     <string name="error_media_parse_error">Respuesta inesperada del servidor</string>
+    <string name="leave_off">Detener</string>
+    <string name="turn_on">Activar</string>
     <string name="upload_finished_toast">No se puede detener la subida porque ya ha finalizado</string>
     <string name="post_title">Título</string>
     <string name="menu_redo">Rehacer</string>
@@ -1655,28 +1982,24 @@ Language: es
     <string name="editor_dropped_text_error">Ocurrió un error al arrastrar texto</string>
     <string name="editor_dropped_html_images_not_allowed">No está permitido arrastrar imágenes en el modo HTML</string>
     <string name="editor_content_hint">Comparte tu historia aquí…</string>
-    <string name="post_status_post_private">Privada</string>
     <string name="post_status_draft">Borrador</string>
     <string name="post_status_pending_review">Pendiente de revisión</string>
+    <string name="post_status_post_private">Privada</string>
     <string name="post_status_publish_post">Publicar</string>
-    <string name="change_location">Cambiar ubicación</string>
-    <string name="remove_location">Borrar ubicación</string>
-    <string name="post_settings_error_placepicker_missing_play_services">No se ha podido abrir el selector de ubicación, Google Play Services no está disponible </string>
-    <string name="post_settings_location">Ubicación</string>
     <string name="now">Ahora</string>
     <string name="post_settings_password_dialog_hint">Solo los que tengan esta contraseña pueden ver esta entrada</string>
     <string name="post_settings_excerpt_dialog_hint">Los extractos son resúmenes opcionales del contenido hechos a mano.</string>
     <string name="post_settings_slug_dialog_hint">El slug es la versión amigable de la URL del título de la entrada.</string>
-    <string name="post_settings_post_format">Formato de entrada</string>
     <string name="post_settings_tags">Etiquetas</string>
     <string name="post_settings_slug">Slug</string>
     <string name="post_settings_excerpt">Extracto</string>
-    <string name="post_settings_not_set">No definido</string>
+    <string name="post_settings_post_format">Formato de entrada</string>
     <string name="post_settings_more_options">Más opciones</string>
     <string name="post_settings_categories_and_tags">Categorías y etiquetas</string>
+    <string name="post_settings_not_set">No definido</string>
     <string name="notifications_tab_title_all">Todos</string>
-    <string name="top_level_category_name">Nivel superior</string>
     <string name="category_parent">Categoría superior (opcional):</string>
+    <string name="top_level_category_name">Nivel superior</string>
     <string name="media_empty_audio_list">No tienes ningún audio</string>
     <string name="media_empty_documents_list">No tienes ningún documento</string>
     <string name="media_empty_videos_list">No tienes ningún vídeo</string>
@@ -1792,11 +2115,11 @@ Language: es
     <string name="media_encoder_quality_85">Media</string>
     <string name="media_encoder_quality_80">Baja</string>
     <string name="media_upload_state_uploaded">Subido</string>
-    <string name="media_upload_state_failed">Fallo al subir</string>
     <string name="media_upload_state_deleted">Se ha eliminado</string>
     <string name="media_upload_state_deleting">Eliminando</string>
     <string name="media_upload_state_uploading">Subiendo</string>
     <string name="media_upload_state_queued">En cola</string>
+    <string name="media_upload_state_failed">Fallo al subir</string>
     <string name="image_quality">Calidad de la imagen</string>
     <string name="error_all_media_upload_canceled">Todos los archivos de medios se han cancelado debido a un error desconocido. Por favor, vuelve a intentar cargarlos</string>
     <string name="error_unknown_post_type">Formato de entrada desconocido</string>
@@ -1812,8 +2135,8 @@ Language: es
     <string name="site_settings_optimize_images">Optimiza las imágenes</string>
     <string name="media_generic_error">Error de los archivos multimedia</string>
     <string name="media_upload_error">Hubo un error al cargar el archivo multimedia</string>
-    <string name="retry">Reintentar</string>
     <string name="confirm">Confirmar</string>
+    <string name="retry">Reintentar</string>
     <string name="xmlrpc_endpoint_forbidden_error">No se pudo conectar. Se ha recibido un error 403 cuando se intenta acceder a \n        tu endpoint del XMLRPC de sitio. La aplicación lo necesita para comunicarse con tu sitio. Ponte en contacto con tu proveedor para solucionar este problema.</string>
     <string name="xmlrpc_post_blocked_error">No se pudo conectar. Tu alojamiento está bloqueando las peticiones POST, y la aplicación las necesita \n        para comunicarse con tu sitio. Ponte en contacto con tu alojamiento para solucionar este problema.</string>
     <string name="reader_hint_search_followed_sites">Busca en los sitios que sigues</string>
@@ -1843,10 +2166,10 @@ Language: es
     <string name="comment_q_action_processing">Procesando…</string>
     <string name="comment_q_action_done_generic">¡Acción realizada!</string>
     <string name="comment_liked">Comentario marcado como me gusta</string>
-    <string name="signout">Cerrar sesión</string>
     <string name="sign_in_wpcom">Iniciar sesión en WordPress.com</string>
+    <string name="signout">Cerrar sesión</string>
     <string name="reader_label_global_related_posts">Más en WordPress.com</string>
-    <string name="reader_label_local_related_posts">Más en %s</string>
+    <string name="reader_label_local_related_posts">Más de %s</string>
     <string name="preference_open_device_settings">Abrir ajustes del dispositivo</string>
     <string name="invite_invalid_email">%s: Correo electrónico no válido</string>
     <string name="invite_user_blocked_invites">%s: Invitaciones bloqueadas por el usuario</string>
@@ -1856,88 +2179,83 @@ Language: es
     <string name="comment_moderated_approved">¡Comentario aprobado!</string>
     <string name="like">Me gusta</string>
     <string name="timespan_now">ahora</string>
-    <string name="role_viewer">Espectador</string>
     <string name="role_follower">Seguidor</string>
+    <string name="role_viewer">Espectador</string>
     <string name="error_post_my_profile_no_connection">Sin conexión, no se pudo guardar tu perfil</string>
-    <string name="alignment_right">Derecha</string>
-    <string name="alignment_left">Izquierda</string>
     <string name="alignment_none">Ninguna</string>
+    <string name="alignment_left">Izquierda</string>
+    <string name="alignment_right">Derecha</string>
     <string name="site_settings_list_editor_action_mode_title">Seleccionado %1$d</string>
     <string name="error_fetch_users_list">No se pudieron recuperar los usuarios del sitio</string>
-    <string name="title_email_follower">Correo electrónico del seguidor</string>
     <string name="title_follower">Seguidor</string>
+    <string name="title_email_follower">Correo electrónico del seguidor</string>
     <string name="people_fetching">Recuperando usuarios…</string>
-    <string name="people_dropdown_item_viewers">Espectadores</string>
     <string name="people_dropdown_item_email_followers">Suscriptores por correo electrónico</string>
+    <string name="people_dropdown_item_viewers">Espectadores</string>
     <string name="people_dropdown_item_followers">Seguidores</string>
     <string name="people_dropdown_item_team">Equipo</string>
     <string name="invite_message_usernames_limit">Invita como máximo a 10 personas con sus correos electrónicos o nombre de usuarios de WordPress.com. A aquellos que necesiten un nombre de usuario se le enviará instrucciones sobre cómo hacerlo.</string>
     <string name="viewer_remove_confirmation_message">Si eliminas a este espectador, no podrá visitar tu sitio\n\n¿Todavía quieres eliminar a este espectador?</string>
     <string name="follower_remove_confirmation_message">Si lo eliminas, este seguidor dejará de recibir informaciones de tu sitio, a no ser que vuelta a seguirte. \n\n¿Todavía quieres eliminar a este seguidor? </string>
     <string name="follower_subscribed_since">Desde %1$s</string>
-    <string name="error_remove_viewer">No se pudo quitar el espectador</string>
     <string name="error_remove_follower">No se pudo quitar al seguidor</string>
+    <string name="error_remove_viewer">No se pudo quitar el espectador</string>
     <string name="error_fetch_email_followers_list">No se pudieron recuperar los correos electrónicos de los seguidores del sitio</string>
     <string name="error_fetch_followers_list">No se pudieron recuperar los seguidores del sitio</string>
     <string name="editor_failed_uploads_switch_html">Algunas subidas de medios han fallado. Puedes cambiar al modo HTML \ncuando esto pasa. ¿Borramos todas las subidas fallidas y seguimos?</string>
+    <string name="image_settings_save_toast">Cambios guardados</string>
     <string name="image_width">Ancho</string>
-    <string name="image_link_to">Enlazado a</string>
     <string name="image_caption">Leyenda</string>
-    <string name="image_settings_save_toast">Cambios guardados</string>
+    <string name="image_link_to">Enlazado a</string>
     <string name="image_settings_dismiss_dialog_title">¿Descartar cambios sin guardar?</string>
     <string name="stop_upload_dialog_title">¿Parar la subida?</string>
-    <string name="tap_to_try_again">¡Toca para probar de nuevo!</string>
     <string name="invite_sent">Invitación enviada con éxito</string>
-    <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_some_failed">¡Se han enviado las invitaciones pero ha habido errores!</string>
+    <string name="tap_to_try_again">¡Toca para probar de nuevo!</string>
+    <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_sending">¡Hubo un error al tratar de enviar la invitación!</string>
     <string name="invite_error_invalid_usernames_multiple">No se pudo enviar: Hay nombres de usuario o correos electrónicos no válidos.</string>
     <string name="invite_error_invalid_usernames_one">No se pudo enviar: Un nombre de usuario o correo electrónico no es válido</string>
     <string name="invite_error_no_usernames">Por favor, añade al menos un nombre de usuario</string>
-    <string name="invite_message_info">(Opcional) Puedes introducir un mensaje personalizado de hasta 500 caracteres que se incluirá en la invitación.</string>
-    <string name="invite_message_remaining_other">%d caracteres restantes</string>
-    <string name="invite_message_remaining_one">Queda 1 carácter</string>
-    <string name="invite_message_remaining_zero">Quedan 0 caracteres</string>
     <string name="invite_message_title">Mensaje personalizado</string>
     <string name="invite">Invitar</string>
-    <string name="invite_names_title">Nombres de usuario o correos electrónicos</string>
-    <string name="invite_people">Invitar a gente</string>
+    <string name="invite_names_title">Nombres de usuarios o correos electrónicos</string>
     <string name="my_site_header_external">Externo</string>
-    <string name="send_link">Enviar enlace</string>
+    <string name="invite_people">Invitar a gente</string>
     <string name="label_clear_search_history">Borrar historial de búsqueda</string>
     <string name="dlg_confirm_clear_search_history">¿Borrar historial de búsqueda?</string>
     <string name="reader_empty_search_description">No se han encontrado resultados con %s para tu idioma</string>
     <string name="reader_hint_post_search">Buscar en WordPress</string>
+    <string name="reader_title_related_post_detail">Entrada relacionada</string>
     <string name="preview_screen_links_disabled">Los enlaces están desactivados en la pantalla de vista previa</string>
     <string name="send">Enviar</string>
-    <string name="person_removed">\@%1$s eliminado correctamente.</string>
     <string name="user_remove_confirmation_message">Si eliminas %1$s, ese usuario ya no será capaz de acceder a este sitio, pero cualquier contenido que fuera creado por %1$s permanecerá en el sitio.\n\n¿Aún te gustaría eliminar este usuario?</string>
+    <string name="person_removed">\@%1$s eliminado correctamente.</string>
     <string name="person_remove_confirmation_title">Eliminar %1$s</string>
-    <string name="role">Perfil</string>
-    <string name="people">Gente</string>
     <string name="reader_empty_posts_in_custom_list">Los sitios de esta lista no han publicado nada últimamente.</string>
+    <string name="people">Gente</string>
+    <string name="role">Perfil</string>
     <string name="error_remove_user">No se pudo eliminar el usuario</string>
     <string name="error_update_role">No se ha podido actualizar el rol del usuario</string>
     <string name="error_fetch_viewers_list">No se pudieron recuperar los espectadores del sitio</string>
     <string name="error_updating_gravatar">Error al subir tu Gravatar</string>
-    <string name="error_refreshing_gravatar">Error al recargar tu Gravatar</string>
     <string name="error_locating_image">Error al localizar la imagen recortada</string>
+    <string name="error_refreshing_gravatar">Error al recargar tu Gravatar</string>
     <string name="error_cropping_image">Error al recortar la imagen</string>
     <string name="checking_email">Comprobando correo electrónico</string>
     <string name="magic_link_unavailable_error_message">Actualmente no disponible. Por favor, introduce tu contraseña</string>
     <string name="logging_in">Accediendo</string>
-    <string name="enter_your_password_instead">Introduce tu contraseña</string>
     <string name="web_address_dialog_hint">Cuando comentes se hará público</string>
     <string name="capture_or_pick_photo">Captura o elige imagen</string>
-    <string name="plans">Planes</string>
     <string name="plan">Plan</string>
+    <string name="plans">Planes</string>
     <string name="export_your_content_message">Tus entradas, páginas y ajustes te serán enviadas por correo electrónico a %s.</string>
     <string name="export_your_content">Exportar tu contenido</string>
-    <string name="export_email_sent">¡Correo electrónico de exportación enviado!</string>
     <string name="exporting_content_progress">Exportando contenido…</string>
-    <string name="checking_purchases">Comprobando compras</string>
+    <string name="export_email_sent">¡Correo electrónico de exportación enviado!</string>
     <string name="show_purchases">Mostrar compras</string>
     <string name="premium_upgrades_message">Tienes mejoras premium en tu sitio. Por favor, cancela tus mejoras antes de eliminar tu sitio. </string>
+    <string name="checking_purchases">Comprobando compras</string>
     <string name="premium_upgrades_title">Mejoras premium</string>
     <string name="purchases_request_error">Algo fue mal. No se pudo realizar la compra.</string>
     <string name="delete_site_progress">Borrando sitio…</string>
@@ -1953,42 +2271,42 @@ Language: es
     <string name="start_over_text">Si quieres un sitio, pero no quieres ninguna de las entradas y las páginas que tiene ahora, nuestro equipo de soporte puede borrar sus mensajes, páginas, archivos multimedia y tus comentarios.\n\nEsto mantendrá su sitio y la URL activos, pero tendrás un nuevo comienzo en la creación de contenidos. Sólo tienes que contactar con nosotros para limpiar tu contenido actual..</string>
     <string name="let_us_help">Déjanos ayudarte</string>
     <string name="site_settings_start_over_hint">Comienza tu sitio encima</string>
-    <string name="start_over">Comenzar de nuevo</string>
     <string name="me_btn_app_settings">Ajustes de la app</string>
+    <string name="start_over">Comenzar de nuevo</string>
     <string name="editor_remove_failed_uploads">Eliminar subidas fallidas</string>
     <string name="site_settings_advanced_header">Avanzado</string>
     <string name="comments_empty_list_filtered_trashed">No hay comentarios en la papelera</string>
     <string name="comments_empty_list_filtered_pending">No hay comentarios pendientes</string>
     <string name="comments_empty_list_filtered_approved">No hay comentarios aprobados</string>
     <string name="xmlrpc_missing_method_error">No se pudo conectar. Los métodos requeridos en el XML-RPC faltan en el servidor.</string>
+    <string name="post_format_status">Estado</string>
     <string name="alignment_center">Centrado</string>
     <string name="post_format_video">Vídeo</string>
-    <string name="post_format_status">Estado</string>
-    <string name="post_format_standard">Estándar</string>
-    <string name="post_format_quote">Cita</string>
-    <string name="post_format_link">Enlace</string>
-    <string name="post_format_image">Imagen</string>
-    <string name="post_format_gallery">Galería</string>
     <string name="post_format_chat">Chat</string>
+    <string name="post_format_gallery">Galería</string>
+    <string name="post_format_image">Imagen</string>
+    <string name="post_format_link">Enlace</string>
+    <string name="post_format_quote">Cita</string>
+    <string name="post_format_standard">Estándar</string>
+    <string name="notif_events">Información sobre cursos y eventos de WordPress.com (online y presenciales).</string>
     <string name="post_format_audio">Audio</string>
     <string name="post_format_aside">Minientrada</string>
-    <string name="notif_events">Información sobre cursos y eventos de WordPress.com (online y presenciales).</string>
     <string name="notif_surveys">Oportunidades para participar en investigaciones y encuestas en WordPress.</string>
     <string name="notif_tips">Consejos para sacar el máximo partido a WordPress.com</string>
     <string name="notif_community">Comunidad</string>
-    <string name="notif_research">Investigación</string>
-    <string name="notif_suggestions">Sugerencias</string>
     <string name="replies_to_my_comments">Respuestas a mis comentarios</string>
-    <string name="username_mentions">Menciones del nombre de usuario</string>
+    <string name="notif_suggestions">Sugerencias</string>
+    <string name="notif_research">Investigación</string>
     <string name="site_achievements">Logros del sitio</string>
+    <string name="username_mentions">Menciones del nombre de usuario</string>
     <string name="site_follows">Seguidores del sitio</string>
     <string name="likes_on_my_posts">«Me gusta» en mis entradas</string>
     <string name="likes_on_my_comments">«Me gusta» en mis comentarios</string>
     <string name="comments_on_my_site">Comentarios en mi sitio</string>
     <string name="site_settings_list_editor_summary_other">%d elementos</string>
     <string name="site_settings_list_editor_summary_one">1 elemento</string>
-    <string name="approve_auto">Todos los usuarios</string>
     <string name="approve_auto_if_previously_approved">Comentarios de usuarios conocidos</string>
+    <string name="approve_auto">Todos los usuarios</string>
     <string name="approve_manual">Sin comentarios</string>
     <string name="site_settings_paging_summary_other">%d comentarios por página</string>
     <string name="site_settings_paging_summary_one">1 comentario por página</string>
@@ -1998,11 +2316,11 @@ Language: es
     <string name="detail_approve_auto">Aprobar automáticamente los comentarios de todo el mundo.</string>
     <string name="detail_approve_auto_if_previously_approved">Aprobar automáticamente si el usuario tiene un comentario previamente aprobado</string>
     <string name="detail_approve_manual">Se requiere aprobación manual de los comentarios de todos.</string>
-    <string name="days_quantity_other">%d días</string>
     <string name="days_quantity_one">1 día</string>
-    <string name="web_address">Dirección web</string>
+    <string name="days_quantity_other">%d días</string>
     <string name="primary_site">Sitio principal</string>
     <string name="pending_email_change_snackbar">Haz click en el enlace de verificación del correo electrónica enviado a %1$s para confirmar tu nueva dirección</string>
+    <string name="web_address">Dirección web</string>
     <string name="editor_toast_uploading_please_wait">Actualmente estás subiendo archivos multimedia. Por favor, espera hasta que se complete.</string>
     <string name="error_refresh_comments_showing_older">No se pudieron actualizar los comentarios ahora mismo - se muestran comentarios antiguos</string>
     <string name="post_settings_set_featured_image">Establece la imagen destacada</string>
@@ -2011,13 +2329,13 @@ Language: es
     <string name="dlg_sure_to_delete_comments">¿Eliminar de forma permanente estos comentarios?</string>
     <string name="dlg_sure_to_delete_comment">¿Eliminar de forma permanente este comentario?</string>
     <string name="mnu_comment_delete_permanently">Eliminar</string>
-    <string name="mnu_comment_untrash">Restaurar</string>
     <string name="comment_deleted_permanently">Comentario eliminado</string>
+    <string name="mnu_comment_untrash">Restaurar</string>
     <string name="comments_empty_list_filtered_spam">No hay comentarios spam</string>
-    <string name="comment_status_all">Todos</string>
     <string name="could_not_load_page">No se pudo cargar la página</string>
-    <string name="off">Off</string>
+    <string name="comment_status_all">Todos</string>
     <string name="interface_language">Idioma del interface</string>
+    <string name="off">Off</string>
     <string name="about_the_app">Sobre la app</string>
     <string name="error_post_account_settings">No se pudieron guardar los ajustes de la cuenta</string>
     <string name="error_fetch_account_settings">No se pudieron recuperar los ajustes de tu cuenta</string>
@@ -2025,9 +2343,9 @@ Language: es
     <string name="site_settings_unknown_language_code_error">No se pudo reconocer el código del idioma</string>
     <string name="site_settings_threading_dialog_description">Permite los comentarios anidados.</string>
     <string name="site_settings_threading_dialog_header">Anidar hasta</string>
+    <string name="remove">Eliminar</string>
     <string name="disabled">Desactivado</string>
     <string name="search">Buscar</string>
-    <string name="remove">Eliminar</string>
     <string name="site_settings_image_original_size">Tamaño original</string>
     <string name="privacy_private">Tu sitio es visible únicamente por ti y por lo usuarios que apruebes</string>
     <string name="privacy_public_not_indexed">Tu sitio es visible para todos pero pide a los motores de búsqueda no ser indexado</string>
@@ -2036,9 +2354,9 @@ Language: es
     <string name="about_me">Sobre mí</string>
     <string name="public_display_name_hint">El nombre público mostrará por defecto el nombre de usuario si no está establecido</string>
     <string name="public_display_name">Nombre que se mostrará públicamente</string>
-    <string name="last_name">Apellidos</string>
-    <string name="first_name">Nombre</string>
     <string name="my_profile">Mi perfil</string>
+    <string name="first_name">Nombre</string>
+    <string name="last_name">Apellidos</string>
     <string name="cd_related_post_preview_image">Imagen de vista previa de entradas relacionadas</string>
     <string name="error_post_remote_site_settings">No pudo guardar la información del sitio</string>
     <string name="error_fetch_remote_site_settings">No pudo recuperar la información del sitio</string>
@@ -2047,7 +2365,7 @@ Language: es
     <string name="site_settings_paging_dialog_description">Rompe los hilos de comentarios en múltiples páginas</string>
     <string name="site_settings_paging_dialog_header">Comentarios por página</string>
     <string name="site_settings_close_after_dialog_title">Cerrar los comentarios</string>
-    <string name="site_settings_blacklist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, así «press» coincidirá con «WordPress».</string>
+    <string name="site_settings_denylist_description">Cuando un comentario contenga alguna de estas palabras en su contenido, nombre, URL, correo electrónico o IP, será marcado como spam. Puedes introducir palabras parciales, así «press» coincidirá con «WordPress».</string>
     <string name="site_settings_hold_for_moderation_description">Cuando un comentario contenga alguna de las estas palabras en su contenido, nombre, URL, correo electrónico o IP, será puesto en la cola para moderar. Puedes introducir palabras parciales, así «press» coincidirá con «Wordpress».</string>
     <string name="site_settings_list_editor_input_hint">Introduce una palabra o frase</string>
     <string name="site_settings_list_editor_no_items_text">Sin elementos</string>
@@ -2062,10 +2380,10 @@ Language: es
     <string name="site_settings_rp_show_header_title">Mostrar cabecera</string>
     <string name="site_settings_rp_switch_summary">Las entradas relacionadas muestran contenido relevante de tu sitio debajo de las entradas.</string>
     <string name="site_settings_rp_switch_title">Mostrar entradas relacionadas</string>
-    <string name="site_settings_blacklist_hint">Los comentarios que coinciden con un filtro, son marcados como spam</string>
+    <string name="site_settings_denylist_hint">Los comentarios que coincidan con un filtro son marcados como spam</string>
     <string name="site_settings_moderation_hold_hint">Los comentarios que coinciden con un filtro, son puestos en la cola para moderar</string>
     <string name="site_settings_multiple_links_hint">Ignorar límite de enlaces de usuarios conocidos</string>
-    <string name="site_settings_whitelist_hint">El autor de un comentario debe tener aprobado un comentario previo</string>
+    <string name="site_settings_allowlist_hint">El autor del comentario debe tener un comentario aprobado previamente</string>
     <string name="site_settings_user_account_required_hint">Los usuarios deben estar registrados e iniciar sesión para comentar</string>
     <string name="site_settings_identity_required_hint">El autor de un comentario debe rellenar el nombre y correo eléctronico</string>
     <string name="site_settings_paging_hint">Mostrar los comentarios en pedazos de un tamaño especificado</string>
@@ -2088,17 +2406,16 @@ Language: es
     <string name="site_settings_address_hint">El cambio de dirección no está soportado en este momento</string>
     <string name="site_settings_tagline_hint">Una descripción corta o frase ingeniosa que describa tu blog</string>
     <string name="site_settings_title_hint">En pocas palabras, explica sobre que es este sitio</string>
-    <string name="site_settings_whitelist_known_summary">Comentarios de usuarios conocidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentarios de todos los usuarios</string>
+    <string name="site_settings_allowlist_known_summary">Comentarios de usuarios conocidos</string>
+    <string name="site_settings_allowlist_all_summary">Comentarios de todos los usuarios</string>
     <string name="site_settings_threading_summary">%d niveles</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Borrar el sitio</string>
-    <string name="site_settings_blacklist_title">Lista negra</string>
     <string name="site_settings_moderation_hold_title">Mantener para moderación</string>
     <string name="site_settings_multiple_links_title">Enlaces en comentarios</string>
-    <string name="site_settings_whitelist_title">Aprobar automáticamente</string>
+    <string name="site_settings_allowlist_title">Aprobar automáticamente</string>
     <string name="site_settings_paging_title">Paginación</string>
     <string name="site_settings_threading_title">Comentarios anidados</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -2110,22 +2427,22 @@ Language: es
     <string name="site_settings_default_format_title">Formato por defecto</string>
     <string name="site_settings_default_category_title">Categoría por defecto</string>
     <string name="site_settings_address_title">Dirección</string>
-    <string name="site_settings_tagline_title">Descripción corta</string>
     <string name="site_settings_title_title">Título del sitio</string>
+    <string name="site_settings_tagline_title">Descripción corta</string>
     <string name="site_settings_discussion_new_posts_header">Por defecto para nuevas entradas</string>
-    <string name="site_settings_writing_header">Escribiendo</string>
     <string name="site_settings_account_header">Cuenta</string>
+    <string name="site_settings_writing_header">Escribiendo</string>
     <string name="site_settings_general_header">General</string>
     <string name="newest_first">Nuevos primero</string>
-    <string name="oldest_first">Antiguos primero</string>
-    <string name="close_after">Cerrar después de</string>
     <string name="comments">Comentarios</string>
-    <string name="related_posts">Entradas relacionadas</string>
     <string name="privacy">Privacidad</string>
+    <string name="oldest_first">Antiguos primero</string>
     <string name="discussion">Discusión</string>
+    <string name="related_posts">Entradas relacionadas</string>
+    <string name="close_after">Cerrar después de</string>
     <string name="media_error_no_permission_upload">No tienes permisos para subir multimedia al sitio</string>
-    <string name="unknown">Desconocido</string>
     <string name="never">Nunca</string>
+    <string name="unknown">Desconocido</string>
     <string name="reader_err_get_post_not_found">Esta entrada ya no existe</string>
     <string name="reader_err_get_post_not_authorized">No estás autorizado a ver esta entrada</string>
     <string name="reader_err_get_post_generic">No se pudo recuperar esta entrada</string>
@@ -2137,22 +2454,22 @@ Language: es
     <string name="theme_activation_error">Se ha producido un error. No se ha podido activar el tema</string>
     <string name="theme_by_author_prompt_append"> de %1$s</string>
     <string name="theme_prompt">Gracias por elegir %1$s</string>
-    <string name="theme_manage_site">GESTIONAR SITIO</string>
-    <string name="theme_done">HECHO</string>
-    <string name="theme_support">Ayuda</string>
-    <string name="theme_details">Detalles</string>
-    <string name="theme_view">Vista</string>
     <string name="theme_try_and_customize">Probar y personalizar</string>
+    <string name="theme_view">Vista</string>
+    <string name="theme_details">Detalles</string>
+    <string name="theme_support">Ayuda</string>
+    <string name="theme_done">HECHO</string>
+    <string name="theme_manage_site">GESTIONAR SITIO</string>
     <string name="theme_activate">Activar</string>
-    <string name="active">Activo</string>
-    <string name="support">Ayuda</string>
-    <string name="details">Detalles</string>
-    <string name="customize">Personalizar</string>
     <string name="current_theme">Tema actual</string>
-    <string name="page_updated">Página actualizada</string>
-    <string name="post_updated">Entrada actualizada</string>
-    <string name="page_published">Página publicada</string>
+    <string name="customize">Personalizar</string>
+    <string name="details">Detalles</string>
+    <string name="support">Ayuda</string>
+    <string name="active">Activo</string>
     <string name="post_published">Entrada publicada</string>
+    <string name="page_published">Página publicada</string>
+    <string name="post_updated">Entrada actualizada</string>
+    <string name="page_updated">Página actualizada</string>
     <string name="theme_no_search_result_found">Lo sentimos, no se han encontrados temas.</string>
     <string name="reader_label_gap_marker">Cargar más entradas</string>
     <string name="notifications_no_search_results">Ningún sitio coincide con «%s»</string>
@@ -2184,290 +2501,288 @@ Language: es
     <string name="notification_types">Tipos de avisos</string>
     <string name="error_loading_notifications">No se han podido cargar los ajustes de avisos</string>
     <string name="comment_likes">Me gusta al comentario</string>
-    <string name="app_notifications">Avisos de la aplicación</string>
     <string name="email">Correo electrónico</string>
+    <string name="app_notifications">Avisos de la aplicación</string>
     <string name="notifications_tab">Pestaña de avisos</string>
     <string name="notification_settings_item_other_account_emails_summary">Siempre mandamos correos electrónicos importantes relativos a tu cuenta, pero también obtendrás extras útiles.</string>
     <string name="stats_insights_latest_post_summary">Sumario de la última entrada</string>
     <string name="connectionbar_no_connection">Sin conexión</string>
     <string name="post_trashed">Entrada enviada a la papelera</string>
-    <string name="button_trash">Papelera</string>
     <string name="button_stats">Estadísticas</string>
+    <string name="button_trash">Papelera</string>
     <string name="button_preview">Vista previa</string>
     <string name="button_view">Ver</string>
-    <string name="button_publish">Publicar</string>
     <string name="button_edit">Editar</string>
+    <string name="button_publish">Publicar</string>
     <string name="reader_toast_err_follow_blog_not_authorized">No tienes autorización para acceder a este sitio</string>
     <string name="reader_toast_err_follow_blog_not_found">No se pudo encontrar este sitio</string>
     <string name="undo">Deshacer</string>
     <string name="push_auth_expired">La solicitud ha expirado. Accede a WordPress.com para volver a intentarlo.</string>
-    <string name="ignore">Ignorar</string>
     <string name="stats_insights_best_ever">El mejor día</string>
+    <string name="ignore">Ignorar</string>
     <string name="stats_insights_today">Estadísticas de hoy</string>
     <string name="stats_insights_all_time">Entradas, vistas y visitantes de todos los tiempos</string>
     <string name="stats_insights">Detalles</string>
     <string name="me_disconnect_from_wordpress_com">Salir de WordPress.com</string>
-    <string name="me_connect_to_wordpress_com">Acceder a WordPress.com</string>
     <string name="me_btn_login_logout">Iniciar/Cerrar sesión</string>
+    <string name="me_connect_to_wordpress_com">Acceder a WordPress.com</string>
     <string name="me_btn_support">Ayuda y soporte</string>
-    <string name="account_settings">Ajustes de la cuenta</string>
     <string name="site_picker_cant_hide_current_site">«%s» no se ha ocultado porque es el sitio actual</string>
+    <string name="account_settings">Ajustes de la cuenta</string>
     <string name="site_picker_create_wpcom">Crear sitio en WordPress.com</string>
     <string name="site_picker_add_self_hosted">Añadir sitio autoalojado</string>
-    <string name="site_picker_add_site">Añadir sitio nuevo</string>
     <string name="site_picker_edit_visibility">Mostrar/Ocultar sitios</string>
-    <string name="site_picker_title">Elegir sitio</string>
-    <string name="my_site_btn_view_site">Ver sitio</string>
-    <string name="my_site_btn_view_admin">Ver Administrador</string>
+    <string name="site_picker_add_site">Añadir sitio nuevo</string>
     <string name="my_site_btn_switch_site">Cambiar sitio</string>
-    <string name="my_site_btn_site_settings">Ajustes</string>
-    <string name="my_site_btn_blog_posts">Entradas del blog</string>
+    <string name="my_site_btn_view_admin">Ver Administrador</string>
+    <string name="my_site_btn_view_site">Ver sitio</string>
+    <string name="site_picker_title">Elegir sitio</string>
     <string name="my_site_header_publish">Publicar</string>
+    <string name="my_site_btn_blog_posts">Entradas del blog</string>
     <string name="my_site_header_look_and_feel">Aspecto</string>
+    <string name="my_site_btn_site_settings">Ajustes</string>
     <string name="my_site_header_configuration">Configuración</string>
     <string name="reader_label_new_posts_subtitle">Toca para mostrarlos</string>
-    <string name="deselect_all">Anular todas las selecciones</string>
-    <string name="select_all">Seleccionar todo</string>
-    <string name="hide">Ocultar</string>
     <string name="show">Mostrar</string>
-    <string name="auth_required">Accede de nuevo para continuar.</string>
+    <string name="hide">Ocultar</string>
+    <string name="select_all">Seleccionar todo</string>
+    <string name="deselect_all">Anular todas las selecciones</string>
+    <string name="language">Idioma</string>
     <string name="invalid_verification_code">Código de verificación no válido</string>
     <string name="verification_code">Código de verificación</string>
-    <string name="language">Idioma</string>
-    <string name="reader_empty_posts_request_failed">No se pudieron recuperar las entradas</string>
-    <string name="publisher">Autor:</string>
+    <string name="auth_required">Accede de nuevo para continuar.</string>
     <string name="error_notification_open">No se pudo abrir la notificación</string>
     <string name="stats_search_terms_unknown_search_terms">Términos de búsqueda desconocidos</string>
-    <string name="stats_view_search_terms">Términos de búsqueda</string>
     <string name="stats_view_authors">Autores</string>
+    <string name="stats_view_search_terms">Términos de búsqueda</string>
+    <string name="publisher">Autor:</string>
     <string name="comments_fetching">Recuperando comentarios…</string>
     <string name="pages_fetching">Recuperando páginas…</string>
     <string name="posts_fetching">Recuperando entradas…</string>
     <string name="media_fetching">Recuperando medios…</string>
+    <string name="reader_empty_posts_request_failed">No se pudieron recuperar las entradas</string>
+    <string name="reader_label_new_posts">Nuevas entradas</string>
     <string name="logs_copied_to_clipboard">Los informes de la aplicación se han copiado al portapapeles</string>
+    <string name="post_uploading">Subiendo entrada</string>
     <string name="reader_empty_posts_in_blog">Este sitio está vacío</string>
-    <string name="reader_label_new_posts">Nuevas entradas</string>
-    <string name="reader_page_recommended_blogs">Sitios que te podrían gustar</string>
     <string name="error_copy_to_clipboard">Ha ocurrido un error al copiar el texto en el portapapeles</string>
-    <string name="post_uploading">Subiendo entrada</string>
-    <string name="stats_followers_years">%1$d años</string>
-    <string name="stats_followers_a_year">Un año</string>
+    <string name="themes_fetching">Obteniendo temas…</string>
     <string name="stats_followers_months">%1$d meses</string>
+    <string name="stats_followers_a_year">Un año</string>
+    <string name="stats_followers_years">%1$d años</string>
     <string name="stats_followers_a_month">Un mes</string>
-    <string name="stats_followers_days">%1$d días</string>
-    <string name="stats_followers_a_day">Un día</string>
-    <string name="stats_followers_hours">%1$d horas</string>
-    <string name="stats_followers_an_hour_ago">hace una hora</string>
     <string name="stats_followers_minutes">%1$d minutos</string>
+    <string name="stats_followers_an_hour_ago">hace una hora</string>
+    <string name="stats_followers_hours">%1$d horas</string>
+    <string name="stats_followers_a_day">Un día</string>
+    <string name="stats_followers_days">%1$d días</string>
     <string name="stats_followers_a_minute_ago">hace un minuto</string>
     <string name="stats_followers_seconds_ago">hace unos segundos</string>
-    <string name="stats_view_followers">Seguidores</string>
-    <string name="stats_view_publicize">Difundir</string>
-    <string name="stats_view_videos">Vídeos</string>
     <string name="stats_view_top_posts_and_pages">Entradas y páginas</string>
+    <string name="stats_view_videos">Vídeos</string>
+    <string name="stats_view_publicize">Difundir</string>
+    <string name="stats_view_followers">Seguidores</string>
     <string name="stats_view_countries">Países</string>
     <string name="stats_likes">Me gusta</string>
-    <string name="stats_visitors">Visitantes</string>
-    <string name="stats_views">Vistas</string>
     <string name="stats_timeframe_years">Años</string>
-    <string name="themes_fetching">Obteniendo temas…</string>
+    <string name="stats_views">Vistas</string>
+    <string name="stats_visitors">Visitantes</string>
     <string name="ssl_certificate_details">Detalles</string>
     <string name="cab_selected">%d seleccionados</string>
-    <string name="browse_our_faq_button">Explora nuestras Preguntas frecuentes.</string>
     <string name="reader_empty_comments">Aún no hay comentarios</string>
-    <string name="reader_empty_posts_in_tag">No hay entradas con esta temática</string>
-    <string name="reader_label_like">Me gusta</string>
     <string name="reader_label_view_original">Ver artículo original</string>
+    <string name="reader_label_like">Me gusta</string>
     <string name="reader_label_comments_closed">Los comentarios están cerrados</string>
     <string name="reader_title_photo_viewer">%1$d de %2$d</string>
     <string name="error_publish_empty_post">No se puede publicar una entrada vacía.</string>
     <string name="error_refresh_unauthorized_posts">No tienes permiso para ver o editar entradas.</string>
     <string name="error_refresh_unauthorized_pages">No tienes permiso para ver o editar páginas.</string>
     <string name="error_refresh_unauthorized_comments">No tienes permiso para ver o editar comentarios.</string>
-    <string name="more">Más</string>
     <string name="older_month">Hace más de 1 mes</string>
-    <string name="older_last_week">Hace más de 1 semana</string>
+    <string name="more">Más</string>
     <string name="older_two_days">Hace más de 2 días</string>
+    <string name="older_last_week">Hace más de 1 semana</string>
     <string name="mnu_comment_liked">Me gustó</string>
     <string name="comment">Comentario</string>
     <string name="comment_trashed">El comentario se ha enviado a la papelera.</string>
     <string name="comment_reply_to_user">Responder a %s</string>
+    <string name="browse_our_faq_button">Explora nuestras Preguntas frecuentes.</string>
     <string name="posts_empty_list">Aún no se han publicado entradas. ¿Por qué no crear una?</string>
     <string name="signing_out">Cerrando sesión…</string>
+    <string name="reader_empty_posts_in_tag">No hay entradas con esta temática</string>
     <string name="reader_toast_err_generic">No es posible realizar esta acción</string>
     <string name="reader_toast_err_block_blog">No es posible bloquear este sitio</string>
     <string name="reader_toast_blog_blocked">Las entradas de este sitio no volverán a mostrarse</string>
     <string name="reader_menu_block_blog">Bloquear este sitio</string>
-    <string name="schedule_verb">Programación</string>
     <string name="update_verb">Actualizar</string>
-    <string name="reader_empty_recommended_blogs">Sin sitios recomendados</string>
-    <string name="reader_toast_err_unfollow_blog">No se puede dejar de seguir este sitio</string>
-    <string name="reader_toast_err_follow_blog">No se puede seguir este sitio</string>
+    <string name="schedule_verb">Programación</string>
+    <string name="reader_page_followed_blogs">Sitios que sigues</string>
     <string name="reader_toast_err_already_follow_blog">Ya estás siguiendo este sitio</string>
-    <string name="reader_toast_err_get_blog_info">No se puede mostrar este sitio</string>
     <string name="reader_label_followed_blog">Sitio seguido</string>
+    <string name="reader_toast_err_get_blog_info">No se puede mostrar este sitio</string>
+    <string name="reader_toast_err_follow_blog">No se puede seguir este sitio</string>
+    <string name="reader_toast_err_unfollow_blog">No se puede dejar de seguir este sitio</string>
+    <string name="reader_empty_recommended_blogs">Sin sitios recomendados</string>
+    <string name="reader_title_blog_preview">Sitio del lector</string>
     <string name="reader_hint_add_tag_or_url">Introduce una URL o tema para seguir</string>
-    <string name="reader_page_followed_blogs">Sitios que sigues</string>
     <string name="reader_page_followed_tags">Temas seguidos</string>
-    <string name="reader_title_blog_preview">Sitio del lector</string>
-    <string name="ssl_certificate_ask_trust">SI normalmente se conecta sin problemas a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
-    <string name="ssl_certificate_error">Certificado SSL no válido</string>
-    <string name="forgot_password">¿Has olvidado la contraseña?</string>
     <string name="help">Ayuda</string>
-    <string name="username_or_password_incorrect">El nombre de usuario o contraseña que has introducido son incorrectos</string>
-    <string name="email_invalid">Introduce una dirección de correo electrónico válida</string>
-    <string name="invalid_email_message">Tu dirección de correo electrónico no es válida</string>
-    <string name="error_downloading_image">Error al descargar la imagen</string>
-    <string name="error_load_comment">No se pudo cargar el comentario</string>
+    <string name="ssl_certificate_error">Certificado SSL no válido</string>
+    <string name="ssl_certificate_ask_trust">SI normalmente se conecta sin problemas a este sitio sin problemas, este error puede significar que alguien están intentando suplantar el sitio, por lo que no deberías continuar. ¿Quieres, de todas formas, confiar en el certificado?</string>
+    <string name="theme_fetch_failed">Ocurrió un error al obtener los temas.</string>
+    <string name="error_refresh_posts">Las entradas no pueden ser actualizadas en este momento</string>
+    <string name="error_refresh_pages">Las páginas no pueden ser actualizadas en este momento.</string>
+    <string name="mnu_comment_unspam">No es spam</string>
+    <string name="adding_cat_failed">No se pudo añadir la categoría</string>
+    <string name="error_generic">Ocurrió un error</string>
     <string name="error_edit_comment">Ocurrió un error al editar el comentario</string>
     <string name="error_moderate_comment">Ocurrió un error al moderar el comentario</string>
-    <string name="error_generic">Ocurrió un error</string>
+    <string name="invalid_email_message">Tu dirección de correo electrónico no es válida</string>
+    <string name="cat_name_required">El campo nombre de categoría es necesario</string>
+    <string name="error_load_comment">No se pudo cargar el comentario</string>
+    <string name="error_downloading_image">Error al descargar la imagen</string>
+    <string name="sdcard_message">Se necesita una tarjeta SD montada para subir medios</string>
+    <string name="no_network_message">No hay ninguna conexión de red disponible</string>
+    <string name="gallery_error">El elemento multimedia no ha podido ser recuperado</string>
+    <string name="blog_not_found">Ha ocurrido un error mientras se accedía a este blog</string>
     <string name="error_refresh_comments">No se pudieron actualizar los comentarios</string>
-    <string name="error_refresh_pages">Las páginas no pueden ser actualizadas en este momento.</string>
-    <string name="error_refresh_posts">Las entradas no pueden ser actualizadas en este momento</string>
     <string name="error_deleting_post">Ocurrió un error al eliminar la entrada</string>
-    <string name="notifications_empty_list">Sin avisos</string>
-    <string name="sdcard_message">Se necesita una tarjeta SD montada para subir medios</string>
-    <string name="cat_name_required">El campo nombre de categoría es necesario</string>
     <string name="adding_cat_success">Categoría añadida correctamente</string>
-    <string name="adding_cat_failed">No se pudo añadir la categoría</string>
-    <string name="mnu_comment_unspam">No es spam</string>
-    <string name="theme_fetch_failed">Ocurrió un error al obtener los temas.</string>
-    <string name="blog_not_found">Ha ocurrido un error mientras se accedía a este blog</string>
-    <string name="gallery_error">El elemento multimedia no ha podido ser recuperado</string>
-    <string name="no_network_message">No hay ninguna conexión de red disponible</string>
-    <string name="reader_toast_err_remove_tag">No se ha podido eliminar este tema</string>
-    <string name="reader_toast_err_add_tag">No se ha podido añadir este tema</string>
-    <string name="reader_title_applog">Registro de la aplicación</string>
-    <string name="fatal_db_error">Ha ocurrido un error al crear la base de datos de la aplicación. Por favor, intenta reinstalar la aplicación. </string>
-    <string name="error_blog_hidden">Este blog está oculto y no se puede cargar. Actívalo de nuevo en ajustes y prueba de nuevo.</string>
-    <string name="error_refresh_media">No se pueden actualizar los medios en este momento</string>
+    <string name="email_invalid">Introduce una dirección de correo electrónico válida</string>
+    <string name="username_or_password_incorrect">El nombre de usuario o contraseña que has introducido son incorrectos</string>
+    <string name="notifications_empty_list">Sin avisos</string>
+    <string name="connection_error">Error de conexión</string>
+    <string name="cancel_edit">Cancelar edición</string>
+    <string name="comment_status_approved">Aprobado</string>
+    <string name="comment_status_unapproved">Pendiente</string>
+    <string name="comment_status_spam">Spam</string>
+    <string name="comment_status_trash">En la papelera</string>
+    <string name="edit_comment">Editar comentario</string>
+    <string name="mnu_comment_approve">Aprobar</string>
+    <string name="mnu_comment_unapprove">Rechazar</string>
+    <string name="mnu_comment_spam">Spam</string>
+    <string name="mnu_comment_trash">Enviar a la papelera</string>
+    <string name="dlg_approving_comments">Aprobando</string>
+    <string name="dlg_unapproving_comments">Rechazando</string>
+    <string name="dlg_spamming_comments">Marcando como spam</string>
+    <string name="dlg_trashing_comments">Enviando a la papelera</string>
+    <string name="dlg_confirm_trash_comments">¿Enviar a la papelera?</string>
+    <string name="trash">Papelera</string>
+    <string name="saving_changes">Guardando cambios</string>
+    <string name="new_post">Nueva entrada</string>
+    <string name="add_new_category">Añadir nueva categoría</string>
+    <string name="category_name">Nombre de la categoría</string>
+    <string name="privacy_policy">Política de privacidad</string>
+    <string name="local_changes">Cambios locales</string>
     <string name="wordpress_blog">Blog de WordPress</string>
+    <string name="page_settings">Ajustes de página</string>
     <string name="image_settings">Ajustes de imagen</string>
-    <string name="local_changes">Cambios locales</string>
-    <string name="privacy_policy">Política de privacidad</string>
-    <string name="new_media">Nuevo elemento multimedia</string>
-    <string name="new_post">Nueva entrada</string>
-    <string name="notifications_empty_all">No hay avisos… aún.</string>
-    <string name="http_authorization_required">Se necesita autorización</string>
-    <string name="invalid_site_url_message">Comprueba que la URL del sitio introducida es válida</string>
-    <string name="open_source_licenses">Licencias de código abierto</string>
+    <string name="post_settings">Ajustes de entrada</string>
+    <string name="select_categories">Seleccionar categorías</string>
+    <string name="link_enter_url_text">Texto del enlace (opcional)</string>
     <string name="file_error_create">No se pudo crear un archivo temporal para subir el archivo multimedia. Asegúrate que haya suficiente espacio libre en tu dispositivo.</string>
-    <string name="category_name">Nombre de la categoría</string>
-    <string name="add_new_category">Añadir nueva categoría</string>
+    <string name="post_not_found">Ocurrió un error al cargar la entrada. Actualiza tus entradas e intenta nuevamente.</string>
+    <string name="local_draft">Borrador local</string>
     <string name="view_in_browser">Ver en el navegador</string>
-    <string name="remove_account">Eliminar sitio</string>
-    <string name="toast_comment_unedited">El comentario no ha cambiado</string>
-    <string name="content_required">Comentario obligatorio</string>
+    <string name="reader_title_applog">Registro de la aplicación</string>
+    <string name="http_authorization_required">Se necesita autorización</string>
+    <string name="learn_more">Aprender más</string>
     <string name="sure_to_cancel_edit_comment">¿Cancelar la edición de este comentario?</string>
-    <string name="saving_changes">Guardando cambios</string>
-    <string name="trash">Papelera</string>
-    <string name="dlg_confirm_trash_comments">¿Enviar a la papelera?</string>
-    <string name="dlg_trashing_comments">Enviando a la papelera</string>
-    <string name="dlg_spamming_comments">Marcando como spam</string>
-    <string name="dlg_unapproving_comments">Rechazando</string>
-    <string name="dlg_approving_comments">Aprobando</string>
-    <string name="mnu_comment_trash">Enviar a la papelera</string>
-    <string name="mnu_comment_spam">Spam</string>
-    <string name="mnu_comment_unapprove">Rechazar</string>
-    <string name="mnu_comment_approve">Aprobar</string>
-    <string name="edit_comment">Editar comentario</string>
-    <string name="comment_status_trash">En la papelera</string>
-    <string name="comment_status_spam">Spam</string>
-    <string name="comment_status_unapproved">Pendiente</string>
-    <string name="comment_status_approved">Aprobado</string>
-    <string name="delete_page">¿Borrar página?</string>
-    <string name="delete_post">¿Borrar entrada?</string>
-    <string name="post_settings">Ajustes de entrada</string>
+    <string name="content_required">Comentario obligatorio</string>
+    <string name="toast_comment_unedited">El comentario no ha cambiado</string>
+    <string name="media_error_no_permission">No tienes permiso para ver la librería multimedia</string>
+    <string name="error_blog_hidden">Este blog está oculto y no se puede cargar. Actívalo de nuevo en ajustes y prueba de nuevo.</string>
+    <string name="new_media">Nuevo elemento multimedia</string>
+    <string name="remove_account">Eliminar sitio</string>
+    <string name="invalid_site_url_message">Comprueba que la URL del sitio introducida es válida</string>
+    <string name="error_refresh_media">No se pueden actualizar los medios en este momento</string>
     <string name="file_not_found">No ha sido posible encontrar el archivo a cargar. ¿Se ha borrado o cambiado de ubicación?</string>
-    <string name="local_draft">Borrador local</string>
-    <string name="page_settings">Ajustes de página</string>
-    <string name="link_enter_url_text">Texto del enlace (opcional)</string>
+    <string name="plugin_not_found">Ocurrió un error al acceder a este plugin</string>
+    <string name="delete_post">¿Borrar entrada?</string>
+    <string name="delete_page">¿Borrar página?</string>
+    <string name="notifications_empty_all">No hay avisos… aún.</string>
+    <string name="open_source_licenses">Licencias de código abierto</string>
     <string name="cannot_delete_multi_media_items">Algunos medios no se han podido borrar en este momento. Inténtalo de nuevo más tarde.</string>
-    <string name="media_error_no_permission">No tienes permiso para ver la librería multimedia</string>
+    <string name="fatal_db_error">Ha ocurrido un error al crear la base de datos de la aplicación. Por favor, intenta reinstalar la aplicación. </string>
     <string name="media_gallery_type_thumbnail_grid">Cuadrícula de miniaturas</string>
-    <string name="learn_more">Aprender más</string>
-    <string name="post_not_found">Ocurrió un error al cargar la entrada. Actualiza tus entradas e intenta nuevamente.</string>
-    <string name="plugin_not_found">Ocurrió un error al acceder a este plugin</string>
-    <string name="cancel_edit">Cancelar edición</string>
-    <string name="connection_error">Error de conexión</string>
-    <string name="select_categories">Seleccionar categorías</string>
+    <string name="reader_toast_err_add_tag">No se ha podido añadir este tema</string>
+    <string name="reader_toast_err_remove_tag">No se ha podido eliminar este tema</string>
     <string name="share_link">Compartir enlace</string>
     <string name="reader_empty_posts_in_tag_updating">Recuperando entradas…</string>
     <string name="reader_likes_you_and_multi">A ti, y a %,d personas más les gusta esto</string>
     <string name="reader_likes_multi">A %,d personas les gusta esto</string>
     <string name="reader_label_reply">Responder</string>
-    <string name="cant_share_no_visible_blog">No se puede compartir en WordPress si no tienes un blog visible</string>
     <string name="comment_spammed">Comentado marcado como spam</string>
+    <string name="cant_share_no_visible_blog">No se puede compartir en WordPress si no tienes un blog visible</string>
+    <string name="pick_photo">Elige una foto</string>
+    <string name="pick_video">Elige un vídeo</string>
     <string name="reader_toast_err_get_post">No fue posible recuperar esta entrada</string>
     <string name="reader_likes_you_and_one">A ti y a otra persona os gusta esto</string>
-    <string name="pick_video">Elige un vídeo</string>
-    <string name="pick_photo">Elige una foto</string>
-    <string name="sign_up_label">Registro</string>
-    <string name="reader_toast_err_url_intent">Imposible abrir %s</string>
-    <string name="reader_toast_err_view_image">Imposible ver la imágen</string>
+    <string name="reader_hint_comment_on_comment">Contestar al comentario </string>
+    <string name="reader_label_added_tag">Añadido %s</string>
     <string name="reader_toast_err_share_intent">Imposible compartir</string>
-    <string name="reader_toast_err_tag_invalid">Este no es un tema válido</string>
-    <string name="reader_toast_err_tag_exists">Ya estás siguiendo este tema</string>
     <string name="reader_toast_err_comment_failed">No se pudo publicar tu comentario </string>
-    <string name="reader_likes_only_you">Te gusta esto</string>
-    <string name="reader_likes_one">A una persona le gusta esto</string>
+    <string name="reader_toast_err_view_image">Imposible ver la imágen</string>
+    <string name="reader_toast_err_url_intent">Imposible abrir %s</string>
     <string name="reader_label_removed_tag">Eliminado %s</string>
-    <string name="reader_label_added_tag">Añadido %s</string>
-    <string name="reader_hint_comment_on_comment">Contestar al comentario </string>
-    <string name="reader_btn_unfollow">Siguiendo</string>
-    <string name="reader_btn_follow">Seguir</string>
-    <string name="reader_btn_share">Compartir</string>
-    <string name="reader_view_reblog">Reblog</string>
+    <string name="empty_list_default">Esta lista esta vacía</string>
     <string name="reader_untitled_post">Sin título</string>
+    <string name="reader_btn_share">Compartir</string>
+    <string name="reader_btn_follow">Seguir</string>
+    <string name="reader_likes_one">A una persona le gusta esto</string>
+    <string name="reader_likes_only_you">Te gusta esto</string>
+    <string name="reader_btn_unfollow">Siguiendo</string>
     <string name="comments_empty_list">No hay comentarios aún</string>
-    <string name="empty_list_default">Esta lista esta vacía</string>
-    <string name="stats_timeframe_months">Meses</string>
-    <string name="stats_timeframe_weeks">Semanas</string>
-    <string name="stats_timeframe_days">Días</string>
-    <string name="stats_timeframe_yesterday">Ayer</string>
-    <string name="stats_timeframe_today">Hoy</string>
-    <string name="stats_view_referrers">Referentes</string>
+    <string name="reader_view_reblog">Reblog</string>
+    <string name="sign_up_label">Registro</string>
+    <string name="reader_toast_err_tag_invalid">Este no es un tema válido</string>
+    <string name="reader_toast_err_tag_exists">Ya estás siguiendo este tema</string>
+    <string name="themes">Temas</string>
     <string name="stats_view_tags_and_categories">Etiquetas y categorías</string>
-    <string name="stats_view_clicks">Clics</string>
-    <string name="stats">Estadísticas</string>
-    <string name="share_action">Compartir</string>
+    <string name="stats_timeframe_today">Hoy</string>
+    <string name="stats_timeframe_yesterday">Ayer</string>
+    <string name="stats_timeframe_days">Días</string>
+    <string name="stats_timeframe_weeks">Semanas</string>
+    <string name="stats_timeframe_months">Meses</string>
     <string name="theme_activate_button">Activar</string>
-    <string name="media_edit_failure">No se pudo actualizar</string>
-    <string name="media_edit_description_text">Descripción</string>
-    <string name="media_edit_caption_text">Leyenda</string>
     <string name="media_edit_title_text">Título</string>
+    <string name="media_edit_description_text">Descripción</string>
+    <string name="share_action">Compartir</string>
+    <string name="stats_view_clicks">Clics</string>
+    <string name="stats_view_referrers">Referentes</string>
     <string name="media_gallery_type_slideshow">Pase de diapositivas </string>
-    <string name="media_gallery_type_circles">Círculos</string>
     <string name="media_gallery_type_tiled">Mosaico</string>
+    <string name="media_gallery_type_circles">Círculos</string>
     <string name="media_gallery_type_squares">Cuadrados</string>
-    <string name="themes">Temas</string>
-    <string name="discard">Descartar</string>
+    <string name="media_edit_caption_text">Leyenda</string>
+    <string name="media_edit_failure">No se pudo actualizar</string>
+    <string name="stats">Estadísticas</string>
     <string name="manage">Gestionar</string>
-    <string name="more_notifications">y %d más.</string>
-    <string name="new_notifications">%d nuevos avisos</string>
-    <string name="follows">Seguimientos</string>
+    <string name="discard">Descartar</string>
     <string name="note_reply_successful">Respuesta publicada</string>
+    <string name="more_notifications">y %d más.</string>
     <string name="sign_in">Acceder</string>
+    <string name="follows">Seguimientos</string>
+    <string name="new_notifications">%d nuevos avisos</string>
     <string name="loading">Cargando…</string>
-    <string name="httppassword">Contraseña HTTP</string>
     <string name="httpuser">Usuario HTTP</string>
+    <string name="httppassword">Contraseña HTTP</string>
     <string name="error_media_upload">Se ha producido un error al cargar los archivos</string>
     <string name="incorrect_credentials">Nombre de usuario o contraseña incorrecta</string>
-    <string name="log_in">Acceder</string>
     <string name="username">Nombre de usuario</string>
     <string name="password">Contraseña</string>
+    <string name="log_in">Acceder</string>
     <string name="reader">Lector</string>
-    <string name="pages">Páginas</string>
     <string name="posts">Entradas</string>
+    <string name="pages">Páginas</string>
     <string name="anonymous">Anónimo</string>
     <string name="no_network_title">No hay red disponible</string>
-    <string name="done">hecho</string>
     <string name="ok">OK</string>
+    <string name="done">hecho</string>
     <string name="link_enter_url">URL</string>
-    <string name="tos">Términos del servicio</string>
-    <string name="version">Versión</string>
     <string name="app_title">WordPress para Android</string>
+    <string name="version">Versión</string>
+    <string name="tos">Términos del servicio</string>
     <string name="image_alignment">Alineación</string>
     <string name="refresh">Refrescar</string>
     <string name="untitled">Sin Título</string>
@@ -2478,24 +2793,24 @@ Language: es
     <string name="quickpress_add_error">El nombre del atajo no puede estar vacío.</string>
     <string name="pages_private">Privado</string>
     <string name="title">Título</string>
-    <string name="tags_separate_with_commas">Separa las etiquetas con comas</string>
     <string name="categories">Categorías</string>
+    <string name="tags_separate_with_commas">Separa las etiquetas con comas</string>
     <string name="dlg_deleting_comments">Eliminando comentarios</string>
     <string name="sdcard_title">Se necesita una tarjeta SD</string>
     <string name="media">Multimedia</string>
     <string name="approve">Aprobar</string>
     <string name="delete">Eliminar</string>
     <string name="none">Ninguno</string>
-    <string name="publish_now">Publicar ahora</string>
-    <string name="reply">Responder</string>
-    <string name="on">en</string>
-    <string name="preview">Vista previa</string>
-    <string name="category_refresh_error">Error de actualización de categorías</string>
     <string name="error">Error</string>
-    <string name="no">No</string>
+    <string name="cancel">Cancelar</string>
+    <string name="save">Guardar</string>
+    <string name="add">Añadir</string>
+    <string name="category_refresh_error">Error de actualización de categorías</string>
+    <string name="preview">Vista previa</string>
+    <string name="reply">Responder</string>
     <string name="yes">Sí</string>
+    <string name="no">No</string>
+    <string name="on">en</string>
     <string name="notification_settings">Ajustes de avisos</string>
-    <string name="add">Añadir</string>
-    <string name="save">Guardar</string>
-    <string name="cancel">Cancelar</string>
+    <string name="publish_now">Publicar ahora</string>
 </resources>
diff --git a/WordPress/src/main/res/values-eu/strings.xml b/WordPress/src/main/res/values-eu/strings.xml
index 5c096aefb61d..f5e30c7653fa 100644
--- a/WordPress/src/main/res/values-eu/strings.xml
+++ b/WordPress/src/main/res/values-eu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2019-12-08 17:50:47+0000
 Plural-Forms: nplurals=2; plural=n != 1;
@@ -6,7 +6,6 @@ Generator: GlotPress/3.0.0-alpha.2
 Language: eu_ES
 -->
 <resources>
-    <string name="suffix_1_000">%sk</string>
     <string name="suffix_1_000_000">%sM</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000">%sB</string>
@@ -69,15 +68,8 @@ Language: eu_ES
     <string name="invite_error_invalid_usernames_multiple">Ezin bidali: erabiltzaile-izen edo e-posta baliogabeak daude</string>
     <string name="invite_error_invalid_usernames_one">Ezin bidali: erabiltzaile-izen edo e-posta bat baliogabea da</string>
     <string name="invite_error_no_usernames">Mesedez, gehitu gutxienez erabiltzaile-izen bat</string>
-    <string name="invite_message_info">(Hautazkoa) Erabiltzaileari/ei bidaliko zaion/en 500 hizki arteko mezu pertsonalizatu bat idatz dezakezu.</string>
-    <string name="invite_message_remaining_other">%d hizki falta dira</string>
-    <string name="invite_message_remaining_one">Hizki 1 falta da</string>
-    <string name="invite_message_remaining_zero">0 hizki falta dira</string>
-    <string name="invite_message_title">Mezu pertsonalizatua</string>
     <string name="invite">Gonbidatu</string>
-    <string name="invite_names_title">Erabiltzaile-izenak edo e-postak</string>
     <string name="my_site_header_external">Kanpokoak</string>
-    <string name="send_link">Bidali esteka</string>
     <string name="invite_people">Gonbidatu jendea</string>
     <string name="label_clear_search_history">Garbitu bilaketen historia</string>
     <string name="dlg_confirm_clear_search_history">Bilaketen historia garbitu?</string>
@@ -90,7 +82,6 @@ Language: eu_ES
     <string name="error_refreshing_gravatar">Errorea zure Gravatarra birkargatzean</string>
     <string name="checking_email">E-posta egiaztatzen</string>
     <string name="logging_in">Saioa hasten</string>
-    <string name="enter_your_password_instead">Sartu zure pasahitza ordez</string>
     <string name="web_address_dialog_hint">Publikoki erakusten da iruzkinak egitean.</string>
     <string name="plan">Plana</string>
     <string name="plans">Planak</string>
@@ -163,16 +154,12 @@ Language: eu_ES
     <string name="site_settings_language_hint">Blog honen hizkuntza nagusia</string>
     <string name="site_settings_tagline_hint">Deskripzio labur bat edo esaldi burutsu bat zure bloga deskribatzeko</string>
     <string name="site_settings_title_hint">Azaldu hitz gutxitan gune hau zertaz doan</string>
-    <string name="site_settings_whitelist_known_summary">Erabiltzaile ezagunen iruzkinak</string>
-    <string name="site_settings_whitelist_all_summary">Erabiltzaile guztien iruzkinak</string>
     <string name="site_settings_privacy_private_summary">Pribatua</string>
     <string name="site_settings_privacy_hidden_summary">Ezkutua</string>
     <string name="site_settings_delete_site_title">Ezabatu gunea</string>
     <string name="site_settings_privacy_public_summary">Publikoa</string>
-    <string name="site_settings_blacklist_title">Zerrenda beltza</string>
     <string name="site_settings_moderation_hold_title">Moderatzeko gelditu</string>
     <string name="site_settings_multiple_links_title">Estekak iruzkinetan</string>
-    <string name="site_settings_whitelist_title">Automatikoki onartu</string>
     <string name="site_settings_threading_title">Hariztaketa</string>
     <string name="site_settings_paging_title">Orrikatzea</string>
     <string name="site_settings_allow_comments_title">Baimendu iruzkinak</string>
@@ -273,7 +260,6 @@ Language: eu_ES
     <string name="stats_view_search_terms">Bilaketa terminoak</string>
     <string name="reader_label_new_posts">Bidalketa berriak</string>
     <string name="error_copy_to_clipboard">Errore bat gertatu da testua arbelera kopiatzean</string>
-    <string name="reader_page_recommended_blogs">Gogoko izan ditzakezun guneak</string>
     <string name="post_uploading">Bidalketa igotzen</string>
     <string name="stats_view_top_posts_and_pages">Bidalketak eta orrialdeak</string>
     <string name="stats_view_videos">Bideoak</string>
@@ -309,7 +295,6 @@ Language: eu_ES
     <string name="reader_page_followed_blogs">Jarraitutako guneak</string>
     <string name="help">Laguntza</string>
     <string name="ssl_certificate_error">SSL ziurtagiri okerra</string>
-    <string name="forgot_password">Pasahitza galdu duzu?</string>
     <string name="ssl_certificate_ask_trust">Normalean gune honetara arazo gabe konektatzen bazara, errore honek norbait zu ordezkatu nahian dabilela adieraz lezake eta ez zenuke aurrera jarraitu beharko. Hala ere ziurtagiriaz fidatu nahi duzu?</string>
     <string name="adding_cat_success">Kategoria zuzen gehitu da.</string>
     <string name="error_refresh_pages">Orrialdeak ezin dira momentu honetan eguneratu.</string>
diff --git a/WordPress/src/main/res/values-fr-rCA/strings.xml b/WordPress/src/main/res/values-fr-rCA/strings.xml
new file mode 100644
index 000000000000..b399c59f9b0d
--- /dev/null
+++ b/WordPress/src/main/res/values-fr-rCA/strings.xml
@@ -0,0 +1,2780 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Translation-Revision-Date: 2021-05-19 06:17:14+0000
+Plural-Forms: nplurals=2; plural=n > 1;
+Generator: GlotPress/3.0.0-alpha.2
+Language: fr
+-->
+<resources>
+    <string name="gutenberg_native_size">Taille</string>
+    <string name="gutenberg_native_image_settings">Réglages d’image</string>
+    <string name="gutenberg_native_audio_settings">Réglages de son</string>
+    <string name="user_profile_untitled_site">(Sans titre)</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">Profil utilisateur : information sur la feuille du bas</string>
+    <string name="likes_list_screen_title">Liste des mentions J’aime %s</string>
+    <string name="gutenberg_native_write_code">Rédiger du code…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Tri et filtre</string>
+    <string name="gutenberg_native_show_download_button">Afficher le bouton de téléchargement</string>
+    <string name="gutenberg_native_shortcode">Code court </string>
+    <string name="gutenberg_native_read_more">Lire la suite</string>
+    <string name="gutenberg_native_preload">Préchargement</string>
+    <string name="gutenberg_native_post_meta_settings">Réglages des métas de publication</string>
+    <string name="gutenberg_native_post_content_settings">Réglages de contenu de publication</string>
+    <string name="gutenberg_native_metadata">Métadonnée</string>
+    <string name="gutenberg_native_media_file">Fichier média</string>
+    <string name="gutenberg_native_media_area">Zone de média</string>
+    <string name="gutenberg_native_loop">Boucle</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Lier vers</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">image %1$d de %2$d dans la galerie</string>
+    <string name="gutenberg_native_heading_d">Titrage %d</string>
+    <string name="gutenberg_native_featured">À la Une</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Saisir l’URL à embarquer…</string>
+    <string name="gutenberg_native_edit_image">Modifier l’image</string>
+    <string name="gutenberg_native_display_post_date">Affiche la date du contenu</string>
+    <string name="gutenberg_native_code">Code</string>
+    <string name="gutenberg_native_change_heading_level">Changer le niveau de titre</string>
+    <string name="gutenberg_native_browser_default">Navigateur par défaut</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Le bloc a été supprimé ou n’est plus disponible.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Le bloc ne peut pas être rendu à l’intérieur de lui-même.</string>
+    <string name="gutenberg_native_autoplay">Lecture auto</string>
+    <string name="gutenberg_native_auto">Auto</string>
+    <string name="gutenberg_native_attachment_page">Page de fichier joint</string>
+    <string name="gutenberg_native_add_text">Ajout de texte…</string>
+    <string name="gutenberg_native_add_caption">Ajouter une légende</string>
+    <string name="gutenberg_native_what_is_alt_text">Qu’est-ce que le texte alternatif ?</string>
+    <string name="gutenberg_native_transform_s_to">Transformer %s en</string>
+    <string name="gutenberg_native_transform_block">Transformer le bloc…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Échec d’insertion du média.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Échec d’insertion du fichier audio</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Décrivez le rôle de cette image. Ne rien remplir si l’image est purement décorative. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s a été transformé en %2$s</string>
+    <string name="like_faces_error_loading_message">Erreur lors du chargement des données. %s.</string>
+    <string name="like_faces_plural_text">%d blogueurs aiment ceci.</string>
+    <string name="like_faces_singular_text">Un blogueur aime ceci.</string>
+    <string name="like_title_plural">%d mentions J\'aime</string>
+    <string name="like_title_singular">1 mention J\'aime</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Entrez les identifiants de votre serveur pour résoudre les menaces.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Entrez les identifiants de votre serveur pour résoudre la menace.</string>
+    <string name="suggestion">Suggestion :</string>
+    <string name="gutenberg_native_search_blocks">Rechercher des blocs</string>
+    <string name="gutenberg_native_search_block">Rechercher un bloc</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">Appuyer deux fois pour modifier l’unité</string>
+    <string name="gutenberg_native_clear_search">Supprimer la recherche</string>
+    <string name="gutenberg_native_cancel_search">Annuler la recherche</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s est %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Une erreur est survenue lors de l’obtention des données sur les mentions J’aime</string>
+    <string name="get_likes_unknown_error">Une erreur inconnue est survenue lors de l’obtention des mentions J’aime.</string>
+    <string name="get_likes_no_network_error">Aucun réseau disponible.</string>
+    <string name="comments_empty_list_filtered_unreplied">Aucun commentaire sans réponse</string>
+    <string name="comment_status_unreplied">Sans réponse</string>
+    <string name="gutenberg_native_table_of_contents">Table des matières</string>
+    <string name="gutenberg_native_summary">sommaire</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Résumez votre article avec une liste d’en-têtes. Ajoutez des ancres HTML aux blocs d’en-tête pour les lier ici.</string>
+    <string name="gutenberg_native_document_outline">aperçu du document</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">Adresses IP toujours autorisées</string>
+    <string name="site_settings_denylist_title">Commentaires rejetés</string>
+    <string name="reader_title_interests">Suivre des sujets</string>
+    <string name="stories_intro_main_subtitle">Une nouvelle façon de publier du contenu attrayant sur votre site.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Ignorer</string>
+    <string name="activity_log_backup_download_notice_download_action">Téléchargement</string>
+    <string name="threat_fix_all_status_success_message_plural">Les menaces ont bien été corrigées.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Veuillez confirmer que vous souhaitez corriger les %s menaces actives.</string>
+    <string name="scan_idle_threats_description_plural">L’analyse a trouvé %1$s menaces potentielles avec %2$s. Veuillez passer en revue les éléments ci-dessous et corriger ou appuyer sur le bouton Tout corriger. Nous sommes %3$s au besoin.</string>
+    <string name="scan_fixing_threats_description_plural">Nous rencontrons des difficultés à résoudre ces menaces en arrière-plan. Pendant ce temps, vous pouvez continuer à utiliser votre site comme d’habitude, tout en revenant de temps à autre pour vérifier la progression de l’analyse.</string>
+    <string name="gutenberg_native_edit_focal_point">Modifier le point focal</string>
+    <string name="new_site_creation_search_domain_example">exemple.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Saisissez un nom pour votre site</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Toutes les tâches sont terminées&lt;/b&gt;.&lt;br/&gt;Vous toucherez plus de personnes. Bon travail !</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Toutes les tâches sont terminées&lt;/b&gt;.&lt;br/&gt;Vous avez personnalisé votre site. Bravo !</string>
+    <string name="quick_start_card_menu_hide">Masquer pour le moment</string>
+    <string name="magic_link_not_meaning_to_create_account">Vous ne voulez pas créer de nouveau compte ? Revenez en arrière et ressaisissez votre adresse e-mail.</string>
+    <string name="invite_links_disable_dialog_message">Une fois le lien d’invitation désactivé, plus personne ne pourra l’utiliser pour rejoindre votre équipe. Confirmez-vous ?</string>
+    <string name="invite_links_disable_dialog_title">Désactiver le lien d’invitation</string>
+    <string name="invite_links_bad_format_response">Réponse reçue non valide</string>
+    <string name="invite_links_null_response">Aucune réponse reçue</string>
+    <string name="invite_links_cannot_get_roles_error">Une erreur s’est produite lors de la récupération des rôles</string>
+    <string name="invite_links_helper_text">Utilisez ce lien pour ajouter les membres de votre équipe sans avoir à les inviter individuellement. Toute personne ayant accès à ce lien sera en mesure de rejoindre votre organisation, même si le lien a été envoyé par quelqu’un d’autre que vous. Veillez à le partager uniquement avec des personnes de confiance.</string>
+    <string name="invite_links_expire_date">Expiration %1$s</string>
+    <string name="invite_links_disable_invite_link">Désactiver le lien d’invitation</string>
+    <string name="invite_links_share_invite_link">Partager le lien d’invitation</string>
+    <string name="invite_links_generate">Générer un nouveau lien</string>
+    <string name="invite_links_get_status_retry">Actualiser l’état des liens</string>
+    <string name="invite_links_section_title">Lien d’invitation</string>
+    <string name="threats_found_singular">Menace détectée</string>
+    <string name="threats_found_plural">Menaces détectées</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Analyse terminée&lt;/b&gt; &lt;br&gt; %s menaces potentielles détectées</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Analyse terminée&lt;/b&gt; &lt;br&gt; Une menace potentielle détectée</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Analyse terminée&lt;/b&gt; &lt;br&gt; Aucune menace détectée</string>
+    <string name="scan_fixing_threats_title_singular">Menace en cours de correction…</string>
+    <string name="disable">Désactiver</string>
+    <string name="quick_start_card_menu_unpin">Désépingler ceci</string>
+    <string name="quick_start_list_review_pages_subtitle">Vérifiez vos pages et apportez des modifications, ou ajoutez ou supprimez des pages.</string>
+    <string name="quick_start_list_view_site_title">Voir votre site</string>
+    <string name="quick_start_list_upload_icon_subtitle">Ajoutez une icône de site pour un aspect brillant et pro.</string>
+    <string name="quick_start_list_follow_site_subtitle">Découvrez et abonnez-vous aux sites qui vous inspirent.</string>
+    <string name="quick_start_list_enable_sharing_title">Activer le partage</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Partagez automatiquement les nouveaux articles sur vos réseaux sociaux.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Donnez à votre site un nom qui reflète sa personnalité et son thème.</string>
+    <string name="quick_start_list_check_stats_title">Vérifier vos statistiques</string>
+    <string name="backup_download_status_failure_bullet2">Nous essayerons encore de créer votre fichier de sauvegarde téléchargeable.</string>
+    <string name="backup_download_status_failure_bullet1">L’état permettant d’indiquer la durée de création de votre sauvegarde téléchargeable est introuvable.</string>
+    <string name="backup_download_status_failure_heading">L’état de votre sauvegarde téléchargeable est introuvable.</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icône Case à cocher</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icône Horloge</string>
+    <string name="restore_status_failure_bullet3">Nous vous préviendrons lorsque cela sera fait.</string>
+    <string name="restore_status_failure_bullet2">Nous essayerons encore de restaurer votre site.</string>
+    <string name="restore_status_failure_bullet1">L’état permettant d’indiquer la durée de votre restauration est introuvable.</string>
+    <string name="restore_status_failure_heading">L’état de votre restauration est introuvable.</string>
+    <string name="restore_complete_failed_description">Nous ne pouvons pas restaurer votre site.</string>
+    <string name="restore_warning_action_button">Confirmer</string>
+    <string name="restore_warning_description_with_two_parameters">Confirmez-vous vouloir restaurer votre site au %1$s sur %2$s ?\n        Toutes les modifications apportées depuis seront perdues.</string>
+    <string name="backup_download_complete_failed_description">Nous ne pouvons pas créer votre sauvegarde.</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exclut les thèmes, les extensions et les chargements)</string>
+    <string name="backup_item_contents">Répertoire WP-content</string>
+    <string name="backup_item_roots">Racine WordPress</string>
+    <string name="backup_download_details_choose_items_header">Éléments inclus dans ce téléchargement</string>
+    <string name="gutenberg_native_uploading">Téléversement…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Les blocs réutilisables ne sont pas modifiables sur WordPress pour iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Les blocs réutilisables ne sont pas modifiables sur WordPress pour Android</string>
+    <string name="gutenberg_native_replace_file">Remplacer le fichier</string>
+    <string name="gutenberg_native_replace_audio">Remplacer le son</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Un problème est survenu lors de l’ouverture du fichier audio</string>
+    <string name="gutenberg_native_open">OUVRIR</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Aucune application ne peut traiter cette requête.</string>
+    <string name="gutenberg_native_lock_icon">Icône de verrouillage</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Échec d’insertion du fichier audio Veuillez appuyer pour afficher les options.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Appuyer deux fois pour sélectionner un fichier audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Appuyer deux fois pour écouter le fichier audio</string>
+    <string name="gutenberg_native_choose_audio">Choisir un fichier sonore</string>
+    <string name="gutenberg_native_audio_player">Lecteur audio</string>
+    <string name="gutenberg_native_audio_file">fichier audio</string>
+    <string name="gutenberg_native_audio_caption_s">Légende audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Légende audio. Vide</string>
+    <string name="gutenberg_native_add_audio">AJOUTER UN FICHIER AUDIO</string>
+    <string name="continue_with_wpcom">Se connecter ou s’inscrire avec WordPress.com</string>
+    <string name="photo_picker_use_audio">Utiliser ce fichier audio</string>
+    <string name="photo_picker_choose_audio">Choisir le fichier audio depuis l’appareil</string>
+    <string name="people_optional_custom_message_helper_text">Facultatif : saisissez un message personnalisé à joindre à votre invitation.</string>
+    <string name="people_learn_more_about_roles">Plus d’infos sur les rôles</string>
+    <string name="threat_status_fixed">Exact</string>
+    <string name="threat_found_header">Trouvé</string>
+    <string name="scan_here_to_help">Aide ici</string>
+    <string name="scan_idle_threats_description_singular">L’analyse a détecté une menace potentielle avec %1$s. Veuillez passer en revue la menace ci-dessous et corriger ou appuyer sur le bouton Tout corriger. Nous sommes %2$s au besoin.</string>
+    <string name="scan_idle_manual_scan_description">Pour contrôler votre site à nouveau, exécutez une analyse manuelle ou attendez la prochaine analyse Jetpack plus tard dans la journée.</string>
+    <string name="scan_provisioning_description">Bienvenue dans Jetpack Scan ! Nous étudions votre site en vue de préparer une analyse complète. Nous vous ferons savoir si nous rencontrons un problème susceptible de compromettre l’analyse, puis nous démarrerons votre première analyse complète.</string>
+    <string name="scan_scanning_is_initial_description">Bienvenue sur Jetpack Scan. Nous réalisons actuellement un état des lieux de votre site et les résultats devraient bientôt vous parvenir.</string>
+    <string name="scan_fixing_threats_description_singular">Nous rencontrons des difficultés à résoudre cette menace en arrière-plan. Pendant ce temps, vous pouvez continuer à utiliser votre site comme d’habitude, tout en revenant de temps à autre pour vérifier la progression de l’analyse.</string>
+    <string name="scan_scanning_description">Nous vous enverrons une notification une fois que l’analyse sera terminée. Pendant ce temps, vous pouvez continuer à utiliser votre site comme d’habitude, tout en revenant de temps à autre pour vérifier la progression de l’analyse.</string>
+    <string name="scan_fixing_threats_title_plural">Correction des menaces</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan n’a pas pu terminer l’analyse de votre site. Veuillez vérifier si votre site est indisponible. Si ce n’est pas le cas, réessayez. S’il l’est, ou si Jetpack Scan rencontre toujours des problèmes, contactez notre équipe d’assistance.</string>
+    <string name="scan_request_failed_title">Un problème est survenu…</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Sauvegarde du site</string>
+    <string name="activity_log_currently_backing_up_message">Sauvegarde du site à partir du %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Création d’une sauvegarde téléchargeable</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Votre site a été sauvegardé avec succès</string>
+    <string name="activity_log_backup_finished_snackbar_message">Votre site a été sauvegardé avec succès\nSauvegardé à partir du %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Votre site est en cours de sauvegarde\nSauvegarde à partir du %1$s %2$s</string>
+    <string name="pick_audio">Sélectionner un fichier audio</string>
+    <string name="restore_complete_visit_site_button_content_description">Bouton Visiter le site</string>
+    <string name="restore_complete_done_button_content_description">Bouton Terminé</string>
+    <string name="restore_complete_header">Votre site a été restauré.</string>
+    <string name="restore_progress_footnote">Pas besoin d’attendre. Nous vous avertirons lorsque votre site aura été restauré.</string>
+    <string name="restore_progress_icon_content_description">Icône Restaurer le site</string>
+    <string name="restore_progress_description_with_two_parameters">Nous sommes en train de restaurer votre site tel qu’il était le %1$s %2$s.</string>
+    <string name="restore_progress_header">Restauration du site en cours</string>
+    <string name="restore_warning_action_button_content_description">Bouton Confirmer la restauration du site</string>
+    <string name="restore_warning_icon_content_description">Image d’un cercle rouge avec un point d’exclamation</string>
+    <string name="restore_warning_header">Avertissement</string>
+    <string name="restore_details_action_button_content_description">Bouton Restaurer le site</string>
+    <string name="restore_details_icon_content_description">Icône Restaurer</string>
+    <string name="restore_details_action_button">Restaurer le site</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s correspond au point sélectionné pour la restauration.</string>
+    <string name="restore_details_header">Restaurer le site</string>
+    <string name="restore_details_choose_items_header">Choisissez les éléments à restaurer :</string>
+    <string name="restore">Restaurer</string>
+    <string name="backup_download_complete_failed_icon_content_description">Icône de nuage avec le symbole X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Bouton Terminé</string>
+    <string name="backup_download_complete_failed_action_button">Terminé</string>
+    <string name="backup_download_complete_failed_title">Échec du téléchargement</string>
+    <string name="web_preview_tablet">Tablette</string>
+    <string name="web_preview_mobile">Portable</string>
+    <string name="quick_start_card_menu_remove">Ne plus afficher</string>
+    <string name="quick_start_card_menu_pin">Épingler ceci</string>
+    <string name="quick_start_dialog_review_pages_message_short">Sélectionnez %1$s Pages %2$s pour afficher votre liste de pages.</string>
+    <string name="quick_start_dialog_review_pages_message">Modifiez, ajoutez ou supprimez les pages de votre site.</string>
+    <string name="quick_start_dialog_review_pages_title">Passer en revue les pages du site</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Sélectionnez %1$s Page d’accueil %2$s pour modifier votre page d’accueil.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Sélectionnez %1$s Pages %2$s pour afficher votre liste de pages.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Modifiez, ajoutez ou supprimez du contenu depuis la page d\'accueil de votre site.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Modifier la page d\'accueil</string>
+    <string name="reader_menu_mark_as_unseen">Marquer comme non lu</string>
+    <string name="reader_menu_mark_as_seen">Marquer comme lu</string>
+    <string name="error_media_upload_failed_for_reason">Échec de chargement du média.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Espace de stockage disponible sur le site insuffisant.</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Impossible de basculer vers le statut Lu pour cet article</string>
+    <string name="reader_marked_post_as_unseen">Article marqué comme non lu</string>
+    <string name="reader_marked_post_as_seen">Article marqué comme lu</string>
+    <string name="threat_fix_all_status_error_message">Erreur lors de la récupération de l’état de la résolution. Veuillez contacter l’assistance.</string>
+    <string name="threat_fix_all_status_success_message_singular">La menace a bien été corrigée.</string>
+    <string name="threat_fix_all_error_message">Erreur lors de la correction de menaces. Veuillez contacter l’assistance.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Veuillez confirmer que vous souhaitez corriger une menace active.</string>
+    <string name="threat_fix_all_warning_title">Corriger l’ensemble des menaces</string>
+    <string name="threat_ignore_error_message">Une erreur s’est produite, l’erreur n’a pas pu être ignorée. Veuillez contacter l’assistance.</string>
+    <string name="threat_ignore_success_message">Menace ignorée.</string>
+    <string name="threat_fix_error_message">Erreur lors de la correction de la menace. Veuillez contacter l’assistance.</string>
+    <string name="threat_item_sub_header_status_ignored">Menace ignorée</string>
+    <string name="threat_item_sub_header_status_fixed_on">Menace résolue le %s</string>
+    <string name="threat_fixing">Menace en cours de correction…</string>
+    <string name="scan_history_ignored_threats_tab">Ignoré</string>
+    <string name="scan_history_no_threats_found">Aucun élément trouvé</string>
+    <string name="scan_history_fixed_threats_tab">Exact</string>
+    <string name="scan_history_all_threats_tab">Tout</string>
+    <string name="scan_scanning_title">Analyse des fichiers</string>
+    <string name="scan_preparing_to_scan_title">Préparation de l’analyse</string>
+    <string name="scan_history_menu_title">Historique</string>
+    <string name="scan_history">Analyser l’historique</string>
+    <string name="backup_active_filter_empty_subtitle">Essayez d’ajuster la période</string>
+    <string name="backup_active_filter_empty_title">Aucune sauvegarde ne correspond</string>
+    <string name="backup_empty_subtitle">Votre première sauvegarde apparaîtra ici dans les 24 heures et dès qu\'elle sera prête, vous recevrez une notification.</string>
+    <string name="backup_empty_title">Votre première sauvegarde sera bientôt prête.</string>
+    <string name="request_failed_message">Un problème est survenu lors du traitement de la demande. Veuillez réessayer plus tard.</string>
+    <string name="gutenberg_native_move_to_bottom">Déplacer tout en bas</string>
+    <string name="gutenberg_native_change_block_position">Modifier l’emplacement du bloc</string>
+    <string name="label_control_upload">Charger</string>
+    <string name="jetpack_icon_content_description">icône</string>
+    <string name="backup_download_complete_info">Nous vous avons également envoyé par e-mail un lien vers votre fichier.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Bouton Lien de partage</string>
+    <string name="backup_download_complete_download_action_button_content_description">Bouton Téléchargement</string>
+    <string name="backup_download_complete_icon_content_description">Icône de sauvegarde téléchargeable prête</string>
+    <string name="backup_download_complete_download_share_action_button">Lien de partage</string>
+    <string name="backup_download_complete_download_action_button">Téléchargement</string>
+    <string name="backup_download_complete_description_with_two_parameters">Nous avons créé une sauvegarde de votre site le %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Votre sauvegarde peut désormais être téléchargée</string>
+    <string name="backup_download_complete_page_title">Votre sauvegarde</string>
+    <string name="backup_download_progress_footnote">Pas besoin d’attendre. Nous vous avertirons lorsque votre sauvegarde sera prête.</string>
+    <string name="backup_download_progress_icon_content_description">Icône de sauvegarde téléchargeable en cours de création</string>
+    <string name="backup_download_progress_description_with_two_parameters">Nous créons une sauvegarde téléchargeable de votre site tel qu’il était le %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Création d’une sauvegarde téléchargeable de votre site en cours</string>
+    <string name="backup_download_progress_page_title">Télécharger la sauvegarde</string>
+    <string name="backup_download_another_download_running">Un autre téléchargement est en cours.</string>
+    <string name="backup_download_generic_failure">Un problème est survenu lors du traitement de la demande. Veuillez réessayer plus tard.</string>
+    <string name="backup_download_details_action_button_content_description">Créer un bouton de sauvegarde téléchargeable</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s est le point sélectionné pour créer une sauvegarde téléchargeable.</string>
+    <string name="gutenberg_native_image_link_url">URL du lien de l’image</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">partage de contenu</string>
+    <string name="suggestion_user">utilisateur</string>
+    <string name="suggestion_no_matching">Aucun(e) %s correspondant(e).</string>
+    <string name="suggestion_problem">Un problème est survenu lors du chargement des suggestions.</string>
+    <string name="suggestion_none">Aucune suggestion %s disponible.</string>
+    <string name="suggestion_selection_needed">Veuillez taper pour filtrer la liste de suggestions.</string>
+    <string name="threat_get_free_estimate">Recevoir un devis gratuit</string>
+    <string name="threat_ignore">Ignorer la menace</string>
+    <string name="threat_fix">Résoudre la menace</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan résoudra la menace.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan modifiera le fichier ou répertoire concerné.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan procédera à la mise à jour vers une version plus récente (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan supprimera le fichier ou répertoire concerné.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan remplacera le fichier ou répertoire concerné.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan ne peut pas résoudre cette menace automatiquement.\n Nous vous conseillons de procéder à une résolution manuelle. Vérifiez que WordPress, votre thème, ainsi que toutes vos extensions sont bien à jour, puis supprimez le code, le thème ou l’extension corrompu de votre site. \n \n\n Pour obtenir de l’aide pour éliminer cette menace, nous vous recommandons &lt;b&gt;Codeable&lt;/b&gt;, une plateforme fiable de freelances WordPress triés sur le volet.\n Un groupe d’experts en sécurité pourra vous venir en aide sur ces projets. Les prix vont de 70 à 120 $ par heure et vous pouvez obtenir une estimation gratuite, sans obligation de contrat.</string>
+    <string name="threat_fix_current_not_fixable_header">Résolution de la menace en cours</string>
+    <string name="threat_fix_fixed_header">Comment Jetpack a-t-il réparé ?</string>
+    <string name="threat_fix_default_header">Comment allons-nous y remédier ?</string>
+    <string name="threat_file_description">Menace détectée dans le fichier :</string>
+    <string name="threat_technical_details_header">Détails techniques</string>
+    <string name="threat_problem_header">Quel était le problème ?</string>
+    <string name="threat_details">Détails de la menace</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnérabilité détectée dans le thème</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnérabilité détectée dans l’extension</string>
+    <string name="threat_item_sub_header_file_signature">Menace détectée %s</string>
+    <string name="threat_item_sub_header_core_file">Vulnérabilité détectée dans WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Vulnérabilité diverse</string>
+    <string name="threat_item_header_vulnerable_theme">Thème vulnérable : %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Extension vulnérable : %s (version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s : modèle de code malveillant</string>
+    <string name="threat_item_header_database_threat">Menaces concernant la base de données %s</string>
+    <string name="threat_item_header_infected_core_file">%s : fichier core infecté</string>
+    <string name="threat_item_header_threat_found">Menace détectée</string>
+    <string name="threats_fix_all">Tout corriger</string>
+    <string name="scan_in_few_seconds">il y a quelques secondes</string>
+    <string name="scan_in_minutes_ago">il y a %s minute(s)</string>
+    <string name="scan_in_hours_ago">il y a %s heure(s)</string>
+    <string name="scan_this_site">ce site</string>
+    <string name="scan_idle_last_scan_description">La dernière analyse Jetpack exécutée le %s n’a détecté aucun risque. %s</string>
+    <string name="scan_idle_threats_found_title">Votre site est peut-être menacé.</string>
+    <string name="scan_idle_no_threats_found_title">Ne vous inquiétez pas.</string>
+    <string name="scan_again">Analyser de nouveau</string>
+    <string name="scan_now">Lancer une analyse</string>
+    <string name="scan_state_icon">Icône d’état de l’analyse</string>
+    <string name="backup">Sauvegardes</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtre Type d’activité (%s types sélectionnés)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (affichage de %s éléments)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtre Type d’activité</string>
+    <string name="activity_log_activity_type_empty_subtitle">Aucune activité n’est enregistrée dans la plage de dates sélectionnée.</string>
+    <string name="activity_log_activity_type_empty_title">Aucune activité disponible</string>
+    <string name="activity_log_activity_type_error_subtitle">Veuillez vérifier votre connexion internet et réessayer.</string>
+    <string name="activity_log_activity_type_error_title">Pas de connexion</string>
+    <string name="activity_log_activity_type_filter_active_label">Type d’activité (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtre Période</string>
+    <string name="activity_log_active_filter_empty_subtitle">Essayez d’ajuster les filtres Période et Type d’activité.</string>
+    <string name="activity_log_active_filter_empty_title">Aucun événement ne correspond</string>
+    <string name="backup_item_plugins">Extensions WordPress</string>
+    <string name="backup_item_themes">Thèmes WordPress</string>
+    <string name="backup_download_details_action_button">Créer un fichier téléchargeable</string>
+    <string name="backup_download_details_header">Créer une sauvegarde téléchargeable</string>
+    <string name="backup_download_details_page_title">Télécharger la sauvegarde</string>
+    <string name="backup_download">Sauvegarde téléchargée</string>
+    <string name="gutenberg_native_error">Erreur</string>
+    <string name="gutenberg_native_choose_file">Choisir un fichier</string>
+    <string name="activity_log_item_menu_download_backup_label">Télécharger la sauvegarde</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copier la version depuis cette application</string>
+    <string name="button_copy">Dupliquer</string>
+    <string name="toast_edit_story_update_in_progress_title">La story a été enregistrée, veuillez patienter…</string>
+    <string name="gutenberg_native_file_name">Nom du fichier</string>
+    <string name="gutenberg_native_file_block_settings">Réglages du bloc fichier</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Le téléversement des fichiers a échoué.\nVeuillez toucher pour accéder aux options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">L’enregistrement des fichiers a échoué.\nVeuillez toucher pour accéder aux options.</string>
+    <string name="gutenberg_native_edit_file">Modifier le fichier</string>
+    <string name="gutenberg_native_copy_file_url">Copier l’URL du fichier</string>
+    <string name="gutenberg_native_choose_a_file">Choisir un fichier</string>
+    <string name="new_site_creation_domain_header_title">Choisir un domaine</string>
+    <string name="my_site_btn_jetpack_settings">Réglages de Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Suivi de la discussion par e-mail</string>
+    <string name="reader_btn_follow_comments">Suivre la discussion par e-mail</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Impossible de se désabonner des commentaires pour cet article</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Impossible de s’abonner aux commentaires pour cet article</string>
+    <string name="reader_follow_comments_get_status_error">Erreur de récupération du statut d’abonnement pour l’article</string>
+    <string name="reader_follow_comments_unsubscribe_success">Bien désabonné·e des commentaires</string>
+    <string name="reader_follow_comments_subscribe_success">Bien abonné·e aux commentaires</string>
+    <string name="reader_follow_comments_bad_format_response">Réponse reçue non valide</string>
+    <string name="reader_follow_comments_null_response">Aucune réponse reçue</string>
+    <string name="activity_log_activity_type_filter_clear">Effacer</string>
+    <string name="activity_log_activity_type_filter_apply">Appliquer</string>
+    <string name="dialog_edit_story_unsupported_format_message">Une ou plusieurs diapositives n’ont pas été ajoutées à votre Story, car les Stories ne prennent pas en charge les fichiers GIF pour le moment. Veuillez plutôt choisir une image statique ou un arrière-plan vidéo.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Fichiers GIF non pris en charge</string>
+    <string name="dialog_edit_story_unrecoverable_message">Nous n’avons pas pu trouver les médias pour cette Story sur le site.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Impossible de modifier la Story</string>
+    <string name="dialog_edit_story_unavailable_message">Impossible de charger le média pour cette Story. Vérifiez votre connexion internet et réessayez dans un instant.</string>
+    <string name="dialog_edit_story_unavailable_title">Impossible de modifier la Story</string>
+    <string name="dialog_edit_story_limited_message">Cette Story a été modifiée sur un appareil différent et la possibilité de modifier certains objets peut être limitée.</string>
+    <string name="dialog_edit_story_limited_title">Modification de la Story limitée</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Le média a été supprimé. Essayez de créer à nouveau votre story.</string>
+    <string name="color_picker_label_background">Arrière-plan</string>
+    <string name="color_picker_label_text">Texte</string>
+    <string name="dialog_discard_story_ok_button_edit">Rejeter</string>
+    <string name="dialog_discard_story_message_edit">Aucune modification effectuée n’a été enregistrée.</string>
+    <string name="dialog_discard_story_title_edit">Annuler les modifications ?</string>
+    <string name="label_done_button">Terminé</string>
+    <string name="label_next_button">Suivant</string>
+    <string name="delete_button_alt">Supprimer</string>
+    <string name="hpp_choose_error">Une erreur s’est produite lors de la sélection du design.</string>
+    <string name="hpp_retry_error">Veuillez vérifier votre connexion internet, puis réessayez.</string>
+    <string name="hpp_error_subtitle">Appuyez sur Réessayer lorsque vous êtes de nouveau en ligne.</string>
+    <string name="hpp_error_title">Mises en page non disponibles hors connexion</string>
+    <string name="continue_site_credentials">Continuer avec les identifiants de connexion de la boutique</string>
+    <string name="login_find_your_connected_email">Trouver votre e-mail connecté</string>
+    <string name="reader_discover_no_posts_button_text">Suivre des sujets</string>
+    <string name="reader_discover_no_posts_subtitle">Essayez de suivre plus de sujets pour élargir la recherche</string>
+    <string name="reader_discover_no_posts_title">Pas d’articles récents.</string>
+    <string name="reader_discover_empty_title">Bienvenue !</string>
+    <string name="scan">Analyser</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; a répondu à votre article</string>
+    <string name="login_prologue_third_subtitle_two">Vous avez reçu &lt;b&gt;50 « J’aime »&lt;/b&gt; sur votre site aujourd\'hui</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; a aimé votre article</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Menu de bloc déroulant ouvert. Sélectionner un bloc.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menu de bloc déroulant fermé.</string>
+    <string name="hpp_skip_button">Passer</string>
+    <string name="hpp_choose_button">Choisir</string>
+    <string name="hpp_subtitle">Sélectionnez votre mise en page préférée pour la page d’accueil. Vous pourrez la personnaliser ou la modifier ultérieurement.</string>
+    <string name="hpp_title">Choisir un design</string>
+    <string name="mlp_network_error_subtitle">Touchez réessayer quand vous serez de nouveau en ligne ou créer un page blanche en utilisant le bouton ci-dessous.</string>
+    <string name="mlp_network_error_title">Les mises en page ne sont pas disponibles hors connexion</string>
+    <string name="mlp_error_subtitle">Touchez réessayer ou créez une page blanche en utilisant le bouton ci-dessous.</string>
+    <string name="mlp_error_title">Les mises en page ne sont pas disponibles suite à une erreur.</string>
+    <string name="prepublishing_nudges_add_category_button">Ajouter une catégorie</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Ajouter une nouvelle catégorie</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Catégories</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Non définie</string>
+    <string name="prepublishing_nudges_categories_action">Catégories</string>
+    <string name="login_prologue_fifth_caption_three">Musées à Londres</string>
+    <string name="login_prologue_fifth_caption_two">Les meilleurs fans du monde</string>
+    <string name="login_prologue_fifth_caption_one">Mon top 10 des cafés</string>
+    <string name="login_prologue_fifth_tag_six">Politique</string>
+    <string name="login_prologue_fifth_tag_five">Musique</string>
+    <string name="login_prologue_fifth_tag_four">Jardinage</string>
+    <string name="login_prologue_fifth_tag_three">Football</string>
+    <string name="login_prologue_fifth_tag_two">Cuisine</string>
+    <string name="login_prologue_fifth_tag_one">Art</string>
+    <string name="login_prologue_fifth_subtitle_three">Semaine du Rock n’ Roll</string>
+    <string name="login_prologue_fifth_subtitle_two">Infos du web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">J’apprécie le travail du photographe Cameron Karsten. J’essaierai ses techniques sur mes prochaines photos.</string>
+    <string name="login_prologue_second_subtitle_one">Inspiration</string>
+    <string name="login_prologue_title_fifth">Suivez vos sites préférés et découvrez de nouveaux blogs.</string>
+    <string name="login_prologue_title_fourth">Regardez votre audience grossir avec les statistiques approfondies.</string>
+    <string name="login_prologue_title_third">Voir les commentaires et notifications en temps réel.</string>
+    <string name="login_prologue_title_second">Avec cet éditeur puissant, vous pouvez publier de n’importe où.</string>
+    <string name="login_prologue_title_first">Bienvenue sur le constructeur de site le plus populaire au monde.</string>
+    <string name="media_loading_failed">Échec du chargement du média</string>
+    <string name="reader_discover_recommended_blogs_header">Sites à suivre</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Nous travaillons dur pour ajouter plus de blocs à chaque version.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">« %s » n’est pas entièrement pris en charge</string>
+    <string name="gutenberg_native_help_button">Bouton d’aide</string>
+    <string name="gutenberg_native_edit_using_web_editor">Modifier avec l’éditeur web</string>
+    <string name="gutenberg_native_choose_images">Choisir des images</string>
+    <string name="stories_intro_create_story_post_label">Créer une publication de story</string>
+    <string name="stories_intro_description_second">Elles sont publiées en tant que nouvel article de blog sur votre site afin que votre public ne rate jamais rien.</string>
+    <string name="stories_intro_title_second">Les publications de story ne disparaissent pas.</string>
+    <string name="stories_intro_description_first">Combinez des photos, des vidéos et du texte pour créer des publications de story engageantes et sur lesquelles on peut appuyer. Vos visiteurs apprécieront.</string>
+    <string name="stories_intro_title_first">Maintenant, les stories sont pour tout le monde</string>
+    <string name="stories_intro_image_caption_second">Exemple de titre de story</string>
+    <string name="stories_intro_image_caption_first">Comment créer une publication de story</string>
+    <string name="stories_intro_main_title">Présentation des publications de story</string>
+    <string name="mlp_notice_blank_page_created">Page vide créée</string>
+    <string name="mlp_notice_page_created">Page créée</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s s’est vu refuser l’accès à vos photos. Pour corriger cela, modifiez vos autorisations et activez %2$s et %3$s.</string>
+    <string name="media_insert_failed">L’insertion du média a échoué.</string>
+    <string name="media_insert_failed_with_reason">L’insertion du média a échoué : %s</string>
+    <string name="photo_picker_wordpress_media_library">Choisir dans la bibliothèque des médias WordPress</string>
+    <string name="reader_label_toolbar_back">Retour</string>
+    <string name="reader_discover_empty_button_text">Premiers pas</string>
+    <string name="reader_discover_empty_subtitle">Suivre les sujets pour découvrir de nouveaux blogs</string>
+    <string name="reader_post_details_header_by_author_name">Par</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Ce référent ne peut pas être marqué comme indésirable</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Marquer comme sain</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Marquer comme indésirable</string>
+    <string name="stats_referrer_popup_menu_open_website">Ouvrir le site web</string>
+    <string name="media_uploading_gif_library_photo">Média gif en cours de téléversement</string>
+    <string name="media_uploading_stock_library_photo">Média de stock en cours de téléversement</string>
+    <string name="media_uploading_default">Média en cours de téléversement</string>
+    <string name="gutenberg_native_select_item">Sélectionner un élément</string>
+    <string name="gutenberg_native_search_or_type_url">Rechercher ou saisir une URL</string>
+    <string name="gutenberg_native_page_break">Saut de page</string>
+    <string name="gutenberg_native_add_this_telephone_link">Lien d’ajout de ce téléphone</string>
+    <string name="gutenberg_native_add_this_link">Ajouter ce lien</string>
+    <string name="gutenberg_native_add_this_email_link">Lien d’ajout de cet e-mail</string>
+    <string name="suggestion_no_connection">Aucune connexion internet.\nLes suggestions ne sont pas disponibles.</string>
+    <string name="typeface_label_shrikhand">Gras</string>
+    <string name="typeface_label_space_mono">Moderne</string>
+    <string name="typeface_label_pacifico">Ludique</string>
+    <string name="typeface_label_oswald">Forte</string>
+    <string name="typeface_label_libre_baskerville">Classique</string>
+    <string name="typeface_label_nunito">Décontractée</string>
+    <string name="toast_capture_operation_permission_needed">Vous devez accorder l’autorisation d’enregistrement audio de l’application afin d’enregistrer des vidéos.</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s sélectionné </string>
+    <string name="login_get_link_by_email">Obtenir un lien de connexion par e-mail.</string>
+    <string name="email_not_registered_wpcom">Hum, nous ne trouvons pas de compte WordPress.com connecté à cet adresse e-mail.</string>
+    <string name="permission_microphone">Microphone</string>
+    <string name="comment_unable_to_show_error">Impossible d’afficher ce commentaire</string>
+    <string name="media_browse_for_items">Parcourir les éléments.</string>
+    <string name="reader_menu_report_post">Signaler cet article</string>
+    <string name="reader_welcome_banner">Bienvenue sur le Lecteur. Découvrez des millions de blogs à portée de main.</string>
+    <string name="error_media_xmlrcp_server_error">Une erreur interne du serveur s’est produite</string>
+    <string name="error_media_xmlrpc_not_allowed">Votre action n’est pas autorisée</string>
+    <string name="show_n_hidden_items_desc">encore %1$s éléments</string>
+    <string name="gutenberg_native_select_a_layout">Sélectionner une mise en page</string>
+    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Note : la mise en page des colonnes peut varier selon les thèmes et tailles d’écran</string>
+    <string name="create_post_story_fab_tooltip">Créer un article ou une story</string>
+    <string name="create_page_fab_tooltip">Créer une page</string>
+    <string name="create_post_fab_tooltip">Créer un article</string>
+    <string name="reader_discover_interests_header">Vous pourriez aimer</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Masquer</string>
+    <string name="gutenberg_native_video_caption_empty">Légende de la vidéo. Vide</string>
+    <string name="gutenberg_native_updates_the_title">Mise à jour du titre.</string>
+    <string name="gutenberg_native_paste_block_after">Coller le bloc après</string>
+    <string name="gutenberg_native_page_title_s">Titre de la page. %s</string>
+    <string name="gutenberg_native_page_title_empty">Titre de la page. Vide</string>
+    <string name="toast_error_playing_video">Une erreur s’est produite lors de la lecture de votre vidéo</string>
+    <string name="camera_error">Cet appareil ne prend pas en charge l’API Camera2.</string>
+    <string name="toast_error_saving_video">La vidéo n’a pas pu être enregistrée</string>
+    <string name="toast_error_saving_image">Erreur lors de l’enregistrement de l’image</string>
+    <string name="toast_capture_operation_in_progress">Opération en cours, réessayez</string>
+    <string name="toast_story_page_not_found">Diapositive Story introuvable</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Afficher le stockage</string>
+    <string name="dialog_insufficient_device_storage_error_message">Nous devons enregistrer la story sur votre appareil avant de pouvoir la publier. Vérifiez les réglages de votre stockage et supprimez des fichiers pour libérer de l’espace.</string>
+    <string name="dialog_insufficient_device_storage_error_title">Stockage de l’appareil insuffisant</string>
+    <string name="dialog_story_saving_error_message">Réessayez d’enregistrer ou supprimez les diapositives, puis essayez de publier à nouveau votre story.</string>
+    <string name="dialog_story_saving_error_title_plural">Impossible d’enregistrer les %1$d diapositives</string>
+    <string name="dialog_story_saving_error_title_singular">Impossible d’enregistrer une diapositive </string>
+    <string name="story_saving_failed_quick_action_manage">Gérer</string>
+    <string name="story_saving_failed_message_plural">%1$d les diapositives nécessitent une action</string>
+    <string name="story_saving_failed_message_singular">une diapositive nécessite une action</string>
+    <string name="story_saving_failed_title">Impossible de charger « %1$s »</string>
+    <string name="story_saving_snackbar_finished_with_error">Impossible de charger « %1$s »</string>
+    <string name="story_saving_snackbar_finished_successfully">« %1$s » publié</string>
+    <string name="story_saving_snackbar_started">Chargement de « %1$s »…</string>
+    <string name="story_saving_subtitle_frames_remaining_plural">%1$d diapositives restantes</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">une diapositive restante</string>
+    <string name="story_saving_title_several">plusieurs stories</string>
+    <string name="story_saving_title">Enregistrement de « %1$s »…</string>
+    <string name="story_saving_untitled">Sans titre</string>
+    <string name="dialog_discard_story_ok_button">Annuler</string>
+    <string name="dialog_discard_story_message">Votre story ne sera pas enregistrée en tant que brouillon.</string>
+    <string name="dialog_discard_story_title">Annuler la publication de la story ?</string>
+    <string name="dialog_discard_page_ok_button">Supprimer </string>
+    <string name="dialog_discard_errored_page_message">Cette diapositive n’a pas encore été enregistrée. Si vous supprimez cette diapositive, vous perdrez toutes les modifications que vous avez apportées.</string>
+    <string name="dialog_discard_page_message">Cette diapositive sera supprimée de votre story.</string>
+    <string name="dialog_discard_page_title">Supprimer la diapositive de la story ?</string>
+    <string name="label_text_color_button">Modifier la couleur du texte</string>
+    <string name="label_text_alignment_button">Modifier l’alignement du texte</string>
+    <string name="label_frame_errored">erroné</string>
+    <string name="label_frame_selected_border">Sélectionnée</string>
+    <string name="label_frame_unselected_border">Desélectionnée </string>
+    <string name="label_frame_image">Diapositive</string>
+    <string name="label_retry_icon">Réessayer</string>
+    <string name="label_saved_icon">Enregistrée</string>
+    <string name="label_close_button">Fermer</string>
+    <string name="label_share_to">Partager vers</string>
+    <string name="label_snackbar_share">PARTAGER</string>
+    <string name="label_snackbar_loop_frame_saved">Enregistré dans les photos</string>
+    <string name="label_control_retry">Réessayer</string>
+    <string name="label_control_saved">Enregistré</string>
+    <string name="label_control_saving">Enregistrement</string>
+    <string name="label_control_flash">Flash</string>
+    <string name="label_control_flip_camera">Retourner</string>
+    <string name="sound_button_alt">Son</string>
+    <string name="text_button_alt">Texte</string>
+    <string name="stickers_button_alt">Autocollants</string>
+    <string name="flash_button_alt">Flash</string>
+    <string name="flip_button_alt">Retourner l’appareil photo</string>
+    <string name="capture_button_alt">Capturer</string>
+    <string name="mlp_preview_page">Prévisualiser</string>
+    <string name="mlp_create_page">Créer une page</string>
+    <string name="mlp_create_blank_page">Créer une page vide</string>
+    <string name="mlp_choose_layout_subtitle">Commencez en choisissant parmi une large variété de mises en page prédéfinies. Ou commencez simplement avec une page vide.</string>
+    <string name="mlp_choose_layout_title">Choisissez une mise en page</string>
+    <string name="prepublishing_nudges_story_title_hint">Donnez un titre à votre story</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Créez un article ou une story</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Créez un article, une page ou une story</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Appuyez sur %1$s Créer. %2$s Puis sélectionnez &lt;b&gt;Article de blog&lt;/b&gt;</string>
+    <string name="photo_picker_choose_file">Choisir depuis l’appareil</string>
+    <string name="my_site_bottom_sheet_add_story">Publication de story</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">La modification d’icônes de site sur des sites WordPress auto-hébergés requiert l’extension Jetpack.</string>
+    <string name="reader_toast_err_page_jump_not_found">Lien d’ancrage lié introuvable</string>
+    <string name="error_media_quota_exceeded_toast">Impossible de charger le fichier.\nQuota de stockage dépassé.</string>
+    <string name="error_media_quota_exceeded">Quota de stockage dépassé</string>
+    <string name="pick_file">Ajouter un fichier</string>
+    <string name="gutenberg_native_replace_video">Remplacer la vidéo</string>
+    <string name="gutenberg_native_replace_image_or_video">Remplacer l’image ou la vidéo</string>
+    <string name="gutenberg_native_choose_video">Choisir une vidéo</string>
+    <string name="gutenberg_native_choose_image_or_video">Choisir une image ou une vidéo</string>
+    <string name="gutenberg_native_choose_image">Choisir une image</string>
+    <string name="gutenberg_native_block_removed">Bloc supprimé</string>
+    <string name="enter_your_site_address">Saisissez l’adresse de votre site actuel</string>
+    <string name="signup_confirmation_title">Confirmation de l’inscription</string>
+    <string name="continue_with_google_terms_of_service_text">Si vous continuez avec Google sans disposer au préalable d’un compte WordPress.com, vous créez un compte et acceptez nos %1$sconditions d’utilisation%2$s.</string>
+    <string name="continue_terms_of_service_text">En poursuivant, vous acceptez nos %1$sConditions d’utilisation%2$s.</string>
+    <string name="signup_confirmation_message">Nous utiliserons cette adresse e-mail pour créer votre nouveau compte WordPress.com.</string>
+    <string name="signup_magic_link_message">Nous vous avons envoyé un lien par e-mail pour créer votre nouveau compte WordPress.com. Consultez vos e-mails sur cet appareil et appuyez sur le lien dans l’e-mail que vous avez reçu de WordPress.com.</string>
+    <string name="enter_account_info_for_site">Saisissez vos informations de compte pour %1$s.</string>
+    <string name="login_or">ou</string>
+    <string name="continue_google_button_suffix">Continuer avec Google</string>
+    <string name="login_find_your_site_adress">Trouver l’adresse de votre site</string>
+    <string name="login_done">Terminé</string>
+    <string name="magic_link_not_seeing_email_message">Vous ne voyez pas l’e-mail ? Vérifiez votre dossier de courrier indésirable.</string>
+    <string name="login_magic_links_sent_label">Consultez vos e-mails sur cet appareil et appuyez sur le lien dans l’e-mail que vous avez reçu de WordPress.com.</string>
+    <string name="login_magic_links_label">Nous vous enverrons par e-mail un lien qui vous connectera instantanément, sans mot de passe.</string>
+    <string name="check_email">Vérifier les e-mails</string>
+    <string name="get_started">Premiers pas</string>
+    <string name="enter_email_to_continue_wordpress_com">Entrez votre adresse e-mail pour vous connecter ou créez un compte WordPress.com.</string>
+    <string name="or_type_your_password">Vous pouvez également saisir votre mot de passe</string>
+    <string name="create_account">Créer un compte</string>
+    <string name="send_link_by_email">Envoyer un lien par e-mail</string>
+    <string name="reset_your_password">Réinitialiser votre mot de passe</string>
+    <string name="reader_error_request_failed_title">Un problème est survenu lors du traitement de la demande. Veuillez réessayer plus tard.</string>
+    <string name="quick_start_list_update_site_title_title">Définir un titre pour votre site</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Appuyer sur &lt;b&gt;%1$s&lt;/b&gt; pour définir un nouveau titre</string>
+    <string name="dialog_confirm_trash_losing_local_changes_message">Supprimer cet article va également supprimer les modifications locales, confirmez-vous vous vouloir continuer ?</string>
+    <string name="gutenberg_native_s_block_options">Option du bloc %s</string>
+    <string name="gutenberg_native_duplicate_block">Dupliquer le bloc</string>
+    <string name="gutenberg_native_copy_block">Copier le bloc</string>
+    <string name="gutenberg_native_copied_block">Bloc copié</string>
+    <string name="gutenberg_native_block_pasted">Bloc collé</string>
+    <string name="gutenberg_native_block_duplicated">Bloc dupliqué</string>
+    <string name="gutenberg_native_block_cut">Bloc coupé</string>
+    <string name="gutenberg_native_block_copied">Bloc copié</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">Le titre du site peut seulement être changé par une personne avec un rôle d’administrateur.</string>
+    <string name="my_site_title_changer_dialog_hint">Le titre du site est affiché dans la barre de titre du navigateur et est affiché dans l’en-tête de la plupart des thèmes.</string>
+    <string name="reader_title_tag_preview">Sujet</string>
+    <string name="error_update_site_title_network">Impossible de mettre à jour le titre du site. Vérifier votre connexion réseau et réessayez.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Modifications non enregistrées</string>
+    <string name="gutenberg_native_open_link_in_a_browser">Ouvrir le lien dans un navigateur</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Allez à la personnalisation du dégradé</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Allez au sélecteur de couleurs personnalisées</string>
+    <string name="gutenberg_native_gradient_type">Type de dégradé</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Touchez deux fois pour sélectionner l’option</string>
+    <string name="gutenberg_native_customize_gradient">Personnaliser le dégradé</string>
+    <string name="pages_list_author">Auteur de la page</string>
+    <string name="photo_picker_use_gif">Utiliser ce GIF</string>
+    <string name="error_media_thumbnail_not_loaded">La miniature n’a pas pu être chargée</string>
+    <string name="menu_content_info">Structure du contenu</string>
+    <string name="everyone">Tout le monde</string>
+    <string name="me">Moi</string>
+    <string name="gutenberg_native_dismiss">Ignorer</string>
+    <string name="prepublishing_nudges_home_tags_not_set">Non défini</string>
+    <string name="prepublishing_tags_description">Les étiquettes indiquent aux lecteurs de quoi traite l’article.</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Date de publication</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Ajouter des étiquettes</string>
+    <string name="prepublishing_nudges_back_button">Précédent</string>
+    <string name="prepublishing_nudges_home_save_button">Enregistrer maintenant</string>
+    <string name="prepublishing_nudges_home_submit_button">Soumettre maintenant</string>
+    <string name="prepublishing_nudges_home_schedule_button">Planifier maintenant</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Publication sur</string>
+    <string name="prepublishing_nudges_tags_action">Étiquettes</string>
+    <string name="prepublishing_nudges_publish_action">Date de publication</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Annuler</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Passer en brouillon</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_message">Les articles dans la corbeille ne peuvent pas être modifier. Voulez-vous changer le statut de cet article vers « brouillon » pour pouvoir travailler dessus ?</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">Déplacer l’article vers Brouillons ?</string>
+    <string name="reader_label_choose_your_interests">Choisir vos thèmes</string>
+    <string name="reader_choose_interests_content_description">Choisir vos thèmes</string>
+    <string name="reader_btn_done">Terminé</string>
+    <string name="reader_btn_select_few_interests">Sélectionnez-en quelques-uns pour continuer.</string>
+    <string name="post_status_post_published">Publié</string>
+    <string name="post_status_post_trashed">Mis à la corbeille</string>
+    <string name="post_status_post_scheduled">Planifié</string>
+    <string name="publish_date">Date de publication</string>
+    <string name="ccpa_privacy_notice_read">Lisez l’avis de confidentialité CCPA</string>
+    <string name="ccpa_privacy_notice_caption">Loi sur la protection du consommateur de Californie (« CCPA ») nous oblige à fournir aux résidents de Californie certaines informations supplémentaires sur les catégories d’informations personnelles que nous recueillons et partageons, où nous obtenons ces informations personnelles, et comment et pourquoi nous les utilisons.</string>
+    <string name="ccpa_privacy_notice_header">Avis de confidentialité pour les utilisateurs californiens</string>
+    <string name="status_and_visibility">État et visibilité</string>
+    <string name="update_now">Mettre à jour maintenant</string>
+    <string name="gutenberg_native_open_block_actions_menu">Ouvrir le menu d’actions du bloc</string>
+    <string name="gutenberg_native_move_to_top">Déplacer tout en haut</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Appuyer deux fois pour ouvrir la feuille du bas avec des options disponibles</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Appuyer deux fois pour ouvrir la feuille d’action avec des options disponibles</string>
+    <string name="pages_cannot_be_started">Impossible d’ouvrir des pages pour le moment. Réessayez ultérieurement.</string>
+    <string name="pages_set_as_posts_page">Définir comme page d’articles</string>
+    <string name="pages_set_as_homepage">Définir comme page d’accueil</string>
+    <string name="suggestion_invalid">%s n’est pas un(e) %s valide</string>
+    <string name="site_settings_select_page">Sélectionner une page</string>
+    <string name="site_settings_posts_page">Page des articles</string>
+    <string name="site_settings_static_homepage">Page d’accueil statique</string>
+    <string name="site_settings_classic_blog">Blog classique</string>
+    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">La page d’accueil sélectionnée et la page des articles ne peuvent pas être la même.</string>
+    <string name="site_settings_failed_update_homepage_settings">La mise à jour des paramètres de la page d’accueil a échoué, vérifiez votre connexion internet</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Impossible d’enregistrer les paramètres de la page d’accueil avant le chargement des pages</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Impossible d’enregistrer les paramètres de la page d’accueil</string>
+    <string name="site_settings_accept_homepage">Accepter</string>
+    <string name="site_settings_failed_to_load_pages">Échec du chargement des pages</string>
+    <string name="site_settings_homepage_settings_description">Choisissez entre une page d’accueil qui affiche vos derniers articles (blog classique) ou une page fixe/statique.</string>
+    <string name="site_settings_homepage_settings">Paramètres de la page d’accueil</string>
+    <string name="site_settings_homepage">Page d’accueil</string>
+    <string name="page_posts_page_update_failed">Échec de la mise à jour de la page des articles</string>
+    <string name="page_posts_page_successfully_updated">Page des articles mise à jour avec succès</string>
+    <string name="page_homepage_update_failed">Échec de la mise à jour de la page d’accueil</string>
+    <string name="page_homepage_successfully_updated">Page d’accueil mise à jour avec succès</string>
+    <string name="page_cannot_set_posts_page">Pour régler la page des articles, activez « Page d’accueil statique » dans les réglages du site</string>
+    <string name="page_cannot_set_homepage">Pour régler la page d’accueil, activez « Page d’accueil statique » dans les réglages du site</string>
+    <string name="gutenberg_native_select_a_color">Sélectionnez une couleur</string>
+    <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toucher deux fois pour aller aux réglages de couleur</string>
+    <string name="reader_empty_followed_blogs_description">Lorsque vous suivez des sites, vous verrez leur contenu ici</string>
+    <string name="feature_announcement_find_out_mode">En savoir plus</string>
+    <string name="feature_announcement_dialog_label">Quoi de neuf dans WordPress</string>
+    <string name="insert_label_with_count">Insérer %d</string>
+    <string name="crop">rogner</string>
+    <string name="error_failed_to_load_into_file">Erreur de chargement dans le fichier, veuillez réessayer.</string>
+    <string name="preview_image_thumbnail_description">Prévisualiser l’image de miniature</string>
+    <string name="photo_picker_use_media">Utiliser ce média</string>
+    <string name="photo_picker_use_video">Utiliser cette vidéo</string>
+    <string name="photo_picker_photo_or_video_title">Choisir un média</string>
+    <string name="photo_picker_video_title">Choisir une vidéo</string>
+    <string name="site_picker_ask_site_select">Impossible de sélectionner le site. Veuillez réessayer.</string>
+    <string name="sitepicker_continue_flow">Continuer</string>
+    <string name="reader_reblog_error">Échec du reblogue</string>
+    <string name="reader_no_site_to_reblog_action">Gérer les sites</string>
+    <string name="reader_no_site_to_reblog_detail">Une fois que vous avez créé un site WordPress.com, vous pouvez rebloguer un contenu que vous avez aimé sur votre propre site.</string>
+    <string name="reader_no_site_to_reblog_title">Aucun site WordPress.com disponible</string>
+    <string name="whats_new_in_version_title">Quoi de neuf ?</string>
+    <string name="comment_q_action_copied_url">Adresse du lien copiée</string>
+    <string name="copy_link_address">Copier l’adresse du lien</string>
+    <string name="comment_share_link_via">Partager via</string>
+    <string name="comment_toast_err_share_intent">Impossible de partager</string>
+    <string name="button_insert">Insérer</string>
+    <string name="continue_label">Continuer</string>
+    <string name="copy_text">Copier</string>
+    <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Déplace le bloc à droite de la position %1$s vers la position %2$s</string>
+    <string name="gutenberg_native_move_block_right">Déplacer le bloc à droite</string>
+    <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Déplace le bloc à gauche de la position %1$s vers la position %2$s</string>
+    <string name="gutenberg_native_move_block_left">Déplacer le bloc à gauche</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toucher deux fois pour déplacer le bloc à droite</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toucher deux fois pour déplacer le bloc à gauche</string>
+    <string name="new_site_creation_creating_site_loading_4">Création du tableau de bord</string>
+    <string name="new_site_creation_creating_site_loading_3">Configuration du thème</string>
+    <string name="new_site_creation_creating_site_loading_2">Ajout des fonctionnalités du site</string>
+    <string name="new_site_creation_creating_site_loading_1">Saisie de l’URL du site</string>
+    <string name="new_site_creation_creating_site_loading_subtitle">Votre site sera prêt rapidement.</string>
+    <string name="new_site_creation_creating_site_loading_title">Hourra !\nC’est presque fini.</string>
+    <string name="pages_and_posts_cancel_auto_upload">Annuler le téléversement</string>
+    <string name="gif_list_search_returned_unknown_error">Il y a eu un problème durant le traitement de la demande</string>
+    <string name="gif_powered_by_tenor">Propulsé par Tenor</string>
+    <string name="gif_picker_search_hint">Chercher « Ténor »</string>
+    <string name="photo_picker_gif">Choisir parmi « Ténor »</string>
+    <string name="weekday_saturday">Samedi</string>
+    <string name="weekday_friday">Vendredi</string>
+    <string name="weekday_thursday">Jeudi</string>
+    <string name="weekday_wednesday">Mercredi</string>
+    <string name="weekday_tuesday">Mardi</string>
+    <string name="weekday_monday">Lundi</string>
+    <string name="weekday_sunday">Dimanche</string>
+    <string name="media_accessing_failed">Échec d’accès au contenu d’un site privé. Certains médias peuvent être indisponibles</string>
+    <string name="media_accessing_progress">Accéder au contenu d’un site privé</string>
+    <string name="error_failed_to_crop_and_save_image">Échec du cadrage et de l’enregistrement de l’image, veuillez réessayer.</string>
+    <string name="failed_to_load_image_tap_to_retry">Échec de l’insertion de l’image.\nVeuillez toucher pour recommencer.</string>
+    <string name="preview_image_description">Afficher l’aperçu de l’image</string>
+    <string name="error_unknown_page_type">Format de page inconnu</string>
+    <string name="error_page_not_submitted">Nous ne pouvons ni terminer cette action ni envoyer cette page à vérifier.</string>
+    <string name="error_page_not_scheduled">Nous ne pouvons ni terminer cette action ni planifier cette page.</string>
+    <string name="error_page_not_published_private">Nous ne pouvons ni terminer cette action ni publier cette page privée.</string>
+    <string name="error_page_not_published">Nous ne pouvons ni terminer cette action ni publier cette page.</string>
+    <string name="error_page_not_submitted_retrying">Nous ne pouvons pas envoyer cette page à vérifier mais nous réessayerons ultérieurement. </string>
+    <string name="error_page_not_scheduled_retrying">Nous ne pouvons pas planifier cette page mais nous réessayerons ultérieurement.</string>
+    <string name="error_page_not_published_retrying_private">Nous ne pouvons pas publier cette page privée mais nous réessayerons ultérieurement.</string>
+    <string name="error_page_not_published_retrying">Nous ne pouvons pas publier cette page mais nous réessayerons ultérieurement.</string>
+    <string name="error_media_recover_page_not_submitted">Nous ne pouvons pas téléverser ce média et nous ne pouvons pas envoyer cette page à vérifier. </string>
+    <string name="error_media_recover_page_not_scheduled">Nous ne pouvons pas téléverser ce média et nous ne pouvons pas planifier cette page.</string>
+    <string name="error_media_recover_page_not_published_private">Nous ne pouvons pas téléverser ce média et nous ne pouvons pas publier cette page privée.</string>
+    <string name="error_media_recover_page_not_published">Nous ne pouvons pas téléverser ce média et nous ne pouvons pas publier cette page.</string>
+    <string name="page_waiting_for_connection_draft">Nous enregistrerons votre brouillon lorsque votre appareil sera de nouveau connecté</string>
+    <string name="page_waiting_for_connection_private">Nous publierons votre page privée lorsque votre appareil sera de nouveau en ligne.</string>
+    <string name="page_waiting_for_connection_scheduled">Nous planifierons votre page lorsque votre appareil sera de nouveau en ligne.</string>
+    <string name="page_waiting_for_connection_pending">Nous enverrons votre page à vérifier lorsque votre appareil sera de nouveau en ligne.</string>
+    <string name="page_waiting_for_connection_publish">Nous publierons votre page lorsque votre appareil sera de nouveau en ligne.</string>
+    <string name="page_queued">Page placée en file d’attente</string>
+    <string name="page_uploading">Téléchargement de la page</string>
+    <string name="error_publish_page_no_network">L’appareil est hors ligne. Page sauvegardée localement.</string>
+    <string name="local_page_autosave_revision_available">Vous avez apporté des modifications non enregistrées à cette page.</string>
+    <string name="editor_uploading_page">Votre page est en cours de chargement</string>
+    <string name="editor_page_saved_locally_failed_media">Cette page a des fichiers joints dont le téléchargement a échoué. Elle a été enregistrée localement.</string>
+    <string name="editor_page_saved_locally">Page enregistrée sur l’appareil</string>
+    <string name="editor_page_saved_online">Page enregistrée en ligne</string>
+    <string name="quickpress_shortcut_activity_label">Sélectionner le blog pour le raccourci QuickPress</string>
+    <string name="app_theme_default">Défini par Battery Saver</string>
+    <string name="app_theme_dark">Sombre</string>
+    <string name="app_theme_light">Claire</string>
+    <string name="app_theme">Apparence</string>
+    <string name="dialog_confirm_autosave_body_first_part_for_page">Vous avez récemment apporté des modifications à cette page, mais ne les avez pas enregistrées. Choisissez une version à charger :\n\n</string>
+    <string name="gutenberg_native_show_post_content">Afficher le contenu de l’article</string>
+    <string name="gutenberg_native_only_show_excerpt">N’afficher que l’extrait</string>
+    <string name="gutenberg_native_link_to">Lier à</string>
+    <string name="gutenberg_native_link_settings">Réglages du lien</string>
+    <string name="gutenberg_native_excerpt_length_words">Longueur de l’extrait (mots)</string>
+    <string name="gutenberg_native_customize">PERSONNALISER</string>
+    <string name="gutenberg_native_video_settings">Réglages vidéo</string>
+    <string name="gutenberg_native_add_paragraph_block">Ajouter un bloc paragraphe</string>
+    <string name="create_post_page_fab_tooltip_contributors">Créer un article</string>
+    <string name="post_list_tab_trashed_posts">Mis à la corbeille</string>
+    <string name="post_list_tab_scheduled_posts">Planifié</string>
+    <string name="post_list_tab_published_posts">Publié</string>
+    <string name="sharing_facebook_account_must_have_pages">La connexion à Facebook ne trouve aucune page. Publicize ne peut pas se connecter aux profils, seulement aux pages publiées.</string>
+    <string name="dialog_title_sharing_facebook_account_must_have_pages">Non connecté</string>
+    <string name="notifications_tab_title_likes">J’aime</string>
+    <string name="notifications_tab_title_follows">Abonnements</string>
+    <string name="notifications_tab_title_comments">Commentaires</string>
+    <string name="notifications_tab_title_unread_notifications">Non lu</string>
+    <string name="dlg_cancel_action_dont_trash">Ne pas supprimer</string>
+    <string name="dlg_confirm_action_trash">Mettre à la corbeille</string>
+    <string name="stats_insights_management_activity">Activité</string>
+    <string name="stats_insights_management_posts_and_pages">Articles et pages</string>
+    <string name="stats_insights_management_general">Général</string>
+    <string name="stats_management_screen_title">Ajouter une nouvelle carte</string>
+    <string name="stats_management_add_new_stats_card">Ajouter une nouvelle carte de statistiques</string>
+    <string name="reader_self_hosted_select_filter">Utiliser le bouton de filtre pour trouver des articles sur des sujets spécifiques</string>
+    <string name="reader_bottom_sheet_content_description">Sélectionner une étiquette ou un site, fenêtre contextuelle</string>
+    <string name="reader_btn_select_filter_content_description">Sélectionner un site ou une étiquette pour filtrer des articles</string>
+    <string name="reader_btn_remove_filter_content_description">Supprimer le filtre actuel</string>
+    <string name="reader_title_subs">Gérer les sujets et les sites</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">Se connecter à WordPress.com</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Se connecter à WordPress.com pour voir les derniers articles à partir des sujets que vous suivez.</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Se connecter à WordPress.com pour voir les derniers articles à partir des sites que vous suivez</string>
+    <string name="gutenberg_native_replace_current_block">Remplacer le bloc actuel</string>
+    <string name="gutenberg_native_add_to_end">Ajouter à la fin</string>
+    <string name="gutenberg_native_add_to_beginning">Ajouter au début</string>
+    <string name="gutenberg_native_add_block_before">Ajouter le bloc avant</string>
+    <string name="gutenberg_native_add_block_after">Ajouter le bloc après</string>
+    <string name="reader_filter_empty_tags_action">Ajouter un sujet</string>
+    <string name="reader_filter_empty_sites_action">S’abonner au site</string>
+    <string name="reader_filter_empty_tags_list">Vous pouvez suivre les articles relatifs à un thème particulier en ajoutant un sujet.</string>
+    <string name="reader_filter_empty_sites_list">Découvrir les derniers articles des sites que vous suivez</string>
+    <string name="reader_filter_main_title">Abonné</string>
+    <string name="reader_filter_cta">Filtrer</string>
+    <string name="gutenberg_native_video_caption_s">Sous-titre vidéo. %s</string>
+    <string name="gutenberg_native_edit_video">Modifier la vidéo</string>
+    <string name="gutenberg_native_add_a_shortcode">Ajouter un code court…</string>
+    <string name="post_list_author">Auteur de l’article</string>
+    <string name="fab_create_desc">Créer un article</string>
+    <string name="stats_posting_activity_end_description">Vous avez entendu toutes les statistiques de cette période.\n Appuyer de nouveau redémarrera depuis le début.</string>
+    <string name="stats_posting_activity_empty_description">Cette période ne contient aucune statistique.</string>
+    <string name="stats_posting_activity_label_content_description">Activité de publication de %1$s</string>
+    <string name="stats_posting_activity_content_description">Les jours avec %1$s vues pour %2$s sont : %2$s %3$s. Appuyez pour en savoir plus.</string>
+    <string name="stats_posting_activity_action">accéder à toutes les statistiques pour cette période</string>
+    <string name="stats_box_type_very_high">très élevé</string>
+    <string name="stats_box_type_high">élevé</string>
+    <string name="stats_box_type_medium">moyen</string>
+    <string name="stats_box_type_low">faible</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_entry">%3$s, %2$d %1$s</string>
+    <string name="gutenberg_native_replace_image">Remplacer l’image</string>
+    <string name="gutenberg_native_gallery_caption_s">Légende de la galerie. %s</string>
+    <string name="create_post_page_fab_tooltip">Créer un article ou une page</string>
+    <string name="content_description_person_building_website">Personne en pleine création d’un site Web</string>
+    <string name="post_signup_interstitial_not_right_now">Pas maintenant</string>
+    <string name="post_signup_interstitial_subtitle">Quoi que vous vouliez créer ou partager, nous vous y aiderons.</string>
+    <string name="post_signup_interstitial_title">Bienvenue dans WordPress</string>
+    <string name="stock_media_picker_list_content_description">Bibliothèque de photos</string>
+    <string name="photo_picker_image_thumbnail_unselected">Image désélectionnée</string>
+    <string name="photo_picker_image_selected">,sélectionnée</string>
+    <string name="photo_picker_image_thumbnail_selected">Image sélectionnée</string>
+    <string name="photo_picker_image_thumbnail_content_description">Miniature de l’image</string>
+    <string name="my_site_bottom_sheet_add_post">Article de blog</string>
+    <string name="my_site_bottom_sheet_title">Ajouter</string>
+    <string name="post_settings_publish">Publier</string>
+    <string name="dialog_confirm_scheduled_post_sync_yes">Synchroniser maintenant</string>
+    <string name="dialog_confirm_scheduled_post_sync_message">Cet article sera synchronisé immédiatement.</string>
+    <string name="dialog_confirm_scheduled_post_sync_title">Prêt à synchroniser ?</string>
+    <string name="new_site_creation_unavailable_domain">Ce domaine n’est pas disponible</string>
+    <string name="negative_prefix">-%s</string>
+    <string name="login_discovery_error_generic">Nous n’avons pas pu accéder à votre site. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_discovery_error_ssl">Nous n’avons pas pu accéder à votre site à cause d’un problème avec le &lt;b&gt;certificat SSL&lt;/b&gt;. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_discovery_error_http_auth">Nous n’avons pas pu accéder à votre site car il requiert une &lt;b&gt;authentification HTTP&lt;/b&gt;. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_discovery_error_xmlrpc">Nous n’avons pas pu accéder au &lt;b&gt;fichier XMLRPC&lt;/b&gt; sur votre site. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_site_credentials_magic_link_label">Vous y êtes presque ! Nous devons juste vérifier votre adresse e-mail connectée à Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="enter_credentials_for_site">Connexion avec vos identifiants au site %1$s</string>
+    <string name="my_site_bottom_sheet_add_page">Page du site</string>
+    <string name="reader_following_display_name">Abonné</string>
+    <string name="reader_my_likes_display_name">J’aime</string>
+    <string name="reader_discover_display_name">Découvrez</string>
+    <string name="reader_save_for_later_display_name">Enregistré</string>
+    <string name="reader_filter_tags_title">Sujets</string>
+    <string name="reader_filter_sites_title">Sites</string>
+    <string name="suffix_1_000_000_000_000_000_000">%s trillion</string>
+    <string name="suffix_1_000_000_000_000_000">%s billiard</string>
+    <string name="suffix_1_000_000_000_000">%s billion</string>
+    <string name="suffix_1_000_000_000">%s milliard</string>
+    <string name="suffix_1_000_000">%s million</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="posts_cannot_be_started">Nous ne pouvons pas ouvrir les articles pour le moment. Réessayez ultérieurement.</string>
+    <string name="site_cannot_be_loaded">Nous ne pouvons pas charger les données de votre site pour le moment. Réessayez ultérieurement.</string>
+    <string name="gutenberg_native_wordpress_media_library">Bibliothèque des médias WordPress</string>
+    <string name="gutenberg_native_unsupported">Non pris(e) en charge</string>
+    <string name="gutenberg_native_ungroup">Dissocier</string>
+    <string name="gutenberg_native_translate">Traduire</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">Appuyer pour cacher le clavier</string>
+    <string name="gutenberg_native_tap_here_to_show_help">Appuyer ici pour afficher l’aide</string>
+    <string name="gutenberg_native_take_a_video">Prendre une vidéo</string>
+    <string name="gutenberg_native_take_a_photo_or_video">Prendre une photo ou une vidéo</string>
+    <string name="gutenberg_native_take_a_photo">Prendre une photo</string>
+    <string name="gutenberg_native_start_writing">Commencez à écrire…</string>
+    <string name="gutenberg_native_show_section">Afficher la section</string>
+    <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloc %s. Le contenu de ce bloc n’est pas valide</string>
+    <string name="gutenberg_native_s_block_empty">Bloc %s. Vide</string>
+    <string name="gutenberg_native_cut_block">Couper le bloc</string>
+    <string name="gutenberg_native_problem_opening_the_video">Un problème est survenu lors de l’ouverture de la vidéo</string>
+    <string name="gutenberg_native_problem_displaying_block">Un problème est survenu lors de l’affichage du bloc</string>
+    <string name="gutenberg_native_post_title_s">Titre de la publication. %s</string>
+    <string name="gutenberg_native_post_title_empty">Titre de la publication. Vide</string>
+    <string name="gutenberg_native_paste_url">Coller l’URL</string>
+    <string name="gutenberg_native_page_break_block_s">Bloc de saut de page. %s</string>
+    <string name="gutenberg_native_open_settings">Ouvrir les paramètres</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Aucune application ne peut traiter cette requête. Veuillez installer un navigateur Internet.</string>
+    <string name="gutenberg_native_navigate_up">Faire défiler vers le haut</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Faire monter le bloc de la ligne %1$s à la ligne %2$s</string>
+    <string name="gutenberg_native_move_block_up">Faire monter le bloc</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Faire descendre le bloc de la ligne %1$s à la ligne %2$s</string>
+    <string name="gutenberg_native_move_block_down">Faire descendre le bloc</string>
+    <string name="gutenberg_native_image_caption_s">Légende de l’image. %s</string>
+    <string name="gutenberg_native_hide_keyboard">Masquer le clavier</string>
+    <string name="gutenberg_native_help_icon">Icône d’aide</string>
+    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Échec de l’insertion du média.\nVeuillez appuyer pour accéder aux options.</string>
+    <string name="gutenberg_native_double_tap_to_undo_last_change">Appuyer deux fois pour annuler la dernière modification</string>
+    <string name="gutenberg_native_double_tap_to_toggle_setting">Appuyer deux fois pour activer/désactiver le paramètre</string>
+    <string name="gutenberg_native_double_tap_to_select_an_image">Appuyer deux fois pour sélectionner une image</string>
+    <string name="gutenberg_native_double_tap_to_select_a_video">Appuyer deux fois pour sélectionner une vidéo</string>
+    <string name="gutenberg_native_double_tap_to_select">Appuyer deux fois effectuer une sélection</string>
+    <string name="gutenberg_native_double_tap_to_redo_last_change">Appuyer deux fois pour rétablir la dernière modification</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_up">Appuyer deux fois pour faire monter le bloc</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_down">Appuyer deux fois pour faire descendre le bloc</string>
+    <string name="gutenberg_native_double_tap_to_edit_this_value">Appuyer deux fois pour modifier cette valeur</string>
+    <string name="gutenberg_native_double_tap_to_add_a_block">Appuyer deux fois pour ajouter un bloc</string>
+    <string name="gutenberg_native_current_value_is_s">La valeur actuelle est %s</string>
+    <string name="gutenberg_native_choose_from_device">Choisir depuis l’appareil</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Une erreur inconnue est survenue. Veuillez réessayer.</string>
+    <string name="gutenberg_native_alt_text">Texte alternatif</string>
+    <string name="gutenberg_native_add_video">AJOUTER UNE VIDÉO</string>
+    <string name="gutenberg_native_add_url">Ajouter une URL</string>
+    <string name="gutenberg_native_add_alt_text">Ajouter du texte alternatif</string>
+    <string name="gutenberg_native_add_image_or_video">AJOUTER UNE IMAGE OU UNE VIDÉO</string>
+    <string name="gutenberg_native_add_image">AJOUTER UNE IMAGE</string>
+    <string name="gutenberg_native_add_block_here">AJOUTER UN BLOC ICI</string>
+    <string name="reader_empty_saved_posts_content_description">Touchez le bouton Ajouter pour enregistrer les articles pour enregistrer un article dans votre liste.</string>
+    <string name="reader_acessibility_list_loaded">« La liste a chargé %1$d éléments. »</string>
+    <string name="notifications_tab_dialog_switch_desc">Notifications</string>
+    <string name="main_switch_default_title_off">Désactivé</string>
+    <string name="main_switch_default_title_on">Activé</string>
+    <string name="notifications_tab_dialog_main_off_message">Désactiver les notifications pour ce site désactivera l’affichage des notifications sur l’onglet Notifications pour ce site. Vous pouvez affiner le type de notification que vous voyez après avoir activé les notifications pour ce site.</string>
+    <string name="notifications_tab_dialog_main_off_title">Pour voir les notifications sur l’onglet Notifications pour ce site, activez les notifications pour ce site.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activer l’affichage des notifications sur l’onglet Notifications pour ce site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Désactiver l’affichage des notifications sur l’onglet Notifications pour ce site</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifications pour ce site</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifications pour ce site</string>
+    <string name="pick_media">Ajouter une image ou une vidéo</string>
+    <string name="error_post_not_submitted_retrying">Nous n\'avons pas pu soumettre cet article pour révision, mais nous réessayerons plus tard. </string>
+    <string name="error_post_not_scheduled_retrying">Nous n\'avons pas pu planifier la publication de cet article, mais nous réessayerons plus tard.</string>
+    <string name="error_post_not_published_retrying_private">Nous n\'avons pas pu publier cet article privé, mais nous réessayerons plus tard.</string>
+    <string name="error_post_not_published_retrying">Nous n\'avons pas pu publier cet article, mais nous réessayerons plus tard.</string>
+    <string name="error_post_not_submitted">Nous n\'avons pas pu effectuer cette action et n\'avons donc pas soumis cet article pour révision.</string>
+    <string name="error_post_not_scheduled">Nous n\'avons pas pu effectuer cette action et n\'avons donc pas planifié la publication de cet article.</string>
+    <string name="error_post_not_published_private">Nous n\'avons pas pu effectuer cette action et n\'avons donc pas publié cet article privé.</string>
+    <string name="error_post_not_published">Nous n\'avons pas pu effectuer cette action et n\'avons donc pas publié cet article.</string>
+    <string name="error_media_recover_post_not_submitted">Nous n\'avons pas pu importer ce média et n\'avons donc pas soumis cet article pour révision. </string>
+    <string name="error_media_recover_post_not_scheduled">Nous n\'avons pas pu importer ce média et n\'avons donc pas planifié la publication de cet article.</string>
+    <string name="error_media_recover_post_not_published_private">Nous n\'avons pas pu importer ce média et n\'avons donc pas publié cet article privé.</string>
+    <string name="error_media_recover_post_not_published">Nous n\'avons pas pu importer ce média et n\'avons donc pas publié l\'article.</string>
+    <string name="error_media_recover_post">Nous n\'avons pas pu importer ce média.</string>
+    <string name="error_generic_error_retrying">Nous n\'avons pas pu effectuer cette action, mais nous réessayerons plus tard. </string>
+    <string name="error_generic_error">Nous n\'avons pas pu effectuer cette action.</string>
+    <string name="error_preview_empty_draft">Impossible de prévisualiser un brouillon vide</string>
+    <string name="error_preview_empty_page">Impossible de prévisualiser une page vide</string>
+    <string name="error_preview_empty_post">Impossible de prévisualiser un article vide</string>
+    <string name="preview_unavailable_self_hosted_sites">Aperçu non disponible</string>
+    <string name="remote_preview_operation_error">Erreur lors de la tentative d\'enregistrement de l\'article avant la prévisualisation</string>
+    <string name="post_preview_remote_auto_saving_post">Génération de l\'aperçu…</string>
+    <string name="post_preview_saving_draft">Enregistrement en cours…</string>
+    <string name="local_post_autosave_revision_available">Les modifications que vous avez apportées à cet article n\'ont pas été enregistrées</string>
+    <string name="dialog_confirm_autosave_dont_restore_button">La version de cette application</string>
+    <string name="dialog_confirm_autosave_restore_button">La version d\'un autre appareil</string>
+    <string name="dialog_confirm_autosave_body_second_part">Cette application\nEnregistré sur %s\n\nUn autre appareil\nEnregistré sur %s\n</string>
+    <string name="dialog_confirm_autosave_body_first_part">Vous avez récemment apporté des modifications à cet article, mais ne les avez pas enregistrées. Choisissez une version à charger :\n\n</string>
+    <string name="dialog_confirm_autosave_title">Quelle version souhaitez-vous modifier ?</string>
+    <string name="button_delete_permanently">Supprimer définitivement</string>
+    <string name="post_waiting_for_connection_draft_cancel">Nous n\'enregistrerons pas les dernières modifications apportées à votre brouillon.</string>
+    <string name="post_waiting_for_connection_scheduled_cancel">Nous ne planifierons pas ces modifications.</string>
+    <string name="post_waiting_for_connection_pending_cancel">Nous ne soumettrons pas ces modifications pour révision. </string>
+    <string name="post_waiting_for_connection_publish_cancel"> Nous ne publierons pas ces modifications.</string>
+    <string name="post_waiting_for_connection_draft">Nous enregistrerons votre brouillon lorsque votre appareil sera de nouveau connecté</string>
+    <string name="post_waiting_for_connection_private">Nous publierons votre article privé lorsque votre appareil sera de nouveau connecté.</string>
+    <string name="post_waiting_for_connection_scheduled">Nous planifierons la publication de votre article lorsque votre appareil sera de nouveau connecté.</string>
+    <string name="post_waiting_for_connection_pending">Nous soumettrons votre article pour révision lorsque votre appareil sera de nouveau connecté.</string>
+    <string name="post_waiting_for_connection_publish">Nous publierons l\'article lorsque votre appareil sera de nouveau connecté.</string>
+    <string name="settings_username_changer_snackbar_cancel">Impossible d\'annuler cette action. L’identifiant a probablement déjà été mis à jour.</string>
+    <string name="settings_username_changer_toast_content">Votre nouvel identifiant est %1$s.</string>
+    <string name="settings_username_changer_progress_dialog">Enregistrement de l’identifiant…</string>
+    <string name="settings_username_changer_confirm_dialog_positive_action">Changer l’identifiant</string>
+    <string name="settings_username_changer_confirm_dialog_content">Vous remplacez votre identifiant par %1$s%2$s%3$s. La modification de votre identifiant affectera également l\'adresse de vos profils Gravatar et Intense Debate. Validez votre nouvel identifiant pour continuer.</string>
+    <string name="settings_username_changer_confirm_dialog_title">Attention !</string>
+    <string name="settings_username_changer_header">Vous êtes sur le point de modifier votre identifiant actuel : %1$s%2$s%3$s. Vous ne pourrez pas réutiliser votre identifiant précédent.</string>
+    <string name="site_settings_jetpack_performance_settings_hint">Voir et modifier vos paramètres de performances Jetpack</string>
+    <string name="site_settings_performance_and_speed">Performances et rapidité</string>
+    <string name="site_settings_more">Lire la suite</string>
+    <string name="site_settings_improved_search_summary">Remplacez le moteur de recherche WordPress intégré par une expérience de recherche optimisée</string>
+    <string name="site_settings_improved_search">Recherche optimisée</string>
+    <string name="site_settings_jetpack_search">Fonction de recherche de Jetpack</string>
+    <string name="site_settings_ad_free_video_hosting">Hébergement vidéo sans publicité</string>
+    <string name="site_settings_media">Média</string>
+    <string name="site_settings_site_accelerator_summary">Chargez les pages plus rapidement en autorisant Jetpack à optimiser vos fichiers image et statiques (comme CSS et JavaScript).</string>
+    <string name="site_settings_faster_static_files">Fichiers statiques plus rapides</string>
+    <string name="site_settings_faster_images">Images plus rapides</string>
+    <string name="site_settings_site_accelerator_off">Désactivé</string>
+    <string name="site_settings_site_accelerator_on">Activé</string>
+    <string name="site_settings_site_accelerator">Accélérateur de site</string>
+    <string name="site_settings_lazy_load_images_summary">Optimisez la vitesse de votre site en ne chargeant que les images visibles à l\'écran.</string>
+    <string name="site_settings_performance">Performances</string>
+    <string name="stats_file_downloads_value_label">Téléchargements</string>
+    <string name="stats_file_downloads_title_label">Fichier</string>
+    <string name="stats_file_downloads">Téléchargements de fichier</string>
+    <string name="stats_data_not_recorded_for_period">Les statistiques de téléchargement de fichier n’étaient pas enregistrée avant le 28 juillet 2019.</string>
+    <string name="stats_site_negative_utc">Fuseau horaire du site (UTC - %s)</string>
+    <string name="stats_site_positive_utc">Fuseau horaire du site (UTC + %s)</string>
+    <string name="stats_site_neutral_utc">Fuseau horaire du site (UTC)</string>
+    <string name="web_preview_desktop">Bureau</string>
+    <string name="web_preview_default">Valeur par défaut</string>
+    <string name="close_dialog_button_desc">Fermer la boîte de dialogue</string>
+    <string name="preview_type_desc">Sélectionner le type d\'aperçu</string>
+    <string name="share_desc">Partager</string>
+    <string name="navigate_back_desc">Retour</string>
+    <string name="navigate_forward_desc">Continuer</string>
+    <string name="calendar_scheduled_post_description">Planification de la publication de « %s » sur « %s » dans votre application WordPress \n %s</string>
+    <string name="calendar_scheduled_post_title">Articles WordPress planifiés « %s »</string>
+    <string name="notification_post_will_be_published_in_ten_minutes">« %s » sera publié dans 10 minutes</string>
+    <string name="notification_post_will_be_published_in_one_hour">« %s » sera publié dans 1 heure</string>
+    <string name="notification_post_has_been_published">« %s » a été publié</string>
+    <string name="notification_scheduled_post_ten_minute_reminder">Article planifié : rappel 10 minutes avant</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Article planifié : rappel 1 heure avant</string>
+    <string name="notification_scheduled_post">Article planifié</string>
+    <string name="post_notification_error">Impossible de créer la notification lorsque la date de publication est située dans le passé.</string>
+    <string name="post_notification_when_published">Lors de la publication</string>
+    <string name="post_notification_ten_minutes_before">10 minutes avant</string>
+    <string name="post_notification_one_hour_before">1 heure avant</string>
+    <string name="post_notification_off">Désactivé</string>
+    <string name="post_settings_add_to_calendar">Ajouter au calendrier</string>
+    <string name="post_settings_notification">Notification</string>
+    <string name="post_settings_time_and_date">Date et heure</string>
+    <string name="login_invalid_site_url">Veuillez entrer une adresse de site Web complète, telle que exemple.com.</string>
+    <string name="enter_email_for_site">Connectez-vous à WordPress.com pour accéder à %1$s</string>
+    <string name="stats_post_views_label">Vues</string>
+    <string name="stats_post_label">Article</string>
+    <string name="stats_list_item_description">%1$s : %2$s, %3$s: %4$s</string>
+    <string name="stats_item_collapsed">Élément réduit</string>
+    <string name="stats_item_expanded">Élément développé</string>
+    <string name="stats_collapse_content_description">Réduire</string>
+    <string name="stats_expand_content_description">Développer</string>
+    <string name="stats_graph_updated">Graphique mis à jour.</string>
+    <string name="stats_overview_content_description">%1$s %2$s pour la période : %3$s, changement par rapport à la période précédente - %4$s</string>
+    <string name="stats_loading_card">Chargement des données de la carte sélectionnée</string>
+    <string name="site_settings_editor">Éditeur</string>
+    <string name="description_expand">Déplier</string>
+    <string name="description_collapse">Replier</string>
+    <string name="my_site_verify_your_email_without_email">Vérifiez votre adresse de messagerie - Instructions envoyées dans votre e-mail</string>
+    <string name="my_site_verify_your_email">Vérifiez votre adresse de messagerie - Instructions envoyées vers %s</string>
+    <string name="link_dialog_button_cancel">Annuler</string>
+    <string name="link_dialog_button_ok">OK</string>
+    <string name="link_dialog_edit_hint">http(s)://</string>
+    <string name="link_dialog_button_remove_link">Retirer le lien</string>
+    <string name="link_dialog_title">Insérer le lien</string>
+    <string name="post_settings_retry_featured_image">Retenter le téléversement</string>
+    <string name="post_settings_featured_image_uploading_tap_for_options">Téléversement du média. Veuillez toucher pour les options.</string>
+    <string name="link_open_new_window">Ouvrir le lien dans une nouvelle fenêtre/ onglet</string>
+    <string name="stats_widget_error_no_access_token">Pour voir vos statistiques, connectez-vous à votre compte WordPress.com.</string>
+    <string name="post_list_search_nothing_found">Aucun article ne correspond à votre recherche</string>
+    <string name="post_list_search_prompt">Rechercher dans les articles</string>
+    <string name="domains_suggestions_intro_description">C\'est ici que les internautes vous trouveront sur Internet.</string>
+    <string name="domains_suggestions_intro_title">Choisissez un nom de domaine Premium</string>
+    <string name="my_site_custom_domain_name">Tous les plans de WordPress.com comprennent un nom de domaine. Vous pouvez enregistrer votre nom de domaine Premium gratuit dès maintenant.</string>
+    <string name="stats_widget_minified_name">D’un coup d’œil</string>
+    <string name="stats_widget_today_insights_name">Aujourd\'hui</string>
+    <string name="stats_widget_all_time_insights_name">Depuis le début</string>
+    <string name="stats_widget_weekly_views_name">Vues cette semaine</string>
+    <string name="stats_widget_log_in_message">Veuillez vous connecter à l’app WordPress pour ajouter le widget.</string>
+    <string name="stats_widget_error_no_network">Pas de réseau disponible</string>
+    <string name="stats_widget_error_no_data">Impossible de charger les données</string>
+    <string name="stats_widget_select_type">Type</string>
+    <string name="stats_widget_select_color">Couleur</string>
+    <string name="stats_widget_select_your_site">Sélectionner votre site</string>
+    <string name="stats_widget_color_dark">Sombre</string>
+    <string name="stats_widget_color_light">Lumineux</string>
+    <string name="stats_widget_color">Couleur</string>
+    <string name="stats_widget_site_caption">Sélectionner votre site</string>
+    <string name="stats_widget_site">Site</string>
+    <string name="stats_widget_all_time_title">Depuis le début</string>
+    <string name="stats_widget_views_title">Vues cette semaine</string>
+    <string name="stats_widget_add">Ajouter le widget</string>
+    <string name="plugin_fetching_error_after_at">Le chargement des détails de l’extension prend plus de temps que d’habitude. Veuillez réessayer plus tard.</string>
+    <string name="plugin_install_site_ineligible_default_error">Si vous venez de créer un nom de domaine, veuillez attendre que nous ayons fini de le mettre en place, et réessayez.\n\nDans le cas contraire, il semble qu’une erreur soit survenue et que la fonctionnalité de l’extension n’est pas disponible pour ce site.</string>
+    <string name="domain_contact_information_state_not_available_hint">État (non disponible)</string>
+    <string name="domain_registration_privacy_protection_tos">En enregistrant ce domaine vous acceptez nos %1$sconditions générales%2$s</string>
+    <string name="error_network_connection">Vérifiez votre connexion réseau et réessayez.</string>
+    <string name="error_browser_no_network">Impossible de charger cette page pour le moment. </string>
+    <string name="error_disabled_apis">Impossible de récupérer les réglages : Certaines APIs sont indisponibles pour cette combinaison d’id d’app OAuth + compte.</string>
+    <string name="jetpack_connection_terms_and_conditions">En configurant jetpack vous acceptez nos %1$sconditions générales%2$s</string>
+    <string name="site_settings_disconnected_toast">Aucune connexion. La modification est désactivée.</string>
+    <string name="site_settings_update_password_message">Pour reconnecter l’application à votre site auto-hébergé, saisissez le nouveau mot de passe du site ici.</string>
+    <string name="site_settings_password_updated">Mot de passe mis à jour</string>
+    <string name="site_settings_password_dialog_title">Mettre à jour le mot de passe</string>
+    <string name="domain_registration_registering_domain_name_progress_dialog_message">Enregistrement du nom de domaine…</string>
+    <string name="domain_registration_state_picker_dialog_title">Sélectionner un État</string>
+    <string name="domain_registration_country_picker_dialog_title">Choisir le pays</string>
+    <string name="domain_registration_result_continue_button">continuer</string>
+    <string name="domain_registration_result_description">votre nouveau domaine &lt;b&gt;%s&lt;/b&gt; est en cours de configuration. Votre site\n fonctionne parfaitement !</string>
+    <string name="domain_registration_result_title">Bravo</string>
+    <string name="domain_contact_information_register_domain_button">Enregistrer un domaine</string>
+    <string name="domain_contact_information_postal_code_hint">Code postal</string>
+    <string name="domain_contact_information_state_hint">État</string>
+    <string name="domain_contact_information_city_hint">Ville</string>
+    <string name="domain_contact_information_address_hint_two">Adresse 2</string>
+    <string name="domain_contact_information_address_hint">Adresse</string>
+    <string name="domain_contact_information_country_hint">Pays</string>
+    <string name="domain_contact_information_country_code_hint">Code pays</string>
+    <string name="domain_contact_information_phone_number_hint">Téléphone</string>
+    <string name="domain_contact_information_organization_hint">Organisation (facultatif)</string>
+    <string name="domain_contact_information_description">Pour vous faciliter la tâche, nous avons prérempli vos coordonnées\n WordPress.com. Veuillez vérifier qu\'elles correspondent bien aux informations que vous voulez utiliser pour ce domaine.</string>
+    <string name="domain_contact_information_title">Coordonnées du domaine</string>
+    <string name="domain_privacy_option_off_title">S\'inscrire publiquement</string>
+    <string name="domain_privacy_option_on_title">S\'inscrire en privé avec protection de la vie privée</string>
+    <string name="domain_registration_privacy_protection_description">Les propriétaires de domaines sont tenus de partager leurs informations de contact dans une base de données publique de domaines.\n Grâce à la fonction de protection de la vie privée, nous publions nos propres informations à la place des vôtres et vous transmettons les communications en privé.</string>
+    <string name="domain_registration_privacy_protection_title">Protection de la vie privée</string>
+    <string name="domain_registration_contact_form_input_error">Veuillez saisir un(e) %s valide</string>
+    <string name="domains_suggestions_choose_domain">Choisir le domaine</string>
+    <string name="stats_management_new">Nouvelles</string>
+    <string name="stats_management_dismiss_insights_news_card">Ignorer</string>
+    <string name="stats_management_try_it_now">Essayer maintenant</string>
+    <string name="stats_management_news_card_message">Choisissez les statistiques à consulter et concentrez-vous sur les données les plus importantes à vos yeux. Appuyez sur %1$s au bas des Tendances pour personnaliser vos statistiques.</string>
+    <string name="stats_manage_your_stats">Gérer vos statistiques</string>
+    <string name="history_fetching_revisions">Fetching revisions…</string>
+    <string name="editor_failed_to_insert_media_tap_to_retry">L’insertion du média a échoué.\nVeuillez appuyer pour réessayer.</string>
+    <string name="editor_uploading_draft">Your draft is uploading</string>
+    <string name="post_uploading_draft">Uploading draft</string>
+    <string name="post_list_tab_drafts">Brouillons</string>
+    <string name="error_restoring_post">Une erreur est survenue pendant la restauration de la publication</string>
+    <string name="backdated_for">Antidaté pour : %s</string>
+    <string name="stats_insights_management_title">N\'affichez que les statistiques les plus pertinentes. Ajoutez et organisez vos tendances ci-après.</string>
+    <string name="stats_insights_social">Réseaux sociaux</string>
+    <string name="stats_insights_annual_site_stats">Statistiques annuelles du site</string>
+    <string name="stats_view_follower_totals">Totaux des abonnés</string>
+    <string name="domain_suggestions_fetch_error">Impossible de charger les suggestions de domaine</string>
+    <string name="domain_suggestions_search_hint">Saisissez un mot-clé pour obtenir davantage d\'idées</string>
+    <string name="domains_suggestions_empty_list">Aucune suggestion n’a été trouvée</string>
+    <string name="register_domain">Enregistrer un domaine</string>
+    <string name="jetpack_installed_message">Maintenant que Jetpack est installé, vous devez procéder à quelques réglages. Cela ne prendra qu\'une minute.</string>
+    <string name="stats_menu_remove">Supprimer des tendances</string>
+    <string name="stats_menu_move_down">Déplacer vers le bas</string>
+    <string name="stats_menu_move_up">Déplacer vers le haut</string>
+    <string name="stats_item_settings">Réglages de l\'élément de statistiques</string>
+    <string name="post_moving_to_draft">Basculement de l\'article en mode brouillon</string>
+    <string name="post_restoring">Restauration de l\'article</string>
+    <string name="post_restored">Article restauré</string>
+    <string name="post_trashing">Suppression de l\'article</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">La suppression de cet article effacera les modifications non enregistrées. Voulez-vous vraiment continuer ?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Changements locaux</string>
+    <string name="button_move_to_draft">Passer en brouillon</string>
+    <string name="post_list_toggle_item_layout_list_view">Basculer vers la vue de la liste</string>
+    <string name="post_list_toggle_item_layout_cards_view">Basculer vers la vue des cartes</string>
+    <string name="posts_trashed_empty">Vous n\'avez pas d\'articles dans la corbeille</string>
+    <string name="posts_draft_empty">Vous n\'avez pas de brouillons d\'article</string>
+    <string name="posts_scheduled_empty">Vous n\'avez aucun article planifié</string>
+    <string name="posts_published_empty">Vous n\'avez pas encore publié d\'articles</string>
+    <string name="notification_wpcom_username_needed">Veuillez vous connecter avec votre identifiant et votre mot de passe.</string>
+    <string name="error_user_username_instead_of_email">Veuillez vous connecter avec votre identifiant WordPress.com plutôt qu\'avec votre adresse de messagerie.</string>
+    <string name="stats_insights_average_words">Moyenne mots/article</string>
+    <string name="stats_insights_total_words">Total des mots</string>
+    <string name="stats_insights_average_likes">Moyenne des j’aime/article</string>
+    <string name="stats_insights_total_likes">Total des j’aime</string>
+    <string name="stats_insights_average_comments">Moyenne des commentaires/article</string>
+    <string name="stats_insights_total_comments">Total des commentaires</string>
+    <string name="stats_insights_posts">Articles</string>
+    <string name="stats_insights_year">Année</string>
+    <string name="stats_insights_this_year_site_stats">Cette année</string>
+    <string name="no_site_error">Le site à cette adresse n’est pas un site WordPress. Pour que nous le connections, le site doit utiliser WordPress.</string>
+    <string name="plugin_check_domain_credit_error">Impossible de vérifier les crédits de domaine disponibles</string>
+    <string name="plugin_check_domain_credits_progress_dialog_message">Vérification des crédits de domaine</string>
+    <string name="plugin_install_custom_domain_required_dialog_register_btn">Enregistrer le domaine</string>
+    <string name="plugin_install_custom_domain_required_dialog_message">Pour installer des extensions, un nom de domaine personnalisé doit être associé à votre site.</string>
+    <string name="plugin_install_custom_domain_required_dialog_title">Installer l\'extension</string>
+    <string name="new_site_creation_preview_subtitle">Vous pourrez personnaliser l’apparence et le ressenti de votre site plus tard</string>
+    <string name="publish_on">Publier le : %s</string>
+    <string name="schedule_for">Planifier pour le : %s</string>
+    <string name="published_on">Publié le : %s</string>
+    <string name="scheduled_for">Planifié pour le : %s</string>
+    <string name="stats_detail_recent_weeks">Dernières semaines</string>
+    <string name="stats_detail_average_views_per_day">Nbr. moy. de vues par jour</string>
+    <string name="stats_months_and_years_views_label">Vues</string>
+    <string name="stats_months_and_years_period_label">Période</string>
+    <string name="stats_detail_months_and_years">Mois et années</string>
+    <string name="stats_insights_load_more">En afficher plus</string>
+    <string name="stats_insights_today_stats">Aujourd’hui</string>
+    <string name="stats_insights_best_hour">Meilleure heure</string>
+    <string name="stats_insights_best_day">Meilleur jour</string>
+    <string name="showing_stats_for">Afficher les stats pour :</string>
+    <string name="app_rating_rate_never">Non merci</string>
+    <string name="app_rating_rate_later">Plus tard</string>
+    <string name="app_rating_rate_now">Évaluer maintenant</string>
+    <string name="app_rating_message">Ravi de vous revoir! Si vous creusez l\'application, nous aimerions une évaluation sur le Google Play Store.</string>
+    <string name="app_rating_title">Vous aimez WordPress ?</string>
+    <string name="editor_post_converted_back_to_draft">Article reconverti en brouillon</string>
+    <string name="stats_insights_posting_activity">Activité de publication</string>
+    <string name="stats_site_not_loaded_yet">Site non encore chargé</string>
+    <string name="stats_more_posts">Plus d’articles</string>
+    <string name="stats_fewer_posts">Moins d’articles</string>
+    <string name="new_site_creation_preview_back_pressed_warning">Vous pourriez perdre vos avancées. Voulez-vous vraiment sortir ?</string>
+    <string name="plans_loading_error_with_cache_button">Afficher quand même les plans</string>
+    <string name="plans_loading_error_with_cache_subtitle">Il vous faut une connexion Internet pour voir les plans, sinon les détails pourraient être obsolètes.</string>
+    <string name="plans_loading_error_no_cache_subtitle">Il vous faut une connexion Internet pour voir les plans.</string>
+    <string name="plans_loading_error_no_plans_subtitle">Nous n’arrivons pas à charger les plans pour le moment. Veuillez réessayer plus tard.</string>
+    <string name="plans_loading_error_no_plans_title">Impossible de charger les plans</string>
+    <string name="plans_loading_error_network_title">Pas de connexion</string>
+    <string name="menu_switch_to_gutenberg_editor">Basculer sur l’éditeur de blocs</string>
+    <string name="stats_loading_block_error">Un problème est survenu lors du chargement de vos données. Rechargez la page pour réessayer.</string>
+    <string name="stats_loading_error">Données non chargées</string>
+    <string name="site_settings_gutenberg_default_for_new_posts_summary">Modifier les nouvelles publications et pages avec l’éditeur de blocs</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">Utiliser l’éditeur de blocs</string>
+    <string name="exit">sortir</string>
+    <string name="quick_start_sites_type_subtitle">Fait : %1$d of %2$d</string>
+    <string name="quick_start_sites_type_grow">Élargir votre public</string>
+    <string name="quick_start_sites_type_customize">Personnaliser votre site</string>
+    <string name="quick_start_sites">Prochaines étapes</string>
+    <string name="quick_start_complete_tasks_header">Terminé (%d)</string>
+    <string name="quick_start_dialog_view_site_message">Profitez de votre produit fini !</string>
+    <string name="quick_start_dialog_upload_icon_title">Téléverser une icône de site</string>
+    <string name="quick_start_dialog_upload_icon_message">Vos visiteurs verront votre icône dans leur navigateur. Ajoutez une icône personnalisée pour un aspect brillant et pro.</string>
+    <string name="quick_start_dialog_explore_plans_message_short">Appuyez sur %1$s Plan %2$s pour voir votre plan actuel et les autres plans disponibles</string>
+    <string name="quick_start_dialog_check_stats_message_short">Appuyez sur %1$s Stats %2$s pour voir comment votre site est performant.</string>
+    <string name="quick_start_dialog_upload_site_icon_message_short">Appuyez sur %1$s Votre icône de site %2$s pour en téléverser une nouvelle</string>
+    <string name="quick_start_dialog_publish_post_message">Rédigez et publiez votre premier article.</string>
+    <string name="quick_start_dialog_need_help_message">Nous allons vous expliquer les bases de la construction et de la croissance de votre site.</string>
+    <string name="quick_start_dialog_migration_title">Nous avons apporté des modifications à vos listes</string>
+    <string name="quick_start_dialog_migration_message">Nous avons ajouté plus de tâches pour vous aider à faire grandir votre audience.</string>
+    <string name="quick_start_dialog_explore_plans_title">Explorer les plans</string>
+    <string name="quick_start_dialog_explore_plans_message">Apprenez-en plus sur le marketing et les outils SEO dans nos plans payants.</string>
+    <string name="quick_start_dialog_enable_sharing_title">Activer le partage d’article</string>
+    <string name="quick_start_dialog_enable_sharing_message">Partager automatiquement les nouveaux articles sur vos comptes de réseaux sociaux.</string>
+    <string name="quick_start_dialog_check_stats_title">Découvrez les statistiques de votre site</string>
+    <string name="quick_start_dialog_check_stats_message">Restez au courant des performances de votre site.</string>
+    <string name="quick_start_dialog_remove_next_steps_message">« Retirer les étapes suivantes » cachera tous les accompagnements sur ce site. Cette action ne peut pas être annulée.</string>
+    <string name="quick_start_dialog_remove_next_steps_title">Retirer les étapes suivantes</string>
+    <string name="quick_start_remove_next_steps_menu_title">Retirer ceci</string>
+    <string name="quick_start_complete_view_subtitle">Vous avez terminé votre liste, félicitations ! Du beau travail !</string>
+    <string name="quick_start_complete_view_title">Toutes les tâches ont été accomplies !</string>
+    <string name="quick_start_task_skip_menu_title">Sauter la tâche</string>
+    <string name="quick_start_completed_tasks_header_chevron_collapse_desc">réduire</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">développer</string>
+    <string name="notification_channel_reminder_title">Rappel</string>
+    <string name="stats_select_next_period_description">Sélectionner la période suivante</string>
+    <string name="stats_select_previous_period_description">Sélectionner la période précédante</string>
+    <string name="stats_most_popular_percent_views">%1$d%% des vues</string>
+    <string name="stats_insights_popular">Heure la plus populaire</string>
+    <string name="stats_traffic_change">%1$s (%2$s%%)</string>
+    <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
+    <string name="new_site_creation_site_preview_content_description">Affichage de l\'aperçu du site</string>
+    <string name="new_site_creation_clear_all_content_description">Effacer</string>
+    <string name="site_created_but_not_fetched_snackbar_message">Il semblerait que votre connexion soit lente. Si votre nouveau site n\'apparaît pas dans la liste, essayez de la réactualiser.</string>
+    <string name="cancel_new_site_wizard_content_description">Annuler l\'assistant de création de sites</string>
+    <string name="notification_new_site_creation_creating_site_subtitle">Nous créons votre nouveau site</string>
+    <string name="notification_new_site_creation_failed">Un problème est survenu</string>
+    <string name="notification_new_site_creation_title">Créer un site</string>
+    <string name="new_site_creation_create_site_button">Créer un site</string>
+    <string name="new_site_creation_domain_header_subtitle">C\'est ici que les internautes vous trouveront sur Internet.</string>
+    <string name="new_site_creation_empty_domain_list_message">Aucune adresse ne correspond à votre recherche</string>
+    <string name="site_creation_error_generic_subtitle">Erreur de communication avec le serveur, veuillez essayer à nouveau.</string>
+    <string name="site_creation_error_generic_title">Un problème est survenu</string>
+    <string name="site_creation_fetch_suggestions_error_unknown">Un problème est survenu</string>
+    <string name="new_site_creation_preview_title">Votre site a été créé.</string>
+    <string name="new_site_creation_screen_title_step_count">%1$d sur %2$d</string>
+    <string name="new_site_creation_screen_title_general">Créer un site</string>
+    <string name="suggestions_updated_content_description">Suggestions mises à jour</string>
+    <string name="site_picker_failed_selecting_added_site">Impossible de sélectionner le site auto-hébergé nouvellement ajouté.</string>
+    <string name="local_post_is_conflicted">Conflit de version</string>
+    <string name="preference_crash_reports_summary">Autoriser les rapports d\'incident automatiques pour nous aider à améliorer les performances de l\'application.</string>
+    <string name="preference_crash_reports">Rapports d\'incident</string>
+    <string name="snackbar_conflict_undo">Annuler</string>
+    <string name="snackbar_conflict_web_version_discarded">Version Web supprimée</string>
+    <string name="snackbar_conflict_local_version_discarded">Version locale supprimée</string>
+    <string name="toast_conflict_updating_post">Mise à jour de l\'article</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Supprimer sur le Web</string>
+    <string name="dialog_confirm_load_remote_post_discard_local">Supprimer en local</string>
+    <string name="dialog_confirm_load_remote_post_body_2">Local\nEnregistré sur %s\n\nWeb\nEnregistré sur %s\n</string>
+    <string name="dialog_confirm_load_remote_post_body">Cet article existe en deux versions, ce qui crée un conflit. Sélectionnez la version à supprimer.\n\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Résoudre le conflit de synchronisation</string>
+    <string name="stats_no_data_for_period">Aucune donnée pour cette période</string>
+    <string name="preference_strip_image_location">Supprimer les données de localisation des photos et vidéos</string>
+    <string name="stats_cannot_be_started">Nous ne pouvons pas ouvrir les statistiques pour le moment. Veuillez réessayer plus tard</string>
+    <string name="gif_picker_endless_scroll_network_error">Le chargement de certains médias a échoué à cause d’une erreur réseau.</string>
+    <string name="gif_picker_empty_search_list">Aucun média ne correspond à votre recherche.</string>
+    <string name="gif_picker_initial_empty_text">Recherchez des GIF à ajouter à votre bibliothèque de médias !</string>
+    <string name="stats_author_views_label">Vues</string>
+    <string name="stats_author_label">Auteur</string>
+    <string name="stats_authors">Auteurs</string>
+    <string name="stats_search_terms_views_label">Vues</string>
+    <string name="stats_search_terms_label">Terme de recherche</string>
+    <string name="stats_search_terms">Termes de recherche</string>
+    <string name="stats_videos_views_label">Vues</string>
+    <string name="stats_videos_title_label">Titre</string>
+    <string name="stats_videos">Vidéos</string>
+    <string name="stats_country_views_label">Vues</string>
+    <string name="stats_country_label">Pays</string>
+    <string name="stats_countries">Pays</string>
+    <string name="stats_clicks_label">Clics</string>
+    <string name="stats_clicks_link_label">Lien</string>
+    <string name="stats_clicks">Clics</string>
+    <string name="stats_referrer_views_label">Vues</string>
+    <string name="stats_referrer_label">Référent</string>
+    <string name="stats_referrers">Référents</string>
+    <string name="stats_posts_and_pages">Articles et pages</string>
+    <string name="stats_insights_path">Path</string>
+    <string name="stats_insights_linkedin">LinkedIn</string>
+    <string name="stats_insights_google_plus">Google+</string>
+    <string name="stats_insights_tumblr">Tumblr</string>
+    <string name="stats_insights_twitter">Twitter</string>
+    <string name="stats_insights_facebook">Facebook</string>
+    <string name="stats_insights_view_more">Voir plus</string>
+    <string name="stats_insights_share_post">Partager lʼarticle</string>
+    <string name="stats_insights_create_post">Créer une publication</string>
+    <string name="stats_insights_latest_post_message">%2$s est publié depuis %1$s. Voilà les performances de l’article :</string>
+    <string name="stats_insights_latest_post_with_no_engagement">%2$s est publié depuis %1$s. Lancez-vous et augmentez le nombre de vues de votre article en le partageant :</string>
+    <string name="stats_insights_latest_post_empty">Vous n’avez pas encore publié d’articles. Lorsque vous commencez à publier, le résumé de votre dernier article apparaît ici :</string>
+    <string name="stats_insights_tags_and_categories">Étiquettes et catégories</string>
+    <string name="stats_insights_all_time_stats">Depuis le début</string>
+    <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
+    <string name="stats_publicize_followers_label">Abonnés</string>
+    <string name="stats_publicize_service_label">Service</string>
+    <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_tags_and_categories_views_label">Vues</string>
+    <string name="stats_tags_and_categories_title_label">Titre</string>
+    <string name="stats_posts_and_pages_views_label">Vues</string>
+    <string name="stats_posts_and_pages_title_label">Titre</string>
+    <string name="stats_comments_label">Commentaires</string>
+    <string name="stats_comments_title_label">Titre</string>
+    <string name="stats_comments_author_label">Auteur</string>
+    <string name="stats_comments_posts_and_pages">Articles et pages</string>
+    <string name="stats_comments_authors">Auteurs</string>
+    <string name="stats_follower_since_label">Depuis</string>
+    <string name="stats_follower_label">Abonné</string>
+    <string name="stats_followers_count_message">Total des abonnés %1$s : %2$s</string>
+    <string name="stats_followers_email">E-mail</string>
+    <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_manage_insights">Gérer les tendances</string>
+    <string name="stats_empty_insights_title">Aucune tendance n’a encore été ajoutée</string>
+    <string name="stats_no_data_yet">Aucune donnée pour le moment.</string>
+    <string name="menu_debug">Menu de débogage</string>
+    <string name="change_password_dialog_message">Modification du mot de passe…</string>
+    <string name="change_password_dialog_hint">Votre mot de passe doit contenir au moins 6 caractères. Pour le rendre plus dur à découvrir, utiliser des lettres majuscules et minuscules, des chiffres et des symboles comme ! \" ? $ % ^ &amp; ).</string>
+    <string name="change_password_confirmation">Le mot de passe a bien été changé.</string>
+    <string name="change_password">Changer le mot de passe</string>
+    <string name="support_identity_input_dialog_name_label">Nom</string>
+    <string name="history_no_title">(sans titre)</string>
+    <string name="history_preview_html">Aperçu HTML</string>
+    <string name="history_preview_visual">Aperçu visuel</string>
+    <string name="history_detail_title">Révision</string>
+    <string name="history_detail_button_previous">Précédent</string>
+    <string name="history_detail_button_next">Suivant</string>
+    <string name="media_space_used">%1$s utilisé</string>
+    <string name="enter_wpcom_or_jetpack_site">Veuillez entrer un site WordPress auto-hébergé et connecté à Jetpack ou un site WordPress.com</string>
+    <string name="history_loading_revision">Chargement de la révision</string>
+    <string name="history_loaded_revision">Révision chargée</string>
+    <string name="history_load_dialog_button_positive">Charger</string>
+    <string name="history_footer_post">Article créé le %1$s sur %2$s</string>
+    <string name="history_footer_page">Page créée le %1$s sur %2$s</string>
+    <string name="history_empty_title">Pas encore d’historique</string>
+    <string name="history_empty_subtitle_post">Lorsque vous apportez des modifications à votre article, vous pouvez voir l’historique ici</string>
+    <string name="history_empty_subtitle_page">Lorsque vous apportez des modifications à votre page, vous pouvez voir l’historique ici</string>
+    <string name="description_user">Avatar de l’utilisateur</string>
+    <string name="image_size_full_label">Taille originale</string>
+    <string name="image_size_large_label">Grande</string>
+    <string name="image_size_medium_label">Moyenne</string>
+    <string name="image_size_thumbnail_label">Miniature</string>
+    <string name="menu_history">Historique</string>
+    <string name="pages_open_page_error">La page sélectionnée n\'est pas disponible</string>
+    <string name="pages_pending">En attente de modération</string>
+    <string name="pages_empty_trashed">Vous n\'avez pas de pages dans la corbeille</string>
+    <string name="pages_empty_scheduled">Vous n\'avez pas de page planifiée</string>
+    <string name="pages_empty_drafts">Vous n\'avez pas de brouillons de page</string>
+    <string name="pages_empty_published">Vous n\'avez pas encore publié de page</string>
+    <string name="pages_search_suggestion">Rechercher dans les pages</string>
+    <string name="pages_empty_search_result">Aucune page ne correspond à votre recherche</string>
+    <string name="pages_delete_permanently">Supprimer définitivement</string>
+    <string name="pages_move_to_trash">Mettre dans la Corbeille</string>
+    <string name="pages_move_to_draft">Passer en brouillon</string>
+    <string name="pages_set_parent">Configurer le parent</string>
+    <string name="pages_view">Afficher</string>
+    <string name="pages_trashed">Mises à la Corbeille</string>
+    <string name="pages_scheduled">Planifiées</string>
+    <string name="pages_drafts">Brouillons</string>
+    <string name="pages_published">Publiées</string>
+    <string name="login_error_sms_throttled">Le nombre de tentatives d\'envoi d\'un code de vérification par SMS a été dépassé – faites une pause et redemandez-en un dans une minute.</string>
+    <string name="login_error_email_not_found_v2">Aucun compte WordPress.com ne correspond à ce compte Google.</string>
+    <string name="site_picker_remove_site_empty">Aucun site ne correspond à votre recherche</string>
+    <string name="reader_empty_followed_blogs_search_title">Aucun site ne correspond à votre recherche</string>
+    <string name="page_parent_changed">Le parent de la page a été modifié</string>
+    <string name="page_permanently_deleted">La page a été supprimée définitivement</string>
+    <string name="page_moved_to_scheduled">La page a été planifiée</string>
+    <string name="page_moved_to_published">La page a été publiée</string>
+    <string name="page_moved_to_trash">La page a été envoyée dans la corbeille</string>
+    <string name="page_moved_to_draft">La page a été déplacée dans le dossier Brouillons</string>
+    <string name="top_level">Premier niveau</string>
+    <string name="page_delete_dialog_message">Voulez-vous vraiment supprimer la page %s ?</string>
+    <string name="page_parent_change_error">Un problème est survenu lors de la modification du parent de la page</string>
+    <string name="page_status_change_error">Un problème est survenu lors de la modification de l\'état de la page</string>
+    <string name="page_delete_error">Un problème est survenu lors de la suppression de la page</string>
+    <string name="set_parent">Configurer le parent</string>
+    <string name="quick_start_focus_point_description">appuyer ici</string>
+    <string name="quick_start_list_create_site_title">Créer votre site</string>
+    <string name="quick_start_list_create_site_subtitle">Rendre votre site opérationnel</string>
+    <string name="quick_start_dialog_view_site_title">Voir votre site</string>
+    <string name="quick_start_dialog_view_site_message_short">Appuyez sur %1$s Voir le site %2$s pour prévisualiser votre site</string>
+    <string name="quick_start_dialog_share_site_title">Partager votre site</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Appuyez sur %1$s Partage %2$s pour continuer</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_connections">Appuyez sur %1$s Connexions %2$s pour ajouter vos comptes de réseaux sociaux</string>
+    <string name="quick_start_dialog_share_site_message">Connectez vos comptes de réseaux sociaux. Votre site partagera automatiquement vos nouveaux articles.</string>
+    <string name="quick_start_dialog_publish_post_title">Publier un article</string>
+    <string name="quick_start_dialog_publish_post_message_short">Appuyez sur %1$s Créer un article %2$s pour créer un article</string>
+    <string name="quick_start_dialog_need_help_title">Besoin d\'un petit coup de pouce pour commencer ?</string>
+    <string name="quick_start_dialog_need_help_button_positive">Accepter</string>
+    <string name="quick_start_dialog_need_help_button_neutral">Jamais</string>
+    <string name="quick_start_dialog_need_help_button_negative">Non, merci</string>
+    <string name="quick_start_dialog_follow_sites_title">S\'abonner à d\'autres sites</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Appuyez sur %1$s Rechercher %2$s pour rechercher des sites avec des thèmes similaires</string>
+    <string name="quick_start_dialog_follow_sites_message_short_reader">Appuyez sur %1$s Lecteur %2$s pour continuer</string>
+    <string name="quick_start_dialog_follow_sites_message">Trouvez des sites qui vous inspirent, et suivez-les pour recevoir une notification quand ils publient.</string>
+    <string name="quick_start_button_positive">C\'est parti !</string>
+    <string name="quick_start_button_negative_short">Annuler</string>
+    <string name="quick_start_button_negative">Pas maintenant</string>
+    <string name="content_description_more">Plus</string>
+    <string name="my_site_create_new_site_title">Vous n\'avez pas de sites.</string>
+    <string name="reader_empty_followed_tags_title">Aucun sujet suivi</string>
+    <string name="reader_empty_followed_tags_subtitle">Ajoutez des sujets ici pour rechercher des articles sur vos rubriques préférées</string>
+    <string name="login_to_to_connect_jetpack">Connectez-vous au compte WordPress.com que vous utilisez pour connecter Jetpack.</string>
+    <string name="install_jetpack_retry">Réessayer</string>
+    <string name="install_jetpack_continue">Configurer</string>
+    <string name="jetpack_installation_problem_message">Impossible d\'installer Jetpack pour le moment.</string>
+    <string name="jetpack_installation_problem">Un problème est survenu</string>
+    <string name="jetpack_installed">Jetpack installé</string>
+    <string name="installing_jetpack_message">Installation de Jetpack en cours sur votre site. Cette opération peut prendre quelques minutes.</string>
+    <string name="installing_jetpack">Installation de Jetpack</string>
+    <string name="install_jetpack_message">Vos informations d\'identification sur le site Web ne seront pas conservées. Elles sont utilisées uniquement pour installer Jetpack.</string>
+    <string name="install_jetpack">Installer Jetpack</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">FAQ Jetpack</string>
+    <string name="stats_jetpack_connection_setup_info">Pour utiliser les statistiques sur votre site WordPress, vous devez installer l\'extension Jetpack.</string>
+    <string name="themes_empty_list">Aucun thème ne correspond à votre recherche.</string>
+    <string name="reader_label_post_search_explainer">Que recherchez-vous ?</string>
+    <string name="site_settings_tags_empty_title_search">Aucune étiquette ne correspond à votre recherche.</string>
+    <string name="site_settings_tags_empty_title">Vous n\'avez pas d’étiquettes.</string>
+    <string name="site_settings_tags_empty_subtitle">Ajoutez ici les étiquettes que vous utilisez le plus souvent afin de pouvoir les sélectionner rapidement lors de l’ajout d’étiquettes à vos articles</string>
+    <string name="site_settings_tags_empty_button">Créer une étiquette</string>
+    <string name="media_empty_search_list">Aucun média ne correspond à votre recherche.</string>
+    <string name="sign_out_wpcom_confirm_with_no_changes">Se déconnecter de WordPress ?</string>
+    <string name="sign_out_wpcom_confirm_with_changes">Vous avez modifié des articles qui n\'ont pas été chargés sur votre site. Si vous vous déconnectez maintenant, vous perdrez ces modifications sur votre appareil. Voulez-vous vous déconnecter malgré tout ?</string>
+    <string name="people_empty_list_filtered_viewers">Pas encore de visiteurs</string>
+    <string name="people_empty_list_filtered_email_followers">Pas encore d\'abonnés par e-mail</string>
+    <string name="people_empty_list_filtered_followers">Pas encore d\'abonnés</string>
+    <string name="people_empty_list_filtered_users">Pas encore d\'utilisateurs</string>
+    <string name="reader_empty_posts_liked_description">Les articles que vous aimez apparaîtront ici</string>
+    <string name="reader_empty_posts_liked_title">Aucune mention J\'aime</string>
+    <string name="reader_empty_followed_blogs_button_followed">Accéder à la page des abonnés</string>
+    <string name="reader_empty_followed_blogs_button_discover">Découvrir des sites</string>
+    <string name="reader_empty_followed_blogs_title">Aucun site suivi</string>
+    <string name="notifications_empty_likes">Pas encore de mentions J\'aime</string>
+    <string name="notifications_empty_followers">Pas encore d\'abonnés</string>
+    <string name="activity_log_limited_content_on_free_plan">Comme vous disposez d\'un plan gratuit, vous ne verrez qu\'un nombre limité d\'événements dans vos activités.</string>
+    <string name="activity_log_empty_subtitle">Lorsque vous effectuez des modifications sur votre site, vous pouvez consulter votre historique d\'activités ici</string>
+    <string name="activity_log_empty_title">Aucune activité pour le moment</string>
+    <string name="posts_empty_list_button">Créer un article</string>
+    <string name="pages_empty_list_button">Créer une page</string>
+    <string name="media_empty_upload_media">Téléverser un média</string>
+    <string name="media_empty_list">Vous n’avez aucun média</string>
+    <string name="reader_gallery_images_desc">galerie d’images</string>
+    <string name="blavatar_desc">icône du site</string>
+    <string name="theme_image_desc">image du thème</string>
+    <string name="featured_image_desc">image mise en avant</string>
+    <string name="button_discard">Rejeter</string>
+    <string name="reader_avatar_desc">photo de profil</string>
+    <string name="notification_channel_transient_title">Transient</string>
+    <string name="support_identity_input_dialog_email_label">E-mail</string>
+    <string name="support_identity_input_dialog_enter_email">Veuillez saisir votre adresse e-mail</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Pour continuer, veuillez saisir votre adresse e-mail et votre nom</string>
+    <string name="support_push_notification_message">Nouveau message depuis \'Aide &amp; Support\'</string>
+    <string name="support_push_notification_title">WordPress</string>
+    <string name="support_contact_email_not_set">Non configuré</string>
+    <string name="support_contact_email">E-mail de contact</string>
+    <string name="application_log_button">Journal d’application</string>
+    <string name="my_tickets">Mes tickets</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Rétablissement en cours</string>
+    <string name="activity_log_currently_restoring_message">Rétablissement vers %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_title">Restauration de votre site en cours</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Votre site a bien été restauré</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Votre site a bien été rétabli\nRétabli à %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Votre site est en cours de rétablissement\nRétablissement vers %1$s %2$s</string>
+    <string name="activity_log_button">Bouton d’action de journal d’activité</string>
+    <string name="plugin_auto_managed">Auto-géré</string>
+    <string name="reader_save_posts_locally_dialog_message">Enregistrez cet article pour le consulter de nouveau quand vous le désirez. Il ne sera disponible que sur cet appareil. En effet, la synchronisation entre appareils n\'est pas disponible pour les articles enregistrés.</string>
+    <string name="reader_save_posts_locally_dialog_title">Enregistrer les articles pour plus tard</string>
+    <string name="reader_empty_search_request_failed">Impossible d’effectuer la recherche</string>
+    <string name="reader_empty_search_title">Aucun résultat trouvé</string>
+    <string name="comment_read_source_post">Lire la source de l’article</string>
+    <string name="sites">Sites</string>
+    <string name="signup_magic_link_title">Lien magique envoyé</string>
+    <string name="verification_2fa_screen_title">Code de vérification</string>
+    <string name="selfhosted_site_login_title">Informations de connexion</string>
+    <string name="magic_link_sent_login_title">Lien magique envoyé</string>
+    <string name="magic_link_login_title">Lien magique de connexion</string>
+    <string name="site_address_login_title">Adresse de site de connexion</string>
+    <string name="email_address_login_title">Adresse e-mail de connexion</string>
+    <string name="reader_empty_saved_posts_description">Appuyez sur %s pour enregistrer un article dans votre liste.</string>
+    <string name="reader_empty_saved_posts_title">Aucun article enregistré — pour le moment !</string>
+    <string name="reader_bookmark_snack_title">Article enregistré</string>
+    <string name="reader_bookmark_snack_btn">Voir tout</string>
+    <string name="reader_remove_bookmark">Supprimer des articles enregistrés</string>
+    <string name="reader_add_bookmark">Ajouter aux articles enregistrés</string>
+    <string name="reader_save_for_later_title">Articles enregistrés</string>
+    <string name="removed">Supprimés</string>
+    <string name="my_site_icon_content_description">Modifier l\'icône du site</string>
+    <string name="my_site_icon_dialog_cancel_button">Annuler</string>
+    <string name="my_site_icon_dialog_remove_button">Supprimer</string>
+    <string name="my_site_icon_dialog_change_button">Modifier</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">Vous n\'avez pas les droits suffisants pour modifier l\'icône du site.</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">Vous n\'avez pas les droits suffisants pour ajouter une icône de site.</string>
+    <string name="my_site_icon_dialog_change_message">Comment souhaitez-vous modifier l\'icône ?</string>
+    <string name="my_site_icon_dialog_add_message">Souhaitez-vous ajouter une icône de site ?</string>
+    <string name="my_site_icon_dialog_title">Icône de site</string>
+    <string name="reader_followed_blog_notifications_this">ce site</string>
+    <string name="reader_followed_blog_notifications_action">Activer</string>
+    <string name="reader_followed_blog_notifications">Activer les notifications pour %1$s%2$s%3$s ?</string>
+    <string name="reader_btn_notifications_on">Activer les notifications de site</string>
+    <string name="reader_btn_notifications_off">Désactiver les notifications de site</string>
+    <string name="activity_log_jetpack_icon">Icône Jetpack</string>
+    <string name="activity_log_event">Événement</string>
+    <string name="activity_log_icon">Icône d\'activité</string>
+    <string name="activity_log">Journal d\'activités</string>
+    <string name="privacy_policy_read">Lire la politique de confidentialité</string>
+    <string name="third_party_policy_learn_more_caption">Nous utilisons d\'autres outils de suivi, notamment des outils provenant de tiers. Découvrez-les et apprenez à les contrôler.</string>
+    <string name="third_party_policy_learn_more_header">Politique de tiers</string>
+    <string name="privacy_policy_learn_more_caption">Ces informations nous permettent d\'améliorer nos produits, de mieux cibler nos campagnes marketing, de personnaliser votre expérience WordPress.com et plus encore, comme indiqué dans notre politique de confidentialité.</string>
+    <string name="privacy_policy_learn_more_header">Politique de confidentialité</string>
+    <string name="cookie_policy_learn_more_caption">Partagez les informations concernant votre utilisation des services avec notre outil d\'analyse tout en étant connecté à votre compte WordPress.com.</string>
+    <string name="cookie_policy_learn_more_header">Politique relative aux cookies</string>
+    <string name="preference_privacy_settings">Paramètres de confidentialité</string>
+    <string name="preference_collect_information">Collecter des informations</string>
+    <string name="post_submitted">Article envoyé</string>
+    <string name="plugin_install_site_ineligible_site_graylisted">La fonctionnalité d\'extension requiert un site en règle.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Vous devez associer cet utilisateur et l’abonnement du domaine principal pour utiliser les extensions.</string>
+    <string name="plugin_install_site_ineligible_non_admin_user">Vous devez être administrateur pour utiliser les extensions.</string>
+    <string name="plugin_install_site_ineligible_no_vip_sites">Impossible d\'installer l\'extension sur des sites VIP.</string>
+    <string name="plugin_install_site_ineligible_excessive_disk_space">Impossible d\'installer l\'extension du fait de l\'espace limité sur le disque.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">Vous devez avoir une adresse e-mail vérifiée pour utiliser les extensions.</string>
+    <string name="plugin_install_site_ineligible_site_private">La fonctionnalité d\'extension requiert que le site soit public.</string>
+    <string name="plugin_install_site_ineligible_no_business_plan">Vous devez avoir souscrit au plan Business pour utiliser les extensions.</string>
+    <string name="plugin_install_site_ineligible_not_using_custom_domain">Vous devez avoir un domaine personnalisé pour utiliser les extensions.</string>
+    <string name="plugin_install_first_plugin_almost_finished_dialog_message">Nous finalisons la configuration, nous aurons bientôt terminé…</string>
+    <string name="plugin_install_first_plugin_progress_dialog_message">Installation de l\'extension en cours</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Installer</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_message">L\'installation de la première extension sur votre site peut prendre jusqu\'à 1 minute. Pendant ce temps, vous ne pourrez pas modifier votre site.</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_title">Installer l\'extension</string>
+    <string name="notification_settings_followed_dialog_title">Notifications</string>
+    <string name="notification_settings_followed_dialog_email_comments">M\'envoyer de nouveaux commentaires par e-mail</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">Hebdomadaire</string>
+    <string name="notification_settings_followed_dialog_email_posts_instantly">Instantanément</string>
+    <string name="notification_settings_followed_dialog_email_posts_daily">Journalier</string>
+    <string name="notification_settings_followed_dialog_notification_posts_switch">Nouveaux articles</string>
+    <string name="notification_settings_followed_dialog_notification_posts_description">Recevoir des notifications relatives aux nouveaux articles publiés sur ce site</string>
+    <string name="notification_settings_followed_dialog_email_posts_switch">Me tenir informé par e-mail des nouveaux articles</string>
+    <string name="notification_settings_item_your_sites_all_followed_sites">Tous les sites auxquels je suis abonné</string>
+    <string name="notification_settings_category_followed_sites">Sites suivis</string>
+    <string name="content_description_person_reading_device_notification">Appareil de lecture avec notifications</string>
+    <string name="content_description_people_looking_charts">Personne regardant des graphiques et des tableaux</string>
+    <string name="comment_title">%s sur %s</string>
+    <string name="dialog_confirm_delete_permanently_post">Voulez-vous vraiment supprimer définitivement cet article ?</string>
+    <string name="notification_channel_important_title">Important</string>
+    <string name="notification_channel_general_title">Général</string>
+    <string name="photo_picker_use_photo">Utiliser cette photo</string>
+    <string name="media_preview_title">%1$d sur %2$d</string>
+    <string name="stock_media_picker_initial_empty_subtext">Photos fournies par %s</string>
+    <string name="stock_media_picker_initial_empty_text">Rechercher des photos gratuites à ajouter à votre bibliothèque de médias</string>
+    <string name="stock_media_picker_search_hint">Rechercher une bibliothèque gratuite de photos</string>
+    <string name="photo_picker_stock_media">Choisir une photo dans une bibliothèque gratuite de photos</string>
+    <string name="error_save_empty_draft">Impossible d\'enregistrer un brouillon vide</string>
+    <string name="site_settings_quota_space_unlimited">%1$s (illimité)</string>
+    <string name="preview_count">Prévisualiser %d</string>
+    <string name="add_count">Ajouter %d</string>
+    <string name="fab_add_tag_desc">Créer une étiquette</string>
+    <string name="navigate_up_desc">faire défiler vers le haut</string>
+    <string name="notification_settings_switch_desc">Notifications</string>
+    <string name="open_external_link_desc">Ouvrir le lien externe</string>
+    <string name="show_more_desc">voir plus</string>
+    <string name="reader_photo_view_desc">photo</string>
+    <string name="reader_list_item_suggestion_remove_desc">supprimer</string>
+    <string name="photo_picker_thumbnail_desc">Lire la vidéo</string>
+    <string name="reader_cardview_post_play_video_desc">lire la vidéo à la une</string>
+    <string name="plugin_detail_logo_desc">logo de l\'extension</string>
+    <string name="plugin_detail_banner_desc">bannière de l\'extension</string>
+    <string name="photo_picker_wpmedia_desc">sélectionner à partir du média WordPress</string>
+    <string name="photo_picker_camera_desc">ouvrir l\'appareil photo</string>
+    <string name="photo_picker_device_desc">sélectionner à partir de l\'appareil</string>
+    <string name="people_invite_role_info_desc">informations sur le rôle</string>
+    <string name="media_settings_play">lire</string>
+    <string name="media_settings_image_preview_desc">Aperçu de l\'image</string>
+    <string name="media_preview_desc">prévisualiser</string>
+    <string name="media_preview_audio_desc">audio</string>
+    <string name="media_grid_item_play_video_desc">lire la vidéo</string>
+    <string name="media_grid_item_trash_desc">corbeille</string>
+    <string name="media_grid_item_retry_desc">réessayer</string>
+    <string name="media_grid_item_image_desc">aperçu du média, nom de fichier %s</string>
+    <string name="invite_user_delete_desc">supprimer %s</string>
+    <string name="profile_picture">Photo de profil de %s</string>
+    <string name="comment_checkmark_desc">coche</string>
+    <string name="signup_with_google_progress">Inscription avec Google…</string>
+    <string name="jetpack_connection_failed_with_reason">Échec de la connexion à Jetpack : %s</string>
+    <string name="jetpack_already_connected_toast">Vous êtes déjà abonné à Jetpack</string>
+    <string name="menu_undo_snackbar_action">ANNULER</string>
+    <string name="menu_visual_mode_done_snackbar">Basculé en mode visuel</string>
+    <string name="menu_visual_mode">Mode visuel</string>
+    <string name="menu_html_mode_done_snackbar">Basculé en mode HTML</string>
+    <string name="menu_html_mode">Mode HTML</string>
+    <string name="menu_preview">Prévisualiser</string>
+    <string name="menu_save_as_draft">Enregistrer comme brouillon</string>
+    <string name="file_size_in_terabytes">%s To</string>
+    <string name="file_size_in_gigabytes">%s Go</string>
+    <string name="file_size_in_megabytes">%s Mo</string>
+    <string name="file_size_in_kilobytes">%s Ko</string>
+    <string name="file_size_in_bytes">%s o</string>
+    <string name="site_settings_quota_space_value">%1$s sur %2$s</string>
+    <string name="site_settings_quota_space_hint">Si vous avez besoin de plus d\'espace, pensez à mettre à niveau votre plan WordPress.</string>
+    <string name="site_settings_quota_space_title">Espace utilisé</string>
+    <string name="site_settings_quota_header">Média</string>
+    <string name="comment_unspam_talkback">Commentaire marqué comme non indésirable</string>
+    <string name="comment_spam_talkback">Commentaire marqué comme indésirable</string>
+    <string name="comment_delete_talkback">Commentaire supprimé</string>
+    <string name="comment_untrash_talkback">Commentaire restauré</string>
+    <string name="comment_trash_talkback">Commentaire envoyé à la corbeille</string>
+    <string name="comment_unliked_talkback">Commentaire sans mention J\'aime</string>
+    <string name="comment_liked_talkback">Commentaire avec mention J\'aime</string>
+    <string name="comment_unapproved_talkback">Commentaire non approuvé</string>
+    <string name="comment_approved_talkback">Commentaire approuvé</string>
+    <string name="notif_detail_screen_title">Détail de la notification %s</string>
+    <string name="edit_photo_screen_title">Éditer photo</string>
+    <string name="share_intent_screen_title">Sélectionner le site</string>
+    <string name="signup_epilogue_screen_title">Nouveau compte</string>
+    <string name="login_epilogue_screen_title">Connecté en tant que</string>
+    <string name="person_detail_screen_title">Détail sur la personne</string>
+    <string name="media_settings_screen_title">Détails sur le fichier</string>
+    <string name="publicize_buttons_screen_title">Boutons de partage</string>
+    <string name="notifications_screen_title">Notifications</string>
+    <string name="reader_screen_title">Lecteur</string>
+    <string name="me_section_screen_title">Moi</string>
+    <string name="my_site_section_screen_title">Mon site</string>
+    <string name="notif_settings_screen_title">Paramètres de notification</string>
+    <string name="help_screen_title">Aide et support technique</string>
+    <string name="license_screen_title">Licence</string>
+    <string name="release_notes_screen_title">Notes de version</string>
+    <string name="signup_epilogue_error_avatar_view">Votre avatar a été chargé et sera bientôt disponible.</string>
+    <string name="permissions_denied_message">Il semblerait que vous ayez désactivé les autorisations obligatoires pour cette fonctionnalité.&lt;br/&gt;&lt;br/&gt;Pour modifier cela, changez vos autorisations et veillez à ce que &lt;strong&gt;%s&lt;/strong&gt; soit activé.</string>
+    <string name="permissions_denied_title">Droits</string>
+    <string name="plugin_caption_featured">À la Une</string>
+    <string name="sharing_disabled_description">Votre module Jetpack de partage étant désactivé, vos options de partage sont inaccessibles.</string>
+    <string name="sharing_disabled">Module de partage désactivé</string>
+    <string name="version_with_name_param">Version %s</string>
+    <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
+    <string name="publisher_with_company_param">Éditeur : %s</string>
+    <string name="notification_sound_has_invalid_path">Le chemin du son choisi n\'est pas valide. Choisissez-en un autre.</string>
+    <string name="quickpress_shortcut_with_account_param">QuickPress %s</string>
+    <string name="uploading_subtitle_pages_posts">%1$d pages/articles restants</string>
+    <string name="uploading_subtitle_pages_only_one">1 page restante</string>
+    <string name="uploading_subtitle_pages_only_plural">%1$d pages restantes</string>
+    <string name="uploading_subtitle_posts_only_plural">%1$d articles restants</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d pages/articles et 1 fichier restants</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d articles et 1 fichier restants</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d pages et 1 fichier restants</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_one">1 article et 1 fichier restants</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_one">1 page et 1 fichier restants</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d pages/articles et %2$d fichiers restants sur %3$d</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d articles et %2$d fichiers restants sur %3$d</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_plural">%1$d pages et %2$d fichiers restants sur %3$d</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_plural">1 article et %1$d fichiers restants sur %2$d</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_plural">1 page et %1$d fichiers restants sur %2$d</string>
+    <string name="media_file_pages_and_posts_only_not_uploaded">%1$d articles/pages non chargés</string>
+    <string name="media_file_pages_plural_only_not_uploaded">%1$d pages non chargées</string>
+    <string name="media_file_page_singular_only_not_uploaded">1 page non chargée</string>
+    <string name="media_file_posts_plural_only_not_uploaded">%1$d articles non chargés</string>
+    <string name="media_file_post_singular_only_not_uploaded">1 article non chargé</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%1$d articles/pages avec %2$d fichiers non chargés</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%1$d pages avec %2$d fichiers non chargés</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">1 page avec %1$d fichiers non chargés</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%1$d articles avec %2$d fichiers non chargés</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">1 article avec %1$d fichiers non chargés</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d articles/pages avec 1 fichier non chargé</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d pages avec 1 fichier non chargé</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 page avec 1 fichier non chargé</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d articles avec 1 fichier non chargé</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 article avec 1 fichier non chargé</string>
+    <string name="untitled_in_parentheses">(Sans titre)</string>
+    <string name="at_username">\@%s</string>
+    <string name="site_creation_domain_finish_button">Créer un site</string>
+    <string name="notification_site_creation_created">Touchez pour continuer.</string>
+    <string name="notification_site_creation_title_success">Le site a bien été créé !</string>
+    <string name="google_error_timeout">Google a mis trop longtemps à répondre. Vous devrez peut-être attendre de profiter d\'une meilleure connexion Internet.</string>
+    <string name="username_changer_title">Modifier l\'identifiant</string>
+    <string name="username_changer_hint">Appuyez pour obtenir plus de suggestions.</string>
+    <string name="username_changer_header">Votre identifiant actuel est %1$s%2$s%3$s. À quelques exceptions près, le nom que verront les autres utilisateurs est %4$s%5$s%6$s.</string>
+    <string name="username_changer_error_none">Aucun identifiant n\'est suggéré depuis %1$s%2$s%3$s. Veuillez saisir d\'autres lettres ou chiffres pour obtenir des suggestions.</string>
+    <string name="username_changer_error_generic">Une erreur s\'est produite lors de la récupération des suggestions d’identifiant.</string>
+    <string name="username_changer_dismiss_message">Annuler la modification de l’identifiant ?</string>
+    <string name="username_changer_dismiss_button_positive">Supprimer</string>
+    <string name="username_changer_action">Enregistrer</string>
+    <string name="content_description_add_avatar">Ajouter un avatar</string>
+    <string name="signup_user_exists">L\'adresse e-mail existe déjà sur WordPress.com.\nPoursuite de la connexion.</string>
+    <string name="signup_updating_account">Mise à jour du compte…</string>
+    <string name="signup_magic_link_progress">Envoi de l\'e-mail</string>
+    <string name="signup_magic_link_error_button_positive">Réessayer</string>
+    <string name="signup_magic_link_error_button_negative">Fermer</string>
+    <string name="signup_magic_link_error">Une erreur s\'est produite lors de l’envoi de l\'e-mail. Vous pouvez recommencer maintenant ou fermer et réessayer ultérieurement.</string>
+    <string name="signup_epilogue_hint_username">Identifiant</string>
+    <string name="signup_epilogue_hint_password_detail">Vous pouvez toujours vous connecter avec un lien de connexion comme celui que vous venez d\'utiliser. Vous pouvez également définir un mot de passe si vous le préférez.</string>
+    <string name="signup_epilogue_hint_password">Mot de passe (facultatif)</string>
+    <string name="signup_epilogue_hint_display">Nom affiché</string>
+    <string name="signup_epilogue_error_button_positive">Réessayer</string>
+    <string name="signup_epilogue_error_button_negative">Annuler les modifications</string>
+    <string name="signup_epilogue_error_generic">Une erreur s\'est produite lors de la mise à jour de votre compte. Vous pouvez réessayer ou annuler vos modifications pour continuer.</string>
+    <string name="signup_epilogue_error_avatar">Une erreur s\'est produite lors du chargement de votre avatar.</string>
+    <string name="plugin_needs_update">Mise à jour nécessaire</string>
+    <string name="plugin_caption_search">Chercher parmi les extensions</string>
+    <string name="plugin_caption_new">Nouvelles</string>
+    <string name="plugin_caption_popular">Populaires</string>
+    <string name="plugins_empty_search_list">Aucun résultat</string>
+    <string name="plugin_see_all">Voir tout</string>
+    <string name="plugin_manage">Gérer</string>
+    <string name="plugin_search_error">Impossible de rechercher les extensions</string>
+    <string name="plugin_installed_failed">Une erreur s\'est produite lors de l\'installation de %s</string>
+    <string name="plugin_installed_successfully">L\'extension %s a bien été installée.</string>
+    <string name="plugin_install">Installer</string>
+    <string name="site_settings_like_header">J\'aime</string>
+    <string name="my_site_add_new_site">Ajouter un nouveau site</string>
+    <string name="my_site_create_new_site">Créer un nouveau site pour votre entreprise, magazine ou blog personnel, ou connectez un site WordPress existant.</string>
+    <string name="notifications_jetpack_connection_setup_info">Pour obtenir des notifications utiles sur votre appareil à partir de votre site WordPress, vous devrez installer l\'extension Jetpack. Souhaitez-vous configurer Jetpack ?</string>
+    <string name="site_settings_lazy_load_images">Images au chargement différé</string>
+    <string name="stats_jetpack_connection_setup">Configurer Jetpack</string>
+    <string name="plugin_chevron_icon_content_description">Inverser le texte</string>
+    <string name="plugin_info_your_version">Votre version de WordPress</string>
+    <string name="plugin_info_requires_version">Nécessite WordPress version</string>
+    <string name="plugin_info_lastupdated">Dernière mise à jour</string>
+    <string name="plugin_info_version">Version</string>
+    <string name="plugin_five_stars">5 étoiles</string>
+    <string name="plugin_four_stars">4 étoiles</string>
+    <string name="plugin_three_stars">3 étoiles</string>
+    <string name="plugin_two_stars">2 étoiles</string>
+    <string name="plugin_one_stars">1 étoile</string>
+    <string name="plugin_empty_text">Non fourni</string>
+    <string name="plugin_num_downloads">%s téléchargements</string>
+    <string name="plugin_num_ratings">%s notes</string>
+    <string name="plugin_read_reviews">Lire les évaluations</string>
+    <string name="plugin_faq">Questions fréquemment posées</string>
+    <string name="plugin_whatsnew">Quoi de neuf</string>
+    <string name="plugin_installation">Installation</string>
+    <string name="plugin_description">Description</string>
+    <string name="plugin_settings">Réglages</string>
+    <string name="plugin_installed">Installée</string>
+    <string name="plugin_installed_version">Version %s installée</string>
+    <string name="plugin_version">Version %s</string>
+    <string name="plugin_byline">par %s</string>
+    <string name="change_photo">Changer la photo</string>
+    <string name="plugin_fetch_error">Impossible de charger les extensions</string>
+    <string name="my_site_btn_site_pages">Pages du site</string>
+    <string name="site_settings_tags_hint">Gérez les étiquettes de votre site</string>
+    <string name="dlg_saving_tag">Enregistrement</string>
+    <string name="dlg_deleting_tag">Suppression</string>
+    <string name="dlg_confirm_delete_tag">Supprimer définitivement la balise « %s » ?</string>
+    <string name="error_tag_exists">Une étiquette avec ce nom existe déjà</string>
+    <string name="add_new_tag">Ajout de nouvelle étiquette</string>
+    <string name="tag_description_hint">Description</string>
+    <string name="tag_name_hint">Étiquette</string>
+    <string name="site_settings_amp_summary">Votre site WordPress.com prend en charge l’utilisation d’Accelerated Mobile Pages, une initiative de Google qui accélère considérablement les temps de chargements sur les périphériques mobiles.</string>
+    <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
+    <string name="site_settings_timezones_error">Impossible de charger les fuseaux horaires</string>
+    <string name="site_settings_format_help">En savoir plus sur le formatage de date et heure</string>
+    <string name="site_settings_format_hint_custom">Format personnalisé</string>
+    <string name="site_settings_format_entry_custom">Personnalisé</string>
+    <string name="site_settings_posts_per_page_title">Articles par page</string>
+    <string name="site_settings_timezone_subtitle">Choisissez une ville dans votre fuseau horaire</string>
+    <string name="site_settings_timezone_title">Fuseau horaire</string>
+    <string name="site_settings_time_format_title">Format horaire</string>
+    <string name="site_settings_date_format_title">Format de date</string>
+    <string name="site_settings_week_start_title">La semaine commence le</string>
+    <string name="site_settings_tags_title">Étiquettes</string>
+    <string name="site_settings_traffic_header">Trafic</string>
+    <string name="delete_yes">Supprimer</string>
+    <string name="plugin_external_link_icon_content_description">Lien externe</string>
+    <string name="plugin_icon_content_description">Icône de l’extension</string>
+    <string name="plugin_home_page">Page de l’extension</string>
+    <string name="wordpress_dot_org_plugin_page">Page WordPress.org de l’extension</string>
+    <string name="plugin_remove_dialog_message">Voulez vous vraiment supprimer %1$s depuis %2$s ?\n\nCette action désactivera l’extension et supprimera tous les fichiers et données associés.</string>
+    <string name="plugin_remove_dialog_title">Supprimer l’extension</string>
+    <string name="plugin_remove_progress_dialog_message">Suppression de %s …</string>
+    <string name="plugin_disable_progress_dialog_message">Désactivation de %s …</string>
+    <string name="plugin_configuration_failed">Une erreur est survenue pendant la configuration de l\'extension : %s</string>
+    <string name="plugin_remove_failed">Erreur de suppression de %s.</string>
+    <string name="plugin_removed_successfully">Suppression réussie de %s.</string>
+    <string name="plugin_updated_failed_detailed">Erreur de mise à jour de %1$s : %2$s</string>
+    <string name="plugin_updated_failed">Erreur de mise à jour de %s.</string>
+    <string name="plugin_updated_successfully">Mise à jour effectuée pour %s.</string>
+    <string name="plugin_available_version">Version %s disponible.</string>
+    <string name="plugin_detail_label_state_autoupdates">Mises à jour automatiques</string>
+    <string name="plugin_detail_label_state_active">Actif</string>
+    <string name="plugin_inactive">Inactif</string>
+    <string name="plugin_active">Actif</string>
+    <string name="plugins">Extensions</string>
+    <string name="my_site_btn_plugins">Extensions</string>
+    <string name="media_edit_link_hint">Ouvrir le lien dans une nouvelle fenêtre/onglet</string>
+    <string name="media_edit_link_text">Lien vers</string>
+    <string name="notification_login_failed">Une erreur est survenue.</string>
+    <string name="notification_2fa_needed">Veuillez fournir un code d\'authentification pour continuer. </string>
+    <string name="notification_error_wrong_password">Veuillez confirmer deux fois votre mot de passe pour continuer.</string>
+    <string name="notification_login_title_stopped">Connexion stoppée</string>
+    <string name="notification_logging_in">Veuillez patienter durant la connexion.</string>
+    <string name="notification_login_title_in_progress">Connexion en cours…</string>
+    <string name="notification_logged_in">Touchez pour continuer.</string>
+    <string name="notification_login_title_success">Connecté⋅e !</string>
+    <string name="login_error_generic_start">La connexion Google n’a pas pu démarrer.</string>
+    <string name="login_empty_password">Veuillez saisir un mot de passe</string>
+    <string name="login_text_otp_another">Envoyez-moi un autre code à la place</string>
+    <string name="enter_verification_code_sms">Nous envoyons un message texte au numéro de téléphone se terminant par %s. Veuillez saisir le code de vérification dans le SMS.</string>
+    <string name="image_size">Taille</string>
+    <string name="uploading_subtitle_media_only_one">1 fichier restant</string>
+    <string name="uploading_subtitle_media_only">%1$d fichiers sur %2$d fichiers</string>
+    <string name="uploading_subtitle_posts_only_one">1 article restant</string>
+    <string name="uploading_title">Téléversement…</string>
+    <string name="media_files_uploaded_write_post">Écrire un article</string>
+    <string name="media_all_files_uploaded_successfully">%d fichiers ont bien été téléversés</string>
+    <string name="media_files_uploaded_successfully">, %d a bien été téléversé</string>
+    <string name="media_file_uploaded">1 fichier téléversé</string>
+    <string name="media_file_not_uploaded">1 fichier non téléversé</string>
+    <string name="media_files_uploaded">%d fichiers téléversés</string>
+    <string name="media_files_not_uploaded">%d fichiers non téléversés</string>
+    <string name="remove_image_from_post">Retirer de l’article</string>
+    <string name="confirm_remove_media_image">Retirer cette image de l’article ?</string>
+    <string name="media_edit_customize_card_caption">Personnaliser</string>
+    <string name="media_edit_file_details_card_caption">Détails du fichier</string>
+    <string name="login_error_suffix">Essayer avec un autre compte ?</string>
+    <string name="login_error_generic">Il y a eu des problèmes avec le compte Google.</string>
+    <string name="login_error_button">Fermer</string>
+    <string name="enter_wpcom_password_google">Pour faire cela avec ce compte Google, veuillez fournir le mot de passe WordPress.com correspondant. Ceci ne sera demandé qu’une seule fois.</string>
+    <string name="error_generic_network">Une erreur réseau est survenue. Veuillez vérifier votre connexion et essayer à nouveau.</string>
+    <string name="post_settings_remove_featured_image">Retirer l’image mise en avant</string>
+    <string name="post_settings_choose_featured_image">Choisir l’image mise en avant</string>
+    <string name="login_log_in_for_share_intent">Connectez-vous sur WordPress.com pour partager ce contenu.</string>
+    <string name="enter_site_address_share_intent">Saisissez l’adresse du site WordPress sur lequel vous souhaitez partager le contenu.</string>
+    <string name="jetpack_disconnect_error_toast">Erreur lors de la déconnexion du site</string>
+    <string name="jetpack_disconnect_success_toast">Site déconnecté</string>
+    <string name="jetpack_disconnect_confirm">Déconnexion</string>
+    <string name="jetpack_disconnect_confirmation_message">Êtes-vous certain de vouloir déconnecter Jetpack de ce site ?</string>
+    <string name="jetpack_disconnect_pref_title">« Déconnecter de WordPress.com »</string>
+    <string name="site_settings_jetpack_allowlist_description">Vous pouvez marquer une adresse IP (ou une série d’adresses IP) comme « Toujours autorisé » pour empêcher leur blocage par Jetpack. IPv4 et IPv6 sont acceptables. Pour spécifier une plage, entrez la valeur basse et la valeur haute en les séparant par un tiret. Exemple : 12.12.12.1–12.12.12.100</string>
+    <string name="jetpack_require_two_factor_title">Nécessite une authentification en deux étapes</string>
+    <string name="jetpack_match_wpcom_via_email_title">Faire correspondre les comptes en utilisant l’e-mail</string>
+    <string name="jetpack_allow_wpcom_sign_in_title">Autoriser la connexion via WordPress.com</string>
+    <string name="jetpack_wpcom_sign_in_category_title">Connexion via WordPress.com</string>
+    <string name="jetpack_prevent_brute_force_title">Bloquer les tentatives de connexion malicieuses</string>
+    <string name="jetpack_prevent_brute_force_category_title">Protection contre les attaques en Brute force</string>
+    <string name="jetpack_send_wp_notifications_title">Envoyer des Notifications push</string>
+    <string name="jetpack_send_email_notifications_title">Envoyer des notifications par e-mail</string>
+    <string name="jetpack_monitor_uptime_title">Monitorer la disponibilité de votre site</string>
+    <string name="jetpack_security_setting_title">Sécurité</string>
+    <string name="jetpack_site_settings_category_title">Réglages de Jetpack</string>
+    <string name="share_intent_adding_to">Ajouter à</string>
+    <string name="share_intent_pick_site">Sélectionner un site</string>
+    <string name="share_action_media">Ajouter à la bibliothèque de médias</string>
+    <string name="share_action_post">Ajouter à un nouvel article</string>
+    <string name="share_media_permission_required">Permissions obligatoires pour partager des images ou des vidéos</string>
+    <string name="invalid_ip_or_range">Adresse IP ou plage d’IP non valide</string>
+    <string name="deleting_media_dlg">Suppression</string>
+    <string name="confirm_delete_media_video">Supprimer cette vidéo ?</string>
+    <string name="confirm_delete_media_image">Supprimer cette image ?</string>
+    <string name="media_title_document_details">Détails du document</string>
+    <string name="media_title_audio_details">Détails audio</string>
+    <string name="media_title_video_details">Détails de la vidéo</string>
+    <string name="media_title_image_details">Détails de l’image</string>
+    <string name="fab_content_description_preview">Prévisualiser</string>
+    <string name="media_edit_upload_date_caption">Date de téléversement</string>
+    <string name="media_edit_duration_caption">Durée</string>
+    <string name="media_edit_video_dimensions_caption">Dimensions de la vidéo</string>
+    <string name="media_edit_image_dimensions_caption">Dimensions de l’image</string>
+    <string name="media_edit_filetype_caption">Type de fichier</string>
+    <string name="media_edit_filename_caption">Nom du fichier</string>
+    <string name="media_edit_url_caption">URL</string>
+    <string name="media_edit_alttext_text">Texte alternatif</string>
+    <string name="connect_site">Connectez un site</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Faire clignoter la lumière</string>
+    <string name="notification_settings_item_sights_and_sounds_vibrate_device">Faire vibrer l\'appareil</string>
+    <string name="notification_settings_item_sights_and_sounds_choose_sound">Choisir un son</string>
+    <string name="notification_settings_category_sights_and_sounds">Images et sons</string>
+    <string name="notification_settings_item_other_account_emails">E-mail WordPress.com</string>
+    <string name="notification_settings_item_other_pending_drafts">M\'avertir lorsque des brouillons sont en attente</string>
+    <string name="notification_settings_item_other_comments_other_blogs">Commentaires sur d\'autres sites</string>
+    <string name="notification_settings_category_other">Autre</string>
+    <string name="notification_settings_item_your_sites_all_your_sites">Tous mes sites</string>
+    <string name="notification_settings_category_your_sites">Vos sites</string>
+    <string name="notification_settings_main_off_message">En désactivant le réglage de notifications, vous désactiverez toutes les notifications de cette application quel que soit le type. Vous pouvez affiner le type de notification que vous recevez après avoir activé le réglage de notification.</string>
+    <string name="notification_settings_main_off_title">Pour recevoir les notifications sur cet appareil, activez le réglage de notification.</string>
+    <string name="notification_settings_main_hint_off">Activer les notifications</string>
+    <string name="notification_settings_main_hint_on">Désactiver les notifications</string>
+    <string name="notification_settings_main_status_off">Désactivé</string>
+    <string name="notification_settings_main_status_on">Activé</string>
+    <string name="max_video_resolution">Taille de vidéo maximale</string>
+    <string name="max_thumbnail_px_size">Taille maximale d’image</string>
+    <string name="error_upload_post_media_param">Une erreur est survenue lors du téléversement du contenu multimédia dans cet article : %s.</string>
+    <string name="error_upload_post_param">Une erreur est survenue lors du téléversement de cet article : %s.</string>
+    <string name="add_media_progress">Ajouter un média</string>
+    <string name="reader_excerpt_link">Rendez vous sur %s pour en savoir plus</string>
+    <string name="error_unknown_page">Page introuvable sur le serveur</string>
+    <string name="error_publish_empty_page">Impossible de publier une page vide</string>
+    <string name="upload_failed_param">Échec du téléversement de « %s »</string>
+    <string name="cannot_retry_deleted_media_item">Le contenu multimédia a été supprimé. Voulez-vous le supprimer de cet article ?</string>
+    <string name="error_please_choose_browser">Une erreur s\'est produite à l\'ouverture du navigateur Web par défaut. Veuillez choisir une autre application :</string>
+    <string name="cant_open_url">Impossible d\'ouvrir le lien</string>
+    <string name="error_unknown_post">Article introuvable sur le serveur</string>
+    <string name="error_post_does_not_exist">Cet article n’existe plus</string>
+    <string name="error_media_canceled">Le téléversement du contenu multimédia a été annulé</string>
+    <string name="error_upload_page_media_param">Une erreur est survenue lors du téléversement du contenu multimédia dans cette page : %s.</string>
+    <string name="error_upload_page_param">Une erreur est survenue lors du chargement de cette page : %s.</string>
+    <string name="editor_uploading_post">Votre article est en cours de téléversement</string>
+    <string name="uploading_media">Téléversement du média…</string>
+    <string name="page_scheduled">Page planifiée</string>
+    <string name="post_scheduled">Article planifié</string>
+    <string name="button_retry">Réessayer</string>
+    <string name="post_queued">Article placé en file d\'attente</string>
+    <string name="uploading_post">téléversement de « %s »</string>
+    <string name="connection_to_server_lost">La connexion au serveur a été perdue</string>
+    <string name="login_epilogue_mysites_other">Mes sites</string>
+    <string name="login_epilogue_mysites_one">Mon site</string>
+    <string name="login_email_client_not_found">Aucune application de messagerie détectée</string>
+    <string name="login_empty_2fa">Veuillez saisir votre code de vérification</string>
+    <string name="login_empty_username">Veuillez saisir un identifiant</string>
+    <string name="login_log_in_for_deeplink">Connectez-vous à WordPress.com pour accéder à l’article.</string>
+    <string name="login_error_while_adding_site">Erreur lors de l’ajout du site. Code erreur : %s</string>
+    <string name="login_checking_site_address">Vérification de l’adresse du site</string>
+    <string name="login_site_address_more_help">Besoin d’aide ?</string>
+    <string name="login_site_address_help_content">L’adresse de votre site apparait dans la barre en haut de l’écran quand vous visitez votre site avec Chrome.</string>
+    <string name="login_site_address_help_title">Quelle est l’adresse de mon site ?</string>
+    <string name="login_site_address">Adresse du site</string>
+    <string name="enter_site_address">Saisissez l’adresse du site WordPress que vous voulez connecter.</string>
+    <string name="login_already_logged_in_wpcom">Déjà connecté·e à WordPress.com</string>
+    <string name="login_continue">Continuer</string>
+    <string name="connect_more">Connectez un autre site</string>
+    <string name="enter_wpcom_password">Saisissez votre mot de passe WordPress.com.</string>
+    <string name="login_magic_link_email_requesting">Demande de l’e-mail de connexion</string>
+    <string name="password_incorrect">Il semblerait que ce mot de passe est incorrect. Veuillez vérifier et essayer à nouveau.</string>
+    <string name="requesting_otp">Demande d’un code de vérification par SMS.</string>
+    <string name="login_text_otp">Envoyez-moi un code par SMS à la place</string>
+    <string name="enter_verification_code">On y est presque ! Veuillez saisir le code de vérification de votre app d’authentification.</string>
+    <string name="next">Suivant</string>
+    <string name="enter_email_wordpress_com">Connectez-vous à WordPress.com en utilisant une adresse de messagerie pour gérer tous vos sites WordPress.com.</string>
+    <string name="image_optimization_promo_desc">L’optimisation réduit la taille des images pour un téléversement plus rapide.\n\nVous pouvez changer ceci à tout moment, dans les réglages du site.</string>
+    <string name="image_optimization_promo_title">Activer l’optimisation des images ?</string>
+    <string name="leave_off">Laisser désactivée</string>
+    <string name="turn_on">Activer</string>
+    <string name="me_profile_photo">Photographie de profil.</string>
+    <string name="error_media_parse_error">Réponse inattendue reçue du serveur.</string>
+    <string name="upload_finished_toast">Impossible de stopper le téléversement car il est déjà terminé.</string>
+    <string name="post_title">Titre</string>
+    <string name="menu_redo">Refaire</string>
+    <string name="menu_undo">Annuler</string>
+    <string name="error_media_small">Le média est trop petit pour s’afficher</string>
+    <string name="editor_dropped_unsupported_files">Attention : les éléments glissés ne sont pas tous pris en charge !</string>
+    <string name="editor_dropped_title_images_not_allowed">Il n\'est pas permis de glisser des images dans le champ Titre</string>
+    <string name="editor_dropped_text_error">Erreur survenue pendant le glisser-déposer du texte</string>
+    <string name="editor_dropped_html_images_not_allowed">Il n\'est pas permis de glisser des images en mode HTML</string>
+    <string name="editor_content_hint">Partagez votre histoire ici…</string>
+    <string name="post_status_post_private">Privé</string>
+    <string name="post_status_draft">Brouillon</string>
+    <string name="post_status_pending_review">En attente de relecture</string>
+    <string name="post_status_publish_post">Publier</string>
+    <string name="now">Maintenant</string>
+    <string name="post_settings_password_dialog_hint">Seules les personnes disposant de ce mot de passe peuvent consulter cet article.</string>
+    <string name="post_settings_excerpt_dialog_hint">Les extraits sont des résumés manuels facultatifs de votre contenu.</string>
+    <string name="post_settings_slug_dialog_hint">Le slug est la version « compatible URL » du titre de la publication.</string>
+    <string name="post_settings_post_format">Format d’article</string>
+    <string name="post_settings_tags">Etiquettes</string>
+    <string name="post_settings_slug">Slug</string>
+    <string name="post_settings_excerpt">Extrait</string>
+    <string name="post_settings_not_set">Non configuré</string>
+    <string name="post_settings_more_options">Plus d’options</string>
+    <string name="post_settings_categories_and_tags">Catégories et étiquettes</string>
+    <string name="notifications_tab_title_all">Tous</string>
+    <string name="top_level_category_name">Niveau le plus haut</string>
+    <string name="category_parent">Catégorie parente (facultative) :</string>
+    <string name="media_empty_audio_list">Vous n\'avez aucun fichier audio</string>
+    <string name="media_empty_documents_list">Vous n\'avez aucun document</string>
+    <string name="media_empty_videos_list">Vous n\'avez aucune vidéo</string>
+    <string name="media_empty_image_list">Vous n\'avez aucune image</string>
+    <string name="media_error_timeout">Le serveur a mis trop longtemps à répondre</string>
+    <string name="media_error_exceeds_memory_limit">Le fichier est trop gros pour être téléversé sur ce site</string>
+    <string name="media_error_exceeds_php_filesize">Le fichier dépasse la taille maximale que ce site peut recevoir</string>
+    <string name="media_error_http_too_large_video_upload">Vidéo trop grosse pour être téléversée</string>
+    <string name="media_error_http_too_large_photo_upload">Image trop grande être téléversée. Essayez de changer le réglage Optimisation d\'Images de votre site</string>
+    <string name="media_audio">Fichier audio</string>
+    <string name="media_videos">Vidéos</string>
+    <string name="media_documents">Documents</string>
+    <string name="media_images">Images</string>
+    <string name="media_all">Tous</string>
+    <string name="photo_picker_soft_ask_permissions_denied">%1$s s\'est vu refuser l\'accès à vos photos. Pour résoudre ce problème, modifiez vos autorisations et activez %2$s.</string>
+    <string name="reader_view_comments">Afficher les commentaires</string>
+    <string name="site_settings_video_quality_hint">Qualité des vidéos. Des valeurs élevées signifient une meilleure qualité des vidéos.</string>
+    <string name="site_settings_video_width_hint">Redimensionne les vidéos des articles à cette taille</string>
+    <string name="site_settings_optimize_video_summary">Autoriser le redimensionnement et la compression des vidéos</string>
+    <string name="site_settings_optimize_videos">Optimiser les vidéos</string>
+    <string name="draft_uploaded">Brouillon téléversé</string>
+    <string name="report_bug">Rapport de bug</string>
+    <string name="video_quality">Qualité vidéo</string>
+    <string name="permission_camera">Appareil photo</string>
+    <string name="permission_storage">Stockage</string>
+    <string name="button_edit_permissions">Modifier les permissions</string>
+    <string name="photo_picker_soft_ask_allow">Autoriser</string>
+    <string name="photo_picker_soft_ask_label">%s a besoin de permissions pour avoir accès à vos photos</string>
+    <string name="sharing_twitter_message">Ceci sera inclus dans les tweets quand les visiteurs feront un partage à l\'aide du bouton Twitter </string>
+    <string name="sharing_label_message">Modifiez le texte de l’étiquette des boutons de partage. Vous devez ajouter au moins un bouton de partage pour que ce texte apparaisse.</string>
+    <string name="connecting_account">Connexion du compte</string>
+    <string name="cannot_connect_account_error">La connexion à %s n’a pas pu être établie parce qu’aucun compte n’a été choisi.</string>
+    <string name="connected">Connecté</string>
+    <string name="twitter">Twitter</string>
+    <string name="likes">Mentions J\'aime</string>
+    <string name="sharing_comment_likes_description">Permettre à tous les commentaires d\'être aimés par vous et vos lecteurs</string>
+    <string name="buttons">Boutons</string>
+    <string name="sharing_edit_more_buttons">Modifier les boutons « Plus »</string>
+    <string name="sharing_more_description">Le bouton « Plus » permet d\'afficher les boutons de partage dans une liste déroulante.</string>
+    <string name="sharing_sharing_buttons_description">Choisissez quels boutons seront affichés sous vos articles</string>
+    <string name="twitter_username">Identifiant Twitter</string>
+    <string name="sharing_comment_likes">Mentions J\'aime pour les commentaires</string>
+    <string name="button_style">Style de bouton</string>
+    <string name="label">Nom</string>
+    <string name="sharing_buttons">Boutons de partage</string>
+    <string name="site_settings_like">Voir le bouton \"J\'aime\"</string>
+    <string name="site_settings_reblog">Voir le bouton \"Rebloguer\"</string>
+    <string name="site_settings_reblog_and_like_header">Rebloguer et aimer</string>
+    <string name="official_buttons_display">Boutons officiels</string>
+    <string name="text_only_display">Texte seulement</string>
+    <string name="icon_only_display">Icône seulement</string>
+    <string name="icon_and_text_display">Icône et texte</string>
+    <string name="connection_chooser_message">Choisissez le compte que voulez autoriser. Notez que vos articles seront automatiquement partagés au compte choisi.</string>
+    <string name="connecting_social_network">Connexion à %s</string>
+    <string name="dlg_confirm_publicize_disconnect">Déconnecter de %s ?</string>
+    <string name="share_btn_connect_another_account">Connecter un autre compte</string>
+    <string name="share_btn_reconnect">Reconnecter</string>
+    <string name="share_btn_disconnect">Déconnecter</string>
+    <string name="share_btn_connect">Connecter</string>
+    <string name="connection_service_description">Connectez-vous pour partager automatiquement vos articles de blog vers %s.</string>
+    <string name="connection_service_label">Publier sur %s</string>
+    <string name="connected_accounts_label">Comptes connectés</string>
+    <string name="connections_description">Connectez vos réseaux sociaux préférés pour partager automatiquement vos articles de blog avec vos amis.</string>
+    <string name="connections_label">Connections</string>
+    <string name="sharing">Partage</string>
+    <string name="tabbar_accessibility_label_notifications">Notifications. Gérez vos notifications.</string>
+    <string name="tabbar_accessibility_label_reader">Lecteur. Suivez le contenu d\'autres sites.</string>
+    <string name="tabbar_accessibility_label_my_site">Mon site. Affichez votre site et gérez-le, y compris les statistiques.</string>
+    <string name="my_site_btn_sharing">Partage</string>
+    <string name="button_not_now">Pas maintenant</string>
+    <string name="media_error_internal_server_error">Erreur de téléversement. Essayez de changer l\'option « Optimiser les images » dans les réglages de votre site.</string>
+    <string name="media_downloading">Enregistrement du fichier sur cet appareil</string>
+    <string name="error_media_save">Impossible d’enregistrer les médias</string>
+    <string name="editor_draft_saved_locally">Brouillon enregistré sur l’appareil</string>
+    <string name="editor_draft_saved_online">Brouillon enregistré en ligne</string>
+    <string name="editor_post_saved_locally">Article enregistré sur l’appareil</string>
+    <string name="button_sync">Synchroniser</string>
+    <string name="smart_toast_comments_long_press">Touchez et maintenez la pression pour sélectionner plusieurs commentaires</string>
+    <string name="photo_picker_choose_video">Choisissez une vidéo sur votre appareil</string>
+    <string name="photo_picker_choose_photo">Choisissez une photo sur votre appareil</string>
+    <string name="wp_media_title">Média WordPress</string>
+    <string name="media_insert_as_gallery">Ajouter en tant que galerie</string>
+    <string name="media_insert_individually">Ajouter individuellement</string>
+    <string name="media_insert_title">Ajouter plusieurs photos</string>
+    <string name="media_gallery_column_count_multi">%d colonnes</string>
+    <string name="media_gallery_column_count_single">Une colonne</string>
+    <string name="editor_confirm_email_prompt_negative">Renvoyer l\'e-mail</string>
+    <string name="editor_confirm_email_prompt_message_with_email">Lors de votre première inscription, nous avons envoyé un e-mail à %s. Veuillez ouvrir le message et cliquer sur le bouton bleu pour activer la publication.</string>
+    <string name="editor_confirm_email_prompt_message">Lors de votre première inscription, nous vous avons envoyé un e-mail. Veuillez ouvrir le message et cliquer sur le bouton bleu pour activer la publication.</string>
+    <string name="editor_confirm_email_prompt_title">Validez votre adresse e-mail</string>
+    <string name="toast_verification_email_send_error">Erreur lors de l\'envoi de l\'e-mail de vérification. Avez-vous déjà vérifié ?</string>
+    <string name="toast_verification_email_sent">E-mail de vérification envoyé, vérifiez votre boîte de réception</string>
+    <string name="toast_saving_post_as_draft">Enregistrement d\'un article en tant que brouillon</string>
+    <string name="photo_picker_capture_video">Prendre une vidéo</string>
+    <string name="photo_picker_capture_photo">Prendre une photo</string>
+    <string name="delete_site_warning_subtitle">Attention ! Une fois qu’un site est supprimé, il ne peut plus être récupéré. Réfléchissez bien avant de poursuivre.</string>
+    <string name="delete_site_warning">L\'intégralité de vos articles, images et données sera supprimée. Et l\'adresse de ce site (%s) sera perdue.</string>
+    <string name="delete_site_warning_title">Supprimer le site ?</string>
+    <string name="start_over_email_intent_error">Impossible d\'envoyer un e-mail</string>
+    <string name="start_over_email_body">Je souhaite recommencer avec le site %s</string>
+    <string name="start_over_email_subject">Recommencer avec le site %s</string>
+    <string name="site_picker_remove_site_error">Erreur lors de la suppression du site, réessayez</string>
+    <string name="editor_post_saved_locally_failed_media">Cet article a des fichiers joints dont le téléversement a échoué. Il a été enregistré localement</string>
+    <string name="sure_to_remove_account">Supprimer ce site de l\'application ?</string>
+    <string name="photo_picker_title">Choisir une photo</string>
+    <string name="error_publish_no_network">L’appareil est hors ligne. L’article a été enregistré localement.</string>
+    <string name="editor_post_saved_online">Article enregistré en ligne</string>
+    <string name="site_settings_image_quality_hint">Qualité des images. Des valeurs élevées signifient une meilleure qualité d’image.</string>
+    <string name="site_settings_optimize_images_summary">Autoriser le redimensionnement et la compression des images</string>
+    <string name="media_encoder_quality_100">Maximum</string>
+    <string name="media_encoder_quality_95">Très élevé</string>
+    <string name="media_encoder_quality_90">Élevé</string>
+    <string name="media_encoder_quality_85">Moyen</string>
+    <string name="media_encoder_quality_80">Faible</string>
+    <string name="media_upload_state_uploaded">Téléversé</string>
+    <string name="media_upload_state_failed">Téléversement échoué</string>
+    <string name="media_upload_state_deleted">Supprimé</string>
+    <string name="media_upload_state_deleting">Suppression</string>
+    <string name="media_upload_state_uploading">Téléversement</string>
+    <string name="media_upload_state_queued">En file d\'attente</string>
+    <string name="image_quality">Qualité d’image</string>
+    <string name="error_all_media_upload_canceled">Tous les téléversements de médias ont été annulés à cause d’une erreur inconnue. Veuillez essayer à nouveau le téléversement.</string>
+    <string name="error_unknown_post_type">Format d\'article inconnu</string>
+    <string name="submit_for_review">Envoyer</string>
+    <string name="duplicate_site_detected">Un site dupliqué a été détecté.</string>
+    <string name="cannot_add_duplicate_site">Ce site existe déjà dans l’app. Vous ne pouvez pas l’ajouter.</string>
+    <string name="already_logged_in_wpcom">Vous êtes déjà connecté à votre compte WordPress.com. Vous ne pouvez pas ajouter un site WordPress.com lié à un autre compte.</string>
+    <string name="error_media_load">Impossible de charger le média</string>
+    <string name="error_media_refresh_no_connection">Connexion obligatoire pour actualiser la bibliothèque</string>
+    <string name="error_media_unauthorized">Vous n’avez pas le droit de voir ni de modifier le média</string>
+    <string name="error_media_not_found">Média introuvable</string>
+    <string name="error_media_insufficient_fs_permissions">Vous n\'avez pas les droits de lecture pour les fichiers médias de cet appareil</string>
+    <string name="site_settings_optimize_images">Optimiser les images</string>
+    <string name="media_generic_error">Une erreur de média s’est produite</string>
+    <string name="media_upload_error">Une erreur de téléversement de média s’est produite</string>
+    <string name="retry">Réessayer</string>
+    <string name="confirm">Confirmer</string>
+    <string name="xmlrpc_endpoint_forbidden_error">Connexion impossible. Nous avons reçu une erreur 403 lors de \nnotre tentative d\'accès au point de terminaison XML-RPC de votre site. \nL’application en a besoin pour communiquer avec votre site. \nContactez votre hébergeur pour résoudre ce problème.</string>
+    <string name="xmlrpc_post_blocked_error">Connexion impossible. Votre hébergeur bloque les requêtes POST\ndont votre application a besoin pour communiquer avec votre site. \nContactez-le pour résoudre ce problème.</string>
+    <string name="reader_hint_search_followed_sites">Rechercher parmi les sites suivis</string>
+    <string name="pending_draft_one_generic">Ne le laissez pas sur la touche&amp;nbsp;! «&amp;nbsp;%1$s&amp;nbsp;» attendre d’être publié.</string>
+    <string name="pending_draft_one_month">Ne le laissez pas sur la touche&amp;nbsp;! «&amp;nbsp;%1$s&amp;nbsp;» attendre d’être publié.</string>
+    <string name="pending_draft_one_week_2">«&amp;nbsp;%1$s&amp;nbsp;» est toujours un brouillon. N\'oubliez pas de le publier&amp;nbsp;!</string>
+    <string name="pending_draft_one_week_1">Votre brouillon «&amp;nbsp;%1$s&amp;nbsp;» vous attend - faites en sorte de le publier&amp;nbsp;!</string>
+    <string name="pending_draft_one_day_2">Saviez-vous que «&amp;nbsp;%1$s&amp;nbsp;» est toujours un brouillon&amp;nbsp;? Publiez-le&amp;nbsp;!</string>
+    <string name="pending_draft_one_day_1">Vous avez commencé «&amp;nbsp;%1$s&amp;nbsp;» hier. N\'oubliez pas de le publier&amp;nbsp;!</string>
+    <string name="reader_label_visit">Aller sur le site</string>
+    <string name="swipe_for_more">Glissez pour plus</string>
+    <string name="reader_err_get_post_not_authorized_signin_fallback">Vous n’êtes pas autorisé à voir cet article. Essayez de vous connecter à WordPress.com ou utilisez le bouton en haut pour l’ouvrir dans le navigateur à la place.</string>
+    <string name="reader_err_get_post_not_authorized_signin">Vous n\'êtes pas autorisé à voir ce poste. Essayez de vous connecter à WordPress.com d\'abord.</string>
+    <string name="reader_err_get_post_not_authorized_fallback">Vous n\'êtes pas autorisé à voir cet article. Utilisez le bouton d\'action pour essayer dans un navigateur à la place.</string>
+    <string name="reader_snackbar_err_cannot_like_post_logged_out">Vous ne pouvez pas aimer tant que vous êtes déconnecté de WordPress.com</string>
+    <string name="reader_toast_err_already_liked">Vous avez déjà aimé ce commentaire</string>
+    <string name="reader_toast_err_comment_not_found">Commentaire introuvable !</string>
+    <string name="reader_toast_err_cannot_like_post">La tentative pour aimer cet article a échoué</string>
+    <string name="error_notif_q_action_reply">Vous ne pouvez pas répondre pour commenter. Veuillez réessayer plus tard.</string>
+    <string name="error_notif_q_action_approve">Impossible d\'approuver ce commentaire. Veuillez réessayer plus tard.</string>
+    <string name="error_notif_q_action_like">Impossible d\'aimer ce commentaire. Veuillez réessayer plus tard.</string>
+    <string name="notifications_label_new_notifications_subtitle">Touchez pour les afficher</string>
+    <string name="notifications_label_new_notifications">Nouvelles notifications</string>
+    <string name="comment_q_action_replying">Réponse en cours…</string>
+    <string name="comment_q_action_approving">Approbation en cours…</string>
+    <string name="comment_q_action_liking">Aimer…</string>
+    <string name="comment_q_action_processing">Traitement en cours…</string>
+    <string name="comment_q_action_done_generic">Terminé !</string>
+    <string name="comment_liked">Commentaire aimé</string>
+    <string name="signout">Se déconnecter</string>
+    <string name="sign_in_wpcom">Se connecter à WordPress.com</string>
+    <string name="reader_label_global_related_posts">Articles connexes sur WordPress.com</string>
+    <string name="reader_label_local_related_posts">Plus de %s</string>
+    <string name="preference_open_device_settings">Accéder aux paramètres système</string>
+    <string name="invite_invalid_email">%s : Email invalide</string>
+    <string name="invite_user_blocked_invites">%s: L\'utilisateur a bloqué les invitations</string>
+    <string name="invite_already_following">%s: Vous suit déjà</string>
+    <string name="invite_already_a_member">%s : Déjà membre</string>
+    <string name="invite_username_not_found">%s : Utilisateur non trouvé</string>
+    <string name="comment_moderated_approved">Commentaire approuvé !</string>
+    <string name="like">Like</string>
+    <string name="timespan_now">maintenant</string>
+    <string name="role_viewer">Lecteur</string>
+    <string name="role_follower">Abonné</string>
+    <string name="error_post_my_profile_no_connection">Aucune connexion, impossible d\'enregistrer le profil</string>
+    <string name="alignment_right">Droit</string>
+    <string name="alignment_left">Gauche</string>
+    <string name="alignment_none">Aucun</string>
+    <string name="site_settings_list_editor_action_mode_title">Sélectionné %1$d</string>
+    <string name="error_fetch_users_list">Impossible de récupérer les utilisateurs du site</string>
+    <string name="title_email_follower">E-mail de l’abonné</string>
+    <string name="title_follower">Abonné</string>
+    <string name="people_fetching">Récupération des utilisateurs…</string>
+    <string name="people_dropdown_item_viewers">Lecteurs</string>
+    <string name="people_dropdown_item_email_followers">Abonnés par E-mail</string>
+    <string name="people_dropdown_item_followers">Abonnés</string>
+    <string name="people_dropdown_item_team">Équipe</string>
+    <string name="invite_message_usernames_limit">Invitez jusqu’à 10 adresses e-mail ou identifiants WordPress.com. Ceux nécessitant un identifiant recevront les indications pour le créer.</string>
+    <string name="viewer_remove_confirmation_message">Si vous supprimez ce compte de lecteur/trice, il ou elle ne pourra plus se rendre sur ce site.\n\nVoulez-vous toujours supprimer ce compte ?</string>
+    <string name="follower_remove_confirmation_message">Une fois supprimé, cet abonné ne recevra plus de notifications à propos de ce site, à moins de se réabonner.\n\nVoulez-vous vraiment supprimer cet abonné ?</string>
+    <string name="follower_subscribed_since">Depuis le %1$s</string>
+    <string name="error_remove_viewer">Impossible de supprimer le lecteur</string>
+    <string name="error_remove_follower">Impossible de supprimer l\'abonné</string>
+    <string name="error_fetch_email_followers_list">Impossible de récupérer les abonnés par e-mail</string>
+    <string name="error_fetch_followers_list">Impossible de récupérer les abonnés au site</string>
+    <string name="editor_failed_uploads_switch_html">Le téléversement de certains fichiers a échoué. Vous ne pouvez pas \nrepasser en mode HTML dans l\'état actuel des choses.\nSupprimer tous les téléversements échoués et continuer ?</string>
+    <string name="image_width">Largeur</string>
+    <string name="image_link_to">Lien vers</string>
+    <string name="image_caption">Légende</string>
+    <string name="image_settings_save_toast">Modifications enregistrées</string>
+    <string name="image_settings_dismiss_dialog_title">Rejeter les modifications non enregistrées ?</string>
+    <string name="stop_upload_dialog_title">Stopper le téléversement ?</string>
+    <string name="tap_to_try_again">Touchez pour réessayer !</string>
+    <string name="invite_sent">Les invitations ont bien été envoyées</string>
+    <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="invite_error_some_failed">L\'invitation a été envoyée mais il y a eu des problèmes !</string>
+    <string name="invite_error_sending">Une erreur est survenue lors de l\'envoi de l\'invitation !</string>
+    <string name="invite_error_invalid_usernames_multiple">Envoi impossible : il y a des identifiants ou adresses de messagerie non valable</string>
+    <string name="invite_error_invalid_usernames_one">Envoi impossible : un identifiant ou une adresse de messagerie n\'est pas valable</string>
+    <string name="invite_error_no_usernames">Veuillez ajouter au moins un identifiant</string>
+    <string name="invite_message_title">Message personnalisé</string>
+    <string name="invite">Invitation</string>
+    <string name="invite_names_title">Identifiants ou adresses e-mail</string>
+    <string name="invite_people">Inviter des personnes</string>
+    <string name="my_site_header_external">Externe</string>
+    <string name="label_clear_search_history">Supprimer l\'historique de recherche</string>
+    <string name="dlg_confirm_clear_search_history">Supprimer l\'historique de recherche ?</string>
+    <string name="reader_empty_search_description">Aucune article trouvé pour %s dans votre langue</string>
+    <string name="reader_hint_post_search">Recherche WordPress</string>
+    <string name="reader_title_related_post_detail">Article connexe</string>
+    <string name="preview_screen_links_disabled">Les liens sont désactivés sur l\'écran de prévisualisation</string>
+    <string name="send">Envoyer</string>
+    <string name="person_removed">%1$s a bien été supprimé</string>
+    <string name="user_remove_confirmation_message">Si vous supprimez %1$s, cet utilisateur ne pourras plus accéder à ce site mais tout le contenu ayant été crée par %1$s restera sur le site.\n\nVoulez vous toujours supprimer cet utilisateur ?</string>
+    <string name="person_remove_confirmation_title">Supprimer %1$s</string>
+    <string name="role">Rôle</string>
+    <string name="people">Personnes</string>
+    <string name="reader_empty_posts_in_custom_list">Les sites dans cette liste n’ont rien publié récemment</string>
+    <string name="error_remove_user">Impossible de supprimer l’utilisateur</string>
+    <string name="error_update_role">Impossible de mettre à jour le rôle utilisateur</string>
+    <string name="error_fetch_viewers_list">Impossible de récupérer les utilisateurs du site</string>
+    <string name="error_updating_gravatar">Erreur lors de la mise à jour de votre Gravatar</string>
+    <string name="error_refreshing_gravatar">Erreur lors de la mise en ligne de votre Gravatar</string>
+    <string name="error_locating_image">Erreur de la localisation de l\'image recadrée</string>
+    <string name="error_cropping_image">Erreur lors du recadrage de l\'image</string>
+    <string name="checking_email">Vérification de l\'adresse e-mail</string>
+    <string name="magic_link_unavailable_error_message">Actuellement indisponible. Veuillez saisir votre mot de passe</string>
+    <string name="logging_in">Connexion</string>
+    <string name="web_address_dialog_hint">Affiché publiquement quand vous commentez.</string>
+    <string name="capture_or_pick_photo">Prenez une photo ou choisissez-en une</string>
+    <string name="plans">Plans</string>
+    <string name="plan">Offre</string>
+    <string name="export_your_content_message">Vos articles, pages, et réglages vont vous être envoyés par e-mail à l\'adresse %s.</string>
+    <string name="export_your_content">Exporter votre contenu</string>
+    <string name="export_email_sent">Message d’export envoyé !</string>
+    <string name="exporting_content_progress">Export en cours…</string>
+    <string name="checking_purchases">Vérification des achats</string>
+    <string name="show_purchases">Voir les achats</string>
+    <string name="premium_upgrades_message">Vous avez des mises à jour premium actives sur votre site. Veuillez annuler vos mises à jour avant de supprimer votre site</string>
+    <string name="premium_upgrades_title">Mises à jour premium</string>
+    <string name="purchases_request_error">Quelque chose s’est mal passé. Impossible de lancer l’achat.</string>
+    <string name="delete_site_progress">Suppression du site…</string>
+    <string name="delete_site_hint">Supprimer le site</string>
+    <string name="export_site_hint">Exportez votre site vers un fichier XML</string>
+    <string name="primary_domain">Domaine principal</string>
+    <string name="error_deleting_site_summary">Il y a eu une erreur durant la suppression de votre site. Veuillez contacter le support pour de l\'assistance.</string>
+    <string name="error_deleting_site">Erreur de suppression de site</string>
+    <string name="site_settings_export_content_title">Export du contenu</string>
+    <string name="confirm_delete_site_prompt">Veuillez saisir %1$s dans le champ ci-dessous pour confirmer. Votre site partira à tout jamais.</string>
+    <string name="confirm_delete_site">Confirmez la suppression du site</string>
+    <string name="contact_support">Contacter le support</string>
+    <string name="start_over_text">Si vous voulez un site mais ne voulez plus aucun de vos articles ou vos pages, notre équipe de support peut supprimer vos articles, pages, médias et commentaires pour vous.\n\nCeci gardera votre site et votre URL actifs, mais vous donnera un nouveau départ pour votre création de contenu. Contactez nous pour avoir votre contenu nettoyé.</string>
+    <string name="let_us_help">Laissez nous vous aider</string>
+    <string name="site_settings_start_over_hint">Recommencez votre site</string>
+    <string name="start_over">Recommencer</string>
+    <string name="me_btn_app_settings">Réglages de l’app</string>
+    <string name="editor_remove_failed_uploads">Supprimer les téléversements échoués</string>
+    <string name="site_settings_advanced_header">Avancé</string>
+    <string name="comments_empty_list_filtered_trashed">Aucun commentaire dans la corbeille</string>
+    <string name="comments_empty_list_filtered_pending">Aucun commentaire en attente</string>
+    <string name="comments_empty_list_filtered_approved">Aucun commentaire approuvé</string>
+    <string name="xmlrpc_missing_method_error">Impossible de se connecter. Le serveur ne dispose pas des méthodes XML-RPC requises.</string>
+    <string name="alignment_center">Centré</string>
+    <string name="post_format_video">Vidéo</string>
+    <string name="post_format_status">État</string>
+    <string name="post_format_standard">Standard</string>
+    <string name="post_format_quote">Citation</string>
+    <string name="post_format_link">Lien</string>
+    <string name="post_format_image">Image</string>
+    <string name="post_format_gallery">Galerie</string>
+    <string name="post_format_chat">Discussion</string>
+    <string name="post_format_audio">Son</string>
+    <string name="post_format_aside">En passant</string>
+    <string name="notif_events">Information sur les formations et évènements WordPress.com (en ligne ou en personne).</string>
+    <string name="notif_surveys">Opportunités de participer aux recherches et sondages de WordPress.com.</string>
+    <string name="notif_tips">Conseils pour tirer au mieux parti de WordPress.com</string>
+    <string name="notif_community">Communauté</string>
+    <string name="notif_research">Recherche</string>
+    <string name="notif_suggestions">Suggestions</string>
+    <string name="replies_to_my_comments">Réponses à mes commentaires</string>
+    <string name="username_mentions">Mentions de l\'identifiant</string>
+    <string name="site_achievements">Accomplissements du site</string>
+    <string name="site_follows">Abonnements du site</string>
+    <string name="likes_on_my_posts">Mentions \"J\'aime\" sur mes articles</string>
+    <string name="likes_on_my_comments">Mentions \"J\'aime\" sur mes commentaires</string>
+    <string name="comments_on_my_site">Commentaires sur mon site</string>
+    <string name="site_settings_list_editor_summary_other">%d éléments</string>
+    <string name="site_settings_list_editor_summary_one">Un élément</string>
+    <string name="approve_auto">Tous les utilisateurs</string>
+    <string name="approve_auto_if_previously_approved">Commentaires d’utilisateurs connus</string>
+    <string name="approve_manual">Aucun commentaire</string>
+    <string name="site_settings_paging_summary_other">%d commentaires par page</string>
+    <string name="site_settings_paging_summary_one">Un commentaire par page</string>
+    <string name="site_settings_multiple_links_summary_other">Requiert une approbation pour plus de %d liens</string>
+    <string name="site_settings_multiple_links_summary_one">Requiert une approbation pour plus d\'un lien</string>
+    <string name="site_settings_multiple_links_summary_zero">Requiert une approbation pour plus de 0 lien</string>
+    <string name="detail_approve_auto">Approuver automatiquement les commentaires de tout le monde.</string>
+    <string name="detail_approve_auto_if_previously_approved">Approuver automatiquement les commentaires de tous ceux ayant déjà eu un commentaire approuvé</string>
+    <string name="detail_approve_manual">Requiert l\'approbation manuelle des commentaires de tout le monde.</string>
+    <string name="days_quantity_other">%d jours</string>
+    <string name="days_quantity_one">Un jour</string>
+    <string name="web_address">Adresse web</string>
+    <string name="primary_site">Site principal</string>
+    <string name="pending_email_change_snackbar">Cliquez sur le lien de vérification de l\'e-mail envoyé à %1$s pour confirmer votre nouvelle adresse.</string>
+    <string name="editor_toast_uploading_please_wait">Vous êtes actuellement en train de téléverser un média. Veuillez patienter jusqu\'à ce que soit terminé.</string>
+    <string name="error_refresh_comments_showing_older">Les commentaires ne peuvent pas être actualisés en ce moment - affichage des commentaires plus anciens</string>
+    <string name="post_settings_set_featured_image">Définir une image mise à la une</string>
+    <string name="post_settings_featured_image">Image à la une</string>
+    <string name="email_address">Adresse de messagerie</string>
+    <string name="dlg_sure_to_delete_comments">Supprimer définitivement ces commentaires ?</string>
+    <string name="dlg_sure_to_delete_comment">Supprimer définitivement ce commentaire ? </string>
+    <string name="mnu_comment_delete_permanently">Supprimer</string>
+    <string name="mnu_comment_untrash">Restaurer</string>
+    <string name="comment_deleted_permanently">Commentaire supprimé</string>
+    <string name="comments_empty_list_filtered_spam">Pas de commentaire indésirable</string>
+    <string name="comment_status_all">Tout</string>
+    <string name="could_not_load_page">Impossible de charger la page</string>
+    <string name="off">Off</string>
+    <string name="interface_language">Langue de l\'interface</string>
+    <string name="about_the_app">À propos de l\'application</string>
+    <string name="error_post_account_settings">Impossible d\'enregistrer vos réglages de compte</string>
+    <string name="error_fetch_account_settings">Impossible de récupérer vos réglages de compte</string>
+    <string name="error_fetch_my_profile">Impossible de récupérer votre profil</string>
+    <string name="site_settings_unknown_language_code_error">Code de langue non reconnu</string>
+    <string name="site_settings_threading_dialog_description">Autoriser les commentaires à se faire en discussion imbriquées.</string>
+    <string name="site_settings_threading_dialog_header">Imbriquer jusqu\'à</string>
+    <string name="disabled">Désactivé(e)</string>
+    <string name="search">Rechercher</string>
+    <string name="remove">Enlever</string>
+    <string name="site_settings_image_original_size">Taille originale</string>
+    <string name="privacy_private">Votre site est visible uniquement pour vous et les utilisateurs que vous approuvez</string>
+    <string name="privacy_public_not_indexed">Votre site est visible par tous, mais demande aux moteurs de recherche de ne pas l\'indexer</string>
+    <string name="privacy_public">Votre site est visible par tous et peut être indexé par les moteurs de recherche</string>
+    <string name="about_me_hint">Quelques mots à propos de vous…</string>
+    <string name="about_me">À propos de moi</string>
+    <string name="public_display_name_hint">Le nom affiché par défaut est votre identifiant s\'il n\'est pas défini.</string>
+    <string name="public_display_name">Public</string>
+    <string name="last_name">Nom</string>
+    <string name="first_name">Prénom</string>
+    <string name="my_profile">Mon profil</string>
+    <string name="cd_related_post_preview_image">Prévisualisation de l\'image de l\'article connexe</string>
+    <string name="error_post_remote_site_settings">Impossible d\'enregistrer les infos du site</string>
+    <string name="error_fetch_remote_site_settings">Impossible de retrouver les infos du site</string>
+    <string name="site_settings_close_after_dialog_switch_text">Fermer automatiquement</string>
+    <string name="site_settings_close_after_dialog_description">Fermer automatiquement les commentaires.</string>
+    <string name="site_settings_paging_dialog_description">Scinder les fils de commentaires en pages multiples.</string>
+    <string name="site_settings_paging_dialog_header">Commentaires par page</string>
+    <string name="site_settings_close_after_dialog_title">Fermer les commentaires</string>
+    <string name="site_settings_denylist_description">Lorsque l’un de ces mots apparaît dans le contenu, le nom, l’URL, l’e-mail ou l’adresse IP d’un commentaire, ce dernier est marqué comme indésirable. Vous pouvez entrer des parties de mot, de sorte que « press » sera associé à « WordPress ».</string>
+    <string name="site_settings_hold_for_moderation_description">Quand un commentaire contient un de ces mots dans son contenu, nom, URL, email ou IP, il sera déposé dans la file de modération. Vous pouvez saisir des mots partiels, ainsi \"press\" correspondra à \"WordPress\". </string>
+    <string name="site_settings_list_editor_input_hint">Entrez un mot ou une phrase</string>
+    <string name="site_settings_list_editor_no_items_text">0 éléments</string>
+    <string name="site_settings_learn_more_caption">Vous pouvez substituer ces paramètres pour les articles individuels.</string>
+    <string name="site_settings_rp_preview3_site">dans \"Mise à jour\"</string>
+    <string name="site_settings_rp_preview3_title">Mise en avant de l\'option : VideoPress pour les mariages</string>
+    <string name="site_settings_rp_preview2_site">dans \"Apps\"</string>
+    <string name="site_settings_rp_preview2_title">WordPress pour Android App a subi un gros lifting</string>
+    <string name="site_settings_rp_preview1_site">Dans \"Mobile\"</string>
+    <string name="site_settings_rp_preview1_title">Grosse mise à jour iPhone/iPad disponible.</string>
+    <string name="site_settings_rp_show_images_title">Afficher les images</string>
+    <string name="site_settings_rp_show_header_title">Afficher l\'en-tête</string>
+    <string name="site_settings_rp_switch_summary">Les articles similaires affichent du contenu pertinent de votre site sous les articles.</string>
+    <string name="site_settings_rp_switch_title">Afficher les articles similaires</string>
+    <string name="site_settings_denylist_hint">Les commentaires qui correspondent à un filtre sont marqués comme indésirables</string>
+    <string name="site_settings_moderation_hold_hint">Les commentaires qui correspondent à un filtre sont mis dans la file d\'attente de modération</string>
+    <string name="site_settings_multiple_links_hint">Ignore la limite de liens pour les utilisateurs connus</string>
+    <string name="site_settings_allowlist_hint">L’auteur d’un commentaire doit avoir déjà au moins un commentaire approuvé</string>
+    <string name="site_settings_user_account_required_hint">Les utilisateurs doivent être enregistrés et connectés pour commenter</string>
+    <string name="site_settings_identity_required_hint">L\'auteur d\'un commentaire doit renseigner son nom et son adresse de messagerie</string>
+    <string name="site_settings_paging_hint">Afficher les commentaires en morceaux d\'une taille spécifiée.</string>
+    <string name="site_settings_threading_hint">Permettre les commentaires imbriqués à un certain niveau</string>
+    <string name="site_settings_sort_by_hint">Détermine l\'ordre d\'affichage des commentaires</string>
+    <string name="site_settings_close_after_hint">Interdire les commentaires après l\'heure indiquée</string>
+    <string name="site_settings_receive_pingbacks_hint">Autoriser les liens de notifications depuis les autres sites</string>
+    <string name="site_settings_send_pingbacks_hint">Tenter de notifier les sites liés depuis le contenu des articles</string>
+    <string name="site_settings_allow_comments_hint">Autoriser les lecteurs à publier des commentaires</string>
+    <string name="site_settings_discussion_hint">Voir et modifier les réglages de discussion de votre site</string>
+    <string name="site_settings_more_hint">Voir tous les réglages de discussion disponibles</string>
+    <string name="site_settings_related_posts_hint">Afficher ou cacher les articles similaires dans le lecteur</string>
+    <string name="site_settings_image_width_hint">Redimensionner les images dans les articles dans cette largeur. </string>
+    <string name="site_settings_format_hint">Configure le nouveau format d\'article</string>
+    <string name="site_settings_category_hint">Configure la nouvelle catégorie d\'articles</string>
+    <string name="site_settings_password_hint">Changez votre mot de passe</string>
+    <string name="site_settings_username_hint">Compte utilisateur actuel</string>
+    <string name="site_settings_language_hint">La langue d\'écriture de ce blog est principalement en</string>
+    <string name="site_settings_privacy_hint">Contrôler qui peut voir votre site.</string>
+    <string name="site_settings_address_hint">Changer votre adresse n\'est actuellement pas pris en charge.</string>
+    <string name="site_settings_tagline_hint">Une brève description ou une phrase accrocheuse pour décrire votre blog</string>
+    <string name="site_settings_title_hint">En quelques mots, décrivez la raison d\'être de ce site.</string>
+    <string name="site_settings_allowlist_known_summary">Commentaires des utilisateurs connus</string>
+    <string name="site_settings_allowlist_all_summary">Commentaires de tous les utilisateurs</string>
+    <string name="site_settings_threading_summary">%d niveaux</string>
+    <string name="site_settings_privacy_private_summary">Privé</string>
+    <string name="site_settings_privacy_hidden_summary">Caché</string>
+    <string name="site_settings_privacy_public_summary">Public</string>
+    <string name="site_settings_delete_site_title">Supprimer le site</string>
+    <string name="site_settings_moderation_hold_title">Garder en modération</string>
+    <string name="site_settings_multiple_links_title">Liens dans les commentaires</string>
+    <string name="site_settings_allowlist_title">Approuver automatiquement</string>
+    <string name="site_settings_paging_title">Pagination</string>
+    <string name="site_settings_threading_title">Fil de discussions</string>
+    <string name="site_settings_sort_by_title">Trier par</string>
+    <string name="site_settings_account_required_title">Les utilisateurs doivent être connectés</string>
+    <string name="site_settings_identity_required_title">Doit inclure le nom et l\'email</string>
+    <string name="site_settings_receive_pingbacks_title">Recevoir les pings</string>
+    <string name="site_settings_send_pingbacks_title">Envoi des pings</string>
+    <string name="site_settings_allow_comments_title">Autoriser les commentaires</string>
+    <string name="site_settings_default_format_title">Format par défaut</string>
+    <string name="site_settings_default_category_title">Catégorie par défaut</string>
+    <string name="site_settings_address_title">Adresse</string>
+    <string name="site_settings_tagline_title">Slogan</string>
+    <string name="site_settings_title_title">Titre du site</string>
+    <string name="site_settings_discussion_new_posts_header">Par défaut pour les nouveaux articles</string>
+    <string name="site_settings_writing_header">Écriture</string>
+    <string name="site_settings_account_header">Compte</string>
+    <string name="site_settings_general_header">Général</string>
+    <string name="newest_first">Récents en premier</string>
+    <string name="oldest_first"> Anciens en Premier</string>
+    <string name="close_after">Fermer après</string>
+    <string name="comments">Commentaires</string>
+    <string name="related_posts">Articles similaires</string>
+    <string name="privacy">Vie privée</string>
+    <string name="discussion">Discussion</string>
+    <string name="media_error_no_permission_upload">Vous n\'avez pas l\'autorisation de téléverser des fichiers média sur ce site</string>
+    <string name="unknown">Inconnu</string>
+    <string name="never">Jamais</string>
+    <string name="reader_err_get_post_not_found">Cet article n’existe plus</string>
+    <string name="reader_err_get_post_not_authorized">Vous n’avez pas les droits nécessaires pour voir cet article</string>
+    <string name="reader_err_get_post_generic">Impossible de retrouver cet article</string>
+    <string name="reader_empty_followed_blogs_no_recent_posts_description">Les sites que vous suivez n\'ont rien publié récemment.</string>
+    <string name="reader_empty_followed_blogs_no_recent_posts_title">Pas d\'articles récents.</string>
+    <string name="media_edit_copy_url_toast">URL copiée dans le presse-papiers.</string>
+    <string name="selected_theme">Thème sélectionné</string>
+    <string name="could_not_load_theme">Impossible de charger le thème</string>
+    <string name="theme_activation_error">Quelque chose s\'est mal passé. Impossible d\'activer le thème.</string>
+    <string name="theme_by_author_prompt_append">par %1$s</string>
+    <string name="theme_prompt">Merci d\'avoir choisi %1$s</string>
+    <string name="theme_manage_site">GÉRER LE SITE</string>
+    <string name="theme_done">FAIT</string>
+    <string name="theme_support">Support</string>
+    <string name="theme_details">Détails</string>
+    <string name="theme_view">Afficher</string>
+    <string name="theme_try_and_customize">Essayer et personnaliser</string>
+    <string name="theme_activate">Activer</string>
+    <string name="active">Actif</string>
+    <string name="support">Support</string>
+    <string name="details">Détails</string>
+    <string name="customize">Personnaliser</string>
+    <string name="current_theme">Thème actuel</string>
+    <string name="page_updated">Page mise à jour</string>
+    <string name="post_updated">Article mis à jour</string>
+    <string name="page_published">Page publiée</string>
+    <string name="post_published">Article publié</string>
+    <string name="theme_no_search_result_found">Désolé, pas de thème trouvé.</string>
+    <string name="reader_label_gap_marker">Charger plus d\'artilces</string>
+    <string name="notifications_no_search_results">Aucun site ne correspond à \'%s\'</string>
+    <string name="search_sites">Rechercher les sites</string>
+    <string name="notifications_empty_view_reader">Ouvrir le Lecteur</string>
+    <string name="notifications_empty_action_followers_likes">Se faire remarquer : commentez les articles que vous avez lus</string>
+    <string name="notifications_empty_action_comments">Rejoignez une conversation : commentez les articles des sites que vous suivez</string>
+    <string name="notifications_empty_action_unread">Relancez la conversation : rédigez un nouvel article</string>
+    <string name="notifications_empty_action_all">Activez vous ! Commentez les articles des sites que vous suivez.</string>
+    <string name="notifications_empty_comments">Pas de commentaires pour le moment</string>
+    <string name="notifications_empty_unread">Vous êtes à jour !</string>
+    <string name="reader_short_comment_count_multi">%s Commentaires</string>
+    <string name="reader_short_comment_count_one">1 Commentaire</string>
+    <string name="reader_hint_comment_on_post">Répondre à l\'article…</string>
+    <string name="reader_discover_visit_blog">Visiter %s</string>
+    <string name="reader_discover_attribution_blog">Publié à l\'origine sur %s</string>
+    <string name="reader_discover_attribution_author">Publié à l\'origine par %s</string>
+    <string name="reader_discover_attribution_author_and_blog">Publié à l\'origine par %1$s sur %2$s</string>
+    <string name="reader_short_like_count_multi">%s Likes</string>
+    <string name="reader_short_like_count_one">1 Like</string>
+    <string name="reader_short_like_count_none">Like</string>
+    <string name="reader_label_follow_count">%,d abonnés</string>
+    <string name="reader_menu_tags">Modifier les sujets et les sites</string>
+    <string name="reader_title_post_detail">Article du Reader</string>
+    <string name="notifications_push_summary">Paramètres de notifications qui apparaissent sur votre appareil.</string>
+    <string name="notifications_email_summary">Paramètres de notifications qui vous sont envoyé par email.</string>
+    <string name="notifications_tab_summary">Paramètres de notifications qui apparaissent dans le tab Notifications.</string>
+    <string name="notifications_disabled">Les notifications de l\'Appli ont été désactivées. Toucher ici pour les activer dans les Paramètres.</string>
+    <string name="notification_types">Types de notifications</string>
+    <string name="error_loading_notifications">Les paramètres de notifications ne peuvent pas être chargés.</string>
+    <string name="comment_likes">Likes de commentaires</string>
+    <string name="app_notifications">Notifications de l\'Appli</string>
+    <string name="email">Email</string>
+    <string name="notifications_tab">Tab de notifications</string>
+    <string name="notification_settings_item_other_account_emails_summary">Nous vous enverrons des e-mails importants concernant votre compte, mais vous pouvez aussi recevoir des informations complémentaires très utiles.</string>
+    <string name="stats_insights_latest_post_summary">Résumé du dernier article</string>
+    <string name="connectionbar_no_connection">Pas de connexion</string>
+    <string name="post_trashed">Article envoyé à la corbeille</string>
+    <string name="button_trash">Corbeille</string>
+    <string name="button_stats">Stats</string>
+    <string name="button_preview">Aperçu</string>
+    <string name="button_view">Vue</string>
+    <string name="button_publish">Publier</string>
+    <string name="button_edit">Editer</string>
+    <string name="reader_toast_err_follow_blog_not_authorized">Vous n\'êtes pas autorisé à accéder à ce site</string>
+    <string name="reader_toast_err_follow_blog_not_found">Ce site est introuvable</string>
+    <string name="undo">Annuler</string>
+    <string name="push_auth_expired">La requête a expiré. Connectez-vous à WordPress.com et réessayez.</string>
+    <string name="ignore">Ignorer</string>
+    <string name="stats_insights_best_ever">Record de vues absolu</string>
+    <string name="stats_insights_today">Statistiques du jour</string>
+    <string name="stats_insights_all_time">Articles, vues et visiteurs depuis la création</string>
+    <string name="stats_insights">Tendances</string>
+    <string name="me_disconnect_from_wordpress_com">Se déconnecter de WordPress.com</string>
+    <string name="me_connect_to_wordpress_com">Se connecter à WordPress.com</string>
+    <string name="me_btn_login_logout">Se Connecter/Déconnecter</string>
+    <string name="me_btn_support">Aide &amp; Support</string>
+    <string name="account_settings">Paramètres du compte</string>
+    <string name="site_picker_cant_hide_current_site">\"%s\" n\'a pas été caché, c\'est le site selectionné</string>
+    <string name="site_picker_create_wpcom">Créer un site WordPress.com</string>
+    <string name="site_picker_add_self_hosted">Ajouter un site auto-hébergé</string>
+    <string name="site_picker_add_site">Ajout de nouveau site</string>
+    <string name="site_picker_edit_visibility">Montrer/cacher les sites</string>
+    <string name="site_picker_title">Choisir un site</string>
+    <string name="my_site_btn_view_site">Afficher le site</string>
+    <string name="my_site_btn_view_admin">Afficher l\'Admin</string>
+    <string name="my_site_btn_switch_site">Changer de Site</string>
+    <string name="my_site_btn_site_settings">Réglages</string>
+    <string name="my_site_btn_blog_posts">Articles</string>
+    <string name="my_site_header_publish">Publier</string>
+    <string name="my_site_header_look_and_feel">Personnaliser</string>
+    <string name="my_site_header_configuration">Configuration</string>
+    <string name="reader_label_new_posts_subtitle">Touchez pour les afficher</string>
+    <string name="deselect_all">Tout déselectionner</string>
+    <string name="select_all">Tout selectionner</string>
+    <string name="hide">Cacher</string>
+    <string name="show">Montrer</string>
+    <string name="auth_required">Se reconnecter pour continuer.</string>
+    <string name="invalid_verification_code">Code de vérification invalide</string>
+    <string name="verification_code">Code de vérification</string>
+    <string name="language">Langue</string>
+    <string name="reader_empty_posts_request_failed">Impossible de récupérer les articles</string>
+    <string name="publisher">Editeur:</string>
+    <string name="error_notification_open">Impossible d\'ouvrir la notification</string>
+    <string name="stats_search_terms_unknown_search_terms">Termes de recherche inconnus</string>
+    <string name="stats_view_search_terms">Termes de Recherche</string>
+    <string name="stats_view_authors">Auteurs</string>
+    <string name="comments_fetching">Récupération des commentaires…</string>
+    <string name="pages_fetching">Récupération des pages…</string>
+    <string name="posts_fetching">Récupération des articles…</string>
+    <string name="media_fetching">Récupération des médias…</string>
+    <string name="logs_copied_to_clipboard">Les logs de l\'application ont été copiés dans le presse papier</string>
+    <string name="reader_empty_posts_in_blog">Ce site est vide</string>
+    <string name="reader_label_new_posts">Nouveaux articles</string>
+    <string name="error_copy_to_clipboard">Une erreur s\'est produite lors de la copie dans le presse papier</string>
+    <string name="post_uploading">Article en cours de téléversement</string>
+    <string name="stats_followers_years">%1$d années</string>
+    <string name="stats_followers_a_year">Un an</string>
+    <string name="stats_followers_months">%1$d mois</string>
+    <string name="stats_followers_a_month">Un mois</string>
+    <string name="stats_followers_days">%1$d jours</string>
+    <string name="stats_followers_a_day">Un jour</string>
+    <string name="stats_followers_hours">%1$d heures</string>
+    <string name="stats_followers_an_hour_ago">il y a une heure</string>
+    <string name="stats_followers_minutes">%1$d minutes</string>
+    <string name="stats_followers_a_minute_ago">il y a une minute</string>
+    <string name="stats_followers_seconds_ago">il y a quelques secondes</string>
+    <string name="stats_view_followers">Abonnés</string>
+    <string name="stats_view_publicize">Publicize</string>
+    <string name="stats_view_videos">Vidéos</string>
+    <string name="stats_view_top_posts_and_pages">Articles et pages</string>
+    <string name="stats_view_countries">Pays</string>
+    <string name="stats_likes">Aimés</string>
+    <string name="stats_visitors">Visiteurs</string>
+    <string name="stats_views">Visites</string>
+    <string name="stats_timeframe_years">Années</string>
+    <string name="themes_fetching">Récupération des thèmes…</string>
+    <string name="ssl_certificate_details">Détails</string>
+    <string name="cab_selected">%d sélectionnés</string>
+    <string name="browse_our_faq_button">Feuilleter notre FAQ</string>
+    <string name="reader_empty_comments">Pas encore de commentaires</string>
+    <string name="reader_empty_posts_in_tag">Pas d\'article avec ce sujet</string>
+    <string name="reader_label_like">Aime</string>
+    <string name="reader_label_view_original">Voir l\'article original</string>
+    <string name="reader_label_comments_closed">Les commentaires sont fermés</string>
+    <string name="reader_title_photo_viewer">%1$d sur %2$d</string>
+    <string name="error_publish_empty_post">Impossible de publier un article vide</string>
+    <string name="error_refresh_unauthorized_posts">Vous n\'avez pas la permission de voir ou éditer les articles</string>
+    <string name="error_refresh_unauthorized_pages">Vous n\'avez pas la permission de voir ou éditer les pages</string>
+    <string name="error_refresh_unauthorized_comments">Vous n\'avez pas la permission de voir ou éditer les commentaires</string>
+    <string name="more">Plus</string>
+    <string name="older_month">Plus d\'un mois</string>
+    <string name="older_last_week">Plus d\'une semaine</string>
+    <string name="older_two_days">Plus de 2 jours</string>
+    <string name="mnu_comment_liked">Aimé</string>
+    <string name="comment">Commentaire</string>
+    <string name="comment_trashed">Commentaire supprimé</string>
+    <string name="comment_reply_to_user">Réponse à %s</string>
+    <string name="posts_empty_list">Pas encore d\'article. Pourquoi ne pas en créer un?</string>
+    <string name="signing_out">Déconnexion…</string>
+    <string name="reader_toast_err_generic">Impossible d\'effectuer cette action</string>
+    <string name="reader_toast_err_block_blog">Impossible de bloquer ce site</string>
+    <string name="reader_toast_blog_blocked">Les articles de ce site ne seront plus affichés</string>
+    <string name="reader_menu_block_blog">Bloquer ce site</string>
+    <string name="schedule_verb">Programmer</string>
+    <string name="update_verb">Mettre à jour</string>
+    <string name="reader_empty_recommended_blogs">Aucun site recommandé</string>
+    <string name="reader_toast_err_unfollow_blog">Impossible de se désabonner de ce site</string>
+    <string name="reader_toast_err_follow_blog">Impossible de suivre ce site</string>
+    <string name="reader_toast_err_already_follow_blog">Vous suivez déjà ce site</string>
+    <string name="reader_toast_err_get_blog_info">Impossible d’afficher ce site</string>
+    <string name="reader_label_followed_blog">Site suivi</string>
+    <string name="reader_hint_add_tag_or_url">Saisissez une URL ou un sujet à suivre</string>
+    <string name="reader_page_followed_blogs">Sites suivis</string>
+    <string name="reader_page_followed_tags">Sujets suivis</string>
+    <string name="reader_title_blog_preview">Blog du Lecteur</string>
+    <string name="ssl_certificate_ask_trust">Si vous vous connectez habituellement à ce site sans problème, cette erreur peut signifier que quelqu\'un essai de se faire passer pour vous et vous ne devriez pas continuer. Souhaitez-vous faire confiance à ce certificat ?</string>
+    <string name="ssl_certificate_error">Certificat SSL invalide</string>
+    <string name="help">Aide</string>
+    <string name="username_or_password_incorrect">L\'identifiant ou le mot de passe saisi est incorrect</string>
+    <string name="email_invalid">Entrez une adresse e-mail valide</string>
+    <string name="invalid_email_message">Votre adresse e-mail est invalide</string>
+    <string name="error_downloading_image">Erreur du téléchargement d\'image</string>
+    <string name="error_load_comment">Ne peut pas charger le commentaire</string>
+    <string name="error_edit_comment">Une erreur s\'est produite lors de la modification du commentaire</string>
+    <string name="error_moderate_comment">Une erreur s\'est produite lors de la modération</string>
+    <string name="error_generic">Une erreur s\'est produite</string>
+    <string name="error_refresh_comments">Les commentaires ne peuvent être actualisés pour l\'instant</string>
+    <string name="error_refresh_pages">Les pages ne peuvent pas être actualisées pour l\'instant </string>
+    <string name="error_refresh_posts">Les articles ne peuvent pas être actualisés pour l\'instant</string>
+    <string name="error_deleting_post">Une erreur s\'est produite lors de la suppression de l\'article</string>
+    <string name="notifications_empty_list">Aucune notifications</string>
+    <string name="sdcard_message">Une carte SD est nécessaire pour téléverser les médias</string>
+    <string name="cat_name_required">Le champ du nom de catégorie est requis</string>
+    <string name="adding_cat_success">Catégorie ajoutée avec succès</string>
+    <string name="adding_cat_failed">Échec de l\'ajout de catégorie</string>
+    <string name="mnu_comment_unspam">Non indésirable</string>
+    <string name="theme_fetch_failed">Échec de chargement des thèmes</string>
+    <string name="blog_not_found">Une erreur s\'est produite en accédant à ce blog</string>
+    <string name="gallery_error">Le média ne peut pas être récupéré</string>
+    <string name="no_network_message">Aucun réseau disponible</string>
+    <string name="reader_toast_err_remove_tag">Impossible de supprimer ce sujet</string>
+    <string name="reader_toast_err_add_tag">Impossible d\'ajouter ce sujet</string>
+    <string name="reader_title_applog">Journal de l\'application</string>
+    <string name="fatal_db_error">Une erreur s\'est produite lors de la création de la base de données de l\'app. Essayez de réinstaller l\'app.</string>
+    <string name="error_blog_hidden">Ce blog est caché et ne peut être chargé. Activez-le dans les paramètres et réessayez.</string>
+    <string name="error_refresh_media">Impossible d’actualiser le contenu multimédia pour l’instant.</string>
+    <string name="wordpress_blog">Blog WordPress</string>
+    <string name="image_settings">Paramètres d\'image</string>
+    <string name="local_changes">Changements locaux</string>
+    <string name="privacy_policy">Vie privée</string>
+    <string name="new_media">Nouveau média</string>
+    <string name="new_post">Nouvel article</string>
+    <string name="notifications_empty_all">Pas (encore) de notifications.</string>
+    <string name="http_authorization_required">Autorisation requise</string>
+    <string name="invalid_site_url_message">Vérifiez que l\'URL saisie est valide</string>
+    <string name="open_source_licenses">Licences open sources</string>
+    <string name="file_error_create">Impossible de créer un fichier temporaire pour le téléversement de média. Veuillez vérifier que vous disposez d\'assez d\'espace libre sur votre appareil.</string>
+    <string name="category_name">Nom de la catégorie</string>
+    <string name="add_new_category">Ajouter une nouvelle catégorie</string>
+    <string name="view_in_browser">Voir dans le navigateur</string>
+    <string name="remove_account">Supprimer le site</string>
+    <string name="toast_comment_unedited">Le commentaire n\'a pas été modifié</string>
+    <string name="content_required">Commentaire requis</string>
+    <string name="sure_to_cancel_edit_comment">Annuler l\'édition de ce commentaire ?</string>
+    <string name="saving_changes">Enregistrement des modifications</string>
+    <string name="trash">Corbeille</string>
+    <string name="dlg_confirm_trash_comments">Mettre à la corbeille ?</string>
+    <string name="dlg_trashing_comments">Envoie à la corbeille</string>
+    <string name="dlg_spamming_comments">Marquage comme indésirable</string>
+    <string name="dlg_unapproving_comments">Désapprobation</string>
+    <string name="dlg_approving_comments">Approbation</string>
+    <string name="mnu_comment_trash">Supprimer</string>
+    <string name="mnu_comment_spam">Indésirable</string>
+    <string name="mnu_comment_unapprove">Désapprouver</string>
+    <string name="mnu_comment_approve">Approuver</string>
+    <string name="edit_comment">Modifier le commentaire</string>
+    <string name="comment_status_trash">À la Corbeille</string>
+    <string name="comment_status_spam">Indésirable</string>
+    <string name="comment_status_unapproved">En attente</string>
+    <string name="comment_status_approved">Approuvé</string>
+    <string name="delete_page">Supprimer la page ?</string>
+    <string name="delete_post">Supprimer l’article ?</string>
+    <string name="post_settings">Paramètres d\'article</string>
+    <string name="file_not_found">Impossible de trouver le fichier pour le téléverser. Aurait-il été supprimé ou déplacé ?</string>
+    <string name="local_draft">Brouillon local</string>
+    <string name="page_settings">Paramètres de page</string>
+    <string name="link_enter_url_text">Texte du lien (optionnel)</string>
+    <string name="cannot_delete_multi_media_items">Certains média ne peuvent pas être supprimés pour l\'instant. Veuillez réessayer plus tard.</string>
+    <string name="media_error_no_permission">Vous n\'avez pas la permission de voir la bibliothèque de média</string>
+    <string name="media_gallery_type_thumbnail_grid">Grille de vignettes</string>
+    <string name="learn_more">En savoir plus</string>
+    <string name="post_not_found">Une erreur s\'est produite en chargeant cet article. Actualisez vos articles et essayez de nouveau.</string>
+    <string name="plugin_not_found">Une erreur s’est produite en accédant à cette extension.</string>
+    <string name="cancel_edit">Annuler la modification</string>
+    <string name="connection_error">Erreur de connexion</string>
+    <string name="select_categories">Sélectionner les catégories</string>
+    <string name="share_link">Lien de partage</string>
+    <string name="reader_empty_posts_in_tag_updating">Récupération des articles…</string>
+    <string name="reader_likes_you_and_multi">Vous et %,d personnes aiment ça</string>
+    <string name="reader_likes_multi">%,d personnes aiment ça</string>
+    <string name="reader_label_reply">Répondre</string>
+    <string name="cant_share_no_visible_blog">Vous ne pouvez pas partager vers WordPress sans avoir publié au moins un blog.</string>
+    <string name="comment_spammed">Commentaire marqué comme indésirable</string>
+    <string name="reader_toast_err_get_post">Impossible de récupérer cet article</string>
+    <string name="reader_likes_you_and_one">Vous et un autre avez aimé ceci</string>
+    <string name="pick_video">Sélectionner une vidéo</string>
+    <string name="pick_photo">Sélectionner une photo</string>
+    <string name="sign_up_label">S’inscrire</string>
+    <string name="reader_toast_err_url_intent">Impossible d\'ouvrir %s</string>
+    <string name="reader_toast_err_view_image">Impossible de voir l\'image</string>
+    <string name="reader_toast_err_share_intent">Impossible de partager</string>
+    <string name="reader_toast_err_tag_invalid">Ce n’est pas un sujet valide</string>
+    <string name="reader_toast_err_tag_exists">Vous suivez déjà ce sujet</string>
+    <string name="reader_toast_err_comment_failed">Impossible d\'envoyer votre commentaire</string>
+    <string name="reader_likes_only_you">Vous aimez ça</string>
+    <string name="reader_likes_one">Une personne aime ça</string>
+    <string name="reader_label_removed_tag">%s Retiré</string>
+    <string name="reader_label_added_tag">%s Ajouté</string>
+    <string name="reader_hint_comment_on_comment">Répondre au commentaire…</string>
+    <string name="reader_btn_unfollow">Abonné</string>
+    <string name="reader_btn_follow">Suivre</string>
+    <string name="reader_btn_share">Partager</string>
+    <string name="reader_view_reblog">Rebloguer</string>
+    <string name="reader_untitled_post">(Sans Titre)</string>
+    <string name="comments_empty_list">Pas de commentaires pour le moment</string>
+    <string name="empty_list_default">Cette liste est vide</string>
+    <string name="stats_timeframe_months">Mois</string>
+    <string name="stats_timeframe_weeks">Semaines</string>
+    <string name="stats_timeframe_days">Jours</string>
+    <string name="stats_timeframe_yesterday">Hier</string>
+    <string name="stats_timeframe_today">Aujourd\'hui</string>
+    <string name="stats_view_referrers">Référents</string>
+    <string name="stats_view_tags_and_categories">Étiquettes et Catégories</string>
+    <string name="stats_view_clicks">Clics</string>
+    <string name="stats">Stats</string>
+    <string name="share_action">Partager</string>
+    <string name="theme_activate_button">Activer</string>
+    <string name="media_edit_failure">Échec de mise à jour</string>
+    <string name="media_edit_description_text">Description</string>
+    <string name="media_edit_caption_text">Légende</string>
+    <string name="media_edit_title_text">Titre</string>
+    <string name="media_gallery_type_slideshow">Diaporama</string>
+    <string name="media_gallery_type_circles">Cercles</string>
+    <string name="media_gallery_type_tiled">Mosaïque</string>
+    <string name="media_gallery_type_squares">Carrés</string>
+    <string name="themes">Thèmes</string>
+    <string name="discard">Rejeter</string>
+    <string name="manage">Organiser</string>
+    <string name="more_notifications">et %d autres.</string>
+    <string name="new_notifications">%d nouvelles notifications</string>
+    <string name="follows">Suivis</string>
+    <string name="note_reply_successful">Réponse envoyée</string>
+    <string name="sign_in">Se connecter</string>
+    <string name="loading">Chargement…</string>
+    <string name="httppassword">Mot de passe HTTP</string>
+    <string name="httpuser">Nom d’utilisateur HTTP</string>
+    <string name="error_media_upload">Désolé, une erreur est survenue pendant le téléversement du média</string>
+    <string name="incorrect_credentials">L\'identifiant ou le mot de passe sont incorrects.</string>
+    <string name="log_in">Connexion</string>
+    <string name="username">Identifiant</string>
+    <string name="password">Mot de passe</string>
+    <string name="reader">Lecteur</string>
+    <string name="pages">Pages</string>
+    <string name="posts">Articles</string>
+    <string name="anonymous">Anonyme</string>
+    <string name="no_network_title">Pas de réseau disponible</string>
+    <string name="done">Terminé</string>
+    <string name="ok">OK</string>
+    <string name="link_enter_url">URL</string>
+    <string name="tos">Conditions d\'utilisation</string>
+    <string name="version">Version</string>
+    <string name="app_title">WordPress pour Android</string>
+    <string name="image_alignment">Alignement</string>
+    <string name="refresh">Actualiser</string>
+    <string name="untitled">Sans titre</string>
+    <string name="edit">Modifier</string>
+    <string name="immediately">Immédiatement</string>
+    <string name="quickpress_add_alert_title">Choisir le nom du raccourci</string>
+    <string name="settings">Paramètres</string>
+    <string name="quickpress_add_error">Le nom du raccourci ne peut pas être vide</string>
+    <string name="pages_private">Privé</string>
+    <string name="title">Titre</string>
+    <string name="tags_separate_with_commas">Séparez les étiquettes par des virgules</string>
+    <string name="categories">Catégories</string>
+    <string name="dlg_deleting_comments">Effacement de commentaires en cours</string>
+    <string name="sdcard_title">Carte SD requise</string>
+    <string name="media">Multimedia</string>
+    <string name="approve">Approuver</string>
+    <string name="delete">Effacer</string>
+    <string name="none">Aucun</string>
+    <string name="publish_now">Publier maintenant</string>
+    <string name="reply">Répondre</string>
+    <string name="on">sur</string>
+    <string name="preview">Prévisualisation</string>
+    <string name="category_refresh_error">Erreur de rafraîchissement de catégorie</string>
+    <string name="error">Erreur</string>
+    <string name="no">Non</string>
+    <string name="yes">Oui</string>
+    <string name="notification_settings">Paramètres de Notification</string>
+    <string name="add">Ajouter</string>
+    <string name="save">Enregistrer</string>
+    <string name="cancel">Annuler</string>
+</resources>
diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml
index 9a45de3a2f5c..b399c59f9b0d 100644
--- a/WordPress/src/main/res/values-fr/strings.xml
+++ b/WordPress/src/main/res/values-fr/strings.xml
@@ -1,11 +1,428 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-30 14:54:10+0000
+Translation-Revision-Date: 2021-05-19 06:17:14+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: fr
 -->
 <resources>
+    <string name="gutenberg_native_size">Taille</string>
+    <string name="gutenberg_native_image_settings">Réglages d’image</string>
+    <string name="gutenberg_native_audio_settings">Réglages de son</string>
+    <string name="user_profile_untitled_site">(Sans titre)</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">Profil utilisateur : information sur la feuille du bas</string>
+    <string name="likes_list_screen_title">Liste des mentions J’aime %s</string>
+    <string name="gutenberg_native_write_code">Rédiger du code…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Tri et filtre</string>
+    <string name="gutenberg_native_show_download_button">Afficher le bouton de téléchargement</string>
+    <string name="gutenberg_native_shortcode">Code court </string>
+    <string name="gutenberg_native_read_more">Lire la suite</string>
+    <string name="gutenberg_native_preload">Préchargement</string>
+    <string name="gutenberg_native_post_meta_settings">Réglages des métas de publication</string>
+    <string name="gutenberg_native_post_content_settings">Réglages de contenu de publication</string>
+    <string name="gutenberg_native_metadata">Métadonnée</string>
+    <string name="gutenberg_native_media_file">Fichier média</string>
+    <string name="gutenberg_native_media_area">Zone de média</string>
+    <string name="gutenberg_native_loop">Boucle</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Lier vers</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">image %1$d de %2$d dans la galerie</string>
+    <string name="gutenberg_native_heading_d">Titrage %d</string>
+    <string name="gutenberg_native_featured">À la Une</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Saisir l’URL à embarquer…</string>
+    <string name="gutenberg_native_edit_image">Modifier l’image</string>
+    <string name="gutenberg_native_display_post_date">Affiche la date du contenu</string>
+    <string name="gutenberg_native_code">Code</string>
+    <string name="gutenberg_native_change_heading_level">Changer le niveau de titre</string>
+    <string name="gutenberg_native_browser_default">Navigateur par défaut</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Le bloc a été supprimé ou n’est plus disponible.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Le bloc ne peut pas être rendu à l’intérieur de lui-même.</string>
+    <string name="gutenberg_native_autoplay">Lecture auto</string>
+    <string name="gutenberg_native_auto">Auto</string>
+    <string name="gutenberg_native_attachment_page">Page de fichier joint</string>
+    <string name="gutenberg_native_add_text">Ajout de texte…</string>
+    <string name="gutenberg_native_add_caption">Ajouter une légende</string>
+    <string name="gutenberg_native_what_is_alt_text">Qu’est-ce que le texte alternatif ?</string>
+    <string name="gutenberg_native_transform_s_to">Transformer %s en</string>
+    <string name="gutenberg_native_transform_block">Transformer le bloc…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Échec d’insertion du média.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Échec d’insertion du fichier audio</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Décrivez le rôle de cette image. Ne rien remplir si l’image est purement décorative. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s a été transformé en %2$s</string>
+    <string name="like_faces_error_loading_message">Erreur lors du chargement des données. %s.</string>
+    <string name="like_faces_plural_text">%d blogueurs aiment ceci.</string>
+    <string name="like_faces_singular_text">Un blogueur aime ceci.</string>
+    <string name="like_title_plural">%d mentions J\'aime</string>
+    <string name="like_title_singular">1 mention J\'aime</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Entrez les identifiants de votre serveur pour résoudre les menaces.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Entrez les identifiants de votre serveur pour résoudre la menace.</string>
+    <string name="suggestion">Suggestion :</string>
+    <string name="gutenberg_native_search_blocks">Rechercher des blocs</string>
+    <string name="gutenberg_native_search_block">Rechercher un bloc</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">Appuyer deux fois pour modifier l’unité</string>
+    <string name="gutenberg_native_clear_search">Supprimer la recherche</string>
+    <string name="gutenberg_native_cancel_search">Annuler la recherche</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s est %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Une erreur est survenue lors de l’obtention des données sur les mentions J’aime</string>
+    <string name="get_likes_unknown_error">Une erreur inconnue est survenue lors de l’obtention des mentions J’aime.</string>
+    <string name="get_likes_no_network_error">Aucun réseau disponible.</string>
+    <string name="comments_empty_list_filtered_unreplied">Aucun commentaire sans réponse</string>
+    <string name="comment_status_unreplied">Sans réponse</string>
+    <string name="gutenberg_native_table_of_contents">Table des matières</string>
+    <string name="gutenberg_native_summary">sommaire</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Résumez votre article avec une liste d’en-têtes. Ajoutez des ancres HTML aux blocs d’en-tête pour les lier ici.</string>
+    <string name="gutenberg_native_document_outline">aperçu du document</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">Adresses IP toujours autorisées</string>
+    <string name="site_settings_denylist_title">Commentaires rejetés</string>
+    <string name="reader_title_interests">Suivre des sujets</string>
+    <string name="stories_intro_main_subtitle">Une nouvelle façon de publier du contenu attrayant sur votre site.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Ignorer</string>
+    <string name="activity_log_backup_download_notice_download_action">Téléchargement</string>
+    <string name="threat_fix_all_status_success_message_plural">Les menaces ont bien été corrigées.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Veuillez confirmer que vous souhaitez corriger les %s menaces actives.</string>
+    <string name="scan_idle_threats_description_plural">L’analyse a trouvé %1$s menaces potentielles avec %2$s. Veuillez passer en revue les éléments ci-dessous et corriger ou appuyer sur le bouton Tout corriger. Nous sommes %3$s au besoin.</string>
+    <string name="scan_fixing_threats_description_plural">Nous rencontrons des difficultés à résoudre ces menaces en arrière-plan. Pendant ce temps, vous pouvez continuer à utiliser votre site comme d’habitude, tout en revenant de temps à autre pour vérifier la progression de l’analyse.</string>
+    <string name="gutenberg_native_edit_focal_point">Modifier le point focal</string>
+    <string name="new_site_creation_search_domain_example">exemple.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Saisissez un nom pour votre site</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Toutes les tâches sont terminées&lt;/b&gt;.&lt;br/&gt;Vous toucherez plus de personnes. Bon travail !</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Toutes les tâches sont terminées&lt;/b&gt;.&lt;br/&gt;Vous avez personnalisé votre site. Bravo !</string>
+    <string name="quick_start_card_menu_hide">Masquer pour le moment</string>
+    <string name="magic_link_not_meaning_to_create_account">Vous ne voulez pas créer de nouveau compte ? Revenez en arrière et ressaisissez votre adresse e-mail.</string>
+    <string name="invite_links_disable_dialog_message">Une fois le lien d’invitation désactivé, plus personne ne pourra l’utiliser pour rejoindre votre équipe. Confirmez-vous ?</string>
+    <string name="invite_links_disable_dialog_title">Désactiver le lien d’invitation</string>
+    <string name="invite_links_bad_format_response">Réponse reçue non valide</string>
+    <string name="invite_links_null_response">Aucune réponse reçue</string>
+    <string name="invite_links_cannot_get_roles_error">Une erreur s’est produite lors de la récupération des rôles</string>
+    <string name="invite_links_helper_text">Utilisez ce lien pour ajouter les membres de votre équipe sans avoir à les inviter individuellement. Toute personne ayant accès à ce lien sera en mesure de rejoindre votre organisation, même si le lien a été envoyé par quelqu’un d’autre que vous. Veillez à le partager uniquement avec des personnes de confiance.</string>
+    <string name="invite_links_expire_date">Expiration %1$s</string>
+    <string name="invite_links_disable_invite_link">Désactiver le lien d’invitation</string>
+    <string name="invite_links_share_invite_link">Partager le lien d’invitation</string>
+    <string name="invite_links_generate">Générer un nouveau lien</string>
+    <string name="invite_links_get_status_retry">Actualiser l’état des liens</string>
+    <string name="invite_links_section_title">Lien d’invitation</string>
+    <string name="threats_found_singular">Menace détectée</string>
+    <string name="threats_found_plural">Menaces détectées</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Analyse terminée&lt;/b&gt; &lt;br&gt; %s menaces potentielles détectées</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Analyse terminée&lt;/b&gt; &lt;br&gt; Une menace potentielle détectée</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Analyse terminée&lt;/b&gt; &lt;br&gt; Aucune menace détectée</string>
+    <string name="scan_fixing_threats_title_singular">Menace en cours de correction…</string>
+    <string name="disable">Désactiver</string>
+    <string name="quick_start_card_menu_unpin">Désépingler ceci</string>
+    <string name="quick_start_list_review_pages_subtitle">Vérifiez vos pages et apportez des modifications, ou ajoutez ou supprimez des pages.</string>
+    <string name="quick_start_list_view_site_title">Voir votre site</string>
+    <string name="quick_start_list_upload_icon_subtitle">Ajoutez une icône de site pour un aspect brillant et pro.</string>
+    <string name="quick_start_list_follow_site_subtitle">Découvrez et abonnez-vous aux sites qui vous inspirent.</string>
+    <string name="quick_start_list_enable_sharing_title">Activer le partage</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Partagez automatiquement les nouveaux articles sur vos réseaux sociaux.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Donnez à votre site un nom qui reflète sa personnalité et son thème.</string>
+    <string name="quick_start_list_check_stats_title">Vérifier vos statistiques</string>
+    <string name="backup_download_status_failure_bullet2">Nous essayerons encore de créer votre fichier de sauvegarde téléchargeable.</string>
+    <string name="backup_download_status_failure_bullet1">L’état permettant d’indiquer la durée de création de votre sauvegarde téléchargeable est introuvable.</string>
+    <string name="backup_download_status_failure_heading">L’état de votre sauvegarde téléchargeable est introuvable.</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icône Case à cocher</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icône Horloge</string>
+    <string name="restore_status_failure_bullet3">Nous vous préviendrons lorsque cela sera fait.</string>
+    <string name="restore_status_failure_bullet2">Nous essayerons encore de restaurer votre site.</string>
+    <string name="restore_status_failure_bullet1">L’état permettant d’indiquer la durée de votre restauration est introuvable.</string>
+    <string name="restore_status_failure_heading">L’état de votre restauration est introuvable.</string>
+    <string name="restore_complete_failed_description">Nous ne pouvons pas restaurer votre site.</string>
+    <string name="restore_warning_action_button">Confirmer</string>
+    <string name="restore_warning_description_with_two_parameters">Confirmez-vous vouloir restaurer votre site au %1$s sur %2$s ?\n        Toutes les modifications apportées depuis seront perdues.</string>
+    <string name="backup_download_complete_failed_description">Nous ne pouvons pas créer votre sauvegarde.</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exclut les thèmes, les extensions et les chargements)</string>
+    <string name="backup_item_contents">Répertoire WP-content</string>
+    <string name="backup_item_roots">Racine WordPress</string>
+    <string name="backup_download_details_choose_items_header">Éléments inclus dans ce téléchargement</string>
+    <string name="gutenberg_native_uploading">Téléversement…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Les blocs réutilisables ne sont pas modifiables sur WordPress pour iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Les blocs réutilisables ne sont pas modifiables sur WordPress pour Android</string>
+    <string name="gutenberg_native_replace_file">Remplacer le fichier</string>
+    <string name="gutenberg_native_replace_audio">Remplacer le son</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Un problème est survenu lors de l’ouverture du fichier audio</string>
+    <string name="gutenberg_native_open">OUVRIR</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Aucune application ne peut traiter cette requête.</string>
+    <string name="gutenberg_native_lock_icon">Icône de verrouillage</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Échec d’insertion du fichier audio Veuillez appuyer pour afficher les options.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Appuyer deux fois pour sélectionner un fichier audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Appuyer deux fois pour écouter le fichier audio</string>
+    <string name="gutenberg_native_choose_audio">Choisir un fichier sonore</string>
+    <string name="gutenberg_native_audio_player">Lecteur audio</string>
+    <string name="gutenberg_native_audio_file">fichier audio</string>
+    <string name="gutenberg_native_audio_caption_s">Légende audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Légende audio. Vide</string>
+    <string name="gutenberg_native_add_audio">AJOUTER UN FICHIER AUDIO</string>
+    <string name="continue_with_wpcom">Se connecter ou s’inscrire avec WordPress.com</string>
+    <string name="photo_picker_use_audio">Utiliser ce fichier audio</string>
+    <string name="photo_picker_choose_audio">Choisir le fichier audio depuis l’appareil</string>
+    <string name="people_optional_custom_message_helper_text">Facultatif : saisissez un message personnalisé à joindre à votre invitation.</string>
+    <string name="people_learn_more_about_roles">Plus d’infos sur les rôles</string>
+    <string name="threat_status_fixed">Exact</string>
+    <string name="threat_found_header">Trouvé</string>
+    <string name="scan_here_to_help">Aide ici</string>
+    <string name="scan_idle_threats_description_singular">L’analyse a détecté une menace potentielle avec %1$s. Veuillez passer en revue la menace ci-dessous et corriger ou appuyer sur le bouton Tout corriger. Nous sommes %2$s au besoin.</string>
+    <string name="scan_idle_manual_scan_description">Pour contrôler votre site à nouveau, exécutez une analyse manuelle ou attendez la prochaine analyse Jetpack plus tard dans la journée.</string>
+    <string name="scan_provisioning_description">Bienvenue dans Jetpack Scan ! Nous étudions votre site en vue de préparer une analyse complète. Nous vous ferons savoir si nous rencontrons un problème susceptible de compromettre l’analyse, puis nous démarrerons votre première analyse complète.</string>
+    <string name="scan_scanning_is_initial_description">Bienvenue sur Jetpack Scan. Nous réalisons actuellement un état des lieux de votre site et les résultats devraient bientôt vous parvenir.</string>
+    <string name="scan_fixing_threats_description_singular">Nous rencontrons des difficultés à résoudre cette menace en arrière-plan. Pendant ce temps, vous pouvez continuer à utiliser votre site comme d’habitude, tout en revenant de temps à autre pour vérifier la progression de l’analyse.</string>
+    <string name="scan_scanning_description">Nous vous enverrons une notification une fois que l’analyse sera terminée. Pendant ce temps, vous pouvez continuer à utiliser votre site comme d’habitude, tout en revenant de temps à autre pour vérifier la progression de l’analyse.</string>
+    <string name="scan_fixing_threats_title_plural">Correction des menaces</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan n’a pas pu terminer l’analyse de votre site. Veuillez vérifier si votre site est indisponible. Si ce n’est pas le cas, réessayez. S’il l’est, ou si Jetpack Scan rencontre toujours des problèmes, contactez notre équipe d’assistance.</string>
+    <string name="scan_request_failed_title">Un problème est survenu…</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Sauvegarde du site</string>
+    <string name="activity_log_currently_backing_up_message">Sauvegarde du site à partir du %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Création d’une sauvegarde téléchargeable</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Votre site a été sauvegardé avec succès</string>
+    <string name="activity_log_backup_finished_snackbar_message">Votre site a été sauvegardé avec succès\nSauvegardé à partir du %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Votre site est en cours de sauvegarde\nSauvegarde à partir du %1$s %2$s</string>
+    <string name="pick_audio">Sélectionner un fichier audio</string>
+    <string name="restore_complete_visit_site_button_content_description">Bouton Visiter le site</string>
+    <string name="restore_complete_done_button_content_description">Bouton Terminé</string>
+    <string name="restore_complete_header">Votre site a été restauré.</string>
+    <string name="restore_progress_footnote">Pas besoin d’attendre. Nous vous avertirons lorsque votre site aura été restauré.</string>
+    <string name="restore_progress_icon_content_description">Icône Restaurer le site</string>
+    <string name="restore_progress_description_with_two_parameters">Nous sommes en train de restaurer votre site tel qu’il était le %1$s %2$s.</string>
+    <string name="restore_progress_header">Restauration du site en cours</string>
+    <string name="restore_warning_action_button_content_description">Bouton Confirmer la restauration du site</string>
+    <string name="restore_warning_icon_content_description">Image d’un cercle rouge avec un point d’exclamation</string>
+    <string name="restore_warning_header">Avertissement</string>
+    <string name="restore_details_action_button_content_description">Bouton Restaurer le site</string>
+    <string name="restore_details_icon_content_description">Icône Restaurer</string>
+    <string name="restore_details_action_button">Restaurer le site</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s correspond au point sélectionné pour la restauration.</string>
+    <string name="restore_details_header">Restaurer le site</string>
+    <string name="restore_details_choose_items_header">Choisissez les éléments à restaurer :</string>
+    <string name="restore">Restaurer</string>
+    <string name="backup_download_complete_failed_icon_content_description">Icône de nuage avec le symbole X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Bouton Terminé</string>
+    <string name="backup_download_complete_failed_action_button">Terminé</string>
+    <string name="backup_download_complete_failed_title">Échec du téléchargement</string>
+    <string name="web_preview_tablet">Tablette</string>
+    <string name="web_preview_mobile">Portable</string>
+    <string name="quick_start_card_menu_remove">Ne plus afficher</string>
+    <string name="quick_start_card_menu_pin">Épingler ceci</string>
+    <string name="quick_start_dialog_review_pages_message_short">Sélectionnez %1$s Pages %2$s pour afficher votre liste de pages.</string>
+    <string name="quick_start_dialog_review_pages_message">Modifiez, ajoutez ou supprimez les pages de votre site.</string>
+    <string name="quick_start_dialog_review_pages_title">Passer en revue les pages du site</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Sélectionnez %1$s Page d’accueil %2$s pour modifier votre page d’accueil.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Sélectionnez %1$s Pages %2$s pour afficher votre liste de pages.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Modifiez, ajoutez ou supprimez du contenu depuis la page d\'accueil de votre site.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Modifier la page d\'accueil</string>
+    <string name="reader_menu_mark_as_unseen">Marquer comme non lu</string>
+    <string name="reader_menu_mark_as_seen">Marquer comme lu</string>
+    <string name="error_media_upload_failed_for_reason">Échec de chargement du média.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Espace de stockage disponible sur le site insuffisant.</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Impossible de basculer vers le statut Lu pour cet article</string>
+    <string name="reader_marked_post_as_unseen">Article marqué comme non lu</string>
+    <string name="reader_marked_post_as_seen">Article marqué comme lu</string>
+    <string name="threat_fix_all_status_error_message">Erreur lors de la récupération de l’état de la résolution. Veuillez contacter l’assistance.</string>
+    <string name="threat_fix_all_status_success_message_singular">La menace a bien été corrigée.</string>
+    <string name="threat_fix_all_error_message">Erreur lors de la correction de menaces. Veuillez contacter l’assistance.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Veuillez confirmer que vous souhaitez corriger une menace active.</string>
+    <string name="threat_fix_all_warning_title">Corriger l’ensemble des menaces</string>
+    <string name="threat_ignore_error_message">Une erreur s’est produite, l’erreur n’a pas pu être ignorée. Veuillez contacter l’assistance.</string>
+    <string name="threat_ignore_success_message">Menace ignorée.</string>
+    <string name="threat_fix_error_message">Erreur lors de la correction de la menace. Veuillez contacter l’assistance.</string>
+    <string name="threat_item_sub_header_status_ignored">Menace ignorée</string>
+    <string name="threat_item_sub_header_status_fixed_on">Menace résolue le %s</string>
+    <string name="threat_fixing">Menace en cours de correction…</string>
+    <string name="scan_history_ignored_threats_tab">Ignoré</string>
+    <string name="scan_history_no_threats_found">Aucun élément trouvé</string>
+    <string name="scan_history_fixed_threats_tab">Exact</string>
+    <string name="scan_history_all_threats_tab">Tout</string>
+    <string name="scan_scanning_title">Analyse des fichiers</string>
+    <string name="scan_preparing_to_scan_title">Préparation de l’analyse</string>
+    <string name="scan_history_menu_title">Historique</string>
+    <string name="scan_history">Analyser l’historique</string>
+    <string name="backup_active_filter_empty_subtitle">Essayez d’ajuster la période</string>
+    <string name="backup_active_filter_empty_title">Aucune sauvegarde ne correspond</string>
+    <string name="backup_empty_subtitle">Votre première sauvegarde apparaîtra ici dans les 24 heures et dès qu\'elle sera prête, vous recevrez une notification.</string>
+    <string name="backup_empty_title">Votre première sauvegarde sera bientôt prête.</string>
+    <string name="request_failed_message">Un problème est survenu lors du traitement de la demande. Veuillez réessayer plus tard.</string>
+    <string name="gutenberg_native_move_to_bottom">Déplacer tout en bas</string>
+    <string name="gutenberg_native_change_block_position">Modifier l’emplacement du bloc</string>
+    <string name="label_control_upload">Charger</string>
+    <string name="jetpack_icon_content_description">icône</string>
+    <string name="backup_download_complete_info">Nous vous avons également envoyé par e-mail un lien vers votre fichier.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Bouton Lien de partage</string>
+    <string name="backup_download_complete_download_action_button_content_description">Bouton Téléchargement</string>
+    <string name="backup_download_complete_icon_content_description">Icône de sauvegarde téléchargeable prête</string>
+    <string name="backup_download_complete_download_share_action_button">Lien de partage</string>
+    <string name="backup_download_complete_download_action_button">Téléchargement</string>
+    <string name="backup_download_complete_description_with_two_parameters">Nous avons créé une sauvegarde de votre site le %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Votre sauvegarde peut désormais être téléchargée</string>
+    <string name="backup_download_complete_page_title">Votre sauvegarde</string>
+    <string name="backup_download_progress_footnote">Pas besoin d’attendre. Nous vous avertirons lorsque votre sauvegarde sera prête.</string>
+    <string name="backup_download_progress_icon_content_description">Icône de sauvegarde téléchargeable en cours de création</string>
+    <string name="backup_download_progress_description_with_two_parameters">Nous créons une sauvegarde téléchargeable de votre site tel qu’il était le %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Création d’une sauvegarde téléchargeable de votre site en cours</string>
+    <string name="backup_download_progress_page_title">Télécharger la sauvegarde</string>
+    <string name="backup_download_another_download_running">Un autre téléchargement est en cours.</string>
+    <string name="backup_download_generic_failure">Un problème est survenu lors du traitement de la demande. Veuillez réessayer plus tard.</string>
+    <string name="backup_download_details_action_button_content_description">Créer un bouton de sauvegarde téléchargeable</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s est le point sélectionné pour créer une sauvegarde téléchargeable.</string>
+    <string name="gutenberg_native_image_link_url">URL du lien de l’image</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">partage de contenu</string>
+    <string name="suggestion_user">utilisateur</string>
+    <string name="suggestion_no_matching">Aucun(e) %s correspondant(e).</string>
+    <string name="suggestion_problem">Un problème est survenu lors du chargement des suggestions.</string>
+    <string name="suggestion_none">Aucune suggestion %s disponible.</string>
+    <string name="suggestion_selection_needed">Veuillez taper pour filtrer la liste de suggestions.</string>
+    <string name="threat_get_free_estimate">Recevoir un devis gratuit</string>
+    <string name="threat_ignore">Ignorer la menace</string>
+    <string name="threat_fix">Résoudre la menace</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan résoudra la menace.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan modifiera le fichier ou répertoire concerné.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan procédera à la mise à jour vers une version plus récente (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan supprimera le fichier ou répertoire concerné.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan remplacera le fichier ou répertoire concerné.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan ne peut pas résoudre cette menace automatiquement.\n Nous vous conseillons de procéder à une résolution manuelle. Vérifiez que WordPress, votre thème, ainsi que toutes vos extensions sont bien à jour, puis supprimez le code, le thème ou l’extension corrompu de votre site. \n \n\n Pour obtenir de l’aide pour éliminer cette menace, nous vous recommandons &lt;b&gt;Codeable&lt;/b&gt;, une plateforme fiable de freelances WordPress triés sur le volet.\n Un groupe d’experts en sécurité pourra vous venir en aide sur ces projets. Les prix vont de 70 à 120 $ par heure et vous pouvez obtenir une estimation gratuite, sans obligation de contrat.</string>
+    <string name="threat_fix_current_not_fixable_header">Résolution de la menace en cours</string>
+    <string name="threat_fix_fixed_header">Comment Jetpack a-t-il réparé ?</string>
+    <string name="threat_fix_default_header">Comment allons-nous y remédier ?</string>
+    <string name="threat_file_description">Menace détectée dans le fichier :</string>
+    <string name="threat_technical_details_header">Détails techniques</string>
+    <string name="threat_problem_header">Quel était le problème ?</string>
+    <string name="threat_details">Détails de la menace</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnérabilité détectée dans le thème</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnérabilité détectée dans l’extension</string>
+    <string name="threat_item_sub_header_file_signature">Menace détectée %s</string>
+    <string name="threat_item_sub_header_core_file">Vulnérabilité détectée dans WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Vulnérabilité diverse</string>
+    <string name="threat_item_header_vulnerable_theme">Thème vulnérable : %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Extension vulnérable : %s (version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s : modèle de code malveillant</string>
+    <string name="threat_item_header_database_threat">Menaces concernant la base de données %s</string>
+    <string name="threat_item_header_infected_core_file">%s : fichier core infecté</string>
+    <string name="threat_item_header_threat_found">Menace détectée</string>
+    <string name="threats_fix_all">Tout corriger</string>
+    <string name="scan_in_few_seconds">il y a quelques secondes</string>
+    <string name="scan_in_minutes_ago">il y a %s minute(s)</string>
+    <string name="scan_in_hours_ago">il y a %s heure(s)</string>
+    <string name="scan_this_site">ce site</string>
+    <string name="scan_idle_last_scan_description">La dernière analyse Jetpack exécutée le %s n’a détecté aucun risque. %s</string>
+    <string name="scan_idle_threats_found_title">Votre site est peut-être menacé.</string>
+    <string name="scan_idle_no_threats_found_title">Ne vous inquiétez pas.</string>
+    <string name="scan_again">Analyser de nouveau</string>
+    <string name="scan_now">Lancer une analyse</string>
+    <string name="scan_state_icon">Icône d’état de l’analyse</string>
+    <string name="backup">Sauvegardes</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtre Type d’activité (%s types sélectionnés)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (affichage de %s éléments)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtre Type d’activité</string>
+    <string name="activity_log_activity_type_empty_subtitle">Aucune activité n’est enregistrée dans la plage de dates sélectionnée.</string>
+    <string name="activity_log_activity_type_empty_title">Aucune activité disponible</string>
+    <string name="activity_log_activity_type_error_subtitle">Veuillez vérifier votre connexion internet et réessayer.</string>
+    <string name="activity_log_activity_type_error_title">Pas de connexion</string>
+    <string name="activity_log_activity_type_filter_active_label">Type d’activité (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtre Période</string>
+    <string name="activity_log_active_filter_empty_subtitle">Essayez d’ajuster les filtres Période et Type d’activité.</string>
+    <string name="activity_log_active_filter_empty_title">Aucun événement ne correspond</string>
+    <string name="backup_item_plugins">Extensions WordPress</string>
+    <string name="backup_item_themes">Thèmes WordPress</string>
+    <string name="backup_download_details_action_button">Créer un fichier téléchargeable</string>
+    <string name="backup_download_details_header">Créer une sauvegarde téléchargeable</string>
+    <string name="backup_download_details_page_title">Télécharger la sauvegarde</string>
+    <string name="backup_download">Sauvegarde téléchargée</string>
+    <string name="gutenberg_native_error">Erreur</string>
+    <string name="gutenberg_native_choose_file">Choisir un fichier</string>
+    <string name="activity_log_item_menu_download_backup_label">Télécharger la sauvegarde</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copier la version depuis cette application</string>
+    <string name="button_copy">Dupliquer</string>
+    <string name="toast_edit_story_update_in_progress_title">La story a été enregistrée, veuillez patienter…</string>
+    <string name="gutenberg_native_file_name">Nom du fichier</string>
+    <string name="gutenberg_native_file_block_settings">Réglages du bloc fichier</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Le téléversement des fichiers a échoué.\nVeuillez toucher pour accéder aux options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">L’enregistrement des fichiers a échoué.\nVeuillez toucher pour accéder aux options.</string>
+    <string name="gutenberg_native_edit_file">Modifier le fichier</string>
+    <string name="gutenberg_native_copy_file_url">Copier l’URL du fichier</string>
+    <string name="gutenberg_native_choose_a_file">Choisir un fichier</string>
+    <string name="new_site_creation_domain_header_title">Choisir un domaine</string>
+    <string name="my_site_btn_jetpack_settings">Réglages de Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Suivi de la discussion par e-mail</string>
+    <string name="reader_btn_follow_comments">Suivre la discussion par e-mail</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Impossible de se désabonner des commentaires pour cet article</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Impossible de s’abonner aux commentaires pour cet article</string>
+    <string name="reader_follow_comments_get_status_error">Erreur de récupération du statut d’abonnement pour l’article</string>
+    <string name="reader_follow_comments_unsubscribe_success">Bien désabonné·e des commentaires</string>
+    <string name="reader_follow_comments_subscribe_success">Bien abonné·e aux commentaires</string>
+    <string name="reader_follow_comments_bad_format_response">Réponse reçue non valide</string>
+    <string name="reader_follow_comments_null_response">Aucune réponse reçue</string>
+    <string name="activity_log_activity_type_filter_clear">Effacer</string>
+    <string name="activity_log_activity_type_filter_apply">Appliquer</string>
+    <string name="dialog_edit_story_unsupported_format_message">Une ou plusieurs diapositives n’ont pas été ajoutées à votre Story, car les Stories ne prennent pas en charge les fichiers GIF pour le moment. Veuillez plutôt choisir une image statique ou un arrière-plan vidéo.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Fichiers GIF non pris en charge</string>
+    <string name="dialog_edit_story_unrecoverable_message">Nous n’avons pas pu trouver les médias pour cette Story sur le site.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Impossible de modifier la Story</string>
+    <string name="dialog_edit_story_unavailable_message">Impossible de charger le média pour cette Story. Vérifiez votre connexion internet et réessayez dans un instant.</string>
+    <string name="dialog_edit_story_unavailable_title">Impossible de modifier la Story</string>
+    <string name="dialog_edit_story_limited_message">Cette Story a été modifiée sur un appareil différent et la possibilité de modifier certains objets peut être limitée.</string>
+    <string name="dialog_edit_story_limited_title">Modification de la Story limitée</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Le média a été supprimé. Essayez de créer à nouveau votre story.</string>
+    <string name="color_picker_label_background">Arrière-plan</string>
+    <string name="color_picker_label_text">Texte</string>
+    <string name="dialog_discard_story_ok_button_edit">Rejeter</string>
+    <string name="dialog_discard_story_message_edit">Aucune modification effectuée n’a été enregistrée.</string>
+    <string name="dialog_discard_story_title_edit">Annuler les modifications ?</string>
+    <string name="label_done_button">Terminé</string>
+    <string name="label_next_button">Suivant</string>
+    <string name="delete_button_alt">Supprimer</string>
+    <string name="hpp_choose_error">Une erreur s’est produite lors de la sélection du design.</string>
+    <string name="hpp_retry_error">Veuillez vérifier votre connexion internet, puis réessayez.</string>
+    <string name="hpp_error_subtitle">Appuyez sur Réessayer lorsque vous êtes de nouveau en ligne.</string>
+    <string name="hpp_error_title">Mises en page non disponibles hors connexion</string>
+    <string name="continue_site_credentials">Continuer avec les identifiants de connexion de la boutique</string>
+    <string name="login_find_your_connected_email">Trouver votre e-mail connecté</string>
+    <string name="reader_discover_no_posts_button_text">Suivre des sujets</string>
+    <string name="reader_discover_no_posts_subtitle">Essayez de suivre plus de sujets pour élargir la recherche</string>
+    <string name="reader_discover_no_posts_title">Pas d’articles récents.</string>
+    <string name="reader_discover_empty_title">Bienvenue !</string>
+    <string name="scan">Analyser</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; a répondu à votre article</string>
+    <string name="login_prologue_third_subtitle_two">Vous avez reçu &lt;b&gt;50 « J’aime »&lt;/b&gt; sur votre site aujourd\'hui</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; a aimé votre article</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Menu de bloc déroulant ouvert. Sélectionner un bloc.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menu de bloc déroulant fermé.</string>
+    <string name="hpp_skip_button">Passer</string>
+    <string name="hpp_choose_button">Choisir</string>
+    <string name="hpp_subtitle">Sélectionnez votre mise en page préférée pour la page d’accueil. Vous pourrez la personnaliser ou la modifier ultérieurement.</string>
+    <string name="hpp_title">Choisir un design</string>
+    <string name="mlp_network_error_subtitle">Touchez réessayer quand vous serez de nouveau en ligne ou créer un page blanche en utilisant le bouton ci-dessous.</string>
+    <string name="mlp_network_error_title">Les mises en page ne sont pas disponibles hors connexion</string>
+    <string name="mlp_error_subtitle">Touchez réessayer ou créez une page blanche en utilisant le bouton ci-dessous.</string>
+    <string name="mlp_error_title">Les mises en page ne sont pas disponibles suite à une erreur.</string>
+    <string name="prepublishing_nudges_add_category_button">Ajouter une catégorie</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Ajouter une nouvelle catégorie</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Catégories</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Non définie</string>
+    <string name="prepublishing_nudges_categories_action">Catégories</string>
+    <string name="login_prologue_fifth_caption_three">Musées à Londres</string>
+    <string name="login_prologue_fifth_caption_two">Les meilleurs fans du monde</string>
+    <string name="login_prologue_fifth_caption_one">Mon top 10 des cafés</string>
+    <string name="login_prologue_fifth_tag_six">Politique</string>
+    <string name="login_prologue_fifth_tag_five">Musique</string>
+    <string name="login_prologue_fifth_tag_four">Jardinage</string>
+    <string name="login_prologue_fifth_tag_three">Football</string>
+    <string name="login_prologue_fifth_tag_two">Cuisine</string>
+    <string name="login_prologue_fifth_tag_one">Art</string>
+    <string name="login_prologue_fifth_subtitle_three">Semaine du Rock n’ Roll</string>
+    <string name="login_prologue_fifth_subtitle_two">Infos du web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">J’apprécie le travail du photographe Cameron Karsten. J’essaierai ses techniques sur mes prochaines photos.</string>
+    <string name="login_prologue_second_subtitle_one">Inspiration</string>
+    <string name="login_prologue_title_fifth">Suivez vos sites préférés et découvrez de nouveaux blogs.</string>
+    <string name="login_prologue_title_fourth">Regardez votre audience grossir avec les statistiques approfondies.</string>
+    <string name="login_prologue_title_third">Voir les commentaires et notifications en temps réel.</string>
+    <string name="login_prologue_title_second">Avec cet éditeur puissant, vous pouvez publier de n’importe où.</string>
+    <string name="login_prologue_title_first">Bienvenue sur le constructeur de site le plus populaire au monde.</string>
+    <string name="media_loading_failed">Échec du chargement du média</string>
+    <string name="reader_discover_recommended_blogs_header">Sites à suivre</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Nous travaillons dur pour ajouter plus de blocs à chaque version.</string>
     <string name="gutenberg_native_s_is_not_fully_supported">« %s » n’est pas entièrement pris en charge</string>
     <string name="gutenberg_native_help_button">Bouton d’aide</string>
@@ -13,24 +430,21 @@ Language: fr
     <string name="gutenberg_native_choose_images">Choisir des images</string>
     <string name="stories_intro_create_story_post_label">Créer une publication de story</string>
     <string name="stories_intro_description_second">Elles sont publiées en tant que nouvel article de blog sur votre site afin que votre public ne rate jamais rien.</string>
-    <string name="stories_intro_title_second">Les publications de story ne disparaissent pas</string>
+    <string name="stories_intro_title_second">Les publications de story ne disparaissent pas.</string>
     <string name="stories_intro_description_first">Combinez des photos, des vidéos et du texte pour créer des publications de story engageantes et sur lesquelles on peut appuyer. Vos visiteurs apprécieront.</string>
     <string name="stories_intro_title_first">Maintenant, les stories sont pour tout le monde</string>
     <string name="stories_intro_image_caption_second">Exemple de titre de story</string>
     <string name="stories_intro_image_caption_first">Comment créer une publication de story</string>
-    <string name="stories_intro_main_subtitle">Vous avez un accès anticipé aux publications de story et nous aimerions que vous l’essayiez.</string>
     <string name="stories_intro_main_title">Présentation des publications de story</string>
-    <string name="mlp_generic_error">Une erreur est survenue lors de l’extraction des mises en page</string>
     <string name="mlp_notice_blank_page_created">Page vide créée</string>
     <string name="mlp_notice_page_created">Page créée</string>
-    <string name="mlp_preview_title">Aperçu de la mise en page</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s s’est vu refuser l’accès à vos photos. Pour corriger cela, modifiez vos autorisations et activez %2$s et %3$s.</string>
     <string name="media_insert_failed">L’insertion du média a échoué.</string>
     <string name="media_insert_failed_with_reason">L’insertion du média a échoué : %s</string>
     <string name="photo_picker_wordpress_media_library">Choisir dans la bibliothèque des médias WordPress</string>
     <string name="reader_label_toolbar_back">Retour</string>
-    <string name="reader_discover_empty_button_text">Commencer</string>
-    <string name="reader_discover_empty_title">Suivre des thèmes pour découvrir de nouveaux blogs</string>
+    <string name="reader_discover_empty_button_text">Premiers pas</string>
+    <string name="reader_discover_empty_subtitle">Suivre les sujets pour découvrir de nouveaux blogs</string>
     <string name="reader_post_details_header_by_author_name">Par</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">Ce référent ne peut pas être marqué comme indésirable</string>
     <string name="stats_referrer_popup_unmark_as_spam">Marquer comme sain</string>
@@ -41,10 +455,11 @@ Language: fr
     <string name="media_uploading_default">Média en cours de téléversement</string>
     <string name="gutenberg_native_select_item">Sélectionner un élément</string>
     <string name="gutenberg_native_search_or_type_url">Rechercher ou saisir une URL</string>
+    <string name="gutenberg_native_page_break">Saut de page</string>
     <string name="gutenberg_native_add_this_telephone_link">Lien d’ajout de ce téléphone</string>
     <string name="gutenberg_native_add_this_link">Ajouter ce lien</string>
     <string name="gutenberg_native_add_this_email_link">Lien d’ajout de cet e-mail</string>
-    <string name="suggestion_no_connection">« Absence de connexion internet.\nLes suggestions non disponibles. »</string>
+    <string name="suggestion_no_connection">Aucune connexion internet.\nLes suggestions ne sont pas disponibles.</string>
     <string name="typeface_label_shrikhand">Gras</string>
     <string name="typeface_label_space_mono">Moderne</string>
     <string name="typeface_label_pacifico">Ludique</string>
@@ -60,7 +475,6 @@ Language: fr
     <string name="comment_unable_to_show_error">Impossible d’afficher ce commentaire</string>
     <string name="media_browse_for_items">Parcourir les éléments.</string>
     <string name="reader_menu_report_post">Signaler cet article</string>
-    <string name="gutenberg_native_angle">Angle</string>
     <string name="reader_welcome_banner">Bienvenue sur le Lecteur. Découvrez des millions de blogs à portée de main.</string>
     <string name="error_media_xmlrcp_server_error">Une erreur interne du serveur s’est produite</string>
     <string name="error_media_xmlrpc_not_allowed">Votre action n’est pas autorisée</string>
@@ -70,7 +484,6 @@ Language: fr
     <string name="create_post_story_fab_tooltip">Créer un article ou une story</string>
     <string name="create_page_fab_tooltip">Créer une page</string>
     <string name="create_post_fab_tooltip">Créer un article</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">Vous pourriez aimer</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Masquer</string>
     <string name="gutenberg_native_video_caption_empty">Légende de la vidéo. Vide</string>
@@ -109,7 +522,6 @@ Language: fr
     <string name="dialog_discard_errored_page_message">Cette diapositive n’a pas encore été enregistrée. Si vous supprimez cette diapositive, vous perdrez toutes les modifications que vous avez apportées.</string>
     <string name="dialog_discard_page_message">Cette diapositive sera supprimée de votre story.</string>
     <string name="dialog_discard_page_title">Supprimer la diapositive de la story ?</string>
-    <string name="menu_delete_page">Supprimer la diapositive</string>
     <string name="label_text_color_button">Modifier la couleur du texte</string>
     <string name="label_text_alignment_button">Modifier l’alignement du texte</string>
     <string name="label_frame_errored">erroné</string>
@@ -119,8 +531,6 @@ Language: fr
     <string name="label_retry_icon">Réessayer</string>
     <string name="label_saved_icon">Enregistrée</string>
     <string name="label_close_button">Fermer</string>
-    <string name="label_control_publish">Suivante</string>
-    <string name="label_done">Terminé</string>
     <string name="label_share_to">Partager vers</string>
     <string name="label_snackbar_share">PARTAGER</string>
     <string name="label_snackbar_loop_frame_saved">Enregistré dans les photos</string>
@@ -131,7 +541,6 @@ Language: fr
     <string name="label_control_flip_camera">Retourner</string>
     <string name="sound_button_alt">Son</string>
     <string name="text_button_alt">Texte</string>
-    <string name="more_button_alt">Plus</string>
     <string name="stickers_button_alt">Autocollants</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Retourner l’appareil photo</string>
@@ -144,7 +553,7 @@ Language: fr
     <string name="prepublishing_nudges_story_title_hint">Donnez un titre à votre story</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Créez un article ou une story</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Créez un article, une page ou une story</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Appuyez sur %1$s Créer. %2$s Puis sélectionnez &lt;b>Article de blog&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Appuyez sur %1$s Créer. %2$s Puis sélectionnez &lt;b&gt;Article de blog&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Choisir depuis l’appareil</string>
     <string name="my_site_bottom_sheet_add_story">Publication de story</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">La modification d’icônes de site sur des sites WordPress auto-hébergés requiert l’extension Jetpack.</string>
@@ -158,13 +567,10 @@ Language: fr
     <string name="gutenberg_native_choose_image_or_video">Choisir une image ou une vidéo</string>
     <string name="gutenberg_native_choose_image">Choisir une image</string>
     <string name="gutenberg_native_block_removed">Bloc supprimé</string>
-    <string name="content_description_logo">Logo WordPress</string>
-    <string name="enter_your_site_address">Saisissez l’adresse de votre site</string>
-    <string name="continue_with_wpcom">Continuer avec WordPress.com</string>
+    <string name="enter_your_site_address">Saisissez l’adresse de votre site actuel</string>
     <string name="signup_confirmation_title">Confirmation de l’inscription</string>
     <string name="continue_with_google_terms_of_service_text">Si vous continuez avec Google sans disposer au préalable d’un compte WordPress.com, vous créez un compte et acceptez nos %1$sconditions d’utilisation%2$s.</string>
     <string name="continue_terms_of_service_text">En poursuivant, vous acceptez nos %1$sConditions d’utilisation%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Nous vous enverrons un lien par e-mail pour créer votre nouveau compte WordPress.com.</string>
     <string name="signup_confirmation_message">Nous utiliserons cette adresse e-mail pour créer votre nouveau compte WordPress.com.</string>
     <string name="signup_magic_link_message">Nous vous avons envoyé un lien par e-mail pour créer votre nouveau compte WordPress.com. Consultez vos e-mails sur cet appareil et appuyez sur le lien dans l’e-mail que vous avez reçu de WordPress.com.</string>
     <string name="enter_account_info_for_site">Saisissez vos informations de compte pour %1$s.</string>
@@ -176,24 +582,20 @@ Language: fr
     <string name="login_magic_links_sent_label">Consultez vos e-mails sur cet appareil et appuyez sur le lien dans l’e-mail que vous avez reçu de WordPress.com.</string>
     <string name="login_magic_links_label">Nous vous enverrons par e-mail un lien qui vous connectera instantanément, sans mot de passe.</string>
     <string name="check_email">Vérifier les e-mails</string>
-    <string name="get_started">Commencer</string>
+    <string name="get_started">Premiers pas</string>
     <string name="enter_email_to_continue_wordpress_com">Entrez votre adresse e-mail pour vous connecter ou créez un compte WordPress.com.</string>
     <string name="or_type_your_password">Vous pouvez également saisir votre mot de passe</string>
     <string name="create_account">Créer un compte</string>
     <string name="send_link_by_email">Envoyer un lien par e-mail</string>
-    <string name="login_promo_text_unlock_the_power">Libérez la puissance de l’outil de création de sites Web le plus flexible.</string>
-    <string name="login_promo_title_37_percent">37\% du Web est intégré à WordPress.</string>
     <string name="reset_your_password">Réinitialiser votre mot de passe</string>
     <string name="reader_error_request_failed_title">Un problème est survenu lors du traitement de la demande. Veuillez réessayer plus tard.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Donnez à votre site un nom qui reflète sa personnalité et son thème. La première impression est importante !</string>
     <string name="quick_start_list_update_site_title_title">Définir un titre pour votre site</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Appuyer sur &lt;b>%1$s&lt;/b> pour définir un nouveau titre</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Appuyer sur &lt;b&gt;%1$s&lt;/b&gt; pour définir un nouveau titre</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Supprimer cet article va également supprimer les modifications locales, confirmez-vous vous vouloir continuer ?</string>
     <string name="gutenberg_native_s_block_options">Option du bloc %s</string>
     <string name="gutenberg_native_duplicate_block">Dupliquer le bloc</string>
     <string name="gutenberg_native_copy_block">Copier le bloc</string>
     <string name="gutenberg_native_copied_block">Bloc copié</string>
-    <string name="gutenberg_native_block_settings">Réglages du bloc</string>
     <string name="gutenberg_native_block_pasted">Bloc collé</string>
     <string name="gutenberg_native_block_duplicated">Bloc dupliqué</string>
     <string name="gutenberg_native_block_cut">Bloc coupé</string>
@@ -209,7 +611,6 @@ Language: fr
     <string name="gutenberg_native_gradient_type">Type de dégradé</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Touchez deux fois pour sélectionner l’option</string>
     <string name="gutenberg_native_customize_gradient">Personnaliser le dégradé</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Auteur de la page</string>
     <string name="photo_picker_use_gif">Utiliser ce GIF</string>
     <string name="error_media_thumbnail_not_loaded">La miniature n’a pas pu être chargée</string>
@@ -232,8 +633,8 @@ Language: fr
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Passer en brouillon</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Les articles dans la corbeille ne peuvent pas être modifier. Voulez-vous changer le statut de cet article vers « brouillon » pour pouvoir travailler dessus ?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Déplacer l’article vers Brouillons ?</string>
-    <string name="reader_label_choose_your_interests">Choisissez vos centres d’intérêts</string>
-    <string name="reader_choose_interests_content_description">Choisissez vos centres d’intérêts</string>
+    <string name="reader_label_choose_your_interests">Choisir vos thèmes</string>
+    <string name="reader_choose_interests_content_description">Choisir vos thèmes</string>
     <string name="reader_btn_done">Terminé</string>
     <string name="reader_btn_select_few_interests">Sélectionnez-en quelques-uns pour continuer.</string>
     <string name="post_status_post_published">Publié</string>
@@ -245,17 +646,14 @@ Language: fr
     <string name="ccpa_privacy_notice_header">Avis de confidentialité pour les utilisateurs californiens</string>
     <string name="status_and_visibility">État et visibilité</string>
     <string name="update_now">Mettre à jour maintenant</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Essayer une mise en page de démarrage</string>
     <string name="gutenberg_native_open_block_actions_menu">Ouvrir le menu d’actions du bloc</string>
-    <string name="gutenberg_native_insert_mention">Insérer une mention</string>
+    <string name="gutenberg_native_move_to_top">Déplacer tout en haut</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Appuyer deux fois pour ouvrir la feuille du bas avec des options disponibles</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Appuyer deux fois pour ouvrir la feuille d’action avec des options disponibles</string>
     <string name="pages_cannot_be_started">Impossible d’ouvrir des pages pour le moment. Réessayez ultérieurement.</string>
     <string name="pages_set_as_posts_page">Définir comme page d’articles</string>
     <string name="pages_set_as_homepage">Définir comme page d’accueil</string>
-    <string name="suggestion_no_matching_users">« Aucun utilisateur correspondant disponible. »</string>
-    <string name="suggestion_invalid_user">« %s n’est pas un utilisateur valide »</string>
+    <string name="suggestion_invalid">%s n’est pas un(e) %s valide</string>
     <string name="site_settings_select_page">Sélectionner une page</string>
     <string name="site_settings_posts_page">Page des articles</string>
     <string name="site_settings_static_homepage">Page d’accueil statique</string>
@@ -275,7 +673,6 @@ Language: fr
     <string name="page_homepage_successfully_updated">Page d’accueil mise à jour avec succès</string>
     <string name="page_cannot_set_posts_page">Pour régler la page des articles, activez « Page d’accueil statique » dans les réglages du site</string>
     <string name="page_cannot_set_homepage">Pour régler la page d’accueil, activez « Page d’accueil statique » dans les réglages du site</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Bienvenue sur notre nouveau blog</string>
     <string name="gutenberg_native_select_a_color">Sélectionnez une couleur</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toucher deux fois pour aller aux réglages de couleur</string>
     <string name="reader_empty_followed_blogs_description">Lorsque vous suivez des sites, vous verrez leur contenu ici</string>
@@ -309,7 +706,6 @@ Language: fr
     <string name="gutenberg_native_move_block_left">Déplacer le bloc à gauche</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toucher deux fois pour déplacer le bloc à droite</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toucher deux fois pour déplacer le bloc à gauche</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Création du tableau de bord</string>
     <string name="new_site_creation_creating_site_loading_3">Configuration du thème</string>
     <string name="new_site_creation_creating_site_loading_2">Ajout des fonctionnalités du site</string>
@@ -365,57 +761,20 @@ Language: fr
     <string name="app_theme_light">Claire</string>
     <string name="app_theme">Apparence</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Vous avez récemment apporté des modifications à cette page, mais ne les avez pas enregistrées. Choisissez une version à charger :\n\n</string>
-    <string name="gutenberg_native_what_people_say">Ce que disent les gens</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Nous offrons une gamme de services pour vous aider à obtenir les résultats que vous recherchez. Vous ne savez pas ce dont vous avez besoin, ou ce que cela coûte ? Nous pouvons vous expliquer quels services sont bons pour vous et vous en dire plus à propos de nos tarifs. Contactez-nous ci-dessous.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Nous sommes une petite équipe de professionnels talentueux avec un large éventail de compétences et d’expérience. Nous aimons ce que nous faisons et nous le faisons avec passion. Nous sommes impatients de travailler avec vous.</string>
-    <string name="gutenberg_native_warning_message">Message d’avertissement</string>
-    <string name="gutenberg_native_want_to_work_with_us">Vous voulez travailler avec nous ?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Les visiteurs veulent savoir qui est de l’autre côté de la page. Servez-vous de cet espace pour écrire à propos de vous, de votre site, de votre entreprise ou de ce que vous voulez. Utilisez les témoignages ci-dessous pour citer les autres, en parlant de la même chose, avec leurs propres mots.</string>
-    <string name="gutenberg_native_usa">États-Unis</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Ceci est du contenu exemple inclus dans le modèle pour illustrer ses fonctionnalités. Retirez-les ou remplacez-les par vos propres mots et médias.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">La meilleure manière de commencer est d’arrêter de discuter et de commencer à faire.</string>
-    <string name="gutenberg_native_team">Équipe</string>
-    <string name="gutenberg_native_success_message">Message envoyé</string>
-    <string name="gutenberg_native_strategy">Stratégie</string>
     <string name="gutenberg_native_show_post_content">Afficher le contenu de l’article</string>
-    <string name="gutenberg_native_services">Services</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel le chien</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nom du projet</string>
-    <string name="gutenberg_native_position_or_job_title">Titre du poste ou intitulé</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
     <string name="gutenberg_native_only_show_excerpt">N’afficher que l’extrait</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Mon portfolio présente des projets variés créés tout au long de ma carrière. Mes coordonnées sont plus bas. Contactez-moi !</string>
     <string name="gutenberg_native_link_to">Lier à</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Parlons-en ! 👋 N’hésitez pas à communiquer en utilisant les coordonnées ci-dessous ou utiliser le formulaire.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Créons quelque chose ensemble !</string>
-    <string name="gutenberg_native_let_s_build_something_together">Créons quelque chose ensemble !</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Ce sont nos choix, Harry, qui montrent ce que nous sommes vraiment, bien plus que nos capacités.</string>
-    <string name="gutenberg_native_inspiration">Inspiration</string>
-    <string name="gutenberg_native_get_in_touch">Contactez-nous !</string>
+    <string name="gutenberg_native_link_settings">Réglages du lien</string>
     <string name="gutenberg_native_excerpt_length_words">Longueur de l’extrait (mots)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Écrivez-nous : &lt;a href=\"mailto:mail@example.com\">mail@exemple.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Ne pleurez pas parce que c’est fini, souriez parce que c’est arrivé.</string>
     <string name="gutenberg_native_customize">PERSONNALISER</string>
-    <string name="gutenberg_native_city_10100">Bordeaux, 33000</string>
+    <string name="gutenberg_native_video_settings">Réglages vidéo</string>
     <string name="gutenberg_native_add_paragraph_block">Ajouter un bloc paragraphe</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Une courte description des services que vous offrez.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Une courte bio avec votre histoire personnelle, vos principales réalisations ou d’autres choses intéressantes.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Une description de votre projet ou des travaux présentés.</string>
-    <string name="gutenberg_native_555_555_1234">05 01 02 03 04</string>
-    <string name="gutenberg_native_10_street_road">1 rue Sainte Catherine</string>
     <string name="create_post_page_fab_tooltip_contributors">Créer un article</string>
     <string name="post_list_tab_trashed_posts">Mis à la corbeille</string>
     <string name="post_list_tab_scheduled_posts">Planifié</string>
     <string name="post_list_tab_published_posts">Publié</string>
     <string name="sharing_facebook_account_must_have_pages">La connexion à Facebook ne trouve aucune page. Publicize ne peut pas se connecter aux profils, seulement aux pages publiées.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Non connecté</string>
-    <string name="my_site_select_domains_page_title">Adresse du site</string>
     <string name="notifications_tab_title_likes">J’aime</string>
     <string name="notifications_tab_title_follows">Abonnements</string>
     <string name="notifications_tab_title_comments">Commentaires</string>
@@ -429,14 +788,12 @@ Language: fr
     <string name="stats_management_add_new_stats_card">Ajouter une nouvelle carte de statistiques</string>
     <string name="reader_self_hosted_select_filter">Utiliser le bouton de filtre pour trouver des articles sur des sujets spécifiques</string>
     <string name="reader_bottom_sheet_content_description">Sélectionner une étiquette ou un site, fenêtre contextuelle</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Sélectionné</string>
     <string name="reader_btn_select_filter_content_description">Sélectionner un site ou une étiquette pour filtrer des articles</string>
     <string name="reader_btn_remove_filter_content_description">Supprimer le filtre actuel</string>
     <string name="reader_title_subs">Gérer les sujets et les sites</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Se connecter à WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Se connecter à WordPress.com pour voir les derniers articles à partir des sujets que vous suivez.</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Se connecter à WordPress.com pour voir les derniers articles à partir des sites que vous suivez</string>
-    <string name="gutenberg_native_template_preview">Aperçu du modèle</string>
     <string name="gutenberg_native_replace_current_block">Remplacer le bloc actuel</string>
     <string name="gutenberg_native_add_to_end">Ajouter à la fin</string>
     <string name="gutenberg_native_add_to_beginning">Ajouter au début</string>
@@ -450,7 +807,6 @@ Language: fr
     <string name="reader_filter_cta">Filtrer</string>
     <string name="gutenberg_native_video_caption_s">Sous-titre vidéo. %s</string>
     <string name="gutenberg_native_edit_video">Modifier la vidéo</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Appuyer deux fois pour sélectionner une disposition</string>
     <string name="gutenberg_native_add_a_shortcode">Ajouter un code court…</string>
     <string name="post_list_author">Auteur de l’article</string>
     <string name="fab_create_desc">Créer un article</string>
@@ -465,10 +821,8 @@ Language: fr
     <string name="stats_box_type_low">faible</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%3$s, %2$d %1$s</string>
-    <string name="gutenberg_native_move_image_forward">Déplacer l’image vers l’avant</string>
-    <string name="gutenberg_native_move_image_backward">Déplacer l’image vers l’arrière</string>
+    <string name="gutenberg_native_replace_image">Remplacer l’image</string>
     <string name="gutenberg_native_gallery_caption_s">Légende de la galerie. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. La valeur actuelle est %2$s</string>
     <string name="create_post_page_fab_tooltip">Créer un article ou une page</string>
     <string name="content_description_person_building_website">Personne en pleine création d’un site Web</string>
     <string name="post_signup_interstitial_not_right_now">Pas maintenant</string>
@@ -482,21 +836,17 @@ Language: fr
     <string name="my_site_bottom_sheet_add_post">Article de blog</string>
     <string name="my_site_bottom_sheet_title">Ajouter</string>
     <string name="post_settings_publish">Publier</string>
-    <string name="dialog_gutenberg_informative_description_v2">Nous avons apporté de grandes améliorations à l\'éditeur de blocs. Essayez-le vite ! Nous l\'avons rendu disponible pour les nouveaux articles et les nouvelles pages, mais si vous souhaitez repasser à l\'éditeur classique, accédez à « Mon site » > « Paramètres du site ».</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Synchroniser maintenant</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Cet article sera synchronisé immédiatement.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Prêt à synchroniser ?</string>
     <string name="new_site_creation_unavailable_domain">Ce domaine n’est pas disponible</string>
-    <string name="login_promo_viewpager_content_description">Introduction</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Nous n’avons pas pu accéder à votre site. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
-    <string name="login_discovery_error_ssl">Nous n’avons pas pu accéder à votre site à cause d’un problème avec le &lt;b>certificat SSL&lt;/b>. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
-    <string name="login_discovery_error_http_auth">Nous n’avons pas pu accéder à votre site car il requiert une &lt;b>authentification HTTP&lt;/b>. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
-    <string name="login_discovery_error_xmlrpc">Nous n’avons pas pu accéder au &lt;b>fichier XMLRPC&lt;/b> sur votre site. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
-    <string name="login_site_credentials_magic_link_label">Vous y êtes presque ! Nous devons juste vérifier votre adresse e-mail connectée à Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Connectez-vous avec vos identifiants au site.</string>
+    <string name="login_discovery_error_ssl">Nous n’avons pas pu accéder à votre site à cause d’un problème avec le &lt;b&gt;certificat SSL&lt;/b&gt;. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_discovery_error_http_auth">Nous n’avons pas pu accéder à votre site car il requiert une &lt;b&gt;authentification HTTP&lt;/b&gt;. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_discovery_error_xmlrpc">Nous n’avons pas pu accéder au &lt;b&gt;fichier XMLRPC&lt;/b&gt; sur votre site. Vous devrez contacter votre hébergeur pour résoudre ce problème.</string>
+    <string name="login_site_credentials_magic_link_label">Vous y êtes presque ! Nous devons juste vérifier votre adresse e-mail connectée à Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Connexion avec vos identifiants au site %1$s</string>
-    <string name="send_verification_email">Envoyer l’e-mail de vérification</string>
     <string name="my_site_bottom_sheet_add_page">Page du site</string>
     <string name="reader_following_display_name">Abonné</string>
     <string name="reader_my_likes_display_name">J’aime</string>
@@ -509,27 +859,23 @@ Language: fr
     <string name="suffix_1_000_000_000_000">%s billion</string>
     <string name="suffix_1_000_000_000">%s milliard</string>
     <string name="suffix_1_000_000">%s million</string>
-    <string name="suffix_1_000">%s mille</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">Nous ne pouvons pas ouvrir les articles pour le moment. Réessayez ultérieurement.</string>
     <string name="site_cannot_be_loaded">Nous ne pouvons pas charger les données de votre site pour le moment. Réessayez ultérieurement.</string>
     <string name="gutenberg_native_wordpress_media_library">Bibliothèque des médias WordPress</string>
+    <string name="gutenberg_native_unsupported">Non pris(e) en charge</string>
     <string name="gutenberg_native_ungroup">Dissocier</string>
     <string name="gutenberg_native_translate">Traduire</string>
-    <string name="gutenberg_native_title">Titre :</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Appuyer pour cacher le clavier</string>
     <string name="gutenberg_native_tap_here_to_show_help">Appuyer ici pour afficher l’aide</string>
     <string name="gutenberg_native_take_a_video">Prendre une vidéo</string>
     <string name="gutenberg_native_take_a_photo_or_video">Prendre une photo ou une vidéo</string>
     <string name="gutenberg_native_take_a_photo">Prendre une photo</string>
     <string name="gutenberg_native_start_writing">Commencez à écrire…</string>
-    <string name="gutenberg_native_size">Taille</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Extension du titre de la colonne latérale</string>
     <string name="gutenberg_native_show_section">Afficher la section</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloc %s. Le contenu de ce bloc n’est pas valide</string>
     <string name="gutenberg_native_s_block_empty">Bloc %s. Vide</string>
     <string name="gutenberg_native_cut_block">Couper le bloc</string>
-    <string name="gutenberg_native_reset_block">Réinitialiser le bloc</string>
-    <string name="gutenberg_native_remove_annotations">Retirer les annotations</string>
     <string name="gutenberg_native_problem_opening_the_video">Un problème est survenu lors de l’ouverture de la vidéo</string>
     <string name="gutenberg_native_problem_displaying_block">Un problème est survenu lors de l’affichage du bloc</string>
     <string name="gutenberg_native_post_title_s">Titre de la publication. %s</string>
@@ -539,17 +885,12 @@ Language: fr
     <string name="gutenberg_native_open_settings">Ouvrir les paramètres</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Aucune application ne peut traiter cette requête. Veuillez installer un navigateur Internet.</string>
     <string name="gutenberg_native_navigate_up">Faire défiler vers le haut</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mon panneau pré-publication</string>
-    <string name="gutenberg_native_my_post_status_info">Informations sur l’état de ma publication</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mon panneau post-publication</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panneau des paramètres de mon document</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Faire monter le bloc de la ligne %1$s à la ligne %2$s</string>
     <string name="gutenberg_native_move_block_up">Faire monter le bloc</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Faire descendre le bloc de la ligne %1$s à la ligne %2$s</string>
     <string name="gutenberg_native_move_block_down">Faire descendre le bloc</string>
     <string name="gutenberg_native_image_caption_s">Légende de l’image. %s</string>
     <string name="gutenberg_native_hide_keyboard">Masquer le clavier</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Voici le contenu du panneau !</string>
     <string name="gutenberg_native_help_icon">Icône d’aide</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Échec de l’insertion du média.\nVeuillez appuyer pour accéder aux options.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Appuyer deux fois pour annuler la dernière modification</string>
@@ -561,34 +902,28 @@ Language: fr
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Appuyer deux fois pour faire monter le bloc</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Appuyer deux fois pour faire descendre le bloc</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Appuyer deux fois pour modifier cette valeur</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Appuyer deux fois pour modifier la valeur à l’aide du curseur</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Appuyer deux fois pour ajouter un bloc</string>
     <string name="gutenberg_native_current_value_is_s">La valeur actuelle est %s</string>
-    <string name="gutenberg_native_content">Contenu…</string>
     <string name="gutenberg_native_choose_from_device">Choisir depuis l’appareil</string>
-    <string name="gutenberg_native_annotations_sidebar">Colonne latérale des annotations</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Une erreur inconnue est survenue. Veuillez réessayer.</string>
     <string name="gutenberg_native_alt_text">Texte alternatif</string>
     <string name="gutenberg_native_add_video">AJOUTER UNE VIDÉO</string>
     <string name="gutenberg_native_add_url">Ajouter une URL</string>
+    <string name="gutenberg_native_add_alt_text">Ajouter du texte alternatif</string>
     <string name="gutenberg_native_add_image_or_video">AJOUTER UNE IMAGE OU UNE VIDÉO</string>
     <string name="gutenberg_native_add_image">AJOUTER UNE IMAGE</string>
     <string name="gutenberg_native_add_block_here">AJOUTER UN BLOC ICI</string>
-    <string name="gutenberg_native_add_annotation">Ajouter une annotation</string>
-    <string name="gutenberg_native_add_a_description">Ajouter une description</string>
     <string name="reader_empty_saved_posts_content_description">Touchez le bouton Ajouter pour enregistrer les articles pour enregistrer un article dans votre liste.</string>
     <string name="reader_acessibility_list_loaded">« La liste a chargé %1$d éléments. »</string>
     <string name="notifications_tab_dialog_switch_desc">Notifications</string>
-    <string name="master_switch_default_title_off">Off</string>
-    <string name="master_switch_default_title_on">On</string>
-    <string name="notifications_tab_dialog_master_off_message">Désactiver les notifications pour ce site désactivera l\'affichage des notifications sur l\'onglet Notifications pour ce site. Vous pouvez affiner le type de notification que vous voyez après avoir activé les notifications pour ce site.</string>
-    <string name="notifications_tab_dialog_master_off_title">Pour voir les notifications sur l\'onglet Notifications pour ce site, activez les notifications pour ce site.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Activer l\'affichage des notifications sur l\'onglet des notifications pour ce site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Désactiver l\'affichage des notifications sur l\'onglet des notifications pour ce site</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifications pour ce site</string>
-    <string name="notifications_tab_dialog_master_status_on">Notifications pour ce site</string>
-    <string name="dialog_gutenberg_informative_description_page">Vous utilisez actuellement le nouvel éditeur de blocs pour les nouvelles pages. C’est super ! Si vous souhaitez revenir à l’éditeur classique, allez sur « Mon site » > « Réglages du site ».</string>
-    <string name="dialog_gutenberg_informative_description_post">Vous utilisez actuellement le nouvel éditeur de blocs pour les nouveaux articles. C’est super ! Si vous souhaitez revenir à l’éditeur classique, allez sur « Mon site » > « Réglages du site ».</string>
+    <string name="main_switch_default_title_off">Désactivé</string>
+    <string name="main_switch_default_title_on">Activé</string>
+    <string name="notifications_tab_dialog_main_off_message">Désactiver les notifications pour ce site désactivera l’affichage des notifications sur l’onglet Notifications pour ce site. Vous pouvez affiner le type de notification que vous voyez après avoir activé les notifications pour ce site.</string>
+    <string name="notifications_tab_dialog_main_off_title">Pour voir les notifications sur l’onglet Notifications pour ce site, activez les notifications pour ce site.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activer l’affichage des notifications sur l’onglet Notifications pour ce site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Désactiver l’affichage des notifications sur l’onglet Notifications pour ce site</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifications pour ce site</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifications pour ce site</string>
     <string name="pick_media">Ajouter une image ou une vidéo</string>
     <string name="error_post_not_submitted_retrying">Nous n\'avons pas pu soumettre cet article pour révision, mais nous réessayerons plus tard. </string>
     <string name="error_post_not_scheduled_retrying">Nous n\'avons pas pu planifier la publication de cet article, mais nous réessayerons plus tard.</string>
@@ -681,8 +1016,6 @@ Language: fr
     <string name="post_settings_add_to_calendar">Ajouter au calendrier</string>
     <string name="post_settings_notification">Notification</string>
     <string name="post_settings_time_and_date">Date et heure</string>
-    <string name="login_need_help_finding_connected_email">Besoin d\'aide pour trouver l\'adresse e-mail avec laquelle vous vous êtes connecté ?</string>
-    <string name="enter_wordpress_site">Le site Web à cette adresse n\'est pas un site WordPress. WordPress doit être installé sur le site pour que nous puissions nous y connecter.</string>
     <string name="login_invalid_site_url">Veuillez entrer une adresse de site Web complète, telle que exemple.com.</string>
     <string name="enter_email_for_site">Connectez-vous à WordPress.com pour accéder à %1$s</string>
     <string name="stats_post_views_label">Vues</string>
@@ -748,7 +1081,7 @@ Language: fr
     <string name="domain_registration_state_picker_dialog_title">Sélectionner un État</string>
     <string name="domain_registration_country_picker_dialog_title">Choisir le pays</string>
     <string name="domain_registration_result_continue_button">continuer</string>
-    <string name="domain_registration_result_description">votre nouveau domaine &lt;b>%s&lt;/b> est en cours de configuration. Votre site\n fonctionne parfaitement !</string>
+    <string name="domain_registration_result_description">votre nouveau domaine &lt;b&gt;%s&lt;/b&gt; est en cours de configuration. Votre site\n fonctionne parfaitement !</string>
     <string name="domain_registration_result_title">Bravo</string>
     <string name="domain_contact_information_register_domain_button">Enregistrer un domaine</string>
     <string name="domain_contact_information_postal_code_hint">Code postal</string>
@@ -856,24 +1189,20 @@ Language: fr
     <string name="plans_loading_error_no_plans_title">Impossible de charger les plans</string>
     <string name="plans_loading_error_network_title">Pas de connexion</string>
     <string name="menu_switch_to_gutenberg_editor">Basculer sur l’éditeur de blocs</string>
-    <string name="menu_switch_to_aztec_editor">Basculer sur l’éditeur classique</string>
     <string name="stats_loading_block_error">Un problème est survenu lors du chargement de vos données. Rechargez la page pour réessayer.</string>
     <string name="stats_loading_error">Données non chargées</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Modifier les nouvelles publications et pages avec l’éditeur de blocs</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Utiliser l’éditeur de blocs</string>
-    <string name="dialog_gutenberg_informative_title">Éditeur de blocs activé</string>
     <string name="exit">sortir</string>
     <string name="quick_start_sites_type_subtitle">Fait : %1$d of %2$d</string>
-    <string name="quick_start_sites_type_grow">Développez votre audience</string>
-    <string name="quick_start_sites_type_customize">Personnalisez votre site</string>
+    <string name="quick_start_sites_type_grow">Élargir votre public</string>
+    <string name="quick_start_sites_type_customize">Personnaliser votre site</string>
     <string name="quick_start_sites">Prochaines étapes</string>
     <string name="quick_start_complete_tasks_header">Terminé (%d)</string>
     <string name="quick_start_dialog_view_site_message">Profitez de votre produit fini !</string>
     <string name="quick_start_dialog_upload_icon_title">Téléverser une icône de site</string>
     <string name="quick_start_dialog_upload_icon_message">Vos visiteurs verront votre icône dans leur navigateur. Ajoutez une icône personnalisée pour un aspect brillant et pro.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Appuyez sur %1$s Plan %2$s pour voir votre plan actuel et les autres plans disponibles</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Appuyez sur %1$s Ajouter une page %2$s pour créer une nouvelle page.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Appuyez sur %1$s Pages %2$s pour continuer.</string>
     <string name="quick_start_dialog_check_stats_message_short">Appuyez sur %1$s Stats %2$s pour voir comment votre site est performant.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Appuyez sur %1$s Votre icône de site %2$s pour en téléverser une nouvelle</string>
     <string name="quick_start_dialog_publish_post_message">Rédigez et publiez votre premier article.</string>
@@ -884,13 +1213,8 @@ Language: fr
     <string name="quick_start_dialog_explore_plans_message">Apprenez-en plus sur le marketing et les outils SEO dans nos plans payants.</string>
     <string name="quick_start_dialog_enable_sharing_title">Activer le partage d’article</string>
     <string name="quick_start_dialog_enable_sharing_message">Partager automatiquement les nouveaux articles sur vos comptes de réseaux sociaux.</string>
-    <string name="quick_start_dialog_customize_site_message">Modifiez les polices, ajoutez des images et plus encore.</string>
-    <string name="quick_start_dialog_create_page_title">Créer une nouvelle page</string>
-    <string name="quick_start_dialog_create_page_message">Ajoutez une page pour le contenu clé — par exemple une page « À propos ».</string>
     <string name="quick_start_dialog_check_stats_title">Découvrez les statistiques de votre site</string>
     <string name="quick_start_dialog_check_stats_message">Restez au courant des performances de votre site.</string>
-    <string name="quick_start_dialog_browse_themes_title">Parcourir les thèmes</string>
-    <string name="quick_start_dialog_browse_themes_message">Explorer des dizaines de possibilités de mise en page, et trouvez celle qui vous convient le mieux.</string>
     <string name="quick_start_dialog_remove_next_steps_message">« Retirer les étapes suivantes » cachera tous les accompagnements sur ce site. Cette action ne peut pas être annulée.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Retirer les étapes suivantes</string>
     <string name="quick_start_remove_next_steps_menu_title">Retirer ceci</string>
@@ -914,15 +1238,11 @@ Language: fr
     <string name="notification_new_site_creation_failed">Un problème est survenu</string>
     <string name="notification_new_site_creation_title">Créer un site</string>
     <string name="new_site_creation_create_site_button">Créer un site</string>
-    <string name="new_site_creation_search_domain_input_hint">Rechercher des domaines</string>
     <string name="new_site_creation_domain_header_subtitle">C\'est ici que les internautes vous trouveront sur Internet.</string>
-    <string name="new_site_creation_domain_header_title">Choisir un nom de domaine pour votre site</string>
     <string name="new_site_creation_empty_domain_list_message">Aucune adresse ne correspond à votre recherche</string>
     <string name="site_creation_error_generic_subtitle">Erreur de communication avec le serveur, veuillez essayer à nouveau.</string>
     <string name="site_creation_error_generic_title">Un problème est survenu</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Un problème est survenu</string>
-    <string name="site_creation_segments_subtitle">Cela nous aide à faire des recommandations. Vous pourrez modifier ce paramètre ultérieurement : tous les sites évoluent !</string>
-    <string name="site_creation_segments_title">Dites-nous quel type de site vous aimeriez créer</string>
     <string name="new_site_creation_preview_title">Votre site a été créé.</string>
     <string name="new_site_creation_screen_title_step_count">%1$d sur %2$d</string>
     <string name="new_site_creation_screen_title_general">Créer un site</string>
@@ -1077,15 +1397,9 @@ Language: fr
     <string name="quick_start_dialog_need_help_button_neutral">Jamais</string>
     <string name="quick_start_dialog_need_help_button_negative">Non, merci</string>
     <string name="quick_start_dialog_follow_sites_title">S\'abonner à d\'autres sites</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Appuyez sur %1$s Rechercher %2$s pour rechercher des sites présentant des intérêts similaires</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Appuyez sur %1$s Rechercher %2$s pour rechercher des sites avec des thèmes similaires</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Appuyez sur %1$s Lecteur %2$s pour continuer</string>
     <string name="quick_start_dialog_follow_sites_message">Trouvez des sites qui vous inspirent, et suivez-les pour recevoir une notification quand ils publient.</string>
-    <string name="quick_start_dialog_customize_site_title">Personnalisez votre site</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Appuyez sur %1$s Thèmes %2$s pour continuer</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Appuyez sur %1$s Personnaliser %2$s pour commencer à personnaliser votre site</string>
-    <string name="quick_start_dialog_choose_theme_title">Choisir un thème</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Appuyez sur %1$s Thèmes %2$s pour découvrir de nouveaux thèmes</string>
-    <string name="quick_start_dialog_choose_theme_message">Parcourez tous nos thèmes pour trouver celui qui vous correspond.</string>
     <string name="quick_start_button_positive">C\'est parti !</string>
     <string name="quick_start_button_negative_short">Annuler</string>
     <string name="quick_start_button_negative">Pas maintenant</string>
@@ -1149,14 +1463,12 @@ Language: fr
     <string name="support_contact_email">E-mail de contact</string>
     <string name="application_log_button">Journal d’application</string>
     <string name="my_tickets">Mes tickets</string>
-    <string name="activity_log_rewind_dialog_message">Voulez vous vraiment faire retourner votre site en arrière de %1$s à %2$s ? Ceci va supprimer tout le contenu et les options créées ou changées depuis.</string>
-    <string name="activity_log_rewind_site">Retour en arrière du site</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Retour en arrière en cours</string>
-    <string name="activity_log_currently_restoring_message">Retour en arrière de %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Rétablissement en cours</string>
+    <string name="activity_log_currently_restoring_message">Rétablissement vers %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Restauration de votre site en cours</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Votre site a bien été restauré</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Votre site a bien été restauré\nRetour en arrière de %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Votre site a bien été restauré\nRetour en arrière de %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Votre site a bien été rétabli\nRétabli à %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Votre site est en cours de rétablissement\nRétablissement vers %1$s %2$s</string>
     <string name="activity_log_button">Bouton d’action de journal d’activité</string>
     <string name="plugin_auto_managed">Auto-géré</string>
     <string name="reader_save_posts_locally_dialog_message">Enregistrez cet article pour le consulter de nouveau quand vous le désirez. Il ne sera disponible que sur cet appareil. En effet, la synchronisation entre appareils n\'est pas disponible pour les articles enregistrés.</string>
@@ -1166,20 +1478,16 @@ Language: fr
     <string name="comment_read_source_post">Lire la source de l’article</string>
     <string name="sites">Sites</string>
     <string name="signup_magic_link_title">Lien magique envoyé</string>
-    <string name="signup_email_screen_title">E-mail d’inscription</string>
     <string name="verification_2fa_screen_title">Code de vérification</string>
     <string name="selfhosted_site_login_title">Informations de connexion</string>
     <string name="magic_link_sent_login_title">Lien magique envoyé</string>
     <string name="magic_link_login_title">Lien magique de connexion</string>
     <string name="site_address_login_title">Adresse de site de connexion</string>
     <string name="email_address_login_title">Adresse e-mail de connexion</string>
-    <string name="alternatively">Alternativement :</string>
     <string name="reader_empty_saved_posts_description">Appuyez sur %s pour enregistrer un article dans votre liste.</string>
     <string name="reader_empty_saved_posts_title">Aucun article enregistré — pour le moment !</string>
     <string name="reader_bookmark_snack_title">Article enregistré</string>
     <string name="reader_bookmark_snack_btn">Voir tout</string>
-    <string name="reader_btn_bookmarked">Enregistré</string>
-    <string name="reader_btn_bookmark">Enregistrer</string>
     <string name="reader_remove_bookmark">Supprimer des articles enregistrés</string>
     <string name="reader_add_bookmark">Ajouter aux articles enregistrés</string>
     <string name="reader_save_for_later_title">Articles enregistrés</string>
@@ -1199,11 +1507,9 @@ Language: fr
     <string name="reader_btn_notifications_on">Activer les notifications de site</string>
     <string name="reader_btn_notifications_off">Désactiver les notifications de site</string>
     <string name="activity_log_jetpack_icon">Icône Jetpack</string>
-    <string name="rewind">Rembobiner</string>
     <string name="activity_log_event">Événement</string>
     <string name="activity_log_icon">Icône d\'activité</string>
     <string name="activity_log">Journal d\'activités</string>
-    <string name="activity">Activité</string>
     <string name="privacy_policy_read">Lire la politique de confidentialité</string>
     <string name="third_party_policy_learn_more_caption">Nous utilisons d\'autres outils de suivi, notamment des outils provenant de tiers. Découvrez-les et apprenez à les contrôler.</string>
     <string name="third_party_policy_learn_more_header">Politique de tiers</string>
@@ -1214,7 +1520,6 @@ Language: fr
     <string name="preference_privacy_settings">Paramètres de confidentialité</string>
     <string name="preference_collect_information">Collecter des informations</string>
     <string name="post_submitted">Article envoyé</string>
-    <string name="login_email_button_signup">Vous n\'avez pas encore de compte ? %1$sS\'inscrire%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">La fonctionnalité d\'extension requiert un site en règle.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Vous devez associer cet utilisateur et l’abonnement du domaine principal pour utiliser les extensions.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Vous devez être administrateur pour utiliser les extensions.</string>
@@ -1313,7 +1618,6 @@ Language: fr
     <string name="edit_photo_screen_title">Éditer photo</string>
     <string name="share_intent_screen_title">Sélectionner le site</string>
     <string name="signup_epilogue_screen_title">Nouveau compte</string>
-    <string name="login_prologue_screen_title">Connexion</string>
     <string name="login_epilogue_screen_title">Connecté en tant que</string>
     <string name="person_detail_screen_title">Détail sur la personne</string>
     <string name="media_settings_screen_title">Détails sur le fichier</string>
@@ -1327,7 +1631,7 @@ Language: fr
     <string name="license_screen_title">Licence</string>
     <string name="release_notes_screen_title">Notes de version</string>
     <string name="signup_epilogue_error_avatar_view">Votre avatar a été chargé et sera bientôt disponible.</string>
-    <string name="permissions_denied_message">Il semblerait que vous ayez désactivé les autorisations obligatoires pour cette fonctionnalité.&lt;br/>&lt;br/>Pour modifier cela, changez vos autorisations et veillez à ce que &lt;strong>%s&lt;/strong> soit activé.</string>
+    <string name="permissions_denied_message">Il semblerait que vous ayez désactivé les autorisations obligatoires pour cette fonctionnalité.&lt;br/&gt;&lt;br/&gt;Pour modifier cela, changez vos autorisations et veillez à ce que &lt;strong&gt;%s&lt;/strong&gt; soit activé.</string>
     <string name="permissions_denied_title">Droits</string>
     <string name="plugin_caption_featured">À la Une</string>
     <string name="sharing_disabled_description">Votre module Jetpack de partage étant désactivé, vos options de partage sont inaccessibles.</string>
@@ -1368,7 +1672,6 @@ Language: fr
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 article avec 1 fichier non chargé</string>
     <string name="untitled_in_parentheses">(Sans titre)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Créer un site</string>
     <string name="notification_site_creation_created">Touchez pour continuer.</string>
     <string name="notification_site_creation_title_success">Le site a bien été créé !</string>
@@ -1382,11 +1685,8 @@ Language: fr
     <string name="username_changer_dismiss_button_positive">Supprimer</string>
     <string name="username_changer_action">Enregistrer</string>
     <string name="content_description_add_avatar">Ajouter un avatar</string>
-    <string name="signup_with_google_button">S\'inscrire avec Google</string>
-    <string name="signup_with_email_button">S\'inscrire avec une adresse e-mail</string>
     <string name="signup_user_exists">L\'adresse e-mail existe déjà sur WordPress.com.\nPoursuite de la connexion.</string>
     <string name="signup_updating_account">Mise à jour du compte…</string>
-    <string name="signup_terms_of_service_text">En vous inscrivant, vous acceptez nos %1$sConditions d\'Utilisation%2$s.</string>
     <string name="signup_magic_link_progress">Envoi de l\'e-mail</string>
     <string name="signup_magic_link_error_button_positive">Réessayer</string>
     <string name="signup_magic_link_error_button_negative">Fermer</string>
@@ -1399,11 +1699,6 @@ Language: fr
     <string name="signup_epilogue_error_button_negative">Annuler les modifications</string>
     <string name="signup_epilogue_error_generic">Une erreur s\'est produite lors de la mise à jour de votre compte. Vous pouvez réessayer ou annuler vos modifications pour continuer.</string>
     <string name="signup_epilogue_error_avatar">Une erreur s\'est produite lors du chargement de votre avatar.</string>
-    <string name="signup_email_header">Pour créer votre nouveau compte WordPress.com, veuillez saisir votre adresse e-mail.</string>
-    <string name="signup_email_error_generic">Une erreur s\'est produite lors de la vérification de l\'adresse e-mail.</string>
-    <string name="sign_up">S\'inscrire sur WordPress.com</string>
-    <string name="enter_username_instead">Connectez-vous avec votre identifiant.</string>
-    <string name="enter_site_address_instead">Connectez-vous en saisissant l\'adresse de votre site.</string>
     <string name="plugin_needs_update">Mise à jour nécessaire</string>
     <string name="plugin_caption_search">Chercher parmi les extensions</string>
     <string name="plugin_caption_new">Nouvelles</string>
@@ -1524,7 +1819,6 @@ Language: fr
     <string name="login_error_suffix">Essayer avec un autre compte ?</string>
     <string name="login_error_generic">Il y a eu des problèmes avec le compte Google.</string>
     <string name="login_error_button">Fermer</string>
-    <string name="login_google_button_suffix">Connexion avec Google</string>
     <string name="enter_wpcom_password_google">Pour faire cela avec ce compte Google, veuillez fournir le mot de passe WordPress.com correspondant. Ceci ne sera demandé qu’une seule fois.</string>
     <string name="error_generic_network">Une erreur réseau est survenue. Veuillez vérifier votre connexion et essayer à nouveau.</string>
     <string name="post_settings_remove_featured_image">Retirer l’image mise en avant</string>
@@ -1536,12 +1830,11 @@ Language: fr
     <string name="jetpack_disconnect_confirm">Déconnexion</string>
     <string name="jetpack_disconnect_confirmation_message">Êtes-vous certain de vouloir déconnecter Jetpack de ce site ?</string>
     <string name="jetpack_disconnect_pref_title">« Déconnecter de WordPress.com »</string>
-    <string name="site_settings_jetpack_whitelist_description">Vous pourriez placer en liste blanche une adresse IP ou une liste d’adresse pour éviter qu’elles soient bloquées par Jetpack. Les adresses IPv4 et IPv6 sont acceptées. Pour préciser une plage d’IP, saisissez la valeur la plus basse et la plus haute en les séparant par un tiret. Par exemple : 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Vous pouvez marquer une adresse IP (ou une série d’adresses IP) comme « Toujours autorisé » pour empêcher leur blocage par Jetpack. IPv4 et IPv6 sont acceptables. Pour spécifier une plage, entrez la valeur basse et la valeur haute en les séparant par un tiret. Exemple : 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Nécessite une authentification en deux étapes</string>
     <string name="jetpack_match_wpcom_via_email_title">Faire correspondre les comptes en utilisant l’e-mail</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Autoriser la connexion via WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Connexion via WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Adresses IP en liste blanche</string>
     <string name="jetpack_prevent_brute_force_title">Bloquer les tentatives de connexion malicieuses</string>
     <string name="jetpack_prevent_brute_force_category_title">Protection contre les attaques en Brute force</string>
     <string name="jetpack_send_wp_notifications_title">Envoyer des Notifications push</string>
@@ -1582,12 +1875,12 @@ Language: fr
     <string name="notification_settings_category_other">Autre</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Tous mes sites</string>
     <string name="notification_settings_category_your_sites">Vos sites</string>
-    <string name="notification_settings_master_off_message">En désactivant le réglage de notifications, vous désactiverez toutes les notifications de cette app quel que soit le type. Vous pouvez régler plus finement quel type de notification vous recevez après avoir activé le réglage de notification.</string>
-    <string name="notification_settings_master_off_title">Pour recevoir les notifications sur cet appareil, activez le réglage de notification.</string>
-    <string name="notification_settings_master_hint_off">Activer les notifications</string>
-    <string name="notification_settings_master_hint_on">Désactiver les notifications</string>
-    <string name="notification_settings_master_status_off">Désactivé</string>
-    <string name="notification_settings_master_status_on">Activé</string>
+    <string name="notification_settings_main_off_message">En désactivant le réglage de notifications, vous désactiverez toutes les notifications de cette application quel que soit le type. Vous pouvez affiner le type de notification que vous recevez après avoir activé le réglage de notification.</string>
+    <string name="notification_settings_main_off_title">Pour recevoir les notifications sur cet appareil, activez le réglage de notification.</string>
+    <string name="notification_settings_main_hint_off">Activer les notifications</string>
+    <string name="notification_settings_main_hint_on">Désactiver les notifications</string>
+    <string name="notification_settings_main_status_off">Désactivé</string>
+    <string name="notification_settings_main_status_on">Activé</string>
     <string name="max_video_resolution">Taille de vidéo maximale</string>
     <string name="max_thumbnail_px_size">Taille maximale d’image</string>
     <string name="error_upload_post_media_param">Une erreur est survenue lors du téléversement du contenu multimédia dans cet article : %s.</string>
@@ -1624,7 +1917,6 @@ Language: fr
     <string name="login_site_address_more_help">Besoin d’aide ?</string>
     <string name="login_site_address_help_content">L’adresse de votre site apparait dans la barre en haut de l’écran quand vous visitez votre site avec Chrome.</string>
     <string name="login_site_address_help_title">Quelle est l’adresse de mon site ?</string>
-    <string name="login_site_address_help">Besoin d’aide pour trouver l’adresse de votre site ?</string>
     <string name="login_site_address">Adresse du site</string>
     <string name="enter_site_address">Saisissez l’adresse du site WordPress que vous voulez connecter.</string>
     <string name="login_already_logged_in_wpcom">Déjà connecté·e à WordPress.com</string>
@@ -1636,7 +1928,6 @@ Language: fr
     <string name="requesting_otp">Demande d’un code de vérification par SMS.</string>
     <string name="login_text_otp">Envoyez-moi un code par SMS à la place</string>
     <string name="enter_verification_code">On y est presque ! Veuillez saisir le code de vérification de votre app d’authentification.</string>
-    <string name="open_mail">Ouvrir les e-mails</string>
     <string name="next">Suivant</string>
     <string name="enter_email_wordpress_com">Connectez-vous à WordPress.com en utilisant une adresse de messagerie pour gérer tous vos sites WordPress.com.</string>
     <string name="image_optimization_promo_desc">L’optimisation réduit la taille des images pour un téléversement plus rapide.\n\nVous pouvez changer ceci à tout moment, dans les réglages du site.</string>
@@ -1659,10 +1950,6 @@ Language: fr
     <string name="post_status_draft">Brouillon</string>
     <string name="post_status_pending_review">En attente de relecture</string>
     <string name="post_status_publish_post">Publier</string>
-    <string name="change_location">Modifier l\'emplacement</string>
-    <string name="remove_location">Supprimer l’emplacement</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Impossible d’ouvrir le sélecteur d’emplacement, Google Play Services n’est pas disponible.</string>
-    <string name="post_settings_location">Emplacement</string>
     <string name="now">Maintenant</string>
     <string name="post_settings_password_dialog_hint">Seules les personnes disposant de ce mot de passe peuvent consulter cet article.</string>
     <string name="post_settings_excerpt_dialog_hint">Les extraits sont des résumés manuels facultatifs de votre contenu.</string>
@@ -1846,7 +2133,7 @@ Language: fr
     <string name="signout">Se déconnecter</string>
     <string name="sign_in_wpcom">Se connecter à WordPress.com</string>
     <string name="reader_label_global_related_posts">Articles connexes sur WordPress.com</string>
-    <string name="reader_label_local_related_posts">Articles connexes dans %s</string>
+    <string name="reader_label_local_related_posts">Plus de %s</string>
     <string name="preference_open_device_settings">Accéder aux paramètres système</string>
     <string name="invite_invalid_email">%s : Email invalide</string>
     <string name="invite_user_blocked_invites">%s: L\'utilisateur a bloqué les invitations</string>
@@ -1894,20 +2181,16 @@ Language: fr
     <string name="invite_error_invalid_usernames_multiple">Envoi impossible : il y a des identifiants ou adresses de messagerie non valable</string>
     <string name="invite_error_invalid_usernames_one">Envoi impossible : un identifiant ou une adresse de messagerie n\'est pas valable</string>
     <string name="invite_error_no_usernames">Veuillez ajouter au moins un identifiant</string>
-    <string name="invite_message_info">(Facultatif) Vous pouvez saisir un message personnalisé, faisant jusqu\'à 500 caractères, qui sera inclus dans l\'invitation envoyée.</string>
-    <string name="invite_message_remaining_other">Restent %d caractères</string>
-    <string name="invite_message_remaining_one">Reste 1 caractère</string>
-    <string name="invite_message_remaining_zero">Reste 0 caractère</string>
     <string name="invite_message_title">Message personnalisé</string>
     <string name="invite">Invitation</string>
     <string name="invite_names_title">Identifiants ou adresses e-mail</string>
     <string name="invite_people">Inviter des personnes</string>
     <string name="my_site_header_external">Externe</string>
-    <string name="send_link">Envoyer le lien</string>
     <string name="label_clear_search_history">Supprimer l\'historique de recherche</string>
     <string name="dlg_confirm_clear_search_history">Supprimer l\'historique de recherche ?</string>
     <string name="reader_empty_search_description">Aucune article trouvé pour %s dans votre langue</string>
     <string name="reader_hint_post_search">Recherche WordPress</string>
+    <string name="reader_title_related_post_detail">Article connexe</string>
     <string name="preview_screen_links_disabled">Les liens sont désactivés sur l\'écran de prévisualisation</string>
     <string name="send">Envoyer</string>
     <string name="person_removed">%1$s a bien été supprimé</string>
@@ -1926,7 +2209,6 @@ Language: fr
     <string name="checking_email">Vérification de l\'adresse e-mail</string>
     <string name="magic_link_unavailable_error_message">Actuellement indisponible. Veuillez saisir votre mot de passe</string>
     <string name="logging_in">Connexion</string>
-    <string name="enter_your_password_instead">Saisissez votre mot de passe à la place</string>
     <string name="web_address_dialog_hint">Affiché publiquement quand vous commentez.</string>
     <string name="capture_or_pick_photo">Prenez une photo ou choisissez-en une</string>
     <string name="plans">Plans</string>
@@ -2047,7 +2329,7 @@ Language: fr
     <string name="site_settings_paging_dialog_description">Scinder les fils de commentaires en pages multiples.</string>
     <string name="site_settings_paging_dialog_header">Commentaires par page</string>
     <string name="site_settings_close_after_dialog_title">Fermer les commentaires</string>
-    <string name="site_settings_blacklist_description">Quand un commentaire contient un de ces mots dans son contenu, nom, URL, email ou IP, il sera marqué en spam. Vous pouvez saisir des mots partiels, ainsi \"press\" correspondra à \"WordPress\".</string>
+    <string name="site_settings_denylist_description">Lorsque l’un de ces mots apparaît dans le contenu, le nom, l’URL, l’e-mail ou l’adresse IP d’un commentaire, ce dernier est marqué comme indésirable. Vous pouvez entrer des parties de mot, de sorte que « press » sera associé à « WordPress ».</string>
     <string name="site_settings_hold_for_moderation_description">Quand un commentaire contient un de ces mots dans son contenu, nom, URL, email ou IP, il sera déposé dans la file de modération. Vous pouvez saisir des mots partiels, ainsi \"press\" correspondra à \"WordPress\". </string>
     <string name="site_settings_list_editor_input_hint">Entrez un mot ou une phrase</string>
     <string name="site_settings_list_editor_no_items_text">0 éléments</string>
@@ -2062,10 +2344,10 @@ Language: fr
     <string name="site_settings_rp_show_header_title">Afficher l\'en-tête</string>
     <string name="site_settings_rp_switch_summary">Les articles similaires affichent du contenu pertinent de votre site sous les articles.</string>
     <string name="site_settings_rp_switch_title">Afficher les articles similaires</string>
-    <string name="site_settings_blacklist_hint">Les commentaires qui correspondent à un filtrer son marqués comme indésirables</string>
+    <string name="site_settings_denylist_hint">Les commentaires qui correspondent à un filtre sont marqués comme indésirables</string>
     <string name="site_settings_moderation_hold_hint">Les commentaires qui correspondent à un filtre sont mis dans la file d\'attente de modération</string>
     <string name="site_settings_multiple_links_hint">Ignore la limite de liens pour les utilisateurs connus</string>
-    <string name="site_settings_whitelist_hint">L\'auteur d\'un commentaire doit avoir déjà au moins un commentaire approuvé</string>
+    <string name="site_settings_allowlist_hint">L’auteur d’un commentaire doit avoir déjà au moins un commentaire approuvé</string>
     <string name="site_settings_user_account_required_hint">Les utilisateurs doivent être enregistrés et connectés pour commenter</string>
     <string name="site_settings_identity_required_hint">L\'auteur d\'un commentaire doit renseigner son nom et son adresse de messagerie</string>
     <string name="site_settings_paging_hint">Afficher les commentaires en morceaux d\'une taille spécifiée.</string>
@@ -2088,17 +2370,16 @@ Language: fr
     <string name="site_settings_address_hint">Changer votre adresse n\'est actuellement pas pris en charge.</string>
     <string name="site_settings_tagline_hint">Une brève description ou une phrase accrocheuse pour décrire votre blog</string>
     <string name="site_settings_title_hint">En quelques mots, décrivez la raison d\'être de ce site.</string>
-    <string name="site_settings_whitelist_known_summary">Commentaires des utilisateurs anonymes</string>
-    <string name="site_settings_whitelist_all_summary">Commentaires de tous les utilisateurs</string>
+    <string name="site_settings_allowlist_known_summary">Commentaires des utilisateurs connus</string>
+    <string name="site_settings_allowlist_all_summary">Commentaires de tous les utilisateurs</string>
     <string name="site_settings_threading_summary">%d niveaux</string>
     <string name="site_settings_privacy_private_summary">Privé</string>
     <string name="site_settings_privacy_hidden_summary">Caché</string>
     <string name="site_settings_privacy_public_summary">Public</string>
     <string name="site_settings_delete_site_title">Supprimer le site</string>
-    <string name="site_settings_blacklist_title">Liste de blocage</string>
     <string name="site_settings_moderation_hold_title">Garder en modération</string>
     <string name="site_settings_multiple_links_title">Liens dans les commentaires</string>
-    <string name="site_settings_whitelist_title">Approuver automatiquement</string>
+    <string name="site_settings_allowlist_title">Approuver automatiquement</string>
     <string name="site_settings_paging_title">Pagination</string>
     <string name="site_settings_threading_title">Fil de discussions</string>
     <string name="site_settings_sort_by_title">Trier par</string>
@@ -2247,7 +2528,6 @@ Language: fr
     <string name="logs_copied_to_clipboard">Les logs de l\'application ont été copiés dans le presse papier</string>
     <string name="reader_empty_posts_in_blog">Ce site est vide</string>
     <string name="reader_label_new_posts">Nouveaux articles</string>
-    <string name="reader_page_recommended_blogs">Sites que vous aimerez</string>
     <string name="error_copy_to_clipboard">Une erreur s\'est produite lors de la copie dans le presse papier</string>
     <string name="post_uploading">Article en cours de téléversement</string>
     <string name="stats_followers_years">%1$d années</string>
@@ -2312,7 +2592,6 @@ Language: fr
     <string name="reader_title_blog_preview">Blog du Lecteur</string>
     <string name="ssl_certificate_ask_trust">Si vous vous connectez habituellement à ce site sans problème, cette erreur peut signifier que quelqu\'un essai de se faire passer pour vous et vous ne devriez pas continuer. Souhaitez-vous faire confiance à ce certificat ?</string>
     <string name="ssl_certificate_error">Certificat SSL invalide</string>
-    <string name="forgot_password">Mot de passe perdu ?</string>
     <string name="help">Aide</string>
     <string name="username_or_password_incorrect">L\'identifiant ou le mot de passe saisi est incorrect</string>
     <string name="email_invalid">Entrez une adresse e-mail valide</string>
diff --git a/WordPress/src/main/res/values-gd/strings.xml b/WordPress/src/main/res/values-gd/strings.xml
index caeda511ba0b..1609b2d6e456 100644
--- a/WordPress/src/main/res/values-gd/strings.xml
+++ b/WordPress/src/main/res/values-gd/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2016-08-23 18:32:37+0000
 Plural-Forms: nplurals=4; plural=(n == 1 || n == 11) ? 0 : ((n == 2 || n == 12) ? 1 : ((n >= 3 && n <= 10 || n >= 13 && n <= 19) ? 2 : 3));
@@ -76,7 +76,6 @@ Language: gd_GB
     <string name="logs_copied_to_clipboard">Chaidh lethbhreac de logaichean na h-aplacaid a chur air an stòr-bhòrd</string>
     <string name="reader_label_new_posts">Puist ùra</string>
     <string name="error_copy_to_clipboard">Thachair mearachd nuair a chaidh lethbhreac dha na faidhlichean a chur air an stòr-bhòrd</string>
-    <string name="reader_page_recommended_blogs">Bidh ùidh agad sna leanas is dòcha</string>
     <string name="themes_fetching">A’ faighinn nan ùrlaran…</string>
     <string name="stats_followers_months">%1$d mìos(an)</string>
     <string name="stats_followers_a_year">Bliadhna</string>
@@ -124,7 +123,6 @@ Language: gd_GB
     <string name="schedule_verb">Cuir air an sgeideal</string>
     <string name="reader_page_followed_blogs">Làraichean a tha thu a’ leantainn</string>
     <string name="help">Cobhair</string>
-    <string name="forgot_password">Na chaill thu am facal-faire agad?</string>
     <string name="ssl_certificate_error">Teisteanas SSL mì-dhligheach</string>
     <string name="ssl_certificate_ask_trust">Ma gheibh thu cothrom air an làrach seo gun duilgheadas sam bith a ghnàth, dh’fhaoidte gu bheil a’ mhearachd seo a’ ciallachadh gu bheil cuideigin a’ leigeil orra gur iad-san an làrach cheart is cha bu chòir dhut leantainn air adhart. A bheil thu airson gabhail ris an teisteanas co-dhiù?</string>
     <string name="no_network_message">Chan eil lìonra ri làimh</string>
diff --git a/WordPress/src/main/res/values-gl/strings.xml b/WordPress/src/main/res/values-gl/strings.xml
index 434a1e813a67..060e35c8bb25 100644
--- a/WordPress/src/main/res/values-gl/strings.xml
+++ b/WordPress/src/main/res/values-gl/strings.xml
@@ -1,27 +1,609 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-07-17 10:12:25+0000
+Translation-Revision-Date: 2021-05-18 07:01:08+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: gl_ES
 -->
 <resources>
-    <string name="quick_start_list_update_site_title_subtitle">Dalle ao teu sitio un nome que reflicte a súa personalidade e temática. As primeiras impresións contan!</string>
+    <string name="gutenberg_native_size">Tamaño</string>
+    <string name="gutenberg_native_image_settings">Axustes de imaxe</string>
+    <string name="gutenberg_native_audio_settings">Axustes de audio</string>
+    <string name="user_profile_untitled_site">(Sen título)</string>
+    <string name="user_profile_site_section_header">Sitio</string>
+    <string name="user_profile_bottom_sheet_description">Información de folla inferior do perfil de usuario</string>
+    <string name="likes_list_screen_title">Lista de Gústame %s</string>
+    <string name="gutenberg_native_write_code">Escribe código…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Ordenación e filtrado</string>
+    <string name="gutenberg_native_show_download_button">Amosar o botón de descarga</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Ler máis</string>
+    <string name="gutenberg_native_preload">Precarga</string>
+    <string name="gutenberg_native_post_meta_settings">Axustes meta da entrada</string>
+    <string name="gutenberg_native_post_content_settings">Axustes do contido da entrada</string>
+    <string name="gutenberg_native_metadata">Metadatos</string>
+    <string name="gutenberg_native_media_file">Arquivo de medios</string>
+    <string name="gutenberg_native_media_area">Área de medios</string>
+    <string name="gutenberg_native_loop">Repetir</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Enlazar a</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">imaxe %1$d de %2$d na biblioteca</string>
+    <string name="gutenberg_native_heading_d">Encabezado %d</string>
+    <string name="gutenberg_native_featured">Destacado</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Introduce aquí a URL a incrustar…</string>
+    <string name="gutenberg_native_edit_image">Editar a imaxe</string>
+    <string name="gutenberg_native_display_post_date">Amosar a data da entrada</string>
+    <string name="gutenberg_native_code">Código</string>
+    <string name="gutenberg_native_change_heading_level">Cambiar o nivel do encabezado</string>
+    <string name="gutenberg_native_browser_default">Navegador por defecto</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">O bloque borrouse ou non está dispoñible.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">O bloque non se pode procesar dentro de si mesmo.</string>
+    <string name="gutenberg_native_autoplay">Reprodución automática</string>
+    <string name="gutenberg_native_auto">Automático</string>
+    <string name="gutenberg_native_attachment_page">Páxina de adxuntos</string>
+    <string name="gutenberg_native_add_text">Engadir texto…</string>
+    <string name="gutenberg_native_add_caption">Engadir lenda</string>
+    <string name="gutenberg_native_what_is_alt_text">Que é o texto alt?</string>
+    <string name="gutenberg_native_failed_to_insert_media">Fallo ao insertar os medios.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Fallo ao insertar o arquivo de audio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Describe o propósito da imaxe. Déixao baleiro se a imaxe é puramente decorativa.</string>
+    <string name="like_faces_error_loading_message">Erro ao cargar os datos de gústame. %s</string>
+    <string name="like_faces_plural_text">A %d blogueiros gústalles isto.</string>
+    <string name="like_faces_singular_text">A 1 blogueiro gústalle isto.</string>
+    <string name="like_title_plural">%d gústame</string>
+    <string name="like_title_singular">1 gústame</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Introduce as credenciais do teu servidor para corrixir as ameazas.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Introduce as credenciais do teu servidor para corrixir a ameaza.</string>
+    <string name="suggestion">Suxerencia:</string>
+    <string name="gutenberg_native_search_blocks">Bloques de busca</string>
+    <string name="gutenberg_native_search_block">Bloque de busca</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">dobre-toque para cambiar a unidade</string>
+    <string name="gutenberg_native_clear_search">Baleirar a busca</string>
+    <string name="gutenberg_native_cancel_search">Cancelar a busca</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s é %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Ocorreu un erro ao obter os datos dos gústame</string>
+    <string name="get_likes_unknown_error">Ocorreu un erro ao obter os gústame.</string>
+    <string name="get_likes_no_network_error">Non hai ningunha rede dispoñible.</string>
+    <string name="comments_empty_list_filtered_unreplied">Non hai ningún comentario sen responder</string>
+    <string name="comment_status_unreplied">Sen responder</string>
+    <string name="gutenberg_native_table_of_contents">Táboa de contidos</string>
+    <string name="gutenberg_native_summary">resumo</string>
+    <string name="gutenberg_native_document_outline">esquema do documento</string>
+    <string name="jetpack_brute_force_allowlist_title">Direccións IP permitidas sempre</string>
+    <string name="site_settings_denylist_title">Comentarios non permitidos</string>
+    <string name="reader_title_interests">Seguir temas</string>
+    <string name="stories_intro_main_subtitle">Unha nova forma de crear e publicar contidos atraíntes no teu sitio.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Descartar</string>
+    <string name="activity_log_backup_download_notice_download_action">Descargar</string>
+    <string name="threat_fix_all_status_success_message_plural">Ameazas corrixidas correctamente.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Por favor, confirma que queres corrixir todas as %s ameazas activas.</string>
+    <string name="gutenberg_native_edit_focal_point">Editar o punto focal</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Toque dobre para abrir a folla do fondo para editar, substituír ou baleirar a imaxe</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Toque dobre para abrir a folla de acción para editar, substituír ou baleirar a imaxe</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Escribe un nome para o teu sitio</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Completáronse todas as tarefas&lt;/b&gt;&lt;br/&gt;Chegaches a máis xente. Bo traballo!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Completáronse todas as tarefas&lt;/b&gt;&lt;br/&gt;Personalizaches o teu sitio. Ben feito!</string>
+    <string name="quick_start_card_menu_hide">Ocultar por agora</string>
+    <string name="magic_link_not_meaning_to_create_account">Non querías crear unha nova conta? Volve atrás e volve a introducir o teu enderezo de correo electrónico.</string>
+    <string name="invite_links_disable_dialog_title">Desactivar enlace de invitación</string>
+    <string name="invite_links_bad_format_response">Resposta recibida non válida</string>
+    <string name="invite_links_null_response">Non se recibiu ningunha resposta</string>
+    <string name="invite_links_cannot_get_role_data_error">Ocorreu un erro ao recuperar datos para o perfil %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Houbo un erro ao obter os perfís</string>
+    <string name="invite_links_generic_get_data_error">Erro descoñecido ao obter os datos dos enlaces de invitación</string>
+    <string name="invite_links_expire_date">Caduca %1$s</string>
+    <string name="invite_links_disable_invite_link">Desactivar enlace de invitación</string>
+    <string name="invite_links_share_invite_link">Compartir enlace de invitación</string>
+    <string name="invite_links_generate">Xerar novo enlace de invitación</string>
+    <string name="invite_links_get_status_retry">Refrescar o estado do enlace</string>
+    <string name="invite_links_section_title">Enlace de invitación</string>
+    <string name="threats_found_singular">Encontrouse unha ameaza</string>
+    <string name="threats_found_plural">Encontráronse ameazas</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;Encontradas %s ameazas potenciais</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;Encontrada unha ameaza potencial</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Exploración finalizada&lt;/b&gt;&lt;br&gt;Non se encontraron ameazas potenciais</string>
+    <string name="scan_fixing_threats_title_singular">Corrixindo a ameaza</string>
+    <string name="disable">Desactivar</string>
+    <string name="quick_start_card_menu_unpin">Desanclar</string>
+    <string name="quick_start_list_review_pages_subtitle">Revisa as túas páxinas e fai cambios, ou engade ou elimina páxinas.</string>
+    <string name="quick_start_list_view_site_title">Visita o teu sitio</string>
+    <string name="quick_start_list_upload_icon_subtitle">Engade unha icona do sitio para un aspecto pulcro, profesional.</string>
+    <string name="quick_start_list_follow_site_subtitle">Descobre e segue sitios que te inspiren.</string>
+    <string name="quick_start_list_enable_sharing_title">Activar compartir</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Comparte automaticamente as novas entradas nos teus medios sociais.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Dálle un nome ao teu sitio que reflexe a súa personalidade e temática.</string>
+    <string name="quick_start_list_check_stats_title">Revisa as túas estatísticas</string>
+    <string name="backup_download_status_failure_bullet2">Trataremos de crear un arquivo de copia de seguridade descargable.</string>
+    <string name="backup_download_status_failure_bullet1">Non puidemos encontrar o estado para dicir canto tardará a túa copia de seguridade descargable.</string>
+    <string name="backup_download_status_failure_heading">Vaia, non puidemos encontrar o estado da túa copia de seguridade descargable</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icona de marca de comprobación</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icona de reloxo</string>
+    <string name="restore_status_failure_bullet3">Avisámoste cando teñamos rematado.</string>
+    <string name="restore_status_failure_bullet2">Volveremos a intentar restaurar o teu sitio.</string>
+    <string name="restore_status_failure_bullet1">Non puidemos encontrar o estado para decir canto tardará a túa restauración.</string>
+    <string name="restore_status_failure_heading">Vaia, non puidemos encontrar o estado da túa restauración</string>
+    <string name="restore_complete_failed_description">Non puidemos restaurar o teu sitio</string>
+    <string name="restore_warning_action_button">Confirmar</string>
+    <string name="backup_download_complete_failed_description">Non puidemos crear a túa copia de seguridade</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exclúe temas, plugins e subidas)</string>
+    <string name="backup_item_contents">Directorio wp-content</string>
+    <string name="backup_item_roots">Raíz de WordPress</string>
+    <string name="backup_download_details_choose_items_header">Elementos incluídos nesta descarga</string>
+    <string name="gutenberg_native_uploading">Subindo…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Os bloques reutilizables non se poden editar en WordPress para iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Os bloques reutilizables non se poden editar en WordPress para Android</string>
+    <string name="gutenberg_native_replace_file">Substituír arquivo</string>
+    <string name="gutenberg_native_replace_audio">Substituír audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problema ao abrir o audio</string>
+    <string name="gutenberg_native_open">ABERTO</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Ningunha aplicación pode xestionar esta solicitude.</string>
+    <string name="gutenberg_native_lock_icon">Icona de cadeado</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Fallo ao insertar o arquivo de audio. Por favor, toca para ver as opcións.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Toca dúas veces para seleccionar un arquivo de audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Toca dúas veces para escoitar o arquivo de audio</string>
+    <string name="gutenberg_native_choose_audio">Elixir audio</string>
+    <string name="gutenberg_native_audio_player">Reprodutor de audio</string>
+    <string name="gutenberg_native_audio_file">arquivo de audio</string>
+    <string name="gutenberg_native_audio_caption_s">Lenda do audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Lenda do audio. Baleira</string>
+    <string name="gutenberg_native_add_audio">ENGADIR AUDIO</string>
+    <string name="continue_with_wpcom">Accede ou rexístrate con WordPress.com</string>
+    <string name="photo_picker_use_audio">Usar este audio</string>
+    <string name="photo_picker_choose_audio">Elixe un audio do dispositivo</string>
+    <string name="people_optional_custom_message_helper_text">Opcional: introduce unha mensaxe personalizada para enviar coa túa invitación.</string>
+    <string name="people_learn_more_about_roles">Aprende máis sobre os perfís</string>
+    <string name="threat_status_fixed">Corrixido</string>
+    <string name="threat_found_header">Encontrado</string>
+    <string name="scan_here_to_help">aquí para axudar</string>
+    <string name="scan_fixing_threats_title_plural">Corrixindo ameazas</string>
+    <string name="scan_request_failed_title">Algo saíu mal</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Facendo copia de seguridade do sitio</string>
+    <string name="activity_log_currently_backing_up_message">Facendo copia de seguridade do sitio desde %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Creando unha copia de seguridade descargable</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">A copia de seguridade do teu sitio realizouse correctamente</string>
+    <string name="pick_audio">Elixir audio</string>
+    <string name="restore_another_process_running">Hai outra restauración en curso.</string>
+    <string name="restore_complete_failed_icon_content_description">Icona de erro</string>
+    <string name="restore_complete_failed_action_button_content_description">Botón Listo</string>
+    <string name="restore_complete_failed_title">Non se puido restaurar</string>
+    <string name="restore_complete_visit_site_button_content_description">Botón Visitar sitio</string>
+    <string name="restore_complete_done_button_content_description">Botón Listo</string>
+    <string name="restore_complete_icon_content_description">Icona de restaurar</string>
+    <string name="restore_complete_visit_site_action_button">Visitar o sitio</string>
+    <string name="restore_complete_description_with_two_parameters">Todos os elementos seleccionados restauráronse á versión do %1$s %2$s.</string>
+    <string name="restore_complete_header">Restaurouse o teu sitio</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Non fai falta que esperes. Enviarémosche un aviso cando se complete a restauración.</string>
+    <string name="restore_progress_icon_content_description">Icona de restaurar sitio</string>
+    <string name="restore_progress_description_with_two_parameters">Estamos restaurando a versión do teu sitio do %1$s %2$s.</string>
+    <string name="restore_progress_header">Estamos restaurando o sitio</string>
+    <string name="restore_warning_action_button_content_description">Botón de Confirmar a restauración do sitio</string>
+    <string name="restore_warning_icon_content_description">Imaxe dun círculo vermello cun signo de exclamación</string>
+    <string name="restore_warning_header">Advertencia</string>
+    <string name="restore_details_action_button_content_description">Botón Restaurar sitio</string>
+    <string name="restore_details_icon_content_description">Icona de restaurar</string>
+    <string name="restore_details_action_button">Restaurar sitio</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s é o punto seleccionado para a restauración.</string>
+    <string name="restore_details_header">Restaurar sitio</string>
+    <string name="restore_details_choose_items_header">Elixe os elementos que queres restaurar:</string>
+    <string name="restore">Restaurar</string>
+    <string name="backup_download_complete_failed_icon_content_description">Nube con icona X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Botón Listo</string>
+    <string name="backup_download_complete_failed_action_button">Listo</string>
+    <string name="backup_download_complete_failed_title">A descarga fallou</string>
+    <string name="web_preview_tablet">Tableta</string>
+    <string name="web_preview_mobile">Dispositivos móbiles</string>
+    <string name="quick_start_card_menu_remove">Non amosar de novo</string>
+    <string name="quick_start_card_menu_pin">Ancorar</string>
+    <string name="quick_start_dialog_review_pages_message_short">Selecciona %1$s Páxinas %2$s para ver a túa lista de páxinas.</string>
+    <string name="quick_start_dialog_review_pages_message">Cambia, engade ou elimina páxinas no teu sitio.</string>
+    <string name="quick_start_dialog_review_pages_title">Revisar as páxinas do sitio</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Selecciona %1$s Páxina de inicio %2$s para editar a túa páxina de inicio.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Selecciona %1$s Páxinas %2$s para ver a túa lista de páxinas.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Cambia, engade ou elimina contido na páxina de inicio do teu sitio.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Editar a páxina de inicio</string>
+    <string name="reader_menu_mark_as_unseen">Marcar como non lida</string>
+    <string name="reader_menu_mark_as_seen">Marcar como lida</string>
+    <string name="error_media_not_enough_storage">Espazo de almacenamento do sitio insuficiente</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Non se pode alternar o estado visto desta entrada</string>
+    <string name="reader_marked_post_as_unseen">Marcar entrada como non lida</string>
+    <string name="reader_marked_post_as_seen">Marcar entrada como lida</string>
+    <string name="threat_fix_all_status_error_message">Produciuse un erro ao comprobar o estado da reparación. Ponte en contacto co servizo de soporte.</string>
+    <string name="threat_fix_all_status_success_message_singular">A ameaza correxiuse correctamente.</string>
+    <string name="threat_fix_all_error_message">Produciuse un erro ao corrixir as ameazas. Ponte en contacto co servizo de soporte.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Por favor, confirma que queres corrixir unha ameaza activa.</string>
+    <string name="threat_fix_all_warning_title">Corrixir todas as ameazas</string>
+    <string name="threat_ignore_error_message">Non se puido ignorar a ameaza. Ponte en contacto co servizo de soporte.</string>
+    <string name="threat_ignore_success_message">Ignorouse a ameaza.</string>
+    <string name="threat_fix_error_message">Non se puido corrixir a ameaza. Ponte en contacto co servizo de soporte.</string>
+    <string name="threat_item_sub_header_status_ignored">Ameaza ignorada</string>
+    <string name="threat_item_sub_header_status_fixed_on">Ameaza corrixida en %s</string>
+    <string name="threat_fixing">Corrixindo a ameaza</string>
+    <string name="scan_history_ignored_threats_tab">Ignorouse</string>
+    <string name="scan_history_no_threats_found">Non se encontrou ningún elemento</string>
+    <string name="scan_history_fixed_threats_tab">Corrixido</string>
+    <string name="scan_history_all_threats_tab">Todos</string>
+    <string name="scan_scanning_title">Analizando arquivos</string>
+    <string name="scan_preparing_to_scan_title">Preparando escaneado</string>
+    <string name="scan_history_menu_title">Historia</string>
+    <string name="scan_history">Historial de exploracións</string>
+    <string name="backup_active_filter_empty_subtitle">Proba a axustar o rango de datas</string>
+    <string name="backup_active_filter_empty_title">Non se encontraron copias de seguridade coincidentes</string>
+    <string name="backup_empty_title">A túa primeira copia de seguridade pronto estará lista</string>
+    <string name="request_failed_message">Ocorreu un problema ao xestionar a petición. Por favor, inténtao de novo máis tarde.</string>
+    <string name="gutenberg_native_move_to_bottom">Mover ao final</string>
+    <string name="gutenberg_native_change_block_position">Cambiar a posición do bloque</string>
+    <string name="label_control_upload">Subir</string>
+    <string name="jetpack_icon_content_description">icona</string>
+    <string name="backup_download_complete_info">Tamén che enviamos un enlace ao teu arquivo.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Botón de compartir enlace</string>
+    <string name="backup_download_complete_download_action_button_content_description">Botón de descarga</string>
+    <string name="backup_download_complete_icon_content_description">Icona de copia de seguridade descargable lista</string>
+    <string name="backup_download_complete_download_share_action_button">Compartir enlace</string>
+    <string name="backup_download_complete_download_action_button">Descargar</string>
+    <string name="backup_download_complete_description_with_two_parameters">Creamos unha copia de seguridade do teu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_complete_header">A túa copia de seguridade xa está dispoñible para descargala</string>
+    <string name="backup_download_complete_page_title">A túa copia de seguridade</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Non fai falta que esperes. Avisarémoste cando estea lista a copia de seguridade</string>
+    <string name="backup_download_progress_icon_content_description">Icona de copia de seguridade descargable en curso</string>
+    <string name="backup_download_progress_description_with_two_parameters">Estamos creando unha copia de seguridade descargable do teu sitio desde %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Estase creando unha copia de seguridade descargable do teu sitio</string>
+    <string name="backup_download_progress_page_title">Descargar copia de seguridade</string>
+    <string name="backup_download_another_download_running">Hai outra descarga en curso.</string>
+    <string name="backup_download_generic_failure">Ocorreu un problema ao xestionar a petición. Por favor, inténtao de novo máis tarde.</string>
+    <string name="backup_download_details_action_button_content_description">Botón Crear copia de seguridade descargable</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s é o punto seleccionado para crear unha copia de seguridade descargable.</string>
+    <string name="gutenberg_native_image_link_url">URL do vínculo da imaxe</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">entrada cruzada</string>
+    <string name="suggestion_user">usuario</string>
+    <string name="suggestion_no_matching">Non coincide con %s.</string>
+    <string name="suggestion_problem">Ocorreu un problema ao cargar as suxerencias.</string>
+    <string name="suggestion_none">Non hai suxerencias %s dispoñibles.</string>
+    <string name="suggestion_selection_needed">Escribe algo para filtrar a lista de suxerencias.</string>
+    <string name="threat_get_free_estimate">Consegue un orzamento gratuíto</string>
+    <string name="threat_ignore">Ignorar ameaza</string>
+    <string name="threat_fix">Corrixir ameaza</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan solucionará a ameaza.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan editará o arquivo ou o directorio afectados.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan actualizarase a unha versión máis recente (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan borrará o arquivo ou o directorio afectados.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan reemplazará o arquivo ou o directorio afectados.</string>
+    <string name="threat_fix_current_not_fixable_header">Solucionando a ameaza</string>
+    <string name="threat_fix_fixed_header">Como o solucionou Jetpack?</string>
+    <string name="threat_fix_default_header">Como imos a reparalo?</string>
+    <string name="threat_file_description">Ameaza detectada no arquivo:</string>
+    <string name="threat_technical_details_header">Información técnica</string>
+    <string name="threat_problem_header">Cal foi o problema?</string>
+    <string name="threat_details">Detalles da ameaza</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Encontrouse unha vulnerabilidade nun tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Encontrouse unha vulnerabilidade nun plugin</string>
+    <string name="threat_item_sub_header_file_signature">Ameaza encontrada %s</string>
+    <string name="threat_item_sub_header_core_file">Encontrouse unha vulnerabilidade en WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Varias vulnerabilidades</string>
+    <string name="threat_item_header_vulnerable_theme">Tema vulnerable: %s (versión %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Plugin vulnerable: %s (versión %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: patrón de código malicioso</string>
+    <string name="threat_item_header_database_threat">Ameazas de base de datos %s</string>
+    <string name="threat_item_header_infected_core_file">%s: arquivo principal infectado</string>
+    <string name="threat_item_header_threat_found">Encontrouse unha ameaza</string>
+    <string name="threats_fix_all">Corrixir todo</string>
+    <string name="scan_in_few_seconds">hai uns segundos</string>
+    <string name="scan_in_minutes_ago">fai %s minuto(s)</string>
+    <string name="scan_in_hours_ago">fai %s hora(s)</string>
+    <string name="scan_this_site">este sitio</string>
+    <string name="scan_idle_last_scan_description">Executouse a última exploración de Jetpack %s e non se encontrou ningún risco. %s</string>
+    <string name="scan_idle_threats_found_title">Pode que o teu sitio web estea desprotexido</string>
+    <string name="scan_idle_no_threats_found_title">Non te preocupes</string>
+    <string name="scan_again">Analizar de novo</string>
+    <string name="scan_now">Analizar agora</string>
+    <string name="scan_state_icon">Icona de estado da análise</string>
+    <string name="backup">Copias de seguridade</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtro de tipo de actividade (%s tipos seleccionados)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (mostrando %s elementos)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtro de tipo de actividade</string>
+    <string name="activity_log_activity_type_empty_subtitle">Non se rexistraron actividades no rango de datas seleccionado.</string>
+    <string name="activity_log_activity_type_empty_title">Non hai actividades dispoñibles</string>
+    <string name="activity_log_activity_type_error_subtitle">Revisa a túa conexión a Internet e inténtao de novo.</string>
+    <string name="activity_log_activity_type_error_title">Sen conexión</string>
+    <string name="activity_log_activity_type_filter_active_label">Tipo de actividade (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtro de rango de datas</string>
+    <string name="activity_log_active_filter_empty_subtitle">Intenta axustar os filtros de rango de data ou de tipo de actividade</string>
+    <string name="activity_log_active_filter_empty_title">Non se encontraron eventos coincidentes</string>
+    <string name="backup_item_sqls">Base de datos do sitio</string>
+    <string name="backup_item_roots_hint">(inclúe wp-config.php e calquera arquivo que non sexa de WordPress)</string>
+    <string name="backup_item_media_uploads">Subidas de medios</string>
+    <string name="backup_item_plugins">Plugins de WordPress</string>
+    <string name="backup_item_themes">Temas de WordPress</string>
+    <string name="backup_download_details_icon_content_description">Crea unha icona de copia de seguridade descargable</string>
+    <string name="backup_download_details_action_button">Crear un arquivo descargable</string>
+    <string name="backup_download_details_header">Crear unha copia de seguridade descargable</string>
+    <string name="backup_download_details_page_title">Descargar copia de seguridade</string>
+    <string name="backup_download">Descarga da copia de seguridade</string>
+    <string name="gutenberg_native_error">Erro</string>
+    <string name="gutenberg_native_choose_file">Elixir arquivo</string>
+    <string name="activity_log_item_menu_download_backup_label">Descargar copia de seguridade</string>
+    <string name="activity_log_item_menu_restore_label">Restaurar até este punto</string>
+    <string name="activity_log_activity_type_filter_label">Tipo de actividade</string>
+    <string name="activity_log_date_range_filter_label">Rango de datas</string>
+    <string name="activity_log_activity_type_filter_header">Filtrar por tipo de actividade</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiar a versión desta aplicación</string>
+    <string name="dialog_confirm_copy_local_edit_button">Editar a entrada primeiro</string>
+    <string name="dialog_confirm_copy_local_title">Conflicto de sincronización da entrada</string>
+    <string name="button_copy">Duplicar</string>
+    <string name="toast_edit_story_update_in_progress_title">A historia está sendo gardada, por favor, espera…</string>
+    <string name="gutenberg_native_file_name">Nome do arquivo</string>
+    <string name="gutenberg_native_file_block_settings">Axustes do arquivo do bloque</string>
+    <string name="gutenberg_native_edit_file">Editar o arquivo</string>
+    <string name="gutenberg_native_copy_file_url">Copiar a URL do arquivo </string>
+    <string name="gutenberg_native_choose_a_file">ELIXIR UN ARQUIVO</string>
+    <string name="new_site_creation_domain_header_title">Elixe un dominio</string>
+    <string name="my_site_btn_jetpack_settings">Axustes de Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Seguindo a conversa por correo electrónico</string>
+    <string name="reader_btn_follow_comments">Seguir a conversa por correo electrónico</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Non se puido anular a subscrición aos comentarios desta entrada</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Non se puido crear a subscrición aos comentarios desta entrada</string>
+    <string name="reader_follow_comments_get_status_error">Erro ao recuperar o estado da subscrición para a entrada</string>
+    <string name="reader_follow_comments_unsubscribe_success">Cancelada correctamente a subscrición aos comentarios</string>
+    <string name="reader_follow_comments_subscribe_success">Subscrito correctamente aos comentarios</string>
+    <string name="reader_follow_comments_bad_format_response">Resposta recibida non válida</string>
+    <string name="reader_follow_comments_null_response">Non se recibiu ningunha resposta</string>
+    <string name="activity_log_activity_type_filter_clear">Baleirar</string>
+    <string name="activity_log_activity_type_filter_apply">Aplicar</string>
+    <string name="dialog_edit_story_unsupported_format_title">Os arquivos GIF non son compatibles</string>
+    <string name="dialog_edit_story_unrecoverable_message">Non puidemos encontrar no sitio os medios para esta historia.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Non se pode editar a historia</string>
+    <string name="dialog_edit_story_unavailable_title">Non se pode editar a historia</string>
+    <string name="dialog_edit_story_limited_title">Edición limitada da historia</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Elimináronse os medios. Intenta volver a crear a túa historia.</string>
+    <string name="color_picker_label_background">Fondo</string>
+    <string name="color_picker_label_text">Texto</string>
+    <string name="dialog_discard_story_ok_button_edit">Descartar</string>
+    <string name="dialog_discard_story_message_edit">Calquera cambio realizado non se gardará.</string>
+    <string name="dialog_discard_story_title_edit">Descartar cambios?</string>
+    <string name="label_done_button">Feito</string>
+    <string name="label_next_button">Seguinte</string>
+    <string name="delete_button_alt">Borrar</string>
+    <string name="hpp_choose_error">Ocorreu un erro ao seleccionar o deseño.</string>
+    <string name="hpp_retry_error">Por favor, revisa a túa conexión a Internet e inténtao de novo.</string>
+    <string name="hpp_error_subtitle">Toca en reintentar cando volvas a estar conectado.</string>
+    <string name="hpp_error_title">Os deseños non están dispoñibles sen conexión</string>
+    <string name="continue_site_credentials">Continuar coas credenciais da tenda</string>
+    <string name="login_find_your_connected_email">Encontra o teu correo electrónico conectado</string>
+    <string name="reader_discover_no_posts_button_text">Seguir temas</string>
+    <string name="reader_discover_no_posts_subtitle">Proba a seguir máis temas para ampliar a busca</string>
+    <string name="reader_discover_no_posts_title">Non hai entradas recentes</string>
+    <string name="reader_discover_empty_title">Benvido!</string>
+    <string name="scan">Explorar</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Xan Vilaboi&lt;/b&gt; respondeu na túa entrada</string>
+    <string name="login_prologue_third_subtitle_two">Hoxe recibiches &lt;b&gt;50 gústame&lt;/b&gt; no teu sitio</string>
+    <string name="login_prologue_third_subtitle_one">A &lt;b&gt;Madison Ruíz&lt;/b&gt; gustoullea túa entrada</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Abriuse o menú de bloques desprazable. Selecciona un bloque.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Pechouse o menú de bloques desprazable.</string>
+    <string name="hpp_skip_button">Omitir</string>
+    <string name="hpp_choose_button">Elixir</string>
+    <string name="hpp_subtitle">Elixe o deseño de páxina de inicio que prefiras. Podes personalizalo ou cambialo máis tarde.</string>
+    <string name="hpp_title">Elixe un deseño</string>
+    <string name="mlp_network_error_subtitle">Toca «Reintentar» cando volvas a estar en liña ou crea unha páxina en branco usando o seguinte botón.</string>
+    <string name="mlp_network_error_title">Os deseños non están dispoñibles sen conexión</string>
+    <string name="mlp_error_subtitle">Toca «Reintentar» ou crea unha páxina en branco usando o seguinte botón.</string>
+    <string name="mlp_error_title">Os deseños non están dispoñibles debido a un erro</string>
+    <string name="prepublishing_nudges_add_category_button">Engadir unha categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Engadir unha nova categoría</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorías</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Non establecido</string>
+    <string name="prepublishing_nudges_categories_action">Categorías</string>
+    <string name="login_prologue_fifth_caption_three">Museos en Londres</string>
+    <string name="login_prologue_fifth_caption_two">Os mellores fanáticos do mundo</string>
+    <string name="login_prologue_fifth_caption_one">Os meus dez mellores cafés</string>
+    <string name="login_prologue_fifth_tag_six">Política</string>
+    <string name="login_prologue_fifth_tag_five">Música</string>
+    <string name="login_prologue_fifth_tag_four">Xardinería</string>
+    <string name="login_prologue_fifth_tag_three">Fútbol</string>
+    <string name="login_prologue_fifth_tag_two">Cociña</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' roll semanal</string>
+    <string name="login_prologue_fifth_subtitle_two">Noticias web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_one">Inspírate</string>
+    <string name="login_prologue_title_fifth">Segue o teus sitios favoritos e descobre novos blogs.</string>
+    <string name="login_prologue_title_fourth">Observa como crece a túa audiencia con analíticas avanzadas.</string>
+    <string name="login_prologue_title_third">Mira os comentarios e avisos en tempo real.</string>
+    <string name="login_prologue_title_second">Co potente editor podes publicar sobre a marcha.</string>
+    <string name="login_prologue_title_first">Benvido ao maquetador web máis popular do mundo.</string>
+    <string name="media_loading_failed">A carga do medio fallou</string>
+    <string name="reader_discover_recommended_blogs_header">Sitios a seguir</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos traballando duro para engadir máis bloques con cada versión.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">«%s» non é totalmente compatible</string>
+    <string name="gutenberg_native_help_button">Botón de axuda</string>
+    <string name="gutenberg_native_edit_using_web_editor">Editar usando o editor web</string>
+    <string name="gutenberg_native_choose_images">Elixir as imaxes</string>
+    <string name="stories_intro_create_story_post_label">Crear unha entrada de historia</string>
+    <string name="stories_intro_title_second">As entradas de historias non desaparecen</string>
+    <string name="stories_intro_title_first">Agora as historias son para todos</string>
+    <string name="stories_intro_image_caption_second">Título da historia de exemplo</string>
+    <string name="stories_intro_image_caption_first">Como crear unha entrada de historias</string>
+    <string name="stories_intro_main_title">Presentación das entradas de historias</string>
+    <string name="mlp_notice_blank_page_created">Páxina en branco creada</string>
+    <string name="mlp_notice_page_created">Páxina creada</string>
+    <string name="media_insert_failed">Inserción do medio fallida.</string>
+    <string name="media_insert_failed_with_reason">Fallou a inserción do medio: %s</string>
+    <string name="photo_picker_wordpress_media_library">Elixe desde a biblioteca de medios de WordPress</string>
+    <string name="reader_label_toolbar_back">Volver</string>
+    <string name="reader_discover_empty_button_text">Primeiros pasos</string>
+    <string name="reader_discover_empty_subtitle">Segue temáticas para descubrir novos blogs</string>
+    <string name="reader_post_details_header_by_author_name">por</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Este referido non pode ser marcado como spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Desmarcar como spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Marcar como spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Abrir a web</string>
+    <string name="media_uploading_gif_library_photo">Subindo medios GIF</string>
+    <string name="media_uploading_stock_library_photo">Subindo medios de inventarios</string>
+    <string name="media_uploading_default">Subindo medios</string>
+    <string name="gutenberg_native_select_item">Seleccionar un elemento</string>
+    <string name="gutenberg_native_search_or_type_url">Busca ou escribe a URL</string>
+    <string name="gutenberg_native_page_break">Salto de páxina</string>
+    <string name="gutenberg_native_add_this_telephone_link">Engadir este enlace de teléfono</string>
+    <string name="gutenberg_native_add_this_link">Engadir este enlace</string>
+    <string name="gutenberg_native_add_this_email_link">Engadir este enlace de correo electrónico</string>
+    <string name="typeface_label_shrikhand">Grosa</string>
+    <string name="typeface_label_space_mono">Moderno</string>
+    <string name="typeface_label_pacifico">Alegre</string>
+    <string name="typeface_label_oswald">Forte</string>
+    <string name="typeface_label_libre_baskerville">Clásico</string>
+    <string name="typeface_label_nunito">Casual</string>
+    <string name="toast_capture_operation_permission_needed">Tes que conceder permisos de gravación de audio á aplicación para gravar vídeo</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s seleccionado</string>
+    <string name="login_get_link_by_email">Obter un enlace de acceso por correo electrónico</string>
+    <string name="email_not_registered_wpcom">Vaia, non encontramos unha conta de WordPress.com conectada a este enderezo de correo electrónico.</string>
+    <string name="permission_microphone">Micrófono</string>
+    <string name="comment_unable_to_show_error">Non se pode amosar este comentario</string>
+    <string name="media_browse_for_items">Navegar por elementos</string>
+    <string name="reader_menu_report_post">Informar desta entrada</string>
+    <string name="reader_welcome_banner">Benvido ao lector. Descobre millóns de blogs ao teu alcance.</string>
+    <string name="error_media_xmlrcp_server_error">Ocorreu un erro interno no servidor</string>
+    <string name="error_media_xmlrpc_not_allowed">A túa acción non está permitida</string>
+    <string name="show_n_hidden_items_desc">%1$s elementos máis</string>
+    <string name="gutenberg_native_select_a_layout">Seleccionar un deseño</string>
+    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Nota: o deseño da columna pode variar entre temas e tamaños de pantalla</string>
+    <string name="create_post_story_fab_tooltip">Crear unha entrada ou historia</string>
+    <string name="create_page_fab_tooltip">Crear unha páxina</string>
+    <string name="create_post_fab_tooltip">Crear unha entrada</string>
+    <string name="reader_discover_interests_header">Pode que che guste</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ocultar</string>
+    <string name="gutenberg_native_video_caption_empty">Lenda do vídeo. Baleira</string>
+    <string name="gutenberg_native_updates_the_title">Actualiza o título.</string>
+    <string name="gutenberg_native_paste_block_after">Pegar o bloque despois</string>
+    <string name="gutenberg_native_page_title_s">Título da páxina. %s</string>
+    <string name="gutenberg_native_page_title_empty">Título da páxina. Baleiro</string>
+    <string name="toast_error_playing_video">Ocorreu un erro ao reproducir o teu vídeo</string>
+    <string name="camera_error">Este dispositivo non é compatible coa API de Camera2</string>
+    <string name="toast_error_saving_video">Non se puido gardar o vídeo</string>
+    <string name="toast_error_saving_image">Erro ao gardar a imaxe</string>
+    <string name="toast_capture_operation_in_progress">Operación en progreso, inténtao de novo</string>
+    <string name="toast_story_page_not_found">Non se puido encontrar a diapositiva da historia</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Ver o almacenamento</string>
+    <string name="dialog_insufficient_device_storage_error_title">Almacenamento insuficiente no dispositivo</string>
+    <string name="dialog_story_saving_error_message">Intenta volver a gardar ou borrar as diapositivas e, despois, intenta volver a publicar a túa historia.</string>
+    <string name="dialog_story_saving_error_title_plural">Non se puideron gardar %1$d diapositivas</string>
+    <string name="dialog_story_saving_error_title_singular">Non se puido gardar 1 diapositiva</string>
+    <string name="story_saving_failed_quick_action_manage">Xestionar</string>
+    <string name="story_saving_failed_message_plural">%1$d diapositivas necesitan unha acción</string>
+    <string name="story_saving_failed_message_singular">1 diapositiva necesita unha acción</string>
+    <string name="story_saving_failed_title">Non se puido subir «%1$s»</string>
+    <string name="story_saving_snackbar_finished_with_error">Non se puido subir «%1$s»</string>
+    <string name="story_saving_snackbar_finished_successfully">Publicado «%1$s»</string>
+    <string name="story_saving_snackbar_started">Subindo «%1$s»…</string>
+    <string name="story_saving_subtitle_frames_remaining_plural">Quedan %1$d diapositivas</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">Queda 1 diapositiva</string>
+    <string name="story_saving_title_several">varias historias</string>
+    <string name="story_saving_title">Gardando «%1$s»…</string>
+    <string name="story_saving_untitled">Sen título</string>
+    <string name="dialog_discard_story_ok_button">Descartar</string>
+    <string name="dialog_discard_story_message">A entrada da túa historia non se gardará como borrador.</string>
+    <string name="dialog_discard_story_title">Descartar a entrada da historia?</string>
+    <string name="dialog_discard_page_ok_button">Borrar</string>
+    <string name="dialog_discard_page_message">Esta diapositiva será eliminada da túa historia.</string>
+    <string name="dialog_discard_page_title">Borrar a diapositiva da historia?</string>
+    <string name="label_text_color_button">Cambiar a cor do texto</string>
+    <string name="label_text_alignment_button">Cambiar a aliñación do texto</string>
+    <string name="label_frame_errored">con erro</string>
+    <string name="label_frame_selected_border">seleccionado</string>
+    <string name="label_frame_unselected_border">sen seleccionar</string>
+    <string name="label_frame_image">Diapositiva</string>
+    <string name="label_retry_icon">Reintentar</string>
+    <string name="label_saved_icon">Gardado</string>
+    <string name="label_close_button">Cerrar</string>
+    <string name="label_share_to">Compartir con</string>
+    <string name="label_snackbar_share">COMPARTIR</string>
+    <string name="label_snackbar_loop_frame_saved">Gardado en fotos</string>
+    <string name="label_control_retry">Reintentar</string>
+    <string name="label_control_saved">Gardado</string>
+    <string name="label_control_saving">Gardando</string>
+    <string name="label_control_flash">Flash</string>
+    <string name="label_control_flip_camera">Xirar</string>
+    <string name="sound_button_alt">Son</string>
+    <string name="text_button_alt">Texto</string>
+    <string name="stickers_button_alt">Pegatinas</string>
+    <string name="flash_button_alt">Flash</string>
+    <string name="flip_button_alt">Xirar a cámara</string>
+    <string name="capture_button_alt">Capturar</string>
+    <string name="mlp_preview_page">Vista previa</string>
+    <string name="mlp_create_page">Crear unha páxina</string>
+    <string name="mlp_create_blank_page">Crear unha páxina en branco</string>
+    <string name="mlp_choose_layout_title">Elixir un deseño</string>
+    <string name="prepublishing_nudges_story_title_hint">Pon un título á túa historia</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Crear unha entrada ou historia</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Crear unha entrada, páxina ou historia</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Toca %1$s Crear. %2$s Despois selecciona &lt;b&gt;Entrada do blog&lt;/b&gt;</string>
+    <string name="photo_picker_choose_file">Elixir o dispositivo</string>
+    <string name="my_site_bottom_sheet_add_story">Entrada da historia</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">Para editares as iconas nos sitios auto-aloxados precisas o plugin Jetpack.</string>
+    <string name="reader_toast_err_page_jump_not_found">Non se puido encontrar o salto de páxina enlazado</string>
+    <string name="error_media_quota_exceeded">Cota de almacenamento superada</string>
+    <string name="pick_file">Engadir un arquivo</string>
+    <string name="gutenberg_native_replace_video">Substituír o vídeo</string>
+    <string name="gutenberg_native_replace_image_or_video">Substituír a imaxe ou vídeo</string>
+    <string name="gutenberg_native_choose_video">Elixir un vídeo</string>
+    <string name="gutenberg_native_choose_image_or_video">Elixir unha imaxe ou vídeo</string>
+    <string name="gutenberg_native_choose_image">Elixir unha imaxe</string>
+    <string name="gutenberg_native_block_removed">Bloque eliminado</string>
+    <string name="enter_your_site_address">Introduce o enderezo do teu sitio existente</string>
+    <string name="signup_confirmation_title">Confirmación do rexistro</string>
+    <string name="continue_terms_of_service_text">Se continúas, aceptas os nosos %1$stermos do servizo%2$s.</string>
+    <string name="signup_confirmation_message">Usaremos este enderezo de correo electrónico para crear a túa nova conta de WordPress.com.</string>
+    <string name="enter_account_info_for_site">Introduce a información da túa conta para %1$s.</string>
+    <string name="login_or">ou</string>
+    <string name="continue_google_button_suffix">Continuar con Google</string>
+    <string name="login_find_your_site_adress">Encontra o enderezo do teu sitio</string>
+    <string name="login_done">Feito</string>
+    <string name="magic_link_not_seeing_email_message">No ves o correo electrónico? Comproba a túa carpeta de spam ou correo non desexado.</string>
+    <string name="login_magic_links_label">Enviarémosche por correo electrónico un enlace que che fará acceder automaticamente, sen necesidade de contrasinal.</string>
+    <string name="check_email">Comprobar o correo electrónico</string>
+    <string name="get_started">Primeiros pasos</string>
+    <string name="enter_email_to_continue_wordpress_com">Introduce o teu enderezo de correo electrónico para acceder ou crear unha conta de WordPress.com.</string>
+    <string name="or_type_your_password">Ou escribe a túa contrasinal</string>
+    <string name="create_account">Crear unha conta</string>
+    <string name="send_link_by_email">Enviar o enlace por correo electrónico</string>
+    <string name="reset_your_password">Restablecer o teu contrasinal</string>
+    <string name="reader_error_request_failed_title">Ocorreu un problema ao xestionar a petición. Por favor, inténtao de novo máis tarde.</string>
     <string name="quick_start_list_update_site_title_title">Configura o título do teu sitio</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b>%1$s&lt;/b> para configurar un novo título</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Toca &lt;b&gt;%1$s&lt;/b&gt; para configurar un novo título</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Ao enviar esta entrada á papeleira tamén se descartarán os cambios locais. Estás seguro de que queres seguir?</string>
     <string name="gutenberg_native_s_block_options">Opciones do bloque %s</string>
     <string name="gutenberg_native_duplicate_block">Duplicar bloque</string>
     <string name="gutenberg_native_copy_block">Copiar bloque</string>
     <string name="gutenberg_native_copied_block">Bloque copiado</string>
-    <string name="gutenberg_native_block_settings">Axustes do bloque</string>
     <string name="gutenberg_native_block_pasted">Bloque pegado</string>
     <string name="gutenberg_native_block_duplicated">Bloque duplicado</string>
     <string name="gutenberg_native_block_cut">Bloque cortado</string>
     <string name="gutenberg_native_block_copied">Bloque copiado</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">O título do sitio só pode ser cambiado por un usuario co perfil de administrador.</string>
+    <string name="reader_title_tag_preview">Tema</string>
+    <string name="error_update_site_title_network">Non se puido actualizar o título do sitio. Comproba a túa conexión de rede e inténtao de novo.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Cambios sen gardar</string>
+    <string name="gutenberg_native_open_link_in_a_browser">Abrir o enlace nun navegador</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Navega para personalizar o degradado</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Navega ao selector de cor personalizado</string>
+    <string name="gutenberg_native_gradient_type">Tipo de degradado</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Toca dúas veces para seleccionar a opción</string>
+    <string name="gutenberg_native_customize_gradient">Personalizar gradiente</string>
+    <string name="pages_list_author">Autor da páxina</string>
+    <string name="photo_picker_use_gif">Usar este GIF</string>
+    <string name="error_media_thumbnail_not_loaded">A miniatura do medio non se puido cargar</string>
+    <string name="menu_content_info">Estrutura do contido</string>
+    <string name="everyone">Todos</string>
+    <string name="me">Eu</string>
     <string name="gutenberg_native_dismiss">Rexeitar</string>
     <string name="prepublishing_nudges_home_tags_not_set">Non establecido</string>
     <string name="prepublishing_tags_description">As etiquetas axudan aos lectores dicíndolles de que se trata a entrada.</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Data de publicación</string>
     <string name="prepublishing_nudges_toolbar_title_tags">Engadir etiquetas</string>
     <string name="prepublishing_nudges_back_button">Volver</string>
     <string name="prepublishing_nudges_home_save_button">Gardar agora</string>
@@ -33,25 +615,26 @@ Language: gl_ES
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Cancelar</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Mover a borrador</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Mover entrada a borrador?</string>
+    <string name="reader_label_choose_your_interests">Elixe as túas temáticas</string>
+    <string name="reader_choose_interests_content_description">Elixe as túas temáticas</string>
     <string name="reader_btn_done">Feito</string>
+    <string name="reader_btn_select_few_interests">Selecciona algúns para continuar</string>
     <string name="post_status_post_published">Publicado</string>
     <string name="post_status_post_trashed">Na papeleira</string>
     <string name="post_status_post_scheduled">Programado</string>
     <string name="publish_date">Data de publicación</string>
+    <string name="ccpa_privacy_notice_read">Le o aviso de privacidade de CCPA</string>
     <string name="ccpa_privacy_notice_header">Aviso de privacidade para usuarios de California</string>
     <string name="status_and_visibility">Estado e visibilidade</string>
     <string name="update_now">Actualizar agora</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Proba un deseño de inicio</string>
     <string name="gutenberg_native_open_block_actions_menu">Abrir o menú de accións de bloques</string>
-    <string name="gutenberg_native_insert_mention">Insertar unha mención</string>
+    <string name="gutenberg_native_move_to_top">Mover arriba</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toca dúas veces para abrir a folla inferior coas opcións dispoñibles</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toca dúas veces pata abrir a folla de acción coas opcións dispoñibles</string>
     <string name="pages_cannot_be_started">No podemos abrir as páxinas neste momento. Por favor, inténtao de novo máis tarde</string>
     <string name="pages_set_as_posts_page">Establecer como páxina de entradas</string>
     <string name="pages_set_as_homepage">Establecer como páxina de inicio</string>
-    <string name="suggestion_no_matching_users">«Non hai usuarios que coincidan.»</string>
-    <string name="suggestion_invalid_user">«%s non é un usuario válido»</string>
+    <string name="suggestion_invalid">%s non é unha %s válida</string>
     <string name="site_settings_select_page">Seleccionar a páxina</string>
     <string name="site_settings_posts_page">Páxina de entradas</string>
     <string name="site_settings_static_homepage">Páxina de inicio estática</string>
@@ -71,7 +654,6 @@ Language: gl_ES
     <string name="page_homepage_successfully_updated">Páxina de inicio actualizada correctamente</string>
     <string name="page_cannot_set_posts_page">Para establecer a páxina de entradas, activa «Páxina de inicio estática» nos axustes do sitio</string>
     <string name="page_cannot_set_homepage">Para establecer a páxina de inicio, activa «Páxina de inicio estática» nos axustes do sitio</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Benvido ao noso novo blog</string>
     <string name="gutenberg_native_select_a_color">Seleccionar unha cor</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toca dúas veces para ir aos axustes da cor</string>
     <string name="reader_empty_followed_blogs_description">Cando sigas sitios, verás aquí o seu contido</string>
@@ -100,10 +682,11 @@ Language: gl_ES
     <string name="continue_label">Continuar</string>
     <string name="copy_text">Copiar</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Mover o bloque á dereita desde a posición %1$s á posición %2$s</string>
+    <string name="gutenberg_native_move_block_right">Mover o bloque á dereita</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Mover o bloque á esquerda desde a posición %1$s á posición %2$s</string>
+    <string name="gutenberg_native_move_block_left">Mover bloque á esquerda</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Toca dúas veces para mover o bloque cara a dereita</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toca dúas veces para mover o bloque cara a esquerda</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Creando o escritorio</string>
     <string name="new_site_creation_creating_site_loading_3">Configurar o tema</string>
     <string name="new_site_creation_creating_site_loading_2">Engadindo as características do sitio</string>
@@ -159,57 +742,20 @@ Language: gl_ES
     <string name="app_theme_light">Claro</string>
     <string name="app_theme">Apariencia</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Recentemente fixeches cambios nesta páxina, pero non os gardaches. Elixe unha versión para cargar:\n\n</string>
-    <string name="gutenberg_native_what_people_say">O que di a xente</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Ofrecemos unha gama de servizos para axudarche a conseguir os resultados que buscas. Non estás seguro do que necesitas ou do que custa? Podemos explicarche que servizos son os adecuados para ti e decirche os nosos honorarios. Ponte en contacto con nós a continuación.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Somos un pequeno equipo de profesionais con talento cunha ampla gama de habilidades e experiencia. Encántanos o que facemos e facémolo con paixón. Esperamos poder traballar contigo.</string>
-    <string name="gutenberg_native_warning_message">Mensaxe de advertencia</string>
-    <string name="gutenberg_native_want_to_work_with_us">Queres traballar con nós?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Os visitantes quererán saber quen está ao outro lado da páxina. Usa este espazo para escribir sobre ti, o teu sitio, o teu negocio ou sobre calquera cousa que queiras. Usa as recomendacións que aparecen a continuación para citar a outros falando do mesmo - coas súas propias palabras.</string>
-    <string name="gutenberg_native_usa">EE.UU.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Este é un contido de exemplo, incluído co modelo, para ilustrar as súas características. Elimínao o substitúeo coas túas propias palabras e medios.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">A forma de comezar é deixar de falar e empezar a facer.</string>
-    <string name="gutenberg_native_team">Equipo</string>
-    <string name="gutenberg_native_success_message">Mensaxe de éxito</string>
-    <string name="gutenberg_native_strategy">Estratexia</string>
     <string name="gutenberg_native_show_post_content">Amosar o contido da entrada</string>
-    <string name="gutenberg_native_services">Servizos</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nome do proxecto</string>
-    <string name="gutenberg_native_position_or_job_title">Posto ou título do traballo</string>
-    <string name="gutenberg_native_portfolio">Porfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Amosar só o extracto</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">O meu porfolio presenta varios proxectos creados ao longo da miña carreira. Mira a continuación a miña información de contacto e ponte en contacto.</string>
     <string name="gutenberg_native_link_to">Enlazar a</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Falemos 👋 Non dubides en contactar na seguinte información de contacto ou envía unha mensaxe usando o formulario.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Imos a construír algo xuntos!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Imos a construír algo xuntos!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Son as nosas eleccións, Harry, as que mostran o que realmente somos, moito máis que as nosas habilidades.</string>
-    <string name="gutenberg_native_inspiration">Inspiración</string>
-    <string name="gutenberg_native_get_in_touch">Ponte en contacto</string>
+    <string name="gutenberg_native_link_settings">Axustes da ligazón</string>
     <string name="gutenberg_native_excerpt_length_words">Lonxitude do extracto (palabras)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Envíame un correo electrónico: &lt;a href=\"mailto:correo@exemplo.gal\">correo@exemplo.gal&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Non chores porque se acabou, sorrí porque ocorreu.</string>
     <string name="gutenberg_native_customize">PERSONALIZAR</string>
-    <string name="gutenberg_native_city_10100">00000, Cidade</string>
+    <string name="gutenberg_native_video_settings">Axustes de vídeo</string>
     <string name="gutenberg_native_add_paragraph_block">Engadir un bloque de parágrafo</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Unha breve descrición dos servizos que ofreces.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Unha breve biografía sobre o teu historial personal, os teus logros clave ou un feito interesante.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:correo@exemplo.gal\">correo@exemplo.gal&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Unha descrición do proxecto e dos traballos presentados.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">Rúa Maior, 10</string>
     <string name="create_post_page_fab_tooltip_contributors">Crear unha entrada</string>
     <string name="post_list_tab_trashed_posts">Na papeleira</string>
     <string name="post_list_tab_scheduled_posts">Programada</string>
     <string name="post_list_tab_published_posts">Publicada</string>
     <string name="sharing_facebook_account_must_have_pages">A conexión con Facebook non pode encontrar ningunha páxina. «Difundir» non pode conectar con perfís de Facebook, só con páxinas publicadas.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Non conectado</string>
-    <string name="my_site_select_domains_page_title">Enderezo do sitio</string>
     <string name="notifications_tab_title_likes">Gústame</string>
     <string name="notifications_tab_title_follows">Seguimentos</string>
     <string name="notifications_tab_title_comments">Comentarios</string>
@@ -223,24 +769,25 @@ Language: gl_ES
     <string name="stats_management_add_new_stats_card">Engadir unha nova tarxeta de estatísticas</string>
     <string name="reader_self_hosted_select_filter">Usa o botón de filtro para encontrar entradas sobre temas específicos</string>
     <string name="reader_bottom_sheet_content_description">Selecciona unha etiqueta ou un sitio, ventá emergente</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Seleccionado</string>
     <string name="reader_btn_select_filter_content_description">Selecciona un sitio ou etiqueta para filtrar entradas</string>
     <string name="reader_btn_remove_filter_content_description">Quitar o filtro actual</string>
+    <string name="reader_title_subs">Xestionar etiquetas e sitios</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Acceder a WordPress.com</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Accede a WordPress.com para ver as últimas entradas dos temas que segues</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Accede a WordPress.com para ver as últimas entradas dos sitios que segues</string>
-    <string name="gutenberg_native_template_preview">Vista previa do modelo</string>
     <string name="gutenberg_native_replace_current_block">Substituír o bloque actual</string>
     <string name="gutenberg_native_add_to_end">Engadir ao final</string>
     <string name="gutenberg_native_add_to_beginning">Engadir ao principio</string>
     <string name="gutenberg_native_add_block_before">Engadir o bloque antes</string>
     <string name="gutenberg_native_add_block_after">Engadir o bloque despois</string>
+    <string name="reader_filter_empty_tags_action">Engadir un tema</string>
     <string name="reader_filter_empty_sites_action">Seguir un sitio</string>
+    <string name="reader_filter_empty_tags_list">Podes seguir entradas sobre un tema específico engadindo un tema</string>
     <string name="reader_filter_empty_sites_list">Mira as entradas máis recentes dos sitios que segues</string>
     <string name="reader_filter_main_title">Seguindo</string>
     <string name="reader_filter_cta">Filtrar</string>
     <string name="gutenberg_native_video_caption_s">Lenda do vídeo. %s</string>
     <string name="gutenberg_native_edit_video">Editar o vídeo</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Toca dúas veces para seleccionar o deseño</string>
     <string name="gutenberg_native_add_a_shortcode">Engadir un shortcode…</string>
     <string name="post_list_author">Autor da entrada</string>
     <string name="fab_create_desc">Crear unha entrada</string>
@@ -255,10 +802,8 @@ Language: gl_ES
     <string name="stats_box_type_low">baixas</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  e %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Mover a imaxe cara adiante</string>
-    <string name="gutenberg_native_move_image_backward">Mover a imaxe cara atrás</string>
+    <string name="gutenberg_native_replace_image">Substituír imaxe</string>
     <string name="gutenberg_native_gallery_caption_s">Lenda da galería. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. O valor actual é %2$s</string>
     <string name="create_post_page_fab_tooltip">Crear unha entrada ou páxina</string>
     <string name="content_description_person_building_website">Creador da web</string>
     <string name="post_signup_interstitial_not_right_now">Agora non</string>
@@ -272,51 +817,46 @@ Language: gl_ES
     <string name="my_site_bottom_sheet_add_post">Entrada do blog</string>
     <string name="my_site_bottom_sheet_title">Engadir nova</string>
     <string name="post_settings_publish">Publicar</string>
-    <string name="dialog_gutenberg_informative_description_v2">Fixemos grandes melloras no editor de bloques e cremos que vale a pena probalo! Activámolo para novas entradas e páxinas, pero se queres cambiar ao editor clásico, vai a «Meu sitio > Axustes do sitio».</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizar agora</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Esta entrada sincronizarase inmediatamente.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Preparado para sincronizar?</string>
     <string name="new_site_creation_unavailable_domain">Este dominio non está dispoñible</string>
-    <string name="login_promo_viewpager_content_description">Introdución</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Non puidemos acceder ao teu sitio. Terás que contactar co teu aloxamento para solucionalo.</string>
-    <string name="login_discovery_error_ssl">Non puidemos acceder ao teu sitio debido a un problema co &lt;b>certificado SSL&lt;/b>. Terás que contactar co teu aloxamento para solucionalo.</string>
-    <string name="login_discovery_error_http_auth">Non puidemos acceder ao teu sitio porque necesita &lt;b>identificación HTTP&lt;/b>. Terás que contactar co teu aloxamento para solucionalo.</string>
-    <string name="login_discovery_error_xmlrpc">Non puidemos acceder no teu sitio ao &lt;b>arquivo XMLRCP&lt;/b>. Terás que contactar co teu aloxamento para solucionalo.</string>
-    <string name="login_site_credentials_magic_link_label">Xa case estamos! Só necesitamos verificar o teu enderezo de correo electrónico conectado a Jetpack &lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">Non puidemos acceder ao teu sitio debido a un problema co &lt;b&gt;certificado SSL&lt;/b&gt;. Terás que contactar co teu aloxamento para solucionalo.</string>
+    <string name="login_discovery_error_http_auth">Non puidemos acceder ao teu sitio porque necesita &lt;b&gt;identificación HTTP&lt;/b&gt;. Terás que contactar co teu aloxamento para solucionalo.</string>
+    <string name="login_discovery_error_xmlrpc">Non puidemos acceder no teu sitio ao &lt;b&gt;arquivo XMLRCP&lt;/b&gt;. Terás que contactar co teu aloxamento para solucionalo.</string>
+    <string name="login_site_credentials_magic_link_label">Xa case estamos! Só necesitamos verificar o teu enderezo de correo electrónico conectado a Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Accede coas credenciais do teu sitio %1$s</string>
-    <string name="send_verification_email">Enviar o correo electrónico de verificación</string>
     <string name="my_site_bottom_sheet_add_page">Páxina do sitio</string>
     <string name="reader_following_display_name">Seguindo</string>
     <string name="reader_my_likes_display_name">Gústame</string>
     <string name="reader_discover_display_name">Descubre</string>
     <string name="reader_save_for_later_display_name">Gardados</string>
+    <string name="reader_filter_tags_title">Temas</string>
     <string name="reader_filter_sites_title">Sitios</string>
     <string name="suffix_1_000_000_000_000_000_000">%sE</string>
     <string name="suffix_1_000_000_000_000_000">%sP</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
     <string name="suffix_1_000_000_000">%sG</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">Non podemos abrir as entradas neste momento. Por favor, inténtao de novo máis tarde</string>
     <string name="site_cannot_be_loaded">Non puidemos cargar os datos para o teu sitio neste momento. Por favor, inténtao de novo máis tarde</string>
     <string name="gutenberg_native_wordpress_media_library">Biblioteca de medios de WordPress</string>
+    <string name="gutenberg_native_unsupported">Non compatible</string>
     <string name="gutenberg_native_ungroup">Desagrupar</string>
     <string name="gutenberg_native_translate">Traducir</string>
-    <string name="gutenberg_native_title">Título:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Toca para ocultar o teclado</string>
     <string name="gutenberg_native_tap_here_to_show_help">Toca aquí para amosar a axuda</string>
     <string name="gutenberg_native_take_a_video">Fai un vídeo</string>
     <string name="gutenberg_native_take_a_photo_or_video">Fai unha foto ou un vídeo</string>
     <string name="gutenberg_native_take_a_photo">Fai unha foto</string>
     <string name="gutenberg_native_start_writing">Empeza a escribir…</string>
-    <string name="gutenberg_native_size">Tamaño</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Título do plugin na barra lateral</string>
     <string name="gutenberg_native_show_section">Amosar a sección</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloque %s. Este bloque ten contido non válido</string>
     <string name="gutenberg_native_s_block_empty">Bloque %s. Baleiro</string>
-    <string name="gutenberg_native_reset_block">Restablecer o bloque</string>
-    <string name="gutenberg_native_remove_annotations">Eliminar as notas</string>
+    <string name="gutenberg_native_cut_block">Cortar bloque</string>
     <string name="gutenberg_native_problem_opening_the_video">Problema ao abrir o vídeo</string>
     <string name="gutenberg_native_problem_displaying_block">Problema ao amosar o bloque</string>
     <string name="gutenberg_native_post_title_s">Título da entrada. %s</string>
@@ -326,15 +866,12 @@ Language: gl_ES
     <string name="gutenberg_native_open_settings">Abrir os axustes</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ningunha aplicación pode manexar esta petición. Por favor, instala un navegador web.</string>
     <string name="gutenberg_native_navigate_up">Navegar arriba</string>
-    <string name="gutenberg_native_my_pre_publish_panel">O meu panel de prepublicación</string>
-    <string name="gutenberg_native_my_post_status_info">Información do estado da miña entrada</string>
-    <string name="gutenberg_native_my_post_publish_panel">O meu panel de publicación de entradas</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panel de axustes dos meus documentos</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover o bloque cara arriba, da fila %1$s á fila %2$s</string>
+    <string name="gutenberg_native_move_block_up">Mover o bloque arriba</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover o bloque cara abaixo, da fila %1$s á fila %2$s</string>
+    <string name="gutenberg_native_move_block_down">Mover o bloque abaixo</string>
     <string name="gutenberg_native_image_caption_s">Lenda da imaxe. %s</string>
     <string name="gutenberg_native_hide_keyboard">Ocultar o teclado</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Aquí está o panel de contido!</string>
     <string name="gutenberg_native_help_icon">Icona de axuda</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Erro ao inserir os medios.\nPor favor, toca para ver as opcións.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Toca dúas veces para desfacer o último cambio</string>
@@ -346,34 +883,26 @@ Language: gl_ES
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Toca dúas veces para mover o bloque cara arriba</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Toca dúas veces para mover o bloque cara abaixo</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Toca dúas veces para editar este valor</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Toca dúas veces para cambiar o valor usando o control deslizante</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Toca dúas veces para engadir un bloque</string>
     <string name="gutenberg_native_current_value_is_s">O valor actual é %s</string>
-    <string name="gutenberg_native_content">Contido…</string>
     <string name="gutenberg_native_choose_from_device">Elixir desde o dispositivo</string>
-    <string name="gutenberg_native_annotations_sidebar">Barra lateral de notas</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ocorreu un erro descoñecido. Por favor, inténtao de novo.</string>
     <string name="gutenberg_native_alt_text">Texto alternativo</string>
     <string name="gutenberg_native_add_video">ENGADIR UN VÍDEO</string>
     <string name="gutenberg_native_add_url">Engadir a URL</string>
+    <string name="gutenberg_native_add_alt_text">Engadir o texto alternativo</string>
     <string name="gutenberg_native_add_image_or_video">ENGADIR UNHA IMAXE OU UN VÍDEO</string>
     <string name="gutenberg_native_add_image">ENGADIR UNHA IMAXE</string>
     <string name="gutenberg_native_add_block_here">ENGADIR O BLOQUE AQUÍ</string>
-    <string name="gutenberg_native_add_annotation">Engadir unha nota</string>
-    <string name="gutenberg_native_add_a_description">Engadir unha descrición</string>
     <string name="reader_empty_saved_posts_content_description">Toca o botón «Engadir ás entradas gardadas» para gardar unha entrada na túa lista.</string>
     <string name="reader_acessibility_list_loaded">A lista cargouse con %1$d elementos.</string>
     <string name="notifications_tab_dialog_switch_desc">Notificacións</string>
-    <string name="master_switch_default_title_off">Desactivados</string>
-    <string name="master_switch_default_title_on">Activados</string>
-    <string name="notifications_tab_dialog_master_off_message">Ao desactivar os avisos para este sitio, desactivaranse os avisos que se mostran na pestana de avisos deste sitio. Podes axustar o tipo de aviso que ves despois de activar os avisos para este sitio.</string>
-    <string name="notifications_tab_dialog_master_off_title">Para ver os avisos na pestana de avisos deste sitio, activa os avisos para este sitio.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Activar os avisos mostrados na pestana de avisos deste sitio</string>
-    <string name="notifications_tab_dialog_master_hint_on">Desactivar os avisos mostrados na pestana de avisos deste sitio</string>
-    <string name="notifications_tab_dialog_master_status_off">Avisos para este sitio</string>
-    <string name="notifications_tab_dialog_master_status_on">Avisos para este sitio</string>
-    <string name="dialog_gutenberg_informative_description_page">Agora estás usando o editor de bloques para as novas páxinas, xenial! Se queres cambiar ao editor clásico, vai a «Meu sitio > Axustes do sitio».</string>
-    <string name="dialog_gutenberg_informative_description_post">Agora estás usando o editor de bloques para as novas entradas, xenial! Se queres cambiar ao editor clásico, vai a «Meu sitio > Axustes do sitio».</string>
+    <string name="main_switch_default_title_off">Desactivado</string>
+    <string name="main_switch_default_title_on">Activado</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activar os avisos mostrados na pestana de avisos deste sitio</string>
+    <string name="notifications_tab_dialog_main_hint_on">Desactivar os avisos mostrados na pestana de avisos deste sitio</string>
+    <string name="notifications_tab_dialog_main_status_off">Avisos para este sitio</string>
+    <string name="notifications_tab_dialog_main_status_on">Avisos para este sitio</string>
     <string name="pick_media">Engadir unha imaxe ou un vídeo</string>
     <string name="error_post_not_submitted_retrying">Non puidemos enviar esta entrada para revisión, pero intentarémolo de novo máis tarde. </string>
     <string name="error_post_not_scheduled_retrying">Non puidemos programar esta entrada, pero intentarémolo de novo máis tarde.</string>
@@ -465,8 +994,7 @@ Language: gl_ES
     <string name="post_notification_off">Desactivados</string>
     <string name="post_settings_add_to_calendar">Engadir ao calendario</string>
     <string name="post_settings_notification">Aviso</string>
-    <string name="login_need_help_finding_connected_email">Necesitas axuda para encontrar o correo electrónico co que te conectaches?</string>
-    <string name="enter_wordpress_site">A web neste enderezo non é un sitio WordPress. Para conectarnos a el, o sitio debe ter instalado WordPress.</string>
+    <string name="post_settings_time_and_date">Data e hora</string>
     <string name="login_invalid_site_url">Por favor, introduce un enderezo completo dunha web, como exemplo.gal.</string>
     <string name="enter_email_for_site">Accede con WordPress.com para conectar con %1$s</string>
     <string name="stats_post_views_label">Visitas</string>
@@ -532,7 +1060,7 @@ Language: gl_ES
     <string name="domain_registration_state_picker_dialog_title">Selecciona a provincia</string>
     <string name="domain_registration_country_picker_dialog_title">Selecciona o país</string>
     <string name="domain_registration_result_continue_button">seguir</string>
-    <string name="domain_registration_result_description">o teu novo dominio &lt;b>%s&lt;/b> estase configurando. O teu sitio está\n    dando saltos mortais de emoción!</string>
+    <string name="domain_registration_result_description">o teu novo dominio &lt;b&gt;%s&lt;/b&gt; estase configurando. O teu sitio está\n    dando saltos mortais de emoción!</string>
     <string name="domain_registration_result_title">Noraboa</string>
     <string name="domain_contact_information_register_domain_button">Rexistrar dominio</string>
     <string name="domain_contact_information_postal_code_hint">Código Postal</string>
@@ -640,12 +1168,10 @@ Language: gl_ES
     <string name="plans_loading_error_no_plans_title">Non se poden cargar os plans</string>
     <string name="plans_loading_error_network_title">Non hai conexión</string>
     <string name="menu_switch_to_gutenberg_editor">Cambiar ao editor de bloques</string>
-    <string name="menu_switch_to_aztec_editor">Cambiar ao editor clásico</string>
     <string name="stats_loading_block_error">Houbo un problema ao cargar os teus datos, recarga a páxina e inténtao de novo.</string>
     <string name="stats_loading_error">Datos non cargados</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edita as novas entradas e páxinas co editor de bloques</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Usar editor de bloques</string>
-    <string name="dialog_gutenberg_informative_title">Editor de bloques activado</string>
     <string name="exit">saír</string>
     <string name="quick_start_sites_type_subtitle">%1$d de %2$d completo</string>
     <string name="quick_start_sites_type_grow">Fai crecer a túa audiencia</string>
@@ -656,8 +1182,6 @@ Language: gl_ES
     <string name="quick_start_dialog_upload_icon_title">Sube un icona do sitio</string>
     <string name="quick_start_dialog_upload_icon_message">Os teus visitantes verán a túa icona no seu navegador. Engade unha icona personalizada para conseguir un aspecto profesional e refinado.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Toca en %1$s Plan %2$s para ver o teu plan actual e outros plans dispoñibles</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Toca en %1$s Engadir páxina %2$s para crear unha nova páxina.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Toca en %1$s Páxinas do sitio %2$s para continuar.</string>
     <string name="quick_start_dialog_check_stats_message_short">Toca en %1$s Estatísticas %2$s para ver como está rendendo o teu sitio.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Toca en %1$s Icona do teu sitio %2$s para subir un novo</string>
     <string name="quick_start_dialog_publish_post_message">Garda en borrador e publica a túa primeira entrada.</string>
@@ -668,13 +1192,8 @@ Language: gl_ES
     <string name="quick_start_dialog_explore_plans_message">Aprende sobre as ferramentas de marketing e SEO dos nosos plans de pagamento.</string>
     <string name="quick_start_dialog_enable_sharing_title">Activar compartir entradas</string>
     <string name="quick_start_dialog_enable_sharing_message">Comparte automaticamente as novas entradas nas túas contas de medios sociais.</string>
-    <string name="quick_start_dialog_customize_site_message">Configura fontes, engade imaxes e máis.</string>
-    <string name="quick_start_dialog_create_page_title">Crea unha nova páxina</string>
-    <string name="quick_start_dialog_create_page_message">Engade unha páxina con contido clave - unha páxina «Acerca de» é un gran comezo.</string>
     <string name="quick_start_dialog_check_stats_title">Revisa as estatísticas do teu sitio</string>
     <string name="quick_start_dialog_check_stats_message">Mantente ao día sobre o rendemento do teu sitio.</string>
-    <string name="quick_start_dialog_browse_themes_title">Explorar temas</string>
-    <string name="quick_start_dialog_browse_themes_message">Explora ducias de opcións de deseño e descobre a que se axuste a ti.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Eliminar os seguintes pasos ocultará todas as visitas guiadas deste sitio. Esta acción é irreversible.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Quitar os seguintes pasos</string>
     <string name="quick_start_remove_next_steps_menu_title">Quitar isto</string>
@@ -698,15 +1217,11 @@ Language: gl_ES
     <string name="notification_new_site_creation_failed">Houbo un problema</string>
     <string name="notification_new_site_creation_title">Crear sitio</string>
     <string name="new_site_creation_create_site_button">Crear sitio</string>
-    <string name="new_site_creation_search_domain_input_hint">Buscar dominios</string>
     <string name="new_site_creation_domain_header_subtitle">Aquí é onde a xente te encontra en Internet.</string>
-    <string name="new_site_creation_domain_header_title">Selecciona un nome de dominio para o teu sitio</string>
     <string name="new_site_creation_empty_domain_list_message">Non hai direccións dispoñibles que coincidan coa túa busca</string>
     <string name="site_creation_error_generic_subtitle">Erro durante a comunicación co servidor. Inténtao de novo</string>
     <string name="site_creation_error_generic_title">Houbo un problema</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Houbo un problema</string>
-    <string name="site_creation_segments_subtitle">Isto axúdanos a facer recomendacións. Pero non tes que estar sempre aí; os sitios evolucionan!</string>
-    <string name="site_creation_segments_title">Cóntanos que tipo de sitio che gustaría crear</string>
     <string name="new_site_creation_preview_title">Creouse o teu sitio!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
     <string name="new_site_creation_screen_title_general">Crear sitio</string>
@@ -861,20 +1376,16 @@ Language: gl_ES
     <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
     <string name="quick_start_dialog_need_help_button_negative">Non, grazas</string>
     <string name="quick_start_dialog_follow_sites_title">Segue outros sitios</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con intereses similares</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Toca en %1$s Buscar %2$s para buscar sitios con temáticas similares</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Toca en %1$s Lector %2$s para seguir</string>
     <string name="quick_start_dialog_follow_sites_message">Descubre sitios que te inspiren, e sígueos para obter actualizacións cando publiquen.</string>
-    <string name="quick_start_dialog_customize_site_title">Personaliza o teu sitio</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Toca en %1$s Temas %2$s para seguir</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Toca en %1$s Personalizar %2$s para empezar a personalizar o teu sitio</string>
-    <string name="quick_start_dialog_choose_theme_title">Elixe un tema</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Toca en %1$s Temas %2$s para descubrir novos temas</string>
-    <string name="quick_start_dialog_choose_theme_message">Revisa todos os nosos temas para encontrar o que se che axuste á perfección</string>
     <string name="quick_start_button_positive">Ir</string>
     <string name="quick_start_button_negative_short">Cancelar</string>
     <string name="quick_start_button_negative">Agora non</string>
     <string name="content_description_more">Máis</string>
     <string name="my_site_create_new_site_title">Non tes sitios</string>
+    <string name="reader_empty_followed_tags_title">Temas non seguidos</string>
+    <string name="reader_empty_followed_tags_subtitle">Engade aquí temas para descubrir entradas sobre as túas temáticas favoritas</string>
     <string name="login_to_to_connect_jetpack">Accede á conta de WordPress.com que usaches para conectar con Jetpack.</string>
     <string name="install_jetpack_retry">Reintentar</string>
     <string name="install_jetpack_continue">Configurar</string>
@@ -931,10 +1442,8 @@ Language: gl_ES
     <string name="support_contact_email">Correo electrónico de contacto</string>
     <string name="application_log_button">Rexistro da aplicación</string>
     <string name="my_tickets">Os meus tickets</string>
-    <string name="activity_log_rewind_dialog_message">Queres rebobinar o teu sitio ao %1$s ás %2$s? Isto borrará todo o contido e opcións creadas ou cambiadas desde entón.</string>
-    <string name="activity_log_rewind_site">Rebobinar sitio</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rebobinado en curso</string>
-    <string name="activity_log_currently_restoring_message">Rebobinando a %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restauración en progreso</string>
+    <string name="activity_log_currently_restoring_message">Restaurando a %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Actualmente restaurando o teu sitio</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">O teu sitio restaurouse satisfactoriamente</string>
     <string name="activity_log_rewind_finished_snackbar_message">O teu sitio restaurouse con éxito\nRebobinado a %1$s %2$s</string>
@@ -948,20 +1457,16 @@ Language: gl_ES
     <string name="comment_read_source_post">Le a entrada de orixe</string>
     <string name="sites">Sitios</string>
     <string name="signup_magic_link_title">Enviado enlace máxico</string>
-    <string name="signup_email_screen_title">Rexistro por correo electrónico</string>
     <string name="verification_2fa_screen_title">Verificación do código</string>
     <string name="selfhosted_site_login_title">Credenciais de acceso</string>
     <string name="magic_link_sent_login_title">Enviado enlace máxico</string>
     <string name="magic_link_login_title">Acceso por enlace máxico</string>
     <string name="site_address_login_title">Acceso mediante o enderezo do sitio</string>
     <string name="email_address_login_title">Acceso mediante enderezo de correo electrónico</string>
-    <string name="alternatively">Alternativamente:</string>
     <string name="reader_empty_saved_posts_description">Toca %s para gardar unha entrada na túa lista.</string>
     <string name="reader_empty_saved_posts_title">Aínda non hai entradas gardadas!</string>
     <string name="reader_bookmark_snack_title">Entrada gardada</string>
     <string name="reader_bookmark_snack_btn">Ver todas</string>
-    <string name="reader_btn_bookmarked">Gardado</string>
-    <string name="reader_btn_bookmark">Gardar</string>
     <string name="reader_remove_bookmark">Borrada das entradas gardadas</string>
     <string name="reader_add_bookmark">Engadir ás entradas gardadas</string>
     <string name="reader_save_for_later_title">Entradas gardadas</string>
@@ -981,11 +1486,9 @@ Language: gl_ES
     <string name="reader_btn_notifications_on">Activar os avisos do sitio</string>
     <string name="reader_btn_notifications_off">Desactivar os avisos do sitio</string>
     <string name="activity_log_jetpack_icon">Icona de Jetpack</string>
-    <string name="rewind">Rebobinar</string>
     <string name="activity_log_event">Evento</string>
     <string name="activity_log_icon">Icona de actividade</string>
     <string name="activity_log">Rexistro de actividade</string>
-    <string name="activity">Actividade</string>
     <string name="privacy_policy_read">Le a política de privacidade</string>
     <string name="third_party_policy_learn_more_caption">Usamos outras ferramentas de seguimento, incluídas algunhas de terceiros. Le acerca destas e como controlalas.</string>
     <string name="third_party_policy_learn_more_header">Política de terceiros</string>
@@ -996,7 +1499,6 @@ Language: gl_ES
     <string name="preference_privacy_settings">Axustes de privacidade</string>
     <string name="preference_collect_information">Recompilar información</string>
     <string name="post_submitted">Entrada enviada</string>
-    <string name="login_email_button_signup">Non tes unha conta? %1$s Rexístrate %2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Unha característica do plugin require que o sitio estea en bo estado.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Unha característica do plugin necesita que a subscrición do dominio principal estea asociada con este usuario.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Unha característica do plugin necesita privilexios de administrador.</string>
@@ -1095,7 +1597,6 @@ Language: gl_ES
     <string name="edit_photo_screen_title">Editar foto</string>
     <string name="share_intent_screen_title">Elixe o sitio</string>
     <string name="signup_epilogue_screen_title">Nova conta</string>
-    <string name="login_prologue_screen_title">Iniciar sesión</string>
     <string name="login_epilogue_screen_title">Conectado como</string>
     <string name="person_detail_screen_title">Detalle da persoa</string>
     <string name="media_settings_screen_title">Detalles do arquivo</string>
@@ -1103,12 +1604,13 @@ Language: gl_ES
     <string name="notifications_screen_title">Notificacións</string>
     <string name="reader_screen_title">Lector</string>
     <string name="me_section_screen_title">Eu</string>
+    <string name="my_site_section_screen_title">O meu sitio</string>
     <string name="notif_settings_screen_title">Axustes de avisos</string>
     <string name="help_screen_title">Axuda e soporte</string>
     <string name="license_screen_title">Licencia</string>
     <string name="release_notes_screen_title">Notas da versión</string>
     <string name="signup_epilogue_error_avatar_view">O teu avatar subiuse e estará dispoñible en breve.</string>
-    <string name="permissions_denied_message">Parece que desactivaches os permisos necesarios para esta característica.&lt;br/>&lt;br/>Para cambialo, edita os teus permisos e asegúrate de que &lt;strong>%s&lt;/strong> estea activado.</string>
+    <string name="permissions_denied_message">Parece que desactivaches os permisos necesarios para esta característica.&lt;br/&gt;&lt;br/&gt;Para cambialo, edita os teus permisos e asegúrate de que &lt;strong&gt;%s&lt;/strong&gt; estea activado.</string>
     <string name="permissions_denied_title">Permisos</string>
     <string name="plugin_caption_featured">Destacados</string>
     <string name="sharing_disabled_description">Non podes acceder aos teus axustes para compartir porque o teu módulo de compartir de Jetpack está desactivado.</string>
@@ -1149,7 +1651,6 @@ Language: gl_ES
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 entrada con 1 arquivo sen subir</string>
     <string name="untitled_in_parentheses">(sen título)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Crear sitio</string>
     <string name="notification_site_creation_created">Toca para continuar.</string>
     <string name="notification_site_creation_title_success">Sitio creado!</string>
@@ -1163,27 +1664,20 @@ Language: gl_ES
     <string name="username_changer_dismiss_button_positive">Descartar</string>
     <string name="username_changer_action">Gardar</string>
     <string name="content_description_add_avatar">Engadir avatar</string>
-    <string name="signup_with_google_button">Rexistro con Google</string>
-    <string name="signup_with_email_button">Rexistro con correo electrónico</string>
     <string name="signup_user_exists">O correo electrónico xa existe en WordPress.com.\nAcceder.</string>
     <string name="signup_updating_account">Actualizando conta…</string>
-    <string name="signup_terms_of_service_text">Ao rexistrarte aceptas os nosos %1$sTermos do servizo%2$s.</string>
     <string name="signup_magic_link_progress">Enviando correo</string>
     <string name="signup_magic_link_error_button_positive">Reintentar</string>
     <string name="signup_magic_link_error_button_negative">Cerrar</string>
     <string name="signup_magic_link_error">Houbo algún problema ao enviar o correo electrónico. Podes reintentalo agora ou pechar e intentalo máis tarde.</string>
     <string name="signup_epilogue_hint_username">Nome do usuario</string>
+    <string name="signup_epilogue_hint_password_detail">Sempre podes acceder cunha ligazón máxica coma a que acabas de usar, pero tamén podes configurar un contrasinal se o prefires.</string>
     <string name="signup_epilogue_hint_password">Contrasinal (opcional)</string>
     <string name="signup_epilogue_hint_display">Nome a amosar</string>
     <string name="signup_epilogue_error_button_positive">Reintentar</string>
     <string name="signup_epilogue_error_button_negative">Reverter</string>
     <string name="signup_epilogue_error_generic">Houbo algún problema ao actualizar a túa conta. Podes reintentalo ou reverter os teus cambios para continuar.</string>
     <string name="signup_epilogue_error_avatar">Houbo algún problema ao subir o teu avatar.</string>
-    <string name="signup_email_header">Para crear a túa nova conta de WordPress.com, por favor, introduce o teu enderezo de correo electrónico.</string>
-    <string name="signup_email_error_generic">Houbo algún problema ao comprobar o enderezo de correo electrónico.</string>
-    <string name="sign_up">Rexistro en WordPress.com</string>
-    <string name="enter_username_instead">Accede co teu nome de usuario.</string>
-    <string name="enter_site_address_instead">Accede introducindo o enderezo do teu sitio.</string>
     <string name="plugin_needs_update">Necesita actualizarse</string>
     <string name="plugin_caption_search">Buscar plugins</string>
     <string name="plugin_caption_new">Novo</string>
@@ -1283,6 +1777,7 @@ Language: gl_ES
     <string name="notification_login_title_success">Conectado!</string>
     <string name="login_error_generic_start">Non se puido iniciar o acceso desde Google.</string>
     <string name="login_empty_password">Por favor, introduce un contrasinal</string>
+    <string name="login_text_otp_another">Mándame un código no seu lugar.</string>
     <string name="enter_verification_code_sms">Enviamos unha mensaxe de texto ao número de teléfono terminado en %s. Por favor, introduce o código de verificación do SMS.</string>
     <string name="image_size">Tamaño</string>
     <string name="uploading_subtitle_media_only_one">Queda 1 arquivo</string>
@@ -1303,7 +1798,6 @@ Language: gl_ES
     <string name="login_error_suffix">\nQuizais probando con outra conta?</string>
     <string name="login_error_generic">Houbo algún problema ao conectar coa conta de Google.</string>
     <string name="login_error_button">Cerrar</string>
-    <string name="login_google_button_suffix">Acceder con Google.</string>
     <string name="enter_wpcom_password_google">Para seguir con esta conta de Google, por favor, facilita o contrasinal correspondente de WordPress.com. Só se che pedirá unha vez.</string>
     <string name="error_generic_network">Ocorreu un erro na rede. Por favor, revisa a túa conexión e inténtao de novo.</string>
     <string name="post_settings_remove_featured_image">Quitar imaxe destacada</string>
@@ -1315,12 +1809,10 @@ Language: gl_ES
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">Estás seguro de querer desconectar Jetpack do sitio?</string>
     <string name="jetpack_disconnect_pref_title">«Desconecta de WordPress.com»</string>
-    <string name="site_settings_jetpack_whitelist_description">Podes pór en lista blanca un enderezo IP ou series de direccións, evitando que as bloquee Jetpack. Acéptanse IPv4 e IPv6. Para especificar un rango introduce un valor inferior e un valor superior separados por guións. Exemplo: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Requiere a identificación en dous pasos</string>
     <string name="jetpack_match_wpcom_via_email_title">Relacionar contas usando o correo electrónico</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir o acceso con WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Acceso con WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Direccións IP en lista branca</string>
     <string name="jetpack_prevent_brute_force_title">Bloquea intentos de acceso maliciosos</string>
     <string name="jetpack_prevent_brute_force_category_title">Protección contra ataques de forza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar avisos instantáneos</string>
@@ -1350,6 +1842,7 @@ Language: gl_ES
     <string name="media_edit_filename_caption">Nome do arquivo</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Texto alternativo</string>
+    <string name="connect_site">Conectar un sitio</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Luz parpadeante</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibración do dispositivo</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Elixe son</string>
@@ -1360,12 +1853,11 @@ Language: gl_ES
     <string name="notification_settings_category_other">Outros</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos os meus sitios</string>
     <string name="notification_settings_category_your_sites">Os teus sitios</string>
-    <string name="notification_settings_master_off_message">Desactivando os axustes de avisos desactivarás todos os avisos desta aplicación, dá igual o tipo. Podes axustar ao detalle que tipo de aviso recibir tras activar os axustes de avisos.</string>
-    <string name="notification_settings_master_off_title">Para recibir avisos neste dispositivo activa os axustes de avisos.</string>
-    <string name="notification_settings_master_hint_off">Activar avisos</string>
-    <string name="notification_settings_master_hint_on">Desactivar avisos</string>
-    <string name="notification_settings_master_status_off">Desactivados</string>
-    <string name="notification_settings_master_status_on">Activados</string>
+    <string name="notification_settings_main_off_title">Para recibir avisos neste dispositivo, activa os axustes de avisos.</string>
+    <string name="notification_settings_main_hint_off">Activar os avisos</string>
+    <string name="notification_settings_main_hint_on">Desactivar os avisos</string>
+    <string name="notification_settings_main_status_off">Desactivado</string>
+    <string name="notification_settings_main_status_on">Activado</string>
     <string name="max_video_resolution">Tamaño máximo de vídeo</string>
     <string name="max_thumbnail_px_size">Tamaño máximo de imaxe</string>
     <string name="error_upload_post_media_param">Houbo un erro ao subir os medios a esta entrada: %s.</string>
@@ -1402,17 +1894,17 @@ Language: gl_ES
     <string name="login_site_address_more_help">Necesitas máis axuda?</string>
     <string name="login_site_address_help_content">O enderezo do teu sitio aparece na barra da parte superior da pantalla cando visitas o teu sitio en Chrome.</string>
     <string name="login_site_address_help_title">Cal é o enderezo do meu sitio?</string>
-    <string name="login_site_address_help">Necesitas axuda para encontrar o enderezo do teu sitio?</string>
     <string name="login_site_address">Enderezo do sitio</string>
     <string name="enter_site_address">Introduce o enderezo do sitio WordPress co que che gustaría conectar.</string>
     <string name="login_already_logged_in_wpcom">Xa estás conectado a WordPress.com</string>
     <string name="login_continue">Continuar</string>
+    <string name="connect_more">Conectar outro sitio</string>
     <string name="enter_wpcom_password">Introduce o teu contrasinal de WordPress.com</string>
     <string name="login_magic_link_email_requesting">Solicitando o correo electrónico de acceso</string>
     <string name="password_incorrect">Parece que este contrasinal é incorrecto. Por favor, volve a comprobar a túa información e inténtao de novo.</string>
     <string name="requesting_otp">Solicitando un código de verificación por SMS.</string>
+    <string name="login_text_otp">Envíame un código en texto no seu lugar</string>
     <string name="enter_verification_code">Case o temos! Por favor, introduce un código de verificación desde a túa aplicación Authenticator.</string>
-    <string name="open_mail">Abrir correo electrónico</string>
     <string name="next">Seguinte</string>
     <string name="enter_email_wordpress_com">Accede a WordPress.com usando un enderezo de correo electrónico para xestionar todos os teus sitios WordPress.</string>
     <string name="image_optimization_promo_desc">A optimización da imaxe reduce as imaxes para que suban máis rápido.\n\nPodes cambiar isto en calquera momento nos axustes do sitio.</string>
@@ -1435,10 +1927,6 @@ Language: gl_ES
     <string name="post_status_draft">Borrador</string>
     <string name="post_status_pending_review">Pendente de revisión</string>
     <string name="post_status_publish_post">Publicar</string>
-    <string name="change_location">Cambiar ubicación</string>
-    <string name="remove_location">Borrar ubicación</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Non se puido abrir o selector de ubicación, Google Play Services non está dispoñible</string>
-    <string name="post_settings_location">Ubicación</string>
     <string name="now">Agora</string>
     <string name="post_settings_password_dialog_hint">Só os que teñan este contrasinal poden ver esta entrada</string>
     <string name="post_settings_excerpt_dialog_hint">Os extractos son resumos opcionais do contido feitos a man.</string>
@@ -1622,7 +2110,7 @@ Language: gl_ES
     <string name="signout">Pechar sesión</string>
     <string name="sign_in_wpcom">Iniciar sesión en WordPress.com</string>
     <string name="reader_label_global_related_posts">Máis en WordPress.com</string>
-    <string name="reader_label_local_related_posts">Máis en %s</string>
+    <string name="reader_label_local_related_posts">Máis de %s</string>
     <string name="preference_open_device_settings">Abrir axustes do dispositivo</string>
     <string name="invite_invalid_email">%s: Correo electrónico non válido</string>
     <string name="invite_user_blocked_invites">%s: Invitacións bloqueadas polo usuario</string>
@@ -1670,20 +2158,16 @@ Language: gl_ES
     <string name="invite_error_invalid_usernames_multiple">Non se pode enviar: Hai nomes de usuario ou enderezos de correo non válidos.</string>
     <string name="invite_error_invalid_usernames_one">Fallou o envío: un nome de usuario ou un enderezo non é válido.</string>
     <string name="invite_error_no_usernames">Introduce como mínimo un nome de usuario</string>
-    <string name="invite_message_info">(Opcional) Podes escribir unha mensaxe persoal de ata 500 caracteres para incluíla na invitación ao/s usuario/s.</string>
-    <string name="invite_message_remaining_other">quedan %d caracteres</string>
-    <string name="invite_message_remaining_one">queda 1 carácter</string>
-    <string name="invite_message_remaining_zero">quedan 0 caracteres</string>
-    <string name="invite_message_title">Mensaxe persoal</string>
+    <string name="invite_message_title">Mensaxe personalizada</string>
     <string name="invite">Invitar</string>
-    <string name="invite_names_title">Nomes de usuario ou enderezos de correo</string>
+    <string name="invite_names_title">Nomes de usuario ou enderezos de correo electrónico</string>
     <string name="invite_people">Invitar xente</string>
     <string name="my_site_header_external">Externo</string>
-    <string name="send_link">Enviar o enlace</string>
     <string name="label_clear_search_history">Limpar o historial de busca</string>
     <string name="dlg_confirm_clear_search_history">Limpar o historial de busca?</string>
     <string name="reader_empty_search_description">Non se atoparon artigos para %s na túa lingua</string>
     <string name="reader_hint_post_search">Buscar en WordPress</string>
+    <string name="reader_title_related_post_detail">Artigos relacionados</string>
     <string name="preview_screen_links_disabled">Os enlaces están inhabilitados na vista previa</string>
     <string name="send">Enviar</string>
     <string name="person_removed">%1$s foi eliminado</string>
@@ -1702,7 +2186,6 @@ Language: gl_ES
     <string name="checking_email">Verificando o enderezo de correo electrónico</string>
     <string name="magic_link_unavailable_error_message">Non dispoñible neste momento. Introduce o teu contrasinal.. </string>
     <string name="logging_in">Conectando</string>
-    <string name="enter_your_password_instead">Introduce o teu contrasinal se non</string>
     <string name="web_address_dialog_hint">Móstrase publicamente no teus comentarios.</string>
     <string name="capture_or_pick_photo">Fai ou escolle unha foto</string>
     <string name="plans">Plans</string>
@@ -1725,6 +2208,7 @@ Language: gl_ES
     <string name="site_settings_export_content_title">Exportar os contidos</string>
     <string name="confirm_delete_site_prompt">Escribe %1$s na caixa de embaixo para confirmar. Nese momento o teu sitio desaparecerá para sempre.</string>
     <string name="confirm_delete_site">Confirmar a eliminación do sitio</string>
+    <string name="contact_support">Contactar co soporte</string>
     <string name="start_over_text">Se queres un sitio pero non queres preservar os contidos que tes agora, o noso soporte pode eliminar artigos, páxinas, ficheiros e comentarios por ti.\n \nIsto manterá activo o teu sitio e a súa URL, e darache a oportunidade de comezar a crear contidos desde cero. Contacta connosco para solicitar unha limpeza total do teu sitio.</string>
     <string name="let_us_help">Imos che axudar</string>
     <string name="site_settings_start_over_hint">Borrar todo e comezar desde cero</string>
@@ -1822,7 +2306,6 @@ Language: gl_ES
     <string name="site_settings_paging_dialog_description">Separar os fíos de comentarios en distintas páxinas</string>
     <string name="site_settings_paging_dialog_header">Comentarios por páxina</string>
     <string name="site_settings_close_after_dialog_title">Pechar os comentarios</string>
-    <string name="site_settings_blacklist_description">Cando un comentario conteña algunha destas palabras no seu contido, nome, URL, correo electrónico ou IP, será sinalado como spam. Pódense incluír fragmentos de palabra, de xeito que \"press\" servirá para \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Cando un comentario conteña algunha destas palabras no seu contido, nome, URL, correo electrónico ou IP, será retido na cola de moderación. Pódense incluír fragmentos de palabra, de xeito que \"press\" servirá para \"WordPress\". </string>
     <string name="site_settings_list_editor_input_hint">Introduce unha palabra ou frase</string>
     <string name="site_settings_list_editor_no_items_text">Sen elementos</string>
@@ -1837,10 +2320,10 @@ Language: gl_ES
     <string name="site_settings_rp_show_header_title">Mostrar a cabeceira</string>
     <string name="site_settings_rp_switch_summary">\"Artigos relacionados\" mostra contido pertinente do sitio despois dos artigos.</string>
     <string name="site_settings_rp_switch_title">Mostrar artigos relacionados</string>
-    <string name="site_settings_blacklist_hint">Os comentarios que coincidan cun filtro serán sinalados como spam</string>
+    <string name="site_settings_denylist_hint">Os comentarios que coincidan cun filtro son marcados como spam</string>
     <string name="site_settings_moderation_hold_hint">Os comentarios que coincidan cun filtro poñeranse na cola de moderación</string>
     <string name="site_settings_multiple_links_hint">Ignora o límite de enlaces para os usuarios coñecidos</string>
-    <string name="site_settings_whitelist_hint"> O autor do comentario debe ter un comentario previamente aprobado</string>
+    <string name="site_settings_allowlist_hint">O autor do comentario debe ter un comentario aprobado previamente</string>
     <string name="site_settings_user_account_required_hint">Os usuarios deben estar rexistrados e conectados para comentar</string>
     <string name="site_settings_identity_required_hint">O autor do comentario debe encher o nome e o correo electrónico</string>
     <string name="site_settings_paging_hint">Mostrar os comentarios en grupos do tamaño especificado</string>
@@ -1863,17 +2346,16 @@ Language: gl_ES
     <string name="site_settings_address_hint">O cambio de enderezo non é admitido neste momento</string>
     <string name="site_settings_tagline_hint">Unha descrición curta ou unha frase atractiva para describir o blogue</string>
     <string name="site_settings_title_hint">Explica en poucas palabras de que trata este sitio</string>
-    <string name="site_settings_whitelist_known_summary">Comentarios de usuarios coñecidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentarios de todos os usuarios</string>
+    <string name="site_settings_allowlist_known_summary">Comentarios de usuarios coñecidos</string>
+    <string name="site_settings_allowlist_all_summary">Comentarios de todos os usuarios</string>
     <string name="site_settings_threading_summary">%d niveis</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Eliminar o sitio</string>
-    <string name="site_settings_blacklist_title">Lista negra</string>
     <string name="site_settings_moderation_hold_title">Pendentes de moderación</string>
     <string name="site_settings_multiple_links_title">Enlaces nos comentarios</string>
-    <string name="site_settings_whitelist_title">Aprobar automaticamente</string>
+    <string name="site_settings_allowlist_title">Aprobar automaticamente</string>
     <string name="site_settings_paging_title">Paxinación</string>
     <string name="site_settings_threading_title">Xerarquización</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -1949,6 +2431,8 @@ Language: gl_ES
     <string name="reader_short_like_count_multi">%s gústame</string>
     <string name="reader_short_like_count_one">1 gústame</string>
     <string name="reader_short_like_count_none">Gústame</string>
+    <string name="reader_label_follow_count">%,d seguidores</string>
+    <string name="reader_menu_tags">Editar temas e sitios</string>
     <string name="reader_title_post_detail">Artigo da Guía de Lectura</string>
     <string name="notifications_push_summary">Configuración de notificacións que aparece no teu dispositivo</string>
     <string name="notifications_email_summary">Configuración de notificacións enviada ao correo electrónico asociado á túa conta.</string>
@@ -2020,7 +2504,6 @@ Language: gl_ES
     <string name="logs_copied_to_clipboard">Os rexistros da aplicación foron copiados no portapapeis</string>
     <string name="reader_empty_posts_in_blog">Este blogue está baleiro</string>
     <string name="reader_label_new_posts">Artigos novos</string>
-    <string name="reader_page_recommended_blogs">Sitios que poden gustarche</string>
     <string name="error_copy_to_clipboard">Houbo un erro ao copiar o texto no portapapeis</string>
     <string name="post_uploading">Cargando</string>
     <string name="stats_followers_years">%1$d anos</string>
@@ -2048,6 +2531,7 @@ Language: gl_ES
     <string name="cab_selected">%d seleccionados</string>
     <string name="browse_our_faq_button">Ves as FAQ</string>
     <string name="reader_empty_comments">Sen comentarios aínda</string>
+    <string name="reader_empty_posts_in_tag">Non hai entradas con esta temática</string>
     <string name="reader_label_like">Gústame</string>
     <string name="reader_label_view_original">Ver o artigo orixinal</string>
     <string name="reader_label_comments_closed">Os comentarios están pechados</string>
@@ -2078,11 +2562,12 @@ Language: gl_ES
     <string name="reader_toast_err_already_follow_blog">Xa segues este blogue</string>
     <string name="reader_toast_err_get_blog_info">Non se pode mostrar este blogue</string>
     <string name="reader_label_followed_blog">Blogue en seguimento</string>
+    <string name="reader_hint_add_tag_or_url">Introduce unha URL ou tema para seguir</string>
     <string name="reader_page_followed_blogs">Sitios que sigo</string>
+    <string name="reader_page_followed_tags">Temas seguidos</string>
     <string name="reader_title_blog_preview">Blogue da Guía de Lectura</string>
     <string name="ssl_certificate_ask_trust">Se habitualmente conectas a este sitio sen problema, este erro pode significar que alguén esta¡á tentando suplantarche no sitio, así que que non deberías continuar.  Queres confiar no certificado aínda así?</string>
     <string name="ssl_certificate_error">Certificado SSL non válido</string>
-    <string name="forgot_password">Perdiches o contrasinal?</string>
     <string name="help">Axuda</string>
     <string name="username_or_password_incorrect">O nome de usuario ou o contrasinal introducido é incorrecto</string>
     <string name="email_invalid">Introduce un enderezo de correo electrónico válido</string>
@@ -2106,6 +2591,8 @@ Language: gl_ES
     <string name="blog_not_found">Houbo un erro mentres se accedía a este blogue</string>
     <string name="gallery_error">Non foi posible obter o elemento multimedia</string>
     <string name="no_network_message">Non hai rede dispoñible</string>
+    <string name="reader_toast_err_remove_tag">Non se puido eliminar este tema</string>
+    <string name="reader_toast_err_add_tag">Non se puido engadir este tema</string>
     <string name="reader_title_applog">Rexistro da aplicación</string>
     <string name="fatal_db_error">Houbo un erro mentres se creaba a base de datos da aplicación. Proba a reinstalar a aplicación.</string>
     <string name="error_blog_hidden">Este blogue non se pode cargar porque está oculto. Habilítao de novo na configuración e proba outra vez.</string>
@@ -2171,9 +2658,12 @@ Language: gl_ES
     <string name="reader_likes_you_and_one">A ti e a un máis gustoulles isto</string>
     <string name="pick_video">Escoller vídeo</string>
     <string name="pick_photo">Escoller foto</string>
+    <string name="sign_up_label">Rexistro</string>
     <string name="reader_toast_err_url_intent">No foi posible abrir %s</string>
     <string name="reader_toast_err_view_image">Non foi posible mostrar a imaxe</string>
     <string name="reader_toast_err_share_intent">Non foi posible compartir</string>
+    <string name="reader_toast_err_tag_invalid">Non é un tema válido</string>
+    <string name="reader_toast_err_tag_exists">Xa segues este tema</string>
     <string name="reader_toast_err_comment_failed">Non foi posible enviar o comentario</string>
     <string name="reader_likes_only_you">Gústache isto</string>
     <string name="reader_likes_one">A unha persoa gustoulle isto</string>
diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml
index 2142e26f9033..158bf4bef58b 100644
--- a/WordPress/src/main/res/values-he/strings.xml
+++ b/WordPress/src/main/res/values-he/strings.xml
@@ -1,11 +1,451 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-29 10:54:38+0000
+Translation-Revision-Date: 2021-05-12 17:54:54+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: he_IL
 -->
 <resources>
+    <string name="gutenberg_native_audio_settings">הגדרות אודיו</string>
+    <string name="gutenberg_native_image_settings">הגדרות תמונה</string>
+    <string name="gutenberg_native_size">גודל</string>
+    <string name="user_profile_site_section_header">אתר</string>
+    <string name="user_profile_untitled_site">(ללא כותרת)</string>
+    <string name="user_profile_bottom_sheet_description">פרטי גיליון תחתון של פרופיל המשתמש</string>
+    <string name="likes_list_screen_title">רשימת לייקים %s</string>
+    <string name="gutenberg_native_write_code">הוספת קוד…</string>
+    <string name="gutenberg_native_sorting_and_filtering">מיון וסינון</string>
+    <string name="gutenberg_native_show_download_button">הצג כפתור הורדה</string>
+    <string name="gutenberg_native_shortcode">שורטקוד</string>
+    <string name="gutenberg_native_read_more">קרא עוד</string>
+    <string name="gutenberg_native_post_content_settings">הגדרות תוכן פוסט</string>
+    <string name="gutenberg_native_post_meta_settings">הגדרות פוסט מטא</string>
+    <string name="gutenberg_native_preload">Preload</string>
+    <string name="gutenberg_native_media_area">אזור מדיה</string>
+    <string name="gutenberg_native_media_file">קובץ מדיה</string>
+    <string name="gutenberg_native_metadata">מטה דטה</string>
+    <string name="gutenberg_native_loop">לנגן בלי הפסקה</string>
+    <string name="gutenberg_native_link_to_12d6f96a">קישור אל</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">תמונה מספר %1$d מתוך %2$d בגלריה</string>
+    <string name="gutenberg_native_heading_d">כותרת %d</string>
+    <string name="gutenberg_native_featured">מרכזיים</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">יש להזין כתובת של תוכן להטמעה…</string>
+    <string name="gutenberg_native_edit_image">עריכת תמונה</string>
+    <string name="gutenberg_native_display_post_date">הצגת תאריך הפוסט</string>
+    <string name="gutenberg_native_change_heading_level">שינוי רמת כותרת</string>
+    <string name="gutenberg_native_code">קוד</string>
+    <string name="gutenberg_native_browser_default">ברירת המחדל של הדפדפן</string>
+    <string name="gutenberg_native_attachment_page">עמוד הקובץ</string>
+    <string name="gutenberg_native_auto">אוטומטי</string>
+    <string name="gutenberg_native_autoplay">הפעלה אוטומטית</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">בלוק שלא יכול להופיע בתוך עצמו.</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">הבלוק נמחק או לא זמין.</string>
+    <string name="gutenberg_native_add_text">הוספת טקסט…</string>
+    <string name="gutenberg_native_add_caption">להוסיף כיתוב</string>
+    <string name="gutenberg_native_what_is_alt_text">מה זה טקסט חלופי?</string>
+    <string name="gutenberg_native_transform_s_to">לשנות את %s אל</string>
+    <string name="gutenberg_native_transform_block">לשנות בלוק…</string>
+    <string name="gutenberg_native_failed_to_insert_media">ההוספה של המדיה נכשלה.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">ההוספה של קובץ האודיו נכשלה.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">לתאר את מטרת התמונה. יש להשאיר את השדה ריק אם התמונה נוספה לצורך דקורטיבי בלבד. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">⁦%1$s⁩ שונה אל ⁦%2$s⁩</string>
+    <string name="like_faces_error_loading_message">שגיאה בטעינה של נתוני הלייקים. %s.</string>
+    <string name="like_faces_plural_text">%d בלוגרים סימנו לזה לייק.</string>
+    <string name="like_faces_singular_text">בלוגר אחד סימן לזה לייק.</string>
+    <string name="like_title_plural">%d לייקים</string>
+    <string name="like_title_singular">לייק אחד</string>
+    <string name="threat_fix_enter_server_creds_message_plural">יש להזין את פרטי הכניסה של השרת כדי לתקן את האיומים האלה.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">יש להזין את פרטי הכניסה של השרת כדי לתקן את האיום הזה.</string>
+    <string name="suggestion">הצעה:</string>
+    <string name="gutenberg_native_search_blocks">בלוקים של חיפוש</string>
+    <string name="gutenberg_native_search_block">בלוק החיפוש</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">יש להקיש פעמיים כדי לשנות את היחידה</string>
+    <string name="gutenberg_native_clear_search">לנקות את החיפוש</string>
+    <string name="gutenberg_native_cancel_search">לבטל חיפוש</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. ⁦%2$s⁩ הוא ⁦%3$s⁩ %4$s.</string>
+    <string name="get_likes_empty_state_title">אירעה שגיאה בהבאת הנתונים של הלייקים</string>
+    <string name="get_likes_unknown_error">אירעה שגיאה לא ידועה בהבאת הלייקים.</string>
+    <string name="get_likes_no_network_error">אין רשת זמינה.</string>
+    <string name="comments_empty_list_filtered_unreplied">אין תגובות ללא מענה</string>
+    <string name="comment_status_unreplied">ללא מענה</string>
+    <string name="gutenberg_native_table_of_contents">תוכן עניינים</string>
+    <string name="gutenberg_native_summary">סיכום</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">לסכם את הפוסט עם רשימה של כותרות. להוסיף עוגנים של HTML לבלוקים של כותרת כדי לקשר אותם כאן.</string>
+    <string name="gutenberg_native_document_outline">חלוקת המסמך לרמות</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">כתובת IP שמותרות תמיד</string>
+    <string name="site_settings_denylist_title">תגובות שלא יותרו לפרסום</string>
+    <string name="reader_title_interests">לעקוב אחר נושאים</string>
+    <string name="stories_intro_main_subtitle">דרך חדשה ליצור ולפרסם תוכן מעניין באתר שלך.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">ביטול</string>
+    <string name="activity_log_backup_download_notice_download_action">הורדה</string>
+    <string name="threat_fix_all_status_success_message_plural">האיומים תוקנו בהצלחה.</string>
+    <string name="scan_idle_threats_description_plural">הסריקה איתרה ⁦%1$s⁩ איומים פוטנציאליים עם ⁦%2$s⁩. עליך לבדוק את הפרטים למטה ולנקוט פעולה או להקיש על הכפתור \'לתקן הכול\'. אנחנו ⁦%3$s⁩ אם נדרשת עזרה.</string>
+    <string name="threat_fix_all_confirmation_message_plural">עליך לאשר שברצונך לתקן את כל %s האיומים הפעילים.</string>
+    <string name="scan_fixing_threats_description_plural">אנחנו משקיעים המון מאמצים ברקע כדי לתקן את האיומים האלה. בינתיים, אפשר להמשיך להשתמש באתר כרגיל ולחזור לבדוק את ההתקדמות בכל שלב.</string>
+    <string name="gutenberg_native_edit_focal_point">לערוך נקודת מוקד</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">יש להקיש פעמיים כדי לפתוח את הגיליון התחתון ולערוך, להחליף או למחוק את התמונה</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">יש להקיש פעמיים כדי לפתוח את גיליון הפעולה ולערוך, להחליף או למחוק את התמונה</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">יש להקליד שם לאתר שלך</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;כל המשימות הושלמו&lt;/b&gt;&lt;br/&gt;האתר שלך יקבל חשיפה ליותר אנשים. עבודה מצוינת!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;כל המשימות הושלמו&lt;/b&gt;&lt;br/&gt;האתר שלך הותאם אישית. כל הכבוד!</string>
+    <string name="quick_start_card_menu_hide">להסתיר לעת עתה</string>
+    <string name="magic_link_not_meaning_to_create_account">לא התכוונת ליצור חשבון חדש? יש לחזור אחורה כדי להזין מחדש את כתובת האימייל שלך.</string>
+    <string name="invite_links_disable_dialog_message">לאחר שהקישור להזמנה יושבת, לא תהיה עוד לאף אחד אפשרות להשתמש בו כדי להצטרף לצוות שלך. האם ברצונך להמשיך?</string>
+    <string name="invite_links_disable_dialog_title">להשבית את הקישור להזמנה</string>
+    <string name="invite_links_bad_format_response">התקבלה תגובה לא חוקית</string>
+    <string name="invite_links_null_response">לא התקבלו תגובות</string>
+    <string name="invite_links_cannot_get_role_data_error">אירעה שגיאה בקבלת הנתונים לתפקיד ⁦%1$s⁩</string>
+    <string name="invite_links_cannot_get_roles_error">אירעה שגיאה בקבלת התפקידים</string>
+    <string name="invite_links_generic_get_data_error">אירעה שגיאה לא ידועה בהבאת הנתונים של קישורי ההזמנות</string>
+    <string name="invite_links_helper_text">ניתן להשתמש בקישור זה כדי להזמין את כל חברי הצוות שלך במקביל, במקום לשלוח הזמנות אישיות. לכל אדם שמבקר בכתובת ה-URL הזאת תהיה אפשרות להירשם לארגון שלך, גם אם הוא מקבל את הקישור מאדם אחר ולכן, חשוב לוודא שהקישור נשלח לאנשים מהימנים בלבד.</string>
+    <string name="invite_links_expire_date">יפוג תוקף ביום ⁦%1$s⁩</string>
+    <string name="invite_links_disable_invite_link">להשבית את הקישור להזמנה</string>
+    <string name="invite_links_share_invite_link">לשתף קישור הזמנה</string>
+    <string name="invite_links_generate">ליצור קישור חדש</string>
+    <string name="invite_links_get_status_retry">לרענן את הסטטוס של הקישור</string>
+    <string name="invite_links_section_title">קישור להזמנה</string>
+    <string name="threats_found_singular">אותר איום</string>
+    <string name="threats_found_plural">נמצאו איומים</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;הסריקה הסתיימה&lt;/b&gt; &lt;br&gt; %s נמצאו איומים פוטנציאליים</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;הסריקה הסתיימה&lt;/b&gt; &lt;br&gt; נמצא איום פוטנציאלי אחד</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;הסריקה הסתיימה&lt;/b&gt; &lt;br&gt; לא נמצאו איומים</string>
+    <string name="scan_fixing_threats_title_singular">מתקן את האיום</string>
+    <string name="disable">להשבית</string>
+    <string name="quick_start_list_review_pages_subtitle">לבדוק את העמודים ולבצע שינויים או להוסיף ולהסיר עמודים.</string>
+    <string name="quick_start_card_menu_unpin">להסיר את הנעץ מהתוכן</string>
+    <string name="quick_start_list_view_site_title">מעבר לאתר שלך</string>
+    <string name="quick_start_list_upload_icon_subtitle">להוסיף סמל לאתר למראה נקי ומקצועי.</string>
+    <string name="quick_start_list_follow_site_subtitle">לגלות אתרים שמספקים לך השראה ולעקוב אחריהם.</string>
+    <string name="quick_start_list_enable_sharing_title">להפעיל את השיתוף</string>
+    <string name="quick_start_list_enable_sharing_subtitle">לשתף באופן אוטומטי פוסטים חדשים ברשתות החברתיות.</string>
+    <string name="quick_start_list_update_site_title_subtitle">כדאי לתת לאתר שלך שם שמשקף את האישיות שלו והנושאים שמוצגים בו.</string>
+    <string name="quick_start_list_check_stats_title">לבדוק את הנתונים הסטטיסטיים שלך</string>
+    <string name="backup_download_status_failure_bullet2">אנחנו נמשיך לנסות ליצור את קובץ הגיבוי שלך להורדה.</string>
+    <string name="backup_download_status_failure_bullet1">לא הצלחנו למצוא את הסטטוס כדי לציין כמה זמן צפויה להימשך היצירה של הגיבוי להורדה.</string>
+    <string name="backup_download_status_failure_heading">ניסינו אבל לא הצלחנו למצוא את הסטטוס של הגיבוי להורדה</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">סמל ביקורת</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">סמל שעון</string>
+    <string name="restore_status_failure_bullet3">אנחנו נודיע לך כאשר הפעולה תושלם.</string>
+    <string name="restore_status_failure_bullet2">אנחנו עדיין ננסה לשחזר את האתר שלך.</string>
+    <string name="restore_status_failure_bullet1">לא הצלחנו למצוא את הסטטוס כדי לציין כמה זמן צפוי להימשך השחזור.</string>
+    <string name="restore_status_failure_heading">ניסינו אבל לא הצלחנו למצוא את הסטטוס של השחזור</string>
+    <string name="restore_complete_failed_description">לא הצלחנו לשחזר את האתר שלך</string>
+    <string name="restore_warning_action_button">אישור</string>
+    <string name="restore_warning_description_with_two_parameters">האם ברצונך להחזיר את האתר לגרסה ממועד ⁦%1$s⁩ בשעה ⁦%2$s⁩?\n        כל השינויים שבוצעו לאחר מועד זה יאבדו.</string>
+    <string name="backup_download_complete_failed_description">לא הצלחנו ליצור את הגיבוי שלך</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(לא כולל ערכות עיצוב, תוספים והעלאות)</string>
+    <string name="backup_item_contents">ספריית WP-content</string>
+    <string name="backup_item_roots">בסיס של WordPress</string>
+    <string name="backup_download_details_choose_items_header">הפריטים שכלולים בהורדה זו</string>
+    <string name="gutenberg_native_uploading">מעלה…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">לא ניתן לערוך בלוקים לשימוש חוזר ב-WordPress ל-iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">לא ניתן לערוך בלוקים לשימוש חוזר ב-WordPress ל-Android</string>
+    <string name="gutenberg_native_replace_file">להחליף את הקובץ</string>
+    <string name="gutenberg_native_replace_audio">להחליף אודיו</string>
+    <string name="gutenberg_native_problem_opening_the_audio">בעיה בפתיחת האודיו</string>
+    <string name="gutenberg_native_open">לפתוח</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">אין אפליקציה שיכולה לטפל בבקשה הזאת.</string>
+    <string name="gutenberg_native_lock_icon">סמל מנעול</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">נכשלה ההוספה של קובץ האודיו. יש להקיש לאפשרויות.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">יש להקיש פעמיים כדי לבחור קובץ אודיו</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">יש להקיש פעמיים כדי להאזין לקובץ האודיו</string>
+    <string name="gutenberg_native_choose_audio">לבחור אודיו</string>
+    <string name="gutenberg_native_audio_player">לנגן אודיו</string>
+    <string name="gutenberg_native_audio_file">קובץ אודיו</string>
+    <string name="gutenberg_native_audio_caption_s">תיאור אודיו. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">תיאור אודיו. ריק</string>
+    <string name="gutenberg_native_add_audio">להוסיף אודיו</string>
+    <string name="continue_with_wpcom">יש להתחבר או להירשם עם WordPress.com</string>
+    <string name="photo_picker_use_audio">להשתמש באודיו זה</string>
+    <string name="photo_picker_choose_audio">לבחור אודיו מהמכשיר</string>
+    <string name="people_optional_custom_message_helper_text">אופציונלי: ניתן להזין הודעה מותאמת אישית שתישלח עם ההזמנה.</string>
+    <string name="people_learn_more_about_roles">למידע נוסף על תפקידים</string>
+    <string name="threat_status_fixed">תוקן</string>
+    <string name="threat_found_header">נמצא</string>
+    <string name="scan_here_to_help">אנחנו פה לעזור</string>
+    <string name="scan_idle_threats_description_singular">הסריקה איתרה איום פוטנציאלי אחד עם ⁦%1$s⁩. עליך לבדוק את האיום למטה ולנקוט פעולה או להקיש על הכפתור \'לתקן הכול\'. אנחנו ⁦%2$s⁩ אם נדרשת עזרה.</string>
+    <string name="scan_idle_manual_scan_description">כדי לבדוק את האתר שלך שוב, יש להפעיל סריקה ידנית או להמתין לסריקה על ידי Jetpack מאוחר יותר היום.</string>
+    <string name="scan_provisioning_description">ברוך בואך ל-Jetpack Scan! אנחנו מכינים את האתר לסריקה מלאה. אנחנו נודיע לך אם נמצא בעיות כלשהן שעלולות להפריע לסריקה ולאחר מכן, הסריקה הראשונה שלך תתחיל.</string>
+    <string name="scan_scanning_is_initial_description">ברוך בואך ל-Jetpack Scan, אנחנו בודקים כעת את האתר שלך לראשונה ומייד נעדכן אותך בתוצאות.</string>
+    <string name="scan_scanning_description">אנחנו נשלח אליך הודעה כאשר הסריקה תושלם. בינתיים, אפשר להמשיך להשתמש באתר כרגיל ולחזור לבדוק את ההתקדמות בכל שלב.</string>
+    <string name="scan_fixing_threats_description_singular">אנחנו משקיעים המון מאמצים ברקע כדי לתקן את האיום הזה. בינתיים, אפשר להמשיך להשתמש באתר כרגיל ולחזור לבדוק את ההתקדמות בכל שלב.</string>
+    <string name="scan_start_request_failed_subtitle">ל-Jetpack Scan לא הייתה אפשרות להשלים את הסריקה של האתר שלך. יש לבדוק אם האתר מושבת – אם לא, יש לנסות שוב. אם האתר מושבת או אם עדיין יש בעיות בהפעלה של Jetpack Scan, עליך ליצור קשר עם צוות התמיכה.</string>
+    <string name="scan_fixing_threats_title_plural">מתקן את האיומים</string>
+    <string name="scan_request_failed_title">משהו השתבש</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">מגבה את האתר</string>
+    <string name="activity_log_currently_backing_up_message">גיבוי האתר מתאריך ⁦%1$s⁩ %2$s</string>
+    <string name="activity_log_currently_backing_up_title">יוצר גיבוי להורדה</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">הגיבוי של האתר שלך בוצע בהצלחה</string>
+    <string name="activity_log_backup_finished_snackbar_message">הגיבוי של האתר שלך בוצע בהצלחה\nגיבוי נוצר מתאריך ⁦%1$s⁩ %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">הגיבוי של האתר שלך מתבצע כעת\nהגיבוי מתבצע מתאריך ⁦%1$s⁩ %2$s</string>
+    <string name="pick_audio">לבחור אודיו</string>
+    <string name="restore_complete_failed_icon_content_description">סמל שגיאה</string>
+    <string name="restore_complete_failed_action_button_content_description">כפתור \'בוצע\'</string>
+    <string name="restore_another_process_running">יש שחזור נוסף שפועל כרגע.</string>
+    <string name="restore_complete_failed_title">השחזור נכשל</string>
+    <string name="restore_complete_visit_site_button_content_description">כפתור \'לבקר באתר\'</string>
+    <string name="restore_complete_done_button_content_description">כפתור \'בוצע\'</string>
+    <string name="restore_complete_icon_content_description">סמל \'שחזור\'</string>
+    <string name="restore_complete_visit_site_action_button">לבקר באתר</string>
+    <string name="restore_complete_description_with_two_parameters">כל הפריטים שבחרת שוחזרו לגרסה מתאריך ⁦%1$s⁩ %2$s.</string>
+    <string name="restore_complete_header">האתר שלך שוחזר</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">אין צורך לשהות כאן ולהמתין. אנחנו נודיע לך כאשר השחזור של האתר שלך הסתיים.</string>
+    <string name="restore_progress_icon_content_description">סמל \'לשחזר את האתר\'</string>
+    <string name="restore_progress_description_with_two_parameters">אנחנו משחזרים את האתר שלך לגרסה מתאריך ⁦%1$s⁩ %2$s.</string>
+    <string name="restore_progress_header">אנחנו משחזרים כעת את האתר שלך</string>
+    <string name="restore_warning_action_button_content_description">כפתור \'לאשר את שחזור האתר\'</string>
+    <string name="restore_warning_icon_content_description">תמונה של עיגול אדום עם סימן קריאה</string>
+    <string name="restore_warning_header">אזהרה</string>
+    <string name="restore_details_action_button_content_description">כפתור \'לשחזר את האתר\'</string>
+    <string name="restore_details_icon_content_description">סמל \'שחזור\'</string>
+    <string name="restore_details_action_button">לשחזר את האתר</string>
+    <string name="restore_details_description_with_two_parameters">המועד ⁦%1$s⁩ ⁦%2$s⁩ הוא המועד שנבחר לשחזור האתר.</string>
+    <string name="restore_details_header">לשחזר את האתר</string>
+    <string name="restore_details_choose_items_header">יש לבחור את הפריטים לשחזור:</string>
+    <string name="restore">לשחזר</string>
+    <string name="backup_download_complete_failed_icon_content_description">סמל ענן עם X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">כפתור \'בוצע\'</string>
+    <string name="backup_download_complete_failed_action_button">סיימתי</string>
+    <string name="backup_download_complete_failed_title">ההורדה נכשלה</string>
+    <string name="web_preview_tablet">טאבלט</string>
+    <string name="web_preview_mobile">טלפון נייד</string>
+    <string name="quick_start_card_menu_remove">לא להציג שוב</string>
+    <string name="quick_start_dialog_review_pages_message_short">יש לבחור באפשרות ⁦%1$s⁩ עמודים ⁦%2$s⁩ כדי להציג את רשימת העמודים שלך.</string>
+    <string name="quick_start_dialog_review_pages_message">לשנות, להוסיף או להסיר עמודים באתר.</string>
+    <string name="quick_start_dialog_review_pages_title">לבדוק עמודים באתר</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">יש לבחור באפשרות ⁦%1$s⁩ עמוד הבית ⁦%2$s⁩ כדי לערוך את עמוד הבית.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">יש לבחור באפשרות ⁦%1$s⁩ עמודים ⁦%2$s⁩ כדי להציג את רשימת העמודים שלך.</string>
+    <string name="quick_start_card_menu_pin">לנעוץ את הפריט</string>
+    <string name="quick_start_dialog_edit_homepage_message">לשנות, להוסיף או להסיר תוכן בעמוד הבית של האתר.</string>
+    <string name="quick_start_dialog_edit_homepage_title">לערוך את עמוד הבית</string>
+    <string name="reader_menu_mark_as_unseen">לסמן כ\'לא נקרא\'</string>
+    <string name="reader_menu_mark_as_seen">לסמן כ\'נקרא\'</string>
+    <string name="error_media_upload_failed_for_reason">העלאת המדיה נכשלה.\n%1$s</string>
+    <string name="error_media_not_enough_storage">אין מספיק שטח אחסון זמין באתר</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">לא ניתן לשנות את המצב \'נקרא\' בפוסט זה</string>
+    <string name="reader_marked_post_as_unseen">הפוסט סומן כ\'לא נקרא\'</string>
+    <string name="reader_marked_post_as_seen">הפוסט סומן כ\'נקרא\'</string>
+    <string name="threat_fix_all_status_error_message">שגיאה בקבלה של מצב התיקון. יש לפנות לתמיכה שלנו.</string>
+    <string name="threat_fix_all_error_message">שגיאה בתיקון האיומים. יש לפנות לתמיכה שלנו.</string>
+    <string name="threat_fix_all_status_success_message_singular">האיום תוקן בהצלחה.</string>
+    <string name="threat_fix_all_confirmation_message_singular">עליך לאשר שברצונך לתקן איום פעיל אחד.</string>
+    <string name="threat_fix_all_warning_title">לתקן את כל האיומים</string>
+    <string name="threat_ignore_error_message">אירעה שגיאה בעת התעלמות מהאיום. יש לפנות לתמיכה.</string>
+    <string name="threat_ignore_success_message">התעלמת מהאיום.</string>
+    <string name="threat_ignore_warning">לא כדאי להתעלם מבעיות אבטחה אלא אם אין לך ספק שהתוכן בטוח. אם ברצונך להתעלם מהאיום הזה, הוא יישאר באתר &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">אירעה שגיאה בעת תיקון האיום. יש לפנות לתמיכה שלנו.</string>
+    <string name="threat_item_sub_header_status_ignored">התעלמת מהאיום</string>
+    <string name="threat_fixing">מתקן את האיום</string>
+    <string name="scan_history_ignored_threats_tab">התעלמת מהאיום</string>
+    <string name="scan_history_no_threats_found">לא נמצאו פריטים</string>
+    <string name="scan_history_fixed_threats_tab">תוקן</string>
+    <string name="scan_history_all_threats_tab">הכול</string>
+    <string name="scan_scanning_title">סורק קבצים</string>
+    <string name="scan_preparing_to_scan_title">מתכונן לסריקה</string>
+    <string name="scan_history_menu_title">היסטוריה</string>
+    <string name="scan_history">היסטוריית סריקות</string>
+    <string name="backup_active_filter_empty_subtitle">כדאי לנסות להתאים את טווח התאריכים</string>
+    <string name="backup_active_filter_empty_title">לא נמצאו גיבויים תואמים</string>
+    <string name="backup_empty_subtitle">הגיבוי הראשון שלך יופיע כאן תוך 24 שעות ואנחנו נשלח לך הודעה כאשר הגיבוי יושלם</string>
+    <string name="threat_item_sub_header_status_fixed_on">האיומים תוקנו בתאריך %s</string>
+    <string name="backup_empty_title">הגיבוי הראשון שלך יהיה מוכן בקרוב</string>
+    <string name="request_failed_message">הייתה בעיה לטפל בבקשה הזאת. יש לנסות שוב מאוחר יותר.</string>
+    <string name="gutenberg_native_move_to_bottom">להעביר לתחתית</string>
+    <string name="gutenberg_native_change_block_position">לבדוק את מיקום הבלוק</string>
+    <string name="label_control_upload">להעלות</string>
+    <string name="jetpack_icon_content_description">סמל</string>
+    <string name="backup_download_complete_info">בנוסף, שלחנו לך הודעת אימייל עם קישור לקובץ שלך.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">כפתור לשיתוף הקישור</string>
+    <string name="backup_download_complete_download_action_button_content_description">כפתור ההורדה</string>
+    <string name="backup_download_complete_icon_content_description">סמל \'הגיבוי להורדה מוכן\'</string>
+    <string name="backup_download_complete_download_share_action_button">שיתוף הקישור</string>
+    <string name="backup_download_complete_download_action_button">הורדה</string>
+    <string name="backup_download_complete_description_with_two_parameters">יצרנו בהצלחה גיבוי של האתר שלך מתאריך ⁦%1$s⁩ %2$s.</string>
+    <string name="backup_download_complete_header">הגיבוי שלך כעת מוכן להורדה</string>
+    <string name="backup_download_complete_page_title">הגיבוי שלך</string>
+    <string name="backup_download_progress_icon_content_description">סמל \'יוצר גיבוי להורדה\'</string>
+    <string name="backup_download_progress_description_with_two_parameters">אנחנו יוצרים גיבוי להורדה של האתר שלך מתאריך ⁦%1$s⁩ %2$s.</string>
+    <string name="backup_download_progress_header">אנחנו כעת יוצרים גיבוי של האתר שלך להורדה</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">אין צורך לשהות כאן ולהמתין. אנחנו נודיע לך כאשר הגיבוי לך יהיה מוכן להורדה.</string>
+    <string name="backup_download_progress_page_title">להוריד גיבוי</string>
+    <string name="backup_download_another_download_running">יש הורדה נוספת שמופעלת כרגע.</string>
+    <string name="backup_download_generic_failure">הייתה בעיה בטיפול בבקשה הזאת. יש לנסות שוב מאוחר יותר.</string>
+    <string name="backup_download_details_action_button_content_description">כפתור \'ליצור גיבוי להורדה\'</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s ⁦%2$s⁩ הוא המועד שנבחר ליצירת הגיבוי להורדה.</string>
+    <string name="gutenberg_native_image_link_url">כתובת URL לקישור התמונה</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">crosspost</string>
+    <string name="suggestion_user">משתמש</string>
+    <string name="threat_get_free_estimate">הערכה חינם</string>
+    <string name="threat_ignore">להתעלם מהאיום</string>
+    <string name="threat_fix">לתקן את האיום</string>
+    <string name="threat_fix_fixable_default">הסריקה של Jetpack Scan תפתור את האיום הזה.</string>
+    <string name="threat_fix_fixable_edit">השירות של Jetpack Scan יערוך את הקובץ או הספרייה שהושפעו.</string>
+    <string name="threat_fix_fixable_update">השירות של Jetpack Scan יתעדכן לגרסה חדשה יותר (%s).</string>
+    <string name="threat_fix_fixable_delete">הסריקה של Jetpack Scan תמחק את הקובץ או הספרייה שהושפעו.</string>
+    <string name="suggestion_no_matching">לא נמצאה התאמה ל-%s.</string>
+    <string name="suggestion_problem">הייתה בעיה בטעינת ההצעות.</string>
+    <string name="suggestion_none">אין הצעות זמינות של %s.</string>
+    <string name="suggestion_selection_needed">יש להקליד כדי לסנן את רשימת ההצעות.</string>
+    <string name="threat_fix_fixable_replace">הסריקה של Jetpack Scan תחליף את הקובץ או הספרייה שהושפעו.</string>
+    <string name="threat_fix_current_not_fixable_description">השירות של Jetpack Scan לא יכול לתקן את האיום הזה באופן אוטומטי.\n אנחנו מציעים לפתור את האיום באופן ידני: יש לוודא ש-WordPress, ערכת העיצוב שלך וכל התוספים שלך מעודכנים ולהסיר מאתר האינטרנט שלך את הקוד, ערכת העיצוב או התוסף שגרמו לבעיה. \n \n\nאם נדרשת לך עזרה נוספת בפתרון האיום הזה, אנחנו מציעים להשתמש בשירות של &lt;b&gt;Codeable&lt;/b&gt;, זהו מאגר של פרילנסרים שכולל מומחי WordPress נחשבים.\n במאגר יש קבוצה נבחרת של מומחי אבטחה שיכולים לאזור עם פרויקטים כאלה. התמחור נע בין 70 $ ל-120 $ לשעה. אפשר לקבל הערכה בחינם, ללא התחייבות.</string>
+    <string name="threat_fix_current_not_fixable_header">תיקון האיום</string>
+    <string name="threat_fix_fixed_header">איך הבעיה תוקנה על ידי Jetpack?</string>
+    <string name="threat_fix_default_header">איך נתקן את זה?</string>
+    <string name="threat_file_description">נמצא איום בקובץ:</string>
+    <string name="threat_technical_details_header">הפרטים הטכניים</string>
+    <string name="threat_problem_header">מתי הבעיה התרחשה?</string>
+    <string name="threat_details">פרטי האיום</string>
+    <string name="threat_item_sub_header_vulnerable_theme">מאפיינים פגיעים שנמצאו בערכת העיצוב</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">מאפיינים פגיעים שנמצאו בתוסף</string>
+    <string name="threat_item_sub_header_file_signature">אותר איום %s</string>
+    <string name="threat_item_sub_header_core_file">מאפיינים פגיעים שנמצאו ב-WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">מאפיינים פגיעים שונים</string>
+    <string name="threat_item_header_vulnerable_theme">ערכת עיצוב פגיעה: %s (גרסה %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">תוסף פגיע: %s (%s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: תבנית קוד זדוני</string>
+    <string name="threat_item_header_database_threat">%s איומים בבסיס הנתונים</string>
+    <string name="threat_item_header_infected_core_file">%s: קובץ ליבה נגוע</string>
+    <string name="threat_item_header_threat_found">אותר איום</string>
+    <string name="scan_this_site">האתר הזה</string>
+    <string name="scan_idle_last_scan_description">השירות של Jetpack Scan פעל %s ולא איתר סיכונים. %s</string>
+    <string name="scan_in_few_seconds">לפני מספר שניות</string>
+    <string name="threats_fix_all">לתקן הכול</string>
+    <string name="scan_idle_threats_found_title">ייתכן שהאתר שלך בסיכון</string>
+    <string name="scan_idle_no_threats_found_title">אל דאגה</string>
+    <string name="scan_again">לסרוק שוב</string>
+    <string name="scan_now">לסרוק עכשיו</string>
+    <string name="scan_state_icon">סמל של מצב סריקה</string>
+    <string name="backup">גיבוי</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">מסנן סוג פעילות (%s סוגים נבחרו)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (מציג %s פריטים)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">מסנן סוג פעילות</string>
+    <string name="activity_log_activity_type_empty_subtitle">לא נרשמה פעילות בטווח התאריכים שנבחר.</string>
+    <string name="activity_log_activity_type_empty_title">אין פעילויות זמינות</string>
+    <string name="activity_log_activity_type_error_subtitle">יש לבדוק את החיבור לאינטרנט ולנסות שוב.</string>
+    <string name="activity_log_activity_type_error_title">אין חיבור</string>
+    <string name="activity_log_activity_type_filter_active_label">סוג הפעילות (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">מסנן טווח תאריכים</string>
+    <string name="activity_log_active_filter_empty_subtitle">יש להתאים את המסננים של טווח התאריכים או של סוג הפעילות</string>
+    <string name="activity_log_active_filter_empty_title">לא נמצאו אירועים תואמים</string>
+    <string name="backup_item_media_uploads">העלאות מדיה</string>
+    <string name="backup_item_plugins">תוספים של WordPress</string>
+    <string name="backup_item_themes">ערכות עיצוב של WordPress</string>
+    <string name="backup_download_details_icon_content_description">סמל ליצירת גיבוי להורדה</string>
+    <string name="backup_item_sqls">בסיס הנתונים של האתר</string>
+    <string name="backup_item_roots_hint">(כולל wp-config.php וקבצים שאינם WordPress)</string>
+    <string name="backup_download_details_action_button">ליצור קובץ להורדה</string>
+    <string name="backup_download_details_header">ליצור גיבוי להורדה</string>
+    <string name="backup_download_details_page_title">להוריד גיבוי</string>
+    <string name="backup_download">הורדת גיבוי</string>
+    <string name="gutenberg_native_error">שגיאה</string>
+    <string name="gutenberg_native_choose_file">לבחור קובץ</string>
+    <string name="activity_log_item_menu_download_backup_label">להוריד גיבוי</string>
+    <string name="activity_log_item_menu_restore_label">לשחזר לנקודה זאת</string>
+    <string name="activity_log_activity_type_filter_label">סוג הפעילות</string>
+    <string name="activity_log_date_range_filter_label">טווח תאריכים</string>
+    <string name="activity_log_activity_type_filter_header">לסנן לפי סוג הפעילות</string>
+    <string name="dialog_confirm_copy_local_copy_button">להעתיק את הגרסה מהאפליקציה הזאת</string>
+    <string name="dialog_confirm_copy_local_edit_button">לערוך את הפוסט קודם כל</string>
+    <string name="dialog_confirm_copy_local_message">לפוסט שברצונך להעתיק קיימות שתי גרסאות שונות זו מזו, או שערכת את הפוסט אבל לא שמרת את השינויים.\n עליך קודם לערוך את הפוסט כדי לפתור התנגשויות בין הגרסאות ואז להמשיך בפעולת ההעתקה של הגרסה מהאפליקציה.</string>
+    <string name="dialog_confirm_copy_local_title">התנגשות בסנכרון הפוסט</string>
+    <string name="button_copy">לשכפל</string>
+    <string name="toast_edit_story_update_in_progress_title">הסטורי נשמר, רק רגע…</string>
+    <string name="gutenberg_native_file_name">שם קובץ</string>
+    <string name="gutenberg_native_file_block_settings">הגדרות של בלוק הקובץ</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">העלאת קבצים נכשלה.\nיש להקיש לאפשרויות.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">שמירת הקבצים נכשלה.\nיש להקיש לאפשרויות.</string>
+    <string name="gutenberg_native_edit_file">לערוך קובץ</string>
+    <string name="gutenberg_native_copy_file_url">להעתיק כתובת URL של קובץ</string>
+    <string name="gutenberg_native_choose_a_file">לבחור קובץ</string>
+    <string name="new_site_creation_domain_header_title">לבחור דומיין</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">לא ניתן היה לבטל את ההרשמה מהתגובות לפוסט זה</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">לא ניתן היה להירשם לתגובות לפוסט זה</string>
+    <string name="reader_follow_comments_get_status_error">שגיאה בהבאת מצב ההרשמה לפוסט</string>
+    <string name="reader_follow_comments_unsubscribe_success">ביטלת בהצלחה את ההרשמה לתגובות</string>
+    <string name="reader_btn_following_comments">הופעל מעקב אחר השיחה באמצעות האימייל</string>
+    <string name="reader_btn_follow_comments">לעקוב אחר השיחה באמצעות האימייל</string>
+    <string name="my_site_btn_jetpack_settings">הגדרות Jetpack</string>
+    <string name="reader_follow_comments_subscribe_success">נרשמת בהצלחה לתגובות</string>
+    <string name="reader_follow_comments_bad_format_response">התקבלה תגובה לא חוקית</string>
+    <string name="reader_follow_comments_null_response">לא התקבלו תגובות</string>
+    <string name="activity_log_activity_type_filter_clear">לנקות</string>
+    <string name="activity_log_activity_type_filter_apply">להחיל</string>
+    <string name="dialog_edit_story_unsupported_format_message">לפחות שקופית אחת לא נוספה לסטורי שלך מאחר שסטוריז לא תומכים בקובצי GIF כרגע. במקום, יש לבחור תמונה סטטית או וידאו לרקע.</string>
+    <string name="dialog_edit_story_unsupported_format_title">קובצי GIF לא נתמכים</string>
+    <string name="dialog_edit_story_unrecoverable_message">מצטערים, לא הצלחנו למצוא את המדיה לסטורי באתר זה.</string>
+    <string name="dialog_edit_story_unrecoverable_title">אין אפשרות לערוך את הסטורי</string>
+    <string name="dialog_edit_story_unavailable_message">לא ניתן לטעון את המדיה לסטורי הזה. יש לבדוק את החיבור שלך לאינטרנט ולנסות שוב עוד מעט.</string>
+    <string name="dialog_edit_story_unavailable_title">אין אפשרות לערוך את הסטורי</string>
+    <string name="dialog_edit_story_limited_message">הסטורי הזה נערך במכשיר שונה והאפשרות לערוך אובייקטים מסוימים עלולה להיות מוגבלת.</string>
+    <string name="dialog_edit_story_limited_title">עריכה מוגבלת של הסטורי</string>
+    <string name="cannot_retry_deleted_media_item_fatal">פריט המדיה הוסר. כדאי לנסות ליצור את הסיפור שלך מחדש.</string>
+    <string name="color_picker_label_background">רקע</string>
+    <string name="color_picker_label_text">טקסט</string>
+    <string name="dialog_discard_story_ok_button_edit">ביטול</string>
+    <string name="dialog_discard_story_message_edit">השינויים לא יישמרו.</string>
+    <string name="dialog_discard_story_title_edit">לבטל את השינויים?</string>
+    <string name="label_done_button">בוצע</string>
+    <string name="label_next_button">הבא</string>
+    <string name="delete_button_alt">למחוק</string>
+    <string name="hpp_choose_error">אירעה שגיאה בעת בחירת העיצוב.</string>
+    <string name="hpp_retry_error">יש לבדוק את החיבור לאינטרנט ולנסות שוב.</string>
+    <string name="hpp_error_subtitle">יש להקיש כדי לנסות שוב במצב מקוון.</string>
+    <string name="hpp_error_title">הפריסות אינן זמינות במצב לא מקוון</string>
+    <string name="continue_site_credentials">להמשיך עם פרטי הכניסה של החנות</string>
+    <string name="login_find_your_connected_email">למצוא את כתובת האימייל המחוברת שלך</string>
+    <string name="reader_discover_no_posts_button_text">לעקוב אחר נושאים</string>
+    <string name="reader_discover_no_posts_subtitle">כדאי לעקוב אחרי נושאים נוספים כדי להרחיב את החיפוש</string>
+    <string name="reader_discover_no_posts_title">אין פוסטים אחרונים</string>
+    <string name="reader_discover_empty_title">ברוך בואך!</string>
+    <string name="scan">לסרוק</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;ישראל ישראלי&lt;/b&gt; הגיב לפוסט שלך</string>
+    <string name="login_prologue_third_subtitle_two">קיבלת &lt;b&gt;‏50 ליקיים&lt;/b&gt; באתר שלך היום</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;ישראלה ישראלה&lt;/b&gt; סימנה לייק בפוסט שלך</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">תפריט בלוק לגלילה פתוח. יש לבחור בלוק.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">תפריט בלוק לגלילה סגור.</string>
+    <string name="hpp_skip_button">לדלג</string>
+    <string name="hpp_choose_button">לבחור</string>
+    <string name="hpp_subtitle">יש לבחור את הפריסה המועדפת עליך לעמוד הבית. אפשר לערוך ולהתאימה אישית מאוחר יותר.</string>
+    <string name="hpp_title">לבחור עיצוב</string>
+    <string name="mlp_network_error_subtitle">יש להקיש כדי לנסות שוב במצב מקוון או ליצור עמוד ריק בעזרת הכפתור למטה.</string>
+    <string name="mlp_network_error_title">הפריסות אינן זמינות במצב לא מקוון</string>
+    <string name="mlp_error_subtitle">יש להקיש כדי לנסות שוב או ליצור עמוד ריק בעזרת הכפתור למטה.</string>
+    <string name="mlp_error_title">הפריסות אינן זמינות בשל שגיאה</string>
+    <string name="prepublishing_nudges_add_category_button">להוסיף קטגוריה</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">קטגוריה חדשה</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">קטגוריות</string>
+    <string name="prepublishing_nudges_home_categories_not_set">לא הוגדר</string>
+    <string name="prepublishing_nudges_categories_action">קטגוריות</string>
+    <string name="login_prologue_fifth_caption_three">מוזיאונים בלונדון</string>
+    <string name="login_prologue_fifth_caption_two">המעריצים הכי נאמנים בעולם</string>
+    <string name="login_prologue_fifth_caption_one">העשירייה הפותחת של בתי הקפה שלי</string>
+    <string name="login_prologue_fifth_tag_six">פוליטיקה</string>
+    <string name="login_prologue_fifth_tag_five">מוזיקה</string>
+    <string name="login_prologue_fifth_tag_four">גינון</string>
+    <string name="login_prologue_fifth_tag_three">פוטבול</string>
+    <string name="login_prologue_fifth_tag_two">בישול</string>
+    <string name="login_prologue_fifth_tag_one">אומנות</string>
+    <string name="login_prologue_fifth_subtitle_three">רוקנרול שבועי</string>
+    <string name="login_prologue_fifth_subtitle_two">חדשות באינטרנט</string>
+    <string name="login_prologue_fifth_subtitle_one">פמלה גואן</string>
+    <string name="login_prologue_second_subtitle_two">העבודות של הצלם קמרון קרסטן הן השראה עצומה עבורי. את הטכניקות האלה אביא לידי ביטוי בפעם הבאה שאצור</string>
+    <string name="login_prologue_second_subtitle_one">לקבל השראה</string>
+    <string name="login_prologue_title_fourth">באמצעות ניתוחי עומק ניתן לעקוב אחר הצמיחה של קהל המבקרים.</string>
+    <string name="login_prologue_title_second">העורך העוצמתי הזה מאפשר לפרסם מכל מקום.</string>
+    <string name="login_prologue_title_first">ברוך בואך לכלי הפופולרי ביותר בעולם לבניית אתרי אינטרנט.</string>
+    <string name="login_prologue_title_third">להציג תגובות והודעות בזמן אמת.</string>
+    <string name="login_prologue_title_fifth">כדאי לעקוב אחר האתרים המועדפים שלך ולגלות בלוגים חדשים לקריאה.</string>
+    <string name="media_loading_failed">העלאת מדיה נכשלה</string>
+    <string name="reader_discover_recommended_blogs_header">אתרים למעקב</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">אנחנו מקדישים מאמץ רב כדי להוסיף עוד בלוקים בכל גרסה.</string>
     <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' לא נתמך באופן מלא</string>
     <string name="gutenberg_native_help_button">כפתור עזרה</string>
@@ -18,19 +458,16 @@ Language: he_IL
     <string name="stories_intro_title_first">הסטוריז החדשים מיועדים לכולם</string>
     <string name="stories_intro_image_caption_second">כותרת סטורי לדוגמה</string>
     <string name="stories_intro_image_caption_first">כיצד ליצור פוסט של סטורי</string>
-    <string name="stories_intro_main_subtitle">אנו מעניקים לך גישה מוקדמת אל \'פוסטים של סטורי\' ונשמח לראות אותך מתנסה בהם.</string>
     <string name="stories_intro_main_title">אנו שמחים להציג את האפשרות \'פוסטים של סטורי\'</string>
-    <string name="mlp_generic_error">אירעה שגיאה בעת הבאת הפריסות</string>
     <string name="mlp_notice_blank_page_created">נוצר עמוד ריק</string>
     <string name="mlp_notice_page_created">העמוד נוצר</string>
-    <string name="mlp_preview_title">תצוגה מקדימה של הפריסה</string>
     <string name="media_picker_soft_ask_permissions_denied">הגישה של ⁦%1$s⁩ אל תמונות שלך נדחתה. כדי לתקן זאת, יש לערוך את ההרשאות ולהפעיל את ⁦%2$s⁩ ואת ⁦%3$s⁩.</string>
     <string name="media_insert_failed">הכנסת המדיה נכשלה.</string>
     <string name="media_insert_failed_with_reason">הכנסת המדיה נכשלה: %s</string>
     <string name="photo_picker_wordpress_media_library">לבחור מתוך ספריית המדיה של WordPress</string>
     <string name="reader_label_toolbar_back">חזרה</string>
     <string name="reader_discover_empty_button_text">מתחילים כאן</string>
-    <string name="reader_discover_empty_title">לעקוב אחר נושאים כדי לגלות בלוגים חדשים</string>
+    <string name="reader_discover_empty_subtitle">לעקוב אחר נושאים כדי לגלות בלוגים חדשים</string>
     <string name="reader_post_details_header_by_author_name">לפי</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">לא ניתן לסמן את מקור ההפניה כזבל</string>
     <string name="stats_referrer_popup_unmark_as_spam">לבטל את הסימון כתגובת זבל</string>
@@ -41,10 +478,11 @@ Language: he_IL
     <string name="media_uploading_default">מעלה מדיה</string>
     <string name="gutenberg_native_select_item">לבחור פריט</string>
     <string name="gutenberg_native_search_or_type_url">לחפש או להקליד כתובת URL</string>
+    <string name="gutenberg_native_page_break">מעבר דף</string>
     <string name="gutenberg_native_add_this_telephone_link">להוסיף קישור למספר הטלפון</string>
     <string name="gutenberg_native_add_this_link">להוסיף את הקישור</string>
     <string name="gutenberg_native_add_this_email_link">להוסיף את הקישור לאימייל</string>
-    <string name="suggestion_no_connection">\"אין חיבור לאינטרנט.\nההצעות לא זמינות.\"</string>
+    <string name="suggestion_no_connection">אין חיבור לאינטרנט.\nההצעות לא זמינות.</string>
     <string name="typeface_label_shrikhand">מודגש</string>
     <string name="typeface_label_space_mono">מודרני</string>
     <string name="typeface_label_pacifico">משעשע</string>
@@ -53,25 +491,24 @@ Language: he_IL
     <string name="typeface_label_nunito">יומיומי</string>
     <string name="toast_capture_operation_permission_needed">עליך לתת לאפליקציה הרשאה להקליט אודיו כדי להקליט וידאו</string>
     <string name="mlp_selected_description">%s נבחר</string>
+    <string name="mlp_notselected_description">%s</string>
     <string name="login_get_link_by_email">לקבל קישור לכניסה באימייל</string>
     <string name="email_not_registered_wpcom">מצטערים, לא הצלחנו לאתר את חשבון ה-WordPress.com שמקושר לכתובת האימייל הזו.</string>
     <string name="permission_microphone">מיקרופון</string>
     <string name="comment_unable_to_show_error">לא ניתן להציג תגובה זו</string>
     <string name="media_browse_for_items">לחפש פריטים</string>
     <string name="reader_menu_report_post">דיווח על פוסט זה</string>
-    <string name="gutenberg_native_angle">זווית</string>
     <string name="reader_welcome_banner">ברוכים הבאים ל-Reader. גישה מהירה למיליוני בלוגים.</string>
     <string name="error_media_xmlrcp_server_error">אירעה שגיאת שרת פנימית</string>
     <string name="error_media_xmlrpc_not_allowed">הפעולה שביצעת לא מותרת</string>
     <string name="show_n_hidden_items_desc">⁦%1$s⁩ פריטים נוספים</string>
-    <string name="gutenberg_native_select_a_layout">לבחור פריסה</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">לתשומת ליבך: הפריסה של הטור עשויה להשתנות בהתאם לערכת העיצוב וגודל המסך</string>
+    <string name="gutenberg_native_select_a_layout">לבחור פריסה</string>
+    <string name="reader_discover_interests_header">אולי יעניין אותך</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">להסתיר</string>
     <string name="create_post_story_fab_tooltip">ליצור פוסט או סטורי</string>
     <string name="create_page_fab_tooltip">ליצור עמוד</string>
     <string name="create_post_fab_tooltip">ליצור פוסט</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">אולי יעניין אותך</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">להסתיר</string>
     <string name="gutenberg_native_video_caption_empty">כיתוב לווידאו. ריק</string>
     <string name="gutenberg_native_updates_the_title">מעדכן את שם האתר.</string>
     <string name="gutenberg_native_paste_block_after">להדביק את הבלוק אחרי</string>
@@ -108,7 +545,6 @@ Language: he_IL
     <string name="dialog_discard_errored_page_message">השקופית הזאת טרם נשמרה. אם השקופית תימחק, כל העריכות שביצעת יאבדו.</string>
     <string name="dialog_discard_page_message">השקופית תוסר מהסטורי שלך.</string>
     <string name="dialog_discard_page_title">האם למחוק את השקופית?</string>
-    <string name="menu_delete_page">למחוק את השקופית</string>
     <string name="label_text_color_button">לשנות את צבע הטקסט</string>
     <string name="label_text_alignment_button">לשנות את היישור של הטקסט</string>
     <string name="label_frame_errored">אירעה שגיאה</string>
@@ -118,8 +554,6 @@ Language: he_IL
     <string name="label_retry_icon">יש לנסות שוב</string>
     <string name="label_saved_icon">נשמר</string>
     <string name="label_close_button">לסגור</string>
-    <string name="label_control_publish">הבא</string>
-    <string name="label_done">בוצע</string>
     <string name="label_share_to">לשתף אל</string>
     <string name="label_snackbar_share">שיתוף</string>
     <string name="label_snackbar_loop_frame_saved">נשמר בתמונות</string>
@@ -130,7 +564,6 @@ Language: he_IL
     <string name="label_control_flip_camera">לשנות כיוון</string>
     <string name="sound_button_alt">שמע</string>
     <string name="text_button_alt">טקסט</string>
-    <string name="more_button_alt">עוד</string>
     <string name="stickers_button_alt">מדבקות</string>
     <string name="flash_button_alt">מבזק</string>
     <string name="flip_button_alt">לשנות את כיוון המצלמה</string>
@@ -139,9 +572,11 @@ Language: he_IL
     <string name="mlp_create_page">ליצור עמוד</string>
     <string name="mlp_create_blank_page">ליצור עמוד ריק</string>
     <string name="mlp_choose_layout_subtitle">ניתן להתחיל באמצעות בחירה ממגוון רחב של פריסות עמוד שהוכנו מראש. או פשוט להתחיל מעמוד ריק.</string>
-    <string name="mlp_choose_layout_title">יש לבחור פריסה</string>
     <string name="prepublishing_nudges_story_title_hint">להגדיר שם לסטורי</string>
-    <string name="quick_start_dialog_create_new_post_message_short">יש להקיש על ⁦%1$s⁩ כדי ליצור. ⁦%2$s⁩ לאחר מכן, יש לבחור &lt;b>פוסט בבלוג&lt;/b></string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">ליצור פוסט או סטורי</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">ליצור פוסט, עמוד או סטורי</string>
+    <string name="quick_start_dialog_create_new_post_message_short">יש להקיש על ⁦%1$s⁩ כדי ליצור. ⁦%2$s⁩ לאחר מכן, יש לבחור &lt;b&gt;פוסט בבלוג&lt;/b&gt;</string>
+    <string name="mlp_choose_layout_title">יש לבחור פריסה</string>
     <string name="photo_picker_choose_file">לבחור מהמכשיר</string>
     <string name="my_site_bottom_sheet_add_story">פוסט של סטורי</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">לעריכה של סמלי אתר באתרים באחסון עצמי ב-WordPress נדרש התוסף של Jetpack.</string>
@@ -155,13 +590,10 @@ Language: he_IL
     <string name="gutenberg_native_choose_image_or_video">לבחור תמונה או וידאו</string>
     <string name="gutenberg_native_choose_image">לבחור תמונה</string>
     <string name="gutenberg_native_block_removed">הבלוק הוסר</string>
-    <string name="content_description_logo">הלוגו של WordPress</string>
-    <string name="enter_your_site_address">יש להזין את כתובת האתר שלך</string>
-    <string name="continue_with_wpcom">להמשיך עם WordPress.com</string>
     <string name="signup_confirmation_title">אישור הרשמה</string>
     <string name="continue_with_google_terms_of_service_text">אם בחרת להמשיך עם Google או ועדיין אין לך חשבון ב-WordPress.com, חשבון ייווצר עבורך ויש הסכמה מצידך ⁦%1$s⁩לתנאי השירות⁦%2$s⁩ שלנו.</string>
+    <string name="enter_your_site_address">יש להזין את כתובת האתר החדש שלך</string>
     <string name="continue_terms_of_service_text">המשך הפעולה מהווה את הסכמתך ⁦%1$s⁩לתנאי השימוש⁦%2$s⁩ שלנו.</string>
-    <string name="signup_confirmation_magic_link_message">נשלח אליך אימייל עם קישור להרשמה כדי ליצור את חשבון חדש ב-WordPress.com.</string>
     <string name="signup_confirmation_message">אנחנו נשתמש בכתובת האימייל הזאת כדי ליצור את החשבון החדש שלך ב-WordPress.com.</string>
     <string name="signup_magic_link_message">שלחנו אליך אימייל עם קישור להרשמה כדי ליצור את החשבון החדש שלך ב-WordPress.com. עליך לבדוק את האימייל ממכשיר זה ולהקיש על הקישור בהודעה שקיבלת מ-WordPress.com.</string>
     <string name="enter_account_info_for_site">להזין את פרטי החשבון שלך ב-⁦%1$s⁩.</string>
@@ -178,18 +610,15 @@ Language: he_IL
     <string name="or_type_your_password">או להקליד את הסיסמה שלך</string>
     <string name="create_account">ליצור חשבון</string>
     <string name="send_link_by_email">לשלוח את הקישור באימייל</string>
-    <string name="login_promo_text_unlock_the_power">לעבוד עם בונה האתרים הכי הגמיש שיש.</string>
-    <string name="login_promo_title_37_percent">37\% מהאתרים ברשת בנויים על הפלטפורמה של WordPress.</string>
     <string name="reset_your_password">יש לאפס את הסיסמה שלך</string>
-    <string name="quick_start_list_update_site_title_subtitle">כדאי לתת לאתר שלך שם שמשקף את האישיות שלו והנושאים שמוצגים בו. הרושם הראשוני חשוב!</string>
+    <string name="reader_error_request_failed_title">הייתה בעיה בטיפול בבקשה הזאת. יש לנסות שוב מאוחר יותר.</string>
     <string name="quick_start_list_update_site_title_title">להגדיר את שם האתר שלך</string>
-    <string name="quick_start_dialog_update_site_title_message_short">יש להקיש &lt;b>⁦%1$s⁩&lt;/b> כדי להגדיר שם חדש</string>
+    <string name="quick_start_dialog_update_site_title_message_short">יש להקיש &lt;b&gt;⁦%1$s⁩&lt;/b&gt; כדי להגדיר שם חדש</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">העברת הפוסט לפח תבטל גם שינויים מקומיים, האם ברצונך להמשיך?</string>
     <string name="gutenberg_native_s_block_options">%s אפשרויות הבלוק</string>
     <string name="gutenberg_native_duplicate_block">לשכפל בלוק</string>
     <string name="gutenberg_native_copy_block">להעתיק בלוק</string>
     <string name="gutenberg_native_copied_block">הבלוק הועתק</string>
-    <string name="gutenberg_native_block_settings">הגדרות הבלוק</string>
     <string name="gutenberg_native_block_pasted">הבלוק הודבק</string>
     <string name="gutenberg_native_block_duplicated">הבלוק שוכפל</string>
     <string name="gutenberg_native_block_cut">הבלוק נחתך</string>
@@ -205,7 +634,6 @@ Language: he_IL
     <string name="gutenberg_native_gradient_type">סוג מעבר צבע</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">יש להקיש פעמיים כדי לבחור את האפשרות</string>
     <string name="gutenberg_native_customize_gradient">להתאים אישית את מעבר הצבע</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">מחבר העמוד</string>
     <string name="photo_picker_use_gif">להשתמש בקובץ GIF זה</string>
     <string name="error_media_thumbnail_not_loaded">לא ניתן לטעון את התמונה הממוזערת של המדיה</string>
@@ -215,7 +643,6 @@ Language: he_IL
     <string name="gutenberg_native_dismiss">ביטול</string>
     <string name="prepublishing_nudges_home_tags_not_set">לא הוגדר</string>
     <string name="prepublishing_tags_description">התגיות יעזרו לקוראים להבין מה הנושא של הפוסט.</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">תאריך פרסום</string>
     <string name="prepublishing_nudges_toolbar_title_tags">להוסיף תגיות</string>
     <string name="prepublishing_nudges_back_button">חזרה</string>
     <string name="prepublishing_nudges_home_save_button">לשמור כעת</string>
@@ -227,9 +654,8 @@ Language: he_IL
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">ביטול</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">להעביר לטיוטות</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">לא ניתן לערוך פוסטים שהועברו לפח. האם ברצונך לשנות את המצב של הפוסט ל\'טיוטה\' כדי לערוך אותו?</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">תאריך פרסום</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">האם להעביר את הפוסט ל\'טיוטות\'?</string>
-    <string name="reader_label_choose_your_interests">לבחור את תחומי העניין שלך</string>
-    <string name="reader_choose_interests_content_description">לבחור את תחומי העניין שלך</string>
     <string name="reader_btn_done">סיימתי</string>
     <string name="reader_btn_select_few_interests">יש לבחור מספר אפשרויות כדי להמשיך</string>
     <string name="post_status_post_published">פורסם</string>
@@ -238,25 +664,24 @@ Language: he_IL
     <string name="publish_date">תאריך פרסום</string>
     <string name="ccpa_privacy_notice_read">לעיון בהצהרת הפרטיות של CCPA</string>
     <string name="ccpa_privacy_notice_caption">לפי החוק California Consumer Privacy Act (החוק לפרטיות צרכנים של קליפורניה – CCPA), עלינו לספק לתושבי קליפורניה פרטים נוספים אודות הקטגוריות של המידע האישי שאנחנו אוספים ומשתפים, המקום שממנו אנחנו מקבלים את המידע האישי, האופן שבו אנחנו משתמשים בו והסיבה לשימוש.</string>
+    <string name="reader_label_choose_your_interests">לבחור את הנושאים שמעניינים אותך</string>
+    <string name="reader_choose_interests_content_description">לבחור את הנושאים שמעניינים אותך</string>
     <string name="ccpa_privacy_notice_header">הצהרת פרטיות למשתמשים מקליפורניה</string>
     <string name="status_and_visibility">מצב וניראות</string>
     <string name="update_now">לעדכן עכשיו</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">לנסות את הפריסה למתחילים</string>
     <string name="gutenberg_native_open_block_actions_menu">לפתוח את התפריט של פעולות הבלוק</string>
-    <string name="gutenberg_native_insert_mention">להוסיף אזכור</string>
+    <string name="gutenberg_native_move_to_top">להעביר לחלק העליון</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">יש להקיש פעמיים כדי לפתוח את גיליון הכפתורים עם האפשרויות הזמינות</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">יש להקיש פעמיים כדי לפתוח את גיליון הפעולות עם האפשרויות הזמינות</string>
     <string name="pages_cannot_be_started">אין לנו אפשרות לפתוח את העמודים כעת. יש לנסות שוב מאוחר יותר</string>
     <string name="pages_set_as_posts_page">להגדיר כעמוד פוסטים</string>
     <string name="pages_set_as_homepage">להגדיר כעמוד הבית</string>
-    <string name="suggestion_no_matching_users">\"לא נמצאו משתמשים מתאימים.\"</string>
-    <string name="suggestion_invalid_user">\"המשתמש %s לא חוקי\"</string>
     <string name="site_settings_select_page">לבחור עמוד</string>
     <string name="site_settings_posts_page">עמוד הפוסטים</string>
     <string name="site_settings_static_homepage">עמוד בית קבוע</string>
     <string name="site_settings_classic_blog">בלוג קלאסי</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">עמוד הבית והעמוד לפוסטים שנבחרו לא יכולים להיות זהים.</string>
+    <string name="suggestion_invalid">הפריט %s לא חוקי %s</string>
     <string name="site_settings_failed_update_homepage_settings">עדכון ההגדרות של עמוד הבית נכשל, כדאי לבדוק את החיבור לאינטרנט</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">לא ניתן היה לשמור את ההגדרות של עמוד הבית לפני טעינת העמודים</string>
     <string name="site_settings_failed_to_save_homepage_settings">לא ניתן היה לשמור את ההגדרות של עמוד הבית</string>
@@ -271,7 +696,6 @@ Language: he_IL
     <string name="page_homepage_successfully_updated">העדכון של עמוד הבית בוצע בהצלחה</string>
     <string name="page_cannot_set_posts_page">כדי להגדיר את עמוד הפוסטים, עליך להפעיל את \'עמוד בית קבוע\' בהגדרות האתר</string>
     <string name="page_cannot_set_homepage">כדי להגדיר את עמוד הבית, עליך להפעיל את \'עמוד בית קבוע\' בהגדרות האתר</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">ברוך בואך אל הבלוג החדש שלנו</string>
     <string name="gutenberg_native_select_a_color">לבחור צבע</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">יש להקיש פעמיים כדי לעבור להגדרות הצבע</string>
     <string name="reader_empty_followed_blogs_description">כאשר יש לך אתרים במעקב, התוכן שלהם יופיע כאן</string>
@@ -305,7 +729,6 @@ Language: he_IL
     <string name="gutenberg_native_move_block_left">להזיז את הבלוק שמאלה</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">להקיש פעמיים כדי להזיז את הבלוק ימינה</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">להקיש פעמיים כדי להזיז את הבלוק שמאלה</string>
-    <string name="gutenberg_native_blog">בלוג</string>
     <string name="new_site_creation_creating_site_loading_4">יוצר לוח בקרה</string>
     <string name="new_site_creation_creating_site_loading_3">להגדיר ערכת עיצוב</string>
     <string name="new_site_creation_creating_site_loading_2">מוסיף תכונות אתר</string>
@@ -327,12 +750,12 @@ Language: he_IL
     <string name="media_accessing_failed">נכשלה הגישה לתוכן באתר פרטי. חלק מפרטי המדיה עלולים להיות לא זמינים</string>
     <string name="media_accessing_progress">ניגש לתוכן של אתר פרטי</string>
     <string name="error_failed_to_crop_and_save_image">פעולת החיתוך והשמירה של התמונה נכשלה, יש לנסות שוב.</string>
-    <string name="failed_to_load_image_tap_to_retry">הטעינה של התמונה נכשלה.\nיש להקיש כדי לנסות שוב.</string>
     <string name="preview_image_description">להציג תצוגה מקדימה של התמונה</string>
     <string name="error_unknown_page_type">פורמט עמוד לא ידוע</string>
     <string name="error_page_not_submitted">לא הצלחנו להשלים את הפעולה ולא שלחנו את העמוד לבדיקה.</string>
     <string name="error_page_not_scheduled">לא הצלחנו להשלים את הפעולה ולא תזמנו את העמוד.</string>
     <string name="error_page_not_published_private">לא הצלחנו להשלים את הפעולה ולא פרסמנו את העמוד הפרטי הזה.</string>
+    <string name="failed_to_load_image_tap_to_retry">הטעינה של התמונה נכשלה.\nיש להקיש כדי לנסות שוב.</string>
     <string name="error_page_not_published">לא הצלחנו להשלים את הפעולה ולא פרסמנו את העמוד.</string>
     <string name="error_page_not_submitted_retrying">לא הצלחנו לשלוח את העמוד לבדיקה אבל ננסה שוב מאוחר יותר. </string>
     <string name="error_page_not_scheduled_retrying">לא הצלחנו לתזמן את העמוד אבל ננסה שוב מאוחר יותר.</string>
@@ -361,57 +784,20 @@ Language: he_IL
     <string name="app_theme_light">צבעים בהירים</string>
     <string name="app_theme">מראה</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">לאחרונה ביצעת שינויים בעמוד וטרם שמרת אותם. לבחור גרסה לטעינה:\n\n</string>
-    <string name="gutenberg_native_what_people_say">מה אנשים אומרים</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">יש לנו מגוון שירותים שיעזרו לך לקבל את התוצאות שנדרשות לך. אין לך מושג מה נדרש לך ומה העלות? אנחנו יכולים להסביר לך אילו שירותים רלוונטיים עבורך ומה הם התעריפים שלנו. אפשר ליצור איתנו קשר למטה.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">אנחנו צוות קטן של אנשי מקצוע מוכשרים עם מגוון רחב של כישורים וניסיון מקצועי. אנחנו אוהבים את המקצוע שלנו ואת העבודה שאנחנו עושים. אנו מצפים לעבוד איתך.</string>
-    <string name="gutenberg_native_warning_message">הודעת אזהרה</string>
-    <string name="gutenberg_native_want_to_work_with_us">רוצה לעבוד איתנו?</string>
-    <string name="gutenberg_native_walt_disney">וולט דיסני</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">המבקרים ישמחו לדעת מי עומד מצידו השני של העמוד. כדאי להשתמש בשטח הזה כדי לכתוב על עצמך, האתר והעסק שלך או להוסיף כל מידע אחר כרצונך. אפשר להשתמש בהמלצות למטה כדי לצטט אחרים שמדברים על נושא מסוים – במילים שלהם.</string>
-    <string name="gutenberg_native_usa">ארה\"ב</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">זהו תוכן לדוגמה שכלול בתבנית כדי לשקף את התכונות שלה. אפשר להסיר או להחליף אותו עם טקסט או מדיה משלך.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">הדרך הכי טובה להתחיל היא להפסיק לדבר ולהתחיל לעשות.</string>
-    <string name="gutenberg_native_team">צוות</string>
-    <string name="gutenberg_native_success_message">הודעת הצלחה</string>
-    <string name="gutenberg_native_strategy">אסטרטגיה</string>
     <string name="gutenberg_native_show_post_content">להציג את תוכן הפוסט</string>
-    <string name="gutenberg_native_services">שירותים</string>
-    <string name="gutenberg_native_samuel_the_dog">סמואל הכלבלב</string>
-    <string name="gutenberg_native_sally_smith">סאלי סמית\'</string>
-    <string name="gutenberg_native_project_name">שם הפרויקט</string>
-    <string name="gutenberg_native_position_or_job_title">כותרת התפקיד או המשרה</string>
-    <string name="gutenberg_native_portfolio">תיק עבודות</string>
     <string name="gutenberg_native_only_show_excerpt">להציג את התקציר בלבד</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">תיק העבודות שלי מציג מספר פרויקטים שיצרתי במהלך הקריירה. פרטי הקשר שלי למטה ואשמח אם תצרו קשר.</string>
     <string name="gutenberg_native_link_to">קישור אל</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">נשמח לשוחח 👋 אפשר ליצור איתנו קשר ללא היסוס באמצעות הפרטים שלמטה, או לשלוח לנו הודעה באמצעות הטופס.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">נשמח לבנות משהו ביחד!</string>
-    <string name="gutenberg_native_let_s_build_something_together">נשמח לבנות משהו ביחד!</string>
-    <string name="gutenberg_native_juan_p_rez">חואן פרז</string>
-    <string name="gutenberg_native_j_k_rowling">ג\'יי קיי רולינג</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">הבחירות שלנו, הארי, משקפות מי אנחנו באמת הרבה יותר מהיכולות שלנו.</string>
-    <string name="gutenberg_native_inspiration">השראה</string>
-    <string name="gutenberg_native_get_in_touch">מצפים לשמוע ממך</string>
+    <string name="gutenberg_native_link_settings">הגדרות הקישור</string>
     <string name="gutenberg_native_excerpt_length_words">אורך התקציר (מילים)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">שלחו לי אימייל: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">דוקטור סוס</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">חבל לבכות כי החוויה שהסתיימה, כדאי לחייך כי החוויה התרחשה.</string>
     <string name="gutenberg_native_customize">התאמה אישית</string>
-    <string name="gutenberg_native_city_10100">עיר מגורים, 10100</string>
     <string name="gutenberg_native_add_paragraph_block">להוסיף בלוק פסקה רגילה</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">תיאור קצר של השירותים שמוצעים על ידך.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">ביוגרפיה קצרה שכוללת היסטוריה אישית, הישגים מרכזיים או עובדות מעניינות.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">תיאור של הפרויקט ושל העבודות שהוצגו.</string>
-    <string name="gutenberg_native_555_555_1234">‎(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">רחוב 10</string>
+    <string name="gutenberg_native_video_settings">הגדרות וידאו</string>
     <string name="create_post_page_fab_tooltip_contributors">ליצור פוסט</string>
     <string name="post_list_tab_trashed_posts">הועבר לפח</string>
     <string name="post_list_tab_scheduled_posts">מתוזמן לפרסום</string>
     <string name="post_list_tab_published_posts">פורסם</string>
     <string name="sharing_facebook_account_must_have_pages">החיבור עם פייסבוק לא הצליח למצוא דפים. השיתוף האוטומטי לא יכול להתחבר אל פרופילים בפייסבוק, רק לדפים שפורסמו.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">לא מחובר</string>
-    <string name="my_site_select_domains_page_title">כתובת האתר</string>
     <string name="notifications_tab_title_likes">לייקים</string>
     <string name="notifications_tab_title_follows">עוקבים</string>
     <string name="notifications_tab_title_comments">תגובות</string>
@@ -425,28 +811,25 @@ Language: he_IL
     <string name="stats_management_add_new_stats_card">להוסיף כרטיס חדש של נתונים סטטיסטיים</string>
     <string name="reader_self_hosted_select_filter">להשתמש בכפתור הסינון לחיפוש פוסטים בנושאים מסוימים</string>
     <string name="reader_bottom_sheet_content_description">לבחור תגית או אתר, חלון קופץ</string>
-    <string name="reader_btn_selected_filter_tick_content_description">נבחר</string>
     <string name="reader_btn_select_filter_content_description">לבחור אתר או תגית כדי לסנן את הפוסטים</string>
     <string name="reader_btn_remove_filter_content_description">להסיר את המסנן הנוכחי</string>
-    <string name="reader_title_subs">לנהל נושאים ואתרים</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">התחברות ל-WordPress.com</string>
-    <string name="reader_filter_self_hosted_empty_tagss_list">יש להתחבר ל-WordPress.com כדי להציג את הפוסטים האחרונים בנושאים שבחרת לעקוב אחריהם</string>
+    <string name="reader_title_subs">לנהל נושאים ואתרים</string>
     <string name="reader_filter_self_hosted_empty_sites_list">יש להתחבר ל-WordPress.com כדי להציג את הפוסטים האחרונים מאתרים שבמעקב אצלך</string>
-    <string name="gutenberg_native_template_preview">תצוגה מקדימה של תבנית</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">יש להתחבר ל-WordPress.com כדי להציג את הפוסטים האחרונים בנושאים שבחרת לעקוב אחריהם</string>
     <string name="gutenberg_native_replace_current_block">יש להחליף את הבלוק הנוכחי</string>
     <string name="gutenberg_native_add_to_end">הוספה לסוף</string>
     <string name="gutenberg_native_add_to_beginning">הוספה להתחלה</string>
     <string name="gutenberg_native_add_block_before">הוספת בלוק לפני</string>
     <string name="gutenberg_native_add_block_after">הוספת בלוק לאחר</string>
-    <string name="reader_filter_empty_tags_action">להוסיף נושא</string>
     <string name="reader_filter_empty_sites_action">מעקב אחר אתר</string>
-    <string name="reader_filter_empty_tags_list">אפשר לעקוב אחר פוסטים בנושא מסוים על ידי הוספת נושא</string>
     <string name="reader_filter_empty_sites_list">ניתן לראות את הפוסטים החדשים ביותר מהאתרים שבחרת לעקוב אחריהם</string>
+    <string name="reader_filter_empty_tags_action">להוסיף נושא</string>
+    <string name="reader_filter_empty_tags_list">אפשר לעקוב אחר פוסטים בנושא מסוים על ידי הוספת נושא</string>
     <string name="reader_filter_main_title">מעקב</string>
     <string name="reader_filter_cta">מסנן</string>
     <string name="gutenberg_native_video_caption_s">כיתוב לווידאו. %s</string>
     <string name="gutenberg_native_edit_video">לערוך וידאו</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">יש להקיש פעמיים כדי לבחור פריסה</string>
     <string name="gutenberg_native_add_a_shortcode">להוסיף שורטקוד…</string>
     <string name="post_list_author">המחבר של הפוסט</string>
     <string name="fab_create_desc">יצירת פוסט</string>
@@ -461,11 +844,9 @@ Language: he_IL
     <string name="stats_box_type_low">נמוכים</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  ו-%1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">להעביר את התמונה קדימה</string>
-    <string name="gutenberg_native_move_image_backward">להעביר את התמונה אחורה</string>
     <string name="gutenberg_native_gallery_caption_s">כיתוב לגלריה. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. הערך הנוכחי הוא %2$s</string>
     <string name="create_post_page_fab_tooltip">ליצור פוסט או עמוד</string>
+    <string name="gutenberg_native_replace_image">החלף תמונה</string>
     <string name="content_description_person_building_website">אדם שבונה אתר אינטרנט</string>
     <string name="post_signup_interstitial_not_right_now">לא כרגע</string>
     <string name="post_signup_interstitial_subtitle">לא משנה מה ברצונך ליצור או לשתף, אנחנו נעזור לך לעשות זאת כאן.</string>
@@ -478,54 +859,46 @@ Language: he_IL
     <string name="my_site_bottom_sheet_add_post">פוסט בבלוג</string>
     <string name="my_site_bottom_sheet_title">להוסיף חדש</string>
     <string name="post_settings_publish">פרסום</string>
-    <string name="dialog_gutenberg_informative_description_v2">שיפרנו באופן משמעותי את עורך הבלוקים ואנחנו חושבים שכדאי לנסות אותו! הפעלנו אותו בפוסטים ובעמודים חדשים אבל אם ברצונך לחזור לעורך הקלאסי, יש לעבור אל \'האתר שלי\' > \'הגדרות אתר\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">לסנכרן עכשיו</string>
     <string name="dialog_confirm_scheduled_post_sync_message">הפוסט הנוכחי יסונכרן באופן מיידי.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">הכול מוכן לסנכרון?</string>
     <string name="new_site_creation_unavailable_domain">הדומיין לא זמין</string>
-    <string name="login_promo_viewpager_content_description">הקדמה</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">לא הייתה לנו אפשרות לגשת לאתר שלך. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
-    <string name="login_discovery_error_ssl">לא הייתה לנו אפשרות לגשת לאתר שלך עקב בעיה &lt;b>בתעודת SSL&lt;/b>. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
-    <string name="login_discovery_error_http_auth">לא הייתה לנו אפשרות לגשת לאתר שלך מכיוון שהוא דורש &lt;b>אימות HTTP&lt;/b>. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
-    <string name="login_discovery_error_xmlrpc">לא הייתה לנו אפשרות לגשת &lt;b>לקובץ XMLRPC&lt;/b> באתר שלך. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
-    <string name="login_site_credentials_magic_link_label">כמעט סיימת! אנחנו רק צריכים לאמת שהשירות של Jetpack מחובר לכתובת האימייל שלך &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">יש להתחבר עם פרטי הכניסה של האתר.</string>
+    <string name="login_discovery_error_ssl">לא הייתה לנו אפשרות לגשת לאתר שלך עקב בעיה &lt;b&gt;בתעודת SSL&lt;/b&gt;. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
+    <string name="login_discovery_error_http_auth">לא הייתה לנו אפשרות לגשת לאתר שלך מכיוון שהוא דורש &lt;b&gt;אימות HTTP&lt;/b&gt;. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
+    <string name="login_discovery_error_xmlrpc">לא הייתה לנו אפשרות לגשת &lt;b&gt;לקובץ XMLRPC&lt;/b&gt; באתר שלך. עליך ליצור קשר עם חברת האחסון שלך כדי לפתור את הבעיה.</string>
+    <string name="login_site_credentials_magic_link_label">כמעט סיימת! אנחנו רק צריכים לאמת שהשירות של Jetpack מחובר לכתובת האימייל שלך &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">יש להתחבר עם פרטי הכניסה שלך לאתר %1$s</string>
-    <string name="send_verification_email">לשלוח את הודעת האימייל לאישור</string>
-    <string name="my_site_bottom_sheet_add_page">עמוד האתר</string>
     <string name="reader_following_display_name">מעקב</string>
-    <string name="reader_my_likes_display_name">לייקים</string>
-    <string name="reader_discover_display_name">היכרות</string>
-    <string name="reader_save_for_later_display_name">נשמר</string>
-    <string name="reader_filter_tags_title">נושאים</string>
-    <string name="reader_filter_sites_title">אתרים</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="suffix_1_000_000_000_000_000">%sQa</string>
-    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="my_site_bottom_sheet_add_page">עמוד האתר</string>
+    <string name="posts_cannot_be_started">אין לנו אפשרות לפתוח את הפוסטים כרגע. יש לנסות שוב מאוחר יותר</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="posts_cannot_be_started">אין לנו אפשרות לפתוח את הפוסטים כרגע. יש לנסות שוב מאוחר יותר</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="reader_filter_sites_title">אתרים</string>
+    <string name="reader_save_for_later_display_name">נשמר</string>
+    <string name="reader_discover_display_name">היכרות</string>
+    <string name="reader_my_likes_display_name">לייקים</string>
     <string name="site_cannot_be_loaded">אין לנו אפשרות לטעון את הנתונים של האתר שלך כרגע. יש לנסות שוב מאוחר יותר</string>
+    <string name="reader_filter_tags_title">נושאים</string>
+    <string name="suffix_1_000">‎%sK</string>
     <string name="gutenberg_native_wordpress_media_library">ספריית המדיה של WordPress</string>
     <string name="gutenberg_native_ungroup">לפרק קבוצה</string>
     <string name="gutenberg_native_translate">לתרגם</string>
-    <string name="gutenberg_native_title">כותרת:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">יש להקיש כדי להסתיר את המקלדת</string>
     <string name="gutenberg_native_tap_here_to_show_help">יש להקיש כאן כי להציג את העזרה</string>
     <string name="gutenberg_native_take_a_video">לצלם וידאו</string>
     <string name="gutenberg_native_take_a_photo_or_video">לצלם תמונה או וידאו</string>
     <string name="gutenberg_native_take_a_photo">לצלם תמונה</string>
     <string name="gutenberg_native_start_writing">להתחיל לכתוב…</string>
-    <string name="gutenberg_native_size">גודל</string>
-    <string name="gutenberg_native_sidebar_title_plugin">תוסף לכותרת הסרגל הצדי</string>
+    <string name="gutenberg_native_unsupported">לא נתמך</string>
     <string name="gutenberg_native_show_section">להציג את המקטע</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">הבלוק %s. בלוק זה כולל תוכן לא חוקי</string>
     <string name="gutenberg_native_s_block_empty">הבלוק %s. ריק</string>
     <string name="gutenberg_native_cut_block">לחתוך את הבלוק</string>
-    <string name="gutenberg_native_reset_block">לאפס את הבלוק</string>
-    <string name="gutenberg_native_remove_annotations">להסיר את ההסברים</string>
     <string name="gutenberg_native_problem_opening_the_video">בעיה בפתיחת הווידאו</string>
     <string name="gutenberg_native_problem_displaying_block">בעיה בהצגת הבלוק</string>
     <string name="gutenberg_native_post_title_s">כותרת הפוסט. %s</string>
@@ -535,17 +908,12 @@ Language: he_IL
     <string name="gutenberg_native_open_settings">פתיחת הגדרות</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">אין אפליקציה שיכולה לטפל בבקשה הזאת. עליך להתקין דפדפן אינטרנט.</string>
     <string name="gutenberg_native_navigate_up">לנווט למעלה</string>
-    <string name="gutenberg_native_my_pre_publish_panel">החלונית של תוכן שטרם פרסמתי</string>
-    <string name="gutenberg_native_my_post_status_info">המידע לגבי מצב הפוסט שלי</string>
-    <string name="gutenberg_native_my_post_publish_panel">החלונית של תוכן שפרסמתי</string>
-    <string name="gutenberg_native_my_document_setting_panel">החלונית של הגדרות המסמכים שלי</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">להזיז את הבלוק למעלה משורה %1$s לשורה %2$s</string>
     <string name="gutenberg_native_move_block_up">להזיז את הבלוק למעלה</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">להזיז את הבלוק למטה משורה %1$s לשורה %2$s</string>
     <string name="gutenberg_native_move_block_down">להזיז את הבלוק למטה</string>
     <string name="gutenberg_native_image_caption_s">כיתוב התמונה. %s</string>
     <string name="gutenberg_native_hide_keyboard">הסתרת מקלדת</string>
-    <string name="gutenberg_native_here_is_the_panel_content">זהו התוכן של החלונית!</string>
     <string name="gutenberg_native_help_icon">סמל עזרה</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">שילוב פירטי המדיה נכשל.\nיש להקיש לאפשרויות.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">יש להקיש פעמיים כדי לבטל את השינוי האחרון</string>
@@ -557,12 +925,9 @@ Language: he_IL
     <string name="gutenberg_native_double_tap_to_move_the_block_up">יש להקיש פעמיים כדי להזיז את הבלוק למעלה</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">יש להקיש פעמיים כדי להזיז את הבלוק למטה</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">יש להקיש פעמיים כדי לערוך את הערך הזה</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">יש להקיש פעמיים כדי לשנות את הערך באמצעות הסליידר</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">יש להקיש פעמיים כדי להוסיף בלוק</string>
     <string name="gutenberg_native_current_value_is_s">הערך הנוכחי הוא %s</string>
-    <string name="gutenberg_native_content">תוכן…</string>
     <string name="gutenberg_native_choose_from_device">לבחור מהמכשיר</string>
-    <string name="gutenberg_native_annotations_sidebar">סרגל צדי להסברים</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">אירעה שגיאה לא מזוהה. יש לנסות שוב.</string>
     <string name="gutenberg_native_alt_text">טקסט חלופי</string>
     <string name="gutenberg_native_add_video">להוסיף וידאו</string>
@@ -570,21 +935,18 @@ Language: he_IL
     <string name="gutenberg_native_add_image_or_video">להוסיף תמונה או וידאו</string>
     <string name="gutenberg_native_add_image">להוסיף תמונה</string>
     <string name="gutenberg_native_add_block_here">להוסיף בלוק כאן</string>
-    <string name="gutenberg_native_add_annotation">להוסיף הסבר</string>
-    <string name="gutenberg_native_add_a_description">להוסיף תיאור</string>
-    <string name="reader_empty_saved_posts_content_description">יש להקיש על הכפתור \'הוספה\' ו-\'שמירת פוסט\' כדי לשמור את הפוסט ברשימה שלך.</string>
+    <string name="gutenberg_native_add_alt_text">להוסיף טקסט חלופי</string>
     <string name="reader_acessibility_list_loaded">\"הרשימה נטענה עם %1$d פריטים.\"</string>
+    <string name="reader_empty_saved_posts_content_description">יש להקיש על הכפתור \'הוספה\' ו-\'שמירת פוסט\' כדי לשמור את הפוסט ברשימה שלך.</string>
     <string name="notifications_tab_dialog_switch_desc">הודעות</string>
-    <string name="master_switch_default_title_off">מופסק</string>
-    <string name="master_switch_default_title_on">מופעל</string>
-    <string name="notifications_tab_dialog_master_off_message">ביטול ההודעות עבור אתר זה יגרום להשבתה של הצגת הודעות בלשונית \'הודעות\' של האתר. אפשר לבחור אילו סוגים של הודעות יוצגו לאחר הפעלת הודעות עבור אתר זה.</string>
-    <string name="notifications_tab_dialog_master_off_title">להצגת הודעות בלשונית \'הודעות\' של אתר זה, יש להפעיל הודעות עבור האתר.</string>
-    <string name="notifications_tab_dialog_master_hint_off">הפעלת הצגת הודעות בלשונית \'הודעות\' של אתר זה</string>
-    <string name="notifications_tab_dialog_master_hint_on">השבתת הצגת הודעות בלשונית \'הודעות\' של אתר זה</string>
-    <string name="notifications_tab_dialog_master_status_off">הודעות עבור אתר זה</string>
-    <string name="notifications_tab_dialog_master_status_on">הודעות עבור אתר זה</string>
-    <string name="dialog_gutenberg_informative_description_page">התחלת להשתמש בעורך הבלוקים ליצירת עמודים חדשים, מעולה! כדי לחזור לעורך הקלאסי, יש לעבור אל \'האתר שלי\' > \'הגדרות אתר\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">התחלת להשתמש בעורך הבלוקים ליצירת פוסטים חדשים, מעולה! כדי לחזור לעורך הקלאסי, יש לעבור אל \'האתר שלי\' > \'הגדרות אתר\'.</string>
+    <string name="main_switch_default_title_off">מושבת</string>
+    <string name="notifications_tab_dialog_main_off_message">ביטול ההודעות עבור אתר זה יגרום להשבתה של הצגת הודעות בלשונית \'הודעות\' של האתר. אפשר לבחור אילו סוגים של הודעות יוצגו לאחר הפעלת ההודעות לאתר זה.</string>
+    <string name="main_switch_default_title_on">פעיל</string>
+    <string name="notifications_tab_dialog_main_off_title">להצגת הודעות בלשונית \'הודעות\' של אתר זה, יש להפעיל הודעות לאתר.</string>
+    <string name="notifications_tab_dialog_main_hint_off">להפעיל הצגת הודעות בלשונית \'הודעות\' של אתר זה</string>
+    <string name="notifications_tab_dialog_main_hint_on">להשבית הצגת הודעות בלשונית \'הודעות\' של אתר זה</string>
+    <string name="notifications_tab_dialog_main_status_off">הודעות לאתר זה</string>
+    <string name="notifications_tab_dialog_main_status_on">הודעות לאתר זה</string>
     <string name="pick_media">להוסיף תמונה או וידאו</string>
     <string name="error_post_not_submitted_retrying">לא הצלחנו לשלוח את הפוסט לבדיקה אבל ננסה שוב מאוחר יותר. </string>
     <string name="error_post_not_scheduled_retrying">לא הצלחנו לתזמן את הפוסט אבל ננסה שוב מאוחר יותר.</string>
@@ -677,8 +1039,6 @@ Language: he_IL
     <string name="post_settings_add_to_calendar">Add to calendar</string>
     <string name="post_settings_notification">הודעה</string>
     <string name="post_settings_time_and_date">תאריך ושעה</string>
-    <string name="login_need_help_finding_connected_email">נדרשת לך עזרה במציאת האימייל שבעזרתו התחברת?</string>
-    <string name="enter_wordpress_site">האתר בכתובת זו אינו אתר של WordPress. כדי שנוכל להתחבר לאתר, השירות של WordPress חייב להיות מותקן באתר.</string>
     <string name="login_invalid_site_url">יש להזין את כתובת האתר המלאה, לדוגמה example.com.</string>
     <string name="enter_email_for_site">עליך להתחבר אל WordPress.com כדי להתחבר אל %1$s</string>
     <string name="stats_post_views_label">צפיות</string>
@@ -744,7 +1104,7 @@ Language: he_IL
     <string name="domain_registration_state_picker_dialog_title">בחירת מדינה</string>
     <string name="domain_registration_country_picker_dialog_title">בחירת ארץ</string>
     <string name="domain_registration_result_continue_button">המשך</string>
-    <string name="domain_registration_result_description">כעת מתבצע תהליך ההגדרה של הדומיין החדש שלך, &lt;b>%s&lt;/b>. האתר שלך\n עושה סלטות מרוב התרגשות!</string>
+    <string name="domain_registration_result_description">כעת מתבצע תהליך ההגדרה של הדומיין החדש שלך, &lt;b&gt;%s&lt;/b&gt;. האתר שלך\n עושה סלטות מרוב התרגשות!</string>
     <string name="domain_registration_result_title">ברכותינו</string>
     <string name="domain_contact_information_register_domain_button">רישום דומיין</string>
     <string name="domain_contact_information_postal_code_hint">מיקוד</string>
@@ -773,17 +1133,18 @@ Language: he_IL
     <string name="editor_failed_to_insert_media_tap_to_retry">שילוב פירטי המדיה נכשל.\nיש להקיש כדי לנסות שוב.</string>
     <string name="editor_uploading_draft">אנחנו מעלים את הטיוטה שלך</string>
     <string name="post_uploading_draft">מעלה את הטיוטה</string>
+    <string name="post_list_tab_drafts">טיוטות</string>
     <string name="error_restoring_post">אירעה שגיאה בעת שחזור הפוסט</string>
     <string name="backdated_for">עדכון לתאריך הזה בעבר: %s</string>
     <string name="stats_insights_management_title">הצגה של הנתונים הסטטיסטיים הרלוונטיים ביותר בלבד. הוספת התובנות שמופיעות למטה וארגונן.</string>
     <string name="stats_insights_social">רשתות חברתיות</string>
     <string name="stats_insights_annual_site_stats">נתונים סטטיסטיים שנתיים של האתר</string>
-    <string name="stats_view_follower_totals">סך כל העוקבים</string>
     <string name="domain_suggestions_fetch_error">לא ניתן לטעון הצעות לדומיין</string>
     <string name="domain_suggestions_search_hint">יש להקליד מילת מפתח לרעיונות נוספים</string>
     <string name="domains_suggestions_empty_list">לא נמצאו הצעות</string>
     <string name="register_domain">רישום דומיין</string>
     <string name="jetpack_installed_message">כעת, לאחר ההתקנה של Jetpack, צריך להגדיר את החשבון. התהליך יארך כדקה.</string>
+    <string name="stats_view_follower_totals">סך כל העוקבים</string>
     <string name="stats_menu_remove">הסרה מהתובנות</string>
     <string name="stats_menu_move_down">העברה למטה</string>
     <string name="stats_menu_move_up">העברה למעלה</string>
@@ -792,8 +1153,8 @@ Language: he_IL
     <string name="post_restoring">הפוסט משוחזר</string>
     <string name="post_restored">הפוסט שוחזר</string>
     <string name="post_trashing">הפוסט מועבר לפח</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_message">העברת הפוסט לפח תבטל גם שינויים שלא נשמרו, האם ברצונך להמשיך?</string>
     <string name="dialog_confirm_trash_losing_local_changes_title">שינויים מקומיים</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">העברת הפוסט לפח תבטל גם שינויים שלא נשמרו, האם ברצונך להמשיך?</string>
     <string name="button_move_to_draft">העברה לטיוטות</string>
     <string name="post_list_toggle_item_layout_list_view">החלפה לתצוגת רשימה</string>
     <string name="post_list_toggle_item_layout_cards_view">החלפה לתצוגת כרטיסים</string>
@@ -818,6 +1179,7 @@ Language: he_IL
     <string name="plugin_install_custom_domain_required_dialog_register_btn">רישום הדומיין</string>
     <string name="plugin_install_custom_domain_required_dialog_message">כדי להתקין תוספים, עליך לספק דומיין מותאם אישית שמקושר לאתר שלך.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">התקנת תוסף</string>
+    <string name="new_site_creation_preview_subtitle">תהיה לך אפשרות להתאים אישית את המראה והאווירה של האתר שלך בשלב מאוחר יותר</string>
     <string name="publish_on">פרסום בתאריך: %s</string>
     <string name="schedule_for">תזמון לתאריך: %s</string>
     <string name="published_on">פורסם בתאריך: %s</string>
@@ -850,24 +1212,20 @@ Language: he_IL
     <string name="plans_loading_error_no_plans_title">אין אפשרות לטעון תוכניות</string>
     <string name="plans_loading_error_network_title">אין חיבור</string>
     <string name="menu_switch_to_gutenberg_editor">מעבר לעורך הבלוקים</string>
-    <string name="menu_switch_to_aztec_editor">מעבר לעורך הקלאסי</string>
     <string name="stats_loading_block_error">הייתה בעיה בטעינת הנתונים שלך, יש לרענן את העמוד ולנסות שוב.</string>
     <string name="stats_loading_error">הנתונים לא נטענו</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">לעריכת פוסטים ועמודים חדשים עם עורך הבלוקים</string>
     <string name="site_settings_gutenberg_default_for_new_posts">שימוש בעורך הבלוקים</string>
-    <string name="dialog_gutenberg_informative_title">עורך הבלוקים הופעל</string>
     <string name="exit">יציאה</string>
     <string name="quick_start_sites_type_subtitle">%1$d מתוך %2$d הושלם</string>
-    <string name="quick_start_sites_type_grow">הגדלת הקהל שלך</string>
-    <string name="quick_start_sites_type_customize">התאמה אישית של האתר שלך</string>
     <string name="quick_start_sites">לשלב הבא</string>
     <string name="quick_start_complete_tasks_header">הושלם (%d)</string>
     <string name="quick_start_dialog_view_site_message">בהצלחה עם המוצר המוגמר!</string>
     <string name="quick_start_dialog_upload_icon_title">העלאה של סמל לאתר</string>
     <string name="quick_start_dialog_upload_icon_message">המבקרים באתר יראו את הסמל שלך בדפדפן שלהם. ניתן להוסיף סמל מותאם אישית למראה נקי ומקצועי.</string>
     <string name="quick_start_dialog_explore_plans_message_short">יש להקיש על %1$s התוכנית %2$s כדי להציג את התוכנית הנוכחית שלך ותוכניות אחרות שזמינות</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">יש להקיש על %1$s הוספת עמוד %2$s כדי ליצור עמוד חדש.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">יש להקיש על  ⁦%1$s⁩ עמודים ⁦%2$s⁩ כדי להמשיך.</string>
+    <string name="quick_start_sites_type_grow">להגדיל את הקהל שלך</string>
+    <string name="quick_start_sites_type_customize">להתאים אישית את האתר שלך</string>
     <string name="quick_start_dialog_check_stats_message_short">יש להקיש על %1$s נתונים סטטיסטיים %2$s כדי להציג את הביצועים של האתר שלך.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">יש להקיש על %1$s סמל האתר שלך %2$s כדי להעלות פריט חדש</string>
     <string name="quick_start_dialog_publish_post_message">אפשר כעת לכתוב טיוטה ולפרסם את הפוסט הראשון שלך.</string>
@@ -878,13 +1236,8 @@ Language: he_IL
     <string name="quick_start_dialog_explore_plans_message">מידע נוסף על כלי שיווק ו-SEO בתוכניות שלנו בתשלום.</string>
     <string name="quick_start_dialog_enable_sharing_title">הפעלת השיתוף של הפוסטים</string>
     <string name="quick_start_dialog_enable_sharing_message">שיתוף אוטומטי של פוסטים חדשים בחשבונות שלך ברשתות החברתיות.</string>
-    <string name="quick_start_dialog_customize_site_message">שינוי גופנים, הוספת תמונות ועוד.</string>
-    <string name="quick_start_dialog_create_page_title">יצירת עמוד חדש</string>
-    <string name="quick_start_dialog_create_page_message">הוספת עמוד לתוכן חשוב - עמוד \'אודות\' הוא התחלה נהדרת.</string>
     <string name="quick_start_dialog_check_stats_title">בדיקת הנתונים הסטטיסטיים של האתר שלך</string>
     <string name="quick_start_dialog_check_stats_message">קבלת עדכונים על הביצועים של האתר שלך.</string>
-    <string name="quick_start_dialog_browse_themes_title">חיפוש ערכות עיצוב</string>
-    <string name="quick_start_dialog_browse_themes_message">ניתן לעיין בעשרות אפשרויות לפריסה כדי למצוא את האפשרות המושלמת עבורך.</string>
     <string name="quick_start_dialog_remove_next_steps_message">ההסרה של השלבים הבאים תסתיר את כל הסיורים באתר זה. לא ניתן לבטל פעולה זו.</string>
     <string name="quick_start_dialog_remove_next_steps_title">הסרת השלבים הבאים</string>
     <string name="quick_start_remove_next_steps_menu_title">להסיר את הפריט</string>
@@ -908,15 +1261,11 @@ Language: he_IL
     <string name="notification_new_site_creation_failed">הייתה בעיה</string>
     <string name="notification_new_site_creation_title">יצירת אתר</string>
     <string name="new_site_creation_create_site_button">יצירת אתר</string>
-    <string name="new_site_creation_search_domain_input_hint">חיפוש דומיינים</string>
     <string name="new_site_creation_domain_header_subtitle">כאן הגולשים ימצאו אותך באינטרנט.</string>
-    <string name="new_site_creation_domain_header_title">בחירת דומיין לאתר שלך</string>
     <string name="new_site_creation_empty_domain_list_message">לא נמצאו כתובות זמינות שתואמות לחיפוש שלך</string>
     <string name="site_creation_error_generic_subtitle">שגיאה בתקשורת עם השרת, יש לנסות שוב</string>
     <string name="site_creation_error_generic_title">הייתה בעיה</string>
     <string name="site_creation_fetch_suggestions_error_unknown">הייתה בעיה</string>
-    <string name="site_creation_segments_subtitle">המידע יעזור לנו לתת לך המלצות. אבל תמיד יש מקום לצמוח - כל האתרים מתפתחים!</string>
-    <string name="site_creation_segments_title">נשמח לשמוע איזה סוג של אתר ברצונך ליצור</string>
     <string name="new_site_creation_preview_title">האתר שלך נוצר!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d מתוך %2$d</string>
     <string name="new_site_creation_screen_title_general">יצירת אתר</string>
@@ -937,8 +1286,7 @@ Language: he_IL
     <string name="stats_no_data_for_period">אין נתונים לתקופה זו</string>
     <string name="preference_strip_image_location">הסרת מיקום ממדיה</string>
     <string name="stats_cannot_be_started">אין לנו אפשרות לפתוח את הנתונים הסטטיסטיים כעת. יש לנסות שוב מאוחר יותר</string>
-    <string name="gif_picker_endless_scroll_network_error">הטעינה של חלק מפרטי המדיה נכשלה עקב שגיאת רשת.</string>
-    <string name="gif_picker_initial_empty_text">לחפש קובצי GIF שניתן להוסיף לספריית המדיה שלך!</string>
+    <string name="gif_picker_empty_search_list">לא נמצאו פרטי מדיה שמתאימים לחיפוש שלך</string>
     <string name="stats_author_views_label">צפיות</string>
     <string name="stats_author_label">מחבר</string>
     <string name="stats_authors">מחברים</string>
@@ -968,10 +1316,12 @@ Language: he_IL
     <string name="stats_insights_share_post">שיתוף פוסט</string>
     <string name="stats_insights_create_post">יצירת פוסט</string>
     <string name="stats_insights_latest_post_message">%2$s התפרסם לפני %1$s. אלו הביצועים של הפוסט עד כה:</string>
-    <string name="stats_insights_latest_post_with_no_engagement">%2$s התפרסם לפני %1$s. אפשר לקבל חשיפה רבה יותר לפוסט על ידי שיתוף:</string>
-    <string name="stats_insights_latest_post_empty">עדיין לא פרסמת אף פוסט. לאחר פרסום של תוכן, סיכום הפוסטים האחרונים יופיע כאן:</string>
+    <string name="gif_picker_endless_scroll_network_error">הטעינה של חלק מפרטי המדיה נכשלה עקב שגיאת רשת.</string>
+    <string name="gif_picker_initial_empty_text">לחפש קובצי GIF שניתן להוסיף לספריית המדיה שלך!</string>
     <string name="stats_insights_tags_and_categories">תגיות וקטגוריות</string>
     <string name="stats_insights_all_time_stats">כל הזמנים</string>
+    <string name="stats_insights_latest_post_empty">עדיין לא פרסמת אף פוסט. לאחר פרסום של תוכן, סיכום הפוסטים האחרונים יופיע כאן:</string>
+    <string name="stats_insights_latest_post_with_no_engagement">%2$s התפרסם לפני %1$s. אפשר לקבל חשיפה רבה יותר לפוסט על ידי שיתוף:</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">עוקבים</string>
     <string name="stats_publicize_service_label">שירות</string>
@@ -1021,8 +1371,8 @@ Language: he_IL
     <string name="image_size_medium_label">בינוני</string>
     <string name="image_size_thumbnail_label">תמונה ממוזערת</string>
     <string name="menu_history">היסטוריה</string>
-    <string name="pages_open_page_error">העמוד שנבחר לא זמין</string>
     <string name="pages_pending">ממתין לתצוגה מקדימה</string>
+    <string name="pages_open_page_error">העמוד שנבחר לא זמין</string>
     <string name="pages_empty_trashed">אין לך עמודים שהועברו לפח</string>
     <string name="pages_empty_scheduled">אין לך אף עמוד מתוזמן לפרסום</string>
     <string name="pages_empty_drafts">אין לך עמודים שנשמרו כטיוטה</string>
@@ -1060,44 +1410,38 @@ Language: he_IL
     <string name="quick_start_dialog_view_site_title">הצגת האתר שלך</string>
     <string name="quick_start_dialog_view_site_message_short">יש להקיש על %1$sהצגת האתר%2$s כדי להציג את האתר שלך בתצוגה מקדימה</string>
     <string name="quick_start_dialog_share_site_title">שיתוף האתר שלך</string>
+    <string name="quick_start_dialog_share_site_message">התחברות לחשבונות שלך ברשתות החברתיות – האתר שלך ישתף באופן אוטומטי פוסטים חדשים.</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">יש להקיש על %1$s שיתוף %2$s כדי להמשיך</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">יש להקיש על %1$s חשבונות מקושרים %2$s כדי להוסיף חשבונות של רשתות חברתיות</string>
-    <string name="quick_start_dialog_share_site_message">התחברות לחשבונות שלך ברשתות החברתיות – האתר שלך ישתף באופן אוטומטי פוסטים חדשים.</string>
     <string name="quick_start_dialog_publish_post_title">פרסום פוסט</string>
     <string name="quick_start_dialog_publish_post_message_short">יש להקיש על %1$sיצירת פוסט%2$s כדי ליצור פוסט חדש</string>
     <string name="quick_start_dialog_need_help_title">נדרשת לך עזרה כדי לצאת לדרך?</string>
     <string name="quick_start_dialog_need_help_button_positive">אשר</string>
     <string name="quick_start_dialog_need_help_button_neutral">לעולם לא</string>
-    <string name="quick_start_dialog_need_help_button_negative">לא תודה</string>
     <string name="quick_start_dialog_follow_sites_title">מעקב אחר אתרים אחרים</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">יש להקיש על %1$sחיפוש%2$s כדי למצוא אתרים בתחומי עניין דומים</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">יש להקיש על %1$sReader%2$s כדי להמשיך</string>
+    <string name="quick_start_dialog_need_help_button_negative">לא תודה</string>
     <string name="quick_start_dialog_follow_sites_message">כדאי לחפש אתרים שנותנים לך השראה ולעקוב אחריהם כדי לקבל עדכונים כשהם יפרסמו תוכן חדש.</string>
-    <string name="quick_start_dialog_customize_site_title">התאמה אישית של האתר שלך</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">יש להקיש על %1$sערכות עיצוב%2$s כדי להמשיך</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">יש להקיש על %1$sהתאמה אישית%2$s כדי להתחיל להתאים את האתר שלך</string>
-    <string name="quick_start_dialog_choose_theme_title">בחירת ערכת עיצוב</string>
-    <string name="quick_start_dialog_browse_themes_message_short">יש להקיש על %1$sתבניות%2$s כדי למצוא תבניות חדשות</string>
-    <string name="quick_start_dialog_choose_theme_message">עיון בכל ערכות העיצוב שלנו כדי למצוא את ההתאמה המושלמת.</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">להקיש על ⁦%1$s⁩ חיפוש ⁦%2$s⁩ כדי לחפש אתרים בנושאים דומים</string>
     <string name="quick_start_button_positive">מעבר אל</string>
     <string name="quick_start_button_negative_short">ביטול</string>
     <string name="quick_start_button_negative">לא עכשיו</string>
-    <string name="content_description_more">עוד</string>
     <string name="my_site_create_new_site_title">אין לך עוד אתרים</string>
+    <string name="content_description_more">עוד</string>
     <string name="reader_empty_followed_tags_title">אין נושאים במעקב</string>
     <string name="reader_empty_followed_tags_subtitle">אפשר להוסיף כאן נושאים כדי למצוא פוסטים על הנושאים המועדפים עליך</string>
     <string name="login_to_to_connect_jetpack">יש להיכנס לחשבון WordPress.com שדרכו חיברת את Jetpack.</string>
     <string name="install_jetpack_retry">יש לנסות שנית</string>
-    <string name="install_jetpack_continue">הגדר</string>
-    <string name="jetpack_installation_problem_message">אין אפשרות להתקין את Jetpack כעת.</string>
     <string name="jetpack_installation_problem">הייתה בעיה</string>
     <string name="jetpack_installed">Jetpack מותקן</string>
-    <string name="installing_jetpack_message">אנחנו מתקינים את Jetpack באתר שלך. השלב הזה יארך מספר דקות לפני השלמתו.</string>
     <string name="installing_jetpack">מתקין את Jetpack</string>
-    <string name="install_jetpack_message">פרטי הכניסה שלך לאתר לא יאוחסנו. אנחנו משתמשים בהם כדי להתקין את Jetpack בלבד.</string>
     <string name="install_jetpack">התקנת Jetpack</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">שאלות נפוצות בנושא Jetpack</string>
+    <string name="jetpack_installation_problem_message">אין אפשרות להתקין את Jetpack כעת.</string>
+    <string name="installing_jetpack_message">אנחנו מתקינים את Jetpack באתר שלך. השלב הזה יארך מספר דקות לפני השלמתו.</string>
+    <string name="install_jetpack_message">פרטי הכניסה שלך לאתר לא יאוחסנו. אנחנו משתמשים בהם כדי להתקין את Jetpack בלבד.</string>
+    <string name="install_jetpack_continue">הגדר</string>
     <string name="stats_jetpack_connection_setup_info">להשתמש בנתונים סטטיסטיים באתר שלך ב-WordPress, עליך להתקין את התוסף של Jetpack.</string>
     <string name="themes_empty_list">לא נמצאו ערכות עיצוב שמתאימות לחיפוש שלך</string>
     <string name="reader_label_post_search_explainer">מה ברצונך לחפש?</string>
@@ -1142,41 +1486,35 @@ Language: he_IL
     <string name="support_contact_email">אימייל ליצירת קשר</string>
     <string name="application_log_button">יומן יישום</string>
     <string name="my_tickets">הפנייה שלי</string>
-    <string name="activity_log_rewind_dialog_message">האם ברצונך לשחזר את האתר חזרה לגרסה ממועד %1$s בשעה %2$s? פעולה זו תסיר את כל התוכן ואת האפשרויות שנוצרו או ששונו מאז.</string>
-    <string name="activity_log_rewind_site">שחזור גרסה קודמת של האתר</string>
-    <string name="activity_log_currently_restoring_message_no_dates">השחזור בתהליך</string>
-    <string name="activity_log_currently_restoring_message">משחזר לתאריך  %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">שחזור בתהליך</string>
+    <string name="activity_log_currently_restoring_message">משחזר אל ⁦%1$s⁩ %2$s</string>
     <string name="activity_log_currently_restoring_title">אנחנו משחזרים כעת את האתר שלך</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">האתר שלך שוחזר בהצלחה</string>
-    <string name="activity_log_rewind_finished_snackbar_message">האתר שלך שוחזר בהצלחה\nשוחזר לתאריך %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">אנחנו משחזרים את האתר שלך כעת\nמשחזר לתאריך %1$s %2$s</string>
     <string name="activity_log_button">כפתור לפעולות ביומן הפעילות</string>
+    <string name="activity_log_rewind_finished_snackbar_message">האתר שלך שוחזר בהצלחה\nשוחזר לגרסה ממועד ⁦%1$s⁩ %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">אנחנו משחזרים את האתר שלך כעת\nמשחזר לגרסה ממועד ⁦%1$s⁩ %2$s</string>
     <string name="plugin_auto_managed">ניהול אוטומטי</string>
     <string name="reader_save_posts_locally_dialog_message">באפשרותך לשמור את הפוסט הנוכחי ולקרוא אותו במועד מאוחר יותר כרצונך. הפוסט יהיה זמין במכשיר זה בלבד - פוסטים שנשמרו לא מסתנכרנים בין מכשירים.</string>
     <string name="reader_save_posts_locally_dialog_title">שמירת פוסטים למועד מאוחר יותר</string>
     <string name="reader_empty_search_request_failed">אין אפשרות לבצע את החיפוש</string>
     <string name="reader_empty_search_title">לא נמצאו תוצאות</string>
-    <string name="comment_read_source_post">קריאת הפוסט המקורי</string>
     <string name="sites">אתרים</string>
+    <string name="comment_read_source_post">קריאת הפוסט המקורי</string>
     <string name="signup_magic_link_title">הקישור הישיר נשלח</string>
-    <string name="signup_email_screen_title">הרשמה באימייל</string>
     <string name="verification_2fa_screen_title">אימות קוד</string>
     <string name="selfhosted_site_login_title">פרטי כניסה</string>
     <string name="magic_link_sent_login_title">הקישור הישיר נשלח</string>
     <string name="magic_link_login_title">התחברות באמצעות קישור ישיר</string>
     <string name="site_address_login_title">התחברות באמצעות כתובת האתר</string>
     <string name="email_address_login_title">התחברות באמצעות כתובת אימייל</string>
-    <string name="alternatively">לחלופין:</string>
     <string name="reader_empty_saved_posts_description">יש להקיש על %s כדי לשמור את הפוסט ברשימה שלך.</string>
-    <string name="reader_empty_saved_posts_title">עדיין לא נשמרו פוסטים! </string>
     <string name="reader_bookmark_snack_title">הפוסט נשמר</string>
     <string name="reader_bookmark_snack_btn">להציג הכול</string>
-    <string name="reader_btn_bookmarked">נשמר</string>
-    <string name="reader_btn_bookmark">שמירה</string>
     <string name="reader_remove_bookmark">הסרה מהפוסטים שנשמרו</string>
     <string name="reader_add_bookmark">הוספה לפוסטים שנשמרו</string>
     <string name="reader_save_for_later_title">פוסטים שנשמרו</string>
     <string name="removed">נמחק</string>
+    <string name="reader_empty_saved_posts_title">עדיין לא נשמרו פוסטים! </string>
     <string name="my_site_icon_content_description">שינוי סמל אתר</string>
     <string name="my_site_icon_dialog_cancel_button">ביטול</string>
     <string name="my_site_icon_dialog_remove_button">מחיקה</string>
@@ -1192,11 +1530,9 @@ Language: he_IL
     <string name="reader_btn_notifications_on">הפעלת הודעות אתר</string>
     <string name="reader_btn_notifications_off">השבתת הודעות אתר</string>
     <string name="activity_log_jetpack_icon">סמל Jetpack</string>
-    <string name="rewind">שחזור לגרסה קודמת</string>
     <string name="activity_log_event">אירוע</string>
     <string name="activity_log_icon">סמל פעילות</string>
     <string name="activity_log">יומן פעילות</string>
-    <string name="activity">פעילות</string>
     <string name="privacy_policy_read">עיון במדיניות פרטיות</string>
     <string name="third_party_policy_learn_more_caption">אנחנו משתמשים בכלים למעקב, כולל כלים של צד שלישי. אפשר לקרוא פרטים על אלו על אלו ועל אופן השליטה בהם.</string>
     <string name="third_party_policy_learn_more_header">מדיניות של צד שלישי</string>
@@ -1207,7 +1543,6 @@ Language: he_IL
     <string name="preference_privacy_settings">הגדרות פרטיות</string>
     <string name="preference_collect_information">איסוף מידע</string>
     <string name="post_submitted">הפוסט נשלח</string>
-    <string name="login_email_button_signup">אין לך חשבון עדיין? %1$sהרשמה%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">כדי להוסיף את התוסף, האתר חייב להיות יציב.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">כדי להוסיף את התוסף, הרישום לעדכונים בדומיין חייב להיות משויך למשתמש זה.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">כדי להוסיף את התוסף, יש לאפשר הרשאות של מנהל מערכת.</string>
@@ -1278,13 +1613,13 @@ Language: he_IL
     <string name="jetpack_connection_failed_with_reason">ההתחברות ל-Jetpack נכשלה: %s</string>
     <string name="jetpack_already_connected_toast">החשבון שלך ב-Jetpack כבר מחובר</string>
     <string name="menu_undo_snackbar_action">ביטול פעולה אחרונה</string>
-    <string name="menu_visual_mode_done_snackbar">הוחלף לעורך החזותי</string>
     <string name="menu_visual_mode">עורך חזותי</string>
-    <string name="menu_html_mode_done_snackbar">הוחלף לעורך HTML</string>
     <string name="menu_html_mode">עורך HTML</string>
     <string name="menu_preview">תצוגה מקדימה</string>
     <string name="menu_save_as_draft">לשמור כטיוטה</string>
     <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_visual_mode_done_snackbar">הוחלף לעורך החזותי</string>
+    <string name="menu_html_mode_done_snackbar">הוחלף לעורך HTML</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1306,7 +1641,6 @@ Language: he_IL
     <string name="edit_photo_screen_title">עריכת תמונה</string>
     <string name="share_intent_screen_title">בחר אתר</string>
     <string name="signup_epilogue_screen_title">חשבון חדש</string>
-    <string name="login_prologue_screen_title">כניסה</string>
     <string name="login_epilogue_screen_title">מחובר בתור</string>
     <string name="person_detail_screen_title">פרטי המשתמש</string>
     <string name="media_settings_screen_title">פרטי הקובץ</string>
@@ -1314,12 +1648,13 @@ Language: he_IL
     <string name="notifications_screen_title">הודעות</string>
     <string name="reader_screen_title">Reader</string>
     <string name="me_section_screen_title">אני</string>
+    <string name="my_site_section_screen_title">האתר שלי</string>
     <string name="notif_settings_screen_title">הגדרות הודעה</string>
     <string name="help_screen_title">עזרה ותמיכה</string>
     <string name="license_screen_title">רישיון</string>
     <string name="release_notes_screen_title">הערות לשחרור גרסה</string>
     <string name="signup_epilogue_error_avatar_view">תמונת הפרופיל שלך הועלתה ותהיה זמינה בקרוב.</string>
-    <string name="permissions_denied_message">נראה שהשבתת את פעילות ההרשאות שנדרשות לתכונה זו.&lt;br/>&lt;br/>כדי לשנות זאת, יש לערוך את ההרשאות שלך ולוודא שהפעלת את &lt;strong>%s&lt;/strong>.</string>
+    <string name="permissions_denied_message">נראה שהשבתת את פעילות ההרשאות שנדרשות לתכונה זו.&lt;br/&gt;&lt;br/&gt;כדי לשנות זאת, יש לערוך את ההרשאות שלך ולוודא שהפעלת את &lt;strong&gt;%s&lt;/strong&gt;.</string>
     <string name="permissions_denied_title">הרשאות</string>
     <string name="plugin_caption_featured">תוספים מרכזיים</string>
     <string name="sharing_disabled_description">אין לך גישה להגדרות השיתוף מכיוון שמודול השיתוף של Jetpack מושבת.</string>
@@ -1360,7 +1695,6 @@ Language: he_IL
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">פוסט אחד עם קובץ אחד לא הועלה</string>
     <string name="untitled_in_parentheses">(ללא כותרת)</string>
     <string name="at_username">‎@‎%s‎</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">יצירת אתר</string>
     <string name="notification_site_creation_created">יש להקיש להמשך.</string>
     <string name="notification_site_creation_title_success">האתר נוצר!</string>
@@ -1374,28 +1708,20 @@ Language: he_IL
     <string name="username_changer_dismiss_button_positive">מחיקה</string>
     <string name="username_changer_action">שמירה</string>
     <string name="content_description_add_avatar">הוספה של תמונת פרופיל</string>
-    <string name="signup_with_google_button">הרשמה באמצעות Google</string>
-    <string name="signup_with_email_button">הרשמה באמצעות אימייל</string>
     <string name="signup_user_exists">כתובת האימייל כבר קיימת ב-WordPress.com.\nהמשך להתחברות.</string>
     <string name="signup_updating_account">מעדכן את החשבון….</string>
-    <string name="signup_terms_of_service_text">ביצוע ההרשמה מהווה את הסכמתך %1$sלתנאי השימוש%2$s שלנו.</string>
     <string name="signup_magic_link_progress">שולח אימייל</string>
     <string name="signup_magic_link_error_button_positive">יש לנסות שנית</string>
     <string name="signup_magic_link_error_button_negative">סגור</string>
-    <string name="signup_magic_link_error">אירעה תקלה בשליחת האימייל. אפשר לנסות שוב עכשיו או לסגור ולנסות שוב מאוחר יותר.</string>
     <string name="signup_epilogue_hint_username">שם משתמש</string>
-    <string name="signup_epilogue_hint_password_detail">אפשר תמיד להתחבר באמצעות קישור, כמו הקישור שבו השתמשת כעת, אבל באפשרותך גם להגדיר סיסמה לבחירתך.</string>
     <string name="signup_epilogue_hint_password">סיסמה (לא חובה)</string>
     <string name="signup_epilogue_hint_display">שם תצוגה</string>
     <string name="signup_epilogue_error_button_positive">יש לנסות שנית</string>
     <string name="signup_epilogue_error_button_negative">חזרה למצב קודם</string>
     <string name="signup_epilogue_error_generic">אירעה בעיה בעדכון החשבון שלך. אפשר לנסות שוב או לבטל את השינויים כדי להמשיך.</string>
     <string name="signup_epilogue_error_avatar">אירעה בעיה בטעינה של תמונת פרופיל שלך.</string>
-    <string name="signup_email_header">כדי ליצור חשבון WordPress.com חדש, יש להזין את כתובת האימייל שלך.</string>
-    <string name="signup_email_error_generic">אירעה בעיה בבדיקה של כתובת האימייל.</string>
-    <string name="sign_up">הרשמה ל-WordPress.com</string>
-    <string name="enter_username_instead">התחברות באמצעות שם המשתמש שלך.</string>
-    <string name="enter_site_address_instead">התחברות באמצעות הזנת כתובת האתר.</string>
+    <string name="signup_magic_link_error">אירעה תקלה בשליחת האימייל. אפשר לנסות שוב עכשיו או לסגור ולנסות שוב מאוחר יותר.</string>
+    <string name="signup_epilogue_hint_password_detail">אפשר תמיד להתחבר באמצעות קישור, כמו הקישור שבו השתמשת כעת, אבל באפשרותך גם להגדיר סיסמה לבחירתך.</string>
     <string name="plugin_needs_update">נדרש עדכון</string>
     <string name="plugin_caption_search">חיפוש בתוספים</string>
     <string name="plugin_caption_new">חדש</string>
@@ -1516,7 +1842,6 @@ Language: he_IL
     <string name="login_error_suffix">\nמומלץ לנסות חשבון אחר.</string>
     <string name="login_error_generic">הייתה בעיה להתחבר עם חשבון Google.</string>
     <string name="login_error_button">סגור</string>
-    <string name="login_google_button_suffix">התחברות עם Google.</string>
     <string name="enter_wpcom_password_google">כדי להמשיך עם חשבון Google, יש לספק סיסמת WordPress.com תואמת. נבקש את הנתונים האלו פעם אחת בלבד.</string>
     <string name="error_generic_network">אירעה שגיאת רשת. יש לבדוק את החיבור ולנסות שוב.</string>
     <string name="post_settings_remove_featured_image">הסרת התמונה המרכזית</string>
@@ -1528,12 +1853,11 @@ Language: he_IL
     <string name="jetpack_disconnect_confirm">התנתקות</string>
     <string name="jetpack_disconnect_confirmation_message">האם ברצונך לנתק את Jetpack מהאתר?</string>
     <string name="jetpack_disconnect_pref_title">\"התנתקות מ-WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">באפשרותך להכניס כתובת IP או סדרת כתובות לרשימת ההיתרים ובכך למנוע לחלוטין את חסימתם על ידי Jetpack. יש תמיכה בגרסאות IPv4 ו-IPv6. כדי לציין טווח, יש להזין את הערך הנמוך והערך הגבוה כשהם מופרדים באמצעות מקף. לדוגמה: ‎12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">אפשר להוסיף כתובת IP (או סדרת כתובות) לרשימת \'מותרות תמיד\' כדי למנוע לחלוטין את חסימתן על ידי Jetpack. יש תמיכה ב-IPv4 ו-IPv6. כדי לציין טווח, יש להזין את הערך הנמוך והערך הגבוה כשהם מופרדים באמצעות מקף. לדוגמה: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">דרישת זיהוי בשני שלבים</string>
     <string name="jetpack_match_wpcom_via_email_title">התאמת חשבונות באמצעות אימייל</string>
     <string name="jetpack_allow_wpcom_sign_in_title">הרשאת התחברות ל-WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">התחברות ל-WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">כתובות IP ברשימת ההיתרים</string>
     <string name="jetpack_prevent_brute_force_title">חסימת ניסיונות התחברות זדוניים</string>
     <string name="jetpack_prevent_brute_force_category_title">הגנה מפני התקפות של ניחוש סיסמה</string>
     <string name="jetpack_send_wp_notifications_title">שליחת הודעות בדחיפה</string>
@@ -1563,8 +1887,8 @@ Language: he_IL
     <string name="media_edit_filename_caption">שם קובץ</string>
     <string name="media_edit_url_caption">כתובת אתר</string>
     <string name="media_edit_alttext_text">טקסט חלופי</string>
-    <string name="connect_site">חיבור אתר</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">הבהוב</string>
+    <string name="connect_site">חיבור אתר</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">מכשיר רוטט</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">בחירת קול</string>
     <string name="notification_settings_category_sights_and_sounds">מראות וצלילים</string>
@@ -1574,13 +1898,13 @@ Language: he_IL
     <string name="notification_settings_category_other">אחר</string>
     <string name="notification_settings_item_your_sites_all_your_sites">כל האתרים שלי</string>
     <string name="notification_settings_category_your_sites">האתרים שלך</string>
-    <string name="notification_settings_master_off_message">הפסקת הפעולה של הגדרות ההתראות תשבית את כל סוגי ההתראות באפליקציה. אפשר לבחור אילו התראות ברצונך לקבל אחרי הפעלת הגדרות ההתראות.</string>
-    <string name="notification_settings_master_off_title">כדי לקבל התראות למכשיר זה, יש להפעיל את הגדרות ההתראות.</string>
-    <string name="notification_settings_master_hint_off">הפעלת התראות</string>
-    <string name="notification_settings_master_hint_on">השבתת התראות</string>
-    <string name="notification_settings_master_status_off">מופסק</string>
-    <string name="notification_settings_master_status_on">מופעל</string>
+    <string name="notification_settings_main_off_message">הפסקת הפעולה של הגדרות ההודעות תשבית את כל סוגי ההודעות באפליקציה. אפשר לבחור אילו הודעות ברצונך לקבל אחרי ההפעלה של הגדרות ההודעות.</string>
+    <string name="notification_settings_main_off_title">כדי לקבל הודעות למכשיר זה, יש להפעיל את הגדרות ההודעות.</string>
+    <string name="notification_settings_main_hint_off">להפעיל הודעות</string>
+    <string name="notification_settings_main_hint_on">להשבית הודעות</string>
+    <string name="notification_settings_main_status_off">מושבת</string>
     <string name="max_video_resolution">גודל מקסימלי של קובץ וידאו</string>
+    <string name="notification_settings_main_status_on">פעיל</string>
     <string name="max_thumbnail_px_size">גודל מקסימלי של קובץ תמונה</string>
     <string name="error_upload_post_media_param">אירעה שגיאה בטעינה של המדיה בפוסט הנוכחי: %s.</string>
     <string name="error_upload_post_param">אירעה שגיאה בטעינה של הפוסט הנוכחי: %s.</string>
@@ -1601,8 +1925,8 @@ Language: he_IL
     <string name="uploading_media">מעלה מדיה…</string>
     <string name="page_scheduled">העמוד תוזמן לפרסום</string>
     <string name="post_scheduled">הפוסט תוזמן לפרסום</string>
-    <string name="button_retry">לנסות שנית</string>
     <string name="post_queued">הפוסט נמצא בתור</string>
+    <string name="button_retry">לנסות שנית</string>
     <string name="uploading_post">מעלה את \"%s\"</string>
     <string name="connection_to_server_lost">החיבור לשרת אבד</string>
     <string name="login_epilogue_mysites_other">האתרים שלי</string>
@@ -1616,20 +1940,19 @@ Language: he_IL
     <string name="login_site_address_more_help">נדרשת עזרה נוספת?</string>
     <string name="login_site_address_help_content">עם הכניסה לאתר בדפדפן Chrome, כתובת האתר שלך תופיע בסרגל העליון של המסך.</string>
     <string name="login_site_address_help_title">מה כתובת האתר שלי?</string>
-    <string name="login_site_address_help">רוצה עזרה במציאת כתובת האתר שלך?</string>
     <string name="login_site_address">כתובת אתר</string>
     <string name="enter_site_address">יש להזין את כתובת האתר ב-WordPress שאליו ברצונך להתחבר.</string>
     <string name="login_already_logged_in_wpcom">כבר בוצע חיבור ל-WordPress.com</string>
     <string name="login_continue">המשך</string>
     <string name="enter_wpcom_password">הזן את הסיסמה שלך ל-WordPress.com.</string>
+    <string name="connect_more">חיבור אתר נוסף</string>
     <string name="login_magic_link_email_requesting">שולח בקשה לאימייל להתחברות</string>
     <string name="password_incorrect">נראה שהסיסמה הזו שגויה. יש לבדוק את המידע שהזנת ולנסות שוב.</string>
     <string name="requesting_otp">שולח קוד אימות באמצעות SMS.</string>
     <string name="login_text_otp">שליחת קוד במקום</string>
     <string name="enter_verification_code">כמעט סיימת! יש להזין את קוד האימות מאפליקציית האימות.</string>
-    <string name="open_mail">פתיחת דואר</string>
-    <string name="next">הבא</string>
     <string name="enter_email_wordpress_com">התחברות ל-WordPress.com באמצעות כתובת אימייל כדי לנהל את האתרים שלך ב-WordPress.</string>
+    <string name="next">הבא</string>
     <string name="image_optimization_promo_desc">מיטוב התמונות מכווץ כעת תמונות להעלאה מהירה יותר.\n\nאפשר לשנות את האפשרות הזו בכל עת דרך הגדרות האתר.</string>
     <string name="image_optimization_promo_title">להפעיל את מיטוב התמונות?</string>
     <string name="leave_off">להשאיר מכובה</string>
@@ -1650,10 +1973,6 @@ Language: he_IL
     <string name="post_status_draft">טיוטה</string>
     <string name="post_status_pending_review">ממתין לתצוגה מקדימה</string>
     <string name="post_status_publish_post">פרסום</string>
-    <string name="change_location">שינוי מיקום</string>
-    <string name="remove_location">הסרת מיקום</string>
-    <string name="post_settings_error_placepicker_missing_play_services">לא ניתן לפתוח את בוחר המיקום, השירותים של Google Play לא זמינים</string>
-    <string name="post_settings_location">מיקום</string>
     <string name="now">עכשיו</string>
     <string name="post_settings_password_dialog_hint">רק משתמשים עם סיסמה יכולים לראות את הפוסט הנוכחי</string>
     <string name="post_settings_excerpt_dialog_hint">תקצירים הם סיכומים אופציונליים, \"בעבודת יד\", של התוכן שלך.</string>
@@ -1663,8 +1982,8 @@ Language: he_IL
     <string name="post_settings_slug">מזהה לכתובת</string>
     <string name="post_settings_excerpt">תקציר</string>
     <string name="post_settings_not_set">לא הוגדר</string>
-    <string name="post_settings_more_options">אפשרויות נוספות</string>
     <string name="post_settings_categories_and_tags">קטגוריות ותגיות</string>
+    <string name="post_settings_more_options">אפשרויות נוספות</string>
     <string name="notifications_tab_title_all">הכל</string>
     <string name="top_level_category_name">קטגוריה עליונה</string>
     <string name="category_parent">קטגוריית אב (אופציונלי):</string>
@@ -1678,9 +1997,9 @@ Language: he_IL
     <string name="media_error_http_too_large_video_upload">קובץ הווידאו גדול מדי להעלאה</string>
     <string name="media_error_http_too_large_photo_upload">קובץ התמונה גדול מדי להעלאה. מומלץ לשנות את מיטוב התמונות בהגדרות האתר שלך</string>
     <string name="media_audio">אודיו</string>
-    <string name="media_videos">וידאו</string>
     <string name="media_documents">מסמכים</string>
     <string name="media_images"> תמונות</string>
+    <string name="media_videos">וידאו</string>
     <string name="media_all">הכל</string>
     <string name="photo_picker_soft_ask_permissions_denied">ל-%1$s אין אפשרות גישה לתמונות שלך. כדי לתקן זאת, יש לערוך את ההרשאות ולהפעיל את %2$s.</string>
     <string name="reader_view_comments">הצגת התגובות</string>
@@ -1738,7 +2057,7 @@ Language: he_IL
     <string name="tabbar_accessibility_label_my_site">האתר שלי. הצגת האתר שלך וניהולו, כולל נתונים סטטיסטיים.</string>
     <string name="my_site_btn_sharing">שיתוף</string>
     <string name="button_not_now">לא עכשיו</string>
-    <string name="media_error_internal_server_error">אירעה שגיאה במהלך ההעלאה. מומלץ להפעיל את מיטוב התמונות ב\'אתר\' -> \'הגדרות\'</string>
+    <string name="media_error_internal_server_error">אירעה שגיאה במהלך ההעלאה. מומלץ להפעיל את מיטוב התמונות ב\'אתר\' -&gt; \'הגדרות\'</string>
     <string name="media_downloading">שומר את פריט המדיה במכשיר זה</string>
     <string name="error_media_save">לא ניתן לשמור פריט מדיה</string>
     <string name="editor_draft_saved_locally">טיוטה נשמרה במכשיר</string>
@@ -1783,11 +2102,11 @@ Language: he_IL
     <string name="media_encoder_quality_85">בינונית</string>
     <string name="media_encoder_quality_80">נמוכה</string>
     <string name="media_upload_state_uploaded">הועלה</string>
-    <string name="media_upload_state_failed">העלאה נכשלה</string>
     <string name="media_upload_state_deleted">נמחק</string>
     <string name="media_upload_state_deleting">מוחק</string>
     <string name="media_upload_state_uploading">מעלה</string>
     <string name="media_upload_state_queued">בתור</string>
+    <string name="media_upload_state_failed">העלאה נכשלה</string>
     <string name="image_quality">איכות תמונה</string>
     <string name="error_all_media_upload_canceled">כל ההעלאות של פריטי המדיה בוטלו עקב שגיאה לא מזוהה. יש לנסות לבצע את ההעלאה שוב</string>
     <string name="error_unknown_post_type">סוג פוסט לא מזוהה</string>
@@ -1833,102 +2152,97 @@ Language: he_IL
     <string name="comment_q_action_liking">מסמן לייק…</string>
     <string name="comment_q_action_processing">מעבד…</string>
     <string name="comment_q_action_done_generic">הפעולה הושלמה!</string>
-    <string name="comment_liked">סימנת לייק לתגובה</string>
     <string name="signout">התנתק</string>
+    <string name="comment_liked">סימנת לייק לתגובה</string>
     <string name="sign_in_wpcom">התחברות ל-WordPress.com</string>
     <string name="reader_label_global_related_posts">עוד מ-WordPress.com</string>
-    <string name="reader_label_local_related_posts">מידע נוסף ב-%s</string>
+    <string name="reader_label_local_related_posts">עוד בנושא %s</string>
     <string name="preference_open_device_settings">פתיחת הגדרות מכשיר</string>
-    <string name="invite_invalid_email">%s: אימייל לא תקין</string>
     <string name="invite_user_blocked_invites">%s: משתמש חסם הזמנות</string>
+    <string name="invite_invalid_email">%s: אימייל לא תקין</string>
     <string name="invite_already_following">%s: כבר עוקב</string>
     <string name="invite_already_a_member">%s: כבר חבר</string>
     <string name="invite_username_not_found">%s: משתמש לא נמצא</string>
     <string name="comment_moderated_approved">תגובה אושרה!</string>
     <string name="like">לייק</string>
     <string name="timespan_now">עכשיו</string>
-    <string name="role_viewer">צופה</string>
     <string name="role_follower">עוקב</string>
+    <string name="role_viewer">צופה</string>
     <string name="error_post_my_profile_no_connection">אין חיבור, הפרופיל לא נשמר</string>
     <string name="alignment_right">ימין</string>
     <string name="alignment_left">שמאל</string>
     <string name="alignment_none">ללא</string>
     <string name="site_settings_list_editor_action_mode_title">%1$d נבחרו</string>
     <string name="error_fetch_users_list">משיכת נתונים על משתמשי האתר נכשלה</string>
-    <string name="title_email_follower">עוקב אימייל</string>
     <string name="title_follower">עוקב</string>
+    <string name="title_email_follower">עוקב אימייל</string>
     <string name="people_fetching">מאחזר משתמשים…</string>
-    <string name="people_dropdown_item_viewers">צופים</string>
     <string name="people_dropdown_item_email_followers">עוקבי אימייל</string>
+    <string name="people_dropdown_item_viewers">צופים</string>
     <string name="people_dropdown_item_followers">עוקבים</string>
     <string name="people_dropdown_item_team">צוות</string>
     <string name="invite_message_usernames_limit">אפשר לשלוח עד 10 הזמנות לכתובות אימייל ו/או שמות משתמשים ב-WordPress.com. הוראות ליצירת שם משתמש יישלחו לכל מי שזקוק לשם משתמש.</string>
     <string name="viewer_remove_confirmation_message">לאחר הסרת צופה זה, הוא או היא לא יוכלו לבקר יותר באתר זה.\n\nבחרת להסיר צופה זה - האם ההחלטה סופית?</string>
     <string name="follower_remove_confirmation_message">לאחר הסרת עוקב זה, הוא יפסיק לקבל הודעות לגבי אתר זה, אלא אם יגדיר מעקב מחדש.\n\nבחרת להסיר עוקב זה - האם ההחלטה סופית?</string>
     <string name="follower_subscribed_since">מאז %1$s</string>
-    <string name="error_remove_viewer">לא ניתן היה להסיר צופה</string>
     <string name="error_remove_follower">לא ניתן היה להסיר עוקב</string>
+    <string name="error_remove_viewer">לא ניתן היה להסיר צופה</string>
     <string name="error_fetch_email_followers_list">לא הצלחנו לאחזר עוקבי אימייל של האתר</string>
     <string name="error_fetch_followers_list">לא הצלחנו לאחזר עוקבים של האתר</string>
     <string name="editor_failed_uploads_switch_html">מספר העלאות מדיה נכשלו. לא ניתן לעבור למצב HTML\n במצב זה. להסיר את כל ההעלאות שנכשלו ולהמשיך?</string>
     <string name="image_width">רוחב</string>
-    <string name="image_link_to">קישור אל</string>
-    <string name="image_caption">כיתוב</string>
     <string name="image_settings_save_toast">שינוי נשמרו</string>
+    <string name="image_caption">כיתוב</string>
+    <string name="image_link_to">קישור אל</string>
     <string name="image_settings_dismiss_dialog_title">לבטל שינויים שלא נשמרו?</string>
     <string name="stop_upload_dialog_title">לעצור העלאה?</string>
-    <string name="tap_to_try_again">יש להקיש כדי לנסות שוב!</string>
+    <string name="invite_error_some_failed">ההזמנה נשלחה אך אירעו שגיאות!</string>
     <string name="invite_sent">ההזמנה נשלחה בהצלחה</string>
+    <string name="tap_to_try_again">יש להקיש כדי לנסות שוב!</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
-    <string name="invite_error_some_failed">ההזמנה נשלחה אך אירעו שגיאות!</string>
     <string name="invite_error_sending">אירעה שגיאה בעת הניסיון לשלוח את ההזמנה!</string>
     <string name="invite_error_invalid_usernames_multiple">לא ניתן לשלוח: יש שמות משתמש או כתובות אימייל לא תקפים</string>
     <string name="invite_error_invalid_usernames_one">לא ניתן לשלוח: שם משתמש או אימייל לא תקפים</string>
     <string name="invite_error_no_usernames">יש להוסיף שם משתמש אחד לפחות</string>
-    <string name="invite_message_info">(אופציונלי) אפשר להזין הודעה מותאמת אישית של עד 500 תווים שתיכלל בהזמנה למשתמשים.</string>
-    <string name="invite_message_remaining_other">נותרו %d תווים</string>
-    <string name="invite_message_remaining_one">תו אחד נותר</string>
-    <string name="invite_message_remaining_zero">לא נותרו תווים</string>
     <string name="invite_message_title">הודעה מותאמת אישית</string>
     <string name="invite">הזמנה</string>
-    <string name="invite_names_title">שמות משתמש או אימיילים</string>
-    <string name="invite_people">הזמנת אנשים</string>
+    <string name="invite_names_title">שמות משתמשים או כתובות אימייל</string>
     <string name="my_site_header_external">חיצוני</string>
-    <string name="send_link">שלח קישור</string>
+    <string name="invite_people">הזמנת אנשים</string>
     <string name="label_clear_search_history">ניקוי היסטוריית חיפוש</string>
     <string name="dlg_confirm_clear_search_history">לנקות היסטוריית חיפוש?</string>
     <string name="reader_empty_search_description">לא נמצאו תוצאות עבור %s בשפה שבחרת</string>
     <string name="reader_hint_post_search">חיפוש ב-WordPress.com</string>
+    <string name="reader_title_related_post_detail">באותו נושא</string>
     <string name="preview_screen_links_disabled">קישורים מושבתים במסך התצוגה המקדימה</string>
     <string name="send">שלח</string>
-    <string name="person_removed">הסרת בהצלחה את @%1$s</string>
     <string name="user_remove_confirmation_message">לאחר הסרת %1$s, משתמש זה לא יקבל יותר גישה לאתר זה אך כל התוכן שנוצר על ידי %1$s יישאר באתר.\n\nבחרת להסיר משתמש זה - האם ההחלטה סופית?</string>
+    <string name="person_removed">הסרת בהצלחה את @%1$s</string>
     <string name="person_remove_confirmation_title">הסרת %1$s</string>
-    <string name="role">תפקיד</string>
-    <string name="people">אנשים</string>
     <string name="reader_empty_posts_in_custom_list">האתרים ברשימה זו לא פרסמו דבר בזמן האחרון</string>
+    <string name="people">אנשים</string>
+    <string name="role">תפקיד</string>
     <string name="error_remove_user">לא ניתן היה להסיר משתמש</string>
-    <string name="error_update_role">לא הצלחנו לעדכן תפקיד משתמש</string>
     <string name="error_fetch_viewers_list">לא הצלחנו לאחזר את משתמשי האתר</string>
+    <string name="error_update_role">לא הצלחנו לעדכן תפקיד משתמש</string>
     <string name="error_updating_gravatar">שגיאה בעדכון ה-gravatar שלך</string>
-    <string name="error_refreshing_gravatar">שגיאה בטעינה מחדש של ה-gravatar שלך</string>
     <string name="error_locating_image">שגיאה באיתור התמונה החתוכה</string>
+    <string name="error_refreshing_gravatar">שגיאה בטעינה מחדש של ה-gravatar שלך</string>
     <string name="error_cropping_image">שגיאה בחיתוך בתמונה</string>
     <string name="checking_email">בודק אימייל</string>
     <string name="magic_link_unavailable_error_message">לא זמין כרגע. יש להזין סיסמה</string>
     <string name="logging_in">נכנס</string>
-    <string name="enter_your_password_instead">להזין סיסמה במקום</string>
     <string name="web_address_dialog_hint">תוצג באופן ציבורי בעת פרסום תגובות שלך.</string>
     <string name="capture_or_pick_photo">בחירה או לכידה של תמונה</string>
-    <string name="plans">תוכניות</string>
-    <string name="plan">תוכנית</string>
     <string name="export_your_content_message">הפוסטים, העמודים וההגדרות שלך יישלחו באימייל לכתובת %s.</string>
+    <string name="plan">תוכנית</string>
+    <string name="plans">תוכניות</string>
     <string name="export_your_content">יצוא התוכן שלך</string>
-    <string name="export_email_sent">אימייל יצוא נשלח!</string>
     <string name="exporting_content_progress">מייצא תוכן…</string>
-    <string name="checking_purchases">בודק רכישות</string>
-    <string name="show_purchases">הצגת רכישות</string>
+    <string name="export_email_sent">אימייל יצוא נשלח!</string>
     <string name="premium_upgrades_message">קיימים שדרוגים פעילים באתר שלך. יש לבטל את השדרוגים לפני מחיקת האתר.</string>
+    <string name="show_purchases">הצגת רכישות</string>
+    <string name="checking_purchases">בודק רכישות</string>
     <string name="premium_upgrades_title">שדרוגים</string>
     <string name="purchases_request_error">משהו השתבש. לא ניתן לבקש רכישות.</string>
     <string name="delete_site_progress">מוחק אתר…</string>
@@ -1937,43 +2251,43 @@ Language: he_IL
     <string name="primary_domain">דומיין ראשי</string>
     <string name="error_deleting_site_summary">אירעה שגיאה בעת מחיקת האתר שלך. יש לפנות לתמיכה לסיוע.</string>
     <string name="error_deleting_site">שגיאה בעת מחיקת האתר</string>
-    <string name="site_settings_export_content_title">יצוא תוכן</string>
     <string name="confirm_delete_site_prompt">יש להקליד את הכתובת %1$s בשדה להלן כדי לאשר. לאחר מכן, האתר שלך ייעלם לעד.</string>
+    <string name="site_settings_export_content_title">יצוא תוכן</string>
     <string name="confirm_delete_site">אישור מחיקת אתר</string>
     <string name="contact_support">ליצור קשר עם התמיכה</string>
     <string name="start_over_text">אם ברצונך להשתמש באתר בלי הפוסטים והעמודים שהוא מכיל, צוות התמיכה שלנו יכול למחוק את הפוסטים, העמודים, המדיה והתגובות עבורך.\n\nכך האתר וכתובת ה-URL שלך יישארו פעילים אבל תהיה לך אפשרות להתחיל ליצור תוכן מחדש. נותר לך רק לפנות אלינו כדי למחוק את התוכן הקיים.</string>
-    <string name="let_us_help">נשמח לעזור</string>
     <string name="site_settings_start_over_hint">הקמת האתר מחדש</string>
-    <string name="start_over">להתחיל מחדש</string>
+    <string name="let_us_help">נשמח לעזור</string>
     <string name="me_btn_app_settings">הגדרות יישום</string>
+    <string name="start_over">להתחיל מחדש</string>
     <string name="editor_remove_failed_uploads">הסרת העלאות שנכשלו</string>
-    <string name="site_settings_advanced_header">אפשרויות מתקדמות</string>
     <string name="comments_empty_list_filtered_trashed">אין תגובות שהועברו לפח</string>
+    <string name="site_settings_advanced_header">אפשרויות מתקדמות</string>
     <string name="comments_empty_list_filtered_pending">אין תגובות שממתינות לאישור</string>
     <string name="comments_empty_list_filtered_approved">אין תגובות מאושרות</string>
     <string name="xmlrpc_missing_method_error">לא ניתן להתחבר. שיטות XML-RPC נדרשות חסרות בשרת.</string>
-    <string name="alignment_center">מרכז</string>
     <string name="post_format_video">וידאו</string>
+    <string name="alignment_center">מרכז</string>
     <string name="post_format_status">מצב</string>
-    <string name="post_format_standard">פוסט רגיל</string>
-    <string name="post_format_quote">ציטוט</string>
-    <string name="post_format_link">קישור</string>
+    <string name="post_format_chat">צ\'אט</string>
     <string name="post_format_image">תמונה</string>
+    <string name="post_format_link">קישור</string>
+    <string name="post_format_quote">ציטוט</string>
     <string name="post_format_gallery">גלריה</string>
-    <string name="post_format_chat">צ\'אט</string>
+    <string name="post_format_standard">פוסט רגיל</string>
     <string name="post_format_audio">אודיו</string>
-    <string name="post_format_aside">קצרצר</string>
     <string name="notif_events">מידע על קורסים ואירועים ב-WordPress.com (ברשת ופרונטלי).</string>
+    <string name="post_format_aside">קצרצר</string>
     <string name="notif_surveys">הזדמנויות להשתתף במחקרים וסקרים של WordPress.com.</string>
     <string name="notif_tips">טיפים כדי להפיק את המרב מ-WordPress.com.</string>
     <string name="notif_community">קהילה</string>
-    <string name="notif_research">מחקר</string>
     <string name="notif_suggestions">הצעות</string>
     <string name="replies_to_my_comments">מענה לתגובות שלי</string>
-    <string name="username_mentions">אזכורים של שם משתמש</string>
+    <string name="notif_research">מחקר</string>
     <string name="site_achievements">הישגי אתר</string>
-    <string name="site_follows">עוקבים אחרי האתר</string>
+    <string name="username_mentions">אזכורים של שם משתמש</string>
     <string name="likes_on_my_posts">לייקים בפוסטים שלי</string>
+    <string name="site_follows">עוקבים אחרי האתר</string>
     <string name="likes_on_my_comments">לייקים בתגובות שלי</string>
     <string name="comments_on_my_site">תגובות באתר שלי</string>
     <string name="site_settings_list_editor_summary_other">%d פריטים</string>
@@ -1989,11 +2303,11 @@ Language: he_IL
     <string name="detail_approve_auto">אישור אוטומטי של תגובות מכולם.</string>
     <string name="detail_approve_auto_if_previously_approved">אישור אוטומטי אם תגובה קודמת של המשתמש אושרה</string>
     <string name="detail_approve_manual">אישור ידני דרוש לתגובות מכולם.</string>
-    <string name="days_quantity_other">%d ימים</string>
     <string name="days_quantity_one">יום אחד</string>
-    <string name="web_address">כתובת URL</string>
+    <string name="days_quantity_other">%d ימים</string>
     <string name="primary_site">אתר ראשי</string>
     <string name="pending_email_change_snackbar">יש ללחוץ על הקישור לאימות באימייל שנשלח לכתובת %1$s כדי לאשר את כתובתך החדשה</string>
+    <string name="web_address">כתובת URL</string>
     <string name="editor_toast_uploading_please_wait">מתבצעת כרגע העלאת מדיה על-ידך. יש להמתין להשלמת הפעולה.</string>
     <string name="error_refresh_comments_showing_older">לא ניתן לרענן תגובות כרגע - מציג תגובות ישנות</string>
     <string name="post_settings_set_featured_image">בחירת תמונה ראשית</string>
@@ -2002,13 +2316,13 @@ Language: he_IL
     <string name="dlg_sure_to_delete_comments">האם למחוק תגובות אלה לצמיתות?</string>
     <string name="dlg_sure_to_delete_comment">האם למחוק תגובה זו לצמיתות?</string>
     <string name="mnu_comment_delete_permanently">מחיקה</string>
-    <string name="mnu_comment_untrash">שחזור</string>
     <string name="comment_deleted_permanently">התגובה נמחקה</string>
+    <string name="mnu_comment_untrash">שחזור</string>
     <string name="comments_empty_list_filtered_spam">אין תגובות זבל</string>
-    <string name="comment_status_all">הכול</string>
     <string name="could_not_load_page">לא ניתן היה לטעון את העמוד</string>
-    <string name="off">כיבוי</string>
+    <string name="comment_status_all">הכול</string>
     <string name="interface_language">שפת ממשק</string>
+    <string name="off">כיבוי</string>
     <string name="about_the_app">מידע על האפליקציה</string>
     <string name="error_post_account_settings">לא ניתן לשמור הגדרות החשבון</string>
     <string name="error_fetch_account_settings">לא ניתן לאחזר את הגדרות החשבון שלך</string>
@@ -2016,20 +2330,20 @@ Language: he_IL
     <string name="site_settings_unknown_language_code_error">קוד שפה לא מזוהה</string>
     <string name="site_settings_threading_dialog_description">אפשר תגובות משורשרות</string>
     <string name="site_settings_threading_dialog_header">שרשור עד עומק של</string>
-    <string name="disabled">לא מופעל</string>
     <string name="search">לחפש</string>
     <string name="remove">להסיר</string>
+    <string name="disabled">לא מופעל</string>
     <string name="site_settings_image_original_size">גודל מקורי</string>
     <string name="privacy_private">האתר גלוי רק לך ולמשתמשים שאישרת</string>
     <string name="privacy_public_not_indexed">האתר שלך גלוי לכולם אבל שולח בקשה למנועי חיפוש לא לצרף אותו לאינדקס</string>
     <string name="privacy_public">האתר שלך גלוי לכולם ומנועי חיפוש יכולים לצרף אותו לאינדקס</string>
     <string name="about_me_hint">תיאור אישי בכמה מילים…</string>
-    <string name="about_me">מי אני</string>
     <string name="public_display_name_hint">אם לא יוגדר אחרת, שם המשתמש שלך ישמש כשם תצוגה בברירת מחדל</string>
+    <string name="about_me">מי אני</string>
     <string name="public_display_name">שם תצוגה ציבורי</string>
-    <string name="last_name">שם משפחה</string>
-    <string name="first_name">שם פרטי</string>
     <string name="my_profile">הפרופיל שלי</string>
+    <string name="first_name">שם פרטי</string>
+    <string name="last_name">שם משפחה</string>
     <string name="cd_related_post_preview_image">תמונת תצוגה מקדימה של פוסט קשור</string>
     <string name="error_post_remote_site_settings">לא הצלחנו לשמור את פרטי האתר</string>
     <string name="error_fetch_remote_site_settings">לא הצלחנו לאחזר את פרטי האתר</string>
@@ -2038,7 +2352,7 @@ Language: he_IL
     <string name="site_settings_paging_dialog_description">חלוקת שרשורי תגובות למספר עמודים.</string>
     <string name="site_settings_paging_dialog_header">תגובות לעמוד</string>
     <string name="site_settings_close_after_dialog_title">סגור לתגובות</string>
-    <string name="site_settings_blacklist_description">תגובה שתכיל מילה מהמילים הללו בתוכן שלה, בשם, בכתובת, באימייל או ב-IP תסומן כתגובת זבל. אפשר להשתמש גם בחלקי מילים, כך ש-\"press\" תתאים למילה \"WordPress\".</string>
+    <string name="site_settings_denylist_description">תגובה שתכיל מילה מהמילים האלו בתוכן, בשם, בכתובת, באימייל או ב-IP שלה תסומן כתגובת זבל. אפשר להשתמש גם בחלקי מילים, כך ש-\"press\" תתאים למילה \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">תגובה שתכיל מילה מהמילים הללו בתוכן שלה, בשם, בכתובת האתר, באימייל או ב-IP תישמר בתור המנהל. אפשר להשתמש גם בחלקי מילים, כך ש-\"press\" תתאים למילה \"WordPress\".</string>
     <string name="site_settings_list_editor_input_hint">הזנת מילה או ביטוי</string>
     <string name="site_settings_list_editor_no_items_text">אין פריטים</string>
@@ -2053,10 +2367,10 @@ Language: he_IL
     <string name="site_settings_rp_show_header_title">הצגת כותרת</string>
     <string name="site_settings_rp_switch_summary">פוסטים קשורים מציגים תוכן רלוונטי מהאתר שלך, מתחת לפוסטים שלך.</string>
     <string name="site_settings_rp_switch_title">הצג תכנים באותו נושא</string>
-    <string name="site_settings_blacklist_hint">תגובות שתואמות למסנן מסומנות כתגובות זבל</string>
+    <string name="site_settings_denylist_hint">תגובות שתואמות למסנן מסומנות כתגובות זבל</string>
     <string name="site_settings_moderation_hold_hint">תגובות שתואמות למסנן עוברות לתור לאישור</string>
     <string name="site_settings_multiple_links_hint">מתעלם ממגבלת קישורים אצל משתמשים מוכרים</string>
-    <string name="site_settings_whitelist_hint">המגיב הוא מישהו שתגובתו אושרה בעבר</string>
+    <string name="site_settings_allowlist_hint">המגיב הוא מישהו שתגובתו אושרה בעבר</string>
     <string name="site_settings_user_account_required_hint">כדי להגיב יש להירשם לאתר ולהתחבר למערכת</string>
     <string name="site_settings_identity_required_hint">המגיבים חייבים לכתוב את שמם ואת כתובת האימייל שלהם</string>
     <string name="site_settings_paging_hint">הצגת כמות מוגדרת של תגובות</string>
@@ -2079,19 +2393,18 @@ Language: he_IL
     <string name="site_settings_address_hint">האפשרות לשינוי כתובת לא נתמכת כרגע</string>
     <string name="site_settings_tagline_hint">תיאור קצר או ביטוי קולע שמתארים את הבלוג שלך</string>
     <string name="site_settings_title_hint">במספר מילים, הסבר במה עוסק האתר</string>
-    <string name="site_settings_whitelist_known_summary">תגובות ממשתמשים מוכרים</string>
-    <string name="site_settings_whitelist_all_summary">תגובות מכל המשתמשים</string>
+    <string name="site_settings_allowlist_known_summary">תגובות ממשתמשים מוכרים</string>
+    <string name="site_settings_allowlist_all_summary">תגובות מכל המשתמשים</string>
     <string name="site_settings_threading_summary">%d רמות</string>
     <string name="site_settings_privacy_private_summary">פרטי</string>
     <string name="site_settings_privacy_hidden_summary">מוסתר</string>
-    <string name="site_settings_privacy_public_summary">ציבורי</string>
     <string name="site_settings_delete_site_title">מחיקת אתר</string>
-    <string name="site_settings_blacklist_title">רשימה שחורה</string>
+    <string name="site_settings_privacy_public_summary">ציבורי</string>
     <string name="site_settings_moderation_hold_title">המתנה לניהול</string>
     <string name="site_settings_multiple_links_title">קישורים בתגובות</string>
-    <string name="site_settings_whitelist_title">אישור אוטומטי</string>
-    <string name="site_settings_paging_title">עימוד</string>
+    <string name="site_settings_allowlist_title">אישור אוטומטי</string>
     <string name="site_settings_threading_title">שרשור</string>
+    <string name="site_settings_paging_title">עימוד</string>
     <string name="site_settings_sort_by_title">מיון לפי</string>
     <string name="site_settings_account_required_title">משתמשים חייבים להיות מחוברים</string>
     <string name="site_settings_identity_required_title">חובה לציין שם ואימייל</string>
@@ -2101,22 +2414,22 @@ Language: he_IL
     <string name="site_settings_default_format_title">סוג ברירת מחדל</string>
     <string name="site_settings_default_category_title">קטגוריית ברירת מחדל</string>
     <string name="site_settings_address_title">כתובת</string>
-    <string name="site_settings_tagline_title">תיאור האתר</string>
     <string name="site_settings_title_title">שם האתר</string>
+    <string name="site_settings_tagline_title">תיאור האתר</string>
     <string name="site_settings_discussion_new_posts_header">ברירות מחדל עבור פוסטים חדשים</string>
-    <string name="site_settings_writing_header">כתיבה</string>
     <string name="site_settings_account_header">חשבון</string>
+    <string name="site_settings_writing_header">כתיבה</string>
     <string name="site_settings_general_header">כללי</string>
     <string name="newest_first">חדשים תחילה</string>
-    <string name="oldest_first">ישנים תחילה</string>
-    <string name="close_after">סגור אחרי</string>
+    <string name="discussion">דיון</string>
+    <string name="privacy">פרטיות</string>
     <string name="comments">תגובות</string>
+    <string name="close_after">סגור אחרי</string>
     <string name="related_posts">באותו נושא</string>
-    <string name="privacy">פרטיות</string>
-    <string name="discussion">דיון</string>
+    <string name="oldest_first">ישנים תחילה</string>
     <string name="media_error_no_permission_upload">אין לך הרשאה להעלות מדיה לאתר</string>
-    <string name="unknown">לא ידוע</string>
     <string name="never">לעולם לא</string>
+    <string name="unknown">לא ידוע</string>
     <string name="reader_err_get_post_not_found">הפוסט כבר לא קיים</string>
     <string name="reader_err_get_post_not_authorized">אינך רשאי לראות פוסט זה</string>
     <string name="reader_err_get_post_generic">לא ניתן לאחזר פוסט זה</string>
@@ -2128,21 +2441,21 @@ Language: he_IL
     <string name="theme_activation_error">משהו השתבש. לאניתן להפעיל תבנית</string>
     <string name="theme_by_author_prompt_append">מאת %1$s</string>
     <string name="theme_prompt">תודה שבחרת %1$s</string>
-    <string name="theme_manage_site">ניהול אתר</string>
-    <string name="theme_done">הושלם</string>
-    <string name="theme_support">תמיכה</string>
-    <string name="theme_details">פרטים</string>
     <string name="theme_view">הצג</string>
+    <string name="theme_details">פרטים</string>
+    <string name="theme_support">תמיכה</string>
+    <string name="theme_done">הושלם</string>
+    <string name="theme_manage_site">ניהול אתר</string>
     <string name="theme_try_and_customize">נסה והתאם אישית</string>
     <string name="theme_activate">הפעלה</string>
-    <string name="active">פעיל</string>
-    <string name="support">תמיכה</string>
+    <string name="current_theme">תבנית נוכחית</string>
     <string name="details">פרטים</string>
+    <string name="support">תמיכה</string>
     <string name="customize">התאמה אישית</string>
-    <string name="current_theme">תבנית נוכחית</string>
-    <string name="page_updated">עמוד עודכן</string>
-    <string name="post_updated">פוסט עודכן</string>
+    <string name="active">פעיל</string>
     <string name="page_published">עמוד פורסם</string>
+    <string name="post_updated">פוסט עודכן</string>
+    <string name="page_updated">עמוד עודכן</string>
     <string name="post_published">הפוסט פורסם</string>
     <string name="theme_no_search_result_found">לא נמצאו תבניות.</string>
     <string name="reader_label_gap_marker">פוסטים נוספים</string>
@@ -2165,6 +2478,7 @@ Language: he_IL
     <string name="reader_short_like_count_multi">%s לייקים</string>
     <string name="reader_short_like_count_one">לייק אחד</string>
     <string name="reader_short_like_count_none">לייק</string>
+    <string name="reader_label_follow_count">%,d עוקבים</string>
     <string name="reader_menu_tags">לערוך נושאים ואתרים</string>
     <string name="reader_title_post_detail">פוסט</string>
     <string name="notifications_push_summary">הגדרת התראות יוצגו במכשיר שלך. </string>
@@ -2174,19 +2488,19 @@ Language: he_IL
     <string name="notification_types">סוגי התראות</string>
     <string name="error_loading_notifications">לא ניתן לטעון הגדרות של התראות</string>
     <string name="comment_likes">לייקים לתגובות</string>
-    <string name="app_notifications">התראות אפליקציה</string>
     <string name="email">אימייל</string>
     <string name="notifications_tab">טאב התראות</string>
+    <string name="app_notifications">התראות אפליקציה</string>
     <string name="notification_settings_item_other_account_emails_summary">תמיד נשלח אימיילים חשובים הקשורים לאתר, אבל לפעמים תקבלו גם תוספות מועילות.</string>
     <string name="stats_insights_latest_post_summary">סיכום פוסטים אחרונים</string>
     <string name="connectionbar_no_connection">אין חיבור</string>
     <string name="post_trashed">הפוסט הועבר לפח</string>
-    <string name="button_trash">פח</string>
     <string name="button_stats">נתונים סטטיסטיים</string>
+    <string name="button_trash">פח</string>
     <string name="button_preview">תצוגה מקדימה</string>
     <string name="button_view">הצגה</string>
-    <string name="button_publish">פרסום</string>
     <string name="button_edit">עריכה</string>
+    <string name="button_publish">פרסום</string>
     <string name="reader_toast_err_follow_blog_not_authorized">אינך מורשה להיכנס לאתר זה</string>
     <string name="reader_toast_err_follow_blog_not_found">האתר לא נמצא</string>
     <string name="undo">ביטול פעולה אחרונה</string>
@@ -2197,265 +2511,264 @@ Language: he_IL
     <string name="stats_insights_all_time">פוסטים, צפיות ומבקרים מההתחלה ועד היום</string>
     <string name="stats_insights">תובנות</string>
     <string name="me_disconnect_from_wordpress_com">התנתקות מוורדפרס.קום</string>
-    <string name="me_connect_to_wordpress_com">התחברות לוורדפרס.קום</string>
     <string name="me_btn_login_logout">כניסה/יציאה</string>
-    <string name="me_btn_support">עזרה ותמיכה</string>
+    <string name="me_connect_to_wordpress_com">התחברות לוורדפרס.קום</string>
     <string name="account_settings">הגדרות חשבון</string>
+    <string name="me_btn_support">עזרה ותמיכה</string>
     <string name="site_picker_cant_hide_current_site">\"%s\" לא הוסתר מכיוון שזהו האתר הנוכחי</string>
     <string name="site_picker_create_wpcom">יצירת אתר וורדפרס.קום</string>
     <string name="site_picker_add_self_hosted">הוספת אתר באחסון עצמי</string>
-    <string name="site_picker_add_site">הוספת אתר חדש</string>
     <string name="site_picker_edit_visibility">הצגת/הסתרת אתרים</string>
-    <string name="site_picker_title">בחירת אתר</string>
-    <string name="my_site_btn_view_site">הצגת אתר</string>
+    <string name="site_picker_add_site">הוספת אתר חדש</string>
     <string name="my_site_btn_view_admin">הצגת מנהל מערכת</string>
+    <string name="my_site_btn_view_site">הצגת אתר</string>
+    <string name="site_picker_title">בחירת אתר</string>
     <string name="my_site_btn_switch_site">החלפת אתר</string>
-    <string name="my_site_btn_site_settings">הגדרות</string>
     <string name="my_site_btn_blog_posts">פוסטים בבלוג</string>
-    <string name="my_site_header_publish">פרסום</string>
+    <string name="my_site_btn_site_settings">הגדרות</string>
     <string name="my_site_header_look_and_feel">סגנון</string>
+    <string name="my_site_header_publish">פרסום</string>
     <string name="my_site_header_configuration">הגדרות תצורה</string>
     <string name="reader_label_new_posts_subtitle">יש ללחוץ כדי להציג</string>
-    <string name="deselect_all">ביטול בחירה בכל האפשרויות</string>
     <string name="select_all">בחר הכל</string>
-    <string name="hide">הסתר</string>
     <string name="show">הצג</string>
+    <string name="hide">הסתר</string>
+    <string name="deselect_all">ביטול בחירה בכל האפשרויות</string>
+    <string name="language">שפה</string>
     <string name="auth_required">יש להתחבר שוב כדי המשיך.</string>
-    <string name="invalid_verification_code">קוד אימות שגוי</string>
     <string name="verification_code">קוד אימות</string>
-    <string name="language">שפה</string>
+    <string name="invalid_verification_code">קוד אימות שגוי</string>
     <string name="reader_empty_posts_request_failed">לא הצלחנו לאחזר פוסטים</string>
     <string name="publisher">Publisher:</string>
     <string name="error_notification_open">לא הצלחנו לפתוח את ההתראה</string>
     <string name="stats_search_terms_unknown_search_terms">מונחי חיפוש לא ידועים</string>
-    <string name="stats_view_search_terms">מונחי חיפוש</string>
     <string name="stats_view_authors">מחברים</string>
+    <string name="stats_view_search_terms">מונחי חיפוש</string>
     <string name="comments_fetching">מביא תגובות…</string>
     <string name="pages_fetching">מביא עמודים…</string>
     <string name="posts_fetching">מביא פוסטים…</string>
     <string name="media_fetching">מביא מדיה…</string>
-    <string name="logs_copied_to_clipboard">הלוגים של האפליקציה הועתקו אל ה-clipboard</string>
-    <string name="reader_empty_posts_in_blog">האתר הזה ריק</string>
     <string name="reader_label_new_posts">פוסטים חדשים</string>
-    <string name="reader_page_recommended_blogs">אתרים מומלצים עבורך </string>
+    <string name="logs_copied_to_clipboard">הלוגים של האפליקציה הועתקו אל ה-clipboard</string>
     <string name="error_copy_to_clipboard">אירעה שגיאה בעת העתקת הטקסט אל ה-clipboard</string>
     <string name="post_uploading">מעלה פוסט</string>
-    <string name="stats_followers_years">%1$d שנים</string>
-    <string name="stats_followers_a_year">שנה</string>
+    <string name="reader_empty_posts_in_blog">האתר הזה ריק</string>
+    <string name="themes_fetching">משיג ערכות עיצוב…</string>
     <string name="stats_followers_months">%1$d חודשים</string>
-    <string name="stats_followers_a_month">חודש</string>
-    <string name="stats_followers_days">%1$d ימים</string>
-    <string name="stats_followers_a_day">יום</string>
-    <string name="stats_followers_hours">%1$d שעות</string>
-    <string name="stats_followers_an_hour_ago">לפני שעה</string>
+    <string name="stats_followers_a_year">שנה</string>
+    <string name="stats_followers_years">%1$d שנים</string>
+    <string name="stats_followers_a_month">חודש</string>
     <string name="stats_followers_minutes">%1$d דקות</string>
+    <string name="stats_followers_an_hour_ago">לפני שעה</string>
+    <string name="stats_followers_hours">%1$d שעות</string>
+    <string name="stats_followers_a_day">יום</string>
+    <string name="stats_followers_days">%1$d ימים</string>
     <string name="stats_followers_a_minute_ago">לפני דקה</string>
     <string name="stats_followers_seconds_ago">לפני כמה שניות</string>
-    <string name="stats_view_followers">עוקבים</string>
-    <string name="stats_view_publicize">שיתוף אוטומטי</string>
-    <string name="stats_view_videos">וידאו</string>
     <string name="stats_view_top_posts_and_pages">פוסטים ועמודים</string>
+    <string name="stats_view_publicize">שיתוף אוטומטי</string>
+    <string name="stats_view_followers">עוקבים</string>
     <string name="stats_view_countries">מדינות</string>
     <string name="stats_likes"> לייקים</string>
-    <string name="stats_visitors">מבקרים</string>
-    <string name="stats_views">צפיות</string>
     <string name="stats_timeframe_years">שנים</string>
-    <string name="themes_fetching">משיג ערכות עיצוב…</string>
+    <string name="stats_views">צפיות</string>
+    <string name="stats_visitors">מבקרים</string>
+    <string name="stats_view_videos">וידאו</string>
     <string name="ssl_certificate_details">פרטים</string>
     <string name="cab_selected">%d נבחרו</string>
-    <string name="browse_our_faq_button">לעיון בשאלות הנפוצות שלנו</string>
     <string name="reader_empty_comments">אין תגובות עדיין</string>
-    <string name="reader_empty_posts_in_tag">אין פוסטים עם נושא זה</string>
-    <string name="reader_label_like">לייק</string>
     <string name="reader_label_view_original">לצפות בפוסט המקורי</string>
     <string name="reader_label_comments_closed">תגובות לא מופעלות</string>
-    <string name="reader_title_photo_viewer">%1$d מתוך %2$d</string>
     <string name="error_publish_empty_post">לא ניתן לפרסם פוסט ריק</string>
-    <string name="error_refresh_unauthorized_posts">אין לך הרשאה לערוך או לצפות בפוסטים</string>
+    <string name="more">עוד</string>
     <string name="error_refresh_unauthorized_pages">אין לך הרשאה לערוך או לצפות בעמודים</string>
+    <string name="error_refresh_unauthorized_posts">אין לך הרשאה לערוך או לצפות בפוסטים</string>
+    <string name="reader_title_photo_viewer">%1$d מתוך %2$d</string>
+    <string name="comment">תגובה</string>
+    <string name="comment_trashed">התגובה הועברה לפח</string>
+    <string name="posts_empty_list">אין פוסטים עדיין. למה לא ליצור אחד?</string>
+    <string name="comment_reply_to_user">להגיב ל-%s</string>
+    <string name="browse_our_faq_button">לעיון בשאלות הנפוצות שלנו</string>
+    <string name="reader_label_like">לייק</string>
     <string name="error_refresh_unauthorized_comments">איך לך הרשאה להציג או לערוך תגובות</string>
-    <string name="more">עוד</string>
     <string name="older_month">בן יותר מחודש</string>
-    <string name="older_last_week">בן יותר משבוע</string>
     <string name="older_two_days">בן יותר מיומיים</string>
+    <string name="older_last_week">בן יותר משבוע</string>
     <string name="mnu_comment_liked">פרסם לייק</string>
-    <string name="comment">תגובה</string>
-    <string name="comment_trashed">התגובה הועברה לפח</string>
-    <string name="comment_reply_to_user">להגיב ל-%s</string>
-    <string name="posts_empty_list">אין פוסטים עדיין. למה לא ליצור אחד?</string>
     <string name="signing_out">יוצא מהמערכת…</string>
+    <string name="reader_empty_posts_in_tag">אין פוסטים עם נושא זה</string>
     <string name="reader_toast_err_generic">לא ניתן לבצע את הפעולה</string>
     <string name="reader_toast_err_block_blog">לא ניתן לחסום אתר זה</string>
     <string name="reader_toast_blog_blocked">הפוסטים מהאתר הזה לא יוצגו עוד</string>
     <string name="reader_menu_block_blog">לחסום את האתר הזה</string>
-    <string name="schedule_verb">תזמן</string>
     <string name="update_verb">עדכן</string>
-    <string name="reader_empty_recommended_blogs">אין אתרים מומלצים</string>
-    <string name="reader_toast_err_unfollow_blog">לא ניתן לבטל את המעקב אחר אתר זה</string>
+    <string name="schedule_verb">תזמן</string>
+    <string name="reader_toast_err_get_blog_info">לא ניתן להציג אתר זה</string>
     <string name="reader_toast_err_follow_blog">לא ניתן לעקוב אחר אתר זה</string>
+    <string name="reader_toast_err_unfollow_blog">לא ניתן לבטל את המעקב אחר אתר זה</string>
+    <string name="reader_empty_recommended_blogs">אין אתרים מומלצים</string>
     <string name="reader_toast_err_already_follow_blog">אתר זה כבר במעקב שלך</string>
-    <string name="reader_toast_err_get_blog_info">לא ניתן להציג אתר זה</string>
     <string name="reader_label_followed_blog">האתר נעקב</string>
-    <string name="reader_hint_add_tag_or_url">יש להזין כתובת URL או נושא למעקב</string>
+    <string name="reader_title_blog_preview">אתר</string>
     <string name="reader_page_followed_blogs">אתרים במעקב</string>
+    <string name="reader_hint_add_tag_or_url">יש להזין כתובת URL או נושא למעקב</string>
     <string name="reader_page_followed_tags">נושאים במעקב</string>
-    <string name="reader_title_blog_preview">אתר</string>
-    <string name="ssl_certificate_ask_trust">אם בדרך כלל אתה מתחבר לאתר זה ללא בעיות, ייתכן ששגיאה זו נובעת מכך שמישהו מנסה להתחזות לאתר ולכן אסור לך להמשיך. האם ברצונך בכל זאת לתת אמון באישור?</string>
-    <string name="ssl_certificate_error">אישור SSL לא תקף</string>
-    <string name="forgot_password">איבדת את הסיסמה שלך?</string>
     <string name="help">עזרה</string>
-    <string name="username_or_password_incorrect">שם המשתמש או הסיסמה שהקלדת שגויים</string>
-    <string name="email_invalid">הקלד כתובת אימייל חוקית</string>
-    <string name="invalid_email_message">כתובת האימייל שלך לא תקפה</string>
-    <string name="error_downloading_image">שגיאה בזמן הורדת תמונה</string>
-    <string name="error_load_comment">לא ניתן היה להעלות את התגובה</string>
-    <string name="error_edit_comment">אירעה שגיאה בזמן עריכת התגובה</string>
-    <string name="error_moderate_comment">אירעה שגיאה בזמן בדיקת התגובות</string>
-    <string name="error_generic">אירעה שגיאה</string>
-    <string name="error_refresh_comments">לא ניתן לרענן תגובות כעת</string>
-    <string name="error_refresh_pages">לא ניתן לרענן דפים כעת</string>
-    <string name="error_refresh_posts">לא ניתן לרענן רשומות כעת</string>
-    <string name="error_deleting_post">אירעה שגיאה בזמן מחיקת הפוסט</string>
-    <string name="notifications_empty_list">אין הודעות</string>
-    <string name="sdcard_message">יש לטעון כרטיס SD כדי להעלות קבצים</string>
-    <string name="cat_name_required">שם הקטגוריה הוא שדה חובה</string>
-    <string name="adding_cat_success">הקטגוריה הוספה בהצלחה</string>
-    <string name="adding_cat_failed">הוספת קטגוריה נכשלה</string>
-    <string name="mnu_comment_unspam">לא תגובת זבל</string>
+    <string name="ssl_certificate_error">אישור SSL לא תקף</string>
+    <string name="ssl_certificate_ask_trust">אם בדרך כלל אתה מתחבר לאתר זה ללא בעיות, ייתכן ששגיאה זו נובעת מכך שמישהו מנסה להתחזות לאתר ולכן אסור לך להמשיך. האם ברצונך בכל זאת לתת אמון באישור?</string>
+    <string name="no_network_message">אין רשת זמינה</string>
+    <string name="gallery_error">לא ניתן היה לאחזר את פריט המדיה</string>
     <string name="theme_fetch_failed">הבאת ערכות העיצוב נכשלה</string>
+    <string name="mnu_comment_unspam">לא תגובת זבל</string>
+    <string name="adding_cat_failed">הוספת קטגוריה נכשלה</string>
+    <string name="adding_cat_success">הקטגוריה הוספה בהצלחה</string>
+    <string name="cat_name_required">שם הקטגוריה הוא שדה חובה</string>
+    <string name="sdcard_message">יש לטעון כרטיס SD כדי להעלות קבצים</string>
+    <string name="notifications_empty_list">אין הודעות</string>
+    <string name="error_refresh_posts">לא ניתן לרענן רשומות כעת</string>
+    <string name="error_refresh_pages">לא ניתן לרענן דפים כעת</string>
+    <string name="error_refresh_comments">לא ניתן לרענן תגובות כעת</string>
+    <string name="error_generic">אירעה שגיאה</string>
+    <string name="error_moderate_comment">אירעה שגיאה בזמן בדיקת התגובות</string>
+    <string name="error_edit_comment">אירעה שגיאה בזמן עריכת התגובה</string>
+    <string name="error_load_comment">לא ניתן היה להעלות את התגובה</string>
+    <string name="error_downloading_image">שגיאה בזמן הורדת תמונה</string>
+    <string name="invalid_email_message">כתובת האימייל שלך לא תקפה</string>
+    <string name="email_invalid">הקלד כתובת אימייל חוקית</string>
+    <string name="username_or_password_incorrect">שם המשתמש או הסיסמה שהקלדת שגויים</string>
     <string name="blog_not_found">אירעה שגיאה בזמן הגישה לאתר זה</string>
-    <string name="gallery_error">לא ניתן היה לאחזר את פריט המדיה</string>
-    <string name="no_network_message">אין רשת זמינה</string>
-    <string name="reader_toast_err_remove_tag">לא ניתן להסיר נושא זה</string>
-    <string name="reader_toast_err_add_tag">לא ניתן להוסיף נושא זה</string>
-    <string name="reader_title_applog">יומן יישום</string>
+    <string name="error_deleting_post">אירעה שגיאה בזמן מחיקת הפוסט</string>
+    <string name="select_categories">בחר קטגוריות</string>
+    <string name="connection_error">שגיאת התחברות</string>
+    <string name="cancel_edit">בטל עריכה</string>
+    <string name="post_not_found">אירעה שגיאה בזמן העלאת הרשומה. רענן את הרשומות שלך ונסה שנית.</string>
+    <string name="learn_more">מידע נוסף</string>
+    <string name="media_gallery_type_thumbnail_grid">טבלת תמונות ממוזערות</string>
+    <string name="media_error_no_permission">אין לך הרשאה לצפות בספריית המדיה</string>
+    <string name="cannot_delete_multi_media_items">לא ניתן בשלב זה למחוק חלק מהמדיה. נסה שנית מאוחר יותר.</string>
+    <string name="link_enter_url_text">טקסט קישור (אופציונאלי)</string>
+    <string name="page_settings">הגדרות דף</string>
+    <string name="local_draft">טיוטה מקומית</string>
+    <string name="file_not_found">מציאת הקובץ להעלאה נכשלה. האם הוא נמחק או הועבר?</string>
+    <string name="post_settings">הגדרות רשומה</string>
+    <string name="comment_status_approved">אושר</string>
+    <string name="comment_status_unapproved">בהמתנה</string>
+    <string name="comment_status_spam">תגובות זבל</string>
+    <string name="comment_status_trash">הושלך לאשפה</string>
+    <string name="edit_comment">ערוך תגובה</string>
+    <string name="mnu_comment_approve">אשר</string>
+    <string name="mnu_comment_unapprove">בטל אישור</string>
+    <string name="mnu_comment_spam">תגובות זבל</string>
+    <string name="mnu_comment_trash">אשפה</string>
+    <string name="dlg_approving_comments">מאשר</string>
+    <string name="dlg_unapproving_comments">מבטל אישור</string>
+    <string name="dlg_spamming_comments">מסמן כתגובת זבל</string>
+    <string name="dlg_trashing_comments">שולח לאשפה</string>
+    <string name="dlg_confirm_trash_comments">לשלוח לאשפה?</string>
+    <string name="trash">אשפה</string>
+    <string name="saving_changes">שומר שינויים</string>
+    <string name="sure_to_cancel_edit_comment">לבטל עריכה של תגובה זו?</string>
+    <string name="content_required">נדרשת תגובה</string>
+    <string name="toast_comment_unedited">התגובה לא השתנתה</string>
+    <string name="view_in_browser">הצג בדפדפן</string>
+    <string name="add_new_category">הוסף קטגוריה חדשה</string>
+    <string name="category_name">שם קטגוריה</string>
+    <string name="file_error_create">יצירת קובץ temp להעלאת קבצים לא הצליחה. וודא שיש מספיק מקום פנוי במכשיר.</string>
+    <string name="open_source_licenses">רישיונות קוד פתוח</string>
+    <string name="http_authorization_required">דרושה הרשאה</string>
+    <string name="new_post">רשומה חדשה</string>
+    <string name="new_media">מדיה חדשה</string>
+    <string name="privacy_policy">מדיניות פרטיות</string>
+    <string name="local_changes">שינויים מקומיים</string>
+    <string name="image_settings">הגדרות תמונה</string>
     <string name="fatal_db_error">אירעה שגיאה בזמן יצירת מסד הנתונים של היישום. נסה להתקין מחדש את היישום.</string>
+    <string name="reader_title_applog">יומן יישום</string>
     <string name="error_blog_hidden">זה אתר סמוי ולא ניתן לטעון אותו. אפשר אותו שוב בהגדרות ונסה שנית.</string>
-    <string name="error_refresh_media">לא ניתן לרענן את פריטי המדיה כעת</string>
+    <string name="remove_account">הסר אתר</string>
     <string name="wordpress_blog">אתר ב-WordPress</string>
-    <string name="image_settings">הגדרות תמונה</string>
-    <string name="local_changes">שינויים מקומיים</string>
-    <string name="privacy_policy">מדיניות פרטיות</string>
-    <string name="new_media">מדיה חדשה</string>
-    <string name="new_post">רשומה חדשה</string>
     <string name="notifications_empty_all">אין התראות… עדיין.</string>
-    <string name="http_authorization_required">דרושה הרשאה</string>
     <string name="invalid_site_url_message">יש לוודא שכתובת ה-URL של האתר שהוזנה תקפה</string>
-    <string name="open_source_licenses">רישיונות קוד פתוח</string>
-    <string name="file_error_create">יצירת קובץ temp להעלאת קבצים לא הצליחה. וודא שיש מספיק מקום פנוי במכשיר.</string>
-    <string name="category_name">שם קטגוריה</string>
-    <string name="add_new_category">הוסף קטגוריה חדשה</string>
-    <string name="view_in_browser">הצג בדפדפן</string>
-    <string name="remove_account">הסר אתר</string>
-    <string name="toast_comment_unedited">התגובה לא השתנתה</string>
-    <string name="content_required">נדרשת תגובה</string>
-    <string name="sure_to_cancel_edit_comment">לבטל עריכה של תגובה זו?</string>
-    <string name="saving_changes">שומר שינויים</string>
-    <string name="trash">אשפה</string>
-    <string name="dlg_confirm_trash_comments">לשלוח לאשפה?</string>
-    <string name="dlg_trashing_comments">שולח לאשפה</string>
-    <string name="dlg_spamming_comments">מסמן כתגובת זבל</string>
-    <string name="dlg_unapproving_comments">מבטל אישור</string>
-    <string name="dlg_approving_comments">מאשר</string>
-    <string name="mnu_comment_trash">אשפה</string>
-    <string name="mnu_comment_spam">תגובות זבל</string>
-    <string name="mnu_comment_unapprove">בטל אישור</string>
-    <string name="mnu_comment_approve">אשר</string>
-    <string name="edit_comment">ערוך תגובה</string>
-    <string name="comment_status_trash">הושלך לאשפה</string>
-    <string name="comment_status_spam">תגובות זבל</string>
-    <string name="comment_status_unapproved">בהמתנה</string>
-    <string name="comment_status_approved">אושר</string>
-    <string name="delete_page">למחוק עמוד? </string>
-    <string name="delete_post">למחוק פוסט? </string>
-    <string name="post_settings">הגדרות רשומה</string>
-    <string name="file_not_found">מציאת הקובץ להעלאה נכשלה. האם הוא נמחק או הועבר?</string>
-    <string name="local_draft">טיוטה מקומית</string>
-    <string name="page_settings">הגדרות דף</string>
-    <string name="link_enter_url_text">טקסט קישור (אופציונאלי)</string>
-    <string name="cannot_delete_multi_media_items">לא ניתן בשלב זה למחוק חלק מהמדיה. נסה שנית מאוחר יותר.</string>
-    <string name="media_error_no_permission">אין לך הרשאה לצפות בספריית המדיה</string>
-    <string name="media_gallery_type_thumbnail_grid">טבלת תמונות ממוזערות</string>
-    <string name="learn_more">מידע נוסף</string>
-    <string name="post_not_found">אירעה שגיאה בזמן העלאת הרשומה. רענן את הרשומות שלך ונסה שנית.</string>
+    <string name="error_refresh_media">לא ניתן לרענן את פריטי המדיה כעת</string>
     <string name="plugin_not_found">אירעה שגיאה במהלך הגישה לתוסף זה</string>
-    <string name="cancel_edit">בטל עריכה</string>
-    <string name="connection_error">שגיאת התחברות</string>
-    <string name="select_categories">בחר קטגוריות</string>
+    <string name="delete_post">למחוק פוסט? </string>
+    <string name="delete_page">למחוק עמוד? </string>
+    <string name="reader_toast_err_add_tag">לא ניתן להוסיף נושא זה</string>
+    <string name="reader_toast_err_remove_tag">לא ניתן להסיר נושא זה</string>
     <string name="share_link">קישור לשיתוף</string>
     <string name="reader_empty_posts_in_tag_updating">מביא רשומות…</string>
     <string name="reader_likes_you_and_multi">אתה ו- %,d אחרים אוהבים את זה</string>
     <string name="reader_likes_multi">%,d אנשים אוהבים את זה</string>
     <string name="reader_label_reply">תשובה</string>
-    <string name="cant_share_no_visible_blog">אינך יכול לשתף ב-WordPress ללא אתר גלוי</string>
     <string name="comment_spammed">התגובה סומנה כתגובת זבל</string>
-    <string name="reader_toast_err_get_post">לא ניתן לאחזר רשומה זו</string>
+    <string name="cant_share_no_visible_blog">אינך יכול לשתף ב-WordPress ללא אתר גלוי</string>
     <string name="reader_likes_you_and_one">אתה ועוד אחד אוהבים את זה</string>
-    <string name="pick_video">בחר וידאו</string>
     <string name="pick_photo">בחר תמונה</string>
-    <string name="sign_up_label">הרשמה</string>
-    <string name="reader_toast_err_url_intent">לא ניתן לפתוח את %s</string>
-    <string name="reader_toast_err_view_image">לא ניתן להציג תמונה</string>
-    <string name="reader_toast_err_share_intent">לא ניתן לשתף</string>
-    <string name="reader_toast_err_tag_invalid">נושא זה אינו תקף</string>
-    <string name="reader_toast_err_tag_exists">כבר בחרת לעקוב אחר נושא זה</string>
-    <string name="reader_toast_err_comment_failed">לא ניתן לפרסם את תגובתך</string>
-    <string name="reader_likes_only_you">אתה אוהב את זה</string>
-    <string name="reader_likes_one">אדם אחד אוהב את זה</string>
-    <string name="reader_label_removed_tag">%s הוסר</string>
-    <string name="reader_label_added_tag">%s התווסף</string>
-    <string name="reader_hint_comment_on_comment">השב לתגובה</string>
-    <string name="reader_btn_unfollow">עוקב</string>
-    <string name="reader_btn_follow">עקוב</string>
-    <string name="reader_btn_share">שתף</string>
+    <string name="pick_video">בחר וידאו</string>
+    <string name="reader_toast_err_get_post">לא ניתן לאחזר רשומה זו</string>
+    <string name="empty_list_default">רשימה זו ריקה</string>
     <string name="reader_untitled_post">(ללא כותרת)</string>
+    <string name="reader_view_reblog">פרסום מחדש בבלוג</string>
+    <string name="reader_btn_share">שתף</string>
+    <string name="reader_btn_follow">עקוב</string>
+    <string name="reader_btn_unfollow">עוקב</string>
+    <string name="reader_hint_comment_on_comment">השב לתגובה</string>
+    <string name="reader_label_added_tag">%s התווסף</string>
+    <string name="reader_label_removed_tag">%s הוסר</string>
+    <string name="reader_likes_one">אדם אחד אוהב את זה</string>
+    <string name="reader_likes_only_you">אתה אוהב את זה</string>
+    <string name="reader_toast_err_comment_failed">לא ניתן לפרסם את תגובתך</string>
+    <string name="reader_toast_err_share_intent">לא ניתן לשתף</string>
+    <string name="reader_toast_err_view_image">לא ניתן להציג תמונה</string>
+    <string name="reader_toast_err_url_intent">לא ניתן לפתוח את %s</string>
     <string name="comments_empty_list">עדיין אין תגובות</string>
-    <string name="empty_list_default">רשימה זו ריקה</string>
-    <string name="stats_timeframe_months">חודשים</string>
-    <string name="stats_timeframe_weeks">שבועות</string>
-    <string name="stats_timeframe_days">ימים</string>
-    <string name="stats_timeframe_yesterday">אתמול</string>
-    <string name="stats_timeframe_today">היום</string>
+    <string name="sign_up_label">הרשמה</string>
+    <string name="reader_toast_err_tag_exists">כבר בחרת לעקוב אחר נושא זה</string>
+    <string name="reader_toast_err_tag_invalid">נושא זה אינו תקף</string>
+    <string name="themes">ערכות עיצוב</string>
+    <string name="media_gallery_type_squares">ריבועים</string>
+    <string name="media_gallery_type_tiled">אריחים</string>
+    <string name="media_gallery_type_circles">עיגולים</string>
+    <string name="media_gallery_type_slideshow">מצגת</string>
+    <string name="media_edit_title_text">כותרת</string>
+    <string name="media_edit_caption_text">כיתוב</string>
+    <string name="media_edit_description_text">תיאור</string>
+    <string name="media_edit_failure">עדכון נכשל</string>
+    <string name="theme_activate_button">הפעל</string>
+    <string name="share_action">שתף</string>
+    <string name="stats">נתונים סטטיסטיים</string>
+    <string name="stats_view_clicks">קליקים</string>
     <string name="stats_view_referrers">הפניות</string>
+    <string name="stats_timeframe_today">היום</string>
+    <string name="stats_timeframe_yesterday">אתמול</string>
+    <string name="stats_timeframe_days">ימים</string>
+    <string name="stats_timeframe_weeks">שבועות</string>
+    <string name="stats_timeframe_months">חודשים</string>
     <string name="stats_view_tags_and_categories">תגים וקטגוריות</string>
-    <string name="stats_view_clicks">קליקים</string>
-    <string name="stats">נתונים סטטיסטיים</string>
-    <string name="share_action">שתף</string>
-    <string name="theme_activate_button">הפעל</string>
-    <string name="media_edit_failure">עדכון נכשל</string>
-    <string name="media_edit_description_text">תיאור</string>
-    <string name="media_edit_caption_text">כיתוב</string>
-    <string name="media_edit_title_text">כותרת</string>
-    <string name="media_gallery_type_slideshow">מצגת</string>
-    <string name="media_gallery_type_circles">עיגולים</string>
-    <string name="media_gallery_type_tiled">אריחים</string>
-    <string name="media_gallery_type_squares">ריבועים</string>
-    <string name="themes">ערכות עיצוב</string>
-    <string name="discard">הסתר</string>
     <string name="manage">ניהול</string>
-    <string name="more_notifications">הוסף %d נוספים.</string>
+    <string name="discard">הסתר</string>
+    <string name="note_reply_successful">תגובה פורסמה</string>
     <string name="new_notifications">%d התראות חדשות</string>
+    <string name="more_notifications">הוסף %d נוספים.</string>
     <string name="follows">עוקבים</string>
-    <string name="note_reply_successful">תגובה פורסמה</string>
     <string name="sign_in">להתחבר</string>
     <string name="loading">טוען…</string>
-    <string name="httppassword">סיסמה</string>
     <string name="httpuser">שם משתמש</string>
+    <string name="httppassword">סיסמה</string>
     <string name="error_media_upload">ארעה שגיאה במהלך העלאת הקובץ.</string>
     <string name="incorrect_credentials">שם משתמש או סיסמה לא נכונים.</string>
-    <string name="log_in">להתחבר</string>
-    <string name="username">שם משתמש</string>
     <string name="password">סיסמה</string>
+    <string name="username">שם משתמש</string>
+    <string name="log_in">להתחבר</string>
     <string name="reader">קורא</string>
-    <string name="pages">עמודים</string>
     <string name="posts">פוסטים</string>
+    <string name="pages">עמודים</string>
     <string name="anonymous">אנונימי</string>
     <string name="no_network_title">הרשת אינה זמינה</string>
-    <string name="done">בוצע</string>
     <string name="ok">אוקיי</string>
+    <string name="done">בוצע</string>
     <string name="link_enter_url">URL</string>
-    <string name="tos">תנאי שימוש</string>
     <string name="version">גרסה</string>
+    <string name="tos">תנאי שימוש</string>
     <string name="app_title">וורדפרס עבור אנדרואיד</string>
     <string name="image_alignment">יישור</string>
     <string name="refresh">רענון</string>
@@ -2467,24 +2780,24 @@ Language: he_IL
     <string name="quickpress_add_error">שם קיצור הדרך אינו יכול להיות ריק</string>
     <string name="pages_private">פרטי</string>
     <string name="title">כותרת</string>
-    <string name="tags_separate_with_commas">יש להפריד תגיות בפסיקים</string>
     <string name="categories">קטגוריות</string>
+    <string name="tags_separate_with_commas">יש להפריד תגיות בפסיקים</string>
     <string name="dlg_deleting_comments">מוחק תגובות</string>
     <string name="sdcard_title">דרוש כרטיס SD</string>
     <string name="media">מדיה</string>
-    <string name="approve">אשר</string>
     <string name="delete">מחק</string>
+    <string name="approve">אשר</string>
     <string name="none">ללא</string>
-    <string name="publish_now">לפרסם כעת</string>
-    <string name="reply">תגובה</string>
-    <string name="on">ב</string>
-    <string name="preview">תצוגה מקדימה</string>
-    <string name="category_refresh_error">שגיאה ברענון קטגוריות</string>
-    <string name="error">שגיאה</string>
-    <string name="no">לא</string>
     <string name="yes">כן</string>
-    <string name="notification_settings">הגדרות התראות</string>
+    <string name="no">לא</string>
     <string name="add">הוסף</string>
     <string name="save">שמור</string>
     <string name="cancel">בטל</string>
+    <string name="error">שגיאה</string>
+    <string name="on">ב</string>
+    <string name="category_refresh_error">שגיאה ברענון קטגוריות</string>
+    <string name="reply">תגובה</string>
+    <string name="preview">תצוגה מקדימה</string>
+    <string name="notification_settings">הגדרות התראות</string>
+    <string name="publish_now">לפרסם כעת</string>
 </resources>
diff --git a/WordPress/src/main/res/values-hi/strings.xml b/WordPress/src/main/res/values-hi/strings.xml
index ef365883965c..738a23496b39 100644
--- a/WordPress/src/main/res/values-hi/strings.xml
+++ b/WordPress/src/main/res/values-hi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2017-12-02 23:45:38+0000
 Plural-Forms: nplurals=2; plural=n != 1;
@@ -32,10 +32,6 @@ Language: hi_IN
     <string name="notification_settings_category_other">अन्य </string>
     <string name="notification_settings_item_your_sites_all_your_sites">मेरे सभी साईट </string>
     <string name="notification_settings_category_your_sites">आपके साइट </string>
-    <string name="notification_settings_master_hint_off">सूचना सक्रिय करें </string>
-    <string name="notification_settings_master_hint_on">सूचना असक्रिये करें </string>
-    <string name="notification_settings_master_status_off">बंद करें </string>
-    <string name="notification_settings_master_status_on">ऑन </string>
     <string name="max_video_resolution">अधिकतम वीडियो साइज</string>
     <string name="max_thumbnail_px_size">अधिकतम छवि साइज</string>
     <string name="error_upload_post_media_param">इस पोस्ट : %s में मीडिया अपलोड करते समय त्रुटि आई।</string>
@@ -57,7 +53,6 @@ Language: hi_IN
     <string name="login_site_address">साइट का पता</string>
     <string name="login_continue">जारी रखें</string>
     <string name="next">अगला</string>
-    <string name="open_mail">मेल खोलें</string>
     <string name="turn_on">चालू करें</string>
     <string name="leave_off">छोड़ दें</string>
     <string name="post_title">शीर्षक</string>
@@ -202,7 +197,6 @@ Language: hi_IN
     <string name="reader_page_followed_blogs">अनुसरण किये गए ब्लॉग </string>
     <string name="help">सहायता</string>
     <string name="ssl_certificate_error">अमान्य एसएसएल  प्रमाणपत्र</string>
-    <string name="forgot_password">आपका पासवर्ड खो गया?</string>
     <string name="ssl_certificate_ask_trust">आप आमतौर पर समस्याओं के बिना इस साइट से कनेक्ट करते हैं, तो यह त्रुटि किसी साइट को प्रतिरूपित करने की कोशिश कर रहा है कि अर्थ हो सकता है, और यदि आप जारी नहीं किया जाना चाहिए. क्या आप फिर भी प्रमाण पत्र पर विश्वास करना चाहेंगे?</string>
     <string name="email_invalid">मान्य ईमेल पता दर्ज करें</string>
     <string name="error_generic">एक त्रुटि हुई</string>
diff --git a/WordPress/src/main/res/values-hr/strings.xml b/WordPress/src/main/res/values-hr/strings.xml
index 00d3a8e81eab..5af50d51d154 100644
--- a/WordPress/src/main/res/values-hr/strings.xml
+++ b/WordPress/src/main/res/values-hr/strings.xml
@@ -1,32 +1,106 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-08-26 21:31:09+0000
+Translation-Revision-Date: 2021-01-09 10:49:53+0000
 Plural-Forms: nplurals=3; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: hr
 -->
 <resources>
+    <string name="color_picker_label_background">Pozadina</string>
+    <string name="color_picker_label_text">Tekst</string>
+    <string name="dialog_discard_story_ok_button_edit">Odbaci</string>
+    <string name="dialog_discard_story_message_edit">Sve izvršene promjene neće biti spremljene.</string>
+    <string name="dialog_discard_story_title_edit">Odbaciti promjene?</string>
+    <string name="label_done_button">Gotovo</string>
+    <string name="label_next_button">Sljedeće</string>
+    <string name="delete_button_alt">Izbrisati</string>
+    <string name="scan">Skeniraj</string>
+    <string name="reader_discover_empty_title">Dobro došli!</string>
+    <string name="hpp_skip_button">Preskoči</string>
+    <string name="hpp_choose_button">Odaberi</string>
+    <string name="hpp_title">Odaberite dizajn</string>
+    <string name="prepublishing_nudges_add_category_button">Dodaj Kategoriju</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Dodaj novu kategoriju</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorije</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Nije postavljeno</string>
+    <string name="prepublishing_nudges_categories_action">Kategorije</string>
+    <string name="login_prologue_fifth_caption_three">Muzeji u Londonu</string>
+    <string name="login_prologue_fifth_tag_six">Politika</string>
+    <string name="login_prologue_fifth_tag_five">Glazba</string>
+    <string name="login_prologue_fifth_tag_four">Vrtlarstvo</string>
+    <string name="login_prologue_fifth_tag_three">Nogomet</string>
+    <string name="login_prologue_fifth_tag_two">Kuhanje</string>
+    <string name="login_prologue_fifth_tag_one">Umjetnost</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="media_loading_failed">Učitavanje sadržaja nije uspjelo</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Dajemo sve od sebe da uz svaku objavu dodajemo nove blokove.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' nije u potpunosti podržan</string>
+    <string name="gutenberg_native_help_button">Gumb za pomoć</string>
+    <string name="gutenberg_native_edit_using_web_editor">Uređujte pomoću web uređivača</string>
+    <string name="gutenberg_native_choose_images">Odaberite slike</string>
+    <string name="stories_intro_create_story_post_label">Napravite članak o priči</string>
+    <string name="stories_intro_title_second">Članci priče ne nestaju</string>
+    <string name="stories_intro_title_first">Priče su sada za sve</string>
+    <string name="stories_intro_image_caption_second">Primjer naslova priče</string>
+    <string name="stories_intro_image_caption_first">Kako napraviti članak iz priče</string>
+    <string name="stories_intro_main_title">Predstavljamo vam članke priče</string>
+    <string name="mlp_notice_blank_page_created">Izrađena je prazna stranica</string>
+    <string name="mlp_notice_page_created">Stranica kreirana</string>
+    <string name="reader_label_toolbar_back">Povratak</string>
+    <string name="reader_discover_empty_button_text">Započnite</string>
+    <string name="reader_post_details_header_by_author_name">Od</string>
+    <string name="mlp_selected_description">%s odabrano</string>
+    <string name="permission_microphone">Mikrofon</string>
+    <string name="reader_menu_report_post">Prijavi ovaj članak</string>
+    <string name="reader_welcome_banner">Dobrodošli u čitateljicu. Otkrijte milijune blogova na dohvat ruke.</string>
+    <string name="error_media_xmlrcp_server_error">Dogodila se interna pogreška poslužitelja</string>
+    <string name="error_media_xmlrpc_not_allowed">Vaša radnja nije dopuštena</string>
+    <string name="show_n_hidden_items_desc">Još %1$s stavki</string>
+    <string name="gutenberg_native_select_a_layout">Odaberite raspored</string>
+    <string name="create_post_story_fab_tooltip">Napravite članak ili priču</string>
+    <string name="create_page_fab_tooltip">Stvorite stranicu</string>
+    <string name="create_post_fab_tooltip">Napravite članak</string>
+    <string name="reader_discover_interests_header">Možda ti se sviđa</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Sakriti</string>
+    <string name="gutenberg_native_video_caption_empty">Video natpis. Prazan</string>
+    <string name="gutenberg_native_updates_the_title">Ažurira naslov.</string>
+    <string name="gutenberg_native_paste_block_after">Zalijepite blok nakon</string>
+    <string name="gutenberg_native_page_title_s">Naslov stranice. %s</string>
+    <string name="gutenberg_native_page_title_empty">Naslov stranice. Prazan</string>
+    <string name="toast_error_playing_video">Došlo je do pogreške tijekom reprodukcije vašeg videozapisa</string>
+    <string name="camera_error">Ovaj uređaj ne podržava API Camera2.</string>
+    <string name="toast_error_saving_video">Videozapis nije moguće spremiti</string>
+    <string name="toast_error_saving_image">Pogreška prilikom spremanja slike</string>
+    <string name="toast_capture_operation_in_progress">Operacija je u tijeku, pokušajte ponovo</string>
+    <string name="toast_story_page_not_found">Slajd Story nije pronađen</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Pogledajte spremište</string>
     <string name="label_close_button">Zatvori</string>
-    <string name="label_control_publish">Sljedeće</string>
-    <string name="label_done">Gotovo</string>
     <string name="label_share_to">Podijeli</string>
     <string name="label_control_retry">Pokušaj ponovno</string>
     <string name="label_control_saved">Spremljeno</string>
     <string name="label_control_saving">Spremanje</string>
     <string name="sound_button_alt">Zvuk</string>
     <string name="text_button_alt">Tekst</string>
-    <string name="more_button_alt">Više</string>
     <string name="stickers_button_alt">Naljepnice</string>
     <string name="alignment_none">Ništa</string>
+    <string name="alignment_right">Desno</string>
+    <string name="alignment_left">Lijevo</string>
     <string name="title_follower">Sljedbenik</string>
     <string name="people_fetching">Dohvaćanje korisnika…</string>
     <string name="people_dropdown_item_viewers">Posjetitelji</string>
     <string name="people_dropdown_item_followers">Pratitelji</string>
+    <string name="image_width">Širina</string>
+    <string name="image_link_to">Poveznica za</string>
+    <string name="image_caption">Naslov</string>
+    <string name="image_settings_save_toast">Promijene spremljene.</string>
     <string name="invite">Pozovi</string>
     <string name="invite_people">Pozovi osobe</string>
+    <string name="reader_title_related_post_detail">Vezana objava</string>
     <string name="send">Pošalji</string>
     <string name="people">Ljudi</string>
     <string name="role">Uloga</string>
+    <string name="plan">Plan</string>
+    <string name="plans">Planovi</string>
     <string name="show_purchases">Prikaži kupovine</string>
     <string name="delete_site_hint">Obriši web-stranicu</string>
     <string name="primary_domain">Primarna domena</string>
@@ -111,7 +185,6 @@ Language: hr
     <string name="site_settings_paging_dialog_description">Prijelom niza komentara u više stranica.</string>
     <string name="site_settings_paging_dialog_header">Komentara po stranici</string>
     <string name="site_settings_close_after_dialog_title">Zatvori komentiranje</string>
-    <string name="site_settings_blacklist_description">Kada komentar sadrži bilo koju od ovih riječi u svom sadržaju, imenu, URL-u, e-pošti, ili IP-u, biti će označen kao spam. Možete unijeti dijelove riječi, tako da će &amp;#8220;press&amp;#8221; odgovarati i riječi &amp;#8220;WordPress&amp;#8221;.</string>
     <string name="site_settings_hold_for_moderation_description">Kada komentar sadrži bilo koju od ovih riječi u svom sadržaju, imenu, URL-u, e-pošti, ili IP-u, biti će označen kao spam. Možete unijeti dijelove riječi, tako da će &amp;#8220;press&amp;#8221; odgovarati i riječi &amp;#8220;WordPress&amp;#8221;.</string>
     <string name="site_settings_list_editor_input_hint">Unesite riječi ili frazu</string>
     <string name="site_settings_list_editor_no_items_text">Nema stavki</string>
@@ -126,10 +199,8 @@ Language: hr
     <string name="site_settings_rp_show_header_title">Prikaži zaglavlje</string>
     <string name="site_settings_rp_switch_summary">Srodne objave prikazuju srodni sadržaj sa vaše stranice ispod vaših objava.</string>
     <string name="site_settings_rp_switch_title">Prikaži srodne objave</string>
-    <string name="site_settings_blacklist_hint">Komentari koji odgovaraju filteru označeni su kao spam</string>
     <string name="site_settings_moderation_hold_hint">Komentari koji odgovaraju filteru stavljeni su na čekanje</string>
     <string name="site_settings_multiple_links_hint">Ignoriranje limita poveznica od poznatih korisnika</string>
-    <string name="site_settings_whitelist_hint">Autor komentara mora imati prethodno odobreni komentar</string>
     <string name="site_settings_user_account_required_hint">Korisnici moraju biti registrirani i prijavljeni kako bi objavili komentare</string>
     <string name="site_settings_identity_required_hint">Autor komentara mora popuniti ime i adresu e-pošte</string>
     <string name="site_settings_paging_hint">Prikaži komentare u grupama određene veličine</string>
@@ -152,17 +223,13 @@ Language: hr
     <string name="site_settings_address_hint">Promjena vaše adrese trenutno nije podržana</string>
     <string name="site_settings_tagline_hint">Kratki opis ili pamtljiva fraza koja opisuje vaš blog</string>
     <string name="site_settings_title_hint">U nekoliko riječi, objasnite o čemu govori ova web-stranice.</string>
-    <string name="site_settings_whitelist_known_summary">Komentari od nepoznatih korisnika</string>
-    <string name="site_settings_whitelist_all_summary">Komentari svih korisnika</string>
     <string name="site_settings_threading_summary">%d nivoa</string>
     <string name="site_settings_privacy_private_summary">Privatno</string>
     <string name="site_settings_privacy_hidden_summary">Skriveno</string>
     <string name="site_settings_privacy_public_summary">Javno</string>
     <string name="site_settings_delete_site_title">Obriši web-stranicu</string>
-    <string name="site_settings_blacklist_title">Crna lista</string>
     <string name="site_settings_moderation_hold_title">Zadržati za moderaciju</string>
     <string name="site_settings_multiple_links_title">Poveznice u komentarima</string>
-    <string name="site_settings_whitelist_title">Automatsko odobravanje</string>
     <string name="site_settings_threading_title">Grananje</string>
     <string name="site_settings_paging_title">Paging</string>
     <string name="site_settings_sort_by_title">Sortiraj po</string>
@@ -309,7 +376,6 @@ Language: hr
     <string name="error_copy_to_clipboard">Došlo je do pogreške prilikom kopiranja teksta u međuspremnik</string>
     <string name="reader_label_new_posts">Nove objave</string>
     <string name="logs_copied_to_clipboard">Zapisi aplikacije su kopirani međuspremnik</string>
-    <string name="reader_page_recommended_blogs">Web-stranice koje bi vam se mogle sviđati</string>
     <string name="post_uploading">Objava se prenosi</string>
     <string name="reader_empty_posts_in_blog">Ova web-stranica je prazna</string>
     <string name="stats_followers_an_hour_ago">Prije sat vremena</string>
@@ -370,7 +436,6 @@ Language: hr
     <string name="reader_label_followed_blog">Pratite web-stranicu</string>
     <string name="reader_title_blog_preview">Web-stranica u Čitaču</string>
     <string name="help">Pomoć</string>
-    <string name="forgot_password">Izgubili ste lozinku?</string>
     <string name="ssl_certificate_error">Nevažeći SSL certifikat</string>
     <string name="ssl_certificate_ask_trust">Ako se inače uspijete spojiti sa ovom web-stranicom bez problema, ova greška mogla bi značiti da netko pokušava oponašati tu web-stranicu, i ne bi trebali nastaviti. Vjerujete certifikat unatoč tome? </string>
     <string name="notifications_empty_list">Nema obavijesti</string>
diff --git a/WordPress/src/main/res/values-hu/strings.xml b/WordPress/src/main/res/values-hu/strings.xml
index 7006c5aa4ff7..d0f7b418b9e0 100644
--- a/WordPress/src/main/res/values-hu/strings.xml
+++ b/WordPress/src/main/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2019-01-17 19:17:56+0000
+Translation-Revision-Date: 2021-02-17 12:52:29+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: hu
@@ -9,12 +9,14 @@ Language: hu
     <string name="timespan_now">most</string>
     <string name="role_follower">Követő</string>
     <string name="language">Nyelv</string>
+    <string name="auth_required">A folytatáshoz lépjünk be újra.</string>
     <string name="publisher">Közzétevő:</string>
     <string name="stats_view_authors">Szerzők</string>
     <string name="pages_fetching">Oldalak betöltése…</string>
     <string name="media_fetching">Média betöltése…</string>
     <string name="comments_fetching">Hozzászólások betöltése…</string>
     <string name="posts_fetching">Bejegyzések betöltése…</string>
+    <string name="reader_empty_posts_in_blog">Ez az oldal üres</string>
     <string name="stats_followers_years">%1$d év</string>
     <string name="stats_followers_a_month">Egy hónap</string>
     <string name="stats_followers_a_year">Egy év</string>
@@ -39,7 +41,6 @@ Language: hu
     <string name="update_verb">Frissítést</string>
     <string name="schedule_verb">Időzítés</string>
     <string name="help">Segítség</string>
-    <string name="forgot_password">Elfelejtett jelszó?</string>
     <string name="ssl_certificate_error">Érvénytelen SSL hitelesítés</string>
     <string name="mnu_comment_unspam">Nem spam</string>
     <string name="no_network_message">Nincs elérehtő hálózat</string>
@@ -101,6 +102,7 @@ Language: hu
     <string name="anonymous">Névtelen</string>
     <string name="posts">Bejegyzés</string>
     <string name="ok">OK</string>
+    <string name="done">kész</string>
     <string name="link_enter_url">URL</string>
     <string name="tos">Szolgáltatási feltételek</string>
     <string name="version">verzió</string>
diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml
index 7d8d05971079..28acaf12e5f2 100644
--- a/WordPress/src/main/res/values-id/strings.xml
+++ b/WordPress/src/main/res/values-id/strings.xml
@@ -1,17 +1,488 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-16 17:54:53+0000
+Translation-Revision-Date: 2021-05-11 11:54:48+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: id
 -->
 <resources>
+    <string name="gutenberg_native_size">Ukuran</string>
+    <string name="gutenberg_native_image_settings">Pengaturan gambar</string>
+    <string name="gutenberg_native_audio_settings">Pengaturan audio</string>
+    <string name="user_profile_untitled_site">(Tanpa judul)</string>
+    <string name="user_profile_site_section_header">Situs</string>
+    <string name="user_profile_bottom_sheet_description">Informasi lembar bawah profil pengguna</string>
+    <string name="likes_list_screen_title">Daftar Sukai %s</string>
+    <string name="gutenberg_native_write_code">Tulis kode…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Pengurutan dan penyaringan</string>
+    <string name="gutenberg_native_show_download_button">Tampilkan tombol unduh</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Selanjutnya</string>
+    <string name="gutenberg_native_preload">Pramuat</string>
+    <string name="gutenberg_native_post_meta_settings">Pengaturan meta artikel</string>
+    <string name="gutenberg_native_post_content_settings">Pengaturan konten artikel</string>
+    <string name="gutenberg_native_metadata">Metadata</string>
+    <string name="gutenberg_native_media_file">Berkas media</string>
+    <string name="gutenberg_native_media_area">Area Media</string>
+    <string name="gutenberg_native_loop">Pengulangan</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Tautan ke</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">gambar %1$d dari %2$d di galeri</string>
+    <string name="gutenberg_native_heading_d">Tajuk %d</string>
+    <string name="gutenberg_native_featured">Andalan</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Masukkan URL untuk disematkan di sini…</string>
+    <string name="gutenberg_native_edit_image">Sunting gambar</string>
+    <string name="gutenberg_native_display_post_date">Tampilkan tanggal pos</string>
+    <string name="gutenberg_native_code">Kode</string>
+    <string name="gutenberg_native_change_heading_level">Ubah level judul</string>
+    <string name="gutenberg_native_browser_default">Peramban standar</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Blok telah dihapus atau tidak tersedia.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Blok tidak dapat dirender di dalam dirinya sendiri.</string>
+    <string name="gutenberg_native_autoplay">Putar otomatis</string>
+    <string name="gutenberg_native_auto">Otomatis</string>
+    <string name="gutenberg_native_attachment_page">Laman lampiran</string>
+    <string name="gutenberg_native_add_text">Tambahkan teks…</string>
+    <string name="gutenberg_native_add_caption">Tambahkan keterangan</string>
+    <string name="gutenberg_native_what_is_alt_text">Apa itu teks alt?</string>
+    <string name="gutenberg_native_transform_s_to">Ubah %s menjadi</string>
+    <string name="gutenberg_native_transform_block">Mengubah blok…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Gagal memasukkan media.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Gagal memasukkan file audio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Jelaskan maksud gambar tersebut. Biarkan kosong jika gambar hanya hiasan. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s diubah menjadi %2$s</string>
+    <string name="like_faces_error_loading_message">Terjadi error saat memuat data sukai. %s.</string>
+    <string name="like_faces_plural_text">%d blogger menyukai ini.</string>
+    <string name="like_faces_singular_text">1 blogger menyukai ini.</string>
+    <string name="like_title_plural">%d Suka</string>
+    <string name="like_title_singular">1 Suka</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Masukkan kredensial server Anda untuk menangani ancaman.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Masukkan kredensial server Anda untuk menangani ancaman.</string>
+    <string name="suggestion">Saran:</string>
+    <string name="gutenberg_native_search_blocks">Cari blok</string>
+    <string name="gutenberg_native_search_block">Cari blok</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">ketuk dua kali untuk mengubah unit</string>
+    <string name="gutenberg_native_clear_search">Hapus pencarian</string>
+    <string name="gutenberg_native_cancel_search">Batalkan pencarian</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s adalah %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Terjadi error saat mengumpulkan data suka</string>
+    <string name="get_likes_unknown_error">Terjadi error yang tidak diketahui saat mengumpulkan suka.</string>
+    <string name="get_likes_no_network_error">Tidak ada jaringan.</string>
+    <string name="comments_empty_list_filtered_unreplied">Tidak ada komentar belum dibalas</string>
+    <string name="comment_status_unreplied">Belum dibalas</string>
+    <string name="gutenberg_native_table_of_contents">Daftar Isi</string>
+    <string name="gutenberg_native_summary">ringkasan</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Rangkum pos Anda dengan daftar heading. Tambahkan anchor HTML ke blok Heading untuk menautkannya ke sini.</string>
+    <string name="gutenberg_native_document_outline">outline dokumen</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">Alamat IP yang selalu diizinkan</string>
+    <string name="site_settings_denylist_title">Komentar yang tidak diizinkan</string>
+    <string name="reader_title_interests">Ikuti topik</string>
+    <string name="stories_intro_main_subtitle">Cara baru untuk membuat dan memposkan konten menarik di situs Anda.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Tutup</string>
+    <string name="activity_log_backup_download_notice_download_action">Unduh</string>
+    <string name="threat_fix_all_status_success_message_plural">Ancaman berhasil ditangani.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Harap konfirmasi bahwa Anda ingin memperbaiki %s ancaman aktif seluruhnya.</string>
+    <string name="scan_idle_threats_description_plural">Pemindaian menemukan %1$s potensi ancaman dengan %2$s. Tinjau di bawah ini dan ambil tindakan atau ketuk tombol perbaiki semua. Kami %3$s jika Anda membutuhkan kami.</string>
+    <string name="scan_fixing_threats_description_plural">Kami kesulitan di latar belakang untuk memperbaiki ancaman ini. Sementara itu, Anda dapat terus menggunakan situs seperti biasa dan memeriksa progresnya kapan saja.</string>
+    <string name="gutenberg_native_edit_focal_point">Edit titik fokus</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Ketuk dua kali untuk membuka Lembar Bawah, untuk mengedit, mengganti, atau menghapus gambar</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Ketuk dua kali untuk membuka Lembar Tindakan, untuk mengedit, mengganti, atau menghapus gambar</string>
+    <string name="new_site_creation_search_domain_example">contoh.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Ketik nama untuk situs Anda</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Semua tugas selesai&lt;/b&gt;&lt;br/&gt;Anda akan menjangkau lebih banyak orang. Kerja bagus!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Semua tugas selesai&lt;/b&gt;&lt;br/&gt;Anda telah menyesuaikan situs Anda. Bagus!</string>
+    <string name="quick_start_card_menu_hide">Sembunyikan untuk sekarang</string>
+    <string name="magic_link_not_meaning_to_create_account">Tidak ingin membuat akun baru? Silakan kembali dan masukkan lagi alamat email Anda.</string>
+    <string name="invite_links_disable_dialog_message">Setelah tautan undangan ini dinonaktifkan, tidak ada yang dapat menggunakannya lagi untuk bergabung dengan tim Anda. Apakah Anda yakin?</string>
+    <string name="invite_links_disable_dialog_title">Nonaktifkan tautan undangan</string>
+    <string name="invite_links_bad_format_response">Respons yang diterima tidak valid</string>
+    <string name="invite_links_null_response">Tidak ada respons yang diterima</string>
+    <string name="invite_links_cannot_get_role_data_error">Terjadi error saat mengambil data untuk peran %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Terjadi error saat mengambil peran</string>
+    <string name="invite_links_generic_get_data_error">Terjadi error saat mengambil data tautan undangan</string>
+    <string name="invite_links_helper_text">Gunakan tautan ini untuk mendaftarkan anggota tim Anda tanpa harus mengundang mereka satu per satu. Siapa pun yang mengunjungi URL berikut akan dapat mendaftar ke organisasi Anda, meski pun mereka menerima tautan dari orang lain, jadi pastikan Anda membagikannya dengan orang tepercaya.</string>
+    <string name="invite_links_expire_date">Kadaluarsa %1$s</string>
+    <string name="invite_links_disable_invite_link">Nonaktifkan tautan undangan</string>
+    <string name="invite_links_share_invite_link">Bagikan tautan undangan</string>
+    <string name="invite_links_generate">Hasilkan tautan baru</string>
+    <string name="invite_links_get_status_retry">Segarkan status tautan</string>
+    <string name="invite_links_section_title">Tautan Undangan</string>
+    <string name="threats_found_singular">Ancaman ditemukan</string>
+    <string name="threats_found_plural">Ancaman ditemukan</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Pemindaian Selesai&lt;/b&gt; &lt;br&gt; %s potensi ancaman ditemukan</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Pemindaian Selesai&lt;/b&gt; &lt;br&gt; Satu potensi ancaman ditemukan</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Pemindaian Selesai&lt;/b&gt; &lt;br&gt; Potensi ancaman tidak ditemukan</string>
+    <string name="scan_fixing_threats_title_singular">Memperbaiki Ancaman</string>
+    <string name="disable">Nonaktifkan</string>
+    <string name="quick_start_card_menu_unpin">Lepas sematan ini</string>
+    <string name="quick_start_list_review_pages_subtitle">Periksa halaman dan lakukan perubahan, atau tambahkan atau hapus halaman.</string>
+    <string name="quick_start_list_view_site_title">Kunjungi situs Anda</string>
+    <string name="quick_start_list_upload_icon_subtitle">Tambahkan ikon situs untuk tampilan yang lebih pro dan elegan.</string>
+    <string name="quick_start_list_follow_site_subtitle">Temukan dan ikuti situs yang menginspirasi Anda.</string>
+    <string name="quick_start_list_enable_sharing_title">Aktifkan berbagi</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Bagikan pos baru secara otomatis ke media sosial Anda.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Berikan nama situs yang mencerminkan karakteristik dan topik situs Anda.</string>
+    <string name="quick_start_list_check_stats_title">Periksa statistik Anda</string>
+    <string name="backup_download_status_failure_bullet2">Kami masih mencoba membuat file cadangan yang dapat diunduh.</string>
+    <string name="backup_download_status_failure_bullet1">Kami tidak dapat menemukan status untuk memberitahukan kapan cadangan yang dapat diunduh ini selesai.</string>
+    <string name="backup_download_status_failure_heading">Hmm, kami tidak dapat menemukan status cadangan yang dapat diunduh</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Ikon tanda centang</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Ikon jam</string>
+    <string name="restore_status_failure_bullet3">Kami akan memberi tahu Anda jika sudah selesai.</string>
+    <string name="restore_status_failure_bullet2">Kami masih mencoba memulihkan situs Anda.</string>
+    <string name="restore_status_failure_bullet1">Kami tidak dapat menemukan status untuk memberitahukan kapan pemulihan ini selesai.</string>
+    <string name="restore_status_failure_heading">Hmm, kami tidak dapat menemukan status pemulihan Anda</string>
+    <string name="restore_complete_failed_description">Kami tidak dapat memulihkan situs Anda</string>
+    <string name="restore_warning_action_button">Konfirmasi</string>
+    <string name="restore_warning_description_with_two_parameters">Anda yakin ingin mengembalikan situs Anda ke %1$s di %2$s?\n        Semua perubahan akan hilang.</string>
+    <string name="backup_download_complete_failed_description">Kami tidak dapat membuat cadangan</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(kecuali tema, plugin, dan unggahan)</string>
+    <string name="backup_item_contents">Direktori konten-WP</string>
+    <string name="backup_item_roots">Root WordPress</string>
+    <string name="backup_download_details_choose_items_header">Item yang disertakan di unduhan ini</string>
+    <string name="gutenberg_native_uploading">Mengunggah…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Blok pakai ulang tidak dapat disunting di WordPress untuk iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Blok pakai ulang tidak dapat disunting di WordPress untuk Android</string>
+    <string name="gutenberg_native_replace_file">Ganti file</string>
+    <string name="gutenberg_native_replace_audio">Ganti audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Terjadi masalah saat membuka audio</string>
+    <string name="gutenberg_native_open">BUKA</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Tidak ada aplikasi yang dapat menangani permintaan ini.</string>
+    <string name="gutenberg_native_lock_icon">Ikon kunci</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Gagal memasukkan file audio. Ketuk untuk melihat pilihan.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Ketuk dua kali untuk memilih file audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Ketuk dua kali untuk mendengarkan file audio</string>
+    <string name="gutenberg_native_choose_audio">Pilih audio</string>
+    <string name="gutenberg_native_audio_player">Pemutar Audio</string>
+    <string name="gutenberg_native_audio_file">file audio</string>
+    <string name="gutenberg_native_audio_caption_s">Keterangan audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Keterangan audio. Kosong</string>
+    <string name="gutenberg_native_add_audio">TAMBAHKAN AUDIO</string>
+    <string name="continue_with_wpcom">Login atau daftar dengan WordPress.com</string>
+    <string name="photo_picker_use_audio">Gunakan audio ini</string>
+    <string name="photo_picker_choose_audio">Pilih audio dari perangkat</string>
+    <string name="people_optional_custom_message_helper_text">Opsional: masukkan pesan khusus untuk disertakan dalam undangan Anda.</string>
+    <string name="people_learn_more_about_roles">Pelajari lebih lanjut tentang peran</string>
+    <string name="threat_status_fixed">Diperbaiki</string>
+    <string name="threat_found_header">Ditemukan</string>
+    <string name="scan_here_to_help">siap membantu</string>
+    <string name="scan_idle_threats_description_singular">Pemindaian menemukan satu potensi ancaman dengan %1$s. Tinjau ancaman di bawah ini dan ambil tindakan atau ketuk tombol perbaiki semua. Kami %2$s jika Anda membutuhkan kami.</string>
+    <string name="scan_idle_manual_scan_description">Untuk meninjau situs Anda lagi, jalankan pemindaian manual atau tunggu Jetpack memindai situs Anda nanti.</string>
+    <string name="scan_provisioning_description">Selamat datang di Jetpack Scan! Kami mengamati situs Anda untuk mempersiapkan pemindaian menyeluruh. Kami akan memberi tahu Anda jika kami menemukan kendala yang mungkin memengaruhi proses pemindaian, kemudian pemindaian menyeluruh yang pertama akan dimulai.</string>
+    <string name="scan_scanning_is_initial_description">Selamat datang di Jetpack Scan, kami sedang melakukan pemeriksaan perdana untuk situs Anda dan hasilnya akan segera ditampilkan.</string>
+    <string name="scan_fixing_threats_description_singular">Kami kesulitan di latar belakang untuk memperbaiki ancaman ini. Sementara itu, Anda dapat terus menggunakan situs seperti biasa dan memeriksa progresnya kapan saja.</string>
+    <string name="scan_scanning_description">Kami akan mengirimkan pemberitahuan setelah pemindaian selesai dilakukan. Sementara itu, Anda dapat terus menggunakan situs seperti biasa dan memeriksa progresnya kapan saja.</string>
+    <string name="scan_fixing_threats_title_plural">Memperbaiki Ancaman</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan tidak dapat menyelesaikan pemindaian situs Anda. Harap periksa apakah situs Anda tidak aktif – jika tidak, coba lagi. Jika tidak aktif, atau jika Jetpack Scan masih mengalami masalah, hubungi tim dukungan kami.</string>
+    <string name="scan_request_failed_title">Terjadi kesalahan</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Mencadangkan situs</string>
+    <string name="activity_log_currently_backing_up_message">Mencadangkan situs dari %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Membuat cadangan yang dapat diunduh</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Situs Anda berhasil dicadangkan</string>
+    <string name="activity_log_backup_finished_snackbar_message">Situs Anda berhasil dicadangkan\nDicadangkan dari %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Situs Anda sedang dicadangkan\nMencadangkan dari %1$s %2$s</string>
+    <string name="pick_audio">Pilih audio</string>
+    <string name="restore_another_process_running">Proses pemulihan lainnya sedang berlangsung.</string>
+    <string name="restore_complete_failed_icon_content_description">Ikon Error</string>
+    <string name="restore_complete_failed_action_button_content_description">Tombol Selesai</string>
+    <string name="restore_complete_failed_title">Pemulihan gagal</string>
+    <string name="restore_complete_visit_site_button_content_description">Kunjungi tombol situs</string>
+    <string name="restore_complete_done_button_content_description">Tombol Selesai</string>
+    <string name="restore_complete_icon_content_description">Ikon Pulihkan</string>
+    <string name="restore_complete_visit_site_action_button">Kunjungi situs</string>
+    <string name="restore_complete_description_with_two_parameters">Semua item yang Anda pilih sekarang telah dipulihkan kembali ke %1$s %2$s.</string>
+    <string name="restore_complete_header">Situs Anda telah dipulihkan</string>
+    <string name="restore_progress_footnote">Tidak perlu lagi menunggu. Kami akan memberi tahu Anda jika situs telah dipulihkan.</string>
+    <string name="restore_progress_icon_content_description">Pulihkan ikon situs</string>
+    <string name="restore_progress_description_with_two_parameters">Kami memulihkan situs Anda ke %1$s %2$s.</string>
+    <string name="restore_progress_header">Sedang memulihkan situs</string>
+    <string name="restore_warning_action_button_content_description">Tombol Konfirmasi pulihkan situs</string>
+    <string name="restore_warning_icon_content_description">Gambar lingkaran merah dengan tanda seru</string>
+    <string name="restore_warning_header">Peringatan</string>
+    <string name="restore_details_action_button_content_description">Pulihkan tombol situs</string>
+    <string name="restore_details_icon_content_description">Pulihkan ikon</string>
+    <string name="restore_details_action_button">Pulihkan situs</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s adalah titik yang Anda pilih untuk pemulihan.</string>
+    <string name="restore_details_header">Pulihkan Situs</string>
+    <string name="restore_details_choose_items_header">Pilih item yang ingin dipulihkan:</string>
+    <string name="restore">Pulihkan</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud dengan ikon X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Tombol Selesai</string>
+    <string name="backup_download_complete_failed_action_button">Selesai</string>
+    <string name="backup_download_complete_failed_title">Pengunduhan gagal</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Seluler</string>
+    <string name="quick_start_card_menu_remove">Jangan tampilkan lagi</string>
+    <string name="quick_start_card_menu_pin">Sematkan ini</string>
+    <string name="quick_start_dialog_review_pages_message_short">Pilih %1$s Halaman %2$s untuk melihat daftar halaman Anda.</string>
+    <string name="quick_start_dialog_review_pages_message">Ubah, tambahkan, atau hapus halaman situs.</string>
+    <string name="quick_start_dialog_review_pages_title">Tinjau halaman situs</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Pilih %1$s Beranda %2$s untuk menyunting Beranda Anda.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Pilih %1$s Halaman %2$s untuk melihat daftar halaman Anda.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Ubah, tambahkan, atau hapus konten dari halaman beranda situs.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Sunting halaman beranda</string>
+    <string name="reader_menu_mark_as_unseen">Tandai sebagai belum dilihat</string>
+    <string name="reader_menu_mark_as_seen">Tandai sebagai telah dilihat</string>
+    <string name="error_media_upload_failed_for_reason">Unggahan media gagal.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Ruang penyimpanan situs yang tersedia tidak mencukupi</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Tidak dapat mengubah status dilihat pos ini</string>
+    <string name="reader_marked_post_as_unseen">Menandai pos sebagai belum dilihat</string>
+    <string name="reader_marked_post_as_seen">Menandai pos sebagai dilihat</string>
+    <string name="threat_fix_all_status_error_message">Terjadi error saat mendapatkan status perbaikan. Silakan hubungi tim dukungan kami.</string>
+    <string name="threat_fix_all_status_success_message_singular">Ancaman berhasil diperbaiki.</string>
+    <string name="threat_fix_all_error_message">Terjadi error saat memperbaiki ancaman. Silakan hubungi tim dukungan kami.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Harap konfirmasi bahwa Anda ingin memperbaiki satu ancaman aktif.</string>
+    <string name="threat_fix_all_warning_title">Perbaiki semua ancaman</string>
+    <string name="threat_ignore_error_message">Terjadi error saat mengabaikan ancaman. Silakan hubungi dukungan.</string>
+    <string name="threat_ignore_success_message">Ancaman diabaikan.</string>
+    <string name="threat_ignore_warning">Sebaiknya jangan abaikan keamanan, kecuali Anda benar-benar yakin ini tidak berbahaya. Jika Anda memilih untuk mengabaikannya, ancaman ini akan tetap ada di situs Anda &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Terjadi error saat memperbaiki ancaman. Silakan hubungi tim dukungan kami.</string>
+    <string name="threat_item_sub_header_status_ignored">Ancaman diabaikan</string>
+    <string name="threat_item_sub_header_status_fixed_on">Ancaman telah diperbaiki pada %s</string>
+    <string name="threat_fixing">Memperbaiki ancaman</string>
+    <string name="scan_history_ignored_threats_tab">Diabaikan</string>
+    <string name="scan_history_no_threats_found">Tidak ada item yang ditemukan</string>
+    <string name="scan_history_fixed_threats_tab">Tetap</string>
+    <string name="scan_history_all_threats_tab">Semua</string>
+    <string name="scan_scanning_title">Memindai berkas</string>
+    <string name="scan_preparing_to_scan_title">Bersiap memindai</string>
+    <string name="scan_history_menu_title">Riwayat</string>
+    <string name="scan_history">Riwayat Pindai</string>
+    <string name="backup_active_filter_empty_subtitle">Coba sesuaikan rentang tanggal Anda</string>
+    <string name="backup_active_filter_empty_title">Tidak ditemukan cadangan yang cocok</string>
+    <string name="backup_empty_subtitle">Pencadangan pertama Anda akan muncul di sini dalam waktu 24 jam dan Anda akan menerima pemberitahuan setelah pencadangan selesai.</string>
+    <string name="backup_empty_title">Pencadangan pertama Anda akan segera tersedia</string>
+    <string name="request_failed_message">Terdapat kendala saat menangani permintaan. Silakan coba kembali.</string>
+    <string name="gutenberg_native_move_to_bottom">Pindah ke bawah</string>
+    <string name="gutenberg_native_change_block_position">Ubah posisi blok</string>
+    <string name="label_control_upload">Unggah</string>
+    <string name="jetpack_icon_content_description">ikon</string>
+    <string name="backup_download_complete_info">Kami juga telah mengirimkan email berisi tautan ke file Anda.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Tombol bagikan tautan</string>
+    <string name="backup_download_complete_download_action_button_content_description">Tombol unduh</string>
+    <string name="backup_download_complete_icon_content_description">Ikon siap cadangan yang dapat diunduh</string>
+    <string name="backup_download_complete_download_share_action_button">Bagikan tautan</string>
+    <string name="backup_download_complete_download_action_button">Unduh</string>
+    <string name="backup_download_complete_description_with_two_parameters">Kami berhasil membuat cadangan situs Anda dari %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Cadangan Anda sudah dapat diunduh</string>
+    <string name="backup_download_complete_page_title">Cadangan Anda</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Tidak perlu lagi menunggu. Kami akan memberi tahu Anda jika cadangan telah siap.</string>
+    <string name="backup_download_progress_icon_content_description">Membuat ikon cadangan yang dapat diunduh</string>
+    <string name="backup_download_progress_description_with_two_parameters">Kami sedang membuat cadangan situs yang dapat Anda unduh dari %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Sedang membuat cadangan situs Anda yang dapat diunduh</string>
+    <string name="backup_download_progress_page_title">Unduh Cadangan</string>
+    <string name="backup_download_another_download_running">Ada unduhan lain yang sedang berlangsung.</string>
+    <string name="backup_download_generic_failure">Ada masalah saat menangani permintaan. Silakan coba lagi nanti.</string>
+    <string name="backup_download_details_action_button_content_description">Buat tombol cadangan yang dapat diunduh</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s adalah titik yang dipilih untuk membuat cadangan yang dapat diunduh.</string>
+    <string name="gutenberg_native_image_link_url">URL Tautan Gambar</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">lintas pos</string>
+    <string name="suggestion_user">pengguna</string>
+    <string name="suggestion_no_matching">Tidak tersedia yang sesuai dengan %s.</string>
+    <string name="suggestion_problem">Terjadi kendala saat memuat saran.</string>
+    <string name="suggestion_none">Tidak tersedia saran %s.</string>
+    <string name="suggestion_selection_needed">Silakan ketik untuk menyaring daftar saran.</string>
+    <string name="threat_get_free_estimate">Dapatkan diagnosis gratis</string>
+    <string name="threat_ignore">Abaikan ancaman</string>
+    <string name="threat_fix">Perbaiki ancaman</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan akan mengatasi ancaman tersebut.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan akan menyunting berkas atau direktori yang terdampak.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan akan memperbarui ke versi yang lebih baru (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan akan menghapus berkas atau direktori yang terdampak.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan akan mengganti berkas atau direktori yang terdampak.</string>
+    <string name="threat_fix_current_not_fixable_description">Pemindaian Jetpack tidak dapat otomatis memperbaiki ancaman ini.\n Kami menyarankan Anda untuk mengatasi ancaman tersebut secara manual: pastikan WordPress, tema, dan semua plugin Anda adalah versi terbaru, lalu hapus kode, tema, atau plugin yang berbahaya dari situs Anda. \n \n\n Jika memerlukan bantuan lebih lanjut untuk mengatasi ancaman ini, kami merekomendasikan &lt;b&gt;Codeable&lt;/b&gt;, marketplace pekerja lepas tepercaya untuk ahli WordPress unggulan.\n Mereka telah mengidentifikasi kelompok pakar keamanan pilihan guna membantu proyek ini. Kisaran harga mulai dari $70–120/jam, dan Anda bisa mendapatkan diagnosis gratis tanpa harus merekrut mereka.</string>
+    <string name="threat_fix_current_not_fixable_header">Mengatasi ancaman</string>
+    <string name="threat_fix_fixed_header">Bagaimana cara Jetpack memperbaikinya?</string>
+    <string name="threat_fix_default_header">Bagaimana cara memperbaikinya?</string>
+    <string name="threat_file_description">Ancaman yang ditemukan di file:</string>
+    <string name="threat_technical_details_header">Rincian teknis</string>
+    <string name="threat_problem_header">Apa masalahnya?</string>
+    <string name="threat_details">Detail Ancaman</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Kerentanan ditemukan dalam Tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Kerentanan ditemukan dalam Plugin</string>
+    <string name="threat_item_sub_header_file_signature">Ancaman ditemukan %s</string>
+    <string name="threat_item_sub_header_core_file">Kerentanan ditemukan dalam WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Kerentanan lain-lain</string>
+    <string name="threat_item_header_vulnerable_theme">Tema yang Rentan: %s (versi %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Plugin yang Rentan: %s (versi %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: pola kode berbahaya</string>
+    <string name="threat_item_header_database_threat">Ancaman %s basis data</string>
+    <string name="threat_item_header_infected_core_file">%s: file inti yang terinfeksi</string>
+    <string name="threat_item_header_threat_found">Ancaman ditemukan</string>
+    <string name="threats_fix_all">Perbaiki Semua</string>
+    <string name="scan_in_few_seconds">beberapa detik yang lalu</string>
+    <string name="scan_in_minutes_ago">%s menit yang lalu</string>
+    <string name="scan_in_hours_ago">%s jam yang lalu</string>
+    <string name="scan_this_site">situs ini</string>
+    <string name="scan_idle_last_scan_description">Pemindaian Jetpack terakhir berjalan %s dan tidak menemukan risiko apa pun. %s</string>
+    <string name="scan_idle_threats_found_title">Situs Anda mungkin berada dalam risiko</string>
+    <string name="scan_idle_no_threats_found_title">Jangan khawatir</string>
+    <string name="scan_again">Pindai lagi</string>
+    <string name="scan_now">Pindai sekarang</string>
+    <string name="scan_state_icon">Ikon status pemindaian</string>
+    <string name="backup">Pencadangan</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Penyaringan Jenis Aktivitas (%s jenis dipilih)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (menampilkan %s item)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Penyaringan Jenis Aktivitas</string>
+    <string name="activity_log_activity_type_empty_subtitle">Tidak ada aktivitas yang tercatat dalam rentang tanggal yang dipilih.</string>
+    <string name="activity_log_activity_type_empty_title">Tidak ada aktivitas</string>
+    <string name="activity_log_activity_type_error_subtitle">Harap periksa koneksi internet Anda lalu coba lagi.</string>
+    <string name="activity_log_activity_type_error_title">Tak ada koneksi</string>
+    <string name="activity_log_activity_type_filter_active_label">Jenis Aktivitas (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Penyaringan Rentang Tanggal</string>
+    <string name="activity_log_active_filter_empty_subtitle">Coba sesuaikan rentang tanggal atau penyaring jenis aktivitas</string>
+    <string name="activity_log_active_filter_empty_title">Tidak ditemukan acara yang cocok</string>
+    <string name="backup_item_sqls">Database situs</string>
+    <string name="backup_item_roots_hint">(mencakup wp-config php dan semua file non-WordPress)</string>
+    <string name="backup_item_media_uploads">Unggahan Media</string>
+    <string name="backup_item_plugins">Plugin WordPress</string>
+    <string name="backup_item_themes">Tema WordPress</string>
+    <string name="backup_download_details_icon_content_description">Buat ikon cadangan yang dapat diunduh</string>
+    <string name="backup_download_details_action_button">Buat file yang dapat diunduh</string>
+    <string name="backup_download_details_header">Buat cadangan yang dapat diunduh</string>
+    <string name="backup_download_details_page_title">Unduh Cadangan</string>
+    <string name="backup_download">Unduhan Cadangan</string>
+    <string name="gutenberg_native_error">Galat</string>
+    <string name="gutenberg_native_choose_file">Pilih berkas</string>
+    <string name="activity_log_item_menu_download_backup_label">Unduh cadangan</string>
+    <string name="activity_log_item_menu_restore_label">Pulihkan hingga ke titik ini</string>
+    <string name="activity_log_activity_type_filter_label">Jenis Aktivitas</string>
+    <string name="activity_log_date_range_filter_label">Rentang Tanggal</string>
+    <string name="activity_log_activity_type_filter_header">Saring Berdasarkan Tipe Aktivitas</string>
+    <string name="dialog_confirm_copy_local_copy_button">Salin versi dari aplikasi ini</string>
+    <string name="dialog_confirm_copy_local_edit_button">Sunting pos terlebih dahulu</string>
+    <string name="dialog_confirm_copy_local_message">Pos yang ingin Anda salin mempunyai dua versi yang saling konflik atau baru-baru ini ada perubahan yang tidak disimpan.\nSunting pos terlebih dahulu untuk menyelesaikan konflik atau lanjutkan dengan menyalin versi dari aplikasi ini.</string>
+    <string name="dialog_confirm_copy_local_title">Konflik sinkronisasi pos</string>
+    <string name="button_copy">Duplikat</string>
+    <string name="toast_edit_story_update_in_progress_title">Cerita sedang disimpan, harap tunggu…</string>
+    <string name="gutenberg_native_file_name">Nama file</string>
+    <string name="gutenberg_native_file_block_settings">Pengaturan blok Berkas</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Gagal mengunggah file.\nKetuk untuk melihat pilihan.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Gagal menyimpan file.\nKetuk untuk melihat pilihan.</string>
+    <string name="gutenberg_native_edit_file">Sunting file</string>
+    <string name="gutenberg_native_copy_file_url">Salin URL file</string>
+    <string name="gutenberg_native_choose_a_file">PILIH FILE</string>
+    <string name="new_site_creation_domain_header_title">Pilih domain</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Mengikuti percakapan melalui e-mail</string>
+    <string name="reader_btn_follow_comments">Ikuti percakapan melalui e-mail</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Tidak dapat berhenti berlangganan komentar pos ini</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Tidak dapat berlangganan komentar pos ini</string>
+    <string name="reader_follow_comments_get_status_error">Terjadi error saat mengambil data status langganan untuk pos</string>
+    <string name="reader_follow_comments_unsubscribe_success">Berhasil berhenti berlangganan komentar</string>
+    <string name="reader_follow_comments_subscribe_success">Berhasil berlangganan komentar</string>
+    <string name="reader_follow_comments_bad_format_response">Respons yang diterima tidak valid</string>
+    <string name="reader_follow_comments_null_response">Tidak ada respons yang diterima</string>
+    <string name="activity_log_activity_type_filter_clear">Hapus</string>
+    <string name="activity_log_activity_type_filter_apply">Terapkan</string>
+    <string name="dialog_edit_story_unsupported_format_message">Satu slide atau lebih belum ditambahkan ke Cerita Anda karena saat ini Cerita tidak mendukung file GIF. Sebagai gantinya, pilih gambar statis atau latar belakang video.</string>
+    <string name="dialog_edit_story_unsupported_format_title">File GIF tidak didukung</string>
+    <string name="dialog_edit_story_unrecoverable_message">Kami tidak dapat menemukan media untuk cerita ini pada situs.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Tidak dapat menyunting Cerita</string>
+    <string name="dialog_edit_story_unavailable_message">Tidak dapat memuat media untuk cerita ini. Periksa koneksi internet Anda dan coba lagi nanti.</string>
+    <string name="dialog_edit_story_unavailable_title">Tidak dapat menyunting Cerita</string>
+    <string name="dialog_edit_story_limited_message">Cerita ini disunting pada perangkat yang berbeda dan kemampuan untuk mengedit objek tertentu mungkin terbatas.</string>
+    <string name="dialog_edit_story_limited_title">Penyuntingan Cerita Terbatas</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media telah dihapus. Coba tulis kembali Cerita Anda.</string>
+    <string name="color_picker_label_background">Latar Belakang</string>
+    <string name="color_picker_label_text">Teks</string>
+    <string name="dialog_discard_story_ok_button_edit">Batal</string>
+    <string name="dialog_discard_story_message_edit">Perubahan yang dibuat tidak akan tersimpan.</string>
+    <string name="dialog_discard_story_title_edit">Buang perubahan?</string>
+    <string name="label_done_button">Selesai</string>
+    <string name="label_next_button">Selanjutnya</string>
+    <string name="delete_button_alt">Hapus</string>
+    <string name="hpp_choose_error">Terjadi error saat memilih desain.</string>
+    <string name="hpp_retry_error">Harap periksa koneksi internet Anda lalu coba lagi.</string>
+    <string name="hpp_error_subtitle">Ketuk coba lagi saat  Anda kembali online.</string>
+    <string name="hpp_error_title">Tata letak tidak tersedia saat offline</string>
+    <string name="continue_site_credentials">Lanjutkan dengan kredensial toko</string>
+    <string name="login_find_your_connected_email">Temukan email Anda yang terhubung</string>
+    <string name="reader_discover_no_posts_button_text">Ikuti topik</string>
+    <string name="reader_discover_no_posts_subtitle">Coba ikuti lebih banyak topik untuk memperluas pencarian</string>
+    <string name="reader_discover_no_posts_title">Tak ada pos terbaru</string>
+    <string name="reader_discover_empty_title">Selamat datang!</string>
+    <string name="scan">Pindai</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; menanggapi pos Anda</string>
+    <string name="login_prologue_third_subtitle_two">Anda menerima &lt;b&gt;50 suka&lt;/b&gt; di situs Anda hari ini</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; menyukai pos Anda</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Menu blok yang dapat digulir terbuka. Pilih blok.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menu blok yang dapat digulir tertutup.</string>
+    <string name="hpp_skip_button">Lewati</string>
+    <string name="hpp_choose_button">Pilih</string>
+    <string name="hpp_subtitle">Pilih tata letak halaman beranda favorit Anda. Anda dapat menyunting dan menyesuaikannya nanti.</string>
+    <string name="hpp_title">Pilih desain</string>
+    <string name="mlp_network_error_subtitle">Ketuk coba lagi setelah Anda kembali online atau buat halaman kosong dengan tombol di bawah ini.</string>
+    <string name="mlp_network_error_title">Tata letak tidak tersedia saat offline</string>
+    <string name="mlp_error_subtitle">Ketuk coba lagi atau buat halaman kosong dengan tombol di bawah ini.</string>
+    <string name="mlp_error_title">Tata letak tersedia karena error</string>
+    <string name="prepublishing_nudges_add_category_button">Tambahkan Kategori</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Tambah Kategori Baru</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategori</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Tidak ditentukan</string>
+    <string name="prepublishing_nudges_categories_action">Kategori</string>
+    <string name="login_prologue_fifth_caption_three">Museum di London</string>
+    <string name="login_prologue_fifth_caption_two">Penggemar Terbaik di Dunia</string>
+    <string name="login_prologue_fifth_caption_one">Sepuluh Kafe Favorit Saya</string>
+    <string name="login_prologue_fifth_tag_six">Politik</string>
+    <string name="login_prologue_fifth_tag_five">Musik</string>
+    <string name="login_prologue_fifth_tag_four">Berkebun</string>
+    <string name="login_prologue_fifth_tag_three">Sepakbola</string>
+    <string name="login_prologue_fifth_tag_two">Memasak</string>
+    <string name="login_prologue_fifth_tag_one">Seni</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' Roll Mingguan</string>
+    <string name="login_prologue_fifth_subtitle_two">Berita Web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Saya sangat terinspirasi oleh karya fotografer Cameron Karsten. Saya akan mencoba teknik ini selanjutnya</string>
+    <string name="login_prologue_second_subtitle_one">Dapatkan Inspirasi</string>
+    <string name="login_prologue_title_fifth">Ikuti situs favorit Anda dan temukan blog-blog baru.</string>
+    <string name="login_prologue_title_fourth">Perhatikan audiens Anda tumbuh dengan analisis mendalam.</string>
+    <string name="login_prologue_title_third">Lihat komentar dan pemberitahuan secara real-time.</string>
+    <string name="login_prologue_title_second">Dengan editor yang hebat, Anda dapat langsung menerbitkan pos.</string>
+    <string name="login_prologue_title_first">Selamat datang di pembuat situs web terpopuler di dunia.</string>
+    <string name="media_loading_failed">Gagal memuat media</string>
+    <string name="reader_discover_recommended_blogs_header">Rekomendasi situs</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Kami berusaha keras untuk menambahkan banyak blok setiap rilis.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' tidak sepenuhnya didukung</string>
+    <string name="gutenberg_native_help_button">Tombol Bantuan</string>
+    <string name="gutenberg_native_edit_using_web_editor">Edit menggunakan editor web</string>
+    <string name="gutenberg_native_choose_images">Pilih gambar</string>
+    <string name="stories_intro_create_story_post_label">Buat Pos Cerita</string>
+    <string name="stories_intro_description_second">Pos tersebut diterbitkan sebagai pos blog baru pada situs agar audiens Anda tidak ketinggalan hal-hal baru.</string>
+    <string name="stories_intro_title_second">Pos Cerita tidak menghilang</string>
+    <string name="stories_intro_description_first">Kombinasikan foto, video, dan teks untuk membuat pos cerita, yang menarik dan memancing pengunjung Anda untuk mengetuk, yang pasti disukai pengunjung Anda.</string>
+    <string name="stories_intro_title_first">Sekarang cerita tersedia untuk semua orang</string>
+    <string name="stories_intro_image_caption_second">Contoh judul cerita</string>
+    <string name="stories_intro_image_caption_first">Cara membuat pos cerita</string>
+    <string name="stories_intro_main_title">Memperkenalkan Pos Cerita</string>
+    <string name="mlp_notice_blank_page_created">Halaman kosong dibuat</string>
+    <string name="mlp_notice_page_created">Halaman dibuat</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s ditolak untuk mengakses foto Anda. Untuk memperbaiki ini, edit perizinan Anda dan aktifkan %2$s dan %3$s.</string>
+    <string name="media_insert_failed">Penyisipan media gagal.</string>
+    <string name="media_insert_failed_with_reason">Penyisipan media gagal: %s</string>
+    <string name="photo_picker_wordpress_media_library">Pilih dari Pustaka Media WordPress</string>
+    <string name="reader_label_toolbar_back">Kembali</string>
+    <string name="reader_discover_empty_button_text">Memulai</string>
+    <string name="reader_discover_empty_subtitle">Ikuti topik untuk menemukan blog baru</string>
+    <string name="reader_post_details_header_by_author_name">Oleh</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Perujuk ini tidak dapat ditandai sebagai spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Hilangkan tanda sebagai Spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Tandai sebagai Spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Buka Situs Web</string>
+    <string name="media_uploading_gif_library_photo">Mengunggah media gif</string>
+    <string name="media_uploading_stock_library_photo">Mengunggah media stok</string>
+    <string name="media_uploading_default">Mengunggah media</string>
     <string name="gutenberg_native_select_item">Pilih item</string>
     <string name="gutenberg_native_search_or_type_url">Cari atau ketik URL</string>
+    <string name="gutenberg_native_page_break">Pemisah halaman</string>
     <string name="gutenberg_native_add_this_telephone_link">Tambahkan link telepon ini</string>
     <string name="gutenberg_native_add_this_link">Tambahkan link ini</string>
     <string name="gutenberg_native_add_this_email_link">Tambahkan link email ini</string>
-    <string name="suggestion_no_connection">\"Tidak ada koneksi internet.\nSaran tidak tersedia.\"</string>
+    <string name="suggestion_no_connection">Tidak tersedia koneksi internet.\nSaran tidak tersedia.</string>
     <string name="typeface_label_shrikhand">Tebal</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_pacifico">Riang</string>
@@ -19,6 +490,7 @@ Language: id
     <string name="typeface_label_libre_baskerville">Klasik</string>
     <string name="typeface_label_nunito">Kasual</string>
     <string name="toast_capture_operation_permission_needed">Anda perlu memberi aplikasi izin untuk merekam audio agar dapat merekam video</string>
+    <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%s dipilih</string>
     <string name="login_get_link_by_email">Dapatkan tautan login lewat email</string>
     <string name="email_not_registered_wpcom">Hmm, kami tidak dapat menemukan akun WordPress.com yang terhubung dengan alamat email ini.</string>
@@ -26,19 +498,17 @@ Language: id
     <string name="comment_unable_to_show_error">Tidak dapat menampilkan komentar ini</string>
     <string name="media_browse_for_items">Telusuri item</string>
     <string name="reader_menu_report_post">Melaporkan Pos Ini</string>
-    <string name="gutenberg_native_angle">Sudut</string>
     <string name="reader_welcome_banner">Selamat datang di Pembaca. Temukan jutaan blog dengan ujung jari Anda.</string>
     <string name="error_media_xmlrcp_server_error">Terjadi kesalahan server internal</string>
     <string name="error_media_xmlrpc_not_allowed">Tindakan Anda tidak diizinkan</string>
     <string name="show_n_hidden_items_desc">%1$s item lainnya</string>
     <string name="gutenberg_native_select_a_layout">Pilih Tata Letak</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Catatan: Tata letak kolom dapat bervariasi antara tema dan ukuran layar</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">Anda mungkin suka</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Sembunyikan</string>
     <string name="create_post_story_fab_tooltip">Buat pos atau cerita</string>
     <string name="create_page_fab_tooltip">Buat halaman</string>
     <string name="create_post_fab_tooltip">Buat pos</string>
+    <string name="reader_discover_interests_header">Anda mungkin suka</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Sembunyikan</string>
     <string name="gutenberg_native_video_caption_empty">Keterangan video. Kosong</string>
     <string name="gutenberg_native_updates_the_title">Perbarui judul.</string>
     <string name="gutenberg_native_paste_block_after">Tempel block setelah</string>
@@ -75,7 +545,6 @@ Language: id
     <string name="dialog_discard_errored_page_message">Slide ini belum disimpan. Jika menghapus slide ini, seluruh pengeditan yang Anda lakukan akan dibuang.</string>
     <string name="dialog_discard_page_message">Slide ini akan dihapus dari cerita Anda.</string>
     <string name="dialog_discard_page_title">Hapus slide cerita?</string>
-    <string name="menu_delete_page">Hapus slide</string>
     <string name="label_text_color_button">Ubah warna teks</string>
     <string name="label_text_alignment_button">Ubah perataan teks</string>
     <string name="label_frame_errored">error</string>
@@ -85,8 +554,6 @@ Language: id
     <string name="label_retry_icon">Coba lagi</string>
     <string name="label_saved_icon">Disimpan</string>
     <string name="label_close_button">Tutup</string>
-    <string name="label_control_publish">Selanjutnya</string>
-    <string name="label_done">Selesai</string>
     <string name="label_share_to">Bagikan ke</string>
     <string name="label_snackbar_share">BAGIKAN</string>
     <string name="label_snackbar_loop_frame_saved">Disimpan ke foto</string>
@@ -97,7 +564,6 @@ Language: id
     <string name="label_control_flip_camera">Balik</string>
     <string name="sound_button_alt">Suara</string>
     <string name="text_button_alt">Teks</string>
-    <string name="more_button_alt">Lainnya</string>
     <string name="stickers_button_alt">Stiker</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Balik kamera</string>
@@ -106,11 +572,11 @@ Language: id
     <string name="mlp_create_page">Buat halaman</string>
     <string name="mlp_create_blank_page">Buat halaman kosong</string>
     <string name="mlp_choose_layout_subtitle">Mulai dengan memilih satu tata letak halaman yang siap digunakan. Atau mulai dengan halaman kosong.</string>
+    <string name="mlp_choose_layout_title">Pilih tata letak</string>
     <string name="prepublishing_nudges_story_title_hint">Beri judul pada cerita Anda</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Buat pos atau cerita</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Buat pos, halaman, atau cerita</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Ketuk %1$s Buat. %2$s Lalu pilih &lt;b>Pos blog&lt;/b></string>
-    <string name="mlp_choose_layout_title">Pilih tata letak</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Ketuk %1$s Buat. %2$s Lalu pilih &lt;b&gt;Pos blog&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Pilih dari perangkat</string>
     <string name="my_site_bottom_sheet_add_story">Pos cerita</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Penyuntingan ikon situs pada situs WordPress hosting sendiri memerlukan plugin Jetpack.</string>
@@ -124,13 +590,10 @@ Language: id
     <string name="gutenberg_native_choose_image_or_video">Pilih gambar atau video</string>
     <string name="gutenberg_native_choose_image">Pilih gambar</string>
     <string name="gutenberg_native_block_removed">Blok dihapus</string>
-    <string name="content_description_logo">Logo WordPress</string>
-    <string name="enter_your_site_address">Masukkan alamat situs Anda</string>
-    <string name="continue_with_wpcom">Lanjutkan dengan WordPress.com</string>
+    <string name="enter_your_site_address">Masukkan alamat situs Anda yang sudah ada</string>
     <string name="signup_confirmation_title">Konfirmasi pendaftaran</string>
     <string name="continue_with_google_terms_of_service_text">Jika Anda melanjutkan dengan Google dan belum memiliki akun WordPress.com, Anda akan membuat akun dan menyetujui  %1$sKetentuan Layanan%2$s kami.</string>
     <string name="continue_terms_of_service_text">Dengan melanjutkan, Anda menyetujui %1$sKetentuan Layanan%2$s kami.</string>
-    <string name="signup_confirmation_magic_link_message">Kami akan mengirimi Anda email berisi tautan pendaftaran untuk membuat akun WordPress.com baru.</string>
     <string name="signup_confirmation_message">Kami akan menggunakan alamat email ini untuk membuat akun WordPress.com baru Anda.</string>
     <string name="signup_magic_link_message">Kami telah mengirimi Anda email berisi tautan masuk untuk membuat akun WordPress.com baru. Periksa email Anda di perangkat ini, dan ketuk tautan dalam email yang Anda terima dari WordPress.com</string>
     <string name="enter_account_info_for_site">Masukkan informasi akun Anda untuk %1$s.</string>
@@ -147,19 +610,15 @@ Language: id
     <string name="or_type_your_password">Atau ketik kata sandi Anda</string>
     <string name="create_account">Buat akun</string>
     <string name="send_link_by_email">Kirim tautan lewat email</string>
-    <string name="login_promo_text_unlock_the_power">Kenali kekuatan dari pembuat situs web yang paling andal.</string>
-    <string name="login_promo_title_37_percent">37\% dari situs web dikembangkan dari WordPress.</string>
     <string name="reset_your_password">Reset kata sandi</string>
     <string name="reader_error_request_failed_title">Ada masalah saat menangani permintaan. Silakan coba lagi nanti.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Berikan nama situs yang mencerminkan karakteristik dan topik situs Anda. Kesan pertama sangat berarti!</string>
     <string name="quick_start_list_update_site_title_title">Atur judul situs Anda</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Ketuk &lt;b>%1$s&lt;/b> untuk mengatur judul baru</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Ketuk &lt;b&gt;%1$s&lt;/b&gt; untuk mengatur judul baru</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Membuang pos ini juga akan menghapus perubahan lokal, Anda yakin ingin melanjutkan?</string>
     <string name="gutenberg_native_s_block_options">%s pilihan blok</string>
     <string name="gutenberg_native_duplicate_block">Duplikasi blok</string>
     <string name="gutenberg_native_copy_block">Salin blok</string>
     <string name="gutenberg_native_copied_block">Blok disalin</string>
-    <string name="gutenberg_native_block_settings">Pengaturan blok</string>
     <string name="gutenberg_native_block_pasted">Blok ditempelkan</string>
     <string name="gutenberg_native_block_duplicated">Blok diduplikasi</string>
     <string name="gutenberg_native_block_cut">Blok dipotong</string>
@@ -175,7 +634,6 @@ Language: id
     <string name="gutenberg_native_gradient_type">Jenis Gradasi</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Ketuk dua kali untuk memilih opsi</string>
     <string name="gutenberg_native_customize_gradient">Kustomisasi Gradasi</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Pembuat halaman</string>
     <string name="photo_picker_use_gif">Gunakan GIF ini</string>
     <string name="error_media_thumbnail_not_loaded">Thumbnail media tidak dapat dimuat</string>
@@ -185,6 +643,7 @@ Language: id
     <string name="gutenberg_native_dismiss">Tutup</string>
     <string name="prepublishing_nudges_home_tags_not_set">Tidak ditentukan</string>
     <string name="prepublishing_tags_description">Tag membantu memberi tahu para pembaca tentang isi sebuah pos.</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Tanggal Publikasi</string>
     <string name="prepublishing_nudges_toolbar_title_tags">Tambahkan Tag</string>
     <string name="prepublishing_nudges_back_button">Kembali</string>
     <string name="prepublishing_nudges_home_save_button">Simpan Sekarang</string>
@@ -196,10 +655,9 @@ Language: id
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Batal</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Pindahkan ke Konsep</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Pos yang dibuang tidak dapat disunting. Apakah Anda ingin mengubah status pos ini menjadi \"konsep\" sehingga Anda dapat menyuntingnya?</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">Tanggal Publikasi</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Pindahkan pos ke Konsep?</string>
-    <string name="reader_label_choose_your_interests">Pilih minat Anda</string>
-    <string name="reader_choose_interests_content_description">Pilih minat Anda</string>
+    <string name="reader_label_choose_your_interests">Pilih topik Anda</string>
+    <string name="reader_choose_interests_content_description">Pilih topik Anda</string>
     <string name="reader_btn_done">Selesai</string>
     <string name="reader_btn_select_few_interests">Pilih beberapa untuk melanjutkan</string>
     <string name="post_status_post_published">Dipublikasikan</string>
@@ -211,17 +669,14 @@ Language: id
     <string name="ccpa_privacy_notice_header">Pemberitahuan privasi untuk pengguna di California</string>
     <string name="status_and_visibility">Status &amp; Keterlihatan</string>
     <string name="update_now">Perbarui Sekarang</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
     <string name="gutenberg_native_open_block_actions_menu">Buka Menu Tindakan Blokir</string>
-    <string name="gutenberg_native_try_a_starter_layout">Coba tampilan pengantar</string>
-    <string name="gutenberg_native_insert_mention">Sertakan penyebutan</string>
+    <string name="gutenberg_native_move_to_top">Pindah ke atas</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Ketuk dua kali untuk membuka Lembar Bawah dengan opsi yang tersedia</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Ketuk dua kali untuk membuka Lembar Tindakan dengan opsi yang tersedia</string>
     <string name="pages_cannot_be_started">Saat ini kami tidak dapat membuka halaman. Harap coba lagi nanti</string>
     <string name="pages_set_as_posts_page">Atur sebagai Halaman Pos</string>
     <string name="pages_set_as_homepage">Atur sebagai Beranda</string>
-    <string name="suggestion_no_matching_users">\"Tidak ada pengguna yang sesuai.\"</string>
-    <string name="suggestion_invalid_user">\"%s bukan pengguna yang valid\"</string>
+    <string name="suggestion_invalid">%s bukan %s yang valid</string>
     <string name="site_settings_select_page">Pilih Halaman</string>
     <string name="site_settings_posts_page">Halaman Pos</string>
     <string name="site_settings_static_homepage">Beranda Statis</string>
@@ -241,7 +696,6 @@ Language: id
     <string name="page_homepage_successfully_updated">Beranda berhasil diperbarui</string>
     <string name="page_cannot_set_posts_page">Untuk memasang halaman Pos, aktifkan \"Halaman Beranda Statis\" di Pengaturan Situs</string>
     <string name="page_cannot_set_homepage">Untuk memasang Halaman Beranda, aktifkan \"Halaman Beranda Statis\" di Pengaturan Situs</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Selamat datang di blog baru kami</string>
     <string name="gutenberg_native_select_a_color">Pilih warna</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Ketuk dua kali untuk membuka pengaturan warna</string>
     <string name="reader_empty_followed_blogs_description">Saat Anda mengikuti situs, Anda akan melihat kontennya di sini</string>
@@ -275,7 +729,6 @@ Language: id
     <string name="gutenberg_native_move_block_left">Geser blok ke kiri</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Ketuk dua kali untuk memindahkan blok ke kanan</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Ketuk dua kali untuk memindahkan blok ke kiri</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Membuat dasbor</string>
     <string name="new_site_creation_creating_site_loading_3">Menyiapkan tema</string>
     <string name="new_site_creation_creating_site_loading_2">Menambahkan fitur situs</string>
@@ -297,12 +750,12 @@ Language: id
     <string name="media_accessing_failed">Gagal mengakses konten situs pribadi. Beberapa media mungkin tidak tersedia</string>
     <string name="media_accessing_progress">Mengakses konten situs pribadi</string>
     <string name="error_failed_to_crop_and_save_image">Gagal memotong dan menyimpan gambar, harap coba lagi.</string>
+    <string name="failed_to_load_image_tap_to_retry">Gagal memuat gambar.\nKetuk untuk mencoba lagi.</string>
     <string name="preview_image_description">Pratinjau Gambar</string>
     <string name="error_unknown_page_type">Format halaman tidak diketahui</string>
     <string name="error_page_not_submitted">Kami tidak dapat menyelesaikan tindakan ini, dan tidak mengirim halaman ini untuk ditinjau.</string>
     <string name="error_page_not_scheduled">Kami tidak dapat menyelesaikan tindakan ini, dan tidak menjadwalkan halaman ini.</string>
     <string name="error_page_not_published_private">Kami tidak dapat menyelesaikan tindakan ini, dan tidak memublikasikan halaman pribadi ini.</string>
-    <string name="failed_to_load_image_tap_to_retry">Gagal memuat gambar.\nKetuk untuk mencoba lagi.</string>
     <string name="error_page_not_published">Kami tidak dapat menyelesaikan tindakan ini, dan tidak memublikasikan halaman ini.</string>
     <string name="error_page_not_submitted_retrying">Kami tidak dapat mengirim halaman ini untuk ditinjau, namun kami akan mencoba lagi nanti. </string>
     <string name="error_page_not_scheduled_retrying">Kami tidak dapat menjadwalkan halaman ini, namun kami akan mencoba lagi nanti.</string>
@@ -331,57 +784,20 @@ Language: id
     <string name="app_theme_light">Terang</string>
     <string name="app_theme">Tampilan</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Baru-baru ini Anda membuat perubahan pada halaman ini namun tidak menyimpannya. Pilih versi untuk dimuat:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Pendapat Orang</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Kami menawarkan berbagai macam layanan untuk membantu Anda mencapai hasil yang diinginkan. Tidak yakin dengan apa yang Anda butuhkan, atau berapa biayanya? Kami dapat menjelaskan layanan yang tepat untuk Anda dan memberikan info lebih lanjut tentang biayanya. Hubungi di bawah ini.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Kami adalah tim kecil beranggotakan para profesional berbakat dengan cakupan keterampilan dan pengalaman yang luas. Kami mencintai apa yang kami lakukan, dan kami melakukannya dengan penuh dedikasi. Kami tidak sabar untuk bekerja sama dengan Anda.</string>
-    <string name="gutenberg_native_warning_message">Pesan Peringatan</string>
-    <string name="gutenberg_native_want_to_work_with_us">Ingin bekerja dengan kami?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Pengunjung mungkin ingin tahu sosok di balik halaman ini. Gunakan bagian ini untuk menulis tentang diri Anda, situs, bisnis, atau apa pun yang Anda inginkan. Gunakan testimoni di bawah ini untuk mencantumkan kutipan orang lain, membicarakan tentang hal yang sama – dengan kata-kata mereka sendiri.</string>
-    <string name="gutenberg_native_usa">Indonesia</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Ini adalah konten contoh, yang disertakan bersama template untuk mengilustrasikan fiturnya. Hapus atau ganti dengan kata-kata dan media Anda sendiri.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Cara untuk memulai adalah berhenti bicara dan mulai mengerjakan.</string>
-    <string name="gutenberg_native_team">Tim</string>
-    <string name="gutenberg_native_success_message">Pesan Berhasil</string>
-    <string name="gutenberg_native_strategy">Strategi</string>
     <string name="gutenberg_native_show_post_content">Tampilkan konten pos</string>
-    <string name="gutenberg_native_services">Layanan</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel si Anjing</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nama Proyek</string>
-    <string name="gutenberg_native_position_or_job_title">Posisi atau Gelar Jabatan</string>
-    <string name="gutenberg_native_portfolio">Portofolio</string>
     <string name="gutenberg_native_only_show_excerpt">Hanya tampilkan kutipan</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Portofolio saya menampilkan berbagai proyek yang saya hasilkan sepanjang karier. Lihat informasi kontak di bawah ini dan hubungi.</string>
     <string name="gutenberg_native_link_to">Tautan Ke</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Ayo bicara 👋 Jangan ragu untuk menghubungi kami melalui informasi kontak di bawah ini, atau kirimkan pesan menggunakan formulir.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Ayo buat sesuatu bersama!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Ayo buat sesuatu bersama!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Harry, yang menunjukkan jati diri kita adalah pilihan yang kita ambil, jauh melebihi kemampuan yang kita tunjukkan.</string>
-    <string name="gutenberg_native_inspiration">Inspirasi</string>
-    <string name="gutenberg_native_get_in_touch">Hubungi Kami</string>
+    <string name="gutenberg_native_link_settings">Pengaturan Tautan</string>
     <string name="gutenberg_native_excerpt_length_words">Panjang kutipan (kata)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Kirimkan email ke saya: &lt;a href=\"mailto:mail@example.com\">mail@contoh.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Jangan menangis karena sesuatu itu berakhir, tetapi tersenyumlah karena itu terjadi.</string>
     <string name="gutenberg_native_customize">SESUAIKAN</string>
-    <string name="gutenberg_native_city_10100">Kota, 10100</string>
+    <string name="gutenberg_native_video_settings">Pengaturan video</string>
     <string name="gutenberg_native_add_paragraph_block">Tambahkan blok paragraf</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Deskripsi singkat layanan yang Anda tawarkan.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Biografi singkat berisi riwayat diri, pencapaian utama, atau fakta menarik.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@contoh.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Deskripsi proyek dan pekerjaan yang ditampilkan.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">Buat pos</string>
     <string name="post_list_tab_trashed_posts">Dibuang</string>
     <string name="post_list_tab_scheduled_posts">Dijadwalkan</string>
     <string name="post_list_tab_published_posts">Dipublikasikan</string>
     <string name="sharing_facebook_account_must_have_pages">Koneksi Facebook tidak dapat menemukan Halaman apa pun. Publikasikan tidak dapat terhubung ke Profil Facebook, hanya Halaman yang dipublikasikan.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Tidak Terhubung</string>
-    <string name="my_site_select_domains_page_title">Alamat Situs</string>
     <string name="notifications_tab_title_likes">Suka</string>
     <string name="notifications_tab_title_follows">Mengikuti</string>
     <string name="notifications_tab_title_comments">Komentar</string>
@@ -395,24 +811,25 @@ Language: id
     <string name="stats_management_add_new_stats_card">Tambahkan kartu statistik baru</string>
     <string name="reader_self_hosted_select_filter">Gunakan tombol penyaring untuk menemukan pos pada subjek tertentu</string>
     <string name="reader_bottom_sheet_content_description">Pilih Tag atau Situs, Jendela Pop Up</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Terpilih</string>
     <string name="reader_btn_select_filter_content_description">Pilih Situs atau Tag untuk menyaring pos</string>
     <string name="reader_btn_remove_filter_content_description">Hapus penyaring saat ini</string>
+    <string name="reader_title_subs">Kelola Topik &amp; Situs</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Login ke WordPress.com</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Masuk ke WordPress.com untuk melihat pos terbaru dari topik yang Anda ikuti</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Login ke WordPress.com untuk melihat pos terbaru dari situs yang Anda ikuti</string>
-    <string name="gutenberg_native_template_preview">Pratinjau Template</string>
     <string name="gutenberg_native_replace_current_block">Ganti Blok Saat Ini</string>
     <string name="gutenberg_native_add_to_end">Tambahkan ke Akhir</string>
     <string name="gutenberg_native_add_to_beginning">Tambahkan ke Awal</string>
     <string name="gutenberg_native_add_block_before">Tambahkan Blok Sebelum</string>
     <string name="gutenberg_native_add_block_after">Tambahkan Blok Setelah</string>
+    <string name="reader_filter_empty_tags_action">Tambahkan topik</string>
     <string name="reader_filter_empty_sites_action">Ikuti situs</string>
+    <string name="reader_filter_empty_tags_list">Anda dapat mengikuti pos dengan subjek tertentu dengan menambahkan topik</string>
     <string name="reader_filter_empty_sites_list">Lihat pos terbaru dari situs yang Anda ikuti</string>
     <string name="reader_filter_main_title">Mengikuti</string>
     <string name="reader_filter_cta">Penyaring</string>
     <string name="gutenberg_native_video_caption_s">Keterangan video. %s</string>
     <string name="gutenberg_native_edit_video">Sunting video</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Ketuk dua kali untuk memilih tata letak</string>
     <string name="gutenberg_native_add_a_shortcode">Tambahkan shortcode…</string>
     <string name="post_list_author">Penulis pos</string>
     <string name="fab_create_desc">Buat pos</string>
@@ -427,10 +844,8 @@ Language: id
     <string name="stats_box_type_low">rendah</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Pindahkan Gambar ke Depan</string>
-    <string name="gutenberg_native_move_image_backward">Pindahkan Gambar ke Belakang</string>
+    <string name="gutenberg_native_replace_image">Ganti gambar</string>
     <string name="gutenberg_native_gallery_caption_s">Keterangan galeri. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Nilai saat ini %2$s</string>
     <string name="create_post_page_fab_tooltip">Buat pos atau halaman</string>
     <string name="content_description_person_building_website">Orang membangun situs web</string>
     <string name="post_signup_interstitial_not_right_now">Jangan sekarang</string>
@@ -444,53 +859,46 @@ Language: id
     <string name="my_site_bottom_sheet_add_post">Pos blog</string>
     <string name="my_site_bottom_sheet_title">Tambahkan baru</string>
     <string name="post_settings_publish">Publikasikan</string>
-    <string name="dialog_gutenberg_informative_description_v2">Kami membuat perubahan besar untuk penyunting blok dan merasa itu layak dicoba! Kami memungkinkannya untuk pos dan halaman baru tetapi jika Anda ingin mengganti ke penyunting klasik, buka \'Situs Saya\' > \'Pengaturan Situs\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sinkronisasi sekarang</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Pos ini akan segera disinkronisasi.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Siap Mensinkronkan?</string>
     <string name="new_site_creation_unavailable_domain">Domain ini tidak tersedia</string>
-    <string name="login_promo_viewpager_content_description">Perkenalan</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Kami tidak dapat mengakses situs Anda. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
-    <string name="login_discovery_error_ssl">Kami tidak dapat mengakses situs Anda karena ada masalah dengan &lt;b>Sertifikat SSL&lt;/b>. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
-    <string name="login_discovery_error_http_auth">Kami tidak dapat mengakses situs Anda akrena hal ini membutuhkan &lt;b>Autentikasi HTTP&lt;/b>. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
-    <string name="login_discovery_error_xmlrpc">Kami tidak dapat mengakses &lt;b>file XMLRPC&lt;/b> situs Anda. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
-    <string name="login_site_credentials_magic_link_label">Hampir selesai! Kami hanya perlu memverifikasi alamat email Anda yang terhubung dengan Jetpack &lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">Kami tidak dapat mengakses situs Anda karena ada masalah dengan &lt;b&gt;Sertifikat SSL&lt;/b&gt;. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
+    <string name="login_discovery_error_http_auth">Kami tidak dapat mengakses situs Anda akrena hal ini membutuhkan &lt;b&gt;Autentikasi HTTP&lt;/b&gt;. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
+    <string name="login_discovery_error_xmlrpc">Kami tidak dapat mengakses &lt;b&gt;file XMLRPC&lt;/b&gt; situs Anda. Anda harus menghubungi host untuk mengatasi masalah ini.</string>
+    <string name="login_site_credentials_magic_link_label">Hampir selesai! Kami hanya perlu memverifikasi alamat email Anda yang terhubung dengan Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Login dengan kredensial situs %1$s</string>
-    <string name="send_verification_email">Kirim email verifikasi</string>
-    <string name="reader_following_display_name">Mengikuti</string>
     <string name="my_site_bottom_sheet_add_page">Halaman situs</string>
-    <string name="enter_site_credentials_instead">Login dengan kredensial situs.</string>
-    <string name="posts_cannot_be_started">Kami saat ini tidak dapat membuka pos. Harap coba lagi nanti</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="suffix_1_000_000_000">%sB</string>
-    <string name="suffix_1_000_000">%sM</string>
+    <string name="reader_following_display_name">Mengikuti</string>
+    <string name="reader_my_likes_display_name">Suka</string>
+    <string name="reader_discover_display_name">Temukan</string>
+    <string name="reader_save_for_later_display_name">Disimpan</string>
+    <string name="reader_filter_tags_title">Topik</string>
+    <string name="reader_filter_sites_title">Situs</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="reader_filter_sites_title">Situs</string>
-    <string name="reader_save_for_later_display_name">Disimpan</string>
-    <string name="reader_discover_display_name">Temukan</string>
-    <string name="reader_my_likes_display_name">Suka</string>
+    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="posts_cannot_be_started">Kami saat ini tidak dapat membuka pos. Harap coba lagi nanti</string>
     <string name="site_cannot_be_loaded">Kami saat ini tidak dapat memuat data untuk situs Anda. Harap coba lagi nanti</string>
     <string name="gutenberg_native_wordpress_media_library">Pustaka Media WordPress</string>
+    <string name="gutenberg_native_unsupported">Tidak didukung</string>
     <string name="gutenberg_native_ungroup">Batalkan pengelompokan</string>
     <string name="gutenberg_native_translate">Terjemahan</string>
-    <string name="gutenberg_native_title">Judul:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Ketuk untuk menyembunyikan keyboard</string>
     <string name="gutenberg_native_tap_here_to_show_help">Ketuk di sini untuk menampilkan bantuan</string>
     <string name="gutenberg_native_take_a_video">Ambil Video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Potret atau Rekam Video</string>
     <string name="gutenberg_native_take_a_photo">Ambil Foto</string>
     <string name="gutenberg_native_start_writing">Mulai menulis…</string>
-    <string name="gutenberg_native_size">Ukuran</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Plugin judul bilah sisi</string>
     <string name="gutenberg_native_show_section">Tampilkan bagian</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s blok. Blok ini memiliki konten yang tidak valid</string>
     <string name="gutenberg_native_s_block_empty">%s blok. Kosong</string>
-    <string name="gutenberg_native_reset_block">Reset Blok</string>
     <string name="gutenberg_native_cut_block">Potong blok</string>
-    <string name="gutenberg_native_remove_annotations">Hilangkan anotasi</string>
     <string name="gutenberg_native_problem_opening_the_video">Terjadi masalah saat membuka video</string>
     <string name="gutenberg_native_problem_displaying_block">Terjadi masalah saat menampilkan blok</string>
     <string name="gutenberg_native_post_title_s">Judul pos. %s</string>
@@ -500,17 +908,12 @@ Language: id
     <string name="gutenberg_native_open_settings">Buka Pengaturan</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Tidak ada aplikasi yang dapat menangani permintaan ini. Harap instal Perambah web.</string>
     <string name="gutenberg_native_navigate_up">Arahkan ke Atas</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Panel sebelum dipublikasikan milik saya</string>
-    <string name="gutenberg_native_my_post_status_info">Info status pos saya</string>
-    <string name="gutenberg_native_my_post_publish_panel">Panel setelah dipublikasikan milik saya</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panel Pengaturan Dokumen Saya</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Pindahkan balok ke atas dari baris %1$s ke baris %2$s</string>
     <string name="gutenberg_native_move_block_up">Naikkan blok</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Pindahkan balok ke bawah dari baris %1$s ke baris %2$s</string>
     <string name="gutenberg_native_move_block_down">Turunkan blok</string>
     <string name="gutenberg_native_image_caption_s">Keterangan gambar. %s</string>
     <string name="gutenberg_native_hide_keyboard">Sembunyikan keyboard</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Di sini adalah konten panel!</string>
     <string name="gutenberg_native_help_icon">Ikon bantuan</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Gagal memasukkan media.\nKetuk untuk melihat pilihan.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Ketuk dua kali untuk mengurungkan perubahan terakhir</string>
@@ -522,34 +925,28 @@ Language: id
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Ketuk dua kali untuk memindahkan blok ke atas</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Ketuk dua kali untuk memindahkan blok ke bawah</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Ketuk dua kali untuk menyunting nilai ini</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Ketuk dua kali untuk mengubah nilai menggunakan slider</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Ketuk dua kali untuk menambahkan blok</string>
     <string name="gutenberg_native_current_value_is_s">Nilai saat ini adalah %s</string>
-    <string name="gutenberg_native_content">Konten…</string>
     <string name="gutenberg_native_choose_from_device">Pilih dari perangkat</string>
-    <string name="gutenberg_native_annotations_sidebar">Bilah Sisi Anotasi</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Terjadi error yang tidak diketahui. Coba lagi.</string>
     <string name="gutenberg_native_alt_text">Teks Alt</string>
     <string name="gutenberg_native_add_video">TAMBAHKAN VIDEO</string>
     <string name="gutenberg_native_add_url">Tambahkan URL</string>
+    <string name="gutenberg_native_add_alt_text">Tambahkan teks alt</string>
     <string name="gutenberg_native_add_image_or_video">TAMBAHKAN GAMBAR ATAU VIDEO</string>
     <string name="gutenberg_native_add_image">TAMBAHKAN GAMBAR</string>
     <string name="gutenberg_native_add_block_here">TAMBAHKAN BLOK DI SINI</string>
-    <string name="gutenberg_native_add_annotation">Tambahkan anotasi</string>
-    <string name="gutenberg_native_add_a_description">Tambahkan deskripsi</string>
     <string name="reader_empty_saved_posts_content_description">Ketuk tombol Tambahkan untuk Simpan Pos untuk menyimpan pos ke daftar Anda.</string>
     <string name="reader_acessibility_list_loaded">\"Daftar ini telah diisi dengan %1$d item.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Pemberitahuan</string>
-    <string name="master_switch_default_title_off">Nonaktif</string>
-    <string name="master_switch_default_title_on">Aktif</string>
-    <string name="notifications_tab_dialog_master_off_message">Menonaktifkan Pemberitahuan untuk situs ini akan menonaktifkan tampilan pemberitahuan di tab pemberitahuan untuk situs ini. Anda bisa memilih jenis pemberitahuan yang ingin Anda lihat setelah mengaktifkan Pemberitahuan untuk situs ini.</string>
-    <string name="notifications_tab_dialog_master_off_title">Untuk melihat pemberitahuan di tab pemberitahuan untuk situs ini, aktifkan Pemberitahuan untuk situs ini.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Aktifkan tampilan pemberitahuan di tab pemberitahuan untuk situs ini</string>
-    <string name="notifications_tab_dialog_master_hint_on">Nonaktifkan tampilan pemberitahuan di tab pemberitahuan untuk situs ini</string>
-    <string name="notifications_tab_dialog_master_status_off">Pemberitahuan untuk situs ini</string>
-    <string name="notifications_tab_dialog_master_status_on">Pemberitahuan untuk situs ini</string>
-    <string name="dialog_gutenberg_informative_description_page">Saat ini Anda menggunakan penyunting blok untuk halaman baru, hebat! Jika Anda ingin mengubah ke penyunting klasik, buka \'Situs Saya\' > \'Pengaturan Situs\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">Saat ini Anda menggunakan penyunting blok untuk pos baru, hebat! Jika Anda ingin mengubah ke penyunting klasik, buka \'Situs Saya\' > \'Pengaturan Situs\'.</string>
+    <string name="main_switch_default_title_off">Nonaktif</string>
+    <string name="main_switch_default_title_on">Aktif</string>
+    <string name="notifications_tab_dialog_main_off_message">Menonaktifkan Pemberitahuan untuk situs ini akan menonaktifkan tampilan pemberitahuan di tab pemberitahuan untuk situs ini. Anda bisa memilih jenis pemberitahuan yang ingin Anda lihat setelah mengaktifkan Pemberitahuan untuk situs ini.</string>
+    <string name="notifications_tab_dialog_main_off_title">Untuk melihat pemberitahuan di tab pemberitahuan untuk situs ini, aktifkan Pemberitahuan untuk situs ini.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Aktifkan tampilan pemberitahuan di tab pemberitahuan untuk situs ini</string>
+    <string name="notifications_tab_dialog_main_hint_on">Nonaktifkan tampilan pemberitahuan di tab pemberitahuan untuk situs ini</string>
+    <string name="notifications_tab_dialog_main_status_off">Pemberitahuan untuk situs ini</string>
+    <string name="notifications_tab_dialog_main_status_on">Pemberitahuan untuk situs ini</string>
     <string name="pick_media">Tambahkan gambar atau video</string>
     <string name="error_post_not_submitted_retrying">Kami tidak dapat mengirim pos ini untuk ditinjau, namun kami akan mencoba lagi nanti. </string>
     <string name="error_post_not_scheduled_retrying">Kami tidak dapat menjadwalkan pos ini, namun kami akan mencoba lagi nanti.</string>
@@ -642,8 +1039,6 @@ Language: id
     <string name="post_settings_add_to_calendar">Tambahkan ke kalender</string>
     <string name="post_settings_notification">Pemberitahuan</string>
     <string name="post_settings_time_and_date">Tanggal dan Waktu</string>
-    <string name="login_need_help_finding_connected_email">Perlu bantuan untuk menemukan email yang terhubung dengan Anda?</string>
-    <string name="enter_wordpress_site">Situs web di alamat ini bukan situs WordPress. Agar kami dapat terhubung ke situs tersebut, situs harus menggunakan WordPress.</string>
     <string name="login_invalid_site_url">Masukkan alamat situs web lengkap, seperti contoh.com.</string>
     <string name="enter_email_for_site">Login dengan WordPress.com untuk terhubung ke %1$s</string>
     <string name="stats_post_views_label">Tampilan</string>
@@ -672,7 +1067,7 @@ Language: id
     <string name="stats_widget_error_no_access_token">Untuk melihat statistik Anda, login ke akun WordPress.com.</string>
     <string name="post_list_search_nothing_found">Tidak ada pos yang cocok dengan pencarian Anda</string>
     <string name="post_list_search_prompt">Cari pos</string>
-    <string name="domains_suggestions_intro_description">Di sinilah orang akan menemukan Anda di internet.</string>
+    <string name="domains_suggestions_intro_description">Anda akan ditemukan di internet melalui nama domain.</string>
     <string name="domains_suggestions_intro_title">Pilih nama domain premium</string>
     <string name="my_site_custom_domain_name">Semua paket WordPress.com menyertakan nama domain kustom. Daftarkan domain premium gratis Anda sekarang.</string>
     <string name="stats_widget_minified_name">Sekilas</string>
@@ -709,7 +1104,7 @@ Language: id
     <string name="domain_registration_state_picker_dialog_title">Pilih Provinsi</string>
     <string name="domain_registration_country_picker_dialog_title">Pilih Negara</string>
     <string name="domain_registration_result_continue_button">Lanjut</string>
-    <string name="domain_registration_result_description">domain baru Anda &lt;b>%s&lt;/b> sedang disiapkan. Situs Anda\n melakukan perubahan dengan penuh keseruan!</string>
+    <string name="domain_registration_result_description">domain baru Anda &lt;b&gt;%s&lt;/b&gt; sedang disiapkan. Situs Anda\n melakukan perubahan dengan penuh keseruan!</string>
     <string name="domain_registration_result_title">Selamat</string>
     <string name="domain_contact_information_register_domain_button">Daftarkan Domain</string>
     <string name="domain_contact_information_postal_code_hint">Kode pos</string>
@@ -758,8 +1153,8 @@ Language: id
     <string name="post_restoring">Pos sedang dipulihkan</string>
     <string name="post_restored">Pos dipulihkan</string>
     <string name="post_trashing">Pos sedang dibuang</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Perubahan lokal</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Membuang pos ini juga akan menghapus perubahan yang belum disimpan, Anda yakin ingin melanjutkan?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Perubahan lokal</string>
     <string name="button_move_to_draft">Pindahkan ke Konsep</string>
     <string name="post_list_toggle_item_layout_list_view">Beralih ke tampilan daftar</string>
     <string name="post_list_toggle_item_layout_cards_view">Beralih ke tampilan kartu</string>
@@ -784,6 +1179,7 @@ Language: id
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Daftarkan domain</string>
     <string name="plugin_install_custom_domain_required_dialog_message">Untuk menginstal plugin, Anda harus memiliki domain kustom yang terkait dengan situs Anda.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Instal plugin</string>
+    <string name="new_site_creation_preview_subtitle">Anda dapat melakukan penyesuaian tampilan dan nuansa situs Anda</string>
     <string name="publish_on">Terbitkan pada: %s</string>
     <string name="schedule_for">Jadwalkan untuk: %s</string>
     <string name="published_on">Diterbitkan pada: %s</string>
@@ -794,7 +1190,6 @@ Language: id
     <string name="stats_months_and_years_period_label">Periode</string>
     <string name="stats_detail_months_and_years">Bulan dan Tahun</string>
     <string name="stats_insights_load_more">Muat lainnya</string>
-    <string name="new_site_creation_preview_subtitle">Anda dapat melakukan kustomisasi tampilan dan sentuhan situs Anda nanti</string>
     <string name="stats_insights_today_stats">Hari Ini</string>
     <string name="stats_insights_best_hour">Jam Terbaik</string>
     <string name="stats_insights_best_day">Hari Terbaik</string>
@@ -816,42 +1211,33 @@ Language: id
     <string name="plans_loading_error_no_plans_subtitle">Saat ini kami tidak dapat memuat Paket. Silakan coba lagi nanti.</string>
     <string name="plans_loading_error_no_plans_title">Tidak dapat memuat Paket</string>
     <string name="plans_loading_error_network_title">Tidak ada koneksi</string>
+    <string name="menu_switch_to_gutenberg_editor">Beralih ke penyunting blok</string>
     <string name="stats_loading_block_error">Terjadi masalah saat memuat data Anda, segarkan halaman untuk mencoba lagi.</string>
     <string name="stats_loading_error">Data tidak dimuat</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Sunting pos dan halaman baru dengan penyunting blok</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Gunakan Penyunting Blok</string>
-    <string name="menu_switch_to_gutenberg_editor">Beralih ke penyunting blok</string>
-    <string name="menu_switch_to_aztec_editor">Beralih ke penyunting klasik</string>
-    <string name="dialog_gutenberg_informative_title">Penyunting Blok Diaktifkan</string>
     <string name="exit">keluar</string>
     <string name="quick_start_sites_type_subtitle">%1$d dari %2$d selesai</string>
-    <string name="quick_start_sites_type_grow">Tumbuhkan Audiens Anda</string>
-    <string name="quick_start_sites_type_customize">Sesuaikan Situs Anda</string>
+    <string name="quick_start_sites_type_grow">Perbanyak audiens Anda</string>
+    <string name="quick_start_sites_type_customize">Sesuaikan situs Anda</string>
     <string name="quick_start_sites">Langkah Berikutnya</string>
     <string name="quick_start_complete_tasks_header">Selesai (%d)</string>
     <string name="quick_start_dialog_view_site_message">Nikmati hasil akhir produk Anda!</string>
     <string name="quick_start_dialog_upload_icon_title">Unggah ikon situs</string>
-    <string name="quick_start_dialog_upload_icon_message">Pengunjung akan melihat ikon Anda di perambah mereka. Tambahkan ikon kustom untuk tampilan yang lebih pro dan elegan.</string>
+    <string name="quick_start_dialog_upload_icon_message">Pengunjung Anda akan melihat ikon Anda di browser. Tambahkan ikon khusus untuk tampilan yang lebih profesional dan elegan.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Ketuk %1$s Paket %2$s untuk melihat paket Anda saat ini dan paket yang tersedia</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Ketuk %1$s Tambahkan Halaman %2$s untuk membuat halaman baru.</string>
     <string name="quick_start_dialog_check_stats_message_short">Ketuk %1$s Statistik %2$s untuk melihat performa situs Anda.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Ketuk %1$s Ikon Situs Anda %2$s untuk mengunggah ikon baru</string>
     <string name="quick_start_dialog_publish_post_message">Buat konsep dan publikasikan pos pertama Anda.</string>
-    <string name="quick_start_dialog_need_help_message">Kami akan memandu Anda melalui dasar-dasar membangun dan mengembangkan situs Anda.</string>
+    <string name="quick_start_dialog_need_help_message">Kami akan memandu Anda dalam mempelajari dasar-dasar membangun dan mengembangkan situs Anda.</string>
     <string name="quick_start_dialog_migration_title">Kami telah membuat beberapa perubahan di daftar periksa Anda</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Ketuk %1$s Halaman %2$s untuk melanjutkan.</string>
     <string name="quick_start_dialog_migration_message">Kami telah menambahkan lebih banyak tugas untuk membantu menumbuhkan audiens Anda.</string>
     <string name="quick_start_dialog_explore_plans_title">Pelajari paket</string>
     <string name="quick_start_dialog_explore_plans_message">Pelajari alat pemasaran dan SEO di paket berbayar kami.</string>
     <string name="quick_start_dialog_enable_sharing_title">Aktifkan berbagi pos</string>
     <string name="quick_start_dialog_enable_sharing_message">Bagikan pos baru secara otomatis ke akun media sosial Anda.</string>
-    <string name="quick_start_dialog_customize_site_message">Berikan efek pada huruf, tambahkan gambar, dan lainnya.</string>
-    <string name="quick_start_dialog_create_page_title">Buat halaman baru</string>
-    <string name="quick_start_dialog_create_page_message">Tambahkan halaman untuk konten penting — Halaman \"Tentang\" bisa menjadi awal yang bagus.</string>
     <string name="quick_start_dialog_check_stats_title">Periksa statistik situs Anda</string>
     <string name="quick_start_dialog_check_stats_message">Ketahui info terbaru mengenai performa situs Anda.</string>
-    <string name="quick_start_dialog_browse_themes_title">Telusuri tema</string>
-    <string name="quick_start_dialog_browse_themes_message">Jelajahi berbagai macam pilihan tata letak dan temukan yang terbaik untuk Anda.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Menghapus Langkah Berikutnya akan menyembunyikan semua tur di situs ini. Tindakan ini tidak dapat diurungkan.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Hapus Langkah Berikutnya</string>
     <string name="quick_start_remove_next_steps_menu_title">Hapus langkah ini</string>
@@ -875,15 +1261,11 @@ Language: id
     <string name="notification_new_site_creation_failed">Ada masalah</string>
     <string name="notification_new_site_creation_title">Buat Situs</string>
     <string name="new_site_creation_create_site_button">Buat Situs</string>
-    <string name="new_site_creation_search_domain_input_hint">Cari Domain</string>
-    <string name="new_site_creation_domain_header_subtitle">Di sinilah orang akan menemukan Anda di internet.</string>
-    <string name="new_site_creation_domain_header_title">Pilih nama domain untuk situs Anda</string>
+    <string name="new_site_creation_domain_header_subtitle">Anda akan ditemukan di internet melalui nama domain.</string>
     <string name="new_site_creation_empty_domain_list_message">Tidak ada alamat yang cocok dengan pencarian Anda</string>
     <string name="site_creation_error_generic_subtitle">Terjadi error saat berkomunikasi dengan server, harap coba lagi</string>
     <string name="site_creation_error_generic_title">Ada masalah</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Ada masalah</string>
-    <string name="site_creation_segments_subtitle">Hal ini membantu kami membuat rekomendasi. Namun Anda tidak akan pernah terikat. Semua situs berevolusi!</string>
-    <string name="site_creation_segments_title">Beri tahu kami situs seperti apa yang ingin Anda buat</string>
     <string name="new_site_creation_preview_title">Situs Anda telah dibuat!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d dari %2$d</string>
     <string name="new_site_creation_screen_title_general">Buat Situs</string>
@@ -904,6 +1286,8 @@ Language: id
     <string name="stats_no_data_for_period">Tidak ada data selama periode ini</string>
     <string name="preference_strip_image_location">Hapus lokasi dari media</string>
     <string name="stats_cannot_be_started">Saat ini kami tidak dapat membuka statistik. Harap coba lagi nanti</string>
+    <string name="gif_picker_endless_scroll_network_error">Sebagian media gagal dimuat karena terdapat eror jaringan.</string>
+    <string name="gif_picker_empty_search_list">Tidak ada media yang sesuai dengan pencarian Anda</string>
     <string name="gif_picker_initial_empty_text">Cari GIF untuk ditambahkan ke Pustaka Media Anda!</string>
     <string name="stats_author_views_label">Tampilan</string>
     <string name="stats_author_label">Penulis</string>
@@ -934,11 +1318,9 @@ Language: id
     <string name="stats_insights_share_post">Bagikan pos</string>
     <string name="stats_insights_create_post">Buat pos</string>
     <string name="stats_insights_latest_post_message">Sudah %1$s sejak %2$s dipublikasikan. Berikut performa pos tersebut sejauh ini:</string>
-    <string name="gif_picker_empty_search_list">Tidak ada media yang sesuai dengan pencarian Anda</string>
-    <string name="gif_picker_endless_scroll_network_error">Sebagian media gagal dimuat karena terdapat eror jaringan.</string>
-    <string name="stats_insights_tags_and_categories">Tag dan Kategori</string>
     <string name="stats_insights_latest_post_with_no_engagement">Sudah %1$s sejak %2$s dipublikasikan. Bersiaplah dan tingkatkan penayangan pos dengan membagikan pos Anda:</string>
     <string name="stats_insights_latest_post_empty">Anda belum memublikasikan pos apa pun. Setelah Anda mulai memublikasikan pos, ringkasan pos terbaru akan muncul di sini:</string>
+    <string name="stats_insights_tags_and_categories">Tag dan Kategori</string>
     <string name="stats_insights_all_time_stats">Sepanjang waktu</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">Pengikut</string>
@@ -989,8 +1371,8 @@ Language: id
     <string name="image_size_medium_label">Sedang</string>
     <string name="image_size_thumbnail_label">Gambar Mini</string>
     <string name="menu_history">Riwayat</string>
-    <string name="pages_pending">Menunggu peninjauan</string>
     <string name="pages_open_page_error">Halaman yang dipilih tidak tersedia</string>
+    <string name="pages_pending">Menunggu peninjauan</string>
     <string name="pages_empty_trashed">Anda tidak punya halaman yang dibuang</string>
     <string name="pages_empty_scheduled">Anda tidak punya halaman yang dijadwalkan</string>
     <string name="pages_empty_drafts">Anda tidak punya halaman konsep</string>
@@ -1033,37 +1415,33 @@ Language: id
     <string name="quick_start_dialog_share_site_message">Sambungkan ke akun media sosial Anda. Situs akan membagikan pos baru secara otomatis.</string>
     <string name="quick_start_dialog_publish_post_title">Publikasikan pos</string>
     <string name="quick_start_dialog_publish_post_message_short">Ketuk %1$s Buat Pos %2$s untuk membuat pos baru</string>
-    <string name="quick_start_dialog_need_help_title">Perlu sedikit bantuan untuk memulai?</string>
+    <string name="quick_start_dialog_need_help_title">Perlu bantuan untuk memulai?</string>
     <string name="quick_start_dialog_need_help_button_positive">Terima</string>
     <string name="quick_start_dialog_need_help_button_neutral">Tidak pernah</string>
+    <string name="quick_start_dialog_need_help_button_negative">Tidak, Terima Kasih</string>
     <string name="quick_start_dialog_follow_sites_title">Ikuti situs lain</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Ketuk %1$s Cari %2$s untuk mencari situs dengan minat serupa</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Ketuk %1$sCari%2$s untuk mencari situs dengan topik serupa</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Ketuk %1$s Pembaca %2$s untuk melanjutkan</string>
-    <string name="quick_start_dialog_customize_site_title">Sesuaikan situs Anda</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Ketuk %1$s Tema %2$s untuk melanjutkan</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Ketuk %1$s Sesuaikan %2$s untuk memulai personalisasi situs</string>
-    <string name="quick_start_dialog_need_help_button_negative">Tidak, Terima Kasih</string>
     <string name="quick_start_dialog_follow_sites_message">Temukan situs yang menginspirasi Anda, dan ikuti mereka untuk mendapatkan pembaruan saat ada pos baru.</string>
-    <string name="quick_start_dialog_choose_theme_title">Pilih tema</string>
-    <string name="quick_start_dialog_choose_theme_message">Jelajahi semua tema kami untuk menemukan yang paling cocok.</string>
     <string name="quick_start_button_positive">Ayo</string>
     <string name="quick_start_button_negative_short">Batal</string>
     <string name="quick_start_button_negative">Jangan sekarang</string>
-    <string name="my_site_create_new_site_title">Anda belum memiliki situs</string>
     <string name="content_description_more">Lainnya</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Ketuk %1$s Tema %2$s untuk menemukan tema baru</string>
+    <string name="my_site_create_new_site_title">Anda belum memiliki situs</string>
+    <string name="reader_empty_followed_tags_title">Tidak ada topi yang diikuti</string>
+    <string name="reader_empty_followed_tags_subtitle">Tambahkan topik di sini untuk menemukan pos tentang topik favorit Anda.</string>
     <string name="login_to_to_connect_jetpack">Login ke akun WordPress.com yang Anda gunakan untuk menghubungkan Jetpack.</string>
     <string name="install_jetpack_retry">Coba lagi</string>
+    <string name="install_jetpack_continue">Siapkan</string>
+    <string name="jetpack_installation_problem_message">Jetpack tidak dapat diinstal untuk saat ini.</string>
     <string name="jetpack_installation_problem">Ada masalah</string>
     <string name="jetpack_installed">Jetpack sudah diinstal</string>
+    <string name="installing_jetpack_message">Menginstal Jetpack di situs Anda. Mungkin perlu waktu beberapa menit untuk menyelesaikan proses ini.</string>
     <string name="installing_jetpack">Menginstal Jetpack</string>
+    <string name="install_jetpack_message">Kredensial situs web Anda tidak akan disimpan dan hanya akan digunakan untuk tujuan penginstalan Jetpack.</string>
     <string name="install_jetpack">Instal Jetpack</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">FAQ Jetpack</string>
-    <string name="install_jetpack_continue">Siapkan</string>
-    <string name="jetpack_installation_problem_message">Jetpack tidak dapat diinstal untuk saat ini.</string>
-    <string name="installing_jetpack_message">Menginstal Jetpack di situs Anda. Mungkin perlu waktu beberapa menit untuk menyelesaikan proses ini.</string>
-    <string name="install_jetpack_message">Kredensial situs web Anda tidak akan disimpan dan hanya akan digunakan untuk tujuan penginstalan Jetpack.</string>
     <string name="stats_jetpack_connection_setup_info">Untuk menggunakan Statistik di situs WordPress, Anda perlu menginstal plugin Jetpack.</string>
     <string name="themes_empty_list">Tidak ada tema yang cocok dengan pencarian Anda</string>
     <string name="reader_label_post_search_explainer">Apa yang ingin Anda cari?</string>
@@ -1092,10 +1470,10 @@ Language: id
     <string name="pages_empty_list_button">Buat halaman</string>
     <string name="media_empty_upload_media">Unggah media</string>
     <string name="media_empty_list">Anda tidak memiliki media apa pun</string>
-    <string name="featured_image_desc">gambar unggulan</string>
     <string name="reader_gallery_images_desc">galeri gambar</string>
     <string name="blavatar_desc">ikon situs</string>
     <string name="theme_image_desc">gambar tema</string>
+    <string name="featured_image_desc">gambar unggulan</string>
     <string name="button_discard">Buang</string>
     <string name="reader_avatar_desc">foto profil</string>
     <string name="notification_channel_transient_title">Transien</string>
@@ -1108,15 +1486,13 @@ Language: id
     <string name="support_contact_email">Email kontak</string>
     <string name="application_log_button">Log aplikasi</string>
     <string name="my_tickets">Tiket Saya</string>
-    <string name="activity_log_rewind_site">Putar Balik Situs</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Putar balik sedang berlangsung</string>
-    <string name="activity_log_rewind_dialog_message">Apakah Anda yakin ingin memutar balik situs Anda ke tanggal %1$s jam %2$s? Tindakan ini akan menghapus semua konten dan opsi yang dibuat atau diubah sejak saat itu.</string>
-    <string name="activity_log_currently_restoring_message">Memutar balik ke %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Pemulihan sedang berlangsung</string>
+    <string name="activity_log_currently_restoring_message">Memulihkan ke %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Sedang memulihkan situs Anda</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Situs Anda berhasil dipulihkan</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Situs Anda telah berhasil dipulihkan\nDipulihkan ke %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Situs Anda sedang dipulihkan\nDipulihkan ke %1$s %2$s</string>
     <string name="activity_log_button">Tombol tindakan Log Aktivitas</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Situs Anda berhasil dipulihkan\nDiputar balik ke %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Situs Anda sedang dipulihkan\nMemutar balik ke %1$s %2$s</string>
     <string name="plugin_auto_managed">Pengelolaan otomatis</string>
     <string name="reader_save_posts_locally_dialog_message">Simpan pos ini, dan buka kembali untuk membacanya kapan saja. Pos ini hanya akan tersedia pada perangkat ini — pos yang disimpan tidak disinkronkan ke perangkat Anda yang lain.</string>
     <string name="reader_save_posts_locally_dialog_title">Simpan Pos untuk Nanti</string>
@@ -1125,24 +1501,20 @@ Language: id
     <string name="comment_read_source_post">Baca pos sumber</string>
     <string name="sites">Situs</string>
     <string name="signup_magic_link_title">Tautan ajaib terkirim</string>
-    <string name="signup_email_screen_title">Pendaftaran email</string>
     <string name="verification_2fa_screen_title">Verifikasi kode</string>
     <string name="selfhosted_site_login_title">Kredensial login</string>
     <string name="magic_link_sent_login_title">Tautan ajaib terkirim</string>
     <string name="magic_link_login_title">Login tautan ajaib</string>
     <string name="site_address_login_title">Login alamat situs</string>
     <string name="email_address_login_title">Login alamat email</string>
-    <string name="alternatively">Atau:</string>
     <string name="reader_empty_saved_posts_description">Ketuk %s untuk menyimpan pos ke dalam daftar Anda.</string>
+    <string name="reader_empty_saved_posts_title">Belum ada pos yang disimpan!</string>
     <string name="reader_bookmark_snack_title">Pos disimpan</string>
     <string name="reader_bookmark_snack_btn">Lihat Semua</string>
-    <string name="reader_btn_bookmarked">Disimpan</string>
-    <string name="reader_btn_bookmark">Simpan</string>
     <string name="reader_remove_bookmark">Buang dari pos saya yang disimpan</string>
     <string name="reader_add_bookmark">Tambahkan ke pos saya yang disimpan</string>
     <string name="reader_save_for_later_title">Pos yang disimpan</string>
     <string name="removed">Dibuang</string>
-    <string name="reader_empty_saved_posts_title">Belum ada pos yang disimpan!</string>
     <string name="my_site_icon_content_description">Ubah ikon situs</string>
     <string name="my_site_icon_dialog_cancel_button">Batalkan</string>
     <string name="my_site_icon_dialog_remove_button">Buang</string>
@@ -1158,11 +1530,9 @@ Language: id
     <string name="reader_btn_notifications_on">Aktifkan pemberitahuan situs</string>
     <string name="reader_btn_notifications_off">Nonaktifkan pemberitahuan situs</string>
     <string name="activity_log_jetpack_icon">Ikon Jetpack</string>
-    <string name="rewind">Putar Balik</string>
     <string name="activity_log_event">Peristiwa</string>
     <string name="activity_log_icon">Ikon aktivitas</string>
     <string name="activity_log">Log Aktivitas</string>
-    <string name="activity">Aktivitas</string>
     <string name="privacy_policy_read">Baca kebijakan privasi</string>
     <string name="third_party_policy_learn_more_caption">Kami menggunakan alat pelacakan lainnya, termasuk beberapa dari pihak ketiga. Baca tentang hal ini dan cara mengontrolnya.</string>
     <string name="third_party_policy_learn_more_header">Kebijakan Pihak Ketiga</string>
@@ -1173,7 +1543,6 @@ Language: id
     <string name="preference_privacy_settings">Pengaturan privasi</string>
     <string name="preference_collect_information">Kumpulkan informasi</string>
     <string name="post_submitted">Pos telah dikirim</string>
-    <string name="login_email_button_signup">Belum memiliki akun? %1$sDaftar%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Fitur plugin memerlukan situs dalam reputasi yang baik.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Fitur plugin memerlukan langganan domain utama untuk dikaitkan dengan pengguna ini.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Fitur plugin memerlukan hak akses admin.</string>
@@ -1217,6 +1586,7 @@ Language: id
     <string name="fab_add_tag_desc">Buat Tag</string>
     <string name="navigate_up_desc">arahkan ke atas</string>
     <string name="notification_settings_switch_desc">Pemberitahuan</string>
+    <string name="open_external_link_desc">Buka tautan eksternal</string>
     <string name="show_more_desc">tampilkan lebih banyak</string>
     <string name="reader_photo_view_desc">foto</string>
     <string name="reader_list_item_suggestion_remove_desc">hapus</string>
@@ -1240,17 +1610,16 @@ Language: id
     <string name="profile_picture">Foto profil %s</string>
     <string name="comment_checkmark_desc">tanda cek</string>
     <string name="signup_with_google_progress">Mendaftar dengan Google…</string>
-    <string name="open_external_link_desc">Buka tautan eksternal</string>
     <string name="jetpack_connection_failed_with_reason">Koneksi ke Jetpack gagal: %s</string>
     <string name="jetpack_already_connected_toast">Anda sudah terhubung dengan Jetpack!</string>
     <string name="menu_undo_snackbar_action">URUNGKAN</string>
+    <string name="menu_visual_mode_done_snackbar">Beralih ke mode Visual</string>
     <string name="menu_visual_mode">Mode Visual</string>
+    <string name="menu_html_mode_done_snackbar">Beralih ke mode HTML</string>
     <string name="menu_html_mode">Mode HTML</string>
     <string name="menu_preview">Pratinjau</string>
     <string name="menu_save_as_draft">Simpan sebagai Konsep</string>
     <string name="file_size_in_terabytes">%s TB</string>
-    <string name="menu_visual_mode_done_snackbar">Beralih ke mode Visual</string>
-    <string name="menu_html_mode_done_snackbar">Beralih ke mode HTML</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1272,7 +1641,6 @@ Language: id
     <string name="edit_photo_screen_title">Edit Foto</string>
     <string name="share_intent_screen_title">Pilih situs</string>
     <string name="signup_epilogue_screen_title">Akun baru</string>
-    <string name="login_prologue_screen_title">Login</string>
     <string name="login_epilogue_screen_title">Sudah login sebagai</string>
     <string name="person_detail_screen_title">Detail orang</string>
     <string name="media_settings_screen_title">Detail file</string>
@@ -1280,13 +1648,13 @@ Language: id
     <string name="notifications_screen_title">Pemberitahuan</string>
     <string name="reader_screen_title">Pembaca</string>
     <string name="me_section_screen_title">Saya</string>
+    <string name="my_site_section_screen_title">Situs Saya</string>
     <string name="notif_settings_screen_title">Pengaturan pemberitahuan</string>
     <string name="help_screen_title">Bantuan dan Dukungan</string>
     <string name="license_screen_title">Lisensi</string>
     <string name="release_notes_screen_title">Catatan rilis</string>
-    <string name="my_site_section_screen_title">Situs Saya</string>
     <string name="signup_epilogue_error_avatar_view">Avatar Anda telah diunggah dan akan tersedia sesaat lagi.</string>
-    <string name="permissions_denied_message">Tampaknya Anda mematikan izin wajib untuk fitur ini.&lt;br/>&lt;br/>Untuk mengubahnya, edit izin Anda dan pastikan &lt;strong>%s&lt;/strong> telah aktif.</string>
+    <string name="permissions_denied_message">Tampaknya Anda mematikan izin wajib untuk fitur ini.&lt;br/&gt;&lt;br/&gt;Untuk mengubahnya, edit izin Anda dan pastikan &lt;strong&gt;%s&lt;/strong&gt; telah aktif.</string>
     <string name="permissions_denied_title">Izin</string>
     <string name="plugin_caption_featured">Andalan</string>
     <string name="sharing_disabled_description">Anda tidak dapat mengakses pengaturan berbagi karena modul Berbagi Jetpack tidak aktif.</string>
@@ -1327,7 +1695,6 @@ Language: id
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 pos dengan 1 file belum diunggah</string>
     <string name="untitled_in_parentheses">(Tidak Berjudul)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Buat situs</string>
     <string name="notification_site_creation_created">Ketuk untuk melanjutkan.</string>
     <string name="notification_site_creation_title_success">Situs telah dibuat!</string>
@@ -1341,27 +1708,20 @@ Language: id
     <string name="username_changer_dismiss_button_positive">Buang</string>
     <string name="username_changer_action">Simpan</string>
     <string name="content_description_add_avatar">Tambahkan avatar</string>
-    <string name="signup_with_google_button">Daftar dengan Google</string>
-    <string name="signup_with_email_button">Daftar dengan Email</string>
     <string name="signup_user_exists">Email sudah ada di WordPress.com.\nLanjutkan dengan login.</string>
     <string name="signup_updating_account">Memperbarui akun…</string>
-    <string name="signup_terms_of_service_text">Dengan mendaftar, berarti Anda menyetujui %1$sKetentuan Layanan%2$s kami.</string>
     <string name="signup_magic_link_progress">Mengirim email</string>
     <string name="signup_magic_link_error_button_positive">Coba lagi</string>
     <string name="signup_magic_link_error_button_negative">Tutup</string>
+    <string name="signup_magic_link_error">Ada beberapa masalah saat mengirim email. Anda dapat mencoba lagi sekarang atau menutupnya dan mencoba lagi nanti.</string>
     <string name="signup_epilogue_hint_username">Nama pengguna</string>
+    <string name="signup_epilogue_hint_password_detail">Anda dapat login dengan tautan seperti tautan yang baru Anda gunakan, tetapi Anda juga dapat menyiapkan kata sandi.</string>
     <string name="signup_epilogue_hint_password">Kata Sandi (opsional)</string>
     <string name="signup_epilogue_hint_display">Nama Tampilan</string>
     <string name="signup_epilogue_error_button_positive">Coba lagi</string>
     <string name="signup_epilogue_error_button_negative">Kembalikan</string>
     <string name="signup_epilogue_error_generic">Ada beberapa masalah saat memperbarui akun. Anda dapat mencoba lagi atau mengembalikan perubahan untuk melanjutkan.</string>
     <string name="signup_epilogue_error_avatar">Ada beberapa masalah saat mengunggah avatar Anda.</string>
-    <string name="signup_email_header">Untuk membuat akun WordPress.com yang baru, masukkan alamat email Anda.</string>
-    <string name="signup_email_error_generic">Ada beberapa masalah saat memeriksa alamat email.</string>
-    <string name="signup_magic_link_error">Ada beberapa masalah saat mengirim email. Anda dapat mencoba lagi sekarang atau menutupnya dan mencoba lagi nanti.</string>
-    <string name="sign_up">Mendaftar ke WordPress.com</string>
-    <string name="enter_username_instead">Login dengan nama pengguna Anda.</string>
-    <string name="enter_site_address_instead">Login dengan memasukkan alamat situs Anda.</string>
     <string name="plugin_needs_update">Perlu pembaruan</string>
     <string name="plugin_caption_search">Cari Plugin</string>
     <string name="plugin_caption_new">Baru</string>
@@ -1389,14 +1749,14 @@ Language: id
     <string name="plugin_three_stars">3 bintang</string>
     <string name="plugin_two_stars">2 bintang</string>
     <string name="plugin_one_stars">1 bintang</string>
-    <string name="plugin_num_downloads">%s unduhan</string>
-    <string name="plugin_read_reviews">Baca Ulasan</string>
     <string name="plugin_empty_text">Belum disediakan</string>
+    <string name="plugin_num_downloads">%s unduhan</string>
     <string name="plugin_num_ratings">%s penilaian</string>
+    <string name="plugin_read_reviews">Baca Ulasan</string>
     <string name="plugin_faq">Pertanyaan umum</string>
-    <string name="plugin_description">Deskripsi</string>
     <string name="plugin_whatsnew">Apa yang Baru</string>
     <string name="plugin_installation">Pemasangan</string>
+    <string name="plugin_description">Deskripsi</string>
     <string name="plugin_settings">Pengaturan</string>
     <string name="plugin_installed">Terpasang</string>
     <string name="plugin_installed_version">Versi %s telah diinstal</string>
@@ -1482,7 +1842,6 @@ Language: id
     <string name="login_error_suffix">\nCoba masuk dengan akun lain?</string>
     <string name="login_error_generic">Ada masalah saat menyambungkan ke akun Google.</string>
     <string name="login_error_button">Tutup</string>
-    <string name="login_google_button_suffix">Login dengan Google.</string>
     <string name="enter_wpcom_password_google">Untuk melanjutkan dengan akun Google ini, silakan masukkan kata sandi WordPress.com yang sesuai. Tindakan ini hanya akan ditanyakan satu kali.</string>
     <string name="error_generic_network">Terjadi error jaringan. Periksa koneksi Anda dan coba lagi.</string>
     <string name="post_settings_remove_featured_image">Hapus gambar andalan</string>
@@ -1494,12 +1853,11 @@ Language: id
     <string name="jetpack_disconnect_confirm">Putuskan koneksi</string>
     <string name="jetpack_disconnect_confirmation_message">Apakah Anda yakin ingin memutuskan koneksi Jetpack dari situs?</string>
     <string name="jetpack_disconnect_pref_title">\"Putuskan koneksi dari WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Anda dapat membuat daftar putih untuk satu atau serangkaian alamat IP agar tidak diblokir oleh Jetpack. IPv4 dan IPv6 diterima. Untuk menentukan rentang, masukkan nilai rendah dan nilai tinggi yang dipisahkan oleh tanda hubung. Misalnya: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Alamat IP (atau beberapa alamat IP) dapat diberi tanda \"Selalu diizinkan\" agar tidak akan pernah diblokir Jetpack. IPv4 dan IPv6 diterima. Untuk menentukan rentang, masukkan nilai rendah dan nilai tinggi yang dipisahkan oleh tanda hubung. Misalnya: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Memerlukan autentikasi dua langkah</string>
     <string name="jetpack_match_wpcom_via_email_title">Cocokkan akun menggunakan email</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Izinkan login WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Login WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Alamat IP dalam daftar putih</string>
     <string name="jetpack_prevent_brute_force_title">Memblokir upaya login berbahaya</string>
     <string name="jetpack_prevent_brute_force_category_title">Perlindungan terhadap serangan paksa</string>
     <string name="jetpack_send_wp_notifications_title">Mengirim pemberitahuan push</string>
@@ -1529,8 +1887,8 @@ Language: id
     <string name="media_edit_filename_caption">Nama File</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Teks alt</string>
-    <string name="notification_settings_item_sights_and_sounds_blink_light">Kedipkan cahaya</string>
     <string name="connect_site">Hubungkan situs</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Kedipkan cahaya</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Getarkan perangkat</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Pilih suara</string>
     <string name="notification_settings_category_sights_and_sounds">Penglihatan dan Suara</string>
@@ -1540,12 +1898,12 @@ Language: id
     <string name="notification_settings_category_other">Lainnya</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Semua Situs Saya</string>
     <string name="notification_settings_category_your_sites">Situs Anda</string>
-    <string name="notification_settings_master_off_message">Menonaktifkan Pengaturan Pemberitahuan akan menonaktifkan semua pemberitahuan dari aplikasi ini, apa pun jenisnya. Anda bisa memilih jenis pemberitahuan yang ingin Anda terima setelah mengaktifkan Pengaturan Pemberitahuan.</string>
-    <string name="notification_settings_master_off_title">Untuk menerima pemberitahuan di perangkat ini, aktifkan Pengaturan Pemberitahuan.</string>
-    <string name="notification_settings_master_hint_off">Aktifkan pemberitahuan</string>
-    <string name="notification_settings_master_hint_on">Nonaktifkan pemberitahuan</string>
-    <string name="notification_settings_master_status_off">Nonaktif</string>
-    <string name="notification_settings_master_status_on">Aktif</string>
+    <string name="notification_settings_main_off_message">Menonaktifkan Pengaturan Pemberitahuan akan menonaktifkan semua pemberitahuan dari aplikasi ini, apa pun jenisnya. Anda bisa memilih jenis pemberitahuan yang ingin Anda terima setelah mengaktifkan Pengaturan Pemberitahuan.</string>
+    <string name="notification_settings_main_off_title">Untuk menerima pemberitahuan di perangkat ini, aktifkan Pengaturan Pemberitahuan.</string>
+    <string name="notification_settings_main_hint_off">Aktifkan pemberitahuan</string>
+    <string name="notification_settings_main_hint_on">Nonaktifkan pemberitahuan</string>
+    <string name="notification_settings_main_status_off">Nonaktif</string>
+    <string name="notification_settings_main_status_on">Aktif</string>
     <string name="max_video_resolution">Ukuran Video Maksimum</string>
     <string name="max_thumbnail_px_size">Ukuran Gambar Maksimum</string>
     <string name="error_upload_post_media_param">Terjadi error saat mengunggah media dalam pos ini: %s.</string>
@@ -1582,19 +1940,17 @@ Language: id
     <string name="login_site_address_more_help">Butuh bantuan lebih lanjut?</string>
     <string name="login_site_address_help_content">Alamat situs Anda ditampilkan di bilah bagian atas layar ketika Anda mengunjungi situs di Chrome.</string>
     <string name="login_site_address_help_title">Apa alamat situs saya?</string>
-    <string name="login_site_address_help">Perlu bantuan untuk menemukan alamat situs Anda?</string>
     <string name="login_site_address">Alamat situs</string>
     <string name="enter_site_address">Masukkan alamat situs WordPress yang ingin Anda hubungkan.</string>
     <string name="login_already_logged_in_wpcom">Sudah login ke WordPress.com</string>
     <string name="login_continue">Lanjutkan</string>
-    <string name="enter_wpcom_password">Masukkan kata sandi WordPress.com Anda.</string>
     <string name="connect_more">Hubungkan situs lainnya</string>
+    <string name="enter_wpcom_password">Masukkan kata sandi WordPress.com Anda.</string>
     <string name="login_magic_link_email_requesting">Meminta email login</string>
     <string name="password_incorrect">Sepertinya kata sandi ini salah. Periksa lagi informasi Anda dan coba lagi.</string>
     <string name="requesting_otp">Meminta kode verifikasi melalui SMS.</string>
     <string name="login_text_otp">Kirimi saya kode saja</string>
     <string name="enter_verification_code">Hampir selesai! Masukkan kode verifikasi dari aplikasi Pengautentikasi.</string>
-    <string name="open_mail">Buka email</string>
     <string name="next">Selanjutnya</string>
     <string name="enter_email_wordpress_com">Login ke WordPress.com dengan alamat email untuk mengelola semua situs WordPress Anda.</string>
     <string name="image_optimization_promo_desc">Pengoptimalan gambar mengecilkan gambar agar pengunggahan lebih cepat.\n\nAnda dapat mengubahnya kapan saja di pengaturan situs.</string>
@@ -1617,10 +1973,6 @@ Language: id
     <string name="post_status_draft">Konsep</string>
     <string name="post_status_pending_review">Menunggu peninjauan</string>
     <string name="post_status_publish_post">Publikasikan</string>
-    <string name="change_location">Ubah Lokasi</string>
-    <string name="remove_location">Hapus Lokasi</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Tidak dapat membuka Pemilih Lokasi, Layanan Google Play tidak tersedia</string>
-    <string name="post_settings_location">Lokasi</string>
     <string name="now">Sekarang</string>
     <string name="post_settings_password_dialog_hint">Hanya yang mengetahui kata sandi ini yang dapat melihat pos ini</string>
     <string name="post_settings_excerpt_dialog_hint">Kutipan merupakan ringkasan pilihan opsional dari konten Anda.</string>
@@ -1705,7 +2057,7 @@ Language: id
     <string name="tabbar_accessibility_label_my_site">Situs Saya. Lihat situs dan kelola, termasuk statusnya.</string>
     <string name="my_site_btn_sharing">Berbagi</string>
     <string name="button_not_now">Jangan sekarang</string>
-    <string name="media_error_internal_server_error">Terjadi error saat mengunggah. Coba aktifkan Optimalkan Gambar di Situs->Pengaturan</string>
+    <string name="media_error_internal_server_error">Terjadi error saat mengunggah. Coba aktifkan Optimalkan Gambar di Situs-&gt;Pengaturan</string>
     <string name="media_downloading">Menyimpan media ke perangkat ini</string>
     <string name="error_media_save">Tidak dapat menyimpan media</string>
     <string name="editor_draft_saved_locally">Konsep disimpan di perangkat</string>
@@ -1750,11 +2102,11 @@ Language: id
     <string name="media_encoder_quality_85">Sedang</string>
     <string name="media_encoder_quality_80">Rendah</string>
     <string name="media_upload_state_uploaded">Diunggah</string>
+    <string name="media_upload_state_failed">Unggahan Gagal</string>
     <string name="media_upload_state_deleted">Dihapus</string>
     <string name="media_upload_state_deleting">Menghapus</string>
     <string name="media_upload_state_uploading">Mengunggah</string>
     <string name="media_upload_state_queued">Diantrekan</string>
-    <string name="media_upload_state_failed">Unggahan Gagal</string>
     <string name="image_quality">Kualitas Gambar</string>
     <string name="error_all_media_upload_canceled">Semua unggahan media telah dibatalkan karena error yang tidak diketahui. Coba unggah lagi</string>
     <string name="error_unknown_post_type">Format pos tidak diketahui</string>
@@ -1804,98 +2156,93 @@ Language: id
     <string name="signout">Keluar</string>
     <string name="sign_in_wpcom">Masuk ke WordPress.com</string>
     <string name="reader_label_global_related_posts">Lainnya di WordPress.com</string>
-    <string name="reader_label_local_related_posts">Lainnya di %s</string>
+    <string name="reader_label_local_related_posts">Lebih banyak dari %s</string>
     <string name="preference_open_device_settings">Buka pengaturan perangkat</string>
-    <string name="invite_user_blocked_invites">%s: Pengguna memblokir undangan</string>
     <string name="invite_invalid_email">%s: Email tidak valid</string>
+    <string name="invite_user_blocked_invites">%s: Pengguna memblokir undangan</string>
     <string name="invite_already_following">%s: Sudah mengikuti</string>
     <string name="invite_already_a_member">%s: Sudah jadi anggota</string>
     <string name="invite_username_not_found">%s: Pengguna tidak ditemukan</string>
     <string name="comment_moderated_approved">Komentar disetujui!</string>
     <string name="like">Suka</string>
     <string name="timespan_now">sekarang</string>
-    <string name="role_follower">Pengikut</string>
     <string name="role_viewer">Penonton</string>
+    <string name="role_follower">Pengikut</string>
     <string name="error_post_my_profile_no_connection">Tak ada koneksi, gagal menyimpan profil Anda</string>
-    <string name="alignment_none">Tak ada</string>
-    <string name="alignment_left">Kiri</string>
     <string name="alignment_right">Kanan</string>
+    <string name="alignment_left">Kiri</string>
+    <string name="alignment_none">Tak ada</string>
     <string name="site_settings_list_editor_action_mode_title">Memilih %1$d</string>
     <string name="error_fetch_users_list">Gagal menampilkan pengguna situs</string>
-    <string name="title_follower">Pengikut</string>
     <string name="title_email_follower">Pengikut Email</string>
+    <string name="title_follower">Pengikut</string>
     <string name="people_fetching">Mengambil pengguna…</string>
-    <string name="people_dropdown_item_email_followers">Pengikut Email</string>
     <string name="people_dropdown_item_viewers">Pengunjung</string>
+    <string name="people_dropdown_item_email_followers">Pengikut Email</string>
     <string name="people_dropdown_item_followers">Pengikut</string>
     <string name="people_dropdown_item_team">Tim</string>
     <string name="invite_message_usernames_limit">Undang hingga 10 alamat email dan/atau nama pengguna WordPress.com. Mereka yang membutuhkan nama pengguna akan menerima instruksi untuk mendapatkannya.</string>
     <string name="viewer_remove_confirmation_message">Jika Anda menghapus pengunjung ini, ia tak akan bisa mengunjungi situs ini lagi.\n\nApakah Anda masih ingin menghapus pengunjung ini?</string>
     <string name="follower_remove_confirmation_message">Jika dihapus, pengunjung ini akan berhenti menerima notifikasi mengenai situs ini, kecuali mereka mengikuti lagi.\n\nApakah Anda masih ingin menghapus pengunjung ini?</string>
     <string name="follower_subscribed_since">Sejak %1$s</string>
-    <string name="error_remove_follower">Gagal menghapus pengikut</string>
     <string name="error_remove_viewer">Gagal menghapus pengunjung</string>
+    <string name="error_remove_follower">Gagal menghapus pengikut</string>
     <string name="error_fetch_email_followers_list">Gagal menampilkan pengikut email situs</string>
     <string name="error_fetch_followers_list">Gagal menampilkan pengikut situs</string>
     <string name="editor_failed_uploads_switch_html">Beberapa media gagal diunggah. Anda bisa pindah ke mode HTML\n        dalam situasi begini. Hapus semua unggahan yang gagal dan lanjutkan?</string>
-    <string name="image_settings_save_toast">Perubahan tersimpan</string>
-    <string name="image_caption">Keterangan gambar</string>
-    <string name="image_link_to">Tautkan ke</string>
     <string name="image_width">Lebar</string>
+    <string name="image_link_to">Tautkan ke</string>
+    <string name="image_caption">Keterangan gambar</string>
+    <string name="image_settings_save_toast">Perubahan tersimpan</string>
     <string name="image_settings_dismiss_dialog_title">Buang perubahan yang belum disimpan?</string>
     <string name="stop_upload_dialog_title">Stop mengunggah?</string>
-    <string name="invite_sent">Undangan berhasil terkirim</string>
     <string name="tap_to_try_again">Ketuk untuk mencoba lagi!</string>
-    <string name="invite_error_some_failed">Undangan terkirim namun terjadi galat!</string>
+    <string name="invite_sent">Undangan berhasil terkirim</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="invite_error_some_failed">Undangan terkirim namun terjadi galat!</string>
     <string name="invite_error_sending">Terjadi sebuah galat saat mencoba mengirimkan undangan!</string>
     <string name="invite_error_invalid_usernames_multiple">Gagal mengirim: Ada nama pengguna atau email yang tak valid</string>
     <string name="invite_error_invalid_usernames_one">Gagal mengirim: Ada sebuah nama pengguna atau email yang tak valid</string>
     <string name="invite_error_no_usernames">Mohon tambahkan sedikitnya satu nama pengguna</string>
-    <string name="invite_message_info">(Opsional) Anda bisa memasukkan sebuah pesan sepanjang 500 karakter yang akan disertakan dalam undangan bagi para pengguna.</string>
-    <string name="invite_message_remaining_other">%d karakter tersisa</string>
-    <string name="invite_message_remaining_one">1 karakter tersisa</string>
-    <string name="invite_message_remaining_zero">0 karakter tersisa</string>
-    <string name="invite_message_title">Pesan Kustom</string>
+    <string name="invite_message_title">Pesan khusus</string>
     <string name="invite">Undang</string>
-    <string name="invite_names_title">Nama pengguna atau Email</string>
-    <string name="send_link">Kirim tautan</string>
-    <string name="my_site_header_external">Eksternal</string>
+    <string name="invite_names_title">Nama pengguna atau email</string>
     <string name="invite_people">Undang Orang-orang</string>
+    <string name="my_site_header_external">Eksternal</string>
     <string name="label_clear_search_history">Bersihkan riwayat pencarian</string>
     <string name="dlg_confirm_clear_search_history">Bersihkan riwayat pencarian?</string>
     <string name="reader_empty_search_description">Tidak ada hasil untuk %s dalam bahasa Anda</string>
     <string name="reader_hint_post_search">Cari di WordPress</string>
+    <string name="reader_title_related_post_detail">Pos Terkait</string>
     <string name="preview_screen_links_disabled">Tautan dinonaktifkan pada laman pratinjau</string>
     <string name="send">Kirim</string>
-    <string name="user_remove_confirmation_message">Jika Anda menghapus %1$s, pengguna tsb tak bisa mengakses situs ini lagi, tetapi semua konten yang telah dibuat oleh %1$s akan tetap ada di situs ini.\n\nApakah Anda masih ingin menghapus pengguna ini?</string>
     <string name="person_removed">Berhasil menghapus %1$s</string>
+    <string name="user_remove_confirmation_message">Jika Anda menghapus %1$s, pengguna tsb tak bisa mengakses situs ini lagi, tetapi semua konten yang telah dibuat oleh %1$s akan tetap ada di situs ini.\n\nApakah Anda masih ingin menghapus pengguna ini?</string>
     <string name="person_remove_confirmation_title">Hapus %1$s</string>
-    <string name="reader_empty_posts_in_custom_list">Situs dalam daftar ini belum memposting apa pun baru-baru ini</string>
-    <string name="people">Orang</string>
     <string name="role">Peran</string>
+    <string name="people">Pengguna</string>
+    <string name="reader_empty_posts_in_custom_list">Situs dalam daftar ini belum memposting apa pun baru-baru ini</string>
     <string name="error_remove_user">Tidak dapat menghapus pengguna</string>
     <string name="error_update_role">Tidak dapat memperbarui peran pengguna</string>
     <string name="error_fetch_viewers_list">Gagal menampilkan pengunjung situs</string>
     <string name="error_updating_gravatar">Terjadi galat saat memperbarui Gravatar</string>
-    <string name="error_locating_image">Terjadi galat saat mencari gambar yang dipangkas</string>
     <string name="error_refreshing_gravatar">Terjadi galat saat memuat ulang Gravatar</string>
+    <string name="error_locating_image">Terjadi galat saat mencari gambar yang dipangkas</string>
     <string name="error_cropping_image">Terjadi galat saat memangkas gambar</string>
     <string name="checking_email">Memeriksa surat elektronik</string>
     <string name="magic_link_unavailable_error_message">Saat ini tidak tersedia. Masukkan kata sandi Anda</string>
     <string name="logging_in">Proses masuk</string>
-    <string name="enter_your_password_instead">Sebaiknya masukkan kata sandi Anda</string>
     <string name="web_address_dialog_hint">Ditampilkan secara publik saat Anda berkomentar.</string>
     <string name="capture_or_pick_photo">Ambil atau pilih foto</string>
-    <string name="export_your_content_message">Pos, halaman, dan pengaturan Anda akan dikirimkan melalui email kepada Anda pada %s.</string>
-    <string name="plan">Paket</string>
     <string name="plans">Paket</string>
+    <string name="plan">Paket</string>
+    <string name="export_your_content_message">Pos, halaman, dan pengaturan Anda akan dikirimkan melalui email kepada Anda pada %s.</string>
     <string name="export_your_content">Ekspor konten Anda</string>
-    <string name="exporting_content_progress">Mengekspor konten…</string>
     <string name="export_email_sent">Email ekspor sudah dikirimkan!</string>
-    <string name="premium_upgrades_message">Anda memiliki peningkatan premium aktif dalam situs Anda. Batalkan peningkatan sebelum menghapus situs Anda.</string>
-    <string name="show_purchases">Tampilkan pembelian</string>
+    <string name="exporting_content_progress">Mengekspor konten…</string>
     <string name="checking_purchases">Memeriksa pembelian</string>
+    <string name="show_purchases">Tampilkan pembelian</string>
+    <string name="premium_upgrades_message">Anda memiliki peningkatan premium aktif dalam situs Anda. Batalkan peningkatan sebelum menghapus situs Anda.</string>
     <string name="premium_upgrades_title">Peningkatan Premium</string>
     <string name="purchases_request_error">Terjadi masalah. Tidak dapat meminta pembelian.</string>
     <string name="delete_site_progress">Menghapus situs…</string>
@@ -1904,49 +2251,49 @@ Language: id
     <string name="primary_domain">Domain Primer</string>
     <string name="error_deleting_site_summary">Ada kesalahan saat menghapus situs Anda. Hubungi tim pendukung untuk bantuan selengkapnya.</string>
     <string name="error_deleting_site">Kesalahan saat menghapus situs</string>
-    <string name="confirm_delete_site_prompt">Harap ketikkan %1$s di bidang di bawah untuk mengonfirmasi. Situs Anda akan dihapus selamanya.</string>
     <string name="site_settings_export_content_title">Ekspor konten</string>
+    <string name="confirm_delete_site_prompt">Harap ketikkan %1$s di bidang di bawah untuk mengonfirmasi. Situs Anda akan dihapus selamanya.</string>
     <string name="confirm_delete_site">Konfirmasi Penghapusan Situs</string>
     <string name="contact_support">Hubungi Dukungan</string>
     <string name="start_over_text">Jika Anda menginginkan sebuah situs tetapi tidak menginginkan beberapa pos dan halaman yang Anda miliki saat ini, tim dukungan kami dapat menghapus pos, halaman, media, dan komentar untuk Anda.\n\nTindakan ini akan membuat situs dan URL Anda tetap aktif, tetapi memberi Anda titik awal yang segar di pembuatan konten. Cukup hubungi kami untuk membersihkan konten Anda saat ini.</string>
-    <string name="site_settings_start_over_hint">Mulai dari awal situs Anda</string>
     <string name="let_us_help">Mari Kami Bantu</string>
-    <string name="me_btn_app_settings">Pengaturan Aplikasi</string>
+    <string name="site_settings_start_over_hint">Mulai dari awal situs Anda</string>
     <string name="start_over">Mulai</string>
+    <string name="me_btn_app_settings">Pengaturan Aplikasi</string>
     <string name="editor_remove_failed_uploads">Buang unggahan yang gagal</string>
     <string name="site_settings_advanced_header">Lanjutan</string>
     <string name="comments_empty_list_filtered_trashed">Tidak ada komentar yang dibuang</string>
     <string name="comments_empty_list_filtered_pending">Tidak komentar tertunda</string>
     <string name="comments_empty_list_filtered_approved">Tidak ada komentar yang disetujui</string>
     <string name="xmlrpc_missing_method_error">Tidak dapat terhubung. Metode XML-RPC yang diperlukan tidak ditemukan di server.</string>
-    <string name="post_format_status">Status</string>
-    <string name="post_format_video">Video</string>
     <string name="alignment_center">Tengah</string>
-    <string name="post_format_chat">Obrolan</string>
-    <string name="post_format_gallery">Galeri</string>
-    <string name="post_format_image">Gambar</string>
-    <string name="post_format_link">Tautan</string>
-    <string name="post_format_quote">Kutipan</string>
+    <string name="post_format_video">Video</string>
+    <string name="post_format_status">Status</string>
     <string name="post_format_standard">Standar</string>
-    <string name="notif_events">Informasi tentang kursus dan acara WordPress.com (online &amp; tatap muka).</string>
-    <string name="post_format_aside">Ke samping</string>
+    <string name="post_format_quote">Kutipan</string>
+    <string name="post_format_link">Tautan</string>
+    <string name="post_format_image">Gambar</string>
+    <string name="post_format_gallery">Galeri</string>
+    <string name="post_format_chat">Obrolan</string>
     <string name="post_format_audio">Audio</string>
+    <string name="post_format_aside">Ke samping</string>
+    <string name="notif_events">Informasi tentang kursus dan acara WordPress.com (online &amp; tatap muka).</string>
     <string name="notif_surveys">Kesempatan untuk berpartisipasi dalam riset &amp; survei WordPress.com.</string>
     <string name="notif_tips">Kiat untuk mendapat maksimal dari WordPress.com.</string>
     <string name="notif_community">Komunitas</string>
-    <string name="replies_to_my_comments">Balas komentar saya</string>
-    <string name="notif_suggestions">Saran</string>
     <string name="notif_research">Riset</string>
-    <string name="site_achievements">Prestasi situs</string>
+    <string name="notif_suggestions">Saran</string>
+    <string name="replies_to_my_comments">Balas komentar saya</string>
     <string name="username_mentions">Penyebutan nama pengguna</string>
-    <string name="likes_on_my_posts">Suka pada pos saya</string>
+    <string name="site_achievements">Prestasi situs</string>
     <string name="site_follows">Pengikut Situs</string>
+    <string name="likes_on_my_posts">Suka pada pos saya</string>
     <string name="likes_on_my_comments">Suka pada komentar saya</string>
     <string name="comments_on_my_site">Komentar di situs saya</string>
     <string name="site_settings_list_editor_summary_other">%d items</string>
     <string name="site_settings_list_editor_summary_one">1 item</string>
-    <string name="approve_auto_if_previously_approved">Komentar pengguna yang diketahui</string>
     <string name="approve_auto">Semua pengguna</string>
+    <string name="approve_auto_if_previously_approved">Komentar pengguna yang diketahui</string>
     <string name="approve_manual">Tak ada komentar</string>
     <string name="site_settings_paging_summary_other">%d komentar per halaman</string>
     <string name="site_settings_paging_summary_one">1 komentar per halaman</string>
@@ -1956,11 +2303,11 @@ Language: id
     <string name="detail_approve_auto">Otomatis setujui komentar semua orang.</string>
     <string name="detail_approve_auto_if_previously_approved">Otomatis setujui jika pengguna memiliki komentar yang disetujui sebelumnya</string>
     <string name="detail_approve_manual">Wajibkan persetujuan manual untuk komentar semua orang.</string>
-    <string name="days_quantity_one">1 hari</string>
     <string name="days_quantity_other">%d hari</string>
-    <string name="pending_email_change_snackbar">Klik tautan verifikasi di email yang dikirimkan ke %1$s untuk mengonfirmasi alamat baru Anda</string>
-    <string name="primary_site">Situs Utama</string>
+    <string name="days_quantity_one">1 hari</string>
     <string name="web_address">Alamat situs web</string>
+    <string name="primary_site">Situs Utama</string>
+    <string name="pending_email_change_snackbar">Klik tautan verifikasi di email yang dikirimkan ke %1$s untuk mengonfirmasi alamat baru Anda</string>
     <string name="editor_toast_uploading_please_wait">Saat ini Anda sedang mengunggah media. Harap tunggu hingga selesai.</string>
     <string name="error_refresh_comments_showing_older">Komentar tidak dapat disegarkan pada saat ini - menunjukkan komentar lama</string>
     <string name="post_settings_set_featured_image">Atur Gambar Andalan</string>
@@ -1969,13 +2316,13 @@ Language: id
     <string name="dlg_sure_to_delete_comments">Hapus komentar ini secara permanen?</string>
     <string name="dlg_sure_to_delete_comment">Hapus komentar ini secara permanen?</string>
     <string name="mnu_comment_delete_permanently">Hapus</string>
-    <string name="comment_deleted_permanently">Komentar dihapus</string>
     <string name="mnu_comment_untrash">Pulihkan</string>
+    <string name="comment_deleted_permanently">Komentar dihapus</string>
     <string name="comments_empty_list_filtered_spam">Tidak ada komentar spam</string>
-    <string name="could_not_load_page">Tidak dapat memuat halaman</string>
     <string name="comment_status_all">Semua</string>
-    <string name="interface_language">Bahasa Antarmuka</string>
+    <string name="could_not_load_page">Tidak dapat memuat halaman</string>
     <string name="off">Nonaktif</string>
+    <string name="interface_language">Bahasa Antarmuka</string>
     <string name="about_the_app">Tentang aplikasi</string>
     <string name="error_post_account_settings">Tidak dapat menyimpan pengaturan akun Anda</string>
     <string name="error_fetch_account_settings">Tidak dapat mengambil pengaturan akun Anda</string>
@@ -1983,9 +2330,9 @@ Language: id
     <string name="site_settings_unknown_language_code_error">Kode bahasa tidak dikenali</string>
     <string name="site_settings_threading_dialog_description">Izinkan komentar ditumpuk dalam utas.</string>
     <string name="site_settings_threading_dialog_header">Utas hingga</string>
-    <string name="remove">Buang</string>
-    <string name="search">Cari</string>
     <string name="disabled">Dinonaktifkan</string>
+    <string name="search">Cari</string>
+    <string name="remove">Buang</string>
     <string name="site_settings_image_original_size">Ukuran Asli</string>
     <string name="privacy_private">Situs Anda hanya dapat dilihat oleh Anda dan pengguna yang Anda setujui</string>
     <string name="privacy_public_not_indexed">Situs Anda dapat dilihat oleh semua orang, tetapi meminta mesin pencari untuk tidak mengindeks.</string>
@@ -1994,9 +2341,9 @@ Language: id
     <string name="about_me">Tentang saya</string>
     <string name="public_display_name_hint">Nama tampilan secara default akan menjadi nama pengguna Anda bila tidak diatur</string>
     <string name="public_display_name">Nama tampilan publik</string>
-    <string name="my_profile">Profil Saya</string>
-    <string name="first_name">Nama depan</string>
     <string name="last_name">Nama belakang</string>
+    <string name="first_name">Nama depan</string>
+    <string name="my_profile">Profil Saya</string>
     <string name="cd_related_post_preview_image">Gambar pratinjau pos terkait</string>
     <string name="error_post_remote_site_settings">Tidak dapat menyimpan info situs</string>
     <string name="error_fetch_remote_site_settings">Tidak dapat mengambil info situs</string>
@@ -2005,7 +2352,7 @@ Language: id
     <string name="site_settings_paging_dialog_description">Bagi utas komentar ke dalam beberapa halaman.</string>
     <string name="site_settings_paging_dialog_header">Komentar per halaman</string>
     <string name="site_settings_close_after_dialog_title">Tutup komentar</string>
-    <string name="site_settings_blacklist_description">Saat komentar memuat kata-kata berikut dalam isi, nama, tautan, email, atau IP, maka akan ditandai sebagai spam. Anda bisa menuliskan bagian kata, jadi \"press\" akan cocok dengan \"WordPress.\"</string>
+    <string name="site_settings_denylist_description">Ketika sebuah komentar memuat kata-kata ini di dalam konten, nama, URL, email, atau IP-nya, maka akan ditandai sebagai spam. Anda dapat memasukkan sebagian kata, sehingga \"press\" akan cocok dengan \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Saat komentar memuat kata-kata berikut dalam isi, nama, tautan, email, atau IP, maka akan tertunda dalam antrean moderasi. Anda bisa menuliskan bagian kata, jadi \"press\" akan cocok dengan \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Masukkan kata atau kalimat</string>
     <string name="site_settings_list_editor_no_items_text">Tidak ada item</string>
@@ -2020,10 +2367,10 @@ Language: id
     <string name="site_settings_rp_show_header_title">Tampilkan Header</string>
     <string name="site_settings_rp_switch_summary">Pos terkait menampilkan konten yang relevan dari situs Anda di bawah pos Anda.</string>
     <string name="site_settings_rp_switch_title">Tampilkan Pos Terkait</string>
-    <string name="site_settings_blacklist_hint">Komentar yang cocok dengan filter ditandai sebagai spam</string>
+    <string name="site_settings_denylist_hint">Komentar yang cocok dengan filter ditandai sebagai spam</string>
     <string name="site_settings_moderation_hold_hint">Komentar yang cocok dengan filter akan menunggu antrean moderasi</string>
     <string name="site_settings_multiple_links_hint">Abaikan batasan tautan untuk pengguna yang dikenal</string>
-    <string name="site_settings_whitelist_hint">Penulis komentar harus mempunyai komentar yang sudah disetujui sebelumnya</string>
+    <string name="site_settings_allowlist_hint">Penulis komentar harus mempunyai komentar yang disetujui sebelumnya</string>
     <string name="site_settings_user_account_required_hint">Pengguna harus sudah terdaftar dan masuk untuk memberi komentar</string>
     <string name="site_settings_identity_required_hint">Penulis komentar harus memasukkan nama dan email</string>
     <string name="site_settings_paging_hint">Tampilkan komentar dalam beberapa bagian dengan ukuran spesifik</string>
@@ -2046,19 +2393,18 @@ Language: id
     <string name="site_settings_address_hint">Mengubah alamat Anda saat ini tidak dimungkinkan</string>
     <string name="site_settings_tagline_hint">Deskripsi pendek atau kalimat unik untuk menggambarkan blog Anda</string>
     <string name="site_settings_title_hint">Dalam beberapa kata, jelaskan mengenai situs ini</string>
-    <string name="site_settings_whitelist_known_summary">Komentar dari user yang dikenal</string>
-    <string name="site_settings_whitelist_all_summary">Komentar dari semua pengguna</string>
+    <string name="site_settings_allowlist_known_summary">Komentar dari user yang dikenal</string>
+    <string name="site_settings_allowlist_all_summary">Komentar dari semua pengguna</string>
     <string name="site_settings_threading_summary">%d level</string>
     <string name="site_settings_privacy_private_summary">Privat</string>
     <string name="site_settings_privacy_hidden_summary">Tersembunyi</string>
-    <string name="site_settings_delete_site_title">Hapus Situs</string>
     <string name="site_settings_privacy_public_summary">Publik</string>
-    <string name="site_settings_blacklist_title">Daftar hitam</string>
+    <string name="site_settings_delete_site_title">Hapus Situs</string>
     <string name="site_settings_moderation_hold_title">Menunggu untuk Moderasi</string>
     <string name="site_settings_multiple_links_title">Tautan dalam komentar</string>
-    <string name="site_settings_whitelist_title">Otomatis disetujui</string>
-    <string name="site_settings_threading_title">Rangkaian</string>
+    <string name="site_settings_allowlist_title">Otomatis disetujui</string>
     <string name="site_settings_paging_title">Penomoran halaman</string>
+    <string name="site_settings_threading_title">Rangkaian</string>
     <string name="site_settings_sort_by_title">Urut berdasar</string>
     <string name="site_settings_account_required_title">Pengguna harus log in</string>
     <string name="site_settings_identity_required_title">Harus menyertakan nama dan email</string>
@@ -2068,22 +2414,22 @@ Language: id
     <string name="site_settings_default_format_title">Format Baku</string>
     <string name="site_settings_default_category_title">Kategori Baku</string>
     <string name="site_settings_address_title">Alamat</string>
-    <string name="site_settings_title_title">Judul Situs</string>
     <string name="site_settings_tagline_title">Slogan</string>
+    <string name="site_settings_title_title">Judul Situs</string>
     <string name="site_settings_discussion_new_posts_header">Baku untuk pos baru</string>
-    <string name="site_settings_account_header">Akun</string>
     <string name="site_settings_writing_header">Tulisan</string>
+    <string name="site_settings_account_header">Akun</string>
     <string name="site_settings_general_header">Umum</string>
     <string name="newest_first">Terbaru terlebih dahulu</string>
-    <string name="discussion">Diskusi</string>
-    <string name="privacy">Privasi</string>
-    <string name="related_posts">Pos Terkait</string>
-    <string name="comments">Komentar</string>
-    <string name="close_after">Tutup setelah</string>
     <string name="oldest_first">Paling lama terlebih dahulu</string>
+    <string name="close_after">Tutup setelah</string>
+    <string name="comments">Komentar</string>
+    <string name="related_posts">Pos Terkait</string>
+    <string name="privacy">Privasi</string>
+    <string name="discussion">Diskusi</string>
     <string name="media_error_no_permission_upload">Anda tidak memiliki izin untuk menambahkan media ke dalam situs</string>
-    <string name="never">Tidak pernah</string>
     <string name="unknown">Tidak diketahui</string>
+    <string name="never">Tidak pernah</string>
     <string name="reader_err_get_post_not_found">Pos ini tidak ada lagi</string>
     <string name="reader_err_get_post_not_authorized">Anda tidak diizinkan melihat pos ini</string>
     <string name="reader_err_get_post_generic">Gagal mengambil pos ini</string>
@@ -2095,22 +2441,22 @@ Language: id
     <string name="theme_activation_error">Terjadi masalah. Tidak dapat mengaktifkan tema</string>
     <string name="theme_by_author_prompt_append"> oleh %1$s</string>
     <string name="theme_prompt">Terima kasih sudah memilih %1$s</string>
-    <string name="theme_try_and_customize">Coba &amp; Sesuaikan</string>
-    <string name="theme_view">Lihat</string>
-    <string name="theme_details">Rincian</string>
-    <string name="theme_support">Dukungan</string>
-    <string name="theme_done">SELESAI</string>
     <string name="theme_manage_site">KELOLA SITUS</string>
+    <string name="theme_done">SELESAI</string>
+    <string name="theme_support">Dukungan</string>
+    <string name="theme_details">Rincian</string>
+    <string name="theme_view">Lihat</string>
+    <string name="theme_try_and_customize">Coba &amp; Sesuaikan</string>
     <string name="theme_activate">Aktifkan</string>
-    <string name="current_theme">Tema Saat Ini</string>
-    <string name="customize">Sesuaikan</string>
-    <string name="details">Rincian</string>
-    <string name="support">Dukungan</string>
     <string name="active">Aktif</string>
-    <string name="post_published">Pos diterbitkan</string>
-    <string name="page_published">Halaman diterbitkan</string>
-    <string name="post_updated">Pos diperbarui</string>
+    <string name="support">Dukungan</string>
+    <string name="details">Rincian</string>
+    <string name="customize">Sesuaikan</string>
+    <string name="current_theme">Tema Saat Ini</string>
     <string name="page_updated">Halaman diperbarui</string>
+    <string name="post_updated">Pos diperbarui</string>
+    <string name="page_published">Halaman diterbitkan</string>
+    <string name="post_published">Pos diterbitkan</string>
     <string name="theme_no_search_result_found">Maaf, tema tidak ditemukan.</string>
     <string name="reader_label_gap_marker">Muat pos lainnya</string>
     <string name="notifications_no_search_results">Tidak ada situs yang cocok dengan \'%s\'</string>
@@ -2131,8 +2477,9 @@ Language: id
     <string name="reader_discover_attribution_author_and_blog">Semula diposkan oleh %1$s pada %2$s</string>
     <string name="reader_short_like_count_multi">%s Suka</string>
     <string name="reader_short_like_count_one">1 Suka</string>
-    <string name="reader_label_follow_count">%,d pengikut</string>
     <string name="reader_short_like_count_none">Suka</string>
+    <string name="reader_label_follow_count">%,d pengikut</string>
+    <string name="reader_menu_tags">Edit topik dan situs</string>
     <string name="reader_title_post_detail">Pos Pembaca</string>
     <string name="notifications_push_summary">Pengaturan pemberitahuan yang muncul di perangkat Anda.</string>
     <string name="notifications_email_summary">Pengaturan pemberitahuan yang dikirim melalui email yang terhubung dengan akun Anda.</string>
@@ -2142,208 +2489,211 @@ Language: id
     <string name="error_loading_notifications">Tidak dapat memuat pengaturan pemberitahuan</string>
     <string name="comment_likes">Menyukai komentar</string>
     <string name="app_notifications">Pemberitahuan aplikasi</string>
-    <string name="notifications_tab">Tab pemberitahuan</string>
     <string name="email">Email</string>
+    <string name="notifications_tab">Tab pemberitahuan</string>
     <string name="notification_settings_item_other_account_emails_summary">Kami akan selalu mengirim email penting terkait akun Anda, namun Anda juga dapat memperoleh beberapa tambahan yang bermanfaat.</string>
     <string name="stats_insights_latest_post_summary">Ringkasan Pos Terbaru</string>
     <string name="connectionbar_no_connection">Tak ada koneksi</string>
-    <string name="button_stats">Statistik</string>
+    <string name="post_trashed">Pos dibuang ke tong sampah</string>
     <string name="button_trash">Buang</string>
+    <string name="button_stats">Statistik</string>
     <string name="button_preview">Pratinjau</string>
     <string name="button_view">Lihat</string>
-    <string name="button_edit">Sunting</string>
     <string name="button_publish">Terbitkan</string>
-    <string name="post_trashed">Pos dibuang ke tong sampah</string>
+    <string name="button_edit">Sunting</string>
     <string name="reader_toast_err_follow_blog_not_authorized">Anda tidak memiliki izin untuk mengakses situs ini</string>
     <string name="reader_toast_err_follow_blog_not_found">Situs ini tidak ditemukan</string>
     <string name="undo">Urungkan</string>
     <string name="push_auth_expired">Permintaan sudah kadaluwarsa. Log in ke WordPress.com untuk mencoba lagi.</string>
-    <string name="stats_insights_best_ever">Tampilan Terbaik</string>
     <string name="ignore">Abaikan</string>
+    <string name="stats_insights_best_ever">Tampilan Terbaik</string>
     <string name="stats_insights_today">Statistik Hari Ini</string>
     <string name="stats_insights_all_time">Pos, tampilan, dan pengunjung sepanjang waktu</string>
     <string name="stats_insights">Wawasan</string>
     <string name="me_disconnect_from_wordpress_com">Logout dari WordPress.com</string>
-    <string name="me_btn_login_logout">Log masuk/keluar</string>
     <string name="me_connect_to_wordpress_com">Log in ke WordPress.com</string>
+    <string name="me_btn_login_logout">Log masuk/keluar</string>
     <string name="me_btn_support">Bantuan &amp; Dukungan</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" tidak tersembunyi karena itu adalah situs saat ini</string>
     <string name="account_settings">Pengaturan Akun</string>
+    <string name="site_picker_cant_hide_current_site">\"%s\" tidak tersembunyi karena itu adalah situs saat ini</string>
     <string name="site_picker_create_wpcom">Buat situs WordPress.com</string>
     <string name="site_picker_add_self_hosted">Tambahkan situs mandiri (self-hosted)</string>
-    <string name="site_picker_edit_visibility">Tampilkan/sembunyikan situs</string>
     <string name="site_picker_add_site">Tambah situs baru</string>
-    <string name="my_site_btn_view_admin">Tampilkan Admin</string>
-    <string name="my_site_btn_view_site">Tampilkan Situs</string>
+    <string name="site_picker_edit_visibility">Tampilkan/sembunyikan situs</string>
     <string name="site_picker_title">Pilih situs</string>
+    <string name="my_site_btn_view_site">Tampilkan Situs</string>
+    <string name="my_site_btn_view_admin">Tampilkan Admin</string>
     <string name="my_site_btn_switch_site">Ganti Situs</string>
-    <string name="my_site_btn_blog_posts">Pos Blog</string>
     <string name="my_site_btn_site_settings">Pengaturan</string>
-    <string name="my_site_header_look_and_feel">Tampilan dan Nuansa</string>
+    <string name="my_site_btn_blog_posts">Pos Blog</string>
     <string name="my_site_header_publish">Terbitkan</string>
+    <string name="my_site_header_look_and_feel">Tampilan dan Nuansa</string>
     <string name="my_site_header_configuration">Konfigurasi</string>
     <string name="reader_label_new_posts_subtitle">Ketuk untuk menampilkannya</string>
-    <string name="show">Tampilkan</string>
-    <string name="hide">Sembunyikan</string>
-    <string name="select_all">Pilih semua</string>
     <string name="deselect_all">Batalkan semua pilihan</string>
-    <string name="language">Bahasa</string>
-    <string name="verification_code">Kode verifikasi</string>
-    <string name="invalid_verification_code">Kode verifikasi tidak valid</string>
+    <string name="select_all">Pilih semua</string>
+    <string name="hide">Sembunyikan</string>
+    <string name="show">Tampilkan</string>
     <string name="auth_required">Log in lagi untuk melanjutkan.</string>
-    <string name="reader_empty_posts_request_failed">Gagal memuat pos-pos</string>
+    <string name="invalid_verification_code">Kode verifikasi tidak valid</string>
+    <string name="verification_code">Kode verifikasi</string>
+    <string name="language">Bahasa</string>
+    <string name="reader_empty_posts_request_failed">Gagal memuat pos-pos</string>
     <string name="publisher">Penerbit:</string>
     <string name="error_notification_open">Gagal membuka notifikasi</string>
     <string name="stats_search_terms_unknown_search_terms">Terma Pencarian Tak Dikenal</string>
-    <string name="stats_view_authors">Para Penulis</string>
     <string name="stats_view_search_terms">Terma-terma Pencarian</string>
+    <string name="stats_view_authors">Para Penulis</string>
     <string name="comments_fetching">Memuat komentar…</string>
     <string name="pages_fetching">Memuat laman…</string>
     <string name="posts_fetching">Memuat pos…</string>
     <string name="media_fetching">Memuat media…</string>
     <string name="logs_copied_to_clipboard">Log aplikasi sudah disalin ke clipboard</string>
-    <string name="error_copy_to_clipboard">Terjadi kesalahan saat menyalin teks ke clipboard</string>
+    <string name="reader_empty_posts_in_blog">Situs ini kosong</string>
     <string name="reader_label_new_posts">Pos baru</string>
-    <string name="reader_page_recommended_blogs">Situs yang mungkin Anda sukai</string>
+    <string name="error_copy_to_clipboard">Terjadi kesalahan saat menyalin teks ke clipboard</string>
     <string name="post_uploading">Mengunggah pos</string>
-    <string name="reader_empty_posts_in_blog">Situs ini kosong</string>
-    <string name="stats_followers_months">%1$d bulan</string>
-    <string name="stats_followers_a_year">Satu tahun</string>
     <string name="stats_followers_years">%1$d tahun</string>
+    <string name="stats_followers_a_year">Satu tahun</string>
+    <string name="stats_followers_months">%1$d bulan</string>
     <string name="stats_followers_a_month">Satu bulan</string>
-    <string name="stats_followers_minutes">%1$d menit</string>
-    <string name="stats_followers_an_hour_ago">satu jam yang lalu</string>
-    <string name="stats_followers_hours">%1$d jam</string>
-    <string name="stats_followers_a_day">Satu hari</string>
     <string name="stats_followers_days">%1$d hari</string>
+    <string name="stats_followers_a_day">Satu hari</string>
+    <string name="stats_followers_hours">%1$d jam</string>
+    <string name="stats_followers_an_hour_ago">satu jam yang lalu</string>
+    <string name="stats_followers_minutes">%1$d menit</string>
     <string name="stats_followers_a_minute_ago">satu menit yang lalu</string>
-    <string name="stats_timeframe_years">Tahun</string>
-    <string name="stats_views">Tampilan</string>
-    <string name="stats_visitors">Pengunjung</string>
-    <string name="themes_fetching">Mengambil tema…</string>
     <string name="stats_followers_seconds_ago">detik yang lalu</string>
-    <string name="stats_view_top_posts_and_pages">Pos &amp; Halaman</string>
-    <string name="stats_view_videos">Video</string>
-    <string name="stats_view_publicize">Publikasikan</string>
     <string name="stats_view_followers">Pengikut</string>
+    <string name="stats_view_publicize">Publikasikan</string>
+    <string name="stats_view_videos">Video</string>
+    <string name="stats_view_top_posts_and_pages">Pos &amp; Halaman</string>
     <string name="stats_view_countries">Negara</string>
     <string name="stats_likes">Suka</string>
+    <string name="stats_visitors">Pengunjung</string>
+    <string name="stats_views">Tampilan</string>
+    <string name="stats_timeframe_years">Tahun</string>
+    <string name="themes_fetching">Mengambil tema…</string>
     <string name="ssl_certificate_details">Rincian</string>
     <string name="cab_selected">%d terpilih</string>
     <string name="browse_our_faq_button">Telusuri Tanya Jawab Umum kami</string>
     <string name="reader_empty_comments">Belum ada komentar</string>
-    <string name="reader_label_view_original">Lihat artikel asli</string>
+    <string name="reader_empty_posts_in_tag">Tidak ada pos dengan topik ini</string>
     <string name="reader_label_like">Suka</string>
+    <string name="reader_label_view_original">Lihat artikel asli</string>
     <string name="reader_label_comments_closed">Komentar ditutup</string>
     <string name="reader_title_photo_viewer">%1$d dari %2$d</string>
     <string name="error_publish_empty_post">Tidak dapat menerbitkan pos kosong</string>
     <string name="error_refresh_unauthorized_posts">Anda tidak memiliki izin untuk melihat atau menyunting pos</string>
     <string name="error_refresh_unauthorized_pages">Anda tidak memiliki izin untuk melihat atau menyunting halaman</string>
     <string name="error_refresh_unauthorized_comments">Anda tidak memiliki izin untuk melihat atau menyunting komentar</string>
-    <string name="older_month">Lebih dari satu bulan</string>
     <string name="more">Lainnya</string>
-    <string name="older_two_days">Lebih dari 2 hari</string>
+    <string name="older_month">Lebih dari satu bulan</string>
     <string name="older_last_week">Lebih dari satu minggu</string>
+    <string name="older_two_days">Lebih dari 2 hari</string>
     <string name="mnu_comment_liked">Disukai</string>
     <string name="comment">Komentar</string>
     <string name="comment_trashed">Komentar dibuang</string>
-    <string name="posts_empty_list">Belum ada pos. Mengapa tidak membuatnya?</string>
     <string name="comment_reply_to_user">Balas ke %s</string>
+    <string name="posts_empty_list">Belum ada pos. Mengapa tidak membuatnya?</string>
     <string name="signing_out">Log out…</string>
     <string name="reader_toast_err_generic">Tidak bisa menjalankan proses ini</string>
     <string name="reader_toast_err_block_blog">Tidak bisa memblokir situs ini</string>
-    <string name="reader_menu_block_blog">Blokir situs ini</string>
     <string name="reader_toast_blog_blocked">Pos dari situs ini tidak akan ditampilkan lagi</string>
-    <string name="update_verb">Mutakhirkan</string>
+    <string name="reader_menu_block_blog">Blokir situs ini</string>
     <string name="schedule_verb">Jadwalkan</string>
-    <string name="reader_page_followed_blogs">Situs yang diikuti</string>
-    <string name="reader_label_followed_blog">Situs diikuti</string>
-    <string name="reader_toast_err_get_blog_info">Tidak dapat menampilkan situs ini</string>
-    <string name="reader_toast_err_already_follow_blog">Anda sudah mengikuti situs ini</string>
-    <string name="reader_toast_err_follow_blog">Tidak dapat mengikuti situs ini</string>
-    <string name="reader_toast_err_unfollow_blog">Tidak dapat berhenti mengikuti situs ini</string>
+    <string name="update_verb">Mutakhirkan</string>
     <string name="reader_empty_recommended_blogs">Tidak ada situs yang disarankan</string>
+    <string name="reader_toast_err_unfollow_blog">Tidak dapat berhenti mengikuti situs ini</string>
+    <string name="reader_toast_err_follow_blog">Tidak dapat mengikuti situs ini</string>
+    <string name="reader_toast_err_already_follow_blog">Anda sudah mengikuti situs ini</string>
+    <string name="reader_toast_err_get_blog_info">Tidak dapat menampilkan situs ini</string>
+    <string name="reader_label_followed_blog">Situs diikuti</string>
+    <string name="reader_hint_add_tag_or_url">Masukkan URL atau topik yang ingin Anda follow</string>
+    <string name="reader_page_followed_blogs">Situs yang diikuti</string>
+    <string name="reader_page_followed_tags">Topik yang diikuti</string>
     <string name="reader_title_blog_preview">Situs Pembaca</string>
-    <string name="help">Bantuan</string>
-    <string name="ssl_certificate_error">Sertifikat SSL tidak sah</string>
     <string name="ssl_certificate_ask_trust">Jika biasanya Anda bisa terhubung dengan situs ini tanpa masalah, galat ini bisa berarti seseorang sedang mencoba meniru situs, dan Anda sebaiknya tidak melanjutkannya. Apakah Anda ingin mempercayai sertifikat ini?</string>
-    <string name="forgot_password">Lupa kata sandi Anda?</string>
-    <string name="no_network_message">Tidak ada jaringan yang tersedia</string>
-    <string name="blog_not_found">Terjadi kekeliruan ketika mengakses blog ini</string>
-    <string name="gallery_error">Item media gagal diambil</string>
-    <string name="theme_fetch_failed">Gagal mengunduh tema</string>
-    <string name="mnu_comment_unspam">Bukan spam</string>
-    <string name="adding_cat_failed">Gagal menambahkan kategori</string>
-    <string name="adding_cat_success">Berhasil menambahkan kategori</string>
-    <string name="cat_name_required">Nama kategori wajib diisi</string>
-    <string name="sdcard_message">Kartu SD tambahan diperlukan untuk mengunggah media</string>
-    <string name="notifications_empty_list">Tak ada pemberitahuan</string>
-    <string name="error_refresh_posts">Pos tidak bisa disegarkan saat ini</string>
-    <string name="error_refresh_pages">Laman tidak bisa disegarkan saat ini</string>
-    <string name="error_refresh_comments">Tanggapan tidak bisa disegarkan saat ini</string>
-    <string name="error_generic">Terjadi galat</string>
-    <string name="error_moderate_comment">Terjadi galat saat sedang memoderasi</string>
-    <string name="error_edit_comment">Terjadi galat saat sedang mengedit tanggapan</string>
-    <string name="error_load_comment">Gagal memuat tanggapan</string>
-    <string name="error_downloading_image">Galat saat mengunduh gambar</string>
-    <string name="invalid_email_message">Alamat emailmu tidak sah</string>
-    <string name="email_invalid">Masukkan alamat email yang sah</string>
+    <string name="ssl_certificate_error">Sertifikat SSL tidak sah</string>
+    <string name="help">Bantuan</string>
     <string name="username_or_password_incorrect">Nama pengguna atau kata sandi yang Anda masukkan tidak tepat</string>
+    <string name="email_invalid">Masukkan alamat email yang sah</string>
+    <string name="invalid_email_message">Alamat emailmu tidak sah</string>
+    <string name="error_downloading_image">Galat saat mengunduh gambar</string>
+    <string name="error_load_comment">Gagal memuat tanggapan</string>
+    <string name="error_edit_comment">Terjadi galat saat sedang mengedit tanggapan</string>
+    <string name="error_moderate_comment">Terjadi galat saat sedang memoderasi</string>
+    <string name="error_generic">Terjadi galat</string>
+    <string name="error_refresh_comments">Tanggapan tidak bisa disegarkan saat ini</string>
+    <string name="error_refresh_pages">Laman tidak bisa disegarkan saat ini</string>
+    <string name="error_refresh_posts">Pos tidak bisa disegarkan saat ini</string>
     <string name="error_deleting_post">Terjadi error saat menghapus pos</string>
-    <string name="connection_error">Galat sambungan</string>
-    <string name="cancel_edit">Batalkan edit</string>
-    <string name="learn_more">Pelajari lebih lanjut</string>
-    <string name="select_categories">Pilih kategori</string>
-    <string name="post_not_found">Terjadi galat saat memuat pos. Segarkan pos Anda dan coba lagi.</string>
-    <string name="media_error_no_permission">Anda tidak memiliki izin untuk melihat pustaka media</string>
-    <string name="cannot_delete_multi_media_items">Beberapa media tak bisa dihapus sekarang. Coba lagi nanti.</string>
-    <string name="link_enter_url_text">Teks tautan (opsional)</string>
-    <string name="page_settings">Pengaturan laman</string>
-    <string name="local_draft">Draf lokal</string>
-    <string name="post_settings">Pengaturan pos</string>
-    <string name="comment_status_approved">Diizinkan</string>
-    <string name="comment_status_unapproved">Tertunda</string>
-    <string name="comment_status_spam">Spam</string>
-    <string name="comment_status_trash">Dibuang</string>
-    <string name="edit_comment">Edit komentar</string>
-    <string name="mnu_comment_approve">Izinkan</string>
-    <string name="mnu_comment_unapprove">Tolak</string>
-    <string name="mnu_comment_spam">Spam</string>
-    <string name="mnu_comment_trash">Tong Sampah</string>
-    <string name="dlg_approving_comments">Mengizinkan</string>
-    <string name="dlg_unapproving_comments">Menolak</string>
-    <string name="dlg_spamming_comments">Menandai sebagai spam</string>
-    <string name="dlg_trashing_comments">Membuang ke Tong Sampah</string>
-    <string name="dlg_confirm_trash_comments">Buang ke Tong Sampah?</string>
-    <string name="trash">Tong Sampah</string>
-    <string name="saving_changes">Menyimpan perubahan</string>
-    <string name="sure_to_cancel_edit_comment">Batal mengedit komentar ini?</string>
-    <string name="content_required">Komentar diwajibkan</string>
-    <string name="toast_comment_unedited">Komentar belum berubah</string>
-    <string name="view_in_browser">Tampilkan di peramban</string>
-    <string name="add_new_category">Tambahkan kategori baru</string>
-    <string name="category_name">Nama kategori</string>
-    <string name="file_error_create">Tidak bisa membuat berkas temporer untuk pengunggahan media. Pastikan masih cukup ruang di perangkat Anda.</string>
-    <string name="open_source_licenses">Lisensi sumber terbuka</string>
-    <string name="http_authorization_required">Otorisasi diwajibkan</string>
-    <string name="new_post">Pos baru</string>
-    <string name="new_media">Media baru</string>
-    <string name="privacy_policy">Kebijakan privasi</string>
-    <string name="local_changes">Perubahan lokal</string>
-    <string name="image_settings">Pengaturan gambar</string>
-    <string name="wordpress_blog">Blog WordPress</string>
-    <string name="error_blog_hidden">Blog ini tersembunyi dan tak bisa dimuat. Aktifkan lagi melalui pengaturan dan coba lagi.</string>
-    <string name="fatal_db_error">Terjadi gagal ketika membuat basis data app. Coba instal ulang app.</string>
+    <string name="notifications_empty_list">Tak ada pemberitahuan</string>
+    <string name="sdcard_message">Kartu SD tambahan diperlukan untuk mengunggah media</string>
+    <string name="cat_name_required">Nama kategori wajib diisi</string>
+    <string name="adding_cat_success">Berhasil menambahkan kategori</string>
+    <string name="adding_cat_failed">Gagal menambahkan kategori</string>
+    <string name="mnu_comment_unspam">Bukan spam</string>
+    <string name="theme_fetch_failed">Gagal mengunduh tema</string>
+    <string name="blog_not_found">Terjadi kekeliruan ketika mengakses blog ini</string>
+    <string name="gallery_error">Item media gagal diambil</string>
+    <string name="no_network_message">Tidak ada jaringan yang tersedia</string>
+    <string name="reader_toast_err_remove_tag">Tidak dapat menghapus topik ini</string>
+    <string name="reader_toast_err_add_tag">Tidak dapat menambahkan topik ini</string>
     <string name="reader_title_applog">Log aplikasi</string>
-    <string name="media_gallery_type_thumbnail_grid">Thumbnail grid</string>
-    <string name="remove_account">Hapus situs</string>
+    <string name="fatal_db_error">Terjadi gagal ketika membuat basis data app. Coba instal ulang app.</string>
+    <string name="error_blog_hidden">Blog ini tersembunyi dan tak bisa dimuat. Aktifkan lagi melalui pengaturan dan coba lagi.</string>
+    <string name="error_refresh_media">Media tidak bisa disegarkan saat ini</string>
+    <string name="wordpress_blog">Blog WordPress</string>
+    <string name="image_settings">Pengaturan gambar</string>
+    <string name="local_changes">Perubahan lokal</string>
+    <string name="privacy_policy">Kebijakan privasi</string>
+    <string name="new_media">Media baru</string>
+    <string name="new_post">Pos baru</string>
     <string name="notifications_empty_all">Belum ada pemberitahuan…sampai sekarang.</string>
+    <string name="http_authorization_required">Otorisasi diwajibkan</string>
     <string name="invalid_site_url_message">Pastikan URL situs yang dimasukkan sudah valid</string>
-    <string name="error_refresh_media">Media tidak bisa disegarkan saat ini</string>
-    <string name="plugin_not_found">Terjadi error saat mengakses plugin ini</string>
-    <string name="file_not_found">Tidak dapat menemukan file yang akan diunggah. Apakah file dihapus atau dipindahkan?</string>
-    <string name="delete_post">Hapus pos?</string>
+    <string name="open_source_licenses">Lisensi sumber terbuka</string>
+    <string name="file_error_create">Tidak bisa membuat berkas temporer untuk pengunggahan media. Pastikan masih cukup ruang di perangkat Anda.</string>
+    <string name="category_name">Nama kategori</string>
+    <string name="add_new_category">Tambahkan kategori baru</string>
+    <string name="view_in_browser">Tampilkan di peramban</string>
+    <string name="remove_account">Hapus situs</string>
+    <string name="toast_comment_unedited">Komentar belum berubah</string>
+    <string name="content_required">Komentar diwajibkan</string>
+    <string name="sure_to_cancel_edit_comment">Batal mengedit komentar ini?</string>
+    <string name="saving_changes">Menyimpan perubahan</string>
+    <string name="trash">Tong Sampah</string>
+    <string name="dlg_confirm_trash_comments">Buang ke Tong Sampah?</string>
+    <string name="dlg_trashing_comments">Membuang ke Tong Sampah</string>
+    <string name="dlg_spamming_comments">Menandai sebagai spam</string>
+    <string name="dlg_unapproving_comments">Menolak</string>
+    <string name="dlg_approving_comments">Mengizinkan</string>
+    <string name="mnu_comment_trash">Tong Sampah</string>
+    <string name="mnu_comment_spam">Spam</string>
+    <string name="mnu_comment_unapprove">Tolak</string>
+    <string name="mnu_comment_approve">Izinkan</string>
+    <string name="edit_comment">Edit komentar</string>
+    <string name="comment_status_trash">Dibuang</string>
+    <string name="comment_status_spam">Spam</string>
+    <string name="comment_status_unapproved">Tertunda</string>
+    <string name="comment_status_approved">Diizinkan</string>
     <string name="delete_page">Hapus halaman?</string>
+    <string name="delete_post">Hapus pos?</string>
+    <string name="post_settings">Pengaturan pos</string>
+    <string name="file_not_found">Tidak dapat menemukan file yang akan diunggah. Apakah file dihapus atau dipindahkan?</string>
+    <string name="local_draft">Draf lokal</string>
+    <string name="page_settings">Pengaturan laman</string>
+    <string name="link_enter_url_text">Teks tautan (opsional)</string>
+    <string name="cannot_delete_multi_media_items">Beberapa media tak bisa dihapus sekarang. Coba lagi nanti.</string>
+    <string name="media_error_no_permission">Anda tidak memiliki izin untuk melihat pustaka media</string>
+    <string name="media_gallery_type_thumbnail_grid">Thumbnail grid</string>
+    <string name="learn_more">Pelajari lebih lanjut</string>
+    <string name="post_not_found">Terjadi galat saat memuat pos. Segarkan pos Anda dan coba lagi.</string>
+    <string name="plugin_not_found">Terjadi error saat mengakses plugin ini</string>
+    <string name="cancel_edit">Batalkan edit</string>
+    <string name="connection_error">Galat sambungan</string>
+    <string name="select_categories">Pilih kategori</string>
     <string name="share_link">Bagikan tautan</string>
     <string name="reader_empty_posts_in_tag_updating">Mengambil pos…</string>
     <string name="reader_likes_you_and_multi">Anda dan %,d lainnya menyukai ini</string>
@@ -2351,73 +2701,75 @@ Language: id
     <string name="reader_label_reply">Balas</string>
     <string name="cant_share_no_visible_blog">Anda tidak bisa berbagi ke WordPress tanpa satupun blog yang terlihat oleh publik</string>
     <string name="comment_spammed">Komentar ditandai sebagai spam</string>
+    <string name="reader_toast_err_get_post">Gagal membuka pos ini</string>
     <string name="reader_likes_you_and_one">Anda dan satu orang lainnya menyukai ini</string>
-    <string name="pick_photo">Pilih foto</string>
     <string name="pick_video">Pilih video</string>
-    <string name="reader_toast_err_get_post">Gagal membuka pos ini</string>
-    <string name="empty_list_default">List ini masih kosong</string>
-    <string name="reader_untitled_post">(Tanpa Judul)</string>
-    <string name="reader_btn_share">Bagikan</string>
-    <string name="reader_btn_follow">Ikuti</string>
-    <string name="reader_btn_unfollow">Pengikut</string>
-    <string name="reader_label_added_tag">%s ditambahkan</string>
-    <string name="reader_label_removed_tag">%s dihapus</string>
-    <string name="reader_likes_one">Satu orang menyukai ini</string>
-    <string name="reader_likes_only_you">Anda menyukai ini</string>
-    <string name="reader_toast_err_comment_failed">Tidak bisa menambahkan komentar anda</string>
-    <string name="reader_toast_err_share_intent">Tidak dapat membagikan</string>
-    <string name="reader_toast_err_view_image">Tidak dapat melihat gambar</string>
-    <string name="reader_toast_err_url_intent">Tidak bisa  membuka %s</string>
+    <string name="pick_photo">Pilih foto</string>
     <string name="sign_up_label">Daftar</string>
+    <string name="reader_toast_err_url_intent">Tidak bisa  membuka %s</string>
+    <string name="reader_toast_err_view_image">Tidak dapat melihat gambar</string>
+    <string name="reader_toast_err_share_intent">Tidak dapat membagikan</string>
+    <string name="reader_toast_err_tag_invalid">Topik tersebut tidak valid</string>
+    <string name="reader_toast_err_tag_exists">Anda telah mengikuti topik ini</string>
+    <string name="reader_toast_err_comment_failed">Tidak bisa menambahkan komentar anda</string>
+    <string name="reader_likes_only_you">Anda menyukai ini</string>
+    <string name="reader_likes_one">Satu orang menyukai ini</string>
+    <string name="reader_label_removed_tag">%s dihapus</string>
+    <string name="reader_label_added_tag">%s ditambahkan</string>
     <string name="reader_hint_comment_on_comment">Balas komentar…</string>
-    <string name="comments_empty_list">Belum ada komentar</string>
+    <string name="reader_btn_unfollow">Pengikut</string>
+    <string name="reader_btn_follow">Ikuti</string>
+    <string name="reader_btn_share">Bagikan</string>
     <string name="reader_view_reblog">Reblog</string>
-    <string name="themes">Tema</string>
-    <string name="media_edit_title_text">Judul</string>
-    <string name="media_edit_caption_text">Subjudul</string>
-    <string name="media_edit_description_text">Deskripsi</string>
-    <string name="media_gallery_type_squares">Kotak-kotak</string>
-    <string name="media_gallery_type_tiled">Tersusun</string>
-    <string name="media_gallery_type_circles">Lingkaran</string>
-    <string name="media_gallery_type_slideshow">Slide</string>
-    <string name="media_edit_failure">Gagal memperbarui</string>
-    <string name="theme_activate_button">Aktivasi</string>
-    <string name="stats_view_clicks">Klik</string>
-    <string name="stats_view_tags_and_categories">Tag &amp; Kategori</string>
-    <string name="stats_view_referrers">Pengacu</string>
-    <string name="stats_timeframe_today">Hari Ini</string>
-    <string name="stats_timeframe_yesterday">Kemarin</string>
-    <string name="share_action">Bagi</string>
-    <string name="stats_timeframe_days">Hari</string>
-    <string name="stats_timeframe_weeks">Minggu</string>
+    <string name="reader_untitled_post">(Tanpa Judul)</string>
+    <string name="comments_empty_list">Belum ada komentar</string>
+    <string name="empty_list_default">List ini masih kosong</string>
     <string name="stats_timeframe_months">Bulan</string>
+    <string name="stats_timeframe_weeks">Minggu</string>
+    <string name="stats_timeframe_days">Hari</string>
+    <string name="stats_timeframe_yesterday">Kemarin</string>
+    <string name="stats_timeframe_today">Hari Ini</string>
+    <string name="stats_view_referrers">Pengacu</string>
+    <string name="stats_view_tags_and_categories">Tag &amp; Kategori</string>
+    <string name="stats_view_clicks">Klik</string>
     <string name="stats">Statistik</string>
-    <string name="manage">Atur</string>
+    <string name="share_action">Bagi</string>
+    <string name="theme_activate_button">Aktivasi</string>
+    <string name="media_edit_failure">Gagal memperbarui</string>
+    <string name="media_edit_description_text">Deskripsi</string>
+    <string name="media_edit_caption_text">Subjudul</string>
+    <string name="media_edit_title_text">Judul</string>
+    <string name="media_gallery_type_slideshow">Slide</string>
+    <string name="media_gallery_type_circles">Lingkaran</string>
+    <string name="media_gallery_type_tiled">Tersusun</string>
+    <string name="media_gallery_type_squares">Kotak-kotak</string>
+    <string name="themes">Tema</string>
     <string name="discard">Batal</string>
-    <string name="note_reply_successful">Balasan telah terbit</string>
-    <string name="new_notifications">%d notifikasi baru</string>
+    <string name="manage">Atur</string>
     <string name="more_notifications">dan %d lagi.</string>
+    <string name="new_notifications">%d notifikasi baru</string>
     <string name="follows">Mengikuti</string>
+    <string name="note_reply_successful">Balasan telah terbit</string>
     <string name="sign_in">Log in</string>
     <string name="loading">Memuat…</string>
-    <string name="httpuser">Nama pengguna HTTP</string>
     <string name="httppassword">Kata sandi HTTP</string>
+    <string name="httpuser">Nama pengguna HTTP</string>
     <string name="error_media_upload">Ada masalah ketika mengunggah media</string>
     <string name="incorrect_credentials">Nama pengguna atau kata sandi salah.</string>
     <string name="log_in">Masuk</string>
-    <string name="password">Kata sandi</string>
     <string name="username">Nama pengguna</string>
+    <string name="password">Kata sandi</string>
     <string name="reader">Pembaca</string>
-    <string name="no_network_title">Tidak ada jaringan</string>
     <string name="pages">Halaman</string>
     <string name="posts">Tulisan</string>
     <string name="anonymous">Anonim</string>
-    <string name="ok">OK</string>
+    <string name="no_network_title">Tidak ada jaringan</string>
     <string name="done">selesai</string>
+    <string name="ok">OK</string>
     <string name="link_enter_url">URL</string>
+    <string name="tos">Syarat Layanan</string>
     <string name="version">Versi</string>
     <string name="app_title">WordPress untuk Android</string>
-    <string name="tos">Syarat Layanan</string>
     <string name="image_alignment">Penjajaran</string>
     <string name="refresh">Segarkan</string>
     <string name="untitled">Tanpa judul</string>
@@ -2428,24 +2780,24 @@ Language: id
     <string name="quickpress_add_error">Nama pintasan tidak boleh kosong</string>
     <string name="pages_private">Privat</string>
     <string name="title">Judul</string>
-    <string name="categories">Kategori</string>
     <string name="tags_separate_with_commas">Pisahkan tag dengan koma</string>
+    <string name="categories">Kategori</string>
     <string name="dlg_deleting_comments">Menghapus komentar</string>
     <string name="sdcard_title">Dibutuhkan SD Card</string>
     <string name="media">Media</string>
-    <string name="delete">Hapus</string>
     <string name="approve">Setujui</string>
+    <string name="delete">Hapus</string>
     <string name="none">Tiada</string>
+    <string name="publish_now">Publikasikan Sekarang</string>
     <string name="reply">Balasan</string>
-    <string name="preview">Pratinjau</string>
     <string name="on">pada</string>
-    <string name="cancel">Batal</string>
-    <string name="save">Simpan</string>
-    <string name="add">Tambah</string>
-    <string name="yes">Ya</string>
-    <string name="no">Tidak</string>
-    <string name="error">Galat</string>
+    <string name="preview">Pratinjau</string>
     <string name="category_refresh_error">Gagal memuat ulang Kategori</string>
+    <string name="error">Galat</string>
+    <string name="no">Tidak</string>
+    <string name="yes">Ya</string>
     <string name="notification_settings">Pengaturan Pemberitahuan</string>
-    <string name="publish_now">Publikasikan Sekarang</string>
+    <string name="add">Tambah</string>
+    <string name="save">Simpan</string>
+    <string name="cancel">Batal</string>
 </resources>
diff --git a/WordPress/src/main/res/values-is/strings.xml b/WordPress/src/main/res/values-is/strings.xml
index ba4c4102c2be..759c8d786796 100644
--- a/WordPress/src/main/res/values-is/strings.xml
+++ b/WordPress/src/main/res/values-is/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2017-05-01 23:08:27+0000
 Plural-Forms: nplurals=2; plural=n % 10 != 1 || n % 100 == 11;
@@ -81,7 +81,6 @@ Language: is
     <string name="comment_liked">Líkar við athugasemd</string>
     <string name="sign_in_wpcom">WordPress.com innskráning</string>
     <string name="reader_label_global_related_posts">Meira á WordPress.com</string>
-    <string name="reader_label_local_related_posts">Meira í %s</string>
     <string name="preference_open_device_settings">Opna stillingar tækis</string>
     <string name="invite_invalid_email">%s: Ógilt netfang</string>
     <string name="invite_user_blocked_invites">%s: Notandi lokaði á öll boð</string>
@@ -129,18 +128,12 @@ Language: is
     <string name="invite_error_invalid_usernames_multiple">Get ekki sent: Ógild notandanöfn eða netföng</string>
     <string name="invite_error_invalid_usernames_one">Get ekki sent: Ógilt notandanafn eða netfang</string>
     <string name="invite_error_no_usernames">Vinsamlegast bættu við a.m.k einu notandanafni</string>
-    <string name="invite_message_info">(Valkvæmt) Þú getur slegið inn sérsniðin skilaboð allt að 500 stafir að lengd sem fylgja boðum til notanda/notenda.</string>
-    <string name="invite_message_remaining_other">%d stafir eftir</string>
-    <string name="invite_message_remaining_one">1 stafur eftir</string>
-    <string name="invite_message_remaining_zero">0 stafir eftir</string>
-    <string name="invite_message_title">Sérsniðin skilaboð</string>
     <string name="invite">Bjóða</string>
-    <string name="invite_names_title">Notendanöfn eða netföng</string>
     <string name="invite_people">Bjóða fólki</string>
-    <string name="send_link">Senda tengil</string>
     <string name="my_site_header_external">Út á við</string>
     <string name="label_clear_search_history">Hreinsa leitarsögu</string>
     <string name="dlg_confirm_clear_search_history">Hreinsa leitarsögu?</string>
+    <string name="reader_title_related_post_detail">Tengdar færslur</string>
     <string name="preview_screen_links_disabled">Tenglar eru óvirkir í forsýn</string>
     <string name="send">Senda</string>
     <string name="person_removed">Fjarlægði %1$s</string>
@@ -159,7 +152,6 @@ Language: is
     <string name="checking_email">Athuga tölvupóst</string>
     <string name="magic_link_unavailable_error_message">Ekki tiltækt í augnablikinu. Vinsamlegast sláðu inn lykilorðið þitt.</string>
     <string name="logging_in">Skrá inn</string>
-    <string name="enter_your_password_instead">Sláðu inn lykilorðið þitt í staðinn</string>
     <string name="web_address_dialog_hint">Birt öllum þegar þú skrifar athugasemd.</string>
     <string name="capture_or_pick_photo">Taka eða velja mynd</string>
     <string name="plan">Plön</string>
@@ -271,7 +263,6 @@ Language: is
     <string name="site_settings_paging_dialog_description">Skipta umræðuþráðum niður á síður.</string>
     <string name="site_settings_paging_dialog_header">Athugasemdir á síðu</string>
     <string name="site_settings_close_after_dialog_title">Loka fyrir athuagsemdir</string>
-    <string name="site_settings_blacklist_description">Þegar athugasemd inniheldur einhver af þessum orðum í efni, nafni, vefslóð, netfangi eða IP tölu, verður hún merkt sem amapóstur. Þú getur slegið inn hluta úr orði, þannig að \"press\" mun passa við \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">Þegar athugasemd inniheldur einhver af þessum orðum í efni, nafni, vefslóð, netfangi eða IP tölu, verður hún flutt í biðröð. Þú getur slegið inn hluta úr orði, þannig að \"press\" mun passa við \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Sláðu inn orð eða setningu</string>
     <string name="site_settings_list_editor_no_items_text">Engin atriði</string>
@@ -286,10 +277,8 @@ Language: is
     <string name="site_settings_rp_show_header_title">Sýna haus</string>
     <string name="site_settings_rp_switch_summary">Tengdar færslur birta viðeigandi efni af vefnum þínum fyrir neðan færsluna þína.</string>
     <string name="site_settings_rp_switch_title">Sýna tengdar færslur</string>
-    <string name="site_settings_blacklist_hint">Athugasemdir sem passa við síu verða merktar sem amapóstur</string>
     <string name="site_settings_moderation_hold_hint">Athugasemdir sem passa við síu verða settar í biðröð fyrir samþykki</string>
     <string name="site_settings_multiple_links_hint">Hundsar takmörkun fjölda tengla fyrir þekkta notendur</string>
-    <string name="site_settings_whitelist_hint">Höfundur verður að hafa fengið athugasemd samþykkta a.m.k. einu sinni áður</string>
     <string name="site_settings_user_account_required_hint">Gestir verða að vera skráðir inn með notandanafni til þess að taka þátt í umræðum</string>
     <string name="site_settings_identity_required_hint">Höfundur athugasemdar verður að tilgreina nafn og netfang</string>
     <string name="site_settings_paging_hint">Birta athugasemdir í skömmtum af tilgreindri stærð</string>
@@ -312,17 +301,13 @@ Language: is
     <string name="site_settings_address_hint">Það er ekki hægt að breyta veffangi eins og er</string>
     <string name="site_settings_tagline_hint">Stutt lýsing eða grípandi setning til þess að lýsa blogginu þínu</string>
     <string name="site_settings_title_hint">Í fáeinum orðum, segðu hvað þessi vefur fjallar um</string>
-    <string name="site_settings_whitelist_known_summary">Athugasemdir frá þekktum notendum</string>
-    <string name="site_settings_whitelist_all_summary">Athugasemdir frá öllum notendum</string>
     <string name="site_settings_threading_summary">%d stig</string>
     <string name="site_settings_privacy_private_summary">Einkamál</string>
     <string name="site_settings_privacy_hidden_summary">Falinn</string>
     <string name="site_settings_delete_site_title">Eyða vef</string>
     <string name="site_settings_privacy_public_summary">Birt</string>
-    <string name="site_settings_blacklist_title">Svartlisti</string>
     <string name="site_settings_moderation_hold_title">Setja á bið eftir samþykki</string>
     <string name="site_settings_multiple_links_title">Tenglar í athugasemdum</string>
-    <string name="site_settings_whitelist_title">Samþykkja sjálfkrafa</string>
     <string name="site_settings_paging_title">Síðuskipting</string>
     <string name="site_settings_threading_title">Þræðir</string>
     <string name="site_settings_sort_by_title">Raða eftir</string>
@@ -455,7 +440,6 @@ Language: is
     <string name="reader_empty_posts_request_failed">Gat ekki sótt færslur</string>
     <string name="logs_copied_to_clipboard">Atburðarskrá forritsins hefur verið afrituð í klemmuspjaldið</string>
     <string name="error_copy_to_clipboard">Villa kom upp við að afrita texta í klemmuspjaldið</string>
-    <string name="reader_page_recommended_blogs">Vefir sem þér gæti líkað við</string>
     <string name="reader_label_new_posts">Nýjar færslur</string>
     <string name="stats_followers_months">%1$d mánuðir</string>
     <string name="stats_followers_a_year">Á ári</string>
@@ -505,7 +489,6 @@ Language: is
     <string name="schedule_verb">Tímaáætla</string>
     <string name="reader_page_followed_blogs">Vefir sem ég fylgi</string>
     <string name="help">Hjálp</string>
-    <string name="forgot_password">Tapað lykilorð?</string>
     <string name="ssl_certificate_error">Ógilt SSL skírteini</string>
     <string name="ssl_certificate_ask_trust">Ef þú getur vanalega tengst þessum vef án vandræða, þá gæti þessi villa þýtt að einhver er að reyna að þykjast vera vefurinn og þú ættir ekki að halda áfram. Viltu treysta þessu skírteini samt sem áður?</string>
     <string name="blog_not_found">Villa kom upp við að tengjast við þetta blogg</string>
diff --git a/WordPress/src/main/res/values-it/strings.xml b/WordPress/src/main/res/values-it/strings.xml
index ece921739d98..f584010dd6a8 100644
--- a/WordPress/src/main/res/values-it/strings.xml
+++ b/WordPress/src/main/res/values-it/strings.xml
@@ -1,17 +1,488 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-21 11:43:53+0000
+Translation-Revision-Date: 2021-05-12 10:54:09+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: it
 -->
 <resources>
+    <string name="gutenberg_native_size">Dimensione</string>
+    <string name="gutenberg_native_image_settings">Impostazioni immagine</string>
+    <string name="gutenberg_native_audio_settings">Impostazioni audio</string>
+    <string name="user_profile_bottom_sheet_description">Informazioni sul foglio inferiore del profilo utente</string>
+    <string name="likes_list_screen_title">Elenco di Mi piace %s</string>
+    <string name="gutenberg_native_write_code">Scrivi codice…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Ordinamento e filtro</string>
+    <string name="gutenberg_native_show_download_button">Mostra il pulsante download</string>
+    <string name="gutenberg_native_shortcode">Shortcode </string>
+    <string name="gutenberg_native_read_more">Leggi tutto</string>
+    <string name="gutenberg_native_preload">Precaricamento</string>
+    <string name="gutenberg_native_post_meta_settings">Impostazioni dei metadati dell\'articolo</string>
+    <string name="gutenberg_native_post_content_settings">Impostazioni del contenuto dell\'articolo</string>
+    <string name="gutenberg_native_metadata">Metadati</string>
+    <string name="gutenberg_native_media_file">File media</string>
+    <string name="gutenberg_native_media_area">area Media</string>
+    <string name="gutenberg_native_loop">Loop</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Link a</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">immagine %1$d of %2$d nella galleria</string>
+    <string name="gutenberg_native_heading_d">Titolo %d</string>
+    <string name="gutenberg_native_featured">In evidenza</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Inserisci qui l\'URL da incorporare…</string>
+    <string name="gutenberg_native_edit_image">Modifica immagine</string>
+    <string name="gutenberg_native_display_post_date">Visualizza data articolo</string>
+    <string name="gutenberg_native_code">Codice</string>
+    <string name="gutenberg_native_change_heading_level">Cambia il livello dell\'Intestazione</string>
+    <string name="gutenberg_native_browser_default">Browser predefinito</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Il blocco è stato eliminato o non è disponibile.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Il blocco non può essere visualizzato all\'interno di se stesso.</string>
+    <string name="gutenberg_native_autoplay">Autoplay</string>
+    <string name="gutenberg_native_auto">Automatico</string>
+    <string name="gutenberg_native_attachment_page">Pagina dell’allegato</string>
+    <string name="gutenberg_native_add_text">Aggiungi testo…</string>
+    <string name="gutenberg_native_add_caption">Aggiungi didascalia</string>
+    <string name="gutenberg_native_what_is_alt_text">Cos\'è il testo alternativo?</string>
+    <string name="gutenberg_native_transform_s_to">Trasforma %s in</string>
+    <string name="gutenberg_native_transform_block">Trasforma il blocco…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Impossibile inserire file multimediali.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Impossibile inserire il file audio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Descrivi lo scopo dell\'immagine. Lascia vuoto, se l\'immagine è semplicemente decorativa. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s trasformato in %2$s</string>
+    <string name="like_faces_error_loading_message">Errore durante il caricamento di dati simili. %s.</string>
+    <string name="like_faces_plural_text">Piace a %d blogger.</string>
+    <string name="like_faces_singular_text">Piace a un blogger.</string>
+    <string name="like_title_plural">%d Mi piace</string>
+    <string name="like_title_singular">1 Mi piace</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Inserisci le tue credenziali del server per risolvere le minacce.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Inserisci le tue credenziali del server per risolvere la minaccia.</string>
+    <string name="suggestion">Suggerimento:</string>
+    <string name="gutenberg_native_search_blocks">Cerca blocchi</string>
+    <string name="gutenberg_native_search_block">Cerca blocco</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">tocca due volte per modificare l\'unità</string>
+    <string name="gutenberg_native_clear_search">Cancella ricerca</string>
+    <string name="gutenberg_native_cancel_search">Annulla ricerca</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s è %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Si è verificato un errore durante l\'ottenimento dei dati dei Mi piace</string>
+    <string name="get_likes_unknown_error">Si è verificato un errore sconosciuto durante l\'ottenimento dei Mi piace.</string>
+    <string name="get_likes_no_network_error">Nessuna rete disponibile.</string>
+    <string name="comments_empty_list_filtered_unreplied">Nessun commento senza risposta</string>
+    <string name="comment_status_unreplied">Senza risposta</string>
+    <string name="gutenberg_native_table_of_contents">Indice dei contenuti</string>
+    <string name="gutenberg_native_summary">sommario</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Riassumi il tuo articolo con una lista di intestazioni. Aggiungi delle ancore HTML ai blocchi Intestazione per collegarle qui.</string>
+    <string name="gutenberg_native_document_outline">Struttura del documento</string>
+    <string name="gutenberg_native_buttongroup">Gruppo pulsante</string>
+    <string name="jetpack_brute_force_allowlist_title">Indirizzi IP sempre consentiti</string>
+    <string name="site_settings_denylist_title">Commenti respinti</string>
+    <string name="reader_title_interests">Argomenti seguiti</string>
+    <string name="stories_intro_main_subtitle">Un nuovo modo per creare e pubblicare contenuti coinvolgenti nel tuo sito.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Ignora</string>
+    <string name="activity_log_backup_download_notice_download_action">Scarica</string>
+    <string name="threat_fix_all_status_success_message_plural">Le minacce sono state risolte.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Conferma di voler correggere tutte le %s minacce attive.</string>
+    <string name="scan_idle_threats_description_plural">La scansione ha trovato %1$s potenziali minacce con %2$s. Esamina questi elementi di seguito oppure tocca il pulsante Correggi tutto. Se hai bisogno, ci trovi qui: %3$s.</string>
+    <string name="scan_fixing_threats_description_plural">Stiamo facendo il possibile per risolvere queste minacce in background. Nel frattempo continua pure a utilizzare tranquillamente il sito come al solito, puoi controllare l\'andamento in qualsiasi momento.</string>
+    <string name="gutenberg_native_edit_focal_point">Modifica il punto focale</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Tocca due volte per aprire il foglio nella parte inferiore per modificare, sostituire o cancellare l\'immagine</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Tocca due volte per aprire il foglio delle azioni per modificare, sostituire o cancellare l\'immagine</string>
+    <string name="new_site_creation_search_domain_example">esempio.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Digita un nome per il sito</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Tutti i task completati&lt;/b&gt;&lt;br/&gt;Raggiungerai più persone. Buon lavoro.</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Tutti i task completati&lt;/b&gt;&lt;br/&gt;Hai personalizzato il sito. Ben fatto!</string>
+    <string name="quick_start_card_menu_hide">Nascondi per ora</string>
+    <string name="magic_link_not_meaning_to_create_account">Non volevi creare un nuovo account? Torna indietro per inserire nuovamente l\'indirizzo e-mail.</string>
+    <string name="invite_links_disable_dialog_message">Una volta disattivato il link di invito, nessuno sarà in grado di usarlo per unirsi al tuo team. Sei sicuro?</string>
+    <string name="invite_links_disable_dialog_title">Disattiva il link di invito</string>
+    <string name="invite_links_bad_format_response">Risposta non valida ricevuta</string>
+    <string name="invite_links_null_response">Nessuna risposta ricevuta</string>
+    <string name="invite_links_cannot_get_role_data_error">Si è verificato un errore durante il recupero dei dati per il ruolo %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Si è verificato un errore durante il recupero dei ruoli</string>
+    <string name="invite_links_generic_get_data_error">Errore sconosciuto durante il recupero dei dati dei link di invito</string>
+    <string name="invite_links_helper_text">Usa questo link per accettare i membri del team senza doverli invitare uno per uno. Chiunque visiti questo URL potrà iscriversi alla tua organizzazione, anche se ha ricevuto un link da qualcun altro, quindi assicurati di condividerlo con le persone fidate.</string>
+    <string name="invite_links_expire_date">Scadenza %1$s</string>
+    <string name="invite_links_disable_invite_link">Disattiva il link di invito</string>
+    <string name="invite_links_share_invite_link">Condividi il link di invito</string>
+    <string name="invite_links_generate">Genera un nuovo link</string>
+    <string name="invite_links_get_status_retry">Aggiorna lo stato dei link</string>
+    <string name="invite_links_section_title">Link di invito</string>
+    <string name="threats_found_singular">Trovata minaccia</string>
+    <string name="threats_found_plural">Minacce rivelate</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scansione terminata&lt;/b&gt; &lt;br&gt; %s potenziali minacce trovate</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scansione terminata&lt;/b&gt; &lt;br&gt; Una potenziale minaccia trovata</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scansione terminata&lt;/b&gt; &lt;br&gt; Nessuna minaccia trovata</string>
+    <string name="scan_fixing_threats_title_singular">Risoluzione della minaccia</string>
+    <string name="disable">Disabilita</string>
+    <string name="quick_start_card_menu_unpin">Rimuovi questo</string>
+    <string name="quick_start_list_review_pages_subtitle">Controlla le pagine e apporta modifiche oppure aggiungi o rimuovi le pagine.</string>
+    <string name="quick_start_list_view_site_title">Visita il tuo sito</string>
+    <string name="quick_start_list_upload_icon_subtitle">Aggiungi un\'icona al sito per un aspetto professionale e raffinato.</string>
+    <string name="quick_start_list_follow_site_subtitle">Scopri e segui i siti che ti ispirano.</string>
+    <string name="quick_start_list_enable_sharing_title">Abilita condivisione</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Condividi automaticamente nuovi articoli sui tuoi social media.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Dai al tuo sito un nome che rifletta la tua personalità e l\'argomento.</string>
+    <string name="quick_start_list_check_stats_title">Controlla le statistiche</string>
+    <string name="backup_download_status_failure_bullet2">Tenteremo ancora la creazione del tuo file di backup scaricabile.</string>
+    <string name="backup_download_status_failure_bullet1">Non è stato possibile trovare lo stato che indica quanto tempo richiederà il backup scaricabile.</string>
+    <string name="backup_download_status_failure_heading">Siamo spiacenti, non è possibile trovare lo stato del backup scaricabile</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icona segno di spunta</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icona orologio</string>
+    <string name="restore_status_failure_bullet3">Ti invieremo una notifica una volta completata l\'operazione.</string>
+    <string name="restore_status_failure_bullet2">Tenteremo ancora di ripristinare il sito.</string>
+    <string name="restore_status_failure_bullet1">Non è stato possibile trovare lo stato che indica quanto tempo richiederà il ripristino.</string>
+    <string name="restore_status_failure_heading">Siamo spiacenti, non è stato possibile trovare lo stato del ripristino</string>
+    <string name="restore_complete_failed_description">Impossibile ripristinare il sito</string>
+    <string name="restore_warning_action_button">Conferma</string>
+    <string name="restore_warning_description_with_two_parameters">Desideri ripristinare il sito al giorno %1$s alle ore %2$s?\n        Qualsiasi modifica apportata da quel momento andrà persa.</string>
+    <string name="backup_download_complete_failed_description">Impossibile creare il backup</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(esclude temi, plugin e caricamenti)</string>
+    <string name="backup_item_contents">Directory wp-content</string>
+    <string name="backup_item_roots">Root WordPress</string>
+    <string name="backup_download_details_choose_items_header">Elementi inclusi in questo download</string>
+    <string name="gutenberg_native_uploading">Caricamento in corso…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">I blocchi riutilizzabili non sono modificabili su WordPress per iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">I blocchi riutilizzabili non sono modificabili su WordPress per Android</string>
+    <string name="gutenberg_native_replace_file">Sostituisci file</string>
+    <string name="gutenberg_native_replace_audio">Sostituisci</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problema durante l\'apertura dell\'audio</string>
+    <string name="gutenberg_native_open">APERTO</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Nessuna applicazione può gestire questa richiesta.</string>
+    <string name="gutenberg_native_lock_icon">Icona di blocco</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Inserimento del file audio non riuscito. Tocca per le opzioni.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Tocca due volte per selezionare un file audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Tocca due volte per ascoltare il file audio</string>
+    <string name="gutenberg_native_choose_audio">Scegli audio</string>
+    <string name="gutenberg_native_audio_player">Audio Player</string>
+    <string name="gutenberg_native_audio_file">file audio</string>
+    <string name="gutenberg_native_audio_caption_s">Didascalia audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Didascalia audio. Vuota</string>
+    <string name="gutenberg_native_add_audio">AGGIUNGI AUDIO</string>
+    <string name="continue_with_wpcom">Accedi o iscriviti con WordPress.com</string>
+    <string name="photo_picker_use_audio">Usa questo audio</string>
+    <string name="photo_picker_choose_audio">Scegli l\'audio dal dispositivo</string>
+    <string name="people_optional_custom_message_helper_text">Facoltativo: inserisci un messaggio personalizzato da inviare insieme all\'invito.</string>
+    <string name="people_learn_more_about_roles">Scopri di più sui ruoli</string>
+    <string name="threat_status_fixed">Corretto</string>
+    <string name="threat_found_header">Trovato</string>
+    <string name="scan_here_to_help">qui per aiutare</string>
+    <string name="scan_idle_threats_description_singular">La scansione ha trovato una potenziale minaccia con %1$s. Esamina la minaccia di seguito e tocca il pulsante Correggi tutto. Se hai bisogno, ci trovi qui: %2$s.</string>
+    <string name="scan_idle_manual_scan_description">Per esaminare il sito nuovamente, esegui una scansione manuale o attendi che Jetpack scansioni il sito più tardi in giornata.</string>
+    <string name="scan_provisioning_description">Jetpack Scan ti dà il benvenuto! Stiamo esaminando l\'ambito del tuo sito, impostando l\'esecuzione di una scansione completa. Ti avviseremo se riscontreremo problemi che possono influire su una scansione, quindi verrà avviata la tua prima scansione completa.</string>
+    <string name="scan_scanning_is_initial_description">Jetpack Scan ti dà il benvenuto. Stiamo analizzando il tuo sito per la prima volta e presto riceverai i risultati.</string>
+    <string name="scan_fixing_threats_description_singular">Stiamo facendo il possibile per risolvere questa minaccia in background. Nel frattempo continua pure a utilizzare tranquillamente il sito come al solito, puoi controllare l\'andamento in qualsiasi momento.</string>
+    <string name="scan_scanning_description">Ti invieremo una notifica al completamento della scansione. Nel frattempo continua pure a utilizzare tranquillamente il sito come al solito, puoi controllare l\'andamento in qualsiasi momento.</string>
+    <string name="scan_fixing_threats_title_plural">Correzione delle minacce</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan non ha potuto completare una scansione del sito. Verifica se il tuo sito non è attivo, in caso contrario riprova. Se lo è, o se Jetpack Scan continua ad avere problemi, contatta il nostro team di supporto.</string>
+    <string name="scan_request_failed_title">Si è verificato un problema.</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Backup del sito in corso</string>
+    <string name="activity_log_currently_backing_up_message">Backup del sito in corso da %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Creazione di un backup scaricabile in corso</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Il backup del tuo sito è stato eseguito correttamente</string>
+    <string name="activity_log_backup_finished_snackbar_message">Il backup del tuo sito è stato eseguito correttamente\nBackup eseguito da %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">È stato eseguito il backup del sito\nBackup in corso da %1$s %2$s</string>
+    <string name="pick_audio">Seleziona audio</string>
+    <string name="restore_another_process_running">È in corso un altro ripristino.</string>
+    <string name="restore_complete_failed_icon_content_description">Icona Errore</string>
+    <string name="restore_complete_failed_action_button_content_description">Pulsante Fatto</string>
+    <string name="restore_complete_failed_title">Ripristino non riuscito</string>
+    <string name="restore_complete_visit_site_button_content_description">Pulsante Visita il sito</string>
+    <string name="restore_complete_done_button_content_description">Pulsante Fatto</string>
+    <string name="restore_complete_icon_content_description">Icona Ripristino</string>
+    <string name="restore_complete_visit_site_action_button">Visita il sito</string>
+    <string name="restore_complete_description_with_two_parameters">Tutti gli elementi selezionati sono ora ripristinati al giorno %1$s %2$s.</string>
+    <string name="restore_complete_header">Il tuo sito è stato ripristinato</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Non è necessario attendere. Ti invieremo una notifica quando il tuo sito sarà stato ripristinato.</string>
+    <string name="restore_progress_icon_content_description">Icona Ripristina sito</string>
+    <string name="restore_progress_description_with_two_parameters">Stiamo ripristinando il tuo sito al giorno %1$s %2$s.</string>
+    <string name="restore_progress_header">Ripristino in corso del sito</string>
+    <string name="restore_warning_action_button_content_description">Pulsante Conferma ripristino del sito</string>
+    <string name="restore_warning_icon_content_description">Immagine del cerchio rosso con punto esclamativo</string>
+    <string name="restore_warning_header">Attenzione</string>
+    <string name="restore_details_action_button_content_description">Pulsante Ripristina sito</string>
+    <string name="restore_details_icon_content_description">Icona Ripristino</string>
+    <string name="restore_details_action_button">Ripristina sito</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s è il punto selezionato per il ripristino.</string>
+    <string name="restore_details_header">Ripristina sito</string>
+    <string name="restore_details_choose_items_header">Scegli gli elementi da ripristinare:</string>
+    <string name="restore">Ripristina</string>
+    <string name="backup_download_complete_failed_icon_content_description">Icona nuvola con X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Pulsante Fatto</string>
+    <string name="backup_download_complete_failed_action_button">Fatto</string>
+    <string name="backup_download_complete_failed_title">Download non riuscito</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Dispositivo mobile</string>
+    <string name="quick_start_card_menu_remove">Non mostrare più</string>
+    <string name="quick_start_card_menu_pin">Aggancia</string>
+    <string name="quick_start_dialog_review_pages_message_short">Seleziona %1$s Pagine %2$s per visualizzare l\'elenco delle tue pagine.</string>
+    <string name="quick_start_dialog_review_pages_message">Modifica, aggiungi o rimuovi le pagine del tuo sito.</string>
+    <string name="quick_start_dialog_review_pages_title">Verifica le pagine del sito</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Seleziona %1$s Homepage %2$s per modificare la tua homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Seleziona %1$s Pagine %2$s per visualizzare l\'elenco delle tue pagine.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Modifica, aggiungi o rimuovi contenuti dalla homepage del tuo sito.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Modifica la tua homepage</string>
+    <string name="reader_menu_mark_as_unseen">Contrassegna come non letto</string>
+    <string name="reader_menu_mark_as_seen">Contrassegna come letto</string>
+    <string name="error_media_upload_failed_for_reason">Caricamento media non riuscito.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Non si dispone di spazio di archiviazione sufficiente</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Impossibile attivare lo stato Letto per questo articolo</string>
+    <string name="reader_marked_post_as_unseen">Articolo contrassegnato come non letto</string>
+    <string name="reader_marked_post_as_seen">Articolo contrassegnato come letto</string>
+    <string name="threat_fix_all_status_error_message">Errore durante il recupero dello stato della correzione. Contatta il nostro supporto.</string>
+    <string name="threat_fix_all_status_success_message_singular">La minaccia è stata risolta correttamente.</string>
+    <string name="threat_fix_all_error_message">Errore durante la risoluzione delle minacce. Contatta il nostro supporto.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Conferma di voler correggere la minaccia attiva.</string>
+    <string name="threat_fix_all_warning_title">Risolvi tutte le minacce</string>
+    <string name="threat_ignore_error_message">Errore mentre la minaccia veniva ignorata. Contatta il supporto.</string>
+    <string name="threat_ignore_success_message">Minaccia ignorata.</string>
+    <string name="threat_ignore_warning">Non dovresti ignorare un problema di sicurezza a meno che tu non sia assolutamente certo che sia innocuo. Se scegli di ignorare questa minaccia, rimarrà sul tuo sito &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Errore durante la risoluzione della minaccia. Contatta il nostro supporto.</string>
+    <string name="threat_item_sub_header_status_ignored">Minaccia ignorata</string>
+    <string name="threat_item_sub_header_status_fixed_on">Minaccia risolta su %s</string>
+    <string name="threat_fixing">Risoluzione della minaccia</string>
+    <string name="scan_history_ignored_threats_tab">Ignorata</string>
+    <string name="scan_history_no_threats_found">Nessun elemento trovato</string>
+    <string name="scan_history_fixed_threats_tab">Risolta</string>
+    <string name="scan_history_all_threats_tab">Tutte</string>
+    <string name="scan_scanning_title">Scansione dei file</string>
+    <string name="scan_preparing_to_scan_title">Preparazione alla scansione</string>
+    <string name="scan_history_menu_title">Cronologia</string>
+    <string name="scan_history">Cronologia di scansione</string>
+    <string name="backup_active_filter_empty_subtitle">Prova a regolare l\'intervallo di date</string>
+    <string name="backup_active_filter_empty_title">Non è stato trovato alcun backup corrispondente</string>
+    <string name="backup_empty_subtitle">Il tuo primo backup verrà visualizzato qui entro 24 ore e riceverai una notifica una volta completato</string>
+    <string name="backup_empty_title">Il tuo primo backup sarà pronto a breve</string>
+    <string name="request_failed_message">Si è verificato un errore durante la gestione della richiesta. Riprova più tardi.</string>
+    <string name="gutenberg_native_move_to_bottom">Sposta in fondo</string>
+    <string name="gutenberg_native_change_block_position">Modifica la posizione del blocco</string>
+    <string name="label_control_upload">Carica</string>
+    <string name="jetpack_icon_content_description">icona</string>
+    <string name="backup_download_complete_info">Ti abbiamo anche inviato una e-mail con un link al tuo file.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Condividi il pulsante del link</string>
+    <string name="backup_download_complete_download_action_button_content_description">Pulsante di scaricamento</string>
+    <string name="backup_download_complete_icon_content_description">Icona di backup scaricabile pronto</string>
+    <string name="backup_download_complete_download_share_action_button">Condividi il link</string>
+    <string name="backup_download_complete_download_action_button">Scarica</string>
+    <string name="backup_download_complete_description_with_two_parameters">Abbiamo creato correttamente un backup del sito da %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Il tuo backup è pronto per essere scaricato</string>
+    <string name="backup_download_complete_page_title">Il tuo backup</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Non è necessario attendere. Ti invieremo una notifica quando il backup sarà pronto.</string>
+    <string name="backup_download_progress_icon_content_description">Icona di creazione di un backup scaricabile</string>
+    <string name="backup_download_progress_description_with_two_parameters">Stiamo creando un backup scaricabile del sito da %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Creazione in corso del backup scaricabile del sito</string>
+    <string name="backup_download_progress_page_title">Scarica il backup</string>
+    <string name="backup_download_another_download_running">È presente un altro donwload in corso.</string>
+    <string name="backup_download_generic_failure">Si è verificato un errore durante la gestione della richiesta. Riprova più tardi.</string>
+    <string name="backup_download_details_action_button_content_description">Pulsante Crea backup scaricabile</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s è il punto selezionato di cui creare un backup scaricabile.</string>
+    <string name="gutenberg_native_image_link_url">URL link immagine</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">pubblicazione incrociata</string>
+    <string name="suggestion_user">utente</string>
+    <string name="suggestion_no_matching">Nessuna corrispondenza con %s.</string>
+    <string name="suggestion_problem">Si è verificato un problema durante il caricamento dei suggerimenti.</string>
+    <string name="suggestion_none">Nessun suggerimento %s disponibile.</string>
+    <string name="suggestion_selection_needed">Digita per filtrare l\'elenco dei suggerimenti.</string>
+    <string name="threat_get_free_estimate">Chiedi una quota</string>
+    <string name="threat_ignore">Ignora minaccia</string>
+    <string name="threat_fix">Risolvi minaccia</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan risolverà la minaccia.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan modificherà la directory o il file interessato.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan verrà aggiornato a una versione più recente (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan eliminerà la directory o il file interessato.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan sostituirà la directory o il file interessato.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan non può risolvere automaticamente questa minaccia.\n Ti consigliamo di correggerla manualmente. Verifica che WordPress, il tema e tutti i plugin siano aggiornati ed elimina il codice, il tema, o il plugin che causa il problema dal sito. \n \n\n Se hai bisogno di ulteriore supporto per risolvere questa minaccia, ti consigliamo &lt;b&gt;Codeable&lt;/b&gt;, un marketplace freelance fidato di esperti WordPress fortemente controllati.\n È stato identificato un gruppo selezionato di esperti sulla sicurezza per offrire supporto con questi progetti. I prezzi variano da $ 70 a $ 120 l\'ora e puoi ottenere un preventivo gratuito senza obbligo di noleggio.</string>
+    <string name="threat_fix_current_not_fixable_header">Correzione del problema in corso</string>
+    <string name="threat_fix_fixed_header">Come ha risolto il problema Jetpack?</string>
+    <string name="threat_fix_default_header">Come correggeremo il problema?</string>
+    <string name="threat_file_description">Minaccia rilevata nel file:</string>
+    <string name="threat_technical_details_header">I dettagli tecnici</string>
+    <string name="threat_problem_header">Qual era il problema?</string>
+    <string name="threat_details">Dettagli minaccia</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerabilità trovata in Tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerabilità trovata in Plugin</string>
+    <string name="threat_item_sub_header_file_signature">Trovata minaccia %s</string>
+    <string name="threat_item_sub_header_core_file">Vulnerabilità trovata in WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Varie vulnerabilità</string>
+    <string name="threat_item_header_vulnerable_theme">Tema vulnerabile: %s (versione %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Plugin vulnerabile: %s (versione %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: modello di codice dannoso</string>
+    <string name="threat_item_header_database_threat">%s minacce al database</string>
+    <string name="threat_item_header_infected_core_file">%s: file di base infetto</string>
+    <string name="threat_item_header_threat_found">Trovata minaccia</string>
+    <string name="threats_fix_all">Correggi tutto</string>
+    <string name="scan_in_few_seconds">alcuni secondi fa</string>
+    <string name="scan_in_minutes_ago">%s minuto/i fa</string>
+    <string name="scan_in_hours_ago">%s ora/e fa</string>
+    <string name="scan_this_site">questo sito</string>
+    <string name="scan_idle_last_scan_description">L\'ultima scansione di Jetpack è stata eseguita il %s e non abbiamo trovato alcun rischio. %s</string>
+    <string name="scan_idle_threats_found_title">Il sito potrebbe essere a rischio</string>
+    <string name="scan_idle_no_threats_found_title">Non preoccuparti di nulla</string>
+    <string name="scan_again">Esegui di nuovo la scansione</string>
+    <string name="scan_now">Esegui scansione ora</string>
+    <string name="scan_state_icon">Icona stato scansione</string>
+    <string name="backup">Backup</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtro tipo di attività (%s tipi selezionati)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (visualizzazione di %s elementi)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtro tipo attività</string>
+    <string name="activity_log_activity_type_empty_subtitle">Nessuna attività registrata nell\'intervallo di date selezionato.</string>
+    <string name="activity_log_activity_type_empty_title">Nessuna attività disponibile</string>
+    <string name="activity_log_activity_type_error_subtitle">Controlla la connessione a Internet e riprova.</string>
+    <string name="activity_log_activity_type_error_title">Nessuna connessione</string>
+    <string name="activity_log_activity_type_filter_active_label">Tipo di attività (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtro intervallo di date</string>
+    <string name="activity_log_active_filter_empty_subtitle">Prova a regolare l’intervallo di date o i filtri del tipo attività</string>
+    <string name="activity_log_active_filter_empty_title">Non è stato trovato alcun evento corrispondente</string>
+    <string name="backup_item_sqls">Database sito</string>
+    <string name="backup_item_roots_hint">(include file wp-config.php e qualsiasi file non WordPress)</string>
+    <string name="backup_item_media_uploads">Caricamento di contenuti multimediali</string>
+    <string name="backup_item_plugins">Plugin WordPress</string>
+    <string name="backup_item_themes">Temi WordPress</string>
+    <string name="backup_download_details_icon_content_description">Crea l\'icona per il backup scaricabile</string>
+    <string name="backup_download_details_action_button">Crea un file scaricabile</string>
+    <string name="backup_download_details_header">Crea un backup scaricabile</string>
+    <string name="backup_download_details_page_title">Scarica il backup</string>
+    <string name="backup_download">Scarica il backup</string>
+    <string name="gutenberg_native_error">Errore</string>
+    <string name="gutenberg_native_choose_file">Scegli un file</string>
+    <string name="activity_log_item_menu_download_backup_label">Scarica il backup</string>
+    <string name="activity_log_item_menu_restore_label">Ripristina fino a questo punto</string>
+    <string name="activity_log_activity_type_filter_label">Tipo di attività</string>
+    <string name="activity_log_date_range_filter_label">Intervallo di date</string>
+    <string name="activity_log_activity_type_filter_header">Filtra per tipo di attività</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copia la versione da questa app</string>
+    <string name="dialog_confirm_copy_local_edit_button">Prima modifica l\'articolo</string>
+    <string name="dialog_confirm_copy_local_message">L\'articolo che stai cercando di copiare ha due versioni in conflitto oppure recentemente hai fatto delle modifiche ma non le hai salvate.\nPrima, modifica l\'articolo per risolvere i conflitti oppure copia la versione presente in questa app.</string>
+    <string name="dialog_confirm_copy_local_title">Conflitto di sincronizzazione dell\'articolo</string>
+    <string name="button_copy">Duplica</string>
+    <string name="toast_edit_story_update_in_progress_title">Sto salvando la storia, attendi…</string>
+    <string name="gutenberg_native_file_name">Nome file</string>
+    <string name="gutenberg_native_file_block_settings">Impostazioni del blocco file</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Impossibile caricare i file.\nTocca per le opzioni.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Impossibile salvare i file.\nTocca per le opzioni.</string>
+    <string name="gutenberg_native_edit_file">Modifica file</string>
+    <string name="gutenberg_native_copy_file_url">Copia URL file</string>
+    <string name="gutenberg_native_choose_a_file">SCEGLI UN FILE</string>
+    <string name="new_site_creation_domain_header_title">Scegli un dominio</string>
+    <string name="my_site_btn_jetpack_settings">Impostazioni di Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Stai seguendo la conversazione tramite e-mail</string>
+    <string name="reader_btn_follow_comments">Segui la conversazione tramite e-mail</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Impossibile annullare l\'abbonamento dai commenti per questo articolo</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Impossibile abbonarsi dai commenti per questo articolo</string>
+    <string name="reader_follow_comments_get_status_error">Errore durante il recupero dello stato dell\'abbonamento per l\'articolo</string>
+    <string name="reader_follow_comments_unsubscribe_success">Annullamento dell\'abbonamento dai commenti completato</string>
+    <string name="reader_follow_comments_subscribe_success">Abbonamento ai commenti completato</string>
+    <string name="reader_follow_comments_bad_format_response">Risposta non valida ricevuta</string>
+    <string name="reader_follow_comments_null_response">Nessuna risposta ricevuta</string>
+    <string name="activity_log_activity_type_filter_clear">Pulisci</string>
+    <string name="activity_log_activity_type_filter_apply">Applica</string>
+    <string name="dialog_edit_story_unsupported_format_message">Una o più diapositive non sono state aggiunte alla tua storia perché al momento le storie non supportano i file GIF. Scegli un\'immagine statica o uno sfondo video.</string>
+    <string name="dialog_edit_story_unsupported_format_title">File GIF non supportati</string>
+    <string name="dialog_edit_story_unrecoverable_message">Non è possibile trovare i media per questa storia sul sito.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Impossibile modificare la storia</string>
+    <string name="dialog_edit_story_unavailable_message">Impossibile caricare i media per questa storia. Controlla la tua connessione a internet e riprova.</string>
+    <string name="dialog_edit_story_unavailable_title">Impossibile modificare la storia</string>
+    <string name="dialog_edit_story_limited_message">Questa storia è stata modificata su un dispositivo diverso e la capacità di modificare determinati oggetti potrebbe essere limitata.</string>
+    <string name="dialog_edit_story_limited_title">Modificabilità della storia limitata</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Il file multimediale è stato rimosso. Prova a modificare la tua storia.</string>
+    <string name="color_picker_label_background">Sfondo</string>
+    <string name="color_picker_label_text">Testo</string>
+    <string name="dialog_discard_story_ok_button_edit">Rimuovi</string>
+    <string name="dialog_discard_story_message_edit">Nessuna delle modifiche effettuate verrà salvata.</string>
+    <string name="dialog_discard_story_title_edit">Annullare le modifiche?</string>
+    <string name="label_done_button">Completato</string>
+    <string name="label_next_button">Prossimo</string>
+    <string name="delete_button_alt">Elimina</string>
+    <string name="hpp_choose_error">Si è verificato un errore durante la selezione del design.</string>
+    <string name="hpp_retry_error">Controlla la tua connessione a internet e riprova.</string>
+    <string name="hpp_error_subtitle">Tocca \"riprova\" quando torni online.</string>
+    <string name="hpp_error_title">Layout non disponibili in modalità offline</string>
+    <string name="continue_site_credentials">Continua con le credenziali del negozio</string>
+    <string name="login_find_your_connected_email">Trova l\'email connessa</string>
+    <string name="reader_discover_no_posts_button_text">Segui gli argomenti</string>
+    <string name="reader_discover_no_posts_subtitle">Cerca di seguire più argomenti per estendere la ricerca</string>
+    <string name="reader_discover_no_posts_title">Nessun articolo recente</string>
+    <string name="reader_discover_empty_title">Benvenuto!</string>
+    <string name="scan">Scansiona</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; ha risposto al tuo articolo</string>
+    <string name="login_prologue_third_subtitle_two">Oggi hai ricevuto &lt;b&gt;50 Mi piace&lt;/b&gt; al tuo sito</string>
+    <string name="login_prologue_third_subtitle_one">A &lt;b&gt;Madison Ruiz&lt;/b&gt; è piaciuto il tuo articolo</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Menu del blocco a scorrimento aperto. Seleziona un blocco.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menu del blocco a scorrimento chiuso.</string>
+    <string name="hpp_skip_button">Salta</string>
+    <string name="hpp_choose_button">Scegli</string>
+    <string name="hpp_subtitle">Scegli il layout che preferisci per la tua homepage. Puoi modificarlo e personalizzarlo in seguito.</string>
+    <string name="hpp_title">Scegli un design</string>
+    <string name="mlp_network_error_subtitle">Tocca Riprova quando sei di nuovo online o crea una pagina vuota utilizzando il pulsante sottostante.</string>
+    <string name="mlp_network_error_title">Layout non disponibili in modalità offline</string>
+    <string name="mlp_error_subtitle">Tocca Riprova o crea una pagina vuota utilizzando il pulsante sottostante.</string>
+    <string name="mlp_error_title">Layout non disponibili a causa di un errore</string>
+    <string name="prepublishing_nudges_add_category_button">Aggiungi categoria</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Aggiungi nuova categoria</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorie</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Non impostato</string>
+    <string name="prepublishing_nudges_categories_action">Categorie</string>
+    <string name="login_prologue_fifth_caption_three">Musei di Londra</string>
+    <string name="login_prologue_fifth_caption_two">World\'s Best Fans</string>
+    <string name="login_prologue_fifth_caption_one">La Top Ten dei bar</string>
+    <string name="login_prologue_fifth_tag_six">Politica</string>
+    <string name="login_prologue_fifth_tag_five">Musica</string>
+    <string name="login_prologue_fifth_tag_four">Giardinaggio</string>
+    <string name="login_prologue_fifth_tag_three">Calcio</string>
+    <string name="login_prologue_fifth_tag_two">Cucina</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock \'n\' Roll di questa settimana</string>
+    <string name="login_prologue_fifth_subtitle_two">Web News</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Sono ispirato dal lavoro del fotografo Cameron Karsten. Proverò queste tecniche durante il mio prossimo</string>
+    <string name="login_prologue_second_subtitle_one">Lasciati ispirare</string>
+    <string name="login_prologue_title_fifth">Segui i tuoi siti preferiti e scopri nuovi blog.</string>
+    <string name="login_prologue_title_fourth">Guarda il tuo pubblico crescere con analisi approfondite.</string>
+    <string name="login_prologue_title_third">Visualizza i commenti e le notifiche in tempo reale.</string>
+    <string name="login_prologue_title_second">Con l\'editor potente puoi pubblicare anche durante i tuoi spostamenti.</string>
+    <string name="login_prologue_title_first">Benvenuto nel costruttore di siti web più popolare del mondo.</string>
+    <string name="media_loading_failed">Caricamento dei file multimediali non riuscito</string>
+    <string name="reader_discover_recommended_blogs_header">Siti da seguire</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Stiamo lavorando duramente per aggiungere più blocchi con ogni versione.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\"%s\" non è pienamente supportato</string>
+    <string name="gutenberg_native_help_button">Pulsante di assistenza</string>
+    <string name="gutenberg_native_edit_using_web_editor">Modifica utilizzando l\'editor web</string>
+    <string name="gutenberg_native_choose_images">Scegli immagini</string>
+    <string name="stories_intro_create_story_post_label">Crea articolo della storia</string>
+    <string name="stories_intro_description_second">Vengono pubblicati come un nuovo articolo del blog sul sito, quindi il pubblico non perderà nulla.</string>
+    <string name="stories_intro_title_second">Gli articoli della storia non scompaiono</string>
+    <string name="stories_intro_description_first">Combina foto, video e testo per creare articoli della storia coinvolgenti e che si possono toccare che i visitatori ameranno.</string>
+    <string name="stories_intro_title_first">Le storie ora sono per tutti</string>
+    <string name="stories_intro_image_caption_second">Esempio titolo storia</string>
+    <string name="stories_intro_image_caption_first">Come creare un articolo della storia</string>
+    <string name="stories_intro_main_title">Introduzione agli articoli della storia</string>
+    <string name="mlp_notice_blank_page_created">Pagina bianca creata</string>
+    <string name="mlp_notice_page_created">Pagina creata</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s è stato negato l\'accesso alle tue foto. Per risolvere questo problema, modifica le tue autorizzazioni e attiva %2$s e %3$s.</string>
+    <string name="media_insert_failed">Inserimento degli elementi multimediali non riuscito.</string>
+    <string name="media_insert_failed_with_reason">Inserimento degli elementi multimediali non riuscito: %s</string>
+    <string name="photo_picker_wordpress_media_library">Scegli dalla Libreria multimediale di WordPress</string>
+    <string name="reader_label_toolbar_back">Indietro</string>
+    <string name="reader_discover_empty_button_text">Inizia ora</string>
+    <string name="reader_discover_empty_subtitle">Segui gli argomenti per scoprire nuovi blog</string>
+    <string name="reader_post_details_header_by_author_name">Da</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Questo referrer non può essere contrassegnato come spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Annulla contrassegno come spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Contrassegna come spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Apri sito web</string>
+    <string name="media_uploading_gif_library_photo">Caricamento GIF multimediale</string>
+    <string name="media_uploading_stock_library_photo">Caricamento magazzino multimediale</string>
+    <string name="media_uploading_default">Caricamento elemento multimediale</string>
     <string name="gutenberg_native_select_item">Seleziona elemento</string>
     <string name="gutenberg_native_search_or_type_url">Cerca o digita URL</string>
+    <string name="gutenberg_native_page_break">Interruzione di pagina</string>
     <string name="gutenberg_native_add_this_telephone_link">Aggiungi questo link del telefono</string>
     <string name="gutenberg_native_add_this_link">Aggiungi questo link</string>
     <string name="gutenberg_native_add_this_email_link">Aggiungi questo link dell\'e-mail</string>
-    <string name="suggestion_no_connection">\"Nessuna connessione Internet.\nI suggerimenti non sono disponibili.\"</string>
+    <string name="suggestion_no_connection">Nessuna connessione Internet.\nI suggerimenti non sono disponibili.</string>
     <string name="typeface_label_shrikhand">Grassetto</string>
     <string name="typeface_label_space_mono">Moderno</string>
     <string name="typeface_label_pacifico">Giocoso</string>
@@ -27,7 +498,6 @@ Language: it
     <string name="comment_unable_to_show_error">Impossibile mostrare questo commento</string>
     <string name="media_browse_for_items">Sfoglia gli elementi</string>
     <string name="reader_menu_report_post">Segnala questo articolo</string>
-    <string name="gutenberg_native_angle">Angolo</string>
     <string name="reader_welcome_banner">Benvenuto al Reader Scopri milioni di blog con il tocco delle dita.</string>
     <string name="error_media_xmlrcp_server_error">Si è verificato un errore del server interno</string>
     <string name="error_media_xmlrpc_not_allowed">L\'azione non è consentita</string>
@@ -37,7 +507,6 @@ Language: it
     <string name="create_post_story_fab_tooltip">Crea un articolo o una storia</string>
     <string name="create_page_fab_tooltip">Crea una pagina</string>
     <string name="create_post_fab_tooltip">Crea un articolo</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">Potrebbe piacerti</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Nascondi</string>
     <string name="gutenberg_native_video_caption_empty">Didascalia del video. Svuota</string>
@@ -76,7 +545,6 @@ Language: it
     <string name="dialog_discard_errored_page_message">Questa diapositiva non è ancora stata salvata. Se elimini questa diapositiva, eventuali modifiche andranno perse.</string>
     <string name="dialog_discard_page_message">Questa diapositiva sarà rimossa dalla tua storia.</string>
     <string name="dialog_discard_page_title">Eliminare la diapositiva della storia?</string>
-    <string name="menu_delete_page">Elimina diapositiva</string>
     <string name="label_text_color_button">Modifica colore del testo</string>
     <string name="label_text_alignment_button">Modifica allineamento del testo</string>
     <string name="label_frame_errored">errore</string>
@@ -86,8 +554,6 @@ Language: it
     <string name="label_retry_icon">Riprova</string>
     <string name="label_saved_icon">Salvataggio completato</string>
     <string name="label_close_button">Chiudi</string>
-    <string name="label_control_publish">Successivo</string>
-    <string name="label_done">Fatto</string>
     <string name="label_share_to">Condividi con</string>
     <string name="label_snackbar_share">CONDIVISIONE</string>
     <string name="label_snackbar_loop_frame_saved">Salvato nelle foto</string>
@@ -98,7 +564,6 @@ Language: it
     <string name="label_control_flip_camera">Inverti</string>
     <string name="sound_button_alt">Suono</string>
     <string name="text_button_alt">Testo</string>
-    <string name="more_button_alt">Altro</string>
     <string name="stickers_button_alt">Adesivi</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Inverti fotocamera</string>
@@ -111,7 +576,7 @@ Language: it
     <string name="prepublishing_nudges_story_title_hint">Dai un titolo alla tua storia</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Crea un articolo o una storia</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Crea un articolo, una pagina o una storia</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Tocca %1$s Crea. %2$s Quindi, seleziona &lt;b>Articolo del blog&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Tocca %1$s Crea. %2$s Quindi, seleziona &lt;b&gt;Articolo del blog&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Scegli da dispositivo</string>
     <string name="my_site_bottom_sheet_add_story">Articolo della storia</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">La modifica delle icone del sito sui siti WordPress ospitati personalmente richiede il plugin Jetpack.</string>
@@ -125,13 +590,10 @@ Language: it
     <string name="gutenberg_native_choose_image_or_video">Scegli immagine o video</string>
     <string name="gutenberg_native_choose_image">Scegli immagine</string>
     <string name="gutenberg_native_block_removed">Blocco rimosso</string>
-    <string name="content_description_logo">Logo WordPress</string>
-    <string name="enter_your_site_address">Inserisci l\'indirizzo del sito</string>
-    <string name="continue_with_wpcom">Continua con WordPress.com</string>
+    <string name="enter_your_site_address">Immetti l\'indirizzo del sito esistente</string>
     <string name="signup_confirmation_title">Conferma dell\'iscrizione</string>
     <string name="continue_with_google_terms_of_service_text">Se continui con Google e non hai già un account WordPress.com, crei un account e accetti i nostri %1$sTermini di servizio%2$s.</string>
     <string name="continue_terms_of_service_text">Continuando, accetti i nostri %1$sTermini di servizio%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Ti invieremo una email con un link per creare il tuo nuovo account WordPress.com.</string>
     <string name="signup_confirmation_message">Useremo un indirizzo e-mail per creare un nuovo account WordPress.com.</string>
     <string name="signup_magic_link_message">Ti abbiamo inviato una e-mail con un link per creare il tuo nuovo account WordPress.com. Controlla la tua e-mail su questo dispositivo e tocca il link nell\'email ricevuta da WordPress.com.</string>
     <string name="enter_account_info_for_site">Inserisci le informazioni dell’account per %1$s.</string>
@@ -148,19 +610,15 @@ Language: it
     <string name="or_type_your_password">In alternativa, digita la tua password</string>
     <string name="create_account">Crea account</string>
     <string name="send_link_by_email">Invia link tramite e-mail</string>
-    <string name="login_promo_text_unlock_the_power">Libera tutto il potenziale del costruttore di siti più flessibile al mondo.</string>
-    <string name="login_promo_title_37_percent">Il 37\% del web viene costruito con WordPress.</string>
     <string name="reset_your_password">Reimposta la password</string>
     <string name="reader_error_request_failed_title">Si è verificato un errore durante la gestione della richiesta. Riprova più tardi.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Dai al tuo sito un nome che rifletta la tua personalità e l\'argomento. La prima impressione conta.</string>
     <string name="quick_start_list_update_site_title_title">Imposta il titolo del sito</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Tocca &lt;b>%1$s&lt;/b> per impostare un nuovo titolo</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Tocca &lt;b&gt;%1$s&lt;/b&gt; per impostare un nuovo titolo</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">L\'eliminazione di questo articolo comporterà anche l\'eliminazione delle modifiche apportate in locale. Continuare?</string>
     <string name="gutenberg_native_s_block_options">%s opzioni blocco</string>
     <string name="gutenberg_native_duplicate_block">Duplica il blocco</string>
     <string name="gutenberg_native_copy_block">Copia il blocco</string>
     <string name="gutenberg_native_copied_block">Blocco copiato</string>
-    <string name="gutenberg_native_block_settings">Impostazioni del blocco</string>
     <string name="gutenberg_native_block_pasted">Blocco incollato</string>
     <string name="gutenberg_native_block_duplicated">Blocco duplicato</string>
     <string name="gutenberg_native_block_cut">Blocco tagliato</string>
@@ -176,7 +634,6 @@ Language: it
     <string name="gutenberg_native_gradient_type">Tipo di gradiente</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Tocca due volte per selezionare l\'opzione</string>
     <string name="gutenberg_native_customize_gradient">Personalizza gradiente</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autore della pagina</string>
     <string name="photo_picker_use_gif">Usa questa GIF</string>
     <string name="error_media_thumbnail_not_loaded">Impossibile caricare la miniatura del file multimediale</string>
@@ -199,8 +656,8 @@ Language: it
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Sposta in bozze</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Gli articoli eliminati non possono essere modificati. Vuoi modificare lo stato di questo articolo da \"bozza\" in modo da poterlo lavorare?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Spostare gli articoli in bozze?</string>
-    <string name="reader_label_choose_your_interests">Scegli i tuoi interessi</string>
-    <string name="reader_choose_interests_content_description">Scegli i tuoi interessi</string>
+    <string name="reader_label_choose_your_interests">Scegli gli argomenti</string>
+    <string name="reader_choose_interests_content_description">Scegli gli argomenti</string>
     <string name="reader_btn_done">Fatto</string>
     <string name="reader_btn_select_few_interests">Selezionane alcuni per continuare</string>
     <string name="post_status_post_published">Pubblicato</string>
@@ -212,17 +669,14 @@ Language: it
     <string name="ccpa_privacy_notice_header">Nota sulla privacy per utenti in California</string>
     <string name="status_and_visibility">Stato e visibilità</string>
     <string name="update_now">Aggiorna ora</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Prova un layout di inizio</string>
     <string name="gutenberg_native_open_block_actions_menu">Apri menu azioni del blocco</string>
-    <string name="gutenberg_native_insert_mention">Inserisci riferimento</string>
+    <string name="gutenberg_native_move_to_top">Sposta in alto</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Tocca due volte per aprire il foglio in basso con le opzioni disponibili</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Tocca due volte per aprire il foglio delle azioni con le opzioni disponibili</string>
     <string name="pages_cannot_be_started">Al momento non possiamo aprire le pagine. Riprova più tardi</string>
     <string name="pages_set_as_posts_page">Imposta come pagine degli articoli</string>
     <string name="pages_set_as_homepage">Imposta come homepage</string>
-    <string name="suggestion_no_matching_users">\"Nessun utente corrispondente disponibile.\"</string>
-    <string name="suggestion_invalid_user">\"%s non è un utente valido\"</string>
+    <string name="suggestion_invalid">%s non è un/una %s valido/valida</string>
     <string name="site_settings_select_page">Seleziona una pagina</string>
     <string name="site_settings_posts_page">Pagina degli articoli</string>
     <string name="site_settings_static_homepage">Homepage statica</string>
@@ -242,7 +696,6 @@ Language: it
     <string name="page_homepage_successfully_updated">Homepage aggiornata correttamente</string>
     <string name="page_cannot_set_posts_page">Per impostare la pagina degli articoli abilita \"Homepage statica\" nelle impostazioni del sito</string>
     <string name="page_cannot_set_homepage">Per impostare la homepage abilita \"Homepage statica\" nelle impostazioni del sito</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Benvenuto nel nostro nuovo blog</string>
     <string name="gutenberg_native_select_a_color">Seleziona un colore</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Tocca due volte per andare alle impostazioni del colore</string>
     <string name="reader_empty_followed_blogs_description">Quando segui i siti, visualizzerai i contenuti qui</string>
@@ -276,7 +729,6 @@ Language: it
     <string name="gutenberg_native_move_block_left">Sposta il blocco a sinistra</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Tocca due volte per spostare il blocco a destra</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Tocca due volte per spostare il blocco a sinistra</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Creazione della bacheca</string>
     <string name="new_site_creation_creating_site_loading_3">Impostazione del tema</string>
     <string name="new_site_creation_creating_site_loading_2">Aggiunta delle funzionalità del sito</string>
@@ -332,57 +784,20 @@ Language: it
     <string name="app_theme_light">Chiaro</string>
     <string name="app_theme">Aspetto</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Di recente hai apportato modifiche a questa pagina ma non le hai salvate. Scegli una versione da caricare:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Cosa dice la gente</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Offriamo una vasta gamma di servizi per aiutarti a raggiungere i risultati che desideri. Non sai di cosa hai bisogno o quanto costa? Ti possiamo illustrare quali sono i servizi adatti a te e dirti di più sulle nostre tariffe. Contattaci tramite i dettagli di seguito.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Abbiamo un piccolo team di professionisti di talento con una vasta gamma di competenze ed esperienze. Amiamo il nostro lavoro e lo facciamo con passione. Non vediamo l\'ora di lavorare con te.</string>
-    <string name="gutenberg_native_warning_message">Messaggio di avviso</string>
-    <string name="gutenberg_native_want_to_work_with_us">Desideri lavorare con noi?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">I visitatori desiderano sapere chi si trova dall\'altra parte della pagina. Utilizza questo spazio per scrivere qualcosa di te, del tuo sito, del tuo business o di qualsiasi cosa tu desideri. Usa le testimonianze di seguito per citare gli altri, parlando dello stesso tema, con le loro parole.</string>
-    <string name="gutenberg_native_usa">Italia</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Questo è un contenuto di esempio, incluso nel modello per illustrarne le caratteristiche. Rimuovi o sostituiscilo con parole e file multimediali tuoi.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Il modo per cominciare è smettere di parlare e iniziare ad agire.</string>
-    <string name="gutenberg_native_team">Team</string>
-    <string name="gutenberg_native_success_message">Messaggio di operazione completata</string>
-    <string name="gutenberg_native_strategy">Strategia</string>
     <string name="gutenberg_native_show_post_content">Mostra contenuti articolo</string>
-    <string name="gutenberg_native_services">Servizi</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel, il cane</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nome progetto</string>
-    <string name="gutenberg_native_position_or_job_title">Posizione o titolo professionale</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Mostra solo estratto</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Il mio portfolio mostra i vari progetti che ho creato durante la mia carriera. Vedi le mie informazioni di contatto qui sotto e contattami.</string>
     <string name="gutenberg_native_link_to">Link a</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Parliamo 👋 Non esitare a contattarci tramite le informazioni di contatto riportate di seguito, altrimenti inviaci un messaggio utilizzando il modulo.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Costruiamo qualcosa insieme!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Costruiamo qualcosa insieme!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Sono le nostre scelte, Harry, che mostrano ciò che realmente siamo, molto più delle nostre abilità.</string>
-    <string name="gutenberg_native_inspiration">Ispirazione</string>
-    <string name="gutenberg_native_get_in_touch">Contattaci</string>
+    <string name="gutenberg_native_link_settings">Impostazioni del link</string>
     <string name="gutenberg_native_excerpt_length_words">Lunghezza estratto (parole)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Inviami un\'e-mail: &lt;a href=\"mailto:mail@example.com\">mail@esempio.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Non piangere perché è finita, sorridi perché è accaduto.</string>
     <string name="gutenberg_native_customize">PERSONALIZZA</string>
-    <string name="gutenberg_native_city_10100">Città, 10100</string>
+    <string name="gutenberg_native_video_settings">Impostazioni video</string>
     <string name="gutenberg_native_add_paragraph_block">Aggiungi blocco Paragrafo</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Una breve descrizione dei servizi che offri.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Una breve biografia con la storia personale, i traguardi chiave o un fatto interessante.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@esempio.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Una descrizione del progetto e dei lavori presentati.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">Corso d\'Italia, 5</string>
     <string name="create_post_page_fab_tooltip_contributors">Crea un articolo</string>
     <string name="post_list_tab_trashed_posts">Spostato nel cestino</string>
     <string name="post_list_tab_scheduled_posts">Programmato</string>
     <string name="post_list_tab_published_posts">Pubblicato</string>
     <string name="sharing_facebook_account_must_have_pages">La connessione a Facebook non riesce a trovare alcuna pagina. Pubblicizza non può connettersi ai profili Facebook, bensì solo alle pagine pubblicate.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Non collegato</string>
-    <string name="my_site_select_domains_page_title">Indirizzo sito</string>
     <string name="notifications_tab_title_likes">Mi piace</string>
     <string name="notifications_tab_title_follows">Segue</string>
     <string name="notifications_tab_title_comments">Commenti</string>
@@ -396,14 +811,12 @@ Language: it
     <string name="stats_management_add_new_stats_card">Aggiungi nuova scheda statistiche</string>
     <string name="reader_self_hosted_select_filter">Utilizza il pulsante di filtro per trovare articoli su argomenti specifici</string>
     <string name="reader_bottom_sheet_content_description">Seleziona un tag o un sito, finestra pop-up</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selezionati</string>
     <string name="reader_btn_select_filter_content_description">Seleziona un sito o un tag per filtrare gli articoli</string>
     <string name="reader_btn_remove_filter_content_description">Rimuovi filtro attuale</string>
     <string name="reader_title_subs">Gestisci argomenti e siti</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Accedi a WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Accedi a WordPress.com per vedere gli ultimi articoli degli argomenti che segui</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Accedi a WordPress.com per vedere gli ultimi articoli dei siti che segui</string>
-    <string name="gutenberg_native_template_preview">Anteprima del modello</string>
     <string name="gutenberg_native_replace_current_block">Sostituisci blocco attuale</string>
     <string name="gutenberg_native_add_to_end">Aggiungi alla fine</string>
     <string name="gutenberg_native_add_to_beginning">Aggiungi all\'inizio</string>
@@ -417,7 +830,6 @@ Language: it
     <string name="reader_filter_cta">Filtro</string>
     <string name="gutenberg_native_video_caption_s">Didascalia del video. %s</string>
     <string name="gutenberg_native_edit_video">Modifica video</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Tocca due volte per selezionare il layout</string>
     <string name="gutenberg_native_add_a_shortcode">Aggiungi uno shortcode…</string>
     <string name="post_list_author">Autore articolo</string>
     <string name="fab_create_desc">Crea un articolo</string>
@@ -432,10 +844,8 @@ Language: it
     <string name="stats_box_type_low">bassa</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%3$s, %2$d %1$s</string>
-    <string name="gutenberg_native_move_image_forward">Sposta avanti l\'immagine</string>
-    <string name="gutenberg_native_move_image_backward">Sposta indietro l\'immagine</string>
+    <string name="gutenberg_native_replace_image">Sostituisci immagine</string>
     <string name="gutenberg_native_gallery_caption_s">Didascalia della galleria. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Il valore attuale è %2$s</string>
     <string name="create_post_page_fab_tooltip">Crea un articolo o una pagina</string>
     <string name="content_description_person_building_website">Creatore del sito web</string>
     <string name="post_signup_interstitial_not_right_now">Non adesso</string>
@@ -449,21 +859,17 @@ Language: it
     <string name="my_site_bottom_sheet_add_post">Articolo del blog</string>
     <string name="my_site_bottom_sheet_title">Aggiungi nuovo</string>
     <string name="post_settings_publish">Pubblica</string>
-    <string name="dialog_gutenberg_informative_description_v2">Abbiamo apportato notevoli migliorie all\'editor dei blocchi e pensiamo valga la pena provarlo! È abilitato per i nuovi articoli e pagine, ma se preferisci passare all\'editor classico, vai su \'Mio Sito\' > \'Impostazioni del Sito\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizza ora</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Questo articolo verrà sincronizzato immediatamente.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Pronto per la sincronizzazione?</string>
     <string name="new_site_creation_unavailable_domain">Questo dominio non è disponibile</string>
-    <string name="login_promo_viewpager_content_description">Introduzione</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Non siamo stati in grado di accedere al tuo sito. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
-    <string name="login_discovery_error_ssl">Non siamo stati in grado di accedere al tuo sito perché abbiamo riscontrato un problema con il &lt;b>certificato SSL&lt;/b>. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
-    <string name="login_discovery_error_http_auth">Non siamo stati in grado di accedere al tuo sito perché viene richiesta l\'&lt;b>autenticazione HTTP&lt;/b>. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
-    <string name="login_discovery_error_xmlrpc">Non siamo stati in grado di accedere al &lt;b>file XMLRPC&lt;/b> sul tuo sito. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
-    <string name="login_site_credentials_magic_link_label">Ci sei quasi! Dobbiamo solamente verificare il tuo indirizzo e-mail connesso a Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Accedi con le credenziali del sito.</string>
+    <string name="login_discovery_error_ssl">Non siamo stati in grado di accedere al tuo sito perché abbiamo riscontrato un problema con il &lt;b&gt;certificato SSL&lt;/b&gt;. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
+    <string name="login_discovery_error_http_auth">Non siamo stati in grado di accedere al tuo sito perché viene richiesta l\'&lt;b&gt;autenticazione HTTP&lt;/b&gt;. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
+    <string name="login_discovery_error_xmlrpc">Non siamo stati in grado di accedere al &lt;b&gt;file XMLRPC&lt;/b&gt; sul tuo sito. Dovrai contattare il tuo fornitore di hosting per risolvere questo problema.</string>
+    <string name="login_site_credentials_magic_link_label">Ci sei quasi! Dobbiamo solamente verificare il tuo indirizzo e-mail connesso a Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Accedi con le credenziali del sito %1$s</string>
-    <string name="send_verification_email">Invia email di verifica</string>
     <string name="my_site_bottom_sheet_add_page">Pagina del sito</string>
     <string name="reader_following_display_name">Stai seguendo</string>
     <string name="reader_my_likes_display_name">Mi piace</string>
@@ -476,27 +882,23 @@ Language: it
     <string name="suffix_1_000_000_000_000">%sT</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">Non siamo in grado di aprire gli articoli in questo momento. Riprova più tardi.</string>
     <string name="site_cannot_be_loaded">Non siamo in grado di caricare i dati per il tuo sito in questo momento. Riprova più tardi.</string>
     <string name="gutenberg_native_wordpress_media_library">Libreria multimediale WordPress</string>
+    <string name="gutenberg_native_unsupported">Non supportato</string>
     <string name="gutenberg_native_ungroup">Non raggruppare</string>
     <string name="gutenberg_native_translate">Traduci</string>
-    <string name="gutenberg_native_title">Titolo:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Tocca per nascondere la tastiera</string>
     <string name="gutenberg_native_tap_here_to_show_help">Tocca qui per mostrare la guida</string>
     <string name="gutenberg_native_take_a_video">Fai un video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Fai un video o scatta una foto</string>
     <string name="gutenberg_native_take_a_photo">Scatta una foto</string>
     <string name="gutenberg_native_start_writing">Inizia a scrivere…</string>
-    <string name="gutenberg_native_size">Dimensione</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Plugin del titolo sulla barra laterale</string>
     <string name="gutenberg_native_show_section">Mostra sezione</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Blocco %s. Questo blocco ha contenuti non validi</string>
     <string name="gutenberg_native_s_block_empty">Blocco %s. Vuoto</string>
     <string name="gutenberg_native_cut_block">Taglia il blocco</string>
-    <string name="gutenberg_native_reset_block">Reimposta blocco</string>
-    <string name="gutenberg_native_remove_annotations">Rimuovi annotazioni</string>
     <string name="gutenberg_native_problem_opening_the_video">Problema durante l\'apertura del video</string>
     <string name="gutenberg_native_problem_displaying_block">Problema durante la visualizzazione del blocco</string>
     <string name="gutenberg_native_post_title_s">Titolo dell\'articolo. %s</string>
@@ -506,17 +908,12 @@ Language: it
     <string name="gutenberg_native_open_settings">Apri le impostazioni</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Nessuna applicazione può gestire questa richiesta. Installa un browser web.</string>
     <string name="gutenberg_native_navigate_up">Naviga su</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Il mio pannello di prepubblicazione</string>
-    <string name="gutenberg_native_my_post_status_info">Le mie informazioni di stato dell\'articolo</string>
-    <string name="gutenberg_native_my_post_publish_panel">Il mio pannello di pubblicazione dell\'articolo</string>
-    <string name="gutenberg_native_my_document_setting_panel">Il mio pannello di impostazioni dei documenti</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Sposta blocco su dalla riga %1$s alla riga %2$s</string>
     <string name="gutenberg_native_move_block_up">Sposta il blocco verso l\'alto</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Sposta il blocco in basso dalla riga %1$s alla riga %2$s</string>
     <string name="gutenberg_native_move_block_down">Sposta il blocco verso il basso</string>
     <string name="gutenberg_native_image_caption_s">Didascalia dell\'immagine. %s</string>
     <string name="gutenberg_native_hide_keyboard">Nascondi tastiera</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Ecco il pannello dei contenuti!</string>
     <string name="gutenberg_native_help_icon">Icona della guida</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Inserimento media non riuscito.\nTocca per ulteriori opzioni.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Tocca due volte per annullare l\'ultima modifica</string>
@@ -528,34 +925,28 @@ Language: it
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Tocca due volte per spostare il blocco in alto</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Tocca due volte per spostare il blocco in basso</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Tocca due volte per modificare questo valore</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Tocca due volte per modificare il valore usando lo slider</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Tocca due volte per aggiungere un blocco</string>
     <string name="gutenberg_native_current_value_is_s">Il valore attuale è %s</string>
-    <string name="gutenberg_native_content">Contenuto…</string>
     <string name="gutenberg_native_choose_from_device">Scegli da dispositivo</string>
-    <string name="gutenberg_native_annotations_sidebar">Barra laterale delle annotazioni</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Si è verificato un errore sconosciuto. Riprova.</string>
     <string name="gutenberg_native_alt_text">Testo Alt</string>
     <string name="gutenberg_native_add_video">AGGIUNGI VIDEO</string>
     <string name="gutenberg_native_add_url">Aggiungi URL</string>
+    <string name="gutenberg_native_add_alt_text">Aggiungi testo alternativo</string>
     <string name="gutenberg_native_add_image_or_video">AGGIUNGI IMMAGINE O VIDEO</string>
     <string name="gutenberg_native_add_image">AGGIUNGI IMMAGINE</string>
     <string name="gutenberg_native_add_block_here">AGGIUNGI BLOCCO QUI</string>
-    <string name="gutenberg_native_add_annotation">Aggiungi annotazione</string>
-    <string name="gutenberg_native_add_a_description">Aggiungi una descrizione</string>
     <string name="reader_empty_saved_posts_content_description">Tocca il pulsante Aggiungi ad articoli salvati per salvare un articolo nell\'elenco.</string>
     <string name="reader_acessibility_list_loaded">\"L\'elenco è stato caricato con %1$d voci.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Notifiche</string>
-    <string name="master_switch_default_title_off">Disattivo</string>
-    <string name="master_switch_default_title_on">Attivo</string>
-    <string name="notifications_tab_dialog_master_off_message">La disattivazione delle notifiche per questo sito ne comporterà la disattivazione della visualizzazione nella scheda delle notifiche per questo sito. Puoi regolare il tipo di notifica da vedere dopo aver attivato le notifiche per questo sito.</string>
-    <string name="notifications_tab_dialog_master_off_title">Per vedere le notifiche sulla scheda delle notifiche per questo sito, attiva le notifiche per questo sito.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Abilita la visualizzazione delle notifiche sulla scheda delle notifiche per questo sito</string>
-    <string name="notifications_tab_dialog_master_hint_on">Disabilita la visualizzazione delle notifiche sulla scheda delle notifiche per questo sito</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifiche per questo sito</string>
-    <string name="notifications_tab_dialog_master_status_on">Notifiche per questo sito</string>
-    <string name="dialog_gutenberg_informative_description_page">Ora stai usando l\'editor a blocchi per le nuove pagine, fantastico. Se desideri passare all\'editor classico, vai a \"Il mio sito\" > \"Impostazioni del sito\".</string>
-    <string name="dialog_gutenberg_informative_description_post">Ora stai usando l\'editor a blocchi per i nuovi articoli, fantastico. Se desideri passare all\'editor classico, vai a \"Il mio sito\" > \"Impostazioni del sito\".</string>
+    <string name="main_switch_default_title_off">Disattivato</string>
+    <string name="main_switch_default_title_on">On</string>
+    <string name="notifications_tab_dialog_main_off_message">La disattivazione di Notifiche per questo sito ne comporterà la disattivazione della visualizzazione nella relativa scheda. Puoi regolare il tipo di notifica da vedere dopo aver attivato Notifiche per questo sito.</string>
+    <string name="notifications_tab_dialog_main_off_title">Per vedere le notifiche sulla scheda delle notifiche per questo sito, attiva Notifiche per questo sito.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Abilita la visualizzazione delle notifiche sulla scheda delle notifiche per questo sito</string>
+    <string name="notifications_tab_dialog_main_hint_on">Disabilita la visualizzazione delle notifiche sulla scheda delle notifiche per questo sito</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifiche per questo sito</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifiche per questo sito</string>
     <string name="pick_media">Aggiungi immagine o video</string>
     <string name="error_post_not_submitted_retrying">Impossibile inviare questo articolo per la revisione, riproveremo più tardi. </string>
     <string name="error_post_not_scheduled_retrying">Impossibile pianificare questo articolo, riproveremo più tardi.</string>
@@ -585,7 +976,7 @@ Language: it
     <string name="dialog_confirm_autosave_body_second_part">Da quest\'app\nSalvato su %s\n\nDa un altro dispositivo\nSalvato su %s\n</string>
     <string name="dialog_confirm_autosave_body_first_part">Di recente hai apportato modifiche a questo articolo ma non le hai salvate. Scegli una versione da caricare:\n\n</string>
     <string name="dialog_confirm_autosave_title">Quale versione desideri modificare?</string>
-    <string name="button_delete_permanently">Cancella definitivamente</string>
+    <string name="button_delete_permanently">Elimina definitivamente</string>
     <string name="post_waiting_for_connection_draft_cancel">Non salveremo le ultime modifiche alla tua bozza.</string>
     <string name="post_waiting_for_connection_scheduled_cancel">Non pianificheremo queste modifiche.</string>
     <string name="post_waiting_for_connection_pending_cancel">Non invieremo queste modifiche per la revisione. </string>
@@ -648,8 +1039,6 @@ Language: it
     <string name="post_settings_add_to_calendar">Aggiungi a calendario</string>
     <string name="post_settings_notification">Notifica</string>
     <string name="post_settings_time_and_date">Data e ora</string>
-    <string name="login_need_help_finding_connected_email">Ti serve aiuto per trovare l\'e-mail con cui ti sei collegato?</string>
-    <string name="enter_wordpress_site">Il sito web su questo indirizzo non è un sito WordPress. Per poterci collegare a esso, il sito deve avere WordPress installato.</string>
     <string name="login_invalid_site_url">Inserisci un indirizzo di sito Web completo, come esempio.com.</string>
     <string name="enter_email_for_site">Accedi con WordPress.com per collegarti a %1$s</string>
     <string name="stats_post_views_label">Visualizzazioni</string>
@@ -715,7 +1104,7 @@ Language: it
     <string name="domain_registration_state_picker_dialog_title">Seleziona uno stato</string>
     <string name="domain_registration_country_picker_dialog_title">Seleziona il Paese</string>
     <string name="domain_registration_result_continue_button">continua</string>
-    <string name="domain_registration_result_description">il tuo nuovo dominio &lt;b>%s&lt;/b> è in fase di configurazione. Un\'ottima cosa\n per il tuo sito!</string>
+    <string name="domain_registration_result_description">il tuo nuovo dominio &lt;b&gt;%s&lt;/b&gt; è in fase di configurazione. Un\'ottima cosa\n per il tuo sito!</string>
     <string name="domain_registration_result_title">Complimenti</string>
     <string name="domain_contact_information_register_domain_button">Registra dominio</string>
     <string name="domain_contact_information_postal_code_hint">CAP</string>
@@ -823,12 +1212,10 @@ Language: it
     <string name="plans_loading_error_no_plans_title">Impossibile caricare i Piani</string>
     <string name="plans_loading_error_network_title">Nessuna connessione</string>
     <string name="menu_switch_to_gutenberg_editor">Passa all\'editor a blocchi</string>
-    <string name="menu_switch_to_aztec_editor">Passa all\'editor classico</string>
     <string name="stats_loading_block_error">Si è verificato un problema con il caricamento dei dati. Aggiorna la pagina per riprovare.</string>
     <string name="stats_loading_error">Dati non caricati</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Modifica i nuovi articoli e pagine con l’editor a blocchi</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Usa editor a blocchi</string>
-    <string name="dialog_gutenberg_informative_title">Editor a blocchi abilitato</string>
     <string name="exit">esci</string>
     <string name="quick_start_sites_type_subtitle">%1$d di %2$d completato</string>
     <string name="quick_start_sites_type_grow">Aumenta il tuo pubblico</string>
@@ -839,8 +1226,6 @@ Language: it
     <string name="quick_start_dialog_upload_icon_title">Carica un\'icona del sito</string>
     <string name="quick_start_dialog_upload_icon_message">I tuoi visitatori vedranno la tua icona nel loro browser. Aggiungi un\'icona personalizzata per un aspetto professionale e raffinato.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Tocca %1$s Piano %2$s per visualizzare il tuo piano attuale e altri piani disponibili</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tocca %1$s Aggiungi pagina %2$s per creare una nuova pagina.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Tocca %1$s Pagine %2$s per continuare.</string>
     <string name="quick_start_dialog_check_stats_message_short">Tocca %1$s Statistiche %2$s per vedere il rendimento del tuo sito.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tocca %1$s l\'icona del tuo sito %2$s per caricarne una nuova</string>
     <string name="quick_start_dialog_publish_post_message">Scrivi e pubblica il tuo primo articolo.</string>
@@ -851,13 +1236,8 @@ Language: it
     <string name="quick_start_dialog_explore_plans_message">Scopri gli strumenti SEO e di marketing nei nostri piani a pagamento.</string>
     <string name="quick_start_dialog_enable_sharing_title">Abilita la condivisione dell\'articolo</string>
     <string name="quick_start_dialog_enable_sharing_message">Condividi automaticamente nuovi articoli sui tuoi social media.</string>
-    <string name="quick_start_dialog_customize_site_message">Migliora i font, aggiungi immagini, ed altro.</string>
-    <string name="quick_start_dialog_create_page_title">Crea una nuova pagina</string>
-    <string name="quick_start_dialog_create_page_message">Aggiungi una pagina per il contenuto principale: una pagina di \"informazioni\" è un ottimo punto di inizio.</string>
     <string name="quick_start_dialog_check_stats_title">Controlla le statistiche del tuo sito</string>
     <string name="quick_start_dialog_check_stats_message">Resta aggiornato sulle performance del tuo sito.</string>
-    <string name="quick_start_dialog_browse_themes_title">Sfoglia temi</string>
-    <string name="quick_start_dialog_browse_themes_message">Esplora dozzine di layout e trova quello perfetto per te.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Rimuovendo Passi successivi, tutti i tour saranno nascosti su questo sito. Questa azione non può essere annullata.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Rimuovi Passi successivi</string>
     <string name="quick_start_remove_next_steps_menu_title">Rimuovilo</string>
@@ -881,15 +1261,11 @@ Language: it
     <string name="notification_new_site_creation_failed">Si è verificato un problema</string>
     <string name="notification_new_site_creation_title">Creazione del sito</string>
     <string name="new_site_creation_create_site_button">Crea il sito</string>
-    <string name="new_site_creation_search_domain_input_hint">Cerca domini</string>
     <string name="new_site_creation_domain_header_subtitle">Ecco dove gli utenti ti troveranno su Internet.</string>
-    <string name="new_site_creation_domain_header_title">Scegli un nome di dominio per il tuo sito</string>
     <string name="new_site_creation_empty_domain_list_message">Nessun indirizzo corrispondente alla ricerca</string>
     <string name="site_creation_error_generic_subtitle">Errore di comunicazione con il server, prova di nuovo</string>
     <string name="site_creation_error_generic_title">Si è verificato un problema</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Si è verificato un problema</string>
-    <string name="site_creation_segments_subtitle">Questo ci aiuta a dare consigli. Non rimani mai bloccato però. Tutti i siti si evolvono.</string>
-    <string name="site_creation_segments_title">Descrivici il tipo di sito che vorresti creare</string>
     <string name="new_site_creation_preview_title">Il sito è stato creato.</string>
     <string name="new_site_creation_screen_title_step_count">%1$d di %2$d</string>
     <string name="new_site_creation_screen_title_general">Creazione del sito</string>
@@ -1003,7 +1379,7 @@ Language: it
     <string name="pages_empty_published">Non hai ancora pubblicato nessuna pagina</string>
     <string name="pages_search_suggestion">Cerca pagine</string>
     <string name="pages_empty_search_result">Nessuna pagina corrispondente alla ricerca</string>
-    <string name="pages_delete_permanently">Cancella definitivamente</string>
+    <string name="pages_delete_permanently">Elimina definitivamente</string>
     <string name="pages_move_to_trash">Sposta nel cestino</string>
     <string name="pages_move_to_draft">Sposta in bozze</string>
     <string name="pages_set_parent">Imposta genitore</string>
@@ -1044,15 +1420,9 @@ Language: it
     <string name="quick_start_dialog_need_help_button_neutral">Mai</string>
     <string name="quick_start_dialog_need_help_button_negative">No grazie</string>
     <string name="quick_start_dialog_follow_sites_title">Segui altri siti</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tocca %1$s Cerca %2$s per guardare altri siti con interessi simili</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tocca %1$s Cerca %2$s per guardare altri siti con argomenti simili</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tocca %1$s Reader %2$s per continuare</string>
     <string name="quick_start_dialog_follow_sites_message">Trova i siti che ti interessano e seguili per ottenere aggiornamenti sui contenuti che pubblicano.</string>
-    <string name="quick_start_dialog_customize_site_title">Personalizza il tuo sito</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tocca %1$s Temi %2$s per continuare</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tocca %1$s Personalizza %2$s per iniziare la personalizzazione del tuo sito</string>
-    <string name="quick_start_dialog_choose_theme_title">Scegli un tema</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tocca %1$s Temi %2$s per scoprire nuovi temi</string>
-    <string name="quick_start_dialog_choose_theme_message">Sfoglia tutti i nostri temi per trovare quello perfetto per te.</string>
     <string name="quick_start_button_positive">Vai</string>
     <string name="quick_start_button_negative_short">Annulla</string>
     <string name="quick_start_button_negative">Non ora</string>
@@ -1116,14 +1486,12 @@ Language: it
     <string name="support_contact_email">Email di contatto</string>
     <string name="application_log_button">Registro applicazione</string>
     <string name="my_tickets">I miei ticket</string>
-    <string name="activity_log_rewind_dialog_message">Sei sicuro di voler riportare il tuo sito al %1$s alle %2$s? Questo rimuoverà tutti i contenuti e le opzioni create o modificate dopo di allora.</string>
-    <string name="activity_log_rewind_site">Ripristina sito</string>
     <string name="activity_log_currently_restoring_message_no_dates">Ripristino in corso</string>
     <string name="activity_log_currently_restoring_message">Ripristino al %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Al momento stiamo ripristinando il tuo sito</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Il tuo sito è stato ripristinato correttamente</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Il tuo sito è stato ripristinato correttamente\nTornando al %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Il tuo sito è in fase di ripristino\nRitorno al %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Il tuo sito è stato ripristinato correttamente\nRipristinato al %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Il tuo sito è in fase di ripristino\nIn ripristino al %1$s %2$s</string>
     <string name="activity_log_button">Pulsante di azione Registro applicazione</string>
     <string name="plugin_auto_managed">Auto-gestito</string>
     <string name="reader_save_posts_locally_dialog_message">Salva questo articolo e torna a leggerlo quando vorrai. Sarà disponibile solo su questo dispositivo — gli articoli salvati non vengono sincronizzati con gli altri dispositivi.</string>
@@ -1133,20 +1501,16 @@ Language: it
     <string name="comment_read_source_post">Leggi l\'articolo sorgente</string>
     <string name="sites">Siti</string>
     <string name="signup_magic_link_title">Link inviato</string>
-    <string name="signup_email_screen_title">Registrazione via email</string>
     <string name="verification_2fa_screen_title">Verifica del codice</string>
     <string name="selfhosted_site_login_title">Credenziali di accesso</string>
     <string name="magic_link_sent_login_title">Link inviato</string>
     <string name="magic_link_login_title">Accesso tramite link</string>
     <string name="site_address_login_title">Accesso tramite indirizzo sito</string>
     <string name="email_address_login_title">Accesso tramite indirizzo email</string>
-    <string name="alternatively">In alternativa:</string>
     <string name="reader_empty_saved_posts_description">Tocca %s per salvare un articolo nel tuo elenco.</string>
     <string name="reader_empty_saved_posts_title">Non è stato ancora salvato nessun articolo.</string>
     <string name="reader_bookmark_snack_title">Articolo salvato</string>
     <string name="reader_bookmark_snack_btn">Visualizza tutto</string>
-    <string name="reader_btn_bookmarked">Salvataggio completato</string>
-    <string name="reader_btn_bookmark">Salva</string>
     <string name="reader_remove_bookmark">Rimuovi da articoli salvati</string>
     <string name="reader_add_bookmark">Aggiungi ad articoli salvati</string>
     <string name="reader_save_for_later_title">Articoli salvati</string>
@@ -1166,11 +1530,9 @@ Language: it
     <string name="reader_btn_notifications_on">Attiva notifiche sito</string>
     <string name="reader_btn_notifications_off">Disattiva notifiche sito</string>
     <string name="activity_log_jetpack_icon">Icona Jetpack</string>
-    <string name="rewind">Ripristina</string>
     <string name="activity_log_event">Evento</string>
     <string name="activity_log_icon">Icona attività</string>
     <string name="activity_log">Log attività</string>
-    <string name="activity">Attività</string>
     <string name="privacy_policy_read">Leggi l’informativa sulla privacy</string>
     <string name="third_party_policy_learn_more_caption">Utilizziamo altri strumenti di tracciamento, compresi alcuni di terzi. Leggi le informazioni sugli strumenti e come controllarli.</string>
     <string name="third_party_policy_learn_more_header">Informativa sulla privacy di terze parti</string>
@@ -1181,7 +1543,6 @@ Language: it
     <string name="preference_privacy_settings">Impostazioni della privacy</string>
     <string name="preference_collect_information">Raccogli informazioni</string>
     <string name="post_submitted">Articolo inviato</string>
-    <string name="login_email_button_signup">Non hai un account? %1$sRegistrati%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">La funzionalità di plugin richiede che il sito sia in regola.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">La funzionalità di plugin richiede che l\'abbonamento di dominio principale sia associato a questo utente.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">La funzionalità di plugin richiede privilegi di amministratore.</string>
@@ -1280,7 +1641,6 @@ Language: it
     <string name="edit_photo_screen_title">Modifica foto</string>
     <string name="share_intent_screen_title">Scegli sito</string>
     <string name="signup_epilogue_screen_title">Nuovo account</string>
-    <string name="login_prologue_screen_title">Accesso</string>
     <string name="login_epilogue_screen_title">Autenticato come</string>
     <string name="person_detail_screen_title">Dettaglio persona</string>
     <string name="media_settings_screen_title">Dettagli file</string>
@@ -1294,7 +1654,7 @@ Language: it
     <string name="license_screen_title">Licenza</string>
     <string name="release_notes_screen_title">Note di rilascio</string>
     <string name="signup_epilogue_error_avatar_view">Il tuo avatar è stato caricato e sarà disponibile a breve.</string>
-    <string name="permissions_denied_message">Sembra che tu abbia disattivato le autorizzazioni necessarie per questa funzionalità.&lt;br/>&lt;br/>Per cambiare, modifica le tue autorizzazioni e assicurati che sia attivo &lt;strong>%s&lt;/strong>.</string>
+    <string name="permissions_denied_message">Sembra che tu abbia disattivato le autorizzazioni necessarie per questa funzionalità.&lt;br/&gt;&lt;br/&gt;Per cambiare, modifica le tue autorizzazioni e assicurati che sia attivo &lt;strong&gt;%s&lt;/strong&gt;.</string>
     <string name="permissions_denied_title">Autorizzazioni</string>
     <string name="plugin_caption_featured">In evidenza</string>
     <string name="sharing_disabled_description">Non puoi accedere alle impostazioni di condivisione poiché il modulo Condivisione Jetpack è disabilitato.</string>
@@ -1335,7 +1695,6 @@ Language: it
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 post con 1 file non caricato</string>
     <string name="untitled_in_parentheses">(senza titolo)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Crea il sito</string>
     <string name="notification_site_creation_created">Tocca per continuare.</string>
     <string name="notification_site_creation_title_success">Sito creato.</string>
@@ -1349,11 +1708,8 @@ Language: it
     <string name="username_changer_dismiss_button_positive">Annulla</string>
     <string name="username_changer_action">Salva</string>
     <string name="content_description_add_avatar">Aggiungi avatar</string>
-    <string name="signup_with_google_button">Registrati con Google</string>
-    <string name="signup_with_email_button">Registrati con l\'email</string>
     <string name="signup_user_exists">L\'email esiste già su WordPress.com.\nContinuare con l\'accesso.</string>
     <string name="signup_updating_account">Aggiornamento dell\'account…</string>
-    <string name="signup_terms_of_service_text">Registrandoti, accetti i nostri %1$sTermini di servizio%2$s.</string>
     <string name="signup_magic_link_progress">Invio email in corso</string>
     <string name="signup_magic_link_error_button_positive">Riprova</string>
     <string name="signup_magic_link_error_button_negative">Chiudi</string>
@@ -1366,11 +1722,6 @@ Language: it
     <string name="signup_epilogue_error_button_negative">Riconverti</string>
     <string name="signup_epilogue_error_generic">Si è verificato un errore durante l\'aggiornamento del tuo account. Puoi riprovare o annullare le modifiche per continuare.</string>
     <string name="signup_epilogue_error_avatar">Si è verificato un errore durante l\'aggiornamento del tuo avatar.</string>
-    <string name="signup_email_header">Per creare il tuo nuovo account WordPress.com, inserisci l\'indirizzo email.</string>
-    <string name="signup_email_error_generic">Si è verificato un errore durante il controllo dell\'indirizzo email.</string>
-    <string name="sign_up">Registrati a WordPress.com</string>
-    <string name="enter_username_instead">Accedi con il tuo nome utente.</string>
-    <string name="enter_site_address_instead">Accedi inserendo l\'indirizzo del tuo sito.</string>
     <string name="plugin_needs_update">È necessario l\'aggiornamento</string>
     <string name="plugin_caption_search">Cerca plugin</string>
     <string name="plugin_caption_new">Nuovo</string>
@@ -1491,7 +1842,6 @@ Language: it
     <string name="login_error_suffix">\nPuoi provare un account diverso?</string>
     <string name="login_error_generic">Si sono verificati dei problemi con la connessione con l’account Google.</string>
     <string name="login_error_button">Chiudi</string>
-    <string name="login_google_button_suffix">Accedi con Google.</string>
     <string name="enter_wpcom_password_google">Per procedere con questo account Google, fornisci la password WordPress.com corrispondente. Verrà richiesta solo una volta.</string>
     <string name="error_generic_network">Si è verificato un errore di rete. Controlla la connessione e riprova.</string>
     <string name="post_settings_remove_featured_image">Rimuovi immagine in evidenza</string>
@@ -1503,12 +1853,11 @@ Language: it
     <string name="jetpack_disconnect_confirm">Disconnetti</string>
     <string name="jetpack_disconnect_confirmation_message">Desideri disconnettere Jetpack dal sito?</string>
     <string name="jetpack_disconnect_pref_title">\"Esegui la disconnessione da WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Puoi includere nella lista bianca un indirizzo IP o serie di indirizzi per evitare che vengano bloccati da Jetpack. Sono accettati indirizzi IPv4 e IPv6. Per specificare un intervallo, inserisci il valore minimo e il valore massimo separati da un trattino. Esempio: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Puoi contrassegnare un indirizzo IP (o una serie di indirizzi) come \"Sempre consentito\" per evitare che venga bloccato da Jetpack. Sono accettati indirizzi IPv4 e IPv6. Per specificare un intervallo, inserisci il valore minimo e il valore massimo separati da un trattino. Esempio: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Richiede l\'Autenticazione a due passaggi</string>
     <string name="jetpack_match_wpcom_via_email_title">Confronta gli account tramite email</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Consenti l\'accesso a WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Accesso a WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Indirizzi IP inclusi nella lista bianca</string>
     <string name="jetpack_prevent_brute_force_title">Blocca i tentativi di accesso dannosi</string>
     <string name="jetpack_prevent_brute_force_category_title">Protezione dagli attacchi di forza bruta</string>
     <string name="jetpack_send_wp_notifications_title">Invia notifiche push</string>
@@ -1549,12 +1898,12 @@ Language: it
     <string name="notification_settings_category_other">Altro</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Tutti i miei siti</string>
     <string name="notification_settings_category_your_sites">I tuoi siti</string>
-    <string name="notification_settings_master_off_message">La disattivazione delle impostazioni di notifica causerà la disabilitazione di tutte le notifiche da questa app, indipendentemente dal tipo. Puoi regolare il tipo di notifica da ricevere dopo aver attivato le impostazioni di notifica.</string>
-    <string name="notification_settings_master_off_title">Per ricevere le notifiche su questo dispositivo, attivare le impostazioni di notifica.</string>
-    <string name="notification_settings_master_hint_off">Attiva notifiche</string>
-    <string name="notification_settings_master_hint_on">Disabilita notifiche</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_status_on">On</string>
+    <string name="notification_settings_main_off_message">La disattivazione delle impostazioni delle notifiche causerà la disabilitazione di tutte le notifiche da questa applicazione, indipendentemente dal tipo. Puoi regolare il tipo di notifica da ricevere dopo aver attivato le impostazioni delle notifiche.</string>
+    <string name="notification_settings_main_off_title">Per ricevere le notifiche su questo dispositivo, attiva le impostazioni delle notifiche.</string>
+    <string name="notification_settings_main_hint_off">Attiva notifiche</string>
+    <string name="notification_settings_main_hint_on">Disabilita notifiche</string>
+    <string name="notification_settings_main_status_off">Disattivato</string>
+    <string name="notification_settings_main_status_on">Attivo</string>
     <string name="max_video_resolution">Dimensione video massima</string>
     <string name="max_thumbnail_px_size">Dimensione immagine massima</string>
     <string name="error_upload_post_media_param">Si è verificato un errore durante il caricamento dell\'elemento multimediale in questo articolo: %s.</string>
@@ -1591,7 +1940,6 @@ Language: it
     <string name="login_site_address_more_help">Hai bisogno di ulteriore aiuto?</string>
     <string name="login_site_address_help_content">L\'indirizzo del tuo sito viene visualizzato sulla barra degli indirizzi nella parte superiore dello schermo quando visiti il tuo sito su Chrome.</string>
     <string name="login_site_address_help_title">Qual è l\'indirizzo del mio sito?</string>
-    <string name="login_site_address_help">Hai bisogno di aiuto per trovare l\'indirizzo del tuo sito?</string>
     <string name="login_site_address">Indirizzo sito</string>
     <string name="enter_site_address">Immetti l\'indirizzo del sito WordPress che desideri connettere.</string>
     <string name="login_already_logged_in_wpcom">Hai già effettuato l\'accesso a WordPress.com</string>
@@ -1603,7 +1951,6 @@ Language: it
     <string name="requesting_otp">Richiesta codice di verifica tramite SMS.</string>
     <string name="login_text_otp">Inviami invece un messaggio con un codice</string>
     <string name="enter_verification_code">Ci sei quasi! Inserisci il codice di verifica dalla tua app di autenticazione.</string>
-    <string name="open_mail">Apri email</string>
     <string name="next">Successivo</string>
     <string name="enter_email_wordpress_com">Accedi a WordPress.com utilizzando un indirizzo email per gestire tutti i tuoi siti WordPress.com.</string>
     <string name="image_optimization_promo_desc">L\'ottimizzazione dell\'immagine restringe l\'immagine per un caricamento più veloce.\n\nPuoi modificare questa opzione in qualsiasi momento nelle impostazioni del sito.</string>
@@ -1626,17 +1973,13 @@ Language: it
     <string name="post_status_draft">Bozza</string>
     <string name="post_status_pending_review">In attesa di revisione</string>
     <string name="post_status_publish_post">Pubblica</string>
-    <string name="change_location">Cambia posizione</string>
-    <string name="remove_location">Rimuovi posizione</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Impossibile aprire Location Picker, Google Play Services non è disponibile</string>
-    <string name="post_settings_location">Posizione</string>
     <string name="now">Ora</string>
     <string name="post_settings_password_dialog_hint">Solo chi conosce questa password può visualizzare l\'articolo</string>
     <string name="post_settings_excerpt_dialog_hint">Gli estratti sono riepiloghi opzionali dei tuoi contenuti creati manualmente.</string>
-    <string name="post_settings_slug_dialog_hint">L\'abbreviazione è la versione URL friendly del titolo dell\'articolo.</string>
+    <string name="post_settings_slug_dialog_hint">Lo slug è la versione URL friendly del titolo dell\'articolo.</string>
     <string name="post_settings_post_format">Formato articoli</string>
-    <string name="post_settings_tags">tag</string>
-    <string name="post_settings_slug">Abbreviazione</string>
+    <string name="post_settings_tags">Tag</string>
+    <string name="post_settings_slug">Slug</string>
     <string name="post_settings_excerpt">Riassunto</string>
     <string name="post_settings_not_set">Non impostato</string>
     <string name="post_settings_more_options">Altre opzioni</string>
@@ -1813,7 +2156,7 @@ Language: it
     <string name="signout">Uscire</string>
     <string name="sign_in_wpcom">Accedere a WordPress.com</string>
     <string name="reader_label_global_related_posts">saperne di più su WordPress.com</string>
-    <string name="reader_label_local_related_posts">Per saperne di più %s</string>
+    <string name="reader_label_local_related_posts">Ulteriori informazioni da %s</string>
     <string name="preference_open_device_settings">Accedere alle impostazioni del device</string>
     <string name="invite_invalid_email">%s: email non valida</string>
     <string name="invite_user_blocked_invites">%s: email non valida</string>
@@ -1861,20 +2204,16 @@ Language: it
     <string name="invite_error_invalid_usernames_multiple">Non è possibile inviare l\'email: ci sono dei nomi utente o degli indirizzi non validi.</string>
     <string name="invite_error_invalid_usernames_one">Non è possibile inviare l\'email: c\'è un nomi utente o un indirizzo non valido. </string>
     <string name="invite_error_no_usernames">Aggiungi almeno un nome utente</string>
-    <string name="invite_message_info">(facoltativo) Puoi inserire un messaggio personalizzato di massimo 500 caratteri che verrà inserito nell\'invito a/agli utente/i.</string>
-    <string name="invite_message_remaining_other">%d caratteri rimanenti</string>
-    <string name="invite_message_remaining_one">1 carattere rimanente</string>
-    <string name="invite_message_remaining_zero">0 caratteri rimanenti</string>
     <string name="invite_message_title">Messaggio personalizzato</string>
     <string name="invite">Invita</string>
-    <string name="invite_names_title">Nomi utente o email</string>
+    <string name="invite_names_title">Nome utente o e-mail</string>
     <string name="invite_people">Invita delle persone</string>
     <string name="my_site_header_external">Esterno</string>
-    <string name="send_link">Invia link</string>
     <string name="label_clear_search_history">Pulisci lo storico della ricerca</string>
     <string name="dlg_confirm_clear_search_history">Pulire lo storico della ricerca?</string>
     <string name="reader_empty_search_description">Nessun articolo trovato nella tua lingua riguardante %s</string>
     <string name="reader_hint_post_search">Cerca in WordPress</string>
+    <string name="reader_title_related_post_detail">Articoli correlati</string>
     <string name="preview_screen_links_disabled">I link sono disabilitati nella schermata di anteprima</string>
     <string name="send">Invia</string>
     <string name="person_removed">\@%1$s è stato rimosso correttamente</string>
@@ -1893,7 +2232,6 @@ Language: it
     <string name="checking_email">Verifica della email</string>
     <string name="magic_link_unavailable_error_message">Attualmente non disponibile. Inserisci la tua password</string>
     <string name="logging_in">Sto entrando</string>
-    <string name="enter_your_password_instead">Oppure inserisci la tua password</string>
     <string name="web_address_dialog_hint">Mostrato pubblicamente quando si commenta.</string>
     <string name="capture_or_pick_photo">Catturare o selezionare una foto</string>
     <string name="plans">Piani</string>
@@ -2014,7 +2352,7 @@ Language: it
     <string name="site_settings_paging_dialog_description">Suddividi il flusso dei commenti in più pagine.</string>
     <string name="site_settings_paging_dialog_header">Commenti per pagina</string>
     <string name="site_settings_close_after_dialog_title">Chiudi commenti</string>
-    <string name="site_settings_blacklist_description">Quando un commento contiene una di queste parole nel testo, nel nome, nell\'URL, nell\'email o nell\'IP, verrà contrassegnato come spam. Puoi inserire parzialmente le parole, per cui \"press\" corrisponderà a \"WordPress\".</string>
+    <string name="site_settings_denylist_description">Quando un commento contiene una di queste parole nel testo, nel nome, nell\'URL, nell\'e-mail o nell\'IP, verrà contrassegnato come spam. Puoi inserire parzialmente le parole, per cui \"press\" corrisponderà a \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Quando un commento contiene una di queste parole nel testo, nel nome, nell\'URL, nell\'email o nell\'IP, verrà inserito nella coda di moderazione. Puoi inserire parzialmente le parole, per cui \"press\" corrisponderà a \"WordPress\".</string>
     <string name="site_settings_list_editor_input_hint">Inserisci una parola o una frase</string>
     <string name="site_settings_list_editor_no_items_text">Nessun elemento</string>
@@ -2029,10 +2367,10 @@ Language: it
     <string name="site_settings_rp_show_header_title">Mostra l\'intestazione</string>
     <string name="site_settings_rp_switch_summary">Articoli correlati visualizza contenuti pertinenti del tuo sito sotto i tuoi articoli.</string>
     <string name="site_settings_rp_switch_title">Mostra gli articoli correlati</string>
-    <string name="site_settings_blacklist_hint">I commenti che corrispondono a un filtro vengono contrassegnati come spam</string>
+    <string name="site_settings_denylist_hint">I commenti che corrispondono a un filtro vengono contrassegnati come spam</string>
     <string name="site_settings_moderation_hold_hint">I commenti che corrispondono a un filtro vengono inseriti nella coda di moderazione</string>
     <string name="site_settings_multiple_links_hint">Ignora limite di link da utenti conosciuti</string>
-    <string name="site_settings_whitelist_hint">L\'autore del commento deve avere un commento già approvato in precedenza</string>
+    <string name="site_settings_allowlist_hint">L\'autore del commento deve avere un commento già approvato in precedenza</string>
     <string name="site_settings_user_account_required_hint">Gli utenti devono essere registrati ed aver effettuato l\'accesso per poter inviare commenti</string>
     <string name="site_settings_identity_required_hint">L\'autore del commento deve inserire nome e indirizzo email</string>
     <string name="site_settings_paging_hint">Visualizza commenti in parti di dimensioni specifiche</string>
@@ -2055,17 +2393,16 @@ Language: it
     <string name="site_settings_address_hint">La modifica dell\'indirizzo non è attualmente supportata</string>
     <string name="site_settings_tagline_hint">Una breve descrizione o una frase accattivante per descrivere il tuo blog</string>
     <string name="site_settings_title_hint">Spiega in poche parole l\'argomento del sito</string>
-    <string name="site_settings_whitelist_known_summary">Commenti da utenti conosciuti</string>
-    <string name="site_settings_whitelist_all_summary">Commenti da tutti gli utenti</string>
+    <string name="site_settings_allowlist_known_summary">Commenti da utenti conosciuti</string>
+    <string name="site_settings_allowlist_all_summary">Commenti da tutti gli utenti</string>
     <string name="site_settings_threading_summary">%d livelli</string>
     <string name="site_settings_privacy_private_summary">Privato</string>
     <string name="site_settings_privacy_hidden_summary">Nascosto</string>
     <string name="site_settings_privacy_public_summary">Pubblico</string>
     <string name="site_settings_delete_site_title">Elimina sito</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
     <string name="site_settings_moderation_hold_title">Sottoponi a moderazione</string>
     <string name="site_settings_multiple_links_title">Link nei commenti</string>
-    <string name="site_settings_whitelist_title">Approva automaticamente</string>
+    <string name="site_settings_allowlist_title">Approva automaticamente</string>
     <string name="site_settings_paging_title">Paginazione</string>
     <string name="site_settings_threading_title">Flusso</string>
     <string name="site_settings_sort_by_title">Ordina per</string>
@@ -2132,7 +2469,7 @@ Language: it
     <string name="notifications_empty_comments">Nessun commento per ora</string>
     <string name="notifications_empty_unread">Tutto è completamente aggiornato!</string>
     <string name="reader_short_comment_count_multi">%s commenti</string>
-    <string name="reader_short_comment_count_one">1 Commento</string>
+    <string name="reader_short_comment_count_one">1 commento</string>
     <string name="reader_hint_comment_on_post">Rispondi all’articolo…</string>
     <string name="reader_discover_visit_blog">Visite %s</string>
     <string name="reader_discover_attribution_blog">Pubblicato originariamente su %s</string>
@@ -2214,7 +2551,6 @@ Language: it
     <string name="logs_copied_to_clipboard">I log dell\'applicazione sono stati copiati negli appunti</string>
     <string name="reader_empty_posts_in_blog">Questo sito è vuoto</string>
     <string name="reader_label_new_posts">Nuovi articoli</string>
-    <string name="reader_page_recommended_blogs">Siti che potrebbero piacerti</string>
     <string name="error_copy_to_clipboard">Si è verificato un errore durante la copia del testo negli appunti</string>
     <string name="post_uploading">Caricamento dell\'articolo</string>
     <string name="stats_followers_years">%1$d anni</string>
@@ -2279,7 +2615,6 @@ Language: it
     <string name="reader_title_blog_preview">Reader del sito</string>
     <string name="ssl_certificate_ask_trust">Se in genere ti connetti al sito senza problemi, questo errore potrebbe significare che qualcuno sta tentando di impersonare il sito, pertanto non dovresti continuare. Desideri comunque confermare l\'affidabilità del certificato?</string>
     <string name="ssl_certificate_error">Certificato SSL non valido</string>
-    <string name="forgot_password">Password dimenticata?</string>
     <string name="help">Aiuto</string>
     <string name="username_or_password_incorrect">Il nome utente o la password immessi non sono corretti</string>
     <string name="email_invalid">Inserisci un indirizzo email valido</string>
@@ -2445,7 +2780,7 @@ Language: it
     <string name="quickpress_add_error">Il nome breve non può essere vuoto</string>
     <string name="pages_private">Privato</string>
     <string name="title">Titolo</string>
-    <string name="tags_separate_with_commas">Separa i tag con una virgola</string>
+    <string name="tags_separate_with_commas">Separa i tag con delle virgole</string>
     <string name="categories">Categorie</string>
     <string name="dlg_deleting_comments">Eliminazione commenti</string>
     <string name="sdcard_title">Scheda SD necessaria</string>
diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml
index 446d9521926b..ebea312beaa8 100644
--- a/WordPress/src/main/res/values-ja/strings.xml
+++ b/WordPress/src/main/res/values-ja/strings.xml
@@ -1,73 +1,544 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-08 13:28:24+0000
+Translation-Revision-Date: 2021-05-06 06:06:03+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/3.0.0-alpha.2
 Language: ja_JP
 -->
 <resources>
-    <string name="gutenberg_native_select_item">項目を選択</string>
+    <string name="gutenberg_native_audio_settings">音声設定</string>
+    <string name="gutenberg_native_image_settings">画像設定</string>
+    <string name="gutenberg_native_size">サイズ</string>
+    <string name="user_profile_bottom_sheet_description">ユーザープロフィールボトムシート情報</string>
+    <string name="user_profile_site_section_header">サイト</string>
+    <string name="user_profile_untitled_site">(無題)</string>
+    <string name="likes_list_screen_title">いいねリスト%s</string>
+    <string name="gutenberg_native_write_code">コードを入力…</string>
+    <string name="gutenberg_native_sorting_and_filtering">並べ替えと絞り込み</string>
+    <string name="gutenberg_native_show_download_button">ダウンロードボタンを表示</string>
+    <string name="gutenberg_native_shortcode">ショートコード</string>
+    <string name="gutenberg_native_read_more">続きを読む</string>
+    <string name="gutenberg_native_post_content_settings">投稿コンテンツ設定</string>
+    <string name="gutenberg_native_post_meta_settings">投稿メタ設定</string>
+    <string name="gutenberg_native_preload">先読み</string>
+    <string name="gutenberg_native_media_area">メディアエリア</string>
+    <string name="gutenberg_native_media_file">メディアファイル</string>
+    <string name="gutenberg_native_metadata">メタデータ</string>
+    <string name="gutenberg_native_loop">ループ</string>
+    <string name="gutenberg_native_link_to_12d6f96a">リンク先</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">ギャラリー内の画像%1$d件中%2$d件</string>
+    <string name="gutenberg_native_heading_d">見出し%d</string>
+    <string name="gutenberg_native_featured">おすすめ</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">埋め込む URL をここに入力…</string>
+    <string name="gutenberg_native_edit_image">画像を編集</string>
+    <string name="gutenberg_native_display_post_date">投稿日を表示</string>
+    <string name="gutenberg_native_change_heading_level">見出しレベルを変更</string>
+    <string name="gutenberg_native_code">ソースコード</string>
+    <string name="gutenberg_native_browser_default">ブラウザーのデフォルト設定</string>
+    <string name="gutenberg_native_attachment_page">添付ファイルのページ</string>
+    <string name="gutenberg_native_auto">自動</string>
+    <string name="gutenberg_native_autoplay">自動再生</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">ブロックは、ブロック自身の内部でレンダリングできません。</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">ブロックは削除されたか、利用できません。</string>
+    <string name="gutenberg_native_add_text">テキストを追加…</string>
+    <string name="gutenberg_native_add_caption">キャプションを追加</string>
+    <string name="gutenberg_native_what_is_alt_text">代替テキストとは ?</string>
+    <string name="gutenberg_native_transform_block">ブロックを変換…</string>
+    <string name="gutenberg_native_transform_s_to">%sを変換:</string>
+    <string name="gutenberg_native_failed_to_insert_media">メディアの挿入に失敗しました。</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">音声ファイルの挿入に失敗しました。</string>
+    <string name="like_faces_error_loading_message">「いいね」データの読み込みに失敗しました。%s。</string>
+    <string name="like_title_plural">%d個の「いいね」</string>
+    <string name="like_faces_singular_text">1人のブロガーが「いいね」をつけました。</string>
+    <string name="like_faces_plural_text">%d人のブロガーが「いいね」をつけました。</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">画像の目的を説明してください。画像が純粋に装飾的なものの場合は、空のままにします。</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$sを%2$sに変換しました</string>
+    <string name="suggestion">提案:</string>
+    <string name="like_title_singular">1個の「いいね」</string>
+    <string name="threat_fix_enter_server_creds_message_plural">脅威を修正するにはサーバーの認証情報を入力してください。</string>
+    <string name="threat_fix_enter_server_creds_message_singular">脅威を修正するにはサーバーの認証情報を入力してください。</string>
+    <string name="gutenberg_native_search_blocks">検索ブロック</string>
+    <string name="gutenberg_native_search_block">検索ブロック</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">ダブルタップして単位を変更</string>
+    <string name="gutenberg_native_clear_search">検索をクリア</string>
+    <string name="gutenberg_native_cancel_search">検索をキャンセル</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$sです。%2$sは%3$s %4$sです。</string>
+    <string name="get_likes_empty_state_title">「いいね」データの取得中にエラーが発生</string>
+    <string name="get_likes_unknown_error">「いいね」の取得中に不明なエラーが発生しました。</string>
+    <string name="get_likes_no_network_error">利用可能なネットワークがありません。</string>
+    <string name="comments_empty_list_filtered_unreplied">未返信のコメント</string>
+    <string name="comment_status_unreplied">未返信</string>
+    <string name="gutenberg_native_table_of_contents">目次</string>
+    <string name="gutenberg_native_summary">要約</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">見出しリストを使って投稿を要約します。ここにリンクするには、見出しブロックに HTML アンカーを追加してください。</string>
+    <string name="gutenberg_native_document_outline">文書アウトライン</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="site_settings_denylist_title">禁止コメント</string>
+    <string name="jetpack_brute_force_allowlist_title">常時許可 IP アドレス</string>
+    <string name="reader_title_interests">トピックをフォロー</string>
+    <string name="stories_intro_main_subtitle">心をつかむコンテンツを作り、サイトで公開する新しい方法。</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">非表示</string>
+    <string name="activity_log_backup_download_notice_download_action">ダウンロード</string>
+    <string name="threat_fix_all_status_success_message_plural">脅威の修正に成功しました。</string>
+    <string name="scan_idle_threats_description_plural">スキャンで %2s に%1s個の潜在的な脅威が見つかりました。 以下の内容を確認して操作するか、すべて修正ボタンをタップしてください。 必要な場合は、%3$sにご連絡ください。</string>
+    <string name="threat_fix_all_confirmation_message_plural">%s件のアクティブな脅威を修正してもよければ確認してください。</string>
+    <string name="scan_fixing_threats_description_plural">現在バックグラウンドでこれらの脅威を修正しています。その間、通常通りサイトを使用し、いつでも進行状況を確認できます。</string>
+    <string name="gutenberg_native_edit_focal_point">焦点を編集</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">サイトの名前を入力してください</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;全タスク完了&lt;/b&gt;&lt;br/&gt;より多くの人に発信できるでしょう。素晴らしいです !</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">ダブルタップして「ボトムシート」を開き、画像を編集、置換、クリアする</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">ダブルタップして「アクションシート」を開き、画像を編集、置換、クリアする</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;全タスク完了&lt;/b&gt;&lt;br/&gt;サイトをカスタマイズしました。いい感じです !</string>
+    <string name="magic_link_not_meaning_to_create_account">新しいアカウントを作成しない場合は、 戻ってメールアドレスを再度入力してください。</string>
+    <string name="invite_links_disable_dialog_message">招待リンクを無効化すると、このリンクを使用してチームに参加できなくなります。本当に実行しますか ?</string>
+    <string name="quick_start_card_menu_hide">今は非表示にする</string>
+    <string name="invite_links_disable_dialog_title">招待リンクを無効化</string>
+    <string name="invite_links_bad_format_response">無効な応答を受信しました</string>
+    <string name="invite_links_null_response">応答がありませんでした</string>
+    <string name="invite_links_helper_text">このリンクを使用すると、チームメンバーを1人ずつではなく一括で招待できます。 {{strong}}この URL にアクセスすると、だれでも組織に登録されます。{{/strong}}リンクをだれから受け取ったかは関係ないため、信頼できる人と共有するようにしてください。</string>
+    <string name="invite_links_generic_get_data_error">招待リンクデータの取得中に不明なエラーが発生しました</string>
+    <string name="invite_links_cannot_get_roles_error">権限グループの取得中にエラーが発生しました</string>
+    <string name="invite_links_cannot_get_role_data_error">権限グループ「%1$s」のデータ取得中にエラーが発生しました</string>
+    <string name="invite_links_disable_invite_link">招待リンクを無効化</string>
+    <string name="invite_links_share_invite_link">招待リンクを共有</string>
+    <string name="invite_links_generate">新規リンクを作成</string>
+    <string name="invite_links_get_status_retry">リンクのステータスを更新</string>
+    <string name="invite_links_section_title">招待リンク</string>
+    <string name="invite_links_expire_date">%1$sに期限切れ</string>
+    <string name="threats_found_singular">検出された脅威</string>
+    <string name="threats_found_plural">検出された脅威</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;スキャン完了&lt;/b&gt; &lt;br&gt;&lt;/br&gt; 1件の潜在的な脅威が見つかりました</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;スキャン完了&lt;/b&gt; &lt;br&gt;&lt;/br&gt;脅威は見つかりませんでした</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;スキャン完了&lt;/b&gt; &lt;br&gt;&lt;/br&gt; %s件の潜在的な脅威が見つかりました</string>
+    <string name="disable">無効化</string>
+    <string name="scan_fixing_threats_title_singular">脅威の修正</string>
+    <string name="quick_start_list_review_pages_subtitle">ページをチェックして変更を加えたり、ページを追加または削除したりしましょう。</string>
+    <string name="quick_start_card_menu_unpin">これを固定解除</string>
+    <string name="quick_start_list_view_site_title">サイトを表示</string>
+    <string name="quick_start_list_upload_icon_subtitle">センスのよいサイトアイコンを追加しましょう。</string>
+    <string name="quick_start_list_follow_site_subtitle">参考になるサイトを探してフォローしましょう。</string>
+    <string name="quick_start_list_enable_sharing_title">シェアを有効化</string>
+    <string name="quick_start_list_enable_sharing_subtitle">新しい投稿を自分のソーシャルメディアと自動的に共有しましょう。</string>
+    <string name="quick_start_list_update_site_title_subtitle">サイトにその特徴とトピックがわかるような名前を付けてください。</string>
+    <string name="quick_start_list_check_stats_title">統計情報を確認</string>
+    <string name="backup_download_status_failure_bullet2">ダウンロード可能なバックアップファイルの作成を試みます。</string>
+    <string name="backup_download_status_failure_bullet1">ダウンロード可能なバックアップにかかる時間を示すステータスが見つかりませんでした。</string>
+    <string name="backup_download_status_failure_heading">ダウンロード可能なバックアップのステータスが見つかりませんでした</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">チェックマークアイコン</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">時計アイコン</string>
+    <string name="restore_status_failure_bullet3">終了時には通知が表示されます。</string>
+    <string name="restore_status_failure_bullet2">引き続きサイトの復元を試みています。</string>
+    <string name="restore_status_failure_bullet1">復元にかかる時間を示すステータスが見つかりませんでした。</string>
+    <string name="restore_status_failure_heading">復元のステータスが見つかりませんでした</string>
+    <string name="restore_complete_failed_description">サイトを復元できませんでした</string>
+    <string name="restore_warning_action_button">確認</string>
+    <string name="restore_warning_description_with_two_parameters">お使いのサイトを%2$sの%1$sに戻しますか ?\n        それ以降の変更はすべて失われます。</string>
+    <string name="backup_download_complete_failed_description">バックアップを作成できませんでした</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(テーマ、プラグイン、アップロードを除く)</string>
+    <string name="backup_item_contents">WP-content ディレクトリ</string>
+    <string name="backup_item_roots">WordPress ルート</string>
+    <string name="backup_download_details_choose_items_header">このダウンロードに含まれるアイテム</string>
+    <string name="gutenberg_native_uploading">アップロード中…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">WordPress for iOS では再利用可能ブロックを編集できません</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">WordPress for Android では再利用可能ブロックを編集できません</string>
+    <string name="gutenberg_native_replace_file">ファイルを置換</string>
+    <string name="gutenberg_native_replace_audio">音声ファイルを置換</string>
+    <string name="gutenberg_native_problem_opening_the_audio">音声を開く際にエラーが発生しました</string>
+    <string name="gutenberg_native_open">開く</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">このリクエストを処理できるアプリケーションはありません。</string>
+    <string name="gutenberg_native_lock_icon">錠のアイコン</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">音声ファイルの挿入に失敗しました。 タップすると、オプションが表示されます。</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">ダブルタップして音声ファイルを選択</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">ダブルタップして音声ファイルを再生</string>
+    <string name="gutenberg_native_choose_audio">音声ファイルを選択</string>
+    <string name="gutenberg_native_audio_player">音声プレーヤー</string>
+    <string name="gutenberg_native_audio_file">音声ファイル</string>
+    <string name="gutenberg_native_audio_caption_s">音声キャプション。 %s</string>
+    <string name="gutenberg_native_audio_caption_empty">音声キャプション。 空</string>
+    <string name="gutenberg_native_add_audio">音声を追加</string>
+    <string name="continue_with_wpcom">WordPress.com でログインまたは登録</string>
+    <string name="photo_picker_use_audio">この音声を使用</string>
+    <string name="photo_picker_choose_audio">端末から音声を選択</string>
+    <string name="people_optional_custom_message_helper_text">オプション: 招待状と一緒に送信するカスタムメッセージを入力します。</string>
+    <string name="people_learn_more_about_roles">権限グループの詳細</string>
+    <string name="threat_status_fixed">固定</string>
+    <string name="threat_found_header">検出</string>
+    <string name="scan_here_to_help">サポートはこちら</string>
+    <string name="scan_idle_threats_description_singular">スキャンで %1$s に1個の潜在的な脅威が見つかりました。 以下の内容を確認して操作するか、すべて修正ボタンをタップしてください。 必要な場合は、%2$sにご連絡ください。</string>
+    <string name="scan_idle_manual_scan_description">サイトを再度確認するには、手動スキャンを実行するか、本日中に行われる Jetpack のサイトスキャンをお待ちください。</string>
+    <string name="scan_provisioning_description">Jetpack Scan へようこそ ! お客様のサイトを調査し、フルスキャンを実行するための設定を行います。 スキャンに影響する可能性のある問題を見つけたらお知らせします。その後、最初のフルスキャンが開始されます。</string>
+    <string name="scan_scanning_is_initial_description">Jetpack Scan へようこそ。現在サイトの初回チェックを行っており、結果はすぐに表示されます。</string>
+    <string name="scan_scanning_description">スキャンが完了したら、通知が送信されます。 その間、通常通りサイトを使用し、いつでも進行状況を確認できます。</string>
+    <string name="scan_fixing_threats_description_singular">バックグラウンドでこの脅威を修正しています。 その間、通常通りサイトを使用し、いつでも進行状況を確認できます。</string>
+    <string name="scan_fixing_threats_title_plural">脅威の修正</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan はサイトのスキャンを完了できませんでした。 サイトがダウンしていないか確認してください。ダウンしていない場合、再度実行してください。 ダウンしている場合、または Jetpack Scan に問題がある場合、サポートチームまでご連絡ください。</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">サイトのバックアップ</string>
+    <string name="activity_log_currently_backing_up_message">%1$s %2$sからサイトをバックアップしています</string>
+    <string name="activity_log_currently_backing_up_title">ダウンロード可能なバックアップの作成</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">サイトは正常にバックアップされました</string>
+    <string name="scan_request_failed_title">問題が発生しました</string>
+    <string name="activity_log_backup_finished_snackbar_message">サイトは正常にバックアップされました\n%1$s %2$sからバックアップ</string>
+    <string name="activity_log_backup_started_snackbar_message">サイトをバックアップしています\n%1$s %2$sからバックアップしています</string>
+    <string name="pick_audio">音声ファイルを選択</string>
+    <string name="restore_complete_failed_icon_content_description">エラーアイコン</string>
+    <string name="restore_complete_failed_action_button_content_description">完了ボタン</string>
+    <string name="restore_another_process_running">実行中の復元が他にあります。</string>
+    <string name="restore_complete_header">サイトを復元しました</string>
+    <string name="restore_complete_visit_site_button_content_description">サイトを表示ボタン</string>
+    <string name="restore_complete_visit_site_action_button">サイトを表示</string>
+    <string name="restore_complete_icon_content_description">復元アイコン</string>
+    <string name="restore_complete_failed_title">復元失敗</string>
+    <string name="restore_complete_done_button_content_description">完了ボタン</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_complete_description_with_two_parameters">選択したすべてのアイテムは %1$s %2$s に復元されました。</string>
+    <string name="restore_progress_footnote">お待ちいただく必要はありません。 サイトが完全に復元されたらお知らせします。</string>
+    <string name="restore_progress_icon_content_description">サイト復元アイコン</string>
+    <string name="restore_progress_header">現在サイトを復元中</string>
+    <string name="restore_warning_action_button_content_description">サイト復元確認ボタン</string>
+    <string name="restore_progress_description_with_two_parameters">サイトを %1$s %2$s に復元しています。</string>
+    <string name="restore_warning_header">警告</string>
+    <string name="restore_details_action_button_content_description">サイト復元ボタン</string>
+    <string name="restore_warning_icon_content_description">感嘆符付きの赤くて丸い画像</string>
+    <string name="restore_details_header">サイトを復元</string>
+    <string name="restore_details_action_button">サイトを復元</string>
+    <string name="restore_details_icon_content_description">復元アイコン</string>
+    <string name="restore">復元</string>
+    <string name="backup_download_complete_failed_action_button_content_description">完了ボタン</string>
+    <string name="backup_download_complete_failed_action_button">完了</string>
+    <string name="backup_download_complete_failed_icon_content_description">クラウドと X のアイコン</string>
+    <string name="restore_details_description_with_two_parameters">復元用ポイントとして%1$s %2$sを選択しています。</string>
+    <string name="restore_details_choose_items_header">復元するアイテムを選択:</string>
+    <string name="web_preview_tablet">タブレット</string>
+    <string name="web_preview_mobile">モバイル</string>
+    <string name="backup_download_complete_failed_title">ダウンロード失敗</string>
+    <string name="quick_start_card_menu_remove">二度と表示しない</string>
+    <string name="quick_start_dialog_review_pages_message_short">%1$s ページ %2$s を選択してページリストを表示します。</string>
+    <string name="quick_start_dialog_review_pages_message">サイトのページを変更、追加、削除します。</string>
+    <string name="quick_start_dialog_review_pages_title">サイトページをレビュー</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">%1$s ホームページ %2$s を選択してホームページを編集します。</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">%1$s ページ %2$s を選択してページリストを表示します。</string>
+    <string name="quick_start_card_menu_pin">上部固定</string>
+    <string name="quick_start_dialog_edit_homepage_title">ホームページを編集する</string>
+    <string name="quick_start_dialog_edit_homepage_message">サイトのホームページからコンテンツを変更、追加、削除します。</string>
+    <string name="reader_menu_mark_as_unseen">未読にする</string>
+    <string name="reader_menu_mark_as_seen">既読にする</string>
+    <string name="error_media_upload_failed_for_reason">メディアのアップロードに失敗しました。\n%1$s</string>
+    <string name="error_media_not_enough_storage">サイトのストレージが不足しています</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">この投稿の既読ステータスを切り替えられません</string>
+    <string name="reader_marked_post_as_unseen">投稿を未読にする</string>
+    <string name="reader_marked_post_as_seen">投稿を既読にする</string>
+    <string name="threat_fix_all_status_error_message">修正のステータスの取得中にエラーが発生しました。 サポートにご連絡ください。</string>
+    <string name="threat_fix_all_status_success_message_singular">脅威は正常に修正されました。</string>
+    <string name="threat_fix_all_error_message">脅威を修正する際にエラーが発生しました。 サポートにご連絡ください。</string>
+    <string name="threat_fix_all_confirmation_message_singular">1件のアクティブな脅威を修正してよろしいですか ?</string>
+    <string name="threat_ignore_success_message">脅威を無視しました。</string>
+    <string name="threat_fix_all_warning_title">すべての脅威を修正</string>
+    <string name="threat_ignore_error_message">脅威を無視する際にエラーが発生しました。 サポートにご連絡ください。</string>
+    <string name="threat_ignore_warning">安全であるという確信がない限り、セキュリティの問題を無視しないでください。 この脅威を無視した場合、この脅威はサイト &lt;b&gt;%s&lt;/b&gt; に残ります。</string>
+    <string name="threat_fix_error_message">脅威を修正する際にエラーが発生しました。 サポートにご連絡ください。</string>
+    <string name="threat_item_sub_header_status_ignored">脅威を無視しました</string>
+    <string name="scan_scanning_title">サイトをスキャン中</string>
+    <string name="scan_history">スキャン履歴</string>
+    <string name="scan_preparing_to_scan_title">スキャン準備中</string>
+    <string name="scan_history_no_threats_found">項目が見つかりませんでした</string>
+    <string name="scan_history_ignored_threats_tab">無視済み</string>
+    <string name="scan_history_menu_title">履歴</string>
+    <string name="threat_fixing">脅威を修正</string>
+    <string name="scan_history_fixed_threats_tab">固定</string>
+    <string name="scan_history_all_threats_tab">すべて</string>
+    <string name="backup_active_filter_empty_subtitle">期間を調整してみてください</string>
+    <string name="backup_active_filter_empty_title">一致するバックアップは見つかりませんでした</string>
+    <string name="threat_item_sub_header_status_fixed_on">次の日時に脅威を修正済み %s</string>
+    <string name="backup_empty_subtitle">初回のバックアップは24時間以内にここに表示され、バックアップが完了すると通知が送信されます</string>
+    <string name="backup_empty_title">最初のバックアップがもうすぐ完了します</string>
+    <string name="request_failed_message">リクエストの処理中に問題が発生しました。 後ほどもう一度お試しください。</string>
+    <string name="gutenberg_native_move_to_bottom">一番下へ</string>
+    <string name="gutenberg_native_change_block_position">ブロックの位置を変更</string>
+    <string name="label_control_upload">アップロード</string>
+    <string name="jetpack_icon_content_description">アイコン</string>
+    <string name="backup_download_complete_info">ファイルへのリンクはメールでも送信されました。</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">リンク共有ボタン</string>
+    <string name="backup_download_complete_download_action_button_content_description">ダウンロードボタン</string>
+    <string name="backup_download_complete_icon_content_description">ダウンロード可能なバックアップ準備済みアイコン</string>
+    <string name="backup_download_complete_download_share_action_button">リンクを共有</string>
+    <string name="backup_download_complete_download_action_button">ダウンロード</string>
+    <string name="backup_download_complete_description_with_two_parameters">%1$s %2$s からサイトのバックアップが正常に作成されました。</string>
+    <string name="backup_download_complete_header">バックアップをダウンロードする準備が整いました</string>
+    <string name="backup_download_complete_page_title">バックアップ</string>
+    <string name="backup_download_progress_icon_content_description">ダウンロード可能なバックアップを作成中アイコン</string>
+    <string name="backup_download_progress_description_with_two_parameters">%1$s %2$s からダウンロード可能なサイトのバックアップを作成中です。</string>
+    <string name="backup_download_progress_header">現在、サイトのダウンロード可能なバックアップを作成中です</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">お待ちいただく必要はありません。 バックアップが完了したら通知します。</string>
+    <string name="backup_download_progress_page_title">バックアップをダウンロードする</string>
+    <string name="backup_download_another_download_running">別のダウンロードを実行中です。</string>
+    <string name="backup_download_generic_failure">リクエストの処理中に問題が発生しました。 後ほど、もう一度お試しください。</string>
+    <string name="backup_download_details_action_button_content_description">ダウンロード可能なバックアップを作成ボタン</string>
+    <string name="backup_download_details_description_with_two_parameters">ダウンロード可能なバックアップを作成するタイミングとして、%1$s %2$s を選択しています。</string>
+    <string name="gutenberg_native_image_link_url">画像リンク URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">クロス投稿</string>
+    <string name="suggestion_user">ユーザー</string>
+    <string name="threat_get_free_estimate">無料の見積もりを受ける</string>
+    <string name="threat_ignore">脅威を無視する</string>
+    <string name="threat_fix">脅威を修正する</string>
+    <string name="threat_fix_fixable_default">Jetpack スキャンが脅威を解決します。</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan は影響を受けるファイルまたはディレクトリを編集します。</string>
+    <string name="threat_fix_fixable_update">Jetpack スキャンは新しいバージョン (%s) に更新されます。</string>
+    <string name="threat_fix_fixable_delete">Jetpack スキャンは影響を受けるファイルまたはディレクトリを削除します。</string>
+    <string name="suggestion_no_matching">一致する %s はありません。</string>
+    <string name="suggestion_problem">提案の読み込みに問題がありました。</string>
+    <string name="suggestion_none">利用できる %s の提案はありません。</string>
+    <string name="suggestion_selection_needed">おすすめリストをフィルターするには入力してください。</string>
+    <string name="threat_fix_fixable_replace">Jetpack スキャンは影響を受けるファイルまたはディレクトリを置き換えます。</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack スキャンは、この脅威を自動的に修正できません。\n 脅威を手動で解決することを推奨します : WordPress、テーマ、すべてのプラグインが最新であることを確認し、問題の原因となるコード、テーマ、プラグインをサイトから削除します。 \n \n\nこの脅威の解決においてさらにサポートが必要な場合は、厳選された WordPress エキスパートによる信頼性の高いフリーランス向けマーケットプレイス、&lt;b&gt;Codeable&lt;/b&gt; をおすすめします。\n これらのプロジェクトを支援するセキュリティエキスパートの厳選されたグループが登録されています。 価格は1時間あたり $70～120で、無料の見積もりを受けることができます。利用を開始する義務はありません。</string>
+    <string name="threat_fix_current_not_fixable_header">脅威の解決</string>
+    <string name="threat_fix_fixed_header">どのように Jetpack で修正されましたか ?</string>
+    <string name="threat_fix_default_header">修正方法</string>
+    <string name="threat_file_description">次のファイルで脅威が見つかりました :</string>
+    <string name="threat_technical_details_header">技術詳細</string>
+    <string name="threat_problem_header">問題は何でしたか ?</string>
+    <string name="threat_details">脅威の詳細</string>
+    <string name="threat_item_sub_header_file_signature">脅威を検出しました %s</string>
+    <string name="threat_item_sub_header_core_file">WordPress で脆弱性が見つかりました</string>
+    <string name="threat_item_sub_header_misc_vulnerability">様々な脆弱性</string>
+    <string name="threat_item_header_vulnerable_theme">脆弱なテーマ: %s (バージョン%s)</string>
+    <string name="threat_item_header_vulnerable_plugin">脆弱なプラグイン: %s (バージョン%s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: 不正なコードパターン</string>
+    <string name="threat_item_header_database_threat">データベース %s 脅威</string>
+    <string name="threat_item_sub_header_vulnerable_theme">テーマに脆弱性を発見</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">プラグインに脆弱性を発見</string>
+    <string name="threat_item_header_infected_core_file">%s: 感染したコアファイル</string>
+    <string name="threat_item_header_threat_found">脅威を検出しました</string>
+    <string name="threats_fix_all">すべて修正</string>
+    <string name="scan_in_minutes_ago">%s分前</string>
+    <string name="scan_in_hours_ago">%s時間前</string>
+    <string name="scan_this_site">このサイト</string>
+    <string name="scan_idle_last_scan_description">前回の Jetpack スキャンは%sに実行され、リスクは見つかりませんでした。 %s</string>
+    <string name="scan_in_few_seconds">数秒前</string>
+    <string name="scan_idle_no_threats_found_title">ご心配は無用です</string>
+    <string name="scan_again">再スキャン</string>
+    <string name="scan_now">今すぐスキャン</string>
+    <string name="scan_state_icon">スキャン状態のアイコン</string>
+    <string name="backup">バックアップ</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">アクティビティタイプフィルター (%sタイプが選択されています)</string>
+    <string name="scan_idle_threats_found_title">サイトが危険にさらされている可能性があります</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">アクティビティタイプフィルター</string>
+    <string name="activity_log_activity_type_empty_subtitle">選択した日付の間に記録されたアクティビティはありません。</string>
+    <string name="activity_log_activity_type_empty_title">アクティビティはありません</string>
+    <string name="activity_log_activity_type_error_subtitle">インターネット接続を確認し、もう一度お試しください。</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (%s項目を表示しています)</string>
+    <string name="activity_log_activity_type_error_title">接続できません</string>
+    <string name="activity_log_activity_type_filter_active_label">アクティビティタイプ (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">日付の範囲フィルター</string>
+    <string name="activity_log_active_filter_empty_subtitle">データ範囲またはアクティビティタイプフィルターを調整してみてください</string>
+    <string name="activity_log_active_filter_empty_title">一致するイベントは見つかりませんでした</string>
+    <string name="backup_item_media_uploads">メディアのアップロード</string>
+    <string name="backup_item_plugins">WordPress プラグイン</string>
+    <string name="backup_item_themes">WordPress テーマ</string>
+    <string name="backup_download_details_icon_content_description">ダウンロード可能なバックアップアイコンを作成</string>
+    <string name="backup_item_sqls">サイトデータベース</string>
+    <string name="backup_item_roots_hint">(wp-config.php と WordPress 以外のすべてのファイルを含む)</string>
+    <string name="backup_download_details_action_button">ダウンロード可能なファイルを作成</string>
+    <string name="backup_download_details_header">ダウンロード可能なバックアップを作成</string>
+    <string name="backup_download_details_page_title">バックアップをダウンロードする</string>
+    <string name="backup_download">バックアップのダウンロード</string>
+    <string name="gutenberg_native_error">エラー</string>
+    <string name="gutenberg_native_choose_file">ファイルを選択</string>
+    <string name="activity_log_item_menu_download_backup_label">バックアップをダウンロード</string>
+    <string name="activity_log_item_menu_restore_label">このポイントに復元</string>
+    <string name="activity_log_date_range_filter_label">日付の範囲</string>
+    <string name="activity_log_activity_type_filter_label">アクティビティタイプ</string>
+    <string name="activity_log_activity_type_filter_header">アクティビティタイプで絞り込み</string>
+    <string name="dialog_confirm_copy_local_copy_button">このアプリからバージョンをコピー</string>
+    <string name="dialog_confirm_copy_local_edit_button">最初に投稿を編集する</string>
+    <string name="dialog_confirm_copy_local_message">コピーしようとしている投稿に競合する2つのバージョンが存在するか、最近行った変更が保存されていません。\n競合を解消するには投稿を編集するか、このアプリからバージョンをコピーしてください。</string>
+    <string name="dialog_confirm_copy_local_title">同期後の競合</string>
+    <string name="button_copy">複製</string>
+    <string name="toast_edit_story_update_in_progress_title">ストーリーを保存中です。しばらくお待ちください…</string>
+    <string name="gutenberg_native_file_name">ファイル名</string>
+    <string name="gutenberg_native_file_block_settings">ファイルブロック設定</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">ファイルのアップロードに失敗しました。\nタップすると、オプションが表示されます。</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">ファイルの保存に失敗しました。\nタップすると、オプションが表示されます。</string>
+    <string name="gutenberg_native_edit_file">ファイルを編集</string>
+    <string name="gutenberg_native_copy_file_url">ファイルの URL をコピー</string>
+    <string name="gutenberg_native_choose_a_file">ファイルを選択</string>
+    <string name="new_site_creation_domain_header_title">ドメインを選択</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack 設定</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">この投稿のコメントをフォロー解除できませんでした</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">この投稿のコメントをフォローできませんでした</string>
+    <string name="reader_follow_comments_get_status_error">投稿の購読ステータスを取得中にエラーが発生しました</string>
+    <string name="reader_follow_comments_unsubscribe_success">コメントの購読を正常に解除しました</string>
+    <string name="reader_btn_follow_comments">メールで会話をフォロー</string>
+    <string name="reader_btn_following_comments">メールで会話をフォロー中</string>
+    <string name="reader_follow_comments_subscribe_success">コメントの購読を正常に登録しました</string>
+    <string name="reader_follow_comments_bad_format_response">無効な応答を受信しました</string>
+    <string name="reader_follow_comments_null_response">応答がありませんでした</string>
+    <string name="activity_log_activity_type_filter_clear">クリア</string>
+    <string name="activity_log_activity_type_filter_apply">適用</string>
+    <string name="dialog_edit_story_unsupported_format_message">1つ以上のスライドがストーリーに追加されていません。現在、ストーリーでは GIF ファイルがサポートされていないためです。 代わりに静的画像または動画の背景を選択してください。</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF ファイルはサポートされていません</string>
+    <string name="dialog_edit_story_unrecoverable_message">このストーリーのメディアがサイトにありませんでした。</string>
+    <string name="dialog_edit_story_unrecoverable_title">ストーリーを編集できません</string>
+    <string name="dialog_edit_story_unavailable_message">このストーリーのメディアを読み込めません。 ネットワーク接続を確認して、もう一度お試しください。</string>
+    <string name="dialog_edit_story_unavailable_title">ストーリーを編集できません</string>
+    <string name="dialog_edit_story_limited_message">このストーリーは別の端末で編集されており、特定のオブジェクトを編集する機能が制限される可能性があります。</string>
+    <string name="dialog_edit_story_limited_title">制限されたストーリー編集</string>
+    <string name="cannot_retry_deleted_media_item_fatal">メディアが削除されました。 ストーリーを再度作成してみてください。</string>
+    <string name="color_picker_label_background">背景</string>
+    <string name="color_picker_label_text">テキスト</string>
+    <string name="dialog_discard_story_ok_button_edit">保存しない</string>
+    <string name="dialog_discard_story_message_edit">行った変更はすべて保存されません。</string>
+    <string name="dialog_discard_story_title_edit">変更を破棄しますか ?</string>
+    <string name="label_done_button">終了</string>
+    <string name="label_next_button">次へ</string>
+    <string name="delete_button_alt">削除</string>
+    <string name="hpp_choose_error">デザインの選択中にエラーが発生しました。</string>
+    <string name="hpp_retry_error">ネットワーク接続を確認して、もう一度お試しください。</string>
+    <string name="hpp_error_subtitle">オンラインに戻ったら、「再試行」をタップします。</string>
+    <string name="hpp_error_title">レイアウトはオフラインでは利用できません</string>
+    <string name="continue_site_credentials">ストアのログイン情報で続ける</string>
+    <string name="login_find_your_connected_email">連携済みのメールアドレスを検索</string>
+    <string name="reader_discover_no_posts_button_text">トピックをフォロー</string>
+    <string name="reader_discover_no_posts_subtitle">もっと多くのトピックをフォローして、検索を広げてみてください</string>
+    <string name="reader_discover_no_posts_title">最近の投稿はありません</string>
+    <string name="reader_discover_empty_title">ようこそ !</string>
+    <string name="scan">スキャン</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; さんが投稿に返信しました</string>
+    <string name="login_prologue_third_subtitle_two">今日サイトで&lt;b&gt;50回「いいね」&lt;/b&gt;されました</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; さんが投稿に「いいね」しました</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">スクロール可能なブロックメニューが開きました。 ブロックを選択します。</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">スクロール可能なブロックメニューが閉じられました。</string>
+    <string name="hpp_skip_button">スキップ</string>
+    <string name="hpp_choose_button">選択</string>
+    <string name="hpp_subtitle">お気に入りのホームページのレイアウトを選択します。 後で編集およびカスタマイズできます。</string>
+    <string name="hpp_title">デザインを選択</string>
+    <string name="mlp_network_error_subtitle">オンラインに戻ったら「再試行」をタップするか、以下のボタンを使用して白紙のページを作成します。</string>
+    <string name="mlp_network_error_title">レイアウトはオフラインでは利用できません</string>
+    <string name="mlp_error_subtitle">「再試行」をタップするか、以下のボタンを使用して白紙のページを作成します。</string>
+    <string name="mlp_error_title">レイアウトがエラーにより利用できません</string>
+    <string name="prepublishing_nudges_add_category_button">カテゴリーを追加</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">新規カテゴリーを追加</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">カテゴリー</string>
+    <string name="prepublishing_nudges_home_categories_not_set">未設定</string>
+    <string name="prepublishing_nudges_categories_action">カテゴリー</string>
+    <string name="login_prologue_fifth_caption_three">ロンドンの博物館</string>
+    <string name="login_prologue_fifth_caption_two">世界最高のファン</string>
+    <string name="login_prologue_fifth_caption_one">私のお気に入りカフェトップ10</string>
+    <string name="login_prologue_fifth_tag_six">政治</string>
+    <string name="login_prologue_fifth_tag_five">ミュージック</string>
+    <string name="login_prologue_fifth_tag_four">園芸</string>
+    <string name="login_prologue_fifth_tag_three">フットボール</string>
+    <string name="login_prologue_fifth_tag_two">クッキング</string>
+    <string name="login_prologue_fifth_tag_one">アート</string>
+    <string name="login_prologue_fifth_subtitle_three">今週のロックンロール</string>
+    <string name="login_prologue_fifth_subtitle_two">ウェブニュース</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">写真家の Cameron Karsten 氏の作品にはとても感銘を受けました。 この技術を今度試すつもりです</string>
+    <string name="login_prologue_second_subtitle_one">インスピレーションを受ける</string>
+    <string name="login_prologue_title_fifth">お気に入りのサイトをフォローして新しい読み物を発見しましょう。</string>
+    <string name="login_prologue_title_fourth">詳細な分析により、オーディエンスの成長を見守れます。</string>
+    <string name="login_prologue_title_second">強力なエディターで、外出中も投稿できます。</string>
+    <string name="login_prologue_title_first">世界で最も人気のサイト構築サービスへようこそ。</string>
+    <string name="login_prologue_title_third">コメントと通知をリアルタイムで表示します。</string>
+    <string name="media_loading_failed">メディア読み込み失敗</string>
+    <string name="reader_discover_recommended_blogs_header">フォローするサイト</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">リリースごとにブロックを追加できるよう努めています。</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">「%s」は完全にはサポートされていません</string>
+    <string name="gutenberg_native_help_button">ヘルプボタン</string>
+    <string name="gutenberg_native_edit_using_web_editor">Web エディターを使って編集</string>
+    <string name="gutenberg_native_choose_images">画像を選択</string>
+    <string name="stories_intro_create_story_post_label">ストーリー投稿を作成</string>
+    <string name="stories_intro_description_second">新しいブログ投稿としてサイトに公開されるため、読者が見逃すことはありません。</string>
+    <string name="stories_intro_title_second">ストーリー投稿は消えません</string>
+    <string name="stories_intro_description_first">写真、動画、文章を組み合わせて、見た人が心をつかまれタップしたくなるような、好感を持たれるストーリー投稿を作ります。</string>
+    <string name="stories_intro_title_first">いまやストーリーはみなさんのためのものです</string>
+    <string name="stories_intro_image_caption_second">ストーリーのタイトルの例</string>
+    <string name="stories_intro_image_caption_first">ストーリー投稿の作り方</string>
+    <string name="stories_intro_main_title">ストーリー投稿の紹介</string>
+    <string name="mlp_notice_blank_page_created">空白ページが作成されました</string>
+    <string name="mlp_notice_page_created">ページが作成されました</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s は写真へのアクセスを拒否されました。 これを解決するには、権限を編集して%2$sと%3$sをオンにしてください。</string>
+    <string name="media_insert_failed">メディアの挿入に失敗しました。</string>
+    <string name="media_insert_failed_with_reason">メディアの挿入に失敗しました : %s</string>
+    <string name="photo_picker_wordpress_media_library">WordPress メディアライブラリから選択</string>
+    <string name="reader_label_toolbar_back">戻る</string>
+    <string name="reader_discover_empty_button_text">今すぐ始める</string>
+    <string name="reader_discover_empty_subtitle">トピックをフォローして新しいブログを見つける</string>
+    <string name="reader_post_details_header_by_author_name">By</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">このリファラーはスパムとしてマークできません</string>
+    <string name="stats_referrer_popup_unmark_as_spam">スパムとしてのマークを解除</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">スパムとしてマーク</string>
+    <string name="stats_referrer_popup_menu_open_website">サイトを開く</string>
+    <string name="media_uploading_gif_library_photo">GIF メディアをアップロード中</string>
+    <string name="media_uploading_stock_library_photo">ストックメディアをアップロード中</string>
+    <string name="media_uploading_default">メディアをアップロード中</string>
     <string name="gutenberg_native_search_or_type_url">検索または URL を入力</string>
+    <string name="gutenberg_native_select_item">項目を選択</string>
+    <string name="gutenberg_native_page_break">改ページ</string>
     <string name="gutenberg_native_add_this_telephone_link">この電話リンクを追加</string>
-    <string name="gutenberg_native_add_this_link">このリンクを追加</string>
     <string name="gutenberg_native_add_this_email_link">このメールリンクを追加</string>
-    <string name="suggestion_no_connection">「インターネットに接続できません。\n提案は利用できません。」</string>
-    <string name="typeface_label_shrikhand">太字</string>
-    <string name="typeface_label_space_mono">モダン</string>
-    <string name="typeface_label_pacifico">プレイフル</string>
+    <string name="gutenberg_native_add_this_link">このリンクを追加</string>
+    <string name="suggestion_no_connection">インターネットに接続していません。\n提案が利用できません。</string>
     <string name="typeface_label_oswald">強調</string>
-    <string name="typeface_label_libre_baskerville">クラシック</string>
+    <string name="typeface_label_pacifico">プレイフル</string>
+    <string name="typeface_label_space_mono">モダン</string>
     <string name="typeface_label_nunito">カジュアル</string>
-    <string name="toast_capture_operation_permission_needed">動画を録画するには、アプリに音声録音の権限を付与する必要があります</string>
+    <string name="typeface_label_libre_baskerville">クラシック</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%sを選択済み</string>
-    <string name="login_get_link_by_email">ログインリンクをメールで取得</string>
-    <string name="email_not_registered_wpcom">このメールアドレスに紐付けられている WordPress.com アカウントが見つかりません</string>
-    <string name="permission_microphone">マイク</string>
+    <string name="toast_capture_operation_permission_needed">動画を録画するには、アプリに音声録音の権限を付与する必要があります</string>
+    <string name="typeface_label_shrikhand">太字</string>
     <string name="comment_unable_to_show_error">このコメントを表示できません</string>
+    <string name="permission_microphone">マイク</string>
+    <string name="login_get_link_by_email">ログインリンクをメールで取得</string>
     <string name="media_browse_for_items">項目を閲覧</string>
+    <string name="email_not_registered_wpcom">このメールアドレスに紐付けられている WordPress.com アカウントが見つかりません。</string>
     <string name="reader_menu_report_post">この投稿を報告</string>
-    <string name="gutenberg_native_angle">角度</string>
-    <string name="reader_welcome_banner">Reader へようこそ。何百万ものブログの中から、お気に入りを発見しましょう。</string>
     <string name="error_media_xmlrcp_server_error">内部サーバーエラーが発生しました</string>
     <string name="error_media_xmlrpc_not_allowed">操作は許可されていません</string>
     <string name="show_n_hidden_items_desc">%1$s 件のアイテムをさらに表示</string>
+    <string name="reader_welcome_banner">Reader へようこそ。何百万ものブログの中から、お気に入りを発見しましょう。</string>
     <string name="gutenberg_native_select_a_layout">レイアウトを選択</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">注: カラムのレイアウトはテーマ、画面サイズによって異なります</string>
-    <string name="create_post_story_fab_tooltip">投稿またはストーリーを作成</string>
-    <string name="create_page_fab_tooltip">ページを作成</string>
     <string name="create_post_fab_tooltip">投稿を作成</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">おすすめ</string>
+    <string name="create_page_fab_tooltip">ページを作成</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">非表示</string>
+    <string name="reader_discover_interests_header">おすすめ</string>
+    <string name="create_post_story_fab_tooltip">投稿またはストーリーを作成</string>
     <string name="gutenberg_native_video_caption_empty">動画の見出しです。 空にする</string>
     <string name="gutenberg_native_updates_the_title">タイトルを更新します。</string>
     <string name="gutenberg_native_paste_block_after">ページタイトルの後に</string>
     <string name="gutenberg_native_page_title_s">ブロックを貼り付けます。 %s</string>
     <string name="gutenberg_native_page_title_empty">ページタイトル。 空にする</string>
     <string name="toast_error_playing_video">動画再生時にエラーが発生しました</string>
-    <string name="camera_error">この端末は Camera2 API をサポートしていません。</string>
     <string name="toast_error_saving_video">動画を保存できませんでした</string>
     <string name="toast_error_saving_image">画像を保存する際にエラーが発生しました</string>
     <string name="toast_capture_operation_in_progress">操作が進行中です。再度お試しください</string>
     <string name="toast_story_page_not_found">ストーリースライドが見つかりませんでした</string>
     <string name="dialog_insufficient_device_storage_error_ok_button">ストレージを表示</string>
-    <string name="dialog_insufficient_device_storage_error_message">公開する前に端末にストーリーを保存する必要があります。ストレージ設定を確認し、ファイルを削除してスペースを空けてください。</string>
-    <string name="dialog_insufficient_device_storage_error_title">端末のストレージ容量が足りません</string>
+    <string name="camera_error">この端末は Camera2 API をサポートしていません。</string>
     <string name="dialog_story_saving_error_message">スライドの保存または削除を再度試してから、ストーリーの公開を再度試してみてください。</string>
     <string name="dialog_story_saving_error_title_plural">%1$dつのスライドを保存できません</string>
     <string name="dialog_story_saving_error_title_singular">1つのスライドを保存できません</string>
     <string name="story_saving_failed_quick_action_manage">管理</string>
     <string name="story_saving_failed_message_plural">%1$d つのスライドで操作が必要です</string>
     <string name="story_saving_failed_message_singular">1つのスライドで操作が必要です</string>
+    <string name="dialog_insufficient_device_storage_error_title">端末のストレージ容量が足りません</string>
+    <string name="dialog_insufficient_device_storage_error_message">公開する前に端末にストーリーを保存する必要があります。ストレージ設定を確認し、ファイルを削除してスペースを空けてください。</string>
     <string name="story_saving_failed_title">「%1$s」をアップロードできません</string>
     <string name="story_saving_snackbar_finished_with_error">「%1$s」をアップロードできません</string>
     <string name="story_saving_snackbar_finished_successfully">「%1$s」を公開しました</string>
-    <string name="story_saving_snackbar_started">「%1$s」をアップロードしています…</string>
+    <string name="story_saving_snackbar_started">「%1$s」をアップロード中…</string>
     <string name="story_saving_subtitle_frames_remaining_plural">%1$d つのスライドが残っています</string>
     <string name="story_saving_subtitle_frames_remaining_singular">1つのスライドが残っています</string>
     <string name="story_saving_title_several">複数のストーリー</string>
-    <string name="story_saving_title">「%1$s」を保存しています…</string>
+    <string name="story_saving_title">「%1$s」を保存中…</string>
     <string name="story_saving_untitled">名称未設定</string>
     <string name="dialog_discard_story_ok_button">削除</string>
     <string name="dialog_discard_story_message">ストーリーの投稿は下書きとして保存されません。</string>
@@ -76,7 +547,6 @@ Language: ja_JP
     <string name="dialog_discard_errored_page_message">このスライドはまだ保存されていません。 このスライドを削除すると、編集内容がすべて失われます。</string>
     <string name="dialog_discard_page_message">このスライドはストーリーから削除されます。</string>
     <string name="dialog_discard_page_title">ストーリーのスライドを削除しますか ?</string>
-    <string name="menu_delete_page">スライドを削除</string>
     <string name="label_text_color_button">テキストの色を変更</string>
     <string name="label_text_alignment_button">テキストの配置を変更</string>
     <string name="label_frame_errored">エラーが発生</string>
@@ -86,8 +556,6 @@ Language: ja_JP
     <string name="label_retry_icon">再試行</string>
     <string name="label_saved_icon">保存しました</string>
     <string name="label_close_button">閉じる</string>
-    <string name="label_control_publish">次へ</string>
-    <string name="label_done">終了</string>
     <string name="label_share_to">以下と共有</string>
     <string name="label_snackbar_share">共有</string>
     <string name="label_snackbar_loop_frame_saved">写真に保存しました</string>
@@ -98,7 +566,6 @@ Language: ja_JP
     <string name="label_control_flip_camera">反転</string>
     <string name="sound_button_alt">音声</string>
     <string name="text_button_alt">テキスト</string>
-    <string name="more_button_alt">その他</string>
     <string name="stickers_button_alt">ステッカー</string>
     <string name="flash_button_alt">フラッシュ</string>
     <string name="flip_button_alt">カメラを反転</string>
@@ -109,15 +576,15 @@ Language: ja_JP
     <string name="mlp_choose_layout_subtitle">事前に用意されたさまざまなページレイアウトを選ぶところから始めましょう。 空白ページから始めることもできます。</string>
     <string name="mlp_choose_layout_title">レイアウトを選択</string>
     <string name="prepublishing_nudges_story_title_hint">ストーリーにタイトルを付ける</string>
-    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">投稿またはストーリーを作成</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">投稿、ページ、ストーリーを作成</string>
-    <string name="quick_start_dialog_create_new_post_message_short">「%1$s 作成」をタップします。 %2$s 次に「&lt;b>ブログ投稿&lt;/b>」を選択します。</string>
-    <string name="photo_picker_choose_file">端末から選択</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">投稿またはストーリーを作成</string>
+    <string name="quick_start_dialog_create_new_post_message_short">「%1$s 作成」をタップします。%2$s 次に「&lt;b&gt;ブログ投稿&lt;/b&gt;」を選択します</string>
     <string name="my_site_bottom_sheet_add_story">ストーリー投稿</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">インストール型の WordPress サイトでサイトアイコンを編集するには Jetpack プラグインが必要です。</string>
     <string name="reader_toast_err_page_jump_not_found">リンクされたページジャンプが見つかりません</string>
     <string name="error_media_quota_exceeded_toast">ファイルをアップロードできません。\nストレージ割り当ての上限に達しました。</string>
     <string name="error_media_quota_exceeded">ストレージ割り当ての上限に達しました</string>
+    <string name="photo_picker_choose_file">端末から選択</string>
     <string name="pick_file">ファイルを追加</string>
     <string name="gutenberg_native_replace_video">動画を置換</string>
     <string name="gutenberg_native_replace_image_or_video">画像または動画を置換</string>
@@ -125,13 +592,10 @@ Language: ja_JP
     <string name="gutenberg_native_choose_image_or_video">画像または動画を選択</string>
     <string name="gutenberg_native_choose_image">画像を選択</string>
     <string name="gutenberg_native_block_removed">削除したブロック</string>
-    <string name="content_description_logo">WordPress のロゴ</string>
-    <string name="enter_your_site_address">サイトアドレスを入力</string>
-    <string name="continue_with_wpcom">WordPress.com で続ける</string>
     <string name="signup_confirmation_title">登録の確認</string>
     <string name="continue_with_google_terms_of_service_text">Google を引き続き使用し、WordPress.com アカウントをまだお持ちでない場合は、アカウントを作成して WordPress.com の%1$s利用規約%2$sに同意します。</string>
+    <string name="enter_your_site_address">既存のサイトアドレスを入力</string>
     <string name="continue_terms_of_service_text">継続することで、%1$s利用規約%2$sに合意したことになります。</string>
-    <string name="signup_confirmation_magic_link_message">新しい WordPress.com アカウントを作成するための登録リンクをメールでお送りします。</string>
     <string name="signup_confirmation_message">このメールアドレスは新しい WordPress.com アカウントの作成に使用します。</string>
     <string name="signup_magic_link_message">新しい WordPress.com アカウントを作成するための登録リンクをメールでお送りしました。現在の端末でメールをチェックし、WordPress.com から届いたメールにあるリンクをタップしてください。</string>
     <string name="enter_account_info_for_site">%1$s のアカウント情報を入力してください。</string>
@@ -140,27 +604,23 @@ Language: ja_JP
     <string name="login_find_your_site_adress">サイトアドレスを検索</string>
     <string name="login_done">終了</string>
     <string name="magic_link_not_seeing_email_message">メールが表示されない場合は、 スパムメールや迷惑メールのフォルダーを確認してください。</string>
-    <string name="login_magic_links_sent_label">この端末でメールをチェックして、WordPress.com から届いたメールにあるリンクをタップしてください。</string>
     <string name="login_magic_links_label">パスワードなしですぐにログインできるリンクのメールをお送りします。</string>
+    <string name="login_magic_links_sent_label">この端末でメールをチェックして、WordPress.com から届いたメールにあるリンクをタップしてください。</string>
     <string name="check_email">メールを確認</string>
     <string name="get_started">今すぐ始める</string>
     <string name="enter_email_to_continue_wordpress_com">メールアドレスを入力してログインするか、WordPress.com アカウントを作成します。</string>
-    <string name="or_type_your_password">または、パスワードを入力してください。</string>
     <string name="create_account">アカウントを作成</string>
     <string name="send_link_by_email">リンクをメールで送信</string>
-    <string name="login_promo_text_unlock_the_power">柔軟性の高いサイトビルダー機能を活用しましょう。</string>
-    <string name="login_promo_title_37_percent">Web の37\% が WordPress で構築されています。</string>
     <string name="reset_your_password">パスワードをリセット</string>
+    <string name="or_type_your_password">またはパスワードを入力</string>
     <string name="reader_error_request_failed_title">リクエストの処理中に問題が発生しました。 後ほど、もう一度お試しください。</string>
-    <string name="quick_start_list_update_site_title_subtitle">サイトにその特徴とトピックがわかるような名前を付けてください。 第一印象が大事です。</string>
     <string name="quick_start_list_update_site_title_title">サイトのタイトルを設定</string>
-    <string name="quick_start_dialog_update_site_title_message_short">新しいタイトルを設定するには&lt;b>%1$s&lt;/b>をタップしてください</string>
+    <string name="quick_start_dialog_update_site_title_message_short">新しいタイトルを設定するには&lt;b&gt;%1$s&lt;/b&gt;をタップしてください</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">この投稿をゴミ箱に移動するとローカルの変更も破棄されます。続行してもよいですか ?</string>
     <string name="gutenberg_native_s_block_options">%s ブロックオプション</string>
     <string name="gutenberg_native_duplicate_block">ブロックを複製</string>
     <string name="gutenberg_native_copy_block">ブロックをコピー</string>
     <string name="gutenberg_native_copied_block">コピーしたブロック</string>
-    <string name="gutenberg_native_block_settings">ブロックの設定</string>
     <string name="gutenberg_native_block_pasted">ブロックを貼り付けました</string>
     <string name="gutenberg_native_block_duplicated">ブロックを複製しました</string>
     <string name="gutenberg_native_block_cut">ブロックを切り取りました</string>
@@ -176,17 +636,15 @@ Language: ja_JP
     <string name="gutenberg_native_gradient_type">グラデーションタイプ</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">ダブルタップしてオプションを選択</string>
     <string name="gutenberg_native_customize_gradient">グラデーションをカスタマイズ</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
-    <string name="pages_list_author">ページ作成者</string>
     <string name="photo_picker_use_gif">この GIF を使う</string>
+    <string name="pages_list_author">ページ作成者</string>
+    <string name="me">自分</string>
     <string name="error_media_thumbnail_not_loaded">メディアサムネイルを読み込めませんでした</string>
-    <string name="menu_content_info">コンテンツ構造</string>
     <string name="everyone">誰でも</string>
-    <string name="me">自分</string>
+    <string name="menu_content_info">コンテンツ構造</string>
     <string name="gutenberg_native_dismiss">非表示</string>
     <string name="prepublishing_nudges_home_tags_not_set">未設定</string>
     <string name="prepublishing_tags_description">タグは、投稿の内容を読者に伝えるのに役立ちます。</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">公開日</string>
     <string name="prepublishing_nudges_toolbar_title_tags">タグを追加</string>
     <string name="prepublishing_nudges_back_button">戻る</string>
     <string name="prepublishing_nudges_home_save_button">今すぐ保存</string>
@@ -197,8 +655,8 @@ Language: ja_JP
     <string name="prepublishing_nudges_publish_action">公開日</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">キャンセル</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">下書きに移動</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_message">ゴミ箱にある投稿は編集できません。 この投稿のステータスを「下書き」に戻して編集しますか ? </string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_title">投稿を「下書き」に移動しますか ? </string>
+    <string name="prepublishing_nudges_toolbar_title_publish">公開日</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_message">ゴミ箱にある投稿は編集できません。この投稿のステータスを「下書き」に戻して編集しますか ?</string>
     <string name="reader_label_choose_your_interests">関心のあるものを選択</string>
     <string name="reader_choose_interests_content_description">関心のあるものを選択</string>
     <string name="reader_btn_done">終了</string>
@@ -209,44 +667,40 @@ Language: ja_JP
     <string name="publish_date">公開日</string>
     <string name="ccpa_privacy_notice_read">CCPA のプライバシー通知を読む</string>
     <string name="ccpa_privacy_notice_caption">カリフォルニア州消費者プライバシー法 (CCPA) は、収集および共有する個人情報の分類、その個人情報を取得する場所、その使用方法と目的についての詳細情報をカリフォルニア州の住民に提供することを企業に義務づけています。</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">投稿を下書きに移動しますか ?</string>
     <string name="ccpa_privacy_notice_header">カリフォルニア州のユーザーへのプライバシー通知</string>
     <string name="status_and_visibility">ステータスと公開状態</string>
     <string name="update_now">今すぐ更新</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">スターターレイアウトを試す</string>
     <string name="gutenberg_native_open_block_actions_menu">ブロックの操作メニューを開く</string>
-    <string name="gutenberg_native_insert_mention">メンションを挿入</string>
+    <string name="gutenberg_native_move_to_top">トップに移動</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">ダブルタップして「下部シート」と利用可能オプションを開く</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">ダブルタップして「アクションシート」と利用可能オプションを開く</string>
+    <string name="site_settings_select_page">ページを選択</string>
     <string name="pages_cannot_be_started">現在、一時的にページを開けません。後ほどもう一度お試しください</string>
+    <string name="site_settings_posts_page">投稿ページ</string>
     <string name="pages_set_as_posts_page">投稿ページとして設定</string>
     <string name="pages_set_as_homepage">ホームページに設定する</string>
-    <string name="suggestion_no_matching_users">「マッチするユーザーがいません」</string>
-    <string name="suggestion_invalid_user">「%s は有効なユーザーではありません」</string>
-    <string name="site_settings_select_page">ページを選択</string>
-    <string name="site_settings_posts_page">投稿ページ</string>
     <string name="site_settings_static_homepage">固定ホームページ</string>
     <string name="site_settings_classic_blog">クラシックブログ</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">ホームページと投稿用ページは同じものを選択できません。</string>
-    <string name="site_settings_failed_update_homepage_settings">ホームページ設定の更新に失敗しました。インターネット接続を確認してください。</string>
-    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">ページを読み込む前にホームページ設定の保存はできません</string>
-    <string name="site_settings_failed_to_save_homepage_settings">ホームページ設定を保存できません</string>
+    <string name="suggestion_invalid">%s は有効な %s ではありません</string>
     <string name="site_settings_accept_homepage">承認</string>
+    <string name="site_settings_failed_to_save_homepage_settings">ホームページ設定を保存できません</string>
+    <string name="site_settings_homepage_settings">ホームページ設定</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">ページを読み込む前にホームページ設定の保存はできません</string>
     <string name="site_settings_failed_to_load_pages">ページの読み込みに失敗しました</string>
     <string name="site_settings_homepage_settings_description">最新の投稿を表示するホームページ (クラシックブログ) か固定ページから選択してください。</string>
-    <string name="site_settings_homepage_settings">ホームページ設定</string>
+    <string name="site_settings_failed_update_homepage_settings">ホームページ設定の更新に失敗しました。インターネット接続を確認してください</string>
     <string name="site_settings_homepage">ホームページ</string>
-    <string name="page_posts_page_update_failed">投稿ページの更新に失敗しました</string>
     <string name="page_posts_page_successfully_updated">投稿ページの更新に成功しました</string>
+    <string name="page_posts_page_update_failed">投稿ページの更新に失敗しました</string>
     <string name="page_homepage_update_failed">ホームページの更新に失敗しました</string>
     <string name="page_homepage_successfully_updated">ホームページが正常に更新されました</string>
     <string name="page_cannot_set_posts_page">「サイト設定」で「投稿」ページを「固定ホームページ」にするには</string>
     <string name="page_cannot_set_homepage">「サイト設定」でホームページを「固定ホームページ」にするには</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">新しいブログへようこそ</string>
     <string name="gutenberg_native_select_a_color">色を選択</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">ダブルタップして色設定に移動</string>
     <string name="reader_empty_followed_blogs_description">サイトをフォローすると、こちらにコンテンツが表示されます</string>
-    <string name="feature_announcement_find_out_mode">詳細</string>
     <string name="feature_announcement_dialog_label">WordPress の新機能</string>
     <string name="insert_label_with_count">%d を挿入</string>
     <string name="crop">切り取り</string>
@@ -257,6 +711,7 @@ Language: ja_JP
     <string name="photo_picker_photo_or_video_title">メディアを選択</string>
     <string name="photo_picker_video_title">動画を選択</string>
     <string name="site_picker_ask_site_select">サイトを選択できませんでした。もう一度お試しください。</string>
+    <string name="feature_announcement_find_out_mode">さらに詳しく</string>
     <string name="sitepicker_continue_flow">次へ</string>
     <string name="reader_reblog_error">リブログに失敗しました</string>
     <string name="reader_no_site_to_reblog_action">サイトの管理</string>
@@ -276,7 +731,6 @@ Language: ja_JP
     <string name="gutenberg_native_move_block_left">ブロックを左に移動</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">ダブルタップしてブロックを右に移動</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">ダブルタップしてブロックを左に移動</string>
-    <string name="gutenberg_native_blog">ブログ</string>
     <string name="new_site_creation_creating_site_loading_4">ダッシュボードの作成</string>
     <string name="new_site_creation_creating_site_loading_3">テーマを設定する</string>
     <string name="new_site_creation_creating_site_loading_2">サイト機能の追加</string>
@@ -298,12 +752,12 @@ Language: ja_JP
     <string name="media_accessing_failed">非公開サイトのコンテンツにアクセスできませんでした。一部のメディアは利用できない場合があります</string>
     <string name="media_accessing_progress">非公開サイトのコンテンツへのアクセス</string>
     <string name="error_failed_to_crop_and_save_image">画像の切り抜きと保存に失敗しました。もう一度お試しください。</string>
-    <string name="failed_to_load_image_tap_to_retry">画像の読み込みに失敗しました。\nタップして再試行してください。</string>
     <string name="preview_image_description">画像をプレビュー</string>
     <string name="error_unknown_page_type">ページのフォーマットが不明です</string>
     <string name="error_page_not_submitted">この操作を完了できなかったため、この確認用のページは送信されていません。</string>
     <string name="error_page_not_scheduled">この操作を完了できなかったため、このページのスケジュールは設定されていません。</string>
     <string name="error_page_not_published_private">この操作を完了できなかったため、この非公開ページは公開されていません。</string>
+    <string name="failed_to_load_image_tap_to_retry">画像の読み込みに失敗しました。\nタップして再試行してください。</string>
     <string name="error_page_not_published">この操作を完了できなかったため、このページは公開されていません。</string>
     <string name="error_page_not_submitted_retrying">この確認用のページを送信できませんでした。後ほど再実行します。</string>
     <string name="error_page_not_scheduled_retrying">このページのスケジュールを設定できませんでした。後ほど再実行します。</string>
@@ -315,16 +769,15 @@ Language: ja_JP
     <string name="error_media_recover_page_not_published">このメディアをアップロードできなかったため、ページは公開されていません。</string>
     <string name="page_waiting_for_connection_draft">端末が再びオンラインになった時に、下書きを保存します</string>
     <string name="page_waiting_for_connection_private">端末が再びオンラインになった時に、非公開のページを公開します。</string>
-    <string name="page_waiting_for_connection_scheduled">端末が再びオンラインになった時に、ページの予約投稿を行います。</string>
-    <string name="page_waiting_for_connection_pending">端末が再びオンラインになった時に、ページのレビュー申請を送信します。</string>
-    <string name="page_waiting_for_connection_publish">端末が再びオンラインになった時に、ページを公開します。</string>
     <string name="page_queued">キューに入っているページ</string>
     <string name="page_uploading">ページをアップロード中</string>
-    <string name="error_publish_page_no_network">端末がオフラインです。ページはローカルに保存されました。</string>
     <string name="local_page_autosave_revision_available">このページに保存されていない変更が加えられました</string>
+    <string name="page_waiting_for_connection_publish">端末が再びオンラインになった時に、ページを公開します。</string>
+    <string name="page_waiting_for_connection_pending">端末が再びオンラインになった時に、ページのレビュー申請を送信します。</string>
+    <string name="page_waiting_for_connection_scheduled">端末が再びオンラインになった時に、ページの予約投稿を行います。</string>
+    <string name="error_publish_page_no_network">端末がオフラインです。ページはローカルに保存されました。</string>
     <string name="editor_uploading_page">ページのアップロード中</string>
     <string name="editor_page_saved_locally_failed_media">ページはメディアアップロードに失敗し、ローカルに保存されました</string>
-    <string name="editor_page_saved_locally">ページを端末に保存しました</string>
     <string name="editor_page_saved_online">ページはオンラインで保存されました</string>
     <string name="quickpress_shortcut_activity_label">QuickPress ショートカット用のブログを選択</string>
     <string name="app_theme_default">バッテリーセーバーで設定</string>
@@ -332,57 +785,21 @@ Language: ja_JP
     <string name="app_theme_light">ライト</string>
     <string name="app_theme">外観</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">このページに最近変更が加えられましたが、保存されませんでした。読み込むバージョンを選択します。\n\n</string>
-    <string name="gutenberg_native_what_people_say">名言集</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">受講者の目標に合わせて、さまざまなレッスンをご用意しています。必要なサービスや費用がわからない場合は、お客様に適切なサービスや価格についてご説明いたします。以下からお問い合わせください。</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">当社は幅広いスキルと豊かな経験を持つ少数精鋭のプロフェッショナル集団です。愛着と熱意を持って、この仕事に取り組んでいます。ご利用をお待ちしています。</string>
-    <string name="gutenberg_native_warning_message">警告メッセージ</string>
-    <string name="gutenberg_native_want_to_work_with_us">求人情報</string>
-    <string name="gutenberg_native_walt_disney">ウォルト・ディズニー</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">訪問者に安心してこのページをご利用いただけるように、自己紹介をします。このページを使用して、ご自身やサイト、ビジネスなどについて自由に記述、公開できます。以下の「お客様の声」を使って、同じ内容の情報について第三者が自分の言葉で表現した発言を引用します。</string>
-    <string name="gutenberg_native_usa">USA</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">これは各種機能を具体的に紹介するテンプレートに含まれるサンプルコンテンツ例です。削除するか、お客様自身の文章とメディアに置き換えてください。</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">何かを始めるには、しゃべるのをやめて行動を開始することだ。</string>
-    <string name="gutenberg_native_team">チーム</string>
-    <string name="gutenberg_native_success_message">成功メッセージ</string>
-    <string name="gutenberg_native_strategy">戦略</string>
+    <string name="editor_page_saved_locally">ページを端末に保存しました</string>
     <string name="gutenberg_native_show_post_content">投稿の内容を表示</string>
-    <string name="gutenberg_native_services">サービス</string>
-    <string name="gutenberg_native_samuel_the_dog">犬のサミュエル</string>
-    <string name="gutenberg_native_sally_smith">サリー・スミス</string>
-    <string name="gutenberg_native_project_name">プロジェクト名</string>
-    <string name="gutenberg_native_position_or_job_title">職位または肩書</string>
-    <string name="gutenberg_native_portfolio">ポートフォリオ</string>
     <string name="gutenberg_native_only_show_excerpt">抜粋のみを表示</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">これまでのキャリアで制作してきたプロジェクトを、ポートフォリオにて紹介しています。下記のお問い合わせ先までご連絡ください。</string>
     <string name="gutenberg_native_link_to">リンク先</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">詳細はご相談にて。ぜひお気軽に以下の連絡先にお問い合わせください。フォームでのご連絡もお待ちしています。</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">一緒に何かを作り上げましょう。</string>
-    <string name="gutenberg_native_let_s_build_something_together">一緒に何かを作り上げましょう。</string>
-    <string name="gutenberg_native_juan_p_rez">フアン・ペレス</string>
-    <string name="gutenberg_native_j_k_rowling">J.K.ローリング</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">ハリー、人が本当に何者であるかを示すのは、何ができるかではなく、どのような選択をするかなのだ。</string>
-    <string name="gutenberg_native_inspiration">インスピレーション</string>
-    <string name="gutenberg_native_get_in_touch">お問い合わせ</string>
+    <string name="gutenberg_native_link_settings">リンク設定</string>
     <string name="gutenberg_native_excerpt_length_words">抜粋の長さ (単語数)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">メール :&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">ドクター・スース</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">終わったと嘆くより、機会に恵まれたと喜ぼう。</string>
     <string name="gutenberg_native_customize">カスタマイズ</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
     <string name="gutenberg_native_add_paragraph_block">段落ブロックを追加</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">サービス内容に関する簡単な説明。</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">個人的経歴、主な業績、興味深い事実を織り込んだ簡単な自己紹介。</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">提示したプロジェクトや作品の説明。</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
+    <string name="gutenberg_native_video_settings">動画設定</string>
     <string name="create_post_page_fab_tooltip_contributors">投稿を作成</string>
     <string name="post_list_tab_trashed_posts">ゴミ箱に移動済み</string>
     <string name="post_list_tab_scheduled_posts">予約済み</string>
     <string name="post_list_tab_published_posts">公開済み</string>
     <string name="sharing_facebook_account_must_have_pages">Facebook との連携でページが見つかりません。パブリサイズで Facebook のプロフィールに連携できません。連携できるのは公開されているページのみです。</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">接続されていません</string>
-    <string name="my_site_select_domains_page_title">サイトのアドレス</string>
     <string name="notifications_tab_title_likes">いいね</string>
     <string name="notifications_tab_title_follows">フォロー</string>
     <string name="notifications_tab_title_comments">コメント</string>
@@ -394,14 +811,14 @@ Language: ja_JP
     <string name="stats_insights_management_general">全般</string>
     <string name="stats_management_screen_title">新しいカードを追加</string>
     <string name="stats_management_add_new_stats_card">新しい統計カードを追加</string>
-    <string name="reader_self_hosted_select_filter">フィルターボタンを使って指定トピックの投稿を検索</string>
-    <string name="reader_bottom_sheet_content_description">タグまたはサイトを選択 (ポップアップウィンドウ)</string>
-    <string name="reader_btn_selected_filter_tick_content_description">選択済</string>
-    <string name="reader_btn_select_filter_content_description">投稿を絞り込むためのサイトまたはタグを選択</string>
-    <string name="reader_btn_remove_filter_content_description">現在のフィルターを削除</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">WordPress.com にログイン</string>
+    <string name="reader_btn_remove_filter_content_description">現在のフィルターを削除</string>
+    <string name="reader_btn_select_filter_content_description">投稿を絞り込むためのサイトまたはタグを選択</string>
+    <string name="reader_bottom_sheet_content_description">タグまたはサイトを選択 (ポップアップウィンドウ)</string>
+    <string name="reader_self_hosted_select_filter">フィルターボタンを使って指定トピックの投稿を検索</string>
+    <string name="reader_title_subs">トピックとサイトを管理</string>
     <string name="reader_filter_self_hosted_empty_sites_list">WordPress.com にログインし、フォロー中のサイトの最新投稿をチェック</string>
-    <string name="gutenberg_native_template_preview">テンプレートのプレビュー</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">WordPress.com にログインし、フォロー中のトピックの最新投稿をチェック</string>
     <string name="gutenberg_native_replace_current_block">現在のブロックを置き換え</string>
     <string name="gutenberg_native_add_to_end">末尾に追加</string>
     <string name="gutenberg_native_add_to_beginning">先頭に追加</string>
@@ -409,11 +826,12 @@ Language: ja_JP
     <string name="gutenberg_native_add_block_after">後にブロックを追加</string>
     <string name="reader_filter_empty_sites_action">サイトをフォロー</string>
     <string name="reader_filter_empty_sites_list">フォローしているサイトの最新の投稿を表示</string>
+    <string name="reader_filter_empty_tags_action">トピックを追加</string>
+    <string name="reader_filter_empty_tags_list">トピックを追加すると、特定の内容に関する投稿をフォローできます</string>
     <string name="reader_filter_main_title">フォロー中</string>
     <string name="reader_filter_cta">フィルター</string>
     <string name="gutenberg_native_video_caption_s">動画の見出しです。%s</string>
     <string name="gutenberg_native_edit_video">動画を編集</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">ダブルタップしてレイアウトを選択</string>
     <string name="gutenberg_native_add_a_shortcode">ショートコードを追加…</string>
     <string name="post_list_author">投稿作成者</string>
     <string name="fab_create_desc">投稿を作成</string>
@@ -428,71 +846,61 @@ Language: ja_JP
     <string name="stats_box_type_low">低い</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s、%2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">画像を前に移動</string>
-    <string name="gutenberg_native_move_image_backward">画像を後ろに移動</string>
     <string name="gutenberg_native_gallery_caption_s">ギャラリーのキャプション。%s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s。現在の値は%2$s</string>
     <string name="create_post_page_fab_tooltip">投稿またはページを作成</string>
-    <string name="content_description_person_building_website">サイトを構築する人</string>
+    <string name="gutenberg_native_replace_image">画像の置き換え</string>
     <string name="post_signup_interstitial_not_right_now">今はしない</string>
+    <string name="content_description_person_building_website">サイトを構築する人</string>
     <string name="post_signup_interstitial_subtitle">どんなものを作成や共有する場合でも、ここでお手伝いします。</string>
     <string name="post_signup_interstitial_title">WordPress へようこそ</string>
-    <string name="stock_media_picker_list_content_description">フォトライブラリ</string>
     <string name="photo_picker_image_thumbnail_unselected">画像の選択を解除しました</string>
+    <string name="stock_media_picker_list_content_description">フォトライブラリ</string>
+    <string name="my_site_bottom_sheet_add_post">ブログ投稿</string>
+    <string name="photo_picker_image_thumbnail_content_description">画像サムネイル</string>
     <string name="photo_picker_image_selected">、選択済</string>
     <string name="photo_picker_image_thumbnail_selected">画像を選択しました</string>
-    <string name="photo_picker_image_thumbnail_content_description">画像サムネイル</string>
-    <string name="my_site_bottom_sheet_add_post">ブログ投稿</string>
     <string name="my_site_bottom_sheet_title">新規追加</string>
     <string name="post_settings_publish">公開</string>
-    <string name="dialog_gutenberg_informative_description_v2">ブロックエディターを大幅に改善しました。ぜひお試しください。新規投稿とページに対して有効化していますが、旧エディターに変更する場合は「自分のサイト」    「サイトの設定」に移動してください。</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">今すぐ同期</string>
     <string name="dialog_confirm_scheduled_post_sync_message">この投稿はすぐに同期されます。</string>
     <string name="dialog_confirm_scheduled_post_sync_title">同期しても良いですか ?</string>
     <string name="new_site_creation_unavailable_domain">このドメインは利用できません</string>
-    <string name="login_promo_viewpager_content_description">はじめに</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">サイトにアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
-    <string name="login_discovery_error_ssl">&lt;b>SSL 証明書&lt;/b>の問題により、サイトにアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
-    <string name="login_discovery_error_http_auth">&lt;b>HTTP 認証&lt;/b>の問題により、サイトにアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
-    <string name="login_discovery_error_xmlrpc">サイトの &lt;b>XMLRPC ファイル&lt;/b>にアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
-    <string name="login_site_credentials_magic_link_label">もう少しです !最後に、Jetpack に連携したメールアドレス &lt;b>%1$s&lt;/b> を確認します</string>
-    <string name="enter_site_credentials_instead">サイトのログイン情報でログインします。</string>
-    <string name="enter_credentials_for_site">%1$s サイトのログイン情報でログインします。</string>
-    <string name="send_verification_email">確認メールを送信</string>
-    <string name="my_site_bottom_sheet_add_page">サイトのページ</string>
+    <string name="login_discovery_error_ssl">&lt;b&gt;SSL 証明書&lt;/b&gt;の問題により、サイトにアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
+    <string name="login_discovery_error_http_auth">&lt;b&gt;HTTP 認証&lt;/b&gt;の問題により、サイトにアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
+    <string name="login_discovery_error_xmlrpc">サイトの &lt;b&gt;XMLRPC ファイル&lt;/b&gt;にアクセスできませんでした。ホストに問い合わせてこの問題を解決してください。</string>
+    <string name="login_site_credentials_magic_link_label">もう少しです !最後に、Jetpack に連携したメールアドレス &lt;b&gt;%1$s&lt;/b&gt; を確認します</string>
     <string name="reader_following_display_name">フォロー中</string>
-    <string name="reader_my_likes_display_name">いいね</string>
-    <string name="reader_discover_display_name">ディスカバー</string>
-    <string name="reader_save_for_later_display_name">保存しました</string>
-    <string name="reader_filter_sites_title">サイト</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="suffix_1_000_000_000_000_000">%sQa</string>
-    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="my_site_bottom_sheet_add_page">サイトのページ</string>
+    <string name="enter_credentials_for_site">%1$s サイトのアカウント情報でログイン</string>
+    <string name="posts_cannot_be_started">現在、投稿を開くことができません。後ほど、もう一度お試しください</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="posts_cannot_be_started">現在、投稿を開くことができません。後ほど、もう一度お試しください</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="reader_filter_sites_title">サイト</string>
+    <string name="reader_save_for_later_display_name">保存しました</string>
+    <string name="reader_my_likes_display_name">いいね</string>
     <string name="site_cannot_be_loaded">現在、サイトのデータを読み込めません。後ほど、もう一度お試しください</string>
+    <string name="reader_discover_display_name">ディスカバー</string>
+    <string name="reader_filter_tags_title">トピック</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress メディアライブラリ</string>
     <string name="gutenberg_native_ungroup">グループ解除</string>
     <string name="gutenberg_native_translate">翻訳</string>
-    <string name="gutenberg_native_title">タイトル:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">タップしてキーボードを非表示</string>
     <string name="gutenberg_native_tap_here_to_show_help">タップしてヘルプを表示</string>
     <string name="gutenberg_native_take_a_video">動画を撮る</string>
     <string name="gutenberg_native_take_a_photo_or_video">写真または動画を撮る</string>
     <string name="gutenberg_native_take_a_photo">写真を撮る</string>
     <string name="gutenberg_native_start_writing">執筆を開始…</string>
-    <string name="gutenberg_native_size">サイズ</string>
-    <string name="gutenberg_native_sidebar_title_plugin">サイドバータイトルプラグイン</string>
+    <string name="gutenberg_native_unsupported">非サポート</string>
     <string name="gutenberg_native_show_section">セクションを表示</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%sブロック。このブロックは無効なコンテンツです</string>
     <string name="gutenberg_native_s_block_empty">%sブロック。空</string>
     <string name="gutenberg_native_cut_block">ブロックを切り取る</string>
-    <string name="gutenberg_native_reset_block">ブロックをリセット</string>
-    <string name="gutenberg_native_remove_annotations">注釈を削除</string>
-    <string name="gutenberg_native_problem_opening_the_video">動画を開く際に問題が発生しました</string>
     <string name="gutenberg_native_problem_displaying_block">ブロックの表示中に問題が発生しました</string>
     <string name="gutenberg_native_post_title_s">投稿タイトル。%s</string>
     <string name="gutenberg_native_post_title_empty">投稿タイトル。空</string>
@@ -500,21 +908,17 @@ Language: ja_JP
     <string name="gutenberg_native_page_break_block_s">改ページブロック。%s</string>
     <string name="gutenberg_native_open_settings">設定を開く</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">このリクエストを処理できるアプリケーションはありません。Web ブラウザーをインストールしてください。</string>
+    <string name="gutenberg_native_problem_opening_the_video">動画を開く際に問題が発生しました</string>
     <string name="gutenberg_native_navigate_up">上に移動</string>
-    <string name="gutenberg_native_my_pre_publish_panel">公開前パネル</string>
-    <string name="gutenberg_native_my_post_status_info">投稿ステータス情報</string>
-    <string name="gutenberg_native_my_post_publish_panel">公開後パネル</string>
-    <string name="gutenberg_native_my_document_setting_panel">ドキュメント設定パネル</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">ブロックを行 %1$s から行 %2$s に上に移動します</string>
     <string name="gutenberg_native_move_block_up">ブロックを上に移動</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">ブロックを行 %1$s から行 %2$s に下に移動します</string>
     <string name="gutenberg_native_move_block_down">ブロックを下に移動</string>
     <string name="gutenberg_native_image_caption_s">画像キャプション。%s</string>
     <string name="gutenberg_native_hide_keyboard">キーボードを非表示</string>
-    <string name="gutenberg_native_here_is_the_panel_content">ここにパネルコンテンツが入ります</string>
     <string name="gutenberg_native_help_icon">ヘルプアイコン</string>
-    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">メディアを挿入できませんでした。\nタップするとオプションが表示されます</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">ダブルタップして前回の変更を元に戻す</string>
+    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">メディアを挿入できませんでした。\nタップするとオプションを表示します。</string>
     <string name="gutenberg_native_double_tap_to_toggle_setting">ダブルタップして設定を切り替え</string>
     <string name="gutenberg_native_double_tap_to_select_an_image">ダブルタップして画像を選択</string>
     <string name="gutenberg_native_double_tap_to_select_a_video">ダブルタップして動画を選択</string>
@@ -523,34 +927,28 @@ Language: ja_JP
     <string name="gutenberg_native_double_tap_to_move_the_block_up">ダブルタップしてブロックを上に移動</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">ダブルタップしてブロックを下に移動</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">ダブルタップしてこの値を編集</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">ダブルタップしてスライダーを使用して値を変更</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">ダブルタップしてブロックを追加</string>
     <string name="gutenberg_native_current_value_is_s">現在の値 %s</string>
-    <string name="gutenberg_native_content">コンテンツ…</string>
     <string name="gutenberg_native_choose_from_device">端末から選択</string>
-    <string name="gutenberg_native_annotations_sidebar">注釈サイドバー</string>
-    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">不明なエラーが発生しました。もう一度実行してください</string>
-    <string name="gutenberg_native_alt_text">代替テキスト</string>
-    <string name="gutenberg_native_add_video">動画を追加</string>
-    <string name="gutenberg_native_add_url">URL を追加</string>
     <string name="gutenberg_native_add_image_or_video">画像または動画を追加</string>
+    <string name="gutenberg_native_add_url">URL を追加</string>
+    <string name="gutenberg_native_add_video">動画を追加</string>
+    <string name="gutenberg_native_alt_text">代替テキスト</string>
     <string name="gutenberg_native_add_image">画像を追加</string>
     <string name="gutenberg_native_add_block_here">ここにブロックを追加</string>
-    <string name="gutenberg_native_add_annotation">注釈を追加</string>
-    <string name="gutenberg_native_add_a_description">説明を追加</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">不明なエラーが発生しました。もう一度お試しください。</string>
+    <string name="gutenberg_native_add_alt_text">代替テキストを追加</string>
     <string name="reader_empty_saved_posts_content_description">「Add to Save Posts」ボタンをタップし、投稿をリストに保存します。</string>
     <string name="reader_acessibility_list_loaded">「リストに %1$d 項目が読み込まれました」</string>
     <string name="notifications_tab_dialog_switch_desc">通知</string>
-    <string name="master_switch_default_title_off">オフ</string>
-    <string name="master_switch_default_title_on">オン</string>
-    <string name="notifications_tab_dialog_master_off_message">このサイトの通知をオフにすると、このサイトの通知タブでは通知表示が無効になります。サイトの通知をオンにすると、表示される通知の種類を調整できます。</string>
-    <string name="notifications_tab_dialog_master_off_title">このサイトの通知タブで通知を表示するには、このサイトの通知をオンにします。</string>
-    <string name="notifications_tab_dialog_master_hint_off">このサイトの通知タブで通知表示を有効にする</string>
-    <string name="notifications_tab_dialog_master_hint_on">このサイトの通知タブで通知表示を無効にする</string>
-    <string name="notifications_tab_dialog_master_status_off">このサイトの通知</string>
-    <string name="notifications_tab_dialog_master_status_on">このサイトの通知</string>
-    <string name="dialog_gutenberg_informative_description_page">新しいページでブロックエディターを使用しています。旧エディターに変更する場合は、「参加サイト」 > 「サイト設定」に移動してください。</string>
-    <string name="dialog_gutenberg_informative_description_post">新しい投稿でブロックエディターを使用しています。旧エディターに変更する場合は、「参加サイト」 > 「サイト設定」に移動してください。</string>
+    <string name="notifications_tab_dialog_main_off_message">このサイトの通知をオフにすると、このサイトの通知タブでは通知表示が無効になります。サイトの通知をオンにすると、表示される通知の種類を調整できます。</string>
+    <string name="main_switch_default_title_on">オン</string>
+    <string name="main_switch_default_title_off">オフ</string>
+    <string name="notifications_tab_dialog_main_status_off">このサイトの通知</string>
+    <string name="notifications_tab_dialog_main_status_on">このサイトの通知</string>
+    <string name="notifications_tab_dialog_main_hint_on">このサイトの通知タブで通知表示を無効化</string>
+    <string name="notifications_tab_dialog_main_hint_off">このサイトの通知タブで通知表示を有効化</string>
+    <string name="notifications_tab_dialog_main_off_title">このサイトの通知タブで通知を表示するには、このサイトの通知をオンにしてください。</string>
     <string name="pick_media">画像または動画を追加</string>
     <string name="error_post_not_submitted_retrying">このレビュー投稿を送信できませんでした。後ほど再度実行します。</string>
     <string name="error_post_not_scheduled_retrying">この投稿を予約投稿にできませんでした。後ほど再度実行します。</string>
@@ -573,26 +971,26 @@ Language: ja_JP
     <string name="preview_unavailable_self_hosted_sites">プレビューは利用できません</string>
     <string name="remote_preview_operation_error">プレビュー前に投稿を保存する際のエラー</string>
     <string name="post_preview_remote_auto_saving_post">プレビューを生成中…</string>
-    <string name="post_preview_saving_draft">保存中…</string>
     <string name="local_post_autosave_revision_available">この投稿に保存されていない変更が加えられました</string>
+    <string name="post_preview_saving_draft">保存中…</string>
     <string name="dialog_confirm_autosave_dont_restore_button">このアプリからのバージョン</string>
-    <string name="dialog_confirm_autosave_restore_button">他の端末からのバージョン</string>
-    <string name="dialog_confirm_autosave_body_second_part">このアプリから\n%sに保存しました\n\n他の端末から\n%sに保存しました\n</string>
     <string name="dialog_confirm_autosave_body_first_part">この投稿に最近変更が加えられましたが、保存されませんでした。読み込むバージョンを選択します。\n\n</string>
     <string name="dialog_confirm_autosave_title">どのバージョンを編集しますか ?</string>
     <string name="button_delete_permanently">完全に削除</string>
     <string name="post_waiting_for_connection_draft_cancel">下書きに加えた最新の変更を保存しません。</string>
+    <string name="dialog_confirm_autosave_body_second_part">このアプリから\n%sに保存しました\n\n他の端末から\n%sに保存しました\n</string>
+    <string name="dialog_confirm_autosave_restore_button">他の端末からのバージョン</string>
     <string name="post_waiting_for_connection_scheduled_cancel">これらの変更を予約しません。</string>
     <string name="post_waiting_for_connection_pending_cancel">レビューに対するこれらの変更を送信しません。</string>
     <string name="post_waiting_for_connection_publish_cancel">これらの変更を公開しません。</string>
     <string name="post_waiting_for_connection_draft">端末が再びオンラインになった時に、下書きを保存します</string>
     <string name="post_waiting_for_connection_private">端末が再びオンラインになった時に、非公開の投稿を公開します。</string>
-    <string name="post_waiting_for_connection_scheduled">端末が再びオンラインになった時に、投稿の予約投稿を行います。</string>
     <string name="post_waiting_for_connection_pending">端末が再びオンラインになった時に、投稿のレビュー申請を送信します。</string>
+    <string name="post_waiting_for_connection_scheduled">端末が再びオンラインになった時に、投稿の予約投稿を行います。</string>
     <string name="post_waiting_for_connection_publish">端末が再びオンラインになった時に、投稿を公開します。</string>
     <string name="settings_username_changer_snackbar_cancel">この操作はキャンセルできません。ユーザー名はすでに更新されている可能性があります。</string>
-    <string name="settings_username_changer_toast_content">新しいユーザー名は %1$s です</string>
     <string name="settings_username_changer_progress_dialog">ユーザー名を保存しています…</string>
+    <string name="settings_username_changer_toast_content">新しいユーザー名は %1$s です</string>
     <string name="settings_username_changer_confirm_dialog_positive_action">ユーザー名を変更する</string>
     <string name="settings_username_changer_confirm_dialog_content">ユーザー名を %1$s%2$s%3$s に変更します。ユーザー名を変更すると、Gravatar プロフィールと IntenseDebate プロフィールのアドレスも変更されます。変更後のユーザー名を確認して続行してください。</string>
     <string name="settings_username_changer_confirm_dialog_title">ご注意ください。</string>
@@ -643,11 +1041,8 @@ Language: ja_JP
     <string name="post_settings_add_to_calendar">カレンダーに追加</string>
     <string name="post_settings_notification">通知</string>
     <string name="post_settings_time_and_date">日付と時刻</string>
-    <string name="login_need_help_finding_connected_email">関連付けられているメールアドレスをお忘れですか ?</string>
-    <string name="enter_wordpress_site">このアドレスのサイトは WordPress のサイトではありません。接続するには、接続先のサイトに WordPress がインストールされている必要があります。</string>
     <string name="login_invalid_site_url">ウェブサイトの完全なアドレス (例 : example.com) を入力してください。</string>
     <string name="enter_email_for_site">WordPress.com でログインして、%1$s に接続してください</string>
-    <string name="stats_post_views_label">表示数</string>
     <string name="stats_post_label">投稿</string>
     <string name="stats_list_item_description">%1$s:%2$s、%3$s:%4$s</string>
     <string name="stats_item_collapsed">項目を非表示にしました</string>
@@ -658,6 +1053,7 @@ Language: ja_JP
     <string name="stats_overview_content_description">次の期間の %1$s %2$s :%3$s、前の期間からの変更 - %4$s</string>
     <string name="stats_loading_card">選択したカードデータの読み込み</string>
     <string name="site_settings_editor">エディター</string>
+    <string name="stats_post_views_label">表示数</string>
     <string name="description_expand">拡大</string>
     <string name="description_collapse">折りたたむ</string>
     <string name="my_site_verify_your_email_without_email">メールアドレスを検証してください。ご登録のメールアドレスに指示が送信されました</string>
@@ -671,27 +1067,27 @@ Language: ja_JP
     <string name="post_settings_featured_image_uploading_tap_for_options">メディアをアップロードしています。\nタップすると、オプションが表示されます。</string>
     <string name="link_open_new_window">リンクを新しいウィンドウまたはタブで開く</string>
     <string name="stats_widget_error_no_access_token">統計情報を表示するには、WordPress.com アカウントにログインしてください。</string>
-    <string name="post_list_search_nothing_found">検索に一致する投稿はありません</string>
+    <string name="stats_widget_all_time_insights_name">全期間</string>
+    <string name="stats_widget_today_insights_name">今日</string>
     <string name="post_list_search_prompt">投稿を検索</string>
     <string name="domains_suggestions_intro_description">これを使って、他の人があなたのサイトをインターネット上で見つけます。</string>
     <string name="domains_suggestions_intro_title">プレミアムドメイン名を選択</string>
-    <string name="my_site_custom_domain_name">WordPress.com のすべてのプランにはカスタムドメイン名があります。無料プレミアムドメインを登録してください。</string>
     <string name="stats_widget_minified_name">概要</string>
-    <string name="stats_widget_today_insights_name">今日</string>
-    <string name="stats_widget_all_time_insights_name">全期間</string>
-    <string name="stats_widget_weekly_views_name">今週の表示数</string>
-    <string name="stats_widget_log_in_message">ウィジェットを追加するには WordPress アプリにログインしてください。</string>
-    <string name="stats_widget_error_no_network">利用可能なネットワークがありません</string>
-    <string name="stats_widget_error_no_data">データを読み込めませんでした</string>
+    <string name="post_list_search_nothing_found">検索に一致する投稿はありません</string>
+    <string name="my_site_custom_domain_name">WordPress.com のすべてのプランにはカスタムドメイン名があります。無料プレミアムドメインを登録してください。</string>
+    <string name="stats_widget_all_time_title">全期間</string>
+    <string name="stats_widget_site">サイト</string>
+    <string name="stats_widget_color">色</string>
+    <string name="stats_widget_color_light">ライト</string>
+    <string name="stats_widget_color_dark">ダーク</string>
+    <string name="stats_widget_select_your_site">サイトを選択</string>
     <string name="stats_widget_select_type">種類</string>
     <string name="stats_widget_select_color">色</string>
-    <string name="stats_widget_select_your_site">サイトを選択</string>
-    <string name="stats_widget_color_dark">ダーク</string>
-    <string name="stats_widget_color_light">ライト</string>
-    <string name="stats_widget_color">色</string>
+    <string name="stats_widget_error_no_data">データを読み込めませんでした</string>
+    <string name="stats_widget_error_no_network">利用可能なネットワークがありません</string>
+    <string name="stats_widget_weekly_views_name">今週の表示数</string>
+    <string name="stats_widget_log_in_message">ウィジェットを追加するには WordPress アプリにログインしてください。</string>
     <string name="stats_widget_site_caption">サイトを選択</string>
-    <string name="stats_widget_site">サイト</string>
-    <string name="stats_widget_all_time_title">全期間</string>
     <string name="stats_widget_views_title">今週の表示数</string>
     <string name="stats_widget_add">ウィジェットを追加</string>
     <string name="plugin_fetching_error_after_at">プラグイン詳細の再読み込みには通常より時間がかかります。後ほどご確認ください。</string>
@@ -710,7 +1106,7 @@ Language: ja_JP
     <string name="domain_registration_state_picker_dialog_title">都道府県を選択</string>
     <string name="domain_registration_country_picker_dialog_title">国を選択</string>
     <string name="domain_registration_result_continue_button">次へ</string>
-    <string name="domain_registration_result_description">新しいドメイン &lt;b>%s&lt;/b> の設定中です。間もなく設定は完了しますので、\nお楽しみに !</string>
+    <string name="domain_registration_result_description">新しいドメイン &lt;b&gt;%s&lt;/b&gt; の設定中です。間もなく設定は完了しますので、\nお楽しみに !</string>
     <string name="domain_registration_result_title">おめでとうございます</string>
     <string name="domain_contact_information_register_domain_button">ドメインを登録</string>
     <string name="domain_contact_information_postal_code_hint">郵便番号</string>
@@ -758,9 +1154,9 @@ Language: ja_JP
     <string name="post_moving_to_draft">投稿は下書きに移動されています</string>
     <string name="post_restoring">投稿が復元されています</string>
     <string name="post_restored">投稿を復元しました</string>
-    <string name="post_trashing">投稿はゴミ箱に移動中です。</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_message">この投稿をゴミ箱に移動すると保存されていない変更も破棄されます。続行してもよいですか ?</string>
     <string name="dialog_confirm_trash_losing_local_changes_title">ローカルの変更</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">この投稿をゴミ箱に移動すると保存されていない変更も破棄されます。続行してもよいですか ?</string>
+    <string name="post_trashing">投稿はゴミ箱に移動中です</string>
     <string name="button_move_to_draft">下書きに移動</string>
     <string name="post_list_toggle_item_layout_list_view">リスト表示に切り替え</string>
     <string name="post_list_toggle_item_layout_cards_view">カード表示に切り替え</string>
@@ -785,17 +1181,17 @@ Language: ja_JP
     <string name="plugin_install_custom_domain_required_dialog_register_btn">ドメインを登録</string>
     <string name="plugin_install_custom_domain_required_dialog_message">プラグインをインストールするには、カスタムドメインをサイトに関連付ける必要があります。</string>
     <string name="plugin_install_custom_domain_required_dialog_title">プラグインをインストール</string>
-    <string name="new_site_creation_preview_subtitle">サイトの外見は後でカスタマイズできます</string>
     <string name="publish_on">公開日:%s</string>
     <string name="schedule_for">予約:%s</string>
     <string name="published_on">公開日時:%s</string>
     <string name="scheduled_for">予約済み:%s</string>
     <string name="stats_detail_recent_weeks">最近の週</string>
     <string name="stats_detail_average_views_per_day">平均表示数/日</string>
-    <string name="stats_months_and_years_views_label">表示数</string>
     <string name="stats_months_and_years_period_label">期間</string>
     <string name="stats_detail_months_and_years">月と年</string>
     <string name="stats_insights_load_more">さらに読み込む</string>
+    <string name="stats_months_and_years_views_label">表示数</string>
+    <string name="new_site_creation_preview_subtitle">サイトの外見は後でカスタマイズできます</string>
     <string name="stats_insights_today_stats">今日</string>
     <string name="stats_insights_best_hour">最高記録達成時間</string>
     <string name="stats_insights_best_day">最高記録達成日</string>
@@ -815,82 +1211,69 @@ Language: ja_JP
     <string name="plans_loading_error_with_cache_subtitle">プランを表示するにはインターネット接続が必須となるため、詳細情報が古い可能性があります。</string>
     <string name="plans_loading_error_no_cache_subtitle">プランを表示するにはインターネット接続が必須です。</string>
     <string name="plans_loading_error_no_plans_subtitle">現在、一時的にプランの読み込みができません。後ほど、もう一度お試しください。</string>
-    <string name="plans_loading_error_no_plans_title">プランの読み込みができません</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">ブロックエディターを使用</string>
     <string name="plans_loading_error_network_title">接続がありません</string>
+    <string name="plans_loading_error_no_plans_title">プランの読み込みができません</string>
     <string name="menu_switch_to_gutenberg_editor">ブロックエディターに切り替える</string>
-    <string name="menu_switch_to_aztec_editor">旧エディターに切り替える</string>
     <string name="stats_loading_block_error">データの読み込み中に問題が発生しました。ページを更新してもう一度お試しください。</string>
     <string name="stats_loading_error">データは読み込まれていません</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">ブロックエディターで新しい投稿やページを編集</string>
-    <string name="site_settings_gutenberg_default_for_new_posts">ブロックエディターを使用</string>
-    <string name="dialog_gutenberg_informative_title">ブロックエディター有効</string>
     <string name="exit">終了</string>
-    <string name="quick_start_sites_type_subtitle">%1$d/%2$d が完了</string>
-    <string name="quick_start_sites_type_grow">訪問者を増やす</string>
     <string name="quick_start_sites_type_customize">サイトをカスタマイズ</string>
     <string name="quick_start_sites">次のステップ</string>
     <string name="quick_start_complete_tasks_header">完了 (%d)</string>
-    <string name="quick_start_dialog_view_site_message">完成した部分をご覧ください。</string>
     <string name="quick_start_dialog_upload_icon_title">サイトアイコンをアップロード</string>
+    <string name="quick_start_sites_type_subtitle">%1$d/%2$d が完了</string>
+    <string name="quick_start_sites_type_grow">訪問者を増やす</string>
     <string name="quick_start_dialog_upload_icon_message">訪問者のブラウザーにアイコンが表示されます。センスのよいカスタムアイコンを追加しましょう。</string>
     <string name="quick_start_dialog_explore_plans_message_short">現在のプランと、その他の利用可能なプランを表示するには %1$s プラン %2$s をタップします</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">新しいページを作成するには %1$s「ページを追加」%2$s をタップします。</string>
-    <string name="quick_start_dialog_create_new_page_message_short">続行するには%1$sページ%2$sをタップします。</string>
+    <string name="quick_start_dialog_view_site_message">完成しました。お楽しみください !</string>
     <string name="quick_start_dialog_check_stats_message_short">サイトのパフォーマンスを表示するには %1$s「統計情報」%2$s をタップします。</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">新しいアイコンをアップロードするには %1$s サイトアイコン %2$s をタップ</string>
     <string name="quick_start_dialog_publish_post_message">最初の投稿の下書きを作成して公開してください。</string>
     <string name="quick_start_dialog_need_help_message">サイトの構築と訪問者を増やす方法の基本について紹介します。</string>
     <string name="quick_start_dialog_migration_title">チェックリストにいくつか変更を加えました</string>
+    <string name="quick_start_dialog_enable_sharing_title">投稿のシェアを有効化</string>
     <string name="quick_start_dialog_migration_message">訪問者を増やすためにタスクを追加しました。</string>
     <string name="quick_start_dialog_explore_plans_title">プランの内容を見る</string>
-    <string name="quick_start_dialog_explore_plans_message">有料プランのマーケティングおよび SEO ツールについての詳細を読む</string>
-    <string name="quick_start_dialog_enable_sharing_title">投稿のシェアを有効化</string>
+    <string name="quick_start_dialog_explore_plans_message">有料プランのマーケティングと SEO ツールについての詳細を読む。</string>
     <string name="quick_start_dialog_enable_sharing_message">新しい投稿を自分のソーシャルメディアアカウントと自動的に共有しましょう。</string>
-    <string name="quick_start_dialog_customize_site_message">フォントのカスタマイズや画像の追加などを行いましょう。</string>
-    <string name="quick_start_dialog_create_page_title">新規ページを作成</string>
-    <string name="quick_start_dialog_create_page_message">キーコンテンツにページを追加しましょう — 「このサイトについて」ページは、格好の出発点です。</string>
+    <string name="quick_start_remove_next_steps_menu_title">これを削除</string>
     <string name="quick_start_dialog_check_stats_title">サイト統計情報を確認</string>
     <string name="quick_start_dialog_check_stats_message">サイトのパフォーマンスを把握しましょう。</string>
-    <string name="quick_start_dialog_browse_themes_title">テーマを見る</string>
-    <string name="quick_start_dialog_browse_themes_message">豊富に用意されたレイアウトオプションのなかからぴったりのものを見つけましょう。</string>
     <string name="quick_start_dialog_remove_next_steps_message">「次のステップ」を削除すると、このサイトのすべてのツアーが非表示になります。この操作を元に戻すことはできません。</string>
     <string name="quick_start_dialog_remove_next_steps_title">次のステップを削除</string>
-    <string name="quick_start_remove_next_steps_menu_title">これを削除</string>
-    <string name="quick_start_complete_view_subtitle">リストが完成しました。おめでとうございます 。</string>
-    <string name="quick_start_complete_view_title">すべてのタスクが完了しました。</string>
+    <string name="quick_start_complete_view_subtitle">リストが完了しました。おめでとうございます。</string>
     <string name="quick_start_task_skip_menu_title">タスクをスキップ</string>
+    <string name="quick_start_complete_view_title">すべてのタスクが完了しました。</string>
     <string name="quick_start_completed_tasks_header_chevron_collapse_desc">折りたたむ</string>
     <string name="quick_start_completed_tasks_header_chevron_expand_desc">展開</string>
     <string name="notification_channel_reminder_title">リマインダー</string>
+    <string name="stats_insights_popular">最も人気の時間</string>
     <string name="stats_select_next_period_description">次の期間を選択</string>
     <string name="stats_select_previous_period_description">前の期間を選択</string>
-    <string name="stats_most_popular_percent_views">表示数: %1$d%%</string>
-    <string name="stats_insights_popular">最も人気の時間</string>
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
+    <string name="stats_most_popular_percent_views">表示数: %1$d%%</string>
     <string name="new_site_creation_site_preview_content_description">サイトのプレビューの表示</string>
     <string name="new_site_creation_clear_all_content_description">クリア</string>
     <string name="site_created_but_not_fetched_snackbar_message">接続速度が遅いようです。リストに新しいサイトが表示されない場合は、再度更新してみてください。</string>
     <string name="cancel_new_site_wizard_content_description">「Cancel Site Creation」ウィザード</string>
-    <string name="notification_new_site_creation_creating_site_subtitle">新しいサイトを作成しています</string>
     <string name="notification_new_site_creation_failed">問題が発生しました</string>
     <string name="notification_new_site_creation_title">サイトを作成</string>
     <string name="new_site_creation_create_site_button">サイトを作成</string>
-    <string name="new_site_creation_search_domain_input_hint">ドメインを検索</string>
-    <string name="new_site_creation_domain_header_subtitle">ドメインとは、インターネット上で閲覧者があなたを見つける場所です</string>
-    <string name="new_site_creation_domain_header_title">サイトのドメイン名を選択してください</string>
+    <string name="notification_new_site_creation_creating_site_subtitle">新しいサイトを作成しています</string>
+    <string name="new_site_creation_domain_header_subtitle">これが、インターネット上で他の人があなたを見つける場所です。</string>
     <string name="new_site_creation_empty_domain_list_message">検索条件一致する利用可能なアドレスはありません</string>
     <string name="site_creation_error_generic_subtitle">サーバーエラーです。もう一度お試しください</string>
     <string name="site_creation_error_generic_title">問題が発生しました</string>
     <string name="site_creation_fetch_suggestions_error_unknown">問題が発生しました</string>
-    <string name="site_creation_segments_subtitle">それに基づいて提案させていただきます。ただしそれに縛られることはありません。サイトはすべて進化するものですから。</string>
-    <string name="site_creation_segments_title">どのようなサイトを作りたいか教えてください</string>
-    <string name="new_site_creation_preview_title">サイトが作成されました。</string>
     <string name="new_site_creation_screen_title_step_count">%1$d/%2$d</string>
     <string name="new_site_creation_screen_title_general">サイトを作成</string>
     <string name="suggestions_updated_content_description">提案が更新されました</string>
     <string name="site_picker_failed_selecting_added_site">新しく追加されたインストール型のサイトを選択できませんでした。</string>
     <string name="local_post_is_conflicted">バージョンの競合</string>
+    <string name="new_site_creation_preview_title">サイトを作成しました。</string>
     <string name="preference_crash_reports_summary">アプリのパフォーマンス向上のため自動クラッシュレポートを許可する。</string>
     <string name="preference_crash_reports">クラッシュレポート</string>
     <string name="snackbar_conflict_undo">元に戻す</string>
@@ -905,25 +1288,18 @@ Language: ja_JP
     <string name="stats_no_data_for_period">この期間のデータがありません</string>
     <string name="preference_strip_image_location">メディアから位置情報を削除する</string>
     <string name="stats_cannot_be_started">現在統計を開けません。後ほど、もう一度お試しください</string>
-    <string name="gif_picker_endless_scroll_network_error">ネットワークエラーのため、一部のメディアを読み込めませんでした。</string>
     <string name="gif_picker_empty_search_list">検索と一致するメディアがありません</string>
-    <string name="gif_picker_initial_empty_text">GIF を検索してメディアライブラリに追加しましょう。</string>
-    <string name="stats_author_views_label">表示数</string>
     <string name="stats_author_label">投稿者</string>
     <string name="stats_authors">投稿者</string>
-    <string name="stats_search_terms_views_label">表示数</string>
     <string name="stats_search_terms_label">検索キーワード</string>
     <string name="stats_search_terms">検索キーワード</string>
-    <string name="stats_videos_views_label">表示数</string>
     <string name="stats_videos_title_label">タイトル</string>
     <string name="stats_videos">動画</string>
-    <string name="stats_country_views_label">表示数</string>
     <string name="stats_country_label">国名</string>
     <string name="stats_countries">国</string>
     <string name="stats_clicks_label">クリック数</string>
     <string name="stats_clicks_link_label">リンク</string>
     <string name="stats_clicks">クリック数</string>
-    <string name="stats_referrer_views_label">表示数</string>
     <string name="stats_referrer_label">リファラ</string>
     <string name="stats_referrers">リファラ</string>
     <string name="stats_posts_and_pages">投稿とページ</string>
@@ -937,17 +1313,22 @@ Language: ja_JP
     <string name="stats_insights_share_post">投稿をシェア</string>
     <string name="stats_insights_create_post">投稿を作成</string>
     <string name="stats_insights_latest_post_message">「%2$s」を公開してから%1$sが経過しました。投稿のこれまでのパフォーマンスは次のとおりです。</string>
-    <string name="stats_insights_latest_post_with_no_engagement">「%2$s」を公開してから%1$sが経過しました。投稿をシェアして閲覧数を増やしましょう。</string>
-    <string name="stats_insights_latest_post_empty">公開投稿はまだありません。公開すると、最新の投稿の概要がここに表示されます</string>
+    <string name="gif_picker_endless_scroll_network_error">ネットワークエラーのため、一部のメディアを読み込めませんでした。</string>
+    <string name="gif_picker_initial_empty_text">GIF を検索してメディアライブラリに追加しましょう。</string>
+    <string name="stats_referrer_views_label">表示数</string>
+    <string name="stats_country_views_label">表示数</string>
+    <string name="stats_videos_views_label">表示数</string>
+    <string name="stats_search_terms_views_label">表示数</string>
+    <string name="stats_author_views_label">表示数</string>
     <string name="stats_insights_tags_and_categories">タグとカテゴリー</string>
+    <string name="stats_insights_latest_post_with_no_engagement">「%2$s」を公開してから%1$sが経過しました。投稿をシェアして閲覧数を増やしましょう。</string>
     <string name="stats_insights_all_time_stats">全期間</string>
+    <string name="stats_insights_latest_post_empty">公開済み投稿はまだありません。公開すると、最新の投稿の概要がここに表示されます:</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">フォロワー</string>
     <string name="stats_publicize_service_label">サービス</string>
     <string name="stats_category_folded_name">%1$s | %2$s</string>
-    <string name="stats_tags_and_categories_views_label">表示数</string>
     <string name="stats_tags_and_categories_title_label">タイトル</string>
-    <string name="stats_posts_and_pages_views_label">表示数</string>
     <string name="stats_posts_and_pages_title_label">タイトル</string>
     <string name="stats_comments_label">コメント</string>
     <string name="stats_comments_title_label">タイトル</string>
@@ -960,6 +1341,8 @@ Language: ja_JP
     <string name="stats_followers_email">メール</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_manage_insights">インサイトを管理</string>
+    <string name="stats_posts_and_pages_views_label">表示数</string>
+    <string name="stats_tags_and_categories_views_label">表示数</string>
     <string name="stats_empty_insights_title">インサイトは追加されていません</string>
     <string name="stats_no_data_yet">データはまだありません</string>
     <string name="menu_debug">デバッグメニュー</string>
@@ -982,16 +1365,16 @@ Language: ja_JP
     <string name="history_footer_post">%1$s の %2$s に作成された投稿</string>
     <string name="history_footer_page">%1$s の %2$s に作成されたページ</string>
     <string name="history_empty_title">変更履歴がありません</string>
-    <string name="history_empty_subtitle_post">投稿に変更を加えた後は、ここで履歴を確認できます。</string>
-    <string name="history_empty_subtitle_page">ページに変更を加えた後は、ここで履歴を確認できます。</string>
+    <string name="history_empty_subtitle_post">投稿に変更を加えた後、ここで履歴を確認できます</string>
+    <string name="history_empty_subtitle_page">ページに変更を加えた後、ここで履歴を確認できます</string>
     <string name="description_user">ユーザーのアバター</string>
     <string name="image_size_full_label">フルサイズ</string>
     <string name="image_size_large_label">大</string>
     <string name="image_size_medium_label">普通</string>
     <string name="image_size_thumbnail_label">サムネイル</string>
     <string name="menu_history">履歴</string>
-    <string name="pages_open_page_error">選択したページは利用できません</string>
     <string name="pages_pending">レビュー待ち</string>
+    <string name="pages_open_page_error">選択したページは利用できません</string>
     <string name="pages_empty_trashed">ゴミ箱に移動したページはありません</string>
     <string name="pages_empty_scheduled">予約済みページはありません</string>
     <string name="pages_empty_drafts">ページの下書きはありません</string>
@@ -1011,8 +1394,7 @@ Language: ja_JP
     <string name="login_error_email_not_found_v2">この Google アカウントに一致する WordPress.com アカウントはありません。</string>
     <string name="site_picker_remove_site_empty">検索に一致するサイトはありません</string>
     <string name="reader_empty_followed_blogs_search_title">検索に一致するサイトはありません</string>
-    <string name="page_parent_changed">ページの親が変更されました。</string>
-    <string name="page_permanently_deleted">ページが完全に削除されました。</string>
+    <string name="page_parent_changed">ページの親が変更されました</string>
     <string name="page_moved_to_scheduled">ページが予約されました</string>
     <string name="page_moved_to_published">ページが公開されました</string>
     <string name="page_moved_to_trash">ページがゴミ箱に移動されました</string>
@@ -1023,15 +1405,16 @@ Language: ja_JP
     <string name="page_status_change_error">ページステータスを変更中に問題が発生しました</string>
     <string name="page_delete_error">ページを削除中に問題が発生しました</string>
     <string name="set_parent">親の設定</string>
+    <string name="page_permanently_deleted">ページは完全に削除されました</string>
     <string name="quick_start_focus_point_description">ここをタップ</string>
     <string name="quick_start_list_create_site_title">サイトの作成</string>
     <string name="quick_start_list_create_site_subtitle">サイトを立ち上げましょう。</string>
     <string name="quick_start_dialog_view_site_title">サイトを表示</string>
-    <string name="quick_start_dialog_view_site_message_short">サイトをプレビューするには、%1$sサイトを表示%2$sをタップします。</string>
     <string name="quick_start_dialog_share_site_title">サイトを共有</string>
+    <string name="quick_start_dialog_share_site_message">自分のソーシャルメディアアカウントと連携すると、サイトの新しい投稿が自動的に共有されるようになります。</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">%1$sシェアする%2$sをタップして続行</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">%1$s連携%2$sをタップして、SNS アカウントを追加</string>
-    <string name="quick_start_dialog_share_site_message">自分のソーシャルメディアアカウントと連携すると、サイトの新しい投稿が自動的に共有されるようになります。</string>
+    <string name="quick_start_dialog_view_site_message_short">サイトをプレビューするには%1$sサイトを表示%2$sをタップします</string>
     <string name="quick_start_dialog_publish_post_title">投稿を公開</string>
     <string name="quick_start_dialog_publish_post_message_short">%1$s投稿の作成%2$sをタップして、新しい党呼応を作成します</string>
     <string name="quick_start_dialog_need_help_title">始めるためのサポートが必要ですか ?</string>
@@ -1042,29 +1425,25 @@ Language: ja_JP
     <string name="quick_start_dialog_follow_sites_message_short_search">%1$s検索%2$sをタップして、興味が似たサイトを検索します</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">%1$sReader%2$sをタップして続行してください</string>
     <string name="quick_start_dialog_follow_sites_message">興味のあるサイトを見つけて、更新が公開されたらすぐ見られるようにフォローしてみましょう。</string>
-    <string name="quick_start_dialog_customize_site_title">自分のサイトをカスタマイズ</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">%1$sテーマ%2$sをタップして続行してください</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">%1$sカスタマイズ%2$sをタップして、サイトをカスタマイズします</string>
-    <string name="quick_start_dialog_choose_theme_title">テーマを選択</string>
-    <string name="quick_start_dialog_browse_themes_message_short">新しいテーマを見つけるには%1$sテーマ%2$sをタップします</string>
-    <string name="quick_start_dialog_choose_theme_message">すべてのテーマを参照して、ぴったりのテーマを見つけてください。</string>
     <string name="quick_start_button_positive">移動</string>
     <string name="quick_start_button_negative_short">キャンセル</string>
     <string name="quick_start_button_negative">後で</string>
-    <string name="content_description_more">もっと見る</string>
     <string name="my_site_create_new_site_title">サイトがありません</string>
+    <string name="content_description_more">もっと見る</string>
+    <string name="reader_empty_followed_tags_title">フォローしているトピックがありません</string>
+    <string name="reader_empty_followed_tags_subtitle">ここでトピックを追加して、お気に入りのトピックに関する投稿を検索します</string>
     <string name="login_to_to_connect_jetpack">Jetpack を接続するのに使用した WordPress.com アカウントにログインします。</string>
     <string name="install_jetpack_retry">再試行</string>
-    <string name="install_jetpack_continue">設定</string>
-    <string name="jetpack_installation_problem_message">Jetpack は現在インストールできません。</string>
     <string name="jetpack_installation_problem">問題が発生しました</string>
     <string name="jetpack_installed">Jetpack がインストールされています</string>
-    <string name="installing_jetpack_message">サイトに Jetpack をインストールしています。完了まで数分かかることがあります。</string>
     <string name="installing_jetpack">Jetpack をインストール</string>
-    <string name="install_jetpack_message">サイトのログイン情報は保存されず、Jetpack インストールのためのみに使用されます。</string>
     <string name="install_jetpack">Jetpack をインストール</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">Jetpack よくある質問</string>
+    <string name="install_jetpack_continue">設定</string>
+    <string name="jetpack_installation_problem_message">Jetpack は現在インストールできません。</string>
+    <string name="installing_jetpack_message">サイトに Jetpack をインストールしています。完了まで数分かかることがあります。</string>
+    <string name="install_jetpack_message">サイトのログイン情報は保存されず、Jetpack インストールのためのみに使用されます。</string>
     <string name="stats_jetpack_connection_setup_info">WordPress サイトの統計情報を利用するには、Jetpack プラグインのインするが必要です。</string>
     <string name="themes_empty_list">検索と一致するテーマがありません</string>
     <string name="reader_label_post_search_explainer">何をお探しですか ?</string>
@@ -1087,16 +1466,16 @@ Language: ja_JP
     <string name="notifications_empty_likes">新しい「いいね」はまだついていません</string>
     <string name="notifications_empty_followers">フォロワーはまだいません</string>
     <string name="activity_log_limited_content_on_free_plan">無料プランをご利用のため、アクティビティで確認できるイベントは限られています。</string>
-    <string name="activity_log_empty_subtitle">サイトに変更を加えた後は、ここでそのアクティビティ履歴を確認できます。</string>
     <string name="activity_log_empty_title">アクティビティはまだありません</string>
+    <string name="activity_log_empty_subtitle">サイトに変更を加えた後、ここでアクティビティ履歴を確認できます</string>
     <string name="posts_empty_list_button">投稿を作成</string>
     <string name="pages_empty_list_button">ページを作成</string>
     <string name="media_empty_upload_media">メディアをアップロード</string>
     <string name="media_empty_list">メディアファイルがありません</string>
-    <string name="reader_gallery_images_desc">ギャラリー</string>
     <string name="blavatar_desc">サイトアイコン</string>
-    <string name="theme_image_desc">テーマ画像</string>
+    <string name="reader_gallery_images_desc">ギャラリー</string>
     <string name="featured_image_desc">アイキャッチ画像</string>
+    <string name="theme_image_desc">テーマ画像</string>
     <string name="button_discard">削除</string>
     <string name="reader_avatar_desc">プロフィール写真</string>
     <string name="notification_channel_transient_title">Transient</string>
@@ -1109,41 +1488,35 @@ Language: ja_JP
     <string name="support_contact_email">連絡先メールアドレス</string>
     <string name="application_log_button">アプリケーションログ</string>
     <string name="my_tickets">自分のチケット</string>
-    <string name="activity_log_rewind_dialog_message">お使いのサイトを%1$s %2$sに巻き戻してもよいですか ? この操作により、作成したすべてのコンテンツとオプション、および作成後に行ったすべての変更が削除されます。</string>
-    <string name="activity_log_rewind_site">サイトの巻き戻し</string>
-    <string name="activity_log_currently_restoring_message_no_dates">巻き戻し中</string>
-    <string name="activity_log_currently_restoring_message">%1$s%2$sまで巻き戻しています</string>
+    <string name="activity_log_currently_restoring_message_no_dates">復元中です</string>
+    <string name="activity_log_currently_restoring_message">%1$s %2$s に復元中です</string>
     <string name="activity_log_currently_restoring_title">現在サイトを復元中です</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">サイトが正常に復元されました</string>
-    <string name="activity_log_rewind_finished_snackbar_message">サイトを復元しました\n%1$s%2$sまで巻き戻しました</string>
-    <string name="activity_log_rewind_started_snackbar_message">現在サイトを復元中です\n%1$s%2$sまで巻き戻しています</string>
     <string name="activity_log_button">「アクティビティログ」アクションボタン</string>
+    <string name="activity_log_rewind_finished_snackbar_message">サイトが正常に復元されました\n%1$s %2$s に復元されました</string>
+    <string name="activity_log_rewind_started_snackbar_message">現在サイトを復元中です\n%1$s %2$s に復元中です</string>
     <string name="plugin_auto_managed">自動管理中</string>
     <string name="reader_save_posts_locally_dialog_message">この投稿を保存し、いつでも戻ってきたときに読むことができます。この端末上のみで利用でき、保存した投稿は他の端末とは同期されません。</string>
-    <string name="reader_save_posts_locally_dialog_title">投稿を保存</string>
     <string name="reader_empty_search_request_failed">検索を実行できませんでした</string>
     <string name="reader_empty_search_title">一致する結果が見つかりません</string>
-    <string name="comment_read_source_post">元の投稿を読む</string>
+    <string name="reader_save_posts_locally_dialog_title">投稿を保存</string>
     <string name="sites">サイト</string>
+    <string name="comment_read_source_post">元の投稿を読む</string>
     <string name="signup_magic_link_title">マジックリンクが送信されました</string>
-    <string name="signup_email_screen_title">メール登録</string>
     <string name="verification_2fa_screen_title">コードの認証</string>
     <string name="selfhosted_site_login_title">ログイン情報</string>
     <string name="magic_link_sent_login_title">マジックリンクが送信されました</string>
     <string name="magic_link_login_title">マジックリンクでのログイン</string>
     <string name="site_address_login_title">サイトアドレスでのログイン</string>
     <string name="email_address_login_title">メールアドレスでのログイン</string>
-    <string name="alternatively">もしくは、</string>
     <string name="reader_empty_saved_posts_description">%s をタップし、投稿をリストに保存します。</string>
-    <string name="reader_empty_saved_posts_title">投稿はまだ保存されていません。</string>
     <string name="reader_bookmark_snack_title">投稿を保存しました</string>
     <string name="reader_bookmark_snack_btn">すべて表示</string>
-    <string name="reader_btn_bookmarked">保存しました</string>
-    <string name="reader_btn_bookmark">保存</string>
     <string name="reader_remove_bookmark">保存済み投稿から削除</string>
     <string name="reader_add_bookmark">保存済み投稿へ追加</string>
     <string name="reader_save_for_later_title">保存済みの投稿</string>
     <string name="removed">削除</string>
+    <string name="reader_empty_saved_posts_title">投稿はまだ保存されていません。</string>
     <string name="my_site_icon_content_description">サイトアイコンを変更</string>
     <string name="my_site_icon_dialog_cancel_button">キャンセル</string>
     <string name="my_site_icon_dialog_remove_button">削除</string>
@@ -1159,11 +1532,9 @@ Language: ja_JP
     <string name="reader_btn_notifications_on">サイト通知を有効にする</string>
     <string name="reader_btn_notifications_off">サイト通知を無効にする</string>
     <string name="activity_log_jetpack_icon">Jetpack アイコン</string>
-    <string name="rewind">巻き戻す</string>
     <string name="activity_log_event">イベント</string>
     <string name="activity_log_icon">アクティビティアイコン</string>
     <string name="activity_log">アクティビティログ</string>
-    <string name="activity">アクティビティ</string>
     <string name="privacy_policy_read">個人情報保護方針を読む</string>
     <string name="third_party_policy_learn_more_caption">サードパーティのものを含め、他の追跡ツールを使用します。それらについての詳細と設定方法についてお読みください。</string>
     <string name="third_party_policy_learn_more_header">サードパーティのポリシー</string>
@@ -1174,7 +1545,6 @@ Language: ja_JP
     <string name="preference_privacy_settings">プライバシー設定</string>
     <string name="preference_collect_information">情報を収集</string>
     <string name="post_submitted">投稿を送信しました</string>
-    <string name="login_email_button_signup">アカウントをまだお持ちではありませんか ?%1$s登録%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">プラグイン機能を使うには、サイトが問題のない状態でなければなりません。</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">プラグイン機能を使うには、一次ドメインサブスクリプションがこのユーザーに関連付けられている必要があります。</string>
     <string name="plugin_install_site_ineligible_non_admin_user">プラグイン機能を使うには、管理者権限が必要です。</string>
@@ -1199,10 +1569,10 @@ Language: ja_JP
     <string name="notification_settings_followed_dialog_email_posts_switch">新しい投稿をメールで通知</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">フォロー中のすべてのサイト</string>
     <string name="notification_settings_category_followed_sites">フォロー中のサイト</string>
-    <string name="content_description_person_reading_device_notification">通知付きの端末で読んでいる人</string>
     <string name="content_description_people_looking_charts">グラフとチャートを見ている人</string>
     <string name="comment_title">%s 投稿日時: %s</string>
     <string name="dialog_confirm_delete_permanently_post">この投稿を完全に削除しますか ?</string>
+    <string name="content_description_person_reading_device_notification">通知付きの端末で読んでいる人</string>
     <string name="notification_channel_important_title">重要</string>
     <string name="notification_channel_general_title">一般</string>
     <string name="photo_picker_use_photo">この写真を使用</string>
@@ -1228,7 +1598,6 @@ Language: ja_JP
     <string name="plugin_detail_banner_desc">プラグインバナー</string>
     <string name="photo_picker_wpmedia_desc">WordPress メディアから選択</string>
     <string name="photo_picker_camera_desc">カメラを開く</string>
-    <string name="photo_picker_device_desc">端末から選択</string>
     <string name="people_invite_role_info_desc">権限グループ情報</string>
     <string name="media_settings_play">再生</string>
     <string name="media_settings_image_preview_desc">画像プレビュー</string>
@@ -1241,17 +1610,18 @@ Language: ja_JP
     <string name="invite_user_delete_desc">%s を削除</string>
     <string name="profile_picture">%s のプロフィール写真</string>
     <string name="comment_checkmark_desc">チェックマーク</string>
-    <string name="signup_with_google_progress">Google アカウントを作成…</string>
+    <string name="photo_picker_device_desc">端末から選択</string>
+    <string name="signup_with_google_progress">Google アカウントで登録中…</string>
     <string name="jetpack_connection_failed_with_reason">Jetpack への接続に失敗しました:%s</string>
     <string name="jetpack_already_connected_toast">すでに Jetpack に接続しています</string>
     <string name="menu_undo_snackbar_action">取り消し</string>
-    <string name="menu_visual_mode_done_snackbar">ビジュアルモードに切り替えました。</string>
     <string name="menu_visual_mode">ビジュアルモード</string>
-    <string name="menu_html_mode_done_snackbar">HTML モードに切り替えました。</string>
     <string name="menu_html_mode">HTML モード</string>
     <string name="menu_preview">プレビュー</string>
     <string name="menu_save_as_draft">下書きとして保存</string>
     <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_visual_mode_done_snackbar">ビジュアルモードに切り替えました</string>
+    <string name="menu_html_mode_done_snackbar">HTML モードに切り替えました</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s KB</string>
@@ -1273,7 +1643,6 @@ Language: ja_JP
     <string name="edit_photo_screen_title">写真の編集</string>
     <string name="share_intent_screen_title">サイトの選択</string>
     <string name="signup_epilogue_screen_title">新しいアカウント</string>
-    <string name="login_prologue_screen_title">ログイン</string>
     <string name="login_epilogue_screen_title">現在のユーザーアカウント:</string>
     <string name="person_detail_screen_title">ユーザーの詳細</string>
     <string name="media_settings_screen_title">ファイルの詳細</string>
@@ -1287,7 +1656,7 @@ Language: ja_JP
     <string name="license_screen_title">ライセンス</string>
     <string name="release_notes_screen_title">リリースノート</string>
     <string name="signup_epilogue_error_avatar_view">アバターがアップロードされました。間もなく利用可能になります。</string>
-    <string name="permissions_denied_message">この機能に必要な権限を無効にしているようです。&lt;br/>&lt;br/>これを変更するには、権限を編集し、&lt;strong>%s&lt;/strong> が有効にされていることを確認してください。</string>
+    <string name="permissions_denied_message">この機能に必要な権限を無効にしているようです。&lt;br/&gt;&lt;br/&gt;これを変更するには、権限を編集し、&lt;strong&gt;%s&lt;/strong&gt; が有効にされていることを確認してください。</string>
     <string name="permissions_denied_title">権限</string>
     <string name="plugin_caption_featured">おすすめ</string>
     <string name="sharing_disabled_description">Jetpack 共有モジュールが無効のため、共有設定にアクセスできません。</string>
@@ -1328,42 +1697,33 @@ Language: ja_JP
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1投稿、1ファイルが未アップロード</string>
     <string name="untitled_in_parentheses">(無題)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f、%2$f</string>
     <string name="site_creation_domain_finish_button">サイトの作成</string>
     <string name="notification_site_creation_created">続行するにはタップしてください。</string>
-    <string name="notification_site_creation_title_success">サイトが作成されました。</string>
     <string name="google_error_timeout">Google が応答するのに時間がかかりすぎました。インターネット接続が安定するまで時間がかかる場合があります。</string>
     <string name="username_changer_title">ユーザー名の変更</string>
     <string name="username_changer_hint">入力してさらに候補を表示</string>
     <string name="username_changer_header">現在のユーザー名は %1$s%2$s%3$s です。いくつかの例外はありますが、他のユーザーには表示名 %4$s%5$s%6$s しか表示されません。</string>
     <string name="username_changer_error_none">%1$s%2$s%3$s から推奨されるユーザー名はありません。候補を表示するには、さらに文字または数字を入力してください。</string>
     <string name="username_changer_error_generic">ユーザー名の候補の取得中にエラーが発生しました。</string>
-    <string name="username_changer_dismiss_message">ユーザー名の変更を破棄しますか。</string>
     <string name="username_changer_dismiss_button_positive">破棄</string>
     <string name="username_changer_action">保存</string>
     <string name="content_description_add_avatar">アバターの追加</string>
-    <string name="signup_with_google_button">Google に登録</string>
-    <string name="signup_with_email_button">メールに登録</string>
     <string name="signup_user_exists">WordPress.com にすでにメールがあります。\nログインを処理しています。</string>
+    <string name="notification_site_creation_title_success">サイトを作成しました。</string>
+    <string name="username_changer_dismiss_message">ユーザー名の変更を破棄しますか ?</string>
     <string name="signup_updating_account">アカウントを更新しています…</string>
-    <string name="signup_terms_of_service_text">登録することで、%1$s利用規約%2$sに合意したことになります。</string>
     <string name="signup_magic_link_progress">メールを送信中</string>
     <string name="signup_magic_link_error_button_positive">再試行</string>
     <string name="signup_magic_link_error_button_negative">閉じる</string>
-    <string name="signup_magic_link_error">メールの送信中にエラーが発生しました。今すぐ再試行するか、しばらくしてからもう一度お試しください。</string>
     <string name="signup_epilogue_hint_username">ユーザー名</string>
-    <string name="signup_epilogue_hint_password_detail">先ほど使用したようなリンクでいつでもログインできますが、ご希望の場合はパスワードを設定することもできます。</string>
     <string name="signup_epilogue_hint_password">パスワード (オプション)</string>
     <string name="signup_epilogue_hint_display">表示名</string>
     <string name="signup_epilogue_error_button_positive">再試行</string>
     <string name="signup_epilogue_error_button_negative">戻す</string>
     <string name="signup_epilogue_error_generic">アカウントの更新中にエラーが発生しました。変更を再試行するか、元に戻して続行できます。</string>
     <string name="signup_epilogue_error_avatar">アバターのアップロード中にエラーが発生しました。</string>
-    <string name="signup_email_header">新しい WordPress.com アカウントを作成するには、メールアドレスを入力してください。</string>
-    <string name="signup_email_error_generic">メールアドレスの確認中にエラーが発生しました。</string>
-    <string name="sign_up">WordPress.com に登録</string>
-    <string name="enter_username_instead">ユーザー名でログインします。</string>
-    <string name="enter_site_address_instead">サイトのアドレスを入力してログインする。</string>
+    <string name="signup_magic_link_error">メールの送信中にエラーが発生しました。今すぐ再試行するか、しばらくしてからもう一度お試しください。</string>
+    <string name="signup_epilogue_hint_password_detail">先ほど使用したようなリンクでいつでもログインできますが、ご希望の場合はパスワードを設定することもできます。</string>
     <string name="plugin_needs_update">更新が必要</string>
     <string name="plugin_caption_search">プラグインの検索</string>
     <string name="plugin_caption_new">新規</string>
@@ -1372,25 +1732,25 @@ Language: ja_JP
     <string name="plugin_see_all">すべて表示</string>
     <string name="plugin_manage">管理</string>
     <string name="plugin_search_error">プラグインを検索できません</string>
-    <string name="plugin_installed_failed">%s のインストール中にエラーが発生しました。</string>
-    <string name="plugin_installed_successfully">%s が正常にインストールされました。</string>
     <string name="plugin_install">インストール</string>
     <string name="site_settings_like_header">いいね</string>
     <string name="my_site_add_new_site">新規サイトを追加</string>
     <string name="my_site_create_new_site">ビジネス、マガジン、個人ブログ用の新しいサイトを作成するか、既存の WordPress インストール環境を関連付けてください。</string>
-    <string name="notifications_jetpack_connection_setup_info">WordPress サイトから役立つ通知を端末で取得するには、Jetpack プラグインをインストールする必要があります。Jetpack を設定しますか ?</string>
+    <string name="plugin_installed_successfully">%s をインストールしました</string>
+    <string name="plugin_installed_failed">%s のインストール中にエラーが発生しました</string>
     <string name="site_settings_lazy_load_images">画像の遅延読み込み</string>
+    <string name="notifications_jetpack_connection_setup_info">WordPress サイトから役立つ通知を端末で取得するには、Jetpack プラグインをインストールする必要があります。Jetpack を設定しますか ?</string>
     <string name="stats_jetpack_connection_setup">Jetpack をインストール</string>
     <string name="plugin_chevron_icon_content_description">テキストを切り替え</string>
     <string name="plugin_info_your_version">お使いの WordPress バージョン</string>
     <string name="plugin_info_requires_version">必須 WordPress バージョン</string>
     <string name="plugin_info_lastupdated">最終更新</string>
-    <string name="plugin_info_version">バージョン</string>
     <string name="plugin_five_stars">5つ星</string>
     <string name="plugin_four_stars">4つ星</string>
     <string name="plugin_three_stars">3つ星</string>
     <string name="plugin_two_stars">2つ星</string>
     <string name="plugin_one_stars">1つ星</string>
+    <string name="plugin_info_version">バージョン</string>
     <string name="plugin_empty_text">何も入力されていません</string>
     <string name="plugin_num_downloads">%s回ダウンロード</string>
     <string name="plugin_num_ratings">%s評価</string>
@@ -1412,15 +1772,15 @@ Language: ja_JP
     <string name="dlg_deleting_tag">削除中</string>
     <string name="dlg_confirm_delete_tag">「%s」タグを永久に削除しますか ?</string>
     <string name="error_tag_exists">この名前のタグは既に存在します</string>
-    <string name="add_new_tag">新規タグを追加</string>
-    <string name="tag_description_hint">説明</string>
     <string name="tag_name_hint">タグ</string>
+    <string name="tag_description_hint">説明</string>
+    <string name="add_new_tag">新規タグを追加</string>
     <string name="site_settings_amp_summary">この WordPress.comサイトでは、Google が主導しているモバイル端末の読み込み時間を大幅に短縮するイニシアチブである Accelerated Mobile Pages の使用をサポートしています</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
-    <string name="site_settings_timezones_error">タイムゾーンを読み込めませんでした</string>
     <string name="site_settings_format_help">日付と時刻の書式の詳細</string>
-    <string name="site_settings_format_hint_custom">カスタム形式</string>
+    <string name="site_settings_timezones_error">タイムゾーンを読み込めませんでした</string>
     <string name="site_settings_format_entry_custom">カスタム</string>
+    <string name="site_settings_format_hint_custom">カスタム形式</string>
     <string name="site_settings_posts_per_page_title">ページ毎の投稿数</string>
     <string name="site_settings_timezone_subtitle">お住いのタイムゾーン内の都市を選択</string>
     <string name="site_settings_timezone_title">タイムゾーン</string>
@@ -1443,7 +1803,7 @@ Language: ja_JP
     <string name="plugin_removed_successfully">%s を削除しました</string>
     <string name="plugin_updated_failed_detailed">%1$s の更新中にエラーが発生しました: %2$s</string>
     <string name="plugin_updated_failed">%s の更新中にエラーが発生しました。</string>
-    <string name="plugin_updated_successfully">%s を更新しました。</string>
+    <string name="plugin_updated_successfully">%s を更新しました</string>
     <string name="plugin_available_version">バージョン %s が利用可能</string>
     <string name="plugin_detail_label_state_autoupdates">自動更新</string>
     <string name="plugin_detail_label_state_active">有効</string>
@@ -1484,7 +1844,6 @@ Language: ja_JP
     <string name="login_error_suffix">\n別のアカウントを試してみますか ?</string>
     <string name="login_error_generic">Google アカウントへの接続で何らかの問題が発生しました。</string>
     <string name="login_error_button">閉じる</string>
-    <string name="login_google_button_suffix">Google でログインする。</string>
     <string name="enter_wpcom_password_google">この Google アカウントで続行するには、一致する WordPress.com パスワードを入力してください。この操作が必要になるのは一度だけです。</string>
     <string name="error_generic_network">ネットワークエラーが発生しました。接続を確認して、もう一度お試しください。</string>
     <string name="post_settings_remove_featured_image">アイキャッチ画像を削除</string>
@@ -1493,15 +1852,14 @@ Language: ja_JP
     <string name="enter_site_address_share_intent">コンテンツを共有する WordPress サイトのアドレスを入力します。</string>
     <string name="jetpack_disconnect_error_toast">サイトの接続解除中のエラー</string>
     <string name="jetpack_disconnect_success_toast">サイトが接続解除されました</string>
-    <string name="jetpack_disconnect_confirm">連携解除</string>
     <string name="jetpack_disconnect_confirmation_message">このサイトから Jetpack の接続を解除してもよいですか ?</string>
+    <string name="jetpack_disconnect_confirm">連携解除</string>
     <string name="jetpack_disconnect_pref_title">「WordPress.com との連携を解除」</string>
-    <string name="site_settings_jetpack_whitelist_description">1つの IP アドレスまたは一連の IP アドレスをホワイトリストに追加すると、それらの IP アドレスが Jetpack によりブロックされなくなります。IPv4と IPv6を使用できます。範囲を指定するには、下限値と上限値をダッシュで区切って入力します。例:12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">単一または一連の IP アドレスをホワイトリストに追加すると、それらが Jetpack にブロックされなくなります。IPv4と IPv6を使用できます。範囲を指定するには、下限値と上限値をダッシュで区切って入力します。例: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">二段階認証が必要</string>
     <string name="jetpack_match_wpcom_via_email_title">メールを使用してアカウントを照合する</string>
     <string name="jetpack_allow_wpcom_sign_in_title">WordPress.com ログインを許可する</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com ログイン</string>
-    <string name="jetpack_brute_force_whitelist_title">ホワイトリストに登録された IP アドレス</string>
     <string name="jetpack_prevent_brute_force_title">悪意のあるログイン試行をブロックする</string>
     <string name="jetpack_prevent_brute_force_category_title">総当たり攻撃からの保護</string>
     <string name="jetpack_send_wp_notifications_title">プッシュ通知を送信する</string>
@@ -1531,24 +1889,24 @@ Language: ja_JP
     <string name="media_edit_filename_caption">ファイル名</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">代替テキスト</string>
-    <string name="connect_site">サイトと連携</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">点滅</string>
+    <string name="connect_site">サイトと連携</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">端末をバイブレート</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">音声を選択する</string>
     <string name="notification_settings_category_sights_and_sounds">視覚効果と音声</string>
     <string name="notification_settings_item_other_account_emails">WordPress.com からのメール</string>
     <string name="notification_settings_item_other_pending_drafts">保留の下書きを通知する</string>
     <string name="notification_settings_item_other_comments_other_blogs">他サイト上のコメント</string>
-    <string name="notification_settings_category_other">その他</string>
     <string name="notification_settings_item_your_sites_all_your_sites">自分の全サイト</string>
+    <string name="notification_settings_category_other">その他</string>
     <string name="notification_settings_category_your_sites">あなたのサイト</string>
-    <string name="notification_settings_master_off_message">通知設定をオフにすると、通知の種類に関係なく、このアプリからの通知がすべて無効になります。通知設定をオンにした後で、受信する通知の種類を調整できます。</string>
-    <string name="notification_settings_master_off_title">この端末で通知を受信するには、通知設定を有効化してください。</string>
-    <string name="notification_settings_master_hint_off">通知を有効にする</string>
-    <string name="notification_settings_master_hint_on">通知を無効化</string>
-    <string name="notification_settings_master_status_off">オフ</string>
-    <string name="notification_settings_master_status_on">オン</string>
+    <string name="notification_settings_main_off_message">通知設定をオフにすると、通知の種類に関係なく、このアプリからの通知がすべて無効になります。通知設定をオンにした後で、受信する通知の種類を調整できます。</string>
+    <string name="notification_settings_main_off_title">この端末で通知を受信するには、通知設定を有効化してください。</string>
+    <string name="notification_settings_main_hint_off">通知を有効化</string>
+    <string name="notification_settings_main_hint_on">通知を無効化</string>
+    <string name="notification_settings_main_status_off">オフ</string>
     <string name="max_video_resolution">最大動画サイズ</string>
+    <string name="notification_settings_main_status_on">オン</string>
     <string name="max_thumbnail_px_size">最大画像サイズ</string>
     <string name="error_upload_post_media_param">投稿内のメディアのアップロード中にエラーが発生しました: %s。</string>
     <string name="error_upload_post_param">投稿のアップロード中にエラーが発生しました: %s。</string>
@@ -1583,28 +1941,26 @@ Language: ja_JP
     <string name="login_checking_site_address">サイトアドレスの確認</string>
     <string name="login_site_address_more_help">問題が解決しない場合</string>
     <string name="login_site_address_help_content">Chrome でサイトにアクセスすると、画面の上部にあるバーにサイトアドレスが表示されます。</string>
-    <string name="login_site_address_help_title">自分のサイトアドレス:</string>
-    <string name="login_site_address_help">自分のサイトアドレスを忘れましたか ?</string>
+    <string name="login_site_address_help_title">自分のサイトアドレスは ?</string>
     <string name="login_site_address">サイトアドレス</string>
     <string name="enter_site_address">連携する WordPress サイトのアドレスを入力してください。</string>
     <string name="login_already_logged_in_wpcom">すでに WordPress.com にログインしています</string>
     <string name="login_continue">次へ</string>
-    <string name="connect_more">別のサイトと連携</string>
     <string name="enter_wpcom_password">WordPress.com パスワードを入力してください。</string>
+    <string name="connect_more">別のサイトと連携</string>
     <string name="login_magic_link_email_requesting">ログインメールのリクエスト</string>
     <string name="password_incorrect">このパスワードは間違っているようです。入力した情報をもう一度確認してから、やり直してください。</string>
     <string name="requesting_otp">SMS 経由で認証コードをリクエスト。</string>
     <string name="login_text_otp">代わりに SMS でコードを送信する</string>
     <string name="enter_verification_code">もう少しで完了です。認証アプリから認証コードを入力してください。</string>
-    <string name="open_mail">メールを開く</string>
     <string name="next">次へ</string>
     <string name="enter_email_wordpress_com">メールアドレスを使用して WordPress.com にログインすると、自分のすべての WordPress サイトを管理できます。</string>
     <string name="image_optimization_promo_desc">画像の最適化により、画像サイズを縮小して迅速に読み込めます。\n\nこれはサイト設定でいつでも変更できます。</string>
     <string name="image_optimization_promo_title">画像の最適化を有効にしますか ?</string>
     <string name="leave_off">無効のままにする</string>
-    <string name="turn_on">有効化する</string>
     <string name="me_profile_photo">プロフィール写真</string>
     <string name="error_media_parse_error">サーバーから予期しない応答が返されました</string>
+    <string name="turn_on">有効化する</string>
     <string name="upload_finished_toast">読み込みはすでに完了しているため、停止することはできません</string>
     <string name="post_title">タイトル</string>
     <string name="menu_redo">やり直し</string>
@@ -1619,10 +1975,6 @@ Language: ja_JP
     <string name="post_status_draft">下書き</string>
     <string name="post_status_pending_review">レビュー待ち</string>
     <string name="post_status_publish_post">公開</string>
-    <string name="change_location">場所を変更</string>
-    <string name="remove_location">場所を削除</string>
-    <string name="post_settings_error_placepicker_missing_play_services">場所ピッカーを開けません。Google Play サービスはご利用いただけません</string>
-    <string name="post_settings_location">場所</string>
     <string name="now">今すぐ</string>
     <string name="post_settings_password_dialog_hint">パスワードを知っているユーザーのみが、この投稿を表示できます</string>
     <string name="post_settings_excerpt_dialog_hint">抜粋は、手動で書かれたコンテンツの要約です (オプション)。</string>
@@ -1637,10 +1989,10 @@ Language: ja_JP
     <string name="notifications_tab_title_all">すべて</string>
     <string name="top_level_category_name">トップレベル</string>
     <string name="category_parent">親カテゴリー (オプション):</string>
-    <string name="media_empty_audio_list">音声がありません。</string>
-    <string name="media_empty_documents_list">文書がありません。</string>
-    <string name="media_empty_videos_list">動画がありません。</string>
-    <string name="media_empty_image_list">画像がありません。</string>
+    <string name="media_empty_audio_list">音声ファイルがありません</string>
+    <string name="media_empty_videos_list">動画がありません</string>
+    <string name="media_empty_documents_list">文書がありません</string>
+    <string name="media_empty_image_list">画像がありません</string>
     <string name="media_error_timeout">サービスが応答するのに時間がかかりすぎました</string>
     <string name="media_error_exceeds_memory_limit">ファイルが大きすぎてこのサイトにアップロードできません</string>
     <string name="media_error_exceeds_php_filesize">このサイトのアップロードサイズ上限を超えているファイルです</string>
@@ -1654,8 +2006,8 @@ Language: ja_JP
     <string name="photo_picker_soft_ask_permissions_denied">%1$sは写真へのアクセスを拒否されました。これを解決するには、権限を編集して、%2$sをオンにしてください。</string>
     <string name="reader_view_comments">コメントを表示</string>
     <string name="site_settings_video_quality_hint">動画の画質。値が高いほど、画質が良いことを意味します。</string>
-    <string name="site_settings_video_width_hint">投稿の動画をこのサイズにする</string>
     <string name="site_settings_optimize_video_summary">サイズ変更と動画圧縮を可能にするには有効化してください</string>
+    <string name="site_settings_video_width_hint">投稿の動画をこのサイズにする</string>
     <string name="site_settings_optimize_videos">ビデオを最適化</string>
     <string name="draft_uploaded">下書きをアップロードしました</string>
     <string name="report_bug">バグを報告</string>
@@ -1669,8 +2021,8 @@ Language: ja_JP
     <string name="sharing_label_message">共有ボタンのラベルテキストを変更します。このテキストを表示するには、少なくとも1つの共有ボタンを追加する必要があります。</string>
     <string name="connecting_account">連携済みアカウント</string>
     <string name="cannot_connect_account_error">アカウントが選択されていなかったため、%s の連携を確立できませんでした。</string>
-    <string name="connected">連携済み</string>
     <string name="twitter">Twitter</string>
+    <string name="connected">連携済み</string>
     <string name="likes">いいね</string>
     <string name="sharing_comment_likes_description">すべてのコメントに対して自分や他の読者が「いいね」の評価を付けられるようにする</string>
     <string name="buttons">ボタン</string>
@@ -1679,8 +2031,8 @@ Language: ja_JP
     <string name="sharing_sharing_buttons_description">投稿の下に表示されているボタンを選択してください</string>
     <string name="twitter_username">Twitter ユーザー名</string>
     <string name="sharing_comment_likes">コメントへのいいね</string>
-    <string name="button_style">ボタンスタイル</string>
     <string name="label">ラベル</string>
+    <string name="button_style">ボタンスタイル</string>
     <string name="sharing_buttons">共有ボタン</string>
     <string name="site_settings_like">「いいね」ボタン表示</string>
     <string name="site_settings_reblog">リブログボタンを表示</string>
@@ -1690,9 +2042,9 @@ Language: ja_JP
     <string name="icon_only_display">アイコンのみ</string>
     <string name="icon_and_text_display">アイコンとテキスト</string>
     <string name="connection_chooser_message">認証するアカウントを選択してください。投稿は、選択されたアカウントに自動で共有されることに注意してください。</string>
-    <string name="connecting_social_network">%s を連携中</string>
     <string name="dlg_confirm_publicize_disconnect">%s との連携を解除しますか ?</string>
     <string name="share_btn_connect_another_account">別のアカウントを連携</string>
+    <string name="connecting_social_network">%s を連携中</string>
     <string name="share_btn_reconnect">再連携</string>
     <string name="share_btn_disconnect">切断</string>
     <string name="share_btn_connect">連携</string>
@@ -1728,7 +2080,7 @@ Language: ja_JP
     <string name="editor_confirm_email_prompt_message">初回登録時にメールをお送りしています。そのメッセージを開き、青いボタンをクリックして公開を有効にしてください。</string>
     <string name="editor_confirm_email_prompt_title">メールアドレスを確認してください</string>
     <string name="toast_verification_email_send_error">認証メールの送信中にエラーが発生しました。すでに認証されていますか ?</string>
-    <string name="toast_verification_email_sent">認証メールが送信されました。受信トレイを確認してください。</string>
+    <string name="toast_verification_email_sent">認証メールを送信しました。受信トレイを確認してください</string>
     <string name="toast_saving_post_as_draft">投稿を下書きとして保存しています</string>
     <string name="photo_picker_capture_video">動画を撮る</string>
     <string name="photo_picker_capture_photo">写真を撮る</string>
@@ -1746,17 +2098,17 @@ Language: ja_JP
     <string name="editor_post_saved_online">投稿をオンラインで保存しました</string>
     <string name="site_settings_image_quality_hint">写真の画質。値が高いほど、画質が良いことを意味します。</string>
     <string name="site_settings_optimize_images_summary">写真をリサイズして圧縮できます</string>
-    <string name="media_encoder_quality_100">最高</string>
     <string name="media_encoder_quality_95">非常に高い</string>
     <string name="media_encoder_quality_90">高い</string>
     <string name="media_encoder_quality_85">普通</string>
     <string name="media_encoder_quality_80">低い</string>
     <string name="media_upload_state_uploaded">アップロード済み</string>
-    <string name="media_upload_state_failed">アップロード失敗</string>
+    <string name="media_encoder_quality_100">最高</string>
     <string name="media_upload_state_deleted">削除済み</string>
     <string name="media_upload_state_deleting">削除中</string>
     <string name="media_upload_state_uploading">アップロード中</string>
     <string name="media_upload_state_queued">待機中</string>
+    <string name="media_upload_state_failed">アップロード失敗</string>
     <string name="image_quality">画質</string>
     <string name="error_all_media_upload_canceled">不明なエラーにより、メディアのアップロードはすべてキャンセルされました。もう一度アップロードをお試しください</string>
     <string name="error_unknown_post_type">投稿フォーマットが不明です</string>
@@ -1802,8 +2154,8 @@ Language: ja_JP
     <string name="comment_q_action_liking">「いいね」を付けています…</string>
     <string name="comment_q_action_processing">処理中…</string>
     <string name="comment_q_action_done_generic">操作が完了しました。</string>
-    <string name="comment_liked">「いいね」を付けたコメント</string>
     <string name="signout">ログアウト</string>
+    <string name="comment_liked">「いいね」を付けたコメント</string>
     <string name="sign_in_wpcom">WordPress.com にログインする</string>
     <string name="reader_label_global_related_posts">WordPress.com の詳細</string>
     <string name="reader_label_local_related_posts">関連 (%s)</string>
@@ -1813,19 +2165,19 @@ Language: ja_JP
     <string name="invite_already_following">%s: すでにフォロー済です</string>
     <string name="invite_already_a_member">%s: すでにメンバーです</string>
     <string name="invite_username_not_found">%s: ユーザーが見つかりませんでした</string>
-    <string name="comment_moderated_approved">コメントが承認されました。</string>
+    <string name="comment_moderated_approved">コメントを承認しました。</string>
     <string name="like">いいね</string>
     <string name="timespan_now">今</string>
-    <string name="role_viewer">閲覧者</string>
     <string name="role_follower">フォロワー</string>
+    <string name="role_viewer">閲覧者</string>
     <string name="error_post_my_profile_no_connection">接続されていないためプロフィールを保存できませんでした</string>
-    <string name="alignment_right">右</string>
-    <string name="alignment_left">左</string>
     <string name="alignment_none">なし</string>
+    <string name="alignment_left">左</string>
+    <string name="alignment_right">右</string>
     <string name="site_settings_list_editor_action_mode_title">%1$d が選択されています</string>
     <string name="error_fetch_users_list">サイトのユーザーを取得できませんでした</string>
-    <string name="title_email_follower">メールフォロワー</string>
     <string name="title_follower">フォロワー</string>
+    <string name="title_email_follower">メールフォロワー</string>
     <string name="people_fetching">ユーザーを取得中…</string>
     <string name="people_dropdown_item_viewers">閲覧者</string>
     <string name="people_dropdown_item_email_followers">メールフォロワー</string>
@@ -1835,120 +2187,115 @@ Language: ja_JP
     <string name="viewer_remove_confirmation_message">この読者を削除すると、この読者はこのサイトにアクセスできなくなります。\n\n本当にこの読者を削除しますか ?</string>
     <string name="follower_remove_confirmation_message">削除すると、このフォロワーが再度フォローしない限り、このサイトの通知を受け取れなくなります。\n\n本当にこのフォロワーを削除しますか ?</string>
     <string name="follower_subscribed_since">購読日: %1$s</string>
-    <string name="error_remove_viewer">閲覧者を削除できませんでした。</string>
-    <string name="error_remove_follower">フォロワーを削除できませんでした。</string>
-    <string name="error_fetch_email_followers_list">サイトのメールフォロワーを取得できませんでした。</string>
-    <string name="error_fetch_followers_list">サイトのフォロワーを取得できませんでした。</string>
+    <string name="error_remove_viewer">閲覧者を削除できませんでした</string>
+    <string name="error_remove_follower">フォロワーを削除できませんでした</string>
+    <string name="error_fetch_email_followers_list">サイトのメールフォロワーを取得できませんでした</string>
+    <string name="error_fetch_followers_list">サイトのフォロワーを取得できませんでした</string>
     <string name="editor_failed_uploads_switch_html">一部のメディアのアップロードに失敗しました。この状態では、HTML モードに切り替えることは\nできません。失敗したアップロードをすべて削除して続行しますか ?</string>
-    <string name="image_width">幅</string>
-    <string name="image_link_to">リンク先</string>
     <string name="image_caption">見出し</string>
+    <string name="image_width">幅</string>
     <string name="image_settings_save_toast">変更を保存しました</string>
+    <string name="image_link_to">リンク先</string>
     <string name="image_settings_dismiss_dialog_title">保存されていない変更を破棄しますか ?</string>
     <string name="stop_upload_dialog_title">アップロードを中止しますか ?</string>
-    <string name="tap_to_try_again">タップしてもう一度お試しください。</string>
+    <string name="invite_error_some_failed">招待メールを送信しましたが、エラーが発生しました。</string>
     <string name="invite_sent">招待メールを送信しました</string>
+    <string name="tap_to_try_again">タップしてもう一度お試しください。</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
-    <string name="invite_error_some_failed">招待メールを送信しましたが、エラーが発生しました。</string>
     <string name="invite_error_sending">招待メールの送信中にエラーが発生しました。</string>
     <string name="invite_error_invalid_usernames_multiple">送信できません。無効なユーザー名またはメールアドレスがあります</string>
     <string name="invite_error_invalid_usernames_one">送信できません。ユーザー名またはメールアドレスが無効です</string>
     <string name="invite_error_no_usernames">最低1つのユーザー名を追加してください</string>
-    <string name="invite_message_info">(オプション) ユーザーへの招待メールには500文字以下のカスタムメッセージを含めることができます。</string>
-    <string name="invite_message_remaining_other">残りの文字数: %d</string>
-    <string name="invite_message_remaining_one">残り1文字です</string>
-    <string name="invite_message_remaining_zero">残り0文字です</string>
     <string name="invite_message_title">カスタムメッセージ</string>
     <string name="invite">招待</string>
     <string name="invite_names_title">ユーザー名またはメールアドレス</string>
-    <string name="invite_people">他の人を招待</string>
     <string name="my_site_header_external">外部</string>
-    <string name="send_link">リンクを送信</string>
+    <string name="invite_people">他の人を招待</string>
     <string name="label_clear_search_history">検索履歴の削除</string>
     <string name="dlg_confirm_clear_search_history">検索履歴を削除しますか ?</string>
-    <string name="reader_empty_search_description">お使いの言語では %s に関する投稿は見つかりませんでした。</string>
+    <string name="reader_empty_search_description">お使いの言語で「%s」についての投稿は見つかりませんでした</string>
     <string name="reader_hint_post_search">WordPress.com を検索</string>
+    <string name="reader_title_related_post_detail">関連記事</string>
     <string name="preview_screen_links_disabled">プレビュー画面ではリンクが無効になっています</string>
     <string name="send">送信</string>
-    <string name="person_removed">%1$s を削除しました</string>
     <string name="user_remove_confirmation_message">%1$s を削除すると、そのユーザーはこのサイトにアクセスできなくなりますが、%1$s によって作成されたコンテンツはサイト上に残ります。\n\n本当にこのユーザーを削除しますか ?</string>
+    <string name="person_removed">%1$s を削除しました</string>
     <string name="person_remove_confirmation_title">%1$s を削除</string>
-    <string name="role">権限グループ</string>
     <string name="people">人</string>
-    <string name="reader_empty_posts_in_custom_list">このリスト内のサイトには最近の投稿がありません。</string>
+    <string name="role">権限グループ</string>
+    <string name="reader_empty_posts_in_custom_list">このリスト内のサイトには最近の投稿がありません</string>
     <string name="error_remove_user">ユーザーを削除できませんでした</string>
     <string name="error_update_role">ユーザー権限グループを更新できませんでした</string>
-    <string name="error_fetch_viewers_list">サイトの閲覧者を取得できませんでした。</string>
+    <string name="error_fetch_viewers_list">サイト閲覧者を取得できませんでした</string>
     <string name="error_updating_gravatar">Gravatar 更新エラー</string>
-    <string name="error_refreshing_gravatar">Gravatar 再読み込みエラー</string>
     <string name="error_locating_image">切り抜き済み画像位置不明エラー</string>
+    <string name="error_refreshing_gravatar">Gravatar 再読み込みエラー</string>
     <string name="error_cropping_image">画像切り抜きエラー</string>
     <string name="checking_email">メールをチェック</string>
     <string name="magic_link_unavailable_error_message">現在ご利用いただけません。パスワードを入力してください</string>
     <string name="logging_in">ログインしています</string>
-    <string name="enter_your_password_instead">代わりにパスワードを入力</string>
     <string name="web_address_dialog_hint">コメントする際に公開表示されます。</string>
     <string name="capture_or_pick_photo">写真を撮影または選択</string>
-    <string name="plans">プラン</string>
     <string name="plan">プラン</string>
+    <string name="plans">プラン</string>
     <string name="export_your_content_message">投稿、ページ、設定については、%s 宛てにメールで送信されます。</string>
     <string name="export_your_content">コンテンツをエクスポート</string>
-    <string name="export_email_sent">エクスポートメールを送信しました。</string>
     <string name="exporting_content_progress">コンテンツをエクスポート中…</string>
-    <string name="checking_purchases">購入を確認中</string>
-    <string name="show_purchases">購入を表示</string>
+    <string name="export_email_sent">エクスポートメールを送信しました。</string>
     <string name="premium_upgrades_message">サイトには有効なプレミアムアップグレードがあります。サイトを削除する前に、アップグレードをキャンセルしてください。</string>
+    <string name="show_purchases">購入を表示</string>
+    <string name="checking_purchases">購入を確認中</string>
     <string name="premium_upgrades_title">プレミアムアップグレード</string>
     <string name="purchases_request_error">エラーが発生しました。購入をリクエストできませんでした。</string>
     <string name="delete_site_progress">サイトを削除中…</string>
     <string name="delete_site_hint">サイトを削除</string>
     <string name="export_site_hint">サイトを XML ファイルとしてエクスポート</string>
     <string name="primary_domain">主要ドメイン</string>
-    <string name="error_deleting_site_summary">サイトの削除中にエラーが発生しました。ヘルプが必要な場合はサポートにご連絡ください</string>
+    <string name="error_deleting_site_summary">サイトの削除中にエラーが発生しました。ヘルプが必要な場合はサポートにご連絡ください。</string>
     <string name="error_deleting_site">サイト削除エラー</string>
     <string name="site_settings_export_content_title">コンテンツをエクスポート</string>
     <string name="confirm_delete_site_prompt">以下のフィールドに %1$s と入力して確認してください。サイトは永久に消去されます。</string>
     <string name="confirm_delete_site">サイト削除を確認</string>
     <string name="contact_support">サポートに問い合わせる</string>
     <string name="start_over_text">サイトは維持したままで現在の投稿やページを削除したい場合は、サポートスタッフが投稿、ページ、メディア、コメントをすべて削除するお手伝いをさせていただきます。\n\nこうすることで、サイトと URL を保ったまま新しいコンテンツを一から作り始めることができます。サポートに連絡し、現在のコンテンツをすべて削除したい旨をお知らせください。</string>
-    <string name="let_us_help">お手伝いさせてください</string>
     <string name="site_settings_start_over_hint">サイトを最初からやり直す</string>
-    <string name="start_over">最初からやり直す</string>
+    <string name="let_us_help">お手伝いさせてください</string>
     <string name="me_btn_app_settings">アプリ設定</string>
+    <string name="start_over">最初からやり直す</string>
     <string name="editor_remove_failed_uploads">アップロードに失敗したメディアを削除</string>
     <string name="site_settings_advanced_header">高度な設定</string>
     <string name="comments_empty_list_filtered_trashed">ゴミ箱内にコメントはありません</string>
     <string name="comments_empty_list_filtered_pending">保留中のコメントはありません</string>
     <string name="comments_empty_list_filtered_approved">承認済みのコメントはありません</string>
     <string name="xmlrpc_missing_method_error">接続できませんでした。必要な XML-RPC メソッドがサーバーにありません。</string>
-    <string name="alignment_center">中央</string>
-    <string name="post_format_video">動画</string>
     <string name="post_format_status">ステータス</string>
-    <string name="post_format_standard">標準</string>
-    <string name="post_format_quote">引用</string>
-    <string name="post_format_link">リンク</string>
-    <string name="post_format_image">画像</string>
-    <string name="post_format_gallery">ギャラリー</string>
+    <string name="post_format_video">動画</string>
+    <string name="alignment_center">中央</string>
     <string name="post_format_chat">チャット</string>
-    <string name="post_format_audio">音声</string>
-    <string name="post_format_aside">アサイド</string>
+    <string name="post_format_gallery">ギャラリー</string>
+    <string name="post_format_image">画像</string>
+    <string name="post_format_link">リンク</string>
+    <string name="post_format_quote">引用</string>
+    <string name="post_format_standard">標準</string>
     <string name="notif_events">WordPress.com のコースやイベント (オンライン・オフライン) の情報。</string>
+    <string name="post_format_aside">アサイド</string>
+    <string name="post_format_audio">音声</string>
     <string name="notif_surveys">WordPress.com の研究・調査に参加する機会。</string>
     <string name="notif_tips">WordPress.com を最大限に活用するためのヒント。</string>
     <string name="notif_community">コミュニティ</string>
-    <string name="notif_research">リサーチ</string>
-    <string name="notif_suggestions">提案</string>
     <string name="replies_to_my_comments">自分のコメントへの返信</string>
-    <string name="username_mentions">ユーザー名メンション</string>
+    <string name="notif_suggestions">提案</string>
+    <string name="notif_research">リサーチ</string>
     <string name="site_achievements">サイトの達成記録</string>
-    <string name="site_follows">サイトでフォロー</string>
+    <string name="username_mentions">ユーザー名メンション</string>
     <string name="likes_on_my_posts">自分の投稿への「いいね」</string>
+    <string name="site_follows">サイトでフォロー</string>
     <string name="likes_on_my_comments">自分のコメントへの「いいね」</string>
     <string name="comments_on_my_site">サイト上のコメント</string>
     <string name="site_settings_list_editor_summary_other">%d項目</string>
     <string name="site_settings_list_editor_summary_one">1項目</string>
-    <string name="approve_auto">すべてのユーザー</string>
     <string name="approve_auto_if_previously_approved">既知のユーザーのコメント</string>
+    <string name="approve_auto">すべてのユーザー</string>
     <string name="approve_manual">コメントなし</string>
     <string name="site_settings_paging_summary_other">%d件のコメント (1ページあたり)</string>
     <string name="site_settings_paging_summary_one">1件のコメント (1ページあたり)</string>
@@ -1958,10 +2305,10 @@ Language: ja_JP
     <string name="detail_approve_auto">すべてのコメントを自動的に承認します。</string>
     <string name="detail_approve_auto_if_previously_approved">ユーザーのコメントが以前に承認されている場合、自動的に承認します</string>
     <string name="detail_approve_manual">すべてのコメントで手動の承認が必要です。</string>
-    <string name="days_quantity_other">%d日</string>
     <string name="days_quantity_one">1日</string>
-    <string name="web_address">ウェブアドレス</string>
+    <string name="days_quantity_other">%d日</string>
     <string name="primary_site">基本のサイト</string>
+    <string name="web_address">ウェブアドレス</string>
     <string name="pending_email_change_snackbar">%1$s へ送信されたメール内の認証リンクをクリックして、新しいアドレスを承認してください</string>
     <string name="editor_toast_uploading_please_wait">メディアをアップロードしています。完了するまで、しばらくお待ちください。</string>
     <string name="error_refresh_comments_showing_older">現在、コメントを更新することができないため、古いコメントが表示されます</string>
@@ -1971,13 +2318,13 @@ Language: ja_JP
     <string name="dlg_sure_to_delete_comments">これらのコメントを完全に削除しますか ?</string>
     <string name="dlg_sure_to_delete_comment">このコメントを完全に削除しますか ?</string>
     <string name="mnu_comment_delete_permanently">削除</string>
-    <string name="mnu_comment_untrash">復元</string>
     <string name="comment_deleted_permanently">コメントを削除しました</string>
+    <string name="mnu_comment_untrash">復元</string>
     <string name="comments_empty_list_filtered_spam">スパムコメントはありません</string>
-    <string name="comment_status_all">すべて</string>
     <string name="could_not_load_page">ページを読み込めません</string>
-    <string name="off">オフ</string>
+    <string name="comment_status_all">すべて</string>
     <string name="interface_language">管理画面の言語</string>
+    <string name="off">オフ</string>
     <string name="about_the_app">このアプリについて</string>
     <string name="error_post_account_settings">アカウント設定を保存できませんでした</string>
     <string name="error_fetch_account_settings">アカウント設定を読み込めませんでした</string>
@@ -1985,9 +2332,9 @@ Language: ja_JP
     <string name="site_settings_unknown_language_code_error">言語コードを認識できません</string>
     <string name="site_settings_threading_dialog_description">コメントスレッドでの入れ子化を許可する。</string>
     <string name="site_settings_threading_dialog_header">入れ子数の上限</string>
-    <string name="disabled">無効</string>
-    <string name="search">検索</string>
     <string name="remove">削除</string>
+    <string name="search">検索</string>
+    <string name="disabled">無効</string>
     <string name="site_settings_image_original_size">元のサイズ</string>
     <string name="privacy_private">サイトはあなたと、承認したユーザーのみが表示できます</string>
     <string name="privacy_public_not_indexed">誰でもサイトを閲覧することができますが、検索エンジンにはインデックスしないよう要求します</string>
@@ -1996,9 +2343,9 @@ Language: ja_JP
     <string name="about_me">自己紹介</string>
     <string name="public_display_name_hint">表示名が設定されていない場合、デフォルトでユーザー名が指定されます</string>
     <string name="public_display_name">公開表示名</string>
-    <string name="last_name">姓</string>
-    <string name="first_name">名</string>
     <string name="my_profile">プロフィール</string>
+    <string name="first_name">名</string>
+    <string name="last_name">姓</string>
     <string name="cd_related_post_preview_image">関連記事のプレビュー画像</string>
     <string name="error_post_remote_site_settings">サイト情報を保存できませんでした</string>
     <string name="error_fetch_remote_site_settings">サイト情報を取得できませんでした</string>
@@ -2007,7 +2354,7 @@ Language: ja_JP
     <string name="site_settings_paging_dialog_description">コメントスレッドを複数のページに分けます。</string>
     <string name="site_settings_paging_dialog_header">1ページあたりのコメント数</string>
     <string name="site_settings_close_after_dialog_title">コメントを閉じます</string>
-    <string name="site_settings_blacklist_description">コメントの本文、名前、URL、メール、IP にこれらの語のいずれかが含まれている場合、スパムとしてマークされます。語句の一部を入力できます。例えば、「press」は「WordPress」に一致します。</string>
+    <string name="site_settings_denylist_description">コメントの本文、名前、URL、メール、IP にこれらの単語のいずれかが含まれている場合、スパムとしてマークされます。語句の一部を入力できます。例えば、\"press\" は \"WordPress\" に一致します。</string>
     <string name="site_settings_hold_for_moderation_description">コメントの本文、名前、URL、メール、IP にこれらの語のいずれかが含まれている場合、承認待ちになります。語句の一部を入力できます。例えば、「press」は「WordPress」に一致します。</string>
     <string name="site_settings_list_editor_input_hint">単語やフレーズを入力してください</string>
     <string name="site_settings_list_editor_no_items_text">項目なし</string>
@@ -2022,10 +2369,10 @@ Language: ja_JP
     <string name="site_settings_rp_show_header_title">ヘッダーを表示</string>
     <string name="site_settings_rp_switch_summary">「関連記事」は投稿の下にサイト内の関連コンテンツを表示します。</string>
     <string name="site_settings_rp_switch_title">関連記事を表示</string>
-    <string name="site_settings_blacklist_hint">フィルターに一致するコメントはスパムとしてマークされます</string>
+    <string name="site_settings_denylist_hint">フィルターに一致するコメントはスパムとしてマークされます</string>
     <string name="site_settings_moderation_hold_hint">フィルターに一致するコメントは承認待ちになります</string>
     <string name="site_settings_multiple_links_hint">既知のユーザーからのリンク制限を無視します</string>
-    <string name="site_settings_whitelist_hint">すでに承認されたコメントの投稿者のコメントを許可し、それ以外のコメントを承認待ちにする</string>
+    <string name="site_settings_allowlist_hint">すでに承認されたコメントの投稿者のコメントを許可し、それ以外のコメントを承認待ちにする</string>
     <string name="site_settings_user_account_required_hint">ユーザー登録してログインしたユーザーのみコメントをつけられるようにする</string>
     <string name="site_settings_identity_required_hint">コメントの際、名前とメールアドレスの入力を必須にする</string>
     <string name="site_settings_paging_hint">コメントを指定したサイズに分けて表示します</string>
@@ -2048,17 +2395,16 @@ Language: ja_JP
     <string name="site_settings_address_hint">アドレスの変更は現在サポートされていません</string>
     <string name="site_settings_tagline_hint">ブログの簡単な説明やブログを表す魅力的なフレーズ</string>
     <string name="site_settings_title_hint">このサイトを短い文章で説明してください</string>
-    <string name="site_settings_whitelist_known_summary">既知のユーザーからのコメント</string>
-    <string name="site_settings_whitelist_all_summary">すべてのユーザーからのコメント</string>
+    <string name="site_settings_allowlist_known_summary">既知のユーザーからのコメント</string>
+    <string name="site_settings_allowlist_all_summary">すべてのユーザーからのコメント</string>
     <string name="site_settings_threading_summary">%d階層</string>
     <string name="site_settings_privacy_private_summary">プライベート</string>
     <string name="site_settings_privacy_hidden_summary">非表示</string>
-    <string name="site_settings_privacy_public_summary">一般公開</string>
     <string name="site_settings_delete_site_title">サイトを削除</string>
-    <string name="site_settings_blacklist_title">ブラックリスト</string>
+    <string name="site_settings_privacy_public_summary">一般公開</string>
     <string name="site_settings_moderation_hold_title">承認待ち</string>
     <string name="site_settings_multiple_links_title">コメント内のリンク</string>
-    <string name="site_settings_whitelist_title">自動で承認</string>
+    <string name="site_settings_allowlist_title">自動承認</string>
     <string name="site_settings_paging_title">ページ送り</string>
     <string name="site_settings_threading_title">スレッド化</string>
     <string name="site_settings_sort_by_title">並び替え</string>
@@ -2070,22 +2416,22 @@ Language: ja_JP
     <string name="site_settings_default_format_title">デフォルトのフォーマット</string>
     <string name="site_settings_default_category_title">デフォルトカテゴリー</string>
     <string name="site_settings_address_title">アドレス</string>
-    <string name="site_settings_tagline_title">キャッチフレーズ</string>
     <string name="site_settings_title_title">サイトのタイトル</string>
+    <string name="site_settings_tagline_title">キャッチフレーズ</string>
     <string name="site_settings_discussion_new_posts_header">新しい投稿のデフォルト</string>
-    <string name="site_settings_writing_header">投稿設定</string>
     <string name="site_settings_account_header">アカウント</string>
+    <string name="site_settings_writing_header">投稿設定</string>
     <string name="site_settings_general_header">一般</string>
     <string name="newest_first">新しいものから表示</string>
-    <string name="oldest_first">古いものから表示</string>
-    <string name="close_after">特定の日付に終了:</string>
-    <string name="comments">コメント</string>
-    <string name="related_posts">関連記事</string>
-    <string name="privacy">プライバシー</string>
     <string name="discussion">ディスカッション</string>
+    <string name="privacy">プライバシー</string>
+    <string name="related_posts">関連記事</string>
+    <string name="comments">コメント</string>
+    <string name="oldest_first">古いものから表示</string>
+    <string name="close_after">この日付に閉じる:</string>
     <string name="media_error_no_permission_upload">このサイトにメディアをアップロードする権限がありません</string>
-    <string name="unknown">不明</string>
     <string name="never">なし</string>
+    <string name="unknown">不明</string>
     <string name="reader_err_get_post_not_found">この投稿は存在しません</string>
     <string name="reader_err_get_post_not_authorized">この投稿を表示する権限がありません</string>
     <string name="reader_err_get_post_generic">この投稿を取得できません</string>
@@ -2094,25 +2440,25 @@ Language: ja_JP
     <string name="media_edit_copy_url_toast">URL をクリップボードにコピーしました</string>
     <string name="selected_theme">選択済みテーマ</string>
     <string name="could_not_load_theme">テーマを読み込めませんでした</string>
-    <string name="theme_activation_error">エラーが発生しました。テーマを有効化できませんでした。</string>
+    <string name="theme_activation_error">何か問題が発生しました。テーマを有効化できません</string>
     <string name="theme_by_author_prompt_append"> by %1$s</string>
-    <string name="theme_prompt">%1$s を選んでいただきありがとうございます。</string>
-    <string name="theme_manage_site">サイト管理</string>
-    <string name="theme_done">完了</string>
-    <string name="theme_support">サポート</string>
-    <string name="theme_details">詳細</string>
-    <string name="theme_view">表示</string>
+    <string name="theme_prompt">%1$s を選んでいただきありがとうございます</string>
     <string name="theme_try_and_customize">お試し &amp; カスタマイズ</string>
+    <string name="theme_view">表示</string>
+    <string name="theme_details">詳細</string>
+    <string name="theme_support">サポート</string>
+    <string name="theme_done">完了</string>
+    <string name="theme_manage_site">サイト管理</string>
     <string name="theme_activate">有効化</string>
-    <string name="active">有効</string>
-    <string name="support">サポート</string>
-    <string name="details">詳細</string>
-    <string name="customize">カスタマイズ</string>
     <string name="current_theme">現在のテーマ</string>
-    <string name="page_updated">ページを更新しました</string>
-    <string name="post_updated">投稿を更新しました</string>
-    <string name="page_published">ページを公開しました</string>
+    <string name="customize">カスタマイズ</string>
+    <string name="details">詳細</string>
+    <string name="support">サポート</string>
+    <string name="active">有効</string>
     <string name="post_published">投稿を公開しました</string>
+    <string name="page_published">ページを公開しました</string>
+    <string name="post_updated">投稿を更新しました</string>
+    <string name="page_updated">ページを更新しました</string>
     <string name="theme_no_search_result_found">テーマが見つかりませんでした。</string>
     <string name="reader_label_gap_marker">さらに投稿を読み込む</string>
     <string name="notifications_no_search_results">「%s」に一致するサイトはありません</string>
@@ -2135,6 +2481,7 @@ Language: ja_JP
     <string name="reader_short_like_count_one">1個の「いいね」</string>
     <string name="reader_short_like_count_none">いいね</string>
     <string name="reader_label_follow_count">%,d人のフォロワー</string>
+    <string name="reader_menu_tags">トピックとサイトを編集</string>
     <string name="reader_title_post_detail">Reader 投稿</string>
     <string name="notifications_push_summary">端末に表示される通知の設定。</string>
     <string name="notifications_email_summary">アカウントに結び付けられているメールに送信される通知の設定。</string>
@@ -2144,281 +2491,286 @@ Language: ja_JP
     <string name="error_loading_notifications">通知設定を読み込めませんでした</string>
     <string name="comment_likes">コメントへの「いいね」</string>
     <string name="app_notifications">アプリ通知</string>
-    <string name="email">メール</string>
     <string name="notifications_tab">「通知」タブ</string>
+    <string name="email">メール</string>
     <string name="notification_settings_item_other_account_emails_summary">アカウントに関する重要なお知らせは常にメールでお送りしますが、役に立つ追加情報を受け取ることもできます。</string>
     <string name="stats_insights_latest_post_summary">最新の投稿概要</string>
     <string name="connectionbar_no_connection">接続できません</string>
     <string name="post_trashed">投稿をゴミ箱へ移動しました</string>
-    <string name="button_trash">ゴミ箱</string>
     <string name="button_stats">統計情報</string>
+    <string name="button_trash">ゴミ箱</string>
     <string name="button_preview">プレビュー</string>
     <string name="button_view">表示</string>
-    <string name="button_publish">公開</string>
     <string name="button_edit">編集</string>
+    <string name="button_publish">公開</string>
     <string name="reader_toast_err_follow_blog_not_authorized">このサイトにアクセスする権限がありません</string>
     <string name="reader_toast_err_follow_blog_not_found">サイトが見つかりませんでした</string>
     <string name="undo">元に戻す</string>
     <string name="push_auth_expired">リクエストの有効期限が切れています。もう一度試すには WordPress.com にログインしてください。</string>
-    <string name="ignore">無視</string>
     <string name="stats_insights_best_ever">過去最高の表示数</string>
+    <string name="ignore">無視</string>
     <string name="stats_insights_today">今日の統計情報</string>
     <string name="stats_insights_all_time">全期間の投稿、表示数、訪問者</string>
     <string name="stats_insights">まとめ</string>
     <string name="me_disconnect_from_wordpress_com">WordPress.com からログアウト</string>
-    <string name="me_connect_to_wordpress_com">WordPress.com にログイン</string>
     <string name="me_btn_login_logout">ログイン/ログアウト</string>
-    <string name="me_btn_support">ヘルプ &amp; サポート</string>
+    <string name="me_connect_to_wordpress_com">WordPress.com にログイン</string>
     <string name="account_settings">アカウント設定</string>
+    <string name="me_btn_support">ヘルプ &amp; サポート</string>
     <string name="site_picker_cant_hide_current_site">現在のサイトのため “%s” は非表示になりませんでした</string>
     <string name="site_picker_create_wpcom">WordPress.com サイトを作成</string>
     <string name="site_picker_add_self_hosted">インストール型サイトを追加</string>
-    <string name="site_picker_add_site">新規サイトを追加</string>
     <string name="site_picker_edit_visibility">サイトを表示/非表示</string>
-    <string name="site_picker_title">サイトを選択</string>
-    <string name="my_site_btn_view_site">サイトを表示</string>
+    <string name="site_picker_add_site">新規サイトを追加</string>
     <string name="my_site_btn_view_admin">管理画面表示</string>
+    <string name="my_site_btn_view_site">サイトを表示</string>
+    <string name="site_picker_title">サイトを選択</string>
     <string name="my_site_btn_switch_site">サイト切り替え</string>
-    <string name="my_site_btn_site_settings">設定</string>
     <string name="my_site_btn_blog_posts">ブログ投稿</string>
+    <string name="my_site_btn_site_settings">設定</string>
     <string name="my_site_header_publish">公開</string>
     <string name="my_site_header_look_and_feel">外観</string>
     <string name="my_site_header_configuration">設定</string>
     <string name="reader_label_new_posts_subtitle">タップして表示</string>
     <string name="deselect_all">すべて選択解除</string>
-    <string name="select_all">すべて選択</string>
-    <string name="hide">隠す</string>
     <string name="show">表示</string>
-    <string name="auth_required">続けるにはログインしてください。</string>
-    <string name="invalid_verification_code">無効な認証コード</string>
-    <string name="verification_code">認証コード</string>
+    <string name="hide">隠す</string>
+    <string name="select_all">すべて選択</string>
     <string name="language">言語</string>
-    <string name="reader_empty_posts_request_failed">投稿を取得できません</string>
+    <string name="verification_code">認証コード</string>
+    <string name="invalid_verification_code">無効な認証コード</string>
+    <string name="auth_required">続けるにはログインしてください。</string>
     <string name="publisher">投稿者:</string>
+    <string name="reader_empty_posts_request_failed">投稿を取得できません</string>
     <string name="error_notification_open">通知を開けませんでした</string>
     <string name="stats_search_terms_unknown_search_terms">不明な検索語</string>
-    <string name="stats_view_search_terms">検索キーワード</string>
-    <string name="stats_view_authors">投稿者</string>
-    <string name="comments_fetching">コメントを取得中…</string>
-    <string name="pages_fetching">ページを取得中…</string>
     <string name="posts_fetching">投稿を取得中…</string>
     <string name="media_fetching">メディアを取得中…</string>
+    <string name="pages_fetching">ページを取得中…</string>
+    <string name="stats_view_search_terms">検索キーワード</string>
+    <string name="comments_fetching">コメントを取得中…</string>
+    <string name="stats_view_authors">投稿者</string>
     <string name="logs_copied_to_clipboard">アプリケーションログをクリップボードにコピーしました</string>
-    <string name="reader_empty_posts_in_blog">このサイトは空です</string>
     <string name="reader_label_new_posts">新規投稿</string>
-    <string name="reader_page_recommended_blogs">おすすめのサイト</string>
     <string name="error_copy_to_clipboard">テキストをクリップボードにコピーする際にエラーが発生しました</string>
     <string name="post_uploading">投稿をアップロード中</string>
-    <string name="stats_followers_years">%1$d年</string>
-    <string name="stats_followers_a_year">1年</string>
+    <string name="reader_empty_posts_in_blog">このサイトは空です</string>
+    <string name="themes_fetching">テーマを取得中…</string>
     <string name="stats_followers_months">%1$dヶ月</string>
+    <string name="stats_followers_a_year">1年</string>
+    <string name="stats_followers_years">%1$d年</string>
     <string name="stats_followers_a_month">1ヶ月</string>
-    <string name="stats_followers_days">%1$d日</string>
-    <string name="stats_followers_a_day">1日</string>
-    <string name="stats_followers_hours">%1$d時間</string>
-    <string name="stats_followers_an_hour_ago">1時間前</string>
     <string name="stats_followers_minutes">%1$d分</string>
+    <string name="stats_followers_an_hour_ago">1時間前</string>
+    <string name="stats_followers_hours">%1$d時間</string>
+    <string name="stats_followers_a_day">1日</string>
+    <string name="stats_followers_days">%1$d日</string>
     <string name="stats_followers_a_minute_ago">1分前</string>
     <string name="stats_followers_seconds_ago">数秒前</string>
-    <string name="stats_view_followers">フォロワー</string>
-    <string name="stats_view_publicize">パブリサイズ共有 </string>
     <string name="stats_view_videos">動画</string>
-    <string name="stats_view_top_posts_and_pages">投稿とページ</string>
+    <string name="stats_view_followers">フォロワー</string>
     <string name="stats_view_countries">国</string>
     <string name="stats_likes">いいね</string>
-    <string name="stats_visitors">サイト訪問者</string>
-    <string name="stats_views">表示数</string>
     <string name="stats_timeframe_years">年</string>
-    <string name="themes_fetching">テーマを取得中…</string>
+    <string name="stats_views">表示数</string>
+    <string name="stats_visitors">サイト訪問者</string>
+    <string name="stats_view_top_posts_and_pages">投稿とページ</string>
+    <string name="stats_view_publicize">パブリサイズ共有</string>
     <string name="ssl_certificate_details">詳細</string>
     <string name="cab_selected">%d件選択</string>
     <string name="browse_our_faq_button">よく聞かれる質問を表示</string>
     <string name="reader_empty_comments">コメントはまだありません</string>
-    <string name="reader_label_like">いいね</string>
     <string name="reader_label_view_original">元の記事を表示</string>
-    <string name="reader_label_comments_closed">コメントは受け付けていません</string>
+    <string name="reader_label_like">いいね</string>
     <string name="reader_title_photo_viewer">%1$d/%2$d</string>
-    <string name="error_publish_empty_post">空の投稿はできません。</string>
-    <string name="error_refresh_unauthorized_posts">投稿の表示/編集権限がありません</string>
-    <string name="error_refresh_unauthorized_pages">ページの表示/編集権限がありません</string>
-    <string name="error_refresh_unauthorized_comments">コメントの表示/編集権限がありません</string>
     <string name="more">続き</string>
-    <string name="older_month">1ヶ月以上前</string>
-    <string name="older_last_week">1週間以上前</string>
-    <string name="older_two_days">2日以上前</string>
     <string name="mnu_comment_liked">「いいね」済み</string>
     <string name="comment">コメント</string>
     <string name="comment_trashed">ゴミ箱に入れたコメント</string>
-    <string name="comment_reply_to_user">%s への返信</string>
     <string name="posts_empty_list">投稿はまだありません。新規作成してください。</string>
+    <string name="comment_reply_to_user">%s への返信</string>
     <string name="signing_out">ログアウト中…</string>
+    <string name="older_month">1ヶ月以上前</string>
+    <string name="older_two_days">2日以上前</string>
+    <string name="older_last_week">1週間以上前</string>
+    <string name="error_refresh_unauthorized_comments">コメントの表示/編集権限がありません</string>
+    <string name="error_refresh_unauthorized_pages">ページの表示/編集権限がありません</string>
+    <string name="error_refresh_unauthorized_posts">投稿の表示/編集権限がありません</string>
+    <string name="reader_label_comments_closed">コメントは受け付けていません</string>
+    <string name="reader_empty_posts_in_tag">このトピックには投稿がありません</string>
+    <string name="error_publish_empty_post">空の投稿は公開できません</string>
     <string name="reader_toast_err_generic">操作を実行できませんでした</string>
-    <string name="reader_toast_err_block_blog">サイトをブロックできませんでした</string>
     <string name="reader_toast_blog_blocked">このサイトからの投稿は今後表示されません</string>
     <string name="reader_menu_block_blog">このサイトをブロック</string>
-    <string name="schedule_verb">予約</string>
+    <string name="reader_toast_err_block_blog">サイトをブロックできませんでした</string>
     <string name="update_verb">更新</string>
-    <string name="reader_empty_recommended_blogs">おすすめサイトはありません</string>
+    <string name="schedule_verb">予約</string>
+    <string name="reader_page_followed_blogs">フォロー中のサイト</string>
     <string name="reader_toast_err_unfollow_blog">このサイトをフォローできませんでした</string>
-    <string name="reader_toast_err_follow_blog">このサイトをフォローできません</string>
     <string name="reader_toast_err_already_follow_blog">このサイトをすでにフォローしています</string>
-    <string name="reader_toast_err_get_blog_info">このサイトを表示できません</string>
     <string name="reader_label_followed_blog">サイトをフォローしました</string>
-    <string name="reader_page_followed_blogs">フォロー中のサイト</string>
+    <string name="reader_toast_err_follow_blog">このサイトをフォローできません</string>
+    <string name="reader_empty_recommended_blogs">おすすめサイトはありません</string>
     <string name="reader_title_blog_preview">Reader サイト</string>
-    <string name="ssl_certificate_ask_trust">通常問題なくサイトに接続できる場合、このエラーは誰かがあなたのサイトになりすましていることを意味しているかもしれないので、そのまま進むべきではありません。それでもこの証明書を信頼してもよいですか ?</string>
-    <string name="ssl_certificate_error">無効な SSL 証明書</string>
-    <string name="forgot_password">パスワードを忘れた場合</string>
+    <string name="reader_toast_err_get_blog_info">このサイトを表示できません</string>
+    <string name="reader_page_followed_tags">フォローしているトピック</string>
+    <string name="reader_hint_add_tag_or_url">フォローする URL またはトピックを入力</string>
     <string name="help">ヘルプ</string>
-    <string name="username_or_password_incorrect">入力されたユーザー名またはパスワードが間違っています</string>
-    <string name="email_invalid">有効なメールアドレスを入力してください</string>
-    <string name="invalid_email_message">無効なメールアドレスです</string>
+    <string name="ssl_certificate_error">無効な SSL 証明書</string>
+    <string name="ssl_certificate_ask_trust">通常問題なくサイトに接続できる場合、このエラーは誰かがあなたのサイトになりすましていることを意味しているかもしれないので、そのまま進むべきではありません。それでもこの証明書を信頼してもよいですか ?</string>
     <string name="error_downloading_image">画像ダウンロードエラー</string>
-    <string name="error_load_comment">コメントを読み込めませんでした</string>
+    <string name="blog_not_found">このブログにアクセスする際にエラーが発生しました</string>
+    <string name="mnu_comment_unspam">スパムはありません</string>
+    <string name="no_network_message">利用可能なネットワークがありません</string>
+    <string name="theme_fetch_failed">テーマの取得に失敗しました</string>
+    <string name="adding_cat_failed">カテゴリーの追加に失敗しました</string>
+    <string name="adding_cat_success">カテゴリーを追加しました</string>
+    <string name="cat_name_required">カテゴリー名は必須項目です</string>
+    <string name="email_invalid">有効なメールアドレスを入力してください</string>
     <string name="error_edit_comment">コメント編集の際にエラーが発生しました</string>
-    <string name="error_moderate_comment">承認の際にエラーが発生しました</string>
     <string name="error_generic">エラーが発生しました</string>
-    <string name="error_refresh_comments">コメントを再読み込みできませんでした</string>
-    <string name="error_refresh_pages">ページを再読み込みできませんでした</string>
-    <string name="error_refresh_posts">投稿を再読み込みできませんでした</string>
-    <string name="error_deleting_post">投稿を削除する際にエラーが発生しました</string>
+    <string name="error_load_comment">コメントを読み込めませんでした</string>
+    <string name="error_moderate_comment">承認の際にエラーが発生しました</string>
+    <string name="invalid_email_message">無効なメールアドレスです</string>
     <string name="notifications_empty_list">通知がありません</string>
     <string name="sdcard_message">メディアをアップロードするには SD カードが必要です</string>
-    <string name="cat_name_required">カテゴリー名は必須項目です</string>
-    <string name="adding_cat_success">カテゴリーを追加しました</string>
-    <string name="adding_cat_failed">カテゴリーの追加に失敗しました</string>
-    <string name="mnu_comment_unspam">スパムはありません</string>
-    <string name="theme_fetch_failed">テーマの取得に失敗しました</string>
-    <string name="blog_not_found">このブログにアクセスする際にエラーが発生しました</string>
-    <string name="gallery_error">メディア項目を読み込めませんでした。</string>
-    <string name="no_network_message">利用可能なネットワークがありません</string>
-    <string name="reader_title_applog">アプリケーションログ</string>
-    <string name="fatal_db_error">アプリのデータベースを作成する際にエラーが発生しました。アプリをもう一度インストールしてみてください。</string>
-    <string name="error_blog_hidden">このブログは非表示になっており読み込めません。設定画面から再有効化してもう一度お試しください。</string>
-    <string name="error_refresh_media">メディアファイルを再読み込みできませんでした</string>
-    <string name="wordpress_blog">WordPress ブログ</string>
+    <string name="username_or_password_incorrect">入力されたユーザー名またはパスワードが間違っています</string>
+    <string name="error_refresh_posts">投稿を再読み込みできませんでした</string>
+    <string name="error_refresh_pages">ページを再読み込みできませんでした</string>
+    <string name="error_refresh_comments">コメントを再読み込みできませんでした</string>
+    <string name="error_deleting_post">投稿を削除する際にエラーが発生しました</string>
+    <string name="gallery_error">メディア項目を読み込めませんでした</string>
     <string name="image_settings">画像設定</string>
     <string name="local_changes">ローカルの変更</string>
-    <string name="privacy_policy">プライバシーポリシー</string>
     <string name="new_media">新規メディア</string>
-    <string name="new_post">新規投稿</string>
-    <string name="notifications_empty_all">通知はまだありません。</string>
-    <string name="http_authorization_required">認証が必要です</string>
-    <string name="invalid_site_url_message">入力したサイト URL が正しいか確認してください</string>
-    <string name="open_source_licenses">オープンソースライセンス</string>
-    <string name="file_error_create">メディアアップロードの際に一時ファイルを作成できませんでした。端末上に空き容量があるか確認してください。</string>
-    <string name="category_name">カテゴリー名</string>
     <string name="add_new_category">新規カテゴリーを追加</string>
-    <string name="view_in_browser">ブラウザで表示</string>
-    <string name="remove_account">サイトを削除</string>
-    <string name="toast_comment_unedited">コメントが変更されていません</string>
+    <string name="cancel_edit">編集をキャンセル</string>
+    <string name="category_name">カテゴリー名</string>
+    <string name="comment_status_approved">承認済み</string>
+    <string name="comment_status_spam">スパム</string>
+    <string name="comment_status_trash">ゴミ箱移動済み</string>
+    <string name="comment_status_unapproved">承認待ち</string>
+    <string name="connection_error">接続エラー</string>
     <string name="content_required">コメント欄は必須項目です</string>
-    <string name="sure_to_cancel_edit_comment">このコメントの修正を中止しますか ?</string>
-    <string name="saving_changes">変更を保存中</string>
-    <string name="trash">ゴミ箱</string>
+    <string name="dlg_approving_comments">承認中</string>
     <string name="dlg_confirm_trash_comments">ゴミ箱に移動しますか ?</string>
-    <string name="dlg_trashing_comments">ゴミ箱に移動中</string>
     <string name="dlg_spamming_comments">スパムとしてマーク中</string>
+    <string name="dlg_trashing_comments">ゴミ箱に移動中</string>
     <string name="dlg_unapproving_comments">承認解除中</string>
-    <string name="dlg_approving_comments">承認中</string>
-    <string name="mnu_comment_trash">ゴミ箱</string>
-    <string name="mnu_comment_spam">スパム</string>
-    <string name="mnu_comment_unapprove">承認を解除</string>
-    <string name="mnu_comment_approve">承認</string>
     <string name="edit_comment">コメント編集</string>
-    <string name="comment_status_trash">ゴミ箱移動済み</string>
-    <string name="comment_status_spam">スパム</string>
-    <string name="comment_status_unapproved">承認待ち</string>
-    <string name="comment_status_approved">承認済み</string>
-    <string name="delete_page">固定ページを削除しますか ?</string>
-    <string name="delete_post">投稿を削除しますか ?</string>
-    <string name="post_settings">投稿設定</string>
-    <string name="file_not_found">アップロードするメディアファイルが見つかりませんでした。削除または移動されたのかもしれません。</string>
-    <string name="local_draft">ローカルの下書き</string>
-    <string name="page_settings">ページ設定</string>
+    <string name="http_authorization_required">認証が必要です</string>
+    <string name="learn_more">さらに詳しく</string>
     <string name="link_enter_url_text">リンク​​テキスト (オプション)</string>
-    <string name="cannot_delete_multi_media_items">一部のメディアは現在削除できません。後ほどもう一度お試しください。</string>
-    <string name="media_error_no_permission">メディアライブラリを表示する権限がありません</string>
+    <string name="local_draft">ローカルの下書き</string>
     <string name="media_gallery_type_thumbnail_grid">サムネイルグリッド</string>
-    <string name="learn_more">さらに詳しく</string>
+    <string name="mnu_comment_approve">承認</string>
+    <string name="mnu_comment_spam">スパム</string>
+    <string name="mnu_comment_trash">ゴミ箱</string>
+    <string name="mnu_comment_unapprove">承認を解除</string>
+    <string name="new_post">新規投稿</string>
+    <string name="open_source_licenses">オープンソースライセンス</string>
+    <string name="page_settings">ページ設定</string>
+    <string name="post_settings">投稿設定</string>
+    <string name="reader_title_applog">アプリケーションログ</string>
+    <string name="saving_changes">変更を保存中</string>
+    <string name="select_categories">カテゴリーを選択</string>
+    <string name="sure_to_cancel_edit_comment">このコメントの修正を中止しますか ?</string>
+    <string name="toast_comment_unedited">コメントが変更されていません</string>
+    <string name="trash">ゴミ箱</string>
+    <string name="view_in_browser">ブラウザで表示</string>
+    <string name="wordpress_blog">WordPress ブログ</string>
+    <string name="fatal_db_error">アプリのデータベースを作成する際にエラーが発生しました。アプリをもう一度インストールしてみてください。</string>
     <string name="post_not_found">投稿を読み込む際にエラーが発生しました。再読み込みしてもう一度お試しください。</string>
+    <string name="media_error_no_permission">メディアライブラリを表示する権限がありません</string>
+    <string name="cannot_delete_multi_media_items">一部のメディアは現在削除できません。後ほどもう一度お試しください。</string>
+    <string name="error_blog_hidden">このブログは非表示になっており読み込めません。設定画面から再有効化してもう一度お試しください。</string>
+    <string name="remove_account">サイトを削除</string>
+    <string name="notifications_empty_all">通知はまだありません。</string>
+    <string name="invalid_site_url_message">入力したサイト URL が正しいか確認してください</string>
+    <string name="file_error_create">メディアアップロードの際に一時ファイルを作成できませんでした。端末上に空き容量があるか確認してください。</string>
+    <string name="error_refresh_media">メディアファイルを再読み込みできませんでした</string>
+    <string name="file_not_found">アップロードするメディアファイルが見つかりませんでした。削除または移動されたのかもしれません。</string>
+    <string name="delete_page">固定ページを削除しますか ?</string>
+    <string name="delete_post">投稿を削除しますか ?</string>
+    <string name="privacy_policy">プライバシーポリシー</string>
     <string name="plugin_not_found">プラグインへのアクセス中にエラーが発生しました</string>
-    <string name="cancel_edit">編集をキャンセル</string>
-    <string name="connection_error">接続エラー</string>
-    <string name="select_categories">カテゴリーを選択</string>
+    <string name="reader_toast_err_add_tag">このトピックを追加できません</string>
+    <string name="reader_toast_err_remove_tag">このトピックを削除できません</string>
     <string name="share_link">リンクを共有</string>
     <string name="reader_empty_posts_in_tag_updating">投稿を取得中…</string>
-    <string name="reader_likes_you_and_multi">あなたと%,d人が「いいね」をしています。</string>
-    <string name="reader_likes_multi">%,d 人が「いいね」しています</string>
+    <string name="comment_spammed">コメントをスパムとしてマークしました</string>
     <string name="reader_label_reply">返信</string>
     <string name="cant_share_no_visible_blog">公開ブログがないため WordPress で共有できません</string>
-    <string name="comment_spammed">コメントをスパムとしてマークしました</string>
+    <string name="reader_likes_multi">%,d 人が「いいね」しています</string>
+    <string name="reader_likes_you_and_multi">あなたと%,d人が「いいね」しました</string>
+    <string name="pick_photo">画像を選択</string>
+    <string name="pick_video">動画を選択</string>
     <string name="reader_toast_err_get_post">この投稿を読み込みできません</string>
     <string name="reader_likes_you_and_one">あなたと他1人が「いいね」をつけました</string>
-    <string name="pick_video">動画を選択</string>
-    <string name="pick_photo">画像を選択</string>
-    <string name="sign_up_label">登録</string>
-    <string name="reader_toast_err_url_intent">%sを開けませんでした</string>
+    <string name="empty_list_default">リストが空です</string>
+    <string name="reader_untitled_post">(無題)</string>
+    <string name="reader_view_reblog">リブログ</string>
+    <string name="reader_btn_share">共有</string>
+    <string name="reader_btn_follow">フォロー</string>
+    <string name="reader_btn_unfollow">フォロー中</string>
+    <string name="reader_label_added_tag">%s を追加</string>
+    <string name="reader_label_removed_tag">%s を削除</string>
+    <string name="reader_likes_only_you">「いいね」をつけました</string>
     <string name="reader_toast_err_view_image">画像を表示できません</string>
     <string name="reader_toast_err_share_intent">共有に失敗しました</string>
-    <string name="reader_toast_err_comment_failed">コメントを投稿できませんでした</string>
-    <string name="reader_likes_only_you">「いいね」をつけました</string>
+    <string name="reader_toast_err_url_intent">%sを開けませんでした</string>
     <string name="reader_likes_one">1人がいいねをつけました</string>
-    <string name="reader_label_removed_tag">%s を削除</string>
-    <string name="reader_label_added_tag">%s を追加</string>
+    <string name="reader_toast_err_comment_failed">コメントを投稿できませんでした</string>
     <string name="reader_hint_comment_on_comment">コメントに返信…</string>
-    <string name="reader_btn_unfollow">フォロー中</string>
-    <string name="reader_btn_follow">フォロー</string>
-    <string name="reader_btn_share">共有</string>
-    <string name="reader_view_reblog">リブログ</string>
-    <string name="reader_untitled_post">(無題)</string>
     <string name="comments_empty_list">コメントはまだありません</string>
-    <string name="empty_list_default">リストが空です</string>
-    <string name="stats_timeframe_months">月</string>
-    <string name="stats_timeframe_weeks">週</string>
-    <string name="stats_timeframe_days">日</string>
-    <string name="stats_timeframe_yesterday">昨日</string>
+    <string name="sign_up_label">登録</string>
+    <string name="reader_toast_err_tag_exists">このトピックをすでにフォローしています</string>
+    <string name="reader_toast_err_tag_invalid">有効なトピックではありません</string>
+    <string name="themes">テーマ</string>
+    <string name="media_gallery_type_squares">正方形タイル</string>
+    <string name="media_gallery_type_tiled">タイルモザイク</string>
+    <string name="media_gallery_type_circles">丸型</string>
+    <string name="media_gallery_type_slideshow">スライドショー</string>
+    <string name="media_edit_title_text">タイトル</string>
+    <string name="media_edit_caption_text">キャプション</string>
+    <string name="media_edit_description_text">説明</string>
+    <string name="theme_activate_button">有効化</string>
+    <string name="share_action">共有</string>
+    <string name="stats">統計</string>
+    <string name="stats_view_clicks">クリック数</string>
     <string name="stats_timeframe_today">今日</string>
+    <string name="stats_timeframe_yesterday">昨日</string>
+    <string name="stats_timeframe_days">日</string>
+    <string name="stats_timeframe_weeks">週</string>
+    <string name="stats_timeframe_months">月</string>
     <string name="stats_view_referrers">リファラ</string>
-    <string name="stats_view_tags_and_categories">タグとカテゴリー</string>
-    <string name="stats_view_clicks">クリック数</string>
-    <string name="stats">統計</string>
-    <string name="share_action">共有</string>
-    <string name="theme_activate_button">有効化</string>
     <string name="media_edit_failure">更新に失敗しました</string>
-    <string name="media_edit_description_text">説明</string>
-    <string name="media_edit_caption_text">キャプション</string>
-    <string name="media_edit_title_text">タイトル</string>
-    <string name="media_gallery_type_slideshow">スライドショー</string>
-    <string name="media_gallery_type_circles">丸型</string>
-    <string name="media_gallery_type_tiled">タイルモザイク</string>
-    <string name="media_gallery_type_squares">正方形タイル</string>
-    <string name="themes">テーマ</string>
-    <string name="discard">保存しない</string>
+    <string name="stats_view_tags_and_categories">タグとカテゴリー</string>
     <string name="manage">管理</string>
+    <string name="discard">保存しない</string>
+    <string name="sign_in">ログイン</string>
+    <string name="note_reply_successful">返信を公開しました</string>
+    <string name="follows">フォロー</string>
     <string name="more_notifications">あと%d件。</string>
     <string name="new_notifications">%d件の新しい通知</string>
-    <string name="follows">フォロー</string>
-    <string name="note_reply_successful">返信を公開しました</string>
-    <string name="sign_in">ログイン</string>
     <string name="loading">読込中…</string>
-    <string name="httppassword">HTTP パスワード</string>
     <string name="httpuser">HTTP ユーザー名</string>
+    <string name="httppassword">HTTP パスワード</string>
     <string name="error_media_upload">メディアをアップロードする際にエラーが発生しました</string>
     <string name="incorrect_credentials">ユーザー名またはパスワードが正しくありません。</string>
-    <string name="log_in">ログイン</string>
-    <string name="username">ユーザー名</string>
     <string name="password">パスワード</string>
+    <string name="username">ユーザー名</string>
+    <string name="log_in">ログイン</string>
     <string name="reader">購読ブログ</string>
+    <string name="no_network_title">利用可能なネットワークがありません</string>
     <string name="pages">ページ</string>
     <string name="posts">投稿</string>
     <string name="anonymous">匿名</string>
-    <string name="no_network_title">利用可能なネットワークがありません</string>
     <string name="done">完了</string>
     <string name="ok">OK</string>
     <string name="link_enter_url">URL</string>
-    <string name="tos">利用規約</string>
     <string name="version">バージョン</string>
+    <string name="tos">利用規約</string>
     <string name="app_title">WordPress for Android</string>
     <string name="image_alignment">配置</string>
     <string name="refresh">再読み込み</string>
@@ -2430,24 +2782,24 @@ Language: ja_JP
     <string name="quickpress_add_error">ショートカット名を記入してください</string>
     <string name="pages_private">非公開</string>
     <string name="title">タイトル</string>
-    <string name="tags_separate_with_commas">タグはコンマで区切ってください</string>
     <string name="categories">カテゴリー</string>
+    <string name="tags_separate_with_commas">タグはコンマで区切ってください</string>
     <string name="dlg_deleting_comments">コメントを削除中</string>
     <string name="sdcard_title">SD カードが必要です</string>
     <string name="media">メディア</string>
-    <string name="approve">承認</string>
     <string name="delete">削除</string>
+    <string name="approve">承認</string>
     <string name="none">なし</string>
-    <string name="publish_now">今すぐ公開</string>
     <string name="reply">返信する</string>
-    <string name="on">オン</string>
     <string name="preview">プレビュー</string>
-    <string name="category_refresh_error">カテゴリーの再読み込みエラー</string>
-    <string name="error">エラー</string>
-    <string name="no">いいえ</string>
+    <string name="on">オン</string>
+    <string name="cancel">キャンセル</string>
+    <string name="save">保存</string>
+    <string name="add">追加</string>
     <string name="yes">はい</string>
+    <string name="no">いいえ</string>
+    <string name="error">エラー</string>
+    <string name="category_refresh_error">カテゴリーの再読み込みエラー</string>
     <string name="notification_settings">通知設定</string>
-    <string name="add">追加</string>
-    <string name="save">保存</string>
-    <string name="cancel">キャンセル</string>
+    <string name="publish_now">今すぐ公開</string>
 </resources>
diff --git a/WordPress/src/main/res/values-kmr/strings.xml b/WordPress/src/main/res/values-kmr/strings.xml
index 547bc1c1aadc..1bee40b218db 100644
--- a/WordPress/src/main/res/values-kmr/strings.xml
+++ b/WordPress/src/main/res/values-kmr/strings.xml
@@ -1,47 +1,136 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 14:42:16+0000
+Translation-Revision-Date: 2020-11-21 10:07:13+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: ku_TR
 -->
 <resources>
+    <string name="color_picker_label_background">Paşrû</string>
+    <string name="color_picker_label_text">Nivîs</string>
+    <string name="dialog_discard_story_ok_button_edit">Biavêje</string>
+    <string name="dialog_discard_story_message_edit">Guhertinên hatine kirin ew ê neyên tomarkirin.</string>
+    <string name="dialog_discard_story_title_edit">Guhertinan biavêje?</string>
+    <string name="label_done_button">Qediya</string>
+    <string name="label_next_button">Pêşve</string>
+    <string name="delete_button_alt">Jê bibe</string>
+    <string name="hpp_choose_error">Di bijartina sêwirê de çewtiyek derket.</string>
+    <string name="hpp_retry_error">Ji kerema xwe, girêdana înterneta xwe kontrol bike û dîsa biceribîne.</string>
+    <string name="hpp_error_subtitle">Dema ku tu ji nû ve serhêl bû li dîsa biceribîneyê bitikîne.</string>
+    <string name="hpp_error_title">Di derhêlbûnê(offline) de raxistin ne berdest in</string>
+    <string name="continue_site_credentials">Bi agahiyên xwe yên firoşgehê re dewam bike</string>
+    <string name="login_find_your_connected_email">Emaila xwe ya girêdayî bibîne</string>
+    <string name="reader_discover_no_posts_button_text">Mijaran bişopîne</string>
+    <string name="reader_discover_no_posts_subtitle">Ji bo berfirehkirina lêgerînê hewl bide mijarên zêdetir, bişopîne</string>
+    <string name="reader_discover_no_posts_title">Şandiyên nû tune ye</string>
+    <string name="reader_discover_empty_title">Bi xêr hatî!</string>
+    <string name="scan">venerîn</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; bersiv da şandiya te</string>
+    <string name="login_prologue_third_subtitle_two">Te îro li ser malpera xwe &lt;b&gt;50 likes&lt;/b&gt; ecibandin sitend</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; şandiya te eciband</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Menuya biloka şemîtonkî vebû. Bilokekê hilbijêre.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menuya biloka şemîtonkî hate girtin.</string>
+    <string name="hpp_skip_button">Derbas bibe</string>
+    <string name="hpp_choose_button">Hilbijêre</string>
+    <string name="hpp_title">Sêwirekê hilbijêre</string>
+    <string name="mlp_network_error_subtitle">Dema ku tu ji nû ve serhêl bû li dîsa biceribîneyê bitikîne an jî bi rêya bikaranîna bişkoka jêrîn rûpeleke vala biafirîne.</string>
+    <string name="mlp_network_error_title">Di derhêlbûnê(offline) de raxistin ne berdest in</string>
+    <string name="mlp_error_subtitle">Li dîsa biceribîneyê bitikîne an jî bi rêya bikaranîna bişkoka jêrîn rûpeleke vala biafirîne.</string>
+    <string name="mlp_error_title">Ji ber hebûna çewtiyekê raxistin nayên bikaranîn</string>
+    <string name="prepublishing_nudges_add_category_button">Kategorî tevlî bike</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Kategoriya nû tevlî bike</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorî</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Nesazkirî</string>
+    <string name="prepublishing_nudges_categories_action">Kategorî</string>
+    <string name="login_prologue_fifth_caption_three">Muzeyên li Londonê</string>
+    <string name="login_prologue_fifth_caption_two">Piştevanên Herî Baş ên Cîhanê</string>
+    <string name="login_prologue_fifth_caption_one">Deh kafeyên min ên sereke</string>
+    <string name="login_prologue_fifth_tag_six">Siyaset</string>
+    <string name="login_prologue_fifth_tag_five">Muzîk</string>
+    <string name="login_prologue_fifth_tag_four">Baxçevanî</string>
+    <string name="login_prologue_fifth_tag_three">Futbol</string>
+    <string name="login_prologue_fifth_tag_two">Xwarin</string>
+    <string name="login_prologue_fifth_tag_one">Huner</string>
+    <string name="login_prologue_fifth_subtitle_three">Heftane Rock n\' Roll</string>
+    <string name="login_prologue_fifth_subtitle_two">Nûçeyên Webê</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Karê wênekêş Cameron Karsten\'ê min zêde han dide. Ez ê van teknîkan piştre biceribînim</string>
+    <string name="login_prologue_second_subtitle_one">Îlhamê Bistîne</string>
+    <string name="login_prologue_title_fourth">Bi analîzên berfireh binêrin gelo girseya we çawa mezin dibe.</string>
+    <string name="login_prologue_title_third">Di dema rasteqîne de şîrove û danezanan bibîne.</string>
+    <string name="login_prologue_title_second">Bi edîtora bihêz re tu dikarî di meşê de jî şandiyan biweşîne.</string>
+    <string name="login_prologue_title_first">Tu bi xêr hatî avakera malperan a herî populer.</string>
+    <string name="media_loading_failed">Medya nehat barkirin</string>
+    <string name="reader_discover_recommended_blogs_header">Malperên şopandinê</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Ji bo em karibin bi her guhertoyê re blokên zêdetir tevlî bikin, em pir dixebitin.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' bi temamî nayê piştgirîkirin</string>
+    <string name="gutenberg_native_help_button">Bişkoka alîkariyê</string>
+    <string name="gutenberg_native_edit_using_web_editor">Bi bikaranîna edîtora webê sererast bike</string>
+    <string name="gutenberg_native_choose_images">Wêneyan hilbijêre</string>
+    <string name="stories_intro_create_story_post_label">Şandiya Çîrokî Biafirîne</string>
+    <string name="stories_intro_description_second">Ew li malpera te wekî şandiyeke nû ya blogî tê weşandin bi vî awayî girseya te ti tiştî ji dest xwe bernade.</string>
+    <string name="stories_intro_title_second">Şandiyên çîrokî wenda nabin</string>
+    <string name="stories_intro_description_first">Wêne, vîdyo û nivîsan li hev bîne û ji wan, şandiyên çîrokî yên balkêş çêke ku mêvanên te bikarin bitikînin wan û ji wan gelekî hez bikin.</string>
+    <string name="stories_intro_title_first">Niha çîrok ji bo her kesî ne</string>
+    <string name="stories_intro_image_caption_second">Sernavê çîrokê - mînak</string>
+    <string name="stories_intro_image_caption_first">Şandiya çîrokî çawa tê afirandin</string>
+    <string name="stories_intro_main_title">Danasîna Şandiyên Çîrokî</string>
+    <string name="mlp_notice_blank_page_created">Rûpela vala hat afirandin</string>
+    <string name="mlp_notice_page_created">Rûpel hat afirandin</string>
+    <string name="media_picker_soft_ask_permissions_denied">Hewla %1$s\'ê ya ji bo bigihîje wêneyên te hat redkirin. Ji bo vêya çareser bikî, destûrên xwe sererast bike, %2$s û %3$s\'ê veke.</string>
+    <string name="media_insert_failed">Tevlîkirina medyayê bi ser neket.</string>
+    <string name="media_insert_failed_with_reason">Tevlîkirina medyayê bi ser neket: %s</string>
+    <string name="photo_picker_wordpress_media_library">Ji Medyageha WordPressê Hilbijêre</string>
+    <string name="reader_label_toolbar_back">Paşve</string>
+    <string name="reader_discover_empty_button_text">Dest Pê Bike</string>
+    <string name="reader_discover_empty_subtitle">Ji bo blogên nû keşf bikî, mijaran bişopîne</string>
+    <string name="reader_post_details_header_by_author_name">Ji hêla</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Ev şander wekî spam nayê nîşankirin</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Wekî Spam nîşan neke</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Wekî Spam nîşan bike</string>
+    <string name="stats_referrer_popup_menu_open_website">Malperê Veke</string>
+    <string name="media_uploading_gif_library_photo">Hilxistina medyaya gif\'ê</string>
+    <string name="media_uploading_stock_library_photo">Hilxistina \"stock medya\"yê</string>
+    <string name="media_uploading_default">Medya tê hilxistin</string>
+    <string name="gutenberg_native_select_item">Hêmanê hilbijêre</string>
+    <string name="gutenberg_native_search_or_type_url">Li URL\'yê bigere an jî binivîse</string>
+    <string name="gutenberg_native_add_this_telephone_link">Girêdana vê telefonê tevlî bike</string>
+    <string name="gutenberg_native_add_this_link">Vê girêdanê tevlî bike</string>
+    <string name="gutenberg_native_add_this_email_link">Girêdana vê emailê tevlî bike</string>
     <string name="typeface_label_shrikhand">Qalind</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_pacifico">Lîstikî</string>
     <string name="typeface_label_oswald">Bihêz</string>
     <string name="typeface_label_libre_baskerville">Klasîk</string>
-    <string name="typeface_label_nunito">Serabera</string>
+    <string name="typeface_label_nunito">Casual</string>
     <string name="toast_capture_operation_permission_needed">Ji bo tomarkirina vîdyoyê divê tu destûra tomarkirina dengî bidî sepanê</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%s hat hilbijartin</string>
-    <string name="login_get_link_by_email">Bi E_name\'yê girêdanekê werbigire.</string>
+    <string name="login_get_link_by_email">Bi emailê girêdaneke têketinê bistîne</string>
     <string name="email_not_registered_wpcom">Hmm, em nikarin ti hesabekî WordPress.com\'ê ku bi vê navnîşana emailê ve girêdayî ye bibînin.</string>
     <string name="permission_microphone">Mîkrofon</string>
     <string name="comment_unable_to_show_error">Ev şîrove nayê nîşandan</string>
-    <string name="media_browse_for_items">Hêmanên bo gerokê</string>
+    <string name="media_browse_for_items">Hêmanan bibîne</string>
     <string name="reader_menu_report_post">Vê şandiyê rapor bike</string>
-    <string name="gutenberg_native_angle">Qozî</string>
-    <string name="reader_welcome_banner">Tu bi xêr hatî Xwînerê. Li bin tiliyên xwe bi hezaran blogan keşf bike.</string>
+    <string name="reader_welcome_banner">Tu bi xêr hatî Xwînerê. Bi milyonan blog li benda keşfkirina te ne.</string>
     <string name="error_media_xmlrcp_server_error">Çewtiya servera navxweyî rû da</string>
-    <string name="error_media_xmlrpc_not_allowed">Ji bo çalakiya te destûr nayê dayîn</string>
+    <string name="error_media_xmlrpc_not_allowed">Destûr ji bo çalakiya te nayê dayîn</string>
     <string name="show_n_hidden_items_desc">%1$s hêmanên zêdetir</string>
-    <string name="gutenberg_native_select_a_layout">Planekê hilbijêre</string>
-    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Nîşe: Di navbera pergala sitûnî, rûkar û ebatên ekranan de dibê ku cudabûn xwuya bikin</string>
+    <string name="gutenberg_native_select_a_layout">Raxistinekê hilbijêre</string>
+    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Not: Dibe ku raxistina stûnî di navbera tema û mezinahiyên ekranê de cuda bê xuyan</string>
     <string name="create_post_story_fab_tooltip">Şandî an jî çîrokekê biafirîne</string>
     <string name="create_page_fab_tooltip">Rûpelekê biafirîne</string>
     <string name="create_post_fab_tooltip">Şandiyekê biafirîne</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">Dibe ku tu biecibînî</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Veşêre</string>
     <string name="gutenberg_native_video_caption_empty">Sernivîsa vîdyoyê. Vala</string>
     <string name="gutenberg_native_updates_the_title">Sernavê hildidemîne.</string>
-    <string name="gutenberg_native_paste_block_after">Blokê li peyê bizeliqîne</string>
+    <string name="gutenberg_native_paste_block_after">Blokê li dawiya wê bizeliqîne</string>
     <string name="gutenberg_native_page_title_s">Sernavê rûpelê. %s</string>
     <string name="gutenberg_native_page_title_empty">Sernavê rûpelê. Vala</string>
-    <string name="toast_error_playing_video">Di jenandina vîdeoya te de çewtiyek rû da</string>
-    <string name="camera_error">Ev navgîna piştevaniya Camera2 API\'ê nake.</string>
-    <string name="toast_error_saving_video">Vîdyo qeyd nebû</string>
+    <string name="toast_error_playing_video">Di lêxistina vîdyoya te de çewtiyek derket</string>
+    <string name="camera_error">Ev cîhaz piştgiriya Camera2 API\'ê nake.</string>
+    <string name="toast_error_saving_video">Vîdyo nehat tomarkirin</string>
     <string name="toast_error_saving_image">Çewtiya tomarkirina wêneyê</string>
     <string name="toast_capture_operation_in_progress">Pêvajo didome, dîsa biceribîne</string>
     <string name="toast_story_page_not_found">Pêşeka Çîrokî nehat dîtin</string>
@@ -52,7 +141,7 @@ Language: ku_TR
     <string name="dialog_story_saving_error_title_plural">%1$d pêşek nehatin tomarkirin</string>
     <string name="dialog_story_saving_error_title_singular">Pêşekek nehat tomarkirin</string>
     <string name="story_saving_failed_quick_action_manage">Bi rê ve bibe</string>
-    <string name="story_saving_failed_message_plural">Ji bo %1$d pêşekan çalakî hewce ye</string>
+    <string name="story_saving_failed_message_plural">Ji bo %1$d pêşekan çalakî hewce ne</string>
     <string name="story_saving_failed_message_singular">Ji bo pêşekekê çalakî hewce ye</string>
     <string name="story_saving_failed_title">\"%1$s\" nehat hilxistin</string>
     <string name="story_saving_snackbar_finished_with_error">\"%1$s\" nehat hilxistin</string>
@@ -65,14 +154,13 @@ Language: ku_TR
     <string name="story_saving_untitled">Bêsernav</string>
     <string name="dialog_discard_story_ok_button">Biavêje</string>
     <string name="dialog_discard_story_message">Şandiya te ya çîrokî ew ê wekî reşnivîs neyê tomarkirin.</string>
-    <string name="dialog_discard_story_title">Şandiya çîrokî biavêje?</string>
+    <string name="dialog_discard_story_title">Bila şandiya çîrokî were avêtin?</string>
     <string name="dialog_discard_page_ok_button">Jê bibe</string>
     <string name="dialog_discard_errored_page_message">Ev pêşek hîn nehatiye tomarkirin. Heke tu vê pêşekê jê bibî tu yê hemû guhertinan ji dest bidî.</string>
     <string name="dialog_discard_page_message">Ev pêşek ew ê ji çîroka te were rakirin.</string>
     <string name="dialog_discard_page_title">Pêşeka çîrokî jê bibe?</string>
-    <string name="menu_delete_page">Pêşekê jê bibe</string>
     <string name="label_text_color_button">Rengê nivîsê biguherîne</string>
-    <string name="label_text_alignment_button">Paldayîna nivîsê biguherîne</string>
+    <string name="label_text_alignment_button">Spartina nivîsê biguherîne</string>
     <string name="label_frame_errored">çewtî derket</string>
     <string name="label_frame_selected_border">hat hilbijartin</string>
     <string name="label_frame_unselected_border">nehat hilbijartin</string>
@@ -80,8 +168,6 @@ Language: ku_TR
     <string name="label_retry_icon">Dîsa biceribîne</string>
     <string name="label_saved_icon">Hat tomarkirin</string>
     <string name="label_close_button">Bigire</string>
-    <string name="label_control_publish">Pêşve</string>
-    <string name="label_done">Qediya</string>
     <string name="label_share_to">Parve bike bi:</string>
     <string name="label_snackbar_share">PARVE BIKE</string>
     <string name="label_snackbar_loop_frame_saved">Li wêneyan tomar bû</string>
@@ -92,7 +178,6 @@ Language: ku_TR
     <string name="label_control_flip_camera">Berovajî bike</string>
     <string name="sound_button_alt">Deng</string>
     <string name="text_button_alt">Nivîs</string>
-    <string name="more_button_alt">Zêdetir</string>
     <string name="stickers_button_alt">Stickers</string>
     <string name="flash_button_alt">Flaş</string>
     <string name="flip_button_alt">Kamerayê bizîvirîne</string>
@@ -100,61 +185,54 @@ Language: ku_TR
     <string name="mlp_preview_page">Pêşdîtin</string>
     <string name="mlp_create_page">Rûpelekê biafirîne</string>
     <string name="mlp_create_blank_page">Rûpeleke vala biafirîne</string>
-    <string name="mlp_choose_layout_subtitle">Ji nav rûpelsaziyên berê hilbijêrin û destpê bikin. An ji pelekî vala dest pê bikin.</string>
-    <string name="mlp_choose_layout_title">Rêkxistinekê Hilbijêre</string>
+    <string name="mlp_choose_layout_subtitle">Ji nav raxistinên pirrengî yên berê çêkirî hilbijêre û dest pê bike. An jî bi rûpeleke vala re dest pê bike.</string>
+    <string name="mlp_choose_layout_title">Raxistinekê hilbijêre</string>
     <string name="prepublishing_nudges_story_title_hint">Sernavekî bide çîroka xwe</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Şandî an jî çîrokekê biafirîne</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Şandî, rûpel an jî çîrokekê biafirîne</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Li %1$s Biafirîne bitikîne. %2$s Piştre&lt;b>Şandiya Blogê&lt;/b> hilbijêre</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Li %1$s Biafirîne\'yê bitikîne. %2$s Piştre&lt;b&gt;Şandiya Blogê&lt;/b&gt; hilbijêre</string>
     <string name="photo_picker_choose_file">Ji cîhazê hilbijêre</string>
     <string name="my_site_bottom_sheet_add_story">Şandiya çîrokî</string>
-    <string name="my_site_icon_dialog_change_requires_jetpack_message">guhertina gotûbêja îkona malpera min pêdivî bi peyamek jetpack heye.</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">Ji bo tu di malperên WordPressê yên xwehewan de îkona malperê biguherînî pêveka Jetpackê hewce ye.</string>
     <string name="reader_toast_err_page_jump_not_found">Pengizîna rûpela girêdayî nayê dîtin</string>
     <string name="error_media_quota_exceeded_toast">Dosye nayê barkirin.\nBi ser kotaya Bîrgehê ket.</string>
     <string name="error_media_quota_exceeded">Bi ser kotaya Bîrgehê ket</string>
-    <string name="pick_file">Dosye tevlê bike</string>
-    <string name="gutenberg_native_replace_video">Vîdeoyê Dîscihke</string>
-    <string name="gutenberg_native_replace_image_or_video">Vîdyo an wêneyê dîscihke</string>
+    <string name="pick_file">Dosye tevlî bike</string>
+    <string name="gutenberg_native_replace_video">Vîdyoyê biguherîne</string>
+    <string name="gutenberg_native_replace_image_or_video">Vîdyo an jî wêneyê biguherîne</string>
     <string name="gutenberg_native_choose_video">Vîdyo Hilbijêre</string>
     <string name="gutenberg_native_choose_image_or_video">Vîdyo an jî wêne hilbijêre</string>
     <string name="gutenberg_native_choose_image">Wêne Hilbijêre</string>
     <string name="gutenberg_native_block_removed">Blok hat rakirin</string>
-    <string name="content_description_logo">Logoya WordPress\'ê</string>
-    <string name="enter_your_site_address">Navnîşana malpera xwe binivîse</string>
-    <string name="continue_with_wpcom">Bi WordPress.com\'ê re dewam bike</string>
+    <string name="enter_your_site_address">Navnîşana malpera xwe ya heyî bikevê</string>
     <string name="signup_confirmation_title">Pejirandina tomarbûnê</string>
     <string name="continue_with_google_terms_of_service_text">Heke tu bi Googleê re dewam bikî û hesabê te yê WordPress\'ê tune be, dema tu ajimêrekê biafirînî tu pê re %1$sMercên Xizmetê%2$s yên me qebûl dikî.</string>
     <string name="continue_terms_of_service_text">Bi domandinê re tu %1$sMercên Xizmetê%2$s yên me qebûl dikî.</string>
-    <string name="signup_confirmation_magic_link_message">Em ê girêdaneke tomarbûnê bi emailê ji te re bişînin da ku tu hesabê xwe yê nû yê WordPress.com\'ê biafirînî.</string>
     <string name="signup_confirmation_message">Em ê vê navnîşana emailê ji bo afirandina hesabê te yê nû yê WordPress.com\'ê bi kar bînin.</string>
     <string name="signup_magic_link_message">Me girêdaneke tomarbûnê ji te re şand ji bo ku tu hesabê xwe yê WordPress.com\'ê biafirînî. Li ser vê cîhazê emaila xwe kontrol bike û li girêdana ji WordPress.com\'ê hatiye, bitikîne.</string>
-    <string name="enter_account_info_for_site">Ji bo %1$s agahiyên hesabê xwe bikevê.</string>
+    <string name="enter_account_info_for_site">Ji bo %1$sê agahiyên hesabê xwe bikevê.</string>
     <string name="login_or">an jî</string>
     <string name="continue_google_button_suffix">Bi Googleê re dewam bike</string>
     <string name="login_find_your_site_adress">Navnîşana malpera xwe bibîne</string>
     <string name="login_done">Qediya</string>
     <string name="magic_link_not_seeing_email_message">Ma tu emailê nabînî? Peldanka emailên nexwestî(spam) kontrol bike.</string>
     <string name="login_magic_links_sent_label">Li ser vê cîhazê emaila xwe kontrol bike û li girêdana ji WordPress.com\'ê hatiye, bitikîne.</string>
-    <string name="login_magic_links_label">Em ê girêdaneke tu pê karibî rasterast têketinê bikî, ji te re bi emaîlê bişînin, hewceyî bi pêborînê tune ye.</string>
-    <string name="check_email">Emaîlê kontrol bike</string>
+    <string name="login_magic_links_label">Em ê girêdaneke tu pê karibî rasterast têketinê bikî, ji te re bi emailê bişînin, hewceyî bi pêborînê tune ye.</string>
+    <string name="check_email">Emailê kontrol bike</string>
     <string name="get_started">Dest Pê Bike</string>
-    <string name="enter_email_to_continue_wordpress_com">Ji bo têketinê an jî afirandina hesabekî WordPress.com\'ê navnîşana emaîla xwe bikevê.</string>
+    <string name="enter_email_to_continue_wordpress_com">Ji bo têketinê an jî afirandina hesabekî WordPress.com\'ê navnîşana emaila xwe bikevê.</string>
     <string name="or_type_your_password">An jî pêborîna xwe binivîse</string>
     <string name="create_account">Hesabekî biafirîne</string>
-    <string name="send_link_by_email">Girêdanê bi emaîlê re bişîne</string>
-    <string name="login_promo_text_unlock_the_power">Hêza malpersaza herî kêrhatî derxe meydanê.</string>
-    <string name="login_promo_title_37_percent">37% ê webê li ser WordPressê hatiye avakirin.</string>
+    <string name="send_link_by_email">Girêdanê bi emailê re bişîne</string>
     <string name="reset_your_password">Pêborîna xwe nûsaz bike</string>
-    <string name="reader_error_request_failed_title">Di hênana daxwazê de pirsgirêkek derket. Ji kerema xwe paşê dîsa biceribîne.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Nevekî bide malpera xwe bila li kesayet û mijarê wê were. Dîtina ewil girîng e!</string>
+    <string name="reader_error_request_failed_title">Di hêrana daxwazê de pirsgirêkek derket. Ji kerema xwe paşê dîsa biceribîne.</string>
     <string name="quick_start_list_update_site_title_title">Sernavê malpera xwe saz bike</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Ji bo sazkirina sernavekî nû, li &lt;b>%1$s&lt;/b>ê bitikîne</string>
-    <string name="dialog_confirm_trash_losing_local_changes_message">Jêbirina vê şandiyê ew ê guhertinên derhêlî jî rake. Bi rastî jî tu dixwazî dewam bikî?</string>
-    <string name="gutenberg_native_s_block_options">Vebijarkên bloka %sê</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Ji bo sazkirina sernavekî nû, li &lt;b&gt;%1$s&lt;/b&gt;ê bitikîne</string>
+    <string name="dialog_confirm_trash_losing_local_changes_message">Jêbirina vê şandiyê ew ê guhertinên derhêlî jî rake. Tu bi rastî jî dixwazî dewam bikî?</string>
+    <string name="gutenberg_native_s_block_options">Vebijarkên bloka %s\'ê</string>
     <string name="gutenberg_native_duplicate_block">Blokê pir bike</string>
     <string name="gutenberg_native_copy_block">Blokê kopî bike</string>
     <string name="gutenberg_native_copied_block">Blok hat kopîkirin</string>
-    <string name="gutenberg_native_block_settings">Sazkariyên blokê</string>
     <string name="gutenberg_native_block_pasted">Blok hat zeliqandin</string>
     <string name="gutenberg_native_block_duplicated">Blok hat pirkirin</string>
     <string name="gutenberg_native_block_cut">Blokê jê bike</string>
@@ -166,11 +244,10 @@ Language: ku_TR
     <string name="dialog_confirm_trash_losing_unsaved_changes_title">Guhertinên netomarkirî</string>
     <string name="gutenberg_native_open_link_in_a_browser">Girêdanê di gerokê de veke</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient">Diçe beşa taybetkirina gradyanê</string>
-    <string name="gutenberg_native_navigates_to_custom_color_picker">Diçe bijêra rengê taybet</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Diçe bijêra rengên taybet</string>
     <string name="gutenberg_native_gradient_type">Cûreya Gradyanê</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Ji bo vebijarkekê hilbijêrî, ducar bitikîne</string>
     <string name="gutenberg_native_customize_gradient">Gradyanê taybet bike</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Nivîskarê rûpelê</string>
     <string name="photo_picker_use_gif">Vê GIF\'ê bi kar bîne</string>
     <string name="error_media_thumbnail_not_loaded">Wêneyê biçûk ê medyayê nehat barkirin</string>
@@ -179,12 +256,12 @@ Language: ku_TR
     <string name="me">Ez</string>
     <string name="gutenberg_native_dismiss">Veşêre</string>
     <string name="prepublishing_nudges_home_tags_not_set">Nesazkirî</string>
-    <string name="prepublishing_tags_description">Etîket di derbarê çi bûna şandiyê de ji xwîneran re dibin alîkar.</string>
+    <string name="prepublishing_tags_description">Etîket di derbarê mijara şandiyan de ji xwîneran re dibin alîkar.</string>
     <string name="prepublishing_nudges_toolbar_title_publish">Demweşan</string>
-    <string name="prepublishing_nudges_toolbar_title_tags">Etîketan tevlê bike</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Etîketan tevlî bike</string>
     <string name="prepublishing_nudges_back_button">Paşve</string>
     <string name="prepublishing_nudges_home_save_button">Aniha tomar bike</string>
-    <string name="prepublishing_nudges_home_submit_button">Aniha bişîne</string>
+    <string name="prepublishing_nudges_home_submit_button">Aniha Bişîne</string>
     <string name="prepublishing_nudges_home_schedule_button">Aniha demsaz bike</string>
     <string name="prepublishing_nudges_home_header_publishing_to">Tê weşandin li</string>
     <string name="prepublishing_nudges_tags_action">Etîket</string>
@@ -192,42 +269,35 @@ Language: ku_TR
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Betal bike</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Vegerîne Reşnîvîsê</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Şandiyên ketine jêbirdankê nayên sererastkirin. Ji bo tu karibî li ser wê bixebitî em rewşa şandiyê bikin \"reşnivîs\"?</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_title">Bila şandî veguheze Reşnivîsan?</string>
-    <string name="reader_label_choose_your_interests">Mijarên bala te dikişîne hilbijêre</string>
-    <string name="reader_choose_interests_content_description">Mijarên bala te dikişîne hilbijêre</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">Bila şandî veguheze nav Reşnivîsan?</string>
     <string name="reader_btn_done">Qediya</string>
-    <string name="reader_btn_select_few_interests">Ji bo domandinê çend heban hilbijêre</string>
+    <string name="reader_btn_select_few_interests">Ji bo domandinê hinekan hilbijêre</string>
     <string name="post_status_post_published">Weşandî</string>
     <string name="post_status_post_trashed">Çû jêbirdankê</string>
     <string name="post_status_post_scheduled">Demsazkirî</string>
     <string name="publish_date">Demweşan</string>
     <string name="ccpa_privacy_notice_read">Hişyariya nihêniyê ya CCPA\'yê bixwîne</string>
-    <string name="ccpa_privacy_notice_caption">Qanûna Nihênîtiya Xerîdaran ya Californiayê (\"CCPA\") me mecbûr dike em şêniyên Californiayê agahdar bikin; derbarê wan kategoriyên agahiyên kesane de yên ku em kom dikin û parve dikin, herwiha ka em wan agahiyên kesane ji kû distînin û em wan çawa û çima bi kar tînin.</string>
+    <string name="ccpa_privacy_notice_caption">Qanûna Ewlehiya Mezêxeran a Kalîforniyayê (\"CCPA\") li me ferz dike ji bo em zêdetir agahiyan bidin şêniyên Kalîforniyayê; derbarê kategoriyên agahiyên şexsî de yên ku em kom dikin û parve dikin, em wan agahiyên şexsî ji ku bi dest dixin û em wan çawa û çima bi kar tînin.</string>
     <string name="ccpa_privacy_notice_header">Hişyariya nihêniyê ji bo bikarhênerên Kalîforniyayê</string>
-    <string name="status_and_visibility">Rewş û Xuyanî</string>
-    <string name="update_now">Aniha hildemîne</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Rûpelsaziya destpêkê biceribînin</string>
+    <string name="status_and_visibility">Rewş &amp; Xuyanî</string>
+    <string name="update_now">Aniha Hildemîne</string>
     <string name="gutenberg_native_open_block_actions_menu">Menuya çalakiyên blokê veke</string>
-    <string name="gutenberg_native_insert_mention">Behskirinê tevlîke</string>
-    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Ji bo Pelê Jêrîn yê bi vebijêrkên berdest vebe, du caran bitepîne</string>
-    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Ji bo Pelê Çalakiyan yê bi vebijêrkên berdest vebe, du caran bitepîne</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Ji bo ku Rûpela Jêrîn bi vebijarkên berdest re vebe, ducar bitikîne</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Ji bo Rûpela Çalakiyan bi vebijarkên berdest re vebe, ducar bitikîne</string>
     <string name="pages_cannot_be_started">Em aniha nikarin rûpelan vekin. Ji kerema xwe piştre dîsa biceribîne</string>
     <string name="pages_set_as_posts_page">Bike Rûpela Şandiyan</string>
     <string name="pages_set_as_homepage">Wekî Serrûpel saz bike</string>
-    <string name="suggestion_no_matching_users">\"Bikarhênerên wiha tune ne.\"</string>
-    <string name="suggestion_invalid_user">\"%s ne navekî derbasdar yê bikarhênerekî ye\"</string>
     <string name="site_settings_select_page">Rûpelê hilbijêre</string>
-    <string name="site_settings_posts_page">Rûpela şandiyan</string>
+    <string name="site_settings_posts_page">Rûpela Şandiyan</string>
     <string name="site_settings_static_homepage">Serrûpela Sabît</string>
-    <string name="site_settings_classic_blog">Bloga klasîk</string>
+    <string name="site_settings_classic_blog">Bloga Klasîk</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Serrûpela hilbijartî û rûpela şandiyan nabe wekî hev bin.</string>
     <string name="site_settings_failed_update_homepage_settings">Sazkariyên serrûpelê nehat hildemandin, girêdana înterneta xwe kontrol bike</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Heta rûpel neyên barkirin sazkariyên serrûpelê nayên tomarkirin</string>
     <string name="site_settings_failed_to_save_homepage_settings">Sazkariyên serrûpelê nayên tomarkirin</string>
     <string name="site_settings_accept_homepage">Bipejirîne</string>
-    <string name="site_settings_failed_to_load_pages">Barkirina rûpelan têk çû</string>
-    <string name="site_settings_homepage_settings_description">An serrûpeleke şandiyên te yên herî dawî nîşan dide (bloga klasîk) an jî rûpeleke sabit/statîk hilbijêre.</string>
+    <string name="site_settings_failed_to_load_pages">Barkirina rûpelan bi ser neket</string>
+    <string name="site_settings_homepage_settings_description">Ji bo şandiyên te yên herî dawî lê bên nîşandan, serrûpelekê (bloga klasîk) an jî rûpeleke sabît/statîk hilbijêre.</string>
     <string name="site_settings_homepage_settings">Sazkariyên Serrûpelê</string>
     <string name="site_settings_homepage">Serrûpel</string>
     <string name="page_posts_page_update_failed">Rûpela şandiyan nehat hildemandin</string>
@@ -236,15 +306,14 @@ Language: ku_TR
     <string name="page_homepage_successfully_updated">Serrûpel bi serkevtî hat hildemandin</string>
     <string name="page_cannot_set_posts_page">Ji bo sazkirina rûpela Şandiyan, di Sazkariyên Malperê de \"Serrûpela Sabît\" biçalakîne</string>
     <string name="page_cannot_set_homepage">Ji bo sazkirina Serrûpelê, di Sazkariyên Malperê de \"Serrûpela Sabît\" biçalakîne</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Tu bi xêr hatî bloga me ya nû</string>
     <string name="gutenberg_native_select_a_color">Rengekî hilbijêre</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Ji bo biçî sazkariyên rengan, ducar bitikîne</string>
     <string name="reader_empty_followed_blogs_description">Dema ku te malper şopandin tu yê naverokên wan li vira bibînî</string>
     <string name="feature_announcement_find_out_mode">Zêdetirî wê bibîne</string>
     <string name="feature_announcement_dialog_label">Di WordPress\'ê De Çi Nû Ne</string>
-    <string name="insert_label_with_count">%dê tevlê bike</string>
+    <string name="insert_label_with_count">%d\'ê tevlî bike</string>
     <string name="crop">biqusîne</string>
-    <string name="error_failed_to_load_into_file">Pelge nehat barkirin, jkx dîsa biceribîne.</string>
+    <string name="error_failed_to_load_into_file">Dosye nehat barkirin, ji kerema xwe dîsa biceribîne.</string>
     <string name="preview_image_thumbnail_description">Pêşdîtina Wêneyê Biçûk</string>
     <string name="photo_picker_use_media">Vê medyayê bi kar bîne</string>
     <string name="photo_picker_use_video">Vê vîdyoyê bi kar bîne</string>
@@ -261,7 +330,7 @@ Language: ku_TR
     <string name="copy_link_address">Navnîşana girêdanê kopî bike</string>
     <string name="comment_share_link_via">Parve bike bi</string>
     <string name="comment_toast_err_share_intent">Nehat parvekirin</string>
-    <string name="button_insert">Tevlê bike</string>
+    <string name="button_insert">Tevlî bike</string>
     <string name="continue_label">Bidomîne</string>
     <string name="copy_text">Kopî bike</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Blokê ji pozisyona %1$sê, ber bi rastê ve bikişîne pozisyona %2$sê</string>
@@ -270,18 +339,17 @@ Language: ku_TR
     <string name="gutenberg_native_move_block_left">Blokê veguhezîne çepê</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Ji bo blokê veguhezînî rastê, ducar bitikîne</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Ji bo blokê veguhezînî çepê, ducar bitikîne</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Afirandina destgehê</string>
     <string name="new_site_creation_creating_site_loading_3">Sazkirina rûkarê</string>
     <string name="new_site_creation_creating_site_loading_2">Tevlêkirina taybetiyên malperê</string>
-    <string name="new_site_creation_creating_site_loading_1">Sitendina URL\'ya malperê</string>
+    <string name="new_site_creation_creating_site_loading_1">Stendina URL\'ya malperê</string>
     <string name="new_site_creation_creating_site_loading_subtitle">Malpera te ew ê di demeke kin de amade be</string>
     <string name="new_site_creation_creating_site_loading_title">Bijî!\nHindik ma biqede</string>
     <string name="pages_and_posts_cancel_auto_upload">Hilxistinê betal bike</string>
     <string name="gif_list_search_returned_unknown_error">Gava ev daxwaz dihat pêkanîn pirsgirêkek çêbû</string>
-    <string name="gif_powered_by_tenor">Bihêzkirin: Tenor</string>
-    <string name="gif_picker_search_hint">Di Tenorê de lêgerînê bike</string>
-    <string name="photo_picker_gif">Ji Tenorê hilbijêre</string>
+    <string name="gif_powered_by_tenor">Bihêzkirin ji aliyê Tenor</string>
+    <string name="gif_picker_search_hint">Di Tenor\'ê de lê bigere</string>
+    <string name="photo_picker_gif">Ji Tenor\'ê hilbijêre</string>
     <string name="weekday_saturday">Şemî</string>
     <string name="weekday_friday">În</string>
     <string name="weekday_thursday">Pêncşem</string>
@@ -292,13 +360,13 @@ Language: ku_TR
     <string name="media_accessing_failed">Gihînî naveroka malpereke taybet nebû. Dibe ku hinek medya neyên bikaranîn</string>
     <string name="media_accessing_progress">Gihînî naveroka malpereke taybet dibe</string>
     <string name="error_failed_to_crop_and_save_image">Wêne nehat qirpandin û tomarkirin, jkx dîsa biceribîne.</string>
-    <string name="failed_to_load_image_tap_to_retry">Barkirina wêneyê pêk nehat.\nJi bo dîsa biceribîne, bitepîne.</string>
+    <string name="failed_to_load_image_tap_to_retry">Barkirina wêneyê pêk nehat.\nJi bo dîsa biceribînî, bitepîne.</string>
     <string name="preview_image_description">Wêneyê pêş bibîne</string>
     <string name="error_unknown_page_type">Formata rûpela nenas</string>
-    <string name="error_page_not_submitted">Me nekarî vê çalakiya temam bikin û vê rûpelê bişinînin ji bo vekolînê.</string>
+    <string name="error_page_not_submitted">Me nekarî vê çalakiyê temam bikin û vê rûpelê bişinînin ji bo vekolînê.</string>
     <string name="error_page_not_scheduled">Me nekarî vê çalakiyê temam bikin û vê rûpelê demsaz bikin.</string>
     <string name="error_page_not_published_private">Me nekarî vê çalakiyê temam bikin û vê rûpela taybet biweşînin.</string>
-    <string name="error_page_not_published">Me nekarî vê çalakiyê temam bikin û vê rûpela biweşînin.</string>
+    <string name="error_page_not_published">Me nekarî vê çalakiyê temam bikin û vê rûpelê biweşînin.</string>
     <string name="error_page_not_submitted_retrying">Me nekarî vê rûpelê bişînin ji bo vekolînê lê em ê piştre dîsa biceribînin. </string>
     <string name="error_page_not_scheduled_retrying">Me nekarî vê rûpelê demsaz bikin lê em ê piştre dîsa biceribînin.</string>
     <string name="error_page_not_published_retrying_private">Me nekarî vê rûpela taybet biweşînin lê em ê piştre dîsa biceribînin.</string>
@@ -317,66 +385,27 @@ Language: ku_TR
     <string name="error_publish_page_no_network">Cîhaz derhêl e. Rûpel bi cîgehî hat tomarkirin.</string>
     <string name="local_page_autosave_revision_available">Te li ser vê rûpelê guhertinên netomarkirî çêkir</string>
     <string name="editor_uploading_page">Rûpela te tê hilxistin</string>
-    <string name="editor_page_saved_locally_failed_media">Rûpelê hilxistinên medyayê bi ser nexist û bi ew derhêlî hatin tomarkirin</string>
+    <string name="editor_page_saved_locally_failed_media">Rûpelê, hilxistinên medyayê bi ser nexist û bi ew derhêlî hatin tomarkirin</string>
     <string name="editor_page_saved_locally">Rûpel li cîhazê hat tomarkirin</string>
     <string name="editor_page_saved_online">Rûpel bi serhêlî hat tomarkirin</string>
-    <string name="quickpress_shortcut_activity_label">Ji bo kurterêya QuickPress\'ê blogê hilbijêre</string>
-    <string name="app_theme_default">Sazandian Teserrufa Beteryayê</string>
+    <string name="quickpress_shortcut_activity_label">Ji bo kurterêya QuickPress\'ê, blogê hilbijêre</string>
+    <string name="app_theme_default">Ji hêla tasarûfa bateryayê tê sazkirin</string>
     <string name="app_theme_dark">Tarî</string>
     <string name="app_theme_light">Ronî</string>
     <string name="app_theme">Xuyang</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Te berî niha di vê rûpelê de hinek guhertin kir lê te ew guhertin tomar nekirin. Guhertoya were barkirin hilbijêre:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Mirov Çi Dibêjin</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Em xizmetên cûrbicûr pêşkeş dikin ji bo tu bikarî encamên dixwazî bi dest bixî. Gelo baş nizanî ji te re çi divên an bihayên wan çend in? Em dikarin ji te re îzah bikin kîjan xizmet ji bo te baş in û behsa fiyetên xwe bikin. Li jêrê bi me re têkilî dayîne.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Em komeke biçûk ya pisporên jêhatî yên xwedî huner û tecrûbeyên cûrbicûr in. Em ji karê xwe hez dikin û wî bi dilxwazî dikin. Em ji dil li hêviyê ne ji bo bi te re bixebitin.</string>
-    <string name="gutenberg_native_warning_message">Peyama Hişyariyê</string>
-    <string name="gutenberg_native_want_to_work_with_us">Tu dixwazî bi me re bixebitî?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Dê serdêr bixwazin pê bizanin yê li wî aliyê rûpelê kî ye. Ji bo li ser xwe, malpera xwe, karê xwe an jî her çi tiştê dixwazî binivîsînî vê qadê bi kar bîne. Ji bo ji ber gotinên xelkê yên li ser heman tiştan dipeyivin bigirî, helwestên li jêrê bi kar bîne.</string>
-    <string name="gutenberg_native_usa">DYA</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Ev naverokên nimûneyî ne, ji bo taybetiyên wî nîşan bidin li Kirasî hatine tevlîkirin. Wan jê bibe an jî li şûna wan peyv û medyayên xwe dayîne.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Ji bo mirov dest pê bike, divê dev ji axiftinê berde û dest bi kar bike.</string>
-    <string name="gutenberg_native_team">Tîm</string>
-    <string name="gutenberg_native_success_message">Peyama Serkevtinê</string>
-    <string name="gutenberg_native_strategy">Stratejî</string>
     <string name="gutenberg_native_show_post_content">Naveroka şandiyê nîşan bide</string>
-    <string name="gutenberg_native_services">Xizmet</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Navê Projeyê</string>
-    <string name="gutenberg_native_position_or_job_title">Pozisyon an jî Nasnav</string>
-    <string name="gutenberg_native_portfolio">Portfolyo</string>
-    <string name="gutenberg_native_only_show_excerpt">Tenê jêgirê nîşan bide</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Portfolyoya min çendîn projeyên min di seranserê kariyera xwe de ava kirine nîşan dide. Li jêrê agahiyên min yên têkiliyê bibîne û bi min re têkilî dayîne.</string>
+    <string name="gutenberg_native_only_show_excerpt">Tenê jêgirtinê nîşan bide</string>
     <string name="gutenberg_native_link_to">Girêdana:</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Ka em biaxivin 👋. Dudilî nebe, tu dikarî ji agahiyên têkiliyê yên li jêr xwe bigihînî me an jî bi bikaranîna formê peyamekê ji me re bişîne.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Ka were em bi hev re tiştekî ava bikin!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Ka were em bi hev re tiştekî ava bikin!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Harry, bijartinên me ji qabiliyetên me zêdetir, me bi rastî didin nîşan ka em kî ne.</string>
-    <string name="gutenberg_native_inspiration">Îlham</string>
-    <string name="gutenberg_native_get_in_touch">Têkeve Têkiliyê</string>
     <string name="gutenberg_native_excerpt_length_words">Dirêjahiya jêgirtinê (peyv)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Ji min re email bişîne:&lt;a href=\"mailto:mail@example.com\">mail@minak.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Negirî ji bo ku qediya, bikene ji bo pêk hat.</string>
-    <string name="gutenberg_native_customize">KESANE BIKE</string>
-    <string name="gutenberg_native_city_10100">Bajar, 10100</string>
-    <string name="gutenberg_native_add_paragraph_block">Bloka Pragrafê tevlê bike</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Îzaheke kurt ji xizmetên tu pêşkêş dikî.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Biyografiyeke kurt ku raboriya kesane, serkevtinên girîng an jî rastiyek balkêş, bihewîne.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@minak.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Danasîna projeyê û xebatên tên pêşkêşkirin.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">Rêya Kolana 10ê</string>
+    <string name="gutenberg_native_customize">BITAYBETÎNE</string>
+    <string name="gutenberg_native_add_paragraph_block">Bloka Pragrafê tevlî bike</string>
     <string name="create_post_page_fab_tooltip_contributors">Şandiyekê biafirîne</string>
     <string name="post_list_tab_trashed_posts">Jêçûyî</string>
     <string name="post_list_tab_scheduled_posts">Demsazkirî</string>
     <string name="post_list_tab_published_posts">Weşandî</string>
     <string name="sharing_facebook_account_must_have_pages">Girêdana Facebookê nikare ti Rûpelan bibîne. Bangewazî, bi Profîlên Facebookê ve nayê girêdan, tenê dikare bi Rûpelên weşandî ve bê girêdan.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Nehatiye girêdan</string>
-    <string name="my_site_select_domains_page_title">Navnîşana Malperê</string>
     <string name="notifications_tab_title_likes">Ecibandin</string>
     <string name="notifications_tab_title_follows">Şopîner</string>
     <string name="notifications_tab_title_comments">Şîrove</string>
@@ -386,131 +415,110 @@ Language: ku_TR
     <string name="stats_insights_management_activity">Çalakî</string>
     <string name="stats_insights_management_posts_and_pages">Şandî û Rûpel</string>
     <string name="stats_insights_management_general">Giştî</string>
-    <string name="stats_management_screen_title">Karta nû tevlê bike</string>
-    <string name="stats_management_add_new_stats_card">Karta amaranên nû tevlê bike</string>
+    <string name="stats_management_screen_title">Karta nû tevlî bike</string>
+    <string name="stats_management_add_new_stats_card">Karta amarên nû tevlî bike</string>
     <string name="reader_self_hosted_select_filter">Ji bo şandiyên ji mijarên spesifîk bibînî bişkoka fîtreyê bi kar bîne</string>
-    <string name="reader_bottom_sheet_content_description">Malper an Etîketê Hilbijêrin, Paceya Hilpekok</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Hilbijartî</string>
+    <string name="reader_bottom_sheet_content_description">Malper an jî Etîketê Hilbijêre, Pencereya Pop Up</string>
     <string name="reader_btn_select_filter_content_description">Ji bo şandiyan fîltre bikî Malperekê an Etîketekê bibijêre</string>
     <string name="reader_btn_remove_filter_content_description">Fîltreya heyî rake</string>
-    <string name="reader_title_subs">Etîket &amp; Malperan bi rê ve bibe</string>
+    <string name="reader_title_subs">Etîket û Malperan bi rê ve bibe</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Têkeve WordPress.com\'ê</string>
-    <string name="reader_filter_self_hosted_empty_tagss_list">Têkeve WordPress.comê ji bo şandiyên ji etîketên tu wan dişopînî bibînî</string>
-    <string name="reader_filter_self_hosted_empty_sites_list">Têkeve WordPress.comê ji bo şandiyên ji malperên tu wan dişopînî bibînî</string>
-    <string name="gutenberg_native_template_preview">Pêşdîtina Kirês</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Ji bo tu şandiyên herî dawî yên ji mijarên tên şopandin bibînî têkeve WordPress.com\'ê</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Ji bo tu şandiyên herî dawî yên ji malperên tên şopandin bibînî têkeve WordPress.com\'ê</string>
     <string name="gutenberg_native_replace_current_block">Bloka heyî biguherîne</string>
     <string name="gutenberg_native_add_to_end">Tevlî dawiyê bike</string>
     <string name="gutenberg_native_add_to_beginning">Tevlî serî bike</string>
     <string name="gutenberg_native_add_block_before">Tevlî pêşiya blokê bike</string>
     <string name="gutenberg_native_add_block_after">Tevlî paşiya blokê bike</string>
-    <string name="reader_filter_empty_tags_action">Etîketekê tevlê bike</string>
+    <string name="reader_filter_empty_tags_action">Mijarekê tevlî bike</string>
     <string name="reader_filter_empty_sites_action">Malperekê bişopîne</string>
-    <string name="reader_filter_empty_tags_list">Tu dikarî etîketekê tevlî bikî ji bo şandiyên mijareke spesifîk bişopînî</string>
+    <string name="reader_filter_empty_tags_list">Tu dikarî bi lêzêdekirina mijarekê şandiyên eleqedarî babeteke diyar bişopînî</string>
     <string name="reader_filter_empty_sites_list">Şandiyên herî nû yên ji malperên tu wan dişopînî bibîne</string>
     <string name="reader_filter_main_title">Şopandinên Te</string>
     <string name="reader_filter_cta">Fîltre bike</string>
     <string name="gutenberg_native_video_caption_s">Sernivîsa vîdyoyê. %s</string>
     <string name="gutenberg_native_edit_video">Vîdyoyê sererast bike</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Ji bo rêkxistinekê bibijêrî du caran bitepîne</string>
-    <string name="gutenberg_native_add_a_shortcode">Kurtekodekê tevlê bike…</string>
+    <string name="gutenberg_native_add_a_shortcode">Kurtekodekê tevlî bike…</string>
     <string name="post_list_author">Nivîskarê şandiyê</string>
     <string name="fab_create_desc">Şandiyekê biafirîne</string>
-    <string name="stats_posting_activity_end_description">Te hemû statîstîkên vê serdemê bihîstin.\n Heke dîsa bitepînî dê ji serî ve dest pê bike.</string>
-    <string name="stats_posting_activity_empty_description">Di vê serdemê de qet statîstîk nîn in.</string>
-    <string name="stats_posting_activity_label_content_description">Ji bo %1$s Çalakiya Şandiyan</string>
+    <string name="stats_posting_activity_end_description">Te hemû amarên vê heyamê bihîstin.\n        Heke dîsa bitepînî dê ji serî ve dest pê bike.</string>
+    <string name="stats_posting_activity_empty_description">Di vê heyamê de ti amar nîn in.</string>
+    <string name="stats_posting_activity_label_content_description">Ji bo %1$s\'ê Çalakiya Şandiyan</string>
     <string name="stats_posting_activity_content_description">%1$s dîtin ji bo %2$sê di ev qas rojan de pêk hatine: %2$s %3$s . Ji bo agahiyên bêhtir bitepîne.</string>
-    <string name="stats_posting_activity_action">here hemû statîstîkên vê serdemê</string>
+    <string name="stats_posting_activity_action">here hemû amarên vê heyamê</string>
     <string name="stats_box_type_very_high">pir bilind</string>
     <string name="stats_box_type_high">bilind</string>
     <string name="stats_box_type_medium">navîn</string>
     <string name="stats_box_type_low">nizm</string>
-    <string name="stats_bar_chart_accessibility_overlapping_entry">  û %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Wênêyê veguhezîne pêşiyê</string>
-    <string name="gutenberg_native_move_image_backward">Wêneyê veguhezîne paşiyê</string>
-    <string name="gutenberg_native_gallery_caption_s">Sernivîsa pêşangehê. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Nirxê heyî %2$s ye</string>
+    <string name="gutenberg_native_gallery_caption_s">Sernivîsa galeriyê. %s</string>
     <string name="create_post_page_fab_tooltip">Şandî an jî rûpelekê biafirîne</string>
     <string name="content_description_person_building_website">Malpera ji destê mirovan</string>
-    <string name="post_signup_interstitial_not_right_now">Niha na</string>
+    <string name="post_signup_interstitial_not_right_now">Ne niha</string>
     <string name="post_signup_interstitial_subtitle">Em ê alî te bikin ji bo her çi tiştên dixwazî li vê derê ava bikî an parve bikî.</string>
-    <string name="post_signup_interstitial_title">Bi xêr hatî WordPress\'ê</string>
+    <string name="post_signup_interstitial_title">Tu bi xêr hatî WordPress\'ê</string>
     <string name="stock_media_picker_list_content_description">Wênegeh</string>
     <string name="photo_picker_image_thumbnail_unselected">Wêne nehat hilbijartin</string>
-    <string name="photo_picker_image_selected">, Hat hilbijartin</string>
+    <string name="photo_picker_image_selected">,Hat hilbijartin</string>
     <string name="photo_picker_image_thumbnail_selected">Wêne hat hilbijartin</string>
     <string name="photo_picker_image_thumbnail_content_description">Wêneyê Biçûk</string>
     <string name="my_site_bottom_sheet_add_post">Şandiya blogê</string>
-    <string name="my_site_bottom_sheet_title">Nû tevlê bike</string>
+    <string name="my_site_bottom_sheet_title">Nû tevlî bike</string>
     <string name="post_settings_publish">Biweşîne</string>
-    <string name="dialog_gutenberg_informative_description_v2">Me gelek pêşxistinên mezin pêk anîn li ser edîtora blokî û bi ya me divê tu wê biceribînî! Me ew ji bo şandî û rûpelên nû çalak kir, lê heke dixwazî vegerî edîtora klasîk, here \'Malpera Min\'> \'Sazkariyên Malperê\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Aniha senkronîze bike</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Ev şandî ew ê yekser were senkronîzekirin.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Tu ji bo senkronîzekirinê amade yî?</string>
     <string name="new_site_creation_unavailable_domain">Ev navper(domain) nayê bikaranîn</string>
-    <string name="login_promo_viewpager_content_description">Pêşgotin</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Me nekarî xwe bigihînin malpera te. Ji bo çareserkirina vê pirsgirêkê hewce ye tu xwe bigihînî hewangeha(host) xwe.</string>
-    <string name="login_discovery_error_ssl">Ji ber pirsgirêkeke eleqedarî &lt;b>Sertîfîkaya SSL&lt;/b>ê me nekarî xwe bigihînin malpera te. Ji bo çareserkirina vê pirsgirêkê hewce ye tu xwe bigihînî hewangeha(host) xwe.</string>
-    <string name="login_discovery_error_http_auth">Me nekarî xwe bigihînin malpera te ji ber ku hewceyî bi &lt;b>Rastandina HTTP&lt;/b>ê heye. Ji bo vê çareser bikî divê tu bi hewangerê xwe re têkilî dayînî.</string>
-    <string name="login_discovery_error_xmlrpc">Me nekarî xwe bigihînin &lt;/b>dosyeya XMLPRC&lt;b>ê ya li ser malpera te. Divê tu bi hewangerê xwe re têkilî dayînî ji bo vê çareser bikî.</string>
-    <string name="login_site_credentials_magic_link_label">Hindikek ma! Tenê divê em navnîşana emaila te ya bi Jetpack\'ê ve girêdayî piştrast bikin &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Bi agahiyên xwe yên malperê têkeve.</string>
-    <string name="enter_credentials_for_site">Bi agahiyên xwe yên malperê %1$s têkeve</string>
-    <string name="send_verification_email">Emaila pejirandinê bişîne</string>
+    <string name="login_discovery_error_ssl">Ji ber pirsgirêkeke eleqedarî &lt;b&gt;Sertîfîkaya SSL&lt;/b&gt;ê me nekarî xwe bigihînin malpera te. Ji bo çareserkirina vê pirsgirêkê hewce ye tu xwe bigihînî hewangeha(host) xwe.</string>
+    <string name="login_discovery_error_http_auth">Me nekarî xwe bigihînin malpera te ji ber ku hewceyî bi &lt;b&gt;Rastandina HTTP&lt;/b&gt;ê heye. Ji bo vê çareser bikî divê tu bi hewangerê xwe re têkilî dayînî.</string>
+    <string name="login_discovery_error_xmlrpc">Me nekarî xwe bigihînin &lt;b&gt;dosyeya XMLRPC&lt;/b&gt;\'ê ya li ser malpera te. Divê tu bi hewangerê xwe re têkilî dayînî ji bo vê çareser bikî.</string>
+    <string name="login_site_credentials_magic_link_label">Hindikek ma! Tenê divê em navnîşana emaila te ya bi Jetpack\'ê ve girêdayî piştrast bikin &lt;b&gt;%1$s&lt;/b&gt;</string>
+    <string name="enter_credentials_for_site">Bi agahiyên xwe yên malpera %1$sê têkeve</string>
     <string name="my_site_bottom_sheet_add_page">Rûpela malperê</string>
     <string name="reader_following_display_name">Şopandî</string>
     <string name="reader_my_likes_display_name">Ecibandî</string>
     <string name="reader_discover_display_name">Keşf bike</string>
     <string name="reader_save_for_later_display_name">Hat tomarkirin</string>
-    <string name="reader_filter_tags_title">Etîket</string>
+    <string name="reader_filter_tags_title">Mijar</string>
     <string name="reader_filter_sites_title">Malper</string>
     <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
     <string name="posts_cannot_be_started">Em aniha nikarin şandiyan vekin. Ji kerema xwe piştre dîsa biceribîne</string>
     <string name="site_cannot_be_loaded">Em aniha nikarin daneyan ji bo malpera te bar bikin. Piştre dîsa biceribîne</string>
     <string name="gutenberg_native_wordpress_media_library">Medyageha WordPress\'ê</string>
-    <string name="gutenberg_native_ungroup">Komê Jihev Veqetîne</string>
+    <string name="gutenberg_native_ungroup">Komê belav bike</string>
     <string name="gutenberg_native_translate">Wergerîne</string>
-    <string name="gutenberg_native_title">Sernav:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Ji bo klavyeyê veşêrî, bitikîne</string>
     <string name="gutenberg_native_tap_here_to_show_help">Ji bo alîkariyê nişan bidî, bitikîne</string>
-    <string name="gutenberg_native_take_a_video">Vîdyo bikişîne</string>
+    <string name="gutenberg_native_take_a_video">Vîdyo Bikişîne</string>
     <string name="gutenberg_native_take_a_photo_or_video">Vîdyo an jî Wêne Bikişîne</string>
-    <string name="gutenberg_native_take_a_photo">Wêneyekî bikişîne</string>
+    <string name="gutenberg_native_take_a_photo">Wêneyekî Bikişîne</string>
     <string name="gutenberg_native_start_writing">Dest bi nivîsandinê bike…</string>
-    <string name="gutenberg_native_size">Mezinahî</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Pêveka sernavê kêlekbendê</string>
     <string name="gutenberg_native_show_section">Beşê nîşan bide</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloka %s. Di vê blokê de naveroka nederbasdar heye</string>
     <string name="gutenberg_native_s_block_empty">Bloka %s. Vala</string>
     <string name="gutenberg_native_cut_block">Blokê jê bike</string>
-    <string name="gutenberg_native_reset_block">Bilokê Nûsaz Bike</string>
-    <string name="gutenberg_native_remove_annotations">Têbîniyan rake</string>
     <string name="gutenberg_native_problem_opening_the_video">Pirsgirêk di vekirina vîdyoyê de derket</string>
     <string name="gutenberg_native_problem_displaying_block">Pirsgirêk di nîşandana blokê de derket</string>
     <string name="gutenberg_native_post_title_s">Sernavê şandiyê. %s</string>
     <string name="gutenberg_native_post_title_empty">Sernavê şandiyê. Vala</string>
-    <string name="gutenberg_native_paste_url">URL\'ê bizeliqîne</string>
+    <string name="gutenberg_native_paste_url">URL\'yê bizeliqîne</string>
     <string name="gutenberg_native_page_break_block_s">Bloka dawiya rûpelê. %s</string>
     <string name="gutenberg_native_open_settings">Sazkariyan Veke</string>
-    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ti sepan nikare vê daxwazê birêve bibe. Ji kerema xwe gerokeke webê saz bike.</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ti sepan nikare vê daxwazê birêve bibe. Ji kerema xwe gerokeke Webê saz bike.</string>
     <string name="gutenberg_native_navigate_up">Here Jorê</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Panela min a berî-weşanê</string>
-    <string name="gutenberg_native_my_post_status_info">Agahiyên rewşa şandiya min</string>
-    <string name="gutenberg_native_my_post_publish_panel">Panela min a piştî-weşanê</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panela sazkariyên dosyeya min</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Blokê ji rêzika %1$sem veguhezîne rêzika %2$sem</string>
     <string name="gutenberg_native_move_block_up">Blokê veguhezîne jorê</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Blokê ji rêzika %1$sem bi jêr ve veguhezîne rêzika %2$sem</string>
     <string name="gutenberg_native_move_block_down">Blokê bikişîne jêrê</string>
     <string name="gutenberg_native_image_caption_s">Sernivîsa wêneyê. %s</string>
     <string name="gutenberg_native_hide_keyboard">Klavyeyê veşêre</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Naveroka panelê li vir e!</string>
     <string name="gutenberg_native_help_icon">Îkona alîkariyê</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Tevlîkirina medyayê bi ser neket.\nJi bo vebijarkan, bitepîne.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Ji bo guhertina dawî vegerînî, ducar bitikîne</string>
@@ -522,35 +530,20 @@ Language: ku_TR
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Ji bo blokê veguhezînî jorê, ducar bitikîne</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Ji bo blokê veguhezînî jêrê, ducar bitikîne</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Ji bo vî nirxî sererast bikî, ducar bitikîne</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Ji bo bi rêya kaşokê nirxî biguherînî ducar bitepîne</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Ji bo blokekê tevlê bikî, ducar bitikîne</string>
     <string name="gutenberg_native_current_value_is_s">Nirxê heyî %s ye</string>
-    <string name="gutenberg_native_content">Naverok…</string>
     <string name="gutenberg_native_choose_from_device">Ji cîhazê hilbijêre</string>
-    <string name="gutenberg_native_annotations_sidebar">Kêlekbenda Şerhan</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Çewtiyeke nenas qewimî. Jkx dîsa hewl bide.</string>
     <string name="gutenberg_native_alt_text">Nivîsa alternatîv</string>
-    <string name="gutenberg_native_add_video">VÎDYO TEVLÊ BIKE</string>
-    <string name="gutenberg_native_add_url">URL tevlê bike</string>
-    <string name="gutenberg_native_add_image_or_video">WÊNE AN VÎDYO TEVLÊ BIKE</string>
-    <string name="gutenberg_native_add_image">WÊNE TEVLÊ BIKE</string>
+    <string name="gutenberg_native_add_video">VÎDYO TEVLÎ BIKE</string>
+    <string name="gutenberg_native_add_url">URL tevlî bike</string>
+    <string name="gutenberg_native_add_image_or_video">WÊNE AN VÎDYO TEVLÎ BIKE</string>
+    <string name="gutenberg_native_add_image">WÊNE TEVLÎ BIKE</string>
     <string name="gutenberg_native_add_block_here">BLOKÊ TEVLÎ VIR BIKE</string>
-    <string name="gutenberg_native_add_annotation">Tebîniyeke zêde devlîke</string>
-    <string name="gutenberg_native_add_a_description">Raveyekê tevlê bike</string>
-    <string name="reader_empty_saved_posts_content_description">Ji bo şandiyekê li lîsteya xwe qeyd bikî bitikîne bişkoka Tevlî Şandiyên Qeydkirî Bike.</string>
-    <string name="reader_acessibility_list_loaded">%1$d hêman li lîsteyê hatin barkirin.</string>
+    <string name="reader_empty_saved_posts_content_description">Ji bo tu şandiyekê li lîsteya xwe qeyd bikî, ji bo tomarkirina şandiyan li \"Tevlî bike\"yê bitikîne.</string>
+    <string name="reader_acessibility_list_loaded">\"%1$d hêman li lîsteyê hatin barkirin.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Danezan</string>
-    <string name="master_switch_default_title_off">Girtî</string>
-    <string name="master_switch_default_title_on">Vekirî</string>
-    <string name="notifications_tab_dialog_master_off_message">Heke tu ji bo vê malperê danezanan bigirî, ew ê danezanên li ser \"hilpeka danezanan\" tên xuyan neçalak bike. Piştî ku te ji bo vê malperê danezan çalak kirin, tu dikarî cûreya danezanan saz bikî.</string>
-    <string name="notifications_tab_dialog_master_off_title">Ji bo danezanên vê malperê di hilpeka danezanan de bibînî, danezanên vê malperê çalak bike.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Ji hilpeka danezanan ji bo vê malperê nîşandana danezanan çalak bike</string>
-    <string name="notifications_tab_dialog_master_hint_on">Ji hilpeka danezanan ji bo vê malperê nîşandana danezanan neçalak bike</string>
-    <string name="notifications_tab_dialog_master_status_off">Danezanên ji bo vê malperê</string>
-    <string name="notifications_tab_dialog_master_status_on">Danezanên ji bo vê malperê</string>
-    <string name="dialog_gutenberg_informative_description_page">Tu aniha ji bo rûpelên nû edîtora blokê bi kar tînî, bijî! Heke tu bixwazî vegere edîtora klasîk, here \'Malpera Min\' > \'Sazkariyên Malperê\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">Tu aniha ji bo şandiyên nû edîtora blokê bi kar tînî, bijî! Heke tu bixwazî vegere edîtora klasîk, here \'Malpera Min\' > \'Sazkariyên Malperê\'.</string>
-    <string name="pick_media">Vîdyo an wêne tevlê bike</string>
+    <string name="pick_media">Vîdyo an jî wêne tevlî bike</string>
     <string name="error_post_not_submitted_retrying">Me nekarî vê şandiyê bişînin ji bo vekolînê lê em ê piştre dîsa biceribînin. </string>
     <string name="error_post_not_scheduled_retrying">Me nekarî vê şandiyê demsaz bikin lê em ê piştre dîsa biceribînin.</string>
     <string name="error_post_not_published_retrying_private">Me nekarî vê şandiya taybet biweşînin lê em ê piştre dîsa biceribînin.</string>
@@ -565,154 +558,152 @@ Language: ku_TR
     <string name="error_media_recover_post_not_published">Me nekarî vê medyayê lê hilxin û vê şandiyê biweşînin.</string>
     <string name="error_media_recover_post">Me nekarî vê medyayê lê hilxin.</string>
     <string name="error_generic_error_retrying">Me nekarî vê çalakiyê temam bikin lê em ê piştre dîsa biceribînin. </string>
-    <string name="error_generic_error">Me nekarî ev çalakî temam bikin.</string>
+    <string name="error_generic_error">Me nekarî vê çalakiyê temam bikin.</string>
     <string name="error_preview_empty_draft">Reşnivîseke vala nayê pêşdîtin</string>
     <string name="error_preview_empty_page">Rûpeleke vala nayê pêşdîtin</string>
     <string name="error_preview_empty_post">Şandiyeke vala nayê pêşdîtin</string>
     <string name="preview_unavailable_self_hosted_sites">Pêşdîtin nayê bikaranîn</string>
-    <string name="remote_preview_operation_error">Çewtî: di tomarkirina şandiyê ya berî pêşdîtinê de</string>
+    <string name="remote_preview_operation_error">Dema ku şandî berî pêşdîtinê dihat tomarkirin çewtî derket</string>
     <string name="post_preview_remote_auto_saving_post">Pêşdîtin tê çêkirin…</string>
-    <string name="post_preview_saving_draft">Tê tomarkirin…</string>
+    <string name="post_preview_saving_draft">Tomar dibe…</string>
     <string name="local_post_autosave_revision_available">Te li ser vê şandiyê guhertinên netomarkirî çêkir</string>
     <string name="dialog_confirm_autosave_dont_restore_button">Guhertoya ji vê sepanê</string>
     <string name="dialog_confirm_autosave_restore_button">Guhertoya ji cîhazeke din</string>
-    <string name="dialog_confirm_autosave_body_second_part">Bi vê sepanê\nDi %san de hatiye qeydkirin\n\nBi amûreke din\nDi %san de hatiye qeydkirin\n</string>
+    <string name="dialog_confirm_autosave_body_second_part">Ji vê sepanê\nDi %san de hat tomarkirin\n\nJi cîhazeke din\nDi %san de hat tomarkirin\n</string>
     <string name="dialog_confirm_autosave_body_first_part">Te berî niha di vê şandiyê de hinek guhertin kir lê te ew guhertin tomar nekirin. Guhertoya were barkirin hilbijêre:\n\n</string>
     <string name="dialog_confirm_autosave_title">Tu dixwazî kîjan guhertoyê sererast bikî?</string>
-    <string name="button_delete_permanently">Bêveger jê bibe</string>
-    <string name="post_waiting_for_connection_draft_cancel">Em ê guhertinên herî dawîn ên reşnivîsa te tomar nekin.</string>
+    <string name="button_delete_permanently">Bi Mayînde Jê Bîbe</string>
+    <string name="post_waiting_for_connection_draft_cancel">Em guhertinên herî dawîn ên reşnivîsa te tomar nakin.</string>
     <string name="post_waiting_for_connection_scheduled_cancel">Em ê van guhertinan demsaz nekin.</string>
     <string name="post_waiting_for_connection_pending_cancel">Em ê van guhertinan ji bo vekolînê neşînin. </string>
-    <string name="post_waiting_for_connection_publish_cancel">Em ê van guhertinan neweşînin.</string>
+    <string name="post_waiting_for_connection_publish_cancel"> Em ê van guhertinan neweşînin.</string>
     <string name="post_waiting_for_connection_draft">Dema ku cîhaza te dîsa serhêl bû em ê reşnivîsa te tomar bikin</string>
     <string name="post_waiting_for_connection_private">Dema ku cîhaza te dîsa serhêl bû em ê şandiya te ya taybet biweşînin.</string>
     <string name="post_waiting_for_connection_scheduled">Dema ku cîhaza te dîsa serhêl bû em ê şandiya te demsaz bikin.</string>
     <string name="post_waiting_for_connection_pending">Dema ku cîhaza te dîsa serhêl bû em ê şandiya te ji bo vekolînê bişînin.</string>
     <string name="post_waiting_for_connection_publish">Dema ku cîhaza te dîsa serhêl bû em ê şandiya te biweşînin.</string>
-    <string name="settings_username_changer_snackbar_cancel">Ev çalakî nikare bê betalkirin. Dibe ku navê bikarhêner hatibe hildemandin.</string>
+    <string name="settings_username_changer_snackbar_cancel">Ev çalakî nayê betalkirin. Dibe ku navê bikarhêner ji berê ve hatibe hildemandin.</string>
     <string name="settings_username_changer_toast_content">Navê te yê bikarhêneriyê yê nû %1$s e</string>
     <string name="settings_username_changer_progress_dialog">Navê bikarhêner tê tomarkirin…</string>
     <string name="settings_username_changer_confirm_dialog_positive_action">Navê bikarhêner biguherîne</string>
     <string name="settings_username_changer_confirm_dialog_content">Tu navê xwe yê bikarhêneriyê dikî %1$s%2$s%3$s. Guhertina navê bikarhêneriyê dê bandorê li ser profîla te ya Gravatarê û navnîşanên te yên profîla Intense Debateyê jî bike.\nJi bo dewamkirinê, navê xwe yê bikarhêneriyê yê nû bipejirîne.</string>
     <string name="settings_username_changer_confirm_dialog_title">Baldar be!</string>
-    <string name="settings_username_changer_header">Tu dikî navê xwe yê bikarhêneriyê yê ku niha %1$s%2$s%3$s ye, biguherînî. Tu yê careke din nekaribî navê xwe yê bikarhêneriyê bikî yê berê.</string>
+    <string name="settings_username_changer_header">Tu dikî navê xwe yê bikarhêneriyê yê ku niha %1$s%2$s%3$s ye, biguherînî. Tu yê nekaribî navê xwe yê bikarhêneriyê vegerînî yê berê.</string>
     <string name="site_settings_jetpack_performance_settings_hint">Sazkariyên performansa Jetpack\'ê bibîne û biguherîne</string>
     <string name="site_settings_performance_and_speed">Performans û Lez</string>
     <string name="site_settings_more">Zêdetir</string>
-    <string name="site_settings_improved_search_summary">Li şûna lêgerîna WordPress\'ê ya cihgirtî tecrûbeyeke lêgerînê ya pêşketîtir saz bike</string>
+    <string name="site_settings_improved_search_summary">Li şûna lêgerîna WordPressê ya heyî, lêgerîneke pêşketîtir saz bike</string>
     <string name="site_settings_improved_search">Lêgerîna Pêşketî</string>
     <string name="site_settings_jetpack_search">Lêgerîna Jetpack\'ê</string>
-    <string name="site_settings_ad_free_video_hosting">Hewandina Vîdyoyên Bêreklam</string>
+    <string name="site_settings_ad_free_video_hosting">Hewandina Vîdyoyên Bê-reklam</string>
     <string name="site_settings_media">Medya</string>
-    <string name="site_settings_site_accelerator_summary">Bihêle bila Jetpack wêne û dosyeyên te yên statîk (wek CSS û JavaScriptê) optîmîze bike ji bo rûpelên te zûtir werin barkirin.</string>
-    <string name="site_settings_faster_static_files">Dosyeyên statîk ên leztir</string>
+    <string name="site_settings_site_accelerator_summary">Ji bo rûpelên te zûtir werin barkirin bihêle bila Jetpack wêne û dosyeyên te yên statîk (wek CSS û JavaScriptê) optîmîze bike.</string>
+    <string name="site_settings_faster_static_files">Dosyeyên statîk ên bilez</string>
     <string name="site_settings_faster_images">Wêneyên bilez</string>
     <string name="site_settings_site_accelerator_off">Girtî</string>
     <string name="site_settings_site_accelerator_on">Vekirî</string>
     <string name="site_settings_site_accelerator">Lezkera Malperê</string>
-    <string name="site_settings_lazy_load_images_summary">Tenê bi barkirina wêneyên li ser ekranê dixuyin re leza malperê xwe zêde bike.</string>
+    <string name="site_settings_lazy_load_images_summary">Tenê wêneyên li ser ekranê dixuyin bar bike û leza malperê xwe zêde bike.</string>
     <string name="site_settings_performance">Performans</string>
     <string name="stats_file_downloads_value_label">Daxistin</string>
     <string name="stats_file_downloads_title_label">Dosye</string>
-    <string name="stats_file_downloads">Daxistinên pelgeyan</string>
-    <string name="stats_data_not_recorded_for_period">Rêjejimarên daxistina pelgeyan berî 28ê Pûşpera 2019an nehatiye tomarkirin.</string>
+    <string name="stats_file_downloads">Daxistina dosyeyan</string>
+    <string name="stats_data_not_recorded_for_period">Amarên daxistina dosyeyan beriya 28ê Hezîrana 2019an nehatine tomarkirin.</string>
     <string name="stats_site_negative_utc">Navçedema malperê (UTC - %s)</string>
     <string name="stats_site_positive_utc">Navçedema malperê (UTC + %s)</string>
     <string name="stats_site_neutral_utc">Navçedema malperê (UTC)</string>
     <string name="web_preview_desktop">Sermase</string>
     <string name="web_preview_default">Jixweber</string>
-    <string name="close_dialog_button_desc">Gotûbêjê Bigire</string>
+    <string name="close_dialog_button_desc">Kodika Gotûbêjê Bigire</string>
     <string name="preview_type_desc">Cûreya pêşdîtinê hilbijêre</string>
     <string name="share_desc">Parve bike</string>
     <string name="navigate_back_desc">Paşve here</string>
     <string name="navigate_forward_desc">Pêşve here</string>
-    <string name="calendar_scheduled_post_description">Ji bo li ser \"%s\" ê biweşînî di sepana te %s ya WordPressê de\n\"%s\" hat demsazkirin</string>
+    <string name="calendar_scheduled_post_description">\"%s\" hat demsazkirin ji bo ku li ser \"%s\"ê di sepana te ya WordPressê de were weşandin \n %s</string>
     <string name="calendar_scheduled_post_title">Şandiya Demsazkirî ya WordPressê: \"%s\"</string>
     <string name="notification_post_will_be_published_in_ten_minutes">\"%s\" dê di 10 xulekan de were weşandin</string>
     <string name="notification_post_will_be_published_in_one_hour">\"%s\" dê di demjimêrekê de were weşandin</string>
     <string name="notification_post_has_been_published">\"%s\" hat weşandin</string>
-    <string name="notification_scheduled_post_ten_minute_reminder">Şandiya demsazkirî: Bîranîna 10 xulekî</string>
-    <string name="notification_scheduled_post_one_hour_reminder">Şandiya demsazkirî: Bîranîna 1 demjimêrî</string>
+    <string name="notification_scheduled_post_ten_minute_reminder">Şandiya demsazkirî: Bibîrxistina10 xulekî</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Şandiya demsazkirî: Bibîrxistina 1 demjimêrî</string>
     <string name="notification_scheduled_post">Şandiya demsazkirî</string>
     <string name="post_notification_error">Heke dema weşanandinê di roboriyê de be, danezan nayê afirandin.</string>
     <string name="post_notification_when_published">Dema ku hat weşandin</string>
     <string name="post_notification_ten_minutes_before">Berî 10 xulekan</string>
     <string name="post_notification_one_hour_before">Berî demjimêrekê</string>
     <string name="post_notification_off">Girtî</string>
-    <string name="post_settings_add_to_calendar">Salnameyê tevlê bike</string>
+    <string name="post_settings_add_to_calendar">Tevlî salnameyê bike</string>
     <string name="post_settings_notification">Danezan</string>
     <string name="post_settings_time_and_date">Dem û Dîrok</string>
-    <string name="login_need_help_finding_connected_email">Alîkarî hewce ye ji bo dîtina e-peyama ku tu pê dihate girêdan?</string>
-    <string name="enter_wordpress_site">Malpera di vê adrêsê de ne malpereke WordPressê ye. Ji bo ku em karibin pê re têkiliyê deynin divê ser malperê WordPress sazkirî be.</string>
-    <string name="login_invalid_site_url">Xêra xwe temamiya adrêsa malperê têkeve, mîna \"example.com\".</string>
-    <string name="enter_email_for_site">Bi WordPressê têkeve, ji bo girêdana %1$s</string>
+    <string name="login_invalid_site_url">Ji kerema xwe temama navnîşana malperê têkeve, mîna \"example.com\".</string>
+    <string name="enter_email_for_site">J bo girêdana bi %1$s\'ê re têkeve hesabê xwe yê WordPress.com\'ê</string>
     <string name="stats_post_views_label">Dîtin</string>
     <string name="stats_post_label">Şandî</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
-    <string name="stats_item_collapsed">Hêman hate tengkirin</string>
-    <string name="stats_item_expanded">Hêman hate firehkirin</string>
+    <string name="stats_item_collapsed">Hêman hat tengkirin</string>
+    <string name="stats_item_expanded">Hêman hat firehkirin</string>
     <string name="stats_collapse_content_description">Veşêre</string>
     <string name="stats_expand_content_description">Fireh bike</string>
-    <string name="stats_graph_updated">Grafîk hate hildemandin.</string>
-    <string name="stats_overview_content_description">%1$s %2$s bo dewra %3$s, ji dewra berê hate guhertin - %4$s</string>
-    <string name="stats_loading_card">Daneya karta bijartî tê barkirin</string>
-    <string name="site_settings_editor">Sererastker</string>
+    <string name="stats_graph_updated">Grafîk hat hildemandin.</string>
+    <string name="stats_overview_content_description">%1$s %2$s ji bo heyama: %3$s\'ê, guhertina ji heyama berî niha - %4$s</string>
+    <string name="stats_loading_card">Daneyên karta bijartî tê barkirin</string>
+    <string name="site_settings_editor">Edîtor</string>
     <string name="description_expand">Fireh bike</string>
     <string name="description_collapse">Teng bike</string>
-    <string name="my_site_verify_your_email_without_email">Navnîşana epeyama xwe piştrast bike - rêname bo epeyama te hat şandin</string>
-    <string name="my_site_verify_your_email">Navnîşana epeyama xwe piştrast bike - rêname bo %s hate şandin</string>
-    <string name="link_dialog_button_cancel">Betal</string>
+    <string name="my_site_verify_your_email_without_email">Navnîşana emaila xwe piştrast bike - rêwerz ji emaila te re hat şandin</string>
+    <string name="my_site_verify_your_email">Navnîşana emaila xwe piştrast bike - rêwerz ji %s\'ê re hat şandin</string>
+    <string name="link_dialog_button_cancel">Betal bike</string>
     <string name="link_dialog_button_ok">BAŞ e</string>
     <string name="link_dialog_edit_hint">http(s)://</string>
     <string name="link_dialog_button_remove_link">Girêdanê Rake</string>
     <string name="link_dialog_title">Girêdanê tevlî bike</string>
     <string name="post_settings_retry_featured_image">Hilxistinê dîsa biceribîne</string>
-    <string name="post_settings_featured_image_uploading_tap_for_options">Medya tê hilxistin.\nJi kerema xwe bo vebijêrkan, bitepîne.</string>
-    <string name="link_open_new_window">Girêdanê di paceyek/hilpekek nû de veke</string>
+    <string name="post_settings_featured_image_uploading_tap_for_options">Medya tê hilxistin.\nJi kerema xwe ji bo vebijêrkan, bitepîne.</string>
+    <string name="link_open_new_window">Girêdanê di pencereyeke/hilpekeke nû de veke</string>
     <string name="stats_widget_error_no_access_token">Ji bo amarên xwe bibînî, têkeve hesabê WordPress.com\'ê.</string>
-    <string name="post_list_search_nothing_found">Li gor lêgerîna te ti şandî nehatin dîtin </string>
+    <string name="post_list_search_nothing_found">Li gorî lêgerîna te ti şandî nehatin dîtin</string>
     <string name="post_list_search_prompt">Li şandiyan bigere</string>
-    <string name="domains_suggestions_intro_description">Mirov ew ê di înternetê de te li vir bibînin.</string>
-    <string name="domains_suggestions_intro_title">Navê navpereke(domain) premiûm bibijêre</string>
-    <string name="my_site_custom_domain_name">Di hemû planên WordPress.com\'ê de navperên(domain) taybet hene. Aniha navpera xwe ya premiûm bêpere tomar bike.</string>
+    <string name="domains_suggestions_intro_description">Mirov di înternetê de ew ê te li vir bibînin.</string>
+    <string name="domains_suggestions_intro_title">Navê navpereke(domain) premiûm hilbijêre</string>
+    <string name="my_site_custom_domain_name">Di hemû pakêtên WordPress.com\'ê de navperên(domain) taybet hene. Aniha navpera xwe ya premiûm bi belaşî tomar bike.</string>
     <string name="stats_widget_minified_name">Bi nêrînekê</string>
     <string name="stats_widget_today_insights_name">Îro</string>
     <string name="stats_widget_all_time_insights_name">Hemû-dem</string>
     <string name="stats_widget_weekly_views_name">Dîtinên vê hefteyê</string>
-    <string name="stats_widget_log_in_message">Ji bo tevlîkirina alavokekê, ji kerema xwe têkeve sepana WordPressê.</string>
+    <string name="stats_widget_log_in_message">Ji bo widgetekê tevlî bikî, ji kerema xwe têkeve sepana WordPressê.</string>
     <string name="stats_widget_error_no_network">Înternet tune ye</string>
     <string name="stats_widget_error_no_data">Dane nehatin barkirin</string>
     <string name="stats_widget_select_type">Cûre</string>
     <string name="stats_widget_select_color">Reng</string>
-    <string name="stats_widget_select_your_site">Malpera xwe bibijêre</string>
+    <string name="stats_widget_select_your_site">Malpera xwe hilbijêre</string>
     <string name="stats_widget_color_dark">Tarî</string>
     <string name="stats_widget_color_light">Ronî</string>
     <string name="stats_widget_color">Reng</string>
-    <string name="stats_widget_site_caption">Malpera xwe bibijêre</string>
+    <string name="stats_widget_site_caption">Malpera xwe hilbijêre</string>
     <string name="stats_widget_site">Malper</string>
     <string name="stats_widget_all_time_title">Hemû-dem</string>
     <string name="stats_widget_views_title">Dîtinên vê hefteyê</string>
-    <string name="stats_widget_add">Alavok tevlî bike</string>
-    <string name="plugin_fetching_error_after_at">Nûyandina hûrgiliyên pêvekan ji her tim bêhtir dewam dike. Ji kerema xwe paşê dîsa kontrol bike.</string>
-    <string name="plugin_install_site_ineligible_default_error">Eger te navperek nû tomar kiribe, ji kerema xwe li bende be heta em sazkirina wê biqedînin û paşê dîsa biceribîne.\n\nEger na, wisa dixuyê ku şaşiyek pêk hatiye û dibe ku taybetiya pêvekê ji bo vê malperê ne guncan be.</string>
-    <string name="domain_contact_information_state_not_available_hint">Herêm (Tune Ye)</string>
-    <string name="domain_registration_privacy_protection_tos">Bi tomarkirina vê navperê tu %1$sşert û merc%2$s ên me dipejirînî.</string>
-    <string name="error_network_connection">Li girêdana xwe ya torê venêre û dîsa biceribîne.</string>
+    <string name="stats_widget_add">Widget tevlî bike</string>
+    <string name="plugin_fetching_error_after_at">Nûkirina hûrguliyên pêvekê ji dema normal zêdetir didome. Ji kerema xwe paşê dîsa kontrol bike.</string>
+    <string name="plugin_install_site_ineligible_default_error">Heke te navê domainekê tomar kiribe, ji kerema xwe heya em sazkirina wê temam bikin li bendê bimîne û paşê dîsa biceribîne.\n\nHeke na, dibe ku hinek çewtî derketibin û belkî taybetmendiya pêvekê ji bo vê malperê neyê bikaranîn.</string>
+    <string name="domain_contact_information_state_not_available_hint">Herêm (Tune ye)</string>
+    <string name="domain_registration_privacy_protection_tos">Bi tomarkirina vê domainê re tu %1$sşert û merc%2$sên me dipejirînî</string>
+    <string name="error_network_connection">Înterneta xwe kontrol bike û dîsa biceribîne.</string>
     <string name="error_browser_no_network">Ev rûpel niha nayê barkirin.</string>
-    <string name="error_disabled_apis">Sazkarî nehatin wergirtin: Hin API ji bo vê tevîhevkirina IDya sepana OAuthê û ajimêrê ne guncan in.</string>
+    <string name="error_disabled_apis">Sazkarî nehatin sitendin: Hinek API ji bo vê ID\'ya sepana OAuth\'ê û kombînasyona hesêb nayên bikaranîn.</string>
     <string name="jetpack_connection_terms_and_conditions">Bi sazkirina Jetpackê tu %1$smerc û rêbazên%2$s me dipejirînî.</string>
-    <string name="site_settings_disconnected_toast">Girêdan tune ye. Serastkirin hat neçalakkirin.</string>
-    <string name="site_settings_update_password_message">Ji bo sepanê dîsa girê bidî malpera xwe yî xwe-hewandî, pêborîna nû ya malperê binivîse vir.</string>
+    <string name="site_settings_disconnected_toast">Înternet tune ye. Sererastkirin hat neçalakkirin.</string>
+    <string name="site_settings_update_password_message">Ji bo ku tu vê sepanê ji nû ve bi malpera xwe ya xwe-hewan ve girêdî, pêborîna nû ya malperê li vir binivîse.</string>
     <string name="site_settings_password_updated">Pêborîn hat hildemandin</string>
     <string name="site_settings_password_dialog_title">Pêborînê hildemîne</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Navê navperê(domain) tê tomarkirin…</string>
     <string name="domain_registration_state_picker_dialog_title">Herêmê Hilbijêre</string>
     <string name="domain_registration_country_picker_dialog_title">Welat Hilbijêre</string>
     <string name="domain_registration_result_continue_button">bidomîne</string>
-    <string name="domain_registration_result_description">navê navpera we &lt;b>%s&lt;/b> tê sazkirin.\nMalpera we ji coşê dide çirifîtka!</string>
-    <string name="domain_registration_result_title">Pîrozbahî</string>
-    <string name="domain_contact_information_register_domain_button">Navperê Tomar Bike</string>
-    <string name="domain_contact_information_postal_code_hint">Koda posteyê</string>
+    <string name="domain_registration_result_description">navê domaina te &lt;b&gt;%s&lt;/b&gt; tê sazkirin. Malpera te ji kêfan\n        çirifîtkan diavêje!</string>
+    <string name="domain_registration_result_title">Bijî!</string>
+    <string name="domain_contact_information_register_domain_button">Domain\'ê Tomar Bike</string>
+    <string name="domain_contact_information_postal_code_hint">Koda Posteyê</string>
     <string name="domain_contact_information_state_hint">Herêm</string>
     <string name="domain_contact_information_city_hint">Bajar</string>
     <string name="domain_contact_information_address_hint_two">Navnîşan 2</string>
@@ -721,198 +712,183 @@ Language: ku_TR
     <string name="domain_contact_information_country_code_hint">Koda Welêt</string>
     <string name="domain_contact_information_phone_number_hint">Telefon</string>
     <string name="domain_contact_information_organization_hint">Organîzasyon (li gor daxwazê)</string>
-    <string name="domain_contact_information_description">Ji bo rehetiya te, me agahiyên te yên pêwendiya WordPress.comê\n        ji berê de tije kir. Ji kerema xwe bala xwe bidê, bê ka ji dil agahiyên tu dixwazî ji bo vê navperê bi kar bînî ew in an na.</string>
-    <string name="domain_contact_information_title">Agahiyên têkiliya navperê</string>
-    <string name="domain_privacy_option_off_title">Bi eşkereyî tomar bike</string>
-    <string name="domain_privacy_option_on_title">Bi Parastina Nepenîtiyê, veşartî tomar bike</string>
-    <string name="domain_registration_privacy_protection_description">Divê xwediyên navperan di agahîdankek giştî ya hemû navperan de agahiyên xwe yî pêwendiyê parve bikin. Bi Parastina Nepenîtiyê, em agahiyên xwe di şûna yên te de parve dikin û hemû danûstandinan radigihînin te.</string>
+    <string name="domain_contact_information_description">Ji bo rehetiya te, me agahiyên te yên têkiliyê yên WordPress.com\'ê\n        ji berê vê dagirt. Ji kerema xwe, kontrol bike bê ka agahiyên rast ên tu dixwazî ji bo vê domainê hatiye bikaranin.</string>
+    <string name="domain_contact_information_title">Agahiyên têkiliyê yên navperê(domain)</string>
+    <string name="domain_privacy_option_off_title">Wekî anonîm tomar bike</string>
+    <string name="domain_privacy_option_on_title">Bi Parastina Nepeniyê re, bi taybetî tomar bike</string>
+    <string name="domain_registration_privacy_protection_description">Divê xwediyên domainê agahiyên xwe yên têkiliyê di danegeheke ku hemû domainên anonîm dihewîne de parve bikin.\n        Bi saya taybetiya Privacy Protectionê, em li şûna agahiyên te agahiyên xwe diweşînin û em bi awayekî veşartî her danûstendinê ji te re dişînin.</string>
     <string name="domain_registration_privacy_protection_title">Parastina Nihêniyê</string>
-    <string name="domain_registration_contact_form_input_error">Ji kerema xwe %s yeka derbasdar têxîne</string>
-    <string name="domains_suggestions_choose_domain">Navper Bibijêre</string>
+    <string name="domain_registration_contact_form_input_error">Ji kerema xwe %s a derbasdar bikevê</string>
+    <string name="domains_suggestions_choose_domain">Domain\'ê Hilbijêre</string>
     <string name="stats_management_new">Nû</string>
     <string name="stats_management_dismiss_insights_news_card">Veşêre</string>
     <string name="stats_management_try_it_now">Aniha biceribîne</string>
-    <string name="stats_management_news_card_message">Rêjejimarên(statîstîkên) ku dixwazî bibînî bibijêre û bala xwe bide agahiyên bi kêrî te tên. Ji bo rêjejimaran(statîstîkan) xwemalî bikî, bitepîne %1$s di binê \"Kûrbînî\"yê de.</string>
-    <string name="stats_manage_your_stats">Rêjejimarên xwe bi rê ve bibe</string>
-    <string name="history_fetching_revisions">Guherto tê anîn…</string>
-    <string name="editor_failed_to_insert_media_tap_to_retry">Tevlîkirina medyayê bi serneket.\nJi bo ceribandineke din, bitepîne.</string>
+    <string name="stats_management_news_card_message">Amarên ku tu dixwazî bibînî hilbijêrî û bala xwe bide daneyên bi kêrî te tên. Ji bo amarên xwe kesane bikî, li hêmana %1$s\'ê ya di binê \"Kûrbînî\"yê de ye bitikîne.</string>
+    <string name="stats_manage_your_stats">Amarên xwe bi rê ve bibe</string>
+    <string name="history_fetching_revisions">Guherto tên stendin…</string>
+    <string name="editor_failed_to_insert_media_tap_to_retry">Tevlîkirina medyayê bi ser neket.\nJi bo dîsa biceribînî, bitikîne.</string>
     <string name="editor_uploading_draft">Reşnivîsa te tê hilxistin</string>
     <string name="post_uploading_draft">Reşnivîs tê hilxistin</string>
     <string name="post_list_tab_drafts">Reşnivîs</string>
-    <string name="error_restoring_post">Di vegerandina şandiyê de çewtiyek pêk hat</string>
+    <string name="error_restoring_post">Di vegerandina şandiyê de çewtiyek derket</string>
     <string name="backdated_for">Vegeriya ser: %s</string>
-    <string name="stats_insights_management_title">Tenê rêjejimarên herî pêwendîdar bibîne. Kûrbînên xwe tevlî jêr bike û serast bike.</string>
+    <string name="stats_insights_management_title">Tenê amarên herî eleqedardar bibîne. Kûrbînên xwe tevlî jêrê bike û sererast bike.</string>
     <string name="stats_insights_social">Civakî</string>
-    <string name="stats_insights_annual_site_stats">Rêjejimarên Salane ya Malperê</string>
+    <string name="stats_insights_annual_site_stats">Amarên malperê yên salane</string>
     <string name="stats_view_follower_totals">Tevahiya Şopîneran</string>
-    <string name="domain_suggestions_fetch_error">Pêşniyarên navperê nehate barkirin</string>
-    <string name="domain_suggestions_search_hint">Ji bo fikrên zêdetir peyvkilîdekê binivîse</string>
+    <string name="domain_suggestions_fetch_error">Pêşniyarên navperê(domain) nehatin barkirin</string>
+    <string name="domain_suggestions_search_hint">Ji bo fikrên zêdetir, peyvkilîdekê binivîse</string>
     <string name="domains_suggestions_empty_list">Ti pêşniyar nehatin dîtin</string>
-    <string name="register_domain">Navperê Tomar Bike</string>
-    <string name="jetpack_installed_message">Ev Jetpack niha hate sazkirin, tene divê em sazkariyên te temam bikin. Ev, dê tenê xulekekê bigire.</string>
-    <string name="stats_menu_remove">Ji nav kûrbînan derxe</string>
-    <string name="stats_menu_move_down">Daxe jêr</string>
-    <string name="stats_menu_move_up">Bibe jor</string>
-    <string name="stats_item_settings">Sazkariyên hêmana rêjejimaran</string>
-    <string name="post_moving_to_draft">Şandî vedigere reşnivîsê</string>
+    <string name="register_domain">Domain\'ê Tomar Bike</string>
+    <string name="jetpack_installed_message">Va ye Jetpack hate sazkirin, îja divê em sazkariyên te temam bikin. Ev ê tenê xulekekê bigire.</string>
+    <string name="stats_menu_remove">Ji nav kûrbînan rake</string>
+    <string name="stats_menu_move_down">Veguhezîne jêrê</string>
+    <string name="stats_menu_move_up">Veguhezîne jorê</string>
+    <string name="stats_item_settings">Sazkariyên hêmana amaran</string>
+    <string name="post_moving_to_draft">Şandî vedigere nav reşnivîsan</string>
     <string name="post_restoring">Şandî tê vegerandin</string>
     <string name="post_restored">Şandî hat vegerandin</string>
     <string name="post_trashing">Şandî tê jêbirin</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_message">Jêbirina vê şandiyê dê guhertinên neqeydkirî jî rake. Bi rastî jî tu dixwazî dewam bikî?</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Guhertinên xwecihî</string>
-    <string name="button_move_to_draft">Vegerîne Reşnîvîsê</string>
-    <string name="post_list_toggle_item_layout_list_view">Derbasî xuyanga lîsteyê bibe</string>
-    <string name="post_list_toggle_item_layout_cards_view">Derbasî xuyanga kardan bibe</string>
-    <string name="posts_trashed_empty">Şandiyên te yên hatine jêbirin tune</string>
-    <string name="posts_draft_empty">Şandiyên te yên reşnivîsî tune</string>
-    <string name="posts_scheduled_empty">Şandiyên te yên demsazkirî tune</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">Jêbirina vê şandiyê ew ê guhertinên netomarkirî jî rake. Tu bi rastî jî dixwazî dewam bikî?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Guhertinên cîgehî</string>
+    <string name="button_move_to_draft">Veguhezîne Reşnivîsê</string>
+    <string name="post_list_toggle_item_layout_list_view">Derbasî xuyanga lîsteyî bibe</string>
+    <string name="post_list_toggle_item_layout_cards_view">Derbasî xuyanga kartan bibe</string>
+    <string name="posts_trashed_empty">Şandiyên te yên hatine jêbirin tune ne</string>
+    <string name="posts_draft_empty">Ti şandiyên te yên reşnivîsî tune ne</string>
+    <string name="posts_scheduled_empty">Ti şandiyên te yên demsazkirî tune ne</string>
     <string name="posts_published_empty">Te hîn ti şandî neweşandiye</string>
-    <string name="notification_wpcom_username_needed">Ji kerema xwe bi navê bikarhêner û pêborînê têkevê.</string>
-    <string name="error_user_username_instead_of_email">Ji kerema xwe li şûna navnîşana epeyama xwe, bi navê bikarhêner ya WordPress.comê têkevê.</string>
-    <string name="stats_insights_average_words">Navîna peyvan/şandiyê</string>
+    <string name="notification_wpcom_username_needed">Ji kerema xwe bi navê bikarhêner û pêborînê têkeve.</string>
+    <string name="error_user_username_instead_of_email">Ji kerema xwe li şûna navnîşana emaila xwe bi navê bikarîner ê WordPress.com\'ê têkeve.</string>
+    <string name="stats_insights_average_words">Peyv/şandî (kêm-zêde)</string>
     <string name="stats_insights_total_words">Tevahiya peyvan</string>
-    <string name="stats_insights_average_likes">Navîna ecibandinan/şandiyê</string>
+    <string name="stats_insights_average_likes">Ecibandin/şandî (kêm-zêde)</string>
     <string name="stats_insights_total_likes">Tevahiya ecibandinan</string>
-    <string name="stats_insights_average_comments">Navîna şîroveyan/şandiyê</string>
+    <string name="stats_insights_average_comments">Şîrove/şandî (kêm-zêde)</string>
     <string name="stats_insights_total_comments">Tevahiya şîroveyan</string>
     <string name="stats_insights_posts">Şandî</string>
     <string name="stats_insights_year">Sal</string>
     <string name="stats_insights_this_year_site_stats">Îsal</string>
-    <string name="no_site_error">Malpera li ser vê navnîşanê ne malpereke WordPressê ye. Ji bo girêdana bi pê re divê malper WordPressê bi kar bîne.</string>
-    <string name="plugin_check_domain_credit_error">Çavdêriya krediyên navper a berdest bi serneket.</string>
+    <string name="no_site_error">Malpera li ser vê navnîşanê ne malpereke WordPressê ye. Ji bo em lê bên girêdan divê malper WordPressê bi kar bîne.</string>
+    <string name="plugin_check_domain_credit_error">Krêdiya domainên berdest nehat kontrolkirin</string>
     <string name="plugin_check_domain_credits_progress_dialog_message">Krediyên navperê têne çavdêrîkirin</string>
-    <string name="plugin_install_custom_domain_required_dialog_register_btn">Navperê tomar bike</string>
-    <string name="plugin_install_custom_domain_required_dialog_message">Bo sazkirina pêvekan divê tu bibe xwediyê navpereke taybet ya ku têkîldarî malpera te yî.</string>
-    <string name="plugin_install_custom_domain_required_dialog_title">Pêvek bisazîne</string>
-    <string name="new_site_creation_preview_subtitle">Tê piştre karibî xuyanga malpera xwe kesane bikî</string>
-    <string name="publish_on">Dema weşanê: %s</string>
-    <string name="schedule_for">Demsaz bike bo: %s</string>
-    <string name="published_on">Di vê de hat weşand: %s</string>
-    <string name="scheduled_for">Hat demsazkirin bo: %s</string>
+    <string name="plugin_install_custom_domain_required_dialog_register_btn">Domain\'ê tomar bike</string>
+    <string name="plugin_install_custom_domain_required_dialog_message">Ji bo sazkirina pêvekan divê tu bibe xwediyê domaineke taybet a ku têkîldarî malpera te ye.</string>
+    <string name="plugin_install_custom_domain_required_dialog_title">Pêvekê saz bike</string>
+    <string name="new_site_creation_preview_subtitle">Tu yê piştre karibî xuyanga malpera xwe kesane bikî</string>
+    <string name="publish_on">Demweşan: %s</string>
+    <string name="schedule_for">Demsaz bike ji bo: %s</string>
+    <string name="published_on">Demweşan: %s</string>
+    <string name="scheduled_for">Demsazkirî ji bo: %s</string>
     <string name="stats_detail_recent_weeks">Hefteyên Dawî</string>
-    <string name="stats_detail_average_views_per_day">Pêşandinên Navîn yê Rojane</string>
-    <string name="stats_months_and_years_views_label">Pêşandin</string>
+    <string name="stats_detail_average_views_per_day">Dîtinên rojane kêm-zêde</string>
+    <string name="stats_months_and_years_views_label">Dîtin</string>
     <string name="stats_months_and_years_period_label">Heyam</string>
     <string name="stats_detail_months_and_years">Meh û Sal</string>
-    <string name="stats_insights_load_more">Bêhtir bar bike</string>
+    <string name="stats_insights_load_more">Zêdetir bar bike</string>
     <string name="stats_insights_today_stats">Îro</string>
     <string name="stats_insights_best_hour">Demjimêra Herî Baş</string>
     <string name="stats_insights_best_day">Roja Herî Baş</string>
-    <string name="showing_stats_for">Rêjêjimarên têne pêşandayîn:</string>
+    <string name="showing_stats_for">Amarên tên nîşandan:</string>
     <string name="app_rating_rate_never">Na spas</string>
     <string name="app_rating_rate_later">Piştre</string>
-    <string name="app_rating_rate_now">Niha deng bide</string>
-    <string name="app_rating_message">Dîsa hatina te çi xweş e! Heke kêfa te ji sepanê re hatibe, ji dengdayîna te ya li Google Play Storeê em ê kêfxweş bin.</string>
+    <string name="app_rating_rate_now">Aniha deng bidê</string>
+    <string name="app_rating_message">Çavê me li rêya betilî! Heke kêfa te ji sepanê re hatibe, ji dengdayîna te ya li Google Play Storeê em ê kêfxweş bibin.</string>
     <string name="app_rating_title">Kêfa te ji WordPressê re hat?</string>
-    <string name="editor_post_converted_back_to_draft">Şandî vegeriya rewşa reşnivîsê</string>
-    <string name="stats_insights_posting_activity">Çalakiya Şandinê</string>
+    <string name="editor_post_converted_back_to_draft">Şandî veguherî rewşa reşnivîsê</string>
+    <string name="stats_insights_posting_activity">Çalakiya Nivîsînê</string>
     <string name="stats_site_not_loaded_yet">Malper hîn nehatiye barkirin</string>
-    <string name="stats_more_posts">Şandiyên bêhtir</string>
+    <string name="stats_more_posts">Şandiyên zêdetir</string>
     <string name="stats_fewer_posts">Şandiyên kêmtir</string>
-    <string name="new_site_creation_preview_back_pressed_warning">Gengaz e tu pêşveçûnê winda bike. Bi rastî jî tu dixwazî derkeve?</string>
-    <string name="plans_loading_error_with_cache_button">Dîsa jî Planan Nîşan Bide</string>
-    <string name="plans_loading_error_with_cache_subtitle">Ji bo dîtina Planan girêdana torekê pêwîst e, ji ber wê dibe ku hûrgilî kevn bin.</string>
-    <string name="plans_loading_error_no_cache_subtitle">Ji bo dîtina Planan girêdana torê pêwist e.</string>
-    <string name="plans_loading_error_no_plans_subtitle">Niha em nikarin Planên te bar bikin. Piştre dîsa biceribîne.</string>
-    <string name="plans_loading_error_no_plans_title">Plan nayên barkirin</string>
-    <string name="plans_loading_error_network_title">Girêdan nîn e</string>
-    <string name="menu_switch_to_gutenberg_editor">Derbasî Serrastgeha Blokê Bibe</string>
-    <string name="menu_switch_to_aztec_editor">Derbasî Serrastgeha Klasîk Bibe</string>
-    <string name="stats_loading_block_error">Di dema barkirina daneyên te de pirsgirêkek pêk hat, rûpela xwe nû bike û dîsa biceribîne.</string>
-    <string name="stats_loading_error">Dane nehat barkirin</string>
-    <string name="site_settings_gutenberg_default_for_new_posts_summary">Bi serrastgeha bloke şandî û rûpelên nû serrast bike</string>
-    <string name="site_settings_gutenberg_default_for_new_posts">Serrastgeha Blokê bi kar bîne</string>
-    <string name="dialog_gutenberg_informative_title">Serrastgeha Blokê Hat Çalakkirin</string>
-    <string name="exit">derkeve</string>
-    <string name="quick_start_sites_type_subtitle">Ji %1$d/%2$d hat qedandin</string>
-    <string name="quick_start_sites_type_grow">Girseya Xwe Mezin Bike</string>
-    <string name="quick_start_sites_type_customize">Malpera Xwe Kesane Bike</string>
+    <string name="new_site_creation_preview_back_pressed_warning">Dibe ku tu pêşveçûnê wenda bikî. Tu bi rastî jî dixwazî derkevî?</string>
+    <string name="plans_loading_error_with_cache_button">Dîsa jî Pakêtan Nîşan Bide</string>
+    <string name="plans_loading_error_with_cache_subtitle">Ji bo Pakêtan bibînî girêdana înternetê pêwîst e, ji ber wê dibe ku hûrgilî ne hildem bin.</string>
+    <string name="plans_loading_error_no_cache_subtitle">Ji bo Pakêtan bibînî girêdana înternetê pêwîst e.</string>
+    <string name="plans_loading_error_no_plans_subtitle">Niha em nikarin Pakêtên te bar bikin. Piştre dîsa biceribîne.</string>
+    <string name="plans_loading_error_no_plans_title">Pakêt nayên barkirin</string>
+    <string name="plans_loading_error_network_title">Înternet tune ye</string>
+    <string name="menu_switch_to_gutenberg_editor">Derbasî edîtora blokê bibe</string>
+    <string name="stats_loading_block_error">Di dema barkirina daneyên te de pirsgirêkek derket, rûpela xwe nû bike û dîsa biceribîne.</string>
+    <string name="stats_loading_error">Dane nehatin barkirin</string>
+    <string name="site_settings_gutenberg_default_for_new_posts_summary">Bi edîtora bloke şandî û rûpelên nû sererast bike</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">Edîtora blokê bi kar bîne</string>
+    <string name="exit">derketin</string>
+    <string name="quick_start_sites_type_subtitle">%1$d / %2$d qediya</string>
     <string name="quick_start_sites">Gavên Pêşve</string>
     <string name="quick_start_complete_tasks_header"> (%d) Qediya</string>
     <string name="quick_start_dialog_view_site_message">Kêfa xwe bi berhema qediyayî bîne!</string>
-    <string name="quick_start_dialog_upload_icon_title">Nîşanekeke malperê hilbar bike</string>
-    <string name="quick_start_dialog_upload_icon_message">Mêvanên te dê nîşaneka te di gerokên xwe de bibînin. Ji bo xuyangeke birqonek û profesyonel nîşanekeke taybet tevlî bike.</string>
-    <string name="quick_start_dialog_explore_plans_message_short">Ji bo plana derbasdar û ên din ên berdest bibînî pê li  %1$s Plan %2$s ê bike</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Ji bo rûpeleke nû biafirînî pêlî %1$s Rûpel Tevlî Bike %2$s yê bike.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Ji bo domandinê %1$s Rûpel %2$sê bitepîne.</string>
-    <string name="quick_start_dialog_check_stats_message_short">Ji bo performansa malpera xwe bibîne pêlî %1$s Rêjejimar %2$sê bike.</string>
-    <string name="quick_start_dialog_upload_site_icon_message_short">Ji bo yeka din bar bike, pêlî %1$s Nîşaneka Te ya Malperê %2$s bike</string>
-    <string name="quick_start_dialog_publish_post_message">Yekem şandiya xwe bike reşnivîs û biweşîne.</string>
-    <string name="quick_start_dialog_need_help_message">Em ê ji bo binyadên avakirin û mezinkirina malpera te ji te re rêberiyê bikin.</string>
-    <string name="quick_start_dialog_migration_title">Me hinek guhertin di lîsteya te ya çavdêriyê de kir.</string>
-    <string name="quick_start_dialog_migration_message">Ji bo alikariya mezinkirina girseya te, me zêdetir peywir tevlî kir.</string>
-    <string name="quick_start_dialog_explore_plans_title">Planan venasîne</string>
-    <string name="quick_start_dialog_explore_plans_message">Di planên mûçekarî de agahî derbarê alavên bazargerî û SEOyê bi dest bixe.</string>
+    <string name="quick_start_dialog_upload_icon_title">Îkona malperekê hilxîne</string>
+    <string name="quick_start_dialog_upload_icon_message">Mêvanên te ew ê îkona te di gerokên xwe de bibînin. Ji bo xuyangeke profesyonel û balkêş îkoneke taybet tevlî bike.</string>
+    <string name="quick_start_dialog_explore_plans_message_short">Ji bo tu pakêta xwe ya heyî û pakêtên din ên berdest bibînî li %1$sPakêt%2$s\'ê bitepîne</string>
+    <string name="quick_start_dialog_check_stats_message_short">Ji bo tu performansa malpera xwe bibînî li %1$sAmar%2$s\'an bitepîne.</string>
+    <string name="quick_start_dialog_upload_site_icon_message_short">Ji bo yeka din lê hilxînî, li %1$sÎkona Malpera Te%2$s\'yê bitepîne</string>
+    <string name="quick_start_dialog_publish_post_message">Şandiya xwe ya ewil bike reşnivîs û biweşîne.</string>
+    <string name="quick_start_dialog_need_help_message">Em ê ji bo bingehên avakirin û mezinkirina malpera te ji te re rêberiyê bikin.</string>
+    <string name="quick_start_dialog_migration_title">Me hinek guhertin di lîsteya te ya kontrolê de kir</string>
+    <string name="quick_start_dialog_migration_message">Ji bo ku tu girseya temaşevanên xwe mezin bikî, me gelek peywir tevlî kirin.</string>
+    <string name="quick_start_dialog_explore_plans_title">Pakêtan keşf bike</string>
+    <string name="quick_start_dialog_explore_plans_message">Di derbarê alavên SEO\'yê û bazarkirinê yên pakêtên bipere de, agahî bi dest bixe.</string>
     <string name="quick_start_dialog_enable_sharing_title">Parvekirina şandiyê biçalakîne</string>
-    <string name="quick_start_dialog_enable_sharing_message">Ji bo ajimêrên xwe yên medyayên civakî, şandiyên nû bi otomatîkî parve bike.</string>
-    <string name="quick_start_dialog_customize_site_message">Fontên nivîsan eyar bike, wêneyan tevlî bike û zêdetir.</string>
-    <string name="quick_start_dialog_create_page_title">Rûpeleke nû biafirîne</string>
-    <string name="quick_start_dialog_create_page_message">Ji bo naveroka sereke, rûpelekê tevlî bike — rûpela \"Derbar\" destpêkeke mezin e. </string>
-    <string name="quick_start_dialog_check_stats_title">Rêjejimarên malpera xwe kontrol bike</string>
-    <string name="quick_start_dialog_check_stats_message">Di derbarê performansa malpera xwe de agahiyên rojane bi dest bixe.</string>
-    <string name="quick_start_dialog_browse_themes_title">Li rûkaran bigere</string>
-    <string name="quick_start_dialog_browse_themes_message">Bi dehan vebijêrkên pergalê vebibîne û ahengiya bêkêmasî bibîne.</string>
-    <string name="quick_start_dialog_remove_next_steps_message">Rakirina Gavên Pêş dê hemû gerên vê malperê veşêre. Ev çalakî nayê vegerandin.</string>
+    <string name="quick_start_dialog_enable_sharing_message">Şandiyên nû di hesabên xwe yên medyaya civakî de bixweber parve bike.</string>
+    <string name="quick_start_dialog_check_stats_title">Amarên malpera xwe kontrol bike</string>
+    <string name="quick_start_dialog_check_stats_message">Agahiyên li ser performansa malpera xwe hildemîne.</string>
+    <string name="quick_start_dialog_remove_next_steps_message">Rakirina Gavên Pêşve ew ê hemû gerên vê malperê veşêre. Ev çalakî nayê vegerandin.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Gavên Pêş Rake</string>
     <string name="quick_start_remove_next_steps_menu_title">Vêya rake</string>
-    <string name="quick_start_complete_view_subtitle">Temamkirina lîsteya te pîroz be. Her bijî, karekî baş e.</string>
-    <string name="quick_start_complete_view_title">Hemû peywir hat temamkirin!</string>
+    <string name="quick_start_complete_view_subtitle">Te lîsteya xwe temam kir. Her bijî te karekî baş kir.</string>
+    <string name="quick_start_complete_view_title">Hemû peywir hatin temamkirin!</string>
     <string name="quick_start_task_skip_menu_title">Peywirê derbas bike</string>
     <string name="quick_start_completed_tasks_header_chevron_collapse_desc">teng bike</string>
     <string name="quick_start_completed_tasks_header_chevron_expand_desc">fireh bike</string>
-    <string name="notification_channel_reminder_title">Bîranînok</string>
-    <string name="stats_select_next_period_description">Heyama pêşî hilbijêre</string>
+    <string name="notification_channel_reminder_title">Bîranîner</string>
+    <string name="stats_select_next_period_description">Heyama pêş hilbijêre</string>
     <string name="stats_select_previous_period_description">Heyama paşî hilbijêre</string>
     <string name="stats_most_popular_percent_views">%1$d%% ji dîtinan</string>
     <string name="stats_insights_popular">Dema Herî Populer</string>
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
-    <string name="new_site_creation_site_preview_content_description">Pêşdîtina malperê tê nişandan</string>
+    <string name="new_site_creation_site_preview_content_description">Pêşdîtina malperê tê nîşandan</string>
     <string name="new_site_creation_clear_all_content_description">Paqij bike</string>
-    <string name="site_created_but_not_fetched_snackbar_message">Xuya ye girêdana te hêdî ye. Heke tu malpera xwe ya nû di lîsteyê de nabînî, venûkirinê biceribîne.</string>
+    <string name="site_created_but_not_fetched_snackbar_message">Xuya ye înterneta te hêdî ye. Heke tu malpera xwe ya nû di lîsteyê de nabînî, nûkirinê biceribîne.</string>
     <string name="cancel_new_site_wizard_content_description">Efsûnbaza Afirandina Malperê Betal Bike</string>
     <string name="notification_new_site_creation_creating_site_subtitle">Em malpera te ya nû diafirînin</string>
     <string name="notification_new_site_creation_failed">Pirsgirêkek hebû</string>
     <string name="notification_new_site_creation_title">Malperê Biafirîne</string>
     <string name="new_site_creation_create_site_button">Malperê Biafirîne</string>
-    <string name="new_site_creation_search_domain_input_hint">Li Navpêran Bigere</string>
-    <string name="new_site_creation_domain_header_subtitle">Vê derê ew cih e ku dê mirov te li înternetê têde bibînîn.</string>
-    <string name="new_site_creation_domain_header_title">Ji bo malpera xwe navekî navperê hilbijêre</string>
-    <string name="new_site_creation_empty_domain_list_message">Tu navnîşana derbasdar û lêgerîna te li hev nayên</string>
-    <string name="site_creation_error_generic_subtitle">Şaşiyeke di ragihandina rajekarê de pêk hat, ji kerema xwe dîsa biceribîne</string>
+    <string name="new_site_creation_domain_header_subtitle">Mirov di înternetê de ew ê te li vir bibînin.</string>
+    <string name="new_site_creation_empty_domain_list_message">Li gorî lêgerîna te ti navnîşan nehat dîtin</string>
+    <string name="site_creation_error_generic_subtitle">Di têkîliya bi serverê re çewtî derket, ji kerema xwe dîsa biceribîne</string>
     <string name="site_creation_error_generic_title">Pirsgirêkek hebû</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Pirsgirêkek hebû</string>
-    <string name="site_creation_segments_subtitle">Ev ê ji bo pêşniyardayînê alîkariya me bike. Lê, tê qet sînordar nebe  — wiha dê hemû malper pêşkevin!</string>
-    <string name="site_creation_segments_title">Tu dixwazî malpereke çawa çê bike ji mere bibêje</string>
-    <string name="new_site_creation_preview_title">malpera te hat afirandin!</string>
-    <string name="new_site_creation_screen_title_step_count">%1$d ji %2$d</string>
+    <string name="new_site_creation_preview_title">Malpera te hat afirandin!</string>
+    <string name="new_site_creation_screen_title_step_count">%1$d / %2$d</string>
     <string name="new_site_creation_screen_title_general">Malperê Biafirîne</string>
     <string name="suggestions_updated_content_description">Pêşniyar hatin hildemandin</string>
     <string name="site_picker_failed_selecting_added_site">Malpera xwe-hewandî ya nû hatiye tevlîkirin, nehat hilbijartin.</string>
     <string name="local_post_is_conflicted">Nakokiya guhertoyê</string>
-    <string name="preference_crash_reports_summary">Ji bo alîkariya pêşxistinê ya performansa sepanê, desture bide raporê hilweşînên otomatîk.</string>
+    <string name="preference_crash_reports_summary">Ji bo em karibin performansa sepanê baştir bikin destûre bide raporên hilweşînên otomatîk.</string>
     <string name="preference_crash_reports">Raporên hilweşînê</string>
     <string name="snackbar_conflict_undo">Vegerîne</string>
     <string name="snackbar_conflict_web_version_discarded">Guhertoya webê hat avêtin</string>
     <string name="snackbar_conflict_local_version_discarded">Guhertoya cîgehî hat avêtin</string>
     <string name="toast_conflict_updating_post">Şandî tê hildemandin</string>
-    <string name="dialog_confirm_load_remote_post_discard_web">Webê Biavêje</string>
-    <string name="dialog_confirm_load_remote_post_discard_local">Xwecihiyê Biavêje</string>
-    <string name="dialog_confirm_load_remote_post_body_2">Xwecihî\nDi %s an de hat tomarkirin\n\nWeb\nDi %s an de hat tomarkirin\n</string>
-    <string name="dialog_confirm_load_remote_post_body">Du guhertoyên nakok yê vê şandiyê hene. Guhertoya tu dixwazî ya avêtinê hilbijêre.\n\n\n</string>
-    <string name="dialog_confirm_load_remote_post_title">Nakokiya hevdemiyê çareser bike</string>
-    <string name="stats_no_data_for_period">Ji bo vê heyamê dane tune</string>
-    <string name="preference_strip_image_location">Ji medyayê cih rake</string>
-    <string name="stats_cannot_be_started">Rêjejimar vêga nayên vekirin. Paştre dîsa biceribîne.</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Web\'ê Biavêje</string>
+    <string name="dialog_confirm_load_remote_post_discard_local">Cîgehiyê Biavêje</string>
+    <string name="dialog_confirm_load_remote_post_body_2">Cîgehî\nDi %s\'an de hat tomarkirin\n\nWeb\nDi %s\'an de hat tomarkirin\n</string>
+    <string name="dialog_confirm_load_remote_post_body">Du guhertoyên bi nakok ên vê şandiyê hene. Guhertoya ku tu dixwazî jê biavêjî, hilbijêre.\n\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Nakokiya senkronîzeyê çareser bike</string>
+    <string name="stats_no_data_for_period">Ji bo vê heyamê dane tune ye</string>
+    <string name="preference_strip_image_location">Ji medyayê cîgehê rake</string>
+    <string name="stats_cannot_be_started">Em niha nikarin amaran vekin. Ji kerema xwe paşê dîsa biceribîne</string>
     <string name="gif_picker_endless_scroll_network_error">Ji ber çewtiya torê hinek medya nehatin barkirin.</string>
-    <string name="gif_picker_empty_search_list">Lêgerîna te û ti medya li hev nehat</string>
+    <string name="gif_picker_empty_search_list">Li gorî lêgerîna te ti medya nehat dîtin</string>
     <string name="gif_picker_initial_empty_text">Ji bo tu GIF\'an tevlî Medyageha xwe bikî, lê bigere!</string>
     <string name="stats_author_views_label">Dîtin</string>
     <string name="stats_author_label">Nivîskar</string>
     <string name="stats_authors">Nivîskar</string>
     <string name="stats_search_terms_views_label">Dîtin</string>
-    <string name="stats_search_terms_label">Têgeha Lêgerînê</string>
-    <string name="stats_search_terms">Têgehên Lêgerînê</string>
+    <string name="stats_search_terms_label">Têgiha Lêgerînê</string>
+    <string name="stats_search_terms">Têgihên Lêgerînê</string>
     <string name="stats_videos_views_label">Dîtin</string>
     <string name="stats_videos_title_label">Sernav</string>
     <string name="stats_videos">Vîdyo</string>
@@ -933,13 +909,13 @@ Language: ku_TR
     <string name="stats_insights_twitter">Twitter</string>
     <string name="stats_insights_facebook">Facebook</string>
     <string name="stats_insights_view_more">Zêdetir bibîne</string>
-    <string name="stats_insights_share_post">Şandî parve bike</string>
-    <string name="stats_insights_create_post">Şandî biafirîne</string>
-    <string name="stats_insights_latest_post_message">Ji weşana %2$s vir ve %1$s. Heta nuha şandeya te çawa performans kiriye, li vir e:</string>
+    <string name="stats_insights_share_post">Şandiyê parve bike</string>
+    <string name="stats_insights_create_post">Şandiya biafirîne</string>
+    <string name="stats_insights_latest_post_message">Ji weşandina %2$s\'ê û vir ve %1$s bûye. Heta niha performansa şandiya te wiha ye:</string>
     <string name="stats_insights_latest_post_with_no_engagement">Ji weşana %2$s vir ve %1$s. Topa xwe bigindire û bi riya parvekirinê dîtinên şandeya xwe zêde bike:</string>
-    <string name="stats_insights_latest_post_empty">Te hîn ti şandî neweşandiye. Dema te dest bi weşanê kir dê kurteya şandiya te ya dawî li vir xuya bike:</string>
+    <string name="stats_insights_latest_post_empty">Te hîn ti şandî neweşandiye. Dema te dest bi weşandinê kir ew ê kurteya şandiya te ya dawî li vir xuya bike:</string>
     <string name="stats_insights_tags_and_categories">Etîket û Kategorî</string>
-    <string name="stats_insights_all_time_stats">Her-dem</string>
+    <string name="stats_insights_all_time_stats">Hemû-dem</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">Şopîner</string>
     <string name="stats_publicize_service_label">Xizmet</string>
@@ -953,242 +929,222 @@ Language: ku_TR
     <string name="stats_comments_author_label">Nivîskar</string>
     <string name="stats_comments_posts_and_pages">Şandî û Rûpel</string>
     <string name="stats_comments_authors">Nivîskar</string>
-    <string name="stats_follower_since_label">Ji vir ve</string>
+    <string name="stats_follower_since_label">Jê û vir ve:</string>
     <string name="stats_follower_label">Şopîner</string>
-    <string name="stats_followers_count_message">Tevahî %1$s Şopîner: %2$s</string>
-    <string name="stats_followers_email">E-peyam</string>
+    <string name="stats_followers_count_message">Tevahî %1$s şopîner: %2$s</string>
+    <string name="stats_followers_email">Email</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
     <string name="stats_manage_insights">Kûrbînan bi rê ve bibe</string>
     <string name="stats_empty_insights_title">Hîn kûrbîn nehatine tevlîkirin</string>
     <string name="stats_no_data_yet">Hîn dane tune ye</string>
     <string name="menu_debug">Menuya Debugê</string>
     <string name="change_password_dialog_message">Pêborîn tê guhertin…</string>
-    <string name="change_password_dialog_hint">Divê pêborîna te bi qasî dirêjiya şeş karekteran be. Ji bo bihêztirbûnê tîpên mezin û biçûk, hejmar û nîşanên wekî ! \" ? $ % ^ &amp; ) bi kar bîne.</string>
-    <string name="change_password_confirmation">Pêborîn bi serkeftî hat guherandin</string>
+    <string name="change_password_dialog_hint">Divê pêborîna te bi qasî dirêjiya şeş karekteran be. Ji bo bihêztirbûnê tîpên mezin û biçûk, hejmar û nîşanên wekî ! \" ? $ % ^  ) bi kar bîne.</string>
+    <string name="change_password_confirmation">Pêborîn bi serkeftî hat guhertin</string>
     <string name="change_password">Pêborînê biguherîne</string>
     <string name="support_identity_input_dialog_name_label">Nav</string>
     <string name="history_no_title">(sernav tune)</string>
-    <string name="history_preview_html">Pêşdîtina HTML</string>
+    <string name="history_preview_html">Pêşdîtina HTML\'î</string>
     <string name="history_preview_visual">Pêşdîtina dîtbarî</string>
-    <string name="history_detail_title">Serrastkirî</string>
+    <string name="history_detail_title">Revizyon</string>
     <string name="history_detail_button_previous">Paşve</string>
     <string name="history_detail_button_next">Pêşve</string>
     <string name="media_space_used">%1$s hat bikaranîn</string>
-    <string name="enter_wpcom_or_jetpack_site">Ji kerema xwe têkeve WordPress.com-ekê an jî malpereke WordPressê ya xwe-hewandî û girêdayî Jetpackê.</string>
-    <string name="history_loading_revision">Serrastkirin tê barkirin</string>
-    <string name="history_loaded_revision">Serrastkirin hat barkirin</string>
+    <string name="enter_wpcom_or_jetpack_site">Ji kerema xwe têkeve WordPress.com\'ê an jî malpereke WordPressê ya xwe-hewan û girêdayî Jetpackê</string>
+    <string name="history_loading_revision">Revizyon tê barkirin</string>
+    <string name="history_loaded_revision">Revizyon hat barkirin</string>
     <string name="history_load_dialog_button_positive">Bar bike</string>
-    <string name="history_footer_post">Şandî li ser %1$s di %2$s de hat afirandin</string>
-    <string name="history_footer_page">Rûpel li ser %1$s di %2$s de hat afirandin</string>
+    <string name="history_footer_post">Şandî di %1$s , %2$s\'an de hat afirandin</string>
+    <string name="history_footer_page">Rûpel di %1$s , %2$s\'an de hat afirandin</string>
     <string name="history_empty_title">Hîn raborî tune ye</string>
-    <string name="history_empty_subtitle_post">Dema te guhertinek li ser şandiya xwe kir, tê bikaribî raboriyê li vir bibînî</string>
-    <string name="history_empty_subtitle_page">Dema te guhertinek li ser rûpela xwe kir, tê bikaribî raboriyê li vir bibînî</string>
+    <string name="history_empty_subtitle_post">Dema ku te guhertin li ser şandiya xwe kir, tu yê karibî raboriyê li vir bibînî</string>
+    <string name="history_empty_subtitle_page">Dema ku te guhertinek li ser rûpela xwe kir, tu yê karibî raboriyê li vir bibînî</string>
     <string name="description_user">Avatara bikarhêner</string>
     <string name="image_size_full_label">Mezinahiya Tije</string>
     <string name="image_size_large_label">Mezin</string>
     <string name="image_size_medium_label">Navîn</string>
-    <string name="image_size_thumbnail_label">Wêneya biçûk</string>
+    <string name="image_size_thumbnail_label">Wêneyê biçûk</string>
     <string name="menu_history">Raborî</string>
-    <string name="pages_open_page_error">Rûpela hilbijartî ne li berdeste</string>
-    <string name="pages_pending">Vekolîna Hilawîstî</string>
-    <string name="pages_empty_trashed">Ti rûpelên te yên hatine jêbirin nîn e</string>
-    <string name="pages_empty_scheduled">Ti rûpelên te yên demsazkirî nîn e</string>
-    <string name="pages_empty_drafts">Ti rûpelên te yên reşnivîs nîn e</string>
-    <string name="pages_empty_published">Te hîn ti rûpel neweşandiye.</string>
+    <string name="pages_open_page_error">Rûpela hilbijartî ne berdest e</string>
+    <string name="pages_pending">Li benda nirxandinê</string>
+    <string name="pages_empty_trashed">Ti rûpelên te yên hatine jêbirin tune ye</string>
+    <string name="pages_empty_scheduled">Ti rûpelên te yên demsazkirî tune ye</string>
+    <string name="pages_empty_drafts">Ti rûpelên te yên reşnivîs tune ye</string>
+    <string name="pages_empty_published">Te hîn ti rûpel neweşandiye</string>
     <string name="pages_search_suggestion">Li rûpelan bigere</string>
-    <string name="pages_empty_search_result">Lêgerînên te bi ti rûpelan re hevber nebû</string>
-    <string name="pages_delete_permanently">Bi Mayînde Jê Bîbe</string>
-    <string name="pages_move_to_trash">Veguhezîne Jêbirdankê</string>
-    <string name="pages_move_to_draft">Vegerîne Reşnivîsê</string>
+    <string name="pages_empty_search_result">Li gorî lêgerîna te ti rûpel nehatin dîtin</string>
+    <string name="pages_delete_permanently">Bi mayînde jê bîbe</string>
+    <string name="pages_move_to_trash">Veguhêze jêbirdankê</string>
+    <string name="pages_move_to_draft">Veguhezîne Reşnivîsê</string>
     <string name="pages_set_parent">Dêûbavan diyar bike</string>
     <string name="pages_view">Bibîne</string>
-    <string name="pages_trashed">Jêçûyî</string>
+    <string name="pages_trashed">Çû jêbirdankê</string>
     <string name="pages_scheduled">Demsazkirî</string>
     <string name="pages_drafts">Reşnivîs</string>
-    <string name="pages_published">Weşandî</string>
-    <string name="login_error_sms_throttled">Me gelek caran koda piştrastkirinê a SMSê şand — navberekî bide û di nav xulekekî de dîsa bixwaze.</string>
-    <string name="login_error_email_not_found_v2">Ti ajimêrên WordPress.comê bi vê ajimêra Googleê re hevberî hev nehatin.</string>
-    <string name="site_picker_remove_site_empty">Lêgerînên te bi ti malperan re hevber nebû</string>
-    <string name="reader_empty_followed_blogs_search_title">Lêgerînên te bi ti malperan re hevber nebû</string>
-    <string name="page_parent_changed">Rûpela mak hat guhertin</string>
+    <string name="pages_published">Hat weşandin</string>
+    <string name="login_error_sms_throttled">Melek gelek caran kodên pejirandinê yên SMS\'ê şand. Hinekî bisekîne û piştî xulekekê yeka din daxwaz bike.</string>
+    <string name="login_error_email_not_found_v2">Ti hesabekî WordPress.com\'ê bi vî hesabê Googleê re hevberî hev nehatin.</string>
+    <string name="site_picker_remove_site_empty">Li gorî lêgerîna te ti malper nehat dîtin</string>
+    <string name="reader_empty_followed_blogs_search_title">Li gorî lêgerîna te ti malper nehat dîtin</string>
+    <string name="page_parent_changed">Make-rûpel hat guhertin</string>
     <string name="page_permanently_deleted">Rûpel bi awayekî mayînde hate jêbirin</string>
     <string name="page_moved_to_scheduled">Rûpel hat demsazkirin</string>
     <string name="page_moved_to_published">Rûpel hat weşandin</string>
     <string name="page_moved_to_trash">Rûpel hat jêbirin</string>
-    <string name="page_moved_to_draft">Rûpel bo reşnivîsê hate vegerandin</string>
-    <string name="top_level">Asta bilind</string>
-    <string name="page_delete_dialog_message">Bi rastî jî tu dixwazî rûpela %s jê bibe?</string>
-    <string name="page_parent_change_error">Di guhertina rûpela mak de pirsgirêkek heye</string>
-    <string name="page_status_change_error">Di guhartina rewşa rûpelê de pirsgirêkek çê bû</string>
-    <string name="page_delete_error">Di jêbirina rûpelê de pirsgirêkek çê bû</string>
-    <string name="set_parent">Makê Saz Bike</string>
-    <string name="quick_start_focus_point_description">vira bitepîne</string>
+    <string name="page_moved_to_draft">Rûpel veguhezî nav Reşnivîsan bû</string>
+    <string name="top_level">Asta herî bilind</string>
+    <string name="page_delete_dialog_message">Tu bi rastî jî dixwazî rûpela %s\'ê jê bibî?</string>
+    <string name="page_parent_change_error">Di guhertina make-rûpelê depirsgirêkek derket</string>
+    <string name="page_status_change_error">Di guhertina rewşa rûpelê de pirsgirêkek derket</string>
+    <string name="page_delete_error">Di jêbirina rûpelê de pirsgirêkek derket</string>
+    <string name="set_parent">Dêûbav diyar bike</string>
+    <string name="quick_start_focus_point_description">vir bitepîne</string>
     <string name="quick_start_list_create_site_title">Malpera xwe biafirîne</string>
-    <string name="quick_start_list_create_site_subtitle">Malpera xwe bînin rewşa xebitînê</string>
+    <string name="quick_start_list_create_site_subtitle">Malpera xwe rake ser lingan û biweşîne.</string>
     <string name="quick_start_dialog_view_site_title">Malpera xwe bibîne</string>
-    <string name="quick_start_dialog_view_site_message_short">Ji bo tu pêşdîtina malpera xwe bibînî %1$s Malperê Bibîne %2$s yê bitepîne</string>
+    <string name="quick_start_dialog_view_site_message_short">Ji bo tu pêşdîtina malpera xwe bibînî li %1$sMalperê Bibîne%2$s\'yê bitepîne</string>
     <string name="quick_start_dialog_share_site_title">Malpera xwe parve bike</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Ji bo domandinê %1$s Parvekirin %2$s ê bitepîne</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_connections">Ji bo tevlîkirina ajimêrên medyaya civakî %1$s Pêwendî %2$s yê bitepîne</string>
-    <string name="quick_start_dialog_share_site_message">Ajimêrên xwe yên medyaya civakî girê bide – malpera te dê şandiyên nû wekî otomatîk parve bike.</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Ji bo domandinê li %1$sParvekirin%2$s\'ê bitepîne</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_connections">Ji bo tu hesabên xwe yên medyaya civakî tevlî bikî li %1$sGirêdan%2$s\'ê bitepîne</string>
+    <string name="quick_start_dialog_share_site_message">Hesabên xwe yên medyaya civakî girêbide – malpera te ew ê şandiyên nû bixweber parve bike.</string>
     <string name="quick_start_dialog_publish_post_title">Şandiyekê biweşîne</string>
-    <string name="quick_start_dialog_publish_post_message_short">Ji bo şandiyeke nû biafirînî %1$s Şandî Biafirîne %2$s yê bitepîne</string>
-    <string name="quick_start_dialog_need_help_title">Ji bo destpêkirinê hinek alîkarî dixwazî?</string>
+    <string name="quick_start_dialog_publish_post_message_short">Ji bo şandiyeke nû biafirînî li %1$sŞandî Biafirîne%2$s\'yê bitepîne</string>
+    <string name="quick_start_dialog_need_help_title">Ji bo dest pê bikî alîkariyeke biçûk dixwazî?</string>
     <string name="quick_start_dialog_need_help_button_positive">Bipejirîne</string>
     <string name="quick_start_dialog_need_help_button_neutral">Qet</string>
     <string name="quick_start_dialog_need_help_button_negative">Na Spas</string>
     <string name="quick_start_dialog_follow_sites_title">Malperên din bişopîne</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Ji bo malperên heman berjewendîdar bibînî li %1$s Lêbigere %2$s yê bitepîne</string>
-    <string name="quick_start_dialog_follow_sites_message_short_reader">Ji bo domandinê %1$s Xwîner %2$s ê bitepîne</string>
-    <string name="quick_start_dialog_follow_sites_message">Li malperan bigere ên dinûqûtin dilê te û wan bişopîne bo rojanekirinên şandeyên wan.</string>
-    <string name="quick_start_dialog_customize_site_title">Malpera xwe besane bike</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Ji bo domandinê %1$s Rûkar %2$s ê bitepîne</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Ji bo dest bi  kesanekirina malpera xwe bike %1$s Kesane Bike %2$s yê bitepîne</string>
-    <string name="quick_start_dialog_choose_theme_title">Rûkarekê hilbijêre</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Ji bo rûkarên nû vebibîne %1$s Rûkar %2$s ê bitepîne</string>
-    <string name="quick_start_dialog_choose_theme_message">Ji bo ahengeke bêkêmasî, çavekî li hemû rûkarên me bigerîne.</string>
+    <string name="quick_start_dialog_follow_sites_message_short_reader">Ji bo domandinê li %1$sXwîner%2$s\'ê bitepîne</string>
+    <string name="quick_start_dialog_follow_sites_message">Malperên ku îlhamê didine te bibîne û wan bişopîne ji bo ku hayê te ji hildemandinên weşanên wan çêbibe.</string>
     <string name="quick_start_button_positive">Here</string>
-    <string name="quick_start_button_negative_short">Betal</string>
+    <string name="quick_start_button_negative_short">Betal bike</string>
     <string name="quick_start_button_negative">Ne niha</string>
     <string name="content_description_more">Zêdetir</string>
-    <string name="my_site_create_new_site_title">Ti malperên te nîn e</string>
-    <string name="reader_empty_followed_tags_title">Etîketa şopkirî tune ye</string>
-    <string name="reader_empty_followed_tags_subtitle">Etîketan tevlî vir bike ji bo dîtina şandeyan ên ku favoriyên te ne</string>
-    <string name="login_to_to_connect_jetpack">Ji bo girêdana Jetpackê di ajimêra xwe ya WordPress.comê keve.</string>
+    <string name="my_site_create_new_site_title">Ti malperên te tune ye</string>
+    <string name="reader_empty_followed_tags_title">Mijarên şopandî tune ye</string>
+    <string name="reader_empty_followed_tags_subtitle">Ji bo ku tu şandiyên têkildarî mijarên xwe yên favorî bibinî, mijaran tevlî vir bike</string>
+    <string name="login_to_to_connect_jetpack">Ji bo Jetpackê girêbidî têkeve hesabê xwe yê WordPress.com\'ê yê tu bi kar tînî.</string>
     <string name="install_jetpack_retry">Dîsa Biceribîne</string>
     <string name="install_jetpack_continue">Bidomîne</string>
-    <string name="jetpack_installation_problem_message">Jetpack di vêgavê de nehat sazkirin.</string>
+    <string name="jetpack_installation_problem_message">Jetpack niha nayê sazkirin.</string>
     <string name="jetpack_installation_problem">Pirsgirêkek hebû</string>
-    <string name="jetpack_installed">Jetpack sazkirî ye</string>
-    <string name="installing_jetpack_message">Jetpack li malperate tê sazkirin. Qedandina vê kirariyê dê çend xulekan bigire</string>
+    <string name="jetpack_installed">Jetpack hat sazkirin</string>
+    <string name="installing_jetpack_message">Jetpack li malpera te tê sazkirin. Qedandina vê kirariyê dê çend xulekan bigire.</string>
     <string name="installing_jetpack">Jetpack tê sazkirin</string>
-    <string name="install_jetpack_message">Dê agahiyên nasnameya malpera te neyê veşartin wê tenê ji bo sazkirina Jetpackê were bi kar anîn.</string>
-    <string name="install_jetpack">Jetpackê Saz Bike</string>
+    <string name="install_jetpack_message">Dê agahiyên nasnameya malpera te neyê veşartin ew ê tenê ji bo sazkirina Jetpackê werin bi kar anîn.</string>
+    <string name="install_jetpack">Jetpack\'ê Saz Bike</string>
     <string name="jetpack">Jetpack</string>
-    <string name="stats_jetpack_connection_faq">Jetpack PPTP</string>
-    <string name="stats_jetpack_connection_setup_info">Ji bo bikaranîna rêjejimarên malpera te ya WordPressê, divê tu pêvekên Jetpackê saz bikî.</string>
-    <string name="themes_empty_list">Lêgerînen te bi ti rûkaran re hevber nebû</string>
+    <string name="stats_jetpack_connection_faq">Jetpack PPP</string>
+    <string name="stats_jetpack_connection_setup_info">Ji bo ku tu Amarên malpera xwe ya WordPressê bi kar bînî divê tu pêveka Jetpackê saz bikî.</string>
+    <string name="themes_empty_list">Li gorî lêgerîna te ti rûkar nehat dîtin</string>
     <string name="reader_label_post_search_explainer">Tu dixwazî çi bibînî?</string>
-    <string name="site_settings_tags_empty_title_search">Tu etîket û lêgerîna te li hev nayên</string>
-    <string name="site_settings_tags_empty_title">Tu etîketên te tune ye.</string>
-    <string name="site_settings_tags_empty_subtitle">Etîketên xwe yên tu pir bi kar tînî tevlî vir bike, bi saya vê dikarin nivîsên te yên etîketkirî bi hêsanî hilbijêrin</string>
-    <string name="site_settings_tags_empty_button">Etîketek biafirîne</string>
+    <string name="site_settings_tags_empty_title_search">Li gorî lêgerîna te ti etîket nehat dîtin</string>
+    <string name="site_settings_tags_empty_title">Ti etîketên te tune ye</string>
+    <string name="site_settings_tags_empty_subtitle">Etîketên xwe yên tu pir bi kar tînî tevlî vir bike, bi saya vê ew ê bikarin di dema etîketkirinê de şandiyên te bi hêsanî hilbijêrin</string>
+    <string name="site_settings_tags_empty_button">Etîketekê biafirîne</string>
     <string name="media_empty_search_list">Lêgerîna te û ti medya li hev nayên</string>
-    <string name="sign_out_wpcom_confirm_with_no_changes">Tu yê ji WordPressê derkeve?</string>
-    <string name="sign_out_wpcom_confirm_with_changes">Guhertinên di şandiyan de hatiye kirin li malpera te nehatiye hilxistin. Heke tu aniha derkevî dê ev guhertin ji amûrê biçe. Dîsa jî tê derkevî?</string>
-    <string name="people_empty_list_filtered_viewers">Hîna kesî temaşe nekiriye</string>
-    <string name="people_empty_list_filtered_email_followers">Hîna şopînerên epeyamê tune ne</string>
-    <string name="people_empty_list_filtered_followers">Hîna şopîner tune</string>
-    <string name="people_empty_list_filtered_users">Hîna bikarhêner tune</string>
-    <string name="reader_empty_posts_liked_description">Şandiyên te ecibandî dê li vir xuya bibe</string>
+    <string name="sign_out_wpcom_confirm_with_no_changes">Tu yê ji WordPressê derkevî?</string>
+    <string name="sign_out_wpcom_confirm_with_changes">Guhertinên di şandiyan de hatine kirin li malpera te nehatine hilxistin. Heke tu aniha derkevî dê ev guhertin ji cîhazê bên jêbirin. Dîsa jî tu yê derkevî?</string>
+    <string name="people_empty_list_filtered_viewers">Hîn ti kesî temaşe nekiriye</string>
+    <string name="people_empty_list_filtered_email_followers">Hîn şopînerên emailê tune ne</string>
+    <string name="people_empty_list_filtered_followers">Hîn şopîner tune ye</string>
+    <string name="people_empty_list_filtered_users">Hîn bikarhêner tune ye</string>
+    <string name="reader_empty_posts_liked_description">Şandiyên ku te ecibandine ew ê li vir xuya bibin</string>
     <string name="reader_empty_posts_liked_title">Hîn ti tişt nehatiye ecibandin</string>
-    <string name="reader_empty_followed_blogs_button_followed">Here şopandinên xwe</string>
+    <string name="reader_empty_followed_blogs_button_followed">Here şopandinan</string>
     <string name="reader_empty_followed_blogs_button_discover">Malperan keşf bike</string>
-    <string name="reader_empty_followed_blogs_title">Malperên tu dişopîne tune</string>
-    <string name="notifications_empty_likes">Hîn ecibandin tune</string>
-    <string name="notifications_empty_followers">Hîna şopîner tune</string>
-    <string name="activity_log_limited_content_on_free_plan">Ji ber ku tu di plana azad de yî, tu yê di çalakiyên xwe de bûyerên sînorkirî bibînî.</string>
-    <string name="activity_log_empty_subtitle">Dema ku te guhertin li malpera xwe kir, dê bikaribî raboriya çalakiyên xwe li vir bibînî</string>
-    <string name="activity_log_empty_title">Hîn çalakî tune</string>
+    <string name="reader_empty_followed_blogs_title">Malperên tu dişopînî tune ye</string>
+    <string name="notifications_empty_likes">Hîn ecibandin tune ye</string>
+    <string name="notifications_empty_followers">Hîn şopîner tune ye</string>
+    <string name="activity_log_limited_content_on_free_plan">Ji ber ku tu di pakêta azad de yî, tu yê di çalakiyên xwe de bûyerên sînordar bibînî.</string>
+    <string name="activity_log_empty_subtitle">Dema ku te guhertin li malpera xwe kir, tu yê bikarî raboriya çalakiyên xwe li vir bibînî</string>
+    <string name="activity_log_empty_title">Hîn çalakî tune ye</string>
     <string name="posts_empty_list_button">Şandiyekê biafirîne</string>
     <string name="pages_empty_list_button">Rûpelekê biafirîne</string>
-    <string name="media_empty_upload_media">Medya hilbar bike</string>
-    <string name="media_empty_list">Ti medya tune</string>
-    <string name="reader_gallery_images_desc">pêşengeha wêneyan</string>
-    <string name="blavatar_desc">Nîşaneka malperê</string>
-    <string name="theme_image_desc">wêneya rûkarê</string>
-    <string name="featured_image_desc">taybetiyên wêneyê</string>
+    <string name="media_empty_upload_media">Medyayê lê hilxîne</string>
+    <string name="media_empty_list">Ti medyayên tune ye</string>
+    <string name="reader_gallery_images_desc">galeriya wêneyan</string>
+    <string name="blavatar_desc">îkona malperê</string>
+    <string name="theme_image_desc">wêneyê rûkarê</string>
+    <string name="featured_image_desc">wêneyê bijarde</string>
     <string name="button_discard">Biavêje</string>
     <string name="reader_avatar_desc">wêneyê profîlê</string>
     <string name="notification_channel_transient_title">Demkî</string>
-    <string name="support_identity_input_dialog_email_label">Emaîl</string>
-    <string name="support_identity_input_dialog_enter_email">Ji kerema xwe navnîşan xwe ya epeyamê têxîne</string>
-    <string name="support_identity_input_dialog_enter_email_and_name">Ji bo domandinê ji kerema xwe navnîşana xwe ya epeyamê û nav têxîne</string>
-    <string name="support_push_notification_message">Ji \'Alîkarî &amp; Piştgirî\'yê peyameke nû</string>
+    <string name="support_identity_input_dialog_email_label">Email</string>
+    <string name="support_identity_input_dialog_enter_email">Ji kerema xwe navnîşana emaila xwe bikevê</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Ji bo domandinê ji kerema xwe, email û navê xwe bikevê</string>
+    <string name="support_push_notification_message">Peyameke nû ji \'Alîkarî û Piştgirî\'yê heye</string>
     <string name="support_push_notification_title">WordPress</string>
     <string name="support_contact_email_not_set">Saz nebû</string>
-    <string name="support_contact_email">Têkiliya epeyamê</string>
-    <string name="application_log_button">Tomarên sepanê</string>
-    <string name="my_tickets">Bilêtên min</string>
-    <string name="activity_log_rewind_dialog_message">Tu bawer î malpera xwe vegerînî li şûna %1$s berê %2$s? Dê ev, hemû naverok û vebijarkên ku hatine çêkirin an guhertin ji wê demê ve rake.</string>
-    <string name="activity_log_rewind_site">Malperê Vegerîne</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Vegerandin didome</string>
-    <string name="activity_log_currently_restoring_message">Li şûna %1$s %2$s ê tê vegerandin</string>
+    <string name="support_contact_email">Emaila têkiliyê</string>
+    <string name="application_log_button">Tomargeha sepanê</string>
+    <string name="my_tickets">Bilêtên Min</string>
     <string name="activity_log_currently_restoring_title">Malpera te niha tê vegerandin</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Malpera te bi serkeftî hat vegerandin</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Malpera te bi serkeftî hat vegerandin\nLi şûna %1$s %2$s ê hat vegerandin</string>
-    <string name="activity_log_rewind_started_snackbar_message">Malpera te bi serkeftî hat vegerandin\nLi şûna %1$s %2$s ê tê vegerandin</string>
-    <string name="activity_log_button">Bişkoka çalakiyê ya Tomarên Çalakê</string>
-    <string name="plugin_auto_managed">Yên bi otomatikî tê rêvebirin</string>
-    <string name="reader_save_posts_locally_dialog_message">Vê şandiyê qeyd bike û kengî tu bixwazî wê bixwînî lê vegere. Ew ê tenê li ser vê cîhazê berdest be, şandiyên qeydkirî bi cîhazên te yên din re senkronîze nabe.</string>
-    <string name="reader_save_posts_locally_dialog_title">Şandiyan ji bo Piştre Tomar Bike</string>
+    <string name="activity_log_button">Bişkoka Tomargeha Çalakiyan</string>
+    <string name="plugin_auto_managed">Bixweber tên birevêbirin</string>
+    <string name="reader_save_posts_locally_dialog_message">Vê şandiyê tomar bike û kengî tu bixwazî wê bixwînî lê vegere. Ew ê tenê li ser vê cîhazê berdest be, şandiyên qeydkirî bi cîhazên te yên din re senkronîze nabin.</string>
+    <string name="reader_save_posts_locally_dialog_title">Şandiyan ji bo \"Paşê\" tomar bike</string>
     <string name="reader_empty_search_request_failed">Lêgerîn nayê kirin</string>
     <string name="reader_empty_search_title">Ti encam nehatin dîtin</string>
     <string name="comment_read_source_post">Çavkaniya şandiyê bixwîne</string>
     <string name="sites">Malper</string>
     <string name="signup_magic_link_title">Girêdana sêhrî hat şandin</string>
-    <string name="signup_email_screen_title">Bi epeyamê têkevê</string>
-    <string name="verification_2fa_screen_title">Piştrastkirina kodê</string>
-    <string name="selfhosted_site_login_title">Agahiyên nasnameyê ya têketinê</string>
+    <string name="verification_2fa_screen_title">Pejirandina kodê</string>
+    <string name="selfhosted_site_login_title">Agahiyên têketinê</string>
     <string name="magic_link_sent_login_title">Girêdana sêhrî hat şandin</string>
     <string name="magic_link_login_title">Têketina girêdana sêhrî</string>
-    <string name="site_address_login_title">Têketina navnîşanê ya malperê</string>
-    <string name="email_address_login_title">Têketina navnîşanê ya epeyamê</string>
-    <string name="alternatively">Vebijêrkek din:</string>
-    <string name="reader_empty_saved_posts_description">Li %s ê bitepîne ji bo tomarkirina şandeyeke li lîsteya te.</string>
-    <string name="reader_empty_saved_posts_title">Şandeyên tomarkirî tune ye — hîn!</string>
-    <string name="reader_bookmark_snack_title">Şandeya tomarkirî</string>
+    <string name="site_address_login_title">Bi navnîşana malperê re têkeve</string>
+    <string name="email_address_login_title">Bi navnîşana emailê re têkeve</string>
+    <string name="reader_empty_saved_posts_description">Ji bo şandiyê li lîsteya xwe tomar bikî li %s\'ê bitepîne.</string>
+    <string name="reader_empty_saved_posts_title">Heta niha ti şandî nehatiye tomarkirin!</string>
+    <string name="reader_bookmark_snack_title">Şandî hat tomarkirin</string>
     <string name="reader_bookmark_snack_btn">Hemûyan Bibîne</string>
-    <string name="reader_btn_bookmarked">Tomarkirî</string>
-    <string name="reader_btn_bookmark">Tomar bike</string>
     <string name="reader_remove_bookmark">Ji nav şandiyên tomarkirî rake</string>
     <string name="reader_add_bookmark">Tevlî şandiyên tomarkirî bike</string>
     <string name="reader_save_for_later_title">Şandiyên tomarkirî</string>
     <string name="removed">Hat rakirin</string>
-    <string name="my_site_icon_content_description">Nîşaneka malperê biguherîne</string>
-    <string name="my_site_icon_dialog_cancel_button">Betal</string>
+    <string name="my_site_icon_content_description">Îkona malperê biguherîne</string>
+    <string name="my_site_icon_dialog_cancel_button">Betal bike</string>
     <string name="my_site_icon_dialog_remove_button">Rake</string>
     <string name="my_site_icon_dialog_change_button">Biguherîne</string>
-    <string name="my_site_icon_dialog_change_requires_permission_message">Destûra te bo serrastkirina nîşaneka malperê tune ye.</string>
-    <string name="my_site_icon_dialog_add_requires_permission_message">Destûra te bo tevlîkirina nîşaneka malperê tune ye.</string>
-    <string name="my_site_icon_dialog_change_message">Tu çawa dixwazî nîşanekê serrast bike?</string>
-    <string name="my_site_icon_dialog_add_message">Tu dixwazî nîşanekeke malperê tevlî bikî?</string>
-    <string name="my_site_icon_dialog_title">Nîşaneka Malperê</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">Destûra te ji bo sererastkirina îkona malperê tune ye.</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">Destûra te ji bo tevlîkirina îkona malperê tune ye.</string>
+    <string name="my_site_icon_dialog_change_message">Tu dixwazî îkonê çawa sererast bikî?</string>
+    <string name="my_site_icon_dialog_add_message">Tu dixwazî îkona malperê tevlî bikî?</string>
+    <string name="my_site_icon_dialog_title">Îkona Malperê</string>
     <string name="reader_followed_blog_notifications_this">ev malper</string>
     <string name="reader_followed_blog_notifications_action">Biçalakîne</string>
     <string name="reader_followed_blog_notifications">Bila ji bo \"%1$s%2$s%3$s\"ê danezan çalak bibin?</string>
     <string name="reader_btn_notifications_on">Danezanên malperê veke</string>
     <string name="reader_btn_notifications_off">Danezanên malperê bigire</string>
-    <string name="activity_log_jetpack_icon">Nîşaneka Jetpackê</string>
-    <string name="rewind">Vegerîne</string>
-    <string name="activity_log_event">Bûyer</string>
-    <string name="activity_log_icon">Nîşaneka çalakiyê</string>
-    <string name="activity_log">Tomara çalakiyê</string>
-    <string name="activity">Çalakî</string>
+    <string name="activity_log_jetpack_icon">Îkona Jetpackê</string>
+    <string name="activity_log_event">Çalakî</string>
+    <string name="activity_log_icon">Îkona çalakiyê</string>
+    <string name="activity_log">Tomargeha Çalakiyan</string>
     <string name="privacy_policy_read">Polîtîkaya nihêniyê bixwîne</string>
-    <string name="third_party_policy_learn_more_caption">Hin aliyên sêyemîn jî tê de, em alavên şopandinê ya din bi kar tînin. Di derheqê wan û kontrolkirina wan de bixwîne.</string>
+    <string name="third_party_policy_learn_more_caption">Hin aliyên sêyem jî tê de, em alavên şopandinê yên din bi kar tînin. Di derheqê wan û kontrolkirina wan de bixwîne.</string>
     <string name="third_party_policy_learn_more_header">Polîtîkaya Aliyên Sêyem</string>
-    <string name="privacy_policy_learn_more_caption">Ev agahî alîkariya me dikin ji bo pêşverbirina berhemên me, ji bo kêrhatîtirkirina bazariya me, ji bo taybetkirina ceribeyên te yên WordPress.comê û ji bo bi dûrûdirêj qalkirina me di rêbaza me ya veşariyê de.</string>
+    <string name="privacy_policy_learn_more_caption">Ev agahî ji bo ku em berhemên xwe çêtir bikin, bazarê ji bo we têkildartir bikin û tecrûbeya we ya WordPress.com\'ê kesane bikin ji me re dibin alîkar. Zêdetirî wan di polîtîkaya nihêniyê de bi hûrgulî hatiye ravekirin.</string>
     <string name="privacy_policy_learn_more_header">Polîtîkaya Nihêniyê</string>
     <string name="cookie_policy_learn_more_caption">Dema têketina te ya ajimêra WordPress.comê, di derheqê bikaranîna xizmetan de bi alavê me ya analîzê re agahî parve bikin.</string>
-    <string name="cookie_policy_learn_more_header">Rêbaza Xurekê</string>
+    <string name="cookie_policy_learn_more_header">Polîtîkaya Xurekê</string>
     <string name="preference_privacy_settings">Sazkariyên nihêniyê</string>
     <string name="preference_collect_information">Agahî berhev bike</string>
     <string name="post_submitted">Şandî hat şandin</string>
-    <string name="login_email_button_signup">Ajimêra te tune ye? %1$sTomar Bibe%2$s</string>
-    <string name="plugin_install_site_ineligible_site_graylisted">Taybetiya pêvekê pêwîstî bi rewşa baş a malperê dike.</string>
-    <string name="plugin_install_site_ineligible_not_domain_owner">Taybetiya pêvekê pêwîst dike ku endamtiya bingehîn a navperê bi vê bikarhênerê ve girêdayî be.</string>
-    <string name="plugin_install_site_ineligible_non_admin_user">Taybetiya pêvekê pêwîstî bi berjewendiya rêvebirê dike.</string>
+    <string name="plugin_install_site_ineligible_site_graylisted">Taybetiya pêvekê hewce dike ku malper di rewşeke baş de be.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Taybetiya pêvekê hewce dike ku abonetiya bingehîn a domainê bi vî bikarhênerî ve girêdayî be.</string>
+    <string name="plugin_install_site_ineligible_non_admin_user">Taybetiya pêvekê îmtiyazên rêvebir hewce dike.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">Pêvek li malperên VIPê nayê sazkirin.</string>
-    <string name="plugin_install_site_ineligible_excessive_disk_space">Ji ber sînordarkirinên qada dîskê pêvek nayê sazkirin.</string>
-    <string name="plugin_install_site_ineligible_email_unverified">Taybetiya pêvekê pêwîstî bi navnîşana epeyameke piştrastkirî dike.</string>
-    <string name="plugin_install_site_ineligible_site_private">Taybetiya pêvekê pêwist dike ku malper gelemperî be.</string>
-    <string name="plugin_install_site_ineligible_no_business_plan">Taybetiya pêvekê pêwistî bi planeke business dike.</string>
-    <string name="plugin_install_site_ineligible_not_using_custom_domain">Taybetiya pêvekê pêwistî bi navpereke taybet dike.</string>
+    <string name="plugin_install_site_ineligible_excessive_disk_space">Ji ber sînordariyên qada dîskê pêvek nayê sazkirin.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">Taybetiya pêvekê navnîşana emaileke piştrastkirî hewce dike.</string>
+    <string name="plugin_install_site_ineligible_site_private">Taybetiya pêvekê hewce dike ku malper anonîm be.</string>
+    <string name="plugin_install_site_ineligible_no_business_plan">Taybetiya pêvekê pakêteke karsaziyê hewce dike.</string>
+    <string name="plugin_install_site_ineligible_not_using_custom_domain">Taybetiya pêvekê domaineke taybet hewce dike.</string>
     <string name="plugin_install_first_plugin_almost_finished_dialog_message">Em sazkirina dawî dikin — hema hema qediya…</string>
     <string name="plugin_install_first_plugin_progress_dialog_message">Pêvek tê sazkirin…</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Saz Bike</string>
-    <string name="plugin_install_first_plugin_confirmation_dialog_message">Dibe ku sazkirina pêveka yekem xulekekê bigire. Di vê demê de tê nikaribî guhertinan li ser malpera xwe bikî.</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_message">Dibe ku sazkirina pêveka yekem xulekekê bigire. Di vê demê de tu yê nikaribî guhertinan li ser malpera xwe bikî.</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Pêvekê saz bike</string>
     <string name="notification_settings_followed_dialog_title">Danezan</string>
     <string name="notification_settings_followed_dialog_email_comments">Şîroveyên nû bi emailê ji min re bîşîne</string>
@@ -1198,24 +1154,24 @@ Language: ku_TR
     <string name="notification_settings_followed_dialog_notification_posts_switch">Şandiyên nû</string>
     <string name="notification_settings_followed_dialog_notification_posts_description">Ji bo şandiyên nû yên vê malperê danezanan bistîne</string>
     <string name="notification_settings_followed_dialog_email_posts_switch">Şandiyên nû bi emalê ji min re bişîne</string>
-    <string name="notification_settings_item_your_sites_all_followed_sites">Hemû Malperên Ez Dişopînim</string>
-    <string name="notification_settings_category_followed_sites">Malperên Hatine Şopandin</string>
-    <string name="content_description_person_reading_device_notification">Kesê bi cîhazê danezanan dixwîne</string>
+    <string name="notification_settings_item_your_sites_all_followed_sites">Hemû malperên ez dişopînim</string>
+    <string name="notification_settings_category_followed_sites">Malperên Şopandî</string>
+    <string name="content_description_person_reading_device_notification">Kesê ku bi cîhazê danezanan dixwîne</string>
     <string name="content_description_people_looking_charts">Mirovên li grafîk û planan dinêrin</string>
     <string name="comment_title">%s li ser %s</string>
-    <string name="dialog_confirm_delete_permanently_post">Bi rastî jî tu dixwazî vê şandiyê bi awayekî mayînde jê bibî?</string>
+    <string name="dialog_confirm_delete_permanently_post">Tu bi rastî jî dixwazî vê şandiyê bi awayekî mayînde jê bibî?</string>
     <string name="notification_channel_important_title">Girîng</string>
     <string name="notification_channel_general_title">Giştî</string>
     <string name="photo_picker_use_photo">Vî wêneyî bi kar bîne</string>
     <string name="media_preview_title">%1$d / %2$d</string>
-    <string name="stock_media_picker_initial_empty_subtext">Wêne ji aliyê %s ve tên peydakirin</string>
-    <string name="stock_media_picker_initial_empty_text">Ji bo wêneyên belaş tevlî Medyagehê bikî, li wêneyan bigere</string>
-    <string name="stock_media_picker_search_hint">Di wênegeha serhêl de bigere</string>
-    <string name="photo_picker_stock_media">Ji wênegeha serhêl hilbijêre</string>
+    <string name="stock_media_picker_initial_empty_subtext">Ji aliyê %s ve tê peydakirin</string>
+    <string name="stock_media_picker_initial_empty_text">Ji bo wêneyên belaş tevlî Medyageha xwe bikî, li wêneyan bigere</string>
+    <string name="stock_media_picker_search_hint">Li wênegeha belaş bigere</string>
+    <string name="photo_picker_stock_media">Ji nav Wênegeha Belaş hilbijêre</string>
     <string name="error_save_empty_draft">Reşnivîsa vala nayê tomarkirin</string>
-    <string name="site_settings_quota_space_unlimited">Ji %1$s bêsînor</string>
-    <string name="preview_count">%d pêşdîtin</string>
-    <string name="add_count">%d Tevlê Bike</string>
+    <string name="site_settings_quota_space_unlimited">%1$s / bêsînor</string>
+    <string name="preview_count">Pêşdîtin %d</string>
+    <string name="add_count">%d Tevlî Bike</string>
     <string name="fab_add_tag_desc">Etîketekê Biafirîne</string>
     <string name="navigate_up_desc">here jorê</string>
     <string name="notification_settings_switch_desc">Danezan</string>
@@ -1224,10 +1180,10 @@ Language: ku_TR
     <string name="reader_photo_view_desc">wêne</string>
     <string name="reader_list_item_suggestion_remove_desc">jê bibe</string>
     <string name="photo_picker_thumbnail_desc">Vîdyoyê bilîzîne</string>
-    <string name="reader_cardview_post_play_video_desc">Vîdyoya berpêş bilîzîne</string>
+    <string name="reader_cardview_post_play_video_desc">vîdyoya bijarde bilîzîne</string>
     <string name="plugin_detail_logo_desc">logoya pêvekê</string>
     <string name="plugin_detail_banner_desc">sernavê pêvekê</string>
-    <string name="photo_picker_wpmedia_desc">ji medyayên WordPress\'ê hilbijêre</string>
+    <string name="photo_picker_wpmedia_desc">ji nav medyayên WordPress\'ê hilbijêre</string>
     <string name="photo_picker_camera_desc">kamerayê veke</string>
     <string name="photo_picker_device_desc">ji cîhazê hilbijêre</string>
     <string name="people_invite_role_info_desc">agahiya rolê</string>
@@ -1248,8 +1204,8 @@ Language: ku_TR
     <string name="menu_undo_snackbar_action">VEGERÎNE</string>
     <string name="menu_visual_mode_done_snackbar">Derbasî moda Dîtbarî bû</string>
     <string name="menu_visual_mode">Moda Dîtbarî</string>
-    <string name="menu_html_mode_done_snackbar">Derbasî moda HTML bû</string>
-    <string name="menu_html_mode">Moda HTML</string>
+    <string name="menu_html_mode_done_snackbar">Derbasî moda HTML\'ê bû</string>
+    <string name="menu_html_mode">Moda HTML\'ê</string>
     <string name="menu_preview">Pêşdîtin</string>
     <string name="menu_save_as_draft">Wekî reşnivîs tomar bike</string>
     <string name="file_size_in_terabytes">%s TB</string>
@@ -1261,22 +1217,21 @@ Language: ku_TR
     <string name="site_settings_quota_space_hint">Heke pêwistiya te bi valahiya zêdetir hebe, bilindkirina plana WordPress\'ê bifikire.</string>
     <string name="site_settings_quota_space_title">Qada Hatiye Bikaranîn</string>
     <string name="site_settings_quota_header">Medya</string>
-    <string name="comment_unspam_talkback">Şîrove wekî nespam hat nîşankirin</string>
+    <string name="comment_unspam_talkback">Şîrove wekî ne spam hat nîşankirin</string>
     <string name="comment_spam_talkback">Şîrove wekî spam hat nîşankirin</string>
     <string name="comment_delete_talkback">Şîrove hat jêbirin</string>
     <string name="comment_untrash_talkback">Şîrove hat vegerandin</string>
-    <string name="comment_trash_talkback">Şîrove hate şandin jêbirdankê</string>
+    <string name="comment_trash_talkback">Şîrove hat jêbirin</string>
     <string name="comment_unliked_talkback">Ecibandina şîroveyê hat rakirin</string>
     <string name="comment_liked_talkback">Şîrove hat ecibandin</string>
-    <string name="comment_unapproved_talkback">Pejira şîroveyê hat rakirin</string>
+    <string name="comment_unapproved_talkback">Pejirandina şîroveyê hat rakirin</string>
     <string name="comment_approved_talkback">Şîrove hat pejirandin</string>
     <string name="notif_detail_screen_title">Hûrgiliya danezanê %s</string>
     <string name="edit_photo_screen_title">Wêneyê Sererast Bike</string>
     <string name="share_intent_screen_title">Malper hilbijêre</string>
     <string name="signup_epilogue_screen_title">Hesabê nû</string>
-    <string name="login_prologue_screen_title">Têkeve</string>
-    <string name="login_epilogue_screen_title">Bi vî hesabî têketî ye</string>
-    <string name="person_detail_screen_title">Hûrgiliya kesê</string>
+    <string name="login_epilogue_screen_title">Bi vî hesabî têketî ye:</string>
+    <string name="person_detail_screen_title">Hûrguliya şexsî</string>
     <string name="media_settings_screen_title">Hûrgiliya dosyeyê</string>
     <string name="publicize_buttons_screen_title">Bişkokên parvekirinê</string>
     <string name="notifications_screen_title">Danezan</string>
@@ -1288,104 +1243,95 @@ Language: ku_TR
     <string name="license_screen_title">Lîsans</string>
     <string name="release_notes_screen_title">Notên guhertoyê</string>
     <string name="signup_epilogue_error_avatar_view">Avatara te hat hilxistin û di demeke nêzîk de ew ê berdest bibe.</string>
-    <string name="permissions_denied_message">Xuya ye te destûrên pêdivî yên ji bo vê taybetiyê girtiye.&lt;br/>&lt;br/>Ji bo guhertina wê destûrên xwe serrast bike û ji çalakbûna &lt;strong>%s&lt;/strong>ê piştrast bibe.</string>
+    <string name="permissions_denied_message">Xuya ye te ji bo vê taybetiyê destûrên hewce girtine.&lt;br/&gt;&lt;br/&gt;Ji bo guhertina vê, destûrên xwe sererast bike û ji çalakbûna &lt;strong&gt;%s&lt;/strong&gt;\'ê piştrast bibe.</string>
     <string name="permissions_denied_title">Destûr</string>
-    <string name="plugin_caption_featured">Berpêş</string>
-    <string name="sharing_disabled_description">Ji ber ku modula Jetpacka te ya Parvekirinê neçalak e, tu nikare bigihêje sazkariyên pervekirinê.</string>
+    <string name="plugin_caption_featured">Bijarde</string>
+    <string name="sharing_disabled_description">Ji ber ku modula Parvekirinê ya Jetpack\'a te neçalak e, tu nikarî bigihîjî sazkariyên pervekirinê.</string>
     <string name="sharing_disabled">Modula parvekirinê neçalak e</string>
     <string name="version_with_name_param">Guherto %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
     <string name="publisher_with_company_param">Weşanger: %s</string>
-    <string name="notification_sound_has_invalid_path">Rêya dengê hilbijartî ne derbasdar e. Ji kerema xwe yeka din hilbijêre.</string>
+    <string name="notification_sound_has_invalid_path">Rêya dengê hilbijartî nederbasdar e. Ji kerema xwe yeka din hilbijêre.</string>
     <string name="quickpress_shortcut_with_account_param">QP %s</string>
-    <string name="uploading_subtitle_pages_posts">%1$d rûpel / şandî maye</string>
+    <string name="uploading_subtitle_pages_posts">%1$d rûpel / şandî mane</string>
     <string name="uploading_subtitle_pages_only_one">Rûpelek maye</string>
-    <string name="uploading_subtitle_pages_only_plural">%1$d rûpel maye</string>
-    <string name="uploading_subtitle_posts_only_plural">%1$d şandî maye</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d rûpel / şandî û pelgeyek maye</string>
-    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d şandî û pelgeyek maye</string>
-    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d rûpel û pelgeyek maye</string>
-    <string name="uploading_subtitle_mixed_post_singular_media_one">Şandî û pelgeyek maye</string>
-    <string name="uploading_subtitle_mixed_page_singular_media_one">Rûpel û pelgeyek maye</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d rûpel / şande û %2$d ji %3$d ê pelgeh man</string>
-    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d şande û %2$d ji %3$d ê pelgeh man</string>
-    <string name="uploading_subtitle_mixed_pages_plural_media_plural">%1$d rûpel û %2$d ji %3$d ê pelgeh man</string>
-    <string name="uploading_subtitle_mixed_post_singular_media_plural">1 şande û %1$d ji %2$d ê pelgeh man</string>
-    <string name="uploading_subtitle_mixed_page_singular_media_plural">1 rûpel û %1$d ji %2$d ê pelgeh man</string>
+    <string name="uploading_subtitle_pages_only_plural">%1$d rûpel mane</string>
+    <string name="uploading_subtitle_posts_only_plural">%1$d şandî mane</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d rûpel / şandî û dosyayek mane</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d şandî û dosyayek mane</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d rûpel û dosyayek mane</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_one">Şandiyek û dosyeyek mane</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_one">Rûpelek û dosyeyek mane</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d rûpel / şandî û %2$d / %3$d dosye man</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d şandî û %2$d / %3$d dosye man</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_plural">%1$d rûpel û %2$d / %3$d dosye man</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_plural">Şandiyek û %1$d / %2$d dosye mane</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_plural">Rûpelek û %1$d / %2$d dosye mane</string>
     <string name="media_file_pages_and_posts_only_not_uploaded">%1$d şandî / rûpel nehatin hilxistin</string>
     <string name="media_file_pages_plural_only_not_uploaded">%1$d rûpel nehatin hilxistin</string>
     <string name="media_file_page_singular_only_not_uploaded">Rûpelek nehat hilxistin</string>
     <string name="media_file_posts_plural_only_not_uploaded">%1$d şandî nehatin hilxistin</string>
     <string name="media_file_post_singular_only_not_uploaded">Şandiyek nehat hilxistin</string>
-    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%1$d şande / rûpel bi %2$d pel ve nehat barkirin</string>
-    <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%1$d rûpel bi %2$d pel ve nehatin barkirin</string>
-    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">1 rûpel bi %1$d pel ve nehatin barkirin</string>
-    <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%1$d şande bi %2$d pel ve nehatin barkirin</string>
-    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">1 şande bi %1$d pelgeh ve nehatin barkirin</string>
-    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d şande / rûpel bi 1 pelgeh ve nehatin barkirin</string>
-    <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d rûpel bi 1 pelgeh ve nehatin barkirin</string>
-    <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 rûpel bi 1 pelgeh ve nehatin barkirin</string>
-    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d şande bi 1 pelgeh ve nehatin barkirin</string>
-    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 şande bi 1 pelgeh ve nehatin barkirin</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%1$d şandî / rûpel û %2$d dosye nehatin hilxistin</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%1$d rûpel û %2$d dosye nehatin hilxistin</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">Rûpelek û %1$d dosye nehatin hilxistin</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%1$d şandî û %2$d dosye nehatin hilxistin</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">Şandiyek û %1$d dosye nehatin hilxistin</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d şandî / rûpel û dosyeyek nehatin hilxistin</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d rûpel û dosyeyek nehatin hilxistin</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_one_file">Rûpelek û dosyeyek nehatin hilxistin</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d şandî û dosyeyek nehatin hilxistin</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_one_file">Şandiyek û dosyeyek nehatin hilxistin</string>
     <string name="untitled_in_parentheses">(Bêsernav)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Malperê biafirîne</string>
-    <string name="notification_site_creation_created">Ji bo domandinê bitepîne.</string>
+    <string name="notification_site_creation_created">Ji bo domandinê, bitepîne.</string>
     <string name="notification_site_creation_title_success">Malper hat afirandin!</string>
-    <string name="google_error_timeout">Bersivdana Googleê gelek dereng ma. Heta ku girêdana te ya torê bihêztir bibe, dibe ku tu li bendê bisekine.</string>
-    <string name="username_changer_title">Navê bikarhênerê biguherîne</string>
-    <string name="username_changer_hint">Ji bo zêdetir pêşniyazan binivîsîne</string>
-    <string name="username_changer_header">Navê te ya heyî %1$s%2$s%3$s e/ye. Ji xeynî çend awarteyan, kesên din dê tenê navê te ya dîtinê %4$s%5$s%6$s bibînin.</string>
-    <string name="username_changer_error_none">Ji %1$s%2$s%3$s ê navê bikarhêner nehat pêşniyazkirin. Ji bo ku pêşniyazan bistîne, ji kerema xwe zêdetir tîp an jî hejmar binivîse.</string>
-    <string name="username_changer_error_generic">Dema ku pêşniyarên navên bikarhêneran dihat stendin çewtiyek pêk hat.</string>
+    <string name="google_error_timeout">Googleê pir dereng bersiv da. Dibe ku heta girêdana te ya înternetê bihêztir bibe tu bisekinî.</string>
+    <string name="username_changer_title">Navê bikarhêner biguherîne</string>
+    <string name="username_changer_hint">Ji bo pêşniyarên zêdetir, binivîse</string>
+    <string name="username_changer_header">%1$s%2$s%3$s navê te yê heyî ye. Ji bilî çend îstisnayan, kesên din ew ê tenê navê te yê dixuye %4$s%5$s%6$s, bibînin.</string>
+    <string name="username_changer_error_none">%1$s%2$s%3$s navê bikarhêner pêşniyar nekir. Ji bo tu pêşniyaran bistînî, ji kerema xwe zêdetir tîp an jî hejmaran binivîse.</string>
+    <string name="username_changer_error_generic">Di sitendina pêşniyarên navê bikarhêneriyê de çewtiyek derket.</string>
     <string name="username_changer_dismiss_message">Bila guhertina navê bikarhêner betal bibe?</string>
-    <string name="username_changer_dismiss_button_positive">Bavêje</string>
+    <string name="username_changer_dismiss_button_positive">Biavêje</string>
     <string name="username_changer_action">Tomar bike</string>
     <string name="content_description_add_avatar">Avatar tevlî bike</string>
-    <string name="signup_with_google_button">Bi Google\'ê Tomar Bibe</string>
-    <string name="signup_with_email_button">Bi Epeyamê Tomar Bibe</string>
-    <string name="signup_user_exists">Epeyam ji xwe li ser WordPress.comê heye.\nBi têketinê kar tê kirin.</string>
-    <string name="signup_updating_account">Ajimêr tê hildemandin…</string>
-    <string name="signup_terms_of_service_text">Bi tomarbûnê re tu %1$sMercên Xizmetê%2$s yên me dipejirînî.</string>
-    <string name="signup_magic_link_progress">Epeyam tê şandin</string>
+    <string name="signup_user_exists">Jixwe email li ser WordPress.com\'ê heye.\nDerbasî têketinê dibe.</string>
+    <string name="signup_updating_account">Hesab tê hildemandin…</string>
+    <string name="signup_magic_link_progress">Email tê şandin</string>
     <string name="signup_magic_link_error_button_positive">Dîsa Bîceribîne</string>
     <string name="signup_magic_link_error_button_negative">Bigire</string>
-    <string name="signup_magic_link_error">Di şandina epeyamê de pirsgirêk çebû. Tu dikarî niha dîsa biceribîne an jî bigire û piştre biceribîne.</string>
+    <string name="signup_magic_link_error">Di şandina emailê de hin pirsgirêk derketibûn. Tu dikarî niha dîsa biceribînî an jî bigirî û paşê dîsa biceribînî.</string>
     <string name="signup_epilogue_hint_username">Navê bikarhêner</string>
-    <string name="signup_epilogue_hint_password_detail">Tu her timî dikarî wekî berî niha bi girêdanekê têketinê bike lê heke tu bixwazî em dikarin pêborînekê jî ji te re saz bikin.</string>
+    <string name="signup_epilogue_hint_password_detail">Tu her timî dikarî wekî berî niha bi girêdanekê têketinê bikî lê heke tu bixwazî em dikarin pêborînekê jî ji te re saz bikin.</string>
     <string name="signup_epilogue_hint_password">Pêborîn (li gor daxwazê)</string>
-    <string name="signup_epilogue_hint_display">Navê Xuya</string>
+    <string name="signup_epilogue_hint_display">Navê Dixuye</string>
     <string name="signup_epilogue_error_button_positive">Dîsa biceribîne</string>
-    <string name="signup_epilogue_error_button_negative">Vegerîne</string>
-    <string name="signup_epilogue_error_generic">Di hildemandina ajimêra te de hinek pirsgirêk çêbûn. Ji bo domandinê tu dikarî guhertinên xwe vegerîne an jî dîsa biceribîne.</string>
+    <string name="signup_epilogue_error_button_negative">Vegerîne rewşa berê</string>
+    <string name="signup_epilogue_error_generic">Di hildemandina hesabê te de hinek pirsgirêk çêbûn. Tu dikarî dîsa biceribînî an jî ji bo domandinê guhertinên xwe vegerînî.</string>
     <string name="signup_epilogue_error_avatar">Di hilxistina avatara te de hinek pirsgirêk derketin.</string>
-    <string name="signup_email_header">Ji bo afirandina ajimêra xwe ya nû a WordPress.comê ji kerema xwe navnîşana epeyamê binivîse.</string>
-    <string name="signup_email_error_generic">Di kontrolkirina navnîşana epeyamê de pirsgirêk çêbû..</string>
-    <string name="sign_up">Li WordPress.comê Tomar Bibe</string>
-    <string name="enter_username_instead">Bi navê xwe yê bikarhêner têkevê.</string>
-    <string name="enter_site_address_instead">Bi navnîşana malperê xwe têkevê.</string>
-    <string name="plugin_needs_update">Pêwîstî hildemandinê heye</string>
+    <string name="plugin_needs_update">Divê bê hildemandin</string>
     <string name="plugin_caption_search">Li Pêvekan Bigere</string>
     <string name="plugin_caption_new">Nû</string>
     <string name="plugin_caption_popular">Populer</string>
     <string name="plugins_empty_search_list">Lihevhatin tune ye</string>
     <string name="plugin_see_all">Hemûyan Bibîne</string>
-    <string name="plugin_manage">Bi rê ve bibe</string>
+    <string name="plugin_manage">Birêve bibe</string>
     <string name="plugin_search_error">Lêgerîna pêvekan nayê kirin</string>
-    <string name="plugin_installed_failed">Dema sazkirina %s ê şaşiyek pêk hat</string>
+    <string name="plugin_installed_failed">Di sazkirina %s\'ê de çewtî derket</string>
     <string name="plugin_installed_successfully"> %s bi serkeftî hat sazkirin</string>
     <string name="plugin_install">Saz Bike</string>
     <string name="site_settings_like_header">Biecibîne</string>
-    <string name="my_site_add_new_site">Malpereke nû tevlê bike</string>
-    <string name="my_site_create_new_site">Ji bo karsazî, kovar an jî bologeke şexsî malpereke nû biafirîne; an jî bi sazkirineke WordPressê ya heyî re girê bidin.</string>
-    <string name="notifications_jetpack_connection_setup_info">Ji bo agahiyên kêrhatî ji malpera te ya WordPressê bê amûra te, divê tu pêveka Jetpackê saz bike. Tu dixwazî Jetpackê saz bikî?</string>
-    <string name="site_settings_lazy_load_images">Wêneyên dereng barkirinê</string>
+    <string name="my_site_add_new_site">Malpera nû tevlî bike</string>
+    <string name="my_site_create_new_site">Ji bo karsazî, kovar an jî bologeke şexsî malpereke nû biafirîne; an jî li sazkirineke WordPressê ya heyî girêde.</string>
+    <string name="notifications_jetpack_connection_setup_info">Ji bo danezanên kêrhatî ji malpera te ya WordPressê bên cîhaza te, divê tu pêveka Jetpackê saz bikî. Tu dixwazî Jetpackê saz bikî?</string>
+    <string name="site_settings_lazy_load_images">Wêneyên dereng hatine barkirin</string>
     <string name="stats_jetpack_connection_setup">Jetpack\'ê saz bike</string>
     <string name="plugin_chevron_icon_content_description">Nivîsê biguherîne</string>
     <string name="plugin_info_your_version">Guhertoya WordPress\'a Te</string>
-    <string name="plugin_info_requires_version">Guhertoya WordPress\'ê ya Pêwîst</string>
-    <string name="plugin_info_lastupdated">Hildema Dawîn</string>
+    <string name="plugin_info_requires_version">Guhertoya WordPress\'ê ya Hewce</string>
+    <string name="plugin_info_lastupdated">Hildema Dawî</string>
     <string name="plugin_info_version">Guherto</string>
     <string name="plugin_five_stars">5 stêrk</string>
     <string name="plugin_four_stars">4 stêrk</string>
@@ -1397,11 +1343,11 @@ Language: ku_TR
     <string name="plugin_num_ratings">%s puan</string>
     <string name="plugin_read_reviews">Nirxandinan Bixwîne</string>
     <string name="plugin_faq">Pirsên Pir Tên Pirsîn</string>
-    <string name="plugin_whatsnew">Çi Nû Ne</string>
+    <string name="plugin_whatsnew">Çi Tiştên Nû Hene</string>
     <string name="plugin_installation">Sazkirin</string>
     <string name="plugin_description">Daxuyanî</string>
     <string name="plugin_settings">Sazkarî</string>
-    <string name="plugin_installed">Sazkirî</string>
+    <string name="plugin_installed">Hat sazkirin</string>
     <string name="plugin_installed_version">Guhertaya %s hat sazkirin</string>
     <string name="plugin_version">Guherto %s</string>
     <string name="plugin_byline">ji aliye %s</string>
@@ -1411,115 +1357,112 @@ Language: ku_TR
     <string name="site_settings_tags_hint">Etîketên malpera xwe birêve bibe</string>
     <string name="dlg_saving_tag">Tê tomarkirin</string>
     <string name="dlg_deleting_tag">Tê jêbirin</string>
-    <string name="dlg_confirm_delete_tag">Etîketa \'%s\' bi mayînde bê jêbirin?</string>
-    <string name="error_tag_exists">Bi vê navê ji xwe etîketeke heye</string>
-    <string name="add_new_tag">Etîketeke Nû Tevlî Bike</string>
+    <string name="dlg_confirm_delete_tag">Bila etîketa \'%s\' bi temamî bê jêbirin?</string>
+    <string name="error_tag_exists">Jixwe bi vî navî etîketek heye</string>
+    <string name="add_new_tag">Etîketa Nû Tevlî Bike</string>
     <string name="tag_description_hint">Daxuyanî</string>
     <string name="tag_name_hint">Etîket</string>
-    <string name="site_settings_amp_summary">Malpera te ya WordPress.com piştgiriyê dide bikaranîna Rûpelên Mobîlê yên Lezandî ku peyaneke bi serokatiya Googleê ye û di amûrên mobîlan de mudeta barkirinê bibandorî dilezîne</string>
-    <string name="site_settings_amp_title">Rûpelên Mobîlê yên Lezandî (RML)</string>
-    <string name="site_settings_timezones_error">Herêma demê nayê barkirin</string>
-    <string name="site_settings_format_help">Di derbarê dirûva(format) dem û dîrokê de zêdetir bizane</string>
-    <string name="site_settings_format_hint_custom">Dirûva taybet</string>
+    <string name="site_settings_amp_summary">Malpera we ya WordPressê piştgiriyê dide pelên mobîl. Ev pel ji bo malper zu werê barkirin bi pêşdebirina google tên birêvebirin.</string>
+    <string name="site_settings_amp_title">Rûpelên Mobîl ên Lezandî (AMP)</string>
+    <string name="site_settings_timezones_error">Navçedem nehatin barkirin</string>
+    <string name="site_settings_format_help">Di derbarê formata dem û dîrokê de zêdetir bizane</string>
+    <string name="site_settings_format_hint_custom">Formata taybet</string>
     <string name="site_settings_format_entry_custom">Taybet</string>
-    <string name="site_settings_posts_per_page_title">Serê rûpelê, şandî</string>
-    <string name="site_settings_timezone_subtitle">Bajarekî bibijêre li qada xwe ya demê</string>
-    <string name="site_settings_timezone_title">Qada demê</string>
-    <string name="site_settings_time_format_title">Dirûva Demê</string>
-    <string name="site_settings_date_format_title">Dirûva Dîrokê</string>
+    <string name="site_settings_posts_per_page_title">Serê rûpelê şandî</string>
+    <string name="site_settings_timezone_subtitle">Ji navçedema xwe bajerekî hilbijêre</string>
+    <string name="site_settings_timezone_title">Navçedem</string>
+    <string name="site_settings_time_format_title">Formata Demê</string>
+    <string name="site_settings_date_format_title">Formata Dîrokê</string>
     <string name="site_settings_week_start_title">Destpêka hefteyê</string>
-    <string name="site_settings_tags_title">Nîşank</string>
+    <string name="site_settings_tags_title">Etîket</string>
     <string name="site_settings_traffic_header">Trafîk</string>
     <string name="delete_yes">Jê bibe</string>
     <string name="plugin_external_link_icon_content_description">Girêdana derveyî</string>
-    <string name="plugin_icon_content_description">Nîşaneka Pêvekê</string>
+    <string name="plugin_icon_content_description">Îkona pêvekê</string>
     <string name="plugin_home_page">Serrûpela Pêvekan</string>
-    <string name="wordpress_dot_org_plugin_page">WordPress.org Rûpela pêvekan</string>
-    <string name="plugin_remove_dialog_message">Bi rastî jî tu dixwazî ji %2$s\'ê %1$s rake?\n\n\nEv, dê pêvekê neçalak bike û hemû dane û pelgeyên têkildar jê bibe.</string>
+    <string name="wordpress_dot_org_plugin_page">Rûpela pêvekan a WordPress.org\'ê</string>
+    <string name="plugin_remove_dialog_message">Tu bi rastî jî dixwazî pêveka %1$s\'ê ji %2$s\'ê rake?\n\nEv ê pêvekê nêçalak bike û hemû dosye û daneyên têkildar jê bibe.</string>
     <string name="plugin_remove_dialog_title">Pêvekê Rake</string>
-    <string name="plugin_remove_progress_dialog_message">%s tê rakirin…</string>
-    <string name="plugin_disable_progress_dialog_message">%s tê neçalakkirin…</string>
-    <string name="plugin_configuration_failed">Di pevsazandina pêvekê de çewtiyek pêk hat: %s</string>
-    <string name="plugin_remove_failed">Di rakirina %s de çewtî pêk hat</string>
-    <string name="plugin_removed_successfully">%s biserkeftî hat rakirin</string>
-    <string name="plugin_updated_failed_detailed">Di hildemandina %1$s de çêwtî pêk hat: %2$s</string>
-    <string name="plugin_updated_failed">Çewtiya hildemandina %sê.</string>
-    <string name="plugin_updated_successfully">%s biserkeftî hat hildemandin</string>
+    <string name="plugin_remove_progress_dialog_message">Tê rakirin %s…</string>
+    <string name="plugin_disable_progress_dialog_message">Tê neçalakkirin %s…</string>
+    <string name="plugin_configuration_failed">Di pevsazandina pêvekê de çewtiyek derket: %s</string>
+    <string name="plugin_remove_failed">Di rakirina %s\'ê de çewtî derket</string>
+    <string name="plugin_removed_successfully">%s bi serkeftî hat rakirin</string>
+    <string name="plugin_updated_failed_detailed">Di hildemandina %1$s\'ê de çêwtî derket: %2$s</string>
+    <string name="plugin_updated_failed">Di hildemandina %s\'ê de çewtî derket.</string>
+    <string name="plugin_updated_successfully">%s bi serkeftî hat hildemandin</string>
     <string name="plugin_available_version">Guhertoya %s berdest e</string>
-    <string name="plugin_detail_label_state_autoupdates">Hildemandinên otomatîk</string>
+    <string name="plugin_detail_label_state_autoupdates">Hildemandinên otomatîkî</string>
     <string name="plugin_detail_label_state_active">Çalak</string>
     <string name="plugin_inactive">Neçalak</string>
     <string name="plugin_active">Çalak</string>
     <string name="plugins">Pêvek</string>
     <string name="my_site_btn_plugins">Pêvek</string>
-    <string name="media_edit_link_hint">Di hilpekîn/paceya nû de girêdanê veke</string>
-    <string name="media_edit_link_text">Giredan:</string>
-    <string name="notification_login_failed">Çewtiyek çêbû.</string>
-    <string name="notification_2fa_needed">Ji kerema xwe bo domandinê kodeke rastandinê peyda bike.</string>
-    <string name="notification_error_wrong_password">Ji kerema xwe bo domandinê pêborîna xwe du cara kontrol bike.</string>
+    <string name="media_edit_link_hint">Di hilpeka/paceya nû de girêdanê veke</string>
+    <string name="media_edit_link_text">Giredana</string>
+    <string name="notification_login_failed">Çewtiyek derket.</string>
+    <string name="notification_2fa_needed">Ji kerema xwe, ji bo domandinê kodeke rastandinê peyda bike.</string>
+    <string name="notification_error_wrong_password">Ji kerema xwe, ji bo domandinê pêborîna xwe du caran kontrol bike.</string>
     <string name="notification_login_title_stopped">Têketin rawestiya</string>
-    <string name="notification_logging_in">Ji kerema xwe benda têketinê be.</string>
+    <string name="notification_logging_in">Ji kerema xwe li benda têketinê be.</string>
     <string name="notification_login_title_in_progress">Pêvojoya têketinê didome…</string>
-    <string name="notification_logged_in">Bo domandinê bitepîne.</string>
+    <string name="notification_logged_in">Ji bo domandinê, bitepîne.</string>
     <string name="notification_login_title_success">Têketin pêk hat!</string>
     <string name="login_error_generic_start">Têketina Googleê nehat destpêkirin.</string>
-    <string name="login_empty_password">Ji kerema xwe pêborînekê têxîne</string>
-    <string name="login_text_otp_another">Jê dêvla wê kodeke din ji min re bişîne</string>
-    <string name="enter_verification_code_sms">Em ji telefona te yê ku bi %s re diqede re peyameke nivîsî şandin. Xêra xwe koda rastandinê yê di SMSê de têkeve.</string>
+    <string name="login_empty_password">Ji kerema xwe pêborînekê bikevê</string>
+    <string name="login_text_otp_another">Ji dêvla wê kodeke din ji min re bişîne</string>
+    <string name="enter_verification_code_sms">Me ji hejmara telefona te ya dawiya wê %s e re peyamek şand. Ji kerema xwe koda rastandinê ya di SMSê de bikevê.</string>
     <string name="image_size">Mezinahî</string>
-    <string name="uploading_subtitle_media_only_one">Pelgeyek maye</string>
-    <string name="uploading_subtitle_media_only">Ji %2$d pelgeyan %1$d maye</string>
+    <string name="uploading_subtitle_media_only_one">Dosyeyek maye</string>
+    <string name="uploading_subtitle_media_only">Ji %2$d dosyeyan %1$d mane</string>
     <string name="uploading_subtitle_posts_only_one">Şandiyek maye</string>
     <string name="uploading_title">Tê hilxistin…</string>
-    <string name="media_files_uploaded_write_post">Şandî Binivîse</string>
-    <string name="media_all_files_uploaded_successfully">%d pelge biserkeftî hatin hilxistin</string>
-    <string name="media_files_uploaded_successfully">, %d biserkeftî hat hilxistin</string>
-    <string name="media_file_uploaded">Pelgeyek hat hilxistin</string>
-    <string name="media_file_not_uploaded">Pelgeyek nehat hilxistin</string>
-    <string name="media_files_uploaded">%d pelge hat hilxistin</string>
-    <string name="media_files_not_uploaded">%d pelge nehatin hilxistin</string>
+    <string name="media_files_uploaded_write_post">Nivîsekê Binivîse</string>
+    <string name="media_all_files_uploaded_successfully">%d dosye biserkeftî hatin hilxistin</string>
+    <string name="media_files_uploaded_successfully">, %d bi serkeftî hat hilxistin</string>
+    <string name="media_file_uploaded">Dosyeyek hat hilxistin</string>
+    <string name="media_file_not_uploaded">Dosyeyek nehat hilxistin</string>
+    <string name="media_files_uploaded">%d dosye hatin hilxistin</string>
+    <string name="media_files_not_uploaded">%d dosye nehatin hilxistin</string>
     <string name="remove_image_from_post">Ji şandiyê rake</string>
     <string name="confirm_remove_media_image">Bila ev wêne ji şandiyê were rakirin?</string>
-    <string name="media_edit_customize_card_caption">Kesane bike</string>
-    <string name="media_edit_file_details_card_caption">Hûrgiliyên Pelgeyê</string>
-    <string name="login_error_suffix">\nBelkî tu ajimêreke cuda biceribîne?</string>
-    <string name="login_error_generic">Di girêdana bi ajimêra Googleê re hinek pirsgirêk pêk hatin.</string>
+    <string name="media_edit_customize_card_caption">Taybet bike</string>
+    <string name="media_edit_file_details_card_caption">Hûrgiliyên Dosyeyê</string>
+    <string name="login_error_suffix">\nBelkî tu hesabekî cuda biceribînî?</string>
+    <string name="login_error_generic">Di girêdana bi hesabê Googleê re hin pirsgirêk derketin.</string>
     <string name="login_error_button">Bigire</string>
-    <string name="login_google_button_suffix">Bi Googleê têkevê.</string>
-    <string name="enter_wpcom_password_google">Ji bo bi vê ajimêra Googleê bidomînî, ji keram xwe peyvborîna li WordPress.comê peyda bikin. Ev ê careke bê pirsîn.</string>
-    <string name="error_generic_network">Çewtiyeke girêdanê pêk hat. Ji kerema xwe girêdana xwe kontrol bike û dîsa biceribîne.</string>
-    <string name="post_settings_remove_featured_image">Wêneyê bijarte rake</string>
-    <string name="post_settings_choose_featured_image">Wêneyê bijarte hilbijêre</string>
-    <string name="login_log_in_for_share_intent">Ji bo parvekirina naverokê di WordPress.comê de têketinê bike.</string>
-    <string name="enter_site_address_share_intent">Navnîşana malpera xwe ya WordPressê binivîse ya ku tu dixwazî naverokê bi wê parve bikî.</string>
-    <string name="jetpack_disconnect_error_toast">Çewtiyeke derket holê gava girêdana malperê dihate qutkirin</string>
-    <string name="jetpack_disconnect_success_toast">Girêdana malperê hate qutkirin</string>
+    <string name="enter_wpcom_password_google">Ji bo bi vî hesabê Googleê dewam bikî, ji kerama xwe pêborîna ku bi WordPress.com\'ê re yeksan e bikevê. Ev ê tenê carekê bê pirsîn.</string>
+    <string name="error_generic_network">Çewtiyeke torê çêbû. Ji kerema xwe girêdana xwe kontrol bike û dîsa biceribîne.</string>
+    <string name="post_settings_remove_featured_image">Wêneyê bijarde rake</string>
+    <string name="post_settings_choose_featured_image">Wêneyê bijarde hilbijêre</string>
+    <string name="login_log_in_for_share_intent">Ji bo naverokê parve bikî di WordPress.com\'ê de têketinê bike.</string>
+    <string name="enter_site_address_share_intent">Navnîşana malpera xwe ya WordPressê ku tu dixwazî naveroka wê parve bikî, têkeve.</string>
+    <string name="jetpack_disconnect_error_toast">Di qutkirina girêdana malperê de çewtî derket</string>
+    <string name="jetpack_disconnect_success_toast">Girêdana malperê hat qutkirin</string>
     <string name="jetpack_disconnect_confirm">Girêdanê qut bike</string>
-    <string name="jetpack_disconnect_confirmation_message">Tu jidil dixwazî ku girêdana Jetpackê ya ji malperê qut bikî?</string>
-    <string name="jetpack_disconnect_pref_title">\"Girêdana ji WordPress.comê qut bike\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Dibe ku tu bixwazî navnîşaneke IPyê an zincîreyeke navnîşanan têxî lîsta spî da ku rê li ber astengkirina ji aliyê Jetpackê ve bigirî. IPv4 û IPv6 meqbûl in. Ji bo diyarkirina navberek, nirxê kêm û nirxê bilind têkeve, û herdukan bi xêzikek ji hev veqetîne. Mînak: 12.12.12.1–12.12.12.100</string>
+    <string name="jetpack_disconnect_confirmation_message">Tu bi rastî jî dixwazî girêdana di navbera Jetpack û malperê de qut bikî?</string>
+    <string name="jetpack_disconnect_pref_title">\"Girêdanê ji WordPress.com\'ê qut bike\"</string>
     <string name="jetpack_require_two_factor_title">Rastandina du-gavî ferz bike</string>
-    <string name="jetpack_match_wpcom_via_email_title">Bi bikaranîna epeyamê ajimêran hevber bike</string>
-    <string name="jetpack_allow_wpcom_sign_in_title">Destûrê bide bo têketina WordPress.comê</string>
-    <string name="jetpack_wpcom_sign_in_category_title">Têketina WordPress.comê</string>
-    <string name="jetpack_brute_force_whitelist_title">Navnîşanên IPê yên lîsteya spî</string>
-    <string name="jetpack_prevent_brute_force_title">Hewldanên têketinê ên niyetxirab asteng bike</string>
-    <string name="jetpack_prevent_brute_force_category_title">Parastina ji erişa Brute forceê</string>
-    <string name="jetpack_send_wp_notifications_title">Danezanên demkî bişîne</string>
-    <string name="jetpack_send_email_notifications_title">Danezanan bi epeyamê bişîne</string>
-    <string name="jetpack_monitor_uptime_title">Wextê xizmetê ya malpera xwe temaşe bike</string>
+    <string name="jetpack_match_wpcom_via_email_title">Bi bikaranîna emailê hesaban hevberî hev bike</string>
+    <string name="jetpack_allow_wpcom_sign_in_title">Destûrê bide ji bo têketina di WordPress.com\'ê de</string>
+    <string name="jetpack_wpcom_sign_in_category_title">Têketina WordPress.com\'ê</string>
+    <string name="jetpack_prevent_brute_force_title">Hewldanên têketinê yên xerab asteng bike</string>
+    <string name="jetpack_prevent_brute_force_category_title">Parastina ji êrişa Brute forceê</string>
+    <string name="jetpack_send_wp_notifications_title">Danezanên yekser bişîne</string>
+    <string name="jetpack_send_email_notifications_title">Danezanan bi emailê bişîne</string>
+    <string name="jetpack_monitor_uptime_title">Dema kar a malpera xwe kontrol bike</string>
     <string name="jetpack_security_setting_title">Ewlehî</string>
-    <string name="jetpack_site_settings_category_title">Sazkariyên Jetpackê</string>
+    <string name="jetpack_site_settings_category_title">Sazkariyên Jetpack\'ê</string>
     <string name="share_intent_adding_to">Tevlî vê dibe</string>
-    <string name="share_intent_pick_site">Malper hilbijêre</string>
+    <string name="share_intent_pick_site">Malperê hilbijêre</string>
     <string name="share_action_media">Tevlî medyagehê bike</string>
     <string name="share_action_post">Tevlî şandiya nû bike</string>
     <string name="share_media_permission_required">Ji bo parvekirina wêne an jî vîdyoyan destûrên hewce.</string>
-    <string name="invalid_ip_or_range">IP an navbera IPyê ya nederbasdar</string>
+    <string name="invalid_ip_or_range">IP an jî navbera IPyê nederbasdar e</string>
     <string name="deleting_media_dlg">Tê jêbirin</string>
     <string name="confirm_delete_media_video">Bila ev vîdyo jê biçe?</string>
-    <string name="confirm_delete_media_image">Bila ev wêne jê biçe</string>
-    <string name="media_title_document_details">Hûrgiliyên pelgeyê</string>
+    <string name="confirm_delete_media_image">Bila ev wêne jê biçe?</string>
+    <string name="media_title_document_details">Hûrgiliyên dosyeyê</string>
     <string name="media_title_audio_details">Hûrgiliyên deng</string>
     <string name="media_title_video_details">Hûrgiliyên vîdyoyê</string>
     <string name="media_title_image_details">Hûrgiliyên wêneyê</string>
@@ -1528,289 +1471,276 @@ Language: ku_TR
     <string name="media_edit_duration_caption">Dirêjî</string>
     <string name="media_edit_video_dimensions_caption">Pîvanên Vîdyoyê</string>
     <string name="media_edit_image_dimensions_caption">Pîvanên Wêneyê</string>
-    <string name="media_edit_filetype_caption">Cureya Pelgeyê</string>
-    <string name="media_edit_filename_caption">Navê Pelgeyê</string>
+    <string name="media_edit_filetype_caption">Cûreya Dosyeyê</string>
+    <string name="media_edit_filename_caption">Navê Dosyeyê</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Nivîsa alternatîv</string>
     <string name="connect_site">Malperekê lê girêde</string>
-    <string name="notification_settings_item_sights_and_sounds_blink_light">Şewqê veke - bigire</string>
-    <string name="notification_settings_item_sights_and_sounds_vibrate_device">Amûrê biricifîne</string>
-    <string name="notification_settings_item_sights_and_sounds_choose_sound">Deng bibijêre</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Ronahiyê bigire - veke</string>
+    <string name="notification_settings_item_sights_and_sounds_vibrate_device">Cîhazê biricifîne</string>
+    <string name="notification_settings_item_sights_and_sounds_choose_sound">Deng hilbijêre</string>
     <string name="notification_settings_category_sights_and_sounds">Dîmen û deng</string>
-    <string name="notification_settings_item_other_account_emails">Epeyama ji WordPress.comê</string>
-    <string name="notification_settings_item_other_pending_drafts">Derbarê reşnivîsen li bendê min agahdar bike</string>
+    <string name="notification_settings_item_other_account_emails">Emaila ji WordPress.com\'ê</string>
+    <string name="notification_settings_item_other_pending_drafts">Di derbarê reşnivîsen hilwestî min agahdar bike</string>
     <string name="notification_settings_item_other_comments_other_blogs">Şîroveyên di malperên din de</string>
-    <string name="notification_settings_category_other">Yên din</string>
+    <string name="notification_settings_category_other">Ya din</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Hemû Malperên Min</string>
     <string name="notification_settings_category_your_sites">Malperên Te</string>
-    <string name="notification_settings_master_off_message">Girtina Sazkariyên Danezanan wê hemû agahdariyên ji vê sepanê neçalak bike, bêyî dîqetkirina cureya danezanê. Piştî ku te Sazkariyên Danezanan vekir, tu yê karibî agahdariyên ku tu dixwazî werbigirî bisazînî.</string>
-    <string name="notification_settings_master_off_title">Ji bo di vê amûrê de danezanan bistîne, Sazkariya Danezanan biçalakîne.</string>
-    <string name="notification_settings_master_hint_off">Danezanan biçalakîne</string>
-    <string name="notification_settings_master_hint_on">Danezanan neçalak bike</string>
-    <string name="notification_settings_master_status_off">Girtî</string>
-    <string name="notification_settings_master_status_on">Vekirî</string>
-    <string name="max_video_resolution">Mezinahiya Vîdeoyê ya Maksîmum</string>
-    <string name="max_thumbnail_px_size">Mezinahiya Wêneyê ya Maksîmum</string>
-    <string name="error_upload_post_media_param">Gava medya li vê şandiyê dihate hilxistin çewtiyeke derket holê: %s.</string>
-    <string name="error_upload_post_param">Gava ev şandî dihate hilxistin çewtiyeke derket holê: %s.</string>
+    <string name="max_video_resolution">Mezinahiya vîdyoyê - maksîmûm</string>
+    <string name="max_thumbnail_px_size">Mezinahiya wêneyê - maksîmûm</string>
+    <string name="error_upload_post_media_param">Dema ku medya li vê şandiyê dihat hilxistin çewtiyek derket: %s.</string>
+    <string name="error_upload_post_param">Dema ku ev şandî dihat hilxistin çewtiyek derket: %s.</string>
     <string name="add_media_progress">Medya tê tevlîkirin</string>
     <string name="reader_excerpt_link">Ji bo zêdetir, seredana %s\'ê bike</string>
-    <string name="error_unknown_page">Rûpel di rajekarê de nehat dîtin</string>
+    <string name="error_unknown_page">Rûpel di serverê de nehat dîtin</string>
     <string name="error_publish_empty_page">Rûpela vala nayê weşandin</string>
-    <string name="upload_failed_param">Hilxistin ji bo \"%s\" bi serneket</string>
-    <string name="cannot_retry_deleted_media_item">Medya hate rakirin. Bila ji vê şandiyê biçe?</string>
-    <string name="error_please_choose_browser">Di vekirina geroka webe de çewtî pêk hat. Ji kerema xwe sepaneke din bibijêre:</string>
-    <string name="cant_open_url">Girêdan venabe</string>
-    <string name="error_unknown_post">Şandî di rajekarê de nehat dîtin</string>
-    <string name="error_post_does_not_exist">Êdî ev şandî ne li berdest e</string>
-    <string name="error_media_canceled">Hilxistina medyayê hate betalkirin</string>
-    <string name="error_upload_page_media_param">Hilxistina medyayê di vê rûpelê de rastî çewtiyekê hat: %s.</string>
-    <string name="error_upload_page_param">Di hilxistina vê rûpelê de çewtiyek pêk hat: %s.</string>
+    <string name="upload_failed_param">Hilxistina ji bo \"%s\"ê bi ser neket</string>
+    <string name="cannot_retry_deleted_media_item">Medya hat rakirin. Bila ji vê şandiyê bê rakirin?</string>
+    <string name="error_please_choose_browser">Di vekirina geroka webê ya jixweberî de çewtî derket. Jkx, sepaneke din hilbijêre:</string>
+    <string name="cant_open_url">Girêdan nayê vekirin</string>
+    <string name="error_unknown_post">Şandî di serverê de nehat dîtin</string>
+    <string name="error_post_does_not_exist">Êdî ev şandî ne berdest e</string>
+    <string name="error_media_canceled">Hilxistina medyayê hat betalkirin</string>
+    <string name="error_upload_page_media_param">Di vê rûpelê de dema medya dihat hilxistin çewtiyek derket: %s.</string>
+    <string name="error_upload_page_param">Di hilxistina vê rûpelê de çewtiyek derket: %s.</string>
     <string name="editor_uploading_post">Şandiya te tê hilxistin</string>
-    <string name="uploading_media">Medya tê hilxistin</string>
+    <string name="uploading_media">Medya tê hilxistin…</string>
     <string name="page_scheduled">Rûpel hat demsazkirin</string>
     <string name="post_scheduled">Şandî hat demsazkirin</string>
     <string name="button_retry">Dîsa biceribîne</string>
-    <string name="post_queued">Şandiya rêzkirî</string>
+    <string name="post_queued">Şandî ket dorê</string>
     <string name="uploading_post">\"%s\" tê hilxistin</string>
-    <string name="connection_to_server_lost">Girêdana bi rajakerê re qut bû</string>
+    <string name="connection_to_server_lost">Girêdan bi serverê re qut bû</string>
     <string name="login_epilogue_mysites_other">Malperên min</string>
     <string name="login_epilogue_mysites_one">Malpera min</string>
     <string name="login_email_client_not_found">Sepana te ya epeyam-wergir bikare were tesbîtkirin</string>
-    <string name="login_empty_2fa">Ji kerema xwe kodeke rastandinê têxîne</string>
-    <string name="login_empty_username">Ji kerema xwe navekî bikarhêner têxîne</string>
-    <string name="login_log_in_for_deeplink">Ji bo bigihêje şandiyê di WordPress.comê de têketinê bike.</string>
-    <string name="login_error_while_adding_site">Dema malper dihat tevlîkirin çewtî çêbû. Koda çewtiyê: %s</string>
+    <string name="login_empty_2fa">Ji kerema xwe kodeke rastandinê bikevê</string>
+    <string name="login_empty_username">Ji kerema xwe navekî bikarhêner bikevê</string>
+    <string name="login_log_in_for_deeplink">Ji bo bigihîjî şandiyê di WordPress.com\'ê de têketinê bike.</string>
+    <string name="login_error_while_adding_site">Di tevlîkirina malperê de çewtî. Koda çewtiyê: %s</string>
     <string name="login_checking_site_address">Navnîşana malperê tê kontrolkirin</string>
-    <string name="login_site_address_more_help">Alîkariya zêdetir pêwîst e?</string>
-    <string name="login_site_address_help_content">Malpera te li benda jor a ekranê wê bê xuyan gava ku te di Chrome-ê de malpera xwe seredan kir.</string>
+    <string name="login_site_address_more_help">Alîkariya zêdetir hewce ye?</string>
+    <string name="login_site_address_help_content">Dema ku tu bi Chromeê serdana malpera xwe bikî ew ê navnîşana malpera te di benda jor a ekranê de xuya dike.</string>
     <string name="login_site_address_help_title">Navnîşana Malpera min çi ye?</string>
-    <string name="login_site_address_help">Ji bo dîtina navnîşana malpera te alîkarî hewce ye?</string>
     <string name="login_site_address">Navnîşana malperê</string>
-    <string name="enter_site_address">Navnîşana Malpera WordPressê ya ku tu dixwaze pê gire bide têxîne.</string>
-    <string name="login_already_logged_in_wpcom">Jixwe di WordPress.comê de têketin pêk hatiye</string>
+    <string name="enter_site_address">Navnîşana Malpera WordPressê ya ku tu dixwazî lê girêdî binivîsî.</string>
+    <string name="login_already_logged_in_wpcom">Jixwe di WordPress.com\'ê de têketin pêk hatiye</string>
     <string name="login_continue">Bidomîne</string>
     <string name="connect_more">Malpereke din girêde</string>
-    <string name="enter_wpcom_password">Pêborîna xwe ya WordPress.comê têxîne.</string>
+    <string name="enter_wpcom_password">Pêborîna xwe ya WordPress.com\'ê bikevê.</string>
     <string name="login_magic_link_email_requesting">Xwestina emaila têketinê</string>
-    <string name="password_incorrect">Wisa dixuye ku ev pêborîn xelet e. Ji kerema xwe agahiyên xwe du caran kontrol bike û careke din biceribîne.</string>
-    <string name="requesting_otp">Xwestina kodeke rastandinê bi riya SMSê.</string>
+    <string name="password_incorrect">Wisa dixuye ku ev pêborîn xelet e. Ji kerema xwe du caran agahiyên xwe kontrol bike û careke din biceribîne.</string>
+    <string name="requesting_otp">Xwestina kodeke rastandinê bi rêya SMSê.</string>
     <string name="login_text_otp">Jê dêvla wê kodekê ji min re bişîne</string>
-    <string name="enter_verification_code">Hema bêje temam bû. Xêra xwe koda rastandinê têkeve ji sepana xwe ya rastkar.</string>
-    <string name="open_mail">Epeyamê veke</string>
+    <string name="enter_verification_code">Hema hema qediya. Ji kerema xwe, ji sepana xwe ya rastandinê koda pejirandinê têkeve.</string>
     <string name="next">Pêşve</string>
-    <string name="enter_email_wordpress_com">Ji bo ku tu hemû malperên xwe yên WordPressê bi rê ve bibî di WordPress.com\'ê de bi navnîşaneke emailê têketinê bike.</string>
-    <string name="image_optimization_promo_desc">Optîmîzasyona wêneyan, wêneyan biçûk dike ji bo hilxistina zûtir\nTu herdem dikarî vê biguherînî ji sazkariyên malperê.</string>
-    <string name="image_optimization_promo_title">Bila optimizasyona wêneyê vebe?</string>
+    <string name="enter_email_wordpress_com">Ji bo ku tu hemû malperên xwe yên WordPressê bi rê ve bibî bi rêya bikaranîna navnîşaneke emailê têkeve WordPress.com\'ê.</string>
+    <string name="image_optimization_promo_desc">Optîmîzasyona wêneyê ji bo hilxistina bilez, wêneyan biçûk dike.\n\nTu her tim dikarî vê ji sazkariyên malperê biguherînî.</string>
+    <string name="image_optimization_promo_title">Bila optîmîzasyona wêneyê vebe?</string>
     <string name="leave_off">Girtî bihêle</string>
     <string name="turn_on">Veke</string>
     <string name="me_profile_photo">Wêneyê Profîlê</string>
-    <string name="error_media_parse_error">Cewaba nehêvîkirî ji rajekarê</string>
+    <string name="error_media_parse_error">Bersiva nehêvîkirî ji serverê</string>
     <string name="upload_finished_toast">Hilxistin nayê rawestandin ji ber ku ji zû ve qediya ye</string>
     <string name="post_title">Sernav</string>
-    <string name="menu_redo">Dubare bike</string>
+    <string name="menu_redo">Dîsa bike</string>
     <string name="menu_undo">Vegerîne</string>
-    <string name="error_media_small">Ji bo nîşandanê medya pir biçûk e</string>
-    <string name="editor_dropped_unsupported_files">Hişyarî: Hemû hêmanên ku hatine hiştin nayên piştgirîkirin!</string>
-    <string name="editor_dropped_title_images_not_allowed">Destûr nayê dayîn ku wêne li Serikê bêne danîn</string>
-    <string name="editor_dropped_text_error">Çewtiyeke derket holê gava danîna nivîsê</string>
-    <string name="editor_dropped_html_images_not_allowed">Di moda HTMLê de destûra hiştina wêneyan nayê dayîn</string>
+    <string name="error_media_small">Medya ji bo nîşandanê pir biçûk e</string>
+    <string name="editor_dropped_unsupported_files">Hişyarî: Hemû hêmanên hatine hiştin nayên piştgirîkirin!</string>
+    <string name="editor_dropped_title_images_not_allowed">Destûr ji bo danîna wêneyan a li Sernavê re nayê dayîn</string>
+    <string name="editor_dropped_text_error">Di danîna nivîsê de çewtî derket</string>
+    <string name="editor_dropped_html_images_not_allowed">Di moda HTMLê de destûr ji bo danîna wêneyan nayê dayîn</string>
     <string name="editor_content_hint">Çîroka xwe li vir parve bike…</string>
     <string name="post_status_post_private">Taybet</string>
     <string name="post_status_draft">Reşnivîs</string>
     <string name="post_status_pending_review">Li benda kontrolê ye</string>
     <string name="post_status_publish_post">Weşandî</string>
-    <string name="change_location">Cîgehê Biguherîne</string>
-    <string name="remove_location">Cîgehê Rake</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Bijêra Lokasyonê nikare veke, Xizmetên Google Playê ne berdest e</string>
-    <string name="post_settings_location">Cîgeh</string>
     <string name="now">Aniha</string>
-    <string name="post_settings_password_dialog_hint">Tenê kesên xwediyê vê pêborînê karin vê şandiyê bibînin</string>
-    <string name="post_settings_excerpt_dialog_hint">Kurte, kurteyên naveroka te yên ku bi destan hatiye amadekirin e.</string>
-    <string name="post_settings_slug_dialog_hint">Kurtenav versiyona URL-hez ya serikê şandiyê ye.</string>
-    <string name="post_settings_post_format">Dirûva Şandiyê</string>
+    <string name="post_settings_password_dialog_hint">Tenê kesên xwediyê vê pêborînê dikarin vê şandiyê bibînin</string>
+    <string name="post_settings_excerpt_dialog_hint">Jêgirtin, kurteyên naveroka te yên ku bi destan hatine amadekirin e.</string>
+    <string name="post_settings_slug_dialog_hint">Kurtenav versiyona url-dostane ya sernavê şandiyê ye.</string>
+    <string name="post_settings_post_format">Formata Şandiyê</string>
     <string name="post_settings_tags">Etîket</string>
     <string name="post_settings_slug">Kurtenav</string>
-    <string name="post_settings_excerpt">Kurte</string>
+    <string name="post_settings_excerpt">Jêgirtin</string>
     <string name="post_settings_not_set">Nesazkirî</string>
-    <string name="post_settings_more_options">Vebijêrkên Zêdetir</string>
-    <string name="post_settings_categories_and_tags">Kategorî &amp; Etîket</string>
+    <string name="post_settings_more_options">Vebijarkên Zêdetir</string>
+    <string name="post_settings_categories_and_tags">Kategorî û Etîket</string>
     <string name="notifications_tab_title_all">Hemû</string>
-    <string name="top_level_category_name">Asta jor</string>
-    <string name="category_parent">Beşa sereke (li gor daxwazê):</string>
+    <string name="top_level_category_name">Asta bilind</string>
+    <string name="category_parent">Kategoriya sereke (li gor daxwazê):</string>
     <string name="media_empty_audio_list">Ti dosyeya te ya dengî tune ye</string>
     <string name="media_empty_documents_list">Ti dosyeyên te tune ye</string>
     <string name="media_empty_videos_list">Hîç vîdyoyên te tune ye</string>
     <string name="media_empty_image_list">Hîç wêneyên te tune ye</string>
     <string name="media_error_timeout">Serverê pir dereng bersiv da</string>
     <string name="media_error_exceeds_memory_limit">Ji bo li hilxistina vê malperê pelge pir mezin e</string>
-    <string name="media_error_exceeds_php_filesize">Pelge mezinahiya hilxitinê ya meztirîn yê ji bo vê malperê derbas dike</string>
+    <string name="media_error_exceeds_php_filesize">Dosye ji bo vê malperê sînorê hilxistina herî zêde derbas dike</string>
     <string name="media_error_http_too_large_video_upload">Ji bo hilxistinê vîdyo pir mezin e</string>
-    <string name="media_error_http_too_large_photo_upload">Wêne pir mezin e bo hilxistinê. Biceribîne ku ji sazkariyên sepana xwe vebijêrka \"Wêneyan Optîmîze Bike\" biguherînî</string>
+    <string name="media_error_http_too_large_photo_upload">Wêne ji bo hilxistinê pir mezin e. Di sazkariyên sepana xwe de \"Wêneyan Optîmîze Bike\"yê biceribîne</string>
     <string name="media_audio">Deng</string>
     <string name="media_videos">Vîdyo</string>
-    <string name="media_documents">Pelge</string>
+    <string name="media_documents">Dosye</string>
     <string name="media_images">Wêne</string>
     <string name="media_all">Hemû</string>
-    <string name="photo_picker_soft_ask_permissions_denied">%1$s red kir ku bigihe wêneyên te. Bo çarekirina vê, destûrên xwe biguherîne û %2$s veke.</string>
+    <string name="photo_picker_soft_ask_permissions_denied">Hewla %1$s\'ê ya ji bo bigihîje wêneyên te hat redkirin. Ji bo vê çareser bikî, destûrên xwe sererast bike û %2$s\'ê veke.</string>
     <string name="reader_view_comments">Şîroveyan bibîne</string>
-    <string name="site_settings_video_quality_hint">Qalîteya vîdyoyan. Nirxên bilindtir tê wateya vîdyoyên qalîteya çêtir.</string>
+    <string name="site_settings_video_quality_hint">Kalîteya vîdeoyan. Nirxên bilind tê wateya vîdyoyên kalîteya çêtir.</string>
     <string name="site_settings_video_width_hint">Mezinahiya vîdeoyên di şandiyê de dike bi qasî vê mezinahiyê</string>
-    <string name="site_settings_optimize_video_summary">Çalak bike bo verehendin û şidandina vîdeoyan</string>
+    <string name="site_settings_optimize_video_summary">Dewisandin û ji nû ve rehendina vîdyoyan biçalakîne</string>
     <string name="site_settings_optimize_videos">Vîdyoyan Optîmîze Bike</string>
-    <string name="draft_uploaded">Reşnivîs hate hilxistin</string>
-    <string name="report_bug">Çewtî ragihîne</string>
-    <string name="video_quality">Qalîteya Vîdyoyê</string>
+    <string name="draft_uploaded">Reşnivîs hat hilxistin</string>
+    <string name="report_bug">Çewtiyekê ragihîne</string>
+    <string name="video_quality">Kalîteya Vîdyoyê</string>
     <string name="permission_camera">Kamera</string>
-    <string name="permission_storage">Bîrbar</string>
-    <string name="button_edit_permissions">Destûran serast bike</string>
+    <string name="permission_storage">Bîrgeh</string>
+    <string name="button_edit_permissions">Destûran sererast bike</string>
     <string name="photo_picker_soft_ask_allow">Destûr bide</string>
-    <string name="photo_picker_soft_ask_label">Hewcedariya %s bi destûra te heye bo gihîna wêneyên te</string>
-    <string name="sharing_twitter_message">Wê ev tevlî nava twîtan bibe gava ku însan bi bişkoka Twîtterê parve kirin</string>
-    <string name="sharing_label_message">Nivîsa bişkokên parvekirinê biguherîne. Ev nivîs wê neyê xuyan heta ku te bi kêmanî yek bişkokek parvekirinê lê zêde kir.</string>
-    <string name="connecting_account">Ajimêr tê girêdan</string>
-    <string name="cannot_connect_account_error">Girêdana %s nikare çêbe ji ber ku ti ajimêrek nehatiye bijartin.</string>
+    <string name="photo_picker_soft_ask_label">Ji bo gihîna li wêneyên te %s destûrê hewce dike</string>
+    <string name="sharing_twitter_message">Dema ku mirov bi rêya bişkoka Twîtterê parve bikin, ev ê jî tevlî nav tweetan bibe</string>
+    <string name="sharing_label_message">Nivîsa bişkokên parvekirinê biguherîne. Heta ku tu bi kêmanî bişkokeke parvekirinê tev lê bikî ew ê ev nivîs neyê xuyan.</string>
+    <string name="connecting_account">Hesab tê girêdan</string>
+    <string name="cannot_connect_account_error">Ji ber ku ti hesab nehatiye hilbijartin, girêdana %s\'ê nehate çêkirin.</string>
     <string name="connected">Hat girêdan</string>
     <string name="twitter">Twitter</string>
     <string name="likes">Ecibandin</string>
-    <string name="sharing_comment_likes_description">Destûr bide ku hemû şîrove ji hêla te û xwendevanên te ve were ecibandin</string>
+    <string name="sharing_comment_likes_description">Destûrê bide bila hemû şîrove ji hêla te û xwînerên te ve werin ecibandin</string>
     <string name="buttons">Bişkok</string>
-    <string name="sharing_edit_more_buttons">Bişkokên \"Bêhtir\" serast bike</string>
-    <string name="sharing_more_description">Bişkokeke \"Zêdetir\" daketokekê dihewîne ku ew bişkokên parvekirinê nîşan dide</string>
-    <string name="sharing_sharing_buttons_description">Bibijêre ku ka bila kîjan bişkok bêne xuyan li bin şandiyên te</string>
-    <string name="twitter_username">Navê bikarhêner yê Twitterê</string>
+    <string name="sharing_edit_more_buttons">Bişkokên \"Zêdetir\" sererast bike</string>
+    <string name="sharing_more_description">Bişkoka \"Zêdetir\"ê menûyeke daketok e ku bi tikandinê re bişkokên parvekirinê nîşan dide</string>
+    <string name="sharing_sharing_buttons_description">Bişkokên ku di bin şandiyên te de bêne nîşandan, hilbijêre</string>
+    <string name="twitter_username">Navê bikarhêner ê Twitterê</string>
     <string name="sharing_comment_likes">Ecibandinên şîroveyê</string>
-    <string name="button_style">Şêwaza Bişkokê</string>
-    <string name="label">Lêgerîn bo:</string>
+    <string name="button_style">Stîla Bişkokê</string>
+    <string name="label">Etîket</string>
     <string name="sharing_buttons">Bişkokên parvekirinê</string>
     <string name="site_settings_like">Bişkoka Ecibandinê Nîşan Bide</string>
     <string name="site_settings_reblog">Bişkoka Dîsblogê Nîşan Bide</string>
-    <string name="site_settings_reblog_and_like_header">Dîsblog û Ecibandin</string>
+    <string name="site_settings_reblog_and_like_header">Dîsblog bike û Biecibîne</string>
     <string name="official_buttons_display">Bişkokên Fermî</string>
     <string name="text_only_display">Tenê Nivîs</string>
-    <string name="icon_only_display">Tenê Nîşanek</string>
-    <string name="icon_and_text_display">Nîşanek û Nivîs</string>
-    <string name="connection_chooser_message">Ajimêra ku tu dixwazî destûrdar bikî bibijêre. Bi bîr bixe ku şandiyên te wê li ajimêrên bijartî bi otomatî werin parvekirin.</string>
-    <string name="connecting_social_network">Girêdan bi %s re pêk tê</string>
+    <string name="icon_only_display">Tenê Îkon</string>
+    <string name="icon_and_text_display">Îkon û Nivîs</string>
+    <string name="connection_chooser_message">Hesabê ku tu dixwazî destûrdar bikî hilbijêrî. Ji bîr neke, ew ê şandiyên te bi hesabê bijartî re bixweber werin parvekirin.</string>
+    <string name="connecting_social_network">Bi %s ve tê girêdan</string>
     <string name="dlg_confirm_publicize_disconnect">Bila girêdan ji %s qut bibe?</string>
-    <string name="share_btn_connect_another_account">Ajimereke din gire bide</string>
+    <string name="share_btn_connect_another_account">Hesabekî din girêde</string>
     <string name="share_btn_reconnect">Dîsa girêde</string>
     <string name="share_btn_disconnect">Girêdanê qut bike</string>
-    <string name="share_btn_connect">Girêdan</string>
-    <string name="connection_service_description">Ji bo ku tu şandiyên blogê yên li ser %s otomatik parve bikî, gire bide.</string>
-    <string name="connection_service_label">Ji bo %s belav bike</string>
-    <string name="connected_accounts_label">Ajimêrên Girêdayî</string>
-    <string name="connections_description">Servîsên medyayên civakî yên kêfa te ji wan re tê gire bide û bila bi awayekî otomatik şandiyên nû bi hevalên te re were parvekirin.</string>
+    <string name="share_btn_connect">Girêde</string>
+    <string name="connection_service_description">Ji bo ku tu şandiyên blogê yên li ser %s\'ê bixweber parve bikî, lê girêde.</string>
+    <string name="connection_service_label">Li ser %sê belav bike</string>
+    <string name="connected_accounts_label">Hesabên girêdayî</string>
+    <string name="connections_description">Servîsên medyaya civakî yên kêfa te ji wan re tê lê girede û bila bixweber şandiyên nû bi hevalên te re werin parvekirin.</string>
     <string name="connections_label">Girêdan</string>
     <string name="sharing">Parvekirin</string>
     <string name="tabbar_accessibility_label_notifications">Danezan. Danezanên xwe bi rê ve bibe.</string>
     <string name="tabbar_accessibility_label_reader">Xwîner. Ji malperên din naverokan bişopîne.</string>
-    <string name="tabbar_accessibility_label_my_site">Malpera Min. Malpera xwe bibine, bi rê ve bibe û li rêjejimaran meyzîne.</string>
+    <string name="tabbar_accessibility_label_my_site">Malpera Min. Malpera xwe bibîne, bi rê ve bibe û amaran kontrol bike.</string>
     <string name="my_site_btn_sharing">Parvekirin</string>
-    <string name="button_not_now">Ne aniha</string>
-    <string name="media_error_internal_server_error">Çewtiya hilxistinê. Ji sazkariyên sepana xwe guhertina vebijêrka \"Wêneyan Optîmîze Bike\" biceribîne</string>
-    <string name="media_downloading">Medya di vê amûrê de tê tomarkirin</string>
+    <string name="button_not_now">Ne niha</string>
+    <string name="media_error_internal_server_error">Çewtiya hilxistinê. Di sazkariyên sepana xwe de guhertina vebijêrka \"Wêneyan Optîmîze Bike\"yê biceribîne</string>
+    <string name="media_downloading">Medya li vê cîhazê tê tomarkirin</string>
     <string name="error_media_save">Medya nayê tomarkirin</string>
-    <string name="editor_draft_saved_locally">Reşnivîs li ser amûrê hat tomarkirin</string>
+    <string name="editor_draft_saved_locally">Reşnivîs li ser cîhazê hat tomarkirin</string>
     <string name="editor_draft_saved_online">Reşnivîs bi serhêl hat tomarkirin</string>
-    <string name="editor_post_saved_locally">Şandî li ser amûrê hat tomarkirin</string>
-    <string name="button_sync">Hevdem bike</string>
-    <string name="smart_toast_comments_long_press">Ji bo pirtir şîroveyan hilbijêre, bitepîne û li ser bihêle</string>
-    <string name="photo_picker_choose_video">Ji amûrê vîdyo bibijêre</string>
-    <string name="photo_picker_choose_photo">Ji amûrê wêne bibijêre</string>
-    <string name="wp_media_title">Medyayên WordPressê</string>
-    <string name="media_insert_as_gallery">Wekî pêşangeh tevlî bike</string>
-    <string name="media_insert_individually">Yekane tevlî bike</string>
+    <string name="editor_post_saved_locally">Şandî li ser cîhazê hat tomarkirin</string>
+    <string name="button_sync">Senkronîze bike</string>
+    <string name="smart_toast_comments_long_press">Ji bo pirtir şîroveyan hilbijêrî, bitepîne û li ser bihêle</string>
+    <string name="photo_picker_choose_video">Ji cîhazê vîdyoyekê hilbijêre</string>
+    <string name="photo_picker_choose_photo">Ji cîhazê wêneyekî hilbijêre</string>
+    <string name="wp_media_title">Medyayên WP\'ê</string>
+    <string name="media_insert_as_gallery">Wekî galerî tevlî bike</string>
+    <string name="media_insert_individually">Yek bi yek tevlî bike</string>
     <string name="media_insert_title">Wêneyan bi piranî tevlî bike</string>
     <string name="media_gallery_column_count_multi">%d stûn</string>
     <string name="media_gallery_column_count_single">Stûnek</string>
-    <string name="editor_confirm_email_prompt_negative">Epeyamê dîsa bişîne</string>
-    <string name="editor_confirm_email_prompt_message_with_email">Em epeyamekê şandin %s, gava ku te cara pêşîn têket. Xêra xwe peyamê vebike û bitikîne bişkoka şîn, ji bo çalakkirina weşandinê.</string>
-    <string name="editor_confirm_email_prompt_message">Em epeyamekê şandin te, gava ku te cara pêşîn têket. Xêra xwe peyamê vebike û bitikîne bişkoka şîn, ji bo çalakkirina weşandinê.</string>
-    <string name="editor_confirm_email_prompt_title">Ji kerema xwe navnîşana epeyama xwe bipejirîne</string>
-    <string name="toast_verification_email_send_error">Di şandina epeyama rastandinê de çewtî çêbû. Jixwe te rastandiye?</string>
-    <string name="toast_verification_email_sent">Epeyama rastandinê hat şandin, hatdanka xwe kontrol bike</string>
+    <string name="editor_confirm_email_prompt_negative">Emailê dîsa bişîne</string>
+    <string name="editor_confirm_email_prompt_message_with_email">Dema ku te cara ewil xwe tomar kir me ji %s\'ê re emailek şand. Ji kerema xwe peyamê veke û ji bo weşandinê çalak bikî li bişkoka şîn bitikîne.</string>
+    <string name="editor_confirm_email_prompt_message">Dema ku te cara ewil xwe tomar kir me ji te re emailek şand. Ji kerema xwe peyamê veke û ji bo weşandinê çalak bikî li bişkoka şîn bitikîne.</string>
+    <string name="editor_confirm_email_prompt_title">Ji kerema xwe navnîşana emaila xwe bipejirîne</string>
+    <string name="toast_verification_email_send_error">Di şandina emaila pejirandinê de çewtî derket. Jixwe te pejirandiye?</string>
+    <string name="toast_verification_email_sent">Emaila pejirandinê hat şandin, hatdanka xwe kontrol bike</string>
     <string name="toast_saving_post_as_draft">Şandiyê wekî reşnivîs tomar bike</string>
     <string name="photo_picker_capture_video">Vîdyo bikşîne</string>
     <string name="photo_picker_capture_photo">Wêne bikşîne</string>
-    <string name="delete_site_warning_subtitle">Baldar be! Carekê malperek hate jêbirin, ew dê neyê filitandin. Ji kerema xwe berî ku tu pêşve biçe jê piştrast be.</string>
-    <string name="delete_site_warning">Dê hemû şandî, wêne û daneyên te werin jêbirin. Wê navnîşana malperê (%s) winda bibe.</string>
+    <string name="delete_site_warning_subtitle">Baldar be! Dema malperek hat jêbirin, ew ê neyê filitandin. Ji kerema xwe berî ku tu berdewam bikî jê piştrast be.</string>
+    <string name="delete_site_warning">Hemû şandî, wêne û daneyên te ew ê werin jêbirin. Navnîşana malperê (%s) ew ê wenda bibe.</string>
     <string name="delete_site_warning_title">Bila malper were jêbirin?</string>
-    <string name="start_over_email_intent_error">Epeyam nayê şandin</string>
-    <string name="start_over_email_body">Ez dixwazim bi ser malpera %s dest pê bikim</string>
-    <string name="start_over_email_subject">Bi malpera %s re dest pê bike</string>
-    <string name="site_picker_remove_site_error">Di rakirina malperê de çewtî çêbû, piştre dîsa biceribîne</string>
-    <string name="editor_post_saved_locally_failed_media">Şandî bi ser neket ku medyayê hilbixe û wek herêmî hate qeydkirin</string>
-    <string name="sure_to_remove_account">Bila ji sepanê ev malpera rabe?</string>
+    <string name="start_over_email_intent_error">Email nayê şandin</string>
+    <string name="start_over_email_body">Ez dixwazim ji serî ve dest bi malpera %s\'ê bikim</string>
+    <string name="start_over_email_subject">Ji serî ve dest bi malpera %s\'ê bike</string>
+    <string name="site_picker_remove_site_error">Di rakirina malperê de çewtî derket, piştre dîsa biceribîne</string>
+    <string name="editor_post_saved_locally_failed_media">Şandiyê hilxistinên medyayê bi ser nexist û bi ew derhêlî hatin tomarkirin</string>
+    <string name="sure_to_remove_account">Bila ev malper ji sepanê bê rakirin?</string>
     <string name="photo_picker_title">Wêne hilbijêre</string>
-    <string name="error_publish_no_network">Cîhaz derhêl e. Şandî cîgehî hat tomarkirin.</string>
-    <string name="editor_post_saved_online">Peyam bi serhêl hat tomarkirin.</string>
-    <string name="site_settings_image_quality_hint">Qalîteya wêneyan. Nirxên bilindtir tê wateya wêneyên qalîteya çêtir.</string>
-    <string name="site_settings_optimize_images_summary">Verehandin û dewisandina wêneyan, biçalakîne</string>
+    <string name="error_publish_no_network">Cîhaz derhêl e. Şandî bi cîgehî hat tomarkirin.</string>
+    <string name="editor_post_saved_online">Şandî bi serhêlî hat tomarkirin</string>
+    <string name="site_settings_image_quality_hint">Kalîteya wêneyan. Nirxên bilindtir tê wateya wêneyên kalîteya wan çêtir.</string>
+    <string name="site_settings_optimize_images_summary">Dewisandin û ji nû ve rehendina wêneyan biçalakîne</string>
     <string name="media_encoder_quality_100">Herî bilind</string>
     <string name="media_encoder_quality_95">Pir bilind</string>
     <string name="media_encoder_quality_90">Bilind</string>
     <string name="media_encoder_quality_85">Navîn</string>
     <string name="media_encoder_quality_80">Nizm</string>
-    <string name="media_upload_state_uploaded">Hilxistî</string>
-    <string name="media_upload_state_failed">Hilxistin bi Serneket</string>
+    <string name="media_upload_state_uploaded">Hat hilxistin</string>
+    <string name="media_upload_state_failed">Hilxistin bi ser neket</string>
     <string name="media_upload_state_deleted">Hat jêbirin</string>
     <string name="media_upload_state_deleting">Tê jêbirin</string>
     <string name="media_upload_state_uploading">Tê hilxistin</string>
     <string name="media_upload_state_queued">Di dorê de</string>
-    <string name="image_quality">Qalîteya Wêneyê</string>
-    <string name="error_all_media_upload_canceled">Ji ber sedema çewtiyeke nediyar hilxistina hemû medayayan betal bû. Ji kerema xwe hilxistinê dîsa biceribîne</string>
-    <string name="error_unknown_post_type">Dirûva şandiya nenas</string>
+    <string name="image_quality">Kalîteya Wêneyê</string>
+    <string name="error_all_media_upload_canceled">Ji ber çewtiyeke nenas hilxistina hemû medayayan hatin betalkirin. Ji kerema xwe hilxistinê dîsa biceribîne</string>
+    <string name="error_unknown_post_type">Formata şandiya nenas</string>
     <string name="submit_for_review">Bişîne</string>
-    <string name="duplicate_site_detected">Malpereke dubarekirî hate tesbîtkirin</string>
-    <string name="cannot_add_duplicate_site">Ev malper jixwe heye di sepanê de, tu nikarî lê zêde bikî.</string>
-    <string name="already_logged_in_wpcom">Te jixwe têketiye ajimêreke WordPress.comê, tu nikarî malpereke WordPress.comê yê ku girêdayî ajimêke din e lê zêde bikî.</string>
+    <string name="duplicate_site_detected">Malpereke dubareyî hat tesbîtkirin.</string>
+    <string name="cannot_add_duplicate_site">Jixwe ev malper di sepanê de heye, tu nikarî wê tevlê bikî.</string>
+    <string name="already_logged_in_wpcom">Jixwe tu di hesabê xwe yê WordPress.com\'ê de têketî ye, tu nikarî malpereke WordPress.com\'ê ya ku girêdayî hesabekî din e lê zêde bikî.</string>
     <string name="error_media_load">Medya nayê barkirin</string>
     <string name="error_media_refresh_no_connection">Ji bo nûkirina medyagehê înternet hewce ye</string>
-    <string name="error_media_unauthorized">Ji bo dîtin an jî serastkirina medyayê destûra te nîn e</string>
+    <string name="error_media_unauthorized">Ji bo tu medyayê bibinî an jî wê sererast bikî îzina te tune ye</string>
     <string name="error_media_not_found">Medya nehat dîtin</string>
-    <string name="error_media_insufficient_fs_permissions">Ser medyaya amûrê destûra xwendinaê hate redkirin</string>
+    <string name="error_media_insufficient_fs_permissions">Ji bo medyaya cîhazê destûra xwendinê hat redkirin</string>
     <string name="site_settings_optimize_images">Wêneyan optîmîze bike</string>
-    <string name="media_generic_error">Çewtiya medyayê qewimî</string>
-    <string name="media_upload_error">Çewtiya hilxistinê ya medyayê qewimî</string>
+    <string name="media_generic_error">Çewtiya medyayê derket</string>
+    <string name="media_upload_error">Çewtiya hilxistina medyayê derket</string>
     <string name="retry">Dîsa biceribîne</string>
     <string name="confirm">Bipejirîne</string>
-    <string name="xmlrpc_endpoint_forbidden_error">Nikare were girêdan. Em çewtiya 403 wergirtin gava ku diceribandin\n        xwe bigihînin nuqteya dawîn ya XMLRPC. Hewcehiya sepanê pê heye da ku bi malpera te re têkiliyê deyîne. Bo çareserkirina vê pirsgirêkê\n        têkiliyê deyîne bi hewandera xwe re.</string>
-    <string name="xmlrpc_post_blocked_error">Nikare were girêdan. Hewandera te daxwazên POSTê asteng dike, \n        û hewcedariya sepanê pê heye ji bo ku bi malpera te re têkiliyê deyîne. Ji bo çareserkirina vê pirsgirêkê bi pêşkêşkera hewangeha xwe re têkiliyê deyîne.</string>
+    <string name="xmlrpc_endpoint_forbidden_error">Nayê girêdan. Dema me hewl da xwe bigihînin nuqteya dawîn XMLRPC\'ê\n        ya malpera te, çewtiyeke 403 qewimî. Ji bo ku sepan karibe bi malpera te re têkilî dayîne pêwîstî pê heye.\n        Ji bo çareserkirina vê pirsgirêkê bi hewangera (host) xwe re têkilî deyne.</string>
+    <string name="xmlrpc_post_blocked_error">Nayê girêdan. Hewangera te daxwazên POSTê asteng dike, û ji bo ku sepan\n         karibe bi malpera te re têkilî dayîne pêwîstî pê heye. Ji bo çareserkirina vê pirsgirêkê bi hewangera (host) xwe re têkilî deyne.</string>
     <string name="reader_hint_search_followed_sites">Li malperên şopandî bigere</string>
-    <string name="pending_draft_one_generic">Wê daliqandî nehêle! \'%1$s\' li benda weşandinê te.</string>
-    <string name="pending_draft_one_month">Wê daliqandî nehêle! \'%1$s\' li benda weşandinê te.</string>
-    <string name="pending_draft_one_week_2">\'%1$s\' wek reşnivîs ma. Weşandina wê ji bîr neke!</string>
-    <string name="pending_draft_one_week_1">Reşnivisa te \'%1$s\' li benda te ye - jê bawer be ku te wê weşandiye!</string>
-    <string name="pending_draft_one_day_2">Te dizanî \'%1$s\' hîn jî reşnivîsek e? Hema biweşîne!</string>
-    <string name="pending_draft_one_day_1">Te doh \'%1$s\' kir reşnivîs. Weşandina wê ji bîr neke!</string>
+    <string name="pending_draft_one_generic">Wê daliqandî nehêle! \'%1$s\' li benda weşandinê ye.</string>
+    <string name="pending_draft_one_month">Wê daliqandî nehêle! \'%1$s\' li benda weşandinê ye.</string>
+    <string name="pending_draft_one_week_2">\'%1$s\' wekî reşnivîsekê ma. Weşandina wê ji bîr neke!</string>
+    <string name="pending_draft_one_week_1">Reşnivisa te \'%1$s\' li benda te ye - ji weşandina wê piştrast be!</string>
+    <string name="pending_draft_one_day_2">Tu dizanî \'%1$s\' hîn jî reşnivîsek e? De ka biweşîne!</string>
+    <string name="pending_draft_one_day_1">Te doh reşnivîsa \'%1$s\'ê tomar kir. Weşandina wê ji bîr neke!</string>
     <string name="reader_label_visit">Serdana malperê bike</string>
     <string name="swipe_for_more">Ji bo zêdetir, bişemitîne</string>
-    <string name="reader_err_get_post_not_authorized_signin_fallback">Tu nehatî destûrdarkirin bo dîtina vê şandiyê. Pêşî biceribîne ku tu têkevî WordPress.comê an jî li şûna wê bo vekirina gerokeke webê, bişkoka çalakiya jorîn bi kar bîne.</string>
-    <string name="reader_err_get_post_not_authorized_signin">Tu ne destûrdayî yî bo dîtina vê şandiyê. Pêşî biceribîne ku tu têkevî WordPress.comê.</string>
-    <string name="reader_err_get_post_not_authorized_fallback">Tu ne destûrdayî yî bo dîtina vê şandiyê. Bi bişkoka çalakiya jorîn biceribîne ku gerokeke webê vebikî.</string>
-    <string name="reader_snackbar_err_cannot_like_post_logged_out">Nikare biecibîne gava ji WordPress.comê derketî be</string>
+    <string name="reader_err_get_post_not_authorized_signin_fallback">Ji bo dîtina vê şandiyê destûra te tune ye. Pêşî têkeve WordPress.com\'ê heke nebe li şûna wê bi rêya bişkoka çalakiyê ya jorê bi gerokekê veke.</string>
+    <string name="reader_err_get_post_not_authorized_signin">Ji bo dîtina vê şandiyê destûra te tune ye. Pêşî hewl bide têkeve WordPress.com\'ê.</string>
+    <string name="reader_err_get_post_not_authorized_fallback">Ji bo dîtina vê şandiyê destûra te tune ye. Hewl bide bi rêya bişkoka çalakiyê ya jorê bi gerokekê veke.</string>
+    <string name="reader_snackbar_err_cannot_like_post_logged_out">Dema tu ji WordPress.com\'ê derketî be tu nikarî biecibînî</string>
     <string name="reader_toast_err_already_liked">Jixwe te ev şîrove ecibandiye</string>
     <string name="reader_toast_err_comment_not_found">Şîrove nehat dîtin!</string>
     <string name="reader_toast_err_cannot_like_post">Ev şandî nehat ecibandin</string>
     <string name="error_notif_q_action_reply">Şîrove nayê bersivandin. Ji kerema xwe piştre dîsa biceribîne.</string>
     <string name="error_notif_q_action_approve">Şîrove nayê pejirandin. Ji kerema xwe piştre dîsa biceribîne.</string>
     <string name="error_notif_q_action_like">Şîrove nayê ecibandin. Ji kerema xwe piştre dîsa biceribîne.</string>
-    <string name="notifications_label_new_notifications_subtitle">Ji bo wan nîşan bide, bitikîne</string>
+    <string name="notifications_label_new_notifications_subtitle">Ji bo nîşandanê, bitikîne</string>
     <string name="notifications_label_new_notifications">Danezanên nû</string>
     <string name="comment_q_action_replying">Tê bersivandin…</string>
     <string name="comment_q_action_approving">Tê pejirandin…</string>
     <string name="comment_q_action_liking">Tê ecibandin…</string>
-    <string name="comment_q_action_processing">Tê xebitandin…</string>
+    <string name="comment_q_action_processing">Tê hêran…</string>
     <string name="comment_q_action_done_generic">Çalakî qediya!</string>
     <string name="comment_liked">Şîrove hat ecibandin</string>
     <string name="signout">Derkeve</string>
     <string name="sign_in_wpcom">Têkeve WordPress.com\'ê</string>
     <string name="reader_label_global_related_posts">Zêdetir li ser WordPress.com\'ê</string>
-    <string name="reader_label_local_related_posts">Zêdetir li ser %s\'ê</string>
     <string name="preference_open_device_settings">Sazkariyên cîhazê veke</string>
     <string name="invite_invalid_email">%s: Emaila nederbasdar</string>
-    <string name="invite_user_blocked_invites">%s: Vexwendinên bikarhêner astengkirî</string>
+    <string name="invite_user_blocked_invites">%s: Vexwendinên astengkirî</string>
     <string name="invite_already_following">%s: Jixwe tê şopandin</string>
     <string name="invite_already_a_member">%s: Jixwe endamek e</string>
     <string name="invite_username_not_found">%s: Bikarhêner nehat dîtin</string>
@@ -1819,127 +1749,120 @@ Language: ku_TR
     <string name="timespan_now">Aniha</string>
     <string name="role_viewer">Bîner</string>
     <string name="role_follower">Şopîner</string>
-    <string name="error_post_my_profile_no_connection">Girêdan tune ye, profîla te nehat tomarkirin</string>
+    <string name="error_post_my_profile_no_connection">Înternet tune ye, profîla te nehat tomarkirin</string>
     <string name="alignment_right">Rast</string>
     <string name="alignment_left">Çep</string>
     <string name="alignment_none">Hîç</string>
     <string name="site_settings_list_editor_action_mode_title">%1$d hat hilbijartin</string>
     <string name="error_fetch_users_list">Bikarhênerên malperê nehatin stendin</string>
-    <string name="title_email_follower">Şopînerê Emailê</string>
+    <string name="title_email_follower">Şopînera Emailê</string>
     <string name="title_follower">Şopîner</string>
     <string name="people_fetching">Bikarhêner tên stendin…</string>
     <string name="people_dropdown_item_viewers">Bîner</string>
     <string name="people_dropdown_item_email_followers">Şopînerên Emailê</string>
     <string name="people_dropdown_item_followers">Şopîner</string>
-    <string name="people_dropdown_item_team">Kom</string>
-    <string name="invite_message_usernames_limit">Heya 10 heb navnîşanên emailê û/an jî bikarhênerên WordPress.com\'ê, vexwîne. Ji bo kesên hewcedariya wan bi navê bikarhêner heyî re di derbarê afirandinê de ew ê rêwerz were şandin.</string>
-    <string name="viewer_remove_confirmation_message">Heke tu vî/vê bînerî/ê rakî êdî ew dê nikaribî seredana vê malperê bike.\n\nDîsa jî tu dixwazî vî/vê binerî/ê rake?</string>
-    <string name="follower_remove_confirmation_message">Heke ev şopîner were rakirin dê di derbarê vê malperê de danezanan nestîne, heta ku dîsa bişopînî.\n\nDîsa jî tu dixwazî ev şopîner were rakirin?</string>
+    <string name="people_dropdown_item_team">Tîm</string>
+    <string name="invite_message_usernames_limit">Heta 10 heb navnîşanên emailê û/an jî bikarhênerên WordPress.com\'ê, vexwîne. Ji bo kesên ku hewcedariya wan bi navê bikarhêneriyê hene re di derbarê afirandinê de ew ê rêwerz were şandin.</string>
+    <string name="viewer_remove_confirmation_message">Heke tu vî bînerî rakî êdî ew ê nikaribe seredana vê malperê bike.\n\nTu dîsa jî dixwazî vî binerî rakî?</string>
+    <string name="follower_remove_confirmation_message">Heke ev şopîner were rakirin ew ê danezanan di derbarê vê malperê de nestîne, heta ku dîsa bişopînî.\n\nTu dîsa jî dixwazî vî şopînerî rakî?</string>
     <string name="follower_subscribed_since">Ji %1$s\'an vir de</string>
     <string name="error_remove_viewer">Bîner nayê rakirin</string>
     <string name="error_remove_follower">Şopîner nayê rakirin</string>
-    <string name="error_fetch_email_followers_list">Şopînerên epeyama malperê bi şûnde nehat</string>
-    <string name="error_fetch_followers_list">Şopînerên malperê bi şûnde nehatin</string>
-    <string name="editor_failed_uploads_switch_html">Hilxistina hinek medayayan bi serneket. Li vê herêmê tu nikarî\n derbasî moda HTMLê bibe. Bila hemû hilxistin û serneketin werin rakirin û pevajo bidome?</string>
+    <string name="error_fetch_email_followers_list">Şopînerên emaila malperê nehatin stendin</string>
+    <string name="error_fetch_followers_list">Şopînerên malperê nehatin stendin</string>
+    <string name="editor_failed_uploads_switch_html">Hilxistina hinek medyayan bi ser neket. Tu nikarî li vê herêmê derbasî\n        moda HTML\'ê bibe. Bila hemû hilxistin serneketî werin rakirin û bidome?</string>
     <string name="image_width">Firehî</string>
     <string name="image_link_to">Giredan</string>
-    <string name="image_caption">Binnivîs</string>
+    <string name="image_caption">Jêrnivîs</string>
     <string name="image_settings_save_toast">Guhertin hatin tomarkirin</string>
-    <string name="image_settings_dismiss_dialog_title">Bila guhertinên netomarkirî were avêtin?</string>
+    <string name="image_settings_dismiss_dialog_title">Bila guhertinên netomarkirî bên avêtin?</string>
     <string name="stop_upload_dialog_title">Bila hilxistin raweste?</string>
-    <string name="tap_to_try_again">Ji bo dîsa biceribîne, bitepîne</string>
+    <string name="tap_to_try_again">Ji bo dîsa biceribînî, bitepîne!</string>
     <string name="invite_sent">Vexwendin bi serkeftî hat şandin</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
-    <string name="invite_error_some_failed">Vexwendin hat şandin lê hin(ek) çewtî rû dan!</string>
-    <string name="invite_error_sending">Dema vexwendin dihat şandin çewtiyek çêbû!</string>
-    <string name="invite_error_invalid_usernames_multiple">Nikare bişîne: Epeyam an jî navên bikarhêneran nederbasdar e</string>
-    <string name="invite_error_invalid_usernames_one">Nikare bişîne: Navek an jî epeyamek nederbasdar e</string>
-    <string name="invite_error_no_usernames">Ji kerema xwe herî kêm navekî bikarhêner tevlî bike</string>
-    <string name="invite_message_info">(Girêdayî daxwazê) Tu dikarî peyameke xisûsî têkevî heya 500 karakteran, ku ev wê tevlî vexwendina bo bikarhêner(an)ê were kirin.</string>
-    <string name="invite_message_remaining_other">%d karakter mane</string>
-    <string name="invite_message_remaining_one">Karakterek maye</string>
-    <string name="invite_message_remaining_zero">0 karakter maye</string>
-    <string name="invite_message_title">Peyama Taybet</string>
+    <string name="invite_error_some_failed">Vexwendin hat şandin lê çewtî çêbû(n)!</string>
+    <string name="invite_error_sending">Di şandina vewendinê de çewtiyek derket!</string>
+    <string name="invite_error_invalid_usernames_multiple">Nikare bişîne: Navê bikarhêner an jî email nederbasdar in</string>
+    <string name="invite_error_invalid_usernames_one">Nikare bişîne: Navek an jî email nederbasdar e</string>
+    <string name="invite_error_no_usernames">Ji kerema xwe herî kêm navê bikarhênerekî tevlî bike</string>
     <string name="invite">Vexwîne</string>
-    <string name="invite_names_title">Epeyam an jî navên bikarhêneran</string>
     <string name="invite_people">Mirovan Vexwîne</string>
     <string name="my_site_header_external">Derveyî</string>
-    <string name="send_link">Girêdanê bişîne</string>
     <string name="label_clear_search_history">Raboriya lêgerînê paqij bike</string>
     <string name="dlg_confirm_clear_search_history">Raboriya lêgerînê paqij bike?</string>
     <string name="reader_empty_search_description">Di zimanê te de ji bo \"%s\"ê ti encam nehatin dîtin</string>
-    <string name="reader_hint_post_search">Li ser WordPress bigere</string>
-    <string name="preview_screen_links_disabled">Girêdanên li ser ekrana pêşdîtinê neçalak in</string>
+    <string name="reader_hint_post_search">Li ser WordPress\'ê bigere</string>
+    <string name="reader_title_related_post_detail">Şandiya Têkildar</string>
+    <string name="preview_screen_links_disabled">Girêdan li ser ekrana pêşdîtinê neçalak in</string>
     <string name="send">Bişîne</string>
     <string name="person_removed">%1$s bi serkeftî hat rakirin</string>
-    <string name="user_remove_confirmation_message">Heke tu bikarhêner %1$s rake, ew dê nikaribe bigihêje vê malperê lê naverokên ji hêla   %1$s wî/ê hatiye afirandin dê li malperê bimîne.\n\nDîsa jî tu dixwazî vî/ê bikarhênerî/ê rake?</string>
+    <string name="user_remove_confirmation_message">Heke tu %1$s rakî, ew ê êdî nikaribe bigihîje vê malperê, lê naverokên ji hêla %1$s ve hatine afirandin ew ê li ser malperê bimînin.\n\nTu dîsa jî dixwazî vî bikarhênerî rakî?</string>
     <string name="person_remove_confirmation_title">%1$s rake</string>
     <string name="role">Rol</string>
     <string name="people">Kes</string>
-    <string name="reader_empty_posts_in_custom_list">Malperên di vê lîsteyê de vê gavê ti şandî nekirine</string>
+    <string name="reader_empty_posts_in_custom_list">Malperên di vê lîsteyê de vê gavê ti şandî neweşandine</string>
     <string name="error_remove_user">Bikarhêner nayê rakirin</string>
     <string name="error_update_role">Rola bikarhêner nayê hildemandin</string>
-    <string name="error_fetch_viewers_list">Bînerên malperê nehat stendin</string>
-    <string name="error_updating_gravatar">Di hildemandina Gravatara te de çewtî çêbû</string>
-    <string name="error_refreshing_gravatar">Di ji nû ve hildemandina Gravatara te de çewtî çêbû</string>
-    <string name="error_locating_image">Di bicîhkirina wêneyên qusandî de çewtî çêbû</string>
-    <string name="error_cropping_image">Di qusandina wêneyê de çewtî çêbû</string>
-    <string name="checking_email">Epeyam tê kontrolkirin</string>
-    <string name="magic_link_unavailable_error_message">Niha ne li berdest e. Ji kerema xwe pêborîna xwe têxîne</string>
+    <string name="error_fetch_viewers_list">Bînerên malperê nehatin stendin</string>
+    <string name="error_updating_gravatar">Di hildemandina Gravatara te de çewtî derket</string>
+    <string name="error_refreshing_gravatar">Di nûkirina Gravatara te de çewtî derket</string>
+    <string name="error_locating_image">Di bicîkirina wêneyên qusandî de çewtî derket</string>
+    <string name="error_cropping_image">Di qusandina wêneyê de çewtî derket</string>
+    <string name="checking_email">Email tê kontrolkirin</string>
+    <string name="magic_link_unavailable_error_message">Niha ne guncav e. Ji kerema xwe pêborîna xwe bikevê</string>
     <string name="logging_in">Têketin pêk tê</string>
-    <string name="enter_your_password_instead">Li şûnê pêborîna xwe têxîne</string>
-    <string name="web_address_dialog_hint">Dema te şîrove kir wê her kes bibîne</string>
-    <string name="capture_or_pick_photo">Wêne hilbijêre an jî bikşîne</string>
-    <string name="plans">Plan</string>
-    <string name="plan">Plan</string>
-    <string name="export_your_content_message">Rûpel, şandî û sazkariyên te dê ji navnîşana %s re bi epayamê were şandin.</string>
-    <string name="export_your_content">Naverokên xwe derxîne derve</string>
-    <string name="export_email_sent">Epeyama derxistinê hat şandin!</string>
+    <string name="web_address_dialog_hint">Dema ku te şîrove kir ew ê her kes bibîne.</string>
+    <string name="capture_or_pick_photo">Wêne hilbijêre an jî bigire</string>
+    <string name="plans">Pakêt</string>
+    <string name="plan">Pakêt</string>
+    <string name="export_your_content_message">Rûpel, şandî û sazkariyên te ew ê bi emailê ji ser %s\'ê ji te re bên şandin.</string>
+    <string name="export_your_content">Naverokên xwe derxîne</string>
+    <string name="export_email_sent">Emaila derxistinê hat şandin!</string>
     <string name="exporting_content_progress">Naverok tê derxistin…</string>
-    <string name="checking_purchases">Kirînên te tê kontrolkirin</string>
+    <string name="checking_purchases">Kirînên te tên kontrolkirin</string>
     <string name="show_purchases">Kirînan nîşan bide</string>
-    <string name="premium_upgrades_message">Li ser malpera te bilindkirinên premium yên çalak hene. Ji kerema xwe berî tu malpera xwe jê bibî bilinkirinên xwe betal bike.</string>
-    <string name="premium_upgrades_title">Bilindkirinên Premium</string>
-    <string name="purchases_request_error">Hinek tişt çewt çû. Daxwazên kirînan pêk nehat.</string>
+    <string name="premium_upgrades_message">Li ser malpera te bilindkirinên premiûm ên çalak hene. Ji kerema xwe berî tu malpera xwe jê bibî bilindkirinên xwe betal bike.</string>
+    <string name="premium_upgrades_title">Bilindkirinên Premiûm</string>
+    <string name="purchases_request_error">Hinek tişt çewt çûn. Daxwaza kirînê pêk nehat.</string>
     <string name="delete_site_progress">Malper tê jêbirin…</string>
-    <string name="delete_site_hint">Malperê jê bibe?</string>
-    <string name="export_site_hint">Malpera xwe wekî pelgeya XML derxe</string>
-    <string name="primary_domain">Navpera Sereke</string>
-    <string name="error_deleting_site_summary">Dema malpera te dihat jêbirin çewtiyek çêbû. Ji kerema xwe bo zêdetir alîkariyê bi timên alîkariyê re têkilî deyne.</string>
+    <string name="delete_site_hint">Malperê jê bibe</string>
+    <string name="export_site_hint">Malpera xwe wekî dosyeya XML\'ê derxîne</string>
+    <string name="primary_domain">Navpera (Domain) Sereke</string>
+    <string name="error_deleting_site_summary">Di jêbirina malpera te de çewtiyek derket. Ji kerema xwe ji bo alîkariya zêdetir bi tîma piştgiriyê re têkilî deyne.</string>
     <string name="error_deleting_site">Di jêbirina malperê de çewtî</string>
-    <string name="site_settings_export_content_title">Naverokê derxe</string>
-    <string name="confirm_delete_site_prompt">Ji kerema xwe bo pejirandinê di qasa jêrîn de %1$s binivîsîne. Malpera te dê piştî vê heta hetayê winda bibe.</string>
+    <string name="site_settings_export_content_title">Naverokê derxîne</string>
+    <string name="confirm_delete_site_prompt">Ji kerema xwe, ji bo pejirandinê li qada jêrîn %1$s\'ê binivîse. Malpera te ew ê piştî vê heta hetayê wenda bibe.</string>
     <string name="confirm_delete_site">Jêbirina Malperê Bipejirîne</string>
-    <string name="contact_support">Têkîlîya Alîkariyê</string>
-    <string name="start_over_text">Tu malpereke nû bixwazî, lê nexwazî ku ti rûpel û şandiyeke te ya niha tê de nîn bin, tîma me ya alîkariyê dikare ji bo te şandî, rûpel, medya û şiroveyên te jê bibe.\n\nEv wê malpera te û URLya te aktîv bigire, lêbelê ji bo te destpêkek teze bide ji bo çêkirina naverokan. Tenê bi me re têkiliyê deyîne ji bo paqijkirina hemû naverokên xwe yên vê gavê.</string>
-    <string name="let_us_help">Werin Em Alîkariya We Bikin</string>
+    <string name="contact_support">Piştgiriya Têkiliyê</string>
+    <string name="start_over_text">Heke tu malperekê dixwazî lê şandî û rûpelên niha tê de hene naxwazî, tîma me ya piştgiriyê dikare şandî, rûpel, medya û şîroveyan ji bo te jê bibe.\n\nEv ê malper û URL\'ya te çalak bihêle û ji bo afirandina naverokan jî ew ê destpêkeke nû ji te re peyda bike. Ji bo naveroka heyî were paqijkirin tenê bi me re têkilî deyne.</string>
+    <string name="let_us_help">Ka Em Bibin Alîkar</string>
     <string name="site_settings_start_over_hint">Ji serî ve dest bi malpera xwe bike</string>
     <string name="start_over">Ji serî ve dest pê bike</string>
     <string name="me_btn_app_settings">Sazkariyên Sepanê</string>
-    <string name="editor_remove_failed_uploads">Hilxistinên bi serneketî rake</string>
+    <string name="editor_remove_failed_uploads">Hilxistinên serneketî rake</string>
     <string name="site_settings_advanced_header">Pêşketî</string>
-    <string name="comments_empty_list_filtered_trashed">Şîroveyên hatine jêbirin tune ye</string>
-    <string name="comments_empty_list_filtered_pending">Şîroveyên hilawîstî tune ye</string>
+    <string name="comments_empty_list_filtered_trashed">Di jêbirdankê de şîrove tune ye</string>
+    <string name="comments_empty_list_filtered_pending">Şîroveyên hilawestî tune ye</string>
     <string name="comments_empty_list_filtered_approved">Şîroveyên pejirandî tune ye</string>
-    <string name="xmlrpc_missing_method_error">Girêdan pêk nehat. Rêbazên XML-RPC yên pêwist li ser serverê kêm in.</string>
-    <string name="alignment_center">Navîn bike</string>
+    <string name="xmlrpc_missing_method_error">Girêdan pêk nehat. Fonksiyonên XML-RPC yên pêwîst di serverê de kêm in.</string>
+    <string name="alignment_center">Navend</string>
     <string name="post_format_video">Vîdyo</string>
     <string name="post_format_status">Rewş</string>
     <string name="post_format_standard">Standard</string>
     <string name="post_format_quote">Jêgirtin</string>
     <string name="post_format_link">Girêdan</string>
     <string name="post_format_image">Wêne</string>
-    <string name="post_format_gallery">Pêşangeh</string>
+    <string name="post_format_gallery">Galerî</string>
     <string name="post_format_chat">Gotûbêj</string>
     <string name="post_format_audio">Deng</string>
     <string name="post_format_aside">Kêlekbend</string>
-    <string name="notif_events">Agahdariya li ser qurs û çalakiyên WordPress.comê (serhêl û şexsî).</string>
-    <string name="notif_surveys">Derfetên beşdarbûnê yên ji  bo lêkolîn û vekolîna WordPress.comê.</string>
-    <string name="notif_tips">Bendên ji bo fêdedîtina ji WordPress.comê.</string>
+    <string name="notif_events">Agahdariya li ser kurs û çalakiyên WordPress.com\'ê (serhêl û şexsî).</string>
+    <string name="notif_surveys">Derfetên beşdarbûnê ji bo lêkolîn û vekolînên WordPress.com\'ê.</string>
+    <string name="notif_tips">Serbendên ji bo tu sûdeke baş ji WordPress.com\'ê werbigirî.</string>
     <string name="notif_community">Civak</string>
     <string name="notif_research">Lêkolîn</string>
     <string name="notif_suggestions">Pêşniyar</string>
-    <string name="replies_to_my_comments">Bersivên li ser şîroveyên min</string>
+    <string name="replies_to_my_comments">Bersivên şîroveyên min</string>
     <string name="username_mentions">Qalkirinên li ser navê bikarhêner</string>
     <string name="site_achievements">Serkevtinên malperê</string>
     <string name="site_follows">Şopandinên malperê</string>
@@ -1949,131 +1872,124 @@ Language: ku_TR
     <string name="site_settings_list_editor_summary_other">%d hêman</string>
     <string name="site_settings_list_editor_summary_one">Hêmanek</string>
     <string name="approve_auto">Hemû bikarhêner</string>
-    <string name="approve_auto_if_previously_approved">Şîroveyên bikarhênerên naskirirî</string>
-    <string name="approve_manual">Şîrove nîn e</string>
+    <string name="approve_auto_if_previously_approved">Şîroveyên bikarhênerên navnas</string>
+    <string name="approve_manual">Şîrove tune ye</string>
     <string name="site_settings_paging_summary_other">Serê rûpelê %d şîrove</string>
     <string name="site_settings_paging_summary_one">Serê rûpelê şîroveyek</string>
-    <string name="site_settings_multiple_links_summary_other">Zêdeyî %d girêdanan be pejirandin pêwîst e</string>
-    <string name="site_settings_multiple_links_summary_one">Zêdeyî girêdanekê be pejirandin pêwîst e</string>
-    <string name="site_settings_multiple_links_summary_zero">Zêdeyî 0 girêdanê be pejirandin pêwîst e</string>
-    <string name="detail_approve_auto">Şîroveyên her kesî otomatîk bipejirîne</string>
-    <string name="detail_approve_auto_if_previously_approved">Bi otomatîkî bipejirîne ger di berê de şiroveyeke bikarhêner yê pejirandî hebe</string>
+    <string name="site_settings_multiple_links_summary_other">Zêdeyî %d girêdanan be pejirandin hewce ye</string>
+    <string name="site_settings_multiple_links_summary_one">Zêdeyî girêdanekê be pejirandin hewce ye</string>
+    <string name="site_settings_multiple_links_summary_zero">Zêdeyî 0 girêdanê be pejirandin hewce ye</string>
+    <string name="detail_approve_auto">Bixweber şîroveyên her kesî bipejirîne.</string>
+    <string name="detail_approve_auto_if_previously_approved">Heke şîroveyeke pejirandî ya bikarhêner ji berê ve hebe, bixweber bipejirîne</string>
     <string name="detail_approve_manual">Ji bo şîroveyên her kesî pejirandina manual hewce dike.</string>
     <string name="days_quantity_other">%d roj</string>
     <string name="days_quantity_one">Rojek</string>
     <string name="web_address">Navnîşana webê</string>
     <string name="primary_site">Malpera sereke</string>
-    <string name="pending_email_change_snackbar">Ji bo navnîşana nû ya te were pejirandin, li girêdana rastandinê ya  ji epeyama %1$s re hatiye şandin bitikîîne</string>
-    <string name="editor_toast_uploading_please_wait">Vê gavê tu medya hldixîne. Ji kerema xwe heta qedandinê bisekine.</string>
-    <string name="error_refresh_comments_showing_older">Şîrove vê gavê nayê nûkirin - şîroveyên kevn tên nîşandan</string>
-    <string name="post_settings_set_featured_image">Wêneya bijarde saz bike</string>
-    <string name="post_settings_featured_image">Wêneya Bijarde</string>
+    <string name="pending_email_change_snackbar">Ji bo navnîşana te ya nû were pejirandin, li girêdana rastandinê ya ji emaila %1$s re hatiye şandin, bitikîne</string>
+    <string name="editor_toast_uploading_please_wait">Tu niha medyayê hildixîne. Ji kerema xwe heta biqede bisekine.</string>
+    <string name="error_refresh_comments_showing_older">Şîrove vê gavê nayên nûkirin - şîroveyên kevn tên nîşandan</string>
+    <string name="post_settings_set_featured_image">Wêneyê bijarde saz bike</string>
+    <string name="post_settings_featured_image">Wêneyê Bijarde</string>
     <string name="email_address">Navnîşana emailê</string>
     <string name="dlg_sure_to_delete_comments">Bila ev şîrove bi awayekî mayînde werin jêbirin?</string>
     <string name="dlg_sure_to_delete_comment">Bila ev şîrove bi awayekî mayînde were jêbirin?</string>
     <string name="mnu_comment_delete_permanently">Jê bibe</string>
     <string name="mnu_comment_untrash">Vegerîne</string>
     <string name="comment_deleted_permanently">Şîrove hat jêbirin</string>
-    <string name="comments_empty_list_filtered_spam">Şîroveyên nexwestî nîn e</string>
+    <string name="comments_empty_list_filtered_spam">Şîroveyên spam tune ye</string>
     <string name="comment_status_all">Hemû</string>
     <string name="could_not_load_page">Rûpel nayê barkirin</string>
     <string name="off">Girtî</string>
     <string name="interface_language">Zimanê Navrûyê</string>
     <string name="about_the_app">Derbarê sepanê</string>
-    <string name="error_post_account_settings">Sazkariyên ajimêra te nehat tomarkirin</string>
-    <string name="error_fetch_account_settings">Sazkariyên ajimêra te nehat stendin</string>
+    <string name="error_post_account_settings">Sazkariyên hesabê te nehat tomarkirin</string>
+    <string name="error_fetch_account_settings">Sazkariyên hesabê te nehat stendin</string>
     <string name="error_fetch_my_profile">Profîla te nehat stendin</string>
-    <string name="site_settings_unknown_language_code_error">Koda ziman nehat naskirin</string>
-    <string name="site_settings_threading_dialog_description">Destûr bide ku şîrove di nav hev de wek deziyan bêne rêzkirin</string>
-    <string name="site_settings_threading_dialog_header">Hejmara meztirîn yê deziyan</string>
+    <string name="site_settings_unknown_language_code_error">Koda zimên nehat naskirin</string>
+    <string name="site_settings_threading_dialog_description">Destûrê bide bila şîrove bi awayê zincîrane bêne rêzkirin.</string>
+    <string name="site_settings_threading_dialog_header">Şîroveyên di zincîreyê de:</string>
     <string name="disabled">Neçalak</string>
-    <string name="search">Lêgerîn</string>
+    <string name="search">Lê bigere</string>
     <string name="remove">Rake</string>
-    <string name="site_settings_image_original_size">Mezinahiya Resen</string>
-    <string name="privacy_private">Malpera te tenê ji bo te û bikarhênerên ku te pejirandî ye xuya ye</string>
-    <string name="privacy_public_not_indexed">Malpera te ji her kesî re tê xuyan lê ji motorên lêgerînê daxwaz dike ku ew neyê navnîşkirin</string>
-    <string name="privacy_public">Malpera te ji her kesî re tê xuyan û dibe ku hatibe navnîşkirin ji aliyê motorên lêgerînan ve</string>
+    <string name="site_settings_image_original_size">Mezinahiya Orijînal</string>
+    <string name="privacy_private">Malpera te tenê ji bo te û bikarhênerên ku te pejirandine re xuyanbar e</string>
+    <string name="privacy_public_not_indexed">Malpera te ji her kesî re xuyanbar e lê ji motorên lêgerînê daxwaze ku wê îndeks neke</string>
+    <string name="privacy_public">Malpera te ji her kesî re xuyanbar e û ji aliyê motorên lêgerînê ve dikare bê îndekskirin</string>
     <string name="about_me_hint">Çend gotin di derbarê te de…</string>
     <string name="about_me">Derbarê min de</string>
-    <string name="public_display_name_hint">Ger nehatibe sazandin, navê berdest wê bibe navê jixweber</string>
-    <string name="public_display_name">Navê xuyabûnê ya giştî</string>
+    <string name="public_display_name_hint">Heke neyê sazkirin, ew ê navê xuya bi bixweberî bibe navê bikarhêner</string>
+    <string name="public_display_name">Navê nîşandanê yê giştî</string>
     <string name="last_name">Paşnav</string>
     <string name="first_name">Nav</string>
     <string name="my_profile">Profîla Min</string>
-    <string name="cd_related_post_preview_image">Risma pêşdîtina şandiyê ya eleqedar</string>
-    <string name="error_post_remote_site_settings">Nebû ku agahiyên malperê qeyd bike</string>
-    <string name="error_fetch_remote_site_settings">Nikare agahiyên malparê werbigire.</string>
+    <string name="cd_related_post_preview_image">Wêneyê pêşdîtina şandiya têkildar</string>
+    <string name="error_post_remote_site_settings">Agahiyên malperê nehat tomarkirin</string>
+    <string name="error_fetch_remote_site_settings">Agahiyên malperê nehat standin</string>
     <string name="site_settings_close_after_dialog_switch_text">Bi otomatîkî bigire</string>
-    <string name="site_settings_close_after_dialog_description">Şiroveyên ser gotaran bi otomatîkî bigire</string>
-    <string name="site_settings_paging_dialog_description">Zincîreyên şiroveyan li nava rûpelên pirhejmar belav bike</string>
-    <string name="site_settings_paging_dialog_header">Şiroveyên bo her rûpelek</string>
+    <string name="site_settings_close_after_dialog_description">Şîroveyên li ser gotaran bixweber bigire.</string>
+    <string name="site_settings_paging_dialog_description">Zincîreyên şîroveyan di nav gelek rûpelan de dabeş bike.</string>
+    <string name="site_settings_paging_dialog_header">Serê rûpelê şîrove</string>
     <string name="site_settings_close_after_dialog_title">Şirovekirinê bigire</string>
-    <string name="site_settings_blacklist_description">Gava şiroveyek di naverok, nav, URL, e-name, an jî IPya xwe de yek ji van peyvan bihewîne, wê ew wek nexwestî (spam) were nîşankirin. Tu dikarî peyvên qismî têkevî, wek \"press\", wê ew bibe \"Wordpress\".</string>
-    <string name="site_settings_hold_for_moderation_description">Gava şiroveyek di naverok, nav, URL, e-name, an jî IPya xwe de yek ji van peyvan bihewîne, wê ew şirove bigirin nav dûvika teftîşê. Tu dikarî peyvên qismî têkevî, wek \"press\", wê ew bibe \"Wordpress\".</string>
-    <string name="site_settings_list_editor_input_hint">Peyvekê an jî gotinekê têxîne</string>
+    <string name="site_settings_hold_for_moderation_description">Dema ku di naverok, nav, URL, email, an jî IP\'ya şîroveyekê de ji van peyvan yek hebe, ew şîrovê ew ê têkeve dora kontrolê. Tu dikarî peyvên parçeyî têkevî, mînak peyva \"press\"ê, ew ê bi \"Wordpress\"ê re hevberî hev bibe.</string>
+    <string name="site_settings_list_editor_input_hint">Peyvekê an jî gotinekê bikevê</string>
     <string name="site_settings_list_editor_no_items_text">Hêman nîn e</string>
-    <string name="site_settings_learn_more_caption">Tu dikarî van sazkariyan ji bo şandiyên taybet bêhukm bikî</string>
+    <string name="site_settings_learn_more_caption">Tu dikarî van sazkariyan ji bo şandiyên taybet nederbasdar bikî.</string>
     <string name="site_settings_rp_preview3_site">di \"Bilindkirin\"ê de</string>
-    <string name="site_settings_rp_preview3_title">Nîvenda Bilindkirinê: Videopress ji bo Zewacan</string>
-    <string name="site_settings_rp_preview2_site">di \"Sepan\"ê de</string>
-    <string name="site_settings_rp_preview2_title">Sepana WordPressê ya bo Androîdan Ji Aliyê Xuyaniyê ve Gelekî Bi Pêş Ket</string>
+    <string name="site_settings_rp_preview3_title">Xala(focus) Bilindkirinê: Videopress ji bo Zewacan</string>
+    <string name="site_settings_rp_preview2_site">di \"Sepanan\" de</string>
+    <string name="site_settings_rp_preview2_title">WordPress ji bo Androidê ji aliyê xuyaniyê ve gelekî bi pêş ket</string>
     <string name="site_settings_rp_preview1_site">di \"Mobîl\"ê de</string>
-    <string name="site_settings_rp_preview1_title">Hildemandina Mezin ya iPhone/iPadê Vêga Hazir e</string>
+    <string name="site_settings_rp_preview1_title">Hildemandina mezin a iPhone/iPadê niha hazir e</string>
     <string name="site_settings_rp_show_images_title">Wêneyan Nîşan Bide</string>
     <string name="site_settings_rp_show_header_title">Sernavê nîşan bide</string>
-    <string name="site_settings_rp_switch_summary">Şandiyên Têkildar di bin şandiyên te de naverokên guncav yên ji malpera te nîşan dide</string>
+    <string name="site_settings_rp_switch_summary">Şandiyên Têkildar di bin şandiyên te de naverokên guncav ji malpera te nîşan dide.</string>
     <string name="site_settings_rp_switch_title">Şandiyên Têkildar Nîşan Bide</string>
-    <string name="site_settings_blacklist_hint">Şîroveyên li parzûnekê tên wek nexwestî tên nîşankirin</string>
-    <string name="site_settings_moderation_hold_hint">Şîroveyên li parzûnekê tên ji bo venêrînê dikevin dorê</string>
-    <string name="site_settings_multiple_links_hint">Ji bo bikarînerên nas guh nede limîta hejmara girêdanan</string>
-    <string name="site_settings_whitelist_hint">Nivîskarê şiroveyê divê xwedî şiroveyeke ji berê de pejirandî be</string>
-    <string name="site_settings_user_account_required_hint">Ji bo şirove bikin divê bikarîner tomarkirî û têketî bin</string>
-    <string name="site_settings_identity_required_hint">Nivîskarê şîroveyê divê navê xwe û e-peyama xwe binivîse</string>
-    <string name="site_settings_paging_hint">Şiroveyan di komikên hejmara wan diyarkirî de nîşan bide</string>
-    <string name="site_settings_threading_hint">Heta radeyeke diyar destûr bide şiroveyên di nav hev de</string>
-    <string name="site_settings_sort_by_hint">Rêza nîşandana şiroveyan diyar dike</string>
-    <string name="site_settings_close_after_hint">Piştî demeke diyar rê nede şiroveyan</string>
-    <string name="site_settings_receive_pingbacks_hint">Destûr bide danezanên girêdanê yên ji blogên din</string>
-    <string name="site_settings_send_pingbacks_hint">Ji bo agahdarkirina blogên di gotarê de hatine girêdan hewl bide </string>
-    <string name="site_settings_allow_comments_hint">Bihêle xwîner şirove bişînin</string>
-    <string name="site_settings_discussion_hint">Sazkariyên gotûbêjê yên malpera xwe nîşan bide û biguherîne</string>
-    <string name="site_settings_more_hint">Hemû sazkariyên berdest yên Gotûbêjê nîşan bide</string>
-    <string name="site_settings_related_posts_hint">Nîşan bide an biveşêre şandiyên eleqedar di xwînerê de</string>
-    <string name="site_settings_image_width_hint">Mezinahiya wêneyên di şandiyê de dike bi qasî vê mezinahiyê</string>
-    <string name="site_settings_format_hint">Sazkariyên dirûva şandiyên nû</string>
-    <string name="site_settings_category_hint">Sazkariyên kategoriya şandiyên nû</string>
-    <string name="site_settings_password_hint">Pêborîna xwe bigherîne</string>
-    <string name="site_settings_username_hint">Ajimêra bikarhêner ya derbasdar</string>
+    <string name="site_settings_moderation_hold_hint">Şîroveyên ku bi fîltreyê re hevber dibin dikevin dora kontrolê</string>
+    <string name="site_settings_multiple_links_hint">Ji bikarhênerên naskirî re sînorê girêdanê paşguh dike</string>
+    <string name="site_settings_user_account_required_hint">Ji bo şîrovekirinê divê bikarhêner tomar bibin û têketînê bikin</string>
+    <string name="site_settings_identity_required_hint">Divê nivîskarê şîroveyê nav û e-mailê dagire</string>
+    <string name="site_settings_paging_hint">Şîroveyan di parçeyên mezinahiya diyarkirî de nîşan bide</string>
+    <string name="site_settings_threading_hint">Heta radeyeke diyar destûrê bide şîroveyên di nav hev de</string>
+    <string name="site_settings_sort_by_hint">Rêza nîşandana şîroveyan diyar dike</string>
+    <string name="site_settings_close_after_hint">Piştî dema diyarkirî rê nede şîroveyan</string>
+    <string name="site_settings_receive_pingbacks_hint">Destûrê bide danezanên girêdanê yên ji blogên din</string>
+    <string name="site_settings_send_pingbacks_hint">Hewl bide blogeke têkildarî gotarê agahdar bike</string>
+    <string name="site_settings_allow_comments_hint">Bihêle bila xwîner şîroveyan bişînin</string>
+    <string name="site_settings_discussion_hint">Sazkariyên gotûbêjê yên malpera xwe bibîne û biguherîne</string>
+    <string name="site_settings_more_hint">Hemû sazkariyên Gotûbêjê yên berdest bibîne</string>
+    <string name="site_settings_related_posts_hint">Di xwînerê de şandiyên têkildar nîşan bide an jî veşêre</string>
+    <string name="site_settings_image_width_hint">Mezinahiya wêneyên di şandiyê de dike bi qasî vê firehiyê</string>
+    <string name="site_settings_format_hint">Formata şandiya nû saz dike</string>
+    <string name="site_settings_category_hint">Kategoriya şandiya nû saz dike</string>
+    <string name="site_settings_password_hint">Pêborîna xwe biguherîne</string>
+    <string name="site_settings_username_hint">Hesabê bikarhêner ê niha</string>
     <string name="site_settings_language_hint">Zimanê sereke yê ev blog pê hatiye nivîsîn</string>
-    <string name="site_settings_privacy_hint">Kontrol dike ku kî dikare malpera te bibîne</string>
+    <string name="site_settings_privacy_hint">Kesên dikarin malpera te bibînin kontrol dike</string>
     <string name="site_settings_address_hint">Guherandina navnîşana te vê gavê nayê piştgirîkirin</string>
-    <string name="site_settings_tagline_hint">Danasîneke kurt an gotineke cazib yê ku bloga te dide naskirin</string>
-    <string name="site_settings_title_hint">Bi hin peyvan, îzah bike ku ev malper derbarê çi de ye</string>
-    <string name="site_settings_whitelist_known_summary">Şîroveyên ji bikarhênerên nas</string>
-    <string name="site_settings_whitelist_all_summary">Şîroveyên ji hemû bikarhêneran</string>
-    <string name="site_settings_threading_summary">asta %d </string>
+    <string name="site_settings_tagline_hint">Raveyeke kurt an jî hevokek balkêş ji bo danasîna bloga te</string>
+    <string name="site_settings_title_hint">Bi çend gotinan rave bike ka ev malper li ser çi ye</string>
+    <string name="site_settings_threading_summary">asta %d</string>
     <string name="site_settings_privacy_private_summary">Taybet</string>
     <string name="site_settings_privacy_hidden_summary">Veşartî</string>
-    <string name="site_settings_privacy_public_summary">Giştî</string>
+    <string name="site_settings_privacy_public_summary">Gelerî</string>
     <string name="site_settings_delete_site_title">Malperê jê bibe</string>
-    <string name="site_settings_blacklist_title">Reşlîste</string>
-    <string name="site_settings_moderation_hold_title">Bisekinîne bo Kontrolê</string>
+    <string name="site_settings_moderation_hold_title">Ji bo kontrolê bihêle</string>
     <string name="site_settings_multiple_links_title">Girêdanên di şîroveyan de</string>
-    <string name="site_settings_whitelist_title">Otomatîk bipejirîne</string>
     <string name="site_settings_paging_title">Rûpelkirin</string>
     <string name="site_settings_threading_title">Zincîrkirin</string>
     <string name="site_settings_sort_by_title">Rêz bike</string>
     <string name="site_settings_account_required_title">Divê bikarhêneran têketin kiribin</string>
-    <string name="site_settings_identity_required_title">Divê epeyam û nav vehewîne</string>
-    <string name="site_settings_receive_pingbacks_title">\"Pingback\"an werbigire</string>
-    <string name="site_settings_send_pingbacks_title">\"Pingback\"an bişîne</string>
-    <string name="site_settings_allow_comments_title">Destûr bide şîroveyan</string>
-    <string name="site_settings_default_format_title">Dirûva Jixweberî</string>
+    <string name="site_settings_identity_required_title">Divê nav û emailê vehewîne</string>
+    <string name="site_settings_receive_pingbacks_title">Paşragihandinê Bistîne</string>
+    <string name="site_settings_send_pingbacks_title">Paşragihandinê Bişîne</string>
+    <string name="site_settings_allow_comments_title">Destûrê bide şîroveyan</string>
+    <string name="site_settings_default_format_title">Formata Jixweberî</string>
     <string name="site_settings_default_category_title">Kategoriya Jixweberî</string>
     <string name="site_settings_address_title">Navnîşan</string>
     <string name="site_settings_tagline_title">Rêza etîketê</string>
     <string name="site_settings_title_title">Sernavê Malperê</string>
-    <string name="site_settings_discussion_new_posts_header">Ji bo şandiyên nû jixweberî</string>
+    <string name="site_settings_discussion_new_posts_header">Jixweberiyên ji bo şandiyên nû</string>
     <string name="site_settings_writing_header">Nivîsîn</string>
     <string name="site_settings_account_header">Hesab</string>
     <string name="site_settings_general_header">Giştî</string>
@@ -2083,134 +1999,133 @@ Language: ku_TR
     <string name="comments">Şîrove</string>
     <string name="related_posts">Şandiyên Têkildar</string>
     <string name="privacy">Nihênî</string>
-    <string name="discussion">Nîqaş</string>
-    <string name="media_error_no_permission_upload">Destûra te nîn e ji bo hilxistina medyayê ya li malperê</string>
+    <string name="discussion">Gotûbêj</string>
+    <string name="media_error_no_permission_upload">Ji bo tu medyayê li malperê hilxîne destûra te tune ye</string>
     <string name="unknown">Nenas</string>
     <string name="never">Oet</string>
-    <string name="reader_err_get_post_not_found">Ev şandî êdî ne berdest e</string>
-    <string name="reader_err_get_post_not_authorized">Bo xuyakirina vê şandiyê destûra te tune</string>
-    <string name="reader_err_get_post_generic">Ev nivîs cardin nayê anîn</string>
-    <string name="reader_empty_followed_blogs_no_recent_posts_description">Malperên tu dişopîne di vê dawiyê de ti şandî nekirine</string>
-    <string name="reader_empty_followed_blogs_no_recent_posts_title">Nivîsên nû tune</string>
+    <string name="reader_err_get_post_not_found">Êdî ev şandî ne berdest e</string>
+    <string name="reader_err_get_post_not_authorized">Ji bo tu vê şandiyê bibînî destûra te tune ye</string>
+    <string name="reader_err_get_post_generic">Ev şandî nayê anîn</string>
+    <string name="reader_empty_followed_blogs_no_recent_posts_description">Malperên tu dişopînî di demên dawîn de ti şandî neweşandine</string>
+    <string name="reader_empty_followed_blogs_no_recent_posts_title">Şandiyên nû tune ye</string>
     <string name="media_edit_copy_url_toast">URL li rûnûsgehê hat kopîkirin</string>
     <string name="selected_theme">Rûkara Hilbijartî</string>
-    <string name="could_not_load_theme">Rûkar nayê hilbarkirin</string>
-    <string name="theme_activation_error">Hinek tişt çewt çû. Rûkar nayê çalakkirin.</string>
-    <string name="theme_by_author_prompt_append">ji aliyê %1$s</string>
-    <string name="theme_prompt">Ji bo bijartina %1$s spas</string>
+    <string name="could_not_load_theme">Rûkar nayê barkirin</string>
+    <string name="theme_activation_error">Hinek çewtî derketin. Rûkar nayê çalakkirin</string>
+    <string name="theme_by_author_prompt_append"> ji hêla %1$s ve</string>
+    <string name="theme_prompt">Spas ji bo bijartina %1$s\'ê</string>
     <string name="theme_manage_site">MALPERÊ BI RÊ VE BIBE</string>
     <string name="theme_done">QEDIYA</string>
     <string name="theme_support">Piştgirî</string>
     <string name="theme_details">Hûrgilî</string>
     <string name="theme_view">Xuyang</string>
-    <string name="theme_try_and_customize">Biceribîne &amp; Kesane Bike</string>
-    <string name="theme_activate">Çalak bike</string>
-    <string name="active">Çalak</string>
+    <string name="theme_try_and_customize">Biceribîne &amp; Taybet Bike</string>
+    <string name="theme_activate">Biçalakîne</string>
+    <string name="active">Biçalakîne</string>
     <string name="support">Piştgirî</string>
     <string name="details">Hûrgilî</string>
-    <string name="customize">Kesanekirin</string>
+    <string name="customize">Taybet bike</string>
     <string name="current_theme">Rûkara Derbasdar</string>
-    <string name="page_updated">Rûpel hate hildemandin</string>
-    <string name="post_updated">Şandî hate hildemandin</string>
-    <string name="page_published">Rûpel hate weşandin</string>
-    <string name="post_published">Şandî hate weşandin</string>
+    <string name="page_updated">Rûpel hat hildemandin</string>
+    <string name="post_updated">Şandî hat hildemandin</string>
+    <string name="page_published">Rûpel hat weşandin</string>
+    <string name="post_published">Şandî hat weşandin</string>
     <string name="theme_no_search_result_found">Bibore, rûkar nehatin dîtin.</string>
-    <string name="reader_label_gap_marker">Şandiyên bêhtir bar bike</string>
-    <string name="notifications_no_search_results">\'%s\' û tu malper nehat li hev</string>
+    <string name="reader_label_gap_marker">Şandiyên zêdetir bar bike</string>
+    <string name="notifications_no_search_results">\'%s\' û ti malper hevber nebûn</string>
     <string name="search_sites">Li malperan bigere</string>
-    <string name="notifications_empty_view_reader">Biçe Xwînerê</string>
-    <string name="notifications_empty_action_followers_likes">Ji bîr neke: şandiyên hatine xwendin şîrove bike</string>
-    <string name="notifications_empty_action_comments">Beşdarî gotûbêjekê bibe: şandiyên blogan şîrove bike</string>
+    <string name="notifications_empty_view_reader">Here Xwînerê</string>
+    <string name="notifications_empty_action_followers_likes">Ji bîr neke: şandiyên ku te xwendine şîrove bike</string>
+    <string name="notifications_empty_action_comments">Beşdarî gotûbêjan bibe: şandiyên blogan şîrove bike</string>
     <string name="notifications_empty_action_unread">Gotûbêjan gûr bike: şandiyeke nû binivîse</string>
-    <string name="notifications_empty_action_all">Çalak be! Li şandiyên di blogên tu dişopîne de şîrove bike </string>
-    <string name="notifications_empty_comments">Hîn ti şîrove tune ne</string>
+    <string name="notifications_empty_action_all">Çalak be! Li şandiyên di blogên tu dişopînî de şîrove bikî.</string>
+    <string name="notifications_empty_comments">Hîn ti şîrove tune ye</string>
     <string name="notifications_empty_unread">Hemû hildem in!</string>
     <string name="reader_short_comment_count_multi">%s Şîrove</string>
     <string name="reader_short_comment_count_one">Şîroveyek</string>
-    <string name="reader_hint_comment_on_post">Şandiyê bibersivîne</string>
-    <string name="reader_discover_visit_blog">Serdana %s bike</string>
-    <string name="reader_discover_attribution_blog">Eslen li ser %s hate weşandin</string>
-    <string name="reader_discover_attribution_author">Eslen ji aliyê %s ve hate weşandin</string>
-    <string name="reader_discover_attribution_author_and_blog">Eslen ji aliyê %1$s ve li ser %2$s hate weşandin</string>
+    <string name="reader_hint_comment_on_post">Şandiyê bibersivîne…</string>
+    <string name="reader_discover_visit_blog">Serdana %s\'ê bike</string>
+    <string name="reader_discover_attribution_blog">Bi awayekî orijînal li %s\'ê hat weşandin</string>
+    <string name="reader_discover_attribution_author">Bi orijînalî ji aliyê %s ve hat weşandin</string>
+    <string name="reader_discover_attribution_author_and_blog">Bi orijînalî ji aliyê %1$s ve li %2$s\'ê hate weşandin</string>
     <string name="reader_short_like_count_multi">%s Ecibandin</string>
     <string name="reader_short_like_count_one">Ecibandinek</string>
     <string name="reader_short_like_count_none">Biecibîne</string>
     <string name="reader_label_follow_count">%,d Şopîner</string>
     <string name="reader_menu_tags">Malper û etîketan sererast bike</string>
     <string name="reader_title_post_detail">Şandiya Xwînerê</string>
-    <string name="notifications_push_summary">Sazkariyên bo danezanên ku li ser amûra te tê xuyan</string>
-    <string name="notifications_email_summary">Sazkariyên ji bo danezanên ku ji epeyama te ya girêdayî hesaba te hatiye şandin</string>
-    <string name="notifications_tab_summary">Sazkariyên danezanan ên di hilpeka Danezanan de dixuyin.</string>
+    <string name="notifications_push_summary">Sazkariyên ji bo danezanên ku li cîhaza te tê xuyan.</string>
+    <string name="notifications_email_summary">Danezanên sazkariyê ji bo epeyama te ya girêdayî hesabê te re hatin şandin.</string>
+    <string name="notifications_tab_summary">Sazkariyên ji bo danezanan di hilpeka Danezanan de dixuyin.</string>
     <string name="notifications_disabled">Danezanên sepanê hatin neçalakkirin. Bitepîne vir ji bo çalakkirina wan di Sazkariyan de</string>
     <string name="notification_types">Cûreyên Danezanan</string>
-    <string name="error_loading_notifications">Sazkariyên danezana nehat barkirin</string>
+    <string name="error_loading_notifications">Sazkariyên danezanan nehat barkirin</string>
     <string name="comment_likes">Ecibandinên şîroveyê</string>
-    <string name="app_notifications">Danezanên Sepanê</string>
-    <string name="email">Emaîl</string>
+    <string name="app_notifications">Danezanên sepanê</string>
+    <string name="email">Email</string>
     <string name="notifications_tab">Hilpeka danezanan</string>
-    <string name="notification_settings_item_other_account_emails_summary">Em ê hertim epeyamên girîng bişînin te yên derbarê ajimêra te de, lê belê tu yê karibî hin zêdekên alîkar jî werbigirî.</string>
-    <string name="stats_insights_latest_post_summary">Kurteya Şandiya dawî</string>
-    <string name="connectionbar_no_connection">Girêdan tune</string>
-    <string name="post_trashed">Şande hate şandin jêbirdankê</string>
-    <string name="button_trash">Bavêje jêbirdankê</string>
+    <string name="notification_settings_item_other_account_emails_summary">Em ê her tim emailên girîng ên têkildarî hesabê te ji te re bişînin, tu dikarî pê re hin naverokên alîkar jî werbigirî.</string>
+    <string name="stats_insights_latest_post_summary">Kurteya Şandiya Dawî</string>
+    <string name="connectionbar_no_connection">Înternet tune ye</string>
+    <string name="post_trashed">Şandî çû jêbirdankê</string>
+    <string name="button_trash">Jêbirdank</string>
     <string name="button_stats">Amar</string>
     <string name="button_preview">Pêşdîtin</string>
     <string name="button_view">Bibîne</string>
     <string name="button_publish">Biweşîne</string>
     <string name="button_edit">Sererast bike</string>
-    <string name="reader_toast_err_follow_blog_not_authorized">Bo gihîna vê malperê destura te tune</string>
+    <string name="reader_toast_err_follow_blog_not_authorized">Ji bo tu xwe bigihînî vê malperê destura te tune ye</string>
     <string name="reader_toast_err_follow_blog_not_found">Ev malper nehat dîtin</string>
     <string name="undo">Vegerîne</string>
-    <string name="push_auth_expired">Daxwaza te demborî bû. Ji bo ku cardin biceribînî têkeve WordPress.comê.</string>
+    <string name="push_auth_expired">Dema daxwazê qediya. Ji bo ku dîsa biceribînî têkeve WordPress.com\'ê.</string>
     <string name="ignore">Piştguh bike</string>
-    <string name="stats_insights_best_ever">Dîtinên Çêtirîn ya Heya Vêga</string>
-    <string name="stats_insights_today">Rêjejimarên Îro</string>
-    <string name="stats_insights_all_time">Şandî, dîtin û serlêderên bo hemû deman</string>
+    <string name="stats_insights_best_ever">Dîtinên herî baş - heta niha</string>
+    <string name="stats_insights_today">Amarên Îro</string>
+    <string name="stats_insights_all_time">Şandî, dîtin û mêvanên hemû deman</string>
     <string name="stats_insights">Kûrbînî</string>
-    <string name="me_disconnect_from_wordpress_com">Ji WordPress.comê derkeve</string>
-    <string name="me_connect_to_wordpress_com">Têketinê di WordPress.com de bike</string>
+    <string name="me_disconnect_from_wordpress_com">Ji WordPress.com\'ê derkeve</string>
+    <string name="me_connect_to_wordpress_com">Têkeve WordPress.com\'ê</string>
     <string name="me_btn_login_logout">Têketin/Derketin</string>
     <string name="me_btn_support">Alîkarî &amp; Piştgirî</string>
     <string name="account_settings">Sazkariyên Hesêb</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" nehate veşartin çimkî ew malpera berdest e</string>
-    <string name="site_picker_create_wpcom">Malpera WordPress.com Biafirîne</string>
-    <string name="site_picker_add_self_hosted">Malpereke xwe-hewander tevlî bike</string>
-    <string name="site_picker_add_site">Malpera nû tevlê bike</string>
-    <string name="site_picker_edit_visibility">Maperan nîşan bide/veşêre</string>
-    <string name="site_picker_title">Malper hilbijêre</string>
+    <string name="site_picker_cant_hide_current_site">\"%s\" nehat veşartin ji ber ku ew malpera niha ye</string>
+    <string name="site_picker_create_wpcom">Malpera WordPress.com\'ê biafirîne</string>
+    <string name="site_picker_add_self_hosted">Malpereke xwe-hewan tevlî bike</string>
+    <string name="site_picker_add_site">Malpera nû tevlî bike</string>
+    <string name="site_picker_edit_visibility">Maperan veşêre/nîşan bide</string>
+    <string name="site_picker_title">Malperê hilbijêre</string>
     <string name="my_site_btn_view_site">Malperê Bîbîne</string>
     <string name="my_site_btn_view_admin">Revebir Bibîne</string>
     <string name="my_site_btn_switch_site">Malperê Biguherîne</string>
     <string name="my_site_btn_site_settings">Sazkarî</string>
     <string name="my_site_btn_blog_posts">Şandiyên Blogê</string>
     <string name="my_site_header_publish">Biweşîne</string>
-    <string name="my_site_header_look_and_feel">Xuyanî û Şêwaz</string>
+    <string name="my_site_header_look_and_feel">Xuyang û Şêwaz</string>
     <string name="my_site_header_configuration">Pevsazî</string>
-    <string name="reader_label_new_posts_subtitle">Bo nîşandanê bitepîne</string>
-    <string name="deselect_all">Temamiya bijartinan rake</string>
-    <string name="select_all">Teva bijêre</string>
+    <string name="reader_label_new_posts_subtitle">Ji bo wan nîşan bide, bitikîne</string>
+    <string name="deselect_all">Hemû bijartinan rake</string>
+    <string name="select_all">Hemûyan hilbijêre</string>
     <string name="hide">Veşêre</string>
     <string name="show">Nîşan bide</string>
-    <string name="auth_required">Bo domandinê dîsa têkevê</string>
-    <string name="invalid_verification_code">Koda rastandinê ya nederbasdar</string>
+    <string name="auth_required">Ji bo dewamkirinê, dîsa têkeve.</string>
+    <string name="invalid_verification_code">Koda rastandinê nederbasdar e</string>
     <string name="verification_code">Koda rastandinê</string>
     <string name="language">Ziman</string>
-    <string name="reader_empty_posts_request_failed">Nikare şandiyan cardin bîne</string>
+    <string name="reader_empty_posts_request_failed">Şandî nayên vegerandin</string>
     <string name="publisher">Weşanger:</string>
     <string name="error_notification_open">Danezan nehat vekirin</string>
-    <string name="stats_search_terms_unknown_search_terms">Têgehên Lêgerînê yên Nenas</string>
-    <string name="stats_view_search_terms">Têgehên Lêgerînê</string>
+    <string name="stats_search_terms_unknown_search_terms">Têgihên Lêgerînê yên Nenas</string>
+    <string name="stats_view_search_terms">Têgihên Lêgerînê</string>
     <string name="stats_view_authors">Nivîskar</string>
     <string name="comments_fetching">Şîrove tên stendin…</string>
-    <string name="pages_fetching">Rûpel tên stendin</string>
+    <string name="pages_fetching">Şandî tên stendin…</string>
     <string name="posts_fetching">Şandî tên stendin…</string>
     <string name="media_fetching">Medya tê stendin…</string>
     <string name="logs_copied_to_clipboard">Tomarên sepanê li rûnûsgehê hatin kopîkirin</string>
     <string name="reader_empty_posts_in_blog">Ev malper vala ye</string>
     <string name="reader_label_new_posts">Şandiyên nû</string>
-    <string name="reader_page_recommended_blogs">Malperên dibe ku tu biecibîne</string>
     <string name="error_copy_to_clipboard">Dema nivîs li rûnûsgehê dihat kopîkirin çewtî pêk hat</string>
-    <string name="post_uploading">Şandî tê hilbarkirin</string>
+    <string name="post_uploading">Şandî tê hilxistin</string>
     <string name="stats_followers_years">%1$d sal</string>
     <string name="stats_followers_a_year">Salek</string>
     <string name="stats_followers_months">%1$d meh</string>
@@ -2221,11 +2136,11 @@ Language: ku_TR
     <string name="stats_followers_an_hour_ago">berî demjimêrekê</string>
     <string name="stats_followers_minutes">%1$d xulek</string>
     <string name="stats_followers_a_minute_ago">berî xulekekê</string>
-    <string name="stats_followers_seconds_ago">çirke berê</string>
+    <string name="stats_followers_seconds_ago">saniye berê</string>
     <string name="stats_view_followers">Şopîner</string>
-    <string name="stats_view_publicize">Bangewazî</string>
+    <string name="stats_view_publicize">Belavok</string>
     <string name="stats_view_videos">Vîdyo</string>
-    <string name="stats_view_top_posts_and_pages">Şandî û Rûpel</string>
+    <string name="stats_view_top_posts_and_pages">Şandî &amp; Rûpel</string>
     <string name="stats_view_countries">Welat</string>
     <string name="stats_likes">Ecibandin</string>
     <string name="stats_visitors">Mêvan</string>
@@ -2234,97 +2149,96 @@ Language: ku_TR
     <string name="themes_fetching">Rûkar tên stendin…</string>
     <string name="ssl_certificate_details">Hûrgilî</string>
     <string name="cab_selected">%d hilbijartî</string>
-    <string name="browse_our_faq_button">Çav li rûpela PPP bigerîne</string>
-    <string name="reader_empty_comments">Hîn ti şîrove tune ne</string>
-    <string name="reader_empty_posts_in_tag">Ti şandiyeke tine bi vê nîşankê</string>
+    <string name="browse_our_faq_button">Rûpela me ya PPP bibîne</string>
+    <string name="reader_empty_comments">Hîn ti şîrove tune ye</string>
+    <string name="reader_empty_posts_in_tag">Ti şandiyên eleqedarî vê mijarê tune ye</string>
     <string name="reader_label_like">Biecibîne</string>
-    <string name="reader_label_view_original">Gotara resen bixwîne</string>
+    <string name="reader_label_view_original">Gotara orijînal bixwîne</string>
     <string name="reader_label_comments_closed">Şîrove hatin girtin</string>
     <string name="reader_title_photo_viewer">%1$d / %2$d</string>
-    <string name="error_publish_empty_post">Nikare biweşîne şandiyeke vala</string>
-    <string name="error_refresh_unauthorized_posts">Ji bo dîtin an jî serastkirina şandiyan destûra te nîn e</string>
-    <string name="error_refresh_unauthorized_pages">Ji bo dîtin an jî serastkirina rûpelan destûra te nîn e</string>
-    <string name="error_refresh_unauthorized_comments">Destûra te nîn e ji bo dîtin an sererastkirina şîroveyan</string>
-    <string name="more">Bêhtir</string>
+    <string name="error_publish_empty_post">Şandiya vala nayê weşandin</string>
+    <string name="error_refresh_unauthorized_posts">Ji bo dîtin an jî sererastkirina şandiyan destûra te nîn e</string>
+    <string name="error_refresh_unauthorized_pages">Ji bo dîtin an jî sererastkirina rûpelan destûra te nîn e</string>
+    <string name="error_refresh_unauthorized_comments">Ji bo dîtin an jî sererastkirina şîroveyan destûra te nîn e</string>
+    <string name="more">Zêdetir</string>
     <string name="older_month">Ji mehekê kevintir</string>
     <string name="older_last_week">Ji hefteyekê kevintir</string>
     <string name="older_two_days">Ji 2 rojan kevintir</string>
-    <string name="mnu_comment_liked">Ecibandî</string>
+    <string name="mnu_comment_liked">Hat ecibandin</string>
     <string name="comment">Şîrove bike</string>
-    <string name="comment_trashed">Şîrove hate jêbirin.</string>
-    <string name="comment_reply_to_user">Vê %s bibersivîne</string>
-    <string name="posts_empty_list">Hêj ti şandiyek tine ye. Çima yek çênakî?</string>
-    <string name="signing_out">Derdikeve…</string>
-    <string name="reader_toast_err_generic">Nikare vê çalakiyê bi cîh bîne</string>
-    <string name="reader_toast_err_block_blog">Nikare vê malperê asteng bike</string>
-    <string name="reader_toast_blog_blocked">Şandiyên ji vê malperê wê êdî neyên nîşandan</string>
+    <string name="comment_trashed">Şîrove betal bû</string>
+    <string name="comment_reply_to_user">Vêya %s bibersivîne</string>
+    <string name="posts_empty_list">Hîn ti şandî tune ye. Ka em şandiyekê çêkin?</string>
+    <string name="signing_out">Tê derketin…</string>
+    <string name="reader_toast_err_generic">Ev çalakî nayê pêkanîn</string>
+    <string name="reader_toast_err_block_blog">Ev malper nayê astengkirin</string>
+    <string name="reader_toast_blog_blocked">Şandiyên ji vê malperê êdî ew ê neyên nîşandan</string>
     <string name="reader_menu_block_blog">Vê malperê asteng bike</string>
     <string name="schedule_verb">Demsaz bike</string>
-    <string name="update_verb">Bihildemîne</string>
-    <string name="reader_empty_recommended_blogs">Malperên pêşniyarkirî nîn in</string>
-    <string name="reader_toast_err_unfollow_blog">Nikare dev ji şopa vê malperê berde</string>
-    <string name="reader_toast_err_follow_blog">Nkare vê malperê bişopîne</string>
+    <string name="update_verb">Hildemîne</string>
+    <string name="reader_empty_recommended_blogs">Malperên pêşniyarkirî tune ye</string>
+    <string name="reader_toast_err_unfollow_blog">Ji şopandina vê malperê nayê derketin</string>
+    <string name="reader_toast_err_follow_blog">Ev malper nayê şopandin</string>
     <string name="reader_toast_err_already_follow_blog">Jixwe tu vê malperê dişopînî</string>
     <string name="reader_toast_err_get_blog_info">Ev malper nayê nîşandan</string>
     <string name="reader_label_followed_blog">Malper hat şopandin</string>
-    <string name="reader_hint_add_tag_or_url">Ji bo şopandinê URL an etîketekê binivîse</string>
+    <string name="reader_hint_add_tag_or_url">Ji bo şopandinê URL an jî mijarekê bikevê</string>
     <string name="reader_page_followed_blogs">Malperên şopandî</string>
-    <string name="reader_page_followed_tags">Etîketên şopandî</string>
+    <string name="reader_page_followed_tags">Mijarên şopandî</string>
     <string name="reader_title_blog_preview">Malpera Xwînerê</string>
-    <string name="ssl_certificate_ask_trust">Eger tu bi pirranî bêyî pirsgirêkek karibî werî girêdan li vê malperê, ev dibe ku were maneya yek dixwaze malpera te teqlîd bike, û tu nikaribî dewam bikî. Dîsa jî dixwazî bi sertîfîkayê bawer bibî?</string>
+    <string name="ssl_certificate_ask_trust">Heke tu bi piranî bêyî ti pirsgirêkê dikevî vê malperê, dibe ku ev çewtî were wateya teqlîdkirina malpera te û divê tu dewam nekî. Dîsa jî tu dixwazî bi sertîfîkayê bawer bibî?</string>
     <string name="ssl_certificate_error">Sertîfîkaya SSL\'ê ya nederbasdar</string>
-    <string name="forgot_password">Te pêborîna xwe wenda kir?</string>
     <string name="help">Alîkarî</string>
     <string name="username_or_password_incorrect">Navê bikarhêner an pêborîn xelet e</string>
-    <string name="email_invalid">Navnîşaneke emailê ya derbasdar têkeve</string>
+    <string name="email_invalid">Navnîşana emaileke derbasdar têkeve</string>
     <string name="invalid_email_message">Navnîşana emaila te nederbasdar e</string>
     <string name="error_downloading_image">Çewtiya daxistina wêneyê</string>
     <string name="error_load_comment">Şîrove nehat barkirin</string>
-    <string name="error_edit_comment">Di sererastkirina şandiyê de çewtiyek qewimî</string>
-    <string name="error_moderate_comment">Di sererastkirinê de çewtiyek qewimî</string>
+    <string name="error_edit_comment">Di sererastkirina şandiyê de çewtiyek derket</string>
+    <string name="error_moderate_comment">Di sererastkirinê de çewtiyek derket</string>
     <string name="error_generic">Çewtiyek derket</string>
     <string name="error_refresh_comments">Vê gavê şîrove nehatin nûkirin</string>
-    <string name="error_refresh_pages">Rûpel nikarin werin nûkirin vê gavê</string>
-    <string name="error_refresh_posts">Şandî nikarin werin nûkirin vê gavê</string>
-    <string name="error_deleting_post">Çewtiyeke rû da gava jêbirina şandiyê</string>
-    <string name="notifications_empty_list">Ti danezanek tine</string>
-    <string name="sdcard_message">Hewcedariya hilxistina medyayê heye ya karteke SDyê ya bicîhkirî</string>
-    <string name="cat_name_required">Qada navê pêwîst e bo beşê</string>
-    <string name="adding_cat_success">Beş bi serkeftî hate tevlîkirin</string>
-    <string name="adding_cat_failed">Tevlîkirina beşê bi ser neket</string>
-    <string name="mnu_comment_unspam">Ne nexwestî</string>
-    <string name="theme_fetch_failed">Bi ser neket ku rûkaran bîne</string>
-    <string name="blog_not_found">Çewtiyeke rû da wextê gihîna vê blogê</string>
-    <string name="gallery_error">Hêmana medyayê nikare were anîn</string>
+    <string name="error_refresh_pages">Rûpel niha nayên nûkirin</string>
+    <string name="error_refresh_posts">Şandî niha nayên nûkirin</string>
+    <string name="error_deleting_post">Di jêbirina şandiyê de çewtiyek derket</string>
+    <string name="notifications_empty_list">Danezan tune</string>
+    <string name="sdcard_message">Ji bo medya were hilxistin SD karta girêdayî pêwîst e</string>
+    <string name="cat_name_required">Navê kategoriyê pêwîst e</string>
+    <string name="adding_cat_success">Kategorî bi serkevtî hat tevlîkirin</string>
+    <string name="adding_cat_failed">Tevlîkirina kategoriyê bi ser neket</string>
+    <string name="mnu_comment_unspam">Ne spam e</string>
+    <string name="theme_fetch_failed">Stendina rûkaran bi ser neket</string>
+    <string name="blog_not_found">Di gihîna vê blogê de çewtiyek derket</string>
+    <string name="gallery_error">Hêmana medyayê nehat vegerandin</string>
     <string name="no_network_message">Toreke berdest nîn e</string>
-    <string name="reader_toast_err_remove_tag">Nikare vê nîşankê rabike</string>
-    <string name="reader_toast_err_add_tag">Nikare vê nîşankê tevlî bike</string>
-    <string name="reader_title_applog">Qeyda sepanê</string>
-    <string name="fatal_db_error">Çewtiyeke rû da wextê çêkirina danegeha sepanê. Jinûvesazkirina sepanê biceribîne.</string>
-    <string name="error_blog_hidden">Ev blog veşartî ye û nikare were barkirin. Ji sazkariyan wê çalak bike û cardin biceribîne.</string>
-    <string name="error_refresh_media">Medya nikare were nûkirin vê gavê</string>
+    <string name="reader_toast_err_remove_tag">Ev mijar nayê rakirin</string>
+    <string name="reader_toast_err_add_tag">Ev mijar nayê tevlîkirin</string>
+    <string name="reader_title_applog">Tomargeha sepanê</string>
+    <string name="fatal_db_error">Dema danegeha sepanê dihat afirandin çewtiyek derket. Sepanê ji nû ve saz bike.</string>
+    <string name="error_blog_hidden">Ev blog veşartî ye û nayê barkirin. Di sazkariyan de wê dîsa çalak bike û dîsa biceribîne.</string>
+    <string name="error_refresh_media">Medya niha nayên nûkirin</string>
     <string name="wordpress_blog">Bloga WordPressê</string>
-    <string name="image_settings">Sazkariyên Wêneya</string>
-    <string name="local_changes">Guherînên xwecihî</string>
-    <string name="privacy_policy">Rênimaya nihêniyê</string>
+    <string name="image_settings">Sazkariyên wêneyê</string>
+    <string name="local_changes">Guhertinên cîgehî</string>
+    <string name="privacy_policy">Polîtîkaya nihêniyê</string>
     <string name="new_media">Medyaya nû</string>
     <string name="new_post">Şandiya nû</string>
-    <string name="notifications_empty_all">Danezan tune…hîna.</string>
-    <string name="http_authorization_required">Destûrdarkirin pêwîste</string>
-    <string name="invalid_site_url_message">Kontrol bike ku URLya têketî derbasdar be</string>
+    <string name="notifications_empty_all">Danezan tune ye…heta niha.</string>
+    <string name="http_authorization_required">Destûrdarkirin pêwîst e</string>
+    <string name="invalid_site_url_message">Derbasdarbûna URL\'ya malperê ya te nivîsiye kontrol bike</string>
     <string name="open_source_licenses">Lîsansên çavkaniya vekirî</string>
-    <string name="file_error_create">Ji bo hilxistina medyayê nikare pelgeya demkî çêbike. Jê bawer be ku ser amûra te têra xwe cihê vala hebe.</string>
+    <string name="file_error_create">Ji bo hilxistina medyayê dosyeya demkî nayê afirandin. Jê bawer be bila di cîhaza te de têra xwe ciyê vala hebe.</string>
     <string name="category_name">Navê kategoriyê</string>
-    <string name="add_new_category">Kategoriya nû tevlê bike</string>
+    <string name="add_new_category">Kategoriya nû tevlî bike</string>
     <string name="view_in_browser">Di gerokê de bibîne</string>
     <string name="remove_account">Malperê rake</string>
-    <string name="toast_comment_unedited">Şîrove nehat guherandin</string>
+    <string name="toast_comment_unedited">Şîrove nehat guhertin</string>
     <string name="content_required">Şîrove pêwîst e</string>
-    <string name="sure_to_cancel_edit_comment">Bila sererastkirina vê şîroveyê were betalkirin?</string>
+    <string name="sure_to_cancel_edit_comment">Sererastkirina vê şîroveyê betal bike?</string>
     <string name="saving_changes">Guhertin tên tomarkirin</string>
     <string name="trash">Jêbirdank</string>
-    <string name="dlg_confirm_trash_comments">Bila biçe jêbirdankê?</string>
-    <string name="dlg_trashing_comments">Diçe jêbirdankê</string>
+    <string name="dlg_confirm_trash_comments">Bişîne jêbirdankê?</string>
+    <string name="dlg_trashing_comments">Dişîne jêbirdankê</string>
     <string name="dlg_spamming_comments">Wekî spam tê nîşankirin</string>
     <string name="dlg_unapproving_comments">Tê redkirin</string>
     <string name="dlg_approving_comments">Tê pejirandin</string>
@@ -2340,48 +2254,48 @@ Language: ku_TR
     <string name="delete_page">Rûpelê jê bibe?</string>
     <string name="delete_post">Şandiyê jê bibe?</string>
     <string name="post_settings">Sazkariyên şandiyê</string>
-    <string name="file_not_found">Ji bo hilxistinê dosye nehat dîtin. Ew hatiye jêbirin an veguheztin?</string>
-    <string name="local_draft">Reşnivîsa Cîgehî</string>
+    <string name="file_not_found">Ji bo hilxistinê dosye nehat dîtin. Ew hatiye jêbirin an jî veguheztin?</string>
+    <string name="local_draft">Reşnivîsa cîgehî</string>
     <string name="page_settings">Sazkariyên rûpelê</string>
     <string name="link_enter_url_text">Nivîsa girêdanê (li gor daxwazê)</string>
     <string name="cannot_delete_multi_media_items">Hinek medya nehatin jêbirin. Piştre dîsa biceribîne.</string>
     <string name="media_error_no_permission">Destûra te ji bo dîtina medyagehê tune ye</string>
     <string name="media_gallery_type_thumbnail_grid">Wêneyê biçûk</string>
     <string name="learn_more">Zêdetir bizane</string>
-    <string name="post_not_found">Di barkirina şandiyê de çewtiyek rû da. Şandiyê nû bike û dîsa biceribîne.</string>
-    <string name="plugin_not_found">Di gihîştina vê pêvekê de çewtiyek rû da</string>
-    <string name="cancel_edit">Serrastkirinê betal bike</string>
+    <string name="post_not_found">Di barkirina şandiyê de çewtiyek derket. Şandiyê nû bike û dîsa biceribîne.</string>
+    <string name="plugin_not_found">Di gihîna vê pêvekê de çewtiyek derket</string>
+    <string name="cancel_edit">Sererastkirinê betal bike</string>
     <string name="connection_error">Çewtiya girêdanê</string>
-    <string name="select_categories">Kategoriyan Hilbijêre</string>
+    <string name="select_categories">Kategoriyan hilbijêre</string>
     <string name="share_link">Girêdanê parve bike</string>
-    <string name="reader_empty_posts_in_tag_updating">Şandî tên anîn…</string>
+    <string name="reader_empty_posts_in_tag_updating">Şandî tên stendin…</string>
     <string name="reader_likes_you_and_multi">Te û %,d kesên din ev eciband</string>
     <string name="reader_likes_multi">%,d kes ev eciband</string>
     <string name="reader_label_reply">Bibersivîne</string>
-    <string name="cant_share_no_visible_blog">Tu nikarî bi WordPressê parve bikî bêyî blogeke berçav</string>
-    <string name="comment_spammed">Şîrove wekî nexwestî hat nîşankirin</string>
-    <string name="reader_toast_err_get_post">Ev şandî cardin nayê anîn</string>
+    <string name="cant_share_no_visible_blog">Heta ku blogeke te ya xuyanbar tune be tu nikarî bi WordPressê parve bikî</string>
+    <string name="comment_spammed">Şîrove wekî spam hat nîşankirin</string>
+    <string name="reader_toast_err_get_post">Ev şandî nayê anîn</string>
     <string name="reader_likes_you_and_one">Te û kesekî din ev eciband</string>
     <string name="pick_video">Vîdyo hilbijêre</string>
     <string name="pick_photo">Wêne hilbijêre</string>
     <string name="sign_up_label">Bibe Endam</string>
-    <string name="reader_toast_err_url_intent">%s nehate vekirin</string>
+    <string name="reader_toast_err_url_intent">%s nehat vekirin</string>
     <string name="reader_toast_err_view_image">Wêne nehat nîşandan</string>
     <string name="reader_toast_err_share_intent">Nehat parvekirin</string>
-    <string name="reader_toast_err_tag_invalid">Ew etîket ne derbasdar e</string>
-    <string name="reader_toast_err_tag_exists">Jixwe tu vê etîketê dişopînî</string>
+    <string name="reader_toast_err_tag_invalid">Ew mijar ne derbasdar e</string>
+    <string name="reader_toast_err_tag_exists">Jixwe tu vê mijarê dişopînî</string>
     <string name="reader_toast_err_comment_failed">Şîroveya te nehat şandin</string>
     <string name="reader_likes_only_you">Te vêya eciband</string>
     <string name="reader_likes_one">Kesekî vêya eciband</string>
     <string name="reader_label_removed_tag">%s hat rakirin</string>
-    <string name="reader_label_added_tag">%s hat tevlîkirin</string>
+    <string name="reader_label_added_tag">%s hat tevlêkirin</string>
     <string name="reader_hint_comment_on_comment">Şîroveyê bibersivîne…</string>
     <string name="reader_btn_unfollow">Tê şopandin</string>
     <string name="reader_btn_follow">Bişopîne</string>
     <string name="reader_btn_share">Parve bike</string>
     <string name="reader_view_reblog">Dîsblog bike</string>
     <string name="reader_untitled_post">(Bêsernav)</string>
-    <string name="comments_empty_list">Hîn ti şîrove tune ne</string>
+    <string name="comments_empty_list">Hîn ti şîrove tune ye</string>
     <string name="empty_list_default">Ev lîste vala ye</string>
     <string name="stats_timeframe_months">Meh</string>
     <string name="stats_timeframe_weeks">Hefte</string>
@@ -2398,9 +2312,9 @@ Language: ku_TR
     <string name="media_edit_description_text">Daxuyanî</string>
     <string name="media_edit_caption_text">Sernûçe</string>
     <string name="media_edit_title_text">Sernav</string>
-    <string name="media_gallery_type_slideshow">Pêşekerî</string>
+    <string name="media_gallery_type_slideshow">Pêşandana Slaytê</string>
     <string name="media_gallery_type_circles">Çember</string>
-    <string name="media_gallery_type_tiled">Mozaîk</string>
+    <string name="media_gallery_type_tiled">Çargoşeyî</string>
     <string name="media_gallery_type_squares">Çargoşe</string>
     <string name="themes">Rûkar</string>
     <string name="discard">Biavêje</string>
@@ -2413,19 +2327,19 @@ Language: ku_TR
     <string name="loading">Tê barkirin…</string>
     <string name="httppassword">Pêborîna HTTP\'ê</string>
     <string name="httpuser">Navê bikarhêner ê HTTP\'ê</string>
-    <string name="error_media_upload">Di hilxistina medyayê de çewtiyek rû da</string>
+    <string name="error_media_upload">Di hilxistina medyayê de çewtiyek derket</string>
     <string name="incorrect_credentials">Navê bikarhêner an jî pêborîn çewt e.</string>
     <string name="log_in">Têkeve</string>
     <string name="username">Navê bikarhêner</string>
     <string name="password">Pêborîn</string>
     <string name="reader">Xwîner</string>
     <string name="pages">Rûpel</string>
-    <string name="posts">şandî</string>
+    <string name="posts">Şandî</string>
     <string name="anonymous">Anonîm</string>
-    <string name="no_network_title">Tora berdest nîn e</string>
+    <string name="no_network_title">Înternet tune ye</string>
     <string name="done">qediya</string>
     <string name="ok">BAŞ e</string>
-    <string name="link_enter_url">Navnîşan</string>
+    <string name="link_enter_url">URL</string>
     <string name="tos">Mercên Xizmetê</string>
     <string name="version">Guherto</string>
     <string name="app_title">WordPress ji bo Android\'ê</string>
@@ -2440,10 +2354,10 @@ Language: ku_TR
     <string name="pages_private">Veşartî</string>
     <string name="title">Sernav</string>
     <string name="tags_separate_with_commas">Etîketan bi bêhnokê(,) ji hev veqetîne</string>
-    <string name="categories">Herî Zêde Bikarhatî</string>
+    <string name="categories">Kategorî</string>
     <string name="dlg_deleting_comments">Şîrove tên jêbirin</string>
     <string name="sdcard_title">SD Kart Pêwîst e</string>
-    <string name="media">Parçeyê vîdeoyê rake</string>
+    <string name="media">Medya</string>
     <string name="approve">Bipejirîne</string>
     <string name="delete">Jê bibe</string>
     <string name="none">Hîç</string>
@@ -2456,7 +2370,7 @@ Language: ku_TR
     <string name="no">Na</string>
     <string name="yes">Erê</string>
     <string name="notification_settings">Sazkariyên Danezanan</string>
-    <string name="add">Tevlê bike</string>
+    <string name="add">Tevlî bike</string>
     <string name="save">Tomar bike</string>
-    <string name="cancel">Betal</string>
+    <string name="cancel">Betal bike</string>
 </resources>
diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml
index 2af7f7ebc1bc..52b20a7065d4 100644
--- a/WordPress/src/main/res/values-ko/strings.xml
+++ b/WordPress/src/main/res/values-ko/strings.xml
@@ -1,13 +1,445 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 01:00:49+0000
+Translation-Revision-Date: 2021-05-12 10:54:10+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/3.0.0-alpha.2
 Language: ko_KR
 -->
 <resources>
+    <string name="gutenberg_native_size">크기</string>
+    <string name="gutenberg_native_image_settings">이미지 설정</string>
+    <string name="gutenberg_native_audio_settings">오디오 설정</string>
+    <string name="user_profile_untitled_site">(제목이 없습니다)</string>
+    <string name="user_profile_site_section_header">사이트</string>
+    <string name="user_profile_bottom_sheet_description">사용자 프로필 하단 시트 정보</string>
+    <string name="likes_list_screen_title">좋아요 목록 %s</string>
+    <string name="gutenberg_native_write_code">코드 쓰기…</string>
+    <string name="gutenberg_native_sorting_and_filtering">정렬과 필터</string>
+    <string name="gutenberg_native_show_download_button">다운로드 버튼 보이기</string>
+    <string name="gutenberg_native_shortcode">쇼트코드</string>
+    <string name="gutenberg_native_read_more">더 보기</string>
+    <string name="gutenberg_native_preload">미리 올림</string>
+    <string name="gutenberg_native_post_meta_settings">글 메타 설정</string>
+    <string name="gutenberg_native_post_content_settings">글 콘텐츠 설정</string>
+    <string name="gutenberg_native_metadata">메타자료</string>
+    <string name="gutenberg_native_media_file">미디어 파일</string>
+    <string name="gutenberg_native_media_area">미디어 영역</string>
+    <string name="gutenberg_native_loop">연속재생</string>
+    <string name="gutenberg_native_link_to_12d6f96a">링크하기</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">갤러리의 이미지 %2$d개 중 %1$d개</string>
+    <string name="gutenberg_native_heading_d">헤딩 %d</string>
+    <string name="gutenberg_native_featured">추천</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">여기에 임베드 하려면 URL을 입력하세요…</string>
+    <string name="gutenberg_native_edit_image">이미지 편집하기</string>
+    <string name="gutenberg_native_display_post_date">발행일 보이기</string>
+    <string name="gutenberg_native_code">코드</string>
+    <string name="gutenberg_native_change_heading_level">헤딩 수준 바꾸기</string>
+    <string name="gutenberg_native_browser_default">브라우저 기본 설정</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">블록을 삭제했거나 가능하지 않습니다.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">블록은 자체적으로 렌더링할 수 없습니다.</string>
+    <string name="gutenberg_native_autoplay">자동 실행</string>
+    <string name="gutenberg_native_auto">자동</string>
+    <string name="gutenberg_native_attachment_page">첨부 패이지</string>
+    <string name="gutenberg_native_add_text">문자 추가하기…</string>
+    <string name="gutenberg_native_add_caption">캡션 추가</string>
+    <string name="gutenberg_native_what_is_alt_text">대체 텍스트란 무엇인가요?</string>
+    <string name="gutenberg_native_transform_s_to">다음으로 %s 변형</string>
+    <string name="gutenberg_native_transform_block">블록 변형…</string>
+    <string name="gutenberg_native_failed_to_insert_media">미디어를 삽입하는 데 실패했습니다.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">오디오 파일 삽입에 실패했습니다.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">이미지의 용도를 설명합니다. 이미지가 장식용이면 비워 둡니다. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%2$s(으)로 변형된 %1$s</string>
+    <string name="like_faces_error_loading_message">좋아요 데이터 로드 중 오류가 발생했습니다. %s.</string>
+    <string name="like_faces_plural_text">%d명의 블로거가 좋아합니다.</string>
+    <string name="like_faces_singular_text">1명의 블로거가 좋아합니다.</string>
+    <string name="like_title_plural">%d 좋아요</string>
+    <string name="like_title_singular">좋아요 1개</string>
+    <string name="threat_fix_enter_server_creds_message_plural">위협을 해결하려면 서버 자격 증명을 입력하세요.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">위협을 해결하려면 서버 자격 증명을 입력하세요.</string>
+    <string name="suggestion">제안:</string>
+    <string name="gutenberg_native_search_blocks">블록 검색</string>
+    <string name="gutenberg_native_search_block">블록 검색</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">두 번 눌러 단위 변경하기</string>
+    <string name="gutenberg_native_clear_search">검색 지우기</string>
+    <string name="gutenberg_native_cancel_search">검색 취소</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s은(는) %3$s %4$s입니다.</string>
+    <string name="get_likes_empty_state_title">좋아요 데이터를 가져오는 중 오류가 발생함</string>
+    <string name="get_likes_unknown_error">좋아요를 가져오는 중 알 수 없는 오류가 발생했습니다.</string>
+    <string name="get_likes_no_network_error">사용 가능한 네트워크가 없습니다.</string>
+    <string name="comments_empty_list_filtered_unreplied">응답 없는 댓글 없음</string>
+    <string name="comment_status_unreplied">응답 없음</string>
+    <string name="gutenberg_native_table_of_contents">목차</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">헤딩요소 목록으로 글을 요약하세요. 여기에서 HTML 앵커를 헤딩요소 블록에 추가하여 링크를 설정하세요.</string>
+    <string name="gutenberg_native_document_outline">문서 개요</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">항상 허용되는 IP 주소</string>
+    <string name="site_settings_denylist_title">허용되지 않는 댓글</string>
+    <string name="reader_title_interests">토픽 따르기</string>
+    <string name="stories_intro_main_subtitle">사이트에서 매력적인 콘텐츠를 만들고 공개하는 새로운 방법입니다.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">해제</string>
+    <string name="activity_log_backup_download_notice_download_action">다운로드하기</string>
+    <string name="threat_fix_all_status_success_message_plural">위협이 해결되었습니다.</string>
+    <string name="threat_fix_all_confirmation_message_plural">%s개의 활성 위협을 모두 해결할지 확인해 주세요.</string>
+    <string name="scan_idle_threats_description_plural">스캔에서 %2$s에 대한 잠재적 위협 %1$s개를 찾았습니다. 아래 내용을 검토하고 조치를 취하거나 모두 해결 버튼을 누르세요. 도움말이 필요하면 %3$s을(를) 클릭하세요.</string>
+    <string name="scan_fixing_threats_description_plural">이러한 위협을 해결하기 위해 백그라운드에서 노력하는 중입니다. 그동안 정상적으로 사이트를 계속 사용하면서 언제든지 진행률을 확인하실 수 있습니다.</string>
+    <string name="gutenberg_native_edit_focal_point">초점 편집하기</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">이미지를 편집, 교체 또는 지울 하단 시트를 두 번 눌러 열기</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">이미지를 편집, 교체 또는 지울 작업 시트를 두 번 눌러 열기</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">사이트의 이름 입력</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;모든 작업 완료됨&lt;/b&gt;&lt;br/&gt;더 많은 사람에게 도달하게 됩니다. 훌륭합니다!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;모든 작업 완료됨&lt;/b&gt;&lt;br/&gt;사이트를 사용자 정의하셨습니다. 잘하셨습니다!</string>
+    <string name="quick_start_card_menu_hide">일시적으로 숨기기</string>
+    <string name="magic_link_not_meaning_to_create_account">새 계정을 만들 계획이 없으신가요? 뒤로 이동하여 이메일 주소를 다시 입력하세요.</string>
+    <string name="invite_links_disable_dialog_message">초대 링크를 비활성화하면 아무도 이 링크를 사용해서 이 팀에 참여할 수 없습니다. 계속할까요?</string>
+    <string name="invite_links_disable_dialog_title">초대 링크 비활성화</string>
+    <string name="invite_links_bad_format_response">유효하지 않은 반응을 받았습니다</string>
+    <string name="invite_links_null_response">받은 응답이 없습니다</string>
+    <string name="invite_links_cannot_get_role_data_error">역할 %1$s에 대한 데이터를 가져오는 중 오류가 발생했습니다.</string>
+    <string name="invite_links_cannot_get_roles_error">역할을 가져오는 중 오류가 발생했습니다.</string>
+    <string name="invite_links_generic_get_data_error">초대 링크를 가져오는 중 알 수 없는 오류가 발생했습니다.</string>
+    <string name="invite_links_helper_text">이 링크를 활용하면 일일이 한 명씩 초대하지 않아도 여러 팀원이 팀에 참여할 수 있게 됩니다. 이 URL을 방문하는 사람은 누구나 조직에 가입할 수 있습니다. 다른 사람을 통해서 이 링크를 전달받은 사람도 가입할 수 있기 때문에 신뢰할 수 있는 사람에게만 공유하세요.</string>
+    <string name="invite_links_expire_date">만료 %1$s</string>
+    <string name="invite_links_disable_invite_link">초대 링크 비활성화</string>
+    <string name="invite_links_share_invite_link">초대 링크 공유</string>
+    <string name="invite_links_generate">새 링크 생성</string>
+    <string name="invite_links_get_status_retry">링크 상태 새로 고침</string>
+    <string name="invite_links_section_title">초대 링크</string>
+    <string name="threats_found_singular">위협을 찾았습니다</string>
+    <string name="threats_found_plural">위협을 찾았습니다</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;스캔 완료됨&lt;/b&gt; &lt;br&gt; %s 잠재적 위협 찾음</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;스캔 완료됨&lt;/b&gt; &lt;br&gt; 잠재적 위협 1개 찾음</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;스캔 완료됨&lt;/b&gt; &lt;br&gt; 찾은 위협 없음</string>
+    <string name="scan_fixing_threats_title_singular">위협 해결 중</string>
+    <string name="disable">비활성화</string>
+    <string name="quick_start_card_menu_unpin">이 항목 고정 취소</string>
+    <string name="quick_start_list_review_pages_subtitle">페이지를 점검하고 내용을 변경하거나 페이지를 추가 또는 제거하세요.</string>
+    <string name="quick_start_list_view_site_title">사이트 방문</string>
+    <string name="quick_start_list_upload_icon_subtitle">깔끔하고 전문적으로 보이도록 사이트에 아이콘을 추가하세요.</string>
+    <string name="quick_start_list_follow_site_subtitle">회원님께 영감을 주는 사이트를 발견하고 팔로우하세요.</string>
+    <string name="quick_start_list_enable_sharing_title">공유 사용</string>
+    <string name="quick_start_list_enable_sharing_subtitle">새 글을 소셜 미디어에 자동으로 공유합니다.</string>
+    <string name="quick_start_list_update_site_title_subtitle">개성과 게시글을 반영하는 이름을 사이트에 지정하세요.</string>
+    <string name="quick_start_list_check_stats_title">통계 확인</string>
+    <string name="backup_download_status_failure_bullet2">그래도 다운로드 가능한 백업 파일 만들기는 시도됩니다.</string>
+    <string name="backup_download_status_failure_bullet1">다운로드 가능한 백업에 걸리는 시간을 알려주는 상태를 찾을 수 없습니다.</string>
+    <string name="backup_download_status_failure_heading">다운로드 가능한 백업 상태를 찾을 수 없습니다.</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">체크 표시 아이콘</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">시계 아이콘</string>
+    <string name="restore_status_failure_bullet3">완료되면 알려드립니다.</string>
+    <string name="restore_status_failure_bullet2">그래도 사이트 복원은 시도됩니다.</string>
+    <string name="restore_status_failure_bullet1">복원에 걸리는 시간을 알려주는 상태를 찾을 수 없습니다.</string>
+    <string name="restore_status_failure_heading">복원 상태를 찾을 수 없습니다.</string>
+    <string name="restore_complete_failed_description">사이트를 복원할 수 없습니다.</string>
+    <string name="restore_warning_action_button">확인</string>
+    <string name="restore_warning_description_with_two_parameters">사이트를 %2$s의 %1$s(으)로 되돌리시겠어요?\n        해당 시점 이후에 변경한 모든 내용이 손실됩니다.</string>
+    <string name="backup_download_complete_failed_description">백업을 만들 수 없습니다.</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(테마, 플러그인 및 업로드 제외)</string>
+    <string name="backup_item_contents">WP-content 디렉터리</string>
+    <string name="backup_item_roots">워드프레스 루터</string>
+    <string name="backup_download_details_choose_items_header">이 다운로드에 포함된 항목</string>
+    <string name="gutenberg_native_uploading">업로드 중…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">재활용 가능한 블록은 iOS용 WordPress에서 편집할 수 없습니다.</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">재활용 가능한 블록은 Android용 WordPress에서 편집할 수 없습니다.</string>
+    <string name="gutenberg_native_replace_file">파일 바꾸기</string>
+    <string name="gutenberg_native_replace_audio">오디오 교체</string>
+    <string name="gutenberg_native_problem_opening_the_audio">오디오 열기 문제</string>
+    <string name="gutenberg_native_open">열기</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">이 요청을 처리할 수 있는 애플리케이션이 없습니다.</string>
+    <string name="gutenberg_native_lock_icon">잠금 아이콘</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">오디오 파일 삽입에 실패했습니다. 옵션을 보려면 누르세요.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">오디오 파일을 두 번 눌러 선택하기</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">오디오 파일을 두 번 눌러 듣기</string>
+    <string name="gutenberg_native_choose_audio">오디오 선택</string>
+    <string name="gutenberg_native_audio_player">오디오 플레이어</string>
+    <string name="gutenberg_native_audio_file">오디오 파일</string>
+    <string name="gutenberg_native_audio_caption_s">오디오 캡션. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">오디오 캡션. 비었음</string>
+    <string name="gutenberg_native_add_audio">오디오 추가</string>
+    <string name="continue_with_wpcom">워드프레스닷컴을 통해 로그인하거나 가입</string>
+    <string name="photo_picker_use_audio">이 오디오 사용</string>
+    <string name="photo_picker_choose_audio">기기에서 오디오 선택</string>
+    <string name="people_optional_custom_message_helper_text">선택 사항: 초대장과 함께 보낼 사용자 정의 메시지를 입력하세요.</string>
+    <string name="people_learn_more_about_roles">역할에 대하여 더 알아보기</string>
+    <string name="threat_status_fixed">해결됨</string>
+    <string name="threat_found_header">찾음</string>
+    <string name="scan_here_to_help">도움말</string>
+    <string name="scan_idle_threats_description_singular">스캔에서 %1$s에 대한 잠재적 위협 1개를 찾았습니다. 아래 위협을 검토하고 조치를 취하거나 모두 해결 버튼을 누르세요. 도움말이 필요하면 %2$s을(를) 클릭하세요.</string>
+    <string name="scan_idle_manual_scan_description">사이트를 다시 검토하려면 수동 스캔을 실행하거나 젯팩의 오늘 중 사이트 스캔을 기다리세요.</string>
+    <string name="scan_provisioning_description">Jetpack Scan에 오신 것을 환영합니다. 전체 스캔이 수행되도록 설정하여 사이트를 자세히 살펴보는 중입니다. 스캔에 영향을 미칠 만한 문제를 발견하면 먼저 알려드리고 전체 스캔을 시작합니다.</string>
+    <string name="scan_scanning_is_initial_description">Jetpack Scan에 오신 것을 환영합니다. 지금 회원님 사이트를 살펴보고 있으며 결과를 곧 알려드리겠습니다.</string>
+    <string name="scan_fixing_threats_description_singular">이 위협을 해결하기 위해 백그라운드에서 노력하는 중입니다. 그동안 정상적으로 사이트를 계속 사용하면서 언제든지 진행률을 확인하실 수 있습니다.</string>
+    <string name="scan_scanning_description">스캔이 완료되면 알림을 보내드립니다. 그동안 정상적으로 사이트를 계속 사용하면서 언제든지 진행 상황을 확인하실 수 있습니다.</string>
+    <string name="scan_fixing_threats_title_plural">위협 해결 중</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan에서 사이트 스캔을 완료할 수 없습니다. 사이트가 다운되었는지 확인해 주세요. 다운되지 않았으면 다시 시도해 주세요. 다운되었거나 Jetpack Scan에서 계속 문제가 발생하는 경우 지원팀에 문의하세요.</string>
+    <string name="scan_request_failed_title">문제가 발생했습니다</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">사이트 백업 중</string>
+    <string name="activity_log_currently_backing_up_message">%1$s %2$s에서 사이트 백업 중</string>
+    <string name="activity_log_currently_backing_up_title">다운로드 가능한 백업을 만드는 중</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">사이트가 백업되었습니다.</string>
+    <string name="activity_log_backup_finished_snackbar_message">사이트가 백업되었습니다.\n%1$s %2$s에서 백업됨</string>
+    <string name="activity_log_backup_started_snackbar_message">사이트가 백업되는 중입니다.\n%1$s %2$s에서 백업 중</string>
+    <string name="pick_audio">오디오 선택</string>
+    <string name="restore_another_process_running">실행 중인 다른 복원이 있습니다.</string>
+    <string name="restore_complete_failed_icon_content_description">오류 아이콘</string>
+    <string name="restore_complete_failed_title">복원 실패</string>
+    <string name="restore_complete_visit_site_button_content_description">사이트 방문 버튼</string>
+    <string name="restore_complete_icon_content_description">복원 아이콘</string>
+    <string name="restore_complete_visit_site_action_button">사이트 방문</string>
+    <string name="restore_complete_description_with_two_parameters">이제 선택한 항목이 모두 %1$s %2$s(으)로 다시 복원되었습니다.</string>
+    <string name="restore_complete_header">사이트가 복원되었습니다.</string>
+    <string name="restore_progress_footnote">기다리시지 않아도 됩니다. 사이트가 복원되면 알려드립니다.</string>
+    <string name="restore_progress_icon_content_description">사이트 복원 아이콘</string>
+    <string name="restore_progress_description_with_two_parameters">사이트를 %1$s %2$s(으)로 다시 복원하는 중입니다.</string>
+    <string name="restore_progress_header">현재 복원 중인 사이트</string>
+    <string name="restore_warning_action_button_content_description">사이트 복원 확인 버튼</string>
+    <string name="restore_warning_icon_content_description">느낌표가 있는 빨간색 원 이미지</string>
+    <string name="restore_warning_header">경고</string>
+    <string name="restore_details_action_button_content_description">사이트 복원 버튼</string>
+    <string name="restore_details_icon_content_description">복원 아이콘</string>
+    <string name="restore_details_action_button">사이트 복원</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s이(가) 사이트를 복원을 위해 선택한 시점입니다.</string>
+    <string name="restore_details_header">사이트 복원</string>
+    <string name="restore_details_choose_items_header">복원할 항목 선택:</string>
+    <string name="restore">복원</string>
+    <string name="backup_download_complete_failed_icon_content_description">X로 표시된 구름 아이콘</string>
+    <string name="web_preview_tablet">태블릿</string>
+    <string name="quick_start_card_menu_remove">다시 보지 않음</string>
+    <string name="quick_start_card_menu_pin">이 항목 고정</string>
+    <string name="quick_start_dialog_review_pages_message_short">페이지 목록을 참조하려면 %1$s 페이지 %2$s을(를) 선택하세요.</string>
+    <string name="quick_start_dialog_review_pages_message">사이트의 페이지를 변경, 추가 또는 제거합니다.</string>
+    <string name="quick_start_dialog_review_pages_title">사이트 페이지 검토</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">홈페이지를 편집하려면 %1$s 홈페이지 %2$s을(를) 선택하세요.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">페이지 목록을 참조하려면 %1$s 페이지 %2$s을(를) 선택하세요.</string>
+    <string name="quick_start_dialog_edit_homepage_message">사이트의 홈페이지에서 콘텐츠를 변경, 추가 또는 제거합니다.</string>
+    <string name="quick_start_dialog_edit_homepage_title">홈페이지 편집</string>
+    <string name="reader_menu_mark_as_unseen">안 읽음으로 표시</string>
+    <string name="reader_menu_mark_as_seen">읽음으로 표시</string>
+    <string name="error_media_upload_failed_for_reason">미디어 업로드에 실패했습니다.\n%1$s</string>
+    <string name="error_media_not_enough_storage">사용 가능한 사이트 저장 공간 부족</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">이 글의 읽음 상태를 전환할 수 없음</string>
+    <string name="reader_marked_post_as_unseen">안 읽음으로 표시됨</string>
+    <string name="reader_marked_post_as_seen">읽음으로 표시됨</string>
+    <string name="threat_fix_all_status_error_message">해결 상태를 가져오는 중 오류가 발생했습니다. 지원팀에 문의하세요.</string>
+    <string name="threat_fix_all_status_success_message_singular">위협이 해결되었습니다.</string>
+    <string name="threat_fix_all_error_message">위협 해결 중 오류가 발생했습니다. 지원팀에 문의하세요.</string>
+    <string name="threat_fix_all_confirmation_message_singular">1개의 활성 위협을 해결할지 확인해 주세요.</string>
+    <string name="threat_fix_all_warning_title">위협 모두 해결</string>
+    <string name="threat_ignore_error_message">위협을 무시하는 중 오류가 발생했습니다. 지원팀에 문의하세요.</string>
+    <string name="threat_ignore_success_message">위협이 무시되었습니다.</string>
+    <string name="threat_ignore_warning">안전한 것이 확실하지 않은 한 보안을 무시해서는 안 됩니다. 이 위협 무시를 선택하면 사이트 &lt;b&gt;%s&lt;/b&gt;에서 위협이 유지됩니다.</string>
+    <string name="threat_fix_error_message">위협 해결 중 오류가 발생했습니다. 지원팀에 문의하세요.</string>
+    <string name="threat_item_sub_header_status_ignored">위협 무시됨</string>
+    <string name="threat_item_sub_header_status_fixed_on">%s에 위협 해결됨</string>
+    <string name="threat_fixing">위협 해결 중</string>
+    <string name="scan_history_ignored_threats_tab">무시됨</string>
+    <string name="scan_history_no_threats_found">항목을 찾을 수 없음</string>
+    <string name="scan_history_fixed_threats_tab">해결됨</string>
+    <string name="scan_history_all_threats_tab">모두</string>
+    <string name="scan_scanning_title">파일 스캔 중</string>
+    <string name="scan_preparing_to_scan_title">스캔 준비</string>
+    <string name="scan_history_menu_title">내역</string>
+    <string name="scan_history">스캔 내역</string>
+    <string name="backup_active_filter_empty_subtitle">날짜 범위 조정 시도</string>
+    <string name="backup_active_filter_empty_title">일치하는 백업을 찾을 수 없음</string>
+    <string name="backup_empty_subtitle">첫 번째 백업이 24시간 이내에 여기에 표시되고 백업이 완료되면 알림이 수신됩니다.</string>
+    <string name="backup_empty_title">첫 번째 백업이 곧 준비됩니다</string>
+    <string name="request_failed_message">요청 처리 중 문제가 발생했습니다. 나중에 다시 시도하세요.</string>
+    <string name="gutenberg_native_move_to_bottom">아래로 이동하기</string>
+    <string name="gutenberg_native_change_block_position">블록 위치 변경</string>
+    <string name="label_control_upload">업로드하기</string>
+    <string name="jetpack_icon_content_description">아이콘</string>
+    <string name="backup_download_complete_info">파일에 연결하는 링크도 이메일했습니다.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">링크 버튼 공유하기</string>
+    <string name="backup_download_complete_download_action_button_content_description">다운로드하기 버튼</string>
+    <string name="backup_download_complete_icon_content_description">다운로드할 수 있는 백업 준비 아이콘</string>
+    <string name="backup_download_complete_download_share_action_button">링크 공유하기</string>
+    <string name="backup_download_complete_download_action_button">다운로드하기</string>
+    <string name="backup_download_complete_description_with_two_parameters">%1$s %2$s에서 사이트의 백업을 성공적으로 만들었습니다.</string>
+    <string name="backup_download_complete_header">이제 백업을 다운로드할 수 있습니다</string>
+    <string name="backup_download_complete_page_title">백업</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">기다리시지 않아도 됩니다. 백업이 준비되면 알려드립니다.</string>
+    <string name="backup_download_progress_icon_content_description">다운로드할 수 있는 백업 만들기 아이콘</string>
+    <string name="backup_download_progress_description_with_two_parameters">%1$s %2$s에서 다운로드할 수 있는 사이트의 백업을 만들고 있습니다.</string>
+    <string name="backup_download_progress_header">현재 다운로드할 수 있는 사이트의 백업을 만드는 중입니다</string>
+    <string name="backup_download_progress_page_title">백업 다운로드하기</string>
+    <string name="backup_download_another_download_running">다른 다운로드를 실행하고 있습니다.</string>
+    <string name="backup_download_generic_failure">요청을 처리하는 중에 문제가 있었습니다. 나중에 다시 시도하기 바랍니다.</string>
+    <string name="backup_download_details_action_button_content_description">다운로드할 수 있는 백업 만들기 버튼</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s은(는) 다운로드할 수 있는 백업을 만들기 위해 선택한 지점입니다.</string>
+    <string name="gutenberg_native_image_link_url">이미지 링크 URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">교차글</string>
+    <string name="suggestion_user">사용자</string>
+    <string name="suggestion_no_matching">일치하는 %s이(가) 없습니다.</string>
+    <string name="suggestion_problem">제안 로드 중 문제가 발생했습니다.</string>
+    <string name="suggestion_none">사용 가능한 %s 제안이 없습니다.</string>
+    <string name="suggestion_selection_needed">제안 목록을 입력하여 필터링하세요.</string>
+    <string name="threat_get_free_estimate">무료 견적 얻기</string>
+    <string name="threat_ignore">위협 무시하기</string>
+    <string name="threat_fix">위협 고치기</string>
+    <string name="threat_fix_fixable_default">젯팩 검사하기가 그 위협을 해결할 것입니다.</string>
+    <string name="threat_fix_fixable_edit">젯팩 검사하기가 영향이 있는 파일이나 디렉터리를 편집할 것입니다.</string>
+    <string name="threat_fix_fixable_update">젯팩 검사하기를 새 버전(%s)으로 업데이트할 것입니다.</string>
+    <string name="threat_fix_fixable_delete">젯팩 검사하기가 영향이 있는 파일이나 디렉터리를 지울 것입니다.</string>
+    <string name="threat_fix_fixable_replace">젯팩 검사하기는 영향이 있는 파일이나 디렉터리를 교체할 것입니다.</string>
+    <string name="threat_fix_current_not_fixable_description">젯팩 검사하기가 이 위협을 자동으로 고칠 수 없습니다.\n        그 위협을 직접 해결하기를 권장합니다: 워드프레스, 테마, 그리고 모든 플러그인이 최신인지 확인하고, 사이트에서 문제일 수 있는 코드, 테마, 또는 플러그인을 제거하세요. \n \n\n        이 위협을 해결하는데 도움이 필요하면, 고도로 검증한 워드프레스 전문가의 신뢰할 수 있는 프리랜서 시장인&lt;b&gt;코더블&lt;/b&gt;을 권장합니다.\n        이 프로젝트를 도울 수 있는 보안 전문가의 그룹을 선별했습니다. 가격대는 시간당 70–120 달러이고, 고요할 의무 없이 무료로 견적을 확인할 수 있습니다.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">위협 해결하는 중</string>
+    <string name="threat_fix_fixed_header">젯팩을 어떻게 고쳤을까요?</string>
+    <string name="threat_fix_default_header">어떻게 고칠까요?</string>
+    <string name="threat_file_description">파일에서 발견한  위협:</string>
+    <string name="threat_technical_details_header">기술 세부정보</string>
+    <string name="threat_problem_header">문제가 무엇이었나요?</string>
+    <string name="threat_details">위협 세부정보</string>
+    <string name="threat_item_sub_header_vulnerable_theme">테마에서 취약점을 찾았습니다</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">플러그인에서 취약점을 찾았습니다</string>
+    <string name="threat_item_sub_header_file_signature">위협을 찾았습니다 %s</string>
+    <string name="threat_item_sub_header_core_file">워드프레스에서 취약점을 찾았습니다</string>
+    <string name="threat_item_sub_header_misc_vulnerability">기타 취약점</string>
+    <string name="threat_item_header_vulnerable_theme">취약한 테마: %s (버전 %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">취약한 플러그인: %s (버전 %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: 의심스러운 코드 유형</string>
+    <string name="threat_item_header_database_threat">대이터배이스 %s 위협</string>
+    <string name="threat_item_header_infected_core_file">%s: 감염 코어 파일</string>
+    <string name="threat_item_header_threat_found">위협을 찾았습니다</string>
+    <string name="threats_fix_all">모두 고치기</string>
+    <string name="scan_in_few_seconds">몇 초 전</string>
+    <string name="scan_this_site">이 사이트</string>
+    <string name="scan_idle_last_scan_description">%s에 마지막 젯팩 스캔이 실행되었으며 위험이 발견되지 않았습니다. %s</string>
+    <string name="scan_idle_threats_found_title">사이트가 위험할 수 있습니다</string>
+    <string name="scan_idle_no_threats_found_title">걱정하지 마세요</string>
+    <string name="scan_again">다시 검사하기</string>
+    <string name="scan_now">지금 검사하기</string>
+    <string name="scan_state_icon">상태 검사하기 아이콘</string>
+    <string name="backup">백업하기</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">활동 유형 필터 (%s유형을 선택했습니다)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (%s 항목을 보이는 중)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">활동 유형 필터</string>
+    <string name="activity_log_activity_type_empty_subtitle">선택한 날짜 범위에 활동 기록이 없습니다.</string>
+    <string name="activity_log_activity_type_empty_title">사용할 수 있는 활동이 없습니다</string>
+    <string name="activity_log_activity_type_error_subtitle">인터넷 연결을 확인하고 다시 시도하기 바랍니다.</string>
+    <string name="activity_log_activity_type_error_title">연결이 없습니다</string>
+    <string name="activity_log_activity_type_filter_active_label">활동 유형 (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">날짜 범위 필터</string>
+    <string name="activity_log_active_filter_empty_subtitle">날짜 범위나 활동 유형 필터 조정하기</string>
+    <string name="activity_log_active_filter_empty_title">일치하는 이벤트가 없습니다</string>
+    <string name="backup_item_sqls">사이트 데이터배이스</string>
+    <string name="backup_item_roots_hint">(wp-config.php 및 비 WordPress 파일 포함)</string>
+    <string name="backup_item_media_uploads">미디어 업로드</string>
+    <string name="backup_item_plugins">워드프레스 플러그인</string>
+    <string name="backup_item_themes">워드프레스 테마</string>
+    <string name="backup_download_details_icon_content_description">다운로드할 수 있는 백업 만들기</string>
+    <string name="backup_download_details_action_button">다운로드할 수 있는 파일 만들기</string>
+    <string name="backup_download_details_header">다운로드 할 수 있는 백업 만들기</string>
+    <string name="backup_download_details_page_title">백업 다운로드하기</string>
+    <string name="backup_download">백업 다운로드</string>
+    <string name="gutenberg_native_error">오류</string>
+    <string name="gutenberg_native_choose_file">파일 선택하기</string>
+    <string name="activity_log_item_menu_download_backup_label">백업 다운로드하기</string>
+    <string name="activity_log_item_menu_restore_label">이 지점으로 복원하기</string>
+    <string name="activity_log_activity_type_filter_label">활동 유형</string>
+    <string name="activity_log_date_range_filter_label">날짜 범위</string>
+    <string name="activity_log_activity_type_filter_header">활동 유형에 따라 필터</string>
+    <string name="dialog_confirm_copy_local_copy_button">이 앱으로부터 버전 복사하기</string>
+    <string name="dialog_confirm_copy_local_edit_button">먼저 글 편집하기</string>
+    <string name="dialog_confirm_copy_local_message">복사하려고 한 글은 충돌하거나 최근 만들고 저장하지 않은 두 버전이 있습니다.\n충돌을 해결하거나 이 앱으로부터 버전 복사를 진행하려면 먼저 글을 편집하세요.</string>
+    <string name="dialog_confirm_copy_local_title">글 동기화 충돌</string>
+    <string name="button_copy">복제하기</string>
+    <string name="toast_edit_story_update_in_progress_title">이야기를 저장하는 중입니다. 기다려 주시기 바랍니다…</string>
+    <string name="gutenberg_native_file_name">파일 이름</string>
+    <string name="gutenberg_native_file_block_settings">파일 블록 설정</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">파일 업로드를 실패했습니다.\n옵션을 열려면 누르시기 바랍니다.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">파일 저장을 실패했습니다.\n옵션을 열려면 누르시기 바랍니다.</string>
+    <string name="gutenberg_native_edit_file">파일 편집하기</string>
+    <string name="gutenberg_native_copy_file_url">파일 URL 복사하기</string>
+    <string name="gutenberg_native_choose_a_file">파일 선택하기</string>
+    <string name="new_site_creation_domain_header_title">도메인 선택하기</string>
+    <string name="my_site_btn_jetpack_settings">젯팩 설정</string>
+    <string name="my_site_header_jetpack">젯팩</string>
+    <string name="reader_btn_following_comments">이메일로 대화 팔로우 중</string>
+    <string name="reader_btn_follow_comments">이메일로 대화 팔로우</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">이 글에 대한 댓글을 구독 해제할 수 없습니다</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">이 글에 대한 댓글을 구독할 수 없습니다</string>
+    <string name="reader_follow_comments_get_status_error">글에 대한 구독상태를 가져오는데 오류가 있습니다</string>
+    <string name="reader_follow_comments_unsubscribe_success">댓글을 성공적으로 구독 해제했습니다</string>
+    <string name="reader_follow_comments_subscribe_success">이 댓글을 성공적으로 구독했습니다</string>
+    <string name="reader_follow_comments_bad_format_response">유효하지 않은 반응을 받았습니다</string>
+    <string name="reader_follow_comments_null_response">받은 응답이 없습니다</string>
+    <string name="activity_log_activity_type_filter_clear">지우기</string>
+    <string name="activity_log_activity_type_filter_apply">적용하기</string>
+    <string name="dialog_edit_story_unsupported_format_message">하나 또는 그 이상의 슬라이드는 지금 이야기가 GIF 파일을 지원하지 않기에 이야기에 추가할 수 없습니다. 정지한 이미지 또는 비디오 배경을 대신 선택하시기 바랍니다.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF 파일을 지원하지 않습니다</string>
+    <string name="dialog_edit_story_unrecoverable_message">사이트의 이 이야기에 대한 미디어를 찾을 수 없습니다.</string>
+    <string name="dialog_edit_story_unrecoverable_title">이야기를 편집할 수 없습니다</string>
+    <string name="dialog_edit_story_unavailable_message">이 이야기에 대한 미디어를 로드할 수 없습니다. 인터넷 연결을 확인하고 잠시 후 다시 시도하세요.</string>
+    <string name="dialog_edit_story_unavailable_title">이야기를 편집할 수 없습니다</string>
+    <string name="dialog_edit_story_limited_message">이 이야기는 다른 장치에서 편집하였고 특정 객체를 편집하는 기능을 제한할 수도 있습니다.</string>
+    <string name="dialog_edit_story_limited_title">제한적인 이야기 편집 중</string>
+    <string name="cannot_retry_deleted_media_item_fatal">미디어를 제거했습니다. 이야기 다시 만들기를 시도하세요.</string>
+    <string name="color_picker_label_background">배경</string>
+    <string name="color_picker_label_text">본문</string>
+    <string name="dialog_discard_story_ok_button_edit">폐기하기</string>
+    <string name="dialog_discard_story_message_edit">아무 변경사항도 저장하지 않을 것입니다.</string>
+    <string name="dialog_discard_story_title_edit">변경사항을 취소하시나요?</string>
+    <string name="label_done_button">완료</string>
+    <string name="label_next_button">다음</string>
+    <string name="delete_button_alt">삭제하기</string>
+    <string name="hpp_choose_error">디자인을 선택하는 중에 오류가 있습니다.</string>
+    <string name="hpp_retry_error">인터넷 연결을 확인하고 재시도하시기 바랍니다.</string>
+    <string name="hpp_error_subtitle">온라인으로 돌아오면 재시도를 누르세요.</string>
+    <string name="hpp_error_title">레이아웃은 오프라인에서 사용할 수 없습니다</string>
+    <string name="continue_site_credentials">상점 자격증명으로 계속하기</string>
+    <string name="login_find_your_connected_email">연결한 이메일 찾기</string>
+    <string name="reader_discover_no_posts_button_text">토픽 따르기</string>
+    <string name="reader_discover_no_posts_subtitle">폭 넓은 검색을 위해 더 많은 토픽을 따르도록 해보세요</string>
+    <string name="reader_discover_no_posts_title">최근 글이 없습니다</string>
+    <string name="reader_discover_empty_title">환영합니다!</string>
+    <string name="scan">검색하기</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;요한 브란트&lt;/b&gt;가 글에 답했습니다</string>
+    <string name="login_prologue_third_subtitle_two">오늘 사이트에서 &lt;b&gt;50개의 좋아요&lt;/b&gt;를 받았습니다</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;메디슨 루이즈&lt;/b&gt;가 글을 좋아합니다</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">스크롤 할 수 있는 블록 메뉴가 열렸습니다. 블록을 선택하세요.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">스크롤 할 수 있는 블록 메뉴를 닫았습니다.</string>
+    <string name="hpp_skip_button">건너뛰기</string>
+    <string name="hpp_choose_button">선택하기</string>
+    <string name="hpp_subtitle">좋아하는 홈페이지 레이아웃을 고르세요. 사용자 정의하거나 나중에 바꿀 수 있습니다.</string>
+    <string name="hpp_title">디자인 선택하기</string>
+    <string name="mlp_network_error_subtitle">온라인으로 돌아가면 재시도를 누르거나 아래의 단추를 이용하여 빈 페이지를 만드세요.</string>
+    <string name="mlp_network_error_title">레이아웃은 오프라인 중에 사용할 수 없습니다</string>
+    <string name="mlp_error_subtitle">재시도를 누르거나 아래의 버튼을 이용하여 빈 페이지를 만드세요.</string>
+    <string name="mlp_error_title">오류가 있어 레이아웃을 사용할 수 없습니다</string>
+    <string name="prepublishing_nudges_add_category_button">카테고리 추가하기</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">새 카테고리 추가하기</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">카테고리</string>
+    <string name="prepublishing_nudges_home_categories_not_set">설정하지 않았습니다</string>
+    <string name="prepublishing_nudges_categories_action">카테고리</string>
+    <string name="login_prologue_fifth_caption_three">런던의 박물관</string>
+    <string name="login_prologue_fifth_caption_two">세계 최고의 팬</string>
+    <string name="login_prologue_fifth_caption_one">상위 10개 카페</string>
+    <string name="login_prologue_fifth_tag_six">정치</string>
+    <string name="login_prologue_fifth_tag_five">음악</string>
+    <string name="login_prologue_fifth_tag_four">원예</string>
+    <string name="login_prologue_fifth_tag_three">축구</string>
+    <string name="login_prologue_fifth_tag_two">요리</string>
+    <string name="login_prologue_fifth_tag_one">예술</string>
+    <string name="login_prologue_fifth_subtitle_three">주간 락앤롤</string>
+    <string name="login_prologue_fifth_subtitle_two">웹 뉴스</string>
+    <string name="login_prologue_fifth_subtitle_one">파멜라 응우옌</string>
+    <string name="login_prologue_second_subtitle_two">사진가 카메론 카르스텐의 작업에서 깊은 영감을 받았습니다. 다음 번에 이 기법을 시도할 것입니다</string>
+    <string name="login_prologue_second_subtitle_one">영감받기</string>
+    <string name="login_prologue_title_fifth">좋아하는 사이트를 팔로우하고 새 블로그를 검색하세요.</string>
+    <string name="login_prologue_title_fourth">깊이 있는 분석으로 독자가 늘어나는 것을 확인하세요.</string>
+    <string name="login_prologue_title_third">댓글과 알림을 실시간으로 보세요.</string>
+    <string name="login_prologue_title_second">강력한 편집기로 이동 중에도 글을 쓸 수 있습니다.</string>
+    <string name="login_prologue_title_first">세계적으로 가장 잘 알려진 웹사이트 제작기에 오신 것을 환영합니다.</string>
+    <string name="media_loading_failed">미디어 로딩을 실패했습니다</string>
+    <string name="reader_discover_recommended_blogs_header">팔로우한 사이트</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">매 릴리즈마다 더 많은 블록을 추가하려고 열심히 일하고 있습니다.</string>
-    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\'을(를) 완전히 지원하지 않습니다</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">‘%s’을(를) 완전히 지원하지 않습니다</string>
     <string name="gutenberg_native_help_button">도움 버튼</string>
     <string name="gutenberg_native_edit_using_web_editor">웹 편집기를 이용하여 편집하기</string>
     <string name="gutenberg_native_choose_images">이미지 고르기</string>
@@ -18,19 +450,16 @@ Language: ko_KR
     <string name="stories_intro_title_first">이제 모두를 위한 이야기가 있습니다</string>
     <string name="stories_intro_image_caption_second">이야기 제목의 예제</string>
     <string name="stories_intro_image_caption_first">이야기 글을 만드는 방법</string>
-    <string name="stories_intro_main_subtitle">이야기 글을 일찍 접근할 수 있게 되었으니 한 번 사용해 보시기 바랍니다.</string>
     <string name="stories_intro_main_title">이야기 글 소개</string>
-    <string name="mlp_generic_error">레이아웃을 가져오는 동안 오류가 생겼습니다</string>
     <string name="mlp_notice_blank_page_created">빈 페이지를 만들었습니다</string>
     <string name="mlp_notice_page_created">페이지를 만들었습니다</string>
-    <string name="mlp_preview_title">레이아웃 미리보기</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s의 사진 접근이 거부되었습니다. 이를 고치려면, 권한을 고치고 %2$s와(과) %3$s을(를) 켜세요.</string>
     <string name="media_insert_failed">미디어 삽입을 실패했습니다.</string>
     <string name="media_insert_failed_with_reason">미디어 삽입을 실패했습니다: %s</string>
     <string name="photo_picker_wordpress_media_library">워드프레스 미디어 라이브러리에서 선택하기</string>
     <string name="reader_label_toolbar_back">돌아가기</string>
     <string name="reader_discover_empty_button_text">시작하기</string>
-    <string name="reader_discover_empty_title">새 블로그를 발견할 수 있는 토픽을 팔로우하세요</string>
+    <string name="reader_discover_empty_subtitle">새 블로그를 발견할 수 있는 토픽을 팔로우하세요</string>
     <string name="reader_post_details_header_by_author_name">작성자</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">이 리퍼러는 스팸으로 표시할 수 없습니다.</string>
     <string name="stats_referrer_popup_unmark_as_spam">스팸 표시 해제하기</string>
@@ -41,10 +470,11 @@ Language: ko_KR
     <string name="media_uploading_default">미디어 업로드 중</string>
     <string name="gutenberg_native_select_item">항목 선택하기</string>
     <string name="gutenberg_native_search_or_type_url">검색하거나 URL 입력하기</string>
+    <string name="gutenberg_native_page_break">페이지 자르기</string>
     <string name="gutenberg_native_add_this_telephone_link">이 전화 링크 추가하기</string>
     <string name="gutenberg_native_add_this_link">이 링크 추가하기</string>
     <string name="gutenberg_native_add_this_email_link">이 이메일 링크 추가하기</string>
-    <string name="suggestion_no_connection">“인터넷 연결이 없습니다.\n제안을 사용할 수 없습니다.”</string>
+    <string name="suggestion_no_connection">인터넷에 연결되지 않았습니다.\n제안을 사용할 수 없습니다.</string>
     <string name="typeface_label_shrikhand">굵게</string>
     <string name="typeface_label_space_mono">모던</string>
     <string name="typeface_label_pacifico">발랄</string>
@@ -60,7 +490,6 @@ Language: ko_KR
     <string name="comment_unable_to_show_error">이 댓글을 볼 수 없습니다</string>
     <string name="media_browse_for_items">항목 탐색하기</string>
     <string name="reader_menu_report_post">이 글 신고하기</string>
-    <string name="gutenberg_native_angle">각도</string>
     <string name="reader_welcome_banner">리더에 오신 것을 환영합니다. 손끝에서 백만의 블로그를 발견하세요.</string>
     <string name="error_media_xmlrcp_server_error">내부 서버 오류가 생겼습니다</string>
     <string name="error_media_xmlrpc_not_allowed">동작을 허용하지 않습니다</string>
@@ -70,7 +499,6 @@ Language: ko_KR
     <string name="create_post_story_fab_tooltip">글 또는 스토리 만들기</string>
     <string name="create_page_fab_tooltip">페이지 만들기</string>
     <string name="create_post_fab_tooltip">글 만들기</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">좋아할 수도 있습니다</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">숨기기</string>
     <string name="gutenberg_native_video_caption_empty">비디오 캡션입니다. 비었습니다</string>
@@ -109,7 +537,6 @@ Language: ko_KR
     <string name="dialog_discard_errored_page_message">이 슬라이드는 아직 저장하지 않았습니다. 이 슬라이드를 지웠다면, 편집한 내용을 읽게 될 것입니다.</string>
     <string name="dialog_discard_page_message">이 슬라이드는 스토리에서 지워질 것입니다.</string>
     <string name="dialog_discard_page_title">스토리 슬라이드를 지우시겠어요?</string>
-    <string name="menu_delete_page">슬라이드 지우기</string>
     <string name="label_text_color_button">본문 색상 변경하기</string>
     <string name="label_text_alignment_button">본문 정렬 변경하기</string>
     <string name="label_frame_errored">오류가 있습니다</string>
@@ -119,8 +546,6 @@ Language: ko_KR
     <string name="label_retry_icon">다시 시도하기</string>
     <string name="label_saved_icon">저장했습니다</string>
     <string name="label_close_button">닫기</string>
-    <string name="label_control_publish">다음</string>
-    <string name="label_done">완료했습니다</string>
     <string name="label_share_to">공유할 대상</string>
     <string name="label_snackbar_share">공유하기</string>
     <string name="label_snackbar_loop_frame_saved">사진에 저장했습니다</string>
@@ -131,7 +556,6 @@ Language: ko_KR
     <string name="label_control_flip_camera">뒤집기</string>
     <string name="sound_button_alt">소리</string>
     <string name="text_button_alt">문자</string>
-    <string name="more_button_alt">기타</string>
     <string name="stickers_button_alt">스티커</string>
     <string name="flash_button_alt">플래시</string>
     <string name="flip_button_alt">카메라 뒤집기</string>
@@ -144,7 +568,7 @@ Language: ko_KR
     <string name="prepublishing_nudges_story_title_hint">스토리에 제목을 부여하기</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">글 또는 스토리 만들기</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">글, 페이지 또는 스토리를 만들기</string>
-    <string name="quick_start_dialog_create_new_post_message_short">%1$s 만들기를 %2$s탭하세요. 다음 &lt;b>블로그 글&lt;/b>을 선택하세요</string>
+    <string name="quick_start_dialog_create_new_post_message_short">%1$s 만들기를 %2$s탭하세요. 다음 &lt;b&gt;블로그 글&lt;/b&gt;을 선택하세요</string>
     <string name="photo_picker_choose_file">장치에서 선택하기</string>
     <string name="my_site_bottom_sheet_add_story">스토리 글</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">자체 호스팅 워드프레스 사이트의 사이트 아이콘 편집은 잿펙 플러그인이 필요합니다.</string>
@@ -158,13 +582,10 @@ Language: ko_KR
     <string name="gutenberg_native_choose_image_or_video">이미지나 비디오 고르기</string>
     <string name="gutenberg_native_choose_image">이미지 고르기</string>
     <string name="gutenberg_native_block_removed">블록을 제거했습니다</string>
-    <string name="content_description_logo">워드프레스 로고</string>
-    <string name="enter_your_site_address">새로 만들 사이트 주소 입력하기</string>
-    <string name="continue_with_wpcom">워드프레스닷컴으로 계속하기</string>
+    <string name="enter_your_site_address">이미 있는 사이트 주소 입력하기</string>
     <string name="signup_confirmation_title">등록 확인</string>
     <string name="continue_with_google_terms_of_service_text">워드프레스닷컴 계정이 없는 상태에서 Google로 계속하기를 선택하는 경우, 계정을 만들고 %1$s서비스 약관%2$s에 동의하는 것으로 간주됩니다.</string>
     <string name="continue_terms_of_service_text">계속하면 %1$s서비스 약관%2$s에 동의하는 것입니다.</string>
-    <string name="signup_confirmation_magic_link_message">새 워드프레스닷컴 계정을 만드는 등록 링크를 이메일 할 것입니다.</string>
     <string name="signup_confirmation_message">이 이메일 주소를 사용하여 새 워드프레스닷컴 계정을 만들 것입니다.</string>
     <string name="signup_magic_link_message">워드프레스닷컴 계정을 만드는 등록 링크를 이메일 하였습니다. 이 장치에서 이메일을 확인하고, 워드프레스닷컴에서 받은 이메일에 있는 링크를 누르세요.</string>
     <string name="enter_account_info_for_site">%1$s에 대한 계정 정보를 입력합니다.</string>
@@ -181,19 +602,15 @@ Language: ko_KR
     <string name="or_type_your_password">또는 비밀번호 입력하기</string>
     <string name="create_account">계정 만들기</string>
     <string name="send_link_by_email">이메일로 링크 보내기</string>
-    <string name="login_promo_text_unlock_the_power">가장 유연한 웹사이트 제작 도구의 능력을 직접 경험해보세요.</string>
-    <string name="login_promo_title_37_percent">웹의 37\%가 워드프레스로 만들어졌습니다.</string>
     <string name="reset_your_password">비밀번호 재설정하기</string>
     <string name="reader_error_request_failed_title">요청을 처리하는 중에 문제가 있었습니다. 나중에 다시 시도하시기 바랍니다.</string>
-    <string name="quick_start_list_update_site_title_subtitle">개성과 주제를 반영할 사이트 이름을 주세요. 첫 인상이 중요합니다!</string>
     <string name="quick_start_list_update_site_title_title">사이트 제목을 설정하세요</string>
-    <string name="quick_start_dialog_update_site_title_message_short">&lt;b>%1$s&lt;/b>(을)를 눌러 새 제목 설정하기</string>
+    <string name="quick_start_dialog_update_site_title_message_short">&lt;b&gt;%1$s&lt;/b&gt;(을)를 눌러 새 제목 설정하기</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">이 글을 휴지통에 버리면 로컬 변경사항도 취소될 것입니다. 계속하기 원하시는게 맞나요?</string>
     <string name="gutenberg_native_s_block_options">%s 블록 옵션</string>
     <string name="gutenberg_native_duplicate_block">블록 복제하기</string>
     <string name="gutenberg_native_copy_block">블록 복사하기</string>
     <string name="gutenberg_native_copied_block">복사된 블록</string>
-    <string name="gutenberg_native_block_settings">블록 설정</string>
     <string name="gutenberg_native_block_pasted">블록을 붙여넣었습니다</string>
     <string name="gutenberg_native_block_duplicated">블록을 복제하였습니다</string>
     <string name="gutenberg_native_block_cut">블록을 잘라내었습니다</string>
@@ -209,7 +626,6 @@ Language: ko_KR
     <string name="gutenberg_native_gradient_type">그라디언트 유형</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">옵션을 선택하려면 두 번 탭하기</string>
     <string name="gutenberg_native_customize_gradient">그라디언트 사용자 정의하기</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">페이지 작성자</string>
     <string name="photo_picker_use_gif">이 GIF 사용하기</string>
     <string name="error_media_thumbnail_not_loaded">미디어 썸네일을 불러 올 수 없습니다</string>
@@ -229,11 +645,11 @@ Language: ko_KR
     <string name="prepublishing_nudges_tags_action">태그</string>
     <string name="prepublishing_nudges_publish_action">발행일</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">취소</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_positive">초안으로 이동</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">초안으로 이동하기</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">휴지통에 있는 글은 편집할 수 없습니다. 이 글의 상태를 “초안”으로 변경하여 작업할 수 있기를 원하십니까?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">글을 초안으로 옮깁니까?</string>
-    <string name="reader_label_choose_your_interests">관심 항목을 고르세요</string>
-    <string name="reader_choose_interests_content_description">관심사항 고르기</string>
+    <string name="reader_label_choose_your_interests">주제 선택</string>
+    <string name="reader_choose_interests_content_description">주제 선택</string>
     <string name="reader_btn_done">완료</string>
     <string name="reader_btn_select_few_interests">계속하기 위해 몇 가지 더 선택하기</string>
     <string name="post_status_post_published">발행됨</string>
@@ -245,17 +661,14 @@ Language: ko_KR
     <string name="ccpa_privacy_notice_header">캘리포니아 사용자를 위한 개인정보보호 고지</string>
     <string name="status_and_visibility">상태 &amp; 가시성</string>
     <string name="update_now">지금 업데이트하기</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">스타터 레이아웃 시도하기</string>
     <string name="gutenberg_native_open_block_actions_menu">블록 동작 메뉴 열기</string>
-    <string name="gutenberg_native_insert_mention">언급 넣기</string>
+    <string name="gutenberg_native_move_to_top">위로 이동하기</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">두 번 눌러 사용 가능한 선택지가 있는 하단 시트 열기</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">두 번 눌러 사용 가능한 선택지가 있는 동작 시트를 열기</string>
     <string name="pages_cannot_be_started">지금은 페이지를 열 수 없습니다. 나중에 다시 시도하시기 바랍니다</string>
     <string name="pages_set_as_posts_page">글 페이지로 설정</string>
     <string name="pages_set_as_homepage">홈페이지로 설정</string>
-    <string name="suggestion_no_matching_users">일치하는 사용자가 없습니다.</string>
-    <string name="suggestion_invalid_user">“%s(은)는 유효한 사용자가 아닙니다”</string>
+    <string name="suggestion_invalid">%s은(는) 유효한 %s이(가) 아님</string>
     <string name="site_settings_select_page">페이지 선택</string>
     <string name="site_settings_posts_page">글 페이지</string>
     <string name="site_settings_static_homepage">정적 홈페이지</string>
@@ -275,7 +688,6 @@ Language: ko_KR
     <string name="page_homepage_successfully_updated">홈페이지를 성공적으로 업데이트하였습니다</string>
     <string name="page_cannot_set_posts_page">사이트 설정에서 글 페이지를 “정적 홈페이지” 활성화로 설정하기</string>
     <string name="page_cannot_set_homepage">사이트 설정에서 홈페이지를 “정적 홈페이지” 활성화로 설정하기</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">새 블로그에 오신 것을 환영합니다.</string>
     <string name="gutenberg_native_select_a_color">색상 선택</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">색상 설정으로 이동하려면 두 번 탭하세요.</string>
     <string name="reader_empty_followed_blogs_description">사이트를 팔로우하면 여기에 해당 콘텐츠가 표시됩니다.</string>
@@ -309,7 +721,6 @@ Language: ko_KR
     <string name="gutenberg_native_move_block_left">블록 왼쪽으로 움직이기</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">블록을 오른쪽으로 움직이려면 두 번 탭</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">블록을 왼쪽으로 움직이려면 두 번 탭</string>
-    <string name="gutenberg_native_blog">블로그</string>
     <string name="new_site_creation_creating_site_loading_4">알림판을 만드는 중</string>
     <string name="new_site_creation_creating_site_loading_3">테마를 설정 중</string>
     <string name="new_site_creation_creating_site_loading_2">사이트 기능 추가 중</string>
@@ -365,57 +776,20 @@ Language: ko_KR
     <string name="app_theme_light">밝음</string>
     <string name="app_theme">외관</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">최근 이 페이지를 변경했지만 저장하지 않았습니다. 불러올 버전을 선택하세요:\n</string>
-    <string name="gutenberg_native_what_people_say">추천의 말</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">회원님이 원하는 결과를 얻을 수 있도록 다양한 서비스를 제공합니다. 필요한 서비스가 무엇인지, 아니면 비용이 얼마인지 잘 모르시겠나요? 어떤 서비스가 적합한지 설명하고 비용에 대해 자세히 알려드릴 수 있습니다. 아래로 문의하세요.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">다양한 기술과 경험을 갖춘 재능 있는 전문가로 이루어진 소규모 팀입니다. 일을 사랑하며 열정적으로 일합니다. 회원님을 기다리고 있겠습니다.</string>
-    <string name="gutenberg_native_warning_message">경고 메시지</string>
-    <string name="gutenberg_native_want_to_work_with_us">함께 하고 싶으신가요?</string>
-    <string name="gutenberg_native_walt_disney">월트 디즈니</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">방문자는 페이지를 만든 사람에 관해 알고 싶어 합니다. 이 공간에 회원님 자신이나 회원님의 사이트, 비즈니스에 관한 소개나 원하는 내용을 기록하세요. 아래의 추천 글을 사용하여 같은 내용을 자신만의 언어로 이야기하는 다른 사람의 글을 인용하세요.</string>
-    <string name="gutenberg_native_usa">미국</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">다음은 샘플 콘텐츠이며, 기능을 설명하는 템플릿도 포함되어 있습니다. 이 콘텐츠를 제거하거나 자신만의 언어와 미디어로 바꾸세요.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">시작하려면 말을 그치고 행동으로 옮겨야 한다.</string>
-    <string name="gutenberg_native_team">팀</string>
-    <string name="gutenberg_native_success_message">성공 메시지</string>
-    <string name="gutenberg_native_strategy">전략</string>
     <string name="gutenberg_native_show_post_content">글 콘텐츠 보기</string>
-    <string name="gutenberg_native_services">서비스</string>
-    <string name="gutenberg_native_samuel_the_dog">강아지 사무엘</string>
-    <string name="gutenberg_native_sally_smith">샐리 스미스</string>
-    <string name="gutenberg_native_project_name">프로젝트 이름</string>
-    <string name="gutenberg_native_position_or_job_title">직위 또는 직급</string>
-    <string name="gutenberg_native_portfolio">포트폴리오</string>
     <string name="gutenberg_native_only_show_excerpt">요악문만 표시</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">제 포트폴리오에 경력을 쌓으면서 작업한 다양한 프로젝트가 나와 있습니다. 아래에서 연락처를 확인하고 연락해주세요.</string>
     <string name="gutenberg_native_link_to">링크</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">상담하기. 👋 아래의 연락처 정보로 문의하거나 양식을 사용하여 메시지를 보내세요.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">함께 만들어 보세요!</string>
-    <string name="gutenberg_native_let_s_build_something_together">함께 만들어 보세요!</string>
-    <string name="gutenberg_native_juan_p_rez">후안 페레스</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. 롤링</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">해리야, 우리가 진짜 누군지 보여주는 건 우리 능력들보다는 우리의 선택이야.</string>
-    <string name="gutenberg_native_inspiration">영감</string>
-    <string name="gutenberg_native_get_in_touch">문의하기</string>
+    <string name="gutenberg_native_link_settings">링크 설정</string>
     <string name="gutenberg_native_excerpt_length_words">요약문 길이(단어)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">이메일: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">닥터 수스</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">끝났다고 울지 말고, 지나간 추억을 떠올리며 미소지어라.</string>
     <string name="gutenberg_native_customize">사용자 정의</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
+    <string name="gutenberg_native_video_settings">비디오 설정</string>
     <string name="gutenberg_native_add_paragraph_block">단락 블록 추가</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">제공하는 서비스에 대한 간단한 설명입니다.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">개인사, 주요 성취, 흥미로운 점을 담은 간단한 소개입니다.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">프로젝트와 작품에 대한 설명이 표시됩니다.</string>
-    <string name="gutenberg_native_555_555_1234">(555) 555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">게시물 작성</string>
     <string name="post_list_tab_trashed_posts">삭제된</string>
     <string name="post_list_tab_scheduled_posts">예약됨</string>
     <string name="post_list_tab_published_posts">게시됨</string>
     <string name="sharing_facebook_account_must_have_pages">페이스북 연결에서 페이지를 찾을 수 없습니다. 배포 기능은 페이스북 프로필에 연결할 수 없으며 게시된 페이지에만 연결할 수 있습니다.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">연결되지 않음</string>
-    <string name="my_site_select_domains_page_title">사이트 주소</string>
     <string name="notifications_tab_title_likes">좋아요</string>
     <string name="notifications_tab_title_follows">팔로우</string>
     <string name="notifications_tab_title_comments">댓글</string>
@@ -429,14 +803,12 @@ Language: ko_KR
     <string name="stats_management_add_new_stats_card">새 스탯 카드 추가</string>
     <string name="reader_self_hosted_select_filter">필터 버튼을 사용하여 특정 주제에 대한 글을 찾습니다.</string>
     <string name="reader_bottom_sheet_content_description">태그 또는 사이트, 팝업 창을 선택합니다.</string>
-    <string name="reader_btn_selected_filter_tick_content_description">선택되었습니다.</string>
     <string name="reader_btn_select_filter_content_description">사이트 또는 태그를 선택하여 글을 필터링합니다.</string>
     <string name="reader_btn_remove_filter_content_description">현재 필터 제거</string>
     <string name="reader_title_subs">토픽과 사이트 관리하기</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">워드프레스닷컴에 로그인</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">워드프레스닷컴에 로그인하여 팔로우하는 토픽의 최신 글을 확인하세요</string>
     <string name="reader_filter_self_hosted_empty_sites_list">워드프레스닷컴에 로그인하여 내가 팔로우하는 사이트의 최신 글을 확인하세요.</string>
-    <string name="gutenberg_native_template_preview">템플릿 미리보기</string>
     <string name="gutenberg_native_replace_current_block">현재 블록 대체하기</string>
     <string name="gutenberg_native_add_to_end">끝에 추가하기</string>
     <string name="gutenberg_native_add_to_beginning">처음에 추가하기</string>
@@ -450,7 +822,6 @@ Language: ko_KR
     <string name="reader_filter_cta">필터</string>
     <string name="gutenberg_native_video_caption_s">비디오 캡션. %s</string>
     <string name="gutenberg_native_edit_video">비디오 편집</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">레이아웃을 선택하려면 두 번 탭하세요.</string>
     <string name="gutenberg_native_add_a_shortcode">쇼트코드 추가…</string>
     <string name="post_list_author">작성자</string>
     <string name="fab_create_desc">게시물 작성</string>
@@ -465,10 +836,8 @@ Language: ko_KR
     <string name="stats_box_type_low">낮음</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">이미지를 앞으로 이동</string>
-    <string name="gutenberg_native_move_image_backward">이미지를 뒤로 이동</string>
+    <string name="gutenberg_native_replace_image">이미지 삭제</string>
     <string name="gutenberg_native_gallery_caption_s">갤러리 캡션. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s 현재 값은 %2$s입니다.</string>
     <string name="create_post_page_fab_tooltip">글 또는 페이지 만들기</string>
     <string name="content_description_person_building_website">사람 건물 웹사이트</string>
     <string name="post_signup_interstitial_not_right_now">나중에</string>
@@ -482,21 +851,17 @@ Language: ko_KR
     <string name="my_site_bottom_sheet_add_post">블로그 글</string>
     <string name="my_site_bottom_sheet_title">새로 추가</string>
     <string name="post_settings_publish">발행</string>
-    <string name="dialog_gutenberg_informative_description_v2">블록 편집기를 크게 개선했습니다. 한 번 시도해 볼 가치가 있다고 생각합니다! 새 글 및 페이지에서 사용하도록 설정했지만 클래식 편집기로 변경하려면 ‘내 사이트’ > ‘사이트 설정’으로 이동하세요.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">지금 동기화</string>
     <string name="dialog_confirm_scheduled_post_sync_message">이 글은 즉시 동기화됩니다.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">동기화할 준비가 되셨습니까?</string>
     <string name="new_site_creation_unavailable_domain">이 도메인을 사용할 수 없습니다.</string>
-    <string name="login_promo_viewpager_content_description">소개</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">사이트에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
-    <string name="login_discovery_error_ssl">&lt;b>SSL 인증서&lt;/b> 문제로 인해 사이트에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
-    <string name="login_discovery_error_http_auth">&lt;b>HTTP 인증&lt;/b>이 필요하므로 사이트에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
-    <string name="login_discovery_error_xmlrpc">사이트에서 &lt;b>XMLRPC 파일&lt;/b>에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
-    <string name="login_site_credentials_magic_link_label">마지막 부분입니다! 젯팩에 연결된 이메일 주소 &lt;b>%1$s&lt;/b>만 확인하면 됩니다.</string>
-    <string name="enter_site_credentials_instead">사이트 자격 증명으로 로그인합니다.</string>
+    <string name="login_discovery_error_ssl">&lt;b&gt;SSL 인증서&lt;/b&gt; 문제로 인해 사이트에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
+    <string name="login_discovery_error_http_auth">&lt;b&gt;HTTP 인증&lt;/b&gt;이 필요하므로 사이트에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
+    <string name="login_discovery_error_xmlrpc">사이트에서 &lt;b&gt;XMLRPC 파일&lt;/b&gt;에 액세스할 수 없습니다. 이 문제를 해결하려면 호스트에게 연락해야 합니다.</string>
+    <string name="login_site_credentials_magic_link_label">마지막 부분입니다! 젯팩에 연결된 이메일 주소 &lt;b&gt;%1$s&lt;/b&gt;만 확인하면 됩니다.</string>
     <string name="enter_credentials_for_site">%1$s 사이트 자격 증명으로 로그인</string>
-    <string name="send_verification_email">인증 이메일 보내기</string>
     <string name="my_site_bottom_sheet_add_page">사이트 페이지</string>
     <string name="reader_following_display_name">팔로우 중</string>
     <string name="reader_my_likes_display_name">좋아요</string>
@@ -513,23 +878,19 @@ Language: ko_KR
     <string name="posts_cannot_be_started">지금 이 글을 열 수 없습니다. 나중에 다시 시도해 주세요.</string>
     <string name="site_cannot_be_loaded">사이트의 데이터를 현재 로드할 수 없습니다. 나중에 다시 시도해 주세요.</string>
     <string name="gutenberg_native_wordpress_media_library">워드프레스 미디어 라이브러리</string>
+    <string name="gutenberg_native_unsupported">지원되지 않음</string>
     <string name="gutenberg_native_ungroup">그룹 해제</string>
     <string name="gutenberg_native_translate">번역</string>
-    <string name="gutenberg_native_title">제목:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">키보드를 숨기려면 탭</string>
     <string name="gutenberg_native_tap_here_to_show_help">도움말을 보려면 여기를 탭</string>
     <string name="gutenberg_native_take_a_video">비디오 촬영</string>
     <string name="gutenberg_native_take_a_photo_or_video">사진 찍기 또는 비디오 촬영</string>
     <string name="gutenberg_native_take_a_photo">사진 촬영</string>
     <string name="gutenberg_native_start_writing">글쓰기 시작…</string>
-    <string name="gutenberg_native_size">크기</string>
-    <string name="gutenberg_native_sidebar_title_plugin">사이드바 제목 플러그인</string>
     <string name="gutenberg_native_show_section">섹션 표시</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s 블록. 이 블록에는 잘못된 내용이 있습니다.</string>
     <string name="gutenberg_native_s_block_empty">%s 블록. 비어 있음</string>
     <string name="gutenberg_native_cut_block">블록 잘라내기</string>
-    <string name="gutenberg_native_reset_block">블록 리셋</string>
-    <string name="gutenberg_native_remove_annotations">주석 제거</string>
     <string name="gutenberg_native_problem_opening_the_video">비디오 열기 문제</string>
     <string name="gutenberg_native_problem_displaying_block">블록 표시 문제</string>
     <string name="gutenberg_native_post_title_s">글 제목. %s</string>
@@ -539,17 +900,12 @@ Language: ko_KR
     <string name="gutenberg_native_open_settings">설정 열기</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">이 요청을 처리할 수 있는 애플리케이션이 없습니다. 웹 브라우저를 설치하세요.</string>
     <string name="gutenberg_native_navigate_up">위로 탐색</string>
-    <string name="gutenberg_native_my_pre_publish_panel">내 사전 발행 패널</string>
-    <string name="gutenberg_native_my_post_status_info">내 글 상태 정보</string>
-    <string name="gutenberg_native_my_post_publish_panel">내 글 발행 패널</string>
-    <string name="gutenberg_native_my_document_setting_panel">내 문서 설정 패널</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">블록을 위로(%1$s 행에서 %2$s 행으로) 이동</string>
     <string name="gutenberg_native_move_block_up">블록을 위로 이동</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">블록을 아래로(%1$s 행에서 %2$s 행으로) 이동</string>
     <string name="gutenberg_native_move_block_down">블록을 아래로 이동</string>
     <string name="gutenberg_native_image_caption_s">이미지 캡션. %s</string>
     <string name="gutenberg_native_hide_keyboard">키보드 숨기기</string>
-    <string name="gutenberg_native_here_is_the_panel_content">패널 콘텐츠입니다!</string>
     <string name="gutenberg_native_help_icon">도움말 아이콘</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">미디어를 삽입하지 못했습니다.\n옵션을 보려면 누르세요.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">마지막 변경을 취소하려면 두 번 탭하세요.</string>
@@ -561,34 +917,20 @@ Language: ko_KR
     <string name="gutenberg_native_double_tap_to_move_the_block_up">블록을 위로 이동하려면 두 번 탭하세요.</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">블록을 아래로 이동하려면 두 번 탭하세요.</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">이 값을 편집하려면 두 번 탭하세요.</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">슬라이더를 사용하여 값을 변경하려면 두 번 탭하세요.</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">블록을 추가하려면 두 번 탭하세요.</string>
     <string name="gutenberg_native_current_value_is_s">현재 값은 %s입니다.</string>
-    <string name="gutenberg_native_content">콘텐츠…</string>
     <string name="gutenberg_native_choose_from_device">기기에서 선택</string>
-    <string name="gutenberg_native_annotations_sidebar">주석 사이드바</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">알 수 없는 오류가 발생했습니다. 다시 시도하세요.</string>
     <string name="gutenberg_native_alt_text">대체 텍스트</string>
     <string name="gutenberg_native_add_video">비디오 추가</string>
     <string name="gutenberg_native_add_url">URL 추가</string>
+    <string name="gutenberg_native_add_alt_text">대체 텍스트 추가</string>
     <string name="gutenberg_native_add_image_or_video">이미지 또는 비디오 추가</string>
     <string name="gutenberg_native_add_image">이미지 추가</string>
     <string name="gutenberg_native_add_block_here">블록을 여기에 추가</string>
-    <string name="gutenberg_native_add_annotation">주석 추가</string>
-    <string name="gutenberg_native_add_a_description">설명 추가</string>
     <string name="reader_empty_saved_posts_content_description">“글을 목록에 저장하려면 글 저장 버튼을 탭합니다.”</string>
     <string name="reader_acessibility_list_loaded">\"목록에 %1$d개 항목이 로드되었습니다. \"</string>
     <string name="notifications_tab_dialog_switch_desc">알림</string>
-    <string name="master_switch_default_title_off">끔</string>
-    <string name="master_switch_default_title_on">켬</string>
-    <string name="notifications_tab_dialog_master_off_message">이 사이트의 알림을 끄면 이 사이트의 알림 탭에서 알림 표시가 사용 안 함으로 설정됩니다. 이 사이트의 알림을 켠 후 표시할 알림의 종류를 세부적으로 조정할 수 있습니다.</string>
-    <string name="notifications_tab_dialog_master_off_title">이 사이트의 알림 탭에 알림을 표시하려면 이 사이트의 알림을 켜세요.</string>
-    <string name="notifications_tab_dialog_master_hint_off">이 사이트의 알림 탭에서 알림 표시 사용</string>
-    <string name="notifications_tab_dialog_master_hint_on">이 사이트의 알림 탭에서 알림 표시 사용 안 함</string>
-    <string name="notifications_tab_dialog_master_status_off">이 사이트의 알림</string>
-    <string name="notifications_tab_dialog_master_status_on">이 사이트의 알림</string>
-    <string name="dialog_gutenberg_informative_description_page">이제 새 페이지에 블록 편집기를 사용하게 됩니다. \u2014 잘하셨습니다! 고전 편집기로 변경하려면 \'내 사이트\'> \'사이트 설정\'으로 이동하세요.</string>
-    <string name="dialog_gutenberg_informative_description_post">이제 새 글에 블록 편집기를 사용합니다. \u2014 잘하셨습니다! 고전 편집기로 변경하려면 \'내 사이트\'> \'사이트 설정\'으로 이동하세요.</string>
     <string name="pick_media">이미지 또는 비디오 추가</string>
     <string name="error_post_not_submitted_retrying">리뷰를 위해 이 글을 제출하지 못했지만 나중에 다시 시도하겠습니다. </string>
     <string name="error_post_not_scheduled_retrying">이 글을 예약하지 못했지만 나중에 다시 시도하겠습니다.</string>
@@ -681,8 +1023,6 @@ Language: ko_KR
     <string name="post_settings_add_to_calendar">달력에 추가</string>
     <string name="post_settings_notification">알림</string>
     <string name="post_settings_time_and_date">날짜와 시간</string>
-    <string name="login_need_help_finding_connected_email">연결한 이메일을 찾는 데 도움이 필요하신가요?</string>
-    <string name="enter_wordpress_site">이 주소의 웹사이트는 워드프레스 사이트가 아닙니다. 워드프레스에서 연결하려면 사이트에 워드프레스가 설치되어 있어야 합니다.</string>
     <string name="login_invalid_site_url">example.com과 같은 완전한 웹사이트 주소를 입력하세요.</string>
     <string name="enter_email_for_site">%1$s에 연결하려면 워드프레스닷컴에 로그인하세요.</string>
     <string name="stats_post_views_label">조회수</string>
@@ -748,7 +1088,7 @@ Language: ko_KR
     <string name="domain_registration_state_picker_dialog_title">주 선택</string>
     <string name="domain_registration_country_picker_dialog_title">국가 선택</string>
     <string name="domain_registration_result_continue_button">계속</string>
-    <string name="domain_registration_result_description">새 도메인 &lt;b>%s&lt;/b>을(를) 설정 중입니다. 회원님의 사이트를\n 마음껏 이용하세요!</string>
+    <string name="domain_registration_result_description">새 도메인 &lt;b&gt;%s&lt;/b&gt;을(를) 설정 중입니다. 회원님의 사이트를\n 마음껏 이용하세요!</string>
     <string name="domain_registration_result_title">축하합니다.</string>
     <string name="domain_contact_information_register_domain_button">도메인 등록</string>
     <string name="domain_contact_information_postal_code_hint">우편번호</string>
@@ -799,7 +1139,7 @@ Language: ko_KR
     <string name="post_trashing">글이 휴지통으로 이동 중</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">이 글을 휴지통에 버리면 로컬 변경 사항이 취소됩니다. 계속하시겠습니까?</string>
     <string name="dialog_confirm_trash_losing_local_changes_title">로컬 변경</string>
-    <string name="button_move_to_draft">임시글로 이동</string>
+    <string name="button_move_to_draft">임시글로 이동하기</string>
     <string name="post_list_toggle_item_layout_list_view">목록 보기로 전환</string>
     <string name="post_list_toggle_item_layout_cards_view">카드 보기로 전환</string>
     <string name="posts_trashed_empty">휴지통에 버린 글이 없습니다.</string>
@@ -856,24 +1196,20 @@ Language: ko_KR
     <string name="plans_loading_error_no_plans_title">요금제를 로드할 수 없음</string>
     <string name="plans_loading_error_network_title">연결 없음</string>
     <string name="menu_switch_to_gutenberg_editor">블록 편집기로 전환</string>
-    <string name="menu_switch_to_aztec_editor">구 버전 편집기로 전환</string>
     <string name="stats_loading_block_error">데이터 로드 중에 문제가 발생했습니다. 페이지를 새로 고치고 다시 시도하세요.</string>
     <string name="stats_loading_error">데이터가 로드되지 않음</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">블록 편집기로 새 글과 페이지 편집</string>
     <string name="site_settings_gutenberg_default_for_new_posts">블록 편집기 사용</string>
-    <string name="dialog_gutenberg_informative_title">블록 편집기가 활성화됨</string>
     <string name="exit">종료</string>
     <string name="quick_start_sites_type_subtitle">%1$d/%2$d 완료</string>
-    <string name="quick_start_sites_type_grow">방문자 수를 늘리세요</string>
-    <string name="quick_start_sites_type_customize">사이트 사용자 정의</string>
+    <string name="quick_start_sites_type_grow">방문자 늘리기</string>
+    <string name="quick_start_sites_type_customize">사이트를 사용자 정의 하기</string>
     <string name="quick_start_sites">다음 단계</string>
     <string name="quick_start_complete_tasks_header">완료(%d)</string>
     <string name="quick_start_dialog_view_site_message">완성된 제품을 즐기세요!</string>
     <string name="quick_start_dialog_upload_icon_title">사이트 아이콘 업로드</string>
     <string name="quick_start_dialog_upload_icon_message">방문자의 브라우저에 아이콘이 표시됩니다. 깔끔하고 전문적인 모양을 만들려면 사용자 정의 아이콘을 추가하세요.</string>
     <string name="quick_start_dialog_explore_plans_message_short">현재 요금제 및 사용 가능한 다른 요금제를 보려면 %1$s요금제%2$s를 탭합니다.</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">새 페이지를 만들려면 %1$s페이지 추가%2$s를 탭합니다.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">계속하려면 %1$s사이트 페이지%2$s를 탭합니다.</string>
     <string name="quick_start_dialog_check_stats_message_short">사이트 성능을 확인하려면 %1$s통계%2$s를 탭합니다.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">새로 업로드하려면 %1$s사이트 아이콘%2$s을 탭합니다.</string>
     <string name="quick_start_dialog_publish_post_message">임시글을 작성하여 첫 번째 글을 게시하세요.</string>
@@ -884,13 +1220,8 @@ Language: ko_KR
     <string name="quick_start_dialog_explore_plans_message">유료 요금제의 마케팅 및 SEO 도구에 대해 알아보세요.</string>
     <string name="quick_start_dialog_enable_sharing_title">글 공유 설정</string>
     <string name="quick_start_dialog_enable_sharing_message">새 글을 소셜 미디어 계정에 자동으로 공유합니다.</string>
-    <string name="quick_start_dialog_customize_site_message">글꼴을 조정하고 이미지를 추가하는 등의 작업을 하세요.</string>
-    <string name="quick_start_dialog_create_page_title">새 페이지 생성</string>
-    <string name="quick_start_dialog_create_page_message">주요 콘텐츠용 페이지 추가 - “정보” 페이지에서 시작하는 것이 좋습니다.</string>
     <string name="quick_start_dialog_check_stats_title">사이트 통계 확인</string>
     <string name="quick_start_dialog_check_stats_message">사이트 성능을 최신 상태로 유지합니다.</string>
-    <string name="quick_start_dialog_browse_themes_title">테마 찾아보기</string>
-    <string name="quick_start_dialog_browse_themes_message">다양한 레이아웃 옵션을 살펴보고 가장 적합한 테마를 찾으세요.</string>
     <string name="quick_start_dialog_remove_next_steps_message">다음 단계를 제거하면 이 사이트의 모든 둘러보기가 숨겨집니다. 이 작업은 되돌릴 수 없습니다.</string>
     <string name="quick_start_dialog_remove_next_steps_title">다음 단계 제거</string>
     <string name="quick_start_remove_next_steps_menu_title">제거</string>
@@ -914,15 +1245,11 @@ Language: ko_KR
     <string name="notification_new_site_creation_failed">문제가 발생했습니다.</string>
     <string name="notification_new_site_creation_title">사이트 생성</string>
     <string name="new_site_creation_create_site_button">사이트 생성</string>
-    <string name="new_site_creation_search_domain_input_hint">도메인 검색</string>
     <string name="new_site_creation_domain_header_subtitle">사람들이 인터넷에서 회원님을 찾을 수 있는 곳입니다.</string>
-    <string name="new_site_creation_domain_header_title">사이트의 도메인 네임 선택</string>
     <string name="new_site_creation_empty_domain_list_message">검색 내용과 일치하는 주소가 없습니다.</string>
     <string name="site_creation_error_generic_subtitle">서버와 통신하는 동안 오류가 발생했습니다. 다시 시도하세요.</string>
     <string name="site_creation_error_generic_title">문제가 발생했습니다.</string>
     <string name="site_creation_fetch_suggestions_error_unknown">문제가 발생했습니다.</string>
-    <string name="site_creation_segments_subtitle">추천 사항을 제안하는 데 도움이 됩니다. 절대 고정된 것은 아닙니다. 모든 사이트는 진화합니다.</string>
-    <string name="site_creation_segments_title">어떤 종류의 사이트를 만들고 싶으신가요?</string>
     <string name="new_site_creation_preview_title">사이트가 생성되었습니다!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d/%2$d</string>
     <string name="new_site_creation_screen_title_general">사이트 생성</string>
@@ -1037,8 +1364,8 @@ Language: ko_KR
     <string name="pages_search_suggestion">페이지 검색</string>
     <string name="pages_empty_search_result">검색어와 일치하는 페이지 없음</string>
     <string name="pages_delete_permanently">영구적으로 삭제하기</string>
-    <string name="pages_move_to_trash">휴지통으로 이동</string>
-    <string name="pages_move_to_draft">임시글로 이동</string>
+    <string name="pages_move_to_trash">휴지통으로 이동하기</string>
+    <string name="pages_move_to_draft">임시글로 이동하기</string>
     <string name="pages_set_parent">상위 항목 설정</string>
     <string name="pages_view">보기</string>
     <string name="pages_trashed">삭제된</string>
@@ -1077,15 +1404,9 @@ Language: ko_KR
     <string name="quick_start_dialog_need_help_button_neutral">절대</string>
     <string name="quick_start_dialog_need_help_button_negative">아니오</string>
     <string name="quick_start_dialog_follow_sites_title">다른 사이트 팔로우</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">%1$s 검색 %2$s을 탭하여 관심사가 비슷한 사이트 찾기</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">%1$s 검색 %2$s을(를) 탭하여 주제가 비슷한 사이트 찾기</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">%1$s 리더 %2$s를 탭하여 계속하기</string>
     <string name="quick_start_dialog_follow_sites_message">도움을 받은 사이트를 찾은 다음 업데이트가 게시될 때 받을 수 있도록 팔로우하세요.</string>
-    <string name="quick_start_dialog_customize_site_title">사이트 사용자 정의</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">%1$s 테마 %2$s를 탭하여 계속하기</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">%1$s 사용자 정의 %2$s를 탭하여 사이트 개인화 시작</string>
-    <string name="quick_start_dialog_choose_theme_title">테마 선택</string>
-    <string name="quick_start_dialog_browse_themes_message_short">%1$s 테마 %2$s를 탭하여 새 테마 검색하기</string>
-    <string name="quick_start_dialog_choose_theme_message">모든 테마를 검색하여 어울리는 것을 찾으세요.</string>
     <string name="quick_start_button_positive">이동</string>
     <string name="quick_start_button_negative_short">취소</string>
     <string name="quick_start_button_negative">지금 안 함</string>
@@ -1149,13 +1470,11 @@ Language: ko_KR
     <string name="support_contact_email">연락처 이메일</string>
     <string name="application_log_button">애플리케이션 로그</string>
     <string name="my_tickets">내 티켓</string>
-    <string name="activity_log_rewind_dialog_message">사이트를 %s(%s)(으)로 되돌리시겠습니까? 이렇게 하면 이 날짜 이후로 만들거나 변경한 콘텐츠와 옵션이 모두 제거됩니다.</string>
-    <string name="activity_log_rewind_site">사이트 되돌리기</string>
     <string name="activity_log_currently_restoring_message_no_dates">되돌리기 진행 중</string>
-    <string name="activity_log_currently_restoring_message">%s %s(으)로 되돌리는 중</string>
+    <string name="activity_log_currently_restoring_message">%1$s %2$s(으)로 되돌리는 중</string>
     <string name="activity_log_currently_restoring_title">현재 사이트 복원 중</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">사이트가 성공적으로 복원되었습니다.</string>
-    <string name="activity_log_rewind_finished_snackbar_message">사이트가 성공적으로 복원되었습니다.\n%s %s(으)로 되돌림</string>
+    <string name="activity_log_rewind_finished_snackbar_message">사이트를 성공적으로 복원했습니다.\n%1$s %2$s(으)로 되돌렸습니다</string>
     <string name="activity_log_rewind_started_snackbar_message">사이트 복원 중\n%s %s(으)로 되돌리는 중</string>
     <string name="activity_log_button">활동 로그 작업 버튼</string>
     <string name="plugin_auto_managed">자동 관리</string>
@@ -1166,20 +1485,16 @@ Language: ko_KR
     <string name="comment_read_source_post">원글 읽기</string>
     <string name="sites">사이트</string>
     <string name="signup_magic_link_title">매직 링크가 전송됨</string>
-    <string name="signup_email_screen_title">이메일 가입</string>
     <string name="verification_2fa_screen_title">코드 확인</string>
     <string name="selfhosted_site_login_title">로그인 자격 증명</string>
     <string name="magic_link_sent_login_title">매직 링크가 전송됨</string>
     <string name="magic_link_login_title">매직 링크 로그인</string>
     <string name="site_address_login_title">사이트 주소 로그인</string>
     <string name="email_address_login_title">이메일 주소 로그인</string>
-    <string name="alternatively">또는:</string>
     <string name="reader_empty_saved_posts_description">%s을(를) 탭하여 목록에 글을 저장합니다.</string>
     <string name="reader_empty_saved_posts_title">글이 아직 저장되지 않았습니다!</string>
     <string name="reader_bookmark_snack_title">글이 저장됨</string>
     <string name="reader_bookmark_snack_btn">모두 보기</string>
-    <string name="reader_btn_bookmarked">저장됨</string>
-    <string name="reader_btn_bookmark">저장</string>
     <string name="reader_remove_bookmark">저장된 글에서 제거</string>
     <string name="reader_add_bookmark">저장된 글에 추가</string>
     <string name="reader_save_for_later_title">저장된 글</string>
@@ -1199,11 +1514,9 @@ Language: ko_KR
     <string name="reader_btn_notifications_on">사이트 알림 켜기</string>
     <string name="reader_btn_notifications_off">사이트 알림 끄기</string>
     <string name="activity_log_jetpack_icon">젯팩 아이콘</string>
-    <string name="rewind">되돌리기</string>
     <string name="activity_log_event">이벤트</string>
     <string name="activity_log_icon">활동 아이콘</string>
     <string name="activity_log">활동 로그</string>
-    <string name="activity">활동</string>
     <string name="privacy_policy_read">개인정보 취급방침 읽기</string>
     <string name="third_party_policy_learn_more_caption">워드프레스는 타사 제품을 포함한 다른 추적 도구를 사용합니다. 이 도구에 대해 읽고 제어하는 방법에 대해 알아보세요.</string>
     <string name="third_party_policy_learn_more_header">타사 정책</string>
@@ -1214,7 +1527,6 @@ Language: ko_KR
     <string name="preference_privacy_settings">개인 정보 설정</string>
     <string name="preference_collect_information">정보 수집</string>
     <string name="post_submitted">글이 제출됨</string>
-    <string name="login_email_button_signup">아직 계정이 없으신가요? %1$s가입하세요.%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">플러그인 기능을 사용하려면 사이트가 양호한 상태여야 합니다.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">플러그인 기능을 사용하려면 이 사용자와 연결된 기본 도메인 구독이 필요합니다.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">플러그인 기능을 사용하려면 관리자 권한이 필요합니다.</string>
@@ -1313,7 +1625,6 @@ Language: ko_KR
     <string name="edit_photo_screen_title">사진 편집</string>
     <string name="share_intent_screen_title">사이트 선택</string>
     <string name="signup_epilogue_screen_title">새 계정</string>
-    <string name="login_prologue_screen_title">로그인</string>
     <string name="login_epilogue_screen_title">다음 계정으로 로그인됨</string>
     <string name="person_detail_screen_title">사용자 세부정보</string>
     <string name="media_settings_screen_title">파일 세부정보</string>
@@ -1327,7 +1638,7 @@ Language: ko_KR
     <string name="license_screen_title">라이선스</string>
     <string name="release_notes_screen_title">릴리스 노트</string>
     <string name="signup_epilogue_error_avatar_view">고객님의 아바타가 업로드되었으며 곧 사용할 수 있습니다.</string>
-    <string name="permissions_denied_message">이 기능에 대한 필수 권한이 해제되어 있는 것 같습니다.&lt;br/>&lt;br/>변경하려면 권한을 편집하고 &lt;strong>%s&lt;/strong>이(가) 활성화되어 있는지 확인하세요.</string>
+    <string name="permissions_denied_message">이 기능에 대한 필수 권한이 해제되어 있는 것 같습니다.&lt;br/&gt;&lt;br/&gt;변경하려면 권한을 편집하고 &lt;strong&gt;%s&lt;/strong&gt;이(가) 활성화되어 있는지 확인하세요.</string>
     <string name="permissions_denied_title">권한</string>
     <string name="plugin_caption_featured">특성</string>
     <string name="sharing_disabled_description">공유 젯팩 모듈이 비활성화되었기 때문에 공유 설정에 액세스할 수 없습니다.</string>
@@ -1368,7 +1679,6 @@ Language: ko_KR
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1개의 파일이 포함된 1개의 글이 업로드되지 않음</string>
     <string name="untitled_in_parentheses">(제목 없음)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%f, %f</string>
     <string name="site_creation_domain_finish_button">사이트 생성</string>
     <string name="notification_site_creation_created">계속하려면 누르세요.</string>
     <string name="notification_site_creation_title_success">사이트를 생성했습니다!</string>
@@ -1382,11 +1692,8 @@ Language: ko_KR
     <string name="username_changer_dismiss_button_positive">취소</string>
     <string name="username_changer_action">저장</string>
     <string name="content_description_add_avatar">아바타 추가</string>
-    <string name="signup_with_google_button">Google로 가입</string>
-    <string name="signup_with_email_button">이메일로 가입</string>
     <string name="signup_user_exists">이메일이 이미 워드프레스닷컴에 있습니다.\n로그인을 통해 진행 중입니다.</string>
     <string name="signup_updating_account">계정 업데이트 중…</string>
-    <string name="signup_terms_of_service_text">가입하려면 %1$s서비스 약관%2$s에 동의해야 합니다.</string>
     <string name="signup_magic_link_progress">이메일 전송 중</string>
     <string name="signup_magic_link_error_button_positive">다시 시도</string>
     <string name="signup_magic_link_error_button_negative">닫기</string>
@@ -1399,11 +1706,6 @@ Language: ko_KR
     <string name="signup_epilogue_error_button_negative">되돌리기</string>
     <string name="signup_epilogue_error_generic">계정을 업데이트하는 중에 문제가 발생했습니다. 다시 시도하거나 변경 내용을 되돌려 계속할 수 있습니다.</string>
     <string name="signup_epilogue_error_avatar">아바타를 업데이트하는 중에 문제가 발생했습니다.</string>
-    <string name="signup_email_header">새 워드프레스닷컴 계정을 만들려면 이메일 주소를 입력하세요.</string>
-    <string name="signup_email_error_generic">이메일 주소를 확인하는 중에 문제가 발생했습니다.</string>
-    <string name="sign_up">워드프레스닷컴 가입</string>
-    <string name="enter_username_instead">사용자명으로 로그인하세요.</string>
-    <string name="enter_site_address_instead">사이트 주소를 입력하여 로그인하세요.</string>
     <string name="plugin_needs_update">업데이트 필요</string>
     <string name="plugin_caption_search">플러그인 검색</string>
     <string name="plugin_caption_new">신규</string>
@@ -1524,7 +1826,6 @@ Language: ko_KR
     <string name="login_error_suffix">\n다른 계정을 사용해 보세요.</string>
     <string name="login_error_generic">Google 계정과 연결하는 데 문제가 발생했습니다.</string>
     <string name="login_error_button">닫기</string>
-    <string name="login_google_button_suffix">Google로 로그인합니다.</string>
     <string name="enter_wpcom_password_google">이 Google 계정으로 진행하려면 일치하는 워드프레스닷컴 비밀번호를 제공하세요. 이 메시지는 한 번만 표시됩니다.</string>
     <string name="error_generic_network">네트워크 오류가 발생했습니다. 연결을 확인하고 다시 시도하세요.</string>
     <string name="post_settings_remove_featured_image">특성 이미지 제거</string>
@@ -1536,12 +1837,11 @@ Language: ko_KR
     <string name="jetpack_disconnect_confirm">연결 해제</string>
     <string name="jetpack_disconnect_confirmation_message">사이트에서 젯팩 연결을 해제하시겠어요?</string>
     <string name="jetpack_disconnect_pref_title">\"워드프레스닷컴과 연결 해제\"</string>
-    <string name="site_settings_jetpack_whitelist_description">젯팩에서 차단하지 않도록 하나 이상의 IP 주소를 화이트리스트에 추가할 수 있습니다. IPv4 및 IPv6를 사용할 수 있습니다. 범위를 지정하려면 낮은 값과 높은 값을 대시로 구분하여 입력하세요. 예: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">젯팩에서 차단하지 않도록 IP 주소(또는 여러 주소)를 \"항상 허용됨\"으로 표시할 수 있습니다. IPv4 및 IPv6를 사용할 수 있습니다. 범위를 지정하려면 낮은 값과 높은 값을 대시로 구분하여 입력하세요. 예: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">2단계 인증 필요</string>
     <string name="jetpack_match_wpcom_via_email_title">이메일을 사용하여 계정 일치</string>
     <string name="jetpack_allow_wpcom_sign_in_title">워드프레스닷컴 로그인 허용</string>
     <string name="jetpack_wpcom_sign_in_category_title">워드프레스닷컴 로그인</string>
-    <string name="jetpack_brute_force_whitelist_title">화이트리스트에 포함된 IP 주소</string>
     <string name="jetpack_prevent_brute_force_title">악의적인 로그인 시도 차단</string>
     <string name="jetpack_prevent_brute_force_category_title">무차별 공격으로부터 보호</string>
     <string name="jetpack_send_wp_notifications_title">푸시 알림 보내기</string>
@@ -1582,12 +1882,6 @@ Language: ko_KR
     <string name="notification_settings_category_other">기타</string>
     <string name="notification_settings_item_your_sites_all_your_sites">내 사이트 모두</string>
     <string name="notification_settings_category_your_sites">내 사이트</string>
-    <string name="notification_settings_master_off_message">알림 설정을 끄면 종류에 관계없이 이 앱에서 모든 알림을 비활성화합니다. 알림 설정을 켠 후 수신하는 알림 종류를 세부적으로 조정할 수 있습니다.</string>
-    <string name="notification_settings_master_off_title">이 기기에서 알림을 받으려면 알림 설정을 켜세요.</string>
-    <string name="notification_settings_master_hint_off">알림 활성화</string>
-    <string name="notification_settings_master_hint_on">알림 비활성화</string>
-    <string name="notification_settings_master_status_off">끔</string>
-    <string name="notification_settings_master_status_on">켬</string>
     <string name="max_video_resolution">최대 동영상 크기</string>
     <string name="max_thumbnail_px_size">최대 이미지 크기</string>
     <string name="error_upload_post_media_param">다음 글에서 미디어를 업로드하는 동안 오류가 발생했습니다. %s</string>
@@ -1624,7 +1918,6 @@ Language: ko_KR
     <string name="login_site_address_more_help">더 많은 도움이 필요하세요?</string>
     <string name="login_site_address_help_content">Chrome에서 사이트를 방문할 때 화면 위쪽의 표시줄에 사이트 주소가 표시됩니다.</string>
     <string name="login_site_address_help_title">내 사이트 주소는 무엇인가요?</string>
-    <string name="login_site_address_help">사이트 주소를 찾는 데 도움이 필요하세요?</string>
     <string name="login_site_address">사이트 주소</string>
     <string name="enter_site_address">연결하려는 워드프레스 사이트의 주소를 입력하세요.</string>
     <string name="login_already_logged_in_wpcom">워드프레스닷컴에 이미 로그인되어 있습니다.</string>
@@ -1636,7 +1929,6 @@ Language: ko_KR
     <string name="requesting_otp">SMS를 통해 확인 코드를 요청 중입니다.</string>
     <string name="login_text_otp">대신 코드를 문자로 받기</string>
     <string name="enter_verification_code">마지막 부분입니다! 인증 앱의 확인 코드를 입력하세요.</string>
-    <string name="open_mail">메일 열기</string>
     <string name="next">다음</string>
     <string name="enter_email_wordpress_com">이메일 주소를 입력하여 워드프레스닷컴에 로그인하고 회원님의 모든 WordPress 사이트를 관리하세요.</string>
     <string name="image_optimization_promo_desc">이미지 최적화는 빠른 업로드를 위해 이미지를 줄입니다.\n\n사이트 설정에서 언제든지 변경할 수 있습니다.</string>
@@ -1659,10 +1951,6 @@ Language: ko_KR
     <string name="post_status_draft">임시글</string>
     <string name="post_status_pending_review">검토 대기 중</string>
     <string name="post_status_publish_post">발행</string>
-    <string name="change_location">위치 변경</string>
-    <string name="remove_location">위치 제거</string>
-    <string name="post_settings_error_placepicker_missing_play_services">위치 선택기를 열 수 없습니다. Google Play 서비스를 사용할 수 없습니다</string>
-    <string name="post_settings_location">위치</string>
     <string name="now">지금</string>
     <string name="post_settings_password_dialog_hint">이 암호를 아는 사용자만 이 글을 볼 수 있습니다</string>
     <string name="post_settings_excerpt_dialog_hint">원하는 경우 내 콘텐츠를 직접 요약한 발췌본을 작성할 수 있습니다.</string>
@@ -1747,7 +2035,7 @@ Language: ko_KR
     <string name="tabbar_accessibility_label_my_site">내 사이트. 통계를 포함하여 사이트를 보고 관리합니다.</string>
     <string name="my_site_btn_sharing">공유</string>
     <string name="button_not_now">지금 안 함</string>
-    <string name="media_error_internal_server_error">업로드 오류입니다. 사이트->설정에서 이미지 최적화를 사용해 보세요.</string>
+    <string name="media_error_internal_server_error">업로드 오류입니다. 사이트-&gt;설정에서 이미지 최적화를 사용해 보세요.</string>
     <string name="media_downloading">이 기기에 미디어 저장 중</string>
     <string name="error_media_save">미디어를 저장할 수 없습니다.</string>
     <string name="editor_draft_saved_locally">장치에 임시글을 저장했습니다.</string>
@@ -1846,7 +2134,7 @@ Language: ko_KR
     <string name="signout">로그아웃</string>
     <string name="sign_in_wpcom">WordPress.com에 로그인</string>
     <string name="reader_label_global_related_posts">워드프레스닷컴 상세 정보</string>
-    <string name="reader_label_local_related_posts">%s의 추가 정보</string>
+    <string name="reader_label_local_related_posts">더 보기: %s</string>
     <string name="preference_open_device_settings">기기 설정 열기</string>
     <string name="invite_invalid_email">%s: 잘못된 이메일주소</string>
     <string name="invite_user_blocked_invites">%s : 사용자가 초대를 막았음</string>
@@ -1894,20 +2182,14 @@ Language: ko_KR
     <string name="invite_error_invalid_usernames_multiple">전송하지 못한 항목: 유효하지 않은 사용자명 또는 이메일이 있습니다.</string>
     <string name="invite_error_invalid_usernames_one">전송하지 못한 항목: 유효하지 않은 사용자명 또는 이메일입니다.</string>
     <string name="invite_error_no_usernames">하나 이상의 사용자명을 추가하세요.</string>
-    <string name="invite_message_info">(선택사항) 사용자 초대에 포함될 사용자 정의 메시지를 500자까지 입력할 수 있습니다.</string>
-    <string name="invite_message_remaining_other">%d자 남음</string>
-    <string name="invite_message_remaining_one">1자 남음</string>
-    <string name="invite_message_remaining_zero">0자 남음</string>
-    <string name="invite_message_title">사용자 정의 메시지</string>
     <string name="invite">초대</string>
-    <string name="invite_names_title">사용자명 또는 이메일</string>
     <string name="invite_people">사용자 초대</string>
     <string name="my_site_header_external">외부</string>
-    <string name="send_link">링크 전송</string>
     <string name="label_clear_search_history">검색 내역 지우기</string>
     <string name="dlg_confirm_clear_search_history">검색 내역을 지울까요?</string>
     <string name="reader_empty_search_description">사용자 언어로 된 %s에 대한 글을 찾을 수 없습니다.</string>
     <string name="reader_hint_post_search">워드프레스닷컴 검색</string>
+    <string name="reader_title_related_post_detail">관련 글</string>
     <string name="preview_screen_links_disabled">미리보기 화면에서 링크가 비활성화되어 있습니다.</string>
     <string name="send">보내기</string>
     <string name="person_removed">\@%1$s이(가) 성공적으로 제거됨</string>
@@ -1926,7 +2208,6 @@ Language: ko_KR
     <string name="checking_email">이메일 확인 중</string>
     <string name="magic_link_unavailable_error_message">현재 사용할 수 없습니다. 비밀번호를 입력하세요.</string>
     <string name="logging_in">로그인 중</string>
-    <string name="enter_your_password_instead">비밀번호를 대신 입력하세요.</string>
     <string name="web_address_dialog_hint">댓글을 달 때 공개적으로 표시합니다.</string>
     <string name="capture_or_pick_photo">사진 캡처 또는 선택</string>
     <string name="plans">계획</string>
@@ -2047,7 +2328,7 @@ Language: ko_KR
     <string name="site_settings_paging_dialog_description">댓글 스레드를 여러 페이지로 나눕니다.</string>
     <string name="site_settings_paging_dialog_header">페이지당 댓글 수</string>
     <string name="site_settings_close_after_dialog_title">댓글 닫기</string>
-    <string name="site_settings_blacklist_description">댓글의 내용이나 이름, URL, 이메일, IP에 아래 단어가 들어있으면 스팸으로 처리됩니다. 단어의 일부만 입력해도 됩니다. \"프레스\"라고 입력하면 \"워드프레스\"로 인식될 수 있습니다.</string>
+    <string name="site_settings_denylist_description">댓글의 내용이나 이름, URL, 이메일, IP에 아래 단어가 들어있으면 스팸으로 처리됩니다. 단어의 일부만 입력해도 됩니다. \"프레스\"라고 입력하면 \"워드프레스\"로 인식될 수 있습니다.</string>
     <string name="site_settings_hold_for_moderation_description">댓글의 내용, 이름, URL, 이메일 또는 IP에 아래 단어가 들어 있으면 중재 대기열에 보관됩니다. 단어의 일부만 입력해도 됩니다. \"프레스\"라고 입력하면 \"워드프레스\"로 인식될 수 있습니다.</string>
     <string name="site_settings_list_editor_input_hint">단어 또는 구절을 입력하세요.</string>
     <string name="site_settings_list_editor_no_items_text">아이템 없음</string>
@@ -2062,10 +2343,9 @@ Language: ko_KR
     <string name="site_settings_rp_show_header_title">헤더 표시</string>
     <string name="site_settings_rp_switch_summary">관련 글에는 글 아래에 있는 사이트의 관련 콘텐츠가 표시됩니다.</string>
     <string name="site_settings_rp_switch_title">관련 글 표시</string>
-    <string name="site_settings_blacklist_hint">필터와 일치하는 댓글은 스팸으로 표시됩니다.</string>
+    <string name="site_settings_denylist_hint">필터와 일치하는 댓글은 스팸으로 표시됩니다.</string>
     <string name="site_settings_moderation_hold_hint">필터와 일치하는 댓글은 중재 대기열에 배치됩니다.</string>
     <string name="site_settings_multiple_links_hint">알려진 사용자의 링크 제한을 무시합니다.</string>
-    <string name="site_settings_whitelist_hint">댓글을 쓴 사람이 예전에 댓글이 승인된 적이 있어야 합니다.</string>
     <string name="site_settings_user_account_required_hint">가입하여 로그인한 사용자만 댓글을 남길 수 있습니다.</string>
     <string name="site_settings_identity_required_hint">댓글을 쓴 사람의 이름과 이메일을 꼭 남겨야 합니다.</string>
     <string name="site_settings_paging_hint">지정된 크기 단위로 댓글 표시</string>
@@ -2088,17 +2368,13 @@ Language: ko_KR
     <string name="site_settings_address_hint">현재 주소 변경은 지원되지 않습니다.</string>
     <string name="site_settings_tagline_hint">블로그를 설명하는 간단한 설명이나 기억하기 쉬운 구절</string>
     <string name="site_settings_title_hint">이 사이트가 추구하는 것에 관해 짧게 쓰세요.</string>
-    <string name="site_settings_whitelist_known_summary">알려진 사용자의 댓글</string>
-    <string name="site_settings_whitelist_all_summary">모든 사용자의 댓글</string>
     <string name="site_settings_threading_summary">%d개 레벨</string>
     <string name="site_settings_privacy_private_summary">비공개</string>
     <string name="site_settings_privacy_hidden_summary">숨김</string>
     <string name="site_settings_privacy_public_summary">공개</string>
     <string name="site_settings_delete_site_title">사이트 삭제</string>
-    <string name="site_settings_blacklist_title">블랙리스트</string>
     <string name="site_settings_moderation_hold_title">중재를 위해 보관</string>
     <string name="site_settings_multiple_links_title">댓글의 링크</string>
-    <string name="site_settings_whitelist_title">자동으로 승인</string>
     <string name="site_settings_paging_title">페이징</string>
     <string name="site_settings_threading_title">스레딩</string>
     <string name="site_settings_sort_by_title">정렬 기준</string>
@@ -2247,7 +2523,6 @@ Language: ko_KR
     <string name="logs_copied_to_clipboard">애플리케이션 로그가 클립보드에 복사되었습니다.</string>
     <string name="reader_empty_posts_in_blog">이 블로그는 비었습니다.</string>
     <string name="reader_label_new_posts">새 게시물</string>
-    <string name="reader_page_recommended_blogs">회원님이 좋아할 만한 블로그</string>
     <string name="error_copy_to_clipboard">텍스트를 클립보드에 복사하는 동안 오류가 발생했습니다.</string>
     <string name="post_uploading">업로드</string>
     <string name="stats_followers_years">%1$d년</string>
@@ -2312,7 +2587,6 @@ Language: ko_KR
     <string name="reader_title_blog_preview">리더 블로그</string>
     <string name="ssl_certificate_ask_trust">일반적으로 문제없이 이 사이트에 연결하는 경우, 이 오류는 누군가가 사이트를 사칭하는 것을 의미 할 수 있습니다, 그렇다면 연결하면 안됩니다.  그래도 인증서를 신뢰 하시겠습니까?</string>
     <string name="ssl_certificate_error">잘못된 SSL 인증서</string>
-    <string name="forgot_password">패스워드를 잊으셨나요?</string>
     <string name="help">도우미</string>
     <string name="username_or_password_incorrect">입력된 사용자 이름이나 암호가 잘못되었습니다.</string>
     <string name="email_invalid">유효한 이메일 주소를 입력 하십시오.</string>
diff --git a/WordPress/src/main/res/values-ldrtl/strings.xml b/WordPress/src/main/res/values-ldrtl/strings.xml
new file mode 100644
index 000000000000..1f36eed8afb6
--- /dev/null
+++ b/WordPress/src/main/res/values-ldrtl/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="reader_author_with_blog_name" translatable="false">%2$s ◂ %1$s</string>
+
+</resources>
diff --git a/WordPress/src/main/res/values-mk/strings.xml b/WordPress/src/main/res/values-mk/strings.xml
index 37fe602f743b..15ea516d2afb 100644
--- a/WordPress/src/main/res/values-mk/strings.xml
+++ b/WordPress/src/main/res/values-mk/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2015-01-28 14:24:38+0000
 Plural-Forms: nplurals=2; plural=n % 10 != 1 || n % 100 == 11;
@@ -55,7 +55,6 @@ Language: mk
     <string name="update_verb">Ажурирај</string>
     <string name="schedule_verb">Закажи</string>
     <string name="help">Помош</string>
-    <string name="forgot_password">Ја изгубивте Вашата лозинка?</string>
     <string name="ssl_certificate_error">Невалиден SSl сертификат</string>
     <string name="ssl_certificate_ask_trust">Доколку вообичаено се поврзувате на страницата без проблеми, оваа грешка може да значи дека некој се обидува да ја имитира вашата страница и не треба да продолжите. Дали му верувате на сертификатот и покрај тоа?</string>
     <string name="mnu_comment_unspam">Не е спам</string>
diff --git a/WordPress/src/main/res/values-ms/strings.xml b/WordPress/src/main/res/values-ms/strings.xml
index 679fe829a13e..40fac12de6ed 100644
--- a/WordPress/src/main/res/values-ms/strings.xml
+++ b/WordPress/src/main/res/values-ms/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2017-12-20 12:00:16+0000
 Plural-Forms: nplurals=1; plural=0;
@@ -31,7 +31,6 @@ Language: ms
     <string name="media_edit_file_details_card_caption">Perincian Fail</string>
     <string name="login_error_suffix">\nMungkin cuba akaun yang lain?</string>
     <string name="login_error_generic">Terdapat kesusahan bersambung dengan akaun Google.</string>
-    <string name="login_google_button_suffix">Log masuk dengan Google.</string>
     <string name="login_error_button">Tutup</string>
     <string name="enter_wpcom_password_google">Untuk teruskan dengan akaun Google ini, sila berikan kata laluan WordPress.com yang sepadan. Ianya hanya akan diminta sekali.</string>
     <string name="error_generic_network">Ralat rangkaian terjadi. Sila periksa sambungan anda dan cuba lagi.</string>
@@ -44,12 +43,10 @@ Language: ms
     <string name="jetpack_disconnect_confirmation_message">Anda pasti anda ingin memutuskan Jetpack daripada laman?</string>
     <string name="jetpack_disconnect_confirm">Putuskan</string>
     <string name="jetpack_disconnect_pref_title">\"Putuskan daripada WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Anda boleh menyenarai putih suatu alamat IP atau siri alamat yang mengelakkannya daripada dihalang oleh Jetpack. IPv4 dan IPv6 diterima. Untuk menyatakan julat tertentu, masukkan nilai rendah dan nilai tinggi dipisahkan oleh tanda sengkang. Contoh: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Perlukan pengesahan dua-langkah</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Benarkan log masuk WordPress.com</string>
     <string name="jetpack_match_wpcom_via_email_title">Padankan akaun menggunakan emel</string>
     <string name="jetpack_wpcom_sign_in_category_title">Log masuk WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Alamat-alamat IP yang disenarai putih</string>
     <string name="jetpack_prevent_brute_force_title">Halang cubaan log masuk berniat jahat</string>
     <string name="jetpack_prevent_brute_force_category_title">Perlindungan serangan kekerasan</string>
     <string name="jetpack_send_wp_notifications_title">Hantar pemberitahuan tolak</string>
@@ -89,13 +86,7 @@ Language: ms
     <string name="notification_settings_item_your_sites_all_your_sites">Semua Laman Saya</string>
     <string name="notification_settings_category_other">Lain</string>
     <string name="notification_settings_category_your_sites">Laman-Laman Anda</string>
-    <string name="notification_settings_master_off_message">Mematikan Tetapan Pemberitahuan akan melumpuhkan semua pemberitahuan dari aplikasi ini tidak kira jenis. Anda boleh membuat talaan kecil pada jenis pemberitahuan yang anda terima selepas menghidupkan Tetapan Pemberitahuan</string>
-    <string name="notification_settings_master_off_title">Untuk menerima pemberitahuan pada peranti ini, hidupkan Tetapan Pemberitahuan.</string>
-    <string name="notification_settings_master_hint_off">Bolehkan pemberitahuan</string>
-    <string name="notification_settings_master_hint_on">Lumpuhkan pemberitahuan</string>
-    <string name="notification_settings_master_status_off">Mati</string>
     <string name="max_video_resolution">Saiz Video Maksimum</string>
-    <string name="notification_settings_master_status_on">Hidup</string>
     <string name="max_thumbnail_px_size">Saiz Imej Maksimum</string>
     <string name="error_upload_post_media_param">Terdapat ralat memuat naik media dalam kiriman ini: %s.</string>
     <string name="error_upload_post_param">Terdapat ralat memuat naik kiriman ini: %s.</string>
@@ -131,7 +122,6 @@ Language: ms
     <string name="login_site_address_more_help">Perlukan bantuan lebih lanjut?</string>
     <string name="login_site_address_help_content">Alamat laman anda muncul dalam palang pada atas skrin apabila anda melawat laman anda dalam Chrome.</string>
     <string name="login_site_address_help_title">Apa alamat laman saya?</string>
-    <string name="login_site_address_help">Perlu bantuan mencari alamat laman anda?</string>
     <string name="login_site_address">Alamat laman</string>
     <string name="login_already_logged_in_wpcom">Telahpun log masuk ke WordPress.com</string>
     <string name="login_continue">Teruskan</string>
@@ -142,7 +132,6 @@ Language: ms
     <string name="enter_verification_code">Hampir di sana! Sila masukkan kod pengesahan daripada aplikasi Authenticator anda.</string>
     <string name="enter_email_wordpress_com">Log masuk ke WordPress.com menggunakan alamat emel untuk mengurus semua laman WordPress anda.</string>
     <string name="next">Seterusnya</string>
-    <string name="open_mail">Buka surat</string>
     <string name="image_optimization_promo_desc">Pengoptimuman imej menecutkan imej untuk muat naik yang lebih laju.\n\nAnda boleh mengubahnya bila-bila masa dalam tetapan laman.</string>
     <string name="image_optimization_promo_title">Hidupkan pengoptimuman imej?</string>
     <string name="leave_off">Biarkan mati</string>
@@ -162,11 +151,7 @@ Language: ms
     <string name="post_status_draft">Draf</string>
     <string name="post_status_pending_review">Menunggu tinjauan</string>
     <string name="post_status_post_private">Persendirian</string>
-    <string name="change_location">Tukar Lokasi</string>
     <string name="post_status_publish_post">Terbit</string>
-    <string name="remove_location">Buang Lokasi</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Tidak boleh membuka Pemetik Lokasi, Google Play Service tidak didapati</string>
-    <string name="post_settings_location">Lokasi</string>
     <string name="now">Sekarang</string>
     <string name="post_settings_password_dialog_hint">Hanya mereka dengan kata laluan ini boleh melihat kiriman ini</string>
     <string name="post_settings_excerpt_dialog_hint">Petikan adalah ringkasan kandungan anda yang dibuat sendiri dan tidak diwajibkan.</string>
@@ -347,7 +332,6 @@ Language: ms
     <string name="signout">Log keluar</string>
     <string name="sign_in_wpcom">Log masuk ke WordPress.com</string>
     <string name="reader_label_global_related_posts">Selanjutnya tentang WordPress.com</string>
-    <string name="reader_label_local_related_posts">Selanjutnya dalam %s</string>
     <string name="preference_open_device_settings">Buka tetapan peranti</string>
     <string name="invite_invalid_email">%s: Emel tidak sah</string>
     <string name="invite_user_blocked_invites">%s: Pengguna menghalang jemputan</string>
@@ -395,18 +379,12 @@ Language: ms
     <string name="invite_error_invalid_usernames_multiple">Tidak dapat menghantar: Terdapat nama pengguna atau emel yang tidak sah</string>
     <string name="invite_error_invalid_usernames_one">Tidak dapat menghantar: Nama pengguna atau emel adalah tidak sah</string>
     <string name="invite_error_no_usernames">Sila tambah sekurang-kurangnya satu nama pengguna</string>
-    <string name="invite_message_info">(Pilihan) Anda boleh memasukkan mesej tersuai sehingga 500 aksara yang akan disertakan dalam jemputan kepada pengguna.</string>
-    <string name="invite_message_remaining_other">Tinggal %d aksara</string>
-    <string name="invite_message_remaining_one">Tinggal 1 aksara</string>
-    <string name="invite_message_remaining_zero">Tinggal 0 aksara</string>
-    <string name="invite_message_title">Mesej Tersuai</string>
     <string name="invite">Jemput</string>
-    <string name="invite_names_title">Nama Pengguna atau Emel</string>
-    <string name="send_link">Hantar pautan</string>
     <string name="my_site_header_external">Luaran</string>
     <string name="invite_people">Jemput Orang</string>
     <string name="label_clear_search_history">Kosongkan sejarah carian</string>
     <string name="dlg_confirm_clear_search_history">Kosongkan sejarah carian?</string>
+    <string name="reader_title_related_post_detail">Kiriman Berkaitan</string>
     <string name="preview_screen_links_disabled">Pautan dinyah boleh pada skrin pratonton</string>
     <string name="send">Hantar</string>
     <string name="person_removed">Berjaya membuang %1$s</string>
@@ -425,7 +403,6 @@ Language: ms
     <string name="checking_email">Menyemak emel</string>
     <string name="magic_link_unavailable_error_message">Tidak terdapat pada masa ini. Sila masukkan kata laluan anda</string>
     <string name="logging_in">Melog masuk</string>
-    <string name="enter_your_password_instead">Sebaliknya masukkan kata laluan anda</string>
     <string name="web_address_dialog_hint">Tunjukkan kepada umum apabila anda mengulas.</string>
     <string name="capture_or_pick_photo">Tangkap atau pilih gambar</string>
     <string name="export_your_content_message">Kiriman, halaman, dan tetapan anda akan diemel kepada anda di %s.</string>
@@ -539,7 +516,6 @@ Language: ms
     <string name="site_settings_paging_dialog_description">Pecahkan jalur ulasan kepada berbilang halaman.</string>
     <string name="site_settings_paging_dialog_header">Ulasan setiap halaman</string>
     <string name="site_settings_close_after_dialog_title">Tutup pengulasan</string>
-    <string name="site_settings_blacklist_description">Apabila ulasan mengandungi mana-mana perkataan berikut dalam kandungan, nama, URL, emel, atau IP, ia akan ditanda sebagai spam. Anda boleh mengisi sebahagian perkataan, oleh itu \"press\" akan padan dengan \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">Apabila ulasan mengandungi mana-mana perkataan ini dalam kandungan, nama, URL, emel atau IP, ia akan ditahan dibawah barisan penyederhanaan. Anda boleh mengisi sebahagian perkataan, oleh itu \"press\" akan padan dengan \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Masukkan perkataan atau frasa</string>
     <string name="site_settings_list_editor_no_items_text">Tiada butiran</string>
@@ -554,10 +530,8 @@ Language: ms
     <string name="site_settings_rp_show_header_title">Tunjukkan Pengepala</string>
     <string name="site_settings_rp_switch_summary">Kiriman Berkaitan memaparkan kandungan yang berkenaan daripada laman anda di bawah kiriman anda.</string>
     <string name="site_settings_rp_switch_title">Tunjukkan Kiriman Berkaitan</string>
-    <string name="site_settings_blacklist_hint">Ulasan yang sepadan dengan penapis ditanda sebagai spam</string>
     <string name="site_settings_moderation_hold_hint">Ulasan yang sepadan dengan penapis diletakkan dalam barisan penyederhanaan</string>
     <string name="site_settings_multiple_links_hint">Abaikan had pautan daripada pengguna dikenali</string>
-    <string name="site_settings_whitelist_hint">Ulasan pengarang mesti mempunyai ulasan terdahulu yang diluluskan</string>
     <string name="site_settings_user_account_required_hint">Pengguna mestilah berdaftar dan log masuk untuk mengulas</string>
     <string name="site_settings_identity_required_hint">Penulis ulasan mesti mengisi nama dan emel</string>
     <string name="site_settings_paging_hint">Papar ulsan dalam ketulan saiz yang ditetapkan</string>
@@ -580,17 +554,13 @@ Language: ms
     <string name="site_settings_address_hint">Menukar alamat anda pada masa ini tidak disokong</string>
     <string name="site_settings_tagline_hint">Huraian pendek atau frasa menarik untuk menggambarkan blog anda</string>
     <string name="site_settings_title_hint">Dalam beberapa perkataan, jelaskan apa laman ini berkenaan dengan</string>
-    <string name="site_settings_whitelist_known_summary">Ulasan daripada pengguna yang diketahui</string>
-    <string name="site_settings_whitelist_all_summary">Ulasan daripada semua pengguna</string>
     <string name="site_settings_threading_summary">%d paras</string>
     <string name="site_settings_privacy_private_summary">Sulit</string>
     <string name="site_settings_privacy_hidden_summary">Tersembunyi</string>
     <string name="site_settings_privacy_public_summary">Umum</string>
     <string name="site_settings_delete_site_title">Hapuskan Laman</string>
-    <string name="site_settings_blacklist_title">Senarai hitam</string>
     <string name="site_settings_moderation_hold_title">Tahan untuk Penyederhanaan</string>
     <string name="site_settings_multiple_links_title">Pautan dalam ulasan</string>
-    <string name="site_settings_whitelist_title">Luluskan secara automatik</string>
     <string name="site_settings_threading_title">Penjaluran</string>
     <string name="site_settings_paging_title">Menomborkan Halaman</string>
     <string name="site_settings_sort_by_title">Isih berdasarkan</string>
@@ -726,7 +696,6 @@ Language: ms
     <string name="error_copy_to_clipboard">Ralat berlaku semasa menyalin teks ke papan keratan</string>
     <string name="logs_copied_to_clipboard">Log aplikasi telah disalin ke papan keratan</string>
     <string name="reader_label_new_posts">Kiriman baharu</string>
-    <string name="reader_page_recommended_blogs">Laman yang anda mungkin suka</string>
     <string name="post_uploading">Memuat naik kiriman</string>
     <string name="stats_followers_days">%1$d hari</string>
     <string name="stats_followers_hours">%1$d jam</string>
@@ -778,7 +747,6 @@ Language: ms
     <string name="help">Bantuan</string>
     <string name="ssl_certificate_error">Sijil SSL tidak sah</string>
     <string name="ssl_certificate_ask_trust">Jika anda biasanya berhubung ke laman ini tanpa masalah, ralat ini mungkin bermakna bahawa seseorang sedang cuba menyamar sebagai laman ini, dan anda tidak sepatutnya teruskan. Adakah anda masih ingin mempercayai sijil ini?</string>
-    <string name="forgot_password">Hilang kata laluan anda?</string>
     <string name="adding_cat_success">Kategori berjaya ditambah</string>
     <string name="cat_name_required">Medan nama kategori dikehendaki</string>
     <string name="notifications_empty_list">Tiada notifikasi</string>
diff --git a/WordPress/src/main/res/values-nb/strings.xml b/WordPress/src/main/res/values-nb/strings.xml
index b49eadfa9f04..9bc6714287c8 100644
--- a/WordPress/src/main/res/values-nb/strings.xml
+++ b/WordPress/src/main/res/values-nb/strings.xml
@@ -1,11 +1,188 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-23 15:04:37+0000
+Translation-Revision-Date: 2021-04-23 11:24:05+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: nb_NO
 -->
 <resources>
+    <string name="gutenberg_native_what_is_alt_text">Hva er alt-tekst?</string>
+    <string name="gutenberg_native_transform_s_to">Omform %s til</string>
+    <string name="gutenberg_native_transform_block">Omform blokk…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Kunne ikke sette inn media.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Kunne ikke sette inn lydfil.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Beskriv hensikten med bildet. La stå tom om bildet kun er dekorativt.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s omformet til %2$s</string>
+    <string name="like_faces_plural_text">%d bloggere liker dette.</string>
+    <string name="like_faces_singular_text">1 blogger liker dette.</string>
+    <string name="like_title_plural">%d likinger</string>
+    <string name="like_title_singular">1 liking</string>
+    <string name="suggestion">Forslag:</string>
+    <string name="gutenberg_native_search_blocks">Søk blokker</string>
+    <string name="gutenberg_native_search_block">Søk blokk</string>
+    <string name="gutenberg_native_clear_search">Rensk søk</string>
+    <string name="gutenberg_native_cancel_search">Avbryt søk</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s er %3$s %4$s.</string>
+    <string name="comment_status_unreplied">Ubesvart</string>
+    <string name="gutenberg_native_table_of_contents">Innholdsfortegnelse</string>
+    <string name="gutenberg_native_summary">sammendrag</string>
+    <string name="gutenberg_native_buttongroup">dokumentomriss</string>
+    <string name="jetpack_brute_force_allowlist_title">IP-adresser som alltid er tillatt</string>
+    <string name="site_settings_denylist_title">Ikke tillatte kommentarer</string>
+    <string name="reader_title_interests">Følg emner</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Avvis</string>
+    <string name="activity_log_backup_download_notice_download_action">Last ned</string>
+    <string name="quick_start_card_menu_hide">Skjul for nå</string>
+    <string name="invite_links_expire_date">Utløper %1$s</string>
+    <string name="invite_links_disable_invite_link">Slå av invitasjonslenke</string>
+    <string name="invite_links_share_invite_link">Del invitasjonslenke</string>
+    <string name="invite_links_generate">Generer ny lenke</string>
+    <string name="invite_links_get_status_retry">Oppfrisk lenkestatus</string>
+    <string name="invite_links_section_title">Invitasjonslenke</string>
+    <string name="threats_found_singular">Trusel funnet</string>
+    <string name="threats_found_plural">Trusler funnet</string>
+    <string name="scan_fixing_threats_title_singular">Fjerner trusel</string>
+    <string name="disable">Slå av</string>
+    <string name="quick_start_list_view_site_title">Besøk nettstedet ditt</string>
+    <string name="quick_start_list_enable_sharing_title">Slå på deling</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Klokke-ikon</string>
+    <string name="restore_warning_action_button">Bekreft</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="gutenberg_native_uploading">Laster opp…</string>
+    <string name="gutenberg_native_replace_file">Erstatt fil</string>
+    <string name="gutenberg_native_replace_audio">Erstatt lyd</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problem under åpning av lyden</string>
+    <string name="gutenberg_native_lock_icon">Låse-ikon</string>
+    <string name="gutenberg_native_choose_audio">Velg lyd</string>
+    <string name="gutenberg_native_audio_player">Lydavspiller</string>
+    <string name="gutenberg_native_audio_file">lydfil</string>
+    <string name="continue_with_wpcom">Logg inn eller registrer deg på WordPress.com</string>
+    <string name="photo_picker_use_audio">Bruk denne lyden</string>
+    <string name="photo_picker_choose_audio">Velg lyd fra enheten</string>
+    <string name="threat_status_fixed">Rettet</string>
+    <string name="threat_found_header">Funnet</string>
+    <string name="scan_here_to_help">her for å hjelpe</string>
+    <string name="scan_fixing_threats_title_plural">Fjerner trusler</string>
+    <string name="scan_request_failed_title">Noe gikk galt</string>
+    <string name="pick_audio">Velg lyd</string>
+    <string name="restore_complete_visit_site_action_button">Besøk nettstedet</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_warning_header">Advarsel</string>
+    <string name="restore_details_header">Gjenopprett nettsted</string>
+    <string name="restore">Gjenopprett</string>
+    <string name="backup_download_complete_failed_action_button">Utført</string>
+    <string name="web_preview_tablet">Nettbrett</string>
+    <string name="web_preview_mobile">Mobil</string>
+    <string name="quick_start_card_menu_remove">Ikke vis igjen</string>
+    <string name="quick_start_card_menu_pin">Fest dette</string>
+    <string name="quick_start_dialog_edit_homepage_title">Rediger din forside</string>
+    <string name="reader_menu_mark_as_unseen">Merk som usett</string>
+    <string name="reader_menu_mark_as_seen">Merk som sett</string>
+    <string name="threat_fix_all_warning_title">Fjern alle trusler</string>
+    <string name="scan_history_ignored_threats_tab">Ignorert</string>
+    <string name="scan_history_no_threats_found">Ingen elementer funnet</string>
+    <string name="scan_history_fixed_threats_tab">Rettet</string>
+    <string name="scan_history_all_threats_tab">Alle</string>
+    <string name="scan_history_menu_title">Historikk</string>
+    <string name="gutenberg_native_move_to_bottom">Flytt til bunnen</string>
+    <string name="label_control_upload">Last opp</string>
+    <string name="jetpack_icon_content_description">ikon</string>
+    <string name="backup_download_complete_download_share_action_button">Del lenke</string>
+    <string name="backup_download_complete_download_action_button">Last ned</string>
+    <string name="backup_download_complete_page_title">Din sikkerhetskopi</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_page_title">Last ned sikkerhetskopi</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">krysspubliser</string>
+    <string name="suggestion_user">bruker</string>
+    <string name="threat_ignore">Ignorer trusel</string>
+    <string name="threat_fix">Fjern trusel</string>
+    <string name="threat_item_header_threat_found">Trusel funnet</string>
+    <string name="threats_fix_all">Rett alle</string>
+    <string name="scan_in_few_seconds">noen sekunder siden</string>
+    <string name="scan_in_minutes_ago">%s minutt(er) siden</string>
+    <string name="scan_in_hours_ago">%s time(r) siden</string>
+    <string name="scan_this_site">dette nettstedet</string>
+    <string name="backup">Sikkerhetskopi</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (viser %s elementer)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Aktivitetstype-filter</string>
+    <string name="activity_log_activity_type_filter_active_label">Aktivitetstype (%s)</string>
+    <string name="backup_item_sqls">Nettstedsdatabase</string>
+    <string name="backup_item_roots_hint">(inkluderer wp-config.php og filer som ikke tilhører WordPress)</string>
+    <string name="backup_item_media_uploads">Media-opplastinger</string>
+    <string name="backup_item_plugins">WordPress-utvidelser</string>
+    <string name="backup_item_themes">WordPress-temaer</string>
+    <string name="backup_download_details_icon_content_description">Lag ikon for nedlastbar sikkerhetskopi</string>
+    <string name="backup_download_details_action_button">Lag nedlastbar fil</string>
+    <string name="backup_download_details_header">Lag nedlastbar sikkerhetskopi</string>
+    <string name="backup_download_details_page_title">Last ned sikkerhetskopi</string>
+    <string name="backup_download">Nedlasting av sikkerhetskopi</string>
+    <string name="gutenberg_native_error">Feil</string>
+    <string name="gutenberg_native_choose_file">Velg fil</string>
+    <string name="activity_log_item_menu_download_backup_label">Last  ned sikkerhetskopi</string>
+    <string name="activity_log_item_menu_restore_label">Gjenopprett til dette tidspunktet</string>
+    <string name="activity_log_activity_type_filter_label">Aktivitetstype</string>
+    <string name="activity_log_date_range_filter_label">Datointervall</string>
+    <string name="activity_log_activity_type_filter_header">Filtrer på aktivitetstype</string>
+    <string name="dialog_confirm_copy_local_copy_button">Kopier versjonen fra denne appen</string>
+    <string name="dialog_confirm_copy_local_edit_button">Rediger innlegget først</string>
+    <string name="button_copy">Dupliser</string>
+    <string name="gutenberg_native_file_name">Filnavn</string>
+    <string name="gutenberg_native_file_block_settings">Innstillinger for fil-blokk</string>
+    <string name="gutenberg_native_edit_file">Rediger fil</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack-innstillinger</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="activity_log_activity_type_filter_clear">Tøm</string>
+    <string name="activity_log_activity_type_filter_apply">Bruk</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF-filer ikke støttet</string>
+    <string name="color_picker_label_background">Bakgrunn</string>
+    <string name="color_picker_label_text">Tekst</string>
+    <string name="dialog_discard_story_ok_button_edit">Forkast</string>
+    <string name="dialog_discard_story_message_edit">Ingen endringer vil bli lagret.</string>
+    <string name="dialog_discard_story_title_edit">Forkaste endringer?</string>
+    <string name="label_done_button">Fullført</string>
+    <string name="label_next_button">Neste</string>
+    <string name="delete_button_alt">Slett</string>
+    <string name="reader_discover_no_posts_button_text">Følg emner</string>
+    <string name="reader_discover_no_posts_title">Ingen nylige innlegg</string>
+    <string name="reader_discover_empty_title">Velkommen!</string>
+    <string name="scan">Skann</string>
+    <string name="hpp_skip_button">Hopp over</string>
+    <string name="hpp_choose_button">Velg</string>
+    <string name="hpp_title">Velg en utforming</string>
+    <string name="prepublishing_nudges_add_category_button">Legg til kategori</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Legg til ny kategori</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorier</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Ikke angitt</string>
+    <string name="prepublishing_nudges_categories_action">Kategorier</string>
+    <string name="login_prologue_fifth_caption_three">Museer i London</string>
+    <string name="login_prologue_fifth_tag_six">Politikk</string>
+    <string name="login_prologue_fifth_tag_five">Musikk</string>
+    <string name="login_prologue_fifth_tag_four">Hagestell</string>
+    <string name="login_prologue_fifth_tag_three">Fotball</string>
+    <string name="login_prologue_fifth_tag_two">Matlaging</string>
+    <string name="login_prologue_fifth_tag_one">Kunst</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_one">Å bli inspirert</string>
+    <string name="login_prologue_title_fifth">Følg dine favorittnettsteder og oppdag nye blogger.</string>
+    <string name="reader_discover_recommended_blogs_header">Nettsteder å følge</string>
+    <string name="gutenberg_native_choose_images">Velg bilder</string>
+    <string name="mlp_notice_page_created">Side opprettet</string>
+    <string name="reader_label_toolbar_back">Tilbake</string>
+    <string name="reader_discover_empty_button_text">Kom i gang</string>
+    <string name="reader_discover_empty_subtitle">Følg emner for å oppdage nye blogger</string>
+    <string name="reader_post_details_header_by_author_name">Av</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Merk som ikke spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Merk som spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Åpne nettstedet</string>
+    <string name="media_uploading_gif_library_photo">Laster opp gif-media</string>
+    <string name="gutenberg_native_select_item">Velg element</string>
+    <string name="gutenberg_native_search_or_type_url">Søk eller skriv inn URL</string>
+    <string name="gutenberg_native_add_this_telephone_link">Legg til denne telefonlenken</string>
+    <string name="gutenberg_native_add_this_link">Legg til denne lenken</string>
+    <string name="gutenberg_native_add_this_email_link">Legg til denne e-postlenken</string>
     <string name="typeface_label_shrikhand">Fet</string>
     <string name="typeface_label_space_mono">Moderne</string>
     <string name="typeface_label_pacifico">Lekende</string>
@@ -15,10 +192,13 @@ Language: nb_NO
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%s valgt</string>
     <string name="login_get_link_by_email">Få en innloggingslenke med e-post</string>
+    <string name="permission_microphone">Mikrofon</string>
+    <string name="reader_menu_report_post">Rapporter dette innlegget</string>
     <string name="gutenberg_native_select_a_layout">Velg et oppsett</string>
     <string name="create_post_story_fab_tooltip">Lag et innlegg eller en fortelling</string>
     <string name="create_page_fab_tooltip">Lag en side</string>
     <string name="create_post_fab_tooltip">Lag et innlegg</string>
+    <string name="reader_discover_interests_header">Du liker kanskje</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Skjul</string>
     <string name="gutenberg_native_video_caption_empty">Videobildetekst. Tom.</string>
     <string name="gutenberg_native_updates_the_title">Oppdaterer tittelen.</string>
@@ -51,22 +231,23 @@ Language: nb_NO
     <string name="dialog_discard_story_title">Forkaste fortelling?</string>
     <string name="dialog_discard_page_ok_button">Slett</string>
     <string name="dialog_discard_page_title">Slette fortellingslysbilde?</string>
-    <string name="menu_delete_page">Slette lysbilde</string>
     <string name="label_text_color_button">Endre tekstfarge</string>
     <string name="label_text_alignment_button">Endre tekstjustering</string>
+    <string name="label_frame_errored">feilet</string>
+    <string name="label_frame_selected_border">valgte</string>
+    <string name="label_frame_unselected_border">fravalgte</string>
+    <string name="label_frame_image">Lysbilde</string>
     <string name="label_retry_icon">Prøv igjen</string>
     <string name="label_saved_icon">Lagret</string>
     <string name="label_close_button">Lukk</string>
-    <string name="label_control_publish">Neste</string>
-    <string name="label_done">Utført</string>
     <string name="label_share_to">Del på</string>
+    <string name="label_snackbar_share">DEL</string>
     <string name="label_snackbar_loop_frame_saved">Lagret til forografier</string>
     <string name="label_control_retry">Prøv på nytt</string>
     <string name="label_control_saved">Lagret</string>
     <string name="label_control_saving">Lagrer</string>
     <string name="sound_button_alt">Lyd</string>
     <string name="text_button_alt">Tekst</string>
-    <string name="more_button_alt">Mer</string>
     <string name="mlp_preview_page">Forhåndsvis</string>
     <string name="mlp_create_page">Lag side</string>
     <string name="mlp_create_blank_page">Lag tom side</string>
@@ -74,7 +255,7 @@ Language: nb_NO
     <string name="prepublishing_nudges_story_title_hint">Gi din fortelling en tittel</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Lag et innlegg eller en fortelling</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Lag et innlegg, en side eller fortelling</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Trykk %1$s Lag. %2$s Velg så &lt;b>blogginnlegg&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Trykk %1$s Lag. %2$s Velg så &lt;b&gt;blogginnlegg&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Velg fra enheten</string>
     <string name="my_site_bottom_sheet_add_story">Fortelling</string>
     <string name="pick_file">Legg til fil</string>
@@ -84,11 +265,8 @@ Language: nb_NO
     <string name="gutenberg_native_choose_image_or_video">Velg bilde eller video</string>
     <string name="gutenberg_native_choose_image">Velg bilde</string>
     <string name="gutenberg_native_block_removed">Blokk fjernet</string>
-    <string name="content_description_logo">WordPress-logo</string>
-    <string name="enter_your_site_address">Oppgi din nettstedsadresse</string>
-    <string name="continue_with_wpcom">Fortsett med WordPress.com</string>
+    <string name="enter_your_site_address">Oppgi din eksisterende nettstedsadresse</string>
     <string name="signup_confirmation_title">Registreringsbekreftelse</string>
-    <string name="signup_confirmation_magic_link_message">Vi vil sende deg en registreringslenke for å opprette din nye WordPress.com-konto.</string>
     <string name="signup_confirmation_message">Vi vil bruke denne e-postadressen til å lage din nye WordPress.com-konto.</string>
     <string name="signup_magic_link_message">Vi har sendt deg en registreringslenke for å lage din nye WordPres.com-konto. Sjekk din e-post på denne enheten og trykk lenken i e-posten du mottar fra WordPress.com.</string>
     <string name="enter_account_info_for_site">Oppgi din kontoinformasjon for %1$s.</string>
@@ -102,18 +280,14 @@ Language: nb_NO
     <string name="or_type_your_password">Eller oppgi dit passord</string>
     <string name="create_account">Opprett konto</string>
     <string name="send_link_by_email">Send lenke med e-post</string>
-    <string name="login_promo_text_unlock_the_power">Lås opp kraften til en mest fleksible nettstedsbyggeren.</string>
-    <string name="login_promo_title_37_percent">37\% av alle nettsteder er bygget på WordPress.</string>
     <string name="reset_your_password">Tilbakestill ditt passord</string>
-    <string name="quick_start_list_update_site_title_subtitle">Gi ditt nettsted et navn som reflekterer des personlighet og emne Førsteinntrykket teller!</string>
     <string name="quick_start_list_update_site_title_title">Bestem din nettstedstittel</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Trykk &lt;b>%1$s&lt;/b> for å angi en ny tittel</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Trykk &lt;b&gt;%1$s&lt;/b&gt; for å angi en ny tittel</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Å kaste dette innlegget vil også forkaste lokale endringer. Er du sikker på at du vil fortsette?</string>
     <string name="gutenberg_native_s_block_options">%s blokk-alternativer</string>
     <string name="gutenberg_native_duplicate_block">Dupliser blokk</string>
     <string name="gutenberg_native_copy_block">Kopier blokk</string>
     <string name="gutenberg_native_copied_block">Kopiert blokk</string>
-    <string name="gutenberg_native_block_settings">Blokkinnstillinger</string>
     <string name="gutenberg_native_block_pasted">Blokk limt inn</string>
     <string name="gutenberg_native_block_duplicated">Blokk duplisert</string>
     <string name="gutenberg_native_block_cut">Blokk kuttet</string>
@@ -124,9 +298,9 @@ Language: nb_NO
     <string name="gutenberg_native_gradient_type">Gradienttype</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Dobbelttrykk for å velge alternativet</string>
     <string name="gutenberg_native_customize_gradient">Tilpass gradienten</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Sideforfatter</string>
     <string name="photo_picker_use_gif">Bruk denne GIFen</string>
+    <string name="menu_content_info">Innholdsstruktur</string>
     <string name="everyone">Alle</string>
     <string name="me">Meg</string>
     <string name="gutenberg_native_dismiss">Avfei</string>
@@ -144,8 +318,8 @@ Language: nb_NO
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Avbryt</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Flytt til kladd</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Flytt innlegg til kladder?</string>
-    <string name="reader_label_choose_your_interests">Velg dine interesser</string>
-    <string name="reader_choose_interests_content_description">Velg dine interesser</string>
+    <string name="reader_label_choose_your_interests">Velg dine emner</string>
+    <string name="reader_choose_interests_content_description">Velg dine emner</string>
     <string name="reader_btn_done">Utført</string>
     <string name="reader_btn_select_few_interests">Velg noen for å fortsette</string>
     <string name="post_status_post_published">Publisert</string>
@@ -154,14 +328,12 @@ Language: nb_NO
     <string name="publish_date">Publiseringsdato</string>
     <string name="status_and_visibility">Status og synlighet</string>
     <string name="update_now">Oppdater nå</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Prøv et startoppsett</string>
     <string name="gutenberg_native_open_block_actions_menu">Åpne handlingsmenyen for blokker</string>
-    <string name="gutenberg_native_insert_mention">Sett inn omtale</string>
+    <string name="gutenberg_native_move_to_top">Flytt til toppen</string>
     <string name="pages_cannot_be_started">Vi kan for tiden ikke åpne sider. Vennligst prøv igjen senere.</string>
     <string name="pages_set_as_posts_page">Sett som innleggsside</string>
     <string name="pages_set_as_homepage">Sett som forside</string>
-    <string name="suggestion_invalid_user">\"%s er ikke en gyldig bruker\"</string>
+    <string name="suggestion_invalid">%s er ikke en gyldig %s</string>
     <string name="site_settings_select_page">Velg side</string>
     <string name="site_settings_posts_page">Innleggsside</string>
     <string name="site_settings_static_homepage">Statisk hjemmeside</string>
@@ -172,7 +344,6 @@ Language: nb_NO
     <string name="site_settings_homepage">Hjemmeside</string>
     <string name="page_posts_page_successfully_updated">Innleggside oppdatert</string>
     <string name="page_homepage_successfully_updated">Hjemmeside oppdatert</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Velkommen til vår nye blogg</string>
     <string name="gutenberg_native_select_a_color">Velg en farge</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Dobbelttrykk for å gå til fargeinnstillinger</string>
     <string name="reader_empty_followed_blogs_description">Når du følger nettsteder vil du se innholdet her</string>
@@ -203,7 +374,6 @@ Language: nb_NO
     <string name="gutenberg_native_move_block_left">Flytt blokken mot venstre</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Dobbelttrykk for å flytte blokken mot høyre</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Dobbelttrykk for å flytte blokken mot venstre</string>
-    <string name="gutenberg_native_blog">Blogg</string>
     <string name="new_site_creation_creating_site_loading_4">Oppretter kontrollpanel</string>
     <string name="new_site_creation_creating_site_loading_3">Setter opp tema</string>
     <string name="new_site_creation_creating_site_loading_2">Legger til funksjoner på nettstedet</string>
@@ -255,46 +425,18 @@ Language: nb_NO
     <string name="app_theme_light">Lys</string>
     <string name="app_theme">Utseende</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Du gjorde nylig endringer på denne siden, men lagret dem ikke. Velg en versjon å laste:\n</string>
-    <string name="gutenberg_native_what_people_say">Hva folk sier</string>
-    <string name="gutenberg_native_warning_message">Advarselsmelding</string>
-    <string name="gutenberg_native_want_to_work_with_us">Vil du arbeide for oss?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_usa">USA</string>
-    <string name="gutenberg_native_team">Arbeidslag</string>
-    <string name="gutenberg_native_success_message">Vellykketmelding</string>
-    <string name="gutenberg_native_strategy">Strategi</string>
     <string name="gutenberg_native_show_post_content">Vis innhold av innlegg</string>
-    <string name="gutenberg_native_services">Tjenester</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Prosjektnavn</string>
-    <string name="gutenberg_native_position_or_job_title">Stilling eller yrkestittel</string>
-    <string name="gutenberg_native_portfolio">Portefølje</string>
     <string name="gutenberg_native_only_show_excerpt">Vis bare utdrag</string>
     <string name="gutenberg_native_link_to">Lenke til</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">La oss bygge noe sammen!</string>
-    <string name="gutenberg_native_let_s_build_something_together">La oss bygge noe sammen!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_inspiration">Inspirasjon</string>
-    <string name="gutenberg_native_get_in_touch">Ta kontakt</string>
+    <string name="gutenberg_native_link_settings">Lenkeinnstillinger</string>
     <string name="gutenberg_native_excerpt_length_words">Lengde på utdrag (ord)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Send meg e-post: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Gråt ikke fordi det er forbi, smil fordi det skjedde.</string>
     <string name="gutenberg_native_customize">TILPASS</string>
-    <string name="gutenberg_native_city_10100">1000 Sted</string>
     <string name="gutenberg_native_add_paragraph_block">Legg til avsnittsblokk</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Et kort beskrivelse av tjenestene du tilbyr.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_555_555_1234">98765432</string>
-    <string name="gutenberg_native_10_street_road">Gateveien 10</string>
     <string name="create_post_page_fab_tooltip_contributors">Lag et innlegg</string>
     <string name="post_list_tab_trashed_posts">Kastet</string>
     <string name="post_list_tab_scheduled_posts">Planlagt</string>
     <string name="post_list_tab_published_posts">Publisert</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Ikke tilkoblet</string>
-    <string name="my_site_select_domains_page_title">Nettstedsadresse</string>
     <string name="notifications_tab_title_likes">Likinger</string>
     <string name="notifications_tab_title_follows">Følger</string>
     <string name="notifications_tab_title_comments">Kommentarer</string>
@@ -306,14 +448,12 @@ Language: nb_NO
     <string name="stats_insights_management_general">Generelt</string>
     <string name="stats_management_screen_title">Legg til nytt kort</string>
     <string name="stats_management_add_new_stats_card">Legg til nytt statistikkort</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Valgt</string>
     <string name="reader_btn_select_filter_content_description">Velg nettsted eller nøkkelord for å filtrere innlegg</string>
     <string name="reader_btn_remove_filter_content_description">Fjern nåværende filter</string>
     <string name="reader_title_subs">Behandle emner og nettsteder</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Logge inn på WordPress.com?</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Logg inn på WordPress.com for å se de siste innleggene fra emner du følger</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Logg inn på WordPress.com for å se siste innlegg fra nettsteder du følger</string>
-    <string name="gutenberg_native_template_preview">Forhåndsvisning av mal</string>
     <string name="gutenberg_native_replace_current_block">Erstatt nåværende blokk</string>
     <string name="gutenberg_native_add_to_end">Legg til på slutten</string>
     <string name="gutenberg_native_add_to_beginning">Legg til i begynnelsen</string>
@@ -326,7 +466,6 @@ Language: nb_NO
     <string name="reader_filter_main_title">Følger</string>
     <string name="reader_filter_cta">Filter</string>
     <string name="gutenberg_native_edit_video">Rediger video</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Dobbelttrykk for å velge oppsett</string>
     <string name="gutenberg_native_add_a_shortcode">Legg til en kortkode…</string>
     <string name="post_list_author">Innleggsforfatter</string>
     <string name="fab_create_desc">Lag et innlegg</string>
@@ -339,10 +478,7 @@ Language: nb_NO
     <string name="stats_box_type_low">lav</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  og %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Flytt bilde forover</string>
-    <string name="gutenberg_native_move_image_backward">Flytt bilde bakover</string>
     <string name="gutenberg_native_gallery_caption_s">Galleribeskrivelse. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Nåværende verdi er %2$s</string>
     <string name="create_post_page_fab_tooltip">Lag et innlegg eller en side</string>
     <string name="post_signup_interstitial_not_right_now">Ikke akkurat nå</string>
     <string name="post_signup_interstitial_subtitle">Hva du enn vil lage eller dele vil vi hjelpe deg å gjøre det her.</string>
@@ -359,13 +495,10 @@ Language: nb_NO
     <string name="dialog_confirm_scheduled_post_sync_message">Dette innlegget vil synkroniseres straks.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Klar til å synkronisere?</string>
     <string name="new_site_creation_unavailable_domain">Dette domenet er ikke tilgengelig</string>
-    <string name="login_promo_viewpager_content_description">Introduksjon</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Vi klarte ikke å få tilgang til nettstedet ditt. Du må kontakte din nettvert for å løse dette.</string>
-    <string name="login_site_credentials_magic_link_label">Straks ferdig! Vi må bare få bekreftet din e-postadresse koblet til Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Logg inn med nettstedsinnloggingen.</string>
+    <string name="login_site_credentials_magic_link_label">Straks ferdig! Vi må bare få bekreftet din e-postadresse koblet til Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Logg inn med din innlggingsinformasjon fra nettstedet %1$s</string>
-    <string name="send_verification_email">Send e-post for bekreftelse</string>
     <string name="my_site_bottom_sheet_add_page">Nettstedsside</string>
     <string name="reader_following_display_name">Følger</string>
     <string name="reader_my_likes_display_name">Likinger</string>
@@ -378,25 +511,23 @@ Language: nb_NO
     <string name="suffix_1_000_000_000_000">%sT</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">Vi kan ikke åpne innlegget akkurat nå. Vennligst prøv igjen senere</string>
     <string name="site_cannot_be_loaded">Vi kan ikke laste data for ditt nettsted akkurat nå. Vennligst prøv igjen senere.</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress mediebibliotek</string>
+    <string name="gutenberg_native_unsupported">Ikke støttet</string>
     <string name="gutenberg_native_ungroup">Fjern fra gruppe</string>
     <string name="gutenberg_native_translate">Oversett</string>
-    <string name="gutenberg_native_title">Tittel:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Trykk for å skjule tatstaturet</string>
     <string name="gutenberg_native_tap_here_to_show_help">Trykk her for å vise hjelp</string>
     <string name="gutenberg_native_take_a_video">Ta en video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Ta et bilde eller en video</string>
     <string name="gutenberg_native_take_a_photo">Ta et foto</string>
     <string name="gutenberg_native_start_writing">Start å skrive…</string>
-    <string name="gutenberg_native_size">Størrelse</string>
     <string name="gutenberg_native_show_section">Vis seksjon</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s-blokk. enn blokken har ugyldig innhold</string>
     <string name="gutenberg_native_s_block_empty">%s blokk. Tom</string>
     <string name="gutenberg_native_cut_block">Kutt blokk</string>
-    <string name="gutenberg_native_reset_block">Tilbakestill blokk</string>
     <string name="gutenberg_native_problem_opening_the_video">Problem under åpning av videoen</string>
     <string name="gutenberg_native_problem_displaying_block">Problem ved visning av blokk</string>
     <string name="gutenberg_native_post_title_s">Overskrift innlegg. %s</string>
@@ -406,17 +537,12 @@ Language: nb_NO
     <string name="gutenberg_native_open_settings">Åpne innstillinger</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Ingen app kan håndtere denne forespørselen. Vennligst installer en nettleser.</string>
     <string name="gutenberg_native_navigate_up">Naviger opp</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mitt førpubliseringspanel</string>
-    <string name="gutenberg_native_my_post_status_info">Min informasjon om innleggsstatus</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mitt etterpubliseringspanel</string>
-    <string name="gutenberg_native_my_document_setting_panel">Mitt innstillingspanel for dokument</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Flytt blokk opp fra rad %1$s til rad %2$s</string>
     <string name="gutenberg_native_move_block_up">Flytt blokk opp</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Flytt blokk ned fra rad %1$s til rad %2$s</string>
     <string name="gutenberg_native_move_block_down">Flytt blokk ned</string>
     <string name="gutenberg_native_image_caption_s">Bildetekst. %s</string>
     <string name="gutenberg_native_hide_keyboard">Skjul tastatur</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Her er panelinnholdet!</string>
     <string name="gutenberg_native_help_icon">Hjelpeikon</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Mislyktes i å sette inn media.\nVennligst trykk for alternativer.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Dobbelttrykk for å angre siste endring</string>
@@ -428,34 +554,28 @@ Language: nb_NO
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Dobbelttrykk for å flytte blokken opp</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Dobbelttrykk for å flytte blokken ned</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Dobbelttrykk for å redigere denne verdien</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Dobbelttrykk for å redigere verdien med glidekontroll</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Dobbelttrykk for å legge til en blokk</string>
     <string name="gutenberg_native_current_value_is_s">Nåværende verdi er %s</string>
-    <string name="gutenberg_native_content">Innhold…</string>
     <string name="gutenberg_native_choose_from_device">Velg fra enhet</string>
-    <string name="gutenberg_native_annotations_sidebar">Sidekolonne for merknader</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">En ukjent feil oppstod. Vennligst prøv igjen.</string>
     <string name="gutenberg_native_alt_text">Alt-tekst</string>
     <string name="gutenberg_native_add_video">LEGG TIL VIDEO</string>
     <string name="gutenberg_native_add_url">Legg til URL</string>
+    <string name="gutenberg_native_add_alt_text">Legg til alt-tekst</string>
     <string name="gutenberg_native_add_image_or_video">LEGG TIL BILDE ELLER VIDEO</string>
     <string name="gutenberg_native_add_image">LEGG TIL BILDE</string>
     <string name="gutenberg_native_add_block_here">LEGG TIL BLOKK HER</string>
-    <string name="gutenberg_native_add_annotation">Legg til merknad</string>
-    <string name="gutenberg_native_add_a_description">Legg til en beskrivelse</string>
     <string name="reader_empty_saved_posts_content_description">Trykk Legg til for å lagre-knappen for å lagre et innlegg til listen din.</string>
     <string name="reader_acessibility_list_loaded">\"Listen er lastet inn med %1$d elementer.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Varsler</string>
-    <string name="master_switch_default_title_off">Av</string>
-    <string name="master_switch_default_title_on">På</string>
-    <string name="notifications_tab_dialog_master_off_message">Å skru av varslinger for dette nettstedet vil deaktivere visning av varslinger på varslingsfanen for dette nettstedet. Du kan finjustere hva slags varslinger du vil se etter å ha skrudd på varslinger dette nettstedet.</string>
-    <string name="notifications_tab_dialog_master_off_title">For å se varslinger på varslingsfanen for dette nettstedet, skru på varslinger for dette nettstedet.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Aktiver visning av varslinger på varslingsfanen for dette nettstedet</string>
-    <string name="notifications_tab_dialog_master_hint_on">Deaktiver visning av varslinger  på varslingsfanen for dette nettstedet.</string>
-    <string name="notifications_tab_dialog_master_status_off">Varslinger for dette nettstedet</string>
-    <string name="notifications_tab_dialog_master_status_on">Varslinger for dette nettstedet</string>
-    <string name="dialog_gutenberg_informative_description_page">Du bruker nå blokkredigering for nye sider, flott! Om du ønsker å bytte til klassisk redigering, gå til \'Mitt nettsted\' > \'Innstillinger for nettstedet\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">Du bruker nå blokkredigering for nye innlegg, flott! Om du ønsker å bytte til klassisk redigering, gå til \'Mitt nettsted\' > \'Innstillinger for nettstedet\'.</string>
+    <string name="main_switch_default_title_off">Av</string>
+    <string name="main_switch_default_title_on">På</string>
+    <string name="notifications_tab_dialog_main_off_message">Å skru av varslinger for dette nettstedet vil deaktivere visning av varslinger på varslingsfanen for dette nettstedet. Du kan finjustere hva slags varslinger du vil se etter å ha skrudd på varslinger dette nettstedet.</string>
+    <string name="notifications_tab_dialog_main_off_title">For å se varslinger på varslingsfanen for dette nettstedet, skru på varslinger for dette nettstedet.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Slå på visning av varslinger på varslingsfanen for dette nettstedet</string>
+    <string name="notifications_tab_dialog_main_hint_on">Slå av visning av varslinger  på varslingsfanen for dette nettstedet</string>
+    <string name="notifications_tab_dialog_main_status_off">Varslinger for dette nettstedet</string>
+    <string name="notifications_tab_dialog_main_status_on">Varslinger for dette nettstedet</string>
     <string name="pick_media">Legg til bilde eller video</string>
     <string name="error_post_not_submitted_retrying">Vi kunne ikke sende dette innlegget til gjennomgang, men vi vil prøve igjen senere.</string>
     <string name="error_post_not_scheduled_retrying">Vi kunne ikke planlegge dette innlegget, men vi vil prøve igjen senere.</string>
@@ -548,8 +668,6 @@ Language: nb_NO
     <string name="post_settings_add_to_calendar">Legg til på kalender</string>
     <string name="post_settings_notification">Varsling</string>
     <string name="post_settings_time_and_date">Dato og tid</string>
-    <string name="login_need_help_finding_connected_email">Trenger du hjelp til å finne den e-postadressen du koblet til med?</string>
-    <string name="enter_wordpress_site">Nettstedet på denne adressen er ikke et WordPress-nettsted. For at vi skal kunne koble til det må det ha WordPress installert.</string>
     <string name="login_invalid_site_url">Vennligst oppgi en fullstendig nettstedsadresse, f.eks example.com.</string>
     <string name="enter_email_for_site">Logg inn med WordPress.com for å koble til %1$s</string>
     <string name="stats_post_views_label">Visninger</string>
@@ -614,7 +732,7 @@ Language: nb_NO
     <string name="domain_registration_state_picker_dialog_title">Velg delstat</string>
     <string name="domain_registration_country_picker_dialog_title">Velg land</string>
     <string name="domain_registration_result_continue_button">fortsett</string>
-    <string name="domain_registration_result_description">ditt nye domene &lt;b>%s&lt;/b> blir satt opp. Ditt nettsted\n        gjør saltomortaler i begeistring!</string>
+    <string name="domain_registration_result_description">ditt nye domene &lt;b&gt;%s&lt;/b&gt; blir satt opp. Ditt nettsted\n        gjør saltomortaler i begeistring!</string>
     <string name="domain_registration_result_title">Gratulerer</string>
     <string name="domain_contact_information_register_domain_button">Registrer domene</string>
     <string name="domain_contact_information_postal_code_hint">Postnummer</string>
@@ -721,12 +839,10 @@ Language: nb_NO
     <string name="plans_loading_error_no_plans_title">Kan ikke laste pakker</string>
     <string name="plans_loading_error_network_title">Ingen forbindelse</string>
     <string name="menu_switch_to_gutenberg_editor">Bytt til blokkredigering</string>
-    <string name="menu_switch_to_aztec_editor">Bytt til klassisk redigering</string>
     <string name="stats_loading_block_error">Det oppsto et problem med lasting av dine data, oppfrisk siden og forsøk igjen.</string>
     <string name="stats_loading_error">Data ikke lastet inn</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Rediger nye innlegg og sider med blokkredigering</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Bruk blokkredigering</string>
-    <string name="dialog_gutenberg_informative_title">Blokkredigering aktivert</string>
     <string name="exit">gå ut</string>
     <string name="quick_start_sites_type_subtitle">%1$d av %2$d ferdig</string>
     <string name="quick_start_sites_type_grow">Gjør ditt publikum større</string>
@@ -737,8 +853,6 @@ Language: nb_NO
     <string name="quick_start_dialog_upload_icon_title">Last opp nettstedsikon</string>
     <string name="quick_start_dialog_upload_icon_message">Dine besøkende vil se ditt ikon i nettleseren. Legg til et tilpasset ikon for et polert og proft utseende.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Trykk %1$s pakke %2$s for å se din nåværende pakke og andre tilgjengelige pakker</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Trykk %1$s Legg til side %2$s for å lage en ny side.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Trykk %1$s sider %2$s for å fortsette.</string>
     <string name="quick_start_dialog_check_stats_message_short">Trykk %1$s Statistkk %2$s for å se hvordan nettstedet ditt gjør det.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Trykk %1$s Ditt nettstedsikon %2$s for å laste opp et nytt</string>
     <string name="quick_start_dialog_publish_post_message">Kladd og publiser ditt første innlegg.</string>
@@ -748,13 +862,8 @@ Language: nb_NO
     <string name="quick_start_dialog_explore_plans_message">Lær om våre markedsførings- og SEO-verktøy i våre betalte pakker.</string>
     <string name="quick_start_dialog_enable_sharing_title">Aktiver deling av innlegg</string>
     <string name="quick_start_dialog_enable_sharing_message">Del dine innlegg automatisk på sosiale media.</string>
-    <string name="quick_start_dialog_customize_site_message">Juster skrifttyper, legg til bilder og mer.</string>
-    <string name="quick_start_dialog_create_page_title">Lag en ny side</string>
-    <string name="quick_start_dialog_create_page_message">Legg til en side for nøkkelinnhold — en \"Om\"-side er en god start.</string>
     <string name="quick_start_dialog_check_stats_title">Sjekk din besøksstatistikk</string>
     <string name="quick_start_dialog_check_stats_message">Hold deg oppdatert om ytelsen til ditt nettsted.</string>
-    <string name="quick_start_dialog_browse_themes_title">Bla gjennom temaer</string>
-    <string name="quick_start_dialog_browse_themes_message">Utforsk dusinvis med utformingsalternativer og finn din perfekte passform.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Fjern de neste trinn</string>
     <string name="quick_start_remove_next_steps_menu_title">Fjern dette</string>
     <string name="quick_start_complete_view_subtitle">Gratulerer med fullført liste. Godt jobbet.</string>
@@ -777,15 +886,11 @@ Language: nb_NO
     <string name="notification_new_site_creation_failed">Det oppsto et problem</string>
     <string name="notification_new_site_creation_title">Lag nettsted</string>
     <string name="new_site_creation_create_site_button">Lag nettsted</string>
-    <string name="new_site_creation_search_domain_input_hint">Søk domener</string>
     <string name="new_site_creation_domain_header_subtitle">Dette er der folk vil finne deg på nettet.</string>
-    <string name="new_site_creation_domain_header_title">Velg et domenenavn for ditt nettsted</string>
     <string name="new_site_creation_empty_domain_list_message">Ingen tilgjengelige adresser passet til ditt søk</string>
     <string name="site_creation_error_generic_subtitle">Feil ved kommunkasjonen med server, vennligst prøv igjen</string>
     <string name="site_creation_error_generic_title">Det oppsto et problem</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Det oppsto et problem</string>
-    <string name="site_creation_segments_subtitle">Dette hjelper oss å komme med anbefalinger, men du er blir aldri låst — alle nettsteder utvikler seg!</string>
-    <string name="site_creation_segments_title">Fortell oss hva slags nettsted du ønsker å lage</string>
     <string name="new_site_creation_preview_title">Ditt nettsted er laget!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d av %2$d</string>
     <string name="new_site_creation_screen_title_general">Opprett nettsted</string>
@@ -940,15 +1045,9 @@ Language: nb_NO
     <string name="quick_start_dialog_need_help_button_neutral">Aldri</string>
     <string name="quick_start_dialog_need_help_button_negative">Nei takk</string>
     <string name="quick_start_dialog_follow_sites_title">Følg andre nettsteder</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Trykk %1$s Søk %2$s for å se etter nettsteder med liknende interesser</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Trykk %1$s Søk %2$s for å se etter nettsteder med liknende emner</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Trykk %1$s Leser %2$s for å fortsette</string>
     <string name="quick_start_dialog_follow_sites_message">Finn nettsteder som inspirerer deg og følg dem for å få oppdateringer når de publiserer.</string>
-    <string name="quick_start_dialog_customize_site_title">Tilpass ditt nettsted</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Trykk %1$s Tema %2$s for å fortsette</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Trykk %1$s Tilpass %2$s for å starte personliggjøring av ditt nettsted</string>
-    <string name="quick_start_dialog_choose_theme_title">Velg et tema</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Trykk %1$s Temaer %2$s for å oppdage nye temaer</string>
-    <string name="quick_start_dialog_choose_theme_message">Bla gjennom alle våre tema for å finne et som passer perfekt.</string>
     <string name="quick_start_button_positive">Gå</string>
     <string name="quick_start_button_negative_short">Avbryt</string>
     <string name="quick_start_button_negative">Ikke nå</string>
@@ -1012,12 +1111,11 @@ Language: nb_NO
     <string name="support_contact_email">Epost for kontakt</string>
     <string name="application_log_button">Appllikasjonslogg</string>
     <string name="my_tickets">Mine saker</string>
-    <string name="activity_log_rewind_site">Tilbakestill nettsted</string>
     <string name="activity_log_currently_restoring_message">Tilbakestiller til %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Ditt nettsted tilbakestilles nå</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Ditt nettsted er tilbakestilt</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Ditt nettsted er gjenopprettet\nTilbakestilt til %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Ditt nettsted gjenopprettes\nTilbakestiller til %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Ditt nettsted er gjenopprettet\nGjenopprettet til %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Ditt nettsted gjenopprettes\nGjenoppretter til %1$s %2$s</string>
     <string name="activity_log_button">Handlingsknapp for aktivitetslogg</string>
     <string name="plugin_auto_managed">Automatisk behandlet</string>
     <string name="reader_save_posts_locally_dialog_message">Lagre dette innlegget og kom tilbake for å lese det når som helst. Det vil bare bli lagret på denne enheten — lagrede innlegg synkroniseres ikke til andre enheter.</string>
@@ -1027,20 +1125,16 @@ Language: nb_NO
     <string name="comment_read_source_post">Les kildeinnlegget</string>
     <string name="sites">Nettsteder</string>
     <string name="signup_magic_link_title">Magisk lenke sendt</string>
-    <string name="signup_email_screen_title">Registrering via epost</string>
     <string name="verification_2fa_screen_title">Kodebekreftelse</string>
     <string name="selfhosted_site_login_title">Legitimasjoner for innlogging</string>
     <string name="magic_link_sent_login_title">Magisk lenke sendt</string>
     <string name="magic_link_login_title">Innlogging med magisk lenke</string>
     <string name="site_address_login_title">Innlogging på nettstedsadresse</string>
     <string name="email_address_login_title">Innlogging med epost</string>
-    <string name="alternatively">Alternativt:</string>
     <string name="reader_empty_saved_posts_description">Trykk %s for å lagre innlegget på din liste.</string>
     <string name="reader_empty_saved_posts_title">Ingen innlegg lagret — ennå!</string>
     <string name="reader_bookmark_snack_title">Innlegg lagret</string>
     <string name="reader_bookmark_snack_btn">Vis alle</string>
-    <string name="reader_btn_bookmarked">Lagret</string>
-    <string name="reader_btn_bookmark">Lagre</string>
     <string name="reader_remove_bookmark">Fjern fra lagrede innlegg</string>
     <string name="reader_add_bookmark">Legg til i lagrede innlegg</string>
     <string name="reader_save_for_later_title">Lagrede innlegg</string>
@@ -1060,18 +1154,15 @@ Language: nb_NO
     <string name="reader_btn_notifications_on">Skru på varsler for nettstedet</string>
     <string name="reader_btn_notifications_off">Skru av varsler for nettstedet</string>
     <string name="activity_log_jetpack_icon">Jetpack-ikon</string>
-    <string name="rewind">Tilbakestill</string>
     <string name="activity_log_event">Hendelse</string>
     <string name="activity_log_icon">Aktivtitetsikon</string>
     <string name="activity_log">Aktivitetslogg</string>
-    <string name="activity">Aktivitet</string>
     <string name="privacy_policy_read">Les personvernerklæringen</string>
     <string name="privacy_policy_learn_more_header">Personvernerklæring</string>
     <string name="cookie_policy_learn_more_header">Policy for informasjonskapsler</string>
     <string name="preference_privacy_settings">Innstillinger for personvern</string>
     <string name="preference_collect_information">Samle informasjon</string>
     <string name="post_submitted">Innlegg sendt inn</string>
-    <string name="login_email_button_signup">Har du ingen konto? %1$sRegistrer deg%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Utvidelsesfunksjonen krever at nettstedet er i god stand.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Funksjonen i utvidelsen krever administraror-rettigheter.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">Utvidelsen kan ikke installeres på VIP-nettsteder.</string>
@@ -1164,7 +1255,6 @@ Language: nb_NO
     <string name="edit_photo_screen_title">Rediger bilde</string>
     <string name="share_intent_screen_title">Velg nettsted</string>
     <string name="signup_epilogue_screen_title">Ny konto</string>
-    <string name="login_prologue_screen_title">Logg inn</string>
     <string name="login_epilogue_screen_title">Logget inn som</string>
     <string name="person_detail_screen_title">Persondetalj</string>
     <string name="media_settings_screen_title">Fildetaljer</string>
@@ -1216,7 +1306,6 @@ Language: nb_NO
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 innlegg med 1 fil ikke lastet opp</string>
     <string name="untitled_in_parentheses">(Uten tittel)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Opprett nettsted</string>
     <string name="notification_site_creation_created">Trykk for å fortsette.</string>
     <string name="notification_site_creation_title_success">Nettsted opprettet!</string>
@@ -1228,11 +1317,8 @@ Language: nb_NO
     <string name="username_changer_dismiss_button_positive">Forkast</string>
     <string name="username_changer_action">Lagre</string>
     <string name="content_description_add_avatar">Legg til avatar</string>
-    <string name="signup_with_google_button">Registrer deg med Google</string>
-    <string name="signup_with_email_button">Registrer deg med epost</string>
     <string name="signup_user_exists">Epost-adressen finnes allerede påWordPress.com.\nFortsett med innlogging.</string>
     <string name="signup_updating_account">Oppdaterer konto…</string>
-    <string name="signup_terms_of_service_text">Ved å registrere deg aksepterer du %1$stjenestebetingelsene%2$s.</string>
     <string name="signup_magic_link_progress">Sender epost</string>
     <string name="signup_magic_link_error_button_positive">Prøv igjen</string>
     <string name="signup_magic_link_error_button_negative">Lukk</string>
@@ -1242,11 +1328,6 @@ Language: nb_NO
     <string name="signup_epilogue_error_button_positive">Prøv igjen</string>
     <string name="signup_epilogue_error_button_negative">Tilbakestill</string>
     <string name="signup_epilogue_error_avatar">Det oppsto problemer med å laste opp din avatar.</string>
-    <string name="signup_email_header">For å lage din nye brukerkonto på WordPres.com, vennligst oppgi dn epost-adresse.</string>
-    <string name="signup_email_error_generic">Det opsto problemer med å kontrollere din e-postadresse.</string>
-    <string name="sign_up">Registrer deg på WordPress.com</string>
-    <string name="enter_username_instead">Logg inn med ditt brukernavn.</string>
-    <string name="enter_site_address_instead">Logg inn med din nettstdedsadresse.</string>
     <string name="plugin_needs_update">Trenger oppdatering</string>
     <string name="plugin_caption_search">Søk utvidelser</string>
     <string name="plugin_caption_new">Ny</string>
@@ -1364,7 +1445,6 @@ Language: nb_NO
     <string name="media_edit_file_details_card_caption">Fildetaljer</string>
     <string name="login_error_suffix">\nKanskje prøve en annen brukerkonto?</string>
     <string name="login_error_button">Lukk</string>
-    <string name="login_google_button_suffix">Logg inn med Google.</string>
     <string name="error_generic_network">Det oppsto en nettverksfeil. Vennligst kontroller din nettforbindelse og prøv igjen.</string>
     <string name="post_settings_remove_featured_image">Fjern fremhevet bilde</string>
     <string name="post_settings_choose_featured_image">Velg fremhevet bilde</string>
@@ -1375,12 +1455,11 @@ Language: nb_NO
     <string name="jetpack_disconnect_confirm">Koble fra</string>
     <string name="jetpack_disconnect_confirmation_message">Er du sikker på at du vil frakoble Jetpack fra denne siden?</string>
     <string name="jetpack_disconnect_pref_title">«Koble ut fra WordPress.com»</string>
-    <string name="site_settings_jetpack_whitelist_description">Du kan hviteliste en IP-adresse eller serie av IP-adresser, for å hindre dem fra å noensinne bli blokkert av Jetpack. IPv6 og IPv4 er mulige. For å bestemme en rekkevidde, skriv inn minimumsverdien og maksverdien, adskilt av en strek. For eksempel: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Du angi en IP-adresse (eller serier av IP-adresser) som \"Alltid tillatte\" for å hindre dem fra å noensinne bli blokkert av Jetpack. IPv6 og IPv4 er mulige. For å bestemme en rekkevidde, skriv inn minimumsverdien og maksverdien, adskilt av en bindestrek. Eksempel: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Krev to-trinnsautentisering</string>
     <string name="jetpack_match_wpcom_via_email_title">Samsvar kontoer gjennom E-post</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Tillat WordPress.com-innlogging</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com-innlogging</string>
-    <string name="jetpack_brute_force_whitelist_title">Hvitelistede IP-adresser</string>
     <string name="jetpack_prevent_brute_force_title">Blokker fiendtlige innloggingsforsøk</string>
     <string name="jetpack_prevent_brute_force_category_title">Beskyttelse mot angrep med rå styrke</string>
     <string name="jetpack_send_wp_notifications_title">Send push-notifikasjoner</string>
@@ -1421,12 +1500,12 @@ Language: nb_NO
     <string name="notification_settings_category_other">Annet</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Alle mine nettsteder</string>
     <string name="notification_settings_category_your_sites">Nettstedene dine</string>
-    <string name="notification_settings_master_off_message">Å skru av Notifikasjonsinnstillinger vil deaktivere alle notifikasjoner fra denne appen, uansett type. Du kan finjustere hvilke notifikasjoner du vil motta, etter at du har skrudd Notifikasjonsinnstillinger på.</string>
-    <string name="notification_settings_master_off_title">For å motta notifikasjoner på denne enheten, skru på Notifikasjonsinnstillinger</string>
-    <string name="notification_settings_master_hint_off">Aktiver notifikasjoner</string>
-    <string name="notification_settings_master_hint_on">Deaktiver notifikasjoner</string>
-    <string name="notification_settings_master_status_off">Av</string>
-    <string name="notification_settings_master_status_on">På</string>
+    <string name="notification_settings_main_off_message">Å skru av varslingssinnstillinger vil slå av alle varslinger fra denne appen, uansett type. Du kan finjustere hvilke varslinger du vil motta, etter at du har skrudd på varslingssinnstillinger.</string>
+    <string name="notification_settings_main_off_title">For å motta varslinger på denne enheten, skru på varslingssinnstillinger</string>
+    <string name="notification_settings_main_hint_off">Aktiver varslinger</string>
+    <string name="notification_settings_main_hint_on">Slå av varslinger</string>
+    <string name="notification_settings_main_status_off">Av</string>
+    <string name="notification_settings_main_status_on">På</string>
     <string name="max_video_resolution">Maks videostørrelse</string>
     <string name="max_thumbnail_px_size">Maks bildestørrelse</string>
     <string name="error_upload_post_media_param">Det var en feil under opplastning av mediene i dette innlegget: %s.</string>
@@ -1463,7 +1542,6 @@ Language: nb_NO
     <string name="login_site_address_more_help">Trenger du mere hjelp?</string>
     <string name="login_site_address_help_content">Nettstedsadressen din dukker opp i linjen på toppen av skjermen, når du besøker siden din på Chrome.</string>
     <string name="login_site_address_help_title">Hva er nettstedsadressen min?</string>
-    <string name="login_site_address_help">Trenger du hjelp med å finne nettstedsadressen din?</string>
     <string name="login_site_address">Nettstedsadresse</string>
     <string name="enter_site_address">Oppgi adressen til det WordPress-nettstedet du ønsker å koble til.</string>
     <string name="login_already_logged_in_wpcom">Du er allerede logget på WordPress.com</string>
@@ -1475,7 +1553,6 @@ Language: nb_NO
     <string name="requesting_otp">Ber om en verifiseringskode via SMS.</string>
     <string name="login_text_otp">Send meg en kode i stedet</string>
     <string name="enter_verification_code">Nesten framme! Vennligst skriv inn verifiseringskoden fra autentiseringsappen din.</string>
-    <string name="open_mail">Åpne E-post</string>
     <string name="next">Neste</string>
     <string name="enter_email_wordpress_com">Logg inn på WordPress.com ved å bruke en E-postadresse, for å behandle alle dine WordPress-nettsteder.</string>
     <string name="image_optimization_promo_desc">Bildeoptimalisering krymper bilder for raskere opplastning.\n\nDu kan endre dette til enhver tid i nettstedets innstillinger.</string>
@@ -1498,10 +1575,6 @@ Language: nb_NO
     <string name="post_status_draft">Utkast</string>
     <string name="post_status_pending_review">Avventer gjennomgang</string>
     <string name="post_status_publish_post">Publiser</string>
-    <string name="change_location">Endre posisjon</string>
-    <string name="remove_location">Fjern posisjon</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Klarte ikke å åpne Posisjonsvelger, siden Google Play Tjenester ikke er tilgjengelig</string>
-    <string name="post_settings_location">Posisjon</string>
     <string name="now">Nå</string>
     <string name="post_settings_password_dialog_hint">Kun de som har dette passordet kan se dette innlegget</string>
     <string name="post_settings_excerpt_dialog_hint">Utdrag, er valgfrie håndlagde oppsummeringer av innholdet ditt.</string>
@@ -1685,7 +1758,7 @@ Language: nb_NO
     <string name="signout">Logg av</string>
     <string name="sign_in_wpcom">Logg inn til WordPress.com</string>
     <string name="reader_label_global_related_posts">Mere på WordPress.com</string>
-    <string name="reader_label_local_related_posts">Mere i %s</string>
+    <string name="reader_label_local_related_posts">Mer fra %s</string>
     <string name="preference_open_device_settings">Åpne enhetsinnstillingene</string>
     <string name="invite_invalid_email">%s: Ugyldig E-post</string>
     <string name="invite_user_blocked_invites">%s: Brukeren har blokkert invitasjoner</string>
@@ -1733,20 +1806,16 @@ Language: nb_NO
     <string name="invite_error_invalid_usernames_multiple">Kan ikke sende: Det er ugyldige brukernavn eller E-poster</string>
     <string name="invite_error_invalid_usernames_one">Kan ikke sende: Et brukernavn eller en E-postadresse er ugyldig</string>
     <string name="invite_error_no_usernames">Vennligst legg til minst ett brukernavn</string>
-    <string name="invite_message_info">(Valgfritt) Du kan skrive inn en tilpasset melding på opptil 500 tegn, som vil bli inkludert i invitasjonen til brukeren(e).</string>
-    <string name="invite_message_remaining_other">%d tegn igjen</string>
-    <string name="invite_message_remaining_one">1 tegn igjen</string>
-    <string name="invite_message_remaining_zero">0 tegn igjen</string>
     <string name="invite_message_title">Tilpasset melding</string>
     <string name="invite">Inviter</string>
-    <string name="invite_names_title">Brukernavn eller E-poster</string>
+    <string name="invite_names_title">Brukernavn eller e-poster</string>
     <string name="invite_people">Inviter folk</string>
     <string name="my_site_header_external">Eksternt</string>
-    <string name="send_link">Send lenke</string>
     <string name="label_clear_search_history">Slett søkehistorien</string>
     <string name="dlg_confirm_clear_search_history">Vil du slette søkehistorien?</string>
     <string name="reader_empty_search_description">Ingen innlegg ble funnet for %s på språket ditt</string>
     <string name="reader_hint_post_search">Søk i WordPress</string>
+    <string name="reader_title_related_post_detail">Relatert innlegg</string>
     <string name="preview_screen_links_disabled">Lenker er deaktivert på forhåndsvisningsskjermen</string>
     <string name="send">Send</string>
     <string name="person_removed">%1$s ble vellykket fjernet</string>
@@ -1765,7 +1834,6 @@ Language: nb_NO
     <string name="checking_email">Sjekker E-posten</string>
     <string name="magic_link_unavailable_error_message">Ikke tilgjengelig for øyeblikket. Vennligst skriv inn passordet ditt</string>
     <string name="logging_in">Logger inn</string>
-    <string name="enter_your_password_instead">Skriv inn passordet ditt istedet</string>
     <string name="web_address_dialog_hint">Vises offentlig når du kommenterer.</string>
     <string name="capture_or_pick_photo">Ta eller velg et bilde</string>
     <string name="plans">Planer</string>
@@ -1831,9 +1899,9 @@ Language: nb_NO
     <string name="approve_manual">Ingen kommentarer</string>
     <string name="site_settings_paging_summary_other">%d kommentarer per side</string>
     <string name="site_settings_paging_summary_one">1 kommentar per side</string>
-    <string name="site_settings_multiple_links_summary_other">Krev godkjennelse ved >%d lenker</string>
-    <string name="site_settings_multiple_links_summary_one">Krev godkjennelse ved >1 lenke</string>
-    <string name="site_settings_multiple_links_summary_zero">Krev godkjennelse ved >0 lenker</string>
+    <string name="site_settings_multiple_links_summary_other">Krev godkjennelse ved &gt;%d lenker</string>
+    <string name="site_settings_multiple_links_summary_one">Krev godkjennelse ved &gt;1 lenke</string>
+    <string name="site_settings_multiple_links_summary_zero">Krev godkjennelse ved &gt;0 lenker</string>
     <string name="detail_approve_auto">Godkjenn automatisk alles beskjeder.</string>
     <string name="detail_approve_auto_if_previously_approved">Godkjenn automatisk dersom brukeren har en tidligere godkjent kommentar</string>
     <string name="detail_approve_manual">Krev manuell godkjennelse av alles kommentarer</string>
@@ -1886,7 +1954,7 @@ Language: nb_NO
     <string name="site_settings_paging_dialog_description">Bryt kommentarfelter opp i flere sider.</string>
     <string name="site_settings_paging_dialog_header">Kommentarer per side</string>
     <string name="site_settings_close_after_dialog_title">Lukk kommentering</string>
-    <string name="site_settings_blacklist_description">Når en kommentar inneholder noen av disse ordene i sitt innhold, navn, nettadresse, E-post eller IP, vil det bli merket som spam. Du kan skrive inn delvise ord, som betyr at «press» vil samsvare med «WordPress».</string>
+    <string name="site_settings_denylist_description">Når en kommentar inneholder noen av disse ordene i sitt innhold, navn, nettadresse, e-post eller IP, vil det bli merket som spam. Du kan skrive inn delvise ord, som betyr at \"press\" vil samsvare med \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Når en kommentar inneholder noen av disse ordene i sitt innhold, navn, nettadresse, E-post eller IP, vil det bli holdt tilbake i modereringskøen. Du kan skrive inn delvise ord, som betyr at «press» vil samsvare med «WordPress».</string>
     <string name="site_settings_list_editor_input_hint">Skriv inn et ord eller en frase</string>
     <string name="site_settings_list_editor_no_items_text">Ingen gjenstander</string>
@@ -1901,10 +1969,10 @@ Language: nb_NO
     <string name="site_settings_rp_show_header_title">Vis overskriften</string>
     <string name="site_settings_rp_switch_summary">«Relaterte innlegg» viser relevant innhold fra nettstedet ditt under innleggene dine.</string>
     <string name="site_settings_rp_switch_title">Vis relaterte innlegg</string>
-    <string name="site_settings_blacklist_hint">Kommentarer som samsvarer med et filter, blir markert som spam</string>
+    <string name="site_settings_denylist_hint">Kommentarer som samsvarer med et filter, blir markert som spam</string>
     <string name="site_settings_moderation_hold_hint">Kommentarer som samsvarer med et filter, blir plassert i modereringskøen</string>
     <string name="site_settings_multiple_links_hint">Ignorerer lenkebegrensingen for kjente brukere</string>
-    <string name="site_settings_whitelist_hint">Kommentarforfatteren må ha en tidligere godkjent kommentar</string>
+    <string name="site_settings_allowlist_hint">Kommentarforfatteren må ha en tidligere godkjent kommentar</string>
     <string name="site_settings_user_account_required_hint">Brukere må være registrert og logget inn for å kommentere</string>
     <string name="site_settings_identity_required_hint">Kommentarforfatteren må fylle ut navn og E-post</string>
     <string name="site_settings_paging_hint">Vis kommentarer i klumper av en bestemt størrelse</string>
@@ -1927,17 +1995,16 @@ Language: nb_NO
     <string name="site_settings_address_hint">Å endre adressen din er ikke støttet for øyeblikket</string>
     <string name="site_settings_tagline_hint">En kort forklaring eller fengende frase som skal beskrive bloggen din</string>
     <string name="site_settings_title_hint">Med noen få ord, forklar hva denne siden handler om</string>
-    <string name="site_settings_whitelist_known_summary">Kommentarer fra kjente brukere</string>
-    <string name="site_settings_whitelist_all_summary">Kommentarer fra alle brukere</string>
+    <string name="site_settings_allowlist_known_summary">Kommentarer fra kjente brukere</string>
+    <string name="site_settings_allowlist_all_summary">Kommentarer fra alle brukere</string>
     <string name="site_settings_threading_summary">%d nivåer</string>
     <string name="site_settings_privacy_private_summary">Privat</string>
     <string name="site_settings_privacy_hidden_summary">Skjult</string>
     <string name="site_settings_privacy_public_summary">Offentlig</string>
     <string name="site_settings_delete_site_title">Slett siden</string>
-    <string name="site_settings_blacklist_title">Svarteliste</string>
     <string name="site_settings_moderation_hold_title">Hold tilbake for moderering</string>
     <string name="site_settings_multiple_links_title">Lenker i kommentarer</string>
-    <string name="site_settings_whitelist_title">Godkjenn automatisk</string>
+    <string name="site_settings_allowlist_title">Godkjenn automatisk</string>
     <string name="site_settings_paging_title">Sideføring</string>
     <string name="site_settings_threading_title">Trådføring</string>
     <string name="site_settings_sort_by_title">Sorter etter</string>
@@ -2086,7 +2153,6 @@ Language: nb_NO
     <string name="logs_copied_to_clipboard">App-loggbøker har blitt kopiert til utklippstavlen</string>
     <string name="reader_empty_posts_in_blog">Dette nettstedet er tomt</string>
     <string name="reader_label_new_posts">Nye innlegg</string>
-    <string name="reader_page_recommended_blogs">Du vil kanskje like</string>
     <string name="error_copy_to_clipboard">En feil oppstod under kopiering av tekst til utklippstavlen</string>
     <string name="post_uploading">Laster opp innlegg</string>
     <string name="stats_followers_years">%1$d år</string>
@@ -2151,7 +2217,6 @@ Language: nb_NO
     <string name="reader_title_blog_preview">Leser-nettsted</string>
     <string name="ssl_certificate_ask_trust">Hvis du vanligvis har koblet deg til dette nettstedet uten problemer, kan denne feilen bety at noen prøver å imitere dette nettstedet, og at du ikke bør fortsette. Er du helt sikker på at du vil stole på dette sertifikatet likevel?</string>
     <string name="ssl_certificate_error">Ugyldig SSL-sertifikat</string>
-    <string name="forgot_password">Mistet passordet ditt?</string>
     <string name="help">Hjelp</string>
     <string name="username_or_password_incorrect">Brukernavnet og/eller passordet du skrev inn er feil</string>
     <string name="email_invalid">Skriv inn en gyldig E-postadresse</string>
@@ -2241,6 +2306,7 @@ Language: nb_NO
     <string name="reader_likes_you_and_one">Du og en annen har likt dette</string>
     <string name="pick_video">Velg video</string>
     <string name="pick_photo">Velg bilde</string>
+    <string name="sign_up_label">Registrer deg</string>
     <string name="reader_toast_err_url_intent">Klarte ikke å åpne %s</string>
     <string name="reader_toast_err_view_image">Klarte ikke å vise bilde</string>
     <string name="reader_toast_err_share_intent">Klarte ikke å dele</string>
diff --git a/WordPress/src/main/res/values-night/colors.xml b/WordPress/src/main/res/values-night/colors.xml
index 54b9cd2ca3a7..d4668064e9bb 100644
--- a/WordPress/src/main/res/values-night/colors.xml
+++ b/WordPress/src/main/res/values-night/colors.xml
@@ -19,29 +19,13 @@
 
     <!-- Switch to attribute after dropping support for api 21-23 -->
     <color name="placeholder">#1AFFFFFF</color>
-
-    <!-- Stats -->
-
-    <color name="stats_activity_very_low">@color/gray_80</color>
-    <color name="stats_activity_low">@color/blue_70</color>
-    <color name="stats_activity_medium">@color/blue_50</color>
-    <color name="stats_activity_high">@color/blue_30</color>
-    <color name="stats_activity_very_high">@color/blue_10</color>
-    <color name="stats_value_bar_color">@color/gray_60</color>
-    <color name="stats_bar_chart_bottom">@color/blue_30</color>
-    <color name="stats_bar_chart_top">@color/blue_60</color>
-    <color name="stats_bar_chart_accent_top">@color/pink_60</color>
-    <color name="stats_bar_chart_accent_bottom">@color/pink_30</color>
-    <color name="stats_bar_chart_gridline">@color/gray_80</color>
-    <color name="stats_map_activity_low">@color/pink_80</color>
-    <color name="stats_map_activity_high">@color/pink_30</color>
-    <color name="stats_map_activity_empty">@color/gray_80</color>
+    <color name="p2_author_bg_stroke">#1E1E1E</color>
 
     <!-- Login Prologue -->
     <color name="promo_indicator_color_default">@color/white_translucent_20</color>
     <color name="login_prologue_background_circle_purple">@color/green_60</color>
     <color name="login_prologue_background_circle_light_purple">@color/purple_60</color>
-    <color name="login_prologue_background_circle_blue">@color/wordpress_blue_60</color>
+    <color name="login_prologue_background_circle_blue">@color/blue_60</color>
     <color name="login_prologue_background_circle_light_blue">@color/blue_60</color>
     <color name="login_prologue_background_circle_green">@color/green_60</color>
     <color name="login_prologue_background_circle_yellow">@color/yellow_60</color>
@@ -78,4 +62,38 @@
     <!-- Collapsing Toolbar Custom Scrim Color -->
     <color name="collapsing_toolbar_custom_scrim_color">@color/black_translucent_50</color>
 
+    <!-- Scan Threat Context Line Custom Colors -->
+    <color name="context_line_highlighted_row_background">@color/red_80</color>
+
+    <!-- Quick Start Task Cards -->
+    <color name="quick_start_task_card_illustration_background">#2C2C2E</color>
+    <color name="quick_start_task_card_illustration_surface">@color/gray_0</color>
+    <color name="quick_start_task_card_illustration_details">@color/gray_50</color>
+    <color name="quick_start_task_card_illustration_line">@color/gray_50</color>
+    <color name="quick_start_task_card_illustration_area">@color/gray_40</color>
+    <color name="quick_start_task_card_illustration_mountain">@color/gray_60</color>
+
+    <color name="quick_start_task_card_illustration_check_site_stats_stroke">@color/gray_60</color>
+    <color name="quick_start_task_card_illustration_edit_site_icon_area">@color/white</color>
+    <color name="quick_start_task_card_illustration_edit_site_icon_mountain_fill">@color/gray_10</color>
+    <color name="quick_start_task_card_illustration_edit_site_icon_mountain_stroke">@color/gray_50</color>
+    <color name="quick_start_task_card_illustration_follow_other_sites_fill">@color/gray_0</color>
+    <color name="quick_start_task_card_illustration_set_site_title_header">@color/gray_10</color>
+    <color name="quick_start_task_card_illustration_set_site_title_body">@color/gray_0</color>
+    <color name="quick_start_task_card_illustration_set_site_title_box_stroke">@color/gray_50</color>
+    <color name="quick_start_task_card_illustration_visit_your_site_star">@color/purple_30</color>
+
+    <!-- Reader Topics You Might Like Chips -->
+    <color name="reader_topics_you_might_like_chip_green_stroke">@color/green_100</color>
+    <color name="reader_topics_you_might_like_chip_green_font">@color/green_40</color>
+    <color name="reader_topics_you_might_like_chip_green_fill">@color/green_90</color>
+    <color name="reader_topics_you_might_like_chip_purple_stroke">@color/purple_100</color>
+    <color name="reader_topics_you_might_like_chip_purple_font">@color/purple_40</color>
+    <color name="reader_topics_you_might_like_chip_purple_fill">@color/purple_90</color>
+    <color name="reader_topics_you_might_like_chip_yellow_stroke">@color/yellow_100</color>
+    <color name="reader_topics_you_might_like_chip_yellow_font">@color/yellow_40</color>
+    <color name="reader_topics_you_might_like_chip_yellow_fill">@color/yellow_90</color>
+    <color name="reader_topics_you_might_like_chip_orange_stroke">@color/orange_100</color>
+    <color name="reader_topics_you_might_like_chip_orange_font">@color/orange_40</color>
+    <color name="reader_topics_you_might_like_chip_orange_fill">@color/orange_90</color>
 </resources>
diff --git a/WordPress/src/main/res/values-night/colors_base.xml b/WordPress/src/main/res/values-night/colors_base.xml
new file mode 100644
index 000000000000..56f811e3956f
--- /dev/null
+++ b/WordPress/src/main/res/values-night/colors_base.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="colorPrimary">@color/primary_30</color>
+    <color name="colorPrimaryVariant">@color/primary_50</color>
+    <color name="colorSecondary">@color/primary_30</color>
+    <color name="colorSecondaryVariant">@color/primary_50</color>
+
+    <color name="nav_bar">@color/colorPrimary</color>
+</resources>
diff --git a/WordPress/src/main/res/values-night/colors_stats.xml b/WordPress/src/main/res/values-night/colors_stats.xml
new file mode 100644
index 000000000000..1dcefe383893
--- /dev/null
+++ b/WordPress/src/main/res/values-night/colors_stats.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="stats_activity_very_low">@color/gray_80</color>
+    <color name="stats_activity_low">@color/blue_70</color>
+    <color name="stats_activity_medium">@color/blue_50</color>
+    <color name="stats_activity_high">@color/blue_30</color>
+    <color name="stats_activity_very_high">@color/blue_10</color>
+    <color name="stats_value_bar_color">@color/gray_60</color>
+    <color name="stats_bar_chart_bottom">@color/blue_30</color>
+    <color name="stats_bar_chart_top">@color/blue_60</color>
+    <color name="stats_bar_chart_accent_top">@color/pink_60</color>
+    <color name="stats_bar_chart_accent_bottom">@color/pink_30</color>
+    <color name="stats_bar_chart_gridline">@color/gray_80</color>
+    <color name="stats_map_activity_low">@color/blue_80</color>
+    <color name="stats_map_activity_high">@color/blue_30</color>
+    <color name="stats_map_activity_empty">@color/gray_80</color>
+</resources>
diff --git a/WordPress/src/main/res/values-night/styles.xml b/WordPress/src/main/res/values-night/styles.xml
index 251ae3df4dc3..0413801df17a 100644
--- a/WordPress/src/main/res/values-night/styles.xml
+++ b/WordPress/src/main/res/values-night/styles.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="Base.Wordpress" parent="Theme.MaterialComponents.DayNight.Bridge">
-        <item name="colorPrimary">@color/blue_30</item>
-        <item name="colorPrimaryVariant">@color/blue_50</item>
-        <item name="colorSecondary">@color/pink_30</item>
-        <item name="colorSecondaryVariant">@color/pink_50</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorSecondaryVariant">@color/colorSecondaryVariant</item>
         <item name="android:colorBackground">@color/background_dark</item>
         <item name="colorSurface">@color/background_dark</item>
         <item name="colorError">@color/red_30</item>
@@ -22,6 +22,7 @@
         <item name="wpColorSuccess">@color/green_30</item>
         <item name="wpColorWarningDark">@color/warning_50</item>
         <item name="wpColorWarningLight">@color/yellow_20</item>
+        <item name="wpColorNavBar">@color/nav_bar</item>
         <item name="wpColorAppBar">?attr/colorSurface</item>
         <item name="wpColorOnSurfaceMedium">@color/material_on_surface_emphasis_medium</item>
         <item name="wpColorActionModeIcon">?attr/colorOnSurface</item>
@@ -53,7 +54,9 @@
 
         <item name="toolbarStyle">@style/WordPress.ToolBar</item>
         <item name="appBarLayoutStyle">@style/WordPress.AppBarLayout</item>
-        <item name="snackbarStyle">@style/Widget.MaterialComponents.Snackbar</item>
+        <item name="snackbarStyle">@style/WordPress.Snackbar</item>
+        <item name="snackbarButtonStyle">@style/WordPress.SnackbarButton</item>
+        <item name="snackbarTextViewStyle">@style/WordPress.SnackbarText</item>
 
         <!-- we can remove it after moving away from Bridge version of theme -->
         <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
@@ -78,7 +81,12 @@
         <item name="categoriesButtonBackground">@color/mlp_categories_button_background_dark</item>
         <item name="categoriesButtonBackgroundSelected">@color/mlp_categories_button_background_selected_dark</item>
         <item name="mlpDividerColor">@color/mlp_divider_dark</item>
-        <item name="categoriesBackground">@color/mlp_categories_background_dark</item>
+        <item name="layoutPickerBackground">@color/mlp_categories_background_dark</item>
+
+        <!-- Material Date Range Picker -->
+        <item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
+        <item name="materialCalendarFullscreenTheme">@style/WordPress.MaterialCalendarFullscreenTheme</item>
+        <item name="materialCalendarTheme">@style/WordPress.MaterialCalendarTheme</item>
     </style>
 
     <style name="WordPress.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
@@ -91,12 +99,6 @@
         <item name="android:navigationBarColor">?attr/colorSurface</item>
     </style>
 
-    <style name="WordPress.TabLayout" parent="Widget.MaterialComponents.TabLayout">
-        <item name="android:elevation">0dp</item>
-        <item name="android:background">@drawable/tab_layout_background</item>
-        <item name="android:duplicateParentState">true</item>
-    </style>
-
     <style name="WordPress.FloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
         <item name="android:backgroundTint">?attr/colorSecondaryVariant</item>
         <item name="tint">?attr/colorOnSurface</item>
@@ -119,18 +121,19 @@
         <item name="android:background">?android:attr/listDivider</item>
     </style>
 
-    <style name="WordPress.ZenDesk" parent="ZendeskSdkTheme.Dark" />
-
-    <!-- Overload of Zendesk FAB style -->
-    <style name="zs_contact_us_fab">
-        <item name="android:gravity">bottom|end</item>
-        <item name="android:layout_margin">@dimen/zs_fab_margin</item>
-        <item name="android:contentDescription">
-            @string/zs_general_contact_us_button_label_accessibility
+    <style name="WordPress.ZenDesk" parent="WordPress.NoActionBar">
+        <item name="toolbarStyle">@style/WordPress.ZenDesk.Toolbar</item>
+        <item name="android:statusBarColor">@color/primary_dark</item>
+        <item name="titleTextColor">?attr/colorOnSurface</item>
+        <item name="toolbarNavigationButtonStyle">
+            @style/Widget.AppCompat.Toolbar.Button.Navigation
         </item>
-        <item name="android:visibility">gone</item>
-        <item name="android:src">@drawable/zs_create_ticket_fab</item>
-        <item name="android:backgroundTint">@color/pink_50</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
+        <item name="android:navigationBarColor">@android:color/black</item>
+    </style>
+
+    <style name="WordPress.SnackbarButton" parent="Widget.MaterialComponents.Button.TextButton.Snackbar">
+        <item name="android:textColor">?attr/colorSecondaryVariant</item>
     </style>
 
 </resources>
diff --git a/WordPress/src/main/res/values-night/styles_toolbar.xml b/WordPress/src/main/res/values-night/styles_toolbar.xml
new file mode 100644
index 000000000000..aa7d8e38bc5f
--- /dev/null
+++ b/WordPress/src/main/res/values-night/styles_toolbar.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Zendesk -->
+    <style name="WordPress.ZenDesk.Toolbar" parent="Widget.MaterialComponents.Toolbar.Surface">
+        <item name="titleTextAppearance">@style/TextAppearance.App.Toolbar.Title</item>
+        <item name="titleTextColor">?attr/colorOnSurface</item>
+        <item name="colorControlNormal">?attr/colorOnSurface</item>
+    </style>
+
+</resources>
diff --git a/WordPress/src/main/res/values-nl/strings.xml b/WordPress/src/main/res/values-nl/strings.xml
index c4b9685a52a2..e57a47a1040b 100644
--- a/WordPress/src/main/res/values-nl/strings.xml
+++ b/WordPress/src/main/res/values-nl/strings.xml
@@ -1,315 +1,747 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-19 19:17:59+0000
+Translation-Revision-Date: 2021-05-19 12:46:09+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: nl
 -->
 <resources>
-    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' wordt niet volledig ondersteund</string>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Dubbeltik om een link toe te voegen.</string>
+    <string name="gutenberg_native_add_link">VOEG EEN LINK TOE</string>
+    <string name="login_empty_view_try_another_account">Probeer het met een ander account</string>
+    <string name="login_empty_view_see_instructions">Bekijk de instructies</string>
+    <string name="login_no_jetpack_sites_error_message">Als je al een site hebt, zul je de gratis Jetpack plugin moeten installeren en deze verbinden met je WordPress.com account.</string>
+    <string name="login_empty_view_avatar_content_description">Je profielfoto</string>
+    <string name="login_not_a_jetpack_site">Om deze app voor %1$s te gebruiken, moet de Jetpack plugin zijn geïnstalleerd en verbonden met je WordPress.com account.</string>
+    <string name="gutenberg_native_size">Grootte</string>
+    <string name="gutenberg_native_move_image_forward">Verplaats afbeelding naar voren</string>
+    <string name="gutenberg_native_move_image_backward">Verplaats afbeelding naar achteren</string>
+    <string name="gutenberg_native_image_settings">Afbeeldingsinstellingen</string>
+    <string name="gutenberg_native_audio_settings">Audio-instellingen</string>
+    <string name="user_profile_untitled_site">(Zonder titel)</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">Gebruikersprofiel onderste blad informatie</string>
+    <string name="likes_list_screen_title">Likes lijst %s</string>
+    <string name="gutenberg_native_write_code">Schrijf code…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sortering en filtering</string>
+    <string name="gutenberg_native_show_download_button">Toon downloadknop</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Lees meer</string>
+    <string name="gutenberg_native_preload">Vooraf laden</string>
+    <string name="gutenberg_native_post_meta_settings">Bericht meta-instellingen</string>
+    <string name="gutenberg_native_post_content_settings">Berichtinhoud instellingen</string>
+    <string name="gutenberg_native_metadata">Metagegevens</string>
+    <string name="gutenberg_native_media_file">Mediabestand</string>
+    <string name="gutenberg_native_media_area">Mediagebied</string>
+    <string name="gutenberg_native_loop">Loop</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Link naar</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">afbeelding %1$d van %2$d in galerij</string>
+    <string name="gutenberg_native_heading_d">Heading %d</string>
+    <string name="gutenberg_native_featured">Uitgelicht</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Voer de URL in om hier in te sluiten…</string>
+    <string name="gutenberg_native_edit_image">Bewerk afbeelding</string>
+    <string name="gutenberg_native_display_post_date">Toon bericht datum</string>
+    <string name="gutenberg_native_code">Code</string>
+    <string name="gutenberg_native_change_heading_level">Wijzig heading niveau</string>
+    <string name="gutenberg_native_browser_default">Browser standaard</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Blok is verwijderd of is niet beschikbaar.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Het blok kan niet binnen zichzelf weergegeven worden.</string>
+    <string name="gutenberg_native_autoplay">Automatisch afspelen</string>
+    <string name="gutenberg_native_auto">Auto</string>
+    <string name="gutenberg_native_attachment_page">Bijlagepagina</string>
+    <string name="gutenberg_native_add_text">Tekst toevoegen…</string>
+    <string name="gutenberg_native_add_caption">Bijschrift toevoegen</string>
+    <string name="login_no_jetpack_sites">Geen Jetpack sites gevonden</string>
+    <string name="gutenberg_native_what_is_alt_text">Wat is alt tekst?</string>
+    <string name="gutenberg_native_transform_s_to">Transformeer %s naar</string>
+    <string name="gutenberg_native_transform_block">Transformeer blok…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Media invoegen is mislukt.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Audiobestand invoegen is mislukt.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Beschrijf het doel van de afbeelding. Laat leeg als de afbeelding puur decoratief is.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s getransformeerd naar %2$s</string>
+    <string name="like_faces_error_loading_message">Fout bij het laden van like gegevens. %s.</string>
+    <string name="like_faces_plural_text">%d bloggers vinden dit leuk.</string>
+    <string name="like_faces_singular_text">1 blogger vindt dit leuk.</string>
+    <string name="like_title_plural">%d likes</string>
+    <string name="like_title_singular">1 Like</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Voer je server referenties in om bedreigingen op te lossen.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Voer je server referenties in om de dreiging op te lossen.</string>
+    <string name="suggestion">Suggestie:</string>
+    <string name="gutenberg_native_search_blocks">Blokken zoeken</string>
+    <string name="gutenberg_native_search_block">Zoekblok</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">dubbel tikken om de eenheid te wijzigen</string>
+    <string name="gutenberg_native_clear_search">Zoekopdracht wissen</string>
+    <string name="gutenberg_native_cancel_search">Zoekopdracht annuleren</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s is %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Er is een fout opgetreden tijdens het ophalen van likes gegevens</string>
+    <string name="get_likes_unknown_error">Een onbekende fout vond plaats tijdens het ophalen van likes.</string>
+    <string name="get_likes_no_network_error">Geen netwerk beschikbaar.</string>
+    <string name="comments_empty_list_filtered_unreplied">Geen onbeantwoorde reacties</string>
+    <string name="comment_status_unreplied">Onbeantwoord</string>
+    <string name="gutenberg_native_table_of_contents">Inhoudsopgave</string>
+    <string name="gutenberg_native_summary">samenvatting</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Vat je bericht samen met een lijst met koppen. Voeg HTML-ankers toe aan heading blokken om ze hier te linken.</string>
+    <string name="gutenberg_native_document_outline">documentoverzicht</string>
+    <string name="gutenberg_native_buttongroup">Knoppen groep</string>
+    <string name="jetpack_brute_force_allowlist_title">Altijd toegestane IP-adressen</string>
+    <string name="site_settings_denylist_title">Niet toegelaten reacties</string>
+    <string name="reader_title_interests">Volg onderwerpen</string>
+    <string name="stories_intro_main_subtitle">Een nieuwe manier om boeiende inhoud op je site te maken en te publiceren.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Negeren</string>
+    <string name="activity_log_backup_download_notice_download_action">Download</string>
+    <string name="threat_fix_all_status_success_message_plural">Bedreigingen zijn met succes opgelost.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Bevestig dat je alle %s actieve bedreigingen wil oplossen.</string>
+    <string name="scan_idle_threats_description_plural">De scan vond %1$s potentiële bedreigingen met %2$s. Bekijk ze hieronder en onderneem actie of tik op de knop Alles herstellen. We zijn %3$s als je ons nodig hebt.</string>
+    <string name="scan_fixing_threats_description_plural">We zijn hard aan het werk om deze bedreigingen op de achtergrond te verhelpen. In de tussentijd kan je je site gewoon blijven gebruiken, je kan op elk moment de voortgang bekijken.</string>
+    <string name="gutenberg_native_edit_focal_point">Focuspunt bewerken</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Dubbeltikken om Onderste blad te openen om de afbeelding te bewerken, vervangen of wissen</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Dubbeltikken om het actieblad te openen om de afbeelding te bewerken, vervangen of wissen</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Typ een naam voor je site</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Alle taken zijn afgerond&lt;/b&gt;&lt;br/&gt; Je bereikt meer mensen. Goed werk!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Alle taken zijn afgerond&lt;/b&gt;&lt;br/&gt; Je hebt je site aangepast. Goed gedaan!</string>
+    <string name="quick_start_card_menu_hide">Verberg voor nu</string>
+    <string name="magic_link_not_meaning_to_create_account">Wilde je geen nieuw account aanmaken? Ga terug om je e-mailadres opnieuw in te voeren.</string>
+    <string name="invite_links_disable_dialog_message">Zodra deze uitnodigingslink is uitgeschakeld, kan niemand deze gebruiken om lid te worden van uw team. Weet je het zeker?</string>
+    <string name="invite_links_disable_dialog_title">Schakel uitnodigingslink uit</string>
+    <string name="invite_links_bad_format_response">Ongeldige reactie ontvangen</string>
+    <string name="invite_links_null_response">Geen reactie ontvangen</string>
+    <string name="invite_links_cannot_get_role_data_error">Er is een fout opgetreden bij het ophalen van gegevens voor rol %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Er is een fout opgetreden bij het ophalen van rollen</string>
+    <string name="invite_links_generic_get_data_error">Onbekende fout bij het ophalen van gegevens van uitnodigingslinks</string>
+    <string name="invite_links_helper_text">Gebruik deze link om je teamleden aan boord te krijgen zonder ze een voor een uit te nodigen. Iedereen die deze URL bezoekt, kan zich aanmelden bij je organisatie, zelfs als ze de link van iemand anders hebben ontvangen, dus zorg ervoor dat je deze deelt met vertrouwde mensen.</string>
+    <string name="invite_links_expire_date">Vervalt op %1$s</string>
+    <string name="invite_links_disable_invite_link">Schakel uitnodigingslink uit</string>
+    <string name="invite_links_share_invite_link">Deel de uitnodigingslink</string>
+    <string name="invite_links_generate">Genereer een nieuwe link</string>
+    <string name="invite_links_get_status_retry">Vernieuw de status van links</string>
+    <string name="invite_links_section_title">Uitnodigingslink</string>
+    <string name="threats_found_singular">Bedreiging gevonden</string>
+    <string name="threats_found_plural">Bedreigingen gevonden</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scan afgerond&lt;/b&gt;&lt;br&gt; %s potentiële bedreigingen gevonden</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scan afgerond&lt;/b&gt;&lt;br&gt; 1 potentiële dreiging gevonden</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scan afgerond&lt;/b&gt;&lt;br&gt;Geen bedreigingen gevonden</string>
+    <string name="scan_fixing_threats_title_singular">Bedreiging oplossen</string>
+    <string name="disable">Uitschakelen</string>
+    <string name="quick_start_card_menu_unpin">Losmaken</string>
+    <string name="quick_start_list_review_pages_subtitle">Controleer je pagina\'s en maak wijzigingen, of voeg pagina\'s toe of verwijder ze.</string>
+    <string name="quick_start_list_view_site_title">Bezoek je site</string>
+    <string name="quick_start_list_upload_icon_subtitle">Voeg een site pictogram toe voor een gepolijst pro uiterlijk.</string>
+    <string name="quick_start_list_follow_site_subtitle">Ontdek en volg sites die je inspireren.</string>
+    <string name="quick_start_list_enable_sharing_title">Schakel delen in</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Deel automatisch nieuwe berichten op je social media.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Geef je site een naam die de persoonlijkheid en het onderwerp weerspiegelt.</string>
+    <string name="quick_start_list_check_stats_title">Bekijk je statistieken</string>
+    <string name="backup_download_status_failure_bullet2">We zullen nog steeds proberen om je downloadbare back-upbestand te maken.</string>
+    <string name="backup_download_status_failure_bullet1">We konden de status niet vinden om aan te geven hoe lang je downloadbare back-up zal duren.</string>
+    <string name="backup_download_status_failure_heading">We konden je downloadbare back-up status niet vinden.</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Vinkje</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Klok pictogram</string>
+    <string name="restore_status_failure_bullet3">We laten het je weten als het klaar is.</string>
+    <string name="restore_status_failure_bullet2">We proberen nog steeds om je site terug te zetten.</string>
+    <string name="restore_status_failure_bullet1">We konden de status niet vinden om te zeggen hoe lang het terugzetten zal duren.</string>
+    <string name="restore_status_failure_heading">We konden je terugzet status niet vinden</string>
+    <string name="restore_complete_failed_description">We konden je site niet terugzetten</string>
+    <string name="restore_warning_action_button">Bevestig</string>
+    <string name="restore_warning_description_with_two_parameters">Weet je zeker dat je je site wil terugzetten naar %1$s op %2$s?\n        Alles wat je sindsdien hebt veranderd, gaat verloren.</string>
+    <string name="backup_download_complete_failed_description">We konden je back-up niet maken</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exclusief thema\'s, plugins en uploads)</string>
+    <string name="backup_item_contents">WP-content folder</string>
+    <string name="backup_item_roots">WordPress root</string>
+    <string name="backup_download_details_choose_items_header">Items opgenomen in deze download</string>
+    <string name="gutenberg_native_uploading">Uploaden…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Herbruikbare blokken zijn niet bewerkbaar in WordPress voor IOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Herbruikbare blokken zijn niet bewerkbaar in WordPress voor Android</string>
+    <string name="gutenberg_native_replace_file">Vervangen bestand</string>
+    <string name="gutenberg_native_replace_audio">Vervang audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Probleem met openen audio</string>
+    <string name="gutenberg_native_open">OPEN</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Geen enkele applicatie kan deze aanvraag behandelen.</string>
+    <string name="gutenberg_native_lock_icon">Slot-pictogram</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Invoegen van audiobestand mislukt. Tik voor opties.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Twee keer tikken om een audiobestand te selecteren</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Twee keer tikken om te luisteren naar het audiobestand</string>
+    <string name="gutenberg_native_choose_audio">Kies audio</string>
+    <string name="gutenberg_native_audio_player">Audiospeler</string>
+    <string name="gutenberg_native_audio_file"> audiobestand</string>
+    <string name="gutenberg_native_audio_caption_s">Audio bijschrift. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Audio bijschrift. Leeg</string>
+    <string name="gutenberg_native_add_audio">AUDIO TOEVOEGEN</string>
+    <string name="continue_with_wpcom">Log in of meld je aan bij WordPress.com</string>
+    <string name="photo_picker_use_audio">Gebruik deze audio</string>
+    <string name="photo_picker_choose_audio">Kies video van apparaat</string>
+    <string name="people_optional_custom_message_helper_text">Optioneel: geef een aangepast bericht in dat met je uitnodiging wordt verzonden.</string>
+    <string name="people_learn_more_about_roles">Leer meer over rollen</string>
+    <string name="threat_status_fixed">Opgelost</string>
+    <string name="threat_found_header">Gevonden</string>
+    <string name="scan_here_to_help">hier om te helpen</string>
+    <string name="scan_idle_threats_description_singular">De scan vond één potentiële bedreiging met %1$s. Bekijk de bedreiging hieronder en onderneem actie of tik op de knop Alles herstellen. We zijn %2$s als je ons nodig hebt.</string>
+    <string name="scan_idle_manual_scan_description">Om je site opnieuw te bekijken, voer je een handmatige scan uit, of wacht tot Jetpack je site later vandaag scant.</string>
+    <string name="scan_provisioning_description">Welkom bij Jetpack Scan! We verkennen je site en maken een volledige scan. We laten het je weten als we problemen ontdekken die van invloed kunnen zijn op een scan, waarna je eerste volledige scan start.</string>
+    <string name="scan_scanning_is_initial_description">Welkom bij Jetpack Scan, we nemen nu een voor het eerst een kijkje op je site, de resultaten zijn er zo.</string>
+    <string name="scan_fixing_threats_description_singular">We zijn hard aan het werk om deze bedreiging op de achtergrond te verhelpen. In de tussentijd kan je je site gewoon blijven gebruiken, je kan op elk moment de voortgang bekijken.</string>
+    <string name="scan_scanning_description">We sturen je een bericht zodra de scan is afgerond. In de tussentijd kan je je site gewoon blijven gebruiken, je kan op elk moment de voortgang bekijken.</string>
+    <string name="scan_fixing_threats_title_plural">Bezig met bedreigingen oplossen</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan kon geen scan van je site afronden. Controleer of je site bereikbaar is - probeer het opnieuw als dat niet het geval is. Als dit het geval is, of als Jetpack Scan nog steeds problemen heeft, neem dan contact op met ons ondersteuningsteam.</string>
+    <string name="scan_request_failed_title">Er is iets fout gegaan</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Er wordt een back-up gemaakt van de site</string>
+    <string name="activity_log_currently_backing_up_message">Een back-up maken van de site van %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Er wordt een downloadbare back-up gemaakt</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Er is met succes een back-up van je site gemaakt</string>
+    <string name="activity_log_backup_finished_snackbar_message">Er is met succes een back-up van je site gemaakt\nBack-up gemaakt van %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Er wordt een back-up van je site gemaakt\nBack-up maken van %1$s %2$s</string>
+    <string name="pick_audio">Selecteer audio</string>
+    <string name="restore_another_process_running">Er loopt nog een andere terugzet actie.</string>
+    <string name="restore_complete_failed_icon_content_description">Fout pictogram</string>
+    <string name="restore_complete_failed_action_button_content_description">Klaar knop</string>
+    <string name="restore_complete_failed_title">Terugzetten mislukt</string>
+    <string name="restore_complete_visit_site_button_content_description">Bezoek site knop</string>
+    <string name="restore_complete_done_button_content_description">Klaar knop</string>
+    <string name="restore_complete_icon_content_description">Terugzet pictogram</string>
+    <string name="restore_complete_visit_site_action_button">Bezoek site</string>
+    <string name="restore_complete_description_with_two_parameters">Alle geselecteerde items zijn nu teruggezet naar %1$s %2$s.</string>
+    <string name="restore_complete_header">Je site is teruggezet</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Je hoeft niet te wachten. We laten het je weten als je site teruggezet is.</string>
+    <string name="restore_progress_icon_content_description">Terugzetten site pictogram</string>
+    <string name="restore_progress_description_with_two_parameters">We zijn je site terug aan het zetten naar %1$s %2$s.</string>
+    <string name="restore_progress_header">Momenteel wordt je site teruggezet</string>
+    <string name="restore_warning_action_button_content_description">Bevestig terugzetten site knop</string>
+    <string name="restore_warning_icon_content_description">Rode cirkel afbeelding met uitroepteken</string>
+    <string name="restore_warning_header">Waarschuwing</string>
+    <string name="restore_details_action_button_content_description">Knop terugzetten site</string>
+    <string name="restore_details_icon_content_description">Terugzet pictogram</string>
+    <string name="restore_details_action_button">Site terugzetten</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s is het geselecteerde punt voor het terugzetten.</string>
+    <string name="restore_details_header">Site terugzetten</string>
+    <string name="restore_details_choose_items_header">Kies de items om terug te zetten:</string>
+    <string name="restore">Terugzetten</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud met X pictogram</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Klaar knop</string>
+    <string name="backup_download_complete_failed_action_button">Klaar</string>
+    <string name="backup_download_complete_failed_title">Download mislukt.</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Mobiel</string>
+    <string name="quick_start_card_menu_remove">Niet meer tonen</string>
+    <string name="quick_start_card_menu_pin">Pin dit</string>
+    <string name="quick_start_dialog_review_pages_message_short">Selecteer %1$s Pagina\'s %2$s om je paginalijst te zien.</string>
+    <string name="quick_start_dialog_review_pages_message">Verander, voeg toe, of verwijder pagina\'s van je site.</string>
+    <string name="quick_start_dialog_review_pages_title">Beoordeel site pagina\'s</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Selecteer %1$s Homepage %2$s om je homepage te bewerken.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Selecteer %1$s Pagina\'s %2$s om je paginalijst te zien.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Verander, voeg toe, of verwijder inhoud van de homepage van je site.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Bewerk je homepage</string>
+    <string name="reader_menu_mark_as_unseen">Markeer als ongezien</string>
+    <string name="reader_menu_mark_as_seen">Markeer als gezien</string>
+    <string name="error_media_upload_failed_for_reason">Media upload mislukt.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Niet genoeg beschikbare site opslag</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Kan status gezien voor dit bericht niet wisselen</string>
+    <string name="reader_marked_post_as_unseen">Bericht gemarkeerd als ongezien</string>
+    <string name="reader_marked_post_as_seen">Bericht gemarkeerd als gezien</string>
+    <string name="threat_fix_all_status_error_message">Fout bij verkrijgen van de oplossingstatus. Neem contact op met ondersteuning.</string>
+    <string name="threat_fix_all_status_success_message_singular">Bedreiging is met succes opgelost.</string>
+    <string name="threat_fix_all_error_message">Fout bij oplossen van bedreigingen. Neem contact op met ondersteuning.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Bevestig dat je één actieve bedreiging wil oplossen.</string>
+    <string name="threat_fix_all_warning_title">Alle bedreigingen oplossen</string>
+    <string name="threat_ignore_error_message">Fout bij negeren van de bedreiging, Neem contact op met ondersteuning.</string>
+    <string name="threat_ignore_success_message">Bedreiging genegeerd.</string>
+    <string name="threat_ignore_warning">Je moet een bedreigings probleem niet negeren, tenzij je zeker weet dat deze niet gevaarlijk is. Als je ervoor kiest om deze bedreiging te negeren, blijft deze aanwezig op je site: &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Fout bij oplossen van de bedreiging. Neem contact op met ondersteuning.</string>
+    <string name="threat_item_sub_header_status_ignored">Bedreiging genegeerd</string>
+    <string name="threat_item_sub_header_status_fixed_on">Bedreiging opgelost op %s</string>
+    <string name="threat_fixing">Bezig met bedreiging oplossen</string>
+    <string name="scan_history_ignored_threats_tab">Genegeerd</string>
+    <string name="scan_history_no_threats_found">Geen items gevonden</string>
+    <string name="scan_history_fixed_threats_tab">Opgelost</string>
+    <string name="scan_history_all_threats_tab">Alle</string>
+    <string name="scan_scanning_title">Bestanden scannen</string>
+    <string name="scan_preparing_to_scan_title">Voorbereiden om te scannen</string>
+    <string name="scan_history_menu_title">Geschiedenis</string>
+    <string name="scan_history">Scangeschiedenis</string>
+    <string name="backup_active_filter_empty_subtitle">Probeer het met aanpassen van je datumbereik</string>
+    <string name="backup_active_filter_empty_title">Geen overeenkomende back-ups gevonden</string>
+    <string name="backup_empty_subtitle">Je eerste back-up verschijnt hier binnen 24 uur en je ontvangt een bericht zodra de back-up is afgerond.</string>
+    <string name="backup_empty_title">Je eerste back-up is binnenkort klaar</string>
+    <string name="request_failed_message">Er is een probleem opgetreden bij het verwerken van de aanvraag. Probeer het later opnieuw.</string>
+    <string name="gutenberg_native_move_to_bottom">Verplaats naar beneden</string>
+    <string name="gutenberg_native_change_block_position">Wijzig blokpositie</string>
+    <string name="label_control_upload">Upload</string>
+    <string name="jetpack_icon_content_description">pictogram</string>
+    <string name="backup_download_complete_info">We hebben je ook een link naar je bestand gemaild.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Deel link knop</string>
+    <string name="backup_download_complete_download_action_button_content_description">Downloadknop</string>
+    <string name="backup_download_complete_icon_content_description">Downloadbaar back-up gereed pictogram</string>
+    <string name="backup_download_complete_download_share_action_button">Deel link</string>
+    <string name="backup_download_complete_download_action_button">Download</string>
+    <string name="backup_download_complete_description_with_two_parameters">We hebben met succes een back-up gemaakt van je site van%1$s %2$s.</string>
+    <string name="backup_download_complete_header">Je back-up is nu beschikbaar om te downloaden</string>
+    <string name="backup_download_complete_page_title">Je back-up</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Je hoeft niet te wachten. We laten het je weten als je back-up klaar is.</string>
+    <string name="backup_download_progress_icon_content_description">Aanmaken van een downloadbaar back-up pictogram</string>
+    <string name="backup_download_progress_description_with_two_parameters">We zijn een downloadbare back-up van je site aan het maken van %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Bezig met het maken van een te downloaden back-up van je site</string>
+    <string name="backup_download_progress_page_title">Back-up downloaden</string>
+    <string name="backup_download_another_download_running">Er loopt een andere download.</string>
+    <string name="backup_download_generic_failure">Er is een probleem opgetreden bij het verwerken van de aanvraag. Probeer het later opnieuw.</string>
+    <string name="backup_download_details_action_button_content_description">Maak een downloadbare back-up knop</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s is het geselecteerde punt om een te downloaden back-up te maken.</string>
+    <string name="gutenberg_native_image_link_url">Afbeelding link URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">kruisbericht</string>
+    <string name="suggestion_user">gebruiker</string>
+    <string name="suggestion_no_matching">Geen overeenkomende %s.</string>
+    <string name="suggestion_problem">Er was een probleem met het laden van suggesties.</string>
+    <string name="suggestion_none">Geen %s suggesties beschikbaar.</string>
+    <string name="suggestion_selection_needed">Typ om de lijst met suggesties te filteren.</string>
+    <string name="threat_get_free_estimate">Ontvang gratis een voorstel</string>
+    <string name="threat_ignore">Bedreiging negeren</string>
+    <string name="threat_fix">Los bedreiging op</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan zal de bedreiging oplossen.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan bewerkt het betreffende bestand of folder.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan zal updaten naar een nieuwere versie (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan verwijdert het betreffende bestand of de folder.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan vervangt het betreffende bestand of de folder.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan kan deze bedreiging niet automatisch herstellen\n        We raden aan om de bedreiging handmatig op te lossen: zorg ervoor dat WordPress, je thema en alle je plugins up-to-date zijn, en verwijder de aanstootgevende code, het thema of de plugin van je site.\n \n\n        Als je meer hulp nodig hebt om deze bedreiging op te lossen, raden we&lt;b&gt;Codeable&lt;/b&gt;, een vertrouwde freelancer marktplaats van zeer goed gescreende WordPress experts aan.\n        Ze hebben een selecte groep beveiligingsexperts aangewezen om bij deze projecten te helpen. De prijzen variëren van $70&amp;mdash;120/uur, en je kan een gratis schatting krijgen zonder verplichting om in te huren.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Bedreiging aan het oplossen</string>
+    <string name="threat_fix_fixed_header">Hoe heeft Jetpack het opgelost?</string>
+    <string name="threat_fix_default_header">Hoe lossen we het op?</string>
+    <string name="threat_file_description">Bedreiging gevonden in bestand:</string>
+    <string name="threat_technical_details_header">De technische details</string>
+    <string name="threat_problem_header">Wat was het probleem?</string>
+    <string name="threat_details">Details bedreiging</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Kwetsbaarheid gevonden in een thema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Kwetsbaarheid gevonden in een plugin</string>
+    <string name="threat_item_sub_header_file_signature">Bedreiging gevonden %s</string>
+    <string name="threat_item_sub_header_core_file">Kwetsbaarheid gevonden in WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Verschillende kwetsbaarheden</string>
+    <string name="threat_item_header_vulnerable_theme">Kwetsbaar thema: %s (versie %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Kwetsbare plugin: %s (versie %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: kwaadaardig codepatroon</string>
+    <string name="threat_item_header_database_threat">Database %s bedreigingen</string>
+    <string name="threat_item_header_infected_core_file">%s: geinfecteerd core bestand</string>
+    <string name="threat_item_header_threat_found">Bedreiging gevonden</string>
+    <string name="threats_fix_all">Alles oplossen</string>
+    <string name="scan_in_few_seconds">een paar seconden geleden</string>
+    <string name="scan_in_minutes_ago">%s minuut(en) geleden</string>
+    <string name="scan_in_hours_ago">%s uur(en) geleden</string>
+    <string name="scan_this_site">deze site</string>
+    <string name="scan_idle_last_scan_description">De laatste Jetpack scan liep op %s en we vonden geen risico\'s. %s</string>
+    <string name="scan_idle_threats_found_title">Je site loopt mogelijk een risico</string>
+    <string name="scan_idle_no_threats_found_title">Maak je nergens zorgen over</string>
+    <string name="scan_again">Scan opnieuw</string>
+    <string name="scan_now">Nu scannen</string>
+    <string name="scan_state_icon">Scanstatus pictogram</string>
+    <string name="backup">Back-up</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Activiteittype filter (%s types geselecteerd)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (weergeven %s items)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Activiteittype filter</string>
+    <string name="activity_log_activity_type_empty_subtitle">Geen activiteiten waargenomen in het geselecteerde datumbereik.</string>
+    <string name="activity_log_activity_type_empty_title">Geen activiteiten beschikbaar</string>
+    <string name="activity_log_activity_type_error_subtitle">Controleer je internet verbinding en probeer het opnieuw.</string>
+    <string name="activity_log_activity_type_error_title">Geen verbinding</string>
+    <string name="activity_log_activity_type_filter_active_label">Activiteittype (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Datumbereik filter</string>
+    <string name="activity_log_active_filter_empty_subtitle">Pas je filters voor datumbereik of activiteitstype aan</string>
+    <string name="activity_log_active_filter_empty_title">Geen overeenkomende gebeurtenissen gevonden</string>
+    <string name="backup_item_sqls">Site database</string>
+    <string name="backup_item_roots_hint">(bevat wp-config.php en andere niet WordPress bestanden)</string>
+    <string name="backup_item_media_uploads">Media uploads</string>
+    <string name="backup_item_plugins">WordPress plugins</string>
+    <string name="backup_item_themes">WordPress thema\'s</string>
+    <string name="backup_download_details_icon_content_description">Maak een downloadbaar back-up pictogram</string>
+    <string name="backup_download_details_action_button">Te downloaden bestand maken</string>
+    <string name="backup_download_details_header">Te downloaden back-up maken</string>
+    <string name="backup_download_details_page_title">Back-up downloaden</string>
+    <string name="backup_download">Back-up download</string>
+    <string name="gutenberg_native_error">Fout</string>
+    <string name="gutenberg_native_choose_file">Kies bestand</string>
+    <string name="activity_log_item_menu_download_backup_label">Back-up downloaden</string>
+    <string name="activity_log_item_menu_restore_label">Herstellen naar dit punt</string>
+    <string name="activity_log_activity_type_filter_label">Activiteitstype</string>
+    <string name="activity_log_date_range_filter_label">Datumbereik</string>
+    <string name="activity_log_activity_type_filter_header">Filter op activiteitstype</string>
+    <string name="dialog_confirm_copy_local_copy_button">Kopieer de versie van deze app</string>
+    <string name="dialog_confirm_copy_local_edit_button">Bewerk het bericht eerst</string>
+    <string name="dialog_confirm_copy_local_message">Het bericht dat je probeert te kopiëren heeft twee versies die tegenstrijdig zijn of je hebt recentelijk wijzigingen aangebracht maar niet opgeslagen.\nBewerk het bericht eerst om een eventueel conflict op te lossen of ga verder met het kopiëren van de versie van deze app.</string>
+    <string name="dialog_confirm_copy_local_title">Synchronisatie conflict bericht</string>
+    <string name="button_copy">Dupliceer</string>
+    <string name="toast_edit_story_update_in_progress_title">Het verhaal wordt opgeslagen, moment geduld…</string>
+    <string name="gutenberg_native_file_name">Bestandsnaam</string>
+    <string name="gutenberg_native_file_block_settings">Bestand blok-instellingen</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Uploaden van bestanden mislukt.\nTik voor opties.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Opslaan van bestanden mislukt.\nTik voor opties.</string>
+    <string name="gutenberg_native_edit_file">Bewerk bestand</string>
+    <string name="gutenberg_native_copy_file_url">Kopieer bestands URL</string>
+    <string name="gutenberg_native_choose_a_file">KIES EEN BESTAND</string>
+    <string name="new_site_creation_domain_header_title">Kies een domein</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack Instellingen</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Conversatie wordt gevolgd per e-mail</string>
+    <string name="reader_btn_follow_comments">Volg conversatie per e-mail</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Kon niet uitschrijven van reacties voor dit bericht</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Kon niet abonneren op reacties voor dit bericht</string>
+    <string name="reader_follow_comments_get_status_error">Fout bij het ophalen van de abonneringstatus voor bericht</string>
+    <string name="reader_follow_comments_unsubscribe_success">Met succes uitgeschreven van de reacties</string>
+    <string name="reader_follow_comments_subscribe_success">Met succes geabonneerd op de reacties</string>
+    <string name="reader_follow_comments_bad_format_response">Ongeldig antwoord ontvangen</string>
+    <string name="reader_follow_comments_null_response">Geen antwoord ontvangen</string>
+    <string name="activity_log_activity_type_filter_clear">Wissen</string>
+    <string name="activity_log_activity_type_filter_apply">Toepassen</string>
+    <string name="dialog_edit_story_unsupported_format_message">Een of meer slides zijn niet toegevoegd aan je verhaal omdat verhalen geen GIF bestanden ondersteunen op dit moment. Kies in plaats daarvan een statische afbeelding of video achtergrond.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF bestanden worden niet ondersteund</string>
+    <string name="dialog_edit_story_unrecoverable_message">We konden geen media vinden voor dit verhaal op de site.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Kan verhaal niet bewerken</string>
+    <string name="dialog_edit_story_unavailable_message">Niet mogelijk om media te laden voor dit verhaal. Controleer je internet verbinding en probeer het zometeen nog een keer.</string>
+    <string name="dialog_edit_story_unavailable_title">Kan het verhaal niet bewerken</string>
+    <string name="dialog_edit_story_limited_message">Dit verhaal is bewerkt op een ander apparaat en de mogelijkheid om bepaalde objecten te bewerken kan beperkt zijn.</string>
+    <string name="dialog_edit_story_limited_title">Beperkte verhaal bewerking</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media is verwijderd. Probeer je verhaal opnieuw te maken.</string>
+    <string name="color_picker_label_background">Achtergrond</string>
+    <string name="color_picker_label_text">Tekst</string>
+    <string name="dialog_discard_story_ok_button_edit">Negeer</string>
+    <string name="dialog_discard_story_message_edit">Elke gemaakte wijziging zal niet opgeslagen worden.</string>
+    <string name="dialog_discard_story_title_edit">Wijzigingen negeren?</string>
+    <string name="label_done_button">Klaar</string>
+    <string name="label_next_button">Volgende</string>
+    <string name="delete_button_alt">Verwijder</string>
+    <string name="hpp_choose_error">Er was een fout bij het selecteren van het ontwerp.</string>
+    <string name="hpp_retry_error">Controleer je internet verbinding en probeer het opnieuw.</string>
+    <string name="hpp_error_subtitle">Tik op opnieuw proberen wanneer je weer online bent.</string>
+    <string name="hpp_error_title">Lay-outs zijn niet beschikbaar indien offline</string>
+    <string name="continue_site_credentials">Ga verder met winkel-referenties</string>
+    <string name="login_find_your_connected_email">Vind je verbonden e-mail</string>
+    <string name="reader_discover_no_posts_button_text">Volg onderwerpen</string>
+    <string name="reader_discover_no_posts_subtitle">Probeer meer onderwerpen te volgen om de zoekopdracht uit te breiden</string>
+    <string name="reader_discover_no_posts_title">Geen recente berichten</string>
+    <string name="reader_discover_empty_title">Welkom!</string>
+    <string name="scan">Scan</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; antwoordde op je bericht</string>
+    <string name="login_prologue_third_subtitle_two">Je ontving &lt;b&gt;50 likes&lt;/b&gt; op je site vandaag</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; liked je bericht</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Scrolbaar blokmenu geopend. Selecteer een blok.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Scrolbaar blokmenu gesloten.</string>
+    <string name="hpp_skip_button">Overslaan</string>
+    <string name="hpp_choose_button">Kies</string>
+    <string name="hpp_subtitle">Kies je favoriete homepage lay-out. Je kan deze bewerken of later altijd nog aanpassen.</string>
+    <string name="hpp_title">Kies een ontwerp</string>
+    <string name="mlp_network_error_subtitle">Tik op opnieuw proberen wanneer je opnieuw online bent of maak een lege pagina met de knop hieronder.</string>
+    <string name="mlp_network_error_title">Lay-outs niet beschikbaar indien offline</string>
+    <string name="mlp_error_subtitle">Tik op opnieuw proberen of maak een lege pagina met de knop hieronder.</string>
+    <string name="mlp_error_title">Lay-outs niet beschikbaar vanwege een fout</string>
+    <string name="prepublishing_nudges_add_category_button">Categorie toevoegen</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Nieuwe categorie toevoegen</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorieën</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Niet ingesteld</string>
+    <string name="prepublishing_nudges_categories_action">Categorieën</string>
+    <string name="login_prologue_fifth_caption_three">Museums in Londen</string>
+    <string name="login_prologue_fifth_caption_two">The World\'s Best Fans</string>
+    <string name="login_prologue_fifth_caption_one">Mijn toptien café\'s</string>
+    <string name="login_prologue_fifth_tag_six">Politiek</string>
+    <string name="login_prologue_fifth_tag_five">Muziek</string>
+    <string name="login_prologue_fifth_tag_four">Tuinieren</string>
+    <string name="login_prologue_fifth_tag_three">Voetbal</string>
+    <string name="login_prologue_fifth_tag_two">Koken</string>
+    <string name="login_prologue_fifth_tag_one">Kunst</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock n\' Roll Weekly</string>
+    <string name="login_prologue_fifth_subtitle_two">Webnieuws</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Ik ben zo geïnspireerd door fotograaf Cameron Karsten. Ik ga deze technieken zeker proberen bij mijn volgende</string>
+    <string name="login_prologue_second_subtitle_one">Raak geinspireerd</string>
+    <string name="login_prologue_title_fifth">Volg je favoriete sites en ontdek nieuwe blogs.</string>
+    <string name="login_prologue_title_fourth">Bekijk hoe je publiek groeit met in-dept analytics.</string>
+    <string name="login_prologue_title_third">Bekijk reacties en berichten in real time.</string>
+    <string name="login_prologue_title_second">Met deze krachtige editor kun je onderweg publiceren.</string>
+    <string name="login_prologue_title_first">Welkom bij de wereld\'s meest populaire sitebouwer.</string>
+    <string name="media_loading_failed">Media laden is mislukt</string>
+    <string name="reader_discover_recommended_blogs_header">Sites om te volgen</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">We werken hard om meer blokken toe te voegen bij elke release.</string>
-    <string name="stories_intro_description_second">Ze worden als een nieuw blogbericht op je site gepubliceerd, zodat je publiek nooit iets mist.</string>
-    <string name="stories_intro_create_story_post_label">Maak een verhaal bericht</string>
-    <string name="gutenberg_native_choose_images">Kies afbeeldingen</string>
-    <string name="gutenberg_native_edit_using_web_editor">Bewerk met gebruik van de webeditor</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' wordt niet volledig ondersteund</string>
     <string name="gutenberg_native_help_button">Help knop</string>
-    <string name="stories_intro_description_first">Combineer foto\'s, video\'s en tekst om boeiende en tikbare verhaal berichten te maken die je bezoekers geweldig zullen vinden.</string>
-    <string name="stories_intro_title_second">Verhaal berichten verdwijnen niet</string>
-    <string name="media_picker_soft_ask_permissions_denied">%1$s heeft geen toegang tot je foto\'s. Om dit op te lossen, bewerk je je rechten en schakel je %2$s en %3$s in.</string>
-    <string name="mlp_preview_title">Lay-out voorbeeld</string>
-    <string name="mlp_notice_page_created">Pagina aangemaakt</string>
-    <string name="mlp_notice_blank_page_created">Blanco pagina aangemaakt</string>
-    <string name="mlp_generic_error">Er is een fout ontstaan bij het ophalen van de lay-outs</string>
-    <string name="stories_intro_image_caption_first">Hoe maak je een verhaal bericht</string>
-    <string name="stories_intro_main_subtitle">Je hebt vroege toegang tot verhaal berichten en we zouden het heel leuk vinden als je het eens probeert.</string>
-    <string name="stories_intro_main_title">Verhaal berichten introductie</string>
-    <string name="stories_intro_image_caption_second">Voorbeeld verhaaltitel</string>
+    <string name="gutenberg_native_edit_using_web_editor">Bewerk met gebruik van de webeditor</string>
+    <string name="gutenberg_native_choose_images">Kies afbeeldingen</string>
+    <string name="stories_intro_create_story_post_label">Maak een verhaal</string>
+    <string name="stories_intro_description_second">Ze worden als een nieuw blogbericht op je site gepubliceerd, zodat je publiek nooit iets mist.</string>
+    <string name="stories_intro_title_second">Verhalen verdwijnen niet</string>
+    <string name="stories_intro_description_first">Combineer foto\'s, video\'s en tekst om boeiende en tikbare verhalen te maken die je bezoekers geweldig zullen vinden.</string>
     <string name="stories_intro_title_first">Nu zijn verhalen voor iedereen</string>
-    <string name="photo_picker_wordpress_media_library">Kies uit WordPress mediabibliotheek</string>
-    <string name="media_insert_failed_with_reason">Invoegen media mislukt: %s</string>
+    <string name="stories_intro_image_caption_second">Voorbeeld verhaaltitel</string>
+    <string name="stories_intro_image_caption_first">Hoe maak je een verhaal</string>
+    <string name="stories_intro_main_title">Introductie verhalen</string>
+    <string name="mlp_notice_blank_page_created">Blanco pagina aangemaakt</string>
+    <string name="mlp_notice_page_created">Pagina aangemaakt</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s heeft geen toegang tot je foto\'s. Om dit op te lossen, bewerk je je rechten en schakel je %2$s en %3$s in.</string>
     <string name="media_insert_failed">Media invoegen mislukt.</string>
+    <string name="media_insert_failed_with_reason">Invoegen media mislukt: %s</string>
+    <string name="photo_picker_wordpress_media_library">Kies uit WordPress mediabibliotheek</string>
     <string name="reader_label_toolbar_back">Terug</string>
-    <string name="reader_post_details_header_by_author_name">Door</string>
-    <string name="reader_discover_empty_title">Volg onderwerpen om nieuwe blogs te ontdekken</string>
     <string name="reader_discover_empty_button_text">Aan de slag</string>
-    <string name="media_uploading_default">Media aan het uploaden</string>
-    <string name="media_uploading_stock_library_photo">Voorraad media aan het uploaden</string>
-    <string name="media_uploading_gif_library_photo">Gif media aan het uploaden</string>
-    <string name="stats_referrer_popup_menu_open_website">Open site</string>
-    <string name="stats_referrer_popup_menu_mark_as_spam">Markeer als spam</string>
-    <string name="stats_referrer_popup_unmark_as_spam">Markering als spam ongedaan maken</string>
+    <string name="reader_discover_empty_subtitle">Volg onderwerpen om nieuwe blogs te ontdekken</string>
+    <string name="reader_post_details_header_by_author_name">Door</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">Deze verwijzer kan niet gemarkeerd worden als spam</string>
-    <string name="gutenberg_native_search_or_type_url">Zoek of typ URL</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Markering als spam ongedaan maken</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Markeer als spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Open site</string>
+    <string name="media_uploading_gif_library_photo">Gif media aan het uploaden</string>
+    <string name="media_uploading_stock_library_photo">Voorraad media aan het uploaden</string>
+    <string name="media_uploading_default">Media aan het uploaden</string>
     <string name="gutenberg_native_select_item">Selecteer item</string>
+    <string name="gutenberg_native_search_or_type_url">Zoek of typ URL</string>
+    <string name="gutenberg_native_page_break">Pagina-einde</string>
     <string name="gutenberg_native_add_this_telephone_link">Voeg deze telefoon link toe</string>
-    <string name="suggestion_no_connection">\"Geen internetverbinding.\nSuggesties zijn niet beschikbaar\".</string>
-    <string name="gutenberg_native_add_this_email_link">Voeg deze e-mail link toe</string>
     <string name="gutenberg_native_add_this_link">Voeg deze link toe</string>
-    <string name="mlp_selected_description">%s geselecteerd</string>
-    <string name="mlp_notselected_description">%s</string>
-    <string name="typeface_label_libre_baskerville">Klassiek</string>
-    <string name="typeface_label_oswald">Sterk</string>
-    <string name="typeface_label_pacifico">Speels</string>
-    <string name="typeface_label_space_mono">Modern</string>
+    <string name="gutenberg_native_add_this_email_link">Voeg deze e-mail link toe</string>
+    <string name="suggestion_no_connection">Geen internetverbinding.\nSuggesties zijn niet beschikbaar.</string>
     <string name="typeface_label_shrikhand">Vet</string>
+    <string name="typeface_label_space_mono">Modern</string>
+    <string name="typeface_label_pacifico">Speels</string>
+    <string name="typeface_label_oswald">Sterk</string>
+    <string name="typeface_label_libre_baskerville">Klassiek</string>
     <string name="typeface_label_nunito">Casual</string>
     <string name="toast_capture_operation_permission_needed">Je moet de app toestemming geven om audio opnames te maken om video op te nemen</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s geselecteerd</string>
     <string name="login_get_link_by_email">Krijg een login link via e-mail</string>
     <string name="email_not_registered_wpcom">We kunnen geen WordPress.com account vinden dat verbonden is met dit e-mailadres.</string>
     <string name="permission_microphone">Microfoon</string>
     <string name="comment_unable_to_show_error">Kan de reactie niet tonen</string>
     <string name="media_browse_for_items">Blader voor items</string>
     <string name="reader_menu_report_post">Rapporteer dit bericht</string>
-    <string name="show_n_hidden_items_desc">%1$s meer items</string>
-    <string name="error_media_xmlrpc_not_allowed">Je actie is niet toegestaan</string>
-    <string name="error_media_xmlrcp_server_error">Er is een interne server fout ontstaan</string>
     <string name="reader_welcome_banner">Welkom bij Reader. Ontdek miljoenen van blogs aan je vingertoppen.</string>
-    <string name="gutenberg_native_angle">Hoek</string>
+    <string name="error_media_xmlrcp_server_error">Er is een interne server fout ontstaan</string>
+    <string name="error_media_xmlrpc_not_allowed">Je actie is niet toegestaan</string>
+    <string name="show_n_hidden_items_desc">%1$s meer items</string>
     <string name="gutenberg_native_select_a_layout">Selecteer een lay-out</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Opmerking:Kolom lay-out kan verschillen tussen thema\'s en scherm grootten</string>
-    <string name="create_post_fab_tooltip">Maak een bericht</string>
-    <string name="create_page_fab_tooltip">Maak een pagina</string>
     <string name="create_post_story_fab_tooltip">Maak een bericht of verhaal</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Verberg</string>
+    <string name="create_page_fab_tooltip">Maak een pagina</string>
+    <string name="create_post_fab_tooltip">Maak een bericht</string>
     <string name="reader_discover_interests_header">Je zult ook leuk vinden</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="toast_error_saving_video">Video kon niet opgeslagen worden</string>
-    <string name="camera_error">Dit apparaat ondersteund geen Camera2 API.</string>
-    <string name="toast_error_playing_video">Er is een fout opgetreden bij het afspelen van je video</string>
-    <string name="gutenberg_native_page_title_empty">Paginatitel. Leeg</string>
-    <string name="gutenberg_native_page_title_s">Oagina titel. %s</string>
-    <string name="gutenberg_native_paste_block_after">Plak het blok na</string>
-    <string name="gutenberg_native_updates_the_title">Werkt de titel bij.</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Verberg</string>
     <string name="gutenberg_native_video_caption_empty">Video bijschrift. Leeg</string>
+    <string name="gutenberg_native_updates_the_title">Werkt de titel bij.</string>
+    <string name="gutenberg_native_paste_block_after">Plak het blok na</string>
+    <string name="gutenberg_native_page_title_s">Oagina titel. %s</string>
+    <string name="gutenberg_native_page_title_empty">Paginatitel. Leeg</string>
+    <string name="toast_error_playing_video">Er is een fout opgetreden bij het afspelen van je video</string>
+    <string name="camera_error">Dit apparaat ondersteund geen Camera2 API.</string>
+    <string name="toast_error_saving_video">Video kon niet opgeslagen worden</string>
     <string name="toast_error_saving_image">Fout bij het opslaan van de afbeelding</string>
-    <string name="dialog_insufficient_device_storage_error_ok_button">Bekijk de opslag</string>
-    <string name="toast_story_page_not_found">Kan verhaal slide niet vinden</string>
     <string name="toast_capture_operation_in_progress">De bewerking wordt uitgevoerd, probeer het opnieuw</string>
-    <string name="story_saving_failed_message_singular">1 slide vereist actie</string>
-    <string name="story_saving_failed_message_plural">%1$d slides vereisen actie</string>
-    <string name="story_saving_failed_quick_action_manage">Beheer</string>
-    <string name="dialog_story_saving_error_title_singular">Niet mogelijk om 1 slide op te slaan</string>
-    <string name="dialog_story_saving_error_title_plural">Niet mogelijk om %1$d slides op te slaan</string>
-    <string name="dialog_story_saving_error_message">Probeer opnieuw om de slides op te slaan of te verwijderen,  probeer daarna opnieuw om je verhaal te publiceren.</string>
-    <string name="dialog_insufficient_device_storage_error_title">Onvoldoende apparaat opslag</string>
+    <string name="toast_story_page_not_found">Kan verhaal slide niet vinden</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Bekijk de opslag</string>
     <string name="dialog_insufficient_device_storage_error_message">We moeten het verhaal op je apparaat opslaan voordat het kan worden gepubliceerd. Controleer je opslaginstellingen en verwijder bestanden om ruimte vrij te maken.</string>
-    <string name="story_saving_snackbar_started">\"%1$s\" wordt geüpload</string>
-    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" gepubliceerd</string>
-    <string name="story_saving_snackbar_finished_with_error">\"%1$s\" niet kunnen uploaden</string>
+    <string name="dialog_insufficient_device_storage_error_title">Onvoldoende apparaat opslag</string>
+    <string name="dialog_story_saving_error_message">Probeer opnieuw om de slides op te slaan of te verwijderen,  probeer daarna opnieuw om je verhaal te publiceren.</string>
+    <string name="dialog_story_saving_error_title_plural">Niet mogelijk om %1$d slides op te slaan</string>
+    <string name="dialog_story_saving_error_title_singular">Niet mogelijk om 1 slide op te slaan</string>
+    <string name="story_saving_failed_quick_action_manage">Beheer</string>
+    <string name="story_saving_failed_message_plural">%1$d slides vereisen actie</string>
+    <string name="story_saving_failed_message_singular">1 slide vereist actie</string>
     <string name="story_saving_failed_title">\"%1$s\" niet kunnen uploaden</string>
-    <string name="story_saving_title_several">verschillende verhalen</string>
-    <string name="story_saving_subtitle_frames_remaining_singular">1 slide resterend</string>
+    <string name="story_saving_snackbar_finished_with_error">\"%1$s\" niet kunnen uploaden</string>
+    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" gepubliceerd</string>
+    <string name="story_saving_snackbar_started">\"%1$s\" wordt geüpload</string>
     <string name="story_saving_subtitle_frames_remaining_plural">%1$d slides resterend</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">1 slide resterend</string>
+    <string name="story_saving_title_several">verschillende verhalen</string>
     <string name="story_saving_title">Opslaan \"%1$s\"…</string>
-    <string name="label_frame_unselected_border">niet geselecteerd</string>
-    <string name="label_frame_selected_border">geselecteerd</string>
-    <string name="label_frame_errored">in fout gegaan</string>
-    <string name="label_text_alignment_button">Wijzig tekstuitlijning</string>
-    <string name="label_text_color_button">Wijzig tekstkleur</string>
-    <string name="menu_delete_page">Verwijder slide</string>
-    <string name="dialog_discard_page_title">Verwijder verhaal slide?</string>
-    <string name="dialog_discard_page_message">Deze slide zal verwijderd worden uit je verhaal.</string>
-    <string name="dialog_discard_errored_page_message">Deze slide is nog niet opgeslagen. Als je deze slide verwijderd, zal je elke wijziging die je hebt gemaakt verliezen.</string>
-    <string name="dialog_discard_page_ok_button">Verwijder</string>
+    <string name="story_saving_untitled">Zonder titel</string>
+    <string name="dialog_discard_story_ok_button">Negeren</string>
     <string name="dialog_discard_story_message">Je verhaal zal niet opgeslagen worden als concept.</string>
     <string name="dialog_discard_story_title">Negeer plaatsing verhaal?</string>
-    <string name="dialog_discard_story_ok_button">Negeren</string>
-    <string name="story_saving_untitled">Zonder titel</string>
-    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Maak een bericht of verhaal</string>
-    <string name="prepublishing_nudges_story_title_hint">Geef je verhaal een titel</string>
-    <string name="mlp_choose_layout_title">Kies een lay-out</string>
-    <string name="mlp_create_blank_page">Maak een lege pagina</string>
-    <string name="mlp_create_page">Maak een pagina</string>
-    <string name="mlp_preview_page">Voorbeeld</string>
-    <string name="capture_button_alt">Vastleggen</string>
-    <string name="flip_button_alt">Draai camera</string>
-    <string name="flash_button_alt">Flash</string>
-    <string name="label_saved_icon">Opgeslagen</string>
-    <string name="label_retry_icon">Probeer opnieuw</string>
+    <string name="dialog_discard_page_ok_button">Verwijder</string>
+    <string name="dialog_discard_errored_page_message">Deze slide is nog niet opgeslagen. Als je deze slide verwijderd, zal je elke wijziging die je hebt gemaakt verliezen.</string>
+    <string name="dialog_discard_page_message">Deze slide zal verwijderd worden uit je verhaal.</string>
+    <string name="dialog_discard_page_title">Verwijder verhaal slide?</string>
+    <string name="label_text_color_button">Wijzig tekstkleur</string>
+    <string name="label_text_alignment_button">Wijzig tekstuitlijning</string>
+    <string name="label_frame_errored">in fout gegaan</string>
+    <string name="label_frame_selected_border">geselecteerd</string>
+    <string name="label_frame_unselected_border">niet geselecteerd</string>
     <string name="label_frame_image">Slide</string>
-    <string name="stickers_button_alt">Stickers</string>
-    <string name="more_button_alt">Meer</string>
-    <string name="text_button_alt">Tekst</string>
-    <string name="sound_button_alt">Geluid</string>
-    <string name="label_control_flip_camera">Omkeren</string>
-    <string name="label_control_flash">Flash</string>
-    <string name="label_control_saving">Opslaan</string>
-    <string name="label_control_saved">Opgeslagen</string>
-    <string name="label_control_retry">Probeer opnieuw</string>
-    <string name="label_snackbar_loop_frame_saved">Opgeslagen naar foto\'s</string>
-    <string name="label_snackbar_share">DELEN</string>
-    <string name="label_share_to">Deel naar</string>
-    <string name="label_done">Klaar</string>
-    <string name="label_control_publish">Volgende</string>
+    <string name="label_retry_icon">Probeer opnieuw</string>
+    <string name="label_saved_icon">Opgeslagen</string>
     <string name="label_close_button">Sluiten</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Tik op %1$s Maken. %2$s Selecteer vervolgens &lt;b>Blog bericht&lt;/b></string>
+    <string name="label_share_to">Deel naar</string>
+    <string name="label_snackbar_share">DELEN</string>
+    <string name="label_snackbar_loop_frame_saved">Opgeslagen naar foto\'s</string>
+    <string name="label_control_retry">Probeer opnieuw</string>
+    <string name="label_control_saved">Opgeslagen</string>
+    <string name="label_control_saving">Opslaan</string>
+    <string name="label_control_flash">Flash</string>
+    <string name="label_control_flip_camera">Omkeren</string>
+    <string name="sound_button_alt">Geluid</string>
+    <string name="text_button_alt">Tekst</string>
+    <string name="stickers_button_alt">Stickers</string>
+    <string name="flash_button_alt">Flash</string>
+    <string name="flip_button_alt">Draai camera</string>
+    <string name="capture_button_alt">Vastleggen</string>
+    <string name="mlp_preview_page">Voorbeeld</string>
+    <string name="mlp_create_page">Maak een pagina</string>
+    <string name="mlp_create_blank_page">Maak een lege pagina</string>
     <string name="mlp_choose_layout_subtitle">Ga aan de slag door te kiezen uit een breed scala aan vooraf gemaakte pagina lay-outs. Of begin gewoon met een lege pagina.</string>
+    <string name="mlp_choose_layout_title">Kies een lay-out</string>
+    <string name="prepublishing_nudges_story_title_hint">Geef je verhaal een titel</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Maak een bericht of verhaal</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Maak een bericht, pagina of verhaal</string>
-    <string name="error_media_quota_exceeded">Opslag quota overschreden</string>
-    <string name="error_media_quota_exceeded_toast">Kan bestand niet uploaden.\nOpslag quota was overschreden.</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Tik op %1$s Maken. %2$s Selecteer vervolgens &lt;b&gt;Blog bericht&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Kies van welk apparaat</string>
-    <string name="reader_toast_err_page_jump_not_found">Kan de gekoppelde pagina niet vinden</string>
-    <string name="my_site_icon_dialog_change_requires_jetpack_message">Voor het bewerken van sitepictogrammen op door jezelf gehoste WordPress sites is de Jetpack plugin vereist.</string>
     <string name="my_site_bottom_sheet_add_story">Verhaal plaatsen</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">Voor het bewerken van sitepictogrammen op door jezelf gehoste WordPress sites is de Jetpack plugin vereist.</string>
+    <string name="reader_toast_err_page_jump_not_found">Kan de gekoppelde pagina niet vinden</string>
+    <string name="error_media_quota_exceeded_toast">Kan bestand niet uploaden.\nOpslag quota was overschreden.</string>
+    <string name="error_media_quota_exceeded">Opslag quota overschreden</string>
     <string name="pick_file">Bestand toevoegen</string>
-    <string name="gutenberg_native_replace_image_or_video">Afbeelding of video vervangen</string>
     <string name="gutenberg_native_replace_video">Video vervangen</string>
-    <string name="continue_with_google_terms_of_service_text">Als je doorgaat met Google en nog geen WordPress.com account hebt, maakt je een account aan en gaat je akkoord met onze %1$sServicevoorwaarden%2$s.</string>
-    <string name="signup_confirmation_title">Inschrijfbevestiging</string>
-    <string name="continue_with_wpcom">Ga verder met WordPress.com</string>
-    <string name="enter_your_site_address">Voer je site adres in</string>
-    <string name="content_description_logo">WordPress logo</string>
-    <string name="gutenberg_native_block_removed">Blok verwijderd</string>
-    <string name="gutenberg_native_choose_image">Kies afbeelding</string>
-    <string name="gutenberg_native_choose_image_or_video">Kies afbeelding of video</string>
+    <string name="gutenberg_native_replace_image_or_video">Afbeelding of video vervangen</string>
     <string name="gutenberg_native_choose_video">Video kiezen</string>
+    <string name="gutenberg_native_choose_image_or_video">Kies afbeelding of video</string>
+    <string name="gutenberg_native_choose_image">Kies afbeelding</string>
+    <string name="gutenberg_native_block_removed">Blok verwijderd</string>
+    <string name="enter_your_site_address">Voer je bestaande site adres in</string>
+    <string name="signup_confirmation_title">Inschrijfbevestiging</string>
+    <string name="continue_with_google_terms_of_service_text">Als je doorgaat met Google en nog geen WordPress.com account hebt, maakt je een account aan en gaat je akkoord met onze %1$sServicevoorwaarden%2$s.</string>
     <string name="continue_terms_of_service_text">Als je doorgaat, ga je akkoord met onze %1$sServicevoorwaarden%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">We sturen je een link per e-mail om je nieuwe WordPress.com account aan te maken.</string>
     <string name="signup_confirmation_message">We gebruiken dit e-mailadres om je nieuwe WordPress.com account aan te maken.</string>
     <string name="signup_magic_link_message">We hebben je een link gestuurd om je nieuwe WordPress.com account aan te maken. Controleer je e-mail op dit apparaat en tik op de link in de e-mail die je van WordPress.com ontvangt.</string>
     <string name="enter_account_info_for_site">Voer je accountgegevens in voor %1$s.</string>
-    <string name="login_magic_links_sent_label">Controleer je e-mail op dit apparaat en tik op de link in de e-mail die je van WordPress.com hebt ontvangen.</string>
-    <string name="magic_link_not_seeing_email_message">Zie je de e-mail niet? Controleer je spam-map of ongewenste e-mail.</string>
-    <string name="login_done">Gedaan</string>
-    <string name="login_find_your_site_adress">Vind het adres van je site</string>
-    <string name="continue_google_button_suffix">Doorgaan met Google</string>
     <string name="login_or">of</string>
+    <string name="continue_google_button_suffix">Doorgaan met Google</string>
+    <string name="login_find_your_site_adress">Vind het adres van je site</string>
+    <string name="login_done">Gedaan</string>
+    <string name="magic_link_not_seeing_email_message">Zie je de e-mail niet? Controleer je spam-map of ongewenste e-mail.</string>
+    <string name="login_magic_links_sent_label">Controleer je e-mail op dit apparaat en tik op de link in de e-mail die je van WordPress.com hebt ontvangen.</string>
     <string name="login_magic_links_label">We e-mailen je een link waarmee je direct kan inloggen, geen wachtwoord nodig.</string>
-    <string name="reset_your_password">Stel je wachtwoord opnieuw in</string>
-    <string name="login_promo_title_37_percent">37\% van het web is gebouwd op WordPress.</string>
-    <string name="login_promo_text_unlock_the_power">Ontgrendel de kracht van de meest flexibele sitebouwer.</string>
-    <string name="send_link_by_email">Link per e-mail verzenden</string>
-    <string name="create_account">Account aanmaken</string>
-    <string name="or_type_your_password">Of typ je wachtwoord</string>
-    <string name="enter_email_to_continue_wordpress_com">Voer je e-mailadres in om in te loggen of maak een WordPress.com account aan.</string>
-    <string name="get_started">Begin</string>
     <string name="check_email">E-mail controleren</string>
+    <string name="get_started">Begin</string>
+    <string name="enter_email_to_continue_wordpress_com">Voer je e-mailadres in om in te loggen of maak een WordPress.com account aan.</string>
+    <string name="or_type_your_password">Of typ je wachtwoord</string>
+    <string name="create_account">Account aanmaken</string>
+    <string name="send_link_by_email">Link per e-mail verzenden</string>
+    <string name="reset_your_password">Stel je wachtwoord opnieuw in</string>
     <string name="reader_error_request_failed_title">Er is een probleem opgetreden bij het verwerken van de aanvraag. Probeer het later opnieuw.</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Tik &lt;b>%1$s&lt;/b> om een nieuwe titel in te stellen</string>
     <string name="quick_start_list_update_site_title_title">Stel je site titel in</string>
-    <string name="quick_start_list_update_site_title_subtitle">Geef je site een naam die zijn personaliteit en onderwerp reflecteerd. De eerste indruk telt!</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Tik &lt;b&gt;%1$s&lt;/b&gt; om een nieuwe titel in te stellen</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Dit bericht naar de prullenbak verplaatsen zal ook lokale wijzigingen negeren, weet je zeker dat je verder wil gaan?</string>
     <string name="gutenberg_native_s_block_options">%s blok opties</string>
-    <string name="my_site_title_changer_dialog_not_allowed_hint">De site titel kan alleen gewijzigd worden door een gebruiker met de beheerder rol.</string>
-    <string name="gutenberg_native_block_copied">Blok gekopieerd</string>
-    <string name="gutenberg_native_block_cut">Blok geknipt</string>
-    <string name="gutenberg_native_block_duplicated">Blok gedupliceerd</string>
-    <string name="gutenberg_native_block_pasted">Blok geplakt</string>
-    <string name="gutenberg_native_block_settings">Blok instellingen</string>
-    <string name="gutenberg_native_copied_block">Blok gecopieerd</string>
-    <string name="gutenberg_native_copy_block">Blok copieren</string>
     <string name="gutenberg_native_duplicate_block">Blok dupliceren</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Niet opgeslagen wijzigingen</string>
-    <string name="error_update_site_title_network">Kon de site titel niet updaten. Controleer je netwerkverbinding en probeer het dan opnieuw.</string>
-    <string name="reader_title_tag_preview">Onderwerp</string>
+    <string name="gutenberg_native_copy_block">Blok copieren</string>
+    <string name="gutenberg_native_copied_block">Blok gecopieerd</string>
+    <string name="gutenberg_native_block_pasted">Blok geplakt</string>
+    <string name="gutenberg_native_block_duplicated">Blok gedupliceerd</string>
+    <string name="gutenberg_native_block_cut">Blok geknipt</string>
+    <string name="gutenberg_native_block_copied">Blok gekopieerd</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">De site titel kan alleen gewijzigd worden door een gebruiker met de beheerder rol.</string>
     <string name="my_site_title_changer_dialog_hint">De site titel wordt getoont in de titelbalk van een webbrowser en wordt getoont in de header van de meeste thema\'s.</string>
+    <string name="reader_title_tag_preview">Onderwerp</string>
+    <string name="error_update_site_title_network">Kon de site titel niet updaten. Controleer je netwerkverbinding en probeer het dan opnieuw.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Niet opgeslagen wijzigingen</string>
     <string name="gutenberg_native_open_link_in_a_browser">Open link in een browser</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
-    <string name="gutenberg_native_double_tap_to_select_the_option">Tik tweemaal om de optie te selecteren</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Navigeert naar aanpassen van het verloop</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Navigeert naar de aangepaste kleurkiezer</string>
     <string name="gutenberg_native_gradient_type">Verloop type</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Tik tweemaal om de optie te selecteren</string>
     <string name="gutenberg_native_customize_gradient">Pas de verloop aan</string>
-    <string name="gutenberg_native_navigates_to_custom_color_picker">Navigeert naar de aangepaste kleurkiezer</string>
-    <string name="gutenberg_native_navigates_to_customize_the_gradient">Navigeert naar aanpassen van het verloop</string>
-    <string name="me">Mij</string>
-    <string name="everyone">Iedereen</string>
-    <string name="menu_content_info">Inhoudstructuur</string>
-    <string name="error_media_thumbnail_not_loaded">De media thumbnail kon niet geladen worden</string>
-    <string name="photo_picker_use_gif">Gebruik deze GIF</string>
     <string name="pages_list_author">Pagina auteur</string>
-    <string name="prepublishing_nudges_home_tags_not_set">Niet ingesteld</string>
+    <string name="photo_picker_use_gif">Gebruik deze GIF</string>
+    <string name="error_media_thumbnail_not_loaded">De media thumbnail kon niet geladen worden</string>
+    <string name="menu_content_info">Inhoudstructuur</string>
+    <string name="everyone">Iedereen</string>
+    <string name="me">Mij</string>
     <string name="gutenberg_native_dismiss">Negeren</string>
-    <string name="prepublishing_nudges_home_submit_button">Verzend nu</string>
-    <string name="prepublishing_nudges_home_save_button">Bewaar nu</string>
-    <string name="prepublishing_nudges_back_button">Terug</string>
-    <string name="prepublishing_nudges_toolbar_title_tags">Tags toevoegen</string>
+    <string name="prepublishing_nudges_home_tags_not_set">Niet ingesteld</string>
     <string name="prepublishing_tags_description">Tags helpen de lezers om aan te geven waar het bericht over gaat</string>
-    <string name="prepublishing_nudges_publish_action">Publicatiedatum</string>
-    <string name="prepublishing_nudges_tags_action">Tags</string>
-    <string name="prepublishing_nudges_home_header_publishing_to">Publiceren naar</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Publicatie datum</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Tags toevoegen</string>
+    <string name="prepublishing_nudges_back_button">Terug</string>
+    <string name="prepublishing_nudges_home_save_button">Bewaar nu</string>
+    <string name="prepublishing_nudges_home_submit_button">Verzend nu</string>
     <string name="prepublishing_nudges_home_schedule_button">Nu inplannen</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Publiceren naar</string>
+    <string name="prepublishing_nudges_tags_action">Tags</string>
+    <string name="prepublishing_nudges_publish_action">Publicatiedatum</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Annuleren</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Verplaatsen naar concept</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Berichten in prullenbak kunnen niet bewerkt worden. Wil je de status van dit bericht wijzigen naar \"concept\" zodat je er aan kan werken?</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">Publicatie datum</string>
-    <string name="publish_date">Publicatiedatum</string>
-    <string name="post_status_post_scheduled">Gepland</string>
-    <string name="post_status_post_trashed">Verwijderd</string>
-    <string name="post_status_post_published">Gepubliceerd</string>
-    <string name="reader_btn_select_few_interests">Selecteer een paar om verder te gaan</string>
-    <string name="reader_btn_done">Klaar</string>
-    <string name="reader_choose_interests_content_description">Kies je interesses</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Verplaats bericht naar concept?</string>
-    <string name="reader_label_choose_your_interests">Kies je interesses</string>
+    <string name="reader_label_choose_your_interests">Kies je onderwerpen</string>
+    <string name="reader_choose_interests_content_description">Kies je onderwerpen</string>
+    <string name="reader_btn_done">Klaar</string>
+    <string name="reader_btn_select_few_interests">Selecteer een paar om verder te gaan</string>
+    <string name="post_status_post_published">Gepubliceerd</string>
+    <string name="post_status_post_trashed">Verwijderd</string>
+    <string name="post_status_post_scheduled">Gepland</string>
+    <string name="publish_date">Publicatiedatum</string>
     <string name="ccpa_privacy_notice_read">Lees CCPA privacy bericht</string>
     <string name="ccpa_privacy_notice_caption">De Californische Consumer Privacy Act (\"CCPA\") vereist dat je ons de Californische inwonenden aanlevert met enige toegevoegde informatie over de categorieën van de persoonlijke informatie die we verzamelen en delen, daar waar we persoonlijke informatie krijgen, en waarom we het gebruiken.</string>
-    <string name="update_now">Update nu</string>
-    <string name="status_and_visibility">Status &amp; zichtbaarheid</string>
     <string name="ccpa_privacy_notice_header">Privacybericht voor gebruikers in Californie</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Probeer een starter lay-out</string>
+    <string name="status_and_visibility">Status &amp; zichtbaarheid</string>
+    <string name="update_now">Update nu</string>
     <string name="gutenberg_native_open_block_actions_menu">Open menu met blokacties</string>
-    <string name="gutenberg_native_insert_mention">Voeg vermelding in</string>
+    <string name="gutenberg_native_move_to_top">Verplaats naar boven</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Dubbeltik om onderste blad te openen met beschikbare opties</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Dubbeltik om actieblad te openen met beschikbare opties</string>
     <string name="pages_cannot_be_started">We kunnen momenteel geen pagina\'s openen. Probeer het later opnieuw</string>
     <string name="pages_set_as_posts_page">Instellen als berichtpagina</string>
     <string name="pages_set_as_homepage">Instellen als homepage</string>
-    <string name="suggestion_no_matching_users">\'Geen overeenkomende gebruikers beschikbaar.\'</string>
-    <string name="suggestion_invalid_user">\'%s is geen geldige gebruiker.\'</string>
+    <string name="suggestion_invalid">%s is geen geldige %s</string>
     <string name="site_settings_select_page">Selecteer pagina</string>
     <string name="site_settings_posts_page">Berichtenpagina</string>
     <string name="site_settings_static_homepage">Statische homepage</string>
     <string name="site_settings_classic_blog">Klassiek blog</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Geselecteerde homepage en pagina voor berichten kunnen niet hetzelfde zijn.</string>
-    <string name="site_settings_homepage_settings">Instellingen Homepage</string>
-    <string name="site_settings_accept_homepage">Accepteren</string>
-    <string name="site_settings_failed_to_save_homepage_settings">Kan homepagina instellingen niet opslaan</string>
     <string name="site_settings_failed_update_homepage_settings">Bijwerken van homepage-instellingen mislukt. Controleer je internetverbinding.</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Kan homepage-instellingen niet opslaan voordat pagina\'s zijn geladen</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Kan homepagina instellingen niet opslaan</string>
+    <string name="site_settings_accept_homepage">Accepteren</string>
     <string name="site_settings_failed_to_load_pages">Laden van pagina mislukt</string>
     <string name="site_settings_homepage_settings_description">Kies uit een homepage waarop je nieuwste berichten (klassiek blog) of een vaste/statische pagina wordt weergegeven.</string>
-    <string name="page_cannot_set_homepage">Instellingen</string>
-    <string name="page_cannot_set_posts_page">Instellingen</string>
-    <string name="page_homepage_successfully_updated">Homepagina met succes bijgewerkt</string>
-    <string name="page_homepage_update_failed">Homepagina bijwerken mislukt</string>
-    <string name="page_posts_page_successfully_updated">Berichtenpagina met succes bijgewerkt</string>
-    <string name="page_posts_page_update_failed">Berichtpagina bijwerken mislukt</string>
+    <string name="site_settings_homepage_settings">Instellingen Homepage</string>
     <string name="site_settings_homepage">Homepagina</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Welkom bij onze nieuwe blog</string>
+    <string name="page_posts_page_update_failed">Berichtpagina bijwerken mislukt</string>
+    <string name="page_posts_page_successfully_updated">Berichtenpagina met succes bijgewerkt</string>
+    <string name="page_homepage_update_failed">Homepagina bijwerken mislukt</string>
+    <string name="page_homepage_successfully_updated">Homepagina met succes bijgewerkt</string>
+    <string name="page_cannot_set_posts_page">Instellingen</string>
+    <string name="page_cannot_set_homepage">Instellingen</string>
     <string name="gutenberg_native_select_a_color">Selecteer een kleur</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Tik tweemaal om naar de kleureninstellingen te gaan</string>
     <string name="reader_empty_followed_blogs_description">Wanneer je sites volgt, zie je hier de content ervan</string>
-    <string name="photo_picker_video_title">Kies video</string>
-    <string name="photo_picker_photo_or_video_title">Kies media</string>
-    <string name="photo_picker_use_video">Gebruik deze video</string>
-    <string name="photo_picker_use_media">Gebruik deze media</string>
-    <string name="site_picker_ask_site_select">Kan site niet selecteren. Probeer het opnieuw.</string>
-    <string name="insert_label_with_count">Invoegen %d</string>
     <string name="feature_announcement_find_out_mode">Meer informatie</string>
+    <string name="feature_announcement_dialog_label">Wat is er nieuw in WordPress</string>
+    <string name="insert_label_with_count">Invoegen %d</string>
     <string name="crop">bijsnijden</string>
     <string name="error_failed_to_load_into_file">Kan niet laden in bestand, probeer het opnieuw.</string>
-    <string name="feature_announcement_dialog_label">Wat is er nieuw in WordPress</string>
     <string name="preview_image_thumbnail_description">Voorbeeld afbeelding thumbnail</string>
-    <string name="copy_text">Kopieer</string>
-    <string name="continue_label">Doorgaan</string>
-    <string name="button_insert">Invoegen</string>
+    <string name="photo_picker_use_media">Gebruik deze media</string>
+    <string name="photo_picker_use_video">Gebruik deze video</string>
+    <string name="photo_picker_photo_or_video_title">Kies media</string>
+    <string name="photo_picker_video_title">Kies video</string>
+    <string name="site_picker_ask_site_select">Kan site niet selecteren. Probeer het opnieuw.</string>
     <string name="sitepicker_continue_flow">Doorgaan</string>
     <string name="reader_reblog_error">Reblog mislukt</string>
+    <string name="reader_no_site_to_reblog_action">Beheer sites</string>
+    <string name="reader_no_site_to_reblog_detail">Zodra je een WordPress.com site maakt, kun je inhoud die je leuk vindt rebloggen op je eigen site.</string>
+    <string name="reader_no_site_to_reblog_title">Geen beschikbare WordPress.com sites</string>
     <string name="whats_new_in_version_title">Wat is er nieuw</string>
     <string name="comment_q_action_copied_url">Linkadres gekopieerd</string>
-    <string name="reader_no_site_to_reblog_action">Beheer sites</string>
     <string name="copy_link_address">Link adres kopiëren</string>
-    <string name="comment_toast_err_share_intent">Onmogelijk te delen</string>
     <string name="comment_share_link_via">Delen via</string>
-    <string name="reader_no_site_to_reblog_title">Geen beschikbare WordPress.com sites</string>
-    <string name="reader_no_site_to_reblog_detail">Zodra je een WordPress.com site maakt, kun je inhoud die je leuk vindt rebloggen op je eigen site.</string>
+    <string name="comment_toast_err_share_intent">Onmogelijk te delen</string>
+    <string name="button_insert">Invoegen</string>
+    <string name="continue_label">Doorgaan</string>
+    <string name="copy_text">Kopieer</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Blok naar rechts verplaatsen van positie %1$s naar positie %2$s</string>
     <string name="gutenberg_native_move_block_right">Blok naar rechts verplaatsen</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Blok naar links verplaatsen van positie %1$s naar positie %2$s</string>
     <string name="gutenberg_native_move_block_left">Blok naar links verplaatsen</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Tik tweemaal om het blok naar rechts te verplaatsen</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Tik tweemaal om het blok naar links te verplaatsen</string>
-    <string name="gutenberg_native_blog">Blog</string>
+    <string name="gutenberg_native_block_settings">Blok instellingen</string>
     <string name="new_site_creation_creating_site_loading_4">Dashboard aanmaken</string>
     <string name="new_site_creation_creating_site_loading_3">Thema configureren</string>
     <string name="new_site_creation_creating_site_loading_2">Sitefuncties toevoegen</string>
@@ -331,12 +763,12 @@ Language: nl
     <string name="media_accessing_failed">Openen van content van privésite mislukt. Sommige media zijn mogelijk niet beschikbaar</string>
     <string name="media_accessing_progress">Content van privésite wordt geopend</string>
     <string name="error_failed_to_crop_and_save_image">Afbeelding bijsnijden en opslaan mislukt. Probeer opnieuw.</string>
+    <string name="failed_to_load_image_tap_to_retry">Afbeelding laden mislukt.\nTik om het opnieuw te proberen.</string>
     <string name="preview_image_description">Voorbeeldweergave afbeelding</string>
     <string name="error_unknown_page_type">Onbekende pagina-indeling</string>
     <string name="error_page_not_submitted">We konden deze handeling niet voltooien en hebben de pagina niet verzonden voor beoordeling.</string>
     <string name="error_page_not_scheduled">We konden deze handeling niet voltooien en hebben deze pagina niet ingepland.</string>
     <string name="error_page_not_published_private">We konden deze handeling niet voltooien en hebben deze privépagina niet gepubliceerd.</string>
-    <string name="failed_to_load_image_tap_to_retry">Afbeelding laden mislukt.\nTik om het opnieuw te proberen.</string>
     <string name="error_page_not_published">We konden deze handeling niet voltooien en hebben deze pagina niet gepubliceerd.</string>
     <string name="error_page_not_submitted_retrying">We konden deze pagina niet inzenden voor beoordeling, maar we proberen het later nog eens. </string>
     <string name="error_page_not_scheduled_retrying">We konden deze pagina niet inplannen, maar we proberen het later nog eens.</string>
@@ -365,57 +797,20 @@ Language: nl
     <string name="app_theme_light">Licht</string>
     <string name="app_theme">Weergave</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Je hebt onlangs wijzigingen aangebracht aan deze pagina, maar deze niet opgeslagen. Kies een versie om te laden:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Wat mensen zeggen</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">We beschikken over een groot aantal services die je kunnen helpen om de gewenste resultaten te behalen. Geen idee wat je nodig hebt of wat het kost? We kunnen uitleggen welke services perfect bij je passen en je meer informatie geven over onze tarieven. Neem hieronder contact met ons op.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">We hebben een klein team van getalenteerde professionals met veel vaardigheden en ervaring. We houden van wat we doen, en we doen het met passie. We kijken ernaar uit met je samen te werken.</string>
-    <string name="gutenberg_native_warning_message">Waarschuwingsmelding</string>
-    <string name="gutenberg_native_want_to_work_with_us">Wil je bij ons werken?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Bezoekers willen weten wie aan de andere kant van de pagina zit. Gebruik deze ruimte om wat te schrijven over jezelf, je site, je bedrijf of wat je maar wil. Gebruik de onderstaande testimonials om anderen te citeren die het over hetzelfde hebben.</string>
-    <string name="gutenberg_native_usa">Nederland</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Dit is voorbeeldinhoud, meegeleverd bij het sjabloon om alle functies te demonstreren. Verwijder de inhoud of vervang deze door je eigen woorden en media.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">De beste manier om te starten is door te stoppen met praten en aan de slag te gaan.</string>
-    <string name="gutenberg_native_team">Team</string>
-    <string name="gutenberg_native_success_message">Succesmelding</string>
-    <string name="gutenberg_native_strategy">Strategie</string>
     <string name="gutenberg_native_show_post_content">Berichtcontent weergeven</string>
-    <string name="gutenberg_native_services">Services</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Projectnaam</string>
-    <string name="gutenberg_native_position_or_job_title">Positie- of functietitel</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
     <string name="gutenberg_native_only_show_excerpt">Alleen samenvatting weergeven</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">In mijn portfolio worden verschillende projecten weergegeven waar ik tijdens mijn carrière aan heb gewerkt. Bekijk hieronder mijn contactgegevens en neem contact met me op.</string>
     <string name="gutenberg_native_link_to">Link naar</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Laten we dit bespreken &amp;amp;amp;#128075; aarzel niet om contact met ons op te nemen via de onderstaande contactgegevens, of een bericht te sturen via het formulier.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Laten we samen wat bouwen!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Laten we samen wat bouwen!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Veel meer dan onze talenten, zijn het onze keuzes die bepalen wie we werkelijk zijn.</string>
-    <string name="gutenberg_native_inspiration">Inspiratie</string>
-    <string name="gutenberg_native_get_in_touch">Neem contact op</string>
+    <string name="gutenberg_native_link_settings">Link instellingen</string>
     <string name="gutenberg_native_excerpt_length_words">Lengte samenvatting (woorden)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Stuur me een e-mail: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Treur niet om wat voorbij is, lach omdat het gebeurd is.</string>
     <string name="gutenberg_native_customize">AANPASSEN</string>
-    <string name="gutenberg_native_city_10100">Plaats, 1234 AB</string>
+    <string name="gutenberg_native_video_settings">Video-instellingen</string>
     <string name="gutenberg_native_add_paragraph_block">Paragraafblok toevoegen</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Een korte beschrijving van de services die je biedt.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Een korte bio met persoonlijke geschiedenis, belangrijke prestaties of een interessant weetje.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Een beschrijving van het project en het uiteindelijke resultaat.</string>
-    <string name="gutenberg_native_555_555_1234">012–3456789</string>
-    <string name="gutenberg_native_10_street_road">Dorpsstraat 10</string>
     <string name="create_post_page_fab_tooltip_contributors">Een bericht maken</string>
     <string name="post_list_tab_trashed_posts">Verwijderd</string>
     <string name="post_list_tab_scheduled_posts">Gepland</string>
     <string name="post_list_tab_published_posts">Gepubliceerd</string>
     <string name="sharing_facebook_account_must_have_pages">De Facebook-verbinding kan geen pagina\'s vinden. Publicize kan geen verbinding maken met Facebook-profielen, alleen met gepubliceerde pagina\'s.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Niet verbonden</string>
-    <string name="my_site_select_domains_page_title">Websiteadres</string>
     <string name="notifications_tab_title_likes">Waarderingen</string>
     <string name="notifications_tab_title_follows">Volgt</string>
     <string name="notifications_tab_title_comments">Commentaar</string>
@@ -429,28 +824,25 @@ Language: nl
     <string name="stats_management_add_new_stats_card">Nieuwe statistiekenkaart toevoegen</string>
     <string name="reader_self_hosted_select_filter">Gebruik de filterknop om berichten over specifieke onderwerpen te vinden</string>
     <string name="reader_bottom_sheet_content_description">Selecteer een tag of site, pop-upvenster</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Geselecteerd</string>
     <string name="reader_btn_select_filter_content_description">Selecteer een site of tag om berichten te filteren</string>
     <string name="reader_btn_remove_filter_content_description">Verwijder het huidige filter</string>
-    <string name="reader_filter_self_hosted_empty_sites_tags_action">Inloggen op WordPress.com</string>
     <string name="reader_title_subs">Beheer onderwerpen &amp; sites</string>
-    <string name="reader_filter_self_hosted_empty_sites_list">Log in op WordPress.com om de laatste berichten van gevolgde sites te bekijken</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">Inloggen op WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Log in op WordPress.com om de laatste berichten van door jou gevolgde onderwerpen te zien</string>
-    <string name="gutenberg_native_template_preview">Voorbeeldweergave van sjabloon</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Log in op WordPress.com om de laatste berichten van gevolgde sites te bekijken</string>
     <string name="gutenberg_native_replace_current_block">Huidig blok vervangen</string>
     <string name="gutenberg_native_add_to_end">Toevoegen aan einde</string>
     <string name="gutenberg_native_add_to_beginning">Toevoegen aan begin</string>
     <string name="gutenberg_native_add_block_before">Blok toevoegen voor</string>
     <string name="gutenberg_native_add_block_after">Blok toevoegen na</string>
-    <string name="reader_filter_empty_sites_action">Een site volgen</string>
-    <string name="reader_filter_empty_sites_list">Bekijk de nieuwste berichten van sites die je volgt</string>
     <string name="reader_filter_empty_tags_action">Voeg een onderwerp toe</string>
+    <string name="reader_filter_empty_sites_action">Een site volgen</string>
     <string name="reader_filter_empty_tags_list">Je kunt berichten over een bepaald onderwerp volgen door een onderwerp toe te voegen</string>
+    <string name="reader_filter_empty_sites_list">Bekijk de nieuwste berichten van sites die je volgt</string>
     <string name="reader_filter_main_title">Volgen</string>
     <string name="reader_filter_cta">Filteren</string>
     <string name="gutenberg_native_video_caption_s">Videobijschrift. %s</string>
     <string name="gutenberg_native_edit_video">Video bewerken</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Tik tweemaal om lay-out te selecteren</string>
     <string name="gutenberg_native_add_a_shortcode">Een shortcode toevoegen …</string>
     <string name="post_list_author">Bericht auteur</string>
     <string name="fab_create_desc">Een bericht maken</string>
@@ -465,10 +857,8 @@ Language: nl
     <string name="stats_box_type_low">laag</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Afbeelding naar voren verplaatsen</string>
-    <string name="gutenberg_native_move_image_backward">Afbeelding naar achteren verplaatsen</string>
+    <string name="gutenberg_native_replace_image">Afbeelding vervangen</string>
     <string name="gutenberg_native_gallery_caption_s">Bijschrift galerij. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Huidige waarde is %2$s</string>
     <string name="create_post_page_fab_tooltip">Een bericht of pagina maken</string>
     <string name="content_description_person_building_website">Persoon die de website gebouwd heeft</string>
     <string name="post_signup_interstitial_not_right_now">Niet nu</string>
@@ -482,54 +872,46 @@ Language: nl
     <string name="my_site_bottom_sheet_add_post">Blogbericht</string>
     <string name="my_site_bottom_sheet_title">Nieuwe toevoegen</string>
     <string name="post_settings_publish">Publiceren</string>
-    <string name="dialog_gutenberg_informative_description_v2">We hebben grote verbeteringen aan de blokeditor aangebracht en vinden het zeker de moeite waard! De editor is ingeschakeld voor nieuwe berichten en pagina\'s. Als je toch liever de klassieke editor gebruikt, ga dan naar \'Mijn site\' > \'Site-instellingen\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Nu synchroniseren</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Dit bericht wordt onmiddellijk gesynchroniseerd.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Klaar om te synchroniseren?</string>
     <string name="new_site_creation_unavailable_domain">Dit domein is niet beschikbaar</string>
-    <string name="login_promo_viewpager_content_description">Inleiding</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">We konden geen toegang krijgen tot je site. Neem contact op met je host om dit probleem te verhelpen.</string>
-    <string name="login_discovery_error_ssl">We konden geen toegang krijgen tot je site vanwege een probleem met het &lt;b>SSL-certificaat&lt;/b>. Neem contact op met je host om dit probleem te verhelpen.</string>
-    <string name="login_discovery_error_http_auth">We konden geen toegang krijgen tot je site omdat hiervoor &lt;b>HTTP-authenticatie is vereist&lt;/b>. Neem contact op met je host om dit probleem te verhelpen.</string>
-    <string name="login_discovery_error_xmlrpc">We konden geen toegang krijgen tot het &lt;b>XMLRPC-bestand&lt;/b> op je site. Neem contact op met je host om dit probleem te verhelpen.</string>
-    <string name="login_site_credentials_magic_link_label">Bijna klaar! We hoeven nu alleen nog het e-mailadres (&lt;b>%1$s&lt;/b>) te verifiëren dat aan je Jetpack-account is gekoppeld</string>
-    <string name="enter_credentials_for_site">Inloggen met je site-inloggegevens voor %1$s.</string>
-    <string name="send_verification_email">Verificatiemail verzenden</string>
-    <string name="reader_following_display_name">Volgen</string>
+    <string name="login_discovery_error_ssl">We konden geen toegang krijgen tot je site vanwege een probleem met het &lt;b&gt;SSL-certificaat&lt;/b&gt;. Neem contact op met je host om dit probleem te verhelpen.</string>
+    <string name="login_discovery_error_http_auth">We konden geen toegang krijgen tot je site omdat hiervoor &lt;b&gt;HTTP-authenticatie is vereist&lt;/b&gt;. Neem contact op met je host om dit probleem te verhelpen.</string>
+    <string name="login_discovery_error_xmlrpc">We konden geen toegang krijgen tot het &lt;b&gt;XMLRPC-bestand&lt;/b&gt; op je site. Neem contact op met je host om dit probleem te verhelpen.</string>
+    <string name="login_site_credentials_magic_link_label">Bijna klaar! We hoeven nu alleen nog het e-mailadres (&lt;b&gt;%1$s&lt;/b&gt;) te verifiëren dat aan je Jetpack-account is gekoppeld</string>
+    <string name="enter_credentials_for_site">Inloggen met je site-referenties voor %1$s.</string>
     <string name="my_site_bottom_sheet_add_page">Site-pagina</string>
-    <string name="enter_site_credentials_instead">Inloggen met site inlog-gegevens</string>
-    <string name="posts_cannot_be_started">We kunnen de berichten momenteel niet openen. Probeer het later opnieuw</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="suffix_1_000_000_000">%s mld.</string>
-    <string name="suffix_1_000_000">%s mln.</string>
+    <string name="reader_following_display_name">Volgen</string>
+    <string name="reader_my_likes_display_name">Waarderingen</string>
+    <string name="reader_discover_display_name">Ontdek</string>
+    <string name="reader_save_for_later_display_name">Opgeslagen</string>
+    <string name="reader_filter_tags_title">Onderwerpen</string>
+    <string name="reader_filter_sites_title">Sites</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="reader_filter_sites_title">Sites</string>
-    <string name="reader_save_for_later_display_name">Opgeslagen</string>
-    <string name="reader_discover_display_name">Ontdek</string>
-    <string name="reader_my_likes_display_name">Waarderingen</string>
+    <string name="suffix_1_000_000_000">%s mld.</string>
+    <string name="suffix_1_000_000">%s mln.</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="posts_cannot_be_started">We kunnen de berichten momenteel niet openen. Probeer het later opnieuw</string>
     <string name="site_cannot_be_loaded">We kunnen op dit moment geen gegevens voor je site laden. Probeer het later opnieuw</string>
-    <string name="reader_filter_tags_title">Onderwerpen</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress-mediabibliotheek</string>
+    <string name="gutenberg_native_unsupported">Niet-ondersteund</string>
+    <string name="gutenberg_native_ungroup">Groep opheffen</string>
     <string name="gutenberg_native_translate">Vertalen</string>
-    <string name="gutenberg_native_title">Titel:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Tik om toetsenbord te verbergen</string>
-    <string name="gutenberg_native_ungroup">Groep opheffen</string>
     <string name="gutenberg_native_tap_here_to_show_help">Tik hier om help te tonen</string>
     <string name="gutenberg_native_take_a_video">Maak een video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Maak een foto of video</string>
     <string name="gutenberg_native_take_a_photo">Maak een foto</string>
     <string name="gutenberg_native_start_writing">Begin met schrijven …</string>
-    <string name="gutenberg_native_size">Afmetingen</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Sidebartitel-plugin</string>
     <string name="gutenberg_native_show_section">Sectie tonen</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s-blok. Dit blok bevat ongeldige inhoud</string>
     <string name="gutenberg_native_s_block_empty">%s-blok. Leegmaken</string>
-    <string name="gutenberg_native_reset_block">Blok resetten</string>
     <string name="gutenberg_native_cut_block">Blok knippen</string>
-    <string name="gutenberg_native_remove_annotations">Aantekeningen verwijderen</string>
     <string name="gutenberg_native_problem_opening_the_video">Probleem bij het openen van de video</string>
     <string name="gutenberg_native_problem_displaying_block">Probleem bij het weergeven van het blok</string>
     <string name="gutenberg_native_post_title_s">Berichttitel. %s</string>
@@ -539,17 +921,12 @@ Language: nl
     <string name="gutenberg_native_open_settings">Open Instellingen</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Er is geen toepassing die deze aanvraag kan verwerken. Installeer een webbrowser.</string>
     <string name="gutenberg_native_navigate_up">Omhoog navigeren</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Mijn venster voor pre-publicatie</string>
-    <string name="gutenberg_native_my_post_status_info">Mijn berichtstatusinformatie</string>
-    <string name="gutenberg_native_my_post_publish_panel">Mijn venster voor publicatie van berichten</string>
-    <string name="gutenberg_native_my_document_setting_panel">Mijn venster met documentinstellingen</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Blok omhoog bewegen van rij %1$s naar rij %2$s</string>
     <string name="gutenberg_native_move_block_up">Blok omhoog verplaatsen</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Blok omlaag bewegen van rij %1$s naar rij %2$s</string>
     <string name="gutenberg_native_move_block_down">Blok omlaag verplaatsen</string>
     <string name="gutenberg_native_image_caption_s">Afbeelding vastleggen. %s</string>
     <string name="gutenberg_native_hide_keyboard">Toetsenbord verbergen</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Dit is de inhoud van het venster!</string>
     <string name="gutenberg_native_help_icon">Help-pictogram</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Invoegen van media mislukt.\nTik voor opties.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Tik tweemaal om laatste wijziging ongedaan te maken</string>
@@ -561,34 +938,28 @@ Language: nl
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Tik tweemaal om het blok omhoog te verplaatsen</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Tik tweemaal om het blok omlaag te verplaatsen</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Tik tweemaal om deze waarde te bewerken</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Tik tweemaal om de waarde te wijzigen met behulp van de schuifbalk</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Tik tweemaal om een blok toe te voegen</string>
     <string name="gutenberg_native_current_value_is_s">Huidige waarde is %s</string>
-    <string name="gutenberg_native_content">Inhoud…</string>
     <string name="gutenberg_native_choose_from_device">Kiezen op apparaat</string>
-    <string name="gutenberg_native_annotations_sidebar">Sidebar met opmerkingen</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Er is een onbekende fout opgetreden. Probeer het nog eens.</string>
     <string name="gutenberg_native_alt_text">Alt. tekst</string>
     <string name="gutenberg_native_add_video">VIDEO TOEVOEGEN</string>
     <string name="gutenberg_native_add_url">URL toevoegen</string>
+    <string name="gutenberg_native_add_alt_text">Alt tekst toevoegen</string>
     <string name="gutenberg_native_add_image_or_video">AFBEELDING OF VIDEO TOEVOEGEN</string>
     <string name="gutenberg_native_add_image">AFBEELDING TOEVOEGEN</string>
     <string name="gutenberg_native_add_block_here">BLOK HIER TOEVOEGEN</string>
-    <string name="gutenberg_native_add_annotation">Opmerking toevoegen</string>
-    <string name="gutenberg_native_add_a_description">Een beschrijving toevoegen</string>
     <string name="reader_empty_saved_posts_content_description">Tik op de knop \'Toevoegen om berichten op te slaan\' om een bericht op te slaan in je lijst.</string>
     <string name="reader_acessibility_list_loaded">\"De lijst is geladen met %1$d items.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Meldingen</string>
-    <string name="master_switch_default_title_off">Uit</string>
-    <string name="master_switch_default_title_on">Aan</string>
-    <string name="notifications_tab_dialog_master_off_message">Door meldingen voor deze site uit te schakelen, worden meldingen op het meldingentabblad van deze site uitgeschakeld. Je kunt zelf bepalen welke soorten meldingen moeten worden weergegeven nadat je meldingen voor deze site inschakelt.</string>
-    <string name="notifications_tab_dialog_master_off_title">Om meldingen op het meldingentabblad voor deze site te bekijken, moet je meldingen voor deze site inschakelen.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Weergave van meldingen op het meldingentabblad van deze site inschakelen</string>
-    <string name="notifications_tab_dialog_master_hint_on">Weergave van meldingen op het meldingentabblad van deze site uitschakelen</string>
-    <string name="notifications_tab_dialog_master_status_off">Meldingen voor deze site</string>
-    <string name="notifications_tab_dialog_master_status_on">Meldingen voor deze site</string>
-    <string name="dialog_gutenberg_informative_description_page">Je gebruikt nu de blok editor voor nieuwe pagina\'s, geweldig! Als je toch liever de klassieke editor gebruikt, ga dan naar \'Mijn site\' > \'Site instellingen\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">Je gebruikt nu de blokeditor voor nieuwe berichten,geweldig! Als je toch liever de klassieke editor gebruikt, ga dan naar \'Mijn site\' > \'Site instellingen\'.</string>
+    <string name="main_switch_default_title_off">Uit</string>
+    <string name="main_switch_default_title_on">Aan</string>
+    <string name="notifications_tab_dialog_main_off_message">Als je Meldingen voor deze site uitschakelt, wordt de weergave van meldingen op het tab Meldingen voor deze site uitgeschakeld. Je kunt afstemmen welk soort melding je ziet nadat je Meldingen voor deze site hebt ingeschakeld.</string>
+    <string name="notifications_tab_dialog_main_off_title">Om meldingen op de tab Meldingen voor deze site te zien, schakel Meldingen voor deze site in.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Schakel de weergave van meldingen in op de tab Meldingen voor deze site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Schakel de weergave van meldingen op de tab Meldingen voor deze site uit</string>
+    <string name="notifications_tab_dialog_main_status_off">Meldingen voor deze site</string>
+    <string name="notifications_tab_dialog_main_status_on">Meldingen voor deze site</string>
     <string name="pick_media">Afbeelding of video toevoegen</string>
     <string name="error_post_not_submitted_retrying">We konden dit bericht niet inzenden voor beoordeling, maar we proberen het later nog eens. </string>
     <string name="error_post_not_scheduled_retrying">We konden dit bericht niet inplannen, maar we proberen het later nog eens.</string>
@@ -681,21 +1052,19 @@ Language: nl
     <string name="post_settings_add_to_calendar">Toevoegen aan agenda</string>
     <string name="post_settings_notification">Melding</string>
     <string name="post_settings_time_and_date">Datum en tijd</string>
-    <string name="login_need_help_finding_connected_email">Heb je hulp nodig bij het vinden van de e-mail waarmee je hebt ingelogd?</string>
-    <string name="enter_wordpress_site">De website op dit adres is geen WordPress-site. Om er verbinding mee te kunnen maken, moet WordPress geïnstalleerd zijn.</string>
     <string name="login_invalid_site_url">Voer een compleet websiteadres in, zoals example.com.</string>
-    <string name="stats_post_label">Bericht</string>
-    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
-    <string name="site_settings_editor">Editor</string>
-    <string name="stats_expand_content_description">Uitklappen</string>
-    <string name="stats_collapse_content_description">Inklappen</string>
     <string name="enter_email_for_site">Log in met WordPress.com om verbinding te maken met %1$s</string>
     <string name="stats_post_views_label">Weergaven</string>
+    <string name="stats_post_label">Bericht</string>
+    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
     <string name="stats_item_collapsed">Item ingeklapt</string>
     <string name="stats_item_expanded">Item uitgevouwen</string>
+    <string name="stats_collapse_content_description">Inklappen</string>
+    <string name="stats_expand_content_description">Uitklappen</string>
     <string name="stats_graph_updated">Grafiek bijgewerkt.</string>
     <string name="stats_overview_content_description">%1$s %2$s voor periode: %3$s, wijziging ten opzichte van vorige periode - %4$s</string>
     <string name="stats_loading_card">Geselecteerde kaartgegevens aan het laden</string>
+    <string name="site_settings_editor">Editor</string>
     <string name="description_expand">Uitklappen</string>
     <string name="description_collapse">Inklappen</string>
     <string name="my_site_verify_your_email_without_email">Je e-mail verifiëren: er zijn instructies naar je e-mailadres verzonden.</string>
@@ -709,14 +1078,16 @@ Language: nl
     <string name="post_settings_featured_image_uploading_tap_for_options">Media worden geüpload.\nTik voor opties.</string>
     <string name="link_open_new_window">Open koppeling in een nieuw venster/tab</string>
     <string name="stats_widget_error_no_access_token">Log in op je WordPress.com-account om je statistieken te bekijken.</string>
+    <string name="post_list_search_nothing_found">Geen berichten voldoen aan je zoekopdracht</string>
     <string name="post_list_search_prompt">Berichten zoeken</string>
     <string name="domains_suggestions_intro_description">Dit is waar mensen je op internet zullen vinden.</string>
-    <string name="post_list_search_nothing_found">Geen berichten voldoen aan je zoekopdracht</string>
     <string name="domains_suggestions_intro_title">Kies een premium domeinnaam</string>
     <string name="my_site_custom_domain_name">Alle WordPress.com abonnementen bevatten een eigen domeinnaam. Registreer nu je gratis premium domein.</string>
-    <string name="stats_widget_today_insights_name">Vandaag</string>
     <string name="stats_widget_minified_name">In een oogopslag</string>
+    <string name="stats_widget_today_insights_name">Vandaag</string>
     <string name="stats_widget_all_time_insights_name">All-time</string>
+    <string name="stats_widget_weekly_views_name">Bezichtigingen deze week</string>
+    <string name="stats_widget_log_in_message">Meld je aan bij de WordPress app om een widget toe te voegen.</string>
     <string name="stats_widget_error_no_network">Geen netwerk beschikbaar</string>
     <string name="stats_widget_error_no_data">Kan gegevens niet laden</string>
     <string name="stats_widget_select_type">Type</string>
@@ -727,11 +1098,9 @@ Language: nl
     <string name="stats_widget_color">Kleur</string>
     <string name="stats_widget_site_caption">Selecteer je site</string>
     <string name="stats_widget_site">Site</string>
-    <string name="stats_widget_weekly_views_name">Bezichtigingen deze week</string>
-    <string name="stats_widget_log_in_message">Meld je aan bij de WordPress app om een widget toe te voegen.</string>
-    <string name="stats_widget_add">Widget toevoegen</string>
-    <string name="stats_widget_views_title">Bezichtingen deze week</string>
     <string name="stats_widget_all_time_title">All-time</string>
+    <string name="stats_widget_views_title">Bezichtingen deze week</string>
+    <string name="stats_widget_add">Widget toevoegen</string>
     <string name="plugin_fetching_error_after_at">Het duurt langer dan normaal om de details van plugins te vernieuwen. Controleer later opnieuw.</string>
     <string name="plugin_install_site_ineligible_default_error">Als je zojuist een domeinnaam hebt geregistreerd, wacht je even tot we klaar zijn met het instellen en het opnieuw proberen.\n\nZo niet, dan ziet het eruit alsof er iets fout is gegaan en is de plugin functie mogelijk niet beschikbaar voor deze site.</string>
     <string name="domain_contact_information_state_not_available_hint">Status (niet beschikbaar)</string>
@@ -748,7 +1117,7 @@ Language: nl
     <string name="domain_registration_state_picker_dialog_title">Selecteer provincie</string>
     <string name="domain_registration_country_picker_dialog_title">Selecteer land</string>
     <string name="domain_registration_result_continue_button">doorgaan</string>
-    <string name="domain_registration_result_description">je nieuwe domein &lt;b>%s&lt;/b> wordt ingesteld. Je site\n maakt salto\'s uit vreugde!</string>
+    <string name="domain_registration_result_description">je nieuwe domein &lt;b&gt;%s&lt;/b&gt; wordt ingesteld. Je site\n maakt salto\'s uit vreugde!</string>
     <string name="domain_registration_result_title">Gefeliciteerd</string>
     <string name="domain_contact_information_register_domain_button">Registreer domein</string>
     <string name="domain_contact_information_postal_code_hint">Postcode</string>
@@ -784,11 +1153,11 @@ Language: nl
     <string name="stats_insights_social">Sociaal</string>
     <string name="stats_insights_annual_site_stats">Jaarlijkse sitestatistieken</string>
     <string name="stats_view_follower_totals">Aantal volgers</string>
+    <string name="domain_suggestions_fetch_error">Domein suggesties konden niet geladen worden</string>
+    <string name="domain_suggestions_search_hint">Type een trefwoord voor meer ideeën</string>
     <string name="domains_suggestions_empty_list">Geen suggesties gevonden</string>
     <string name="register_domain">Registreer domein</string>
     <string name="jetpack_installed_message">Nu Jetpack is geïnstalleerd, hoeven we er alleen nog voor te zorgen dat alles goed ingesteld is. Dit duurt maar heel even.</string>
-    <string name="domain_suggestions_fetch_error">Domein suggesties konden niet geladen worden</string>
-    <string name="domain_suggestions_search_hint">Type een trefwoord voor meer ideeën</string>
     <string name="stats_menu_remove">Verwijderen uit inzichten</string>
     <string name="stats_menu_move_down">Omlaag verplaatsen</string>
     <string name="stats_menu_move_up">Omhoog verplaatsen</string>
@@ -797,8 +1166,8 @@ Language: nl
     <string name="post_restoring">Bericht wordt hersteld</string>
     <string name="post_restored">Bericht hersteld</string>
     <string name="post_trashing">Bericht wordt naar prullenbak verplaatst</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Lokale wijzigingen</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Door dit bericht naar de prullenbak te verplaatsen, worden niet bewaarde wijzigingen genegeerd. Weet je zeker dat je wil doorgaan?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Lokale wijzigingen</string>
     <string name="button_move_to_draft">Verplaatsen naar concept</string>
     <string name="post_list_toggle_item_layout_list_view">Overschakelen op lijstweergave</string>
     <string name="post_list_toggle_item_layout_cards_view">Overschakelen op kaartweergave</string>
@@ -808,15 +1177,15 @@ Language: nl
     <string name="posts_published_empty">Je hebt nog geen berichten gepubliceerd</string>
     <string name="notification_wpcom_username_needed">Log in met je gebruikersnaam en wachtwoord.</string>
     <string name="error_user_username_instead_of_email">Log in met je WordPress.com-gebruikersnaam in plaats van met je e-mailadres.</string>
-    <string name="stats_insights_posts">Berichten</string>
-    <string name="stats_insights_year">Jaar</string>
-    <string name="stats_insights_this_year_site_stats">Dit jaar</string>
     <string name="stats_insights_average_words">Gemiddeld aantal woorden per bericht</string>
     <string name="stats_insights_total_words">Totaalaantal woorden</string>
     <string name="stats_insights_average_likes">Gemiddeld aantal likes per bericht</string>
     <string name="stats_insights_total_likes">Totaalaantal likes</string>
     <string name="stats_insights_average_comments">Gemiddeld aantal reacties per bericht</string>
     <string name="stats_insights_total_comments">Totaalaantal reacties</string>
+    <string name="stats_insights_posts">Berichten</string>
+    <string name="stats_insights_year">Jaar</string>
+    <string name="stats_insights_this_year_site_stats">Dit jaar</string>
     <string name="no_site_error">De site op dit adres is geen WordPress-site. Om er verbinding mee te kunnen maken, moet de site gebruikmaken van WordPress.</string>
     <string name="plugin_check_domain_credit_error">Fout bij het controleren van beschikbaar domeinkrediet</string>
     <string name="plugin_check_domain_credits_progress_dialog_message">Domeinkrediet wordt gecontroleerd</string>
@@ -855,42 +1224,33 @@ Language: nl
     <string name="plans_loading_error_no_plans_subtitle">We kunnen abonnementen momenteel niet laden. Probeer het later opnieuw.</string>
     <string name="plans_loading_error_no_plans_title">Abonnementen kunnen niet worden geladen</string>
     <string name="plans_loading_error_network_title">Geen verbinding</string>
+    <string name="menu_switch_to_gutenberg_editor">Overschakelen naar de blok-editor</string>
     <string name="stats_loading_block_error">Er is een probleem opgetreden bij het laden van je gegevens. Vernieuw je pagina om het opnieuw te proberen.</string>
     <string name="stats_loading_error">Gegevens niet geladen</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Bewerk nieuwe berichten en pagina\'s met de blok-editor</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Blok-editor gebruiken</string>
-    <string name="menu_switch_to_gutenberg_editor">Overschakelen naar de blok-editor</string>
-    <string name="menu_switch_to_aztec_editor">Overschakelen naar de klassieke editor</string>
-    <string name="dialog_gutenberg_informative_title">Blok-editor ingeschakeld</string>
     <string name="exit">afsluiten</string>
     <string name="quick_start_sites_type_subtitle">%1$d van %2$d voltooid</string>
-    <string name="quick_start_sites_type_grow">Verhoog je bezoekersaantallen</string>
-    <string name="quick_start_sites_type_customize">Je site aanpassen</string>
+    <string name="quick_start_sites_type_grow">Breid je publiek uit</string>
+    <string name="quick_start_sites_type_customize">Pas je site aan</string>
     <string name="quick_start_sites">Volgende stappen</string>
     <string name="quick_start_complete_tasks_header">Voltooi (%d)</string>
     <string name="quick_start_dialog_view_site_message">Veel plezier met je voltooide product!</string>
     <string name="quick_start_dialog_upload_icon_title">Upload een favicon</string>
     <string name="quick_start_dialog_upload_icon_message">Je bezoekers zien je pictogram in hun browser. Voeg een aangepast pictogram toe voor een stijlvolle, professionele look.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Tik op %1$s Abonnement %2$s om je huidige abonnement en andere beschikbare abonnementen in te zien</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tik op %1$s Pagina toevoegen %2$s om een nieuwe pagina aan te maken.</string>
     <string name="quick_start_dialog_check_stats_message_short">Tik op %1$s Statistieken %2$s om te zien hoe je site presteert.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tik op %1$s Jouw favicon %2$s om een nieuwe te uploaden</string>
     <string name="quick_start_dialog_publish_post_message">Stel je eerste bericht op en publiceer het.</string>
     <string name="quick_start_dialog_need_help_message">Wij brengen je de basis bij voor het bouwen en laten groeien van je site.</string>
     <string name="quick_start_dialog_migration_title">We hebben wat wijzigingen aangebracht aan je checklist</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Tik op %1$s pagina\'s %2$s om verder te gaan.</string>
     <string name="quick_start_dialog_migration_message">We hebben wat taken toegevoegd om je te helpen je bezoekersaantallen te vergroten.</string>
     <string name="quick_start_dialog_explore_plans_title">Abonnementen verkennen</string>
     <string name="quick_start_dialog_explore_plans_message">Bekijk meer informatie over de marketing- en SEO-tools van onze betaalde abonnementen.</string>
     <string name="quick_start_dialog_enable_sharing_title">Berichten delen inschakelen</string>
     <string name="quick_start_dialog_enable_sharing_message">Deel nieuwe berichten automatisch op je socialmedia-accounts.</string>
-    <string name="quick_start_dialog_customize_site_message">Lettertypes afstemmen, afbeeldingen toevoegen en meer.</string>
-    <string name="quick_start_dialog_create_page_title">Een nieuwe pagina maken</string>
-    <string name="quick_start_dialog_create_page_message">Voeg een pagina voor belangrijke content toe; een pagina \'Over\' is een goed begin.</string>
     <string name="quick_start_dialog_check_stats_title">Controleer je site-statistieken</string>
     <string name="quick_start_dialog_check_stats_message">Houd de prestaties van je site bij.</string>
-    <string name="quick_start_dialog_browse_themes_title">Blader door thema’s</string>
-    <string name="quick_start_dialog_browse_themes_message">Verken tientallen opties voor de lay-out en vind jouw perfecte match.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Door \'Volgende stappen\' te verwijderen, worden alle rondleidingen op deze site verborgen. Deze actie kan niet ongedaan worden gemaakt.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Volgende stappen verwijderen</string>
     <string name="quick_start_remove_next_steps_menu_title">Verwijder dit</string>
@@ -906,79 +1266,82 @@ Language: nl
     <string name="stats_insights_popular">Populairste tijd</string>
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
+    <string name="new_site_creation_site_preview_content_description">Toont site voorbeeld</string>
+    <string name="new_site_creation_clear_all_content_description">Wissen</string>
+    <string name="site_created_but_not_fetched_snackbar_message">Het lijkt er op dat je op een trage verbinding zit. Als je je nieuwe site niet in de lijst ziet, ververs dan je scherm.</string>
+    <string name="cancel_new_site_wizard_content_description">Annuleer  site aanmaak wizard</string>
+    <string name="notification_new_site_creation_creating_site_subtitle">We maken je nieuwe site</string>
     <string name="notification_new_site_creation_failed">Er was een probleem</string>
     <string name="notification_new_site_creation_title">Maak een site</string>
     <string name="new_site_creation_create_site_button">Maak een site</string>
     <string name="new_site_creation_domain_header_subtitle">Dit is waar mensen je op internet zullen vinden .</string>
-    <string name="new_site_creation_clear_all_content_description">Wissen</string>
-    <string name="new_site_creation_search_domain_input_hint">Domeinen zoeken</string>
-    <string name="notification_new_site_creation_creating_site_subtitle">We maken je nieuwe site</string>
-    <string name="cancel_new_site_wizard_content_description">Annuleer  site aanmaak wizard</string>
-    <string name="new_site_creation_site_preview_content_description">Toont site voorbeeld</string>
-    <string name="site_created_but_not_fetched_snackbar_message">Het lijkt er op dat je op een trage verbinding zit. Als je je nieuwe site niet in de lijst ziet, ververs dan je scherm.</string>
     <string name="new_site_creation_empty_domain_list_message">Geen beschikbare adressen die overeenkomen met uw  zoekopdracht</string>
     <string name="site_creation_error_generic_subtitle">Fout bij communicatie met de server. Probeer het opnieuw</string>
     <string name="site_creation_error_generic_title">Er was een probleem</string>
-    <string name="new_site_creation_domain_header_title">Kies een domeinnaam voor je site</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Er was een probleem</string>
-    <string name="site_creation_segments_subtitle">Hiermee kunnen aanbevelingen maken. Maar je zit nergens aan vast - alle sites blijven zich ontwikkelen!</string>
-    <string name="site_creation_segments_title">Vertel ons wat voor soort site je zou willen maken</string>
+    <string name="new_site_creation_preview_title">Je site is gemaakt!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d van %2$d</string>
     <string name="new_site_creation_screen_title_general">Maak een site</string>
     <string name="suggestions_updated_content_description">Suggesties bijgewerkt</string>
     <string name="site_picker_failed_selecting_added_site">Kan de nieuw toegevoegde zelf-gehoste site niet selecteren .</string>
-    <string name="new_site_creation_preview_title">Je site is gemaakt!</string>
     <string name="local_post_is_conflicted">Versie conflict</string>
     <string name="preference_crash_reports_summary">Sta automatische crashrapporten toe om ons te helpen de prestaties van de app te verbeteren.</string>
     <string name="preference_crash_reports">Crash-rapporten</string>
-    <string name="dialog_confirm_load_remote_post_discard_web">Negeer web</string>
     <string name="snackbar_conflict_undo">Ongedaan maken</string>
-    <string name="toast_conflict_updating_post">Bericht updaten</string>
     <string name="snackbar_conflict_web_version_discarded">Webversie genegeerd</string>
     <string name="snackbar_conflict_local_version_discarded">Lokale versie genegeerd</string>
-    <string name="dialog_confirm_load_remote_post_body">Dit bericht heeft twee versies die met elkaar in conflict zijn. Selecteer de versie die u wilt negeren. \n \n\n</string>
-    <string name="dialog_confirm_load_remote_post_title">Sync conflict oplossen</string>
+    <string name="toast_conflict_updating_post">Bericht updaten</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Negeer web</string>
     <string name="dialog_confirm_load_remote_post_discard_local">Negeer lokaal</string>
     <string name="dialog_confirm_load_remote_post_body_2">Lokaal \nOpgeslagen op%s\nWeb\nOpgeslagen op%s\n</string>
+    <string name="dialog_confirm_load_remote_post_body">Dit bericht heeft twee versies die met elkaar in conflict zijn. Selecteer de versie die u wilt negeren. \n \n\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Sync conflict oplossen</string>
     <string name="stats_no_data_for_period">Geen gegevens voor deze periode</string>
     <string name="preference_strip_image_location">Locatie van media verwijderen</string>
     <string name="stats_cannot_be_started">We kunnen de statistieken momenteel niet openen. Probeer het later opnieuw</string>
+    <string name="gif_picker_endless_scroll_network_error">Sommige media kon niet worden geladen vanwege een netwerk fout .</string>
+    <string name="gif_picker_empty_search_list">Geen media die overeenkomen met uw  zoekopdracht</string>
+    <string name="gif_picker_initial_empty_text">Zoeken om GIF\'s te vinden die je aan  je mediabibliotheek kunt toevoegen !</string>
+    <string name="stats_author_views_label">Weergaven</string>
     <string name="stats_author_label">Auteur</string>
     <string name="stats_authors">Auteurs</string>
+    <string name="stats_search_terms_views_label">Keer bekeken</string>
+    <string name="stats_search_terms_label">Zoekterm</string>
+    <string name="stats_search_terms">Zoektermen</string>
+    <string name="stats_videos_views_label">Keer bekeken</string>
     <string name="stats_videos_title_label">Titel</string>
-    <string name="stats_clicks">Kliks</string>
-    <string name="stats_clicks_label">Kliks</string>
+    <string name="stats_videos">Videos</string>
+    <string name="stats_country_views_label">Keer bekeken</string>
     <string name="stats_country_label">Land</string>
     <string name="stats_countries">Landen</string>
+    <string name="stats_clicks_label">Kliks</string>
+    <string name="stats_clicks_link_label">Link</string>
+    <string name="stats_clicks">Kliks</string>
+    <string name="stats_referrer_views_label">Keer bekeken</string>
+    <string name="stats_referrer_label">Verwijzer</string>
+    <string name="stats_referrers">Verwijzers</string>
+    <string name="stats_posts_and_pages">Berichten en pagina\'s</string>
     <string name="stats_insights_path">Path</string>
     <string name="stats_insights_linkedin">LinkedIn</string>
     <string name="stats_insights_google_plus">Google+</string>
     <string name="stats_insights_tumblr">Tumblr</string>
     <string name="stats_insights_twitter">Twitter</string>
     <string name="stats_insights_facebook">Facebook</string>
-    <string name="stats_posts_and_pages">Berichten en pagina\'s</string>
-    <string name="stats_search_terms_label">Zoekterm</string>
-    <string name="stats_search_terms">Zoektermen</string>
-    <string name="stats_clicks_link_label">Link</string>
-    <string name="gif_picker_empty_search_list">Geen media die overeenkomen met uw  zoekopdracht</string>
-    <string name="stats_search_terms_views_label">Keer bekeken</string>
-    <string name="stats_videos_views_label">Keer bekeken</string>
-    <string name="stats_videos">Videos</string>
-    <string name="stats_country_views_label">Keer bekeken</string>
-    <string name="stats_referrer_views_label">Keer bekeken</string>
+    <string name="stats_insights_view_more">Meer weergeven</string>
     <string name="stats_insights_share_post">Deel bericht</string>
     <string name="stats_insights_create_post">Maak bericht</string>
-    <string name="stats_author_views_label">Weergaven</string>
-    <string name="stats_insights_view_more">Meer weergeven</string>
     <string name="stats_insights_latest_post_message">Het is %1$s geleden sinds %2$s is gepubliceerd. Hier zie je hoe het bericht het tot nu toe heeft gedaan …</string>
-    <string name="gif_picker_endless_scroll_network_error">Sommige media kon niet worden geladen vanwege een netwerk fout .</string>
-    <string name="stats_referrer_label">Verwijzer</string>
-    <string name="stats_referrers">Verwijzers</string>
-    <string name="gif_picker_initial_empty_text">Zoeken om GIF\'s te vinden die je aan  je mediabibliotheek kunt toevoegen !</string>
+    <string name="stats_insights_latest_post_with_no_engagement">Het is %1$s sinds %2$s is gepubliceerd. Krijg de bal aan het rollen en verhoog het bekijken van je berichten door het delen van je berichten:</string>
+    <string name="stats_insights_latest_post_empty">Je hebt nog geen berichten gepubliceerd. Zodra je begint met publiceren, verschijnt hier de samenvatting van je laatste bericht:</string>
     <string name="stats_insights_tags_and_categories">Tags en categorieën</string>
     <string name="stats_insights_all_time_stats">All-time</string>
-    <string name="stats_insights_latest_post_empty">Je hebt nog geen berichten gepubliceerd. Zodra je begint met publiceren, verschijnt hier de samenvatting van je laatste bericht:</string>
-    <string name="stats_insights_latest_post_with_no_engagement">Het is %1$s sinds %2$s is gepubliceerd. Krijg de bal aan het rollen en verhoog het bekijken van je berichten door het delen van je berichten:</string>
+    <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
+    <string name="stats_publicize_followers_label">Volgers</string>
+    <string name="stats_publicize_service_label">Dienst</string>
+    <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_tags_and_categories_views_label">Keer bekeken</string>
+    <string name="stats_tags_and_categories_title_label">Titel</string>
+    <string name="stats_posts_and_pages_views_label">Keer bekeken</string>
     <string name="stats_posts_and_pages_title_label">Titel</string>
     <string name="stats_comments_label">Reacties</string>
     <string name="stats_comments_title_label">Titel</string>
@@ -990,16 +1353,9 @@ Language: nl
     <string name="stats_followers_count_message">Totaal %1$s volgers: %2$s</string>
     <string name="stats_followers_email">E-mail</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="stats_tags_and_categories_title_label">Titel</string>
-    <string name="stats_category_folded_name">%1$s | %2$s</string>
-    <string name="stats_publicize_followers_label">Volgers</string>
-    <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
-    <string name="stats_tags_and_categories_views_label">Keer bekeken</string>
-    <string name="stats_posts_and_pages_views_label">Keer bekeken</string>
     <string name="stats_manage_insights">Beheer inzichten</string>
-    <string name="stats_publicize_service_label">Dienst</string>
-    <string name="stats_no_data_yet">Nog geen gegevens</string>
     <string name="stats_empty_insights_title">Er zijn nog geen insights toegevoegd</string>
+    <string name="stats_no_data_yet">Nog geen gegevens</string>
     <string name="menu_debug">Debug-menu</string>
     <string name="change_password_dialog_message">Wachtwoord wordt gewijzigd …</string>
     <string name="change_password_dialog_hint">Je wachtwoord moet tenminste zes tekens bevatten. Als je het wachtwoord sterker wilt maken, gebruik dan hoofdletters en kleine letters, cijfers en symbolen zoals ! \" ? $ % ^ &amp; ).</string>
@@ -1028,8 +1384,8 @@ Language: nl
     <string name="image_size_medium_label">Gemiddeld</string>
     <string name="image_size_thumbnail_label">Miniatuur</string>
     <string name="menu_history">Geschiedenis</string>
-    <string name="pages_pending">Beoordeling in behandeling</string>
     <string name="pages_open_page_error">De geselecteerde pagina is niet beschikbaar</string>
+    <string name="pages_pending">Beoordeling in behandeling</string>
     <string name="pages_empty_trashed">Je hebt geen verwijderde pagina\'s</string>
     <string name="pages_empty_scheduled">Je hebt geen geplande pagina\'s</string>
     <string name="pages_empty_drafts">Je hebt geen concept-pagina\'s</string>
@@ -1068,43 +1424,37 @@ Language: nl
     <string name="quick_start_dialog_view_site_message_short">Tik op %1$s Site bekijken %2$s om een voorbeeld te zien van je site</string>
     <string name="quick_start_dialog_share_site_title">Je site delen</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">Tik op %1$s Delen %2$s om door te gaan</string>
-    <string name="quick_start_dialog_share_site_message">Koppel je site aan je social media-accounts en je site zal nieuwe berichten automatisch delen.</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Tik op %1$s Verbindingen %2$s om je socialmedia-accounts toe te voegen</string>
+    <string name="quick_start_dialog_share_site_message">Koppel je site aan je social media-accounts en je site zal nieuwe berichten automatisch delen.</string>
     <string name="quick_start_dialog_publish_post_title">Een bericht publiceren</string>
     <string name="quick_start_dialog_publish_post_message_short">Tik op %1$s Bericht aanmaken %2$s om een nieuw bericht aan te maken</string>
     <string name="quick_start_dialog_need_help_title">Heb je hulp nodig om aan de slag te kunnen gaan?</string>
     <string name="quick_start_dialog_need_help_button_positive">Accepteer</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nooit</string>
+    <string name="quick_start_dialog_need_help_button_negative">Nee dank je</string>
     <string name="quick_start_dialog_follow_sites_title">Andere sites volgen</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tik op %1$s Zoeken %2$s om te zoeken naar sites met dezelfde interesses</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tik op %1$s Zoeken %2$s om te zoeken naar sites met dezelfde onderwerpen</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tik op %1$s Reader %2$s om door te gaan</string>
-    <string name="quick_start_dialog_customize_site_title">Je site aanpassen</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tik op %1$s Thema\'s %2$s om door te gaan</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tik op %1$s Aanpassen %2$s om je site te personaliseren</string>
-    <string name="quick_start_dialog_need_help_button_negative">Nee dank je</string>
     <string name="quick_start_dialog_follow_sites_message">Ontdek sites die je aanspreken en volg ze om updates te ontvangen wanneer nieuwe inhoud wordt gepost.</string>
-    <string name="quick_start_dialog_choose_theme_title">Kies een thema</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tik op %1$s Thema\'s %2$s om nieuwe thema\'s te ontdekken</string>
-    <string name="quick_start_dialog_choose_theme_message">Blader door al onze thema\'s om het thema te vinden dat perfect bij je past.</string>
     <string name="quick_start_button_positive">Starten</string>
     <string name="quick_start_button_negative_short">Annuleren</string>
     <string name="quick_start_button_negative">Niet nu</string>
-    <string name="my_site_create_new_site_title">Je hebt geen sites</string>
     <string name="content_description_more">Meer</string>
+    <string name="my_site_create_new_site_title">Je hebt geen sites</string>
     <string name="reader_empty_followed_tags_title">Geen gevolgde onderwerpen</string>
     <string name="reader_empty_followed_tags_subtitle">Voeg hier onderwerpen toe om berichten te vinden over je favoriete onderwerpen</string>
     <string name="login_to_to_connect_jetpack">Log in op het WordPress.com-account dat je gebruikte om verbinding te maken met Jetpack.</string>
     <string name="install_jetpack_retry">Opnieuw proberen</string>
+    <string name="install_jetpack_continue">Instellen</string>
+    <string name="jetpack_installation_problem_message">Jetpack kan momenteel niet geïnstalleerd worden.</string>
     <string name="jetpack_installation_problem">Er is een probleem opgetreden</string>
     <string name="jetpack_installed">Jetpack geïnstalleerd</string>
+    <string name="installing_jetpack_message">Jetpack installeren op je site. Het kan een aantal minuten duren voordat de installatie is afgerond.</string>
     <string name="installing_jetpack">Jetpack installeren</string>
+    <string name="install_jetpack_message">Je site-referenties zullen niet worden opgeslagen en worden alleen gebruikt om Jetpack te installeren.</string>
     <string name="install_jetpack">Jetpack installeren</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">Veelgestelde vragen Jetpack</string>
-    <string name="install_jetpack_continue">Instellen</string>
-    <string name="jetpack_installation_problem_message">Jetpack kan momenteel niet geïnstalleerd worden.</string>
-    <string name="installing_jetpack_message">Jetpack installeren op je site. Het kan een aantal minuten duren voordat de installatie is afgerond.</string>
-    <string name="install_jetpack_message">De inloggegevens voor je site zullen niet worden opgeslagen en worden alleen gebruikt om Jetpack te installeren.</string>
     <string name="stats_jetpack_connection_setup_info">Installeer de Jetpack-plugin om statistieken voor je WordPress-site te gebruiken.</string>
     <string name="themes_empty_list">Er komen geen thema\'s overeen met je zoekopdracht</string>
     <string name="reader_label_post_search_explainer">Waar ben je naar op zoek?</string>
@@ -1149,15 +1499,13 @@ Language: nl
     <string name="support_contact_email">E-mail voor contact</string>
     <string name="application_log_button">Toepassingslog</string>
     <string name="my_tickets">Mijn tickets</string>
-    <string name="activity_log_rewind_site">Site terugbrengen</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Bezig met terugzetten</string>
-    <string name="activity_log_rewind_dialog_message">Weet je zeker dat je je site wilt terugbrengen naar %1$s op %2$s? Hierdoor wordt alle inhoud en worden alle opties verwijderd die sindsdien zijn aangemaakt of gewijzigd.</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Terugzetten in bewerking</string>
     <string name="activity_log_currently_restoring_message">Terugzetten naar %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Je site wordt momenteel hersteld</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Het herstellen van je site is geslaagd</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Je site is met succes teruggezet.\nTeruggezet naar %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Je site wordt teruggezet\nTerugzetten naar %1$s %2$s</string>
     <string name="activity_log_button">Actieknop Activiteitenlog</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Het herstellen van je site is geslaagd\nTeruggezet naar %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Je site wordt hersteld\nTerugzetten naar %1$s %2$s</string>
     <string name="plugin_auto_managed">Automatisch beheerd</string>
     <string name="reader_save_posts_locally_dialog_message">Sla dit bericht op en keer op elk gewenst moment terug om het te lezen. Het bericht is alleen op dit apparaat beschikbaar; opgeslagen berichten worden niet gesynchroniseerd met andere apparaten.</string>
     <string name="reader_save_posts_locally_dialog_title">Berichten opslaan voor later</string>
@@ -1166,24 +1514,20 @@ Language: nl
     <string name="comment_read_source_post">Lees het oorspronkelijke bericht</string>
     <string name="sites">Sites</string>
     <string name="signup_magic_link_title">Magische link verzonden</string>
-    <string name="signup_email_screen_title">Aanmelden via E-mail</string>
     <string name="verification_2fa_screen_title">Code verificatie</string>
     <string name="selfhosted_site_login_title">Login referenties</string>
     <string name="magic_link_sent_login_title">Magische link verzonden</string>
     <string name="magic_link_login_title">Magische link login</string>
     <string name="site_address_login_title">Site adres login</string>
     <string name="email_address_login_title">E-mail adres login</string>
-    <string name="alternatively">Alternatief</string>
     <string name="reader_empty_saved_posts_description">Tik op %s om een bericht op te slaan in je lijst.</string>
+    <string name="reader_empty_saved_posts_title">Nog geen berichten opgeslagen!</string>
     <string name="reader_bookmark_snack_title">Bericht opgeslagen</string>
     <string name="reader_bookmark_snack_btn">Alles weergeven</string>
-    <string name="reader_btn_bookmarked">Opgeslagen</string>
-    <string name="reader_btn_bookmark">Opslaan</string>
     <string name="reader_remove_bookmark">Verwijderen uit opgeslagen berichten</string>
     <string name="reader_add_bookmark">Toevoegen aan opgeslagen berichten</string>
     <string name="reader_save_for_later_title">Opgeslagen berichten</string>
     <string name="removed">Verwijderd</string>
-    <string name="reader_empty_saved_posts_title">Nog geen berichten opgeslagen!</string>
     <string name="my_site_icon_content_description">Favicon wijzigen</string>
     <string name="my_site_icon_dialog_cancel_button">Annuleren</string>
     <string name="my_site_icon_dialog_remove_button">Verwijderen</string>
@@ -1199,11 +1543,9 @@ Language: nl
     <string name="reader_btn_notifications_on">Sitemeldingen inschakelen</string>
     <string name="reader_btn_notifications_off">Sitemeldingen uitschakelen</string>
     <string name="activity_log_jetpack_icon">Jetpack-pictogram</string>
-    <string name="rewind">Terugzetten</string>
     <string name="activity_log_event">Gebeurtenis</string>
     <string name="activity_log_icon">Activiteitenpictogram</string>
     <string name="activity_log">Activiteitenlog</string>
-    <string name="activity">Activiteit</string>
     <string name="privacy_policy_read">Privacybeleid lezen</string>
     <string name="third_party_policy_learn_more_caption">We gebruiken ook andere tracking-tools, waaronder een aantal van derden. Bekijk meer informatie over deze tools en hoe je ze kunt beheren.</string>
     <string name="third_party_policy_learn_more_header">Beleid van derden</string>
@@ -1214,7 +1556,6 @@ Language: nl
     <string name="preference_privacy_settings">Privacyinstellingen</string>
     <string name="preference_collect_information">Gegevens verzamelen</string>
     <string name="post_submitted">Bericht geplaatst</string>
-    <string name="login_email_button_signup">Heb je nog geen account? %1$sRegistreren%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Voor deze plugin-functie moet de site in goede staat zijn.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Voor deze plugin-functie moet het abonnement op het primaire domein aan deze gebruiker zijn gekoppeld.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Voor deze plugin-functie zijn beheerdersrechten vereist.</string>
@@ -1243,21 +1584,22 @@ Language: nl
     <string name="content_description_people_looking_charts">Mensen die naar grafieken en tabellen kijken</string>
     <string name="comment_title">%s op %s</string>
     <string name="dialog_confirm_delete_permanently_post">Weet je zeker dat je dit bericht permanent wilt verwijderen?</string>
-    <string name="photo_picker_use_photo">Gebruik deze foto</string>
-    <string name="notification_channel_general_title">Algemeen</string>
     <string name="notification_channel_important_title">Belangrijk</string>
+    <string name="notification_channel_general_title">Algemeen</string>
+    <string name="photo_picker_use_photo">Gebruik deze foto</string>
     <string name="media_preview_title">%1$d van %2$d</string>
-    <string name="site_settings_quota_space_unlimited">%1$s van onbeperkt</string>
     <string name="stock_media_picker_initial_empty_subtext">Foto\'s beschikbaar gesteld door %s</string>
     <string name="stock_media_picker_initial_empty_text">Zoek naar gratis foto\'s om aan je media-bibliotheek toe te voegen</string>
     <string name="stock_media_picker_search_hint">Bibliotheek met gratis foto\'s doorzoeken</string>
     <string name="photo_picker_stock_media">Kiezen uit bibliotheek met gratis foto\'s</string>
     <string name="error_save_empty_draft">Leeg concept kan niet opgeslagen worden</string>
+    <string name="site_settings_quota_space_unlimited">%1$s van onbeperkt</string>
     <string name="preview_count">Voorbeeld van %d bekijken</string>
     <string name="add_count">%d toevoegen</string>
     <string name="fab_add_tag_desc">Tag aanmaken</string>
     <string name="navigate_up_desc">omhoog navigeren</string>
     <string name="notification_settings_switch_desc">Meldingen</string>
+    <string name="open_external_link_desc">Externe link openen</string>
     <string name="show_more_desc">meer tonen</string>
     <string name="reader_photo_view_desc">foto</string>
     <string name="reader_list_item_suggestion_remove_desc">verwijderen</string>
@@ -1281,17 +1623,16 @@ Language: nl
     <string name="profile_picture">profielfoto van %s\'</string>
     <string name="comment_checkmark_desc">vinkje</string>
     <string name="signup_with_google_progress">Inschrijven bij Google …</string>
-    <string name="open_external_link_desc">Externe link openen</string>
     <string name="jetpack_connection_failed_with_reason">Verbinden met Jetpack mislukt: %s</string>
     <string name="jetpack_already_connected_toast">Je bent al verbonden met Jetpack</string>
     <string name="menu_undo_snackbar_action">ONGEDAAN MAKEN</string>
+    <string name="menu_visual_mode_done_snackbar">Overgeschakeld op de visuele modus</string>
     <string name="menu_visual_mode">Visuele modus</string>
+    <string name="menu_html_mode_done_snackbar">Overgeschakeld op de HTML-modus</string>
     <string name="menu_html_mode">HTML-modus</string>
     <string name="menu_preview">Voorbeeld bekijken</string>
     <string name="menu_save_as_draft">Opslaan als concept</string>
     <string name="file_size_in_terabytes">%s TB</string>
-    <string name="menu_visual_mode_done_snackbar">Overgeschakeld op de visuele modus</string>
-    <string name="menu_html_mode_done_snackbar">Overgeschakeld op de HTML-modus</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1313,13 +1654,12 @@ Language: nl
     <string name="edit_photo_screen_title">Foto bewerken</string>
     <string name="share_intent_screen_title">Site kiezen</string>
     <string name="signup_epilogue_screen_title">Nieuw account</string>
-    <string name="login_prologue_screen_title">Inloggen</string>
     <string name="login_epilogue_screen_title">Ingelogd als</string>
     <string name="person_detail_screen_title">Persoonsgegevens</string>
     <string name="media_settings_screen_title">Bestandsgegevens</string>
     <string name="publicize_buttons_screen_title">Deelknoppen</string>
     <string name="notifications_screen_title">Meldingen</string>
-    <string name="reader_screen_title">Lezer</string>
+    <string name="reader_screen_title">Reader</string>
     <string name="me_section_screen_title">Ik</string>
     <string name="my_site_section_screen_title">Mijn site</string>
     <string name="notif_settings_screen_title">Meldingsinstellingen</string>
@@ -1327,12 +1667,12 @@ Language: nl
     <string name="license_screen_title">Licentie</string>
     <string name="release_notes_screen_title">Release-opmerkingen</string>
     <string name="signup_epilogue_error_avatar_view">Je avatar is geüpload en binnenkort beschikbaar.</string>
-    <string name="plugin_caption_featured">Uitgelicht</string>
-    <string name="version_with_name_param">Versie %s</string>
-    <string name="permissions_denied_message">Het lijkt erop dat je de vereiste machtigingen voor deze functie hebt uitgeschakeld.&lt;br/>&lt;br/>Om dit te wijzigen, moet je je machtigingen bewerken en zorgen dat &lt;strong>%s&lt;/strong> is ingeschakeld.</string>
+    <string name="permissions_denied_message">Het lijkt erop dat je de vereiste machtigingen voor deze functie hebt uitgeschakeld.&lt;br/&gt;&lt;br/&gt;Om dit te wijzigen, moet je je machtigingen bewerken en zorgen dat &lt;strong&gt;%s&lt;/strong&gt; is ingeschakeld.</string>
     <string name="permissions_denied_title">Machtigingen</string>
+    <string name="plugin_caption_featured">Uitgelicht</string>
     <string name="sharing_disabled_description">Je kunt je instellingen voor delen niet openen, omdat je Sharing-module van Jetpack is uitgeschakeld.</string>
     <string name="sharing_disabled">Sharing-module uitgeschakeld</string>
+    <string name="version_with_name_param">Versie %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
     <string name="publisher_with_company_param">Publisher: %s</string>
     <string name="notification_sound_has_invalid_path">Het gekozen geluid heeft een ongeldig pad. Kies een andere.</string>
@@ -1368,56 +1708,47 @@ Language: nl
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 bericht met 1 bestand niet geüpload</string>
     <string name="untitled_in_parentheses">(Zonder titel)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Site maken</string>
-    <string name="username_changer_action">Opslaan</string>
-    <string name="content_description_add_avatar">Voeg avatar toe </string>
-    <string name="username_changer_title">Verander gebruikersnaam</string>
-    <string name="username_changer_error_none">Geen gebruikersnamen worden voorgesteld vanuit %1$s%2$s%3$s. Gebruik alstublieft meer letters of cijfers om een suggestie te krijgen. </string>
-    <string name="username_changer_error_generic">Een fout heeft zich voorgedaan tijdens het ophalen van gebruikersnaam suggesties</string>
-    <string name="signup_user_exists">E-mailadres bestaat al op WordPress.com\nDoorgaan met inloggen. </string>
     <string name="notification_site_creation_created">Klik om door te gaan.</string>
-    <string name="signup_with_email_button">Meld je aan met e-mail</string>
-    <string name="signup_with_google_button">Meld je aan met Google</string>
-    <string name="google_error_timeout">Reactie van Google duurde te lang. Je moet mogelijk wachten tot je een sterkere internetverbinding hebt.</string>
     <string name="notification_site_creation_title_success">Site gemaakt!</string>
+    <string name="google_error_timeout">Reactie van Google duurde te lang. Je moet mogelijk wachten tot je een sterkere internetverbinding hebt.</string>
+    <string name="username_changer_title">Verander gebruikersnaam</string>
     <string name="username_changer_hint">Type om meer suggesties te krijgen.</string>
+    <string name="username_changer_header">Je huidige gebruikersnaam is %1$s%2$s%3$s. Met een paar uitzonderingen, zullen anderen alleen je display naam zien, %4$s%5$s%6$s.</string>
+    <string name="username_changer_error_none">Geen gebruikersnamen worden voorgesteld vanuit %1$s%2$s%3$s. Gebruik alstublieft meer letters of cijfers om een suggestie te krijgen. </string>
+    <string name="username_changer_error_generic">Een fout heeft zich voorgedaan tijdens het ophalen van gebruikersnaam suggesties</string>
     <string name="username_changer_dismiss_message">Verandering van gebruikersnaam negeren?</string>
     <string name="username_changer_dismiss_button_positive">Negeren</string>
-    <string name="username_changer_header">Je huidige gebruikersnaam is %1$s%2$s%3$s. Met een paar uitzonderingen, zullen anderen alleen je display naam zien, %4$s%5$s%6$s.</string>
+    <string name="username_changer_action">Opslaan</string>
+    <string name="content_description_add_avatar">Voeg avatar toe </string>
+    <string name="signup_user_exists">E-mailadres bestaat al op WordPress.com\nDoorgaan met inloggen. </string>
     <string name="signup_updating_account">Updating account…</string>
     <string name="signup_magic_link_progress">E-mail versturen</string>
-    <string name="signup_terms_of_service_text">Als je je registreert, ga je akkoord met onze %1$sServicevoorwaarden%2$s.</string>
     <string name="signup_magic_link_error_button_positive">Probeer opnieuw</string>
+    <string name="signup_magic_link_error_button_negative">Sluit</string>
+    <string name="signup_magic_link_error">Er waren problemen met het versturen van de e-mail. Je kan het nu nog een keer proberen of sluiten en het later nog een keer proberen. </string>
     <string name="signup_epilogue_hint_username">Gebruikersnaam</string>
+    <string name="signup_epilogue_hint_password_detail">Je kunt altijd inloggen met de link zoals je die net hebt gebruikt maar je kunt ook een wachtwoord instellen als dat je voorkeur heeft.</string>
     <string name="signup_epilogue_hint_password">Wachtwoord (optioneel)</string>
+    <string name="signup_epilogue_hint_display">Weergavenaam</string>
     <string name="signup_epilogue_error_button_positive">Probeer opnieuw</string>
     <string name="signup_epilogue_error_button_negative">Terug draaien</string>
     <string name="signup_epilogue_error_generic">Er waren wat problemen bij het updaten van jouw account. Je kan het opnieuw proberen of je veranderingen terug draaien om door te gaan. </string>
     <string name="signup_epilogue_error_avatar">Er waren problemen met het uploaden van je avatar.</string>
-    <string name="signup_magic_link_error_button_negative">Sluit</string>
-    <string name="signup_epilogue_hint_display">Weergavenaam</string>
-    <string name="signup_magic_link_error">Er waren problemen met het versturen van de e-mail. Je kan het nu nog een keer proberen of sluiten en het later nog een keer proberen. </string>
-    <string name="signup_email_error_generic">Er waren wat problemen met het controleren van je e-mailadres </string>
-    <string name="signup_email_header">Om je nieuwe WordPress.com account aan te maken, vul je alstublieft je email adres in. </string>
-    <string name="signup_epilogue_hint_password_detail">Je kunt altijd inloggen met de link zoals je die net hebt gebruikt maar je kunt ook een wachtwoord instellen als dat je voorkeur heeft.</string>
-    <string name="enter_site_address_instead">Meld je aan door je site adres in te vullen. </string>
-    <string name="enter_username_instead">Log in met je gebruikersnaam.</string>
-    <string name="sign_up">Meld je aan voor WordPress.com</string>
-    <string name="plugin_caption_popular">Populair</string>
-    <string name="plugin_manage">Beheren</string>
-    <string name="plugin_search_error">Niet mogelijk om plugins te zoeken</string>
-    <string name="plugin_install">Installeer</string>
-    <string name="my_site_add_new_site">Voeg nieuwe site toe</string>
-    <string name="plugin_caption_new">Nieuw</string>
-    <string name="my_site_create_new_site">Creëer een nieuwe site voor jouw bedrijf, magazine, persoonlijke blog of verbind een bestaande WordPress installatie. </string>
     <string name="plugin_needs_update">Update nodig </string>
     <string name="plugin_caption_search">Zoek plugins</string>
-    <string name="plugin_installed_successfully">%s succesvol geïnstalleerd</string>
+    <string name="plugin_caption_new">Nieuw</string>
+    <string name="plugin_caption_popular">Populair</string>
     <string name="plugins_empty_search_list">Geen overeenkomsten</string>
     <string name="plugin_see_all">Bekijk alles</string>
+    <string name="plugin_manage">Beheren</string>
+    <string name="plugin_search_error">Niet mogelijk om plugins te zoeken</string>
     <string name="plugin_installed_failed">Fout installeren %s</string>
+    <string name="plugin_installed_successfully">%s succesvol geïnstalleerd</string>
+    <string name="plugin_install">Installeer</string>
     <string name="site_settings_like_header">Leuk vinden</string>
+    <string name="my_site_add_new_site">Voeg nieuwe site toe</string>
+    <string name="my_site_create_new_site">Creëer een nieuwe site voor jouw bedrijf, magazine, persoonlijke blog of verbind een bestaande WordPress installatie. </string>
     <string name="notifications_jetpack_connection_setup_info">Om nuttige notificaties van jouw WordPress site op jouw apparaat te krijgen, moet je de Jetpack plugin installeren. Wil je Jetpack installeren? </string>
     <string name="site_settings_lazy_load_images">Lazy-load-afbeeldingen</string>
     <string name="stats_jetpack_connection_setup">Jetpack installeren</string>
@@ -1425,14 +1756,14 @@ Language: nl
     <string name="plugin_info_your_version">Jouw WordPress versie</string>
     <string name="plugin_info_requires_version">Vereist WordPress versie</string>
     <string name="plugin_info_lastupdated">Laatst bijgewerkt</string>
+    <string name="plugin_info_version">Versie</string>
     <string name="plugin_five_stars">5 sterren</string>
     <string name="plugin_four_stars">4 sterren</string>
     <string name="plugin_three_stars">3 sterren</string>
     <string name="plugin_two_stars">2 sterren</string>
     <string name="plugin_one_stars">1 ster</string>
-    <string name="plugin_info_version">Versie</string>
-    <string name="plugin_num_downloads">%s downloads</string>
     <string name="plugin_empty_text">Geen opgegeven</string>
+    <string name="plugin_num_downloads">%s downloads</string>
     <string name="plugin_num_ratings">%s beoordelingen</string>
     <string name="plugin_read_reviews">Lees beoordelingen</string>
     <string name="plugin_faq">Veelgestelde vragen</string>
@@ -1452,9 +1783,9 @@ Language: nl
     <string name="dlg_deleting_tag">Verwijderen</string>
     <string name="dlg_confirm_delete_tag">Tag \'%s\' permanent verwijderen?</string>
     <string name="error_tag_exists">Een tag met deze naam bestaat al</string>
-    <string name="tag_name_hint">Tag</string>
     <string name="add_new_tag">Voeg nieuwe tag toe</string>
     <string name="tag_description_hint">Beschrijving</string>
+    <string name="tag_name_hint">Tag</string>
     <string name="site_settings_amp_summary">Jouw WordPress.com site ondersteunt het gebruik van Accelerated Mobile Pages, een initiatief van Google wat laadtijden op mobiele apparaten aanzienlijk versneld</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
     <string name="site_settings_timezones_error">Niet mogelijk om tijdzones te laden</string>
@@ -1472,8 +1803,8 @@ Language: nl
     <string name="delete_yes">Verwijder</string>
     <string name="plugin_external_link_icon_content_description">Externe link</string>
     <string name="plugin_icon_content_description">Plugin pictogram</string>
-    <string name="wordpress_dot_org_plugin_page">Pluginpagina WordPress.org</string>
     <string name="plugin_home_page">Plugin homepage</string>
+    <string name="wordpress_dot_org_plugin_page">Pluginpagina WordPress.org</string>
     <string name="plugin_remove_dialog_message">Weet je zeker dat je %1$s wilt verwijderen uit %2$s?\n\nHierdoor wordt de plugin gedeactiveerd en worden alle bijbehorende bestanden en gegevens verwijderd.</string>
     <string name="plugin_remove_dialog_title">Plugin verwijderen</string>
     <string name="plugin_remove_progress_dialog_message">%s wordt verwijderd …</string>
@@ -1521,10 +1852,9 @@ Language: nl
     <string name="confirm_remove_media_image">Deze afbeelding verwijderen uit het bericht?</string>
     <string name="media_edit_customize_card_caption">Aanpassen</string>
     <string name="media_edit_file_details_card_caption">Bestanddetails</string>
-    <string name="login_error_generic">Er kon geen verbinding worden gemaakt met het Google-account.</string>
     <string name="login_error_suffix">\nMisschien een ander account proberen?</string>
+    <string name="login_error_generic">Er kon geen verbinding worden gemaakt met het Google-account.</string>
     <string name="login_error_button">Sluit</string>
-    <string name="login_google_button_suffix">Log in met Google.</string>
     <string name="enter_wpcom_password_google">Om door te gaan met dit Google-account moet je eerst het wachtwoord van WordPress.com opgeven. Je hoeft dit slechts één keer in te vullen.</string>
     <string name="error_generic_network">Er is een netwerkfout opgetreden. Controleer je verbinding en probeer het nogmaals.</string>
     <string name="post_settings_remove_featured_image">Uitgelichte afbeelding verwijderen</string>
@@ -1536,18 +1866,17 @@ Language: nl
     <string name="jetpack_disconnect_confirm">Loskoppelen</string>
     <string name="jetpack_disconnect_confirmation_message">Weet je zeker dat je Jetpack wilt loskoppelen van de site?</string>
     <string name="jetpack_disconnect_pref_title">\"Loskoppelen van WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Door een IP-adres of een reeks IP-adressen op een whitelist te plaatsen, zodat ze nooit door Jetpack worden geblokkeerd. IPv4 en IPv6 zijn acceptabel. Stel een bereik in door de hoge en lage waarde in te voeren met een streepje ertussen. Voorbeeld: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Je kunt een IP-adres (of een reeks adressen) markeren als \"Altijd toegestaan\", waardoor wordt voorkomen dat ze ooit door Jetpack worden geblokkeerd. IPv4 en IPv6 zijn acceptabel. Om een bereik op te geven, voer je de lage waarde en de hoge waarde in, gescheiden door een streepje. Voorbeeld: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Twee-staps verificatie vereisen</string>
-    <string name="jetpack_allow_wpcom_sign_in_title">WordPress.com-login toestaan</string>
     <string name="jetpack_match_wpcom_via_email_title">Accounts matchen via e-mail</string>
+    <string name="jetpack_allow_wpcom_sign_in_title">WordPress.com-login toestaan</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com-login</string>
-    <string name="jetpack_brute_force_whitelist_title">IP-adressen op whitelist</string>
     <string name="jetpack_prevent_brute_force_title">Kwaadaardige inlogpogingen blokkeren</string>
     <string name="jetpack_prevent_brute_force_category_title">Bescherming tegen brute force-aanvallen</string>
     <string name="jetpack_send_wp_notifications_title">Pushmeldingen verzenden</string>
     <string name="jetpack_send_email_notifications_title">Meldingen per e-mail verzenden</string>
-    <string name="jetpack_security_setting_title">Beveiliging</string>
     <string name="jetpack_monitor_uptime_title">Monitor de uptime van je site</string>
+    <string name="jetpack_security_setting_title">Beveiliging</string>
     <string name="jetpack_site_settings_category_title">Jetpack instellingen</string>
     <string name="share_intent_adding_to">Toevoegen aan</string>
     <string name="share_intent_pick_site">Site kiezen</string>
@@ -1555,24 +1884,24 @@ Language: nl
     <string name="share_action_post">Toevoegen aan nieuw bericht</string>
     <string name="share_media_permission_required">Machtigingen vereist om afbeeldingen of video\'s te delen</string>
     <string name="invalid_ip_or_range">Onjuist IP of IP-reeks</string>
-    <string name="confirm_delete_media_video">Deze video verwijderen?</string>
     <string name="deleting_media_dlg">Verwijderen…</string>
+    <string name="confirm_delete_media_video">Deze video verwijderen?</string>
     <string name="confirm_delete_media_image">Deze afbeelding verwijderen?</string>
     <string name="media_title_document_details">Documentgegevens</string>
     <string name="media_title_audio_details">Audiogegevens</string>
     <string name="media_title_video_details">Videogegevens</string>
-    <string name="fab_content_description_preview">Voorbeeld bekijken</string>
     <string name="media_title_image_details">Afbeeldinggegevens</string>
+    <string name="fab_content_description_preview">Voorbeeld bekijken</string>
     <string name="media_edit_upload_date_caption">Uploaddatum</string>
     <string name="media_edit_duration_caption">Duur</string>
     <string name="media_edit_video_dimensions_caption">Video-afmetingen</string>
     <string name="media_edit_image_dimensions_caption">Afbeeldingsafmetingen</string>
-    <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_filetype_caption">Bestandstype</string>
     <string name="media_edit_filename_caption">Bestandsnaam</string>
+    <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alt. tekst</string>
-    <string name="notification_settings_item_sights_and_sounds_blink_light">Lamp laten knipperen</string>
     <string name="connect_site">Verbind een site</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Lamp laten knipperen</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Apparaat laten trillen</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Kies geluid</string>
     <string name="notification_settings_category_sights_and_sounds">Beeld en geluid</string>
@@ -1582,12 +1911,12 @@ Language: nl
     <string name="notification_settings_category_other">Andere</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Al mijn sites</string>
     <string name="notification_settings_category_your_sites">Jouw sites</string>
-    <string name="notification_settings_master_off_message">Het uitschakelen van Meldingsinstellingen zal alle meldingen van deze app uitschakelen, ongeacht het type. Je kunt specificeren welke type notificaties je wilt ontvangen nadat je de Meldingsinstellingen hebt ingeschakeld.</string>
-    <string name="notification_settings_master_off_title">Om meldingen te ontvangen op dit apparaat, schakel de Meldingsinstellingen in.</string>
-    <string name="notification_settings_master_hint_off">Meldingen inschakelen</string>
-    <string name="notification_settings_master_hint_on">Meldingen uitschakelen</string>
-    <string name="notification_settings_master_status_off">Uit</string>
-    <string name="notification_settings_master_status_on">Aan</string>
+    <string name="notification_settings_main_off_message">Als je Meldingsinstellingen uitschakelt, worden alle meldingen van deze app uitgeschakeld, ongeacht het type. Je kunt afstemmen welk soort melding je ontvangt nadat je Meldingsinstellingen hebt ingeschakeld.</string>
+    <string name="notification_settings_main_off_title">Om meldingen op dit apparaat te ontvangen, schakel de melding instelling in.</string>
+    <string name="notification_settings_main_hint_off">Meldingen inschakelen</string>
+    <string name="notification_settings_main_hint_on">Meldingen uitschakelen</string>
+    <string name="notification_settings_main_status_off">Uit</string>
+    <string name="notification_settings_main_status_on">Aan</string>
     <string name="max_video_resolution">Maximale video grootte</string>
     <string name="max_thumbnail_px_size">Maximale afbeeldingsgrootte</string>
     <string name="error_upload_post_media_param">Er is een fout opgetreden bij het uploaden van een media-bestand bij dit bericht: %s.</string>
@@ -1613,10 +1942,10 @@ Language: nl
     <string name="post_queued">Bericht in wachtrij</string>
     <string name="uploading_post">\"%s\" wordt geüpload</string>
     <string name="connection_to_server_lost">De verbinding met de server is verbroken</string>
-    <string name="login_epilogue_mysites_one">Mijn site</string>
     <string name="login_epilogue_mysites_other">Mijn sites</string>
-    <string name="login_empty_2fa">Voer een verificatiecode in</string>
+    <string name="login_epilogue_mysites_one">Mijn site</string>
     <string name="login_email_client_not_found">Detectie van mailclient-app mislukt</string>
+    <string name="login_empty_2fa">Voer een verificatiecode in</string>
     <string name="login_empty_username">Voer een gebruikersnaam in</string>
     <string name="login_log_in_for_deeplink">Log in op WordPress.com om dit bericht te bekijken.</string>
     <string name="login_error_while_adding_site">Fout bij het toevoegen van site. Foutcode: %s</string>
@@ -1624,19 +1953,17 @@ Language: nl
     <string name="login_site_address_more_help">Meer hulp nodig?</string>
     <string name="login_site_address_help_content">Het adres van je site wordt aan de bovenzijde van je scherm weergegeven wanneer je je site in Chrome bekijkt.</string>
     <string name="login_site_address_help_title">Wat is mijn site-adres?</string>
-    <string name="login_site_address_help">Hulp nodig bij het vinden van je site-adres?</string>
     <string name="login_site_address">Site-adres</string>
     <string name="enter_site_address">Vul het adres van de WordPress site in die je wilt verbinden.</string>
     <string name="login_already_logged_in_wpcom">Al ingelogd op WordPress.com</string>
-    <string name="enter_wpcom_password">Voer je WordPress.com wachtwoord in.</string>
     <string name="login_continue">Doorgaan</string>
     <string name="connect_more">Verbind een andere site</string>
+    <string name="enter_wpcom_password">Voer je WordPress.com wachtwoord in.</string>
     <string name="login_magic_link_email_requesting">E-mail voor inloggen aangevraagd</string>
     <string name="password_incorrect">Het lijkt erop alsof dit wachtwoord onjuist is. Controleer je gegevens en probeer het nogmaals.</string>
     <string name="requesting_otp">Verificatiecode via sms aanvragen.</string>
     <string name="login_text_otp">Sms  mij een code in plaats daarvan</string>
     <string name="enter_verification_code">Bijna klaar! Voer de verificatiecode uit je Authenticator-app in.</string>
-    <string name="open_mail">Open e-mail</string>
     <string name="next">Volgende</string>
     <string name="enter_email_wordpress_com">Log in op WordPress.com met behulp van een e-mailadres om al je WordPress-sites te beheren.</string>
     <string name="image_optimization_promo_desc">Afbeeldingoptimalisatie maakt afbeeldingen kleiner, zodat ze sneller geüpload kunnen worden.\n\nJe kunt deze optie op elk moment wijzigen in de site-instellingen.</string>
@@ -1659,10 +1986,6 @@ Language: nl
     <string name="post_status_draft">Concept</string>
     <string name="post_status_pending_review">Beoordeling in behandeling</string>
     <string name="post_status_publish_post">Publiceren</string>
-    <string name="change_location">Locatie wijzigen</string>
-    <string name="remove_location">Locatie verwijderen</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Kan locatiekiezer niet openen; Google Play Services is niet beschikbaar</string>
-    <string name="post_settings_location">Locatie</string>
     <string name="now">Nu</string>
     <string name="post_settings_password_dialog_hint">Alleen personen met dit wachtwoord kunnen dit bericht bekijken.</string>
     <string name="post_settings_excerpt_dialog_hint">Samenvattingen zijn optionele, handgemaakte overzichten van je content.</string>
@@ -1697,21 +2020,21 @@ Language: nl
     <string name="site_settings_video_width_hint">De afmeting van video\'s in berichten wijzigen naar dit formaat</string>
     <string name="site_settings_optimize_video_summary">Het aanpassen van de grootte en het comprimeren van video\'s inschakelen</string>
     <string name="site_settings_optimize_videos">Optimaliseer video\'s</string>
-    <string name="video_quality">Videokwaliteit</string>
-    <string name="report_bug">Bug rapporteren</string>
     <string name="draft_uploaded">Concept toegevoegd</string>
+    <string name="report_bug">Bug rapporteren</string>
+    <string name="video_quality">Videokwaliteit</string>
     <string name="permission_camera">Camera</string>
     <string name="permission_storage">Opslag</string>
     <string name="button_edit_permissions">Rechten bewerken</string>
-    <string name="photo_picker_soft_ask_label">%s heeft rechten nodig om toegang te krijgen tot je foto\'s </string>
     <string name="photo_picker_soft_ask_allow">Toestaan</string>
+    <string name="photo_picker_soft_ask_label">%s heeft rechten nodig om toegang te krijgen tot je foto\'s </string>
     <string name="sharing_twitter_message">Dit wordt opgenomen in tweets als mensen delen met behulp van de Twitter-knop</string>
     <string name="sharing_label_message">De tekst van het deelknoppenlabel wijzigen. Deze tekst verschijnt niet totdat je tenminste één deelknop hebt toegevoegd.</string>
     <string name="connecting_account">Verbinden met account</string>
     <string name="cannot_connect_account_error">De %s verbinding kon niet tot stand worden gebracht omdat er geen account geselecteerd is.</string>
-    <string name="likes">Likes</string>
-    <string name="twitter">Twitter</string>
     <string name="connected">Verbonden</string>
+    <string name="twitter">Twitter</string>
+    <string name="likes">Likes</string>
     <string name="sharing_comment_likes_description">Toestaan dat alle reacties door jezelf en je lezers geliket kunnen worden</string>
     <string name="buttons">Knoppen</string>
     <string name="sharing_edit_more_buttons">Knoppen \'Meer\' bewerken</string>
@@ -1719,34 +2042,34 @@ Language: nl
     <string name="sharing_sharing_buttons_description">Selecteer welke knoppen worden weergegeven onder je berichten</string>
     <string name="twitter_username">Twitter gebruikersnaam</string>
     <string name="sharing_comment_likes">Reactie-likes</string>
-    <string name="label">Label</string>
     <string name="button_style">Knopstijl</string>
+    <string name="label">Label</string>
     <string name="sharing_buttons">Deel-knoppen</string>
     <string name="site_settings_like">Like-knop tonen</string>
     <string name="site_settings_reblog">Rebloggen-knop tonen</string>
     <string name="site_settings_reblog_and_like_header">Rebloggen en liken</string>
-    <string name="text_only_display">Alleen tekst</string>
     <string name="official_buttons_display">Officiële knoppen</string>
+    <string name="text_only_display">Alleen tekst</string>
     <string name="icon_only_display">Alleen icoon</string>
     <string name="icon_and_text_display">Icoon &amp; tekst</string>
     <string name="connection_chooser_message">Selecteer het account dat je wilt verifiëren. Je berichten worden automatisch gedeeld op het geselecteerde account.</string>
     <string name="connecting_social_network">Verbinden met %s</string>
     <string name="dlg_confirm_publicize_disconnect">Verbinding verbreken met %s?</string>
     <string name="share_btn_connect_another_account">Verbinden met een ander account</string>
-    <string name="share_btn_connect">Verbinden</string>
-    <string name="share_btn_disconnect">Verbinding verbreken</string>
     <string name="share_btn_reconnect">Herverbinden</string>
+    <string name="share_btn_disconnect">Verbinding verbreken</string>
+    <string name="share_btn_connect">Verbinden</string>
     <string name="connection_service_description">Maak verbinding om je blogberichten automatisch te delen met %s.</string>
     <string name="connection_service_label">Publiceren op %s</string>
     <string name="connected_accounts_label">Verbonden accounts</string>
     <string name="connections_description">Koppel je favoriete social media-services om nieuwe berichten automatisch met vrienden te delen.</string>
-    <string name="sharing">Delen</string>
     <string name="connections_label">Verbindingen</string>
+    <string name="sharing">Delen</string>
     <string name="tabbar_accessibility_label_notifications">Meldingen. Beheer je meldingen</string>
     <string name="tabbar_accessibility_label_reader">Reader. Inhoud van andere sites volgen.</string>
     <string name="tabbar_accessibility_label_my_site">Mijn site. Je site bekijken en beheren, inclusief statistieken.</string>
-    <string name="button_not_now">Niet nu</string>
     <string name="my_site_btn_sharing">Delen</string>
+    <string name="button_not_now">Niet nu</string>
     <string name="media_error_internal_server_error">Uploadfout. Probeer \"Afbeeldingen optimaliseren\" in te schakelen via de instellingen van je app</string>
     <string name="media_downloading">Media op dit apparaat opslaan</string>
     <string name="error_media_save">Media opslaan is mislukt</string>
@@ -1760,9 +2083,9 @@ Language: nl
     <string name="wp_media_title">WordPress media</string>
     <string name="media_insert_as_gallery">Toevoegen als galerij</string>
     <string name="media_insert_individually">Individueel toevoegen</string>
-    <string name="media_gallery_column_count_single">1 kolom</string>
-    <string name="media_gallery_column_count_multi">%d kolommen</string>
     <string name="media_insert_title">Voeg meerdere foto\'s toe</string>
+    <string name="media_gallery_column_count_multi">%d kolommen</string>
+    <string name="media_gallery_column_count_single">1 kolom</string>
     <string name="editor_confirm_email_prompt_negative">E-mail opnieuw verzenden</string>
     <string name="editor_confirm_email_prompt_message_with_email">We hebben een e-mail gestuurd naar %s toen je je de eerste keer aanmeldde. Open het bericht en klik op de blauwe knop om publiceren in te schakelen.</string>
     <string name="editor_confirm_email_prompt_message">We hebben je een e-mail gestuurd toen je je de eerste keer aanmeldde. Open het bericht en klik op de blauwe knop om publiceren in te schakelen.</string>
@@ -1792,11 +2115,11 @@ Language: nl
     <string name="media_encoder_quality_85">Gemiddeld</string>
     <string name="media_encoder_quality_80">Laag</string>
     <string name="media_upload_state_uploaded">Geüpload</string>
+    <string name="media_upload_state_failed">Upload mislukt</string>
     <string name="media_upload_state_deleted">Verwijderd</string>
     <string name="media_upload_state_deleting">Verwijderen …</string>
     <string name="media_upload_state_uploading">Uploaden</string>
     <string name="media_upload_state_queued">In wachtrij geplaatst</string>
-    <string name="media_upload_state_failed">Upload mislukt</string>
     <string name="image_quality">Afbeeldingskwaliteit</string>
     <string name="error_all_media_upload_canceled">Alle media-uploads zijn vanwege een onverwachte fout geannuleerd. Probeer ze opnieuw te uploaden</string>
     <string name="error_unknown_post_type">Onbekende berichtindeling</string>
@@ -1846,27 +2169,27 @@ Language: nl
     <string name="signout">Uitloggen</string>
     <string name="sign_in_wpcom">Inloggen op WordPress.com</string>
     <string name="reader_label_global_related_posts">Meer op WordPress.com</string>
-    <string name="reader_label_local_related_posts">Meer in %s</string>
+    <string name="reader_label_local_related_posts">Meer van %s</string>
     <string name="preference_open_device_settings">Open apparaat instellingen</string>
     <string name="invite_invalid_email">%s: Ongeldige e-mail</string>
     <string name="invite_user_blocked_invites">%s: Gebruiker blokkeert uitnodigingen</string>
     <string name="invite_already_following">%s: Volg je al</string>
-    <string name="invite_username_not_found">%s: Gebruiker niet gevonden</string>
     <string name="invite_already_a_member">%s: Is al lid</string>
+    <string name="invite_username_not_found">%s: Gebruiker niet gevonden</string>
     <string name="comment_moderated_approved">Reactie goedgekeurd!</string>
     <string name="like">Vind ik leuk</string>
     <string name="timespan_now">nu</string>
-    <string name="role_follower">Volger</string>
     <string name="role_viewer">Lezer</string>
+    <string name="role_follower">Volger</string>
     <string name="error_post_my_profile_no_connection">Geen verbinding, profiel opslaan is niet mogelijk</string>
-    <string name="alignment_none">Geen</string>
-    <string name="alignment_left">Link</string>
     <string name="alignment_right">Rechts</string>
+    <string name="alignment_left">Link</string>
+    <string name="alignment_none">Geen</string>
     <string name="site_settings_list_editor_action_mode_title">Geselecteerd %1$d</string>
     <string name="error_fetch_users_list">Site-gebruikers ophalen mislukt</string>
+    <string name="title_email_follower">E-mailvolger</string>
     <string name="title_follower">Volger</string>
     <string name="people_fetching">Gebruikers ophalen…</string>
-    <string name="title_email_follower">E-mailvolger</string>
     <string name="people_dropdown_item_viewers">Lezers</string>
     <string name="people_dropdown_item_email_followers">E-mailvolgers</string>
     <string name="people_dropdown_item_followers">Volgers</string>
@@ -1875,69 +2198,64 @@ Language: nl
     <string name="viewer_remove_confirmation_message">Als je deze lezer verwijdert, kan hij of zij deze site niet bezoeken.\n\nWil je deze lezer toch verwijderen?</string>
     <string name="follower_remove_confirmation_message">Als deze volger wordt verwijderd, kan hij of zij geen meldingen meer ontvangen over deze site tot hij of zij opnieuw gaat volgen.\n\nWil je deze volger toch verwijderen?</string>
     <string name="follower_subscribed_since">Sinds %1$s</string>
-    <string name="error_remove_follower">Volger verwijderen mislukt</string>
     <string name="error_remove_viewer">Lezer verwijderen mislukt</string>
+    <string name="error_remove_follower">Volger verwijderen mislukt</string>
     <string name="error_fetch_email_followers_list">E-mailvolgers site ophalen mislukt</string>
     <string name="error_fetch_followers_list">Sitevolgers ophalen mislukt</string>
     <string name="editor_failed_uploads_switch_html">Enkele media konden niet worden geüpload. Je kunt niet overschakelen naar HTML.\n in deze staat. Alle mislukte uploads verwijderen en doorgaan?</string>
-    <string name="image_settings_save_toast">Wijzigingen opgeslagen</string>
-    <string name="image_caption">Bijschrift</string>
-    <string name="image_link_to">Link naar</string>
     <string name="image_width">Breedte</string>
+    <string name="image_link_to">Link naar</string>
+    <string name="image_caption">Bijschrift</string>
+    <string name="image_settings_save_toast">Wijzigingen opgeslagen</string>
     <string name="image_settings_dismiss_dialog_title">Niet-opgeslagen wijzigingen verwijderen?</string>
     <string name="stop_upload_dialog_title">Stoppen met uploaden?</string>
-    <string name="invite_sent">Uitnodiging verzonden</string>
     <string name="tap_to_try_again">Tik om het opnieuw te proberen!</string>
+    <string name="invite_sent">Uitnodiging verzonden</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_some_failed">Uitnodiging verzonden, maar fout(en) opgetreden.</string>
     <string name="invite_error_sending">Fout opgetreden bij verzenden van uitnodiging.</string>
     <string name="invite_error_invalid_usernames_multiple">Kan niet verzenden: ongeldige gebruikersnamen of e-mailadressen</string>
     <string name="invite_error_invalid_usernames_one">Kan niet verzenden: een gebruikersnaam of e-mailadres is ongeldig</string>
     <string name="invite_error_no_usernames">Voeg minstens één gebruikersnaam toe</string>
-    <string name="invite_message_info">(Optioneel) Je kunt een aangepast bericht invoeren van maximaal 500 tekens, dat wordt toegevoegd aan de uitnodiging van de gebruiker(s).</string>
-    <string name="invite_message_remaining_other">%d tekens resterend</string>
-    <string name="invite_message_remaining_one">1 teken resterend</string>
-    <string name="invite_message_remaining_zero">0 tekens resterend</string>
     <string name="invite_message_title">Aangepast bericht</string>
     <string name="invite">Uitnodigen</string>
     <string name="invite_names_title">Gebruikersnamen of e-mails</string>
-    <string name="send_link">Stuur link</string>
-    <string name="my_site_header_external">Extern</string>
     <string name="invite_people">Mensen uitnodigen</string>
+    <string name="my_site_header_external">Extern</string>
     <string name="label_clear_search_history">Zoekgeschiedenis wissen</string>
     <string name="dlg_confirm_clear_search_history">Zoekgeschiedenis wissen?</string>
     <string name="reader_empty_search_description">Geen resultaten gevonden voor %s in je taal.</string>
     <string name="reader_hint_post_search">Zoek op WordPress</string>
+    <string name="reader_title_related_post_detail">Gerelateerd bericht</string>
     <string name="preview_screen_links_disabled">Links uitgeschakeld op voorbeeldscherm</string>
     <string name="send">Verzenden</string>
-    <string name="user_remove_confirmation_message">Als je %1$s verwijdert, kan die gebruiker deze site niet meer openen. Alle content die door %1$s is gemaakt, blijft echter op de site staan.\n\nWil je deze gebruiker toch verwijderen?</string>
     <string name="person_removed">%1$s is verwijderd</string>
+    <string name="user_remove_confirmation_message">Als je %1$s verwijdert, kan die gebruiker deze site niet meer openen. Alle content die door %1$s is gemaakt, blijft echter op de site staan.\n\nWil je deze gebruiker toch verwijderen?</string>
     <string name="person_remove_confirmation_title">Verwijder %1$s</string>
-    <string name="reader_empty_posts_in_custom_list">De sites in deze lijst hebben recent niets geplaatst</string>
-    <string name="people">Mensen</string>
     <string name="role">Rol</string>
+    <string name="people">Mensen</string>
+    <string name="reader_empty_posts_in_custom_list">De sites in deze lijst hebben recent niets geplaatst</string>
     <string name="error_remove_user">Gebruiker verwijderen mislukt</string>
-    <string name="error_fetch_viewers_list">Site-gebruikers ophalen mislukt</string>
     <string name="error_update_role">Gebruikersrol updaten mislukt</string>
+    <string name="error_fetch_viewers_list">Site-gebruikers ophalen mislukt</string>
     <string name="error_updating_gravatar">Fout bij het updaten van je Gravatar</string>
-    <string name="error_locating_image">Fout bij het vinden van de bij te snijden afbeelding</string>
     <string name="error_refreshing_gravatar">Fout bij het opnieuw laden van je Gravatar</string>
+    <string name="error_locating_image">Fout bij het vinden van de bij te snijden afbeelding</string>
     <string name="error_cropping_image">Fout bij het bijsnijden van de afbeelding</string>
     <string name="checking_email">E-mail wordt gecontroleerd</string>
     <string name="magic_link_unavailable_error_message">Momenteel niet beschikbaar. Voer je wachtwoord in</string>
     <string name="logging_in">Inloggen</string>
-    <string name="enter_your_password_instead">Voer je wachtwoord in</string>
     <string name="web_address_dialog_hint">Wordt openbaar getoond als je reageert.</string>
     <string name="capture_or_pick_photo">Neem of selecteer foto</string>
-    <string name="plan">Abonnement</string>
     <string name="plans">Plans</string>
+    <string name="plan">Abonnement</string>
     <string name="export_your_content_message">Je berichten, pagina\'s en instellingen worden naar je e-mailadres, %s, verzonden.</string>
     <string name="export_your_content">Exporteer je content</string>
     <string name="export_email_sent">Exporteer verzonden e-mail!</string>
     <string name="exporting_content_progress">Content exporteren…</string>
-    <string name="premium_upgrades_message">Je hebt actieve Premium-upgrades op je site. Annuleer je upgrades voordat je je site verwijdert.</string>
     <string name="checking_purchases">Aankopen worden gecontroleerd</string>
     <string name="show_purchases">Geef aankopen weer</string>
+    <string name="premium_upgrades_message">Je hebt actieve Premium-upgrades op je site. Annuleer je upgrades voordat je je site verwijdert.</string>
     <string name="premium_upgrades_title">Premium-upgrades</string>
     <string name="purchases_request_error">Er is iets fout gegaan. Kon aankopen niet aanvragen.</string>
     <string name="delete_site_progress">Site verwijderen…</string>
@@ -1946,13 +2264,13 @@ Language: nl
     <string name="primary_domain">Primair domein</string>
     <string name="error_deleting_site_summary">Er is een fout opgetreden bij het verwijderen van je site. Neem contact op met de ondersteuning voor meer hulp.</string>
     <string name="error_deleting_site">Fout bij verwijderen site</string>
-    <string name="confirm_delete_site_prompt">Voer %1$s in het onderstaande veld in om dit te bevestigen. Je site wordt dan voorgoed verwijderd.</string>
     <string name="site_settings_export_content_title">Content exporteren</string>
+    <string name="confirm_delete_site_prompt">Voer %1$s in het onderstaande veld in om dit te bevestigen. Je site wordt dan voorgoed verwijderd.</string>
     <string name="confirm_delete_site">Site verwijderen bevestigen</string>
     <string name="contact_support">Contact opnemen met ondersteuning</string>
     <string name="start_over_text">Als je een site wilt, maar niet de berichten en pagina\'s die je nu hebt, kan ons ondersteuningsteam je berichten, pagina\'s, media en reacties voor je verwijderen.\n\nHiermee blijft je site en URL actief maar kan je van vooraf aan beginnen met het maken van content. Neem contact met ons op als je je huidige content wilt verwijderen.</string>
-    <string name="site_settings_start_over_hint">Begin opnieuw met je site</string>
     <string name="let_us_help">Laat ons je helpen</string>
+    <string name="site_settings_start_over_hint">Begin opnieuw met je site</string>
     <string name="start_over">Begin opnieuw</string>
     <string name="me_btn_app_settings">App-instellingen</string>
     <string name="editor_remove_failed_uploads">Mislukte uploads verwijderen</string>
@@ -1961,34 +2279,34 @@ Language: nl
     <string name="comments_empty_list_filtered_pending">Geen reacties in behandeling</string>
     <string name="comments_empty_list_filtered_approved">Geen goedgekeurde reacties</string>
     <string name="xmlrpc_missing_method_error">Kon geen verbinding maken. Vereiste XML-RPC-methoden ontbreken op de server.</string>
-    <string name="post_format_status">Status</string>
-    <string name="post_format_video">Video</string>
     <string name="alignment_center">Midden</string>
-    <string name="post_format_chat">Chat</string>
-    <string name="post_format_gallery">Galerij</string>
-    <string name="post_format_image">Afbeelding</string>
-    <string name="post_format_link">Link</string>
-    <string name="post_format_quote">Citeren</string>
+    <string name="post_format_video">Video</string>
+    <string name="post_format_status">Status</string>
     <string name="post_format_standard">Standaard</string>
-    <string name="notif_events">Informatie over cursussen en evenementen van WordPress.com (online en op locatie).</string>
-    <string name="post_format_aside">Aside</string>
+    <string name="post_format_quote">Citeren</string>
+    <string name="post_format_link">Link</string>
+    <string name="post_format_image">Afbeelding</string>
+    <string name="post_format_gallery">Galerij</string>
+    <string name="post_format_chat">Chat</string>
     <string name="post_format_audio">Audio</string>
+    <string name="post_format_aside">Aside</string>
+    <string name="notif_events">Informatie over cursussen en evenementen van WordPress.com (online en op locatie).</string>
     <string name="notif_surveys">Mogelijkheden om deel te nemen aan onderzoeken en enquêtes van WordPress.com.</string>
     <string name="notif_tips">Tips om WordPress.com optimaal te benutten.</string>
     <string name="notif_community">Community</string>
-    <string name="replies_to_my_comments">Antwoorden op mijn reacties</string>
-    <string name="notif_suggestions">Suggesties</string>
     <string name="notif_research">Onderzoek</string>
-    <string name="site_achievements">Prestaties voor de site</string>
+    <string name="notif_suggestions">Suggesties</string>
+    <string name="replies_to_my_comments">Antwoorden op mijn reacties</string>
     <string name="username_mentions">Vermeldingen van gebruikersnaam</string>
-    <string name="likes_on_my_posts">Likes voor mijn berichten</string>
+    <string name="site_achievements">Prestaties voor de site</string>
     <string name="site_follows">Volgers van site</string>
+    <string name="likes_on_my_posts">Likes voor mijn berichten</string>
     <string name="likes_on_my_comments">Likes voor mijn reacties</string>
     <string name="comments_on_my_site">Reacties op mijn site</string>
     <string name="site_settings_list_editor_summary_other">%d items</string>
     <string name="site_settings_list_editor_summary_one">1 item</string>
-    <string name="approve_auto_if_previously_approved">Reacties van bekende gebruikers</string>
     <string name="approve_auto">Alle gebruikers</string>
+    <string name="approve_auto_if_previously_approved">Reacties van bekende gebruikers</string>
     <string name="approve_manual">Geen reacties</string>
     <string name="site_settings_paging_summary_other">%d reacties per pagina</string>
     <string name="site_settings_paging_summary_one">1 reactie per pagina</string>
@@ -1998,11 +2316,11 @@ Language: nl
     <string name="detail_approve_auto">Keur de reacties van iedereen automatisch goed.</string>
     <string name="detail_approve_auto_if_previously_approved">Keur de reactie automatisch goed indien de gebruiker eerder een goedgekeurde reactie heeft geplaatst</string>
     <string name="detail_approve_manual">Vereist handmatige goedkeuring voor de reacties van iedereen.</string>
-    <string name="days_quantity_one">1 dag</string>
     <string name="days_quantity_other">%d dagen</string>
-    <string name="pending_email_change_snackbar">Klik op de link in de verificatiemail die verzonden is naar %1$s om je nieuwe adres te bevestigen</string>
-    <string name="primary_site">Primaire site</string>
+    <string name="days_quantity_one">1 dag</string>
     <string name="web_address">Webadres</string>
+    <string name="primary_site">Primaire site</string>
+    <string name="pending_email_change_snackbar">Klik op de link in de verificatiemail die verzonden is naar %1$s om je nieuwe adres te bevestigen</string>
     <string name="editor_toast_uploading_please_wait">Je bent media aan het uploaden. Wacht totdat dit is afgerond.</string>
     <string name="error_refresh_comments_showing_older">Reacties konden momenteel niet worden vernieuwd - oudere reacties worden weergegeven</string>
     <string name="post_settings_set_featured_image">Stel uitgelichte afbeelding in</string>
@@ -2011,13 +2329,13 @@ Language: nl
     <string name="dlg_sure_to_delete_comments">Deze reacties permanent verwijderen?</string>
     <string name="dlg_sure_to_delete_comment">Deze reactie permanent verwijderen?</string>
     <string name="mnu_comment_delete_permanently">Verwijderen</string>
-    <string name="comment_deleted_permanently">Reactie verwijderd</string>
     <string name="mnu_comment_untrash">Herstellen</string>
+    <string name="comment_deleted_permanently">Reactie verwijderd</string>
     <string name="comments_empty_list_filtered_spam">Geen spamreacties</string>
-    <string name="could_not_load_page">Kan pagina niet laden</string>
     <string name="comment_status_all">Alle</string>
-    <string name="interface_language">Interface-taal</string>
+    <string name="could_not_load_page">Kan pagina niet laden</string>
     <string name="off">Uit</string>
+    <string name="interface_language">Interface-taal</string>
     <string name="about_the_app">Over de app</string>
     <string name="error_post_account_settings">Opslaan van je accountinstellingen mislukt</string>
     <string name="error_fetch_account_settings">Ophalen van je accountinstellingen mislukt</string>
@@ -2025,20 +2343,20 @@ Language: nl
     <string name="site_settings_unknown_language_code_error">Taalcode niet herkend</string>
     <string name="site_settings_threading_dialog_description">Geneste reacties in threads toestaan.</string>
     <string name="site_settings_threading_dialog_header">Thread omhoog naar</string>
-    <string name="remove">Verwijderen</string>
-    <string name="search">Zoeken</string>
     <string name="disabled">Uitgeschakeld</string>
+    <string name="search">Zoeken</string>
+    <string name="remove">Verwijderen</string>
     <string name="site_settings_image_original_size">Oorspronkelijke grootte</string>
     <string name="privacy_private">Je site is alleen zichtbaar voor jou en gebruikers die je goedkeurt</string>
     <string name="privacy_public_not_indexed">Je site kan door iedereen worden bekeken, maar wordt niet geïndexeerd door zoekmachines</string>
     <string name="privacy_public">Je site kan door iedereen worden bekeken en kan worden geïndexeerd door zoekmachines</string>
     <string name="about_me_hint">Enkele woorden over jou…</string>
-    <string name="public_display_name_hint">De weergavenaam is standaard je gebruikersnaam, tenzij hij anders is ingesteld</string>
     <string name="about_me">Over mij</string>
+    <string name="public_display_name_hint">De weergavenaam is standaard je gebruikersnaam, tenzij hij anders is ingesteld</string>
     <string name="public_display_name">Openbare weergavenaam</string>
-    <string name="my_profile">Mijn Profiel</string>
-    <string name="first_name">Voornaam</string>
     <string name="last_name">Achternaam</string>
+    <string name="first_name">Voornaam</string>
+    <string name="my_profile">Mijn Profiel</string>
     <string name="cd_related_post_preview_image">Voorbeeldafbeelding van gerelateerd bericht bekijken</string>
     <string name="error_post_remote_site_settings">Kan site-informatie niet opslaan</string>
     <string name="error_fetch_remote_site_settings">Kan site-informatie niet ophalen</string>
@@ -2047,7 +2365,7 @@ Language: nl
     <string name="site_settings_paging_dialog_description">Deel reacties in threads op in meerdere pagina\'s.</string>
     <string name="site_settings_paging_dialog_header">Reacties per pagina</string>
     <string name="site_settings_close_after_dialog_title">Reacties afsluiten</string>
-    <string name="site_settings_blacklist_description">Wanneer een reactie een van deze woorden bevat in de inhoud, naam, URL, e-mailadres of IP-adres, wordt het gemarkeerd als spam. Ook delen van woorden worden gevonden, dus \"press\" levert ook \"WordPress\" op als resultaat.</string>
+    <string name="site_settings_denylist_description">Als een reactie een van deze woorden in de inhoud, naam, URL, e-mail of IP bevat, wordt deze als spam gemarkeerd. Je kunt gedeeltelijke woorden invoeren, dus \"press\" komt overeen met \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Wanneer een reactie een van deze woorden bevat in de inhoud, naam, URL, het e-mailadres of IP-adres, wordt hij in de wachtrij voor moderatie gezet. Ook delen van woorden worden gevonden, dus \"press\" levert ook \"WordPress\" op als resultaat.</string>
     <string name="site_settings_list_editor_input_hint">Voer een woord of zinsdeel in</string>
     <string name="site_settings_list_editor_no_items_text">Geen items</string>
@@ -2062,10 +2380,10 @@ Language: nl
     <string name="site_settings_rp_show_header_title">Koptekst weergeven</string>
     <string name="site_settings_rp_switch_summary">Gerelateerde berichten geeft relevante content van je site weer onder je berichten.</string>
     <string name="site_settings_rp_switch_title">Gerelateerde berichten weergeven</string>
-    <string name="site_settings_blacklist_hint">Reacties die overeenkomen met een filter worden als spam gemarkeerd</string>
+    <string name="site_settings_denylist_hint">Reacties die overeenkomen met een filter worden als spam gemarkeerd</string>
     <string name="site_settings_moderation_hold_hint">Reacties die overeenkomen met een filter worden in de wachtrij voor moderatie gezet</string>
     <string name="site_settings_multiple_links_hint">Negeert koppelingslimiet van bekende gebruikers</string>
-    <string name="site_settings_whitelist_hint">De reactie-auteur moet eerder een goedgekeurde reactie hebben geplaatst</string>
+    <string name="site_settings_allowlist_hint">De reactie auteur moet een eerder goedgekeurde reactie hebben</string>
     <string name="site_settings_user_account_required_hint">Gebruikers moeten geregistreerd en ingelogd zijn om een reactie te plaatsen</string>
     <string name="site_settings_identity_required_hint">De reactie-auteur moet zijn of haar naam en e-mailadres invullen</string>
     <string name="site_settings_paging_hint">Geef reacties weer in delen van een specifieke grootte</string>
@@ -2088,19 +2406,18 @@ Language: nl
     <string name="site_settings_address_hint">Het wijzigen van je adres wordt momenteel niet ondersteund</string>
     <string name="site_settings_tagline_hint">Een korte beschrijving of een pakkende zin om je blog te omschrijven</string>
     <string name="site_settings_title_hint">Leg in een paar woorden uit waar deze site over gaat</string>
-    <string name="site_settings_whitelist_known_summary">Reacties van bekende gebruikers</string>
-    <string name="site_settings_whitelist_all_summary">Reacties van alle gebruikers</string>
+    <string name="site_settings_allowlist_known_summary">Reacties van bekende gebruikers</string>
+    <string name="site_settings_allowlist_all_summary">Reacties van alle gebruikers</string>
     <string name="site_settings_threading_summary">%d niveaus</string>
     <string name="site_settings_privacy_private_summary">Privé</string>
     <string name="site_settings_privacy_hidden_summary">Verborgen</string>
-    <string name="site_settings_delete_site_title">Site verwijderen</string>
     <string name="site_settings_privacy_public_summary">Openbaar</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
+    <string name="site_settings_delete_site_title">Site verwijderen</string>
     <string name="site_settings_moderation_hold_title">In de wacht zetten voor moderatie</string>
     <string name="site_settings_multiple_links_title">Koppelingen in reacties</string>
-    <string name="site_settings_whitelist_title">Automatisch goedkeuren</string>
-    <string name="site_settings_threading_title">Weergave threads</string>
+    <string name="site_settings_allowlist_title">Automatisch goedkeuren</string>
     <string name="site_settings_paging_title">Weergave pagina\'s</string>
+    <string name="site_settings_threading_title">Weergave threads</string>
     <string name="site_settings_sort_by_title">Sorteren op</string>
     <string name="site_settings_account_required_title">Gebruikers moeten ingelogd zijn</string>
     <string name="site_settings_identity_required_title">Moet naam en e-mail bevatten</string>
@@ -2110,22 +2427,22 @@ Language: nl
     <string name="site_settings_default_format_title">Standaard indeling</string>
     <string name="site_settings_default_category_title">Standaard categorie</string>
     <string name="site_settings_address_title">Adres</string>
-    <string name="site_settings_title_title">Sitetitel</string>
     <string name="site_settings_tagline_title">Slogan</string>
+    <string name="site_settings_title_title">Sitetitel</string>
     <string name="site_settings_discussion_new_posts_header">Standaardinstellingen voor nieuwe berichten</string>
-    <string name="site_settings_account_header">Account</string>
     <string name="site_settings_writing_header">Schrijven</string>
-    <string name="newest_first">Nieuwste eerst</string>
+    <string name="site_settings_account_header">Account</string>
     <string name="site_settings_general_header">Algemeen</string>
-    <string name="discussion">Reacties</string>
-    <string name="privacy">Privacy</string>
-    <string name="related_posts">Gerelateerde berichten</string>
-    <string name="comments">Commentaar</string>
-    <string name="close_after">Hierna sluiten</string>
+    <string name="newest_first">Nieuwste eerst</string>
     <string name="oldest_first">Oudste eerst</string>
+    <string name="close_after">Hierna sluiten</string>
+    <string name="comments">Commentaar</string>
+    <string name="related_posts">Gerelateerde berichten</string>
+    <string name="privacy">Privacy</string>
+    <string name="discussion">Reacties</string>
     <string name="media_error_no_permission_upload">Je hebt geen toestemming om media naar de site te uploaden</string>
-    <string name="never">Nooit</string>
     <string name="unknown">Onbekend</string>
+    <string name="never">Nooit</string>
     <string name="reader_err_get_post_not_found">Dit bericht bestaat niet meer</string>
     <string name="reader_err_get_post_not_authorized">Je hebt geen rechten om dit bericht te lezen</string>
     <string name="reader_err_get_post_generic">Kan dit bericht niet ophalen</string>
@@ -2137,22 +2454,22 @@ Language: nl
     <string name="theme_activation_error">Er is iets fout gegaan. Kan thema niet activeren</string>
     <string name="theme_by_author_prompt_append"> door %1$s</string>
     <string name="theme_prompt">Bedankt dat je hebt gekozen voor %1$s</string>
-    <string name="theme_try_and_customize">Uitproberen en aanpassen</string>
-    <string name="theme_view">Weergeven</string>
-    <string name="theme_details">Details</string>
-    <string name="theme_support">Ondersteuning</string>
-    <string name="theme_done">GEREED</string>
     <string name="theme_manage_site">SITE BEHEREN</string>
+    <string name="theme_done">GEREED</string>
+    <string name="theme_support">Ondersteuning</string>
+    <string name="theme_details">Details</string>
+    <string name="theme_view">Weergeven</string>
+    <string name="theme_try_and_customize">Uitproberen en aanpassen</string>
     <string name="theme_activate">Activeren</string>
-    <string name="current_theme">Huidig thema</string>
-    <string name="customize">Aanpassen</string>
-    <string name="details">Details</string>
-    <string name="support">Ondersteuning</string>
     <string name="active">Actief</string>
-    <string name="post_published">Bericht gepubliceerd</string>
-    <string name="page_published">Pagina gepubliceerd</string>
-    <string name="post_updated">Bericht bijgewerkt</string>
+    <string name="support">Ondersteuning</string>
+    <string name="details">Details</string>
+    <string name="customize">Aanpassen</string>
+    <string name="current_theme">Huidig thema</string>
     <string name="page_updated">Pagina bijgewerkt</string>
+    <string name="post_updated">Bericht bijgewerkt</string>
+    <string name="page_published">Pagina gepubliceerd</string>
+    <string name="post_published">Bericht gepubliceerd</string>
     <string name="theme_no_search_result_found">Helaas, geen thema\'s gevonden.</string>
     <string name="reader_label_gap_marker">Meer berichten laden</string>
     <string name="notifications_no_search_results">Geen sites overeengekomen met \'%s\'</string>
@@ -2185,18 +2502,18 @@ Language: nl
     <string name="error_loading_notifications">Kan meldingsinstellingen niet laden</string>
     <string name="comment_likes">Likes voor reactie</string>
     <string name="app_notifications">Appmeldingen</string>
-    <string name="notifications_tab">Tabblad Meldingen</string>
     <string name="email">E-mailadres</string>
+    <string name="notifications_tab">Tabblad Meldingen</string>
     <string name="notification_settings_item_other_account_emails_summary">We sturen altijd belangrijke e-mails met betrekking tot je account, maar je kunt ook aanvullende nuttige berichten ontvangen.</string>
     <string name="stats_insights_latest_post_summary">Samenvatting laatste bericht</string>
     <string name="connectionbar_no_connection">Geen verbinding</string>
-    <string name="button_publish">Publiceren</string>
     <string name="post_trashed">Bericht naar de prullenbak verplaatst</string>
-    <string name="button_stats">Statistieken</string>
     <string name="button_trash">Prullenbak</string>
-    <string name="button_edit">Bewerken</string>
+    <string name="button_stats">Statistieken</string>
     <string name="button_preview">Voorbeeld</string>
     <string name="button_view">Bekijk</string>
+    <string name="button_publish">Publiceren</string>
+    <string name="button_edit">Bewerken</string>
     <string name="reader_toast_err_follow_blog_not_authorized">Je hebt geen rechten om deze site te bezoeken</string>
     <string name="reader_toast_err_follow_blog_not_found">Deze site kon niet gevonden worden</string>
     <string name="undo">Ongedaan maken</string>
@@ -2207,266 +2524,264 @@ Language: nl
     <string name="stats_insights_all_time">Alle berichten, weergaven en bezoekers</string>
     <string name="stats_insights">Inzichten</string>
     <string name="me_disconnect_from_wordpress_com">Uitloggen van WordPress.com</string>
-    <string name="me_btn_login_logout">Inloggen/uitloggen</string>
     <string name="me_connect_to_wordpress_com">Inloggen op WordPress.com</string>
+    <string name="me_btn_login_logout">Inloggen/uitloggen</string>
     <string name="me_btn_support">Help &amp; Support</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" was niet verborgen omdat het de huidige site is</string>
     <string name="account_settings">Accountinstellingen</string>
+    <string name="site_picker_cant_hide_current_site">\"%s\" was niet verborgen omdat het de huidige site is</string>
     <string name="site_picker_create_wpcom">WordPress.com site maken</string>
     <string name="site_picker_add_self_hosted">Een zelf-gehoste site toevoegen</string>
-    <string name="site_picker_edit_visibility">Sites tonen/verbergen</string>
     <string name="site_picker_add_site">Voeg nieuwe site toe</string>
-    <string name="my_site_btn_view_admin">Beheer bekijken</string>
-    <string name="my_site_btn_view_site">Bekijk site</string>
+    <string name="site_picker_edit_visibility">Sites tonen/verbergen</string>
     <string name="site_picker_title">Site kiezen</string>
+    <string name="my_site_btn_view_site">Bekijk site</string>
+    <string name="my_site_btn_view_admin">Beheer bekijken</string>
     <string name="my_site_btn_switch_site">Site wisselen</string>
-    <string name="my_site_btn_blog_posts">Blogberichten</string>
     <string name="my_site_btn_site_settings">Instellingen</string>
-    <string name="my_site_header_look_and_feel">Look and feel</string>
+    <string name="my_site_btn_blog_posts">Blogberichten</string>
     <string name="my_site_header_publish">Publiceren</string>
+    <string name="my_site_header_look_and_feel">Look and feel</string>
     <string name="my_site_header_configuration">Configuratie</string>
     <string name="reader_label_new_posts_subtitle">Tik om ze te tonen</string>
     <string name="deselect_all">Alles deselecteren</string>
-    <string name="show">Tonen</string>
-    <string name="hide">Verbergen</string>
     <string name="select_all">Alles selecteren</string>
-    <string name="language">Taal</string>
-    <string name="verification_code">Verificatiecode</string>
-    <string name="invalid_verification_code">Ongeldige verificatiecode</string>
+    <string name="hide">Verbergen</string>
+    <string name="show">Tonen</string>
     <string name="auth_required">Log opnieuw in om door te gaan.</string>
+    <string name="invalid_verification_code">Ongeldige verificatiecode</string>
+    <string name="verification_code">Verificatiecode</string>
+    <string name="language">Taal</string>
     <string name="reader_empty_posts_request_failed">Unable to retrieve posts</string>
     <string name="publisher">Publisher:</string>
     <string name="error_notification_open">Could not open notification</string>
     <string name="stats_search_terms_unknown_search_terms">Onbekende zoektermen</string>
-    <string name="stats_view_authors">Auteurs</string>
     <string name="stats_view_search_terms">Zoektermen</string>
+    <string name="stats_view_authors">Auteurs</string>
     <string name="comments_fetching">Fetching comments…</string>
     <string name="pages_fetching">Fetching pages…</string>
     <string name="posts_fetching">Fetching posts…</string>
     <string name="media_fetching">Fetching media…</string>
     <string name="logs_copied_to_clipboard">Applicatielogs zijn gekopieerd naar het klembord</string>
+    <string name="reader_empty_posts_in_blog">Deze site is leeg</string>
     <string name="reader_label_new_posts">Nieuwe berichten</string>
     <string name="error_copy_to_clipboard">Er is een fout opgetreden tijdens het kopiëren van de tekst naar het klembord</string>
-    <string name="reader_page_recommended_blogs">Sites die je misschien ook leuk vindt</string>
     <string name="post_uploading">Uploaden bericht</string>
-    <string name="reader_empty_posts_in_blog">Deze site is leeg</string>
-    <string name="themes_fetching">Thema\'s ophalen …</string>
-    <string name="stats_followers_months">%1$d maanden</string>
-    <string name="stats_followers_a_year">Per jaar</string>
     <string name="stats_followers_years">%1$d jaren</string>
+    <string name="stats_followers_a_year">Per jaar</string>
+    <string name="stats_followers_months">%1$d maanden</string>
     <string name="stats_followers_a_month">Per maand</string>
-    <string name="stats_followers_minutes">%1$d minuten</string>
-    <string name="stats_followers_an_hour_ago">een uur geleden</string>
-    <string name="stats_followers_hours">%1$d uren</string>
-    <string name="stats_followers_a_day">Per dag</string>
     <string name="stats_followers_days">%1$d dagen</string>
+    <string name="stats_followers_a_day">Per dag</string>
+    <string name="stats_followers_hours">%1$d uren</string>
+    <string name="stats_followers_an_hour_ago">een uur geleden</string>
+    <string name="stats_followers_minutes">%1$d minuten</string>
     <string name="stats_followers_a_minute_ago">een minuut geleden</string>
     <string name="stats_followers_seconds_ago">seconden geleden</string>
-    <string name="stats_view_top_posts_and_pages">Berichten &amp; pagina\'s</string>
-    <string name="stats_view_videos">Video\'s</string>
-    <string name="stats_view_publicize">Publiceren</string>
     <string name="stats_view_followers">Volgers</string>
+    <string name="stats_view_publicize">Publiceren</string>
+    <string name="stats_view_videos">Video\'s</string>
+    <string name="stats_view_top_posts_and_pages">Berichten &amp; pagina\'s</string>
     <string name="stats_view_countries">Landen</string>
     <string name="stats_likes">Waarderingen</string>
-    <string name="stats_timeframe_years">Jaren</string>
-    <string name="stats_views">Weergaven</string>
     <string name="stats_visitors">Bezoekers</string>
+    <string name="stats_views">Weergaven</string>
+    <string name="stats_timeframe_years">Jaren</string>
+    <string name="themes_fetching">Thema\'s ophalen …</string>
     <string name="ssl_certificate_details">Details</string>
     <string name="cab_selected">%d geselecteerd</string>
     <string name="browse_our_faq_button">Bekijk onze FAQ</string>
-    <string name="reader_label_view_original">Bekijk oorspronkelijk artikel</string>
+    <string name="reader_empty_comments">Nog geen reacties</string>
+    <string name="reader_empty_posts_in_tag">Geen berichten met dit onderwerp</string>
     <string name="reader_label_like">Like</string>
-    <string name="error_refresh_unauthorized_posts">Je hebt geen rechten om berichten te bekijken of te bewerken</string>
+    <string name="reader_label_view_original">Bekijk oorspronkelijk artikel</string>
+    <string name="reader_label_comments_closed">Reacties zijn gesloten</string>
     <string name="reader_title_photo_viewer">%1$d van %2$d</string>
-    <string name="error_refresh_unauthorized_pages">Je hebt geen rechten om pagina\'s te bekijken of te bewerken</string>
     <string name="error_publish_empty_post">Kan een leeg bericht niet publiceren</string>
-    <string name="comment">Reactie</string>
-    <string name="comment_trashed">Reactie verwijderd</string>
-    <string name="older_month">Ouder dan een maand</string>
+    <string name="error_refresh_unauthorized_posts">Je hebt geen rechten om berichten te bekijken of te bewerken</string>
+    <string name="error_refresh_unauthorized_pages">Je hebt geen rechten om pagina\'s te bekijken of te bewerken</string>
+    <string name="error_refresh_unauthorized_comments">Je hebt geen rechten om reacties te bekijken of te bewerken</string>
     <string name="more">Meer</string>
-    <string name="older_two_days">Ouder dan 2 dagen</string>
+    <string name="older_month">Ouder dan een maand</string>
     <string name="older_last_week">Ouder dan een week</string>
-    <string name="comment_reply_to_user">Antwoord op %s</string>
+    <string name="older_two_days">Ouder dan 2 dagen</string>
     <string name="mnu_comment_liked">Liked</string>
+    <string name="comment">Reactie</string>
+    <string name="comment_trashed">Reactie verwijderd</string>
+    <string name="comment_reply_to_user">Antwoord op %s</string>
     <string name="posts_empty_list">Nog geen berichten. Waarom maak je er niet een?</string>
-    <string name="reader_empty_comments">Nog geen reacties</string>
-    <string name="reader_label_comments_closed">Reacties zijn gesloten</string>
-    <string name="error_refresh_unauthorized_comments">Je hebt geen rechten om reacties te bekijken of te bewerken</string>
     <string name="signing_out">Uitloggen…</string>
-    <string name="reader_empty_posts_in_tag">Geen berichten met dit onderwerp</string>
     <string name="reader_toast_err_generic">Deze actie kan niet uitgevoerd worden</string>
-    <string name="reader_menu_block_blog">Blokkeer deze site</string>
     <string name="reader_toast_err_block_blog">Blokkeren van deze site is mislukt</string>
     <string name="reader_toast_blog_blocked">Berichten van deze site zullen niet meer getoond worden</string>
-    <string name="update_verb">Bijwerken</string>
+    <string name="reader_menu_block_blog">Blokkeer deze site</string>
     <string name="schedule_verb">Inplannen</string>
-    <string name="reader_page_followed_blogs">Gevolgde sites</string>
-    <string name="reader_label_followed_blog">Site gevolgd</string>
-    <string name="reader_toast_err_get_blog_info">Kan deze site niet tonen</string>
-    <string name="reader_toast_err_already_follow_blog">Je volgt deze site al</string>
-    <string name="reader_toast_err_follow_blog">Kan deze site niet volgen</string>
-    <string name="reader_toast_err_unfollow_blog">Kan deze site niet ontvolgen</string>
+    <string name="update_verb">Bijwerken</string>
     <string name="reader_empty_recommended_blogs">Geen aanbevolen sites</string>
-    <string name="reader_title_blog_preview">Lezer site</string>
-    <string name="reader_page_followed_tags">Gevolgde onderwerpen</string>
+    <string name="reader_toast_err_unfollow_blog">Kan deze site niet ontvolgen</string>
+    <string name="reader_toast_err_follow_blog">Kan deze site niet volgen</string>
+    <string name="reader_toast_err_already_follow_blog">Je volgt deze site al</string>
+    <string name="reader_toast_err_get_blog_info">Kan deze site niet tonen</string>
+    <string name="reader_label_followed_blog">Site gevolgd</string>
     <string name="reader_hint_add_tag_or_url">Voer een URL of onderwerp in om te volgen</string>
-    <string name="help">Help</string>
-    <string name="forgot_password">Wachtwoord vergeten?</string>
-    <string name="ssl_certificate_error">Ongeldig SSL-certificaat</string>
+    <string name="reader_page_followed_blogs">Gevolgde sites</string>
+    <string name="reader_page_followed_tags">Gevolgde onderwerpen</string>
+    <string name="reader_title_blog_preview">Reader site</string>
     <string name="ssl_certificate_ask_trust">Als je normaal gesproken zonder problemen verbinding maakt met deze site kan deze fout betekenen dat iemand zich probeert voor te doen als deze site. Ga niet verder als dat zo is. Wil je het certificaat toch vertrouwen?</string>
-    <string name="no_network_message">Er is geen netwerk beschikbaar</string>
-    <string name="adding_cat_failed">Toevoegen van categorie mislukt</string>
-    <string name="adding_cat_success">Categorie toegevoegd</string>
-    <string name="cat_name_required">Het veld Categorienaam is verplicht</string>
-    <string name="sdcard_message">Er moet een SD-kaart zijn gekoppeld om media te uploaden</string>
-    <string name="error_load_comment">Kan de reactie niet laden</string>
-    <string name="error_downloading_image">Fout bij downloaden van afbeelding</string>
+    <string name="ssl_certificate_error">Ongeldig SSL-certificaat</string>
+    <string name="help">Help</string>
+    <string name="username_or_password_incorrect">De gebruikersnaam of het wachtwoord is niet correct</string>
+    <string name="email_invalid">Voer een geldig e-mailadres in</string>
     <string name="invalid_email_message">Je e-mailadres is niet geldig</string>
-    <string name="theme_fetch_failed">Fout bij het ophalen van thema\'s</string>
-    <string name="mnu_comment_unspam">Geen spam</string>
-    <string name="gallery_error">Media-item kan niet worden opgehaald</string>
-    <string name="blog_not_found">Er heeft zich een fout voorgedaan tijdens het openen van dit blog</string>
-    <string name="notifications_empty_list">Geen notificaties</string>
-    <string name="error_refresh_posts">Berichten kunnen momenteel niet worden ververst</string>
-    <string name="error_refresh_pages">Pagina\'s kunnen momenteel niet worden ververst</string>
-    <string name="error_refresh_comments">Reacties kunnen momenteel niet worden ververst</string>
-    <string name="error_generic">Er heeft zich een fout voorgedaan</string>
-    <string name="error_moderate_comment">Er heeft zich een fout voorgedaan tijdens het modereren</string>
+    <string name="error_downloading_image">Fout bij downloaden van afbeelding</string>
+    <string name="error_load_comment">Kan de reactie niet laden</string>
     <string name="error_edit_comment">Er heeft zich een fout voorgedaan tijdens het bewerken van de reactie</string>
-    <string name="email_invalid">Voer een geldig e-mailadres in</string>
-    <string name="username_or_password_incorrect">De gebruikersnaam of het wachtwoord is niet correct</string>
+    <string name="error_moderate_comment">Er heeft zich een fout voorgedaan tijdens het modereren</string>
+    <string name="error_generic">Er heeft zich een fout voorgedaan</string>
+    <string name="error_refresh_comments">Reacties kunnen momenteel niet worden ververst</string>
+    <string name="error_refresh_pages">Pagina\'s kunnen momenteel niet worden ververst</string>
+    <string name="error_refresh_posts">Berichten kunnen momenteel niet worden ververst</string>
     <string name="error_deleting_post">Er heeft zich een fout voorgedaan bij het verwijderen van het bericht</string>
-    <string name="select_categories">Categorieën selecteren</string>
-    <string name="connection_error">Verbindingsfout</string>
-    <string name="cancel_edit">Bewerken annuleren</string>
-    <string name="post_not_found">Er heeft zich een fout voorgedaan bij het laden van het bericht. Ververs je berichten en probeer het opnieuw.</string>
-    <string name="learn_more">Meer informatie</string>
-    <string name="media_gallery_type_thumbnail_grid">Miniatuurraster</string>
-    <string name="media_error_no_permission">Je hebt geen rechten om de mediabibliotheek te bekijken</string>
-    <string name="cannot_delete_multi_media_items">Sommige media kan niet worden verwijderd. Probeer het later opnieuw.</string>
-    <string name="link_enter_url_text">Linktekst (optioneel)</string>
-    <string name="page_settings">Pagina-instellingen</string>
-    <string name="local_draft">Lokaal concept</string>
-    <string name="post_settings">Berichtinstellingen</string>
-    <string name="comment_status_approved">Goedgekeurd</string>
-    <string name="comment_status_unapproved">In afwachting</string>
-    <string name="comment_status_spam">Spam</string>
-    <string name="comment_status_trash">Weggegooid</string>
-    <string name="edit_comment">Reactie bewerken</string>
-    <string name="mnu_comment_approve">Goedkeuren</string>
-    <string name="mnu_comment_unapprove">Afkeuren</string>
-    <string name="mnu_comment_spam">Spam</string>
-    <string name="mnu_comment_trash">Prullenbak</string>
-    <string name="dlg_approving_comments">Aan het goedkeuren</string>
-    <string name="dlg_unapproving_comments">Aan het afkeuren</string>
-    <string name="dlg_spamming_comments">Aan het markeren als spam</string>
-    <string name="dlg_trashing_comments">Aan het verplaatsen naar de prullenbak</string>
-    <string name="dlg_confirm_trash_comments">Verplaatsen naar de prullenbak?</string>
-    <string name="trash">Prullenbak</string>
-    <string name="saving_changes">Wijzigingen aan het opslaan</string>
-    <string name="sure_to_cancel_edit_comment">Bewerken van deze reactie annuleren?</string>
-    <string name="content_required">Reactie is vereist</string>
-    <string name="toast_comment_unedited">Reactie is niet gewijzigd</string>
-    <string name="view_in_browser">Weergeven in browser</string>
-    <string name="add_new_category">Nieuwe categorie toevoegen</string>
-    <string name="category_name">Naam categorie</string>
-    <string name="file_error_create">Kan geen tijdelijk bestand maken voor het uploaden van media. Controleer of er genoeg vrije ruimte is op je apparaat.</string>
-    <string name="open_source_licenses">Open-sourcelicenties</string>
-    <string name="http_authorization_required">Autorisatie vereist</string>
-    <string name="new_post">Nieuw bericht</string>
-    <string name="new_media">Nieuwe media</string>
-    <string name="privacy_policy">Privacybeleid</string>
-    <string name="local_changes">Lokale wijzigingen</string>
-    <string name="image_settings">Afbeeldingsinstellingen</string>
-    <string name="wordpress_blog">WordPress-blog</string>
-    <string name="error_blog_hidden">Dit blog is verborgen en kan niet worden geladen. Schakel het blog in instellingen in en probeer het opnieuw.</string>
-    <string name="fatal_db_error">Er heeft zich een fout voorgedaan bij het aanmaken van de database van de app. Probeer de app opnieuw te installeren.</string>
+    <string name="notifications_empty_list">Geen notificaties</string>
+    <string name="sdcard_message">Er moet een SD-kaart zijn gekoppeld om media te uploaden</string>
+    <string name="cat_name_required">Het veld Categorienaam is verplicht</string>
+    <string name="adding_cat_success">Categorie toegevoegd</string>
+    <string name="adding_cat_failed">Toevoegen van categorie mislukt</string>
+    <string name="mnu_comment_unspam">Geen spam</string>
+    <string name="theme_fetch_failed">Fout bij het ophalen van thema\'s</string>
+    <string name="blog_not_found">Er heeft zich een fout voorgedaan tijdens het openen van dit blog</string>
+    <string name="gallery_error">Media-item kan niet worden opgehaald</string>
+    <string name="no_network_message">Er is geen netwerk beschikbaar</string>
+    <string name="reader_toast_err_remove_tag">Niet mogelijk om dit onderwerp te verwijderen</string>
+    <string name="reader_toast_err_add_tag">Niet mogelijk om dit onderwerp toe te voegen</string>
     <string name="reader_title_applog">Applicatielogboek</string>
-    <string name="remove_account">Site verwijderen</string>
+    <string name="fatal_db_error">Er heeft zich een fout voorgedaan bij het aanmaken van de database van de app. Probeer de app opnieuw te installeren.</string>
+    <string name="error_blog_hidden">Dit blog is verborgen en kan niet worden geladen. Schakel het blog in instellingen in en probeer het opnieuw.</string>
+    <string name="error_refresh_media">Media konden op dit moment niet worden vernieuwd</string>
+    <string name="wordpress_blog">WordPress-blog</string>
+    <string name="image_settings">Afbeeldingsinstellingen</string>
+    <string name="local_changes">Lokale wijzigingen</string>
+    <string name="privacy_policy">Privacybeleid</string>
+    <string name="new_media">Nieuwe media</string>
+    <string name="new_post">Nieuw bericht</string>
     <string name="notifications_empty_all">Nog geen meldingen.</string>
+    <string name="http_authorization_required">Autorisatie vereist</string>
     <string name="invalid_site_url_message">Controleer of de ingevoerde site-URL geldig is</string>
-    <string name="error_refresh_media">Media konden op dit moment niet worden vernieuwd</string>
-    <string name="plugin_not_found">Er is een fout opgetreden bij het openen van deze plugin</string>
-    <string name="file_not_found">Kan het bestand voor upload niet vinden. Is het verplaatst of verwijderd?</string>
-    <string name="delete_post">Verwijder bericht?</string>
+    <string name="open_source_licenses">Open-sourcelicenties</string>
+    <string name="file_error_create">Kan geen tijdelijk bestand maken voor het uploaden van media. Controleer of er genoeg vrije ruimte is op je apparaat.</string>
+    <string name="category_name">Naam categorie</string>
+    <string name="add_new_category">Nieuwe categorie toevoegen</string>
+    <string name="view_in_browser">Weergeven in browser</string>
+    <string name="remove_account">Site verwijderen</string>
+    <string name="toast_comment_unedited">Reactie is niet gewijzigd</string>
+    <string name="content_required">Reactie is vereist</string>
+    <string name="sure_to_cancel_edit_comment">Bewerken van deze reactie annuleren?</string>
+    <string name="saving_changes">Wijzigingen aan het opslaan</string>
+    <string name="trash">Prullenbak</string>
+    <string name="dlg_confirm_trash_comments">Verplaatsen naar de prullenbak?</string>
+    <string name="dlg_trashing_comments">Aan het verplaatsen naar de prullenbak</string>
+    <string name="dlg_spamming_comments">Aan het markeren als spam</string>
+    <string name="dlg_unapproving_comments">Aan het afkeuren</string>
+    <string name="dlg_approving_comments">Aan het goedkeuren</string>
+    <string name="mnu_comment_trash">Prullenbak</string>
+    <string name="mnu_comment_spam">Spam</string>
+    <string name="mnu_comment_unapprove">Afkeuren</string>
+    <string name="mnu_comment_approve">Goedkeuren</string>
+    <string name="edit_comment">Reactie bewerken</string>
+    <string name="comment_status_trash">Weggegooid</string>
+    <string name="comment_status_spam">Spam</string>
+    <string name="comment_status_unapproved">In afwachting</string>
+    <string name="comment_status_approved">Goedgekeurd</string>
     <string name="delete_page">Verwijder pagina?</string>
-    <string name="reader_toast_err_add_tag">Niet mogelijk om dit onderwerp toe te voegen</string>
-    <string name="reader_toast_err_remove_tag">Niet mogelijk om dit onderwerp te verwijderen</string>
+    <string name="delete_post">Verwijder bericht?</string>
+    <string name="post_settings">Berichtinstellingen</string>
+    <string name="file_not_found">Kan het bestand voor upload niet vinden. Is het verplaatst of verwijderd?</string>
+    <string name="local_draft">Lokaal concept</string>
+    <string name="page_settings">Pagina-instellingen</string>
+    <string name="link_enter_url_text">Linktekst (optioneel)</string>
+    <string name="cannot_delete_multi_media_items">Sommige media kan niet worden verwijderd. Probeer het later opnieuw.</string>
+    <string name="media_error_no_permission">Je hebt geen rechten om de mediabibliotheek te bekijken</string>
+    <string name="media_gallery_type_thumbnail_grid">Miniatuurraster</string>
+    <string name="learn_more">Meer informatie</string>
+    <string name="post_not_found">Er heeft zich een fout voorgedaan bij het laden van het bericht. Ververs je berichten en probeer het opnieuw.</string>
+    <string name="plugin_not_found">Er is een fout opgetreden bij het openen van deze plugin</string>
+    <string name="cancel_edit">Bewerken annuleren</string>
+    <string name="connection_error">Verbindingsfout</string>
+    <string name="select_categories">Categorieën selecteren</string>
     <string name="share_link">Deel link</string>
     <string name="reader_empty_posts_in_tag_updating">Berichten ophalen…</string>
     <string name="reader_likes_you_and_multi">Jij en %,d anderen vinden dit leuk</string>
     <string name="reader_likes_multi">%,d mensen vinden dit leuk</string>
     <string name="reader_label_reply">Beantwoord</string>
-    <string name="comment_spammed">Reactie als spam gemarkeerd</string>
     <string name="cant_share_no_visible_blog">Je kan niet delen naar WordPress zonder een zichtbare blog</string>
-    <string name="pick_photo">Selecteer foto</string>
-    <string name="pick_video">Selecteer video</string>
+    <string name="comment_spammed">Reactie als spam gemarkeerd</string>
     <string name="reader_toast_err_get_post">Niet in staat om dit bericht op te halen</string>
     <string name="reader_likes_you_and_one">Jij en één andere vinden dit leuk</string>
-    <string name="reader_untitled_post">(geen titel)</string>
-    <string name="reader_btn_share">Delen</string>
-    <string name="reader_btn_follow">Volg</string>
-    <string name="reader_label_added_tag">%s toegevoegd</string>
-    <string name="reader_label_removed_tag">%s verwijderd</string>
+    <string name="pick_video">Selecteer video</string>
+    <string name="pick_photo">Selecteer foto</string>
+    <string name="sign_up_label">Abonneren</string>
     <string name="reader_toast_err_url_intent">Onmogelijk %s te openen</string>
-    <string name="reader_toast_err_share_intent">Onmogelijk te delen</string>
     <string name="reader_toast_err_view_image">Onmogelijk afbeelding te bekijken</string>
-    <string name="empty_list_default">Deze lijst is leeg</string>
-    <string name="reader_likes_one">1 persoon vindt dit leuk</string>
+    <string name="reader_toast_err_share_intent">Onmogelijk te delen</string>
+    <string name="reader_toast_err_tag_invalid">Dat is geen geldig onderwerp</string>
+    <string name="reader_toast_err_tag_exists">Je volgt dit onderwerp al</string>
+    <string name="reader_toast_err_comment_failed">Je reactie kon niet geplaatst worden</string>
     <string name="reader_likes_only_you">Je vindt dit leuk</string>
-    <string name="reader_toast_err_comment_failed">Je reactie kon niet gepost worden</string>
-    <string name="reader_btn_unfollow">Volgend</string>
+    <string name="reader_likes_one">1 persoon vindt dit leuk</string>
+    <string name="reader_label_removed_tag">%s verwijderd</string>
+    <string name="reader_label_added_tag">%s toegevoegd</string>
     <string name="reader_hint_comment_on_comment">Beantwoord reactie…</string>
-    <string name="comments_empty_list">Nog geen reacties</string>
+    <string name="reader_btn_unfollow">Volgend</string>
+    <string name="reader_btn_follow">Volg</string>
+    <string name="reader_btn_share">Delen</string>
     <string name="reader_view_reblog">Rebloggen</string>
-    <string name="sign_up_label">Abonneren</string>
-    <string name="reader_toast_err_tag_exists">Je volgt dit onderwerp al</string>
-    <string name="reader_toast_err_tag_invalid">Dat is geen geldig onderwerp</string>
-    <string name="media_gallery_type_slideshow">Diavoorstelling</string>
-    <string name="media_edit_title_text">Titel</string>
-    <string name="media_edit_caption_text">Onderschrift</string>
-    <string name="themes">Thema\'s</string>
-    <string name="media_gallery_type_squares">Vierkanten</string>
-    <string name="media_gallery_type_circles">Circels</string>
-    <string name="theme_activate_button">Activeren</string>
-    <string name="share_action">Deel</string>
-    <string name="stats">Statistieken</string>
-    <string name="stats_view_clicks">Kliks</string>
-    <string name="stats_view_tags_and_categories">Tags en categorieën </string>
-    <string name="media_edit_description_text">Beschrijving</string>
-    <string name="media_edit_failure">Bijwerken mislukt</string>
-    <string name="stats_timeframe_days">Dagen</string>
-    <string name="stats_timeframe_weeks">Weken</string>
+    <string name="reader_untitled_post">(geen titel)</string>
+    <string name="comments_empty_list">Nog geen reacties</string>
+    <string name="empty_list_default">Deze lijst is leeg</string>
     <string name="stats_timeframe_months">Maanden</string>
+    <string name="stats_timeframe_weeks">Weken</string>
+    <string name="stats_timeframe_days">Dagen</string>
     <string name="stats_timeframe_yesterday">Gisteren</string>
-    <string name="stats_view_referrers">Top auteurs</string>
     <string name="stats_timeframe_today">Vandaag</string>
+    <string name="stats_view_referrers">Top auteurs</string>
+    <string name="stats_view_tags_and_categories">Tags en categorieën </string>
+    <string name="stats_view_clicks">Kliks</string>
+    <string name="stats">Statistieken</string>
+    <string name="share_action">Deel</string>
+    <string name="theme_activate_button">Activeren</string>
+    <string name="media_edit_failure">Bijwerken mislukt</string>
+    <string name="media_edit_description_text">Beschrijving</string>
+    <string name="media_edit_caption_text">Onderschrift</string>
+    <string name="media_edit_title_text">Titel</string>
+    <string name="media_gallery_type_slideshow">Diavoorstelling</string>
+    <string name="media_gallery_type_circles">Circels</string>
     <string name="media_gallery_type_tiled">Tegels</string>
+    <string name="media_gallery_type_squares">Vierkanten</string>
+    <string name="themes">Thema\'s</string>
     <string name="discard">Verwijder</string>
     <string name="manage">Beheer</string>
-    <string name="sign_in">Inloggen</string>
-    <string name="note_reply_successful">Reactie gepubliceerd</string>
-    <string name="new_notifications">%d nieuwe notificaties</string>
     <string name="more_notifications">en %d extra.</string>
+    <string name="new_notifications">%d nieuwe notificaties</string>
     <string name="follows">Volgt</string>
+    <string name="note_reply_successful">Reactie gepubliceerd</string>
+    <string name="sign_in">Inloggen</string>
     <string name="loading">Laden…</string>
-    <string name="httpuser">HTTP gebruikersnaam</string>
     <string name="httppassword">HTTP wachtwoord</string>
+    <string name="httpuser">HTTP gebruikersnaam</string>
     <string name="error_media_upload">Er is een fout opgetreden tijdens het uploaden van media</string>
     <string name="incorrect_credentials">Incorrecte gebruikersnaam en wachtwoord.</string>
-    <string name="password">Wachtwoord</string>
-    <string name="username">Gebruikersnaam</string>
     <string name="log_in">Log In</string>
+    <string name="username">Gebruikersnaam</string>
+    <string name="password">Wachtwoord</string>
     <string name="reader">Reader</string>
-    <string name="no_network_title">Geen netwerk beschikbaar</string>
     <string name="pages">Pagina\'s</string>
     <string name="posts">Berichten</string>
     <string name="anonymous">Anoniem</string>
-    <string name="ok">Ok</string>
+    <string name="no_network_title">Geen netwerk beschikbaar</string>
     <string name="done">Klaar</string>
+    <string name="ok">Ok</string>
     <string name="link_enter_url">URL</string>
-    <string name="version">Versie</string>
     <string name="tos">Eindgebruikersovereenkomst</string>
+    <string name="version">Versie</string>
     <string name="app_title">WordPress voor Android</string>
     <string name="image_alignment">Uitlijning </string>
     <string name="refresh">Vernieuw</string>
@@ -2478,24 +2793,24 @@ Language: nl
     <string name="quickpress_add_error">Snelkoppelingsnaam kan niet leeg zijn.</string>
     <string name="pages_private">Privé</string>
     <string name="title">Titel</string>
-    <string name="categories">Categorieën </string>
     <string name="tags_separate_with_commas">Scheid tags met komma\'s</string>
+    <string name="categories">Categorieën </string>
     <string name="dlg_deleting_comments">Reacties verwijderen</string>
     <string name="sdcard_title">SD kaart is vereist </string>
     <string name="media">Media</string>
-    <string name="delete">Verwijderen</string>
     <string name="approve">Goedkeuren</string>
+    <string name="delete">Verwijderen</string>
     <string name="none">Geen</string>
-    <string name="no">Nee</string>
-    <string name="yes">Ja</string>
+    <string name="publish_now">Nu publiceren</string>
     <string name="reply">Beantwoord</string>
     <string name="on">aan</string>
-    <string name="add">Voeg toe</string>
-    <string name="error">Fout</string>
-    <string name="cancel">Annuleer </string>
-    <string name="save">Bewaar</string>
-    <string name="category_refresh_error">Categorie vernieuwen fout</string>
     <string name="preview">Voorbeeld</string>
+    <string name="category_refresh_error">Categorie vernieuwen fout</string>
+    <string name="error">Fout</string>
+    <string name="no">Nee</string>
+    <string name="yes">Ja</string>
     <string name="notification_settings">Meldingsinstellingen</string>
-    <string name="publish_now">Nu publiceren</string>
+    <string name="add">Voeg toe</string>
+    <string name="save">Bewaar</string>
+    <string name="cancel">Annuleer </string>
 </resources>
diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml
index 0032189a749b..68d52d3a1d11 100644
--- a/WordPress/src/main/res/values-pl/strings.xml
+++ b/WordPress/src/main/res/values-pl/strings.xml
@@ -1,11 +1,109 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-23 08:38:08+0000
+Translation-Revision-Date: 2021-01-11 07:13:31+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: pl
 -->
 <resources>
+    <string name="backup_item_media_uploads">Wgrywanie plików</string>
+    <string name="backup_item_plugins">Wtyczki WordPressa</string>
+    <string name="backup_item_themes">Motywy WordPressa</string>
+    <string name="backup_download_details_icon_content_description">Utwórz ikonę dla kopii zapasowej, którą można pobrać</string>
+    <string name="gutenberg_native_error">Błąd</string>
+    <string name="gutenberg_native_choose_file">Wybierz plik</string>
+    <string name="backup_download_details_action_button">Utwórz plik do pobrania</string>
+    <string name="backup_download_details_header">Utwórz kopię zapasową, która można pobrać</string>
+    <string name="backup_download_details_page_title">Pobierz kopię zapasową</string>
+    <string name="backup_download">Pobranie kopii zapasowej</string>
+    <string name="activity_log_item_menu_download_backup_label">Pobierz kopię zapasową</string>
+    <string name="activity_log_item_menu_restore_label">Odzyskaj do tego punktu przywracania</string>
+    <string name="activity_log_activity_type_filter_header">Filtruj po typie aktywności</string>
+    <string name="dialog_confirm_copy_local_copy_button">Skopiuj wersję z tej aplikacji</string>
+    <string name="dialog_confirm_copy_local_edit_button">Najpierw edytuj wpis</string>
+    <string name="dialog_confirm_copy_local_title">Konflikt synchronizacji wpisu</string>
+    <string name="button_copy">Zduplikuj</string>
+    <string name="toast_edit_story_update_in_progress_title">Relacja jest zapisywana, proszę czekać…</string>
+    <string name="gutenberg_native_file_name">Nazwa pliku:</string>
+    <string name="gutenberg_native_file_block_settings">Ustawienia bloku pliku</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Nie można było zapisać plików.\nStuknij aby wejść w opcje.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Nie można było przesłać plików.\nStuknij aby wejść w opcje.</string>
+    <string name="gutenberg_native_edit_file">Edytuj plik</string>
+    <string name="gutenberg_native_copy_file_url">Kopiuj adres URL pliku</string>
+    <string name="gutenberg_native_choose_a_file">WYBIERZ PLIK</string>
+    <string name="new_site_creation_domain_header_title">Wybierz domenę</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Nie można było cofnąć subskrypcji komentarzy dla tego wpisu</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Nie można było subskrybować komentarzy dla tego wpisu</string>
+    <string name="reader_follow_comments_get_status_error">Błąd pobierania statusu subskrypcji dla wpisu</string>
+    <string name="reader_follow_comments_unsubscribe_success">Udało się cofnąć subskrypcję komentarzy</string>
+    <string name="activity_log_activity_type_filter_clear">Wyczyść</string>
+    <string name="activity_log_activity_type_filter_apply">Zastosuj</string>
+    <string name="reader_follow_comments_subscribe_success">Udało się zasubskrybować komentarze</string>
+    <string name="reader_follow_comments_bad_format_response">Otrzymano nieprawidłową odpowiedź</string>
+    <string name="reader_follow_comments_null_response">Nie otrzymano żadnej odpowiedzi</string>
+    <string name="dialog_edit_story_unsupported_format_title">Pliki GIF nie są obsługiwane</string>
+    <string name="dialog_edit_story_unrecoverable_title">Nie można edytować Relacji</string>
+    <string name="dialog_edit_story_unavailable_title">Nie można edytować Relacji</string>
+    <string name="dialog_edit_story_unrecoverable_message">Nie można było odnaleźć w witrynie mediów dla tej relacji</string>
+    <string name="dialog_edit_story_unavailable_message">Nie można było wczytać mediów dla tej Relacji. Sprawdź swoje połączenie internetowe i spróbuj ponownie za chwilę.</string>
+    <string name="dialog_edit_story_limited_title">Ograniczone edytowanie Relacji</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media zostały usunięte. Proszę spróbować odtworzyć relację.</string>
+    <string name="color_picker_label_background">Tło</string>
+    <string name="color_picker_label_text">Tekst</string>
+    <string name="dialog_discard_story_ok_button_edit">Odrzuć</string>
+    <string name="dialog_discard_story_message_edit">Wszelkie zmiany nie zostaną zapisane</string>
+    <string name="dialog_discard_story_title_edit">Odrzucić zmiany?</string>
+    <string name="label_done_button">Gotowe</string>
+    <string name="label_next_button">Następny</string>
+    <string name="delete_button_alt">Usuń</string>
+    <string name="hpp_choose_error">Wystąpił błąd podczas wyboru projektu</string>
+    <string name="hpp_retry_error">Sprawdź swoje połączenie internetowe i spróbuj ponownie.</string>
+    <string name="hpp_error_subtitle">Stuknij ponów kiedy będziesz spowrotem online</string>
+    <string name="hpp_error_title">Szablony nie są dostępne w trybie offline</string>
+    <string name="continue_site_credentials">Zaloguj się za pomocą danych uwierzytelniających tej witryny</string>
+    <string name="login_find_your_connected_email">Odnajdź swój połączony email</string>
+    <string name="reader_discover_no_posts_button_text">Obserwuj tematy</string>
+    <string name="reader_discover_no_posts_subtitle">Spróbuj poniższych tematów aby poszerzyć wyszukiwanie</string>
+    <string name="reader_discover_no_posts_title">Brak ostatnich wpisów</string>
+    <string name="reader_discover_empty_title">Witaj!</string>
+    <string name="scan">Skanuj</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; odpowiedział na twój wpis</string>
+    <string name="login_prologue_third_subtitle_two">Twoja witryna otrzymała dziś &lt;b&gt;50 polubień&lt;/b&gt;</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; polubił(a) twój wpis</string>
+    <string name="hpp_skip_button">Pomiń</string>
+    <string name="hpp_choose_button">Wybierz</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Otwarto przewijalne menu blokowe. Wybierz blok.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Zamknięto przewijalne menu blokowe. </string>
+    <string name="hpp_subtitle">Wybierz swój ulubiony szablon dla strony głównej. Możesz go edytować i dostosować w późniejszym czasie.</string>
+    <string name="hpp_title">Wybierz wzór</string>
+    <string name="prepublishing_nudges_add_category_button">Dodaj kategorię</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorie</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Nie ustawiono</string>
+    <string name="prepublishing_nudges_categories_action">Kategorie</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Dodaj nową kategorię</string>
+    <string name="mlp_error_title">Szablony nie są dostępne z powodu błędu</string>
+    <string name="mlp_network_error_title">Szablony nie są dostępne w trybie offline</string>
+    <string name="mlp_network_error_subtitle">Stuknij ponów kiedy będziesz spowrotem online lub stwórz pustą stronę używając poniższego przycisku.</string>
+    <string name="mlp_error_subtitle">Stuknij ponów lub stwórz pustą stronę używając poniższego przycisku.</string>
+    <string name="login_prologue_fifth_tag_six">Polityka</string>
+    <string name="login_prologue_fifth_tag_five">Muzyka</string>
+    <string name="login_prologue_fifth_tag_four">Ogrodnictwo</string>
+    <string name="login_prologue_fifth_tag_three">Piłka nożna</string>
+    <string name="login_prologue_fifth_tag_two">Gotowanie</string>
+    <string name="login_prologue_fifth_tag_one">Sztuka</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_fifth_caption_three">Muzea w Londynie</string>
+    <string name="login_prologue_fifth_caption_two">Najlepsi na świecie fani</string>
+    <string name="login_prologue_fifth_caption_one">Moje dziesięć ulubionych kawiarni</string>
+    <string name="login_prologue_fifth_subtitle_two">Wiadomości Web</string>
+    <string name="login_prologue_title_second">Dzięki potężnemu edytorowi możesz w locie dodawać nowe wpisy.</string>
+    <string name="login_prologue_title_first">Witaj na najbardziej popularnej platformie do tworzenia witryny internetowej</string>
+    <string name="login_prologue_title_fourth">Obserwuj jak rośnie twoja publiczność dzięki zaawansowanej analityce.</string>
+    <string name="login_prologue_title_third">Sprawdzaj komentarze i otrzymuj powiadomienia w czasie rzeczywistym.</string>
+    <string name="login_prologue_second_subtitle_one">Czerpanie inspiracji</string>
+    <string name="media_loading_failed">Nie udało się wczytać plików mediów</string>
+    <string name="reader_discover_recommended_blogs_header">Witryny do obserwacji</string>
     <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' nie jest w pełni wspierana</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Z każdym wydaniem pracujemy nad dodawaniem większej ilości bloków.</string>
     <string name="stories_intro_create_story_post_label">Utwórz wpis z relacją</string>
@@ -17,21 +115,18 @@ Language: pl
     <string name="stories_intro_description_first">Połącz zdjęcia, filmy i tekst aby utworzyć interesujące wpisy z relacjami.</string>
     <string name="stories_intro_image_caption_second">Przykładowy tytuł relacji</string>
     <string name="stories_intro_image_caption_first">Jak utworzyć wpis z relacją</string>
-    <string name="stories_intro_main_subtitle">Uzyskałeś/aś wczesny dostęp do wpisów z relacjami. Zachęcamy ciebie do wypróbowania tej funkcji.</string>
     <string name="stories_intro_main_title">Wprowadzamy wpisy z relacjami</string>
     <string name="stories_intro_title_first">Nowe relacje są dla każdego</string>
-    <string name="mlp_generic_error">Wystąpił błąd podczas pobierania układów</string>
     <string name="mlp_notice_blank_page_created">Utworzono pustą stronę</string>
     <string name="mlp_notice_page_created">Utworzono stronę</string>
-    <string name="mlp_preview_title">Podgląd układu</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s nie ma dostępu do twoich zdjęć. Aby to naprawić, edytuj uprawnienia i włącz %2$s i %3$s.</string>
     <string name="media_insert_failed">Nie udało się osadzić plików mediów.</string>
     <string name="media_insert_failed_with_reason">Nie udało się osadzić plików mediów: %s</string>
     <string name="photo_picker_wordpress_media_library">Wybierz z biblioteki mediów WordPressa</string>
     <string name="reader_label_toolbar_back">Cofnij</string>
     <string name="reader_discover_empty_button_text">Rozpocznij</string>
-    <string name="reader_discover_empty_title">Obserwuj tematy aby odkryć nowe blogi</string>
     <string name="reader_post_details_header_by_author_name">Autor</string>
+    <string name="reader_discover_empty_subtitle">Obserwuj tematy aby odkryć nowe blogi</string>
     <string name="stats_referrer_popup_menu_mark_as_spam">Oznacz jako Spam</string>
     <string name="stats_referrer_popup_unmark_as_spam">Oznacz jako Nie Spam</string>
     <string name="stats_referrer_popup_menu_open_website">Otwórz witrynę</string>
@@ -44,7 +139,6 @@ Language: pl
     <string name="gutenberg_native_add_this_telephone_link">Dodaj ten odnośnik do numeru telefonu</string>
     <string name="gutenberg_native_add_this_link">Dodaj ten odnośnik</string>
     <string name="gutenberg_native_add_this_email_link">Dodaj ten odnośnik adresu email</string>
-    <string name="suggestion_no_connection">\"Brak połączenia internetowego.\nSugestie nie są dostępne.\"</string>
     <string name="typeface_label_shrikhand">Pogrubiona</string>
     <string name="typeface_label_space_mono">Nowoczesna</string>
     <string name="typeface_label_pacifico">Zabawna</string>
@@ -64,10 +158,8 @@ Language: pl
     <string name="error_media_xmlrcp_server_error">Wystąpił wewnętrzny błąd serwera</string>
     <string name="error_media_xmlrpc_not_allowed">Twoje działanie nie jest dozwolone</string>
     <string name="show_n_hidden_items_desc">%1$s więcej elementów</string>
-    <string name="gutenberg_native_angle">Obrót</string>
     <string name="gutenberg_native_select_a_layout">Wybierz układ</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Uwaga: Układ kolumny może różnić się pomiędzy motywami i różnymi wymiarami ekranów</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">Może polubisz</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ukryj</string>
     <string name="create_post_story_fab_tooltip">Utwórz wpis lub relację</string>
@@ -104,7 +196,6 @@ Language: pl
     <string name="story_saving_untitled">Bez tytułu</string>
     <string name="dialog_discard_page_ok_button">Usuń</string>
     <string name="dialog_discard_errored_page_message">Ten slajd nie został jeszcze zachowany. Jeśli go usuniesz, stracisz wszystkie zmiany, które wprowadziłeś.</string>
-    <string name="menu_delete_page">Usuń slajd</string>
     <string name="label_text_color_button">Zmień kolor tekstu</string>
     <string name="label_text_alignment_button">Zmień wyrównanie tekstu</string>
     <string name="label_frame_errored">z błędem</string>
@@ -119,8 +210,6 @@ Language: pl
     <string name="label_retry_icon">Ponów</string>
     <string name="label_saved_icon">Zapisana</string>
     <string name="label_close_button">Zamknij</string>
-    <string name="label_control_publish">Dalej</string>
-    <string name="label_done">Zrobione</string>
     <string name="label_snackbar_share">UDOSTĘPNIJ</string>
     <string name="label_snackbar_loop_frame_saved">Zapisano w obrazach</string>
     <string name="label_control_retry">Ponów</string>
@@ -130,7 +219,6 @@ Language: pl
     <string name="label_control_flip_camera">Odwróć</string>
     <string name="sound_button_alt">Dźwięk</string>
     <string name="text_button_alt">Tekst</string>
-    <string name="more_button_alt">Więcej</string>
     <string name="stickers_button_alt">Naklejki</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">kamera z funkcją flip</string>
@@ -140,7 +228,7 @@ Language: pl
     <string name="mlp_create_blank_page">Utwórz pustą stronę</string>
     <string name="mlp_choose_layout_subtitle">Zacznij od wybrania układu z szerokiej gamy gotowców lub rozpocznij z pustą stroną.</string>
     <string name="mlp_choose_layout_title">Wybierz układ</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Stuknij %1$s Utwórz. %2$s Następnie wybierz &lt;b>Wpis na blogu&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Stuknij %1$s Utwórz. %2$s Następnie wybierz &lt;b&gt;Wpis na blogu&lt;/b&gt;</string>
     <string name="label_share_to">Udostępnij na</string>
     <string name="prepublishing_nudges_story_title_hint">Nadaj tytuł swojej relacji</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Utwórz wpis lub relację</string>
@@ -158,13 +246,10 @@ Language: pl
     <string name="gutenberg_native_choose_image_or_video">Wybierz zdjęcie lub film</string>
     <string name="gutenberg_native_choose_image">Wybierz obrazek</string>
     <string name="gutenberg_native_block_removed">Blok usunięto</string>
-    <string name="content_description_logo">Logo WordPressa</string>
-    <string name="enter_your_site_address">Wprowadź adres witryny</string>
-    <string name="continue_with_wpcom">Kontynuuj z WordPress.com</string>
     <string name="signup_confirmation_title">Potwierdzenie rejestracji</string>
     <string name="continue_with_google_terms_of_service_text">Jeśli kontynuujesz z logowamiem poprzez Google, a nie masz jeszcze konta na WordPress.com, zakładasz automatycznie konto i zgadzasz się z naszymi %1$sWarunkami świadczenia usługi%2$s.</string>
+    <string name="enter_your_site_address">Wprowadź adres swojej istniejącej witryny</string>
     <string name="continue_terms_of_service_text">Kontynuując, zgadzasz się z naszymi %1$sWarunkami świadczenia usługi%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Prześlemy tobie odnośnik, za pomocą którego utworzysz nowe konto na WordPress.com.</string>
     <string name="signup_confirmation_message">Twój adres email będzie użyty to utworzenia twojego nowego konta na WordPress.com.</string>
     <string name="signup_magic_link_message">Wysłaliśmy tobie odnośnik, za pomocą którego utworzysz nowe konto na WordPress.com. Sprawdź pocztę na tym urządzeniu, i stuknij odnośnik we wiadomości email, którą otrzymasz od WordPress.com</string>
     <string name="enter_account_info_for_site">Wprowadź informacje dotyczące swoje konta dla %1$s.</string>
@@ -181,19 +266,15 @@ Language: pl
     <string name="or_type_your_password">Lub wprowadź hasło</string>
     <string name="create_account">Utwórz konto</string>
     <string name="send_link_by_email">Wyślij odnośnik przez email</string>
-    <string name="login_promo_text_unlock_the_power">Wykorzystaj możliwości najbardziej elastycznego kreatora witryny.</string>
-    <string name="login_promo_title_37_percent">37\% internetu jest oparte na WordPressie.</string>
     <string name="reset_your_password">Zresetuj hasło</string>
     <string name="reader_error_request_failed_title">Wystąpił błąd podczas obsługi tego zapytania. Proszę spróbować ponownie później.</string>
     <string name="quick_start_list_update_site_title_title">Ustaw tytuł witryny</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Stuknij &lt;b>%1$s&lt;/b> aby nadać nowy tytuł</string>
-    <string name="quick_start_list_update_site_title_subtitle">Nadaj witrynie nazwę, która odzwierciedla jej osobowość i tematykę. Pierwsze wrażenie się liczy!</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Stuknij &lt;b&gt;%1$s&lt;/b&gt; aby nadać nowy tytuł</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Usunięcie tego wpisu anuluje lokalne zmiany, czy jesteś pewien/pewna że chcesz kontynuować?</string>
     <string name="gutenberg_native_s_block_options">%s opcje bloku</string>
     <string name="gutenberg_native_duplicate_block">Duplikuj blok</string>
     <string name="gutenberg_native_copy_block">Skopiuj blok</string>
     <string name="gutenberg_native_copied_block">Skopiowany blok</string>
-    <string name="gutenberg_native_block_settings">Ustawienia bloku</string>
     <string name="gutenberg_native_block_pasted">Blok wklejony</string>
     <string name="gutenberg_native_block_duplicated">Blok zduplikowany</string>
     <string name="gutenberg_native_block_cut">Blok wycięty</string>
@@ -209,7 +290,6 @@ Language: pl
     <string name="gutenberg_native_gradient_type">Typ gradientu</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Stuknij dwukrotnie aby wybrać opcję</string>
     <string name="gutenberg_native_customize_gradient">Personalizuj gradient</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autor strony</string>
     <string name="photo_picker_use_gif">Użyj tego GIFa</string>
     <string name="error_media_thumbnail_not_loaded">Nie można było wczytać miniatury tego pliku mediów</string>
@@ -232,8 +312,6 @@ Language: pl
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Usunięte wpisy nie mogą być edytowane. Czy chcesz zmienić status tego wpisu na \"szkic\", tak aby można było na nim pracować?</string>
     <string name="prepublishing_nudges_toolbar_title_publish">Data publikacji</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Przesieść wpis do Szkiców?</string>
-    <string name="reader_label_choose_your_interests">Wybierz swoje zainteresowania</string>
-    <string name="reader_choose_interests_content_description">Wybierz swoje zainteresowania</string>
     <string name="reader_btn_done">Gotowe</string>
     <string name="reader_btn_select_few_interests">Wybierz kilka aby kontynuować</string>
     <string name="post_status_post_published">Opublikowano</string>
@@ -245,16 +323,11 @@ Language: pl
     <string name="ccpa_privacy_notice_header">Notka dotycząca prywatności dla użytkowników Kaliforni</string>
     <string name="status_and_visibility">Status i widoczność</string>
     <string name="update_now">Aktualizuj teraz</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
     <string name="gutenberg_native_open_block_actions_menu">Otwórz menu działań na blokach</string>
-    <string name="gutenberg_native_try_a_starter_layout">Wypróbuj układ startowy</string>
-    <string name="gutenberg_native_insert_mention">Wstaw wzmiankę</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Stuknij dwukrotnie aby otworzyć dolną zakładkę z dostępnymi opcjami</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Stuknij dwukrotnie aby otworzyć zakładkę akcji z dostępnymi opcjami</string>
     <string name="pages_cannot_be_started">Nie można było otworzyć stron w tej chwili. Proszę spróbować później</string>
     <string name="pages_set_as_homepage">Ustaw jako stronę domową</string>
-    <string name="suggestion_no_matching_users">\"Brak pasujących użytkowników\"</string>
-    <string name="suggestion_invalid_user">\"%s nie jest prawidłową nazwą użytkownika\"</string>
     <string name="site_settings_select_page">Wybierz Stronę</string>
     <string name="site_settings_posts_page">Strona z wpisami</string>
     <string name="site_settings_static_homepage">Statyczna strona główna</string>
@@ -276,7 +349,6 @@ Language: pl
     <string name="page_posts_page_successfully_updated">Strona z wpisami zaktualizowana</string>
     <string name="page_cannot_set_homepage">Aby ustawić Stronę główną włącz opcję \"Statyczna strona główna\" w ustawieniach witryny</string>
     <string name="gutenberg_native_select_a_color">Wybierz kolor</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Witaj na nowym blogu</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Stuknij dwukrotnie, by przejść do ustawień kolorów</string>
     <string name="reader_empty_followed_blogs_description">Gdy zaczniesz śledzić inne witryny, zobaczysz tutaj ich treść</string>
     <string name="feature_announcement_find_out_mode">Dowiedz się więcej</string>
@@ -310,7 +382,6 @@ Language: pl
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Przesuń blok w prawo z pozycji %1$s na pozycję %2$s</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Przesuń blok w lewo z pozycji %1$s na pozycję %2$s</string>
     <string name="new_site_creation_creating_site_loading_title">Hurra!\nPrawie gotowe</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_3">Ustawianie motywu</string>
     <string name="new_site_creation_creating_site_loading_4">Tworzenie kokpitu</string>
     <string name="new_site_creation_creating_site_loading_1">Pobieranie adresu URL witryny</string>
@@ -365,56 +436,17 @@ Language: pl
     <string name="editor_page_saved_online">Strona zapisana online</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Dokonałeś w ostatnim czasie zmian na tej stronie, ale nie zostały zapisane. Wybierz którą wersję wczytać:\n</string>
     <string name="quickpress_shortcut_activity_label">Wybierz blog dla skrótu QuickPress</string>
-    <string name="gutenberg_native_what_people_say">Co mówią ludzie</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Oferujemy zakres usług aby pomóc tobie w osiągnięciu wyników, które ciebie interesują. Nie masz pewności czego potrzebujesz, lub ile to kosztuje. Możemy wyjaśnić jakie usługi są dla ciebie właściwe i powiemy ci o naszych stawkach. Skontaktuj się z nami.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Jesteśmy małym zespołem utalentowanych profesjonalistów z szerokim zakresem umiejętności i doświadczeń. Kochamy to co robimy i robimy to z pasją. Czekamy z niecierpliwością aby rozpocząć współpracę z tobą. </string>
-    <string name="gutenberg_native_warning_message">Ostrzeżenie</string>
-    <string name="gutenberg_native_want_to_work_with_us">Chcesz pracować z nami?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Odwiedzający witrynę będą chcieli wiedzieć kto jest po drugiej stronie. Wykorzystaj tą przestrzeń aby napisać więcej o sobie, swojej witrynie, swoimi biznesie, lub cokolwiek innego chcesz . Użyj rekomendacji poniżej aby zacytować innych, mówiących o tej samej rzeczy - ich słowami.</string>
-    <string name="gutenberg_native_usa">USA</string>
-    <string name="gutenberg_native_team">Zespół</string>
-    <string name="gutenberg_native_strategy">Strategia</string>
     <string name="gutenberg_native_show_post_content">Pokaż treść wpisu</string>
-    <string name="gutenberg_native_services">Usługi</string>
-    <string name="gutenberg_native_samuel_the_dog">Pies Samuel</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nazwa projektu</string>
-    <string name="gutenberg_native_position_or_job_title">Nazwa stanowiska</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Aby zacząć trzeba przestać gadać i zacząć robić.</string>
-    <string name="gutenberg_native_success_message">Komunikat o pozytywnym zakończeniu</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">To jest przykładowa treść, zawarta w szablonie, która ilustruje jego możliwości. Usuń ją i wstaw swoje słowa i media.</string>
-    <string name="gutenberg_native_portfolio">Portfolio</string>
     <string name="gutenberg_native_link_to">Odnośnik do</string>
     <string name="gutenberg_native_only_show_excerpt">Pokaż tylko zajawkę</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Porozmawiajmy 👋 Nie wahaj się skontaktować z nami lub wysłać wiadomość przy pomocy formularza</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Moje portfolio prezentuje różne projekty stworzone w toku mojej kariery. Poniżej moje dane kontaktowe - skontaktuj się.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Zbudujmy coś razem!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Zbudujmy coś razem!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_inspiration">Inspiracja</string>
-    <string name="gutenberg_native_get_in_touch">Skontaktuj się</string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
     <string name="gutenberg_native_excerpt_length_words">Długość zajawki (ilość słów)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Napisz do mnie email:  &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">To twój wybór Harry, który pokazyje kim naprawdę jesteśmy, dużo więcej niż nasze możliwości.</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Nie płacz bo się skończyło, śmiej się bo się zdarzyło.</string>
     <string name="gutenberg_native_customize">PERSONALIZUJ</string>
-    <string name="gutenberg_native_city_10100">Miasto, 10100</string>
     <string name="gutenberg_native_add_paragraph_block">Dodaj blok paragrafu</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Krótki opis usług które oferujesz.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Opis projektu i zaprezentowanych prac</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Krótki życiorys z osobistą historią, kluczowe osiągnięcia lub interesujący fakt.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">Stwórz wpis</string>
     <string name="post_list_tab_trashed_posts">Usunięto do kosza</string>
     <string name="post_list_tab_scheduled_posts">Zaplanowany</string>
     <string name="post_list_tab_published_posts">Opublikowano</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Nie połączono</string>
-    <string name="my_site_select_domains_page_title">Adres witryny</string>
     <string name="sharing_facebook_account_must_have_pages">Połączenie z Facebookiem nie może odnaleźć żadnych Stron. Publicize nie może połączyć się z profilami Facebooka, tylko z publikowanymi Stronami.</string>
     <string name="notifications_tab_title_likes">Polubienia</string>
     <string name="notifications_tab_title_follows">Obserwuje</string>
@@ -429,14 +461,12 @@ Language: pl
     <string name="stats_management_add_new_stats_card">Dodaj kartę nowych statystyk</string>
     <string name="reader_self_hosted_select_filter">Użyj przycisku filtra aby odnaleźć wpisy dotyczące określonych tematów</string>
     <string name="reader_bottom_sheet_content_description">Wybierz znacznik lub witrynę, wyskakujące okienko</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Wybrano</string>
     <string name="reader_btn_select_filter_content_description">Wybierz witrynę lub znacznik aby odfiltrować wpisy</string>
     <string name="reader_btn_remove_filter_content_description">Usuń bieżący filtr</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Zaloguj się do WordPress.com</string>
     <string name="reader_title_subs">Zarządzaj Tematami i Witrynami</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Zaloguj się do WordPress.com aby zobaczyć ostatnie wpisy, z witryn które obserwujesz</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Zaloguj się do WordPress.com aby zobaczyć ostatnie wpisy dotyczące tematów, które obserwujesz</string>
-    <string name="gutenberg_native_template_preview">Podgląd szablonu</string>
     <string name="gutenberg_native_replace_current_block">Zamień aktualny blok</string>
     <string name="gutenberg_native_add_to_end">Dodaj zakończenie</string>
     <string name="gutenberg_native_add_to_beginning">Dodaj początek</string>
@@ -449,7 +479,6 @@ Language: pl
     <string name="reader_filter_main_title">Obserwowane</string>
     <string name="reader_filter_cta">Filtr</string>
     <string name="gutenberg_native_edit_video">Edytuj film</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Stuknij dwukrotnie aby wybrać układ</string>
     <string name="gutenberg_native_add_a_shortcode">Dodaj krótki kod (shortcode)…</string>
     <string name="gutenberg_native_video_caption_s">Podpis pod filmem. %s</string>
     <string name="post_list_author">Autor wpisu</string>
@@ -466,9 +495,6 @@ Language: pl
     <string name="stats_posting_activity_end_description">Sprawdziłeś już statystyki za ten okres.\n      Stuknij jeszcze raz i rozpoczniesz od nowa.</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
     <string name="create_post_page_fab_tooltip">Stwórz wpis lub stronę</string>
-    <string name="gutenberg_native_move_image_forward">Przesuń obrazek dalej</string>
-    <string name="gutenberg_native_move_image_backward">Przesuń obrazek do tyłu</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Aktualna wartość to %2$s</string>
     <string name="gutenberg_native_gallery_caption_s">Podpis galerii. %s</string>
     <string name="post_signup_interstitial_not_right_now">Nie teraz</string>
     <string name="content_description_person_building_website">Osoba budująca witrynę</string>
@@ -482,24 +508,19 @@ Language: pl
     <string name="my_site_bottom_sheet_add_post">Wpis na blogu</string>
     <string name="my_site_bottom_sheet_title">Dodaj nowy</string>
     <string name="post_settings_publish">Opublikuj</string>
-    <string name="dialog_gutenberg_informative_description_v2">Wprowadziliśmy znaczące usprawnienia w edytorze blokowym i wydaję się nam, że warto spróbować. Uaktywniliśmy je dla nowych wpisów i stron, ale jeśli chciałbym przejść na klasyczny edytor, przejdź, do zakładki \'Moja witryna\'>\'Ustawienia witryny\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Synchronizuj teraz</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Ten wpis będzie natychmiast zsynchronizowany.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Gotowe do synchronizacji?</string>
     <string name="new_site_creation_unavailable_domain">Domena nie jest dostępna</string>
-    <string name="login_promo_viewpager_content_description">Wprowadzenie</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Nie byliśmy w stanie uzyskać dostępu do twojej witryny. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
-    <string name="login_discovery_error_ssl">Nie byliśmy w stanie uzyskać dostępu do twojej witryny z powodu problemu z &lt;b>SSL Certificatem&lt;/b>. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
-    <string name="login_discovery_error_http_auth">Nie byliśmy w stanie uzyskać dostępu do twojej witryny ponieważ wymaga &lt;b>Authentykacji HTTP&lt;/b>. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
-    <string name="send_verification_email">Wyślij email weryfikacyjny</string>
+    <string name="login_discovery_error_ssl">Nie byliśmy w stanie uzyskać dostępu do twojej witryny z powodu problemu z &lt;b&gt;SSL Certificatem&lt;/b&gt;. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
+    <string name="login_discovery_error_http_auth">Nie byliśmy w stanie uzyskać dostępu do twojej witryny ponieważ wymaga &lt;b&gt;Authentykacji HTTP&lt;/b&gt;. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
     <string name="reader_following_display_name">Obserwowane</string>
     <string name="enter_credentials_for_site">Zaloguj się za pomocą danych uwierzytelniających %1$s tej witryny</string>
-    <string name="login_discovery_error_xmlrpc">Nie byliśmy w stanie uzyskać dostępu do &lt;b>pliku XMLRPC&lt;/b> na twojej witrynie. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
-    <string name="login_site_credentials_magic_link_label">Prawie zakończone! Musimy tylko sprawdzić twój adres email &lt;b>%1$s&lt;/b> podłączony do Jetpacka</string>
+    <string name="login_discovery_error_xmlrpc">Nie byliśmy w stanie uzyskać dostępu do &lt;b&gt;pliku XMLRPC&lt;/b&gt; na twojej witrynie. Aby rozwiązać ten problem, sprawdź dostęp do hosta.</string>
+    <string name="login_site_credentials_magic_link_label">Prawie zakończone! Musimy tylko sprawdzić twój adres email &lt;b&gt;%1$s&lt;/b&gt; podłączony do Jetpacka</string>
     <string name="my_site_bottom_sheet_add_page">Strona witryny</string>
-    <string name="enter_site_credentials_instead">Zaloguj się za pomocą danych uwierzytelniających tej witryny.</string>
-    <string name="suffix_1_000">%s tys.</string>
     <string name="suffix_1_000_000_000">%s mld</string>
     <string name="suffix_1_000_000">%s mln</string>
     <string name="suffix_1_000_000_000_000_000">%s bld</string>
@@ -513,23 +534,19 @@ Language: pl
     <string name="posts_cannot_be_started">Nie możemy w tym momencie otworzyć wpisów. Proszę spróbować ponownie później</string>
     <string name="reader_filter_tags_title">Tematy</string>
     <string name="gutenberg_native_wordpress_media_library">Biblioteka mediów WordPressa</string>
+    <string name="gutenberg_native_unsupported">Niewspierane</string>
     <string name="gutenberg_native_ungroup">Rozgrupuj</string>
     <string name="gutenberg_native_translate">Przetłumacz</string>
-    <string name="gutenberg_native_title">Tytuł:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Stuknij aby ukryć klawiaturę</string>
     <string name="gutenberg_native_tap_here_to_show_help">Stuknij tutaj aby otworzyć pomoc</string>
     <string name="gutenberg_native_take_a_video">Nakręć film</string>
     <string name="gutenberg_native_take_a_photo_or_video">Zrób zdjęcie lub nakręć film</string>
     <string name="gutenberg_native_take_a_photo">Wykonaj zdjęcie</string>
     <string name="gutenberg_native_start_writing">Rozpocznij pisanie…</string>
-    <string name="gutenberg_native_size">Rozmiar</string>
     <string name="gutenberg_native_show_section">Wybierz sekcję</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s blok. Ten blok ma nieprawidłową zawartość</string>
     <string name="gutenberg_native_s_block_empty">%s blok. Puste</string>
-    <string name="gutenberg_native_reset_block">Resetuj blok</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Wtyczka paska bocznego</string>
     <string name="gutenberg_native_cut_block">Wytnij blok</string>
-    <string name="gutenberg_native_remove_annotations">Usuń przypis</string>
     <string name="gutenberg_native_problem_opening_the_video">Problem podczas otwierania filmu</string>
     <string name="gutenberg_native_problem_displaying_block">Problem z wyświetlaniem bloku</string>
     <string name="gutenberg_native_post_title_s">Tytuł wpisu. %s</string>
@@ -539,10 +556,6 @@ Language: pl
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Żadna aplikacja nie jest w stanie obsłużyć tego zapytania. Proszę zainstalować przeglądarkę.</string>
     <string name="gutenberg_native_page_break_block_s">Blok końca strony. %s</string>
     <string name="gutenberg_native_navigate_up">Nawiguj w górę</string>
-    <string name="gutenberg_native_my_post_status_info">Informacje o statusie mojego wpisu</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Panel wstępnej publikacji</string>
-    <string name="gutenberg_native_my_post_publish_panel">Panel publikacji mojego wpisu</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panel ustawień dokumentu</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Przesuń blok w górę z wiersza %1$s do wiersza %2$s</string>
     <string name="gutenberg_native_move_block_up">Przesuń blok w górę</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Przesuń blok w dół z wiersza %1$s do wiersza %2$s</string>
@@ -550,7 +563,6 @@ Language: pl
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Nie można było osadzić plików mediów.\nStuknij aby wejść w opcje.</string>
     <string name="gutenberg_native_move_block_down">Przesuń blok w dół</string>
     <string name="gutenberg_native_hide_keyboard">Ukryj klawiaturę</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Tutaj jest zawartość panelu!</string>
     <string name="gutenberg_native_help_icon">Ikona pomocy</string>
     <string name="gutenberg_native_image_caption_s">Podpis pod obrazkiem. %s</string>
     <string name="gutenberg_native_double_tap_to_select_an_image">Stuknij dwukrotnie aby wybrać obrazek</string>
@@ -561,12 +573,9 @@ Language: pl
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Stuknij dwukrotnie aby przesunąć blok do góry</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Stuknij dwukrotnie aby przesunąć blok w dół</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Stuknij dwukrotnie aby edytować tą wartość</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Stuknij dwukrotnie aby zmienić wartość przy użyciu suwaka</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Stuknij dwukrotnie aby dodać blok</string>
     <string name="gutenberg_native_current_value_is_s">Aktualna wartość to %s</string>
-    <string name="gutenberg_native_content">Treść…</string>
     <string name="gutenberg_native_choose_from_device">Wybierz z urządzenia</string>
-    <string name="gutenberg_native_annotations_sidebar">Pasek boczny przypisu</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Wystąpił nieznany błąd. Spróbuj ponownie.</string>
     <string name="gutenberg_native_alt_text">Tekst alternatywny</string>
     <string name="gutenberg_native_add_video">DODAJ FILM</string>
@@ -574,21 +583,9 @@ Language: pl
     <string name="gutenberg_native_add_image_or_video">DODAJ ZDJĘCIE LUB FILM</string>
     <string name="gutenberg_native_add_image">DODAJ ZDJĘCIE</string>
     <string name="gutenberg_native_add_block_here">DODAJ TUTAJ BLOK</string>
-    <string name="gutenberg_native_add_a_description">Dodaj opis</string>
-    <string name="gutenberg_native_add_annotation">Dodaj przypis</string>
     <string name="reader_empty_saved_posts_content_description">Stuknij przycisk Dodaj do Zapisanych Wpisów aby zapisać wpis na swojej liście. </string>
     <string name="reader_acessibility_list_loaded">\"Lista ma %1$d elementów.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Powiadomienia</string>
-    <string name="master_switch_default_title_off">Wyłączone</string>
-    <string name="master_switch_default_title_on">Włączone</string>
-    <string name="notifications_tab_dialog_master_off_message">Wyłączenie powiadomień dla tej witryny spowoduje zatrzymanie powiadomień w zakładce powiadomienia. Możesz określić jaki typ powiadomień chcesz otrzymywać po włączeniu powiadomień dla tej witryny.</string>
-    <string name="notifications_tab_dialog_master_status_off">Powiadomienia dla tej witryny</string>
-    <string name="notifications_tab_dialog_master_status_on">Powiadomienia dla tej witryny</string>
-    <string name="notifications_tab_dialog_master_off_title">Aby zobaczyć zakładkę powiadomień dla tej witryny, włącz powiadomienia dla tej witryny.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Włącz ekran powiadomień na zakładce powiadomień dla tej witryny</string>
-    <string name="notifications_tab_dialog_master_hint_on">Wyłącz ekran powiadomień na zakładce powiadomień dla tej witryny</string>
-    <string name="dialog_gutenberg_informative_description_page">Dla nowych stron używasz aktualnie edytora blokowego - super! Jeśli chciał(a)byś zmienić na edytor klasysczny przejdź do ekranu \'Moja Witryna\' > \'Ustawienia witryny\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">Dla nowych wpisów używasz aktualnie edytora blokowego - super! Jeśli chciał(a)byś zmienić na edytor klasysczny przejdź do ekranu \'Moja Witryna\' > \'Ustawienia witryny\'.</string>
     <string name="pick_media">Dodaj zdjęcie lub film</string>
     <string name="error_post_not_submitted_retrying">Nie można było przesłać tego wpisu do przeglądu, ale spróbujemy później</string>
     <string name="error_post_not_scheduled_retrying">Nie można było zaplanować daty opublikowania tego wpisu, ale spróbujemy później.</string>
@@ -681,8 +678,6 @@ Language: pl
     <string name="post_settings_add_to_calendar">Dodaj do kalendarza</string>
     <string name="post_settings_notification">Powiadomienie</string>
     <string name="post_settings_time_and_date">Data i czas</string>
-    <string name="login_need_help_finding_connected_email">Potrzebujesz pomocy w znalezieniu adresu email za pomocą połączyłe(a)ś się?</string>
-    <string name="enter_wordpress_site">Witryna znajdująca się pod tym adresem nie jest witryną WordPressową. Abyśmy mogli ją podłączyć, witryna musi mieć zainstalowanego WordPressa.</string>
     <string name="login_invalid_site_url">Proszę wprowadzić pełny adres witryny, na przykład example.com.</string>
     <string name="site_settings_editor">Edytor</string>
     <string name="enter_email_for_site">Zaloguj się z WordPress.com aby połączyć z %1$s</string>
@@ -758,7 +753,7 @@ Language: pl
     <string name="domain_contact_information_state_hint">Stan </string>
     <string name="domain_registration_result_continue_button">kontynuuj</string>
     <string name="domain_registration_result_title">Gratulacje</string>
-    <string name="domain_registration_result_description">twoja nowa witryna &lt;b>%s&lt;/b> jest ustawiana. Twoja witryna \n        wykonuje salta z ekscytacji!</string>
+    <string name="domain_registration_result_description">twoja nowa witryna &lt;b&gt;%s&lt;/b&gt; jest ustawiana. Twoja witryna \n        wykonuje salta z ekscytacji!</string>
     <string name="domain_contact_information_organization_hint">Organizacja (opcjonalnie)</string>
     <string name="domain_contact_information_description">Dla twojej wygody, wypełniliśmy wstępnie twoje dane kontaktowe\nWordpress.com. Przejrzyj je aby upewnić się, że wpisane są prawidłowe informacje dla tej domeny.</string>
     <string name="domain_contact_information_title">Informacje kontaktowe domeny</string>
@@ -856,41 +851,30 @@ Language: pl
     <string name="plans_loading_error_no_plans_title">Nie można było wczytać planów subskrypcji</string>
     <string name="plans_loading_error_network_title">Brak połączenia</string>
     <string name="menu_switch_to_gutenberg_editor">Przejdź na edytor blokowy</string>
-    <string name="menu_switch_to_aztec_editor">Przejdź do edytora klasycznego</string>
     <string name="stats_loading_block_error">Wystąpił problem podczas wczytywania twoich danych, odśwież stronę i spróbuj ponownie.</string>
     <string name="stats_loading_error">Dane nie wczytane</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Edytuj nowe wpisy i strony przy pomocy edytora blokowego</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Użyj edytora blokowego</string>
-    <string name="dialog_gutenberg_informative_title">Włączono edytor blokowy</string>
     <string name="exit">wyjdź</string>
     <string name="quick_start_sites_type_subtitle">Wykonano %1$d z %2$d</string>
-    <string name="quick_start_sites_type_grow">Rozwiń swoją społeczność</string>
-    <string name="quick_start_sites_type_customize">Spersonalizuj swoją witrynę</string>
     <string name="quick_start_sites">Kolejne kroki</string>
     <string name="quick_start_complete_tasks_header">Ukończono (%d)</string>
     <string name="quick_start_dialog_view_site_message">Ciesz się gotowym produktem!</string>
     <string name="quick_start_dialog_upload_icon_title">Wczytaj ikonę witryny</string>
     <string name="quick_start_dialog_upload_icon_message">Przeglądający twoją witrynę zobaczą twoją witrynę w swoich przeglądarkach. Dodaj własną ikonę aby uzyskać profesjonalny wygląd.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Stuknij %1$s Plan %2$s aby sprawdzić swój aktualny plan sibskrypcji i inne dostępne plany. </string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Stuknij %1$s Dodaj stronę %2$s  aby stworzyć nową stronę. </string>
     <string name="quick_start_dialog_publish_post_message">Stwórz szkic i opublikuj swój pierwszy wpis.</string>
     <string name="quick_start_dialog_need_help_message">Przeprowadzimy cię przez podstawy budowy i rozwijania swojej witryny.</string>
     <string name="quick_start_dialog_migration_title">Dokonaliśmy kilku zmian na twojej liście</string>
     <string name="quick_start_dialog_check_stats_message_short">Stuknij%1$s Statystyki %2$s aby sprawdzić jak radzi sobie twoja witryna. </string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Stuknij %1$s Ikonę Twojej Witryny %2$s aby  wczytać nową </string>
-    <string name="quick_start_dialog_create_new_page_message_short">Stuknij %1$s Strony %2$s aby kontynuować. </string>
     <string name="quick_start_dialog_migration_message">Dodaliśmy więcej zadań aby rozwinąć twoją społeczność.</string>
     <string name="quick_start_dialog_explore_plans_title">Eksploruj plany subskrypcji</string>
     <string name="quick_start_dialog_explore_plans_message">Dowiedz się więcej o narzędziach SEO w naszych płatnych planach subskrypcji.</string>
     <string name="quick_start_dialog_enable_sharing_title">Uaktywnij udostępnianie wpisów</string>
     <string name="quick_start_dialog_enable_sharing_message">Automatycznie udostępniaj nowe wpisy na swoich kontach mediów społecznościowych.</string>
-    <string name="quick_start_dialog_customize_site_message">Dostosuj czcionki, dodaj obrazki i więcej.</string>
-    <string name="quick_start_dialog_create_page_title">Stwórz nową stronę</string>
-    <string name="quick_start_dialog_create_page_message">Dodaj stronę dla kluczowej treści - strona \"O nas\" to dobry początek.</string>
     <string name="quick_start_dialog_check_stats_title">Sprawdź statystyki swojej witryny</string>
     <string name="quick_start_dialog_check_stats_message">Bądź na bieżąco w temacie statystyk swojej witryny.</string>
-    <string name="quick_start_dialog_browse_themes_title">Przeglądaj motywy</string>
-    <string name="quick_start_dialog_browse_themes_message">Eksploruj dziesiątki opcji układu i znajdź dla siebie najlepsze rozwiązanie.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Usunięcie Kolejnych Kroków ukryje wszystkie przewodniki na tej witrynie. Nie można cofnąć tej czynności.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Usuń Kolejne Kroki</string>
     <string name="quick_start_remove_next_steps_menu_title">Usuń to</string>
@@ -914,15 +898,11 @@ Language: pl
     <string name="notification_new_site_creation_failed">Wystąpił problem</string>
     <string name="notification_new_site_creation_title">Tworzenie nowej witryny</string>
     <string name="new_site_creation_create_site_button">Tworzenie nowej witryny</string>
-    <string name="new_site_creation_search_domain_input_hint">Przeszukaj domeny</string>
     <string name="new_site_creation_domain_header_subtitle">To tu ludzie odnajdą ciebie w internecie.</string>
-    <string name="new_site_creation_domain_header_title">Wybierz nazwę domeny dla swojej witryny</string>
     <string name="new_site_creation_empty_domain_list_message">Brak dostępnych adresów zgodnych z twoimi kryteriami wyszukiwania</string>
     <string name="site_creation_error_generic_subtitle">Błąd komunikacji z serwerem, spróbuj ponownie</string>
     <string name="site_creation_error_generic_title">Wystąpił problem</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Wystąpił problem</string>
-    <string name="site_creation_segments_subtitle">Dzięki temu nasza rekomendacja będzie trafniejsza. Ale nie oznacza to zaszufladowania - wszystkie witryny ewoluują!</string>
-    <string name="site_creation_segments_title">Powiedz nam jaki rodzaj witryny chcesz utworzyć</string>
     <string name="new_site_creation_preview_title">Twoja witryna został utworzona!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d z %2$d</string>
     <string name="new_site_creation_screen_title_general">Tworzenie witryny</string>
@@ -1076,21 +1056,14 @@ Language: pl
     <string name="quick_start_dialog_need_help_button_positive">Akceptuj</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nigdy</string>
     <string name="quick_start_dialog_follow_sites_title">Obserwuj inne witryny</string>
-    <string name="quick_start_dialog_customize_site_title">Spersonalizuj swoją witrynę</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Stuknij %1$s Szukanie %2$s aby znaleźć witryny z podobnymi zainteresowaniami</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Stuknij %1$s Czytnik %2$s aby kontynuować</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Stuknij %1$s Motywy %2$s aby kontynuować</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Stuknij %1$s Personalizuj %2$s aby rozpocząć personalizację swojej witryny</string>
     <string name="quick_start_dialog_need_help_button_negative">Nie, dziękuję</string>
     <string name="quick_start_dialog_follow_sites_message">Znajdź witryny które ciebie inspirują i obserwuj je aby otrzymywać aktualizacje kiedy te coś opublikują.</string>
-    <string name="quick_start_dialog_choose_theme_title">Wybierz szablon</string>
     <string name="quick_start_button_positive">Dalej</string>
     <string name="quick_start_button_negative_short">Anuluj</string>
     <string name="quick_start_button_negative">Nie teraz</string>
     <string name="my_site_create_new_site_title">Nie msz żadnych witryn</string>
-    <string name="quick_start_dialog_choose_theme_message">Przeglądaj wszystkie motywy i znajdź najlepiej dopasowany do swoich potrzeb. </string>
     <string name="content_description_more">Więcej</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Stuknij %1$s Motywy %2$s aby odkryć nowe motywy</string>
     <string name="reader_empty_followed_tags_title">Nie obserwujesz żadnych tematów</string>
     <string name="reader_empty_followed_tags_subtitle">Dodaj tematy aby odnaleźć wpisy dotyczące tych które ciebie interesują</string>
     <string name="stats_jetpack_connection_faq">FAQ Jetpack</string>
@@ -1148,16 +1121,10 @@ Language: pl
     <string name="support_contact_email">Email kontaktowy</string>
     <string name="application_log_button">Log/dziennik aplikacji</string>
     <string name="my_tickets">Moje bilety</string>
-    <string name="activity_log_rewind_site">Przywróć wcześniejszy stan witryny</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Przywracanie witryny w toku</string>
     <string name="notification_channel_transient_title">Krótkotrwały</string>
-    <string name="activity_log_rewind_dialog_message">Czy na pewno chcesz przywrócić swoją witrynę do %1$s na %2$s? Spowoduje to usunięcie całej zawartości i opcji ustawionych lub zmienionych po tym terminie.</string>
-    <string name="activity_log_currently_restoring_message">Przywracanie stanu do %1$s %2$s</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Twoja witryna została z powodzeniem przywrócona</string>
     <string name="activity_log_button">Przycisk aktywności logu/dziennika aktywności</string>
     <string name="activity_log_currently_restoring_title">Trwa przywracanie twojej witryny</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Twoja witryna została z powodzeniem przywrócona.\nOdtworzono stan z %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Twoja witryna jest w trakcie przywracania\nPrzywracanie do stanu z %1$s %2$s</string>
     <string name="plugin_auto_managed">Zarządzane automatycznie</string>
     <string name="reader_save_posts_locally_dialog_message">Zapisz ten wpis i wróć do niego w późniejszym czasie. Będzie dostępny jedynie na tym urządzeniu - zapisane wpisy nie synchronizują się na innych twoich urządzeniach.</string>
     <string name="reader_save_posts_locally_dialog_title">Zapisz wpis na później</string>
@@ -1166,18 +1133,14 @@ Language: pl
     <string name="comment_read_source_post">Przeczytaj wpis źródłowy</string>
     <string name="sites">Witryny</string>
     <string name="signup_magic_link_title">Wysłano Magic Linka</string>
-    <string name="signup_email_screen_title">Rejestracja przy użyciu emaila</string>
     <string name="verification_2fa_screen_title">Weryfikacja kodu</string>
     <string name="selfhosted_site_login_title">Dane uwierzytelniające logowania</string>
-    <string name="alternatively">Alternatywnie:</string>
     <string name="email_address_login_title">Logowanie adresem email</string>
     <string name="site_address_login_title">Logowanie adresem witryny</string>
     <string name="magic_link_login_title">Logowanie przy użyciu Magic Linka</string>
     <string name="magic_link_sent_login_title">Wysłano Magic Linka</string>
     <string name="reader_bookmark_snack_title">Wpis zapisano</string>
     <string name="reader_bookmark_snack_btn">Zobacz wszystkie</string>
-    <string name="reader_btn_bookmarked">Zapisano</string>
-    <string name="reader_btn_bookmark">Zapisz</string>
     <string name="reader_remove_bookmark">Usuń z zapisanych wpisów</string>
     <string name="reader_add_bookmark">Dodaj do zapisanych wpisów</string>
     <string name="reader_save_for_later_title">Zapisane wpisy</string>
@@ -1199,11 +1162,9 @@ Language: pl
     <string name="reader_btn_notifications_on">Włącz powiadomienia dla witryny</string>
     <string name="reader_btn_notifications_off">Wyłącz powiadomienia dla witryny</string>
     <string name="activity_log_jetpack_icon">Ikona Jetpacka</string>
-    <string name="rewind">Przewiń</string>
     <string name="activity_log_event">Wydarzenie</string>
     <string name="activity_log_icon">Ikona aktywności</string>
     <string name="activity_log">Dziennik aktywności</string>
-    <string name="activity">Aktywność</string>
     <string name="privacy_policy_read">Przeczytaj politykę prywatności</string>
     <string name="third_party_policy_learn_more_caption">Korzystamy z narzędzi do śledzenia, w tym z narzędzi od podmiotów trzecich. Przeczytaj więcej i dowiedz się jak je kontrolować.</string>
     <string name="third_party_policy_learn_more_header">Polityka prywatności podmiotów trzecich</string>
@@ -1214,7 +1175,6 @@ Language: pl
     <string name="privacy_policy_learn_more_caption">Ta informacja pomaga nam ulepszyć nasze produkty, oferować bardziej spersonalizowany marketing, dostosować działanie WordPressa oraz uszczegółowić politykę prywatności.</string>
     <string name="cookie_policy_learn_more_caption">Udostępnij informacje przy pomocy naszego narzędzia analitycznego dotyczące wykorzystania usług podczas zalogowania to konta WordPressowego.</string>
     <string name="post_submitted">Zamieszczono wpis</string>
-    <string name="login_email_button_signup">Nie masz konta? %1$sZarejestruj się%2$s</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Funkcjonalność wtyczek wymaga aby subskrypcja domeny głównej była przypisana do tego użytkownika.</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Funkcja wtyczki wymaga, aby witryna była w dobrej kondycji.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Funkcjonalność wtyczek wymaga uprawnień administratora.</string>
@@ -1309,7 +1269,6 @@ Language: pl
     <string name="edit_photo_screen_title">Edytuj zdjęcie</string>
     <string name="share_intent_screen_title">Wybierz witrynę</string>
     <string name="signup_epilogue_screen_title">Nowe konto</string>
-    <string name="login_prologue_screen_title">Zaloguj się</string>
     <string name="site_settings_quota_space_hint">Jeśli potrzebujesz więcej przestrzeni, rozważ rozszerzenie subskrypcji WordPress.</string>
     <string name="comment_unliked_talkback"> Cofnięto dodanie polubienia</string>
     <string name="notif_detail_screen_title">Szczegóły powiadomienia %s</string>
@@ -1330,7 +1289,7 @@ Language: pl
     <string name="permissions_denied_title">Uprawnienia</string>
     <string name="plugin_caption_featured">Wyróżniający</string>
     <string name="version_with_name_param">Wersja %s</string>
-    <string name="permissions_denied_message">Wygląda na to, że wyłączyłeś uprawnienia wymagane do tej funkcjonalności.&lt;br/>&lt;br/>Aby to zmienić, edytuj uprawnienia i upewnij się, iż &lt;strong>%s&lt;/strong> jest uaktywnione.</string>
+    <string name="permissions_denied_message">Wygląda na to, że wyłączyłeś uprawnienia wymagane do tej funkcjonalności.&lt;br/&gt;&lt;br/&gt;Aby to zmienić, edytuj uprawnienia i upewnij się, iż &lt;strong&gt;%s&lt;/strong&gt; jest uaktywnione.</string>
     <string name="sharing_disabled_description">Nie możesz uzyskać dostępu do ustawień udostępniania ponieważ twój moduł udostępniania Jetpack jest wyłączony.</string>
     <string name="sharing_disabled">Moduł udostępniania wyłączony</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
@@ -1368,7 +1327,6 @@ Language: pl
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">Nie przesłano 1 wpisu z 1 plikiem</string>
     <string name="untitled_in_parentheses">(bez tytułu)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Utwórz witrynę</string>
     <string name="notification_site_creation_created">Stuknij aby kontynuować.</string>
     <string name="notification_site_creation_title_success">Utworzono witrynę!</string>
@@ -1383,10 +1341,7 @@ Language: pl
     <string name="username_changer_action">Zapisz</string>
     <string name="content_description_add_avatar">Dodaj zdjęcie profilowe</string>
     <string name="signup_user_exists">Email już istnieje na WordPress.com.\nKontynuowanie logowania.</string>
-    <string name="signup_with_google_button">Zarejestruj się z Google</string>
-    <string name="signup_with_email_button">Zarejestruj się za pomocą Emaila</string>
     <string name="signup_updating_account">Aktualizacja konta…</string>
-    <string name="signup_terms_of_service_text">Rejestrując się, zgadzasz się z naszymi %1$sWarunkami Świadczenia Usługi%2$s.</string>
     <string name="signup_magic_link_progress">Wysyłanie emaila</string>
     <string name="signup_magic_link_error_button_positive">Ponów próbę</string>
     <string name="signup_magic_link_error_button_negative">Zamknij</string>
@@ -1398,12 +1353,7 @@ Language: pl
     <string name="signup_epilogue_error_button_negative">Cofnij</string>
     <string name="signup_epilogue_error_generic">Wystąpił problem podczas aktualizacji twojego konta. Możesz spróbować ponownie lub cofnąć zmianę użytkownika aby kontynuować.</string>
     <string name="signup_epilogue_error_avatar">Wystąpił błąd przesyłania swojego zdjęcia profilowego.</string>
-    <string name="signup_email_header">Aby utworzyć nowe konto WordPress.com, wprowadź proszę swój adres email.</string>
-    <string name="signup_email_error_generic">Wystąpił błąd podczas sprawdzania adresu email.</string>
     <string name="signup_magic_link_error">Wystąpił problem podczas wysyłania wiadomości email. Możesz spróbować ponownie lub zamknąć i spróbować ponownie później.</string>
-    <string name="sign_up">Zarejestruj się na WordPress.com</string>
-    <string name="enter_username_instead">Zaloguj się ze swoją nazwą użytkownika.</string>
-    <string name="enter_site_address_instead">Zaloguj się wprowadzając adres swojej witryny.</string>
     <string name="plugin_needs_update">Wymaga aktualizacji/subskrypcji</string>
     <string name="plugin_caption_search">Szukaj wtyczek</string>
     <string name="plugin_caption_new">Nowe</string>
@@ -1524,7 +1474,6 @@ Language: pl
     <string name="login_error_suffix">\nMoże spróbujesz innego konta? </string>
     <string name="login_error_generic">Wystąpił błąd połączenia z kontem Google. </string>
     <string name="login_error_button">Zamknij</string>
-    <string name="login_google_button_suffix">Zaloguj się za pośrednictwem Google. </string>
     <string name="enter_wpcom_password_google">Aby kontynuować ze swoim kontem Google, proszę uzupełnić odpowiednie hasłow WordPress.com. Zostaniesz o to zapytany tylko raz.</string>
     <string name="error_generic_network">Wystąpił błąd sieci. Sprawdź połączenie i spróbuj ponownie.</string>
     <string name="post_settings_remove_featured_image">Usuń obrazek wyróżniający</string>
@@ -1536,12 +1485,10 @@ Language: pl
     <string name="jetpack_disconnect_confirm">Rozłącz</string>
     <string name="jetpack_disconnect_confirmation_message">Czy jesteś pewien że chcesz rozłączyć Jetpack od tej witryny? </string>
     <string name="jetpack_disconnect_pref_title">\"Rozłącz z WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Możesz dodać adres IP lub serię adresów do białej listy aby zapobiec zablokowaniu przez Jetpack. Dozwolone są adresy IPv4 i IPv6. Aby określić zakres, wprowadź dolną \n i górną wartość zakresu i odziej je myślnikiem. Przykład 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Wymagaj uwierzytelniania dwuetapowego</string>
     <string name="jetpack_match_wpcom_via_email_title">Połącz konta używając adresu email </string>
     <string name="jetpack_allow_wpcom_sign_in_title">Zezwól na logowanie WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Logowanie WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Biała lista adresów IP</string>
     <string name="jetpack_prevent_brute_force_title">Blokuj złośliwe próby logowania</string>
     <string name="jetpack_prevent_brute_force_category_title">Zabezpieczenie przed atakiem zmasowanym</string>
     <string name="jetpack_send_wp_notifications_title">Wysyłaj powiadomienia typu push</string>
@@ -1582,12 +1529,6 @@ Language: pl
     <string name="notification_settings_category_other">Inne</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Wszystkie moje witryny</string>
     <string name="notification_settings_category_your_sites">Twoje witryny</string>
-    <string name="notification_settings_master_off_message">Zmiana ustawienia na \"Brak powiadomień\" spowoduje że nie będziesz otrzymywać żadnych powiadomień z tej aplikacji, bez względu na ich typ. Możesz dostosować typ otrzymywanych powiadomień po włączeniu powyższej funkcji.</string>
-    <string name="notification_settings_master_off_title">Aby włączyć powiadomienia na tym urządzeniu, włącz ustawienie w sekcji Powiadomień.</string>
-    <string name="notification_settings_master_hint_off">Włącz powiadomienia</string>
-    <string name="notification_settings_master_hint_on">Wyłącz powiadomienia</string>
-    <string name="notification_settings_master_status_off">Wyłączone</string>
-    <string name="notification_settings_master_status_on">Włączone</string>
     <string name="max_video_resolution">Maksymalny rozmiar filmu</string>
     <string name="max_thumbnail_px_size">Maksymalny rozmiar obrazka</string>
     <string name="error_upload_post_media_param">Wystąpił błąd podczas przesyłania mediów w tym wpisie: %s.</string>
@@ -1624,7 +1565,6 @@ Language: pl
     <string name="login_site_address_more_help">Potrzebujesz pomocy?</string>
     <string name="login_site_address_help_content">Adres twojej witryny pojawia się w belce na górze ekrany kiedy przechodzisz na stronę witryny w przeglądarce Chrome.</string>
     <string name="login_site_address_help_title">Jaki jest adres mojej witryny?</string>
-    <string name="login_site_address_help">Potrzebujesz pomocy w odnalezieniu adresu witryny?</string>
     <string name="login_site_address">Adres witryny</string>
     <string name="enter_site_address">Wprowadź adres witryny WordPress, którą chciałbyś połączyć.</string>
     <string name="login_already_logged_in_wpcom">Jesteś już zalogowany na WordPress.com</string>
@@ -1636,7 +1576,6 @@ Language: pl
     <string name="requesting_otp">Żądanie kodu weryfikacyjnego przez SMS</string>
     <string name="login_text_otp">Wyślij mi zamiast tego kod przez SMS</string>
     <string name="enter_verification_code">Już prawie! Proszę wprowadzić kod weryfikacyjny z aplikacji do Uwierzytelnienia.</string>
-    <string name="open_mail">Otwórz pocztę</string>
     <string name="next">Następny</string>
     <string name="enter_email_wordpress_com">Zaloguj się do WordPress.com używając adresu email aby zarządzać wszystkimi swoimi witrynami WordPress.</string>
     <string name="image_optimization_promo_desc">Optymalizacja obrazów zmniejsza ich rozmiar w celu szybszego przesyłania.\n\nMożesz zmienić to ustawienie później w ustawieniach witryny.</string>
@@ -1658,12 +1597,8 @@ Language: pl
     <string name="post_status_draft">Szkic</string>
     <string name="post_status_post_private">Prywatny</string>
     <string name="post_status_pending_review">Oczekuje na przegląd</string>
-    <string name="change_location">Zmień lokalizację</string>
-    <string name="remove_location">Usuń lokalizację</string>
     <string name="post_status_publish_post">Opublikuj</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Nie można było otworzyć selektora lokalizacji, usługi Google Play są niedostępne</string>
     <string name="now">Teraz</string>
-    <string name="post_settings_location">Lokalizacja</string>
     <string name="post_settings_password_dialog_hint">Tylko osoby posiadające hasło mogą czytać ten wpis</string>
     <string name="post_settings_excerpt_dialog_hint">Zajawki to opcjonalne, ręcznie przygotowane podsumowania twoich treści.</string>
     <string name="post_settings_slug_dialog_hint">Nazwa uproszczona to tytuł wpisu w postaci przyjaznego adresu URL</string>
@@ -1846,7 +1781,6 @@ Language: pl
     <string name="sign_in_wpcom">Zaloguj się do WordPress.com</string>
     <string name="signout">Wyloguj się</string>
     <string name="reader_label_global_related_posts">Więcej na WordPress.com</string>
-    <string name="reader_label_local_related_posts">Więcej w %s</string>
     <string name="preference_open_device_settings">Przejdź do ustawień urządzenia</string>
     <string name="invite_invalid_email">%s: Nieprawidłowy email</string>
     <string name="invite_user_blocked_invites">%s: Użytkownik zablokował zaproszenia</string>
@@ -1894,20 +1828,14 @@ Language: pl
     <string name="invite_error_invalid_usernames_multiple">Nie można wysłać: wystąpiły nieprawidłowe nazwy użytkownika lub adresy email</string>
     <string name="invite_error_invalid_usernames_one">Nie można wysłać: nieprawidłowa nazwa użytkownika lub email</string>
     <string name="invite_error_no_usernames">Proszę dodać przynajmniej jednego użytkownika</string>
-    <string name="invite_message_info">(Opcjonalnie) Możesz wprowadzić tekst wiadomości zawierającej do 500 znaków, która będzie załączona do zaproszenia do użytkownika(ów).</string>
-    <string name="invite_message_remaining_other">Pozostało %d znaków</string>
-    <string name="invite_message_remaining_one">Pozostał 1 znak</string>
-    <string name="invite_message_remaining_zero">Pozostało 0 znaków</string>
-    <string name="invite_message_title">Wiadomość spersonalizowana</string>
     <string name="invite">Zaproś</string>
-    <string name="invite_names_title">Nazwy użytkowników lub adresy e-mail</string>
-    <string name="send_link">Wyślij odnośnik</string>
     <string name="invite_people">Zaproś ludzi</string>
     <string name="my_site_header_external">Na zewnątrz</string>
     <string name="label_clear_search_history">Usuń historię wyszukiwania</string>
     <string name="dlg_confirm_clear_search_history">Usunąć historię wyszukiwania?</string>
     <string name="reader_empty_search_description">Nie odnaleziono żadnych wyników wyszukiwania zawierających %s w twoim języku</string>
     <string name="reader_hint_post_search">Przeszukaj WordPressa</string>
+    <string name="reader_title_related_post_detail">Powiązany wpis</string>
     <string name="preview_screen_links_disabled">Odnośniki są wyłączone na ekranie podglądu</string>
     <string name="send">Wyślij</string>
     <string name="user_remove_confirmation_message">Jeśli usuniesz %1$s, użytkownik utraci dostęp do tej witryny, jednakże treści dodawane przez %1$s pozostaną na tej witrynie.\nCzy chciałbyś nadal usunąć tego użytkownika?</string>
@@ -1926,7 +1854,6 @@ Language: pl
     <string name="checking_email">Sprawdzanie emaili</string>
     <string name="magic_link_unavailable_error_message">Aktualnie niedostępne. Proszę wprowadzić hasło</string>
     <string name="logging_in">Logowanie</string>
-    <string name="enter_your_password_instead">Wprowadź swoje hasło</string>
     <string name="web_address_dialog_hint">Prezentowany kiedy dodajesz komentarze.</string>
     <string name="capture_or_pick_photo">Wykonaj lub wybierz zdjęcie</string>
     <string name="plan">Plan</string>
@@ -2047,7 +1974,6 @@ Language: pl
     <string name="site_settings_paging_dialog_description">Podziel wątki komentarzy na kilka stron</string>
     <string name="site_settings_paging_dialog_header">Komentarzy na strone</string>
     <string name="site_settings_close_after_dialog_title">Zamknij komentowanie</string>
-    <string name="site_settings_blacklist_description">Komentarz zostanie oznaczony jako spam jeśli zawiera przynajmniej jedno ze słów z poniższej listy - w swojej zawartości, imieniu autora, odnośniku URL, adresie e-mail lub adresie IP.  Możesz wprowadzić część słowa - np. słowo \"press\" będzie dopasowane do słowa  \"WordPress\". </string>
     <string name="site_settings_hold_for_moderation_description">Komentarz zostanie umieszczony w kolejce do moderacji jeśli zawiera przynajmniej jedno ze słów z poniższej listy - w swojej zawartości, imieniu autora, odnośniku URL, adresie e-mail lub adresie IP.  Możesz wprowadzić część słowa - np. słowo \"press\" będzie dopasowane do słowa \"WordPress\". </string>
     <string name="site_settings_list_editor_input_hint">Wprowadź słowo lub frazę</string>
     <string name="site_settings_list_editor_no_items_text">Brak elementów</string>
@@ -2062,10 +1988,8 @@ Language: pl
     <string name="site_settings_rp_show_header_title">Pokaż nagłówek</string>
     <string name="site_settings_rp_switch_summary">Wyświetla odpowiednią zawartość z twojej witryny poniżej twoich wpisów.</string>
     <string name="site_settings_rp_switch_title">Pokaż Powiązane Wpisy</string>
-    <string name="site_settings_blacklist_hint">Komentarze odpowiadające szablonowi filtra są oznaczane jako spam</string>
     <string name="site_settings_moderation_hold_hint">Komentarze odpowiadające szablonowi filtra są umieszcza w kolejce do moderacji</string>
     <string name="site_settings_multiple_links_hint">Ignoruje limit odnośników od znanych tobie użytkowników</string>
-    <string name="site_settings_whitelist_hint">Autor komentarza musi mieć uprzednio zatwierdzony komentarz</string>
     <string name="site_settings_user_account_required_hint">Użytkownicy muszą być zarejestrowani oraz zalogowani aby móc dodawać komentarze</string>
     <string name="site_settings_identity_required_hint">Autor komentarza musi podać imię oraz e-mail</string>
     <string name="site_settings_paging_hint">Pokaż komentarze w kawałkach o określonym rozmiarze</string>
@@ -2088,17 +2012,13 @@ Language: pl
     <string name="site_settings_address_hint">Zmiana twojego adresu nie jest aktualnie wspierana</string>
     <string name="site_settings_tagline_hint">Krótki opis lub chwytliwe wyrażenie opisujące twojego bloga</string>
     <string name="site_settings_title_hint">W kilku słowach, wyjaśnij o czym jest ta witryna</string>
-    <string name="site_settings_whitelist_known_summary">Komentarze od znanych tobie użytkowników</string>
-    <string name="site_settings_whitelist_all_summary">Komentarze wszystkich użytkowników</string>
     <string name="site_settings_threading_summary">%d poziomy/ów</string>
     <string name="site_settings_privacy_private_summary">Prywatna</string>
     <string name="site_settings_privacy_hidden_summary">Ukryta</string>
     <string name="site_settings_delete_site_title">Usuń witrynę</string>
     <string name="site_settings_privacy_public_summary">Publiczna</string>
-    <string name="site_settings_blacklist_title">Czarna lista</string>
     <string name="site_settings_moderation_hold_title">Wstrzymaj do moderacji</string>
     <string name="site_settings_multiple_links_title">Odnośniki w komentarzach</string>
-    <string name="site_settings_whitelist_title">Automatyczne zatwierdzaj</string>
     <string name="site_settings_threading_title">Wątki dyskusji</string>
     <string name="site_settings_paging_title">Stronicowanie</string>
     <string name="site_settings_sort_by_title">Sortuj</string>
@@ -2247,7 +2167,6 @@ Language: pl
     <string name="error_copy_to_clipboard">Wystąpił błąd podczas kopiowania tekstu do schowka</string>
     <string name="logs_copied_to_clipboard">Dziennik aplikacji został skopiowany do schowka</string>
     <string name="reader_label_new_posts">Nowe wpisy</string>
-    <string name="reader_page_recommended_blogs">Blogi, które mogą ciebie zainteresować</string>
     <string name="post_uploading">Przesyłanie wpisu</string>
     <string name="reader_empty_posts_in_blog">Ta witryna jest pusta</string>
     <string name="stats_followers_minutes">%1$d minut</string>
@@ -2311,7 +2230,6 @@ Language: pl
     <string name="reader_page_followed_tags">Obserwowane tematy</string>
     <string name="reader_hint_add_tag_or_url">Wpisz adres lub temat aby obserwować</string>
     <string name="help">Pomoc</string>
-    <string name="forgot_password">Nie pamiętasz hasła?</string>
     <string name="ssl_certificate_error">Niepoprawny certyfikat SSL</string>
     <string name="ssl_certificate_ask_trust">Jeśli zazwyczaj łączysz się z tą stroną bez problemów, ten błąd może oznaczać, że ktoś próbuje się pod nią podszyć i nie powinieneś kontynuować. Czy mimo to chcesz zaufać temu certyfikatowi?</string>
     <string name="mnu_comment_unspam">To nie jest spam</string>
diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml
index c7ba78ca41e5..cadb7d55b0df 100644
--- a/WordPress/src/main/res/values-pt-rBR/strings.xml
+++ b/WordPress/src/main/res/values-pt-rBR/strings.xml
@@ -1,17 +1,480 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-09 17:23:42+0000
+Translation-Revision-Date: 2021-05-20 17:59:03+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: pt_BR
 -->
 <resources>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Clique duas vezes para adicionar um link.</string>
+    <string name="gutenberg_native_add_link">ADICIONAR LINK</string>
+    <string name="login_empty_view_try_another_account">Tente com outra conta</string>
+    <string name="login_empty_view_see_instructions">Ver instruções</string>
+    <string name="login_no_jetpack_sites_error_message">Se você já tem um site, precisará instalar o plugin gratuito Jetpack e conectá-lo à sua conta do WordPress.</string>
+    <string name="login_empty_view_avatar_content_description">Sua foto de perfil</string>
+    <string name="login_not_a_jetpack_site">Para utilizar este aplicativo em %1$s você precisa ter o plugin Jetpack instalado e conectado à sua conta do WordPress.com. </string>
+    <string name="gutenberg_native_size">Tamanho</string>
+    <string name="gutenberg_native_move_image_forward">Mover imagem para frente</string>
+    <string name="gutenberg_native_move_image_backward">Mover imagem para trás</string>
+    <string name="gutenberg_native_image_settings">Configurações da imagem</string>
+    <string name="gutenberg_native_audio_settings">Configurações de áudio</string>
+    <string name="user_profile_untitled_site">(Sem título)</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">Informação de perfil do usuário no final da página</string>
+    <string name="likes_list_screen_title">Lista de likes %s</string>
+    <string name="gutenberg_native_write_code">Insira o código…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Ordem e filtros</string>
+    <string name="gutenberg_native_show_download_button">Mostrar botão de download</string>
+    <string name="gutenberg_native_shortcode">Shortcode</string>
+    <string name="gutenberg_native_read_more">Leia mais</string>
+    <string name="gutenberg_native_preload">Pré-carregamento</string>
+    <string name="gutenberg_native_post_meta_settings">Configurações de metadados do post</string>
+    <string name="gutenberg_native_post_content_settings">Configurações do conteúdo do post</string>
+    <string name="gutenberg_native_metadata">Metadados</string>
+    <string name="gutenberg_native_media_area">Área de mídia</string>
+    <string name="gutenberg_native_media_file">Arquivo de mídia</string>
+    <string name="gutenberg_native_loop">Loop</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Link para</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">imagem %1$d de %2$d na galeria</string>
+    <string name="gutenberg_native_heading_d">Título %d</string>
+    <string name="gutenberg_native_featured">Em destaque</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Digite aqui o URL da mídia a ser incorporada…</string>
+    <string name="gutenberg_native_edit_image">Editar imagem</string>
+    <string name="gutenberg_native_display_post_date">Exibir a data do post</string>
+    <string name="gutenberg_native_code">Código</string>
+    <string name="gutenberg_native_change_heading_level">Mudar o nível do título</string>
+    <string name="gutenberg_native_browser_default">Navegador padrão</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">O bloco foi excluído ou está indisponível.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">O bloco não pode ser renderizado dentro de si mesmo.</string>
+    <string name="gutenberg_native_autoplay">Reprodução automática</string>
+    <string name="gutenberg_native_auto">Automático</string>
+    <string name="gutenberg_native_attachment_page">Página de anexo</string>
+    <string name="gutenberg_native_add_text">Adicionar texto…</string>
+    <string name="gutenberg_native_add_caption">Adicione uma legenda</string>
+    <string name="login_no_jetpack_sites">Nenhum site Jetpack foi encontrado</string>
+    <string name="gutenberg_native_transform_block">Modificar bloco…</string>
+    <string name="gutenberg_native_transform_s_to">Modificar %s em</string>
+    <string name="gutenberg_native_what_is_alt_text">O que é texto alternativo?</string>
+    <string name="gutenberg_native_failed_to_insert_media">Não foi possível inserir a mídia.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s modificado para %2$s</string>
+    <string name="like_faces_error_loading_message">Erro ao carregar informações de curtidas. %s.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Não foi possível inserir o arquivo de áudio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Descreva o propósito da imagem. Não preencha se a imagem é puramente decorativa.</string>
+    <string name="like_faces_singular_text">Um blogueiro curtiu disso.</string>
+    <string name="like_faces_plural_text">%d blogueiros curtiram isso.</string>
+    <string name="like_title_plural">%d curtidas</string>
+    <string name="suggestion">Sugestão:</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Digite as credenciais de seu servidor para corrigir a ameaça.</string>
+    <string name="like_title_singular">1 curtida</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Digite as credenciais de seu servidor para corrigir ameaças.</string>
+    <string name="gutenberg_native_search_blocks">Pesquisar blocos</string>
+    <string name="gutenberg_native_search_block">Pesquisar bloco</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">toque duas vezes para alterar a unidade</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s é %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Ocorreu um erro na obtenção dos dados de curtidas</string>
+    <string name="get_likes_unknown_error">Um erro desconhecido ocorreu na obtenção de curtidas.</string>
+    <string name="gutenberg_native_clear_search">Limpar pesquisa</string>
+    <string name="gutenberg_native_cancel_search">Cancelar pesquisa</string>
+    <string name="get_likes_no_network_error">Nenhuma rede disponível</string>
+    <string name="comments_empty_list_filtered_unreplied">Nenhum comentário não respondido</string>
+    <string name="comment_status_unreplied">Não respondido</string>
+    <string name="gutenberg_native_table_of_contents">Tabela de conteúdos</string>
+    <string name="gutenberg_native_summary">sumário</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Exiba uma lista resumida com os títulos de seu post. Adicione âncoras HTML aos blocos de Título para adicionar links aqui.</string>
+    <string name="gutenberg_native_document_outline">visão geral do documento</string>
+    <string name="gutenberg_native_buttongroup">Grupo de botões</string>
+    <string name="jetpack_brute_force_allowlist_title">Endereços IP sempre permitidos</string>
+    <string name="site_settings_denylist_title">Comentários não permitidos</string>
+    <string name="reader_title_interests">Seguir tópicos</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Dispensar</string>
+    <string name="stories_intro_main_subtitle">Uma nova maneira de criar e publicar conteúdos atraentes em seu site.</string>
+    <string name="activity_log_backup_download_notice_download_action">Baixar</string>
+    <string name="threat_fix_all_confirmation_message_plural">Confirme que deseja corrigir todas as %s ameaças ativas.</string>
+    <string name="threat_fix_all_status_success_message_plural">As ameaças foram corrigidas.</string>
+    <string name="scan_idle_threats_description_plural">A varredura encontrou %1$s possíveis ameaças em %2$s. Analise-as abaixo e tome as ações necessárias ou toque no botão corrigir todas. Estamos %3$s para ajudar se precisar.</string>
+    <string name="gutenberg_native_edit_focal_point">Editar ponto focal</string>
+    <string name="new_site_creation_search_domain_example">exemplo.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Digite um nome para o seu site</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Todas as tarefas foram concluídas&lt;/b&gt;&lt;br/&gt;Você alcançará mais pessoas. Bom trabalho!</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Toque duas vezes para abrir a janela inferior para editar, substituir ou remover a imagem</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Toque duas vezes para abrir a janela de ações para editar, substituir ou remover a imagem</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Todas as tarefas foram concluídas&lt;/b&gt;&lt;br/&gt;Você personalizou seu site. Bom trabalho!</string>
+    <string name="quick_start_card_menu_hide">Ocultar por enquanto</string>
+    <string name="magic_link_not_meaning_to_create_account">Não queria criar uma conta nova? Volte para reinserir seu endereço de e-mail.</string>
+    <string name="invite_links_disable_dialog_message">Assim que esse link de convite for desativado, ninguém poderá usá-lo para ingressar em sua equipe. Você tem certeza?</string>
+    <string name="invite_links_disable_dialog_title">Desativar link de convite</string>
+    <string name="invite_links_bad_format_response">Resposta inválida recebida</string>
+    <string name="invite_links_null_response">Nenhuma resposta recebida</string>
+    <string name="invite_links_helper_text">Use este link para integrar os membros da sua equipe sem ter que convidá-los um por um. Qualquer pessoa que visitar este URL poderá se inscrever em sua organização, mesmo que tenha recebido o link de outra pessoa, então certifique-se de compartilhá-lo com pessoas de confiança.</string>
+    <string name="invite_links_cannot_get_role_data_error">Ocorreu um erro ao carregar os dados da função %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Ocorreu um erro ao carregar as funções</string>
+    <string name="invite_links_generic_get_data_error">Erro desconhecido ao coletar os dados de links de convite</string>
+    <string name="invite_links_disable_invite_link">Desativar link de convite</string>
+    <string name="invite_links_share_invite_link">Compartilhar link de convite</string>
+    <string name="invite_links_generate">Gerar novo link</string>
+    <string name="invite_links_get_status_retry">Atualizar status dos links</string>
+    <string name="invite_links_section_title">Link de convite</string>
+    <string name="invite_links_expire_date">Expira em %1$s</string>
+    <string name="threats_found_singular">Ameaça encontrada</string>
+    <string name="threats_found_plural">Ameaças encontradas</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Varredura concluída&lt;/b&gt; &lt;br&gt; %s possíveis ameaças encontradas</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Varredura concluída&lt;/b&gt; &lt;br&gt; Uma possível ameaça encontrada</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Varredura concluída&lt;/b&gt; &lt;br&gt; Nenhuma ameaça encontrada</string>
+    <string name="disable">Desativar</string>
+    <string name="scan_fixing_threats_title_singular">Corrigindo ameaça</string>
+    <string name="quick_start_list_review_pages_subtitle">Verifique suas páginas e faça alterações ou adicione e remova páginas.</string>
+    <string name="quick_start_list_view_site_title">Acesse seu site</string>
+    <string name="quick_start_list_follow_site_subtitle">Descubra e siga sites que te inspiram.</string>
+    <string name="quick_start_list_enable_sharing_title">Ativar o compartilhamento</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Compartilhe novos posts em suas redes sociais automaticamente.</string>
+    <string name="quick_start_list_upload_icon_subtitle">Adicione um ícone ao site para uma aparência profissional e elegante.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Dê ao seu site um nome que reflita sua personalidade e temática.</string>
+    <string name="quick_start_list_check_stats_title">Verifique suas estatísticas</string>
+    <string name="backup_download_status_failure_bullet2">Ainda tentaremos criar o arquivo de backup para que possa ser baixado.</string>
+    <string name="backup_download_status_failure_bullet1">Não conseguimos encontrar o status para informar quanto tempo a criação do backup levará.</string>
+    <string name="restore_status_failure_bullet3">Te avisaremos quando estiver concluído.</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Ícone de relógio</string>
+    <string name="backup_download_status_failure_heading">Não conseguimos localizar o status do arquivo de backup</string>
+    <string name="restore_status_failure_bullet2">Ainda tentaremos restaurar seu site.</string>
+    <string name="restore_complete_failed_description">Não foi possível restaurar seu site</string>
+    <string name="restore_status_failure_heading">Não conseguimos encontrar o status da restauração</string>
+    <string name="restore_status_failure_bullet1">Não conseguimos encontrar o status para informar quanto tempo a restauração levará.</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exclui temas, plugins e arquivos enviados)</string>
+    <string name="restore_warning_action_button">Confirmar</string>
+    <string name="backup_download_complete_failed_description">Não conseguimos criar seu backup</string>
+    <string name="gutenberg_native_uploading">Enviando…</string>
+    <string name="backup_item_contents">Diretório WP-content</string>
+    <string name="backup_item_roots">Raiz do WordPress</string>
+    <string name="backup_download_details_choose_items_header">Itens incluídos nesse download</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Blocos reutilizáveis não podem ser editados no WordPress para iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Blocos reutilizáveis não podem ser editados no WordPress para Android</string>
+    <string name="gutenberg_native_replace_audio">Substituir áudio</string>
+    <string name="gutenberg_native_replace_file">Substituir arquivo</string>
+    <string name="gutenberg_native_open">ABRIR</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problema ao abrir o áudio</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Nenhuma aplicação suporta essa solicitação. </string>
+    <string name="gutenberg_native_lock_icon">Ícone do cadeado</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Falha ao inserir arquivo de áudio. Clique para ver opções.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Dois cliques para selecionar arquivo de áudio</string>
+    <string name="gutenberg_native_audio_player">Tocador de áudio</string>
+    <string name="gutenberg_native_choose_audio">Escolher áudio</string>
+    <string name="gutenberg_native_add_audio">ADICIONAR ÁUDIO</string>
+    <string name="gutenberg_native_audio_caption_s">Legenda do áudio. %s</string>
+    <string name="photo_picker_use_audio">Usar esse áudio</string>
+    <string name="people_optional_custom_message_helper_text">Opcional: digite uma mensagem personalizada para ser enviada com seu convite. </string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Dois cliques para ouvir arquivo de áudio</string>
+    <string name="gutenberg_native_audio_file">arquivo de áudio</string>
+    <string name="gutenberg_native_audio_caption_empty">Legenda de áudio. Vazia</string>
+    <string name="continue_with_wpcom">Entre ou cadastre-se no WordPress.com</string>
+    <string name="photo_picker_choose_audio">Escolher arquivo de áudio a partir do dispositivo</string>
+    <string name="threat_status_fixed">Corrigida</string>
+    <string name="threat_found_header">Encontrada</string>
+    <string name="scan_here_to_help">aqui para ajudar</string>
+    <string name="people_learn_more_about_roles">Saiba mais sobre Funções</string>
+    <string name="scan_idle_threats_description_singular">A varredura encontrou uma ameaça potencial com %1$s. Verifique a ameaça abaixo e tome as ações necessárias ou clique no botão de corrigir todas. Estamos %2$s para ajudar caso precise. </string>
+    <string name="scan_idle_manual_scan_description">Para revisar seu site novamente, faça uma varredura manual, ou aguarde até que o Jetpack examine seu site hoje, mais tarde. </string>
+    <string name="scan_provisioning_description">Desejamos boas-vindas ao Jetpack Scan! Estamos analisando seu site. Informaremos se detectarmos algum problema e iniciaremos a primeira varredura completa.</string>
+    <string name="scan_scanning_is_initial_description">Desejamos boas-vindas ao Jetpack Scan, estamos realizando uma análise inicial do seu site. Você receberá os resultados em breve.</string>
+    <string name="scan_fixing_threats_title_plural">Corrigindo ameaças</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Fazendo backup do site</string>
+    <string name="activity_log_currently_backing_up_message">Fazendo backup do site de %1$s %2$s</string>
+    <string name="scan_request_failed_title">Ocorreu um erro</string>
+    <string name="activity_log_currently_backing_up_title">Criando backup para download</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Criamos um backup de seu site com sucesso</string>
+    <string name="pick_audio">Selecionar áudio</string>
+    <string name="activity_log_backup_started_snackbar_message">Estamos criando um backup de seu site\nCriando backup de %1$s %2$s</string>
+    <string name="restore_complete_failed_icon_content_description">Ícone de erro</string>
+    <string name="restore_complete_failed_action_button_content_description">Botão de concluído</string>
+    <string name="restore_another_process_running">Há outra restauração em andamento.</string>
+    <string name="restore_complete_failed_title">Restauração falhou</string>
+    <string name="restore_complete_visit_site_button_content_description">Botão para visitar site</string>
+    <string name="restore_complete_done_button_content_description">Botão de concluído</string>
+    <string name="restore_complete_icon_content_description">Ícone de restaurar</string>
+    <string name="restore_complete_visit_site_action_button">Visitar site</string>
+    <string name="restore_complete_description_with_two_parameters">Todos os itens selecionados estão restaurados de volta para %1$s %2$s.</string>
+    <string name="restore_complete_header">Seu site foi restaurado</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Você não precisa aguardar por aqui. Te notificaremos quando o site estiver restaurado.</string>
+    <string name="restore_progress_description_with_two_parameters">Estamos restaurando seu site para %1$s %2$s.</string>
+    <string name="restore_progress_header">Restaurando site no momento</string>
+    <string name="restore_warning_action_button_content_description">Botão de confirmação da restauração do site</string>
+    <string name="restore_progress_icon_content_description">Ícone de restauração do site</string>
+    <string name="restore_warning_icon_content_description">Imagem de um círculo vermelho com ponto de exclamação</string>
+    <string name="restore_warning_header">Aviso</string>
+    <string name="restore_details_action_button_content_description">Botão de restauração do site</string>
+    <string name="backup_download_complete_failed_action_button">Concluído</string>
+    <string name="restore_details_icon_content_description">Ícone de restauração</string>
+    <string name="restore_details_action_button">Restaurar site</string>
+    <string name="restore">Restaurar</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Botão concluir</string>
+    <string name="restore_details_header">Restaurar site</string>
+    <string name="restore_details_choose_items_header">Selecione os itens para restaurar:</string>
+    <string name="web_preview_mobile">Dispositivo móvel</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="quick_start_card_menu_remove">Não mostrar novamente</string>
+    <string name="backup_download_complete_failed_title">Falha no download</string>
+    <string name="quick_start_card_menu_pin">Fixar isso</string>
+    <string name="quick_start_dialog_review_pages_message">Altere, adicione ou remova as páginas do seu site.</string>
+    <string name="quick_start_dialog_review_pages_title">Revise as páginas do site</string>
+    <string name="quick_start_dialog_edit_homepage_message">Altere, adicione ou remova conteúdo em sua página inicial.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Edite sua página inicial</string>
+    <string name="reader_marked_post_as_seen">Post marcado como visto</string>
+    <string name="reader_menu_mark_as_unseen">Marcar como não lido</string>
+    <string name="reader_menu_mark_as_seen">Marcar como lido</string>
+    <string name="error_media_upload_failed_for_reason">Envio da mídia falhou.\n%1$s</string>
+    <string name="threat_fix_all_status_error_message">Erro ao gerar correção de status. Contate nosso suporte. </string>
+    <string name="threat_fix_all_status_success_message_singular">A ameaça foi corrigida com sucesso. </string>
+    <string name="threat_fix_all_error_message">Erro ao corrigir ameaças. Contate nosso suporte.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Confirme que deseja corrigir uma ameaça ativa. </string>
+    <string name="threat_fix_all_warning_title">Corrigir todas as ameaças</string>
+    <string name="threat_ignore_error_message">Erro ao ignorar ameaça. Contate o suporte.</string>
+    <string name="threat_ignore_success_message">Ameaça ignorada.</string>
+    <string name="threat_ignore_warning">Você não deveria ignorar um problema de segurança, a menos que tenha certeza de que ele é inofensivo. Se você optar por ignorar esta ameaça, ela continuará em seu site &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Erro ao corrigir ameaça. Contate nosso suporte. </string>
+    <string name="scan_history_all_threats_tab">Tudo</string>
+    <string name="threat_item_sub_header_status_ignored">Ameaça ignorada</string>
+    <string name="threat_item_sub_header_status_fixed_on">Ameaça corrigida em %s</string>
+    <string name="threat_fixing">Corrigindo ameaça</string>
+    <string name="scan_history_ignored_threats_tab">Ignorada</string>
+    <string name="scan_history_no_threats_found">Nenhum item encontrado</string>
+    <string name="scan_history_fixed_threats_tab">Corrigida</string>
+    <string name="scan_scanning_title">Analisando arquivos</string>
+    <string name="scan_preparing_to_scan_title">Preparando para varredura</string>
+    <string name="scan_history_menu_title">Histórico</string>
+    <string name="scan_history">Histórico de varreduras</string>
+    <string name="backup_active_filter_empty_subtitle">Tente ajustar o intervalo de datas</string>
+    <string name="backup_active_filter_empty_title">Nenhum backup correspondente encontrado</string>
+    <string name="backup_empty_subtitle">Seu primeiro backup aparecerá aqui dentro de 24 horas e você receberá uma notificação assim que o backup estiver concluído</string>
+    <string name="backup_empty_title">Seu primeiro backup estará pronto logo</string>
+    <string name="request_failed_message">Houve um problema no processamento da solicitação. Tente novamente mais tarde.</string>
+    <string name="gutenberg_native_move_to_bottom">Mover para o fim</string>
+    <string name="gutenberg_native_change_block_position">Alterar posição do bloco</string>
+    <string name="label_control_upload">Enviar</string>
+    <string name="jetpack_icon_content_description">ícone</string>
+    <string name="backup_download_complete_info">Nós também enviarmos um e-mail com link para seu arquivo.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Botão para compartilhar link</string>
+    <string name="backup_download_complete_download_action_button_content_description">Botão de download</string>
+    <string name="backup_download_complete_download_share_action_button">Compartilhar link</string>
+    <string name="backup_download_complete_download_action_button">Fazer download</string>
+    <string name="backup_download_complete_icon_content_description">Ícone de backup pronto para ser baixado</string>
+    <string name="backup_download_complete_header">Seu backup já está disponível para ser baixado.</string>
+    <string name="backup_download_complete_page_title">Seu backup</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Você não precisa esperar com o celular na mão. Avisaremos quando o backup estiver pronto.</string>
+    <string name="backup_download_progress_icon_content_description">Ícone de criação de um backup que pode ser baixado</string>
+    <string name="backup_download_progress_description_with_two_parameters">Estamos criando um backup do seu site de %1$s %2$s, que poderá ser baixado.</string>
+    <string name="backup_download_progress_page_title">Baixar backup</string>
+    <string name="backup_download_another_download_running">Há outro download em processo.</string>
+    <string name="backup_download_generic_failure">Houve um problema ao processar a solicitação. Tente novamente mais tarde.</string>
+    <string name="backup_download_details_action_button_content_description">Botão de criar backup para ser baixado</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="gutenberg_native_image_link_url">Link da imagem</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_user">usuário</string>
+    <string name="threat_ignore">Ignorar ameaça</string>
+    <string name="suggestion_problem">Ocorreu um problema ao carregar as sugestões.</string>
+    <string name="suggestion_none">Nenhum sugestão disponível para %s.</string>
+    <string name="threat_fix">Corrigir ameaça</string>
+    <string name="threat_get_free_estimate">Obter um orçamento gratuitamente</string>
+    <string name="suggestion_xpost">post cruzado</string>
+    <string name="suggestion_no_matching">Sem correspondências para %s.</string>
+    <string name="suggestion_selection_needed">Digite para filtrar a lista de sugestões.</string>
+    <string name="threat_fix_fixable_default">O Jetpack Scan resolverá a ameaça.</string>
+    <string name="threat_fix_fixable_edit">O Jetpack Scan editará o arquivo ou diretório afetado.</string>
+    <string name="threat_fix_fixable_update">O Jetpack Scan atualizará para uma versão mais recente (%s).</string>
+    <string name="threat_fix_fixable_delete">O Jetpack Scan excluirá o arquivo ou diretório afetado.</string>
+    <string name="threat_fix_fixable_replace">O Jetpack Scan substituirá o arquivo ou diretório afetado.</string>
+    <string name="threat_fix_current_not_fixable_description">O Jetpack Scan não pode automaticamente resolver esta ameaça.\n        Sugerimos que você resolva a ameaça manualmente: garanta que seu WordPress, tema e todos os plugins estejam atualizados, e remova o código, tema ou plugin ofensivo do seu site.. \n \n\n        Se você precisa de ajuda para resolver a ameaça, recomendamos o &lt;b&gt;Codeable&lt;/b&gt;, uma rede confiável de freelancers altamente especializados em WordPress.\n        Eles identificaram um grupo seleto de especialistas em segurança para ajudar em casos como este. Os preços variam de $70–120/hora, e você pode obter uma opinião gratuita sem obrigação de contratação.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Resolvendo ameaça</string>
+    <string name="threat_fix_fixed_header">Como o Jetpack resolveu isso?</string>
+    <string name="threat_fix_default_header">Como vamos corrigir isso?</string>
+    <string name="threat_file_description">Ameaça encontrada no arquivo:</string>
+    <string name="threat_technical_details_header">Os detalhes técnicos</string>
+    <string name="threat_problem_header">Qual foi o problema?</string>
+    <string name="threat_item_sub_header_core_file">Vulnerabilidade encontrada no WordPress</string>
+    <string name="threat_details">Detalhes da ameaça</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerabilidade encontrada no tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerabilidade encontrada no plugin</string>
+    <string name="threat_item_sub_header_file_signature">Ameaça encontrada %s</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Diversas vulnerabilidades</string>
+    <string name="threat_item_header_vulnerable_theme">Tema comprometido: %s (versão %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Plugin comprometido: %s (versão %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: padrão de código malicioso</string>
+    <string name="threat_item_header_database_threat">%s ameaças no banco de dados</string>
+    <string name="threat_item_header_threat_found">Ameaça encontrada</string>
+    <string name="threats_fix_all">Corrigir tudo</string>
+    <string name="scan_in_few_seconds">alguns segundos atrás</string>
+    <string name="scan_in_minutes_ago">%s minutos atrás</string>
+    <string name="scan_in_hours_ago">%s hora(s) atrás</string>
+    <string name="scan_this_site">este site</string>
+    <string name="threat_item_header_infected_core_file">%s: arquivo do núcleo infectado</string>
+    <string name="scan_idle_last_scan_description">A última varredura do Jetpack rodou %s e não encontrou nenhum risco. %s</string>
+    <string name="scan_idle_threats_found_title">Seu site pode estar em risco</string>
+    <string name="scan_idle_no_threats_found_title">Não se preocupe com nada</string>
+    <string name="scan_again">Examinar novamente</string>
+    <string name="scan_now">Examinar agora</string>
+    <string name="backup">Backup</string>
+    <string name="scan_state_icon">Ícone de estado da varredura</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtro de Tipo de Atividade (%s tipos selecionados)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtro de tipo de atividade</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (exibindo %s itens)</string>
+    <string name="activity_log_activity_type_empty_subtitle">Nenhuma atividade registrada no espaço de tempo selecionado.</string>
+    <string name="activity_log_activity_type_empty_title">Sem atividades disponíveis.</string>
+    <string name="activity_log_activity_type_error_subtitle">Verifique sua conexão com a internet e tente novamente.</string>
+    <string name="activity_log_activity_type_error_title">Sem conexão</string>
+    <string name="activity_log_activity_type_filter_active_label">Tipo de atividade (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtro de intervalo de data</string>
+    <string name="activity_log_active_filter_empty_subtitle">Tente ajustar o período ou o filtro de tipos de atividade</string>
+    <string name="activity_log_active_filter_empty_title">Nenhum evento correspondente encontrado</string>
+    <string name="backup_item_plugins">Plugins WordPress</string>
+    <string name="backup_item_media_uploads">Mídias enviadas</string>
+    <string name="backup_item_sqls">Banco de dados do site</string>
+    <string name="backup_item_themes">Temas WordPress</string>
+    <string name="backup_item_roots_hint">(inclui wp-config.php e qualquer arquivo que não seja do WordPress)</string>
+    <string name="backup_download_details_icon_content_description">Ícone de criação de um backup para ser baixado</string>
+    <string name="activity_log_item_menu_restore_label">Restaurar até este ponto</string>
+    <string name="activity_log_activity_type_filter_label">Tipo de atividade</string>
+    <string name="activity_log_date_range_filter_label">Período</string>
+    <string name="gutenberg_native_choose_file">Escolher arquivo</string>
+    <string name="backup_download_details_action_button">Criar arquivo para ser baixado</string>
+    <string name="backup_download_details_header">Criar backup para ser baixado</string>
+    <string name="gutenberg_native_error">Erro</string>
+    <string name="activity_log_item_menu_download_backup_label">Baixar backup</string>
+    <string name="backup_download_details_page_title">Baixar backup</string>
+    <string name="backup_download">Baixar backup</string>
+    <string name="activity_log_activity_type_filter_header">Filtrar por tipo de atividade</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiar a versão deste aplicativo</string>
+    <string name="button_copy">Duplicar</string>
+    <string name="dialog_confirm_copy_local_edit_button">Editar o post primeiro</string>
+    <string name="dialog_confirm_copy_local_title">Conflito na sincronização do post</string>
+    <string name="toast_edit_story_update_in_progress_title">A story está sendo salva. Aguarde…</string>
+    <string name="gutenberg_native_file_name">Nome do arquivo</string>
+    <string name="gutenberg_native_file_block_settings">Configurações do bloco Arquivo</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Falha ao enviar arquivos.\nToque para ver mais opções.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Falha ao salvar arquivos.\nToque para ver mais opções.</string>
+    <string name="gutenberg_native_edit_file">Editar arquivo</string>
+    <string name="gutenberg_native_copy_file_url">Copiar URL do arquivo</string>
+    <string name="gutenberg_native_choose_a_file">Escolha um arquivo</string>
+    <string name="new_site_creation_domain_header_title">Escolha um domínio</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_get_status_error">Erro ao coletar o status da assinatura do post</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Não foi possível cancelar a inscrição dos comentários deste post</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Não foi possível inscrever-se nos comentários deste post</string>
+    <string name="reader_follow_comments_unsubscribe_success">Inscrição nos comentários cancelada</string>
+    <string name="my_site_btn_jetpack_settings">Configurações do Jetpack</string>
+    <string name="reader_btn_following_comments">Seguindo conversa por e-mail</string>
+    <string name="reader_btn_follow_comments">Seguir conversa por e-mail</string>
+    <string name="activity_log_activity_type_filter_clear">Limpar</string>
+    <string name="activity_log_activity_type_filter_apply">Aplicar</string>
+    <string name="reader_follow_comments_subscribe_success">Inscrição nos comentários concluída</string>
+    <string name="reader_follow_comments_bad_format_response">Resposta inválida recebida</string>
+    <string name="reader_follow_comments_null_response">Nenhuma resposta recebida</string>
+    <string name="dialog_edit_story_unsupported_format_message">Um ou mais slide não foi adicionado ao seu Story por que este recurso não suporte arquivos GIF no momento. Escolha uma imagem estática ou vídeo de fundo.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Arquivos gif não são compatíveis</string>
+    <string name="dialog_edit_story_unrecoverable_message">Não conseguimos encontrar a mídia para este story no site.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Não é possível editar o story</string>
+    <string name="dialog_edit_story_unavailable_message">Não foi possível enviar a mídia para este story. Verifique sua conexão de internet e tente novamente.</string>
+    <string name="dialog_edit_story_unavailable_title">Não é possível editar o story</string>
+    <string name="dialog_edit_story_limited_message">Este story foi editado em outro dispositivo e a possibilidade de edição de certos objetos pode estar limitada.</string>
+    <string name="dialog_edit_story_limited_title">Edição limitada de story</string>
+    <string name="cannot_retry_deleted_media_item_fatal">A mídia foi removida. Tente criar a story novamente.</string>
+    <string name="color_picker_label_background">Fundo</string>
+    <string name="color_picker_label_text">Texto</string>
+    <string name="dialog_discard_story_ok_button_edit">Descartar</string>
+    <string name="dialog_discard_story_message_edit">Qualquer alteração feita não será salva.</string>
+    <string name="dialog_discard_story_title_edit">Descartar alterações?</string>
+    <string name="label_done_button">Concluído</string>
+    <string name="label_next_button">Seguinte</string>
+    <string name="delete_button_alt">Excluir</string>
+    <string name="hpp_choose_error">Ocorreu um erro durante a seleção do design.</string>
+    <string name="hpp_retry_error">Verifique sua conexão com a internet e tente novamente.</string>
+    <string name="hpp_error_subtitle">Toque em tentar novamente quando estiver online.</string>
+    <string name="hpp_error_title">Modelos não estão disponíveis off-line</string>
+    <string name="reader_discover_no_posts_title">Nenhum post recente</string>
+    <string name="reader_discover_no_posts_button_text">Seguir tópicos</string>
+    <string name="login_find_your_connected_email">Encontre o e-mail conectado</string>
+    <string name="scan">Examinar</string>
+    <string name="reader_discover_empty_title">Desejamos boas-vindas!</string>
+    <string name="continue_site_credentials">Prosseguir com as informações salvas</string>
+    <string name="reader_discover_no_posts_subtitle">Tente seguir mais assuntos para melhorar a pesquisa</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; respondeu seu post</string>
+    <string name="login_prologue_third_subtitle_two">Você recebeu &lt;b&gt;50 curtidas&lt;/b&gt; em seu site hoje</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; curtiu seu post</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Menu de blocos aberto. Escolha um bloco.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menu de blocos fechado.</string>
+    <string name="hpp_skip_button">Pular</string>
+    <string name="hpp_choose_button">Escolher</string>
+    <string name="hpp_subtitle">Escolha seu modelo preferido para a página inicial. Você poderá personalizar ou alterá-lo depois.</string>
+    <string name="hpp_title">Escolha um design</string>
+    <string name="mlp_network_error_title">Modelos não estão disponíveis off-line</string>
+    <string name="mlp_error_subtitle">Toque em tentar novamente ou crie uma página vazia usando o botão abaixo.</string>
+    <string name="mlp_error_title">Modelos não estão disponíveis devido um erro</string>
+    <string name="prepublishing_nudges_add_category_button">Adicionar categoria</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Adicionar nova categoria</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorias</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Não definido</string>
+    <string name="prepublishing_nudges_categories_action">Categorias</string>
+    <string name="mlp_network_error_subtitle">Toque em tentar novamente quando estiver online ou crie uma página vazia usando o botão abaixo.</string>
+    <string name="login_prologue_fifth_caption_three">Museus em Londres</string>
+    <string name="login_prologue_fifth_caption_one">Minhas 10 cafeterias preferidas</string>
+    <string name="login_prologue_fifth_tag_six">Política</string>
+    <string name="login_prologue_fifth_tag_five">Música</string>
+    <string name="login_prologue_fifth_tag_four">Jardinagem</string>
+    <string name="login_prologue_fifth_tag_three">Futebol</string>
+    <string name="login_prologue_fifth_tag_two">Culinária</string>
+    <string name="login_prologue_fifth_tag_one">Arte</string>
+    <string name="login_prologue_fifth_subtitle_three">Novidades sobre Rock n\' Roll</string>
+    <string name="login_prologue_fifth_subtitle_two">Novidades da internet</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_fifth_caption_two">Os melhores fãs do mundo</string>
+    <string name="login_prologue_second_subtitle_two">Me inspiro muito no trabalho do fotógrafo. Vou tentar uma dessas técnicas em meu próximo</string>
+    <string name="login_prologue_second_subtitle_one">Inspirando-se</string>
+    <string name="login_prologue_title_fourth">Veja seu público-alvo aumentar usando análises detalhadas.</string>
+    <string name="login_prologue_title_third">Veja comentários e notificações em tempo real.</string>
+    <string name="login_prologue_title_second">Com o editor avançado, você publica seus posts de onde estiver.</string>
+    <string name="login_prologue_title_first">Desejamos boas-vindas ao criador de sites mais popular do mundo.</string>
+    <string name="login_prologue_title_fifth">Siga seus sites favoritos e descubra novos blogs.</string>
+    <string name="media_loading_failed">O envio da mídia falhou</string>
+    <string name="reader_discover_recommended_blogs_header">Sites para seguir</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Estamos trabalhando arduamente para adicionar mais blocos a cada lançamento.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' não é totalmente suportado</string>
+    <string name="gutenberg_native_help_button">Botão de ajuda</string>
+    <string name="gutenberg_native_edit_using_web_editor">Editar usando o editor web</string>
+    <string name="gutenberg_native_choose_images">Escolher imagens</string>
+    <string name="stories_intro_create_story_post_label">Criar um post de Story</string>
+    <string name="stories_intro_description_second">São publicados como novos posts em seu site para que sua audiência não perca nada.</string>
+    <string name="stories_intro_title_second">Posts de Stories não desaparecem</string>
+    <string name="stories_intro_description_first">Combine fotos, vídeos e texto para criar stories clicáveis e com alto engajamento que seus visitantes vão adorar.</string>
+    <string name="stories_intro_title_first">Agora stories são para todo mundo</string>
+    <string name="stories_intro_image_caption_second">Título de exemplo to story</string>
+    <string name="stories_intro_image_caption_first">Como criar um post de story</string>
+    <string name="stories_intro_main_title">Apresentando os posts de Story</string>
+    <string name="mlp_notice_blank_page_created">Página vazia criada</string>
+    <string name="mlp_notice_page_created">Página criada</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s teve o acesso negado às suas fotos. Para corrigir, edite suas permissões e habilite %2$s e %3$s.</string>
+    <string name="media_insert_failed">Inserção de imagem falhou.</string>
+    <string name="media_insert_failed_with_reason">Inserção de imagem com falha: %s</string>
+    <string name="photo_picker_wordpress_media_library">Escolher da biblioteca de mídias do WordPress</string>
+    <string name="reader_label_toolbar_back">Voltar</string>
+    <string name="reader_discover_empty_button_text">Comece agora</string>
+    <string name="reader_discover_empty_subtitle">Siga tópicos para descobrir novos blogs</string>
+    <string name="reader_post_details_header_by_author_name">Por</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Este referenciador não pode ser marcado como spam</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Desmarcar como spam</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Marcar como spam</string>
+    <string name="stats_referrer_popup_menu_open_website">Abrir site</string>
+    <string name="media_uploading_gif_library_photo">Enviando o arquivo gif</string>
+    <string name="media_uploading_default">Enviando mídia</string>
+    <string name="media_uploading_stock_library_photo">Enviando mídia</string>
     <string name="gutenberg_native_select_item">Selecionar item</string>
     <string name="gutenberg_native_search_or_type_url">Pesquisar ou digitar o URL</string>
+    <string name="gutenberg_native_page_break">Quebra de página</string>
     <string name="gutenberg_native_add_this_telephone_link">Adicionar este telefone como link</string>
     <string name="gutenberg_native_add_this_link">Adicionar este link</string>
     <string name="gutenberg_native_add_this_email_link">Adicionar este e-mail como link</string>
-    <string name="suggestion_no_connection">\"Sem conexão à internet.\nAs sugestões estão indisponíveis.\"</string>
+    <string name="suggestion_no_connection">Sem conexão à internet.\nAs sugestões estão indisponíveis.</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%s selecionado(s)</string>
     <string name="typeface_label_shrikhand">Negrito</string>
@@ -27,7 +490,6 @@ Language: pt_BR
     <string name="permission_microphone">Microfone</string>
     <string name="comment_unable_to_show_error">Não é possível mostrar este comentário</string>
     <string name="reader_menu_report_post">Reportar este post</string>
-    <string name="gutenberg_native_angle">Ângulo</string>
     <string name="error_media_xmlrpc_not_allowed">Sua ação não é permitida</string>
     <string name="reader_welcome_banner">Boas-vindas ao Leitor. Descubra milhões de blogs ao seu alcance.</string>
     <string name="error_media_xmlrcp_server_error">Ocorreu um erro interno no servidor</string>
@@ -38,7 +500,6 @@ Language: pt_BR
     <string name="create_page_fab_tooltip">Criar uma página</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ocultar</string>
     <string name="reader_discover_interests_header">Você pode gostar</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="create_post_story_fab_tooltip">Criar um post ou story</string>
     <string name="gutenberg_native_updates_the_title">Atualiza o título.</string>
     <string name="gutenberg_native_paste_block_after">Colar bloco após</string>
@@ -71,7 +532,6 @@ Language: pt_BR
     <string name="story_saving_untitled">Sem título</string>
     <string name="dialog_discard_page_ok_button">Excluir</string>
     <string name="dialog_discard_page_title">Excluir slide do story?</string>
-    <string name="menu_delete_page">Excluir slide</string>
     <string name="label_text_color_button">Mudar cor do texto</string>
     <string name="label_text_alignment_button">Mudar alinhamento do texto</string>
     <string name="dialog_discard_story_ok_button">Descartar</string>
@@ -85,8 +545,6 @@ Language: pt_BR
     <string name="label_retry_icon">Tentar novamente</string>
     <string name="label_saved_icon">Salvo</string>
     <string name="label_close_button">Fechar</string>
-    <string name="label_control_publish">Próximo</string>
-    <string name="label_done">Concluído</string>
     <string name="label_share_to">Compartilhar em</string>
     <string name="label_snackbar_share">Compartilhar</string>
     <string name="label_snackbar_loop_frame_saved">Salvo em fotos</string>
@@ -97,7 +555,6 @@ Language: pt_BR
     <string name="label_control_flip_camera">Virar</string>
     <string name="sound_button_alt">Som</string>
     <string name="text_button_alt">Texto</string>
-    <string name="more_button_alt">Mais</string>
     <string name="stickers_button_alt">Adesivos</string>
     <string name="flash_button_alt">Flash</string>
     <string name="flip_button_alt">Virar câmera</string>
@@ -109,7 +566,7 @@ Language: pt_BR
     <string name="prepublishing_nudges_story_title_hint">Adicione um título para seu story</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Criar um post ou story</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Criar um post, página ou story</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Toque em %1$s Criar. %2$s Então selecione  &lt;b>Post do blog&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Toque em %1$s Criar. %2$s Então selecione  &lt;b&gt;Post do blog&lt;/b&gt;</string>
     <string name="mlp_choose_layout_title">Escolher um modelo</string>
     <string name="mlp_choose_layout_subtitle">Comece escolhendo entre uma grande variedade de modelos prontos ou crie uma página vazia.</string>
     <string name="photo_picker_choose_file">Escolher no dispositivo</string>
@@ -125,13 +582,10 @@ Language: pt_BR
     <string name="gutenberg_native_choose_image_or_video">Escolher imagem ou vídeo</string>
     <string name="gutenberg_native_choose_image">Escolher imagem</string>
     <string name="gutenberg_native_block_removed">Bloco removido</string>
-    <string name="content_description_logo">Logo do WordPress</string>
     <string name="enter_your_site_address">Digite o endereço de seu site</string>
-    <string name="continue_with_wpcom">Continuar com WordPress.com</string>
     <string name="signup_confirmation_title">Confirmação de inscrição</string>
     <string name="continue_with_google_terms_of_service_text">Se você continuar com o Google e ainda não tiver uma conta no WordPress.com, você criará uma conta e concordará com nossos %1$sTermos de Serviços%2$s.</string>
     <string name="continue_terms_of_service_text">Ao continuar, você concorda com os nossos %1$sTermos de Serviço%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Enviaremos um link por e-mail para criar sua nova conta no WordPress.com.</string>
     <string name="signup_confirmation_message">Usaremos este endereço de e-mail para criar sua nova conta no WordPress.com.</string>
     <string name="signup_magic_link_message">Nós enviamos um link por e-mail para criar sua nova conta no WordPress.com. Verifique sua caixa de e-mails neste dispositivo e toque no link recebido do WordPress.com.</string>
     <string name="enter_account_info_for_site">Digite as informações da conta de %1$s.</string>
@@ -148,19 +602,15 @@ Language: pt_BR
     <string name="or_type_your_password">Ou digite sua senha</string>
     <string name="create_account">Criar conta</string>
     <string name="send_link_by_email">Enviar link por e-mail</string>
-    <string name="login_promo_text_unlock_the_power">Descubra o poder do criador de sites mais flexível.</string>
-    <string name="login_promo_title_37_percent">37\% da internet é construída com o WordPress.</string>
     <string name="reset_your_password">Redefinir sua senha</string>
     <string name="reader_error_request_failed_title">Houve um problema ao completar a solicitação. Tente novamente mais tarde.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Dê ao seu site um nome que reflita sua personalidade e tópico. As primeiras impressões contam!</string>
     <string name="quick_start_list_update_site_title_title">Defina o título do seu site</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Toque em &lt;b>%1$s&lt;/b> para definir um novo título</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Toque em &lt;b&gt;%1$s&lt;/b&gt; para definir um novo título</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Mover esse post para a lixeira também apagará as alterações não salvas. Você tem certeza de que deseja continuar?</string>
     <string name="gutenberg_native_s_block_options">Opções do bloco %s</string>
     <string name="gutenberg_native_duplicate_block">Duplicar bloco</string>
     <string name="gutenberg_native_copy_block">Copiar bloco</string>
     <string name="gutenberg_native_copied_block">Bloco copiado</string>
-    <string name="gutenberg_native_block_settings">Configurações do bloco</string>
     <string name="gutenberg_native_block_pasted">Bloco colado</string>
     <string name="gutenberg_native_block_duplicated">Bloco duplicado</string>
     <string name="gutenberg_native_block_cut">Bloco recortado</string>
@@ -174,7 +624,6 @@ Language: pt_BR
     <string name="gutenberg_native_gradient_type">Tipo de gradiente</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Toque duas vezes para selecionar a opção</string>
     <string name="gutenberg_native_customize_gradient">Personalizar o gradiente</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient">Ir para a personalização de gradiente</string>
     <string name="gutenberg_native_navigates_to_custom_color_picker">Ir para o seletor de cores personalizadas</string>
     <string name="pages_list_author">Autor da página</string>
@@ -199,8 +648,6 @@ Language: pt_BR
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Posts na lixeira não podem ser editados. Você deseja alterar o status deste post para rascunho para que possa editá-lo?</string>
     <string name="prepublishing_nudges_toolbar_title_publish">Data de publicação</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Mover post para rascunhos?</string>
-    <string name="reader_label_choose_your_interests">Escolha seus interesses</string>
-    <string name="reader_choose_interests_content_description">Escolher seus interesses</string>
     <string name="reader_btn_done">Concluído</string>
     <string name="reader_btn_select_few_interests">Selecione alguns para continuar</string>
     <string name="post_status_post_published">Publicado</string>
@@ -209,25 +656,24 @@ Language: pt_BR
     <string name="publish_date">Data de publicação</string>
     <string name="ccpa_privacy_notice_read">Leia o aviso de privacidade CCPA</string>
     <string name="ccpa_privacy_notice_caption">O California Consumer Privacy Act (\"CCPA\") requer que informemos os residentes no estado da Califórnia mais detalhes sobre os tipos de informações pessoais coletadas e compartilhadas no aplicativo, onde conseguimos esses dados e como e por que são usados.</string>
+    <string name="reader_label_choose_your_interests">Escolha seus interesses</string>
+    <string name="reader_choose_interests_content_description">Escolher seus interesses</string>
     <string name="status_and_visibility">Status e visibilidade</string>
     <string name="update_now">Atualizar agora</string>
     <string name="ccpa_privacy_notice_header">Aviso de privacidade para usuários na Califórnia</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
     <string name="gutenberg_native_open_block_actions_menu">Abrir menu de ações do bloco</string>
-    <string name="gutenberg_native_try_a_starter_layout">Experimente começar com um modelo</string>
-    <string name="gutenberg_native_insert_mention">Inserir menção</string>
+    <string name="gutenberg_native_move_to_top">Mover para o topo</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Toque duas vezes para abrir a janela inferior com as opções disponíveis</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Toque duas vezes para abrir a janela de ações com as opções disponíveis</string>
     <string name="pages_cannot_be_started">Não conseguimos abrir as páginas agora. Tente novamente mais tarde.</string>
     <string name="pages_set_as_homepage">Definir como página inicial</string>
     <string name="pages_set_as_posts_page">Definir como página de posts</string>
-    <string name="suggestion_no_matching_users">\"Nenhum usuário correspondente disponível\"</string>
-    <string name="suggestion_invalid_user">\"%s não é um usuário válido\"</string>
     <string name="site_settings_select_page">Selecionar página</string>
     <string name="site_settings_posts_page">Página de posts</string>
     <string name="site_settings_static_homepage">Página inicial estática</string>
     <string name="site_settings_classic_blog">Blog clássico</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">As páginas selecionadas como página inicial e página de posts não podem ser a mesma.</string>
+    <string name="suggestion_invalid">%s não é um %s válido</string>
     <string name="site_settings_accept_homepage">Aceitar</string>
     <string name="site_settings_homepage_settings">Configurações da página inicial</string>
     <string name="site_settings_failed_update_homepage_settings">A atualização das configurações da página inicial falhou. Verifique sua conexão de internet</string>
@@ -242,7 +688,6 @@ Language: pt_BR
     <string name="page_cannot_set_posts_page">Para definir uma \"Página de posts\" ative a opção \"Página inicial estática\" em \"Configurações do site\"</string>
     <string name="page_cannot_set_homepage">Para definir uma \"Página inicial\" ative a opção \"Página inicial estática\" em \"Configurações do site\"</string>
     <string name="page_posts_page_update_failed">Atualização da página de posts falhou</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Boas-vindas ao nosso novo blog</string>
     <string name="gutenberg_native_select_a_color">Selecionar uma cor</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Toque duas vezes para ir para as configurações de cor</string>
     <string name="reader_empty_followed_blogs_description">Ao seguir sites, você verá o conteúdo deles aqui</string>
@@ -276,13 +721,13 @@ Language: pt_BR
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Toque duas vezes para mover o bloco para a esquerda</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Mover o bloco para a direita da posição %1$s para a posição %2$s</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Mover o bloco para a esquerda da posição %1$s para a posição %2$s</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Criando o painel</string>
     <string name="new_site_creation_creating_site_loading_3">Configurando o tema</string>
     <string name="new_site_creation_creating_site_loading_2">Adicionando recursos ao site</string>
     <string name="new_site_creation_creating_site_loading_1">Criando um endereço para o site</string>
     <string name="new_site_creation_creating_site_loading_subtitle">Seu site estará pronto em breve</string>
     <string name="new_site_creation_creating_site_loading_title">Eba!\nQuase concluído</string>
+    <string name="gutenberg_native_block_settings">Configurações do bloco</string>
     <string name="pages_and_posts_cancel_auto_upload">Cancelar envio</string>
     <string name="gif_list_search_returned_unknown_error">Houve um problema durante a solicitação</string>
     <string name="weekday_saturday">Sábado</string>
@@ -332,55 +777,18 @@ Language: pt_BR
     <string name="editor_page_saved_locally_failed_media">A página tem envios de mídias não concluídos e foi salva localmente</string>
     <string name="quickpress_shortcut_activity_label">Selecione blog para atalho QuickPress</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Você fez alterações nessa página recentemente mas não as salvou. Escolha uma versão para carregar:\n</string>
-    <string name="gutenberg_native_what_people_say">O que dizem sobre nós</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Nós oferecemos uma variedade de serviços para te ajudar a alcançar seus objetivos. Não tem certeza o que deseja ou quanto custa? Podemos te explicar quais os melhores serviços para você e os preços de cada um. Entre em contato abaixo.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Somos uma pequena equipe de profissionais talentosos. Nós amamos o que fazemos e fazemos tudo com paixão. Estamos ansiosos para trabalhar com você.</string>
-    <string name="gutenberg_native_want_to_work_with_us">Quer trabalhar conosco?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_warning_message">Mensagem de alerta</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Visitantes desejarão saber quem está do outro lado da página. Use este espaço para escrever algo sobre você, seu site, seu negócio ou qualquer coisa que deseje. Use os depoimentos abaixo para adicionar citações.</string>
-    <string name="gutenberg_native_team">Equipe</string>
-    <string name="gutenberg_native_success_message">Mensagem de sucesso</string>
-    <string name="gutenberg_native_strategy">Estratégia</string>
-    <string name="gutenberg_native_services">Serviços</string>
-    <string name="gutenberg_native_project_name">Título do projeto</string>
-    <string name="gutenberg_native_position_or_job_title">Posição ou título do cargo</string>
-    <string name="gutenberg_native_usa">Brasil</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Isso é um conteúdo de exemplo incluído no modelo para ilustrar seus recursos. Remova ou o substitua com suas próprias palavras e mídias.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">A melhor maneira de começar é parar de planejar e começar a executar.</string>
     <string name="gutenberg_native_show_post_content">Mostrar conteúdo do post</string>
-    <string name="gutenberg_native_samuel_the_dog">João da Silva</string>
-    <string name="gutenberg_native_sally_smith">Maria Aparecida</string>
-    <string name="gutenberg_native_portfolio">Portfólio</string>
     <string name="gutenberg_native_link_to">Link para</string>
     <string name="gutenberg_native_only_show_excerpt">Mostrar apenas o resumo</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Meu portfólio exibe diversos projetos feitos durante minha carreira. Veja minhas informações de contato abaixo e fale comigo.</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Vamos conversar 👋 Não hesite em entrar em contato usando as informações abaixo ou me envie uma mensagem usando o formulário de contato.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Vamos construir algo juntos!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Vamos construir algo juntos!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pires</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_get_in_touch">Entre em contato</string>
+    <string name="gutenberg_native_link_settings">Configurações de link</string>
     <string name="gutenberg_native_excerpt_length_words">Tamanho do resumo (em palavras)</string>
-    <string name="gutenberg_native_inspiration">Inspiração</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Entre em contato: &lt;a href=\"mailto:e-mail@exemplo.com\">e-mail@exemplo.com&lt;/a></string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">São as nossas escolhas que revelam o que realmente somos, muito mais do que as nossas qualidades.</string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Não chore por que acabou. Sorria porque aconteceu.</string>
     <string name="gutenberg_native_customize">Personalizar</string>
-    <string name="gutenberg_native_city_10100">Cidade, 01010–100</string>
     <string name="gutenberg_native_add_paragraph_block">Adicionar bloco de parágrafo</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:email@exemplo.com.br\">email@exemplo.com.br&lt;/a></string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Uma pequena descrição dos serviços que você oferece.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Uma pequena biografia com sua história pessoal, conquistas ou fatos interessantes.</string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Uma descrição do projeto e trabalhos apresentados.</string>
-    <string name="gutenberg_native_555_555_1234">(11) 1234–5678</string>
-    <string name="gutenberg_native_10_street_road">Avenida Paulista, 1</string>
+    <string name="gutenberg_native_video_settings">Configurações de vídeo</string>
     <string name="create_post_page_fab_tooltip_contributors">Criar um post</string>
     <string name="post_list_tab_scheduled_posts">Agendado</string>
     <string name="post_list_tab_published_posts">Publicado</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Não conectado</string>
-    <string name="my_site_select_domains_page_title">Endereço do site</string>
     <string name="post_list_tab_trashed_posts">Na lixeira</string>
     <string name="sharing_facebook_account_must_have_pages">A conexão com o Facebook não encontrou nenhuma página. O Publicize não consegue se conectar a perfis do Facebook, apenas a páginas públicas.</string>
     <string name="notifications_tab_title_likes">Curtidas</string>
@@ -395,26 +803,27 @@ Language: pt_BR
     <string name="stats_management_screen_title">Adicionar novo cartão</string>
     <string name="stats_management_add_new_stats_card">Adicionar novo cartão de estatísticas</string>
     <string name="reader_self_hosted_select_filter">Use o botão de filtro para encontrar posts de assuntos específicos</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selecionado</string>
     <string name="reader_btn_select_filter_content_description">Selecione um site ou tag para filtrar posts</string>
     <string name="reader_btn_remove_filter_content_description">Remover o filtro atual</string>
     <string name="reader_bottom_sheet_content_description">Selecione um site ou tag para filtrar posts, janela popup</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Acessar o WordPress.com</string>
+    <string name="reader_title_subs">Gerenciar tópicos e sites</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Acesse com o WordPress.com para ver os posts mais recentes dos sites que você segue</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Acesse com o WordPress.com para ver os posts mais recentes dos tópicos que você segue</string>
     <string name="gutenberg_native_add_block_before">Adicionar bloco antes</string>
     <string name="gutenberg_native_add_block_after">Adicionar bloco depois</string>
     <string name="reader_filter_empty_sites_action">Seguir um site</string>
     <string name="gutenberg_native_replace_current_block">Substituir o bloco atual</string>
     <string name="reader_filter_empty_sites_list">Veja os posts mais recentes de sites que você segue</string>
-    <string name="gutenberg_native_template_preview">Visualizar modelo</string>
     <string name="gutenberg_native_add_to_end">Adicionar ao final</string>
     <string name="gutenberg_native_add_to_beginning">Adicionar no início</string>
+    <string name="reader_filter_empty_tags_action">Adicionar um tópico</string>
+    <string name="reader_filter_empty_tags_list">Você pode seguir posts de um assunto específico adicionando um tópico</string>
     <string name="reader_filter_main_title">Seguindo</string>
     <string name="reader_filter_cta">Filtrar</string>
     <string name="gutenberg_native_add_a_shortcode">Adicionar um shortcode…</string>
     <string name="gutenberg_native_edit_video">Editar vídeo</string>
     <string name="gutenberg_native_video_caption_s">Legenda do vídeo. %s</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Toque duas vezes para selecionar um modelo</string>
     <string name="post_list_author">Autor do post</string>
     <string name="fab_create_desc">Criar um post</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
@@ -428,11 +837,9 @@ Language: pt_BR
     <string name="stats_box_type_low">baixa</string>
     <string name="stats_box_type_medium">média</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Mover imagem para frente</string>
-    <string name="gutenberg_native_move_image_backward">Mover imagem para trás</string>
     <string name="gutenberg_native_gallery_caption_s">Legenda da galeria. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. O valor atual é %2$s</string>
     <string name="create_post_page_fab_tooltip">Criar um post ou página</string>
+    <string name="gutenberg_native_replace_image">Substituir imagem</string>
     <string name="post_signup_interstitial_not_right_now">Agora não</string>
     <string name="content_description_person_building_website">Pessoa construindo um site</string>
     <string name="post_signup_interstitial_subtitle">O que você quiser criar ou compartilhar, nós te ajudaremos aqui.</string>
@@ -445,25 +852,20 @@ Language: pt_BR
     <string name="photo_picker_image_thumbnail_content_description">Miniatura da imagem</string>
     <string name="my_site_bottom_sheet_add_post">Posts do blog</string>
     <string name="post_settings_publish">Publicar</string>
-    <string name="dialog_gutenberg_informative_description_v2">Fizemos grandes melhorias no editor de blocos e achamos que vale a pena testá-lo. O editor de blocos foi ativado para novos posts e páginas, mas caso você queira voltar ao editor clássico, é possível fazer a alteração em Meu site > Configurações do site.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizar agora</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Este post será sincronizado imediatamente.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Pronto para sincronizar?</string>
     <string name="new_site_creation_unavailable_domain">Este domínio não está disponível</string>
-    <string name="login_promo_viewpager_content_description">Introdução</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Não foi possível acessar seu site. Entre em contato com sua hospedagem para resolver isso.</string>
-    <string name="login_discovery_error_ssl">Não foi possível acessar seu site devido a um problema com o &lt;b>certificado SSL&lt;/b>. Entre em contato com sua hospedagem para resolver isso.</string>
-    <string name="login_discovery_error_http_auth">Não foi possível acessar seu site porque ele requer &lt;b>autenticação HTTP&lt;/b>. Entre em contato com sua hospedagem para resolver isso.</string>
-    <string name="login_discovery_error_xmlrpc">Não foi possível acessar o &lt;b>arquivo XMLRPC&lt;/b> de seu site. Entre em contato com sua hospedagem para resolver isso.</string>
-    <string name="login_site_credentials_magic_link_label">Quase pronto! Só precisamos verificar seu endereço de e-mail conectado ao Jetpack: &lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">Não foi possível acessar seu site devido a um problema com o &lt;b&gt;certificado SSL&lt;/b&gt;. Entre em contato com sua hospedagem para resolver isso.</string>
+    <string name="login_discovery_error_http_auth">Não foi possível acessar seu site porque ele requer &lt;b&gt;autenticação HTTP&lt;/b&gt;. Entre em contato com sua hospedagem para resolver isso.</string>
+    <string name="login_discovery_error_xmlrpc">Não foi possível acessar o &lt;b&gt;arquivo XMLRPC&lt;/b&gt; de seu site. Entre em contato com sua hospedagem para resolver isso.</string>
+    <string name="login_site_credentials_magic_link_label">Quase pronto! Só precisamos verificar seu endereço de e-mail conectado ao Jetpack: &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Acessar com as credenciais do site %1$s</string>
-    <string name="send_verification_email">Enviar um e-mail de verificação</string>
     <string name="reader_following_display_name">Seguindo</string>
     <string name="my_site_bottom_sheet_add_page">Página do site</string>
-    <string name="enter_site_credentials_instead">Acessar com as credenciais do site.</string>
     <string name="posts_cannot_be_started">Não conseguimos abrir os posts agora. Tente novamente mais tarde.</string>
-    <string name="suffix_1_000">%sk</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
@@ -474,24 +876,22 @@ Language: pt_BR
     <string name="reader_discover_display_name">Explorar</string>
     <string name="reader_my_likes_display_name">Curtidas</string>
     <string name="site_cannot_be_loaded">Não conseguimos carregar os dados de seu site no momento. Tente novamente mais tarde.</string>
+    <string name="reader_filter_tags_title">Tópicos</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="gutenberg_native_wordpress_media_library">Biblioteca de mídia do WordPress</string>
     <string name="gutenberg_native_ungroup">Desagrupar</string>
+    <string name="gutenberg_native_unsupported">Não compatível</string>
     <string name="gutenberg_native_translate">Traduzir</string>
-    <string name="gutenberg_native_title">Título:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Toque para ocultar o teclado</string>
     <string name="gutenberg_native_tap_here_to_show_help">Toque aqui para mostrar ajuda</string>
     <string name="gutenberg_native_take_a_video">Gravar um vídeo</string>
     <string name="gutenberg_native_take_a_photo_or_video">Fotografar ou filmar</string>
     <string name="gutenberg_native_take_a_photo">Tirar uma foto</string>
     <string name="gutenberg_native_start_writing">Comece a escrever…</string>
-    <string name="gutenberg_native_size">Tamanho</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Barra lateral de título do plugin</string>
     <string name="gutenberg_native_show_section">Mostrar seção</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloco %s. Este bloco tem conteúdo inválido.</string>
     <string name="gutenberg_native_s_block_empty">Bloco %s. Vazio.</string>
-    <string name="gutenberg_native_reset_block">Redefinir bloco</string>
     <string name="gutenberg_native_cut_block">Recortar bloco</string>
-    <string name="gutenberg_native_remove_annotations">Remover anotações</string>
     <string name="gutenberg_native_problem_opening_the_video">Problema ao abrir o vídeo</string>
     <string name="gutenberg_native_problem_displaying_block">Problema ao exibir o bloco</string>
     <string name="gutenberg_native_post_title_s">Título do post. %s</string>
@@ -501,17 +901,12 @@ Language: pt_BR
     <string name="gutenberg_native_open_settings">Abrir configurações</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Nenhum aplicativo pode responder essa requisição. Instale um navegador de internet.</string>
     <string name="gutenberg_native_navigate_up">Navegar acima</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Meu painel de pré publicação</string>
-    <string name="gutenberg_native_my_post_status_info">Minhas informações de status do post</string>
-    <string name="gutenberg_native_my_post_publish_panel">Meu painel de publicação do post</string>
-    <string name="gutenberg_native_my_document_setting_panel">Meu painel de configurações do documento</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mover o bloco acima da linha %1$s para a linha %2$s</string>
     <string name="gutenberg_native_move_block_up">Mover o bloco para cima</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mover o bloco abaixo da linha %1$s para a linha %2$s</string>
     <string name="gutenberg_native_move_block_down">Mover o bloco para baixo</string>
     <string name="gutenberg_native_image_caption_s">Legenda da imagem. %s</string>
     <string name="gutenberg_native_hide_keyboard">Esconder teclado</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Aqui está o painel de conteúdo!</string>
     <string name="gutenberg_native_help_icon">Ícone de ajuda</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Falha ao inserir a mídia.\nToque para ver mais opções.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Toque duas vezes para desfazer a última alteração</string>
@@ -522,13 +917,10 @@ Language: pt_BR
     <string name="gutenberg_native_double_tap_to_redo_last_change">Toque duas vezes para refazer a última alteração</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Toque duas vezes para mover o bloco para cima</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Toque duas vezes para mover o bloco para baixo</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Toque duas vezes para alterar o valor usando um slider</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Toque duas vezes para adicionar um bloco</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Toque duas vezes para editar esse valor</string>
     <string name="gutenberg_native_current_value_is_s">O valor atual é %s</string>
-    <string name="gutenberg_native_content">Conteúdo…</string>
     <string name="gutenberg_native_choose_from_device">Escolher no dispositivo</string>
-    <string name="gutenberg_native_annotations_sidebar">Barra lateral de anotações</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ocorreu um erro desconhecido. Tente novamente.</string>
     <string name="gutenberg_native_alt_text">Texto alternativo</string>
     <string name="gutenberg_native_add_video">Adicionar vídeo</string>
@@ -536,21 +928,18 @@ Language: pt_BR
     <string name="gutenberg_native_add_image_or_video">Adicionar imagem ou vídeo</string>
     <string name="gutenberg_native_add_image">Adicionar imagem</string>
     <string name="gutenberg_native_add_block_here">Adicionar um bloco aqui</string>
-    <string name="gutenberg_native_add_annotation">Adicionar anotação</string>
-    <string name="gutenberg_native_add_a_description">Adicionar uma descrição</string>
+    <string name="gutenberg_native_add_alt_text">Adicionar texto alternativo</string>
     <string name="reader_empty_saved_posts_content_description">\"Toque no botão Adicionar para salvar posts para adicionar um post à sua lista\"</string>
     <string name="reader_acessibility_list_loaded">\"A lista foi carregada com %1$d itens.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Notificações</string>
-    <string name="master_switch_default_title_off">Desativado</string>
-    <string name="master_switch_default_title_on">Ativado</string>
-    <string name="notifications_tab_dialog_master_off_message">\"Desativar as notificações deste site removerá a exibição de todas as notificações dele. Você pode ajustar o tipo de notificações desejadas após ativar as notificações.\"</string>
-    <string name="notifications_tab_dialog_master_off_title">Para ver as notificações desse site na aba notificações, ative as notificações desse site.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Ativar as notificações desse site para serem exibidas na aba notificações</string>
-    <string name="notifications_tab_dialog_master_status_off">Notificações para esse site</string>
-    <string name="notifications_tab_dialog_master_status_on">Notificações para esse site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Desativar a exibição de notificações deste site na aba notificações</string>
-    <string name="dialog_gutenberg_informative_description_page">Agora você está usando o editor de blocos para novas páginas.Ótimo! Se você quiser mudar para o editar clássico, acesse \'Meu site\' > \'Configurações do site\'.</string>
-    <string name="dialog_gutenberg_informative_description_post">Agora você está usando o editor de blocos para novos posts. Ótimo! Se você quiser mudar para o editar clássico, acesse \'Meu site\' > \'Configurações do site\'.</string>
+    <string name="main_switch_default_title_off">Desativado</string>
+    <string name="main_switch_default_title_on">Ativado</string>
+    <string name="notifications_tab_dialog_main_off_message">Desativar notificações para este site irá desabilitar a exibição de notificações na aba correspondente do site. Você pode ajustar o tipo de notificações que deseja receber após ativar notificações para o site.</string>
+    <string name="notifications_tab_dialog_main_hint_on">Desativar a exibição de notificações deste site na aba de notificações</string>
+    <string name="notifications_tab_dialog_main_status_off">Notificações para este site</string>
+    <string name="notifications_tab_dialog_main_off_title">Para ver as notificações desse site na aba notificações, ative as notificações desse site.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Ativar a exibição de notificações deste site na aba de notificações</string>
+    <string name="notifications_tab_dialog_main_status_on">Notificações para esse site</string>
     <string name="pick_media">Adicionar imagem ou vídeo</string>
     <string name="error_post_not_submitted_retrying">Não foi possível enviar este post para revisão, mas tentaremos novamente mais tarde.</string>
     <string name="error_post_not_scheduled_retrying">Não foi possível agendar esse post, mas tentaremos novamente mais tarde.</string>
@@ -643,8 +1032,6 @@ Language: pt_BR
     <string name="post_settings_add_to_calendar">Adicionar ao calendário</string>
     <string name="post_settings_notification">Notificação</string>
     <string name="post_settings_time_and_date">Data e hora</string>
-    <string name="login_need_help_finding_connected_email">Precisa de ajuda para encontrar o e-mail com que se conectou?</string>
-    <string name="enter_wordpress_site">O site neste endereço não é um site do WordPress. Para que possamos nos conectar a ele, o site precisa ter o WordPress instalado.</string>
     <string name="login_invalid_site_url">Digite o endereço completo do site, tal como exemplo.com.</string>
     <string name="stats_post_views_label">Visualizações</string>
     <string name="stats_collapse_content_description">Recolher</string>
@@ -716,7 +1103,7 @@ Language: pt_BR
     <string name="domain_contact_information_state_hint">Estado</string>
     <string name="domain_contact_information_city_hint">Cidade</string>
     <string name="domain_contact_information_address_hint_two">Endereço 2</string>
-    <string name="domain_registration_result_description">seu novo domínio &lt;b>%s&lt;/b> está sendo configurado.\nSeu site está animado!</string>
+    <string name="domain_registration_result_description">seu novo domínio &lt;b&gt;%s&lt;/b&gt; está sendo configurado.\nSeu site está animado!</string>
     <string name="domain_contact_information_address_hint">Endereço</string>
     <string name="domain_contact_information_country_hint">País</string>
     <string name="domain_contact_information_country_code_hint">Código do país</string>
@@ -819,44 +1206,35 @@ Language: pt_BR
     <string name="stats_loading_error">Dados não carregados</string>
     <string name="plans_loading_error_no_plans_title">Não foi possível carregar os planos</string>
     <string name="menu_switch_to_gutenberg_editor">Mudar para o editor de blocos</string>
-    <string name="menu_switch_to_aztec_editor">Mudar para o editor clássico</string>
     <string name="stats_loading_block_error">Ocorreu um problema ao carregar seus dados. Atualize sua página para tentar novamente.</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Editar novos posts e páginas com o editor de blocos.</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Usar o editor de blocos</string>
-    <string name="dialog_gutenberg_informative_title">Editor de blocos ativado</string>
     <string name="exit">sair</string>
     <string name="quick_start_sites_type_subtitle">%1$d de %2$d concluído</string>
-    <string name="quick_start_sites_type_grow">Aumente sua audiência</string>
-    <string name="quick_start_sites_type_customize">Personalize seu site</string>
     <string name="quick_start_sites">Próximos passos</string>
-    <string name="quick_start_complete_tasks_header">Concluído (%d)</string>
-    <string name="quick_start_dialog_view_site_message">Aproveite seu produto concluído!</string>
-    <string name="quick_start_dialog_upload_icon_title">Enviar um ícone do site</string>
     <string name="quick_start_dialog_upload_icon_message">Seus visitantes verão o ícone no navegador. Adicione um ícone personalizado para uma exibição profissional.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Toque em %1$s Plano %2$s para ver seu plano atual e outros planos disponíveis</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Toque em %1$s Adicionar página %2$s para criar uma nova página.</string>
+    <string name="quick_start_dialog_upload_icon_title">Envie um ícone do site</string>
+    <string name="quick_start_dialog_view_site_message">Aproveite seu novo site!</string>
+    <string name="quick_start_complete_tasks_header">Concluídas (%d)</string>
+    <string name="quick_start_sites_type_grow">Aumente seu número de visitantes</string>
+    <string name="quick_start_sites_type_customize">Personalize seu site</string>
     <string name="quick_start_dialog_publish_post_message">Crie um rascunho e publique seu primeiro post.</string>
     <string name="quick_start_dialog_need_help_message">Te guiaremos pelos passos básicos em criar um site.</string>
     <string name="quick_start_dialog_migration_title">Fizemos algumas alterações em sua lista</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Toque em %1$s Páginas %2$s para continuar.</string>
     <string name="quick_start_dialog_check_stats_message_short">Toque em %1$s Estatísticas %2$s para ver o desempenho de seu site.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Toque em %1$s Ícone do seu site %2$s para enviar um ícone</string>
     <string name="quick_start_dialog_migration_message">Adicionamos mais tarefas para te ajudar a aumentar sua audiência.</string>
-    <string name="quick_start_dialog_explore_plans_title">Explorar planos</string>
     <string name="quick_start_dialog_explore_plans_message">Aprenda mais sobre as ferramentas de marketing e SEO de nossos planos pagos.</string>
-    <string name="quick_start_dialog_enable_sharing_title">Ativar compartilhamento de post</string>
+    <string name="quick_start_dialog_enable_sharing_title">Ative o compartilhamento de post</string>
+    <string name="quick_start_dialog_explore_plans_title">Explore planos</string>
     <string name="quick_start_dialog_enable_sharing_message">Compartilhar novos posts em suas redes sociais automaticamente.</string>
-    <string name="quick_start_dialog_customize_site_message">Ajuste fontes, adicione imagens e muito mais.</string>
-    <string name="quick_start_dialog_create_page_title">Crie uma nova página</string>
-    <string name="quick_start_dialog_create_page_message">Crie uma página com conteúdo fixo. Uma página Sobre é um ótimo começo.</string>
     <string name="quick_start_dialog_check_stats_title">Verifique as estatísticas de seu site</string>
     <string name="quick_start_dialog_check_stats_message">Mantenha-se atualizado com o desempenho de seu site.</string>
-    <string name="quick_start_dialog_browse_themes_title">Pesquisar temas</string>
     <string name="quick_start_dialog_remove_next_steps_message">Remover os próximos passos esconderá todas dicas em seu site. Essa ação não pode ser desfeita.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Remover os próximos passos</string>
     <string name="quick_start_remove_next_steps_menu_title">Remover este</string>
     <string name="quick_start_complete_view_subtitle">Parabéns por completar sua lista. Ótimo trabalho!</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore dezenas de opções de modelo e encontre a perfeita para você.</string>
     <string name="quick_start_complete_view_title">Todas as tarefas concluídas!</string>
     <string name="quick_start_task_skip_menu_title">Pular tarefa</string>
     <string name="quick_start_completed_tasks_header_chevron_collapse_desc">recolher</string>
@@ -870,7 +1248,6 @@ Language: pt_BR
     <string name="stats_select_previous_period_description">Selecionar período anterior</string>
     <string name="notification_new_site_creation_title">Criar site</string>
     <string name="new_site_creation_create_site_button">Criar site</string>
-    <string name="new_site_creation_search_domain_input_hint">Pesquisar por domínios</string>
     <string name="notification_new_site_creation_failed">Ocorreu um problema</string>
     <string name="notification_new_site_creation_creating_site_subtitle">Estamos criando seu novo site</string>
     <string name="new_site_creation_site_preview_content_description">Mostrando pré-visualização do site</string>
@@ -878,13 +1255,10 @@ Language: pt_BR
     <string name="site_created_but_not_fetched_snackbar_message">Parece que sua conexão está lenta. Se você não encontrar seu site na lista, tente atualizar a tela.</string>
     <string name="cancel_new_site_wizard_content_description">Cancelar o guia de criação do site</string>
     <string name="new_site_creation_domain_header_subtitle">É onde as pessoas encontrarão seu site na internet.</string>
-    <string name="new_site_creation_domain_header_title">Escolha um nome de domínio para seu site</string>
     <string name="new_site_creation_empty_domain_list_message">Nenhum endereço disponível corresponde à sua pesquisa</string>
     <string name="site_creation_error_generic_subtitle">Erro de comunicação com o servidor. Tente novamente.</string>
     <string name="site_creation_error_generic_title">Ocorreu um problema</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Ocorreu um problema</string>
-    <string name="site_creation_segments_subtitle">Isso nos ajuda a fazer recomendações mas você não está preso a isso. Todos os sites evoluem!</string>
-    <string name="site_creation_segments_title">Nos conte que tipo de site você gostaria de fazer</string>
     <string name="new_site_creation_preview_title">Seu site foi criado!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d de %2$d</string>
     <string name="new_site_creation_screen_title_general">Criar site</string>
@@ -1026,33 +1400,28 @@ Language: pt_BR
     <string name="quick_start_focus_point_description">toque aqui</string>
     <string name="quick_start_list_create_site_title">Crie seu site</string>
     <string name="quick_start_list_create_site_subtitle">Coloque seu site no ar.</string>
-    <string name="quick_start_dialog_view_site_title">Ver seu site</string>
     <string name="quick_start_dialog_share_site_title">Compartilhar seu site</string>
     <string name="quick_start_dialog_share_site_message">Conectar suas contas em redes sociais para compartilhar novos posts automaticamente.</string>
     <string name="quick_start_dialog_view_site_message_short">Toque em %1$s Ver site %2$s para visualizar seu site</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">Toque em %1$s Compartilhar %2$s para continuar</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Toque em %1$s Conexões %2$s para adicionar suas contas em redes sociais</string>
-    <string name="quick_start_dialog_publish_post_title">Publicar um post</string>
+    <string name="quick_start_dialog_view_site_title">Veja seu site</string>
     <string name="quick_start_dialog_need_help_title">Precisa de alguma ajuda para iniciar?</string>
     <string name="quick_start_dialog_need_help_button_positive">Aceitar</string>
     <string name="quick_start_dialog_publish_post_message_short">Toque em %1$s Criar post %2$s para criar um novo post</string>
+    <string name="quick_start_dialog_publish_post_title">Publique um post</string>
     <string name="quick_start_dialog_need_help_button_neutral">Nunca</string>
-    <string name="quick_start_dialog_follow_sites_title">Seguir outros sites</string>
     <string name="quick_start_dialog_follow_sites_message">Encontre sites com conteúdos de seu interesse e siga-os para receber atualizações assim que forem publicadas.</string>
-    <string name="quick_start_dialog_customize_site_title">Personalize seu site</string>
     <string name="quick_start_dialog_need_help_button_negative">Não obrigado</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Toque em %1$s Pesquisar %2$s para procurar por sites com interesses similares</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Toque em %1$s Leitor %2$s para continuar</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Toque em %1$s Temas %2$s para continuar</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Toque em %1$s Personalizar %2$s para começar a editar seu site</string>
+    <string name="quick_start_dialog_follow_sites_title">Siga outros sites</string>
     <string name="quick_start_button_negative_short">Cancelar</string>
     <string name="quick_start_button_negative">Agora não</string>
     <string name="my_site_create_new_site_title">Você não tem nenhum site</string>
-    <string name="quick_start_dialog_choose_theme_message">Procurar em todos os nossos temas para encontrar um perfeito para você.</string>
     <string name="quick_start_button_positive">Ir</string>
-    <string name="quick_start_dialog_choose_theme_title">Escolha um tema</string>
     <string name="content_description_more">Mais</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Toque em %1$s Temas %2$s para descobrir novos temas</string>
+    <string name="reader_empty_followed_tags_title">Nenhum tópico seguido</string>
+    <string name="reader_empty_followed_tags_subtitle">Adicione tópicos aqui para encontrar posts sobre seus assuntos favoritos</string>
     <string name="install_jetpack_retry">Tentar novamente</string>
     <string name="jetpack">Jetpack</string>
     <string name="jetpack_installed">Jetpack instalado</string>
@@ -1107,17 +1476,15 @@ Language: pt_BR
     <string name="support_contact_email_not_set">Não informado</string>
     <string name="support_contact_email">E-mail de contato</string>
     <string name="application_log_button">Log do aplicativo</string>
-    <string name="activity_log_rewind_site">Retroceder site</string>
-    <string name="activity_log_currently_restoring_message">Retrocedendo para %1$s %2$s</string>
     <string name="notification_channel_transient_title">Transitório</string>
     <string name="my_tickets">Meus tickets</string>
-    <string name="activity_log_rewind_dialog_message">Tem certeza de que deseja retroceder seu site para %1$s as %2$s? Isso removerá todo conteúdo e opções criadas ou alteradas a partir desse momento.</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Retrocesso em progresso</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restauração em progresso</string>
+    <string name="activity_log_currently_restoring_message">Restaurando para %1$s %2$s</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Seu site foi restaurado com sucesso</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Seu site foi restaurado com sucesso\nRetrocedido para %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Seu site está sendo restaurado\nRetrocedendo para %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Seu site está sendo restaurado</string>
     <string name="activity_log_button">Botão do histórico de atividades</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Seu site foi restaurado com sucesso\nRestaurado para %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Seu site está sendo restaurado\nRestaurando para %1$s %2$s</string>
     <string name="plugin_auto_managed">Auto gerenciado</string>
     <string name="reader_save_posts_locally_dialog_message">Salve esse post e volte para lê-lo quando quiser. Ele ficará disponível apenas neste dispositivo por que posts salvos ainda não são sincronizados entre dispositivos (estamos trabalhando nisso).</string>
     <string name="reader_empty_search_request_failed">Não foi possível pesquisar</string>
@@ -1125,7 +1492,6 @@ Language: pt_BR
     <string name="reader_save_posts_locally_dialog_title">Salvar posts para depois</string>
     <string name="sites">Sites</string>
     <string name="comment_read_source_post">Ler o post original</string>
-    <string name="signup_email_screen_title">Inscrição por e-mail</string>
     <string name="signup_magic_link_title">Link mágico enviado</string>
     <string name="verification_2fa_screen_title">Código de verificação</string>
     <string name="selfhosted_site_login_title">Informações de acesso</string>
@@ -1133,14 +1499,11 @@ Language: pt_BR
     <string name="magic_link_login_title">Acessar com link mágico</string>
     <string name="site_address_login_title">Endereço do site para acesso</string>
     <string name="email_address_login_title">Endereço de e-mail para acesso</string>
-    <string name="alternatively">Alternativamente:</string>
     <string name="removed">Removido</string>
     <string name="reader_save_for_later_title">Posts salvos</string>
     <string name="reader_remove_bookmark">Remover dos posts salvos</string>
     <string name="reader_bookmark_snack_title">Post salvo</string>
     <string name="reader_bookmark_snack_btn">Ver tudo</string>
-    <string name="reader_btn_bookmarked">Salvo</string>
-    <string name="reader_btn_bookmark">Salvar</string>
     <string name="reader_add_bookmark">Adicionar aos posts salvos</string>
     <string name="reader_empty_saved_posts_title">Nenhum post salvo ainda.</string>
     <string name="reader_empty_saved_posts_description">Toque em %s para salvar um post em sua lista.</string>
@@ -1159,10 +1522,8 @@ Language: pt_BR
     <string name="reader_btn_notifications_on">Ativar notificações do site</string>
     <string name="reader_btn_notifications_off">Desativar notificações do site</string>
     <string name="activity_log_jetpack_icon">Ícone do Jetpack</string>
-    <string name="rewind">Retroceder</string>
     <string name="activity_log_event">Evento</string>
     <string name="activity_log_icon">Ícone da atividade</string>
-    <string name="activity">Atividade</string>
     <string name="privacy_policy_read">Ler a política de privacidade</string>
     <string name="privacy_policy_learn_more_header">Política de privacidade</string>
     <string name="cookie_policy_learn_more_header">Política de cookies</string>
@@ -1174,7 +1535,6 @@ Language: pt_BR
     <string name="cookie_policy_learn_more_caption">Compartilhar informações de como nossos serviços são usados com nossas ferramentas de análise enquanto estiver acessando sua conta do WordPress.com.</string>
     <string name="third_party_policy_learn_more_header">Política de terceiros</string>
     <string name="post_submitted">Post enviado</string>
-    <string name="login_email_button_signup">Não tem uma conta? %1$sRegistre-se%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">O recurso de plugins requer que seu site cumpra alguns requisitos.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">O recurso de plugins precisa que o domínio principal esteja associado a esse usuário.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">Plugin não pode ser instalado em sites VIP.</string>
@@ -1272,7 +1632,6 @@ Language: pt_BR
     <string name="comment_unapproved_talkback">Comentário desaprovado</string>
     <string name="comment_approved_talkback">Comentário aprovado</string>
     <string name="share_intent_screen_title">Escolher site</string>
-    <string name="login_prologue_screen_title">Acessar</string>
     <string name="notif_detail_screen_title">Informações da notificação %s</string>
     <string name="notifications_screen_title">Notificações</string>
     <string name="publicize_buttons_screen_title">Botões de compartilhamento</string>
@@ -1287,7 +1646,7 @@ Language: pt_BR
     <string name="media_settings_screen_title">Detalhes do arquivo</string>
     <string name="person_detail_screen_title">Informações da pessoa</string>
     <string name="signup_epilogue_error_avatar_view">Seu avatar foi enviado e estará disponível em breve.</string>
-    <string name="permissions_denied_message">Parece que você desabilitou permissões necessárias para este recurso.&lt;br/>&lt;br/>Para alterar isso, edite suas permissões e tenha certeza de que &lt;strong>%s&lt;/strong> está habilitado.</string>
+    <string name="permissions_denied_message">Parece que você desabilitou permissões necessárias para este recurso.&lt;br/&gt;&lt;br/&gt;Para alterar isso, edite suas permissões e tenha certeza de que &lt;strong&gt;%s&lt;/strong&gt; está habilitado.</string>
     <string name="permissions_denied_title">Permissões</string>
     <string name="plugin_caption_featured">Em destaque</string>
     <string name="sharing_disabled_description">Não é possível acessar suas configurações de compartilhamento porque o seu módulo de compartilhamento do Jetpack está desabilitado.</string>
@@ -1328,7 +1687,6 @@ Language: pt_BR
     <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 página com 1 arquivo não enviado</string>
     <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d posts com 1 arquivo não enviado</string>
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 post com 1 arquivo não enviado</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Criar site</string>
     <string name="notification_site_creation_created">Toque para continuar.</string>
     <string name="notification_site_creation_title_success">Site criado!</string>
@@ -1342,11 +1700,8 @@ Language: pt_BR
     <string name="username_changer_dismiss_button_positive">Descartar</string>
     <string name="username_changer_action">Salvar</string>
     <string name="content_description_add_avatar">Adicionar avatar</string>
-    <string name="signup_with_google_button">Inscrever-se com o Google</string>
-    <string name="signup_with_email_button">Inscrever-se com e-mail</string>
     <string name="signup_user_exists">Este e-mail já existe no WordPress.com.\nContinuando com o acesso.</string>
     <string name="signup_updating_account">Atualizando conta…</string>
-    <string name="signup_terms_of_service_text">Ao cadastrar-se, você concorda com os nossos %1$sTermos de serviço%2$s.</string>
     <string name="signup_magic_link_progress">Enviando e-mail</string>
     <string name="signup_magic_link_error_button_positive">Tentar novamente</string>
     <string name="signup_magic_link_error_button_negative">Fechar</string>
@@ -1358,12 +1713,7 @@ Language: pt_BR
     <string name="signup_epilogue_error_button_negative">Reverter</string>
     <string name="signup_epilogue_error_generic">Houve um problema ao atualizar sua conta. Você pode tentar novamente ou reverter suas alterações para continuar.</string>
     <string name="signup_epilogue_error_avatar">Houve um problema ao enviar seu avatar.</string>
-    <string name="signup_email_header">Para criar sua nova conta no WordPress.com, digite seu endereço de e-mail.</string>
-    <string name="signup_email_error_generic">Houve um problema ao verificar o endereço de e-mail.</string>
     <string name="signup_epilogue_hint_password_detail">Você sempre pode acessar com um link como o que acabou de usar, mas também é possível definir uma senha se preferir.</string>
-    <string name="sign_up">Inscrever-se no WordPress.com</string>
-    <string name="enter_username_instead">Acesse com seu nome de usuário.</string>
-    <string name="enter_site_address_instead">Acesse digitando o endereço do seu site.</string>
     <string name="plugin_see_all">Ver todos</string>
     <string name="plugin_manage">Gerenciar</string>
     <string name="plugin_search_error">Não foi possível pesquisar por plugins</string>
@@ -1484,7 +1834,6 @@ Language: pt_BR
     <string name="login_error_suffix">\nTalvez tentar com outra conta?</string>
     <string name="login_error_generic">Houve um problema na conexão com a conta do Google.</string>
     <string name="login_error_button">Fechar</string>
-    <string name="login_google_button_suffix">Acessar com o Google.</string>
     <string name="enter_wpcom_password_google">Para continuar com esta conta do Google, digite a senha da conta correspondente no WordPress.com. Isso só será solicitado uma vez.</string>
     <string name="error_generic_network">Ocorreu um erro na rede. Verifique sua conexão e tente novamente.</string>
     <string name="post_settings_remove_featured_image">Remover imagem destacada</string>
@@ -1496,12 +1845,11 @@ Language: pt_BR
     <string name="jetpack_disconnect_confirm">Desconectar</string>
     <string name="jetpack_disconnect_confirmation_message">Tem certeza de que quer desconectar o Jetpack do site?</string>
     <string name="jetpack_disconnect_pref_title">\"Desconectar do WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Você pode liberar um ou vários endereços IPs para que eles nunca sejam bloqueados pelo Jetpack. São permitidos IPv4 e IPv6. Para especificar uma faixa, digite o valor mais baixo separado do valor mais alto por um hífen. Exemplo: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Você pode configurar um endereço IP ou diversos endereços como \"Sempre permitidos\" para evitar que sejam bloqueados pelo Jetpack. IPv4 e IPv6 são aceitos. Para especificar um intervalo, insira o menor e o maior valor separados por um traço. Exemplo: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Exigir autenticação em duas etapas</string>
     <string name="jetpack_match_wpcom_via_email_title">Relacionar contas usando o e-mail</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permitir login com o WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Login do WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Endereços IP permitidos</string>
     <string name="jetpack_prevent_brute_force_title">Bloquear tentativas maliciosas de login</string>
     <string name="jetpack_prevent_brute_force_category_title">Proteção contra ataques de força bruta</string>
     <string name="jetpack_send_wp_notifications_title">Enviar notificações push</string>
@@ -1542,13 +1890,12 @@ Language: pt_BR
     <string name="notification_settings_category_other">Outro</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Todos os meus sites</string>
     <string name="notification_settings_category_your_sites">Seus sites</string>
-    <string name="notification_settings_master_off_message">Desligar as configurações de notificação desabilitará todos os avisos deste aplicativo, não importando o tipo. Você pode escolher detalhadamente quais tipos de notificação quer receber ligando as configurações de notificação.</string>
-    <string name="notification_settings_master_off_title">Para receber notificações neste dispositivo, ligue as configurações de notificação.</string>
-    <string name="notification_settings_master_hint_off">Habilitar notificações</string>
-    <string name="notification_settings_master_hint_on">Desabilitar notificações</string>
-    <string name="notification_settings_master_status_off">Desligado</string>
-    <string name="notification_settings_master_status_on">Ligado</string>
+    <string name="notification_settings_main_off_title">Para receber notificações neste dispositivo, ative as configurações de notificação.</string>
+    <string name="notification_settings_main_hint_off">Ativar notificações</string>
+    <string name="notification_settings_main_hint_on">Desativar notificações</string>
+    <string name="notification_settings_main_status_off">Desativado</string>
     <string name="max_video_resolution">Tamanho máximo de vídeo</string>
+    <string name="notification_settings_main_status_on">Ativado</string>
     <string name="max_thumbnail_px_size">Tamanho máximo de imagem</string>
     <string name="error_upload_post_media_param">Ocorreu um erro durante o upload de mídia neste post: %s.</string>
     <string name="error_upload_post_param">Ocorreu um erro durante o upload deste post: %s.</string>
@@ -1584,7 +1931,6 @@ Language: pt_BR
     <string name="login_site_address_more_help">Precisa de mais ajuda?</string>
     <string name="login_site_address_help_content">O endereço do seu site aparece na barra na parte superior da tela quando você visita seu site no Chrome.</string>
     <string name="login_site_address_help_title">Qual é o endereço do meu site?</string>
-    <string name="login_site_address_help">Precisa de ajuda para encontrar o endereço do seu site?</string>
     <string name="login_site_address">Endereço do site</string>
     <string name="enter_site_address">Digite o endereço do site WordPress que você deseja conectar.</string>
     <string name="login_already_logged_in_wpcom">Já conectado no WordPress.com</string>
@@ -1596,7 +1942,6 @@ Language: pt_BR
     <string name="requesting_otp">Solicitando um código de verificação via SMS.</string>
     <string name="login_text_otp">Envie-me uma mensagem de texto com o código em vez disso.</string>
     <string name="enter_verification_code">Quase lá! Digite o código de verificação do seu aplicativo de autenticação.</string>
-    <string name="open_mail">Abrir e-mail</string>
     <string name="next">Próximo</string>
     <string name="enter_email_wordpress_com">Fazer login no WordPress.com usando um endereço de e-mail para gerenciar todos os seus sites WordPress.</string>
     <string name="image_optimization_promo_desc">A otimização de imagens as deixa mais leves, tornando seu upload mais rápido.\n\nVocê pode alterar essa funcionalidade a qualquer momento nas configurações do site.</string>
@@ -1619,11 +1964,7 @@ Language: pt_BR
     <string name="post_status_draft">Rascunho</string>
     <string name="post_status_pending_review">Revisão pendente</string>
     <string name="post_status_publish_post">Publicar</string>
-    <string name="change_location">Alterar localização</string>
-    <string name="remove_location">Remover localização</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Não foi possível abrir o selecionador de localização. O Google Play Services não está disponível</string>
     <string name="now">Agora</string>
-    <string name="post_settings_location">Localização</string>
     <string name="post_settings_password_dialog_hint">Somente usuários com essa senha podem ver este post</string>
     <string name="post_settings_excerpt_dialog_hint">Resumos são sumários opcionais do seu conteúdo, escritos separadamente.</string>
     <string name="post_settings_slug_dialog_hint">O slug é a versão para URL amigável do título do post.</string>
@@ -1806,7 +2147,7 @@ Language: pt_BR
     <string name="signout">Fazer logout</string>
     <string name="sign_in_wpcom">Fazer login em WordPress.com</string>
     <string name="reader_label_global_related_posts">Mais em WordPress.com</string>
-    <string name="reader_label_local_related_posts">Mais em %s</string>
+    <string name="reader_label_local_related_posts">Mais de %s</string>
     <string name="preference_open_device_settings">Abrir configurações do dispositivo</string>
     <string name="invite_invalid_email">%s: E-mail inválido</string>
     <string name="invite_user_blocked_invites">%s: Convites de usuários bloqueados </string>
@@ -1854,20 +2195,16 @@ Language: pt_BR
     <string name="invite_error_invalid_usernames_multiple">Não pôde enviar: Contém nome de usuários ou e-mails inválidos</string>
     <string name="invite_error_invalid_usernames_one">Não pôde enviar: Um nome de usuário ou e-mail é inválido</string>
     <string name="invite_error_no_usernames">Adicione pelo menos um nome de usuário</string>
-    <string name="invite_message_info">(Opcional) Você pode inserir uma mensagem personalizada de até 500 caracteres que será incluída no convite para os usuários.</string>
-    <string name="invite_message_remaining_other">%d caracteres restantes</string>
-    <string name="invite_message_remaining_one">1 caractere restante</string>
-    <string name="invite_message_remaining_zero">0 caracteres restantes</string>
     <string name="invite_message_title">Mensagem personalizada</string>
     <string name="invite">Convidar</string>
-    <string name="invite_names_title">Nome de usuários ou e-mails</string>
-    <string name="send_link">Enviar link</string>
+    <string name="invite_names_title">Nomes de usuário ou e-mails</string>
     <string name="my_site_header_external">Externo</string>
     <string name="invite_people">Convidar pessoas</string>
     <string name="label_clear_search_history">Limpar histórico de pesquisa</string>
     <string name="dlg_confirm_clear_search_history">Limpar histórico de pesquisa?</string>
     <string name="reader_empty_search_description">Nenhum resultado encontrado em seu idioma para %s.</string>
     <string name="reader_hint_post_search">Pesquisar no WordPress</string>
+    <string name="reader_title_related_post_detail">Post relacionado</string>
     <string name="preview_screen_links_disabled">Os links são desabilitados na tela de visualização</string>
     <string name="send">Enviar</string>
     <string name="person_removed">%1$s removido com sucesso</string>
@@ -1886,7 +2223,6 @@ Language: pt_BR
     <string name="checking_email">Verificando e-mail</string>
     <string name="magic_link_unavailable_error_message">Atualmente indisponível. Digite sua senha</string>
     <string name="logging_in">Fazendo login</string>
-    <string name="enter_your_password_instead">Digite sua senha ao invés disso</string>
     <string name="web_address_dialog_hint">Exibido ao público quando você comentar.</string>
     <string name="capture_or_pick_photo">Tirar or selecionar uma foto</string>
     <string name="export_your_content_message">Seus posts, páginas e configurações serão enviados para você em %s</string>
@@ -2007,7 +2343,7 @@ Language: pt_BR
     <string name="site_settings_paging_dialog_description">Dividir tópicos de comentários em várias páginas.</string>
     <string name="site_settings_paging_dialog_header">Comentários por página</string>
     <string name="site_settings_close_after_dialog_title">Encerrar comentários</string>
-    <string name="site_settings_blacklist_description">Quando um comentário tiver uma destas palavras em seu conteúdo, nome, URL, e-mail ou IP, ele será marcado como spam. Você pode inserir partes de palavras, então \"press\" corresponderá a \"WordPress\".</string>
+    <string name="site_settings_denylist_description">Quando um comentário tiver uma destas palavras em seu conteúdo, nome, URL, e-mail ou IP, ele será marcado como spam. Você pode inserir partes de palavras, então \"press\" corresponderá a \"WordPress\".</string>
     <string name="site_settings_hold_for_moderation_description">Quando um comentário contiver qualquer uma destas palavras em seu conteúdo, nome, URL, endereço de e-mail ou IP, o mesmo será retido na fila de moderação. Você pode inserir partes de palavras, então \"press\" corresponderá a \"WordPress\".</string>
     <string name="site_settings_list_editor_input_hint">Insira uma palavra ou frase</string>
     <string name="site_settings_list_editor_no_items_text">Nenhum item</string>
@@ -2022,10 +2358,10 @@ Language: pt_BR
     <string name="site_settings_rp_show_header_title">Mostrar cabeçalho</string>
     <string name="site_settings_rp_switch_summary">Posts Relacionados exibe conteúdo relevante do seu site abaixo dos seus posts.</string>
     <string name="site_settings_rp_switch_title">Mostrar posts relacionados</string>
-    <string name="site_settings_blacklist_hint">Comentários que corresponderem a um filtro serão marcados como spam</string>
+    <string name="site_settings_denylist_hint">Comentários que correspondem a um filtro são marcados como spam</string>
     <string name="site_settings_moderation_hold_hint">Comentários que corresponderem a um filtro serão colocados em uma fila de moderação</string>
     <string name="site_settings_multiple_links_hint">Ignora o limite de links de usuários conhecidos</string>
-    <string name="site_settings_whitelist_hint">O autor do comentário tem que ter um comentário aprovado anteriormente</string>
+    <string name="site_settings_allowlist_hint">O autor do comentário deve possuir um comentário aprovado anteriormente</string>
     <string name="site_settings_user_account_required_hint">Usuários devem estar registrados e logados para comentar</string>
     <string name="site_settings_identity_required_hint">O autor do comentário tem que preencher o nome e email</string>
     <string name="site_settings_paging_hint">Exibir comentários em grupos de tamanho especificado</string>
@@ -2048,17 +2384,16 @@ Language: pt_BR
     <string name="site_settings_address_hint">No momento, você não pode alterar o endereço</string>
     <string name="site_settings_tagline_hint">Uma breve descrição ou uma frase de efeito para descrever o seu blog</string>
     <string name="site_settings_title_hint">Em poucas palavras, explique sobre o que é este site</string>
-    <string name="site_settings_whitelist_known_summary">Comentários de usuários conhecidos</string>
-    <string name="site_settings_whitelist_all_summary">Comentários de todos os usuários</string>
+    <string name="site_settings_allowlist_known_summary">Comentários de usuários conhecidos</string>
+    <string name="site_settings_allowlist_all_summary">Comentários de todos os usuários</string>
     <string name="site_settings_threading_summary">%d níveis</string>
     <string name="site_settings_privacy_private_summary">Privado</string>
     <string name="site_settings_privacy_hidden_summary">Oculto</string>
     <string name="site_settings_privacy_public_summary">Público</string>
     <string name="site_settings_delete_site_title">Excluir site</string>
-    <string name="site_settings_blacklist_title">Lista bloqueada</string>
     <string name="site_settings_moderation_hold_title">Aguardar moderação</string>
     <string name="site_settings_multiple_links_title">Links nos comentários</string>
-    <string name="site_settings_whitelist_title">Aprovar automaticamente</string>
+    <string name="site_settings_allowlist_title">Aprovar automaticamente</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_paging_title">Paginação</string>
     <string name="site_settings_sort_by_title">Ordenar por</string>
@@ -2135,6 +2470,7 @@ Language: pt_BR
     <string name="reader_short_like_count_one">1 curtida</string>
     <string name="reader_label_follow_count">%,d seguidores</string>
     <string name="reader_short_like_count_none">Curtir</string>
+    <string name="reader_menu_tags">Editar tópicos e sites</string>
     <string name="reader_title_post_detail">Post do leitor</string>
     <string name="notifications_push_summary">Configurações de notificações que são exibidas em seu dispositivo.</string>
     <string name="notifications_email_summary">Configurações de notificações que são enviadas ao e-mail vinculado à sua conta.</string>
@@ -2206,7 +2542,6 @@ Language: pt_BR
     <string name="error_copy_to_clipboard">Ocorreu um erro ao copiar o texto para a área de transferência</string>
     <string name="reader_label_new_posts">Novos posts</string>
     <string name="logs_copied_to_clipboard">O logs do aplicativo foram copiados para a área de transferência</string>
-    <string name="reader_page_recommended_blogs">Talvez você goste destes sites</string>
     <string name="post_uploading">Fazendo upload do post</string>
     <string name="reader_empty_posts_in_blog">Este site está vazio</string>
     <string name="themes_fetching">Obtendo temas…</string>
@@ -2252,6 +2587,7 @@ Language: pt_BR
     <string name="comment_reply_to_user">Responder %s</string>
     <string name="signing_out">Saindo…</string>
     <string name="browse_our_faq_button">Veja nossa seção de Perguntas Frequentes</string>
+    <string name="reader_empty_posts_in_tag">Nenhum post neste tópico</string>
     <string name="reader_toast_err_generic">Não é possível executar esta ação</string>
     <string name="reader_toast_blog_blocked">Os posts deste blog não serão mais exibidos</string>
     <string name="reader_menu_block_blog">Bloquear este site</string>
@@ -2266,8 +2602,9 @@ Language: pt_BR
     <string name="reader_toast_err_unfollow_blog">Não é possível deixar de seguir este site</string>
     <string name="reader_empty_recommended_blogs">Nenhum site recomendado</string>
     <string name="reader_title_blog_preview">Leitor do site</string>
+    <string name="reader_page_followed_tags">Tópicos seguidos</string>
+    <string name="reader_hint_add_tag_or_url">Digite um URL ou tópico para seguir</string>
     <string name="help">Ajuda</string>
-    <string name="forgot_password">Perdeu a senha?</string>
     <string name="ssl_certificate_error">Certificado SSL inválido</string>
     <string name="ssl_certificate_ask_trust">Se você geralmente se conecta a este site sem problemas, talvez este erro signifique que alguém está tentando imitar o site, e você não deve continuar. Deseja confiar no certificado mesmo assim?</string>
     <string name="notifications_empty_list">Sem notificações</string>
@@ -2346,6 +2683,8 @@ Language: pt_BR
     <string name="delete_page">Excluir página?</string>
     <string name="local_changes">Alterações locais</string>
     <string name="open_source_licenses">Abrir licenças dos arquivos fonte</string>
+    <string name="reader_toast_err_add_tag">Não é possível adicionar este tópico</string>
+    <string name="reader_toast_err_remove_tag">Não é possível remover este tópico</string>
     <string name="share_link">Compartilhar link</string>
     <string name="reader_empty_posts_in_tag_updating">Coletando posts…</string>
     <string name="reader_likes_you_and_multi">Você e %,d outros curtiram isso</string>
@@ -2374,6 +2713,8 @@ Language: pt_BR
     <string name="comments_empty_list">Nenhum comentário ainda</string>
     <string name="reader_view_reblog">Reblogar</string>
     <string name="sign_up_label">Inscrever-se</string>
+    <string name="reader_toast_err_tag_exists">Você já segue esse tópico</string>
+    <string name="reader_toast_err_tag_invalid">Esta tópico não é válido</string>
     <string name="themes">Temas</string>
     <string name="media_edit_title_text">Título</string>
     <string name="media_edit_caption_text">Legenda</string>
diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml
index 39c2cc1ba1bc..5d82691fcb30 100644
--- a/WordPress/src/main/res/values-ro/strings.xml
+++ b/WordPress/src/main/res/values-ro/strings.xml
@@ -1,11 +1,463 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-21 08:41:13+0000
+Translation-Revision-Date: 2021-05-19 08:55:34+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n == 0 || n % 100 >= 2 && n % 100 <= 19) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: ro
 -->
 <resources>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Atinge de două ori pentru a adăuga o legătură.</string>
+    <string name="gutenberg_native_add_link">ADAUGĂ LEGĂTURĂ</string>
+    <string name="login_empty_view_try_another_account">Încearcă cu un alt cont</string>
+    <string name="login_empty_view_see_instructions">Vezi instrucțiunile</string>
+    <string name="login_no_jetpack_sites_error_message">Dacă ai deja un sit, va trebui să instalezi modulul gratuit Jetpack și să îl conectezi la contul tău WordPress.com.</string>
+    <string name="login_empty_view_avatar_content_description">Poza ta de profil</string>
+    <string name="login_not_a_jetpack_site">Pentru a utiliza această aplicație pentru %1$s, va trebui să ai instalat modulul Jetpack și să fie conectat la contul tău WordPress.com.</string>
+    <string name="gutenberg_native_size">Dimensiune</string>
+    <string name="gutenberg_native_move_image_forward">Mută imaginea înainte</string>
+    <string name="gutenberg_native_move_image_backward">Mută imaginea înapoi</string>
+    <string name="gutenberg_native_image_settings">Setări imagine</string>
+    <string name="gutenberg_native_audio_settings">Setări audio</string>
+    <string name="user_profile_untitled_site">(Fără titlu)</string>
+    <string name="user_profile_site_section_header">Sit</string>
+    <string name="user_profile_bottom_sheet_description">Informații din foaia de jos a profilului de utilizator</string>
+    <string name="likes_list_screen_title">Lista aprecierilor %s</string>
+    <string name="gutenberg_native_write_code">Scrie codul…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sortare și filtrare</string>
+    <string name="gutenberg_native_show_download_button">Arată butonul de descărcare</string>
+    <string name="gutenberg_native_shortcode">Scurtcod</string>
+    <string name="gutenberg_native_read_more">Citește mai mult</string>
+    <string name="gutenberg_native_preload">Pre-încarcă</string>
+    <string name="gutenberg_native_post_meta_settings">Setări metadate articol</string>
+    <string name="gutenberg_native_post_content_settings">Setări conținut articol</string>
+    <string name="gutenberg_native_metadata">Metadate</string>
+    <string name="gutenberg_native_media_file">Fișier media</string>
+    <string name="gutenberg_native_media_area">Zonă media</string>
+    <string name="gutenberg_native_loop">Buclă</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Legătură la</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">imaginea %1$d din %2$d din galerie</string>
+    <string name="gutenberg_native_heading_d">Subtitlu %d</string>
+    <string name="gutenberg_native_featured">Reprezentativ</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Introdu URL-ul pentru a îngloba aici…</string>
+    <string name="gutenberg_native_edit_image">Editează imaginea</string>
+    <string name="gutenberg_native_display_post_date">Afișează dată articol</string>
+    <string name="gutenberg_native_code">Cod</string>
+    <string name="gutenberg_native_change_heading_level">Schimbă nivelul subtitlului</string>
+    <string name="gutenberg_native_browser_default">Navigator implicit</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Blocul a fost șters sau este indisponibil.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Blocurile nu pot fi randate în interiorul lor.</string>
+    <string name="gutenberg_native_autoplay">Redare automată</string>
+    <string name="gutenberg_native_auto">Automat</string>
+    <string name="gutenberg_native_attachment_page">Pagină atașament</string>
+    <string name="gutenberg_native_add_text">Adaugă text…</string>
+    <string name="gutenberg_native_add_caption">Adaugă text asociat</string>
+    <string name="login_no_jetpack_sites">Nu am găsit niciun sit Jetpack</string>
+    <string name="gutenberg_native_what_is_alt_text">Ce este textul alternativ?</string>
+    <string name="gutenberg_native_transform_s_to">Transformă %s în</string>
+    <string name="gutenberg_native_transform_block">Transformă blocul…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Inserarea elementului media a eșuat.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Inserarea fișierului audio a eșuat.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Descrie scopul imaginii. Lasă gol dacă imaginea este doar decorativă.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s a fost transformat în %2$s</string>
+    <string name="like_faces_error_loading_message">Eroare la încărcarea datele despre aprecieri. %s.</string>
+    <string name="like_faces_plural_text">%d blogeri apreciază asta.</string>
+    <string name="like_faces_singular_text">Un bloger apreciază asta.</string>
+    <string name="like_title_plural">%d aprecieri</string>
+    <string name="like_title_singular">O apreciere</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Pentru a înlătura amenințările, introdu datele de conectare la server.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Pentru a înlătura amenințarea, introdu datele de conectare la server.</string>
+    <string name="suggestion">Sugestie:</string>
+    <string name="gutenberg_native_search_blocks">Caută blocuri</string>
+    <string name="gutenberg_native_search_block">Bloc Căutare</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">atinge de două ori pentru a schimba unitatea</string>
+    <string name="gutenberg_native_clear_search">Șterge căutarea</string>
+    <string name="gutenberg_native_cancel_search">Anulează căutarea</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s este %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">A apărut o eroare în timpul primirii datelor pentru aprecieri</string>
+    <string name="get_likes_unknown_error">A apărut o eroare necunoscută în timpul primirii datelor pentru aprecieri.</string>
+    <string name="get_likes_no_network_error">Nu este disponibilă nicio rețea.</string>
+    <string name="comments_empty_list_filtered_unreplied">Niciun comentariu fără răspuns</string>
+    <string name="comment_status_unreplied">Fără răspuns</string>
+    <string name="gutenberg_native_table_of_contents">Cuprins</string>
+    <string name="gutenberg_native_summary">rezumat</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Face un rezumat al articolului folosind o listă de subtitluri. Adaugă ancore HTML la blocurile Subtitlu pentru a le lega aici.</string>
+    <string name="gutenberg_native_document_outline">schiță document</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">Adrese IP mereu permise</string>
+    <string name="site_settings_denylist_title">Comentarii neaprobate</string>
+    <string name="reader_title_interests">Urmărește subiecte</string>
+    <string name="stories_intro_main_subtitle">Un mod nou de a crea și publica conținut captivant pe situl tău.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Refuză</string>
+    <string name="activity_log_backup_download_notice_download_action">Descarcă</string>
+    <string name="threat_fix_all_status_success_message_plural">Amenințările au fost înlăturate cu succes.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Te rog confirmă că vrei să înlături toate cele %s amenințări active.</string>
+    <string name="scan_idle_threats_description_plural">Scanarea a găsit %1$s amenințări posibile pe %2$s. Te rog examinează fiecare amenințare și acționează sau atinge butonul Înlătură-le pe toate. Suntem %3$s, dacă ai nevoie de noi.</string>
+    <string name="scan_fixing_threats_description_plural">Lucrăm din greu, în fundal, pentru înlăturarea acestor amenințări. Între timp, îți poți folosi situl așa cum o faci de obicei și poți vedea oricând progresul făcut.</string>
+    <string name="gutenberg_native_edit_focal_point">Editează punctul central</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Atinge de două ori pentru a deschide foaia Jos pentru a edita, înlocui sau șterge imaginea</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Atinge de două ori pentru a deschide foaia Acțiuni pentru a edita, înlocui sau șterge imaginea</string>
+    <string name="new_site_creation_search_domain_example">exemplu.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Scrie un nume pentru situl tău</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Ai finalizat toate sarcinile&lt;/b&gt;&lt;br/&gt;Vei atrage mai multe persoane. Foarte bine!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Ai finalizat toate sarcinile&lt;/b&gt;&lt;br/&gt;Ți-ai personalizat situl. Foarte bine!</string>
+    <string name="quick_start_card_menu_hide">Ascunde deocamdată</string>
+    <string name="magic_link_not_meaning_to_create_account">Nu ai vrut să creezi un cont nou? Mergi înapoi și reintrodu adresa ta de email.</string>
+    <string name="invite_links_disable_dialog_message">După ce această legătură la invitație este dezactivată, nimeni nu o va putea folosi pentru a se alătura echipei. Sigur?</string>
+    <string name="invite_links_disable_dialog_title">Dezactivează legătura la invitație</string>
+    <string name="invite_links_bad_format_response">Am primit un răspuns invalid</string>
+    <string name="invite_links_null_response">Nu am primit niciun răspuns</string>
+    <string name="invite_links_cannot_get_role_data_error">A fost o eroare la preluarea datelor pentru rolul %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">A fost o eroare la preluarea rolurilor</string>
+    <string name="invite_links_generic_get_data_error">Eroare necunoscută la aducerea datelor pentru legăturile la invitații</string>
+    <string name="invite_links_helper_text">Folosește această legătură pentru a mării numărul de membri din echipa ta fără a fi nevoie să-i inviți individual. Oricine vizitează acest URL va putea să se înscrie în organizația ta, chiar dacă a primit o invitație de la altcineva, deci asigură-te că partajezi legătura cu persoane de încredere.</string>
+    <string name="invite_links_expire_date">Expiră %1$s</string>
+    <string name="invite_links_disable_invite_link">Dezactivează legătura la invitație</string>
+    <string name="invite_links_share_invite_link">Partajează legătura la invitație</string>
+    <string name="invite_links_generate">Generează o legătură nouă</string>
+    <string name="invite_links_get_status_retry">Reîmprospătează starea legăturilor</string>
+    <string name="invite_links_section_title">Legătură la invitație</string>
+    <string name="threats_found_singular">Amenințare găsită</string>
+    <string name="threats_found_plural">Amenințări găsite</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scanarea a fost finalizată&lt;/b&gt; &lt;br&gt; Am găsit %s posibile amenințări</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scanarea a fost finalizată&lt;/b&gt; &lt;br&gt; Am găsit o posibilă amenințare</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scanarea a fost finalizată&lt;/b&gt; &lt;br&gt; Nu am găsit amenințări</string>
+    <string name="scan_fixing_threats_title_singular">Înlătur amenințarea</string>
+    <string name="disable">Dezactivează</string>
+    <string name="quick_start_card_menu_unpin">Anulează fixarea</string>
+    <string name="quick_start_list_review_pages_subtitle">Verifică-ți paginile și fă modificări sau adaugă ori înlătură pagini.</string>
+    <string name="quick_start_list_view_site_title">Vizitează-ți situl</string>
+    <string name="quick_start_list_upload_icon_subtitle">Adaugă un icon sit pentru un aspect rafinat și profesionist.</string>
+    <string name="quick_start_list_follow_site_subtitle">Descoperă și urmărește siturile care te inspiră.</string>
+    <string name="quick_start_list_enable_sharing_title">Activează partajarea</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Partajezi automat articole noi în media socială.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Dă-i sitului un nume care să-ți reflecte personalitatea și prin care să arăți la ce se referă.</string>
+    <string name="quick_start_list_check_stats_title">Vezi statisticile</string>
+    <string name="backup_download_status_failure_bullet2">Vom încerca oricum să creăm fișierul cu copia de siguranță care poate fi descărcată.</string>
+    <string name="backup_download_status_failure_bullet1">Nu am putut găsi starea pentru a spune cât timp va dura crearea copiei de siguranță care poate fi descărcată.</string>
+    <string name="backup_download_status_failure_heading">Nu am putut găsi starea pentru copia de siguranță care poate fi descărcată</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Icon bifare</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Icon ceas</string>
+    <string name="restore_status_failure_bullet3">Te vom anunța când este gata.</string>
+    <string name="restore_status_failure_bullet2">Vom încerca oricum să-ți restaurăm situl.</string>
+    <string name="restore_status_failure_bullet1">Nu am putut găsi starea pentru a spune cât timp va dura restaurarea.</string>
+    <string name="restore_status_failure_heading">Nu am putut găsi starea pentru restaurare</string>
+    <string name="restore_complete_failed_description">Nu am putut să-ți restaurăm situl</string>
+    <string name="restore_warning_action_button">Confirmă</string>
+    <string name="restore_warning_description_with_two_parameters">Sigur vrei să-ți restaurezi situl înapoi la %1$s pe %2$s?\n        Toate modificările pe care le-ai făcut de atunci se vor pierde.</string>
+    <string name="backup_download_complete_failed_description">Nu am putut să creăm copia de siguranță</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exclude teme, module și încărcări)</string>
+    <string name="backup_item_contents">Directorul wp-content</string>
+    <string name="backup_item_roots">Rădăcină WordPress</string>
+    <string name="backup_download_details_choose_items_header">Elemente incluse în această descărcare</string>
+    <string name="gutenberg_native_uploading">Încarc…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Blocurile reutilizabile nu pot fi editate pe WordPress pentru iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Blocurile reutilizabile nu pot fi editate pe WordPress pentru Android</string>
+    <string name="gutenberg_native_replace_file">Înlocuiește fișierul</string>
+    <string name="gutenberg_native_replace_audio">Înlocuiește fișierul audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problemă la deschiderea fișierul audio</string>
+    <string name="gutenberg_native_open">DESCHIDE</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Această cerere nu poate fi gestionată de nicio aplicație.</string>
+    <string name="gutenberg_native_lock_icon">Icon blocare</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Inserarea fișierului audio a eșuat. Te rog atinge pentru opțiuni.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Atinge de două ori pentru a selecta un fișier audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Atinge de două ori pentru a asculta fișierul audio</string>
+    <string name="gutenberg_native_choose_audio">Alege un fișier audio</string>
+    <string name="gutenberg_native_audio_player">Player audio</string>
+    <string name="gutenberg_native_audio_file">fișier audio</string>
+    <string name="gutenberg_native_audio_caption_s">Text asociat audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Text asociat audio. Gol</string>
+    <string name="gutenberg_native_add_audio">ADAUGĂ UN FIȘIER AUDIO</string>
+    <string name="continue_with_wpcom">Autentifică-te în WordPress.com sau înregistrează-te</string>
+    <string name="photo_picker_use_audio">Folosește acest fișier audio</string>
+    <string name="photo_picker_choose_audio">Alege un fișier audio de pe dispozitiv</string>
+    <string name="people_optional_custom_message_helper_text">Opțional: introdu un mesaj personalizat care să fie trimis împreună cu invitația.</string>
+    <string name="people_learn_more_about_roles">Află mai multe despre roluri</string>
+    <string name="threat_status_fixed">Înlăturate</string>
+    <string name="threat_found_header">Găsite</string>
+    <string name="scan_here_to_help">aici pentru a te ajuta</string>
+    <string name="scan_idle_threats_description_singular">Scanarea a găsit o posibilă amenințare pe %1$s. Te rog examinează amenințarea și acționează sau atinge butonul Înlătură-le pe toate. Suntem %2$s dacă ai nevoie de noi.</string>
+    <string name="scan_idle_manual_scan_description">Pentru a analiza situl din nou, Rulează acum o scanare manuală sau așteaptă ca Jetpack să-ți scaneze situl azi, mai târziu.</string>
+    <string name="scan_provisioning_description">Bine ai venit la scanarea Jetpack Scan! Îți investigăm situl și ne pregătim să facem o scanare completă. Te vom anunța dacă detectăm probleme care ar putea afecta scanarea, apoi va începe prima scanare completă.</string>
+    <string name="scan_scanning_is_initial_description">Bine ai venit la scanarea Jetpack, acum aruncăm o primă privire pe situl tău, vei primi rezultatele în curând.</string>
+    <string name="scan_fixing_threats_description_singular">Lucrăm din greu, în fundal, pentru înlăturarea acestei amenințări. Între timp, îți poți folosi situl așa cum o faci de obicei și poți vedea oricând progresul făcut.</string>
+    <string name="scan_scanning_description">Îți vom trimite o notificare după ce scanarea va fi finalizată. Între timp, îți poți folosi situl așa cum o faci de obicei și poți vedea oricând progresul făcut.</string>
+    <string name="scan_fixing_threats_title_plural">Înlătur amenințările</string>
+    <string name="scan_start_request_failed_subtitle">Scanarea Jetpack nu a putut finaliza scanarea sitului tău. Te rog verifică dacă nu ți-a căzut situl - dacă funcționează, încearcă din nou. Dacă situl funcționează și ai în continuare probleme cu scanarea Jetpack, contactează echipa noastră pentru suport.</string>
+    <string name="scan_request_failed_title">Ceva nu a mers bine</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Creez o copie de siguranță a sitului</string>
+    <string name="activity_log_currently_backing_up_message">Creez o copie de siguranță a sitului din %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Creez copia de siguranță care se poate descărca</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">A fost creată cu succes o copie de siguranță a sitului</string>
+    <string name="activity_log_backup_finished_snackbar_message">A fost creată cu succes o copie de siguranță a sitului\nCopie de siguranță creată din %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Situl tău are o copie de siguranță\nCopie de siguranță creată din %1$s %2$s</string>
+    <string name="pick_audio">Selectează audio</string>
+    <string name="restore_another_process_running">Există o altă restaurare care rulează.</string>
+    <string name="restore_complete_failed_icon_content_description">Icon eroare</string>
+    <string name="restore_complete_failed_action_button_content_description">Buton Gata</string>
+    <string name="restore_complete_failed_title">Restaurarea a eșuat</string>
+    <string name="restore_complete_visit_site_button_content_description">Buton Vizitează situl</string>
+    <string name="restore_complete_done_button_content_description">Buton Gata</string>
+    <string name="restore_complete_icon_content_description">Icon restaurează</string>
+    <string name="restore_complete_visit_site_action_button">Vizitează situl</string>
+    <string name="restore_complete_description_with_two_parameters">Toate elementele selectate sunt restaurate acum înapoi la %1$s %2$s.</string>
+    <string name="restore_complete_header">Situl tău a fost restaurat</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Nu trebuie să aștepți aici. Te vom anunța când situl a fost restaurat.</string>
+    <string name="restore_progress_icon_content_description">Icon Restaurează situl</string>
+    <string name="restore_progress_description_with_two_parameters">Îți restaurăm înapoi situl la %1$s %2$s.</string>
+    <string name="restore_progress_header">Îți restaurăm situl acum</string>
+    <string name="restore_warning_action_button_content_description">Buton Confirmă restaurarea sitului</string>
+    <string name="restore_warning_icon_content_description">Imagine cu un cerc roșu și semn de exclamare</string>
+    <string name="restore_warning_header">Avertizare</string>
+    <string name="restore_details_action_button_content_description">Buton Restaurează situl</string>
+    <string name="restore_details_icon_content_description">Icon restaurează</string>
+    <string name="restore_details_action_button">Restaurează situl</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s este punctul selectat pentru restaurarea ta.</string>
+    <string name="restore_details_header">Restaurează situl</string>
+    <string name="restore_details_choose_items_header">Alege elementele de restaurat:</string>
+    <string name="restore">Restaurează</string>
+    <string name="backup_download_complete_failed_icon_content_description">Nor cu iconul X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Buton Gata</string>
+    <string name="backup_download_complete_failed_action_button">Gata</string>
+    <string name="backup_download_complete_failed_title">Descărcarea a eșuat</string>
+    <string name="web_preview_tablet">Tabletă</string>
+    <string name="web_preview_mobile">Mobil</string>
+    <string name="quick_start_card_menu_remove">Nu arăta din nou</string>
+    <string name="quick_start_card_menu_pin">Fixează asta</string>
+    <string name="quick_start_dialog_review_pages_message_short">Selectează %1$s Pagini %2$s pentru a vedea lista cu pagini.</string>
+    <string name="quick_start_dialog_review_pages_message">Modifică paginile, adaugă sau înlătură pagini pe sit.</string>
+    <string name="quick_start_dialog_review_pages_title">Revizuiește paginile sitului</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Selectează %1$s Prima pagină %2$s pentru a edita prima pagină.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Selectează %1$s Pagini %2$s pentru a vedea lista cu pagini.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Modifică conținutul, adaugă sau înlătură conținut, pe prima pagină a sitului tău.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Editează prima pagină</string>
+    <string name="reader_menu_mark_as_unseen">Marchează ca nevăzut</string>
+    <string name="reader_menu_mark_as_seen">Marchează ca văzut</string>
+    <string name="error_media_upload_failed_for_reason">Încărcarea elementului media a eșuat.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Nu este disponibil suficient spațiu de stocare pe sit</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Nu pot comuta la starea văzut pentru acest articol</string>
+    <string name="reader_marked_post_as_unseen">Articolul a fost marcat ca nevăzut</string>
+    <string name="reader_marked_post_as_seen">Articolul a fost marcat ca văzut</string>
+    <string name="threat_fix_all_status_error_message">Eroare la primirea stării pentru înlăturarea amenințărilor. Te rog contactează suportul.</string>
+    <string name="threat_fix_all_status_success_message_singular">Amenințarea a fost înlăturată cu succes.</string>
+    <string name="threat_fix_all_error_message">Eroare la înlăturarea amenințărilor. Te rog contactează suportul.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Te rog confirmă că vrei să înlături o amenințare activă.</string>
+    <string name="threat_fix_all_warning_title">Înlătură toate amenințările</string>
+    <string name="threat_ignore_error_message">Eroare la ignorarea amenințării. Te rog contactează suportul.</string>
+    <string name="threat_ignore_success_message">Amenințarea a fost ignorată.</string>
+    <string name="threat_ignore_warning">Nu ar trebui să ignori o problemă de securitate decât dacă ești absolut sigur că ea este inofensivă. Dacă alegi să ignori această amenințare, ea va rămâne pe situl tău &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Eroare la înlăturarea amenințării. Te rog contactează suportul.</string>
+    <string name="threat_item_sub_header_status_ignored">Amenințarea a fost ignorată</string>
+    <string name="threat_item_sub_header_status_fixed_on">Amenințarea a fost înlăturată pe %s</string>
+    <string name="threat_fixing">Înlătur amenințarea</string>
+    <string name="scan_history_ignored_threats_tab">Ignorate</string>
+    <string name="scan_history_no_threats_found">Niciun element găsit</string>
+    <string name="scan_history_fixed_threats_tab">Înlăturate</string>
+    <string name="scan_history_all_threats_tab">Toate</string>
+    <string name="scan_scanning_title">Scanez fișierele</string>
+    <string name="scan_preparing_to_scan_title">Pregătesc scanarea</string>
+    <string name="scan_history_menu_title">Istoric</string>
+    <string name="scan_history">Istoric scanări</string>
+    <string name="backup_active_filter_empty_subtitle">Încearcă să ajustezi intervalul de timp</string>
+    <string name="backup_active_filter_empty_title">Nu am găsit nicio copie de siguranță care să se potrivească</string>
+    <string name="backup_empty_subtitle">Prima copie de siguranță va apărea aici în maxim 24 de ore și vei primi o notificare după ce copia de siguranță a fost finalizată</string>
+    <string name="backup_empty_title">Prima copie de siguranță va fi gata în curând</string>
+    <string name="request_failed_message">A fost o problemă la gestionarea cererii. Te rog reîncearcă mai târziu.</string>
+    <string name="gutenberg_native_move_to_bottom">Mută în jos</string>
+    <string name="gutenberg_native_change_block_position">Schimbă poziția blocului</string>
+    <string name="label_control_upload">Încarcă</string>
+    <string name="jetpack_icon_content_description">icon</string>
+    <string name="backup_download_complete_info">De asemenea, ți-am trimis prin email o legătură la fișierul tău.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Buton Partajează legătura</string>
+    <string name="backup_download_complete_download_action_button_content_description">Buton de descărcare</string>
+    <string name="backup_download_complete_icon_content_description">Icon pentru copia de siguranță este gata de descărcare</string>
+    <string name="backup_download_complete_download_share_action_button">Partajează legătura</string>
+    <string name="backup_download_complete_download_action_button">Descarcă</string>
+    <string name="backup_download_complete_description_with_two_parameters">Am creat cu succes o copie de siguranță a sitului tău din %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Copia ta de siguranță este disponibilă acum pentru descărcare</string>
+    <string name="backup_download_complete_page_title">Copia ta de siguranță</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Nu trebuie să aștepți aici. Te vom anunța când copia de siguranță este gata.</string>
+    <string name="backup_download_progress_icon_content_description">Icon pentru Creez copii de siguranță care se pot descărca</string>
+    <string name="backup_download_progress_description_with_two_parameters">Creăm o copie de siguranță a sitului tău din %1$s %2$s, care se poate descărca.</string>
+    <string name="backup_download_progress_header">Acum creăm o copie de siguranță a sitului tău care poate fi descărcată</string>
+    <string name="backup_download_progress_page_title">Descarcă copia de siguranță</string>
+    <string name="backup_download_another_download_running">Există o altă descărcare care rulează.</string>
+    <string name="backup_download_generic_failure">A fost o problemă la gestionarea cererii. Te rog reîncearcă mai târziu.</string>
+    <string name="backup_download_details_action_button_content_description">Buton Creează copii de siguranță care se pot descărca</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s este punctul selectat pentru a crea o copie de siguranță care se poate descărca.</string>
+    <string name="gutenberg_native_image_link_url">URL legătură la imagine</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">crosspost</string>
+    <string name="suggestion_user">utilizator</string>
+    <string name="suggestion_no_matching">Nu se potrivește cu %s.</string>
+    <string name="suggestion_problem">A fost o problemă la încărcarea sugestiilor.</string>
+    <string name="suggestion_none">Nu este disponibilă nicio sugestie pentru %s.</string>
+    <string name="suggestion_selection_needed">Te rog tastează pentru a filtra lista cu sugestii.</string>
+    <string name="threat_get_free_estimate">Ai o estimare gratuită</string>
+    <string name="threat_ignore">Ignoră amenințarea</string>
+    <string name="threat_fix">Înlătură amenințarea</string>
+    <string name="threat_fix_fixable_default">Scanarea Jetpack va soluționa amenințarea.</string>
+    <string name="threat_fix_fixable_edit">Scanarea Jetpack va edita fișierul sau directorul afectat.</string>
+    <string name="threat_fix_fixable_update">Scanarea Jetpack va fi actualizată la o versiune mai nouă (%s).</string>
+    <string name="threat_fix_fixable_delete">Scanarea Jetpack va șterge fișierul sau directorul afectat.</string>
+    <string name="threat_fix_fixable_replace">Scanarea Jetpack va înlocui fișierul sau directorul afectat.</string>
+    <string name="threat_fix_current_not_fixable_description">Scanarea Jetpack nu poate înlătura automat această amenințare.\n        Îți sugerăm să înlături amenințarea manual: asigură-te că WordPress, tema ta și toate modulele sunt actualizate și înlătură de pe site codul, tema sau modulul care creează probleme. \n \n\n        Dacă ai nevoie de mai mult ajutor pentru a înlătura această amenințare, recomandăm &lt;b&gt;Codeable&lt;/b&gt;, o piață de liber-profesioniști de încredere din sfera experților WordPress deja recunoscuți.\n        Ei se bazează pe un grup select de experți în securitate pentru a ajuta la aceste proiecte. Prețurile variază între 70 și 120 $/oră și poți obține o estimare gratuită fără obligația de a-i angaja..\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Înlăturarea amenințării</string>
+    <string name="threat_fix_fixed_header">Cum a corectat Jetpack asta?</string>
+    <string name="threat_fix_default_header">Cum vom corecta asta?</string>
+    <string name="threat_file_description">Amenințare găsită în fișierul:</string>
+    <string name="threat_technical_details_header">Detaliile tehnice</string>
+    <string name="threat_problem_header">Care a fost problema?</string>
+    <string name="threat_details">Detalii amenințare</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerabilități găsite în teme</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerabilități găsite în module</string>
+    <string name="threat_item_sub_header_file_signature">%s amenințări găsite</string>
+    <string name="threat_item_sub_header_core_file">Vulnerabilități găsite în WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Vulnerabilități diverse</string>
+    <string name="threat_item_header_vulnerable_theme">Temă vulnerabilă: %s (versiunea %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Modul vulnerabil: %s (versiunea %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: model de cod rău intenționat</string>
+    <string name="threat_item_header_database_threat">%s amenințări în baza de date</string>
+    <string name="threat_item_header_infected_core_file">%s: fișier infectat în nucleu</string>
+    <string name="threat_item_header_threat_found">Amenințare găsită</string>
+    <string name="threats_fix_all">Înlătură-le pe toate</string>
+    <string name="scan_in_few_seconds">acum câteva secunde</string>
+    <string name="scan_in_minutes_ago">acum %s minute</string>
+    <string name="scan_in_hours_ago">acum %s ore</string>
+    <string name="scan_this_site">acest sit</string>
+    <string name="scan_idle_last_scan_description">Ultima scanare Jetpack a rulat pe %s și nu a găsit niciun risc. %s</string>
+    <string name="scan_idle_threats_found_title">Situl tău poate fi în pericol</string>
+    <string name="scan_idle_no_threats_found_title">Nu-ți faci griji pentru nimic</string>
+    <string name="scan_again">Scanează încă o dată</string>
+    <string name="scan_now">Scanează acum</string>
+    <string name="scan_state_icon">Icon stare scanare</string>
+    <string name="backup">Copii de siguranță</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Filtru pentru tip de activitate (%s tipuri selectate)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (arăt %s elemente)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtru pentru tip de activitate</string>
+    <string name="activity_log_activity_type_empty_subtitle">Nicio activitate înregistrată în intervalul de timp selectat.</string>
+    <string name="activity_log_activity_type_empty_title">Nu sunt disponibile activități</string>
+    <string name="activity_log_activity_type_error_subtitle">Te rog verifică-ți conexiunea la internet și încearcă din nou.</string>
+    <string name="activity_log_activity_type_error_title">Fără conexiune</string>
+    <string name="activity_log_activity_type_filter_active_label">Tip de activitate (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtru pentru intervalul de timp</string>
+    <string name="activity_log_active_filter_empty_subtitle">Încearcă ajustarea filtrelor pentru intervalul de timp sau tipul de activitate</string>
+    <string name="activity_log_active_filter_empty_title">Nu am găsit niciun eveniment care să se potrivească</string>
+    <string name="backup_item_sqls">Bază de date sit</string>
+    <string name="backup_item_roots_hint">(include wp-config.php și toate fișierele care nu sunt din WordPress)</string>
+    <string name="backup_item_media_uploads">Încărcări media</string>
+    <string name="backup_item_plugins">Module WordPress</string>
+    <string name="backup_item_themes">Teme WordPress</string>
+    <string name="backup_download_details_icon_content_description">Icon Creează copii de siguranță care se pot descărca</string>
+    <string name="backup_download_details_action_button">Creează un fișier care se poate descărca</string>
+    <string name="backup_download_details_header">Creează copii de siguranță care se pot descărca</string>
+    <string name="backup_download_details_page_title">Descarcă copia de siguranță</string>
+    <string name="backup_download">Descărcare copii de siguranță</string>
+    <string name="gutenberg_native_error">Eroare</string>
+    <string name="gutenberg_native_choose_file">Alege fișierul</string>
+    <string name="activity_log_item_menu_download_backup_label">Descarcă copia de siguranță</string>
+    <string name="activity_log_item_menu_restore_label">Restaurează la acest punct</string>
+    <string name="activity_log_activity_type_filter_label">Tip de activitate</string>
+    <string name="activity_log_date_range_filter_label">Interval de timp</string>
+    <string name="activity_log_activity_type_filter_header">Filtrează după tipul de activitate</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copiază versiunea din această aplicație</string>
+    <string name="dialog_confirm_copy_local_edit_button">Mai întâi, editează articolul</string>
+    <string name="dialog_confirm_copy_local_message">Articolul pe care încerci să-l copiezi are două versiuni care sunt în conflict sau ai făcut recent modificări pe care nu le-ai salvat.\nMai întâi, editează articolul pentru a elimina orice conflict sau continuă cu copierea versiunii din această aplicație.</string>
+    <string name="dialog_confirm_copy_local_title">Conflict la sincronizarea articolului</string>
+    <string name="button_copy">Fă duplicat</string>
+    <string name="toast_edit_story_update_in_progress_title">Se salvează narațiunea, te rog așteaptă…</string>
+    <string name="gutenberg_native_file_name">Nume fișier</string>
+    <string name="gutenberg_native_file_block_settings">Setări bloc fișier</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Încărcarea fișierelor a eșuat.\nTe rog atinge pentru opțiuni.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Salvarea fișierelor a eșuat.\nTe rog atinge pentru opțiuni.</string>
+    <string name="gutenberg_native_edit_file">Editează fișierul</string>
+    <string name="gutenberg_native_copy_file_url">Copiază URL-ul fișierului</string>
+    <string name="gutenberg_native_choose_a_file">ALEGE UN FIȘIER</string>
+    <string name="new_site_creation_domain_header_title">Alege un domeniu</string>
+    <string name="my_site_btn_jetpack_settings">Setări Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Urmăresc conversația prin email</string>
+    <string name="reader_btn_follow_comments">Urmărește conversația prin email</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Nu am putut face dezabonarea la comentarii pentru acest articol</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Nu am putut face abonarea la comentarii pentru acest articol</string>
+    <string name="reader_follow_comments_get_status_error">Eroare la aducerea stării abonamentului pentru articol</string>
+    <string name="reader_follow_comments_unsubscribe_success">Te-ai dezabonat cu succes de la comentarii</string>
+    <string name="reader_follow_comments_subscribe_success">Te-ai abonat cu succes la comentarii</string>
+    <string name="reader_follow_comments_bad_format_response">Am primit un răspuns invalid</string>
+    <string name="reader_follow_comments_null_response">Nu am primit niciun răspuns</string>
+    <string name="activity_log_activity_type_filter_clear">Șterge</string>
+    <string name="activity_log_activity_type_filter_apply">Aplică</string>
+    <string name="dialog_edit_story_unsupported_format_message">Nu au fost adăugate diapozitive în narațiunea ta deoarece narațiunile nu acceptă fișiere GIF. Te rog alege în schimb o imagine statică sau un fundal video.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Fișierele GIF nu sunt acceptate</string>
+    <string name="dialog_edit_story_unrecoverable_message">Nu am putut găsi pe sit conținut media pentru această narațiune.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Nu pot edita narațiunea</string>
+    <string name="dialog_edit_story_unavailable_message">Nu pot să încarc conținut media pentru această narațiune. Verifică conexiunea la internet și încearcă din nou.</string>
+    <string name="dialog_edit_story_unavailable_title">Nu pot edita narațiunea</string>
+    <string name="dialog_edit_story_limited_message">Această narațiune a fost editată pe un alt dispozitiv, iar posibilitatea de a edita anumite obiecte poate fi limitată.</string>
+    <string name="dialog_edit_story_limited_title">Editare limitată pentru narațiuni</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Elementul media a fost înlăturat. Încearcă să-ți recreezi narațiunea.</string>
+    <string name="color_picker_label_background">Fundal</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="dialog_discard_story_ok_button_edit">Renunță</string>
+    <string name="dialog_discard_story_message_edit">Nu va fi salvată nicio modificare făcută.</string>
+    <string name="dialog_discard_story_title_edit">Renunți la modificări?</string>
+    <string name="label_done_button">Gata</string>
+    <string name="label_next_button">Următorul</string>
+    <string name="delete_button_alt">Șterge</string>
+    <string name="hpp_choose_error">A apărut o eroare în timpul selectării designului.</string>
+    <string name="hpp_retry_error">Te rog verifică-ți conexiunea la internet și încearcă din nou.</string>
+    <string name="hpp_error_subtitle">Atinge reîncearcă când ești din nou online.</string>
+    <string name="hpp_error_title">Aranjamentele nu sunt disponibile când ești offline</string>
+    <string name="continue_site_credentials">Continuă cu datele de conectare la magazin</string>
+    <string name="login_find_your_connected_email">Găsește emailul conectat</string>
+    <string name="reader_discover_no_posts_button_text">Urmărește subiecte</string>
+    <string name="reader_discover_no_posts_subtitle">Încearcă să urmărești mai multe subiecte pentru a extinde căutarea</string>
+    <string name="reader_discover_no_posts_title">Niciun articol recent</string>
+    <string name="reader_discover_empty_title">Bine ai venit!</string>
+    <string name="scan">Scanează</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; a răspuns la articolul tău</string>
+    <string name="login_prologue_third_subtitle_two">Azi ai primit &lt;b&gt;50 de aprecieri&lt;/b&gt; pe sit</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; ți-a apreciat articolul</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Meniul de blocuri care poate fi derulat este deschis. Selectează un bloc.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Meniul de blocuri care poate fi derulat este închis.</string>
+    <string name="hpp_skip_button">Sari</string>
+    <string name="hpp_choose_button">Alege</string>
+    <string name="hpp_subtitle">Alege aranjamentul preferat pentru prima pagină. Îl poți edita sau personaliza mai târziu.</string>
+    <string name="hpp_title">Alege un design</string>
+    <string name="mlp_network_error_subtitle">Atinge reîncearcă când ești din nou online sau creează o pagină goală folosind butonul de mai jos.</string>
+    <string name="mlp_network_error_title">Aranjamentele nu sunt disponibile când ești offline</string>
+    <string name="mlp_error_subtitle">Atinge reîncearcă sau creează o pagină goală folosind butonul de mai jos.</string>
+    <string name="mlp_error_title">Aranjamentele nu sunt disponibile din cauza unei erori</string>
+    <string name="prepublishing_nudges_add_category_button">Adaugă o categorie</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Adaugă o categorie nouă</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Categorii</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Nesetată</string>
+    <string name="prepublishing_nudges_categories_action">Categorii</string>
+    <string name="login_prologue_fifth_caption_three">Muzee din Londra</string>
+    <string name="login_prologue_fifth_caption_two">Cei mai buni fani din lume</string>
+    <string name="login_prologue_fifth_caption_one">Primele zece cafenele, pe gustul meu</string>
+    <string name="login_prologue_fifth_tag_six">Politică</string>
+    <string name="login_prologue_fifth_tag_five">Muzică</string>
+    <string name="login_prologue_fifth_tag_four">Grădinărit</string>
+    <string name="login_prologue_fifth_tag_three">Fotbal</string>
+    <string name="login_prologue_fifth_tag_two">Bucătărie</string>
+    <string name="login_prologue_fifth_tag_one">Artă</string>
+    <string name="login_prologue_fifth_subtitle_three">Rock and Roll în fiecare săptămână</string>
+    <string name="login_prologue_fifth_subtitle_two">Știri pe web</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">M-au inspirat foarte mult lucrările fotografului Cameron Karsten. Voi încerca aceste tehnici pe viitor</string>
+    <string name="login_prologue_second_subtitle_one">Inspiră-te</string>
+    <string name="login_prologue_title_fifth">Urmărește-ți siturile preferate și descoperi bloguri noi.</string>
+    <string name="login_prologue_title_fourth">Urmărești cum îți crește audiența cu analitice detaliate.</string>
+    <string name="login_prologue_title_third">Vezi comentariile și notificările în timp real.</string>
+    <string name="login_prologue_title_second">Cu acest editor puternic poți publica din mers.</string>
+    <string name="login_prologue_title_first">Bine ai venit la cel mai popular constructor de situri web din lume.</string>
+    <string name="media_loading_failed">Încărcarea media a eșuat</string>
+    <string name="reader_discover_recommended_blogs_header">Situri de urmărit</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Lucrăm continuu pentru a adăuga mai multe blocuri la fiecare lansare.</string>
     <string name="gutenberg_native_s_is_not_fully_supported">„%s” nu este acceptat în totalitate</string>
     <string name="gutenberg_native_help_button">Buton pentru ajutor</string>
@@ -18,19 +470,16 @@ Language: ro
     <string name="stories_intro_title_first">Acum narațiunile sunt pentru toată lumea</string>
     <string name="stories_intro_image_caption_second">Exemplu de titlu narațiune</string>
     <string name="stories_intro_image_caption_first">Cum să creezi un articol narațiune</string>
-    <string name="stories_intro_main_subtitle">Acum ai acces Articole narațiune și ne-ar plăcea să le încerci.</string>
     <string name="stories_intro_main_title">Prezentăm Articole narațiune</string>
-    <string name="mlp_generic_error">A apărut o eroare în timpul aducerii aranjamentelor</string>
     <string name="mlp_notice_blank_page_created">A fost creată o pagină goală</string>
     <string name="mlp_notice_page_created">A fost creată o pagină</string>
-    <string name="mlp_preview_title">Previzualizare aranjament</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s a fost refuzat accesul la fotografiile tale. Pentru a corecta asta, editează-ți permisiunile și pornește %2$s și %3$s.</string>
     <string name="media_insert_failed">Inserarea media a eșuat.</string>
     <string name="media_insert_failed_with_reason">Inserarea media a eșuat: %s</string>
     <string name="photo_picker_wordpress_media_library">Alege din biblioteca Media din WordPress</string>
     <string name="reader_label_toolbar_back">Înapoi</string>
     <string name="reader_discover_empty_button_text">Începe</string>
-    <string name="reader_discover_empty_title">Urmărește niște subiecte pentru a descoperi bloguri noi</string>
+    <string name="reader_discover_empty_subtitle">Urmărește niște subiecte pentru a descoperi bloguri noi</string>
     <string name="reader_post_details_header_by_author_name">De</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">Acest referent nu poate fi marcat ca spam</string>
     <string name="stats_referrer_popup_unmark_as_spam">Anulează marcarea ca spam</string>
@@ -41,10 +490,11 @@ Language: ro
     <string name="media_uploading_default">Încărcare media</string>
     <string name="gutenberg_native_select_item">Selectează un element</string>
     <string name="gutenberg_native_search_or_type_url">Caută sau tastează URL-ul</string>
+    <string name="gutenberg_native_page_break">Sfârșit de pagină</string>
     <string name="gutenberg_native_add_this_telephone_link">Adaugă această legătură la telefon</string>
     <string name="gutenberg_native_add_this_link">Adaugă această legătură</string>
     <string name="gutenberg_native_add_this_email_link">Adaugă această legătură la email</string>
-    <string name="suggestion_no_connection">„Nu există conexiune la internet.\nSugestiile nu sunt disponibile.”</string>
+    <string name="suggestion_no_connection">Nu există conexiune la internet.\nSugestiile nu sunt disponibile.</string>
     <string name="typeface_label_shrikhand">Aldin</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_pacifico">Vesel</string>
@@ -60,7 +510,6 @@ Language: ro
     <string name="comment_unable_to_show_error">Nu pot să arăt acest comentariu</string>
     <string name="media_browse_for_items">Răsfoiește pentru a căuta elemente</string>
     <string name="reader_menu_report_post">Raportează acest articol</string>
-    <string name="gutenberg_native_angle">Unghi</string>
     <string name="reader_welcome_banner">Bine ai venit la Cititor. Descoperi milioane de bloguri la îndemână.</string>
     <string name="error_media_xmlrcp_server_error">A apărut o eroare internă la server</string>
     <string name="error_media_xmlrpc_not_allowed">Acțiunea ta nu este permisă</string>
@@ -70,7 +519,6 @@ Language: ro
     <string name="create_post_story_fab_tooltip">Creează un articol sau o narațiune</string>
     <string name="create_page_fab_tooltip">Creează o pagină</string>
     <string name="create_post_fab_tooltip">Creează un articol</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">S-ar putea să-ți placă</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Ascunde</string>
     <string name="gutenberg_native_video_caption_empty">Text asociat video. Gol</string>
@@ -109,7 +557,6 @@ Language: ro
     <string name="dialog_discard_errored_page_message">Acest diapozitiv nu a fost încă salvat. Dacă ștergi acest diapozitiv, vei pierde toate modificările pe care le-ai făcut.</string>
     <string name="dialog_discard_page_message">Acest diapozitiv va fi înlăturat din narațiune.</string>
     <string name="dialog_discard_page_title">Ștergi diapozitivul narațiunii?</string>
-    <string name="menu_delete_page">Șterge diapozitivul</string>
     <string name="label_text_color_button">Schimbă culoarea textului</string>
     <string name="label_text_alignment_button">Modifică alinierea textului</string>
     <string name="label_frame_errored">eronat</string>
@@ -119,8 +566,6 @@ Language: ro
     <string name="label_retry_icon">Reîncearcă</string>
     <string name="label_saved_icon">Salvat</string>
     <string name="label_close_button">Închide</string>
-    <string name="label_control_publish">Următor</string>
-    <string name="label_done">Gata</string>
     <string name="label_share_to">Partajează pe</string>
     <string name="label_snackbar_share">PARTAJEAZĂ</string>
     <string name="label_snackbar_loop_frame_saved">Salvată în fotografii</string>
@@ -131,7 +576,6 @@ Language: ro
     <string name="label_control_flip_camera">Întoarcere</string>
     <string name="sound_button_alt">Sunet</string>
     <string name="text_button_alt">Text</string>
-    <string name="more_button_alt">Mai multe</string>
     <string name="stickers_button_alt">Autocolante</string>
     <string name="flash_button_alt">Bliț</string>
     <string name="flip_button_alt">Întoarce camera</string>
@@ -144,7 +588,7 @@ Language: ro
     <string name="prepublishing_nudges_story_title_hint">Dă-i un titlu narațiunii tale</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Creează un articol sau o narațiune</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Creează un articol, o pagină sau o narațiune</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Atinge Creează %1$s. %2$s Apoi selectează &lt;b>Articol blog&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">Atinge Creează %1$s. %2$s Apoi selectează &lt;b&gt;Articol blog&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Alege de pe dispozitiv</string>
     <string name="my_site_bottom_sheet_add_story">Articol narațiune</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Editarea iconurilor de sit pe siturile WordPress auto-găzduite necesită modulul Jetpack.</string>
@@ -158,13 +602,10 @@ Language: ro
     <string name="gutenberg_native_choose_image_or_video">Alege o imagine sau un video</string>
     <string name="gutenberg_native_choose_image">Alege o imagine</string>
     <string name="gutenberg_native_block_removed">Bloc înlăturat</string>
-    <string name="content_description_logo">Logo WordPress</string>
-    <string name="enter_your_site_address">Introdu adresa sitului tău</string>
-    <string name="continue_with_wpcom">Continuă cu WordPress.com</string>
+    <string name="enter_your_site_address">Introdu adresa sitului tău de acum</string>
     <string name="signup_confirmation_title">Confirmare înregistrare</string>
     <string name="continue_with_google_terms_of_service_text">Dacă continui cu Google și nu ai deja un cont WordPress.com, îți creezi un cont și ești de acord cu %1$stermenii de utilizare ai serviciului%2$s nostru.</string>
     <string name="continue_terms_of_service_text">Dacă continui, ești de acord cu %1$stermenii de utilizare ai serviciului%2$s nostru.</string>
-    <string name="signup_confirmation_magic_link_message">Îți vom trimite prin email o legătură de înregistrare pentru a-ți crea noul cont WordPress.com.</string>
     <string name="signup_confirmation_message">Vom folosi această adresă de email pentru a-ți crea noul cont WordPress.com.</string>
     <string name="signup_magic_link_message">Ți-am trimis prin email o legătură de înregistrare pentru a-ți crea noul cont WordPress.com. Verifică emailurile primite pe acest dispozitiv și atinge legătura din emailul primit de la WordPress.com.</string>
     <string name="enter_account_info_for_site">Introdu informațiile contului pentru %1$s.</string>
@@ -181,19 +622,15 @@ Language: ro
     <string name="or_type_your_password">Sau tastează parola</string>
     <string name="create_account">Creează un cont</string>
     <string name="send_link_by_email">Trimite legătura prin email</string>
-    <string name="login_promo_text_unlock_the_power">Deblochează puterea celui mai flexibil constructor de situri web.</string>
-    <string name="login_promo_title_37_percent">37\% din web este construit cu WordPress.</string>
     <string name="reset_your_password">Resetează-ți parola</string>
     <string name="reader_error_request_failed_title">A fost o problemă la gestionarea cererii. Te rog reîncearcă mai târziu.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Dă-i sitului un nume care să-i reflecte personalitatea și subiectul (tema). Prima impresie este foarte importantă!</string>
     <string name="quick_start_list_update_site_title_title">Setează titlul sitului</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Atinge &lt;b>%1$s&lt;/b> pentru a seta un nou titlu</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Atinge &lt;b&gt;%1$s&lt;/b&gt; pentru a seta un nou titlu</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Aruncarea acestui articol la gunoi va anula și modificările locale, sigur vrei să continui?</string>
     <string name="gutenberg_native_s_block_options">Opțiuni bloc %s</string>
     <string name="gutenberg_native_duplicate_block">Fă un duplicat al blocului</string>
     <string name="gutenberg_native_copy_block">Copiază blocul</string>
     <string name="gutenberg_native_copied_block">Bloc copiat</string>
-    <string name="gutenberg_native_block_settings">Setări blocuri</string>
     <string name="gutenberg_native_block_pasted">Bloc plasat</string>
     <string name="gutenberg_native_block_duplicated">Bloc duplicat</string>
     <string name="gutenberg_native_block_cut">Bloc șters</string>
@@ -209,7 +646,6 @@ Language: ro
     <string name="gutenberg_native_gradient_type">Tip de gradient</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Atinge de două ori pentru a selecta opțiunea</string>
     <string name="gutenberg_native_customize_gradient">Personalizează gradientul</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autor pagină</string>
     <string name="photo_picker_use_gif">Folosește acest GIF</string>
     <string name="error_media_thumbnail_not_loaded">Miniatura media nu a putut fi încărcată</string>
@@ -232,8 +668,8 @@ Language: ro
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Mută în ciorne</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Articolele aruncate la gunoi nu pot fi editate. Vrei să modifici starea acestui articol în „ciornă” pentru a-l putea edita?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Muți articolul în Ciorne?</string>
-    <string name="reader_label_choose_your_interests">Alege ce te interesează</string>
-    <string name="reader_choose_interests_content_description">Alege ce te interesează</string>
+    <string name="reader_label_choose_your_interests">Alege subiecte</string>
+    <string name="reader_choose_interests_content_description">Alege subiecte</string>
     <string name="reader_btn_done">Gata</string>
     <string name="reader_btn_select_few_interests">Selectează câteva pentru a continua</string>
     <string name="post_status_post_published">Publicat</string>
@@ -245,17 +681,14 @@ Language: ro
     <string name="ccpa_privacy_notice_header">Notificări de confidențialitate pentru utilizatorii din California</string>
     <string name="status_and_visibility">Stare și vizibilitate</string>
     <string name="update_now">Actualizează acum</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Încearcă un aranjament de început</string>
     <string name="gutenberg_native_open_block_actions_menu">Deschide meniul acțiuni blocuri</string>
-    <string name="gutenberg_native_insert_mention">Inserează mențiunea</string>
+    <string name="gutenberg_native_move_to_top">Mută în sus</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Atinge de două ori pentru a deschide Foaia de jos cu opțiunile disponibile</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Atinge de două ori pentru a deschide Foaia acțiuni cu opțiunile disponibile</string>
     <string name="pages_cannot_be_started">Nu putem deschide paginile în acest moment. Te rog reîncearcă mai târziu.</string>
     <string name="pages_set_as_posts_page">Setează ca pagină articole</string>
     <string name="pages_set_as_homepage">Setează ca prima pagină</string>
-    <string name="suggestion_no_matching_users">„Nu se potrivește niciun utilizator disponibil.”</string>
-    <string name="suggestion_invalid_user">„%s nu este un utilizator valid”</string>
+    <string name="suggestion_invalid">%s nu este un %s valid</string>
     <string name="site_settings_select_page">Selectează pagina</string>
     <string name="site_settings_posts_page">Pagină articole</string>
     <string name="site_settings_static_homepage">Prima pagină statică</string>
@@ -275,7 +708,6 @@ Language: ro
     <string name="page_homepage_successfully_updated">Prima pagină a fost actualizată cu succes</string>
     <string name="page_cannot_set_posts_page">Pentru a seta pagina Articole activează „Prima pagină statică” în Setări sit</string>
     <string name="page_cannot_set_homepage">Pentru a seta Prima pagină activează „Prima pagină statică” în Setări sit</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Bine ai venit la noul nostru blog</string>
     <string name="gutenberg_native_select_a_color">Selectează o culoare</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Atinge de două ori pentru a merge la setări culori</string>
     <string name="reader_empty_followed_blogs_description">Când urmărești situri, vei vedea conținutul lor aici</string>
@@ -309,7 +741,7 @@ Language: ro
     <string name="gutenberg_native_move_block_left">Mută blocul în stânga</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Atinge de două ori pentru a muta blocul în dreapta</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Atinge de două ori pentru a muta blocul în stânga</string>
-    <string name="gutenberg_native_blog">Blog</string>
+    <string name="gutenberg_native_block_settings">Setări bloc</string>
     <string name="new_site_creation_creating_site_loading_4">Creez panoul de control</string>
     <string name="new_site_creation_creating_site_loading_3">Inițializez tema</string>
     <string name="new_site_creation_creating_site_loading_2">Adaug funcționalitățile sitului</string>
@@ -365,57 +797,20 @@ Language: ro
     <string name="app_theme_light">Luminoasă</string>
     <string name="app_theme">Aspect</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Ai făcut recent modificări în această pagină, dar nu le-ai salvat. Alege o versiune pentru a o încărca:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Ce spune lumea</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Oferim o serie de servicii care te ajută să obții rezultatele pe care le cauți. Nu știi sigur de ce ai nevoie sau cât costă? Îți putem explica care servicii sunt potrivite pentru tine și îți spunem mai multe despre costurile care le implică.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Suntem o mică echipă de profesioniști talentați, cu calificare și experiență. Ne place ceea ce facem și o facem cu pasiune. Abia așteptăm să lucrăm cu tine.</string>
-    <string name="gutenberg_native_warning_message">Mesaj de avertizare</string>
-    <string name="gutenberg_native_want_to_work_with_us">Vrei să lucrezi cu noi?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Vizitatorii vor dori să știe cine se află în spatele paginii. Folosește acest spațiu pentru a scrie despre tine, situl tău, afacerea ta sau orice altceva vrei. Folosește testimonialele de mai jos pentru a-i cita pe alții, referitor la aceleași lucruri - cu propriile lor cuvinte.</string>
-    <string name="gutenberg_native_usa">S.U.A.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Acesta este un exemplu de conținut, inclus în șablon, pentru a ilustra funcționalitățile. Înlătură-l sau înlocuiește-l cu propriile cuvinte și elemente media.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Modul de a începe este să renunți la vorbărie și să începi să faci ceva.</string>
-    <string name="gutenberg_native_team">Echipă</string>
-    <string name="gutenberg_native_success_message">Mesaj de succes</string>
-    <string name="gutenberg_native_strategy">Strategie</string>
     <string name="gutenberg_native_show_post_content">Arată conținutul articolului</string>
-    <string name="gutenberg_native_services">Servicii</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Nume proiect</string>
-    <string name="gutenberg_native_position_or_job_title">Poziția sau funcția</string>
-    <string name="gutenberg_native_portfolio">Portofoliu</string>
     <string name="gutenberg_native_only_show_excerpt">Arată numai rezumatul</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Portofoliul meu prezintă diferite proiecte create de-a lungul carierei mele. Vezi informațiile mele de contact de mai jos și intrăm în legătură.</string>
     <string name="gutenberg_native_link_to">Legătură la</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Hai să vorbim 👋 Nu ezita să mă contactezi, ai mai jos informațiile mele de contact, sau să-mi trimiți un mesaj folosind formularul.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Hai să construim ceva împreună!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Hai să construim ceva împreună!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Sunt alegerile noastre Harry, care arată ceea ce suntem cu adevărat, cu mult mai mult decât abilitățile noastre.</string>
-    <string name="gutenberg_native_inspiration">Inspirație</string>
-    <string name="gutenberg_native_get_in_touch">Intră în contact</string>
+    <string name="gutenberg_native_link_settings">Setări legătură</string>
     <string name="gutenberg_native_excerpt_length_words">Lungime rezumat (cuvinte)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Trimite-mi un email la: &lt;a href=\"mailto:mail@example.com\">mail@exemplu.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Nu plânge pentru că s-a terminat, zâmbește pentru că s-a întâmplat.</string>
     <string name="gutenberg_native_customize">PERSONALIZEAZĂ</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
+    <string name="gutenberg_native_video_settings">Setări video</string>
     <string name="gutenberg_native_add_paragraph_block">Adaugă un bloc Paragraf</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">O scurtă descriere a serviciilor pe care le oferi.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">O biografie scurtă, ca un istoric personal, realizări importante sau fapte interesante.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@exemplu.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">O descriere a proiectului și a lucrărilor prezentate.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">Creează un articol</string>
     <string name="post_list_tab_trashed_posts">Aruncate la gunoi</string>
     <string name="post_list_tab_scheduled_posts">Programate</string>
     <string name="post_list_tab_published_posts">Publicate</string>
     <string name="sharing_facebook_account_must_have_pages">Conexiunea Facebook nu găsește nicio pagină. Publicitatea nu se poate conecta la profilurile Facebook, ci numai la pagini Facebook publicate.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Neconectat</string>
-    <string name="my_site_select_domains_page_title">Adresă sit</string>
     <string name="notifications_tab_title_likes">Aprecieri</string>
     <string name="notifications_tab_title_follows">Urmăriri</string>
     <string name="notifications_tab_title_comments">Comentarii</string>
@@ -429,14 +824,12 @@ Language: ro
     <string name="stats_management_add_new_stats_card">Adaugă un cartuș nou pentru statistici</string>
     <string name="reader_self_hosted_select_filter">Folosește butonul de filtrare pentru a găsi articole pentru anumite subiecte</string>
     <string name="reader_bottom_sheet_content_description">Selectează o etichetă sau un sit, ferestră popup</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selectat(ă)</string>
     <string name="reader_btn_select_filter_content_description">Selectează un sit sau o etichetă pentru a filtra articolele</string>
     <string name="reader_btn_remove_filter_content_description">Înlătură filtrul curent</string>
     <string name="reader_title_subs">Administrează subiectele și siturile</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Autentifică-te în WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Autentifică-te în WordPress.com pentru a vedea ultimele articole cu subiectele pe care le urmărești</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Autentifică-te în WordPress.com pentru a vedea ultimele din siturile pe care le urmărești</string>
-    <string name="gutenberg_native_template_preview">Previzualizare șablon</string>
     <string name="gutenberg_native_replace_current_block">Înlocuiește blocul curent</string>
     <string name="gutenberg_native_add_to_end">Adaugă la sfârșit</string>
     <string name="gutenberg_native_add_to_beginning">Adaugă la început</string>
@@ -450,7 +843,6 @@ Language: ro
     <string name="reader_filter_cta">Filtrează</string>
     <string name="gutenberg_native_video_caption_s">Text asociat video. %s</string>
     <string name="gutenberg_native_edit_video">Editează videoul</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Atinge de două ori pentru a selecta aranjamentul</string>
     <string name="gutenberg_native_add_a_shortcode">Adaugă un scurtcod…</string>
     <string name="post_list_author">Autor articol</string>
     <string name="fab_create_desc">Creează un articol</string>
@@ -465,10 +857,8 @@ Language: ro
     <string name="stats_box_type_low">puține</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  și %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Mută imaginea înainte</string>
-    <string name="gutenberg_native_move_image_backward">Mută imaginea înapoi</string>
+    <string name="gutenberg_native_replace_image">Înlocuiește imaginea</string>
     <string name="gutenberg_native_gallery_caption_s">Text asociat galerie. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Valoarea curentă este %2$s</string>
     <string name="create_post_page_fab_tooltip">Creează un articol sau o pagină</string>
     <string name="content_description_person_building_website">Persoană care construiește un sit web</string>
     <string name="post_signup_interstitial_not_right_now">Nu chiar acum</string>
@@ -482,21 +872,17 @@ Language: ro
     <string name="my_site_bottom_sheet_add_post">Articol blog</string>
     <string name="my_site_bottom_sheet_title">Adaugă nou</string>
     <string name="post_settings_publish">Publică</string>
-    <string name="dialog_gutenberg_informative_description_v2">Am făcut îmbunătățiri importante la editorul de blocuri și credem că merită să-l încerci! L-am activat pentru articole și pagini noi, dar dacă vrei să rămâi la editorul clasic mergi la „Situl meu” > „Setări sit”.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Sincronizează acum</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Acest articol va fi sincronizat imediat.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Ești gata pentru sincronizare?</string>
     <string name="new_site_creation_unavailable_domain">Acest domeniu nu este disponibil</string>
-    <string name="login_promo_viewpager_content_description">Introducere</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Nu am putut să-ți accesăm situl. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
-    <string name="login_discovery_error_ssl">Nu am putut să-ți accesăm situl din cauza unei probleme cu &lt;b>certificatul SSL&lt;/b>. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
-    <string name="login_discovery_error_http_auth">Nu am putut să-ți accesăm situl deoarece solicită &lt;b>autentificarea HTTP&lt;/b>. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
-    <string name="login_discovery_error_xmlrpc">Nu am putut să accesăm &lt;b>fișierul XMLRPC&lt;/b> pe situl tău. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
-    <string name="login_site_credentials_magic_link_label">Aproape gata! Trebuie doar să-ți verificăm adresa de email conectată la Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Autentifică-te cu datele de conectare ale sitului.</string>
+    <string name="login_discovery_error_ssl">Nu am putut să-ți accesăm situl din cauza unei probleme cu &lt;b&gt;certificatul SSL&lt;/b&gt;. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
+    <string name="login_discovery_error_http_auth">Nu am putut să-ți accesăm situl deoarece solicită &lt;b&gt;autentificarea HTTP&lt;/b&gt;. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
+    <string name="login_discovery_error_xmlrpc">Nu am putut să accesăm &lt;b&gt;fișierul XMLRPC&lt;/b&gt; pe situl tău. Pentru a rezolva acest lucru, va trebui să contactezi serviciul tău de găzduire.</string>
+    <string name="login_site_credentials_magic_link_label">Aproape gata! Trebuie doar să-ți verificăm adresa de email conectată la Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Autentifică-te cu datele de conectare ale sitului %1$s</string>
-    <string name="send_verification_email">Trimite emailul de verificare</string>
     <string name="my_site_bottom_sheet_add_page">Pagină sit</string>
     <string name="reader_following_display_name">Urmăresc</string>
     <string name="reader_my_likes_display_name">Aprecieri</string>
@@ -513,23 +899,19 @@ Language: ro
     <string name="posts_cannot_be_started">Nu putem deschide articolele acum. Te rog reîncearcă mai târziu</string>
     <string name="site_cannot_be_loaded">Nu putem încărca datele pentru situl tău chiar acum. Te rog reîncearcă mai târziu</string>
     <string name="gutenberg_native_wordpress_media_library">Bibliotecă media WordPress</string>
+    <string name="gutenberg_native_unsupported">Neacceptat</string>
     <string name="gutenberg_native_ungroup">Anulează gruparea</string>
     <string name="gutenberg_native_translate">Tradu</string>
-    <string name="gutenberg_native_title">Titlu:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Atinge pentru a ascunde tastatura</string>
     <string name="gutenberg_native_tap_here_to_show_help">Atinge aici pentru a afișa ajutorul</string>
     <string name="gutenberg_native_take_a_video">Fă un video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Fă o fotografie sau un video</string>
     <string name="gutenberg_native_take_a_photo">Fă o poză</string>
     <string name="gutenberg_native_start_writing">Începe să scrii…</string>
-    <string name="gutenberg_native_size">Dimensiune</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Conectare titlu bară laterală</string>
     <string name="gutenberg_native_show_section">Arată secțiunea</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bloc %s. Acest bloc are conținut invalid</string>
     <string name="gutenberg_native_s_block_empty">Bloc %s. Gol</string>
     <string name="gutenberg_native_cut_block">Șterge blocul</string>
-    <string name="gutenberg_native_reset_block">Resetează blocul</string>
-    <string name="gutenberg_native_remove_annotations">Înlătură adnotările</string>
     <string name="gutenberg_native_problem_opening_the_video">Problemă la deschiderea videoului</string>
     <string name="gutenberg_native_problem_displaying_block">Problemă la afișarea blocului</string>
     <string name="gutenberg_native_post_title_s">Titlu articol. %s</string>
@@ -539,17 +921,12 @@ Language: ro
     <string name="gutenberg_native_open_settings">Deschide setările</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Nicio aplicație nu poate gestiona această cerere. Te rog instalează un navigator web.</string>
     <string name="gutenberg_native_navigate_up">Navighează în sus</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Panoul meu pentru pre-publicare</string>
-    <string name="gutenberg_native_my_post_status_info">Informații despre starea articolelor mele</string>
-    <string name="gutenberg_native_my_post_publish_panel">Panoul meu pentru publicare articole</string>
-    <string name="gutenberg_native_my_document_setting_panel">Panoul meu pentru setări documente</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Mută blocul în sus de pe rândul %1$s pe rândul %2$s</string>
     <string name="gutenberg_native_move_block_up">Mută blocul în sus</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Mută blocul în jos de pe rândul %1$s pe rândul %2$s</string>
     <string name="gutenberg_native_move_block_down">Mută blocul în jos</string>
     <string name="gutenberg_native_image_caption_s">Text asociat imagine. %s</string>
     <string name="gutenberg_native_hide_keyboard">Ascunde tastatura</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Iată conținutul panoului!</string>
     <string name="gutenberg_native_help_icon">Icon pentru ajutor</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Inserarea elementului media a eșuat.\nTe rog atinge pentru opțiuni.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Atinge de două ori pentru a anula ultima modificare</string>
@@ -561,34 +938,28 @@ Language: ro
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Atinge de două ori pentru a muta blocul în sus</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Atinge de două ori pentru a muta blocul în jos</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Atinge de două ori pentru a edita această valoare</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Atinge de două ori pentru a modifica valoarea folosind caruselul</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Atinge de două ori pentru a adăuga un bloc</string>
     <string name="gutenberg_native_current_value_is_s">Valoarea curentă este %s</string>
-    <string name="gutenberg_native_content">Conținut…</string>
     <string name="gutenberg_native_choose_from_device">Alege de pe dispozitiv</string>
-    <string name="gutenberg_native_annotations_sidebar">Bară laterală adnotări</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">A apărut o eroare necunoscută. Te rog încearcă din nou.</string>
     <string name="gutenberg_native_alt_text">Text alternativ</string>
     <string name="gutenberg_native_add_video">ADAUGĂ VIDEO</string>
     <string name="gutenberg_native_add_url">Adaugă URL</string>
+    <string name="gutenberg_native_add_alt_text">Adaugă text alternativ</string>
     <string name="gutenberg_native_add_image_or_video">ADAUGĂ IMAGINE SAU VIDEO</string>
     <string name="gutenberg_native_add_image">ADAUGĂ IMAGINE</string>
     <string name="gutenberg_native_add_block_here">ADAUGĂ BLOC AICI</string>
-    <string name="gutenberg_native_add_annotation">Adaugă o adnotare</string>
-    <string name="gutenberg_native_add_a_description">Adaugă o descriere</string>
     <string name="reader_empty_saved_posts_content_description">Pentru a salva un articol în listă atinge butonul Adaugă în articole salvate.</string>
     <string name="reader_acessibility_list_loaded">„Lista a fost încărcată și are %1$d elemente.”</string>
     <string name="notifications_tab_dialog_switch_desc">Notificări</string>
-    <string name="master_switch_default_title_off">Oprite</string>
-    <string name="master_switch_default_title_on">Pornite</string>
-    <string name="notifications_tab_dialog_master_off_message">Pornirea notificărilor pentru acest sit va dezactiva afișarea notificărilor în fila notificări pentru acest sit. După pornirea notificărilor pentru acest sit, poți ajusta ce fel de notificări vrei să vezi.</string>
-    <string name="notifications_tab_dialog_master_off_title">Pentru a vedea notificările în fila notificări pentru acest sit, pornește notificările pe sit.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Activează afișarea notificărilor în fila notificări pentru acest sit</string>
-    <string name="notifications_tab_dialog_master_hint_on">Dezactivează afișarea notificărilor în fila notificări pentru acest sit</string>
-    <string name="notifications_tab_dialog_master_status_off">Notificări pentru acest sit</string>
-    <string name="notifications_tab_dialog_master_status_on">Notificări pentru acest sit</string>
-    <string name="dialog_gutenberg_informative_description_page">Acum folosești editorul de blocuri pentru pagini noi, foarte bine! Dacă vrei să treci la editorul clasic, mergi la „Situl meu” > „Setări sit”.</string>
-    <string name="dialog_gutenberg_informative_description_post">Acum folosești editorul de blocuri pentru articole noi, foarte bine! Dacă vrei să treci la editorul clasic, mergi la „Situl meu” > „Setări sit”.</string>
+    <string name="main_switch_default_title_off">Oprite</string>
+    <string name="main_switch_default_title_on">Pornite</string>
+    <string name="notifications_tab_dialog_main_off_message">Oprirea notificărilor pentru acest sit va dezactiva afișarea notificărilor în fila Notificări. După ce activezi notificările pentru acest sit, poți ajusta ce fel de notificări vrei să vezi.</string>
+    <string name="notifications_tab_dialog_main_off_title">Pentru a vedea notificările pentru acest sit în fila Notificări, pornește notificările pe sit.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Activează afișarea notificărilor pentru acest sit în fila Notificări</string>
+    <string name="notifications_tab_dialog_main_hint_on">Dezactivează afișarea notificărilor pentru acest sit în fila Notificări</string>
+    <string name="notifications_tab_dialog_main_status_off">Notificări pentru acest sit</string>
+    <string name="notifications_tab_dialog_main_status_on">Notificări pentru acest sit</string>
     <string name="pick_media">Adaugă imagine sau video</string>
     <string name="error_post_not_submitted_retrying">Nu am putut trimite acest articol pentru verificare, dar vom încerca din nou mai târziu.</string>
     <string name="error_post_not_scheduled_retrying">Nu am putut programa acest articol, dar vom încerca din nou mai târziu.</string>
@@ -681,8 +1052,6 @@ Language: ro
     <string name="post_settings_add_to_calendar">Adaugă în calendar</string>
     <string name="post_settings_notification">Notificare</string>
     <string name="post_settings_time_and_date">Dată și oră</string>
-    <string name="login_need_help_finding_connected_email">Ai nevoie de ajutor pentru a găsi emailul cu care te-ai conectat?</string>
-    <string name="enter_wordpress_site">Situl web de la această adresă nu este un sit WordPress. Pentru a-l putea conecta, situl trebuie să aibă instalat WordPress.</string>
     <string name="login_invalid_site_url">Te rog introdu adresa completă a sitului web, cum ar fi exemplu.com.</string>
     <string name="enter_email_for_site">Autentifică-te cu WordPress.com pentru a te conecta la %1$s</string>
     <string name="stats_post_views_label">Vizualizări</string>
@@ -748,7 +1117,7 @@ Language: ro
     <string name="domain_registration_state_picker_dialog_title">Selectează județul (provincia, statul)</string>
     <string name="domain_registration_country_picker_dialog_title">Selectează țara</string>
     <string name="domain_registration_result_continue_button">continuă</string>
-    <string name="domain_registration_result_description">domeniul tău &lt;b>%s&lt;/b> este inițializat acum. Situl tău\n        face tumbe de bucurie!</string>
+    <string name="domain_registration_result_description">domeniul tău &lt;b&gt;%s&lt;/b&gt; este inițializat acum. Situl tău\n        face tumbe de bucurie!</string>
     <string name="domain_registration_result_title">Felicitări</string>
     <string name="domain_contact_information_register_domain_button">Înregistrează domeniul</string>
     <string name="domain_contact_information_postal_code_hint">Cod poștal</string>
@@ -856,12 +1225,10 @@ Language: ro
     <string name="plans_loading_error_no_plans_title">Nu putem încărca planuri</string>
     <string name="plans_loading_error_network_title">Fără conexiune</string>
     <string name="menu_switch_to_gutenberg_editor">Comută la editorul de blocuri</string>
-    <string name="menu_switch_to_aztec_editor">Comută la editorul clasic</string>
     <string name="stats_loading_block_error">A fost o problemă la încărcarea datelor, reîncarcă pagina pentru a încerca din nou.</string>
     <string name="stats_loading_error">Datele nu au fost încărcate</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Editează articolele și paginile noi cu editorul de blocuri</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Folosește editorul de blocuri</string>
-    <string name="dialog_gutenberg_informative_title">Editor de blocuri activat</string>
     <string name="exit">ieșire</string>
     <string name="quick_start_sites_type_subtitle">%1$d din %2$d finalizate</string>
     <string name="quick_start_sites_type_grow">Crește-ți audiența</string>
@@ -872,8 +1239,6 @@ Language: ro
     <string name="quick_start_dialog_upload_icon_title">Încarcă un icon pentru sit</string>
     <string name="quick_start_dialog_upload_icon_message">Vizitatorii îți vor vedea iconul în navigatoarele lor. Adaugă un icon personalizat pentru un aspect rafinat și profesionist.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Atinge %1$s Plan %2$s pentru a vedea planul actual și alte planuri disponibile</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Atinge %1$s Adaugă pagină %2$s pentru a crea o pagină nouă.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Atinge %1$s Pagini %2$s pentru a continua.</string>
     <string name="quick_start_dialog_check_stats_message_short">Atinge %1$s Statistici %2$s pentru a vedea rezultatele obținute de situl tău.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Atinge %1$s Icon sit %2$s pentru a încărca unul nou</string>
     <string name="quick_start_dialog_publish_post_message">Redactează și publică primul tău articol.</string>
@@ -884,13 +1249,8 @@ Language: ro
     <string name="quick_start_dialog_explore_plans_message">Află despre instrumentele SEO și de marketing din planurile nostre plătite.</string>
     <string name="quick_start_dialog_enable_sharing_title">Activează partajarea articolelor</string>
     <string name="quick_start_dialog_enable_sharing_message">Partajează automat articole noi în conturile tale din media socială.</string>
-    <string name="quick_start_dialog_customize_site_message">Ajustezi fonturile, adaugi imagini și altele.</string>
-    <string name="quick_start_dialog_create_page_title">Creează o pagină nouă</string>
-    <string name="quick_start_dialog_create_page_message">Adaugă o pagină pentru conținutul cheie - o pagină „Despre” este un început foarte bun.</string>
     <string name="quick_start_dialog_check_stats_title">Vezi statisticile sitului</string>
     <string name="quick_start_dialog_check_stats_message">Fii la curent cu performanța sitului tău.</string>
-    <string name="quick_start_dialog_browse_themes_title">Răsfoiește temele</string>
-    <string name="quick_start_dialog_browse_themes_message">Explorează zeci de opțiuni pentru aranjament și găsește-l pe cel care este perfect pentru tine.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Înlăturarea pașilor următori va ascunde toate tururile de pe acest sit. Această acțiune nu poate fi anulată.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Înlătură pașii următori</string>
     <string name="quick_start_remove_next_steps_menu_title">Înlătură acest</string>
@@ -914,15 +1274,11 @@ Language: ro
     <string name="notification_new_site_creation_failed">A fost o problemă</string>
     <string name="notification_new_site_creation_title">Crează un sit</string>
     <string name="new_site_creation_create_site_button">Crează situl</string>
-    <string name="new_site_creation_search_domain_input_hint">Caută domenii</string>
     <string name="new_site_creation_domain_header_subtitle">Aici vei fi găsit pe internet.</string>
-    <string name="new_site_creation_domain_header_title">Alege un nume de domeniu pentru situl tău</string>
     <string name="new_site_creation_empty_domain_list_message">Nu se potrivește nicio adresă disponibilă cu căutarea ta</string>
     <string name="site_creation_error_generic_subtitle">Eroare de comunicare cu serverul, te rog încercă din nou</string>
     <string name="site_creation_error_generic_title">A fost o problemă</string>
     <string name="site_creation_fetch_suggestions_error_unknown">A fost o problemă</string>
-    <string name="site_creation_segments_subtitle">Acest lucru ne ajută să facem recomandări. Dar nu trebuie să te limitezi la ele - toate siturile evoluează!</string>
-    <string name="site_creation_segments_title">Spune-ne ce fel de sit vrei să creezi</string>
     <string name="new_site_creation_preview_title">Situl tău a fost creat!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d din %2$d</string>
     <string name="new_site_creation_screen_title_general">Crează un sit</string>
@@ -1077,15 +1433,9 @@ Language: ro
     <string name="quick_start_dialog_need_help_button_neutral">Niciodată</string>
     <string name="quick_start_dialog_need_help_button_negative">Nu, mulțumesc</string>
     <string name="quick_start_dialog_follow_sites_title">Urmărește alte situri</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Atinge %1$s Caută %2$s pentru a căuta situri cu interese similare</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Atinge %1$s Caută %2$s pentru a căuta situri cu subiecte similare</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Atinge %1$s Cititor %2$s pentru a continua</string>
     <string name="quick_start_dialog_follow_sites_message">Găsește situri care te inspiră și urmărește-le pentru a primi notificări când publică articole noi.</string>
-    <string name="quick_start_dialog_customize_site_title">Personalizează-ți situl</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Atinge %1$s Teme %2$s pentru a continua</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Atinge %1$s Personalizează %2$s pentru a începe personalizarea sitului</string>
-    <string name="quick_start_dialog_choose_theme_title">Alege o temă</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Atinge %1$s Teme %2$s pentru a descoperi teme noi</string>
-    <string name="quick_start_dialog_choose_theme_message">Răsfoiește toate temele noastre pentru a o găsi pe cea care ți se potrivește perfect.</string>
     <string name="quick_start_button_positive">Începe</string>
     <string name="quick_start_button_negative_short">Anulează</string>
     <string name="quick_start_button_negative">Nu acum</string>
@@ -1149,14 +1499,12 @@ Language: ro
     <string name="support_contact_email">Email de contact</string>
     <string name="application_log_button">Jurnal aplicații</string>
     <string name="my_tickets">Tichetele mele</string>
-    <string name="activity_log_rewind_dialog_message">Sigur vrei să-ți derulezi situl înapoi la %1$s pe %2$s? Derularea înapoi va înlătura tot conținutul și opțiunile create sau modificate de atunci.</string>
-    <string name="activity_log_rewind_site">Derulează înapoi situl</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Derulare înapoi în curs de desfășurare</string>
-    <string name="activity_log_currently_restoring_message">Derulez înapoi la %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restaurare în curs de desfășurare</string>
+    <string name="activity_log_currently_restoring_message">Restaurez la %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Acum îți restaurăm situl</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Situl tău a fost restaurat cu succes</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Situl tău a fost restaurat cu succes\nDerulat înapoi la %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Situl tău este restaurat acum\nDerulez înapoi la %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Situl tău a fost restaurat cu succes\nA fost restaurat la %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Situl tău este restaurat acum\nRestaurez la %1$s %2$s</string>
     <string name="activity_log_button">Buton acțiune jurnal de activități</string>
     <string name="plugin_auto_managed">Administrat automat</string>
     <string name="reader_save_posts_locally_dialog_message">Salvează acest articol și te poți întoarce să-l citești oricând vrei. El va fi disponibil numai pe acest dispozitiv - articolele salvate nu sunt sincronizate pe alte dispozitive.</string>
@@ -1166,20 +1514,16 @@ Language: ro
     <string name="comment_read_source_post">Citește articolul sursă</string>
     <string name="sites">Situri</string>
     <string name="signup_magic_link_title">Legătura magică a fost trimisă</string>
-    <string name="signup_email_screen_title">Înregistrare prin email</string>
     <string name="verification_2fa_screen_title">Verificare cod</string>
     <string name="selfhosted_site_login_title">Date de autentificare</string>
     <string name="magic_link_sent_login_title">Legătura magică a fost trimisă</string>
     <string name="magic_link_login_title">Autentificare prin legătura magică</string>
     <string name="site_address_login_title">Autentificare prin adresa sitului</string>
     <string name="email_address_login_title">Autentificare prin adresa de email</string>
-    <string name="alternatively">Ca alternativă:</string>
     <string name="reader_empty_saved_posts_description">Atinge %s pentru a salva un articol în lista ta.</string>
     <string name="reader_empty_saved_posts_title">Niciun articol salvat — până acum!</string>
     <string name="reader_bookmark_snack_title">Publică salvate</string>
     <string name="reader_bookmark_snack_btn">Vezi tot</string>
-    <string name="reader_btn_bookmarked">Salvate</string>
-    <string name="reader_btn_bookmark">Salvează</string>
     <string name="reader_remove_bookmark">Înlătură din articole salvate</string>
     <string name="reader_add_bookmark">Adaugă la articole salvate</string>
     <string name="reader_save_for_later_title">Articole salvate</string>
@@ -1199,11 +1543,9 @@ Language: ro
     <string name="reader_btn_notifications_on">Activează notificările pe sit</string>
     <string name="reader_btn_notifications_off">Dezactivează notificările pe sit</string>
     <string name="activity_log_jetpack_icon">Icon Jetpack</string>
-    <string name="rewind">Derulează înapoi</string>
     <string name="activity_log_event">Eveniment</string>
     <string name="activity_log_icon">Icon activități</string>
     <string name="activity_log">Jurnal de activități</string>
-    <string name="activity">Activitate</string>
     <string name="privacy_policy_read">Citește politica de confidențialitate</string>
     <string name="third_party_policy_learn_more_caption">Folosim și alte instrumente de urmărire, inclusiv unele de la terți. Citește despre ele și despre cum le controlăm.</string>
     <string name="third_party_policy_learn_more_header">Politică părți terțe</string>
@@ -1214,7 +1556,6 @@ Language: ro
     <string name="preference_privacy_settings">Setări confidențialitate</string>
     <string name="preference_collect_information">Colectează informații</string>
     <string name="post_submitted">Articol trimis</string>
-    <string name="login_email_button_signup">Nu ai un cont? %1$sÎnregistrează-te%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Funcționalitatea modulului necesită ca situl să fie în stare bună.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Funcționalitatea modulului necesită ca abonamentul domeniul principal să fie asociat acestui utilizator.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Funcționalitatea modulului necesită privilegii de administrator.</string>
@@ -1313,7 +1654,6 @@ Language: ro
     <string name="edit_photo_screen_title">Editează fotografia</string>
     <string name="share_intent_screen_title">Alege situl</string>
     <string name="signup_epilogue_screen_title">Cont nou</string>
-    <string name="login_prologue_screen_title">Autentificare</string>
     <string name="login_epilogue_screen_title">Autentificat ca</string>
     <string name="person_detail_screen_title">Detalii personale</string>
     <string name="media_settings_screen_title">Detalii fișier</string>
@@ -1327,7 +1667,7 @@ Language: ro
     <string name="license_screen_title">Licență</string>
     <string name="release_notes_screen_title">Note de lansare</string>
     <string name="signup_epilogue_error_avatar_view">Avatarul tău a fost încărcat și va fi disponibil în scurt timp.</string>
-    <string name="permissions_denied_message">Se pare că ai dezactivat permisiunile necesare pentru această funcționalitate.&lt;br/>&lt;br/>Pentru a modifica asta, editează-ți permisiunile și asigură-te că &lt;strong>%s&lt;/strong> este activată.</string>
+    <string name="permissions_denied_message">Se pare că ai dezactivat permisiunile necesare pentru această funcționalitate.&lt;br/&gt;&lt;br/&gt;Pentru a modifica asta, editează-ți permisiunile și asigură-te că &lt;strong&gt;%s&lt;/strong&gt; este activată.</string>
     <string name="permissions_denied_title">Permisiuni</string>
     <string name="plugin_caption_featured">Reprezentativ</string>
     <string name="sharing_disabled_description">Nu poți accesa setările de partajare deoarece extensia Partajare de la Jetpack este dezactivată.</string>
@@ -1368,7 +1708,6 @@ Language: ro
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">Un articol cu un fișier neîncărcat</string>
     <string name="untitled_in_parentheses">(fără titlu)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Creează situl</string>
     <string name="notification_site_creation_created">Atinge pentru a continua.</string>
     <string name="notification_site_creation_title_success">Sit creat!</string>
@@ -1382,11 +1721,8 @@ Language: ro
     <string name="username_changer_dismiss_button_positive">Renunță</string>
     <string name="username_changer_action">Salvează</string>
     <string name="content_description_add_avatar">Adaugă avatar</string>
-    <string name="signup_with_google_button">Înregistrare cu Google</string>
-    <string name="signup_with_email_button">Înregistrare prin email</string>
     <string name="signup_user_exists">Emailul există deja pe WordPress.com.\nContinui autentificarea.</string>
     <string name="signup_updating_account">Actualizez contul…</string>
-    <string name="signup_terms_of_service_text">Prin înregistrare, ești de acord cu %1$sTermenii noștri de utilizare ai serviciului%2$s.</string>
     <string name="signup_magic_link_progress">Trimit emailul</string>
     <string name="signup_magic_link_error_button_positive">Reîncearcă</string>
     <string name="signup_magic_link_error_button_negative">Închide</string>
@@ -1399,11 +1735,6 @@ Language: ro
     <string name="signup_epilogue_error_button_negative">Revenire</string>
     <string name="signup_epilogue_error_generic">Au fost unele probleme la actualizarea contului tău. Poți reîncerca sau reveni la modificările tale pentru a continua.</string>
     <string name="signup_epilogue_error_avatar">Au fost unele probleme la încărcarea avatarului tău.</string>
-    <string name="signup_email_header">Pentru a-ți crea un cont WordPress.com nou, te rog introdu adresa ta de email.</string>
-    <string name="signup_email_error_generic">Au fost unele probleme la verificarea adresei de email.</string>
-    <string name="sign_up">Înregistrează-te la WordPress.com</string>
-    <string name="enter_username_instead">Autentifică-te cu numele de utilizator.</string>
-    <string name="enter_site_address_instead">Autentifică-te introducând adresa sitului tău.</string>
     <string name="plugin_needs_update">Necesită actualizare</string>
     <string name="plugin_caption_search">Caută module</string>
     <string name="plugin_caption_new">Noi</string>
@@ -1524,7 +1855,6 @@ Language: ro
     <string name="login_error_suffix">\nPoate încerci un alt cont?</string>
     <string name="login_error_generic">Au fost probleme cu conectarea la contul Google.</string>
     <string name="login_error_button">Închide</string>
-    <string name="login_google_button_suffix">Autentificare cu Google.</string>
     <string name="enter_wpcom_password_google">Pentru a continua cu acest cont Google, te rog furnizează parola WordPress.com care se potrivește. Aceasta va fi cerută o singură dată.</string>
     <string name="error_generic_network">A apărut o eroare de rețea. Te rog verifică-ți conexiunea și încearcă din nou.</string>
     <string name="post_settings_remove_featured_image">Înlătură imaginea reprezentativă</string>
@@ -1536,12 +1866,11 @@ Language: ro
     <string name="jetpack_disconnect_confirm">Deconectează</string>
     <string name="jetpack_disconnect_confirmation_message">Sigur vrei să deconectezi Jetpack de pe sit?</string>
     <string name="jetpack_disconnect_pref_title">„Deconectează din WordPress.com”</string>
-    <string name="site_settings_jetpack_whitelist_description">Poți trece în lista albă o adresă IP sau o serie de adrese împiedicându-le de a fi blocate vreodată de către Jetpack. IPv4 și IPv6 sunt acceptate. Pentru a specifica un interval, introdu valoarea mică și valoarea mare separate printr-o liniuță. Exemplu: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Poți marca o adresă IP (sau o serie de adrese IP) ca „Mereu permise”, pentru ca Jetpack să nu le blocheze vreodată. IPv4 și IPv6 sunt acceptate. Pentru a specifica un interval, introdu valoarea mică și valoarea mare, separate printr-o liniuță. Exemplu: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Necesită autentificare în doi-pași</string>
     <string name="jetpack_match_wpcom_via_email_title">Leagă conturile folosind adrese de email</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Permite autentificarea WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Autentificare WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Adrese IP din lista albă</string>
     <string name="jetpack_prevent_brute_force_title">Blochează încercările de autentificare rău intenționate</string>
     <string name="jetpack_prevent_brute_force_category_title">Protecție împotriva atacurilor cu forță-brută</string>
     <string name="jetpack_send_wp_notifications_title">Trimite notificări imediate</string>
@@ -1582,12 +1911,12 @@ Language: ro
     <string name="notification_settings_category_other">Altă</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Toate siturile mele</string>
     <string name="notification_settings_category_your_sites">Siturile tale</string>
-    <string name="notification_settings_master_off_message">Oprirea setărilor de notificare va dezactiva toate notificările din această aplicație, indiferent de tipul lor. Poți ajusta ce tip de notificare vrei să primești după pornirea setărilor de notificare.</string>
-    <string name="notification_settings_master_off_title">Pentru a primi notificări pe acest dispozitiv, pornește setările de notificare.</string>
-    <string name="notification_settings_master_hint_off">Activează notificările</string>
-    <string name="notification_settings_master_hint_on">Dezactivează notificările</string>
-    <string name="notification_settings_master_status_off">Oprite</string>
-    <string name="notification_settings_master_status_on">Pornite</string>
+    <string name="notification_settings_main_off_message">Oprirea setărilor pentru notificări va dezactiva toate notificările din această aplicație, indiferent de tipul lor. După ce activezi setările pentru notificări pentru acest sit, poți ajusta ce fel de notificări vrei să vezi.</string>
+    <string name="notification_settings_main_off_title">Pentru a primi notificări pe acest dispozitiv, pornește setările pentru notificări.</string>
+    <string name="notification_settings_main_hint_off">Activează notificările</string>
+    <string name="notification_settings_main_hint_on">Dezactivează notificările</string>
+    <string name="notification_settings_main_status_off">Oprite</string>
+    <string name="notification_settings_main_status_on">Pornite</string>
     <string name="max_video_resolution">Dimensiune maximă video</string>
     <string name="max_thumbnail_px_size">Dimensiune maximă imagine</string>
     <string name="error_upload_post_media_param">A fost o eroare la încărcarea media în acest articol: %s.</string>
@@ -1624,7 +1953,6 @@ Language: ro
     <string name="login_site_address_more_help">Ai nevoie de mai mult ajutor?</string>
     <string name="login_site_address_help_content">Adresa sitului tău apare în bara din partea de sus a ecranului când îți vizitezi situl în Chrome.</string>
     <string name="login_site_address_help_title">Care este adresa sitului meu?</string>
-    <string name="login_site_address_help">Ai nevoie de ajutor pentru a-ți găsi adresa sitului?</string>
     <string name="login_site_address">Adresă sit</string>
     <string name="enter_site_address">Introdu adresa sitului WordPress pe care vrei să-l conectezi.</string>
     <string name="login_already_logged_in_wpcom">Autentificat deja în WordPress.com</string>
@@ -1636,7 +1964,6 @@ Language: ro
     <string name="requesting_otp">Cer un cod de verificare prin SMS.</string>
     <string name="login_text_otp">În schimb, trimite-mi un mesaj text cu un cod</string>
     <string name="enter_verification_code">Aproape gata! Te rog codul de verificare din aplicația ta Authenticator.</string>
-    <string name="open_mail">Deschide corespondența</string>
     <string name="next">Următor</string>
     <string name="enter_email_wordpress_com">Autentifică-te în WordPress.com folosind o adresă de email pentru a-ți administra toate siturile WordPress.</string>
     <string name="image_optimization_promo_desc">Optimizarea imaginilor micșorează imaginile pentru a le încărca mai rapid.\n\nPoți modifica asta oricând în setările sitului.</string>
@@ -1659,10 +1986,6 @@ Language: ro
     <string name="post_status_draft">Ciornă</string>
     <string name="post_status_pending_review">Revizie în așteptare</string>
     <string name="post_status_publish_post">Publică</string>
-    <string name="change_location">Schimbă locația</string>
-    <string name="remove_location">Înlătură locația</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Nu pot deschide selectorul de locație, serviciile Google Play nu sunt disponibile</string>
-    <string name="post_settings_location">Locație</string>
     <string name="now">Acum</string>
     <string name="post_settings_password_dialog_hint">Numai cei care au această parolă pot vedea acest articol</string>
     <string name="post_settings_excerpt_dialog_hint">Rezumatele sunt scurte expuneri manuale, opționale, ale conținutului tău.</string>
@@ -1894,20 +2217,16 @@ Language: ro
     <string name="invite_error_invalid_usernames_multiple">Nu pot trimite: există nume de utilizator sau emailuri invalide</string>
     <string name="invite_error_invalid_usernames_one">Nu pot trimite: un nume utilizator sau un email este invalid</string>
     <string name="invite_error_no_usernames">Te rog adaugă cel puțin un nume utilizator</string>
-    <string name="invite_message_info">(Opțional) Poți introduce un mesaj personalizat de până la 500 de caractere care va fi inclus în invitația utilizatorului/utilizatorilor.</string>
-    <string name="invite_message_remaining_other">%d caractere rămase</string>
-    <string name="invite_message_remaining_one">1 caracter rămas</string>
-    <string name="invite_message_remaining_zero">Niciun caracter rămas</string>
     <string name="invite_message_title">Mesaj personalizat</string>
     <string name="invite">Invită</string>
     <string name="invite_names_title">Nume de utilizatori sau emailuri</string>
     <string name="invite_people">Invită persoane</string>
     <string name="my_site_header_external">Extern</string>
-    <string name="send_link">Trimite legătura</string>
     <string name="label_clear_search_history">Șterge istoric căutări</string>
     <string name="dlg_confirm_clear_search_history">Ștergi istoricul căutărilor?</string>
     <string name="reader_empty_search_description">Nu s-a găsit niciun rezultat pentru %s în limba ta</string>
     <string name="reader_hint_post_search">Caută în WordPress</string>
+    <string name="reader_title_related_post_detail">Articole similare</string>
     <string name="preview_screen_links_disabled">Legăturile sunt dezactivate pe ecranul de previzualizare</string>
     <string name="send">Trimite</string>
     <string name="person_removed">%1$s înlăturat cu succes</string>
@@ -1926,7 +2245,6 @@ Language: ro
     <string name="checking_email">Verificarea emailului</string>
     <string name="magic_link_unavailable_error_message">În prezent indisponibilă. Te rog să-ți introduci parola</string>
     <string name="logging_in">Autentificare</string>
-    <string name="enter_your_password_instead">Introdu-ți parola în schimb</string>
     <string name="web_address_dialog_hint">Făcută publică atunci când comentezi.</string>
     <string name="capture_or_pick_photo">Selectează sau fă o fotografie</string>
     <string name="plans">Planuri</string>
@@ -2047,8 +2365,8 @@ Language: ro
     <string name="site_settings_paging_dialog_description">Împarte firele de comentarii în mai multe pagini.</string>
     <string name="site_settings_paging_dialog_header">Comentarii per pagină</string>
     <string name="site_settings_close_after_dialog_title">Închidere comentare</string>
-    <string name="site_settings_blacklist_description">Când un comentariu conține oricare dintre aceste cuvinte în conținutul său, în nume, URL, email sau IP, va fi marcat ca spam. Poți introduce cuvinte parțiale, așa că \"press\" se va potrivi și pentru \"WordPress\".</string>
-    <string name="site_settings_hold_for_moderation_description">Când un comentariu conține oricare dintre aceste cuvinte în conținutul său, în nume, URL, email sau IP, va fi reținut în coada de moderare. Poți introduce cuvinte parțiale, așa că \"press\" se va potrivi și pentru \"WordPress\".</string>
+    <string name="site_settings_denylist_description">Când un comentariu conține oricare dintre aceste cuvinte în conținutul său, în nume, URL, email sau IP, va fi marcat ca spam. Poți introduce cuvinte parțiale, așa că „press” se va potrivi și pentru „WordPress”.</string>
+    <string name="site_settings_hold_for_moderation_description">Când un comentariu conține oricare dintre aceste cuvinte în conținutul său, în nume, URL, email sau IP, va fi reținut în coada de moderare. Poți introduce cuvinte parțiale, așa că „press” se va potrivi și pentru „WordPress”.</string>
     <string name="site_settings_list_editor_input_hint">Introdu un cuvânt sau frază</string>
     <string name="site_settings_list_editor_no_items_text">Niciun element</string>
     <string name="site_settings_learn_more_caption">Poți suprascrie aceste setări pentru fiecare articol.</string>
@@ -2056,16 +2374,16 @@ Language: ro
     <string name="site_settings_rp_preview3_title">Focalizare actualizare: VideoPress pentru nunți</string>
     <string name="site_settings_rp_preview2_site">în „Aplicații”</string>
     <string name="site_settings_rp_preview2_title">Aplicația WordPress pentru Android a primit o mare actualizare a aspectului</string>
-    <string name="site_settings_rp_preview1_site">în \"Mobile\"</string>
+    <string name="site_settings_rp_preview1_site">în „Mobile”</string>
     <string name="site_settings_rp_preview1_title">Este disponibilă o importantă actualizare pentru iPhone/iPad</string>
     <string name="site_settings_rp_show_images_title">Arată imaginile</string>
     <string name="site_settings_rp_show_header_title">Arată antetul</string>
     <string name="site_settings_rp_switch_summary">Articole similare afișează conținut relevant de pe situl tău sub articolele tale.</string>
     <string name="site_settings_rp_switch_title">Arată articole similare</string>
-    <string name="site_settings_blacklist_hint">Comentariile care corespund unui filtru sunt marcate ca spam</string>
+    <string name="site_settings_denylist_hint">Comentariile care corespund unui filtru sunt marcate ca spam</string>
     <string name="site_settings_moderation_hold_hint">Comentariile care corespund unui filtru sunt puse în coada de moderare</string>
     <string name="site_settings_multiple_links_hint">Ignoră limita de legături pentru utilizatorii cunoscuți</string>
-    <string name="site_settings_whitelist_hint">Autorul comentariului trebuie să mai aibă un comentariu anterior aprobat</string>
+    <string name="site_settings_allowlist_hint">Autorul comentariului trebuie să aibă un comentariu aprobat anterior</string>
     <string name="site_settings_user_account_required_hint">Utilizatorul trebuie să fie înregistrat și autentificat pentru a comenta</string>
     <string name="site_settings_identity_required_hint">Autorul comentariului trebuie să completeze numele și emailul său</string>
     <string name="site_settings_paging_hint">Afișează comentariile în tranșe de o anumită mărime</string>
@@ -2088,17 +2406,16 @@ Language: ro
     <string name="site_settings_address_hint">Schimbarea adresei nu este încă suportată</string>
     <string name="site_settings_tagline_hint">O scurtă descriere sau o frază de impact pentru a descrie blogul tău</string>
     <string name="site_settings_title_hint">Explică, în câteva cuvinte, despre ce este acest sit</string>
-    <string name="site_settings_whitelist_known_summary">Comentarii de la utilizatori necunoscuți</string>
-    <string name="site_settings_whitelist_all_summary">Comentarii de la toți utilizatorii</string>
+    <string name="site_settings_allowlist_known_summary">Comentarii de la utilizatori cunoscuți</string>
+    <string name="site_settings_allowlist_all_summary">Comentarii de la toți utilizatorii</string>
     <string name="site_settings_threading_summary">%d nivele</string>
     <string name="site_settings_privacy_private_summary">Privat</string>
     <string name="site_settings_privacy_hidden_summary">Ascuns</string>
     <string name="site_settings_privacy_public_summary">Public</string>
     <string name="site_settings_delete_site_title">Șterge situl</string>
-    <string name="site_settings_blacklist_title">Lista neagră</string>
     <string name="site_settings_moderation_hold_title">Reținere pentru moderare</string>
     <string name="site_settings_multiple_links_title">Legături în comentarii</string>
-    <string name="site_settings_whitelist_title">Aprobare automată</string>
+    <string name="site_settings_allowlist_title">Aprobă automat</string>
     <string name="site_settings_paging_title">Paginare</string>
     <string name="site_settings_threading_title">Fire de discuție</string>
     <string name="site_settings_sort_by_title">Sortează după</string>
@@ -2211,7 +2528,7 @@ Language: ro
     <string name="me_btn_login_logout">Autentificare/Deautentificare</string>
     <string name="me_btn_support">Ajutor și suport</string>
     <string name="account_settings">Setări cont</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" n-a fost ascuns pentru că este situl curent</string>
+    <string name="site_picker_cant_hide_current_site">„%s” n-a fost ascuns pentru că este situl curent</string>
     <string name="site_picker_create_wpcom">Creează un sit WordPress.com</string>
     <string name="site_picker_add_self_hosted">Adaugă sit auto-găzduit</string>
     <string name="site_picker_add_site">Adaugă sit nou</string>
@@ -2247,7 +2564,6 @@ Language: ro
     <string name="logs_copied_to_clipboard">Jurnalele aplicației au fost copiate în clipbord</string>
     <string name="reader_empty_posts_in_blog">Acest sit este gol</string>
     <string name="reader_label_new_posts">Articole noi</string>
-    <string name="reader_page_recommended_blogs">Situri care s-ar putea să-ți placă</string>
     <string name="error_copy_to_clipboard">A apărut o eroare în timp ce copiam textul în clipbord</string>
     <string name="post_uploading">Încarc articolul</string>
     <string name="stats_followers_years">%1$d ani</string>
@@ -2273,7 +2589,7 @@ Language: ro
     <string name="themes_fetching">Se aduc teme…</string>
     <string name="ssl_certificate_details">Detalii</string>
     <string name="cab_selected">%d selectate</string>
-    <string name="browse_our_faq_button">Răsfoiește Î&amp;R noastre</string>
+    <string name="browse_our_faq_button">Răsfoiește întrebările noastre frecvente</string>
     <string name="reader_empty_comments">Niciun comentariu încă</string>
     <string name="reader_empty_posts_in_tag">Niciun articol cu acest subiect</string>
     <string name="reader_label_like">Apreciere</string>
@@ -2312,7 +2628,6 @@ Language: ro
     <string name="reader_title_blog_preview">Sit Cititor</string>
     <string name="ssl_certificate_ask_trust">Dacă în mod uzual te conectezi fără probleme la acest sit, această eroare poate să însemne că cineva încearcă să se substituie sitului și n-ar trebui să mai continui. Preferi să te încrezi în certificat oricum?</string>
     <string name="ssl_certificate_error">Certificat SSL invalid</string>
-    <string name="forgot_password">Ai uitat parola?</string>
     <string name="help">Ajutor</string>
     <string name="username_or_password_incorrect">Numele de utilizator sau parola introduse de tine sunt incorecte</string>
     <string name="email_invalid">Introdu o adresă de email validă</string>
@@ -2378,7 +2693,7 @@ Language: ro
     <string name="comment_status_approved">Aprobat</string>
     <string name="delete_page">Ștergi pagina?</string>
     <string name="delete_post">Ștergi articolul?</string>
-    <string name="post_settings">Setări articol</string>
+    <string name="post_settings">Setări articole</string>
     <string name="file_not_found">Nu am putut găsit fișierul pentru încărcare. A fost șters sau mutat?</string>
     <string name="local_draft">Ciornă locală</string>
     <string name="page_settings">Setări pagină</string>
@@ -2392,7 +2707,7 @@ Language: ro
     <string name="cancel_edit">Abandonează editarea</string>
     <string name="connection_error">Eroare de conectare</string>
     <string name="select_categories">Selectează categoriile</string>
-    <string name="share_link">Partajare legătură</string>
+    <string name="share_link">Partajează legătura</string>
     <string name="reader_empty_posts_in_tag_updating">Se aduc articole…</string>
     <string name="reader_likes_you_and_multi">Tu și alții %,d apreciați asta</string>
     <string name="reader_likes_multi">%,d persoane apreciază asta</string>
@@ -2449,7 +2764,7 @@ Language: ro
     <string name="follows">Urmăriri</string>
     <string name="note_reply_successful">Răspuns publicat</string>
     <string name="sign_in">Autentificare</string>
-    <string name="loading">Se încarcă…</string>
+    <string name="loading">Încarc…</string>
     <string name="httppassword">parolă HTTP</string>
     <string name="httpuser">nume utilizator HTTP</string>
     <string name="error_media_upload">A apărut o eroare la încărcarea media</string>
diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml
index 250a42003251..5b1be6ce84c6 100644
--- a/WordPress/src/main/res/values-ru/strings.xml
+++ b/WordPress/src/main/res/values-ru/strings.xml
@@ -1,474 +1,864 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-19 18:27:42+0000
+Translation-Revision-Date: 2021-05-19 04:50:36+0000
 Plural-Forms: nplurals=3; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: ru
 -->
 <resources>
-    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' полностью не поддерживается</string>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Нажмите дважды для добавления ссылки.</string>
+    <string name="gutenberg_native_add_link">ДОБАВИТЬ ССЫЛКУ</string>
+    <string name="login_empty_view_try_another_account">Использовать другую учётную запись</string>
+    <string name="login_empty_view_see_instructions">См. инструкции</string>
+    <string name="login_no_jetpack_sites_error_message">Если у вас уже есть сайт, вам необходимо установить бесплатный плагин Jetpack и подключить его к вашей учетной записи WordPress.com.</string>
+    <string name="login_empty_view_avatar_content_description">Фотография вашего профиля</string>
+    <string name="login_not_a_jetpack_site">Чтобы использовать это приложение для %1$s, нужно установить и настроить плагин Jetpack и подключить его к учетной записи WordPress.com</string>
+    <string name="gutenberg_native_size">Размер</string>
+    <string name="gutenberg_native_move_image_forward">Переместить изображение вперёд</string>
+    <string name="gutenberg_native_move_image_backward">Переместить изображение назад</string>
+    <string name="gutenberg_native_image_settings">Настройки изображения</string>
+    <string name="gutenberg_native_audio_settings">Настройки аудио</string>
+    <string name="user_profile_untitled_site">(Без названия)</string>
+    <string name="user_profile_site_section_header">Сайт</string>
+    <string name="user_profile_bottom_sheet_description">Нижняя часть информации профиля пользователя</string>
+    <string name="likes_list_screen_title">Отметки \"нравится\" %s</string>
+    <string name="gutenberg_native_write_code">Введите код…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Сортировка и фильтрация</string>
+    <string name="gutenberg_native_show_download_button">Показать кнопку скачивания</string>
+    <string name="gutenberg_native_shortcode">Шорткод</string>
+    <string name="gutenberg_native_read_more">Читать далее</string>
+    <string name="gutenberg_native_preload">Предварительная загрузка</string>
+    <string name="gutenberg_native_post_meta_settings">Настройки метаданных записи</string>
+    <string name="gutenberg_native_post_content_settings">Настройки содержимого записи</string>
+    <string name="gutenberg_native_metadata">Метаданные</string>
+    <string name="gutenberg_native_media_file">Медиафайл</string>
+    <string name="gutenberg_native_media_area">Область мультимедиа</string>
+    <string name="gutenberg_native_loop">Цикл</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Ссылка на</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">изображение %1$d из %2$d в галерее</string>
+    <string name="gutenberg_native_heading_d">Заголовок %d</string>
+    <string name="gutenberg_native_featured">Избранное</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Укажите URL для вставки…</string>
+    <string name="gutenberg_native_edit_image">Редактировать изображение</string>
+    <string name="gutenberg_native_display_post_date">Отображать дату публикации</string>
+    <string name="gutenberg_native_code">Код</string>
+    <string name="gutenberg_native_change_heading_level">Изменение уровня заголовка</string>
+    <string name="gutenberg_native_browser_default">Браузер по умолчанию</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Блок удален или недоступен.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Блок не может быть отображен внутри себя же.</string>
+    <string name="gutenberg_native_autoplay">Автовоспроизведение</string>
+    <string name="gutenberg_native_auto">Авто</string>
+    <string name="gutenberg_native_attachment_page">Страница вложения</string>
+    <string name="gutenberg_native_add_text">Добавить текст…</string>
+    <string name="gutenberg_native_add_caption">Добавить подпись</string>
+    <string name="login_no_jetpack_sites">Нет сайтов с Jetpack</string>
+    <string name="gutenberg_native_what_is_alt_text">Что такое текст alt?</string>
+    <string name="gutenberg_native_transform_s_to">Преобразовать %s в</string>
+    <string name="gutenberg_native_transform_block">Преобразовать блок…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Не удалось вставить медиафайл.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Не удалось вставить аудиофайл.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Опишите назначение изображения. Оставьте пустым, если изображение является только элементом декора.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">Блок %1$s преобразован в %2$s</string>
+    <string name="like_faces_error_loading_message">Ошибка загрузки данных отметок \"нравится\". %s</string>
+    <string name="like_faces_plural_text">Это нравится блогерам: %d.</string>
+    <string name="like_faces_singular_text">Одному блогеру это нравится.</string>
+    <string name="like_title_plural">%d отметок \"нравится\"</string>
+    <string name="like_title_singular">Нравится 1 пользователю</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Введите данные для входа на сервер для исправления угроз.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Введите данные для входа на сервер для исправления угрозы.</string>
+    <string name="suggestion">Предложение:</string>
+    <string name="gutenberg_native_search_blocks">Блоки поиска</string>
+    <string name="gutenberg_native_search_block">Блок поиска</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">Нажмите дважды для смены единиц</string>
+    <string name="gutenberg_native_clear_search">Очистить поиск</string>
+    <string name="gutenberg_native_cancel_search">Отменить поиск</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s - %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">При получении данных отметок \"нравится\" произошла ошибка.</string>
+    <string name="get_likes_unknown_error">При получении отметок \"нравится\" произошла неизвестная ошибка. </string>
+    <string name="get_likes_no_network_error">Сеть недоступна.</string>
+    <string name="comments_empty_list_filtered_unreplied">Нет комментариев без ответа</string>
+    <string name="comment_status_unreplied">Без ответов</string>
+    <string name="gutenberg_native_table_of_contents">Оглавление</string>
+    <string name="gutenberg_native_summary">итог</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Завершите вашу запись списком заголовков, добавьте HTML-якоря к блокам заголовков, чтобы создать ссылки на них здесь.</string>
+    <string name="gutenberg_native_document_outline">структура документа</string>
+    <string name="gutenberg_native_buttongroup">Группа кнопок</string>
+    <string name="jetpack_brute_force_allowlist_title">Белый список IP</string>
+    <string name="site_settings_denylist_title">Запрещённые комментарии</string>
+    <string name="reader_title_interests">Подписаться на темы</string>
+    <string name="stories_intro_main_subtitle">Новый способ создавать и публиковать захватывающее содержимое на вашем сайте.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Скрыть</string>
+    <string name="activity_log_backup_download_notice_download_action">Скачать</string>
+    <string name="threat_fix_all_status_success_message_plural">Угрозы были успешно устранены.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Подтвердите исправление всех %s активных угроз.</string>
+    <string name="scan_idle_threats_description_plural">Проверка обнаружила %1$s возможные угрозы с %2$s. Посмотрите подробности ниже и предпримите действие по устранению, или нажмите кнопку Исправить всё. Мы %3$s, если требуется.</string>
+    <string name="scan_fixing_threats_description_plural">Мы сейчас стараемся исправить эти угрозы в фоновом режиме, вы можете продолжать использовать ваш сайт как обычно, проверить состояние вы сможете в любое время.</string>
+    <string name="gutenberg_native_edit_focal_point">Изменить точку фокусировки</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Нажмите дважды, чтобы открыть нижний список действий для редактирования, замены или очистки изображения.</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Нажмите дважды, чтобы открыть список действий для редактирования, замены или очистки изображения.</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Выберите название для вашего сайта.</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Все задачи выполнены&lt;/b&gt;&lt;br/&gt; Вы привлечёте больше посетителей. Хорошая работа!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Все задачи выполнены&lt;/b&gt;&lt;br/&gt;Вы персонализировали ваш сайт. Отлично!</string>
+    <string name="quick_start_card_menu_hide">Временно скрыть</string>
+    <string name="magic_link_not_meaning_to_create_account">Не планировали создание новой учётной записи? Перейдите назад и введите ваш адрес email.</string>
+    <string name="invite_links_disable_dialog_message">Если эта ссылка для приглашения будет отключена, никто не сможет использовать её для присоединения к вашей команде. Вы уверены в этом?</string>
+    <string name="invite_links_disable_dialog_title">Отключить пригласительную ссылку</string>
+    <string name="invite_links_bad_format_response">Получен неверный ответ</string>
+    <string name="invite_links_null_response">Ответ не получен</string>
+    <string name="invite_links_cannot_get_role_data_error">При получении данных для роли %1$s произошла ошибка</string>
+    <string name="invite_links_cannot_get_roles_error">При получении ролей произошла ошибка</string>
+    <string name="invite_links_generic_get_data_error">Неизвестная ошибка при получении данных пригласительных ссылок</string>
+    <string name="invite_links_helper_text">Используйте эту ссылку, чтобы подключить членов вашей команды, не приглашая их по одному. Любой, кто посетит этот URL-адрес, сможет зарегистрироваться в вашей организации, даже если получит ссылку от кого-то другого, поэтому убедитесь, что вы делитесь ею с доверенными людьми.</string>
+    <string name="invite_links_expire_date">Действует до %1$s</string>
+    <string name="invite_links_disable_invite_link">Отключить пригласительную ссылку</string>
+    <string name="invite_links_share_invite_link">Поделиться ссылкой приглашения</string>
+    <string name="invite_links_generate">Сгенерировать новую ссылку</string>
+    <string name="invite_links_get_status_retry">Обновить состояние ссылки</string>
+    <string name="invite_links_section_title">Пригласительная ссылка</string>
+    <string name="threats_found_singular">Обнаружена угроза</string>
+    <string name="threats_found_plural">Обнаружены угрозы</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Проверка завершена&lt;/b&gt; &lt;br&gt;&lt;/br&gt; Обнаружено возможных угроз - %s</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Проверка завершена&lt;/b&gt; &lt;br&gt;&lt;/br&gt; Найдена одна возможная угроза</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Проверка завершена&lt;/b&gt; &lt;br&gt;&lt;/br&gt; Угроз не найдено</string>
+    <string name="scan_fixing_threats_title_singular">Устранение угрозы</string>
+    <string name="disable">Отключить</string>
+    <string name="quick_start_card_menu_unpin">Открепить</string>
+    <string name="quick_start_list_review_pages_subtitle">Просмотрите ваши страницы, внесите изменение или добавьте/удалите страницы.</string>
+    <string name="quick_start_list_view_site_title">Перейдите на свой сайт</string>
+    <string name="quick_start_list_upload_icon_subtitle">Добавьте значок сайта, чтобы сайт выглядел качественно и профессионально.</string>
+    <string name="quick_start_list_follow_site_subtitle">Находите и подписывайтесь на сайты вдохновляющие вас.</string>
+    <string name="quick_start_list_enable_sharing_title">Включить возможности поделиться</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Автоматически делитесь вашими новыми записями в социальных сетях.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Задайте вашему сайту название отражающее его суть и тематику.</string>
+    <string name="quick_start_list_check_stats_title">Посмотрите статистику сайта</string>
+    <string name="backup_download_status_failure_bullet2">Мы всё еще пытаемся создать файл скачиваемой резервной копии.</string>
+    <string name="backup_download_status_failure_bullet1">Мы пока не можем оценить как долго займет создание резервной копии сайта.</string>
+    <string name="backup_download_status_failure_heading">Хм, не удается получить статус создания скачиваемой резервной копии</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Значок галочки</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Значок часов</string>
+    <string name="restore_status_failure_bullet3">Мы уведомим вас по завершении.</string>
+    <string name="restore_status_failure_bullet2">Мы всё еще пытаемся восстановить ваш сайт.</string>
+    <string name="restore_status_failure_bullet1">Мы пока не можем оценить как долго займет восстановление сайта.</string>
+    <string name="restore_status_failure_heading">Хм, не удается получить состояние восстановления</string>
+    <string name="restore_complete_failed_description">Не удалось восстановить ваш сайт</string>
+    <string name="restore_warning_action_button">Подтвердить</string>
+    <string name="restore_warning_description_with_two_parameters">Вы уверены, что хотите восстановить ваш сайт на %1$s в %2$s?\nВсе изменения после этой даты будут потеряны.</string>
+    <string name="backup_download_complete_failed_description">Не удалось создать резервную копию</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(исключает темы, плагины и загруженные файлы)</string>
+    <string name="backup_item_contents">Папка wp-content</string>
+    <string name="backup_item_roots">Корневая папка WordPress</string>
+    <string name="backup_download_details_choose_items_header">Элементы включенные для скачивания</string>
+    <string name="gutenberg_native_uploading">Загрузка…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">\"Мои блоки\" нельзя редактировать в приложении WordPress для iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">\"Мои блоки\" нельзя редактировать в приложении WordPress для Android</string>
+    <string name="gutenberg_native_replace_file">Заменить файл</string>
+    <string name="gutenberg_native_replace_audio">Заменить аудиофайл</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Проблема с открытием аудио</string>
+    <string name="gutenberg_native_open">ОТКРЫТЬ</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Нет зарегистрированного приложения для обработки этого запроса.</string>
+    <string name="gutenberg_native_lock_icon">Значок блокировки</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Невозможно вставить аудиозапись. Нажмите для выбора вариантов.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Нажмите дважды для выбора аудиозаписи</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Нажмите дважды для прослушивания аудиозаписи</string>
+    <string name="gutenberg_native_choose_audio">Выберите аудиозапись</string>
+    <string name="gutenberg_native_audio_player">Аудиоплеер</string>
+    <string name="gutenberg_native_audio_file">Аудио файл</string>
+    <string name="gutenberg_native_audio_caption_s">Подпись к аудиозаписи. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Подпись к аудиозаписи. Пустая</string>
+    <string name="gutenberg_native_add_audio">ДОБАВИТЬ АУДИО</string>
+    <string name="continue_with_wpcom">Войти или зарегистрироваться с WordPress.com</string>
+    <string name="photo_picker_use_audio">Использовать эту аудиозапись</string>
+    <string name="photo_picker_choose_audio">Выберите аудиозапись с устройства</string>
+    <string name="people_optional_custom_message_helper_text">Введите сообщение, которое будет отправлено вместе с приглашением (не обязательно).</string>
+    <string name="people_learn_more_about_roles">Подробнее о ролях</string>
+    <string name="threat_status_fixed">Исправлено</string>
+    <string name="threat_found_header">Обнаружено</string>
+    <string name="scan_here_to_help">готовы помочь вам</string>
+    <string name="scan_idle_threats_description_singular">Проверка обнаружила одну возможную угрозу с %1$s. Посмотрите подробности ниже и предпримите действие по устранению, или нажмите кнопку Исправить всё. Мы %2$s, если требуется.</string>
+    <string name="scan_idle_manual_scan_description">Для повторного обзора запустите проверку вручную или подождите результатов следующей проверки Jetpack сегодня.</string>
+    <string name="scan_provisioning_description">Вас приветствует Jetpack Scan! Сейчас мы анализируем ваш сайт для проведения полного сканирования. Мы обязательно сообщим вам, если обнаружим потенциальные проблемы. После этого начнётся первое полное сканирование.</string>
+    <string name="scan_scanning_is_initial_description">Добро пожаловать в Jetpack Scan! Мы изучаем ваш сайт и скоро поделимся с вами результатами.</string>
+    <string name="scan_fixing_threats_description_singular">Мы сейчас стараемся исправить эти угрозы в фоновом режиме, вы можете продолжать использовать ваш сайт как обычно, проверить состояние вы сможете в любое время.</string>
+    <string name="scan_scanning_description">Мы пришлем уведомление после завершения сканирования. Вы можете продолжать работать со своим сайтом как обычно — прогресс сканирования можно проверить в любое удобное время. </string>
+    <string name="scan_fixing_threats_title_plural">Устранение угроз</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan не удалось завершить проверку вашего сайта. Пожалуйста, проверьте, доступен ли ваш сайт в принципе. Если всё в порядке, то повторите попытку. Если нет, а также если Jetpack Scan по-прежнему не работает, обратитесь в службу поддержки.</string>
+    <string name="scan_request_failed_title">Что-то пошло не так</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Резервное копирование сайта</string>
+    <string name="activity_log_currently_backing_up_message">Создание резервной копии сайта из %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Создание резервной копии для скачивания</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Резервная копия вашего сайта создана</string>
+    <string name="activity_log_backup_finished_snackbar_message">Резервная копия вашего сайта создана\nРезервная копия от %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Создание резервной копии сайта\nРезервное копирование из %1$s %2$s</string>
+    <string name="pick_audio">Выбор аудио</string>
+    <string name="restore_another_process_running">Сейчас запущен другой процесс восстановления.</string>
+    <string name="restore_complete_failed_icon_content_description">Значок ошибки</string>
+    <string name="restore_complete_failed_action_button_content_description">Кнопка \"готово\"</string>
+    <string name="restore_complete_failed_title">Не удалось восстановить</string>
+    <string name="restore_complete_visit_site_button_content_description">Кнопка перехода на сайт</string>
+    <string name="restore_complete_done_button_content_description">Кнопка \"готово\"</string>
+    <string name="restore_complete_icon_content_description">Значок восстановления</string>
+    <string name="restore_complete_visit_site_action_button">Перейти на сайт</string>
+    <string name="restore_complete_description_with_two_parameters">Все выбранные элементы восстановлены на %1$s %2$s.</string>
+    <string name="restore_complete_header">Ваш сайт был восстановлен</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">Не обязательно ждать. Мы уведомим вас по окончании восстановления сайта.</string>
+    <string name="restore_progress_icon_content_description">Значок восстановления сайта</string>
+    <string name="restore_progress_description_with_two_parameters">Выполняется откат к состоянию сайта на %1$s %2$s.</string>
+    <string name="restore_progress_header">Идёт восстановление сайта</string>
+    <string name="restore_warning_action_button_content_description">Кнопка подтверждения восстановления</string>
+    <string name="restore_warning_icon_content_description">Изображение красного круга с восклицательным знаком</string>
+    <string name="restore_warning_header">Предупреждение</string>
+    <string name="restore_details_action_button_content_description">Кнопка восстановления сайта</string>
+    <string name="restore_details_icon_content_description">Значок восстановления</string>
+    <string name="restore_details_action_button">Восстановление сайта</string>
+    <string name="restore_details_description_with_two_parameters"> %1$s %2$s — выбранная точка для восстановления сайта.</string>
+    <string name="restore_details_header">Восстановление сайта</string>
+    <string name="restore_details_choose_items_header">Выбор элементов для восстановления</string>
+    <string name="restore">Восстановление</string>
+    <string name="backup_download_complete_failed_icon_content_description">Облако с значком Х</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Кнопка \"готово\"</string>
+    <string name="backup_download_complete_failed_action_button">Готово</string>
+    <string name="backup_download_complete_failed_title">Загрузка не удалась.</string>
+    <string name="web_preview_tablet">Планшет</string>
+    <string name="web_preview_mobile">Мобильное устройство</string>
+    <string name="quick_start_card_menu_remove">Не показывать снова</string>
+    <string name="quick_start_card_menu_pin">Прикрепить</string>
+    <string name="quick_start_dialog_review_pages_message_short">Выберите %1$s страницы %2$s для просмотра списка страниц.</string>
+    <string name="quick_start_dialog_review_pages_message">Изменить, добавить или удалить страницы вашего сайта.</string>
+    <string name="quick_start_dialog_review_pages_title">Обзор страниц сайта</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Выберите %1$s Главная страница %2$s для редактирования главной страницы.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Выберите %1$s страницы %2$s для просмотра списка страниц.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Изменить, добавить или удалить содержимое главной страницы сайта.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Редактировать главную страницу</string>
+    <string name="reader_menu_mark_as_unseen">Отметить как непрочитанное</string>
+    <string name="reader_menu_mark_as_seen">Отметить как прочитанное</string>
+    <string name="error_media_upload_failed_for_reason">Загрузка медиафайла не удалась.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Недостаточно места для данных на вашем сайте</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Не удается изменить статус прочтения для этой записи</string>
+    <string name="reader_marked_post_as_unseen">Запись отмечена как непрочитанная</string>
+    <string name="reader_marked_post_as_seen">Запись отмечена как прочитанная</string>
+    <string name="threat_fix_all_status_error_message">Ошибка получения статуса исправлений. Обратитесь в  службу поддержки.</string>
+    <string name="threat_fix_all_status_success_message_singular">Угрозы были успешно устранены.</string>
+    <string name="threat_fix_all_error_message">Ошибка устранения угроз. Обратитесь в  службу поддержки.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Подтвердите исправление активной угрозы.</string>
+    <string name="threat_fix_all_warning_title">Устранить все угрозы</string>
+    <string name="threat_ignore_error_message">Ошибка при игнорировании угрозы. Обратитесь в службу поддержки.</string>
+    <string name="threat_ignore_success_message">Угроза проигнорирована.</string>
+    <string name="threat_ignore_warning">Не игнорируйте предупреждения, если полностью не уверены в том, что опасности нет. Если пропустить угрозу, она останется на вашем сайте &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Ошибка при устранении угрозы. Обратитесь в службу поддержки.</string>
+    <string name="threat_item_sub_header_status_ignored">Угроза проигнорирована</string>
+    <string name="threat_item_sub_header_status_fixed_on">Угроза устранена для %s</string>
+    <string name="threat_fixing">Устранение угрозы…</string>
+    <string name="scan_history_ignored_threats_tab">Проигнорировано</string>
+    <string name="scan_history_no_threats_found">Элементов не найдено.</string>
+    <string name="scan_history_fixed_threats_tab">Исправлено</string>
+    <string name="scan_history_all_threats_tab">Все</string>
+    <string name="scan_scanning_title">Проверка файлов</string>
+    <string name="scan_preparing_to_scan_title">Подготовка проверки</string>
+    <string name="scan_history_menu_title">История</string>
+    <string name="scan_history">История проверок</string>
+    <string name="backup_active_filter_empty_subtitle">Попробуйте задать иной диапазон дат</string>
+    <string name="backup_active_filter_empty_title">Подходящих резервных копий не найдено</string>
+    <string name="backup_empty_subtitle">Ваша первая резервная копия появится здесь в течение 24 часов. Вы получите уведомление, когда резервная копия будет готова.</string>
+    <string name="backup_empty_title">Ваша первая резервная копия скоро будет готова</string>
+    <string name="request_failed_message">При выполнении запроса возникла проблема. Повторите попытку позже.</string>
+    <string name="gutenberg_native_move_to_bottom">Сдвинуть вниз</string>
+    <string name="gutenberg_native_change_block_position">Переместить блок</string>
+    <string name="label_control_upload">Загрузка</string>
+    <string name="jetpack_icon_content_description">значок</string>
+    <string name="backup_download_complete_info">Мы также отправили вам ссылку на файл по email.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Кнопка поделиться ссылкой</string>
+    <string name="backup_download_complete_download_action_button_content_description">Кнопка «Скачать»</string>
+    <string name="backup_download_complete_icon_content_description">Значок готовой к скачиванию резервной копии</string>
+    <string name="backup_download_complete_download_share_action_button">Поделиться ссылкой</string>
+    <string name="backup_download_complete_download_action_button">Скачать</string>
+    <string name="backup_download_complete_description_with_two_parameters">Резервная копия вашего сайта на %1$s %2$s создана.</string>
+    <string name="backup_download_complete_header">Резервная копия доступна для скачивания</string>
+    <string name="backup_download_complete_page_title">Резервная копия</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Не обязательно ждать. Мы уведомим вас о готовности резервной копии</string>
+    <string name="backup_download_progress_icon_content_description">Создание значка скачиваемой резервной копии</string>
+    <string name="backup_download_progress_description_with_two_parameters">Создается резервная копия вашего сайта на %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Идёт создание скачиваемой резервной копии вашего сайта</string>
+    <string name="backup_download_progress_page_title">Скачать резервную копию</string>
+    <string name="backup_download_another_download_running">Сейчас активно другое скачивание.</string>
+    <string name="backup_download_generic_failure">При выполнении запроса возникла проблема. Повторите попытку позже.</string>
+    <string name="backup_download_details_action_button_content_description">Кнопка создания скачиваемой резервной копии</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s - выбранная точка создания резервной копии для скачивания.</string>
+    <string name="gutenberg_native_image_link_url">Ссылка изображения</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">кросспост</string>
+    <string name="suggestion_user">пользователь</string>
+    <string name="suggestion_no_matching">Нет подходящих %s.</string>
+    <string name="suggestion_problem">Ошибка загрузки предложений.</string>
+    <string name="suggestion_none">Нет предложения для %s.</string>
+    <string name="suggestion_selection_needed">Введите что-либо для использования фильтра предложений.</string>
+    <string name="threat_get_free_estimate">Получить оценку</string>
+    <string name="threat_ignore">Игнорировать угрозу</string>
+    <string name="threat_fix">Устранить угрозу</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan устранит угрозу.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan изменит затронутый файл или папку.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan обновится до последней версии (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan удалит затронутый файл или папку.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan заменит затронутый файл или папку.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan не может автоматически устранить эту угрозу.\nМы предлагаем вам устранить угрозу вручную: убедитесь, что WordPress, ваша тема и все ваши плагины обновлены, и удалите вредоносный код, тему или плагин со своего сайта.\n\n\nЕсли вам нужна дополнительная помощь в устранении этой угрозы, мы рекомендуем &lt;b&gt;Codeable&lt;/b&gt;, надежную торговую площадку для фрилансеров, состоящую из проверенных экспертов WordPress.\nОни определили избранную группу экспертов по безопасности для помощи в этих проектах. Цены варьируются от 70 до 120 долларов в час, и вы можете получить бесплатную оценку без каких-либо обязательств по найму.</string>
+    <string name="threat_fix_current_not_fixable_header">Устранение угрозы</string>
+    <string name="threat_fix_fixed_header">Как Jetpack исправил это?</string>
+    <string name="threat_fix_default_header">Как мы это исправим?</string>
+    <string name="threat_file_description">Угроза обнаружена в файле:</string>
+    <string name="threat_technical_details_header">Технические сведения</string>
+    <string name="threat_problem_header">В чем была проблема?</string>
+    <string name="threat_details">Подробности об угрозе</string>
+    <string name="threat_item_sub_header_vulnerable_theme">В теме обнаружена уязвимость</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">В плагине обнаружена уязвимость</string>
+    <string name="threat_item_sub_header_file_signature">Обнаружена угроза %s</string>
+    <string name="threat_item_sub_header_core_file">В WordPress обнаружена уязвимость</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Прочие уязвимости</string>
+    <string name="threat_item_header_vulnerable_theme">Уязвимая тема: %s (версия %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Уязвимый плагин: %s (версия %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: шаблон вредоносного кода</string>
+    <string name="threat_item_header_database_threat">Угроза базы данных %s</string>
+    <string name="threat_item_header_infected_core_file">%s: заражены файлы ядра</string>
+    <string name="threat_item_header_threat_found">Обнаружена угроза</string>
+    <string name="threats_fix_all">Устранить все</string>
+    <string name="scan_in_few_seconds">несколько секунд назад</string>
+    <string name="scan_in_minutes_ago">%s минут(ы) назад</string>
+    <string name="scan_in_hours_ago">%s час(-a,-ов) назад</string>
+    <string name="scan_this_site">этот сайт</string>
+    <string name="scan_idle_last_scan_description">Последняя проверка Jetpack была %s и всё выглядело замечательно, %s</string>
+    <string name="scan_idle_threats_found_title">Ваш сайт может быть под угрозой</string>
+    <string name="scan_idle_no_threats_found_title">Ни о чем не волнуйтесь</string>
+    <string name="scan_again">Повтор проверки</string>
+    <string name="scan_now">Проверить сейчас</string>
+    <string name="scan_state_icon">Значок состояния проверки</string>
+    <string name="backup">Резервные копии</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Фильтр типа активности (выбрано %s типов)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (показ %s элементов)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Фильтр типа активности</string>
+    <string name="activity_log_activity_type_empty_subtitle">Нет зарегистрированных действий в выбранном диапазоне дат.</string>
+    <string name="activity_log_activity_type_empty_title">Пока нет активности</string>
+    <string name="activity_log_activity_type_error_subtitle">Проверьте подключение к Интернету и повторите попытку.</string>
+    <string name="activity_log_activity_type_error_title">Нет подключения</string>
+    <string name="activity_log_activity_type_filter_active_label">Тип активности (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Фильтр диапазона дат</string>
+    <string name="activity_log_active_filter_empty_subtitle">Попробуйте настроить диапазон дат или фильтры по типу активности</string>
+    <string name="activity_log_active_filter_empty_title">Соответствующие события не найдены</string>
+    <string name="backup_item_sqls">База данных сайта (SQL)</string>
+    <string name="backup_item_roots_hint">(включая wp-config.php и любые файлы, не относящиеся к WordPress)</string>
+    <string name="backup_item_media_uploads">Загруженные медиафайлы</string>
+    <string name="backup_item_plugins">Плагины WordPress</string>
+    <string name="backup_item_themes">Темы WordPress</string>
+    <string name="backup_download_details_icon_content_description">Создание значка скачиваемой резервной копии</string>
+    <string name="backup_download_details_action_button">Создать скачиваемый файл</string>
+    <string name="backup_download_details_header">Создать резервную копию для скачивания</string>
+    <string name="backup_download_details_page_title">Скачать резервную копию</string>
+    <string name="backup_download">Скачивание резервной копии</string>
+    <string name="gutenberg_native_error">Ошибка</string>
+    <string name="gutenberg_native_choose_file">Выбрать файл</string>
+    <string name="activity_log_item_menu_download_backup_label">Скачать резервную копию</string>
+    <string name="activity_log_item_menu_restore_label">Восстановить до этой точки</string>
+    <string name="activity_log_activity_type_filter_label">Тип активности</string>
+    <string name="activity_log_date_range_filter_label">Период</string>
+    <string name="activity_log_activity_type_filter_header">Отфильтровать по типу активности</string>
+    <string name="dialog_confirm_copy_local_copy_button">Взять версию из этого приложения</string>
+    <string name="dialog_confirm_copy_local_edit_button">Сначала отредактируйте запись</string>
+    <string name="dialog_confirm_copy_local_message">Запись, которую вы пытаетесь скопировать имеет две конфликтующие версии или вы недавно внесли, но не сохранили изменения.\nОтредактируйте запись и решите конфликты или скопируйте версию из этого приложения.</string>
+    <string name="dialog_confirm_copy_local_title">Конфликт синхронизации записей</string>
+    <string name="button_copy">Дублировать</string>
+    <string name="toast_edit_story_update_in_progress_title">История сохраняется, подождите…</string>
+    <string name="gutenberg_native_file_name">Имя файла</string>
+    <string name="gutenberg_native_file_block_settings">Настройки блока файла</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Невозможно загрузить файлы.\nНажмите для выбора вариантов.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Невозможно сохранить файлы.\nНажмите для выбора вариантов.</string>
+    <string name="gutenberg_native_edit_file">Редактировать файл</string>
+    <string name="gutenberg_native_copy_file_url">Скопировать URL файла</string>
+    <string name="gutenberg_native_choose_a_file">ВЫБРАТЬ ФАЙЛ</string>
+    <string name="new_site_creation_domain_header_title">Выбрать домен</string>
+    <string name="my_site_btn_jetpack_settings">Настройки Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Вы подписаны на беседу по email</string>
+    <string name="reader_btn_follow_comments">Подписаться на эту беседу по email</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Невозможно отписаться от комментариев для этой записи</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Невозможно подписаться на комментарии для этой записи</string>
+    <string name="reader_follow_comments_get_status_error">Ошибка получения статуса подписки для записи</string>
+    <string name="reader_follow_comments_unsubscribe_success">Вы отписались от комментариев</string>
+    <string name="reader_follow_comments_subscribe_success">Вы подписались на комментарии</string>
+    <string name="reader_follow_comments_bad_format_response">Получен неверный ответ</string>
+    <string name="reader_follow_comments_null_response">Ответ не получен</string>
+    <string name="activity_log_activity_type_filter_clear">Очистить</string>
+    <string name="activity_log_activity_type_filter_apply">Применить</string>
+    <string name="dialog_edit_story_unsupported_format_message">К вашей истории не были добавлены один или несколько слайдов, на текущий момент истории не поддерживают GIF файлы. Выберите статическое изображение или видео для фона вместо GIF.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF файлы не поддерживаются</string>
+    <string name="dialog_edit_story_unrecoverable_message">Невозможно найти медиафайлы этой истории на сайте.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Нельзя отредактировать историю</string>
+    <string name="dialog_edit_story_unavailable_message">Невозможно загрузить медиафайлы этой истории. Проверьте ваше подключение к сети и попробуйте снова.</string>
+    <string name="dialog_edit_story_unavailable_title">Нельзя отредактировать историю</string>
+    <string name="dialog_edit_story_limited_message">Эта история редактировалась на другом устройстве. Возможности редактирования некоторых объектов могут быть ограничены.</string>
+    <string name="dialog_edit_story_limited_title">Ограниченное редактирование истории</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Медиафайл удалён. Попробуйте создать историю заново.</string>
+    <string name="color_picker_label_background">Фон</string>
+    <string name="color_picker_label_text">Текст</string>
+    <string name="dialog_discard_story_ok_button_edit">Отбросить</string>
+    <string name="dialog_discard_story_message_edit">Сделанные изменения не будут сохранены.</string>
+    <string name="dialog_discard_story_title_edit">Отменить изменения</string>
+    <string name="label_done_button">Готово</string>
+    <string name="label_next_button">Далее</string>
+    <string name="delete_button_alt">Удалить</string>
+    <string name="hpp_choose_error">При выборе оформления произошла ошибка.</string>
+    <string name="hpp_retry_error">Проверьте подключение к Интернету и повторите попытку.</string>
+    <string name="hpp_error_subtitle">Нажмите повторить при появлении подключения к сети.</string>
+    <string name="hpp_error_title">Макеты недоступны при отсутствии подключения к сети</string>
+    <string name="continue_site_credentials">Продолжить с учетными данными магазина</string>
+    <string name="login_find_your_connected_email">Узнать адрес привязанной эл. почты</string>
+    <string name="reader_discover_no_posts_button_text">Подписаться на темы</string>
+    <string name="reader_discover_no_posts_subtitle">Для расширения поиска попробуйте подписаться на больше тем</string>
+    <string name="reader_discover_no_posts_title">Нет свежих записей</string>
+    <string name="reader_discover_empty_title">Добро пожаловать!</string>
+    <string name="scan">Сканировать</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Вася Пупкин&lt;/b&gt; ответил на вашу запись</string>
+    <string name="login_prologue_third_subtitle_two">Вы сегодня получили &lt;b&gt;50 отметок \"нравится\"&lt;/b&gt; на сайте</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Юля Петрова&lt;/b&gt; отмечает вашу запись как понравившуюся</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Прокручиваемое меню блоков открыто. Выберите блок.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Прокручиваемое меню блоков закрыто.</string>
+    <string name="hpp_skip_button">Пропустить</string>
+    <string name="hpp_choose_button">Выбрать</string>
+    <string name="hpp_subtitle">Выберите макет главной страницы. Его можно настроить или изменить позже.</string>
+    <string name="hpp_title">Выбрать оформление</string>
+    <string name="mlp_network_error_subtitle">Нажмите повторить при восстановлении подключения к сети или создайте пустую страницу нажав на кнопку ниже.</string>
+    <string name="mlp_network_error_title">Макеты недоступны при отсутствии подключения к сети</string>
+    <string name="mlp_error_subtitle">Нажмите повторить или создайте пустую страницу нажав на кнопку ниже.</string>
+    <string name="mlp_error_title">Макеты недоступны из-за ошибки</string>
+    <string name="prepublishing_nudges_add_category_button">Добавить рубрику</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Добавить новую рубрику</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Рубрики</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Не указано</string>
+    <string name="prepublishing_nudges_categories_action">Рубрики</string>
+    <string name="login_prologue_fifth_caption_three">Музеи Лондона</string>
+    <string name="login_prologue_fifth_caption_two">Лучшие мировые фанаты</string>
+    <string name="login_prologue_fifth_caption_one">Мой выбор лучших 10 кафе</string>
+    <string name="login_prologue_fifth_tag_six">Политика</string>
+    <string name="login_prologue_fifth_tag_five">Музыка</string>
+    <string name="login_prologue_fifth_tag_four">Садоводство</string>
+    <string name="login_prologue_fifth_tag_three">Футбол</string>
+    <string name="login_prologue_fifth_tag_two">Кулинария</string>
+    <string name="login_prologue_fifth_tag_one">Искусство</string>
+    <string name="login_prologue_fifth_subtitle_three">Еженедельный рок-н-ролл</string>
+    <string name="login_prologue_fifth_subtitle_two">Новости веб</string>
+    <string name="login_prologue_fifth_subtitle_one">Памела Нгуен</string>
+    <string name="login_prologue_second_subtitle_two">Меня восхищают работы фотографа Кэмерона Карстена. Я попробую его техники в будущем</string>
+    <string name="login_prologue_second_subtitle_one">Вдохновляйтесь</string>
+    <string name="login_prologue_title_fifth">Подписывайтесь на избранные сайты и находите новое чтиво.</string>
+    <string name="login_prologue_title_fourth">Следите за ростом вашей аудитории с глубокой аналитикой.</string>
+    <string name="login_prologue_title_third">Следите в реальном времени за комментариями и уведомлениями.</string>
+    <string name="login_prologue_title_second">С настолько мощным редактором вы можете создавать публикации на ходу.</string>
+    <string name="login_prologue_title_first">Добро пожаловать в самый популярный в мире конструктор сайтов.</string>
+    <string name="media_loading_failed">Загрузка медиафайла неудалась</string>
+    <string name="reader_discover_recommended_blogs_header">Сайты для подписки</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Мы стараемся добавить как можно больше блоков в каждом выпуске.</string>
-    <string name="stories_intro_description_second">Они публикуются как новые записи блога на вашем сайте, ваша аудитория их не пропустит, это точно!</string>
-    <string name="stories_intro_create_story_post_label">Создать запись-историю</string>
-    <string name="gutenberg_native_choose_images">Выберите изображения</string>
-    <string name="gutenberg_native_edit_using_web_editor">Редактировать используя веб-редактор</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' полностью не поддерживается</string>
     <string name="gutenberg_native_help_button">Кнопка помощи</string>
-    <string name="stories_intro_description_first">Комбинируйте фото, видео и текст для создания захватывающих историй с переходами, они обязательно полюбятся вашим посетителям.</string>
+    <string name="gutenberg_native_edit_using_web_editor">Редактировать используя веб-редактор</string>
+    <string name="gutenberg_native_choose_images">Выберите изображения</string>
+    <string name="stories_intro_create_story_post_label">Создать запись-историю</string>
+    <string name="stories_intro_description_second">Они публикуются как новые записи блога на вашем сайте, ваша аудитория их не пропустит, это точно!</string>
     <string name="stories_intro_title_second">Записи истории не пропадают</string>
-    <string name="media_picker_soft_ask_permissions_denied">%1$s было отказано в доступе к вашим фотографиям. Чтобы исправить это, измените настройки доступа и включите %2$s и %3$s.</string>
-    <string name="mlp_preview_title">Просмотр макета</string>
-    <string name="mlp_notice_page_created">Страница создана</string>
-    <string name="mlp_notice_blank_page_created">Создана пустая страница</string>
-    <string name="mlp_generic_error">Произошла ошибка при получении макетов</string>
-    <string name="stories_intro_main_subtitle">Вам предоставлен ранний доступ к Историям, и мы хотим чтобы вы их попробовали.</string>
-    <string name="stories_intro_main_title">Представляем записи-истории</string>
+    <string name="stories_intro_description_first">Комбинируйте фото, видео и текст для создания захватывающих историй с переходами, они обязательно полюбятся вашим посетителям.</string>
+    <string name="stories_intro_title_first">Истории доступны для всех</string>
     <string name="stories_intro_image_caption_second">Пример названия истории</string>
     <string name="stories_intro_image_caption_first">Как создать историю</string>
-    <string name="stories_intro_title_first">Истории доступны для всех</string>
-    <string name="photo_picker_wordpress_media_library">Выберите из медиатеки WordPress</string>
-    <string name="media_insert_failed_with_reason">Вставка мультимедиа не удалась: %s</string>
+    <string name="stories_intro_main_title">Представляем записи-истории</string>
+    <string name="mlp_notice_blank_page_created">Создана пустая страница</string>
+    <string name="mlp_notice_page_created">Страница создана</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s было отказано в доступе к вашим фотографиям. Чтобы исправить это, измените настройки доступа и включите %2$s и %3$s.</string>
     <string name="media_insert_failed">Вставка мультимедиа не удалась.</string>
+    <string name="media_insert_failed_with_reason">Вставка мультимедиа не удалась: %s</string>
+    <string name="photo_picker_wordpress_media_library">Выберите из медиатеки WordPress</string>
     <string name="reader_label_toolbar_back">Назад</string>
-    <string name="reader_post_details_header_by_author_name">От автора</string>
-    <string name="reader_discover_empty_title">Подписывайтесь на темы для того, чтобы найти новые блоги</string>
     <string name="reader_discover_empty_button_text">Начните</string>
-    <string name="media_uploading_default">Загрузка медиафайлов</string>
-    <string name="media_uploading_stock_library_photo">Загрузка стоковых медиафайлов</string>
-    <string name="media_uploading_gif_library_photo">Загузка GIF медиафайла</string>
-    <string name="stats_referrer_popup_menu_open_website">Открыть сайт</string>
-    <string name="stats_referrer_popup_menu_mark_as_spam">Пометить как спам</string>
-    <string name="stats_referrer_popup_unmark_as_spam">Убрать отметку спам</string>
+    <string name="reader_discover_empty_subtitle">Подписывайтесь на темы для того, чтобы найти новые блоги</string>
+    <string name="reader_post_details_header_by_author_name">От автора</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">Этот реферер не может быть отмечен как спам</string>
-    <string name="gutenberg_native_search_or_type_url">Введите поисковый запрос или URL</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Убрать отметку спам</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Пометить как спам</string>
+    <string name="stats_referrer_popup_menu_open_website">Открыть сайт</string>
+    <string name="media_uploading_gif_library_photo">Загузка GIF медиафайла</string>
+    <string name="media_uploading_stock_library_photo">Загрузка стоковых медиафайлов</string>
+    <string name="media_uploading_default">Загрузка медиафайлов</string>
     <string name="gutenberg_native_select_item">Выбрать элемент</string>
+    <string name="gutenberg_native_search_or_type_url">Введите поисковый запрос или URL</string>
+    <string name="gutenberg_native_page_break">Разрыв страницы</string>
     <string name="gutenberg_native_add_this_telephone_link">Добавить ссылку на номер телефона</string>
-    <string name="suggestion_no_connection">\"Нет подключения к сети.\nПредложения недоступны.\"</string>
-    <string name="gutenberg_native_add_this_email_link">Добавить ссылку на email</string>
     <string name="gutenberg_native_add_this_link">Добавить ссылку</string>
-    <string name="mlp_selected_description">Выбрано %s</string>
-    <string name="mlp_notselected_description">%s</string>
-    <string name="toast_capture_operation_permission_needed">Для записи видео вам нужно дать приложению разрешение на запись звука.</string>
-    <string name="typeface_label_nunito">Повседневный</string>
-    <string name="typeface_label_libre_baskerville">Классический</string>
-    <string name="typeface_label_oswald">Сильный</string>
-    <string name="typeface_label_pacifico">Игривый</string>
-    <string name="typeface_label_space_mono">Современный</string>
+    <string name="gutenberg_native_add_this_email_link">Добавить ссылку на email</string>
+    <string name="suggestion_no_connection">Нет подключения к сети.\nПредложения недоступны.</string>
     <string name="typeface_label_shrikhand">Жирный</string>
-    <string name="media_browse_for_items">Поиск элементов</string>
-    <string name="comment_unable_to_show_error">Не удаётся показать этот комментарий</string>
-    <string name="permission_microphone">микрофон</string>
-    <string name="email_not_registered_wpcom">Не получается найти учётную запись WordPress.com для этого адреса email.</string>
+    <string name="typeface_label_space_mono">Современный</string>
+    <string name="typeface_label_pacifico">Игривый</string>
+    <string name="typeface_label_oswald">Сильный</string>
+    <string name="typeface_label_libre_baskerville">Классический</string>
+    <string name="typeface_label_nunito">Повседневный</string>
+    <string name="toast_capture_operation_permission_needed">Для записи видео вам нужно дать приложению разрешение на запись звука.</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">Выбрано %s</string>
     <string name="login_get_link_by_email">Получить ссылку для входа по email</string>
+    <string name="email_not_registered_wpcom">Не получается найти учётную запись WordPress.com для этого адреса email.</string>
+    <string name="permission_microphone">микрофон</string>
+    <string name="comment_unable_to_show_error">Не удаётся показать этот комментарий</string>
+    <string name="media_browse_for_items">Поиск элементов</string>
     <string name="reader_menu_report_post">Пожаловаться на запись</string>
-    <string name="gutenberg_native_angle">Угол</string>
     <string name="reader_welcome_banner">Добро пожаловать в Чтиво. Откройте миллионы блоков прямо у вас под рукой.</string>
     <string name="error_media_xmlrcp_server_error">Произошла внутренняя ошибка сервера</string>
     <string name="error_media_xmlrpc_not_allowed">Это действие недопустимо</string>
     <string name="show_n_hidden_items_desc">еще элементов: %1$s</string>
     <string name="gutenberg_native_select_a_layout">Выберите макет</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Заметьте: макет колонок может меняться в зависимости от темы и размера экрана</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
+    <string name="create_post_story_fab_tooltip">Создать запись или историю</string>
+    <string name="create_page_fab_tooltip">Создать страницу</string>
+    <string name="create_post_fab_tooltip">Создать запись</string>
     <string name="reader_discover_interests_header">Вам может понравиться</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Скрыть</string>
-    <string name="create_post_fab_tooltip">Создать запись</string>
-    <string name="create_page_fab_tooltip">Создать страницу</string>
-    <string name="create_post_story_fab_tooltip">Создать запись или историю</string>
-    <string name="dialog_insufficient_device_storage_error_ok_button">Просмотр хранилища</string>
-    <string name="toast_story_page_not_found">Невозможно найти слайд истории</string>
-    <string name="toast_capture_operation_in_progress">Операция в процессе, попробуйте позже</string>
-    <string name="toast_error_saving_image">Ошибка сохранения изображения</string>
-    <string name="toast_error_saving_video">Не удалось сохранить видео</string>
-    <string name="camera_error">Это устройство не поддерживает Camera2 API.</string>
-    <string name="toast_error_playing_video">Ошибка воспроизведения видео</string>
-    <string name="gutenberg_native_page_title_empty">Название страницы. Пустое.</string>
-    <string name="gutenberg_native_page_title_s">Название страницы. %s</string>
-    <string name="gutenberg_native_paste_block_after">Вставить блок после</string>
-    <string name="gutenberg_native_updates_the_title">Обновление названия.</string>
     <string name="gutenberg_native_video_caption_empty">Подпись к видео. Пустая</string>
-    <string name="story_saving_failed_message_singular">Требуется действие для 1 слайда</string>
-    <string name="story_saving_failed_message_plural">Требуется действие для %1$d слайдов</string>
-    <string name="story_saving_failed_quick_action_manage">Управление</string>
-    <string name="dialog_story_saving_error_title_singular">Невозможно сохранить 1 слайд</string>
-    <string name="dialog_story_saving_error_title_plural">Невозможно сохранить %1$d слайдов</string>
-    <string name="dialog_story_saving_error_message">Сохраните снова или удалите слайды, потом попробуйте заново опубликовать вашу историю.</string>
-    <string name="dialog_insufficient_device_storage_error_title">Недостаточно места в хранилище устройства</string>
+    <string name="gutenberg_native_updates_the_title">Обновление названия.</string>
+    <string name="gutenberg_native_paste_block_after">Вставить блок после</string>
+    <string name="gutenberg_native_page_title_s">Название страницы. %s</string>
+    <string name="gutenberg_native_page_title_empty">Название страницы. Пустое.</string>
+    <string name="toast_error_playing_video">Ошибка воспроизведения видео</string>
+    <string name="camera_error">Это устройство не поддерживает Camera2 API.</string>
+    <string name="toast_error_saving_video">Не удалось сохранить видео</string>
+    <string name="toast_error_saving_image">Ошибка сохранения изображения</string>
+    <string name="toast_capture_operation_in_progress">Операция в процессе, попробуйте позже</string>
+    <string name="toast_story_page_not_found">Невозможно найти слайд истории</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Просмотр хранилища</string>
     <string name="dialog_insufficient_device_storage_error_message">Требуется сохранить историю на вашем устройстве перед публикацией. Посмотрите настройки хранилища данных и удалите что-нибудь для освобождения места.</string>
-    <string name="story_saving_snackbar_started">Загружается \"%1$s\"…</string>
-    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" опубликована</string>
-    <string name="story_saving_snackbar_finished_with_error">Загрузка не удалась для \"%1$s\"</string>
+    <string name="dialog_insufficient_device_storage_error_title">Недостаточно места в хранилище устройства</string>
+    <string name="dialog_story_saving_error_message">Сохраните снова или удалите слайды, потом попробуйте заново опубликовать вашу историю.</string>
+    <string name="dialog_story_saving_error_title_plural">Невозможно сохранить %1$d слайдов</string>
+    <string name="dialog_story_saving_error_title_singular">Невозможно сохранить 1 слайд</string>
+    <string name="story_saving_failed_quick_action_manage">Управление</string>
+    <string name="story_saving_failed_message_plural">Требуется действие для %1$d слайдов</string>
+    <string name="story_saving_failed_message_singular">Требуется действие для 1 слайда</string>
     <string name="story_saving_failed_title">Загрузка не удалась для \"%1$s\"</string>
-    <string name="story_saving_title">Сохраняется \"%1$s\"…</string>
-    <string name="story_saving_title_several">несколько историй</string>
-    <string name="story_saving_subtitle_frames_remaining_singular">остался 1 слайд</string>
+    <string name="story_saving_snackbar_finished_with_error">Загрузка не удалась для \"%1$s\"</string>
+    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" опубликована</string>
+    <string name="story_saving_snackbar_started">Загружается \"%1$s\"…</string>
     <string name="story_saving_subtitle_frames_remaining_plural">осталось %1$d слайдов</string>
-    <string name="label_frame_unselected_border">невыбрано</string>
-    <string name="label_frame_selected_border">выбрано</string>
-    <string name="label_frame_errored">с ошибкой</string>
-    <string name="label_text_alignment_button">Изменить выравнивание текста</string>
-    <string name="label_text_color_button">Изменить цвет текста</string>
-    <string name="menu_delete_page">Удалить слайд</string>
-    <string name="dialog_discard_page_title">Удалить слайд истории?</string>
-    <string name="dialog_discard_page_message">Этот слайд будет удален из истории.</string>
-    <string name="dialog_discard_errored_page_message">Этот слайд ещё не сохранён. Если вы удалите его, то потеряете все сделанные правки.</string>
-    <string name="dialog_discard_page_ok_button">Удалить</string>
-    <string name="dialog_discard_story_title">Отбросить запись истории?</string>
-    <string name="dialog_discard_story_message">Запись истории не будет сохранена в черновики.</string>
-    <string name="dialog_discard_story_ok_button">Отбросить</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">остался 1 слайд</string>
+    <string name="story_saving_title_several">несколько историй</string>
+    <string name="story_saving_title">Сохраняется \"%1$s\"…</string>
     <string name="story_saving_untitled">Без названия</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Нажмите %1$s Создать. %2$s Затем выберите &lt;b>Запись блога&lt;/b></string>
-    <string name="create_post_page_fab_tooltip_stories_enabled">Создать запись, страницу или историю</string>
-    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Создать запись или страницу</string>
-    <string name="prepublishing_nudges_story_title_hint">Назовите вашу историю</string>
-    <string name="mlp_choose_layout_subtitle">Начните с выбора заранее подготовленных вариантов макета, или начните с пустой страницы.</string>
-    <string name="mlp_create_blank_page">Создать пустую страницу</string>
-    <string name="mlp_create_page">Создать страницу</string>
-    <string name="mlp_preview_page">Просмотреть</string>
-    <string name="capture_button_alt">Захват</string>
-    <string name="flip_button_alt">Перевернуть камеру</string>
-    <string name="flash_button_alt">Вспышка</string>
-    <string name="stickers_button_alt">Наклейки</string>
-    <string name="more_button_alt">Еще</string>
-    <string name="text_button_alt">Текст</string>
-    <string name="sound_button_alt">Звук</string>
-    <string name="label_control_flip_camera">Отразить</string>
-    <string name="label_control_flash">Вспышка</string>
-    <string name="label_control_saving">Сохранение</string>
-    <string name="label_control_saved">Сохранено</string>
-    <string name="label_control_retry">Повторить</string>
-    <string name="label_snackbar_loop_frame_saved">Сохранено в фотографиях</string>
-    <string name="label_snackbar_share">ПОДЕЛИТЬСЯ</string>
-    <string name="label_share_to">Поделиться с</string>
-    <string name="label_done">Готово</string>
-    <string name="label_control_publish">Далее</string>
-    <string name="label_close_button">Закрыть</string>
-    <string name="label_saved_icon">Сохранено</string>
-    <string name="label_retry_icon">Повторить</string>
+    <string name="dialog_discard_story_ok_button">Отбросить</string>
+    <string name="dialog_discard_story_message">Запись истории не будет сохранена в черновики.</string>
+    <string name="dialog_discard_story_title">Отбросить запись истории?</string>
+    <string name="dialog_discard_page_ok_button">Удалить</string>
+    <string name="dialog_discard_errored_page_message">Этот слайд ещё не сохранён. Если вы удалите его, то потеряете все сделанные правки.</string>
+    <string name="dialog_discard_page_message">Этот слайд будет удален из истории.</string>
+    <string name="dialog_discard_page_title">Удалить слайд истории?</string>
+    <string name="label_text_color_button">Изменить цвет текста</string>
+    <string name="label_text_alignment_button">Изменить выравнивание текста</string>
+    <string name="label_frame_errored">с ошибкой</string>
+    <string name="label_frame_selected_border">выбрано</string>
+    <string name="label_frame_unselected_border">невыбрано</string>
     <string name="label_frame_image">Слайд</string>
+    <string name="label_retry_icon">Повторить</string>
+    <string name="label_saved_icon">Сохранено</string>
+    <string name="label_close_button">Закрыть</string>
+    <string name="label_share_to">Поделиться с</string>
+    <string name="label_snackbar_share">ПОДЕЛИТЬСЯ</string>
+    <string name="label_snackbar_loop_frame_saved">Сохранено в фотографиях</string>
+    <string name="label_control_retry">Повторить</string>
+    <string name="label_control_saved">Сохранено</string>
+    <string name="label_control_saving">Сохранение</string>
+    <string name="label_control_flash">Вспышка</string>
+    <string name="label_control_flip_camera">Отразить</string>
+    <string name="sound_button_alt">Звук</string>
+    <string name="text_button_alt">Текст</string>
+    <string name="stickers_button_alt">Наклейки</string>
+    <string name="flash_button_alt">Вспышка</string>
+    <string name="flip_button_alt">Перевернуть камеру</string>
+    <string name="capture_button_alt">Захват</string>
+    <string name="mlp_preview_page">Просмотреть</string>
+    <string name="mlp_create_page">Создать страницу</string>
+    <string name="mlp_create_blank_page">Создать пустую страницу</string>
+    <string name="mlp_choose_layout_subtitle">Начните с выбора заранее подготовленных вариантов макета, или начните с пустой страницы.</string>
     <string name="mlp_choose_layout_title">Выберите макет</string>
-    <string name="error_media_quota_exceeded">Превышение ограничения данных в хранилище</string>
-    <string name="error_media_quota_exceeded_toast">Невозможно загрузить файл.\nНедостаточно места в хранилище.</string>
-    <string name="reader_toast_err_page_jump_not_found">Не найден переход на ссылаемую страницу</string>
-    <string name="my_site_icon_dialog_change_requires_jetpack_message">Редактирование значков сайта на самостоятельно размещенном сайте WordPress требует наличия плагина Jetpack.</string>
-    <string name="my_site_bottom_sheet_add_story">История</string>
+    <string name="prepublishing_nudges_story_title_hint">Назовите вашу историю</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Создать запись или страницу</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Создать запись, страницу или историю</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Нажмите %1$s Создать. %2$s Затем выберите &lt;b&gt;Запись блога&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Выбрать с устройства</string>
+    <string name="my_site_bottom_sheet_add_story">История</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">Редактирование значков сайта на самостоятельно размещенном сайте WordPress требует наличия плагина Jetpack.</string>
+    <string name="reader_toast_err_page_jump_not_found">Не найден переход на ссылаемую страницу</string>
+    <string name="error_media_quota_exceeded_toast">Невозможно загрузить файл.\nНедостаточно места в хранилище.</string>
+    <string name="error_media_quota_exceeded">Превышение ограничения данных в хранилище</string>
     <string name="pick_file">Добавить файл</string>
-    <string name="gutenberg_native_replace_image_or_video">Заменить изображение или видео</string>
     <string name="gutenberg_native_replace_video">Заменить видео</string>
-    <string name="continue_with_google_terms_of_service_text">Если вы продолжите работу с учетной записью Google, не имея учётной записи WordPress.com, вы создадите учётную запись и примете наши %1$sУсловия обслуживания%2$s.</string>
-    <string name="signup_confirmation_title">Подтверждение регистрации</string>
-    <string name="continue_with_wpcom">Продолжить с WordPress.com</string>
-    <string name="enter_your_site_address">Введите адрес вашего сайта</string>
-    <string name="content_description_logo">Логотип WordPress</string>
-    <string name="gutenberg_native_block_removed">Блок удалён</string>
-    <string name="gutenberg_native_choose_image">Выбор изображения</string>
-    <string name="gutenberg_native_choose_image_or_video">Выбор изображения или видео</string>
+    <string name="gutenberg_native_replace_image_or_video">Заменить изображение или видео</string>
     <string name="gutenberg_native_choose_video">Выбор видео</string>
+    <string name="gutenberg_native_choose_image_or_video">Выбор изображения или видео</string>
+    <string name="gutenberg_native_choose_image">Выбор изображения</string>
+    <string name="gutenberg_native_block_removed">Блок удалён</string>
+    <string name="enter_your_site_address">Введите адрес вашего сайта</string>
+    <string name="signup_confirmation_title">Подтверждение регистрации</string>
+    <string name="continue_with_google_terms_of_service_text">Если вы продолжите работу с учетной записью Google, не имея учётной записи WordPress.com, вы создадите учётную запись и примете наши %1$sУсловия обслуживания%2$s.</string>
     <string name="continue_terms_of_service_text">Продолжив, вы соглашаетесь с нашими %1$sПравилами пользования%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Мы пришлём вам ссылку для создания учётной записи WordPress.com.</string>
     <string name="signup_confirmation_message">Этот адрес эл.почты будет использован при создании вашей новой учётной записи WordPress.com.</string>
     <string name="signup_magic_link_message">Мы отослали вам ссылку для создания учётной записи WordPress.com. Проверьте почту на вашем устройстве и нажмите на ссылку, полученную с WordPress.com.</string>
     <string name="enter_account_info_for_site">Введите данные вашей учётной записи для %1$s.</string>
-    <string name="login_magic_links_sent_label">Проверьте почту на этом устройстве и нажмите ссылку в письме от WordPress.com</string>
-    <string name="magic_link_not_seeing_email_message">Не нашли письмо? Загляните в папку со спамом.</string>
-    <string name="login_done">Готово</string>
-    <string name="login_find_your_site_adress">Найдите адрес вашего сайта</string>
-    <string name="continue_google_button_suffix">Продолжить с Google</string>
     <string name="login_or">или</string>
+    <string name="continue_google_button_suffix">Продолжить с Google</string>
+    <string name="login_find_your_site_adress">Найдите адрес вашего сайта</string>
+    <string name="login_done">Готово</string>
+    <string name="magic_link_not_seeing_email_message">Не нашли письмо? Загляните в папку со спамом.</string>
+    <string name="login_magic_links_sent_label">Проверьте почту на этом устройстве и нажмите ссылку в письме от WordPress.com</string>
     <string name="login_magic_links_label">Мы пришлём вам ссылку для входа, которая позволит вам сразу войти без пароля.</string>
-    <string name="reset_your_password">Сбросить пароль</string>
-    <string name="login_promo_title_37_percent">37\% всех сайтов сети основаны на WordPress.</string>
-    <string name="login_promo_text_unlock_the_power">Раскройте потенциал самой гибкой платформы для создания сайтов.</string>
-    <string name="send_link_by_email">Прислать ссылку по электронной почте</string>
-    <string name="create_account">Создать учётную запись</string>
-    <string name="or_type_your_password">или введите ваш пароль</string>
-    <string name="enter_email_to_continue_wordpress_com">Введите ваш адрес электронной почты чтобы войти или создать учётную запись WordPress.com.</string>
-    <string name="get_started">Начать </string>
     <string name="check_email">Проверка почты</string>
+    <string name="get_started">Начать </string>
+    <string name="enter_email_to_continue_wordpress_com">Введите ваш адрес электронной почты чтобы войти или создать учётную запись WordPress.com.</string>
+    <string name="or_type_your_password">или введите ваш пароль</string>
+    <string name="create_account">Создать учётную запись</string>
+    <string name="send_link_by_email">Прислать ссылку по электронной почте</string>
+    <string name="reset_your_password">Сбросить пароль</string>
     <string name="reader_error_request_failed_title">При выполнении запроса возникла проблема. Повторите попытку позже.</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Нажмите &lt;b>%1$s&lt;/b> для установки нового названия</string>
     <string name="quick_start_list_update_site_title_title">Задайте название сайта</string>
-    <string name="quick_start_list_update_site_title_subtitle">Первое впечатление важно! Назовите свой сайт так, как это отразит его индивидуальность и содержание.</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Нажмите &lt;b&gt;%1$s&lt;/b&gt; для установки нового названия</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Удаление в корзину этой записи отменит локальные изменения, вы точно хотите продолжить?</string>
     <string name="gutenberg_native_s_block_options">настройки блока %s</string>
-    <string name="my_site_title_changer_dialog_not_allowed_hint">Название сайта может быть изменено только администратором.</string>
-    <string name="gutenberg_native_block_copied">Блок скопирован</string>
-    <string name="gutenberg_native_block_cut">Блок вырезан</string>
-    <string name="gutenberg_native_block_duplicated">Блок продублирован</string>
-    <string name="gutenberg_native_block_pasted">Блок вставлен</string>
-    <string name="gutenberg_native_block_settings">Настройки блока</string>
-    <string name="gutenberg_native_copied_block">Скопированный блок</string>
-    <string name="gutenberg_native_copy_block">Копировать блок</string>
     <string name="gutenberg_native_duplicate_block">Дублировать блок</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Несохранённые изменения</string>
-    <string name="error_update_site_title_network">Невозможно обновить название сайта. Проверьте подключение к сети и попробуйте снова.</string>
-    <string name="reader_title_tag_preview">Тема</string>
-    <string name="my_site_title_changer_dialog_hint">Название сайта отображается в заголовке браузера и отображается большинством тем в заголовке сайта.</string>
-    <string name="gutenberg_native_open_link_in_a_browser">Открыть ссылку в браузере</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
-    <string name="gutenberg_native_customize_gradient">Настройка градиента</string>
-    <string name="gutenberg_native_double_tap_to_select_the_option">Нажмите дважды для выбора</string>
-    <string name="gutenberg_native_gradient_type">Тип градиента</string>
-    <string name="gutenberg_native_navigates_to_custom_color_picker">Переход к выбору пользовательского цвета</string>
+    <string name="gutenberg_native_copy_block">Копировать блок</string>
+    <string name="gutenberg_native_copied_block">Скопированный блок</string>
+    <string name="gutenberg_native_block_pasted">Блок вставлен</string>
+    <string name="gutenberg_native_block_duplicated">Блок продублирован</string>
+    <string name="gutenberg_native_block_cut">Блок вырезан</string>
+    <string name="gutenberg_native_block_copied">Блок скопирован</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">Название сайта может быть изменено только администратором.</string>
+    <string name="my_site_title_changer_dialog_hint">Название сайта отображается в заголовке браузера и отображается большинством тем в заголовке сайта.</string>
+    <string name="reader_title_tag_preview">Тема</string>
+    <string name="error_update_site_title_network">Невозможно обновить название сайта. Проверьте подключение к сети и попробуйте снова.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Несохранённые изменения</string>
+    <string name="gutenberg_native_open_link_in_a_browser">Открыть ссылку в браузере</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient">Переход к настройкам градиента</string>
-    <string name="me">Мой профиль</string>
-    <string name="everyone">Все</string>
-    <string name="menu_content_info">Структура содержимого</string>
-    <string name="error_media_thumbnail_not_loaded">Миниатюра не может быть загружена</string>
-    <string name="photo_picker_use_gif">Использовать этот GIF</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Переход к выбору пользовательского цвета</string>
+    <string name="gutenberg_native_gradient_type">Тип градиента</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Нажмите дважды для выбора</string>
+    <string name="gutenberg_native_customize_gradient">Настройка градиента</string>
     <string name="pages_list_author">Автор страницы</string>
-    <string name="prepublishing_nudges_home_tags_not_set">Не установлены</string>
+    <string name="photo_picker_use_gif">Использовать этот GIF</string>
+    <string name="error_media_thumbnail_not_loaded">Миниатюра не может быть загружена</string>
+    <string name="menu_content_info">Структура содержимого</string>
+    <string name="everyone">Все</string>
+    <string name="me">Мой профиль</string>
     <string name="gutenberg_native_dismiss">Закрыть</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_message">Записи из корзины не могут быть отредактированы. Хотите изменить статус на \"черновик\", чтобы получить возможность редактирования?</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Переместить в черновики</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Отмена</string>
-    <string name="prepublishing_nudges_publish_action">Дата публикации</string>
-    <string name="prepublishing_nudges_tags_action">Метки</string>
-    <string name="prepublishing_nudges_home_header_publishing_to">Публикация на</string>
-    <string name="prepublishing_nudges_home_schedule_button">Запланировать сейчас</string>
-    <string name="prepublishing_nudges_home_submit_button">Отправить</string>
-    <string name="prepublishing_nudges_home_save_button">Сохранить</string>
-    <string name="prepublishing_nudges_back_button">Назад</string>
-    <string name="prepublishing_nudges_toolbar_title_tags">Добавить метки</string>
+    <string name="prepublishing_nudges_home_tags_not_set">Не установлены</string>
     <string name="prepublishing_tags_description">Метки информируют о том, про что написано в записи.</string>
     <string name="prepublishing_nudges_toolbar_title_publish">Дата публикации</string>
-    <string name="ccpa_privacy_notice_caption">Калифорнийский закон о защите прав потребителей («CCPA») обязывает нас предоставлять жителям Калифорнии некоторую дополнительную информацию о категориях личной информации, которую мы собираем и передаем, где мы получаем эту личную информацию, а также как и почему мы ее используем.</string>
-    <string name="ccpa_privacy_notice_read">Прочитать уведомление о конфиденциальности CCPA</string>
-    <string name="publish_date">Дата публикации</string>
-    <string name="post_status_post_scheduled">Запланирована</string>
-    <string name="post_status_post_trashed">В корзине</string>
-    <string name="post_status_post_published">Опубликована</string>
-    <string name="reader_btn_select_few_interests">Выберите несколько для продолжения</string>
-    <string name="reader_btn_done">Готово</string>
-    <string name="reader_choose_interests_content_description">Выберите ваши интересы</string>
-    <string name="reader_label_choose_your_interests">Выберите ваши интересы</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Добавить метки</string>
+    <string name="prepublishing_nudges_back_button">Назад</string>
+    <string name="prepublishing_nudges_home_save_button">Сохранить</string>
+    <string name="prepublishing_nudges_home_submit_button">Отправить</string>
+    <string name="prepublishing_nudges_home_schedule_button">Запланировать сейчас</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Публикация на</string>
+    <string name="prepublishing_nudges_tags_action">Метки</string>
+    <string name="prepublishing_nudges_publish_action">Дата публикации</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Отмена</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Переместить в черновики</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_message">Записи из корзины не могут быть отредактированы. Хотите изменить статус на \"черновик\", чтобы получить возможность редактирования?</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Переместить записи в черновики</string>
-    <string name="update_now">Обновить сейчас</string>
-    <string name="status_and_visibility">Статус и видимость</string>
+    <string name="reader_label_choose_your_interests">Выберите ваши интересы</string>
+    <string name="reader_choose_interests_content_description">Выберите ваши интересы</string>
+    <string name="reader_btn_done">Готово</string>
+    <string name="reader_btn_select_few_interests">Выберите несколько для продолжения</string>
+    <string name="post_status_post_published">Опубликована</string>
+    <string name="post_status_post_trashed">В корзине</string>
+    <string name="post_status_post_scheduled">Запланирована</string>
+    <string name="publish_date">Дата публикации</string>
+    <string name="ccpa_privacy_notice_read">Прочитать уведомление о конфиденциальности CCPA</string>
+    <string name="ccpa_privacy_notice_caption">Калифорнийский закон о защите прав потребителей («CCPA») обязывает нас предоставлять жителям Калифорнии некоторую дополнительную информацию о категориях личной информации, которую мы собираем и передаем, где мы получаем эту личную информацию, а также как и почему мы ее используем.</string>
     <string name="ccpa_privacy_notice_header">Уведомление о конфиденциальности для жителей Калифорнии</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Попробуйте стартовый макет</string>
+    <string name="status_and_visibility">Статус и видимость</string>
+    <string name="update_now">Обновить сейчас</string>
     <string name="gutenberg_native_open_block_actions_menu">Открыть меню действий с блоком</string>
-    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Нажмите дважды для того, чтобы открыть панель действий со всеми доступными возможностями</string>
+    <string name="gutenberg_native_move_to_top">Сдвинуть наверх</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Нажмите дважды для того, чтобы открыть нижнюю панель действий с доступными возможностями</string>
-    <string name="gutenberg_native_insert_mention">Вставить упоминание</string>
-    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Выбранная главная страница и страница записей не могут быть однаковыми.</string>
-    <string name="site_settings_classic_blog">Классический блог</string>
-    <string name="site_settings_static_homepage">Статическая главная страница</string>
-    <string name="site_settings_posts_page">Страница записей</string>
-    <string name="site_settings_select_page">Выберите страницу</string>
-    <string name="suggestion_invalid_user">\"%s не является действительным пользователем\"</string>
-    <string name="suggestion_no_matching_users">\"Нет подходящих пользователей.\"</string>
-    <string name="pages_set_as_homepage">Установить в качестве главной страницы</string>
-    <string name="pages_set_as_posts_page">Выбрать в качестве страницы записей</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Нажмите дважды для того, чтобы открыть панель действий со всеми доступными возможностями</string>
     <string name="pages_cannot_be_started">Невозможно открыть страницы в данный момент. Пожалуйста, попробуйте позже.</string>
-    <string name="site_settings_homepage_settings">Настройки главной страницы</string>
-    <string name="site_settings_homepage_settings_description">Выберите в качестве главной страницы страницу последних записей (классический блог) или фиксированную (статическую) страницу.</string>
-    <string name="site_settings_failed_to_load_pages">Загрузка страниц не удалась</string>
-    <string name="site_settings_accept_homepage">Принять</string>
-    <string name="site_settings_failed_to_save_homepage_settings">Не удалось сохранить настройки главной страницы</string>
-    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Не удалось сохранить настройки главной страницы до загрузки страниц</string>
+    <string name="pages_set_as_posts_page">Выбрать в качестве страницы записей</string>
+    <string name="pages_set_as_homepage">Установить в качестве главной страницы</string>
+    <string name="suggestion_invalid">%s не является действительным %s</string>
+    <string name="site_settings_select_page">Выберите страницу</string>
+    <string name="site_settings_posts_page">Страница записей</string>
+    <string name="site_settings_static_homepage">Статическая главная страница</string>
+    <string name="site_settings_classic_blog">Классический блог</string>
+    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Выбранная главная страница и страница записей не могут быть однаковыми.</string>
     <string name="site_settings_failed_update_homepage_settings">Обновление настроек главной страницы не удалось. Проверьте ваше подключение к сети.</string>
-    <string name="page_cannot_set_homepage">Для установки главной страницы включите \"Статическую главную страницу\" в настройках сайта</string>
-    <string name="page_cannot_set_posts_page">Для установки страницы записей включите \"Статическую главную страницу\" в настройках сайта</string>
-    <string name="page_homepage_successfully_updated">Настройки главной страницы обновлены</string>
-    <string name="page_homepage_update_failed">Обновление настроек главной страницы не удалось</string>
-    <string name="page_posts_page_successfully_updated">Настройки страницы записей обновлены</string>
-    <string name="page_posts_page_update_failed">Обновление настроек страницы записей не удалось</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Не удалось сохранить настройки главной страницы до загрузки страниц</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Не удалось сохранить настройки главной страницы</string>
+    <string name="site_settings_accept_homepage">Принять</string>
+    <string name="site_settings_failed_to_load_pages">Загрузка страниц не удалась</string>
+    <string name="site_settings_homepage_settings_description">Выберите в качестве главной страницы страницу последних записей (классический блог) или фиксированную (статическую) страницу.</string>
+    <string name="site_settings_homepage_settings">Настройки главной страницы</string>
     <string name="site_settings_homepage">Главная страница</string>
+    <string name="page_posts_page_update_failed">Обновление настроек страницы записей не удалось</string>
+    <string name="page_posts_page_successfully_updated">Настройки страницы записей обновлены</string>
+    <string name="page_homepage_update_failed">Обновление настроек главной страницы не удалось</string>
+    <string name="page_homepage_successfully_updated">Настройки главной страницы обновлены</string>
+    <string name="page_cannot_set_posts_page">Для установки страницы записей включите \"Статическую главную страницу\" в настройках сайта</string>
+    <string name="page_cannot_set_homepage">Для установки главной страницы включите \"Статическую главную страницу\" в настройках сайта</string>
     <string name="gutenberg_native_select_a_color">Выберите цвет</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Добро пожаловать в наш новый блог</string>
-    <string name="reader_empty_followed_blogs_description">При подписке на сайты вы увидите их содержимое здесь</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Нажмите дважды для перехода в настройки цветов</string>
-    <string name="site_picker_ask_site_select">Не удалось выбрать сайт. Повторите попытку.</string>
-    <string name="photo_picker_video_title">Выбрать видео</string>
-    <string name="photo_picker_photo_or_video_title">Выбрать медиафайл</string>
-    <string name="photo_picker_use_video">Использовать это видео</string>
-    <string name="photo_picker_use_media">Использовать этот медиафайл</string>
-    <string name="preview_image_thumbnail_description">Предварительный просмотр миниатюры</string>
-    <string name="error_failed_to_load_into_file">Ошибка загрузки в файл, повторите попытку.</string>
-    <string name="crop">обрезать</string>
-    <string name="insert_label_with_count">Вставить %d</string>
-    <string name="feature_announcement_dialog_label">Что нового в WordPress</string>
+    <string name="reader_empty_followed_blogs_description">При подписке на сайты вы увидите их содержимое здесь</string>
     <string name="feature_announcement_find_out_mode">Подробнее</string>
-    <string name="copy_text">Копировать</string>
-    <string name="continue_label">Продолжить</string>
-    <string name="button_insert">Вставить</string>
-    <string name="comment_toast_err_share_intent">Нельзя поделиться</string>
-    <string name="comment_share_link_via">Поделиться в</string>
-    <string name="copy_link_address">Скопировать адрес ссылки</string>
-    <string name="comment_q_action_copied_url">Адрес ссылки скопирован</string>
-    <string name="whats_new_in_version_title">Что нового</string>
-    <string name="reader_no_site_to_reblog_title">Нет доступных сайтов на WordPress.com</string>
-    <string name="reader_no_site_to_reblog_detail">После создания сайта на WordPress.com вы сможете сделать перепубликацию понравившегося содержимого на своем сайте.</string>
-    <string name="reader_no_site_to_reblog_action">Управление сайтами</string>
-    <string name="reader_reblog_error">Перепубликация не удалась</string>
+    <string name="feature_announcement_dialog_label">Что нового в WordPress</string>
+    <string name="insert_label_with_count">Вставить %d</string>
+    <string name="crop">обрезать</string>
+    <string name="error_failed_to_load_into_file">Ошибка загрузки в файл, повторите попытку.</string>
+    <string name="preview_image_thumbnail_description">Предварительный просмотр миниатюры</string>
+    <string name="photo_picker_use_media">Использовать этот медиафайл</string>
+    <string name="photo_picker_use_video">Использовать это видео</string>
+    <string name="photo_picker_photo_or_video_title">Выбрать медиафайл</string>
+    <string name="photo_picker_video_title">Выбрать видео</string>
+    <string name="site_picker_ask_site_select">Не удалось выбрать сайт. Повторите попытку.</string>
     <string name="sitepicker_continue_flow">Продолжить</string>
-    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Нажмите дважды для перемещения блока влево</string>
-    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Нажмите дважды для перемещения блока вправо</string>
-    <string name="gutenberg_native_move_block_left">Переместить блок влево</string>
-    <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Переместить блок влево из позиции %1$s в позицию %2$s</string>
-    <string name="gutenberg_native_move_block_right">Переместить блок вправо</string>
+    <string name="reader_reblog_error">Перепубликация не удалась</string>
+    <string name="reader_no_site_to_reblog_action">Управление сайтами</string>
+    <string name="reader_no_site_to_reblog_detail">После создания сайта на WordPress.com вы сможете сделать перепубликацию понравившегося содержимого на своем сайте.</string>
+    <string name="reader_no_site_to_reblog_title">Нет доступных сайтов на WordPress.com</string>
+    <string name="whats_new_in_version_title">Что нового</string>
+    <string name="comment_q_action_copied_url">Адрес ссылки скопирован</string>
+    <string name="copy_link_address">Скопировать адрес ссылки</string>
+    <string name="comment_share_link_via">Поделиться в</string>
+    <string name="comment_toast_err_share_intent">Нельзя поделиться</string>
+    <string name="button_insert">Вставить</string>
+    <string name="continue_label">Продолжить</string>
+    <string name="copy_text">Копировать</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Переместить блок вправо из позиции %1$s в позицию %2$s</string>
-    <string name="new_site_creation_creating_site_loading_title">Ура!\nПочти всё готово</string>
-    <string name="new_site_creation_creating_site_loading_subtitle">Ваш сайт вскоре будет готов</string>
-    <string name="new_site_creation_creating_site_loading_1">Получение URL сайта</string>
-    <string name="new_site_creation_creating_site_loading_2">Добавление функциональности сайта</string>
-    <string name="new_site_creation_creating_site_loading_3">Настройка темы</string>
+    <string name="gutenberg_native_move_block_right">Переместить блок вправо</string>
+    <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Переместить блок влево из позиции %1$s в позицию %2$s</string>
+    <string name="gutenberg_native_move_block_left">Переместить блок влево</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Нажмите дважды для перемещения блока вправо</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Нажмите дважды для перемещения блока влево</string>
+    <string name="gutenberg_native_block_settings">Настройки блока</string>
     <string name="new_site_creation_creating_site_loading_4">Создание консоли</string>
-    <string name="gutenberg_native_blog">Блог</string>
-    <string name="gif_list_search_returned_unknown_error">Возникла проблема с вашим запросом.</string>
+    <string name="new_site_creation_creating_site_loading_3">Настройка темы</string>
+    <string name="new_site_creation_creating_site_loading_2">Добавление функциональности сайта</string>
+    <string name="new_site_creation_creating_site_loading_1">Получение URL сайта</string>
+    <string name="new_site_creation_creating_site_loading_subtitle">Ваш сайт вскоре будет готов</string>
+    <string name="new_site_creation_creating_site_loading_title">Ура!\nПочти всё готово</string>
     <string name="pages_and_posts_cancel_auto_upload">Отменить загрузку</string>
-    <string name="weekday_sunday">Воскресенье</string>
-    <string name="weekday_monday">Понедельник</string>
-    <string name="weekday_tuesday">Вторник</string>
-    <string name="weekday_wednesday">Среда</string>
-    <string name="weekday_thursday">Четверг</string>
-    <string name="weekday_friday">Пятница</string>
-    <string name="weekday_saturday">Суббота</string>
-    <string name="photo_picker_gif">Выберите из Tenor</string>
-    <string name="gif_picker_search_hint">Поиск в Tenor</string>
+    <string name="gif_list_search_returned_unknown_error">Возникла проблема с вашим запросом.</string>
     <string name="gif_powered_by_tenor">GIF с сервиса Tenor</string>
-    <string name="media_accessing_progress">Доступ к содержимому личного сайта</string>
+    <string name="gif_picker_search_hint">Поиск в Tenor</string>
+    <string name="photo_picker_gif">Выберите из Tenor</string>
+    <string name="weekday_saturday">Суббота</string>
+    <string name="weekday_friday">Пятница</string>
+    <string name="weekday_thursday">Четверг</string>
+    <string name="weekday_wednesday">Среда</string>
+    <string name="weekday_tuesday">Вторник</string>
+    <string name="weekday_monday">Понедельник</string>
+    <string name="weekday_sunday">Воскресенье</string>
     <string name="media_accessing_failed">Доступ к содержимому личного сайта не удался, некоторые медиафайлы могут быть недоступны.</string>
+    <string name="media_accessing_progress">Доступ к содержимому личного сайта</string>
     <string name="error_failed_to_crop_and_save_image">Ошибка обрезки и сохранения изображения, попробуйте снова.</string>
-    <string name="error_page_not_published_private">Невозможно завершить это действие и опубликовать личную страницу.</string>
-    <string name="error_page_not_scheduled">Невозможно завершить это действие и запланировать страницу к публикации.</string>
-    <string name="error_page_not_submitted">Невозможно завершить это действие и отправить страницу на одобрение.</string>
-    <string name="error_unknown_page_type">Неизвестный формат страницы</string>
-    <string name="preview_image_description">Предварительный просмотр изображения</string>
     <string name="failed_to_load_image_tap_to_retry">Невозможно загрузить изображение.\nНажмите для повтора.</string>
-    <string name="error_media_recover_page_not_submitted">Невозможно загрузить этот медиафайл и отправить страницу на одобрение.</string>
-    <string name="error_page_not_published_retrying">Невозможно опубликовать страницу, но мы попробуем ещё раз позже.</string>
-    <string name="error_page_not_published_retrying_private">Невозможно опубликовать эту личную страницу, но мы попробуем ещё раз позже.</string>
-    <string name="error_page_not_scheduled_retrying">Невозможно запланировать публикацию страницы, но мы попробуем ещё раз позже.</string>
-    <string name="error_page_not_submitted_retrying">Невозможно отправить страницу на одобрение, но мы попробуем ещё раз позже.</string>
+    <string name="preview_image_description">Предварительный просмотр изображения</string>
+    <string name="error_unknown_page_type">Неизвестный формат страницы</string>
+    <string name="error_page_not_submitted">Невозможно завершить это действие и отправить страницу на одобрение.</string>
+    <string name="error_page_not_scheduled">Невозможно завершить это действие и запланировать страницу к публикации.</string>
+    <string name="error_page_not_published_private">Невозможно завершить это действие и опубликовать личную страницу.</string>
     <string name="error_page_not_published">Действие не было завершено, страница не была опубликована.</string>
-    <string name="page_waiting_for_connection_private">Личная запись будет опубликована, когда на вашем устройстве будет доступ к сети.</string>
-    <string name="page_waiting_for_connection_draft">Черновик будет сохранён, когда на вашем устройстве будет доступ к сети.</string>
-    <string name="error_media_recover_page_not_published">Невозможно загрузить этот медиафайл и опубликовать страницу.</string>
-    <string name="error_media_recover_page_not_published_private">Невозможно загрузить этот медиафайл и опубликовать личную страницу.</string>
+    <string name="error_page_not_submitted_retrying">Невозможно отправить страницу на одобрение, но мы попробуем ещё раз позже.</string>
+    <string name="error_page_not_scheduled_retrying">Невозможно запланировать публикацию страницы, но мы попробуем ещё раз позже.</string>
+    <string name="error_page_not_published_retrying_private">Невозможно опубликовать эту личную страницу, но мы попробуем ещё раз позже.</string>
+    <string name="error_page_not_published_retrying">Невозможно опубликовать страницу, но мы попробуем ещё раз позже.</string>
+    <string name="error_media_recover_page_not_submitted">Невозможно загрузить этот медиафайл и отправить страницу на одобрение.</string>
     <string name="error_media_recover_page_not_scheduled">Невозможно загрузить этот медиафайл и запланировать страницу к публикации.</string>
-    <string name="local_page_autosave_revision_available">Вы внесли, но не сохранили изменения на этой странице.</string>
-    <string name="error_publish_page_no_network">Нет доступа к сети. Страница сохранена локально.</string>
-    <string name="page_uploading">Загрузка страницы</string>
-    <string name="page_queued">Страница в очереди</string>
-    <string name="page_waiting_for_connection_publish">Страница будет опубликована при появлении подключения к сети.</string>
-    <string name="page_waiting_for_connection_pending">Страница будет отправлена на одобрение, когда на вашем устройстве будет доступ к сети.</string>
+    <string name="error_media_recover_page_not_published_private">Невозможно загрузить этот медиафайл и опубликовать личную страницу.</string>
+    <string name="error_media_recover_page_not_published">Невозможно загрузить этот медиафайл и опубликовать страницу.</string>
+    <string name="page_waiting_for_connection_draft">Черновик будет сохранён, когда на вашем устройстве будет доступ к сети.</string>
+    <string name="page_waiting_for_connection_private">Личная запись будет опубликована, когда на вашем устройстве будет доступ к сети.</string>
     <string name="page_waiting_for_connection_scheduled">Публикация страницы будет запланирована при появлении подключения к сети.</string>
-    <string name="dialog_confirm_autosave_body_first_part_for_page">Вы недавно внесли изменения в эту страницу, но не сохранили их. Выберите версию для загрузки:\n\n</string>
-    <string name="app_theme">Внешний вид</string>
-    <string name="app_theme_light">Светлая</string>
-    <string name="app_theme_dark">Тёмная</string>
-    <string name="app_theme_default">В зависимости от заряда аккумулятора</string>
-    <string name="quickpress_shortcut_activity_label">Выберите блог для ярлыка QuickPress</string>
-    <string name="editor_page_saved_online">Страница сохранена в Интернете.</string>
-    <string name="editor_page_saved_locally">Страница сохранена на устройстве</string>
-    <string name="editor_page_saved_locally_failed_media">Эта страница сохранена локально: она содержит медиафайлы, загрузка которых не удалась.</string>
+    <string name="page_waiting_for_connection_pending">Страница будет отправлена на одобрение, когда на вашем устройстве будет доступ к сети.</string>
+    <string name="page_waiting_for_connection_publish">Страница будет опубликована при появлении подключения к сети.</string>
+    <string name="page_queued">Страница в очереди</string>
+    <string name="page_uploading">Загрузка страницы</string>
+    <string name="error_publish_page_no_network">Нет доступа к сети. Страница сохранена локально.</string>
+    <string name="local_page_autosave_revision_available">Вы внесли, но не сохранили изменения на этой странице.</string>
     <string name="editor_uploading_page">Выполняется загрузка страница</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Мы предлагаем спектр услуг для достижения ваших результатов. Пока  не знаете что именно вам нужно и чего это будет стоить? Мы можем проконсультировать вас! Свяжитесь с нами ниже.</string>
-    <string name="gutenberg_native_what_people_say">Люди говорят</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Мы небольшая команда талантливых профессионалов с широким спектром навыков и опытом. Мы страстно любим свое дело. Мы стремимся начать работать с вами.</string>
-    <string name="gutenberg_native_walt_disney">Уолт Дисней</string>
-    <string name="gutenberg_native_want_to_work_with_us">Хотите работать с нами?</string>
-    <string name="gutenberg_native_warning_message">Предупреждающее сообщение</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Посетителям интересно узнать кто за той стороной экрана. Используйте это место для того, чтобы написать о себе, о сайте, о своем бизнесе или чём угодно еще. Используйте отзывы ниже для цитат, на одну тему, своими словами.</string>
-    <string name="gutenberg_native_position_or_job_title">Должность</string>
-    <string name="gutenberg_native_project_name">Имя проекта</string>
-    <string name="gutenberg_native_sally_smith">Елена Васина</string>
-    <string name="gutenberg_native_samuel_the_dog">котёнок Гав</string>
-    <string name="gutenberg_native_services">Услуги</string>
+    <string name="editor_page_saved_locally_failed_media">Эта страница сохранена локально: она содержит медиафайлы, загрузка которых не удалась.</string>
+    <string name="editor_page_saved_locally">Страница сохранена на устройстве</string>
+    <string name="editor_page_saved_online">Страница сохранена в Интернете.</string>
+    <string name="quickpress_shortcut_activity_label">Выберите блог для ярлыка QuickPress</string>
+    <string name="app_theme_default">В зависимости от заряда аккумулятора</string>
+    <string name="app_theme_dark">Тёмная</string>
+    <string name="app_theme_light">Светлая</string>
+    <string name="app_theme">Внешний вид</string>
+    <string name="dialog_confirm_autosave_body_first_part_for_page">Вы недавно внесли изменения в эту страницу, но не сохранили их. Выберите версию для загрузки:\n\n</string>
     <string name="gutenberg_native_show_post_content">Показать содержимое записи</string>
-    <string name="gutenberg_native_strategy">Стратегия</string>
-    <string name="gutenberg_native_success_message">Сообщение об успехе</string>
-    <string name="gutenberg_native_team">Команда</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Чтобы начать, нужно перестать говорить и начать делать.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Это шаблонное содержимое для иллюстрации возможностей. Удалите или замените его своим.</string>
-    <string name="gutenberg_native_usa">СССР</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Давайте общаться 👋 Не стесняйтесь воспользоваться контактной информацией ниже или послать сообщение через форму.</string>
-    <string name="gutenberg_native_link_to">Ссылка на</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Мое портфолио демонстрирует различные проекты созданные в течении моей карьеры. Информация для договора представлена ниже, свяжитесь со мной.</string>
     <string name="gutenberg_native_only_show_excerpt">Показывать только отрывок</string>
-    <string name="gutenberg_native_portfolio">Портфолио</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Давайте сотворим что-нибудь вместе!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Давайте сотворим что-нибудь вместе!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Напишите мне: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
+    <string name="gutenberg_native_link_to">Ссылка на</string>
+    <string name="gutenberg_native_link_settings">Настройки ссылок</string>
     <string name="gutenberg_native_excerpt_length_words">Длина отрывка (слов)</string>
-    <string name="gutenberg_native_get_in_touch">Присоединяйтесь</string>
-    <string name="gutenberg_native_inspiration">Вдохновение</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Именно наш выбор, Гарри, определяет, что мы есть на самом деле, куда в большей степени, чем наши способности.</string>
-    <string name="gutenberg_native_j_k_rowling">Дж. К. Роулинг</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Don’t cry because it’s over, smile because it happened.</string>
-    <string name="gutenberg_native_city_10100">Воронеж, 394077</string>
     <string name="gutenberg_native_customize">НАСТРОИТЬ</string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Описание проекта и представляемых работ.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Короткая биография, ключевые достижения или интересные факты.</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Краткое описание предлагаемых услуг.</string>
+    <string name="gutenberg_native_video_settings">Настройки видео</string>
     <string name="gutenberg_native_add_paragraph_block">Добавить блок параграфа</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">улица Лизюкова 2</string>
-    <string name="my_site_select_domains_page_title">Адрес сайта</string>
-    <string name="dialog_title_sharing_facebook_account_must_have_pages">Нет подключения</string>
-    <string name="sharing_facebook_account_must_have_pages">Подключение к Facebook не может обнаружить страниц, Publicize не может использовать профили Facebook, только страницы.</string>
-    <string name="post_list_tab_published_posts">Опубликованные</string>
-    <string name="post_list_tab_scheduled_posts">Запланированные</string>
-    <string name="post_list_tab_trashed_posts">В корзине</string>
     <string name="create_post_page_fab_tooltip_contributors">Создать запись</string>
-    <string name="dlg_confirm_action_trash">В корзину</string>
-    <string name="dlg_cancel_action_dont_trash">Не удалять</string>
-    <string name="notifications_tab_title_unread_notifications">Непрочитанные</string>
-    <string name="notifications_tab_title_comments">Комментарии</string>
-    <string name="notifications_tab_title_follows">Подписки</string>
+    <string name="post_list_tab_trashed_posts">В корзине</string>
+    <string name="post_list_tab_scheduled_posts">Запланированные</string>
+    <string name="post_list_tab_published_posts">Опубликованные</string>
+    <string name="sharing_facebook_account_must_have_pages">Подключение к Facebook не может обнаружить страниц, Publicize не может использовать профили Facebook, только страницы.</string>
+    <string name="dialog_title_sharing_facebook_account_must_have_pages">Нет подключения</string>
     <string name="notifications_tab_title_likes">Отметки \"Нравится\"</string>
-    <string name="stats_management_add_new_stats_card">Добавить новую карточку статистики</string>
-    <string name="stats_management_screen_title">Добавить новую карточку</string>
-    <string name="stats_insights_management_general">Общее</string>
-    <string name="stats_insights_management_posts_and_pages">Записи и страницы</string>
+    <string name="notifications_tab_title_follows">Подписки</string>
+    <string name="notifications_tab_title_comments">Комментарии</string>
+    <string name="notifications_tab_title_unread_notifications">Непрочитанные</string>
+    <string name="dlg_cancel_action_dont_trash">Не удалять</string>
+    <string name="dlg_confirm_action_trash">В корзину</string>
     <string name="stats_insights_management_activity">Активность</string>
-    <string name="reader_filter_self_hosted_empty_sites_tags_action">Войти на WordPress.com</string>
-    <string name="reader_btn_remove_filter_content_description">Убрать текущий фильтр</string>
-    <string name="reader_btn_select_filter_content_description">Выберите сайт или метку для фильтрации записей</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Выбрано</string>
-    <string name="reader_bottom_sheet_content_description">Выберите метку или сайт, всплывающее окно</string>
+    <string name="stats_insights_management_posts_and_pages">Записи и страницы</string>
+    <string name="stats_insights_management_general">Общее</string>
+    <string name="stats_management_screen_title">Добавить новую карточку</string>
+    <string name="stats_management_add_new_stats_card">Добавить новую карточку статистики</string>
     <string name="reader_self_hosted_select_filter">Используйте кнопку фильтра для поиска записей по интересующим темам</string>
+    <string name="reader_bottom_sheet_content_description">Выберите метку или сайт, всплывающее окно</string>
+    <string name="reader_btn_select_filter_content_description">Выберите сайт или метку для фильтрации записей</string>
+    <string name="reader_btn_remove_filter_content_description">Убрать текущий фильтр</string>
     <string name="reader_title_subs">Управление темами и сайтами</string>
-    <string name="reader_filter_self_hosted_empty_sites_list">Войдите на WordPress.com, чтобы увидеть последние записи с сайтов, на которые вы подписаны</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">Войти на WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Войдите на WordPress.com, чтобы увидеть последние записи по темам, на которые вы подписаны</string>
-    <string name="reader_filter_empty_sites_list">Читайте свежие записи с сайтов, на которые вы подписаны</string>
-    <string name="reader_filter_empty_sites_action">Подписаться на сайт</string>
-    <string name="gutenberg_native_add_block_after">Добавить блок после</string>
-    <string name="gutenberg_native_add_block_before">Добавить блок перед</string>
-    <string name="gutenberg_native_add_to_beginning">Добавить в начале</string>
-    <string name="gutenberg_native_add_to_end">Добавить в конце</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Войдите на WordPress.com, чтобы увидеть последние записи с сайтов, на которые вы подписаны</string>
     <string name="gutenberg_native_replace_current_block">Заменить текущий блок</string>
-    <string name="gutenberg_native_template_preview">Предварительный просмотр шаблона</string>
-    <string name="reader_filter_empty_tags_list">Вы можете подписаться на определенную тему добавив её</string>
+    <string name="gutenberg_native_add_to_end">Добавить в конце</string>
+    <string name="gutenberg_native_add_to_beginning">Добавить в начале</string>
+    <string name="gutenberg_native_add_block_before">Добавить блок перед</string>
+    <string name="gutenberg_native_add_block_after">Добавить блок после</string>
     <string name="reader_filter_empty_tags_action">Добавить тему</string>
-    <string name="reader_filter_cta">Фильтр</string>
+    <string name="reader_filter_empty_sites_action">Подписаться на сайт</string>
+    <string name="reader_filter_empty_tags_list">Вы можете подписаться на определенную тему добавив её</string>
+    <string name="reader_filter_empty_sites_list">Читайте свежие записи с сайтов, на которые вы подписаны</string>
     <string name="reader_filter_main_title">Подписки</string>
-    <string name="gutenberg_native_add_a_shortcode">Добавить шорткод…</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Нажмите дважды для выбора макета</string>
+    <string name="reader_filter_cta">Фильтр</string>
     <string name="gutenberg_native_video_caption_s">Подпись к видео. %s</string>
     <string name="gutenberg_native_edit_video">Изменить видео</string>
-    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
-    <string name="stats_box_type_low">низкий</string>
-    <string name="stats_box_type_medium">средний</string>
-    <string name="stats_box_type_high">высокий</string>
-    <string name="stats_box_type_very_high">очень высокий</string>
-    <string name="stats_posting_activity_action">пролистать всю статистику за этот период</string>
-    <string name="stats_posting_activity_content_description">Дни с %1$s просмотрами для %2$s были : %2$s %3$s.Нажмите для подробностей.</string>
-    <string name="stats_posting_activity_label_content_description">Активность публикаций для %1$s</string>
-    <string name="stats_posting_activity_empty_description">Нет статистики за этот период.</string>
-    <string name="stats_posting_activity_end_description">Вы прослушали всю статистику за этот период.\n   Повторное нажатие перезапустит сначала.</string>
-    <string name="fab_create_desc">Создать запись</string>
+    <string name="gutenberg_native_add_a_shortcode">Добавить шорткод…</string>
     <string name="post_list_author">Автор записи</string>
+    <string name="fab_create_desc">Создать запись</string>
+    <string name="stats_posting_activity_end_description">Вы прослушали всю статистику за этот период.\n   Повторное нажатие перезапустит сначала.</string>
+    <string name="stats_posting_activity_empty_description">Нет статистики за этот период.</string>
+    <string name="stats_posting_activity_label_content_description">Активность публикаций для %1$s</string>
+    <string name="stats_posting_activity_content_description">Дни с %1$s просмотрами для %2$s были : %2$s %3$s.Нажмите для подробностей.</string>
+    <string name="stats_posting_activity_action">пролистать всю статистику за этот период</string>
+    <string name="stats_box_type_very_high">очень высокий</string>
+    <string name="stats_box_type_high">высокий</string>
+    <string name="stats_box_type_medium">средний</string>
+    <string name="stats_box_type_low">низкий</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Переместить изображение вперед</string>
-    <string name="gutenberg_native_move_image_backward">Переместить изображение назад</string>
+    <string name="gutenberg_native_replace_image">Заменить изображение</string>
     <string name="gutenberg_native_gallery_caption_s">Подпись галереи. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Текущее значение - %2$s</string>
     <string name="create_post_page_fab_tooltip">Создать запись или страницу</string>
     <string name="content_description_person_building_website">Личность, создающая сайт</string>
     <string name="post_signup_interstitial_not_right_now">Не сейчас</string>
@@ -482,220 +872,199 @@ Language: ru
     <string name="my_site_bottom_sheet_add_post">Запись блога</string>
     <string name="my_site_bottom_sheet_title">Добавить</string>
     <string name="post_settings_publish">Опубликовать</string>
-    <string name="dialog_gutenberg_informative_description_v2">Мы значительно улучшили редактор блоков. Вы должны его попробовать! Мы включили редактор блоков для новых записей и страниц. Если вы захотите вернуться на классический редактор, то перейдите в \'Мой сайт\' > \'Настройки сайта\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Синхронизировать сейчас</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Эта запись будет синхронизирована прямо сейчас.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Готовы начать синхронизацию?</string>
-    <string name="login_promo_viewpager_content_description">Вступление</string>
-    <string name="negative_prefix">-%s</string>
     <string name="new_site_creation_unavailable_domain">Этот домен недоступен</string>
-    <string name="login_discovery_error_http_auth">Мы не смогли подключиться к сайту, поскольку он требует &lt;b>HTTP авторизации&lt;/b>. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
-    <string name="login_discovery_error_ssl">Мы не смогли подключиться к сайту, поскольку имеется проблема с &lt;b>сертификатом SSL&lt;/b>. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
+    <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Мы не смогли подключиться к сайту. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
-    <string name="reader_following_display_name">Подписчик</string>
-    <string name="send_verification_email">Отправить письмо с подтверждением</string>
+    <string name="login_discovery_error_ssl">Мы не смогли подключиться к сайту, поскольку имеется проблема с &lt;b&gt;сертификатом SSL&lt;/b&gt;. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
+    <string name="login_discovery_error_http_auth">Мы не смогли подключиться к сайту, поскольку он требует &lt;b&gt;HTTP авторизации&lt;/b&gt;. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
+    <string name="login_discovery_error_xmlrpc">Мы не смогли подключиться к &lt;b&gt;XMLRPC&lt;/b&gt; сайта. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
+    <string name="login_site_credentials_magic_link_label">Почти готово! Нужно только проверить адрес эл.почты подключения Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Войдите с именем пользователя и паролем для сайта %1$s</string>
-    <string name="login_site_credentials_magic_link_label">Почти готово! Нужно только проверить адрес эл.почты подключения Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="login_discovery_error_xmlrpc">Мы не смогли подключиться к &lt;b>XMLRPC&lt;/b> сайта. Возможно потребуется обратиться в техподдержку хостинга, чтобы решить эту проблему.</string>
     <string name="my_site_bottom_sheet_add_page">Страница сайта</string>
-    <string name="enter_site_credentials_instead">Войти с именем пользователя и паролем cайта.</string>
-    <string name="suffix_1_000">%sк</string>
-    <string name="suffix_1_000_000_000">%sГ</string>
-    <string name="suffix_1_000_000">%sМ</string>
-    <string name="suffix_1_000_000_000_000_000">%sП</string>
-    <string name="suffix_1_000_000_000_000">%sТ</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sЭ</string>
-    <string name="reader_filter_sites_title">Сайты</string>
-    <string name="site_cannot_be_loaded">Сейчас невозможно загрузить данные для вашего сайта. Попробуйте позже.</string>
+    <string name="reader_following_display_name">Подписчик</string>
     <string name="reader_my_likes_display_name">Отметки \"Нравится\"</string>
     <string name="reader_discover_display_name">Найти</string>
     <string name="reader_save_for_later_display_name">Сохранено</string>
-    <string name="posts_cannot_be_started">Сейчас невозможно загрузить записи вашего сайта. Попробуйте позже.</string>
     <string name="reader_filter_tags_title">Темы</string>
+    <string name="reader_filter_sites_title">Сайты</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sЭ</string>
+    <string name="suffix_1_000_000_000_000_000">%sП</string>
+    <string name="suffix_1_000_000_000_000">%sТ</string>
+    <string name="suffix_1_000_000_000">%sГ</string>
+    <string name="suffix_1_000_000">%sМ</string>
+    <string name="suffix_1_000">%sк</string>
+    <string name="posts_cannot_be_started">Сейчас невозможно загрузить записи вашего сайта. Попробуйте позже.</string>
+    <string name="site_cannot_be_loaded">Сейчас невозможно загрузить данные для вашего сайта. Попробуйте позже.</string>
     <string name="gutenberg_native_wordpress_media_library">Медиатека WordPress</string>
+    <string name="gutenberg_native_unsupported">Не поддерживается</string>
+    <string name="gutenberg_native_ungroup">Разгруппировать</string>
+    <string name="gutenberg_native_translate">Перевести</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">Нажмите, чтобы скрыть клавиатуру</string>
+    <string name="gutenberg_native_tap_here_to_show_help">Нажмите тут для показа справки</string>
+    <string name="gutenberg_native_take_a_video">Записать видео</string>
+    <string name="gutenberg_native_take_a_photo_or_video">Сделать фото или записать видео</string>
     <string name="gutenberg_native_take_a_photo">Сделать фото</string>
     <string name="gutenberg_native_start_writing">Начните писать…</string>
-    <string name="gutenberg_native_take_a_photo_or_video">Сделать фото или записать видео</string>
-    <string name="gutenberg_native_take_a_video">Записать видео</string>
-    <string name="gutenberg_native_tap_here_to_show_help">Нажмите тут для показа справки</string>
-    <string name="gutenberg_native_tap_to_hide_the_keyboard">Нажмите, чтобы скрыть клавиатуру</string>
-    <string name="gutenberg_native_title">Заголовок:</string>
-    <string name="gutenberg_native_translate">Перевести</string>
-    <string name="gutenberg_native_ungroup">Разгруппировать</string>
-    <string name="gutenberg_native_reset_block">Сбросить блок</string>
-    <string name="gutenberg_native_s_block_empty">Блок %s. Пустой</string>
-    <string name="gutenberg_native_s_block_this_block_has_invalid_content">Блок %s. Блок имеет неверное содержимое.</string>
     <string name="gutenberg_native_show_section">Показать раздел</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Плагин заголовка боковой панели</string>
-    <string name="gutenberg_native_size">Размер</string>
+    <string name="gutenberg_native_s_block_this_block_has_invalid_content">Блок %s. Блок имеет неверное содержимое.</string>
+    <string name="gutenberg_native_s_block_empty">Блок %s. Пустой</string>
     <string name="gutenberg_native_cut_block">Вырезать блок</string>
-    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Отсутствует приложения для обработки этого запроса. Пожалуйста, установите веб-браузер.</string>
-    <string name="gutenberg_native_open_settings">Открыть настройки</string>
-    <string name="gutenberg_native_page_break_block_s">Блок разрыва страницы. %s</string>
-    <string name="gutenberg_native_paste_url">Вставьте URL</string>
-    <string name="gutenberg_native_post_title_empty">Название записи. Пустое.</string>
-    <string name="gutenberg_native_post_title_s">Название записи. %s</string>
-    <string name="gutenberg_native_problem_displaying_block">Проблема отображения блока</string>
     <string name="gutenberg_native_problem_opening_the_video">Проблема с открытием видео</string>
-    <string name="gutenberg_native_remove_annotations">Удалить аннотации</string>
-    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Переместить блок вниз из ряда %1$s в ряд %2$s</string>
-    <string name="gutenberg_native_move_block_up">Переместить блок вверх</string>
-    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Переместить блок вверх из ряда %1$s в ряд %2$s</string>
-    <string name="gutenberg_native_my_document_setting_panel">Панель настроек моего документа</string>
-    <string name="gutenberg_native_my_post_publish_panel">Панель публикации моей записи</string>
-    <string name="gutenberg_native_my_post_status_info">Информация о состоянии моей записи</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Моя панель перед публикацией</string>
+    <string name="gutenberg_native_problem_displaying_block">Проблема отображения блока</string>
+    <string name="gutenberg_native_post_title_s">Название записи. %s</string>
+    <string name="gutenberg_native_post_title_empty">Название записи. Пустое.</string>
+    <string name="gutenberg_native_paste_url">Вставьте URL</string>
+    <string name="gutenberg_native_page_break_block_s">Блок разрыва страницы. %s</string>
+    <string name="gutenberg_native_open_settings">Открыть настройки</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Отсутствует приложения для обработки этого запроса. Пожалуйста, установите веб-браузер.</string>
     <string name="gutenberg_native_navigate_up">Перейти наверх</string>
-    <string name="gutenberg_native_double_tap_to_undo_last_change">Нажмите дважды для отмены последнего действия</string>
-    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Невозможно вставить медиафайл.\nНажмите для выбора вариантов.</string>
-    <string name="gutenberg_native_help_icon">Значок справки</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Это содержимое панели!</string>
-    <string name="gutenberg_native_hide_keyboard">Скрыть клавиатуру</string>
-    <string name="gutenberg_native_image_caption_s">Подпись к изображению. %s</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Переместить блок вверх из ряда %1$s в ряд %2$s</string>
+    <string name="gutenberg_native_move_block_up">Переместить блок вверх</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Переместить блок вниз из ряда %1$s в ряд %2$s</string>
     <string name="gutenberg_native_move_block_down">Переместить блок ниже</string>
-    <string name="gutenberg_native_double_tap_to_redo_last_change">Нажмите дважды для повторения последнего изименения</string>
-    <string name="gutenberg_native_double_tap_to_select">Нажмите дважды для выбора</string>
-    <string name="gutenberg_native_double_tap_to_select_a_video">Нажмите дважды для выбора видео</string>
-    <string name="gutenberg_native_double_tap_to_select_an_image">Нажмите дважды для выбора изображения</string>
+    <string name="gutenberg_native_image_caption_s">Подпись к изображению. %s</string>
+    <string name="gutenberg_native_hide_keyboard">Скрыть клавиатуру</string>
+    <string name="gutenberg_native_help_icon">Значок справки</string>
+    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Невозможно вставить медиафайл.\nНажмите для выбора вариантов.</string>
+    <string name="gutenberg_native_double_tap_to_undo_last_change">Нажмите дважды для отмены последнего действия</string>
     <string name="gutenberg_native_double_tap_to_toggle_setting">Нажмите дважды для переключения настройки</string>
-    <string name="gutenberg_native_double_tap_to_add_a_block">Нажмите дважды для добавления блока</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Нажмите дважды и измените значение используя ползунок</string>
-    <string name="gutenberg_native_double_tap_to_edit_this_value">Нажмите дважды для изменения</string>
-    <string name="gutenberg_native_double_tap_to_move_the_block_down">Нажмите дважды для перемещения блока вниз</string>
+    <string name="gutenberg_native_double_tap_to_select_an_image">Нажмите дважды для выбора изображения</string>
+    <string name="gutenberg_native_double_tap_to_select_a_video">Нажмите дважды для выбора видео</string>
+    <string name="gutenberg_native_double_tap_to_select">Нажмите дважды для выбора</string>
+    <string name="gutenberg_native_double_tap_to_redo_last_change">Нажмите дважды для повторения последнего изименения</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Нажмите дважды для перемещения блока вверх</string>
-    <string name="gutenberg_native_annotations_sidebar">Боковая панель аннотаций</string>
-    <string name="gutenberg_native_choose_from_device">Выбрать с устройства</string>
-    <string name="gutenberg_native_content">Содержимое…</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_down">Нажмите дважды для перемещения блока вниз</string>
+    <string name="gutenberg_native_double_tap_to_edit_this_value">Нажмите дважды для изменения</string>
+    <string name="gutenberg_native_double_tap_to_add_a_block">Нажмите дважды для добавления блока</string>
     <string name="gutenberg_native_current_value_is_s">Текущее значение - %s</string>
-    <string name="gutenberg_native_add_a_description">Добавить описание</string>
-    <string name="gutenberg_native_add_annotation">Добавить аннотацию</string>
-    <string name="gutenberg_native_add_image">ДОБАВИТЬ ИЗОБРАЖЕНИЕ</string>
+    <string name="gutenberg_native_choose_from_device">Выбрать с устройства</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Произошла неизвестная ошибка. Повторите попытку.</string>
+    <string name="gutenberg_native_alt_text">Текст атрибута alt</string>
+    <string name="gutenberg_native_add_video">ДОБАВИТЬ ВИДЕО</string>
+    <string name="gutenberg_native_add_url">Добавить URL</string>
+    <string name="gutenberg_native_add_alt_text">Добавить текст alt</string>
     <string name="gutenberg_native_add_image_or_video">ДОБАВИТЬ ИЗОБРАЖЕНИЕ ИЛИ ВИДЕО</string>
+    <string name="gutenberg_native_add_image">ДОБАВИТЬ ИЗОБРАЖЕНИЕ</string>
     <string name="gutenberg_native_add_block_here">ДОБАВИТЬ БЛОК ЗДЕСЬ</string>
-    <string name="gutenberg_native_add_url">Добавить URL</string>
-    <string name="gutenberg_native_add_video">ДОБАВИТЬ ВИДЕО</string>
-    <string name="gutenberg_native_alt_text">Текст атрибута alt</string>
-    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Произошла неизвестная ошибка. Повторите попытку.</string>
-    <string name="reader_acessibility_list_loaded">\"Загружен список из %1$d элементов.\"</string>
     <string name="reader_empty_saved_posts_content_description">Нажмите на кнопку добавления в сохраненные записи для сохранения записи в ваш список.</string>
-    <string name="master_switch_default_title_on">Вкл.</string>
-    <string name="master_switch_default_title_off">Выкл.</string>
-    <string name="notifications_tab_dialog_master_off_message">Отключение уведомлений для этого сайта выключит их отображение на вкладке уведомлений. Вы можете настроить какие из уведомлений вы хотите видеть, после того как включите уведомления.</string>
+    <string name="reader_acessibility_list_loaded">\"Загружен список из %1$d элементов.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Уведомления</string>
-    <string name="dialog_gutenberg_informative_description_page">Сейчас вы используете редактор блоков для новых страниц. Отлично! Если захотите изменить редактор на классический, то сделайте это в \'Мой сайт\'>\'Настройки сайта\',</string>
-    <string name="notifications_tab_dialog_master_status_on">Уведомления для этого сайта</string>
-    <string name="notifications_tab_dialog_master_status_off">Уведомления для этого сайта</string>
-    <string name="notifications_tab_dialog_master_hint_on">Выключить отображение уведомлений для этого сайта на вкладке уведомлений</string>
-    <string name="notifications_tab_dialog_master_hint_off">Включить отображение уведомлений для этого сайта на вкладке уведомлений</string>
-    <string name="notifications_tab_dialog_master_off_title">Для просмотра уведомлений от этого сайта на вкладке уведомлений включите уведомления для сайта.</string>
-    <string name="dialog_gutenberg_informative_description_post">Сейчас вы используете редактор блоков для новых записей. Отлично! Если захотите изменить редактор на классический, то сделайте это в \'Мой сайт\'>\'Настройки сайта\',</string>
+    <string name="main_switch_default_title_off">Выкл.</string>
+    <string name="main_switch_default_title_on">Вкл.</string>
+    <string name="notifications_tab_dialog_main_off_message">Отключение уведомлений для этого сайта выключит их отображение на вкладке уведомлений. Вы можете настроить какие из уведомлений вы хотите видеть, после того как включите уведомления.</string>
+    <string name="notifications_tab_dialog_main_off_title">Для просмотра уведомлений от этого сайта на вкладке уведомлений включите уведомления для сайта.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Включить отображение уведомлений для этого сайта на вкладке уведомлений</string>
+    <string name="notifications_tab_dialog_main_hint_on">Выключить отображение уведомлений для этого сайта на вкладке уведомлений</string>
+    <string name="notifications_tab_dialog_main_status_off">Уведомления для этого сайта</string>
+    <string name="notifications_tab_dialog_main_status_on">Уведомления для этого сайта</string>
     <string name="pick_media">Добавить изображение или видео</string>
-    <string name="error_post_not_published_retrying_private">Невозможно опубликовать эту личную запись, но мы попробуем ещё раз позже.</string>
-    <string name="error_post_not_scheduled_retrying">Невозможно запланировать публикацию записи, но мы попробуем ещё раз позже.</string>
     <string name="error_post_not_submitted_retrying">Невозможно отправить запись на одобрение, но мы попробуем ещё раз позже.</string>
-    <string name="error_post_not_published">Невозможно завершить это действие и опубликовать запись.</string>
-    <string name="error_post_not_published_private">Невозможно завершить это действие и опубликовать личную запись.</string>
-    <string name="error_post_not_scheduled">Невозможно завершить это действие и запланировать запись к публикации.</string>
-    <string name="error_post_not_submitted">Невозможно завершить это действие и отправить запись на одобрение.</string>
+    <string name="error_post_not_scheduled_retrying">Невозможно запланировать публикацию записи, но мы попробуем ещё раз позже.</string>
+    <string name="error_post_not_published_retrying_private">Невозможно опубликовать эту личную запись, но мы попробуем ещё раз позже.</string>
     <string name="error_post_not_published_retrying">Невозможно опубликовать запись, но мы попробуем ещё раз позже.</string>
-    <string name="error_media_recover_post">Невозможно загрузить этот медиафайл.</string>
-    <string name="error_media_recover_post_not_published">Невозможно загрузить этот медиафайл и опубликовать запись.</string>
-    <string name="error_media_recover_post_not_published_private">Невозможно загрузить этот медиафайл и опубликовать личную запись.</string>
-    <string name="error_media_recover_post_not_scheduled">Невозможно загрузить этот медиафайл и запланировать записть на публикацию.</string>
+    <string name="error_post_not_submitted">Невозможно завершить это действие и отправить запись на одобрение.</string>
+    <string name="error_post_not_scheduled">Невозможно завершить это действие и запланировать запись к публикации.</string>
+    <string name="error_post_not_published_private">Невозможно завершить это действие и опубликовать личную запись.</string>
+    <string name="error_post_not_published">Невозможно завершить это действие и опубликовать запись.</string>
     <string name="error_media_recover_post_not_submitted">Невозможно загрузить этот медиафайл и отправить запись на одобрение.</string>
-    <string name="post_preview_remote_auto_saving_post">Создание предварительного просмотра…</string>
-    <string name="remote_preview_operation_error">Ошибка при сохранении записи перед созданием просмотра</string>
-    <string name="preview_unavailable_self_hosted_sites">Просмотр не доступен</string>
-    <string name="error_preview_empty_post">Нельзя просмотреть пустую запись</string>
-    <string name="error_preview_empty_page">Нельзя просмотреть пустую страницу</string>
-    <string name="error_preview_empty_draft">Нельзя просмотреть пустой черновик</string>
-    <string name="error_generic_error">Невозможно завершить это действие.</string>
+    <string name="error_media_recover_post_not_scheduled">Невозможно загрузить этот медиафайл и запланировать записть на публикацию.</string>
+    <string name="error_media_recover_post_not_published_private">Невозможно загрузить этот медиафайл и опубликовать личную запись.</string>
+    <string name="error_media_recover_post_not_published">Невозможно загрузить этот медиафайл и опубликовать запись.</string>
+    <string name="error_media_recover_post">Невозможно загрузить этот медиафайл.</string>
     <string name="error_generic_error_retrying">Невозможно завершить это действие, но мы попробуем ещё раз позже.</string>
-    <string name="local_post_autosave_revision_available">Вы внесли но не сохранили изменения в эту запись</string>
+    <string name="error_generic_error">Невозможно завершить это действие.</string>
+    <string name="error_preview_empty_draft">Нельзя просмотреть пустой черновик</string>
+    <string name="error_preview_empty_page">Нельзя просмотреть пустую страницу</string>
+    <string name="error_preview_empty_post">Нельзя просмотреть пустую запись</string>
+    <string name="preview_unavailable_self_hosted_sites">Просмотр не доступен</string>
+    <string name="remote_preview_operation_error">Ошибка при сохранении записи перед созданием просмотра</string>
+    <string name="post_preview_remote_auto_saving_post">Создание предварительного просмотра…</string>
     <string name="post_preview_saving_draft">Сохранение…</string>
-    <string name="post_waiting_for_connection_draft_cancel">Эти последние изменения не будут сохранены как черновик.</string>
-    <string name="button_delete_permanently">Удалить навсегда</string>
-    <string name="dialog_confirm_autosave_title">Какой вариант вы хотите отредактировать?</string>
-    <string name="dialog_confirm_autosave_body_first_part">Вы недавно внесли изменения в эту запись, но не сохранили их. Выберите версию для загрузки:\n\n</string>
-    <string name="dialog_confirm_autosave_body_second_part">Из приложения\nсохранение от %s\n\nС другого устройства\nсохранение от %s\n</string>
-    <string name="dialog_confirm_autosave_restore_button">Версия с другого устройства</string>
+    <string name="local_post_autosave_revision_available">Вы внесли но не сохранили изменения в эту запись</string>
     <string name="dialog_confirm_autosave_dont_restore_button">Версия из этого приложения</string>
-    <string name="post_waiting_for_connection_private">Личная запись будет опубликована, когда на вашем устройстве будет доступ к сети.</string>
-    <string name="post_waiting_for_connection_draft">Черновик будет сохранён, когда на вашем устройстве будет доступ к сети.</string>
-    <string name="post_waiting_for_connection_publish_cancel">Эти изменения не будут опубликованы.</string>
-    <string name="post_waiting_for_connection_pending_cancel">Эти изменения не будут отправлены на одобрение.</string>
+    <string name="dialog_confirm_autosave_restore_button">Версия с другого устройства</string>
+    <string name="dialog_confirm_autosave_body_second_part">Из приложения\nсохранение от %s\n\nС другого устройства\nсохранение от %s\n</string>
+    <string name="dialog_confirm_autosave_body_first_part">Вы недавно внесли изменения в эту запись, но не сохранили их. Выберите версию для загрузки:\n\n</string>
+    <string name="dialog_confirm_autosave_title">Какой вариант вы хотите отредактировать?</string>
+    <string name="button_delete_permanently">Удалить навсегда</string>
+    <string name="post_waiting_for_connection_draft_cancel">Эти последние изменения не будут сохранены как черновик.</string>
     <string name="post_waiting_for_connection_scheduled_cancel">Эти изменения не будут запланированы к публикации.</string>
-    <string name="post_waiting_for_connection_publish">Запись будет опубликована, когда на вашем устройстве будет доступ к сети.</string>
-    <string name="post_waiting_for_connection_pending">Ваша запись будет отправлена на одобрение, когда на вашем устройстве будет доступ к сети.</string>
+    <string name="post_waiting_for_connection_pending_cancel">Эти изменения не будут отправлены на одобрение.</string>
+    <string name="post_waiting_for_connection_publish_cancel">Эти изменения не будут опубликованы.</string>
+    <string name="post_waiting_for_connection_draft">Черновик будет сохранён, когда на вашем устройстве будет доступ к сети.</string>
+    <string name="post_waiting_for_connection_private">Личная запись будет опубликована, когда на вашем устройстве будет доступ к сети.</string>
     <string name="post_waiting_for_connection_scheduled">Запись будет запланирована к публикации, когда на вашем устройстве будет доступ к сети.</string>
-    <string name="settings_username_changer_progress_dialog">Сохраняем имя пользователя…</string>
-    <string name="settings_username_changer_toast_content">Ваше новое имя пользователя - %1$s</string>
+    <string name="post_waiting_for_connection_pending">Ваша запись будет отправлена на одобрение, когда на вашем устройстве будет доступ к сети.</string>
+    <string name="post_waiting_for_connection_publish">Запись будет опубликована, когда на вашем устройстве будет доступ к сети.</string>
     <string name="settings_username_changer_snackbar_cancel">Это действие не может быть отменено. Имя пользователя могло уже обновиться.</string>
-    <string name="site_settings_performance_and_speed">Производительность и скорость</string>
-    <string name="site_settings_jetpack_performance_settings_hint">Просмотрите и измените настройки производительности Jetpack</string>
-    <string name="settings_username_changer_header">Вы собираетесь изменить имя пользователя (сейчас - %1$s%2$s%3$s). Вы не сможете потом сменить его назад.</string>
-    <string name="settings_username_changer_confirm_dialog_title">Осторожно!</string>
-    <string name="settings_username_changer_confirm_dialog_content">Вы собираетесь сменить имя пользователя на %1$s%2$s%3$s. Это изменение также затронет адреса профилей Gravatar и IntenseDebate. Подтвердите новое имя пользователя для продолжения.</string>
+    <string name="settings_username_changer_toast_content">Ваше новое имя пользователя - %1$s</string>
+    <string name="settings_username_changer_progress_dialog">Сохраняем имя пользователя…</string>
     <string name="settings_username_changer_confirm_dialog_positive_action">Сменить имя пользователя</string>
-    <string name="site_settings_site_accelerator_off">Выкл.</string>
-    <string name="site_settings_faster_images">Быстрая загрузка изображений</string>
-    <string name="site_settings_faster_static_files">Быстрая загрузка статических файлов</string>
-    <string name="site_settings_site_accelerator_summary">Страницы будут загружаться быстрее, если вы разрешите Jetpack оптимизировать изображения и статические файлы (например CSS и JavaScript).</string>
-    <string name="site_settings_media">Медиафайлы</string>
-    <string name="site_settings_ad_free_video_hosting">Видеохостинг без рекламы</string>
-    <string name="site_settings_jetpack_search">Поиск Jetpack</string>
-    <string name="site_settings_improved_search">Улучшенный поиск</string>
-    <string name="site_settings_improved_search_summary">Замена встроенного поиска WordPress на улучшенный</string>
+    <string name="settings_username_changer_confirm_dialog_content">Вы собираетесь сменить имя пользователя на %1$s%2$s%3$s. Это изменение также затронет адреса профилей Gravatar и IntenseDebate. Подтвердите новое имя пользователя для продолжения.</string>
+    <string name="settings_username_changer_confirm_dialog_title">Осторожно!</string>
+    <string name="settings_username_changer_header">Вы собираетесь изменить имя пользователя (сейчас - %1$s%2$s%3$s). Вы не сможете потом сменить его назад.</string>
+    <string name="site_settings_jetpack_performance_settings_hint">Просмотрите и измените настройки производительности Jetpack</string>
+    <string name="site_settings_performance_and_speed">Производительность и скорость</string>
     <string name="site_settings_more">Больше настроек</string>
-    <string name="site_settings_performance">Производительность</string>
-    <string name="site_settings_lazy_load_images_summary">Загрузка изображений в момент появления на экране поможет ускорить работу сайта.</string>
-    <string name="site_settings_site_accelerator">Ускоритель сайта</string>
+    <string name="site_settings_improved_search_summary">Замена встроенного поиска WordPress на улучшенный</string>
+    <string name="site_settings_improved_search">Улучшенный поиск</string>
+    <string name="site_settings_jetpack_search">Поиск Jetpack</string>
+    <string name="site_settings_ad_free_video_hosting">Видеохостинг без рекламы</string>
+    <string name="site_settings_media">Медиафайлы</string>
+    <string name="site_settings_site_accelerator_summary">Страницы будут загружаться быстрее, если вы разрешите Jetpack оптимизировать изображения и статические файлы (например CSS и JavaScript).</string>
+    <string name="site_settings_faster_static_files">Быстрая загрузка статических файлов</string>
+    <string name="site_settings_faster_images">Быстрая загрузка изображений</string>
+    <string name="site_settings_site_accelerator_off">Выкл.</string>
     <string name="site_settings_site_accelerator_on">Вкл.</string>
+    <string name="site_settings_site_accelerator">Ускоритель сайта</string>
+    <string name="site_settings_lazy_load_images_summary">Загрузка изображений в момент появления на экране поможет ускорить работу сайта.</string>
+    <string name="site_settings_performance">Производительность</string>
     <string name="stats_file_downloads_value_label">Загрузки</string>
-    <string name="stats_site_neutral_utc">Часовой пояс сайта (UTC)</string>
-    <string name="stats_site_positive_utc">Часовой пояс сайта (UTC + %s)</string>
-    <string name="stats_site_negative_utc">Часовой пояс сайта (UTC - %s)</string>
-    <string name="stats_data_not_recorded_for_period">Счетчики загрузки файлов не учитывались до 28 июня 2019 года.</string>
-    <string name="stats_file_downloads">Скачанные файлы</string>
     <string name="stats_file_downloads_title_label">Файл</string>
-    <string name="notification_post_will_be_published_in_ten_minutes">\"%s\" будет опубликована через 10 минут</string>
-    <string name="calendar_scheduled_post_title">Запланирована запись: \"%s\"</string>
-    <string name="calendar_scheduled_post_description">\"%s\" запланирована к публикации в \"%s\" в приложении WordPress\n%s</string>
-    <string name="navigate_forward_desc">Вперед</string>
-    <string name="navigate_back_desc">Назад</string>
-    <string name="share_desc">Поделиться</string>
-    <string name="preview_type_desc">Выберите тип предварительного просмотра</string>
-    <string name="close_dialog_button_desc">Закрыть диалог</string>
-    <string name="web_preview_default">По умолчанию</string>
+    <string name="stats_file_downloads">Скачанные файлы</string>
+    <string name="stats_data_not_recorded_for_period">Счетчики загрузки файлов не учитывались до 28 июня 2019 года.</string>
+    <string name="stats_site_negative_utc">Часовой пояс сайта (UTC - %s)</string>
+    <string name="stats_site_positive_utc">Часовой пояс сайта (UTC + %s)</string>
+    <string name="stats_site_neutral_utc">Часовой пояс сайта (UTC)</string>
     <string name="web_preview_desktop">Полная версия</string>
-    <string name="post_notification_when_published">После публикации</string>
-    <string name="post_notification_error">Уведомления не могут быть созданы, если дата публикации уже в прошлом.</string>
-    <string name="notification_scheduled_post">Запланированная запись</string>
-    <string name="notification_scheduled_post_one_hour_reminder">Запланированная запись: напоминание за 1 час</string>
-    <string name="notification_scheduled_post_ten_minute_reminder">Запланированная запись: напоминание за 10 минут</string>
-    <string name="notification_post_has_been_published">\"%s\" опубликована</string>
+    <string name="web_preview_default">По умолчанию</string>
+    <string name="close_dialog_button_desc">Закрыть диалог</string>
+    <string name="preview_type_desc">Выберите тип предварительного просмотра</string>
+    <string name="share_desc">Поделиться</string>
+    <string name="navigate_back_desc">Назад</string>
+    <string name="navigate_forward_desc">Вперед</string>
+    <string name="calendar_scheduled_post_description">\"%s\" запланирована к публикации в \"%s\" в приложении WordPress\n%s</string>
+    <string name="calendar_scheduled_post_title">Запланирована запись: \"%s\"</string>
+    <string name="notification_post_will_be_published_in_ten_minutes">\"%s\" будет опубликована через 10 минут</string>
     <string name="notification_post_will_be_published_in_one_hour">\"%s\" будет опубликована через 1 час</string>
-    <string name="post_settings_notification">Уведомление</string>
-    <string name="post_settings_add_to_calendar">Добавить в календарь</string>
-    <string name="post_notification_off">Выкл.</string>
-    <string name="post_notification_one_hour_before">За один час</string>
+    <string name="notification_post_has_been_published">\"%s\" опубликована</string>
+    <string name="notification_scheduled_post_ten_minute_reminder">Запланированная запись: напоминание за 10 минут</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Запланированная запись: напоминание за 1 час</string>
+    <string name="notification_scheduled_post">Запланированная запись</string>
+    <string name="post_notification_error">Уведомления не могут быть созданы, если дата публикации уже в прошлом.</string>
+    <string name="post_notification_when_published">После публикации</string>
     <string name="post_notification_ten_minutes_before">За 10 минут</string>
+    <string name="post_notification_one_hour_before">За один час</string>
+    <string name="post_notification_off">Выкл.</string>
+    <string name="post_settings_add_to_calendar">Добавить в календарь</string>
+    <string name="post_settings_notification">Уведомление</string>
     <string name="post_settings_time_and_date">Дата и время</string>
     <string name="login_invalid_site_url">Введите полный адрес вебсайта, например example.com.</string>
-    <string name="enter_wordpress_site">Сайт по этому адресу не является сайтом на WordPress. Мы не можем подключиться к нему.</string>
-    <string name="login_need_help_finding_connected_email">Не можете вспомнить адрес эл. почты, указанный при регистрации?</string>
-    <string name="site_settings_editor">Редактор</string>
-    <string name="stats_loading_card">Загрузка данных выбранной карты</string>
-    <string name="stats_overview_content_description">%1$s %2$s за период: %3$s, изменений по сравнению с предыдущим периодом - %4$s</string>
-    <string name="stats_graph_updated">График обновлен.</string>
-    <string name="stats_expand_content_description">Развернуть</string>
-    <string name="stats_collapse_content_description">Свернуть</string>
-    <string name="stats_item_expanded">Элемент развернут</string>
-    <string name="stats_item_collapsed">Элемент свернут</string>
-    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
-    <string name="stats_post_label">Запись</string>
-    <string name="stats_post_views_label">Просмотры</string>
     <string name="enter_email_for_site">Войдите на WordPress.com, чтобы подключиться к %1$s</string>
+    <string name="stats_post_views_label">Просмотры</string>
+    <string name="stats_post_label">Запись</string>
+    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
+    <string name="stats_item_collapsed">Элемент свернут</string>
+    <string name="stats_item_expanded">Элемент развернут</string>
+    <string name="stats_collapse_content_description">Свернуть</string>
+    <string name="stats_expand_content_description">Развернуть</string>
+    <string name="stats_graph_updated">График обновлен.</string>
+    <string name="stats_overview_content_description">%1$s %2$s за период: %3$s, изменений по сравнению с предыдущим периодом - %4$s</string>
+    <string name="stats_loading_card">Загрузка данных выбранной карты</string>
+    <string name="site_settings_editor">Редактор</string>
     <string name="description_expand">Развернуть</string>
     <string name="description_collapse">Свернуть</string>
     <string name="my_site_verify_your_email_without_email">Проверьте ваш адрес электронной почты, на него были посланы инструкции</string>
@@ -709,29 +1078,29 @@ Language: ru
     <string name="post_settings_featured_image_uploading_tap_for_options">Загрузка медиафайла.\n Нажмите для расширенных возможностей.</string>
     <string name="link_open_new_window">Открыть ссылку в новом окне/вкладке</string>
     <string name="stats_widget_error_no_access_token">Для просмотра статистики войдите в вашу учётную запись WordPress.com.</string>
-    <string name="stats_widget_all_time_insights_name">За всё время</string>
-    <string name="stats_widget_today_insights_name">Сегодня</string>
-    <string name="stats_widget_minified_name">На виду</string>
-    <string name="my_site_custom_domain_name">Все тарифы WordPress.com включают возможность зарегистрировать пользовательское имя домена. Сделайте это сейчас.</string>
-    <string name="domains_suggestions_intro_title">Выберите имя домена</string>
-    <string name="domains_suggestions_intro_description">Это то, где люди найдут вас в сети.</string>
-    <string name="post_list_search_prompt">Поиск по записям</string>
     <string name="post_list_search_nothing_found">Нет записей по критериям поиска</string>
+    <string name="post_list_search_prompt">Поиск по записям</string>
+    <string name="domains_suggestions_intro_description">Это то, где люди найдут вас в сети.</string>
+    <string name="domains_suggestions_intro_title">Выберите имя домена</string>
+    <string name="my_site_custom_domain_name">Все тарифы WordPress.com включают возможность зарегистрировать пользовательское имя домена. Сделайте это сейчас.</string>
+    <string name="stats_widget_minified_name">На виду</string>
+    <string name="stats_widget_today_insights_name">Сегодня</string>
+    <string name="stats_widget_all_time_insights_name">За всё время</string>
     <string name="stats_widget_weekly_views_name">Просмотров на этой неделе</string>
     <string name="stats_widget_log_in_message">Войдите в приложение WordPress для добавления виджета.</string>
     <string name="stats_widget_error_no_network">Сеть недоступна</string>
     <string name="stats_widget_error_no_data">Невозможно загрузить данные</string>
-    <string name="stats_widget_add">Добавить виджет</string>
-    <string name="stats_widget_views_title">Просмотров на этой неделе</string>
-    <string name="stats_widget_all_time_title">За всё время</string>
-    <string name="stats_widget_site">Сайт</string>
-    <string name="stats_widget_site_caption">Выберите ваш сайт</string>
-    <string name="stats_widget_color">Цвет</string>
-    <string name="stats_widget_color_light">Светлый</string>
-    <string name="stats_widget_color_dark">Тёмный</string>
-    <string name="stats_widget_select_your_site">Выберите сайт</string>
-    <string name="stats_widget_select_color">Цвет</string>
     <string name="stats_widget_select_type">Тип</string>
+    <string name="stats_widget_select_color">Цвет</string>
+    <string name="stats_widget_select_your_site">Выберите сайт</string>
+    <string name="stats_widget_color_dark">Тёмный</string>
+    <string name="stats_widget_color_light">Светлый</string>
+    <string name="stats_widget_color">Цвет</string>
+    <string name="stats_widget_site_caption">Выберите ваш сайт</string>
+    <string name="stats_widget_site">Сайт</string>
+    <string name="stats_widget_all_time_title">За всё время</string>
+    <string name="stats_widget_views_title">Просмотров на этой неделе</string>
+    <string name="stats_widget_add">Добавить виджет</string>
     <string name="plugin_fetching_error_after_at">Обновление подробностей о плагине занимает больше времени чем обычно, попробуйте попозже.</string>
     <string name="plugin_install_site_ineligible_default_error">Если вы только что зарегистрировали имя домена, пожалуйста, дождитесь завершения процесса регистрации и настройки и попробуйте снова\n\nВ ином случае, похоже что что-то пошло не так и возможности использования плагинов недоступны на этом сайте.</string>
     <string name="domain_contact_information_state_not_available_hint">Область/округ (не доступно)</string>
@@ -745,594 +1114,565 @@ Language: ru
     <string name="site_settings_password_updated">Пароль обновлен</string>
     <string name="site_settings_password_dialog_title">Обновить пароль</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Регистрация доменного имени…</string>
-    <string name="domain_registration_country_picker_dialog_title">Выберите страну</string>
     <string name="domain_registration_state_picker_dialog_title">Выберите округ/область</string>
-    <string name="domain_contact_information_phone_number_hint">Телефон</string>
-    <string name="domain_contact_information_country_code_hint">Код страны</string>
-    <string name="domain_contact_information_country_hint">Страна</string>
-    <string name="domain_contact_information_address_hint">Адрес</string>
-    <string name="domain_contact_information_address_hint_two">Адрес 2</string>
-    <string name="domain_contact_information_city_hint">Город</string>
-    <string name="domain_contact_information_state_hint">Округ/Область</string>
-    <string name="domain_contact_information_postal_code_hint">Почтовый индекс</string>
-    <string name="domain_contact_information_register_domain_button">Зарегистрировать домен</string>
-    <string name="domain_registration_result_title">Поздравляем!</string>
-    <string name="domain_registration_result_description">Ваш новый домен &lt;b>%s&lt;/b> настраивается\n   Ваш сайт замер в нетерпении!</string>
+    <string name="domain_registration_country_picker_dialog_title">Выберите страну</string>
     <string name="domain_registration_result_continue_button">продолжить</string>
-    <string name="domain_contact_information_description">Для вашего удобства, мы заполнили вашу контактную информацию WordPress.com. Пожалуйста, перепроверьте её на корректность, действительно ли вы хотите использовать её для этого домена.</string>
+    <string name="domain_registration_result_description">Ваш новый домен &lt;b&gt;%s&lt;/b&gt; настраивается\n   Ваш сайт замер в нетерпении!</string>
+    <string name="domain_registration_result_title">Поздравляем!</string>
+    <string name="domain_contact_information_register_domain_button">Зарегистрировать домен</string>
+    <string name="domain_contact_information_postal_code_hint">Почтовый индекс</string>
+    <string name="domain_contact_information_state_hint">Округ/Область</string>
+    <string name="domain_contact_information_city_hint">Город</string>
+    <string name="domain_contact_information_address_hint_two">Адрес 2</string>
+    <string name="domain_contact_information_address_hint">Адрес</string>
+    <string name="domain_contact_information_country_hint">Страна</string>
+    <string name="domain_contact_information_country_code_hint">Код страны</string>
+    <string name="domain_contact_information_phone_number_hint">Телефон</string>
     <string name="domain_contact_information_organization_hint">Организация (необязательно)</string>
-    <string name="domain_registration_privacy_protection_description">Владельцы доменов должны делиться контактной информацией для публичной базы данных по всем доменам. С защитой персональных данных мы публикуем нашу информацию вместо вашей и перенаправляем вам все сообщения приватным образом.</string>
-    <string name="domain_privacy_option_on_title">Зарегистрировать как личный с защитой персональных данных</string>
-    <string name="domain_privacy_option_off_title">Зарегистрировать открыто</string>
+    <string name="domain_contact_information_description">Для вашего удобства, мы заполнили вашу контактную информацию WordPress.com. Пожалуйста, перепроверьте её на корректность, действительно ли вы хотите использовать её для этого домена.</string>
     <string name="domain_contact_information_title">Контактная информация домена</string>
-    <string name="domain_registration_contact_form_input_error">Введите правильный %s</string>
+    <string name="domain_privacy_option_off_title">Зарегистрировать открыто</string>
+    <string name="domain_privacy_option_on_title">Зарегистрировать как личный с защитой персональных данных</string>
+    <string name="domain_registration_privacy_protection_description">Владельцы доменов должны делиться контактной информацией для публичной базы данных по всем доменам. С защитой персональных данных мы публикуем нашу информацию вместо вашей и перенаправляем вам все сообщения приватным образом.</string>
     <string name="domain_registration_privacy_protection_title">Защита персональных данных</string>
-    <string name="stats_manage_your_stats">Управление статистикой</string>
-    <string name="stats_management_news_card_message">Выберите статистику для просмотра, акцентируйте те данные, которые вам наиболее интересны. Нажмите %1$s внизу статистики для её настройки.</string>
-    <string name="stats_management_try_it_now">Попробуйте прямо сейчас!</string>
-    <string name="stats_management_dismiss_insights_news_card">Закрыть</string>
-    <string name="stats_management_new">Новый</string>
+    <string name="domain_registration_contact_form_input_error">Введите правильный %s</string>
     <string name="domains_suggestions_choose_domain">Выберите домен</string>
+    <string name="stats_management_new">Новый</string>
+    <string name="stats_management_dismiss_insights_news_card">Закрыть</string>
+    <string name="stats_management_try_it_now">Попробуйте прямо сейчас!</string>
+    <string name="stats_management_news_card_message">Выберите статистику для просмотра, акцентируйте те данные, которые вам наиболее интересны. Нажмите %1$s внизу статистики для её настройки.</string>
+    <string name="stats_manage_your_stats">Управление статистикой</string>
     <string name="history_fetching_revisions">Получение редакций…</string>
-    <string name="editor_uploading_draft">Выполняется загрузка черновика</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">Ошибка вставки медиафайла.\nНажмите для повтора.</string>
+    <string name="editor_uploading_draft">Выполняется загрузка черновика</string>
     <string name="post_uploading_draft">Загрузка черновика</string>
-    <string name="error_restoring_post">Возникла ошибка при восстановлении записи</string>
     <string name="post_list_tab_drafts">Черновики</string>
-    <string name="jetpack_installed_message">Теперь, когда Jetpack установлен, нам нужно настроить, это займет всего минуту.</string>
-    <string name="register_domain">Зарегистрировать домен</string>
-    <string name="domains_suggestions_empty_list">Нет предложений</string>
-    <string name="domain_suggestions_search_hint">Напишите ключевое слово для получения предложений</string>
-    <string name="domain_suggestions_fetch_error">Предложения по доменам не могут быть загружены</string>
-    <string name="stats_insights_annual_site_stats">Данные по сайту за год</string>
-    <string name="stats_insights_social">Социальные</string>
-    <string name="stats_insights_management_title">Смотрите только нужную статистику, добавьте и отсортируйте данные ниже.</string>
+    <string name="error_restoring_post">Возникла ошибка при восстановлении записи</string>
     <string name="backdated_for">Датировано задним числом для: %s</string>
+    <string name="stats_insights_management_title">Смотрите только нужную статистику, добавьте и отсортируйте данные ниже.</string>
+    <string name="stats_insights_social">Социальные</string>
+    <string name="stats_insights_annual_site_stats">Данные по сайту за год</string>
     <string name="stats_view_follower_totals">Статистика подписок</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Локальные изменения</string>
-    <string name="post_trashing">Запись удаляется в корзину</string>
-    <string name="post_restored">Запись восстановлена</string>
-    <string name="post_restoring">Запись восстанавливается</string>
-    <string name="post_moving_to_draft">Запись перемещается в черновики</string>
-    <string name="stats_item_settings">Настройка элементов статистики</string>
-    <string name="stats_menu_move_up">Вверх</string>
-    <string name="stats_menu_move_down">Вниз</string>
+    <string name="domain_suggestions_fetch_error">Предложения по доменам не могут быть загружены</string>
+    <string name="domain_suggestions_search_hint">Напишите ключевое слово для получения предложений</string>
+    <string name="domains_suggestions_empty_list">Нет предложений</string>
+    <string name="register_domain">Зарегистрировать домен</string>
+    <string name="jetpack_installed_message">Теперь, когда Jetpack установлен, нам нужно настроить, это займет всего минуту.</string>
     <string name="stats_menu_remove">Удалить с вкладки</string>
+    <string name="stats_menu_move_down">Вниз</string>
+    <string name="stats_menu_move_up">Вверх</string>
+    <string name="stats_item_settings">Настройка элементов статистики</string>
+    <string name="post_moving_to_draft">Запись перемещается в черновики</string>
+    <string name="post_restoring">Запись восстанавливается</string>
+    <string name="post_restored">Запись восстановлена</string>
+    <string name="post_trashing">Запись удаляется в корзину</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Удаление в корзину этой записи отменит несохраненные изменения, вы точно хотите продолжить?</string>
-    <string name="posts_published_empty">У вас нет опубликрованных записей</string>
-    <string name="posts_scheduled_empty">У вас нет запланированных записей</string>
-    <string name="posts_draft_empty">У вас нет черновиков записей</string>
-    <string name="posts_trashed_empty">У вас нет записей удаленных в корзину</string>
-    <string name="post_list_toggle_item_layout_cards_view">Переключиться на просмотр плиткой</string>
-    <string name="post_list_toggle_item_layout_list_view">Переключиться на просмотр списком</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Локальные изменения</string>
     <string name="button_move_to_draft">Переместить в черновики</string>
-    <string name="error_user_username_instead_of_email">Пожалуйста, войдите с именем пользователя на WordPress.com вместо email адреса.</string>
+    <string name="post_list_toggle_item_layout_list_view">Переключиться на просмотр списком</string>
+    <string name="post_list_toggle_item_layout_cards_view">Переключиться на просмотр плиткой</string>
+    <string name="posts_trashed_empty">У вас нет записей удаленных в корзину</string>
+    <string name="posts_draft_empty">У вас нет черновиков записей</string>
+    <string name="posts_scheduled_empty">У вас нет запланированных записей</string>
+    <string name="posts_published_empty">У вас нет опубликрованных записей</string>
     <string name="notification_wpcom_username_needed">Пожалуйста, войдите указав имя пользователя и пароль.</string>
-    <string name="no_site_error">Сайт по этому адресу не использует WordPress. Вы можете подключиться только к сайтам на WordPress.</string>
-    <string name="stats_insights_this_year_site_stats">За этот год</string>
-    <string name="stats_insights_year">Год</string>
-    <string name="stats_insights_posts">Записи</string>
-    <string name="stats_insights_total_comments">Всего комментариев</string>
-    <string name="stats_insights_average_comments">В среднем комментариев/записей</string>
-    <string name="stats_insights_total_likes">Всего отметок \"нравится\"</string>
-    <string name="stats_insights_average_likes">В среднем отметок \"нравится\" на запись</string>
-    <string name="stats_insights_total_words">Всего слов</string>
+    <string name="error_user_username_instead_of_email">Пожалуйста, войдите с именем пользователя на WordPress.com вместо email адреса.</string>
     <string name="stats_insights_average_words">В среднем слов на запись</string>
-    <string name="plugin_check_domain_credits_progress_dialog_message">Проверка возможности покупки домена</string>
+    <string name="stats_insights_total_words">Всего слов</string>
+    <string name="stats_insights_average_likes">В среднем отметок \"нравится\" на запись</string>
+    <string name="stats_insights_total_likes">Всего отметок \"нравится\"</string>
+    <string name="stats_insights_average_comments">В среднем комментариев/записей</string>
+    <string name="stats_insights_total_comments">Всего комментариев</string>
+    <string name="stats_insights_posts">Записи</string>
+    <string name="stats_insights_year">Год</string>
+    <string name="stats_insights_this_year_site_stats">За этот год</string>
+    <string name="no_site_error">Сайт по этому адресу не использует WordPress. Вы можете подключиться только к сайтам на WordPress.</string>
     <string name="plugin_check_domain_credit_error">Ошибка проверки возможности покупки домена</string>
-    <string name="plugin_install_custom_domain_required_dialog_title">Установка плагина</string>
-    <string name="plugin_install_custom_domain_required_dialog_message">Для установки плагинов требуется привязать к сайту ваш пользовательский домен.</string>
+    <string name="plugin_check_domain_credits_progress_dialog_message">Проверка возможности покупки домена</string>
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Зарегистрировать домен</string>
-    <string name="stats_insights_load_more">Загрузить больше</string>
-    <string name="stats_detail_months_and_years">Месяцы и годы</string>
-    <string name="stats_months_and_years_period_label">Период</string>
-    <string name="stats_months_and_years_views_label">Просмотры</string>
-    <string name="stats_detail_average_views_per_day">Просмотров за день (в среднем)</string>
-    <string name="stats_detail_recent_weeks">Последние недели</string>
-    <string name="scheduled_for">Запланировано на: %s</string>
-    <string name="published_on">Опубликовано в: %s</string>
-    <string name="schedule_for">Запланировать на: %s</string>
-    <string name="publish_on">Опубликовать в: %s</string>
+    <string name="plugin_install_custom_domain_required_dialog_message">Для установки плагинов требуется привязать к сайту ваш пользовательский домен.</string>
+    <string name="plugin_install_custom_domain_required_dialog_title">Установка плагина</string>
     <string name="new_site_creation_preview_subtitle">Вы сможете настроить внешний вид вашего сайта позже</string>
-    <string name="showing_stats_for">Показ статистики для:</string>
-    <string name="stats_insights_best_day">Лучший день</string>
-    <string name="stats_insights_best_hour">Лучший час</string>
+    <string name="publish_on">Опубликовать в: %s</string>
+    <string name="schedule_for">Запланировать на: %s</string>
+    <string name="published_on">Опубликовано в: %s</string>
+    <string name="scheduled_for">Запланировано на: %s</string>
+    <string name="stats_detail_recent_weeks">Последние недели</string>
+    <string name="stats_detail_average_views_per_day">Просмотров за день (в среднем)</string>
+    <string name="stats_months_and_years_views_label">Просмотры</string>
+    <string name="stats_months_and_years_period_label">Период</string>
+    <string name="stats_detail_months_and_years">Месяцы и годы</string>
+    <string name="stats_insights_load_more">Загрузить больше</string>
     <string name="stats_insights_today_stats">Сегодня</string>
-    <string name="app_rating_message">Рады видеть вас снова! Если вы пользуетесь приложением, то будет отлично если вы оцените его в магазине Google Play.</string>
-    <string name="app_rating_rate_now">Оценить сейчас</string>
-    <string name="app_rating_rate_later">Позже</string>
+    <string name="stats_insights_best_hour">Лучший час</string>
+    <string name="stats_insights_best_day">Лучший день</string>
+    <string name="showing_stats_for">Показ статистики для:</string>
     <string name="app_rating_rate_never">Нет, спасибо</string>
-    <string name="stats_fewer_posts">Меньше записей</string>
-    <string name="stats_more_posts">Больше записей</string>
-    <string name="stats_site_not_loaded_yet">Сайт еще не загружен</string>
-    <string name="stats_insights_posting_activity">Активность публикации</string>
-    <string name="editor_post_converted_back_to_draft">Запись переведена назад в черновики</string>
+    <string name="app_rating_rate_later">Позже</string>
+    <string name="app_rating_rate_now">Оценить сейчас</string>
+    <string name="app_rating_message">Рады видеть вас снова! Если вы пользуетесь приложением, то будет отлично если вы оцените его в магазине Google Play.</string>
     <string name="app_rating_title">Нравится WordPress?</string>
-    <string name="plans_loading_error_no_plans_subtitle">Невозможно было загрузить тарифы. Пожалуйста, попробуйте позже.</string>
-    <string name="plans_loading_error_no_cache_subtitle">Для просмотра тарифов требуется подключение к Интернет.</string>
-    <string name="plans_loading_error_with_cache_subtitle">Для просмотра тарифов требуется подключение к Интернет, данные могут быть неактуальны.</string>
-    <string name="plans_loading_error_with_cache_button">Всё равно посмотреть тарифы</string>
+    <string name="editor_post_converted_back_to_draft">Запись переведена назад в черновики</string>
+    <string name="stats_insights_posting_activity">Активность публикации</string>
+    <string name="stats_site_not_loaded_yet">Сайт еще не загружен</string>
+    <string name="stats_more_posts">Больше записей</string>
+    <string name="stats_fewer_posts">Меньше записей</string>
     <string name="new_site_creation_preview_back_pressed_warning">Вы можете потерять ваш прогресс, вы точно хотите выйти?</string>
-    <string name="site_settings_gutenberg_default_for_new_posts">Использовать редактор блоков</string>
-    <string name="site_settings_gutenberg_default_for_new_posts_summary">Редактировать новые записи и страницы в редакторе блоков</string>
-    <string name="stats_loading_error">Данные не загружены</string>
-    <string name="stats_loading_block_error">Возникла проблема загрузки данных, обновите страницу, чтобы попробовать снова.</string>
-    <string name="menu_switch_to_aztec_editor">Переключиться на классический редактор</string>
-    <string name="menu_switch_to_gutenberg_editor">Переключиться на редактор блоков</string>
-    <string name="plans_loading_error_network_title">Нет подключения</string>
+    <string name="plans_loading_error_with_cache_button">Всё равно посмотреть тарифы</string>
+    <string name="plans_loading_error_with_cache_subtitle">Для просмотра тарифов требуется подключение к Интернет, данные могут быть неактуальны.</string>
+    <string name="plans_loading_error_no_cache_subtitle">Для просмотра тарифов требуется подключение к Интернет.</string>
+    <string name="plans_loading_error_no_plans_subtitle">Невозможно было загрузить тарифы. Пожалуйста, попробуйте позже.</string>
     <string name="plans_loading_error_no_plans_title">Невозможно загрузить тарифы</string>
+    <string name="plans_loading_error_network_title">Нет подключения</string>
+    <string name="menu_switch_to_gutenberg_editor">Переключиться на редактор блоков</string>
+    <string name="stats_loading_block_error">Возникла проблема загрузки данных, обновите страницу, чтобы попробовать снова.</string>
+    <string name="stats_loading_error">Данные не загружены</string>
+    <string name="site_settings_gutenberg_default_for_new_posts_summary">Редактировать новые записи и страницы в редакторе блоков</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">Использовать редактор блоков</string>
     <string name="exit">выход</string>
-    <string name="dialog_gutenberg_informative_title">Редактор блоков включен</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Нажмите %1$s Добавить страницу %2$s для создания новой страницы.</string>
-    <string name="quick_start_dialog_explore_plans_message_short">Нажмите %1$s Тариф %2$s для просмотра вашего и других доступных тарифов</string>
-    <string name="quick_start_dialog_upload_icon_message">Ваши посетители увидят ваш значок в своем браузере. Добавьте пользовательский значок для стильного, профессионального вида.</string>
-    <string name="quick_start_dialog_upload_icon_title">Загрузить значок сайта</string>
-    <string name="quick_start_dialog_view_site_message">Получайте удовольствие от завершенной работы!</string>
-    <string name="quick_start_complete_tasks_header">Готово (%d)</string>
-    <string name="quick_start_sites">Следующие шаги</string>
-    <string name="quick_start_sites_type_customize">Настроить ваш сайт</string>
-    <string name="quick_start_sites_type_grow">Привлекайте аудиторию</string>
     <string name="quick_start_sites_type_subtitle">Готово %1$d из %2$d</string>
-    <string name="quick_start_dialog_migration_title">Мы внесли некоторые изменения в ваш список проверки</string>
-    <string name="quick_start_dialog_need_help_message">Мы проведем вас по основам создания и роста вашего сайта.</string>
-    <string name="quick_start_dialog_publish_post_message">Создайте черновик и опубликуйте свою первую запись.</string>
-    <string name="quick_start_dialog_upload_site_icon_message_short">Нажмите %1$s Значок вашего сайта %2$s для загрузки нового</string>
+    <string name="quick_start_sites_type_grow">Привлекайте аудиторию</string>
+    <string name="quick_start_sites_type_customize">Настроить ваш сайт</string>
+    <string name="quick_start_sites">Следующие шаги</string>
+    <string name="quick_start_complete_tasks_header">Готово (%d)</string>
+    <string name="quick_start_dialog_view_site_message">Получайте удовольствие от завершенной работы!</string>
+    <string name="quick_start_dialog_upload_icon_title">Загрузить значок сайта</string>
+    <string name="quick_start_dialog_upload_icon_message">Ваши посетители увидят ваш значок в своем браузере. Добавьте пользовательский значок для стильного, профессионального вида.</string>
+    <string name="quick_start_dialog_explore_plans_message_short">Нажмите %1$s Тариф %2$s для просмотра вашего и других доступных тарифов</string>
     <string name="quick_start_dialog_check_stats_message_short">Нажмите %1$s Статистика %2$s для просмотра как живет ваш сайт.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Нажмите %1$s Страницы %2$s для продолжения.</string>
-    <string name="quick_start_dialog_enable_sharing_title">Включить возможность делиться записями</string>
-    <string name="quick_start_dialog_explore_plans_message">Узнайте больше о маркетинге и SEO инструментах на наших платных тарифах.</string>
-    <string name="quick_start_dialog_explore_plans_title">Посмотреть тарифы</string>
+    <string name="quick_start_dialog_upload_site_icon_message_short">Нажмите %1$s Значок вашего сайта %2$s для загрузки нового</string>
+    <string name="quick_start_dialog_publish_post_message">Создайте черновик и опубликуйте свою первую запись.</string>
+    <string name="quick_start_dialog_need_help_message">Мы проведем вас по основам создания и роста вашего сайта.</string>
+    <string name="quick_start_dialog_migration_title">Мы внесли некоторые изменения в ваш список проверки</string>
     <string name="quick_start_dialog_migration_message">Мы добавили пару задач для того, чтобы помочь вам привлечь аудиторию.</string>
-    <string name="quick_start_dialog_create_page_message">Добавьте страницу для ключевого содержимого, \"О нас\" будет отличным началом!</string>
-    <string name="quick_start_dialog_create_page_title">Создать новую страницу</string>
-    <string name="quick_start_dialog_customize_site_message">Настройте шрифты, добавьте изображения и другое.</string>
+    <string name="quick_start_dialog_explore_plans_title">Посмотреть тарифы</string>
+    <string name="quick_start_dialog_explore_plans_message">Узнайте больше о маркетинге и SEO инструментах на наших платных тарифах.</string>
+    <string name="quick_start_dialog_enable_sharing_title">Включить возможность делиться записями</string>
     <string name="quick_start_dialog_enable_sharing_message">Автоматически делитесь вашими новыми записями в социальных сетях.</string>
-    <string name="quick_start_complete_view_subtitle">Поздравляем с завершением списка. Отличная работа!</string>
-    <string name="quick_start_remove_next_steps_menu_title">Убрать это</string>
-    <string name="quick_start_dialog_remove_next_steps_title">Пропустить следующие шаги</string>
-    <string name="quick_start_dialog_browse_themes_message">Посмотрите десятки возможностей макета и найдите идеальный вариант.</string>
-    <string name="quick_start_dialog_browse_themes_title">Посмотреть темы</string>
-    <string name="quick_start_dialog_check_stats_message">Будьте в курсе статистики вашего сайта.</string>
     <string name="quick_start_dialog_check_stats_title">Посмотреть статистику сайта</string>
+    <string name="quick_start_dialog_check_stats_message">Будьте в курсе статистики вашего сайта.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Пропуск следующих шагов отключит все гиды по этому сайту. Действие не может быть отменено.</string>
-    <string name="notification_channel_reminder_title">Напоминание</string>
-    <string name="quick_start_completed_tasks_header_chevron_expand_desc">развернуть</string>
-    <string name="quick_start_completed_tasks_header_chevron_collapse_desc">свернуть</string>
-    <string name="quick_start_task_skip_menu_title">Пропустить задачу</string>
+    <string name="quick_start_dialog_remove_next_steps_title">Пропустить следующие шаги</string>
+    <string name="quick_start_remove_next_steps_menu_title">Убрать это</string>
+    <string name="quick_start_complete_view_subtitle">Поздравляем с завершением списка. Отличная работа!</string>
     <string name="quick_start_complete_view_title">Все задачи завершены!</string>
-    <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
-    <string name="stats_traffic_change">%1$s (%2$s%%)</string>
-    <string name="stats_insights_popular">Самое популярное время</string>
-    <string name="stats_most_popular_percent_views">%1$d%% просмотров</string>
-    <string name="stats_select_previous_period_description">Выбор предыдущего периода</string>
+    <string name="quick_start_task_skip_menu_title">Пропустить задачу</string>
+    <string name="quick_start_completed_tasks_header_chevron_collapse_desc">свернуть</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">развернуть</string>
+    <string name="notification_channel_reminder_title">Напоминание</string>
     <string name="stats_select_next_period_description">Выбор следующего периода</string>
-    <string name="new_site_creation_domain_header_subtitle">Это место, где вас можно найти в сети.</string>
-    <string name="new_site_creation_search_domain_input_hint">Поиск доменов</string>
-    <string name="new_site_creation_create_site_button">Создать сайт</string>
-    <string name="notification_new_site_creation_title">Создание сайта</string>
-    <string name="notification_new_site_creation_failed">Возникла проблема</string>
-    <string name="notification_new_site_creation_creating_site_subtitle">Мы создаем ваш новый сайт</string>
-    <string name="cancel_new_site_wizard_content_description">Закрыть мастер создания сайта</string>
-    <string name="site_created_but_not_fetched_snackbar_message">Похоже, что ваше подключение слишком медленное. Если вы не видите ваш новый сайт в списке, попробуйте обновить.</string>
-    <string name="new_site_creation_clear_all_content_description">Очистить</string>
+    <string name="stats_select_previous_period_description">Выбор предыдущего периода</string>
+    <string name="stats_most_popular_percent_views">%1$d%% просмотров</string>
+    <string name="stats_insights_popular">Самое популярное время</string>
+    <string name="stats_traffic_change">%1$s (%2$s%%)</string>
+    <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
     <string name="new_site_creation_site_preview_content_description">Показ предварительного просмотра сайта</string>
-    <string name="site_creation_error_generic_title">Возникла проблема</string>
-    <string name="site_creation_error_generic_subtitle">Ошибка подключения к серверу, пожалуйста попробуйте еще раз</string>
+    <string name="new_site_creation_clear_all_content_description">Очистить</string>
+    <string name="site_created_but_not_fetched_snackbar_message">Похоже, что ваше подключение слишком медленное. Если вы не видите ваш новый сайт в списке, попробуйте обновить.</string>
+    <string name="cancel_new_site_wizard_content_description">Закрыть мастер создания сайта</string>
+    <string name="notification_new_site_creation_creating_site_subtitle">Мы создаем ваш новый сайт</string>
+    <string name="notification_new_site_creation_failed">Возникла проблема</string>
+    <string name="notification_new_site_creation_title">Создание сайта</string>
+    <string name="new_site_creation_create_site_button">Создать сайт</string>
+    <string name="new_site_creation_domain_header_subtitle">Это место, где вас можно найти в сети.</string>
     <string name="new_site_creation_empty_domain_list_message">Нет доступных адресов по критериям поиска</string>
-    <string name="new_site_creation_domain_header_title">Выберите доменное имя для вашего сайта</string>
-    <string name="site_creation_segments_subtitle">Это поможет нам делать вам рекомендации. Но вы не ограничены этим, все сайты развиваются.</string>
+    <string name="site_creation_error_generic_subtitle">Ошибка подключения к серверу, пожалуйста попробуйте еще раз</string>
+    <string name="site_creation_error_generic_title">Возникла проблема</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Возникла проблема</string>
-    <string name="site_creation_segments_title">Расскажите какого типа сайт вы хотите создать</string>
-    <string name="local_post_is_conflicted">Конфликт версии</string>
-    <string name="site_picker_failed_selecting_added_site">Невозможно выбрать только что добавленный сайт на вашем хостинге.</string>
-    <string name="suggestions_updated_content_description">Предложения обновлены</string>
-    <string name="new_site_creation_screen_title_general">Создание сайта</string>
-    <string name="new_site_creation_screen_title_step_count">%1$d из %2$d</string>
     <string name="new_site_creation_preview_title">Ваш новый сайт создан!</string>
-    <string name="dialog_confirm_load_remote_post_discard_web">Отменить веб изменения</string>
-    <string name="toast_conflict_updating_post">Обновление записи</string>
-    <string name="snackbar_conflict_local_version_discarded">Локальные изменения отменены</string>
-    <string name="snackbar_conflict_web_version_discarded">Веб изменения отменены</string>
-    <string name="snackbar_conflict_undo">Вернуть</string>
-    <string name="preference_crash_reports">Отчеты о падениях</string>
+    <string name="new_site_creation_screen_title_step_count">%1$d из %2$d</string>
+    <string name="new_site_creation_screen_title_general">Создание сайта</string>
+    <string name="suggestions_updated_content_description">Предложения обновлены</string>
+    <string name="site_picker_failed_selecting_added_site">Невозможно выбрать только что добавленный сайт на вашем хостинге.</string>
+    <string name="local_post_is_conflicted">Конфликт версии</string>
     <string name="preference_crash_reports_summary">Разрешить посылать нам автоматические отчеты о падениях, для помощи с улучшением приложения.</string>
-    <string name="dialog_confirm_load_remote_post_title">Решить конфликт рассинхронизации</string>
-    <string name="dialog_confirm_load_remote_post_body">Эта запись имеет две конфликтующие версии. Выберите версию, изменения в которой будут потеряны.\n \n\n\n</string>
-    <string name="dialog_confirm_load_remote_post_body_2">Локальная\nСохранена %s\n\nВеб\nСохранена %s\n</string>
+    <string name="preference_crash_reports">Отчеты о падениях</string>
+    <string name="snackbar_conflict_undo">Вернуть</string>
+    <string name="snackbar_conflict_web_version_discarded">Веб изменения отменены</string>
+    <string name="snackbar_conflict_local_version_discarded">Локальные изменения отменены</string>
+    <string name="toast_conflict_updating_post">Обновление записи</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Отменить веб изменения</string>
     <string name="dialog_confirm_load_remote_post_discard_local">Отменить локальные изменения</string>
-    <string name="preference_strip_image_location">Убрать данные местоположения из медиафайлов</string>
+    <string name="dialog_confirm_load_remote_post_body_2">Локальная\nСохранена %s\n\nВеб\nСохранена %s\n</string>
+    <string name="dialog_confirm_load_remote_post_body">Эта запись имеет две конфликтующие версии. Выберите версию, изменения в которой будут потеряны.\n \n\n\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Решить конфликт рассинхронизации</string>
     <string name="stats_no_data_for_period">Для указанного периода нет данных</string>
+    <string name="preference_strip_image_location">Убрать данные местоположения из медиафайлов</string>
     <string name="stats_cannot_be_started">Извините, статистика в данный момент недоступна, попробуйте позже.</string>
-    <string name="stats_insights_create_post">Создать запись</string>
-    <string name="stats_insights_share_post">Поделиться записью</string>
-    <string name="stats_insights_view_more">Посмотреть больше</string>
-    <string name="stats_insights_facebook">Facebook</string>
-    <string name="stats_insights_twitter">Twitter</string>
-    <string name="stats_insights_tumblr">Tumblr</string>
-    <string name="stats_insights_google_plus">Google+</string>
-    <string name="stats_insights_linkedin">LinkedIn</string>
-    <string name="stats_insights_path">Путь</string>
-    <string name="stats_posts_and_pages">Страницы и записи</string>
-    <string name="stats_referrers">Ссылающиеся сайты</string>
-    <string name="stats_referrer_label">Ссылающийся сайт</string>
-    <string name="stats_referrer_views_label">Просмотры</string>
-    <string name="stats_clicks">Переходы</string>
-    <string name="stats_clicks_link_label">Ссылка</string>
-    <string name="stats_clicks_label">Переходы</string>
-    <string name="stats_countries">Страны</string>
-    <string name="stats_country_label">Страна</string>
-    <string name="stats_country_views_label">Просмотры</string>
-    <string name="stats_videos">Видео</string>
-    <string name="stats_videos_title_label">Название</string>
-    <string name="stats_videos_views_label">Просмотры</string>
-    <string name="stats_search_terms">Поисковые фразы</string>
-    <string name="stats_search_terms_label">Поисковая фраза</string>
-    <string name="stats_search_terms_views_label">Просмотры</string>
-    <string name="stats_authors">Авторы</string>
-    <string name="stats_author_label">Автор</string>
-    <string name="stats_author_views_label">Просмотры</string>
-    <string name="gif_picker_initial_empty_text">Найдите GIF изображения и добавьте их в медиатеку!</string>
-    <string name="gif_picker_empty_search_list">Мультимедиа по критериям поиска не найдены</string>
     <string name="gif_picker_endless_scroll_network_error">Некоторые медиафайлы не загрузились из-за ошибки сети.</string>
+    <string name="gif_picker_empty_search_list">Мультимедиа по критериям поиска не найдены</string>
+    <string name="gif_picker_initial_empty_text">Найдите GIF изображения и добавьте их в медиатеку!</string>
+    <string name="stats_author_views_label">Просмотры</string>
+    <string name="stats_author_label">Автор</string>
+    <string name="stats_authors">Авторы</string>
+    <string name="stats_search_terms_views_label">Просмотры</string>
+    <string name="stats_search_terms_label">Поисковая фраза</string>
+    <string name="stats_search_terms">Поисковые фразы</string>
+    <string name="stats_videos_views_label">Просмотры</string>
+    <string name="stats_videos_title_label">Название</string>
+    <string name="stats_videos">Видео</string>
+    <string name="stats_country_views_label">Просмотры</string>
+    <string name="stats_country_label">Страна</string>
+    <string name="stats_countries">Страны</string>
+    <string name="stats_clicks_label">Переходы</string>
+    <string name="stats_clicks_link_label">Ссылка</string>
+    <string name="stats_clicks">Переходы</string>
+    <string name="stats_referrer_views_label">Просмотры</string>
+    <string name="stats_referrer_label">Ссылающийся сайт</string>
+    <string name="stats_referrers">Ссылающиеся сайты</string>
+    <string name="stats_posts_and_pages">Страницы и записи</string>
+    <string name="stats_insights_path">Путь</string>
+    <string name="stats_insights_linkedin">LinkedIn</string>
+    <string name="stats_insights_google_plus">Google+</string>
+    <string name="stats_insights_tumblr">Tumblr</string>
+    <string name="stats_insights_twitter">Twitter</string>
+    <string name="stats_insights_facebook">Facebook</string>
+    <string name="stats_insights_view_more">Посмотреть больше</string>
+    <string name="stats_insights_share_post">Поделиться записью</string>
+    <string name="stats_insights_create_post">Создать запись</string>
     <string name="stats_insights_latest_post_message">Прошло уже %1$s с публикации %2$s. Вот статистика по этой записи:</string>
-    <string name="stats_insights_tags_and_categories">Метки и рубрики</string>
     <string name="stats_insights_latest_post_with_no_engagement">Прошло уже %1$s с публикации %2$s. Мяч на вашей стороне, поделитесь записью и увеличьте число просмотров:</string>
     <string name="stats_insights_latest_post_empty">Вы еще не опубликовали ни одной записи. Как только вы это сделаете, статистика по последней записи появится здесь:</string>
+    <string name="stats_insights_tags_and_categories">Метки и рубрики</string>
     <string name="stats_insights_all_time_stats">За всё время</string>
-    <string name="stats_manage_insights">Настроить статистику</string>
-    <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="stats_followers_email">Email</string>
-    <string name="stats_followers_count_message">Всего %1$s Подписчики: %2$s</string>
-    <string name="stats_follower_label">Подписчик</string>
-    <string name="stats_follower_since_label">с</string>
-    <string name="stats_comments_authors">Авторы</string>
-    <string name="stats_comments_posts_and_pages">Записи и страницы</string>
-    <string name="stats_comments_author_label">Автор</string>
-    <string name="stats_comments_title_label">Название</string>
-    <string name="stats_comments_label">Комментарии</string>
-    <string name="stats_posts_and_pages_title_label">Название</string>
-    <string name="stats_posts_and_pages_views_label">Просмотры</string>
-    <string name="stats_tags_and_categories_title_label">Название</string>
-    <string name="stats_tags_and_categories_views_label">Просмотры</string>
-    <string name="stats_category_folded_name">%1$s | %2$s</string>
-    <string name="stats_publicize_service_label">Служба</string>
-    <string name="stats_publicize_followers_label">Подписчики</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
-    <string name="stats_no_data_yet">Пока нет данных</string>
+    <string name="stats_publicize_followers_label">Подписчики</string>
+    <string name="stats_publicize_service_label">Служба</string>
+    <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_tags_and_categories_views_label">Просмотры</string>
+    <string name="stats_tags_and_categories_title_label">Название</string>
+    <string name="stats_posts_and_pages_views_label">Просмотры</string>
+    <string name="stats_posts_and_pages_title_label">Название</string>
+    <string name="stats_comments_label">Комментарии</string>
+    <string name="stats_comments_title_label">Название</string>
+    <string name="stats_comments_author_label">Автор</string>
+    <string name="stats_comments_posts_and_pages">Записи и страницы</string>
+    <string name="stats_comments_authors">Авторы</string>
+    <string name="stats_follower_since_label">с</string>
+    <string name="stats_follower_label">Подписчик</string>
+    <string name="stats_followers_count_message">Всего %1$s Подписчики: %2$s</string>
+    <string name="stats_followers_email">Email</string>
+    <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_manage_insights">Настроить статистику</string>
     <string name="stats_empty_insights_title">Еще нет статистики</string>
+    <string name="stats_no_data_yet">Пока нет данных</string>
     <string name="menu_debug">Меню отладки</string>
     <string name="change_password_dialog_message">Смена пароля…</string>
-    <string name="change_password">Сменить пароль</string>
-    <string name="change_password_confirmation">Пароль успешно изменен</string>
-    <string name="change_password_dialog_hint">Ваш пароль должен быть не менее шести символов. Для усиления пароля используйте верхний и нижний регистры, числа и символы типа ! \" ? $ % ^ &amp; ).</string>
-    <string name="history_preview_visual">Визуальный просмотр</string>
-    <string name="history_preview_html">HTML просмотр</string>
-    <string name="history_no_title">(без названия)</string>
+    <string name="change_password_dialog_hint">Ваш пароль должен быть не менее шести символов. Для усиления пароля используйте верхний и нижний регистры, числа и символы типа ! \" ? $ % ^ &amp; ).</string>
+    <string name="change_password_confirmation">Пароль успешно изменен</string>
+    <string name="change_password">Сменить пароль</string>
     <string name="support_identity_input_dialog_name_label">Имя</string>
+    <string name="history_no_title">(без названия)</string>
+    <string name="history_preview_html">HTML просмотр</string>
+    <string name="history_preview_visual">Визуальный просмотр</string>
     <string name="history_detail_title">Редакция</string>
     <string name="history_detail_button_previous">Предыдущая</string>
     <string name="history_detail_button_next">Следующая</string>
     <string name="media_space_used">Использовано места: %1$s</string>
     <string name="enter_wpcom_or_jetpack_site">Пожалуйста введите сайт WordPress.com или с подключенным Jetpack</string>
     <string name="history_loading_revision">Загрузка редакции</string>
-    <string name="history_empty_subtitle_page">При внесении изменений на страницу вы сможете увидеть историю изменений здесь</string>
-    <string name="history_empty_subtitle_post">При внесении изменений в запись вы сможете увидеть историю изменений здесь</string>
-    <string name="history_empty_title">Нет истории</string>
-    <string name="history_footer_page">Страница создана %1$s в %2$s</string>
-    <string name="history_footer_post">Запись создана %1$s в %2$s</string>
-    <string name="history_load_dialog_button_positive">Загрузить</string>
     <string name="history_loaded_revision">Редакция загружена</string>
+    <string name="history_load_dialog_button_positive">Загрузить</string>
+    <string name="history_footer_post">Запись создана %1$s в %2$s</string>
+    <string name="history_footer_page">Страница создана %1$s в %2$s</string>
+    <string name="history_empty_title">Нет истории</string>
+    <string name="history_empty_subtitle_post">При внесении изменений в запись вы сможете увидеть историю изменений здесь</string>
+    <string name="history_empty_subtitle_page">При внесении изменений на страницу вы сможете увидеть историю изменений здесь</string>
     <string name="description_user">Аватар пользователя</string>
-    <string name="menu_history">История</string>
-    <string name="image_size_thumbnail_label">Миниатюра</string>
-    <string name="image_size_medium_label">Средняя</string>
-    <string name="image_size_large_label">Большая</string>
     <string name="image_size_full_label">Полный размер</string>
-    <string name="pages_pending">Ожидающие одобрения</string>
+    <string name="image_size_large_label">Большая</string>
+    <string name="image_size_medium_label">Средняя</string>
+    <string name="image_size_thumbnail_label">Миниатюра</string>
+    <string name="menu_history">История</string>
     <string name="pages_open_page_error">Выбранная страница недоступна</string>
-    <string name="pages_move_to_draft">Переместить в черновики</string>
-    <string name="pages_move_to_trash">Переместить в корзину</string>
-    <string name="pages_delete_permanently">Удалить навсегда</string>
-    <string name="pages_empty_search_result">Нет страниц по критериям поиска</string>
-    <string name="pages_search_suggestion">Поиск страниц</string>
-    <string name="pages_empty_published">Вы еще не опубликовали ни одной страницы</string>
-    <string name="pages_empty_drafts">У вас нет страниц в черновиках</string>
-    <string name="pages_empty_scheduled">У вас нет запланированных к публикации страниц</string>
+    <string name="pages_pending">Ожидающие одобрения</string>
     <string name="pages_empty_trashed">У вас нет страниц в корзине</string>
-    <string name="login_error_sms_throttled">Слишком много попыток отправить СМС-код проверки, отдохните и запросите снова через пару минут.</string>
-    <string name="pages_published">Опубликовано</string>
-    <string name="pages_drafts">Черновики</string>
-    <string name="pages_scheduled">Запланировано</string>
-    <string name="pages_trashed">Корзина</string>
-    <string name="pages_view">Просмотр</string>
+    <string name="pages_empty_scheduled">У вас нет запланированных к публикации страниц</string>
+    <string name="pages_empty_drafts">У вас нет страниц в черновиках</string>
+    <string name="pages_empty_published">Вы еще не опубликовали ни одной страницы</string>
+    <string name="pages_search_suggestion">Поиск страниц</string>
+    <string name="pages_empty_search_result">Нет страниц по критериям поиска</string>
+    <string name="pages_delete_permanently">Удалить навсегда</string>
+    <string name="pages_move_to_trash">Переместить в корзину</string>
+    <string name="pages_move_to_draft">Переместить в черновики</string>
     <string name="pages_set_parent">Установить родителя</string>
-    <string name="page_parent_changed">Родитель для страницы сменен</string>
-    <string name="reader_empty_followed_blogs_search_title">Нет сайтов по критериям поиска</string>
-    <string name="site_picker_remove_site_empty">Нет сайтов по критериям поиска</string>
+    <string name="pages_view">Просмотр</string>
+    <string name="pages_trashed">Корзина</string>
+    <string name="pages_scheduled">Запланировано</string>
+    <string name="pages_drafts">Черновики</string>
+    <string name="pages_published">Опубликовано</string>
+    <string name="login_error_sms_throttled">Слишком много попыток отправить СМС-код проверки, отдохните и запросите снова через пару минут.</string>
     <string name="login_error_email_not_found_v2">Ни одна учетная запись WordPress.com не совпадает с этой записью в Google.</string>
-    <string name="set_parent">Установить родителя</string>
-    <string name="page_delete_error">Возникла проблема при удалении страницы</string>
-    <string name="page_status_change_error">Возникла проблема установления статуса страницы</string>
-    <string name="page_parent_change_error">Возникла проблема смены родителя страницы</string>
-    <string name="page_delete_dialog_message">Вы точно хотите удалить страницу  %s?</string>
-    <string name="top_level">Верхний уровень</string>
-    <string name="page_moved_to_draft">Страница перемещена в черновики</string>
-    <string name="page_moved_to_trash">Страница перемещена в корзину</string>
-    <string name="page_moved_to_published">Страница опубликована</string>
-    <string name="page_moved_to_scheduled">Страница запланирована к публикации</string>
+    <string name="site_picker_remove_site_empty">Нет сайтов по критериям поиска</string>
+    <string name="reader_empty_followed_blogs_search_title">Нет сайтов по критериям поиска</string>
+    <string name="page_parent_changed">Родитель для страницы сменен</string>
     <string name="page_permanently_deleted">Страница удалена навсегда</string>
+    <string name="page_moved_to_scheduled">Страница запланирована к публикации</string>
+    <string name="page_moved_to_published">Страница опубликована</string>
+    <string name="page_moved_to_trash">Страница перемещена в корзину</string>
+    <string name="page_moved_to_draft">Страница перемещена в черновики</string>
+    <string name="top_level">Верхний уровень</string>
+    <string name="page_delete_dialog_message">Вы точно хотите удалить страницу  %s?</string>
+    <string name="page_parent_change_error">Возникла проблема смены родителя страницы</string>
+    <string name="page_status_change_error">Возникла проблема установления статуса страницы</string>
+    <string name="page_delete_error">Возникла проблема при удалении страницы</string>
+    <string name="set_parent">Установить родителя</string>
     <string name="quick_start_focus_point_description">нажмите здесь</string>
-    <string name="quick_start_list_create_site_subtitle">Запустите ваш сайт</string>
     <string name="quick_start_list_create_site_title">Создайте ваш сайт</string>
-    <string name="quick_start_dialog_share_site_message">Подключите ваши учетные записи в соцсетях и ваш сайт автоматически будет делиться новыми записями.</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_connections">Нажмите %1$s Подключения %2$s для добавления учетных записей в соцсетях</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Нажмите %1$s Поделиться %2$s для продолжения</string>
-    <string name="quick_start_dialog_share_site_title">Делитесь содержимым сайта</string>
-    <string name="quick_start_dialog_view_site_message_short">Нажмите %1$s Посмотреть сайт %2$s для просмотра вашего сайта</string>
+    <string name="quick_start_list_create_site_subtitle">Запустите ваш сайт</string>
     <string name="quick_start_dialog_view_site_title">Посмотреть ваш сайт</string>
-    <string name="quick_start_dialog_need_help_title">Нужна помощь с тем, как начать?</string>
+    <string name="quick_start_dialog_view_site_message_short">Нажмите %1$s Посмотреть сайт %2$s для просмотра вашего сайта</string>
+    <string name="quick_start_dialog_share_site_title">Делитесь содержимым сайта</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Нажмите %1$s Поделиться %2$s для продолжения</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_connections">Нажмите %1$s Подключения %2$s для добавления учетных записей в соцсетях</string>
+    <string name="quick_start_dialog_share_site_message">Подключите ваши учетные записи в соцсетях и ваш сайт автоматически будет делиться новыми записями.</string>
     <string name="quick_start_dialog_publish_post_title">Опубликовать запись</string>
     <string name="quick_start_dialog_publish_post_message_short">Нажмите %1$s Создать запись %2$s для создания новой записи</string>
+    <string name="quick_start_dialog_need_help_title">Нужна помощь с тем, как начать?</string>
     <string name="quick_start_dialog_need_help_button_positive">Принять</string>
     <string name="quick_start_dialog_need_help_button_neutral">Никогда</string>
+    <string name="quick_start_dialog_need_help_button_negative">Нет, спасибо</string>
     <string name="quick_start_dialog_follow_sites_title">Подписка на другие сайты</string>
     <string name="quick_start_dialog_follow_sites_message_short_search">Нажмите %1$s Поиск %2$s, чтобы найти сайты с похожими интересами</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Нажмите %1$s Читалка %2$s для продолжения</string>
-    <string name="quick_start_dialog_customize_site_title">Настройте ваш сайт</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Нажмите %1$s Темы %2$s для продолжения</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Нажмите %1$s Настроить %2$s для начала персонализации вашего сайта</string>
-    <string name="quick_start_dialog_need_help_button_negative">Нет, спасибо</string>
     <string name="quick_start_dialog_follow_sites_message">Найдите сайты вдохновляющие вас и подпишитесь на них для получения новых публикаций с них.</string>
     <string name="quick_start_button_positive">Вперед</string>
     <string name="quick_start_button_negative_short">Отмена</string>
     <string name="quick_start_button_negative">Не сейчас</string>
-    <string name="my_site_create_new_site_title">У вас нет сайтов</string>
-    <string name="quick_start_dialog_choose_theme_title">Выберите тему</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Нажмите %1$s Темы %2$s для поиска новых тем</string>
-    <string name="quick_start_dialog_choose_theme_message">Посмотреть все наши темы, чтобы найти наиболее подходящую.</string>
     <string name="content_description_more">Больше</string>
+    <string name="my_site_create_new_site_title">У вас нет сайтов</string>
     <string name="reader_empty_followed_tags_title">Нет подписок на темы</string>
     <string name="reader_empty_followed_tags_subtitle">Добавьте любимые темы здесь, чтобы найти по ним записи</string>
-    <string name="jetpack">Jetpack</string>
-    <string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
-    <string name="install_jetpack">Установить Jetpack</string>
-    <string name="installing_jetpack">Устанавливается Jetpack</string>
-    <string name="jetpack_installed">Jetpack установлен</string>
-    <string name="install_jetpack_retry">Повторить</string>
     <string name="login_to_to_connect_jetpack">Войдите в учетную запись WordPress.com, с которой был подключен Jetpack.</string>
-    <string name="jetpack_installation_problem">Возникла проблема</string>
+    <string name="install_jetpack_retry">Повторить</string>
     <string name="install_jetpack_continue">Продолжить установку</string>
     <string name="jetpack_installation_problem_message">Сейчас Jetpack не может быть установлен.</string>
+    <string name="jetpack_installation_problem">Возникла проблема</string>
+    <string name="jetpack_installed">Jetpack установлен</string>
     <string name="installing_jetpack_message">Установка Jetpack на сайт. Это может занять пару минут.</string>
+    <string name="installing_jetpack">Устанавливается Jetpack</string>
     <string name="install_jetpack_message">Данные для входа на ваш сайт не будут сохранены и будут использоваться только для установки Jetpack.</string>
+    <string name="install_jetpack">Установить Jetpack</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
     <string name="stats_jetpack_connection_setup_info">Для использования Статистики на вашем сайте WordPress требуется установить плагин Jetpack.</string>
+    <string name="themes_empty_list">Нет тем по вашему поиску</string>
     <string name="reader_label_post_search_explainer">Что вы хотите найти?</string>
     <string name="site_settings_tags_empty_title_search">Нет меток по вашему поиску</string>
-    <string name="themes_empty_list">Нет тем по вашему поиску</string>
     <string name="site_settings_tags_empty_title">У вас нет меток</string>
     <string name="site_settings_tags_empty_subtitle">Добавьте сюда часто используемые метки, чтобы быстро выбирать их для записей</string>
     <string name="site_settings_tags_empty_button">Создать метку</string>
     <string name="media_empty_search_list">Нет медиафайлов по вашему поиску</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">Выйти из WordPress?</string>
     <string name="sign_out_wpcom_confirm_with_changes">У вас есть несохраненные изменения к записи, которые еще не были загружены на сайт, они будут потеряны на вашем устройстве при выходе. Всё равно выйти?</string>
-    <string name="reader_empty_posts_liked_description">Записи, которые вам понравились будут здесь</string>
-    <string name="people_empty_list_filtered_users">Ещё нет пользователей</string>
-    <string name="people_empty_list_filtered_followers">Ещё нет подписчиков</string>
-    <string name="people_empty_list_filtered_email_followers">Ещё нет подписчиков по эл.почте</string>
     <string name="people_empty_list_filtered_viewers">Ещё нет просмотров</string>
-    <string name="reader_empty_followed_blogs_title">Нет подписок на сайты</string>
-    <string name="reader_empty_followed_blogs_button_discover">Найти сайты</string>
-    <string name="reader_empty_followed_blogs_button_followed">Перейти к подпискам</string>
+    <string name="people_empty_list_filtered_email_followers">Ещё нет подписчиков по эл.почте</string>
+    <string name="people_empty_list_filtered_followers">Ещё нет подписчиков</string>
+    <string name="people_empty_list_filtered_users">Ещё нет пользователей</string>
+    <string name="reader_empty_posts_liked_description">Записи, которые вам понравились будут здесь</string>
     <string name="reader_empty_posts_liked_title">Нет отметок \"нравится\"</string>
-    <string name="activity_log_limited_content_on_free_plan">Для бесплатных тарифов число событий в истории ограничено.</string>
-    <string name="notifications_empty_followers">Ещё нет подписчиков</string>
+    <string name="reader_empty_followed_blogs_button_followed">Перейти к подпискам</string>
+    <string name="reader_empty_followed_blogs_button_discover">Найти сайты</string>
+    <string name="reader_empty_followed_blogs_title">Нет подписок на сайты</string>
     <string name="notifications_empty_likes">Ещё нет отметок \"нравится\"</string>
-    <string name="activity_log_empty_title">Активности не отмечено</string>
+    <string name="notifications_empty_followers">Ещё нет подписчиков</string>
+    <string name="activity_log_limited_content_on_free_plan">Для бесплатных тарифов число событий в истории ограничено.</string>
     <string name="activity_log_empty_subtitle">При внесении изменений на сайт, вы сможете увидеть историю активности здесь</string>
-    <string name="media_empty_list">У вас нет мультимедиа-файлов</string>
-    <string name="media_empty_upload_media">Загрузка медиафайлов</string>
-    <string name="pages_empty_list_button">Создать страницу</string>
+    <string name="activity_log_empty_title">Активности не отмечено</string>
     <string name="posts_empty_list_button">Создать запись</string>
+    <string name="pages_empty_list_button">Создать страницу</string>
+    <string name="media_empty_upload_media">Загрузка медиафайлов</string>
+    <string name="media_empty_list">У вас нет мультимедиа-файлов</string>
     <string name="reader_gallery_images_desc">галерея изображений</string>
     <string name="blavatar_desc">значок сайта</string>
     <string name="theme_image_desc">изображение темы</string>
     <string name="featured_image_desc">изображение записи</string>
     <string name="button_discard">Отменить</string>
     <string name="reader_avatar_desc">изображение профиля</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Откат в процессе</string>
-    <string name="activity_log_rewind_site">Откат состояния сайта</string>
-    <string name="my_tickets">Мои тикеты</string>
-    <string name="application_log_button">Журнал приложения</string>
-    <string name="support_contact_email">Контактный адрес эл.почты</string>
-    <string name="support_contact_email_not_set">Не установлен</string>
-    <string name="support_push_notification_title">WordPress</string>
-    <string name="support_push_notification_message">Новое сообщение от \'Помощь и поддержка\'</string>
-    <string name="support_identity_input_dialog_enter_email_and_name">Для продолжения введите ваш адрес эл.почты и имя</string>
-    <string name="support_identity_input_dialog_enter_email">Пожалуйста, введите ваш адрес эл.почты</string>
-    <string name="support_identity_input_dialog_email_label">Email</string>
     <string name="notification_channel_transient_title">Транзиент</string>
+    <string name="support_identity_input_dialog_email_label">Email</string>
+    <string name="support_identity_input_dialog_enter_email">Пожалуйста, введите ваш адрес эл.почты</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Для продолжения введите ваш адрес эл.почты и имя</string>
+    <string name="support_push_notification_message">Новое сообщение от \'Помощь и поддержка\'</string>
+    <string name="support_push_notification_title">WordPress</string>
+    <string name="support_contact_email_not_set">Не установлен</string>
+    <string name="support_contact_email">Контактный адрес эл.почты</string>
+    <string name="application_log_button">Журнал приложения</string>
+    <string name="my_tickets">Мои тикеты</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Откат в процессе</string>
     <string name="activity_log_currently_restoring_message">Откат на %1$s %2$s</string>
-    <string name="activity_log_rewind_dialog_message">Вы уверены, что хотите откатить ваш сайт назад на %1$s в %2$s? Вы потеряете все изменения в содержимом и настройки, сделанные после этого времени.</string>
-    <string name="activity_log_button">Кнопка действий с журналом активности</string>
-    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Ваш сайт был успешно восстановлен</string>
     <string name="activity_log_currently_restoring_title">Ваш сайт в процессе восстановления</string>
-    <string name="activity_log_rewind_started_snackbar_message">Ваш сайт в процессе восстановления\nОткат на %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Ваш сайт был успешно восстановлен</string>
     <string name="activity_log_rewind_finished_snackbar_message">Ваш сайт восстановлен\nСовершен откат на %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Ваш сайт в процессе восстановления\nОткат на %1$s %2$s</string>
+    <string name="activity_log_button">Кнопка действий с журналом активности</string>
     <string name="plugin_auto_managed">Управляется автоматически</string>
     <string name="reader_save_posts_locally_dialog_message">Сохраните эту запись и вернитесь к её чтению в любое время. Это будет доступно только на этом устройстве, сохраненные записи не синхронизируюся между устройствами.</string>
-    <string name="reader_empty_search_title">Результатов не найдено</string>
-    <string name="reader_empty_search_request_failed">Невозможно совершить поиск</string>
     <string name="reader_save_posts_locally_dialog_title">Сохранить запись на потом</string>
-    <string name="sites">Сайты</string>
+    <string name="reader_empty_search_request_failed">Невозможно совершить поиск</string>
+    <string name="reader_empty_search_title">Результатов не найдено</string>
     <string name="comment_read_source_post">Прочесть исходную запись</string>
-    <string name="signup_email_screen_title">Email регистрация</string>
+    <string name="sites">Сайты</string>
     <string name="signup_magic_link_title">Магическая ссылка отослана</string>
-    <string name="alternatively">Альтернативно:</string>
-    <string name="email_address_login_title">Вход по email адресу</string>
-    <string name="site_address_login_title">Вход по адресу сайта</string>
-    <string name="magic_link_login_title">Вход по магической ссылке</string>
-    <string name="magic_link_sent_login_title">Магическая ссылка отослана</string>
-    <string name="selfhosted_site_login_title">Данные для входа</string>
     <string name="verification_2fa_screen_title">Проверка кода</string>
-    <string name="removed">Удалено</string>
-    <string name="reader_save_for_later_title">Сохраненные записи</string>
-    <string name="reader_add_bookmark">Добавить в сохраненные записи</string>
-    <string name="reader_remove_bookmark">Удалить из сохраненных записей</string>
-    <string name="reader_btn_bookmark">Сохранить</string>
-    <string name="reader_btn_bookmarked">Сохранено</string>
-    <string name="reader_bookmark_snack_btn">Посмотреть все</string>
-    <string name="reader_bookmark_snack_title">Запись сохранена</string>
-    <string name="reader_empty_saved_posts_title">Пока не сохранено никаких записей!</string>
+    <string name="selfhosted_site_login_title">Данные для входа</string>
+    <string name="magic_link_sent_login_title">Магическая ссылка отослана</string>
+    <string name="magic_link_login_title">Вход по магической ссылке</string>
+    <string name="site_address_login_title">Вход по адресу сайта</string>
+    <string name="email_address_login_title">Вход по email адресу</string>
     <string name="reader_empty_saved_posts_description">Нажмите %s для сохранения записи в ваш список.</string>
-    <string name="reader_followed_blog_notifications_action">Включить</string>
-    <string name="reader_followed_blog_notifications_this">этот сайт</string>
-    <string name="my_site_icon_dialog_title">Значок сайта</string>
-    <string name="my_site_icon_dialog_add_message">Хотите ли вы добавить значок сайта?</string>
-    <string name="my_site_icon_dialog_change_message">Как вы хотите отредактировать значок?</string>
-    <string name="my_site_icon_dialog_add_requires_permission_message">У вас нет разрешения добавить значок сайта.</string>
-    <string name="my_site_icon_dialog_change_requires_permission_message">У вас нет разрешения редактировать значок сайта.</string>
-    <string name="my_site_icon_dialog_change_button">Сменить</string>
-    <string name="my_site_icon_dialog_remove_button">Удалить</string>
-    <string name="my_site_icon_dialog_cancel_button">Отменить</string>
+    <string name="reader_empty_saved_posts_title">Пока не сохранено никаких записей!</string>
+    <string name="reader_bookmark_snack_title">Запись сохранена</string>
+    <string name="reader_bookmark_snack_btn">Посмотреть все</string>
+    <string name="reader_remove_bookmark">Удалить из сохраненных записей</string>
+    <string name="reader_add_bookmark">Добавить в сохраненные записи</string>
+    <string name="reader_save_for_later_title">Сохраненные записи</string>
+    <string name="removed">Удалено</string>
     <string name="my_site_icon_content_description">Сменить значок сайта</string>
-    <string name="preference_collect_information">Сбор информации</string>
-    <string name="preference_privacy_settings">Настройки конфиденциальности</string>
-    <string name="cookie_policy_learn_more_header">Политика куки</string>
-    <string name="cookie_policy_learn_more_caption">Поделиться информацией с нашей аналитикой по использованию сервисов при входе в вашу учетную запись WordPress.</string>
-    <string name="privacy_policy_learn_more_header">Политика конфиденциальности</string>
-    <string name="privacy_policy_learn_more_caption">Эта информация позволит нам улушать наши продукты, уточнять маркетинг, персонализировать ваш опыт взаимодействия с WordPress.com, и далее как указано в нашей политике конфиденциальности.</string>
-    <string name="third_party_policy_learn_more_header">Политики третьих сторон</string>
-    <string name="third_party_policy_learn_more_caption">Мы используем другие инструменты отслеживания, включая и инструменты третьих сторон. Прочитайте о них и как их контролировать.</string>
-    <string name="privacy_policy_read">Прочитать политику конфиденциальности</string>
-    <string name="activity">Активность</string>
-    <string name="activity_log">Журнал активности</string>
-    <string name="activity_log_icon">Значок активности</string>
-    <string name="activity_log_event">Событие</string>
-    <string name="rewind">Откат</string>
-    <string name="activity_log_jetpack_icon">Значок Jetpack</string>
-    <string name="reader_btn_notifications_off">Отключить уведомления сайта</string>
-    <string name="reader_btn_notifications_on">Включить уведомления сайта</string>
+    <string name="my_site_icon_dialog_cancel_button">Отменить</string>
+    <string name="my_site_icon_dialog_remove_button">Удалить</string>
+    <string name="my_site_icon_dialog_change_button">Сменить</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">У вас нет разрешения редактировать значок сайта.</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">У вас нет разрешения добавить значок сайта.</string>
+    <string name="my_site_icon_dialog_change_message">Как вы хотите отредактировать значок?</string>
+    <string name="my_site_icon_dialog_add_message">Хотите ли вы добавить значок сайта?</string>
+    <string name="my_site_icon_dialog_title">Значок сайта</string>
+    <string name="reader_followed_blog_notifications_this">этот сайт</string>
+    <string name="reader_followed_blog_notifications_action">Включить</string>
     <string name="reader_followed_blog_notifications">Включить уведомления для %1$s%2$s%3$s?</string>
+    <string name="reader_btn_notifications_on">Включить уведомления сайта</string>
+    <string name="reader_btn_notifications_off">Отключить уведомления сайта</string>
+    <string name="activity_log_jetpack_icon">Значок Jetpack</string>
+    <string name="activity_log_event">Событие</string>
+    <string name="activity_log_icon">Значок активности</string>
+    <string name="activity_log">Журнал активности</string>
+    <string name="privacy_policy_read">Прочитать политику конфиденциальности</string>
+    <string name="third_party_policy_learn_more_caption">Мы используем другие инструменты отслеживания, включая и инструменты третьих сторон. Прочитайте о них и как их контролировать.</string>
+    <string name="third_party_policy_learn_more_header">Политики третьих сторон</string>
+    <string name="privacy_policy_learn_more_caption">Эта информация позволит нам улушать наши продукты, уточнять маркетинг, персонализировать ваш опыт взаимодействия с WordPress.com, и далее как указано в нашей политике конфиденциальности.</string>
+    <string name="privacy_policy_learn_more_header">Политика конфиденциальности</string>
+    <string name="cookie_policy_learn_more_caption">Поделиться информацией с нашей аналитикой по использованию сервисов при входе в вашу учетную запись WordPress.</string>
+    <string name="cookie_policy_learn_more_header">Политика куки</string>
+    <string name="preference_privacy_settings">Настройки конфиденциальности</string>
+    <string name="preference_collect_information">Сбор информации</string>
     <string name="post_submitted">Запись отправлена</string>
-    <string name="login_email_button_signup">Еще нет учетной записи? %1$sЗарегистрируйтесь%2$s</string>
-    <string name="plugin_install_site_ineligible_not_domain_owner">Возможность установки плагинов требует связи подписки основного домена и этого пользователя.</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Возможность установки плагинов требует, чтобы сайт не был в серых списках.</string>
-    <string name="plugin_install_site_ineligible_excessive_disk_space">Плагин не может быть установлен из-за ограничений дискового пространства.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Возможность установки плагинов требует связи подписки основного домена и этого пользователя.</string>
+    <string name="plugin_install_site_ineligible_non_admin_user">Возможность установки плагинов требует привилегий администратора.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">Плагин не может быть установлен на VIP сайтах.</string>
-    <string name="plugin_install_site_ineligible_not_using_custom_domain">Возможность установки плагинов требует пользовательского домена.</string>
-    <string name="plugin_install_site_ineligible_no_business_plan">Возможность установки плагинов требует бизнес тариф.</string>
-    <string name="plugin_install_site_ineligible_site_private">Возможность установки плагинов требует открытого сайта.</string>
+    <string name="plugin_install_site_ineligible_excessive_disk_space">Плагин не может быть установлен из-за ограничений дискового пространства.</string>
     <string name="plugin_install_site_ineligible_email_unverified">Возможность установки плагинов требует проверенного адреса email.</string>
-    <string name="plugin_install_site_ineligible_non_admin_user">Возможность установки плагинов требует привилегий администратора.</string>
+    <string name="plugin_install_site_ineligible_site_private">Возможность установки плагинов требует открытого сайта.</string>
+    <string name="plugin_install_site_ineligible_no_business_plan">Возможность установки плагинов требует бизнес тариф.</string>
+    <string name="plugin_install_site_ineligible_not_using_custom_domain">Возможность установки плагинов требует пользовательского домена.</string>
     <string name="plugin_install_first_plugin_almost_finished_dialog_message">Мы завершаем установку — почти готово…</string>
     <string name="plugin_install_first_plugin_progress_dialog_message">Установка плагина…</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Установить</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_message">Установка первого плагина на сайт может занять до 1 минуты. В течении этого времени вы не сможете вносить изменения на ваш сайт.</string>
-    <string name="notification_settings_followed_dialog_email_posts_switch">Посылать по эл.почте новые записи</string>
-    <string name="notification_settings_followed_dialog_notification_posts_description">Получать уведомления о новых записях на этом сайте</string>
-    <string name="notification_settings_followed_dialog_notification_posts_switch">Новые записи</string>
-    <string name="notification_settings_followed_dialog_email_posts_daily">Ежедневно</string>
-    <string name="notification_settings_followed_dialog_email_posts_instantly">Сразу</string>
-    <string name="notification_settings_followed_dialog_email_posts_weekly">Еженедельно</string>
-    <string name="notification_settings_followed_dialog_email_comments">Посылать по эл.почте новые комментарии</string>
-    <string name="notification_settings_followed_dialog_title">Уведомления</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Установить плагин</string>
-    <string name="notification_settings_category_followed_sites">Сайты с подпиской</string>
+    <string name="notification_settings_followed_dialog_title">Уведомления</string>
+    <string name="notification_settings_followed_dialog_email_comments">Посылать по эл.почте новые комментарии</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">Еженедельно</string>
+    <string name="notification_settings_followed_dialog_email_posts_instantly">Сразу</string>
+    <string name="notification_settings_followed_dialog_email_posts_daily">Ежедневно</string>
+    <string name="notification_settings_followed_dialog_notification_posts_switch">Новые записи</string>
+    <string name="notification_settings_followed_dialog_notification_posts_description">Получать уведомления о новых записях на этом сайте</string>
+    <string name="notification_settings_followed_dialog_email_posts_switch">Посылать по эл.почте новые записи</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">Все мои сайты с подпиской</string>
-    <string name="dialog_confirm_delete_permanently_post">Точно хотите навсегда удалить эту запись?</string>
-    <string name="comment_title">%s в %s</string>
-    <string name="content_description_people_looking_charts">Люди, смотрящие на графики и диаграммы</string>
+    <string name="notification_settings_category_followed_sites">Сайты с подпиской</string>
     <string name="content_description_person_reading_device_notification">Персональные устройства чтения с уведомлениями</string>
+    <string name="content_description_people_looking_charts">Люди, смотрящие на графики и диаграммы</string>
+    <string name="comment_title">%s в %s</string>
+    <string name="dialog_confirm_delete_permanently_post">Точно хотите навсегда удалить эту запись?</string>
     <string name="notification_channel_important_title">Важное</string>
     <string name="notification_channel_general_title">Общее</string>
     <string name="photo_picker_use_photo">Использовать это фото</string>
-    <string name="add_count">Добавить %d</string>
-    <string name="preview_count">Предпросмотр %d</string>
-    <string name="site_settings_quota_space_unlimited">%1$s / неограничено</string>
-    <string name="error_save_empty_draft">Нельзя сохранить пустой черновик</string>
-    <string name="photo_picker_stock_media">Выберите из свободной фототеки</string>
-    <string name="stock_media_picker_search_hint">Поиск в свободной фототеке</string>
-    <string name="stock_media_picker_initial_empty_text">Ищите бесплатные фото и добавьте их в вашу медиатеку</string>
-    <string name="stock_media_picker_initial_empty_subtext">Фотографии предоставлены %s</string>
     <string name="media_preview_title">%1$d из %2$d</string>
+    <string name="stock_media_picker_initial_empty_subtext">Фотографии предоставлены %s</string>
+    <string name="stock_media_picker_initial_empty_text">Ищите бесплатные фото и добавьте их в вашу медиатеку</string>
+    <string name="stock_media_picker_search_hint">Поиск в свободной фототеке</string>
+    <string name="photo_picker_stock_media">Выберите из свободной фототеки</string>
+    <string name="error_save_empty_draft">Нельзя сохранить пустой черновик</string>
+    <string name="site_settings_quota_space_unlimited">%1$s / неограничено</string>
+    <string name="preview_count">Предпросмотр %d</string>
+    <string name="add_count">Добавить %d</string>
     <string name="fab_add_tag_desc">Создать метку</string>
-    <string name="signup_with_google_progress">Регистрация через Google…</string>
-    <string name="comment_checkmark_desc">отметка</string>
-    <string name="profile_picture">Изображение профиля %s</string>
-    <string name="invite_user_delete_desc">удалить %s</string>
-    <string name="media_grid_item_image_desc">предпросмотр медиа, имя файла %s</string>
-    <string name="media_grid_item_retry_desc">повторить</string>
-    <string name="media_grid_item_trash_desc">в корзину</string>
-    <string name="media_grid_item_play_video_desc">воспроизвести видео</string>
-    <string name="media_preview_audio_desc">аудио</string>
-    <string name="media_preview_desc">предпросмотр</string>
-    <string name="media_settings_image_preview_desc">предпросмотр изображения</string>
-    <string name="media_settings_play">воспроизвести</string>
-    <string name="people_invite_role_info_desc">информация о роли</string>
-    <string name="photo_picker_device_desc">выбрать с устройства</string>
-    <string name="photo_picker_camera_desc">сделать фото</string>
-    <string name="photo_picker_wpmedia_desc">выбрать из медиатеки WordPress</string>
-    <string name="plugin_detail_banner_desc">баннер плагина</string>
-    <string name="plugin_detail_logo_desc">логотип плагина</string>
-    <string name="reader_cardview_post_play_video_desc">воспроизвести видео</string>
-    <string name="photo_picker_thumbnail_desc">Воспроизвести видео</string>
-    <string name="reader_list_item_suggestion_remove_desc">удалить</string>
-    <string name="reader_photo_view_desc">фото</string>
-    <string name="show_more_desc">показать больше</string>
-    <string name="notification_settings_switch_desc">Уведомления</string>
     <string name="navigate_up_desc">перейти наверх</string>
+    <string name="notification_settings_switch_desc">Уведомления</string>
     <string name="open_external_link_desc">Открыть внешнюю ссылку</string>
-    <string name="jetpack_already_connected_toast">Вы уже подключили Jetpack</string>
+    <string name="show_more_desc">показать больше</string>
+    <string name="reader_photo_view_desc">фото</string>
+    <string name="reader_list_item_suggestion_remove_desc">удалить</string>
+    <string name="photo_picker_thumbnail_desc">Воспроизвести видео</string>
+    <string name="reader_cardview_post_play_video_desc">воспроизвести видео</string>
+    <string name="plugin_detail_logo_desc">логотип плагина</string>
+    <string name="plugin_detail_banner_desc">баннер плагина</string>
+    <string name="photo_picker_wpmedia_desc">выбрать из медиатеки WordPress</string>
+    <string name="photo_picker_camera_desc">сделать фото</string>
+    <string name="photo_picker_device_desc">выбрать с устройства</string>
+    <string name="people_invite_role_info_desc">информация о роли</string>
+    <string name="media_settings_play">воспроизвести</string>
+    <string name="media_settings_image_preview_desc">предпросмотр изображения</string>
+    <string name="media_preview_desc">предпросмотр</string>
+    <string name="media_preview_audio_desc">аудио</string>
+    <string name="media_grid_item_play_video_desc">воспроизвести видео</string>
+    <string name="media_grid_item_trash_desc">в корзину</string>
+    <string name="media_grid_item_retry_desc">повторить</string>
+    <string name="media_grid_item_image_desc">предпросмотр медиа, имя файла %s</string>
+    <string name="invite_user_delete_desc">удалить %s</string>
+    <string name="profile_picture">Изображение профиля %s</string>
+    <string name="comment_checkmark_desc">отметка</string>
+    <string name="signup_with_google_progress">Регистрация через Google…</string>
     <string name="jetpack_connection_failed_with_reason">Подключение к Jetpack не удалось: %s</string>
-    <string name="file_size_in_terabytes">%s ТБ</string>
-    <string name="menu_save_as_draft">Сохранить как черновик</string>
-    <string name="menu_preview">Предпросмотр</string>
-    <string name="menu_html_mode">Режим HTML</string>
-    <string name="menu_html_mode_done_snackbar">Переход в режим HTML</string>
-    <string name="menu_visual_mode">Визуальный режим</string>
-    <string name="menu_visual_mode_done_snackbar">Переход в визуальный режим.</string>
+    <string name="jetpack_already_connected_toast">Вы уже подключили Jetpack</string>
     <string name="menu_undo_snackbar_action">ОТМЕНИТЬ</string>
-    <string name="login_prologue_screen_title">Войти</string>
-    <string name="signup_epilogue_screen_title">Новая учетная запись</string>
-    <string name="share_intent_screen_title">Выберите сайт</string>
-    <string name="edit_photo_screen_title">Изменить фото</string>
-    <string name="notif_detail_screen_title">Подробности уведомления %s</string>
-    <string name="comment_approved_talkback">Комментарий одобрен</string>
-    <string name="comment_unapproved_talkback">Комментарий отклонен</string>
-    <string name="comment_liked_talkback">Комментарий отмечен понравившимся</string>
-    <string name="comment_unliked_talkback">Комментарий удален из понравившихся</string>
-    <string name="comment_trash_talkback">Комментарий удален в корзину</string>
-    <string name="comment_untrash_talkback">Комментарий восстановлен</string>
-    <string name="comment_delete_talkback">Комментарий удален</string>
-    <string name="comment_spam_talkback">Комментарий отмечен как спам</string>
-    <string name="comment_unspam_talkback">Комментарий отмечен как не спам</string>
-    <string name="site_settings_quota_header">Медиа</string>
-    <string name="site_settings_quota_space_title">Использованное место</string>
-    <string name="site_settings_quota_space_hint">Если вам требуется больше места, то вам нужно улучшить ваш тариф WordPress.</string>
-    <string name="site_settings_quota_space_value">%1$s из %2$s</string>
-    <string name="file_size_in_bytes">%s байт</string>
-    <string name="file_size_in_kilobytes">%s КБ</string>
-    <string name="file_size_in_megabytes">%s МБ</string>
+    <string name="menu_visual_mode_done_snackbar">Переход в визуальный режим.</string>
+    <string name="menu_visual_mode">Визуальный режим</string>
+    <string name="menu_html_mode_done_snackbar">Переход в режим HTML</string>
+    <string name="menu_html_mode">Режим HTML</string>
+    <string name="menu_preview">Предпросмотр</string>
+    <string name="menu_save_as_draft">Сохранить как черновик</string>
+    <string name="file_size_in_terabytes">%s ТБ</string>
     <string name="file_size_in_gigabytes">%s ГБ</string>
-    <string name="release_notes_screen_title">Заметки о выпуске</string>
-    <string name="license_screen_title">Лицензия</string>
-    <string name="help_screen_title">Помощь и поддержка</string>
-    <string name="notif_settings_screen_title">Настройки уведомления</string>
-    <string name="my_site_section_screen_title">Мой сайт</string>
-    <string name="reader_screen_title">Читалка</string>
-    <string name="notifications_screen_title">Уведомления</string>
-    <string name="publicize_buttons_screen_title">Кнопки поделиться</string>
-    <string name="media_settings_screen_title">Информация о файле</string>
-    <string name="person_detail_screen_title">Информация о человеке</string>
+    <string name="file_size_in_megabytes">%s МБ</string>
+    <string name="file_size_in_kilobytes">%s КБ</string>
+    <string name="file_size_in_bytes">%s байт</string>
+    <string name="site_settings_quota_space_value">%1$s из %2$s</string>
+    <string name="site_settings_quota_space_hint">Если вам требуется больше места, то вам нужно улучшить ваш тариф WordPress.</string>
+    <string name="site_settings_quota_space_title">Использованное место</string>
+    <string name="site_settings_quota_header">Медиа</string>
+    <string name="comment_unspam_talkback">Комментарий отмечен как не спам</string>
+    <string name="comment_spam_talkback">Комментарий отмечен как спам</string>
+    <string name="comment_delete_talkback">Комментарий удален</string>
+    <string name="comment_untrash_talkback">Комментарий восстановлен</string>
+    <string name="comment_trash_talkback">Комментарий удален в корзину</string>
+    <string name="comment_unliked_talkback">Комментарий удален из понравившихся</string>
+    <string name="comment_liked_talkback">Комментарий отмечен понравившимся</string>
+    <string name="comment_unapproved_talkback">Комментарий отклонен</string>
+    <string name="comment_approved_talkback">Комментарий одобрен</string>
+    <string name="notif_detail_screen_title">Подробности уведомления %s</string>
+    <string name="edit_photo_screen_title">Изменить фото</string>
+    <string name="share_intent_screen_title">Выберите сайт</string>
+    <string name="signup_epilogue_screen_title">Новая учетная запись</string>
     <string name="login_epilogue_screen_title">Вход от</string>
+    <string name="person_detail_screen_title">Информация о человеке</string>
+    <string name="media_settings_screen_title">Информация о файле</string>
+    <string name="publicize_buttons_screen_title">Кнопки поделиться</string>
+    <string name="notifications_screen_title">Уведомления</string>
+    <string name="reader_screen_title">Читалка</string>
     <string name="me_section_screen_title">Профиль</string>
+    <string name="my_site_section_screen_title">Мой сайт</string>
+    <string name="notif_settings_screen_title">Настройки уведомления</string>
+    <string name="help_screen_title">Помощь и поддержка</string>
+    <string name="license_screen_title">Лицензия</string>
+    <string name="release_notes_screen_title">Заметки о выпуске</string>
     <string name="signup_epilogue_error_avatar_view">Ваш аватар загружен и скоро станет доступен.</string>
-    <string name="version_with_name_param">Версия %s</string>
-    <string name="sharing_disabled">Модуль \"поделиться\" отключен</string>
-    <string name="sharing_disabled_description">Нет доступа к настройкам \"поделиться\" , так как соответствующий модуль отключен в Jetpack.</string>
-    <string name="plugin_caption_featured">Рекомендуется</string>
+    <string name="permissions_denied_message">Похоже что были отключены разрешения, требуемые данной возможостью.&lt;br/&gt;&lt;br/&gt;Отредактируйте разрешения и убедитесь что &lt;strong&gt;%s&lt;/strong&gt; включено.</string>
     <string name="permissions_denied_title">Права доступа</string>
-    <string name="permissions_denied_message">Похоже что были отключены разрешения, требуемые данной возможостью.&lt;br/>&lt;br/>Отредактируйте разрешения и убедитесь что &lt;strong>%s&lt;/strong> включено.</string>
+    <string name="plugin_caption_featured">Рекомендуется</string>
+    <string name="sharing_disabled_description">Нет доступа к настройкам \"поделиться\" , так как соответствующий модуль отключен в Jetpack.</string>
+    <string name="sharing_disabled">Модуль \"поделиться\" отключен</string>
+    <string name="version_with_name_param">Версия %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
     <string name="publisher_with_company_param">Издатель: %s</string>
     <string name="notification_sound_has_invalid_path">Выбранный звук имеет неверный путь. Выберите другой.</string>
@@ -1361,49 +1701,40 @@ Language: ru
     <string name="media_file_page_singular_mixed_not_uploaded_files_plural">не загружены 1 страница и %1$d файлов</string>
     <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">не загружены %1$d запись и %2$d файлов</string>
     <string name="media_file_post_singular_mixed_not_uploaded_files_plural">не загружены 1 запись и %1$d файлов</string>
-    <string name="at_username">\@%s</string>
-    <string name="untitled_in_parentheses">(Без названия)</string>
     <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">не загружены %1$d страниц/записей и 1 файл</string>
     <string name="media_file_pages_plural_mixed_not_uploaded_one_file">не загружены %1$d страница и 1 файл</string>
     <string name="media_file_page_singular_mixed_not_uploaded_one_file">не загружены 1 страница и 1 файл </string>
     <string name="media_file_posts_plural_mixed_not_uploaded_one_file">не загружены %1$d записей и 1 файл </string>
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">не загружены 1 запись и 1 файл </string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
+    <string name="untitled_in_parentheses">(Без названия)</string>
+    <string name="at_username">\@%s</string>
     <string name="site_creation_domain_finish_button">Создать сайт</string>
-    <string name="signup_user_exists">Email уже зарегистрирован на WordPress.com\nПереходим ко входу.</string>
-    <string name="signup_with_email_button">Зарегистрироваться с адресом Email</string>
-    <string name="signup_with_google_button">Зарегистрироваться через Google</string>
-    <string name="content_description_add_avatar">Добавить аватар</string>
-    <string name="username_changer_action">Сохранить</string>
-    <string name="username_changer_dismiss_button_positive">Отменить</string>
-    <string name="username_changer_dismiss_message">Отменить смену имени пользователя?</string>
-    <string name="username_changer_error_generic">Возникла ошибка при получении предложений по именам пользователя.</string>
-    <string name="username_changer_error_none">Нет предложений по именам пользователя из %1$s%2$s%3$s. Добавьте больше букв или цифр для получения предложений.</string>
-    <string name="username_changer_header">Ваше имя пользователя - %1$s%2$s%3$s. За некоторыми исключениями, другие будут видеть ваше отображаемое имя - %4$s%5$s%6$s.</string>
-    <string name="username_changer_hint">Введите что-нибудь для получения еще предложений</string>
-    <string name="username_changer_title">Сменить имя пользователя</string>
-    <string name="google_error_timeout">Google отвечает слишком долго. Возможно вам стоит подождать пока ваше подключение к Интернет станет лучше.</string>
-    <string name="notification_site_creation_title_success">Сайт создан!</string>
     <string name="notification_site_creation_created">Нажмите для продолжения.</string>
-    <string name="signup_magic_link_progress">Отправка email</string>
+    <string name="notification_site_creation_title_success">Сайт создан!</string>
+    <string name="google_error_timeout">Google отвечает слишком долго. Возможно вам стоит подождать пока ваше подключение к Интернет станет лучше.</string>
+    <string name="username_changer_title">Сменить имя пользователя</string>
+    <string name="username_changer_hint">Введите что-нибудь для получения еще предложений</string>
+    <string name="username_changer_header">Ваше имя пользователя - %1$s%2$s%3$s. За некоторыми исключениями, другие будут видеть ваше отображаемое имя - %4$s%5$s%6$s.</string>
+    <string name="username_changer_error_none">Нет предложений по именам пользователя из %1$s%2$s%3$s. Добавьте больше букв или цифр для получения предложений.</string>
+    <string name="username_changer_error_generic">Возникла ошибка при получении предложений по именам пользователя.</string>
+    <string name="username_changer_dismiss_message">Отменить смену имени пользователя?</string>
+    <string name="username_changer_dismiss_button_positive">Отменить</string>
+    <string name="username_changer_action">Сохранить</string>
+    <string name="content_description_add_avatar">Добавить аватар</string>
+    <string name="signup_user_exists">Email уже зарегистрирован на WordPress.com\nПереходим ко входу.</string>
     <string name="signup_updating_account">Обновление учетной записи…</string>
-    <string name="signup_terms_of_service_text">Регистрируясь, вы соглашаетесь с нашими %1$sПравилами пользования%2$s.</string>
+    <string name="signup_magic_link_progress">Отправка email</string>
     <string name="signup_magic_link_error_button_positive">Повторить</string>
     <string name="signup_magic_link_error_button_negative">Закрыть</string>
     <string name="signup_magic_link_error">Возникла проблема при отправке почты. Вы можете повторить сейчас или закрыть и попробовать еще раз позже.</string>
     <string name="signup_epilogue_hint_username">Имя пользователя</string>
+    <string name="signup_epilogue_hint_password_detail">Вы всегда можете войти со ссылкой, как вы только что использовали, но если хотите, то можно и установить пароль.</string>
     <string name="signup_epilogue_hint_password">Пароль (не обязательно)</string>
     <string name="signup_epilogue_hint_display">Отображаемое имя</string>
     <string name="signup_epilogue_error_button_positive">Повтор</string>
     <string name="signup_epilogue_error_button_negative">Откат</string>
     <string name="signup_epilogue_error_generic">Возникла ошибка обновления учетной записи. Вы можете повторить или сделать откат изменений.</string>
     <string name="signup_epilogue_error_avatar">Возникла ошибка обновления аватара.</string>
-    <string name="signup_email_header">Для создания новой учетной записи WordPress.com, пожалуйста введите ваш адрес email.</string>
-    <string name="signup_email_error_generic">Возникла ошибка проверки адреса email.</string>
-    <string name="signup_epilogue_hint_password_detail">Вы всегда можете войти со ссылкой, как вы только что использовали, но если хотите, то можно и установить пароль.</string>
-    <string name="sign_up">Зарегистрироваться на WordPress.com</string>
-    <string name="enter_username_instead">Войти с именем пользователя.</string>
-    <string name="enter_site_address_instead">Войти с адресом вашего сайта.</string>
     <string name="plugin_needs_update">Требует обновления</string>
     <string name="plugin_caption_search">Искать плагины</string>
     <string name="plugin_caption_new">Новые</string>
@@ -1425,58 +1756,58 @@ Language: ru
     <string name="plugin_info_your_version">Ваша версия WordPress</string>
     <string name="plugin_info_requires_version">Требует версии WordPress</string>
     <string name="plugin_info_lastupdated">Последнее обновление</string>
-    <string name="plugin_one_stars">1 звезда</string>
-    <string name="plugin_two_stars">2 звезды</string>
-    <string name="plugin_three_stars">3 звезды</string>
-    <string name="plugin_four_stars">4 звезды</string>
-    <string name="plugin_five_stars">5 звезд</string>
     <string name="plugin_info_version">Версия</string>
-    <string name="plugin_read_reviews">Прочитать отзывы</string>
-    <string name="plugin_num_ratings">%s оценки</string>
-    <string name="plugin_num_downloads">%s скачивания</string>
+    <string name="plugin_five_stars">5 звезд</string>
+    <string name="plugin_four_stars">4 звезды</string>
+    <string name="plugin_three_stars">3 звезды</string>
+    <string name="plugin_two_stars">2 звезды</string>
+    <string name="plugin_one_stars">1 звезда</string>
     <string name="plugin_empty_text">Не предоставлено</string>
+    <string name="plugin_num_downloads">%s скачивания</string>
+    <string name="plugin_num_ratings">%s оценки</string>
+    <string name="plugin_read_reviews">Прочитать отзывы</string>
     <string name="plugin_faq">Часто задаваемые вопросы</string>
-    <string name="plugin_description">Описание</string>
-    <string name="plugin_installation">Установка</string>
     <string name="plugin_whatsnew">Что нового</string>
-    <string name="plugin_installed_version">Установлена версия %s</string>
-    <string name="plugin_installed">Установлен</string>
+    <string name="plugin_installation">Установка</string>
+    <string name="plugin_description">Описание</string>
     <string name="plugin_settings">Настройки</string>
-    <string name="plugin_byline">от автора %s</string>
+    <string name="plugin_installed">Установлен</string>
+    <string name="plugin_installed_version">Установлена версия %s</string>
     <string name="plugin_version">Версия %s</string>
-    <string name="plugin_fetch_error">Невозможно загрузить  плагины</string>
+    <string name="plugin_byline">от автора %s</string>
     <string name="change_photo">Изменить фото</string>
-    <string name="dlg_deleting_tag">Удаление</string>
-    <string name="dlg_saving_tag">Сохранение</string>
-    <string name="site_settings_tags_hint">Управлять метками сайта</string>
+    <string name="plugin_fetch_error">Невозможно загрузить  плагины</string>
     <string name="my_site_btn_site_pages">Страницы сайта</string>
+    <string name="site_settings_tags_hint">Управлять метками сайта</string>
+    <string name="dlg_saving_tag">Сохранение</string>
+    <string name="dlg_deleting_tag">Удаление</string>
     <string name="dlg_confirm_delete_tag">Навсегда удалить метку \'%s\'?</string>
     <string name="error_tag_exists">Метка с таким именем уже существует</string>
-    <string name="site_settings_amp_summary">Ваш сайт на WordPress.com поддерживает использование Accelerated Mobile Pages, инициативы Google, которая значительно ускоряет загрузку страниц на мобильных устройствах</string>
-    <string name="tag_name_hint">Метка</string>
-    <string name="tag_description_hint">Описание</string>
     <string name="add_new_tag">Добавить новую метку</string>
+    <string name="tag_description_hint">Описание</string>
+    <string name="tag_name_hint">Метка</string>
+    <string name="site_settings_amp_summary">Ваш сайт на WordPress.com поддерживает использование Accelerated Mobile Pages, инициативы Google, которая значительно ускоряет загрузку страниц на мобильных устройствах</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
-    <string name="site_settings_format_help">Узнать больше о форматировании даты и времени</string>
     <string name="site_settings_timezones_error">Невозможно загрузить часовые пояса</string>
-    <string name="site_settings_format_entry_custom">Пользовательский</string>
+    <string name="site_settings_format_help">Узнать больше о форматировании даты и времени</string>
     <string name="site_settings_format_hint_custom">Пользовательский формат</string>
+    <string name="site_settings_format_entry_custom">Пользовательский</string>
     <string name="site_settings_posts_per_page_title">Записей на страницу</string>
     <string name="site_settings_timezone_subtitle">Выберите город в вашем часовом поясе</string>
-    <string name="site_settings_time_format_title">Формат времени</string>
     <string name="site_settings_timezone_title">Часовой пояс</string>
+    <string name="site_settings_time_format_title">Формат времени</string>
     <string name="site_settings_date_format_title">Формат даты</string>
     <string name="site_settings_week_start_title">День начала недели</string>
-    <string name="site_settings_traffic_header">Трафик</string>
     <string name="site_settings_tags_title">Метки</string>
+    <string name="site_settings_traffic_header">Трафик</string>
     <string name="delete_yes">Удалить</string>
     <string name="plugin_external_link_icon_content_description">Внешняя ссылка</string>
     <string name="plugin_icon_content_description">Значок плагина</string>
-    <string name="wordpress_dot_org_plugin_page">Страница плагина на WordPress.org</string>
     <string name="plugin_home_page">Домашняя страница плагина</string>
+    <string name="wordpress_dot_org_plugin_page">Страница плагина на WordPress.org</string>
     <string name="plugin_remove_dialog_message">Вы точно хотите удалить %1$s с %2$s?\n\nЭто деактивирует плагин и удалит все ассоциированные файлы и данные.</string>
-    <string name="plugin_remove_progress_dialog_message">Удаление %s…</string>
     <string name="plugin_remove_dialog_title">Удаление плагина</string>
+    <string name="plugin_remove_progress_dialog_message">Удаление %s…</string>
     <string name="plugin_disable_progress_dialog_message">Отключение %s…</string>
     <string name="plugin_configuration_failed">Возникла ошибка конфигурации плагина: %s</string>
     <string name="plugin_remove_failed">Ошибка удаления %s.</string>
@@ -1497,34 +1828,33 @@ Language: ru
     <string name="notification_2fa_needed">Пожалуйста, введите код авторизации для продолжения.</string>
     <string name="notification_error_wrong_password">Пожалуйста, перепроверьте свой пароль для продолжения.</string>
     <string name="notification_login_title_stopped">Вход остановлен</string>
-    <string name="notification_login_title_in_progress">Вход …</string>
     <string name="notification_logging_in">Пожалуйста подождите пока авторизуемся.</string>
+    <string name="notification_login_title_in_progress">Вход …</string>
     <string name="notification_logged_in">Нажмите чтобы продолжить.</string>
     <string name="notification_login_title_success">Вход успешен!</string>
     <string name="login_error_generic_start">Процесс входа в Google не может быть запущен.</string>
     <string name="login_empty_password">Пожалуйста, введите пароль</string>
     <string name="login_text_otp_another">Пришлите мне другой код.</string>
     <string name="enter_verification_code_sms">Мы послали текстовое сообщение на телефонный номер оканчивающийся на %s. Пожалуйста введите проверочный код из SMS.</string>
-    <string name="uploading_subtitle_media_only">осталось %1$d из %2$d файлов</string>
-    <string name="uploading_subtitle_media_only_one">остался 1 файл</string>
     <string name="image_size">Размер</string>
+    <string name="uploading_subtitle_media_only_one">остался 1 файл</string>
+    <string name="uploading_subtitle_media_only">осталось %1$d из %2$d файлов</string>
     <string name="uploading_subtitle_posts_only_one">осталась 1 запись</string>
     <string name="uploading_title">Загрузка…</string>
     <string name="media_files_uploaded_write_post">Написать запись</string>
     <string name="media_all_files_uploaded_successfully">успешно загружено %d файлов</string>
     <string name="media_files_uploaded_successfully">, %d загружено</string>
-    <string name="media_files_uploaded">%d файлов загружено</string>
-    <string name="media_file_not_uploaded">1 файл не загружен</string>
     <string name="media_file_uploaded">1 файл загружен</string>
+    <string name="media_file_not_uploaded">1 файл не загружен</string>
+    <string name="media_files_uploaded">%d файлов загружено</string>
     <string name="media_files_not_uploaded">%d файлов не загружено</string>
     <string name="remove_image_from_post">Удалить из записи</string>
     <string name="confirm_remove_media_image">Удалить это изображение из записи?</string>
-    <string name="media_edit_file_details_card_caption">Информация о файле</string>
     <string name="media_edit_customize_card_caption">Настроить</string>
-    <string name="login_error_generic">Возникла ошибка подключения к учетной записи Google.</string>
+    <string name="media_edit_file_details_card_caption">Информация о файле</string>
     <string name="login_error_suffix">\nВозможно попробуете другую учетную запись?</string>
+    <string name="login_error_generic">Возникла ошибка подключения к учетной записи Google.</string>
     <string name="login_error_button">Закрыть</string>
-    <string name="login_google_button_suffix">Войти через Google.</string>
     <string name="enter_wpcom_password_google">Чтобы войти через эту учетную запись Google, пожалуйста укажите соответствующий пароль WordPress.com. Это запрашивается только один раз.</string>
     <string name="error_generic_network">Возникла ошибка сети. Проверьте ваше подключение и попробуйте снова.</string>
     <string name="post_settings_remove_featured_image">Убрать изображение записи</string>
@@ -1536,12 +1866,11 @@ Language: ru
     <string name="jetpack_disconnect_confirm">Отключить</string>
     <string name="jetpack_disconnect_confirmation_message">Вы точно хотите отключить Jetpack от этого сайта?</string>
     <string name="jetpack_disconnect_pref_title">\"Отключить от WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Вы можете внести IP адрес или диапазон адресов в белый список, они не будут блокироваться Jetpack. Приемлимы IPv4 и IPv6. Для указания диапазона, введите начальный и конечный адрес разделенные тире. Пример: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Вы можете внести IP адрес или диапазон адресов в белый список, они не будут блокироваться Jetpack. Приемлимы IPv4 и IPv6. Для указания диапазона, введите начальный и конечный адрес разделенные тире. Пример: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Требуется 2-факторная авторизация</string>
     <string name="jetpack_match_wpcom_via_email_title">Использовать сопоставление учетных записей по email адресу</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Разрешать вход через WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Вход через WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Белый список IP</string>
     <string name="jetpack_prevent_brute_force_title">Блокировать вредоносные попытки входа</string>
     <string name="jetpack_prevent_brute_force_category_title">Защита от атак методом перебора</string>
     <string name="jetpack_send_wp_notifications_title">Отсылать PUSH-уведомления</string>
@@ -1582,12 +1911,12 @@ Language: ru
     <string name="notification_settings_category_other">Прочее</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Все мои сайты</string>
     <string name="notification_settings_category_your_sites">Ваши сайты</string>
-    <string name="notification_settings_master_off_message">Отключив настройки уведомлений, вы не будете получать от этого приложения никакие уведомления, независимо от типа. Тип уведомлений можно выбрать, включив настройки уведомлений.</string>
-    <string name="notification_settings_master_off_title">Для получения уведомлений на этом устройстве включите настройки уведомлений.</string>
-    <string name="notification_settings_master_hint_off">Включить уведомления</string>
-    <string name="notification_settings_master_hint_on">Отключить уведомления</string>
-    <string name="notification_settings_master_status_off">Выкл.</string>
-    <string name="notification_settings_master_status_on">Вкл.</string>
+    <string name="notification_settings_main_off_message">Отключив настройки уведомлений, вы не будете получать от этого приложения никакие уведомления, независимо от типа. Тип уведомлений можно выбрать, включив настройки уведомлений.</string>
+    <string name="notification_settings_main_off_title">Для получения уведомлений на этом устройстве включите настройки уведомлений.</string>
+    <string name="notification_settings_main_hint_off">Включить уведомления</string>
+    <string name="notification_settings_main_hint_on">Отключить уведомления</string>
+    <string name="notification_settings_main_status_off">Выкл.</string>
+    <string name="notification_settings_main_status_on">Вкл.</string>
     <string name="max_video_resolution">Максимальный размер видео</string>
     <string name="max_thumbnail_px_size">Максимальный размер изображения</string>
     <string name="error_upload_post_media_param">При загрузке медиафайла в эту запись произошла ошибка: %s.</string>
@@ -1624,7 +1953,6 @@ Language: ru
     <string name="login_site_address_more_help">Нужна дополнительная помощь?</string>
     <string name="login_site_address_help_content">При открытии сайта в браузере Chrome его адрес отображается в строке в верхней части экрана.</string>
     <string name="login_site_address_help_title">Какой адрес у моего сайта?</string>
-    <string name="login_site_address_help">Как найти адрес своего сайта?</string>
     <string name="login_site_address">Адрес сайта</string>
     <string name="enter_site_address">Введите адрес сайта WordPress, к которому требуется подключиться.</string>
     <string name="login_already_logged_in_wpcom">Вы уже вошли на WordPress.com</string>
@@ -1637,7 +1965,6 @@ Language: ru
     <string name="login_text_otp">Пришлите мне сообщение с кодом.</string>
     <string name="enter_verification_code">Почти готово! Введите проверочный код из приложения Authenticator.</string>
     <string name="next">Вперед</string>
-    <string name="open_mail">Открыть почту</string>
     <string name="enter_email_wordpress_com">Для управления всеми своими сайтами WordPress войдите в систему WordPress.com с помощью адреса электронной почты.</string>
     <string name="image_optimization_promo_desc">Средство оптимизации изображений сжимает их для ускорения загрузки.\n\nВы в любой момент можете изменить это в настройках сайта.</string>
     <string name="image_optimization_promo_title">Включить оптимизацию изображений?</string>
@@ -1655,20 +1982,16 @@ Language: ru
     <string name="editor_dropped_text_error">При перетаскивании текста произошла ошибка.</string>
     <string name="editor_dropped_html_images_not_allowed">Перетаскивание изображений в режиме HTML не разрешено.</string>
     <string name="editor_content_hint">Поделитесь своей историей здесь…</string>
-    <string name="post_status_draft">Черновик</string>
     <string name="post_status_post_private">Личная</string>
+    <string name="post_status_draft">Черновик</string>
     <string name="post_status_pending_review">Ожидает проверки</string>
     <string name="post_status_publish_post">Опубликовать</string>
-    <string name="change_location">Изменить местоположение</string>
-    <string name="remove_location">Удалить местоположение</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Невозможно открыть средство выбора расположений: службы Google Play недоступны.</string>
     <string name="now">Сейчас</string>
-    <string name="post_settings_location">Местоположение</string>
     <string name="post_settings_password_dialog_hint">Без этого пароля невозможно просмотреть запись.</string>
     <string name="post_settings_excerpt_dialog_hint">Цитата — это краткое содержание записи, составляемое по желанию.</string>
     <string name="post_settings_slug_dialog_hint">Слаг — это усечённая версия названия записи для включения в URL-адрес.</string>
-    <string name="post_settings_tags">Метки</string>
     <string name="post_settings_post_format">Формат записи</string>
+    <string name="post_settings_tags">Метки</string>
     <string name="post_settings_slug">Слаг</string>
     <string name="post_settings_excerpt">Цитата</string>
     <string name="post_settings_not_set">Не заданы</string>
@@ -1730,9 +2053,9 @@ Language: ru
     <string name="icon_only_display">Только значок</string>
     <string name="icon_and_text_display">Значок и текст</string>
     <string name="connection_chooser_message">Выберите учётную запись для авторизации. Обратите внимание, что ваши записи автоматически станут доступны для выбранной учётной записи.</string>
+    <string name="connecting_social_network">Подключение %s</string>
     <string name="dlg_confirm_publicize_disconnect">Отключиться от %s?</string>
     <string name="share_btn_connect_another_account">Подключить еще одну учётную запись</string>
-    <string name="connecting_social_network">Подключение %s</string>
     <string name="share_btn_reconnect">Подключить снова</string>
     <string name="share_btn_disconnect">Отключить</string>
     <string name="share_btn_connect">Подключиться</string>
@@ -1747,7 +2070,7 @@ Language: ru
     <string name="tabbar_accessibility_label_my_site">Мой сайт. Просмотр сайта и управление параметрами, включая статистику.</string>
     <string name="my_site_btn_sharing">Поделиться</string>
     <string name="button_not_now">Не сейчас</string>
-    <string name="media_error_internal_server_error">Ошибка загрузки. Попробуйте включить функцию «Оптимизировать изображения» в разделе «Сайт -> Настройки»</string>
+    <string name="media_error_internal_server_error">Ошибка загрузки. Попробуйте включить функцию «Оптимизировать изображения» в разделе «Сайт -&gt; Настройки»</string>
     <string name="media_downloading">Сохранение медиафайлов на этом устройстве</string>
     <string name="error_media_save">Невозможно сохранить медиафайл</string>
     <string name="editor_draft_saved_locally">Черновик сохранён на устройство</string>
@@ -1792,11 +2115,11 @@ Language: ru
     <string name="media_encoder_quality_85">Среднее</string>
     <string name="media_encoder_quality_80">Низкое</string>
     <string name="media_upload_state_uploaded">Загружено</string>
+    <string name="media_upload_state_failed">Загрузка не удалась</string>
     <string name="media_upload_state_deleted">Удалено</string>
     <string name="media_upload_state_deleting">Удаление</string>
     <string name="media_upload_state_uploading">Идет загрузка</string>
     <string name="media_upload_state_queued">В очереди</string>
-    <string name="media_upload_state_failed">Загрузка не удалась</string>
     <string name="image_quality">Качество изображений</string>
     <string name="error_all_media_upload_canceled">Все процессы загрузки медиафайлов были прерваны из-за неизвестной ошибки. Попробуйте начать загрузку заново</string>
     <string name="error_unknown_post_type">Неизвестный формат записи</string>
@@ -1807,8 +2130,8 @@ Language: ru
     <string name="error_media_load">Не удается загрузить медиафайлы</string>
     <string name="error_media_refresh_no_connection">Для обновления библиотеки требуется подключение</string>
     <string name="error_media_unauthorized">У вас нет прав на просмотр или редактирование медиасодержимого</string>
-    <string name="error_media_insufficient_fs_permissions">Для просмотра медиафайла необходимы соответствующие права</string>
     <string name="error_media_not_found">Медиасодержимое не найдено</string>
+    <string name="error_media_insufficient_fs_permissions">Для просмотра медиафайла необходимы соответствующие права</string>
     <string name="site_settings_optimize_images">Оптимизировать изображения</string>
     <string name="media_generic_error">Проблема с медиафайлом</string>
     <string name="media_upload_error">Ошибка при загрузке медиафайла на сайт</string>
@@ -1842,11 +2165,11 @@ Language: ru
     <string name="comment_q_action_liking">Размещение отметки «Нравится»…</string>
     <string name="comment_q_action_processing">Обработка…</string>
     <string name="comment_q_action_done_generic">Готово!</string>
-    <string name="signout">Выйти</string>
     <string name="comment_liked">Комментарий отмечен как понравившийся</string>
+    <string name="signout">Выйти</string>
     <string name="sign_in_wpcom">Войдите на WordPress.com</string>
     <string name="reader_label_global_related_posts">Подробнее на WordPress.com</string>
-    <string name="reader_label_local_related_posts">Подробнее на %s</string>
+    <string name="reader_label_local_related_posts">Ещё больше с %s</string>
     <string name="preference_open_device_settings">Открыть настройки устройства</string>
     <string name="invite_invalid_email">%s: неверный адрес электронной почты</string>
     <string name="invite_user_blocked_invites">%s: приглашения, заблокированные пользователем</string>
@@ -1856,69 +2179,65 @@ Language: ru
     <string name="comment_moderated_approved">Комментарий одобрен!</string>
     <string name="like">Нравится</string>
     <string name="timespan_now">сейчас</string>
-    <string name="role_follower">Читатель</string>
     <string name="role_viewer">Обозреватель</string>
+    <string name="role_follower">Читатель</string>
     <string name="error_post_my_profile_no_connection">Нет сети — не удалось сохранить профиль.</string>
-    <string name="alignment_none">Нет</string>
-    <string name="alignment_left">Слева</string>
     <string name="alignment_right">Справа</string>
+    <string name="alignment_left">Слева</string>
+    <string name="alignment_none">Нет</string>
     <string name="site_settings_list_editor_action_mode_title">Выбрано %1$d</string>
     <string name="error_fetch_users_list">Не удалось получить список пользователей сайта</string>
-    <string name="people_fetching">Получение списка пользователей…</string>
-    <string name="title_follower">Читатель</string>
     <string name="title_email_follower">Подписчик по электронной почте</string>
-    <string name="people_dropdown_item_email_followers">Подписчики по электронной почте</string>
+    <string name="title_follower">Читатель</string>
+    <string name="people_fetching">Получение списка пользователей…</string>
     <string name="people_dropdown_item_viewers">Обозреватели</string>
+    <string name="people_dropdown_item_email_followers">Подписчики по электронной почте</string>
     <string name="people_dropdown_item_followers">Подписчики</string>
     <string name="people_dropdown_item_team">Команда</string>
     <string name="invite_message_usernames_limit">Вы можете пригласить до 10 пользователей с уникальными адресами эл. почты или учётными данными WordPress.com. Незарегистрированным пользователям будут отправлены инструкции по созданию учётной записи.</string>
     <string name="viewer_remove_confirmation_message">Если удалить этого обозревателя, он больше не сможет зайти на ваш сайт.\n\nВсё равно удалить этого обозревателя?</string>
     <string name="follower_remove_confirmation_message">Если удалить этого читателя, он больше не будет получать уведомления об изменениях на этом сайте, пока не восстановит подписку.\n\nВсё равно удалить этого читателя?</string>
     <string name="follower_subscribed_since">С %1$s</string>
-    <string name="error_remove_follower">Не удалось удалить читателя</string>
     <string name="error_remove_viewer">Не удалось удалить обозревателя</string>
+    <string name="error_remove_follower">Не удалось удалить читателя</string>
     <string name="error_fetch_email_followers_list">Не удалось получить список подписчиков по электронной почте</string>
     <string name="error_fetch_followers_list">Не удалось получить список читателей сайта</string>
     <string name="editor_failed_uploads_switch_html">Некоторые загрузки завершились с ошибкой. В этом состоянии нельзя\nпереключиться в режим HTML. Удалить неудачные загрузки и продолжить?</string>
-    <string name="image_settings_save_toast">Изменения сохранены</string>
-    <string name="image_caption">Подпись</string>
-    <string name="image_link_to">Ссылка</string>
     <string name="image_width">Ширина</string>
+    <string name="image_link_to">Ссылка</string>
+    <string name="image_caption">Подпись</string>
+    <string name="image_settings_save_toast">Изменения сохранены</string>
     <string name="image_settings_dismiss_dialog_title">Отменить несохранённые изменения?</string>
     <string name="stop_upload_dialog_title">Остановить загрузку?</string>
-    <string name="invite_error_some_failed">Приглашение отправлено, но возникли ошибки!</string>
-    <string name="invite_sent">Приглашение успешно отправлено</string>
     <string name="tap_to_try_again">Тапните, чтобы попробовать ещё раз!</string>
+    <string name="invite_sent">Приглашение успешно отправлено</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="invite_error_some_failed">Приглашение отправлено, но возникли ошибки!</string>
     <string name="invite_error_sending">При отправке приглашения произошла ошибка!</string>
     <string name="invite_error_invalid_usernames_multiple">Не удалось отправить: Несколько имён пользователей или адресов e-mail некорректны</string>
     <string name="invite_error_invalid_usernames_one">Не удалось отправить: Некорректное имя пользователя или адрес e-mail</string>
     <string name="invite_error_no_usernames">Пожалуйста, добавьте хотя бы одно имя пользователя</string>
-    <string name="invite_message_info">(Дополнительно) Можно ввести произвольное сообщение длиной до 500 символов, которое будет включено в приглашение.</string>
-    <string name="invite_message_remaining_other">символов осталось: %d</string>
-    <string name="invite_message_remaining_one">символов осталось: 1</string>
-    <string name="invite_message_remaining_zero">символов осталось: 0</string>
     <string name="invite_message_title">Произвольное сообщение</string>
     <string name="invite">Пригласить</string>
     <string name="invite_names_title">Имена пользователей или адреса e-mail</string>
-    <string name="send_link">Отправить ссылку</string>
     <string name="invite_people">Пригласить людей</string>
     <string name="my_site_header_external">Внешние ссылки</string>
     <string name="label_clear_search_history">Очистить историю поиска</string>
     <string name="dlg_confirm_clear_search_history">Очистить историю поиска?</string>
     <string name="reader_empty_search_description">По запросу «%s» на вашем языке записей не найдено</string>
     <string name="reader_hint_post_search">Поиск в WordPress</string>
+    <string name="reader_title_related_post_detail">Похожая запись</string>
     <string name="preview_screen_links_disabled">На экране предпросмотра ссылки отключены</string>
     <string name="send">Отправить</string>
-    <string name="user_remove_confirmation_message">Если вы удалите пользователя %1$s, он больше не сможет посещать этот сайт, но всё содержимое, созданное пользователем %1$s, останется на сайте.\n\nВсё равно удалить этого пользователя?</string>
     <string name="person_removed">Выполнено удаление %1$s</string>
+    <string name="user_remove_confirmation_message">Если вы удалите пользователя %1$s, он больше не сможет посещать этот сайт, но всё содержимое, созданное пользователем %1$s, останется на сайте.\n\nВсё равно удалить этого пользователя?</string>
     <string name="person_remove_confirmation_title">Удалить %1$s</string>
-    <string name="reader_empty_posts_in_custom_list">На сайтах из этого списка за последнее время не было ничего опубликовано</string>
-    <string name="people">Люди</string>
     <string name="role">Роль</string>
+    <string name="people">Люди</string>
+    <string name="reader_empty_posts_in_custom_list">На сайтах из этого списка за последнее время не было ничего опубликовано</string>
     <string name="error_remove_user">Не удалось удалить пользователя</string>
-    <string name="error_fetch_viewers_list">Не получить список пользователей сайта</string>
     <string name="error_update_role">Не удалось обновить роль пользователя</string>
+    <string name="error_fetch_viewers_list">Не получить список пользователей сайта</string>
     <string name="error_updating_gravatar">При обновлении граватара произошла ошибка</string>
     <string name="error_refreshing_gravatar">При перезагрузке граватара произошла ошибка</string>
     <string name="error_locating_image">Не удалось найти обрезанное изображение</string>
@@ -1926,18 +2245,17 @@ Language: ru
     <string name="checking_email">Проверка адреса эл. почты</string>
     <string name="magic_link_unavailable_error_message">В настоящий момент ссылка недоступна. Введите пароль</string>
     <string name="logging_in">Вход в систему</string>
-    <string name="enter_your_password_instead">Введите пароль.</string>
     <string name="web_address_dialog_hint">Отображается для всех пользователей, когда вы добавляете комментарии.</string>
     <string name="capture_or_pick_photo">Сделайте снимок или выберите фото</string>
-    <string name="export_your_content_message">Ваши записи, страницы и настройки будут отправлены вам по электронной почте %s.</string>
-    <string name="plan">Тарифный план</string>
     <string name="plans">Тарифные планы</string>
+    <string name="plan">Тарифный план</string>
+    <string name="export_your_content_message">Ваши записи, страницы и настройки будут отправлены вам по электронной почте %s.</string>
     <string name="export_your_content">Экспортируйте ваше содержимое</string>
-    <string name="exporting_content_progress">Выполняется экспорт содержимого…</string>
     <string name="export_email_sent">Сообщение об экспорте отправлено.</string>
-    <string name="premium_upgrades_message">На вашем сайте есть активированные платные услуги. Прежде чем удалить свой сайт, отключите платные услуги.</string>
-    <string name="show_purchases">Показать покупки</string>
+    <string name="exporting_content_progress">Выполняется экспорт содержимого…</string>
     <string name="checking_purchases">Просмотр покупок</string>
+    <string name="show_purchases">Показать покупки</string>
+    <string name="premium_upgrades_message">На вашем сайте есть активированные платные услуги. Прежде чем удалить свой сайт, отключите платные услуги.</string>
     <string name="premium_upgrades_title">Платные услуги</string>
     <string name="purchases_request_error">Произошла ошибка. Не удалось отправить запрос на покупки.</string>
     <string name="delete_site_progress">Удаление сайта…</string>
@@ -1946,49 +2264,49 @@ Language: ru
     <string name="primary_domain">Основной домен</string>
     <string name="error_deleting_site_summary">При удалении сайта произошла ошибка. Обратитесь в службу поддержки.</string>
     <string name="error_deleting_site">Ошибка при удалении сайта</string>
-    <string name="confirm_delete_site_prompt">Для подтверждения введите %1$s в поле ниже. Ваш сайт будет безвозвратно удален.</string>
     <string name="site_settings_export_content_title">Экспортировать содержимое</string>
-    <string name="contact_support">Обратиться в службу поддержки</string>
+    <string name="confirm_delete_site_prompt">Для подтверждения введите %1$s в поле ниже. Ваш сайт будет безвозвратно удален.</string>
     <string name="confirm_delete_site">Подтвердить удаление сайта</string>
+    <string name="contact_support">Обратиться в службу поддержки</string>
     <string name="start_over_text">Если вы хотите сохранить сайт, но при этом удалить с него все записи, страницы, медиафайлы и комментарии, обратитесь в службу поддержки.\n\nВ этом случае вы сохраните свой сайт и URL-адрес и сможете заново создавать содержимое. Свяжитесь с нами, чтобы мы удалили все содержимое сайта.</string>
-    <string name="site_settings_start_over_hint">Запустите свой сайт заново</string>
     <string name="let_us_help">Обратитесь к нам за помощью</string>
+    <string name="site_settings_start_over_hint">Запустите свой сайт заново</string>
     <string name="start_over">Начать сначала</string>
     <string name="me_btn_app_settings">Настройки приложения</string>
     <string name="editor_remove_failed_uploads">Удалить невыполненные загрузки</string>
-    <string name="comments_empty_list_filtered_trashed">Нет комментариев в корзине</string>
     <string name="site_settings_advanced_header">Дополнительно</string>
+    <string name="comments_empty_list_filtered_trashed">Нет комментариев в корзине</string>
     <string name="comments_empty_list_filtered_pending">Нет комментариев на утверждении</string>
     <string name="comments_empty_list_filtered_approved">Нет одобренных комментариев</string>
     <string name="xmlrpc_missing_method_error">Не удалось подключиться. На сервере отсутствуют необходимые методы XML-RPC.</string>
-    <string name="post_format_status">Статус</string>
-    <string name="post_format_video">Видео</string>
     <string name="alignment_center">По центру</string>
-    <string name="post_format_chat">Чат</string>
-    <string name="post_format_gallery">Галерея</string>
-    <string name="post_format_image">Изображение</string>
-    <string name="post_format_link">Ссылка</string>
-    <string name="post_format_quote">Цитата</string>
+    <string name="post_format_video">Видео</string>
+    <string name="post_format_status">Статус</string>
     <string name="post_format_standard">Стандартный</string>
-    <string name="notif_events">Информация об учебных курсах и мероприятиях WordPress.com (очных и онлайн).</string>
-    <string name="post_format_aside">Заметка</string>
+    <string name="post_format_quote">Цитата</string>
+    <string name="post_format_link">Ссылка</string>
+    <string name="post_format_image">Изображение</string>
+    <string name="post_format_gallery">Галерея</string>
+    <string name="post_format_chat">Чат</string>
     <string name="post_format_audio">Аудио</string>
+    <string name="post_format_aside">Заметка</string>
+    <string name="notif_events">Информация об учебных курсах и мероприятиях WordPress.com (очных и онлайн).</string>
     <string name="notif_surveys">Возможности участия в исследованиях и опросах WordPress.com.</string>
     <string name="notif_tips">Советы по эффективному использованию WordPress.com.</string>
     <string name="notif_community">Сообщество</string>
-    <string name="replies_to_my_comments">Ответы на мои комментарии</string>
-    <string name="notif_suggestions">Предложения</string>
     <string name="notif_research">Исследования</string>
-    <string name="site_achievements">Достижения сайта</string>
+    <string name="notif_suggestions">Предложения</string>
+    <string name="replies_to_my_comments">Ответы на мои комментарии</string>
     <string name="username_mentions">Упоминания имени пользователя</string>
-    <string name="likes_on_my_posts">Отметки «Нравится» к моим записям</string>
+    <string name="site_achievements">Достижения сайта</string>
     <string name="site_follows">Читатели сайта</string>
+    <string name="likes_on_my_posts">Отметки «Нравится» к моим записям</string>
     <string name="likes_on_my_comments">Отметки «Нравится» к моим комментариям</string>
     <string name="comments_on_my_site">Комментарии на моём сайте</string>
     <string name="site_settings_list_editor_summary_other">Всего элементов: %d</string>
     <string name="site_settings_list_editor_summary_one">1 элемент</string>
-    <string name="approve_auto_if_previously_approved">Комментарии известных пользователей</string>
     <string name="approve_auto">Все пользователи</string>
+    <string name="approve_auto_if_previously_approved">Комментарии известных пользователей</string>
     <string name="approve_manual">Нет комментариев</string>
     <string name="site_settings_paging_summary_other">Количество комментариев на страницу: %d</string>
     <string name="site_settings_paging_summary_one">1 комментарий на страницу</string>
@@ -1998,11 +2316,11 @@ Language: ru
     <string name="detail_approve_auto">Автоматически одобрять все комментарии.</string>
     <string name="detail_approve_auto_if_previously_approved">Автоматически одобрять комментарии пользователя, оставившего ранее одобренные комментарии</string>
     <string name="detail_approve_manual">Включить обязательный этап одобрения для всех комментариев.</string>
-    <string name="days_quantity_one">1 день</string>
     <string name="days_quantity_other">%d дн.</string>
-    <string name="pending_email_change_snackbar">Нажмите на ссылку в электронном письме, отправленном на %1$s, чтобы подтвердить новый адрес</string>
-    <string name="primary_site">Основной сайт</string>
+    <string name="days_quantity_one">1 день</string>
     <string name="web_address">Интернет-адрес</string>
+    <string name="primary_site">Основной сайт</string>
+    <string name="pending_email_change_snackbar">Нажмите на ссылку в электронном письме, отправленном на %1$s, чтобы подтвердить новый адрес</string>
     <string name="editor_toast_uploading_please_wait">В данный момент выполняется загрузка медиафайлов. Дождитесь окончания загрузки.</string>
     <string name="error_refresh_comments_showing_older">Не удалось обновить ленту комментариев — отображены старые комментарии</string>
     <string name="post_settings_set_featured_image">Настроить изображение записи</string>
@@ -2011,13 +2329,13 @@ Language: ru
     <string name="dlg_sure_to_delete_comments">Удалить эти комментарии без возможности восстановления?</string>
     <string name="dlg_sure_to_delete_comment">Удалить этот комментарий без возможности восстановления?</string>
     <string name="mnu_comment_delete_permanently">Удалить</string>
-    <string name="comment_deleted_permanently">Комментарий удалён</string>
     <string name="mnu_comment_untrash">Восстановить</string>
+    <string name="comment_deleted_permanently">Комментарий удалён</string>
     <string name="comments_empty_list_filtered_spam">Нет комментариев, помеченных как спам</string>
-    <string name="could_not_load_page">Не удалось загрузить страницу</string>
     <string name="comment_status_all">Все</string>
-    <string name="interface_language">Язык интерфейса</string>
+    <string name="could_not_load_page">Не удалось загрузить страницу</string>
     <string name="off">Выкл.</string>
+    <string name="interface_language">Язык интерфейса</string>
     <string name="about_the_app">О приложении</string>
     <string name="error_post_account_settings">Не удалось сохранить настройки учётной записи.</string>
     <string name="error_fetch_account_settings">Не удалось загрузить настройки учетной записи.</string>
@@ -2025,20 +2343,20 @@ Language: ru
     <string name="site_settings_unknown_language_code_error">Код языка не распознан.</string>
     <string name="site_settings_threading_dialog_description">Разрешить вложение комментариев в ветках.</string>
     <string name="site_settings_threading_dialog_header">Ветки до</string>
-    <string name="remove">Удалить</string>
-    <string name="search">Поиск</string>
     <string name="disabled">Отключено</string>
+    <string name="search">Поиск</string>
+    <string name="remove">Удалить</string>
     <string name="site_settings_image_original_size">Исходный размер</string>
     <string name="privacy_private">Ваш сайт доступен только вам и выбранным вами пользователям.</string>
     <string name="privacy_public_not_indexed">Ваш сайт доступен всем посетителям, но для него выбран параметр «Попросить поисковые системы не индексировать сайт».</string>
     <string name="privacy_public">Ваш сайт доступен всем и может индексироваться поисковыми системами.</string>
     <string name="about_me_hint">Несколько слов о себе…</string>
-    <string name="public_display_name_hint">Если отображаемое имя не задано, вместо него по умолчанию используется имя пользователя.</string>
     <string name="about_me">Обо мне</string>
+    <string name="public_display_name_hint">Если отображаемое имя не задано, вместо него по умолчанию используется имя пользователя.</string>
     <string name="public_display_name">Отображаемое для всех имя</string>
-    <string name="my_profile">Мой профиль</string>
-    <string name="first_name">Имя</string>
     <string name="last_name">Фамилия</string>
+    <string name="first_name">Имя</string>
+    <string name="my_profile">Мой профиль</string>
     <string name="cd_related_post_preview_image">Изображение для предварительного просмотра похожих записей</string>
     <string name="error_post_remote_site_settings">Не удалось сохранить данные сайта.</string>
     <string name="error_fetch_remote_site_settings">Не удалось получить данные сайта.</string>
@@ -2047,7 +2365,7 @@ Language: ru
     <string name="site_settings_paging_dialog_description">Выделять ветки комментариев на отдельные страницы.</string>
     <string name="site_settings_paging_dialog_header">Комментариев на странице:</string>
     <string name="site_settings_close_after_dialog_title">Закрыть обсуждение</string>
-    <string name="site_settings_blacklist_description">Комментарии, содержащие любые из этих слов в тексте, имени автора, URL-адресе, адресе электронной почты или IP-адресе, будут помечены как спам. Можно вводить фрагменты слов, то есть по слову press будет найдено WordPress.</string>
+    <string name="site_settings_denylist_description">Комментарии, содержащие любые из этих слов в тексте, имени автора, URL-адресе, адресе электронной почты или IP-адресе, будут помечены как спам. Можно вводить фрагменты слов, то есть по слову press будет найдено WordPress.</string>
     <string name="site_settings_hold_for_moderation_description">Комментарии, содержащие любые из этих слов в тексте, имени автора, URL-адресе, адресе электронной почты или IP-адресе, будут помещены в очередь на модерацию. Можно вводить фрагменты слов, то есть по слову press будет найдено WordPress.</string>
     <string name="site_settings_list_editor_input_hint">Введите слово или фразу</string>
     <string name="site_settings_list_editor_no_items_text">Нет элементов</string>
@@ -2062,10 +2380,10 @@ Language: ru
     <string name="site_settings_rp_show_header_title">Показывать заголовок</string>
     <string name="site_settings_rp_switch_summary">В разделе «Похожие записи» под вашими записями отображается соответствующее содержимое с вашего сайта.</string>
     <string name="site_settings_rp_switch_title">Показывать похожие записи</string>
-    <string name="site_settings_blacklist_hint">Комментарии, соответствующие фильтру, будут помечены как спам.</string>
+    <string name="site_settings_denylist_hint">Комментарии, соответствующие фильтру, будут помечены как спам.</string>
     <string name="site_settings_moderation_hold_hint">Комментарии, соответствующие фильтру, будут помещены в очередь на модерацию.</string>
     <string name="site_settings_multiple_links_hint">Удаление ограничения по числу ссылок, размещаемых известными пользователями</string>
-    <string name="site_settings_whitelist_hint">Автор комментария должен иметь ранее одобренные комментарии.</string>
+    <string name="site_settings_allowlist_hint">Автор комментария должен иметь ранее одобренные комментарии.</string>
     <string name="site_settings_user_account_required_hint">Чтобы оставить комментарий, пользователь должен быть зарегистрирован и авторизован.</string>
     <string name="site_settings_identity_required_hint">Автор комментария должен указать имя и эл. адрес.</string>
     <string name="site_settings_paging_hint">Показ комментариев блоками определенного размера</string>
@@ -2088,19 +2406,18 @@ Language: ru
     <string name="site_settings_address_hint">Изменение адреса пока не поддерживается.</string>
     <string name="site_settings_tagline_hint"> или удачная фраза, характеризующая ваш блог</string>
     <string name="site_settings_title_hint">Объясните в нескольких словах, о чем этот блог.</string>
-    <string name="site_settings_whitelist_known_summary">Комментарии известных пользователей</string>
-    <string name="site_settings_whitelist_all_summary">Все комментарии</string>
+    <string name="site_settings_allowlist_known_summary">Комментарии известных пользователей</string>
+    <string name="site_settings_allowlist_all_summary">Комментарии всех пользователей</string>
     <string name="site_settings_threading_summary">%d уров.</string>
     <string name="site_settings_privacy_private_summary">Скрытая</string>
     <string name="site_settings_privacy_hidden_summary">Скрыто</string>
-    <string name="site_settings_delete_site_title">Удалить сайт</string>
     <string name="site_settings_privacy_public_summary">Открытая</string>
-    <string name="site_settings_blacklist_title">Черный список</string>
+    <string name="site_settings_delete_site_title">Удалить сайт</string>
     <string name="site_settings_moderation_hold_title">Отправить на модерацию</string>
     <string name="site_settings_multiple_links_title">Ссылки в комментариях</string>
-    <string name="site_settings_whitelist_title">Одобрять автоматически</string>
-    <string name="site_settings_threading_title">Ветвление</string>
+    <string name="site_settings_allowlist_title">Одобрять автоматически</string>
     <string name="site_settings_paging_title">Разбиение на страницы</string>
+    <string name="site_settings_threading_title">Ветвление</string>
     <string name="site_settings_sort_by_title">Приоритет сортировки</string>
     <string name="site_settings_account_required_title">Только от зарегестрированых пользователей</string>
     <string name="site_settings_identity_required_title">Необходимо указывать имя и эл. адрес</string>
@@ -2110,22 +2427,22 @@ Language: ru
     <string name="site_settings_default_format_title">Формат записей по умолчанию</string>
     <string name="site_settings_default_category_title">Рубрика по умолчанию</string>
     <string name="site_settings_address_title">Адрес</string>
-    <string name="site_settings_title_title">Название сайта</string>
     <string name="site_settings_tagline_title">Краткое описание</string>
+    <string name="site_settings_title_title">Название сайта</string>
     <string name="site_settings_discussion_new_posts_header">Параметры по умолчанию для новых записей</string>
-    <string name="site_settings_account_header">Учетная запись</string>
     <string name="site_settings_writing_header">Написание</string>
-    <string name="newest_first">Сначала новые</string>
+    <string name="site_settings_account_header">Учетная запись</string>
     <string name="site_settings_general_header">Общие</string>
-    <string name="discussion">Обсуждение</string>
-    <string name="privacy">Политика конфиденциальности</string>
-    <string name="related_posts">Похожие записи</string>
-    <string name="comments">Комментарии</string>
-    <string name="close_after">Закрыть обсуждение через</string>
+    <string name="newest_first">Сначала новые</string>
     <string name="oldest_first">Сначала старые</string>
+    <string name="close_after">Закрыть обсуждение через</string>
+    <string name="comments">Комментарии</string>
+    <string name="related_posts">Похожие записи</string>
+    <string name="privacy">Политика конфиденциальности</string>
+    <string name="discussion">Обсуждение</string>
     <string name="media_error_no_permission_upload">У вас нет разрешения на загрузку файлов на этот сайт</string>
-    <string name="never">Никогда</string>
     <string name="unknown">Неизвестно</string>
+    <string name="never">Никогда</string>
     <string name="reader_err_get_post_not_found">Эта запись больше не существует</string>
     <string name="reader_err_get_post_not_authorized">У вас нет прав на просмотр этой записи</string>
     <string name="reader_err_get_post_generic">Не удается загрузить эту запись</string>
@@ -2137,22 +2454,22 @@ Language: ru
     <string name="theme_activation_error">Произошла ошибка. Не удалось активировать тему</string>
     <string name="theme_by_author_prompt_append"> Автор: %1$s</string>
     <string name="theme_prompt">Благодарим вас за выбор %1$s</string>
-    <string name="theme_try_and_customize">Попробовать и настроить</string>
-    <string name="theme_view">Просмотр</string>
-    <string name="theme_details">Подробнее</string>
-    <string name="theme_support">Поддержка</string>
-    <string name="theme_done">ГОТОВО</string>
     <string name="theme_manage_site">УПРАВЛЕНИЕ САЙТОМ</string>
+    <string name="theme_done">ГОТОВО</string>
+    <string name="theme_support">Поддержка</string>
+    <string name="theme_details">Подробнее</string>
+    <string name="theme_view">Просмотр</string>
+    <string name="theme_try_and_customize">Попробовать и настроить</string>
     <string name="theme_activate">Активировать</string>
-    <string name="current_theme">Текущая тема</string>
-    <string name="customize">Настроить</string>
-    <string name="details">Подробнее</string>
-    <string name="support">Поддержка</string>
     <string name="active">Активно</string>
-    <string name="post_published">Запись опубликована</string>
-    <string name="page_published">Страница опубликована</string>
-    <string name="post_updated">Запись обновлена</string>
+    <string name="support">Поддержка</string>
+    <string name="details">Подробнее</string>
+    <string name="customize">Настроить</string>
+    <string name="current_theme">Текущая тема</string>
     <string name="page_updated">Страница обновлена</string>
+    <string name="post_updated">Запись обновлена</string>
+    <string name="page_published">Страница опубликована</string>
+    <string name="post_published">Запись опубликована</string>
     <string name="theme_no_search_result_found">К сожалению, тем не найдено.</string>
     <string name="reader_label_gap_marker">Загрузить другие записи</string>
     <string name="notifications_no_search_results">Сайтов по запросу «%s» не найдено</string>
@@ -2173,8 +2490,8 @@ Language: ru
     <string name="reader_discover_attribution_author_and_blog">Изначально опубликовано автором %1$s на сайте %2$s</string>
     <string name="reader_short_like_count_multi">%s оценок</string>
     <string name="reader_short_like_count_one">1 оценка</string>
-    <string name="reader_label_follow_count">%,d подписчиков</string>
     <string name="reader_short_like_count_none">Оценить</string>
+    <string name="reader_label_follow_count">%,d подписчиков</string>
     <string name="reader_menu_tags">Редактировать темы и сайты</string>
     <string name="reader_title_post_detail">Запись из Чтива</string>
     <string name="notifications_push_summary">Настройки уведомлений, отображаемых на вашем устройстве.</string>
@@ -2184,19 +2501,19 @@ Language: ru
     <string name="notification_types">Типы уведомлений</string>
     <string name="error_loading_notifications">Не удалось загрузить настройки уведомлений</string>
     <string name="comment_likes">Оценки комментариев</string>
+    <string name="app_notifications">Уведомления в приложении</string>
     <string name="email">E-mail</string>
     <string name="notifications_tab">Вкладка «Уведомления»</string>
-    <string name="app_notifications">Уведомления в приложении</string>
     <string name="notification_settings_item_other_account_emails_summary">Важные письма, касающиеся вашей учётной записи, мы отправляем всегда, но можно также включить и другие полезные уведомления.</string>
     <string name="stats_insights_latest_post_summary">Данные о последней записи</string>
     <string name="connectionbar_no_connection">Нет соединения</string>
     <string name="post_trashed">Запись помещена в корзину</string>
-    <string name="button_stats">Статистика</string>
     <string name="button_trash">Корзина</string>
+    <string name="button_stats">Статистика</string>
     <string name="button_preview">Просмотреть</string>
     <string name="button_view">Просмотреть</string>
-    <string name="button_edit">Изменить</string>
     <string name="button_publish">Опубликовать</string>
+    <string name="button_edit">Изменить</string>
     <string name="reader_toast_err_follow_blog_not_authorized">У вас нет разрешения на доступ к этому сайту.</string>
     <string name="reader_toast_err_follow_blog_not_found">Не удаётся найти этот сайт.</string>
     <string name="undo">Назад</string>
@@ -2209,249 +2526,247 @@ Language: ru
     <string name="me_disconnect_from_wordpress_com">Отключение от WordPress.com</string>
     <string name="me_connect_to_wordpress_com">Подключение к WordPress.com</string>
     <string name="me_btn_login_logout">Вход/выход</string>
-    <string name="account_settings">Настройки учётной записи</string>
     <string name="me_btn_support">Помощь и техническая поддержка</string>
+    <string name="account_settings">Настройки учётной записи</string>
     <string name="site_picker_cant_hide_current_site">\"%s\" не был скрыт, так как это текущий сайт.</string>
     <string name="site_picker_create_wpcom">Создать сайт на WordPress.com</string>
-    <string name="site_picker_add_site">Добавить веб-сайт</string>
     <string name="site_picker_add_self_hosted">Добавить автономный веб-сайт</string>
+    <string name="site_picker_add_site">Добавить веб-сайт</string>
     <string name="site_picker_edit_visibility">Показать/скрыть веб-сайты</string>
-    <string name="my_site_btn_view_site">Просмотреть веб-сайт</string>
     <string name="site_picker_title">Выбрать сайт</string>
-    <string name="my_site_btn_switch_site">Сменить сайт</string>
+    <string name="my_site_btn_view_site">Просмотреть веб-сайт</string>
     <string name="my_site_btn_view_admin">Перейти в консоль сайта</string>
-    <string name="my_site_btn_blog_posts">Записи в блоге</string>
+    <string name="my_site_btn_switch_site">Сменить сайт</string>
     <string name="my_site_btn_site_settings">Настройки</string>
-    <string name="my_site_header_look_and_feel">Внешний вид</string>
+    <string name="my_site_btn_blog_posts">Записи в блоге</string>
     <string name="my_site_header_publish">Публикация</string>
+    <string name="my_site_header_look_and_feel">Внешний вид</string>
     <string name="my_site_header_configuration">Конфигурация</string>
     <string name="reader_label_new_posts_subtitle">Нажмите, чтобы показать записи.</string>
     <string name="deselect_all">Снять выделение</string>
-    <string name="show">Показать</string>
-    <string name="hide">Скрыть</string>
     <string name="select_all">Выделить все</string>
-    <string name="language">Язык</string>
+    <string name="hide">Скрыть</string>
+    <string name="show">Показать</string>
     <string name="auth_required">Войдите заново для продолжения.</string>
-    <string name="verification_code">Код подтверждения</string>
     <string name="invalid_verification_code">Неверный код подтверждения</string>
+    <string name="verification_code">Код подтверждения</string>
+    <string name="language">Язык</string>
     <string name="reader_empty_posts_request_failed">Не удалось загрузить записи.</string>
     <string name="publisher">Автор:</string>
     <string name="error_notification_open">Не удалось открыть уведомление.</string>
     <string name="stats_search_terms_unknown_search_terms">Неизвестные поисковые запросы</string>
-    <string name="stats_view_authors">Авторы</string>
     <string name="stats_view_search_terms">Поисковые запросы</string>
+    <string name="stats_view_authors">Авторы</string>
     <string name="comments_fetching">Загрузка комментариев…</string>
     <string name="pages_fetching">Загрузка страниц…</string>
     <string name="posts_fetching">Загрузка записей…</string>
     <string name="media_fetching">Загрузка медиафайлов…</string>
-    <string name="post_uploading">Идет отправка на сервер.</string>
     <string name="logs_copied_to_clipboard">Журналы приложения скопированы в буфер обмена.</string>
+    <string name="reader_empty_posts_in_blog">Этот сайт пуст.</string>
     <string name="reader_label_new_posts">Новые записи</string>
     <string name="error_copy_to_clipboard">Произошла ошибка при копировании текста в буфер обмена.</string>
-    <string name="reader_page_recommended_blogs">Сайты, подобранные для вас</string>
-    <string name="reader_empty_posts_in_blog">Этот сайт пуст.</string>
-    <string name="themes_fetching">Получение тем…</string>
-    <string name="stats_followers_months">%1$d месяцев</string>
-    <string name="stats_followers_a_year">Год</string>
+    <string name="post_uploading">Идет отправка на сервер.</string>
     <string name="stats_followers_years">%1$d лет</string>
+    <string name="stats_followers_a_year">Год</string>
+    <string name="stats_followers_months">%1$d месяцев</string>
     <string name="stats_followers_a_month">Месяц</string>
-    <string name="stats_followers_minutes">%1$d минуты</string>
-    <string name="stats_followers_an_hour_ago">час назад</string>
-    <string name="stats_followers_hours">%1$d часов</string>
-    <string name="stats_followers_a_day">День</string>
     <string name="stats_followers_days">%1$d дней</string>
+    <string name="stats_followers_a_day">День</string>
+    <string name="stats_followers_hours">%1$d часов</string>
+    <string name="stats_followers_an_hour_ago">час назад</string>
+    <string name="stats_followers_minutes">%1$d минуты</string>
     <string name="stats_followers_a_minute_ago">минуту назад</string>
     <string name="stats_followers_seconds_ago">несколько секунд назад</string>
-    <string name="stats_view_top_posts_and_pages">Записи и страницы</string>
-    <string name="stats_view_videos">Видео</string>
-    <string name="stats_view_publicize">Публикация</string>
     <string name="stats_view_followers">Подписчики</string>
+    <string name="stats_view_publicize">Публикация</string>
+    <string name="stats_view_videos">Видео</string>
+    <string name="stats_view_top_posts_and_pages">Записи и страницы</string>
     <string name="stats_view_countries">Страны</string>
-    <string name="stats_timeframe_years">Годы</string>
-    <string name="stats_views">Просмотров</string>
-    <string name="stats_visitors">Посетителей</string>
     <string name="stats_likes">\"Нравится\"</string>
+    <string name="stats_visitors">Посетителей</string>
+    <string name="stats_views">Просмотров</string>
+    <string name="stats_timeframe_years">Годы</string>
+    <string name="themes_fetching">Получение тем…</string>
     <string name="ssl_certificate_details">Подробнее</string>
     <string name="cab_selected">Выбрано: %d</string>
     <string name="browse_our_faq_button">Поиск в списке часто задаваемых вопросов</string>
     <string name="reader_empty_comments">Пока нет комментариев</string>
-    <string name="reader_label_view_original">Просмотреть исходную публикацию</string>
+    <string name="reader_empty_posts_in_tag">Нет записей по этой теме</string>
     <string name="reader_label_like">Нравится</string>
+    <string name="reader_label_view_original">Просмотреть исходную публикацию</string>
+    <string name="reader_label_comments_closed">Комментарии закрыты</string>
     <string name="reader_title_photo_viewer">%1$d из %2$d</string>
     <string name="error_publish_empty_post">Нельзя опубликовать пустую запись.</string>
     <string name="error_refresh_unauthorized_posts">У вас нет прав на просмотр или редактирование записей.</string>
     <string name="error_refresh_unauthorized_pages">У вас нет прав на просмотр или редактирование страниц.</string>
     <string name="error_refresh_unauthorized_comments">У вас нет прав на просмотр или редактирование комментариев.</string>
-    <string name="older_month">Больше месяца назад</string>
     <string name="more">Больше</string>
-    <string name="older_two_days">Больше двух дней назад</string>
+    <string name="older_month">Больше месяца назад</string>
     <string name="older_last_week">Больше недели</string>
+    <string name="older_two_days">Больше двух дней назад</string>
     <string name="mnu_comment_liked">Понравилось</string>
     <string name="comment">Комментировать</string>
     <string name="comment_trashed">Комментарий перемещен в корзину</string>
-    <string name="posts_empty_list">Пока нет записей. Создайте первую!</string>
     <string name="comment_reply_to_user">Ответить автору %s</string>
+    <string name="posts_empty_list">Пока нет записей. Создайте первую!</string>
     <string name="signing_out">Выход из системы…</string>
-    <string name="reader_label_comments_closed">Комментарии закрыты</string>
-    <string name="reader_empty_posts_in_tag">Нет записей по этой теме</string>
     <string name="reader_toast_err_generic">Не удалось совершить это действие</string>
-    <string name="reader_menu_block_blog">Заблокировать этот сайт</string>
-    <string name="reader_toast_blog_blocked">Записи с этого сайта больше не будут отображаться</string>
     <string name="reader_toast_err_block_blog">Не удалось заблокировать этот сайт</string>
-    <string name="update_verb">Обновить</string>
-    <string name="schedule_verb">Запланировать</string>
-    <string name="reader_toast_err_unfollow_blog">Не удалось отписаться</string>
-    <string name="reader_page_followed_blogs">Отслеживаемые сайты</string>
-    <string name="reader_label_followed_blog">Вы подписаны на этот сайт</string>
+    <string name="reader_toast_blog_blocked">Записи с этого сайта больше не будут отображаться</string>
+    <string name="reader_menu_block_blog">Заблокировать этот сайт</string>
+    <string name="schedule_verb">Запланировать</string>
+    <string name="update_verb">Обновить</string>
     <string name="reader_empty_recommended_blogs">Нет рекомендованных сайтов</string>
+    <string name="reader_toast_err_unfollow_blog">Не удалось отписаться</string>
     <string name="reader_toast_err_follow_blog">Не удалось подписаться на этот сайт</string>
-    <string name="reader_toast_err_get_blog_info">Не удалось отобразить сайт</string>
-    <string name="reader_title_blog_preview">Сайт из Чтива</string>
     <string name="reader_toast_err_already_follow_blog">Вы уже подписаны на этот сайт</string>
-    <string name="reader_page_followed_tags">Подписанные темы</string>
+    <string name="reader_toast_err_get_blog_info">Не удалось отобразить сайт</string>
+    <string name="reader_label_followed_blog">Вы подписаны на этот сайт</string>
     <string name="reader_hint_add_tag_or_url">Введите URL или тему для подписки</string>
-    <string name="forgot_password">Забыли пароль?</string>
-    <string name="help">Помощь</string>
-    <string name="ssl_certificate_error">Недействительный сертификат SSL</string>
+    <string name="reader_page_followed_blogs">Отслеживаемые сайты</string>
+    <string name="reader_page_followed_tags">Подписанные темы</string>
+    <string name="reader_title_blog_preview">Сайт из Чтива</string>
     <string name="ssl_certificate_ask_trust">Если вы обычно заходите на этот сайт без проблем, эта ошибка может означать, что кто-то пытается подделать сайт и вам не стоит сюда заходить. Хотите ли вы доверять ssl сертификату?</string>
-    <string name="no_network_message">Нет доступной сети.</string>
-    <string name="blog_not_found">Ошибка при попытке подключиться к блогу</string>
-    <string name="mnu_comment_unspam">Нет спама</string>
-    <string name="gallery_error">Медиа-файл не может быть восстановлен</string>
-    <string name="error_refresh_posts">Пост не может быть обновлен в данный момент</string>
-    <string name="error_refresh_pages">Страница не может быть обновлена в данный момент</string>
-    <string name="error_refresh_comments">Комментарии не могут быть обновлены в данный момент</string>
-    <string name="error_generic">Произошла ошибка</string>
+    <string name="ssl_certificate_error">Недействительный сертификат SSL</string>
+    <string name="help">Помощь</string>
+    <string name="username_or_password_incorrect">Имя пользователя или пароль введены неверно</string>
+    <string name="email_invalid">Введите правильный email адрес</string>
+    <string name="invalid_email_message">Ваш адрес email не подходит</string>
+    <string name="error_downloading_image">Ошибка при загрузке картинки</string>
+    <string name="error_load_comment">Невозможно загрузить комментарии</string>
     <string name="error_edit_comment">Во время редактирования комментария произошла ошибка</string>
     <string name="error_moderate_comment">Во время модерации произошла ошибка</string>
-    <string name="error_load_comment">Невозможно загрузить комментарии</string>
-    <string name="error_downloading_image">Ошибка при загрузке картинки</string>
-    <string name="email_invalid">Введите правильный email адрес</string>
-    <string name="theme_fetch_failed">Ошибка выбора темы.</string>
+    <string name="error_generic">Произошла ошибка</string>
+    <string name="error_refresh_comments">Комментарии не могут быть обновлены в данный момент</string>
+    <string name="error_refresh_pages">Страница не может быть обновлена в данный момент</string>
+    <string name="error_refresh_posts">Пост не может быть обновлен в данный момент</string>
+    <string name="error_deleting_post">Произошла ошибка при удалении записи</string>
     <string name="notifications_empty_list">Нет уведомлений</string>
-    <string name="invalid_email_message">Ваш адрес email не подходит</string>
-    <string name="username_or_password_incorrect">Имя пользователя или пароль введены неверно</string>
     <string name="sdcard_message">Для загрузки медиа нужно подключить SD карту</string>
-    <string name="adding_cat_failed">Добавление категории не удалось</string>
-    <string name="adding_cat_success">Категория успешно добавлена</string>
     <string name="cat_name_required">Поле \"название категории\" является обязательным</string>
-    <string name="error_deleting_post">Произошла ошибка при удалении записи</string>
-    <string name="select_categories">Выберите категории</string>
-    <string name="connection_error">Ошибка соединения</string>
-    <string name="cancel_edit">Отменить изменения</string>
-    <string name="post_not_found">Произошла ошибка при загрузке поста. Обновите ваши записи и повторите попытку.</string>
-    <string name="learn_more">Узнать больше</string>
-    <string name="media_gallery_type_thumbnail_grid">Эскиз сетки</string>
-    <string name="media_error_no_permission">У вас нет прав для просмотра медиа-библиотеки</string>
-    <string name="cannot_delete_multi_media_items">Некоторые медиа-файлы не могут быть удалены сейчас. Попробуйте позже.</string>
-    <string name="link_enter_url_text">Текст ссылки(необязательно)</string>
-    <string name="page_settings">Настройки страницы</string>
-    <string name="comment_status_unapproved">На рассмотрении</string>
-    <string name="comment_status_spam">Спам</string>
-    <string name="comment_status_trash">Удалён</string>
-    <string name="edit_comment">Редактировать комментарий</string>
-    <string name="mnu_comment_spam">Спам</string>
-    <string name="mnu_comment_trash">Удалить</string>
-    <string name="comment_status_approved">Одобрен</string>
-    <string name="mnu_comment_approve">Одобрить</string>
-    <string name="mnu_comment_unapprove">Не одобрить</string>
-    <string name="dlg_approving_comments">Одобрить</string>
-    <string name="dlg_unapproving_comments">Не одобрить</string>
-    <string name="dlg_spamming_comments">Отметить как спам</string>
-    <string name="dlg_trashing_comments">Удалить</string>
-    <string name="dlg_confirm_trash_comments">Удалить?</string>
-    <string name="trash">Удалённые</string>
-    <string name="saving_changes">Сохранить изменения</string>
-    <string name="sure_to_cancel_edit_comment">Отменить редактирование комментария?</string>
-    <string name="toast_comment_unedited">Комментарий не изменялся</string>
-    <string name="view_in_browser">Открыть в браузере</string>
-    <string name="add_new_category">Добавить категорию</string>
-    <string name="category_name">Имя категории</string>
-    <string name="file_error_create">Не удалось создать временный файл для выгрузки медиа. Убедитесь, что имеется достаточно свободного места на вашем устройстве.</string>
-    <string name="new_post">Новая запись</string>
-    <string name="new_media">Новое медиа</string>
-    <string name="privacy_policy">Политика конфиденциальности</string>
-    <string name="image_settings">Настройки изображений</string>
-    <string name="wordpress_blog">Блог WordPress</string>
-    <string name="error_blog_hidden">Этот блог является скрытым и не может быть загружен. Откройте его через настройки и попробуйте снова.</string>
-    <string name="fatal_db_error">Произошла ошибка при создании базы данных приложения- попробуйте его переустановить.</string>
+    <string name="adding_cat_success">Категория успешно добавлена</string>
+    <string name="adding_cat_failed">Добавление категории не удалось</string>
+    <string name="mnu_comment_unspam">Нет спама</string>
+    <string name="theme_fetch_failed">Ошибка выбора темы.</string>
+    <string name="blog_not_found">Ошибка при попытке подключиться к блогу</string>
+    <string name="gallery_error">Медиа-файл не может быть восстановлен</string>
+    <string name="no_network_message">Нет доступной сети.</string>
+    <string name="reader_toast_err_remove_tag">Не удается удалить эту тему</string>
+    <string name="reader_toast_err_add_tag">Не удается подписаться на эту тему</string>
     <string name="reader_title_applog">Лог приложения</string>
-    <string name="local_draft">Локальные черновики</string>
-    <string name="open_source_licenses">Лицензия Open Source</string>
-    <string name="http_authorization_required">Требуется авторизация</string>
+    <string name="fatal_db_error">Произошла ошибка при создании базы данных приложения- попробуйте его переустановить.</string>
+    <string name="error_blog_hidden">Этот блог является скрытым и не может быть загружен. Откройте его через настройки и попробуйте снова.</string>
+    <string name="error_refresh_media">В данный момент не удалось обновить медиафайлы.</string>
+    <string name="wordpress_blog">Блог WordPress</string>
+    <string name="image_settings">Настройки изображений</string>
     <string name="local_changes">Локальные изменения</string>
-    <string name="content_required">Требуется комментарий</string>
-    <string name="post_settings">Настройки записи</string>
-    <string name="remove_account">Удалить сайт</string>
+    <string name="privacy_policy">Политика конфиденциальности</string>
+    <string name="new_media">Новое медиа</string>
+    <string name="new_post">Новая запись</string>
     <string name="notifications_empty_all">Уведомлений пока нет.</string>
+    <string name="http_authorization_required">Требуется авторизация</string>
     <string name="invalid_site_url_message">Убедитесь, что введен допустимый URL-адрес сайта</string>
-    <string name="error_refresh_media">В данный момент не удалось обновить медиафайлы.</string>
+    <string name="open_source_licenses">Лицензия Open Source</string>
+    <string name="file_error_create">Не удалось создать временный файл для выгрузки медиа. Убедитесь, что имеется достаточно свободного места на вашем устройстве.</string>
+    <string name="category_name">Имя категории</string>
+    <string name="add_new_category">Добавить категорию</string>
+    <string name="view_in_browser">Открыть в браузере</string>
+    <string name="remove_account">Удалить сайт</string>
+    <string name="toast_comment_unedited">Комментарий не изменялся</string>
+    <string name="content_required">Требуется комментарий</string>
+    <string name="sure_to_cancel_edit_comment">Отменить редактирование комментария?</string>
+    <string name="saving_changes">Сохранить изменения</string>
+    <string name="trash">Удалённые</string>
+    <string name="dlg_confirm_trash_comments">Удалить?</string>
+    <string name="dlg_trashing_comments">Удалить</string>
+    <string name="dlg_spamming_comments">Отметить как спам</string>
+    <string name="dlg_unapproving_comments">Не одобрить</string>
+    <string name="dlg_approving_comments">Одобрить</string>
+    <string name="mnu_comment_trash">Удалить</string>
+    <string name="mnu_comment_spam">Спам</string>
+    <string name="mnu_comment_unapprove">Не одобрить</string>
+    <string name="mnu_comment_approve">Одобрить</string>
+    <string name="edit_comment">Редактировать комментарий</string>
+    <string name="comment_status_trash">Удалён</string>
+    <string name="comment_status_spam">Спам</string>
+    <string name="comment_status_unapproved">На рассмотрении</string>
+    <string name="comment_status_approved">Одобрен</string>
+    <string name="delete_page">Удалить страницу?</string>
+    <string name="delete_post">Удалить запись?</string>
+    <string name="post_settings">Настройки записи</string>
     <string name="file_not_found">Не удалось найти файл для загрузки. Возможно он был удален или перемещен?</string>
+    <string name="local_draft">Локальные черновики</string>
+    <string name="page_settings">Настройки страницы</string>
+    <string name="link_enter_url_text">Текст ссылки(необязательно)</string>
+    <string name="cannot_delete_multi_media_items">Некоторые медиа-файлы не могут быть удалены сейчас. Попробуйте позже.</string>
+    <string name="media_error_no_permission">У вас нет прав для просмотра медиа-библиотеки</string>
+    <string name="media_gallery_type_thumbnail_grid">Эскиз сетки</string>
+    <string name="learn_more">Узнать больше</string>
+    <string name="post_not_found">Произошла ошибка при загрузке поста. Обновите ваши записи и повторите попытку.</string>
     <string name="plugin_not_found">Возникла ошибка при доступе к этому плагину</string>
-    <string name="delete_post">Удалить запись?</string>
-    <string name="delete_page">Удалить страницу?</string>
-    <string name="reader_toast_err_add_tag">Не удается подписаться на эту тему</string>
-    <string name="reader_toast_err_remove_tag">Не удается удалить эту тему</string>
+    <string name="cancel_edit">Отменить изменения</string>
+    <string name="connection_error">Ошибка соединения</string>
+    <string name="select_categories">Выберите категории</string>
     <string name="share_link">Поделиться ссылкой</string>
     <string name="reader_empty_posts_in_tag_updating">Ищем записи…</string>
     <string name="reader_likes_you_and_multi">Вам и %,d другим понравилось это.</string>
-    <string name="comment_spammed">Комментарий помечен как спам.</string>
-    <string name="reader_label_reply">Ответ</string>
     <string name="reader_likes_multi">Понравилось %,d людям</string>
+    <string name="reader_label_reply">Ответ</string>
     <string name="cant_share_no_visible_blog">Вы не можете поделиться через WordPress без видимого блога</string>
-    <string name="pick_photo">Выберите фото</string>
-    <string name="pick_video">Выберите видео</string>
-    <string name="reader_likes_you_and_one">Вам и ещё одному понравилось это</string>
+    <string name="comment_spammed">Комментарий помечен как спам.</string>
     <string name="reader_toast_err_get_post">Не удаётся загрузить эту запись</string>
-    <string name="reader_untitled_post">(Без названия)</string>
-    <string name="empty_list_default">Этот список пуст</string>
-    <string name="reader_btn_share">Поделиться</string>
-    <string name="reader_btn_follow">Подписаться</string>
-    <string name="reader_btn_unfollow">Отписаться</string>
-    <string name="reader_likes_one">Одному человеку нравится это</string>
-    <string name="reader_likes_only_you">Вам нравится это</string>
-    <string name="reader_toast_err_comment_failed">Не удалось оставить комментарий</string>
-    <string name="reader_toast_err_share_intent">Не в состоянии поделиться</string>
-    <string name="reader_toast_err_view_image">Не удаётся просмотреть изображение</string>
-    <string name="reader_toast_err_url_intent">Не удаётся открыть %s</string>
-    <string name="reader_hint_comment_on_comment">Ответить на комментарий…</string>
-    <string name="reader_label_added_tag">Метка %s добавлена</string>
-    <string name="reader_label_removed_tag">Метка %s удалена</string>
-    <string name="comments_empty_list">Комментариев ещё нет</string>
-    <string name="reader_view_reblog">Реблог</string>
+    <string name="reader_likes_you_and_one">Вам и ещё одному понравилось это</string>
+    <string name="pick_video">Выберите видео</string>
+    <string name="pick_photo">Выберите фото</string>
     <string name="sign_up_label">Зарегистрироваться</string>
+    <string name="reader_toast_err_url_intent">Не удаётся открыть %s</string>
+    <string name="reader_toast_err_view_image">Не удаётся просмотреть изображение</string>
+    <string name="reader_toast_err_share_intent">Не в состоянии поделиться</string>
     <string name="reader_toast_err_tag_invalid">Это неверная тема</string>
     <string name="reader_toast_err_tag_exists">Вы уже подписаны на эту тему</string>
-    <string name="themes">Темы</string>
-    <string name="stats_view_tags_and_categories">Теги и Рубрики</string>
+    <string name="reader_toast_err_comment_failed">Не удалось оставить комментарий</string>
+    <string name="reader_likes_only_you">Вам нравится это</string>
+    <string name="reader_likes_one">Одному человеку нравится это</string>
+    <string name="reader_label_removed_tag">Метка %s удалена</string>
+    <string name="reader_label_added_tag">Метка %s добавлена</string>
+    <string name="reader_hint_comment_on_comment">Ответить на комментарий…</string>
+    <string name="reader_btn_unfollow">Отписаться</string>
+    <string name="reader_btn_follow">Подписаться</string>
+    <string name="reader_btn_share">Поделиться</string>
+    <string name="reader_view_reblog">Реблог</string>
+    <string name="reader_untitled_post">(Без названия)</string>
+    <string name="comments_empty_list">Комментариев ещё нет</string>
+    <string name="empty_list_default">Этот список пуст</string>
+    <string name="stats_timeframe_months">Месяцы</string>
+    <string name="stats_timeframe_weeks">Недели</string>
     <string name="stats_timeframe_days">Дни</string>
+    <string name="stats_timeframe_yesterday">Вчера</string>
     <string name="stats_timeframe_today">Сегодня</string>
-    <string name="media_edit_description_text">Описание</string>
-    <string name="stats">Статистика</string>
-    <string name="media_gallery_type_squares">Квадраты</string>
-    <string name="media_gallery_type_slideshow">Показ слайдов</string>
-    <string name="media_gallery_type_circles">Круги</string>
-    <string name="media_gallery_type_tiled">Плитка</string>
+    <string name="stats_view_referrers">Ссылающиеся</string>
+    <string name="stats_view_tags_and_categories">Теги и Рубрики</string>
     <string name="stats_view_clicks">Нажатия</string>
-    <string name="stats_timeframe_weeks">Недели</string>
+    <string name="stats">Статистика</string>
+    <string name="share_action">Поделиться</string>
     <string name="theme_activate_button">Активировать</string>
     <string name="media_edit_failure">Ошибка обновления</string>
-    <string name="share_action">Поделиться</string>
-    <string name="stats_timeframe_months">Месяцы</string>
-    <string name="stats_view_referrers">Ссылающиеся</string>
-    <string name="stats_timeframe_yesterday">Вчера</string>
-    <string name="media_edit_title_text">Название</string>
+    <string name="media_edit_description_text">Описание</string>
     <string name="media_edit_caption_text">Заголовок</string>
-    <string name="manage">Управление</string>
+    <string name="media_edit_title_text">Название</string>
+    <string name="media_gallery_type_slideshow">Показ слайдов</string>
+    <string name="media_gallery_type_circles">Круги</string>
+    <string name="media_gallery_type_tiled">Плитка</string>
+    <string name="media_gallery_type_squares">Квадраты</string>
+    <string name="themes">Темы</string>
     <string name="discard">Отменить</string>
-    <string name="sign_in">Войти</string>
-    <string name="note_reply_successful">Ответ опубликован</string>
+    <string name="manage">Управление</string>
     <string name="more_notifications">и %d ещё.</string>
     <string name="new_notifications">Новые уведомления: %d</string>
     <string name="follows">Подписки</string>
+    <string name="note_reply_successful">Ответ опубликован</string>
+    <string name="sign_in">Войти</string>
     <string name="loading">Загрузка…</string>
-    <string name="httpuser">Имя для HTTP-авторизации</string>
     <string name="httppassword">Пароль для HTTP-авторизации</string>
+    <string name="httpuser">Имя для HTTP-авторизации</string>
     <string name="error_media_upload">Произошла ошибка при загрузке медиафайла</string>
     <string name="incorrect_credentials">Неправильное имя или пароль.</string>
     <string name="log_in">Войти</string>
@@ -2462,11 +2777,11 @@ Language: ru
     <string name="posts">Записи</string>
     <string name="anonymous">Аноним</string>
     <string name="no_network_title">Сеть недоступна</string>
-    <string name="ok">OK</string>
     <string name="done">Готово</string>
+    <string name="ok">OK</string>
     <string name="link_enter_url">URL</string>
-    <string name="version">Версия</string>
     <string name="tos">Условия сервиса</string>
+    <string name="version">Версия</string>
     <string name="app_title">WordPress для Android</string>
     <string name="image_alignment">Выравнивание</string>
     <string name="refresh">Обновить</string>
@@ -2477,25 +2792,25 @@ Language: ru
     <string name="settings">Настройки</string>
     <string name="quickpress_add_error">Ярлык не может быть пустым</string>
     <string name="pages_private">Личные</string>
-    <string name="categories">Рубрики</string>
-    <string name="tags_separate_with_commas">Метки (разделяйте запятыми)</string>
     <string name="title">Заголовок</string>
+    <string name="tags_separate_with_commas">Метки (разделяйте запятыми)</string>
+    <string name="categories">Рубрики</string>
     <string name="dlg_deleting_comments">Удаление комментариев</string>
     <string name="sdcard_title">Требуется SD-карта</string>
     <string name="media">Медиа</string>
-    <string name="delete">Удалить</string>
     <string name="approve">Одобрить</string>
+    <string name="delete">Удалить</string>
     <string name="none">Пусто</string>
-    <string name="no">Нет</string>
-    <string name="cancel">Отмена</string>
-    <string name="error">Ошибка</string>
-    <string name="save">Сохранить</string>
-    <string name="add">Добавить</string>
+    <string name="publish_now">Опубликовать</string>
+    <string name="reply">Ответ</string>
     <string name="on">на</string>
-    <string name="notification_settings">Настройки уведомлений</string>
-    <string name="yes">Да</string>
     <string name="preview">Предварительный просмотр</string>
-    <string name="reply">Ответ</string>
     <string name="category_refresh_error">Ошибка обновления категорий</string>
-    <string name="publish_now">Опубликовать</string>
+    <string name="error">Ошибка</string>
+    <string name="no">Нет</string>
+    <string name="yes">Да</string>
+    <string name="notification_settings">Настройки уведомлений</string>
+    <string name="add">Добавить</string>
+    <string name="save">Сохранить</string>
+    <string name="cancel">Отмена</string>
 </resources>
diff --git a/WordPress/src/main/res/values-sk/strings.xml b/WordPress/src/main/res/values-sk/strings.xml
index 8203ffc9f4cb..f8ae21fda7c4 100644
--- a/WordPress/src/main/res/values-sk/strings.xml
+++ b/WordPress/src/main/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-30 08:37:04+0000
+Translation-Revision-Date: 2021-02-27 18:15:57+0000
 Plural-Forms: nplurals=3; plural=(n == 1) ? 0 : ((n >= 2 && n <= 4) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: sk
@@ -16,12 +16,8 @@ Language: sk
     <string name="app_theme_light">Svetlá</string>
     <string name="app_theme">Vzhľad</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Nedávno ste na tejto stránke vykonali zmeny, ale neboli uložené. Zvoľte verziu k načítaniu:\n\n</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
     <string name="gutenberg_native_link_to">Odkaz na</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Poďme spolu niečo vybudovať!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Poďme spolu niečo vybudovať!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J. K. Rowling</string>
+    <string name="gutenberg_native_link_settings">Nastavenia odkazu</string>
     <string name="reader_filter_empty_tags_action">Pridať tému</string>
     <string name="reader_filter_cta">Filter</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Inštaluj plugin</string>
@@ -44,8 +40,6 @@ Language: sk
     <string name="quick_start_sites_type_subtitle">%1$d z %2$d kompletné</string>
     <string name="quick_start_sites">Ďalšie kroky</string>
     <string name="quick_start_complete_tasks_header">Kompletné (%d)</string>
-    <string name="quick_start_dialog_create_page_title">Vytvoriť novú stránku</string>
-    <string name="quick_start_dialog_browse_themes_title">Prehľadávať témy</string>
     <string name="quick_start_remove_next_steps_menu_title">Odstrániť toto</string>
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
@@ -180,13 +174,7 @@ Language: sk
     <string name="quick_start_dialog_need_help_button_neutral">Nikdy</string>
     <string name="quick_start_dialog_need_help_button_negative">Nie, ďakujem</string>
     <string name="quick_start_dialog_follow_sites_title">Sledovať iné webové stránky</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Ťuknite %1$s Search %2$s , aby ste našli webové stránky s podobnými záujmami.</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Ťuknite %1$s Reader %2$s, keď chcete pokračovať.</string>
-    <string name="quick_start_dialog_customize_site_title">Prispôsobte si webovú stránku</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Ťuknite na %1$s Themes %2$s , keď chcete pokračovať.</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Ťuknite na %1$s Customize %2$s , keď chcete upraviť webovú stránku.</string>
-    <string name="quick_start_dialog_choose_theme_title">Vyberte tému</string>
-    <string name="quick_start_dialog_choose_theme_message">Prehľadávajte všetky témy a nájdite tú, ktorá vám vyhovuje.</string>
     <string name="quick_start_button_positive">Ísť</string>
     <string name="quick_start_button_negative_short">Zrušiť</string>
     <string name="quick_start_button_negative">Teraz nie</string>
@@ -246,14 +234,12 @@ Language: sk
     <string name="support_contact_email">Kontaktný email</string>
     <string name="application_log_button">Aplikačný záznam</string>
     <string name="my_tickets">Moje tickety</string>
-    <string name="activity_log_rewind_dialog_message">Naozaj chcete vrátiť svoje stránky späť na %1$s o %2$s? Tým sa odstráni všetok obsah a možnosti, ktoré boli odvtedy vytvorené alebo zmenené.</string>
-    <string name="activity_log_rewind_site">Obnoviť webovú stránku</string>
     <string name="activity_log_currently_restoring_message_no_dates">Prebieha obnovenie</string>
-    <string name="activity_log_currently_restoring_message">Prevíjanie na %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message">Obnovovanie na %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">Prebieha obnovenie Vašej webovej stránky</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Vaša webová stránka bola úspešne obnovená</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Vaša webová stránka bola úspešne obnovená\nVrátená na %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">Vaše webové stránky sa obnovujú\nNávrat na %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Vaša webová stránka bola úspešne obnovená\nObnovená na %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Vaša webová stránka sa obnovuje\nObnova na %1$s %2$s</string>
     <string name="activity_log_button">tlačidlo Záznamu aktivít</string>
     <string name="plugin_auto_managed">automaticky spravované</string>
     <string name="reader_save_posts_locally_dialog_message">Uložte tento článok a vráťte sa k jeho prečítaniu, kedykoľvek budete chcieť. Bude k dispozícii na tomto zariadení - uložené články sa nesynchronizujú s vašimi ďalšími zariadeniami.</string>
@@ -263,20 +249,16 @@ Language: sk
     <string name="comment_read_source_post">článok</string>
     <string name="sites">Webové stránky</string>
     <string name="signup_magic_link_title">Magický odkaz bol odoslaný</string>
-    <string name="signup_email_screen_title">Zaregistrujte sa e-mailom</string>
     <string name="verification_2fa_screen_title">Overenie kódu</string>
     <string name="selfhosted_site_login_title">Prihlasovacie údaje</string>
     <string name="magic_link_sent_login_title">Magický odkaz bol odoslaný</string>
     <string name="magic_link_login_title">Prihlásenie pre magický odkaz</string>
     <string name="site_address_login_title">Prihlásenie cez adresu webovej stránky</string>
     <string name="email_address_login_title">Prihlásenie cez emailovú adresu</string>
-    <string name="alternatively">Alternatívy</string>
     <string name="reader_empty_saved_posts_description">Klepnite na %s pre uloženie článku do Vášho zoznamu</string>
     <string name="reader_empty_saved_posts_title">Žiadne uložené články — zatiaľ!</string>
     <string name="reader_bookmark_snack_title">Článok bol uložený</string>
     <string name="reader_bookmark_snack_btn">Ukázať všetky</string>
-    <string name="reader_btn_bookmarked">Uložené</string>
-    <string name="reader_btn_bookmark">Uložiť</string>
     <string name="reader_remove_bookmark">Odstrániť z uložených článkov</string>
     <string name="reader_add_bookmark">Pridať do uložených článkov</string>
     <string name="reader_save_for_later_title">Uložené články</string>
@@ -296,11 +278,9 @@ Language: sk
     <string name="reader_btn_notifications_on">Zapnúť upozornenia webovej stránky</string>
     <string name="reader_btn_notifications_off">Vypnúť upozornenia webovej stránky</string>
     <string name="activity_log_jetpack_icon">Ikona Jetpack</string>
-    <string name="rewind">Obnoviť</string>
     <string name="activity_log_event">Udalosť</string>
     <string name="activity_log_icon">Ikonka aktivity</string>
     <string name="activity_log">Log aktivity</string>
-    <string name="activity">Aktivita</string>
     <string name="privacy_policy_read">Prečítajte si zásady ochrany osobných údajov</string>
     <string name="third_party_policy_learn_more_caption">Používame ďalšie nástroje na sledovanie, vrátane niektorých od tretích strán. Prečítajte si o nich a o možnostiach ako ich ovládať.</string>
     <string name="third_party_policy_learn_more_header">Pravidlá tretej strany</string>
@@ -311,7 +291,6 @@ Language: sk
     <string name="preference_privacy_settings">Nastavenia súkromia</string>
     <string name="preference_collect_information">Zbierajte informácie</string>
     <string name="post_submitted">Článok bol odoslaný</string>
-    <string name="login_email_button_signup">Nemáte účet? %1$sZaregistrujte sa%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Vlastnosť pluginu vyžaduje, aby bola webová stránka v dobrom stave.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Funkcia pluginu vyžaduje, aby predplatenie primárnej domény bolo spojené s týmto používateľom.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Funkcia pluginu vyžaduje administrátorské privilégiá.</string>
@@ -410,7 +389,6 @@ Language: sk
     <string name="edit_photo_screen_title">Upraviť fotku</string>
     <string name="share_intent_screen_title">Vybrať webovú stránku</string>
     <string name="signup_epilogue_screen_title">Nový účet</string>
-    <string name="login_prologue_screen_title">Prihlásenie</string>
     <string name="login_epilogue_screen_title">Prihlásený ako</string>
     <string name="person_detail_screen_title">Detail osoby</string>
     <string name="media_settings_screen_title">Detaily súboru</string>
@@ -424,7 +402,7 @@ Language: sk
     <string name="license_screen_title">Licencia</string>
     <string name="release_notes_screen_title">Poznámky k verzii</string>
     <string name="signup_epilogue_error_avatar_view">Váš avatar bol nahraný a zakrátko bude dostupný.</string>
-    <string name="permissions_denied_message">Zdá sa, že ste vypli oprávnenia požadované pre túto funkciu.&lt;br/>&lt;br/>Ak to chcete zmeniť, upravte svoje oprávnenia a uistite sa, že je povolené &lt;strong>%s&lt;/strong>.</string>
+    <string name="permissions_denied_message">Zdá sa, že ste vypli oprávnenia požadované pre túto funkciu.&lt;br/&gt;&lt;br/&gt;Ak to chcete zmeniť, upravte svoje oprávnenia a uistite sa, že je povolené &lt;strong&gt;%s&lt;/strong&gt;.</string>
     <string name="permissions_denied_title">Oprávnenia</string>
     <string name="plugin_caption_featured">Odporúčaný</string>
     <string name="sharing_disabled_description">Nemáte prístup k nastaveniam zdieľania, pretože Jetpack modul Zdieľanie je zakázaný.</string>
@@ -465,7 +443,6 @@ Language: sk
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 príspevok s 1 súborom neboli nahrané</string>
     <string name="untitled_in_parentheses">(Bez názvu)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Vytvoriť webovú stránku</string>
     <string name="notification_site_creation_created">Klepnutím pokračujte.</string>
     <string name="notification_site_creation_title_success">Webová stránka bola vytvorená!</string>
@@ -479,11 +456,8 @@ Language: sk
     <string name="username_changer_dismiss_button_positive">Zrušiť</string>
     <string name="username_changer_action">Uložiť</string>
     <string name="content_description_add_avatar">Pridať avatar</string>
-    <string name="signup_with_google_button">Zaregistrovať sa cez Google</string>
-    <string name="signup_with_email_button">Zaregistrovať sa emailom</string>
     <string name="signup_user_exists">Tento email už na WordPress.com existuje.\nPrihlasovanie pokračuje.</string>
     <string name="signup_updating_account">Účet sa aktualizuje…</string>
-    <string name="signup_terms_of_service_text">Registráciou vyjadrujete súhlas s našimi %1$s Zmluvnými podmienkami%2$s.</string>
     <string name="signup_magic_link_progress">Posiela sa email</string>
     <string name="signup_magic_link_error_button_positive">Opakovať</string>
     <string name="signup_magic_link_error_button_negative">Zatvoriť</string>
@@ -496,11 +470,6 @@ Language: sk
     <string name="signup_epilogue_error_button_negative">Prejsť späť</string>
     <string name="signup_epilogue_error_generic">Pri aktualizácii vášho účtu sa vyskytli problémy. Môžete to skúsiť znova alebo vrátiť zmeny, aby ste mohli pokračovať.</string>
     <string name="signup_epilogue_error_avatar">Pri nahrávaní vášho avataru sa vyskytli problémy.</string>
-    <string name="signup_email_header">Ak chcete vytvoriť svoj nový účet WordPress.com, zadajte svoju e-mailovú adresu.</string>
-    <string name="signup_email_error_generic">Pri kontrole e-mailovej adresy sa vyskytli problémy.</string>
-    <string name="sign_up">Zaregistrujte sa na WordPress.com</string>
-    <string name="enter_username_instead">Prihláste sa pomocou svojho používateľského mena.</string>
-    <string name="enter_site_address_instead">Prihláste sa zadaním adresy vašej webovej stránky.</string>
     <string name="plugin_needs_update">Potrebná aktualizácia</string>
     <string name="plugin_caption_search">Hľadať pluginy</string>
     <string name="plugin_caption_new">Nový</string>
@@ -621,7 +590,6 @@ Language: sk
     <string name="login_error_suffix">\nMožno skúste iný účet?</string>
     <string name="login_error_generic">Počas pripájania na Google účet došlo k nejakým chybám.</string>
     <string name="login_error_button">Zavrieť</string>
-    <string name="login_google_button_suffix">Prihláste sa pomocou Google.</string>
     <string name="enter_wpcom_password_google">Ak chcete pokračovať s týmto účtom Google, zadajte zodpovedajúce heslo WordPress.com. Toto bude požiadané len raz.</string>
     <string name="error_generic_network">Vyskytla sa chyba siete. Skontrolujte svoje pripojenie a skúste to znova.</string>
     <string name="post_settings_remove_featured_image">Odstráňte vybraný obrázok</string>
@@ -633,12 +601,10 @@ Language: sk
     <string name="jetpack_disconnect_confirm">Odpojenie</string>
     <string name="jetpack_disconnect_confirmation_message">Ste si istý, že chcete odpojiť jetpack z webovej stránky?</string>
     <string name="jetpack_disconnect_pref_title">\"Odpojenie z WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Môžete pridať na zoznam povolených IP adresu alebo súhrn adries, aby ste zabránili ich zablokovaniu na Jetpack. IPv4 a IPv6 sú prijateľné. Pre vymedzenie rozsahu zadajte nízku a vysokú hodnotu oddelenú pomlčkou. Príklad: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Vyžaduje sa dvojkrokové overenie.</string>
     <string name="jetpack_match_wpcom_via_email_title">Prispôsobte účty použitím e-mailovej adresy</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Povoľte WordPress.com prihlásiť sa</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com prihlásenie</string>
-    <string name="jetpack_brute_force_whitelist_title">Zoznam povolených IP adries</string>
     <string name="jetpack_prevent_brute_force_title">Zablokovať škodlivé pokusy o prihlásenie</string>
     <string name="jetpack_prevent_brute_force_category_title">Ochrana pred útokom hrubou silou</string>
     <string name="jetpack_send_wp_notifications_title">Poslať zobrazovanie upozornení</string>
@@ -679,12 +645,6 @@ Language: sk
     <string name="notification_settings_category_other">Ostatné</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Všetky moje stránky</string>
     <string name="notification_settings_category_your_sites">Tvoje stránky</string>
-    <string name="notification_settings_master_off_message">Vypni nastavenie upozornení čo odstrání všetky upozornenie z tejto aplikácie, bez ohľadu na typ. Môžete taktiež naladiť, ktorý typ upozornenia môžeš po zapnutí Nastavení Upozornení. </string>
-    <string name="notification_settings_master_off_title">Prijmúť upozornenia na tomto zariadenie, zapni Nastavenie upozornení. </string>
-    <string name="notification_settings_master_hint_off">Zapni upozornenia</string>
-    <string name="notification_settings_master_hint_on">Vypni upozornenia</string>
-    <string name="notification_settings_master_status_off">Vypnúť</string>
-    <string name="notification_settings_master_status_on">Zapnúť</string>
     <string name="max_video_resolution">Maximálna veľkosť videa</string>
     <string name="max_thumbnail_px_size">Maximálna veľkosť obrázku</string>
     <string name="error_upload_post_media_param">Nastala chyba pri načítavaní médiá v článku: %s.</string>
@@ -721,7 +681,6 @@ Language: sk
     <string name="login_site_address_more_help">Potrebujete pomoc?</string>
     <string name="login_site_address_help_content">Adresa vašej webovej stránky sa zobrazí v paneli na vrchu obrazovky, keď navštívite vašu stránku v prehliadači Chrome.</string>
     <string name="login_site_address_help_title">Aká je adresa mojej webovej stránky?</string>
-    <string name="login_site_address_help">Potrebujete pomoc pri hľadaní adresy vašej webovej stránky?</string>
     <string name="login_site_address">Adresa webovej stránky</string>
     <string name="login_already_logged_in_wpcom">Už ste prihlásený vo WordPress.com</string>
     <string name="login_continue">Pokračovať</string>
@@ -732,7 +691,6 @@ Language: sk
     <string name="requesting_otp">Vyžaduje sa overenie kódu prostredníctvom SMS.</string>
     <string name="login_text_otp">Radšej mi pošlite kód</string>
     <string name="enter_verification_code">Takmer dokončené! Prosím, zadajte overovací kód z vašej aplikácie Authenticator.</string>
-    <string name="open_mail">Otvoriť e-mail</string>
     <string name="next">Ďalej</string>
     <string name="enter_email_wordpress_com">Prihláste sa do WordPress.com použití e-mailovej adresy a spravujte všetky vaše webové stránky WordPress.</string>
     <string name="image_optimization_promo_desc">Optimalizácia obrázkov zmenší obrázky pre rýchlejšie nahranie.\n\nPokyn môžete kedykoľvek zmeniť v nastaveniach webovej stránky.</string>
@@ -755,10 +713,6 @@ Language: sk
     <string name="post_status_draft">Koncept</string>
     <string name="post_status_pending_review">Nepotvrdená recenzia</string>
     <string name="post_status_publish_post">Zverejniť</string>
-    <string name="change_location">Zmeniť polohu</string>
-    <string name="remove_location">Odstrániť polohu</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Nemožno otvoriť Location Picker, Google Play Services nie je dostupné.</string>
-    <string name="post_settings_location">Poloha</string>
     <string name="now">Teraz</string>
     <string name="post_settings_password_dialog_hint">Len tí, ktorí majú heslo môžu vidieť článok.</string>
     <string name="post_settings_excerpt_dialog_hint">Zhrnutia sú nepovinné ručne vyrobené zhrnutia vášho obsahu.</string>
@@ -942,7 +896,6 @@ Language: sk
     <string name="signout">Odhlásiť sa</string>
     <string name="sign_in_wpcom">Prihlásiť sa do WordPress.com</string>
     <string name="reader_label_global_related_posts">Viac na WordPress.com</string>
-    <string name="reader_label_local_related_posts">Viac na %s</string>
     <string name="preference_open_device_settings">Otvoriť nastavenia zariadenia</string>
     <string name="invite_invalid_email">%s: neplatný email</string>
     <string name="invite_user_blocked_invites">%s: Používateľ zablokoval pozvania.</string>
@@ -990,20 +943,16 @@ Language: sk
     <string name="invite_error_invalid_usernames_multiple">Nemožno poslať: Nachdázajú sa tu neplatné používateľské mená alebo e-mailové adresy.</string>
     <string name="invite_error_invalid_usernames_one">Nemožno poslať: Používateľské meno alebo e-mailová adresa je neplatné</string>
     <string name="invite_error_no_usernames">Pridajte aspoň jedno používateľské meno</string>
-    <string name="invite_message_info">(Voliteľné) Môžete zadať vlastnú správu do 500 znakov, ktorú bude pozvánka  používateľovi/používateľom obsahovať.</string>
-    <string name="invite_message_remaining_other">%d zostávajúcich znakov</string>
-    <string name="invite_message_remaining_one">1 zostávajúci znak</string>
-    <string name="invite_message_remaining_zero">0 zostávajúcich znakov</string>
     <string name="invite_message_title">Vlastná správa</string>
     <string name="invite">Pozvať</string>
     <string name="invite_names_title">Používateľské mená alebo emaily</string>
     <string name="invite_people">Pozvať ľudí</string>
     <string name="my_site_header_external">Externý</string>
-    <string name="send_link">Poslať odkaz</string>
     <string name="label_clear_search_history">Vyčistiť históriu vyhľadávania</string>
     <string name="dlg_confirm_clear_search_history">Vyčistiť históriu vyhľadávania?</string>
     <string name="reader_empty_search_description">Nenašli sa žiadne výsledky pre %s vo vašom jazyku</string>
     <string name="reader_hint_post_search">Prehľadávať WordPress</string>
+    <string name="reader_title_related_post_detail">Podobný článok</string>
     <string name="preview_screen_links_disabled">Linky sú deaktivované v náhľade</string>
     <string name="send">Odoslať</string>
     <string name="person_removed">%1$s úspešne odstránený</string>
@@ -1022,7 +971,6 @@ Language: sk
     <string name="checking_email">Kontrola emailu</string>
     <string name="magic_link_unavailable_error_message">Momentálne nedostupné. Prosím vložte vaše heslo</string>
     <string name="logging_in">Prihlasovanie</string>
-    <string name="enter_your_password_instead">Zadajte heslo</string>
     <string name="web_address_dialog_hint">Zobraziť verejne, keď píšete komentáre.</string>
     <string name="capture_or_pick_photo">Odfoť alebo vyber fotku</string>
     <string name="plans">Paušály</string>
@@ -1143,7 +1091,6 @@ Language: sk
     <string name="site_settings_paging_dialog_description">Rozdeliť komentáre na stránky.</string>
     <string name="site_settings_paging_dialog_header">Počet komentárov na jednu stránku</string>
     <string name="site_settings_close_after_dialog_title">Zavrieť komentovanie</string>
-    <string name="site_settings_blacklist_description">Ak komentár obsahuje ktorékoľvek z týchto slov vo svojom obsahu, mene, URL adrese, emailovej adrese alebo IP adrese, automaticky bude označený ako spam. Môžete zadať čiastkové slová, napr. slovo \"press\" bude spárované so slovom \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">Ak komentár obsahuje ktorékoľvek z týchto slov vo svojom obsahu, mene, URL adrese, emailovej adrese alebo IP adrese, automaticky bude zadržaný vo fronte. Môžete zadať čiastkové slová, napr. slovo \"press\" bude spárované so slovom \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Zadajte slovo alebo frázu</string>
     <string name="site_settings_list_editor_no_items_text">Žiadne položky</string>
@@ -1158,10 +1105,8 @@ Language: sk
     <string name="site_settings_rp_show_header_title">Zobraziť hlavičku</string>
     <string name="site_settings_rp_switch_summary">Sekcia s podobnými článkami zobrazuje súvisiaci obsah z vašej stránky pod článkami</string>
     <string name="site_settings_rp_switch_title">Zobraziť podobné články</string>
-    <string name="site_settings_blacklist_hint">Komentáre, ktoré zodpovedajú filtru, budú označené ako spam</string>
     <string name="site_settings_moderation_hold_hint">Komentáre, ktoré zodpovedajú filtru, budú zadržané vo fronte</string>
     <string name="site_settings_multiple_links_hint">Ignorovať limit na počet odkazov od známych užívateľov</string>
-    <string name="site_settings_whitelist_hint">Autor komentára musí mať v minulosti schválený aspoň jeden komentár</string>
     <string name="site_settings_user_account_required_hint">Používateľ musí byť pred komentovaním zaregistrovaný a prihlásený</string>
     <string name="site_settings_identity_required_hint">Autor komentára musí vyplniť meno a e-mail</string>
     <string name="site_settings_paging_hint">Zobraziť komentáre v blokoch konkrétnej veľkosti</string>
@@ -1184,17 +1129,13 @@ Language: sk
     <string name="site_settings_address_hint">Zmena vašej adresy nie je momentálne podporovaná</string>
     <string name="site_settings_tagline_hint">Krátky popis alebo chytľavá fráza, ktorá popisuje váš blog</string>
     <string name="site_settings_title_hint">Pár slovami popíšte túto stránku</string>
-    <string name="site_settings_whitelist_known_summary">Komentáre od známych užívateľov</string>
-    <string name="site_settings_whitelist_all_summary">Komentáre od všetkých užívateľov</string>
     <string name="site_settings_threading_summary">%d levely/levelov</string>
     <string name="site_settings_privacy_private_summary">Súkromný</string>
     <string name="site_settings_privacy_hidden_summary">Skrytý</string>
     <string name="site_settings_privacy_public_summary">Verejný</string>
     <string name="site_settings_delete_site_title">Zmazať stránku</string>
-    <string name="site_settings_blacklist_title">Čierna listina</string>
     <string name="site_settings_moderation_hold_title">Pozdržať na moderáciu</string>
     <string name="site_settings_multiple_links_title">Odkazy v komentároch</string>
-    <string name="site_settings_whitelist_title">Schváliť automaticky</string>
     <string name="site_settings_paging_title">Stránkovanie</string>
     <string name="site_settings_threading_title">Spracovanie</string>
     <string name="site_settings_sort_by_title">Zoradiť podľa</string>
@@ -1340,7 +1281,6 @@ Language: sk
     <string name="logs_copied_to_clipboard">Záznamy aplikácie boli skopírované do schránky</string>
     <string name="reader_empty_posts_in_blog">Táto webová stránka je prázdna</string>
     <string name="reader_label_new_posts">Nové príspevky</string>
-    <string name="reader_page_recommended_blogs">Webové stránky, ktoré sa vám možno páčia</string>
     <string name="error_copy_to_clipboard">Pri kopírovaní textu do schránky nastala chyba </string>
     <string name="post_uploading">Nahrávanie príspevku</string>
     <string name="stats_followers_years">počet rokov: %1$d</string>
@@ -1405,7 +1345,6 @@ Language: sk
     <string name="reader_title_blog_preview">Webová stránka čítačky</string>
     <string name="ssl_certificate_ask_trust">Ak sa bežne pripájate bez problémov, táto chyba môže znamenať, že sa niekto pokúša prevziať vašu identitu. Neodporúčame vám pokračovať. Chcete aj napriek tomu dôverovať tomuto certifikátu?</string>
     <string name="ssl_certificate_error">Neplatný SSL certifikát</string>
-    <string name="forgot_password">Stratili ste heslo?</string>
     <string name="help">Pomocník</string>
     <string name="username_or_password_incorrect">Používateľské meno alebo heslo nie je správne</string>
     <string name="email_invalid">Vložte platnú emailovú adresu</string>
diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml
index 714a77515cf4..d024c484a2d1 100644
--- a/WordPress/src/main/res/values-sq/strings.xml
+++ b/WordPress/src/main/res/values-sq/strings.xml
@@ -1,11 +1,447 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-20 11:33:37+0000
+Translation-Revision-Date: 2021-05-05 09:07:13+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: sq_AL
 -->
 <resources>
+    <string name="gutenberg_native_size">Madhësi</string>
+    <string name="gutenberg_native_image_settings">Rregullime figurash</string>
+    <string name="gutenberg_native_audio_settings">Rregullime për audion</string>
+    <string name="user_profile_untitled_site">(I patitull)</string>
+    <string name="user_profile_site_section_header">Sajt</string>
+    <string name="likes_list_screen_title">Listë %s Pëlqimesh</string>
+    <string name="gutenberg_native_write_code">Shkruani kod…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Renditje dhe filtrim</string>
+    <string name="gutenberg_native_show_download_button">Shfaq buton shkarkimesh</string>
+    <string name="gutenberg_native_shortcode">Kod i shkurtër</string>
+    <string name="gutenberg_native_read_more">Lexoni më tepër</string>
+    <string name="gutenberg_native_preload">Parangarkoje</string>
+    <string name="gutenberg_native_post_meta_settings">Rregullime Meta postimi</string>
+    <string name="gutenberg_native_post_content_settings">Rregullime lënde postimi</string>
+    <string name="gutenberg_native_metadata">Tejtëdhëna</string>
+    <string name="gutenberg_native_media_file">Kartelë media</string>
+    <string name="gutenberg_native_media_area">Zonë mediash</string>
+    <string name="gutenberg_native_loop">Qerthull</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Lidhje për te</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">figura %1$d nga %2$d në galeri</string>
+    <string name="gutenberg_native_heading_d">Krye %d</string>
+    <string name="gutenberg_native_featured">Të zgjedhura</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Jepni këtu URL-në për trupëzim…</string>
+    <string name="gutenberg_native_edit_image">Përpunoni figurën</string>
+    <string name="gutenberg_native_display_post_date">Shfaq datë postimesh</string>
+    <string name="gutenberg_native_code">Kod</string>
+    <string name="gutenberg_native_change_heading_level">Ndryshoni shkallë kryesh</string>
+    <string name="gutenberg_native_browser_default">Parazgjedhje shfletuesi</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Blloku është fshirë ose s’mund të kihet.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Blloku s’mund të krijohet brenda vetes.</string>
+    <string name="gutenberg_native_autoplay">Vetëluaje</string>
+    <string name="gutenberg_native_auto">Auto</string>
+    <string name="gutenberg_native_attachment_page">Faqe bashkëngjitje</string>
+    <string name="gutenberg_native_add_text">Shtoni tekst…</string>
+    <string name="gutenberg_native_add_caption">Shtoni titra</string>
+    <string name="gutenberg_native_what_is_alt_text">Ç’është teksti alternativ?</string>
+    <string name="gutenberg_native_failed_to_insert_media">S’u arrit të futej media.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">S’u arrit të futej kartelë audio.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Përshkruani qëllimin e figurës. Lëreni të zbrazët, nëse figura është thjesht dekorative. </string>
+    <string name="like_faces_error_loading_message">Gabim gjatë ngarkimi të dhënash pëlqimesh. %s.</string>
+    <string name="like_faces_plural_text">Këtë e pëlqejnë %d blogues.</string>
+    <string name="like_faces_singular_text">Këtë e pëlqen 1 blogues.</string>
+    <string name="like_title_plural">%d Pëlqime</string>
+    <string name="like_title_singular">1 Pëlqim</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Që të eliminohen kërcënimet, jepni kredencialet tuaja për në shërbyes.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Që të eliminohet kërcënimi, jepni kredencialet tuaja për në shërbyes.</string>
+    <string name="suggestion">Sugjerim:</string>
+    <string name="gutenberg_native_search_blocks">Kërkon në blloqe</string>
+    <string name="gutenberg_native_search_block">Bllok kërkimesh</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">Që të ndryshoni njësinë, prekeni dy herë</string>
+    <string name="gutenberg_native_clear_search">Spastroje kërkimin</string>
+    <string name="gutenberg_native_cancel_search">Anuloje kërkimin</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s është %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Ndodhi një gabim teksa merreshin të dhëna pëlqimesh</string>
+    <string name="get_likes_unknown_error">Ndodhi një gabim i panjohur teksa merreshin pëlqimet.</string>
+    <string name="comments_empty_list_filtered_unreplied">S’ka komente pa përgjigje</string>
+    <string name="comment_status_unreplied">Pa përgjigje</string>
+    <string name="get_likes_no_network_error">S’ka rrjet.</string>
+    <string name="gutenberg_native_table_of_contents">Tryeza e Lëndës</string>
+    <string name="gutenberg_native_summary">përmbledhje</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Përmblidheni postimin tuaj me një listë kryesh. Shtoni spiranca HTML për te blloqe Kryesh për t’i lidhur këtu.</string>
+    <string name="gutenberg_native_document_outline">përvijim dokumenti</string>
+    <string name="jetpack_brute_force_allowlist_title">Adresa IP të lejuara përgjithnjë</string>
+    <string name="site_settings_denylist_title">Komente të palejuara</string>
+    <string name="reader_title_interests">Ndiqni tema</string>
+    <string name="stories_intro_main_subtitle">Një rrugë e re për të krijuar dhe botuar lëndë tërheqëse në sajtin tuaj.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Hidhe tej</string>
+    <string name="activity_log_backup_download_notice_download_action">Shkarkoje</string>
+    <string name="threat_fix_all_status_success_message_plural">Kërcënimet u zgjidhën me sukses.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Ju lutemi, ripohoni se doni të zgjidhni krejt %s kërcënimet aktive.</string>
+    <string name="scan_idle_threats_description_plural">Kontrolli gjeti %1$s kërcënime potenciale me %2$s. Ju lutemi, shqyrtojini më poshtë dhe ndërmerrni një veprim ose prekni butonin “Ndreqi krejt”. Jemi %3$s, nëse keni nevojë për ne.</string>
+    <string name="scan_fixing_threats_description_plural">Jemi duke punuar fort për t’i zgjidhur pa zhurmë këto kërcënime. Ndërkohë, mos ngurroni të vazhdoni ta përdorni sajtin tuaj si normalisht, ecurinë mund ta kontrolloni kurdo qoftë.</string>
+    <string name="gutenberg_native_edit_focal_point">Përpunoni pikë vatrore</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Prekeni dy herë që të hapet Fleta e Poshtme për përpunim, zëvendësim ose spastrim të figurës</string>
+    <string name="new_site_creation_search_domain_input_hint">Shtypni një emër për sajtin tuaj</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Krejt punët të mbaruara&lt;/b&gt;&lt;br/&gt;Do të mbërrini në më shumë njerëz. Punë e paqme!</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Prekeni dy herë që të hapet Fleta e Veprimeve për përpunim, zëvendësim ose spastrim të figurës</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Krejt punët të mbaruara&lt;/b&gt;&lt;br/&gt;E keni përshtatur sajtin tuaj. Ju lumtë!</string>
+    <string name="quick_start_card_menu_hide">Fshihe hëpërhë</string>
+    <string name="magic_link_not_meaning_to_create_account">S’e kishit fjalën të krijonit një llogari të re? Kthehuni mbrapsht, që të jepni adresën tuaj email.</string>
+    <string name="invite_links_disable_dialog_message">Pasi të jetë çaktivizuar kjo lidhje ftese, askush s’do të jetë në gjendje të bëhet pjesë e ekipit tuaj. Jeni i sigurt?</string>
+    <string name="invite_links_disable_dialog_title">Çaktivizo lidhje ftese</string>
+    <string name="invite_links_bad_format_response">U mor përgjigje e pavlefshme</string>
+    <string name="invite_links_null_response">S’u mor përgjigje</string>
+    <string name="invite_links_cannot_get_role_data_error">Pati një gabim në marrjen e të dhënave për rolin %1$s</string>
+    <string name="invite_links_cannot_get_roles_error">Pati një gabim në marrje rolesh</string>
+    <string name="invite_links_generic_get_data_error">Gabim i panjohur në prurje të dhënash lidhjesh ftese</string>
+    <string name="invite_links_helper_text">Përdoreni këtë lidhje për mirëseardhjen e anëtarëve të ekipit tuaj, pa pasur nevojë t’i ftoni ata tek për tek. Cilido që viziton këtë URL, do të jetë në gjendje të regjistrohet në entin tuaj, madje edhe nëse lidhjen e morën nga dikush tjetër, ndaj kujdesuni t’ua jepni personave të besuar.</string>
+    <string name="invite_links_expire_date">Skadon më: %1$s</string>
+    <string name="invite_links_disable_invite_link">Çaktivizo lidhje ftese</string>
+    <string name="invite_links_share_invite_link">Jepni lidhje ftese</string>
+    <string name="invite_links_generate">Prodho lidhje të re</string>
+    <string name="invite_links_get_status_retry">Rifresko gjendje lidhjesh</string>
+    <string name="invite_links_section_title">Lidhje Ftese</string>
+    <string name="threats_found_singular">U gjet kërcënim</string>
+    <string name="threats_found_plural">U gjetën kërcënime</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Kontrolli Përfundoi&lt;/b&gt; &lt;br&gt; S’u gjetën kërcënime</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Kontrolli Përfundoi&lt;/b&gt; &lt;br&gt; U gjetën %s kërcënime potenciale</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Kontrolli Përfundoi&lt;/b&gt; &lt;br&gt; U gjet 1 kërcënim potencial</string>
+    <string name="scan_fixing_threats_title_singular">Po zgjidhet Kërcënimi</string>
+    <string name="disable">Çaktivizoje</string>
+    <string name="quick_start_list_review_pages_subtitle">Shihni faqe dhe bëni ndryshime, ose shtoni dhe hiqni faqe.</string>
+    <string name="quick_start_card_menu_unpin">Shfiksoje këtë</string>
+    <string name="quick_start_list_view_site_title">Vizitoni sajtin tuaj</string>
+    <string name="quick_start_list_upload_icon_subtitle">Shtoni një ikonë sajti, për një pamje të rafinuar, profesionale.</string>
+    <string name="quick_start_list_follow_site_subtitle">Zbuloni dhe ndiqni sajte që ju frymëzojnë.</string>
+    <string name="quick_start_list_enable_sharing_title">Aktivizo ndarje me të tjerë</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Ndani vetvetiu me të tjerët në rrjetet tuaja shoqërore postime të reja.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Jepini sajtit tuaj një emër që pasqyron personalitetin dhe subjektin e tij.</string>
+    <string name="quick_start_list_check_stats_title">Shihni statistikat tuaja</string>
+    <string name="backup_download_status_failure_bullet2">Do të përpiqemi të krijojmë kartelën e kopjeruajtjes tuaj të shkarkueshme.</string>
+    <string name="backup_download_status_failure_bullet1">S’gjetëm dot gjendjen për të thënë se sa do të zgjasë krijimi i kopjeruajtjes tuaj të shkarkueshme.</string>
+    <string name="backup_download_status_failure_heading">Hëm, s’gjetëm dot gjendjen e kopjeruajtjes tuaj të shkarkueshme</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Ikonë tiku</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Ikonë sahati</string>
+    <string name="restore_status_failure_bullet3">Do t’’ju njoftojmë kur të jetë kryer.</string>
+    <string name="restore_status_failure_bullet2">Do të përpiqemi të rikthejmë sajtin tuaj.</string>
+    <string name="restore_status_failure_bullet1">S’e gjetëm dot gjendjen, që të themi se sa do të zgjasë rikthimi juaj.</string>
+    <string name="restore_status_failure_heading">Hëm, s’gjetëm dot gjendjen e rikthimit tuaj</string>
+    <string name="restore_complete_failed_description">S’e rikthyem dot sajtin tuaj</string>
+    <string name="restore_warning_action_button">Ripohojeni</string>
+    <string name="backup_download_complete_failed_description">S’e krijuam dot kopjeruajtjen tuaj</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(përjashton tema, shtojca dhe ngarkime)</string>
+    <string name="restore_warning_description_with_two_parameters">Jeni i sigurt se doni të rikthehet sajti juaj te %1$s prej %2$s?\n        Çfarëdo që keni ndryshuar që atëherë, do të humbë.</string>
+    <string name="backup_item_contents">Drejtoria WP-content</string>
+    <string name="backup_item_roots">Rrënjë WordPress-i</string>
+    <string name="backup_download_details_choose_items_header">Elementë të përfshirë në këtë shkarkim</string>
+    <string name="gutenberg_native_uploading">Po ngarkohet…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Blloqet e ripërdorshëm s’janë të përpunueshëm në WordPress për iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Blloqet e ripërdorshëm s’janë të përpunueshëm në WordPress për Android</string>
+    <string name="gutenberg_native_replace_file">Zëvendësoni kartelë</string>
+    <string name="gutenberg_native_replace_audio">Zëvendësoni audio</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problem me hapjen e audios</string>
+    <string name="gutenberg_native_open">HAPE</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">S’ka aplikacion për ta trajtuar këtë kërkesë.</string>
+    <string name="gutenberg_native_lock_icon">Ikonë kyçjeje</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">S’u arrit të futej kartelë audio. Ju lutemi, prekeni për mundësi.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Prekeni dy herë që të përzgjidhni një kartelë audio</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Prekeni dy herë që të dëgjoni kartelën audio</string>
+    <string name="gutenberg_native_choose_audio">Zgjidhni audio</string>
+    <string name="gutenberg_native_audio_player">Luajtës Audio</string>
+    <string name="gutenberg_native_audio_file"> kartelë audio</string>
+    <string name="gutenberg_native_audio_caption_s">Marrje audio. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Marrje audio. E zbrazët</string>
+    <string name="gutenberg_native_add_audio">SHTONI AUDIO</string>
+    <string name="continue_with_wpcom">Hyni ose regjistrohuni me WordPress.com</string>
+    <string name="photo_picker_use_audio">Përdor këtë audio</string>
+    <string name="photo_picker_choose_audio">Zgjidhni audio prej pajisjes</string>
+    <string name="people_optional_custom_message_helper_text">Opsionale: jepni një mesazh vetjak për t’u dërguar me ftesën tuaj.</string>
+    <string name="people_learn_more_about_roles">Mësoni më tepër rreth rolesh</string>
+    <string name="threat_status_fixed">Të zgjidhur</string>
+    <string name="threat_found_header">Gjetur</string>
+    <string name="scan_here_to_help">këtu për t’ju ndihmuar</string>
+    <string name="scan_idle_threats_description_singular">Kontrolli gjeti një kërcënim potencial me %1$s. Ju lutemi, shqyrtojeni më poshtë dhe ndërmerrni një veprim ose prekni butonin “Ndreqe”. Jemi %2$s, nëse keni nevojë për ne.</string>
+    <string name="scan_idle_manual_scan_description">Që ta shqyrtoni sajtin tuaj sërish, bëni një kontroll dorazi, ose prisni që Jetpack-u të kontrollojë sajtin tuaj më vonë sot.</string>
+    <string name="scan_provisioning_description">Mirë se vini te Jetpack Scan! Po e shohim sajtin tuaj me vëmendje, teksa ujdisim kryerjen e një kontroll të plotë. Do t’ju vëmë në dijeni, nëse kapim çfarëdo problemi që mund të ketë ndikim te kontrolli, mandej do të fillojë i pari kontroll i juaji i plotë.</string>
+    <string name="scan_scanning_is_initial_description">Mirë se vini te Jetpack Scan, tani po i hedhim një sy paraprak sajtit tuaj dhe së shpejti do të keni përfundimin.</string>
+    <string name="scan_scanning_description">Do t’ju dërgojmë një njoftim, sapo kontrolli të jetë i plotë. Ndërkohë, mos ngurroni të vazhdoni ta përdorni sajtin tuaj si normalisht, ecurinë mund ta kontrolloni kur të doni.</string>
+    <string name="scan_fixing_threats_description_singular">Jemi duke punuar fort për t’i zgjidhur pa zhurmë këtë kërcënim. Ndërkohë, mos ngurroni të vazhdoni ta përdorni sajtin tuaj si normalisht, ecurinë mund ta kontrolloni kurdo qoftë.</string>
+    <string name="scan_fixing_threats_title_plural">Zgjidhje Kërcënimesh</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan s’plotësoi dot një kontroll të sajtit tuaj. Ju lutemi, kontrolloni se mos sajti juaj s’është në funksionim – nëse s’është, riprovoni. Nëse është jashtë funksionimi, ose në Jetpack Scan prapë ka probleme, lidhuni me ekipin tonë të asistencës.</string>
+    <string name="scan_request_failed_title">Diçka shkoi ters</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Kopjeruajtje sajti</string>
+    <string name="activity_log_currently_backing_up_title">Po krijohet kopjeruajtje e shkarkueshme</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Sajti juaj u kopjeruajt me sukses</string>
+    <string name="activity_log_currently_backing_up_message">Sajti po rikthehet sipas %1$s %2$s</string>
+    <string name="pick_audio">Përzgjidhni audio</string>
+    <string name="activity_log_backup_finished_snackbar_message">Sajti juaj u rikthye me sukses\nU rikthye sipas %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Sajti juaj po rikthehet\nRikthim sipas %1$s %2$s</string>
+    <string name="restore_complete_failed_icon_content_description">Ikonë gabimi</string>
+    <string name="restore_complete_failed_action_button_content_description">Buton “U bë”</string>
+    <string name="restore_another_process_running">Ka një rikthim në kryerje e sipër.</string>
+    <string name="restore_complete_failed_title">Rikthimi dështoi</string>
+    <string name="restore_complete_visit_site_button_content_description">Buton “Vizitoni sajtin”</string>
+    <string name="restore_complete_done_button_content_description">Buton “U bë”</string>
+    <string name="restore_complete_icon_content_description">Ikonë rikthimi</string>
+    <string name="restore_complete_visit_site_action_button">Vizitoni sajtin</string>
+    <string name="restore_complete_description_with_two_parameters">Krejt zërat tuaj të përzgjedhur janë rikthyer te %1$s %2$s.</string>
+    <string name="restore_complete_header">Sajti juaj u rikthye</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">S’ka nevojë të prisni këtu. Do t’ju njoftojmë, kur sajti të jetë rikthyer.</string>
+    <string name="restore_progress_icon_content_description">Ikonë “Riktheni sajtin”</string>
+    <string name="restore_progress_description_with_two_parameters">Po e rikthejmë sajtin tuaj te %1$s %2$s.</string>
+    <string name="restore_progress_header">Sajti juaj po rikthehet</string>
+    <string name="restore_warning_action_button_content_description">Buton “Ripohoni rikthim sajti”</string>
+    <string name="restore_warning_icon_content_description">Figurë rreth i kuq me pikë çuditje</string>
+    <string name="restore_warning_header">Kujdes</string>
+    <string name="restore_details_action_button_content_description">Buton “Riktheje sajtin”</string>
+    <string name="restore_details_icon_content_description">Ikonë rikthimi</string>
+    <string name="restore_details_action_button">Riktheje sajtin</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s është pika e përzgjedhur për rikthimin tuaj.</string>
+    <string name="restore_details_header">Riktheni Sajtin</string>
+    <string name="restore_details_choose_items_header">Zgjidhni objektet për rikthim:</string>
+    <string name="restore">Riktheje</string>
+    <string name="backup_download_complete_failed_icon_content_description">Re me ikonë X</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Buton “U bë”</string>
+    <string name="backup_download_complete_failed_action_button">U bë</string>
+    <string name="backup_download_complete_failed_title">Shkarkimi dështoi</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Celular</string>
+    <string name="quick_start_card_menu_remove">Mos e shfaq sërish</string>
+    <string name="quick_start_dialog_review_pages_message_short">Që të shihni listën e faqeve tuaja, përzgjidhni %1$s Faqe %2$s.</string>
+    <string name="quick_start_dialog_review_pages_message">Ndryshoni, shtoni ose hiqni faqe të sajtit tuaj.</string>
+    <string name="quick_start_dialog_review_pages_title">Shqyrtoni faqe sajti</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Që të përpunoni Faqen tuaj hyrëse, përzgjidhni %1$s Faqe hyrëse %2$s.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Që të shihni listën e faqeve tuaja, përzgjidhni %1$s Faqe %2$s.</string>
+    <string name="quick_start_card_menu_pin">Fiksoje këtë</string>
+    <string name="quick_start_dialog_edit_homepage_message">Ndryshoni, shtoni ose hiqni lëndë nga faqja hyrëse e sajtit tuaj.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Përpunoni faqen tuaj hyrëse</string>
+    <string name="reader_menu_mark_as_unseen">Hiqi shenjë si i parë</string>
+    <string name="reader_menu_mark_as_seen">Vëri shenjë si i parë</string>
+    <string name="error_media_upload_failed_for_reason">Ngarkimi i medias dështoi.\n%1$s</string>
+    <string name="error_media_not_enough_storage">S’ka hapësirë të mjaftueshme depozitimi sajti</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">S’ndryshohet dot gjendja “parë” e këtij postimi</string>
+    <string name="reader_marked_post_as_unseen">Postimit iu hoq shenja si i parë</string>
+    <string name="reader_marked_post_as_seen">Postimit iu vu shenjë si i parë</string>
+    <string name="threat_fix_all_status_error_message">Gabim në marrje gjendje zgjidhjeje. Ju lutemi, lidhuni me asistencën tonë.</string>
+    <string name="threat_fix_all_error_message">Gabim në zgjidhje kërcënimesh. Ju lutemi, lidhuni me asistencën tonë.</string>
+    <string name="threat_fix_all_status_success_message_singular">Kërcënimi u zgjidh me sukses.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Ju lutemi, ripohoni se doni të zgjidhni një kërcënim aktiv.</string>
+    <string name="threat_fix_all_warning_title">Zgjidhi krejt kërcënimet</string>
+    <string name="threat_ignore_error_message">Gabim në shpërfillje kërcënimi. Ju lutemi, lidhuni me ata të asistencës.</string>
+    <string name="threat_ignore_success_message">Kërcënimi u shpërfill.</string>
+    <string name="threat_ignore_warning">S’duhet ta shpërfillni një çështje sigurie, veç në qofshi absolutisht i sigurt se është e padëmshme. Nëse zgjidhni të shpërfillet ky kërcënim, do të mbetet në sajtin tuaj &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Gabim në zgjidhje kërcënimi. Ju lutemi, lidhuni me asistecën tonë.</string>
+    <string name="threat_fixing">Po zgjidhet kërcënim</string>
+    <string name="scan_history_ignored_threats_tab">Të shpërfillur</string>
+    <string name="scan_history_no_threats_found">S’u gjetën zëra</string>
+    <string name="scan_history_fixed_threats_tab">Të zgjidhur</string>
+    <string name="scan_history_all_threats_tab">Krejt</string>
+    <string name="scan_scanning_title">Po skanohen kartelat</string>
+    <string name="scan_preparing_to_scan_title">Po përgatitet të skanojë</string>
+    <string name="scan_history_menu_title">Historik</string>
+    <string name="scan_history">Skano Historikun</string>
+    <string name="backup_active_filter_empty_subtitle">Provoni të ndryshoni intervalin tuaj të datave</string>
+    <string name="backup_active_filter_empty_title">S’u gjetën kopjeruajtje me përputhje</string>
+    <string name="threat_item_sub_header_status_ignored">Kërcënim i shpërfillur</string>
+    <string name="backup_empty_subtitle">Kopjeruajtja juaj e parë do të shfaqet këtu brenda 34 orësh dhe ju do të merrni një njoftim sapo kopjeruajtja të jetë plotësuar</string>
+    <string name="threat_item_sub_header_status_fixed_on">Kërcënim i zgjidhur më %s</string>
+    <string name="backup_empty_title">Kopjeruajtja juaj e parë do të jetë gati së shpejti</string>
+    <string name="request_failed_message">Pati një problem me trajtimin e kërkesës. Ju lutemi, riprovoni më vonë.</string>
+    <string name="gutenberg_native_move_to_bottom">Kaloje në fund</string>
+    <string name="gutenberg_native_change_block_position">Ndryshoni pozicion blloku</string>
+    <string name="label_control_upload">Ngarkoje</string>
+    <string name="jetpack_icon_content_description">ikonë</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Buton “Ndajeni lidhjen me të tjerët”</string>
+    <string name="backup_download_complete_info">Ju dërguam gjithashtu me email një lidhje për te kartela juaj.</string>
+    <string name="backup_download_complete_download_action_button_content_description">Buton shkarkimi</string>
+    <string name="backup_download_complete_icon_content_description">Ikonë “Kopjeruajtje gati për shkarkim”</string>
+    <string name="backup_download_complete_download_share_action_button">Ndajeni lidhjen me të tjerët</string>
+    <string name="backup_download_complete_download_action_button">Shkarkoje</string>
+    <string name="backup_download_complete_header">Kopjeruajtja juaj tani është gati për shkarkim</string>
+    <string name="backup_download_complete_description_with_two_parameters">Krijuam me sukses një kopjeruajtje të sajtit tuaj prej %1$s %2$s.</string>
+    <string name="backup_download_complete_page_title">Kopjeruajtja Juaj</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_icon_content_description">Po krijohet ikonë “kopjeruajtjeje të shkarkueshme”</string>
+    <string name="backup_download_progress_description_with_two_parameters">Po krijojmë një kopjeruajtje të shkarkueshme të sajtit tuaj prej %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Aktualisht duke krijuar një kopjeruajtje të shkarkueshme të sajtit tuaj</string>
+    <string name="backup_download_progress_footnote">S’ka nevojë të rrini e të pritni. Do t’ju njoftojmë, kur kopjeruajtja juaj të jetë gati.</string>
+    <string name="backup_download_progress_page_title">Shkarkoje Kopjeruajtjen</string>
+    <string name="backup_download_another_download_running">Po kryhet një shkarkim tjetër.</string>
+    <string name="backup_download_generic_failure">Pati një problem me trajtimin e kërkesës. Ju lutemi, riprovoni më vonë.</string>
+    <string name="backup_download_details_action_button_content_description">Buton “Krijoni kopjeruajtje të shkarkueshme”</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s është pika e përzgjedhur për të krijuar një kopjeruajtje të shkarkueshme.</string>
+    <string name="gutenberg_native_image_link_url">URL Lidhjeje Figure</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_user">përdorues</string>
+    <string name="threat_get_free_estimate">Merrni një parashikim falas</string>
+    <string name="threat_ignore">Shpërfille kërcënimin</string>
+    <string name="threat_fix">Zgjidhe kërcënimin</string>
+    <string name="threat_fix_fixable_default">Kontrolli Jetpack do ta zgjidhë kërcënimin.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan do të përditësohet me një version më të ri (%s).</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan-i do ta përpunojë kartelën ose drejtorinë e prekur.</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan-i do të fshijë kartelën ose drejtorinë e prekur.</string>
+    <string name="suggestion_selection_needed">Ju lutemi, shtypni që të filtrohet lista e sugjerimeve.</string>
+    <string name="suggestion_problem">Pati një problem me ngarkimin e sugjerimeve.</string>
+    <string name="suggestion_no_matching">S’u gjet %s me përputhje.</string>
+    <string name="suggestion_none">S’ka sugjerime %s.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan-i do ta zëvendësojë kartelën ose drejtorinë e prekur.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan s’mund ta zgjidhë vetvetiu këtë kërcënim.\n        Sugjerojmë ta zgjidhni kërcënimin dorazi: sigurohuni se WordPress-i, tema juaj, dhe krejt shtojcat tuaja janë të përditësuara, dhe hiqni nga sajti juaj kodin, temën, ose shtojcën që nuk e plotëson këtë. \n \n\n        Nëse ju duhet më tepër ndihmë në zgjidhjen e këtij kërcënimi, rekomandojmë &lt;b&gt;Codeable&lt;/b&gt;, një treg të besueshëm ustallarësh &lt;em&gt;freelancer&lt;/em&gt; ekspertë WordPress-i shumë të vlerësuar.\n        Ata kanë identifikuar një grup të përzgjedhur ekspertësh sigurie për të ndihmuar me këto projekte. Çmimet shkojnë nga 70–120 dollarë/orë, dhe mund të merrni falas një çmim të përafërt, pa detyrim për ta punësuar.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Po zgjidhet kërcënimi</string>
+    <string name="threat_fix_fixed_header">Si e ndreqi Jetpack-u?</string>
+    <string name="threat_fix_default_header">Si do ta ndreqim?</string>
+    <string name="threat_file_description">U gjet kërcënim te kartela:</string>
+    <string name="threat_technical_details_header">Hollësitë teknike</string>
+    <string name="threat_problem_header">Cili qe problemi?</string>
+    <string name="threat_details">Hollësi Kërcënimi</string>
+    <string name="threat_item_sub_header_vulnerable_theme">U gjet cenueshmëri në temë grafike</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">U gjet cenueshmëri në shtojcë</string>
+    <string name="threat_item_sub_header_core_file">U gjet cenueshmëri në WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Cenueshmëri të ndryshme</string>
+    <string name="threat_item_header_vulnerable_theme">Temë e Cenueshme: %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Shtojcë e Cenueshme: %s (version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: rregullsi kodi dashakeq</string>
+    <string name="threat_item_sub_header_file_signature">%s kërcënimi të gjetur</string>
+    <string name="threat_item_header_database_threat">Kërcënime ndaj bazës së të dhënave %s</string>
+    <string name="threat_item_header_infected_core_file">%s: kartelë bazë e infektuar</string>
+    <string name="threat_item_header_threat_found">U gjet kërcënim</string>
+    <string name="scan_this_site">këtë sajt</string>
+    <string name="threats_fix_all">Ndreqi Krejt</string>
+    <string name="scan_idle_last_scan_description">Kontrolli i fundit nga Jetpack-u u krye më %s dhe s’gjeti ndonjë rrezik. %s</string>
+    <string name="scan_in_few_seconds">pak sekonda më parë</string>
+    <string name="scan_in_minutes_ago">%s minutë(a) më parë</string>
+    <string name="scan_in_hours_ago">%s orë më parë</string>
+    <string name="scan_idle_threats_found_title">Sajti juaj mund të jetë i rrezikuar</string>
+    <string name="scan_idle_no_threats_found_title">Mos vrisni mendjen</string>
+    <string name="scan_again">Riskanoje</string>
+    <string name="scan_now">Skanoje tani</string>
+    <string name="scan_state_icon">Ikonë gjendjeje skanimi</string>
+    <string name="backup">Kopjeruaje</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">FIltër Llojesh Veprimtarie (%s lloje të përzgjedhur)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (po shfaqen %s objekte)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Filtër Lloj Veprimtarish</string>
+    <string name="activity_log_activity_type_empty_subtitle">S’ka veprimtari të regjistruara në intervalin e përzgjedhur të datave.</string>
+    <string name="activity_log_activity_type_empty_title">S’ka veprimtari të gatshme</string>
+    <string name="activity_log_activity_type_error_subtitle">Ju lutemi, kontrolloni lidhjen tuaj dhe riprovoni.</string>
+    <string name="activity_log_activity_type_error_title">S’ka lidhje</string>
+    <string name="activity_log_activity_type_filter_active_label">Lloj Veprimtarie (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filtër Interval Datash</string>
+    <string name="activity_log_active_filter_empty_subtitle">Provoni të ndryshoni filtrat për intervalin tuaj të datave ose për lloj veprimtarie</string>
+    <string name="activity_log_active_filter_empty_title">S’u gjetën veprimtari me përputhje</string>
+    <string name="backup_item_media_uploads">Ngarkime Media</string>
+    <string name="backup_item_plugins">Shtojca WordPress</string>
+    <string name="backup_item_themes">Tema WordPress</string>
+    <string name="backup_download_details_icon_content_description">Krijoni ikonë kopjeruajtjesh të shkarkueshme</string>
+    <string name="backup_item_sqls">Bazë të dhënash sajti</string>
+    <string name="backup_item_roots_hint">(përfshin wp-config.php dhe çfarëdo kartelash jo WordPress)</string>
+    <string name="backup_download_details_action_button">Krijoni kartelë të shkarkueshme</string>
+    <string name="backup_download_details_page_title">Shkarkoni Kopjeruatjen</string>
+    <string name="backup_download_details_header">Krijoni kopjeruajtje të shkarkueshme</string>
+    <string name="backup_download">Shkarkim Kopjeruajtjeje</string>
+    <string name="gutenberg_native_error">Gabim</string>
+    <string name="gutenberg_native_choose_file">Zgjidhni kartelë</string>
+    <string name="activity_log_item_menu_download_backup_label">Shkarko kopjeruajtje</string>
+    <string name="activity_log_item_menu_restore_label">Riktheje në këtë pikë</string>
+    <string name="activity_log_activity_type_filter_label">Lloj Veprimtarie</string>
+    <string name="activity_log_date_range_filter_label">Interval Datash</string>
+    <string name="activity_log_activity_type_filter_header">Filtroji sipas Llojesh Veprimtarie</string>
+    <string name="dialog_confirm_copy_local_copy_button">Zgjidhni versionin prej këtij aplikacioni</string>
+    <string name="dialog_confirm_copy_local_edit_button">Përpunoni postimin së pari</string>
+    <string name="dialog_confirm_copy_local_message">Postimi që po rrekeni të kopjoni, ka dy versione që kanë përplasje, ose keni bërë ndryshime tani afër, por nuk i ruajtët ato.\nSë pari përpunoni postimin, që të zgjidhet çfarëdo përplasje ose që të vazhdohet kopjimi i versionit prej këtij aplikacioni.</string>
+    <string name="dialog_confirm_copy_local_title">Përplasje pas njëkohësimi</string>
+    <string name="button_copy">Përsëdyte</string>
+    <string name="toast_edit_story_update_in_progress_title">Artikulli po ruhet, ju lutemi, pritni…</string>
+    <string name="gutenberg_native_file_name">Emër kartele</string>
+    <string name="gutenberg_native_file_block_settings">Rregullime blloku kartelash</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">S’u arrit të ngarkohen kartela.\nJu lutemi, prekeni për mundësi.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">S’u arrit të ruhen kartela.\nJu lutemi, prekeni për mundësi.</string>
+    <string name="gutenberg_native_edit_file">Përpunoni kartelën</string>
+    <string name="gutenberg_native_copy_file_url">Kopjoni URL-në e kartelës</string>
+    <string name="gutenberg_native_choose_a_file">ZGJIDHNI NJË KARTELË</string>
+    <string name="new_site_creation_domain_header_title">Zgjidhni përkatësi</string>
+    <string name="my_site_btn_jetpack_settings">Rregullime Jetpack-u</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">S’u bë dot shpajtimi nga komentet për këtë postim</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">S’u bë dot pajtimi te komentet për këtë postim</string>
+    <string name="reader_follow_comments_get_status_error">Gabim në sjellje gjendjeje pajtimi për këtë postim</string>
+    <string name="reader_follow_comments_unsubscribe_success">U shpajtua me sukses nga komentet</string>
+    <string name="reader_btn_following_comments">Ndjekje bisede përmes email-i</string>
+    <string name="reader_btn_follow_comments">Ndiqeni bisedën përmes email-i</string>
+    <string name="reader_follow_comments_subscribe_success">U pajtua me sukses te komentet</string>
+    <string name="reader_follow_comments_bad_format_response">U mor përgjigje e pavlefshme</string>
+    <string name="reader_follow_comments_null_response">S’u mor përgjigje</string>
+    <string name="activity_log_activity_type_filter_clear">Spastroje</string>
+    <string name="activity_log_activity_type_filter_apply">Aplikoje</string>
+    <string name="dialog_edit_story_unsupported_format_message">Një ose disa diapozitiva nuk janë shtuar te Artikulli juaj, ngaqë Artikujt nuk mbulojnë kartela GIF, hëpërhë. Ju lutemi, në vend të tyre, zgjidhni një figurë statike ose një sfond video.</string>
+    <string name="dialog_edit_story_unsupported_format_title">Kartelat GIF nuk mbulohen</string>
+    <string name="dialog_edit_story_unrecoverable_message">S’gjetëm dot te sajti median për këtë artikull.</string>
+    <string name="dialog_edit_story_unrecoverable_title">S’përpunohet dot Artikulli</string>
+    <string name="dialog_edit_story_unavailable_message">S’arrihet të ngarkohet media për këtë artikull. Kontrolloni lidhjen tuaj në internet dhe riprovoni pas një çasti.</string>
+    <string name="dialog_edit_story_unavailable_title">S’përpunohet dot Artikulli</string>
+    <string name="dialog_edit_story_limited_message">Ky artikull u përpunua në një pajisje tjetër dhe aftësia për të përpunuar disa elemente të dhënë mund të jetë e kufizuar.</string>
+    <string name="dialog_edit_story_limited_title">Përpunim Artikulli i Kufizuar</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media është hequr. Provoni të rikrijoni Artikullin tuaj.</string>
+    <string name="color_picker_label_background">Sfond</string>
+    <string name="color_picker_label_text">Tekst</string>
+    <string name="dialog_discard_story_ok_button_edit">Hidhe tej</string>
+    <string name="dialog_discard_story_message_edit">Çfarëdo ndryshimesh të bëra, s’do të ruhen.</string>
+    <string name="dialog_discard_story_title_edit">Të hidhen tej ndryshimet?</string>
+    <string name="label_done_button">U bë</string>
+    <string name="label_next_button">Pasuesi</string>
+    <string name="delete_button_alt">Fshije</string>
+    <string name="hpp_choose_error">Pati një gabim gjatë përzgjedhjes së skemës.</string>
+    <string name="hpp_retry_error">Ju lutemi, Kontrolloni lidhjen tuaj në internet dhe riprovoni.</string>
+    <string name="hpp_error_subtitle">Kur të jeni sërish i lidhur, prekni Riprovo.</string>
+    <string name="hpp_error_title">S’mund të kihen skema, teksa jeni jashtë linje</string>
+    <string name="continue_site_credentials">Vazhdo me kredenciale shitoreje</string>
+    <string name="login_find_your_connected_email">Gjeni email-in tuaj të lidhur</string>
+    <string name="reader_discover_no_posts_button_text">Ndiqni tema</string>
+    <string name="reader_discover_no_posts_subtitle">Provoni të ndiqni më tepër tema që të zgjerohet kërkimi</string>
+    <string name="reader_discover_no_posts_title">Pa postime së fundi</string>
+    <string name="reader_discover_empty_title">Mirë se vini!</string>
+    <string name="scan">Skanoje</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Durim Cerova&lt;/b&gt; iu përgjigj postimit tuaj</string>
+    <string name="login_prologue_third_subtitle_two">Sot në sajtin tuaj patët &lt;b&gt;50 pëlqeim&lt;/b&gt;</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Maqo Senko&lt;/b&gt; pëlqeu postimin tuaj</string>
+    <string name="hpp_skip_button">Anashkaloje</string>
+    <string name="hpp_choose_button">Zgjidhni</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">U hap me blloqesh. Përzgjidhni një bllok.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Menuja e blloqeve u mbyll.</string>
+    <string name="hpp_subtitle">Zgjidhni skemën e parapëlqyer për faqen tuaj hyrëse. Mund ta përpunoni dhe përshtatni.</string>
+    <string name="hpp_title">Zgjidhni një skemë</string>
+    <string name="mlp_network_error_subtitle">Prekni &lt;code&gt;Retry&lt;/code&gt;, kur të jeni prapë të lidhur, ose krijoni një faqe të zbrazët duke përdorur butonin më poshtë.</string>
+    <string name="mlp_error_subtitle">Prekni &lt;code&gt;Retry&lt;/code&gt;, ose krijoni një faqe të zbrazët duke përdorur butonin më poshtë.</string>
+    <string name="mlp_network_error_title">S’mund të kihen skema, teksa jeni jashtë linje</string>
+    <string name="mlp_error_title">Skema jo të passhme, për shkak të një gabimi</string>
+    <string name="prepublishing_nudges_add_category_button">Shtoni Kategori</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Shtoni Kategori të Re</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategori</string>
+    <string name="prepublishing_nudges_home_categories_not_set">S’është caktuar</string>
+    <string name="prepublishing_nudges_categories_action">Kategori</string>
+    <string name="login_prologue_fifth_caption_three">Muzeume në Londër</string>
+    <string name="login_prologue_fifth_caption_two">Tifozët Më të Zjarrtë të Botës</string>
+    <string name="login_prologue_fifth_caption_one">Dhjetë Kafehanet e Mia Më të Mira</string>
+    <string name="login_prologue_fifth_tag_six">Politikë</string>
+    <string name="login_prologue_fifth_tag_five">Muzikë</string>
+    <string name="login_prologue_fifth_tag_four">Lulishtari</string>
+    <string name="login_prologue_fifth_tag_three">Futboll</string>
+    <string name="login_prologue_fifth_tag_two">Gatim</string>
+    <string name="login_prologue_fifth_tag_one">Art</string>
+    <string name="login_prologue_fifth_subtitle_three">Fyejt Gjatë Javës</string>
+    <string name="login_prologue_fifth_subtitle_two">Lajme Në Internet</string>
+    <string name="login_prologue_fifth_subtitle_one">Xhike Baulja</string>
+    <string name="login_prologue_second_subtitle_two">Jam kaq i frymëzuar nga vepra e gdhendësit Çome Çomanga. Do t’i provoj këto teknika në veprën time të ardhshme</string>
+    <string name="login_prologue_second_subtitle_one">Frymëzohuni</string>
+    <string name="login_prologue_title_fourth">Vëzhgoni shtimin e publikut tuaj, me mjete analizimi në thellësi.</string>
+    <string name="login_prologue_title_third">Shihni aty për aty komente  dhe njoftime.</string>
+    <string name="login_prologue_title_second">Me fuqinë e përpunuesit mund të postoni kudo që ndodheni.</string>
+    <string name="login_prologue_title_first">Mirë se vini te krijuesi më popullor në botë i sajteve.</string>
+    <string name="login_prologue_title_fifth">Ndiqni sajtet tuaj të parapëlqyer dhe zbuloni blogje të rinj.</string>
+    <string name="media_loading_failed">Dështoi ngarkimi i medias</string>
+    <string name="reader_discover_recommended_blogs_header">Sajte për t’u ndjekur</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Po punojmë fort për të shtuar më tepër blloqe me çdo hedhje në qarkullim.</string>
     <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' s’mbulohet plotësisht</string>
     <string name="gutenberg_native_help_button">Buton ndihme</string>
@@ -15,22 +451,19 @@ Language: sq_AL
     <string name="stories_intro_description_second">Botohen si postim i ri blogu në sajtin tuaj, që kështu publiku juaj kurrë të mos humbë një gjë.</string>
     <string name="stories_intro_title_second">Postimet e shkrimeve s’zhduken</string>
     <string name="stories_intro_description_first">Ndërthurni foto, video dhe tekst, që të krijoni postime shkrimesh tërheqës, që vizitorët tuaj do t’i duan fort.</string>
-    <string name="stories_intro_title_first">Tani më shkrimet janë për këdo</string>
     <string name="stories_intro_image_caption_second">Titull shembulli shkrimi</string>
     <string name="stories_intro_image_caption_first">Si të krijohet një postim shkrimi</string>
-    <string name="stories_intro_main_subtitle">Ju është dhënë mundësia e përdorimit të hershëm të Postimeve të Shkrimeve dhe do të donim ta provonit.</string>
     <string name="stories_intro_main_title">Ju Paraqesim Postime Shkrimesh</string>
-    <string name="mlp_generic_error">Ndodhi një gabim teksa silleshin skemat</string>
     <string name="mlp_notice_blank_page_created">U krijua faqe e zbrazët</string>
     <string name="mlp_notice_page_created">Faqja u krijua</string>
-    <string name="mlp_preview_title">Paraparje Skeme</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s-it iu mohua hyrja te fotot tuaj. Që të ndreqet kjo, përpunoni lejet tuaj dhe aktivizoni %2$s dhe %3$s.</string>
+    <string name="stories_intro_title_first">Tanimë shkrimet janë për këdo</string>
     <string name="media_insert_failed">Dështoi futje medie.</string>
     <string name="media_insert_failed_with_reason">Dështoi futje medie: %s</string>
     <string name="photo_picker_wordpress_media_library">Zgjidhni prej Mediatekës WordPress</string>
     <string name="reader_label_toolbar_back">Mbrapsht</string>
     <string name="reader_discover_empty_button_text">Fillojani</string>
-    <string name="reader_discover_empty_title">Ndiqni tema, që të zbuloni blogje të rinj</string>
+    <string name="reader_discover_empty_subtitle">Ndiqni tema, që të zbuloni blogje të rinj</string>
     <string name="reader_post_details_header_by_author_name">Nga</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">Këtij referuesi s’mund t’i vihet shenjë si i padëshiruar</string>
     <string name="stats_referrer_popup_unmark_as_spam">Hiqja Shenjën Si i Padëshiruar</string>
@@ -41,37 +474,37 @@ Language: sq_AL
     <string name="media_uploading_default">Po ngarkohet media</string>
     <string name="gutenberg_native_select_item">Përzgjidhni objekt</string>
     <string name="gutenberg_native_search_or_type_url">Kërkoni ose shtypni URL</string>
+    <string name="gutenberg_native_page_break">Ndërprerje faqeje</string>
     <string name="gutenberg_native_add_this_telephone_link">Shtoni këtë lidhje telefoni</string>
     <string name="gutenberg_native_add_this_link">Shtoje këtë lidhje</string>
     <string name="gutenberg_native_add_this_email_link">Shtoni këtë lidhje email</string>
-    <string name="suggestion_no_connection">“S’ka lidhje në internet.\nS’merren dot sugjerime.”</string>
+    <string name="suggestion_no_connection">S’ka lidhje në internet.\nS’merren dot sugjerime.</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s të përzgjedhura</string>
+    <string name="toast_capture_operation_permission_needed">Që të mund të regjistroni video, duhet t’i akordoni aplikacionit leje incizimi audioje</string>
     <string name="typeface_label_shrikhand">Të trasha</string>
     <string name="typeface_label_space_mono">Moderne</string>
     <string name="typeface_label_pacifico">Lojcake</string>
     <string name="typeface_label_oswald">Të forta</string>
     <string name="typeface_label_libre_baskerville">Klasike</string>
-    <string name="toast_capture_operation_permission_needed">Që të mund të regjistroni video, duhet t’i akordoni aplikacionit leje incizimi audioje</string>
-    <string name="mlp_notselected_description">%s</string>
-    <string name="mlp_selected_description">%s të përzgjedhura</string>
-    <string name="login_get_link_by_email">Merrni me email një lidhje hyrjeje.</string>
+    <string name="typeface_label_nunito">Casual</string>
     <string name="email_not_registered_wpcom">Hëm, s’gjejmë dot një llogari WordPress.com të lidhur me këtë adresë email.</string>
     <string name="permission_microphone">Mikrofon</string>
     <string name="comment_unable_to_show_error">S’arrihet të shfaqet ky koment</string>
     <string name="media_browse_for_items">Shfletoni për objekte</string>
+    <string name="login_get_link_by_email">Merrni me email një lidhje hyrjeje</string>
     <string name="reader_menu_report_post">Njoftoni për këtë postim</string>
-    <string name="gutenberg_native_angle">Kënd</string>
     <string name="reader_welcome_banner">Mirë se vini te Reader. Zbuloni në pëllëmbë të dorës miliona blogje.</string>
     <string name="error_media_xmlrcp_server_error">Ndodhi një gabim i brendshëm shërbyesi</string>
     <string name="error_media_xmlrpc_not_allowed">Veprimi juaj s’lejohet</string>
     <string name="show_n_hidden_items_desc">%1$s objekte të tjerë</string>
     <string name="gutenberg_native_select_a_layout">Përzgjidhni një skemë</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Shënim: Skema e shtyllave mund të jetë ndryshojë sipas temash dhe madhësish ekrani</string>
+    <string name="reader_discover_interests_header">Mund t’ju pëlqente edhe</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Fshihe</string>
     <string name="create_post_story_fab_tooltip">Krijoni një postim ose një shkrim</string>
     <string name="create_page_fab_tooltip">Krijoni një faqe</string>
     <string name="create_post_fab_tooltip">Krijoni një postim</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">Mund t’ju pëlqente edhe</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Fshihe</string>
     <string name="gutenberg_native_video_caption_empty">Legjendë videoje. E zbrazët</string>
     <string name="gutenberg_native_updates_the_title">Përditëson titullin.</string>
     <string name="gutenberg_native_paste_block_after">Ngjite bllokun pas</string>
@@ -108,7 +541,6 @@ Language: sq_AL
     <string name="dialog_discard_errored_page_message">Ky diapozitiv s’është ruajtur ende. Nëse e fshini këtë diapozitiv, do të humbni çfarëdo përpunimesh që keni bërë.</string>
     <string name="dialog_discard_page_message">Ky diapozitiv do të hiqet prej sajtit tuaj.</string>
     <string name="dialog_discard_page_title">Të fshihet diapozitivi i shkrimit?</string>
-    <string name="menu_delete_page">Fshije diapozitivin</string>
     <string name="label_text_color_button">Ndryshoni ngjyrë teksti</string>
     <string name="label_text_alignment_button">Ndryshoni drejtim teksti</string>
     <string name="label_frame_errored">me gabim</string>
@@ -118,10 +550,7 @@ Language: sq_AL
     <string name="label_retry_icon">Riprovo</string>
     <string name="label_saved_icon">U ruajt</string>
     <string name="label_close_button">Mbylle</string>
-    <string name="label_control_publish">Pasuesi</string>
-    <string name="label_done">U bë</string>
     <string name="label_share_to">Ndajeni me të tjerët në</string>
-    <string name="label_snackbar_share">NDAJENI ME TË TJERË</string>
     <string name="label_snackbar_loop_frame_saved">U ruajt te fotot</string>
     <string name="label_control_retry">Riprovo</string>
     <string name="label_control_saved">U ruajt</string>
@@ -130,20 +559,20 @@ Language: sq_AL
     <string name="label_control_flip_camera">Ktheje në anë tjetër</string>
     <string name="sound_button_alt">Tingull</string>
     <string name="text_button_alt">Tekst</string>
-    <string name="more_button_alt">Më tepër</string>
     <string name="stickers_button_alt">Ngjitës</string>
     <string name="flash_button_alt">Blic</string>
     <string name="flip_button_alt">Rrotulloni kamerën</string>
-    <string name="capture_button_alt">Regjistroje</string>
     <string name="mlp_preview_page">Paraparje</string>
     <string name="mlp_create_page">Krijoni faqe</string>
     <string name="mlp_create_blank_page">Krijoni faqe të zbrazët</string>
     <string name="mlp_choose_layout_subtitle">Nisjani duke zgjedhur nga një larmi e madhe skemash të parapërgatitura faqesh. Ose thjesht fillojani me një faqe të zbrazët.</string>
-    <string name="mlp_choose_layout_title">Zgjidhni një skemë</string>
     <string name="prepublishing_nudges_story_title_hint">Jepini një titull shkrimit tuaj</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Prekni %1$s Krijoni. %2$s Mandej përzgjidhni &lt;b&gt;Postim blogu&lt;/b&gt;</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Krijoni një postim ose një shkrim</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Krijoni një postim, faqe ose shkrim</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Prekni %1$s Krijoni. %2$s Mandej përzgjidhni &lt;b>Postim blogu&lt;/b></string>
+    <string name="label_snackbar_share">NDAJENI ME TË TJERË</string>
+    <string name="capture_button_alt">Regjistroje</string>
+    <string name="mlp_choose_layout_title">Zgjidhni një skemë</string>
     <string name="photo_picker_choose_file">Zgjidhni nga pajisje</string>
     <string name="my_site_bottom_sheet_add_story">Postim shkrimi</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Përpunimi i ikonave të sajtit në sajte WordPress të vetëstrehuar lyp doemos shtojcën Jetpack.</string>
@@ -157,13 +586,10 @@ Language: sq_AL
     <string name="gutenberg_native_choose_image_or_video">Zgjidhni figurë ose video</string>
     <string name="gutenberg_native_choose_image">Zgjidhni figurë</string>
     <string name="gutenberg_native_block_removed">Blloku u hoq</string>
-    <string name="content_description_logo">Stema e WordPress-it</string>
-    <string name="enter_your_site_address">Jepni adresën e sajtit tuaj</string>
-    <string name="continue_with_wpcom">Vazhdoni me WordPress.com</string>
     <string name="signup_confirmation_title">Ripohim regjistrimi</string>
     <string name="continue_with_google_terms_of_service_text">Nëse vazhdoni me Google dhe ende s’keni një llogari WordPress.com, po krijoni një llogari dhe pajtoheni me %1$sKushtet tona të Shërbimit%2$s.</string>
+    <string name="enter_your_site_address">Jepni adresën e sajtit tuaj ekzistues</string>
     <string name="continue_terms_of_service_text">Duke u regjistruar, pajtoheni me %1$sKushtet tona të Shërbimit%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Do t’ju dërgojmë me email një lidhje regjistrimi për të krijuar llogarinë tuaj të re WordPress.com.</string>
     <string name="signup_confirmation_message">Këtë adresë email do ta përdorim për të krijuar llogarinë tuaj të re WordPress.com.</string>
     <string name="signup_magic_link_message">Ju dërguam me email një lidhje regjistrimi për të krijuar llogarinë tuaj të re WordPress.com. Kontrolloni email-et në këtë pajisje dhe prekni lidhjen te email-i i ardhur nga WordPress.com.</string>
     <string name="enter_account_info_for_site">Jepni të dhënat e llogarisë suaj për %1$s.</string>
@@ -180,19 +606,15 @@ Language: sq_AL
     <string name="or_type_your_password">Ose shtypni fjalëkalimin tuaj</string>
     <string name="create_account">Krijo llogari</string>
     <string name="send_link_by_email">Dërgoje lidhjen me email</string>
-    <string name="login_promo_text_unlock_the_power">Çlironi fuqinë e krijuesit më të zhdërvjellët të sajteve.</string>
-    <string name="login_promo_title_37_percent">37\% e web-it ngrihet mbi WordPress.</string>
     <string name="reset_your_password">Ricaktoni fjalëkalimi tuaj</string>
     <string name="reader_error_request_failed_title">Pati një problem me trajtimin e kërkesës. Ju lutemi, riprovoni.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Jepini sajtit tuaj një emër që pasqyron personalitetin dhe subjektin e tij. Përshtypja e parë ka vlerë!</string>
     <string name="quick_start_list_update_site_title_title">Caktoni titullin e sajtit tuaj</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Prekni &lt;b>%1$s&lt;/b> që të caktoni një titull të ri</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Prekni &lt;b&gt;%1$s&lt;/b&gt; që të caktoni një titull të ri</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Shpënia te hedhurinat e këtij postimi do të hedhë tej edhe ndryshimet e paruajtura, jeni i sigurt se doni të vazhdohet?</string>
     <string name="gutenberg_native_s_block_options">Mundësi blloku %s</string>
     <string name="gutenberg_native_duplicate_block">Bllok Përsëdyte</string>
     <string name="gutenberg_native_copy_block">Bllok Kopjoje</string>
     <string name="gutenberg_native_copied_block">Blloku u kopjua</string>
-    <string name="gutenberg_native_block_settings">Rregullime blloku</string>
     <string name="gutenberg_native_block_pasted">Blloku u ngjit</string>
     <string name="gutenberg_native_block_duplicated">Blloku u përsëdyt</string>
     <string name="gutenberg_native_block_cut">Blloku u pre</string>
@@ -208,7 +630,6 @@ Language: sq_AL
     <string name="gutenberg_native_gradient_type">Lloj Gradienti</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Që të përzgjidhni mundësinë, prekeni dyfish</string>
     <string name="gutenberg_native_customize_gradient">Përshtatni Gradientë</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">Autor faqeje</string>
     <string name="photo_picker_use_gif">Përdor këtë GIF</string>
     <string name="error_media_thumbnail_not_loaded">S’u ngarkua dot miniaturë mediash</string>
@@ -218,7 +639,6 @@ Language: sq_AL
     <string name="gutenberg_native_dismiss">Hidhe tej</string>
     <string name="prepublishing_nudges_home_tags_not_set">E pacaktuar</string>
     <string name="prepublishing_tags_description">Etiketat ndihmojnë t’u tregohet lexuesve se për çfarë është një postim.</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">Datë Botimi</string>
     <string name="prepublishing_nudges_toolbar_title_tags">Shtoni Etiketa</string>
     <string name="prepublishing_nudges_back_button">Mbrapsht</string>
     <string name="prepublishing_nudges_home_save_button">Ruaje Tani</string>
@@ -230,9 +650,8 @@ Language: sq_AL
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">Anuloje</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">Shpjere te Skica</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Postimet e shpënë në hedhurina s’mund të përpunohen. Doni të ndryshohet gjendja e këtij postimi në “skicë”, që të mund të merreni me të?</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Datë Botimi</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Të kalohet postimi te Skicat?</string>
-    <string name="reader_label_choose_your_interests">Zgjidhni ç’ju intereson</string>
-    <string name="reader_choose_interests_content_description">Zgjidhni ç’ju intereson</string>
     <string name="reader_btn_done">U bë</string>
     <string name="reader_btn_select_few_interests">Që të vazhdohet, përzgjidhni ndoca</string>
     <string name="post_status_post_published">Të botuar</string>
@@ -241,25 +660,24 @@ Language: sq_AL
     <string name="publish_date">Datë Botimi</string>
     <string name="ccpa_privacy_notice_read">Lexoni shënimin CCPA mbi privatësinë</string>
     <string name="ccpa_privacy_notice_caption">Ligji i Privatësisë së Konsumatorit në Kaliforni (\"CCPA\") kërkon prej nesh t’u japim banuesve në Kaliforni disa të dhëna shtesë rreth kategorive të të dhënave personale që grumbullojmë dhe ndajmë me të tjerë, prej nga i marrim këto të dhëna personale, dhe si dhe pse i përdorim.</string>
+    <string name="reader_label_choose_your_interests">Zgjidhni temat tuaja</string>
+    <string name="reader_choose_interests_content_description">Zgjidhni temat tuaja</string>
     <string name="ccpa_privacy_notice_header">Shënim mbi privatësinë për përdorues në Kaliforni</string>
     <string name="status_and_visibility">Gjendje &amp; Dukshmëri</string>
     <string name="update_now">Përditësojeni Tani</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Provoni një skemë sa për fillim</string>
     <string name="gutenberg_native_open_block_actions_menu">Hap Menu Veprimesh Blloqesh</string>
-    <string name="gutenberg_native_insert_mention">Futni përmendje</string>
+    <string name="gutenberg_native_move_to_top">Ngjite në krye</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Prekeni dyfish që të hapet Fleta e Poshtme me mundësitë e gatshme</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Prekeni dyfish që të hapet Fleta e Veprimeve me mundësitë e gatshme</string>
     <string name="pages_cannot_be_started">S’hapim dot faqe tani. Ju lutemi, riprovoni më vonë</string>
     <string name="pages_set_as_posts_page">Caktojeni Faqe Postimesh</string>
     <string name="pages_set_as_homepage">Caktojeni si Faqen hyrëse</string>
-    <string name="suggestion_no_matching_users">\"S’ka përdorues me përputhje.\"</string>
-    <string name="suggestion_invalid_user">\"%s s’është përdorues i vlefshëm\"</string>
     <string name="site_settings_select_page">Përzgjidhe Faqen</string>
     <string name="site_settings_posts_page">Faqe Postimesh</string>
     <string name="site_settings_static_homepage">Faqe Hyrëse Statike</string>
     <string name="site_settings_classic_blog">Blog Klasik</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Faqja hyrëse e përzgjedhur dhe faqja e përzgjedhur për postime s’mund të jenë e njëjta.</string>
+    <string name="suggestion_invalid">%s s’është %s i vlefshëm</string>
     <string name="site_settings_failed_update_homepage_settings">Përditësimi i rregullimeve të faqes hyrëse dështoi, kontrolloni lidhjen tuaj në internet</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">S’mund të ruhen rregullime faqeje hyrëse përpara se të ngarkohen faqe</string>
     <string name="site_settings_failed_to_save_homepage_settings">S’ruhen dot rregullime faqeje hyrëse</string>
@@ -268,13 +686,12 @@ Language: sq_AL
     <string name="site_settings_homepage_settings_description">Zgjidhni prej një faqeje hyrëse që shfaq postimet tuaja më të reja (blog klasik) ose një faqe të fiksuar / statike.</string>
     <string name="site_settings_homepage_settings">Rregullime Faqeje Hyrëse</string>
     <string name="site_settings_homepage">Faqe Hyrëse</string>
-    <string name="page_posts_page_update_failed">Përditësimi i Faqes Postime dështoi</string>
     <string name="page_posts_page_successfully_updated">Faqja Postime u përditësua me sukses</string>
     <string name="page_homepage_update_failed">Përditësimi i faqes hyrëse dështoi</string>
     <string name="page_homepage_successfully_updated">Faqja hyrëse u krijua me sukses</string>
     <string name="page_cannot_set_posts_page">Që të caktoni faqe Postimesh, aktivizoni te Rregullime Sajti \"Faqe hyrëse Statike\"</string>
     <string name="page_cannot_set_homepage">Që të caktoni Faqe hyrëse, aktivizoni te Rregullime Sajti \"Faqe hyrëse Statike\"</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Mirë se vini te blogu ynë i ri</string>
+    <string name="page_posts_page_update_failed">Përditësimi i Faqes Postime dështoi</string>
     <string name="gutenberg_native_select_a_color">Përzgjidhni një ngjyrë</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Prekeni dyfish që të kaloni te rregullimet e ngjyrave</string>
     <string name="reader_empty_followed_blogs_description">Kur ndiqni sajte, lëndën e tyre do ta shihni këtu</string>
@@ -308,7 +725,6 @@ Language: sq_AL
     <string name="gutenberg_native_move_block_left">Shpjere bllokun majtas</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Që ta lëvizni bllokun djathtas, prekeni dyfish</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Që ta lëvizni bllokun majtas, prekeni dyfish</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Po krijohet pulti</string>
     <string name="new_site_creation_creating_site_loading_3">Po ujdiset tema</string>
     <string name="new_site_creation_creating_site_loading_2">Po shtohen veçori sajti</string>
@@ -317,9 +733,6 @@ Language: sq_AL
     <string name="new_site_creation_creating_site_loading_title">Urra!\nPothuajse mbaruat</string>
     <string name="pages_and_posts_cancel_auto_upload">Anuloje ngarkimin</string>
     <string name="gif_list_search_returned_unknown_error">Pati një problem me trajtimin e kërkesës</string>
-    <string name="gif_powered_by_tenor">Bazuar në Tenor</string>
-    <string name="gif_picker_search_hint">Kërkoni në Tenor</string>
-    <string name="photo_picker_gif">Zgjidhni prej Tenor-i</string>
     <string name="weekday_saturday">E shtunë</string>
     <string name="weekday_friday">E premte</string>
     <string name="weekday_thursday">E enjte</string>
@@ -327,15 +740,18 @@ Language: sq_AL
     <string name="weekday_tuesday">E martë</string>
     <string name="weekday_monday">E hënë</string>
     <string name="weekday_sunday">E diel</string>
+    <string name="gif_powered_by_tenor">Bazuar në Tenor</string>
+    <string name="gif_picker_search_hint">Kërkoni në Tenor</string>
+    <string name="photo_picker_gif">Zgjidhni prej Tenor-i</string>
     <string name="media_accessing_failed">S’u arrit të hyhej te lëndë në një sajt privat. Disa media mund të mos përdoren dot</string>
     <string name="media_accessing_progress">Po përdoret lëndë e një sajti privat</string>
     <string name="error_failed_to_crop_and_save_image">S’u arrit të qethej dhe ruhej figura, ju lutemi, riprovoni.</string>
-    <string name="failed_to_load_image_tap_to_retry">S’u arrit të ngarkohej figurë.\nJu lutemi, prekeni që të riprovohet.</string>
     <string name="preview_image_description">Paraparje Figure</string>
     <string name="error_unknown_page_type">Format faqesh i panjohur</string>
     <string name="error_page_not_submitted">S’e plotësuam dot këtë veprim dhe s’e parashtruam për shqyrtim këtë faqe.</string>
     <string name="error_page_not_scheduled">S’e plotësuam dot këtë veprim dhe s’e vumë dot në plan këtë faqe.</string>
     <string name="error_page_not_published_private">S’e plotësuam dot këtë veprim dhe s’e botuam këtë faqe private.</string>
+    <string name="failed_to_load_image_tap_to_retry">S’u arrit të ngarkohej figurë.\nJu lutemi, prekeni që të riprovohet.</string>
     <string name="error_page_not_published">S’e plotësuam dot këtë veprim dhe s’e botuam këtë faqe.</string>
     <string name="error_page_not_submitted_retrying">S’e parashtruam dot për shqyrtim këtë faqe, por do të riprovojmë më vonë. </string>
     <string name="error_page_not_scheduled_retrying">S’e vumë dot në plan këtë faqe, por do të riprovojmë më vonë.</string>
@@ -345,8 +761,8 @@ Language: sq_AL
     <string name="error_media_recover_page_not_scheduled">S’e ngarkuam dot këtë media dhe s’e vumë në plan këtë faqe.</string>
     <string name="error_media_recover_page_not_published_private">S’e ngarkuam dot këtë media dhe s’e botuam këtë faqe private.</string>
     <string name="error_media_recover_page_not_published">S’e ngarkuam dot këtë media dhe s’e botuam faqen.</string>
-    <string name="page_waiting_for_connection_draft">Do ta ruajmë skicën tuaj, kur pajisja juaj të jetë sërish në linjë</string>
     <string name="page_waiting_for_connection_private">Do ta botojmë faqen tuaj private kur pajisja juaj të jetë sërish në linjë.</string>
+    <string name="page_waiting_for_connection_draft">Do ta ruajmë skicën tuaj, kur pajisja juaj të jetë sërish në linjë</string>
     <string name="page_waiting_for_connection_scheduled">Do ta vëmë në plan faqen tuaj kur pajisja juaj të jetë sërish në linjë.</string>
     <string name="page_waiting_for_connection_pending">Do ta parashtrojmë për shqyrtim faqen tuaj kur pajisja juaj të jetë sërish në linjë.</string>
     <string name="page_waiting_for_connection_publish">Do ta botojmë faqen kur pajisja juaj të jetë sërish në linjë.</string>
@@ -364,57 +780,20 @@ Language: sq_AL
     <string name="app_theme_light">E çelët</string>
     <string name="app_theme">Dukje</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Së fundi keni bëtë ndryshime te kjo faqe, por nuk i ruajtët. Zgjidhni një version për ngarkim:\n\n</string>
-    <string name="gutenberg_native_what_people_say">Ç’thonë Njerëzit</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Ofrojmë një gamë shërbimesh për t’ju ndihmuar të arrini përfundimet që kërkoni. S’jeni i sigurt se ç’ju nevojitet, ose sa kushton? Mund t’ju shpjegojmë cilat shërbime ju bëjnë punë dhe t’ju tregojmë më tepër rreth tarifave tona. Lidhuni me ne, nga më poshtë.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Jemi një ekip i vogël profesionistësh me një gamë të gjerë aftësish dhe përvoje. E duam atë që bëjmë dhe e bëjmë me pasion. Presim të punojmë me ju.</string>
-    <string name="gutenberg_native_warning_message">Mesazh Sinjalizimi</string>
-    <string name="gutenberg_native_want_to_work_with_us">Doni të punoni me ne?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Vizitorët do të duan të njohin cili është në anën tjetër të faqes. Përdoreni këtë hapësirë për të shkruar diçka mbi veten, sajtin tuaj, biznesin, ç’të doni. Përdorini përshtypjet më poshtë për të cituar të tjerët, që flasin për të njëjtën gjë – me fjalët e tyre.</string>
-    <string name="gutenberg_native_usa">ShBA</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Ky është një shembull lënde, i përfshirë me gjedhen për ilustrim të veçorive të saj. Hiqeni ose zëvendësojeni me fjalët dhe median tuaj.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Rruga se si t’ia fillohet është të lihen llafet dhe t’i hyhet punës.</string>
-    <string name="gutenberg_native_team">Ekip</string>
-    <string name="gutenberg_native_success_message">Mesazh Suksesi</string>
-    <string name="gutenberg_native_strategy">Strategji</string>
     <string name="gutenberg_native_show_post_content">Shfaq lëndë postimi</string>
-    <string name="gutenberg_native_services">Shërbime</string>
-    <string name="gutenberg_native_samuel_the_dog">Qeni Samuel</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Emër Projekti</string>
-    <string name="gutenberg_native_position_or_job_title">Pozicion ose Emër Vendi Pune</string>
-    <string name="gutenberg_native_portfolio">Portofol</string>
     <string name="gutenberg_native_only_show_excerpt">Shfaq vetëm copëz</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Portofoli im paraqet projekte të ndryshme të krijuar përgjatë karrierës time. Shihni të dhëna kontakti më poshtë dhe lidhuni me mua.</string>
     <string name="gutenberg_native_link_to">Lidhje Te</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Ta bisedojmë 👋 Mos ngurroni të lidheni me ne përmes të dhënave të kontaktit më poshtë, ose dërgoni një mesazh duke përdorur formularin.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Le të ngremë diçka bashkë!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Le të ngremë diçka bashkë!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Harri, janë zgjedhjet tona ato që tregojnë vërtet se ç’jemi, shumë më tepër se aftësitë tona.</string>
-    <string name="gutenberg_native_inspiration">Frymëzim</string>
-    <string name="gutenberg_native_get_in_touch">Lidhuni</string>
+    <string name="gutenberg_native_link_settings">Rregullime Lidhjesh</string>
     <string name="gutenberg_native_excerpt_length_words">Gjatësi copëzash (fjalë)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Dërgomëni email: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Mos qa pse mbaroi, qesh pse ndodhi.</string>
     <string name="gutenberg_native_customize">PËRSHTATENI</string>
-    <string name="gutenberg_native_city_10100">Qytet, 10100</string>
     <string name="gutenberg_native_add_paragraph_block">Shtoni bllok paragraf</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Një përshkrim i shkurtër i shërbimeve që ofroni.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Një jetëshkrim i shkurtër me historik personal, arritjet kryesore, ose një fakt interesant.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Një përshkrim i projektit dhe punët e paraqitura.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
+    <string name="gutenberg_native_video_settings">Rregullime për videon</string>
     <string name="create_post_page_fab_tooltip_contributors">Krijoni një postim</string>
     <string name="post_list_tab_trashed_posts">Shpënë te hedhurinat</string>
     <string name="post_list_tab_scheduled_posts">Vënë në plan</string>
     <string name="post_list_tab_published_posts">Botuar</string>
     <string name="sharing_facebook_account_must_have_pages">Lidhja Facebook s’gjen dot ndonjë Faqe. Publicize s’mund të lidhet me Profile Facebook, vetëm me Faqe të botuara.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">I palidhur</string>
-    <string name="my_site_select_domains_page_title">Adresë Sajti</string>
     <string name="notifications_tab_title_likes">Pëlqime</string>
     <string name="notifications_tab_title_follows">Ndjekje</string>
     <string name="notifications_tab_title_comments">Komente</string>
@@ -428,47 +807,42 @@ Language: sq_AL
     <string name="stats_management_add_new_stats_card">Shtoni kartë të re statistikash</string>
     <string name="reader_self_hosted_select_filter">Përdorni butonin e filtrave që të gjeni postime rreth subjektesh specifike</string>
     <string name="reader_bottom_sheet_content_description">Përzgjidhni një Etiketë ose Sajt, Dritare Flluskë</string>
-    <string name="reader_btn_selected_filter_tick_content_description">E përzgjedhur</string>
     <string name="reader_btn_select_filter_content_description">Përzgjidhni një Sajt ose Etiketë që të filtrohen postime</string>
     <string name="reader_btn_remove_filter_content_description">Hiqe filtrin e tanishme</string>
-    <string name="reader_title_subs">Administroni Tema &amp; Sajte</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">Hyni te WordPress.com</string>
-    <string name="reader_filter_self_hosted_empty_tagss_list">Që të shihni postimet më të reja në temat që ndiqni, bëni hyrjen te llogaria juaj në WordPress.com </string>
+    <string name="reader_title_subs">Administroni Tema &amp; Sajte</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Bëni hyrjen te llogaria juaj në WordPress.com që të shihni postimet më të reja prej sajtesh që ndiqni</string>
-    <string name="gutenberg_native_template_preview">Paraparje Gjedheje</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Që të shihni postimet më të reja në temat që ndiqni, bëni hyrjen te llogaria juaj në WordPress.com</string>
     <string name="gutenberg_native_replace_current_block">Zëvendëso Bllokun e Tanishëm</string>
     <string name="gutenberg_native_add_to_end">Shtoje Në Fund</string>
     <string name="gutenberg_native_add_to_beginning">Shtoje Në Fillim</string>
     <string name="gutenberg_native_add_block_before">Shtoje Përpara Bllokut</string>
     <string name="gutenberg_native_add_block_after">Shtoje Pas Bllokut</string>
-    <string name="reader_filter_empty_tags_action">Shtoni një temë</string>
     <string name="reader_filter_empty_sites_action">Ndiqni një sajt</string>
-    <string name="reader_filter_empty_tags_list">Mund të ndiqni postime lidhur me një subjekt të caktuar, duke shtuar një temë</string>
     <string name="reader_filter_empty_sites_list">Shihni postimet më të reja prej sajtesh që ndiqni</string>
+    <string name="reader_filter_empty_tags_action">Shtoni një temë</string>
+    <string name="reader_filter_empty_tags_list">Mund të ndiqni postime lidhur me një subjekt të caktuar, duke shtuar një temë</string>
     <string name="reader_filter_main_title">Në ndjekje</string>
     <string name="reader_filter_cta">Filtër</string>
     <string name="gutenberg_native_video_caption_s">Legjendë videoje. %s</string>
     <string name="gutenberg_native_edit_video">Përpunoni videon</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Prekeni dy herë që të përzgjidhet skemë</string>
     <string name="gutenberg_native_add_a_shortcode">Shtoni kod të shkurtër…</string>
     <string name="post_list_author">Autor postimi</string>
     <string name="fab_create_desc">Krijoni një postim</string>
-    <string name="stats_posting_activity_end_description">Keni dëgjuar krejt statistika për këtë periudhë.\n        Prekja sërish do të shkaktojë rinisje nga e para.</string>
-    <string name="stats_posting_activity_empty_description">S’ka statistika në këtë periudhë.</string>
-    <string name="stats_posting_activity_label_content_description">Veprimtari Postimi për %1$s</string>
-    <string name="stats_posting_activity_content_description">Ditët me %1$s parje për %2$s janë : %2$s %3$s.Prekeni për më tepër.</string>
-    <string name="stats_posting_activity_action">kaloni nëpër krejt statistikat për këtë periudhë</string>
     <string name="stats_box_type_very_high">shumë i lartë</string>
     <string name="stats_box_type_high">i lartë</string>
     <string name="stats_box_type_medium">mesatar</string>
     <string name="stats_box_type_low">i ulët</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
+    <string name="stats_posting_activity_label_content_description">Veprimtari Postimi për %1$s</string>
+    <string name="stats_posting_activity_content_description">Ditët me %1$s parje për %2$s janë : %2$s %3$s.Prekeni për më tepër.</string>
+    <string name="stats_posting_activity_empty_description">S’ka statistika në këtë periudhë.</string>
+    <string name="stats_posting_activity_end_description">Keni dëgjuar krejt statistika për këtë periudhë.\n        Prekja sërish do të shkaktojë rinisje nga e para.</string>
+    <string name="stats_posting_activity_action">kaloni nëpër krejt statistikat për këtë periudhë</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Lëvize Figurën Përpara</string>
-    <string name="gutenberg_native_move_image_backward">Lëvize Figurën Mbrapsht</string>
     <string name="gutenberg_native_gallery_caption_s">Përshkrim galerie. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Vlera e tanishme është %2$s</string>
     <string name="create_post_page_fab_tooltip">Krijoni një postim ose faqe</string>
+    <string name="gutenberg_native_replace_image">Zëvendëso figurën</string>
     <string name="content_description_person_building_website">Personi që po krijon sajt</string>
     <string name="post_signup_interstitial_not_right_now">Jo tani</string>
     <string name="post_signup_interstitial_subtitle">Çfarëdo që doni të krijoni ose ndani me të tjerët, do t’ju ndihmojmë ta bëni mu këtu.</string>
@@ -481,54 +855,46 @@ Language: sq_AL
     <string name="my_site_bottom_sheet_add_post">Postim blogu</string>
     <string name="my_site_bottom_sheet_title">Shtoni të ri</string>
     <string name="post_settings_publish">Botoje</string>
-    <string name="dialog_gutenberg_informative_description_v2">Bëmë përmirësime të mëdha te përpunuesi me blloqe dhe mendojmë se ia vlen të provohet! E kemi aktivizuar për postime dhe faqe të reja, por nëse doni të ktheheni te përpunuesi klasik, shkoni te \'Sajti Im\' > \'Rregullime Sajti\'.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Njëkohësoje tani</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Ky postim do të njëkohësohet menjëherë.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Gati për Njëkohësim?</string>
     <string name="new_site_creation_unavailable_domain">Kjo përkatësi s’është e lirë</string>
-    <string name="login_promo_viewpager_content_description">Hyrje</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">S’qemë në gjendje të hyjmë në sajtin tuaj. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
-    <string name="login_discovery_error_ssl">S’qemë në gjendje të hyjmë në sajtin tuaj, për shkak të një problemi me &lt;b>Dëshminë SSL&lt;/b>. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
-    <string name="login_discovery_error_http_auth">S’qemë në gjendje të hyjmë në sajtin tuaj, ngaqë lyp &lt;b>Mirëfilltësim HTTP&lt;/b>. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
-    <string name="login_discovery_error_xmlrpc">S’qemë në gjendje të hyjmë te &lt;b>kartela&lt;/b> në sajtin tuaj. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
-    <string name="login_site_credentials_magic_link_label">Thuajse mbërritëm! Na duhet vetëm të verifikojmë adresën tuaj email të lidhur me Jetpack-un &lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">Hyni me kredenciale sajti.</string>
+    <string name="login_discovery_error_ssl">S’qemë në gjendje të hyjmë në sajtin tuaj, për shkak të një problemi me &lt;b&gt;Dëshminë SSL&lt;/b&gt;. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
+    <string name="login_discovery_error_http_auth">S’qemë në gjendje të hyjmë në sajtin tuaj, ngaqë lyp &lt;b&gt;Mirëfilltësim HTTP&lt;/b&gt;. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
+    <string name="login_discovery_error_xmlrpc">S’qemë në gjendje të hyjmë te &lt;b&gt;kartela&lt;/b&gt; në sajtin tuaj. Do t’ju duhet të lidheni me strehuesin tuaj që ta zgjidhni këtë problem.</string>
+    <string name="login_site_credentials_magic_link_label">Thuajse mbërritëm! Na duhet vetëm të verifikojmë adresën tuaj email të lidhur me Jetpack-un &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Hyni me kredencialet tuaja për sajtin %1$s</string>
-    <string name="send_verification_email">Dërgo email verifikimi</string>
-    <string name="my_site_bottom_sheet_add_page">Faqe sajti</string>
     <string name="reader_following_display_name">Ndjekur prej jush</string>
-    <string name="reader_my_likes_display_name">Pëlqime</string>
-    <string name="reader_discover_display_name">Zbuloni</string>
-    <string name="reader_save_for_later_display_name">U ruajt</string>
-    <string name="reader_filter_tags_title">Tema</string>
-    <string name="reader_filter_sites_title">Sajte</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="suffix_1_000_000_000_000_000">%sQa</string>
-    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="my_site_bottom_sheet_add_page">Faqe sajti</string>
+    <string name="posts_cannot_be_started">S’i hapim dot postimet tani. Ju lutemi, riprovoni më vonë</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="posts_cannot_be_started">S’i hapim dot postimet tani. Ju lutemi, riprovoni më vonë</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="reader_filter_sites_title">Sajte</string>
+    <string name="reader_save_for_later_display_name">U ruajt</string>
+    <string name="reader_discover_display_name">Zbuloni</string>
+    <string name="reader_my_likes_display_name">Pëlqime</string>
     <string name="site_cannot_be_loaded">S’ngarkojmë dot të dhënat për sajtin tuaj tani. Ju lutemi, riprovoni më vonë</string>
+    <string name="reader_filter_tags_title">Tema</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="gutenberg_native_wordpress_media_library">Mediatekë WordPress</string>
+    <string name="gutenberg_native_unsupported">E pambuluar</string>
     <string name="gutenberg_native_ungroup">Hiqi Grupin</string>
     <string name="gutenberg_native_translate">Përktheni</string>
-    <string name="gutenberg_native_title">Titull:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Prekeni që të fshihet tastiera</string>
     <string name="gutenberg_native_tap_here_to_show_help">Prekeni këtu që të shfaqet ndihmë</string>
     <string name="gutenberg_native_take_a_video">Bëni një Video</string>
     <string name="gutenberg_native_take_a_photo_or_video">Bëni Foto ose Video</string>
     <string name="gutenberg_native_take_a_photo">Bëni një Foto</string>
     <string name="gutenberg_native_start_writing">Nisni të shkruani…</string>
-    <string name="gutenberg_native_size">Madhësi</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Shtojcë titulli anështylle</string>
     <string name="gutenberg_native_show_section">Shfaq ndarje</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Bllok %s. Ky bllok ka lëndë të pavlefshme</string>
     <string name="gutenberg_native_s_block_empty">Bllok %s. I zbrazët</string>
     <string name="gutenberg_native_cut_block">Bllok Prije</string>
-    <string name="gutenberg_native_reset_block">Rikthejeni Bllokun Te Parazgjedhjet</string>
-    <string name="gutenberg_native_remove_annotations">Hiqi shënimet</string>
     <string name="gutenberg_native_problem_opening_the_video">Problem me hapjen e videos</string>
     <string name="gutenberg_native_problem_displaying_block">Problem me shfaqjen e bllokut</string>
     <string name="gutenberg_native_post_title_s">Titull postimi. %s</string>
@@ -538,17 +904,12 @@ Language: sq_AL
     <string name="gutenberg_native_open_settings">Hap Rregullimet</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">S’ka aplikacion për ta trajtuar këtë kërkesë. Ju lutemi, instaloni një shfletues.</string>
     <string name="gutenberg_native_navigate_up">Ngjituni</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Paneli im para-publikim</string>
-    <string name="gutenberg_native_my_post_status_info">Të dhëna gjendjeje postimi</string>
-    <string name="gutenberg_native_my_post_publish_panel">Paneli im i botimit të postimeve</string>
-    <string name="gutenberg_native_my_document_setting_panel">Paneli Im i Rregullimeve Për Dokumente</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Kaloje bllokun nga rreshti %1$s sipër te rreshti %2$s</string>
     <string name="gutenberg_native_move_block_up">Shpjere bllokun më sipër</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Kaloje bllokun nga rreshti %1$s poshtë te rreshti %2$s</string>
     <string name="gutenberg_native_move_block_down">Shpjere bllokun më poshtë</string>
     <string name="gutenberg_native_image_caption_s">Titull figure. %s</string>
     <string name="gutenberg_native_hide_keyboard">Fshihe tastierën</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Ja lënda e panelit!</string>
     <string name="gutenberg_native_help_icon">Ikonë ndihme</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">S’u arrit të futej media.\nJu lutemi, prekeni për mundësi.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Që të zhbëhet ndryshimi i fundit, prekeni dyfish</string>
@@ -560,12 +921,9 @@ Language: sq_AL
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Që ta ngrini bllokun sipër, prekeni dyfish</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Që ta ulni bllokun poshtë, prekeni dyfish</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Që të përpunoni këtë vlerë, prekeni dyfish</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Që ta ndryshoni vlerën duke përdorur rrëshqitësin, prekeni dyfish</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Që të shtoni një bllok, prekeni dyfish</string>
     <string name="gutenberg_native_current_value_is_s">Vlera e tanishme është %s</string>
-    <string name="gutenberg_native_content">Lëndë…</string>
     <string name="gutenberg_native_choose_from_device">Zgjidhni nga pajisje</string>
-    <string name="gutenberg_native_annotations_sidebar">Anështyllë Shënimesh</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ndodhi një gabim i panjohur. Ju lutemi, riprovoni.</string>
     <string name="gutenberg_native_alt_text">Tekst Alternativ</string>
     <string name="gutenberg_native_add_video">SHTONI VIDEO</string>
@@ -573,21 +931,18 @@ Language: sq_AL
     <string name="gutenberg_native_add_image_or_video">SHTONI FIGURË OSE VIDEO</string>
     <string name="gutenberg_native_add_image">SHTONI FIGURË</string>
     <string name="gutenberg_native_add_block_here">SHTONI BLLOK KËTU</string>
-    <string name="gutenberg_native_add_annotation">Shtoni shënim</string>
-    <string name="gutenberg_native_add_a_description">Shtoni një përshkrim</string>
+    <string name="gutenberg_native_add_alt_text">Shtoni tekst alternativ</string>
     <string name="reader_empty_saved_posts_content_description">Prekni butonin “Shtoje te Postime të Ruajtur” që të ruhet një postim te lista juaj.</string>
     <string name="reader_acessibility_list_loaded">\"Lista është ngarkuar me %1$d zëra.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Njoftime</string>
-    <string name="master_switch_default_title_off">Off</string>
-    <string name="master_switch_default_title_on">On</string>
-    <string name="notifications_tab_dialog_master_off_message">Mbyllja e njoftimeve për këtë sajt do të çaktivizojë për këtë sajt shfaqjen e tyre te skeda njoftime. Mund të përimtoni cilin lloj njoftimesh shihni pasi të keni mbyllur Njoftimet për këtë sajt.</string>
-    <string name="notifications_tab_dialog_master_off_title">Që të shihni njoftime te skeda e njoftimeve për këtë sajt, hapni Njoftime për këtë sajt.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Aktivizoni shfaqje njoftimesh te skedë njoftimesh për këtë sajt</string>
-    <string name="notifications_tab_dialog_master_hint_on">Çaktivizoni shfaqje njoftimesh te skedë njoftimesh për këtë sajt</string>
-    <string name="notifications_tab_dialog_master_status_off">Njoftime për këtë sajt</string>
-    <string name="notifications_tab_dialog_master_status_on">Njoftime për këtë sajt</string>
-    <string name="dialog_gutenberg_informative_description_page">Për faqe të reja tanimë po përdorni përpunuesin me blloqe, bukur! Nëse do të donit ta ndryshonit me përpunuesin klasik, shkoni te ‘Sajti Im’ > ‘Rregullime Sajti’.</string>
-    <string name="dialog_gutenberg_informative_description_post">Për postime të reja tanimë po përdorni përpunuesin me blloqe, bukur! Nëse do të donit ta ndryshonit me përpunuesin klasik, shkoni te ‘Sajti Im’ > ‘Rregullime Sajti’.</string>
+    <string name="main_switch_default_title_off">Off</string>
+    <string name="main_switch_default_title_on">On</string>
+    <string name="notifications_tab_dialog_main_off_message">Mbyllja e njoftimeve për këtë sajt do të çaktivizojë për këtë sajt shfaqjen e tyre te skeda njoftime. Mund të përimtoni cilin lloj njoftimesh shihni pasi të keni mbyllur Njoftimet për këtë sajt.</string>
+    <string name="notifications_tab_dialog_main_off_title">Që të shihni njoftime te skeda e njoftimeve për këtë sajt, hapni Njoftime për këtë sajt.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Aktivizoni shfaqje njoftimesh te skedë njoftimesh për këtë sajt</string>
+    <string name="notifications_tab_dialog_main_hint_on">Çaktivizoni shfaqje njoftimesh te skedë njoftimesh për këtë sajt</string>
+    <string name="notifications_tab_dialog_main_status_off">Njoftime për këtë sajt</string>
+    <string name="notifications_tab_dialog_main_status_on">Njoftime për këtë sajt</string>
     <string name="pick_media">Shtoni figurë ose video</string>
     <string name="error_post_not_submitted_retrying">S’e parashtruam dot për shqyrtim këtë postim, por do të riprovojmë më vonë. </string>
     <string name="error_post_not_scheduled_retrying">S’e vumë dot në plan këtë postim, por do të riprovojmë më vonë.</string>
@@ -680,10 +1035,7 @@ Language: sq_AL
     <string name="post_settings_add_to_calendar">Shtoje në kalendar</string>
     <string name="post_settings_notification">Njoftim</string>
     <string name="post_settings_time_and_date">Data dhe Koha</string>
-    <string name="login_need_help_finding_connected_email">Ju duhet ndihmë për të gjetur email-in me të cilin e lidhët?</string>
-    <string name="enter_wordpress_site">Sajti te kjo adresë s’është sajt WordPress. Që të lidhemi me të, sajti duhet të ketë të instaluar WordPress-in.</string>
     <string name="login_invalid_site_url">Ju lutemi, jepni një adresë të plotë sajti, bie fjala, example.com.</string>
-    <string name="enter_email_for_site">Që të lidheni me %1$s, bëni hyrjen te llogaria juaj WordPress.com</string>
     <string name="stats_post_views_label">Pamje</string>
     <string name="stats_post_label">Postim</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
@@ -695,6 +1047,7 @@ Language: sq_AL
     <string name="stats_overview_content_description">%1$s %2$s për periudhën: %3$s, ndryshim nga periudha e mëparshme - %4$s</string>
     <string name="stats_loading_card">Po ngarkohen të dhënat e kartës së përzgjedhur</string>
     <string name="site_settings_editor">Përpunues</string>
+    <string name="enter_email_for_site">Që të lidheni me %1$s, bëni hyrjen te llogaria juaj WordPress.com</string>
     <string name="description_expand">Zgjeroje</string>
     <string name="description_collapse">Tkurre</string>
     <string name="my_site_verify_your_email_without_email">Kontrolloni adresën tuaj email - udhëzimet u dërguan te email-i juaj</string>
@@ -717,7 +1070,7 @@ Language: sq_AL
     <string name="stats_widget_today_insights_name">Sot</string>
     <string name="stats_widget_all_time_insights_name">Për krejt kohën</string>
     <string name="stats_widget_weekly_views_name">Parje këtë javë</string>
-    <string name="stats_widget_log_in_message">Ju lutemi, që të shtoni një &lt;em>widget&lt;/em>, bëni hyrjen te aplikacioni WordPress.</string>
+    <string name="stats_widget_log_in_message">Ju lutemi, që të shtoni një &lt;em&gt;widget&lt;/em&gt;, bëni hyrjen te aplikacioni WordPress.</string>
     <string name="stats_widget_error_no_network">S’ka rrjet gati</string>
     <string name="stats_widget_error_no_data">S’u ngarkuan dot të dhëna</string>
     <string name="stats_widget_select_type">Lloj</string>
@@ -733,12 +1086,12 @@ Language: sq_AL
     <string name="stats_widget_add">Shtoni widget</string>
     <string name="plugin_fetching_error_after_at">Rifreskimi i hollësive të shtojcës do më shumë kohë se zakonisht. Ju lutemi, rikontrolloni më vonë.</string>
     <string name="plugin_install_site_ineligible_default_error">Nëse sapo e regjistruat një emër përkatësie, Ju lutemi, pritni deri sa të përfundojmë ujdisjen e saj dhe riprovoni.\n\nNë të kundërt, duket si diç shkoi ters dhe veçoria e shtojcës mund të mos jetë e përdorshme në këtë sajt.</string>
-    <string name="domain_contact_information_state_not_available_hint">Gjendje (S’dihet)</string>
     <string name="domain_registration_privacy_protection_tos">Duke regjistruar këtë përkatësi, ju pajtoheni me %1$stermat dhe kushtet tona%2$s</string>
     <string name="error_network_connection">Kontrolloni lidhjen tuaj me rrjetin dhe riprovoni.</string>
     <string name="error_browser_no_network">S’arrihet të ngarkohet kjo faqe hëpërhë.</string>
     <string name="error_disabled_apis">S’u sollën dot rregullimet: Disa API s’janë gati për këtë ndërthurje ID aplikacioni OAuth + llogari.</string>
     <string name="jetpack_connection_terms_and_conditions">Duke rregulluar Jetpack-un, ju pajtoheni me %1$stermat dhe kushtet tona%2$s</string>
+    <string name="domain_contact_information_state_not_available_hint">Gjendje (S’dihet)</string>
     <string name="site_settings_disconnected_toast">Pa lidhje. Përpunimi është i çaktivizuar.</string>
     <string name="site_settings_update_password_message">Që të rilidhni aplikacionin te sajti juaj i vetëstrehuar, jepni këtu fjalëkalimin e ri të sajtit.</string>
     <string name="site_settings_password_updated">Fjalëkalimi u përditësua</string>
@@ -747,7 +1100,7 @@ Language: sq_AL
     <string name="domain_registration_state_picker_dialog_title">Përzgjidhni Shtet</string>
     <string name="domain_registration_country_picker_dialog_title">Përzgjidhni Vend</string>
     <string name="domain_registration_result_continue_button">vazhdo</string>
-    <string name="domain_registration_result_description">po ujdiset përkatësia juaj e re &lt;b>%s&lt;/b>. Sajti juaj po bën\n     rrotullime në ajër nga gëzimi!</string>
+    <string name="domain_registration_result_description">po ujdiset përkatësia juaj e re &lt;b&gt;%s&lt;/b&gt;. Sajti juaj po bën\n     rrotullime në ajër nga gëzimi!</string>
     <string name="domain_registration_result_title">Përgëzime</string>
     <string name="domain_contact_information_register_domain_button">Regjistroni Përkatësie</string>
     <string name="domain_contact_information_postal_code_hint">Kod postar</string>
@@ -764,40 +1117,40 @@ Language: sq_AL
     <string name="domain_privacy_option_off_title">Regjistroje publikisht</string>
     <string name="domain_privacy_option_on_title">Regjistroje publikisht me Mbrojtje Privatësie</string>
     <string name="domain_registration_privacy_protection_description">Të zotëve të përkatësive u duhet të ndajnë me të tjerët të dhëna kontakti, në një bazë publike të dhënash të krejt përkatësive.\n        Me Mbrojtje Privatësie, ne botojmë të dhënat tona, në vend se tuajat, dhe ju përcjellim privatisht çfarëdo komunikimi.</string>
-    <string name="domain_registration_privacy_protection_title">Mbrojtje Privatësie</string>
     <string name="domain_registration_contact_form_input_error">Ju lutemi, jepni një %s të vlefshëm</string>
+    <string name="domain_registration_privacy_protection_title">Mbrojtje Privatësie</string>
     <string name="domains_suggestions_choose_domain">Zgjidhni Përkatësi</string>
     <string name="stats_management_new">E re</string>
     <string name="stats_management_dismiss_insights_news_card">Hidhe tej</string>
     <string name="stats_management_try_it_now">Provojeni që tani</string>
-    <string name="stats_management_news_card_message">Zgjidhni ç’statistika të shihen, dhe përqendrohuni në të dhënat që keni më për zemër. Që të përshtatni statistikat, prekni %1$s në fund të faqes Prirje.</string>
     <string name="stats_manage_your_stats">Administroni Statistikat Tuaja</string>
+    <string name="stats_management_news_card_message">Zgjidhni ç’statistika të shihen, dhe përqendrohuni në të dhënat që keni më për zemër. Që të përshtatni statistikat, prekni %1$s në fund të faqes Prirje.</string>
     <string name="history_fetching_revisions">Po sillen rishikimet…</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">S’u arrit të futej media.\nJu lutemi, prekeni që të riprovohet.</string>
     <string name="editor_uploading_draft">Skica juaj po ngarkohet</string>
     <string name="post_uploading_draft">Po ngarkohet skicë</string>
     <string name="post_list_tab_drafts">Skica</string>
     <string name="error_restoring_post">Ndodhi një gabim gjatë rikthimit të postimit</string>
-    <string name="backdated_for">Vënë në plan për: %s</string>
     <string name="stats_insights_management_title">Shihni vetëm statistikat më me peshë. Shtoni dhe sistemoni më poshtë tendencat tuaja.</string>
     <string name="stats_insights_social">Shoqërore</string>
     <string name="stats_insights_annual_site_stats">Statistika Vjetore Sajti</string>
     <string name="stats_view_follower_totals">Ndjekës Gjithsej</string>
-    <string name="domain_suggestions_fetch_error">S’u ngarkuan dot sugjerime përkatësish</string>
     <string name="domain_suggestions_search_hint">Për më tepër ide, shtypni një fjalëkyç</string>
     <string name="domains_suggestions_empty_list">S’u gjetën sugjerime</string>
     <string name="register_domain">Regjistroni Përkatësi</string>
     <string name="jetpack_installed_message">Tani që Jetpack-u është instaluar, na duhet vetëm t’ju bëjmë gati. Kjo do të hajë vetëm një minutë.</string>
+    <string name="domain_suggestions_fetch_error">S’u ngarkuan dot sugjerime përkatësish</string>
+    <string name="backdated_for">Vënë në plan për: %s</string>
     <string name="stats_menu_remove">Hiqe prej tendencave</string>
-    <string name="stats_menu_move_down">Ule poshtë</string>
     <string name="stats_menu_move_up">Ngjite sipër</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Ndryshime vendore</string>
     <string name="stats_item_settings">Rregullime zëri statistikash</string>
     <string name="post_moving_to_draft">Postimi po shpihet te skicat</string>
     <string name="post_restoring">Postimi po rikthehet</string>
     <string name="post_restored">Postimi u rikthye</string>
     <string name="post_trashing">Postimi po shpihet te hedhurinat</string>
+    <string name="stats_menu_move_down">Ule poshtë</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Shpënia te hedhurinat e këtij postimi do të hedhë tej ndryshimet e paruajtura, jeni i sigurt se doni të vazhdohet?</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Ndryshime vendore</string>
     <string name="button_move_to_draft">Kaloje te Skica</string>
     <string name="post_list_toggle_item_layout_list_view">Kalo te pamja listë</string>
     <string name="post_list_toggle_item_layout_cards_view">Kalo te pamja karta</string>
@@ -807,32 +1160,32 @@ Language: sq_AL
     <string name="posts_published_empty">S’keni botuar ende ndonjë postim</string>
     <string name="notification_wpcom_username_needed">Ju lutemi, bëni hyrjen me emrin tuaj të përdoruesit dhe fjalëkalimin.</string>
     <string name="error_user_username_instead_of_email">Ju lutemi, hyni duke përdorur emrin tuaj të përdoruesit WordPress.com, në vend se adresën tuaj email.</string>
-    <string name="stats_insights_average_words">Mesatare fjalësh/postim</string>
     <string name="stats_insights_total_words">Fjalë gjithsej</string>
-    <string name="stats_insights_average_likes">Mesatare pëlqimesh/postim</string>
     <string name="stats_insights_total_likes">Pëlqime gjithsej</string>
-    <string name="stats_insights_average_comments">Mesatare komentesh/postim</string>
     <string name="stats_insights_total_comments">Komente gjithsej</string>
     <string name="stats_insights_posts">Postime</string>
     <string name="stats_insights_year">Vit</string>
     <string name="stats_insights_this_year_site_stats">Këtë Vit</string>
+    <string name="stats_insights_average_words">Mesatare fjalësh/postim</string>
+    <string name="stats_insights_average_likes">Mesatare pëlqimesh/postim</string>
+    <string name="stats_insights_average_comments">Mesatare komentesh/postim</string>
     <string name="no_site_error">Sajti në këtë adresë s’është sajt WordPress. Që të mund të lidhemi me të, sajti duhet të përdorë WordPress-in.</string>
     <string name="plugin_check_domain_credit_error">S’u arrit të kontrollohet kredit përkatësie gjendje</string>
     <string name="plugin_check_domain_credits_progress_dialog_message">Po kontrollohet kredit përkatësie</string>
-    <string name="plugin_install_custom_domain_required_dialog_register_btn">Regjistroje përkatësinë</string>
     <string name="plugin_install_custom_domain_required_dialog_message">Që të instaloni shtojca, lypset të keni një përkatësi vetjake përshoqëruar sajtit tuaj.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Instaloni shtojcë</string>
-    <string name="new_site_creation_preview_subtitle">Do të jeni në gjendje të përshtatni më vonë pamjen dhe ndjesitë që jep sajti juaj</string>
+    <string name="plugin_install_custom_domain_required_dialog_register_btn">Regjistroje përkatësinë</string>
     <string name="publish_on">Botoje më: %s</string>
     <string name="schedule_for">Planifikoje për: %s</string>
     <string name="published_on">Botuar më: %s</string>
     <string name="scheduled_for">Planifikuar për: %s</string>
     <string name="stats_detail_recent_weeks">Javë Së Fundi</string>
-    <string name="stats_detail_average_views_per_day">Parje Mes. Për Ditë</string>
     <string name="stats_months_and_years_views_label">Parje</string>
     <string name="stats_months_and_years_period_label">Periudhë</string>
     <string name="stats_detail_months_and_years">Muaj dhe Vite</string>
     <string name="stats_insights_load_more">Ngarko më tepër</string>
+    <string name="new_site_creation_preview_subtitle">Do të jeni në gjendje të përshtatni më vonë pamjen dhe ndjesitë që jep sajti juaj</string>
+    <string name="stats_detail_average_views_per_day">Parje Mes. Për Ditë</string>
     <string name="stats_insights_today_stats">Sot</string>
     <string name="stats_insights_best_hour">Ora Më e Mirë</string>
     <string name="stats_insights_best_day">Dita Më e Mirë</string>
@@ -854,25 +1207,21 @@ Language: sq_AL
     <string name="plans_loading_error_no_plans_subtitle">S’i ngarkojmë dot Planet tani. Ju lutemi, riprovoni më vonë.</string>
     <string name="plans_loading_error_no_plans_title">S’arrihet të ngarkohen Planet</string>
     <string name="plans_loading_error_network_title">S\'ka lidhje</string>
-    <string name="menu_switch_to_gutenberg_editor">Kaloni nën përpunuesin me blloqe</string>
-    <string name="menu_switch_to_aztec_editor">Kaloni nën përpunuesin klasik</string>
     <string name="stats_loading_block_error">Pati një problem në ngarkimin e të dhënave tuaja, rifreskoni faqen dhe riprovoni.</string>
     <string name="stats_loading_error">S’u ngarkuan të dhëna</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Përpunoni postime dhe faqe të reja me përpunuesin me blloqe</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Përdorni Përpunuesin Me Blloqe</string>
-    <string name="dialog_gutenberg_informative_title">Përpunuesi Pamor i Aktivizuar</string>
+    <string name="menu_switch_to_gutenberg_editor">Kaloni nën përpunuesin me blloqe</string>
     <string name="exit">dalje</string>
     <string name="quick_start_sites_type_subtitle">%1$d e %2$d e plotësuar</string>
-    <string name="quick_start_sites_type_grow">Shtoni Publikun Tuaj</string>
-    <string name="quick_start_sites_type_customize">Përshtatni Sajtin Tuaj</string>
     <string name="quick_start_sites">Hapat Pasues</string>
     <string name="quick_start_complete_tasks_header">Të plotësuar (%d)</string>
     <string name="quick_start_dialog_view_site_message">Kënaquni me produktin tuaj të përfunduar!</string>
     <string name="quick_start_dialog_upload_icon_title">Ngarkoni një ikonë sajti</string>
     <string name="quick_start_dialog_upload_icon_message">Vizitorët tuaj do ta shohin në shfletuesin e tyre ikonën tuaj. Shtoni një ikonë vetjake, për një pamje të rafinuar, profesionale.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Prekni %1$s Plan %2$s që të shihni planin tuaj të tanishëm dhe të tjerë plane të mundshëm</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Prekni %1$s Shtoni Faqe %2$s që të krijoni një faqe të re.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Prekni %1$s Faqe Sajti %2$s që të vazhdohet.</string>
+    <string name="quick_start_sites_type_grow">Shtoni publikun tuaj</string>
+    <string name="quick_start_sites_type_customize">Përshtatni sajtin tuaj</string>
     <string name="quick_start_dialog_check_stats_message_short">Prekni %1$s Statistika %2$s që të shihni se si po ecën sajti juaj.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Prekni %1$s Ikona e Sajtit Tuaj %2$s që të ngarkoni një të re</string>
     <string name="quick_start_dialog_publish_post_message">Hartoni dhe botoni postimin tuaj të parë fare.</string>
@@ -883,13 +1232,8 @@ Language: sq_AL
     <string name="quick_start_dialog_explore_plans_message">Mësoni rreth mjetesh marketingu dhe SEO në planet tona me pagesë.</string>
     <string name="quick_start_dialog_enable_sharing_title">Aktivizo ndarje postimesh me të tjerët</string>
     <string name="quick_start_dialog_enable_sharing_message">Kryeni ndarje të vetvetishme me të tjerët në rrjetet tuaja shoqërore të postimeve të reja.</string>
-    <string name="quick_start_dialog_customize_site_message">Ujdisni shkronja, shtoni figura, etj.</string>
-    <string name="quick_start_dialog_create_page_title">Krijoni një faqe të re</string>
-    <string name="quick_start_dialog_create_page_message">Shtoni një faqe për gjëra kyçe — një faqe “Mbi” është një fillim i mirë.</string>
     <string name="quick_start_dialog_check_stats_title">Ndiqni statistikat e sajtit tuaj</string>
     <string name="quick_start_dialog_check_stats_message">Mbajeni të përditësuar funksionimin e sajtit tuaj.</string>
-    <string name="quick_start_dialog_browse_themes_title">Shfletoni tema</string>
-    <string name="quick_start_dialog_browse_themes_message">Eksploroni dhjetëra mundësi skemash dhe gjeni atë që ju shkon për shtat.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Heqja e Hapave Pasues do të fshehë krejt turet në këtë sajt. Ky veprim s’mund të zhbëhet.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Hiqi Hapat Pasues</string>
     <string name="quick_start_remove_next_steps_menu_title">Hiqe këtë</string>
@@ -913,15 +1257,11 @@ Language: sq_AL
     <string name="notification_new_site_creation_failed">Pati një problem</string>
     <string name="notification_new_site_creation_title">Krijoni Sajt</string>
     <string name="new_site_creation_create_site_button">Krijoje Sajtin</string>
-    <string name="new_site_creation_search_domain_input_hint">Kërkoni te Përkatësitë</string>
     <string name="new_site_creation_domain_header_subtitle">Ky është vendi ku do t’ju gjejnë njerëzit në internet.</string>
-    <string name="new_site_creation_domain_header_title">Zgjidhni emër përkatësie për sajtin tuaj</string>
     <string name="new_site_creation_empty_domain_list_message">S’ka adresa me përputhje me kërkimin tuaj</string>
     <string name="site_creation_error_generic_subtitle">Gabim gjatë komunikimit me shërbyesin, ju lutemi, riprovoni</string>
     <string name="site_creation_error_generic_title">Pati një problem</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Pati një problem</string>
-    <string name="site_creation_segments_subtitle">Kjo na ndihmon të bëjmë rekomandime. Por s’jeni kurrë të kyçur në to - krejt sajtet evoluojnë!</string>
-    <string name="site_creation_segments_title">Tregonani se ç’lloj sajti do të donit të bënit</string>
     <string name="new_site_creation_preview_title">Sajti juaj u krijua!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d nga %2$d</string>
     <string name="new_site_creation_screen_title_general">Krijoje Sajtin</string>
@@ -936,9 +1276,9 @@ Language: sq_AL
     <string name="toast_conflict_updating_post">Përditësim postimi</string>
     <string name="dialog_confirm_load_remote_post_discard_web">Hidh tej versionin Web</string>
     <string name="dialog_confirm_load_remote_post_discard_local">Hidh tej versionin Vendor</string>
-    <string name="dialog_confirm_load_remote_post_body_2">Vendor\nRuajtur në %s\n\nWeb\nRuajtur në %s\n</string>
     <string name="dialog_confirm_load_remote_post_body">Ky postim ka dy versione që janë në kundërshti. Përzgjidhni versionin që do të donit të hidhej tej.\n\n</string>
     <string name="dialog_confirm_load_remote_post_title">Zgjidheni përplasjen e njëkohësimit</string>
+    <string name="dialog_confirm_load_remote_post_body_2">Vendor\nRuajtur në %s\n\nWeb\nRuajtur në %s\n</string>
     <string name="stats_no_data_for_period">S’ka të dhëna për këtë periudhë</string>
     <string name="preference_strip_image_location">Hiqe vendndodhjen prej mediash</string>
     <string name="stats_cannot_be_started">S’i hapim dot statistikat tani. Ju lutemi, riprovoni më vonë</string>
@@ -974,9 +1314,9 @@ Language: sq_AL
     <string name="stats_insights_share_post">Ndajeni postimin me të tjerët</string>
     <string name="stats_insights_create_post">Krijoje postimin</string>
     <string name="stats_insights_latest_post_message">U bënë %1$s qëkur qe botuar %2$s. Ja se si ka ecur postimi deri tani:</string>
+    <string name="stats_insights_tags_and_categories">Etiketa dhe Kategori</string>
     <string name="stats_insights_latest_post_with_no_engagement">U bënë %1$s qëkur u botua %2$s. Vëreni punën në lëvizje dhe shtoni parjen e postimit tuaj duke e ndarë atë me të tjerët:</string>
     <string name="stats_insights_latest_post_empty">S’keni botuar ende ndonjë postim. Sapo të filloni të botoni, këtu do të shfaqet përmbledhja e postimit tuaj më të ri:</string>
-    <string name="stats_insights_tags_and_categories">Etiketa dhe Kategori</string>
     <string name="stats_insights_all_time_stats">Për Krejt Kohën</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">Ndjekës</string>
@@ -1027,8 +1367,8 @@ Language: sq_AL
     <string name="image_size_medium_label">Mesatare</string>
     <string name="image_size_thumbnail_label">Miniaturë</string>
     <string name="menu_history">Historik</string>
-    <string name="pages_open_page_error">Faqja e përzgjedhur s’kapet dot</string>
     <string name="pages_pending">Në pritje të shqyrtimit</string>
+    <string name="pages_open_page_error">Faqja e përzgjedhur s’kapet dot</string>
     <string name="pages_empty_trashed">S’keni faqe të shpëna te hedhurinat</string>
     <string name="pages_empty_scheduled">S’keni faqe të planifikuara për botim</string>
     <string name="pages_empty_drafts">S’keni ndonjë faqe skicë</string>
@@ -1067,42 +1407,36 @@ Language: sq_AL
     <string name="quick_start_dialog_view_site_message_short">Prekni %1$s Shihni Sajtin %2$s që të shihni si do të dukej sajti juaj</string>
     <string name="quick_start_dialog_share_site_title">Ndajeni sajtin tuaj me të tjerë</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">Prekni %1$s Ndarje Me të Tjerë %2$s që të vazhdohet</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_connections">Prekni %1$s Lidhje %2$s që të shtoni llogari tuajat nga media shoqërore</string>
     <string name="quick_start_dialog_share_site_message">Lidhni llogaritë tuaja nga media shoqërore — sajti juaj do të ndajë vetvetiu me të tjerët postimet e reja.</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_connections">Prekni %1$s Lidhje %2$s që të shtoni llogari tuajat nga media shoqërore</string>
     <string name="quick_start_dialog_publish_post_title">Botoni një postim</string>
     <string name="quick_start_dialog_publish_post_message_short">Prekni %1$s Krijo Postim %2$s që të krijohet një postim i ri</string>
     <string name="quick_start_dialog_need_help_title">Doni pakëz ndihmë për t’ia filluar?</string>
     <string name="quick_start_dialog_need_help_button_positive">Pranoj</string>
     <string name="quick_start_dialog_need_help_button_neutral">Kurrë</string>
-    <string name="quick_start_dialog_need_help_button_negative">Jo, Faleminderit</string>
     <string name="quick_start_dialog_follow_sites_title">Ndiqni sajte të tjerë</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Prekni %1$s Kërkoni %2$s që të shihni për sajte me interesa të ngjashëm</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Prekni %1$s Lexues %2$s që të vazhdohet</string>
+    <string name="quick_start_dialog_need_help_button_negative">Jo, Faleminderit</string>
     <string name="quick_start_dialog_follow_sites_message">Gjeni sajte që ju frymëzojnë, dhe ndiqini që të merrni të rejat kur botojnë të tilla.</string>
-    <string name="quick_start_dialog_customize_site_title">Përshtatni sajtin tuaj</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Prekni %1$s Tema %2$s që të vazhdohet</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Prekni %1$s Përshtateni %2$s që të nisni personalizimin e sajtit tuaj</string>
-    <string name="quick_start_dialog_choose_theme_title">Zgjidhni një temë</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Prekni %1$s Tema %2$s që të zbuloni tema të reja</string>
-    <string name="quick_start_dialog_choose_theme_message">Shfletoni krejt temat tuaja që të gjeni përputhjen e përsosur.</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Prekni %1$s Kërkoni %2$s që të shihni për sajte me tema të ngjashme</string>
     <string name="quick_start_button_positive">Jepi</string>
     <string name="quick_start_button_negative_short">Anuloje</string>
     <string name="quick_start_button_negative">Jo tani</string>
-    <string name="content_description_more">Më tepër</string>
     <string name="my_site_create_new_site_title">S’keni ende ndonjë sajt</string>
+    <string name="content_description_more">Më tepër</string>
     <string name="reader_empty_followed_tags_title">Pa tema të ndjekura</string>
     <string name="reader_empty_followed_tags_subtitle">Shtoni këtu tema që të gjeni postime rreth temave tuaja të parapëlqyera</string>
     <string name="login_to_to_connect_jetpack">Bëni hyrjen te llogaria WordPress.com që përdorët për t’ia përshoqëruar Jetpack-ut.</string>
     <string name="install_jetpack_retry">Riprovoni</string>
-    <string name="install_jetpack_continue">Ujdise</string>
-    <string name="jetpack_installation_problem_message">Jetpack-u s’u instalua dot këtë herë.</string>
     <string name="jetpack_installation_problem">Pati një problem</string>
     <string name="jetpack_installed">Jetpack-u u instalua</string>
-    <string name="installing_jetpack_message">Po instalohet Jetpack-u në sajtin tuaj. Kjo mund të dojë ca minuta të plotësohet.</string>
-    <string name="installing_jetpack">Instalim i Jetpack-ut</string>
-    <string name="install_jetpack_message">Kredencialet e hyrjes në sajtin tuaj nuk do të depozitohen, dhe përdoren vetëm për qëllimin e instalimit të Jetpack-ut.</string>
     <string name="install_jetpack">Instaloni Jetpack-un</string>
     <string name="jetpack">Jetpack</string>
+    <string name="install_jetpack_continue">Ujdise</string>
+    <string name="jetpack_installation_problem_message">Jetpack-u s’u instalua dot këtë herë.</string>
+    <string name="installing_jetpack_message">Po instalohet Jetpack-u në sajtin tuaj. Kjo mund të dojë ca minuta të plotësohet.</string>
+    <string name="install_jetpack_message">Kredencialet e hyrjes në sajtin tuaj nuk do të depozitohen, dhe përdoren vetëm për qëllimin e instalimit të Jetpack-ut.</string>
+    <string name="installing_jetpack">Instalim i Jetpack-ut</string>
     <string name="stats_jetpack_connection_faq">PBR për Jetpack</string>
     <string name="stats_jetpack_connection_setup_info">Që të përdorni Statistikat te sajti juaj WordPress, do t’ju duhet të instaloni shtojcën Jetpack.</string>
     <string name="themes_empty_list">Kërkimi juaj s’ka përputhje me ndonjë temë</string>
@@ -1120,14 +1454,14 @@ Language: sq_AL
     <string name="people_empty_list_filtered_users">Ende pa përdorues</string>
     <string name="reader_empty_posts_liked_description">Postimet që pëlqeni do të shfaqen këtu</string>
     <string name="reader_empty_posts_liked_title">Ende pa pëlqyer gjë</string>
-    <string name="reader_empty_followed_blogs_button_followed">Shko te vijuesja</string>
     <string name="reader_empty_followed_blogs_button_discover">Zbuloni sajte</string>
     <string name="reader_empty_followed_blogs_title">Pa sajte të ndjekur</string>
+    <string name="reader_empty_followed_blogs_button_followed">Shko te vijuesja</string>
     <string name="notifications_empty_likes">Ende pa pëlqime</string>
     <string name="notifications_empty_followers">Ende pa ndjekës</string>
     <string name="activity_log_limited_content_on_free_plan">Meqë jeni nën një plan falas, do të shihni akte të kufizuara në veprimtarinë tuaj.</string>
-    <string name="activity_log_empty_subtitle">Kur bëni ndryshime te sajti juaj, këtu do të jeni në gjendje të shihni historikun e veprimtarisë tuaj</string>
     <string name="activity_log_empty_title">Ende pa veprimtari</string>
+    <string name="activity_log_empty_subtitle">Kur bëni ndryshime te sajti juaj, këtu do të jeni në gjendje të shihni historikun e veprimtarisë tuaj</string>
     <string name="posts_empty_list_button">Krijoni një postim</string>
     <string name="pages_empty_list_button">Krijoni një faqe</string>
     <string name="media_empty_upload_media">Ngarkoni media</string>
@@ -1138,7 +1472,6 @@ Language: sq_AL
     <string name="featured_image_desc">figurë e zgjedhur</string>
     <string name="button_discard">Hidhe Tej</string>
     <string name="reader_avatar_desc">foto profili</string>
-    <string name="notification_channel_transient_title">Tranzient</string>
     <string name="support_identity_input_dialog_email_label">Email</string>
     <string name="support_identity_input_dialog_enter_email">Ju lutemi, jepni adresën tuaj email</string>
     <string name="support_identity_input_dialog_enter_email_and_name">Që të vazhdohet, ju lutemi, jepni adresën tuaj email dhe emrin</string>
@@ -1148,15 +1481,14 @@ Language: sq_AL
     <string name="support_contact_email">Email kontaktesh</string>
     <string name="application_log_button">Regjistër aplikacioni</string>
     <string name="my_tickets">Çështjet e Mia</string>
-    <string name="activity_log_rewind_dialog_message">Jeni i sigurt se doni të rikthehet sajti juaj në %1$s më %2$s? Kjo të sjellë heqjen e krejt lëndës së krijuar apo ndryshuar dhe mundësive të ndryshuara që nga ajo datë.</string>
-    <string name="activity_log_rewind_site">Riktheni Sajtin Në Një Datë të Dikurshme</string>
     <string name="activity_log_currently_restoring_message_no_dates">Rikthim në ecuri e sipër</string>
     <string name="activity_log_currently_restoring_message">Po rikthehet te %1$s %2$s</string>
+    <string name="notification_channel_transient_title">Tranzient</string>
     <string name="activity_log_currently_restoring_title">Sajti juaj po rikthehet</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Sajti juaj u rikthye me sukses</string>
+    <string name="activity_log_button">Buton veprimesh Regjistri Veprimtarie</string>
     <string name="activity_log_rewind_finished_snackbar_message">Sajti juaj u rikthye me sukses\nU rikthye te %1$s %2$s</string>
     <string name="activity_log_rewind_started_snackbar_message">Sajti juaj po rikthehet\nRikthim te %1$s %2$s</string>
-    <string name="activity_log_button">Buton veprimesh Regjistri Veprimtarie</string>
     <string name="plugin_auto_managed">E vetëadministruar</string>
     <string name="reader_save_posts_locally_dialog_message">Ruajeni këtë postim, dhe rikthejuni leximit kur të doni. Do ta keni vetëm në këtë pajisje — postimet e ruajtur nuk njëkohësohen në pajisje të tjera.</string>
     <string name="reader_save_posts_locally_dialog_title">Ruani Postime për Më Vonë</string>
@@ -1165,20 +1497,16 @@ Language: sq_AL
     <string name="comment_read_source_post">Lexoni postimin burim</string>
     <string name="sites">Sajte</string>
     <string name="signup_magic_link_title">Lidhja magjike u dërgua</string>
-    <string name="signup_email_screen_title">Regjistrim me email</string>
     <string name="verification_2fa_screen_title">Verifikim kodi</string>
     <string name="selfhosted_site_login_title">Kredenciale hyrjeje</string>
     <string name="magic_link_sent_login_title">Lidhja magjike u dërgua</string>
     <string name="magic_link_login_title">Hyrje me lidhje magjike</string>
     <string name="site_address_login_title">Hyrje me adresë sajti</string>
     <string name="email_address_login_title">Hyrje me adresë email</string>
-    <string name="alternatively">Ndryshe:</string>
     <string name="reader_empty_saved_posts_description">Prekeni %s që të ruhet një postim te lista juaj.</string>
     <string name="reader_empty_saved_posts_title">Ende pa postime të ruajtur!</string>
     <string name="reader_bookmark_snack_title">Postimi u ruajt</string>
     <string name="reader_bookmark_snack_btn">Shihini Krejt</string>
-    <string name="reader_btn_bookmarked">U ruajt</string>
-    <string name="reader_btn_bookmark">Ruaje</string>
     <string name="reader_remove_bookmark">U hoq nga postime të ruajtur</string>
     <string name="reader_add_bookmark">Shtoje te postime të ruajtura</string>
     <string name="reader_save_for_later_title">Postime të ruajtur</string>
@@ -1198,11 +1526,9 @@ Language: sq_AL
     <string name="reader_btn_notifications_on">Aktivizoni njoftime sajti</string>
     <string name="reader_btn_notifications_off">Çaktivizoni njoftime sajti</string>
     <string name="activity_log_jetpack_icon">Ikonë Jetpack</string>
-    <string name="rewind">Rikthim</string>
     <string name="activity_log_event">Veprimtari</string>
     <string name="activity_log_icon">Ikonë veprimtarie</string>
     <string name="activity_log">Regjistër Veprimtarish</string>
-    <string name="activity">Veprimtari</string>
     <string name="privacy_policy_read">Lexoni rregullat e privatësisë</string>
     <string name="third_party_policy_learn_more_caption">Përdorim mjete të tjera gjurmimi, përfshi disa të tillë nga palë të treta. Lexoni rreth tyre dhe se si t’i mbani nën kontroll.</string>
     <string name="third_party_policy_learn_more_header">Rregulla Palësh të Treta</string>
@@ -1213,9 +1539,8 @@ Language: sq_AL
     <string name="preference_privacy_settings">Rregullime privatësie</string>
     <string name="preference_collect_information">Grumbullo të dhëna</string>
     <string name="post_submitted">Postimi u parashtrua</string>
-    <string name="login_email_button_signup">S’keni llogari? %1$sRegjistrohuni%2$s</string>
-    <string name="plugin_install_site_ineligible_site_graylisted">Veçoria e shtojcës lyp që sajti të jetë në rregull.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Veçoria e shtojcës lyp që pajtimi i përkatësisë parësore të jetë përshoqëruar me këtë përdorues.</string>
+    <string name="plugin_install_site_ineligible_site_graylisted">Veçoria e shtojcës lyp që sajti të jetë në rregull.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Veçoria e shtojcës lyp privilegje përgjegjësi.</string>
     <string name="plugin_install_site_ineligible_no_vip_sites">Shtojca s’mund të instalohet në sajte VIP.</string>
     <string name="plugin_install_site_ineligible_excessive_disk_space">Shtojca s’mund të instalohet, për shkak kufizimesh hapësire në disk.</string>
@@ -1230,12 +1555,12 @@ Language: sq_AL
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Instaloje shtojcën</string>
     <string name="notification_settings_followed_dialog_title">Njoftime</string>
     <string name="notification_settings_followed_dialog_email_comments">Dërgomë komentet e reja me email</string>
-    <string name="notification_settings_followed_dialog_email_posts_weekly">Një herë në javë</string>
     <string name="notification_settings_followed_dialog_email_posts_instantly">Menjëherë</string>
     <string name="notification_settings_followed_dialog_email_posts_daily">Përditë</string>
     <string name="notification_settings_followed_dialog_notification_posts_switch">Postime të reja</string>
     <string name="notification_settings_followed_dialog_notification_posts_description">Merrni njoftime postimesh të reja nga ky sajt</string>
     <string name="notification_settings_followed_dialog_email_posts_switch">Dërgomë postimet e reja me email</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">Një herë në javë</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">Krejt Sajtet e Ndjekur Prej Meje</string>
     <string name="notification_settings_category_followed_sites">Sajte të Ndjekur</string>
     <string name="content_description_person_reading_device_notification">Person që lexon pajisje me njoftime</string>
@@ -1257,7 +1582,6 @@ Language: sq_AL
     <string name="fab_add_tag_desc">Krijoje Etiketën</string>
     <string name="navigate_up_desc">lëvizni</string>
     <string name="notification_settings_switch_desc">Njoftime</string>
-    <string name="open_external_link_desc">Hap lidhje të jashtme</string>
     <string name="show_more_desc">shfaq më tepër</string>
     <string name="reader_photo_view_desc">foto</string>
     <string name="reader_list_item_suggestion_remove_desc">fshije</string>
@@ -1281,16 +1605,17 @@ Language: sq_AL
     <string name="profile_picture">Foto profili e %s</string>
     <string name="comment_checkmark_desc">shenjë</string>
     <string name="signup_with_google_progress">Po bëhet regjistrim me Google…</string>
+    <string name="open_external_link_desc">Hap lidhje të jashtme</string>
     <string name="jetpack_connection_failed_with_reason">Dështoi lidhja me Jetpack-un: %s</string>
     <string name="jetpack_already_connected_toast">Jeni tashmë i lidhur te Jetpack-u</string>
     <string name="menu_undo_snackbar_action">ZHBËJE</string>
-    <string name="menu_visual_mode_done_snackbar">U kalua nën mënyrën Pamore</string>
-    <string name="menu_visual_mode">Mënyra Pamore</string>
-    <string name="menu_html_mode_done_snackbar">U kalua nën mënyrën HTML</string>
     <string name="menu_html_mode">Mënyra HTML</string>
     <string name="menu_preview">Paraparje</string>
     <string name="menu_save_as_draft">Ruaje si Skicë</string>
     <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_visual_mode_done_snackbar">U kalua nën mënyrën Pamore</string>
+    <string name="menu_html_mode_done_snackbar">U kalua nën mënyrën HTML</string>
+    <string name="menu_visual_mode">Mënyra Pamore</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1312,21 +1637,20 @@ Language: sq_AL
     <string name="edit_photo_screen_title">Përpunoni Foto</string>
     <string name="share_intent_screen_title">Zgjidhni sajt</string>
     <string name="signup_epilogue_screen_title">Llogari e re</string>
-    <string name="login_prologue_screen_title">Hyrje</string>
     <string name="login_epilogue_screen_title">I futur si</string>
-    <string name="person_detail_screen_title">Hollësi personi</string>
     <string name="media_settings_screen_title">Hollësi kartele</string>
     <string name="publicize_buttons_screen_title">Butona ndarjesh me të tjerët</string>
     <string name="notifications_screen_title">Njoftime</string>
     <string name="reader_screen_title">Lexues</string>
     <string name="me_section_screen_title">Unë</string>
-    <string name="my_site_section_screen_title">Sajti Im</string>
     <string name="notif_settings_screen_title">Rregullime njoftimesh</string>
     <string name="help_screen_title">Ndihmë dhe Asistencë</string>
     <string name="license_screen_title">Licencë</string>
     <string name="release_notes_screen_title">Shënime hedhjeje në qarkullim</string>
+    <string name="person_detail_screen_title">Hollësi personi</string>
+    <string name="my_site_section_screen_title">Sajti Im</string>
     <string name="signup_epilogue_error_avatar_view">Avatari juaj u ngarkua dhe do të jetë gati për përdorim pas pak.</string>
-    <string name="permissions_denied_message">Duket se i keni çaktivizuar lejet e domosdoshme për funksionimin e kësaj veçorie.&lt;br/>&lt;br/>Për ta ndryshuar këtë, përpunoni lejet tuaja dhe sigurohuni që &lt;strong>%s&lt;/strong> është e aktivizuar.</string>
+    <string name="permissions_denied_message">Duket se i keni çaktivizuar lejet e domosdoshme për funksionimin e kësaj veçorie.&lt;br/&gt;&lt;br/&gt;Për ta ndryshuar këtë, përpunoni lejet tuaja dhe sigurohuni që &lt;strong&gt;%s&lt;/strong&gt; është e aktivizuar.</string>
     <string name="permissions_denied_title">Leje</string>
     <string name="plugin_caption_featured">Të zgjedhura</string>
     <string name="sharing_disabled_description">S’mund të hyni te rregullimet tuaja mbi ndarjen me të tjerë, ngaqë moduli juaj Sharing Jetpack është i çaktivizuar.</string>
@@ -1367,7 +1691,6 @@ Language: sq_AL
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 postim me 1 kartelë të pangarkuar</string>
     <string name="untitled_in_parentheses">(Pa titull)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="site_creation_domain_finish_button">Krijoje sajtin</string>
     <string name="notification_site_creation_created">Prekeni që të vazhdohet.</string>
     <string name="notification_site_creation_title_success">Sajti u krijua!</string>
@@ -1376,33 +1699,25 @@ Language: sq_AL
     <string name="username_changer_hint">Shtypni që të merrni më tepër sugjerime</string>
     <string name="username_changer_header">Emri juaj i tanishëm i përdoruesit është %1$s%2$s%3$s. Me pak përjashtime, të tjerët zor se do ta shohin emrin tuaj të ekranit, %4$s%5$s%6$s.</string>
     <string name="username_changer_error_none">S’ka emra përdoruesi të sugjeruar nga %1$s%2$s%3$s. Ju lutemi, që të merrni sugjerime, jepni më tepër shkronja ose numra.</string>
-    <string name="username_changer_error_generic">Ndodhi një gabim teksa merreshin sugjerime emrash përdoruesi.</string>
     <string name="username_changer_dismiss_message">Të hidhet tej ndryshimi i emrit të përdoruesit?</string>
     <string name="username_changer_dismiss_button_positive">Hidhe Tej</string>
     <string name="username_changer_action">Ruaje</string>
     <string name="content_description_add_avatar">Shtoni avatar</string>
-    <string name="signup_with_google_button">Regjistrohuni me Google</string>
-    <string name="signup_with_email_button">Regjistrohuni me Email</string>
     <string name="signup_user_exists">Email tashmë ekzistues në WordPress.com.\nPo vazhdohet me hyrjen.</string>
+    <string name="username_changer_error_generic">Ndodhi një gabim teksa merreshin sugjerime emrash përdoruesi.</string>
     <string name="signup_updating_account">Po përditësohet llogaria…</string>
-    <string name="signup_terms_of_service_text">Duke u regjistruar, pajtoheni me %1$sKushtet tona të Shërbimit%2$s.</string>
     <string name="signup_magic_link_progress">Mesazhi po dërgohet</string>
     <string name="signup_magic_link_error_button_positive">Riprovoni</string>
     <string name="signup_magic_link_error_button_negative">Mbylle</string>
     <string name="signup_magic_link_error">Pati ca probleme me dërgimin e email-it.  Mund të riprovoni tani ose ta mbyllni dhe të riprovoni më vonë.</string>
     <string name="signup_epilogue_hint_username">Emër përdoruesi</string>
-    <string name="signup_epilogue_hint_password_detail">Mundeni të hyni përherë me një lidhje si ajo që sapo përdorët, por mund të caktoni edhe një fjalëkalim, nëse parapëlqeni.</string>
     <string name="signup_epilogue_hint_password">Fjalëkalim (opsional)</string>
     <string name="signup_epilogue_hint_display">Emër Shfaqjeje</string>
     <string name="signup_epilogue_error_button_positive">Riprovoni</string>
     <string name="signup_epilogue_error_button_negative">Riktheje</string>
     <string name="signup_epilogue_error_generic">Pati ca probleme me përditësimin e llogarisë tuaj. Që të vazhdohet, mund të riprovoni ose prapësoni ndryshimet.</string>
     <string name="signup_epilogue_error_avatar">Pati ca probleme me ngarkimin e avatarit tuaj.</string>
-    <string name="signup_email_header">Që të krijoni llogarinë tuaj të re WordPress.com, ju lutemi, jepni adresën tuaj email.</string>
-    <string name="signup_email_error_generic">Pati ca probleme me kontrollin e adresës email.</string>
-    <string name="sign_up">Regjistrohuni te WordPress.com</string>
-    <string name="enter_username_instead">Hyni me emrin tuaj të përdoruesit.</string>
-    <string name="enter_site_address_instead">Bëni hyrjen duke dhënë adresën e sajtit tuaj.</string>
+    <string name="signup_epilogue_hint_password_detail">Mundeni të hyni përherë me një lidhje si ajo që sapo përdorët, por mund të caktoni edhe një fjalëkalim, nëse parapëlqeni.</string>
     <string name="plugin_needs_update">Lyp përditësim</string>
     <string name="plugin_caption_search">Kërkoni Për Shtojca</string>
     <string name="plugin_caption_new">E re</string>
@@ -1523,7 +1838,6 @@ Language: sq_AL
     <string name="login_error_suffix">\nNdoshta të provohej me një llogari tjetër?</string>
     <string name="login_error_generic">Pati problem në lidhjen me llogarinë Google.</string>
     <string name="login_error_button">Mbylle</string>
-    <string name="login_google_button_suffix">Hyni me Google.</string>
     <string name="enter_wpcom_password_google">Që të vazhdohet me këtë llogari Google, ju lutemi, jepni fjalëkalimin për te WordPress.com. Kjo do t’ju kërkohet vetëm një herë.</string>
     <string name="error_generic_network">Ndodhi një gabim rrjeti. Ju lutemi, kontrolloni lidhjen tuaj dhe riprovoni.</string>
     <string name="post_settings_remove_featured_image">Hiqe figurën e zgjedhur</string>
@@ -1535,18 +1849,17 @@ Language: sq_AL
     <string name="jetpack_disconnect_confirm">Shkëpute</string>
     <string name="jetpack_disconnect_confirmation_message">Jeni i sigurt se doni të shkëputet Jetpack-u nga sajti?</string>
     <string name="jetpack_disconnect_pref_title">\"Shkëputu nga WordPress.com\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Një adresë ose seri adresash IP mund t’i vendosni në një listë lejimesh për të penguar përgjithmonë bllokimin e tyre nga Jetpack-u. Janë të pranueshme adresa të llojit IPv4 dhe IPv6. Që të jepni një interval vlerash, jepni vlerën e ulët dhe të lartë të ndarë nga një vijë. Për shembull: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Mundeni t\'i vini shenjë një adrese ose serie adresash IP si “Lejuar përherë”, duke penguar përgjithmonë bllokimin e tyre nga Jetpack-u. Janë të pranueshme adresa të llojit IPv4 dhe IPv6. Që të jepni një interval vlerash, jepni vlerën e ulët dhe të lartë, ndarë nga një vijë. Për shembull: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Kërko mirëfilltësim me dy hapa</string>
     <string name="jetpack_match_wpcom_via_email_title">Përputhje në llogari kërkoji sipas email-esh</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Lejo hyrje me WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Hyrje me WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Adresa IP të lejuara</string>
     <string name="jetpack_prevent_brute_force_title">Blloko përpjekje dashakeqe për hyrje</string>
-    <string name="jetpack_prevent_brute_force_category_title">Mbrojtje nga sulme &lt;em>brute force&lt;/em></string>
+    <string name="jetpack_prevent_brute_force_category_title">Mbrojtje nga sulme &lt;em&gt;brute force&lt;/em&gt;</string>
     <string name="jetpack_send_wp_notifications_title">Dërgo njoftime push</string>
     <string name="jetpack_send_email_notifications_title">Dërgo njoftime me email</string>
-    <string name="jetpack_monitor_uptime_title">Mbikëqyrni sa kohë ka sajti që punon</string>
     <string name="jetpack_security_setting_title">Siguri</string>
+    <string name="jetpack_monitor_uptime_title">Mbikëqyrni sa kohë ka sajti që punon</string>
     <string name="jetpack_site_settings_category_title">Rregullime Jetpack-u</string>
     <string name="share_intent_adding_to">Shtim te</string>
     <string name="share_intent_pick_site">Zgjidhni sajt</string>
@@ -1570,8 +1883,8 @@ Language: sq_AL
     <string name="media_edit_filename_caption">Emër Kartele</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Tekst alternativ</string>
-    <string name="connect_site">Lidhni një sajt</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">Xixëllo dritëzë njoftimesh</string>
+    <string name="connect_site">Lidhni një sajt</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Dridhe pajisjen</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Zgjidhni tingull</string>
     <string name="notification_settings_category_sights_and_sounds">Vështrime dhe Tinguj</string>
@@ -1581,12 +1894,12 @@ Language: sq_AL
     <string name="notification_settings_category_other">Të tjera</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Krejt Sajtet e Mi</string>
     <string name="notification_settings_category_your_sites">Sajtet Tuaj</string>
-    <string name="notification_settings_master_off_message">Çaktivizimi i Rregullimeve mbi Njoftimet do të çaktivizojë krejt njoftimet nga ky aplikacion, pavarësisht nga lloji. Mund të përimtoni cilat lloje njoftimesh merrni, pasi të keni aktivizuar Rregullime Njoftimesh.</string>
-    <string name="notification_settings_master_off_title">Që të merrni njoftime në këtë pajisje, aktivizoni Rregullime Njoftimesh.</string>
-    <string name="notification_settings_master_hint_off">Aktivizo njoftimet</string>
-    <string name="notification_settings_master_hint_on">Çaktivizo njoftimet</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_status_on">On</string>
+    <string name="notification_settings_main_off_message">Çaktivizimi i Rregullimeve mbi Njoftimet do të çaktivizojë krejt njoftimet nga ky aplikacion, pavarësisht nga lloji. Mund të përimtoni cilat lloje njoftimesh merrni, pasi të keni aktivizuar Rregullime Njoftimesh.</string>
+    <string name="notification_settings_main_off_title">Që të merrni njoftime në këtë pajisje, aktivizoni Rregullime Njoftimesh.</string>
+    <string name="notification_settings_main_hint_off">Aktivizo njoftimet</string>
+    <string name="notification_settings_main_hint_on">Çaktivizoni njoftimet</string>
+    <string name="notification_settings_main_status_off">Off</string>
+    <string name="notification_settings_main_status_on">On</string>
     <string name="max_video_resolution">Madhësi Maksimum Videoje</string>
     <string name="max_thumbnail_px_size">Madhësi Maksimum Figure</string>
     <string name="error_upload_post_media_param">Ndodhi një gabim gjatë ngarkimit të medias në këtë postim: %s.</string>
@@ -1623,27 +1936,25 @@ Language: sq_AL
     <string name="login_site_address_more_help">Ju duhet më tepër ndihmë?</string>
     <string name="login_site_address_help_content">Adresa e sajtit tuaj shfaqet te shtylla në krye të skenës, kur vizitoni sajtin tuaj nën Chrome.</string>
     <string name="login_site_address_help_title">Cila është adresa e sajtit tim?</string>
-    <string name="login_site_address_help">Ju duhet ndihmë për gjetjen e adresës së sajtit tuaj?</string>
     <string name="login_site_address">Adresë sajti</string>
     <string name="enter_site_address">Jepni adresën e sajtit WordPress te i cili do të donit të lidheshit.</string>
     <string name="login_already_logged_in_wpcom">Jeni tashmë i futur te WordPress.com</string>
     <string name="login_continue">Vazhdo</string>
-    <string name="connect_more">Lidhni një sajt tjetër</string>
     <string name="enter_wpcom_password">Jepni fjalëkalimin tuaj WordPress.com.</string>
+    <string name="connect_more">Lidhni një sajt tjetër</string>
     <string name="login_magic_link_email_requesting">Po kërkohet email hyrjesh</string>
     <string name="password_incorrect">Duket sikur ky fjalëkalim është i pasaktë. Ju lutemi, kontrollojeni edhe një herë informacionin tuaj dhe riprovoni.</string>
     <string name="requesting_otp">Po kërkohet një kod verifikimi përmes SMS-je.</string>
     <string name="login_text_otp">Më mirë më dërgoni kod me tekst</string>
     <string name="enter_verification_code">Thuajse arritëm! Ju lutemi, jepni kodin e verifikimit prej aplikacionit tuaj Authenticator.</string>
-    <string name="open_mail">Hap postën</string>
     <string name="next">Pasuesi</string>
     <string name="enter_email_wordpress_com">Që të administroni krejt sajtet tuaj WordPress, bëni hyrjen te WordPress.com.</string>
     <string name="image_optimization_promo_desc">Optimizimi i figurave i mpak figurat, për ngarkim më të shpejtë.\n\nKëtë mund ta ndryshoni kurdo, te rregullimet e sajtit.</string>
     <string name="image_optimization_promo_title">Të aktivizohet optimizimi i figurave?</string>
-    <string name="leave_off">Lëre joaktive</string>
-    <string name="turn_on">Aktivizoje</string>
     <string name="me_profile_photo">Foto Profili</string>
     <string name="error_media_parse_error">Përgjigje e papritur nga shërbyesi</string>
+    <string name="turn_on">Aktivizoje</string>
+    <string name="leave_off">Lëre joaktive</string>
     <string name="upload_finished_toast">Ngarkimi s’mund të ndalet, ngaqë ka mbaruar tashmë</string>
     <string name="post_title">Titull</string>
     <string name="menu_redo">Ribëje</string>
@@ -1658,10 +1969,6 @@ Language: sq_AL
     <string name="post_status_draft">Skicë</string>
     <string name="post_status_pending_review">Në pritje të shqyrtimit</string>
     <string name="post_status_publish_post">Botojeni</string>
-    <string name="change_location">Ndryshoni Vendndodhje</string>
-    <string name="remove_location">Hiqe Vendndodhjen</string>
-    <string name="post_settings_error_placepicker_missing_play_services">S’hapet dot Location Picker, Google Play Services s’është i passhëm</string>
-    <string name="post_settings_location">Vendndodhje</string>
     <string name="now">Tani</string>
     <string name="post_settings_password_dialog_hint">Vetëm ata me këtë fjalëkalim mund të shohin këtë postim</string>
     <string name="post_settings_excerpt_dialog_hint">Copëzat janë përmbledhje opsionale të lëndës tuaj, hartuar dorazi.</string>
@@ -1708,10 +2015,10 @@ Language: sq_AL
     <string name="sharing_label_message">Ndryshoni tekstin e etiketës së butonit të ndarjeve me të tjerët. Ky tekst s’ka për t’u shfaqur pa shtuar të paktën një buton të tillë.</string>
     <string name="connecting_account">Po lidhet llogaria</string>
     <string name="cannot_connect_account_error">S’u bë dot lidhja %s, ngaqë s’u përzgjodh ndonjë llogari.</string>
-    <string name="connected">I lidhur</string>
     <string name="twitter">Twitter</string>
     <string name="likes">Pëlqime</string>
     <string name="sharing_comment_likes_description">Lejo që të Pëlqehen prej jush dhe lexuesve tuaj krejt komentet</string>
+    <string name="connected">I lidhur</string>
     <string name="buttons">Butona</string>
     <string name="sharing_edit_more_buttons">Përpunoni Butona \"Më Tepër\"</string>
     <string name="sharing_more_description">Një buton \"Më Tepër\" përmban një menu hapmbyll që shfaq butona ndarjesh me të tjerët</string>
@@ -1750,7 +2057,7 @@ Language: sq_AL
     <string name="media_downloading">Po ruhet media në këtë pajisje</string>
     <string name="error_media_save">S’arrihet të ruhet media</string>
     <string name="editor_draft_saved_locally">Skica u ruajt në pajisje</string>
-    <string name="editor_draft_saved_online">Skica u ruajt &lt;em>online&lt;/em></string>
+    <string name="editor_draft_saved_online">Skica u ruajt &lt;em&gt;online&lt;/em&gt;</string>
     <string name="editor_post_saved_locally">Postimi u ruaj në pajisje</string>
     <string name="button_sync">Njëkohësoje</string>
     <string name="smart_toast_comments_long_press">Që të përzgjidhni disa komente njëherësh, prekeni dhe mbajeni të prekur</string>
@@ -1791,11 +2098,11 @@ Language: sq_AL
     <string name="media_encoder_quality_85">E mesme</string>
     <string name="media_encoder_quality_80">E ulët</string>
     <string name="media_upload_state_uploaded">U ngarkua</string>
-    <string name="media_upload_state_failed">Ngarkimi Dështoi</string>
     <string name="media_upload_state_deleted">U fshi</string>
     <string name="media_upload_state_deleting">Po fshihet</string>
     <string name="media_upload_state_uploading">Po ngarkohet</string>
     <string name="media_upload_state_queued">Në radhë</string>
+    <string name="media_upload_state_failed">Ngarkimi Dështoi</string>
     <string name="image_quality">Cilësi Figure</string>
     <string name="error_all_media_upload_canceled">Krejt ngarkimet e mediave u anuluan për shkak të një gabimi të panjohur. Ju lutemi, riprovoni t’i ringarkoni</string>
     <string name="error_unknown_post_type">Format i panjohur postimesh</string>
@@ -1845,7 +2152,7 @@ Language: sq_AL
     <string name="signout">Dilni</string>
     <string name="sign_in_wpcom">Hyni te WordPress.com</string>
     <string name="reader_label_global_related_posts">Më tepër mbi WordPress.com</string>
-    <string name="reader_label_local_related_posts">Më tepër te %s</string>
+    <string name="reader_label_local_related_posts">Më tepër nga %s</string>
     <string name="preference_open_device_settings">Hap rregullime pajisjeje</string>
     <string name="invite_invalid_email">%s: Email i pavlefshëm</string>
     <string name="invite_user_blocked_invites">%s: Ftesa të bllokuara nga përdoruesi</string>
@@ -1855,19 +2162,19 @@ Language: sq_AL
     <string name="comment_moderated_approved">Komenti u miratua!</string>
     <string name="like">Pëlqejeni</string>
     <string name="timespan_now">tani</string>
-    <string name="role_viewer">Shikues</string>
     <string name="role_follower">Ndjekës</string>
+    <string name="role_viewer">Shikues</string>
     <string name="error_post_my_profile_no_connection">S’ka lidhje, s’u ruajt dot profili juaj</string>
-    <string name="alignment_right">Djathtas</string>
-    <string name="alignment_left">Majtas</string>
     <string name="alignment_none">Pa drejtim</string>
+    <string name="alignment_left">Majtas</string>
+    <string name="alignment_right">Djathtas</string>
     <string name="site_settings_list_editor_action_mode_title">U përzgjodh %1$d</string>
     <string name="error_fetch_users_list">S’u morën dot përdorues të sajtit</string>
-    <string name="title_email_follower">Ndjekës Me Email</string>
-    <string name="title_follower">Ndjekës</string>
     <string name="people_fetching">Po sillen përdoruesit…</string>
-    <string name="people_dropdown_item_viewers">Parës</string>
+    <string name="title_follower">Ndjekës</string>
+    <string name="title_email_follower">Ndjekës Me Email</string>
     <string name="people_dropdown_item_email_followers">Ndjekës Me Email</string>
+    <string name="people_dropdown_item_viewers">Parës</string>
     <string name="people_dropdown_item_followers">Ndjekës</string>
     <string name="people_dropdown_item_team">Ekipi</string>
     <string name="invite_message_usernames_limit">Ftoni deri në 10 adresa email dhe/ose emra përdoruesish WordPress.com. Atyre që kanë nevojë për emër përdoruesi, do t’u dërgohen udhëzime se si të krijojnë një të tillë.</string>
@@ -1879,64 +2186,59 @@ Language: sq_AL
     <string name="error_fetch_email_followers_list">S’u morën dot ndjekës të sajtit me email</string>
     <string name="error_fetch_followers_list">S’u morën dot ndjekës të sajtit</string>
     <string name="editor_failed_uploads_switch_html">Disa ngarkime mediash dështuan. S’mund të kaloni nën mënyrën HTML\n        në këtë gjendje. Të hiqen krejt ngarkimet e dështuara dhe të vazhdohet?</string>
-    <string name="image_width">Gjerësi</string>
-    <string name="image_link_to">Lidhje për te</string>
-    <string name="image_caption">Titull</string>
     <string name="image_settings_save_toast">Ndryshimet u ruajtën</string>
+    <string name="image_caption">Titull</string>
+    <string name="image_link_to">Lidhje për te</string>
+    <string name="image_width">Gjerësi</string>
     <string name="image_settings_dismiss_dialog_title">Të hidhen tej ndryshimet e paruajtura?</string>
     <string name="stop_upload_dialog_title">Të ndalet ngarkimi?</string>
-    <string name="tap_to_try_again">Prekeni që të riprovohet!</string>
-    <string name="invite_sent">Ftesa u dërgua me sukses</string>
-    <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_error_some_failed">Ftesa u dërgua por pati gabim(e)!</string>
+    <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="invite_sent">Ftesa u dërgua me sukses</string>
+    <string name="tap_to_try_again">Prekeni që të riprovohet!</string>
     <string name="invite_error_sending">Ndodhi një gabim teksa provohej të dërgohej ftesa!</string>
     <string name="invite_error_invalid_usernames_multiple">S’dërgohet dot: Ka emra përdoruesish ose email-e të pavlefshëm</string>
     <string name="invite_error_invalid_usernames_one">S’dërgohet dot: Një emër përdoruesi ose email është i pavlefshëm</string>
     <string name="invite_error_no_usernames">Ju lutemi, shtoni të paktën një emër përdoruesi</string>
-    <string name="invite_message_info">(Në daçi) Mund të jepni një mesazh të përshtatur, deri në 500 shenja, i cili do të përfshihet te ftesa për përdoruesin(t).</string>
-    <string name="invite_message_remaining_other">%d shenja ende</string>
-    <string name="invite_message_remaining_one">1 shenjë ende</string>
-    <string name="invite_message_remaining_zero">0 shenja</string>
-    <string name="invite_message_title">Mesazh i Personalizuar</string>
+    <string name="invite_message_title">Mesazh vetjak</string>
     <string name="invite">Ftoji</string>
-    <string name="invite_names_title">Emra përdoruesish ose Email-e</string>
-    <string name="invite_people">Ftoni Njerëz</string>
+    <string name="invite_names_title">Emra përdoruesish ose email-e</string>
     <string name="my_site_header_external">I jashtëm</string>
-    <string name="send_link">Dërgo lidhje</string>
+    <string name="invite_people">Ftoni Njerëz</string>
     <string name="label_clear_search_history">Spastro historikun e kërkimeve</string>
     <string name="dlg_confirm_clear_search_history">Të spastrohet historiku?</string>
     <string name="reader_empty_search_description">S’u gjetën përfundime në gjuhën tuaj për %s</string>
     <string name="reader_hint_post_search">Kërkoni te WordPress</string>
+    <string name="reader_title_related_post_detail">Postim i Afërt</string>
     <string name="preview_screen_links_disabled">Në skenën paraparje lidhjet janë të çaktivizuara</string>
     <string name="send">Dërgoje</string>
     <string name="person_removed">U hoq me sukses %1$s</string>
     <string name="user_remove_confirmation_message">Nëse e hiqni %1$s, ai përdorues nuk do të jetë më në gjendje të hyjë në këtë sajt, por çfarëdo lënde e krijuar nga %1$s do të mbetet te sajti.\n\nDoni ende ta hiqni këtë përdorues?</string>
     <string name="person_remove_confirmation_title">Hiqe %1$s</string>
-    <string name="role">Rol</string>
     <string name="people">Persona</string>
+    <string name="role">Rol</string>
     <string name="reader_empty_posts_in_custom_list">Sajtet në këtë listë s’kanë postuar ndonjë gjë tani së fundi</string>
     <string name="error_remove_user">S’u hoq dot përdoruesi</string>
     <string name="error_update_role">S’u përditësua dot rol përdoruesi</string>
     <string name="error_fetch_viewers_list">S’u morën dot shikues sajti</string>
     <string name="error_updating_gravatar">Gabim teksa përditësohej Gravatari juaj</string>
-    <string name="error_refreshing_gravatar">Gabim në ringarkimin e Gravatarit tuaj</string>
     <string name="error_locating_image">Gabim në ngarkimin e figurës së qethur</string>
+    <string name="error_refreshing_gravatar">Gabim në ringarkimin e Gravatarit tuaj</string>
     <string name="error_cropping_image">Gabim teksa qethej figura</string>
     <string name="checking_email">Po kontrollohet email-i</string>
     <string name="magic_link_unavailable_error_message">Jo e mundshme këtë çast. Ju lutemi, jepni fjalëkalimin tuaj</string>
     <string name="logging_in">Po hyhet</string>
-    <string name="enter_your_password_instead">Në vend të kësaj, jepni fjalëkalimin tuaj</string>
     <string name="web_address_dialog_hint">E shfaqur publikisht kur komentoni.</string>
     <string name="capture_or_pick_photo">Bëni ose përzgjidhni foto</string>
     <string name="plans">Plane</string>
     <string name="plan">Plan</string>
     <string name="export_your_content_message">Postimet, faqet dhe rregullimet tuaja do t’ju dërgohen me email te %s.</string>
     <string name="export_your_content">Eksportoni lëndën tuaj</string>
-    <string name="export_email_sent">Email-i i eksportimit u dërgua!</string>
     <string name="exporting_content_progress">Po eksportohet lëndë…</string>
-    <string name="checking_purchases">Po kontrollohen blerjet</string>
+    <string name="export_email_sent">Email-i i eksportimit u dërgua!</string>
     <string name="show_purchases">Shfaqi blerjet</string>
     <string name="premium_upgrades_message">Në sajtin tuaj keni përmirësime me pagesë aktive. Ju lutemi, anuloni përmirësimet, përpara se të fshini sajtin tuaj.</string>
+    <string name="checking_purchases">Po kontrollohen blerjet</string>
     <string name="premium_upgrades_title">Përmirësime Me Pagesë</string>
     <string name="purchases_request_error">Diç shkoi ters. S’u kërkuan dot blerjet.</string>
     <string name="delete_site_progress">Po fshihet sajti…</string>
@@ -1945,49 +2247,49 @@ Language: sq_AL
     <string name="primary_domain">Përkatësi Parësore</string>
     <string name="error_deleting_site_summary">Pati një gabim në fshirjen e sajtit tuaj. Për më tepër, ju lutemi, lidhuni me ata të asistencës.</string>
     <string name="error_deleting_site">Gabim në fshirjen e sajtit</string>
-    <string name="site_settings_export_content_title">Eksportim lënde</string>
     <string name="confirm_delete_site_prompt">Ju lutemi, shtypni %1$s në fushën më poshtë, që ta ripohoni. Sajti juaj mandej do të zhduket përgjithmonë.</string>
+    <string name="site_settings_export_content_title">Eksportim lënde</string>
     <string name="confirm_delete_site">Ripohoni Fshirje Sajti</string>
     <string name="contact_support">Lidhuni me Asistencën</string>
     <string name="start_over_text">Nëse doni një sajt, por nuk doni më ndonjë nga postimet dhe faqet që keni tani, ekipi ynë i asistencës mund të fshijë për ju postimet, faqet, mediat dhe komentet e sajtit tuaj.\n\nKjo do t’i mbajë sajtin tuaj dhe URL-në e tij aktive, por do t’ju ofrojë një fillim të ri për krijimin e lëndës. Që të spastrohet lënda juaj, thjesht lidhuni me ne.</string>
-    <string name="let_us_help">Le T’ju Ndihmojmë</string>
     <string name="site_settings_start_over_hint">Fillojeni sajtin nga e para</string>
-    <string name="start_over">Fillojani Nga e Para</string>
+    <string name="let_us_help">Le T’ju Ndihmojmë</string>
     <string name="me_btn_app_settings">Rregullime Aplikacioni</string>
+    <string name="start_over">Fillojani Nga e Para</string>
     <string name="editor_remove_failed_uploads">Hiqi ngarkimet e dështuara</string>
     <string name="site_settings_advanced_header">Të mëtejshme</string>
     <string name="comments_empty_list_filtered_trashed">S’ka komente të shpënë në Hedhurina</string>
     <string name="comments_empty_list_filtered_pending">S’ka komente në pritje të shqyrtimit</string>
     <string name="comments_empty_list_filtered_approved">S’ka komente të miratuara</string>
     <string name="xmlrpc_missing_method_error">S’u lidh dot. Metodat e domosdoshme XML-RPC mungojnë te shërbyesi.</string>
-    <string name="alignment_center">Në qendër</string>
-    <string name="post_format_video">Video</string>
     <string name="post_format_status">Gjendje</string>
-    <string name="post_format_standard">Standard</string>
-    <string name="post_format_quote">Citim</string>
-    <string name="post_format_link">Lidhje</string>
-    <string name="post_format_image">Figurë</string>
-    <string name="post_format_gallery">Galeri</string>
+    <string name="post_format_video">Video</string>
+    <string name="alignment_center">Në qendër</string>
     <string name="post_format_chat">Fjalosje</string>
-    <string name="post_format_audio">Audio</string>
-    <string name="post_format_aside">Anësore</string>
+    <string name="post_format_gallery">Galeri</string>
+    <string name="post_format_image">Figurë</string>
+    <string name="post_format_link">Lidhje</string>
+    <string name="post_format_quote">Citim</string>
+    <string name="post_format_standard">Standard</string>
     <string name="notif_events">Të dhëna mbi kurse dhe veprimtari WordPress.com (në Internet &amp; në rrugë klasike).</string>
+    <string name="post_format_aside">Anësore</string>
+    <string name="post_format_audio">Audio</string>
     <string name="notif_surveys">Mundësi për të marrë pjesë në kërkime &amp; pyetësorë nga WordPress.com.</string>
     <string name="notif_tips">Këshilla për përfitimin e maksimumit nga WordPress.com.</string>
     <string name="notif_community">Bashkësi</string>
-    <string name="notif_research">Punë kërkimore</string>
-    <string name="notif_suggestions">Këshilla</string>
     <string name="replies_to_my_comments">Përgjigje ndaj komenteve të mia</string>
-    <string name="username_mentions">Përmendje të emrit të përdoruesit</string>
+    <string name="notif_suggestions">Këshilla</string>
+    <string name="notif_research">Punë kërkimore</string>
     <string name="site_achievements">Arritje sajti</string>
-    <string name="site_follows">Ndjekje të sajtit</string>
+    <string name="username_mentions">Përmendje të emrit të përdoruesit</string>
     <string name="likes_on_my_posts">Pëlqime të postimeve të mia</string>
+    <string name="site_follows">Ndjekje të sajtit</string>
     <string name="likes_on_my_comments">Pëlqime të komenteve të mia</string>
     <string name="comments_on_my_site">Komente te sajti im</string>
     <string name="site_settings_list_editor_summary_other">%d objekte</string>
     <string name="site_settings_list_editor_summary_one">1 objekt</string>
-    <string name="approve_auto">Krejt përdoruesit</string>
     <string name="approve_auto_if_previously_approved">Komente përdoruesish të njohur</string>
+    <string name="approve_auto">Krejt përdoruesit</string>
     <string name="approve_manual">Pa komente</string>
     <string name="site_settings_paging_summary_other">%d komente për faqe</string>
     <string name="site_settings_paging_summary_one">1 koment për faqe</string>
@@ -1997,11 +2299,11 @@ Language: sq_AL
     <string name="detail_approve_auto">Mirato vetvetiu komentet e gjithkujt.</string>
     <string name="detail_approve_auto_if_previously_approved">Miratoje vetvetiu, nëse përdoruesi ka një koment të mëparshëm të miratuar</string>
     <string name="detail_approve_manual">Kërkoni miratim dorazi për komentet e kujtdo.</string>
-    <string name="days_quantity_other">%d ditë</string>
     <string name="days_quantity_one">1 ditë</string>
-    <string name="web_address">Adresë Web</string>
-    <string name="primary_site">Sajti parësor</string>
+    <string name="days_quantity_other">%d ditë</string>
     <string name="pending_email_change_snackbar">Që të ripohoni adresën tuaj të re, klikoni lidhjen e verifikimit te email-i i dërguar për %1$s</string>
+    <string name="primary_site">Sajti parësor</string>
+    <string name="web_address">Adresë Web</string>
     <string name="editor_toast_uploading_please_wait">Po ngarkoni media. Ju lutemi, pritni deri sa kjo të plotësohet.</string>
     <string name="error_refresh_comments_showing_older">Komentet s’u freskuan dot këtë herë - po shfaqen komente më të vjetër</string>
     <string name="post_settings_set_featured_image">Vëre Si Figurë të Zgjedhur</string>
@@ -2010,13 +2312,13 @@ Language: sq_AL
     <string name="dlg_sure_to_delete_comments">Të fshihen përgjithmonë këto komente?</string>
     <string name="dlg_sure_to_delete_comment">Të fshihet përgjithmonë ky koment?</string>
     <string name="mnu_comment_delete_permanently">Fshije</string>
-    <string name="mnu_comment_untrash">Riktheje</string>
     <string name="comment_deleted_permanently">Koment u fshi</string>
+    <string name="mnu_comment_untrash">Riktheje</string>
     <string name="comments_empty_list_filtered_spam">S’ka komente mesazh të padëshiruar</string>
     <string name="comment_status_all">Krejt</string>
     <string name="could_not_load_page">S’u ngarkua dot faqja</string>
-    <string name="off">Off</string>
     <string name="interface_language">Gjuhë Ndërfaqeje</string>
+    <string name="off">Off</string>
     <string name="about_the_app">Rreth aplikacionit</string>
     <string name="error_post_account_settings">S’u ruajtën dot rregullimet e llogarisë tuaj</string>
     <string name="error_fetch_account_settings">S’u morën dot rregullimet e llogarisë tuaj</string>
@@ -2024,20 +2326,20 @@ Language: sq_AL
     <string name="site_settings_unknown_language_code_error">Kod gjuhe i papranuar</string>
     <string name="site_settings_threading_dialog_description">Lejo komente të folezëzuar në rrjedha.</string>
     <string name="site_settings_threading_dialog_header">Rrjedhë deri në</string>
-    <string name="disabled">E çaktivizuar</string>
-    <string name="search">Kërkoni</string>
     <string name="remove">Hiqe</string>
+    <string name="search">Kërkoni</string>
+    <string name="disabled">E çaktivizuar</string>
     <string name="site_settings_image_original_size">Madhësia Origjinale</string>
     <string name="privacy_private">Sajti juaj është i dukshëm vetëm për ju dhe për përdorues që miratoni</string>
     <string name="privacy_public_not_indexed">Sajti juaj është i dukshëm për këdo, por kërkon që motorët e kërkimeve të mos e indeksojnë</string>
     <string name="privacy_public">Sajti juaj është i dukshëm për këdo dhe mund të indeksohet nga motorë kërkimesh</string>
     <string name="about_me_hint">Pak fjalë rreth jush…</string>
-    <string name="about_me">Rreth meje</string>
     <string name="public_display_name_hint">Nëse nuk caktohet një i tillë, si emër ekrani do të përdoret emri juaj i përdoruesit</string>
+    <string name="about_me">Rreth meje</string>
     <string name="public_display_name">Emri i shfaqur botërisht</string>
-    <string name="last_name">Mbiemri</string>
-    <string name="first_name">Emri</string>
     <string name="my_profile">Profili Im</string>
+    <string name="first_name">Emri</string>
+    <string name="last_name">Mbiemri</string>
     <string name="cd_related_post_preview_image">Figurë paraparje postimi të afërt</string>
     <string name="error_post_remote_site_settings">S’u ruajtën dot të dhëna sajti</string>
     <string name="error_fetch_remote_site_settings">S’u morën dot të dhëna sajti</string>
@@ -2046,7 +2348,7 @@ Language: sq_AL
     <string name="site_settings_paging_dialog_description">Copëzojini rrjedhat e komenteve në disa faqe.</string>
     <string name="site_settings_paging_dialog_header">Komente për faqe</string>
     <string name="site_settings_close_after_dialog_title">Mbylle komentimin</string>
-    <string name="site_settings_blacklist_description">Kur një koment përmban cilëndo nga këto fjalë në lëndën e vet, emrin, URL-në, email-in, ose IP-në e tij, do të shënohet si i padëshiruar. Mund të jepni edhe copa fjalësh, fjala vjen \"press\" do të ketë efekt edhe për \"WordPress.\"</string>
+    <string name="site_settings_denylist_description">Kur një koment përmban cilëndo nga këto fjalë në lëndën e vet, emrin, URL-në, email-in, ose IP-në e tij, do të shënohet si i padëshiruar. Mund të jepni edhe copa fjalësh, fjala vjen \"press\" do të ketë efekt edhe për \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">Kur një koment përmban cilëndo nga këto fjalë në lëndën e vet, emrin, URL-në, email-in, ose IP-në e tij, do të mbahet në radhën e moderimeve. Mund të jepni edhe copa fjalësh, fjala vjen \"press\" do të ketë efekt edhe për \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Jepni një fjalë ose togfjalësh</string>
     <string name="site_settings_list_editor_no_items_text">Pa objekte</string>
@@ -2061,10 +2363,10 @@ Language: sq_AL
     <string name="site_settings_rp_show_header_title">Shfaq Kryet</string>
     <string name="site_settings_rp_switch_summary">Postimet e Afërta shfaqin nën postimet tuaja lëndë të afërt prej sajtit tuaj.</string>
     <string name="site_settings_rp_switch_title">Shfaq Postime të Afërta</string>
-    <string name="site_settings_blacklist_hint">Komentet me përputhje me një filtër shënohen si të padëshiruar</string>
+    <string name="site_settings_denylist_hint">Komentet me përputhje me një filtër shënohen si të padëshiruar</string>
     <string name="site_settings_moderation_hold_hint">Komentet me përputhje me ndonjë nga filtra vendosen në radhën e moderimit</string>
     <string name="site_settings_multiple_links_hint">Për përdorues të njohur shpërfille kufirin e lidhjeve</string>
-    <string name="site_settings_whitelist_hint">Autori i komentit duhet të kenë një koment të miratuar më parë</string>
+    <string name="site_settings_allowlist_hint">Autorët e komenteve duhet të kenë një koment të miratuar më parë</string>
     <string name="site_settings_user_account_required_hint">Përdoruesit duhet të jenë të regjistruar dhe të kenë bërë hyrjen</string>
     <string name="site_settings_identity_required_hint">Autori i komentit duhet të plotësojë emrin dhe email-in</string>
     <string name="site_settings_paging_hint">Shfaq komente në copa të madhësisë së dhënë</string>
@@ -2087,19 +2389,18 @@ Language: sq_AL
     <string name="site_settings_address_hint">Hëpërhë nuk mbulohet ndryshimi i adresës suaj</string>
     <string name="site_settings_tagline_hint">Një përshkrim i shkurtër ose një togfjalësh ndjellës për të përshkruar blogun tuaj</string>
     <string name="site_settings_title_hint">Shpjegoni, me pak fjalë, se për çfarë është ky sajt</string>
-    <string name="site_settings_whitelist_known_summary">Komente prej përdoruesish të njohur</string>
-    <string name="site_settings_whitelist_all_summary">Komente prej krejt përdoruesit</string>
+    <string name="site_settings_allowlist_known_summary">Komente prej përdoruesish të njohur</string>
+    <string name="site_settings_allowlist_all_summary">Komente prej krejt përdoruesit</string>
     <string name="site_settings_threading_summary">%d nivele</string>
     <string name="site_settings_privacy_private_summary">Privat</string>
     <string name="site_settings_privacy_hidden_summary">I fshehur</string>
-    <string name="site_settings_privacy_public_summary">Publik</string>
     <string name="site_settings_delete_site_title">Fshije Sajtin</string>
-    <string name="site_settings_blacklist_title">Listë e zezë</string>
+    <string name="site_settings_privacy_public_summary">Publik</string>
     <string name="site_settings_moderation_hold_title">Mbaje për Moderim</string>
     <string name="site_settings_multiple_links_title">Lidhje në komente</string>
-    <string name="site_settings_whitelist_title">Miratoji vetvetiu</string>
-    <string name="site_settings_paging_title">Faqosje</string>
+    <string name="site_settings_allowlist_title">Miratoji vetvetiu</string>
     <string name="site_settings_threading_title">Në rrjedha</string>
+    <string name="site_settings_paging_title">Faqosje</string>
     <string name="site_settings_sort_by_title">Renditini sipas</string>
     <string name="site_settings_account_required_title">Përdoruesi duhet të ketë bërë hyrjen</string>
     <string name="site_settings_identity_required_title">Duhet të përfshijë emër dhe email</string>
@@ -2109,22 +2410,22 @@ Language: sq_AL
     <string name="site_settings_default_format_title">Format Parazgjedhje</string>
     <string name="site_settings_default_category_title">Kategori Parazgjedhje</string>
     <string name="site_settings_address_title">Adresë</string>
-    <string name="site_settings_tagline_title">Përmbledhtas</string>
     <string name="site_settings_title_title">Titull Sajti</string>
+    <string name="site_settings_tagline_title">Përmbledhtas</string>
     <string name="site_settings_discussion_new_posts_header">Parazgjedhje për postime të reja</string>
-    <string name="site_settings_writing_header">Shkrim</string>
     <string name="site_settings_account_header">Llogari</string>
-    <string name="site_settings_general_header">Të përgjithshme</string>
+    <string name="site_settings_writing_header">Shkrim</string>
     <string name="newest_first">Më të rejat së pari</string>
-    <string name="oldest_first">Më të vjetrat së pari</string>
-    <string name="close_after">Mbylle pas</string>
-    <string name="comments">Komente</string>
-    <string name="related_posts">Postime të afërt</string>
-    <string name="privacy">Privatësi</string>
+    <string name="site_settings_general_header">Të përgjithshme</string>
     <string name="discussion">Diskutim</string>
+    <string name="privacy">Privatësi</string>
+    <string name="related_posts">Postime të afërt</string>
+    <string name="comments">Komente</string>
+    <string name="close_after">Mbylle pas</string>
+    <string name="oldest_first">Më të vjetrat së pari</string>
     <string name="media_error_no_permission_upload">S’keni leje të ngarkoni media në këtë sajt</string>
-    <string name="unknown">E panjohur</string>
     <string name="never">Kurrë</string>
+    <string name="unknown">E panjohur</string>
     <string name="reader_err_get_post_not_found">Ky postim s’ekziston më</string>
     <string name="reader_err_get_post_not_authorized">S’jeni i autorizuar ta shihni këtë postim</string>
     <string name="reader_err_get_post_generic">S’arrihet të merret ky postim</string>
@@ -2136,22 +2437,22 @@ Language: sq_AL
     <string name="theme_activation_error">Diç shkoi ters. S’u aktivizua dot tema</string>
     <string name="theme_by_author_prompt_append"> nga %1$s</string>
     <string name="theme_prompt">Faleminderit që zgjidhni %1$s</string>
-    <string name="theme_manage_site">ADMINISTRONI SAJTIN</string>
-    <string name="theme_done">U BË</string>
-    <string name="theme_support">Asistencë</string>
-    <string name="theme_details">Hollësi</string>
-    <string name="theme_view">Shihni</string>
     <string name="theme_try_and_customize">Provojeni &amp; Përshtateni</string>
+    <string name="theme_view">Shihni</string>
+    <string name="theme_details">Hollësi</string>
+    <string name="theme_support">Asistencë</string>
+    <string name="theme_done">U BË</string>
+    <string name="theme_manage_site">ADMINISTRONI SAJTIN</string>
     <string name="theme_activate">Aktivizoje</string>
-    <string name="active">Aktive</string>
-    <string name="support">Asistencë</string>
-    <string name="details">Hollësi</string>
-    <string name="customize">Përshtateni</string>
     <string name="current_theme">Tema e Tanishme</string>
-    <string name="page_updated">Faqja u përditësua</string>
+    <string name="customize">Përshtateni</string>
+    <string name="details">Hollësi</string>
+    <string name="support">Asistencë</string>
+    <string name="active">Aktive</string>
+    <string name="post_published">Postimi u botua</string>
     <string name="post_updated">Postimi u përditësua</string>
+    <string name="page_updated">Faqja u përditësua</string>
     <string name="page_published">Faqja është botuar</string>
-    <string name="post_published">Postimi u botua</string>
     <string name="theme_no_search_result_found">Na ndjeni, s’u gjetën tema.</string>
     <string name="reader_label_gap_marker">Ngarko më tepër postime</string>
     <string name="notifications_no_search_results">S’ka sajte me përputhje për \'%s\'</string>
@@ -2184,288 +2485,286 @@ Language: sq_AL
     <string name="error_loading_notifications">S’ngarkoi dot rregullime njoftimesh</string>
     <string name="comment_likes">Pëlqime komenti</string>
     <string name="app_notifications">Njoftime aplikacioni</string>
-    <string name="email">Email</string>
     <string name="notifications_tab">Skedë njoftimesh</string>
+    <string name="email">Email</string>
     <string name="notification_settings_item_other_account_emails_summary">Do të dërgojmë përherë email-e të rëndësishëm lidhur me llogarinë tuaj, por mundeni gjithashtu të merrni ca ekstra të dobishme.</string>
     <string name="stats_insights_latest_post_summary">Përmbledhje Postimesh Më të Reja</string>
     <string name="connectionbar_no_connection">Pa lidhje</string>
     <string name="post_trashed">Postimi u kalua te hedhurinat</string>
-    <string name="button_trash">Hedhurina</string>
     <string name="button_stats">Statistika</string>
+    <string name="button_trash">Hedhurina</string>
     <string name="button_preview">Paraparje</string>
     <string name="button_view">Shiheni</string>
-    <string name="button_publish">Botojeni</string>
     <string name="button_edit">Përpunojeni</string>
+    <string name="button_publish">Botojeni</string>
     <string name="reader_toast_err_follow_blog_not_authorized">S’jeni i autorizuar të hyni në këtë sajt</string>
     <string name="reader_toast_err_follow_blog_not_found">Ky sajt s’u gjet dot</string>
     <string name="undo">Zhbëje</string>
     <string name="push_auth_expired">Kërkesa skadoi. Hyni te WordPress.com që të riprovoni.</string>
-    <string name="ignore">Shpërfille</string>
     <string name="stats_insights_best_ever">Parjet Më të Mira Ndonjëherë</string>
+    <string name="ignore">Shpërfille</string>
     <string name="stats_insights_today">Statistikat e Sotme</string>
     <string name="stats_insights_all_time">Postimet, parjet dhe vizitorët gjatë gjithë kohës</string>
     <string name="stats_insights">Tendenca</string>
     <string name="me_disconnect_from_wordpress_com">Dil nga WordPress.com</string>
-    <string name="me_connect_to_wordpress_com">Hyni te WordPress.com</string>
     <string name="me_btn_login_logout">Hyrje/Dalje</string>
-    <string name="me_btn_support">Ndihmë &amp; Asistencë</string>
+    <string name="me_connect_to_wordpress_com">Hyni te WordPress.com</string>
     <string name="account_settings">Rregullime Llogarie</string>
+    <string name="me_btn_support">Ndihmë &amp; Asistencë</string>
     <string name="site_picker_cant_hide_current_site">\"%s\" s’u fsheh, ngaqë është sajti i tanishëm</string>
     <string name="site_picker_create_wpcom">Ndërtoni një sajt te WordPress.com</string>
     <string name="site_picker_add_self_hosted">Shto sajt të vetëstrehuar</string>
-    <string name="site_picker_add_site">Shtoni sajt të ri</string>
     <string name="site_picker_edit_visibility">Shfaq/fshih sajte</string>
-    <string name="site_picker_title">Zgjidhni një sajt</string>
-    <string name="my_site_btn_view_site">Shihni Sajtin</string>
+    <string name="site_picker_add_site">Shtoni sajt të ri</string>
     <string name="my_site_btn_view_admin">Shihni Përgjegjësin</string>
+    <string name="my_site_btn_view_site">Shihni Sajtin</string>
+    <string name="site_picker_title">Zgjidhni një sajt</string>
     <string name="my_site_btn_switch_site">Këmbe Sajt</string>
-    <string name="my_site_btn_site_settings">Rregullime</string>
     <string name="my_site_btn_blog_posts">Postime Blogu</string>
-    <string name="my_site_header_publish">Botoje</string>
+    <string name="my_site_btn_site_settings">Rregullime</string>
     <string name="my_site_header_look_and_feel">Pamja dhe Ndjesitë</string>
+    <string name="my_site_header_publish">Botoje</string>
     <string name="my_site_header_configuration">Formësim</string>
     <string name="reader_label_new_posts_subtitle">Prekeni që të shfaqen</string>
-    <string name="deselect_all">Shpërzgjidhe krejt</string>
-    <string name="select_all">Përzgjidhe krejt</string>
-    <string name="hide">Fshihe</string>
     <string name="show">Shfaqe</string>
-    <string name="auth_required">Hyni sërish që të vazhdohet.</string>
-    <string name="invalid_verification_code">Kod verifikimi i pavlefshëm</string>
-    <string name="verification_code">Kod verifikimi</string>
+    <string name="hide">Fshihe</string>
+    <string name="select_all">Përzgjidhe krejt</string>
+    <string name="deselect_all">Shpërzgjidhe krejt</string>
     <string name="language">Gjuhë</string>
-    <string name="reader_empty_posts_request_failed">S’arrin të marrë dot postimet</string>
+    <string name="verification_code">Kod verifikimi</string>
+    <string name="invalid_verification_code">Kod verifikimi i pavlefshëm</string>
+    <string name="auth_required">Hyni sërish që të vazhdohet.</string>
     <string name="publisher">Botues:</string>
-    <string name="error_notification_open">S’u hap dot njoftimi</string>
     <string name="stats_search_terms_unknown_search_terms">Terma të Panjohur Kërkimesh</string>
-    <string name="stats_view_search_terms">Terma Kërkimesh</string>
     <string name="stats_view_authors">Autorë</string>
+    <string name="stats_view_search_terms">Terma Kërkimesh</string>
     <string name="comments_fetching">Po sillen komentet…</string>
     <string name="pages_fetching">Po sillen faqet…</string>
     <string name="posts_fetching">Po sillen postimet…</string>
     <string name="media_fetching">Po sillet media…</string>
+    <string name="error_notification_open">S’u hap dot njoftimi</string>
+    <string name="reader_empty_posts_request_failed">S’arrin të marrë dot postimet</string>
     <string name="logs_copied_to_clipboard">Regjistrat e aplikacionit u kopjuan te e papastra</string>
-    <string name="reader_empty_posts_in_blog">Ky sajt është i zbrazët</string>
     <string name="reader_label_new_posts">Postime të reja</string>
-    <string name="reader_page_recommended_blogs">Sajte që mund t’ju pëlqejnë</string>
     <string name="error_copy_to_clipboard">Ndodhi një gabim gjatë kopjimit të tekstit te e papastra</string>
     <string name="post_uploading">Po ngarkohet postimi</string>
-    <string name="stats_followers_years">%1$d vjet</string>
-    <string name="stats_followers_a_year">Një vit</string>
+    <string name="reader_empty_posts_in_blog">Ky sajt është i zbrazët</string>
+    <string name="themes_fetching">Po sillen temat…</string>
     <string name="stats_followers_months">%1$d muaj</string>
-    <string name="stats_followers_a_month">Një muaj</string>
-    <string name="stats_followers_days">%1$d ditë</string>
-    <string name="stats_followers_a_day">Një ditë</string>
-    <string name="stats_followers_hours">%1$d orë</string>
-    <string name="stats_followers_an_hour_ago">një orë më parë</string>
+    <string name="stats_followers_years">%1$d vjet</string>
     <string name="stats_followers_minutes">%1$d minuta</string>
+    <string name="stats_followers_an_hour_ago">një orë më parë</string>
+    <string name="stats_followers_hours">%1$d orë</string>
+    <string name="stats_followers_days">%1$d ditë</string>
     <string name="stats_followers_a_minute_ago">një minutë më parë</string>
     <string name="stats_followers_seconds_ago">sekonda më parë</string>
-    <string name="stats_view_followers">Ndjekës</string>
-    <string name="stats_view_publicize">Publicizoje</string>
-    <string name="stats_view_videos">Video</string>
     <string name="stats_view_top_posts_and_pages">Postime &amp;amp; Faqe</string>
+    <string name="stats_view_videos">Video</string>
+    <string name="stats_view_publicize">Publicizoje</string>
+    <string name="stats_view_followers">Ndjekës</string>
     <string name="stats_view_countries">Vende</string>
     <string name="stats_likes">Pëlqime</string>
-    <string name="stats_visitors">Vizitorë</string>
-    <string name="stats_views">Parje</string>
     <string name="stats_timeframe_years">Vite</string>
-    <string name="themes_fetching">Po sillen temat…</string>
+    <string name="stats_views">Parje</string>
+    <string name="stats_visitors">Vizitorë</string>
+    <string name="stats_followers_a_year">Një vit</string>
+    <string name="stats_followers_a_month">Një muaj</string>
+    <string name="stats_followers_a_day">Një ditë</string>
     <string name="ssl_certificate_details">Hollësi</string>
     <string name="cab_selected">%d të përzgjedhur</string>
-    <string name="browse_our_faq_button">Shfletoni PBR tonat</string>
     <string name="reader_empty_comments">Ende pa komente</string>
-    <string name="reader_empty_posts_in_tag">S’ka postime me këtë temë</string>
     <string name="reader_label_like">Pëlqim</string>
-    <string name="reader_label_view_original">Shihni shkrimin origjinal</string>
     <string name="reader_label_comments_closed">Komentet janë mbyllur</string>
-    <string name="reader_title_photo_viewer">%1$d nga %2$d</string>
-    <string name="error_publish_empty_post">S’botohet dot një postim i zbrazët</string>
-    <string name="error_refresh_unauthorized_posts">S’keni leje të shihni ose të përpunoni postime</string>
-    <string name="error_refresh_unauthorized_pages">S’keni leje të shihni ose të përpunoni faqe</string>
-    <string name="error_refresh_unauthorized_comments">S’keni leje të shihni ose të përpunoni postime komente</string>
-    <string name="more">Më tepër</string>
     <string name="older_month">Më të vjetër se një muaj</string>
-    <string name="older_last_week">Më të vjetër se një javë</string>
     <string name="older_two_days">Më të vjetër se 2 ditë</string>
-    <string name="mnu_comment_liked">U pëlqye</string>
+    <string name="older_last_week">Më të vjetër se një javë</string>
     <string name="comment">Koment</string>
     <string name="comment_trashed">Komenti u hodh te hedhurinat</string>
-    <string name="comment_reply_to_user">Përgjigjiuni %s</string>
     <string name="posts_empty_list">Ende pa postime. Pse nuk krijoni një?</string>
+    <string name="comment_reply_to_user">Përgjigjiuni %s</string>
     <string name="signing_out">Po dilet…</string>
+    <string name="reader_title_photo_viewer">%1$d nga %2$d</string>
+    <string name="mnu_comment_liked">U pëlqye</string>
+    <string name="more">Më tepër</string>
+    <string name="error_refresh_unauthorized_comments">S’keni leje të shihni ose të përpunoni postime komente</string>
+    <string name="error_refresh_unauthorized_pages">S’keni leje të shihni ose të përpunoni faqe</string>
+    <string name="error_refresh_unauthorized_posts">S’keni leje të shihni ose të përpunoni postime</string>
+    <string name="error_publish_empty_post">S’botohet dot një postim i zbrazët</string>
+    <string name="browse_our_faq_button">Shfletoni PBR tonat</string>
+    <string name="reader_label_view_original">Shihni shkrimin origjinal</string>
+    <string name="reader_empty_posts_in_tag">S’ka postime me këtë temë</string>
     <string name="reader_toast_err_generic">I pazoti të kryejë këtë veprim</string>
     <string name="reader_toast_err_block_blog">S’arrihet të bllokohet ky sajt</string>
-    <string name="reader_toast_blog_blocked">Postimet prej këtij sajti s’do të shfaqen më</string>
     <string name="reader_menu_block_blog">Bllokoje këtë sajt</string>
-    <string name="schedule_verb">Planifikoje</string>
+    <string name="reader_toast_blog_blocked">Postimet prej këtij sajti s’do të shfaqen më</string>
     <string name="update_verb">Përditësoje</string>
-    <string name="reader_empty_recommended_blogs">S’ka sajte të këshilluar</string>
-    <string name="reader_toast_err_unfollow_blog">S’arrihet të ndërpritet ndjekja e këtij sajti</string>
-    <string name="reader_toast_err_follow_blog">S’arrihet të ndiqet ky sajt</string>
-    <string name="reader_toast_err_already_follow_blog">E ndiqni tashmë këtë sajt</string>
+    <string name="schedule_verb">Planifikoje</string>
+    <string name="reader_page_followed_blogs">Sajte te ndjekur</string>
+    <string name="reader_title_blog_preview">Sajti i Lexuesit</string>
     <string name="reader_toast_err_get_blog_info">S’arrihet të shfaqet ky sajt</string>
+    <string name="reader_toast_err_already_follow_blog">E ndiqni tashmë këtë sajt</string>
+    <string name="reader_toast_err_follow_blog">S’arrihet të ndiqet ky sajt</string>
+    <string name="reader_toast_err_unfollow_blog">S’arrihet të ndërpritet ndjekja e këtij sajti</string>
     <string name="reader_label_followed_blog">Sajti u ndoq</string>
-    <string name="reader_hint_add_tag_or_url">Jepni një URL ose temë që të ndiqet</string>
-    <string name="reader_page_followed_blogs">Sajte te ndjekur</string>
+    <string name="reader_empty_recommended_blogs">S’ka sajte të këshilluar</string>
     <string name="reader_page_followed_tags">Tema të ndjekura</string>
-    <string name="reader_title_blog_preview">Sajti i Lexuesit</string>
-    <string name="ssl_certificate_ask_trust">Nëse zakonisht lidheni te ky sajt pa probleme, ky gabim mund të thotë që dikush po provon të hiqet si ky sajt, dhe s’duhet të vazhdoni. Doni të besohet dëshmia, sido qoftë?</string>
-    <string name="ssl_certificate_error">Dëshmi SSL e pavlefshme</string>
-    <string name="forgot_password">Humbët fjalëkalimin tuaj?</string>
+    <string name="reader_hint_add_tag_or_url">Jepni një URL ose temë që të ndiqet</string>
     <string name="help">Ndihmë</string>
-    <string name="username_or_password_incorrect">Emri i përdoruesit apo fjalëkalimi që dhatë është i pasaktë</string>
+    <string name="ssl_certificate_error">Dëshmi SSL e pavlefshme</string>
+    <string name="ssl_certificate_ask_trust">Nëse zakonisht lidheni te ky sajt pa probleme, ky gabim mund të thotë që dikush po provon të hiqet si ky sajt, dhe s’duhet të vazhdoni. Doni të besohet dëshmia, sido qoftë?</string>
+    <string name="blog_not_found">Ndodhi një gabim gjatë hyrjes te ky blog</string>
+    <string name="theme_fetch_failed">Dështoi sjellja e temave</string>
+    <string name="mnu_comment_unspam">Jo i padëshiruar</string>
+    <string name="adding_cat_failed">Shtimi i kategorisë dështoi</string>
+    <string name="adding_cat_success">Kategoria u shtua me sukses</string>
+    <string name="cat_name_required">Emri i kategorisë është i domosdoshëm</string>
+    <string name="sdcard_message">Për të ngarkuar media, lypset një kartë SD e montuar</string>
+    <string name="error_generic">Ndodhi një gabim</string>
+    <string name="error_moderate_comment">Ndodhi një gabim gjatë moderimit</string>
+    <string name="error_edit_comment">Ndodhi një gabim gjatë përpunimit të komentit</string>
+    <string name="error_load_comment">S\'u ngarkua dot komenti</string>
+    <string name="error_downloading_image">Gabim në shkarkim figure</string>
     <string name="email_invalid">Jepni një adresë email të vlefshme</string>
+    <string name="username_or_password_incorrect">Emri i përdoruesit apo fjalëkalimi që dhatë është i pasaktë</string>
+    <string name="error_deleting_post">Ndodhi një gabim teksa fshihej postimi</string>
     <string name="invalid_email_message">Adresa juaj email s’është e vlefshme</string>
-    <string name="error_downloading_image">Gabim në shkarkim figure</string>
-    <string name="error_load_comment">S\'u ngarkua dot komenti</string>
-    <string name="error_edit_comment">Ndodhi një gabim gjatë përpunimit të komentit</string>
-    <string name="error_moderate_comment">Ndodhi një gabim gjatë moderimit</string>
-    <string name="error_generic">Ndodhi një gabim</string>
     <string name="error_refresh_comments">Komentet s’u rifreskuan dot tani</string>
     <string name="error_refresh_pages">Postimet s’u rifreskuan dot tani</string>
     <string name="error_refresh_posts">Postimet s’u rifreskuan dot tani</string>
-    <string name="error_deleting_post">Ndodhi një gabim teksa fshihej postimi</string>
     <string name="notifications_empty_list">S’ka njoftime</string>
-    <string name="sdcard_message">Për të ngarkuar media, lypset një kartë SD e montuar</string>
-    <string name="cat_name_required">Emri i kategorisë është i domosdoshëm</string>
-    <string name="adding_cat_success">Kategoria u shtua me sukses</string>
-    <string name="adding_cat_failed">Shtimi i kategorisë dështoi</string>
-    <string name="mnu_comment_unspam">Jo i padëshiruar</string>
-    <string name="theme_fetch_failed">Dështoi sjellja e temave</string>
-    <string name="blog_not_found">Ndodhi një gabim gjatë hyrjes te ky blog</string>
     <string name="gallery_error">S’u mor dot objekti media</string>
     <string name="no_network_message">S’ka rrjet gati</string>
-    <string name="reader_toast_err_remove_tag">S’arrihet të hiqet kjo temë</string>
-    <string name="reader_toast_err_add_tag">S’arrihet të shtohet kjo temë</string>
-    <string name="reader_title_applog">Regjistër aplikacioni</string>
-    <string name="fatal_db_error">Ndodhi një gabim gjatë krijimit të bazës së të dhënave për aplikacionin. Provoni të riinstaloni aplikacionin.</string>
-    <string name="error_blog_hidden">Ky blog është i fshehur dhe s’u ngarkua dot. Aktivizojeni sërish te rregullimet dhe riprovoni.</string>
-    <string name="error_refresh_media">Media s’u rifreskua dot tani</string>
-    <string name="wordpress_blog">Blog WordPress</string>
-    <string name="image_settings">Rregullime figurash</string>
-    <string name="local_changes">Ndryshime vendore</string>
-    <string name="privacy_policy">Rregulla privatësie</string>
-    <string name="new_media">Media e re</string>
+    <string name="select_categories">Përzgjidhni kategori</string>
+    <string name="connection_error">Gabim lidhjeje</string>
+    <string name="cancel_edit">Anuloni përpunimin</string>
+    <string name="learn_more">Mësoni më tepër</string>
+    <string name="media_gallery_type_thumbnail_grid">Rrjetë miniaturash</string>
+    <string name="link_enter_url_text">Tekst lidhjeje (opsional)</string>
+    <string name="page_settings">Rregullime faqeje</string>
+    <string name="local_draft">Skicë vendore</string>
+    <string name="post_settings">Rregullime postimi</string>
+    <string name="comment_status_approved">Të miratuar</string>
+    <string name="comment_status_unapproved">Në pritje</string>
+    <string name="comment_status_spam">I padëshiruar</string>
+    <string name="comment_status_trash">U hodh te hedhurinat</string>
+    <string name="edit_comment">Përpunoni komentin</string>
+    <string name="mnu_comment_approve">Miratoje</string>
+    <string name="mnu_comment_unapprove">Shmiratoje</string>
+    <string name="mnu_comment_spam">I padëshiruar</string>
+    <string name="mnu_comment_trash">Hedhurina</string>
+    <string name="dlg_approving_comments">Po miratohet</string>
+    <string name="dlg_spamming_comments">Po shënohet si i padëshiruar</string>
+    <string name="dlg_trashing_comments">Po kalohet te hedhurinat</string>
+    <string name="dlg_confirm_trash_comments">Të kalohet te hedhurinat?</string>
+    <string name="trash">Hedhurina</string>
+    <string name="saving_changes">Po ruhen ndryshimet</string>
+    <string name="sure_to_cancel_edit_comment">Të anulohet përpunimi i këtij dokumenti?</string>
+    <string name="content_required">Komenti është i domosdoshëm</string>
+    <string name="remove_account">Hiqe sajtin</string>
+    <string name="view_in_browser">Shiheni në shfletues</string>
+    <string name="add_new_category">Shtoni kategori të re</string>
+    <string name="category_name">Emër kategorie</string>
+    <string name="open_source_licenses">Licenca burimi të hapur</string>
     <string name="new_post">Postim i ri</string>
-    <string name="notifications_empty_all">Ende pa njoftime.</string>
-    <string name="http_authorization_required">Lypset autorizim</string>
+    <string name="new_media">Media e re</string>
+    <string name="privacy_policy">Rregulla privatësie</string>
+    <string name="local_changes">Ndryshime vendore</string>
+    <string name="image_settings">Rregullime figurash</string>
+    <string name="wordpress_blog">Blog WordPress</string>
+    <string name="fatal_db_error">Ndodhi një gabim gjatë krijimit të bazës së të dhënave për aplikacionin. Provoni të riinstaloni aplikacionin.</string>
+    <string name="reader_title_applog">Regjistër aplikacioni</string>
+    <string name="post_not_found">Ndodhi një gabim teksa ngarkohej postimi. Rifreskoni postimet tuaja dhe riprovoni.</string>
+    <string name="dlg_unapproving_comments">Po shmiratohet</string>
     <string name="invalid_site_url_message">Kontrolloni nëse URL-ja e sajtit të dhënë është e vlefshme</string>
-    <string name="open_source_licenses">Licenca burimi të hapur</string>
+    <string name="http_authorization_required">Lypset autorizim</string>
+    <string name="notifications_empty_all">Ende pa njoftime.</string>
+    <string name="error_refresh_media">Media s’u rifreskua dot tani</string>
+    <string name="error_blog_hidden">Ky blog është i fshehur dhe s’u ngarkua dot. Aktivizojeni sërish te rregullimet dhe riprovoni.</string>
     <string name="file_error_create">S’u krijua dot kartelë e përkohshme për ngarkim medie. Sigurohuni që në pajisjen tuaj ka hapësirë të lirë të mjaftueshme.</string>
-    <string name="category_name">Emër kategorie</string>
-    <string name="add_new_category">Shtoni kategori të re</string>
-    <string name="view_in_browser">Shiheni në shfletues</string>
-    <string name="remove_account">Hiqe sajtin</string>
     <string name="toast_comment_unedited">Komenti s’ndryshoi</string>
-    <string name="content_required">Komenti është i domosdoshëm</string>
-    <string name="sure_to_cancel_edit_comment">Të anulohet përpunimi i këtij dokumenti?</string>
-    <string name="saving_changes">Po ruhen ndryshimet</string>
-    <string name="trash">Hedhurina</string>
-    <string name="dlg_confirm_trash_comments">Të kalohet te hedhurinat?</string>
-    <string name="dlg_trashing_comments">Po kalohet te hedhurinat</string>
-    <string name="dlg_spamming_comments">Po shënohet si i padëshiruar</string>
-    <string name="dlg_unapproving_comments">Po shmiratohet</string>
-    <string name="dlg_approving_comments">Po miratohet</string>
-    <string name="mnu_comment_trash">Hedhurina</string>
-    <string name="mnu_comment_spam">I padëshiruar</string>
-    <string name="mnu_comment_unapprove">Shmiratoje</string>
-    <string name="mnu_comment_approve">Miratoje</string>
-    <string name="edit_comment">Përpunoni komentin</string>
-    <string name="comment_status_trash">U hodh te hedhurinat</string>
-    <string name="comment_status_spam">I padëshiruar</string>
-    <string name="comment_status_unapproved">Në pritje</string>
-    <string name="comment_status_approved">Të miratuar</string>
-    <string name="delete_page">Të fshihet faqja?</string>
-    <string name="delete_post">Të fshihet postimi?</string>
-    <string name="post_settings">Rregullime postimi</string>
     <string name="file_not_found">S’u gjet dot kartela media për ngarkim. Mos është fshirë apo lëvizur?</string>
-    <string name="local_draft">Skicë vendore</string>
-    <string name="page_settings">Rregullime faqeje</string>
-    <string name="link_enter_url_text">Tekst lidhjeje (opsional)</string>
     <string name="cannot_delete_multi_media_items">Disa media s’fshihen dot hëpërhë. Riprovoni më vonë.</string>
     <string name="media_error_no_permission">S’keni leje të shihni mediatekën</string>
-    <string name="media_gallery_type_thumbnail_grid">Rrjetë miniaturash</string>
-    <string name="learn_more">Mësoni më tepër</string>
-    <string name="post_not_found">Ndodhi një gabim teksa ngarkohej postimi. Rifreskoni postimet tuaja dhe riprovoni.</string>
     <string name="plugin_not_found">Ndodhi një gabim gjatë hyrjes te kjo shtojcë</string>
-    <string name="cancel_edit">Anuloni përpunimin</string>
-    <string name="connection_error">Gabim lidhjeje</string>
-    <string name="select_categories">Përzgjidhni kategori</string>
+    <string name="delete_post">Të fshihet postimi?</string>
+    <string name="delete_page">Të fshihet faqja?</string>
+    <string name="reader_toast_err_add_tag">S’arrihet të shtohet kjo temë</string>
+    <string name="reader_toast_err_remove_tag">S’arrihet të hiqet kjo temë</string>
     <string name="share_link">Ndajeni lidhjen me të tjerët</string>
     <string name="reader_empty_posts_in_tag_updating">Po sillen postime…</string>
-    <string name="reader_likes_you_and_multi">Këtë e pëlqeni ju dhe %,d të tjerë</string>
     <string name="reader_likes_multi">Kjo u pëlqen %,d personave</string>
-    <string name="reader_label_reply">Përgjigjuni</string>
-    <string name="cant_share_no_visible_blog">S’mund të ndani me të tjerët në WordPress pa një blog të dukshëm</string>
     <string name="comment_spammed">Komenti u shënua si i padëshiruar</string>
-    <string name="reader_toast_err_get_post">I pazoti të marrë këtë postim</string>
+    <string name="reader_likes_you_and_multi">Këtë e pëlqeni ju dhe %,d të tjerë</string>
+    <string name="cant_share_no_visible_blog">S’mund të ndani me të tjerët në WordPress pa një blog të dukshëm</string>
+    <string name="reader_label_reply">Përgjigjuni</string>
     <string name="reader_likes_you_and_one">Këtë e pëlqeni ju dhe një tjetër</string>
-    <string name="pick_video">Përzgjidhni video</string>
     <string name="pick_photo">Përzgjidhni foto</string>
-    <string name="sign_up_label">Regjistrohuni</string>
+    <string name="pick_video">Përzgjidhni video</string>
+    <string name="reader_toast_err_get_post">I pazoti të marrë këtë postim</string>
+    <string name="empty_list_default">Kjo listë është e zbrazët</string>
+    <string name="reader_untitled_post">(Pa titull)</string>
+    <string name="reader_btn_share">Ndajeni me të tjerët</string>
+    <string name="reader_btn_follow">Ndiqe</string>
+    <string name="reader_label_added_tag">U shtua %s</string>
+    <string name="reader_label_removed_tag">U hoq %s</string>
+    <string name="reader_likes_one">Kjo i pëlqen një personi</string>
+    <string name="reader_likes_only_you">E pëlqeni</string>
+    <string name="reader_btn_unfollow">Ndjekur prej jush</string>
     <string name="reader_toast_err_url_intent">S’arrin të hapë %s</string>
     <string name="reader_toast_err_view_image">S’arrin të shihet figura</string>
     <string name="reader_toast_err_share_intent">S’arrin të ndajë me të tjerët</string>
-    <string name="reader_toast_err_tag_invalid">Kjo s’është temë e vlefshme</string>
-    <string name="reader_toast_err_tag_exists">E ndiqni tashmë këtë temë</string>
     <string name="reader_toast_err_comment_failed">S’u postua dot komenti juaj</string>
-    <string name="reader_likes_only_you">E pëlqeni</string>
-    <string name="reader_likes_one">Kjo i pëlqen një personi</string>
-    <string name="reader_label_removed_tag">U hoq %s</string>
-    <string name="reader_label_added_tag">U shtua %s</string>
+    <string name="comments_empty_list">Ende pa komente</string>
     <string name="reader_hint_comment_on_comment">Përgjigjuni komentit…</string>
-    <string name="reader_btn_unfollow">Ndjekur prej jush</string>
-    <string name="reader_btn_follow">Ndiqe</string>
-    <string name="reader_btn_share">Ndajeni me të tjerët</string>
     <string name="reader_view_reblog">Riblogoje</string>
-    <string name="reader_untitled_post">(Pa titull)</string>
-    <string name="comments_empty_list">Ende pa komente</string>
-    <string name="empty_list_default">Kjo listë është e zbrazët</string>
-    <string name="stats_timeframe_months">Muaj</string>
-    <string name="stats_timeframe_weeks">Javë</string>
-    <string name="stats_timeframe_days">Ditë</string>
-    <string name="stats_timeframe_yesterday">Dje</string>
-    <string name="stats_timeframe_today">Sot</string>
-    <string name="stats_view_referrers">Referues</string>
-    <string name="stats_view_tags_and_categories">Etiketa &amp; Kategori</string>
-    <string name="stats_view_clicks">Klikime</string>
-    <string name="stats">Statistika</string>
-    <string name="share_action">Ndajeni me të tjerët</string>
+    <string name="sign_up_label">Regjistrohuni</string>
+    <string name="reader_toast_err_tag_exists">E ndiqni tashmë këtë temë</string>
+    <string name="reader_toast_err_tag_invalid">Kjo s’është temë e vlefshme</string>
+    <string name="themes">Tema</string>
+    <string name="media_gallery_type_squares">Katrorë</string>
+    <string name="media_gallery_type_tiled">Tjegullëzuar</string>
+    <string name="media_gallery_type_circles">Rrathë</string>
+    <string name="media_gallery_type_slideshow">Diapozitiva</string>
+    <string name="media_edit_title_text">Titull</string>
+    <string name="media_edit_caption_text">Legjendë</string>
+    <string name="media_edit_description_text">Përshkrim</string>
     <string name="theme_activate_button">Aktivizoje</string>
+    <string name="share_action">Ndajeni me të tjerët</string>
+    <string name="stats">Statistika</string>
+    <string name="stats_view_clicks">Klikime</string>
+    <string name="stats_view_tags_and_categories">Etiketa &amp; Kategori</string>
+    <string name="stats_view_referrers">Referues</string>
+    <string name="stats_timeframe_today">Sot</string>
+    <string name="stats_timeframe_yesterday">Dje</string>
+    <string name="stats_timeframe_days">Ditë</string>
+    <string name="stats_timeframe_weeks">Javë</string>
+    <string name="stats_timeframe_months">Muaj</string>
     <string name="media_edit_failure">S’u përditësua dot</string>
-    <string name="media_edit_description_text">Përshkrim</string>
-    <string name="media_edit_caption_text">Legjendë</string>
-    <string name="media_edit_title_text">Titull</string>
-    <string name="media_gallery_type_slideshow">Diapozitiva</string>
-    <string name="media_gallery_type_circles">Rrathë</string>
-    <string name="media_gallery_type_tiled">Tjegullëzuar</string>
-    <string name="media_gallery_type_squares">Katrorë</string>
-    <string name="themes">Tema</string>
     <string name="discard">Hidhe Tej</string>
     <string name="manage">Administroni</string>
-    <string name="more_notifications">dhe%d të tjera.</string>
-    <string name="new_notifications">%d njoftime të reja</string>
+    <string name="sign_in">Hyni</string>
     <string name="follows">Ndjekje</string>
+    <string name="new_notifications">%d njoftime të reja</string>
+    <string name="more_notifications">dhe%d të tjera.</string>
     <string name="note_reply_successful">Përgjigja u botua</string>
-    <string name="sign_in">Hyni</string>
     <string name="loading">Po ngarkohet…</string>
-    <string name="httppassword">Fjalëkalim HTTP</string>
     <string name="httpuser">Emër përdoruesi HTTP</string>
+    <string name="httppassword">Fjalëkalim HTTP</string>
     <string name="error_media_upload">Ndodhi një gabim gjatë ngarkimit të medias</string>
     <string name="incorrect_credentials">Emër përdoruesi ose fjalëkalim i pasaktë.</string>
-    <string name="log_in">Hyni</string>
-    <string name="username">Emër përdoruesi</string>
     <string name="password">Fjalëkalim</string>
+    <string name="username">Emër përdoruesi</string>
+    <string name="log_in">Hyni</string>
     <string name="reader">Lexues</string>
     <string name="pages">Faqe</string>
     <string name="posts">Postime</string>
     <string name="anonymous">I paemër</string>
     <string name="no_network_title">S’ka rrjet gati</string>
-    <string name="done">u bë</string>
     <string name="ok">OK</string>
+    <string name="done">u bë</string>
     <string name="link_enter_url">URL</string>
-    <string name="tos">Kushte Shërbimi</string>
     <string name="version">Version</string>
+    <string name="tos">Kushte Shërbimi</string>
     <string name="app_title">WordPress për Android</string>
     <string name="image_alignment">Drejtim</string>
     <string name="refresh">Rifresko</string>
@@ -2477,24 +2776,24 @@ Language: sq_AL
     <string name="quickpress_add_error">Emri i shkurtores s’mund të jetë i zbrazët</string>
     <string name="pages_private">Private</string>
     <string name="title">Titull</string>
-    <string name="tags_separate_with_commas">Etiketat ndajini me presje</string>
     <string name="categories">Kategori</string>
+    <string name="tags_separate_with_commas">Etiketat ndajini me presje</string>
     <string name="dlg_deleting_comments">Po fshihen komente</string>
     <string name="sdcard_title">Lypset Kartë SD</string>
     <string name="media">Media</string>
-    <string name="approve">Miratojeni</string>
     <string name="delete">Fshije</string>
+    <string name="approve">Miratojeni</string>
     <string name="none">Asnjë</string>
-    <string name="publish_now">Botoje Që Tani</string>
-    <string name="reply">Përgjigjuni</string>
-    <string name="on">on</string>
-    <string name="preview">Paraparje</string>
-    <string name="category_refresh_error">Gabim rifreskimi kategorish</string>
     <string name="error">Gabim</string>
-    <string name="no">Jo</string>
+    <string name="cancel">Anuloje</string>
+    <string name="save">Ruaje</string>
+    <string name="add">Shtoni</string>
+    <string name="category_refresh_error">Gabim rifreskimi kategorish</string>
+    <string name="preview">Paraparje</string>
+    <string name="on">on</string>
     <string name="yes">Po</string>
+    <string name="no">Jo</string>
     <string name="notification_settings">Rregullime Njoftimesh</string>
-    <string name="add">Shtoni</string>
-    <string name="save">Ruaje</string>
-    <string name="cancel">Anuloje</string>
+    <string name="reply">Përgjigjuni</string>
+    <string name="publish_now">Botoje Që Tani</string>
 </resources>
diff --git a/WordPress/src/main/res/values-sr/strings.xml b/WordPress/src/main/res/values-sr/strings.xml
index 654286f6e9c9..8a874861efb3 100644
--- a/WordPress/src/main/res/values-sr/strings.xml
+++ b/WordPress/src/main/res/values-sr/strings.xml
@@ -1,11 +1,1638 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2015-09-21 11:11:47+0000
+Translation-Revision-Date: 2021-04-17 21:48:14+0000
 Plural-Forms: nplurals=3; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : ((n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14)) ? 1 : 2);
 Generator: GlotPress/3.0.0-alpha.2
 Language: sr_RS
 -->
 <resources>
+    <string name="gutenberg_native_search_blocks">Блокови претраге</string>
+    <string name="gutenberg_native_search_block">Блок претраге</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s је %3$s %4$s.</string>
+    <string name="activity_log_backup_download_notice_download_action">Преузми</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Одбаци</string>
+    <string name="threat_fix_all_status_success_message_plural">Претње су успешно исправљене.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Молимо потврдите да желите да исправите свих %s активних претњи.</string>
+    <string name="scan_idle_threats_description_plural">Скенирањем је пронађено %1s потенцијалних претњи са %2s. Молимо прегледајте их и примените радњу или притисните дугме за поправку свих. Ми смо %3$s ако смо Вам потребни.</string>
+    <string name="quick_start_card_menu_hide">Сакриј за сада</string>
+    <string name="quick_start_list_view_site_title">Посетите своје веб место</string>
+    <string name="quick_start_list_upload_icon_subtitle">Додајте иконицу веб места за исполиран професионални изглед.</string>
+    <string name="quick_start_list_follow_site_subtitle">Откријте и пратите веб места која Вас инспиришу.</string>
+    <string name="quick_start_list_enable_sharing_title">Омогући дељење</string>
+    <string name="quick_start_list_check_stats_title">Проверите своју статистику</string>
+    <string name="restore_warning_action_button">Потврди</string>
+    <string name="gutenberg_native_replace_file">Замени датотеку</string>
+    <string name="gutenberg_native_replace_audio">Замени звучни запис</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Проблем приликом отварања звучног записа</string>
+    <string name="gutenberg_native_open">ОТВОРИ</string>
+    <string name="gutenberg_native_lock_icon">Иконица за закључавање</string>
+    <string name="gutenberg_native_choose_audio">Одабери звучни запис</string>
+    <string name="gutenberg_native_audio_file">Датотека звучног записа</string>
+    <string name="gutenberg_native_add_audio">ДОДАЈ ЗВУЧНИ ЗАПИС</string>
+    <string name="photo_picker_use_audio">Употреби овај звучни запис</string>
+    <string name="photo_picker_choose_audio">Одабери звучни запис са уређаја</string>
+    <string name="threat_status_fixed">Поправљено</string>
+    <string name="threat_found_header">Пронађено</string>
+    <string name="pick_audio">Одабери звучни запис</string>
+    <string name="restore_complete_failed_icon_content_description">Иконица грешке</string>
+    <string name="restore_complete_failed_action_button_content_description">Дугме за урађено</string>
+    <string name="restore_complete_visit_site_button_content_description">Дугме за посети веб место</string>
+    <string name="restore_complete_done_button_content_description">Дугме за урађено</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_warning_header">Упозорење</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Дугме за урађено</string>
+    <string name="backup_download_complete_failed_action_button">Урађено</string>
+    <string name="backup_download_complete_failed_title">Неуспело преузимање</string>
+    <string name="backup_item_sqls">База података веб места</string>
+    <string name="backup_item_roots_hint">(садржи wp-config.php и све не-Вордпресове датотеке)</string>
+    <string name="backup_item_media_uploads">Отпремања садржаја</string>
+    <string name="backup_item_plugins">Вордпресови додаци</string>
+    <string name="backup_item_themes">Вордпрес теме</string>
+    <string name="gutenberg_native_error">Грешка</string>
+    <string name="gutenberg_native_choose_file">Одабери датотеку</string>
+    <string name="activity_log_item_menu_restore_label">Поврати на ову тачку</string>
+    <string name="activity_log_activity_type_filter_label">Тип активности</string>
+    <string name="activity_log_date_range_filter_label">Распон датума</string>
+    <string name="activity_log_activity_type_filter_header">Филтрирај по типу активности</string>
+    <string name="gutenberg_native_file_name">Назив датотеке</string>
+    <string name="gutenberg_native_edit_file">Уреди датотеку</string>
+    <string name="gutenberg_native_copy_file_url">Ископирај URL датотеке</string>
+    <string name="gutenberg_native_choose_a_file">ОДАБЕРИ ДАТОТЕКУ</string>
+    <string name="new_site_creation_domain_header_title">Одабери домен</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="my_site_btn_jetpack_settings">Подешавања Jetpack-а</string>
+    <string name="activity_log_activity_type_filter_clear">Очисти</string>
+    <string name="activity_log_activity_type_filter_apply">Примени</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF датотеке нису подржане</string>
+    <string name="color_picker_label_background">Позадина</string>
+    <string name="color_picker_label_text">Текст</string>
+    <string name="dialog_discard_story_ok_button_edit">Одбаци</string>
+    <string name="dialog_discard_story_title_edit">Одбацити измене?</string>
+    <string name="label_done_button">Готово</string>
+    <string name="label_next_button">Следеће</string>
+    <string name="delete_button_alt">Обриши</string>
+    <string name="hpp_choose_error">Дошло је до грешке при одабиру дизајна.</string>
+    <string name="hpp_error_subtitle">Додирните на покушај поново када се поново повежете на мрежу.</string>
+    <string name="dialog_discard_story_message_edit">Било које измене неће бити сачуване.</string>
+    <string name="hpp_retry_error">Молимо проверите своју интернет везу и покушајте поново.</string>
+    <string name="reader_discover_empty_title">Добродошли!</string>
+    <string name="reader_discover_no_posts_title">Нема недавних чланака</string>
+    <string name="scan">Скенирај</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Јохан Брант&lt;/b&gt; је одговорио на ваш чланак</string>
+    <string name="hpp_skip_button">Прескочи</string>
+    <string name="hpp_choose_button">Одабери</string>
+    <string name="hpp_title">Одаберите дизајн</string>
+    <string name="prepublishing_nudges_add_category_button">Додај категорију</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Додај нову категорију</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Категорије</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Није постављено</string>
+    <string name="prepublishing_nudges_categories_action">Категорије</string>
+    <string name="login_prologue_fifth_caption_three">Музеји у Лондону</string>
+    <string name="login_prologue_fifth_tag_six">Политика</string>
+    <string name="login_prologue_fifth_tag_five">Музика</string>
+    <string name="login_prologue_fifth_tag_four">Баштованство</string>
+    <string name="login_prologue_fifth_tag_three">Фудбал</string>
+    <string name="login_prologue_fifth_tag_two">Кување</string>
+    <string name="login_prologue_fifth_tag_one">Уметност</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_fifth_caption_one">Мојих десет најбољих кафића</string>
+    <string name="login_prologue_second_subtitle_two">Врло сам инспирисан радом фотографа Камерона Карстена. Испробаваћу ове технике на свом следећем</string>
+    <string name="login_prologue_fifth_subtitle_two">Веб новости</string>
+    <string name="login_prologue_title_second">Помоћу моћног уређивача можете да објављујете у покрету.</string>
+    <string name="login_prologue_title_third">Видите коментаре и обавештења у реалном времену.</string>
+    <string name="login_prologue_title_first">Добродошли у најпопуларнији градитељ веб страница на свету.</string>
+    <string name="login_prologue_title_fourth">Гледајте раст ваше публике помоћу дубинске аналитике.</string>
+    <string name="login_prologue_title_fifth">Пратите своје омиљене локације и откривајте нове блогове.</string>
+    <string name="media_loading_failed">Учитавање садржаја није успело</string>
+    <string name="reader_discover_recommended_blogs_header">Веб места за праћење</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\'%s\' није у потпуности подржан</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Дајемо све од себе да додамо нове блокове са сваком објавом.</string>
+    <string name="gutenberg_native_help_button">Дугме помоћи</string>
+    <string name="gutenberg_native_edit_using_web_editor">Уреди помоћу веб уређивача</string>
+    <string name="gutenberg_native_choose_images">Одабери слике</string>
+    <string name="stories_intro_create_story_post_label">Направи чланак приче</string>
+    <string name="stories_intro_title_second">Чланци приче не нестају</string>
+    <string name="stories_intro_title_first">Приче су сада за све</string>
+    <string name="stories_intro_image_caption_second">Пример наслова приче</string>
+    <string name="stories_intro_image_caption_first">Како направити чланак приче</string>
+    <string name="stories_intro_main_title">Представљамо чланке приче</string>
+    <string name="mlp_notice_blank_page_created">Празна страница је направљена</string>
+    <string name="mlp_notice_page_created">Страница направљена</string>
+    <string name="reader_label_toolbar_back">Назад</string>
+    <string name="reader_post_details_header_by_author_name">Од</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Означи као непожељно</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Уклони ознаку непожељног</string>
+    <string name="stats_referrer_popup_menu_open_website">Отвори веб место</string>
+    <string name="mlp_selected_description">%s одабрано</string>
+    <string name="permission_microphone">Микрофон</string>
+    <string name="reader_menu_report_post">Пријави овај чланак</string>
+    <string name="error_media_xmlrpc_not_allowed">Ваша акција није дозвољена</string>
+    <string name="reader_welcome_banner">Добродошли у читач. Откријте милионе блогова на дохват руке.</string>
+    <string name="error_media_xmlrcp_server_error">Дошло је до интерне грешке сервера</string>
+    <string name="show_n_hidden_items_desc">још %1$s ставки</string>
+    <string name="gutenberg_native_select_a_layout">Изаберите распоред</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Сакрити</string>
+    <string name="create_page_fab_tooltip">Направити страницу</string>
+    <string name="create_post_story_fab_tooltip">Направити чланак или причу</string>
+    <string name="create_post_fab_tooltip">Направити чланак</string>
+    <string name="reader_discover_interests_header">Можда Вам се свиди</string>
+    <string name="gutenberg_native_video_caption_empty">Натпис видео записа. Празно</string>
+    <string name="gutenberg_native_updates_the_title">Ажурира наслов.</string>
+    <string name="gutenberg_native_paste_block_after">Залепи блок након</string>
+    <string name="gutenberg_native_page_title_s">Наслов странице. %s</string>
+    <string name="gutenberg_native_page_title_empty">Наслов странице. Празно</string>
+    <string name="toast_error_playing_video">Грешка се појавила током пуштања Вашег видео записа</string>
+    <string name="camera_error">Овај уређај не подржава Camera2 API.</string>
+    <string name="toast_error_saving_video">Видео запис није могао бити сачуван</string>
+    <string name="toast_error_saving_image">Грешка приликом чувања слике</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Види складиште</string>
+    <string name="toast_capture_operation_in_progress">Операција у току, покушајте поново</string>
+    <string name="toast_story_page_not_found">Није могуће пронаћи слајд Приче</string>
+    <string name="dialog_insufficient_device_storage_error_title">Недеовољно складишта на уређају</string>
+    <string name="dialog_story_saving_error_title_plural">Није могуће сачувати %1$d слајдове</string>
+    <string name="dialog_story_saving_error_title_singular">Није могуће сачувати 1 слајд</string>
+    <string name="story_saving_failed_quick_action_manage">Управљај</string>
+    <string name="story_saving_failed_message_plural">%1$d слајдова захтева радњу</string>
+    <string name="story_saving_failed_message_singular">1 слајд захтева радњу</string>
+    <string name="dialog_story_saving_error_message">Покушајте поново да сачувате или обришете слајдове, затим покушајте поново да објавите Вашу причу.</string>
+    <string name="story_saving_failed_title">Није могуће отпремити \"%1$s\"</string>
+    <string name="story_saving_snackbar_finished_with_error">Није могуће отпремити \"%1$s\"</string>
+    <string name="story_saving_snackbar_finished_successfully">\"%1$s\" је објављен</string>
+    <string name="story_saving_snackbar_started">Отпремање \"%1$s\"…</string>
+    <string name="story_saving_subtitle_frames_remaining_plural">%1$d преосталих слајдова</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">1 преостао слајд</string>
+    <string name="story_saving_title_several">неколико прича</string>
+    <string name="story_saving_title">Снимање \"%1$s\"…</string>
+    <string name="story_saving_untitled">Без наслова</string>
+    <string name="dialog_discard_story_ok_button">Одбаци</string>
+    <string name="dialog_discard_story_message">Ваш чланак Приче се неће сачувати као нацрт.</string>
+    <string name="dialog_discard_story_title">Одбаци чланак приче?</string>
+    <string name="dialog_discard_page_ok_button">Обриши</string>
+    <string name="dialog_discard_page_message">Овај слајд ће бити уклоњен из Ваше приче.</string>
+    <string name="dialog_discard_errored_page_message">Овај слајд још увек није сачуван. Ако обришете овај слајд, изгубићете сва уређивања која сте направили.</string>
+    <string name="dialog_discard_page_title">Обриши слајд приче?</string>
+    <string name="label_text_color_button">Измени боју текста</string>
+    <string name="label_text_alignment_button">Измени поравнање текста</string>
+    <string name="label_frame_errored">има грешку</string>
+    <string name="label_frame_selected_border">одабрано</string>
+    <string name="label_frame_unselected_border">није одабрано</string>
+    <string name="mlp_create_page">Напарвити страницу</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Направити чланак или причу</string>
+    <string name="mlp_create_blank_page">Направити празну страницу</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Направите чланак, страницу или причу</string>
+    <string name="label_frame_image">Слајд</string>
+    <string name="label_retry_icon">Покушај поново</string>
+    <string name="label_saved_icon">Сачувано</string>
+    <string name="label_close_button">Затвори</string>
+    <string name="label_share_to">Подели</string>
+    <string name="label_snackbar_share">ПОДЕЛИ</string>
+    <string name="label_snackbar_loop_frame_saved">Сачувано међу фотографијама</string>
+    <string name="label_control_retry">Покушај поново</string>
+    <string name="label_control_saved">Сачувано</string>
+    <string name="label_control_saving">Чува се</string>
+    <string name="label_control_flip_camera">Окрени</string>
+    <string name="label_control_flash">Блиц</string>
+    <string name="sound_button_alt">Звук</string>
+    <string name="text_button_alt">Текст</string>
+    <string name="stickers_button_alt">Налепнице</string>
+    <string name="flash_button_alt">Блиц</string>
+    <string name="flip_button_alt">Окрени камеру</string>
+    <string name="capture_button_alt">Ухвати</string>
+    <string name="mlp_preview_page">Преглед</string>
+    <string name="mlp_choose_layout_title">Одабери распоред</string>
+    <string name="prepublishing_nudges_story_title_hint">Доделите својој причи наслов</string>
+    <string name="photo_picker_choose_file">Одабери са уређаја</string>
+    <string name="my_site_bottom_sheet_add_story">Чланак приче</string>
+    <string name="error_media_quota_exceeded">Прекорачено ограничење складиштења</string>
+    <string name="pick_file">Додај датотеку</string>
+    <string name="gutenberg_native_replace_video">Замени видео запис</string>
+    <string name="gutenberg_native_replace_image_or_video">Замени слику или видео запис</string>
+    <string name="gutenberg_native_choose_video">Одабери видео запис</string>
+    <string name="gutenberg_native_choose_image_or_video">Одабери слику или видео запис</string>
+    <string name="gutenberg_native_choose_image">Одабери слику</string>
+    <string name="gutenberg_native_block_removed">Уклоњен блок</string>
+    <string name="signup_confirmation_title">Потврда пријаве</string>
+    <string name="enter_your_site_address">Унесите постојећу адресу свој сајта</string>
+    <string name="continue_terms_of_service_text">Наставком, прихваћате наше %1$sУслове коришћења%2$s.</string>
+    <string name="login_or">или</string>
+    <string name="continue_google_button_suffix">Настави са Google-ом</string>
+    <string name="login_done">Готово</string>
+    <string name="magic_link_not_seeing_email_message">Не видите електронску пошту? Проверите Непожељну пошту или Смеће.</string>
+    <string name="create_account">Направите налог</string>
+    <string name="check_email">Провери електронску пошту</string>
+    <string name="get_started">Започните</string>
+    <string name="or_type_your_password">Или укуцајте своју лозинку</string>
+    <string name="send_link_by_email">Пошаљи повезницу електронском поштом</string>
+    <string name="reset_your_password">Ресетујте своју лозинку</string>
+    <string name="quick_start_list_update_site_title_title">Поставите наслов свог сајта</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Додирни &lt;b&gt;%1$s&lt;/b&gt; за постављање новог наслова</string>
+    <string name="gutenberg_native_s_block_options">опције блока %s</string>
+    <string name="gutenberg_native_duplicate_block">Дуплирај блок</string>
+    <string name="gutenberg_native_copy_block">Копирај блок</string>
+    <string name="gutenberg_native_copied_block">Ископиран блок</string>
+    <string name="gutenberg_native_block_pasted">Блок залепљен</string>
+    <string name="gutenberg_native_block_duplicated">Блок дуплиран</string>
+    <string name="gutenberg_native_block_cut">Блок исечен</string>
+    <string name="gutenberg_native_block_copied">Блок копиран</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">Наслов сајта може да измени само корисник са администраторском улогом.</string>
+    <string name="reader_title_tag_preview">Тема</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Несачуване измене</string>
+    <string name="gutenberg_native_open_link_in_a_browser">Отвори везу у прегледачу</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Двапут тапни за одабир опције</string>
+    <string name="pages_list_author">Аутор странице</string>
+    <string name="photo_picker_use_gif">Користи овај GIF</string>
+    <string name="everyone">Сви</string>
+    <string name="me">Ја</string>
+    <string name="menu_content_info">Структура садржаја</string>
+    <string name="gutenberg_native_dismiss">Одбаци</string>
+    <string name="prepublishing_nudges_home_tags_not_set">Није постављено</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Датум објаве</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Додај ознаке</string>
+    <string name="prepublishing_nudges_back_button">Назад</string>
+    <string name="prepublishing_nudges_home_save_button">Сачувај сада</string>
+    <string name="prepublishing_nudges_home_submit_button">Предај сада</string>
+    <string name="prepublishing_nudges_home_schedule_button">Закажи сада</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Објављује се</string>
+    <string name="prepublishing_nudges_tags_action">Ознаке</string>
+    <string name="prepublishing_nudges_publish_action">Датум објаве</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Откажи</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Пребаци у Нацрте</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">Пребаци чланак у Нацрте?</string>
+    <string name="reader_btn_done">Готово</string>
+    <string name="reader_btn_select_few_interests">Одаберите неколико за наставак</string>
+    <string name="post_status_post_published">Објављено</string>
+    <string name="post_status_post_trashed">У отпаду</string>
+    <string name="post_status_post_scheduled">Заказано</string>
+    <string name="publish_date">Датум објаве</string>
+    <string name="ccpa_privacy_notice_read">Прочитај објаву CCPA везану за приватност</string>
+    <string name="reader_label_choose_your_interests">Одаберите своје теме</string>
+    <string name="reader_choose_interests_content_description">Одаберите своје теме</string>
+    <string name="ccpa_privacy_notice_header">Објава везана за приватност за кориснике из Калифорније</string>
+    <string name="status_and_visibility">Статус &amp; Видљивост</string>
+    <string name="update_now">Ажурирај сада</string>
+    <string name="gutenberg_native_move_to_top">Помери на горе</string>
+    <string name="pages_set_as_posts_page">Постави страницу чланака</string>
+    <string name="pages_set_as_homepage">Постави почетну страницу</string>
+    <string name="site_settings_select_page">Одабери страницу</string>
+    <string name="site_settings_posts_page">Страница чланака</string>
+    <string name="site_settings_static_homepage">Статична почетна страница</string>
+    <string name="site_settings_classic_blog">Класичан блог</string>
+    <string name="suggestion_invalid">%s није исправан %s</string>
+    <string name="site_settings_accept_homepage">Прихвати</string>
+    <string name="site_settings_failed_to_load_pages">Неуспело учитавање страница</string>
+    <string name="site_settings_homepage_settings">Подешавања почетне странице</string>
+    <string name="site_settings_homepage">Почетна страница</string>
+    <string name="page_posts_page_update_failed">Неуспело ажурирање странице чланака</string>
+    <string name="page_posts_page_successfully_updated">Страница чланак успешно ажурирана</string>
+    <string name="page_homepage_update_failed">Неуспело ажурирање почетне странице</string>
+    <string name="page_homepage_successfully_updated">Почетна страница успешно ажурирана</string>
+    <string name="gutenberg_native_select_a_color">Одабери боју</string>
+    <string name="gutenberg_native_double_tap_to_go_to_color_settings">Додирни двапут за подешавања боја</string>
+    <string name="reader_empty_followed_blogs_description">Када пратите веб локације, овде ћете видети њихов садржај</string>
+    <string name="crop">исеци</string>
+    <string name="feature_announcement_dialog_label">Шта има ново у Вордпресу</string>
+    <string name="feature_announcement_find_out_mode">Сазнај више</string>
+    <string name="insert_label_with_count">Убаци %d</string>
+    <string name="photo_picker_use_video">Користи овај видео запис</string>
+    <string name="photo_picker_video_title">Изабери видео запис</string>
+    <string name="photo_picker_photo_or_video_title">Одаберите садржај</string>
+    <string name="photo_picker_use_media">Користи овај садржај</string>
+    <string name="copy_link_address">Копирајте адресу линка</string>
+    <string name="comment_share_link_via">Поделите путем</string>
+    <string name="comment_toast_err_share_intent">Није могуће поделити</string>
+    <string name="comment_q_action_copied_url">Адреса везе је копирана</string>
+    <string name="sitepicker_continue_flow">Настави</string>
+    <string name="reader_no_site_to_reblog_action">Управљај сајтовима</string>
+    <string name="whats_new_in_version_title">Шта има ново</string>
+    <string name="button_insert">Убаци</string>
+    <string name="continue_label">Настави</string>
+    <string name="copy_text">Копирај</string>
+    <string name="gutenberg_native_move_block_right">Помери блок удесно</string>
+    <string name="gutenberg_native_move_block_left">Помери блок улево</string>
+    <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Помери блок улево од места %1$s на место %2$s</string>
+    <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Помери блок удесно од места %1$s на место %2$s</string>
+    <string name="new_site_creation_creating_site_loading_title">Ура!\nСкоро готово</string>
+    <string name="new_site_creation_creating_site_loading_subtitle">Ваш сајт ће ускоро бити спреман</string>
+    <string name="pages_and_posts_cancel_auto_upload">Откажи отпремање</string>
+    <string name="weekday_saturday">субота</string>
+    <string name="weekday_friday">петак</string>
+    <string name="weekday_thursday">четвртак</string>
+    <string name="weekday_wednesday">среда</string>
+    <string name="weekday_tuesday">уторак</string>
+    <string name="weekday_monday">понедељак</string>
+    <string name="weekday_sunday">недеља</string>
+    <string name="app_theme_dark">Тамна</string>
+    <string name="app_theme_light">Светла</string>
+    <string name="app_theme">Изглед</string>
+    <string name="gutenberg_native_show_post_content">Прикажи садржај чланка</string>
+    <string name="gutenberg_native_only_show_excerpt">Прикажи само одломак </string>
+    <string name="gutenberg_native_link_to">Повежи са</string>
+    <string name="gutenberg_native_link_settings">Подешавања веза</string>
+    <string name="post_list_tab_scheduled_posts">Заказано</string>
+    <string name="post_list_tab_published_posts">Објављено</string>
+    <string name="create_post_page_fab_tooltip_contributors">Направите чланак</string>
+    <string name="dialog_title_sharing_facebook_account_must_have_pages">Није повезано</string>
+    <string name="notifications_tab_title_comments">Коментари</string>
+    <string name="notifications_tab_title_follows">Праћења</string>
+    <string name="notifications_tab_title_likes">Свиђања</string>
+    <string name="notifications_tab_title_unread_notifications">Непрочитано</string>
+    <string name="dlg_cancel_action_dont_trash">Не шаљи на отпад</string>
+    <string name="dlg_confirm_action_trash">Помери на отпад</string>
+    <string name="stats_insights_management_activity">Активност</string>
+    <string name="stats_insights_management_posts_and_pages">Чланци и Странице</string>
+    <string name="stats_insights_management_general">Опште</string>
+    <string name="stats_management_screen_title">Додај нову картицу</string>
+    <string name="stats_management_add_new_stats_card">Додај нову картицу статистике</string>
+    <string name="reader_btn_remove_filter_content_description">Уклоните тренутни филтер</string>
+    <string name="gutenberg_native_replace_current_block">Замени тренутни блок</string>
+    <string name="gutenberg_native_add_to_end">Додај на крај</string>
+    <string name="gutenberg_native_add_to_beginning">Додај на почетак</string>
+    <string name="gutenberg_native_add_block_before">Додај блок пре</string>
+    <string name="gutenberg_native_add_block_after">Додај блок после</string>
+    <string name="reader_filter_empty_tags_action">Додај ознаку</string>
+    <string name="reader_filter_empty_sites_action">Прати сајт</string>
+    <string name="reader_filter_cta">Филтрирај</string>
+    <string name="gutenberg_native_edit_video">Уреди видео запис</string>
+    <string name="post_list_author">Аутор чланка</string>
+    <string name="fab_create_desc">Креирај чланак</string>
+    <string name="stats_box_type_very_high">врло високо</string>
+    <string name="stats_box_type_high">високо</string>
+    <string name="stats_box_type_medium">средње</string>
+    <string name="stats_box_type_low">ниско</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
+    <string name="create_post_page_fab_tooltip">Направити чланак или страницу</string>
+    <string name="content_description_person_building_website">Особа која прави веб место</string>
+    <string name="post_signup_interstitial_not_right_now">Не сад</string>
+    <string name="post_signup_interstitial_title">Добро дошли у Вордпрес</string>
+    <string name="stock_media_picker_list_content_description">Библиотека фотографија</string>
+    <string name="photo_picker_image_thumbnail_unselected">Уклоњен одабир слике</string>
+    <string name="photo_picker_image_selected">,Одабрано</string>
+    <string name="photo_picker_image_thumbnail_selected">Слика одабрана</string>
+    <string name="my_site_bottom_sheet_add_post">Чланак блога</string>
+    <string name="my_site_bottom_sheet_title">Додај нови</string>
+    <string name="post_settings_publish">Објави</string>
+    <string name="dialog_confirm_scheduled_post_sync_yes">Синхронизуј сада</string>
+    <string name="dialog_confirm_scheduled_post_sync_message">Овај чланак ће бити одмах синхронизован.</string>
+    <string name="dialog_confirm_scheduled_post_sync_title">Спремни за синхронизацију?</string>
+    <string name="new_site_creation_unavailable_domain">Домен није доступан</string>
+    <string name="negative_prefix">-%s</string>
+    <string name="my_site_bottom_sheet_add_page">Страница сајта</string>
+    <string name="reader_following_display_name">Прати</string>
+    <string name="reader_save_for_later_display_name">Сачувано</string>
+    <string name="reader_discover_display_name">Откриј</string>
+    <string name="reader_my_likes_display_name">Свиђања</string>
+    <string name="reader_filter_tags_title">Ознаке</string>
+    <string name="reader_filter_sites_title">Веб места</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="gutenberg_native_ungroup">Разгрупиши</string>
+    <string name="gutenberg_native_translate">Преведи</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">Додирни да сакријеш тастатуру</string>
+    <string name="gutenberg_native_tap_here_to_show_help">Додирни овде да се прикаже помоћ</string>
+    <string name="gutenberg_native_start_writing">Почни да пишеш…</string>
+    <string name="gutenberg_native_take_a_video">Направи видео запис</string>
+    <string name="gutenberg_native_take_a_photo_or_video">Направи фотографију или видео запис</string>
+    <string name="gutenberg_native_take_a_photo">Направи фотографију</string>
+    <string name="gutenberg_native_cut_block">Исеци блок</string>
+    <string name="gutenberg_native_show_section">Прикажи одељак</string>
+    <string name="gutenberg_native_s_block_empty">%s блок. Празно</string>
+    <string name="gutenberg_native_post_title_s">Наслов чланка. %s</string>
+    <string name="gutenberg_native_post_title_empty">Наслов чланка. Празно</string>
+    <string name="gutenberg_native_paste_url">Залепи URL</string>
+    <string name="gutenberg_native_open_settings">Отвори подешавања</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Помери блок доле од реда %1$s до реда %2$s</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Помери блок горе од реда %1$s до реда %2$s</string>
+    <string name="gutenberg_native_move_block_up">Помери блок горе</string>
+    <string name="gutenberg_native_help_icon">Иконица помоћи</string>
+    <string name="gutenberg_native_hide_keyboard">Сакриј тастатуру</string>
+    <string name="gutenberg_native_move_block_down">Помери блок доле</string>
+    <string name="gutenberg_native_current_value_is_s">Тренутна вредност је %s</string>
+    <string name="gutenberg_native_choose_from_device">Одабери свој уређај</string>
+    <string name="gutenberg_native_alt_text">Алтернативни текст</string>
+    <string name="gutenberg_native_add_video">ДОДАЈ ВИДЕО ЗАПИС</string>
+    <string name="gutenberg_native_add_url">Додај URL</string>
+    <string name="gutenberg_native_add_image_or_video">ДОДАЈ СЛИКУ ИЛИ ВИДЕО ЗАПИС</string>
+    <string name="gutenberg_native_add_image">ДОДАЈ СЛИКУ</string>
+    <string name="gutenberg_native_add_block_here">ДОДАЈ БЛОК ОВДЕ</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Јавила се непозната грешка. Молимо вас да покушате поново касније.</string>
+    <string name="notifications_tab_dialog_switch_desc">Обавештења</string>
+    <string name="main_switch_default_title_off">Искључи</string>
+    <string name="main_switch_default_title_on">Укључи</string>
+    <string name="notifications_tab_dialog_main_status_off">Обавештења за ову локацију</string>
+    <string name="notifications_tab_dialog_main_status_on">Обавештења за ову локацију</string>
+    <string name="pick_media">Додај слику или видео запис</string>
+    <string name="error_post_not_scheduled_retrying">Нисмо успели да закажемо чланак, али ћемо покушати поново касније.</string>
+    <string name="error_media_recover_post">Нисмо могли да отпремимо овај садржај.</string>
+    <string name="post_preview_remote_auto_saving_post">Прављење прегледа…</string>
+    <string name="post_preview_saving_draft">Чување…</string>
+    <string name="local_post_autosave_revision_available">Направили сте измене на овом чланку које нису сачуване</string>
+    <string name="dialog_confirm_autosave_dont_restore_button">Издање ове апликације</string>
+    <string name="button_delete_permanently">Обриши трајно</string>
+    <string name="dialog_confirm_autosave_restore_button">Верзија са другог уређаја</string>
+    <string name="settings_username_changer_snackbar_cancel">Ова радња се не може отказати. Корисничко име је можда већ ажурирано.</string>
+    <string name="settings_username_changer_toast_content">Ваше ново корисничко име је %1$s</string>
+    <string name="settings_username_changer_progress_dialog">Чување корисничког имена …</string>
+    <string name="settings_username_changer_confirm_dialog_positive_action">Промените корисничко име</string>
+    <string name="settings_username_changer_confirm_dialog_title">Пажљиво!</string>
+    <string name="settings_username_changer_header">Спремате се да промените своје корисничко име, које је тренутно %1$s%2$s%3$s. Нећете моћи да вратите своје корисничко име назад.</string>
+    <string name="site_settings_performance_and_speed">Перформансе и Брзина</string>
+    <string name="site_settings_more">Више</string>
+    <string name="site_settings_improved_search">Побољшана Претрага</string>
+    <string name="site_settings_jetpack_search">Jetpack Претрага</string>
+    <string name="site_settings_site_accelerator_off">Искључено</string>
+    <string name="site_settings_media">Садржај</string>
+    <string name="site_settings_ad_free_video_hosting">Видео хостинг без реклама</string>
+    <string name="site_settings_faster_images">Брже слике</string>
+    <string name="site_settings_faster_static_files">Брже статичке датотеке</string>
+    <string name="site_settings_site_accelerator_on">Укључено</string>
+    <string name="site_settings_site_accelerator">Убрзавач сајта</string>
+    <string name="site_settings_performance">Перформанса</string>
+    <string name="stats_file_downloads_value_label">Преузимања</string>
+    <string name="stats_file_downloads_title_label">Датотека</string>
+    <string name="stats_file_downloads">Преузимања датотеке</string>
+    <string name="stats_data_not_recorded_for_period">Статистика преузимања датотеке није бележена пре 28. јуна 2019. године.</string>
+    <string name="stats_site_negative_utc">Временска зона сајта (UTC - %s)</string>
+    <string name="stats_site_positive_utc">Временска зона сајта (UTC + %s)</string>
+    <string name="stats_site_neutral_utc">Временска зона сајта (UTC)</string>
+    <string name="share_desc">Подели</string>
+    <string name="web_preview_default">Подразумевано</string>
+    <string name="web_preview_desktop">Десктоп</string>
+    <string name="navigate_back_desc">Иди назад</string>
+    <string name="navigate_forward_desc">Иди напред</string>
+    <string name="notification_post_will_be_published_in_ten_minutes">\"%s\" ће бити објављен за 10 минута</string>
+    <string name="notification_scheduled_post">Заказан чланак</string>
+    <string name="notification_scheduled_post_ten_minute_reminder">Заказан чланак: подсетник за 10 минута</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Заказан чланак: подсетник за 1 сат</string>
+    <string name="notification_post_will_be_published_in_one_hour">\"%s\" ће бити објављен за 1 сат</string>
+    <string name="notification_post_has_been_published">\"%s\" је објављен</string>
+    <string name="post_notification_when_published">Кад је објављено</string>
+    <string name="post_settings_time_and_date">Датум и време</string>
+    <string name="post_notification_off">Искључено</string>
+    <string name="post_notification_ten_minutes_before">10 минута раније</string>
+    <string name="post_notification_one_hour_before">1 сат раније</string>
+    <string name="post_settings_add_to_calendar">Додај у календар</string>
+    <string name="post_settings_notification">Обавештење</string>
+    <string name="stats_post_views_label">Прегледи</string>
+    <string name="stats_post_label">Чланак</string>
+    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
+    <string name="stats_collapse_content_description">Скупи</string>
+    <string name="stats_expand_content_description">Рашири</string>
+    <string name="stats_item_collapsed">Ставка скупљена</string>
+    <string name="stats_item_expanded">Ставка раширена</string>
+    <string name="site_settings_editor">Уређивач</string>
+    <string name="description_collapse">Скупи</string>
+    <string name="description_expand">Прошири</string>
+    <string name="my_site_verify_your_email_without_email">Потврдите адресу своје е-поште - упутства су послата на вашу е-пошту.</string>
+    <string name="my_site_verify_your_email">Потврдите адресу своје е-поште - упутства су послата  на %s</string>
+    <string name="link_dialog_button_cancel">Откажи</string>
+    <string name="link_dialog_button_ok">У реду</string>
+    <string name="link_dialog_button_remove_link">Уклонити везу</string>
+    <string name="link_dialog_title">Уметнути везу</string>
+    <string name="post_settings_featured_image_uploading_tap_for_options">Отпремање медија.\nДодирните за опције.</string>
+    <string name="post_settings_retry_featured_image">Покушајте поново да отпремите</string>
+    <string name="link_dialog_edit_hint">http(s)://</string>
+    <string name="link_open_new_window">Отвори везу у новом прозору/језичку</string>
+    <string name="stats_widget_error_no_access_token">Да би видели своју статистику, пријавите се на WordPress.com налог.</string>
+    <string name="post_list_search_nothing_found">Нема чланака које се подударају са твојом претрагом</string>
+    <string name="domains_suggestions_intro_description">Овде ће вас људи наћи на интернету.</string>
+    <string name="domains_suggestions_intro_title">Изабери премиум назив домене</string>
+    <string name="stats_widget_minified_name">На први поглед</string>
+    <string name="stats_widget_today_insights_name">Данас</string>
+    <string name="stats_widget_all_time_insights_name">Све време</string>
+    <string name="my_site_custom_domain_name">Сви WordPress.com пакети укључују жељени назив домена. Региструјте свој бесплатни премиум домен одмах.</string>
+    <string name="post_list_search_prompt">Претражи чланке</string>
+    <string name="stats_widget_all_time_title">Све време</string>
+    <string name="stats_widget_weekly_views_name">Прегледи ове недеље</string>
+    <string name="stats_widget_select_type">Тип</string>
+    <string name="stats_widget_select_color">Боја</string>
+    <string name="stats_widget_select_your_site">Одаберите свој сајт</string>
+    <string name="stats_widget_color_dark">Тамно</string>
+    <string name="stats_widget_color_light">Светло</string>
+    <string name="stats_widget_color">Боја</string>
+    <string name="stats_widget_site_caption">Одаберите свој сајт</string>
+    <string name="stats_widget_site">Сајт</string>
+    <string name="stats_widget_views_title">Прегледи ове седмице</string>
+    <string name="stats_widget_add">Додај виџет</string>
+    <string name="domain_contact_information_state_not_available_hint">Покрајина (није доступно)</string>
+    <string name="site_settings_password_updated">Лозинка ажурирана</string>
+    <string name="site_settings_password_dialog_title">Ажурирај лозинку</string>
+    <string name="site_settings_disconnected_toast">Нема интернет везе. Уређивање је онемогућено.</string>
+    <string name="domain_registration_country_picker_dialog_title">Одабери државу</string>
+    <string name="domain_registration_state_picker_dialog_title">Одабери покрајину</string>
+    <string name="domain_registration_result_title">Честитамо</string>
+    <string name="domain_contact_information_register_domain_button">Региструјте домен</string>
+    <string name="domain_contact_information_postal_code_hint">Поштански број</string>
+    <string name="domain_contact_information_state_hint">Покрајина</string>
+    <string name="domain_contact_information_city_hint">Град</string>
+    <string name="domain_contact_information_address_hint_two">Адреса 2</string>
+    <string name="domain_contact_information_address_hint">Адреса</string>
+    <string name="domain_contact_information_country_hint">Држава</string>
+    <string name="domain_contact_information_country_code_hint">Код државе</string>
+    <string name="domain_contact_information_phone_number_hint">Телефон</string>
+    <string name="domain_registration_result_continue_button">настави</string>
+    <string name="domain_contact_information_organization_hint">Организација (опционо)</string>
+    <string name="domain_privacy_option_off_title">Региструј јавно</string>
+    <string name="domain_privacy_option_on_title">Региструј приватно са Заштитом приватности</string>
+    <string name="domain_registration_privacy_protection_title">Заштита приватности</string>
+    <string name="domain_registration_contact_form_input_error">Молимо унесите исправан %s</string>
+    <string name="domains_suggestions_choose_domain">Одаберите домен</string>
+    <string name="stats_management_new">Ново</string>
+    <string name="stats_management_dismiss_insights_news_card">Одбаци</string>
+    <string name="stats_management_try_it_now">Испробајте сада</string>
+    <string name="stats_manage_your_stats">Управљајте својим статистикама</string>
+    <string name="editor_uploading_draft">Ваш нарцт се отпрема</string>
+    <string name="post_uploading_draft">Отпремање нацрта</string>
+    <string name="post_list_tab_drafts">Нацрти</string>
+    <string name="register_domain">Региструј домен</string>
+    <string name="domains_suggestions_empty_list">Нема пронађених предлога</string>
+    <string name="stats_insights_annual_site_stats">Годишње статистике сајта</string>
+    <string name="stats_insights_social">Друштвено</string>
+    <string name="stats_menu_move_down">Помери доле</string>
+    <string name="stats_menu_move_up">Помери горе</string>
+    <string name="post_restored">Чланак враћен</string>
+    <string name="post_moving_to_draft">Чланак се пребацује у нацрт</string>
+    <string name="post_restoring">Чланак се враћа</string>
+    <string name="post_trashing">Чланак се пребацује у отпад</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Локалне измене</string>
+    <string name="stats_menu_remove">Уклони из увида</string>
+    <string name="button_move_to_draft">Пребаци у Нацрт</string>
+    <string name="posts_draft_empty">Немате чланке у нацртима</string>
+    <string name="posts_trashed_empty">Немате чланке у отпаду</string>
+    <string name="posts_scheduled_empty">Немате заказане чланке</string>
+    <string name="posts_published_empty">Још увек нисте објавили ниједан чланак</string>
+    <string name="notification_wpcom_username_needed">Молимо, пријавите се са својим корисничким именом и лозинком.</string>
+    <string name="stats_insights_total_comments">Укупно коментара</string>
+    <string name="stats_insights_average_comments">Просечно коментара / чланак</string>
+    <string name="stats_insights_average_words">Просечно речи по чланку</string>
+    <string name="stats_insights_total_words">Укупно речи</string>
+    <string name="stats_insights_average_likes">Просечно свиђања по чланку</string>
+    <string name="stats_insights_total_likes">Укупно свиђања</string>
+    <string name="stats_insights_posts">Чланци</string>
+    <string name="stats_insights_year">Година</string>
+    <string name="stats_insights_this_year_site_stats">Ове године</string>
+    <string name="plugin_install_custom_domain_required_dialog_title">Инсталирај додатак</string>
+    <string name="plugin_install_custom_domain_required_dialog_register_btn">Региструј домен</string>
+    <string name="stats_detail_average_views_per_day">Просечно прегледа по дану</string>
+    <string name="stats_months_and_years_views_label">Прегледи</string>
+    <string name="stats_months_and_years_period_label">Период</string>
+    <string name="stats_detail_months_and_years">Месечна и годишња</string>
+    <string name="publish_on">Објави: %s</string>
+    <string name="published_on">Објављено: %s</string>
+    <string name="scheduled_for">Заказано за: %s</string>
+    <string name="schedule_for">Закажи за: %s</string>
+    <string name="stats_insights_load_more">Учитај више</string>
+    <string name="stats_detail_recent_weeks">Скорашње седмице</string>
+    <string name="stats_insights_today_stats">Данас</string>
+    <string name="stats_insights_best_day">Најбољи дан</string>
+    <string name="stats_insights_best_hour">Најбоље време</string>
+    <string name="showing_stats_for">Приказивање статистике за:</string>
+    <string name="app_rating_rate_never">Не, хвала</string>
+    <string name="app_rating_rate_later">Касније</string>
+    <string name="app_rating_rate_now">Оцените сада</string>
+    <string name="app_rating_message">Лепо је видети те опет! Ако копате по апликацији, волели бисмо оцену у Гугл Плеј продавници.</string>
+    <string name="app_rating_title">Уживате у Вордпресу?</string>
+    <string name="stats_more_posts">Више чланака</string>
+    <string name="stats_fewer_posts">Мање чланака</string>
+    <string name="stats_site_not_loaded_yet">Сајт још увек није учитан</string>
+    <string name="stats_insights_posting_activity">Активност објављивања</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">Користи блоковски уређивач</string>
+    <string name="plans_loading_error_network_title">Нема везе</string>
+    <string name="menu_switch_to_gutenberg_editor">Пребаци на блоковски уређивач</string>
+    <string name="stats_loading_error">Подаци нису учитани</string>
+    <string name="exit">излаз</string>
+    <string name="quick_start_sites_type_grow">Увећајте свој аудиторијум</string>
+    <string name="quick_start_sites_type_customize">Прилагодите свој сајт</string>
+    <string name="quick_start_sites">Наредни кораци</string>
+    <string name="quick_start_complete_tasks_header">Завршено (%d)</string>
+    <string name="quick_start_dialog_view_site_message">Уживајте у свом готовом производу!</string>
+    <string name="quick_start_dialog_upload_icon_title">Отпреми иконицу сајта</string>
+    <string name="quick_start_sites_type_subtitle">%1$d од %2$d завршено</string>
+    <string name="quick_start_dialog_publish_post_message">Направи нацрт и објави свој први чланак</string>
+    <string name="quick_start_dialog_explore_plans_title">Истражи планове</string>
+    <string name="quick_start_dialog_enable_sharing_title">Омогући дељење чланака</string>
+    <string name="quick_start_dialog_remove_next_steps_title">Уклони наредне кораке</string>
+    <string name="quick_start_remove_next_steps_menu_title">Уклони ово</string>
+    <string name="quick_start_dialog_check_stats_title">Провери статистику свог сајта</string>
+    <string name="quick_start_task_skip_menu_title">Прескочи задатак</string>
+    <string name="quick_start_complete_view_title">Сви задаци су завршени!</string>
+    <string name="quick_start_completed_tasks_header_chevron_collapse_desc">скупи</string>
+    <string name="quick_start_completed_tasks_header_chevron_expand_desc">прошири</string>
+    <string name="notification_channel_reminder_title">Подсетник</string>
+    <string name="stats_insights_popular">Најпопуларније време</string>
+    <string name="stats_select_next_period_description">Одабери наредни период</string>
+    <string name="stats_select_previous_period_description">Одабери претходни период</string>
+    <string name="stats_most_popular_percent_views">%1$d%% од прегледа</string>
+    <string name="stats_traffic_change">%1$s (%2$s%%)</string>
+    <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
+    <string name="new_site_creation_clear_all_content_description">Очисти</string>
+    <string name="notification_new_site_creation_failed">Дошло је до проблема</string>
+    <string name="notification_new_site_creation_title">Креирај сајт</string>
+    <string name="new_site_creation_create_site_button">Креирај сајт</string>
+    <string name="site_creation_error_generic_title">Дошло је до проблема</string>
+    <string name="site_creation_fetch_suggestions_error_unknown">Дошло је до проблема</string>
+    <string name="new_site_creation_preview_title">Ваша страница је креирана!</string>
+    <string name="new_site_creation_screen_title_step_count">%1$d од %2$d</string>
+    <string name="new_site_creation_screen_title_general">Креирај сајт</string>
+    <string name="suggestions_updated_content_description">Предлози ажурирани</string>
+    <string name="local_post_is_conflicted">Конфликт верзија</string>
+    <string name="preference_crash_reports_summary">Омогућите аутоматске извештаје о падовима који ће нам помоћи да побољшамо перформансе апликације.</string>
+    <string name="snackbar_conflict_undo">Врати</string>
+    <string name="toast_conflict_updating_post">Ажурирање чланка</string>
+    <string name="snackbar_conflict_local_version_discarded">Локална верзија одбачена</string>
+    <string name="snackbar_conflict_web_version_discarded">Веб верзија одбачена</string>
+    <string name="dialog_confirm_load_remote_post_discard_web">Одбаци веб</string>
+    <string name="dialog_confirm_load_remote_post_discard_local">Одбаци локално</string>
+    <string name="dialog_confirm_load_remote_post_title">Реши синхронизациони конфликт</string>
+    <string name="stats_no_data_for_period">Нема података за овај период</string>
+    <string name="preference_strip_image_location">Уклони локацију из садржаја</string>
+    <string name="stats_insights_tumblr">Tumblr</string>
+    <string name="stats_insights_twitter">Twitter</string>
+    <string name="stats_insights_facebook">Facebook</string>
+    <string name="stats_insights_view_more">Види више</string>
+    <string name="stats_insights_share_post">Подели чланак</string>
+    <string name="stats_insights_create_post">Креирај чланак</string>
+    <string name="stats_insights_latest_post_message">Прошло је %1$s од када је %2$s објављен. Ево какви су досадашњи резултати чланка:</string>
+    <string name="stats_author_views_label">Прегледи</string>
+    <string name="gif_picker_empty_search_list">Нема садржаја који се поклапају са Вашом претрагом</string>
+    <string name="stats_author_label">Аутор</string>
+    <string name="stats_authors">Аутори</string>
+    <string name="stats_search_terms_views_label">Прегледи</string>
+    <string name="stats_search_terms_label">Термин за претрагу</string>
+    <string name="stats_search_terms">Термини за претрагу</string>
+    <string name="stats_videos_views_label">Прегледи</string>
+    <string name="stats_videos_title_label">Наслов</string>
+    <string name="stats_videos">Видео записи</string>
+    <string name="stats_country_views_label">Прегледи</string>
+    <string name="stats_country_label">Држава</string>
+    <string name="stats_countries">Државе</string>
+    <string name="stats_clicks_label">Кликови</string>
+    <string name="stats_clicks_link_label">Веза</string>
+    <string name="stats_clicks">Кликови</string>
+    <string name="stats_referrer_views_label">Прегледи</string>
+    <string name="stats_referrer_label">Препоручилац</string>
+    <string name="stats_referrers">Препоручиоци</string>
+    <string name="stats_posts_and_pages">Чланци и Странице</string>
+    <string name="stats_insights_path">Путања</string>
+    <string name="stats_insights_linkedin">LinkedIn</string>
+    <string name="stats_insights_google_plus">Google+</string>
+    <string name="stats_insights_all_time_stats">Све време</string>
+    <string name="stats_insights_latest_post_with_no_engagement">Прошло је %1$s од када је %2$s објављен. Покрени причу и увећај прегледе свог чланка дељећи га:</string>
+    <string name="stats_insights_tags_and_categories">Ознаке и категорије</string>
+    <string name="stats_insights_latest_post_empty">Нисте до сада објавили ни један чланак. Кад почнете да објављујете, резиме Вашег најновијег чланка ће се појавити овде: </string>
+    <string name="stats_comments_label">Коментари</string>
+    <string name="stats_comments_title_label">Наслов</string>
+    <string name="stats_comments_author_label">Аутор</string>
+    <string name="stats_comments_posts_and_pages">Чланци и странице</string>
+    <string name="stats_comments_authors">Аутори</string>
+    <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_publicize_followers_label">Пратиоци</string>
+    <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
+    <string name="stats_publicize_service_label">Услуга</string>
+    <string name="stats_tags_and_categories_views_label">Прегледи</string>
+    <string name="stats_tags_and_categories_title_label">Наслов</string>
+    <string name="stats_posts_and_pages_views_label">Прегледи</string>
+    <string name="stats_posts_and_pages_title_label">Наслов</string>
+    <string name="stats_follower_since_label">Од</string>
+    <string name="stats_follower_label">Пратилац</string>
+    <string name="stats_followers_count_message">Укупно %1$s пратилаца: %2$s</string>
+    <string name="stats_followers_email">Електронска пошта</string>
+    <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_manage_insights">Управљај увидима</string>
+    <string name="stats_no_data_yet">Још нема података</string>
+    <string name="stats_empty_insights_title">Ниједан увид још увек није додан </string>
+    <string name="menu_debug">Изборник отклањања грешака</string>
+    <string name="change_password_dialog_message">Лозинка се мења…</string>
+    <string name="change_password_confirmation">Лозинка успешно промењена</string>
+    <string name="change_password">Промени лозинку</string>
+    <string name="support_identity_input_dialog_name_label">Назив</string>
+    <string name="history_no_title">(без наслова)</string>
+    <string name="history_preview_html">HTML преглед</string>
+    <string name="history_preview_visual">Визуални преглед</string>
+    <string name="history_detail_title">Ревизија</string>
+    <string name="history_detail_button_previous">Претходно</string>
+    <string name="history_detail_button_next">Следеће</string>
+    <string name="media_space_used">%1$s искоришћено</string>
+    <string name="history_load_dialog_button_positive">Учитај</string>
+    <string name="history_footer_post">Чланак креиран %1$s у %2$s</string>
+    <string name="history_footer_page">Страница креирана %1$s у %2$s</string>
+    <string name="history_loading_revision">Ревизије се учитавају</string>
+    <string name="history_loaded_revision">Ревизије су учитане</string>
+    <string name="history_empty_title">Још увек нема историјата</string>
+    <string name="history_empty_subtitle_post">Када направите измене на свом чланку, бићете у могућности да видите историјат овде</string>
+    <string name="history_empty_subtitle_page">Када направите измене на својој страници, бићете у могућности да видите историјат овде</string>
+    <string name="description_user">Кориснички аватар</string>
+    <string name="image_size_full_label">Пуна величина</string>
+    <string name="image_size_large_label">Велико</string>
+    <string name="image_size_medium_label">Средње</string>
+    <string name="image_size_thumbnail_label">Умањена слика</string>
+    <string name="menu_history">Историја</string>
+    <string name="pages_open_page_error">Одабрана страница није доступна</string>
+    <string name="pages_pending">Чека се рецензија</string>
+    <string name="pages_search_suggestion">Претражи странице</string>
+    <string name="pages_delete_permanently">Трајно обриши</string>
+    <string name="pages_move_to_trash">Пребаци у Отпад</string>
+    <string name="pages_move_to_draft">Пребаци у Нацрт</string>
+    <string name="pages_empty_search_result">Нема страница које одговарају Вашој претрази</string>
+    <string name="pages_empty_trashed">Немате страница у отпаду</string>
+    <string name="pages_empty_scheduled">Немате заказаних страница</string>
+    <string name="pages_empty_drafts">Немате страница у нацртима</string>
+    <string name="pages_empty_published">Још увек немате ниједну објављену страницу</string>
+    <string name="pages_trashed">У отпаду</string>
+    <string name="pages_scheduled">Заказано</string>
+    <string name="pages_drafts">Нацрти</string>
+    <string name="pages_published">Објављено</string>
+    <string name="pages_set_parent">Постави родитеља</string>
+    <string name="pages_view">Види</string>
+    <string name="site_picker_remove_site_empty">Нема сајтова који се поклапају са Вашом претрагом</string>
+    <string name="login_error_email_not_found_v2">Не постоји WordPress.com налог који се поклапа са овим Google налогом.</string>
+    <string name="reader_empty_followed_blogs_search_title">Нема сајтова који се поклапају са Вашом претрагом</string>
+    <string name="page_parent_changed">Родитељ странице је промењен</string>
+    <string name="page_moved_to_scheduled">Страница је заказана</string>
+    <string name="page_permanently_deleted">Страница је трајно обрисана</string>
+    <string name="page_moved_to_published">Страница је објављена</string>
+    <string name="page_moved_to_trash">Страница је бачена у отпад</string>
+    <string name="page_moved_to_draft">Страница је премештена у Нацрте</string>
+    <string name="top_level">Највиши ниво</string>
+    <string name="set_parent">Постави родитеља</string>
+    <string name="page_delete_error">Догодио се проблем приликом брисања странице</string>
+    <string name="page_status_change_error">Догодио се проблем приликом промене статуса странице</string>
+    <string name="page_parent_change_error">Догодио се проблем приликом промене родитеља странице</string>
+    <string name="page_delete_dialog_message">Да ли сте сигурни да желите да обришете страницу %s?</string>
+    <string name="quick_start_focus_point_description">додирни овде</string>
+    <string name="quick_start_list_create_site_subtitle">Направите и покрените своју веб локацију.</string>
+    <string name="quick_start_list_create_site_title">Креирај свој сајт</string>
+    <string name="quick_start_dialog_view_site_title">Види свој сајт</string>
+    <string name="quick_start_dialog_share_site_title">Подели свој сајт</string>
+    <string name="quick_start_dialog_view_site_message_short">Додирни %1$s Види сајт %2$s за преглед свог сајта</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Додирни %1$s Дељење %2$s за наставак</string>
+    <string name="quick_start_dialog_need_help_button_positive">Прихвати</string>
+    <string name="quick_start_dialog_publish_post_title">Објави чланак</string>
+    <string name="quick_start_dialog_need_help_button_neutral">Никад</string>
+    <string name="quick_start_dialog_need_help_button_negative">Не хвала</string>
+    <string name="quick_start_dialog_follow_sites_title">Прати друге сајтове</string>
+    <string name="quick_start_button_positive">Крени</string>
+    <string name="quick_start_button_negative_short">Откажи</string>
+    <string name="quick_start_button_negative">Не сада</string>
+    <string name="content_description_more">Више</string>
+    <string name="my_site_create_new_site_title">Немате ниједан сајт</string>
+    <string name="reader_empty_followed_tags_title">Нема праћених ознака</string>
+    <string name="reader_empty_followed_tags_subtitle">Додајте ознаке како бисте пронашли чланке о својим омиљеним темама</string>
+    <string name="install_jetpack_retry">Покушај поново</string>
+    <string name="jetpack_installation_problem">Јавио се проблем</string>
+    <string name="jetpack_installed">Jetpack инсталиран</string>
+    <string name="installing_jetpack">Jetpack се инсталира</string>
+    <string name="install_jetpack">Инсталирај Jetpack</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">Jetpack Често Постављана Питања</string>
+    <string name="jetpack_installation_problem_message">Jetpack није могуће инсталирати у овом тренутку.</string>
+    <string name="installing_jetpack_message">Jetpack се инсталира на Ваш сајт. Ово може да потраје неколико минута.</string>
+    <string name="login_to_to_connect_jetpack">Пријавите се на WordPress.com налог који сте користили за повезивање Jetpack-а.</string>
+    <string name="install_jetpack_continue">Постави</string>
+    <string name="sign_out_wpcom_confirm_with_no_changes">Одјавите се из Вордпреса?</string>
+    <string name="site_settings_tags_empty_button">Направити ознаку</string>
+    <string name="site_settings_tags_empty_title">Немате ниједну ознаку</string>
+    <string name="site_settings_tags_empty_title_search">Нема ознака које се поклапају са Вашом претрагом</string>
+    <string name="reader_label_post_search_explainer">Шта бисте желели да пронађете?</string>
+    <string name="themes_empty_list">Нема тема које се поклапају са Вашом претрагом</string>
+    <string name="media_empty_search_list">Нема садржаја који се поклапа са Вашом претрагом</string>
+    <string name="people_empty_list_filtered_followers">Још увек нема пратилаца</string>
+    <string name="people_empty_list_filtered_users">Још увек нема корисника</string>
+    <string name="people_empty_list_filtered_email_followers">Још увек нема пратилаца електронске поште</string>
+    <string name="people_empty_list_filtered_viewers">Још увек нема гледалаца</string>
+    <string name="reader_empty_posts_liked_description">Чланци који Вам се свиђају ће се појавити овде</string>
+    <string name="reader_empty_followed_blogs_button_discover">Откриј сајтове</string>
+    <string name="reader_empty_followed_blogs_title">Нема праћених сајтова</string>
+    <string name="notifications_empty_likes">Још нема свиђања</string>
+    <string name="notifications_empty_followers">Још нема пратилаца</string>
+    <string name="activity_log_empty_title">Још увек нема активности</string>
+    <string name="posts_empty_list_button">Направити чланак</string>
+    <string name="pages_empty_list_button">Направити страницу</string>
+    <string name="media_empty_upload_media">Отпреми садржај</string>
+    <string name="media_empty_list">Немате никакав садржај</string>
+    <string name="reader_gallery_images_desc">Галерија слика</string>
+    <string name="blavatar_desc">иконица сајта</string>
+    <string name="theme_image_desc">слика теме</string>
+    <string name="featured_image_desc">издвојена слика</string>
+    <string name="button_discard">Одбаци</string>
+    <string name="reader_avatar_desc">профилна слика</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Да бисте наставили, унесите своју адресу е-поште и име</string>
+    <string name="support_identity_input_dialog_enter_email">Молимо, унесите вашу адресу е-поште</string>
+    <string name="support_identity_input_dialog_email_label">Електронска пошта</string>
+    <string name="support_push_notification_message">Нова порука од \"Помоћи и Подршке\"</string>
+    <string name="support_push_notification_title">Вордпрес</string>
+    <string name="support_contact_email_not_set">Није подешено</string>
+    <string name="my_tickets">Моји тикети</string>
+    <string name="notification_channel_transient_title">Пролазан</string>
+    <string name="application_log_button">Дневник апликације</string>
+    <string name="activity_log_currently_restoring_message">Враћање на %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Враћање у претходно стање у току</string>
+    <string name="support_contact_email">Електронска пошта за контакт</string>
+    <string name="activity_log_currently_restoring_title">Тренутно се Ваш сајт враћа у претходно стање</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Ваш сајт је успешно враћен у претходно стање</string>
+    <string name="activity_log_button">Акционо дугме дневника активности</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Ваш сајт је успешно враћен у претходно стање\nВраћен на %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Ваш сајт се враћа у претходно стање\nВраћање на %1$s %2$s</string>
+    <string name="plugin_auto_managed">Аутоматско управљање</string>
+    <string name="reader_empty_search_title">Нема пронађених резултата</string>
+    <string name="reader_save_posts_locally_dialog_title">Сачувај чланке за касније</string>
+    <string name="reader_empty_search_request_failed">Није могуће извршити претрагу</string>
+    <string name="comment_read_source_post">Прочитајте изворни чланак</string>
+    <string name="sites">Сајтови</string>
+    <string name="verification_2fa_screen_title">Верификација кодом</string>
+    <string name="selfhosted_site_login_title">Креденцијали за пријаву</string>
+    <string name="removed">Уклоњено</string>
+    <string name="reader_save_for_later_title">Сачувани чланци</string>
+    <string name="reader_add_bookmark">Додато у сачуване чланке</string>
+    <string name="reader_remove_bookmark">Уклоњено из сачуваних чланака</string>
+    <string name="reader_bookmark_snack_btn">Види све</string>
+    <string name="reader_bookmark_snack_title">Чланак сачуван</string>
+    <string name="reader_empty_saved_posts_title">Нема сачуваних чланака - још увек!</string>
+    <string name="reader_followed_blog_notifications_action">Омогући</string>
+    <string name="reader_followed_blog_notifications_this">ово веб место</string>
+    <string name="my_site_icon_dialog_title">Иконица сајта</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">Немате дозволу да додате иконицу сајта.</string>
+    <string name="my_site_icon_dialog_add_message">Да ли желите да додате иконицу сајта?</string>
+    <string name="my_site_icon_dialog_change_message">Како бисте желели да уредите иконицу?</string>
+    <string name="my_site_icon_dialog_remove_button">Уклони</string>
+    <string name="my_site_icon_content_description">Промени иконицу сајта</string>
+    <string name="my_site_icon_dialog_cancel_button">Откажи</string>
+    <string name="my_site_icon_dialog_change_button">Промени</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">Немате дозволу да уређујете иконицу сајта</string>
+    <string name="activity_log_icon">Иконица активности</string>
+    <string name="reader_followed_blog_notifications">Омогући обавештења за %1$s%2$s%3$s?</string>
+    <string name="reader_btn_notifications_on">Укључи обавештења сајта</string>
+    <string name="reader_btn_notifications_off">Искључи обавештења сајта</string>
+    <string name="activity_log_jetpack_icon">Иконица Jetpack-а</string>
+    <string name="activity_log_event">Догађај</string>
+    <string name="activity_log">Дневник активности</string>
+    <string name="privacy_policy_read">Прочитај политику приватности</string>
+    <string name="privacy_policy_learn_more_header">Политика приватности</string>
+    <string name="cookie_policy_learn_more_header">Политика колачића</string>
+    <string name="preference_privacy_settings">Подешавања приватности</string>
+    <string name="preference_collect_information">Прикупи информације</string>
+    <string name="post_submitted">Чланак је предат</string>
+    <string name="plugin_install_site_ineligible_site_graylisted">Могућност додатка захтева да сајт буде добро позициониран.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Могућност додатка захтева да претплата на главни домен буде везана за корисника.</string>
+    <string name="plugin_install_site_ineligible_site_private">Функција додатка захтева да страница буде јавна.</string>
+    <string name="plugin_install_site_ineligible_non_admin_user">Могућност додатка захтева администраторске привилегије.</string>
+    <string name="plugin_install_site_ineligible_no_vip_sites">Додатак не може бити инсталиран на VIP сајтове.</string>
+    <string name="plugin_install_site_ineligible_excessive_disk_space">Додатак не може бити инсталиран због ограничења простора на диску.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">Могућност додатка захтева верификовану адресу електронске поште.</string>
+    <string name="plugin_install_site_ineligible_no_business_plan">Могућност додатка захтева бизнис план.</string>
+    <string name="plugin_install_site_ineligible_not_using_custom_domain">Могућност додатка захтева поседовање сопственог домена.</string>
+    <string name="plugin_install_first_plugin_almost_finished_dialog_message">Финална подешавања су у току - још мало, па готово…</string>
+    <string name="plugin_install_first_plugin_progress_dialog_message">Инсталирање додатка…</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Инсталирај</string>
+    <string name="notification_settings_followed_dialog_title">Обавештења</string>
+    <string name="notification_settings_followed_dialog_notification_posts_description">Примајте обавештења о новим чланцима са ове странице</string>
+    <string name="notification_settings_followed_dialog_email_comments">Пошаљите ми нове коментаре е-поштом</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_title">Инсталирај додатак</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">Седмично</string>
+    <string name="notification_settings_followed_dialog_email_posts_instantly">Истог тренутка</string>
+    <string name="notification_settings_followed_dialog_email_posts_daily">Дневно</string>
+    <string name="notification_settings_followed_dialog_notification_posts_switch">Нови чланци</string>
+    <string name="notification_settings_followed_dialog_email_posts_switch">ошаљи ми нове чланке електронском поштом</string>
+    <string name="comment_title">%s на %s</string>
+    <string name="notification_settings_item_your_sites_all_followed_sites">Сви моји праћени сајтови</string>
+    <string name="notification_settings_category_followed_sites">Праћени сајтови</string>
+    <string name="dialog_confirm_delete_permanently_post">Да ли сте сигурни да желите да трајно обришете овај чланак?</string>
+    <string name="notification_channel_important_title">Важно</string>
+    <string name="notification_channel_general_title">Опште</string>
+    <string name="photo_picker_use_photo">Користи ову фотографију</string>
+    <string name="media_preview_title">%1$d од %2$d</string>
+    <string name="stock_media_picker_initial_empty_subtext">Фотографије обезбеђене од стране %s</string>
+    <string name="add_count">Додај %d</string>
+    <string name="preview_count">Прегледај %d</string>
+    <string name="stock_media_picker_search_hint">Претражите библиотеку бесплатних фотографија</string>
+    <string name="photo_picker_stock_media">Одаберите из библиотеке бесплатних фотографија</string>
+    <string name="error_save_empty_draft">Није могуће сачувати празан нацрт</string>
+    <string name="site_settings_quota_space_unlimited">%1$s од неограниченог</string>
+    <string name="fab_add_tag_desc">Направити ознаку</string>
+    <string name="notification_settings_switch_desc">Обавештења</string>
+    <string name="comment_checkmark_desc">квачица</string>
+    <string name="profile_picture">Профилна слика од %s</string>
+    <string name="show_more_desc">прикажи више</string>
+    <string name="open_external_link_desc">Отвори спољну везу</string>
+    <string name="reader_photo_view_desc">фотографија</string>
+    <string name="reader_list_item_suggestion_remove_desc">обриши</string>
+    <string name="photo_picker_thumbnail_desc">Пусти видео запис</string>
+    <string name="reader_cardview_post_play_video_desc">пусти издвојени видео запис</string>
+    <string name="plugin_detail_logo_desc">лого додатка</string>
+    <string name="plugin_detail_banner_desc">банер додатка</string>
+    <string name="photo_picker_camera_desc">покрени камеру</string>
+    <string name="photo_picker_device_desc">одабери са уређаја</string>
+    <string name="people_invite_role_info_desc">информације о улози</string>
+    <string name="media_settings_play">пусти</string>
+    <string name="media_settings_image_preview_desc">преглед слике</string>
+    <string name="media_preview_desc">преглед</string>
+    <string name="media_preview_audio_desc">звучни запис</string>
+    <string name="media_grid_item_play_video_desc">пусти видео запис</string>
+    <string name="media_grid_item_trash_desc">отпад</string>
+    <string name="media_grid_item_retry_desc">покушај поново</string>
+    <string name="invite_user_delete_desc">уклони %s</string>
+    <string name="signup_with_google_progress">Регистровање са Google-ом…</string>
+    <string name="jetpack_already_connected_toast">Већ сте повезани на Jetpack</string>
+    <string name="jetpack_connection_failed_with_reason">Неуспело повезивање на Jetpack: %s</string>
+    <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_save_as_draft">Сачувај као нацрт</string>
+    <string name="menu_preview">Преглед</string>
+    <string name="menu_undo_snackbar_action">ВРАТИ</string>
+    <string name="menu_html_mode_done_snackbar">Пребачено на HTML режим</string>
+    <string name="menu_html_mode">HTML режим</string>
+    <string name="menu_visual_mode_done_snackbar">Пребачено на визуални режим</string>
+    <string name="menu_visual_mode">Визуални режим</string>
+    <string name="signup_epilogue_screen_title">Нови налог</string>
+    <string name="comment_unapproved_talkback">Коментар није одобрен</string>
+    <string name="comment_approved_talkback">Коментар је одобрен</string>
+    <string name="comment_unspam_talkback">Коментар је означен да није нежељен</string>
+    <string name="comment_spam_talkback">Коментар је означен као непожељан</string>
+    <string name="comment_delete_talkback">Коментар је обрисан</string>
+    <string name="comment_untrash_talkback">Коментар је враћен</string>
+    <string name="comment_trash_talkback">Коментар је послат у смеће</string>
+    <string name="comment_liked_talkback">Коментар свиђан</string>
+    <string name="notif_detail_screen_title">Детаљ обавештења %s</string>
+    <string name="edit_photo_screen_title">Уреди фотографију</string>
+    <string name="share_intent_screen_title">Одабери сајт</string>
+    <string name="file_size_in_gigabytes">%s GB</string>
+    <string name="file_size_in_megabytes">%s MB</string>
+    <string name="file_size_in_kilobytes">%s kB</string>
+    <string name="file_size_in_bytes">%s B</string>
+    <string name="site_settings_quota_space_value">%1$s од %2$s</string>
+    <string name="site_settings_quota_space_title">Искоришћен простор</string>
+    <string name="site_settings_quota_space_hint">Ако Вам је потребан додатни простор, размислите о надоградњи Вордпрес плана.</string>
+    <string name="site_settings_quota_header">Садржај</string>
+    <string name="notifications_screen_title">Обавештења</string>
+    <string name="publicize_buttons_screen_title">Дугмићи за дељење</string>
+    <string name="login_epilogue_screen_title">Пријављен као</string>
+    <string name="person_detail_screen_title">Детаљи особе</string>
+    <string name="media_settings_screen_title">Детаљи датотеке</string>
+    <string name="reader_screen_title">Читач</string>
+    <string name="me_section_screen_title">Ја</string>
+    <string name="my_site_section_screen_title">Мој сајт</string>
+    <string name="notif_settings_screen_title">Подешавања обавештења</string>
+    <string name="help_screen_title">Помоћ и Подршка</string>
+    <string name="license_screen_title">Лиценца</string>
+    <string name="version_with_name_param">Издање %s</string>
+    <string name="permissions_denied_title">Допуштења</string>
+    <string name="plugin_caption_featured">Издвојено</string>
+    <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
+    <string name="sharing_disabled">Модул дељења је онемогућен</string>
+    <string name="publisher_with_company_param">Објављивач: %s</string>
+    <string name="quickpress_shortcut_with_account_param">QP %s</string>
+    <string name="uploading_subtitle_pages_posts">Преостало %1$d страница / чланака</string>
+    <string name="uploading_subtitle_pages_only_one">Преостала 1 страница</string>
+    <string name="uploading_subtitle_pages_only_plural">Преостало %1$d страница</string>
+    <string name="uploading_subtitle_posts_only_plural">Преостало %1$d чланака</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">Преостало %1$d страница / чланака и 1 датотека</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_one">Преостало %1$d чланака и 1 датотека</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_one">Преостало %1$d страница и 1 датотека</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_one">Преостао 1 чланак и 1 датотека</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_one">Преостала 1 страница и 1 датотека</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">Преостало %1$d страница / чланака и %2$d од %3$d датотека</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_plural">Преостало %1$d чланака и %2$d од %3$d датотека</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_plural">Преостало %1$d страница и %2$d од %3$d датотека</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_plural">Преостао 1 чланак и %1$d од %2$d датотека</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_plural">Преостала 1 страница и %1$d од %2$d датотека</string>
+    <string name="media_file_pages_and_posts_only_not_uploaded">%1$d чланака / страница није отпремљено</string>
+    <string name="media_file_pages_plural_only_not_uploaded">%1$d страница није отпремљено</string>
+    <string name="media_file_page_singular_only_not_uploaded">1 страница није отпремљена</string>
+    <string name="media_file_posts_plural_only_not_uploaded">%1$d чланака није отпремљено</string>
+    <string name="media_file_post_singular_only_not_uploaded">1 чланак није отпремљен</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%1$d чланака / страница са %2$d датотека није отпремљено</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%1$d страница са %2$d датотека није отпремљено</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">1 страница са %1$d датотека није отпремљена</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%1$d чланака са %2$d датотека није отпремљено</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">1 чланак са %1$d датотека није отпремљен</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d чланака / страница са 1 датотеком није отпремљено</string>
+    <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d страница са 1 датотеком није отпремљено</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 страница са 1 датотеком није отпремљена</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d чланака са 1 датотеком није отпремљено</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 чланак са 1 датотеком није отпремљен</string>
+    <string name="untitled_in_parentheses">(Без наслова)</string>
+    <string name="at_username">\@%s</string>
+    <string name="site_creation_domain_finish_button">Направити веб локацију</string>
+    <string name="notification_site_creation_created">Додирните за наставак.</string>
+    <string name="notification_site_creation_title_success">Веб локација направљена!</string>
+    <string name="username_changer_title">Промени корисничко име</string>
+    <string name="username_changer_hint">Куцај за више предлога</string>
+    <string name="username_changer_dismiss_button_positive">Одбаци</string>
+    <string name="username_changer_dismiss_message">Одбаци промену корисничког имена?</string>
+    <string name="username_changer_action">Сачувај</string>
+    <string name="content_description_add_avatar">Додај аватар</string>
+    <string name="signup_user_exists">Електронска пошта већ постоји на WordPress.com.\nНаставите са пријавом.</string>
+    <string name="signup_updating_account">Ажурирање налога…</string>
+    <string name="signup_magic_link_progress">Слање електронске поште</string>
+    <string name="signup_magic_link_error_button_positive">Покушај поново</string>
+    <string name="signup_magic_link_error_button_negative">Затвори</string>
+    <string name="signup_epilogue_hint_username">Корисничко име</string>
+    <string name="signup_epilogue_hint_password">Лозинка (опционо)</string>
+    <string name="signup_epilogue_hint_display">Име које се приказује</string>
+    <string name="signup_epilogue_error_button_positive">Покушај поново</string>
+    <string name="signup_epilogue_error_button_negative">Врати претходно</string>
+    <string name="plugins_empty_search_list">Нема резултата</string>
+    <string name="my_site_create_new_site">Направите нову веб локацију за своје предузеће, часопис или лични блог; или повежите постојећу Вордпрес инсталацију.</string>
+    <string name="plugin_needs_update">Потребно је ажурирање</string>
+    <string name="plugin_caption_search">Претражи додатке</string>
+    <string name="plugin_caption_new">Нови</string>
+    <string name="plugin_caption_popular">Популарни</string>
+    <string name="plugin_see_all">Види све</string>
+    <string name="plugin_manage">Управљај</string>
+    <string name="plugin_search_error">Претрага додатака није успела</string>
+    <string name="plugin_installed_failed">Грешка приликом инсталирања %s</string>
+    <string name="plugin_installed_successfully">Успешно инсталиран %s</string>
+    <string name="plugin_install">Инсталирај</string>
+    <string name="site_settings_like_header">Свиђа ми се</string>
+    <string name="my_site_add_new_site">Додај нови сајт</string>
+    <string name="stats_jetpack_connection_setup">Инсталирај Jetpack</string>
+    <string name="plugin_info_your_version">Ваша верзија Вордпреса</string>
+    <string name="plugin_info_requires_version">Захтева Вордпрес верзију</string>
+    <string name="plugin_info_lastupdated">Последњи пут ажурирано</string>
+    <string name="plugin_info_version">Верзија</string>
+    <string name="plugin_five_stars">5 звездица</string>
+    <string name="plugin_four_stars">4 звездице</string>
+    <string name="plugin_three_stars">3 звездице</string>
+    <string name="plugin_two_stars">2 звездице</string>
+    <string name="plugin_one_stars">1 звездица</string>
+    <string name="plugin_num_downloads">%s преузимања</string>
+    <string name="plugin_num_ratings">%s оцена</string>
+    <string name="plugin_read_reviews">Читај рецензије</string>
+    <string name="plugin_faq">Често постављана питања</string>
+    <string name="plugin_whatsnew">Шта је ново</string>
+    <string name="plugin_installation">Инсталација</string>
+    <string name="plugin_description">Опис</string>
+    <string name="plugin_settings">Подешавања</string>
+    <string name="plugin_installed">Инсталирано</string>
+    <string name="plugin_installed_version">Верзија %s инсталирана</string>
+    <string name="plugin_version">Верзија %s</string>
+    <string name="plugin_byline">од %s</string>
+    <string name="change_photo">Промените фотографију</string>
+    <string name="plugin_fetch_error">Није у могућности да учита додатке</string>
+    <string name="my_site_btn_site_pages">Странице сајта</string>
+    <string name="dlg_saving_tag">Снимање</string>
+    <string name="dlg_deleting_tag">Брисање</string>
+    <string name="dlg_confirm_delete_tag">Трајно обриши ознаку \'%s\'?</string>
+    <string name="error_tag_exists">Ознака са овим именом већ постоји</string>
+    <string name="tag_name_hint">Ознака</string>
+    <string name="add_new_tag">Додај нову ознаку</string>
+    <string name="tag_description_hint">Опис</string>
+    <string name="site_settings_amp_title">Убрзане мобилне странице (AMP)</string>
+    <string name="site_settings_timezones_error">Није могуће учитати временске зоне</string>
+    <string name="site_settings_format_help">Сазнај више о форматирању датума и времена</string>
+    <string name="site_settings_format_hint_custom">Прилагођен облик</string>
+    <string name="site_settings_format_entry_custom">Прилагођено</string>
+    <string name="site_settings_posts_per_page_title">Чланака по страници</string>
+    <string name="site_settings_timezone_subtitle">Одаберите град у Вашој временској зони</string>
+    <string name="site_settings_timezone_title">Временска зона</string>
+    <string name="site_settings_time_format_title">Облик времена</string>
+    <string name="site_settings_date_format_title">Облик датума</string>
+    <string name="site_settings_week_start_title">Седмица почиње у</string>
+    <string name="site_settings_tags_title">Ознаке</string>
+    <string name="site_settings_traffic_header">Саобраћај</string>
+    <string name="delete_yes">Обриши</string>
+    <string name="plugin_external_link_icon_content_description">Спољна веза</string>
+    <string name="plugin_icon_content_description">Иконица додатка</string>
+    <string name="plugin_home_page">Почетна страница додатка</string>
+    <string name="wordpress_dot_org_plugin_page">WordPress.org страница додатка</string>
+    <string name="plugin_remove_dialog_title">Уклони додатак</string>
+    <string name="plugin_remove_progress_dialog_message">Уклања се %s…</string>
+    <string name="plugin_disable_progress_dialog_message">Онемогућава се %s…</string>
+    <string name="plugin_configuration_failed">Појавила се грешка приликом конфигурисања додатка: %s</string>
+    <string name="plugin_remove_failed">Грешка приликом уклањања %s</string>
+    <string name="plugin_removed_successfully">Успешно уклоњен %s</string>
+    <string name="plugin_updated_failed_detailed">Грешка приликом ажурирања %1$s: %2$s</string>
+    <string name="plugin_updated_failed">Грешка приликом ажурирања %s.</string>
+    <string name="plugin_updated_successfully">Успешно ажуриран %s</string>
+    <string name="plugin_available_version">Верзија %s је доступна</string>
+    <string name="plugin_detail_label_state_autoupdates">Аутоматска ажурирања</string>
+    <string name="plugin_detail_label_state_active">Укључено</string>
+    <string name="plugins">Додаци</string>
+    <string name="my_site_btn_plugins">Додаци</string>
+    <string name="plugin_active">Укључен</string>
+    <string name="plugin_inactive">Искључен</string>
+    <string name="media_edit_link_hint">Отвори везу у новом прозору/језичку</string>
+    <string name="media_edit_link_text">Веза ка</string>
+    <string name="notification_login_failed">Дошло је до грешке.</string>
+    <string name="notification_error_wrong_password">Молимо проверите своју лозинку за наставак.</string>
+    <string name="notification_login_title_stopped">Пријављивање обустављено</string>
+    <string name="notification_logging_in">Молимо сачекајте док траје пријављивање.</string>
+    <string name="notification_login_title_in_progress">Пријављивање у току…</string>
+    <string name="notification_logged_in">Додирни за наставак.</string>
+    <string name="notification_login_title_success">Успешна пријава!</string>
+    <string name="login_empty_password">Молимо унесите лозинку</string>
+    <string name="image_size">Величина</string>
+    <string name="uploading_subtitle_media_only_one">Преостала 1 датотека</string>
+    <string name="uploading_subtitle_media_only">Преостало %1$d од %2$d датотека</string>
+    <string name="uploading_subtitle_posts_only_one">Преостао 1 чланак</string>
+    <string name="uploading_title">Отпремање…</string>
+    <string name="media_files_uploaded_write_post">Напиши чланак</string>
+    <string name="media_all_files_uploaded_successfully">%d датотека успешно отпремљено</string>
+    <string name="media_files_uploaded_successfully">, %d успешно отпремљено</string>
+    <string name="media_file_uploaded">1 датотека отпремљена</string>
+    <string name="media_file_not_uploaded">1 датотека није отпремљена</string>
+    <string name="media_files_uploaded">%d датотека отпремљено</string>
+    <string name="media_files_not_uploaded">%d датотека није отпремљено</string>
+    <string name="remove_image_from_post">Уклони из чланка</string>
+    <string name="confirm_remove_media_image">Уклони ову слику из чланка?</string>
+    <string name="media_edit_customize_card_caption">Прилагоди</string>
+    <string name="media_edit_file_details_card_caption">Детаљи датотеке</string>
+    <string name="login_error_suffix">\nА да покушате са другим налогом?</string>
+    <string name="login_error_button">Затвори</string>
+    <string name="post_settings_remove_featured_image">Уклони издвојену слику</string>
+    <string name="post_settings_choose_featured_image">Одабери издвојену слику</string>
+    <string name="login_log_in_for_share_intent">Улогуј се на WordPress.com како би поделио садржај.</string>
+    <string name="jetpack_disconnect_success_toast">Прекинута веза сајта</string>
+    <string name="jetpack_disconnect_error_toast">Грешка приликом прекида везе сајта</string>
+    <string name="jetpack_disconnect_confirm">Прекини везу</string>
+    <string name="jetpack_disconnect_confirmation_message">Да ли сте сигурни да желите да прекинете везу Jetpack-а са сајтом?</string>
+    <string name="jetpack_allow_wpcom_sign_in_title">Дозволи WordPress.com пријаву</string>
+    <string name="jetpack_wpcom_sign_in_category_title">WordPress.com пријава</string>
+    <string name="jetpack_send_wp_notifications_title">Пошаљите пуш обавештења</string>
+    <string name="jetpack_send_email_notifications_title">Пошаљите обавештења е-поштом</string>
+    <string name="jetpack_security_setting_title">Безбедност</string>
+    <string name="jetpack_site_settings_category_title">Jetpack подешавања</string>
+    <string name="share_intent_adding_to">Додаје се</string>
+    <string name="share_intent_pick_site">Одабери сајт</string>
+    <string name="share_action_media">Додај у библиотеку садржаја</string>
+    <string name="share_action_post">Додај новом чланку</string>
+    <string name="invalid_ip_or_range">Неисправан IP или IP распон</string>
+    <string name="deleting_media_dlg">Брише се</string>
+    <string name="confirm_delete_media_video">Обриши овај видео запис?</string>
+    <string name="confirm_delete_media_image">Обриши ову слику?</string>
+    <string name="media_title_document_details">Детаљи документа</string>
+    <string name="media_title_audio_details">Детаљи звучног записа</string>
+    <string name="media_title_video_details">Детаљи видео записа</string>
+    <string name="media_title_image_details">Детаљи слике</string>
+    <string name="fab_content_description_preview">Преглед</string>
+    <string name="media_edit_upload_date_caption">Датум отпремања</string>
+    <string name="media_edit_duration_caption">Трајање</string>
+    <string name="media_edit_video_dimensions_caption">Димензије видео записа</string>
+    <string name="media_edit_image_dimensions_caption">Димензије слике</string>
+    <string name="media_edit_filetype_caption">Тип датотеке</string>
+    <string name="media_edit_filename_caption">Име датотеке</string>
+    <string name="media_edit_url_caption">URL</string>
+    <string name="media_edit_alttext_text">Резервни текст</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Трептање светла</string>
+    <string name="connect_site">Повежи сајт</string>
+    <string name="notification_settings_item_sights_and_sounds_vibrate_device">Вибрација уређаја</string>
+    <string name="notification_settings_item_sights_and_sounds_choose_sound">Одабери звук</string>
+    <string name="notification_settings_item_other_account_emails">Електронска пошта од WordPress.com</string>
+    <string name="notification_settings_item_other_pending_drafts">Обавести ме о нацртима на чекању</string>
+    <string name="notification_settings_item_other_comments_other_blogs">Коментари на другим сајтовима</string>
+    <string name="notification_settings_category_other">Остало</string>
+    <string name="notification_settings_item_your_sites_all_your_sites">Сви моји сајтови</string>
+    <string name="notification_settings_category_your_sites">Ваши сајтови</string>
+    <string name="notification_settings_main_hint_off">Омогући обавештења</string>
+    <string name="notification_settings_main_hint_on">Онемогући обавештења</string>
+    <string name="notification_settings_main_status_off">Искључено</string>
+    <string name="notification_settings_main_status_on">Укључено</string>
+    <string name="max_video_resolution">Највећа величина видео записа</string>
+    <string name="max_thumbnail_px_size">Највећа величина слике</string>
+    <string name="reader_excerpt_link">Посети %s за више</string>
+    <string name="add_media_progress">Додавање садржаја</string>
+    <string name="upload_failed_param">Отпремање неуспело за \"%s\"</string>
+    <string name="editor_uploading_post">Ваш чланак се отпрема</string>
+    <string name="uploading_media">Отпремање садржаја…</string>
+    <string name="post_scheduled">Чланак заказан</string>
+    <string name="page_scheduled">Страница заказана</string>
+    <string name="button_retry">Покушај поново</string>
+    <string name="post_queued">Чланак на чекању</string>
+    <string name="uploading_post">Отпремање \"%s\"</string>
+    <string name="connection_to_server_lost">Веза са сервером је изгубљена</string>
+    <string name="login_epilogue_mysites_other">Моји сајтови</string>
+    <string name="login_epilogue_mysites_one">Мој сајт</string>
+    <string name="login_empty_2fa">Молимо унесите верификациони код</string>
+    <string name="login_empty_username">Унесите корисничко име</string>
+    <string name="login_log_in_for_deeplink">Улогујте се на WordPress.com како би приступили чланку.</string>
+    <string name="login_error_while_adding_site">Грешка приликом додавања сајта. Код грешке: %s</string>
+    <string name="login_site_address_more_help">Потребна додатна помоћ?</string>
+    <string name="login_site_address_help_title">Која је адреса мог сајта?</string>
+    <string name="login_site_address">Адреса сајта</string>
+    <string name="enter_site_address">Унесите адресу Вордпрес сајта који бисте желели да повежете.</string>
+    <string name="login_already_logged_in_wpcom">Већ сте пријављени на WordPress.com</string>
+    <string name="enter_wpcom_password">Унесите своју WordPress.com лозинку.</string>
+    <string name="login_continue">Настави</string>
+    <string name="connect_more">Повежи други сајт</string>
+    <string name="enter_verification_code">Скоро смо тамо! Унесите верификациони код из апликације Authenticator.</string>
+    <string name="next">Следећи</string>
+    <string name="image_optimization_promo_title">Укључи оптимизацију слика</string>
+    <string name="me_profile_photo">Профилна слика</string>
+    <string name="leave_off">Остави искључено</string>
+    <string name="turn_on">Укључи</string>
+    <string name="error_media_parse_error">Неочекивани одговор од сервера</string>
+    <string name="post_title">Наслов</string>
+    <string name="menu_redo">Понови</string>
+    <string name="menu_undo">Врати</string>
+    <string name="error_media_small">Садржај исувише мален за приказ</string>
+    <string name="editor_content_hint">Поделите своју причу овде…</string>
+    <string name="post_status_post_private">Приватно</string>
+    <string name="post_status_draft">Нацрт</string>
+    <string name="post_status_pending_review">Чека рецензију</string>
+    <string name="post_status_publish_post">Објави</string>
+    <string name="now">Сада</string>
+    <string name="post_settings_tags">Ознаке</string>
+    <string name="post_settings_post_format">Облик чланка</string>
+    <string name="post_settings_slug">Подложак</string>
+    <string name="post_settings_excerpt">Одломак</string>
+    <string name="post_settings_not_set">Није подешено</string>
+    <string name="post_settings_more_options">Више опција</string>
+    <string name="post_settings_categories_and_tags">Категорије &amp; ознаке</string>
+    <string name="notifications_tab_title_all">Све</string>
+    <string name="top_level_category_name">Највиши ниво</string>
+    <string name="category_parent">Родитељска категорија (опционо):</string>
+    <string name="media_empty_audio_list">Немате ниједан звучни запис</string>
+    <string name="media_empty_documents_list">Немате ниједан документ</string>
+    <string name="media_empty_videos_list">Немате ниједан видео запис</string>
+    <string name="media_empty_image_list">Немате ниједну слику</string>
+    <string name="media_error_timeout">Одзив сервера је трајао предуго</string>
+    <string name="media_error_exceeds_memory_limit">Датотека је превелика да би се отпрмила на овај сајт</string>
+    <string name="media_error_exceeds_php_filesize">Датотека премашује максималну величину за отпремање на овом сајту</string>
+    <string name="media_error_http_too_large_video_upload">Видео запис је превелик за отпремање</string>
+    <string name="media_audio">Звучни запис</string>
+    <string name="media_videos">Видео записи</string>
+    <string name="media_documents">Документи</string>
+    <string name="media_images">Слике</string>
+    <string name="media_all">Све</string>
+    <string name="reader_view_comments">Погледајте коментаре</string>
+    <string name="site_settings_optimize_videos">Оптимизуј видео записе</string>
+    <string name="draft_uploaded">Нацрти отпремљени</string>
+    <string name="report_bug">Пријави грешку</string>
+    <string name="video_quality">Квалитет видео записа</string>
+    <string name="permission_camera">Камера</string>
+    <string name="permission_storage">Складиште</string>
+    <string name="button_edit_permissions">Уреди допуштења</string>
+    <string name="photo_picker_soft_ask_allow">Дозволи</string>
+    <string name="photo_picker_soft_ask_label">Потребна дозвола за %s за приступ Вашим фотографијама</string>
+    <string name="connecting_account">Повезивање налога</string>
+    <string name="connected">Повезано</string>
+    <string name="twitter">Twitter</string>
+    <string name="likes">Свиђања</string>
+    <string name="buttons">Дугмад</string>
+    <string name="sharing_edit_more_buttons">Уреди дугме \"Више\"</string>
+    <string name="sharing_more_description">Дугме \"Више\" садржи падајући мени који приказује дугмад за дељење</string>
+    <string name="twitter_username">Корисничко име на Твитеру</string>
+    <string name="sharing_comment_likes">Свиђања коментара</string>
+    <string name="sharing_buttons">Дугмићи за дељење</string>
+    <string name="label">Етикета</string>
+    <string name="button_style">Стил дугмета</string>
+    <string name="site_settings_like">Прикажи дугме свиђања</string>
+    <string name="text_only_display">Само текст</string>
+    <string name="official_buttons_display">Званична дугмад</string>
+    <string name="icon_only_display">Само иконица</string>
+    <string name="icon_and_text_display">Иконица &amp; текст</string>
+    <string name="connecting_social_network">Повезивање %s</string>
+    <string name="dlg_confirm_publicize_disconnect">Прекини повезаност са %s?</string>
+    <string name="share_btn_connect_another_account">Повежи други налог?</string>
+    <string name="share_btn_reconnect">Поново повежи</string>
+    <string name="share_btn_disconnect">Прекини повезаност</string>
+    <string name="share_btn_connect">Повежи</string>
+    <string name="connected_accounts_label">Повезани налози</string>
+    <string name="sharing">Дељење</string>
+    <string name="tabbar_accessibility_label_notifications">Обавештења. Управљајте обавештењима.</string>
+    <string name="connections_label">Повезаности</string>
+    <string name="my_site_btn_sharing">Дељење</string>
+    <string name="button_not_now">Не сада</string>
+    <string name="editor_draft_saved_locally">Нацрт сачуван на уређају</string>
+    <string name="editor_draft_saved_online">Нацрт сачуван онлајн</string>
+    <string name="editor_post_saved_locally">Чланак сачуван на уређају</string>
+    <string name="button_sync">Синхронизуј</string>
+    <string name="photo_picker_choose_video">Одабери видео запис са уређаја</string>
+    <string name="photo_picker_choose_photo">Одабери фотографију са уређаја</string>
+    <string name="media_insert_as_gallery">Додај као галерију</string>
+    <string name="wp_media_title">Вордпресов садржај</string>
+    <string name="media_insert_title">Додај више фотографија</string>
+    <string name="media_gallery_column_count_multi">%d колоне</string>
+    <string name="media_gallery_column_count_single">1 колона</string>
+    <string name="editor_confirm_email_prompt_negative">Поново пошаљи електронску пошту</string>
+    <string name="editor_confirm_email_prompt_title">Молим вас потврдите вашу адресу е-поште</string>
+    <string name="toast_saving_post_as_draft">Чување чланка као нацрт</string>
+    <string name="photo_picker_capture_video">Направи видео запис</string>
+    <string name="photo_picker_capture_photo">Направи фотографију</string>
+    <string name="delete_site_warning_title">Обриши сајт?</string>
+    <string name="start_over_email_intent_error">Није могуће послати електронску пошту</string>
+    <string name="photo_picker_title">Одабери фотографију</string>
+    <string name="editor_post_saved_online">Чланак сачуван онлајн</string>
+    <string name="site_settings_image_quality_hint">Квалитет слика. Више вредности представљају слике бољег квалитета.</string>
+    <string name="media_encoder_quality_100">Максималан</string>
+    <string name="media_encoder_quality_95">Врло висок</string>
+    <string name="media_encoder_quality_90">Висок</string>
+    <string name="media_encoder_quality_85">Средњи</string>
+    <string name="media_encoder_quality_80">Низак</string>
+    <string name="media_upload_state_uploaded">Отпремљено</string>
+    <string name="media_upload_state_failed">Неуспело отпремање</string>
+    <string name="media_upload_state_deleted">Обрисано</string>
+    <string name="media_upload_state_deleting">Брише се</string>
+    <string name="media_upload_state_uploading">Отпрема се</string>
+    <string name="media_upload_state_queued">На чекању</string>
+    <string name="image_quality">Квалитет слике</string>
+    <string name="error_unknown_post_type">Непознат облик чланка</string>
+    <string name="submit_for_review">Предај</string>
+    <string name="error_media_load">Није могуће учитати садржај</string>
+    <string name="error_media_not_found">Садржај није могуће пронаћи</string>
+    <string name="site_settings_optimize_images">Оптимизуј слике</string>
+    <string name="media_generic_error">Дошло је до грешке са садржајем</string>
+    <string name="media_upload_error">Дошло је до грешке са отпремањем садржаја</string>
+    <string name="retry">Покушај поново</string>
+    <string name="confirm">Потврди</string>
+    <string name="reader_hint_search_followed_sites">Претражи праћене сајтове</string>
+    <string name="pending_draft_one_week_1">Ваш нацрт \'%1$s\' Вас чека - не заборавите да га објавите!</string>
+    <string name="pending_draft_one_day_2">Да ли сте знали да је \'%1$s\' још увек нацрт? Објавите га!</string>
+    <string name="reader_label_visit">Посети</string>
+    <string name="swipe_for_more">Превуците за више</string>
+    <string name="reader_err_get_post_not_authorized_signin_fallback">Није вам дозвољено да погледате овај пост. Пробајте да се пријавите у WordPress.com прво или искористите дугме на врху да отворите пост у интернет прегледачу.</string>
+    <string name="reader_err_get_post_not_authorized_signin">Није вам дозвољено да гледате овај пост. Пробајте да се пријавите у WordPress.com прво.</string>
+    <string name="reader_err_get_post_not_authorized_fallback">Није вам дозвољено да гледате овај пост. Кликните на дугме на врху да отворите пост у интернет прегледачу.</string>
+    <string name="reader_snackbar_err_cannot_like_post_logged_out">Не можете да лајкујете док се не улогујете у WordPress.com</string>
+    <string name="reader_toast_err_already_liked">Већ сте лајковали овај коментар</string>
+    <string name="reader_toast_err_comment_not_found">Коментар није пронађен!</string>
+    <string name="reader_toast_err_cannot_like_post">Пост није лајкован</string>
+    <string name="error_notif_q_action_reply">Није одговорено на коментар. Молимо вас да покушате касније.</string>
+    <string name="error_notif_q_action_approve">Коментар није одобрен. Молимо вас да покушате касније.</string>
+    <string name="error_notif_q_action_like">Коментар није лајкован. Молимо вас да покушате касније.</string>
+    <string name="notifications_label_new_notifications_subtitle">Додирните екран да бисте их приказали</string>
+    <string name="notifications_label_new_notifications">Нова обавештења</string>
+    <string name="comment_q_action_replying">Одговарам…</string>
+    <string name="comment_q_action_approving">Одобравам…</string>
+    <string name="comment_q_action_liking">Лајкујем…</string>
+    <string name="comment_q_action_processing">Обрађујем…</string>
+    <string name="comment_q_action_done_generic">Акција одрађена!</string>
+    <string name="comment_liked">Коментар лајкован</string>
+    <string name="signout">Одјави се</string>
+    <string name="sign_in_wpcom">Пријави се у WordPress.com</string>
+    <string name="reader_label_global_related_posts">Више на WordPress.com</string>
+    <string name="reader_label_local_related_posts">Више од %s</string>
+    <string name="preference_open_device_settings">Отвори подешавања телефона</string>
+    <string name="invite_invalid_email">%s: Неисправан емаил</string>
+    <string name="invite_user_blocked_invites">%s: Корисник је блокирао позивнице</string>
+    <string name="invite_already_following">%s: Већ прати</string>
+    <string name="invite_already_a_member">%s: Већ је члан</string>
+    <string name="invite_username_not_found">%s: Корисник није пронађен</string>
+    <string name="comment_moderated_approved">Коментар одобрен!</string>
+    <string name="like">Лајк</string>
+    <string name="timespan_now">сада</string>
+    <string name="role_viewer">Посетилац</string>
+    <string name="role_follower">Пратилац</string>
+    <string name="error_post_my_profile_no_connection">Нема конекције, нисмо могли да сачувамо ваш профил</string>
+    <string name="alignment_right">Десно</string>
+    <string name="alignment_left">Лево</string>
+    <string name="alignment_none">Без</string>
+    <string name="site_settings_list_editor_action_mode_title">Изабрани %1$d</string>
+    <string name="error_fetch_users_list">Нисмо могли да прикажемо кориснике сајта</string>
+    <string name="title_email_follower">Емаил Пратилац</string>
+    <string name="title_follower">Пратилац</string>
+    <string name="people_fetching">Преузимам кориснике…</string>
+    <string name="people_dropdown_item_viewers">Гледаоци</string>
+    <string name="people_dropdown_item_email_followers">Пошаљите е-пошту пратиоцима</string>
+    <string name="people_dropdown_item_followers">Пратиоци</string>
+    <string name="people_dropdown_item_team">Тим</string>
+    <string name="invite_message_usernames_limit">Позовите до 10 адреса е-поште и/или корисничких имена са WordPress.com. Онима којима је потребно корисничко име биће послата упутства како да га креирају.</string>
+    <string name="follower_remove_confirmation_message">Ако га уклоните, овај пратилац ће престати да добија обавештења о овом сајту, осим уколико не крену поново да га прате. Да ли и даље желите да уклоните овог пратиоца?</string>
+    <string name="follower_subscribed_since">Од %1$s</string>
+    <string name="error_remove_follower">Пратилац није уклоњен</string>
+    <string name="error_remove_viewer">Није могуће уклонити прегледач</string>
+    <string name="error_fetch_email_followers_list">Нисмо могли да преузмемо емаилове пратиоца сајта</string>
+    <string name="error_fetch_followers_list">Нисмо могли да преузмемо пратиоце сајта</string>
+    <string name="editor_failed_uploads_switch_html">Неки од медија које сте послали нису успешно послати. У овом тренутку не можете да се пребаците у HTML мод.\nЖелите ли да уклоните све неуспешне медије и да наставите?</string>
+    <string name="image_width">Ширина</string>
+    <string name="image_link_to">Линк ка</string>
+    <string name="image_caption">Натпис</string>
+    <string name="image_settings_save_toast">Промене сачуване</string>
+    <string name="image_settings_dismiss_dialog_title">Одбаци сачуване промене?</string>
+    <string name="stop_upload_dialog_title">Заустави слање?</string>
+    <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="tap_to_try_again">Притисните да пробате поново!</string>
+    <string name="invite_sent">Позивница је успешно послата</string>
+    <string name="invite_error_some_failed">Позивнице су послате али је дошло до грешака!</string>
+    <string name="invite_error_sending">Дошло је до грешке приликом слања позивница!</string>
+    <string name="invite_error_invalid_usernames_multiple">Неисправни емаил-ови или корисничка имена: позивнице нису познате</string>
+    <string name="invite_error_invalid_usernames_one">Корисничко име или емаил нису исправни: позивница није послата</string>
+    <string name="invite_error_no_usernames">Молимо вас додајте бар једно корисничко име</string>
+    <string name="invite_message_title">Прилагођена порука</string>
+    <string name="invite">Позови</string>
+    <string name="invite_names_title">Корисничка имена или адресе е-поште</string>
+    <string name="invite_people">Позови људе</string>
+    <string name="my_site_header_external">Спољни</string>
+    <string name="label_clear_search_history">Обриши историју претраге</string>
+    <string name="dlg_confirm_clear_search_history">Обриши историју претраге?</string>
+    <string name="reader_hint_post_search">Претражи WordPress.com</string>
+    <string name="reader_title_related_post_detail">Повезан чланак</string>
+    <string name="preview_screen_links_disabled">Линкови су искључени на демо екрану</string>
+    <string name="send">Пошаљи</string>
+    <string name="person_removed">Успешно уклоњен %1$s</string>
+    <string name="user_remove_confirmation_message">Ако уклоните %1$s, тај корисник више неће моћи да приступи сајту, али ће сав садржај који је креирао %1$s остати на сајту. \n\nДа ли и даље желите да уклоните овог корисника?</string>
+    <string name="person_remove_confirmation_title">Уклони %1$s</string>
+    <string name="role">Улога</string>
+    <string name="people">Људи</string>
+    <string name="reader_empty_posts_in_custom_list">Сајтови на овој листи нису ништа објавили неко време</string>
+    <string name="error_remove_user">Корисник није уклоњен</string>
+    <string name="error_update_role">Није промењена улога корисника</string>
+    <string name="error_updating_gravatar">Грешка приликом мењања вашег Граватара</string>
+    <string name="error_refreshing_gravatar">Грешка током учитавања вашег Граватара</string>
+    <string name="error_locating_image">Грешка приликом налажења исечене слике</string>
+    <string name="error_cropping_image">Грешка током сечења слике</string>
+    <string name="checking_email">Проверавам емаил</string>
+    <string name="magic_link_unavailable_error_message">Тренутно недоступно. Молимо вас унесите вашу шифру</string>
+    <string name="logging_in">Пријављивање</string>
+    <string name="web_address_dialog_hint">Приказано свима када коментаришете.</string>
+    <string name="capture_or_pick_photo">Сликај камером или изабери слику</string>
+    <string name="plans">Планови</string>
+    <string name="plan">План</string>
+    <string name="export_your_content_message">Ваши постови, стране и подешавања ће вам бити послата емаилом на %s.</string>
+    <string name="export_your_content">Извезите ваш садржај</string>
+    <string name="exporting_content_progress">Извозим садржај…</string>
+    <string name="show_purchases">Прикажи купљено</string>
+    <string name="premium_upgrades_title">Премијум унапређења</string>
+    <string name="delete_site_progress">Бришем сајт…</string>
+    <string name="delete_site_hint">Обриши сајт</string>
+    <string name="export_site_hint">Извезите своје веб место у XML датотеку</string>
+    <string name="primary_domain">Главни домен</string>
+    <string name="error_deleting_site_summary">Дошло је до грешке приликом брисања вашег сајта. Молимо вас контактирајте подршку за више информација</string>
+    <string name="error_deleting_site">Грешка током брисања сајта</string>
+    <string name="confirm_delete_site_prompt">Молимо вас унесите  %1$s у поље испод да потврдите. Ваш сајт ће затим бити заувек обрисан.</string>
+    <string name="site_settings_export_content_title">Извези садржај</string>
+    <string name="confirm_delete_site">Потврди брисање сајта</string>
+    <string name="contact_support">Контактирајте подршку</string>
+    <string name="start_over_text">Ако желите веб локацију, али не желите чланке и странице које имате сада, наш тим за подршку може за вас избрисати ваше чланке, странице, медије и коментаре.\n\nОво ће одржавати вашу веб локацију и УРЛ активним, али ће вам дати нови почетак стварања садржаја. Само нас контактирајте како бисмо уклонили ваш тренутни садржај.</string>
+    <string name="let_us_help">Пустите нас да помогнемо</string>
+    <string name="site_settings_start_over_hint">Започните своје веб место испочетка</string>
+    <string name="start_over">Почни поново</string>
+    <string name="me_btn_app_settings">Подешавања апликације</string>
+    <string name="editor_remove_failed_uploads">Уклони неуспела слања</string>
+    <string name="site_settings_advanced_header">Напредно</string>
+    <string name="comments_empty_list_filtered_trashed">Нема коментара у смећу</string>
+    <string name="comments_empty_list_filtered_pending">Нема коментара који чекају</string>
+    <string name="comments_empty_list_filtered_approved">Нема одобрених коментара</string>
+    <string name="alignment_center">Центар</string>
+    <string name="post_format_video">Видео</string>
+    <string name="post_format_status">Статус</string>
+    <string name="post_format_standard">Стандардни</string>
+    <string name="post_format_quote">Цитат</string>
+    <string name="post_format_link">Линк</string>
+    <string name="post_format_image">Слика</string>
+    <string name="post_format_gallery">Галерија</string>
+    <string name="post_format_chat">Ћаскање</string>
+    <string name="post_format_audio">Звук</string>
+    <string name="post_format_aside">Са стране</string>
+    <string name="notif_tips">Савети за максимизирање користи од WordPress.com.</string>
+    <string name="notif_community">Заједница</string>
+    <string name="notif_suggestions">Предлози</string>
+    <string name="replies_to_my_comments">Одговори на моје коментаре</string>
+    <string name="notif_research">Истражи</string>
+    <string name="username_mentions">Предлози корисничког имена</string>
+    <string name="site_achievements">Достигнућа интернет места</string>
+    <string name="likes_on_my_posts">Свиђања мојих чланака</string>
+    <string name="site_follows">Праћена сајта</string>
+    <string name="likes_on_my_comments">Лајкови на мојим коментарима</string>
+    <string name="comments_on_my_site">Коментари на мом веб месту</string>
+    <string name="site_settings_list_editor_summary_other">%d предмета</string>
+    <string name="site_settings_list_editor_summary_one">1 предемт</string>
+    <string name="approve_auto">Сви корисници</string>
+    <string name="approve_auto_if_previously_approved">Коментари познатих корисника</string>
+    <string name="approve_manual">Нема коментара</string>
+    <string name="site_settings_paging_summary_other">%d коментара по страни</string>
+    <string name="site_settings_paging_summary_one">1 коментар по страни</string>
+    <string name="site_settings_multiple_links_summary_other">Затражи допуштење за више од %d веза</string>
+    <string name="site_settings_multiple_links_summary_one">Затражи допуштење за више од 1 везе</string>
+    <string name="site_settings_multiple_links_summary_zero">Потребно допуштење за више од 0 веза</string>
+    <string name="detail_approve_auto">Аутоматски одобри коментаре свих.</string>
+    <string name="detail_approve_auto_if_previously_approved">Аутоматски одобри ако корисник има претходно одобрени коментар</string>
+    <string name="detail_approve_manual">Захтевајте ручно одобрење за коментаре свих.</string>
+    <string name="days_quantity_one">1 дан</string>
+    <string name="days_quantity_other">%d дана</string>
+    <string name="web_address">Веб адреса</string>
+    <string name="primary_site">Примарно веб место</string>
+    <string name="error_refresh_comments_showing_older">Тренутно није могуће освежити коментаре - приказују се старији коментари</string>
+    <string name="post_settings_set_featured_image">Постави издвојену слику</string>
+    <string name="post_settings_featured_image">Издвојена слика</string>
+    <string name="email_address">Адреса е-поште</string>
+    <string name="dlg_sure_to_delete_comments">Трајно избрисати ове коментаре?</string>
+    <string name="dlg_sure_to_delete_comment">Трајно обриши овај коментар</string>
+    <string name="mnu_comment_delete_permanently">Обриши</string>
+    <string name="comment_deleted_permanently">Коментар обрисан</string>
+    <string name="mnu_comment_untrash">Поврати</string>
+    <string name="comments_empty_list_filtered_spam">Нема нежељених коментара</string>
+    <string name="comment_status_all">Сви</string>
+    <string name="could_not_load_page">Није могуће учитати страницу</string>
+    <string name="off">Искључено</string>
+    <string name="interface_language">Језик интерфејса</string>
+    <string name="about_the_app">О апликацији</string>
+    <string name="error_post_account_settings">Није било могуће сачувати Ваша подешавања налога</string>
+    <string name="error_fetch_account_settings">Није било могуће повратити Ваша подешавања налога</string>
+    <string name="error_fetch_my_profile">Није било могуће повратити Ваш налог</string>
+    <string name="site_settings_unknown_language_code_error">Код језика није препознат</string>
+    <string name="disabled">Онемогућено</string>
+    <string name="search">Претрага</string>
+    <string name="remove">Уклони</string>
+    <string name="site_settings_image_original_size">Изворна величина</string>
+    <string name="privacy_public_not_indexed">Ваша локација је видљива свима, али тражи од претраживача да је не индексирају</string>
+    <string name="privacy_public">Ваша локација је видљива свима и претраживачи је могу индексирати</string>
+    <string name="about_me_hint">Неколико речи о вама …</string>
+    <string name="public_display_name_hint">Име за приказ подразумевано ће бити ваше корисничко име ако није другачије постављено</string>
+    <string name="about_me">О мени</string>
+    <string name="public_display_name">Јавно име за приказ</string>
+    <string name="my_profile">Мој профил</string>
+    <string name="last_name">Презиме</string>
+    <string name="first_name">Име</string>
+    <string name="error_post_remote_site_settings">Није могуће сачувати информације о сајту</string>
+    <string name="error_fetch_remote_site_settings">Није било могуће повратити информације о сајту</string>
+    <string name="site_settings_close_after_dialog_switch_text">Аутоматски затвори</string>
+    <string name="site_settings_close_after_dialog_description">Аутоматски затвори коментаре на чланцима.</string>
+    <string name="site_settings_paging_dialog_header">Коментара по страници</string>
+    <string name="site_settings_close_after_dialog_title">Затвори коментарисање</string>
+    <string name="site_settings_list_editor_input_hint">Унесите реч или фразу</string>
+    <string name="site_settings_list_editor_no_items_text">Нема ставки</string>
+    <string name="site_settings_rp_preview3_site">У \"Ажурирању\"</string>
+    <string name="site_settings_rp_preview2_site">У \"Апликацијама\"</string>
+    <string name="site_settings_rp_preview1_site">У \"Мобилном\"</string>
+    <string name="site_settings_rp_show_images_title">Прикажи слике</string>
+    <string name="site_settings_rp_show_header_title">Прикажи заглавље</string>
+    <string name="site_settings_rp_switch_title">Прикажи везане чланке</string>
+    <string name="site_settings_allowlist_hint">Аутор коментара мора имати претходно одобрени коментар</string>
+    <string name="site_settings_user_account_required_hint">Корисници морају бити регистровани и пријављени да би могли коментарисати</string>
+    <string name="site_settings_identity_required_hint">Аутор коментара мора попунити име и адресу е-поште</string>
+    <string name="site_settings_paging_hint">Прикажите коментаре у комадима одређене величине</string>
+    <string name="site_settings_threading_hint">Омогућите угнежђене коментаре до одређене дубине</string>
+    <string name="site_settings_sort_by_hint">Утврђује редослед приказа коментара</string>
+    <string name="site_settings_close_after_hint">Забрани коментаре након наведеног времена</string>
+    <string name="site_settings_allow_comments_hint">Омогућите читаоцима да постављају коментаре</string>
+    <string name="site_settings_more_hint">Види сва могућа подешавања Расправе</string>
+    <string name="site_settings_related_posts_hint">Прикажи или сакриј везане чланке у читачу</string>
+    <string name="site_settings_format_hint">Поставља нови облик чланка</string>
+    <string name="site_settings_category_hint">Поставља нову категорију чланка</string>
+    <string name="site_settings_password_hint">Измените своју лозинку</string>
+    <string name="site_settings_username_hint">Тренутни кориснички налог</string>
+    <string name="site_settings_language_hint">Језик у ком је овај блог првенствено написан</string>
+    <string name="site_settings_privacy_hint">Контролише ко може да види Ваш сајт</string>
+    <string name="site_settings_address_hint">Промена адресе тренутно није подржана</string>
+    <string name="site_settings_allowlist_known_summary">Коментари познатих корисника</string>
+    <string name="site_settings_allowlist_all_summary">Коментари свих корисника</string>
+    <string name="site_settings_threading_summary">Нивои %d</string>
+    <string name="site_settings_privacy_private_summary">Приватно</string>
+    <string name="site_settings_privacy_hidden_summary">Сакривено</string>
+    <string name="site_settings_privacy_public_summary">Јавно</string>
+    <string name="site_settings_delete_site_title">Обриши сајт</string>
+    <string name="site_settings_moderation_hold_title">Задржи за модеризацију</string>
+    <string name="site_settings_multiple_links_title">Везе у коментарима</string>
+    <string name="site_settings_allowlist_title">Аутоматски одобри</string>
+    <string name="site_settings_sort_by_title">Сортирај по</string>
+    <string name="site_settings_account_required_title">Корисници морају бити улоговани</string>
+    <string name="site_settings_identity_required_title">Мора да садржи име и е-пошту</string>
+    <string name="site_settings_receive_pingbacks_title">Примај повратне везе</string>
+    <string name="site_settings_send_pingbacks_title">Шаљи повратне везе</string>
+    <string name="site_settings_allow_comments_title">Дозволите коментаре</string>
+    <string name="site_settings_default_format_title">Подразумевани облик</string>
+    <string name="site_settings_default_category_title">Подразумевана категорија</string>
+    <string name="site_settings_address_title">Адреса</string>
+    <string name="site_settings_title_title">Наслов сајта</string>
+    <string name="site_settings_discussion_new_posts_header">Подразумеване ствари за нове чланке</string>
+    <string name="site_settings_writing_header">Писање</string>
+    <string name="site_settings_account_header">Налог</string>
+    <string name="site_settings_general_header">Уопштено</string>
+    <string name="newest_first">Прво најновије</string>
+    <string name="comments">Коментари</string>
+    <string name="oldest_first">Прво најстарије</string>
+    <string name="close_after">Затвори након</string>
+    <string name="related_posts">Везани чланци</string>
+    <string name="privacy">Приватност</string>
+    <string name="discussion">Расправа</string>
+    <string name="unknown">Непознато</string>
+    <string name="never">Никад</string>
+    <string name="reader_err_get_post_not_found">Овај чланак више не постоји</string>
+    <string name="reader_empty_followed_blogs_no_recent_posts_title">Нема скорашњих чланака</string>
+    <string name="selected_theme">Одабрана тема</string>
+    <string name="could_not_load_theme">Није могуће учитати тему</string>
+    <string name="theme_activation_error">Нешто је пошло по злу. Није било могуће активирати тему</string>
+    <string name="theme_by_author_prompt_append"> од стране %1$s</string>
+    <string name="theme_prompt">Хвала што сте одабрали %1$s</string>
+    <string name="theme_manage_site">УПРАВЉАЈ САЈТОМ</string>
+    <string name="theme_done">ГОТОВО</string>
+    <string name="theme_support">Подршка</string>
+    <string name="theme_details">Детаљи</string>
+    <string name="theme_view">Види</string>
+    <string name="theme_try_and_customize">Испробај &amp; Прилагоди</string>
+    <string name="theme_activate">Укључи</string>
+    <string name="active">Укључено</string>
+    <string name="support">Подршка</string>
+    <string name="details">Детаљи</string>
+    <string name="customize">Прилагоди</string>
+    <string name="current_theme">Тренутна тема</string>
+    <string name="post_published">Чланак је објављен</string>
+    <string name="page_updated">Страница ажурирана</string>
+    <string name="post_updated">Чланак ажуриран</string>
+    <string name="page_published">Страница објављена</string>
+    <string name="theme_no_search_result_found">Жао нам је, ниједна тема није пронађена</string>
+    <string name="reader_label_gap_marker">Учитај више чланака</string>
+    <string name="search_sites">Претражи сајтове</string>
+    <string name="notifications_empty_view_reader">Идите у Читач</string>
+    <string name="notifications_empty_action_followers_likes">Будите примећени: коментаришите чланке које сте прочитали</string>
+    <string name="notifications_empty_action_comments">Придружите се разговору: коментаришите чланке блогова које пратите</string>
+    <string name="notifications_empty_action_all">Будите активни! Коментaришите чланке блогова које пратите.</string>
+    <string name="notifications_empty_comments">Још увек нема коментара</string>
+    <string name="notifications_empty_unread">У току сте са свим!</string>
     <string name="reader_short_comment_count_multi">%s коментара</string>
     <string name="reader_short_comment_count_one">1 коментар</string>
     <string name="reader_hint_comment_on_post">Одговор на чланак…</string>
@@ -16,6 +1643,8 @@ Language: sr_RS
     <string name="reader_short_like_count_multi">%s свиђања</string>
     <string name="reader_short_like_count_one">1 свиђање</string>
     <string name="reader_short_like_count_none">Свиђање</string>
+    <string name="reader_label_follow_count">%,d пратилаца</string>
+    <string name="reader_menu_tags">Уреди ознаке и сајтове</string>
     <string name="reader_title_post_detail">Чланак читача</string>
     <string name="notifications_push_summary">Подешавања за обавештења која се појављују на вашем уређају.</string>
     <string name="notifications_email_summary">Подешавања за обавештења која су послата на е-пошту повезану са вашим налогом.</string>
@@ -27,26 +1656,35 @@ Language: sr_RS
     <string name="email">Е-пошта</string>
     <string name="app_notifications">Обавештења апликације</string>
     <string name="notifications_tab">Језичак обавештења</string>
+    <string name="notification_settings_item_other_account_emails_summary">Увек ћемо слати важну е-пошту везану за ваш налог, али такође можете да добијете неке додатке који могу да Вам помогну.</string>
     <string name="stats_insights_latest_post_summary">Резиме последњег чланка</string>
     <string name="connectionbar_no_connection">Нема везе</string>
     <string name="post_trashed">Чланак је послат на отпад</string>
-    <string name="button_stats">Статистике</string>
     <string name="button_trash">Отпад</string>
     <string name="button_preview">Предпреглед</string>
     <string name="button_view">Поглед</string>
     <string name="button_edit">Уређивање</string>
     <string name="button_publish">Објављивање</string>
+    <string name="button_stats">Статистика</string>
+    <string name="reader_toast_err_follow_blog_not_authorized">Нисте овлашћени да приступите овом веб месту</string>
+    <string name="reader_toast_err_follow_blog_not_found">Овај сајт не може бити пронађен</string>
     <string name="undo">Врати</string>
-    <string name="stats_insights_best_ever">Најбољи погледи икада</string>
+    <string name="push_auth_expired">Захтев је истекао. Пријавите се на WordPress.com да бисте покушали поново.</string>
     <string name="ignore">Занемари</string>
-    <string name="stats_insights_today">Данашње статистике</string>
-    <string name="stats_insights_all_time">Чланци, погледи и посетиоци целог времена</string>
+    <string name="stats_insights_best_ever">Најбољи прегледи икад</string>
+    <string name="stats_insights_today">Данашња статистика</string>
+    <string name="stats_insights_all_time">Чланци, прегледи и посетиоци за све време</string>
     <string name="stats_insights">Увиди</string>
+    <string name="me_disconnect_from_wordpress_com">Одјави се са WordPress.com</string>
     <string name="me_btn_login_logout">Пријава/одјава</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" није сакривен зато што је тренутно веб место</string>
+    <string name="me_connect_to_wordpress_com">Пријави се на WordPress.com</string>
     <string name="me_btn_support">Помоћ и подршка</string>
+    <string name="site_picker_cant_hide_current_site">„%s“ није сакривен зато што је тренутно веб место</string>
+    <string name="account_settings">Подешавања налога</string>
+    <string name="site_picker_create_wpcom">Направи WordPress.com сајт</string>
     <string name="site_picker_edit_visibility">Прикажи/сакриј веб места</string>
     <string name="site_picker_add_self_hosted">Додај самостално угошћено веб место</string>
+    <string name="site_picker_add_site">Додај нови сајт</string>
     <string name="my_site_btn_view_admin">Види управљање</string>
     <string name="my_site_btn_view_site">Види веб место</string>
     <string name="site_picker_title">Одабери веб место</string>
@@ -64,6 +1702,7 @@ Language: sr_RS
     <string name="language">Језик</string>
     <string name="verification_code">Код за потврђивање</string>
     <string name="invalid_verification_code">Погрешан верификациони код</string>
+    <string name="auth_required">Пријавите се поново за наставак.</string>
     <string name="publisher">Објављивач:</string>
     <string name="error_notification_open">Није могуће отворити обавештење</string>
     <string name="stats_search_terms_unknown_search_terms">Непознати термини за претрагу</string>
@@ -77,7 +1716,8 @@ Language: sr_RS
     <string name="logs_copied_to_clipboard">Извештај о променама у апликацији је копиран у оставу</string>
     <string name="reader_label_new_posts">Нови чланци</string>
     <string name="error_copy_to_clipboard">Дошло је до грешке приликом копирања текста у оставу</string>
-    <string name="reader_page_recommended_blogs">Веб места која би могла да вам се свиде</string>
+    <string name="post_uploading">Отпремање чланка</string>
+    <string name="reader_empty_posts_in_blog">Овај сајт је празан</string>
     <string name="themes_fetching">Добављам теме…</string>
     <string name="stats_followers_months">%1$d месеци</string>
     <string name="stats_followers_a_year">Година</string>
@@ -94,11 +1734,11 @@ Language: sr_RS
     <string name="stats_view_followers">Пратиоци</string>
     <string name="stats_view_countries">Државе</string>
     <string name="stats_likes">Свиђања</string>
-    <string name="stats_timeframe_years">Година</string>
     <string name="stats_views">Прегледа</string>
     <string name="stats_visitors">Посетиоци</string>
     <string name="stats_view_top_posts_and_pages">Чланци и стране</string>
-    <string name="stats_view_publicize">Publicize</string>
+    <string name="stats_view_publicize">Објави</string>
+    <string name="stats_timeframe_years">Годишња</string>
     <string name="ssl_certificate_details">Детаљи</string>
     <string name="cab_selected">%d изабрано</string>
     <string name="reader_empty_comments">Нема коментара</string>
@@ -117,15 +1757,28 @@ Language: sr_RS
     <string name="comment">Коментар</string>
     <string name="comment_trashed">Коментар померен на отпад</string>
     <string name="posts_empty_list">Не постоје чланци. Зашто не бисте направили нови?</string>
-    <string name="comment_reply_to_user">Одговор %s</string>
     <string name="error_refresh_unauthorized_pages">Немате дозволу да прегледате или уређујете стране</string>
     <string name="browse_our_faq_button">Прегледајте наша ЧПП</string>
-    <string name="reader_toast_err_generic">Није могуће обавити ову радњу</string>
+    <string name="signing_out">Одјава…</string>
+    <string name="comment_reply_to_user">Одговорите %s</string>
+    <string name="reader_empty_posts_in_tag">Нема чланака са овом темом</string>
+    <string name="reader_toast_err_generic">Није могуће обавити овај поступак</string>
+    <string name="reader_toast_err_block_blog">Није могуће блокирати ову страницу</string>
+    <string name="reader_menu_block_blog">Блокирај овај сајт</string>
+    <string name="reader_toast_blog_blocked">Чланци са овог сајта више неће бити приказивани</string>
     <string name="schedule_verb">Заказати</string>
     <string name="update_verb">Ажурирај</string>
     <string name="reader_page_followed_blogs">Веб места која пратите</string>
+    <string name="reader_hint_add_tag_or_url">Унесите URL или ознаку за праћење</string>
+    <string name="reader_label_followed_blog">Сајт запраћен</string>
+    <string name="reader_toast_err_get_blog_info">Није могуће приказати овај сајт</string>
+    <string name="reader_toast_err_already_follow_blog">Већ пратите овај сајт</string>
+    <string name="reader_toast_err_follow_blog">Није могуће пратити овај сајт</string>
+    <string name="reader_toast_err_unfollow_blog">Није могуће отпратити овај сајт</string>
+    <string name="reader_empty_recommended_blogs">Нема препоручених сајтова</string>
+    <string name="reader_title_blog_preview">Сајт читача</string>
+    <string name="reader_page_followed_tags">Праћене теме</string>
     <string name="help">Помоћ</string>
-    <string name="forgot_password">Изгубили сте лозинку?</string>
     <string name="ssl_certificate_error">Неисправна SSL потврда</string>
     <string name="ssl_certificate_ask_trust">Уколико се уобичајено на ово веб место повезујете без проблема, ова грешка може да значи да неко други покушава да се представи као ваше веб место и у том случају не би требало да наставите. Желите ли ипак да верујете овој потврди?</string>
     <string name="adding_cat_failed">Додавање категорије неуспешно</string>
@@ -149,6 +1802,7 @@ Language: sr_RS
     <string name="sdcard_message">Уграђена SD картица је неопходна за отпремање медија</string>
     <string name="error_refresh_posts">Чланци тренутно не могу бити освежени</string>
     <string name="mnu_comment_unspam">Није непожељен коментар</string>
+    <string name="error_deleting_post">Дошло је до грешке приликом брисања чланка</string>
     <string name="select_categories">Одаберите категорије</string>
     <string name="page_settings">Подешавања стране</string>
     <string name="connection_error">Грешка у успостављању везе</string>
@@ -175,16 +1829,13 @@ Language: sr_RS
     <string name="http_authorization_required">Неопходно овлашћење</string>
     <string name="new_post">Нови чланак</string>
     <string name="new_media">Нови медиј</string>
-    <string name="privacy_policy">Полиса приватности</string>
     <string name="local_changes">Локалне измене</string>
     <string name="image_settings">Подешавања слике</string>
     <string name="cannot_delete_multi_media_items">Неки медији тренутно не могу бити обрисани. Пробајте поново касније.</string>
     <string name="link_enter_url_text">Текст везе (опционо)</string>
     <string name="local_draft">Локални нацрт</string>
     <string name="post_settings">Подешавања чланка</string>
-    <string name="open_source_licenses">Дозволе Отвореног кода</string>
     <string name="wordpress_blog">Вордпрес блог</string>
-    <string name="error_blog_hidden">Овај блог је сакривен и не може се учитати. У подешавањима поново омогућите да буде видљив и пробајте поново.</string>
     <string name="add_new_category">Додај нову категорију</string>
     <string name="category_name">Име категорије</string>
     <string name="file_error_create">Није могуће направити привремену датотеку за отпремање медија. Потврдите да имате довољно слободног простора за складиштење на свом уређају.</string>
@@ -196,13 +1847,25 @@ Language: sr_RS
     <string name="comment_status_spam">Непожељни коментар</string>
     <string name="post_not_found">Дошло је до грешке током учитавања чланка. Освежите списак чланака и пробајте поново.</string>
     <string name="remove_account">Уклони веб место</string>
+    <string name="plugin_not_found">Дошло је до грешке приликом приступа овом додатку.</string>
+    <string name="file_not_found">Није могуће пронаћи датотеку за отпремање. Да ли је можда обрисана или померена?</string>
+    <string name="invalid_site_url_message">Проверите да ли је унета УРЛ адреса тачна</string>
+    <string name="error_refresh_media">Тренутно није могуће освежити медије</string>
+    <string name="privacy_policy">Политика приватности</string>
+    <string name="open_source_licenses">Лиценце отвореног кода</string>
+    <string name="error_blog_hidden">Овај блог је скривен и не може се учитати. Поново га омогућите у подешавањима и покушајте поново.</string>
+    <string name="notifications_empty_all">Нема обавештења … још увек.</string>
+    <string name="delete_page">Обриши страницу?</string>
+    <string name="delete_post">Обриши чланак?</string>
+    <string name="reader_toast_err_add_tag">Није могуће додати ову тему</string>
+    <string name="reader_toast_err_remove_tag">Није могуће уклонити ову тему</string>
     <string name="share_link">Подели везу</string>
     <string name="reader_empty_posts_in_tag_updating">Добављам чланке…</string>
     <string name="comment_spammed">Коментар означен као непожељан</string>
     <string name="reader_label_reply">Одговор</string>
-    <string name="cant_share_no_visible_blog">Не можете делити на Вордпрес без видљивог блога</string>
     <string name="reader_likes_you_and_multi">Вама и %,d других се ово свиђа</string>
-    <string name="reader_likes_multi">%,d људи се ово свиђа</string>
+    <string name="cant_share_no_visible_blog">Не можете делити на Вордпресу без видљивог блога</string>
+    <string name="reader_likes_multi">%,d људи ово воли</string>
     <string name="pick_photo">Одаберите фотографију</string>
     <string name="pick_video">Одаберите видео снимак</string>
     <string name="reader_toast_err_get_post">Није могуће добавити овај чланак</string>
@@ -221,7 +1884,10 @@ Language: sr_RS
     <string name="reader_toast_err_url_intent">Није могуће отворити %s</string>
     <string name="empty_list_default">Овај списак је празан</string>
     <string name="reader_hint_comment_on_comment">Одговор на коментар…</string>
-    <string name="stats_timeframe_weeks">Недељу дана</string>
+    <string name="comments_empty_list">Још увек нема коментара</string>
+    <string name="sign_up_label">Пријави се</string>
+    <string name="reader_toast_err_tag_exists">Већ пратите ову тему</string>
+    <string name="reader_toast_err_tag_invalid">Ово није исправна тема</string>
     <string name="media_gallery_type_squares">Квадрати</string>
     <string name="media_gallery_type_circles">Кругови</string>
     <string name="media_edit_title_text">Наслов</string>
@@ -230,21 +1896,25 @@ Language: sr_RS
     <string name="stats_view_referrers">Извори упућивања</string>
     <string name="stats_timeframe_today">Данас</string>
     <string name="stats_timeframe_yesterday">Јуче</string>
-    <string name="stats_timeframe_days">Дани</string>
-    <string name="stats_timeframe_months">Месеци</string>
     <string name="share_action">Подели</string>
-    <string name="stats">Статистике</string>
-    <string name="stats_view_clicks">Притискања</string>
     <string name="themes">Теме</string>
-    <string name="media_gallery_type_tiled">Поплочан</string>
     <string name="media_edit_failure">Ажурирање неуспешно</string>
     <string name="theme_activate_button">Укључи</string>
     <string name="media_gallery_type_slideshow">Приказ слајдова</string>
     <string name="stats_view_tags_and_categories">Ознаке и категорије</string>
+    <string name="stats">Статистика</string>
+    <string name="stats_view_clicks">Кликови</string>
+    <string name="media_gallery_type_tiled">Плочице</string>
+    <string name="stats_timeframe_months">Месечна</string>
+    <string name="stats_timeframe_weeks">Недељна</string>
+    <string name="stats_timeframe_days">Дневна</string>
     <string name="manage">Управљајте</string>
+    <string name="discard">Одбаци</string>
     <string name="note_reply_successful">Успешно одговорено</string>
     <string name="new_notifications">%d нових обавештења</string>
     <string name="more_notifications">и %d још.</string>
+    <string name="sign_in">Пријава</string>
+    <string name="follows">Праћења</string>
     <string name="loading">Учитавање…</string>
     <string name="httpuser">HTTP корисничко име</string>
     <string name="httppassword">HTTP лозинка</string>
@@ -252,12 +1922,14 @@ Language: sr_RS
     <string name="incorrect_credentials">Неисправно корисничко име или лозинка.</string>
     <string name="password">Лозинка</string>
     <string name="username">Корисничко име</string>
+    <string name="log_in">Пријавите се</string>
     <string name="reader">Читач</string>
     <string name="pages">Стране</string>
     <string name="no_network_title">Нема доступне мреже</string>
     <string name="posts">Чланци</string>
     <string name="anonymous">Анониман</string>
     <string name="ok">У реду</string>
+    <string name="done">обављено</string>
     <string name="link_enter_url">URL</string>
     <string name="app_title">Вордпрес за Андроид</string>
     <string name="tos">Услови сервиса</string>
@@ -270,11 +1942,15 @@ Language: sr_RS
     <string name="quickpress_add_alert_title">Подеси име пречице</string>
     <string name="settings">Подешавања</string>
     <string name="quickpress_add_error">Име пречице не може бити празно</string>
+    <string name="pages_private">Приватна</string>
     <string name="title">Наслов</string>
     <string name="categories">Категорије</string>
+    <string name="tags_separate_with_commas">Одвојите ознаке зарезима</string>
+    <string name="dlg_deleting_comments">Брисање коментара</string>
     <string name="sdcard_title">SD картица неопходна</string>
     <string name="media">Медији</string>
     <string name="delete">Обриши</string>
+    <string name="approve">Одобри</string>
     <string name="none">Ниједан</string>
     <string name="error">Грешка</string>
     <string name="cancel">Откажи</string>
@@ -287,4 +1963,5 @@ Language: sr_RS
     <string name="yes">Да</string>
     <string name="no">Не</string>
     <string name="notification_settings">Подешавања обавештења</string>
+    <string name="publish_now">Објави одмах</string>
 </resources>
diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml
index 7cf8a8c34ebd..8e3c297b2765 100644
--- a/WordPress/src/main/res/values-sv/strings.xml
+++ b/WordPress/src/main/res/values-sv/strings.xml
@@ -1,315 +1,745 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-26 16:21:19+0000
+Translation-Revision-Date: 2021-05-19 05:42:49+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: sv_SE
 -->
 <resources>
-    <string name="gutenberg_native_s_is_not_fully_supported">”%s” stöds inte fullt ut</string>
+    <string name="gutenberg_native_double_tap_to_add_a_link">Dubbeltryck för att lägga till en länk.</string>
+    <string name="gutenberg_native_add_link">LÄGG TILL LÄNK</string>
+    <string name="login_empty_view_try_another_account">Prova med ett annat konto</string>
+    <string name="login_empty_view_see_instructions">Se instruktionerna</string>
+    <string name="login_empty_view_avatar_content_description">Ditt profilfoto</string>
+    <string name="gutenberg_native_size">Storlek</string>
+    <string name="gutenberg_native_move_image_forward">Flytta bilden framåt</string>
+    <string name="gutenberg_native_move_image_backward">Flytta bilden bakåt</string>
+    <string name="gutenberg_native_image_settings">Bildinställningar</string>
+    <string name="gutenberg_native_audio_settings">Ljudinställningar</string>
+    <string name="user_profile_untitled_site">(utan rubrik)</string>
+    <string name="user_profile_site_section_header">Webbplats</string>
+    <string name="user_profile_bottom_sheet_description">Användarprofil, information på nedre blad</string>
+    <string name="likes_list_screen_title">Lista över gilla-markeringar %s</string>
+    <string name="gutenberg_native_write_code">Skriv kod …</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sortering och filtrering</string>
+    <string name="gutenberg_native_show_download_button">Visa nedladdningsknapp</string>
+    <string name="gutenberg_native_shortcode">Kortkod</string>
+    <string name="gutenberg_native_read_more">Läs mer</string>
+    <string name="gutenberg_native_preload">Förhandsladda</string>
+    <string name="gutenberg_native_post_meta_settings">Inställningar för metainformation om inlägg</string>
+    <string name="gutenberg_native_post_content_settings">Inställningar för inläggsinnehåll</string>
+    <string name="gutenberg_native_metadata">Metadata</string>
+    <string name="gutenberg_native_media_file">Mediafil</string>
+    <string name="gutenberg_native_media_area">Mediaområde</string>
+    <string name="gutenberg_native_loop">Loop</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Länk till</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">bild %1$d av %2$d i galleri</string>
+    <string name="gutenberg_native_heading_d">Rubriknivå %d</string>
+    <string name="gutenberg_native_featured">Utvalda</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Ange URL att bädda in här …</string>
+    <string name="gutenberg_native_edit_image">Redigera bild</string>
+    <string name="gutenberg_native_display_post_date">Visa inläggsdatum</string>
+    <string name="gutenberg_native_code">Kod</string>
+    <string name="gutenberg_native_change_heading_level">Ändra rubriknivå</string>
+    <string name="gutenberg_native_browser_default">Standardinställning för webbläsare</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Block har tagits bort eller är inte tillgängligt.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Block kan inte visas inuti sig självt.</string>
+    <string name="gutenberg_native_autoplay">Automatisk uppspelning</string>
+    <string name="gutenberg_native_auto">Automatisk</string>
+    <string name="gutenberg_native_attachment_page">Sida för bilaga</string>
+    <string name="gutenberg_native_add_text">Lägg till text …</string>
+    <string name="gutenberg_native_add_caption">Lägg till bildtext</string>
+    <string name="login_no_jetpack_sites">Inga Jetpack-webbplatser hittades</string>
+    <string name="gutenberg_native_what_is_alt_text">Vad är alternativ text?</string>
+    <string name="gutenberg_native_transform_s_to">Omvandla %s till</string>
+    <string name="gutenberg_native_transform_block">Omvandla block …</string>
+    <string name="gutenberg_native_failed_to_insert_media">Misslyckades att infoga media.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Misslyckades att infoga ljudfil.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Beskriv bildens syfte. Lämna tomt om bilden endast har dekorativ funktion.</string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s har omvandats till %2$s</string>
+    <string name="like_faces_error_loading_message">Fel vid hämtning av info om gillamarkeringar. %s.</string>
+    <string name="like_faces_plural_text">%d bloggare gillar detta.</string>
+    <string name="like_faces_singular_text">En bloggare gillar detta.</string>
+    <string name="like_title_plural">%d gillamarkeringar</string>
+    <string name="like_title_singular">1 gillamarkering</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Ange inloggningsuppgifterna till din server för att avhjälpa hot.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Ange inloggningsuppgifterna till din server för att avhjälpa hotet.</string>
+    <string name="suggestion">Förslag:</string>
+    <string name="gutenberg_native_search_blocks">Sök block</string>
+    <string name="gutenberg_native_search_block">Sök block</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">Dubbelklicka för att ändra enhet</string>
+    <string name="gutenberg_native_clear_search">Rensa sökning</string>
+    <string name="gutenberg_native_cancel_search">Avbryt sök</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s är %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Ett fel uppstod vid hämtningen av data för gilla-markeringar</string>
+    <string name="get_likes_unknown_error">Ett okänt fel uppstod vid hämtningen av gilla-markeringar</string>
+    <string name="get_likes_no_network_error">Inget nätverk tillgängligt.</string>
+    <string name="comments_empty_list_filtered_unreplied">Inga obesvarade kommentarer</string>
+    <string name="comment_status_unreplied">Obesvarat</string>
+    <string name="gutenberg_native_table_of_contents">Innehållsförteckning</string>
+    <string name="gutenberg_native_summary">sammanfattning</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Sammanfatta ditt inlägg med en rubriklista. Lägg in HTML-länkmål till rubrikblock för att länka till dem härifrån.</string>
+    <string name="gutenberg_native_document_outline">dokumentöversikt</string>
+    <string name="gutenberg_native_buttongroup">Knappgrupp</string>
+    <string name="jetpack_brute_force_allowlist_title">IP-adresser som alltid tillåts</string>
+    <string name="site_settings_denylist_title">Kommentering avstängd</string>
+    <string name="reader_title_interests">Följ ämnen</string>
+    <string name="stories_intro_main_subtitle">Ett nytt sätt att skapa och publicera engagerande innehåll på din webbplats.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Stäng</string>
+    <string name="activity_log_backup_download_notice_download_action">Ladda ner</string>
+    <string name="threat_fix_all_status_success_message_plural">Hoten har åtgärdats utan problem.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Bekräfta att du vill åtgärda alla %s aktiva hot.</string>
+    <string name="scan_idle_threats_description_plural">Genomsökningen hittade %1$s potentiella hot hos %2$s. Granska dem nedan och vidta åtgärder eller tryck på knappen ”Åtgärda allt”. Vi finns %3$s om du behöver vår hjälp.</string>
+    <string name="scan_fixing_threats_description_plural">Vi arbetar intensivt med att rätta dessa hot i bakgrunden. Under tiden får du gärna fortsätta att använda din webbplats som vanligt. Du kan när som helst kolla hur arbetet fortskrider.</string>
+    <string name="gutenberg_native_edit_focal_point">Ändra plats i fokus</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Dubbeltryck för att öppna nedre bladet där du kan redigera, ersätta eller ta bort bilden</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Dubbeltryck för att öppna åtgärdsbladet där du kan redigera, ersätta eller ta bort bilden</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Skriv ett namn för din webbplats</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Alla uppgifter är utförda&lt;/b&gt;&lt;br/&gt;Nu kommer du att nå fler. Bra gjort!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Alla uppgifter är utförda&lt;/b&gt;&lt;br/&gt;Nu har du anpassat webbplatsen. Bra gjort!</string>
+    <string name="quick_start_card_menu_hide">Dölj tills vidare</string>
+    <string name="magic_link_not_meaning_to_create_account">Vill du inte registrera ett nytt konto? Gå tillbaka för att mata in e-postadressen igen.</string>
+    <string name="invite_links_disable_dialog_message">När denna inbjudningslänk har inaktiverats kan ingen använda den för att ansluta sig till ditt team. Är du säker?</string>
+    <string name="invite_links_disable_dialog_title">Inaktivera inbjudningslänk</string>
+    <string name="invite_links_bad_format_response">Ett ogiltigt svar har tagits emot</string>
+    <string name="invite_links_null_response">Inget svar har tagits emot</string>
+    <string name="invite_links_cannot_get_role_data_error">Ett fel inträffade när uppgifterna för rollen %1$s skulle hämtas</string>
+    <string name="invite_links_cannot_get_roles_error">Ett fel inträffade när rollerna skulle hämtas</string>
+    <string name="invite_links_generic_get_data_error">Ett okänt fel inträffade när uppgifter om inbjudningslänkar skulle hämtas</string>
+    <string name="invite_links_helper_text">Använd denna länk för att låta dina teammedlemmar gå med utan att behöva bjuda in dem en och en. Vem som helst som besöker denna URL kan registrera sig till din organisation, även om de har fått länken från någon annan, så se till att du delar den med betrodda personer.</string>
+    <string name="invite_links_expire_date">Löper ut %1$s</string>
+    <string name="invite_links_disable_invite_link">Inaktivera inbjudningslänk</string>
+    <string name="invite_links_share_invite_link">Dela inbjudningslänk</string>
+    <string name="invite_links_generate">Generera ny länk</string>
+    <string name="invite_links_get_status_retry">Uppdatera länkarnas status</string>
+    <string name="invite_links_section_title">Inbjudningslänk</string>
+    <string name="threats_found_singular">Hot hittat</string>
+    <string name="threats_found_plural">Hot hittade</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Genomsökningen genomförd&lt;/b&gt; &lt;br&gt;%s potentiella hot hittades</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Genomsökningen genomförd&lt;/b&gt; &lt;br&gt;1 potentiellt hot hittades</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Genomsökningen genomförd&lt;/b&gt; &lt;br&gt;Inga hot hittades</string>
+    <string name="scan_fixing_threats_title_singular">Åtgärdar hot</string>
+    <string name="disable">Inaktivera</string>
+    <string name="quick_start_card_menu_unpin">Avklistra detta</string>
+    <string name="quick_start_list_review_pages_subtitle">Kontrollera dina sidor och gör ändringar, lägg till eller ta bort sidor.</string>
+    <string name="quick_start_list_view_site_title">Besök din webbplats</string>
+    <string name="quick_start_list_upload_icon_subtitle">Lägg till en webbplatsikon för ett genomarbetat och proffsigt utseende.</string>
+    <string name="quick_start_list_follow_site_subtitle">Hitta och följ webbplatser som inspirerar dig.</string>
+    <string name="quick_start_list_enable_sharing_title">Aktivera delning</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Dela automatiskt dina nya inlägg i dina sociala media.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Ge din webbplats ett namn som återspeglar dess personlighet och ämnesområde.</string>
+    <string name="quick_start_list_check_stats_title">Kolla din statistik</string>
+    <string name="backup_download_status_failure_bullet2">Vi kommer fortfarande att försöka skapa din nedladdningsbara fil med en säkerhetskopia.</string>
+    <string name="backup_download_status_failure_bullet1">Vi lyckades inte hitta statusläget för att kunna säga hur lång tid den nedladdningsbara säkerhetskopieringen kommer att ta.</string>
+    <string name="backup_download_status_failure_heading">Ajdå, vi hittade inte statusen för din nedladdningsbara säkerhetskopia</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Klartikon</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Klockikon</string>
+    <string name="restore_status_failure_bullet3">Vi aviserar dig när det är klart.</string>
+    <string name="restore_status_failure_bullet2">Vi försöker fortfarande återställa din webbplats.</string>
+    <string name="restore_status_failure_bullet1">Vi lyckades inte hitta statusläget för att kunna säga hur lång tid återställningen kommer att ta.</string>
+    <string name="restore_status_failure_heading">Ajdå. Vi hittar inte statusen för din återställning</string>
+    <string name="restore_complete_failed_description">Vi kunde inte återställa din webbplats</string>
+    <string name="restore_warning_action_button">Bekräfta</string>
+    <string name="restore_warning_description_with_two_parameters">Är du säker på att du vill återställa din webbplats till läget från %1$s kl. %2$s?\nAllt du ändrat sedan dess kommer att försvinna.</string>
+    <string name="backup_download_complete_failed_description">Vi kunde inte skapa din säkerhetskopia</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(exkluderar teman, tillägg och uppladdningar)</string>
+    <string name="backup_item_contents">Katalogen wp-content</string>
+    <string name="backup_item_roots">WordPress-rot</string>
+    <string name="backup_download_details_choose_items_header">Objekt som ingår i denna nedladdning</string>
+    <string name="gutenberg_native_uploading">Laddar upp …</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Återanvändbara block kan inte redigeras i WordPress för iOS</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Återanvändbara block kan inte redigeras i WordPress för Android</string>
+    <string name="gutenberg_native_replace_file">Ersätt fil</string>
+    <string name="gutenberg_native_replace_audio">Ersätt ljudfilen</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Problem att öppna ljudet</string>
+    <string name="gutenberg_native_open">ÖPPNA</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Ingen applikation kan hantera denna begäran.</string>
+    <string name="gutenberg_native_lock_icon">Låsikon</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Kunde inte lägga in ljudfil. Tryck för att visa alternativ.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Dubbeltryck för att välja en ljudfil</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Dubbeltryck för att lyssna på ljudfilen</string>
+    <string name="gutenberg_native_choose_audio">Välj ljud</string>
+    <string name="gutenberg_native_audio_player">Ljudspelare</string>
+    <string name="gutenberg_native_audio_file"> ljudfil</string>
+    <string name="gutenberg_native_audio_caption_s">Beskrivning för ljudfil. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Beskrivning för ljudfil. Tom</string>
+    <string name="gutenberg_native_add_audio">LÄGG TILL LJUD</string>
+    <string name="continue_with_wpcom">Logga in eller registrera dig hos WordPress.com</string>
+    <string name="photo_picker_use_audio">Använd detta ljud</string>
+    <string name="photo_picker_choose_audio">Välj ljud från enhet</string>
+    <string name="people_optional_custom_message_helper_text">Valfritt: ange ett anpassat meddelande som ska skickas med din inbjudan.</string>
+    <string name="people_learn_more_about_roles">Lär dig mer om roller</string>
+    <string name="threat_status_fixed">Åtgärdat</string>
+    <string name="threat_found_header">Hittade</string>
+    <string name="scan_here_to_help">här</string>
+    <string name="scan_idle_threats_description_singular">Jetpack-genomsökningen hittade ett potentiellt hot hos %1$s. Granska hoten nedan och vidta åtgärder eller tryck på knappen ”Åtgärda allt”. Vi finns %2$s om du behöver vår hjälp.</string>
+    <string name="scan_idle_manual_scan_description">För att kontrollera din webbplats igen kan du starta en genomsökning manuellt eller vänta tills Jetpack automatiskt söker igenom webbplatsen senare idag.</string>
+    <string name="scan_provisioning_description">Välkommen till Jetpack Scan! Vi tittar närmare på din webbplats och förbereder för en fullständig genomsökning. Vi meddelar dig om vi upptäcker några problem som kan påverka en genomsökning. Därefter startar din första fullständiga genomsökning.</string>
+    <string name="scan_scanning_is_initial_description">Välkommen till Jetpack Scan. Vi tar nu en första titt på din webbplats och du kommer snart att ha resultaten.</string>
+    <string name="scan_fixing_threats_description_singular">Vi arbetar intensivt med att rätta dessa hot i bakgrunden. Under tiden kan du fortsätta att använda din webbplats som vanligt. Du kan när som helst kolla hur arbetet fortskrider.</string>
+    <string name="scan_scanning_description">Vi kommer att skicka en avisering till dig när genomsökningen har slutförts. Under tiden kan du använda din webbplats som vanligt. Du kan även när som helst kontrollera genomsökningens status.</string>
+    <string name="scan_fixing_threats_title_plural">Åtgärdar hot</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan kunde inte slutföra en genomsökning av din webbplats. Kontrollera om din webbplats ligger nere – om den inte gör det, försök igen. Om den gör det, eller om Jetpack Scan fortfarande har problem, kontakta vårt supportteam.</string>
+    <string name="scan_request_failed_title">Något gick fel</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Säkerhetskopierar webbplatsen</string>
+    <string name="activity_log_currently_backing_up_message">Säkerhetskopierar webbplatsen från %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_title">Skapar nedladdningsbar säkerhetskopia</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Din webbplats är nu säkerhetskopierad</string>
+    <string name="activity_log_backup_finished_snackbar_message">Din webbplats har säkerhetskopierats\nKopierat från %1$s %2$s</string>
+    <string name="activity_log_backup_started_snackbar_message">Din webbplats håller på att säkerhetskopieras\nSäkerhetskopierar från %1$s %2$s</string>
+    <string name="pick_audio">Välj ljud</string>
+    <string name="restore_another_process_running">En annan återställning pågår.</string>
+    <string name="restore_complete_failed_icon_content_description">Felikon</string>
+    <string name="restore_complete_failed_action_button_content_description">Knapp ”klart”</string>
+    <string name="restore_complete_failed_title">Återställning misslyckades</string>
+    <string name="restore_complete_visit_site_button_content_description">Knapp ”besök webbplatsen”</string>
+    <string name="restore_complete_done_button_content_description">Knapp ”klart”</string>
+    <string name="restore_complete_icon_content_description">Återställningsikon</string>
+    <string name="restore_complete_visit_site_action_button">Besök webbplats</string>
+    <string name="restore_complete_description_with_two_parameters">Alla dina valda objekt har nu återställts till läget för %1$s %2$s.</string>
+    <string name="restore_complete_header">Din webbplats har återställts</string>
+    <string name="restore_progress_label">%1$s %%</string>
+    <string name="restore_progress_footnote">Du behöver inte sitta och vänta. Vi aviserar dig när webbplatsen är återställd.</string>
+    <string name="restore_progress_icon_content_description">Ikon för återställning av webbplats</string>
+    <string name="restore_progress_description_with_two_parameters">Vi håller på att återställa din webbplats till innehållet från  %1$s %2$s.</string>
+    <string name="restore_progress_header">Återställer just nu webbplatsen</string>
+    <string name="restore_warning_action_button_content_description">Knapp ”bekräfta återställning av webbplatsen”</string>
+    <string name="restore_warning_icon_content_description">Röd cirkel med utropstecken</string>
+    <string name="restore_warning_header">Varning</string>
+    <string name="restore_details_action_button_content_description">Knapp för återställning av webbplats</string>
+    <string name="restore_details_icon_content_description">Återställningsikon</string>
+    <string name="restore_details_action_button">Återställ webbplats</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s är den valda tidpunkten för återställningen av din webbplats.</string>
+    <string name="restore_details_header">Återställ webbplats</string>
+    <string name="restore_details_choose_items_header">Välj vilka objekt du vill återställa:</string>
+    <string name="restore">Återställ</string>
+    <string name="backup_download_complete_failed_icon_content_description">Moln med X-ikon</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Knapp ”klart”</string>
+    <string name="backup_download_complete_failed_action_button">Klart</string>
+    <string name="backup_download_complete_failed_title">Nedladdning misslyckades</string>
+    <string name="web_preview_tablet">Surfplatta</string>
+    <string name="web_preview_mobile">Mobil</string>
+    <string name="quick_start_card_menu_remove">Visa inte igen</string>
+    <string name="quick_start_card_menu_pin">Klistra detta</string>
+    <string name="quick_start_dialog_review_pages_message_short">Välj %1$s Sidor %2$s för att visa listan med dina sidor.</string>
+    <string name="quick_start_dialog_review_pages_message">Ändra, lägg till eller ta bort sidor på webbplatsen.</string>
+    <string name="quick_start_dialog_review_pages_title">Granska webbplatsens sidor</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Välj %1$s Startsida %2$s för att redigera startsidan.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Välj %1$s Sidor %2$s för att visa listan med dina sidor.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Ändra, lägg till eller ta bort innehåll på startsidan för din webbplats.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Redigera din startsida</string>
+    <string name="reader_menu_mark_as_unseen">Markera som ej visat</string>
+    <string name="reader_menu_mark_as_seen">Markera som visat</string>
+    <string name="error_media_upload_failed_for_reason">Uppladdningen av media misslyckades.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Otillräckligt lagringsutrymme för webbplatsen</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Det gick inte att ändra statusen för om detta inlägg visats</string>
+    <string name="reader_marked_post_as_unseen">Markera inlägget som ej visat</string>
+    <string name="reader_marked_post_as_seen">Markera inlägget som visat</string>
+    <string name="threat_fix_all_status_error_message">Ett fel inträffade när statusen för åtgärdandet skulle hämtas. Kontakta vår support.</string>
+    <string name="threat_fix_all_status_success_message_singular">Hotet åtgärdades utan problem.</string>
+    <string name="threat_fix_all_error_message">Fel när hotet åtgärdades. Kontakta vår support.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Bekräfta att du vill åtgärda ett aktivt hot.</string>
+    <string name="threat_fix_all_warning_title">Åtgärda alla hot</string>
+    <string name="threat_ignore_error_message">Ett fel inträffade när hotet skulle ignoreras. Kontakta vår support.</string>
+    <string name="threat_ignore_success_message">Hotet har ignorerats.</string>
+    <string name="threat_ignore_warning">Du bör inte ignorera ett säkerhetshot om du inte är helt säker på att det är ofarligt. Om du väljer att ignorera detta hot kommer det att finnas kvar på webbplatsen &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_fix_error_message">Ett fel inträffade när hotet skulle åtgärdas. Kontakta vår support.</string>
+    <string name="threat_item_sub_header_status_ignored">Hotet har ignorerats</string>
+    <string name="threat_item_sub_header_status_fixed_on">Hot åtgärdat på %s</string>
+    <string name="threat_fixing">Åtgärdar hot</string>
+    <string name="scan_history_ignored_threats_tab">Ignorerat</string>
+    <string name="scan_history_no_threats_found">Inga objekt hittades</string>
+    <string name="scan_history_fixed_threats_tab">Åtgärdat</string>
+    <string name="scan_history_all_threats_tab">Alla</string>
+    <string name="scan_scanning_title">Skannar filer</string>
+    <string name="scan_preparing_to_scan_title">Förbereder för att skanna</string>
+    <string name="scan_history_menu_title">Historik</string>
+    <string name="scan_history">Skanningshistorik</string>
+    <string name="backup_active_filter_empty_subtitle">Försök att anpassa datumintervallet</string>
+    <string name="backup_active_filter_empty_title">Inga matchande säkerhetskopior hittades</string>
+    <string name="backup_empty_subtitle">Din första säkerhetskopia visas här inom 24 timmar och du får en avisering när säkerhetskopieringen har slutförts</string>
+    <string name="backup_empty_title">Din första säkerhetskopia kommer snart vara klar</string>
+    <string name="request_failed_message">Ett problem inträffade när din begäran skulle behandlas. Försök igen senare.</string>
+    <string name="gutenberg_native_move_to_bottom">Flytta längst ned</string>
+    <string name="gutenberg_native_change_block_position">Ändra blockets position</string>
+    <string name="label_control_upload">Ladda upp</string>
+    <string name="jetpack_icon_content_description">ikon</string>
+    <string name="backup_download_complete_info">Vi har även skickat e-post med länken till din fil.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Knapp för delning av länk</string>
+    <string name="backup_download_complete_download_action_button_content_description">Nedladdningsknapp</string>
+    <string name="backup_download_complete_icon_content_description">Ikon för säkerhetskopia som är klar för nedladdning</string>
+    <string name="backup_download_complete_download_share_action_button">Dela länk</string>
+    <string name="backup_download_complete_download_action_button">Ladda ner</string>
+    <string name="backup_download_complete_description_with_two_parameters">Vi skapade en säkerhetskopia av din webbplats från %1$s %2$s.</string>
+    <string name="backup_download_complete_header">Din säkerhetskopia är nu tillgänglig för nedladdning</string>
+    <string name="backup_download_complete_page_title">Din säkerhetskopia</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Du behöver inte sitta och vänta. Vi aviserar dig när din säkerhetskopiering är klar.</string>
+    <string name="backup_download_progress_icon_content_description">Ikon för skapande av nedladdningsbar säkerhetskopia</string>
+    <string name="backup_download_progress_description_with_two_parameters">Vi håller på att skapa en nedladdningsbar säkerhetskopia av din webbplats från %1$s %2$s.</string>
+    <string name="backup_download_progress_header">Vi skapar för närvarande en nedladdningsbar säkerhetskopia av din webbplats</string>
+    <string name="backup_download_progress_page_title">Ladda ner säkerhetskopia</string>
+    <string name="backup_download_another_download_running">En annan nedladdning körs just nu.</string>
+    <string name="backup_download_generic_failure">Ett problem inträffade när din begäran skulle behandlas. Försök igen senare.</string>
+    <string name="backup_download_details_action_button_content_description">Skapa knapp för nedladdningsbar säkerhetskopia</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s är den valda punkten för att skapa en nedladdningsbar säkerhetskopia.</string>
+    <string name="gutenberg_native_image_link_url">URL-länk till bild</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s –</string>
+    <string name="pages_item_date_author">%1$s – %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s –</string>
+    <string name="suggestion_xpost">korspublicera</string>
+    <string name="suggestion_user">användare</string>
+    <string name="suggestion_no_matching">Matchande %s saknas.</string>
+    <string name="suggestion_problem">Det gick inte att läsa in förslagen.</string>
+    <string name="suggestion_none">Inga förslag för %s tillgängliga.</string>
+    <string name="suggestion_selection_needed">Börja skriva för att filtrera listan med förslag.</string>
+    <string name="threat_get_free_estimate">Få ett gratis kostnadsförslag</string>
+    <string name="threat_ignore">Ignorera hot</string>
+    <string name="threat_fix">Åtgärda hot</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan kommer att åtgärda hotet.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan kommer redigera den berörda filen eller katalogen.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan kommer att uppdatera till en nyare version (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan kommer att ta bort den berörda filen eller katalogen.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan kommer att ersätta den berörda filen eller katalogen.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan kan inte korrigera detta hot automatiskt.\n        Vi föreslår att du manuellt hanterar detta hot: Se till att WordPress, ditt tema och alla dina tillägg är uppdaterade till den senaste versionen och att du tar bort den felaktiga programkoden, temat eller tillägget från webbplatsen. \n \n\n        Om du behöver mer hjälp för att avhjälpa detta hot rekommenderar vi &lt;b&gt;Codeable&lt;/b&gt;, en tillförlitlig marknadsplats för väl kontrollerade WordPress-experter.\n        De har valt ut en grupp säkerhetsexperter som kan hjälpa till med projekt av denna typ. Deras priser ligger i området 70 – 120 USD/timme och du kan be om ett gratis kostnadsförslag utan några förpliktelser.\n    </string>
+    <string name="threat_fix_current_not_fixable_header">Löser hotet</string>
+    <string name="threat_fix_fixed_header">Hur åtgärdade Jetpack det?</string>
+    <string name="threat_fix_default_header">Hur åtgärdar vi det?</string>
+    <string name="threat_file_description">Hot hittades i fil:</string>
+    <string name="threat_technical_details_header">De tekniska detaljerna</string>
+    <string name="threat_problem_header">Vad var problemet?</string>
+    <string name="threat_details">Uppgifter om hot</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Sårbarhet hittades i tema</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Sårbarhet hittades i tillägg</string>
+    <string name="threat_item_sub_header_file_signature">Hot hittat %s</string>
+    <string name="threat_item_sub_header_core_file">Sårbarhet hittades i WordPress</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Övrig typ av sårbarhet</string>
+    <string name="threat_item_header_vulnerable_theme">Sårbart tema: %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Sårbart tillägg: %s (version %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: signatur för skadlid kod</string>
+    <string name="threat_item_header_database_threat">Databashot %s</string>
+    <string name="threat_item_header_infected_core_file">%s: infekterad fil i WordPress-kärnan</string>
+    <string name="threat_item_header_threat_found">Hot hittat</string>
+    <string name="threats_fix_all">Åtgärda alla</string>
+    <string name="scan_in_few_seconds">några sekunder sedan</string>
+    <string name="scan_in_minutes_ago">%s minut/minuter sedan</string>
+    <string name="scan_in_hours_ago">%s timme/timmar sedan</string>
+    <string name="scan_this_site">denna webbplats</string>
+    <string name="scan_idle_last_scan_description">Jetpack körde den senaste genomsökningen %s och då såg allt utmärkt ut. %s</string>
+    <string name="scan_idle_threats_found_title">Din webbplats kan vara i riskzonen</string>
+    <string name="scan_idle_no_threats_found_title">Oroa dig inte för någonting</string>
+    <string name="scan_again">Skanna igen</string>
+    <string name="scan_now">Skanna nu</string>
+    <string name="scan_state_icon">Ikon för genomsökningsstatus</string>
+    <string name="backup">Säkerhetskopia</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Aktivitetstypsfiler (%s typer valda)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (visar %s objekt)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Aktivitetstypsfilter</string>
+    <string name="activity_log_activity_type_empty_subtitle">Inga aktiviteter registrerade inom det valda datumintervallet.</string>
+    <string name="activity_log_activity_type_empty_title">Inga aktiviteter tillgängliga</string>
+    <string name="activity_log_activity_type_error_subtitle">Kontrollera din internetanslutning och försök igen.</string>
+    <string name="activity_log_activity_type_error_title">Ingen anslutning</string>
+    <string name="activity_log_activity_type_filter_active_label">Aktivitetstyp (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Filter för datumintervall</string>
+    <string name="activity_log_active_filter_empty_subtitle">Försök att justera ditt datumintervall eller filtreringen av aktivitetstyp</string>
+    <string name="activity_log_active_filter_empty_title">Ingen matchande händelse hittades</string>
+    <string name="backup_item_sqls">Webbplatsens databas</string>
+    <string name="backup_item_roots_hint">(inkluderar wp-config.php och eventuella icke-WordPress-filer)</string>
+    <string name="backup_item_media_uploads">Mediauppladdningar</string>
+    <string name="backup_item_plugins">WordPress-tillägg</string>
+    <string name="backup_item_themes">WordPress-teman</string>
+    <string name="backup_download_details_icon_content_description">Skapa ikon för nedladdningsbar säkerhetskopia</string>
+    <string name="backup_download_details_action_button">Skapa nedladdningsbar fil</string>
+    <string name="backup_download_details_header">Skapa nedladdningsbar säkerhetskopia</string>
+    <string name="backup_download_details_page_title">Ladda ned säkerhetskopia</string>
+    <string name="backup_download">Nedladdning av säkerhetskopia</string>
+    <string name="gutenberg_native_error">Fel</string>
+    <string name="gutenberg_native_choose_file">Välj fil</string>
+    <string name="activity_log_item_menu_download_backup_label">Ladda ned säkerhetskopia</string>
+    <string name="activity_log_item_menu_restore_label">Återställ till denna punkt</string>
+    <string name="activity_log_activity_type_filter_label">Aktivitetstyp</string>
+    <string name="activity_log_date_range_filter_label">Datumintervall</string>
+    <string name="activity_log_activity_type_filter_header">Filtrera på aktivitetstyp</string>
+    <string name="dialog_confirm_copy_local_copy_button">Kopiera versionen från denna app</string>
+    <string name="dialog_confirm_copy_local_edit_button">Redigera inlägget först</string>
+    <string name="dialog_confirm_copy_local_message">Inlägget du försöker kopiera har två versioner som står i konflikt med varandra, eller så har du nyligen gjort ändringar som inte är sparade.\nRedigera inlägget först för att lösa eventuella konflikter och kopiera därefter versionen från denna app.</string>
+    <string name="dialog_confirm_copy_local_title">Konflikt vid synkronisering av inlägg</string>
+    <string name="button_copy">Duplicera</string>
+    <string name="toast_edit_story_update_in_progress_title">Berättelsen sparas, vänta lite …</string>
+    <string name="gutenberg_native_file_name">Filnamn</string>
+    <string name="gutenberg_native_file_block_settings">Inställningar för filblock</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Kunde inte ladda upp filerna.\nTryck för att visa alternativ.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Kunde inte spara filerna.\nTryck för att visa alternativ.</string>
+    <string name="gutenberg_native_edit_file">Redigera fil</string>
+    <string name="gutenberg_native_copy_file_url">Kopiera filens URL</string>
+    <string name="gutenberg_native_choose_a_file">VÄLJ EN FIL</string>
+    <string name="new_site_creation_domain_header_title">Välj en domän</string>
+    <string name="my_site_btn_jetpack_settings">Inställningar för Jetpack</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Följer konversation via e-post</string>
+    <string name="reader_btn_follow_comments">Följ konversation via e-post</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Det gick inte att avsluta prenumerationen på kommentarer till detta inlägg</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Det gick inte att prenumerera på kommentarer till detta inlägg</string>
+    <string name="reader_follow_comments_get_status_error">Ett fel inträffade när prenumerationsstatusen för inlägget skulle hämtas</string>
+    <string name="reader_follow_comments_unsubscribe_success">Prenumeration på kommentarer har avslutats</string>
+    <string name="reader_follow_comments_subscribe_success">Prenumeration på kommentarer har startats</string>
+    <string name="reader_follow_comments_bad_format_response">Ett ogiltigt svar har tagits emot</string>
+    <string name="reader_follow_comments_null_response">Inget svar har tagits emot</string>
+    <string name="activity_log_activity_type_filter_clear">Rensa</string>
+    <string name="activity_log_activity_type_filter_apply">Utför</string>
+    <string name="dialog_edit_story_unsupported_format_message">En eller flera bilder lades inte till i din berättelse eftersom berättelser för närvarande saknar stöd för GIF-filer. Välj en statisk bild eller en video som bakgrund i stället.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF-filer stöds inte</string>
+    <string name="dialog_edit_story_unrecoverable_message">Vi hittar inte mediafilerna för denna berättelse på webbplatsen.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Det går inte att redigera berättelsen.</string>
+    <string name="dialog_edit_story_unavailable_message">Det går inte att hämta mediafilerna för denna berättelse. Kontrollera din internetanslutning och försök igen.</string>
+    <string name="dialog_edit_story_unavailable_title">Det går inte att redigera berättelsen.</string>
+    <string name="dialog_edit_story_limited_message">Denna berättelse har redigerats på en annan typ av enhet och möjligheten att redigera vissa objekt kan vara begränsad.</string>
+    <string name="dialog_edit_story_limited_title">Begränsad berättelseredigering</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Mediafilerna har tagits bort. Försök att återskapa din berättelse.</string>
+    <string name="color_picker_label_background">Bakgrund</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="dialog_discard_story_ok_button_edit">Kasta</string>
+    <string name="dialog_discard_story_message_edit">Eventuella ändringar kommer inte att sparas.</string>
+    <string name="dialog_discard_story_title_edit">Kasta ändringarna?</string>
+    <string name="label_done_button">Klart</string>
+    <string name="label_next_button">Nästa</string>
+    <string name="delete_button_alt">Ta bort</string>
+    <string name="hpp_choose_error">Ett fel uppstod när designen skulle aktiveras.</string>
+    <string name="hpp_retry_error">Kontrollera din internet-anslutning och försök igen.</string>
+    <string name="hpp_error_subtitle">Tryck på ”Försök igen” när du har förbindelse med internet igen.</string>
+    <string name="hpp_error_title">Layouter är inte tillgängliga när du saknar internetförbindelse</string>
+    <string name="continue_site_credentials">Fortsätt med butiksautentiseringsuppgifter</string>
+    <string name="login_find_your_connected_email">Hitta din anslutna e-postadress</string>
+    <string name="reader_discover_no_posts_button_text">Följ ämnen</string>
+    <string name="reader_discover_no_posts_subtitle">Försök att följa fler ämnen för att söka bredare</string>
+    <string name="reader_discover_no_posts_title">Inga nya inlägg</string>
+    <string name="reader_discover_empty_title">Välkommen!</string>
+    <string name="scan">Skanna</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Erik S&lt;/b&gt; har svarat på ditt inlägg</string>
+    <string name="login_prologue_third_subtitle_two">Du har fått &lt;b&gt;50 gilla-markeringar&lt;/b&gt; på webbplatsen i dag</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Anna S&lt;/b&gt; gillade ditt inlägg</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Den rullningsbara blockmenyn har öppnats. Välj ett block.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Den rullningsbara blockmenyn har stängts.</string>
+    <string name="hpp_skip_button">Hoppa över</string>
+    <string name="hpp_choose_button">Välj</string>
+    <string name="hpp_subtitle">Välj favoritlayout på din startsida Du kan anpassa eller ändra det senare.</string>
+    <string name="hpp_title">Välj en design</string>
+    <string name="mlp_network_error_subtitle">Tryck på ”Försök igen” när du har internetuppkoppling igen eller skapa en tom sida med knappen nedan.</string>
+    <string name="mlp_network_error_title">Layouter är inte tillgängliga när du saknar internetförbindelse</string>
+    <string name="mlp_error_subtitle">Tryck på ”Försök igen” eller skapa en tom sida med hjälp av knappen nedan.</string>
+    <string name="mlp_error_title">Layouter är inte tillgängliga på grund av ett fel</string>
+    <string name="prepublishing_nudges_add_category_button">Lägg till kategori</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Lägg till ny kategori</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategorier</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Inte inställd</string>
+    <string name="prepublishing_nudges_categories_action">Kategorier</string>
+    <string name="login_prologue_fifth_caption_three">Muséer i London</string>
+    <string name="login_prologue_fifth_caption_two">Världens bästa fans</string>
+    <string name="login_prologue_fifth_caption_one">Mina tio favoritcaféer</string>
+    <string name="login_prologue_fifth_tag_six">Politik</string>
+    <string name="login_prologue_fifth_tag_five">Musik</string>
+    <string name="login_prologue_fifth_tag_four">Trädgårdsskötsel</string>
+    <string name="login_prologue_fifth_tag_three">Fotboll</string>
+    <string name="login_prologue_fifth_tag_two">Matlagning</string>
+    <string name="login_prologue_fifth_tag_one">Konst</string>
+    <string name="login_prologue_fifth_subtitle_three">Veckans nytt om rock’n roll</string>
+    <string name="login_prologue_fifth_subtitle_two">Webbnyheter</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Jag inspireras verkligen av fotografen Cameron Karstens verk. Jag tänker prova mig på dessa tekniker snart</string>
+    <string name="login_prologue_second_subtitle_one">Låt dig inspireras</string>
+    <string name="login_prologue_title_fifth">Följ dina favoritwebbplatser och hitta nya bloggar att läsa.</string>
+    <string name="login_prologue_title_fourth">Se hur din publik växer med hjälp av detaljerad statistik.</string>
+    <string name="login_prologue_title_third">Se kommentarer och aviseringar i realtid.</string>
+    <string name="login_prologue_title_second">Med den kraftfulla redigeringsmiljön kan du skapa inlägg på rörlig fot.</string>
+    <string name="login_prologue_title_first">Välkommen till världens populäraste webbplatsbyggare.</string>
+    <string name="media_loading_failed">Hämtningen av mediafiler misslyckades</string>
+    <string name="reader_discover_recommended_blogs_header">Webbplatser att följa</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Vi arbetar för fullt med att lägga till fler block i varje utgåva.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">”%s” stöds inte fullt ut</string>
+    <string name="gutenberg_native_help_button">Hjälpknapp</string>
+    <string name="gutenberg_native_edit_using_web_editor">Redigera i webbredigeraren</string>
     <string name="gutenberg_native_choose_images">Välj bilder</string>
-    <string name="stories_intro_description_second">De publiceras som ett nytt blogginlägg på din webbplats för att dina läsare aldrig ska missa något.</string>
     <string name="stories_intro_create_story_post_label">Skapa ett berättelseinlägg</string>
-    <string name="gutenberg_native_edit_using_web_editor">Redigera i webbredigeraren</string>
-    <string name="gutenberg_native_help_button">Hjälpknapp</string>
-    <string name="stories_intro_description_first">Kombinera foton, videoklipp och text för att skapa engagerande och smidiga berättelseinlägg som dina besökare kommer att älska.</string>
+    <string name="stories_intro_description_second">De publiceras som ett nytt blogginlägg på din webbplats för att dina läsare aldrig ska missa något.</string>
     <string name="stories_intro_title_second">Berättelseinlägg försvinner inte</string>
-    <string name="mlp_preview_title">Förhandsgranska layout</string>
-    <string name="media_picker_soft_ask_permissions_denied">%1$s nekades åtkomst till dina bilder. Korrigera genom att redigera dina rättigheter och aktivera %2$s och %3$s.</string>
-    <string name="mlp_notice_page_created">Sidan har skapats</string>
-    <string name="mlp_notice_blank_page_created">En blank sida har skapats</string>
-    <string name="mlp_generic_error">Ett fel inträffade när layouterna skulle hämtas</string>
-    <string name="stories_intro_main_title">Lär känna berättelseinlägg</string>
-    <string name="stories_intro_main_subtitle">Du har fått förhandsåtkomst till berättelseinlägg och det vore härligt om du ville prova dem.</string>
-    <string name="stories_intro_image_caption_first">Du kanske vill skapa ett berättelseinlägg</string>
-    <string name="stories_intro_image_caption_second">Exempelrubrik för berättelse</string>
+    <string name="stories_intro_description_first">Kombinera foton, videoklipp och text för att skapa engagerande och smidiga berättelseinlägg som dina besökare kommer att älska.</string>
     <string name="stories_intro_title_first">Nu kan alla använda berättelser</string>
+    <string name="stories_intro_image_caption_second">Exempelrubrik för berättelse</string>
+    <string name="stories_intro_image_caption_first">Du kanske vill skapa ett berättelseinlägg</string>
+    <string name="stories_intro_main_title">Lär känna berättelseinlägg</string>
+    <string name="mlp_notice_blank_page_created">En blank sida har skapats</string>
+    <string name="mlp_notice_page_created">Sidan har skapats</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s nekades åtkomst till dina bilder. Korrigera genom att redigera dina rättigheter och aktivera %2$s och %3$s.</string>
     <string name="media_insert_failed">Infogning av media misslyckades.</string>
-    <string name="photo_picker_wordpress_media_library">Välj ur mediabiblioteket i WordPress</string>
     <string name="media_insert_failed_with_reason">Infogning av media misslyckades: %s</string>
+    <string name="photo_picker_wordpress_media_library">Välj ur mediabiblioteket i WordPress</string>
     <string name="reader_label_toolbar_back">Tillbaka</string>
     <string name="reader_discover_empty_button_text">Kom igång</string>
-    <string name="reader_discover_empty_title">Följ ämnen för att upptäcka nya bloggar</string>
+    <string name="reader_discover_empty_subtitle">Följ ämnen för att upptäcka nya bloggar</string>
     <string name="reader_post_details_header_by_author_name">Av</string>
-    <string name="media_uploading_default">Laddar upp media</string>
-    <string name="stats_referrer_popup_menu_open_website">Öppna webbplats</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Denna hänvisande webbplats går inte att avmarkera som skräp</string>
+    <string name="stats_referrer_popup_unmark_as_spam">Ta bort markering som skräppost</string>
     <string name="stats_referrer_popup_menu_mark_as_spam">Markera som skräppost</string>
-    <string name="media_uploading_stock_library_photo">Laddar upp stockfoton</string>
+    <string name="stats_referrer_popup_menu_open_website">Öppna webbplats</string>
     <string name="media_uploading_gif_library_photo">Laddar upp gif-mediafiler</string>
-    <string name="stats_referrer_popup_unmark_as_spam">Ta bort markering som skräppost</string>
-    <string name="stats_referrer_snackbar_cant_mark_as_spam">Denna hänvisande webbplats går inte att avmarkera som skräp</string>
-    <string name="gutenberg_native_search_or_type_url">Sök eller skriv URL</string>
+    <string name="media_uploading_stock_library_photo">Laddar upp stockfoton</string>
+    <string name="media_uploading_default">Laddar upp media</string>
     <string name="gutenberg_native_select_item">Välj objekt</string>
+    <string name="gutenberg_native_search_or_type_url">Sök eller skriv URL</string>
+    <string name="gutenberg_native_page_break">Sidbrytning</string>
     <string name="gutenberg_native_add_this_telephone_link">Länka till detta telefonnummer</string>
-    <string name="suggestion_no_connection">”Internetförbindelse saknas.\nFörslag är inte tillgängliga.”</string>
-    <string name="gutenberg_native_add_this_email_link">Länka till denna e-postadress</string>
     <string name="gutenberg_native_add_this_link">Lägg till denna länk</string>
-    <string name="mlp_selected_description">%s valt</string>
-    <string name="mlp_notselected_description">%s</string>
-    <string name="toast_capture_operation_permission_needed">För att kunna spela in video måste du ge appen tillstånd att spela in ljud</string>
-    <string name="typeface_label_nunito">Avslappnad</string>
-    <string name="typeface_label_libre_baskerville">Klassisk</string>
-    <string name="typeface_label_oswald">Framhävd</string>
-    <string name="typeface_label_pacifico">Lekfull</string>
-    <string name="typeface_label_space_mono">Modern</string>
+    <string name="gutenberg_native_add_this_email_link">Länka till denna e-postadress</string>
+    <string name="suggestion_no_connection">Internetförbindelse saknas.\nFörslag är inte tillgängliga.</string>
     <string name="typeface_label_shrikhand">Fetstil</string>
-    <string name="media_browse_for_items">Bläddra bland objekt</string>
-    <string name="comment_unable_to_show_error">Det går inte att visa denna kommentar</string>
-    <string name="permission_microphone">Mikrofon</string>
-    <string name="email_not_registered_wpcom">Hmm. Vi hittar inget konto hos WordPress.com som är kopplat till denna e-postadress.</string>
+    <string name="typeface_label_space_mono">Modern</string>
+    <string name="typeface_label_pacifico">Lekfull</string>
+    <string name="typeface_label_oswald">Framhävd</string>
+    <string name="typeface_label_libre_baskerville">Klassisk</string>
+    <string name="typeface_label_nunito">Avslappnad</string>
+    <string name="toast_capture_operation_permission_needed">För att kunna spela in video måste du ge appen tillstånd att spela in ljud</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s valt</string>
     <string name="login_get_link_by_email">Få en länk för inloggning via e-post</string>
+    <string name="email_not_registered_wpcom">Hmm. Vi hittar inget konto hos WordPress.com som är kopplat till denna e-postadress.</string>
+    <string name="permission_microphone">Mikrofon</string>
+    <string name="comment_unable_to_show_error">Det går inte att visa denna kommentar</string>
+    <string name="media_browse_for_items">Bläddra bland objekt</string>
     <string name="reader_menu_report_post">Rapportera detta inlägg</string>
-    <string name="show_n_hidden_items_desc">%1$s fler objekt</string>
-    <string name="error_media_xmlrpc_not_allowed">Din åtgärd är inte tillåten</string>
-    <string name="error_media_xmlrcp_server_error">Ett internt serverfel inträffade</string>
     <string name="reader_welcome_banner">Välkommen till läsaren. Upptäck miljontals bloggar som finns smidigt tillgängliga.</string>
-    <string name="gutenberg_native_angle">Vinkel</string>
+    <string name="error_media_xmlrcp_server_error">Ett internt serverfel inträffade</string>
+    <string name="error_media_xmlrpc_not_allowed">Din åtgärd är inte tillåten</string>
+    <string name="show_n_hidden_items_desc">%1$s fler objekt</string>
     <string name="gutenberg_native_select_a_layout">Välj en layout</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Obs: Kolumnlayouten kan variera mellan olika teman och skärmstorlekar</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Dölj</string>
     <string name="create_post_story_fab_tooltip">Skapa ett inlägg eller en berättelse</string>
     <string name="create_page_fab_tooltip">Skapa en sida</string>
     <string name="create_post_fab_tooltip">Skapa ett inlägg</string>
     <string name="reader_discover_interests_header">Du kanske gillar</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="dialog_insufficient_device_storage_error_ok_button">Visa lagring</string>
-    <string name="toast_story_page_not_found">Hittade ingen bild för berättelsen</string>
-    <string name="toast_capture_operation_in_progress">En åtgärd pågår. Försök igen</string>
-    <string name="toast_error_saving_image">Det gick inte att spara bilden</string>
-    <string name="toast_error_saving_video">Videon kunde inte sparas</string>
-    <string name="camera_error">Enheten saknar stöd för API:et Camera2.</string>
-    <string name="toast_error_playing_video">Ett fel inträffade när videon skulle spelas upp</string>
-    <string name="gutenberg_native_page_title_empty">Sidrubrik. Tom</string>
-    <string name="gutenberg_native_page_title_s">Sidrubrik. %s</string>
-    <string name="gutenberg_native_paste_block_after">Infoga blocket efter</string>
-    <string name="gutenberg_native_updates_the_title">Uppdaterar rubriken.</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Dölj</string>
     <string name="gutenberg_native_video_caption_empty">Beskrivning för video. Tom</string>
-    <string name="story_saving_failed_message_singular">1 bild kräver åtgärd</string>
-    <string name="story_saving_failed_message_plural">%1$d bilder kräver åtgärd</string>
-    <string name="story_saving_failed_quick_action_manage">Hantera</string>
-    <string name="dialog_story_saving_error_title_singular">Kan inte spara 1 bild</string>
-    <string name="dialog_story_saving_error_title_plural">Kan inte spara %1$d bilder</string>
-    <string name="dialog_story_saving_error_message">Gör ett nytt försök att spara eller ta bort bilderna, försök sedan att publicera din berättelse igen.</string>
-    <string name="dialog_insufficient_device_storage_error_title">För lite minnesutrymme i enheten</string>
+    <string name="gutenberg_native_updates_the_title">Uppdaterar rubriken.</string>
+    <string name="gutenberg_native_paste_block_after">Infoga blocket efter</string>
+    <string name="gutenberg_native_page_title_s">Sidrubrik. %s</string>
+    <string name="gutenberg_native_page_title_empty">Sidrubrik. Tom</string>
+    <string name="toast_error_playing_video">Ett fel inträffade när videon skulle spelas upp</string>
+    <string name="camera_error">Enheten saknar stöd för API:et Camera2.</string>
+    <string name="toast_error_saving_video">Videon kunde inte sparas</string>
+    <string name="toast_error_saving_image">Det gick inte att spara bilden</string>
+    <string name="toast_capture_operation_in_progress">En åtgärd pågår. Försök igen</string>
+    <string name="toast_story_page_not_found">Hittade ingen bild för berättelsen</string>
+    <string name="dialog_insufficient_device_storage_error_ok_button">Visa lagring</string>
     <string name="dialog_insufficient_device_storage_error_message">Berättelsen behöver sparas på din enhet innan den kan publiceras. Kontrollera dina inställningar för lagring av data och radera filer för att frigöra utrymme.</string>
-    <string name="story_saving_snackbar_started">Laddar upp ”%1$s” …</string>
-    <string name="story_saving_snackbar_finished_successfully">”%1$s” har publicerats</string>
-    <string name="story_saving_snackbar_finished_with_error">Det gick inte att ladda upp ”%1$s”</string>
+    <string name="dialog_insufficient_device_storage_error_title">För lite minnesutrymme i enheten</string>
+    <string name="dialog_story_saving_error_message">Gör ett nytt försök att spara eller ta bort bilderna, försök sedan att publicera din berättelse igen.</string>
+    <string name="dialog_story_saving_error_title_plural">Kan inte spara %1$d bilder</string>
+    <string name="dialog_story_saving_error_title_singular">Kan inte spara 1 bild</string>
+    <string name="story_saving_failed_quick_action_manage">Hantera</string>
+    <string name="story_saving_failed_message_plural">%1$d bilder kräver åtgärd</string>
+    <string name="story_saving_failed_message_singular">1 bild kräver åtgärd</string>
     <string name="story_saving_failed_title">Det gick inte att ladda upp ”%1$s”</string>
-    <string name="story_saving_title">Sparar ”%1$s …</string>
-    <string name="story_saving_title_several">flera berättelser</string>
-    <string name="story_saving_subtitle_frames_remaining_singular">1 bild återstår</string>
+    <string name="story_saving_snackbar_finished_with_error">Det gick inte att ladda upp ”%1$s”</string>
+    <string name="story_saving_snackbar_finished_successfully">”%1$s” har publicerats</string>
+    <string name="story_saving_snackbar_started">Laddar upp ”%1$s” …</string>
     <string name="story_saving_subtitle_frames_remaining_plural">%1$d bilder återstår</string>
-    <string name="label_frame_unselected_border">ej valt</string>
-    <string name="label_frame_selected_border">valt</string>
-    <string name="label_frame_errored">med fel</string>
-    <string name="label_text_alignment_button">Ändra textens justering</string>
-    <string name="label_text_color_button">Ändra textfärg</string>
-    <string name="menu_delete_page">Ta bort bild</string>
-    <string name="dialog_discard_page_title">Ta bort bild ur berättelse?</string>
-    <string name="dialog_discard_page_message">Denna bild kommer att tas bort ur din berättelse.</string>
-    <string name="dialog_discard_errored_page_message">Bilden är inte sparad än. Om du tar bort denna bild förlorar du eventuell bildredigering.</string>
-    <string name="dialog_discard_page_ok_button">Ta bort</string>
-    <string name="dialog_discard_story_title">Ta bort berättelseinlägget?</string>
-    <string name="dialog_discard_story_message">Ditt berättelseinlägg kommer inte att sparas som utkast.</string>
-    <string name="dialog_discard_story_ok_button">Kasta</string>
+    <string name="story_saving_subtitle_frames_remaining_singular">1 bild återstår</string>
+    <string name="story_saving_title_several">flera berättelser</string>
+    <string name="story_saving_title">Sparar ”%1$s …</string>
     <string name="story_saving_untitled">Utan rubrik</string>
-    <string name="quick_start_dialog_create_new_post_message_short">Tryck på %1$s Skapa. %2$s Välj sedan &lt;b>Blogginlägg&lt;/b></string>
-    <string name="create_post_page_fab_tooltip_stories_enabled">Skapa ett inlägg, en sida eller en berättelse</string>
-    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Skapa ett inlägg eller en berättelse</string>
-    <string name="prepublishing_nudges_story_title_hint">Ge din berättelse en rubrik</string>
-    <string name="mlp_choose_layout_title">Välj en layout</string>
-    <string name="mlp_choose_layout_subtitle">Kom igång genom att välja någon av alla förberedda sidlayouter. Eller börja helt enkelt med en tom sida.</string>
-    <string name="mlp_create_blank_page">Skapa en tom sida</string>
-    <string name="mlp_create_page">Skapa sida</string>
-    <string name="mlp_preview_page">Förhandsgranska</string>
-    <string name="capture_button_alt">Ta bild</string>
-    <string name="flash_button_alt">Blixt</string>
-    <string name="stickers_button_alt">Klistermärken</string>
-    <string name="more_button_alt">Mer</string>
-    <string name="text_button_alt">Text</string>
-    <string name="sound_button_alt">Ljud</string>
+    <string name="dialog_discard_story_ok_button">Kasta</string>
+    <string name="dialog_discard_story_message">Ditt berättelseinlägg kommer inte att sparas som utkast.</string>
+    <string name="dialog_discard_story_title">Ta bort berättelseinlägget?</string>
+    <string name="dialog_discard_page_ok_button">Ta bort</string>
+    <string name="dialog_discard_errored_page_message">Bilden är inte sparad än. Om du tar bort denna bild förlorar du eventuell bildredigering.</string>
+    <string name="dialog_discard_page_message">Denna bild kommer att tas bort ur din berättelse.</string>
+    <string name="dialog_discard_page_title">Ta bort bild ur berättelse?</string>
+    <string name="label_text_color_button">Ändra textfärg</string>
+    <string name="label_text_alignment_button">Ändra textens justering</string>
+    <string name="label_frame_errored">med fel</string>
+    <string name="label_frame_selected_border">valt</string>
+    <string name="label_frame_unselected_border">ej valt</string>
+    <string name="label_frame_image">Bild</string>
+    <string name="label_retry_icon">Försök igen</string>
+    <string name="label_saved_icon">Sparat</string>
+    <string name="label_close_button">Stäng</string>
+    <string name="label_share_to">Dela till</string>
+    <string name="label_snackbar_share">DELA</string>
+    <string name="label_snackbar_loop_frame_saved">Sparat till foton</string>
+    <string name="label_control_retry">Försök igen</string>
+    <string name="label_control_saved">Sparat</string>
+    <string name="label_control_saving">Sparar</string>
+    <string name="label_control_flash">Blixt</string>
     <string name="label_control_flip_camera">Vänd</string>
+    <string name="sound_button_alt">Ljud</string>
+    <string name="text_button_alt">Text</string>
+    <string name="stickers_button_alt">Klistermärken</string>
+    <string name="flash_button_alt">Blixt</string>
     <string name="flip_button_alt">Spegelvänd kamerabilden</string>
-    <string name="label_control_flash">Blixt</string>
-    <string name="label_control_saving">Sparar</string>
-    <string name="label_control_saved">Sparat</string>
-    <string name="label_control_retry">Försök igen</string>
-    <string name="label_snackbar_loop_frame_saved">Sparat till foton</string>
-    <string name="label_snackbar_share">DELA</string>
-    <string name="label_share_to">Dela till</string>
-    <string name="label_done">Klart</string>
-    <string name="label_control_publish">Nästa</string>
-    <string name="label_close_button">Stäng</string>
-    <string name="label_saved_icon">Sparat</string>
-    <string name="label_retry_icon">Försök igen</string>
-    <string name="label_frame_image">Bild</string>
-    <string name="error_media_quota_exceeded">Förvaringsutrymmet överskridet</string>
-    <string name="error_media_quota_exceeded_toast">Kan inte ladda upp filen.\nFörvaringsutrymmet överskridet.</string>
-    <string name="reader_toast_err_page_jump_not_found">Hittar inte den länkade sidans mål</string>
-    <string name="my_site_icon_dialog_change_requires_jetpack_message">För att redigera webbplatsikoner för WordPress-webbplatser på webbhotell behövs tillägget Jetpack.</string>
-    <string name="my_site_bottom_sheet_add_story">Berättelseinlägg</string>
+    <string name="capture_button_alt">Ta bild</string>
+    <string name="mlp_preview_page">Förhandsgranska</string>
+    <string name="mlp_create_page">Skapa sida</string>
+    <string name="mlp_create_blank_page">Skapa en tom sida</string>
+    <string name="mlp_choose_layout_subtitle">Kom igång genom att välja någon av alla förberedda sidlayouter. Eller börja helt enkelt med en tom sida.</string>
+    <string name="mlp_choose_layout_title">Välj en layout</string>
+    <string name="prepublishing_nudges_story_title_hint">Ge din berättelse en rubrik</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Skapa ett inlägg eller en berättelse</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">Skapa ett inlägg, en sida eller en berättelse</string>
+    <string name="quick_start_dialog_create_new_post_message_short">Tryck på %1$s Skapa. %2$s Välj sedan &lt;b&gt;Blogginlägg&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">Välj från enheten</string>
+    <string name="my_site_bottom_sheet_add_story">Berättelseinlägg</string>
+    <string name="my_site_icon_dialog_change_requires_jetpack_message">För att redigera webbplatsikoner för WordPress-webbplatser på webbhotell behövs tillägget Jetpack.</string>
+    <string name="reader_toast_err_page_jump_not_found">Hittar inte den länkade sidans mål</string>
+    <string name="error_media_quota_exceeded_toast">Kan inte ladda upp filen.\nFörvaringsutrymmet överskridet.</string>
+    <string name="error_media_quota_exceeded">Förvaringsutrymmet överskridet</string>
     <string name="pick_file">Lägg till fil</string>
     <string name="gutenberg_native_replace_video">Byt video</string>
     <string name="gutenberg_native_replace_image_or_video">Ersätt en bild eller ett videoklipp</string>
-    <string name="continue_with_wpcom">Fortsätt med WordPress.com</string>
-    <string name="enter_your_site_address">Ange din webbplatsadress</string>
-    <string name="gutenberg_native_choose_image">Välj bild</string>
     <string name="gutenberg_native_choose_video">Välj video</string>
     <string name="gutenberg_native_choose_image_or_video">Välj bild eller video</string>
-    <string name="continue_with_google_terms_of_service_text">Om du fortsätter med Google och inte redan har ett WordPress.com-konto, skapar du ett konto och samtycker till våra %1$sanvändarvillkor%2$s.</string>
-    <string name="signup_confirmation_title">Bekräftelse av registrering</string>
-    <string name="content_description_logo">WordPress-logga</string>
+    <string name="gutenberg_native_choose_image">Välj bild</string>
     <string name="gutenberg_native_block_removed">Blocket har tagits bort</string>
+    <string name="enter_your_site_address">Ange din befintliga webbplatsadress</string>
+    <string name="signup_confirmation_title">Bekräftelse av registrering</string>
+    <string name="continue_with_google_terms_of_service_text">Om du fortsätter med Google och inte redan har ett WordPress.com-konto, skapar du ett konto och samtycker till våra %1$sanvändarvillkor%2$s.</string>
     <string name="continue_terms_of_service_text">Genom att gå vidare accepterar du våra %1$sanvändarvillkor%2$s.</string>
-    <string name="signup_confirmation_magic_link_message">Vi kommer att skicka e-post med en registreringslänk som låter dig skapa ett nytt WordPress.com-konto.</string>
     <string name="signup_confirmation_message">Vi kommer att använda den här e-postadressen för att skapa ditt nya WordPress.com-konto.</string>
     <string name="signup_magic_link_message">Vi har skickat en registreringslänk som låter dig skapa ditt nya konto hos WordPress.com. Öppna e-posten på din enhet och tryck på länken i meddelandet du fått från WordPress.com.</string>
     <string name="enter_account_info_for_site">Ange din kontoinformation för %1$s.</string>
     <string name="login_or">eller</string>
     <string name="continue_google_button_suffix">Fortsätt med Google</string>
     <string name="login_find_your_site_adress">Hitta din webbplatsadress</string>
-    <string name="login_magic_links_sent_label">Öppna e-posten på din enhet och tryck på länken i meddelandet du fått från WordPress.com.</string>
-    <string name="magic_link_not_seeing_email_message">Hittar du inte meddelandet? Kolla i mappen för skräppost eller reklam.</string>
     <string name="login_done">Klart</string>
+    <string name="magic_link_not_seeing_email_message">Hittar du inte meddelandet? Kolla i mappen för skräppost eller reklam.</string>
+    <string name="login_magic_links_sent_label">Öppna e-posten på din enhet och tryck på länken i meddelandet du fått från WordPress.com.</string>
     <string name="login_magic_links_label">Vi skickar en länk som låter dig logga in direkt, utan något lösenord.</string>
-    <string name="reset_your_password">Återställ ditt lösenord</string>
-    <string name="or_type_your_password">Eller skriv ditt lösenord</string>
-    <string name="create_account">Skapa konto</string>
+    <string name="check_email">Kolla din e-post</string>
     <string name="get_started">Kom igång</string>
     <string name="enter_email_to_continue_wordpress_com">Ange din e-postadress för att logga in eller skapa ett WordPress.com-konto.</string>
+    <string name="or_type_your_password">Eller skriv ditt lösenord</string>
+    <string name="create_account">Skapa konto</string>
     <string name="send_link_by_email">Skicka länk via e-post</string>
-    <string name="login_promo_text_unlock_the_power">Ta vara på kraften hos den mest flexibla webbplatsskaparen.</string>
-    <string name="check_email">Kolla din e-post</string>
-    <string name="login_promo_title_37_percent">37\% av webben är byggd på WordPress.</string>
+    <string name="reset_your_password">Återställ ditt lösenord</string>
     <string name="reader_error_request_failed_title">Ett problem inträffade när din begäran skulle behandlas. Försök igen senare.</string>
-    <string name="quick_start_list_update_site_title_subtitle">Ge din webbplats ett namn som återspeglar dess personlighet och ämne. Första intrycket har betydelse!</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Tryck &lt;b>%1$s&lt;/b> för att ange en ny rubrik</string>
     <string name="quick_start_list_update_site_title_title">Ange webbplatsens rubrik</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Tryck &lt;b&gt;%1$s&lt;/b&gt; för att ange en ny rubrik</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Om du lägger detta inlägg i papperskorgen kommer även lokala ändringar att kastas. Vill du fortsätta?</string>
     <string name="gutenberg_native_s_block_options">Inställningar för blocket %s</string>
-    <string name="my_site_title_changer_dialog_not_allowed_hint">Webbplatsrubriken kan bara ändras av en användare med rollen administratör.</string>
-    <string name="gutenberg_native_block_copied">Blocket kopierat</string>
-    <string name="gutenberg_native_block_cut">Blocket har klippts ut</string>
-    <string name="gutenberg_native_block_duplicated">Blocket har duplicerats</string>
-    <string name="gutenberg_native_block_pasted">Blocket har klistrats in</string>
-    <string name="gutenberg_native_block_settings">Blockinställningar</string>
-    <string name="gutenberg_native_copy_block">Kopiera block</string>
     <string name="gutenberg_native_duplicate_block">Duplicera block</string>
+    <string name="gutenberg_native_copy_block">Kopiera block</string>
     <string name="gutenberg_native_copied_block">Blocket kopierat</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Ej sparade ändringar</string>
-    <string name="error_update_site_title_network">Det gick inte att uppdatera webbplatsens rubrik. Kontrollera din nätverksanslutning och försök igen.</string>
-    <string name="reader_title_tag_preview">Ämne</string>
+    <string name="gutenberg_native_block_pasted">Blocket har klistrats in</string>
+    <string name="gutenberg_native_block_duplicated">Blocket har duplicerats</string>
+    <string name="gutenberg_native_block_cut">Blocket har klippts ut</string>
+    <string name="gutenberg_native_block_copied">Blocket kopierat</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">Webbplatsrubriken kan bara ändras av en användare med rollen administratör.</string>
     <string name="my_site_title_changer_dialog_hint">Webbplatsrubriken syns webbläsarens titelrad och de flesta teman visar den också i sidhuvudet.</string>
+    <string name="reader_title_tag_preview">Ämne</string>
+    <string name="error_update_site_title_network">Det gick inte att uppdatera webbplatsens rubrik. Kontrollera din nätverksanslutning och försök igen.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Ej sparade ändringar</string>
     <string name="gutenberg_native_open_link_in_a_browser">Öppna länken i en webbläsare</string>
+    <string name="gutenberg_native_navigates_to_customize_the_gradient">Går till anpassning av gradient</string>
+    <string name="gutenberg_native_navigates_to_custom_color_picker">Går till färgväljare</string>
+    <string name="gutenberg_native_gradient_type">Gradienttyp</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">Dubbeltryck för att välja alternativet</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="gutenberg_native_customize_gradient">Anpassa gradient</string>
-    <string name="gutenberg_native_gradient_type">Gradienttyp</string>
-    <string name="gutenberg_native_navigates_to_custom_color_picker">Går till färgväljare</string>
-    <string name="gutenberg_native_navigates_to_customize_the_gradient">Går till anpassning av gradient</string>
+    <string name="pages_list_author">Sidans författare</string>
     <string name="photo_picker_use_gif">Använd denna GIF</string>
-    <string name="me">Jag</string>
-    <string name="everyone">Alla</string>
-    <string name="menu_content_info">Innehållsstruktur</string>
     <string name="error_media_thumbnail_not_loaded">Ingen miniatyr av mediafilen kunde inte laddas</string>
-    <string name="pages_list_author">Sidans författare</string>
+    <string name="menu_content_info">Innehållsstruktur</string>
+    <string name="everyone">Alla</string>
+    <string name="me">Jag</string>
     <string name="gutenberg_native_dismiss">Avfärda</string>
     <string name="prepublishing_nudges_home_tags_not_set">Inte inställd</string>
-    <string name="prepublishing_nudges_home_save_button">Spara nu</string>
-    <string name="prepublishing_nudges_home_submit_button">Skicka nu</string>
-    <string name="prepublishing_nudges_publish_action">Publiceringsdatum</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Avbryt</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Flytta till utkast</string>
+    <string name="prepublishing_tags_description">Etiketter hjälper till att berätta för läsarna vad ett inlägg handlar om.</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">Publiceringsdatum</string>
     <string name="prepublishing_nudges_toolbar_title_tags">Lägg till etiketter</string>
     <string name="prepublishing_nudges_back_button">Tillbaka</string>
+    <string name="prepublishing_nudges_home_save_button">Spara nu</string>
+    <string name="prepublishing_nudges_home_submit_button">Skicka nu</string>
     <string name="prepublishing_nudges_home_schedule_button">Schemalägg nu</string>
     <string name="prepublishing_nudges_home_header_publishing_to">Publicerar till</string>
     <string name="prepublishing_nudges_tags_action">Etiketter</string>
-    <string name="prepublishing_tags_description">Etiketter hjälper till att berätta för läsarna vad ett inlägg handlar om.</string>
+    <string name="prepublishing_nudges_publish_action">Publiceringsdatum</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">Avbryt</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Flytta till utkast</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">Kastade inlägg kan inte redigeras. Vill du ändra statusen för detta inlägg till “utkast“ så att du kan arbeta med det?</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">Publiceringsdatum</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">Flytta inlägget till utkast?</string>
-    <string name="publish_date">Publiceringsdatum</string>
+    <string name="reader_label_choose_your_interests">Välj dina ämnen</string>
+    <string name="reader_choose_interests_content_description">Välj dina ämnen</string>
+    <string name="reader_btn_done">Klar</string>
     <string name="reader_btn_select_few_interests">Välj några för att fortsätta</string>
     <string name="post_status_post_published">Publicerat</string>
-    <string name="reader_label_choose_your_interests">Välj dina intressen</string>
-    <string name="reader_choose_interests_content_description">Välj dina intressen</string>
-    <string name="reader_btn_done">Klar</string>
-    <string name="post_status_post_scheduled">Schemalagd</string>
     <string name="post_status_post_trashed">Borttagen</string>
+    <string name="post_status_post_scheduled">Schemalagd</string>
+    <string name="publish_date">Publiceringsdatum</string>
     <string name="ccpa_privacy_notice_read">Läs CCPA-sekretessmeddelandet</string>
     <string name="ccpa_privacy_notice_caption">Enligt California Consumer Privacy Act (CCPA) måste vi delge boende i Kalifornien med viss ytterligare information om de kategorier av personuppgifter som vi samlar in och delar, var vi får de uppgifterna från samt hur och varför vi använder dem.</string>
-    <string name="update_now">Uppdatera nu</string>
-    <string name="status_and_visibility">Status och synlighet</string>
     <string name="ccpa_privacy_notice_header">Integritetsnotis för användare i Kalifornien</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Prova någon av grundlayouterna</string>
+    <string name="status_and_visibility">Status och synlighet</string>
+    <string name="update_now">Uppdatera nu</string>
     <string name="gutenberg_native_open_block_actions_menu">Öppna menyn för blockåtgärder</string>
-    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Dubbeltryck för att öppna åtgärdsbladet med tillgängliga alternativ</string>
+    <string name="gutenberg_native_move_to_top">Flytta till toppen</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Dubbeltryck för att öppna det nedre arket med tillgänliga alternativ</string>
-    <string name="gutenberg_native_insert_mention">Infoga omnämnande</string>
-    <string name="suggestion_invalid_user">”%s är inte en giltig användare”</string>
-    <string name="site_settings_select_page">Välj sida</string>
-    <string name="site_settings_static_homepage">Statisk startsida</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Dubbeltryck för att öppna åtgärdsbladet med tillgängliga alternativ</string>
     <string name="pages_cannot_be_started">Vi kan inte öppna sidor just nu. Försök igen senare</string>
+    <string name="pages_set_as_posts_page">Ställ in som inläggssida</string>
     <string name="pages_set_as_homepage">Ställ in som startsida</string>
-    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Den valda startsidan kan inte vara den samma som sidan för inlägg.</string>
+    <string name="suggestion_invalid">%s är inte ett giltigt %s</string>
+    <string name="site_settings_select_page">Välj sida</string>
     <string name="site_settings_posts_page">Inläggssida</string>
-    <string name="suggestion_no_matching_users">”Inga matchande användare finns tillgängliga.”</string>
-    <string name="pages_set_as_posts_page">Ställ in som inläggssida</string>
+    <string name="site_settings_static_homepage">Statisk startsida</string>
     <string name="site_settings_classic_blog">Klassisk blogg</string>
+    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Den valda startsidan kan inte vara den samma som sidan för inlägg.</string>
+    <string name="site_settings_failed_update_homepage_settings">Uppdateringen av inställningar för startsida misslyckades, kontrollera att du har kontakt med internet</string>
+    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Det går inte att spara inställningarna för startsida förrän sidorna har lästs in</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Det gick inte att spara inställningarna för startsida</string>
     <string name="site_settings_accept_homepage">Acceptera</string>
-    <string name="site_settings_homepage_settings">Inställningar för startsida</string>
-    <string name="site_settings_homepage_settings_description">Välj mellan en startsida som visar dina senaste inlägg (klassisk blogg) och en fast/statisk sida.</string>
     <string name="site_settings_failed_to_load_pages">Laddningen av sidorna misslyckades</string>
-    <string name="site_settings_failed_to_save_homepage_settings">Det gick inte att spara inställningarna för startsida</string>
-    <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Det går inte att spara inställningarna för startsida förrän sidorna har lästs in</string>
-    <string name="site_settings_failed_update_homepage_settings">Uppdateringen av inställningar för startsida misslyckades, kontrollera att du har kontakt med internet</string>
+    <string name="site_settings_homepage_settings_description">Välj mellan en startsida som visar dina senaste inlägg (klassisk blogg) och en fast/statisk sida.</string>
+    <string name="site_settings_homepage_settings">Inställningar för startsida</string>
     <string name="site_settings_homepage">Startsida</string>
+    <string name="page_posts_page_update_failed">Uppdateringen av inläggssidan misslyckades</string>
+    <string name="page_posts_page_successfully_updated">Inställningarna för sida med blogginlägg har uppdaterats</string>
     <string name="page_homepage_update_failed">Uppdatering av startsida misslyckades</string>
-    <string name="page_cannot_set_homepage">För att ange startsida behöver du aktivera ”Statisk startsida” under webbplatsinställningar</string>
-    <string name="page_cannot_set_posts_page">För att ange sida för blogginlägg behöver du aktivera ”Statisk startsida” under webbplatsinställningar</string>
     <string name="page_homepage_successfully_updated">Inställningarna för startsida har ändrats</string>
-    <string name="page_posts_page_successfully_updated">Inställningarna för sida med blogginlägg har uppdaterats</string>
-    <string name="page_posts_page_update_failed">Uppdateringen av inläggssidan misslyckades</string>
+    <string name="page_cannot_set_posts_page">För att ange sida för blogginlägg behöver du aktivera ”Statisk startsida” under webbplatsinställningar</string>
+    <string name="page_cannot_set_homepage">För att ange startsida behöver du aktivera ”Statisk startsida” under webbplatsinställningar</string>
     <string name="gutenberg_native_select_a_color">Välj en färg</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Välkommen till vår nya blogg</string>
-    <string name="reader_empty_followed_blogs_description">Om du följer några webbplatser kan du se deras innehåll här</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Dubbeltryck för att gå till färginställningarna</string>
-    <string name="crop">beskär</string>
-    <string name="insert_label_with_count">Infoga %d</string>
+    <string name="reader_empty_followed_blogs_description">Om du följer några webbplatser kan du se deras innehåll här</string>
     <string name="feature_announcement_find_out_mode">Ta reda på mer</string>
-    <string name="site_picker_ask_site_select">Kunde inte välja webbplats. Försök igen.</string>
+    <string name="feature_announcement_dialog_label">Nyheter i WordPress</string>
+    <string name="insert_label_with_count">Infoga %d</string>
+    <string name="crop">beskär</string>
+    <string name="error_failed_to_load_into_file">Lyckades inte ladda in i filen, försök igen.</string>
+    <string name="preview_image_thumbnail_description">Miniatyr av förhandsvisningsbild</string>
+    <string name="photo_picker_use_media">Använd denna mediafil</string>
+    <string name="photo_picker_use_video">Använd denna video</string>
     <string name="photo_picker_photo_or_video_title">Välj media</string>
     <string name="photo_picker_video_title">Välj video</string>
-    <string name="photo_picker_use_video">Använd denna video</string>
-    <string name="photo_picker_use_media">Använd denna mediafil</string>
-    <string name="preview_image_thumbnail_description">Miniatyr av förhandsvisningsbild</string>
-    <string name="error_failed_to_load_into_file">Lyckades inte ladda in i filen, försök igen.</string>
-    <string name="feature_announcement_dialog_label">Nyheter i WordPress</string>
-    <string name="button_insert">Infoga</string>
-    <string name="continue_label">Fortsätt</string>
-    <string name="copy_text">Kopiera</string>
-    <string name="comment_share_link_via">Dela via</string>
-    <string name="comment_toast_err_share_intent">Kunde inte dela</string>
-    <string name="copy_link_address">Kopiera länkadress</string>
-    <string name="comment_q_action_copied_url">Länkadress kopierad</string>
+    <string name="site_picker_ask_site_select">Kunde inte välja webbplats. Försök igen.</string>
     <string name="sitepicker_continue_flow">Fortsätt</string>
     <string name="reader_reblog_error">Reblogg misslyckades</string>
     <string name="reader_no_site_to_reblog_action">Hantera webbplatser</string>
     <string name="reader_no_site_to_reblog_detail">När du har skapat en webbplats på WordPress.com kan du reblogga innehåll du tycker om till din egen webbplats.</string>
-    <string name="whats_new_in_version_title">Nyheter</string>
     <string name="reader_no_site_to_reblog_title">Inga webbplatser på WordPress.com tillgängliga</string>
+    <string name="whats_new_in_version_title">Nyheter</string>
+    <string name="comment_q_action_copied_url">Länkadress kopierad</string>
+    <string name="copy_link_address">Kopiera länkadress</string>
+    <string name="comment_share_link_via">Dela via</string>
+    <string name="comment_toast_err_share_intent">Kunde inte dela</string>
+    <string name="button_insert">Infoga</string>
+    <string name="continue_label">Fortsätt</string>
+    <string name="copy_text">Kopiera</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Flytta blocket åt höger från position %1$s till position %2$s</string>
     <string name="gutenberg_native_move_block_right">Flytta blocket åt höger</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Flytta blocket åt vänster från position %1$s till position %2$s</string>
     <string name="gutenberg_native_move_block_left">Flytta blocket åt vänster</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Dubbeltryck för att flytta blocket åt höger</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Dubbeltryck för att flytta blocket åt vänster</string>
-    <string name="gutenberg_native_blog">Blogg</string>
+    <string name="gutenberg_native_block_settings">Blockinställningar</string>
     <string name="new_site_creation_creating_site_loading_4">Skapar adminpanel</string>
     <string name="new_site_creation_creating_site_loading_3">Konfigurerar temat</string>
     <string name="new_site_creation_creating_site_loading_2">Lägger till olika webbplatsfunktioner</string>
@@ -331,12 +761,12 @@ Language: sv_SE
     <string name="media_accessing_failed">Lyckades inte hämta innehållet från en privat webbplats. Vissa mediafiler kanske inte är tillgängliga</string>
     <string name="media_accessing_progress">Hämtning av innehåll från en privat webbplats</string>
     <string name="error_failed_to_crop_and_save_image">Lyckades inte beskära och spara bilden. Försök igen.</string>
+    <string name="failed_to_load_image_tap_to_retry">Misslyckades att ladda bild.\nTryck för att försöka igen.</string>
     <string name="preview_image_description">Förhandsgranskningsbild</string>
     <string name="error_unknown_page_type">Okänt sidformat</string>
     <string name="error_page_not_submitted">Åtgärden gick inte att slutföra och denna sida skickades inte för granskning.</string>
     <string name="error_page_not_scheduled">Åtgärden gick inte att slutföra och sidan schemalades inte.</string>
     <string name="error_page_not_published_private">Åtgärden gick inte att slutföra och denna privata sida publicerades inte.</string>
-    <string name="failed_to_load_image_tap_to_retry">Misslyckades att ladda bild.\nTryck för att försöka igen.</string>
     <string name="error_page_not_published">Åtgärden gick inte att slutföra och denna sida publicerades inte.</string>
     <string name="error_page_not_submitted_retrying">Det gick inte att skicka denna sida för granskning, men vi försöker igen senare. </string>
     <string name="error_page_not_scheduled_retrying">Det gick inte att schemalägga denna sida, men vi försöker igen senare.</string>
@@ -365,110 +795,68 @@ Language: sv_SE
     <string name="app_theme_light">Ljust</string>
     <string name="app_theme">Utseende</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">Du har nyligen gjort ändringar i denna sida utan att spara. Välj vilken version du vill använda:\n\n</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">Vi erbjuder en rad tjänster som hjälper dig att uppnå dina mål. Vet du inte vad du behöver, eller undrar du hur mycket det kostar? Vi förklarar gärna mer om våra tjänster och berättar om våra priser. Hör av dig till oss här nedan.</string>
-    <string name="gutenberg_native_what_people_say">Så här säger andra personer</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Vi är ett litet team med proffsiga specialister och täcker många olika områden och erfarenheter. Vi älskar vårt jobb och arbetar därför passionerat. Vi ser fram emot att arbeta även med dig.</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Dina besökare vill veta mer om vem som står bakom webbplatsen. Här kan du berätta om dig själv, din webbplats, ditt företag eller om vad som helst. Med hjälp av recensionerna nedan kan du citera andra, som berättar om samma sak med sina egna ord.</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_want_to_work_with_us">Vill du arbeta hos oss?</string>
-    <string name="gutenberg_native_warning_message">Varningsmeddelande</string>
-    <string name="gutenberg_native_position_or_job_title">Titel</string>
-    <string name="gutenberg_native_project_name">Projektnamn</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_services">Tjänster</string>
     <string name="gutenberg_native_show_post_content">Visa inläggsinnehåll</string>
-    <string name="gutenberg_native_strategy">Strategi</string>
-    <string name="gutenberg_native_success_message">Framgångsmeddelande</string>
-    <string name="gutenberg_native_team">Team</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">För att komma igång måste man sluta prata och börja göra något.</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Detta är exempelinnehåll som medföljer mallen för att visa upp dess olika funktioner. Ta bort innehållet eller ersätt det med din egen text och dina egna mediafiler.</string>
-    <string name="gutenberg_native_usa">USA</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Låt oss prata 👋 Hör görna av dig med hjälp av nedanstående kontaktuppgifter eller skicka ett meddelande med hjälp av formuläret.</string>
-    <string name="gutenberg_native_link_to">Länk till</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Min portfölj demonstrerar olika projekt jag skapat under min karriär. Mina kontaktuppgifter finns här nedan. Hör av dig.</string>
     <string name="gutenberg_native_only_show_excerpt">Visa endast utdrag</string>
-    <string name="gutenberg_native_portfolio">Portfölj</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Låt oss skapa något tillsammans!</string>
-    <string name="gutenberg_native_let_s_build_something_together">Låt oss skapa något tillsammans!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Skicka e-post: &lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
+    <string name="gutenberg_native_link_to">Länk till</string>
+    <string name="gutenberg_native_link_settings">Länkinställningar</string>
     <string name="gutenberg_native_excerpt_length_words">Utdragets längd (antal ord)</string>
-    <string name="gutenberg_native_get_in_touch">Hör av dig</string>
-    <string name="gutenberg_native_inspiration">Inspiration</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Harry, det är dina val som visar vilka vi egentligen är, i långt högre grad än våra förmågor.</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Gråt inte över att det är slut. Le för att du var med om det.</string>
-    <string name="gutenberg_native_city_10100">Staden, 10100</string>
     <string name="gutenberg_native_customize">ANPASSA</string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">En beskrivning av projektet och dess slutresultat.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">En kort biografi med din personliga berättelse, största framgångar eller intressant information.</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">En kort beskrivning av de tjänster du erbjuder.</string>
+    <string name="gutenberg_native_video_settings">Videoinställningar</string>
     <string name="gutenberg_native_add_paragraph_block">Lägg till ett block med ett textstycke</string>
-    <string name="gutenberg_native_555_555_1234">+1-(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">Skapa ett inlägg</string>
     <string name="post_list_tab_trashed_posts">Borttagna</string>
     <string name="post_list_tab_scheduled_posts">Tidsinställda</string>
     <string name="post_list_tab_published_posts">Publicerade</string>
     <string name="sharing_facebook_account_must_have_pages">Facebook-kopplingen hittar inga sidor. Publicize kan inte kopplas till Facebook-profiler, utan endast till publicerade sidor.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Inte ansluten</string>
-    <string name="my_site_select_domains_page_title">Webbplatsadress</string>
     <string name="notifications_tab_title_likes">Gillamarkeringar</string>
     <string name="notifications_tab_title_follows">Följer</string>
     <string name="notifications_tab_title_comments">Kommentarer</string>
     <string name="notifications_tab_title_unread_notifications">Olästa</string>
     <string name="dlg_cancel_action_dont_trash">Kasta inte</string>
     <string name="dlg_confirm_action_trash">Ta bort</string>
-    <string name="stats_management_add_new_stats_card">Lägg till nytt kort med statistik</string>
-    <string name="stats_management_screen_title">Lägg till nytt kort</string>
-    <string name="stats_insights_management_general">Allmänt</string>
-    <string name="stats_insights_management_posts_and_pages">Inlägg och sidor</string>
     <string name="stats_insights_management_activity">Aktivitet</string>
-    <string name="reader_filter_self_hosted_empty_sites_tags_action">Logga in på WordPress.com</string>
-    <string name="reader_btn_remove_filter_content_description">Ta bort befintligt filter</string>
-    <string name="reader_btn_select_filter_content_description">Välj en webbplats eller etikett för att filtrera inläggen</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Valt</string>
-    <string name="reader_bottom_sheet_content_description">Välj en etikett eller en webbplats, popup-fönster</string>
+    <string name="stats_insights_management_posts_and_pages">Inlägg och sidor</string>
+    <string name="stats_insights_management_general">Allmänt</string>
+    <string name="stats_management_screen_title">Lägg till nytt kort</string>
+    <string name="stats_management_add_new_stats_card">Lägg till nytt kort med statistik</string>
     <string name="reader_self_hosted_select_filter">Använd filtreringsknappen för att hitta inlägg om specifika ämnen</string>
+    <string name="reader_bottom_sheet_content_description">Välj en etikett eller en webbplats, popup-fönster</string>
+    <string name="reader_btn_select_filter_content_description">Välj en webbplats eller etikett för att filtrera inläggen</string>
+    <string name="reader_btn_remove_filter_content_description">Ta bort befintligt filter</string>
     <string name="reader_title_subs">Hantera ämnen och webbplatser</string>
-    <string name="reader_filter_self_hosted_empty_sites_list">Logga in på WordPress.com för att se de senaste inläggen från de webbplatser du följer</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">Logga in på WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">Logga in på WordPress.com för att se de senaste inläggen från de ämnen du följer</string>
-    <string name="reader_filter_empty_sites_list">Se de senaste inläggen från webbplatserna du följer</string>
-    <string name="reader_filter_empty_sites_action">Följ en webbplats</string>
-    <string name="gutenberg_native_add_block_after">Lägg till block efter</string>
-    <string name="gutenberg_native_add_block_before">Lägg till block före</string>
-    <string name="gutenberg_native_add_to_beginning">Lägg till först</string>
-    <string name="gutenberg_native_add_to_end">Lägg till sist</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">Logga in på WordPress.com för att se de senaste inläggen från de webbplatser du följer</string>
     <string name="gutenberg_native_replace_current_block">Ersätt aktuellt block</string>
-    <string name="gutenberg_native_template_preview">Förhandsgranska mall</string>
+    <string name="gutenberg_native_add_to_end">Lägg till sist</string>
+    <string name="gutenberg_native_add_to_beginning">Lägg till först</string>
+    <string name="gutenberg_native_add_block_before">Lägg till block före</string>
+    <string name="gutenberg_native_add_block_after">Lägg till block efter</string>
     <string name="reader_filter_empty_tags_action">Lägg till ett ämne</string>
+    <string name="reader_filter_empty_sites_action">Följ en webbplats</string>
     <string name="reader_filter_empty_tags_list">Du kan följa inlägg om ett specifikt ämne genom att lägga till ett ämne</string>
-    <string name="reader_filter_cta">Filter</string>
+    <string name="reader_filter_empty_sites_list">Se de senaste inläggen från webbplatserna du följer</string>
     <string name="reader_filter_main_title">Följer</string>
-    <string name="gutenberg_native_add_a_shortcode">Lägg till kortkod …</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Dubbeltryck för att välja layout</string>
-    <string name="gutenberg_native_edit_video">Redigera video</string>
+    <string name="reader_filter_cta">Filter</string>
     <string name="gutenberg_native_video_caption_s">Beskrivning för video. %s</string>
-    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
-    <string name="stats_box_type_low">lågt</string>
-    <string name="stats_box_type_medium">mellan</string>
-    <string name="stats_box_type_high">högt</string>
-    <string name="stats_box_type_very_high">mycket högt</string>
-    <string name="stats_posting_activity_action">navigera bland all statistik för denna period</string>
-    <string name="stats_posting_activity_content_description">Dagarna med %1$s visningar för %2$s är: %2$s %3$s.Tryck för mer.</string>
-    <string name="stats_posting_activity_label_content_description">Publiceringsaktivitet för %1$s</string>
-    <string name="stats_posting_activity_empty_description">Det finns ingen statistik för perioden.</string>
-    <string name="stats_posting_activity_end_description">Du har hört alla statistik för denna period.\nOm du trycker en gång till startar det om från början.</string>
-    <string name="fab_create_desc">Skapa ett inlägg</string>
+    <string name="gutenberg_native_edit_video">Redigera video</string>
+    <string name="gutenberg_native_add_a_shortcode">Lägg till kortkod …</string>
     <string name="post_list_author">Inläggsförfattare</string>
+    <string name="fab_create_desc">Skapa ett inlägg</string>
+    <string name="stats_posting_activity_end_description">Du har hört alla statistik för denna period.\nOm du trycker en gång till startar det om från början.</string>
+    <string name="stats_posting_activity_empty_description">Det finns ingen statistik för perioden.</string>
+    <string name="stats_posting_activity_label_content_description">Publiceringsaktivitet för %1$s</string>
+    <string name="stats_posting_activity_content_description">Dagarna med %1$s visningar för %2$s är: %2$s %3$s.Tryck för mer.</string>
+    <string name="stats_posting_activity_action">navigera bland all statistik för denna period</string>
+    <string name="stats_box_type_very_high">mycket högt</string>
+    <string name="stats_box_type_high">högt</string>
+    <string name="stats_box_type_medium">mellan</string>
+    <string name="stats_box_type_low">lågt</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">Flytta bilden framåt</string>
-    <string name="gutenberg_native_move_image_backward">Flytta bilden bakåt</string>
+    <string name="gutenberg_native_replace_image">Ersätt bild</string>
     <string name="gutenberg_native_gallery_caption_s">Bildtext för galleri. %s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Aktuellt värde är %2$s</string>
     <string name="create_post_page_fab_tooltip">Skapa ett inlägg eller en sida</string>
     <string name="content_description_person_building_website">Person som bygger en webbplats</string>
     <string name="post_signup_interstitial_not_right_now">Inte just nu</string>
@@ -482,152 +870,133 @@ Language: sv_SE
     <string name="my_site_bottom_sheet_add_post">Blogginlägg</string>
     <string name="my_site_bottom_sheet_title">Lägg till</string>
     <string name="post_settings_publish">Publicera</string>
-    <string name="dialog_gutenberg_informative_description_v2">Vi har gjort stora förbättringar i blockredigeraren, ta och prova den!\n\nDen är aktiverad för nya inlägg och nya sidor. Om du vill ändra till den klassiska redigeraren kan du göra detta under ”Min webbplats” > ”Inställningar”.</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">Synkronisera nu</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Inlägget kommer att synkroniseras direkt.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Är du klar att synkronisera?</string>
-    <string name="negative_prefix">-%s</string>
-    <string name="login_promo_viewpager_content_description">Inledning</string>
     <string name="new_site_creation_unavailable_domain">Denna domän är inte tillgänglig</string>
-    <string name="login_discovery_error_http_auth">Vi kunde inte nå din webbplats eftersom den kräver &lt;b>HTTP-autentisering&lt;/b>. För att lösa detta behöver du kontakta ditt webbhotell.</string>
-    <string name="login_discovery_error_ssl">Vi kunde inte nå din webbplats på grund av ett problem med &lt;b>SSL-certifikatet&lt;/b>. För att lösa detta behöver du kontakta ditt webbhotell.</string>
+    <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Vi kunde inte nå din webbplats. För att lösa detta behöver du kontakta ditt webbhotell.</string>
-    <string name="reader_following_display_name">Följer</string>
-    <string name="send_verification_email">Skicka verifieringsmeddelande via e-post</string>
+    <string name="login_discovery_error_ssl">Vi kunde inte nå din webbplats på grund av ett problem med &lt;b&gt;SSL-certifikatet&lt;/b&gt;. För att lösa detta behöver du kontakta ditt webbhotell.</string>
+    <string name="login_discovery_error_http_auth">Vi kunde inte nå din webbplats eftersom den kräver &lt;b&gt;HTTP-autentisering&lt;/b&gt;. För att lösa detta behöver du kontakta ditt webbhotell.</string>
+    <string name="login_discovery_error_xmlrpc">Vi kunde inte nå filen &lt;b&gt;XMLRPC&lt;/b&gt; på din webbplats. För att lösa detta behöver du kontakta ditt webbhotell.</string>
+    <string name="login_site_credentials_magic_link_label">Nästan klart! Vi behöver bara bekräfta den e-postadress du har registrerad hos Jetpack &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">Logga in med dina inloggningsuppgifter för webbplatsen %1$s</string>
-    <string name="login_site_credentials_magic_link_label">Nästan klart! Vi behöver bara bekräfta den e-postadress du har registrerad hos Jetpack &lt;b>%1$s&lt;/b></string>
-    <string name="login_discovery_error_xmlrpc">Vi kunde inte nå filen &lt;b>XMLRPC&lt;/b> på din webbplats. För att lösa detta behöver du kontakta ditt webbhotell.</string>
     <string name="my_site_bottom_sheet_add_page">Webbplatssida</string>
-    <string name="enter_site_credentials_instead">Logga in med dina inloggningsuppgifter.</string>
-    <string name="site_cannot_be_loaded">Vi lyckas inte hämta uppgifterna för din webbplats just nu. Försök igen senare.</string>
+    <string name="reader_following_display_name">Följer</string>
     <string name="reader_my_likes_display_name">Gillar</string>
     <string name="reader_discover_display_name">Upptäck</string>
     <string name="reader_save_for_later_display_name">Sparat</string>
+    <string name="reader_filter_tags_title">Ämnen</string>
     <string name="reader_filter_sites_title">Webbplatser</string>
-    <string name="suffix_1_000">%s tusen</string>
-    <string name="suffix_1_000_000">%s miljoner</string>
-    <string name="suffix_1_000_000_000">%s miljarder</string>
-    <string name="suffix_1_000_000_000_000">%s biljoner</string>
     <string name="suffix_1_000_000_000_000_000_000">%s triljoner</string>
     <string name="suffix_1_000_000_000_000_000">%s biljarder</string>
+    <string name="suffix_1_000_000_000_000">%s biljoner</string>
+    <string name="suffix_1_000_000_000">%s miljarder</string>
+    <string name="suffix_1_000_000">%s miljoner</string>
+    <string name="suffix_1_000">%s tusen</string>
     <string name="posts_cannot_be_started">Det går inte att öppna inläggen just nu. Försök igen senare</string>
-    <string name="reader_filter_tags_title">Ämnen</string>
+    <string name="site_cannot_be_loaded">Vi lyckas inte hämta uppgifterna för din webbplats just nu. Försök igen senare.</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress mediabibliotek</string>
-    <string name="gutenberg_native_start_writing">Börja skriva…</string>
-    <string name="gutenberg_native_take_a_photo">Ta en bild</string>
-    <string name="gutenberg_native_take_a_photo_or_video">Ta ett foto eller spela in video</string>
-    <string name="gutenberg_native_take_a_video">Spela in en video</string>
-    <string name="gutenberg_native_tap_here_to_show_help">Tryck här för att visa hjälp</string>
-    <string name="gutenberg_native_tap_to_hide_the_keyboard">Tryck för att dölja tangentbordet</string>
-    <string name="gutenberg_native_title">Rubrik:</string>
-    <string name="gutenberg_native_translate">Översätt</string>
+    <string name="gutenberg_native_unsupported">Stöds ej</string>
     <string name="gutenberg_native_ungroup">Lös upp grupp</string>
-    <string name="gutenberg_native_reset_block">Återställ block</string>
-    <string name="gutenberg_native_s_block_empty">Block av typen %s. Tomt</string>
-    <string name="gutenberg_native_s_block_this_block_has_invalid_content">Block av typen %s. Detta block har ogiltigt innehåll</string>
+    <string name="gutenberg_native_translate">Översätt</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">Tryck för att dölja tangentbordet</string>
+    <string name="gutenberg_native_tap_here_to_show_help">Tryck här för att visa hjälp</string>
+    <string name="gutenberg_native_take_a_video">Spela in en video</string>
+    <string name="gutenberg_native_take_a_photo_or_video">Ta ett foto eller spela in video</string>
+    <string name="gutenberg_native_take_a_photo">Ta en bild</string>
+    <string name="gutenberg_native_start_writing">Börja skriva…</string>
     <string name="gutenberg_native_show_section">Visa sektion</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Tillägg för sidopanelrubrik</string>
-    <string name="gutenberg_native_size">Storlek</string>
+    <string name="gutenberg_native_s_block_this_block_has_invalid_content">Block av typen %s. Detta block har ogiltigt innehåll</string>
+    <string name="gutenberg_native_s_block_empty">Block av typen %s. Tomt</string>
     <string name="gutenberg_native_cut_block">Klipp ut blocket</string>
-    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Det finns inget program som kan hantera denna begäran. Installera ett webbläsarprogram.</string>
-    <string name="gutenberg_native_open_settings">Öppna inställningar</string>
-    <string name="gutenberg_native_page_break_block_s">Sidbrytningblock. %s</string>
-    <string name="gutenberg_native_paste_url">Klistra in URL</string>
-    <string name="gutenberg_native_post_title_empty">Inläggsrubrik. Tom</string>
-    <string name="gutenberg_native_post_title_s">Inläggsrubrik. %s</string>
-    <string name="gutenberg_native_problem_displaying_block">Problem med att visa block</string>
     <string name="gutenberg_native_problem_opening_the_video">Svårigheter att öppna videoklippet</string>
-    <string name="gutenberg_native_remove_annotations">Ta bort bildtexter/förklaringar</string>
-    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Flytta block nedåt från rad %1$s till rad %2$s</string>
-    <string name="gutenberg_native_move_block_up">Flytta block uppåt</string>
-    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Flytta block uppåt från rad  %1$s till rad %2$s</string>
-    <string name="gutenberg_native_my_document_setting_panel">Min panel för dokumentinställningar</string>
-    <string name="gutenberg_native_my_post_publish_panel">Min panel för publicering av inlägg</string>
-    <string name="gutenberg_native_my_post_status_info">Min statusinformation om inlägg</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Min granskningspanel före publicering</string>
+    <string name="gutenberg_native_problem_displaying_block">Problem med att visa block</string>
+    <string name="gutenberg_native_post_title_s">Inläggsrubrik. %s</string>
+    <string name="gutenberg_native_post_title_empty">Inläggsrubrik. Tom</string>
+    <string name="gutenberg_native_paste_url">Klistra in URL</string>
+    <string name="gutenberg_native_page_break_block_s">Sidbrytningblock. %s</string>
+    <string name="gutenberg_native_open_settings">Öppna inställningar</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Det finns inget program som kan hantera denna begäran. Installera ett webbläsarprogram.</string>
     <string name="gutenberg_native_navigate_up">Navigera upp</string>
-    <string name="gutenberg_native_double_tap_to_undo_last_change">Dubbeltryck för att ångra senaste ändring</string>
-    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Kunde inte lägga in mediafil.\nTryck för att visa alternativ.</string>
-    <string name="gutenberg_native_help_icon">Hjälpikon</string>
-    <string name="gutenberg_native_here_is_the_panel_content">Här är panelen innehåll!</string>
-    <string name="gutenberg_native_hide_keyboard">Dölj tangentbordet</string>
-    <string name="gutenberg_native_image_caption_s">Bildtext. %s</string>
+    <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Flytta block uppåt från rad  %1$s till rad %2$s</string>
+    <string name="gutenberg_native_move_block_up">Flytta block uppåt</string>
+    <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Flytta block nedåt från rad %1$s till rad %2$s</string>
     <string name="gutenberg_native_move_block_down">Flytta block nedåt</string>
-    <string name="gutenberg_native_double_tap_to_redo_last_change">Dubbeltryck för att göra om senaste ändring</string>
-    <string name="gutenberg_native_double_tap_to_select">Dubbeltryck för att välja</string>
-    <string name="gutenberg_native_double_tap_to_select_a_video">Dubbeltryck för att välja ett videoklipp</string>
-    <string name="gutenberg_native_double_tap_to_select_an_image">Dubbeltryck för att välja en bild</string>
+    <string name="gutenberg_native_image_caption_s">Bildtext. %s</string>
+    <string name="gutenberg_native_hide_keyboard">Dölj tangentbordet</string>
+    <string name="gutenberg_native_help_icon">Hjälpikon</string>
+    <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Kunde inte lägga in mediafil.\nTryck för att visa alternativ.</string>
+    <string name="gutenberg_native_double_tap_to_undo_last_change">Dubbeltryck för att ångra senaste ändring</string>
     <string name="gutenberg_native_double_tap_to_toggle_setting">Dubbeltryck för att växla inställningens värde</string>
-    <string name="gutenberg_native_double_tap_to_add_a_block">Dubbeltryck för att lägga till block</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Dubbeltryck för att ändra värdet via skjutreglage.</string>
-    <string name="gutenberg_native_double_tap_to_edit_this_value">Dubbeltryck för att redigera värdet</string>
-    <string name="gutenberg_native_double_tap_to_move_the_block_down">Dubbeltryck för att flytta blocket nedåt</string>
+    <string name="gutenberg_native_double_tap_to_select_an_image">Dubbeltryck för att välja en bild</string>
+    <string name="gutenberg_native_double_tap_to_select_a_video">Dubbeltryck för att välja ett videoklipp</string>
+    <string name="gutenberg_native_double_tap_to_select">Dubbeltryck för att välja</string>
+    <string name="gutenberg_native_double_tap_to_redo_last_change">Dubbeltryck för att göra om senaste ändring</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Dubbeltryck för att flytta blocket uppåt</string>
-    <string name="gutenberg_native_annotations_sidebar">Sidopanel för bildtexter/beskrivninger</string>
-    <string name="gutenberg_native_choose_from_device">Välj från enheten</string>
-    <string name="gutenberg_native_content">Innehåll…</string>
+    <string name="gutenberg_native_double_tap_to_move_the_block_down">Dubbeltryck för att flytta blocket nedåt</string>
+    <string name="gutenberg_native_double_tap_to_edit_this_value">Dubbeltryck för att redigera värdet</string>
+    <string name="gutenberg_native_double_tap_to_add_a_block">Dubbeltryck för att lägga till block</string>
     <string name="gutenberg_native_current_value_is_s">Nuvarande värde är %s</string>
-    <string name="gutenberg_native_add_a_description">Lägg till beskrivning</string>
-    <string name="gutenberg_native_add_annotation">Lägg till bildtext/beskrivning</string>
-    <string name="gutenberg_native_add_block_here">LÄGG TILL BLOCK HÄR</string>
-    <string name="gutenberg_native_add_image">LÄGG TILL BILD</string>
-    <string name="gutenberg_native_add_image_or_video">LÄGG TILL BILD ELLER VIDEO</string>
-    <string name="gutenberg_native_add_url">Lägg till URL</string>
-    <string name="gutenberg_native_add_video">LÄGG TILL VIDEO</string>
-    <string name="gutenberg_native_alt_text">Alt-text</string>
+    <string name="gutenberg_native_choose_from_device">Välj från enheten</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Ett okänt fel har inträffatt. Försök igen.</string>
-    <string name="reader_acessibility_list_loaded">”Listan har lästs in med %1$d objekt.”</string>
+    <string name="gutenberg_native_alt_text">Alt-text</string>
+    <string name="gutenberg_native_add_video">LÄGG TILL VIDEO</string>
+    <string name="gutenberg_native_add_url">Lägg till URL</string>
+    <string name="gutenberg_native_add_alt_text">Lägg till alt-text</string>
+    <string name="gutenberg_native_add_image_or_video">LÄGG TILL BILD ELLER VIDEO</string>
+    <string name="gutenberg_native_add_image">LÄGG TILL BILD</string>
+    <string name="gutenberg_native_add_block_here">LÄGG TILL BLOCK HÄR</string>
     <string name="reader_empty_saved_posts_content_description">Tryck på knappen ”Lägg till i sparade inlägg” för att lägga till inlägget i din lista.</string>
-    <string name="notifications_tab_dialog_master_off_message">Om du stänger av aviseringar för denna webbplats kommer all visning av aviseringar under aviseringsfliken att stängas av för webbplatsen. Du kan finjustera vilka aviseringar du vill använda efter att du först aktiverat aviseringar för webbplatsen.</string>
-    <string name="master_switch_default_title_on">Till</string>
-    <string name="master_switch_default_title_off">Från</string>
+    <string name="reader_acessibility_list_loaded">”Listan har lästs in med %1$d objekt.”</string>
     <string name="notifications_tab_dialog_switch_desc">Aviseringar</string>
-    <string name="notifications_tab_dialog_master_status_on">Aviseringar för denna webbplats</string>
-    <string name="notifications_tab_dialog_master_status_off">Aviseringar för denna webbplats</string>
-    <string name="notifications_tab_dialog_master_hint_on">Inaktivera visning av aviseringar under aviseringsfliken för denna webbplats</string>
-    <string name="notifications_tab_dialog_master_hint_off">Aktivera visning av aviseringar under aviseringsfliken för denna webbplats</string>
-    <string name="notifications_tab_dialog_master_off_title">För att kunna se aviseringar under aviseringsfliken för denna webbplats behöver du aktivera aviseringar för webbplatsen.</string>
-    <string name="dialog_gutenberg_informative_description_page">Nu använder du blockredigeraren för nya sidor – utmärkt! Om du vill återgå till den klassiska redigeraren går du till ”Min webbplats” > ”Inställningar”.</string>
-    <string name="dialog_gutenberg_informative_description_post">Nu använder du blockredigeraren för nya inlägg – utmärkt! Om du vill återgå till den klassiska redigeraren går du till ”Min webbplats” > ”Inställningar”.</string>
+    <string name="main_switch_default_title_off">Från</string>
+    <string name="main_switch_default_title_on">Till</string>
+    <string name="notifications_tab_dialog_main_off_message">Om du stänger av aviseringar för denna webbplats kommer all visning av aviseringar under aviseringsfliken att stängas av för webbplatsen. Du kan finjustera vilka aviseringar du vill använda efter att du först aktiverat aviseringar för webbplatsen.</string>
+    <string name="notifications_tab_dialog_main_off_title">För att kunna se aviseringar under aviseringsfliken för denna webbplats behöver du aktivera aviseringar för webbplatsen.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Aktivera visning av aviseringar under aviseringsfliken för denna webbplats</string>
+    <string name="notifications_tab_dialog_main_hint_on">Inaktivera visning av aviseringar under aviseringsfliken för denna webbplats</string>
+    <string name="notifications_tab_dialog_main_status_off">Aviseringar för denna webbplats</string>
+    <string name="notifications_tab_dialog_main_status_on">Aviseringar för denna webbplats</string>
     <string name="pick_media">Lägg till bild eller video</string>
-    <string name="error_post_not_published_retrying_private">Det gick inte att publicera detta privata inlägg, men vi försöker igen senare.</string>
-    <string name="error_post_not_scheduled_retrying">Det gick inte att schemalägga detta inlägg, men vi försöker igen senare.</string>
     <string name="error_post_not_submitted_retrying">Det gick inte att skicka detta inlägg för granskning, men vi försöker igen senare.</string>
-    <string name="error_post_not_published">Åtgärden gick inte att slutföra och detta inlägg publicerades inte.</string>
-    <string name="error_post_not_published_private">Åtgärden gick inte att slutföra och detta privata inlägg publicerades inte.</string>
-    <string name="error_post_not_scheduled">Åtgärden gick inte att slutföra och inlägget schemalades inte.</string>
-    <string name="error_post_not_submitted">Åtgärden gick inte att slutföra och detta inlägg skickades inte för granskning.</string>
+    <string name="error_post_not_scheduled_retrying">Det gick inte att schemalägga detta inlägg, men vi försöker igen senare.</string>
+    <string name="error_post_not_published_retrying_private">Det gick inte att publicera detta privata inlägg, men vi försöker igen senare.</string>
     <string name="error_post_not_published_retrying">Inlägget gick inte att publicera, men vi försöker igen senare.</string>
-    <string name="error_media_recover_post">Det gick inte att ladda upp denna mediafil.</string>
-    <string name="error_media_recover_post_not_published">Det gick inte att ladda upp denna mediafil och inlägget publicerades inte.</string>
-    <string name="error_media_recover_post_not_published_private">Det gick inte att ladda upp denna mediafil och detta privata inlägg publicerades inte.</string>
-    <string name="error_media_recover_post_not_scheduled">Det gick inte att ladda upp denna mediafil och inlägget schemalades inte.</string>
+    <string name="error_post_not_submitted">Åtgärden gick inte att slutföra och detta inlägg skickades inte för granskning.</string>
+    <string name="error_post_not_scheduled">Åtgärden gick inte att slutföra och inlägget schemalades inte.</string>
+    <string name="error_post_not_published_private">Åtgärden gick inte att slutföra och detta privata inlägg publicerades inte.</string>
+    <string name="error_post_not_published">Åtgärden gick inte att slutföra och detta inlägg publicerades inte.</string>
     <string name="error_media_recover_post_not_submitted">Det gick inte att ladda upp denna mediafil och inlägget skickades inte för granskning.</string>
-    <string name="post_preview_remote_auto_saving_post">Genererar förhandsgranskning …</string>
-    <string name="remote_preview_operation_error">Ett fel inträffade när inlägget skulle sparas inför förhandsgranskningen</string>
-    <string name="preview_unavailable_self_hosted_sites">Förhandsvisning är inte tillgänglig</string>
-    <string name="error_preview_empty_post">Det går inte att förhandsgranska ett inlägg utan innehåll</string>
-    <string name="error_preview_empty_page">Det går inte att förhandsgranska en sida utan innehåll</string>
-    <string name="error_preview_empty_draft">Det går inte att förhandsgranska ett utkast utan innehåll</string>
-    <string name="error_generic_error">Åtgärden gick inte att slutföra.</string>
+    <string name="error_media_recover_post_not_scheduled">Det gick inte att ladda upp denna mediafil och inlägget schemalades inte.</string>
+    <string name="error_media_recover_post_not_published_private">Det gick inte att ladda upp denna mediafil och detta privata inlägg publicerades inte.</string>
+    <string name="error_media_recover_post_not_published">Det gick inte att ladda upp denna mediafil och inlägget publicerades inte.</string>
+    <string name="error_media_recover_post">Det gick inte att ladda upp denna mediafil.</string>
     <string name="error_generic_error_retrying">Åtgärden gick inte att slutföra, men vi försöker igen senare.</string>
-    <string name="local_post_autosave_revision_available">Du har gjort ändringar i detta inlägg som inte är sparade</string>
+    <string name="error_generic_error">Åtgärden gick inte att slutföra.</string>
+    <string name="error_preview_empty_draft">Det går inte att förhandsgranska ett utkast utan innehåll</string>
+    <string name="error_preview_empty_page">Det går inte att förhandsgranska en sida utan innehåll</string>
+    <string name="error_preview_empty_post">Det går inte att förhandsgranska ett inlägg utan innehåll</string>
+    <string name="preview_unavailable_self_hosted_sites">Förhandsvisning är inte tillgänglig</string>
+    <string name="remote_preview_operation_error">Ett fel inträffade när inlägget skulle sparas inför förhandsgranskningen</string>
+    <string name="post_preview_remote_auto_saving_post">Genererar förhandsgranskning …</string>
     <string name="post_preview_saving_draft">Sparar …</string>
-    <string name="post_waiting_for_connection_draft_cancel">De senaste ändringarna till ditt utkast kommer inte att sparas.</string>
-    <string name="button_delete_permanently">Ta bort permanent</string>
-    <string name="dialog_confirm_autosave_title">Vilken version vill du redigera?</string>
-    <string name="dialog_confirm_autosave_body_first_part">Du har nyligen gjort några ändringar i detta inlägg utan att spara. Välj vilken version du vill använda:\n\n</string>
-    <string name="dialog_confirm_autosave_body_second_part">Från denna app\nSparad den %s\n\nFrån en annan enhet\nSparad den %s\n</string>
-    <string name="dialog_confirm_autosave_restore_button">Versionen från en annan enhet</string>
+    <string name="local_post_autosave_revision_available">Du har gjort ändringar i detta inlägg som inte är sparade</string>
     <string name="dialog_confirm_autosave_dont_restore_button">Versionen från denna app</string>
-    <string name="post_waiting_for_connection_publish_cancel">Vi kommer inte att publicera dessa ändringar.</string>
-    <string name="post_waiting_for_connection_pending_cancel">Vi kommer inte att skicka dessa ändringar för granskning.</string>
+    <string name="dialog_confirm_autosave_restore_button">Versionen från en annan enhet</string>
+    <string name="dialog_confirm_autosave_body_second_part">Från denna app\nSparad den %s\n\nFrån en annan enhet\nSparad den %s\n</string>
+    <string name="dialog_confirm_autosave_body_first_part">Du har nyligen gjort några ändringar i detta inlägg utan att spara. Välj vilken version du vill använda:\n\n</string>
+    <string name="dialog_confirm_autosave_title">Vilken version vill du redigera?</string>
+    <string name="button_delete_permanently">Ta bort permanent</string>
+    <string name="post_waiting_for_connection_draft_cancel">De senaste ändringarna till ditt utkast kommer inte att sparas.</string>
     <string name="post_waiting_for_connection_scheduled_cancel">Vi kommer inte att schemalägga dessa ändringar.</string>
-    <string name="post_waiting_for_connection_private">Vi kommer att publicera ditt privata inlägg när din enhet har kontakt med internet igen</string>
+    <string name="post_waiting_for_connection_pending_cancel">Vi kommer inte att skicka dessa ändringar för granskning.</string>
+    <string name="post_waiting_for_connection_publish_cancel">Vi kommer inte att publicera dessa ändringar.</string>
     <string name="post_waiting_for_connection_draft">Vi kommer att spara ditt utkast när din enhet har kontakt med internet igen</string>
-    <string name="post_waiting_for_connection_publish">Vi kommer att publicera inlägget när din enhet har kontakt med internet igen.</string>
-    <string name="post_waiting_for_connection_pending">Vi kommer att skicka ditt inlägg för granskning när din enhet har kontakt med internet igen.</string>
+    <string name="post_waiting_for_connection_private">Vi kommer att publicera ditt privata inlägg när din enhet har kontakt med internet igen</string>
     <string name="post_waiting_for_connection_scheduled">Vi kommer att schemalägga inlägget när din enhet har kontakt med internet igen.</string>
+    <string name="post_waiting_for_connection_pending">Vi kommer att skicka ditt inlägg för granskning när din enhet har kontakt med internet igen.</string>
+    <string name="post_waiting_for_connection_publish">Vi kommer att publicera inlägget när din enhet har kontakt med internet igen.</string>
     <string name="settings_username_changer_snackbar_cancel">Åtgärden går inte att avbryta. Användarnamnet kanske redan är uppdaterat.</string>
     <string name="settings_username_changer_toast_content">Ditt nya användarnamn är %1$s</string>
     <string name="settings_username_changer_progress_dialog">Sparar användarnamnet…</string>
@@ -658,39 +1027,37 @@ Language: sv_SE
     <string name="stats_site_negative_utc">Tidszon för webbplatsen (UTC - %s)</string>
     <string name="stats_site_positive_utc">Tidszon för webbplatsen (UTC + %s)</string>
     <string name="stats_site_neutral_utc">Tidszon för webbplatsen (UTC)</string>
+    <string name="web_preview_desktop">Stationär dator</string>
     <string name="web_preview_default">Standard</string>
     <string name="close_dialog_button_desc">Stäng dialogruta</string>
+    <string name="preview_type_desc">Välj typ av förhandsgranskning</string>
     <string name="share_desc">Dela</string>
     <string name="navigate_back_desc">Gå tillbaka</string>
     <string name="navigate_forward_desc">Gå framåt</string>
-    <string name="web_preview_desktop">Stationär dator</string>
-    <string name="preview_type_desc">Välj typ av förhandsgranskning</string>
-    <string name="notification_post_will_be_published_in_ten_minutes">”%s” kommer att publiceras om 10 minuter</string>
-    <string name="calendar_scheduled_post_title">Schemalagt WordPress-inlägg: ”%s”</string>
     <string name="calendar_scheduled_post_description">”%s” har schemalagts för publicering den ”%s” i din WordPress-app \n %s</string>
+    <string name="calendar_scheduled_post_title">Schemalagt WordPress-inlägg: ”%s”</string>
+    <string name="notification_post_will_be_published_in_ten_minutes">”%s” kommer att publiceras om 10 minuter</string>
     <string name="notification_post_will_be_published_in_one_hour">”%s” kommer att publiceras om en timme</string>
     <string name="notification_post_has_been_published">”%s” har publicerats</string>
-    <string name="post_notification_when_published">Vid publicering</string>
-    <string name="post_notification_error">Det går inte att skapa någon avisering när publiceringsdatumet redan har passerat.</string>
-    <string name="notification_scheduled_post">Tidsinställt inlägg</string>
-    <string name="notification_scheduled_post_one_hour_reminder">Tidsinställt inlägg: 1 timme kvar</string>
     <string name="notification_scheduled_post_ten_minute_reminder">Tidsinställt inlägg: 10 minuter kvar</string>
-    <string name="post_settings_notification">Avisering</string>
+    <string name="notification_scheduled_post_one_hour_reminder">Tidsinställt inlägg: 1 timme kvar</string>
+    <string name="notification_scheduled_post">Tidsinställt inlägg</string>
+    <string name="post_notification_error">Det går inte att skapa någon avisering när publiceringsdatumet redan har passerat.</string>
+    <string name="post_notification_when_published">Vid publicering</string>
+    <string name="post_notification_ten_minutes_before">10 minuter innan</string>
+    <string name="post_notification_one_hour_before">1 timme innan</string>
     <string name="post_notification_off">Av</string>
     <string name="post_settings_add_to_calendar">Lägg till i kalender</string>
-    <string name="post_notification_one_hour_before">1 timme innan</string>
-    <string name="post_notification_ten_minutes_before">10 minuter innan</string>
+    <string name="post_settings_notification">Avisering</string>
     <string name="post_settings_time_and_date">Datum och tid</string>
-    <string name="login_need_help_finding_connected_email">Behöver du hjälp att hitta e-postadressen du använde för att ansluta dig?</string>
-    <string name="enter_wordpress_site">Webbplatsen på den angivna adressen använder inte WordPress. För att vi ska kunna ansluta till webbplatsen måste WordPress vara installerat.</string>
     <string name="login_invalid_site_url">Skriv in den fullständiga adressen till en webbplats, såsom example.com.</string>
     <string name="enter_email_for_site">Logga in med WordPress.com för ansluta till %1$s</string>
     <string name="stats_post_views_label">Visningar</string>
     <string name="stats_post_label">Inlägg</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
     <string name="stats_item_collapsed">Objektet minimerat</string>
-    <string name="stats_collapse_content_description">Minimera</string>
     <string name="stats_item_expanded">Objektet expanderat</string>
+    <string name="stats_collapse_content_description">Minimera</string>
     <string name="stats_expand_content_description">Expandera</string>
     <string name="stats_graph_updated">Diagrammet har uppdaterats.</string>
     <string name="stats_overview_content_description">%1$s %2$s för perioden: %3$s, ändring mot föregående period – %4$s</string>
@@ -732,63 +1099,63 @@ Language: sv_SE
     <string name="stats_widget_all_time_title">Sedan starten</string>
     <string name="stats_widget_views_title">Visningar denna vecka</string>
     <string name="stats_widget_add">Lägg till widget</string>
-    <string name="plugin_install_site_ineligible_default_error">Om du alldeles nyss registrerat ett domännamn behöver du vänta tills vi har hunnit konfigurera det innan du försöker igen.\n\nOm så inte är fallet måste något ha blivit fel och i så fall kanske hantering av tillägg inte är tillgängligt för denna webbplats.</string>
     <string name="plugin_fetching_error_after_at">Det verkar ta längre tid än vanligt att uppdatera uppgifterna om tilläggen. Försök igen senare.</string>
+    <string name="plugin_install_site_ineligible_default_error">Om du alldeles nyss registrerat ett domännamn behöver du vänta tills vi har hunnit konfigurera det innan du försöker igen.\n\nOm så inte är fallet måste något ha blivit fel och i så fall kanske hantering av tillägg inte är tillgängligt för denna webbplats.</string>
     <string name="domain_contact_information_state_not_available_hint">Delstat (Inte tillgänglig)</string>
+    <string name="domain_registration_privacy_protection_tos">I och med att du registrerar denna domän accepterar du våra %1$savtalsvillkor%2$s</string>
     <string name="error_network_connection">Kontrollera din nätverksanslutning och försök igen.</string>
-    <string name="error_disabled_apis">Det gick inte att hämta inställningarna: Vissa API:er är inte tillgängliga för denna kombination av OAuth app-ID och användarkonto.</string>
     <string name="error_browser_no_network">Det går inte att ladda denna sida just nu.</string>
-    <string name="domain_registration_privacy_protection_tos">I och med att du registrerar denna domän accepterar du våra %1$savtalsvillkor%2$s</string>
+    <string name="error_disabled_apis">Det gick inte att hämta inställningarna: Vissa API:er är inte tillgängliga för denna kombination av OAuth app-ID och användarkonto.</string>
     <string name="jetpack_connection_terms_and_conditions">I och med att du konfigurerar Jetpack accepterar du våra %1$savtalsvillkor%2$s</string>
-    <string name="site_settings_password_updated">Lösenord uppdaterat</string>
-    <string name="site_settings_password_dialog_title">Uppdatera lösenord</string>
     <string name="site_settings_disconnected_toast">Ingen anslutning. Redigering är inaktiverad.</string>
     <string name="site_settings_update_password_message">För att återansluta appen till din webbplats som körs på extern server behöver du skriva in webbplatsens nya lösenord här.</string>
+    <string name="site_settings_password_updated">Lösenord uppdaterat</string>
+    <string name="site_settings_password_dialog_title">Uppdatera lösenord</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Registrerar domännamn…</string>
-    <string name="domain_registration_country_picker_dialog_title">Välj land</string>
     <string name="domain_registration_state_picker_dialog_title">Välj delstat</string>
+    <string name="domain_registration_country_picker_dialog_title">Välj land</string>
     <string name="domain_registration_result_continue_button">fortsätt</string>
+    <string name="domain_registration_result_description">Din nya domän &lt;b&gt;%s&lt;/b&gt; håller på att konfigureras. Webbplatsen gör förväntansfulla kullerbyttor!</string>
     <string name="domain_registration_result_title">Grattis</string>
+    <string name="domain_contact_information_register_domain_button">Registrera domän</string>
+    <string name="domain_contact_information_postal_code_hint">Postnummer</string>
+    <string name="domain_contact_information_state_hint">Delstat</string>
     <string name="domain_contact_information_city_hint">Ort</string>
     <string name="domain_contact_information_address_hint_two">Adress 2</string>
     <string name="domain_contact_information_address_hint">Adress</string>
     <string name="domain_contact_information_country_hint">Land</string>
     <string name="domain_contact_information_country_code_hint">Landskod</string>
     <string name="domain_contact_information_phone_number_hint">Telefon</string>
-    <string name="domain_contact_information_postal_code_hint">Postnummer</string>
-    <string name="domain_contact_information_register_domain_button">Registrera domän</string>
-    <string name="domain_contact_information_state_hint">Delstat</string>
-    <string name="domain_registration_result_description">Din nya domän &lt;b>%s&lt;/b> håller på att konfigureras. Webbplatsen gör förväntansfulla kullerbyttor!</string>
     <string name="domain_contact_information_organization_hint">Organisation (valfritt)</string>
     <string name="domain_contact_information_description">För din bekvämlighet har vi förfyllt din WordPress.com\n        kontaktinformation. Granska det för att vara säker på att det är rätt information du vill använda för denna domän.</string>
     <string name="domain_contact_information_title">Kontaktinformation för domän</string>
     <string name="domain_privacy_option_off_title">Registrera publikt</string>
     <string name="domain_privacy_option_on_title">Registrera privat med integritetsskydd</string>
     <string name="domain_registration_privacy_protection_description">Domänägare måste uppge kontaktinformation i en publik databas som omfattar alla domäner. Med integritetsskydd publicerar vi våra uppgifter istället för dina, och vidarebefordrar sedan privat eventuella meddelanden till dig.</string>
-    <string name="domain_registration_contact_form_input_error">Ange en giltig %s</string>
     <string name="domain_registration_privacy_protection_title">Integritetsskydd</string>
+    <string name="domain_registration_contact_form_input_error">Ange en giltig %s</string>
     <string name="domains_suggestions_choose_domain">Välj domän</string>
+    <string name="stats_management_new">Nytt</string>
     <string name="stats_management_dismiss_insights_news_card">Avfärda</string>
     <string name="stats_management_try_it_now">Prova det nu</string>
-    <string name="stats_manage_your_stats">Hantera din statistik</string>
-    <string name="stats_management_new">Nytt</string>
     <string name="stats_management_news_card_message">Välj vilken statistik du vill se och fokusera på de data du bryr dig mest om. Knacka på %1$s under insikterna för att anpassa visningen av din statistik.</string>
+    <string name="stats_manage_your_stats">Hantera din statistik</string>
     <string name="history_fetching_revisions">Hämtar versioner…</string>
-    <string name="editor_uploading_draft">Ditt utkast laddas upp</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">Det gick inte att lägga in media.\nKnacka här för att försöka igen.</string>
+    <string name="editor_uploading_draft">Ditt utkast laddas upp</string>
     <string name="post_uploading_draft">Laddar upp utkast</string>
-    <string name="error_restoring_post">Ett fel inträffade när inlägget skulle återställas</string>
     <string name="post_list_tab_drafts">Utkast</string>
+    <string name="error_restoring_post">Ett fel inträffade när inlägget skulle återställas</string>
     <string name="backdated_for">Backdaterad: %s</string>
     <string name="stats_insights_management_title">Visa endast den mest relevanta statistiken. Lägg till och organisera dina insikter nedan.</string>
     <string name="stats_insights_social">Socialt</string>
     <string name="stats_insights_annual_site_stats">Årlig webbplatsstatistik</string>
+    <string name="stats_view_follower_totals">Totala antal följare</string>
     <string name="domain_suggestions_fetch_error">Det gick inte att ladda in förslag på domäner</string>
     <string name="domain_suggestions_search_hint">Skriv in ett nyckelord för fler idéer</string>
     <string name="domains_suggestions_empty_list">Inga förslag hittades</string>
     <string name="register_domain">Registrera domän</string>
     <string name="jetpack_installed_message">Nu när Jetpack är installerat behöver vi hjälpa dig igång. Det tar bara någon minut.</string>
-    <string name="stats_view_follower_totals">Totala antal följare</string>
     <string name="stats_menu_remove">Ta bort från Insikter</string>
     <string name="stats_menu_move_down">Flytta ned</string>
     <string name="stats_menu_move_up">Flytta upp</string>
@@ -797,8 +1164,8 @@ Language: sv_SE
     <string name="post_restoring">Inlägget återställs</string>
     <string name="post_restored">Inlägget har återställts</string>
     <string name="post_trashing">Inlägget läggs i papperskorgen</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Lokala ändringar</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Om du lägger detta inlägg i papperskorgen kommer redigering som inte sparats att kastas. Vill du fortsätta?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Lokala ändringar</string>
     <string name="button_move_to_draft">Flytta till utkast</string>
     <string name="post_list_toggle_item_layout_list_view">Växla till listvy</string>
     <string name="post_list_toggle_item_layout_cards_view">Växla till kortvy</string>
@@ -808,60 +1175,58 @@ Language: sv_SE
     <string name="posts_published_empty">Du har inte publicerat några inlägg ännu</string>
     <string name="notification_wpcom_username_needed">Logga in med ditt användarnamn och lösenord.</string>
     <string name="error_user_username_instead_of_email">Logga in med ditt användarnamn för WordPress.com och inte med din e-postadress.</string>
+    <string name="stats_insights_average_words">Ord per inlägg i snitt</string>
+    <string name="stats_insights_total_words">Totalt antal ord</string>
+    <string name="stats_insights_average_likes">Gilla per inlägg i snitt</string>
+    <string name="stats_insights_total_likes">Totalt antal ”gilla”</string>
+    <string name="stats_insights_average_comments">Kommentarer per inlägg i snitt</string>
+    <string name="stats_insights_total_comments">Totalt antal kommentarer</string>
+    <string name="stats_insights_posts">Inlägg</string>
     <string name="stats_insights_year">År</string>
-    <string name="no_site_error">Webbplatsen på denna adress är inte en WordPress-webbplats.  För att vi ska kunna ansluta till den måste webbplatsen använda WordPress.</string>
     <string name="stats_insights_this_year_site_stats">I år</string>
-    <string name="stats_insights_posts">Inlägg</string>
-    <string name="stats_insights_total_comments">Totalt antal kommentarer</string>
-    <string name="stats_insights_average_comments">Kommentarer per inlägg i snitt</string>
-    <string name="stats_insights_total_likes">Totalt antal ”gilla”</string>
-    <string name="stats_insights_average_likes">Gilla per inlägg i snitt</string>
-    <string name="stats_insights_total_words">Totalt antal ord</string>
-    <string name="stats_insights_average_words">Ord per inlägg i snitt</string>
-    <string name="plugin_check_domain_credits_progress_dialog_message">Kontrollerar domänens saldo</string>
+    <string name="no_site_error">Webbplatsen på denna adress är inte en WordPress-webbplats.  För att vi ska kunna ansluta till den måste webbplatsen använda WordPress.</string>
     <string name="plugin_check_domain_credit_error">Lyckades inte kontrollera domänens saldo</string>
-    <string name="plugin_install_custom_domain_required_dialog_title">Installera tillägg</string>
+    <string name="plugin_check_domain_credits_progress_dialog_message">Kontrollerar domänens saldo</string>
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Registrera domän</string>
     <string name="plugin_install_custom_domain_required_dialog_message">För att installera tillägg måste du ha en anpassad domän som är associerad med din webbplats.</string>
-    <string name="stats_insights_load_more">Hämta mer</string>
-    <string name="stats_detail_months_and_years">Månader och år</string>
-    <string name="stats_months_and_years_period_label">Period</string>
-    <string name="stats_months_and_years_views_label">Visningar</string>
-    <string name="stats_detail_average_views_per_day">Snitt visningar/dag</string>
-    <string name="stats_detail_recent_weeks">Senaste veckorna</string>
-    <string name="scheduled_for">Schemalagt för: %s</string>
-    <string name="published_on">Publicerat: %s</string>
-    <string name="schedule_for">Schemalägg till: %s</string>
-    <string name="publish_on">Publicera den: %s</string>
+    <string name="plugin_install_custom_domain_required_dialog_title">Installera tillägg</string>
     <string name="new_site_creation_preview_subtitle">Du kommer att kunna anpassa utseendet och känslan hos din webbplats senare</string>
-    <string name="showing_stats_for">Visar statistik för:</string>
-    <string name="stats_insights_best_day">Bästa dag</string>
-    <string name="stats_insights_best_hour">Bästa timme</string>
+    <string name="publish_on">Publicera den: %s</string>
+    <string name="schedule_for">Schemalägg till: %s</string>
+    <string name="published_on">Publicerat: %s</string>
+    <string name="scheduled_for">Schemalagt för: %s</string>
+    <string name="stats_detail_recent_weeks">Senaste veckorna</string>
+    <string name="stats_detail_average_views_per_day">Snitt visningar/dag</string>
+    <string name="stats_months_and_years_views_label">Visningar</string>
+    <string name="stats_months_and_years_period_label">Period</string>
+    <string name="stats_detail_months_and_years">Månader och år</string>
+    <string name="stats_insights_load_more">Hämta mer</string>
     <string name="stats_insights_today_stats">Idag</string>
-    <string name="app_rating_message">Kul att se dig igen! Om du gillar appen vore det härligt om du kunde betygsätta den i Google Play-butiken.</string>
-    <string name="app_rating_rate_now">Betygsätt nu</string>
-    <string name="app_rating_rate_later">Senare</string>
+    <string name="stats_insights_best_hour">Bästa timme</string>
+    <string name="stats_insights_best_day">Bästa dag</string>
+    <string name="showing_stats_for">Visar statistik för:</string>
     <string name="app_rating_rate_never">Nej tack</string>
-    <string name="stats_fewer_posts">Färre inlägg</string>
-    <string name="stats_more_posts">Fler inlägg</string>
-    <string name="stats_site_not_loaded_yet">Webbplatsen har inte laddats klart</string>
-    <string name="stats_insights_posting_activity">Publiceringsaktivitet</string>
-    <string name="editor_post_converted_back_to_draft">Inlägget har konverterats tillbaka till ett utkast</string>
+    <string name="app_rating_rate_later">Senare</string>
+    <string name="app_rating_rate_now">Betygsätt nu</string>
+    <string name="app_rating_message">Kul att se dig igen! Om du gillar appen vore det härligt om du kunde betygsätta den i Google Play-butiken.</string>
     <string name="app_rating_title">Gillar du WordPress?</string>
+    <string name="editor_post_converted_back_to_draft">Inlägget har konverterats tillbaka till ett utkast</string>
+    <string name="stats_insights_posting_activity">Publiceringsaktivitet</string>
+    <string name="stats_site_not_loaded_yet">Webbplatsen har inte laddats klart</string>
+    <string name="stats_more_posts">Fler inlägg</string>
+    <string name="stats_fewer_posts">Färre inlägg</string>
     <string name="new_site_creation_preview_back_pressed_warning">Du riskerar att förlora det du hunnit göra. Är du säker på att du vill avbryta?</string>
     <string name="plans_loading_error_with_cache_button">Visa ändå paketen</string>
     <string name="plans_loading_error_with_cache_subtitle">Man behöver ha en internetanslutning för att se paketen. Därför är det möjligt att uppgifterna är föråldrade.</string>
     <string name="plans_loading_error_no_cache_subtitle">Man behöver vara uppkopplad till internet för att se paketen.</string>
     <string name="plans_loading_error_no_plans_subtitle">Det går inte att läsa in paketen just nu. Försök igen senare.</string>
-    <string name="plans_loading_error_network_title">Ingen anslutning</string>
-    <string name="site_settings_gutenberg_default_for_new_posts">Använd blockredigerare</string>
-    <string name="site_settings_gutenberg_default_for_new_posts_summary">Redigera nya inlägg och sidor med blockredigeraren</string>
     <string name="plans_loading_error_no_plans_title">Kan inte läsa in paketen</string>
+    <string name="plans_loading_error_network_title">Ingen anslutning</string>
     <string name="menu_switch_to_gutenberg_editor">Växla till blockredigeraren</string>
-    <string name="menu_switch_to_aztec_editor">Växla till den klassiska redigeraren</string>
     <string name="stats_loading_block_error">Ett problem inträffade när dina uppgifter skulle läsas in. Ladda om sidan för att försöka en gång till.</string>
     <string name="stats_loading_error">Uppgifterna kunde inte läsas in</string>
-    <string name="dialog_gutenberg_informative_title">Blockredigerare aktiverad</string>
+    <string name="site_settings_gutenberg_default_for_new_posts_summary">Redigera nya inlägg och sidor med blockredigeraren</string>
+    <string name="site_settings_gutenberg_default_for_new_posts">Använd blockredigerare</string>
     <string name="exit">avbryt</string>
     <string name="quick_start_sites_type_subtitle">%1$d av %2$d klart</string>
     <string name="quick_start_sites_type_grow">Vidga din läsekrets</string>
@@ -872,25 +1237,18 @@ Language: sv_SE
     <string name="quick_start_dialog_upload_icon_title">Ladda upp en webbplats-ikon</string>
     <string name="quick_start_dialog_upload_icon_message">Dina besökare kommer att se din ikon i sin webbläsare. Lägg till en anpassad ikon för att skapa ett finputsat och professionellt utseende. </string>
     <string name="quick_start_dialog_explore_plans_message_short">Tryck på %1$spaket%2$s för att se ditt nuvarande paket och andra paket du kan välja</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tryck på %1$sskapa sida%2$s för att lägga till en ny sida.</string>
     <string name="quick_start_dialog_check_stats_message_short">Tryck på %1$sstatistik%2$s för att kolla hur det går för din webbplats.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Tryck på %1$sdin webbplats-ikon%2$s för att ladda upp en ny</string>
     <string name="quick_start_dialog_publish_post_message">Skriv och publicera ditt första inlägg.</string>
     <string name="quick_start_dialog_need_help_message">Vi hjälper dig att gå igenom grunderna för hur du bygger din webbplats och får den att växa.</string>
     <string name="quick_start_dialog_migration_title">Vi har gjort några ändringar i din checklista.</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Tryck på %1$ssidor%2$s för att fortsätta.</string>
     <string name="quick_start_dialog_migration_message">Vi har lagt till nya åtgärder för att hjälpa dig vidga din läsekrets.</string>
     <string name="quick_start_dialog_explore_plans_title">Undersök olika paket</string>
     <string name="quick_start_dialog_explore_plans_message">Läs om verktygen för marknadsföring och sökoptimering i våra betalda paket.</string>
     <string name="quick_start_dialog_enable_sharing_title">Aktivera delning av inlägg</string>
     <string name="quick_start_dialog_enable_sharing_message">Dela automatiskt dina nya inlägg i dina olika konton i sociala media.</string>
-    <string name="quick_start_dialog_customize_site_message">Finjustera typsnitt, lägg till bilder m.m.</string>
-    <string name="quick_start_dialog_create_page_title">Skapa en ny sida</string>
-    <string name="quick_start_dialog_create_page_message">Lägg till en sida med viktig information – sidan ”Om oss”  är en utmärkt början.</string>
     <string name="quick_start_dialog_check_stats_title">Kontrollera statistiken för din webbplats</string>
     <string name="quick_start_dialog_check_stats_message">Håll dig informerad om hur det går för din webbplats.</string>
-    <string name="quick_start_dialog_browse_themes_title">Leta bland teman</string>
-    <string name="quick_start_dialog_browse_themes_message">Utforska dussintal layoutalternativ för att hitta det som passar dig perfekt.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Om du tar bort resten av stegen kommer detta att dölja alla informativa rundvandringar på denna webbplats. Denna åtgärd går inte att ångra.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Ta bort resten av stegen</string>
     <string name="quick_start_remove_next_steps_menu_title">Ta bort detta</string>
@@ -914,15 +1272,11 @@ Language: sv_SE
     <string name="notification_new_site_creation_failed">Ett problem har inträffat</string>
     <string name="notification_new_site_creation_title">Skapa webbplats</string>
     <string name="new_site_creation_create_site_button">Skapa webbplats</string>
-    <string name="new_site_creation_search_domain_input_hint">Sök domäner</string>
     <string name="new_site_creation_domain_header_subtitle">Det är där andra människor hittar dig på internet.</string>
-    <string name="new_site_creation_domain_header_title">Välj ett domännamn för din webbplats</string>
     <string name="new_site_creation_empty_domain_list_message">Det inns ingen adress som matchar din sökning</string>
     <string name="site_creation_error_generic_subtitle">Kommunikationen med servern fungerar inte. Försök igen</string>
     <string name="site_creation_error_generic_title">Ett fel har inträffat</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Ett fel har inträffat</string>
-    <string name="site_creation_segments_subtitle">Detta hjälper oss att ge dig rekommentationer. Men du är aldrig låst till detta – alla webbplatser fortsätter att utvecklas!</string>
-    <string name="site_creation_segments_title">Berätta vilken typ av webbplats du vill skapa</string>
     <string name="new_site_creation_preview_title">Din webbplats har skapats!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d av %2$d</string>
     <string name="new_site_creation_screen_title_general">Skapa webbplats</string>
@@ -932,9 +1286,9 @@ Language: sv_SE
     <string name="preference_crash_reports_summary">Tillåt automatiska automatiska kraschrapporter för att hjälpa oss förbättra appens prestanda.</string>
     <string name="preference_crash_reports">Kraschrapporter</string>
     <string name="snackbar_conflict_undo">Ångra</string>
+    <string name="snackbar_conflict_web_version_discarded">Versionen på webben har kastats</string>
     <string name="snackbar_conflict_local_version_discarded">Den lokala versionen har kastats</string>
     <string name="toast_conflict_updating_post">Inlägget uppdateras</string>
-    <string name="snackbar_conflict_web_version_discarded">Versionen på webben har kastats</string>
     <string name="dialog_confirm_load_remote_post_discard_web">Kasta webbversionen</string>
     <string name="dialog_confirm_load_remote_post_discard_local">Kasta den lokala</string>
     <string name="dialog_confirm_load_remote_post_body_2">Lokal version\nSparades %s\n\nWebbversion\nSparades %s\n</string>
@@ -943,85 +1297,85 @@ Language: sv_SE
     <string name="stats_no_data_for_period">Inga uppgifter för denna tidsperiod</string>
     <string name="preference_strip_image_location">Avlägsna position från media</string>
     <string name="stats_cannot_be_started">Just nu går det inte att öppna statistiken. Försök igen senare</string>
+    <string name="gif_picker_endless_scroll_network_error">Vissa mediefiler kunde inte laddas på grund av nätverksproblem.</string>
     <string name="gif_picker_empty_search_list">Inga media matchar din sökning</string>
+    <string name="gif_picker_initial_empty_text">Leta efter GIF-filer du kan lägga till i ditt mediebibliotek!</string>
+    <string name="stats_author_views_label">Visningar</string>
     <string name="stats_author_label">Författare</string>
     <string name="stats_authors">Författare</string>
+    <string name="stats_search_terms_views_label">Visningar</string>
+    <string name="stats_search_terms_label">Sökterm</string>
+    <string name="stats_search_terms">Söktermer</string>
+    <string name="stats_videos_views_label">Visningar</string>
+    <string name="stats_videos_title_label">Rubrik</string>
+    <string name="stats_videos">Videoklipp</string>
+    <string name="stats_country_views_label">Visningar</string>
     <string name="stats_country_label">Land</string>
     <string name="stats_countries">Länder</string>
+    <string name="stats_clicks_label">Klick</string>
+    <string name="stats_clicks_link_label">Länk</string>
+    <string name="stats_clicks">Klick</string>
+    <string name="stats_referrer_views_label">Visningar</string>
+    <string name="stats_referrer_label">Inlänkande webbplats</string>
+    <string name="stats_referrers">Inlänkande webbplatser</string>
+    <string name="stats_posts_and_pages">Inlägg och sidor</string>
+    <string name="stats_insights_path">Sökväg</string>
     <string name="stats_insights_linkedin">LinkedIn</string>
     <string name="stats_insights_google_plus">Google+</string>
     <string name="stats_insights_tumblr">Tumblr</string>
     <string name="stats_insights_twitter">Twitter</string>
     <string name="stats_insights_facebook">Facebook</string>
-    <string name="stats_insights_create_post">Skapa inlägg</string>
-    <string name="stats_insights_share_post">Dela inlägg</string>
-    <string name="stats_clicks_link_label">Länk</string>
-    <string name="stats_posts_and_pages">Inlägg och sidor</string>
-    <string name="stats_insights_path">Sökväg</string>
-    <string name="stats_videos">Videoklipp</string>
-    <string name="stats_search_terms">Söktermer</string>
-    <string name="stats_search_terms_label">Sökterm</string>
     <string name="stats_insights_view_more">Visa mer</string>
-    <string name="stats_referrers">Inlänkande webbplatser</string>
-    <string name="stats_referrer_label">Inlänkande webbplats</string>
-    <string name="stats_referrer_views_label">Visningar</string>
-    <string name="stats_clicks">Klick</string>
-    <string name="stats_clicks_label">Klick</string>
-    <string name="stats_country_views_label">Visningar</string>
-    <string name="stats_videos_title_label">Rubrik</string>
-    <string name="stats_videos_views_label">Visningar</string>
-    <string name="stats_search_terms_views_label">Visningar</string>
-    <string name="stats_author_views_label">Visningar</string>
-    <string name="gif_picker_initial_empty_text">Leta efter GIF-filer du kan lägga till i ditt mediebibliotek!</string>
-    <string name="gif_picker_endless_scroll_network_error">Vissa mediefiler kunde inte laddas på grund av nätverksproblem.</string>
+    <string name="stats_insights_share_post">Dela inlägg</string>
+    <string name="stats_insights_create_post">Skapa inlägg</string>
     <string name="stats_insights_latest_post_message">Nu har det gått %1$s sedan ”%2$s” publicerades. Så här har det gått hittills för inlägget:</string>
-    <string name="stats_insights_tags_and_categories">Etiketter och kategorier</string>
-    <string name="stats_insights_latest_post_empty">Du har inte publicerat några inlägg än. När du börjar publicera kommer en sammanfattning för ditt senaste inlägg att visas här:</string>
     <string name="stats_insights_latest_post_with_no_engagement">Nu har det gått %1$s sedan ”%2$s” publicerades. Sätt bollen i rullning och skaffa fler visningar genom att dela ditt inlägg:</string>
+    <string name="stats_insights_latest_post_empty">Du har inte publicerat några inlägg än. När du börjar publicera kommer en sammanfattning för ditt senaste inlägg att visas här:</string>
+    <string name="stats_insights_tags_and_categories">Etiketter och kategorier</string>
     <string name="stats_insights_all_time_stats">Sedan starten</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">Följare</string>
     <string name="stats_publicize_service_label">Tjänst</string>
     <string name="stats_category_folded_name">%1$s | %2$s</string>
+    <string name="stats_tags_and_categories_views_label">Visningar</string>
     <string name="stats_tags_and_categories_title_label">Rubrik</string>
+    <string name="stats_posts_and_pages_views_label">Visningar</string>
+    <string name="stats_posts_and_pages_title_label">Rubrik</string>
+    <string name="stats_comments_label">Kommentarer</string>
+    <string name="stats_comments_title_label">Rubrik</string>
     <string name="stats_comments_author_label">Författare</string>
     <string name="stats_comments_posts_and_pages">Inlägg och sidor</string>
     <string name="stats_comments_authors">Författare</string>
+    <string name="stats_follower_since_label">Sedan</string>
     <string name="stats_follower_label">Följare</string>
+    <string name="stats_followers_count_message">Totalt antal följare för ”%1$s”: %2$s</string>
     <string name="stats_followers_email">E-post</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="stats_follower_since_label">Sedan</string>
-    <string name="stats_comments_title_label">Rubrik</string>
-    <string name="stats_comments_label">Kommentarer</string>
-    <string name="stats_posts_and_pages_title_label">Rubrik</string>
-    <string name="stats_posts_and_pages_views_label">Visningar</string>
-    <string name="stats_tags_and_categories_views_label">Visningar</string>
-    <string name="stats_followers_count_message">Totalt antal följare för ”%1$s”: %2$s</string>
     <string name="stats_manage_insights">Hantera Insikter</string>
-    <string name="stats_no_data_yet">Inga data insamlade än</string>
     <string name="stats_empty_insights_title">Inga insikter har lagts till än</string>
+    <string name="stats_no_data_yet">Inga data insamlade än</string>
     <string name="menu_debug">Felsökningsmeny</string>
     <string name="change_password_dialog_message">Ändrar lösenord…</string>
-    <string name="change_password">Ändra lösenord</string>
-    <string name="change_password_confirmation">Lösenordet ändrat</string>
     <string name="change_password_dialog_hint">Ditt lösenord bör innehålla minst sex tecken. Du kan göra det starkare genom att använda både stora och små bokstäver, siffror och olika symboler, såsom ! \" ? $ % ^ &amp; ).</string>
+    <string name="change_password_confirmation">Lösenordet ändrat</string>
+    <string name="change_password">Ändra lösenord</string>
     <string name="support_identity_input_dialog_name_label">Namn</string>
     <string name="history_no_title">(ingen rubrik)</string>
-    <string name="history_preview_visual">Visuell förhandsgranskning</string>
     <string name="history_preview_html">HTML-förhandsvisning</string>
-    <string name="history_detail_button_next">Nästa</string>
-    <string name="history_detail_button_previous">Föregående</string>
+    <string name="history_preview_visual">Visuell förhandsgranskning</string>
     <string name="history_detail_title">Version</string>
+    <string name="history_detail_button_previous">Föregående</string>
+    <string name="history_detail_button_next">Nästa</string>
     <string name="media_space_used">%1$s används</string>
-    <string name="history_empty_subtitle_page">När du ändrar din sida kommer historiken att visas här</string>
-    <string name="history_empty_subtitle_post">När du ändrar ditt inlägg kommer historiken att visas här</string>
-    <string name="history_empty_title">Ingen historik har sparats ännu</string>
+    <string name="enter_wpcom_or_jetpack_site">Ange en webbplats som ligger på WordPress.com eller en WordPress-webbplats på egen server som är ansluten till Jetpack</string>
+    <string name="history_loading_revision">Läser in version</string>
+    <string name="history_loaded_revision">Versionen har lästs in</string>
+    <string name="history_load_dialog_button_positive">Läs in</string>
     <string name="history_footer_post">Inlägget skapades den %1$s kl. %2$s</string>
     <string name="history_footer_page">Sidan skapades den %1$s kl. %2$s</string>
-    <string name="history_load_dialog_button_positive">Läs in</string>
-    <string name="history_loaded_revision">Versionen har lästs in</string>
-    <string name="history_loading_revision">Läser in version</string>
-    <string name="enter_wpcom_or_jetpack_site">Ange en webbplats som ligger på WordPress.com eller en WordPress-webbplats på egen server som är ansluten till Jetpack</string>
+    <string name="history_empty_title">Ingen historik har sparats ännu</string>
+    <string name="history_empty_subtitle_post">När du ändrar ditt inlägg kommer historiken att visas här</string>
+    <string name="history_empty_subtitle_page">När du ändrar din sida kommer historiken att visas här</string>
     <string name="description_user">Användarens profilbild</string>
     <string name="image_size_full_label">Full storlek</string>
     <string name="image_size_large_label">Stor</string>
@@ -1030,134 +1384,126 @@ Language: sv_SE
     <string name="menu_history">Historik</string>
     <string name="pages_open_page_error">Den valda sidan är inte tillgänglig</string>
     <string name="pages_pending">Inväntar granskning</string>
-    <string name="pages_move_to_draft">Lägg i utkast</string>
-    <string name="pages_move_to_trash">Lägg i papperskorgen</string>
-    <string name="pages_delete_permanently">Radera permanent</string>
-    <string name="pages_empty_search_result">Ingen sida matchar din sökning</string>
-    <string name="pages_search_suggestion">Sök sidor</string>
-    <string name="pages_empty_published">Du har inte publicerat några sidor ännu</string>
-    <string name="pages_empty_drafts">Du har inga utkast till sidor</string>
-    <string name="pages_empty_scheduled">Du har inte några schemalagda sidor</string>
     <string name="pages_empty_trashed">Du har inga sidor i papperskorgen</string>
-    <string name="login_error_sms_throttled">Vi har gjort för många försök att leverera en verifieringskod via SMS – Vänta lite och be om en ny om en minut.</string>
-    <string name="pages_published">Publicerade</string>
-    <string name="pages_drafts">Utkast</string>
-    <string name="pages_scheduled">Schemalagda</string>
-    <string name="pages_trashed">I papperskorgen</string>
-    <string name="pages_view">Visa</string>
+    <string name="pages_empty_scheduled">Du har inte några schemalagda sidor</string>
+    <string name="pages_empty_drafts">Du har inga utkast till sidor</string>
+    <string name="pages_empty_published">Du har inte publicerat några sidor ännu</string>
+    <string name="pages_search_suggestion">Sök sidor</string>
+    <string name="pages_empty_search_result">Ingen sida matchar din sökning</string>
+    <string name="pages_delete_permanently">Radera permanent</string>
+    <string name="pages_move_to_trash">Lägg i papperskorgen</string>
+    <string name="pages_move_to_draft">Lägg i utkast</string>
     <string name="pages_set_parent">Ange överordnad</string>
-    <string name="page_parent_changed">Överordnad sida har uppdaterats</string>
-    <string name="reader_empty_followed_blogs_search_title">Inga webbplatser motsvarar din sökning</string>
-    <string name="site_picker_remove_site_empty">Inga webbplatser motsvarar din sökning</string>
+    <string name="pages_view">Visa</string>
+    <string name="pages_trashed">I papperskorgen</string>
+    <string name="pages_scheduled">Schemalagda</string>
+    <string name="pages_drafts">Utkast</string>
+    <string name="pages_published">Publicerade</string>
+    <string name="login_error_sms_throttled">Vi har gjort för många försök att leverera en verifieringskod via SMS – Vänta lite och be om en ny om en minut.</string>
     <string name="login_error_email_not_found_v2">Det finns inget WordPress.com-konto som stämmer mot detta Google-konto.</string>
-    <string name="set_parent">Ange överordnad</string>
-    <string name="page_delete_error">Det gick inte att radera sidan</string>
-    <string name="page_status_change_error">Det gick inte att ändra sidans status</string>
-    <string name="page_parent_change_error">Det gick inte att ändra den överordnade sidan</string>
-    <string name="page_delete_dialog_message">Är du säker på att du vill radera sidan %s?</string>
-    <string name="top_level">Översta nivån</string>
-    <string name="page_moved_to_draft">Sidan har flyttats till utkast</string>
-    <string name="page_moved_to_trash">Sidan har lagts i papperskorgen</string>
-    <string name="page_moved_to_published">Sidan har publicerats</string>
-    <string name="page_moved_to_scheduled">Sidan har schemalagts</string>
+    <string name="site_picker_remove_site_empty">Inga webbplatser motsvarar din sökning</string>
+    <string name="reader_empty_followed_blogs_search_title">Inga webbplatser motsvarar din sökning</string>
+    <string name="page_parent_changed">Överordnad sida har uppdaterats</string>
     <string name="page_permanently_deleted">Sidan har raderats permanent</string>
+    <string name="page_moved_to_scheduled">Sidan har schemalagts</string>
+    <string name="page_moved_to_published">Sidan har publicerats</string>
+    <string name="page_moved_to_trash">Sidan har lagts i papperskorgen</string>
+    <string name="page_moved_to_draft">Sidan har flyttats till utkast</string>
+    <string name="top_level">Översta nivån</string>
+    <string name="page_delete_dialog_message">Är du säker på att du vill radera sidan %s?</string>
+    <string name="page_parent_change_error">Det gick inte att ändra den överordnade sidan</string>
+    <string name="page_status_change_error">Det gick inte att ändra sidans status</string>
+    <string name="page_delete_error">Det gick inte att radera sidan</string>
+    <string name="set_parent">Ange överordnad</string>
     <string name="quick_start_focus_point_description">tryck här</string>
     <string name="quick_start_list_create_site_title">Skapa din webbplats</string>
     <string name="quick_start_list_create_site_subtitle">Kom igång med din webbplats.</string>
-    <string name="quick_start_dialog_share_site_message">Anslut till dina konton på sociala medier – din webbplats kommer automatiskt att dela nya inlägg.</string>
-    <string name="quick_start_dialog_share_site_title">Dela din webbplats</string>
     <string name="quick_start_dialog_view_site_title">Visa din webbplats</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_connections">Tryck på %1$skopplingar%2$s för att lägga till dina konton i sociala media</string>
-    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Tryck på %1$sdelning%2$s för att fortsätta</string>
     <string name="quick_start_dialog_view_site_message_short">Tryck på %1$s Visa webbplats %2$s för att förhandsvisa din webbplats</string>
+    <string name="quick_start_dialog_share_site_title">Dela din webbplats</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_sharing">Tryck på %1$sdelning%2$s för att fortsätta</string>
+    <string name="quick_start_dialog_enable_sharing_message_short_connections">Tryck på %1$skopplingar%2$s för att lägga till dina konton i sociala media</string>
+    <string name="quick_start_dialog_share_site_message">Anslut till dina konton på sociala medier – din webbplats kommer automatiskt att dela nya inlägg.</string>
     <string name="quick_start_dialog_publish_post_title">Publicera ett inlägg</string>
+    <string name="quick_start_dialog_publish_post_message_short">Tryck på %1$s Skapa ett inlägg %2$s för att skapa ett nytt inlägg</string>
     <string name="quick_start_dialog_need_help_title">Vill du ha lite hjälp att komma igång?</string>
     <string name="quick_start_dialog_need_help_button_positive">Ja</string>
-    <string name="quick_start_dialog_publish_post_message_short">Tryck på %1$s Skapa ett inlägg %2$s för att skapa ett nytt inlägg</string>
     <string name="quick_start_dialog_need_help_button_neutral">Aldrig</string>
     <string name="quick_start_dialog_need_help_button_negative">Nej</string>
     <string name="quick_start_dialog_follow_sites_title">Följ andra webbplatser</string>
-    <string name="quick_start_dialog_customize_site_title">Anpassa din webbplats</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tryck på %1$s Sök %2$s för att leta efter webbplatser med liknande intressen</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tryck på %1$s Sök %2$s för att leta efter webbplatser kring liknande ämnen</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Tryck på %1$s Läsaren %2$s för att fortsätta</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Tryck på %1$s Teman %2$s för att fortsätta</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tryck på %1$s Anpassa %2$s för att börja anpassa din webbplats</string>
     <string name="quick_start_dialog_follow_sites_message">Hitta webbplatser som inspirerar dig och följ dem för att få uppdateringar när de publicerar.</string>
-    <string name="quick_start_button_negative">Inte nu</string>
-    <string name="quick_start_button_negative_short">Avbryt</string>
-    <string name="quick_start_dialog_choose_theme_title">Välj ett tema</string>
-    <string name="my_site_create_new_site_title">Du har inga webbplatser</string>
-    <string name="quick_start_dialog_choose_theme_message">Bläddra bland alla teman för att hitta det som passar dig perfekt.</string>
     <string name="quick_start_button_positive">Kör</string>
+    <string name="quick_start_button_negative_short">Avbryt</string>
+    <string name="quick_start_button_negative">Inte nu</string>
     <string name="content_description_more">Mera</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Tryck på %1$steman%2$s för att upptäcka nya teman</string>
+    <string name="my_site_create_new_site_title">Du har inga webbplatser</string>
     <string name="reader_empty_followed_tags_title">Inga följda ämnen</string>
     <string name="reader_empty_followed_tags_subtitle">Lägg till ämnen här för att hitta inlägg om dina favoritämnen</string>
-    <string name="jetpack">Jetpack</string>
-    <string name="install_jetpack">Installera Jetpack</string>
-    <string name="jetpack_installed">Jetpack installerat</string>
-    <string name="jetpack_installation_problem">Det var ett problem</string>
-    <string name="install_jetpack_retry">Försök igen</string>
     <string name="login_to_to_connect_jetpack">Logga in på WordPress.com-kontot du använde för att ansluta Jetpack.</string>
-    <string name="installing_jetpack">Installerar Jetpack</string>
-    <string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
+    <string name="install_jetpack_retry">Försök igen</string>
+    <string name="install_jetpack_continue">Konfigurera</string>
     <string name="jetpack_installation_problem_message">Jetpack kunde inte installeras just nu.</string>
+    <string name="jetpack_installation_problem">Det var ett problem</string>
+    <string name="jetpack_installed">Jetpack installerat</string>
     <string name="installing_jetpack_message">Installerar Jetpack på din webbplats. Detta kan ta några minuter att slutföra.</string>
+    <string name="installing_jetpack">Installerar Jetpack</string>
     <string name="install_jetpack_message">Dina webbplatsuppgifter kommer inte att lagras och används endast för att installera Jetpack.</string>
-    <string name="install_jetpack_continue">Konfigurera</string>
+    <string name="install_jetpack">Installera Jetpack</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">Jetpack FAQ</string>
     <string name="stats_jetpack_connection_setup_info">För att använda statistik på din WordPress-webbplats måste du installera tillägget Jetpack.</string>
     <string name="themes_empty_list">Inga teman matchar din sökning</string>
     <string name="reader_label_post_search_explainer">Vad vill du hitta?</string>
     <string name="site_settings_tags_empty_title_search">Inga etiketter matchar din sökning</string>
     <string name="site_settings_tags_empty_title">Du har inga etiketter</string>
+    <string name="site_settings_tags_empty_subtitle">Lägg till dina vanligaste etiketter här, så att du snabbt kan välja dem för att märka dina inlägg</string>
     <string name="site_settings_tags_empty_button">Skapa en etikett</string>
     <string name="media_empty_search_list">Inga media matchar din sökning</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">Logga ut från WordPress?</string>
-    <string name="site_settings_tags_empty_subtitle">Lägg till dina vanligaste etiketter här, så att du snabbt kan välja dem för att märka dina inlägg</string>
     <string name="sign_out_wpcom_confirm_with_changes">Du har gjort ändringar i inlägg som ännu inte är uppladdade till webbplatsen. Om du loggar ut nu kommer dessa ändringar tas bort från din enhet. Logga ut ändå?</string>
-    <string name="reader_empty_posts_liked_description">Inlägg som du gillar kommer att visas här</string>
+    <string name="people_empty_list_filtered_viewers">Inga besökare än</string>
+    <string name="people_empty_list_filtered_email_followers">Inga e-postföljare än</string>
     <string name="people_empty_list_filtered_followers">Inga följare än</string>
     <string name="people_empty_list_filtered_users">Inga användare än</string>
-    <string name="people_empty_list_filtered_email_followers">Inga e-postföljare än</string>
-    <string name="people_empty_list_filtered_viewers">Inga besökare än</string>
-    <string name="reader_empty_followed_blogs_title">Inga följda webbplatser</string>
-    <string name="reader_empty_followed_blogs_button_discover">Hitta webbplatser</string>
-    <string name="reader_empty_followed_blogs_button_followed">Gå till följda webbplatser</string>
+    <string name="reader_empty_posts_liked_description">Inlägg som du gillar kommer att visas här</string>
     <string name="reader_empty_posts_liked_title">Ingenting gillat än</string>
-    <string name="activity_log_limited_content_on_free_plan">Eftersom du har ett gratispaket visar din aktivitetslogg begränsade händelser.</string>
-    <string name="notifications_empty_followers">Inga följare än</string>
+    <string name="reader_empty_followed_blogs_button_followed">Gå till följda webbplatser</string>
+    <string name="reader_empty_followed_blogs_button_discover">Hitta webbplatser</string>
+    <string name="reader_empty_followed_blogs_title">Inga följda webbplatser</string>
     <string name="notifications_empty_likes">Inga gillamarkeringar än</string>
-    <string name="activity_log_empty_title">Ingen aktivitet än</string>
+    <string name="notifications_empty_followers">Inga följare än</string>
+    <string name="activity_log_limited_content_on_free_plan">Eftersom du har ett gratispaket visar din aktivitetslogg begränsade händelser.</string>
     <string name="activity_log_empty_subtitle">När du ändrar saker på din webbplats kommer du att kunna se din aktivitetshistoria här</string>
-    <string name="media_empty_list">Du har inga mediafiler</string>
-    <string name="media_empty_upload_media">Ladda upp mediafil</string>
-    <string name="pages_empty_list_button">Skapa en sida</string>
+    <string name="activity_log_empty_title">Ingen aktivitet än</string>
     <string name="posts_empty_list_button">Skapa ett inlägg</string>
+    <string name="pages_empty_list_button">Skapa en sida</string>
+    <string name="media_empty_upload_media">Ladda upp mediafil</string>
+    <string name="media_empty_list">Du har inga mediafiler</string>
     <string name="reader_gallery_images_desc">bildgalleri</string>
     <string name="blavatar_desc">webbplats-ikon</string>
     <string name="theme_image_desc">tema-bild</string>
     <string name="featured_image_desc">utvald bild</string>
     <string name="button_discard">Kasta</string>
     <string name="reader_avatar_desc">Profilbild</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Återställning pågår</string>
-    <string name="activity_log_rewind_site">Återställ webbplats</string>
-    <string name="my_tickets">Mina ärenden</string>
-    <string name="application_log_button">Logg för applikationen</string>
-    <string name="support_contact_email">E-postadress för kontakt</string>
-    <string name="support_contact_email_not_set">Inte angivet</string>
-    <string name="support_push_notification_title">WordPress</string>
-    <string name="support_push_notification_message">Nytt meddelande från ”Hjälp och support”</string>
-    <string name="support_identity_input_dialog_enter_email_and_name">Ange din e-postadress och ditt namn för att fortsätta</string>
-    <string name="support_identity_input_dialog_enter_email">Ange din e-postadress</string>
-    <string name="support_identity_input_dialog_email_label">E-post</string>
     <string name="notification_channel_transient_title">Tillfälligt</string>
+    <string name="support_identity_input_dialog_email_label">E-post</string>
+    <string name="support_identity_input_dialog_enter_email">Ange din e-postadress</string>
+    <string name="support_identity_input_dialog_enter_email_and_name">Ange din e-postadress och ditt namn för att fortsätta</string>
+    <string name="support_push_notification_message">Nytt meddelande från ”Hjälp och support”</string>
+    <string name="support_push_notification_title">WordPress</string>
+    <string name="support_contact_email_not_set">Inte angivet</string>
+    <string name="support_contact_email">E-postadress för kontakt</string>
+    <string name="application_log_button">Logg för applikationen</string>
+    <string name="my_tickets">Mina ärenden</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Återställning pågår</string>
     <string name="activity_log_currently_restoring_message">Återställer till %1$s %2$s</string>
-    <string name="activity_log_rewind_dialog_message">Är du säker på att du vill återställa din webbplats till %1$s kl. %2$s? Detta kommer att avlägsna innehåll och inställningar som skapats eller ändrats sedan dess.</string>
-    <string name="activity_log_button">Åtgärdsknapp för akitivitetslogg</string>
-    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Din webbplats har återställts</string>
     <string name="activity_log_currently_restoring_title">Din webbplats återställs just nu</string>
-    <string name="activity_log_rewind_started_snackbar_message">Din webbplats håller på att återställas\nBackar till %1$s %2$s</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Din webbplats har återställts\nBackat till %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Din webbplats har återställts</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Din webbplats har återställts\nÅterställd till %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">Din webbplats håller på att återställas\nÅterställer till %1$s %2$s</string>
+    <string name="activity_log_button">Åtgärdsknapp för akitivitetslogg</string>
     <string name="plugin_auto_managed">Automatiskt hanterad</string>
     <string name="reader_save_posts_locally_dialog_message">Spara detta inlägg och läs det senare, närhelst det passar dig. Det kommer endast att vara tillgängligt på denna enhet – sparade inlägg synkroniseras inte till dina andra enheter.</string>
     <string name="reader_save_posts_locally_dialog_title">Spara inlägg till senare</string>
@@ -1166,97 +1512,92 @@ Language: sv_SE
     <string name="comment_read_source_post">Läs käll-inlägget</string>
     <string name="sites">Webbplatser</string>
     <string name="signup_magic_link_title">Magisk länk har skickats</string>
-    <string name="signup_email_screen_title">Registrering via e-post</string>
     <string name="verification_2fa_screen_title">Bekräftelse av kod</string>
     <string name="selfhosted_site_login_title">Inloggningsuppgifter</string>
     <string name="magic_link_sent_login_title">Magisk länk har skickats</string>
     <string name="magic_link_login_title">Inloggning via magisk länk</string>
     <string name="site_address_login_title">Webbplatsens inloggningsadress</string>
     <string name="email_address_login_title">E-postadress för inloggning</string>
-    <string name="alternatively">Alternativt:</string>
     <string name="reader_empty_saved_posts_description">Knacka på %s för att spara ett inlägg till din lista.</string>
+    <string name="reader_empty_saved_posts_title">Inga inlägg sparade – ännu!</string>
     <string name="reader_bookmark_snack_title">Inlägget sparat</string>
     <string name="reader_bookmark_snack_btn">Se alla</string>
-    <string name="reader_btn_bookmarked">Sparat</string>
-    <string name="reader_btn_bookmark">Spara</string>
     <string name="reader_remove_bookmark">Ta bort från sparade inlägg</string>
     <string name="reader_add_bookmark">Lägg till i sparade inlägg</string>
     <string name="reader_save_for_later_title">Sparade inlägg</string>
     <string name="removed">Borttaget</string>
-    <string name="reader_empty_saved_posts_title">Inga inlägg sparade – ännu!</string>
-    <string name="reader_followed_blog_notifications_action">Aktivera</string>
-    <string name="reader_followed_blog_notifications_this">denna webbplats</string>
-    <string name="my_site_icon_dialog_title">Webbplatsikon</string>
-    <string name="my_site_icon_dialog_add_message">Vill du lägga till en webbplatsikon?</string>
-    <string name="my_site_icon_dialog_change_message">Hur vill du redigera ikonen?</string>
-    <string name="my_site_icon_dialog_add_requires_permission_message">Du har inte behörighet att lägga till webbplatsikon.</string>
-    <string name="my_site_icon_dialog_change_requires_permission_message">Du har inte behörighet att redigera webbplatsikonen.</string>
-    <string name="my_site_icon_dialog_change_button">Ändra</string>
-    <string name="my_site_icon_dialog_remove_button">Ta bort</string>
-    <string name="my_site_icon_dialog_cancel_button">Avbryt</string>
     <string name="my_site_icon_content_description">Byt webbplatsikon</string>
-    <string name="preference_collect_information">Samla in information</string>
-    <string name="preference_privacy_settings">Integritetsinställningar</string>
-    <string name="cookie_policy_learn_more_header">Cookie-policy</string>
-    <string name="cookie_policy_learn_more_caption">Dela information till vårt analysverktyg om din användning av tjänster medan du är inloggad på ditt konto på WordPress.com.</string>
-    <string name="privacy_policy_learn_more_header">Integritetspolicy</string>
-    <string name="privacy_policy_learn_more_caption">Denna information hjälper oss att förbättra våra produkter, visa dig marknadsinformation som är mer relevant, anpassa din upplevelse av WordPress.com och annat som finns beskrivet i vår integritetspolicy.</string>
-    <string name="third_party_policy_learn_more_header">Policyer från tredje part</string>
-    <string name="third_party_policy_learn_more_caption">Vi använder spårningsverktyg, inklusive vissa från tredje part. Läs mer om dessa och hur du styr dem.</string>
-    <string name="privacy_policy_read">Läs integritetspolicy</string>
-    <string name="activity">Aktivitet</string>
-    <string name="activity_log">Aktivitetslogg</string>
-    <string name="activity_log_icon">Aktivitetsikon</string>
-    <string name="activity_log_event">Händelse</string>
-    <string name="rewind">Spola tillbaka</string>
-    <string name="activity_log_jetpack_icon">Jetpack-ikon</string>
-    <string name="reader_btn_notifications_off">Stäng av webbplatsaviseringar</string>
-    <string name="reader_btn_notifications_on">Slå på webbplatsaviseringar</string>
+    <string name="my_site_icon_dialog_cancel_button">Avbryt</string>
+    <string name="my_site_icon_dialog_remove_button">Ta bort</string>
+    <string name="my_site_icon_dialog_change_button">Ändra</string>
+    <string name="my_site_icon_dialog_change_requires_permission_message">Du har inte behörighet att redigera webbplatsikonen.</string>
+    <string name="my_site_icon_dialog_add_requires_permission_message">Du har inte behörighet att lägga till webbplatsikon.</string>
+    <string name="my_site_icon_dialog_change_message">Hur vill du redigera ikonen?</string>
+    <string name="my_site_icon_dialog_add_message">Vill du lägga till en webbplatsikon?</string>
+    <string name="my_site_icon_dialog_title">Webbplatsikon</string>
+    <string name="reader_followed_blog_notifications_this">denna webbplats</string>
+    <string name="reader_followed_blog_notifications_action">Aktivera</string>
     <string name="reader_followed_blog_notifications">Aktivera aviseringar för %1$s%2$s%3$s?</string>
+    <string name="reader_btn_notifications_on">Slå på webbplatsaviseringar</string>
+    <string name="reader_btn_notifications_off">Stäng av webbplatsaviseringar</string>
+    <string name="activity_log_jetpack_icon">Jetpack-ikon</string>
+    <string name="activity_log_event">Händelse</string>
+    <string name="activity_log_icon">Aktivitetsikon</string>
+    <string name="activity_log">Aktivitetslogg</string>
+    <string name="privacy_policy_read">Läs integritetspolicy</string>
+    <string name="third_party_policy_learn_more_caption">Vi använder spårningsverktyg, inklusive vissa från tredje part. Läs mer om dessa och hur du styr dem.</string>
+    <string name="third_party_policy_learn_more_header">Policyer från tredje part</string>
+    <string name="privacy_policy_learn_more_caption">Denna information hjälper oss att förbättra våra produkter, visa dig marknadsinformation som är mer relevant, anpassa din upplevelse av WordPress.com och annat som finns beskrivet i vår integritetspolicy.</string>
+    <string name="privacy_policy_learn_more_header">Integritetspolicy</string>
+    <string name="cookie_policy_learn_more_caption">Dela information till vårt analysverktyg om din användning av tjänster medan du är inloggad på ditt konto på WordPress.com.</string>
+    <string name="cookie_policy_learn_more_header">Cookie-policy</string>
+    <string name="preference_privacy_settings">Integritetsinställningar</string>
+    <string name="preference_collect_information">Samla in information</string>
     <string name="post_submitted">Inlägget har skickats</string>
-    <string name="login_email_button_signup">Har du inget konto? %1$sRegistrera dig%2$s</string>
-    <string name="plugin_install_site_ineligible_not_domain_owner">Funktionen för tillägg kräver att domänens abonnemang är kopplat till denna användare.</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Funktionen för tillägg kräver att webbplatsen har gott anseende.</string>
-    <string name="plugin_install_site_ineligible_not_using_custom_domain">För funktionen med tillägg krävs ett anpassat domännamn.</string>
-    <string name="plugin_install_site_ineligible_no_business_plan">För funktionen med tillägg krävs ett business-konto.</string>
-    <string name="plugin_install_site_ineligible_site_private">För funktionen med tillägg krävs att webbplatsen är publik.</string>
-    <string name="plugin_install_site_ineligible_email_unverified">För funktionen med tillägg måste e-postadressen vara bekräftad.</string>
-    <string name="plugin_install_site_ineligible_excessive_disk_space">Det går inte att installera tillägget på grund av begränsat lagringsutrymme.</string>
-    <string name="plugin_install_site_ineligible_no_vip_sites">Tillägg kan inte installeras på VIP-webbplatser.</string>
+    <string name="plugin_install_site_ineligible_not_domain_owner">Funktionen för tillägg kräver att domänens abonnemang är kopplat till denna användare.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Funktionen med tillägg kräver administratörsbehörighet.</string>
+    <string name="plugin_install_site_ineligible_no_vip_sites">Tillägg kan inte installeras på VIP-webbplatser.</string>
+    <string name="plugin_install_site_ineligible_excessive_disk_space">Det går inte att installera tillägget på grund av begränsat lagringsutrymme.</string>
+    <string name="plugin_install_site_ineligible_email_unverified">För funktionen med tillägg måste e-postadressen vara bekräftad.</string>
+    <string name="plugin_install_site_ineligible_site_private">För funktionen med tillägg krävs att webbplatsen är publik.</string>
+    <string name="plugin_install_site_ineligible_no_business_plan">För funktionen med tillägg krävs ett business-konto.</string>
+    <string name="plugin_install_site_ineligible_not_using_custom_domain">För funktionen med tillägg krävs ett anpassat domännamn.</string>
     <string name="plugin_install_first_plugin_almost_finished_dialog_message">Vi genomför de sista förberedelserna – nästan klart…</string>
     <string name="plugin_install_first_plugin_progress_dialog_message">Installerar tillägget…</string>
-    <string name="plugin_install_first_plugin_confirmation_dialog_message">Installationen av det första tillägget på din webbplats kan ta upp till 1 minut. Under denna tid kan du inte ändra något på webbplatsen.</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_install_btn">Installera</string>
-    <string name="notification_settings_followed_dialog_email_posts_switch">Skicka mig nya inlägg via e-post</string>
-    <string name="notification_settings_followed_dialog_notification_posts_switch">Nya inlägg</string>
-    <string name="notification_settings_followed_dialog_email_posts_daily">Dagligen</string>
-    <string name="notification_settings_followed_dialog_email_posts_instantly">Omedelbart</string>
-    <string name="notification_settings_followed_dialog_email_posts_weekly">En gång i veckan</string>
-    <string name="notification_settings_followed_dialog_email_comments">Skicka kommentarer till mig via e-post</string>
+    <string name="plugin_install_first_plugin_confirmation_dialog_message">Installationen av det första tillägget på din webbplats kan ta upp till 1 minut. Under denna tid kan du inte ändra något på webbplatsen.</string>
     <string name="plugin_install_first_plugin_confirmation_dialog_title">Installera tillägget</string>
-    <string name="notification_settings_followed_dialog_notification_posts_description">Få aviseringar om nya inlägg från denna webbplats</string>
     <string name="notification_settings_followed_dialog_title">Aviseringar</string>
-    <string name="dialog_confirm_delete_permanently_post">Är du säker på att du vill radera detta inlägg permanent?</string>
-    <string name="comment_title">%s om %s</string>
-    <string name="content_description_people_looking_charts">Personers som studerar diagram och tabeller</string>
-    <string name="notification_settings_category_followed_sites">Följda webbplatser</string>
+    <string name="notification_settings_followed_dialog_email_comments">Skicka kommentarer till mig via e-post</string>
+    <string name="notification_settings_followed_dialog_email_posts_weekly">En gång i veckan</string>
+    <string name="notification_settings_followed_dialog_email_posts_instantly">Omedelbart</string>
+    <string name="notification_settings_followed_dialog_email_posts_daily">Dagligen</string>
+    <string name="notification_settings_followed_dialog_notification_posts_switch">Nya inlägg</string>
+    <string name="notification_settings_followed_dialog_notification_posts_description">Få aviseringar om nya inlägg från denna webbplats</string>
+    <string name="notification_settings_followed_dialog_email_posts_switch">Skicka mig nya inlägg via e-post</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">Alla webbplatser jag följer</string>
+    <string name="notification_settings_category_followed_sites">Följda webbplatser</string>
     <string name="content_description_person_reading_device_notification">Person som läser en mobil enhet med hjälp av aviseringar</string>
-    <string name="photo_picker_use_photo">Använd detta foto</string>
-    <string name="notification_channel_general_title">Allmänt</string>
+    <string name="content_description_people_looking_charts">Personers som studerar diagram och tabeller</string>
+    <string name="comment_title">%s om %s</string>
+    <string name="dialog_confirm_delete_permanently_post">Är du säker på att du vill radera detta inlägg permanent?</string>
     <string name="notification_channel_important_title">Viktigt</string>
-    <string name="add_count">Lägg till %d</string>
-    <string name="preview_count">Förhandsgranska %d</string>
-    <string name="site_settings_quota_space_unlimited">%1$s av obegränsat</string>
-    <string name="error_save_empty_draft">Kan inte spara ett tomt utkast</string>
-    <string name="photo_picker_stock_media">Välj från bibliotek med fria fotografier</string>
-    <string name="stock_media_picker_search_hint">Sök i bibliotek med fria fotografier</string>
-    <string name="stock_media_picker_initial_empty_text">Sök efter fria fotografier som du kan lägga till i ditt mediabibliotek</string>
-    <string name="stock_media_picker_initial_empty_subtext">Fotografrier från %s</string>
+    <string name="notification_channel_general_title">Allmänt</string>
+    <string name="photo_picker_use_photo">Använd detta foto</string>
     <string name="media_preview_title">%1$d av %2$d</string>
+    <string name="stock_media_picker_initial_empty_subtext">Fotografrier från %s</string>
+    <string name="stock_media_picker_initial_empty_text">Sök efter fria fotografier som du kan lägga till i ditt mediabibliotek</string>
+    <string name="stock_media_picker_search_hint">Sök i bibliotek med fria fotografier</string>
+    <string name="photo_picker_stock_media">Välj från bibliotek med fria fotografier</string>
+    <string name="error_save_empty_draft">Kan inte spara ett tomt utkast</string>
+    <string name="site_settings_quota_space_unlimited">%1$s av obegränsat</string>
+    <string name="preview_count">Förhandsgranska %d</string>
+    <string name="add_count">Lägg till %d</string>
     <string name="fab_add_tag_desc">Skapa etikett</string>
     <string name="navigate_up_desc">uppåt</string>
+    <string name="notification_settings_switch_desc">Aviseringar</string>
+    <string name="open_external_link_desc">Öppna extern länk</string>
     <string name="show_more_desc">visa mer</string>
     <string name="reader_photo_view_desc">foto</string>
     <string name="reader_list_item_suggestion_remove_desc">ta bort</string>
@@ -1269,29 +1610,27 @@ Language: sv_SE
     <string name="photo_picker_device_desc">välj från enhet</string>
     <string name="people_invite_role_info_desc">information om roll</string>
     <string name="media_settings_play">spela</string>
+    <string name="media_settings_image_preview_desc">förhandsgranskning av bild</string>
+    <string name="media_preview_desc">förhandgranskning</string>
     <string name="media_preview_audio_desc">ljudklipp</string>
     <string name="media_grid_item_play_video_desc">spela video</string>
     <string name="media_grid_item_trash_desc">släng i papperskorgen</string>
     <string name="media_grid_item_retry_desc">försök igen</string>
+    <string name="media_grid_item_image_desc">förhandsgranskning av media, filnamn %s</string>
     <string name="invite_user_delete_desc">ta bort %s</string>
     <string name="profile_picture">profilbild för %s</string>
-    <string name="signup_with_google_progress">Registrering via Google…</string>
-    <string name="media_grid_item_image_desc">förhandsgranskning av media, filnamn %s</string>
-    <string name="media_preview_desc">förhandgranskning</string>
-    <string name="media_settings_image_preview_desc">förhandsgranskning av bild</string>
     <string name="comment_checkmark_desc">förbockningsmärke</string>
-    <string name="open_external_link_desc">Öppna extern länk</string>
-    <string name="notification_settings_switch_desc">Aviseringar</string>
+    <string name="signup_with_google_progress">Registrering via Google…</string>
     <string name="jetpack_connection_failed_with_reason">Anslutningen till Jetpack fungerade inte: %s</string>
     <string name="jetpack_already_connected_toast">DU är redan ansluten till Jetpack</string>
     <string name="menu_undo_snackbar_action">ÅNGRA</string>
+    <string name="menu_visual_mode_done_snackbar">Växlat till visuellt läge</string>
     <string name="menu_visual_mode">Visuellt läge</string>
+    <string name="menu_html_mode_done_snackbar">Växlat till HTML-läge</string>
     <string name="menu_html_mode">HTML-läge</string>
     <string name="menu_preview">Förhandsgranskning</string>
     <string name="menu_save_as_draft">Spara som utkast</string>
     <string name="file_size_in_terabytes">%s TB</string>
-    <string name="menu_visual_mode_done_snackbar">Växlat till visuellt läge</string>
-    <string name="menu_html_mode_done_snackbar">Växlat till HTML-läge</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1301,123 +1640,113 @@ Language: sv_SE
     <string name="site_settings_quota_space_title">Använt utrymme</string>
     <string name="site_settings_quota_header">Media</string>
     <string name="comment_unspam_talkback">Kommentaren är markerad som ”inte skräppost”</string>
-    <string name="login_prologue_screen_title">Inloggning</string>
-    <string name="signup_epilogue_screen_title">Nytt konto</string>
-    <string name="share_intent_screen_title">Välj webbplats</string>
-    <string name="edit_photo_screen_title">Redigera foto</string>
-    <string name="comment_trash_talkback">Kommentaren har lagts i papperskorgen</string>
+    <string name="comment_spam_talkback">Kommentaren har markerats som skräppost</string>
+    <string name="comment_delete_talkback">Kommentaren har tagits bort</string>
     <string name="comment_untrash_talkback">Kommentaren har återställts</string>
-    <string name="comment_approved_talkback">Kommentaren har godkänts</string>
-    <string name="comment_unapproved_talkback">Kommentaren har avvisats</string>
-    <string name="comment_liked_talkback">Kommentaren har gillats</string>
+    <string name="comment_trash_talkback">Kommentaren har lagts i papperskorgen</string>
     <string name="comment_unliked_talkback">Kommentaren är inte längre gillad</string>
-    <string name="comment_delete_talkback">Kommentaren har tagits bort</string>
-    <string name="comment_spam_talkback">Kommentaren har markerats som skräppost</string>
+    <string name="comment_liked_talkback">Kommentaren har gillats</string>
+    <string name="comment_unapproved_talkback">Kommentaren har avvisats</string>
+    <string name="comment_approved_talkback">Kommentaren har godkänts</string>
     <string name="notif_detail_screen_title">Aviseringsinformation %s</string>
-    <string name="release_notes_screen_title">Release-uppgifter</string>
-    <string name="license_screen_title">Licens</string>
-    <string name="help_screen_title">Hjälp och support</string>
-    <string name="my_site_section_screen_title">Min webbplats</string>
-    <string name="me_section_screen_title">Jag</string>
-    <string name="reader_screen_title">Läsare</string>
-    <string name="publicize_buttons_screen_title">Delningsknappar</string>
-    <string name="media_settings_screen_title">Filinformation</string>
-    <string name="person_detail_screen_title">Personinformation</string>
+    <string name="edit_photo_screen_title">Redigera foto</string>
+    <string name="share_intent_screen_title">Välj webbplats</string>
+    <string name="signup_epilogue_screen_title">Nytt konto</string>
     <string name="login_epilogue_screen_title">Inloggad som</string>
-    <string name="notif_settings_screen_title">Aviseringsinställningar</string>
+    <string name="person_detail_screen_title">Personinformation</string>
+    <string name="media_settings_screen_title">Filinformation</string>
+    <string name="publicize_buttons_screen_title">Delningsknappar</string>
     <string name="notifications_screen_title">Aviseringar</string>
+    <string name="reader_screen_title">Läsare</string>
+    <string name="me_section_screen_title">Jag</string>
+    <string name="my_site_section_screen_title">Min webbplats</string>
+    <string name="notif_settings_screen_title">Aviseringsinställningar</string>
+    <string name="help_screen_title">Hjälp och support</string>
+    <string name="license_screen_title">Licens</string>
+    <string name="release_notes_screen_title">Release-uppgifter</string>
     <string name="signup_epilogue_error_avatar_view">Din profilbild har laddats upp och kommer snart att vara tillgänglig.</string>
-    <string name="copyright_with_year_and_company_params">© %d %s</string>
-    <string name="permissions_denied_message">Det verkar som du har stängt av behörigheterna som krävs för denna funktion.&lt;br/>&lt;br/>Redigera behörigheterna för att ändra detta och se till att &lt;strong>%s&lt;/strong> är aktiverat.</string>
+    <string name="permissions_denied_message">Det verkar som du har stängt av behörigheterna som krävs för denna funktion.&lt;br/&gt;&lt;br/&gt;Redigera behörigheterna för att ändra detta och se till att &lt;strong&gt;%s&lt;/strong&gt; är aktiverat.</string>
     <string name="permissions_denied_title">Behörigheter</string>
     <string name="plugin_caption_featured">Utvald</string>
     <string name="sharing_disabled_description">Du kan inte komma åt dina delningsinställningar eftersom modulen Sharing Jetpack är inaktiverad.</string>
-    <string name="version_with_name_param">Version %s</string>
     <string name="sharing_disabled">Delningsmodulen är inaktiverad</string>
+    <string name="version_with_name_param">Version %s</string>
+    <string name="copyright_with_year_and_company_params">© %d %s</string>
     <string name="publisher_with_company_param">Utgivare: %s</string>
     <string name="notification_sound_has_invalid_path">Ogiltig sökväg för det valda ljudet Välj en annan.</string>
     <string name="quickpress_shortcut_with_account_param">QP %s</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d sidor/inlägg och 1 fil återstår</string>
-    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d sidor och 1 fil återstår</string>
-    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d inlägg och 1 fil återstår</string>
+    <string name="uploading_subtitle_pages_posts">%1$d sidor/inlägg återstår</string>
     <string name="uploading_subtitle_pages_only_one">1 sida återstår</string>
     <string name="uploading_subtitle_pages_only_plural">%1$d sidor återstår</string>
-    <string name="uploading_subtitle_pages_posts">%1$d sidor/inlägg återstår</string>
     <string name="uploading_subtitle_posts_only_plural">%1$d inlägg återstår</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d sidor/inlägg och 1 fil återstår</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d inlägg och 1 fil återstår</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d sidor och 1 fil återstår</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_one">1 inlägg och 1 fil återstår</string>
     <string name="uploading_subtitle_mixed_page_singular_media_one">1 sida och 1 fil återstår</string>
-    <string name="uploading_subtitle_mixed_page_singular_media_plural">1 sida och %1$d av %2$d filer återstår</string>
     <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d sidor/inlägg och %2$d av %3$d filer återstår</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d inlägg och %2$d av %3$d filer återstår</string>
     <string name="uploading_subtitle_mixed_pages_plural_media_plural">%1$d sidor och %2$d av %3$d filer återstår</string>
-    <string name="uploading_subtitle_mixed_post_singular_media_one">1 inlägg och 1 fil återstår</string>
     <string name="uploading_subtitle_mixed_post_singular_media_plural">1 inlägg och %1$d av %2$d filer återstår</string>
-    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d inlägg och %2$d av %3$d filer återstår</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_plural">1 sida och %1$d av %2$d filer återstår</string>
     <string name="media_file_pages_and_posts_only_not_uploaded">%1$d sidor/inlägg laddades inte upp</string>
     <string name="media_file_pages_plural_only_not_uploaded">%1$d sidor laddades inte upp</string>
-    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">1 sida med %1$d filer laddades inte upp</string>
     <string name="media_file_page_singular_only_not_uploaded">1 sida laddades inte upp</string>
+    <string name="media_file_posts_plural_only_not_uploaded">%1$d inlägg laddades inte upp</string>
+    <string name="media_file_post_singular_only_not_uploaded">1 inlägg laddades inte upp</string>
     <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%1$d inlägg/sidor med %2$d filer laddades inte upp</string>
     <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%1$d sidor med %2$d filer laddades inte upp</string>
-    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">1 inlägg med %1$d filer laddades inte upp</string>
-    <string name="media_file_post_singular_only_not_uploaded">1 inlägg laddades inte upp</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_files_plural">1 sida med %1$d filer laddades inte upp</string>
     <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%1$d inlägg med %2$d filer laddades inte upp</string>
-    <string name="media_file_posts_plural_only_not_uploaded">%1$d inlägg laddades inte upp</string>
-    <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%f, %f</string>
-    <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 sida med 1 fil laddades inte upp</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">1 inlägg med %1$d filer laddades inte upp</string>
     <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">%1$d inlägg/sidor med 1 fil laddades inte upp</string>
     <string name="media_file_pages_plural_mixed_not_uploaded_one_file">%1$d sidor med 1 fil laddades inte upp</string>
-    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 inlägg med 1 fil laddades inte upp</string>
+    <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 sida med 1 fil laddades inte upp</string>
     <string name="media_file_posts_plural_mixed_not_uploaded_one_file">%1$d inlägg med 1 fil laddades inte upp</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 inlägg med 1 fil laddades inte upp</string>
     <string name="untitled_in_parentheses">(Namnlös)</string>
+    <string name="at_username">\@%s</string>
     <string name="site_creation_domain_finish_button">Skapa webbplats</string>
+    <string name="notification_site_creation_created">Tryck för att fortsätta.</string>
     <string name="notification_site_creation_title_success">Webbplats skapad!</string>
+    <string name="google_error_timeout">Det tog för lång tid för Google att svara. Du kan behöva vänta tills du har en stabilare internetuppkoppling.</string>
     <string name="username_changer_title">Ändra användarnamn</string>
+    <string name="username_changer_hint">Fortsätt skriva för att få fler förslag</string>
+    <string name="username_changer_header">Ditt nuvarande användarnamn är %1$s%2$s%3$s. Med få undantag kommer andra personer bara att se ditt visningsnamn, %4$s%5$s%6$s.</string>
+    <string name="username_changer_error_none">Inga användarnamn att föreslå utifrån %1$s%2$s%3$s. Skriv in några fler bokstäver eller siffror för att få förslag.</string>
+    <string name="username_changer_error_generic">Ett fel inträffade när förslag på användarnamn skulle hämtas.</string>
+    <string name="username_changer_dismiss_message">Avbryt bytet av användarnamn?</string>
+    <string name="username_changer_dismiss_button_positive">Avbryt</string>
     <string name="username_changer_action">Spara</string>
-    <string name="signup_user_exists">E-postadressen finns redan på WordPress.com.\nGår vidare till inloggning.</string>
-    <string name="signup_with_email_button">Registrering med e-postadress</string>
-    <string name="signup_with_google_button">Registrering med Google</string>
     <string name="content_description_add_avatar">Lägg till profilbild</string>
-    <string name="username_changer_dismiss_button_positive">Avbryt</string>
-    <string name="username_changer_dismiss_message">Avbryt bytet av användarnamn?</string>
-    <string name="username_changer_error_generic">Ett fel inträffade när förslag på användarnamn skulle hämtas.</string>
-    <string name="username_changer_error_none">Inga användarnamn att föreslå utifrån %1$s%2$s%3$s. Skriv in några fler bokstäver eller siffror för att få förslag.</string>
-    <string name="username_changer_header">Ditt nuvarande användarnamn är %1$s%2$s%3$s. Med få undantag kommer andra personer bara att se ditt visningsnamn, %4$s%5$s%6$s.</string>
-    <string name="username_changer_hint">Fortsätt skriva för att få fler förslag</string>
-    <string name="google_error_timeout">Det tog för lång tid för Google att svara. Du kan behöva vänta tills du har en stabilare internetuppkoppling.</string>
-    <string name="notification_site_creation_created">Tryck för att fortsätta.</string>
-    <string name="signup_magic_link_progress">Skickar e-post</string>
-    <string name="signup_terms_of_service_text">Genom att registrera dig accepterar du våra %1$sAnvändarvillkor%2$s.</string>
+    <string name="signup_user_exists">E-postadressen finns redan på WordPress.com.\nGår vidare till inloggning.</string>
     <string name="signup_updating_account">Uppdaterar kontot…</string>
+    <string name="signup_magic_link_progress">Skickar e-post</string>
+    <string name="signup_magic_link_error_button_positive">Försök igen</string>
     <string name="signup_magic_link_error_button_negative">Stäng</string>
+    <string name="signup_magic_link_error">Det gick inte att sända e-postmeddelandet. Du kan försöka igen nu eller stänga och göra ett nytt försök senare.</string>
     <string name="signup_epilogue_hint_username">Användarnamn</string>
+    <string name="signup_epilogue_hint_password_detail">Du kan alltid logga in med en länk av samma typ som du just använde, men om du vill, kan du också konfigurera ett lösenord.</string>
     <string name="signup_epilogue_hint_password">Lösenord (valfritt)</string>
     <string name="signup_epilogue_hint_display">Visningsnamn</string>
-    <string name="signup_email_header">Skriv in din e-postadress för att skapa ditt nya WordPress.com-konto.</string>
-    <string name="signup_email_error_generic">Det gick inte att kontrollera e-postadressen.</string>
-    <string name="signup_epilogue_error_avatar">Det gick inte att ladda upp din profilbild.</string>
-    <string name="signup_epilogue_error_generic">Det gick inte att uppdatera ditt konto. Du kan försöka en gång till eller backa dina ändringar för att fortsätta.</string>
-    <string name="signup_epilogue_error_button_negative">Backa</string>
     <string name="signup_epilogue_error_button_positive">Försök igen</string>
-    <string name="signup_magic_link_error_button_positive">Försök igen</string>
-    <string name="signup_magic_link_error">Det gick inte att sända e-postmeddelandet. Du kan försöka igen nu eller stänga och göra ett nytt försök senare.</string>
-    <string name="signup_epilogue_hint_password_detail">Du kan alltid logga in med en länk av samma typ som du just använde, men om du vill, kan du också konfigurera ett lösenord.</string>
-    <string name="enter_username_instead">Logga in med ditt användarnamn.</string>
-    <string name="enter_site_address_instead">Logga in genom att skriva din webbplatsadress.</string>
-    <string name="sign_up">Registrera dig på WordPress.com</string>
+    <string name="signup_epilogue_error_button_negative">Backa</string>
+    <string name="signup_epilogue_error_generic">Det gick inte att uppdatera ditt konto. Du kan försöka en gång till eller backa dina ändringar för att fortsätta.</string>
+    <string name="signup_epilogue_error_avatar">Det gick inte att ladda upp din profilbild.</string>
+    <string name="plugin_needs_update">Behöver uppdateras</string>
+    <string name="plugin_caption_search">Sök tillägg</string>
+    <string name="plugin_caption_new">Nya</string>
+    <string name="plugin_caption_popular">Populära</string>
+    <string name="plugins_empty_search_list">Inga träffar</string>
+    <string name="plugin_see_all">Visa alla</string>
     <string name="plugin_manage">Hantera</string>
+    <string name="plugin_search_error">Kan inte söka tillägg</string>
+    <string name="plugin_installed_failed">Fel vid installation av %s</string>
+    <string name="plugin_installed_successfully">%s har installerats</string>
     <string name="plugin_install">Installera</string>
     <string name="site_settings_like_header">Gilla</string>
     <string name="my_site_add_new_site">Lägg till ny webbplats</string>
     <string name="my_site_create_new_site">Skapa en ny webbplats för ditt företag, tidskrift eller personliga blogg; eller anslut en befintlig installation av WordPress.</string>
-    <string name="plugin_installed_successfully">%s har installerats</string>
-    <string name="plugin_installed_failed">Fel vid installation av %s</string>
-    <string name="plugin_search_error">Kan inte söka tillägg</string>
-    <string name="plugin_see_all">Visa alla</string>
-    <string name="plugins_empty_search_list">Inga träffar</string>
-    <string name="plugin_caption_popular">Populära</string>
-    <string name="plugin_caption_new">Nya</string>
-    <string name="plugin_caption_search">Sök tillägg</string>
-    <string name="plugin_needs_update">Behöver uppdateras</string>
     <string name="notifications_jetpack_connection_setup_info">För att få hjälpsamma aviseringar till din telefon från din WordPress-webbplats behöver du installera tillägget Jetpack. Vill du konfigurera Jetpack?</string>
     <string name="site_settings_lazy_load_images">Uppskjuten inläsning av bilder (lazy-load)</string>
     <string name="stats_jetpack_connection_setup">Installera Jetpack</string>
@@ -1425,50 +1754,50 @@ Language: sv_SE
     <string name="plugin_info_your_version">Din WordPress-version</string>
     <string name="plugin_info_requires_version">Kräver WordPress-version</string>
     <string name="plugin_info_lastupdated">Senast uppdaterat</string>
-    <string name="plugin_one_stars">1 stjärna</string>
-    <string name="plugin_two_stars">2 stjärnor</string>
-    <string name="plugin_three_stars">3 stjärnor</string>
-    <string name="plugin_four_stars">4 stjärnor</string>
-    <string name="plugin_five_stars">5 stjärnor</string>
     <string name="plugin_info_version">Version</string>
-    <string name="plugin_faq">Vanliga frågor</string>
-    <string name="plugin_read_reviews">Läs recensioner</string>
-    <string name="plugin_num_ratings">%s betyg</string>
-    <string name="plugin_num_downloads">%s nedladdningar</string>
+    <string name="plugin_five_stars">5 stjärnor</string>
+    <string name="plugin_four_stars">4 stjärnor</string>
+    <string name="plugin_three_stars">3 stjärnor</string>
+    <string name="plugin_two_stars">2 stjärnor</string>
+    <string name="plugin_one_stars">1 stjärna</string>
     <string name="plugin_empty_text">Information saknas</string>
-    <string name="plugin_description">Beskrivning</string>
-    <string name="plugin_installation">Installation</string>
+    <string name="plugin_num_downloads">%s nedladdningar</string>
+    <string name="plugin_num_ratings">%s betyg</string>
+    <string name="plugin_read_reviews">Läs recensioner</string>
+    <string name="plugin_faq">Vanliga frågor</string>
     <string name="plugin_whatsnew">Nyheter</string>
-    <string name="plugin_installed_version">Version %s är installerad</string>
-    <string name="plugin_installed">Installerat</string>
+    <string name="plugin_installation">Installation</string>
+    <string name="plugin_description">Beskrivning</string>
     <string name="plugin_settings">Inställningar</string>
-    <string name="plugin_byline">av %s</string>
+    <string name="plugin_installed">Installerat</string>
+    <string name="plugin_installed_version">Version %s är installerad</string>
     <string name="plugin_version">Version %s</string>
-    <string name="plugin_fetch_error">Kan inte läsa in tillägg</string>
+    <string name="plugin_byline">av %s</string>
     <string name="change_photo">Byt foto</string>
-    <string name="dlg_deleting_tag">Raderar</string>
-    <string name="dlg_saving_tag">Sparar</string>
-    <string name="site_settings_tags_hint">Hantera etiketterna för din webbplats</string>
+    <string name="plugin_fetch_error">Kan inte läsa in tillägg</string>
     <string name="my_site_btn_site_pages">Webbplatssidor</string>
+    <string name="site_settings_tags_hint">Hantera etiketterna för din webbplats</string>
+    <string name="dlg_saving_tag">Sparar</string>
+    <string name="dlg_deleting_tag">Raderar</string>
     <string name="dlg_confirm_delete_tag">Radera etiketten ”%s” permanent?</string>
     <string name="error_tag_exists">Det finns redan en etikett med det namnet</string>
-    <string name="site_settings_amp_summary">Din webbplats på WordPress.com har stöd för Accelerated Mobile Pages, ett initiativ under ledning av Google som innebär mycket kortare sidladdningstider på mobila enheter.</string>
-    <string name="tag_name_hint">Etikett</string>
-    <string name="tag_description_hint">Beskrivning</string>
     <string name="add_new_tag">Lägg till ny etikett</string>
+    <string name="tag_description_hint">Beskrivning</string>
+    <string name="tag_name_hint">Etikett</string>
+    <string name="site_settings_amp_summary">Din webbplats på WordPress.com har stöd för Accelerated Mobile Pages, ett initiativ under ledning av Google som innebär mycket kortare sidladdningstider på mobila enheter.</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
-    <string name="site_settings_format_help">Läs mer om formatering av datum och tid</string>
     <string name="site_settings_timezones_error">Kan inte ladda in tidszoner</string>
-    <string name="site_settings_format_entry_custom">Anpassat</string>
+    <string name="site_settings_format_help">Läs mer om formatering av datum och tid</string>
     <string name="site_settings_format_hint_custom">Anpassat format</string>
+    <string name="site_settings_format_entry_custom">Anpassat</string>
     <string name="site_settings_posts_per_page_title">Inlägg per sida</string>
     <string name="site_settings_timezone_subtitle">Välj en stad i din tidszon</string>
-    <string name="site_settings_time_format_title">Tidsformat</string>
     <string name="site_settings_timezone_title">Tidszon</string>
+    <string name="site_settings_time_format_title">Tidsformat</string>
     <string name="site_settings_date_format_title">Datumformat</string>
     <string name="site_settings_week_start_title">Veckan börjar på</string>
-    <string name="site_settings_traffic_header">Trafik</string>
     <string name="site_settings_tags_title">Etiketter</string>
+    <string name="site_settings_traffic_header">Trafik</string>
     <string name="delete_yes">Radera</string>
     <string name="plugin_external_link_icon_content_description">Extern länk</string>
     <string name="plugin_icon_content_description">Tilläggsikon</string>
@@ -1487,8 +1816,8 @@ Language: sv_SE
     <string name="plugin_available_version">Version %s är tillgänglig</string>
     <string name="plugin_detail_label_state_autoupdates">Automatiska uppdateringar</string>
     <string name="plugin_detail_label_state_active">Aktivt</string>
-    <string name="plugin_active">Aktivt</string>
     <string name="plugin_inactive">Inaktivt</string>
+    <string name="plugin_active">Aktivt</string>
     <string name="plugins">Tillägg</string>
     <string name="my_site_btn_plugins">Tillägg</string>
     <string name="media_edit_link_hint">Öppna länk i nytt fönster/ny flik</string>
@@ -1497,8 +1826,8 @@ Language: sv_SE
     <string name="notification_2fa_needed">Fyll i en autentiseringskod för att fortsätta.</string>
     <string name="notification_error_wrong_password">Dubbelkolla ditt lösenord för att fortsätta.</string>
     <string name="notification_login_title_stopped">Inloggningen avbruten</string>
-    <string name="notification_login_title_in_progress">Inloggning pågår…</string>
     <string name="notification_logging_in">Vänta medan inloggningen pågår.</string>
+    <string name="notification_login_title_in_progress">Inloggning pågår…</string>
     <string name="notification_logged_in">Tryck för att fortsätta.</string>
     <string name="notification_login_title_success">Inloggad!</string>
     <string name="login_error_generic_start">Google login kunde inte startas.</string>
@@ -1524,36 +1853,34 @@ Language: sv_SE
     <string name="login_error_suffix">\nDu kanske vill prova ett annat konto?</string>
     <string name="login_error_generic">Det var något som inte stämde vid uppkoppling till Google-kontot.</string>
     <string name="login_error_button">Stäng</string>
-    <string name="login_google_button_suffix">Logga in via Google.</string>
     <string name="enter_wpcom_password_google">Ange motsvarande lösenord för WordPress.com för att fortsätta med detta Google-konto. Denna fråga får du endast en gång.</string>
     <string name="error_generic_network">Ett nätverksfel har inträffat. Kontrollera anslutningen och försök igen.</string>
     <string name="post_settings_remove_featured_image">Ta bort den utvalda bilden</string>
     <string name="post_settings_choose_featured_image">Välj utvald bild</string>
     <string name="login_log_in_for_share_intent">Logga in på WordPress.com för att dela innehållet.</string>
     <string name="enter_site_address_share_intent">Skriv in adressen för den WordPress-webbplats dit du vill dela innehållet.</string>
-    <string name="jetpack_disconnect_success_toast">Webbplatsen har kopplats bort</string>
     <string name="jetpack_disconnect_error_toast">Ett fel inträffade när webbplatsen skulle kopplas bort</string>
-    <string name="jetpack_disconnect_confirmation_message">Är du säker på att du vill koppla bort Jetpack från denna webbplats?</string>
+    <string name="jetpack_disconnect_success_toast">Webbplatsen har kopplats bort</string>
     <string name="jetpack_disconnect_confirm">Koppla bort</string>
+    <string name="jetpack_disconnect_confirmation_message">Är du säker på att du vill koppla bort Jetpack från denna webbplats?</string>
     <string name="jetpack_disconnect_pref_title">”Koppla bort från WordPress.com”</string>
-    <string name="site_settings_jetpack_whitelist_description">Du kan vitlista en IP-adress eller ett IP-adressintervall så att de aldrig blockeras av Jetpack. Man kan lägga in både IPv4- och IPv6-adresser. Ange ett intervall genom att skriva in det lägsta och det högsta värdet med tankstreck mellan dem. Exempel:: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Du kan vitlista en IP-adress eller ett IP-adressintervall så att de aldrig blockeras av Jetpack. Man kan lägga in både IPv4- och IPv6-adresser. Ange ett intervall genom att skriva in det lägsta och det högsta värdet med bindestreck mellan dem. Exempel: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">Kräv tvåstegsautentisering</string>
-    <string name="jetpack_allow_wpcom_sign_in_title">Tillåt inloggning via WordPress.com</string>
     <string name="jetpack_match_wpcom_via_email_title">Koppla samman konton via e-postadressen</string>
+    <string name="jetpack_allow_wpcom_sign_in_title">Tillåt inloggning via WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">Inloggning via WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">Vitlistade IP-adresser</string>
     <string name="jetpack_prevent_brute_force_title">Blockera obehöriga inloggningsförsök</string>
     <string name="jetpack_prevent_brute_force_category_title">Skydd mot brute force-attacker</string>
     <string name="jetpack_send_wp_notifications_title">Skicka push-meddelanden</string>
     <string name="jetpack_send_email_notifications_title">Skicka aviseringar via e-post</string>
-    <string name="jetpack_security_setting_title">Säkerhet</string>
     <string name="jetpack_monitor_uptime_title">Övervaka drifttiden för din webbplats</string>
-    <string name="share_action_media">Lägg till i mediabiblioteket</string>
-    <string name="share_intent_pick_site">Välj webbplats</string>
-    <string name="share_intent_adding_to">Lägger till i</string>
+    <string name="jetpack_security_setting_title">Säkerhet</string>
     <string name="jetpack_site_settings_category_title">Jetpack-inställningar</string>
-    <string name="share_media_permission_required">Tillstånd krävs för delning av bilder och video</string>
+    <string name="share_intent_adding_to">Lägger till i</string>
+    <string name="share_intent_pick_site">Välj webbplats</string>
+    <string name="share_action_media">Lägg till i mediabiblioteket</string>
     <string name="share_action_post">Lägg till i nytt inlägg</string>
+    <string name="share_media_permission_required">Tillstånd krävs för delning av bilder och video</string>
     <string name="invalid_ip_or_range">Ogiltig IP-adress eller -adressintervall</string>
     <string name="deleting_media_dlg">Raderar</string>
     <string name="confirm_delete_media_video">Ska videon raderas?</string>
@@ -1571,8 +1898,8 @@ Language: sv_SE
     <string name="media_edit_filename_caption">Filnamn</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alt-text</string>
-    <string name="notification_settings_item_sights_and_sounds_blink_light">Blinksignal</string>
     <string name="connect_site">Anslut en webbplats</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Blinksignal</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Vibrationssignal</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Välj ljud</string>
     <string name="notification_settings_category_sights_and_sounds">Visuella signaler och ljud</string>
@@ -1582,12 +1909,12 @@ Language: sv_SE
     <string name="notification_settings_category_other">Övrigt</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Alla mina webbplatser</string>
     <string name="notification_settings_category_your_sites">Dina webbplatser</string>
-    <string name="notification_settings_master_off_message">Om du stänger av aviseringar i inställningarna kommer detta att inaktivera alla aviseringar, oavsett typ, från denna app. Du kan finjustera vilka aviseringar du vill ta emot efter att du åter aktiverat aviseringar i inställningarna.</string>
-    <string name="notification_settings_master_off_title">Aktivera aviseringar för att få aviseringar på denna enhet.</string>
-    <string name="notification_settings_master_hint_off">Aktivera aviseringar</string>
-    <string name="notification_settings_master_hint_on">Inaktivera aviseringar</string>
-    <string name="notification_settings_master_status_off">Av</string>
-    <string name="notification_settings_master_status_on">På</string>
+    <string name="notification_settings_main_off_message">Om du stänger av aviseringar i inställningarna kommer detta att inaktivera alla aviseringar, oavsett typ, från denna app. Du kan finjustera vilka aviseringar du vill ta emot efter att du åter aktiverat aviseringar i inställningarna.</string>
+    <string name="notification_settings_main_off_title">Aktivera aviseringar för att få aviseringar på denna enhet.</string>
+    <string name="notification_settings_main_hint_off">Aktivera aviseringar</string>
+    <string name="notification_settings_main_hint_on">Inaktivera aviseringar</string>
+    <string name="notification_settings_main_status_off">Av</string>
+    <string name="notification_settings_main_status_on">På</string>
     <string name="max_video_resolution">Maximal videostorlek</string>
     <string name="max_thumbnail_px_size">Maximal bildstorlek</string>
     <string name="error_upload_post_media_param">Ett fel inträffade vid uppladdning av media för följande inlägg: %s.</string>
@@ -1613,32 +1940,30 @@ Language: sv_SE
     <string name="post_queued">Inlägget i kö</string>
     <string name="uploading_post">Laddar upp ”%s”</string>
     <string name="connection_to_server_lost">Förbindelsen med servern bröts</string>
-    <string name="login_epilogue_mysites_one">Min webbplats</string>
     <string name="login_epilogue_mysites_other">Mina webbplatser</string>
-    <string name="login_empty_2fa">Skriv in en verifieringskod</string>
+    <string name="login_epilogue_mysites_one">Min webbplats</string>
     <string name="login_email_client_not_found">Lyckas inte hitta ditt e-postprogram</string>
+    <string name="login_empty_2fa">Skriv in en verifieringskod</string>
     <string name="login_empty_username">Skriv in ett användarnamn</string>
     <string name="login_log_in_for_deeplink">Logga in till ditt konto på WordPress.com för att nå inlägget.</string>
     <string name="login_error_while_adding_site">Ett fel inträffade när webbplatsen skulle läggas till. Felkod: %s</string>
     <string name="login_checking_site_address">Webbplatsadressen kontrolleras</string>
-    <string name="login_site_address_help_content">Din webbplatsadress visas i fältet längst upp när du besöker din webbplats i Chrome.</string>
     <string name="login_site_address_more_help">Behöver du mer hjälp?</string>
+    <string name="login_site_address_help_content">Din webbplatsadress visas i fältet längst upp när du besöker din webbplats i Chrome.</string>
     <string name="login_site_address_help_title">Vilket webbplatsadress har jag?</string>
-    <string name="login_site_address_help">Behöver du hjälp att hitta din webbplatsadress?</string>
-    <string name="enter_site_address">Skriv in adressen för den WordPress-webbplats du vill ansluta.</string>
     <string name="login_site_address">Webbplatsadress</string>
+    <string name="enter_site_address">Skriv in adressen för den WordPress-webbplats du vill ansluta.</string>
     <string name="login_already_logged_in_wpcom">Redan inloggad på WordPress.com</string>
-    <string name="enter_wpcom_password">Skriv in ditt lösenord för WordPress.com.</string>
     <string name="login_continue">Fortsätt</string>
     <string name="connect_more">Anslut ytterligare en webbplats</string>
+    <string name="enter_wpcom_password">Skriv in ditt lösenord för WordPress.com.</string>
     <string name="login_magic_link_email_requesting">Begär e-postadress för inloggning</string>
     <string name="password_incorrect">Det verkar som om ditt lösenord inte stämmer. Dubbelkolla dina uppgifer och försök igen.</string>
     <string name="requesting_otp">Begär en verifieringskod via SMS.</string>
     <string name="login_text_otp">Skicka mig en kod via SMS istället</string>
     <string name="enter_verification_code">Nästan klart! Skriv in verifieringskoden från din Authenticator-app.</string>
-    <string name="enter_email_wordpress_com">Logga in på WordPress.com med hjälp av en e-postadress för att hantera alla dina WordPress-webbplatser.</string>
     <string name="next">Nästa</string>
-    <string name="open_mail">Öppna e-posten</string>
+    <string name="enter_email_wordpress_com">Logga in på WordPress.com med hjälp av en e-postadress för att hantera alla dina WordPress-webbplatser.</string>
     <string name="image_optimization_promo_desc">Bildoptimering minskar storleken på blder för snabbare uppladdning.\n\nDu kan när som helst ändra detta i webbplatsinställningarna.</string>
     <string name="image_optimization_promo_title">Aktivera bildoptimering?</string>
     <string name="leave_off">Behåll avstängt</string>
@@ -1659,10 +1984,6 @@ Language: sv_SE
     <string name="post_status_draft">Utkast</string>
     <string name="post_status_pending_review">Väntar på granskning</string>
     <string name="post_status_publish_post">Publicera</string>
-    <string name="change_location">Ändra plats</string>
-    <string name="remove_location">Ta bort plats</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Det går inte att öppna platsväljaren, Tjänsten Google Play är inte tillgänglig</string>
-    <string name="post_settings_location">Plats</string>
     <string name="now">Nu</string>
     <string name="post_settings_password_dialog_hint">Man behöver lösenord för att se detta inlägg</string>
     <string name="post_settings_excerpt_dialog_hint">Utdrag är valfria handskrivna sammanfattningar av ditt innehåll.</string>
@@ -1703,50 +2024,50 @@ Language: sv_SE
     <string name="permission_camera">Kamera</string>
     <string name="permission_storage">Lagring</string>
     <string name="button_edit_permissions">Redigera behörigheter</string>
-    <string name="photo_picker_soft_ask_label">%s behöver behörighet för att komma åt dina foton</string>
     <string name="photo_picker_soft_ask_allow">Tillåt</string>
+    <string name="photo_picker_soft_ask_label">%s behöver behörighet för att komma åt dina foton</string>
     <string name="sharing_twitter_message">Detta kommer att inkluderas i twitter-meddelandena när besökare delar dina sidor med Twitter-knappen</string>
     <string name="sharing_label_message">Ändra texten på dela-knappen. Denna text kommer inte att synas förrän du lägger till minst en dela-knapp.</string>
     <string name="connecting_account">Kontoanslutning</string>
     <string name="cannot_connect_account_error">Anslutningen till %s kunde inte genomföras eftersom inget konto valdes.</string>
-    <string name="sharing_comment_likes_description">Tillåt att du och dina läsare kan gilla alla kommentarer</string>
-    <string name="likes">Gillande</string>
-    <string name="twitter">Twitter</string>
     <string name="connected">Ansluten</string>
-    <string name="sharing_more_description">En knapp ”Mer” innehåller en rullista som visar delningsknappar</string>
-    <string name="sharing_edit_more_buttons">Redigera knapparna ”Mera”</string>
+    <string name="twitter">Twitter</string>
+    <string name="likes">Gillande</string>
+    <string name="sharing_comment_likes_description">Tillåt att du och dina läsare kan gilla alla kommentarer</string>
     <string name="buttons">Knappar</string>
+    <string name="sharing_edit_more_buttons">Redigera knapparna ”Mera”</string>
+    <string name="sharing_more_description">En knapp ”Mer” innehåller en rullista som visar delningsknappar</string>
     <string name="sharing_sharing_buttons_description">Välj vilka knappar som ska visas under dina inlägg</string>
-    <string name="sharing_comment_likes">”Gilla” för kommentarer</string>
     <string name="twitter_username">Användarnamn på Twitter</string>
-    <string name="site_settings_like">Visa gilla-knapp</string>
-    <string name="sharing_buttons">Delningsknappar</string>
-    <string name="label">Etikett</string>
+    <string name="sharing_comment_likes">”Gilla” för kommentarer</string>
     <string name="button_style">Knapputseende</string>
-    <string name="site_settings_reblog_and_like_header">Återblogga och gilla</string>
+    <string name="label">Etikett</string>
+    <string name="sharing_buttons">Delningsknappar</string>
+    <string name="site_settings_like">Visa gilla-knapp</string>
     <string name="site_settings_reblog">Visa knappen ”Återblogga”</string>
-    <string name="text_only_display">Endast text</string>
+    <string name="site_settings_reblog_and_like_header">Återblogga och gilla</string>
     <string name="official_buttons_display">Officiella knappar</string>
-    <string name="connection_chooser_message">Välj vilket konto du vill auktorisera. Observera att dina inlägg automatiskt kommer att delas via det valda kontot.</string>
-    <string name="icon_and_text_display">Ikon och text</string>
+    <string name="text_only_display">Endast text</string>
     <string name="icon_only_display">Endast ikon</string>
-    <string name="share_btn_connect_another_account">Anslut ett annat konto</string>
-    <string name="dlg_confirm_publicize_disconnect">Koppla bort från %s?</string>
+    <string name="icon_and_text_display">Ikon och text</string>
+    <string name="connection_chooser_message">Välj vilket konto du vill auktorisera. Observera att dina inlägg automatiskt kommer att delas via det valda kontot.</string>
     <string name="connecting_social_network">Ansluter %s</string>
-    <string name="connection_service_description">Anslut för att automatiskt dela dina blogginlägg till %s.</string>
-    <string name="share_btn_connect">Anslut</string>
-    <string name="share_btn_disconnect">Koppla bort</string>
+    <string name="dlg_confirm_publicize_disconnect">Koppla bort från %s?</string>
+    <string name="share_btn_connect_another_account">Anslut ett annat konto</string>
     <string name="share_btn_reconnect">Återanslut</string>
+    <string name="share_btn_disconnect">Koppla bort</string>
+    <string name="share_btn_connect">Anslut</string>
+    <string name="connection_service_description">Anslut för att automatiskt dela dina blogginlägg till %s.</string>
     <string name="connection_service_label">Offentliggör till %s</string>
-    <string name="connections_description">Anslut de sociala nätverk du gillar mest för att automatiskt dela nya inlägg med dina vänner.</string>
     <string name="connected_accounts_label">Anslutna konton</string>
-    <string name="sharing">Delning</string>
+    <string name="connections_description">Anslut de sociala nätverk du gillar mest för att automatiskt dela nya inlägg med dina vänner.</string>
     <string name="connections_label">Kopplingar</string>
+    <string name="sharing">Delning</string>
     <string name="tabbar_accessibility_label_notifications">Aviseringar. Hantera dina aviseringar.</string>
     <string name="tabbar_accessibility_label_reader">Läsare. Följ innehåll från andra webbplatser.</string>
     <string name="tabbar_accessibility_label_my_site">Min webbplats. Se och hantera din webbplats, inklusive statistik.</string>
-    <string name="button_not_now">Inte just nu.</string>
     <string name="my_site_btn_sharing">Delning</string>
+    <string name="button_not_now">Inte just nu.</string>
     <string name="media_error_internal_server_error">Fel vid uppladdning. Prova att aktivera ”Optimera bilder” i appens inställningar</string>
     <string name="media_downloading">Mediafilerna sparas i denna enhet</string>
     <string name="error_media_save">Kan inte spara media</string>
@@ -1786,17 +2107,17 @@ Language: sv_SE
     <string name="editor_post_saved_online">Inlägget har sparats on-line</string>
     <string name="site_settings_image_quality_hint">Bildkvalitet. Ett högre värde innebär bilder med högre kvalitet.</string>
     <string name="site_settings_optimize_images_summary">Gör det möjligt att ändra storlek på och komprimera bildfiler</string>
-    <string name="media_upload_state_uploaded">Uppladdat</string>
-    <string name="media_encoder_quality_80">Låg</string>
-    <string name="media_encoder_quality_85">Medium</string>
-    <string name="media_encoder_quality_90">Hög</string>
-    <string name="media_encoder_quality_95">Mycket hög</string>
     <string name="media_encoder_quality_100">Max</string>
-    <string name="media_upload_state_queued">Tillagt i kön</string>
-    <string name="media_upload_state_uploading">Laddar upp</string>
-    <string name="media_upload_state_deleting">Raderar</string>
-    <string name="media_upload_state_deleted">Raderat</string>
+    <string name="media_encoder_quality_95">Mycket hög</string>
+    <string name="media_encoder_quality_90">Hög</string>
+    <string name="media_encoder_quality_85">Medium</string>
+    <string name="media_encoder_quality_80">Låg</string>
+    <string name="media_upload_state_uploaded">Uppladdat</string>
     <string name="media_upload_state_failed">Uppladdningen misslyckades</string>
+    <string name="media_upload_state_deleted">Raderat</string>
+    <string name="media_upload_state_deleting">Raderar</string>
+    <string name="media_upload_state_uploading">Laddar upp</string>
+    <string name="media_upload_state_queued">Tillagt i kön</string>
     <string name="image_quality">Bildkvalitet</string>
     <string name="error_all_media_upload_canceled">Alla mediauppladdningar har avbrutits på grund av ett okänt fel. Försök ladda upp igen</string>
     <string name="error_unknown_post_type">Okänt inläggsformat</string>
@@ -1842,33 +2163,33 @@ Language: sv_SE
     <string name="comment_q_action_liking">Gillar…</string>
     <string name="comment_q_action_processing">Arbetar…</string>
     <string name="comment_q_action_done_generic">Klart!</string>
-    <string name="sign_in_wpcom">Logga in på WordPress.com</string>
-    <string name="signout">Logga ut</string>
     <string name="comment_liked">Kommentaren gillad</string>
+    <string name="signout">Logga ut</string>
+    <string name="sign_in_wpcom">Logga in på WordPress.com</string>
     <string name="reader_label_global_related_posts">Mer på WordPress.com</string>
     <string name="reader_label_local_related_posts">Mer från %s</string>
     <string name="preference_open_device_settings">Öppna enhetens inställningar</string>
     <string name="invite_invalid_email">%s: Ogiltig e-postadress</string>
     <string name="invite_user_blocked_invites">%s: Användaren har blockerat inbjudningar</string>
     <string name="invite_already_following">%s: Följer redan</string>
-    <string name="invite_username_not_found">%s: Användaren hittades inte</string>
     <string name="invite_already_a_member">%s: Redan medlem</string>
+    <string name="invite_username_not_found">%s: Användaren hittades inte</string>
     <string name="comment_moderated_approved">Kommentar godkänd!</string>
     <string name="like">Gilla</string>
     <string name="timespan_now">nu</string>
-    <string name="role_follower">Prenumerant</string>
     <string name="role_viewer">Läsare</string>
+    <string name="role_follower">Prenumerant</string>
     <string name="error_post_my_profile_no_connection">Ingen nätverksanslutning, kunde inte spara din profil</string>
-    <string name="alignment_none">Ingen</string>
-    <string name="alignment_left">Vänster</string>
     <string name="alignment_right">Höger</string>
+    <string name="alignment_left">Vänster</string>
+    <string name="alignment_none">Ingen</string>
     <string name="site_settings_list_editor_action_mode_title">Vald %1$d</string>
     <string name="error_fetch_users_list">Kunde inte hämta webbplatsens användare</string>
-    <string name="people_fetching">Hämtar användare…</string>
-    <string name="title_follower">Följare</string>
     <string name="title_email_follower">Följare via e-post</string>
-    <string name="people_dropdown_item_email_followers">Följare via e-post</string>
+    <string name="title_follower">Följare</string>
+    <string name="people_fetching">Hämtar användare…</string>
     <string name="people_dropdown_item_viewers">Läsare</string>
+    <string name="people_dropdown_item_email_followers">Följare via e-post</string>
     <string name="people_dropdown_item_followers">Följare</string>
     <string name="people_dropdown_item_team">Team</string>
     <string name="invite_message_usernames_limit">Bjud in upp till 10 e-postadresser eller användare på WordPress.com. De som behöver ett användarnamn får instruktioner skickade till dem.</string>
@@ -1880,64 +2201,59 @@ Language: sv_SE
     <string name="error_fetch_email_followers_list">Kunde inte hämta följare via e-post</string>
     <string name="error_fetch_followers_list">Kunde inte hämta följare</string>
     <string name="editor_failed_uploads_switch_html">Vissa mediauppladdningar har misslyckats. Du kan inte skifta till HTML-läget\n        i detta tillstånd. Vill du ta bort alla misslyckade uppladdningar och fortsätta?</string>
-    <string name="image_settings_save_toast">Ändringar sparade</string>
-    <string name="image_caption">Bildtext</string>
-    <string name="image_link_to">Länka till</string>
     <string name="image_width">Bredd</string>
+    <string name="image_link_to">Länka till</string>
+    <string name="image_caption">Bildtext</string>
+    <string name="image_settings_save_toast">Ändringar sparade</string>
     <string name="image_settings_dismiss_dialog_title">Förkasta ändringar som inte sparats?</string>
     <string name="stop_upload_dialog_title">Stoppa uppladdning?</string>
-    <string name="invite_error_some_failed">Inbjudan skickades men fel uppstod!</string>
-    <string name="invite_sent">Inbjudan skickad</string>
     <string name="tap_to_try_again">Tryck för att försöka igen!</string>
+    <string name="invite_sent">Inbjudan skickad</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="invite_error_some_failed">Inbjudan skickades men fel uppstod!</string>
     <string name="invite_error_sending">Ett fel uppstod när inbjudan skulle skickas!</string>
     <string name="invite_error_invalid_usernames_multiple">Kan inte skicka: Det finns ogiltiga användarnamn eller e-postadresser</string>
     <string name="invite_error_invalid_usernames_one">Kan inte skicka: Ett användarnamn eller en e-postadress är ogiltig</string>
     <string name="invite_error_no_usernames">Ange minst ett användarnamn</string>
-    <string name="invite_message_info">(Valfritt) Du kan lägga till ett anpassat meddelande med upp till 500 tecken som kommer att ingå i inbjudan till användare.</string>
-    <string name="invite_message_remaining_other">%d tecken återstår</string>
-    <string name="invite_message_remaining_one">1 tecken återstår</string>
-    <string name="invite_message_remaining_zero">0 tecken återstår</string>
     <string name="invite_message_title">Anpassat meddelande</string>
     <string name="invite">Bjud in</string>
-    <string name="invite_names_title">Användarnamn eller e‑postmeddelanden</string>
-    <string name="send_link">Skicka länk</string>
-    <string name="my_site_header_external">Externt</string>
+    <string name="invite_names_title">Användarnamn eller e‑post</string>
     <string name="invite_people">Bjud in personer</string>
+    <string name="my_site_header_external">Externt</string>
     <string name="label_clear_search_history">Rensa sökhistoriken</string>
     <string name="dlg_confirm_clear_search_history">Rensa sökhistoriken?</string>
     <string name="reader_empty_search_description">Inga inlägg hittade för %s på ditt språk</string>
     <string name="reader_hint_post_search">Sök WordPress</string>
+    <string name="reader_title_related_post_detail">Relaterade inlägg</string>
     <string name="preview_screen_links_disabled">Länkar har avaktiverats på förhandsvisningsskärmen</string>
     <string name="send">Skicka</string>
-    <string name="user_remove_confirmation_message">Om du tar bort %1$s kommer användaren inte längre kunna besöka webbplatsen, men eventuellt innehåll som skapats av %1$s kommer att finnas kvar.\n\nVill du fortfarande ta bort denna användare?</string>
     <string name="person_removed">%1$s borttagen</string>
+    <string name="user_remove_confirmation_message">Om du tar bort %1$s kommer användaren inte längre kunna besöka webbplatsen, men eventuellt innehåll som skapats av %1$s kommer att finnas kvar.\n\nVill du fortfarande ta bort denna användare?</string>
     <string name="person_remove_confirmation_title">Ta bort %1$s</string>
-    <string name="reader_empty_posts_in_custom_list">Webbplatserna i denna lista har inte publicerat några inlägg på senare tid</string>
-    <string name="people">Människor</string>
     <string name="role">Roll</string>
+    <string name="people">Människor</string>
+    <string name="reader_empty_posts_in_custom_list">Webbplatserna i denna lista har inte publicerat några inlägg på senare tid</string>
     <string name="error_remove_user">Kunde inte ta bort användare</string>
     <string name="error_update_role">Kunde inte uppdatera användarroll</string>
     <string name="error_fetch_viewers_list">Kunde inte hämta webbplatsens läsare</string>
     <string name="error_updating_gravatar">Det gick inte att uppdatera din Gravatar</string>
-    <string name="error_locating_image">Det gick inte att hitta den beskurna bilden</string>
     <string name="error_refreshing_gravatar">Det gick inte att ladda om din Gravatar</string>
+    <string name="error_locating_image">Det gick inte att hitta den beskurna bilden</string>
     <string name="error_cropping_image">Det gick inte att beskära bilden</string>
     <string name="checking_email">Kontrollerar e-post</string>
     <string name="magic_link_unavailable_error_message">Inte tillgänglig för närvarande. Ange ditt lösenord</string>
     <string name="logging_in">Loggar in</string>
-    <string name="enter_your_password_instead">Ange ditt lösenord istället</string>
     <string name="web_address_dialog_hint">Visas offentligt när du kommenterar.</string>
     <string name="capture_or_pick_photo">Ta eller välj ett foto</string>
-    <string name="export_your_content_message">Dina inlägg, sidor och inställningar kommer att skickas via e-post till %s.</string>
-    <string name="plan">Paket</string>
     <string name="plans">Paket</string>
+    <string name="plan">Paket</string>
+    <string name="export_your_content_message">Dina inlägg, sidor och inställningar kommer att skickas via e-post till %s.</string>
     <string name="export_your_content">Exportera ditt innehåll</string>
-    <string name="exporting_content_progress">Exporterar innehåll…</string>
     <string name="export_email_sent">Exporte-post skickat!</string>
-    <string name="premium_upgrades_message">Du har aktiva premium-uppgraderingar på din webbplats. Vänligen avsluta dina uppgraderingar innan du tar bort din webbplats.</string>
-    <string name="show_purchases">Visa köp</string>
+    <string name="exporting_content_progress">Exporterar innehåll…</string>
     <string name="checking_purchases">Kollar köp</string>
+    <string name="show_purchases">Visa köp</string>
+    <string name="premium_upgrades_message">Du har aktiva premium-uppgraderingar på din webbplats. Vänligen avsluta dina uppgraderingar innan du tar bort din webbplats.</string>
     <string name="premium_upgrades_title">Premium-uppgraderingar</string>
     <string name="purchases_request_error">Något gick fel. Kunde inte hämta köp.</string>
     <string name="delete_site_progress">Raderar webbplats…</string>
@@ -1946,49 +2262,49 @@ Language: sv_SE
     <string name="primary_domain">Primärdomän</string>
     <string name="error_deleting_site_summary">Ett fel uppstod när din webbplats skulle tas bort. Kontakta supporten för mer hjälp.</string>
     <string name="error_deleting_site">Kunde inte ta bort webbplats</string>
-    <string name="confirm_delete_site_prompt">Vänligen skriv %1$s i fältet nedan för att godkänna. Din webbplats kommer sedan vara borta för alltid.</string>
     <string name="site_settings_export_content_title">Exportera innehåll</string>
+    <string name="confirm_delete_site_prompt">Vänligen skriv %1$s i fältet nedan för att godkänna. Din webbplats kommer sedan vara borta för alltid.</string>
     <string name="confirm_delete_site">Godkänn webbplatsborttagning</string>
     <string name="contact_support">Kontakta supporten</string>
     <string name="start_over_text">Om du vill ha en webbplats, men inte vill ha någon av inläggen eller sidorna du har nu, kan vårt supportteam ta bort dina inlägg, sidor, mediaobjekt och kommentarer åt dig.\n\nDetta låter dig behålla din webbplats och URL men ger dig möjligheten att börja om på nytt i ditt skapande. Kontakta oss för att ta bort allt ditt nuvarande innehåll.</string>
-    <string name="site_settings_start_over_hint">Börja om med webbplatsen</string>
     <string name="let_us_help">Låt oss hjälpa</string>
-    <string name="me_btn_app_settings">Appinställningar</string>
+    <string name="site_settings_start_over_hint">Börja om med webbplatsen</string>
     <string name="start_over">Börja om</string>
+    <string name="me_btn_app_settings">Appinställningar</string>
     <string name="editor_remove_failed_uploads">Ta bort misslyckade uppladdningar</string>
     <string name="site_settings_advanced_header">Avancerat</string>
     <string name="comments_empty_list_filtered_trashed">Inga kastade kommentarer</string>
     <string name="comments_empty_list_filtered_pending">Inga väntande kommentarer</string>
     <string name="comments_empty_list_filtered_approved">Inga godkända kommentarer</string>
     <string name="xmlrpc_missing_method_error">Kunde inte ansluta. Obligatoriska XML-RPC-metoder saknas på servern.</string>
-    <string name="post_format_status">Status</string>
-    <string name="post_format_video">Videoklipp</string>
     <string name="alignment_center">Centrerat</string>
-    <string name="post_format_chat">Chatt</string>
-    <string name="post_format_gallery">Galleri</string>
-    <string name="post_format_image">Bild</string>
-    <string name="post_format_link">Länk</string>
-    <string name="post_format_quote">Citat</string>
+    <string name="post_format_video">Videoklipp</string>
+    <string name="post_format_status">Status</string>
     <string name="post_format_standard">Standard</string>
-    <string name="notif_events">Information om kurser och evenemang på WordPress.com (online och fysiska möten).</string>
+    <string name="post_format_quote">Citat</string>
+    <string name="post_format_link">Länk</string>
+    <string name="post_format_image">Bild</string>
+    <string name="post_format_gallery">Galleri</string>
+    <string name="post_format_chat">Chatt</string>
     <string name="post_format_audio">Ljud</string>
     <string name="post_format_aside">Notis</string>
+    <string name="notif_events">Information om kurser och evenemang på WordPress.com (online och fysiska möten).</string>
     <string name="notif_surveys">Möjligheter att delta i WordPress.coms studier och undersökningar.</string>
     <string name="notif_tips">Tips för att få ut så mycket som möjligt av WordPress.com.</string>
     <string name="notif_community">Community</string>
-    <string name="replies_to_my_comments">Svar på mina kommentarer</string>
-    <string name="notif_suggestions">Förslag</string>
     <string name="notif_research">Forskning</string>
-    <string name="site_achievements">Webbplats-troféer</string>
+    <string name="notif_suggestions">Förslag</string>
+    <string name="replies_to_my_comments">Svar på mina kommentarer</string>
     <string name="username_mentions">Omnämnande av användarnamn</string>
-    <string name="likes_on_my_posts">Gilla-markeringar för mina inlägg</string>
+    <string name="site_achievements">Webbplats-troféer</string>
     <string name="site_follows">Webbplatsföljare</string>
+    <string name="likes_on_my_posts">Gilla-markeringar för mina inlägg</string>
     <string name="likes_on_my_comments">Gillar mina kommentarer</string>
     <string name="comments_on_my_site">Kommentarer på min webbplats</string>
     <string name="site_settings_list_editor_summary_other">%d poster</string>
     <string name="site_settings_list_editor_summary_one">1 post</string>
-    <string name="approve_auto_if_previously_approved">Kända användares kommentarer</string>
     <string name="approve_auto">Alla användare</string>
+    <string name="approve_auto_if_previously_approved">Kända användares kommentarer</string>
     <string name="approve_manual">Inga kommentarer</string>
     <string name="site_settings_paging_summary_other">%d kommentarer per sida</string>
     <string name="site_settings_paging_summary_one">1 kommentar per sida</string>
@@ -1998,11 +2314,11 @@ Language: sv_SE
     <string name="detail_approve_auto">Godkänn allas kommentarer automatiskt.</string>
     <string name="detail_approve_auto_if_previously_approved">Godkänn automatiskt om användaren har en tidigare godkänd kommentar</string>
     <string name="detail_approve_manual">Kräv manuellt godkännande för alla kommentarer.</string>
-    <string name="days_quantity_one">1 dag</string>
     <string name="days_quantity_other">%d dagar</string>
-    <string name="pending_email_change_snackbar">Klicka på verifieringslänken i e-postmeddelandet som skickades till %1$s för att bekräfta din nya adress</string>
-    <string name="primary_site">Primär webbplats</string>
+    <string name="days_quantity_one">1 dag</string>
     <string name="web_address">Webbadress</string>
+    <string name="primary_site">Primär webbplats</string>
+    <string name="pending_email_change_snackbar">Klicka på verifieringslänken i e-postmeddelandet som skickades till %1$s för att bekräfta din nya adress</string>
     <string name="editor_toast_uploading_please_wait">Mediefiler laddas upp för tillfället. Vänta tills de är färdiguppladdade.</string>
     <string name="error_refresh_comments_showing_older">Kommentarer kan inte uppdateras just nu – visar äldre kommentarer</string>
     <string name="post_settings_set_featured_image">Ange utvald bild</string>
@@ -2011,13 +2327,13 @@ Language: sv_SE
     <string name="dlg_sure_to_delete_comments">Radera dessa kommentarer premanent?</string>
     <string name="dlg_sure_to_delete_comment">Radera denna kommentar premanent?</string>
     <string name="mnu_comment_delete_permanently">Ta bort</string>
-    <string name="comment_deleted_permanently">Kommentar raderad</string>
     <string name="mnu_comment_untrash">Återställ</string>
+    <string name="comment_deleted_permanently">Kommentar raderad</string>
     <string name="comments_empty_list_filtered_spam">Inga skräppost-kommentarer</string>
-    <string name="could_not_load_page">Kunde inte ladda sida</string>
     <string name="comment_status_all">Alla</string>
-    <string name="interface_language">Gränssnittspråk</string>
+    <string name="could_not_load_page">Kunde inte ladda sida</string>
     <string name="off">Av</string>
+    <string name="interface_language">Gränssnittspråk</string>
     <string name="about_the_app">Om appen</string>
     <string name="error_post_account_settings">Kunde inte spara dina kontoinställningar</string>
     <string name="error_fetch_account_settings">Kunde inte hämta dina kontoinställningar</string>
@@ -2025,20 +2341,20 @@ Language: sv_SE
     <string name="site_settings_unknown_language_code_error">Språkkoden känns inte igen</string>
     <string name="site_settings_threading_dialog_description">Tillåt att kommentarer staplas i trådar.</string>
     <string name="site_settings_threading_dialog_header">Trådar upp till</string>
-    <string name="remove">Ta bort</string>
-    <string name="search">Sök</string>
     <string name="disabled">Inaktiverad</string>
+    <string name="search">Sök</string>
+    <string name="remove">Ta bort</string>
     <string name="site_settings_image_original_size">Originalstorlek</string>
     <string name="privacy_private">Din webbplats är bara synlig för dig själv och användare som du godkänner</string>
     <string name="privacy_public_not_indexed">Din webbplats är synlig för alla, men begär att sökmotorerna inte ska indexera den</string>
     <string name="privacy_public">Din webbplats är synlig för alla och kan indexeras av sökmotorer</string>
     <string name="about_me_hint">Ett par ord om dig själv…</string>
-    <string name="public_display_name_hint">Om det inte anges något annat kommer visningsnamnet som standard att vara ditt användarnamn</string>
     <string name="about_me">Om mig</string>
+    <string name="public_display_name_hint">Om det inte anges något annat kommer visningsnamnet som standard att vara ditt användarnamn</string>
     <string name="public_display_name">Offentligt visningsnamn</string>
-    <string name="my_profile">Min profil</string>
-    <string name="first_name">Förnamn</string>
     <string name="last_name">Efternamn</string>
+    <string name="first_name">Förnamn</string>
+    <string name="my_profile">Min profil</string>
     <string name="cd_related_post_preview_image">Relaterat inlägg förhandsgranskningsbild</string>
     <string name="error_post_remote_site_settings">Kunde inte spara webbplatsinfo</string>
     <string name="error_fetch_remote_site_settings">Kunde inte hämta webbplatsinfo</string>
@@ -2047,7 +2363,7 @@ Language: sv_SE
     <string name="site_settings_paging_dialog_description">Dela upp kommentarstrådar i flera sidor.</string>
     <string name="site_settings_paging_dialog_header">Kommentarer per sida</string>
     <string name="site_settings_close_after_dialog_title">Stäng kommentarer</string>
-    <string name="site_settings_blacklist_description">När en kommentar innehåller något av dessa ord i innehåll, namn, URL, e-postadress eller IP markeras den som skräppost. Du kan ange delar av ord, så \"press\" kommer att matcha \"Wordpress\".</string>
+    <string name="site_settings_denylist_description">När en kommentar innehåller något av dessa ord i innehåll, namn, URL, e-postadress eller IP-adress markeras den som skräppost. Du kan ange delar av ord, så \"press\" kommer att matcha ”WordPress”.</string>
     <string name="site_settings_hold_for_moderation_description">När en kommentar innehåller något av dessa ord i innehåll, namn, URL, e-postadress eller IP stannar den i granskningskön Du kan ange delar av ord, så \"press\" kommer att matcha \"Wordpress\".</string>
     <string name="site_settings_list_editor_input_hint">Ange ett ord eller en fras</string>
     <string name="site_settings_list_editor_no_items_text">Inga objekt</string>
@@ -2062,10 +2378,10 @@ Language: sv_SE
     <string name="site_settings_rp_show_header_title">Visa sidhuvud</string>
     <string name="site_settings_rp_switch_summary">Relaterade inlägg visar relevant innehåll från din webbplats nedanför dina inlägg.</string>
     <string name="site_settings_rp_switch_title">Visa relaterade inlägg</string>
-    <string name="site_settings_blacklist_hint">Kommentarer som matchar ett filter markeras som skräppost</string>
+    <string name="site_settings_denylist_hint">Kommentarer som matchar ett filter markeras som skräppost</string>
     <string name="site_settings_moderation_hold_hint">Kommentarer som matchar ett filter placeras i granskningskön</string>
     <string name="site_settings_multiple_links_hint">Ignorera länkbegränsningen för kända användare</string>
-    <string name="site_settings_whitelist_hint">Kommentarens författare måste ha en tidigare godkänd kommentar</string>
+    <string name="site_settings_allowlist_hint">Kommentarens författare måste ha en tidigare godkänd kommentar</string>
     <string name="site_settings_user_account_required_hint">Användare måste vara registrerade och inloggade för att kunna kommentera</string>
     <string name="site_settings_identity_required_hint">Kommentarens författare måste fylla i namn och e-postadress</string>
     <string name="site_settings_paging_hint">Visa kommentarer i stycken av en viss storlek</string>
@@ -2088,19 +2404,18 @@ Language: sv_SE
     <string name="site_settings_address_hint">Ändring av din adress stöds för närvarande inte</string>
     <string name="site_settings_tagline_hint">En kort beskrivning eller snärtig mening som beskriver din blogg</string>
     <string name="site_settings_title_hint">Beskriv med några få ord vad denna webbplats handlar om</string>
-    <string name="site_settings_whitelist_known_summary">Kommentarer från kända användare</string>
-    <string name="site_settings_whitelist_all_summary">Kommentarer från alla användare</string>
+    <string name="site_settings_allowlist_known_summary">Kommentarer från kända användare</string>
+    <string name="site_settings_allowlist_all_summary">Kommentarer från alla användare</string>
     <string name="site_settings_threading_summary">%d nivåer</string>
     <string name="site_settings_privacy_private_summary">Privat</string>
     <string name="site_settings_privacy_hidden_summary">Dold</string>
-    <string name="site_settings_delete_site_title">Radera webbplats</string>
     <string name="site_settings_privacy_public_summary">Offentlig</string>
-    <string name="site_settings_blacklist_title">Svartlista</string>
+    <string name="site_settings_delete_site_title">Radera webbplats</string>
     <string name="site_settings_moderation_hold_title">Vänta på granskning</string>
     <string name="site_settings_multiple_links_title">Länkar i kommentarer</string>
-    <string name="site_settings_whitelist_title">Godkänn automatiskt</string>
-    <string name="site_settings_threading_title">Trådning</string>
+    <string name="site_settings_allowlist_title">Godkänn automatiskt</string>
     <string name="site_settings_paging_title">Paginering</string>
+    <string name="site_settings_threading_title">Trådning</string>
     <string name="site_settings_sort_by_title">Sortera efter</string>
     <string name="site_settings_account_required_title">Användare måste vara inloggade</string>
     <string name="site_settings_identity_required_title">Måste inkludera namn och e-postadress</string>
@@ -2110,22 +2425,22 @@ Language: sv_SE
     <string name="site_settings_default_format_title">Standardformat</string>
     <string name="site_settings_default_category_title">Standardkategori</string>
     <string name="site_settings_address_title">Adress</string>
-    <string name="site_settings_title_title">Webbplatsens titel</string>
     <string name="site_settings_tagline_title">Slogan</string>
+    <string name="site_settings_title_title">Webbplatsens titel</string>
     <string name="site_settings_discussion_new_posts_header">Standard för nya inlägg</string>
-    <string name="site_settings_account_header">Konto</string>
     <string name="site_settings_writing_header">Skriva</string>
-    <string name="newest_first">Nyast först</string>
+    <string name="site_settings_account_header">Konto</string>
     <string name="site_settings_general_header">Allmänt</string>
-    <string name="discussion">Diskussion</string>
-    <string name="privacy">Integritet</string>
-    <string name="related_posts">Relaterade inlägg</string>
-    <string name="comments">Kommentarer</string>
-    <string name="close_after">Stäng efter</string>
+    <string name="newest_first">Nyast först</string>
     <string name="oldest_first">Äldst först</string>
+    <string name="close_after">Stäng efter</string>
+    <string name="comments">Kommentarer</string>
+    <string name="related_posts">Relaterade inlägg</string>
+    <string name="privacy">Integritet</string>
+    <string name="discussion">Diskussion</string>
     <string name="media_error_no_permission_upload">Du har inte tillåtelse att ladda upp media till webbplatsen</string>
-    <string name="never">Aldrig</string>
     <string name="unknown">Okänd</string>
+    <string name="never">Aldrig</string>
     <string name="reader_err_get_post_not_found">Detta inlägg finns inte längre</string>
     <string name="reader_err_get_post_not_authorized">Du har inte behörighet att se detta inlägg</string>
     <string name="reader_err_get_post_generic">Kunde inte hämta detta inlägg</string>
@@ -2137,22 +2452,22 @@ Language: sv_SE
     <string name="theme_activation_error">Något gick fel. Kunde inte aktivera tema</string>
     <string name="theme_by_author_prompt_append"> av %1$s</string>
     <string name="theme_prompt">Tack för att du väljer %1$s</string>
-    <string name="theme_try_and_customize">Testa &amp; anpassa</string>
-    <string name="theme_view">Visa</string>
-    <string name="theme_details">Information</string>
-    <string name="theme_support">Support</string>
-    <string name="theme_done">KLART</string>
     <string name="theme_manage_site">HANTERA WEBBPLATS</string>
+    <string name="theme_done">KLART</string>
+    <string name="theme_support">Support</string>
+    <string name="theme_details">Information</string>
+    <string name="theme_view">Visa</string>
+    <string name="theme_try_and_customize">Testa &amp; anpassa</string>
     <string name="theme_activate">Aktivera</string>
-    <string name="current_theme">Nuvarande tema</string>
-    <string name="customize">Anpassa</string>
-    <string name="details">Information</string>
-    <string name="support">Support</string>
     <string name="active">Aktiv</string>
-    <string name="post_published">Inlägg publicerat</string>
-    <string name="page_published">Sida publicerad</string>
-    <string name="post_updated">Inlägg uppdaterat</string>
+    <string name="support">Support</string>
+    <string name="details">Information</string>
+    <string name="customize">Anpassa</string>
+    <string name="current_theme">Nuvarande tema</string>
     <string name="page_updated">Sida uppdaterad</string>
+    <string name="post_updated">Inlägg uppdaterat</string>
+    <string name="page_published">Sida publicerad</string>
+    <string name="post_published">Inlägg publicerat</string>
     <string name="theme_no_search_result_found">Tyvärr hittades inga teman.</string>
     <string name="reader_label_gap_marker">Ladda fler inlägg</string>
     <string name="notifications_no_search_results">Inga webbplatser matchade \"%s\"</string>
@@ -2184,289 +2499,287 @@ Language: sv_SE
     <string name="notification_types">Aviseringstyper</string>
     <string name="error_loading_notifications">Det gick inte att läsa in aviseringsinställningar</string>
     <string name="comment_likes">Gillar för kommentarer</string>
-    <string name="email">E-post</string>
     <string name="app_notifications">App-aviseringar</string>
+    <string name="email">E-post</string>
     <string name="notifications_tab">Fliken Aviseringar</string>
     <string name="notification_settings_item_other_account_emails_summary">Viktiga e-postmeddelanden om ditt konto kommer vi alltid att sända, men du vill kan du dessutom få en del hjälpsamma ytterligare saker.</string>
     <string name="stats_insights_latest_post_summary">Sammanfattning av senaste inlägg</string>
     <string name="connectionbar_no_connection">Ingen anslutning</string>
-    <string name="button_view">Visa</string>
-    <string name="button_edit">Redigera</string>
-    <string name="button_publish">Publicera</string>
-    <string name="button_stats">Statistik</string>
+    <string name="post_trashed">Inlägget placerat i papperskorgen</string>
     <string name="button_trash">Ta bort</string>
+    <string name="button_stats">Statistik</string>
     <string name="button_preview">Förhandsgranska</string>
-    <string name="post_trashed">Inlägget placerat i papperskorgen</string>
+    <string name="button_view">Visa</string>
+    <string name="button_publish">Publicera</string>
+    <string name="button_edit">Redigera</string>
     <string name="reader_toast_err_follow_blog_not_authorized">Du har inte behörighet för att komma åt denna blogg</string>
     <string name="reader_toast_err_follow_blog_not_found">Denna webbplats kunde inte hittas</string>
     <string name="undo">Ångra</string>
     <string name="push_auth_expired">Begäran har löpt ut. Logga in på WordPress.com för att försöka igen.</string>
-    <string name="stats_insights_best_ever">Flest visningar någonsin</string>
     <string name="ignore">Ignorera </string>
+    <string name="stats_insights_best_ever">Flest visningar någonsin</string>
     <string name="stats_insights_today">Dagens statistik </string>
     <string name="stats_insights_all_time">Alla inlägg, visningar och besökare</string>
     <string name="stats_insights">Insikter</string>
     <string name="me_disconnect_from_wordpress_com">Logga ut från WordPress.com </string>
-    <string name="me_btn_login_logout">Logga in/Logga ut</string>
     <string name="me_connect_to_wordpress_com">Logga in på WordPress.com</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" kunde inte döljas eftersom den är den nuvarande webbplatsen</string>
-    <string name="account_settings">Kontoinställningar</string>
+    <string name="me_btn_login_logout">Logga in/Logga ut</string>
     <string name="me_btn_support">Hjälp och support</string>
+    <string name="account_settings">Kontoinställningar</string>
+    <string name="site_picker_cant_hide_current_site">\"%s\" kunde inte döljas eftersom den är den nuvarande webbplatsen</string>
     <string name="site_picker_create_wpcom">Skapa en webbplats på WordPress.com</string>
-    <string name="site_picker_edit_visibility">Visa/dölj webbplatser</string>
     <string name="site_picker_add_self_hosted">Lägg till webbplats på egen server</string>
     <string name="site_picker_add_site">Lägg till ny webbplats</string>
-    <string name="my_site_btn_switch_site">Byt webbplats</string>
+    <string name="site_picker_edit_visibility">Visa/dölj webbplatser</string>
     <string name="site_picker_title">Välj webbplats</string>
-    <string name="my_site_btn_view_admin">Visa admin</string>
     <string name="my_site_btn_view_site">Visa webbplats</string>
+    <string name="my_site_btn_view_admin">Visa admin</string>
+    <string name="my_site_btn_switch_site">Byt webbplats</string>
     <string name="my_site_btn_site_settings">Inställningar </string>
-    <string name="my_site_header_look_and_feel">Utseende och känsla</string>
-    <string name="my_site_header_publish">Publicera</string>
     <string name="my_site_btn_blog_posts">Blogginlägg</string>
+    <string name="my_site_header_publish">Publicera</string>
+    <string name="my_site_header_look_and_feel">Utseende och känsla</string>
     <string name="my_site_header_configuration">Konfiguration</string>
     <string name="reader_label_new_posts_subtitle">Knacka för att visa dem</string>
     <string name="deselect_all">Avmarkera alla </string>
-    <string name="hide">Dölj</string>
     <string name="select_all">Välj alla</string>
+    <string name="hide">Dölj</string>
     <string name="show">Visa</string>
-    <string name="language">Språk</string>
-    <string name="verification_code">Verifieringskod</string>
-    <string name="invalid_verification_code">Ogiltig verifieringskod</string>
     <string name="auth_required">Logga in igen för att fortsätta.</string>
+    <string name="invalid_verification_code">Ogiltig verifieringskod</string>
+    <string name="verification_code">Verifieringskod</string>
+    <string name="language">Språk</string>
     <string name="reader_empty_posts_request_failed">Kunde inte hämta inlägg</string>
     <string name="publisher">Publicerat av:</string>
+    <string name="error_notification_open">Kunde inte öppna aviseringen</string>
     <string name="stats_search_terms_unknown_search_terms">Okända söktermer</string>
-    <string name="stats_view_authors">Författare</string>
     <string name="stats_view_search_terms">Söktermer</string>
+    <string name="stats_view_authors">Författare</string>
     <string name="comments_fetching">Hämtar kommentarer…</string>
     <string name="pages_fetching">Hämtar sidor…</string>
     <string name="posts_fetching">Hämtar inlägg…</string>
     <string name="media_fetching">Hämtar media…</string>
-    <string name="error_notification_open">Kunde inte öppna aviseringen</string>
     <string name="logs_copied_to_clipboard">App-loggar har kopierats till urklipp</string>
+    <string name="reader_empty_posts_in_blog">Denna webbplats är tom</string>
     <string name="reader_label_new_posts">Nya inlägg</string>
     <string name="error_copy_to_clipboard">Ett fel uppstod när text skulle kopieras till urklipp</string>
-    <string name="reader_page_recommended_blogs">Webbplatser du kanske gillar</string>
     <string name="post_uploading">Laddar upp inlägg</string>
-    <string name="reader_empty_posts_in_blog">Denna webbplats är tom</string>
-    <string name="themes_fetching">Hämtar teman…</string>
-    <string name="stats_followers_months">%1$d månader</string>
-    <string name="stats_followers_a_year">Ett år</string>
     <string name="stats_followers_years">%1$d år</string>
+    <string name="stats_followers_a_year">Ett år</string>
+    <string name="stats_followers_months">%1$d månader</string>
     <string name="stats_followers_a_month">En månad</string>
-    <string name="stats_followers_minutes">%1$d minuter</string>
-    <string name="stats_followers_an_hour_ago">en timme sedan</string>
-    <string name="stats_followers_hours">%1$d timmar</string>
-    <string name="stats_followers_a_day">En dag</string>
     <string name="stats_followers_days">%1$d dagar</string>
+    <string name="stats_followers_a_day">En dag</string>
+    <string name="stats_followers_hours">%1$d timmar</string>
+    <string name="stats_followers_an_hour_ago">en timme sedan</string>
+    <string name="stats_followers_minutes">%1$d minuter</string>
     <string name="stats_followers_a_minute_ago">en minut sedan</string>
     <string name="stats_followers_seconds_ago">sekunder sedan</string>
-    <string name="stats_view_top_posts_and_pages">Inlägg &amp; sidor</string>
-    <string name="stats_view_videos">Videoklipp</string>
-    <string name="stats_view_publicize">Publicize</string>
     <string name="stats_view_followers">Följare</string>
+    <string name="stats_view_publicize">Publicize</string>
+    <string name="stats_view_videos">Videoklipp</string>
+    <string name="stats_view_top_posts_and_pages">Inlägg &amp; sidor</string>
     <string name="stats_view_countries">Länder</string>
     <string name="stats_likes">Gillar</string>
-    <string name="stats_timeframe_years">År</string>
-    <string name="stats_views">Visningar</string>
     <string name="stats_visitors">Besökare</string>
+    <string name="stats_views">Visningar</string>
+    <string name="stats_timeframe_years">År</string>
+    <string name="themes_fetching">Hämtar teman…</string>
     <string name="ssl_certificate_details">Detaljer</string>
     <string name="cab_selected">%d valda</string>
     <string name="browse_our_faq_button">Bläddra bland vanliga frågor</string>
     <string name="reader_empty_comments">Inga kommentarer än</string>
-    <string name="reader_label_view_original">Visa originalartikel</string>
+    <string name="reader_empty_posts_in_tag">Inga inlägg med detta ämne</string>
     <string name="reader_label_like">Gilla</string>
+    <string name="reader_label_view_original">Visa originalartikel</string>
     <string name="reader_label_comments_closed">Kommentarer inaktiverade</string>
     <string name="reader_title_photo_viewer">%1$d av %2$d</string>
     <string name="error_publish_empty_post">Det går inte att publicera ett tomt inlägg</string>
     <string name="error_refresh_unauthorized_posts">Du saknar behörighet för att visa eller redigera inlägg</string>
     <string name="error_refresh_unauthorized_pages">Du saknar behörighet för att visa eller redigera sidor</string>
     <string name="error_refresh_unauthorized_comments">Du saknar behörighet för att visa eller redigera kommentarer</string>
-    <string name="older_month">Äldre än en månad</string>
     <string name="more">Mer</string>
-    <string name="older_two_days">Äldre än 2 dagar</string>
+    <string name="older_month">Äldre än en månad</string>
     <string name="older_last_week">Äldre än en vecka</string>
+    <string name="older_two_days">Äldre än 2 dagar</string>
     <string name="mnu_comment_liked">Gillat</string>
     <string name="comment">Kommentar</string>
     <string name="comment_trashed">Kommentar förkastad</string>
-    <string name="posts_empty_list">Inga inlägg än. Varför inte skapa ett?</string>
     <string name="comment_reply_to_user">Svar till %s</string>
+    <string name="posts_empty_list">Inga inlägg än. Varför inte skapa ett?</string>
     <string name="signing_out">Loggar ut…</string>
-    <string name="reader_empty_posts_in_tag">Inga inlägg med detta ämne</string>
     <string name="reader_toast_err_generic">Kunde inte genomföra denna åtgärd</string>
-    <string name="reader_menu_block_blog">Blockera denna webbplats</string>
-    <string name="reader_toast_blog_blocked">Inlägg från denna webbplats kommer inte längre att visas</string>
     <string name="reader_toast_err_block_blog">Kunde inte blockera denna webbplats</string>
-    <string name="update_verb">Uppdatera</string>
+    <string name="reader_toast_blog_blocked">Inlägg från denna webbplats kommer inte längre att visas</string>
+    <string name="reader_menu_block_blog">Blockera denna webbplats</string>
     <string name="schedule_verb">Tidinställ</string>
-    <string name="reader_page_followed_blogs">Följda webbplatser</string>
-    <string name="reader_label_followed_blog">Webbplatsen följs</string>
-    <string name="reader_toast_err_get_blog_info">Kunde inte visa denna webbplats</string>
-    <string name="reader_toast_err_already_follow_blog">Du följer redan denna webbplats</string>
-    <string name="reader_toast_err_follow_blog">Kunde inte följa denna webbplats</string>
-    <string name="reader_toast_err_unfollow_blog">Kunde inte sluta följa denna webbplats</string>
+    <string name="update_verb">Uppdatera</string>
     <string name="reader_empty_recommended_blogs">Inga rekommenderade webbplatser</string>
-    <string name="reader_title_blog_preview">Läsarwebbplats</string>
-    <string name="reader_page_followed_tags">Följda ämnen</string>
+    <string name="reader_toast_err_unfollow_blog">Kunde inte sluta följa denna webbplats</string>
+    <string name="reader_toast_err_follow_blog">Kunde inte följa denna webbplats</string>
+    <string name="reader_toast_err_already_follow_blog">Du följer redan denna webbplats</string>
+    <string name="reader_toast_err_get_blog_info">Kunde inte visa denna webbplats</string>
+    <string name="reader_label_followed_blog">Webbplatsen följs</string>
     <string name="reader_hint_add_tag_or_url">Ange en URL eller ämne att följa</string>
-    <string name="help">Hjälp</string>
-    <string name="forgot_password">Glömt ditt lösenord?</string>
-    <string name="ssl_certificate_error">Ogiltigt SSL-ceritfikat</string>
+    <string name="reader_page_followed_blogs">Följda webbplatser</string>
+    <string name="reader_page_followed_tags">Följda ämnen</string>
+    <string name="reader_title_blog_preview">Läsarwebbplats</string>
     <string name="ssl_certificate_ask_trust">Om du vanligtvis kan nå denna webbplats utan problem kan felet betyda att någon försöker efterlikna webbplatsen och du borde inte fortsätta. Vill du lita på certifikatet ändå?</string>
-    <string name="no_network_message">Inget nätverk tillgängligt</string>
-    <string name="mnu_comment_unspam">Inte skräppost</string>
-    <string name="error_generic">Ett fel uppstod</string>
+    <string name="ssl_certificate_error">Ogiltigt SSL-ceritfikat</string>
+    <string name="help">Hjälp</string>
+    <string name="username_or_password_incorrect">Användarnamnet eller lösenordet som angavs är felaktigt</string>
+    <string name="email_invalid">Ange en giltig epostadress</string>
+    <string name="invalid_email_message">Din epostadress är ogilltig</string>
     <string name="error_downloading_image">Fel vid nedladdning av bild</string>
     <string name="error_load_comment">Kunde inte ladda kommentaren</string>
-    <string name="invalid_email_message">Din epostadress är ogilltig</string>
-    <string name="email_invalid">Ange en giltig epostadress</string>
-    <string name="username_or_password_incorrect">Användarnamnet eller lösenordet som angavs är felaktigt</string>
-    <string name="adding_cat_failed">Misslyckades lägga till kategori</string>
-    <string name="adding_cat_success">Kategorin tillagd</string>
-    <string name="cat_name_required">Kategorinamn måste anges</string>
-    <string name="theme_fetch_failed">Misslyckades hämta teman</string>
-    <string name="error_moderate_comment">Ett fel uppstod under modereringen</string>
     <string name="error_edit_comment">Ett fel uppstod under redigeringen av kommentaren</string>
+    <string name="error_moderate_comment">Ett fel uppstod under modereringen</string>
+    <string name="error_generic">Ett fel uppstod</string>
     <string name="error_refresh_comments">Kommentarerna kan inte uppdateras just nu</string>
     <string name="error_refresh_pages">Sidorna kunde inte uppdateras just nu</string>
     <string name="error_refresh_posts">Inläggen kunde inte uppdateras just nu</string>
-    <string name="gallery_error">Medieobjektet kunde inte hämtas</string>
-    <string name="blog_not_found">Ett fel uppstod vid anslutning till bloggen</string>
-    <string name="sdcard_message">Ett SD-kort är nödvändigt för att ladda upp media</string>
     <string name="error_deleting_post">Ett fel uppstod när inlägget skulle raderas</string>
     <string name="notifications_empty_list">Inga aviseringar</string>
-    <string name="select_categories">Välj kategorier</string>
-    <string name="connection_error">Kommunikationsfel</string>
-    <string name="cancel_edit">Avbryt redigering</string>
-    <string name="page_settings">Sidinställningar</string>
-    <string name="comment_status_approved">Godkänd</string>
-    <string name="edit_comment">Redigera kommentar</string>
-    <string name="mnu_comment_approve">Godkänn</string>
-    <string name="mnu_comment_spam">Skräppost</string>
-    <string name="mnu_comment_trash">Skräp</string>
-    <string name="dlg_approving_comments">Godkänner</string>
-    <string name="dlg_spamming_comments">Markera som skräppost</string>
-    <string name="dlg_trashing_comments">Skicka till papperskorg</string>
-    <string name="comment_status_spam">Skräppost</string>
-    <string name="saving_changes">Spara ändringarna</string>
-    <string name="sure_to_cancel_edit_comment">Avbryt redigeringen av denna kommentar?</string>
-    <string name="toast_comment_unedited">Kommentaren har inte ändrats</string>
-    <string name="add_new_category">Lägg till ny kategori</string>
-    <string name="category_name">Kategorinamn</string>
-    <string name="new_post">Nytt inlägg</string>
-    <string name="new_media">Ny media</string>
-    <string name="image_settings">Bildinställningar</string>
+    <string name="sdcard_message">Ett SD-kort är nödvändigt för att ladda upp media</string>
+    <string name="cat_name_required">Kategorinamn måste anges</string>
+    <string name="adding_cat_success">Kategorin tillagd</string>
+    <string name="adding_cat_failed">Misslyckades lägga till kategori</string>
+    <string name="mnu_comment_unspam">Inte skräppost</string>
+    <string name="theme_fetch_failed">Misslyckades hämta teman</string>
+    <string name="blog_not_found">Ett fel uppstod vid anslutning till bloggen</string>
+    <string name="gallery_error">Medieobjektet kunde inte hämtas</string>
+    <string name="no_network_message">Inget nätverk tillgängligt</string>
+    <string name="reader_toast_err_remove_tag">Kan inte ta bort detta ämne</string>
+    <string name="reader_toast_err_add_tag">Kan inte lägga till detta ämne</string>
+    <string name="reader_title_applog">Programlogg</string>
+    <string name="fatal_db_error">Ett fel uppstod vid skapandet av app-databasen. Försök återinstallera appen.</string>
+    <string name="error_blog_hidden">Den här bloggen är dold och kunde inte laddas. Aktivera den igen i inställningarna och försök igen.</string>
+    <string name="error_refresh_media">Det gick inte att förnya medialistan just nu</string>
     <string name="wordpress_blog">WordPress-blogg</string>
-    <string name="link_enter_url_text">Länktext (valfritt)</string>
-    <string name="local_draft">Lokalt utkast</string>
-    <string name="post_settings">Inläggsinställningar</string>
-    <string name="content_required">Kommentar krävs</string>
-    <string name="dlg_confirm_trash_comments">Kasta?</string>
-    <string name="view_in_browser">Visa i webbläsare</string>
-    <string name="http_authorization_required">Autentisering krävs</string>
+    <string name="image_settings">Bildinställningar</string>
     <string name="local_changes">Lokala ändringar</string>
     <string name="privacy_policy">Integritetspolicy</string>
-    <string name="fatal_db_error">Ett fel uppstod vid skapandet av app-databasen. Försök återinstallera appen.</string>
-    <string name="error_blog_hidden">Den här bloggen är dold och kunde inte laddas. Aktivera den igen i inställningarna och försök igen.</string>
-    <string name="reader_title_applog">Programlogg</string>
-    <string name="post_not_found">Ett fel uppstod vid inläsning av inlägget. Uppdatera dina inlägg och försök igen.</string>
-    <string name="learn_more">Läs mer</string>
-    <string name="comment_status_trash">Kastad</string>
+    <string name="new_media">Ny media</string>
+    <string name="new_post">Nytt inlägg</string>
+    <string name="notifications_empty_all">Inga aviseringar … ännu.</string>
+    <string name="http_authorization_required">Autentisering krävs</string>
+    <string name="invalid_site_url_message">Kontrollera att webbplatsens URL är giltig</string>
     <string name="open_source_licenses">Öppen källkodslicens</string>
-    <string name="media_gallery_type_thumbnail_grid">Rutnät av miniatyrer</string>
-    <string name="media_error_no_permission">Du har inte behörighet att visa mediebiblioteket</string>
-    <string name="cannot_delete_multi_media_items">En del medieobjekt kunde inte tas bort just nu. Försök igen senare.</string>
-    <string name="comment_status_unapproved">Väntande</string>
-    <string name="mnu_comment_unapprove">Godkänn ej</string>
-    <string name="dlg_unapproving_comments">Förkastar</string>
-    <string name="trash">Kasta bort</string>
     <string name="file_error_create">Kunde inte skapa temporär mediafil för uppladdning. Se till att det finns tillräckligt med utrymme på din enhet.</string>
+    <string name="category_name">Kategorinamn</string>
+    <string name="add_new_category">Lägg till ny kategori</string>
+    <string name="view_in_browser">Visa i webbläsare</string>
     <string name="remove_account">Ta bort webbplatsen</string>
-    <string name="invalid_site_url_message">Kontrollera att webbplatsens URL är giltig</string>
-    <string name="error_refresh_media">Det gick inte att förnya medialistan just nu</string>
+    <string name="toast_comment_unedited">Kommentaren har inte ändrats</string>
+    <string name="content_required">Kommentar krävs</string>
+    <string name="sure_to_cancel_edit_comment">Avbryt redigeringen av denna kommentar?</string>
+    <string name="saving_changes">Spara ändringarna</string>
+    <string name="trash">Kasta bort</string>
+    <string name="dlg_confirm_trash_comments">Kasta?</string>
+    <string name="dlg_trashing_comments">Skicka till papperskorg</string>
+    <string name="dlg_spamming_comments">Markera som skräppost</string>
+    <string name="dlg_unapproving_comments">Förkastar</string>
+    <string name="dlg_approving_comments">Godkänner</string>
+    <string name="mnu_comment_trash">Skräp</string>
+    <string name="mnu_comment_spam">Skräppost</string>
+    <string name="mnu_comment_unapprove">Godkänn ej</string>
+    <string name="mnu_comment_approve">Godkänn</string>
+    <string name="edit_comment">Redigera kommentar</string>
+    <string name="comment_status_trash">Kastad</string>
+    <string name="comment_status_spam">Skräppost</string>
+    <string name="comment_status_unapproved">Väntande</string>
+    <string name="comment_status_approved">Godkänd</string>
+    <string name="delete_page">Ta bort sida?</string>
+    <string name="delete_post">Ta bort inlägg?</string>
+    <string name="post_settings">Inläggsinställningar</string>
     <string name="file_not_found">Kunde inte hitta mediafilen att ladda upp. Kanske har den tagits bort eller flyttats?</string>
+    <string name="local_draft">Lokalt utkast</string>
+    <string name="page_settings">Sidinställningar</string>
+    <string name="link_enter_url_text">Länktext (valfritt)</string>
+    <string name="cannot_delete_multi_media_items">En del medieobjekt kunde inte tas bort just nu. Försök igen senare.</string>
+    <string name="media_error_no_permission">Du har inte behörighet att visa mediebiblioteket</string>
+    <string name="media_gallery_type_thumbnail_grid">Rutnät av miniatyrer</string>
+    <string name="learn_more">Läs mer</string>
+    <string name="post_not_found">Ett fel uppstod vid inläsning av inlägget. Uppdatera dina inlägg och försök igen.</string>
     <string name="plugin_not_found">Ett fel inträffade vid åtkomsten till detta tillägg</string>
-    <string name="delete_post">Ta bort inlägg?</string>
-    <string name="delete_page">Ta bort sida?</string>
-    <string name="notifications_empty_all">Inga aviseringar … ännu.</string>
-    <string name="reader_toast_err_remove_tag">Kan inte ta bort detta ämne</string>
-    <string name="reader_toast_err_add_tag">Kan inte lägga till detta ämne</string>
+    <string name="cancel_edit">Avbryt redigering</string>
+    <string name="connection_error">Kommunikationsfel</string>
+    <string name="select_categories">Välj kategorier</string>
     <string name="share_link">Dela länk</string>
     <string name="reader_empty_posts_in_tag_updating">Hämtar inlägg…</string>
-    <string name="reader_label_reply">Svara</string>
-    <string name="comment_spammed">Kommentar markerad som skräppost</string>
     <string name="reader_likes_you_and_multi">Du och %,d andra gillar detta</string>
     <string name="reader_likes_multi">%,d gillar detta</string>
+    <string name="reader_label_reply">Svara</string>
     <string name="cant_share_no_visible_blog">Du kan inte dela på WordPress utan att ha en synlig blogg</string>
-    <string name="pick_photo">Välj bild</string>
-    <string name="pick_video">Välj video</string>
-    <string name="reader_likes_you_and_one">Du och en annan gillar detta</string>
+    <string name="comment_spammed">Kommentar markerad som skräppost</string>
     <string name="reader_toast_err_get_post">Kunde inte hämta detta inlägg</string>
-    <string name="empty_list_default">Listan är tom</string>
-    <string name="reader_untitled_post">(Ingen titel)</string>
-    <string name="reader_view_reblog">Reblogga</string>
-    <string name="reader_btn_share">Dela</string>
-    <string name="reader_btn_follow">Följ</string>
-    <string name="reader_btn_unfollow">Följer</string>
-    <string name="reader_label_added_tag">Lade till %s</string>
-    <string name="reader_label_removed_tag">Tog bort %s</string>
-    <string name="reader_likes_one">En person gillar detta</string>
-    <string name="reader_likes_only_you">Du gillar detta</string>
-    <string name="reader_toast_err_comment_failed">Kunde inte kommentera</string>
-    <string name="reader_toast_err_tag_exists">Du följer redan detta ämne</string>
-    <string name="reader_toast_err_share_intent">Kunde inte dela</string>
-    <string name="reader_toast_err_view_image">Kunde inte visa bild</string>
+    <string name="reader_likes_you_and_one">Du och en annan gillar detta</string>
+    <string name="pick_video">Välj video</string>
+    <string name="pick_photo">Välj bild</string>
+    <string name="sign_up_label">Registrera</string>
     <string name="reader_toast_err_url_intent">Kunde inte öppna %s</string>
+    <string name="reader_toast_err_view_image">Kunde inte visa bild</string>
+    <string name="reader_toast_err_share_intent">Kunde inte dela</string>
+    <string name="reader_toast_err_tag_invalid">Det är inte ett giltigt ämne</string>
+    <string name="reader_toast_err_tag_exists">Du följer redan detta ämne</string>
+    <string name="reader_toast_err_comment_failed">Kunde inte kommentera</string>
+    <string name="reader_likes_only_you">Du gillar detta</string>
+    <string name="reader_likes_one">En person gillar detta</string>
+    <string name="reader_label_removed_tag">Tog bort %s</string>
+    <string name="reader_label_added_tag">Lade till %s</string>
     <string name="reader_hint_comment_on_comment">Svara kommentaren…</string>
+    <string name="reader_btn_unfollow">Följer</string>
+    <string name="reader_btn_follow">Följ</string>
+    <string name="reader_btn_share">Dela</string>
+    <string name="reader_view_reblog">Reblogga</string>
+    <string name="reader_untitled_post">(Ingen titel)</string>
     <string name="comments_empty_list">Inga kommentarer … än</string>
-    <string name="sign_up_label">Registrera</string>
-    <string name="reader_toast_err_tag_invalid">Det är inte ett giltigt ämne</string>
-    <string name="themes">Teman</string>
-    <string name="media_gallery_type_squares">Kvadrater</string>
-    <string name="media_gallery_type_tiled">Mosaik</string>
-    <string name="media_gallery_type_circles">Cirklar</string>
-    <string name="media_gallery_type_slideshow">Bildspel</string>
-    <string name="media_edit_title_text">Rubrik</string>
-    <string name="media_edit_caption_text">Bildtext</string>
-    <string name="media_edit_description_text">Beskrivning</string>
-    <string name="media_edit_failure">Kunde inte uppdatera</string>
-    <string name="theme_activate_button">Aktivera</string>
-    <string name="share_action">Dela</string>
-    <string name="stats">Statistik</string>
-    <string name="stats_view_clicks">Klick</string>
-    <string name="stats_view_tags_and_categories">Etiketter och kategorier</string>
-    <string name="stats_view_referrers">Hänvisningar</string>
-    <string name="stats_timeframe_today">I dag</string>
-    <string name="stats_timeframe_yesterday">I går</string>
-    <string name="stats_timeframe_days">Dagar</string>
-    <string name="stats_timeframe_weeks">Veckor</string>
+    <string name="empty_list_default">Listan är tom</string>
     <string name="stats_timeframe_months">Månader</string>
-    <string name="manage">Hantera</string>
+    <string name="stats_timeframe_weeks">Veckor</string>
+    <string name="stats_timeframe_days">Dagar</string>
+    <string name="stats_timeframe_yesterday">I går</string>
+    <string name="stats_timeframe_today">I dag</string>
+    <string name="stats_view_referrers">Hänvisningar</string>
+    <string name="stats_view_tags_and_categories">Etiketter och kategorier</string>
+    <string name="stats_view_clicks">Klick</string>
+    <string name="stats">Statistik</string>
+    <string name="share_action">Dela</string>
+    <string name="theme_activate_button">Aktivera</string>
+    <string name="media_edit_failure">Kunde inte uppdatera</string>
+    <string name="media_edit_description_text">Beskrivning</string>
+    <string name="media_edit_caption_text">Bildtext</string>
+    <string name="media_edit_title_text">Rubrik</string>
+    <string name="media_gallery_type_slideshow">Bildspel</string>
+    <string name="media_gallery_type_circles">Cirklar</string>
+    <string name="media_gallery_type_tiled">Mosaik</string>
+    <string name="media_gallery_type_squares">Kvadrater</string>
+    <string name="themes">Teman</string>
     <string name="discard">Kasta bort</string>
-    <string name="sign_in">Logga in</string>
-    <string name="note_reply_successful">Svar publicerat</string>
+    <string name="manage">Hantera</string>
     <string name="more_notifications">och %d mer.</string>
-    <string name="follows">Följer</string>
     <string name="new_notifications">%d nya aviseringar</string>
+    <string name="follows">Följer</string>
+    <string name="note_reply_successful">Svar publicerat</string>
+    <string name="sign_in">Logga in</string>
     <string name="loading">Laddar…</string>
-    <string name="httpuser">HTTP-användarnamn</string>
     <string name="httppassword">HTTP-lösenord</string>
+    <string name="httpuser">HTTP-användarnamn</string>
     <string name="error_media_upload">Ett fel uppstod vid uppladdning av media</string>
     <string name="incorrect_credentials">Felaktigt användarnamn eller lösenord.</string>
-    <string name="password">Lösenord</string>
-    <string name="username">Användarnamn</string>
     <string name="log_in">Logga in</string>
+    <string name="username">Användarnamn</string>
+    <string name="password">Lösenord</string>
     <string name="reader">Läsare</string>
-    <string name="no_network_title">Inget nätverk tillgängligt</string>
     <string name="pages">Sidor</string>
     <string name="posts">Inlägg</string>
     <string name="anonymous">Anonym</string>
-    <string name="ok">OK</string>
+    <string name="no_network_title">Inget nätverk tillgängligt</string>
     <string name="done">klart</string>
+    <string name="ok">OK</string>
     <string name="link_enter_url">URL</string>
-    <string name="version">Version</string>
     <string name="tos">Allmänna villkor</string>
+    <string name="version">Version</string>
     <string name="app_title">WordPress for Android</string>
     <string name="image_alignment">Justering</string>
     <string name="refresh">Uppdatera</string>
@@ -2478,24 +2791,24 @@ Language: sv_SE
     <string name="quickpress_add_error">Genvägsnamn kan inte vara tomt</string>
     <string name="pages_private">Privat</string>
     <string name="title">Titel</string>
-    <string name="categories">Kategorier</string>
     <string name="tags_separate_with_commas">Separera etiketter med kommatecken</string>
+    <string name="categories">Kategorier</string>
     <string name="dlg_deleting_comments">Raderar kommentarer</string>
     <string name="sdcard_title">SD-kort krävs</string>
     <string name="media">Media</string>
-    <string name="delete">Radera</string>
     <string name="approve">Godkänn</string>
+    <string name="delete">Radera</string>
     <string name="none">Ingen</string>
+    <string name="publish_now">Publicera nu</string>
     <string name="reply">Svara</string>
-    <string name="cancel">Avbryt</string>
-    <string name="save">Spara</string>
-    <string name="add">Lägg till</string>
+    <string name="on">om</string>
+    <string name="preview">Förhandsgranska</string>
     <string name="category_refresh_error">Fel vid uppdatering av kategorier</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nej</string>
     <string name="error">Fel</string>
-    <string name="preview">Förhandsgranska</string>
-    <string name="on">om</string>
+    <string name="no">Nej</string>
+    <string name="yes">Ja</string>
     <string name="notification_settings">Aviseringsinställningar</string>
-    <string name="publish_now">Publicera nu</string>
+    <string name="add">Lägg till</string>
+    <string name="save">Spara</string>
+    <string name="cancel">Avbryt</string>
 </resources>
diff --git a/WordPress/src/main/res/values-sw600dp-land/dimens.xml b/WordPress/src/main/res/values-sw600dp-land/dimens.xml
index bda7d09cc226..4fd176a6882f 100644
--- a/WordPress/src/main/res/values-sw600dp-land/dimens.xml
+++ b/WordPress/src/main/res/values-sw600dp-land/dimens.xml
@@ -2,6 +2,4 @@
     <dimen name="reader_detail_margin">@dimen/reader_detail_margin_tablet_landscape</dimen>
 
     <dimen name="bottom_sheet_dialog_width">512dp</dimen>
-
-    <dimen name="hpp_maximum_container_width">800dp</dimen>
 </resources>
diff --git a/WordPress/src/main/res/values-th/strings.xml b/WordPress/src/main/res/values-th/strings.xml
index 21c2267f0eb3..64c810ef8183 100644
--- a/WordPress/src/main/res/values-th/strings.xml
+++ b/WordPress/src/main/res/values-th/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2016-12-01 04:20:36+0000
 Plural-Forms: nplurals=1; plural=0;
@@ -34,7 +34,6 @@ Language: th
     <string name="site_settings_rp_preview1_site">ใน \"มือถือ\"</string>
     <string name="site_settings_rp_show_images_title">แสดงรูปภาพ</string>
     <string name="site_settings_rp_show_header_title">แสดงส่วนหัว</string>
-    <string name="site_settings_whitelist_hint">ผู้เขียนความเห็นต้องมีความเห็นก่อนหน้าที่ได้รับอนุมัติแล้ว</string>
     <string name="site_settings_user_account_required_hint">ผู้ใช้ต้องลงทะเบียนและเข้าสู่ระบบเพื่อจะเขียนความเห็น</string>
     <string name="site_settings_identity_required_hint">ผู้เขียนความเห็นต้องใส่ชื่อและอีเมล</string>
     <string name="site_settings_sort_by_hint">กำหนดลำดับความเห็นที่จะแสดง</string>
@@ -50,17 +49,13 @@ Language: th
     <string name="site_settings_password_hint">เปลี่ยนรหัสผ่านของคุณ</string>
     <string name="site_settings_username_hint">บัญชีผู้ใช้ปัจจุบัน</string>
     <string name="site_settings_privacy_hint">กำหนดว่าใครสามารถเห็นเว็บของคุณได้</string>
-    <string name="site_settings_whitelist_known_summary">ความเห็นจากผู้ใช้ที่รู้จัก</string>
-    <string name="site_settings_whitelist_all_summary">ความเห็นจากผู้ใช้ทั้งหมด</string>
     <string name="site_settings_threading_summary">%d ระดับ</string>
     <string name="site_settings_privacy_private_summary">ส่วนตัว</string>
     <string name="site_settings_privacy_hidden_summary">ซ่อน</string>
     <string name="site_settings_delete_site_title">ลบเว็บ</string>
     <string name="site_settings_privacy_public_summary">สาธารณะ</string>
-    <string name="site_settings_blacklist_title">บัญชีดำ</string>
     <string name="site_settings_moderation_hold_title">กดค้างเพื่อจัดการ</string>
     <string name="site_settings_multiple_links_title">ลิงก์ในความเห็น</string>
-    <string name="site_settings_whitelist_title">อนุมัติอัตโนมัติ</string>
     <string name="site_settings_sort_by_title">เรียงตาม</string>
     <string name="site_settings_account_required_title">ผู้ใช้ต้องเข้าสู่ระบบ</string>
     <string name="site_settings_identity_required_title">ต้องประกอบด้วยชื่อและอีเมล</string>
@@ -191,7 +186,6 @@ Language: th
     <string name="reader_label_new_posts">เรื่องใหม่</string>
     <string name="error_copy_to_clipboard">มีความผิดพลาดเกิดขึ้นขณะกำลังคัดลอกข้อความไปยังคลิปบอร์ด</string>
     <string name="logs_copied_to_clipboard">ปูมแอพพลิเคชั่นถูกคัดลอกลงคลิปบอร์ด</string>
-    <string name="reader_page_recommended_blogs">เว็บที่คุณอาจจะชอบ</string>
     <string name="stats_view_top_posts_and_pages">เรื่องและหน้า</string>
     <string name="stats_view_videos">วีดีโอ</string>
     <string name="stats_view_followers">ผู้ติดตาม</string>
@@ -240,7 +234,6 @@ Language: th
     <string name="schedule_verb">ตารางงาน</string>
     <string name="reader_page_followed_blogs">เว็บที่ติดตามแล้ว</string>
     <string name="help">ช่วยเหลือ</string>
-    <string name="forgot_password">จำรหัสผ่านของคุณไม่ได้?</string>
     <string name="ssl_certificate_error">SSL certificate ใช้งานไม่ได้</string>
     <string name="ssl_certificate_ask_trust">ถ้าคุณสามารถเชื่อมต่อกับเว็บนี้บ่อย ๆ โดยไม่มีปัญหา  ความผิดพลาดนี้อาจหมายถึงมีบางคนพยายามเปลี่ยนแปลงเว็บทำให้คุณไม่สามารถดำเนินการต่อได้  คุณต้องการที่จะเชื่อใจการรับรองนี้หรือไม่?</string>
     <string name="mnu_comment_unspam">ไม่ใช่สแปม</string>
diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml
index 7ebb7d77cd22..6bb994570b1a 100644
--- a/WordPress/src/main/res/values-tr/strings.xml
+++ b/WordPress/src/main/res/values-tr/strings.xml
@@ -1,50 +1,521 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-17 00:56:33+0000
+Translation-Revision-Date: 2021-05-11 11:54:48+0000
 Plural-Forms: nplurals=2; plural=n > 1;
 Generator: GlotPress/3.0.0-alpha.2
 Language: tr
 -->
 <resources>
-    <string name="gutenberg_native_search_or_type_url">URL arayın veya yazın</string>
+    <string name="gutenberg_native_size">Boyut</string>
+    <string name="gutenberg_native_image_settings">Görsel ayarları</string>
+    <string name="gutenberg_native_audio_settings">Ses ayarları</string>
+    <string name="user_profile_untitled_site">(Başlıksız)</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_bottom_sheet_description">Kullanıcı profili alt sayfa bilgileri</string>
+    <string name="likes_list_screen_title">Beğeniler listesi %s</string>
+    <string name="gutenberg_native_write_code">Kod yaz…</string>
+    <string name="gutenberg_native_sorting_and_filtering">Sıralama ve filtreleme</string>
+    <string name="gutenberg_native_show_download_button">İndirme düğmesini göster</string>
+    <string name="gutenberg_native_shortcode">Kısa kod</string>
+    <string name="gutenberg_native_read_more">Devamını Oku</string>
+    <string name="gutenberg_native_preload">Ön yükleme</string>
+    <string name="gutenberg_native_post_meta_settings">Yazı meta ayarları</string>
+    <string name="gutenberg_native_post_content_settings">Yazı içeriği ayarları</string>
+    <string name="gutenberg_native_metadata">Meta bilgileri</string>
+    <string name="gutenberg_native_media_file">Ortam dosyası</string>
+    <string name="gutenberg_native_media_area">Ortam alanı</string>
+    <string name="gutenberg_native_loop">Döngü</string>
+    <string name="gutenberg_native_link_to_12d6f96a">Bağlantı</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">galeri içinde görsel %1$d / %2$d</string>
+    <string name="gutenberg_native_heading_d">Başlık %d</string>
+    <string name="gutenberg_native_featured">Öne çıkan</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">Buraya gömülecek bağlantıyı girin…</string>
+    <string name="gutenberg_native_edit_image">Görseli düzenle</string>
+    <string name="gutenberg_native_display_post_date">Yazı tarihini göster</string>
+    <string name="gutenberg_native_code">Kod</string>
+    <string name="gutenberg_native_change_heading_level">Başlık seviyesini değiştir</string>
+    <string name="gutenberg_native_browser_default">Tarayıcı varsayılanı</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">Blok silindi veya kullanılamıyor.</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">Blok kendi içinde oluşturulamaz.</string>
+    <string name="gutenberg_native_autoplay">Otomatik oynat</string>
+    <string name="gutenberg_native_auto">Otomatik</string>
+    <string name="gutenberg_native_attachment_page">Ek sayfası</string>
+    <string name="gutenberg_native_add_text">Metin ekle…</string>
+    <string name="gutenberg_native_add_caption">Başlık ekle</string>
+    <string name="gutenberg_native_what_is_alt_text">Alternatif metin nedir?</string>
+    <string name="gutenberg_native_transform_s_to">%s öğesini şuna dönüştür:</string>
+    <string name="gutenberg_native_transform_block">Bloku dönüştür…</string>
+    <string name="gutenberg_native_failed_to_insert_media">Medya eklenemedi.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">Ses dosyası eklenemedi.</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">Görselin amacını açıklayın. Görsel tamamen dekoratif amaçlıysa boş bırakın. </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s, %2$s olarak dönüştürüldü</string>
+    <string name="like_faces_error_loading_message">Beğeni verileri yüklenirken hata oluştu. %s.</string>
+    <string name="like_faces_plural_text">%d blog yazarı bunu beğendi.</string>
+    <string name="like_faces_singular_text">1 blog yazarı bunu beğendi.</string>
+    <string name="like_title_plural">%d Beğenilenler</string>
+    <string name="like_title_singular">1 beğeni</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Tehditleri gidermek için sunucu kimlik bilgilerinizi girin.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Tehdidi gidermek için sunucu kimlik bilgilerinizi girin.</string>
+    <string name="suggestion">Öneri:</string>
+    <string name="gutenberg_native_search_blocks">Arama blokları</string>
+    <string name="gutenberg_native_search_block">Arama bloğu</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">birimi değiştirmek için iki kez dokunun</string>
+    <string name="gutenberg_native_clear_search">Aramayı temizle</string>
+    <string name="gutenberg_native_cancel_search">Aramayı iptal et</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s, %3$s %4$s.</string>
+    <string name="get_likes_empty_state_title">Beğeni verileri alınırken bir hata oluştu</string>
+    <string name="get_likes_unknown_error">Beğeniler alınırken bilinmeyen bir hata oluştu.</string>
+    <string name="get_likes_no_network_error">Kullanılabilir ağ yok.</string>
+    <string name="comments_empty_list_filtered_unreplied">Cevaplanmamış yorum yok</string>
+    <string name="comment_status_unreplied">Cevaplanmamış</string>
+    <string name="gutenberg_native_table_of_contents">İçerik tablosu</string>
+    <string name="gutenberg_native_summary">özet</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">Gönderinizi bir başlık listesiyle özetleyin.  HTML bağlantılarını buraya bağlamak için Başlık bloklarına ekleyin.</string>
+    <string name="gutenberg_native_document_outline">belge taslağı</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">Her zaman izin verilen IP adresleri</string>
+    <string name="site_settings_denylist_title">İzin verilmeyen yorumlar</string>
+    <string name="reader_title_interests">Konuları takip et</string>
+    <string name="stories_intro_main_subtitle">Sitenizde ilgi çekici içerik oluşturmanın ve yayınlamanın yeni bir yolu.</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Kapat</string>
+    <string name="activity_log_backup_download_notice_download_action">İndir</string>
+    <string name="threat_fix_all_status_success_message_plural">Tehditler başarıyla düzeltildi.</string>
+    <string name="threat_fix_all_confirmation_message_plural">Lütfen tüm %s aktif tehdidi düzeltmek istediğinizi onaylayın.</string>
+    <string name="scan_idle_threats_description_plural">Tarama işlemi %2$s üzerinde %1$s olası tehdit buldu. Lütfen aşağıdan bunları inceleyin ve gereken adımı atın veya tümünü düzelt düğmesine dokunun. Bize  ihtiyacın olursa %3$s.</string>
+    <string name="scan_fixing_threats_description_plural">Arka planda bu tehditleri düzeltmek için çok çalışıyoruz. Bu arada sitenizi normal bir şekilde kullanmaya devam edebilirsiniz, ilerlemeyi istediğiniz zaman kontrol edebilirsiniz.</string>
+    <string name="gutenberg_native_edit_focal_point">Odak noktasını düzenle</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">Görseli düzenlemek, değiştirmek veya temizlemek üzere alt sayfayı açmak için iki kez dokunun</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">Görseli düzenlemek, değiştirmek veya temizlemek üzere eylem sayfasını açmak için iki kez dokunun</string>
+    <string name="new_site_creation_search_domain_example">ornek.com</string>
+    <string name="new_site_creation_search_domain_input_hint">Siteniz için bir ad yazın</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;Tüm görevler tamamlandı&lt;/b&gt;&lt;br/&gt;Daha fazla kişiye ulaşacaksınız. İyi iş!</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;Tüm görevler tamamlandı&lt;/b&gt; &lt;br/&gt;Sitenizi özelleştirdiniz. İyi iş!</string>
+    <string name="quick_start_card_menu_hide">Şimdilik gizle</string>
+    <string name="magic_link_not_meaning_to_create_account">Yeni bir hesap oluşturmak istemediniz mi? E-posta adresinizi yeniden girmek için geri dönün.</string>
+    <string name="invite_links_disable_dialog_message">Davet bağlantısı etkisizleştirildiğinde, ekibinizden kimse katılamaz. Emin misiniz?</string>
+    <string name="invite_links_disable_dialog_title">Davet bağlantısını etkisizleştir</string>
+    <string name="invite_links_bad_format_response">Geçersiz yanıt alındı</string>
+    <string name="invite_links_null_response">Yanıt alınamadı</string>
+    <string name="invite_links_cannot_get_role_data_error">%1$s rolü için veri alınırken bir hata oluştu</string>
+    <string name="invite_links_cannot_get_roles_error">Rol alınırken bir hata oluştu</string>
+    <string name="invite_links_generic_get_data_error">Davet bağlantıları verilerini alırken bilinmeyen hata</string>
+    <string name="invite_links_helper_text">Ekibinizin üyelerini tek tek davet etmek zorunda kalmadan dahil etmek için bu bağlantıyı kullanın. Bu bağlantıya tıklayan herkes, başkasından bile almış olsa, kurumunuza dahil olabilir. O nedenle, sadece güvendiğiniz kişilerle paylaşmaya dikkat edin.</string>
+    <string name="invite_links_expire_date">Son kullanma tarihi: %1$s</string>
+    <string name="invite_links_disable_invite_link">Davet bağlantısını etkisizleştir</string>
+    <string name="invite_links_share_invite_link">Davet bağlantısını paylaş</string>
+    <string name="invite_links_generate">Yeni bağlantı oluştur</string>
+    <string name="invite_links_get_status_retry">Bağlantı durumunu yenile</string>
+    <string name="invite_links_section_title">Davet bağlantısı</string>
+    <string name="threats_found_singular">Tehdit bulundu</string>
+    <string name="threats_found_plural">Tehditler bulundu</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Tarama tamamlandı&lt;/b&gt; &lt;br&gt; %s Olası tehditler bulundu</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Tarama tamamlandı&lt;/b&gt; &lt;br&gt; Bir olası tehdit bulundu</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Tarama Bitti&lt;/b&gt; &lt;br&gt; Tehdit bulunmadı</string>
+    <string name="scan_fixing_threats_title_singular">Tehditler düzeltiliyor</string>
+    <string name="disable">Etkisizleştir</string>
+    <string name="quick_start_card_menu_unpin">Sabitlemeyi kaldır</string>
+    <string name="quick_start_list_review_pages_subtitle">Sayfalarınızı kontrol edin ve değişiklikler yapın veya sayfa ekleyin ya da kaldırın.</string>
+    <string name="quick_start_list_view_site_title">Sitenizi ziyaret edin</string>
+    <string name="quick_start_list_upload_icon_subtitle">Göz alıcı ve profesyonel bir görünüm için bir site simgesi ekleyin.</string>
+    <string name="quick_start_list_follow_site_subtitle">Size ilham veren siteleri keşfedin ve takip edin.</string>
+    <string name="quick_start_list_enable_sharing_title">Paylaşımı etkinleştir</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Yeni yazıları sosyal medyanızda otomatik olarak paylaşın.</string>
+    <string name="quick_start_list_update_site_title_subtitle">Sitenize kişiliğini ve konuyu yansıtan bir ad verin.</string>
+    <string name="quick_start_list_check_stats_title">İstatistiklerinizi kontrol edin</string>
+    <string name="backup_download_status_failure_bullet2">Yine de indirilebilir yedek dosyanızı oluşturmaya çalışacağız.</string>
+    <string name="backup_download_status_failure_bullet1">İndirilebilir yedeğinizin hazırlanmasının ne kadar süreceğini ilişkin bir durum bilgisi bulunamadı.</string>
+    <string name="backup_download_status_failure_heading">Maalesef indirilebilir yedeğinizin durum bilgisi bulunamadı</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Onay işareti simgesi</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Saat simgesi</string>
+    <string name="restore_status_failure_bullet3">Tamamlandığında sizi bilgilendireceğiz.</string>
+    <string name="restore_status_failure_bullet2">Yine de sitenizi geri yüklemeyi deneyeceğiz.</string>
+    <string name="restore_status_failure_bullet1">Geri yüklemenizin ne kadar süreceğine ilişkin durum bilgisi bulunamadı.</string>
+    <string name="restore_status_failure_heading">Maalesef geri yükleme ile ilgili durum bilgisi bulunamadı</string>
+    <string name="restore_complete_failed_description">Sitenizi geri yükleyemedik</string>
+    <string name="restore_warning_action_button">Onayla</string>
+    <string name="restore_warning_description_with_two_parameters">Sitenizi %1$s, %2$s durumuna geri döndürmek istediğinizden emin misiniz?\n        O zamandan beri değiştirdiğiniz her şey kaybolacak</string>
+    <string name="backup_download_complete_failed_description"> Yedeğinizi oluşturamadık</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(temalar, eklentiler ve yüklemeler hariç)</string>
+    <string name="backup_item_contents">WP-content dizini</string>
+    <string name="backup_item_roots">WordPress kök dizini</string>
+    <string name="backup_download_details_choose_items_header">Bu indirmeye dahil olan öğeler</string>
+    <string name="gutenberg_native_uploading">Yükleniyor…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">Yeniden kullanılabilir bloklar iOS için WordPress\'te düzenlenemez</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">Yeniden kullanılabilir bloklar Android için WordPress\'te düzenlenemez</string>
+    <string name="gutenberg_native_replace_file">Dosyayı değiştir</string>
+    <string name="gutenberg_native_replace_audio">Sesi değiştir</string>
+    <string name="gutenberg_native_problem_opening_the_audio">Sesi açma sorunu</string>
+    <string name="gutenberg_native_open">AÇIK</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">Hiçbir uygulama bu isteği yerine getiremiyor.</string>
+    <string name="gutenberg_native_lock_icon">Kilit simgesi</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">Ses dosyası eklenemedi. Seçenekler için lütfen dokunun.</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">Bir ses dosyası seçmek için iki kez dokunun</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">Ses dosyasını dinlemek için iki kez dokunun</string>
+    <string name="gutenberg_native_choose_audio">Ses seç</string>
+    <string name="gutenberg_native_audio_player">Ses oynatıcı</string>
+    <string name="gutenberg_native_audio_file"> ses dosyası</string>
+    <string name="gutenberg_native_audio_caption_s">Ses yazısı. %s</string>
+    <string name="gutenberg_native_audio_caption_empty">Ses yazısı. Boş</string>
+    <string name="gutenberg_native_add_audio">SES EKLE</string>
+    <string name="continue_with_wpcom">WordPress.com\'a giriş yapın veya kaydolun</string>
+    <string name="photo_picker_use_audio">Bu sesi kullan</string>
+    <string name="photo_picker_choose_audio">Cihazdan ses seç</string>
+    <string name="people_optional_custom_message_helper_text">İsteğe bağlı: Davetinizle birlikte gönderilecek özel bir mesaj girin.</string>
+    <string name="people_learn_more_about_roles">Roller hakkında daha fazla bilgi edinin</string>
+    <string name="threat_status_fixed">Sabit</string>
+    <string name="threat_found_header">Bulundu</string>
+    <string name="scan_here_to_help">yardım etmek için buradayım</string>
+    <string name="scan_idle_threats_description_singular">Tarama işlemi %1$s üzerinde bir olası tehdit buldu. Lütfen aşağıdan tehdidi inceleyin ve gereken adımı atın veya tümünü düzelt düğmesine dokunun. Bize  ihtiyacın olursa %2$s.</string>
+    <string name="scan_idle_manual_scan_description">Sitenizi yeniden gözden geçirmek için manuel bir tarama yapın veya Jetpack\'in sitenizi bugün daha sonra taramasını bekleyin.</string>
+    <string name="scan_provisioning_description">Jetpack Scan\'e hoş geldiniz! Sitenize göz atıyor ve tam bir tarama yapacak şekilde ayarlıyoruz. Taramayı etkileyebilecek herhangi bir sorun tespit edersek size haber vereceğiz, ardından ilk tam taramanız başlayacaktır.</string>
+    <string name="scan_scanning_is_initial_description">Jetpack Scan\'e hoşgeldiniz. Şimdi sitenize bakıyoruz, az sonra sonuçları sizinle de paylaşacağız.</string>
+    <string name="scan_fixing_threats_description_singular">Arka planda bu tehditleri düzeltmek için çok çalışıyoruz. Bu arada sitenizi normal şekilde kullanmaya devam edebilir ve ilerleme durumunu istediğiniz zaman kontrol edebilirsiniz.</string>
+    <string name="scan_scanning_description">Tarama tamamlandığında size bir bildirim göndereceğiz. Bu arada sitenizi normal şekilde kullanmaya devam edebilir ve ilerleme durumunu istediğiniz zaman kontrol edebilirsiniz.</string>
+    <string name="scan_fixing_threats_title_plural">Tehditler düzeltiliyor</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan sitenizin taramasını tamamlayamadı. Lütfen sitenizin devre dışı olup olmadığını kontrol edin, değilse tekrar deneyin. Devre dışıysa veya Jetpack Scan\'de hâlâ sorun varsa destek ekibimizle iletişime geçin.</string>
+    <string name="scan_request_failed_title">Bir şeyler yanlış gitti</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Site yedekleniyor</string>
+    <string name="activity_log_currently_backing_up_message">Siteden %1$s %2$s kaynağından yedekleniyor</string>
+    <string name="activity_log_currently_backing_up_title">İndirilebilir yedek oluşturuluyor</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Siteniz başarıyla yedeklendi</string>
+    <string name="activity_log_backup_finished_snackbar_message">Siteniz başarıyla yedeklendi\n%1$s %2$s kaynağından yedeklendi</string>
+    <string name="activity_log_backup_started_snackbar_message">Siteniz yedekleniyor\n%1$s %2$s kaynağından yedekleniyor</string>
+    <string name="pick_audio">Ses seç</string>
+    <string name="restore_another_process_running">Çalışan başka bir geri yükleme var.</string>
+    <string name="restore_complete_failed_icon_content_description">Hata simgesi</string>
+    <string name="restore_complete_failed_action_button_content_description">Bitti düğmesi</string>
+    <string name="restore_complete_failed_title">Geri yükleme başarısız oldu</string>
+    <string name="restore_complete_visit_site_button_content_description">Siteyi ziyaret et düğmesi</string>
+    <string name="restore_complete_done_button_content_description">Bitti düğmesi</string>
+    <string name="restore_complete_icon_content_description">Geri yükle simgesi</string>
+    <string name="restore_complete_visit_site_action_button">Siteyi ziyaret et</string>
+    <string name="restore_complete_description_with_two_parameters">Seçtiğiniz tüm öğeler şimdi %1$s %2$s konumuna geri yüklendi.</string>
+    <string name="restore_complete_header">Siteniz geri yüklendi</string>
+    <string name="restore_progress_label">%%%1$s</string>
+    <string name="restore_progress_footnote">Beklemeye gerek yok. Siteniz tamamen geri yüklendiğinde sizi bilgilendireceğiz.</string>
+    <string name="restore_progress_icon_content_description">Siteyi geri yükle simgesi</string>
+    <string name="restore_progress_description_with_two_parameters">Siteniz %1$s %2$s konumuna geri yükleniyor.</string>
+    <string name="restore_progress_header">Site şu anda geri yükleniyor</string>
+    <string name="restore_warning_action_button_content_description">Siteyi geri yüklemeyi onayla düğmesi</string>
+    <string name="restore_warning_icon_content_description">Ünlem işaretli kırmızı daire resmi</string>
+    <string name="restore_warning_header">Uyarı</string>
+    <string name="restore_details_action_button_content_description">Site geri yüklemesini onayla düğmesi</string>
+    <string name="restore_details_icon_content_description">Geri yükle simgesi</string>
+    <string name="restore_details_action_button">Siteyi geri yükle</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s, geri yüklemeniz için seçilen noktadır.</string>
+    <string name="restore_details_header">Siteyi geri yükle</string>
+    <string name="restore_details_choose_items_header">Geri döndürülecek öğeleri seçin:</string>
+    <string name="restore">Geri yükle</string>
+    <string name="backup_download_complete_failed_icon_content_description">X simgeli Cloud</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Tamam düğmesi</string>
+    <string name="backup_download_complete_failed_action_button">Tamam</string>
+    <string name="backup_download_complete_failed_title">Dosya indirilemedi</string>
+    <string name="web_preview_tablet">Tablet</string>
+    <string name="web_preview_mobile">Mobil</string>
+    <string name="quick_start_card_menu_remove">Tekrar gösterme</string>
+    <string name="quick_start_card_menu_pin">Sabitle</string>
+    <string name="quick_start_dialog_review_pages_message_short">Sayfa listenizi görmek için %1$s Sayfalar %2$s öğesini seçin.</string>
+    <string name="quick_start_dialog_review_pages_message">Sitenizde sayfaları değiştirin, ekleyin veya kaldırın.</string>
+    <string name="quick_start_dialog_review_pages_title">Site sayfalarını inceleyin</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">Ana Sayfanızı düzenlemek için %1$s Ana Sayfa %2$s öğesini seçin.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">Sayfa listenizi görmek için %1$s Sayfalar %2$s öğesini seçin.</string>
+    <string name="quick_start_dialog_edit_homepage_message">Sitenizin ana sayfasında içeriği değiştirin, ekleyin veya kaldırın.</string>
+    <string name="quick_start_dialog_edit_homepage_title">Ana sayfanızı düzenleyin</string>
+    <string name="reader_menu_mark_as_unseen">Görülmedi olarak işaretle</string>
+    <string name="reader_menu_mark_as_seen">Görüldü olarak işaretle</string>
+    <string name="error_media_upload_failed_for_reason">Medya yüklenemedi.\n%1$s</string>
+    <string name="error_media_not_enough_storage">Sitede yeterli depolama alanı yok</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Bu gönderinin görüldü durumu değiştirilemiyor</string>
+    <string name="reader_marked_post_as_unseen">Yayın görülmedi olarak işaretlendi</string>
+    <string name="reader_marked_post_as_seen">Yayın görüldü olarak işaretlendi</string>
+    <string name="threat_fix_all_status_error_message">Düzeltme durumu alınırken hata oluştu. Lütfen destek ekibimizle iletişime geçin.</string>
+    <string name="threat_fix_all_status_success_message_singular">Tehditler başarıyla düzeltildi.</string>
+    <string name="threat_fix_all_error_message">Tehditler düzeltilirken hata oluştu. Lütfen destek ekibimizle iletişime geçin.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Lütfen bir aktif tehdidi düzeltmek istediğinizi onaylayın.</string>
+    <string name="threat_fix_all_warning_title">Tüm tehditleri gider</string>
+    <string name="threat_ignore_error_message">Tehdit yok sayılırken hata oluştu. Lütfen destek birimine başvurun.</string>
+    <string name="threat_ignore_success_message">Tehdit yok sayıldı.</string>
+    <string name="threat_ignore_warning">Zararsız olduğundan kesinlikle emin değilseniz bir güvenlik sorununu görmezden gelmemelisiniz. Bu tehdidi göz ardı etmeyi seçerseniz &lt;b&gt;%s&lt;/b&gt; sitenizde kalacaktır.</string>
+    <string name="threat_fix_error_message">Tehdit düzeltilirken hata oluştu. Lütfen destek ekibimizle iletişime geçin.</string>
+    <string name="threat_item_sub_header_status_ignored">Tehdit göz ardı edildi</string>
+    <string name="threat_item_sub_header_status_fixed_on">%s üzerindeki tehdit düzeltildi</string>
+    <string name="threat_fixing">Tehditler düzeltiliyor</string>
+    <string name="scan_history_ignored_threats_tab">Yok sayıldı</string>
+    <string name="scan_history_no_threats_found">Hiç bir öğe bulunamadı</string>
+    <string name="scan_history_fixed_threats_tab">Sabit</string>
+    <string name="scan_history_all_threats_tab">Tümü</string>
+    <string name="scan_scanning_title">Dosyalar taranıyor</string>
+    <string name="scan_preparing_to_scan_title">Taramaya hazırlık</string>
+    <string name="scan_history_menu_title">Geçmiş</string>
+    <string name="scan_history">Tarama Geçmişi</string>
+    <string name="backup_active_filter_empty_subtitle">Tarih aralığınızı ayarlamayı deneyin</string>
+    <string name="backup_active_filter_empty_title">Eşleşen yedek bulunamadı</string>
+    <string name="backup_empty_subtitle">İlk yedeğiniz 24 saat içinde burada görünecek. Yedekleme tamamlandığında size haber vereceğiz.</string>
+    <string name="backup_empty_title">İlk yedeğiniz az sonra hazır olacak</string>
+    <string name="request_failed_message">İstek işlenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin.</string>
+    <string name="gutenberg_native_move_to_bottom">Alta taşı</string>
+    <string name="gutenberg_native_change_block_position">Blok konumunu değiştir</string>
+    <string name="label_control_upload">Yükle</string>
+    <string name="jetpack_icon_content_description">simge</string>
+    <string name="backup_download_complete_info">Ayrıca size dosyanızın bağlantısını da e-postayla gönderdik.</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Bağlantıyı paylaş düğmesi</string>
+    <string name="backup_download_complete_download_action_button_content_description">İndirme düğmesi</string>
+    <string name="backup_download_complete_icon_content_description">İndirilebilir yedekleme hazır simgesi</string>
+    <string name="backup_download_complete_download_share_action_button">Bağlantıyı paylaş</string>
+    <string name="backup_download_complete_download_action_button">İndir</string>
+    <string name="backup_download_complete_description_with_two_parameters">%1$s %2$s üzerinden başarıyla sitenizin bir yedeğini oluşturduk.</string>
+    <string name="backup_download_complete_header">Yedeklemeniz artık indirilebilir</string>
+    <string name="backup_download_complete_page_title">Yedeklemeniz</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">Beklemeye gerek yok. Yedeğiniz hazır olduğunda sizi bilgilendireceğiz.</string>
+    <string name="backup_download_progress_icon_content_description">İndirişebilir yedek simgesi oluşturuluyor</string>
+    <string name="backup_download_progress_description_with_two_parameters">%1$s %2$s üzerinden sitenizin indirilebilir bir yedeğini oluşturuyoruz.</string>
+    <string name="backup_download_progress_header">Şu anda sitenizin indirilebilir bir yedeği oluşturuluyor</string>
+    <string name="backup_download_progress_page_title">Yedeklemeyi indir</string>
+    <string name="backup_download_another_download_running">Çalışan başka bir indirme var.</string>
+    <string name="backup_download_generic_failure">İstek işlenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin.</string>
+    <string name="backup_download_details_action_button_content_description">İndirilebilir yedekleme düğmesi oluştur</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s indirme yedeklemesi oluşturmak için seçtiğiniz saattir.</string>
+    <string name="gutenberg_native_image_link_url">Görsel bağlantı adresi</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">crosspost</string>
+    <string name="suggestion_user">kullanıcı</string>
+    <string name="suggestion_no_matching">Eşleşen %s yok.</string>
+    <string name="suggestion_problem">Öneriler yüklenirken bir problem oluştu.</string>
+    <string name="suggestion_none">Uygun %s önerisi yok.</string>
+    <string name="suggestion_selection_needed">Lütfen öneri listesini filtrelemek için yazmaya başlayın.</string>
+    <string name="threat_get_free_estimate">Ücretsiz bir tahmin edinin</string>
+    <string name="threat_ignore">Tehdidi yok say</string>
+    <string name="threat_fix">Tehdidi düzelt</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan tehdidi ortadan kaldıracak.</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan enfekte dosya ya da dizini düzenleyecek.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan daha güncel bir sürüme yükseltilecek (%s).</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan enfekte dosya ya da dizini silecek.</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan enfekte dosya ya da dizini değiştirecek.</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan bu tehdidi otomatik olarak düzeltemez.\n Tehdidi sizin manuel olarak çözmenizi öneririz: WordPress\'in, temanızın ve tüm eklentilerinizin güncel olduğundan emin olduktan sonra sorun yaratan kod, tema veya eklentiyi sitenizden kaldırın. \n \n\n Bu tehdidi gidermek için daha fazla yardıma ihtiyacınız varsa son derece deneyimli WordPress uzmanlarından oluşan güvenilir bir serbest çalışan pazarı olan &lt;b&gt;Codeable&lt;/b&gt;\'ı öneririz.\n Bunlar bu projelerde yardımcı olacak seçkin bir güvenlik uzmanı grubu belirlemiştir. Fiyatlandırma 70–120 ABD doları/saat arasında değişir ve kiralama zorunluluğu olmadan ücretsiz bir tahmin alabilirsiniz.</string>
+    <string name="threat_fix_current_not_fixable_header">Tehdidi çözme</string>
+    <string name="threat_fix_fixed_header">Jetpack bunu nasıl düzeltti?</string>
+    <string name="threat_fix_default_header">Nasıl düzelteceğiz?</string>
+    <string name="threat_file_description">Tehdit bulunan dosya:</string>
+    <string name="threat_technical_details_header">Teknik ayrıntılar</string>
+    <string name="threat_problem_header">Problem neydi?</string>
+    <string name="threat_details">Tehdit detayları</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Temada açık bulundu</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Eklentide açık bulundu</string>
+    <string name="threat_item_sub_header_file_signature">Tehdir bulundu %s</string>
+    <string name="threat_item_sub_header_core_file">WordPress içinde güvenlik açığı bulundu</string>
+    <string name="threat_item_sub_header_misc_vulnerability">Gizemli güvenlik açığı</string>
+    <string name="threat_item_header_vulnerable_theme">Savunmasız tema: %s (sürüm %s)</string>
+    <string name="threat_item_header_vulnerable_plugin">Savunmasız eklenti: %s (sürüm %s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: kötü amaçlı kod deseni</string>
+    <string name="threat_item_header_database_threat">Veritabanı %s tehditleri</string>
+    <string name="threat_item_header_infected_core_file">%s: enfekte çekirdek dosyası</string>
+    <string name="threat_item_header_threat_found">Tehdit bulundu</string>
+    <string name="threats_fix_all">Tümünü düzelt</string>
+    <string name="scan_in_few_seconds">bir kaç saniye önce</string>
+    <string name="scan_in_minutes_ago">%s dakika önce</string>
+    <string name="scan_in_hours_ago">%s saat önce</string>
+    <string name="scan_this_site">bu site</string>
+    <string name="scan_idle_last_scan_description">Son Jetpack taraması çalıştı %s ve herhangi bir risk bulunmadı. %s</string>
+    <string name="scan_idle_threats_found_title">Siteniz risk altında olabilir</string>
+    <string name="scan_idle_no_threats_found_title">Hiç endişe etmeyin</string>
+    <string name="scan_again">Yeniden tara</string>
+    <string name="scan_now">Şimdi tara</string>
+    <string name="scan_state_icon">Tarama durumu simgesi</string>
+    <string name="backup">Yedek</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Etkinlik türü filtresi (%s tür seçili)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (%s öğe gösteriliyor)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Etkinlik türü filtresi</string>
+    <string name="activity_log_activity_type_empty_subtitle">Seçili tarih aralığında bir etkinlik kayıt edilmemiş.</string>
+    <string name="activity_log_activity_type_empty_title">Kullanılabilir etkinlik yok</string>
+    <string name="activity_log_activity_type_error_subtitle">Lütfen internet bağlantınızı kontrol edin ve yeniden deneyin.</string>
+    <string name="activity_log_activity_type_error_title">Bağlantı yok</string>
+    <string name="activity_log_activity_type_filter_active_label">Etkinlik türü (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">Tarih aralığı filtresi</string>
+    <string name="activity_log_active_filter_empty_subtitle">Tarih aralığınızı veya etkinlik türü filtrelerinizi ayarlamayı deneyin</string>
+    <string name="activity_log_active_filter_empty_title">Eşleşen etkinlik bulunamadı</string>
+    <string name="backup_item_sqls">Site veritabanı</string>
+    <string name="backup_item_roots_hint">(wp-config.php ve WordPress\'e ait olmayan tüm dosyaları içerir)</string>
+    <string name="backup_item_media_uploads">Medya Yüklemeleri</string>
+    <string name="backup_item_plugins">WordPress Eklentileri</string>
+    <string name="backup_item_themes">WordPress Temaları</string>
+    <string name="backup_download_details_icon_content_description">İndirilebilir yedekleme oluştur simgesi</string>
+    <string name="backup_download_details_action_button">İndirilebilir dosya oluştur</string>
+    <string name="backup_download_details_header">İndirilebilir yedekleme oluştur</string>
+    <string name="backup_download_details_page_title">Yedeklemeyi İndir</string>
+    <string name="backup_download">İndirilebilir Yedekleme</string>
+    <string name="gutenberg_native_error">Hata</string>
+    <string name="gutenberg_native_choose_file">Dosya seçin</string>
+    <string name="activity_log_item_menu_download_backup_label">Yedeklemeyi indir</string>
+    <string name="activity_log_item_menu_restore_label">Bu noktaya kadar geri yükle</string>
+    <string name="activity_log_activity_type_filter_label">Etkinlik türü</string>
+    <string name="activity_log_date_range_filter_label">Tarih aralığı</string>
+    <string name="activity_log_activity_type_filter_header">Etkinlik Türüne göre filtrele</string>
+    <string name="dialog_confirm_copy_local_copy_button">Sürümü bu uygulamadan kopyala</string>
+    <string name="dialog_confirm_copy_local_edit_button">Önce gönderiyi düzenle</string>
+    <string name="dialog_confirm_copy_local_message">Kopyalamaya çalıştığınız gönderinin çakışan iki sürümü var veya yakın zamanda değişiklik yaptığınız ancak bunları kaydetmediniz.\nHerhangi bir çakışmayı çözmek için önce gönderiyi düzenleyin veya sürümü bu uygulamadan kopyalayarak devam edin.</string>
+    <string name="dialog_confirm_copy_local_title">Senkronizasyon çakışması sonrası</string>
+    <string name="button_copy">Çoğalt</string>
+    <string name="toast_edit_story_update_in_progress_title">Öykü kaydediliyor, lütfen bekleyin…</string>
+    <string name="gutenberg_native_file_name">Dosya adı</string>
+    <string name="gutenberg_native_file_block_settings">Dosya blok ayarları</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">Dosyaların yüklenmesi başarısız.\nSeçenekler için dokunun.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">Dosyalar kaydedilemedi.\nSeçenekler için dokunun.</string>
+    <string name="gutenberg_native_edit_file">Dosyayı düzenle</string>
+    <string name="gutenberg_native_copy_file_url">Dosya adresini kopyala</string>
+    <string name="gutenberg_native_choose_a_file">DOSYA SEÇ</string>
+    <string name="new_site_creation_domain_header_title">Bir alan adı seçin</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack ayarları</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">Sohbet e-postayla takip ediliyor</string>
+    <string name="reader_btn_follow_comments">Sohbeti e-posta ile takip et</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Bu yazının yorumları için abonelik sonlandırılamıyor</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Bu yazının yorumları için abonelik başlatılamıyor</string>
+    <string name="reader_follow_comments_get_status_error">Bu yazı için abonelik durumu getirilemiyor</string>
+    <string name="reader_follow_comments_unsubscribe_success">Yorum aboneliği başarıyla sonlandırıldı</string>
+    <string name="reader_follow_comments_subscribe_success">Yorumlara başarıyla abone olundu</string>
+    <string name="reader_follow_comments_bad_format_response">Geçersiz yanıt alındı</string>
+    <string name="reader_follow_comments_null_response">Yanıt alınamadı</string>
+    <string name="activity_log_activity_type_filter_clear">Temizle</string>
+    <string name="activity_log_activity_type_filter_apply">Uygula</string>
+    <string name="dialog_edit_story_unsupported_format_message">Öyküler şu anda GIF dosyalarını desteklemediği için bir veya daha fazla slayt öykünüze eklenmedi. Lütfen bunun yerine statik bir resim veya video arka planı seçin.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF dosyaları desteklenmez</string>
+    <string name="dialog_edit_story_unrecoverable_message">Bu öykü için medyayı sitede bulamadık.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Öykü düzenlenemiyor</string>
+    <string name="dialog_edit_story_unavailable_message">Bu öykü için medya yüklenemiyor. İnternet bağlantınızı kontrol edin ve bir süre sonra tekrar deneyin.</string>
+    <string name="dialog_edit_story_unavailable_title">Öykü düzenlenemiyor</string>
+    <string name="dialog_edit_story_limited_message">Bu öykü farklı bir cihazda düzenlendi ve belirli nesneleri düzenleme yeteneği sınırlı olabilir.</string>
+    <string name="dialog_edit_story_limited_title">Sınırlı Öykü Düzenleme</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Ortam kaldırıldı. Öykünüzü yeniden oluşturmayı deneyin.</string>
+    <string name="color_picker_label_background">Arka plan</string>
+    <string name="color_picker_label_text">Metin</string>
+    <string name="dialog_discard_story_ok_button_edit">Vazgeç</string>
+    <string name="dialog_discard_story_message_edit">Yapılan değişiklikler kaydedilmeyecek.</string>
+    <string name="dialog_discard_story_title_edit">Değişiklikler iptal edilsin mi?</string>
+    <string name="label_done_button">Tamamlandı</string>
+    <string name="label_next_button">Sonraki</string>
+    <string name="delete_button_alt">Sil</string>
+    <string name="hpp_choose_error">Tasarım seçilirken bir hata oluştu.</string>
+    <string name="hpp_retry_error">Lütfen internet bağlantınızı kontrol edip tekrar deneyin.</string>
+    <string name="hpp_error_subtitle">Tekrar çevrimiçi olduğunuzda yeniden dene\'ye dokunun.</string>
+    <string name="hpp_error_title">Çevrimdışıyken düzenler kullanılamaz</string>
+    <string name="continue_site_credentials">Mağaza kimlik bilgileriyle devam edin</string>
+    <string name="login_find_your_connected_email">Bağlı e-postanızı bulun</string>
+    <string name="reader_discover_no_posts_button_text">Takip edilen konular</string>
+    <string name="reader_discover_no_posts_subtitle">Arama kapsamını genişletmek için daha fazla konuyu takip etmeyi deneyin</string>
+    <string name="reader_discover_no_posts_title">Yeni yazı yok</string>
+    <string name="reader_discover_empty_title">Hoş geldiniz!</string>
+    <string name="scan">Tarama</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; yazınıza yanıt verdi</string>
+    <string name="login_prologue_third_subtitle_two">Bugün sitenizde &lt;b&gt;50 beğeni&lt;/b&gt; aldınız</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; yazınızı beğendi</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">Kaydırılabilir blok menüsü açıldı. Bir blok seçin.</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">Kaydırılabilir blok menüsü kapandı.</string>
+    <string name="hpp_skip_button">Atla</string>
+    <string name="hpp_choose_button">Seç</string>
+    <string name="hpp_subtitle">En sevdiğiniz ana sayfa düzenini seçin. Daha sonra özelleştirebilir ve değiştirebilirsiniz.</string>
+    <string name="hpp_title">Bir tasarım seçin</string>
+    <string name="mlp_network_error_subtitle">Tekrar çevrimiçi olduğunuzda yeniden dene seçeneğine dokunun veya aşağıdaki düğmeyi kullanarak boş bir sayfa oluşturun.</string>
+    <string name="mlp_network_error_title">Çevrimdışıyken düzenler kullanılamaz</string>
+    <string name="mlp_error_subtitle">Yeniden dene seçeneğine dokunun veya aşağıdaki düğmeyi kullanarak boş bir sayfa oluşturun.</string>
+    <string name="mlp_error_title">Bir hata nedeniyle düzenler kullanılamıyor</string>
+    <string name="prepublishing_nudges_add_category_button">Kategori Ekle</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">Yeni Kategori Ekle</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">Kategoriler</string>
+    <string name="prepublishing_nudges_home_categories_not_set">Ayarlanmadı</string>
+    <string name="prepublishing_nudges_categories_action">Kategoriler</string>
+    <string name="login_prologue_fifth_caption_three">Londra\'daki müzeler</string>
+    <string name="login_prologue_fifth_caption_two">Dünyanın En İyi Hayranları</string>
+    <string name="login_prologue_fifth_caption_one">En Sevdiğim On Kafe</string>
+    <string name="login_prologue_fifth_tag_six">Politika</string>
+    <string name="login_prologue_fifth_tag_five">Müzik</string>
+    <string name="login_prologue_fifth_tag_four">Bahçe İşçiliği</string>
+    <string name="login_prologue_fifth_tag_three">Futbol</string>
+    <string name="login_prologue_fifth_tag_two">Yemek pişirme</string>
+    <string name="login_prologue_fifth_tag_one">Sanat</string>
+    <string name="login_prologue_fifth_subtitle_three">Haftalık Rock n\' Roll</string>
+    <string name="login_prologue_fifth_subtitle_two">Web Haberleri</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">Fotoğrafçı Cameron Karsten\'in çalışmalarından çok ilham alıyorum. Bu teknikleri bir sonraki adımda deneyeceğim</string>
+    <string name="login_prologue_second_subtitle_one">İlham Alma</string>
+    <string name="login_prologue_title_fifth">Favori sitelerinizi takip edin ve yeni bloglar keşfedin.</string>
+    <string name="login_prologue_title_fourth">Kapsamlı analizlerle kitlenizin nasıl büyüdüğünü izleyin.</string>
+    <string name="login_prologue_title_third">Yorumları ve bildirimleri gerçek zamanlı olarak görün.</string>
+    <string name="login_prologue_title_second">Güçlü düzenleyici ile hareket halindeyken yazı gönderebilirsiniz.</string>
+    <string name="login_prologue_title_first">Dünyanın en popüler web sitesi oluşturucusuna hoş geldiniz.</string>
+    <string name="media_loading_failed">Medya yükleme başarısız oldu</string>
+    <string name="reader_discover_recommended_blogs_header">Takip edilecek siteler</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">Her sürümde daha fazla blok eklemek için elimizden geleni yapıyoruz.</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">\"%s\" tamamen desteklenmiyor</string>
+    <string name="gutenberg_native_help_button">Yardım düğmesi</string>
+    <string name="gutenberg_native_edit_using_web_editor">Web düzenleyicisini kullanarak düzenle</string>
+    <string name="gutenberg_native_choose_images">Görsel seç</string>
+    <string name="stories_intro_create_story_post_label">Öykü Yayını Oluştur</string>
+    <string name="stories_intro_description_second">Sitenizde yeni bir blog yazısı olarak yayınlanırlar, böylece kitleniz hiçbir şeyi kaçırmaz.</string>
+    <string name="stories_intro_title_second">Öykü yayınları kaybolmaz</string>
+    <string name="stories_intro_description_first">Ziyaretçilerinizin seveceği ilgi çekici ve dokunulabilir öykü yayınları oluşturmak için fotoğrafları, videoları ve metinleri birleştirin.</string>
+    <string name="stories_intro_title_first">Artık herkes öykülere erişebilir</string>
+    <string name="stories_intro_image_caption_second">Öykü başlığı örneği</string>
+    <string name="stories_intro_image_caption_first">Öykü yayını nasıl oluşturulur?</string>
+    <string name="stories_intro_main_title">Öykü Yayınlarına Giriş</string>
+    <string name="mlp_notice_blank_page_created">Boş sayfa oluşturuldu</string>
+    <string name="mlp_notice_page_created">Sayfa oluşturuldu</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s fotoğraflarınıza erişimi reddedildi. Bunu düzeltmek için izinlerinizi düzenleyip %2$s ve %3$s özelliklerini açın.</string>
+    <string name="media_insert_failed">Medya eklenemedi.</string>
+    <string name="media_insert_failed_with_reason">Medya eklenemedi: %s</string>
+    <string name="photo_picker_wordpress_media_library">WordPress Ortam Kütüphanesi\'nden seçin</string>
+    <string name="reader_label_toolbar_back">Geri</string>
+    <string name="reader_discover_empty_button_text">Başlayın</string>
+    <string name="reader_discover_empty_subtitle">Yeni bloglar keşfetmek için konular takip edin</string>
+    <string name="reader_post_details_header_by_author_name">gönderen:</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">Bu yönlendiren, istenmeyen posta olarak işaretlenemez</string>
+    <string name="stats_referrer_popup_unmark_as_spam">İstenmeyen posta işaretini kaldır</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">Spam Olarak İşaretle</string>
+    <string name="stats_referrer_popup_menu_open_website">Web Sitesini Aç</string>
+    <string name="media_uploading_gif_library_photo">Gif medyası yükleme</string>
+    <string name="media_uploading_stock_library_photo">Stok medya yükleme</string>
+    <string name="media_uploading_default">Ortam dosyası yükleniyor</string>
     <string name="gutenberg_native_select_item">Öğeyi seç</string>
+    <string name="gutenberg_native_search_or_type_url">URL arayın veya yazın</string>
+    <string name="gutenberg_native_page_break">Sayfa arası</string>
     <string name="gutenberg_native_add_this_telephone_link">Bu telefon bağlantısını ekle</string>
     <string name="gutenberg_native_add_this_link">Bu bağlantıyı ekle</string>
     <string name="gutenberg_native_add_this_email_link">Bu e-posta bağlantısını ekle</string>
-    <string name="suggestion_no_connection">\"İnternet bağlantısı yok.\nÖneriler kullanılamaz.\"</string>
-    <string name="mlp_selected_description">%s seçildi</string>
-    <string name="mlp_notselected_description">%s</string>
-    <string name="typeface_label_nunito">Gelişigüzel</string>
-    <string name="typeface_label_libre_baskerville">Klasik</string>
-    <string name="typeface_label_oswald">Güçlü</string>
-    <string name="typeface_label_pacifico">Eğlenceli</string>
-    <string name="typeface_label_space_mono">Modern</string>
+    <string name="suggestion_no_connection">İnternet bağlantısı yok.\nÖneriler kullanılamaz.</string>
     <string name="typeface_label_shrikhand">Gözüpek</string>
+    <string name="typeface_label_space_mono">Modern</string>
+    <string name="typeface_label_pacifico">Eğlenceli</string>
+    <string name="typeface_label_oswald">Güçlü</string>
+    <string name="typeface_label_libre_baskerville">Klasik</string>
+    <string name="typeface_label_nunito">Gelişigüzel</string>
     <string name="toast_capture_operation_permission_needed">Video kaydetmek için uygulamaya ses kaydetme izni vermeniz gerekiyor</string>
-    <string name="comment_unable_to_show_error">Bu yorum gösterilemiyor</string>
-    <string name="permission_microphone">Mikrofon</string>
+    <string name="mlp_notselected_description">%s</string>
+    <string name="mlp_selected_description">%s seçildi</string>
     <string name="login_get_link_by_email">E-posta ile bir oturum açma bağlantısı alın</string>
     <string name="email_not_registered_wpcom">Bu e-posta hesabına bağlı bir WordPress.com hesabı bulamıyoruz.</string>
+    <string name="permission_microphone">Mikrofon</string>
+    <string name="comment_unable_to_show_error">Bu yorum gösterilemiyor</string>
     <string name="media_browse_for_items">Öğelere göz atın</string>
     <string name="reader_menu_report_post">Bu yazıyı bildir</string>
     <string name="reader_welcome_banner">Okuyucuya hoş geldiniz. Parmaklarınızın ucunda milyonlarca blogu keşfedin.</string>
-    <string name="gutenberg_native_angle">Açı</string>
     <string name="error_media_xmlrcp_server_error">Dahili sunucu hatası oluştu</string>
     <string name="error_media_xmlrpc_not_allowed">Eyleminize izin verilmiyor</string>
     <string name="show_n_hidden_items_desc">%1$s daha fazla öğe</string>
     <string name="gutenberg_native_select_a_layout">Düzen seç</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">Not: Sütun düzeni, temalar ve ekran boyutları arasında değişiklik gösterebilir</string>
-    <string name="create_post_fab_tooltip">Bir yazı oluştur</string>
-    <string name="create_page_fab_tooltip">Bir sayfa oluştur</string>
     <string name="create_post_story_fab_tooltip">Bir yazı veya öykü oluştur</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Gizle</string>
+    <string name="create_page_fab_tooltip">Bir sayfa oluştur</string>
+    <string name="create_post_fab_tooltip">Bir yazı oluştur</string>
     <string name="reader_discover_interests_header">Şunları beğenebilirsin</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">Gizle</string>
+    <string name="gutenberg_native_video_caption_empty">Video yazısı. Boş</string>
     <string name="gutenberg_native_updates_the_title">Başlığı günceller.</string>
     <string name="gutenberg_native_paste_block_after">Sonrasına bloğu yapıştır</string>
     <string name="gutenberg_native_page_title_s">Sayfa başlığı. %s</string>
     <string name="gutenberg_native_page_title_empty">Sayfa başlığı. Boş</string>
-    <string name="gutenberg_native_video_caption_empty">Video yazısı. Boş</string>
     <string name="toast_error_playing_video">Videonuzu oynatırken bir hata oluştu</string>
     <string name="camera_error">Bu cihaz Camera2 API\'sını desteklemiyor.</string>
     <string name="toast_error_saving_video">Video kaydedilemedi</string>
@@ -76,7 +547,6 @@ Language: tr
     <string name="dialog_discard_errored_page_message">Bu slayt henüz kaydedilmedi. Bu slaytı silerseniz yaptığınız tüm düzenlemeleri kaybedersiniz.</string>
     <string name="dialog_discard_page_message">Bu slayt öykünüzden kaldırılacak.</string>
     <string name="dialog_discard_page_title">Öykü slaytı silinsin mi?</string>
-    <string name="menu_delete_page">Slaytı sil</string>
     <string name="label_text_color_button">Metin rengini değiştir</string>
     <string name="label_text_alignment_button">Metin hizalamasını değiştir</string>
     <string name="label_frame_errored">hata oluştu</string>
@@ -86,8 +556,6 @@ Language: tr
     <string name="label_retry_icon">Tekrar dene</string>
     <string name="label_saved_icon">Kaydedildi</string>
     <string name="label_close_button">Kapat</string>
-    <string name="label_control_publish">Sonraki</string>
-    <string name="label_done">Bitti</string>
     <string name="label_share_to">Şununla paylaş:</string>
     <string name="label_snackbar_share">PAYLAŞ</string>
     <string name="label_snackbar_loop_frame_saved">Fotoğraflara kaydedildi</string>
@@ -98,7 +566,6 @@ Language: tr
     <string name="label_control_flip_camera">Ters Çevir</string>
     <string name="sound_button_alt">Ses</string>
     <string name="text_button_alt">Metin</string>
-    <string name="more_button_alt">Daha Fazla</string>
     <string name="stickers_button_alt">Çıkartmalar</string>
     <string name="flash_button_alt">Flaş</string>
     <string name="flip_button_alt">Kamerayı çevir</string>
@@ -107,11 +574,11 @@ Language: tr
     <string name="mlp_create_page">Sayfa Oluştur</string>
     <string name="mlp_create_blank_page">Boş sayfa oluştur</string>
     <string name="mlp_choose_layout_subtitle">Önceden hazırlanmış çeşitli sayfa düzenleri arasından seçim yaparak başlayın. Veya boş bir sayfayla başlayın.</string>
+    <string name="mlp_choose_layout_title">Bir düzen seç</string>
     <string name="prepublishing_nudges_story_title_hint">Öykünüze bir başlık koyun</string>
-    <string name="quick_start_dialog_create_new_post_message_short">%1$s Oluştur\'a dokunun. %2$s Ardından &lt;b>Blog yayını&lt;/b>\'nı seçin</string>
     <string name="create_post_page_fab_tooltip_contributors_stories_enabled">Bir yazı veya öykü oluştur</string>
     <string name="create_post_page_fab_tooltip_stories_enabled">Bir yazı, sayfa veya öykü oluştur</string>
-    <string name="mlp_choose_layout_title">Bir düzen seç</string>
+    <string name="quick_start_dialog_create_new_post_message_short">%1$s Oluştur\'a dokunun. %2$s Ardından &lt;b&gt;Blog yayını&lt;/b&gt;\'nı seçin</string>
     <string name="photo_picker_choose_file">Cihazdan seç</string>
     <string name="my_site_bottom_sheet_add_story">Öykü yayını</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">Kendi kendine barındırılan WordPress sitelerinde site simgelerini düzenlemek için Jetpack eklentisi gerekir.</string>
@@ -119,122 +586,111 @@ Language: tr
     <string name="error_media_quota_exceeded_toast">Dosya yüklenemiyor.\nDepolama kotası aşıldı.</string>
     <string name="error_media_quota_exceeded">Depolama kotası aşıldı.</string>
     <string name="pick_file">Dosya ekle</string>
-    <string name="gutenberg_native_replace_image_or_video">Video veya görseli değiştir</string>
     <string name="gutenberg_native_replace_video">Videoyu değiştir</string>
-    <string name="continue_with_wpcom">WordPress.com ile devam et</string>
-    <string name="enter_your_site_address">Site adresinizi girin</string>
-    <string name="content_description_logo">WordPress logosu</string>
-    <string name="gutenberg_native_block_removed">Blok kaldırıldı</string>
-    <string name="gutenberg_native_choose_image">Görsel seç</string>
-    <string name="gutenberg_native_choose_image_or_video">Görsel veya video seç</string>
+    <string name="gutenberg_native_replace_image_or_video">Video veya görseli değiştir</string>
     <string name="gutenberg_native_choose_video">Video seç</string>
-    <string name="continue_with_google_terms_of_service_text">Google ile devam ederseniz ve WordPress.com hesabınız yoksa, bir hesap oluşturup %1$shizmet şartlarımızı%2$s kabul etmiş olursunuz.</string>
+    <string name="gutenberg_native_choose_image_or_video">Görsel veya video seç</string>
+    <string name="gutenberg_native_choose_image">Görsel seç</string>
+    <string name="gutenberg_native_block_removed">Blok kaldırıldı</string>
+    <string name="enter_your_site_address">Mevcut site adresinizi girin</string>
     <string name="signup_confirmation_title">Kayıt onayı</string>
+    <string name="continue_with_google_terms_of_service_text">Google ile devam ederseniz ve WordPress.com hesabınız yoksa, bir hesap oluşturup %1$shizmet şartlarımızı%2$s kabul etmiş olursunuz.</string>
     <string name="continue_terms_of_service_text">Devam etmekle, %1$shizmet koşullarını%2$s kabul etmiş olursunuz.</string>
-    <string name="signup_confirmation_magic_link_message">Yeni WordPress.com hesabınızı oluşturmak için size e-postayla bir kayıt bağlantısı göndereceğiz.</string>
     <string name="signup_confirmation_message">Bu e-posta adresini, yeni WordPress.com hesabınızı oluşturmak için kullanacağız.</string>
     <string name="signup_magic_link_message">Yeni WordPress.com hesabınızı oluşturmak için size kayıdolma bağlantısı gönderdik. Bu cihazdaki e-postanızı kontrol edin ve WordPress.com\'dan aldığınız e-postadaki bağlantıya dokunun.</string>
     <string name="enter_account_info_for_site">%1$s için hesap bilgilerinizi girin.</string>
-    <string name="login_done">Bitti</string>
-    <string name="login_find_your_site_adress">Site adresinizi bulun</string>
-    <string name="continue_google_button_suffix">Google ile devam et</string>
     <string name="login_or">veya</string>
-    <string name="login_magic_links_sent_label">E-postanızı bu cihazda kontrol edin ve WordPress.com’dan gelen e-postadaki bağlantıya dokunun</string>
+    <string name="continue_google_button_suffix">Google ile devam et</string>
+    <string name="login_find_your_site_adress">Site adresinizi bulun</string>
+    <string name="login_done">Bitti</string>
     <string name="magic_link_not_seeing_email_message">E-postayı görmüyor musunuz? İstenmeyen posta klasörünüzü kontrol edin.</string>
+    <string name="login_magic_links_sent_label">E-postanızı bu cihazda kontrol edin ve WordPress.com’dan gelen e-postadaki bağlantıya dokunun</string>
     <string name="login_magic_links_label">Size anında giriş yapacağınız bir bağlantıyı e-posta ile göndereceğiz, hiç bir parolaya gerek yok.</string>
-    <string name="reset_your_password">Parolanızı sıfırlayın</string>
-    <string name="login_promo_text_unlock_the_power">En esnek web sitesi oluşturma platformunun gücünü açığa çıkarın.</string>
-    <string name="create_account">Hesap oluştur</string>
-    <string name="get_started">Başlayın</string>
     <string name="check_email">E-postayı kontrol et</string>
-    <string name="login_promo_title_37_percent">Web\'in %37\'si WordPress üzerine kurulmuştur.</string>
-    <string name="send_link_by_email">Bağlantıyı e-postayla gönder</string>
-    <string name="or_type_your_password">Veya parolanızı yazın</string>
+    <string name="get_started">Başlayın</string>
     <string name="enter_email_to_continue_wordpress_com">Giriş yapmak veya bir WordPress.com hesabı oluşturmak için e-posta adresinizi girin.</string>
+    <string name="or_type_your_password">Veya parolanızı yazın</string>
+    <string name="create_account">Hesap oluştur</string>
+    <string name="send_link_by_email">Bağlantıyı e-postayla gönder</string>
+    <string name="reset_your_password">Parolanızı sıfırlayın</string>
     <string name="reader_error_request_failed_title">İstek işlenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin.</string>
-    <string name="quick_start_dialog_update_site_title_message_short">Yeni bir başlık belirlemek için &lt;b>%1$s&lt;/b> dokunun</string>
     <string name="quick_start_list_update_site_title_title">Site başlığınızı ayarlayın</string>
-    <string name="quick_start_list_update_site_title_subtitle">Sitenize kişiliğini ve konuyu yansıtan bir ad verin. İlk izlenim önemlidir.</string>
+    <string name="quick_start_dialog_update_site_title_message_short">Yeni bir başlık belirlemek için &lt;b&gt;%1$s&lt;/b&gt; dokunun</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Bu yazının çöpe taşınması, yerel değişiklikleri yok sayar. Devam etmek istediğinizden emin misiniz?</string>
     <string name="gutenberg_native_s_block_options">%s blok seçenekleri</string>
-    <string name="my_site_title_changer_dialog_not_allowed_hint">Site Başlığı yalnızca yönetici rolüne sahip bir kullanıcı tarafından değiştirilebilir.</string>
-    <string name="gutenberg_native_block_copied">Blok kopyalandı</string>
-    <string name="gutenberg_native_block_cut">Blok kesildi</string>
-    <string name="gutenberg_native_block_duplicated">Blok çoğaltıldı</string>
-    <string name="gutenberg_native_block_pasted">Blok yapıştırıldı</string>
-    <string name="gutenberg_native_block_settings">Blok ayarları</string>
-    <string name="gutenberg_native_copied_block">Kopyalanan blok</string>
-    <string name="gutenberg_native_copy_block">Bloğu kopyala</string>
     <string name="gutenberg_native_duplicate_block">Bloğu çoğalt</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Kaydedilmemiş değişiklikler</string>
-    <string name="error_update_site_title_network">Site başlığı güncellenemedi. Ağ bağlantınızı kontrol edip tekrar deneyin.</string>
-    <string name="reader_title_tag_preview">Konu</string>
+    <string name="gutenberg_native_copy_block">Bloğu kopyala</string>
+    <string name="gutenberg_native_copied_block">Kopyalanan blok</string>
+    <string name="gutenberg_native_block_pasted">Blok yapıştırıldı</string>
+    <string name="gutenberg_native_block_duplicated">Blok çoğaltıldı</string>
+    <string name="gutenberg_native_block_cut">Blok kesildi</string>
+    <string name="gutenberg_native_block_copied">Blok kopyalandı</string>
+    <string name="my_site_title_changer_dialog_not_allowed_hint">Site Başlığı yalnızca yönetici rolüne sahip bir kullanıcı tarafından değiştirilebilir.</string>
     <string name="my_site_title_changer_dialog_hint">Site Başlığı, web tarayıcısının başlık çubuğunda görüntülenir ve çoğu temada üst bilgide gösterilir.</string>
+    <string name="reader_title_tag_preview">Konu</string>
+    <string name="error_update_site_title_network">Site başlığı güncellenemedi. Ağ bağlantınızı kontrol edip tekrar deneyin.</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_title">Kaydedilmemiş değişiklikler</string>
     <string name="gutenberg_native_open_link_in_a_browser">Bağlantıyı tarayıcıda aç</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
-    <string name="gutenberg_native_double_tap_to_select_the_option">Bir seçenek belirlemek için çift dokunun</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient">Gradyanı özelleştirme bölümüne gider</string>
     <string name="gutenberg_native_navigates_to_custom_color_picker">Özel renk seçiciye gider</string>
     <string name="gutenberg_native_gradient_type">Gradyan Türü</string>
+    <string name="gutenberg_native_double_tap_to_select_the_option">Bir seçenek belirlemek için çift dokunun</string>
     <string name="gutenberg_native_customize_gradient">Gradyanı Özelleştir</string>
-    <string name="me">Ben</string>
-    <string name="everyone">Herkes</string>
-    <string name="menu_content_info">İçerik yapısı</string>
     <string name="pages_list_author">Sayfa yazarı</string>
     <string name="photo_picker_use_gif">Bu GIF\'i kullan</string>
     <string name="error_media_thumbnail_not_loaded">Medya küçük resmi yüklenemedi</string>
+    <string name="menu_content_info">İçerik yapısı</string>
+    <string name="everyone">Herkes</string>
+    <string name="me">Ben</string>
     <string name="gutenberg_native_dismiss">Kapat</string>
     <string name="prepublishing_nudges_home_tags_not_set">Belirlenmemiş</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Taslağa taşı</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_negative">İptal</string>
-    <string name="prepublishing_nudges_publish_action">Yayımlama tarihi</string>
-    <string name="prepublishing_nudges_tags_action">Etiketler</string>
-    <string name="prepublishing_nudges_home_schedule_button">Şimdi zamanla</string>
-    <string name="prepublishing_nudges_home_submit_button">Şimdi gönder</string>
-    <string name="prepublishing_nudges_home_save_button">Şimdi kaydet</string>
-    <string name="prepublishing_nudges_back_button">Geri</string>
-    <string name="prepublishing_nudges_toolbar_title_tags">Etiketleri ekle</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_message">Çöpe atılan yazılar düzenlenemez. Üzerinde çalışabilmek için bu yazının durumunu \"taslak\" olarak değiştirmek ister misiniz?</string>
     <string name="prepublishing_tags_description">Etiketler okuyuculara bir yazının ne hakkında olduğunu söylemeye yardımcı olur.</string>
-    <string name="prepublishing_nudges_home_header_publishing_to">Şuraya yayımlanıyor:</string>
     <string name="prepublishing_nudges_toolbar_title_publish">Yayımlama tarihi</string>
-    <string name="publish_date">Yayımlama tarihi</string>
-    <string name="post_status_post_scheduled">Zamanlandı</string>
-    <string name="post_status_post_trashed">Çöpe taşındı</string>
-    <string name="post_status_post_published">Yayımlandı</string>
+    <string name="prepublishing_nudges_toolbar_title_tags">Etiketleri ekle</string>
+    <string name="prepublishing_nudges_back_button">Geri</string>
+    <string name="prepublishing_nudges_home_save_button">Şimdi kaydet</string>
+    <string name="prepublishing_nudges_home_submit_button">Şimdi gönder</string>
+    <string name="prepublishing_nudges_home_schedule_button">Şimdi zamanla</string>
+    <string name="prepublishing_nudges_home_header_publishing_to">Şuraya yayımlanıyor:</string>
+    <string name="prepublishing_nudges_tags_action">Etiketler</string>
+    <string name="prepublishing_nudges_publish_action">Yayımlama tarihi</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_negative">İptal</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_positive">Taslağa taşı</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_message">Çöpe atılan yazılar düzenlenemez. Üzerinde çalışabilmek için bu yazının durumunu \"taslak\" olarak değiştirmek ister misiniz?</string>
+    <string name="post_list_move_trashed_post_to_draft_dialog_title">Yazı taslaklara taşınsın mı?</string>
+    <string name="reader_label_choose_your_interests"> Konularınızı seçin</string>
+    <string name="reader_choose_interests_content_description">Konularınızı seçin</string>
     <string name="reader_btn_done">Tamamlandı</string>
-    <string name="ccpa_privacy_notice_caption">California Tüketici Gizlilik Yasası (\"CCPA\"), California sakinlerine topladığımız ve paylaştığımız kişisel bilgi kategorileri, bu kişisel bilgileri nereden aldığımız ve bunları nasıl ve neden kullandığımız hakkında bazı ek bilgiler sağlamamızı gerektirir.</string>
-    <string name="ccpa_privacy_notice_read">CCPA gizlilik notunu okuyun</string>
     <string name="reader_btn_select_few_interests">Devam etmek için birkaç tane seçin</string>
-    <string name="reader_choose_interests_content_description">İlgi alanlarınızı seçin</string>
-    <string name="reader_label_choose_your_interests">İlgi alanlarınızı seçin</string>
-    <string name="post_list_move_trashed_post_to_draft_dialog_title">Yazı taslaklara taşınsın mı?</string>
-    <string name="update_now">Şimdi güncelle</string>
-    <string name="status_and_visibility">Durum ve görünürlük</string>
+    <string name="post_status_post_published">Yayımlandı</string>
+    <string name="post_status_post_trashed">Çöpe taşındı</string>
+    <string name="post_status_post_scheduled">Zamanlandı</string>
+    <string name="publish_date">Yayımlama tarihi</string>
+    <string name="ccpa_privacy_notice_read">CCPA gizlilik notunu okuyun</string>
+    <string name="ccpa_privacy_notice_caption">California Tüketici Gizlilik Yasası (\"CCPA\"), California sakinlerine topladığımız ve paylaştığımız kişisel bilgi kategorileri, bu kişisel bilgileri nereden aldığımız ve bunları nasıl ve neden kullandığımız hakkında bazı ek bilgiler sağlamamızı gerektirir.</string>
     <string name="ccpa_privacy_notice_header">Californiya kullanıcıları için gizlilik notu</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">Başlangıç düzenini deneyin</string>
+    <string name="status_and_visibility">Durum ve görünürlük</string>
+    <string name="update_now">Şimdi güncelle</string>
     <string name="gutenberg_native_open_block_actions_menu">Blok eylemleri menüsünü aç</string>
-    <string name="gutenberg_native_insert_mention">Bahsetme ekle</string>
+    <string name="gutenberg_native_move_to_top">Üste taşı</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">Uygun seçenekleri içeren Alt Sayfayı açmak için iki kez dokunun</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">Uygun seçenekleri içeren Eylem Sayfasını açmak için iki kez dokunun</string>
-    <string name="site_settings_posts_page">Yazılar sayfası</string>
-    <string name="site_settings_select_page">Sayfa seç</string>
     <string name="pages_cannot_be_started">Şu anda sayfaları açamıyoruz. Lütfen daha sonra tekrar deneyin</string>
     <string name="pages_set_as_posts_page">Yazılar Sayfası Yap</string>
     <string name="pages_set_as_homepage">Ana Sayfa olarak ayarla</string>
-    <string name="suggestion_no_matching_users">“Eşleşen kullanıcı yok.”</string>
-    <string name="suggestion_invalid_user">“%s geçerli bir kullanıcı değil”</string>
-    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Seçilen ana sayfa ve gönderi sayfası aynı olamaz.</string>
-    <string name="site_settings_classic_blog">Klasik blog</string>
+    <string name="suggestion_invalid">%s geçerli bir %s değil</string>
+    <string name="site_settings_select_page">Sayfa seç</string>
+    <string name="site_settings_posts_page">Yazılar sayfası</string>
     <string name="site_settings_static_homepage">Sabit ana sayfa</string>
-    <string name="site_settings_accept_homepage">Kabul et</string>
-    <string name="site_settings_homepage_settings">Ana sayfa ayarları</string>
+    <string name="site_settings_classic_blog">Klasik blog</string>
+    <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Seçilen ana sayfa ve gönderi sayfası aynı olamaz.</string>
     <string name="site_settings_failed_update_homepage_settings">Ana sayfa ayarları güncellenemedi, internet bağlantınızı kontrol edin</string>
-    <string name="site_settings_failed_to_save_homepage_settings">Ana sayfa ayarları kaydedilemiyor</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Sayfalar yüklenmeden önce ana sayfa ayarları kaydedilemez</string>
-    <string name="site_settings_homepage_settings_description">En son gönderilerinizi görüntüleyen bir ana sayfa (klasik blog) veya sabit/statik bir sayfa seçin.</string>
+    <string name="site_settings_failed_to_save_homepage_settings">Ana sayfa ayarları kaydedilemiyor</string>
+    <string name="site_settings_accept_homepage">Kabul et</string>
     <string name="site_settings_failed_to_load_pages">Sayfalar yüklemesi başarısız</string>
+    <string name="site_settings_homepage_settings_description">En son gönderilerinizi görüntüleyen bir ana sayfa (klasik blog) veya sabit/statik bir sayfa seçin.</string>
+    <string name="site_settings_homepage_settings">Ana sayfa ayarları</string>
     <string name="site_settings_homepage">Ana sayfa</string>
     <string name="page_posts_page_update_failed">Gönderiler Sayfası güncellenemedi</string>
     <string name="page_posts_page_successfully_updated">Gönderiler Sayfası başarıyla güncellendi</string>
@@ -243,40 +699,38 @@ Language: tr
     <string name="page_cannot_set_posts_page">Gönderiler sayfasını ayarlamak için Site Ayarları’nda “Statik Ana Sayfa” seçeneğini belirleyin</string>
     <string name="page_cannot_set_homepage">Ana sayfa ayarlamak için Site Ayarları’nda “Statik Ana Sayfa” seçeneğini belirleyin</string>
     <string name="gutenberg_native_select_a_color">Bir renk seçin</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">Yeni blogumuza hoşgeldiniz</string>
-    <string name="reader_empty_followed_blogs_description">Siteleri takip ettiğinizde, içeriklerini burada görürsünüz</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">Renk ayarlarına gitmek için çift dokunun</string>
-    <string name="site_picker_ask_site_select">Site seçilemedi. Lütfen yeniden deneyin.</string>
-    <string name="photo_picker_video_title">Video seç</string>
-    <string name="photo_picker_photo_or_video_title">Ortam seç</string>
-    <string name="photo_picker_use_video">Bu videoyu kullan</string>
-    <string name="photo_picker_use_media">Bu ortamı kullan</string>
-    <string name="preview_image_thumbnail_description">Önizleme görseli küçük resmi</string>
-    <string name="error_failed_to_load_into_file">Dosyaya yüklenemedi, lütfen tekrar deneyin.</string>
-    <string name="crop">kırp</string>
-    <string name="insert_label_with_count">%d ekle</string>
-    <string name="feature_announcement_dialog_label">WordPress\'de neler yeni</string>
+    <string name="reader_empty_followed_blogs_description">Siteleri takip ettiğinizde, içeriklerini burada görürsünüz</string>
     <string name="feature_announcement_find_out_mode">Daha fazlasını bul</string>
-    <string name="copy_text">Kopyala</string>
-    <string name="continue_label">Devam</string>
-    <string name="button_insert">Ekle</string>
-    <string name="comment_toast_err_share_intent">Paylaşılamadı</string>
-    <string name="comment_share_link_via">Paylaş</string>
-    <string name="copy_link_address">Bağlantıyı kopyala</string>
-    <string name="comment_q_action_copied_url">Bağlantı kopyalandı</string>
-    <string name="whats_new_in_version_title">Neler yeni</string>
-    <string name="reader_no_site_to_reblog_title">Kullanılabilir WordPress.com sitesi yok</string>
-    <string name="reader_no_site_to_reblog_detail">Bir WordPress.com sitesi oluşturduktan sonra, beğendiğiniz içeriği kendi sitenize yeniden bloglayabilirsiniz.</string>
-    <string name="reader_no_site_to_reblog_action">Siteleri yönet</string>
-    <string name="reader_reblog_error">Yeniden bloglama başarısız</string>
+    <string name="feature_announcement_dialog_label">WordPress\'de neler yeni</string>
+    <string name="insert_label_with_count">%d ekle</string>
+    <string name="crop">kırp</string>
+    <string name="error_failed_to_load_into_file">Dosyaya yüklenemedi, lütfen tekrar deneyin.</string>
+    <string name="preview_image_thumbnail_description">Önizleme görseli küçük resmi</string>
+    <string name="photo_picker_use_media">Bu ortamı kullan</string>
+    <string name="photo_picker_use_video">Bu videoyu kullan</string>
+    <string name="photo_picker_photo_or_video_title">Ortam seç</string>
+    <string name="photo_picker_video_title">Video seç</string>
+    <string name="site_picker_ask_site_select">Site seçilemedi. Lütfen yeniden deneyin.</string>
     <string name="sitepicker_continue_flow">Devam</string>
+    <string name="reader_reblog_error">Yeniden bloglama başarısız</string>
+    <string name="reader_no_site_to_reblog_action">Siteleri yönet</string>
+    <string name="reader_no_site_to_reblog_detail">Bir WordPress.com sitesi oluşturduktan sonra, beğendiğiniz içeriği kendi sitenize yeniden bloglayabilirsiniz.</string>
+    <string name="reader_no_site_to_reblog_title">Kullanılabilir WordPress.com sitesi yok</string>
+    <string name="whats_new_in_version_title">Neler yeni</string>
+    <string name="comment_q_action_copied_url">Bağlantı kopyalandı</string>
+    <string name="copy_link_address">Bağlantıyı kopyala</string>
+    <string name="comment_share_link_via">Paylaş</string>
+    <string name="comment_toast_err_share_intent">Paylaşılamadı</string>
+    <string name="button_insert">Ekle</string>
+    <string name="continue_label">Devam</string>
+    <string name="copy_text">Kopyala</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">Bloğu sağa, %1$s konumundan %2$s konumuna taşıyın</string>
     <string name="gutenberg_native_move_block_right">Bloğu sağa taşı</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">Bloğu sola, %1$s konumundan %2$s konumuna taşıyın</string>
     <string name="gutenberg_native_move_block_left">Bloğu sola taşı</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">Bloğu sağa taşımak için iki kez dokunun</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">Bloğu sola taşımak için iki kez dokunun</string>
-    <string name="gutenberg_native_blog">Blog</string>
     <string name="new_site_creation_creating_site_loading_4">Pano oluşturma</string>
     <string name="new_site_creation_creating_site_loading_3">Tema ayarlama</string>
     <string name="new_site_creation_creating_site_loading_2">Site özellikleri ekleme</string>
@@ -298,97 +752,60 @@ Language: tr
     <string name="media_accessing_failed">Özel bir sitenin içeriğine erişilemedi. Bazı ortamlar kullanılamayabilir</string>
     <string name="media_accessing_progress">Özel bir sitenin içeriğine erişiliyor.</string>
     <string name="error_failed_to_crop_and_save_image">Görsel kırpılamadı ve kaydedilemedi, lütfen tekrar deneyin.</string>
-    <string name="error_page_not_published_private">Bu eylemi tamamlayamadık ve bu özel sayfayı yayımlamadık.</string>
-    <string name="error_page_not_scheduled">Bu eylemi tamamlayamadık ve bu sayfayı planlamadık.</string>
-    <string name="error_page_not_submitted">Bu eylemi tamamlayamadık ve bu sayfayı inceleme için göndermedik.</string>
-    <string name="error_unknown_page_type">Bilinmeyen sayfa formatı</string>
-    <string name="preview_image_description">Görseli ön izle</string>
     <string name="failed_to_load_image_tap_to_retry">Görsel yükleme başarısız.\nYeniden denemek için dokunun.</string>
-    <string name="error_media_recover_page_not_submitted">Bu medyayı karşıya yükleyemedik ve bu sayfayı inceleme için göndermedik.</string>
-    <string name="error_page_not_published_retrying">Bu sayfayı yayımlayamadık ama daha sonra tekrar deneyeceğiz.</string>
-    <string name="error_page_not_published_retrying_private">Bu özel sayfayı yayımlayamadık ama daha sonra tekrar deneyeceğiz.</string>
-    <string name="error_page_not_scheduled_retrying">Bu sayfayı planlayamadık ama daha sonra tekrar deneyeceğiz.</string>
-    <string name="error_page_not_submitted_retrying">Bu sayfayı inceleme için gönderemedik ama daha sonra tekrar deneyeceğiz.</string>
+    <string name="preview_image_description">Görseli ön izle</string>
+    <string name="error_unknown_page_type">Bilinmeyen sayfa formatı</string>
+    <string name="error_page_not_submitted">Bu eylemi tamamlayamadık ve bu sayfayı inceleme için göndermedik.</string>
+    <string name="error_page_not_scheduled">Bu eylemi tamamlayamadık ve bu sayfayı planlamadık.</string>
+    <string name="error_page_not_published_private">Bu eylemi tamamlayamadık ve bu özel sayfayı yayımlamadık.</string>
     <string name="error_page_not_published">Bu eylemi tamamlayamadık ve bu sayfayı yayımlamadık.</string>
-    <string name="page_waiting_for_connection_private">Cihazınız yeniden çevrimiçi olduğunda özel sayfanızı yayımlayacağız.</string>
-    <string name="page_waiting_for_connection_draft">Cihazınız yeniden çevrimiçi olduğunda taslağınızı kaydedeceğiz</string>
-    <string name="error_media_recover_page_not_published">Bu medyayı karşıya yükleyemedik ve bu sayfayı yayımlamadık.</string>
-    <string name="error_media_recover_page_not_published_private">Bu medyayı karşıya yükleyemedik ve bu özel sayfayı yayımlamadık.</string>
+    <string name="error_page_not_submitted_retrying">Bu sayfayı inceleme için gönderemedik ama daha sonra tekrar deneyeceğiz.</string>
+    <string name="error_page_not_scheduled_retrying">Bu sayfayı planlayamadık ama daha sonra tekrar deneyeceğiz.</string>
+    <string name="error_page_not_published_retrying_private">Bu özel sayfayı yayımlayamadık ama daha sonra tekrar deneyeceğiz.</string>
+    <string name="error_page_not_published_retrying">Bu sayfayı yayımlayamadık ama daha sonra tekrar deneyeceğiz.</string>
+    <string name="error_media_recover_page_not_submitted">Bu medyayı karşıya yükleyemedik ve bu sayfayı inceleme için göndermedik.</string>
     <string name="error_media_recover_page_not_scheduled">Bu medyayı karşıya yükleyemedik ve bu sayfayı planlamadık.</string>
-    <string name="local_page_autosave_revision_available">Bu sayfada kaydedilmeyen değişiklikler yaptınız</string>
-    <string name="error_publish_page_no_network">Cihaz çevrimdışı. Sayfalar yerel olarak kaydedildi.</string>
-    <string name="page_uploading">Sayfa yükleniyor</string>
-    <string name="page_queued">Sayfa kuyruğa alındı</string>
-    <string name="page_waiting_for_connection_publish">Cihazınız yeniden çevrimiçi olduğunda sayfanızı yayımlayacağız.</string>
-    <string name="page_waiting_for_connection_pending">Cihazınız yeniden çevrimiçi olduğunda sayfanızı inceleme için göndereceğiz.</string>
+    <string name="error_media_recover_page_not_published_private">Bu medyayı karşıya yükleyemedik ve bu özel sayfayı yayımlamadık.</string>
+    <string name="error_media_recover_page_not_published">Bu medyayı karşıya yükleyemedik ve bu sayfayı yayımlamadık.</string>
+    <string name="page_waiting_for_connection_draft">Cihazınız yeniden çevrimiçi olduğunda taslağınızı kaydedeceğiz</string>
+    <string name="page_waiting_for_connection_private">Cihazınız yeniden çevrimiçi olduğunda özel sayfanızı yayımlayacağız.</string>
     <string name="page_waiting_for_connection_scheduled">Cihazınız yeniden çevrimiçi olduğunda sayfanızı planlayacağız.</string>
-    <string name="dialog_confirm_autosave_body_first_part_for_page">Yakın zamanda bu sayfada değişiklikler yaptınız ancak değişiklikleri kaydetmediniz. Yüklenecek sürümü seçin:\n\n</string>
-    <string name="app_theme">Görünüm</string>
-    <string name="app_theme_light">Açık</string>
-    <string name="app_theme_dark">Koyu</string>
-    <string name="quickpress_shortcut_activity_label">QuickPress kısayolu için blog seçin</string>
-    <string name="editor_page_saved_online">Sayfa çevrimiçi kaydedildi</string>
-    <string name="editor_page_saved_locally">Sayfa cihaz üzerinde kaydedildi</string>
-    <string name="editor_page_saved_locally_failed_media">Sayfa, ortam dosyası yüklemelerinde başarısız oldu ve yerel olarak kaydedildi</string>
+    <string name="page_waiting_for_connection_pending">Cihazınız yeniden çevrimiçi olduğunda sayfanızı inceleme için göndereceğiz.</string>
+    <string name="page_waiting_for_connection_publish">Cihazınız yeniden çevrimiçi olduğunda sayfanızı yayımlayacağız.</string>
+    <string name="page_queued">Sayfa kuyruğa alındı</string>
+    <string name="page_uploading">Sayfa yükleniyor</string>
+    <string name="error_publish_page_no_network">Cihaz çevrimdışı. Sayfalar yerel olarak kaydedildi.</string>
+    <string name="local_page_autosave_revision_available">Bu sayfada kaydedilmeyen değişiklikler yaptınız</string>
     <string name="editor_uploading_page">Sayfanız yükleniyor</string>
+    <string name="editor_page_saved_locally_failed_media">Sayfa, ortam dosyası yüklemelerinde başarısız oldu ve yerel olarak kaydedildi</string>
+    <string name="editor_page_saved_locally">Sayfa cihaz üzerinde kaydedildi</string>
+    <string name="editor_page_saved_online">Sayfa çevrimiçi kaydedildi</string>
+    <string name="quickpress_shortcut_activity_label">QuickPress kısayolu için blog seçin</string>
     <string name="app_theme_default">Pil tasarrufu ile ayarlanır</string>
-    <string name="gutenberg_native_what_people_say">Ne Söylediler?</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">İstediğiniz sonuçlara ulaşmanıza yardımcı olmak için çeşitli hizmetler sunuyoruz. Neye ihtiyaç duyduğunuzdan ya da bunun ne kadara mal olacağından emin değil misiniz? Sizin için hangi hizmetlerin doğru olduğunu anlatabilir ve ücretlerimiz hakkında bilgi verebiliriz. Aşağıdan bizimle iletişime geçin.</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">Biz çeşitli becerilere ve farklı alanlarda deneyime sahip yetenekli profesyonellerden oluşan küçük bir ekibiz. Yaptığımız işi seviyor ve bunu tutkuyla yapıyoruz. Sizinle çalışmak için sabırsızlanıyoruz.</string>
-    <string name="gutenberg_native_warning_message">Uyarı Mesajı</string>
-    <string name="gutenberg_native_want_to_work_with_us">Bizimle çalışmak ister misiniz?</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">Ziyaretçiler sayfanın diğer tarafında kimin olduğunu bilmek isteyecektir. Bu alanı kendiniz, siteniz, işiniz veya istediğiniz herhangi bir konu hakkında bir şeyler yazmak için kullanın. Aynı konu hakkında kendi ifadeleriyle konuşan diğer insanları alıntılamak için aşağıdaki görüşleri kullanın.</string>
-    <string name="gutenberg_native_usa">ABD</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">Bu, özelliklerini göstermek için şablon içeren bir örnek içeriktir. Bu içeriği kaldırabilir veya kendi kelimeleriniz ve ortam içeriğiniz ile değiştirebilirsiniz.</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">Başlamanın yolu, konuşmayı bir kenara bırakmak ve yapmaya başlamaktır.</string>
-    <string name="gutenberg_native_team">Ekip</string>
-    <string name="gutenberg_native_success_message">Başarı Mesajı</string>
-    <string name="gutenberg_native_strategy">Strateji</string>
+    <string name="app_theme_dark">Koyu</string>
+    <string name="app_theme_light">Açık</string>
+    <string name="app_theme">Görünüm</string>
+    <string name="dialog_confirm_autosave_body_first_part_for_page">Yakın zamanda bu sayfada değişiklikler yaptınız ancak değişiklikleri kaydetmediniz. Yüklenecek sürümü seçin:\n\n</string>
     <string name="gutenberg_native_show_post_content">Gönderi içeriğini göster</string>
-    <string name="gutenberg_native_services">Hizmetler</string>
-    <string name="gutenberg_native_samuel_the_dog">Samuel the Dog</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">Proje Adı</string>
-    <string name="gutenberg_native_position_or_job_title">Pozisyon veya Unvan</string>
-    <string name="gutenberg_native_portfolio">Portföy</string>
     <string name="gutenberg_native_only_show_excerpt">Sadece alıntı göster</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">Portföyüm, kariyerim boyunca oluşturduğum çeşitli projeleri sergilemektedir. İletişim bilgilerim aşağıdadır, benimle iletişime geçebilirsiniz.</string>
     <string name="gutenberg_native_link_to">Şuna Bağlantı:</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">Hadi konuşalım 👋 Aşağıdaki iletişim bilgilerini kullanarak bize ulaşabilir veya form aracılığıyla bize mesaj gönderebilirsiniz.</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">Hadi birlikte bir şeyler oluşturalım.</string>
-    <string name="gutenberg_native_let_s_build_something_together">Hadi birlikte bir şeyler oluşturalım!</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K. Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">Harry, gerçekten kim olduğumuzu gösteren becerilerimizden daha çok kendi seçimlerimizdir.</string>
-    <string name="gutenberg_native_inspiration">İlham</string>
-    <string name="gutenberg_native_get_in_touch">İletişime Geçin</string>
+    <string name="gutenberg_native_link_settings">Bağlantı ayarları</string>
     <string name="gutenberg_native_excerpt_length_words">Alıntı uzunluğu (sözcük)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">Bana e-posta gönderin: &lt;a href=\"mailto:mail@example.com\">eposta@ornek.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Dr. Seuss</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">Bitti diye ağlama, gerçekleştiği için gülümse.</string>
     <string name="gutenberg_native_customize">ÖZELLEŞTİR</string>
-    <string name="gutenberg_native_city_10100">Şehir, 10100</string>
+    <string name="gutenberg_native_video_settings">Video ayarları</string>
     <string name="gutenberg_native_add_paragraph_block">Paragraf bloku ekle</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">Sunduğunuz hizmetlerin kısa bir tanımı.</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">Kişisel geçmişinizi, önemli başarılarınızı veya ilginç bir gerçeği içeren kısa bir biyografi.</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">eposta@ornek.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">Proje tanımı ve sunulan işler.</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">Bir yazı oluştur</string>
     <string name="post_list_tab_trashed_posts">Çöpe taşındı</string>
     <string name="post_list_tab_scheduled_posts">Zamanlandı</string>
     <string name="post_list_tab_published_posts">Yayımlandı</string>
     <string name="sharing_facebook_account_must_have_pages">Facebook bağlantısı hiçbir sayfa bulamıyor. Duyuru, Facebook profillerine bağlanamaz, yalnızca yayınlanan sayfalara bağlanabilir.</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">Bağlı değil</string>
-    <string name="my_site_select_domains_page_title">Site adresi</string>
     <string name="notifications_tab_title_likes">Beğeniler</string>
     <string name="notifications_tab_title_follows">Takipçiler</string>
     <string name="notifications_tab_title_comments">Yorumlar</string>
     <string name="notifications_tab_title_unread_notifications">Okunmamış</string>
-    <string name="dlg_confirm_action_trash">Çöpe taşı</string>
     <string name="dlg_cancel_action_dont_trash">Çöpe taşıma</string>
+    <string name="dlg_confirm_action_trash">Çöpe taşı</string>
     <string name="stats_insights_management_activity">Etkinlik</string>
     <string name="stats_insights_management_posts_and_pages">Yazılar ve sayfalar</string>
     <string name="stats_insights_management_general">Genel</string>
@@ -396,24 +813,25 @@ Language: tr
     <string name="stats_management_add_new_stats_card">Yeni istatistik kartı ekle</string>
     <string name="reader_self_hosted_select_filter">Belirli konular hakkında yazılar bulmak için filtre düğmesini kullanın</string>
     <string name="reader_bottom_sheet_content_description">Etiket veya Site Seçin, Açılır Pencere</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Seçilen</string>
     <string name="reader_btn_select_filter_content_description">Yazıları filtrelemek için bir Site veya Etiket seçin</string>
     <string name="reader_btn_remove_filter_content_description">Geçerli filtreyi kaldır</string>
+    <string name="reader_title_subs">Konuları ve Siteleri Yönetme</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">WordPress.com\'da oturum aç</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">Takip ettiğiniz konulardaki en yeni yazıları görmek için WordPress.com\'da oturum açın</string>
     <string name="reader_filter_self_hosted_empty_sites_list">Takip ettiğiniz sitelerdeki en son yazıları görmek için WordPress.com\'da oturum açın</string>
-    <string name="reader_filter_empty_sites_action">Bir siteyi takip et</string>
-    <string name="gutenberg_native_add_block_after">Blok sonrasına ekle</string>
-    <string name="gutenberg_native_add_block_before">Blok öncesine ekle</string>
-    <string name="gutenberg_native_add_to_beginning">Başa ekle</string>
-    <string name="gutenberg_native_add_to_end">Sona ekle</string>
     <string name="gutenberg_native_replace_current_block">Mevcut bloğu değiştir</string>
-    <string name="gutenberg_native_template_preview">Şablon ön izlemesi</string>
-    <string name="reader_filter_empty_sites_list">Takip ettiğiniz sitelerdeki en yeni yazıları görün</string>
-    <string name="reader_filter_cta">Filtrele</string>
-    <string name="reader_filter_main_title">Takip edilen</string>
-    <string name="gutenberg_native_video_caption_s">Video yazısı. %s</string>
+    <string name="gutenberg_native_add_to_end">Sona ekle</string>
+    <string name="gutenberg_native_add_to_beginning">Başa ekle</string>
+    <string name="gutenberg_native_add_block_before">Blok öncesine ekle</string>
+    <string name="gutenberg_native_add_block_after">Blok sonrasına ekle</string>
+    <string name="reader_filter_empty_tags_action">Bir konu ekle</string>
+    <string name="reader_filter_empty_sites_action">Bir siteyi takip et</string>
+    <string name="reader_filter_empty_tags_list">Bir konu ekleyerek o konudaki yazıları takip edebilirsiniz</string>
+    <string name="reader_filter_empty_sites_list">Takip ettiğiniz sitelerdeki en yeni yazıları görün</string>
+    <string name="reader_filter_main_title">Takip edilen</string>
+    <string name="reader_filter_cta">Filtrele</string>
+    <string name="gutenberg_native_video_caption_s">Video yazısı. %s</string>
     <string name="gutenberg_native_edit_video">Videoyu düzenle</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">Düzeni seçmek için çift dokunun</string>
     <string name="gutenberg_native_add_a_shortcode">Kısa kod ekle…</string>
     <string name="post_list_author">Gönderi Yazarı</string>
     <string name="fab_create_desc">Gönderi oluştur</string>
@@ -428,70 +846,61 @@ Language: tr
     <string name="stats_box_type_low">düşük</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  ve %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="create_post_page_fab_tooltip">Yazı veya sayfa oluştur</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s. Mevcut değer %2$s</string>
+    <string name="gutenberg_native_replace_image">Görseli değiştir</string>
     <string name="gutenberg_native_gallery_caption_s">Galeri yazısı. %s</string>
-    <string name="gutenberg_native_move_image_backward">Görseli geriye taşı</string>
-    <string name="gutenberg_native_move_image_forward">Görseli öne taşı</string>
-    <string name="post_signup_interstitial_subtitle">Oluşturmak veya paylaşmak istediğiniz her şeyi burada yapmanıza yardımcı olacağız.</string>
-    <string name="post_signup_interstitial_not_right_now">Şimdi değil</string>
+    <string name="create_post_page_fab_tooltip">Yazı veya sayfa oluştur</string>
     <string name="content_description_person_building_website">İnsan yapımı websitesi</string>
-    <string name="photo_picker_image_thumbnail_unselected">Görsel seçilmedi</string>
-    <string name="stock_media_picker_list_content_description">Fotoğraf kütüphanesi</string>
+    <string name="post_signup_interstitial_not_right_now">Şimdi değil</string>
+    <string name="post_signup_interstitial_subtitle">Oluşturmak veya paylaşmak istediğiniz her şeyi burada yapmanıza yardımcı olacağız.</string>
     <string name="post_signup_interstitial_title">WordPress\'e hoşgeldiniz</string>
-    <string name="my_site_bottom_sheet_title">Yeni ekle</string>
-    <string name="my_site_bottom_sheet_add_post">Blog yazısı</string>
-    <string name="photo_picker_image_thumbnail_content_description">Görsel küçük resmi</string>
-    <string name="photo_picker_image_thumbnail_selected">Görsel seçildi</string>
+    <string name="stock_media_picker_list_content_description">Fotoğraf kütüphanesi</string>
+    <string name="photo_picker_image_thumbnail_unselected">Görsel seçilmedi</string>
     <string name="photo_picker_image_selected">,Seçildi</string>
-    <string name="dialog_gutenberg_informative_description_v2">Blok düzenleyicide büyük iyileştirmeler yaptık ve denemeye değer olduğunu düşünüyoruz! Yeni yazılar ve sayfalar için etkinleştirdik, ancak klasik düzenleyiciye geçmek isterseniz, \'Sitem\'> \'Site Ayarları\'na gidin.</string>
+    <string name="photo_picker_image_thumbnail_selected">Görsel seçildi</string>
+    <string name="photo_picker_image_thumbnail_content_description">Görsel küçük resmi</string>
+    <string name="my_site_bottom_sheet_add_post">Blog yazısı</string>
+    <string name="my_site_bottom_sheet_title">Yeni ekle</string>
     <string name="post_settings_publish">Yayımla</string>
+    <string name="dialog_confirm_scheduled_post_sync_yes">Şimdi senkronize et</string>
     <string name="dialog_confirm_scheduled_post_sync_message">Bu yazı hemen yayınlanacak.</string>
     <string name="dialog_confirm_scheduled_post_sync_title">Senkronize etmeye hazır mısınız?</string>
-    <string name="dialog_confirm_scheduled_post_sync_yes">Şimdi senkronize et</string>
-    <string name="negative_prefix">-%s</string>
-    <string name="login_promo_viewpager_content_description">Önsöz</string>
     <string name="new_site_creation_unavailable_domain">Bu alan adı kullanılamaz.</string>
+    <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">Sitenize erişimi başaramadık. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
-    <string name="login_discovery_error_ssl">&lt;b>SSL Sertifikası&lt;/b> ile ilgili bir sorun nedeniyle sitenize erişemedik. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
-    <string name="login_discovery_error_http_auth">&lt;b>HTTP Kimlik Doğrulaması&lt;/b> gerektiğinden sitenize erişemedik. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
-    <string name="login_discovery_error_xmlrpc">Sitenizdeki &lt;b>XMLRPC dosyasına&lt;/b> erişemedik. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
-    <string name="login_site_credentials_magic_link_label">Çok az kaldı! Sadece Jetpack bağlantılı e-posta adresinizi doğrulamamız gerekiyor&lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">&lt;b&gt;SSL Sertifikası&lt;/b&gt; ile ilgili bir sorun nedeniyle sitenize erişemedik. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
+    <string name="login_discovery_error_http_auth">&lt;b&gt;HTTP Kimlik Doğrulaması&lt;/b&gt; gerektiğinden sitenize erişemedik. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
+    <string name="login_discovery_error_xmlrpc">Sitenizdeki &lt;b&gt;XMLRPC dosyasına&lt;/b&gt; erişemedik. Bu sorunu çözmek için sunucunuza ulaşmanız gerekecektir.</string>
+    <string name="login_site_credentials_magic_link_label">Çok az kaldı! Sadece Jetpack bağlantılı e-posta adresinizi doğrulamamız gerekiyor&lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">%1$s site kimlik bilginizle giriş yapın</string>
-    <string name="send_verification_email">Doğrulama e-postası gönder</string>
-    <string name="reader_following_display_name">Takip Ediliyor</string>
     <string name="my_site_bottom_sheet_add_page">Site sayfası</string>
-    <string name="enter_site_credentials_instead">Site kimlik bilgileriyle giriş yapın.</string>
-    <string name="posts_cannot_be_started">Şu anda gönderileri açamıyoruz. Lütfen daha sonra tekrar deneyin</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="suffix_1_000_000_000">%sB</string>
-    <string name="suffix_1_000_000">%sM</string>
+    <string name="reader_following_display_name">Takip Ediliyor</string>
+    <string name="reader_my_likes_display_name">Beğeniler</string>
+    <string name="reader_discover_display_name">Keşfet</string>
+    <string name="reader_save_for_later_display_name">Kaydedildi</string>
+    <string name="reader_filter_tags_title">Konular</string>
+    <string name="reader_filter_sites_title">Siteler</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="reader_filter_sites_title">Siteler</string>
-    <string name="reader_save_for_later_display_name">Kaydedildi</string>
-    <string name="reader_discover_display_name">Keşfet</string>
-    <string name="reader_my_likes_display_name">Beğeniler</string>
+    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="posts_cannot_be_started">Şu anda gönderileri açamıyoruz. Lütfen daha sonra tekrar deneyin</string>
     <string name="site_cannot_be_loaded">Şu anda siteniz için veri yüklemesi yapamıyoruz. Lütfen daha sonra tekrar deneyin</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress Ortam Kütüphanesi</string>
-    <string name="gutenberg_native_take_a_photo">Fotoğraf Çek</string>
-    <string name="gutenberg_native_start_writing">Yazmaya başlayın…</string>
+    <string name="gutenberg_native_unsupported">Desteklenmeyen</string>
     <string name="gutenberg_native_ungroup">Gruplamayı Kaldır</string>
     <string name="gutenberg_native_translate">Çevir</string>
-    <string name="gutenberg_native_title">Başlık:</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">Klavyeyi gizlemek için dokunun</string>
     <string name="gutenberg_native_tap_here_to_show_help">Yardımı görüntülemek için buraya dokunun</string>
     <string name="gutenberg_native_take_a_video">Video Çek</string>
     <string name="gutenberg_native_take_a_photo_or_video">Fotoğraf veya Video Çek</string>
-    <string name="gutenberg_native_size">Boyut</string>
-    <string name="gutenberg_native_sidebar_title_plugin">Kenar çubuğu başlık eklentisi</string>
+    <string name="gutenberg_native_take_a_photo">Fotoğraf Çek</string>
+    <string name="gutenberg_native_start_writing">Yazmaya başlayın…</string>
     <string name="gutenberg_native_show_section">Bölümü göster</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s bloğu. Bu blok geçersiz içerik barındırıyor</string>
     <string name="gutenberg_native_s_block_empty">%s bloğu. Boş</string>
-    <string name="gutenberg_native_reset_block">Bloğu sıfırla</string>
     <string name="gutenberg_native_cut_block">Bloğu kes</string>
-    <string name="gutenberg_native_remove_annotations">Ek açıklamaları kaldır</string>
     <string name="gutenberg_native_problem_opening_the_video">Video açılırken bir sorun oluştu</string>
     <string name="gutenberg_native_problem_displaying_block">Blok görüntülenirken bir sorun oluştu</string>
     <string name="gutenberg_native_post_title_s">Yazı başlığı. %s</string>
@@ -501,17 +910,12 @@ Language: tr
     <string name="gutenberg_native_open_settings">Ayarları aç</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">Hiçbir uygulama bu isteği yerine getiremiyor. Lütfen bir Web tarayıcısı yükleyin.</string>
     <string name="gutenberg_native_navigate_up">Yukarı Git</string>
-    <string name="gutenberg_native_my_pre_publish_panel">Yayımlama öncesi panelim</string>
-    <string name="gutenberg_native_my_post_status_info">Gönderi durumu bilgilerim</string>
-    <string name="gutenberg_native_my_post_publish_panel">Yayımlama sonrası panelim</string>
-    <string name="gutenberg_native_my_document_setting_panel">Belge ayarları panelim</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">Bloğu %1$s. satırdan %2$s. satıra taşı</string>
     <string name="gutenberg_native_move_block_up">Bloğu yukarı taşı</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">Bloğu %1$s. satırdan %2$s. satıra taşı</string>
     <string name="gutenberg_native_move_block_down">Bloğu aşağı taşı</string>
     <string name="gutenberg_native_image_caption_s">Görsel yazısı. %s</string>
     <string name="gutenberg_native_hide_keyboard">Klavyeyi gizle</string>
-    <string name="gutenberg_native_here_is_the_panel_content">İşte panel içeriği!</string>
     <string name="gutenberg_native_help_icon">Yardım simgesi</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Medya eklenemedi.\nLütfen seçenekler için dokunun.</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Son değişikliği geri almak için çift dokunun</string>
@@ -523,96 +927,90 @@ Language: tr
     <string name="gutenberg_native_double_tap_to_move_the_block_up">Bloğu yukarı taşımak için çift dokunun</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">Bloğu aşağı taşımak için çift dokunun</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">Bu değeri düzenlemek için çift dokunun</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">Kaydırıcıyı kullanarak değeri değiştirmek için çift dokunun</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">Blok eklemek için çift dokunun</string>
-    <string name="gutenberg_native_content">İçerik…</string>
     <string name="gutenberg_native_current_value_is_s">Geçerli değer: %s</string>
     <string name="gutenberg_native_choose_from_device">Cihazdan seç</string>
-    <string name="gutenberg_native_annotations_sidebar">Ek Açıklamalar Kenar Çubuğu</string>
+    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Bilinmeyen bir hata oluştu. Lütfen tekrar deneyin.</string>
     <string name="gutenberg_native_alt_text">Alternatif metin</string>
     <string name="gutenberg_native_add_video">VİDEO EKLE</string>
     <string name="gutenberg_native_add_url">URL ekle</string>
+    <string name="gutenberg_native_add_alt_text">Alternatif metin ekle</string>
     <string name="gutenberg_native_add_image_or_video">GÖRSEL VEYA VİDEO EKLE</string>
     <string name="gutenberg_native_add_image">GÖRSEL EKLE</string>
     <string name="gutenberg_native_add_block_here">BURAYA BLOK EKLE</string>
-    <string name="gutenberg_native_add_annotation">Ek açıklama ekle</string>
-    <string name="gutenberg_native_add_a_description">Açıklama ekle</string>
-    <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">Bilinmeyen bir hata oluştu. Lütfen tekrar deneyin.</string>
     <string name="reader_empty_saved_posts_content_description">Bir gönderiyi listenize kaydetmek için Gönderileri Kaydetmek için Ekle düğmesine dokunun.</string>
     <string name="reader_acessibility_list_loaded">\"Listeye %1$d öğe yüklendi.\"</string>
     <string name="notifications_tab_dialog_switch_desc">Bildirimler</string>
-    <string name="master_switch_default_title_off">Kapalı</string>
-    <string name="master_switch_default_title_on">Açık</string>
-    <string name="notifications_tab_dialog_master_off_message">Bu site için bildirimleri kapatmak, bildirimler sekmesinde görünen bildirimleri devre dışı bırakacaktır. Bu site için bildirimleri açtıktan sonra ne tür bir bildirim göreceğinize ince ayar yapabilirsiniz.</string>
-    <string name="notifications_tab_dialog_master_status_off">Bu site için bildirimler</string>
-    <string name="notifications_tab_dialog_master_status_on">Bu site için bildirimler</string>
-    <string name="notifications_tab_dialog_master_off_title">Bu sitenin bildirimlerini, bildirimler sekmesindeki bildirimleri görmek için, açın.</string>
-    <string name="notifications_tab_dialog_master_hint_off">Bu site için bildirimler sekmesinde bildirim gösterimini etkinleştir</string>
-    <string name="notifications_tab_dialog_master_hint_on">Bu site için bildirimler sekmesinde bildirim gösterimini etkisizleştir</string>
-    <string name="dialog_gutenberg_informative_description_page">Şimdi yeni sayfalar için blok düzenleyiciyi kullanıyorsunuz, harika! Klasik düzenleyiciye geçmek istiyorsanız, \'Sitem\'> \'Site Ayarları\'na gidin.</string>
-    <string name="dialog_gutenberg_informative_description_post">Şimdi yeni göçnderiler için blok düzenleyiciyi kullanıyorsunuz, harika! Klasik düzenleyiciye geçmek istiyorsanız, \'Sitem\'> \'Site Ayarları\'na gidin.</string>
+    <string name="main_switch_default_title_off">Kapalı</string>
+    <string name="main_switch_default_title_on">Açık</string>
+    <string name="notifications_tab_dialog_main_off_message">Bu sitenin bildirimleri kapatılırsa, bildirimler sekmesinde bu siteyle ilgili bildirimler görüntülenmez. Bu site için bildirimleri açtıktan sonra, almak istediğiniz bildirim türlerini ayarlayabilirsiniz.</string>
+    <string name="notifications_tab_dialog_main_off_title">Bu sitenin bildirimlerini, bildirimler sekmesindeki bildirimleri görmek için, açın.</string>
+    <string name="notifications_tab_dialog_main_hint_off">Bu site için bildirimler sekmesinde bildirim gösterimini etkinleştir</string>
+    <string name="notifications_tab_dialog_main_hint_on">Bu site için bildirimler sekmesinde bildirim gösterimini etkisizleştir</string>
+    <string name="notifications_tab_dialog_main_status_off">Bu site için bildirimler</string>
+    <string name="notifications_tab_dialog_main_status_on">Bu site için bildirimler</string>
     <string name="pick_media">Görsel veya video ekle.</string>
-    <string name="error_post_not_published_retrying_private">Bu özel yazıyı yayınlayamadık ama daha sonra tekrar deneyeceğiz.</string>
-    <string name="error_post_not_scheduled_retrying">Bu yazıyı planlayamadık ama daha sonra tekrar deneyeceğiz.</string>
     <string name="error_post_not_submitted_retrying">Bu yazıyı inceleme için gönderemedik ama daha sonra tekrar deneyeceğiz.</string>
-    <string name="error_post_not_published">Bu eylemi tamamlayamadık ve bu yazıyı yayınlamadık.</string>
-    <string name="error_post_not_published_private">Bu eylemi tamamlayamadık ve bu özel yazıyı yayınlamadık.</string>
-    <string name="error_post_not_scheduled">Bu eylemi tamamlayamadık ve bu yazıyı planlamadık.</string>
-    <string name="error_post_not_submitted">Bu eylemi tamamlayamadık ve bu yazıyı inceleme için göndermedik.</string>
+    <string name="error_post_not_scheduled_retrying">Bu yazıyı planlayamadık ama daha sonra tekrar deneyeceğiz.</string>
+    <string name="error_post_not_published_retrying_private">Bu özel yazıyı yayınlayamadık ama daha sonra tekrar deneyeceğiz.</string>
     <string name="error_post_not_published_retrying">Bu yazıyı yayınlayamadık ama daha sonra tekrar deneyeceğiz.</string>
-    <string name="error_media_recover_post">Bu medyayı yükleyemedik.</string>
-    <string name="error_media_recover_post_not_published">Bu medyayı karşıya yükleyemedik ve bu yazıyı yayınlamadık.</string>
-    <string name="error_media_recover_post_not_published_private">Bu medyayı karşıya yükleyemedik ve bu özel yazıyı yayınlamadık.</string>
-    <string name="error_media_recover_post_not_scheduled">Bu medyayı karşıya yükleyemedik ve bu yazıyı planlamadık.</string>
+    <string name="error_post_not_submitted">Bu eylemi tamamlayamadık ve bu yazıyı inceleme için göndermedik.</string>
+    <string name="error_post_not_scheduled">Bu eylemi tamamlayamadık ve bu yazıyı planlamadık.</string>
+    <string name="error_post_not_published_private">Bu eylemi tamamlayamadık ve bu özel yazıyı yayınlamadık.</string>
+    <string name="error_post_not_published">Bu eylemi tamamlayamadık ve bu yazıyı yayınlamadık.</string>
     <string name="error_media_recover_post_not_submitted">Bu medyayı karşıya yükleyemedik ve bu yazıyı inceleme için göndermedik.</string>
+    <string name="error_media_recover_post_not_scheduled">Bu medyayı karşıya yükleyemedik ve bu yazıyı planlamadık.</string>
+    <string name="error_media_recover_post_not_published_private">Bu medyayı karşıya yükleyemedik ve bu özel yazıyı yayınlamadık.</string>
+    <string name="error_media_recover_post_not_published">Bu medyayı karşıya yükleyemedik ve bu yazıyı yayınlamadık.</string>
+    <string name="error_media_recover_post">Bu medyayı yükleyemedik.</string>
     <string name="error_generic_error_retrying">Bu eylemi tamamlayamadık ama daha sonra tekrar deneyeceğiz. </string>
     <string name="error_generic_error">Bu eylemi tamamlayamadık.</string>
     <string name="error_preview_empty_draft">Boş bir taslak önizlenemez</string>
     <string name="error_preview_empty_page">Boş bir sayfa önizlenemez</string>
+    <string name="error_preview_empty_post">Boş bir yazı önizlenemez</string>
     <string name="preview_unavailable_self_hosted_sites">Önizleme Kullanılamıyor</string>
-    <string name="post_preview_remote_auto_saving_post">Önizleme Oluşturuluyor…</string>
     <string name="remote_preview_operation_error">Önizlemeden önce yazıyı kaydetmeye çalışırken hata</string>
-    <string name="error_preview_empty_post">Boş bir yazı önizlenemez</string>
+    <string name="post_preview_remote_auto_saving_post">Önizleme Oluşturuluyor…</string>
     <string name="post_preview_saving_draft">Kaydediliyor…</string>
     <string name="local_post_autosave_revision_available">Bu yazıda kaydedilmeyen değişiklikler yaptınız</string>
     <string name="dialog_confirm_autosave_dont_restore_button">Bu uygulamadan sürüm</string>
     <string name="dialog_confirm_autosave_restore_button">Başka cihazdan sürüm</string>
     <string name="dialog_confirm_autosave_body_second_part">Bu uygulamadan\n%s tarihinde kaydedildi\n\nBaşka cihazdan\n%s tarihinde kaydedildi\n</string>
+    <string name="dialog_confirm_autosave_body_first_part">Yakın zamanda bu yazınıda değişiklikler yaptınız ancak değişiklikleri kaydetmediniz. Yüklenecek sürümü seçin:\n\n</string>
     <string name="dialog_confirm_autosave_title">Hangi sürümü düzenlemekl istersiniz?</string>
     <string name="button_delete_permanently">Kalıcı Olarak Sil</string>
     <string name="post_waiting_for_connection_draft_cancel">Taslağınızdaki son değişiklikleri kaydetmeyeceğiz.</string>
-    <string name="dialog_confirm_autosave_body_first_part">Yakın zamanda bu yazınıda değişiklikler yaptınız ancak değişiklikleri kaydetmediniz. Yüklenecek sürümü seçin:\n\n</string>
     <string name="post_waiting_for_connection_scheduled_cancel">Bu değişiklikleri planlamayacağız.</string>
     <string name="post_waiting_for_connection_pending_cancel">Bu değişiklikleri inceleme için sunmayacağız. </string>
     <string name="post_waiting_for_connection_publish_cancel"> Bu değişiklikleri yayınlamayacağız.</string>
     <string name="post_waiting_for_connection_draft">Cihazınız yeniden çevrimiçi olduğunda taslağınızı kaydedeceğiz</string>
     <string name="post_waiting_for_connection_private">Cihazınız yeniden çevrimiçi olduğunda özel yazınızı yayınlayacağız.</string>
-    <string name="post_waiting_for_connection_publish">Cihazınız yeniden çevrimiçi olduğunda yazınızı yayınlayacağız.</string>
-    <string name="post_waiting_for_connection_pending">Cihazınız yeniden çevrimiçi olduğunda yazınızı inceleme için göndereceğiz.</string>
     <string name="post_waiting_for_connection_scheduled">Cihazının yeniden çevrimiçi olduğunda yazınızı planlayacağız.</string>
-    <string name="settings_username_changer_progress_dialog">Kullanıcı adı kaydediliyor…</string>
-    <string name="settings_username_changer_toast_content">Yeni kullanıcı adınız %1$s</string>
+    <string name="post_waiting_for_connection_pending">Cihazınız yeniden çevrimiçi olduğunda yazınızı inceleme için göndereceğiz.</string>
+    <string name="post_waiting_for_connection_publish">Cihazınız yeniden çevrimiçi olduğunda yazınızı yayınlayacağız.</string>
     <string name="settings_username_changer_snackbar_cancel">Bu işlem iptal edilemez. Kullanıcı adı zaten güncellenmiş olabilir.</string>
-    <string name="site_settings_performance_and_speed">Performans ve hız</string>
-    <string name="site_settings_jetpack_performance_settings_hint">Jetpack performans ayarlarınızı görüntüleyin ve değiştirin</string>
-    <string name="settings_username_changer_header">Şu anda %1$s%2$s%3$s olan kullanıcı adınızı değiştirmek üzeresiniz. Kullanıcı adınızı geri döndüremezsiniz.</string>
-    <string name="settings_username_changer_confirm_dialog_title">Dikkatli olun!</string>
-    <string name="settings_username_changer_confirm_dialog_content">Kullanıcı adınızı %1$s%2$s%3$s olarak değiştiriyorsunuz. Kullanıcı adınızı değiştirmek Gravatar profilinizi ve Intense Debate profil adreslerinizi de etkiler.\nDevam etmek için yeni kullanıcı adınızı onaylayın.</string>
+    <string name="settings_username_changer_toast_content">Yeni kullanıcı adınız %1$s</string>
+    <string name="settings_username_changer_progress_dialog">Kullanıcı adı kaydediliyor…</string>
     <string name="settings_username_changer_confirm_dialog_positive_action">Kullanıcı adını değiştir</string>
-    <string name="site_settings_site_accelerator_off">Kapalı</string>
+    <string name="settings_username_changer_confirm_dialog_content">Kullanıcı adınızı %1$s%2$s%3$s olarak değiştiriyorsunuz. Kullanıcı adınızı değiştirmek Gravatar profilinizi ve Intense Debate profil adreslerinizi de etkiler.\nDevam etmek için yeni kullanıcı adınızı onaylayın.</string>
+    <string name="settings_username_changer_confirm_dialog_title">Dikkatli olun!</string>
+    <string name="settings_username_changer_header">Şu anda %1$s%2$s%3$s olan kullanıcı adınızı değiştirmek üzeresiniz. Kullanıcı adınızı geri döndüremezsiniz.</string>
+    <string name="site_settings_jetpack_performance_settings_hint">Jetpack performans ayarlarınızı görüntüleyin ve değiştirin</string>
+    <string name="site_settings_performance_and_speed">Performans ve hız</string>
+    <string name="site_settings_more">Daha fazla</string>
+    <string name="site_settings_improved_search_summary">WordPress yerleşik aramasını gelişmiş bir arama deneyimiyle değiştirin</string>
+    <string name="site_settings_improved_search">İyileştirilmiş arama</string>
+    <string name="site_settings_jetpack_search">Jetpack araması</string>
+    <string name="site_settings_ad_free_video_hosting">Reklamsız video barındırma</string>
+    <string name="site_settings_media">Ortam</string>
     <string name="site_settings_site_accelerator_summary">Jetpack\'in görsellerinizi ve statik dosyalarınızı (CSS ve JavaScript gibi) optimize etmesine izin vererek sayfaları daha hızlı yükleyin.</string>
     <string name="site_settings_faster_static_files">Hızlı statik dosyalar</string>
-    <string name="site_settings_media">Ortam</string>
-    <string name="site_settings_ad_free_video_hosting">Reklamsız video barındırma</string>
     <string name="site_settings_faster_images">Hızlı görseller</string>
-    <string name="site_settings_jetpack_search">Jetpack araması</string>
-    <string name="site_settings_improved_search">İyileştirilmiş arama</string>
-    <string name="site_settings_improved_search_summary">WordPress yerleşik aramasını gelişmiş bir arama deneyimiyle değiştirin</string>
-    <string name="site_settings_more">Daha fazla</string>
-    <string name="site_settings_performance">Performans</string>
-    <string name="site_settings_lazy_load_images_summary">Yalnızca ekranda görünen görselleri yükleyerek sitenizin hızını artırın.</string>
+    <string name="site_settings_site_accelerator_off">Kapalı</string>
     <string name="site_settings_site_accelerator_on">Açık</string>
     <string name="site_settings_site_accelerator">Site hızlandırıcısı</string>
+    <string name="site_settings_lazy_load_images_summary">Yalnızca ekranda görünen görselleri yükleyerek sitenizin hızını artırın.</string>
+    <string name="site_settings_performance">Performans</string>
     <string name="stats_file_downloads_value_label">İndirmeler</string>
     <string name="stats_file_downloads_title_label">Dosya</string>
     <string name="stats_file_downloads">İndirilebilir dosyalar</string>
@@ -643,8 +1041,6 @@ Language: tr
     <string name="post_settings_add_to_calendar">Takvime ekle</string>
     <string name="post_settings_notification">Bildirim</string>
     <string name="post_settings_time_and_date">Tarih ve saat</string>
-    <string name="login_need_help_finding_connected_email">Bağlanırken kullandığınız e-postayı bulmak için yardıma mı ihtiyacınız var?</string>
-    <string name="enter_wordpress_site">Bu adresteki web sitesi bir WordPress sitesi değil. Siteyle bağlantı kurabilmemiz için sitede WordPress yüklü olmalıdır.</string>
     <string name="login_invalid_site_url">Lütfen example.com gibi eksiksiz bir web sitesi adresi girin.</string>
     <string name="enter_email_for_site">%1$s ile bağlanmak için WordPress.com hesabınıza giriş yapın</string>
     <string name="stats_post_views_label">Görüntülemeler</string>
@@ -672,13 +1068,13 @@ Language: tr
     <string name="link_open_new_window">Bağlantıyı yeni pencerede/sekmede aç</string>
     <string name="stats_widget_error_no_access_token">İstatistiklerinizi görüntülemek için WordPress.com hesabında oturum açın.</string>
     <string name="post_list_search_nothing_found">Aramanızla eşleşen gönderi yok</string>
+    <string name="post_list_search_prompt">Yazıları ara</string>
     <string name="domains_suggestions_intro_description">Bu, insanların sizi internette bulacakları yerdir.</string>
     <string name="domains_suggestions_intro_title">Bir premium alan adı seçin</string>
     <string name="my_site_custom_domain_name">Tüm WordPress.com planları kişisel bir alan adı içerir. Ücretsiz premium alan adınızı hemen kaydedin.</string>
     <string name="stats_widget_minified_name">Bir bakışta</string>
     <string name="stats_widget_today_insights_name">Bugün</string>
     <string name="stats_widget_all_time_insights_name">Tüm zamanlar</string>
-    <string name="post_list_search_prompt">Yazıları ara</string>
     <string name="stats_widget_weekly_views_name">Bu haftadan görünümler</string>
     <string name="stats_widget_log_in_message">Bir pencere öğesi eklemek için lütfen WordPress uygulamasında oturum açın.</string>
     <string name="stats_widget_error_no_network">Ağ yok</string>
@@ -696,20 +1092,21 @@ Language: tr
     <string name="stats_widget_add">Pencere öğesi ekle</string>
     <string name="plugin_fetching_error_after_at">Eklenti ayrıntılarının yenilenmesi normalden daha uzun sürer. Lütfen daha sonra tekrar kontrol edin.</string>
     <string name="plugin_install_site_ineligible_default_error">Bir alan adı kaydettirdiyseniz lütfen kayıt tamamlanana kadar bekleyin ve ardından yeniden deneyin.\n\nAksi takdirde, bir şeyler yanlış gitmiş olabilir ve eklenti özelliği bu site için kullanılamayabilir.</string>
-    <string name="jetpack_connection_terms_and_conditions">Jetpack\'i kurarak %1$sşartlar ve koşulları%2$s kabul etmiş sayılırsınız.</string>
-    <string name="error_disabled_apis">Ayarlar getirilemedi: Bu OAuth uygulama idsi ve hesap birleşimi için bazı API\'ler kullanılamıyor.</string>
-    <string name="error_browser_no_network">Bu sayfa şu anda yüklenemiyor.</string>
-    <string name="error_network_connection">Ağ bağlantınızı kontrol edin ve tekrar deneyin.</string>
-    <string name="domain_registration_privacy_protection_tos">Bu etki alanını kaydettirerek %1$sşartlar ve koşulları%2$s kabul etmiş sayılırsınız.</string>
     <string name="domain_contact_information_state_not_available_hint">Eyalet (mevcut değil)</string>
-    <string name="site_settings_password_dialog_title">Parolayı güncelle</string>
-    <string name="site_settings_password_updated">Parola güncellendi</string>
-    <string name="site_settings_update_password_message">Uygulamayı kendi barındırdığınız sitenize yeniden bağlamak için sitenin yeni parolasını buraya girin.</string>
+    <string name="domain_registration_privacy_protection_tos">Bu etki alanını kaydettirerek %1$sşartlar ve koşulları%2$s kabul etmiş sayılırsınız.</string>
+    <string name="error_network_connection">Ağ bağlantınızı kontrol edin ve tekrar deneyin.</string>
+    <string name="error_browser_no_network">Bu sayfa şu anda yüklenemiyor.</string>
+    <string name="error_disabled_apis">Ayarlar getirilemedi: Bu OAuth uygulama idsi ve hesap birleşimi için bazı API\'ler kullanılamıyor.</string>
+    <string name="jetpack_connection_terms_and_conditions">Jetpack\'i kurarak %1$sşartlar ve koşulları%2$s kabul etmiş sayılırsınız.</string>
     <string name="site_settings_disconnected_toast">Bağlantı yok. Düzenleme devre dışı bırakıldı.</string>
+    <string name="site_settings_update_password_message">Uygulamayı kendi barındırdığınız sitenize yeniden bağlamak için sitenin yeni parolasını buraya girin.</string>
+    <string name="site_settings_password_updated">Parola güncellendi</string>
+    <string name="site_settings_password_dialog_title">Parolayı güncelle</string>
     <string name="domain_registration_registering_domain_name_progress_dialog_message">Alan adı kaydediliyor…</string>
     <string name="domain_registration_state_picker_dialog_title">Eyalet seçin</string>
     <string name="domain_registration_country_picker_dialog_title">Ülke seçin</string>
     <string name="domain_registration_result_continue_button">devam</string>
+    <string name="domain_registration_result_description">Alan adınız &lt;b&gt;%s&lt;/b&gt; kuruluyor. Siteniz heyecanla takla atıyor!</string>
     <string name="domain_registration_result_title">Tebrikler</string>
     <string name="domain_contact_information_register_domain_button">Alan adı kaydet</string>
     <string name="domain_contact_information_postal_code_hint">Posta kodu</string>
@@ -720,7 +1117,6 @@ Language: tr
     <string name="domain_contact_information_country_hint">Ülke</string>
     <string name="domain_contact_information_country_code_hint">Ülke kodu</string>
     <string name="domain_contact_information_phone_number_hint">Telefon</string>
-    <string name="domain_registration_result_description">Alan adınız &lt;b>%s&lt;/b> kuruluyor. Siteniz heyecanla takla atıyor!</string>
     <string name="domain_contact_information_organization_hint">Kuruluş (isteğe bağlı)</string>
     <string name="domain_contact_information_description">Size kolaylık olması için, WordPress.com iletişim bilgilerinizi önceden doldurduk. Lütfen bu bilgilerin bu alan adında kullanmak istediğiniz doğru bilgiler olduğundan emin olmak için gözden geçirin.</string>
     <string name="domain_contact_information_title">Alan adı iletişim bilgileri</string>
@@ -733,24 +1129,25 @@ Language: tr
     <string name="stats_management_new">Yeni</string>
     <string name="stats_management_dismiss_insights_news_card">Kapat</string>
     <string name="stats_management_try_it_now">Şimdi deneyin</string>
-    <string name="stats_manage_your_stats">İstatistiklerinizi yönetin</string>
     <string name="stats_management_news_card_message">Hangi istatistikleri göreceğinizi seçin ve en çok önem verdiğiniz verilere odaklanın. İstatistiklerinizi özelleştirmek için \"Yönelimler\" altındaki %1$s öğesine dokunun.</string>
+    <string name="stats_manage_your_stats">İstatistiklerinizi yönetin</string>
     <string name="history_fetching_revisions">Eski srümler getiriliyor…</string>
-    <string name="editor_uploading_draft">Taslağınız karşıya yükleniyor</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">Ortam eklenemedi.\nTekrar denemek için lütfen dokunun.</string>
+    <string name="editor_uploading_draft">Taslağınız karşıya yükleniyor</string>
     <string name="post_uploading_draft">Taslak karşıya yükleniyor</string>
-    <string name="error_restoring_post">Yazı geri yüklenirken bir hata oluştu</string>
     <string name="post_list_tab_drafts">Taslaklar</string>
+    <string name="error_restoring_post">Yazı geri yüklenirken bir hata oluştu</string>
     <string name="backdated_for">Geriye dönüldü: %s</string>
+    <string name="stats_insights_management_title">Sadece en çok ilgili olan istatistikleri görün. Yönelimleri aşağıya ekleyin ve düzenleyin.</string>
     <string name="stats_insights_social">Sosyal</string>
-    <string name="register_domain">Alan Adını Kaydet</string>
-    <string name="jetpack_installed_message">Jetpack yüklendiğine göre artık sadece ayarlarınızı tamamlamanız yeterli. Bu işlem sadece bir dakika sürer.</string>
+    <string name="stats_insights_annual_site_stats">Yıllık site istatistikleri</string>
+    <string name="stats_view_follower_totals">Toplam takipçi</string>
     <string name="domain_suggestions_fetch_error">Alan adı önerileri yüklenemedi</string>
     <string name="domain_suggestions_search_hint">Daha fazla fikir edinmek için anahtar sözcük girin</string>
     <string name="domains_suggestions_empty_list">Hiçir öneri bulunamadı</string>
-    <string name="stats_insights_annual_site_stats">Yıllık site istatistikleri</string>
-    <string name="stats_view_follower_totals">Toplam takipçi</string>
-    <string name="stats_insights_management_title">Sadece en çok ilgili olan istatistikleri görün. Yönelimleri aşağıya ekleyin ve düzenleyin.</string>
+    <string name="register_domain">Alan Adını Kaydet</string>
+    <string name="jetpack_installed_message">Jetpack yüklendiğine göre artık sadece ayarlarınızı tamamlamanız yeterli. Bu işlem sadece bir dakika sürer.</string>
+    <string name="stats_menu_remove">Tek bakıştan çıkar</string>
     <string name="stats_menu_move_down">Aşağı taşı</string>
     <string name="stats_menu_move_up">Yukarı taşı</string>
     <string name="stats_item_settings">İstatistikler öğesi ayarları</string>
@@ -758,9 +1155,8 @@ Language: tr
     <string name="post_restoring">Gönderi geri yükleniyor</string>
     <string name="post_restored">Gönderi geri yüklendi</string>
     <string name="post_trashing">Gönderi siliniyor</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">Yerel değişiklikler</string>
-    <string name="stats_menu_remove">Tek bakıştan çıkar</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Bu yazının çöpe taşınması, kaydedilmeyen değişiklikleri yok sayar. Devam etmek istediğinizden emin misiniz?</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">Yerel değişiklikler</string>
     <string name="button_move_to_draft">Taslaklara taşı</string>
     <string name="post_list_toggle_item_layout_list_view">Liste görünümüne geç</string>
     <string name="post_list_toggle_item_layout_cards_view">Kart görünümüne geç</string>
@@ -785,31 +1181,31 @@ Language: tr
     <string name="plugin_install_custom_domain_required_dialog_register_btn">Alan adı kaydet</string>
     <string name="plugin_install_custom_domain_required_dialog_message">Eklentileri yüklemek için sitenizle ilişkili özel bir alan adına sahip olmanız gerekir.</string>
     <string name="plugin_install_custom_domain_required_dialog_title">Eklenti yükle</string>
-    <string name="stats_insights_load_more">Daha fazla yükle</string>
-    <string name="stats_detail_months_and_years">Ay ve Yıl</string>
-    <string name="stats_months_and_years_period_label">Dönem</string>
-    <string name="stats_months_and_years_views_label">Gösterimler</string>
-    <string name="stats_detail_average_views_per_day">Günlük ortalama gösterim</string>
-    <string name="stats_detail_recent_weeks">Güncel haftalar</string>
-    <string name="scheduled_for">Zamanlanmış: %s</string>
-    <string name="published_on">Yayınlanma tarihi: %s</string>
-    <string name="schedule_for">Zamanlanan: %s</string>
-    <string name="publish_on">Yayın tarihi: %s</string>
     <string name="new_site_creation_preview_subtitle">Daha sonra sitenizin görünümünü kişiselleştirebileceksiniz</string>
-    <string name="showing_stats_for">Gösterilen istatistik:</string>
-    <string name="stats_insights_best_day">En iyi gün</string>
-    <string name="stats_insights_best_hour">En iyi saat</string>
+    <string name="publish_on">Yayın tarihi: %s</string>
+    <string name="schedule_for">Zamanlanan: %s</string>
+    <string name="published_on">Yayınlanma tarihi: %s</string>
+    <string name="scheduled_for">Zamanlanmış: %s</string>
+    <string name="stats_detail_recent_weeks">Güncel haftalar</string>
+    <string name="stats_detail_average_views_per_day">Günlük ortalama gösterim</string>
+    <string name="stats_months_and_years_views_label">Gösterimler</string>
+    <string name="stats_months_and_years_period_label">Dönem</string>
+    <string name="stats_detail_months_and_years">Ay ve Yıl</string>
+    <string name="stats_insights_load_more">Daha fazla yükle</string>
     <string name="stats_insights_today_stats">Bugün</string>
-    <string name="app_rating_rate_now">Şimdi puanla</string>
-    <string name="app_rating_rate_later">Sonra</string>
+    <string name="stats_insights_best_hour">En iyi saat</string>
+    <string name="stats_insights_best_day">En iyi gün</string>
+    <string name="showing_stats_for">Gösterilen istatistik:</string>
     <string name="app_rating_rate_never">Hayır teşekkürler</string>
+    <string name="app_rating_rate_later">Sonra</string>
+    <string name="app_rating_rate_now">Şimdi puanla</string>
     <string name="app_rating_message">Seni tekrar görmek güzel! Eğer uygulamayı sonuna kadar kullandıysan, Google Play mağazasında bir derecelendirmeye bayılırız.</string>
-    <string name="stats_fewer_posts">Daha az yazı</string>
-    <string name="stats_more_posts">Daha çok yazı</string>
-    <string name="stats_site_not_loaded_yet">Site henüz yüklenmedi</string>
-    <string name="stats_insights_posting_activity">Yazma etkinliği</string>
-    <string name="editor_post_converted_back_to_draft">Yazı taslağa geri dönderildi</string>
     <string name="app_rating_title">WordPress hoşunuza gitti mi?</string>
+    <string name="editor_post_converted_back_to_draft">Yazı taslağa geri dönderildi</string>
+    <string name="stats_insights_posting_activity">Yazma etkinliği</string>
+    <string name="stats_site_not_loaded_yet">Site henüz yüklenmedi</string>
+    <string name="stats_more_posts">Daha çok yazı</string>
+    <string name="stats_fewer_posts">Daha az yazı</string>
     <string name="new_site_creation_preview_back_pressed_warning">İlerleme durumunuzu kaybedebilirsiniz. Çıkış yapmak istediğinizden emin misiniz?</string>
     <string name="plans_loading_error_with_cache_button">Yine de Paketleri Görüntüle</string>
     <string name="plans_loading_error_with_cache_subtitle">Paketleri görüntüleyebilmek için etkin bir internet bağlantısı gerekmektedir, bu nedenle ayrıntılar güncel olmayabilir.</string>
@@ -817,42 +1213,33 @@ Language: tr
     <string name="plans_loading_error_no_plans_subtitle">Şu anda Paketleri yükleyemiyoruz. Lütfen daha sonra tekrar deneyin.</string>
     <string name="plans_loading_error_no_plans_title">Paketler Yüklenemiyor</string>
     <string name="plans_loading_error_network_title">Bağlantı yok</string>
+    <string name="menu_switch_to_gutenberg_editor">Blok düzenleyicisine geç</string>
     <string name="stats_loading_block_error">Verileriniz yüklenirken bir sorun oluştu, sayfanızı yenileyip tekrar deneyin.</string>
     <string name="stats_loading_error">Veriler yüklenmedi</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">Blog düzenleyicisi ile yeni gönderileri ve sayfaları düzenleyin</string>
     <string name="site_settings_gutenberg_default_for_new_posts">Blok Düzenleyicisini Kullan</string>
-    <string name="menu_switch_to_gutenberg_editor">Blok düzenleyicisine geç</string>
-    <string name="menu_switch_to_aztec_editor">Klasik düzenleyiciye geç</string>
-    <string name="dialog_gutenberg_informative_title">Blok Düzenleyicisi Etkinleştirildi</string>
     <string name="exit">çıkış</string>
     <string name="quick_start_sites_type_subtitle">%1$d/%2$d tamamlandı</string>
-    <string name="quick_start_sites_type_grow">Kitlenizi Genişletin</string>
-    <string name="quick_start_sites_type_customize">Sitenizi Özelleştirin</string>
+    <string name="quick_start_sites_type_grow">Kitlenizi genişletin</string>
+    <string name="quick_start_sites_type_customize">Sitenizi özelleştirin</string>
     <string name="quick_start_sites">Sonraki Adımlar</string>
     <string name="quick_start_complete_tasks_header">Tamamlandı (%d)</string>
     <string name="quick_start_dialog_view_site_message">Tamamlanmış ürününüzün tadını çıkarın!</string>
     <string name="quick_start_dialog_upload_icon_title">Bir site simgesi yükleyin</string>
     <string name="quick_start_dialog_upload_icon_message">Ziyaretçileriniz tarayıcılarında sizin simgenizi görecektir. Gösterişli ve profesyonel bir görünüm için özel bir simge ekleyin.</string>
     <string name="quick_start_dialog_explore_plans_message_short">Mevcut paketi ve kullanılabilecek diğer paketleri görmek için %1$s Paket %2$s seçeneğine dokunun</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Yeni bir sayfa oluşturmak için %1$s Sayfa Ekle %2$s simgesine dokunun.</string>
     <string name="quick_start_dialog_check_stats_message_short">Sitenizin performansını görmek için %1$s İstatistikler %2$s simgesine dokunun.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">Yeni bir tane yüklemek için %1$s Site Simgeniz %2$s’e dokunun</string>
     <string name="quick_start_dialog_publish_post_message">İlk gönderinizi taslak olarak yayınlayın.</string>
     <string name="quick_start_dialog_need_help_message">Sitenizi oluşturma ve geliştirme konusundaki temel bilgiler hakkında size rehberlik edeceğiz.</string>
     <string name="quick_start_dialog_migration_title">Kontrol listenizde bazı değişiklikler yaptık</string>
-    <string name="quick_start_dialog_create_new_page_message_short">Devam etmek için %1$s Sayfalar %2$s simgesine dokunun.</string>
     <string name="quick_start_dialog_migration_message">Kitlenizi geliştirmenize yardımcı olacak daha fazla görev ekledik.</string>
     <string name="quick_start_dialog_explore_plans_title">Paketleri keşfedin</string>
     <string name="quick_start_dialog_explore_plans_message">Ücretli paketlerimizdeki pazarlama ve SEO araçları hakkında bilgi edinin.</string>
     <string name="quick_start_dialog_enable_sharing_title">Gönderi paylaşımına izin verin</string>
     <string name="quick_start_dialog_enable_sharing_message">Yeni gönderileri sosyal medya hesaplarınızda otomatik olarak paylaşın.</string>
-    <string name="quick_start_dialog_customize_site_message">Yazı tiplerini ayarlayın, resim ekleyin ve daha fazlasını yapın.</string>
-    <string name="quick_start_dialog_create_page_title">Yeni bir sayfa oluşturun</string>
-    <string name="quick_start_dialog_create_page_message">Önemli içerikler için bir sayfa ekleyin. \"Hakkında\" sayfası oluşturmak harika bir başlangıç olabilir.</string>
     <string name="quick_start_dialog_check_stats_title">Sitenizin istatistiklerini gözden geçirin</string>
     <string name="quick_start_dialog_check_stats_message">Sitenizin performansıyla ilgili bilgilerinizi güncelleyin.</string>
-    <string name="quick_start_dialog_browse_themes_title">Temalara göz atın</string>
-    <string name="quick_start_dialog_browse_themes_message">Düzinelerce seçenek arasından isteklerinize en uyumlu olanı keşfedin.</string>
     <string name="quick_start_dialog_remove_next_steps_message">Sonraki Adımları kaldırma seçeneği, bu sitedeki diğer tüm turları gizler. Bu eylem geri alınamaz.</string>
     <string name="quick_start_dialog_remove_next_steps_title">Sonraki Adımları Kaldır</string>
     <string name="quick_start_remove_next_steps_menu_title">Kaldır</string>
@@ -864,27 +1251,23 @@ Language: tr
     <string name="notification_channel_reminder_title">Hatırlatıcı</string>
     <string name="stats_select_next_period_description">Gelecek dönemi seç</string>
     <string name="stats_select_previous_period_description">Önceki dönemi seç</string>
-    <string name="stats_most_popular_percent_views">Görüntülemelere ait %1$d%%</string>
+    <string name="stats_most_popular_percent_views">Görüntülemelerein %%%1$d kadarı</string>
+    <string name="stats_insights_popular">En popüler zaman</string>
     <string name="stats_traffic_change">%1$s (%2$s%%)</string>
     <string name="stats_traffic_increase">+%1$s (%2$s%%)</string>
-    <string name="stats_insights_popular">En popüler zaman</string>
-    <string name="new_site_creation_create_site_button">Site oluştur</string>
-    <string name="notification_new_site_creation_title">Site Oluştur</string>
-    <string name="notification_new_site_creation_failed">Bir sorun vardı</string>
-    <string name="new_site_creation_search_domain_input_hint">Alan adı ara</string>
-    <string name="new_site_creation_clear_all_content_description">Temizle</string>
     <string name="new_site_creation_site_preview_content_description">Site önizlemesi gösteriliyor</string>
+    <string name="new_site_creation_clear_all_content_description">Temizle</string>
     <string name="site_created_but_not_fetched_snackbar_message">Yavaş bir bağlantı kullanıyorsunuz gibi duruyor. Yeni sitenizi listede görmüyorsanız listeyi yenilemeyi deneyin.</string>
     <string name="cancel_new_site_wizard_content_description">Site Oluşturma Sihirbazını İptal Et</string>
     <string name="notification_new_site_creation_creating_site_subtitle">Yeni sitenizi oluşturuyoruz</string>
+    <string name="notification_new_site_creation_failed">Bir sorun vardı</string>
+    <string name="notification_new_site_creation_title">Site Oluştur</string>
+    <string name="new_site_creation_create_site_button">Site oluştur</string>
     <string name="new_site_creation_domain_header_subtitle">Bu, insanların sizi internette bulacakları yerdir.</string>
-    <string name="new_site_creation_domain_header_title">Siteniz için bir alan adı seçin</string>
     <string name="new_site_creation_empty_domain_list_message">Aramanızla eşleşen hiçbir adres bulunamadı</string>
     <string name="site_creation_error_generic_subtitle">Sunucu ile iletişim kurulurken hata oluştu, lütfen tekrar deneyin</string>
     <string name="site_creation_error_generic_title">Bir hata oluştu</string>
     <string name="site_creation_fetch_suggestions_error_unknown">Bir hata oluştu</string>
-    <string name="site_creation_segments_subtitle">Bu, öneriler sunmamıza yardımcı olur. Ancak bu sizi asla kısıtlamaz çünkü tüm siteler değişir!</string>
-    <string name="site_creation_segments_title">Ne tür bir site oluşturmak istediğinizi bize söyleyin</string>
     <string name="new_site_creation_preview_title">Siteniz oluşturuldu!</string>
     <string name="new_site_creation_screen_title_step_count">%1$d/%2$d</string>
     <string name="new_site_creation_screen_title_general">Site Oluştur</string>
@@ -898,16 +1281,19 @@ Language: tr
     <string name="snackbar_conflict_local_version_discarded">Yerel sürüm atıldı</string>
     <string name="toast_conflict_updating_post">Gönderi güncelleniyor</string>
     <string name="dialog_confirm_load_remote_post_discard_web">Web’i At</string>
-    <string name="dialog_confirm_load_remote_post_title">Senkron sorununu çöz</string>
     <string name="dialog_confirm_load_remote_post_discard_local">Yereli At</string>
     <string name="dialog_confirm_load_remote_post_body_2">Yerel\n%s tarihinde kaydedildi\n\nWeb\n%s tarihinde kaydedildi\n</string>
     <string name="dialog_confirm_load_remote_post_body">Bu gönderinin birbiriyle çakışan iki sürümü var. Atmak istediğiniz sürümü seçin.\n\n</string>
+    <string name="dialog_confirm_load_remote_post_title">Senkron sorununu çöz</string>
     <string name="stats_no_data_for_period">Bu dönem için veri yok</string>
     <string name="preference_strip_image_location">Ortam dosyasından konum bilgisini kaldır</string>
     <string name="stats_cannot_be_started">Şu anda istatistikleri açamıyoruz. Lütfen daha sonra tekrar deneyiniz.</string>
+    <string name="gif_picker_endless_scroll_network_error">Ağ hatası nedeniyle bazı ortam dosyaları yüklenemedi.</string>
+    <string name="gif_picker_empty_search_list">Aramanızla eşleşen ortam yok</string>
+    <string name="gif_picker_initial_empty_text">Medya Kitaplığınıza eklemek için GIF\'ler arayın!</string>
+    <string name="stats_author_views_label">Görüntülemeler</string>
     <string name="stats_author_label">Yazar</string>
     <string name="stats_authors">Yazarlar</string>
-    <string name="stats_author_views_label">Görüntülemeler</string>
     <string name="stats_search_terms_views_label">Görüntülemeler</string>
     <string name="stats_search_terms_label">Arama terimi</string>
     <string name="stats_search_terms">Arama terimleri</string>
@@ -924,6 +1310,7 @@ Language: tr
     <string name="stats_referrer_label">Yönlendiren</string>
     <string name="stats_referrers">Yönlendirenler</string>
     <string name="stats_posts_and_pages">Yazılar ve sayfalar</string>
+    <string name="stats_insights_path">Yol</string>
     <string name="stats_insights_linkedin">LinkedIn</string>
     <string name="stats_insights_google_plus">Google+</string>
     <string name="stats_insights_tumblr">Tumblr</string>
@@ -932,14 +1319,10 @@ Language: tr
     <string name="stats_insights_view_more">Daha fazlasını görüntüle</string>
     <string name="stats_insights_share_post">Yazıyı paylaş</string>
     <string name="stats_insights_create_post">Yeni yazı oluştur</string>
-    <string name="gif_picker_endless_scroll_network_error">Ağ hatası nedeniyle bazı ortam dosyaları yüklenemedi.</string>
-    <string name="stats_insights_path">Yol</string>
     <string name="stats_insights_latest_post_message">%2$s yayınlandığından beri %1$s geçti. Yazının şimdiye kadar ki performansı şöyle:</string>
-    <string name="gif_picker_empty_search_list">Aramanızla eşleşen ortam yok</string>
-    <string name="gif_picker_initial_empty_text">Medya Kitaplığınıza eklemek için GIF\'ler arayın!</string>
-    <string name="stats_insights_tags_and_categories">Etiketler ve kategoriler</string>
-    <string name="stats_insights_latest_post_empty">Henüz hiç yazı yayımnlamadınız. Yayımlamaya başladığınızda en son yazınızın özeti burada görünecektir:</string>
     <string name="stats_insights_latest_post_with_no_engagement">%2$s yayımlandığından beri %1$s geçti. Şimdi işe başlayın ve yazılarınızı paylaşarak yazı görüntülemenizi arttırın:</string>
+    <string name="stats_insights_latest_post_empty">Henüz hiç yazı yayımnlamadınız. Yayımlamaya başladığınızda en son yazınızın özeti burada görünecektir:</string>
+    <string name="stats_insights_tags_and_categories">Etiketler ve kategoriler</string>
     <string name="stats_insights_all_time_stats">Tüm zamanlar</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">Takipçiler</string>
@@ -954,14 +1337,14 @@ Language: tr
     <string name="stats_comments_author_label">Yazar</string>
     <string name="stats_comments_posts_and_pages">Yazılar ve sayfalar</string>
     <string name="stats_comments_authors">Yazarlar</string>
+    <string name="stats_follower_since_label">İtibaren</string>
     <string name="stats_follower_label">Takipçi</string>
     <string name="stats_followers_count_message">Toplam %1$s takipçisi: %2$s</string>
     <string name="stats_followers_email">E-posta</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
-    <string name="stats_follower_since_label">Şu tarihten başlayarak:</string>
     <string name="stats_manage_insights">Yönelimleri yönet</string>
-    <string name="stats_no_data_yet">Henüz veri yok</string>
     <string name="stats_empty_insights_title">Henüz yönelim eklenmedi</string>
+    <string name="stats_no_data_yet">Henüz veri yok</string>
     <string name="menu_debug">Hata ayıklama menüsü</string>
     <string name="change_password_dialog_message">Parola değiştiriliyor…</string>
     <string name="change_password_dialog_hint">Parolanız en az altı karakter uzunluğunda olmalı. Daha güçlü olması için küçük harf, büyük harf, numaralar ve ! \" ? $ % ^ &amp; ) gibi semboller kullanın.</string>
@@ -979,28 +1362,28 @@ Language: tr
     <string name="history_loading_revision">Revizyon yükleniyor</string>
     <string name="history_loaded_revision">Revizyon yüklendi</string>
     <string name="history_load_dialog_button_positive">Yükle</string>
+    <string name="history_footer_post">Yazı %1$s %2$s tarihinde oluşturuldu</string>
     <string name="history_footer_page">Sayfa %1$s Tarihinde %2$s Saatinde Oluşturuldu</string>
     <string name="history_empty_title">Henüz geçmiş yok</string>
-    <string name="history_empty_subtitle_page">Sayfanızda değişiklik yaptığınızda geçmişi buradan görebileceksiniz</string>
     <string name="history_empty_subtitle_post">Yazınızda değişiklik yaptığınızda geçmişi buradan görebileceksiniz</string>
-    <string name="history_footer_post">Yazı %1$s %2$s tarihinde oluşturuldu</string>
+    <string name="history_empty_subtitle_page">Sayfanızda değişiklik yaptığınızda geçmişi buradan görebileceksiniz</string>
     <string name="description_user">Kullanıcı avatarı</string>
+    <string name="image_size_full_label">Tam boy</string>
     <string name="image_size_large_label">Büyük</string>
     <string name="image_size_medium_label">Orta</string>
     <string name="image_size_thumbnail_label">Küçük resim</string>
     <string name="menu_history">Geçmiş</string>
-    <string name="image_size_full_label">Tam boy</string>
-    <string name="pages_pending">İnceleme bekleyen</string>
     <string name="pages_open_page_error">Seçilen sayfa mevcut değil</string>
+    <string name="pages_pending">İnceleme bekleyen</string>
+    <string name="pages_empty_trashed">Silinmiş sayfanız yok</string>
+    <string name="pages_empty_scheduled">Zamanlanmış sayfanız yok</string>
+    <string name="pages_empty_drafts">Taslak sayfanız yok</string>
+    <string name="pages_empty_published">Henüz hiç sayfa yayımlamadınız</string>
     <string name="pages_search_suggestion">Sayfaları ara</string>
     <string name="pages_empty_search_result">Aramanızla eşleşen sayfa yok</string>
     <string name="pages_delete_permanently">Kalıcı olarak sil</string>
     <string name="pages_move_to_trash">Çöpe taşı</string>
     <string name="pages_move_to_draft">Taslağa taşı</string>
-    <string name="pages_empty_trashed">Silinmiş sayfanız yok</string>
-    <string name="pages_empty_scheduled">Zamanlanmış sayfanız yok</string>
-    <string name="pages_empty_drafts">Taslak sayfanız yok</string>
-    <string name="pages_empty_published">Henüz hiç sayfa yayımlamadınız</string>
     <string name="pages_set_parent">Ebeveyn belirle</string>
     <string name="pages_view">Görüntüle</string>
     <string name="pages_trashed">Çöpe atıldı</string>
@@ -1012,59 +1395,55 @@ Language: tr
     <string name="site_picker_remove_site_empty">Aramanızla eşleşen site bulunamadı</string>
     <string name="reader_empty_followed_blogs_search_title">Aramanızla eşleşen site bulunamadı</string>
     <string name="page_parent_changed">Üst sayfa değiştirildi</string>
-    <string name="set_parent">Ebeveyn belirle</string>
     <string name="page_permanently_deleted">Sayfa kalıcı olarak silindi</string>
     <string name="page_moved_to_scheduled">Sayfa zamanlandı</string>
     <string name="page_moved_to_published">Sayfa yayımlandı</string>
     <string name="page_moved_to_trash">Sayfa silindi</string>
+    <string name="page_moved_to_draft">Sayfa taslaklara taşındı</string>
     <string name="top_level">En üst seviye</string>
     <string name="page_delete_dialog_message">%s sayfasını silmek istediğinizden emin misiniz?</string>
     <string name="page_parent_change_error">Üst sayfa değiştirilirken sorun yaşandı</string>
     <string name="page_status_change_error">Sayfa durumu değiştirilirken sorun yaşandı</string>
     <string name="page_delete_error">Sayfa silinirken sorun yaşandı</string>
-    <string name="page_moved_to_draft">Sayfa taslaklara taşındı</string>
+    <string name="set_parent">Ebeveyn belirle</string>
     <string name="quick_start_focus_point_description">buraya dokunun</string>
     <string name="quick_start_list_create_site_title">Sitenizi oluşturun</string>
     <string name="quick_start_list_create_site_subtitle">Sitenizi ayağa kaldırın ve yayınlayın.</string>
-    <string name="quick_start_dialog_share_site_title">Siteni paylaş</string>
     <string name="quick_start_dialog_view_site_title">Sitenizi görüntüleyin</string>
-    <string name="quick_start_dialog_share_site_message">Sosyal medya hesaplarınıza bağlanın - siteniz yeni yazıları otomatik olarak paylaşır.</string>
     <string name="quick_start_dialog_view_site_message_short">Sitenizi önizlemek için %1$s Siteyi Görüntüle %2$s seçeneğine dokunun.</string>
+    <string name="quick_start_dialog_share_site_title">Siteni paylaş</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">Devam etmek için %1$s Paylaşım %2$s seçeneğine dokunun</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Sosyal medya hesaplarınızı eklemek için %1$s Bağlantılar %2$s seçeneğine dokunun</string>
+    <string name="quick_start_dialog_share_site_message">Sosyal medya hesaplarınıza bağlanın - siteniz yeni yazıları otomatik olarak paylaşır.</string>
     <string name="quick_start_dialog_publish_post_title">Bir yazı yayınla</string>
-    <string name="quick_start_dialog_need_help_title">Başlamak için ufak bir yardım ister misin?</string>
     <string name="quick_start_dialog_publish_post_message_short">Yeni bir yazı oluşturmak için %1$s yazı oluştur %2$s seçeneğine dokunun</string>
+    <string name="quick_start_dialog_need_help_title">Başlamak için ufak bir yardım ister misin?</string>
     <string name="quick_start_dialog_need_help_button_positive">Evet</string>
-    <string name="quick_start_dialog_need_help_button_negative">Hayır</string>
     <string name="quick_start_dialog_need_help_button_neutral">Asla</string>
+    <string name="quick_start_dialog_need_help_button_negative">Hayır</string>
     <string name="quick_start_dialog_follow_sites_title">Diğer siteleri takip et</string>
-    <string name="quick_start_dialog_customize_site_title">Sitenizi özelleştirin</string>
-    <string name="quick_start_dialog_follow_sites_message">Size hitab eden siteleri bulun ve yayınladıkları zaman güncellemeleri almak için bunları takip edin.</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Benzer alanlardaki siteleri aramak için %1$s Ara %2$s seçeneğine dokunun</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Benzer konulara sahip siteleri aramak için %1$sAra%2$s\'ya dokunun</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Devam etmek için %1$s Okuyucu %2$s seçeneğine dokunun.</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Devam etmek için %1$s Temalar %2$s seçeneğine dokunun.</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Sitenizi kişiselleştirmeye başlamak için %1$s Özelleştir %2$s seçeneğine dokunun</string>
-    <string name="quick_start_button_negative">Şimdi değil</string>
-    <string name="quick_start_button_negative_short">Vazgeç</string>
+    <string name="quick_start_dialog_follow_sites_message">Size hitab eden siteleri bulun ve yayınladıkları zaman güncellemeleri almak için bunları takip edin.</string>
     <string name="quick_start_button_positive">Git</string>
-    <string name="my_site_create_new_site_title">Hiçbir siteniz yok</string>
-    <string name="quick_start_dialog_choose_theme_message">Mükemmel uyumunuzu bulmak için tüm temalarımıza göz atın.</string>
-    <string name="quick_start_dialog_choose_theme_title">Bir tema seç</string>
-    <string name="quick_start_dialog_browse_themes_message_short">Yeni temalar keşfetmek için %1$s Temalar %2$s seçeneğine dokunun</string>
+    <string name="quick_start_button_negative_short">Vazgeç</string>
+    <string name="quick_start_button_negative">Şimdi değil</string>
     <string name="content_description_more">Daha fazlası</string>
-    <string name="stats_jetpack_connection_faq">Jetpack SSS</string>
-    <string name="jetpack">Jetpack</string>
-    <string name="install_jetpack">Jetpack\'i kur</string>
-    <string name="installing_jetpack">Jetpack kuruluyor</string>
-    <string name="jetpack_installed">Jetpack kuruldu</string>
+    <string name="my_site_create_new_site_title">Hiçbir siteniz yok</string>
+    <string name="reader_empty_followed_tags_title">Takip edilen konu yok</string>
+    <string name="reader_empty_followed_tags_subtitle">En sevdiğiniz konularla ilgili yazıları bulmak için buraya konu ekleyin</string>
+    <string name="login_to_to_connect_jetpack">Jetpack\'i bağlamak için kullandığınız WordPress.com hesabına giriş yapın.</string>
     <string name="install_jetpack_retry">Tekrar dene</string>
     <string name="install_jetpack_continue">Devam et</string>
-    <string name="jetpack_installation_problem">Bir sorun vardı</string>
-    <string name="login_to_to_connect_jetpack">Jetpack\'i bağlamak için kullandığınız WordPress.com hesabına giriş yapın.</string>
     <string name="jetpack_installation_problem_message">Jetpack şu anda yüklenemedi.</string>
+    <string name="jetpack_installation_problem">Bir sorun vardı</string>
+    <string name="jetpack_installed">Jetpack kuruldu</string>
     <string name="installing_jetpack_message">Jetpack sitenize yükleniyor. Bu işlemin tamamlanması birkaç dakika sürebilir.</string>
+    <string name="installing_jetpack">Jetpack kuruluyor</string>
     <string name="install_jetpack_message">Web sitesi kimlik bilgileriniz depolanmayacak ve yalnızca Jetpack\'i kurma amacıyla kullanılacak.</string>
+    <string name="install_jetpack">Jetpack\'i kur</string>
+    <string name="jetpack">Jetpack</string>
+    <string name="stats_jetpack_connection_faq">Jetpack SSS</string>
     <string name="stats_jetpack_connection_setup_info">WordPress sitenizdeki istatistikleri kullanmak için Jetpack eklentisini yüklemeniz gerekir.</string>
     <string name="themes_empty_list">Aramanızla eşleşen bir tema yok</string>
     <string name="reader_label_post_search_explainer">Ne bulmak istersiniz?</string>
@@ -1075,28 +1454,28 @@ Language: tr
     <string name="media_empty_search_list">Aramanızla eşleşen bir ortam yok</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">WordPress oturumu kapatılsın mı?</string>
     <string name="sign_out_wpcom_confirm_with_changes">Yazı üzerinden henüz sitenize yüklenmemiş değişiklikleriniz var. Şimdi oturumu kapatmak bu değişiklikleri cihazınızdan silecektir. Yine de oturum kapatılsın mı?</string>
-    <string name="people_empty_list_filtered_users">Henüz kullanıcı yok</string>
-    <string name="people_empty_list_filtered_followers">Henüz takipçi yok</string>
-    <string name="reader_empty_posts_liked_description">Beğendiğiniz yazılar burada yer alacak</string>
     <string name="people_empty_list_filtered_viewers">Henüz hiç kimse görüntülemedi</string>
     <string name="people_empty_list_filtered_email_followers">Henüz e-posta takipçisi yok</string>
-    <string name="reader_empty_followed_blogs_button_discover">Siteleri keşfet</string>
+    <string name="people_empty_list_filtered_followers">Henüz takipçi yok</string>
+    <string name="people_empty_list_filtered_users">Henüz kullanıcı yok</string>
+    <string name="reader_empty_posts_liked_description">Beğendiğiniz yazılar burada yer alacak</string>
     <string name="reader_empty_posts_liked_title">Henüz herhangi bir şey beğenilmedi</string>
     <string name="reader_empty_followed_blogs_button_followed">Takip edilenlere git</string>
+    <string name="reader_empty_followed_blogs_button_discover">Siteleri keşfet</string>
     <string name="reader_empty_followed_blogs_title">Takip edilen site yok</string>
     <string name="notifications_empty_likes">Henüz beğeni yok</string>
     <string name="notifications_empty_followers">Henüz takipçi yok</string>
     <string name="activity_log_limited_content_on_free_plan">Ücretsiz bir paket kullandığınız için etkinliklerinizde sınırlı içerik görüyorsunuz.</string>
-    <string name="activity_log_empty_title">Henüz etkinlik yok</string>
     <string name="activity_log_empty_subtitle">Sitenizde değişiklikler yaptığınızda etkinlik geçmişinizi burada görebilirsiniz</string>
+    <string name="activity_log_empty_title">Henüz etkinlik yok</string>
     <string name="posts_empty_list_button">Bir yazı oluştur</string>
     <string name="pages_empty_list_button">Bir sayfa oluştur</string>
     <string name="media_empty_upload_media">Ortam yükle</string>
     <string name="media_empty_list">Hiç medya içeriğiniz yok</string>
-    <string name="featured_image_desc">öne çıkan görsel</string>
-    <string name="theme_image_desc">tema görslei</string>
-    <string name="blavatar_desc">site simgesi</string>
     <string name="reader_gallery_images_desc">görsel galerisi</string>
+    <string name="blavatar_desc">site simgesi</string>
+    <string name="theme_image_desc">tema görslei</string>
+    <string name="featured_image_desc">öne çıkan görsel</string>
     <string name="button_discard">Gözardı et</string>
     <string name="reader_avatar_desc">profil fotoğrafı</string>
     <string name="notification_channel_transient_title">Geçici</string>
@@ -1108,42 +1487,36 @@ Language: tr
     <string name="support_contact_email_not_set">Ayarlanmadı</string>
     <string name="support_contact_email">İletişim e-postası</string>
     <string name="application_log_button">Uygulama kaydı</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Geri alma devam ediyor</string>
-    <string name="activity_log_rewind_site">Siteyi geri al</string>
     <string name="my_tickets">Taleplerim</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Geri alma devam ediyor</string>
     <string name="activity_log_currently_restoring_message">%1$s %2$s durumuna geri alınıyor</string>
-    <string name="activity_log_rewind_dialog_message">Sitenizi %1$s %2$s durumuna geri almak istediğinize emin misiniz? Bu, o tarihten itibaren oluşturulan veya değiştirilen tüm içeriği ve seçenekleri silecektir.</string>
-    <string name="activity_log_button">Etkinlik kaydı eylem düğmesi</string>
-    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Siteniz başarıyla geri alındı</string>
     <string name="activity_log_currently_restoring_title">Siteniz şuan geri alınıyor</string>
-    <string name="activity_log_rewind_started_snackbar_message">Siteniz geri yüklendi\n%1$s %2$s durumuna geri alınıyor</string>
+    <string name="activity_log_rewind_finished_snackbar_message_no_dates">Siteniz başarıyla geri alındı</string>
     <string name="activity_log_rewind_finished_snackbar_message">Siteniz başarıyla geri alındı\n%1$s %2$s durumuna geri alındı</string>
+    <string name="activity_log_rewind_started_snackbar_message">Siteniz geri yükleniyor\n%1$s %2$s durumuna geri alınıyor</string>
+    <string name="activity_log_button">Etkinlik kaydı eylem düğmesi</string>
     <string name="plugin_auto_managed">Otomatik yönetilen</string>
     <string name="reader_save_posts_locally_dialog_message">Bu yazıyı saklayın ve istediğiniz zaman okumak için geri dönün. Yalnızca bu cihazda kullanılabilir; kaydedilen yazılar diğer cihazlarınızla senkronize edilmez.</string>
-    <string name="reader_empty_search_title">Sonuç bulunamadı</string>
-    <string name="reader_empty_search_request_failed">Arama yapılamıyor</string>
     <string name="reader_save_posts_locally_dialog_title">Yazıyı sonrası için kaydet</string>
-    <string name="sites">Siteler</string>
+    <string name="reader_empty_search_request_failed">Arama yapılamıyor</string>
+    <string name="reader_empty_search_title">Sonuç bulunamadı</string>
     <string name="comment_read_source_post">Yazı kaynağını oku</string>
+    <string name="sites">Siteler</string>
     <string name="signup_magic_link_title">Sihirli bağlantı gönderildi</string>
-    <string name="signup_email_screen_title">E-posta ile giriş</string>
     <string name="verification_2fa_screen_title">Kod doğrulaması</string>
     <string name="selfhosted_site_login_title">Giriş bilgileri</string>
     <string name="magic_link_sent_login_title">Sihirli bağlantı gönderildi</string>
     <string name="magic_link_login_title">Sihirli bağlantı ile giriş</string>
     <string name="site_address_login_title">Site adresi ile giriş</string>
     <string name="email_address_login_title">E-posta ile giriş</string>
-    <string name="alternatively">Alternatif olarak:</string>
-    <string name="reader_btn_bookmarked">Kaydedildi</string>
-    <string name="reader_btn_bookmark">Kaydet</string>
-    <string name="reader_save_for_later_title">Kaydedilen gönderiler</string>
-    <string name="removed">Kaldırıldı</string>
+    <string name="reader_empty_saved_posts_description">%s üzerine dokunarak yazıyı listenize kaydedin.</string>
     <string name="reader_empty_saved_posts_title">Henüz hiç yazı kaydedilmedi!</string>
+    <string name="reader_bookmark_snack_title">Yazı kaydedildi</string>
     <string name="reader_bookmark_snack_btn">Tümünü görüntüle</string>
-    <string name="reader_add_bookmark">Kaydedilen yazılara ekle</string>
     <string name="reader_remove_bookmark">Kaydedilen yazılardan kaldır</string>
-    <string name="reader_bookmark_snack_title">Yazı kaydedildi</string>
-    <string name="reader_empty_saved_posts_description">%s üzerine dokunarak yazıyı listenize kaydedin.</string>
+    <string name="reader_add_bookmark">Kaydedilen yazılara ekle</string>
+    <string name="reader_save_for_later_title">Kaydedilen gönderiler</string>
+    <string name="removed">Kaldırıldı</string>
     <string name="my_site_icon_content_description">Site simgesini değiştir</string>
     <string name="my_site_icon_dialog_cancel_button">İptal</string>
     <string name="my_site_icon_dialog_remove_button">Kaldır</string>
@@ -1152,29 +1525,26 @@ Language: tr
     <string name="my_site_icon_dialog_add_requires_permission_message">Site simgesi ekleme izniniz yok.</string>
     <string name="my_site_icon_dialog_change_message">Simgeyi nasıl düzenlemek istiyorsunuz?</string>
     <string name="my_site_icon_dialog_add_message">Site simgesi eklemek istiyor musunuz?</string>
+    <string name="my_site_icon_dialog_title">Site simgesi</string>
     <string name="reader_followed_blog_notifications_this">bu site</string>
     <string name="reader_followed_blog_notifications_action">Etkinleştir</string>
-    <string name="my_site_icon_dialog_title">Site simgesi</string>
     <string name="reader_followed_blog_notifications">%1$s%2$s%3$s için bildirimler etkinleştirilsin mi?</string>
     <string name="reader_btn_notifications_on">Site bildirimlerini aç</string>
     <string name="reader_btn_notifications_off">Site bildirimlerini kapat</string>
     <string name="activity_log_jetpack_icon">Jetpack simgesi</string>
     <string name="activity_log_event">İşlem</string>
     <string name="activity_log_icon">Etkinlik simgesi</string>
-    <string name="activity">Etkinlik</string>
+    <string name="activity_log">Etkinlik günlüğü</string>
     <string name="privacy_policy_read">Gizlilik politikasını okuyun</string>
     <string name="third_party_policy_learn_more_caption">Üçüncü taraflara ait olanlar dahil diğer izleme araçlarını kullanıyoruz. Bunlar ve nasıl kontrol edilecekleri hakkında bilgi alın.</string>
+    <string name="third_party_policy_learn_more_header">Üçüncü taraf politikası</string>
     <string name="privacy_policy_learn_more_caption">Bu bilgiler, ürünlerimizi geliştirmemize, pazarlamayı sizin için daha alakalı hale getirmemize, WordPress.com deneyiminizi kişiselleştirmemize ve ayrıntılı olarak gizlilik politikamızda belirttiğimiz şekilde daha fazlasına yardımcı olur.</string>
+    <string name="privacy_policy_learn_more_header">Gizlilik politikası</string>
     <string name="cookie_policy_learn_more_caption">WordPress.com hesabınızda oturum açmış durumdayken hizmetlerini kullanımınız hakkında bilgileri analiz aracımızla paylaşın.</string>
+    <string name="cookie_policy_learn_more_header">Çerez politikası</string>
     <string name="preference_privacy_settings">Gizlilik ayarları</string>
     <string name="preference_collect_information">Bilgi topla</string>
-    <string name="cookie_policy_learn_more_header">Çerez politikası</string>
-    <string name="privacy_policy_learn_more_header">Gizlilik politikası</string>
-    <string name="third_party_policy_learn_more_header">Üçüncü taraf politikası</string>
-    <string name="activity_log">Etkinlik günlüğü</string>
-    <string name="rewind">Geri yükle</string>
     <string name="post_submitted">Yazı gönderildi</string>
-    <string name="login_email_button_signup">Hesabınız yok mu? %1$sKaydolun%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">Eklenti özelliği sitenin olumlu itibara sahip olmasını gerektirir.</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">Eklenti özelliği birincil alan adı aboneliğinin bu kullanıcıyla ilişkilendirilmesini gerektirir.</string>
     <string name="plugin_install_site_ineligible_non_admin_user">Eklenti özelliği yönetici ayrıcalıkları gerektirir.</string>
@@ -1194,30 +1564,31 @@ Language: tr
     <string name="notification_settings_followed_dialog_email_posts_weekly">Haftalık</string>
     <string name="notification_settings_followed_dialog_email_posts_instantly">Anında</string>
     <string name="notification_settings_followed_dialog_email_posts_daily">Günlük</string>
+    <string name="notification_settings_followed_dialog_notification_posts_switch">Yeni yazılar</string>
     <string name="notification_settings_followed_dialog_notification_posts_description">Bu sitedeki yeni gönderiler için bildirim alın</string>
     <string name="notification_settings_followed_dialog_email_posts_switch">Yeni yazılar hakkında bana e-posta gönder</string>
-    <string name="notification_settings_followed_dialog_notification_posts_switch">Yeni yazılar</string>
+    <string name="notification_settings_item_your_sites_all_followed_sites">Tüm takip ettiğim siteler</string>
+    <string name="notification_settings_category_followed_sites">Takip edilen siteler</string>
     <string name="content_description_person_reading_device_notification">Cihaz bildirimlerini okuyan kişi</string>
     <string name="content_description_people_looking_charts">Grafiklere ve çizelgelere bakan kişiler</string>
     <string name="comment_title">%s, %s üzerinde</string>
-    <string name="notification_settings_category_followed_sites">Takip edilen siteler</string>
-    <string name="notification_settings_item_your_sites_all_followed_sites">Tüm takip ettiğim siteler</string>
     <string name="dialog_confirm_delete_permanently_post">Bu yazıyı kalıcı olarak silmek istediğinizden emin misiniz?</string>
     <string name="notification_channel_important_title">Önemli</string>
     <string name="notification_channel_general_title">Genel</string>
     <string name="photo_picker_use_photo">Bu fotoğrafı kullan</string>
-    <string name="stock_media_picker_search_hint">Ücretsiz fotoğraf kitaplığı arayın</string>
-    <string name="error_save_empty_draft">Boş taslak kaydedilemez</string>
     <string name="media_preview_title">%1$d of %2$d</string>
     <string name="stock_media_picker_initial_empty_subtext">%s tarafından sağlanıyor</string>
+    <string name="stock_media_picker_initial_empty_text">Ortam kitaplığınıza eklemek için ücretsiz fotoğraflar arayın</string>
+    <string name="stock_media_picker_search_hint">Ücretsiz fotoğraf kitaplığı arayın</string>
+    <string name="photo_picker_stock_media">Ücretsiz fotoğraf kitaplığının içinden seçim yapın</string>
+    <string name="error_save_empty_draft">Boş taslak kaydedilemez</string>
+    <string name="site_settings_quota_space_unlimited">%1$s / sınırsız</string>
     <string name="preview_count">Önizleme %d</string>
     <string name="add_count">Ekle %d</string>
-    <string name="site_settings_quota_space_unlimited">%1$s / sınırsız</string>
-    <string name="photo_picker_stock_media">Ücretsiz fotoğraf kitaplığının içinden seçim yapın</string>
-    <string name="stock_media_picker_initial_empty_text">Ortam kitaplığınıza eklemek için ücretsiz fotoğraflar arayın</string>
     <string name="fab_add_tag_desc">Etiket oluşturun</string>
     <string name="navigate_up_desc">yukarı gidin</string>
     <string name="notification_settings_switch_desc">Bildirimler</string>
+    <string name="open_external_link_desc">Dış bağlantıyı açın</string>
     <string name="show_more_desc">daha fazla öğe gösterin</string>
     <string name="reader_photo_view_desc">fotoğraf</string>
     <string name="reader_list_item_suggestion_remove_desc">silin</string>
@@ -1241,23 +1612,23 @@ Language: tr
     <string name="profile_picture">%s adlı kullanıcının profil resmi</string>
     <string name="comment_checkmark_desc">onay işareti</string>
     <string name="signup_with_google_progress">Google ile kaydolunuyor…</string>
-    <string name="open_external_link_desc">Dış bağlantıyı açın</string>
     <string name="jetpack_connection_failed_with_reason">Jetpack’e bağlantı kurulamadı: %s</string>
     <string name="jetpack_already_connected_toast">Jetpack’e zaten bağlısınız</string>
     <string name="menu_undo_snackbar_action">GERİ AL</string>
-    <string name="menu_preview">Önizleme</string>
-    <string name="file_size_in_terabytes">%s TB</string>
     <string name="menu_visual_mode_done_snackbar">Görsel moda geçildi</string>
+    <string name="menu_visual_mode">Görsel mod</string>
     <string name="menu_html_mode_done_snackbar">HTML moduna geçildi</string>
-    <string name="menu_save_as_draft">Taslak olarak kaydet</string>
     <string name="menu_html_mode">HTML modu</string>
-    <string name="menu_visual_mode">Görsel mod</string>
+    <string name="menu_preview">Önizleme</string>
+    <string name="menu_save_as_draft">Taslak olarak kaydet</string>
+    <string name="file_size_in_terabytes">%s TB</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s KB</string>
     <string name="file_size_in_bytes">%s B</string>
     <string name="site_settings_quota_space_value">%1$s / %2$s</string>
     <string name="site_settings_quota_space_hint">Daha fazla alana gereksinim duyuyorsanız WordPress planınızı yükseltebilirsiniz.</string>
+    <string name="site_settings_quota_space_title">Kullanılan alan</string>
     <string name="site_settings_quota_header">Ortam</string>
     <string name="comment_unspam_talkback">Yorum istenmeyen içerik değil olarak işaretlendi</string>
     <string name="comment_spam_talkback">Yorum istenmeyen içerik olarak işaretlendi</string>
@@ -1269,11 +1640,9 @@ Language: tr
     <string name="comment_unapproved_talkback">Yorumun onayı kaldırıldı</string>
     <string name="comment_approved_talkback">Yorum onaylandı</string>
     <string name="notif_detail_screen_title">Bildirim ayrıntısı %s</string>
+    <string name="edit_photo_screen_title">Fotoğrafı düzenle</string>
     <string name="share_intent_screen_title">Site seç</string>
     <string name="signup_epilogue_screen_title">Yeni hesap</string>
-    <string name="login_prologue_screen_title">Oturum aç</string>
-    <string name="edit_photo_screen_title">Fotoğrafı düzenle</string>
-    <string name="site_settings_quota_space_title">Kullanılan alan</string>
     <string name="login_epilogue_screen_title">Oturum açmak için kullanılan hesap:</string>
     <string name="person_detail_screen_title">Kişi ayrıntısı</string>
     <string name="media_settings_screen_title">Dosya ayrıntıları</string>
@@ -1281,59 +1650,54 @@ Language: tr
     <string name="notifications_screen_title">Bildirimler</string>
     <string name="reader_screen_title">Okuyucu</string>
     <string name="me_section_screen_title">Ben</string>
+    <string name="my_site_section_screen_title">Sitem</string>
     <string name="notif_settings_screen_title">Bildirim ayarları</string>
+    <string name="help_screen_title">Yardım ve destek</string>
     <string name="license_screen_title">Lisans</string>
     <string name="release_notes_screen_title">Sürüm notları</string>
-    <string name="help_screen_title">Yardım ve destek</string>
-    <string name="my_site_section_screen_title">Sitem</string>
     <string name="signup_epilogue_error_avatar_view">Avatarınız yüklendi ve kısa süre içinde kullanılabilir olacak.</string>
+    <string name="permissions_denied_message">Görünen o ki bu özellik için gerekli izinleri kapatmışsınız.&lt;br/&gt;&lt;br/&gt;Bunu değiştirmek için izinlerinizi düzenleyin ve &lt;strong&gt;%s&lt;/strong&gt; izninin etkin olduğundan emin olun.</string>
     <string name="permissions_denied_title">İzinler</string>
-    <string name="version_with_name_param">Sürüm %s</string>
-    <string name="permissions_denied_message">Görünen o ki bu özellik için gerekli izinleri kapatmışsınız.&lt;br/>&lt;br/>Bunu değiştirmek için izinlerinizi düzenleyin ve &lt;strong>%s&lt;/strong> izninin etkin olduğundan emin olun.</string>
     <string name="plugin_caption_featured">Öne çıkan</string>
     <string name="sharing_disabled_description">Jetpack Paylaşım modülünüz devre dışı olduğundan paylaşım ayarlarınıza erişemiyorsunuz.</string>
     <string name="sharing_disabled">Paylaşım modülü devre dışı</string>
+    <string name="version_with_name_param">Sürüm %s</string>
     <string name="copyright_with_year_and_company_params">© %1$d %2$s</string>
     <string name="publisher_with_company_param">Yayıncı: %s</string>
     <string name="notification_sound_has_invalid_path">Seçilen ses geçersiz yola sahip. Lütfen başka bir tane seçin.</string>
     <string name="quickpress_shortcut_with_account_param">QP %s</string>
+    <string name="uploading_subtitle_pages_posts">%1$d sayfa / yazı kaldı</string>
     <string name="uploading_subtitle_pages_only_one">1 sayfa kaldı</string>
     <string name="uploading_subtitle_pages_only_plural">%1$d sayfa kaldı</string>
-    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d sayfa ve 1 dosya kaldı</string>
-    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d yazı ve 1 dosya kaldı</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d sayfa / yazı ve 1 dosya kaldı</string>
     <string name="uploading_subtitle_posts_only_plural">%1$d yazı kaldı</string>
-    <string name="uploading_subtitle_pages_posts">%1$d sayfa / yazı kaldı</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_one">%1$d sayfa / yazı ve 1 dosya kaldı</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_one">%1$d yazı ve 1 dosya kaldı</string>
+    <string name="uploading_subtitle_mixed_pages_plural_media_one">%1$d sayfa ve 1 dosya kaldı</string>
+    <string name="uploading_subtitle_mixed_post_singular_media_one">1 yazı ve 1 dosya kaldı</string>
     <string name="uploading_subtitle_mixed_page_singular_media_one">1 sayfa ve 1 dosya kaldı</string>
+    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d sayfa / yazı ve %2$d / %3$d dosya kaldı</string>
+    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d yazı ve %2$d / %3$d dosya kaldı</string>
     <string name="uploading_subtitle_mixed_pages_plural_media_plural">%1$d sayfa ve %2$d / %3$d dosya kaldı</string>
-    <string name="uploading_subtitle_mixed_page_singular_media_plural">1 sayfa ve %1$d / %2$d dosya kaldı</string>
     <string name="uploading_subtitle_mixed_post_singular_media_plural">1 yazı ve %1$d / %2$d dosya kaldı</string>
-    <string name="uploading_subtitle_mixed_posts_plural_media_plural">%1$d yazı ve %2$d / %3$d dosya kaldı</string>
-    <string name="uploading_subtitle_mixed_pages_and_posts_plural_media_plural">%1$d sayfa / yazı ve %2$d / %3$d dosya kaldı</string>
-    <string name="uploading_subtitle_mixed_post_singular_media_one">1 yazı ve 1 dosya kaldı</string>
-    <string name="media_file_pages_plural_only_not_uploaded">%1$d sayfa karşıya yüklenmedi</string>
+    <string name="uploading_subtitle_mixed_page_singular_media_plural">1 sayfa ve %1$d / %2$d dosya kaldı</string>
     <string name="media_file_pages_and_posts_only_not_uploaded">%1$d yazı/sayfa karşıya yüklenmedi</string>
+    <string name="media_file_pages_plural_only_not_uploaded">%1$d sayfa karşıya yüklenmedi</string>
     <string name="media_file_page_singular_only_not_uploaded">1 sayfa karşıya yüklenmedi</string>
+    <string name="media_file_posts_plural_only_not_uploaded">%1$d yazı karşıya yüklenmedi</string>
+    <string name="media_file_post_singular_only_not_uploaded">1 yazı karşıya yüklenmedi</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%2$d dosya ile %1$d yazı/sayfa karşıya yüklenmedi</string>
     <string name="media_file_pages_plural_mixed_not_uploaded_files_plural">%2$d dosya ile %1$d sayfa karşıya yüklenmedi</string>
     <string name="media_file_page_singular_mixed_not_uploaded_files_plural">%1$d dosya ile 1 sayfa karşıya yüklenmedi</string>
-    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">%1$d dosya ile 1 yazı karşıya yüklenmedi</string>
     <string name="media_file_posts_plural_mixed_not_uploaded_files_plural">%2$d dosya ile %1$d yazı karşıya yüklenmedi</string>
-    <string name="media_file_pages_and_posts_mixed_not_uploaded_files_plural">%2$d dosya ile %1$d yazı/sayfa karşıya yüklenmedi</string>
-    <string name="media_file_post_singular_only_not_uploaded">1 yazı karşıya yüklenmedi</string>
-    <string name="media_file_posts_plural_only_not_uploaded">%1$d yazı karşıya yüklenmedi</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_files_plural">%1$d dosya ile 1 yazı karşıya yüklenmedi</string>
+    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">1 dosya ile %1$d yazı/sayfa karşıya yüklenmedi</string>
     <string name="media_file_pages_plural_mixed_not_uploaded_one_file">1 dosya ile %1$d sayfa karşıya yüklenmedi</string>
     <string name="media_file_page_singular_mixed_not_uploaded_one_file">1 dosya ile 1 sayfa karşıya yüklenmedi</string>
+    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">1 dosya ile %1$d yazı karşıya yüklenmedi</string>
+    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 dosya ile 1 yazı karşıya yüklenmedi</string>
     <string name="untitled_in_parentheses">(İsimsiz)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f, %2$f</string>
-    <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 dosya ile 1 yazı karşıya yüklenmedi</string>
-    <string name="media_file_posts_plural_mixed_not_uploaded_one_file">1 dosya ile %1$d yazı karşıya yüklenmedi</string>
-    <string name="media_file_pages_and_posts_mixed_not_uploaded_one_file">1 dosya ile %1$d yazı/sayfa karşıya yüklenmedi</string>
     <string name="site_creation_domain_finish_button">Site oluştur</string>
-    <string name="content_description_add_avatar">Avatar ekle</string>
-    <string name="signup_with_google_button">Google ile üye ol</string>
-    <string name="signup_with_email_button">E-posta ile üye ol</string>
-    <string name="username_changer_action">Kaydet</string>
     <string name="notification_site_creation_created">Devam etmek için dokunun.</string>
     <string name="notification_site_creation_title_success">Site oluşturuldu!</string>
     <string name="google_error_timeout">Google çok uzun sürede cevap verdi. Daha hızlı bir internet bağlantınız oluncaya kadar beklemeniz gerekebilir.</string>
@@ -1344,39 +1708,35 @@ Language: tr
     <string name="username_changer_error_generic">Kullanıcı adı önerileri alınırken bir hata oluştu.</string>
     <string name="username_changer_dismiss_message">Kullanıcı adı değiştirme iptal edilsin mi?</string>
     <string name="username_changer_dismiss_button_positive">Vazgeç</string>
+    <string name="username_changer_action">Kaydet</string>
+    <string name="content_description_add_avatar">Avatar ekle</string>
     <string name="signup_user_exists">E-posta WordPress.com’da zaten var.\nOturum açmaya geçiliyor.</string>
     <string name="signup_updating_account">Hesap güncelleniyor…</string>
-    <string name="signup_terms_of_service_text">Kaydolmakla %1$sHizmet Koşulları%2$s\'nı kabul etmiş olursunuz.</string>
     <string name="signup_magic_link_progress">E-posta gönderiliyor</string>
     <string name="signup_magic_link_error_button_positive">Tekrar dene</string>
     <string name="signup_magic_link_error_button_negative">Kapat</string>
+    <string name="signup_magic_link_error">E-posta gönderirken bir sorunla karşılaştık. Şimdi yeniden deneyebilir veya kapatıp daha sonra tekrar deneyebilirsiniz.</string>
     <string name="signup_epilogue_hint_username">Kullanıcı adı</string>
+    <string name="signup_epilogue_hint_password_detail">Her zaman az önce kullandığınız gibi bir bağlantıyla oturum açabilirsiniz, ancak isterseniz bir parola da oluşturabilirsiniz.</string>
+    <string name="signup_epilogue_hint_password">Parola (seçime bağlı)</string>
     <string name="signup_epilogue_hint_display">Görünen ad</string>
     <string name="signup_epilogue_error_button_positive">Tekrar dene</string>
     <string name="signup_epilogue_error_button_negative">Eski haline getir</string>
-    <string name="signup_magic_link_error">E-posta gönderirken bir sorunla karşılaştık. Şimdi yeniden deneyebilir veya kapatıp daha sonra tekrar deneyebilirsiniz.</string>
-    <string name="signup_epilogue_hint_password">Parola (seçime bağlı)</string>
     <string name="signup_epilogue_error_generic">Hesabınız güncellenirken bir sorunla karşılaştık. Yeniden deneyebilir veya devam etmek için değişikliklerinizi geri alabilirsiniz.</string>
     <string name="signup_epilogue_error_avatar">Avatarınız güncellenirken bir sorunla karşılaştık.</string>
-    <string name="signup_email_header">Yeni WordPress.com hesabınızı oluşturmak için lütfen e-posta adresinizi girin.</string>
-    <string name="signup_email_error_generic">E-posta adresinizi kontrol ederken bir sorunla karşılaştık.</string>
-    <string name="signup_epilogue_hint_password_detail">Her zaman az önce kullandığınız gibi bir bağlantıyla oturum açabilirsiniz, ancak isterseniz bir parola da oluşturabilirsiniz.</string>
-    <string name="sign_up">WordPress.com\'a Kaydolun</string>
-    <string name="enter_username_instead">Kullanıcı adınızla oturum açın.</string>
-    <string name="enter_site_address_instead">Site adresinizi girerek oturum açın.</string>
+    <string name="plugin_needs_update">Güncellenmesi gerekiyor</string>
     <string name="plugin_caption_search">Eklentileri ara</string>
     <string name="plugin_caption_new">Yeni</string>
     <string name="plugin_caption_popular">Popüler</string>
     <string name="plugins_empty_search_list">Eşleşme yok</string>
     <string name="plugin_see_all">Tümünü gör</string>
     <string name="plugin_manage">Yönet</string>
-    <string name="plugin_install">Kur</string>
-    <string name="site_settings_like_header">Beğen</string>
-    <string name="my_site_add_new_site">Yeni bir site ekle</string>
-    <string name="plugin_needs_update">Güncellenmesi gerekiyor</string>
     <string name="plugin_search_error">Eklentilerde arama yapılamıyor</string>
     <string name="plugin_installed_failed">%s yüklenirken hata oluştu</string>
     <string name="plugin_installed_successfully">%s başarıyla yüklendi!</string>
+    <string name="plugin_install">Kur</string>
+    <string name="site_settings_like_header">Beğen</string>
+    <string name="my_site_add_new_site">Yeni bir site ekle</string>
     <string name="my_site_create_new_site">İşiniz, derginiz ya da kişisel blogunuz için bir site oluşturun; veya mevcut bir WordPress kurulumuna bağlanın.</string>
     <string name="notifications_jetpack_connection_setup_info">Cihazınıza WordPress sitesinden faydalı bildirimler almak için, Jetpack eklentisini yüklemelisiniz. Jetpack’i kurmak istiyor musunuz?</string>
     <string name="site_settings_lazy_load_images">\"Geç yüklenen\" görseller</string>
@@ -1391,11 +1751,11 @@ Language: tr
     <string name="plugin_three_stars">3 yıldız</string>
     <string name="plugin_two_stars">2 yıldız</string>
     <string name="plugin_one_stars">1 yıldız</string>
+    <string name="plugin_empty_text">Hiç biri sağlanmadı</string>
     <string name="plugin_num_downloads">%s indirme</string>
     <string name="plugin_num_ratings">%s puan</string>
     <string name="plugin_read_reviews">İncelemeleri okuyun</string>
     <string name="plugin_faq">Sık sorulan sorular</string>
-    <string name="plugin_empty_text">Hiç biri sağlanmadı</string>
     <string name="plugin_whatsnew">Neler yeni</string>
     <string name="plugin_installation">Kurulum</string>
     <string name="plugin_description">Açıklama</string>
@@ -1404,54 +1764,54 @@ Language: tr
     <string name="plugin_installed_version">%s sürümü kuruldu</string>
     <string name="plugin_version">Sürüm %s</string>
     <string name="plugin_byline">%s tarafından</string>
-    <string name="plugin_fetch_error">Eklentiler yüklenemedi</string>
     <string name="change_photo">Fotoğrafı değiştir</string>
-    <string name="dlg_deleting_tag">Siliniyor</string>
-    <string name="dlg_saving_tag">Kaydediliyor</string>
-    <string name="site_settings_tags_hint">Sitenizin etiketlerini yönetin</string>
+    <string name="plugin_fetch_error">Eklentiler yüklenemedi</string>
     <string name="my_site_btn_site_pages">Site sayfaları</string>
+    <string name="site_settings_tags_hint">Sitenizin etiketlerini yönetin</string>
+    <string name="dlg_saving_tag">Kaydediliyor</string>
+    <string name="dlg_deleting_tag">Siliniyor</string>
     <string name="dlg_confirm_delete_tag">\'%s\' etiketi tamamen silinsin mi?</string>
     <string name="error_tag_exists">Bu isimdeki bir etiket zaten mevcut.</string>
-    <string name="tag_name_hint">Etiket</string>
-    <string name="tag_description_hint">Açıklama</string>
     <string name="add_new_tag">Yeni etiket ekle</string>
+    <string name="tag_description_hint">Açıklama</string>
+    <string name="tag_name_hint">Etiket</string>
     <string name="site_settings_amp_summary">WordPress.com siteniz, mobil cihazlarda yüklenme sürelerini önemli ölçüde hızlandıran, Google liderliğindeki bir girişim olan Hızlandırılmış Mobil Sayfalar kullanımını desteklemektedir</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
-    <string name="site_settings_format_help">Tarih ve zaman biçimi hakkında daha fazlasını öğrenin</string>
     <string name="site_settings_timezones_error">Saat dilimleri yüklenemedi</string>
-    <string name="site_settings_format_entry_custom">Özel</string>
+    <string name="site_settings_format_help">Tarih ve zaman biçimi hakkında daha fazlasını öğrenin</string>
     <string name="site_settings_format_hint_custom">Özel biçim</string>
+    <string name="site_settings_format_entry_custom">Özel</string>
     <string name="site_settings_posts_per_page_title">Sayfa başına yazı</string>
     <string name="site_settings_timezone_subtitle">Saat diliminizden bir şehir seçin</string>
-    <string name="site_settings_time_format_title">Zaman biçimi</string>
     <string name="site_settings_timezone_title">Saat dilimi</string>
+    <string name="site_settings_time_format_title">Zaman biçimi</string>
     <string name="site_settings_date_format_title">Tarih biçimi</string>
     <string name="site_settings_week_start_title">Hafta başlangıcı</string>
-    <string name="site_settings_traffic_header">Trafik</string>
     <string name="site_settings_tags_title">Etiketler</string>
+    <string name="site_settings_traffic_header">Trafik</string>
     <string name="delete_yes">Sil</string>
     <string name="plugin_external_link_icon_content_description">Harici bağlantı</string>
     <string name="plugin_icon_content_description">Eklenti simgesi</string>
-    <string name="wordpress_dot_org_plugin_page">WordPress.org eklenti sayfası</string>
     <string name="plugin_home_page">Eklenti ana sayfası</string>
+    <string name="wordpress_dot_org_plugin_page">WordPress.org eklenti sayfası</string>
     <string name="plugin_remove_dialog_message">%1$s içinden %2$s eklentisini kaldırmak istediğinizden emin misiniz?\n\nBu eklentiyi devre dışı bırakır ve tüm ilişkili dosyaları ve verileri siler.</string>
-    <string name="plugin_remove_progress_dialog_message">Kaldırılıyor %s…</string>
     <string name="plugin_remove_dialog_title">Eklentiyi kaldır</string>
+    <string name="plugin_remove_progress_dialog_message">Kaldırılıyor %s…</string>
     <string name="plugin_disable_progress_dialog_message">Etkisizleştiriliyor %s…</string>
     <string name="plugin_configuration_failed">Eklentiyi yapılandırılırken bir hata oluştu: %s</string>
     <string name="plugin_remove_failed">%s kaldırılırken hata oluştu</string>
     <string name="plugin_removed_successfully">%s başarıyla kaldırıldı.</string>
     <string name="plugin_updated_failed_detailed">%1$s güncellenirken hata oluştu: %2$s</string>
-    <string name="plugin_updated_successfully">%s başarıyla güncellendi.</string>
     <string name="plugin_updated_failed">%s güncellenirken hata oluştu.</string>
+    <string name="plugin_updated_successfully">%s başarıyla güncellendi.</string>
     <string name="plugin_available_version">%s sürümü mevcut</string>
     <string name="plugin_detail_label_state_autoupdates">Otomatik güncellemeler</string>
     <string name="plugin_detail_label_state_active">Etkin</string>
-    <string name="my_site_btn_plugins">Eklentiler</string>
-    <string name="plugins">Eklentiler</string>
-    <string name="media_edit_link_hint">Bağlantıyı yeni sekmede/pencere aç</string>
     <string name="plugin_inactive">Etkin değil</string>
     <string name="plugin_active">Etkin</string>
+    <string name="plugins">Eklentiler</string>
+    <string name="my_site_btn_plugins">Eklentiler</string>
+    <string name="media_edit_link_hint">Bağlantıyı yeni sekmede/pencere aç</string>
     <string name="media_edit_link_text">Bağlantı</string>
     <string name="notification_login_failed">Bir hata oluştu.</string>
     <string name="notification_2fa_needed">Lütfen devam etmek için bir kimlik doğrulama kodu sağlayın.</string>
@@ -1465,25 +1825,24 @@ Language: tr
     <string name="login_empty_password">Lütfen bir parola girin</string>
     <string name="login_text_otp_another">Bana SMS ile başka bir kod gönder</string>
     <string name="enter_verification_code_sms">%s ile biten telefon numaranıza mesaj gönderdik. Lütfen SMS ile aldığınız doğrulama kodunu giriniz.</string>
-    <string name="uploading_subtitle_media_only_one">1 dosya kaldı</string>
     <string name="image_size">Boyut</string>
+    <string name="uploading_subtitle_media_only_one">1 dosya kaldı</string>
     <string name="uploading_subtitle_media_only">%2$d dosyadan %1$d kaldı</string>
     <string name="uploading_subtitle_posts_only_one">1 yazı kaldı</string>
     <string name="uploading_title">Yükleniyor…</string>
     <string name="media_files_uploaded_write_post">Yazı yaz</string>
     <string name="media_all_files_uploaded_successfully">%d dosya başarıyla yüklendi</string>
     <string name="media_files_uploaded_successfully">, %d başarıyla yüklendi</string>
-    <string name="media_file_not_uploaded">1 dosya yüklenmedi</string>
     <string name="media_file_uploaded">1 dosya yüklendi</string>
+    <string name="media_file_not_uploaded">1 dosya yüklenmedi</string>
     <string name="media_files_uploaded">%d dosya yüklendi</string>
     <string name="media_files_not_uploaded">%d dosya yüklenmedi</string>
     <string name="remove_image_from_post">Yazıdan kaldır</string>
     <string name="confirm_remove_media_image">Bu görsel yazıdan kaldırılsın mı?</string>
     <string name="media_edit_customize_card_caption">Özelleştir</string>
     <string name="media_edit_file_details_card_caption">Dosya detayları</string>
-    <string name="login_error_generic">Google hesabı ile bağlantı kurarken bir miktar sorun yaşadık.</string>
     <string name="login_error_suffix">\nBelki de farklı bir hesap denemelisiniz.</string>
-    <string name="login_google_button_suffix">Google ile giriş yapın.</string>
+    <string name="login_error_generic">Google hesabı ile bağlantı kurarken bir miktar sorun yaşadık.</string>
     <string name="login_error_button">Kapat</string>
     <string name="enter_wpcom_password_google">Bu Google hesabıyla devam etmek için lütfen eşleşen WordPress.com parolasını sağlayın. Bu yalnızca bir kez sorulacak.</string>
     <string name="error_generic_network">Bir ağ hatası oluştu. Lütfen bağlantınızı kontrol edin ve tekrar deneyin.</string>
@@ -1491,29 +1850,28 @@ Language: tr
     <string name="post_settings_choose_featured_image">Öne çıkan görsel seç</string>
     <string name="login_log_in_for_share_intent">İçeriği paylaşmak için WordPress.com\'a giriş yapın.</string>
     <string name="enter_site_address_share_intent">WordPress sitenizin içeriğini paylaşmak istediğiniz adresini girin.</string>
-    <string name="jetpack_disconnect_success_toast">Site bağlantısı kesildi</string>
     <string name="jetpack_disconnect_error_toast">Site bağlantısı kesilirken hata oluştu</string>
-    <string name="jetpack_disconnect_confirmation_message">Jetpack\'in siteden bağlantısını kesmek istediğinize emin misiniz?</string>
+    <string name="jetpack_disconnect_success_toast">Site bağlantısı kesildi</string>
     <string name="jetpack_disconnect_confirm">Bağlantıyı kes</string>
+    <string name="jetpack_disconnect_confirmation_message">Jetpack\'in siteden bağlantısını kesmek istediğinize emin misiniz?</string>
     <string name="jetpack_disconnect_pref_title">\"WordPress.com\'dan bağlantıyı kes\"</string>
-    <string name="site_settings_jetpack_whitelist_description">Jetpack tarafından engellenmelerini önleyen bir IP adresini veya bir dizi adresleri beyaz listeye ekleyebilirsiniz. IPv4 ve IPv6 kabul edilebilir. Bir aralığı belirtmek için, düşük değeri ve yüksek değeri bir çizgi ile ayırarak girin. Örnek: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">Bir IP adresini veya bir adres dizisini \"Her zaman izin ver\" olarak işaretleyebilir, böylece Jetpack tarafından engellenmelerini önleyebilirsiniz. IPv4 ve IPv6 kabul edilebilir niteliktedir. Bir aralık belirtmek için aralarına tire ekleyerek düşük ve yüksek değerleri girin. Örnek: 12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">İki adımlı kimlik doğrulamayı zorunlu kıl</string>
-    <string name="jetpack_allow_wpcom_sign_in_title">WordPress.com oturum açmaya izin ver</string>
     <string name="jetpack_match_wpcom_via_email_title">E-posta kullanarak hesapları eşleştir</string>
+    <string name="jetpack_allow_wpcom_sign_in_title">WordPress.com oturum açmaya izin ver</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com oturum açma</string>
-    <string name="jetpack_brute_force_whitelist_title">Beyaz listedeki IP adresleri</string>
     <string name="jetpack_prevent_brute_force_title">Kötü amaçlı giriş girişimleri engelle</string>
     <string name="jetpack_prevent_brute_force_category_title">Brute force saldırı koruması</string>
     <string name="jetpack_send_wp_notifications_title">Anlık bildirimleri gönder</string>
     <string name="jetpack_send_email_notifications_title">Bildirimleri e-posta ile gönder</string>
-    <string name="jetpack_security_setting_title">Güvenlik</string>
     <string name="jetpack_monitor_uptime_title">Sitenizin çalışma süresini izleyin</string>
-    <string name="share_action_media">Ortam kütüphanesine ekle</string>
-    <string name="share_intent_pick_site">Site seç</string>
-    <string name="share_intent_adding_to">Şuna ekleniyor</string>
+    <string name="jetpack_security_setting_title">Güvenlik</string>
     <string name="jetpack_site_settings_category_title">Jetpack ayarları</string>
-    <string name="share_media_permission_required">Görsel veya videoları paylaşmak için gereken izinler</string>
+    <string name="share_intent_adding_to">Şuna ekleniyor</string>
+    <string name="share_intent_pick_site">Site seç</string>
+    <string name="share_action_media">Ortam kütüphanesine ekle</string>
     <string name="share_action_post">Yeni yazıya ekle</string>
+    <string name="share_media_permission_required">Görsel veya videoları paylaşmak için gereken izinler</string>
     <string name="invalid_ip_or_range">Geçersiz IP yada IP aralığı</string>
     <string name="deleting_media_dlg">Siliniyor</string>
     <string name="confirm_delete_media_video">Bu video silinsin mi?</string>
@@ -1531,8 +1889,8 @@ Language: tr
     <string name="media_edit_filename_caption">Dosya adı</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">Alternatif metin</string>
-    <string name="notification_settings_item_sights_and_sounds_blink_light">Işığı yakıp söndür</string>
     <string name="connect_site">Site bağla</string>
+    <string name="notification_settings_item_sights_and_sounds_blink_light">Işığı yakıp söndür</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">Cihazı titreştir</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">Ses seç</string>
     <string name="notification_settings_category_sights_and_sounds">Görüntüler ve sesler</string>
@@ -1542,18 +1900,18 @@ Language: tr
     <string name="notification_settings_category_other">Diğer</string>
     <string name="notification_settings_item_your_sites_all_your_sites">Tüm sitelerim</string>
     <string name="notification_settings_category_your_sites">Siteleriniz</string>
-    <string name="notification_settings_master_off_message">Bildirim ayarlarını devre dışı bırakmak, bu uygulamada türüne bakılmaksızın tüm bildirimleri devre dışı bırakır. Bildirim ayarlarını açtıktan sonra almak istediğiniz bildirim türlerini ayarlayabilirsiniz.</string>
-    <string name="notification_settings_master_off_title">Bu cihazda bildirim almak için Bildirim Ayarlarını etkinleştirin.</string>
-    <string name="notification_settings_master_hint_off">Bildirimleri etkinleştir</string>
-    <string name="notification_settings_master_hint_on">Bildirimleri devre dışı bırak</string>
-    <string name="notification_settings_master_status_off">Kapalı</string>
-    <string name="notification_settings_master_status_on">Açık</string>
+    <string name="notification_settings_main_off_message">Bildirim Ayarlarını devre dışı bırakmak, bu uygulamada türüne bakılmaksızın tüm bildirimleri devre dışı bırakır. Bildirim Ayarlarını açtıktan sonra almak istediğiniz bildirim türlerini ayarlayabilirsiniz.</string>
+    <string name="notification_settings_main_off_title">Bu cihazda bildirim almak için Bildirim Ayarlarını etkinleştirin.</string>
+    <string name="notification_settings_main_hint_off">Bildirimleri etkinleştir</string>
+    <string name="notification_settings_main_hint_on">Bildirimleri etkisizleştir</string>
+    <string name="notification_settings_main_status_off">Kapalı</string>
+    <string name="notification_settings_main_status_on">Açık</string>
     <string name="max_video_resolution">Azami video boyutu</string>
     <string name="max_thumbnail_px_size">Azami görsel boyutu</string>
     <string name="error_upload_post_media_param">Bu yazıya ortam dosyası yüklenirken bir hata oluştu: %s.</string>
     <string name="error_upload_post_param">Bu yazı yüklenirken hata oluştu: %s.</string>
-    <string name="reader_excerpt_link">Daha fazlası için %s adresini ziyaret edin</string>
     <string name="add_media_progress">Ortam ekleniyor</string>
+    <string name="reader_excerpt_link">Daha fazlası için %s adresini ziyaret edin</string>
     <string name="error_unknown_page">Sayfa sunucuda bulunamadı</string>
     <string name="error_publish_empty_page">Boş bir sayfa yayınlanamaz</string>
     <string name="upload_failed_param">\"%s\" için yükleme başarısız</string>
@@ -1584,20 +1942,18 @@ Language: tr
     <string name="login_site_address_more_help">Daha fazla yardım mı gerekiyor?</string>
     <string name="login_site_address_help_content">Sitenize Chrome ile girdiğiniz zaman, sitenizin adresi ekranın üst tarafındaki çubukta gözükür.</string>
     <string name="login_site_address_help_title">Site adresim ne?</string>
-    <string name="login_site_address_help">Site adresinizi bulma konusunda yardıma mı ihtiyacınız var?</string>
     <string name="login_site_address">Site adresi</string>
     <string name="enter_site_address">Bağlanmak istediğiniz WordPress sitesinin adresini girin.</string>
     <string name="login_already_logged_in_wpcom">WordPress.com\'a zaten oturum açılmış</string>
     <string name="login_continue">Devam et</string>
-    <string name="enter_wpcom_password">WordPress.com parolanızı girin.</string>
     <string name="connect_more">Başka siteye bağlan</string>
+    <string name="enter_wpcom_password">WordPress.com parolanızı girin.</string>
     <string name="login_magic_link_email_requesting">Oturum açma e-postası istemek</string>
     <string name="password_incorrect">Bu parola yanlış gibi görünüyor. Lütfen bilgilerinizi iki kez kontrol edin ve tekrar deneyin.</string>
     <string name="requesting_otp">SMS ile bir doğrulama kodu istemek.</string>
     <string name="login_text_otp">Bunun yerine bana SMS ile bir kod gönder</string>
     <string name="enter_verification_code">Neredeyse tamam. Lütfen kimlik doğrulayıcı uygulamanızdan doğrulama kodunu girin.</string>
     <string name="next">Sonraki</string>
-    <string name="open_mail">E-postayı aç</string>
     <string name="enter_email_wordpress_com">Tüm WordPress sitelerinizi yönetmek için bir e-posta adresi kullanarak WordPress.com\'a oturum açın.</string>
     <string name="image_optimization_promo_desc">Görsel optimizasyonu daha hızlı yükleme için görselleri küçültür\n\nSite ayarlarından bu ayarı istediğiniz zaman değiştirebilirsiniz.</string>
     <string name="image_optimization_promo_title">Görsel optimizasyonu etkinleştirilsin mi?</string>
@@ -1619,10 +1975,6 @@ Language: tr
     <string name="post_status_draft">Taslak</string>
     <string name="post_status_pending_review">İnceleme bekliyor</string>
     <string name="post_status_publish_post">Yayımlanmış</string>
-    <string name="change_location">Konumu değiştir</string>
-    <string name="remove_location">Konumu kaldır</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Konum seçicisi açılamıyor, Google Play servisleri uygun durumda değil</string>
-    <string name="post_settings_location">Konum</string>
     <string name="now">Şimdi</string>
     <string name="post_settings_password_dialog_hint">Sadee parolaya sahip olanlar bu yazıyı görüntüleyebilirler</string>
     <string name="post_settings_excerpt_dialog_hint">Özetler içeriğinizin içinden özel olarak el ile hazırlanmış kısa içeriklerdir.</string>
@@ -1647,15 +1999,15 @@ Language: tr
     <string name="media_error_http_too_large_video_upload">Video yüklemek için çok büyük</string>
     <string name="media_error_http_too_large_photo_upload">Görsel yüklemek için çok büyük. Site ayarlarınızdan görselleri optimize et seçeneğini değiştirmeyi deneyin</string>
     <string name="media_audio">Ses</string>
-    <string name="media_documents">Belgeler</string>
     <string name="media_videos">Videolar</string>
+    <string name="media_documents">Belgeler</string>
     <string name="media_images">Görseller</string>
     <string name="media_all">Tümü</string>
     <string name="photo_picker_soft_ask_permissions_denied">%1$s’un fotoğraflarınıza erişimi reddedildi. Bunu düzeltmek için izinlerinizi düzenleyip %2$s özelliğini açın.</string>
     <string name="reader_view_comments">Yorumları görüntüle</string>
     <string name="site_settings_video_quality_hint">Videoların kalitesi. Daha yüksek değerler daha kaliteli videolar demektir.</string>
-    <string name="site_settings_optimize_video_summary">Videoları yeniden boyutlandırmak ve sıkıştırmak için etkinleştirin</string>
     <string name="site_settings_video_width_hint">Yazılardaki videoların boyutunu bu boyuta değiştirir</string>
+    <string name="site_settings_optimize_video_summary">Videoları yeniden boyutlandırmak ve sıkıştırmak için etkinleştirin</string>
     <string name="site_settings_optimize_videos">Videoları optimize et</string>
     <string name="draft_uploaded">Taslak yüklendi</string>
     <string name="report_bug">Hata bildirin</string>
@@ -1730,8 +2082,8 @@ Language: tr
     <string name="toast_verification_email_send_error">Doğrulama e-postası gönderilirken hata oluştu. Zaten doğruladınız mı?</string>
     <string name="toast_verification_email_sent">Doğrulama e-postası gönderildi, gelen kutunuzu kontrol edin</string>
     <string name="toast_saving_post_as_draft">Yazıyı taslak olarak kaydet</string>
-    <string name="photo_picker_capture_photo">Fotoğraf çek</string>
     <string name="photo_picker_capture_video">Video çek</string>
+    <string name="photo_picker_capture_photo">Fotoğraf çek</string>
     <string name="delete_site_warning_subtitle">Dikkatli ol! Site bir kere silindiğinde geri kurtarılamaz. Lütfen ilerlemeden önce emin olun.</string>
     <string name="delete_site_warning">Tüm yazılarınız, görüntüleriniz ve veriler silinecektir. Sitenin adresi (%s) kaybolacaktır.</string>
     <string name="delete_site_warning_title">Site silinsin mi?</string>
@@ -1746,17 +2098,17 @@ Language: tr
     <string name="editor_post_saved_online">Yazı çevrimiçi kaydedildi.</string>
     <string name="site_settings_image_quality_hint">Görüntülerin kalitesi. Daha yüksek değerler daha kaliteli görüntü anlamına gelir.</string>
     <string name="site_settings_optimize_images_summary">Görüntülerin boyutlandırılıp sıkıştırılabilmelerini etkinleştir</string>
+    <string name="media_encoder_quality_100">En yüksek</string>
     <string name="media_encoder_quality_95">Çok yüksek</string>
     <string name="media_encoder_quality_90">Yüksek</string>
     <string name="media_encoder_quality_85">Orta</string>
     <string name="media_encoder_quality_80">Düşük</string>
     <string name="media_upload_state_uploaded">Yüklendi</string>
-    <string name="media_encoder_quality_100">En yüksek</string>
+    <string name="media_upload_state_failed">Yükleme başarısız oldu</string>
     <string name="media_upload_state_deleted">Silindi</string>
     <string name="media_upload_state_deleting">Siliniyor</string>
     <string name="media_upload_state_uploading">Yükleniyor</string>
     <string name="media_upload_state_queued">Sırada</string>
-    <string name="media_upload_state_failed">Yükleme başarısız oldu</string>
     <string name="image_quality">Görsel kalitesi</string>
     <string name="error_all_media_upload_canceled">Tüm ortam yüklemeleri bilimeyen bir hata sebebiyle iptal edildi. Lütfen tekrar yüklemeyi deneyin</string>
     <string name="error_unknown_post_type">Bilinmeyen yazı biçimi</string>
@@ -1770,10 +2122,10 @@ Language: tr
     <string name="error_media_not_found">Ortam bulunamadı</string>
     <string name="error_media_insufficient_fs_permissions">Cihaz ortam dosyası için okuma izni reddedildi</string>
     <string name="site_settings_optimize_images">Görselleri iyileştir</string>
-    <string name="media_upload_error">Ortam yükleme hatası oluştu</string>
     <string name="media_generic_error">Ortam hatası oluştu</string>
-    <string name="confirm">Onayla</string>
+    <string name="media_upload_error">Ortam yükleme hatası oluştu</string>
     <string name="retry">Tekrar dene</string>
+    <string name="confirm">Onayla</string>
     <string name="xmlrpc_endpoint_forbidden_error">Bağlanılamıyor. Sitenizin XMLRPC uç noktasına bağlanırken bir 403\n     hatası aldık. Uygulamanın sitenizle iletişim kurabilmesi için gereklidir. Problemi çözmek için\n     servis sağlayıcınızla iletişime geçin.</string>
     <string name="xmlrpc_post_blocked_error">Bağlanılamıyor. Sunucunuz POST isteklerini engelliyor ve uygulama sitenizle\n    iletişim kurmak için buna ihtiyaç duyuyor. Bu problemi gidermek için servis sağlayıcınızla iletişime geçin.</string>
     <string name="reader_hint_search_followed_sites">Takip edilen siteleri ara</string>
@@ -1806,7 +2158,7 @@ Language: tr
     <string name="signout">Çıkış yap</string>
     <string name="sign_in_wpcom">WordPress.com hesabına giriş yap</string>
     <string name="reader_label_global_related_posts">WordPress.com üzerinden daha fazlası</string>
-    <string name="reader_label_local_related_posts">%s üzerinden daha fazlası</string>
+    <string name="reader_label_local_related_posts">Daha fazlası: %s</string>
     <string name="preference_open_device_settings">Cihaz ayarlarını aç</string>
     <string name="invite_invalid_email">%s: Geçersiz e-posta</string>
     <string name="invite_user_blocked_invites">%s: Kullanıcı bloklu davetler</string>
@@ -1816,88 +2168,83 @@ Language: tr
     <string name="comment_moderated_approved">Yorum onaylandı!</string>
     <string name="like">Beğen</string>
     <string name="timespan_now">şu an</string>
-    <string name="role_follower">Takipçi</string>
     <string name="role_viewer">Görüntüleyici</string>
+    <string name="role_follower">Takipçi</string>
     <string name="error_post_my_profile_no_connection">Bağlantı yok, profiliniz kaydedilemedi</string>
-    <string name="alignment_none">Hiçbiri</string>
-    <string name="alignment_left">Sol</string>
     <string name="alignment_right">Sağ</string>
+    <string name="alignment_left">Sol</string>
+    <string name="alignment_none">Hiçbiri</string>
     <string name="site_settings_list_editor_action_mode_title">%1$d seçildi</string>
     <string name="error_fetch_users_list">Site kullanıcıları getirilemedi</string>
-    <string name="title_follower">Takipçi</string>
     <string name="title_email_follower">E-posta takipçisi</string>
+    <string name="title_follower">Takipçi</string>
     <string name="people_fetching">Kullanıcılar getiriliyor…</string>
-    <string name="people_dropdown_item_email_followers">E-posta takipçileri</string>
     <string name="people_dropdown_item_viewers">İzleyiciler</string>
+    <string name="people_dropdown_item_email_followers">E-posta takipçileri</string>
     <string name="people_dropdown_item_followers">Takipçiler</string>
     <string name="people_dropdown_item_team">Takım</string>
     <string name="invite_message_usernames_limit">10 taneye kadar e-posta adresi ve/veya WordPress.com kullanıcısı davet edin. Kullanıcı adına ihtiyacı olanlara, nasıl oluşturacaklarına dair bilgilendirme gönderilecek.</string>
     <string name="viewer_remove_confirmation_message">Bu izleyiciyi kaldırırsanız artık sitenizi ziyaret edemeyecek.\n\nHala bu kullanıcıyı kaldırmak istiyor musunuz?</string>
     <string name="follower_remove_confirmation_message">Eğer kaldırılırsa, bu takipçi site hakkındaki bildirimleri almayı kesecek, tabi tekrar takibe başlayana kadar.\n\nHala bu takipçiyi kaldırmak istiyor musunuz?</string>
     <string name="follower_subscribed_since">%1$s tarihinden beri</string>
-    <string name="error_remove_follower">Takipçi kaldırılamıyor</string>
     <string name="error_remove_viewer">İzleyici kaldırılamıyor</string>
+    <string name="error_remove_follower">Takipçi kaldırılamıyor</string>
     <string name="error_fetch_email_followers_list">Sitenin e-posta takipçileri getirilemedi</string>
     <string name="error_fetch_followers_list">Site takipçileri getirilemedi</string>
     <string name="editor_failed_uploads_switch_html">Bazı ortam yüklemeleri başarısız oldu. HTML moduna geçebilirsiniz\n        Tüm başarısız yüklemeleri kaldırılıp devam edilsin mi?</string>
-    <string name="image_settings_save_toast">Değişiklikler kaydedildi</string>
-    <string name="image_caption">Altyazı</string>
-    <string name="image_link_to">Bağlantı</string>
     <string name="image_width">Genişlik</string>
+    <string name="image_link_to">Bağlantı</string>
+    <string name="image_caption">Altyazı</string>
+    <string name="image_settings_save_toast">Değişiklikler kaydedildi</string>
     <string name="image_settings_dismiss_dialog_title">Kaydedilmemiş değişiklikler atılsın mı?</string>
     <string name="stop_upload_dialog_title">Yükleme durdurulsun mu?</string>
-    <string name="invite_error_some_failed">Davet gönderildi fakat hata(lar) oluştu!</string>
-    <string name="invite_sent">Davet başarıyla gönderildi</string>
     <string name="tap_to_try_again">Tekrar denemek için dokunun!</string>
+    <string name="invite_sent">Davet başarıyla gönderildi</string>
     <string name="invite_error_for_username">%1$s: %2$s</string>
+    <string name="invite_error_some_failed">Davet gönderildi fakat hata(lar) oluştu!</string>
     <string name="invite_error_sending">Davet gönderilmeye çalışılırken bir hata oluştu!</string>
     <string name="invite_error_invalid_usernames_multiple">Gönderemiyor: Geçersiz kullanıcı adları veya e-postalar</string>
     <string name="invite_error_invalid_usernames_one">Gönderemiyor: bir kullanıcı adı veya e-posta geçersiz</string>
     <string name="invite_error_no_usernames">Lütfen en az bir kullanıcı adı ekleyin</string>
-    <string name="invite_message_info">(İsteğe bağlı) Kullanıcıya/Kullanıcılara göndereceğiniz davete 500 karaktere kadar özel bir mesaj ekleyebilirsiniz.</string>
-    <string name="invite_message_remaining_other">%d karakter kaldı</string>
-    <string name="invite_message_remaining_one">1 karakter kaldı</string>
-    <string name="invite_message_remaining_zero">0 karakter kaldı</string>
-    <string name="invite_message_title">Özel mesaj</string>
+    <string name="invite_message_title">Özel Mesaj</string>
     <string name="invite">Davet et</string>
-    <string name="invite_names_title">Kullanıcı adları ya da e-postalar</string>
-    <string name="send_link">Bağlantı gönder</string>
-    <string name="my_site_header_external">Harici</string>
+    <string name="invite_names_title">Kullanıcı Adları veya E-postalar</string>
     <string name="invite_people">İnsanları davet et</string>
+    <string name="my_site_header_external">Harici</string>
     <string name="label_clear_search_history">Arama geçmişini temizle</string>
     <string name="dlg_confirm_clear_search_history">Arama geçmişini temizle?</string>
     <string name="reader_empty_search_description">Dilinizde %s için hiç sonuç bulunamadı</string>
     <string name="reader_hint_post_search">WordPress üzerinde ara</string>
+    <string name="reader_title_related_post_detail">İlişkili yazı</string>
     <string name="preview_screen_links_disabled">Önizleme ekranında bağlantılar etkisiz durumdadır</string>
     <string name="send">Gönder</string>
-    <string name="user_remove_confirmation_message">Eğer %1$s kullanıcısını kaldırırsanız, o kullanıcı bu siteye artık erişemez fakat %1$s kullanıcı tarafından oluşturulmuş içerik sitede kalır.\n\nHala bu kullanıcıyı kaldırmak istiyor musunuz?</string>
     <string name="person_removed">%1$s başarıyla kaldırıldı</string>
+    <string name="user_remove_confirmation_message">Eğer %1$s kullanıcısını kaldırırsanız, o kullanıcı bu siteye artık erişemez fakat %1$s kullanıcı tarafından oluşturulmuş içerik sitede kalır.\n\nHala bu kullanıcıyı kaldırmak istiyor musunuz?</string>
     <string name="person_remove_confirmation_title">%1$s kullanıcısını kaldır</string>
-    <string name="reader_empty_posts_in_custom_list">Bu listedeki siteler yakın zamanda herhangi bir gönderide bulunmadı</string>
     <string name="role">Rol</string>
     <string name="people">Kişiler</string>
+    <string name="reader_empty_posts_in_custom_list">Bu listedeki siteler yakın zamanda herhangi bir gönderide bulunmadı</string>
     <string name="error_remove_user">Kullanıcı kaldırılamıyor</string>
     <string name="error_update_role">Kullanıcı rolü güncellenemiyor</string>
     <string name="error_fetch_viewers_list">Site izleyicileri getirilemedi</string>
     <string name="error_updating_gravatar">Gravatar\'ınızı güncellerken hata oluştu</string>
-    <string name="error_locating_image">Kırpılmış görseli konumlandırırken hata oluştu</string>
     <string name="error_refreshing_gravatar">Gravatar\'ınız yenilenirken hata oluştu</string>
+    <string name="error_locating_image">Kırpılmış görseli konumlandırırken hata oluştu</string>
     <string name="error_cropping_image">Görsel kırpılırken hata oluştu</string>
     <string name="checking_email">E-posta kontrol ediliyor</string>
     <string name="magic_link_unavailable_error_message">Şu an uygun değil. Lütfen parolanızı girin</string>
     <string name="logging_in">Giriş yapılıyor</string>
-    <string name="enter_your_password_instead">Bunun yerine parola gir</string>
     <string name="web_address_dialog_hint">Yorum yaptığınızda herkes tarafından görülebilir.</string>
     <string name="capture_or_pick_photo">Fotoğraf seç ya da yakala</string>
-    <string name="export_your_content_message">Yazılarınız, sayfalarınız ve ayarlarınız size %s adresine e-posta ile gönderilecek.</string>
-    <string name="plan">Plan</string>
     <string name="plans">Planlar</string>
+    <string name="plan">Plan</string>
+    <string name="export_your_content_message">Yazılarınız, sayfalarınız ve ayarlarınız size %s adresine e-posta ile gönderilecek.</string>
     <string name="export_your_content">İçeriğinizi dışarı aktarın</string>
-    <string name="exporting_content_progress">İçerik dışarı aktarılıyor…</string>
     <string name="export_email_sent">Dışarı aktarma e-postası gönderildi!</string>
-    <string name="premium_upgrades_message">Sitenizde etkin premium güncellemeleri var. Lütfen sitenizi silmeden önce güncellemeleri iptal edin.</string>
-    <string name="show_purchases">Satın almaları göster</string>
+    <string name="exporting_content_progress">İçerik dışarı aktarılıyor…</string>
     <string name="checking_purchases">Satın almalar kontrol ediliyor</string>
+    <string name="show_purchases">Satın almaları göster</string>
+    <string name="premium_upgrades_message">Sitenizde etkin premium güncellemeleri var. Lütfen sitenizi silmeden önce güncellemeleri iptal edin.</string>
     <string name="premium_upgrades_title">Premium güncellemeleri</string>
     <string name="purchases_request_error">Bir şeyler ters gitti. Satın almalar için istek yapılamadı.</string>
     <string name="delete_site_progress">Site siliniyor…</string>
@@ -1906,49 +2253,49 @@ Language: tr
     <string name="primary_domain">Birincil alan adı</string>
     <string name="error_deleting_site_summary">Sitenizi silerken bir hata oluştu. Lütfen daha fazla yardım için destek birimine başvurun.</string>
     <string name="error_deleting_site">Site silinirken hata</string>
-    <string name="confirm_delete_site_prompt">Lütfen aşağıdaki alana %1$s yazarak doğrulayın. Sonrasında siteniz sonsuza dek yok olacak.</string>
     <string name="site_settings_export_content_title">İçeriği dışarı aktar</string>
+    <string name="confirm_delete_site_prompt">Lütfen aşağıdaki alana %1$s yazarak doğrulayın. Sonrasında siteniz sonsuza dek yok olacak.</string>
     <string name="confirm_delete_site">Site silmeyi onayla</string>
     <string name="contact_support">Destek birimine başvurun</string>
     <string name="start_over_text">Eğer bir site istiyor fakat içindeki yazı ve sayfaları istemiyorsanız, destek ekibimiz sizin için yazıları, sayfaları, ortam dosyalarını ve yorumları silebilir\n\nBu sitenizi ve alan adınızı etkin tutar ve size içeriğinizi oluşturabilmeniz için yeni bir başlangıç imkanı verir. Mevcut içeriğinizin temizlenmesi için bize ulaşmanız yeterli.</string>
-    <string name="site_settings_start_over_hint">Sitenize baştan başlayın</string>
     <string name="let_us_help">Yardım edelim</string>
-    <string name="me_btn_app_settings">Uygulama ayarları</string>
+    <string name="site_settings_start_over_hint">Sitenize baştan başlayın</string>
     <string name="start_over">Baştan başla</string>
+    <string name="me_btn_app_settings">Uygulama ayarları</string>
     <string name="editor_remove_failed_uploads">Başarısız yüklemeleri kaldır</string>
-    <string name="comments_empty_list_filtered_trashed">Çöpte yorum yok</string>
     <string name="site_settings_advanced_header">Gelişmiş</string>
+    <string name="comments_empty_list_filtered_trashed">Çöpte yorum yok</string>
     <string name="comments_empty_list_filtered_pending">Bekleyen yorum yok</string>
     <string name="comments_empty_list_filtered_approved">Onaylı yorum yok</string>
     <string name="xmlrpc_missing_method_error">Bağlanılamadı. Sunucuda gerekli XML-RPC işlevleri eksik.</string>
-    <string name="post_format_status">Durum</string>
-    <string name="post_format_video">Video</string>
     <string name="alignment_center">Ortala</string>
-    <string name="post_format_chat">Sohbet</string>
-    <string name="post_format_gallery">Galeri</string>
-    <string name="post_format_image">Görsel</string>
-    <string name="post_format_link">Bağlantı</string>
-    <string name="post_format_quote">Alıntı</string>
+    <string name="post_format_video">Video</string>
+    <string name="post_format_status">Durum</string>
     <string name="post_format_standard">Standart</string>
-    <string name="notif_events">WordPress.com kursları ve etkinlikleri hakkında bilgi (çevrimiçi ve bire bir).</string>
-    <string name="post_format_aside">Yan sütun</string>
+    <string name="post_format_quote">Alıntı</string>
+    <string name="post_format_link">Bağlantı</string>
+    <string name="post_format_image">Görsel</string>
+    <string name="post_format_gallery">Galeri</string>
+    <string name="post_format_chat">Sohbet</string>
     <string name="post_format_audio">Ses</string>
+    <string name="post_format_aside">Yan sütun</string>
+    <string name="notif_events">WordPress.com kursları ve etkinlikleri hakkında bilgi (çevrimiçi ve bire bir).</string>
     <string name="notif_surveys">WordPress.com araştırma ve anketlerine katkıda bulunma olanakları.</string>
     <string name="notif_tips">WordPress.com\'dan en fazlasını almak için ipuçları.</string>
     <string name="notif_community">Topluluk</string>
-    <string name="replies_to_my_comments">Yorumlarıma cevaplar</string>
-    <string name="notif_suggestions">Öneriler</string>
     <string name="notif_research">Araştırma</string>
-    <string name="site_achievements">Site başarıları</string>
+    <string name="notif_suggestions">Öneriler</string>
+    <string name="replies_to_my_comments">Yorumlarıma cevaplar</string>
     <string name="username_mentions">Kullanıcı adı bahsedenleri</string>
-    <string name="likes_on_my_posts">Yazılarımdaki beğenmeler</string>
+    <string name="site_achievements">Site başarıları</string>
     <string name="site_follows">Site takipleri</string>
+    <string name="likes_on_my_posts">Yazılarımdaki beğenmeler</string>
     <string name="likes_on_my_comments">Yorumlarımdaki beğenmeler</string>
     <string name="comments_on_my_site">Sitemdeki yorumlar</string>
     <string name="site_settings_list_editor_summary_other">%d öğe</string>
     <string name="site_settings_list_editor_summary_one">1 öğe</string>
-    <string name="approve_auto_if_previously_approved">Bilinen kullanıcıların yorumları</string>
     <string name="approve_auto">Tüm kullanıcılar</string>
+    <string name="approve_auto_if_previously_approved">Bilinen kullanıcıların yorumları</string>
     <string name="approve_manual">Yorum yapılmamış</string>
     <string name="site_settings_paging_summary_other">Sayfa başına %d yorum</string>
     <string name="site_settings_paging_summary_one">Sayfa başına 1 yorum</string>
@@ -1958,11 +2305,11 @@ Language: tr
     <string name="detail_approve_auto">Herkesin yorumlarını otomatik olarak onayla.</string>
     <string name="detail_approve_auto_if_previously_approved">Kullanıcının daha önceden onaylanmış bir yorumu varsa otomatik olarak onayla</string>
     <string name="detail_approve_manual">Herkesin yorumları için el ile onaylama ister.</string>
-    <string name="days_quantity_one">1 gün</string>
     <string name="days_quantity_other">%d gün</string>
-    <string name="pending_email_change_snackbar">Yeni adresinizin onaylanması için %1$s adresine gönderilen e-postadaki doğrulama bağlantısına tıklayın.</string>
-    <string name="primary_site">Birincil site</string>
+    <string name="days_quantity_one">1 gün</string>
     <string name="web_address">Web adresi</string>
+    <string name="primary_site">Birincil site</string>
+    <string name="pending_email_change_snackbar">Yeni adresinizin onaylanması için %1$s adresine gönderilen e-postadaki doğrulama bağlantısına tıklayın.</string>
     <string name="editor_toast_uploading_please_wait">Şu anda medya yüklüyorsunuz. Lütfen bu işlem tamamlanıncaya kadar bekleyin.</string>
     <string name="error_refresh_comments_showing_older">Yorumlar şu anda yenilenemiyor, eski yorumlar gösteriliyor</string>
     <string name="post_settings_set_featured_image">Öne çıkan görsel belirle</string>
@@ -1971,11 +2318,11 @@ Language: tr
     <string name="dlg_sure_to_delete_comments">Bu yorumlar kalıcı olarak silinsin mi?</string>
     <string name="dlg_sure_to_delete_comment">Bu yorum kalıcı olarak silinsin mi?</string>
     <string name="mnu_comment_delete_permanently">Sil</string>
-    <string name="comment_deleted_permanently">Yorum silindi</string>
     <string name="mnu_comment_untrash">Geri yükle</string>
+    <string name="comment_deleted_permanently">Yorum silindi</string>
     <string name="comments_empty_list_filtered_spam">İstenmeyen yorum yok</string>
-    <string name="could_not_load_page">Sayfa yüklenemiyor</string>
     <string name="comment_status_all">Tümü</string>
+    <string name="could_not_load_page">Sayfa yüklenemiyor</string>
     <string name="off">Kapalı</string>
     <string name="interface_language">Arayüz dili</string>
     <string name="about_the_app">Uygulama hakkında</string>
@@ -1985,20 +2332,20 @@ Language: tr
     <string name="site_settings_unknown_language_code_error">Dil kodu tanınmadı</string>
     <string name="site_settings_threading_dialog_description">Yorumların zincirler halinde kademelenmesine izin ver</string>
     <string name="site_settings_threading_dialog_header">Zincirdeki azami yorum sayısı:</string>
-    <string name="remove">Kaldır</string>
-    <string name="search">Ara</string>
     <string name="disabled">Devre dışı</string>
+    <string name="search">Ara</string>
+    <string name="remove">Kaldır</string>
     <string name="site_settings_image_original_size">Orijinal boyut</string>
     <string name="privacy_private">Siteniz sadece siz ve onay verdiğiniz kullanıcılar tarafından görüntülenebilir</string>
     <string name="privacy_public_not_indexed">Siteniz herkes tarafından görüntülenebilir, ancak arama motorlarından kendisini indekslememelerini ister</string>
     <string name="privacy_public">Siteniz herkes tarafından görülebilir ve arama motorları tarafından indekslenebilir</string>
     <string name="about_me_hint">Hakkınızda birkaç kelime…</string>
-    <string name="public_display_name_hint">Ayarlanmazsa, görünen ad varsayılan olarak kullanıcı adınız şeklinde belirlenir</string>
     <string name="about_me">Hakkımda</string>
+    <string name="public_display_name_hint">Ayarlanmazsa, görünen ad varsayılan olarak kullanıcı adınız şeklinde belirlenir</string>
     <string name="public_display_name">Herkese açık görünen ad</string>
-    <string name="my_profile">Profilim</string>
-    <string name="first_name">Ad</string>
     <string name="last_name">Soyad</string>
+    <string name="first_name">Ad</string>
+    <string name="my_profile">Profilim</string>
     <string name="cd_related_post_preview_image">İlgili yazı önizleme görseli</string>
     <string name="error_post_remote_site_settings">Site bilgileri kaydedilemedi</string>
     <string name="error_fetch_remote_site_settings">Site bilgileri alınamadı</string>
@@ -2007,7 +2354,7 @@ Language: tr
     <string name="site_settings_paging_dialog_description">Yorum zincirlerini birden çok sayfaya böl.</string>
     <string name="site_settings_paging_dialog_header">Sayfa başına yorum</string>
     <string name="site_settings_close_after_dialog_title">Yorumları kapat</string>
-    <string name="site_settings_blacklist_description">Bir yorum içeriğinde, adında, adresinde, e-posta ya da IP’sinde bu sözcüklerden biri bulunuyorsa bu yorum, istenmeyen olarak işaretlenecektir. Sözcük parçaları girebilirsiniz; örneğin \"press\" ifadesi \"WordPress\" ile eşleşecektir.</string>
+    <string name="site_settings_denylist_description">Bir yorum içeriğinde, adında, URL’sinde, e-posta ya da IP’sinde bu sözcüklerden biri bulunuyorsa bu yorum, istenmeyen olarak işaretlenecektir. Sözcük parçaları girebilirsiniz; örneğin \"press\" ifadesi \"WordPress\" ile eşleşecektir.</string>
     <string name="site_settings_hold_for_moderation_description">Bir yorumun içeriğinde, adında, adresinde, e-posta ya da IP’sinde bu sözcüklerden biri bulunuyorsa bu yorum, denetim kuyruğuna alınır. Sözcük parçaları girebilirsiniz; örneğin \"press\" ifadesi \"WordPress\" ile eşleşecektir.</string>
     <string name="site_settings_list_editor_input_hint">Bir sözcük veya sözcük grubu girin</string>
     <string name="site_settings_list_editor_no_items_text">Öğe yok</string>
@@ -2022,10 +2369,10 @@ Language: tr
     <string name="site_settings_rp_show_header_title">Başlığı göster</string>
     <string name="site_settings_rp_switch_summary">Benzer Yazılar, yazılarınızın altında sitenizden ilgili içerikler gösterir.</string>
     <string name="site_settings_rp_switch_title">Benzer yazıları göster</string>
-    <string name="site_settings_blacklist_hint">Bir filtre ile eşleşen yorumlar istenmeyen olarak işaretlenir</string>
+    <string name="site_settings_denylist_hint">Bir filtre ile eşleşen yorumlar istenmeyen olarak işaretlenir</string>
     <string name="site_settings_moderation_hold_hint">Bir filtre ile eşleşen yorumlar denetim kuyruğuna alınır</string>
     <string name="site_settings_multiple_links_hint">Bilinen kullanıcılar için bağlantı sayısı sınırını yoksayar</string>
-    <string name="site_settings_whitelist_hint">Yorum yazarının önceden onaylanmış bir yorumu olmalıdır</string>
+    <string name="site_settings_allowlist_hint">Yorum yazanın önceden onaylanmış bir yorumu olmalı</string>
     <string name="site_settings_user_account_required_hint">Kullanıcılar yorum yapmak için kaydolmalı ve oturum açmalılardır</string>
     <string name="site_settings_identity_required_hint">Yorum yazarı ad ve e-posta alanlarını doldurmalıdır</string>
     <string name="site_settings_paging_hint">Yorumları belirlenen bir boyuttaki öbekler halinde görüntüle</string>
@@ -2048,19 +2395,18 @@ Language: tr
     <string name="site_settings_address_hint">Adresinizi değiştirme şu anda desteklenmiyor</string>
     <string name="site_settings_tagline_hint">Blogunuzu anlatan kısa bir açıklama ya da akılda kalıcı bir ifade</string>
     <string name="site_settings_title_hint">Birkaç kelimeyle bu sitenin ne ile ilgili olduğunu anlatın</string>
-    <string name="site_settings_whitelist_known_summary">Bilinen kullanıcılardan yorumlar</string>
-    <string name="site_settings_whitelist_all_summary">Tüm kullanıcılardan yorumlar</string>
+    <string name="site_settings_allowlist_known_summary">Bilinen kullanıcılardan yorumlar</string>
+    <string name="site_settings_allowlist_all_summary">Tüm kullanıcılardan yorumlar</string>
     <string name="site_settings_threading_summary">%d seviye</string>
     <string name="site_settings_privacy_private_summary">Özel</string>
     <string name="site_settings_privacy_hidden_summary">Gizli</string>
-    <string name="site_settings_delete_site_title">Siteyi sil</string>
     <string name="site_settings_privacy_public_summary">Herkese açık</string>
-    <string name="site_settings_blacklist_title">Kara liste</string>
+    <string name="site_settings_delete_site_title">Siteyi sil</string>
     <string name="site_settings_moderation_hold_title">Denetleme için tut</string>
     <string name="site_settings_multiple_links_title">Yorumlardaki bağlantılar</string>
-    <string name="site_settings_whitelist_title">Otomatik olarak onayla</string>
-    <string name="site_settings_threading_title">Yorum zinciri ayarı</string>
+    <string name="site_settings_allowlist_title">Otomatik olarak onayla</string>
     <string name="site_settings_paging_title">Sayfa ayarı</string>
+    <string name="site_settings_threading_title">Yorum zinciri ayarı</string>
     <string name="site_settings_sort_by_title">Sırala</string>
     <string name="site_settings_account_required_title">Kullanıcılar oturum açmış olmalıdır</string>
     <string name="site_settings_identity_required_title">Ad ve e-posta adresi içermelidir</string>
@@ -2070,22 +2416,22 @@ Language: tr
     <string name="site_settings_default_format_title">Varsayılan biçim</string>
     <string name="site_settings_default_category_title">Varsayılan kategori</string>
     <string name="site_settings_address_title">Adres</string>
-    <string name="site_settings_title_title">Site başlığı</string>
     <string name="site_settings_tagline_title">Etiket satırı</string>
+    <string name="site_settings_title_title">Site başlığı</string>
     <string name="site_settings_discussion_new_posts_header">Yeni yazılar için varsayılanlar</string>
-    <string name="site_settings_account_header">Hesap</string>
     <string name="site_settings_writing_header">Yazma</string>
-    <string name="newest_first">İlk en yeni</string>
+    <string name="site_settings_account_header">Hesap</string>
     <string name="site_settings_general_header">Genel</string>
-    <string name="discussion">Tartışma</string>
-    <string name="privacy">Gizlilik</string>
-    <string name="comments">Yorumlar</string>
-    <string name="close_after">Şu süreden sonra kapat:</string>
+    <string name="newest_first">İlk en yeni</string>
     <string name="oldest_first">İlk en eski</string>
+    <string name="close_after">Şu süreden sonra kapat:</string>
+    <string name="comments">Yorumlar</string>
     <string name="related_posts">İlgili yazılar</string>
+    <string name="privacy">Gizlilik</string>
+    <string name="discussion">Tartışma</string>
     <string name="media_error_no_permission_upload">Siteye medya yükleme izniniz yok</string>
-    <string name="never">Hiçbir zaman</string>
     <string name="unknown">Bilinmeyen</string>
+    <string name="never">Hiçbir zaman</string>
     <string name="reader_err_get_post_not_found">Bu yazı artık mevcut değil</string>
     <string name="reader_err_get_post_not_authorized">Bu yazıyı görüntülemeye yetkili değilsiniz</string>
     <string name="reader_err_get_post_generic">Bu yazı getirilemiyor</string>
@@ -2097,22 +2443,22 @@ Language: tr
     <string name="theme_activation_error">Bir şeyler ters gitti. Tema etkinleştirilemiyor</string>
     <string name="theme_by_author_prompt_append">%1$s tarafından</string>
     <string name="theme_prompt">%1$s terchiniz için teşekkürler</string>
-    <string name="theme_view">Görünüm</string>
-    <string name="theme_details">Detaylar</string>
-    <string name="theme_support">Destek</string>
-    <string name="theme_done">TAMAMLANDI</string>
     <string name="theme_manage_site">SİTEYİ YÖNET</string>
+    <string name="theme_done">TAMAMLANDI</string>
+    <string name="theme_support">Destek</string>
+    <string name="theme_details">Detaylar</string>
+    <string name="theme_view">Görünüm</string>
     <string name="theme_try_and_customize">Deneyin ve özelleştirin</string>
     <string name="theme_activate">Etkinleştir</string>
-    <string name="current_theme">Mevcut tema</string>
-    <string name="customize">Özelleştir</string>
-    <string name="details">Detaylar</string>
-    <string name="support">Destek</string>
     <string name="active">Etkinleştir</string>
-    <string name="post_published">Yazı yayımlandı</string>
-    <string name="page_published">Sayfa yayımlandı</string>
-    <string name="post_updated">Yazı güncellendi</string>
+    <string name="support">Destek</string>
+    <string name="details">Detaylar</string>
+    <string name="customize">Özelleştir</string>
+    <string name="current_theme">Mevcut tema</string>
     <string name="page_updated">Sayfa güncellendi</string>
+    <string name="post_updated">Yazı güncellendi</string>
+    <string name="page_published">Sayfa yayımlandı</string>
+    <string name="post_published">Yazı yayımlandı</string>
     <string name="theme_no_search_result_found">Üzgünüz, tema bulunamadı.</string>
     <string name="reader_label_gap_marker">Daha fazla yazı yükle</string>
     <string name="notifications_no_search_results">\'%s\' hiçbir siteyle eşleşmedi</string>
@@ -2132,9 +2478,10 @@ Language: tr
     <string name="reader_discover_attribution_author">Orijinal olarak %s tarafından yayınlandı</string>
     <string name="reader_discover_attribution_author_and_blog">Orijinal olarak %1$s tarafından %2$s adresinde yayınlandı</string>
     <string name="reader_short_like_count_multi">%s beğeni</string>
-    <string name="reader_short_like_count_none">Beğen</string>
     <string name="reader_short_like_count_one">1 beğeni</string>
+    <string name="reader_short_like_count_none">Beğen</string>
     <string name="reader_label_follow_count">%,d takipçi</string>
+    <string name="reader_menu_tags">Konu ve site düzenleme</string>
     <string name="reader_title_post_detail">Okuyucu yazısı</string>
     <string name="notifications_push_summary">Cihazınızda görünen bildirimlerin ayarları.</string>
     <string name="notifications_email_summary">Hesabınıza bağlı e-posta adresine gönderilen bildirimlerin ayarları.</string>
@@ -2143,19 +2490,19 @@ Language: tr
     <string name="notification_types">Bildirim tipleri</string>
     <string name="error_loading_notifications">Bildirim ayarları yüklenemedi</string>
     <string name="comment_likes">Yorum beğenileri</string>
+    <string name="app_notifications">Uygulama bildirimleri</string>
     <string name="email">E-posta</string>
     <string name="notifications_tab">Bildirimler sekmesi</string>
-    <string name="app_notifications">Uygulama bildirimleri</string>
     <string name="notification_settings_item_other_account_emails_summary">Hesabınızla ilgili önemli e-postaları her zaman göndereceğiz, ayrıca bazı yardımcı içerikler de alabilirsiniz.</string>
     <string name="stats_insights_latest_post_summary">Son yazılar özeti</string>
     <string name="connectionbar_no_connection">Bağlantı yok</string>
+    <string name="post_trashed">Yazı çöpe taşındı</string>
+    <string name="button_trash">Çöpe taşı</string>
     <string name="button_stats">İstatistikler</string>
     <string name="button_preview">Ön izleme</string>
     <string name="button_view">Görüntüle</string>
-    <string name="button_edit">Düzenle</string>
     <string name="button_publish">Yayımla</string>
-    <string name="button_trash">Çöpe taşı</string>
-    <string name="post_trashed">Yazı çöpe taşındı</string>
+    <string name="button_edit">Düzenle</string>
     <string name="reader_toast_err_follow_blog_not_authorized">Bu siteye erişim için yetkiniz yok</string>
     <string name="reader_toast_err_follow_blog_not_found">Site bulunamadı</string>
     <string name="undo">Geri al</string>
@@ -2166,244 +2513,249 @@ Language: tr
     <string name="stats_insights_all_time">Tüm zamanlardaki yazılar, görüntülemeler ve ziyaretçiler</string>
     <string name="stats_insights">Yönelimler</string>
     <string name="me_disconnect_from_wordpress_com">WordPress.com hesabından çıkış yap</string>
-    <string name="me_btn_login_logout">Giriş/Çıkış</string>
     <string name="me_connect_to_wordpress_com">WordPress.com hesabına giriş yap</string>
-    <string name="site_picker_cant_hide_current_site">\"%s\" şu anki site olduğundan gizlenmedi</string>
-    <string name="account_settings">Hesap ayarları</string>
+    <string name="me_btn_login_logout">Giriş/Çıkış</string>
     <string name="me_btn_support">Yardım ve destek</string>
+    <string name="account_settings">Hesap ayarları</string>
+    <string name="site_picker_cant_hide_current_site">\"%s\" şu anki site olduğundan gizlenmedi</string>
     <string name="site_picker_create_wpcom">WordPress.com sitesi oluştur</string>
-    <string name="site_picker_edit_visibility">Siteleri göster/gizle</string>
     <string name="site_picker_add_self_hosted">Kullanıcı tarafından barındırılan site ekle</string>
     <string name="site_picker_add_site">Yeni site ekle</string>
+    <string name="site_picker_edit_visibility">Siteleri göster/gizle</string>
     <string name="site_picker_title">Site seç</string>
-    <string name="my_site_btn_view_admin">Yöneticiyi görüntüle</string>
     <string name="my_site_btn_view_site">Siteyi göster</string>
+    <string name="my_site_btn_view_admin">Yöneticiyi görüntüle</string>
     <string name="my_site_btn_switch_site">Site değiştir</string>
     <string name="my_site_btn_site_settings">Ayarlar</string>
-    <string name="my_site_header_publish">Yayımla</string>
     <string name="my_site_btn_blog_posts">Blog yazıları</string>
+    <string name="my_site_header_publish">Yayımla</string>
     <string name="my_site_header_look_and_feel">Genel görünüm</string>
     <string name="my_site_header_configuration">Yapılandırma</string>
     <string name="reader_label_new_posts_subtitle">Göstermek için dokunun</string>
-    <string name="show">Göster</string>
-    <string name="hide">Gizle</string>
     <string name="deselect_all">Tüm seçimleri kaldır</string>
     <string name="select_all">Tümünü seç</string>
-    <string name="language">Dil</string>
-    <string name="verification_code">Doğrulama kodu</string>
-    <string name="invalid_verification_code">Geçersiz doğrulama kodu</string>
+    <string name="hide">Gizle</string>
+    <string name="show">Göster</string>
     <string name="auth_required">Devam etmek için tekrar giriş yapın.</string>
+    <string name="invalid_verification_code">Geçersiz doğrulama kodu</string>
+    <string name="verification_code">Doğrulama kodu</string>
+    <string name="language">Dil</string>
+    <string name="reader_empty_posts_request_failed">Yazılar geri alınamıyor</string>
     <string name="publisher">Yayımlayan:</string>
     <string name="error_notification_open">Bildirim açılamadı</string>
+    <string name="stats_search_terms_unknown_search_terms">Bilinmeyen arama terimleri</string>
+    <string name="stats_view_search_terms">Arama terimleri</string>
     <string name="stats_view_authors">Yazarlar</string>
     <string name="comments_fetching">Yorumlar alınıyor…</string>
     <string name="pages_fetching">Sayfalar alınıyor…</string>
-    <string name="media_fetching">Medya alınıyor…</string>
-    <string name="stats_search_terms_unknown_search_terms">Bilinmeyen arama terimleri</string>
-    <string name="stats_view_search_terms">Arama terimleri</string>
-    <string name="reader_empty_posts_request_failed">Yazılar geri alınamıyor</string>
     <string name="posts_fetching">Yazılar alınıyor…</string>
+    <string name="media_fetching">Medya alınıyor…</string>
     <string name="logs_copied_to_clipboard">Uygulama günlükleri panoya kopyalandı</string>
-    <string name="error_copy_to_clipboard">Metin panoya kopyalanırken bir hata oluştu</string>
-    <string name="reader_page_recommended_blogs">Hoşunuza gidebilecek siteler</string>
-    <string name="post_uploading">Yazı yükleniyor</string>
     <string name="reader_empty_posts_in_blog">Bu site boş</string>
     <string name="reader_label_new_posts">Yeni yazılar</string>
-    <string name="stats_visitors">Ziyaretçiler</string>
-    <string name="stats_view_countries">Ülkeler</string>
-    <string name="stats_view_followers">Takipçiler</string>
-    <string name="stats_view_videos">Videolar</string>
-    <string name="stats_followers_an_hour_ago">bir saat önce</string>
-    <string name="stats_followers_hours">%1$d saat</string>
-    <string name="stats_followers_months">%1$d ay</string>
-    <string name="stats_followers_a_year">Bir yıl</string>
+    <string name="error_copy_to_clipboard">Metin panoya kopyalanırken bir hata oluştu</string>
+    <string name="post_uploading">Yazı yükleniyor</string>
     <string name="stats_followers_years">%1$d yıl</string>
+    <string name="stats_followers_a_year">Bir yıl</string>
+    <string name="stats_followers_months">%1$d ay</string>
     <string name="stats_followers_a_month">Bir ay</string>
-    <string name="stats_followers_minutes">%1$d dakika</string>
-    <string name="stats_followers_a_day">Bir gün</string>
     <string name="stats_followers_days">%1$d gün</string>
+    <string name="stats_followers_a_day">Bir gün</string>
+    <string name="stats_followers_hours">%1$d saat</string>
+    <string name="stats_followers_an_hour_ago">bir saat önce</string>
+    <string name="stats_followers_minutes">%1$d dakika</string>
     <string name="stats_followers_a_minute_ago">bir dakika önce</string>
     <string name="stats_followers_seconds_ago">saniye önce</string>
-    <string name="themes_fetching">Temalar alınıyor…</string>
-    <string name="stats_view_top_posts_and_pages">Yazılar ve Sayfalar</string>
+    <string name="stats_view_followers">Takipçiler</string>
     <string name="stats_view_publicize">Duyuru</string>
+    <string name="stats_view_videos">Videolar</string>
+    <string name="stats_view_top_posts_and_pages">Yazılar ve Sayfalar</string>
+    <string name="stats_view_countries">Ülkeler</string>
     <string name="stats_likes">Beğenilenler</string>
-    <string name="stats_timeframe_years">Yıl</string>
+    <string name="stats_visitors">Ziyaretçiler</string>
     <string name="stats_views">Görüntülemeler</string>
+    <string name="stats_timeframe_years">Yıl</string>
+    <string name="themes_fetching">Temalar alınıyor…</string>
     <string name="ssl_certificate_details">Detaylar</string>
     <string name="cab_selected">%d seçili</string>
     <string name="browse_our_faq_button">SSS sayfamıza göz atın</string>
     <string name="reader_empty_comments">Henüz yorum yapılmadı</string>
-    <string name="reader_label_view_original">Orijinal makaleyi oku</string>
+    <string name="reader_empty_posts_in_tag">Bu konuyla ilgili hiç yazı yok</string>
     <string name="reader_label_like">Beğen</string>
+    <string name="reader_label_view_original">Orijinal makaleyi oku</string>
     <string name="reader_label_comments_closed">Yorumlar kapandı</string>
     <string name="reader_title_photo_viewer">%1$d / %2$d</string>
+    <string name="error_publish_empty_post">Boş bir yazı yayımlanamaz</string>
     <string name="error_refresh_unauthorized_posts">Yazıları görüntüleme veya düzenleme izniniz yok</string>
     <string name="error_refresh_unauthorized_pages">Sayfaları görüntüleme veya düzenleme izniniz yok</string>
     <string name="error_refresh_unauthorized_comments">Yorumları görüntüleme veya düzenleme izniniz yok</string>
-    <string name="older_month">Bir aydan eski</string>
     <string name="more">Daha Fazla</string>
-    <string name="older_two_days">2 günden eski</string>
+    <string name="older_month">Bir aydan eski</string>
     <string name="older_last_week">1 haftadan eski</string>
+    <string name="older_two_days">2 günden eski</string>
     <string name="mnu_comment_liked">Beğenildi</string>
+    <string name="comment">Yorum yap</string>
     <string name="comment_trashed">Yorum iptal edildi</string>
+    <string name="comment_reply_to_user">Şunu cevapla: %s</string>
     <string name="posts_empty_list">Henüz yazı yok. Bir yazı oluşturmaya ne dersiniz?</string>
     <string name="signing_out">Çıkış yapılıyor…</string>
-    <string name="comment_reply_to_user">Şunu cevapla: %s</string>
-    <string name="error_publish_empty_post">Boş bir yazı yayımlanamaz</string>
-    <string name="comment">Yorum yap</string>
     <string name="reader_toast_err_generic">Bu eylemi gerçekleştirilemiyor</string>
     <string name="reader_toast_err_block_blog">Bu site engellenemiyor</string>
     <string name="reader_toast_blog_blocked">Bu siteden yazılar artık gösterilmeyecek</string>
     <string name="reader_menu_block_blog">Bu siteyi engelleyin</string>
-    <string name="update_verb">Güncelle</string>
     <string name="schedule_verb">Zamanla</string>
-    <string name="reader_page_followed_blogs">Takip edilen siteler</string>
-    <string name="reader_label_followed_blog">Site takip edildi</string>
-    <string name="reader_toast_err_get_blog_info">Bu site gösterilemiyor</string>
-    <string name="reader_toast_err_already_follow_blog">Bu siteyi zaten takip ediyorsunuz</string>
-    <string name="reader_toast_err_follow_blog">Bu site takip edilemiyor</string>
-    <string name="reader_toast_err_unfollow_blog">Bu sitenin takibi bırakılamıyor</string>
+    <string name="update_verb">Güncelle</string>
     <string name="reader_empty_recommended_blogs">Önerilen site yok</string>
+    <string name="reader_toast_err_unfollow_blog">Bu sitenin takibi bırakılamıyor</string>
+    <string name="reader_toast_err_follow_blog">Bu site takip edilemiyor</string>
+    <string name="reader_toast_err_already_follow_blog">Bu siteyi zaten takip ediyorsunuz</string>
+    <string name="reader_toast_err_get_blog_info">Bu site gösterilemiyor</string>
+    <string name="reader_label_followed_blog">Site takip edildi</string>
+    <string name="reader_hint_add_tag_or_url">Bir URL veya takip etmek istediğiniz konuyu girin</string>
+    <string name="reader_page_followed_blogs">Takip edilen siteler</string>
+    <string name="reader_page_followed_tags">Takip edilen konular</string>
     <string name="reader_title_blog_preview">Okuyucu sitesi</string>
-    <string name="help">Yardım</string>
-    <string name="forgot_password">Parolanızı mı kaybettiniz?</string>
-    <string name="ssl_certificate_error">Geçersiz SSL setifikası</string>
     <string name="ssl_certificate_ask_trust">Eğer bu siteye genelde sorunsuz şekilde bağlanabiliyorsanız bu hata birilerinin siteyi taklit ettiği anlamına gelebilir. Yine de sertifikaya güvenmek ister misiniz?</string>
-    <string name="adding_cat_failed">Kategori ekleme başarısız</string>
-    <string name="adding_cat_success">Kategori başarı ile eklendi</string>
-    <string name="sdcard_message">Medya yüklemek için takılı SD kart gereklidir</string>
-    <string name="notifications_empty_list">Bildirim yok</string>
-    <string name="error_generic">Bir hata oluştu</string>
-    <string name="error_moderate_comment">Düzenlenirken hata oluştu</string>
+    <string name="ssl_certificate_error">Geçersiz SSL setifikası</string>
+    <string name="help">Yardım</string>
+    <string name="username_or_password_incorrect">Yanlış kullanıcı adı veya parola girdiniz</string>
+    <string name="email_invalid">Geçerli bir e-posta adresi girin</string>
+    <string name="invalid_email_message">Geçersiz e-posta adresi</string>
+    <string name="error_downloading_image">Görsel indirme hatası</string>
     <string name="error_load_comment">Yorum yüklenemedi</string>
-    <string name="gallery_error">Ortam dosyası geri getirilemedi</string>
-    <string name="no_network_message">Uygun durumda şebeke yok</string>
-    <string name="theme_fetch_failed">Temalar çekilemedi</string>
-    <string name="cat_name_required">Kategori ismi gereklidir</string>
-    <string name="error_refresh_pages">Sayfa şuan yenilenemiyor</string>
-    <string name="error_refresh_comments">Yorumlar şuan yenilenemedi</string>
     <string name="error_edit_comment">Yorum düzeltilirken hata oluştu</string>
+    <string name="error_moderate_comment">Düzenlenirken hata oluştu</string>
+    <string name="error_generic">Bir hata oluştu</string>
+    <string name="error_refresh_comments">Yorumlar şuan yenilenemedi</string>
+    <string name="error_refresh_pages">Sayfa şuan yenilenemiyor</string>
+    <string name="error_refresh_posts">Yazılar şuan yenilenemiyor</string>
     <string name="error_deleting_post">Yazı silinirken bir hata oluştu</string>
-    <string name="blog_not_found">Bu bloga erişilirken hata ile karşılaşıldı</string>
+    <string name="notifications_empty_list">Bildirim yok</string>
+    <string name="sdcard_message">Medya yüklemek için takılı SD kart gereklidir</string>
+    <string name="cat_name_required">Kategori ismi gereklidir</string>
+    <string name="adding_cat_success">Kategori başarı ile eklendi</string>
+    <string name="adding_cat_failed">Kategori ekleme başarısız</string>
     <string name="mnu_comment_unspam">Gereksiz değil</string>
-    <string name="error_downloading_image">Görsel indirme hatası</string>
-    <string name="invalid_email_message">Geçersiz e-posta adresi</string>
-    <string name="email_invalid">Geçerli bir e-posta adresi girin</string>
-    <string name="username_or_password_incorrect">Yanlış kullanıcı adı veya parola girdiniz</string>
-    <string name="error_refresh_posts">Yazılar şuan yenilenemiyor</string>
-    <string name="select_categories">Kategorileri seçin</string>
-    <string name="connection_error">Bağlantı hatası</string>
-    <string name="cancel_edit">Düzenlemekten vazgeç</string>
-    <string name="learn_more">Daha fazla bilgi</string>
-    <string name="media_gallery_type_thumbnail_grid">Küçük resim</string>
-    <string name="media_error_no_permission">Medya kütüphanesini görüntüleme yetkiniz yok</string>
-    <string name="page_settings">Sayfa ayarları</string>
-    <string name="local_draft">Yerel taslak</string>
-    <string name="comment_status_unapproved">Bekliyor</string>
-    <string name="comment_status_spam">Gereksiz</string>
-    <string name="comment_status_trash">Çöp</string>
-    <string name="edit_comment">Yorumu düzenle</string>
-    <string name="mnu_comment_approve">Onayla</string>
-    <string name="mnu_comment_unapprove">Reddet</string>
-    <string name="mnu_comment_spam">Gereksiz</string>
-    <string name="mnu_comment_trash">Çöp</string>
-    <string name="dlg_approving_comments">Onaylanıyor</string>
-    <string name="dlg_unapproving_comments">Reddediliyor</string>
-    <string name="dlg_spamming_comments">Gereksiz olarak işaretleniyor</string>
-    <string name="dlg_trashing_comments">Çöpe gönderiliyor</string>
-    <string name="trash">Çöp</string>
-    <string name="add_new_category">Yeni kategori ekle</string>
-    <string name="category_name">Kategori adı</string>
-    <string name="http_authorization_required">Yetkilendirme gerekli</string>
-    <string name="new_media">Yeni medya</string>
-    <string name="saving_changes">Değişiklikler kaydediliyor</string>
-    <string name="sure_to_cancel_edit_comment">Bu yorumun düzenlenmesi iptal edilsin mi?</string>
-    <string name="content_required">Yorum gerekli</string>
-    <string name="toast_comment_unedited">Yorum değiştirilmedi</string>
-    <string name="image_settings">Görsel ayarları</string>
-    <string name="fatal_db_error">Uygulama veritabanı oluşturulurken hata meydana geldi. Uygulamayı tekrar yüklemeyi deneyin.</string>
-    <string name="view_in_browser">Tarayıcıda görüntüle</string>
-    <string name="open_source_licenses">Açık kaynak lisanslar</string>
+    <string name="theme_fetch_failed">Temalar çekilemedi</string>
+    <string name="blog_not_found">Bu bloga erişilirken hata ile karşılaşıldı</string>
+    <string name="gallery_error">Ortam dosyası geri getirilemedi</string>
+    <string name="no_network_message">Uygun durumda şebeke yok</string>
+    <string name="reader_toast_err_remove_tag">Bu konu silinemiyor</string>
+    <string name="reader_toast_err_add_tag">Bu konu eklenemiyor</string>
     <string name="reader_title_applog">Uygulama günlüğü</string>
-    <string name="dlg_confirm_trash_comments">Çöpe gönderilsin mi?</string>
-    <string name="privacy_policy">Gizlilik politikası</string>
-    <string name="local_changes">Yerel değişiklikler</string>
-    <string name="wordpress_blog">WordPress blog</string>
+    <string name="fatal_db_error">Uygulama veritabanı oluşturulurken hata meydana geldi. Uygulamayı tekrar yüklemeyi deneyin.</string>
     <string name="error_blog_hidden">Bu blog gizli ve yüklenemedi. Ayarlardan yeniden etkinleştirin ve yeniden deneyin.</string>
-    <string name="cannot_delete_multi_media_items">Bazı medyalar silinemedi. Daha sonra tekrar deneyin</string>
-    <string name="post_settings">Yazı ayarları</string>
-    <string name="comment_status_approved">Onaylanan</string>
-    <string name="file_error_create">Geçici medya dosyası oluşturulamıyor. Cihazınızda yeterli boş alan olduğundan emin olun.</string>
+    <string name="error_refresh_media">Ortam dosyaları şu an yenilenemiyor</string>
+    <string name="wordpress_blog">WordPress blog</string>
+    <string name="image_settings">Görsel ayarları</string>
+    <string name="local_changes">Yerel değişiklikler</string>
+    <string name="privacy_policy">Gizlilik politikası</string>
+    <string name="new_media">Yeni medya</string>
     <string name="new_post">Yeni yazı</string>
-    <string name="remove_account">Siteyi kaldır</string>
     <string name="notifications_empty_all">Bildirim yok…henüz.</string>
+    <string name="http_authorization_required">Yetkilendirme gerekli</string>
     <string name="invalid_site_url_message">Girdiğiniz site URL\'sinin geçerli olduğunu kontrol edin</string>
-    <string name="error_refresh_media">Ortam dosyaları şu an yenilenemiyor</string>
-    <string name="file_not_found">Yükleme için dosya bulunamadı. Silindi veya taşındı mı?</string>
-    <string name="plugin_not_found">Bu eklentiye erişirken bir hata oluştu </string>
+    <string name="open_source_licenses">Açık kaynak lisanslar</string>
+    <string name="file_error_create">Geçici medya dosyası oluşturulamıyor. Cihazınızda yeterli boş alan olduğundan emin olun.</string>
+    <string name="category_name">Kategori adı</string>
+    <string name="add_new_category">Yeni kategori ekle</string>
+    <string name="view_in_browser">Tarayıcıda görüntüle</string>
+    <string name="remove_account">Siteyi kaldır</string>
+    <string name="toast_comment_unedited">Yorum değiştirilmedi</string>
+    <string name="content_required">Yorum gerekli</string>
+    <string name="sure_to_cancel_edit_comment">Bu yorumun düzenlenmesi iptal edilsin mi?</string>
+    <string name="saving_changes">Değişiklikler kaydediliyor</string>
+    <string name="trash">Çöp</string>
+    <string name="dlg_confirm_trash_comments">Çöpe gönderilsin mi?</string>
+    <string name="dlg_trashing_comments">Çöpe gönderiliyor</string>
+    <string name="dlg_spamming_comments">Gereksiz olarak işaretleniyor</string>
+    <string name="dlg_unapproving_comments">Reddediliyor</string>
+    <string name="dlg_approving_comments">Onaylanıyor</string>
+    <string name="mnu_comment_trash">Çöp</string>
+    <string name="mnu_comment_spam">Gereksiz</string>
+    <string name="mnu_comment_unapprove">Reddet</string>
+    <string name="mnu_comment_approve">Onayla</string>
+    <string name="edit_comment">Yorumu düzenle</string>
+    <string name="comment_status_trash">Çöp</string>
+    <string name="comment_status_spam">Gereksiz</string>
+    <string name="comment_status_unapproved">Bekliyor</string>
+    <string name="comment_status_approved">Onaylanan</string>
     <string name="delete_page">Sayfa silinsin mi?</string>
     <string name="delete_post">Yazıyı silinsin mi?</string>
-    <string name="post_not_found">Yazı yüklenirken hata oluştu. Yazıyı yenileyin ve tekrar deneyin</string>
+    <string name="post_settings">Yazı ayarları</string>
+    <string name="file_not_found">Yükleme için dosya bulunamadı. Silindi veya taşındı mı?</string>
+    <string name="local_draft">Yerel taslak</string>
+    <string name="page_settings">Sayfa ayarları</string>
     <string name="link_enter_url_text">Bağlantı yazısı (opsiyonel)</string>
+    <string name="cannot_delete_multi_media_items">Bazı medyalar silinemedi. Daha sonra tekrar deneyin</string>
+    <string name="media_error_no_permission">Medya kütüphanesini görüntüleme yetkiniz yok</string>
+    <string name="media_gallery_type_thumbnail_grid">Küçük resim</string>
+    <string name="learn_more">Daha fazla bilgi</string>
+    <string name="post_not_found">Yazı yüklenirken hata oluştu. Yazıyı yenileyin ve tekrar deneyin</string>
+    <string name="plugin_not_found">Bu eklentiye erişirken bir hata oluştu </string>
+    <string name="cancel_edit">Düzenlemekten vazgeç</string>
+    <string name="connection_error">Bağlantı hatası</string>
+    <string name="select_categories">Kategorileri seçin</string>
     <string name="share_link">Bağlantıyı paylaş</string>
     <string name="reader_empty_posts_in_tag_updating">Yazılar getiriliyor…</string>
-    <string name="reader_label_reply">Yanıtla</string>
-    <string name="reader_likes_multi">%,d kişi bunu beğendi</string>
     <string name="reader_likes_you_and_multi">Siz ve %,d kişi bunu beğendi</string>
-    <string name="comment_spammed">Yorum istenmeyen olarak işaretlendi</string>
+    <string name="reader_likes_multi">%,d kişi bunu beğendi</string>
+    <string name="reader_label_reply">Yanıtla</string>
     <string name="cant_share_no_visible_blog">Görünür bir bloğunuz olmadan WordPress ile paylaşamazsınız</string>
-    <string name="pick_photo">Fotoğraf seçin</string>
-    <string name="pick_video">Video seçin</string>
-    <string name="reader_likes_you_and_one">Siz ve bir başkası daha bunu değendi</string>
+    <string name="comment_spammed">Yorum istenmeyen olarak işaretlendi</string>
     <string name="reader_toast_err_get_post">Bu yazıya erişilemiyor</string>
-    <string name="empty_list_default">Bu liste boş</string>
-    <string name="reader_untitled_post">(Başlıksız)</string>
-    <string name="reader_btn_share">Paylaş</string>
-    <string name="reader_toast_err_share_intent">Paylaşılamadı</string>
+    <string name="reader_likes_you_and_one">Siz ve bir başkası daha bunu değendi</string>
+    <string name="pick_video">Video seçin</string>
+    <string name="pick_photo">Fotoğraf seçin</string>
+    <string name="sign_up_label">Üye ol</string>
     <string name="reader_toast_err_url_intent">%s açılamadı</string>
-    <string name="reader_likes_one">Bir kişi bunu beğendi</string>
-    <string name="reader_likes_only_you">Bunu beğendin</string>
-    <string name="reader_btn_follow">Takip et</string>
-    <string name="reader_btn_unfollow">Takipte</string>
+    <string name="reader_toast_err_view_image">Görsel görüntülenemedi</string>
+    <string name="reader_toast_err_share_intent">Paylaşılamadı</string>
+    <string name="reader_toast_err_tag_invalid">Bu geçerli bir konu değil</string>
+    <string name="reader_toast_err_tag_exists">Bu konuyu zaten takip ediyorsunuz</string>
     <string name="reader_toast_err_comment_failed">Yorumunuz gönderilemedi</string>
-    <string name="reader_view_reblog">Yeniden blogla</string>
-    <string name="reader_label_added_tag">%s eklendi</string>
+    <string name="reader_likes_only_you">Bunu beğendin</string>
+    <string name="reader_likes_one">Bir kişi bunu beğendi</string>
     <string name="reader_label_removed_tag">%s kaldırıldı</string>
+    <string name="reader_label_added_tag">%s eklendi</string>
     <string name="reader_hint_comment_on_comment">Yorumu yanıtla…</string>
+    <string name="reader_btn_unfollow">Takipte</string>
+    <string name="reader_btn_follow">Takip et</string>
+    <string name="reader_btn_share">Paylaş</string>
+    <string name="reader_view_reblog">Yeniden blogla</string>
+    <string name="reader_untitled_post">(Başlıksız)</string>
     <string name="comments_empty_list">Henüz yorum yok</string>
-    <string name="reader_toast_err_view_image">Görsel görüntülenemedi</string>
-    <string name="sign_up_label">Üye ol</string>
-    <string name="themes">Temalar</string>
-    <string name="media_edit_title_text">Başlık</string>
-    <string name="media_edit_caption_text">Manşet</string>
-    <string name="media_edit_description_text">Açıklama</string>
-    <string name="media_edit_failure">Güncelleme hatası</string>
-    <string name="share_action">Paylaş</string>
-    <string name="stats">İstatistikler</string>
-    <string name="stats_view_clicks">Tıklamalar</string>
-    <string name="stats_timeframe_today">Bugün</string>
-    <string name="stats_timeframe_yesterday">Dün</string>
-    <string name="stats_timeframe_days">Günler</string>
-    <string name="stats_timeframe_weeks">Haftalar</string>
+    <string name="empty_list_default">Bu liste boş</string>
     <string name="stats_timeframe_months">Aylar</string>
-    <string name="media_gallery_type_tiled">Döşeme</string>
-    <string name="media_gallery_type_slideshow">Slayt gösterisi</string>
-    <string name="media_gallery_type_squares">Kare</string>
-    <string name="media_gallery_type_circles">Çember</string>
-    <string name="theme_activate_button">Aktifleştir</string>
+    <string name="stats_timeframe_weeks">Haftalar</string>
+    <string name="stats_timeframe_days">Günler</string>
+    <string name="stats_timeframe_yesterday">Dün</string>
+    <string name="stats_timeframe_today">Bugün</string>
     <string name="stats_view_referrers">Gönderenler</string>
     <string name="stats_view_tags_and_categories">Etiketler ve kategoriler</string>
-    <string name="manage">Yönet</string>
+    <string name="stats_view_clicks">Tıklamalar</string>
+    <string name="stats">İstatistikler</string>
+    <string name="share_action">Paylaş</string>
+    <string name="theme_activate_button">Aktifleştir</string>
+    <string name="media_edit_failure">Güncelleme hatası</string>
+    <string name="media_edit_description_text">Açıklama</string>
+    <string name="media_edit_caption_text">Manşet</string>
+    <string name="media_edit_title_text">Başlık</string>
+    <string name="media_gallery_type_slideshow">Slayt gösterisi</string>
+    <string name="media_gallery_type_circles">Çember</string>
+    <string name="media_gallery_type_tiled">Döşeme</string>
+    <string name="media_gallery_type_squares">Kare</string>
+    <string name="themes">Temalar</string>
     <string name="discard">Vazgeç</string>
-    <string name="new_notifications">%d yeni bildirim</string>
+    <string name="manage">Yönet</string>
     <string name="more_notifications">ve %d daha.</string>
-    <string name="sign_in">Oturum aç</string>
-    <string name="note_reply_successful">Yanıt yayımlandı</string>
+    <string name="new_notifications">%d yeni bildirim</string>
     <string name="follows">Takipçiler</string>
+    <string name="note_reply_successful">Yanıt yayımlandı</string>
+    <string name="sign_in">Oturum aç</string>
     <string name="loading">Yükleniyor…</string>
-    <string name="httpuser">HTTP kullanıcı adı</string>
     <string name="httppassword">HTTP parolası</string>
+    <string name="httpuser">HTTP kullanıcı adı</string>
     <string name="error_media_upload">Ortam dosyası yüklenirken bir hata oluştu</string>
     <string name="incorrect_credentials">Geçersiz kullanıcı adı veya parola.</string>
     <string name="log_in">Giriş yap</string>
@@ -2411,15 +2763,15 @@ Language: tr
     <string name="password">Parola</string>
     <string name="reader">Okuyucu</string>
     <string name="pages">Sayfalar</string>
+    <string name="posts">Yazılar</string>
     <string name="anonymous">Anonim</string>
     <string name="no_network_title">Kullanılabilir ağ yok</string>
-    <string name="posts">Yazılar</string>
-    <string name="ok">Tamam</string>
     <string name="done">bitti</string>
+    <string name="ok">Tamam</string>
     <string name="link_enter_url">Adres</string>
+    <string name="tos">Hizmet şartları</string>
     <string name="version">Sürüm</string>
     <string name="app_title">Android için WordPress</string>
-    <string name="tos">Hizmet şartları</string>
     <string name="image_alignment">Konumlandırma</string>
     <string name="refresh">Yenile</string>
     <string name="untitled">Başlıksız</string>
@@ -2429,25 +2781,25 @@ Language: tr
     <string name="settings">Ayarlar</string>
     <string name="quickpress_add_error">Kısayol ismi boş olamaz</string>
     <string name="pages_private">Gizli</string>
-    <string name="categories">Kategoriler</string>
     <string name="title">Başlık</string>
     <string name="tags_separate_with_commas">Etiketleri virgül ile ayırın</string>
+    <string name="categories">Kategoriler</string>
     <string name="dlg_deleting_comments">Yorumlar siliniyor</string>
     <string name="sdcard_title">SD kart gerekli</string>
     <string name="media">Ortam</string>
-    <string name="delete">Sil</string>
     <string name="approve">Onayla</string>
+    <string name="delete">Sil</string>
     <string name="none">Hiçbiri</string>
-    <string name="error">Hata</string>
-    <string name="cancel">İptal</string>
-    <string name="save">Kaydet</string>
-    <string name="add">Ekle</string>
-    <string name="preview">Önizleme</string>
-    <string name="on">üstünde</string>
+    <string name="publish_now">Şimdi yayınla</string>
     <string name="reply">Cevapla</string>
-    <string name="yes">Evet</string>
-    <string name="no">Hayır</string>
+    <string name="on">üstünde</string>
+    <string name="preview">Önizleme</string>
     <string name="category_refresh_error">Kategori tazeleme hatası</string>
+    <string name="error">Hata</string>
+    <string name="no">Hayır</string>
+    <string name="yes">Evet</string>
     <string name="notification_settings">Bildirim ayarları</string>
-    <string name="publish_now">Şimdi yayınla</string>
+    <string name="add">Ekle</string>
+    <string name="save">Kaydet</string>
+    <string name="cancel">İptal</string>
 </resources>
diff --git a/WordPress/src/main/res/values-uz/strings.xml b/WordPress/src/main/res/values-uz/strings.xml
index 378e4f0bf4e7..e602c98268ce 100644
--- a/WordPress/src/main/res/values-uz/strings.xml
+++ b/WordPress/src/main/res/values-uz/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2018-03-05 11:25:08+0000
 Plural-Forms: nplurals=1; plural=0;
diff --git a/WordPress/src/main/res/values-v23/styles_login.xml b/WordPress/src/main/res/values-v23/styles_login.xml
new file mode 100644
index 000000000000..a1d0676e1024
--- /dev/null
+++ b/WordPress/src/main/res/values-v23/styles_login.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="LoginTheme.TransparentStatusBar" parent="LoginTheme">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+</resources>
diff --git a/WordPress/src/main/res/values-vi/strings.xml b/WordPress/src/main/res/values-vi/strings.xml
index 36382348a463..638b2b5f90f5 100644
--- a/WordPress/src/main/res/values-vi/strings.xml
+++ b/WordPress/src/main/res/values-vi/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Translation-Revision-Date: 2019-12-25 16:34:28+0000
 Plural-Forms: nplurals=1; plural=0;
@@ -43,10 +43,7 @@ Language: vi_VN
     <string name="quick_start_dialog_need_help_button_neutral">Không bao giờ</string>
     <string name="quick_start_dialog_need_help_button_negative">Không</string>
     <string name="quick_start_dialog_follow_sites_title">Theo dõi các site khác</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Nhấp %1$s Tìm kiếm %2$s để tìm các site với các quan tâm tương tự</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">Nhấp %1$s Ngước đọc %2$s để tiếp tục</string>
-    <string name="quick_start_dialog_customize_site_title">Tùy chỉnh size của bạn</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">Nhấp %1$s Chủ đề %2$s để tiếp tục</string>
     <string name="error_all_media_upload_canceled">Tất cả media tải lên đã bị hủy vì lỗi chưa rõ. Vui lòng thử tải lên lại</string>
     <string name="error_unknown_post_type">Định dạng bài viết chưa rõ</string>
     <string name="cannot_add_duplicate_site">Site này đã có trong ứng dụng, bạn không thể thêm nó.</string>
@@ -94,20 +91,14 @@ Language: vi_VN
     <string name="invite_error_invalid_usernames_multiple">Không thể gửi: Có tên người dùng hoặc email không hợp lệ</string>
     <string name="invite_error_invalid_usernames_one">Không thể gửi: Một tên người dùng hoặc email không hợp lệ</string>
     <string name="invite_error_no_usernames">Vui lòng thêm ít nhất 1 tên người dùng</string>
-    <string name="invite_message_info">(Tùy chọn) Bạn có thể nhập một tin nhắn tùy chỉnh lên tới 500 kí tự mà sẽ được bao gồm trong lời mời tới người dùng.</string>
-    <string name="invite_message_remaining_other">%d kí tự còn lại</string>
-    <string name="invite_message_remaining_one">1 kí tự còn lại</string>
-    <string name="invite_message_remaining_zero">0 kí tự còn lại</string>
-    <string name="invite_message_title">Tin nhắn tùy chỉnh</string>
     <string name="invite">Mời</string>
-    <string name="invite_names_title">Tên người dùng hoặc Email</string>
-    <string name="send_link">Gửi liên kết</string>
     <string name="invite_people">Mời mọi người</string>
     <string name="my_site_header_external">Mở rộng</string>
     <string name="label_clear_search_history">Xóa lịch sử tìm kiếm</string>
     <string name="dlg_confirm_clear_search_history">Xóa lịch sử tìm kiếm?</string>
     <string name="reader_empty_search_description">Không tìm thấy kết quả cho %s với ngôn ngữ của bạn</string>
     <string name="reader_hint_post_search">Tìm trong WordPress</string>
+    <string name="reader_title_related_post_detail">Bài viết có liên quan</string>
     <string name="preview_screen_links_disabled">Các liên kết bị vô hiệu trên màn hình xem trước</string>
     <string name="send">Gửi</string>
     <string name="user_remove_confirmation_message">Nếu bạn loại bỏ %1$s, người dùng đó sẽ không còn có thể truy cập site này, nhưng bất kì nội dung nào được tạo bởi %1$s sẽ còn lại trên site.\n\nBạn vẫn muốn loại bỏ người dùng này?</string>
@@ -126,7 +117,6 @@ Language: vi_VN
     <string name="checking_email">Đang kiểm tra email</string>
     <string name="magic_link_unavailable_error_message">Hiện tại không sẵn có. Vui lòng nhập mật khẩu của bạn</string>
     <string name="logging_in">Đang đăng nhập</string>
-    <string name="enter_your_password_instead">Nhập mật khẩu thay thế của bạn</string>
     <string name="web_address_dialog_hint">Được hiển thị công khai khi bạn bình luận.</string>
     <string name="capture_or_pick_photo">Chụp ảnh hoặc chọn hình ảnh</string>
     <string name="plan">Gói dịch vụ</string>
@@ -243,7 +233,6 @@ Language: vi_VN
     <string name="site_settings_paging_dialog_description">Ngắt chuỗi bình luận thành nhiều trang.</string>
     <string name="site_settings_paging_dialog_header">Bình luận trên mỗi trang</string>
     <string name="site_settings_close_after_dialog_title">Đóng bình luận</string>
-    <string name="site_settings_blacklist_description">Khi bình luận chứa bất kỳ của các từ trong nội dung, tên, URL, e-mail, hoặc IP của nó, nó sẽ được đánh dấu là Spam. Bạn có thể nhập một phần từ, do đó \"press\" sẽ khớp \"WordPress.\"</string>
     <string name="site_settings_hold_for_moderation_description">Khi bình luận chứa bất kỳ của các từ trong nội dung, tên, URL, e-mail, hoặc IP của nó, nó sẽ được giữ trong hàng đợi kiểm duyệt. Bạn có thể nhập một phần từ, do đó, \"press\" sẽ khớp \"WordPress.\"</string>
     <string name="site_settings_list_editor_input_hint">Nhập một từ hoặc cụm từ</string>
     <string name="site_settings_list_editor_no_items_text">Không có mục</string>
@@ -258,10 +247,8 @@ Language: vi_VN
     <string name="site_settings_rp_show_header_title">Hiện đầu trang</string>
     <string name="site_settings_rp_switch_summary">Bài viết liên quan hiển thị nội dung có liên quan từ trang web của bạn bên dưới bài viết của bạn.</string>
     <string name="site_settings_rp_switch_title">Hiện các bài viết liên quan</string>
-    <string name="site_settings_blacklist_hint">Các bình luận khớp với bộ lọc được đánh dấu là rác</string>
     <string name="site_settings_moderation_hold_hint">Nhận xét phù hợp với một bộ lọc được đặt trong hàng đợi kiểm duyệt</string>
     <string name="site_settings_multiple_links_hint">Bỏ qua giới hạn liên kết từ những người dùng đã biết</string>
-    <string name="site_settings_whitelist_hint">Tác giả bình luận phải có 1 bình luận được phê duyệt trước đó</string>
     <string name="site_settings_user_account_required_hint">Người dùng phải được đăng kí và đăng nhập để bình luận</string>
     <string name="site_settings_identity_required_hint">Tác giả bình luận phải điền đủ tên và email</string>
     <string name="site_settings_paging_hint">Hiển thị bình luận trong khối có kích thước quy định</string>
@@ -284,17 +271,13 @@ Language: vi_VN
     <string name="site_settings_address_hint">Thay đổi địa chỉ của bạn hiện thời không được hỗ trợ</string>
     <string name="site_settings_tagline_hint">Một mô tả ngắn hoặc cụm từ dễ nhớ để miêu tả về blog của bạn</string>
     <string name="site_settings_title_hint">Trong một vài từ, giải thích site này nói về điều gì</string>
-    <string name="site_settings_whitelist_known_summary">Bình luận từ người dùng đã biết</string>
-    <string name="site_settings_whitelist_all_summary">Bình luận từ tất cả người dùng</string>
     <string name="site_settings_threading_summary">%d mức</string>
     <string name="site_settings_privacy_private_summary">Riêng tư</string>
     <string name="site_settings_privacy_hidden_summary">Ẩn đi</string>
     <string name="site_settings_privacy_public_summary">Công khai</string>
     <string name="site_settings_delete_site_title">Xóa Site</string>
-    <string name="site_settings_blacklist_title">Danh sách đen</string>
     <string name="site_settings_moderation_hold_title">Giữ cho Kiểm duyệt</string>
     <string name="site_settings_multiple_links_title">Liên kết trong bình luận</string>
-    <string name="site_settings_whitelist_title">Tự động phê duyệt</string>
     <string name="site_settings_threading_title">Luồng</string>
     <string name="site_settings_paging_title">Trang</string>
     <string name="site_settings_sort_by_title">Xếp theo</string>
@@ -435,7 +418,6 @@ Language: vi_VN
     <string name="publisher">Người xuất bản:</string>
     <string name="stats_search_terms_unknown_search_terms">Không biết Điều kiện tìm kiếm</string>
     <string name="error_copy_to_clipboard">Một lỗi đã xảy ra trong khi sao chép văn bản vào bộ nhớ tạm</string>
-    <string name="reader_page_recommended_blogs">Các site bạn có thể thích</string>
     <string name="reader_label_new_posts">Bài viết mới</string>
     <string name="logs_copied_to_clipboard">Bản ghi ứng dụng đã được sao chép vào clipboard</string>
     <string name="reader_empty_posts_in_blog">Site này không có gì</string>
@@ -488,7 +470,6 @@ Language: vi_VN
     <string name="schedule_verb">Lich trinh</string>
     <string name="reader_page_followed_blogs">Site được theo dõi</string>
     <string name="reader_toast_err_already_follow_blog">Bạn đã theo dõi site này</string>
-    <string name="forgot_password">Quên mật khẩu?</string>
     <string name="help">Trợ giúp</string>
     <string name="ssl_certificate_error">Chứng nhận SSL không hợp lệ</string>
     <string name="ssl_certificate_ask_trust">Nếu bạn thường kết nối với trang web này mà không có vấn đề nào, lỗi này có thể có nghĩa rằng ai đó đang cố gắng mạo danh trang web, và bạn không nên tiếp tục. Bạn có muốn tin tưởng chứng chỉ không?</string>
diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml
index 3a88380cbed8..7f5e4feeb8be 100644
--- a/WordPress/src/main/res/values-zh-rCN/strings.xml
+++ b/WordPress/src/main/res/values-zh-rCN/strings.xml
@@ -1,11 +1,453 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-30 11:54:09+0000
+Translation-Revision-Date: 2021-05-06 09:24:46+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/3.0.0-alpha.2
 Language: zh_CN
 -->
 <resources>
+    <string name="gutenberg_native_size">大小</string>
+    <string name="gutenberg_native_image_settings">图像设置</string>
+    <string name="gutenberg_native_audio_settings">音频设置</string>
+    <string name="user_profile_untitled_site">（无标题）</string>
+    <string name="user_profile_site_section_header">站点</string>
+    <string name="user_profile_bottom_sheet_description">用户个人资料底部信息</string>
+    <string name="likes_list_screen_title">作者 %s</string>
+    <string name="gutenberg_native_write_code">编写代码…</string>
+    <string name="gutenberg_native_sorting_and_filtering">排序和筛选</string>
+    <string name="gutenberg_native_show_download_button">显示下载按钮</string>
+    <string name="gutenberg_native_shortcode">简码</string>
+    <string name="gutenberg_native_read_more">阅读更多</string>
+    <string name="gutenberg_native_preload">预加载</string>
+    <string name="gutenberg_native_post_meta_settings">文章元数据设置</string>
+    <string name="gutenberg_native_post_content_settings">文章内容设置</string>
+    <string name="gutenberg_native_metadata">元数据</string>
+    <string name="gutenberg_native_media_file">媒体文件</string>
+    <string name="gutenberg_native_media_area">媒体区</string>
+    <string name="gutenberg_native_loop">循环</string>
+    <string name="gutenberg_native_link_to_12d6f96a">链接到</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">画廊中第 %1$d/%2$d 张图片</string>
+    <string name="gutenberg_native_heading_d">标题%d</string>
+    <string name="gutenberg_native_featured">文章特色图片</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">键入要在此嵌入的URL…</string>
+    <string name="gutenberg_native_edit_image">编辑图像</string>
+    <string name="gutenberg_native_display_post_date">显示文章日期</string>
+    <string name="gutenberg_native_code">代码</string>
+    <string name="gutenberg_native_change_heading_level">修改标题级别</string>
+    <string name="gutenberg_native_browser_default">浏览器默认</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">区块已被删除或不可用。</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">区块不能在其内部渲染。</string>
+    <string name="gutenberg_native_autoplay">自动播放</string>
+    <string name="gutenberg_native_auto">自动</string>
+    <string name="gutenberg_native_attachment_page">附件页面</string>
+    <string name="gutenberg_native_add_text">添加文本…</string>
+    <string name="gutenberg_native_add_caption">视频说明文字</string>
+    <string name="gutenberg_native_what_is_alt_text">什么是alt文字？</string>
+    <string name="gutenberg_native_transform_s_to">将%s转换为</string>
+    <string name="gutenberg_native_transform_block">转换区块…</string>
+    <string name="gutenberg_native_failed_to_insert_media">未能插入媒体。</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">未能插入音频文件。</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">描述图像的目的。如果图像纯粹是装饰性的，则留空。 </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s转换为%2$s</string>
+    <string name="like_faces_error_loading_message">数据加载错误。%s.</string>
+    <string name="like_faces_plural_text">%d 位博主喜欢了</string>
+    <string name="like_faces_singular_text">1 位博主喜欢了。</string>
+    <string name="like_title_plural">%d 喜欢</string>
+    <string name="like_title_singular">1 喜欢</string>
+    <string name="threat_fix_enter_server_creds_message_plural">输入您的服务器凭据以修复威胁。</string>
+    <string name="threat_fix_enter_server_creds_message_singular">输入您的服务器凭据以修复威胁。</string>
+    <string name="suggestion">建议：</string>
+    <string name="gutenberg_native_search_blocks">搜索区块</string>
+    <string name="gutenberg_native_search_block">搜索区块</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">双击更改单位</string>
+    <string name="gutenberg_native_clear_search">清除搜索</string>
+    <string name="gutenberg_native_cancel_search">取消搜索</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s. %2$s是%3$s%4$s。</string>
+    <string name="get_likes_empty_state_title">获取数据时出错</string>
+    <string name="get_likes_unknown_error">获取数据时发生未知错误。</string>
+    <string name="get_likes_no_network_error">无网络可用。</string>
+    <string name="comments_empty_list_filtered_unreplied">没有未回复的评论</string>
+    <string name="comment_status_unreplied">未回复</string>
+    <string name="gutenberg_native_table_of_contents">目录</string>
+    <string name="gutenberg_native_summary">总结</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">用一个标题列表来总结您的文章。在标题区块中添加HTML锚点，将其链接到这里。</string>
+    <string name="gutenberg_native_document_outline">文档大纲</string>
+    <string name="gutenberg_native_buttongroup">按钮分组</string>
+    <string name="jetpack_brute_force_allowlist_title">始终允许的 IP 地址</string>
+    <string name="site_settings_denylist_title">不允许的评论</string>
+    <string name="reader_title_interests">关注话题</string>
+    <string name="stories_intro_main_subtitle">在您的网站上创建、发布吸引人内容的新方法。</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">忽略</string>
+    <string name="activity_log_backup_download_notice_download_action">下载</string>
+    <string name="threat_fix_all_status_success_message_plural">已成功修复威胁。</string>
+    <string name="threat_fix_all_confirmation_message_plural">请确认您要修复所有 %s 个活跃威胁。</string>
+    <string name="scan_idle_threats_description_plural">扫描发现 %2$s 存在 %1$s 项潜在威胁。 请在下面查看这些威胁并采取行动，或者轻点“全部修复”按钮。 如果您需要，我们位于%3$s。</string>
+    <string name="scan_fixing_threats_description_plural">我们正在后台努力修复这些威胁。 在此期间，您可以继续正常使用您的站点，您可以随时查看进度。</string>
+    <string name="gutenberg_native_edit_focal_point">编辑焦点</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">双击“底部表页”，将其打开，以编辑、替换或清除图片</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">双击“操作表页”，将其打开，以编辑、替换或清除图片</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">为您的站点输入名称</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;已完成所有任务&lt;/b&gt;&lt;br/&gt;您将吸引更多用户。 做得漂亮！</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;已完成所有任务&lt;/b&gt;&lt;br/&gt;您将自定义您的站点。 大功告成了！</string>
+    <string name="quick_start_card_menu_hide">立即隐藏</string>
+    <string name="magic_link_not_meaning_to_create_account">不打算创建新帐户？ 返回以重新输入您的电子邮件地址。</string>
+    <string name="invite_links_disable_dialog_message">禁用此邀请链接后，任何人都无法再使用它来加入您的团队。 是否确定？</string>
+    <string name="invite_links_disable_dialog_title">禁用邀请链接</string>
+    <string name="invite_links_bad_format_response">收到无效响应</string>
+    <string name="invite_links_null_response">未收到任何响应</string>
+    <string name="invite_links_cannot_get_role_data_error">获取角色 %1$s 的数据时出错</string>
+    <string name="invite_links_cannot_get_roles_error">获取角色时出错</string>
+    <string name="invite_links_generic_get_data_error">获取邀请链接数据时发生未知错误</string>
+    <string name="invite_links_helper_text">使用此链接请团队成员加入，而不必逐个邀请团队成员。 使用此 URL 的任何人都可以注册您的组织（即使他们收到了其他人的链接），因此请确保与值得信任的人共享。</string>
+    <string name="invite_links_expire_date">失效于%1$s</string>
+    <string name="invite_links_disable_invite_link">禁用邀请链接</string>
+    <string name="invite_links_share_invite_link">分享邀请链接</string>
+    <string name="invite_links_generate">生成邀请链接</string>
+    <string name="invite_links_get_status_retry">刷新链接状态</string>
+    <string name="invite_links_section_title">邀请链接</string>
+    <string name="threats_found_singular">已发现威胁</string>
+    <string name="threats_found_plural">发现威胁</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;扫描完成&lt;/b&gt; &lt;br&gt;发现 %s 项潜在威胁</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;扫描完成&lt;/b&gt; &lt;br&gt; 发现 1 项潜在威胁</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;扫描完成&lt;/b&gt; &lt;br&gt;未发现威胁</string>
+    <string name="scan_fixing_threats_title_singular">修复威胁</string>
+    <string name="disable">禁用</string>
+    <string name="quick_start_card_menu_unpin">取消钉选此项</string>
+    <string name="quick_start_list_review_pages_subtitle">查看您的页面并进行更改，或者添加或移除页面。</string>
+    <string name="quick_start_list_view_site_title">访问您的站点</string>
+    <string name="quick_start_list_upload_icon_subtitle">添加站点图标，打造精美的专业外观。</string>
+    <string name="quick_start_list_follow_site_subtitle">发现并关注能激发您灵感的站点。</string>
+    <string name="quick_start_list_enable_sharing_title">启用共享</string>
+    <string name="quick_start_list_enable_sharing_subtitle">自动将新文章共享到您的社交媒体</string>
+    <string name="quick_start_list_update_site_title_subtitle">为您的站点提供一个反映其个性和主题的名称。</string>
+    <string name="quick_start_list_check_stats_title">查看您的统计信息</string>
+    <string name="backup_download_status_failure_bullet2">我们仍会尝试创建您的可下载备份文件。</string>
+    <string name="backup_download_status_failure_bullet1">我们找不到可说明您的可下载备份所需时长的状态。</string>
+    <string name="backup_download_status_failure_heading">呃，我们找不到您的可下载备份状态</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">复选标记图标</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">时钟图标</string>
+    <string name="restore_status_failure_bullet3">我们将在完成时通知您。</string>
+    <string name="restore_status_failure_bullet2">我们仍会尝试恢复您的站点。</string>
+    <string name="restore_status_failure_bullet1">我们找不到可说明您的恢复所需时长的状态。</string>
+    <string name="restore_status_failure_heading">呃，我们找不到您的恢复状态</string>
+    <string name="restore_complete_failed_description">我们无法恢复您的站点</string>
+    <string name="restore_warning_action_button">确认</string>
+    <string name="restore_warning_description_with_two_parameters">是否确定要将您的站点恢复到 %1$s %2$s？\n        您在此之后的所有更改都将丢失。</string>
+    <string name="backup_download_complete_failed_description">我们无法为您创建备份</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">（不包括主题、插件和上传）</string>
+    <string name="backup_item_contents">WP-content 目录</string>
+    <string name="backup_item_roots">WordPress 根</string>
+    <string name="backup_download_details_choose_items_header">此下载包含的项目</string>
+    <string name="gutenberg_native_uploading">正在上传…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">可重用区块在 iOS 版 WordPress 上不可编辑</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">可重用区块在 Android 版 WordPress 上不可编辑</string>
+    <string name="gutenberg_native_replace_file">替换文件</string>
+    <string name="gutenberg_native_replace_audio">替换音频</string>
+    <string name="gutenberg_native_problem_opening_the_audio">打开音频时出现问题</string>
+    <string name="gutenberg_native_open">打开</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">没有可以处理此请求的应用程序。</string>
+    <string name="gutenberg_native_lock_icon">锁形图标</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">无法插入音频文件。 请轻点以查看选项。</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">轻点两次以选择音频文件</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">轻点两次以倾听音频文件</string>
+    <string name="gutenberg_native_choose_audio">选择音频</string>
+    <string name="gutenberg_native_audio_player">音频播放器</string>
+    <string name="gutenberg_native_audio_file">音频文件</string>
+    <string name="gutenberg_native_audio_caption_s">音频说明。 %s</string>
+    <string name="gutenberg_native_audio_caption_empty">音频说明。 空</string>
+    <string name="gutenberg_native_add_audio">添加音频</string>
+    <string name="continue_with_wpcom">使用 WordPress.com 登录或注册</string>
+    <string name="photo_picker_use_audio">使用此音频</string>
+    <string name="photo_picker_choose_audio">从设备中选择音频</string>
+    <string name="people_optional_custom_message_helper_text">可选：输入一条自定义消息，与您的邀请一起发送。</string>
+    <string name="people_learn_more_about_roles">了解更多关于角色的信息</string>
+    <string name="threat_status_fixed">固定</string>
+    <string name="threat_found_header">找到</string>
+    <string name="scan_here_to_help">此处可获取帮助</string>
+    <string name="scan_idle_threats_description_singular">扫描发现 %1$s 存在 1 项潜在威胁。 请在下面查看这些威胁并采取行动，或者轻点“全部修复”按钮。 如果您需要，我们位于%2$s。</string>
+    <string name="scan_idle_manual_scan_description">要重新审查您的站点，请手动进行扫描或等待 Jetpack 今日稍后扫描您的站点。</string>
+    <string name="scan_provisioning_description">欢迎使用 Jetpack Scan！ 我们正在检查您的站点，准备执行完整扫描。 如果发现任何可能影响扫描的问题，我们将向您发送通知，然后开始您的第一次完整扫描。</string>
+    <string name="scan_scanning_is_initial_description">欢迎使用 Jetpack Scan，我们会立即优先浏览您的站点并很快给您结果。</string>
+    <string name="scan_fixing_threats_description_singular">我们正在后台努力修复此威胁。 在此期间，您可以继续正常使用您的站点，您可以随时查看进度。</string>
+    <string name="scan_scanning_description">扫描完成后，我们会向您发送通知。 在此期间，您可以继续正常使用您的站点，您可以随时查看进度。</string>
+    <string name="scan_fixing_threats_title_plural">修复威胁</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan 无法完成站点扫描。 请检查您的站点是否已经关闭。如果没有，请再试一次。 如果已经关闭，或 Jetpack Scan 仍然有问题，请联系我们的支持团队。</string>
+    <string name="scan_request_failed_title">出错了</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">备份站点</string>
+    <string name="activity_log_currently_backing_up_message">通过 %1$s %2$s 备份站点</string>
+    <string name="activity_log_currently_backing_up_title">创建可下载备份</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">您的站点已成功备份</string>
+    <string name="activity_log_backup_finished_snackbar_message">您的站点已成功备份\n已通过 %1$s %2$s 备份</string>
+    <string name="activity_log_backup_started_snackbar_message">您的站点正在备份\n通过 %1$s %2$s 备份</string>
+    <string name="pick_audio">选择音频</string>
+    <string name="restore_another_process_running">另一项还原操作正在运行。</string>
+    <string name="restore_complete_failed_icon_content_description">“错误”图标</string>
+    <string name="restore_complete_failed_action_button_content_description">“完成”按钮</string>
+    <string name="restore_complete_failed_title">恢复失败</string>
+    <string name="restore_complete_visit_site_button_content_description">“访问站点”按钮</string>
+    <string name="restore_complete_done_button_content_description">“完成”按钮</string>
+    <string name="restore_complete_icon_content_description">“还原”图标</string>
+    <string name="restore_complete_visit_site_action_button">访问站点</string>
+    <string name="restore_complete_description_with_two_parameters">您选择的所有项目现在都会还原到 %1$s %2$s。</string>
+    <string name="restore_complete_header">已还原您的站点</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">您无需等待。在您的站点还原后，我们会通知您。</string>
+    <string name="restore_progress_icon_content_description">“还原站点”图标</string>
+    <string name="restore_progress_description_with_two_parameters">我们正在将您的站点还原到 %1$s %2$s。</string>
+    <string name="restore_progress_header">目前正在还原站点</string>
+    <string name="restore_warning_action_button_content_description">“确认还原站点”按钮</string>
+    <string name="restore_warning_icon_content_description">带感叹号的红色圆圈图片</string>
+    <string name="restore_warning_header">警告</string>
+    <string name="restore_details_action_button_content_description">“还原站点”按钮</string>
+    <string name="restore_details_icon_content_description">“还原”图标</string>
+    <string name="restore_details_action_button">恢复站点</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s 是供您还原的选定点。</string>
+    <string name="restore_details_header">恢复站点</string>
+    <string name="restore_details_choose_items_header">选择要还原的项目：</string>
+    <string name="restore">恢复</string>
+    <string name="backup_download_complete_failed_icon_content_description">带 X 的云图标</string>
+    <string name="backup_download_complete_failed_action_button_content_description">“完成”按钮</string>
+    <string name="backup_download_complete_failed_action_button">完成</string>
+    <string name="backup_download_complete_failed_title">下载失败</string>
+    <string name="web_preview_tablet">平板电脑</string>
+    <string name="web_preview_mobile">移动设备</string>
+    <string name="quick_start_card_menu_remove">请勿再次显示</string>
+    <string name="quick_start_card_menu_pin">置顶</string>
+    <string name="quick_start_dialog_review_pages_message_short">选择%1$s页面%2$s以查看您的页面列表。</string>
+    <string name="quick_start_dialog_review_pages_message">更改、添加或删除您站点的页面。</string>
+    <string name="quick_start_dialog_review_pages_title">评论站点页面</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">选择%1$s主页%2$s以编辑您的主页。</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">选择%1$s页面%2$s以查看您的页面列表。</string>
+    <string name="quick_start_dialog_edit_homepage_message">在您站点的主页上更改、添加或删除内容。</string>
+    <string name="quick_start_dialog_edit_homepage_title">编辑您的主页</string>
+    <string name="reader_menu_mark_as_unseen">标记为未读</string>
+    <string name="reader_menu_mark_as_seen">标记为已读</string>
+    <string name="error_media_upload_failed_for_reason">媒体上传失败。\n%1$s</string>
+    <string name="error_media_not_enough_storage">可用的站点存储空间不足</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">无法切换此文章的已浏览状态</string>
+    <string name="reader_marked_post_as_unseen">将文章标记为未读</string>
+    <string name="reader_marked_post_as_seen">将文章标记为已读</string>
+    <string name="threat_fix_all_status_error_message">获取修复状态时出错。 请联系我们的支持人员。</string>
+    <string name="threat_fix_all_status_success_message_singular">威胁已成功修复。</string>
+    <string name="threat_fix_all_error_message">修复威胁时出错。 请联系我们的支持人员。</string>
+    <string name="threat_fix_all_confirmation_message_singular">请确认您希望修复 1 项活跃威胁。</string>
+    <string name="threat_fix_all_warning_title">修复所有威胁</string>
+    <string name="threat_ignore_error_message">忽略威胁时出错。 请联系支持人员。</string>
+    <string name="threat_ignore_success_message">已忽略威胁。</string>
+    <string name="threat_ignore_warning">您不应忽视安全性问题，除非您确信该问题不会带来负面影响。 如果您选择忽略此威胁，它将继续存留在您的站点 &lt;b&gt;%s&lt;/b&gt;。</string>
+    <string name="threat_fix_error_message">修复威胁时出错。 请联系我们的支持人员。</string>
+    <string name="threat_item_sub_header_status_ignored">已忽略威胁</string>
+    <string name="threat_item_sub_header_status_fixed_on">威胁已于 %s 修复</string>
+    <string name="threat_fixing">修复威胁</string>
+    <string name="scan_history_ignored_threats_tab">已忽略</string>
+    <string name="scan_history_no_threats_found">未找到项</string>
+    <string name="scan_history_fixed_threats_tab">固定</string>
+    <string name="scan_history_all_threats_tab">全部</string>
+    <string name="scan_scanning_title">正在扫描文件</string>
+    <string name="scan_preparing_to_scan_title">准备扫描</string>
+    <string name="scan_history_menu_title">历史记录</string>
+    <string name="scan_history">扫描历史记录</string>
+    <string name="backup_active_filter_empty_subtitle">尝试调整您的日期范围</string>
+    <string name="backup_active_filter_empty_title">未找到匹配的备份</string>
+    <string name="backup_empty_subtitle">您的第一个备份将在 24 小时显示在此处，备份完成后，您会收到通知。</string>
+    <string name="backup_empty_title">您的第一个备份即将准备就绪</string>
+    <string name="request_failed_message">处理请求时出现问题。 请稍后重试。</string>
+    <string name="gutenberg_native_move_to_bottom">移到底部</string>
+    <string name="gutenberg_native_change_block_position">移动区块位置</string>
+    <string name="label_control_upload">上传</string>
+    <string name="jetpack_icon_content_description">图标</string>
+    <string name="backup_download_complete_info">我们还通过电子邮件向您发送了文件链接。</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">“分享链接”按钮</string>
+    <string name="backup_download_complete_download_action_button_content_description">“下载”按钮</string>
+    <string name="backup_download_complete_icon_content_description">“可下载备份就绪”按钮</string>
+    <string name="backup_download_complete_download_share_action_button">分享链接</string>
+    <string name="backup_download_complete_download_action_button">下载</string>
+    <string name="backup_download_complete_description_with_two_parameters">我们已成功从 %1$s %2$s 为您的站点创建了备份。</string>
+    <string name="backup_download_complete_header">您的备份现已可供下载</string>
+    <string name="backup_download_complete_page_title">您的备份</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">无需等待。我们会在备份就绪时通知您。</string>
+    <string name="backup_download_progress_icon_content_description">“创建可下载备份”图标</string>
+    <string name="backup_download_progress_description_with_two_parameters">我们正在从 %1$s %2$s 为您的站点创建可下载备份。</string>
+    <string name="backup_download_progress_header">当前正在创建您站点的可下载备份</string>
+    <string name="backup_download_progress_page_title">下载备份</string>
+    <string name="backup_download_another_download_running">另一个下载项目正在运行。</string>
+    <string name="backup_download_generic_failure">处理请求时出现问题。 请稍后重试。</string>
+    <string name="backup_download_details_action_button_content_description">“创建可下载备份”按钮</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s 是要创建下载备份的选定点。</string>
+    <string name="gutenberg_native_image_link_url">图片链接</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">交叉发表</string>
+    <string name="suggestion_user">用户</string>
+    <string name="suggestion_no_matching">没有符合条件的 %s。</string>
+    <string name="suggestion_problem">加载建议时出现问题。</string>
+    <string name="suggestion_none">%s 建议不可用。</string>
+    <string name="suggestion_selection_needed">请输入以过滤建议列表。</string>
+    <string name="threat_get_free_estimate">获取免费估算</string>
+    <string name="threat_ignore">忽略威胁</string>
+    <string name="threat_fix">修复威胁</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan 将解决该威胁。</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan 将编辑受影响的文件或目录。</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan 将更新至较新的版本 (%s)。</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan 将删除受影响的文件或目录。</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan 将替换受影响的文件或目录。</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan 无法自动修复此威胁。\n 我们建议您手动解决威胁：确保 WordPress、主题和所有插件都是最新的，并从您的站点中删除有问题的代码、主题或插件。 \n \n\n 如果您需要更多帮助来解决此威胁，建议您使用 &lt;b&gt;Codeable&lt;/b&gt; - 一个由经过严格审查的 WordPress 专家组成的值得信赖的自由职业者市场。\n 他们已组建一个安全专家小组来帮助开展这些项目。 价格从 70–120 美元/小时不等，您可以免费估价，无需租用。</string>
+    <string name="threat_fix_current_not_fixable_header">解决威胁</string>
+    <string name="threat_fix_fixed_header">Jetpack 如何修复该问题？</string>
+    <string name="threat_fix_default_header">我们将如何解决？</string>
+    <string name="threat_file_description">在以下文件中发现威胁：</string>
+    <string name="threat_technical_details_header">技术详情</string>
+    <string name="threat_problem_header">问题是什么？</string>
+    <string name="threat_details">威胁详情</string>
+    <string name="threat_item_sub_header_vulnerable_theme">在主题中发现漏洞</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">在插件中发现漏洞</string>
+    <string name="threat_item_sub_header_file_signature">已发现威胁 %s</string>
+    <string name="threat_item_sub_header_core_file">在 WordPress 中发现漏洞</string>
+    <string name="threat_item_sub_header_misc_vulnerability">其他漏洞</string>
+    <string name="threat_item_header_vulnerable_theme">易受攻击的主题：%s（版本 %s）</string>
+    <string name="threat_item_header_vulnerable_plugin">易受攻击的插件：%s（版本%s）</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s：恶意代码模式</string>
+    <string name="threat_item_header_database_threat">数据库 %s 威胁</string>
+    <string name="threat_item_header_infected_core_file">%s：已感染的核心文件</string>
+    <string name="threat_item_header_threat_found">已发现威胁</string>
+    <string name="threats_fix_all">全部修复</string>
+    <string name="scan_in_few_seconds">几秒前</string>
+    <string name="scan_in_minutes_ago">%s分钟以前</string>
+    <string name="scan_in_hours_ago">%s小时以前</string>
+    <string name="scan_this_site">此站点</string>
+    <string name="scan_idle_last_scan_description">上次 Jetpack 扫描运行了 %s，没有发现任何风险。 %s</string>
+    <string name="scan_idle_threats_found_title">您的站点可能存在风险</string>
+    <string name="scan_idle_no_threats_found_title">不必担心</string>
+    <string name="scan_again">重新扫描</string>
+    <string name="scan_now">立即扫描</string>
+    <string name="scan_state_icon">“扫描状态”图标</string>
+    <string name="backup">备份</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">活动类型过滤器（已选择 %s 类型）</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s（显示 %s 个项目）</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">活动类型过滤器</string>
+    <string name="activity_log_activity_type_empty_subtitle">已选择的日期范围内未记录任何活动。</string>
+    <string name="activity_log_activity_type_empty_title">无可用的活动</string>
+    <string name="activity_log_activity_type_error_subtitle">请检查您的互联网连接，然后重试。</string>
+    <string name="activity_log_activity_type_error_title">无连接</string>
+    <string name="activity_log_activity_type_filter_active_label">活动类型 (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">日期范围过滤器</string>
+    <string name="activity_log_active_filter_empty_subtitle">尝试调整日期范围或活动类型过滤器</string>
+    <string name="activity_log_active_filter_empty_title">未发现符合条件的事件</string>
+    <string name="backup_item_sqls">站点数据库（SQL）</string>
+    <string name="backup_item_roots_hint">WordPress根目录（包括wp-config.php和任何非WordPress文件）</string>
+    <string name="backup_item_media_uploads">媒体上传</string>
+    <string name="backup_item_plugins">WordPress插件</string>
+    <string name="backup_item_themes">WordPress主题</string>
+    <string name="backup_download_details_icon_content_description">创建可下载的备份的图标</string>
+    <string name="backup_download_details_action_button">创建可下载的文件</string>
+    <string name="backup_download_details_header">创建可下载的备份</string>
+    <string name="backup_download_details_page_title">下载备份</string>
+    <string name="backup_download">备份下载</string>
+    <string name="gutenberg_native_error">错误</string>
+    <string name="gutenberg_native_choose_file">选择文件</string>
+    <string name="activity_log_item_menu_download_backup_label">下载备份</string>
+    <string name="activity_log_item_menu_restore_label">恢复到此点</string>
+    <string name="activity_log_activity_type_filter_label">活动类型</string>
+    <string name="activity_log_date_range_filter_label">日期范围</string>
+    <string name="activity_log_activity_type_filter_header">按活动类型筛选</string>
+    <string name="dialog_confirm_copy_local_copy_button">从应用程序中复制这一版本</string>
+    <string name="dialog_confirm_copy_local_edit_button">请先编辑文章</string>
+    <string name="dialog_confirm_copy_local_message">您正尝试编辑的文章有两个版本，均与您最近编辑但暂未保存的内容有冲突。\n请先编辑文章以解决所有冲突，或请从应用程序中先复制现有的文章版本。</string>
+    <string name="dialog_confirm_copy_local_title">文章同步冲突</string>
+    <string name="button_copy">复制</string>
+    <string name="toast_edit_story_update_in_progress_title">故事正在保存，请稍候…</string>
+    <string name="gutenberg_native_file_name">文件名</string>
+    <string name="gutenberg_native_file_block_settings">文件区块设置</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">无法上传文件。\n请轻点以查看选项。</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">无法保存文件。\n请轻点以查看选项。</string>
+    <string name="gutenberg_native_edit_file">编辑文件</string>
+    <string name="gutenberg_native_copy_file_url">复制文件 URL</string>
+    <string name="gutenberg_native_choose_a_file">选择文件</string>
+    <string name="new_site_creation_domain_header_title">选择域</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack设置</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">通过电子邮件关注对话</string>
+    <string name="reader_btn_follow_comments">通过电子邮件关注对话</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">无法取消订阅本博客的评论</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">无法订阅本博客的评论</string>
+    <string name="reader_follow_comments_get_status_error">获取博客订阅状态时出错</string>
+    <string name="reader_follow_comments_unsubscribe_success">已成功取消订阅评论</string>
+    <string name="reader_follow_comments_subscribe_success">已成功订阅评论</string>
+    <string name="reader_follow_comments_bad_format_response">收到无效响应</string>
+    <string name="reader_follow_comments_null_response">未收到任何响应</string>
+    <string name="activity_log_activity_type_filter_clear">清除</string>
+    <string name="activity_log_activity_type_filter_apply">应用</string>
+    <string name="dialog_edit_story_unsupported_format_message">您的故事没有添加一张或多张幻灯片，因为故事目前不支持GIF文件。 请选择静态图片或视频背景。</string>
+    <string name="dialog_edit_story_unsupported_format_title">不支持GIF文件</string>
+    <string name="dialog_edit_story_unrecoverable_message">我们在网站上找不到该故事的媒体。</string>
+    <string name="dialog_edit_story_unrecoverable_title">无法编辑故事</string>
+    <string name="dialog_edit_story_unavailable_message">无法加载该故事的媒体。 检查您的互联网连接，稍后再试。</string>
+    <string name="dialog_edit_story_unavailable_title">无法编辑故事</string>
+    <string name="dialog_edit_story_limited_message">这个故事是在其他设备上编辑的，因此编辑某些对象时可能会受到限制。</string>
+    <string name="dialog_edit_story_limited_title">受限故事编辑</string>
+    <string name="cannot_retry_deleted_media_item_fatal">媒体已被删除。请尝试重新编辑您的故事。</string>
+    <string name="color_picker_label_background">背景</string>
+    <string name="color_picker_label_text">文本</string>
+    <string name="dialog_discard_story_ok_button_edit">丢弃</string>
+    <string name="dialog_discard_story_message_edit">所做的任何更改将不会保存。</string>
+    <string name="dialog_discard_story_title_edit">放弃修改</string>
+    <string name="label_done_button">完成</string>
+    <string name="label_next_button">下一步</string>
+    <string name="delete_button_alt">删除</string>
+    <string name="hpp_choose_error">选择设计时出错。</string>
+    <string name="hpp_retry_error">请检查您的互联网连接，然后重试。</string>
+    <string name="hpp_error_subtitle">当您恢复在线时，请点击重试。</string>
+    <string name="hpp_error_title">离线时无法使用布局</string>
+    <string name="continue_site_credentials">继续使用商店凭证</string>
+    <string name="login_find_your_connected_email">找到您的关联电子邮件</string>
+    <string name="reader_discover_no_posts_button_text">关注话题</string>
+    <string name="reader_discover_no_posts_subtitle">尝试关注更多话题以扩大搜索范围</string>
+    <string name="reader_discover_no_posts_title">无近期文章</string>
+    <string name="reader_discover_empty_title">欢迎！</string>
+    <string name="scan">扫描</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; 回复了您的文章</string>
+    <string name="login_prologue_third_subtitle_two">您的站点今天收到了&lt;b&gt;50个喜欢&lt;/b&gt;</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; 喜欢了您的文章</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">滚动区块菜单打开。 选择区块。</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">滚动区块菜单关闭。</string>
+    <string name="hpp_skip_button">跳过</string>
+    <string name="hpp_choose_button">选择</string>
+    <string name="hpp_subtitle">选择您喜欢的主页布局。 您可以稍后对其进行编辑和自定义。</string>
+    <string name="hpp_title">选择设计</string>
+    <string name="mlp_network_error_subtitle">重新上线后，点击“重试”，或使用下面的按钮创建空白页。</string>
+    <string name="mlp_network_error_title">离线时布局不可用</string>
+    <string name="mlp_error_subtitle">点击“重试”或使用下面的按钮创建空白页。</string>
+    <string name="mlp_error_title">由于发生错误，布局不可用</string>
+    <string name="prepublishing_nudges_add_category_button">添加类别</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">添加新分类目录</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">类别</string>
+    <string name="prepublishing_nudges_home_categories_not_set">未设置</string>
+    <string name="prepublishing_nudges_categories_action">类别</string>
+    <string name="login_prologue_fifth_caption_three">伦敦的博物馆</string>
+    <string name="login_prologue_fifth_caption_two">世界最佳粉丝</string>
+    <string name="login_prologue_fifth_caption_one">我的十大咖啡馆</string>
+    <string name="login_prologue_fifth_tag_six">政治</string>
+    <string name="login_prologue_fifth_tag_five">音乐</string>
+    <string name="login_prologue_fifth_tag_four">园艺</string>
+    <string name="login_prologue_fifth_tag_three">足球</string>
+    <string name="login_prologue_fifth_tag_two">烹饪</string>
+    <string name="login_prologue_fifth_tag_one">艺术</string>
+    <string name="login_prologue_fifth_subtitle_three">摇滚周刊</string>
+    <string name="login_prologue_fifth_subtitle_two">网络新闻</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">我受到摄影师 Cameron Karsten 的作品启发很大。 我会在下次尝试这些技术</string>
+    <string name="login_prologue_second_subtitle_one">受到启发</string>
+    <string name="login_prologue_title_fifth">关注您喜欢的站点，发现新的阅读内容。</string>
+    <string name="login_prologue_title_fourth">通过深入分析观察您的受众增长。</string>
+    <string name="login_prologue_title_third">实时查看评论和通知。</string>
+    <string name="login_prologue_title_second">有了这个功能强大的编辑器，您可以随时随地发表内容。</string>
+    <string name="login_prologue_title_first">欢迎使用全球最热门的网站生成器。</string>
+    <string name="media_loading_failed">媒体加载失败</string>
+    <string name="reader_discover_recommended_blogs_header">关注的站点</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">我们正在努力在每个版本中添加更多区块。</string>
     <string name="gutenberg_native_s_is_not_fully_supported">不完全支持“%s”</string>
     <string name="gutenberg_native_help_button">“帮助”按钮</string>
@@ -18,19 +460,16 @@ Language: zh_CN
     <string name="stories_intro_title_first">现在，每个人都可以创作自己的故事</string>
     <string name="stories_intro_image_caption_second">故事标题示例</string>
     <string name="stories_intro_image_caption_first">如何创作故事文章</string>
-    <string name="stories_intro_main_subtitle">您可以抢先体验故事文章，我们也希望您能亲身感受一下故事文章的创作乐趣。</string>
     <string name="stories_intro_main_title">故事文章简介</string>
-    <string name="mlp_generic_error">获取布局时出错</string>
     <string name="mlp_notice_blank_page_created">创建了空白页面</string>
     <string name="mlp_notice_page_created">页面已创建</string>
-    <string name="mlp_preview_title">布局预览</string>
     <string name="media_picker_soft_ask_permissions_denied">%1$s 已被拒绝访问您的照片。 要解决此问题，请编辑您的权限，然后启用“%2$s”和“%3$s”。</string>
     <string name="media_insert_failed">媒体插入失败。</string>
     <string name="media_insert_failed_with_reason">媒体插入失败： %s</string>
     <string name="photo_picker_wordpress_media_library">从 WordPress 媒体库中选择</string>
     <string name="reader_label_toolbar_back">返回</string>
     <string name="reader_discover_empty_button_text">开始</string>
-    <string name="reader_discover_empty_title">关注主题以发现新博客</string>
+    <string name="reader_discover_empty_subtitle">关注话题以发现新博客</string>
     <string name="reader_post_details_header_by_author_name">作者</string>
     <string name="stats_referrer_snackbar_cant_mark_as_spam">不能将此推荐来源标记为垃圾信息</string>
     <string name="stats_referrer_popup_unmark_as_spam">取消标记为垃圾信息</string>
@@ -41,10 +480,11 @@ Language: zh_CN
     <string name="media_uploading_default">正在上传媒体</string>
     <string name="gutenberg_native_select_item">选择项目</string>
     <string name="gutenberg_native_search_or_type_url">搜索或键入 URL</string>
+    <string name="gutenberg_native_page_break">分页符</string>
     <string name="gutenberg_native_add_this_telephone_link">添加此电话链接</string>
     <string name="gutenberg_native_add_this_link">添加此链接</string>
     <string name="gutenberg_native_add_this_email_link">添加此电子邮件链接</string>
-    <string name="suggestion_no_connection">”未连接互联网\n建议不可用。”</string>
+    <string name="suggestion_no_connection">未连接互联网。\n建议不可用。</string>
     <string name="typeface_label_shrikhand">粗体</string>
     <string name="typeface_label_space_mono">现代</string>
     <string name="typeface_label_pacifico">有趣</string>
@@ -52,6 +492,7 @@ Language: zh_CN
     <string name="typeface_label_libre_baskerville">经典</string>
     <string name="typeface_label_nunito">休闲</string>
     <string name="toast_capture_operation_permission_needed">您需要授予应用程序录音权限才能录制视频</string>
+    <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">%s 已选择</string>
     <string name="login_get_link_by_email">通过电子邮件获取登录链接</string>
     <string name="email_not_registered_wpcom">找不到与此电子邮件地址关联的 WordPress.com 帐户。</string>
@@ -59,19 +500,19 @@ Language: zh_CN
     <string name="comment_unable_to_show_error">无法显示此评论</string>
     <string name="media_browse_for_items">浏览商品</string>
     <string name="reader_menu_report_post">报告此文章</string>
-    <string name="gutenberg_native_angle">角度</string>
     <string name="reader_welcome_banner">欢迎使用阅读器。 动动手指即可发现数百万个博客。</string>
     <string name="error_media_xmlrcp_server_error">发生内部服务器错误</string>
     <string name="error_media_xmlrpc_not_allowed">您不能执行此操作</string>
     <string name="show_n_hidden_items_desc">%1$s 更多项目</string>
-    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">注意：主题和屏幕尺寸之间的分栏布局可能会有所不同</string>
     <string name="gutenberg_native_select_a_layout">选择布局</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">您可能会喜欢</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">隐藏</string>
+    <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">注意：主题和屏幕尺寸之间的分栏布局可能会有所不同</string>
     <string name="create_post_story_fab_tooltip">创建文章或故事</string>
     <string name="create_page_fab_tooltip">创建页面</string>
     <string name="create_post_fab_tooltip">撰写文章</string>
+    <string name="reader_discover_interests_header">您可能会喜欢</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">隐藏</string>
+    <string name="gutenberg_native_video_caption_empty">视频说明.空</string>
+    <string name="gutenberg_native_updates_the_title">更新标题。</string>
     <string name="gutenberg_native_paste_block_after">在以下位置后粘贴区块</string>
     <string name="gutenberg_native_page_title_s">“页面”标题。 %s</string>
     <string name="gutenberg_native_page_title_empty">“页面”标题。 清空</string>
@@ -106,7 +547,6 @@ Language: zh_CN
     <string name="dialog_discard_errored_page_message">此幻灯片尚未保存。 如果删除此幻灯片，您将丢失所做的所有编辑。</string>
     <string name="dialog_discard_page_message">此幻灯片将从您的故事中删除。</string>
     <string name="dialog_discard_page_title">删除故事幻灯片？</string>
-    <string name="menu_delete_page">删除幻灯片</string>
     <string name="label_text_color_button">更改文本颜色</string>
     <string name="label_text_alignment_button">更改文本对齐方式</string>
     <string name="label_frame_errored">出错了</string>
@@ -116,8 +556,6 @@ Language: zh_CN
     <string name="label_retry_icon">重试</string>
     <string name="label_saved_icon">已保存</string>
     <string name="label_close_button">关闭</string>
-    <string name="label_control_publish">下一步</string>
-    <string name="label_done">完成</string>
     <string name="label_share_to">共享至</string>
     <string name="label_snackbar_share">分享</string>
     <string name="label_snackbar_loop_frame_saved">已保存到相册</string>
@@ -128,7 +566,6 @@ Language: zh_CN
     <string name="label_control_flip_camera">翻转</string>
     <string name="sound_button_alt">声音</string>
     <string name="text_button_alt">文本</string>
-    <string name="more_button_alt">更多</string>
     <string name="stickers_button_alt">贴纸</string>
     <string name="flash_button_alt">刷新</string>
     <string name="flip_button_alt">翻转摄像头</string>
@@ -137,8 +574,11 @@ Language: zh_CN
     <string name="mlp_create_page">创建页面</string>
     <string name="mlp_create_blank_page">创建空白页面</string>
     <string name="mlp_choose_layout_subtitle">从种类繁多的预设页面布局中选择心仪的布局，开始打造自己的页面。 或者，您也可以从一个空白页面开始。</string>
+    <string name="mlp_choose_layout_title">选择布局</string>
     <string name="prepublishing_nudges_story_title_hint">为您的故事设定标题</string>
-    <string name="quick_start_dialog_create_new_post_message_short">轻点%1$s创建。 %2$s 然后选择&lt;b>博文&lt;/b></string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">创建文章或故事</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">创建文章、页面或故事</string>
+    <string name="quick_start_dialog_create_new_post_message_short">轻点%1$s创建。 %2$s 然后选择&lt;b&gt;博文&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">从设备中选择</string>
     <string name="my_site_bottom_sheet_add_story">故事文章</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">在自托管 WordPress 站点上编辑站点图标需要使用 Jetpack 插件。</string>
@@ -152,13 +592,10 @@ Language: zh_CN
     <string name="gutenberg_native_choose_image_or_video">选择图片或视频</string>
     <string name="gutenberg_native_choose_image">选择图像</string>
     <string name="gutenberg_native_block_removed">区块已删除</string>
-    <string name="content_description_logo">WordPress 徽标</string>
-    <string name="enter_your_site_address">输入您的站点地址</string>
-    <string name="continue_with_wpcom">继续使用 WordPress.com</string>
+    <string name="enter_your_site_address">输入您的现有站点地址</string>
     <string name="signup_confirmation_title">注册确认</string>
     <string name="continue_with_google_terms_of_service_text">如果您继续使用 Google，并且还没有 WordPress.com 帐户，则需要创建一个帐户，并同意我们的%1$s服务条款%2$s。</string>
     <string name="continue_terms_of_service_text">继续即表示您同意我们的%1$s服务条款%2$s。</string>
-    <string name="signup_confirmation_magic_link_message">我们将通过电子邮件向您发送注册链接，供您创建新的 WordPress.com 帐户。</string>
     <string name="signup_confirmation_message">我们将使用此电子邮件地址为您创建新 WordPress.com 帐户。</string>
     <string name="signup_magic_link_message">我们已通过电子邮件向您发送一个注册链接，供您创建新的 WordPress.com 帐户。 请在此设备上查看电子邮件，并轻点您从 WordPress.com 收到的电子邮件中的链接。</string>
     <string name="enter_account_info_for_site">输入您的 %1$s 帐户信息。</string>
@@ -175,18 +612,15 @@ Language: zh_CN
     <string name="or_type_your_password">或者输入您的密码</string>
     <string name="create_account">创建帐户</string>
     <string name="send_link_by_email">通过电子邮件发送链接</string>
-    <string name="login_promo_text_unlock_the_power">发挥最灵活的网站生成器的强大功能。</string>
-    <string name="login_promo_title_37_percent">网上有 37\% 的内容是在 WordPress 上构建的。</string>
     <string name="reset_your_password">重置密码</string>
-    <string name="quick_start_list_update_site_title_subtitle">为您的站点提供一个反映其个性和主题的名称。 第一印象很重要！</string>
+    <string name="reader_error_request_failed_title">处理请求时出现问题。 请稍后重试。</string>
     <string name="quick_start_list_update_site_title_title">设置您的站点标题</string>
-    <string name="quick_start_dialog_update_site_title_message_short">轻点 &lt;b>%1$s&lt;/b> 以设置新标题</string>
+    <string name="quick_start_dialog_update_site_title_message_short">轻点 &lt;b&gt;%1$s&lt;/b&gt; 以设置新标题</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">将此文章放入回收站还将放弃本地更改，是否确定要继续？</string>
     <string name="gutenberg_native_s_block_options">%s 区块选项</string>
     <string name="gutenberg_native_duplicate_block">复制区块</string>
     <string name="gutenberg_native_copy_block">拷贝区块</string>
     <string name="gutenberg_native_copied_block">已拷贝区块</string>
-    <string name="gutenberg_native_block_settings">区块设置</string>
     <string name="gutenberg_native_block_pasted">已粘贴区块</string>
     <string name="gutenberg_native_block_duplicated">已复制区块</string>
     <string name="gutenberg_native_block_cut">已剪切区块</string>
@@ -202,7 +636,6 @@ Language: zh_CN
     <string name="gutenberg_native_gradient_type">渐变类型</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">轻点两下以选择选项</string>
     <string name="gutenberg_native_customize_gradient">自定义渐变</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">页面作者</string>
     <string name="photo_picker_use_gif">使用此 GIF</string>
     <string name="error_media_thumbnail_not_loaded">无法加载媒体缩略图</string>
@@ -212,6 +645,7 @@ Language: zh_CN
     <string name="gutenberg_native_dismiss">忽略</string>
     <string name="prepublishing_nudges_home_tags_not_set">未设置</string>
     <string name="prepublishing_tags_description">标签有助于读者了解文章内容。</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">发布日期</string>
     <string name="prepublishing_nudges_toolbar_title_tags">添加标签</string>
     <string name="prepublishing_nudges_back_button">返回</string>
     <string name="prepublishing_nudges_home_save_button">立即保存</string>
@@ -223,7 +657,6 @@ Language: zh_CN
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">取消</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">移动到草稿</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">无法编辑已放入回收站的文章。 您想将此文章的状态更改为“草稿”，以便您可以进行编辑？</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">发布日期</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">将文章移动到“草稿”？</string>
     <string name="reader_label_choose_your_interests">选择您的兴趣</string>
     <string name="reader_choose_interests_content_description">选择您的兴趣</string>
@@ -238,17 +671,14 @@ Language: zh_CN
     <string name="ccpa_privacy_notice_header">面向加州用户的隐私声明</string>
     <string name="status_and_visibility">状态和可见性</string>
     <string name="update_now">现在更新</string>
-    <string name="pages_item_subtitle">%1$s· %2$s</string>
     <string name="gutenberg_native_open_block_actions_menu">打开区块操作菜单</string>
-    <string name="gutenberg_native_try_a_starter_layout">试用初学者布局</string>
-    <string name="gutenberg_native_insert_mention">插入提及</string>
+    <string name="gutenberg_native_move_to_top">移到顶部</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">双击以打开带有可用选项的底部表页</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">双击以打开带有可用选项的操作表页</string>
     <string name="pages_cannot_be_started">目前我们无法打开页面。请稍后重试</string>
     <string name="pages_set_as_posts_page">设为文章页面</string>
     <string name="pages_set_as_homepage">设为主页</string>
-    <string name="suggestion_no_matching_users">\"没有找到匹配的用户。\"</string>
-    <string name="suggestion_invalid_user">\"%s不是有效用户\"</string>
+    <string name="suggestion_invalid">%s 不是有效的 %s</string>
     <string name="site_settings_select_page">选择页面</string>
     <string name="site_settings_posts_page">文章页面</string>
     <string name="site_settings_static_homepage">静态主页</string>
@@ -260,13 +690,14 @@ Language: zh_CN
     <string name="site_settings_accept_homepage">接受</string>
     <string name="site_settings_failed_to_load_pages">页面加载失败</string>
     <string name="site_settings_homepage_settings_description">选择显示您的近期文章（经典博客）的主页或固定/静态页面。</string>
+    <string name="site_settings_homepage_settings">主页设置</string>
+    <string name="site_settings_homepage">主页</string>
     <string name="page_posts_page_update_failed">文章页面更新失败</string>
     <string name="page_posts_page_successfully_updated">文章页面更新成功</string>
     <string name="page_homepage_update_failed">主页更新失败</string>
     <string name="page_homepage_successfully_updated">主页更新成功</string>
     <string name="page_cannot_set_posts_page">要设置文章页面，请在“站点设置”中启用“静态主页”</string>
     <string name="page_cannot_set_homepage">要设置主页，请在“站点设置”中启用“静态主页”</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">欢迎访问我们的新博客</string>
     <string name="gutenberg_native_select_a_color">选择一种颜色</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">点击两下以进入颜色设置</string>
     <string name="reader_empty_followed_blogs_description">在您关注站点时，您会在这里看到其内容</string>
@@ -282,7 +713,9 @@ Language: zh_CN
     <string name="photo_picker_video_title">选择视频</string>
     <string name="site_picker_ask_site_select">无法选择站点。请再试一次。</string>
     <string name="sitepicker_continue_flow">继续</string>
+    <string name="reader_reblog_error">转载失败</string>
     <string name="reader_no_site_to_reblog_action">管理站点</string>
+    <string name="reader_no_site_to_reblog_detail">建立 WordPress.com 站点后，您可以将喜爱的内容转载到自己的站点。</string>
     <string name="reader_no_site_to_reblog_title">没有可用的 WordPress.com 站点</string>
     <string name="whats_new_in_version_title">新变化</string>
     <string name="comment_q_action_copied_url">链接地址已复制</string>
@@ -292,15 +725,12 @@ Language: zh_CN
     <string name="button_insert">插入</string>
     <string name="continue_label">继续</string>
     <string name="copy_text">复制</string>
-    <string name="reader_reblog_error">转载失败</string>
-    <string name="reader_no_site_to_reblog_detail">建立 WordPress.com 站点后，您可以将喜爱的内容转载到自己的站点。</string>
     <string name="gutenberg_native_move_block_right_from_position_1_s_to_position_2_s">将区块从位置 %1$s 向右移动到位置 %2$s</string>
     <string name="gutenberg_native_move_block_right">向右移动区块</string>
     <string name="gutenberg_native_move_block_left_from_position_1_s_to_position_2_s">将区块从位置 %1$s 向左移动到位置 %2$s</string>
     <string name="gutenberg_native_move_block_left">向左移动区块</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">轻按两下以向右移动区块</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">轻按两下以向左移动区块</string>
-    <string name="gutenberg_native_blog">博客</string>
     <string name="new_site_creation_creating_site_loading_4">正在创建控制面板</string>
     <string name="new_site_creation_creating_site_loading_3">正在设置主题</string>
     <string name="new_site_creation_creating_site_loading_2">正在添加站点功能</string>
@@ -322,12 +752,12 @@ Language: zh_CN
     <string name="media_accessing_failed">无法访问私人站点的内容。某些媒体可能不可用</string>
     <string name="media_accessing_progress">正在访问私人站点的内容</string>
     <string name="error_failed_to_crop_and_save_image">无法裁剪和保存图片，请重试。</string>
+    <string name="failed_to_load_image_tap_to_retry">无法载入图片。\n轻按可重试。</string>
     <string name="preview_image_description">预览图片</string>
     <string name="error_unknown_page_type">未知页面格式</string>
     <string name="error_page_not_submitted">我们无法完成此操作，因而未提交此页面以进行审核。</string>
     <string name="error_page_not_scheduled">我们无法完成此操作，因而未安排此页面的发布时间。</string>
     <string name="error_page_not_published_private">我们无法完成此操作，因而未发布此私密页面。</string>
-    <string name="failed_to_load_image_tap_to_retry">无法载入图片。\n轻按可重试。</string>
     <string name="error_page_not_published">我们无法完成此操作，因而未发布此页面。</string>
     <string name="error_page_not_submitted_retrying">我们无法提交此页面以进行审核，但我们稍后会重试。</string>
     <string name="error_page_not_scheduled_retrying">我们无法安排此页面的发布时间，但我们稍后会重试。</string>
@@ -356,58 +786,21 @@ Language: zh_CN
     <string name="app_theme_light">浅色</string>
     <string name="app_theme">外观</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">您最近对此页面所做的更改没有保存。选择要加载的版本：\n\n</string>
-    <string name="gutenberg_native_what_people_say">用户评价</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">我们提供一系列服务来帮助您达成您所追求的结果。不确定您需要的服务或费用？我们可以向您说明哪些服务适合您，并向您详细介绍相关费用。通过以下方式与我们联系。</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">我们是一个由具有广泛技能和经验的专业人才组成的小型团队。我们热爱自己的工作，并且为之乐此不疲。我们期待与您合作。</string>
-    <string name="gutenberg_native_warning_message">警告消息</string>
-    <string name="gutenberg_native_want_to_work_with_us">想与我们合作？</string>
-    <string name="gutenberg_native_walt_disney">Walt Disney</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">访客会想要了解页面的制作者。使用此空间介绍您本人、您的站点、您的业务或任何您想要展示的内容。使用下面的好评部分来引用别人的话，用他们自己的话来谈论同样的事情。</string>
-    <string name="gutenberg_native_usa">美国</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">这是示例内容，包含在模板中，用来说明其功能。删除示例内容或将示例内容替换为自己的文字和媒体。</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">开始做事的方法就是停止空谈并付诸行动。</string>
-    <string name="gutenberg_native_team">团队</string>
-    <string name="gutenberg_native_success_message">成功消息</string>
-    <string name="gutenberg_native_strategy">战略</string>
     <string name="gutenberg_native_show_post_content">显示文章内容</string>
-    <string name="gutenberg_native_services">服务</string>
-    <string name="gutenberg_native_samuel_the_dog">小狗 Samuel</string>
-    <string name="gutenberg_native_sally_smith">Sally Smith</string>
-    <string name="gutenberg_native_project_name">项目名称</string>
-    <string name="gutenberg_native_position_or_job_title">职位或职称</string>
-    <string name="gutenberg_native_portfolio">作品集</string>
     <string name="gutenberg_native_only_show_excerpt">仅显示摘录</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">我的作品集展示了我职业生涯中完成的各种项目。请在下面查看我的联系信息并与我联系。</string>
     <string name="gutenberg_native_link_to">链接到</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">我们来交流一下 👋 您可以随时通过以下联系信息联系我们，或者使用表单发送消息。</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">让我们一起创造精彩！</string>
-    <string name="gutenberg_native_let_s_build_something_together">让我们一起创造精彩！</string>
-    <string name="gutenberg_native_juan_p_rez">Juan Pérez</string>
-    <string name="gutenberg_native_j_k_rowling">J.K.Rowling</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">决定我们成为什么样人的，不是我们的能力，而是我们的选择。</string>
-    <string name="gutenberg_native_inspiration">灵感</string>
-    <string name="gutenberg_native_get_in_touch">联系我们</string>
+    <string name="gutenberg_native_link_settings">链接设置</string>
     <string name="gutenberg_native_excerpt_length_words">摘录长度（字数）</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">向我发送电子邮件：&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">Seuss 博士</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">不要为结束而哭泣，要为曾经拥有而微笑。</string>
     <string name="gutenberg_native_customize">定制</string>
-    <string name="gutenberg_native_city_10100">北京，100000</string>
+    <string name="gutenberg_native_video_settings">视频设置</string>
     <string name="gutenberg_native_add_paragraph_block">添加段落区块</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">简要介绍您提供的服务。</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">简短的个人简介，包括个人经历、主要成就或有趣的体验。</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">对展示的项目和作品的描述。</string>
-    <string name="gutenberg_native_555_555_1234">(555) 555–1234</string>
-    <string name="gutenberg_native_10_street_road">中关村北大街 1 号</string>
     <string name="create_post_page_fab_tooltip_contributors">撰写文章</string>
     <string name="post_list_tab_trashed_posts">已放入回收站</string>
     <string name="post_list_tab_scheduled_posts">预发布</string>
     <string name="post_list_tab_published_posts">已发布</string>
     <string name="sharing_facebook_account_must_have_pages">Facebook 连接无法找到任何页面。Publicize 无法连接到 Facebook 个人资料，只能连接到已发布的页面。</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">未连接</string>
-    <string name="my_site_select_domains_page_title">站点地址</string>
-    <string name="notifications_tab_title_likes">赞</string>
+    <string name="notifications_tab_title_likes">喜欢</string>
     <string name="notifications_tab_title_follows">关注</string>
     <string name="notifications_tab_title_comments">评论</string>
     <string name="notifications_tab_title_unread_notifications">未读</string>
@@ -420,31 +813,28 @@ Language: zh_CN
     <string name="stats_management_add_new_stats_card">添加新统计信息卡片</string>
     <string name="reader_self_hosted_select_filter">使用“过滤器”按钮查找特定主题的文章</string>
     <string name="reader_bottom_sheet_content_description">选择标签、站点或弹出窗口</string>
-    <string name="reader_btn_selected_filter_tick_content_description">已选择</string>
     <string name="reader_btn_select_filter_content_description">选择站点或标签来过滤文章</string>
     <string name="reader_btn_remove_filter_content_description">删除当前过滤器</string>
-    <string name="reader_filter_self_hosted_empty_sites_tags_action">登录 WordPress.com</string>
     <string name="reader_title_subs">管理主题和站点</string>
-    <string name="reader_filter_self_hosted_empty_sites_list">登录 WordPress.com 以查看您关注的站点的最新文章</string>
+    <string name="reader_filter_self_hosted_empty_sites_tags_action">登录 WordPress.com</string>
     <string name="reader_filter_self_hosted_empty_tagss_list">登录 WordPress.com，查看有关您关注的主题的最新博文</string>
-    <string name="gutenberg_native_template_preview">模板预览</string>
+    <string name="reader_filter_self_hosted_empty_sites_list">登录 WordPress.com 以查看您关注的站点的最新文章</string>
     <string name="gutenberg_native_replace_current_block">替换现有区块</string>
     <string name="gutenberg_native_add_to_end">添加到结尾</string>
     <string name="gutenberg_native_add_to_beginning">添加到开始</string>
     <string name="gutenberg_native_add_block_before">在之前添加区块</string>
     <string name="gutenberg_native_add_block_after">在之后添加区块</string>
-    <string name="reader_filter_empty_sites_action">关注站点</string>
-    <string name="reader_filter_empty_sites_list">查看您关注的站点的最新文章</string>
     <string name="reader_filter_empty_tags_action">添加主题</string>
+    <string name="reader_filter_empty_sites_action">关注站点</string>
     <string name="reader_filter_empty_tags_list">您可以通过添加主题来关注有关某个特定主题的博文</string>
+    <string name="reader_filter_empty_sites_list">查看您关注的站点的最新文章</string>
     <string name="reader_filter_main_title">已关注</string>
     <string name="reader_filter_cta">过滤器</string>
-    <string name="gutenberg_native_edit_video">编辑视频</string>
     <string name="gutenberg_native_video_caption_s">视频说明。%s</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">双击以选择布局</string>
+    <string name="gutenberg_native_edit_video">编辑视频</string>
     <string name="gutenberg_native_add_a_shortcode">添加短代码…</string>
-    <string name="fab_create_desc">撰写文章</string>
     <string name="post_list_author">文章作者</string>
+    <string name="fab_create_desc">撰写文章</string>
     <string name="stats_posting_activity_end_description">您已获得这段时间的所有统计数据。\n再次点击将从头开始。</string>
     <string name="stats_posting_activity_empty_description">此段时间无统计数据。</string>
     <string name="stats_posting_activity_label_content_description">为 %1$s 发布活动</string>
@@ -456,10 +846,8 @@ Language: zh_CN
     <string name="stats_box_type_low">低</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry">  以及 %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">向前移动图片</string>
-    <string name="gutenberg_native_move_image_backward">向后移动图片</string>
+    <string name="gutenberg_native_replace_image">更换图像</string>
     <string name="gutenberg_native_gallery_caption_s">图库说明。%s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s。当前值为 %2$s</string>
     <string name="create_post_page_fab_tooltip">创建文章或页面</string>
     <string name="content_description_person_building_website">网站构建者</string>
     <string name="post_signup_interstitial_not_right_now">现在不行</string>
@@ -473,54 +861,46 @@ Language: zh_CN
     <string name="my_site_bottom_sheet_add_post">博客文章</string>
     <string name="my_site_bottom_sheet_title">新增</string>
     <string name="post_settings_publish">发布</string>
-    <string name="dialog_gutenberg_informative_description_v2">我们对区块编辑器进行了重大改进，绝对值得一试！我们已为新文章和页面启用该编辑器，但是，如果您想改用经典编辑器，请转到“我的站点”>“站点设置”。</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">立即同步</string>
     <string name="dialog_confirm_scheduled_post_sync_message">此文章将立即同步。</string>
     <string name="dialog_confirm_scheduled_post_sync_title">准备好同步了？</string>
     <string name="new_site_creation_unavailable_domain">此域不可用</string>
-    <string name="login_promo_viewpager_content_description">简介</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">我们无法访问您的站点。您需要联系您的主机来解决这个问题。</string>
-    <string name="login_discovery_error_ssl">由于 &lt;b>SSL 证书&lt;/b>的问题，我们无法访问您的站点。您需要联系您的主机来解决这个问题。</string>
-    <string name="login_discovery_error_http_auth">由于需要 &lt;b>HTTP 验证&lt;/b>，我们无法访问您的站点。您需要联系您的主机来解决这个问题。</string>
-    <string name="login_discovery_error_xmlrpc">我们无法访问您的站点上的 &lt;b>XMLRPC 文件&lt;/b>。您需要联系您的主机来解决这个问题。</string>
-    <string name="login_site_credentials_magic_link_label">马上就好！我们需要验证您的 Jetpack 连接的电子邮件地址 &lt;b>%1$s&lt;/b></string>
+    <string name="login_discovery_error_ssl">由于 &lt;b&gt;SSL 证书&lt;/b&gt;的问题，我们无法访问您的站点。您需要联系您的主机来解决这个问题。</string>
+    <string name="login_discovery_error_http_auth">由于需要 &lt;b&gt;HTTP 验证&lt;/b&gt;，我们无法访问您的站点。您需要联系您的主机来解决这个问题。</string>
+    <string name="login_discovery_error_xmlrpc">我们无法访问您的站点上的 &lt;b&gt;XMLRPC 文件&lt;/b&gt;。您需要联系您的主机来解决这个问题。</string>
+    <string name="login_site_credentials_magic_link_label">马上就好！我们需要验证您的 Jetpack 连接的电子邮件地址 &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">使用 %1$s 站点凭据登录</string>
-    <string name="send_verification_email">发送验证电子邮件</string>
-    <string name="reader_following_display_name">关注中</string>
     <string name="my_site_bottom_sheet_add_page">站点页面</string>
-    <string name="enter_site_credentials_instead">使用站点凭据登录。</string>
-    <string name="posts_cannot_be_started">我们现在无法打开文章。请稍后重试</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="suffix_1_000_000_000">%sB</string>
-    <string name="suffix_1_000_000">%sM</string>
+    <string name="reader_following_display_name">关注中</string>
+    <string name="reader_my_likes_display_name">喜欢</string>
+    <string name="reader_discover_display_name">发现</string>
+    <string name="reader_save_for_later_display_name">已保存</string>
+    <string name="reader_filter_tags_title">主题</string>
+    <string name="reader_filter_sites_title">站点</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="reader_filter_sites_title">站点</string>
-    <string name="reader_save_for_later_display_name">已保存</string>
-    <string name="reader_discover_display_name">发现</string>
-    <string name="reader_my_likes_display_name">赞</string>
+    <string name="suffix_1_000_000_000">%sB</string>
+    <string name="suffix_1_000_000">%sM</string>
+    <string name="suffix_1_000">%sK</string>
+    <string name="posts_cannot_be_started">我们现在无法打开文章。请稍后重试</string>
     <string name="site_cannot_be_loaded">我们现在无法为您的站点加载数据。请稍后重试</string>
-    <string name="reader_filter_tags_title">主题</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress 媒体库</string>
+    <string name="gutenberg_native_unsupported">不受支持</string>
     <string name="gutenberg_native_ungroup">取消分组</string>
     <string name="gutenberg_native_translate">翻译</string>
+    <string name="gutenberg_native_tap_to_hide_the_keyboard">轻按可隐藏键盘</string>
+    <string name="gutenberg_native_tap_here_to_show_help">轻按此处以显示帮助</string>
     <string name="gutenberg_native_take_a_video">拍摄视频</string>
     <string name="gutenberg_native_take_a_photo_or_video">拍摄照片或视频</string>
     <string name="gutenberg_native_take_a_photo">拍照</string>
     <string name="gutenberg_native_start_writing">开始撰写…</string>
-    <string name="gutenberg_native_tap_to_hide_the_keyboard">轻按可隐藏键盘</string>
-    <string name="gutenberg_native_title">标题:</string>
-    <string name="gutenberg_native_tap_here_to_show_help">轻按此处以显示帮助</string>
-    <string name="gutenberg_native_size">尺寸</string>
-    <string name="gutenberg_native_sidebar_title_plugin">边栏标题插件</string>
     <string name="gutenberg_native_show_section">显示分区</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s 区块。此区块包含无效内容</string>
     <string name="gutenberg_native_s_block_empty">%s 区块。空白</string>
-    <string name="gutenberg_native_reset_block">重置区块</string>
     <string name="gutenberg_native_cut_block">剪切区块</string>
-    <string name="gutenberg_native_remove_annotations">删除注释</string>
     <string name="gutenberg_native_problem_opening_the_video">打开视频时出现问题</string>
     <string name="gutenberg_native_problem_displaying_block">显示区块时出现问题</string>
     <string name="gutenberg_native_post_title_s">文章标题。%s</string>
@@ -530,17 +910,12 @@ Language: zh_CN
     <string name="gutenberg_native_open_settings">打开设置</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">没有可以处理此请求的应用程序。请安装 Web 浏览器。</string>
     <string name="gutenberg_native_navigate_up">向上导航</string>
-    <string name="gutenberg_native_my_pre_publish_panel">我的预发布面板</string>
-    <string name="gutenberg_native_my_post_status_info">我的文章状态信息</string>
-    <string name="gutenberg_native_my_post_publish_panel">我的文章发布面板</string>
-    <string name="gutenberg_native_my_document_setting_panel">我的文档设置面板</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">将区块从第 %1$s 行向上移动到第 %2$s 行</string>
     <string name="gutenberg_native_move_block_up">向上移动区块</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">将区块从第 %1$s 行向下移动到第 %2$s 行</string>
     <string name="gutenberg_native_move_block_down">向下移动区块</string>
     <string name="gutenberg_native_image_caption_s">图片说明。%s</string>
     <string name="gutenberg_native_hide_keyboard">隐藏键盘</string>
-    <string name="gutenberg_native_here_is_the_panel_content">这里是面板内容！</string>
     <string name="gutenberg_native_help_icon">“帮助”图标</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">无法插入媒体。\n请轻按以查看选项。</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">轻按两下以撤销上次的更改</string>
@@ -552,34 +927,28 @@ Language: zh_CN
     <string name="gutenberg_native_double_tap_to_move_the_block_up">轻按两下以向上移动区块</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">轻按两下以向下移动区块</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">轻按两下以编辑此值</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">轻按两下以使用滑块更改此值</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">轻按两下以添加区块</string>
     <string name="gutenberg_native_current_value_is_s">当前值为 %s</string>
-    <string name="gutenberg_native_content">内容…</string>
     <string name="gutenberg_native_choose_from_device">从设备中选择</string>
-    <string name="gutenberg_native_annotations_sidebar">注释边栏</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">发生了未知错误。请重试。</string>
     <string name="gutenberg_native_alt_text">替代文本</string>
     <string name="gutenberg_native_add_video">添加视频</string>
     <string name="gutenberg_native_add_url">添加 URL</string>
+    <string name="gutenberg_native_add_alt_text">添加alt文字</string>
     <string name="gutenberg_native_add_image_or_video">添加图片或视频</string>
     <string name="gutenberg_native_add_image">添加图片</string>
     <string name="gutenberg_native_add_block_here">在此处添加区块</string>
-    <string name="gutenberg_native_add_annotation">添加注释</string>
-    <string name="gutenberg_native_add_a_description">添加说明</string>
-    <string name="reader_acessibility_list_loaded">“列表已加载 %1$d 项。”</string>
     <string name="reader_empty_saved_posts_content_description">轻按“添加以保存文章”按钮，将文章保存到您的列表中。</string>
+    <string name="reader_acessibility_list_loaded">“列表已加载 %1$d 项。”</string>
     <string name="notifications_tab_dialog_switch_desc">通知</string>
-    <string name="master_switch_default_title_off">关</string>
-    <string name="master_switch_default_title_on">开</string>
-    <string name="notifications_tab_dialog_master_off_message">关闭此站点的“通知”功能后，此站点的“通知”选项卡中将不再显示通知。您可以在打开此站点的“通知”功能后，调整您要查看的通知类型。</string>
-    <string name="notifications_tab_dialog_master_off_title">要在此站点的“通知”选项卡中查看通知，请为此站点打开“通知”功能。</string>
-    <string name="notifications_tab_dialog_master_hint_off">为此站点启用在“通知”选项卡上显示通知</string>
-    <string name="notifications_tab_dialog_master_hint_on">为此站点禁用在“通知”选项卡上显示通知</string>
-    <string name="notifications_tab_dialog_master_status_off">此站点的通知</string>
-    <string name="notifications_tab_dialog_master_status_on">此站点的通知</string>
-    <string name="dialog_gutenberg_informative_description_page">您现在正在使用区块编辑器创建新页面，太棒了！如果您想要改为使用经典编辑器，请转至“我的站点”>“站点设置”。</string>
-    <string name="dialog_gutenberg_informative_description_post">您现在正在使用区块编辑器撰写新文章，太棒了！如果您想要改为使用经典编辑器，请转至“我的站点”>“站点设置”。</string>
+    <string name="main_switch_default_title_off">关闭</string>
+    <string name="main_switch_default_title_on">开启</string>
+    <string name="notifications_tab_dialog_main_off_message">如果关闭此站点的通知功能，则此站点的通知选项卡上将不会显示通知。开启此站点的通知功能后，您可以调整您看到的通知类型。</string>
+    <string name="notifications_tab_dialog_main_off_title">要在此站点的“通知”选项卡中查看通知，请为此站点打开“通知”功能。</string>
+    <string name="notifications_tab_dialog_main_hint_off">为此站点启用在“通知”选项卡上显示通知</string>
+    <string name="notifications_tab_dialog_main_hint_on">为此站点禁用在“通知”选项卡上显示通知</string>
+    <string name="notifications_tab_dialog_main_status_off">此站点的通知</string>
+    <string name="notifications_tab_dialog_main_status_on">此站点的通知</string>
     <string name="pick_media">添加图片或视频</string>
     <string name="error_post_not_submitted_retrying">我们无法提交这篇文章以进行审核，但我们会稍后重试。</string>
     <string name="error_post_not_scheduled_retrying">我们无法安排此文章的发布时间，但我们会稍后重试。</string>
@@ -594,6 +963,7 @@ Language: zh_CN
     <string name="error_media_recover_post_not_published_private">我们无法上传此媒体，因而未发布此私密文章。</string>
     <string name="error_media_recover_post_not_published">我们无法上传此媒体，因而未发布此文章。</string>
     <string name="error_media_recover_post">我们无法上传此媒体。</string>
+    <string name="error_generic_error_retrying">我们无法完成此操作，但我们会稍后重试。 </string>
     <string name="error_generic_error">我们无法完成此操作。</string>
     <string name="error_preview_empty_draft">无法预览空白草稿</string>
     <string name="error_preview_empty_page">无法预览空白页面</string>
@@ -601,7 +971,6 @@ Language: zh_CN
     <string name="preview_unavailable_self_hosted_sites">预览不可用</string>
     <string name="remote_preview_operation_error">尝试在预览前保存文章时出错</string>
     <string name="post_preview_remote_auto_saving_post">正在生成预览…</string>
-    <string name="error_generic_error_retrying">我们无法完成此操作，但我们会稍后重试。 </string>
     <string name="post_preview_saving_draft">正在保存…</string>
     <string name="local_post_autosave_revision_available">您对此文章所做的更改未保存</string>
     <string name="dialog_confirm_autosave_dont_restore_button">来自此应用程序的版本</string>
@@ -612,10 +981,10 @@ Language: zh_CN
     <string name="button_delete_permanently">永久删除</string>
     <string name="post_waiting_for_connection_draft_cancel">我们不会保存您的草稿的最新更改。</string>
     <string name="post_waiting_for_connection_scheduled_cancel">我们不会安排这些更改的发布时间。</string>
-    <string name="post_waiting_for_connection_draft">当您的设备重新联网后，我们将保存您的草稿</string>
-    <string name="post_waiting_for_connection_private">当您的设备重新联网后，我们将发布您的私密文章。</string>
     <string name="post_waiting_for_connection_pending_cancel">我们不会提交这些更改供审核。 </string>
     <string name="post_waiting_for_connection_publish_cancel"> 我们不会发布这些更改。</string>
+    <string name="post_waiting_for_connection_draft">当您的设备重新联网后，我们将保存您的草稿</string>
+    <string name="post_waiting_for_connection_private">当您的设备重新联网后，我们将发布您的私密文章。</string>
     <string name="post_waiting_for_connection_scheduled">当您的设备重新联网后，我们将安排您的文章的发布时间。</string>
     <string name="post_waiting_for_connection_pending">当您的设备重新联网后，我们将提交您的文章以进行审核。</string>
     <string name="post_waiting_for_connection_publish">当您的设备重新联网后，我们将发布此文章。</string>
@@ -646,8 +1015,8 @@ Language: zh_CN
     <string name="stats_file_downloads_title_label">文件</string>
     <string name="stats_file_downloads">文件下载</string>
     <string name="stats_data_not_recorded_for_period">系统未记录 2019 年 6 月 28 日之前的文件下载统计数据。</string>
-    <string name="stats_site_negative_utc">站点时区 (UTC - %s)</string>
-    <string name="stats_site_positive_utc">站点时区 (UTC + %s)</string>
+    <string name="stats_site_negative_utc">站点时区（UTC-%s）</string>
+    <string name="stats_site_positive_utc">站点时区（UTC+%s）</string>
     <string name="stats_site_neutral_utc">站点时区 (UTC)</string>
     <string name="web_preview_desktop">桌面</string>
     <string name="web_preview_default">默认</string>
@@ -673,20 +1042,18 @@ Language: zh_CN
     <string name="post_settings_notification">通知</string>
     <string name="post_settings_time_and_date">日期和时间</string>
     <string name="login_invalid_site_url">请输入一个完整的网站地址，例如 example.com。</string>
-    <string name="enter_wordpress_site">此地址下的网站不是 WordPress 站点。站点必须安装 WordPress，我们才能建立连接。</string>
-    <string name="login_need_help_finding_connected_email">需要帮助查找您连接的电子邮件吗?</string>
-    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
-    <string name="stats_post_label">文章</string>
-    <string name="site_settings_editor">编辑</string>
     <string name="enter_email_for_site">登录 WordPress.com 来连接 %1$s</string>
-    <string name="stats_expand_content_description">展开</string>
+    <string name="stats_post_views_label">浏览次数</string>
+    <string name="stats_post_label">文章</string>
+    <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
     <string name="stats_item_collapsed">收起条目</string>
     <string name="stats_item_expanded">展开条目</string>
     <string name="stats_collapse_content_description">收起</string>
+    <string name="stats_expand_content_description">展开</string>
     <string name="stats_graph_updated">图表已更新。</string>
     <string name="stats_overview_content_description">%1$s%2$s 针对以下时段：%3$s，与上个时段相比的变化 - %4$s</string>
     <string name="stats_loading_card">正在加载选定的卡片数据</string>
-    <string name="stats_post_views_label">浏览次数</string>
+    <string name="site_settings_editor">编辑</string>
     <string name="description_expand">展开</string>
     <string name="description_collapse">折叠</string>
     <string name="my_site_verify_your_email_without_email">请验证您的电子邮件地址（说明已发送至您的电子邮件地址）</string>
@@ -694,20 +1061,22 @@ Language: zh_CN
     <string name="link_dialog_button_cancel">取消</string>
     <string name="link_dialog_button_ok">确定</string>
     <string name="link_dialog_edit_hint">http(s)://</string>
-    <string name="link_dialog_title">插入链接</string>
     <string name="link_dialog_button_remove_link">移除链接</string>
+    <string name="link_dialog_title">插入链接</string>
     <string name="post_settings_retry_featured_image">重试上传</string>
     <string name="post_settings_featured_image_uploading_tap_for_options">正在上传媒体。\n请轻按以查看选项。</string>
     <string name="link_open_new_window">在新窗口/选项卡中打开链接</string>
     <string name="stats_widget_error_no_access_token">要查看您的统计信息，请登录 WordPress.com 帐户。</string>
+    <string name="post_list_search_nothing_found">没有与您的关键词匹配的文章</string>
     <string name="post_list_search_prompt">搜索文章</string>
-    <string name="stats_widget_today_insights_name">今天</string>
+    <string name="domains_suggestions_intro_description">人们可以通过此域名在互联网上找到您。</string>
     <string name="domains_suggestions_intro_title">选择高级版域名</string>
     <string name="my_site_custom_domain_name">所有 WordPress.com 套餐均包含一个自定义域名。立即注册您的免费高级版域。</string>
-    <string name="post_list_search_nothing_found">没有与您的关键词匹配的文章</string>
-    <string name="domains_suggestions_intro_description">人们可以通过此域名在互联网上找到您。</string>
     <string name="stats_widget_minified_name">概览</string>
+    <string name="stats_widget_today_insights_name">今天</string>
     <string name="stats_widget_all_time_insights_name">所有时间</string>
+    <string name="stats_widget_weekly_views_name">本周浏览次数</string>
+    <string name="stats_widget_log_in_message">请登录 WordPress 应用以添加小部件。</string>
     <string name="stats_widget_error_no_network">没有可用网络</string>
     <string name="stats_widget_error_no_data">无法加载数据</string>
     <string name="stats_widget_select_type">类型</string>
@@ -719,10 +1088,8 @@ Language: zh_CN
     <string name="stats_widget_site_caption">选择你的站点</string>
     <string name="stats_widget_site">站点</string>
     <string name="stats_widget_all_time_title">全部时间</string>
-    <string name="stats_widget_add">添加小工具</string>
-    <string name="stats_widget_weekly_views_name">本周浏览次数</string>
-    <string name="stats_widget_log_in_message">请登录 WordPress 应用以添加小部件。</string>
     <string name="stats_widget_views_title">本周浏览次数</string>
+    <string name="stats_widget_add">添加小工具</string>
     <string name="plugin_fetching_error_after_at">刷新插件详细信息耗时比平常更长。请稍后再查看。</string>
     <string name="plugin_install_site_ineligible_default_error">如果域名是您刚刚注册的，请等待相关配置生效后再试一次。\n\n如果没有，则似乎出现了问题，该站点可能无法使用插件功能。</string>
     <string name="domain_contact_information_state_not_available_hint">州/省/自治区/直辖市（不可用）</string>
@@ -739,7 +1106,7 @@ Language: zh_CN
     <string name="domain_registration_state_picker_dialog_title">选择州/省/自治区/直辖市</string>
     <string name="domain_registration_country_picker_dialog_title">选择国家/地区</string>
     <string name="domain_registration_result_continue_button">继续</string>
-    <string name="domain_registration_result_description">您的新域 &lt;b>%s&lt;/b> 正在设置中。您的站点\n真是太棒了！</string>
+    <string name="domain_registration_result_description">您的新域 &lt;b&gt;%s&lt;/b&gt; 正在设置中。您的站点\n真是太棒了！</string>
     <string name="domain_registration_result_title">恭喜</string>
     <string name="domain_contact_information_register_domain_button">注册域</string>
     <string name="domain_contact_information_postal_code_hint">邮政编码</string>
@@ -765,21 +1132,21 @@ Language: zh_CN
     <string name="stats_management_news_card_message">选择要查看的统计数据，重点关注您最关心的数据。点按“数据分析”底部的“%1$s”，以自定义您的统计数据。</string>
     <string name="stats_manage_your_stats">管理您的统计数据</string>
     <string name="history_fetching_revisions">正在获取修订版…</string>
-    <string name="editor_uploading_draft">正在上传您的草稿</string>
     <string name="editor_failed_to_insert_media_tap_to_retry">无法插入媒体。\n请轻按以重试。</string>
+    <string name="editor_uploading_draft">正在上传您的草稿</string>
     <string name="post_uploading_draft">正在上传草稿</string>
-    <string name="error_restoring_post">恢复文章时出错</string>
     <string name="post_list_tab_drafts">草稿</string>
+    <string name="error_restoring_post">恢复文章时出错</string>
     <string name="backdated_for">倒填日期：%s</string>
     <string name="stats_insights_management_title">仅查看相关性较大的统计信息。在下面添加和管理您的见解。</string>
     <string name="stats_insights_social">社交</string>
     <string name="stats_insights_annual_site_stats">年度站点统计信息</string>
+    <string name="stats_view_follower_totals">粉丝总数</string>
     <string name="domain_suggestions_fetch_error">无法加载域建议</string>
     <string name="domain_suggestions_search_hint">请输入关键字以获取更多想法</string>
     <string name="domains_suggestions_empty_list">未找到任何建议</string>
     <string name="register_domain">注册域</string>
     <string name="jetpack_installed_message">安装 Jetpack 后，我们只需进行设置即可。这只需要一分钟时间。</string>
-    <string name="stats_view_follower_totals">粉丝总数</string>
     <string name="stats_menu_remove">从见解中删除</string>
     <string name="stats_menu_move_down">下移</string>
     <string name="stats_menu_move_up">上移</string>
@@ -788,8 +1155,8 @@ Language: zh_CN
     <string name="post_restoring">文章已成功恢复</string>
     <string name="post_restored">文章已恢复</string>
     <string name="post_trashing">文章正移至回收站</string>
-    <string name="dialog_confirm_trash_losing_local_changes_title">本地更改</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">将此文章放入回收站还将放弃未保存的更改，是否确定要继续？</string>
+    <string name="dialog_confirm_trash_losing_local_changes_title">本地更改</string>
     <string name="button_move_to_draft">移动到草稿</string>
     <string name="post_list_toggle_item_layout_list_view">切换到列表视图</string>
     <string name="post_list_toggle_item_layout_cards_view">切换到卡片视图</string>
@@ -801,8 +1168,8 @@ Language: zh_CN
     <string name="error_user_username_instead_of_email">请使用您的 WordPress.com 用户名（而不是电子邮件地址）登录。</string>
     <string name="stats_insights_average_words">每篇文章的平均字数</string>
     <string name="stats_insights_total_words">总字数</string>
-    <string name="stats_insights_average_likes">每篇文章的平均赞数</string>
-    <string name="stats_insights_total_likes">总赞数</string>
+    <string name="stats_insights_average_likes">平均喜欢数/文章</string>
+    <string name="stats_insights_total_likes">总喜欢数</string>
     <string name="stats_insights_average_comments">每篇文章的平均评论数</string>
     <string name="stats_insights_total_comments">总评论数</string>
     <string name="stats_insights_posts">文章</string>
@@ -830,15 +1197,15 @@ Language: zh_CN
     <string name="stats_insights_best_day">最佳日期</string>
     <string name="showing_stats_for">显示以下内容的统计数据：</string>
     <string name="app_rating_rate_never">不用了，谢谢</string>
-    <string name="app_rating_message">欢迎您再次到来！如果您喜欢这款应用，我们希望能够在 Google Play 商店中获得您的评分。</string>
     <string name="app_rating_rate_later">以后再说</string>
     <string name="app_rating_rate_now">立即评分</string>
+    <string name="app_rating_message">欢迎您再次到来！如果您喜欢此应用，我们希望您能在Google Play Store上给我们一个评价。</string>
+    <string name="app_rating_title">喜欢 WordPress 吗?</string>
+    <string name="editor_post_converted_back_to_draft">文章已转换回草稿</string>
     <string name="stats_insights_posting_activity">文章发布活动</string>
     <string name="stats_site_not_loaded_yet">站点尚未加载</string>
     <string name="stats_more_posts">更多文章</string>
     <string name="stats_fewer_posts">更少文章</string>
-    <string name="app_rating_title">喜欢 WordPress 吗?</string>
-    <string name="editor_post_converted_back_to_draft">文章已转换回草稿</string>
     <string name="new_site_creation_preview_back_pressed_warning">如果退出，可能会前功尽弃。是否确定要退出？</string>
     <string name="plans_loading_error_with_cache_button">仍然查看套餐</string>
     <string name="plans_loading_error_with_cache_subtitle">必须连接互联网才能查看套餐，因此详细信息可能已过时。</string>
@@ -846,13 +1213,11 @@ Language: zh_CN
     <string name="plans_loading_error_no_plans_subtitle">我们暂时无法加载套餐。请稍后重试。</string>
     <string name="plans_loading_error_no_plans_title">无法加载套餐</string>
     <string name="plans_loading_error_network_title">无连接</string>
+    <string name="menu_switch_to_gutenberg_editor">切换到区块编辑器</string>
     <string name="stats_loading_block_error">加载数据时出现问题，请刷新页面以重试。</string>
     <string name="stats_loading_error">无法加载数据</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">使用区块编辑器编辑新的文章和页面</string>
     <string name="site_settings_gutenberg_default_for_new_posts">使用区块编辑器</string>
-    <string name="menu_switch_to_gutenberg_editor">切换到区块编辑器</string>
-    <string name="menu_switch_to_aztec_editor">切换到经典编辑器</string>
-    <string name="dialog_gutenberg_informative_title">已启用区块编辑器</string>
     <string name="exit">退出</string>
     <string name="quick_start_sites_type_subtitle">已完成 %1$d 个（共 %2$d 个）</string>
     <string name="quick_start_sites_type_grow">增加您的受众</string>
@@ -863,25 +1228,18 @@ Language: zh_CN
     <string name="quick_start_dialog_upload_icon_title">上传站点图标</string>
     <string name="quick_start_dialog_upload_icon_message">访客将在其浏览器中看到您的图标。添加自定义图标，打造精美的专业外观。</string>
     <string name="quick_start_dialog_explore_plans_message_short">点击%1$s套餐%2$s查看您的当前套餐和其他可选套餐</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">点击%1$s添加页面%2$s创建一个新页面。</string>
     <string name="quick_start_dialog_check_stats_message_short">点击%1$s统计信息%2$s查看您站点的效果。</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">点击%1$s您的站点图标%2$s上传一个新图标</string>
     <string name="quick_start_dialog_publish_post_message">撰写并发布您的第一篇文章。</string>
     <string name="quick_start_dialog_need_help_message">我们将带您了解构建和提升站点的基本知识。</string>
     <string name="quick_start_dialog_migration_title">我们对您的清单进行了一些修改</string>
-    <string name="quick_start_dialog_create_new_page_message_short">轻按%1$s页面%2$s以继续。</string>
     <string name="quick_start_dialog_migration_message">我们添加了更多的任务，以帮助您增加受众。</string>
     <string name="quick_start_dialog_explore_plans_title">了解各个套餐</string>
     <string name="quick_start_dialog_explore_plans_message">了解付费套餐中的营销和搜索引擎优化工具。</string>
     <string name="quick_start_dialog_enable_sharing_title">启用文章共享</string>
     <string name="quick_start_dialog_enable_sharing_message">自动将新文章共享到社交媒体帐户。</string>
-    <string name="quick_start_dialog_customize_site_message">调整字体、添加图像等等。</string>
-    <string name="quick_start_dialog_create_page_title">创建新页面</string>
-    <string name="quick_start_dialog_create_page_message">添加重要内容页面，“关于”页面是不错的开始。</string>
     <string name="quick_start_dialog_check_stats_title">查看站点统计信息</string>
     <string name="quick_start_dialog_check_stats_message">及时了解您站点的效果。</string>
-    <string name="quick_start_dialog_browse_themes_title">浏览主题</string>
-    <string name="quick_start_dialog_browse_themes_message">浏览数十个布局选项，找到最适合您的选择。</string>
     <string name="quick_start_dialog_remove_next_steps_message">删除“后续步骤”将隐藏此站点中的所有导览。此操作无法撤销。</string>
     <string name="quick_start_dialog_remove_next_steps_title">删除后续步骤</string>
     <string name="quick_start_remove_next_steps_menu_title">删除此</string>
@@ -905,15 +1263,11 @@ Language: zh_CN
     <string name="notification_new_site_creation_failed">出现问题</string>
     <string name="notification_new_site_creation_title">创建站点</string>
     <string name="new_site_creation_create_site_button">创建站点</string>
-    <string name="new_site_creation_search_domain_input_hint">搜索域</string>
     <string name="new_site_creation_domain_header_subtitle">人们可以通过此域名在互联网上找到您。</string>
-    <string name="new_site_creation_domain_header_title">为您的站点选择一个域名</string>
     <string name="new_site_creation_empty_domain_list_message">没有与您的搜索内容相匹配的地址</string>
     <string name="site_creation_error_generic_subtitle">与服务器通信时出错，请重试</string>
     <string name="site_creation_error_generic_title">出现问题</string>
     <string name="site_creation_fetch_suggestions_error_unknown">出现问题</string>
-    <string name="site_creation_segments_subtitle">这帮助我们提出建议。但您永远不会被锁定 – 所有站点都在不断发展！</string>
-    <string name="site_creation_segments_title">告诉我们您想创建何种站点</string>
     <string name="new_site_creation_preview_title">您的站点已创建！</string>
     <string name="new_site_creation_screen_title_step_count">%1$d/%2$d</string>
     <string name="new_site_creation_screen_title_general">创建站点</string>
@@ -928,12 +1282,15 @@ Language: zh_CN
     <string name="toast_conflict_updating_post">正在更新文章</string>
     <string name="dialog_confirm_load_remote_post_discard_web">放弃 Web</string>
     <string name="dialog_confirm_load_remote_post_discard_local">放弃本地</string>
-    <string name="dialog_confirm_load_remote_post_body_2">本地\n在 %s保存\n\nWeb\n在 %s保存\n</string>
+    <string name="dialog_confirm_load_remote_post_body_2">本地\n已保存在 %s\n\nWeb\n已保存在 %s\n</string>
     <string name="dialog_confirm_load_remote_post_body">此文章有两个冲突的版本。请选择您想放弃的版本。\n\n</string>
     <string name="dialog_confirm_load_remote_post_title">解决同步冲突</string>
     <string name="stats_no_data_for_period">没有此时间段的数据</string>
     <string name="preference_strip_image_location">从媒体删除位置信息</string>
     <string name="stats_cannot_be_started">我们现在无法打开统计信息。请稍后重试</string>
+    <string name="gif_picker_endless_scroll_network_error">由于网络错误，无法加载某些媒体。</string>
+    <string name="gif_picker_empty_search_list">没有与您的搜索条件匹配的媒体</string>
+    <string name="gif_picker_initial_empty_text">搜索以查找要添加到您的媒体库中的 GIF 文件！</string>
     <string name="stats_author_views_label">浏览量</string>
     <string name="stats_author_label">作者</string>
     <string name="stats_authors">作者</string>
@@ -963,12 +1320,9 @@ Language: zh_CN
     <string name="stats_insights_share_post">分享文章</string>
     <string name="stats_insights_create_post">创建文章</string>
     <string name="stats_insights_latest_post_message">%2$s 已发布 %1$s。下面是该文章到目前为止的表现：</string>
-    <string name="gif_picker_empty_search_list">没有与您的搜索条件匹配的媒体</string>
-    <string name="gif_picker_initial_empty_text">搜索以查找要添加到您的媒体库中的 GIF 文件！</string>
-    <string name="gif_picker_endless_scroll_network_error">由于网络错误，无法加载某些媒体。</string>
-    <string name="stats_insights_tags_and_categories">标签或类别</string>
     <string name="stats_insights_latest_post_with_no_engagement">%2$s 已发布 %1$s。开始吧！通过分享您的文章来增加文章浏览量：</string>
     <string name="stats_insights_latest_post_empty">您尚未发布任何文章。开始发布后，此处会显示您最新文章的摘要：</string>
+    <string name="stats_insights_tags_and_categories">标签或类别</string>
     <string name="stats_insights_all_time_stats">所有时间</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">粉丝</string>
@@ -1019,8 +1373,8 @@ Language: zh_CN
     <string name="image_size_medium_label">中</string>
     <string name="image_size_thumbnail_label">缩略图</string>
     <string name="menu_history">历史记录</string>
-    <string name="pages_pending">待审核</string>
     <string name="pages_open_page_error">所选页面不可用</string>
+    <string name="pages_pending">待审核</string>
     <string name="pages_empty_trashed">您没有任何放入回收站的页面</string>
     <string name="pages_empty_scheduled">您没有任何预发布页面</string>
     <string name="pages_empty_drafts">您没有任何草稿页面</string>
@@ -1032,11 +1386,11 @@ Language: zh_CN
     <string name="pages_move_to_draft">移动到“草稿”</string>
     <string name="pages_set_parent">设置父项</string>
     <string name="pages_view">查看</string>
+    <string name="pages_trashed">回收站</string>
     <string name="pages_scheduled">预发布</string>
     <string name="pages_drafts">草稿</string>
     <string name="pages_published">已发布</string>
     <string name="login_error_sms_throttled">尝试发送短信验证码的次数太多了 - 休息一下，在一分钟后再申请新的短信验证码。</string>
-    <string name="pages_trashed">回收站</string>
     <string name="login_error_email_not_found_v2">没有与此 Google 帐户匹配的 WordPress.com 帐户。</string>
     <string name="site_picker_remove_site_empty">没有与您的搜索匹配的站点</string>
     <string name="reader_empty_followed_blogs_search_title">没有与您的搜索匹配的站点</string>
@@ -1056,46 +1410,40 @@ Language: zh_CN
     <string name="quick_start_list_create_site_title">创建站点</string>
     <string name="quick_start_list_create_site_subtitle">建立并运行您的站点。</string>
     <string name="quick_start_dialog_view_site_title">查看您的站点</string>
+    <string name="quick_start_dialog_view_site_message_short">轻按%1$s查看站点%2$s可预览您的站点</string>
     <string name="quick_start_dialog_share_site_title">分享您的站点</string>
-    <string name="quick_start_dialog_share_site_message">连接至您的社交媒体帐户 - 您的站点将自动共享新文章。</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">轻按 %1$s 分享 %2$s 并继续</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">轻按 %1$s 连接 %2$s 可添加您的社交媒体帐户</string>
-    <string name="quick_start_dialog_view_site_message_short">轻按%1$s查看站点%2$s可预览您的站点</string>
+    <string name="quick_start_dialog_share_site_message">连接至您的社交媒体帐户 - 您的站点将自动共享新文章。</string>
     <string name="quick_start_dialog_publish_post_title">发布文章</string>
+    <string name="quick_start_dialog_publish_post_message_short">轻按%1$s“创建文章”%2$s，撰写一篇新文章</string>
     <string name="quick_start_dialog_need_help_title">不知从何入手，需要一点帮助？</string>
     <string name="quick_start_dialog_need_help_button_positive">接受</string>
-    <string name="quick_start_dialog_publish_post_message_short">轻按%1$s“创建文章”%2$s，撰写一篇新文章</string>
     <string name="quick_start_dialog_need_help_button_neutral">从不</string>
-    <string name="quick_start_dialog_follow_sites_title">关注其他站点</string>
-    <string name="quick_start_dialog_customize_site_title">定制您的站点</string>
     <string name="quick_start_dialog_need_help_button_negative">不用了，谢谢</string>
-    <string name="quick_start_dialog_follow_sites_message">查找并关注您喜爱的站点，在他们发布新内容时可及时获取更新。</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">轻按%1$s“搜索”%2$s，查找具有类似兴趣的站点</string>
+    <string name="quick_start_dialog_follow_sites_title">关注其他站点</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">轻按%1$s搜索%2$s，查找具有类似兴趣的站点</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">轻按%1$s“阅读器”%2$s并继续</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">轻按%1$s“主题”%2$s并继续</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">轻按%1$s“定制”%2$s，开始个性化您的站点</string>
-    <string name="quick_start_dialog_choose_theme_title">选择主题</string>
-    <string name="quick_start_dialog_choose_theme_message">浏览我们所有的主题，寻找最适合您的主题。</string>
+    <string name="quick_start_dialog_follow_sites_message">查找并关注您喜爱的站点，在他们发布新内容时可及时获取更新。</string>
     <string name="quick_start_button_positive">前往</string>
     <string name="quick_start_button_negative_short">取消</string>
     <string name="quick_start_button_negative">现在不行</string>
-    <string name="my_site_create_new_site_title">您没有任何站点</string>
     <string name="content_description_more">更多</string>
-    <string name="quick_start_dialog_browse_themes_message_short">轻按 %1$s 主题 %2$s 可发现新主题</string>
+    <string name="my_site_create_new_site_title">您没有任何站点</string>
     <string name="reader_empty_followed_tags_title">无已关注的主题</string>
     <string name="reader_empty_followed_tags_subtitle">在此处添加主题，以查找有关您喜爱的主题的博文</string>
     <string name="login_to_to_connect_jetpack">登录用于关联 Jetpack 的 WordPress.com 帐户。</string>
     <string name="install_jetpack_retry">重试</string>
+    <string name="install_jetpack_continue">设置</string>
+    <string name="jetpack_installation_problem_message">目前无法安装 Jetpack。</string>
     <string name="jetpack_installation_problem">出现问题</string>
     <string name="jetpack_installed">已安装 Jetpack</string>
+    <string name="installing_jetpack_message">正在您的站点上安装 Jetpack。这将花费几分钟的时间才能完成。</string>
     <string name="installing_jetpack">正在安装 Jetpack</string>
+    <string name="install_jetpack_message">系统将不会存储您的网站凭据，并且仅将其用于安装 Jetpack。</string>
     <string name="install_jetpack">安装 Jetpack</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">Jetpack 常见问题解答</string>
-    <string name="install_jetpack_continue">设置</string>
-    <string name="jetpack_installation_problem_message">目前无法安装 Jetpack。</string>
-    <string name="installing_jetpack_message">正在您的站点上安装 Jetpack。这将花费几分钟的时间才能完成。</string>
-    <string name="install_jetpack_message">系统将不会存储您的网站凭据，并且仅将其用于安装 Jetpack。</string>
     <string name="stats_jetpack_connection_setup_info">要在 WordPress 站点中使用统计功能，您需要安装 Jetpack 插件。</string>
     <string name="themes_empty_list">没有与您的搜索匹配的主题</string>
     <string name="reader_label_post_search_explainer">您想要查找什么内容？</string>
@@ -1110,12 +1458,12 @@ Language: zh_CN
     <string name="people_empty_list_filtered_email_followers">尚无电子邮件粉丝</string>
     <string name="people_empty_list_filtered_followers">尚无粉丝</string>
     <string name="people_empty_list_filtered_users">尚无用户</string>
-    <string name="reader_empty_posts_liked_description">您点赞的文章将在此处显示</string>
-    <string name="reader_empty_posts_liked_title">尚无点赞内容</string>
+    <string name="reader_empty_posts_liked_description">您喜欢的文章会显示在这里</string>
+    <string name="reader_empty_posts_liked_title">暂无喜欢</string>
     <string name="reader_empty_followed_blogs_button_followed">去关注</string>
     <string name="reader_empty_followed_blogs_button_discover">发现站点</string>
     <string name="reader_empty_followed_blogs_title">无关注的站点</string>
-    <string name="notifications_empty_likes">尚无人点赞</string>
+    <string name="notifications_empty_likes">尚无喜欢</string>
     <string name="notifications_empty_followers">尚无粉丝</string>
     <string name="activity_log_limited_content_on_free_plan">由于您使用的是免费套餐，因此您的活动中显示有限的事件。</string>
     <string name="activity_log_empty_subtitle">在对站点进行更改时，您可在此处查看您的活动历史记录</string>
@@ -1140,15 +1488,13 @@ Language: zh_CN
     <string name="support_contact_email">联系人电子邮件</string>
     <string name="application_log_button">应用程序日志</string>
     <string name="my_tickets">我的工单</string>
-    <string name="activity_log_rewind_site">还原站点</string>
-    <string name="activity_log_currently_restoring_message_no_dates">正在还原</string>
-    <string name="activity_log_rewind_dialog_message">是否确定要在 %2$s 将站点还原至 %1$s？此操作将删除在此时间之后创建或更改的所有内容和选项。</string>
-    <string name="activity_log_currently_restoring_message">正在还原至 %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">恢复正在进行中</string>
+    <string name="activity_log_currently_restoring_message">正在恢复至 %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">目前正在恢复您的站点</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">已成功恢复您的站点</string>
+    <string name="activity_log_rewind_finished_snackbar_message">已成功恢复您的站点\n已恢复至 %1$s %2$s</string>
+    <string name="activity_log_rewind_started_snackbar_message">您的站点正在恢复中\n正在恢复至 %1$s %2$s</string>
     <string name="activity_log_button">活动日志操作按钮</string>
-    <string name="activity_log_rewind_finished_snackbar_message">已成功恢复您的站点\n已还原至 %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">正在恢复您的站点\n正在还原至 %1$s %2$s</string>
     <string name="plugin_auto_managed">已自动托管</string>
     <string name="reader_save_posts_locally_dialog_message">保存此文章，方便您随时回来阅读。但您只能在此设备上阅读该文章，也就是说已保存的文章不会同步到其他设备</string>
     <string name="reader_save_posts_locally_dialog_title">保存文章供稍后查看</string>
@@ -1157,24 +1503,20 @@ Language: zh_CN
     <string name="comment_read_source_post">阅读源文章</string>
     <string name="sites">站点</string>
     <string name="signup_magic_link_title">免密登录链接已发送</string>
-    <string name="signup_email_screen_title">电子邮件注册</string>
     <string name="verification_2fa_screen_title">代码验证</string>
     <string name="selfhosted_site_login_title">登录凭据</string>
     <string name="magic_link_sent_login_title">免密登录链接已发送</string>
     <string name="magic_link_login_title">使用免密登录链接登录</string>
     <string name="site_address_login_title">使用站点地址登录</string>
     <string name="email_address_login_title">使用电子邮件地址登录</string>
-    <string name="alternatively">其他方式：</string>
+    <string name="reader_empty_saved_posts_description">轻按“%s”以将文章保存到您的列表中。</string>
+    <string name="reader_empty_saved_posts_title">尚未保存任何文章！</string>
     <string name="reader_bookmark_snack_title">文章已保存</string>
     <string name="reader_bookmark_snack_btn">查看所有</string>
-    <string name="reader_btn_bookmarked">已保存</string>
-    <string name="reader_btn_bookmark">保存</string>
     <string name="reader_remove_bookmark">从已保存的文章中删除</string>
     <string name="reader_add_bookmark">添加到已保存的文章</string>
     <string name="reader_save_for_later_title">已保存的文章</string>
     <string name="removed">已删除</string>
-    <string name="reader_empty_saved_posts_title">尚未保存任何文章！</string>
-    <string name="reader_empty_saved_posts_description">轻按“%s”以将文章保存到您的列表中。</string>
     <string name="my_site_icon_content_description">更改站点图标</string>
     <string name="my_site_icon_dialog_cancel_button">取消</string>
     <string name="my_site_icon_dialog_remove_button">删除</string>
@@ -1190,11 +1532,9 @@ Language: zh_CN
     <string name="reader_btn_notifications_on">打开站点通知</string>
     <string name="reader_btn_notifications_off">关闭站点通知</string>
     <string name="activity_log_jetpack_icon">Jetpack 图标</string>
-    <string name="rewind">还原</string>
     <string name="activity_log_event">事件</string>
     <string name="activity_log_icon">活动图标</string>
     <string name="activity_log">活动日志</string>
-    <string name="activity">活动</string>
     <string name="privacy_policy_read">阅读隐私政策</string>
     <string name="third_party_policy_learn_more_caption">我们使用其他跟踪工具，其中包括来自第三方的工具。了解这些工具及其使用方法。</string>
     <string name="third_party_policy_learn_more_header">第三方政策</string>
@@ -1205,7 +1545,6 @@ Language: zh_CN
     <string name="preference_privacy_settings">隐私设置</string>
     <string name="preference_collect_information">收集信息</string>
     <string name="post_submitted">文章已提交</string>
-    <string name="login_email_button_signup">还没有帐户？%1$s注册%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">使用插件功能需要站点具有良好的信誉。</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">使用插件功能需要具有与该用户关联的主域订阅。</string>
     <string name="plugin_install_site_ineligible_non_admin_user">使用插件功能需要具有管理员权限。</string>
@@ -1249,6 +1588,7 @@ Language: zh_CN
     <string name="fab_add_tag_desc">创建标签</string>
     <string name="navigate_up_desc">向上导航</string>
     <string name="notification_settings_switch_desc">通知</string>
+    <string name="open_external_link_desc">打开外部链接</string>
     <string name="show_more_desc">显示更多</string>
     <string name="reader_photo_view_desc">照片</string>
     <string name="reader_list_item_suggestion_remove_desc">删除</string>
@@ -1269,20 +1609,19 @@ Language: zh_CN
     <string name="media_grid_item_retry_desc">重试</string>
     <string name="media_grid_item_image_desc">媒体预览，文件名：%s</string>
     <string name="invite_user_delete_desc">移除 %s</string>
-    <string name="profile_picture">%s的个人资料照片</string>
+    <string name="profile_picture">%s 的个人资料照片</string>
     <string name="comment_checkmark_desc">选中标记</string>
     <string name="signup_with_google_progress">使用 Google 注册…</string>
-    <string name="open_external_link_desc">打开外部链接</string>
     <string name="jetpack_connection_failed_with_reason">Jetpack 连接中断：%s</string>
     <string name="jetpack_already_connected_toast">您已连接至 Jetpack</string>
     <string name="menu_undo_snackbar_action">撤消</string>
+    <string name="menu_visual_mode_done_snackbar">已切换至可视模式</string>
     <string name="menu_visual_mode">可视模式</string>
+    <string name="menu_html_mode_done_snackbar">已切换至 HTML 模式</string>
     <string name="menu_html_mode">HTML 模式</string>
     <string name="menu_preview">预览</string>
     <string name="menu_save_as_draft">保存为草稿</string>
     <string name="file_size_in_terabytes">%s TB</string>
-    <string name="menu_visual_mode_done_snackbar">已切换至可视模式</string>
-    <string name="menu_html_mode_done_snackbar">已切换至 HTML 模式</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s KB</string>
@@ -1296,15 +1635,14 @@ Language: zh_CN
     <string name="comment_delete_talkback">评论已删除</string>
     <string name="comment_untrash_talkback">评论已还原</string>
     <string name="comment_trash_talkback">评论已发送至回收站</string>
-    <string name="comment_unliked_talkback">已取消对评论点赞</string>
-    <string name="comment_liked_talkback">已对评论点赞</string>
+    <string name="comment_unliked_talkback">取消喜欢评论</string>
+    <string name="comment_liked_talkback">喜欢评论</string>
     <string name="comment_unapproved_talkback">评论未获批准</string>
     <string name="comment_approved_talkback">评论已获批准</string>
     <string name="notif_detail_screen_title">通知详情：%s</string>
     <string name="edit_photo_screen_title">编辑照片</string>
     <string name="share_intent_screen_title">选择站点</string>
     <string name="signup_epilogue_screen_title">新建帐户</string>
-    <string name="login_prologue_screen_title">登录</string>
     <string name="login_epilogue_screen_title">登录身份为</string>
     <string name="person_detail_screen_title">个人详情</string>
     <string name="media_settings_screen_title">文件详情</string>
@@ -1312,12 +1650,13 @@ Language: zh_CN
     <string name="notifications_screen_title">通知</string>
     <string name="reader_screen_title">阅读器</string>
     <string name="me_section_screen_title">我</string>
+    <string name="my_site_section_screen_title">我的站点</string>
     <string name="notif_settings_screen_title">通知设置</string>
     <string name="help_screen_title">帮助与支持</string>
     <string name="license_screen_title">许可</string>
     <string name="release_notes_screen_title">版本说明</string>
     <string name="signup_epilogue_error_avatar_view">您的头像已上传，很快便会显示。</string>
-    <string name="permissions_denied_message">您似乎关闭了此功能所需的权限。&lt;br/>&lt;br/>要对此进行更改，请编辑您的权限并确保已启用&lt;strong>%s&lt;/strong>。</string>
+    <string name="permissions_denied_message">您似乎关闭了此功能所需的权限。&lt;br/&gt;&lt;br/&gt;要对此进行更改，请编辑您的权限并确保已启用&lt;strong&gt;%s&lt;/strong&gt;。</string>
     <string name="permissions_denied_title">权限</string>
     <string name="plugin_caption_featured">精选</string>
     <string name="sharing_disabled_description">您无法访问共享设置，因为共享 Jetpack 模块已禁用。</string>
@@ -1358,8 +1697,8 @@ Language: zh_CN
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">1 篇文章和 1 个文件未上传</string>
     <string name="untitled_in_parentheses">（无标题）</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f，%2$f</string>
     <string name="site_creation_domain_finish_button">创建站点</string>
+    <string name="notification_site_creation_created">轻按以继续。</string>
     <string name="notification_site_creation_title_success">站点已创建！</string>
     <string name="google_error_timeout">Google 响应时间过长。您可能需要等到网络连接状况更好时才能继续。</string>
     <string name="username_changer_title">更改用户名</string>
@@ -1371,29 +1710,20 @@ Language: zh_CN
     <string name="username_changer_dismiss_button_positive">放弃</string>
     <string name="username_changer_action">保存</string>
     <string name="content_description_add_avatar">添加头像</string>
-    <string name="signup_with_google_button">使用 Google 注册</string>
-    <string name="signup_with_email_button">使用电子邮件注册</string>
     <string name="signup_user_exists">电子邮件已注册 WordPress.com。\n继续登录。</string>
-    <string name="notification_site_creation_created">轻按以继续。</string>
     <string name="signup_updating_account">正在更新帐户…</string>
     <string name="signup_magic_link_progress">正在发送电子邮件</string>
-    <string name="signup_terms_of_service_text">注册即表示您同意我们的%1$s服务条款%2$s。</string>
     <string name="signup_magic_link_error_button_positive">重试</string>
     <string name="signup_magic_link_error_button_negative">关闭</string>
+    <string name="signup_magic_link_error">发送电子邮件时出现问题。您可以立即重试，或关闭并稍后重试。</string>
     <string name="signup_epilogue_hint_username">用户名</string>
+    <string name="signup_epilogue_hint_password_detail">通常情况下，您可以随时使用刚刚用过的链接登录，但如果您愿意，也可以设置密码。</string>
     <string name="signup_epilogue_hint_password">密码（可选）</string>
     <string name="signup_epilogue_hint_display">显示名称</string>
     <string name="signup_epilogue_error_button_positive">重试</string>
     <string name="signup_epilogue_error_button_negative">恢复</string>
     <string name="signup_epilogue_error_generic">更新帐户时出现问题。您可以重试或恢复更改以继续。</string>
     <string name="signup_epilogue_error_avatar">上传头像时出现问题。</string>
-    <string name="signup_email_header">要创建新的 WordPress.com 帐户，请输入您的电子邮件地址。</string>
-    <string name="signup_email_error_generic">检查电子邮件地址时出现问题。</string>
-    <string name="signup_magic_link_error">发送电子邮件时出现问题。您可以立即重试，或关闭并稍后重试。</string>
-    <string name="signup_epilogue_hint_password_detail">通常情况下，您可以随时使用刚刚用过的链接登录，但如果您愿意，也可以设置密码。</string>
-    <string name="sign_up">注册 WordPress.com</string>
-    <string name="enter_username_instead">使用用户名登录。</string>
-    <string name="enter_site_address_instead">通过输入您的站点地址登录。</string>
     <string name="plugin_needs_update">需要更新</string>
     <string name="plugin_caption_search">搜索插件</string>
     <string name="plugin_caption_new">新</string>
@@ -1405,7 +1735,7 @@ Language: zh_CN
     <string name="plugin_installed_failed">安装 %s 时出错</string>
     <string name="plugin_installed_successfully">已成功安装 %s</string>
     <string name="plugin_install">安装</string>
-    <string name="site_settings_like_header">赞</string>
+    <string name="site_settings_like_header">喜欢</string>
     <string name="my_site_add_new_site">添加新站点</string>
     <string name="my_site_create_new_site">为您的业务、杂志或个人博客创建新站点；或连接现有的 WordPress 站点。</string>
     <string name="notifications_jetpack_connection_setup_info">要在您的设备上接收来自 WordPress 站点的有用通知，您需要安装 Jetpack 插件。是否希望设置 Jetpack？</string>
@@ -1434,8 +1764,8 @@ Language: zh_CN
     <string name="plugin_installed_version">已安装版本 %s</string>
     <string name="plugin_version">版本 %s</string>
     <string name="plugin_byline">作者：%s</string>
-    <string name="plugin_fetch_error">无法加载插件</string>
     <string name="change_photo">更改照片</string>
+    <string name="plugin_fetch_error">无法加载插件</string>
     <string name="my_site_btn_site_pages">站点页面</string>
     <string name="site_settings_tags_hint">管理站点标签</string>
     <string name="dlg_saving_tag">正在保存</string>
@@ -1453,8 +1783,8 @@ Language: zh_CN
     <string name="site_settings_format_entry_custom">自定义</string>
     <string name="site_settings_posts_per_page_title">篇文章/页</string>
     <string name="site_settings_timezone_subtitle">选择您所处时区内的一座城市</string>
-    <string name="site_settings_time_format_title">时间格式</string>
     <string name="site_settings_timezone_title">时区</string>
+    <string name="site_settings_time_format_title">时间格式</string>
     <string name="site_settings_date_format_title">日期格式</string>
     <string name="site_settings_week_start_title">每星期开始于</string>
     <string name="site_settings_tags_title">标签</string>
@@ -1514,7 +1844,6 @@ Language: zh_CN
     <string name="login_error_suffix">\n换个账户试试?</string>
     <string name="login_error_generic">连接到 Google 帐户时出现问题。</string>
     <string name="login_error_button">关闭</string>
-    <string name="login_google_button_suffix">使用 Google 登录。</string>
     <string name="enter_wpcom_password_google">要继续使用此 Google 帐户，请提供匹配的 WordPress.com 密码。此要求仅会出现一次。</string>
     <string name="error_generic_network">发生网络错误。请检查您的连接，然后再试一次。</string>
     <string name="post_settings_remove_featured_image">删除推荐图片</string>
@@ -1526,12 +1855,11 @@ Language: zh_CN
     <string name="jetpack_disconnect_confirm">断开连接</string>
     <string name="jetpack_disconnect_confirmation_message">是否确定要断开 Jetpack 与该站点的连接？</string>
     <string name="jetpack_disconnect_pref_title">「断开与 WordPress.com 的连接」</string>
-    <string name="site_settings_jetpack_whitelist_description">您可以将一个或多个 IP 地址加入白名单，以避免 Jetpack 将其屏蔽。IPv4 和 IPv6 都支持。如要按范围指定地址，请输入最小值和最大值，并用破折号隔开。示例：12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">您可以将一个或多个 IP 地址加入白名单，以避免 Jetpack 将其屏蔽。IPv4 和 IPv6 都支持。如要按范围指定地址，请输入最小值和最大值，并用破折号隔开。示例：12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">需要两步验证</string>
     <string name="jetpack_match_wpcom_via_email_title">使用邮箱地址匹配帐户</string>
     <string name="jetpack_allow_wpcom_sign_in_title">允许通过 WordPress.com 登录</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com 登录</string>
-    <string name="jetpack_brute_force_whitelist_title">已加入白名单的 IP 地址</string>
     <string name="jetpack_prevent_brute_force_title">阻止恶意登录尝试</string>
     <string name="jetpack_prevent_brute_force_category_title">防范暴力破解攻击</string>
     <string name="jetpack_send_wp_notifications_title">发送推送通知</string>
@@ -1561,6 +1889,7 @@ Language: zh_CN
     <string name="media_edit_filename_caption">文件名</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">替代文本</string>
+    <string name="connect_site">连接站点</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">让指示灯闪烁</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">让设备振动</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">选择声音</string>
@@ -1571,12 +1900,12 @@ Language: zh_CN
     <string name="notification_settings_category_other">其他</string>
     <string name="notification_settings_item_your_sites_all_your_sites">我的所有站点</string>
     <string name="notification_settings_category_your_sites">您的站点</string>
-    <string name="notification_settings_master_off_message">关闭「通知设置」将停止接收来自此应用程序的所有通知，无论何种类型。您可以在打开「通知设置」后，对您想接收的通知类型进行精细调整。</string>
-    <string name="notification_settings_master_off_title">要在此设备上接收通知，请打开「通知设置」。</string>
-    <string name="notification_settings_master_hint_off">启用通知</string>
-    <string name="notification_settings_master_hint_on">禁用通知</string>
-    <string name="notification_settings_master_status_off">关闭</string>
-    <string name="notification_settings_master_status_on">打开</string>
+    <string name="notification_settings_main_off_message">关闭「通知设置」将停止接收来自此应用程序的所有通知，无论何种类型。您可以在打开「通知设置」后，对您想接收的通知类型进行精细调整。</string>
+    <string name="notification_settings_main_off_title">要在此设备上接收通知，请打开「通知设置」。</string>
+    <string name="notification_settings_main_hint_off">启用通知</string>
+    <string name="notification_settings_main_hint_on">禁用通知</string>
+    <string name="notification_settings_main_status_off">关闭</string>
+    <string name="notification_settings_main_status_on">打开</string>
     <string name="max_video_resolution">视频大小上限</string>
     <string name="max_thumbnail_px_size">图片大小上限</string>
     <string name="error_upload_post_media_param">上传这篇文章中的媒体时出错：%s。</string>
@@ -1585,14 +1914,14 @@ Language: zh_CN
     <string name="reader_excerpt_link">访问 %s 了解更多</string>
     <string name="error_unknown_page">服务器上无法找到此页面</string>
     <string name="error_publish_empty_page">不能发布空页</string>
-    <string name="upload_failed_param">「%s」上传失败</string>
+    <string name="upload_failed_param">“%s”上传失败</string>
     <string name="cannot_retry_deleted_media_item">媒体已被删除。是否从这篇文章中删除？</string>
     <string name="error_please_choose_browser">打开默认 web 浏览器出错。请选择其他应用:</string>
     <string name="cant_open_url">无法打开链接</string>
     <string name="error_unknown_post">服务器上无法找到此文章</string>
     <string name="error_post_does_not_exist">此文章已不存在</string>
     <string name="error_media_canceled">已取消上传媒体</string>
-    <string name="error_upload_page_media_param">上传此页面中的媒体时出错: %s。</string>
+    <string name="error_upload_page_media_param">上传此页面中的媒体时出错：%s。</string>
     <string name="error_upload_page_param">上传此页面时出错: %s.</string>
     <string name="editor_uploading_post">您的文章正在上传</string>
     <string name="uploading_media">正在上传媒体…</string>
@@ -1613,18 +1942,17 @@ Language: zh_CN
     <string name="login_site_address_more_help">需要更多帮助？</string>
     <string name="login_site_address_help_content">在您使用 Chrome 访问自己的站点时，站点地址显示在屏幕顶部的地址栏中。</string>
     <string name="login_site_address_help_title">我的站点地址是什么？</string>
-    <string name="login_site_address_help">查找站点地址时需要帮助？</string>
     <string name="login_site_address">站点地址</string>
     <string name="enter_site_address">输入您要连接的 WordPress 站点的地址。</string>
     <string name="login_already_logged_in_wpcom">已经登录 WordPress.com</string>
     <string name="login_continue">继续</string>
+    <string name="connect_more">连接其他站点</string>
     <string name="enter_wpcom_password">输入您的 WordPress.com 密码。</string>
     <string name="login_magic_link_email_requesting">正在请求登录电子邮件</string>
     <string name="password_incorrect">密码似乎不对。请仔细检查您的信息，然后再试一次。</string>
     <string name="requesting_otp">正在请求短信验证码。</string>
     <string name="login_text_otp">通过短信向我发送代码</string>
     <string name="enter_verification_code">马上就好！请输入验证器应用中的验证码。</string>
-    <string name="open_mail">打开邮箱</string>
     <string name="next">下一步</string>
     <string name="enter_email_wordpress_com">使用电子邮件地址登录 WordPress.com 以便管理您的所有 WordPress 站点。</string>
     <string name="image_optimization_promo_desc">图片优化可缩小图片以便更快地上传。\n\n您可以随时在站点设置中更改此选项。</string>
@@ -1647,10 +1975,6 @@ Language: zh_CN
     <string name="post_status_draft">草稿</string>
     <string name="post_status_pending_review">待审核</string>
     <string name="post_status_publish_post">发布</string>
-    <string name="change_location">更改位置</string>
-    <string name="remove_location">删除位置</string>
-    <string name="post_settings_error_placepicker_missing_play_services">无法打开位置选取器，「Google Play 服务」不可用</string>
-    <string name="post_settings_location">位置</string>
     <string name="now">现在</string>
     <string name="post_settings_password_dialog_hint">只有知道此密码的用户才能查看这篇文章</string>
     <string name="post_settings_excerpt_dialog_hint">摘录是您内容的概要，可以手动编写，也可自动生成。</string>
@@ -1699,20 +2023,20 @@ Language: zh_CN
     <string name="cannot_connect_account_error">由于未选择任何帐户，因此无法建立 %s 连接。</string>
     <string name="connected">已连接</string>
     <string name="twitter">Twitter</string>
-    <string name="likes">赞</string>
-    <string name="sharing_comment_likes_description">允许所有评论被您或读者点赞</string>
+    <string name="likes">喜欢</string>
+    <string name="sharing_comment_likes_description">允许所有评论被您和您的读者喜欢。</string>
     <string name="buttons">按钮</string>
     <string name="sharing_edit_more_buttons">编辑「更多」按钮</string>
     <string name="sharing_more_description">「更多」按钮包含显示分享按钮的下拉菜单</string>
     <string name="sharing_sharing_buttons_description">选择要在您的文章下方显示的按钮</string>
     <string name="twitter_username">Twitter 用户名</string>
-    <string name="sharing_comment_likes">评论点赞</string>
+    <string name="sharing_comment_likes">评论与喜欢</string>
     <string name="button_style">按钮风格</string>
     <string name="label">标签</string>
     <string name="sharing_buttons">分享按钮</string>
-    <string name="site_settings_like">显示「赞」按钮</string>
+    <string name="site_settings_like">显示「喜欢」按钮</string>
     <string name="site_settings_reblog">显示「转载」按钮</string>
-    <string name="site_settings_reblog_and_like_header">转载 &amp; 点赞</string>
+    <string name="site_settings_reblog_and_like_header">转载 &amp; 喜欢</string>
     <string name="official_buttons_display">官方按钮</string>
     <string name="text_only_display">仅显示文字</string>
     <string name="icon_only_display">仅显示图标</string>
@@ -1780,11 +2104,11 @@ Language: zh_CN
     <string name="media_encoder_quality_85">中</string>
     <string name="media_encoder_quality_80">低</string>
     <string name="media_upload_state_uploaded">已上传</string>
+    <string name="media_upload_state_failed">上传失败</string>
     <string name="media_upload_state_deleted">已删除</string>
     <string name="media_upload_state_deleting">正在删除</string>
     <string name="media_upload_state_uploading">正在上传</string>
     <string name="media_upload_state_queued">在排队</string>
-    <string name="media_upload_state_failed">上传失败</string>
     <string name="image_quality">图片质量</string>
     <string name="error_all_media_upload_canceled">由于发生未知错误，所有媒体上传均已取消。请重新尝试上传</string>
     <string name="error_unknown_post_type">未知文章格式</string>
@@ -1816,23 +2140,23 @@ Language: zh_CN
     <string name="reader_err_get_post_not_authorized_signin_fallback">您未被授权查看这篇文章。请尝试先登录 WordPress.com，或可以使用顶部的操作按钮打开浏览器。</string>
     <string name="reader_err_get_post_not_authorized_signin">您未被授权查看这篇文章。请尝试先登录 WordPress.com。</string>
     <string name="reader_err_get_post_not_authorized_fallback">您未被授权查看这篇文章。请使用顶部的操作按钮打开浏览器。</string>
-    <string name="reader_snackbar_err_cannot_like_post_logged_out">未登录 WordPress.com 时不能点赞</string>
-    <string name="reader_toast_err_already_liked">您已经为这条评论点过赞</string>
+    <string name="reader_snackbar_err_cannot_like_post_logged_out">未登录WordPress.com无法喜欢。</string>
+    <string name="reader_toast_err_already_liked">您已经喜欢此评论</string>
     <string name="reader_toast_err_comment_not_found">评论未找到！</string>
-    <string name="reader_toast_err_cannot_like_post">对此文章点赞失败</string>
+    <string name="reader_toast_err_cannot_like_post">无法喜欢此文章</string>
     <string name="error_notif_q_action_reply">无法回复评论。请稍后重试。</string>
     <string name="error_notif_q_action_approve">无法批准评论。请稍后重试。</string>
-    <string name="error_notif_q_action_like">无法为评论点赞。请稍后重试。</string>
+    <string name="error_notif_q_action_like">无法喜欢此评论。请稍后再试。</string>
     <string name="notifications_label_new_notifications_subtitle">点击显示</string>
     <string name="notifications_label_new_notifications">新通知</string>
     <string name="comment_q_action_replying">正在回复…</string>
     <string name="comment_q_action_approving">正在批准…</string>
-    <string name="comment_q_action_liking">正在点赞…</string>
+    <string name="comment_q_action_liking">正在喜欢…</string>
     <string name="comment_q_action_processing">正在处理…</string>
     <string name="comment_q_action_done_generic">操作完成！</string>
-    <string name="sign_in_wpcom">登录到 WordPress.com</string>
-    <string name="comment_liked">已对评论点赞</string>
+    <string name="comment_liked">喜欢评论</string>
     <string name="signout">退出</string>
+    <string name="sign_in_wpcom">登录到 WordPress.com</string>
     <string name="reader_label_global_related_posts">WordPress.com 上的更多内容</string>
     <string name="reader_label_local_related_posts">%s 中的更多内容</string>
     <string name="preference_open_device_settings">打开设备设置</string>
@@ -1842,68 +2166,64 @@ Language: zh_CN
     <string name="invite_already_a_member">%s：已经是会员</string>
     <string name="invite_username_not_found">%s：没有找到用户</string>
     <string name="comment_moderated_approved">评论已批准！</string>
-    <string name="like">赞</string>
+    <string name="like">喜欢</string>
     <string name="timespan_now">现在</string>
-    <string name="role_follower">粉丝</string>
     <string name="role_viewer">查看者</string>
+    <string name="role_follower">粉丝</string>
     <string name="error_post_my_profile_no_connection">网络未连接，无法保存您的个人资料</string>
-    <string name="alignment_none">无</string>
-    <string name="alignment_left">左</string>
     <string name="alignment_right">右</string>
+    <string name="alignment_left">左</string>
+    <string name="alignment_none">无</string>
     <string name="site_settings_list_editor_action_mode_title">已选择 %1$d</string>
     <string name="error_fetch_users_list">无法检索站点用户</string>
-    <string name="people_fetching">正在获取用户…</string>
-    <string name="title_follower">粉丝</string>
     <string name="title_email_follower">电子邮件粉丝</string>
-    <string name="people_dropdown_item_email_followers">电子邮件粉丝</string>
+    <string name="title_follower">粉丝</string>
+    <string name="people_fetching">正在获取用户…</string>
     <string name="people_dropdown_item_viewers">查看者</string>
+    <string name="people_dropdown_item_email_followers">电子邮件粉丝</string>
     <string name="people_dropdown_item_followers">粉丝</string>
     <string name="people_dropdown_item_team">团队</string>
     <string name="invite_message_usernames_limit">最多可邀请 10 个电子邮件地址和/或 WordPress.com 用户名。没有用户名的人将收到有关如何创建用户名的说明。</string>
     <string name="viewer_remove_confirmation_message">如果删除该查看者，他或她将无法访问此站点。\n\n是否仍要删除该查看者？</string>
     <string name="follower_remove_confirmation_message">如果删除该粉丝，则此人将不会再收到关于此站点的通知，除非其重新关注此站点。\n\n是否仍要删除该粉丝？</string>
     <string name="follower_subscribed_since">从 %1$s开始</string>
-    <string name="error_remove_follower">无法删除粉丝</string>
     <string name="error_remove_viewer">无法删除查看者</string>
+    <string name="error_remove_follower">无法删除粉丝</string>
     <string name="error_fetch_email_followers_list">无法检索站点电子邮件粉丝</string>
     <string name="error_fetch_followers_list">无法检索站点粉丝</string>
     <string name="editor_failed_uploads_switch_html">部分媒体上传失败。在此状态下，您无法切换\n到 HTML 模式。删除所有失败的上传并继续？</string>
-    <string name="image_settings_save_toast">更改已保存</string>
-    <string name="image_caption">标题</string>
-    <string name="image_link_to">链接到</string>
     <string name="image_width">宽度</string>
+    <string name="image_link_to">链接到</string>
+    <string name="image_caption">标题</string>
+    <string name="image_settings_save_toast">更改已保存</string>
     <string name="image_settings_dismiss_dialog_title">放弃未保存的更改？</string>
     <string name="stop_upload_dialog_title">停止上传？</string>
+    <string name="tap_to_try_again">轻按即可重试！</string>
     <string name="invite_sent">已成功发送邀请</string>
     <string name="invite_error_for_username">%1$s：%2$s</string>
     <string name="invite_error_some_failed">邀请已发送但发生错误!</string>
-    <string name="tap_to_try_again">轻按即可重试！</string>
     <string name="invite_error_sending">尝试发送邀请时发生错误!</string>
     <string name="invite_error_invalid_usernames_multiple">无法发送: 存在无效的用户名或邮箱地址</string>
     <string name="invite_error_invalid_usernames_one">无法发送: 用户名或邮箱地址无效</string>
     <string name="invite_error_no_usernames">请添加至少一个用户名</string>
-    <string name="invite_message_info">（可选）您最多可以在用户邀请函中输入 500 个字符的自定义消息。</string>
-    <string name="invite_message_remaining_other">剩余 %d 个字符</string>
-    <string name="invite_message_remaining_one">剩余 1 个字符</string>
-    <string name="invite_message_remaining_zero">剩余 0 个字符</string>
     <string name="invite_message_title">自定义消息</string>
     <string name="invite">邀请</string>
-    <string name="invite_names_title">用户名或电子邮件地址</string>
-    <string name="send_link">发送链接</string>
-    <string name="my_site_header_external">外部</string>
+    <string name="invite_names_title">用户名或邮箱</string>
     <string name="invite_people">邀请用户</string>
+    <string name="my_site_header_external">外部</string>
     <string name="label_clear_search_history">清除搜索历史记录</string>
     <string name="dlg_confirm_clear_search_history">清除搜索历史记录？</string>
     <string name="reader_empty_search_description">未找到与您的语言对应的符合“%s”搜索条件的结果</string>
     <string name="reader_hint_post_search">搜索 WordPress</string>
+    <string name="reader_title_related_post_detail">相关文章</string>
     <string name="preview_screen_links_disabled">预览屏幕禁用链接</string>
     <string name="send">发送</string>
     <string name="person_removed">已成功移除 %1$s</string>
     <string name="user_remove_confirmation_message">如果您移除 %1$s，该用户将无法访问此站点，但 %1$s 所创建的所有内容仍将保留在站内。\n\n是否仍要移除该用户?</string>
     <string name="person_remove_confirmation_title">删除 %1$s</string>
-    <string name="reader_empty_posts_in_custom_list">此列表中的站点最近未发布任何内容</string>
-    <string name="people">人员</string>
     <string name="role">角色</string>
+    <string name="people">人员</string>
+    <string name="reader_empty_posts_in_custom_list">此列表中的站点最近未发布任何内容</string>
     <string name="error_remove_user">无法删除用户</string>
     <string name="error_update_role">无法更新用户角色</string>
     <string name="error_fetch_viewers_list">无法获取站点查看数</string>
@@ -1914,17 +2234,16 @@ Language: zh_CN
     <string name="checking_email">检查电子邮件地址</string>
     <string name="magic_link_unavailable_error_message">目前不可用。请输入密码</string>
     <string name="logging_in">正在登录</string>
-    <string name="enter_your_password_instead">改为输入密码</string>
     <string name="web_address_dialog_hint">公开显示您的评论。</string>
     <string name="capture_or_pick_photo">拍摄或选择照片</string>
-    <string name="export_your_content_message">系统会将您的文章、页面和设置发送到以下电子邮件地址：%s。</string>
-    <string name="plan">套餐</string>
     <string name="plans">套餐</string>
+    <string name="plan">套餐</string>
+    <string name="export_your_content_message">系统会将您的文章、页面和设置发送到以下电子邮件地址：%s。</string>
     <string name="export_your_content">导出您的内容</string>
-    <string name="exporting_content_progress">正在导出内容…</string>
     <string name="export_email_sent">导出已发送的电子邮件！</string>
-    <string name="show_purchases">显示购买交易</string>
+    <string name="exporting_content_progress">正在导出内容…</string>
     <string name="checking_purchases">查看购买交易</string>
+    <string name="show_purchases">显示购买交易</string>
     <string name="premium_upgrades_message">您的站点尚有活动的高级套餐。删除站点前，请先取消套餐。</string>
     <string name="premium_upgrades_title">高级套餐升级</string>
     <string name="purchases_request_error">出现错误。无法请求购买交易。</string>
@@ -1934,48 +2253,49 @@ Language: zh_CN
     <string name="primary_domain">主域</string>
     <string name="error_deleting_site_summary">删除您的站点时出现错误。请联系支持人员，获取更多帮助。</string>
     <string name="error_deleting_site">删除站点时出错</string>
-    <string name="confirm_delete_site_prompt">请在下列字段中输入 %1$s，进行确认。之后，您的站点将不复存在。</string>
     <string name="site_settings_export_content_title">导出内容</string>
+    <string name="confirm_delete_site_prompt">请在下列字段中输入 %1$s，进行确认。之后，您的站点将不复存在。</string>
     <string name="confirm_delete_site">确认删除站点</string>
+    <string name="contact_support">联系支持人员</string>
     <string name="start_over_text">如果您想留下某个站点，但不想保留其中现有的任何文章和页面，我们的支持团队可以为您删除相关文章、页面、媒体以及评论。\n\n这不会影响您站点和 URL 的有效性，还能让您重新开始创建内容。联系我们即可清除当前所有内容。</string>
-    <string name="site_settings_start_over_hint">从头开始构建您的站点</string>
     <string name="let_us_help">让我们助您一臂之力</string>
-    <string name="me_btn_app_settings">应用程序设置</string>
+    <string name="site_settings_start_over_hint">从头开始构建您的站点</string>
     <string name="start_over">从头开始</string>
+    <string name="me_btn_app_settings">应用程序设置</string>
     <string name="editor_remove_failed_uploads">删除上传失败的内容</string>
     <string name="site_settings_advanced_header">高级</string>
     <string name="comments_empty_list_filtered_trashed">无已移至回收站的评论</string>
     <string name="comments_empty_list_filtered_pending">无待审评论</string>
     <string name="comments_empty_list_filtered_approved">无已批准的评论</string>
     <string name="xmlrpc_missing_method_error">无法连接。服务器上没有所需的 XML-RPC 方法。</string>
-    <string name="post_format_status">状态</string>
-    <string name="post_format_video">视频</string>
     <string name="alignment_center">居中</string>
-    <string name="post_format_chat">聊天</string>
-    <string name="post_format_gallery">图库</string>
-    <string name="post_format_link">链接</string>
-    <string name="post_format_quote">引用</string>
+    <string name="post_format_video">视频</string>
+    <string name="post_format_status">状态</string>
     <string name="post_format_standard">标准</string>
+    <string name="post_format_quote">引用</string>
+    <string name="post_format_link">链接</string>
     <string name="post_format_image">图片</string>
-    <string name="notif_events">有关 WordPress.com 课程和活动（在线和现场）的信息。</string>
-    <string name="post_format_aside">旁白</string>
+    <string name="post_format_gallery">图库</string>
+    <string name="post_format_chat">聊天</string>
     <string name="post_format_audio">音频</string>
+    <string name="post_format_aside">旁白</string>
+    <string name="notif_events">有关 WordPress.com 课程和活动（在线和现场）的信息。</string>
     <string name="notif_surveys">参加 WordPress.com 研究和调查的机会。</string>
     <string name="notif_tips">有关畅享 WordPress.com 的提示。</string>
     <string name="notif_community">社区</string>
-    <string name="replies_to_my_comments">我的评论收到的回复</string>
-    <string name="notif_suggestions">建议</string>
     <string name="notif_research">研究</string>
-    <string name="site_achievements">站点成就</string>
+    <string name="notif_suggestions">建议</string>
+    <string name="replies_to_my_comments">我的评论收到的回复</string>
     <string name="username_mentions">用户名提到的次数</string>
-    <string name="likes_on_my_posts">我的文章收到的赞</string>
+    <string name="site_achievements">站点成就</string>
     <string name="site_follows">站点关注人数</string>
-    <string name="likes_on_my_comments">我的评论收到的赞</string>
+    <string name="likes_on_my_posts">我的文章收到的喜欢</string>
+    <string name="likes_on_my_comments">我的评论收到的喜欢</string>
     <string name="comments_on_my_site">我的站点上的评论</string>
     <string name="site_settings_list_editor_summary_other">%d 个条目</string>
     <string name="site_settings_list_editor_summary_one">1 个条目</string>
-    <string name="approve_auto_if_previously_approved">已知用户的评论</string>
     <string name="approve_auto">所有用户</string>
+    <string name="approve_auto_if_previously_approved">已知用户的评论</string>
     <string name="approve_manual">没有评论</string>
     <string name="site_settings_paging_summary_other">每页 %d 条评论</string>
     <string name="site_settings_paging_summary_one">每页 1 条评论</string>
@@ -1985,11 +2305,11 @@ Language: zh_CN
     <string name="detail_approve_auto">自动批准每个人的评论。</string>
     <string name="detail_approve_auto_if_previously_approved">如果用户已有获得批准的评论，则自动批准该用户的其他评论</string>
     <string name="detail_approve_manual">每个人的评论都需要进行人工审核。</string>
-    <string name="days_quantity_one">1 天</string>
     <string name="days_quantity_other">%d 天</string>
-    <string name="pending_email_change_snackbar">单击发送给 %1$s 的电子邮件中的验证链接以确认您的新地址</string>
-    <string name="primary_site">主站点</string>
+    <string name="days_quantity_one">1 天</string>
     <string name="web_address">网址</string>
+    <string name="primary_site">主站点</string>
+    <string name="pending_email_change_snackbar">单击发送给 %1$s 的电子邮件中的验证链接以确认您的新地址</string>
     <string name="editor_toast_uploading_please_wait">您目前正在上传媒体。请等待，直到此任务完成。</string>
     <string name="error_refresh_comments_showing_older">目前无法刷新评论 – 显示的是旧评论</string>
     <string name="post_settings_set_featured_image">设置特色图片</string>
@@ -1998,13 +2318,13 @@ Language: zh_CN
     <string name="dlg_sure_to_delete_comments">是否永久删除这些评论？</string>
     <string name="dlg_sure_to_delete_comment">是否永久删除该评论？</string>
     <string name="mnu_comment_delete_permanently">删除</string>
-    <string name="comment_deleted_permanently">已删除评论</string>
     <string name="mnu_comment_untrash">恢复</string>
+    <string name="comment_deleted_permanently">已删除评论</string>
     <string name="comments_empty_list_filtered_spam">无垃圾评论</string>
-    <string name="could_not_load_page">无法加载页面</string>
     <string name="comment_status_all">全部</string>
-    <string name="interface_language">界面语言</string>
+    <string name="could_not_load_page">无法加载页面</string>
     <string name="off">关闭</string>
+    <string name="interface_language">界面语言</string>
     <string name="about_the_app">关于该应用程序</string>
     <string name="error_post_account_settings">无法保存您的帐户设置</string>
     <string name="error_fetch_account_settings">无法检索您的帐户设置</string>
@@ -2012,20 +2332,20 @@ Language: zh_CN
     <string name="site_settings_unknown_language_code_error">无法识别语言代码</string>
     <string name="site_settings_threading_dialog_description">允许在线程中嵌入评论。</string>
     <string name="site_settings_threading_dialog_header">线程级数上限</string>
+    <string name="disabled">禁用</string>
     <string name="search">搜索</string>
     <string name="remove">移除</string>
-    <string name="disabled">禁用</string>
     <string name="site_settings_image_original_size">原始大小</string>
     <string name="privacy_private">您的站点仅对您以及您审核通过的用户可见</string>
     <string name="privacy_public_not_indexed">您的站点对所有人可见，但要求搜索引擎不将其编入索引</string>
     <string name="privacy_public">您的站点对所有人可见，并且可以被搜索引擎编入索引</string>
     <string name="about_me_hint">有关您的一些字词…</string>
-    <string name="public_display_name_hint">显示名称（如果未设置）将默认为您的用户名</string>
     <string name="about_me">关于我</string>
+    <string name="public_display_name_hint">显示名称（如果未设置）将默认为您的用户名</string>
     <string name="public_display_name">公开显示名称</string>
-    <string name="my_profile">我的个人资料</string>
-    <string name="first_name">名字</string>
     <string name="last_name">姓氏</string>
+    <string name="first_name">名字</string>
+    <string name="my_profile">我的个人资料</string>
     <string name="cd_related_post_preview_image">相关文章预览图片</string>
     <string name="error_post_remote_site_settings">无法保存站点信息</string>
     <string name="error_fetch_remote_site_settings">无法检索站点信息</string>
@@ -2034,7 +2354,7 @@ Language: zh_CN
     <string name="site_settings_paging_dialog_description">将评论线程划分到多个页面。</string>
     <string name="site_settings_paging_dialog_header">每个页面上的评论</string>
     <string name="site_settings_close_after_dialog_title">关闭评论</string>
-    <string name="site_settings_blacklist_description">如果评论的内容、名称、URL、电子邮件或 IP 中包含其中任意字词，则评论会被标记为垃圾内容。您可输入部分字词，这样，输入「press」将匹配出「WordPress」。</string>
+    <string name="site_settings_denylist_description">如果评论的内容、名称、URL、电子邮箱地址或 IP 中包含其中任意字词，则评论会被标记为垃圾内容。您可输入部分字词，例如输入「press」将匹配出「WordPress」。</string>
     <string name="site_settings_hold_for_moderation_description">如果评论的内容、名称、URL、电子邮件或 IP 中包含其中任意字词，则评论会保留在审核队列中。您可输入部分字词，这样，输入「press」将匹配出「WordPress」。</string>
     <string name="site_settings_list_editor_input_hint">输入一个单词或短语</string>
     <string name="site_settings_list_editor_no_items_text">无菜单项</string>
@@ -2049,10 +2369,10 @@ Language: zh_CN
     <string name="site_settings_rp_show_header_title">显示标题</string>
     <string name="site_settings_rp_switch_summary">「相关文章」在您的文章下方显示您站点中的相关内容。</string>
     <string name="site_settings_rp_switch_title">显示相关文章</string>
-    <string name="site_settings_blacklist_hint">将与过滤器匹配的评论标记为垃圾内容</string>
+    <string name="site_settings_denylist_hint">将与过滤器匹配的评论标记为垃圾内容</string>
     <string name="site_settings_moderation_hold_hint">将与过滤器匹配的评论置于审核队列</string>
     <string name="site_settings_multiple_links_hint">忽略来自已知用户的链接限制</string>
-    <string name="site_settings_whitelist_hint">评论作者必须已有审核通过的评论</string>
+    <string name="site_settings_allowlist_hint">评论者先前须有评论通过了审核</string>
     <string name="site_settings_user_account_required_hint">用户必须已注册并登录才能评论</string>
     <string name="site_settings_identity_required_hint">评论作者必须填写名称和电子邮件</string>
     <string name="site_settings_paging_hint">以指定大小的数据块显示评论</string>
@@ -2075,19 +2395,18 @@ Language: zh_CN
     <string name="site_settings_address_hint">目前不支持更改地址</string>
     <string name="site_settings_tagline_hint">介绍您的博客的简短说明或夺人眼球的短语</string>
     <string name="site_settings_title_hint">以简洁的话语介绍此站点的内容</string>
-    <string name="site_settings_whitelist_known_summary">来自已知用户的评论</string>
-    <string name="site_settings_whitelist_all_summary">来自所有用户的评论</string>
+    <string name="site_settings_allowlist_known_summary">来自已知用户的评论</string>
+    <string name="site_settings_allowlist_all_summary">来自所有用户的评论</string>
     <string name="site_settings_threading_summary">%d个级别</string>
     <string name="site_settings_privacy_private_summary">私密</string>
     <string name="site_settings_privacy_hidden_summary">已隐藏</string>
-    <string name="site_settings_delete_site_title">删除站点</string>
     <string name="site_settings_privacy_public_summary">公开</string>
-    <string name="site_settings_blacklist_title">黑名单</string>
+    <string name="site_settings_delete_site_title">删除站点</string>
     <string name="site_settings_moderation_hold_title">保持审核状态</string>
     <string name="site_settings_multiple_links_title">评论中的链接</string>
-    <string name="site_settings_whitelist_title">自动审核</string>
-    <string name="site_settings_threading_title">线程</string>
+    <string name="site_settings_allowlist_title">自动批准</string>
     <string name="site_settings_paging_title">分页</string>
+    <string name="site_settings_threading_title">线程</string>
     <string name="site_settings_sort_by_title">排序方式</string>
     <string name="site_settings_account_required_title">用户必须登录</string>
     <string name="site_settings_identity_required_title">必须包括名称和电子邮件</string>
@@ -2097,22 +2416,22 @@ Language: zh_CN
     <string name="site_settings_default_format_title">默认格式</string>
     <string name="site_settings_default_category_title">默认类别</string>
     <string name="site_settings_address_title">地址</string>
-    <string name="site_settings_title_title">站点标题</string>
     <string name="site_settings_tagline_title">标语</string>
+    <string name="site_settings_title_title">站点标题</string>
     <string name="site_settings_discussion_new_posts_header">默认用于新文章</string>
-    <string name="site_settings_account_header">帐户</string>
     <string name="site_settings_writing_header">撰写</string>
-    <string name="newest_first">最新评论在先</string>
+    <string name="site_settings_account_header">帐户</string>
     <string name="site_settings_general_header">常规</string>
-    <string name="discussion">讨论</string>
-    <string name="privacy">隐私</string>
-    <string name="related_posts">相关文章</string>
-    <string name="comments">评论</string>
-    <string name="close_after">在指定天数后关闭</string>
+    <string name="newest_first">最新评论在先</string>
     <string name="oldest_first">最早评论在先</string>
+    <string name="close_after">在指定天数后关闭</string>
+    <string name="comments">评论</string>
+    <string name="related_posts">相关文章</string>
+    <string name="privacy">隐私</string>
+    <string name="discussion">讨论</string>
     <string name="media_error_no_permission_upload">您无权向此站点上传媒体文件</string>
-    <string name="never">从不</string>
     <string name="unknown">未知</string>
+    <string name="never">从不</string>
     <string name="reader_err_get_post_not_found">此文章不再存在</string>
     <string name="reader_err_get_post_not_authorized">您不具备查看此文章的权限</string>
     <string name="reader_err_get_post_generic">无法检索这篇文章</string>
@@ -2124,22 +2443,22 @@ Language: zh_CN
     <string name="theme_activation_error">出现错误。无法激活主题</string>
     <string name="theme_by_author_prompt_append">作者：%1$s</string>
     <string name="theme_prompt">感谢您选择 %1$s</string>
-    <string name="theme_try_and_customize">尝试与定制</string>
-    <string name="theme_view">查看</string>
-    <string name="theme_details">详细信息</string>
-    <string name="theme_support">支持</string>
-    <string name="theme_done">完成</string>
     <string name="theme_manage_site">管理站点</string>
+    <string name="theme_done">完成</string>
+    <string name="theme_support">支持</string>
+    <string name="theme_details">详细信息</string>
+    <string name="theme_view">查看</string>
+    <string name="theme_try_and_customize">尝试与定制</string>
     <string name="theme_activate">激活</string>
-    <string name="current_theme">当前主题</string>
-    <string name="customize">定制</string>
-    <string name="details">详细信息</string>
-    <string name="support">支持</string>
     <string name="active">已激活</string>
-    <string name="post_published">文章已发布</string>
-    <string name="page_published">页面已发布</string>
-    <string name="post_updated">文章已更新</string>
+    <string name="support">支持</string>
+    <string name="details">详细信息</string>
+    <string name="customize">定制</string>
+    <string name="current_theme">当前主题</string>
     <string name="page_updated">页面已更新</string>
+    <string name="post_updated">文章已更新</string>
+    <string name="page_published">页面已发布</string>
+    <string name="post_published">文章已发布</string>
     <string name="theme_no_search_result_found">抱歉，找不到主题。</string>
     <string name="reader_label_gap_marker">加载更多文章</string>
     <string name="notifications_no_search_results">没有符合「%s」条件的站点</string>
@@ -2158,9 +2477,10 @@ Language: zh_CN
     <string name="reader_discover_attribution_blog">最初发布在 %s 上</string>
     <string name="reader_discover_attribution_author">最初由%s发布</string>
     <string name="reader_discover_attribution_author_and_blog">最初由%1$s发布在 %2$s 上</string>
-    <string name="reader_short_like_count_multi">%s 个赞</string>
-    <string name="reader_short_like_count_one">1 个赞</string>
+    <string name="reader_short_like_count_multi">%s 喜欢</string>
+    <string name="reader_short_like_count_one">1 喜欢</string>
     <string name="reader_short_like_count_none">顶</string>
+    <string name="reader_label_follow_count">%,d 个粉丝</string>
     <string name="reader_menu_tags">编辑主题和站点</string>
     <string name="reader_title_post_detail">读者文章</string>
     <string name="notifications_push_summary">关于出现在设备上的通知的设置。</string>
@@ -2169,7 +2489,7 @@ Language: zh_CN
     <string name="notifications_disabled">应用程序通知已禁用。轻按此处以在「设置」中将其启用。</string>
     <string name="notification_types">通知类型</string>
     <string name="error_loading_notifications">无法加载通知设置</string>
-    <string name="comment_likes">评论赞数</string>
+    <string name="comment_likes">评论喜欢</string>
     <string name="app_notifications">应用程序通知</string>
     <string name="email">电子邮件</string>
     <string name="notifications_tab">「通知」选项卡</string>
@@ -2177,281 +2497,280 @@ Language: zh_CN
     <string name="stats_insights_latest_post_summary">最新的文章摘要</string>
     <string name="connectionbar_no_connection">无连接</string>
     <string name="post_trashed">文章已放入回收站</string>
-    <string name="button_stats">统计信息</string>
     <string name="button_trash">放入回收站</string>
+    <string name="button_stats">统计信息</string>
     <string name="button_preview">预览</string>
     <string name="button_view">查看</string>
-    <string name="button_edit">编辑</string>
     <string name="button_publish">发布</string>
+    <string name="button_edit">编辑</string>
     <string name="reader_toast_err_follow_blog_not_authorized">您无权访问此站点</string>
     <string name="reader_toast_err_follow_blog_not_found">找不到此站点</string>
     <string name="undo">撤消</string>
     <string name="push_auth_expired">请求已过期。请登录 WordPress.com 再试一次。</string>
-    <string name="stats_insights_best_ever">最受欢迎的文章</string>
     <string name="ignore">忽略</string>
+    <string name="stats_insights_best_ever">最受欢迎的文章</string>
     <string name="stats_insights_today">今日统计</string>
     <string name="stats_insights_all_time">全时段的文章篇数、阅读次数和访客人数</string>
     <string name="stats_insights">见解</string>
     <string name="me_disconnect_from_wordpress_com">退出 WordPress.com</string>
-    <string name="me_btn_login_logout">登录/退出</string>
     <string name="me_connect_to_wordpress_com">登录 WordPress.com</string>
+    <string name="me_btn_login_logout">登录/退出</string>
     <string name="me_btn_support">帮助与支持</string>
     <string name="account_settings">帐户设置</string>
     <string name="site_picker_cant_hide_current_site">「%s」未隐藏，因为它是当前站点</string>
     <string name="site_picker_create_wpcom">创建 WordPress.com 站点</string>
     <string name="site_picker_add_self_hosted">添加自托管站点</string>
-    <string name="site_picker_edit_visibility">显示/隐藏站点</string>
     <string name="site_picker_add_site">添加新站点</string>
-    <string name="my_site_btn_view_admin">查看管理员</string>
-    <string name="my_site_btn_view_site">查看站点</string>
+    <string name="site_picker_edit_visibility">显示/隐藏站点</string>
     <string name="site_picker_title">选择站点</string>
-    <string name="my_site_btn_switch_site">转换站点</string>
-    <string name="my_site_btn_blog_posts">博客文章</string>
+    <string name="my_site_btn_view_site">查看站点</string>
+    <string name="my_site_btn_view_admin">查看管理员</string>
+    <string name="my_site_btn_switch_site">切换站点</string>
     <string name="my_site_btn_site_settings">设置</string>
-    <string name="my_site_header_look_and_feel">外观</string>
+    <string name="my_site_btn_blog_posts">博客文章</string>
     <string name="my_site_header_publish">发布</string>
+    <string name="my_site_header_look_and_feel">外观</string>
     <string name="my_site_header_configuration">配置</string>
     <string name="reader_label_new_posts_subtitle">轻按以显示文章</string>
     <string name="deselect_all">全部不选</string>
-    <string name="show">显示</string>
-    <string name="hide">隐藏</string>
     <string name="select_all">选择全部</string>
-    <string name="language">语言</string>
-    <string name="verification_code">验证码</string>
-    <string name="invalid_verification_code">验证码无效</string>
+    <string name="hide">隐藏</string>
+    <string name="show">显示</string>
     <string name="auth_required">再次登录以继续操作。</string>
-    <string name="media_fetching">正在获取媒体…</string>
-    <string name="posts_fetching">正在获取文章…</string>
-    <string name="comments_fetching">正在提取评论…</string>
-    <string name="pages_fetching">正在获取页面…</string>
-    <string name="stats_view_authors">作者</string>
-    <string name="stats_view_search_terms">搜索字词</string>
+    <string name="invalid_verification_code">验证码无效</string>
+    <string name="verification_code">验证码</string>
+    <string name="language">语言</string>
+    <string name="reader_empty_posts_request_failed">无法检索文章</string>
+    <string name="publisher">发布者：</string>
     <string name="error_notification_open">无法打开通知</string>
     <string name="stats_search_terms_unknown_search_terms">未知搜索字词</string>
-    <string name="publisher">发布者：</string>
-    <string name="reader_empty_posts_request_failed">无法检索文章</string>
+    <string name="stats_view_search_terms">搜索字词</string>
+    <string name="stats_view_authors">作者</string>
+    <string name="comments_fetching">正在提取评论…</string>
+    <string name="pages_fetching">正在获取页面…</string>
+    <string name="posts_fetching">正在获取文章…</string>
+    <string name="media_fetching">正在获取媒体…</string>
     <string name="logs_copied_to_clipboard">已将应用程序日志复制到剪贴板</string>
+    <string name="reader_empty_posts_in_blog">此站点为空</string>
     <string name="reader_label_new_posts">新文章</string>
     <string name="error_copy_to_clipboard">复制文本到剪贴板时出错</string>
-    <string name="reader_page_recommended_blogs">您可能喜欢的博客</string>
     <string name="post_uploading">正在上传文章</string>
-    <string name="reader_empty_posts_in_blog">此站点为空</string>
-    <string name="themes_fetching">正在获取主题…</string>
-    <string name="stats_followers_months">%1$d 个月</string>
-    <string name="stats_followers_a_year">一年</string>
     <string name="stats_followers_years">%1$d 年</string>
+    <string name="stats_followers_a_year">一年</string>
+    <string name="stats_followers_months">%1$d 个月</string>
     <string name="stats_followers_a_month">一个月</string>
-    <string name="stats_followers_minutes">%1$d 分钟</string>
-    <string name="stats_followers_an_hour_ago">一小时以前</string>
-    <string name="stats_followers_hours">%1$d 小时</string>
-    <string name="stats_followers_a_day">一天</string>
     <string name="stats_followers_days">%1$d 天</string>
+    <string name="stats_followers_a_day">一天</string>
+    <string name="stats_followers_hours">%1$d 小时</string>
+    <string name="stats_followers_an_hour_ago">一小时以前</string>
+    <string name="stats_followers_minutes">%1$d 分钟</string>
     <string name="stats_followers_a_minute_ago">一分钟以前</string>
     <string name="stats_followers_seconds_ago">秒以前</string>
-    <string name="stats_view_top_posts_and_pages">文章和页面</string>
-    <string name="stats_view_videos">视频</string>
-    <string name="stats_view_publicize">Publicize</string>
     <string name="stats_view_followers">关注者</string>
+    <string name="stats_view_publicize">Publicize</string>
+    <string name="stats_view_videos">视频</string>
+    <string name="stats_view_top_posts_and_pages">文章和页面</string>
     <string name="stats_view_countries">国家/地区</string>
-    <string name="stats_likes">赞</string>
-    <string name="stats_timeframe_years">年</string>
-    <string name="stats_views">浏览量</string>
+    <string name="stats_likes">喜欢</string>
     <string name="stats_visitors">访客</string>
+    <string name="stats_views">浏览量</string>
+    <string name="stats_timeframe_years">年</string>
+    <string name="themes_fetching">正在获取主题…</string>
     <string name="ssl_certificate_details">详细信息</string>
     <string name="cab_selected">已选 %d 个</string>
     <string name="browse_our_faq_button">浏览我们的常见问题解答</string>
     <string name="reader_empty_comments">尚无评论</string>
+    <string name="reader_empty_posts_in_tag">没有与此主题相关的博文</string>
+    <string name="reader_label_like">喜欢</string>
     <string name="reader_label_view_original">查看原文</string>
-    <string name="reader_label_like">赞</string>
     <string name="reader_label_comments_closed">评论功能被关闭</string>
     <string name="reader_title_photo_viewer">%1$d/%2$d</string>
     <string name="error_publish_empty_post">发布的文章不能为空</string>
     <string name="error_refresh_unauthorized_posts">您不具备查看或编辑文章的权限</string>
     <string name="error_refresh_unauthorized_pages">您不具备查看或编辑页面的权限</string>
     <string name="error_refresh_unauthorized_comments">您不具备查看或编辑评论的权限</string>
-    <string name="older_month">超过一个月</string>
     <string name="more">更多</string>
-    <string name="older_two_days">超过 2 天</string>
+    <string name="older_month">超过一个月</string>
     <string name="older_last_week">超过 1 周</string>
-    <string name="mnu_comment_liked">赞</string>
+    <string name="older_two_days">超过 2 天</string>
+    <string name="mnu_comment_liked">喜欢</string>
     <string name="comment">评论</string>
     <string name="comment_trashed">评论已移到回收站</string>
-    <string name="posts_empty_list">尚无文章。为何不创建一个？</string>
     <string name="comment_reply_to_user">回复 %s</string>
+    <string name="posts_empty_list">尚无文章。为何不创建一个？</string>
     <string name="signing_out">正在退出…</string>
-    <string name="reader_empty_posts_in_tag">没有与此主题相关的博文</string>
     <string name="reader_toast_err_generic">无法执行此操作</string>
     <string name="reader_toast_err_block_blog">无法阻止此站点</string>
     <string name="reader_toast_blog_blocked">此站点中的文章不会再显示</string>
     <string name="reader_menu_block_blog">阻止此站点</string>
-    <string name="update_verb">更新</string>
     <string name="schedule_verb">计划</string>
-    <string name="reader_page_followed_blogs">已关注的博客</string>
-    <string name="reader_label_followed_blog">已关注的站点</string>
-    <string name="reader_toast_err_get_blog_info">无法显示此站点</string>
-    <string name="reader_toast_err_already_follow_blog">您已经关注此站点</string>
-    <string name="reader_toast_err_follow_blog">无法关注此站点</string>
-    <string name="reader_toast_err_unfollow_blog">无法取消关注此站点</string>
+    <string name="update_verb">更新</string>
     <string name="reader_empty_recommended_blogs">无推荐站点</string>
-    <string name="reader_title_blog_preview">“阅读器”站点</string>
-    <string name="reader_page_followed_tags">已关注的主题</string>
+    <string name="reader_toast_err_unfollow_blog">无法取消关注此站点</string>
+    <string name="reader_toast_err_follow_blog">无法关注此站点</string>
+    <string name="reader_toast_err_already_follow_blog">您已经关注此站点</string>
+    <string name="reader_toast_err_get_blog_info">无法显示此站点</string>
+    <string name="reader_label_followed_blog">已关注的站点</string>
     <string name="reader_hint_add_tag_or_url">输入要关注的 URL 或主题</string>
-    <string name="help">帮助</string>
-    <string name="forgot_password">忘记密码？</string>
-    <string name="ssl_certificate_error">无效的SSL证书</string>
+    <string name="reader_page_followed_blogs">已关注的博客</string>
+    <string name="reader_page_followed_tags">已关注的主题</string>
+    <string name="reader_title_blog_preview">“阅读器”站点</string>
     <string name="ssl_certificate_ask_trust">如果你平时连接到这个网站没有任何问题，这个错误可能意味着有人试图冒充该网站，你不应该继续下去。你想仍然信任这个证书？</string>
-    <string name="no_network_message">没用可用的网络</string>
-    <string name="gallery_error">抱歉,无法从图库检索该媒体对象</string>
-    <string name="theme_fetch_failed">未能获取主题</string>
-    <string name="mnu_comment_unspam">不是垃圾评论</string>
-    <string name="adding_cat_failed">添加分类失败</string>
-    <string name="adding_cat_success">分类添加成功</string>
-    <string name="sdcard_message">上传媒体需要已装载的 SD 卡</string>
-    <string name="notifications_empty_list">没有通知</string>
-    <string name="error_refresh_posts">现在不能刷新文章</string>
-    <string name="error_refresh_pages">现在不能刷新页面</string>
-    <string name="error_refresh_comments">现在不能刷新评论</string>
-    <string name="error_generic">发生错误</string>
-    <string name="error_moderate_comment">调节时出现了一个错误</string>
-    <string name="error_edit_comment">在编辑评论时出现了一个错误</string>
-    <string name="error_load_comment">无法加载评论</string>
-    <string name="invalid_email_message">你的邮件地址不可用</string>
-    <string name="email_invalid">请输入一个可用的电子邮件地址</string>
+    <string name="ssl_certificate_error">无效的SSL证书</string>
+    <string name="help">帮助</string>
     <string name="username_or_password_incorrect">你输入的用户名或密码错误</string>
+    <string name="email_invalid">请输入一个可用的电子邮件地址</string>
+    <string name="invalid_email_message">你的邮件地址不可用</string>
     <string name="error_downloading_image">下载图片错误</string>
-    <string name="cat_name_required">「分类名称」必填</string>
+    <string name="error_load_comment">无法加载评论</string>
+    <string name="error_edit_comment">在编辑评论时出现了一个错误</string>
+    <string name="error_moderate_comment">调节时出现了一个错误</string>
+    <string name="error_generic">发生错误</string>
+    <string name="error_refresh_comments">现在不能刷新评论</string>
+    <string name="error_refresh_pages">现在不能刷新页面</string>
+    <string name="error_refresh_posts">现在不能刷新文章</string>
     <string name="error_deleting_post">删除文章时出现错误</string>
+    <string name="notifications_empty_list">没有通知</string>
+    <string name="sdcard_message">上传媒体需要已装载的 SD 卡</string>
+    <string name="cat_name_required">「分类名称」必填</string>
+    <string name="adding_cat_success">分类添加成功</string>
+    <string name="adding_cat_failed">添加分类失败</string>
+    <string name="mnu_comment_unspam">不是垃圾评论</string>
+    <string name="theme_fetch_failed">未能获取主题</string>
     <string name="blog_not_found">抱歉，尝试访问该博客时发生错误</string>
-    <string name="select_categories">选择分类</string>
-    <string name="connection_error">连接错误</string>
-    <string name="cancel_edit">取消编辑</string>
-    <string name="post_not_found">抱歉，尝试加载文章时出现错误。请刷新文章列表再试.</string>
-    <string name="learn_more">了解更多</string>
-    <string name="media_gallery_type_thumbnail_grid">缩略图</string>
-    <string name="media_error_no_permission">你没有权限查看媒体库</string>
-    <string name="cannot_delete_multi_media_items">一些媒体文件现在不能删除.请稍后再试.</string>
-    <string name="link_enter_url_text">链接文字 (可选)</string>
-    <string name="page_settings">页面设置</string>
-    <string name="local_draft">本地草稿</string>
-    <string name="comment_status_approved">通过</string>
-    <string name="comment_status_unapproved">待审</string>
-    <string name="comment_status_spam">垃圾</string>
-    <string name="comment_status_trash">删除</string>
-    <string name="edit_comment">编辑评论</string>
-    <string name="mnu_comment_approve">通过</string>
-    <string name="mnu_comment_unapprove">不通过</string>
-    <string name="mnu_comment_spam">垃圾</string>
-    <string name="mnu_comment_trash">删除</string>
-    <string name="dlg_approving_comments">批准</string>
-    <string name="dlg_unapproving_comments">不批准</string>
-    <string name="dlg_spamming_comments">正在标记为垃圾评论</string>
-    <string name="dlg_trashing_comments">正在删除</string>
-    <string name="dlg_confirm_trash_comments">确定删除？</string>
-    <string name="trash">删除</string>
-    <string name="saving_changes">正在保存更改</string>
-    <string name="sure_to_cancel_edit_comment">是否确定要取消编辑该评论?</string>
-    <string name="toast_comment_unedited">评论没有改变</string>
-    <string name="view_in_browser">在浏览器中查看</string>
-    <string name="add_new_category">添加新分类</string>
-    <string name="category_name">分类名称</string>
-    <string name="file_error_create">无法创建上传媒体所需的临时文件。请确保设备有足够的空闲空间.</string>
-    <string name="open_source_licenses">开源许可协议</string>
-    <string name="http_authorization_required">需要验证</string>
-    <string name="new_post">新文章</string>
-    <string name="new_media">新媒体</string>
-    <string name="privacy_policy">隐私政策</string>
-    <string name="local_changes">本地修改</string>
-    <string name="wordpress_blog">WordPress 博客</string>
-    <string name="error_blog_hidden">这个博客是隐藏的，无法加载。在设置中重新启用它并再次尝试。</string>
-    <string name="fatal_db_error">创建程序数据库时出错，请重新安装程序.</string>
+    <string name="gallery_error">抱歉,无法从图库检索该媒体对象</string>
+    <string name="no_network_message">没用可用的网络</string>
+    <string name="reader_toast_err_remove_tag">无法移除此主题</string>
+    <string name="reader_toast_err_add_tag">无法添加此主题</string>
     <string name="reader_title_applog">程序日志</string>
-    <string name="remove_account">删除站点</string>
-    <string name="notifications_empty_all">尚无通知…。</string>
-    <string name="invalid_site_url_message">请检查输入的站点 URL 是否有效</string>
+    <string name="fatal_db_error">创建程序数据库时出错，请重新安装程序.</string>
+    <string name="error_blog_hidden">这个博客是隐藏的，无法加载。在设置中重新启用它并再次尝试。</string>
     <string name="error_refresh_media">此时无法刷新媒体</string>
+    <string name="wordpress_blog">WordPress 博客</string>
     <string name="image_settings">图片设置</string>
+    <string name="local_changes">本地修改</string>
+    <string name="privacy_policy">隐私政策</string>
+    <string name="new_media">新媒体</string>
+    <string name="new_post">新文章</string>
+    <string name="notifications_empty_all">尚无通知…。</string>
+    <string name="http_authorization_required">需要验证</string>
+    <string name="invalid_site_url_message">请检查输入的站点 URL 是否有效</string>
+    <string name="open_source_licenses">开源许可协议</string>
+    <string name="file_error_create">无法创建上传媒体所需的临时文件。请确保设备有足够的空闲空间.</string>
+    <string name="category_name">分类名称</string>
+    <string name="add_new_category">添加新分类</string>
+    <string name="view_in_browser">在浏览器中查看</string>
+    <string name="remove_account">删除站点</string>
+    <string name="toast_comment_unedited">评论没有改变</string>
+    <string name="content_required">评论正文为必填项</string>
+    <string name="sure_to_cancel_edit_comment">是否确定要取消编辑该评论?</string>
+    <string name="saving_changes">正在保存更改</string>
+    <string name="trash">删除</string>
+    <string name="dlg_confirm_trash_comments">确定删除？</string>
+    <string name="dlg_trashing_comments">正在删除</string>
+    <string name="dlg_spamming_comments">正在标记为垃圾评论</string>
+    <string name="dlg_unapproving_comments">不批准</string>
+    <string name="dlg_approving_comments">批准</string>
+    <string name="mnu_comment_trash">删除</string>
+    <string name="mnu_comment_spam">垃圾</string>
+    <string name="mnu_comment_unapprove">不通过</string>
+    <string name="mnu_comment_approve">通过</string>
+    <string name="edit_comment">编辑评论</string>
+    <string name="comment_status_trash">删除</string>
+    <string name="comment_status_spam">垃圾</string>
+    <string name="comment_status_unapproved">待审</string>
+    <string name="comment_status_approved">通过</string>
+    <string name="delete_page">删除页面？</string>
+    <string name="delete_post">删除文章？</string>
     <string name="post_settings">文章设置</string>
     <string name="file_not_found">无法找到要上传到文件。是否已删除或被移走?</string>
+    <string name="local_draft">本地草稿</string>
+    <string name="page_settings">页面设置</string>
+    <string name="link_enter_url_text">链接文字 (可选)</string>
+    <string name="cannot_delete_multi_media_items">一些媒体文件现在不能删除.请稍后再试.</string>
+    <string name="media_error_no_permission">你没有权限查看媒体库</string>
+    <string name="media_gallery_type_thumbnail_grid">缩略图</string>
+    <string name="learn_more">了解更多</string>
+    <string name="post_not_found">抱歉，尝试加载文章时出现错误。请刷新文章列表再试.</string>
     <string name="plugin_not_found">访问该插件时发生错误</string>
-    <string name="delete_post">删除文章？</string>
-    <string name="delete_page">删除页面？</string>
-    <string name="content_required">评论正文为必填项</string>
-    <string name="reader_toast_err_add_tag">无法添加此主题</string>
-    <string name="reader_toast_err_remove_tag">无法移除此主题</string>
+    <string name="cancel_edit">取消编辑</string>
+    <string name="connection_error">连接错误</string>
+    <string name="select_categories">选择分类</string>
     <string name="share_link">分享链接</string>
     <string name="reader_empty_posts_in_tag_updating">正在获取文章…</string>
-    <string name="reader_likes_you_and_multi">你和 %,d 人喜欢</string>
-    <string name="reader_likes_multi">%,d 人喜欢</string>
+    <string name="reader_likes_you_and_multi">您和另外 %,d 人喜欢了</string>
+    <string name="reader_likes_multi">%,d 人喜欢了</string>
     <string name="reader_label_reply">回复</string>
     <string name="cant_share_no_visible_blog">没有一个博客，你不能分享到WordPress</string>
     <string name="comment_spammed">评论被标记为垃圾评论</string>
-    <string name="reader_likes_you_and_one">你和另一个人喜欢</string>
-    <string name="pick_photo">选择图片</string>
-    <string name="pick_video">选择视频</string>
     <string name="reader_toast_err_get_post">无法检索这篇文章</string>
-    <string name="reader_untitled_post">(未命名)</string>
-    <string name="reader_label_removed_tag">已移除 %s</string>
-    <string name="reader_label_added_tag">已添加 %s</string>
-    <string name="reader_likes_one">1 人喜欢</string>
-    <string name="reader_likes_only_you">已喜欢</string>
-    <string name="reader_toast_err_comment_failed">无法发表评论</string>
+    <string name="reader_likes_you_and_one">您和另外1人喜欢了</string>
+    <string name="pick_video">选择视频</string>
+    <string name="pick_photo">选择图片</string>
+    <string name="sign_up_label">注册</string>
     <string name="reader_toast_err_url_intent">无法打开 %s</string>
-    <string name="empty_list_default">这个列表是空的</string>
-    <string name="reader_btn_follow">订阅</string>
-    <string name="reader_btn_unfollow">关注中</string>
-    <string name="reader_hint_comment_on_comment">回复评论</string>
     <string name="reader_toast_err_view_image">无法查看图片</string>
     <string name="reader_toast_err_share_intent">无法分享</string>
-    <string name="reader_btn_share">分享</string>
-    <string name="comments_empty_list">尚无评论</string>
-    <string name="reader_view_reblog">转载</string>
     <string name="reader_toast_err_tag_invalid">该主题无效</string>
     <string name="reader_toast_err_tag_exists">您已经关注此主题</string>
-    <string name="stats_timeframe_today">今天</string>
-    <string name="stats_timeframe_yesterday">昨天</string>
-    <string name="stats_timeframe_days">天</string>
-    <string name="stats_timeframe_weeks">周</string>
+    <string name="reader_toast_err_comment_failed">无法发表评论</string>
+    <string name="reader_likes_only_you">您喜欢了</string>
+    <string name="reader_likes_one">1人喜欢了</string>
+    <string name="reader_label_removed_tag">已移除 %s</string>
+    <string name="reader_label_added_tag">已添加 %s</string>
+    <string name="reader_hint_comment_on_comment">回复评论</string>
+    <string name="reader_btn_unfollow">关注中</string>
+    <string name="reader_btn_follow">订阅</string>
+    <string name="reader_btn_share">分享</string>
+    <string name="reader_view_reblog">转载</string>
+    <string name="reader_untitled_post">(未命名)</string>
+    <string name="comments_empty_list">尚无评论</string>
+    <string name="empty_list_default">这个列表是空的</string>
     <string name="stats_timeframe_months">月</string>
+    <string name="stats_timeframe_weeks">周</string>
+    <string name="stats_timeframe_days">天</string>
+    <string name="stats_timeframe_yesterday">昨天</string>
+    <string name="stats_timeframe_today">今天</string>
+    <string name="stats_view_referrers">推荐人</string>
+    <string name="stats_view_tags_and_categories">标签和类别</string>
     <string name="stats_view_clicks">点击</string>
-    <string name="share_action">分享</string>
     <string name="stats">统计</string>
-    <string name="media_edit_title_text">标题</string>
-    <string name="media_edit_caption_text">标题</string>
-    <string name="media_edit_description_text">描述</string>
-    <string name="media_edit_failure">更新失败</string>
+    <string name="share_action">分享</string>
     <string name="theme_activate_button">激活</string>
-    <string name="themes">主题</string>
-    <string name="media_gallery_type_squares">方格</string>
-    <string name="media_gallery_type_tiled">磁贴</string>
-    <string name="media_gallery_type_circles">环状</string>
+    <string name="media_edit_failure">更新失败</string>
+    <string name="media_edit_description_text">描述</string>
+    <string name="media_edit_caption_text">标题</string>
+    <string name="media_edit_title_text">标题</string>
     <string name="media_gallery_type_slideshow">幻灯片</string>
-    <string name="stats_view_referrers">推荐人</string>
-    <string name="stats_view_tags_and_categories">标签和类别</string>
-    <string name="manage">管理</string>
+    <string name="media_gallery_type_circles">环状</string>
+    <string name="media_gallery_type_tiled">磁贴</string>
+    <string name="media_gallery_type_squares">方格</string>
+    <string name="themes">主题</string>
     <string name="discard">舍弃</string>
-    <string name="note_reply_successful">回复已发表</string>
-    <string name="new_notifications">%d 条新通知</string>
+    <string name="manage">管理</string>
     <string name="more_notifications">以及其他 %d 人。</string>
+    <string name="new_notifications">%d 条新通知</string>
     <string name="follows">关注</string>
+    <string name="note_reply_successful">回复已发表</string>
     <string name="sign_in">登录</string>
     <string name="loading">正在加载…</string>
-    <string name="httpuser">HTTP 用户名</string>
     <string name="httppassword">HTTP 密码</string>
+    <string name="httpuser">HTTP 用户名</string>
     <string name="error_media_upload">上传媒体时出错</string>
     <string name="incorrect_credentials">用户名或密码不正确。</string>
-    <string name="password">密码</string>
-    <string name="username">用户名</string>
     <string name="log_in">登录</string>
+    <string name="username">用户名</string>
+    <string name="password">密码</string>
     <string name="reader">阅读器</string>
-    <string name="no_network_title">无网络可用</string>
     <string name="pages">页面</string>
-    <string name="anonymous">匿名</string>
     <string name="posts">文章</string>
-    <string name="ok">确定</string>
+    <string name="anonymous">匿名</string>
+    <string name="no_network_title">无网络可用</string>
     <string name="done">完成</string>
+    <string name="ok">确定</string>
     <string name="link_enter_url">URL</string>
-    <string name="version">版本</string>
     <string name="tos">服务条款</string>
+    <string name="version">版本</string>
     <string name="app_title">WordPress for Android</string>
     <string name="image_alignment">对齐</string>
     <string name="refresh">刷新</string>
@@ -2463,24 +2782,24 @@ Language: zh_CN
     <string name="quickpress_add_error">快捷方式名称不能为空</string>
     <string name="pages_private">隐私</string>
     <string name="title">标题</string>
-    <string name="categories">分类</string>
     <string name="tags_separate_with_commas">用逗号分隔标签</string>
+    <string name="categories">分类</string>
     <string name="dlg_deleting_comments">删除评论</string>
     <string name="sdcard_title">需要 SD 卡</string>
     <string name="media">媒体</string>
-    <string name="delete">删除</string>
     <string name="approve">通过</string>
+    <string name="delete">删除</string>
     <string name="none">无</string>
-    <string name="error">错误</string>
-    <string name="cancel">取消</string>
-    <string name="save">保存</string>
-    <string name="add">添加</string>
-    <string name="category_refresh_error">分类刷新错误</string>
-    <string name="on">于</string>
+    <string name="publish_now">立即发布</string>
     <string name="reply">回复</string>
-    <string name="yes">是</string>
-    <string name="no">否</string>
+    <string name="on">于</string>
     <string name="preview">预览</string>
+    <string name="category_refresh_error">分类刷新错误</string>
+    <string name="error">错误</string>
+    <string name="no">否</string>
+    <string name="yes">是</string>
     <string name="notification_settings">通知设置</string>
-    <string name="publish_now">立即发布</string>
+    <string name="add">添加</string>
+    <string name="save">保存</string>
+    <string name="cancel">取消</string>
 </resources>
diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml
index 238eee7497e4..c26876b02527 100644
--- a/WordPress/src/main/res/values-zh-rHK/strings.xml
+++ b/WordPress/src/main/res/values-zh-rHK/strings.xml
@@ -1,17 +1,490 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-16 11:54:09+0000
+Translation-Revision-Date: 2021-05-13 09:54:08+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/3.0.0-alpha.2
 Language: zh_TW
 -->
 <resources>
+    <string name="gutenberg_native_audio_settings">音訊設定</string>
+    <string name="gutenberg_native_image_settings">圖片設定</string>
+    <string name="gutenberg_native_size">尺寸</string>
+    <string name="user_profile_site_section_header">網站</string>
+    <string name="user_profile_untitled_site">(未命名)</string>
+    <string name="user_profile_bottom_sheet_description">使用者個人資料底頁資訊</string>
+    <string name="likes_list_screen_title">按讚清單%s</string>
+    <string name="gutenberg_native_write_code">撰寫程式碼…</string>
+    <string name="gutenberg_native_sorting_and_filtering">排序及篩選方式</string>
+    <string name="gutenberg_native_show_download_button">顯示下載按鈕</string>
+    <string name="gutenberg_native_shortcode">短代碼</string>
+    <string name="gutenberg_native_read_more">閱讀全文</string>
+    <string name="gutenberg_native_post_content_settings">文章內容設定</string>
+    <string name="gutenberg_native_post_meta_settings">文章中繼資料設定</string>
+    <string name="gutenberg_native_preload">預先載入</string>
+    <string name="gutenberg_native_media_area">媒體區域</string>
+    <string name="gutenberg_native_media_file">媒體檔案</string>
+    <string name="gutenberg_native_metadata">中繼資料</string>
+    <string name="gutenberg_native_loop">循環播放</string>
+    <string name="gutenberg_native_link_to_12d6f96a">連結到</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">第 %1$d 張圖片，圖庫中總計 %2$d 張圖片</string>
+    <string name="gutenberg_native_heading_d">標題 %d</string>
+    <string name="gutenberg_native_featured">精選內容</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">在這裡輸入網址以嵌入內容…</string>
+    <string name="gutenberg_native_edit_image">編輯圖片</string>
+    <string name="gutenberg_native_display_post_date">顯示內容發佈日期</string>
+    <string name="gutenberg_native_change_heading_level">變更標題階層</string>
+    <string name="gutenberg_native_code">標示為程式碼</string>
+    <string name="gutenberg_native_browser_default">瀏覽器預設值</string>
+    <string name="gutenberg_native_attachment_page">附件頁面</string>
+    <string name="gutenberg_native_auto">自動載入</string>
+    <string name="gutenberg_native_autoplay">自動播放</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">區塊無法在內部含有相同區塊時進行轉譯。</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">區塊已刪除或無法使用。</string>
+    <string name="gutenberg_native_add_text">加入文字…</string>
+    <string name="gutenberg_native_add_caption">新增說明文字</string>
+    <string name="gutenberg_native_what_is_alt_text">替代文字是什麼？</string>
+    <string name="gutenberg_native_transform_s_to">將 %s 轉換為</string>
+    <string name="gutenberg_native_transform_block">轉換區塊…</string>
+    <string name="gutenberg_native_failed_to_insert_media">無法插入媒體。</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">無法插入音訊檔案。</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">說明圖片用途。 如果圖片只是為了裝飾，請保留空白。 </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s 已轉換為 %2$s</string>
+    <string name="like_faces_error_loading_message">載入讚資料時發生錯誤。%s。</string>
+    <string name="like_faces_plural_text">%d 位部落客說這個讚。</string>
+    <string name="like_faces_singular_text">1 位部落客說這個讚。</string>
+    <string name="like_title_plural">%d 按讚數</string>
+    <string name="like_title_singular">1 個讚</string>
+    <string name="threat_fix_enter_server_creds_message_plural">輸入你的伺服器憑證以修正威脅。</string>
+    <string name="threat_fix_enter_server_creds_message_singular">輸入你的伺服器憑證以修正威脅。</string>
+    <string name="suggestion">建議：</string>
+    <string name="gutenberg_native_search_blocks">搜尋區塊</string>
+    <string name="gutenberg_native_search_block">搜尋區塊</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">按兩下以變更單位</string>
+    <string name="gutenberg_native_clear_search">清除搜尋</string>
+    <string name="gutenberg_native_cancel_search">取消搜尋</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s。%2$s 是 %3$s %4$s。</string>
+    <string name="get_likes_empty_state_title">取得按讚資料時發生錯誤</string>
+    <string name="get_likes_unknown_error">獲得「讚」時發生未知的錯誤。</string>
+    <string name="get_likes_no_network_error">沒有可用的網路。</string>
+    <string name="comments_empty_list_filtered_unreplied">沒有尚未回覆的留言</string>
+    <string name="comment_status_unreplied">尚未回覆</string>
+    <string name="gutenberg_native_table_of_contents">目錄</string>
+    <string name="gutenberg_native_summary">摘要</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">列出標題以呈現文章摘要。 將 HTML 錨點新增至標題區塊，藉此連結相應文章內容。</string>
+    <string name="gutenberg_native_document_outline">文件大綱</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">一律允許的 IP 位址</string>
+    <string name="site_settings_denylist_title">留言含有不允許的內容</string>
+    <string name="reader_title_interests">追蹤主題</string>
+    <string name="stories_intro_main_subtitle">在網站創作並發布引人注目內容的全新方式。</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">忽略</string>
+    <string name="activity_log_backup_download_notice_download_action">下載</string>
+    <string name="threat_fix_all_status_success_message_plural">已成功修正威脅。</string>
+    <string name="scan_idle_threats_description_plural">掃描作業發現 %2$s 有 %1$s 個潛在威脅。 請檢閱以下威脅並採取行動，或點選「全部修正」按鈕。 如果你有需要，我們 %3$s。</string>
+    <string name="threat_fix_all_confirmation_message_plural">請確認你要修正所有 %s 個作用中威脅。</string>
+    <string name="scan_fixing_threats_description_plural">我們正努力在背景修正這些威脅。 這段時間你可以照常使用網站，也可以隨時回來查看掃瞄進度。</string>
+    <string name="gutenberg_native_edit_focal_point">編輯焦點</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">點兩下開啟底部工作表，然後編輯、取代或清除圖片</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">點兩下開啟動作工作表，然後編輯、取代或清除圖片</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">輸入網站的名稱</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;已完成所有任務&lt;/b&gt;&lt;br/&gt;你將觸及更多使用者。 做得好！</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;已完成所有任務&lt;/b&gt;&lt;br/&gt;你已自訂你的網站。 做得好！</string>
+    <string name="quick_start_card_menu_hide">暫時隱藏</string>
+    <string name="magic_link_not_meaning_to_create_account">不是要建立一個新帳號嗎？ 返回並重新輸入你的電子郵件地址。</string>
+    <string name="invite_links_disable_dialog_message">一旦你停用此邀請連結，就沒有人可以再用此連結加入你的團隊。 你確定嗎？</string>
+    <string name="invite_links_disable_dialog_title">停用邀請連結</string>
+    <string name="invite_links_bad_format_response">收到無效回應</string>
+    <string name="invite_links_null_response">未收到回應</string>
+    <string name="invite_links_cannot_get_role_data_error">取得角色的資料時發生錯誤%1$s</string>
+    <string name="invite_links_cannot_get_roles_error">取得角色發生錯誤</string>
+    <string name="invite_links_generic_get_data_error">擷取邀請連結資料時發生未知錯誤</string>
+    <string name="invite_links_helper_text">用這個連結直接加入成員，就不需要一個一個邀請。 造訪此 URL 的人都可以註冊你的組織，即使他們是從其他人那裡收到連結，因此請務必與值得信任的人分享。</string>
+    <string name="invite_links_expire_date">過期 %1$s</string>
+    <string name="invite_links_disable_invite_link">停用邀請連結</string>
+    <string name="invite_links_share_invite_link">分享邀請連結</string>
+    <string name="invite_links_generate">產生新連結</string>
+    <string name="invite_links_get_status_retry">重新整理連結狀態</string>
+    <string name="invite_links_section_title">邀請連結</string>
+    <string name="threats_found_singular">發現威脅</string>
+    <string name="threats_found_plural">發現數個威脅</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;掃描完成&lt;/b&gt; &lt;br&gt; %s 發現潛在威脅</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;掃描完成&lt;/b&gt; &lt;br&gt; 發現一個潛在威脅</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;掃描完成&lt;/b&gt; &lt;br&gt; 未發現威脅</string>
+    <string name="scan_fixing_threats_title_singular">正在修正威脅</string>
+    <string name="disable">停用</string>
+    <string name="quick_start_list_review_pages_subtitle">檢查你的頁面並進行變更，或新增/移除頁面。</string>
+    <string name="quick_start_card_menu_unpin">取消釘選此項目</string>
+    <string name="quick_start_list_view_site_title">造訪你的網站</string>
+    <string name="quick_start_list_upload_icon_subtitle">新增網站圖示，讓網站看起來更專業幹練。</string>
+    <string name="quick_start_list_follow_site_subtitle">探索並追蹤帶給你啟發的網站。</string>
+    <string name="quick_start_list_enable_sharing_title">啟用分享功能</string>
+    <string name="quick_start_list_enable_sharing_subtitle">自動將新文章分享到社群媒體。</string>
+    <string name="quick_start_list_update_site_title_subtitle">為網站取一個能反映出自我風格和主題的名稱。</string>
+    <string name="quick_start_list_check_stats_title">檢視統計資料</string>
+    <string name="backup_download_status_failure_bullet2">我們仍會嘗試為你建立可下載的備份檔案。</string>
+    <string name="backup_download_status_failure_bullet1">我們擷取不到狀態，無法判斷需要花多久時間建立可下載的備份。</string>
+    <string name="backup_download_status_failure_heading">看來，我們擷取不到可下載備份的狀態</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">核取記號圖示</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">時鐘圖示</string>
+    <string name="restore_status_failure_bullet3">我們會在完成時通知你。</string>
+    <string name="restore_status_failure_bullet2">我們仍在嘗試還原你的網站。</string>
+    <string name="restore_status_failure_bullet1">我們擷取不到狀態，無法判斷還原程序需要花多久時間。</string>
+    <string name="restore_status_failure_heading">看來，我們擷取不到你的還原狀態</string>
+    <string name="restore_complete_failed_description">我們無法還原你的網站</string>
+    <string name="restore_warning_action_button">確認</string>
+    <string name="restore_warning_description_with_two_parameters">你確定要將網站還原到 %2$s 的 %1$s 嗎？\n        你在那之後所做的任何變更都會遺失。</string>
+    <string name="backup_download_complete_failed_description">我們無法建立你的備份</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(排除佈景主題、外掛程式和上傳內容)</string>
+    <string name="backup_item_contents">WP 內容目錄</string>
+    <string name="backup_item_roots">WordPress 根目錄</string>
+    <string name="backup_download_details_choose_items_header">包含在這次下載中的項目</string>
+    <string name="gutenberg_native_uploading">上傳中…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">可重複使用區塊無法在 iOS 版 WordPress 中編輯</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">可重複使用區塊無法在 Android 版 WordPress 中編輯</string>
+    <string name="gutenberg_native_replace_file">取代檔案</string>
+    <string name="gutenberg_native_replace_audio">替換音訊</string>
+    <string name="gutenberg_native_problem_opening_the_audio">開啟音訊時發生問題</string>
+    <string name="gutenberg_native_open">開啟</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">沒有應用程式可以處理這項要求。</string>
+    <string name="gutenberg_native_lock_icon">鎖定圖示</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">無法插入音訊檔案。 請點選以顯示選項。</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">按兩下以選擇音訊檔案</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">按兩下以聆聽音訊檔案</string>
+    <string name="gutenberg_native_choose_audio">選擇音樂</string>
+    <string name="gutenberg_native_audio_player">音樂播放器</string>
+    <string name="gutenberg_native_audio_file">音訊檔案</string>
+    <string name="gutenberg_native_audio_caption_s">音訊字幕。 %s</string>
+    <string name="gutenberg_native_audio_caption_empty">音訊字幕。 清空</string>
+    <string name="gutenberg_native_add_audio">新增音訊</string>
+    <string name="continue_with_wpcom">登入或註冊 WordPress.com</string>
+    <string name="photo_picker_use_audio">使用這個音訊</string>
+    <string name="photo_picker_choose_audio">從裝置中選擇音訊</string>
+    <string name="people_optional_custom_message_helper_text">選填：輸入自訂訊息，連同你的邀請一併傳送。</string>
+    <string name="people_learn_more_about_roles">瞭解更多有關角色的資訊</string>
+    <string name="threat_status_fixed">固定</string>
+    <string name="threat_found_header">找到</string>
+    <string name="scan_here_to_help">隨時為你提供協助</string>
+    <string name="scan_idle_threats_description_singular">掃描作業發現 %1$s 有一個潛在威脅。 請檢閱以下威脅並採取行動，或點選「全部修正」按鈕。 如果你有需要，我們 %2$s。</string>
+    <string name="scan_idle_manual_scan_description">如要再次檢查網站，請執行手動掃瞄，或等待 Jetpack 於今日稍晚掃瞄你的網站。</string>
+    <string name="scan_provisioning_description">歡迎使用 Jetpack Scan！ 我們已經預定執行完整掃描，將會徹底審視你的網站。 如果我們發現可能影響掃瞄作業的問題，就會通知你；接著就可以開始進行首次完整掃瞄。</string>
+    <string name="scan_scanning_is_initial_description">歡迎使用 Jetpack Scan 服務。我們會掃瞄你的網站，並且很快讓你得知結果。</string>
+    <string name="scan_scanning_description">掃瞄作業完成後，我們會傳送通知給你。 這段時間你可以照常使用網站，也可以隨時回來查看掃瞄進度。</string>
+    <string name="scan_fixing_threats_description_singular">我們正致力在背景解決此威脅。 這段時間你可以照常使用網站，也可以隨時回來查看掃瞄進度。</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan 無法完成網站掃瞄作業。 請檢查你的網站是否已經關閉。若否，請再試一次。 如果網站已關閉，或 Jetpack Scan 仍無法順利掃瞄，請與我們的支援團隊聯絡。</string>
+    <string name="scan_fixing_threats_title_plural">正在修正威脅</string>
+    <string name="scan_request_failed_title">發生錯誤</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">正在備份網站</string>
+    <string name="activity_log_currently_backing_up_message">正在從 %1$s %2$s 備份網站</string>
+    <string name="activity_log_currently_backing_up_title">正在建立可下載的備份</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">你的網站已成功備份</string>
+    <string name="activity_log_backup_finished_snackbar_message">你的網站已成功備份\n已從 %1$s %2$s 備份</string>
+    <string name="activity_log_backup_started_snackbar_message">正在備份你的網站\n正在從 %1$s %2$s 備份</string>
+    <string name="pick_audio">設定音樂</string>
+    <string name="restore_complete_failed_icon_content_description">錯誤圖示</string>
+    <string name="restore_complete_failed_action_button_content_description">「完成」按鈕</string>
+    <string name="restore_another_process_running">有其他還原作業正在執行。</string>
+    <string name="restore_complete_failed_title">還原失敗</string>
+    <string name="restore_complete_visit_site_button_content_description">「造訪網站」按鈕</string>
+    <string name="restore_complete_done_button_content_description">「完成」按鈕</string>
+    <string name="restore_complete_icon_content_description">還原圖示</string>
+    <string name="restore_complete_visit_site_action_button">造訪網站</string>
+    <string name="restore_complete_description_with_two_parameters">所有你選取的項目現在都還原至 %1$s %2$s。</string>
+    <string name="restore_complete_header">你的網站已經還原</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">無須等待。 我們會在網站還原後通知你。</string>
+    <string name="restore_progress_icon_content_description">還原網站圖示</string>
+    <string name="restore_progress_description_with_two_parameters">我們正在將你的網站還原至 %1$s %2$s。</string>
+    <string name="restore_progress_header">目前正在還原網站</string>
+    <string name="restore_warning_action_button_content_description">「確認還原網站」按鈕</string>
+    <string name="restore_warning_icon_content_description">紅色圓圈圖片，中間有驚嘆號</string>
+    <string name="restore_warning_header">警告</string>
+    <string name="restore_details_action_button_content_description">「還原網站」按鈕</string>
+    <string name="restore_details_icon_content_description">還原圖示</string>
+    <string name="restore_details_action_button">還原網站</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s 是你選取的還原時間點。</string>
+    <string name="restore_details_header">還原網站</string>
+    <string name="restore_details_choose_items_header">選擇要還原的項目：</string>
+    <string name="restore">還原</string>
+    <string name="backup_download_complete_failed_icon_content_description">含有 X 圖示的雲端</string>
+    <string name="backup_download_complete_failed_action_button_content_description">「完成」按鈕</string>
+    <string name="backup_download_complete_failed_action_button">完成</string>
+    <string name="backup_download_complete_failed_title">下載失敗</string>
+    <string name="web_preview_tablet">平板電腦</string>
+    <string name="web_preview_mobile">行動裝置</string>
+    <string name="quick_start_card_menu_remove">不要再顯示</string>
+    <string name="quick_start_dialog_review_pages_message_short">選取%1$s「頁面」%2$s以檢視頁面清單。</string>
+    <string name="quick_start_dialog_review_pages_message">變更、新增或移除網站的頁面。</string>
+    <string name="quick_start_dialog_review_pages_title">檢閱網站頁面</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">選取%1$s「首頁」%2$s以編輯首頁。</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">選取%1$s「頁面」%2$s以檢視頁面清單。</string>
+    <string name="quick_start_card_menu_pin">釘選此項目</string>
+    <string name="quick_start_dialog_edit_homepage_message">變更、新增或移除網站首頁的內容。</string>
+    <string name="quick_start_dialog_edit_homepage_title">編輯首頁</string>
+    <string name="reader_menu_mark_as_unseen">標示為未讀。</string>
+    <string name="reader_menu_mark_as_seen">標示為已讀。</string>
+    <string name="error_media_upload_failed_for_reason">上傳媒體失敗。\n%1$s</string>
+    <string name="error_media_not_enough_storage">網站儲存空間不足</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">無法切換此文章的已讀狀態</string>
+    <string name="reader_marked_post_as_unseen">已將文章標示為未讀</string>
+    <string name="reader_marked_post_as_seen">已將文章標示為已讀</string>
+    <string name="threat_fix_all_status_error_message">取得修正狀態時發生錯誤。 請聯絡我們的支援團隊。</string>
+    <string name="threat_fix_all_error_message">修正威脅時發生錯誤。 請聯絡我們的支援團隊。</string>
+    <string name="threat_fix_all_status_success_message_singular">已成功修正威脅。</string>
+    <string name="threat_fix_all_confirmation_message_singular">請確認你要修正一個作用中威脅。</string>
+    <string name="threat_fix_all_warning_title">修復所有威脅</string>
+    <string name="threat_ignore_error_message">忽略威脅時發生錯誤。 請聯絡支援團隊。</string>
+    <string name="threat_ignore_success_message">已忽略威脅。</string>
+    <string name="threat_ignore_warning">除非徹底確認安全無害，否則請不要忽視安全性問題。 若你選擇忽略此威脅，該威脅會繼續存在於你的網站 &lt;b&gt;%s&lt;/b&gt;。</string>
+    <string name="threat_fix_error_message">修正威脅時發生錯誤。 請聯絡我們的支援團隊。</string>
+    <string name="threat_item_sub_header_status_ignored">威脅已忽略</string>
+    <string name="threat_fixing">正在修正威脅</string>
+    <string name="scan_history_ignored_threats_tab">已忽略</string>
+    <string name="scan_history_no_threats_found">找不到任何項目</string>
+    <string name="scan_history_fixed_threats_tab">固定</string>
+    <string name="scan_history_all_threats_tab">全部</string>
+    <string name="scan_scanning_title">掃描檔案</string>
+    <string name="scan_preparing_to_scan_title">準備掃描</string>
+    <string name="scan_history_menu_title">記錄</string>
+    <string name="scan_history">掃描記錄</string>
+    <string name="backup_active_filter_empty_subtitle">請嘗試調整你的日期範圍</string>
+    <string name="backup_active_filter_empty_title">找不到相符的備份</string>
+    <string name="backup_empty_subtitle">你的第一次備份將於 24 小時內顯示於此；備份完成後，你會收到通知</string>
+    <string name="threat_item_sub_header_status_fixed_on">威脅已於 %s 修正</string>
+    <string name="backup_empty_title">第一次備份即將準備就緒</string>
+    <string name="request_failed_message">處理要求時發生問題。 請稍後再試一次。</string>
+    <string name="gutenberg_native_move_to_bottom">移至底部</string>
+    <string name="gutenberg_native_change_block_position">變更區塊位置</string>
+    <string name="label_control_upload">上傳</string>
+    <string name="jetpack_icon_content_description">圖示</string>
+    <string name="backup_download_complete_info">我們也已將檔案連結透過電子郵件傳送給你。</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">分享連結按鈕</string>
+    <string name="backup_download_complete_download_action_button_content_description">下載按鈕</string>
+    <string name="backup_download_complete_icon_content_description">可下載備份已準備就緒圖示</string>
+    <string name="backup_download_complete_download_share_action_button">分享連結</string>
+    <string name="backup_download_complete_download_action_button">下載</string>
+    <string name="backup_download_complete_description_with_two_parameters">我們已成功建立 %1$s %2$s 的網站備份。</string>
+    <string name="backup_download_complete_header">你的備份現在已可下載</string>
+    <string name="backup_download_complete_page_title">你的備份</string>
+    <string name="backup_download_progress_icon_content_description">建立可下載備份圖示</string>
+    <string name="backup_download_progress_description_with_two_parameters">我們正在為你的網站建立 %1$s %2$s 的可下載備份。</string>
+    <string name="backup_download_progress_header">目前正在為你的網站建立可下載的備份</string>
+    <string name="backup_download_progress_footnote">無須等待。 我們會在備份準備就緒時通知你。</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_page_title">下載備份</string>
+    <string name="backup_download_another_download_running">正在執行其他下載作業。</string>
+    <string name="backup_download_generic_failure">處理要求時發生問題。 請稍後再試一次。</string>
+    <string name="backup_download_details_action_button_content_description">建立可下載備份按鈕</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s 是選定建立可下載備份的時間點。</string>
+    <string name="gutenberg_native_image_link_url">圖片連結 URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">多重發佈</string>
+    <string name="suggestion_user">使用者</string>
+    <string name="threat_get_free_estimate">免費估價</string>
+    <string name="threat_ignore">忽略威脅</string>
+    <string name="threat_fix">威脅處理</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan 會解決威脅。</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan 會刪除受影響的檔案或目錄。</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan 將升級至更新版本 (%s)。</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan 會刪除受影響的檔案或目錄。</string>
+    <string name="suggestion_no_matching">沒有相符的 %s。</string>
+    <string name="suggestion_problem">載入建議時發生問題。</string>
+    <string name="suggestion_none">無可用的 %s 建議。</string>
+    <string name="suggestion_selection_needed">請輸入字詞以篩選建議清單。</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan 會替換受影響的檔案或目錄。</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan 無法自動修正此威脅。\n 建議你手動處理，方法如下：確認 WordPress、你使用的佈景主題與所有外掛程式都是最新的版本，並且將可能有資安疑慮的程式碼、佈景主題或外掛程式自網站上移除。 \n \n\n 如需更多協助來解決此威脅，建議你使用 &lt;b&gt;Codeable&lt;/b&gt;；這個自由工作者平台上的 WordPress 專家均通過嚴格審查，專業能力值得信賴。\n 他們已經選出一群安全專家協助你處理這些專案。 價格為一小時 $70 到 $120 之間，平台提供免費報價，不一定要聘用。</string>
+    <string name="threat_fix_current_not_fixable_header">正在解決威脅</string>
+    <string name="threat_fix_fixed_header">Jetpack 如何修復問題？</string>
+    <string name="threat_fix_default_header">如何修復？</string>
+    <string name="threat_file_description">檔案中發現的威脅：</string>
+    <string name="threat_technical_details_header">技術詳細資訊</string>
+    <string name="threat_problem_header">問題為何？</string>
+    <string name="threat_details">威脅詳細資訊</string>
+    <string name="threat_item_sub_header_vulnerable_theme">已在佈景主題中發現安全漏洞</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">已在外掛程式中發現安全漏洞</string>
+    <string name="threat_item_sub_header_file_signature">發現威脅 %s</string>
+    <string name="threat_item_sub_header_core_file">已在 WordPress 中發現安全漏洞</string>
+    <string name="threat_item_sub_header_misc_vulnerability">其他安全漏洞</string>
+    <string name="threat_item_header_vulnerable_theme">易受攻擊的佈景主題：%s (版本：%s)</string>
+    <string name="threat_item_header_vulnerable_plugin">易受攻擊的外掛程式：%s (版本：%s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s：惡意程式碼模式</string>
+    <string name="threat_item_header_database_threat">資料庫有 %s 個威脅</string>
+    <string name="threat_item_header_infected_core_file">%s：受感染的核心檔案</string>
+    <string name="threat_item_header_threat_found">發現威脅</string>
+    <string name="scan_this_site">此網站</string>
+    <string name="scan_idle_last_scan_description">最近一次 Jetpack 掃瞄已執行 %s，且未找到任何風險。 %s</string>
+    <string name="scan_in_few_seconds">幾秒鐘前</string>
+    <string name="threats_fix_all">全部修復</string>
+    <string name="scan_in_minutes_ago">%s 分鐘前</string>
+    <string name="scan_in_hours_ago">%s 小時前</string>
+    <string name="scan_idle_threats_found_title">你的網站可能存在風險</string>
+    <string name="scan_idle_no_threats_found_title">完全不必擔心</string>
+    <string name="scan_again">重新掃瞄</string>
+    <string name="scan_now">立即掃瞄</string>
+    <string name="scan_state_icon">掃瞄狀態圖示</string>
+    <string name="backup">備份</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">活動類型篩選器 (已選取 %s 個類型)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (顯示 %s 個項目)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">活動類型篩選器</string>
+    <string name="activity_log_activity_type_empty_subtitle">選取的日期範圍內沒有任何活動記錄。</string>
+    <string name="activity_log_activity_type_empty_title">無活動可查看</string>
+    <string name="activity_log_activity_type_error_subtitle">請檢查你的網際網路連線，然後再試一次。</string>
+    <string name="activity_log_activity_type_error_title">沒有連線</string>
+    <string name="activity_log_activity_type_filter_active_label">活動類型 (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">日期範圍篩選器</string>
+    <string name="activity_log_active_filter_empty_subtitle">請嘗試調整日期範圍或活動類型篩選條件</string>
+    <string name="activity_log_active_filter_empty_title">找不到符合的活動</string>
+    <string name="backup_item_media_uploads">媒體上傳</string>
+    <string name="backup_item_plugins">WordPress 外掛程式</string>
+    <string name="backup_item_themes">WordPress 佈景主題</string>
+    <string name="backup_download_details_icon_content_description">建立可下載的備份圖示</string>
+    <string name="backup_item_sqls">網站資料庫</string>
+    <string name="backup_item_roots_hint">(包括 wp-config.php 和任何非 WordPress 檔案)</string>
+    <string name="backup_download_details_action_button">建立可下載檔案</string>
+    <string name="backup_download_details_header">建立可下載的備份</string>
+    <string name="backup_download_details_page_title">下載備份</string>
+    <string name="backup_download">備份下載</string>
+    <string name="gutenberg_native_error">錯誤</string>
+    <string name="gutenberg_native_choose_file">選擇檔案</string>
+    <string name="activity_log_item_menu_download_backup_label">下載備份</string>
+    <string name="activity_log_item_menu_restore_label">還原至此時間點</string>
+    <string name="activity_log_activity_type_filter_label">活動類型</string>
+    <string name="activity_log_date_range_filter_label">日期範圍</string>
+    <string name="activity_log_activity_type_filter_header">依活動類型篩選</string>
+    <string name="dialog_confirm_copy_local_copy_button">複製此應用程式的版本</string>
+    <string name="dialog_confirm_copy_local_edit_button">首先編輯文章</string>
+    <string name="dialog_confirm_copy_local_message">你嘗試複製的文章有兩個互相不一致的版本，或者你最近進行變更但沒有儲存。\n首先編輯文章，解決任何不一致，或繼續複製此應用程式的版本。</string>
+    <string name="dialog_confirm_copy_local_title">文章同步不一致</string>
+    <string name="button_copy">複製</string>
+    <string name="toast_edit_story_update_in_progress_title">正在儲存故事，請稍候…</string>
+    <string name="gutenberg_native_file_name">檔案名稱</string>
+    <string name="gutenberg_native_file_block_settings">檔案區塊設定</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">上傳檔案失敗。\n請點選以顯示選項。</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">存檔失敗。\n請點選以顯示選項。</string>
+    <string name="gutenberg_native_edit_file">編輯檔案</string>
+    <string name="gutenberg_native_copy_file_url">複製檔案 URL</string>
+    <string name="gutenberg_native_choose_a_file">選擇檔案</string>
+    <string name="new_site_creation_domain_header_title">選擇網域</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">無法取消訂閱這篇文章的留言</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">無法訂閱這篇文章的留言</string>
+    <string name="reader_follow_comments_get_status_error">擷取文章訂閱狀態時發生錯誤</string>
+    <string name="reader_follow_comments_unsubscribe_success">已成功取消訂閱留言</string>
+    <string name="reader_btn_following_comments">透過電子郵件追蹤對話</string>
+    <string name="reader_btn_follow_comments">透過電子郵件追蹤對話</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack 設定</string>
+    <string name="reader_follow_comments_subscribe_success">已成功訂閱留言</string>
+    <string name="reader_follow_comments_bad_format_response">收到無效回應</string>
+    <string name="reader_follow_comments_null_response">未收到回應</string>
+    <string name="activity_log_activity_type_filter_clear">清除</string>
+    <string name="activity_log_activity_type_filter_apply">套用</string>
+    <string name="dialog_edit_story_unsupported_format_message">一或多張投影片並未加入你的限時動態，因為「限時動態」功能目前不支援 GIF 檔案。 請改為選擇靜態圖片或影片背景。</string>
+    <string name="dialog_edit_story_unsupported_format_title">不支援 GIF 檔案</string>
+    <string name="dialog_edit_story_unrecoverable_message">我們無法在網站上找到這個限時動態使用的媒體。</string>
+    <string name="dialog_edit_story_unrecoverable_title">無法編輯限時動態</string>
+    <string name="dialog_edit_story_unavailable_message">無法載入這個限時動態的媒體 請檢查你的網際網路連線，並稍後再試一次。</string>
+    <string name="dialog_edit_story_unavailable_title">無法編輯限時動態</string>
+    <string name="dialog_edit_story_limited_message">這個限時動態已在不同裝置上編輯過，因此特定物件的編輯功能可能受到限制。</string>
+    <string name="dialog_edit_story_limited_title">限時動態編輯功能受限</string>
+    <string name="cannot_retry_deleted_media_item_fatal">已移除媒體。 請嘗試重新建立你的限時動態。</string>
+    <string name="color_picker_label_background">背景</string>
+    <string name="color_picker_label_text">文字</string>
+    <string name="dialog_discard_story_ok_button_edit">捨棄</string>
+    <string name="dialog_discard_story_message_edit">系統將不會儲存任何變更。</string>
+    <string name="dialog_discard_story_title_edit">要捨棄變更嗎？</string>
+    <string name="label_done_button">完成</string>
+    <string name="label_next_button">下一步</string>
+    <string name="delete_button_alt">刪除</string>
+    <string name="hpp_choose_error">選取設計時發生錯誤。</string>
+    <string name="hpp_retry_error">請檢查你的網際網路連線，然後再試一次。</string>
+    <string name="hpp_error_subtitle">請在重新上線時點選重試。</string>
+    <string name="hpp_error_title">版面配置在離線時無法使用</string>
+    <string name="continue_site_credentials">使用商店憑證繼續</string>
+    <string name="login_find_your_connected_email">尋找你連結的電子郵件</string>
+    <string name="reader_discover_no_posts_button_text">追蹤主題</string>
+    <string name="reader_discover_no_posts_subtitle">嘗試追蹤更多主題以擴大搜尋範圍</string>
+    <string name="reader_discover_no_posts_title">沒有近期文章</string>
+    <string name="reader_discover_empty_title">歡迎！</string>
+    <string name="scan">掃瞄</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; 已回應你的文章</string>
+    <string name="login_prologue_third_subtitle_two">你的網站本日獲得 &lt;b&gt;50 個讚&lt;/b&gt;</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; 已對你的文章按讚</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">已開啟可捲動的區塊選單。 請選取一個區塊。</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">已關閉可捲動的區塊選單。</string>
+    <string name="hpp_skip_button">跳過</string>
+    <string name="hpp_choose_button">選擇</string>
+    <string name="hpp_subtitle">選擇你喜愛的首頁版面配置。 你可於稍後加以編輯及自訂。</string>
+    <string name="hpp_title">選擇一款設計</string>
+    <string name="mlp_network_error_subtitle">請在重新上線時點選重試，或是使用下方按鈕建立空白頁面。</string>
+    <string name="mlp_network_error_title">版面配置在離線時無法使用</string>
+    <string name="mlp_error_subtitle">請點選重試或使用下方按鈕建立空白頁面。</string>
+    <string name="mlp_error_title">發生錯誤導致版面配置無法使用</string>
+    <string name="prepublishing_nudges_add_category_button">新增類別</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">新增類別</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">類別</string>
+    <string name="prepublishing_nudges_home_categories_not_set">未設定</string>
+    <string name="prepublishing_nudges_categories_action">類別</string>
+    <string name="login_prologue_fifth_caption_three">倫敦的博物館</string>
+    <string name="login_prologue_fifth_caption_two">全球最棒的粉絲</string>
+    <string name="login_prologue_fifth_caption_one">我最愛的十家咖啡館</string>
+    <string name="login_prologue_fifth_tag_six">政治</string>
+    <string name="login_prologue_fifth_tag_five">音樂</string>
+    <string name="login_prologue_fifth_tag_four">園藝</string>
+    <string name="login_prologue_fifth_tag_three">橄欖球</string>
+    <string name="login_prologue_fifth_tag_two">烹飪</string>
+    <string name="login_prologue_fifth_tag_one">藝術</string>
+    <string name="login_prologue_fifth_subtitle_three">每週搖滾</string>
+    <string name="login_prologue_fifth_subtitle_two">網路新聞</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">攝影師 Cameron Karsten 的作品讓我深受啟發。 我下次會嘗試這些技巧</string>
+    <string name="login_prologue_second_subtitle_one">激發靈感</string>
+    <string name="login_prologue_title_fourth">透過深入分析資料拓展讀者群。</string>
+    <string name="login_prologue_title_second">這個功能強大的編輯器讓你隨時隨地都能發佈文章。</string>
+    <string name="login_prologue_title_first">歡迎使用全球最受歡迎的網站建置工具。</string>
+    <string name="login_prologue_title_third">即時查看留言和通知。</string>
+    <string name="login_prologue_title_fifth">關注你喜歡的網站並發掘新網誌。</string>
+    <string name="media_loading_failed">媒體載入失敗</string>
+    <string name="reader_discover_recommended_blogs_header">值得關注的網站</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">我們正在努力開發，讓每次版本更新都可以新增更多區塊。</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">無法完全支援「%s」</string>
+    <string name="gutenberg_native_help_button">「協助」按鈕</string>
+    <string name="gutenberg_native_edit_using_web_editor">使用網頁編輯器編輯</string>
+    <string name="gutenberg_native_choose_images">選擇圖片</string>
+    <string name="stories_intro_create_story_post_label">建立限時動態文章</string>
+    <string name="stories_intro_description_second">它們會以新網誌文章的形式發佈在你的網站上，這樣你的讀者群永遠不會錯過任何精彩內容。</string>
+    <string name="stories_intro_title_second">故事文章不會消失</string>
+    <string name="stories_intro_description_first">結合相片、視訊和文字，建立吸睛又可點按的故事，你的訪客一定會喜歡。</string>
+    <string name="stories_intro_title_first">現在人人都可以發佈限時動態</string>
+    <string name="stories_intro_image_caption_second">限時動態標題例子</string>
+    <string name="stories_intro_image_caption_first">如何建立限時動態文章</string>
+    <string name="stories_intro_main_title">限時動態文章介紹</string>
+    <string name="mlp_notice_blank_page_created">已建立空白頁面</string>
+    <string name="mlp_notice_page_created">已建立頁面</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s 存取你的相片時遭拒絕。 若要解決此問題，請編輯存取權限並開啟 %2$s 和 %3$s。</string>
+    <string name="media_insert_failed">媒體插入失敗。</string>
+    <string name="media_insert_failed_with_reason">媒體插入失敗：%s</string>
+    <string name="photo_picker_wordpress_media_library">從 WordPress 媒體庫選擇</string>
+    <string name="reader_label_toolbar_back">返回</string>
+    <string name="reader_discover_empty_button_text">開始使用</string>
+    <string name="reader_post_details_header_by_author_name">發表者：</string>
+    <string name="reader_discover_empty_subtitle">追蹤主題以探索新網誌</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">此推薦連結不能被標記為垃圾郵件</string>
+    <string name="stats_referrer_popup_unmark_as_spam">取消標記為垃圾郵件</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">標記為垃圾</string>
+    <string name="stats_referrer_popup_menu_open_website">開啟網站</string>
+    <string name="media_uploading_gif_library_photo">正在上傳 GIF 媒體</string>
+    <string name="media_uploading_stock_library_photo">正在上傳庫存媒體</string>
+    <string name="media_uploading_default">正在上傳媒體</string>
     <string name="gutenberg_native_select_item">選取項目</string>
     <string name="gutenberg_native_search_or_type_url">搜尋或輸入 URL</string>
+    <string name="gutenberg_native_page_break">分頁符號</string>
     <string name="gutenberg_native_add_this_telephone_link">新增此電話連結</string>
     <string name="gutenberg_native_add_this_link">新增此連結</string>
     <string name="gutenberg_native_add_this_email_link">新增此電子郵件連結</string>
-    <string name="suggestion_no_connection">「沒有網際網路連線。\n無法使用建議。」</string>
+    <string name="suggestion_no_connection">沒有網際網路連線。\n建議無法使用。</string>
     <string name="typeface_label_shrikhand">粗體</string>
     <string name="typeface_label_space_mono">現代</string>
     <string name="typeface_label_pacifico">趣味</string>
@@ -20,25 +493,24 @@ Language: zh_TW
     <string name="typeface_label_nunito">休閒</string>
     <string name="toast_capture_operation_permission_needed">你需要授予應用程式錄音權限，才能錄製影片</string>
     <string name="mlp_selected_description">已選取 %s</string>
+    <string name="mlp_notselected_description">%s</string>
     <string name="login_get_link_by_email">透過電子郵件取得登入連結</string>
     <string name="email_not_registered_wpcom">很抱歉，我們找不到與此電子郵件地址連結的 WordPress.com 帳號。</string>
     <string name="permission_microphone">麥克風</string>
     <string name="comment_unable_to_show_error">無法顯示此留言</string>
     <string name="media_browse_for_items">瀏覽項目</string>
     <string name="reader_menu_report_post">檢舉這篇文章</string>
-    <string name="gutenberg_native_angle">角度</string>
     <string name="reader_welcome_banner">歡迎使用閱讀器。 動動指尖即可探索數百萬個網誌。</string>
     <string name="error_media_xmlrcp_server_error">發生內部伺服器錯誤</string>
     <string name="error_media_xmlrpc_not_allowed">你無法執行此動作</string>
     <string name="show_n_hidden_items_desc">其他 %1$s 個項目</string>
-    <string name="gutenberg_native_select_a_layout">選取版面配置</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes">請注意：內容欄版面配置可能會因佈景主題和螢幕尺寸而有所不同</string>
+    <string name="gutenberg_native_select_a_layout">選取版面配置</string>
+    <string name="reader_discover_interests_header">你可能會喜歡</string>
+    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">隱藏</string>
     <string name="create_post_story_fab_tooltip">建立文章或故事</string>
     <string name="create_page_fab_tooltip">建立頁面</string>
     <string name="create_post_fab_tooltip">建立文章</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
-    <string name="reader_discover_interests_header">你可能會喜歡</string>
-    <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">隱藏</string>
     <string name="gutenberg_native_video_caption_empty">視訊標題。 清空</string>
     <string name="gutenberg_native_updates_the_title">更新標題。</string>
     <string name="gutenberg_native_paste_block_after">將區塊貼在以下物件後方：</string>
@@ -75,7 +547,6 @@ Language: zh_TW
     <string name="dialog_discard_errored_page_message">此投影片尚未儲存。 若刪除此投影片，你所做的任何編輯將會遺失。</string>
     <string name="dialog_discard_page_message">此投影片將從你的故事移除。</string>
     <string name="dialog_discard_page_title">要刪除故事投影片嗎？</string>
-    <string name="menu_delete_page">刪除投影片</string>
     <string name="label_text_color_button">變更文字顏色</string>
     <string name="label_text_alignment_button">變更文字對齊方式</string>
     <string name="label_frame_errored">發生錯誤</string>
@@ -85,8 +556,6 @@ Language: zh_TW
     <string name="label_retry_icon">重試</string>
     <string name="label_saved_icon">已儲存</string>
     <string name="label_close_button">關閉</string>
-    <string name="label_control_publish">下一篇</string>
-    <string name="label_done">完成</string>
     <string name="label_share_to">分享至</string>
     <string name="label_snackbar_share">分享</string>
     <string name="label_snackbar_loop_frame_saved">已儲存至相片</string>
@@ -97,7 +566,6 @@ Language: zh_TW
     <string name="label_control_flip_camera">翻轉</string>
     <string name="sound_button_alt">音效</string>
     <string name="text_button_alt">文字</string>
-    <string name="more_button_alt">更多</string>
     <string name="stickers_button_alt">貼紙</string>
     <string name="flash_button_alt">閃爍</string>
     <string name="flip_button_alt">翻轉相機</string>
@@ -106,9 +574,11 @@ Language: zh_TW
     <string name="mlp_create_page">建立頁面</string>
     <string name="mlp_create_blank_page">建立空白頁面</string>
     <string name="mlp_choose_layout_subtitle">首先請從各種預先製作的頁面版面配置挑選。 或從空白頁面開始也可以。</string>
-    <string name="mlp_choose_layout_title">選擇版面配置</string>
     <string name="prepublishing_nudges_story_title_hint">新增故事標題</string>
-    <string name="quick_start_dialog_create_new_post_message_short">點選 %1$s「建立」。 %2$s 然後選取&lt;b>「網誌文章」&lt;/b></string>
+    <string name="quick_start_dialog_create_new_post_message_short">點選 %1$s「建立」。 %2$s 然後選取&lt;b&gt;「網誌文章」&lt;/b&gt;</string>
+    <string name="mlp_choose_layout_title">選擇版面配置</string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">建立文章或限時動態</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">建立文章、頁面或限時動態</string>
     <string name="photo_picker_choose_file">從裝置中選擇</string>
     <string name="my_site_bottom_sheet_add_story">故事文章</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">你需要 Jetpack 外掛程式才能在自助託管的 WordPress 網站上編輯網站圖示。</string>
@@ -122,13 +592,10 @@ Language: zh_TW
     <string name="gutenberg_native_choose_image_or_video">選擇圖片或視訊</string>
     <string name="gutenberg_native_choose_image">選擇圖片</string>
     <string name="gutenberg_native_block_removed">已移除區塊</string>
-    <string name="content_description_logo">WordPress 標誌</string>
-    <string name="enter_your_site_address">請輸入你的網站位址</string>
-    <string name="continue_with_wpcom">繼續使用 WordPress.com</string>
     <string name="signup_confirmation_title">註冊確認</string>
     <string name="continue_with_google_terms_of_service_text">如果你繼續使用 Google 操作且尚未擁有 WordPress.com 帳號，即表示你正在建立帳號，並同意我們的%1$s服務條款%2$s。</string>
+    <string name="enter_your_site_address">輸入你現有的網址</string>
     <string name="continue_terms_of_service_text">繼續操作即代表你同意我們的%1$s服務條款%2$s。</string>
-    <string name="signup_confirmation_magic_link_message">我們會透過電子郵件傳送註冊連結給你，使用此連結即可建立新的 WordPress.com 帳號。</string>
     <string name="signup_confirmation_message">我們會使用這個電子郵件地址，為你建立全新的 WordPress.com 帳號。</string>
     <string name="signup_magic_link_message">我們已透過電子郵件傳送註冊連結給你，使用此連結即可建立新的 WordPress.com 帳號。 請使用此裝置查看電子郵件，並點選 WordPress.com 所傳送電子郵件中的連結。</string>
     <string name="enter_account_info_for_site">輸入你的 %1$s 帳號資訊。</string>
@@ -145,18 +612,15 @@ Language: zh_TW
     <string name="or_type_your_password">或輸入你的密碼</string>
     <string name="create_account">建立帳號</string>
     <string name="send_link_by_email">以電子郵件傳送連結</string>
-    <string name="login_promo_text_unlock_the_power">最具彈性、功能最強大的網站建置系統，釋放無限可能。</string>
-    <string name="login_promo_title_37_percent">37\% 的網站皆選用 WordPress 建置。</string>
     <string name="reset_your_password">重設密碼</string>
-    <string name="quick_start_list_update_site_title_subtitle">為網站取一個能反映出自我風格和主題的名稱。 第一印象很重要！</string>
+    <string name="reader_error_request_failed_title">處理要求時發生問題。 請稍後再試一次。</string>
     <string name="quick_start_list_update_site_title_title">設定你的網站標題</string>
-    <string name="quick_start_dialog_update_site_title_message_short">點選 &lt;b>%1$s&lt;/b> 以設定新標題</string>
+    <string name="quick_start_dialog_update_site_title_message_short">點選 &lt;b&gt;%1$s&lt;/b&gt; 以設定新標題</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">將這篇文章移至垃圾桶也會捨棄本機變更，確定要繼續此操作？</string>
     <string name="gutenberg_native_s_block_options">%s 區塊選項</string>
     <string name="gutenberg_native_duplicate_block">重複區塊</string>
     <string name="gutenberg_native_copy_block">複製區塊</string>
     <string name="gutenberg_native_copied_block">複製的區塊</string>
-    <string name="gutenberg_native_block_settings">區塊設定</string>
     <string name="gutenberg_native_block_pasted">已貼上區塊</string>
     <string name="gutenberg_native_block_duplicated">已重複區塊</string>
     <string name="gutenberg_native_block_cut">已剪下區塊</string>
@@ -172,7 +636,6 @@ Language: zh_TW
     <string name="gutenberg_native_gradient_type">漸層色彩類型</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">按兩下以選擇</string>
     <string name="gutenberg_native_customize_gradient">自訂漸層色彩</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">頁面作者</string>
     <string name="photo_picker_use_gif">使用此 GIF</string>
     <string name="error_media_thumbnail_not_loaded">無法載入媒體縮圖</string>
@@ -182,7 +645,6 @@ Language: zh_TW
     <string name="gutenberg_native_dismiss">關閉</string>
     <string name="prepublishing_nudges_home_tags_not_set">未設定</string>
     <string name="prepublishing_tags_description">標籤可協助讀者瞭解文章內容。</string>
-    <string name="prepublishing_nudges_toolbar_title_publish">發表日期</string>
     <string name="prepublishing_nudges_toolbar_title_tags">新增標籤</string>
     <string name="prepublishing_nudges_back_button">返回</string>
     <string name="prepublishing_nudges_home_save_button">立即儲存</string>
@@ -194,10 +656,8 @@ Language: zh_TW
     <string name="post_list_move_trashed_post_to_draft_dialog_negative">取消</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">移至草稿</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">你無法編輯移至垃圾桶的文章。 要將此文章狀態變更為「草稿」以便修正嗎？</string>
+    <string name="prepublishing_nudges_toolbar_title_publish">發表日期</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">是否將文章移至草稿？</string>
-    <string name="reader_label_choose_your_interests">選擇你的興趣</string>
-    <string name="reader_choose_interests_content_description">選擇你的興趣</string>
-    <string name="reader_btn_done">完成</string>
     <string name="reader_btn_select_few_interests">選取幾項以繼續操作</string>
     <string name="post_status_post_published">已發表</string>
     <string name="post_status_post_trashed">已移至垃圾桶</string>
@@ -205,25 +665,25 @@ Language: zh_TW
     <string name="publish_date">發表日期</string>
     <string name="ccpa_privacy_notice_read">閱讀《加州消費者隱私保護法》(CCPA) 隱私權聲明</string>
     <string name="ccpa_privacy_notice_caption">根據《加州消費者隱私保護法》(以下稱「CCPA」) 規定，我們必須提供加州使用者一些額外資訊，說明我們收集和分享的個人資訊種類、從哪裡取得這些資訊，以及這些資訊的使用方式及用途。</string>
+    <string name="reader_btn_done">完成</string>
+    <string name="reader_label_choose_your_interests">選擇你的主題</string>
+    <string name="reader_choose_interests_content_description">選擇你的主題</string>
     <string name="ccpa_privacy_notice_header">加州使用者的隱私權聲明</string>
     <string name="status_and_visibility">狀態及可見度</string>
     <string name="update_now">馬上更新</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">試用入門版面配置</string>
     <string name="gutenberg_native_open_block_actions_menu">開啟區塊操作選單</string>
-    <string name="gutenberg_native_insert_mention">插入標記</string>
+    <string name="gutenberg_native_move_to_top">移至頂端</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">按兩下以開啟含有可用選項的底部工作表</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">按兩下以開啟含有可用選項的操作工作表</string>
     <string name="pages_cannot_be_started">目前我們無法開啟頁面。請稍後再試一次</string>
     <string name="pages_set_as_posts_page">設為文章頁面</string>
     <string name="pages_set_as_homepage">設為首頁</string>
-    <string name="suggestion_no_matching_users">「沒有符合條件的使用者。」</string>
-    <string name="suggestion_invalid_user">「%s不是有效的使用者」</string>
     <string name="site_settings_select_page">選取頁面</string>
     <string name="site_settings_posts_page">文章列表頁面</string>
     <string name="site_settings_static_homepage">靜態首頁</string>
     <string name="site_settings_classic_blog">傳統網誌</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">選取的首頁和文章頁面不能相同。</string>
+    <string name="suggestion_invalid">%s 不是有效的 %s</string>
     <string name="site_settings_failed_update_homepage_settings">首頁設定更新失敗，請檢查你的網際網路連線</string>
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">載入頁面之前無法儲存首頁設定</string>
     <string name="site_settings_failed_to_save_homepage_settings">無法儲存首頁設定</string>
@@ -238,14 +698,12 @@ Language: zh_TW
     <string name="page_homepage_successfully_updated">首頁已成功更新</string>
     <string name="page_cannot_set_posts_page">若要設定文章頁面，請在網站設定中啟用「靜態首頁」</string>
     <string name="page_cannot_set_homepage">若要設定首頁，請在網站設定中啟用「靜態首頁」</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">歡迎來到我們全新的網誌</string>
     <string name="gutenberg_native_select_a_color">選擇顏色</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">點選兩次即可前往顏色設定</string>
     <string name="reader_empty_followed_blogs_description">關注網站後，網站內容就會顯示於此</string>
     <string name="feature_announcement_find_out_mode">瞭解更多</string>
     <string name="feature_announcement_dialog_label">WordPress 新功能</string>
     <string name="insert_label_with_count">插入 %d 個</string>
-    <string name="crop">裁剪</string>
     <string name="error_failed_to_load_into_file">無法載入檔案，請再試一次。</string>
     <string name="preview_image_thumbnail_description">預覽圖片縮圖</string>
     <string name="photo_picker_use_media">使用此媒體</string>
@@ -253,6 +711,7 @@ Language: zh_TW
     <string name="photo_picker_photo_or_video_title">選擇媒體</string>
     <string name="photo_picker_video_title">選擇視訊</string>
     <string name="site_picker_ask_site_select">無法選擇網站，請再試一次。</string>
+    <string name="crop">裁剪</string>
     <string name="sitepicker_continue_flow">繼續</string>
     <string name="reader_reblog_error">轉發失敗</string>
     <string name="reader_no_site_to_reblog_action">管理網站</string>
@@ -272,7 +731,6 @@ Language: zh_TW
     <string name="gutenberg_native_move_block_left">向左移動區塊</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">按兩下將區塊向右移</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">按兩下將區塊向左移</string>
-    <string name="gutenberg_native_blog">網誌</string>
     <string name="new_site_creation_creating_site_loading_4">建立儀表板</string>
     <string name="new_site_creation_creating_site_loading_3">設定佈景主題</string>
     <string name="new_site_creation_creating_site_loading_2">新增網站功能</string>
@@ -294,12 +752,12 @@ Language: zh_TW
     <string name="media_accessing_failed">無法存取私人網站的內容。部分媒體可能無法使用</string>
     <string name="media_accessing_progress">正在存取私人網站的內容</string>
     <string name="error_failed_to_crop_and_save_image">無法裁剪和儲存圖片，請再試一次。</string>
-    <string name="failed_to_load_image_tap_to_retry">無法載入圖片。\n請點選以重試。</string>
     <string name="preview_image_description">預覽圖片</string>
     <string name="error_unknown_page_type">不明的頁面格式</string>
     <string name="error_page_not_submitted">我們無法完成此動作，因此未將此頁面提交送審。</string>
     <string name="error_page_not_scheduled">我們無法完成此動作，因此未排程此頁面。</string>
     <string name="error_page_not_published_private">我們無法完成此動作，因此未發表這篇私密文章。</string>
+    <string name="failed_to_load_image_tap_to_retry">無法載入圖片。\n請點選以重試。</string>
     <string name="error_page_not_published">我們無法完成此動作，因此未發表此頁面。</string>
     <string name="error_page_not_submitted_retrying">我們無法將此頁面提交送審，但稍後會再試一次。</string>
     <string name="error_page_not_scheduled_retrying">我們無法排程此頁面，但稍後會再試一次。</string>
@@ -328,57 +786,20 @@ Language: zh_TW
     <string name="app_theme_light">淡色系</string>
     <string name="app_theme">外觀</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">你最近變更了這個頁面，但沒有儲存這些變更。選擇要載入的版本：\n\n</string>
-    <string name="gutenberg_native_what_people_say">使用者評價</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">我們提供一系列服務，可協助你達到期望的成果。不確定自己需要什麼，或所需內容的費用嗎？我們可以說明有哪些符合你需求的服務，並提供相關費用的詳細資訊。請於下方與我們聯絡。</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">我們是由一群才華橫溢的專業人士組成的小團隊，具備廣泛的技能和經驗。我們熱愛自己的工作，對旅遊產業充滿熱情。期待能與你合作。</string>
-    <string name="gutenberg_native_warning_message">警告訊息</string>
-    <string name="gutenberg_native_want_to_work_with_us">想加入我們的行列嗎？</string>
-    <string name="gutenberg_native_walt_disney">華特迪士尼</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">訪客會想知道頁面作者是什麼樣的人。利用此空間介紹你本人、你的網站、企業或任何你想說的話。使用下方的證言，即可引用他人針對同一主題發表的言論。</string>
-    <string name="gutenberg_native_usa">美國</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">這是範本內含的範例內容，用以說明其功能。你可以移除或用自己的話和媒體取代該內容。</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">想要有所做為，坐而言不如起而行。</string>
-    <string name="gutenberg_native_team">團隊</string>
-    <string name="gutenberg_native_success_message">成功訊息</string>
-    <string name="gutenberg_native_strategy">策略</string>
     <string name="gutenberg_native_show_post_content">顯示文章內容</string>
-    <string name="gutenberg_native_services">服務</string>
-    <string name="gutenberg_native_samuel_the_dog">校犬 Samuel</string>
-    <string name="gutenberg_native_sally_smith">莎莉史密斯</string>
-    <string name="gutenberg_native_project_name">專案名稱</string>
-    <string name="gutenberg_native_position_or_job_title">職位或職稱</string>
-    <string name="gutenberg_native_portfolio">作品集</string>
     <string name="gutenberg_native_only_show_excerpt">只顯示摘要</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">我的個人作品集展示了我在職涯中完成的各項專案。我的聯絡資訊如下，歡迎與我聯繫。</string>
     <string name="gutenberg_native_link_to">連結至</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">與我們討論 👋 如有任何疑問，歡迎使用下方資訊與我們聯絡，或使用表單傳送訊息給我們。</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">讓我們攜手創造不凡！</string>
-    <string name="gutenberg_native_let_s_build_something_together">讓我們攜手創造不凡！</string>
-    <string name="gutenberg_native_juan_p_rez">胡安培瑞茲</string>
-    <string name="gutenberg_native_j_k_rowling">J.K.羅琳</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">哈利，決定我們成為什麼樣的人，並不是我們的能力，而是我們做了什麼選擇。</string>
-    <string name="gutenberg_native_inspiration">旅遊靈感</string>
-    <string name="gutenberg_native_get_in_touch">與我們聯絡</string>
+    <string name="gutenberg_native_link_settings">連結設定</string>
     <string name="gutenberg_native_excerpt_length_words">摘要長度 (字數)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">透過電子郵件聯絡我：&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">蘇斯博士</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">不要因為結束而哭泣，要為曾經發生過而微笑。</string>
     <string name="gutenberg_native_customize">自訂</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
     <string name="gutenberg_native_add_paragraph_block">新增段落區塊</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">簡要說明你提供的服務。</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">提供簡短自傳，包括個人經歷、重大成就或趣事。</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">專案及展示作品的說明。</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
+    <string name="gutenberg_native_video_settings">視訊設定</string>
     <string name="create_post_page_fab_tooltip_contributors">建立文章</string>
     <string name="post_list_tab_trashed_posts">已移至垃圾桶</string>
     <string name="post_list_tab_scheduled_posts">已排程</string>
     <string name="post_list_tab_published_posts">已發佈</string>
     <string name="sharing_facebook_account_must_have_pages">Facebook 連結找不到任何頁面。Publicize 無法連結至 Facebook 個人檔案，只能連結至已發表的頁面。</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">未連線</string>
-    <string name="my_site_select_domains_page_title">網站位址</string>
     <string name="notifications_tab_title_likes">按讚數</string>
     <string name="notifications_tab_title_follows">關注者</string>
     <string name="notifications_tab_title_comments">留言</string>
@@ -392,12 +813,12 @@ Language: zh_TW
     <string name="stats_management_add_new_stats_card">新增統計資料卡片</string>
     <string name="reader_self_hosted_select_filter">使用篩選按鈕尋找特定主題的文章</string>
     <string name="reader_bottom_sheet_content_description">選擇一個標籤或網站、快顯視窗</string>
-    <string name="reader_btn_selected_filter_tick_content_description">已選取</string>
     <string name="reader_btn_select_filter_content_description">選擇網站或標籤以篩選文章</string>
     <string name="reader_btn_remove_filter_content_description">移除目前的篩選條件</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">登入 WordPress.com</string>
+    <string name="reader_title_subs">管理主題和網站</string>
     <string name="reader_filter_self_hosted_empty_sites_list">登入 WordPress.com，查看關注網站的最新文章</string>
-    <string name="gutenberg_native_template_preview">範例預覽</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">登入 WordPress.com，查看你關注主題的最新文章</string>
     <string name="gutenberg_native_replace_current_block">取代目前區塊</string>
     <string name="gutenberg_native_add_to_end">新增至「結束」</string>
     <string name="gutenberg_native_add_to_beginning">新增至「開始」</string>
@@ -405,11 +826,12 @@ Language: zh_TW
     <string name="gutenberg_native_add_block_after">在之後新增區塊</string>
     <string name="reader_filter_empty_sites_action">關注網站</string>
     <string name="reader_filter_empty_sites_list">查看你關注網站的最新聞張</string>
+    <string name="reader_filter_empty_tags_action">新增主題</string>
+    <string name="reader_filter_empty_tags_list">你可以新增主題以關注特定主題的文章</string>
     <string name="reader_filter_main_title">關注中</string>
     <string name="reader_filter_cta">篩選</string>
     <string name="gutenberg_native_video_caption_s">視訊標題。%s</string>
     <string name="gutenberg_native_edit_video">編輯視訊</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">按兩下以選擇版面形式</string>
     <string name="gutenberg_native_add_a_shortcode">新增短代碼…</string>
     <string name="post_list_author">文章作者</string>
     <string name="fab_create_desc">建立文章</string>
@@ -424,11 +846,9 @@ Language: zh_TW
     <string name="stats_box_type_low">低</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry"> 與 %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s，%2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">向前移動圖片</string>
-    <string name="gutenberg_native_move_image_backward">向後移動圖片</string>
     <string name="gutenberg_native_gallery_caption_s">圖庫標題。%s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s。目前的值是 %2$s</string>
     <string name="create_post_page_fab_tooltip">建立文章或頁面</string>
+    <string name="gutenberg_native_replace_image">更換圖片</string>
     <string name="content_description_person_building_website">網站架設人員</string>
     <string name="post_signup_interstitial_not_right_now">現在不用</string>
     <string name="post_signup_interstitial_subtitle">無論你要建立或共享，我們都會為你提供協助。</string>
@@ -441,53 +861,46 @@ Language: zh_TW
     <string name="my_site_bottom_sheet_add_post">網誌文章</string>
     <string name="my_site_bottom_sheet_title">新增</string>
     <string name="post_settings_publish">發佈</string>
-    <string name="dialog_gutenberg_informative_description_v2">我們大幅改進了區塊編輯器，值得你一試！我們為新文章和頁面啟用了這項功能，但如果你希望變更為傳統編輯器，請前往「我的網站」>「網站設定」進行變更。</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">立即同步</string>
     <string name="dialog_confirm_scheduled_post_sync_message">此文章會立即同步。</string>
     <string name="dialog_confirm_scheduled_post_sync_title">準備好要同步了嗎？</string>
     <string name="new_site_creation_unavailable_domain">此網域不可使用</string>
-    <string name="login_promo_viewpager_content_description">簡介</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_discovery_error_ssl">由於 &lt;b>SSL 憑證&lt;/b>發生問題，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_discovery_error_http_auth">由於你的網站須進行 &lt;b>HTTP 驗證&lt;/b>，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_discovery_error_xmlrpc">無法存取你網站上的 &lt;b>XMLRPC 檔案&lt;/b>。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_site_credentials_magic_link_label">快完成了！我們只需驗證你與 Jetpack 綁定的電子郵件地址就行了&lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">請使用網站憑證登入。</string>
+    <string name="login_discovery_error_ssl">由於 &lt;b&gt;SSL 憑證&lt;/b&gt;發生問題，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
+    <string name="login_discovery_error_http_auth">由於你的網站須進行 &lt;b&gt;HTTP 驗證&lt;/b&gt;，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
+    <string name="login_discovery_error_xmlrpc">無法存取你網站上的 &lt;b&gt;XMLRPC 檔案&lt;/b&gt;。你必須聯絡主機商以解決此問題。</string>
+    <string name="login_site_credentials_magic_link_label">快完成了！我們只需驗證你與 Jetpack 綁定的電子郵件地址就行了&lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">請使用 %1$s 網站憑證登入</string>
-    <string name="send_verification_email">傳送驗證電子郵件</string>
-    <string name="my_site_bottom_sheet_add_page">網頁</string>
     <string name="reader_following_display_name">關注中</string>
-    <string name="reader_my_likes_display_name">按讚數</string>
-    <string name="reader_discover_display_name">探索</string>
-    <string name="reader_save_for_later_display_name">已儲存</string>
-    <string name="reader_filter_sites_title">網站</string>
-    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
-    <string name="suffix_1_000_000_000_000_000">%sQa</string>
-    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="my_site_bottom_sheet_add_page">網頁</string>
+    <string name="posts_cannot_be_started">目前無法開啟文章。請稍後再試一次</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
-    <string name="posts_cannot_be_started">目前無法開啟文章。請稍後再試一次</string>
+    <string name="suffix_1_000_000_000_000_000">%sQa</string>
+    <string name="suffix_1_000_000_000_000">%sT</string>
+    <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
+    <string name="reader_filter_sites_title">網站</string>
+    <string name="reader_save_for_later_display_name">已儲存</string>
+    <string name="reader_discover_display_name">探索</string>
+    <string name="reader_my_likes_display_name">按讚數</string>
     <string name="site_cannot_be_loaded">目前無法載入你的網站資料。請稍後再試一次</string>
+    <string name="reader_filter_tags_title">主題</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress 媒體庫</string>
     <string name="gutenberg_native_ungroup">取消群組</string>
     <string name="gutenberg_native_translate">翻譯</string>
-    <string name="gutenberg_native_title">標題：</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">點選即可隱藏鍵盤</string>
     <string name="gutenberg_native_tap_here_to_show_help">點選此處顯示說明</string>
     <string name="gutenberg_native_take_a_video">拍攝視訊</string>
     <string name="gutenberg_native_take_a_photo_or_video">拍攝相片或視訊</string>
     <string name="gutenberg_native_take_a_photo">拍攝照片</string>
     <string name="gutenberg_native_start_writing">開始撰寫內容…</string>
-    <string name="gutenberg_native_size">大小</string>
-    <string name="gutenberg_native_sidebar_title_plugin">側邊欄標題外掛程式</string>
+    <string name="gutenberg_native_unsupported">不支援</string>
     <string name="gutenberg_native_show_section">顯示區段</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s 區塊含有無效內容</string>
     <string name="gutenberg_native_s_block_empty">%s 區塊空白</string>
     <string name="gutenberg_native_cut_block">剪下區塊</string>
-    <string name="gutenberg_native_reset_block">重設區塊</string>
-    <string name="gutenberg_native_remove_annotations">移除註解</string>
     <string name="gutenberg_native_problem_opening_the_video">開啟視訊時發生問題</string>
     <string name="gutenberg_native_problem_displaying_block">顯示區塊時發生問題</string>
     <string name="gutenberg_native_post_title_s">文章標題。%s</string>
@@ -497,17 +910,12 @@ Language: zh_TW
     <string name="gutenberg_native_open_settings">開啟設定</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">沒有應用程式可以處理這項要求。請安裝網頁瀏覽器。</string>
     <string name="gutenberg_native_navigate_up">瀏覽</string>
-    <string name="gutenberg_native_my_pre_publish_panel">我的發表前面板</string>
-    <string name="gutenberg_native_my_post_status_info">我的文章狀態資訊</string>
-    <string name="gutenberg_native_my_post_publish_panel">我的發表後面板</string>
-    <string name="gutenberg_native_my_document_setting_panel">我的文件設定面板</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">將區塊從第 %1$s 列向上移至第 %2$s 列</string>
     <string name="gutenberg_native_move_block_up">向上移動區塊</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">將區塊從第 %1$s 列向下移至第 %2$s 列</string>
     <string name="gutenberg_native_move_block_down">向下移動區塊</string>
     <string name="gutenberg_native_image_caption_s">圖片說明。%s</string>
     <string name="gutenberg_native_hide_keyboard">隱藏鍵盤</string>
-    <string name="gutenberg_native_here_is_the_panel_content">這裡是面板內容！</string>
     <string name="gutenberg_native_help_icon">說明圖示</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">無法插入媒體。\n請點選以顯示選項。</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">按兩次即可復原上次變更</string>
@@ -519,12 +927,9 @@ Language: zh_TW
     <string name="gutenberg_native_double_tap_to_move_the_block_up">按兩下將區塊向上移</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">按兩下將區塊向下移</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">按兩下以編輯此數值</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">按兩下以使用滑桿變更數值</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">按兩下以新增區塊</string>
     <string name="gutenberg_native_current_value_is_s">目前的值是 %s</string>
-    <string name="gutenberg_native_content">內容…</string>
     <string name="gutenberg_native_choose_from_device">從裝置中選擇</string>
-    <string name="gutenberg_native_annotations_sidebar">註解側邊欄</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">發生不明的錯誤，請再試一次。</string>
     <string name="gutenberg_native_alt_text">替代文字</string>
     <string name="gutenberg_native_add_video">新增視訊</string>
@@ -532,21 +937,18 @@ Language: zh_TW
     <string name="gutenberg_native_add_image_or_video">新增圖片或視訊</string>
     <string name="gutenberg_native_add_image">新增圖片</string>
     <string name="gutenberg_native_add_block_here">在此新增區塊</string>
-    <string name="gutenberg_native_add_annotation">新增註解</string>
-    <string name="gutenberg_native_add_a_description">新增說明</string>
+    <string name="gutenberg_native_add_alt_text">新增替代文字</string>
     <string name="reader_empty_saved_posts_content_description">點選「新增至儲存文章」按鈕即可將文章儲存至你的清單。</string>
     <string name="reader_acessibility_list_loaded">「此清單已載入 %1$d 個項目。」</string>
     <string name="notifications_tab_dialog_switch_desc">通知</string>
-    <string name="master_switch_default_title_off">關閉</string>
-    <string name="master_switch_default_title_on">開啟</string>
-    <string name="notifications_tab_dialog_master_off_message">若關閉此網站的「通知」功能，將會停用網站通知分頁的通知顯示。你可以開啟網站的「通知」功能，進一步調整想查看哪一類通知。</string>
-    <string name="notifications_tab_dialog_master_off_title">若要在此網站的通知分頁查看通知，請開啟此網站的「通知」功能。</string>
-    <string name="notifications_tab_dialog_master_hint_off">啟用此網站通知分頁的通知顯示</string>
-    <string name="notifications_tab_dialog_master_hint_on">停用此網站通知分頁的通知顯示</string>
-    <string name="notifications_tab_dialog_master_status_off">此網站的通知</string>
-    <string name="notifications_tab_dialog_master_status_on">此網站的通知</string>
-    <string name="dialog_gutenberg_informative_description_page">你正在使用區塊編輯器編輯新頁面，太棒了！ 如想改用傳統編輯器，請前往「我的網站」>「網站設定」。</string>
-    <string name="dialog_gutenberg_informative_description_post">你正在使用區塊編輯器編輯新文章，太棒了！ 如想改用傳統編輯器，請前往「我的網站」>「網站設定」。</string>
+    <string name="notifications_tab_dialog_main_off_message">若關閉此網站的「通知」功能，將會停用網站通知分頁的通知顯示。 你可以開啟網站的「通知」功能，進一步調整想查看的通知類型。</string>
+    <string name="main_switch_default_title_off">關閉</string>
+    <string name="main_switch_default_title_on">開啟</string>
+    <string name="notifications_tab_dialog_main_off_title">若要在此網站的通知分頁查看通知，請開啟此網站的「通知」功能。</string>
+    <string name="notifications_tab_dialog_main_hint_off">啟用此網站通知分頁的通知顯示</string>
+    <string name="notifications_tab_dialog_main_hint_on">停用此網站通知分頁的通知顯示</string>
+    <string name="notifications_tab_dialog_main_status_off">此網站的通知</string>
+    <string name="notifications_tab_dialog_main_status_on">此網站的通知</string>
     <string name="pick_media">新增圖片或視訊</string>
     <string name="error_post_not_submitted_retrying">我們無法將這篇文章提交送審，但稍後會再試一次。</string>
     <string name="error_post_not_scheduled_retrying">我們無法排程這篇文章，但稍後會再試一次。</string>
@@ -639,8 +1041,6 @@ Language: zh_TW
     <string name="post_settings_add_to_calendar">新增到行事曆</string>
     <string name="post_settings_notification">通知</string>
     <string name="post_settings_time_and_date">日期和時間</string>
-    <string name="login_need_help_finding_connected_email">需要協助找出你連結的電子郵件嗎？</string>
-    <string name="enter_wordpress_site">此地址的網站不是 WordPress 網站。為協助我們連結網站，網站必須安裝 WordPress。</string>
     <string name="login_invalid_site_url">請輸入完整的網站位址，例如 example.com。</string>
     <string name="enter_email_for_site">透過 WordPress.com 登入以連結至 %1$s</string>
     <string name="stats_post_views_label">瀏覽次數</string>
@@ -706,7 +1106,7 @@ Language: zh_TW
     <string name="domain_registration_state_picker_dialog_title">選取州/省</string>
     <string name="domain_registration_country_picker_dialog_title">選取國家</string>
     <string name="domain_registration_result_continue_button">繼續</string>
-    <string name="domain_registration_result_description">正在設定你的新網域 &lt;b>%s&lt;/b>。你的網站\n簡直令人樂不可支！</string>
+    <string name="domain_registration_result_description">正在設定你的新網域 &lt;b&gt;%s&lt;/b&gt;。你的網站\n簡直令人樂不可支！</string>
     <string name="domain_registration_result_title">恭喜</string>
     <string name="domain_contact_information_register_domain_button">註冊網域</string>
     <string name="domain_contact_information_postal_code_hint">郵遞區號</string>
@@ -736,12 +1136,15 @@ Language: zh_TW
     <string name="editor_uploading_draft">你的草稿正在上傳中…</string>
     <string name="post_uploading_draft">正在上傳草稿</string>
     <string name="error_restoring_post">還原文章時發生錯誤</string>
+    <string name="post_list_tab_drafts">草稿</string>
     <string name="backdated_for">回溯至：%s</string>
     <string name="stats_insights_management_title">只查看最相關的統計資料。在下方新增及管理你的洞察報告。</string>
     <string name="stats_insights_social">社交</string>
     <string name="stats_insights_annual_site_stats">年度網站統計</string>
     <string name="register_domain">註冊網域</string>
     <string name="jetpack_installed_message">現在 Jetpack 已安裝完成，我們只需要協助你完成設定即可。這只需要一分鐘左右。</string>
+    <string name="stats_view_follower_totals">追蹤者總數</string>
+    <string name="domain_suggestions_search_hint">輸入關鍵字尋找更多想法</string>
     <string name="stats_menu_remove">從洞察報告中移除</string>
     <string name="stats_menu_move_down">向下移動</string>
     <string name="stats_menu_move_up">向上移動</string>
@@ -750,8 +1153,8 @@ Language: zh_TW
     <string name="post_restoring">正在還原文章</string>
     <string name="post_restored">文章已還原</string>
     <string name="post_trashing">正在將文章移至垃圾桶</string>
-    <string name="dialog_confirm_trash_losing_unsaved_changes_message">將這篇文章移至垃圾桶也會捨棄未儲存的變更，確定要繼續此操作？</string>
     <string name="dialog_confirm_trash_losing_local_changes_title">本機變更</string>
+    <string name="dialog_confirm_trash_losing_unsaved_changes_message">將這篇文章移至垃圾桶也會捨棄未儲存的變更，確定要繼續此操作？</string>
     <string name="button_move_to_draft">移至草稿</string>
     <string name="post_list_toggle_item_layout_list_view">切換至清單檢視</string>
     <string name="post_list_toggle_item_layout_cards_view">切換至卡片檢視</string>
@@ -776,7 +1179,6 @@ Language: zh_TW
     <string name="plugin_install_custom_domain_required_dialog_register_btn">註冊網域</string>
     <string name="plugin_install_custom_domain_required_dialog_message">若要安裝外掛程式，你的自訂網域必須與你的網站建立關聯。</string>
     <string name="plugin_install_custom_domain_required_dialog_title">安裝外掛程式</string>
-    <string name="new_site_creation_preview_subtitle">稍後可以自訂網站的外觀和風格</string>
     <string name="publish_on">發表於：%s</string>
     <string name="schedule_for">排程於：%s</string>
     <string name="published_on">已發表於：%s</string>
@@ -787,6 +1189,7 @@ Language: zh_TW
     <string name="stats_months_and_years_period_label">期間</string>
     <string name="stats_detail_months_and_years">月份與年份</string>
     <string name="stats_insights_load_more">載入更多</string>
+    <string name="new_site_creation_preview_subtitle">稍後可以自訂網站的外觀和風格</string>
     <string name="stats_insights_today_stats">今天</string>
     <string name="stats_insights_best_hour">最佳時段</string>
     <string name="stats_insights_best_day">最好的一天</string>
@@ -812,19 +1215,17 @@ Language: zh_TW
     <string name="stats_loading_error">未載入資料</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">使用區塊編輯器編輯新文章和網頁</string>
     <string name="site_settings_gutenberg_default_for_new_posts">使用區塊編輯器</string>
-    <string name="dialog_gutenberg_informative_title">已啟用區塊編輯器</string>
+    <string name="menu_switch_to_gutenberg_editor">切換至區塊編輯器</string>
     <string name="exit">結束</string>
     <string name="quick_start_sites_type_subtitle">已完成 %2$d 個，共 %1$d 個</string>
-    <string name="quick_start_sites_type_grow">拓展你的讀者群</string>
-    <string name="quick_start_sites_type_customize">自訂你的網站</string>
     <string name="quick_start_sites">後續步驟</string>
     <string name="quick_start_complete_tasks_header">完成 (%d)</string>
     <string name="quick_start_dialog_view_site_message">享受完成的成果！</string>
     <string name="quick_start_dialog_upload_icon_title">上傳網站圖示</string>
     <string name="quick_start_dialog_upload_icon_message">你的訪客會在他們的瀏覽器上看到你的圖示。新增自訂圖示會讓網站看起來更專業幹練。</string>
     <string name="quick_start_dialog_explore_plans_message_short">點選%1$s方案%2$s以查看你目前的方案和其他可用方案</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">點選%1$s新增頁面%2$s以建立新頁面。</string>
-    <string name="quick_start_dialog_create_new_page_message_short">請點選%1$s「網頁」%2$s以繼續。</string>
+    <string name="quick_start_sites_type_grow">讀者持續成長</string>
+    <string name="quick_start_sites_type_customize">自訂你的網站</string>
     <string name="quick_start_dialog_check_stats_message_short">點選%1$s統計資料%2$s以瞭解網站的成效。</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">點選%1$s你的網站圖示%2$s以上傳新圖示</string>
     <string name="quick_start_dialog_publish_post_message">撰寫並發表你的第一篇文章。</string>
@@ -835,13 +1236,8 @@ Language: zh_TW
     <string name="quick_start_dialog_explore_plans_message">深入瞭解付費專案中的行銷和 SEO 工具。</string>
     <string name="quick_start_dialog_enable_sharing_title">啟用文章分享功能</string>
     <string name="quick_start_dialog_enable_sharing_message">自動將新文章分享到社交媒體帳號。</string>
-    <string name="quick_start_dialog_customize_site_message">調整字型、新增圖片等。</string>
-    <string name="quick_start_dialog_create_page_title">建立新頁面</string>
-    <string name="quick_start_dialog_create_page_message">為重要內容新增頁面：就從「關於」頁面開始吧！</string>
     <string name="quick_start_dialog_check_stats_title">檢視網站統計資料</string>
     <string name="quick_start_dialog_check_stats_message">隨時掌握你的網站成效。</string>
-    <string name="quick_start_dialog_browse_themes_title">瀏覽佈景主題</string>
-    <string name="quick_start_dialog_browse_themes_message">探索數十種版面配置選項，尋找最適合你的版面。</string>
     <string name="quick_start_dialog_remove_next_steps_message">移除後續步驟會隱藏此網站上的所有導覽。此動作無法復原。</string>
     <string name="quick_start_dialog_remove_next_steps_title">移除後續步驟</string>
     <string name="quick_start_remove_next_steps_menu_title">移除此項</string>
@@ -865,15 +1261,11 @@ Language: zh_TW
     <string name="notification_new_site_creation_failed">發生問題</string>
     <string name="notification_new_site_creation_title">建立網站</string>
     <string name="new_site_creation_create_site_button">建立網站</string>
-    <string name="new_site_creation_search_domain_input_hint">搜尋網域</string>
     <string name="new_site_creation_domain_header_subtitle">這是人們在網際網路上找到你的地方。</string>
-    <string name="new_site_creation_domain_header_title">選擇網站的網域名稱</string>
     <string name="new_site_creation_empty_domain_list_message">找不到你搜尋的網址</string>
     <string name="site_creation_error_generic_subtitle">與伺服器通訊時發生錯誤，請再試一次</string>
     <string name="site_creation_error_generic_title">發生問題</string>
     <string name="site_creation_fetch_suggestions_error_unknown">發生問題</string>
-    <string name="site_creation_segments_subtitle">這會協助我們向你推薦相關選項。但你不應裹足不前，所有網站都會不斷進步！</string>
-    <string name="site_creation_segments_title">告訴我們你希望建立什麼類型的網站</string>
     <string name="new_site_creation_preview_title">你的網站已建立！</string>
     <string name="new_site_creation_screen_title_step_count">第 %1$d 步 (共 %2$d 步)</string>
     <string name="new_site_creation_screen_title_general">建立網站</string>
@@ -923,9 +1315,12 @@ Language: zh_TW
     <string name="stats_insights_share_post">分享文章</string>
     <string name="stats_insights_create_post">建立文章</string>
     <string name="stats_insights_latest_post_message">自從 %2$s 發表後已經過了 %1$s。文章截至目前為止獲得的迴響如下︰</string>
+    <string name="gif_picker_empty_search_list">沒有符合搜尋條件的媒體</string>
+    <string name="gif_picker_initial_empty_text">搜尋 GIF 以新增至你的媒體庫！</string>
+    <string name="gif_picker_endless_scroll_network_error">網路發生錯誤，導致部份媒體載入失敗。</string>
+    <string name="stats_insights_tags_and_categories">標籤和類別</string>
     <string name="stats_insights_latest_post_with_no_engagement">自從 %2$s 發表後已經過了 %1$s。分享你的文章，讓這些文章廣為人知，並增加文章瀏覽次數︰</string>
     <string name="stats_insights_latest_post_empty">你尚未發表任何文章。開始發表文章後，這裡便會顯示最新文章的摘要︰</string>
-    <string name="stats_insights_tags_and_categories">標籤和類別</string>
     <string name="stats_insights_all_time_stats">有史以來</string>
     <string name="stats_from_to_dates_in_week_label">%1$s - %2$s</string>
     <string name="stats_publicize_followers_label">關注者</string>
@@ -945,6 +1340,7 @@ Language: zh_TW
     <string name="stats_followers_count_message">%1$s 關注者總數：%2$s</string>
     <string name="stats_followers_email">電子郵件</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_manage_insights">管理洞察報告</string>
     <string name="stats_empty_insights_title">尚未新增任何洞察報告</string>
     <string name="stats_no_data_yet">尚無資料</string>
     <string name="menu_debug">除錯選單</string>
@@ -975,8 +1371,8 @@ Language: zh_TW
     <string name="image_size_medium_label">中</string>
     <string name="image_size_thumbnail_label">縮圖</string>
     <string name="menu_history">記錄</string>
-    <string name="pages_open_page_error">無法使用選取的網頁</string>
     <string name="pages_pending">待審中</string>
+    <string name="pages_open_page_error">無法使用選取的網頁</string>
     <string name="pages_empty_trashed">你沒有任何移至垃圾桶的頁面</string>
     <string name="pages_empty_scheduled">你沒有任何已排程頁面</string>
     <string name="pages_empty_drafts">你沒有任何草稿頁面</string>
@@ -1014,42 +1410,38 @@ Language: zh_TW
     <string name="quick_start_dialog_view_site_title">檢視你的網站</string>
     <string name="quick_start_dialog_view_site_message_short">點選%1$s檢視網站%2$s，以預覽你的網站</string>
     <string name="quick_start_dialog_share_site_title">分享你的網站</string>
+    <string name="quick_start_dialog_share_site_message">連結到你的社交媒體帳號 - 你的網站會自動分享新文章。</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing">點選%1$s「分享」%2$s以繼續</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">點選%1$s「連結」%2$s以新增你的社交媒體帳號</string>
-    <string name="quick_start_dialog_share_site_message">連結到你的社交媒體帳號 - 你的網站會自動分享新文章。</string>
     <string name="quick_start_dialog_publish_post_title">發表文章</string>
     <string name="quick_start_dialog_publish_post_message_short">點選%1$s建立文章%2$s以建立新文章</string>
     <string name="quick_start_dialog_need_help_title">需要協助開始使用嗎？</string>
     <string name="quick_start_dialog_need_help_button_positive">接受</string>
     <string name="quick_start_dialog_need_help_button_neutral">從未</string>
-    <string name="quick_start_dialog_need_help_button_negative">不用了，謝謝</string>
     <string name="quick_start_dialog_follow_sites_title">關注其他網站</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">點選%1$s搜尋%2$s以尋找具有相似興趣的網站</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">點選%1$s讀取器%2$s以繼續</string>
+    <string name="quick_start_dialog_need_help_button_negative">不用了，謝謝</string>
     <string name="quick_start_dialog_follow_sites_message">尋找並關注讓你獲得啟發的網站，在這些網站發表文章時獲得最新資訊。</string>
-    <string name="quick_start_dialog_customize_site_title">自訂你的網站</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">點選%1$s佈景主題%2$s以繼續</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">點選%1$s自訂%2$s以開始個人化你的網站</string>
-    <string name="quick_start_dialog_choose_theme_title">選擇佈景主題</string>
-    <string name="quick_start_dialog_browse_themes_message_short">點選%1$s「佈景主題」%2$s以探索新的佈景主題</string>
-    <string name="quick_start_dialog_choose_theme_message">瀏覽所有佈景主題，找到最適合的完美之選。</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">點選%1$s搜尋%2$s以尋找具有相似主題的網站</string>
     <string name="quick_start_button_positive">執行</string>
     <string name="quick_start_button_negative_short">取消</string>
     <string name="quick_start_button_negative">現在不要</string>
-    <string name="content_description_more">更多</string>
     <string name="my_site_create_new_site_title">你沒有任何網站</string>
+    <string name="content_description_more">更多</string>
+    <string name="reader_empty_followed_tags_title">沒有關注任何主題</string>
+    <string name="reader_empty_followed_tags_subtitle">請在此處新增主題，以尋找你最愛的主題文章</string>
     <string name="login_to_to_connect_jetpack">請登入你用來連結 Jetpack 的 WordPress.com 帳號。</string>
     <string name="install_jetpack_retry">重試</string>
-    <string name="install_jetpack_continue">設定</string>
-    <string name="jetpack_installation_problem_message">目前無法安裝 Jetpack。</string>
     <string name="jetpack_installation_problem">發生問題</string>
     <string name="jetpack_installed">已安裝 Jetpack</string>
-    <string name="installing_jetpack_message">正在你的網站上安裝 Jetpack。這可能需要幾分鐘才能完成。</string>
     <string name="installing_jetpack">正在安裝 Jetpack</string>
-    <string name="install_jetpack_message">我們不會儲存你的網站憑證，而且只會將其用於安裝 Jetpack。</string>
     <string name="install_jetpack">安裝 Jetpack</string>
     <string name="jetpack">Jetpack</string>
     <string name="stats_jetpack_connection_faq">Jetpack 常見問題</string>
+    <string name="install_jetpack_continue">設定</string>
+    <string name="jetpack_installation_problem_message">目前無法安裝 Jetpack。</string>
+    <string name="installing_jetpack_message">正在你的網站上安裝 Jetpack。這可能需要幾分鐘才能完成。</string>
+    <string name="install_jetpack_message">我們不會儲存你的網站憑證，而且只會將其用於安裝 Jetpack。</string>
     <string name="stats_jetpack_connection_setup_info">若要在你的 WordPress 網站上使用「統計」功能，必須安裝 Jetpack 外掛程式。</string>
     <string name="themes_empty_list">沒有符合你搜尋條件的佈景主題</string>
     <string name="reader_label_post_search_explainer">你想找什麼呢？</string>
@@ -1094,15 +1486,11 @@ Language: zh_TW
     <string name="support_contact_email">聯絡電子郵件</string>
     <string name="application_log_button">應用程式記錄檔</string>
     <string name="my_tickets">我的票證</string>
-    <string name="activity_log_rewind_dialog_message">確定要將你的網站還原至 %1$s 的 %2$s？這將移除在該時間點之後所建立或變更的全部內容和選項。</string>
-    <string name="activity_log_rewind_site">還原網站</string>
-    <string name="activity_log_currently_restoring_message_no_dates">正在還原</string>
-    <string name="activity_log_currently_restoring_message">正在還原至 %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">目前正在還原你的網站</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">已成功還原你的網站</string>
-    <string name="activity_log_rewind_finished_snackbar_message">已成功還原你的網站\n已還原至 %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">正在還原網站\n正在還原至 %1$s %2$s</string>
     <string name="activity_log_button">活動記錄動作按鈕</string>
+    <string name="activity_log_rewind_finished_snackbar_message">已成功還原你的網站\n(還原至 %1$s %2$s)</string>
+    <string name="activity_log_rewind_started_snackbar_message">正在還原你的網站\n(還原至 %1$s %2$s)</string>
     <string name="plugin_auto_managed">自動管理</string>
     <string name="reader_save_posts_locally_dialog_message">儲存這篇文章，即可隨時返回閱讀。儲存的文章不會同步至其他裝置，因此你只能在這部裝置上存取文章。</string>
     <string name="reader_save_posts_locally_dialog_title">儲存文章以供稍後使用</string>
@@ -1111,24 +1499,20 @@ Language: zh_TW
     <string name="comment_read_source_post">參閱原始文章</string>
     <string name="sites">網站</string>
     <string name="signup_magic_link_title">神奇連結已傳送</string>
-    <string name="signup_email_screen_title">電子郵件註冊</string>
     <string name="verification_2fa_screen_title">代碼驗證</string>
     <string name="selfhosted_site_login_title">登入憑證</string>
     <string name="magic_link_sent_login_title">神奇連結已傳送</string>
     <string name="magic_link_login_title">神奇連結登入</string>
     <string name="site_address_login_title">網站位址登入</string>
     <string name="email_address_login_title">電子郵件地址登入</string>
-    <string name="alternatively">替代作法：</string>
     <string name="reader_empty_saved_posts_description">點選「%s」即可將文章儲存至你的清單。</string>
-    <string name="reader_empty_saved_posts_title">尚未儲存任何文章！</string>
     <string name="reader_bookmark_snack_title">文章已儲存</string>
     <string name="reader_bookmark_snack_btn">檢視全部</string>
-    <string name="reader_btn_bookmarked">已儲存</string>
-    <string name="reader_btn_bookmark">儲存</string>
     <string name="reader_remove_bookmark">從已儲存文章中移除</string>
     <string name="reader_add_bookmark">加入已儲存文章</string>
     <string name="reader_save_for_later_title">已儲存文章</string>
     <string name="removed">已移除</string>
+    <string name="reader_empty_saved_posts_title">尚未儲存任何文章！</string>
     <string name="my_site_icon_content_description">變更網站圖示</string>
     <string name="my_site_icon_dialog_cancel_button">取消</string>
     <string name="my_site_icon_dialog_remove_button">移除</string>
@@ -1144,11 +1528,9 @@ Language: zh_TW
     <string name="reader_btn_notifications_on">開啟網站通知</string>
     <string name="reader_btn_notifications_off">關閉網站通知</string>
     <string name="activity_log_jetpack_icon">Jetpack 圖示</string>
-    <string name="rewind">還原</string>
     <string name="activity_log_event">事件</string>
     <string name="activity_log_icon">活動圖示</string>
     <string name="activity_log">活動記錄</string>
-    <string name="activity">活動</string>
     <string name="privacy_policy_read">閱讀隱私權政策</string>
     <string name="third_party_policy_learn_more_caption">我們會使用其他的追蹤工具，包括由第三方所提供的追蹤工具。瞭解相關資訊及其控制方式。</string>
     <string name="third_party_policy_learn_more_header">第三方政策</string>
@@ -1159,7 +1541,6 @@ Language: zh_TW
     <string name="preference_privacy_settings">隱私權設定</string>
     <string name="preference_collect_information">收集資訊</string>
     <string name="post_submitted">文章已提交。</string>
-    <string name="login_email_button_signup">還沒有帳號？%1$s註冊%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">外掛功能需要該網站具有良好聲譽。</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">外掛功能需要主要網域訂閱與此名使用者相關聯。</string>
     <string name="plugin_install_site_ineligible_non_admin_user">外掛功能需要管理員權限。</string>
@@ -1228,13 +1609,13 @@ Language: zh_TW
     <string name="jetpack_connection_failed_with_reason">無法連結至 Jetpack：%s</string>
     <string name="jetpack_already_connected_toast">你已連結至 Jetpack</string>
     <string name="menu_undo_snackbar_action">復原</string>
-    <string name="menu_visual_mode_done_snackbar">已切換至「視覺化」模式</string>
     <string name="menu_visual_mode">視覺化模式</string>
-    <string name="menu_html_mode_done_snackbar">已切換至「HTML」模式</string>
     <string name="menu_html_mode">HTML 模式</string>
     <string name="menu_preview">預覽</string>
     <string name="menu_save_as_draft">儲存為草稿</string>
     <string name="file_size_in_terabytes">%s TB</string>
+    <string name="menu_visual_mode_done_snackbar">已切換至「視覺化」模式</string>
+    <string name="menu_html_mode_done_snackbar">已切換至「HTML」模式</string>
     <string name="file_size_in_gigabytes">%s GB</string>
     <string name="file_size_in_megabytes">%s MB</string>
     <string name="file_size_in_kilobytes">%s kB</string>
@@ -1256,7 +1637,6 @@ Language: zh_TW
     <string name="edit_photo_screen_title">編輯照片</string>
     <string name="share_intent_screen_title">挑選網站</string>
     <string name="signup_epilogue_screen_title">新增帳號</string>
-    <string name="login_prologue_screen_title">登入</string>
     <string name="login_epilogue_screen_title">已登入為</string>
     <string name="person_detail_screen_title">個人詳細資料</string>
     <string name="media_settings_screen_title">檔案詳細資料</string>
@@ -1268,8 +1648,9 @@ Language: zh_TW
     <string name="help_screen_title">說明與支援</string>
     <string name="license_screen_title">授權</string>
     <string name="release_notes_screen_title">版本備註</string>
+    <string name="my_site_section_screen_title">我的網站</string>
     <string name="signup_epilogue_error_avatar_view">你的大頭貼已上傳，且稍後即可使用。</string>
-    <string name="permissions_denied_message">你似乎已關閉此功能所需的權限。&lt;br/>&lt;br/>若要變更此設定，請編輯權限並確認已啟用 &lt;strong>%s&lt;/strong>。</string>
+    <string name="permissions_denied_message">你似乎已關閉此功能所需的權限。&lt;br/&gt;&lt;br/&gt;若要變更此設定，請編輯權限並確認已啟用 &lt;strong&gt;%s&lt;/strong&gt;。</string>
     <string name="permissions_denied_title">權限</string>
     <string name="plugin_caption_featured">精選</string>
     <string name="sharing_disabled_description">由於你的「分享 Jetpack」模組已停用，因此無法存取分享設定。</string>
@@ -1310,7 +1691,6 @@ Language: zh_TW
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">無法上傳 1 篇文章和 1 個檔案</string>
     <string name="untitled_in_parentheses">(未命名)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f，%2$f</string>
     <string name="site_creation_domain_finish_button">建立網站</string>
     <string name="notification_site_creation_created">點選以繼續。</string>
     <string name="notification_site_creation_title_success">網站已建立！</string>
@@ -1324,28 +1704,20 @@ Language: zh_TW
     <string name="username_changer_dismiss_button_positive">放棄</string>
     <string name="username_changer_action">儲存</string>
     <string name="content_description_add_avatar">新增大頭貼</string>
-    <string name="signup_with_google_button">透過 Google 註冊</string>
-    <string name="signup_with_email_button">透過電子郵件註冊</string>
     <string name="signup_user_exists">電子郵件已存在於 WordPress.com。\n繼續登入。</string>
     <string name="signup_updating_account">正在更新帳號……</string>
-    <string name="signup_terms_of_service_text">註冊即代表你同意我們的%1$s服務條款%2$s。</string>
     <string name="signup_magic_link_progress">正在傳送電子郵件</string>
     <string name="signup_magic_link_error_button_positive">重試</string>
     <string name="signup_magic_link_error_button_negative">關閉</string>
-    <string name="signup_magic_link_error">傳送電子郵件時發生錯誤。你可以現在重試，或先關閉並稍後再試。</string>
     <string name="signup_epilogue_hint_username">使用者名稱</string>
-    <string name="signup_epilogue_hint_password_detail">你可以像剛剛一樣隨時使用連結來登入，也可以依需要設定密碼。</string>
     <string name="signup_epilogue_hint_password">密碼 (非必要)</string>
     <string name="signup_epilogue_hint_display">顯示名稱</string>
     <string name="signup_epilogue_error_button_positive">重試</string>
     <string name="signup_epilogue_error_button_negative">還原</string>
     <string name="signup_epilogue_error_generic">更新你的帳號時發生錯誤。你可以重試或還原變更並繼續。</string>
     <string name="signup_epilogue_error_avatar">上傳你的大頭貼時發生錯誤。</string>
-    <string name="signup_email_header">若要建立新的 WordPress.com 帳號，請輸入你的電子郵件地址。</string>
-    <string name="signup_email_error_generic">檢查電子郵件地址時發生錯誤。</string>
-    <string name="sign_up">註冊 WordPress.com</string>
-    <string name="enter_username_instead">用你的使用者名稱登入。</string>
-    <string name="enter_site_address_instead">藉由輸入你的網站位址來登入。</string>
+    <string name="signup_magic_link_error">傳送電子郵件時發生錯誤。你可以現在重試，或先關閉並稍後再試。</string>
+    <string name="signup_epilogue_hint_password_detail">你可以像剛剛一樣隨時使用連結來登入，也可以依需要設定密碼。</string>
     <string name="plugin_needs_update">需要更新</string>
     <string name="plugin_caption_search">搜尋外掛程式</string>
     <string name="plugin_caption_new">新增</string>
@@ -1466,7 +1838,6 @@ Language: zh_TW
     <string name="login_error_suffix">\n要嘗試其他帳號嗎？</string>
     <string name="login_error_generic">連線 Google 帳號時發生一些問題。</string>
     <string name="login_error_button">關閉</string>
-    <string name="login_google_button_suffix">透過 Google 登入。</string>
     <string name="enter_wpcom_password_google">若要繼續使用此 Google 帳號，請提供相符的 WordPress.com 密碼。只會詢問一次。</string>
     <string name="error_generic_network">網路發生錯誤。請檢查你的連線並再試一次。</string>
     <string name="post_settings_remove_featured_image">移除特色圖片</string>
@@ -1478,12 +1849,11 @@ Language: zh_TW
     <string name="jetpack_disconnect_confirm">中斷連線</string>
     <string name="jetpack_disconnect_confirmation_message">確定要中斷網站與 Jetpack 的連線？</string>
     <string name="jetpack_disconnect_pref_title">「中斷與 WordPress.com 的連線」</string>
-    <string name="site_settings_jetpack_whitelist_description">你可在允許清單中新增 IP 位址或一系列的位址，以避免這些位址受到 Jetpack 封鎖。可接受 IPv4 和 IPv6。若要指定範圍，請輸入最低值及最高值，並以破折號分隔。範例：12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">你可以將某個 IP 位址 (或多個位址) 標記為「一律允許」，避免這些位址遭到 Jetpack 封鎖。 可接受 IPv4 和 IPv6。 若要指定範圍，請輸入最低值及最高值，並以破折號分隔。 例如：12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">需要雙步驟驗證</string>
     <string name="jetpack_match_wpcom_via_email_title">使用電子郵件地址比對帳號</string>
     <string name="jetpack_allow_wpcom_sign_in_title">允許登入 WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">登入 WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">在允許清單中的 IP 位址</string>
     <string name="jetpack_prevent_brute_force_title">封鎖嘗試登入的惡意攻擊</string>
     <string name="jetpack_prevent_brute_force_category_title">暴力破解密碼攻擊防護</string>
     <string name="jetpack_send_wp_notifications_title">傳送推播通知</string>
@@ -1514,6 +1884,7 @@ Language: zh_TW
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">替代文字</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">閃爍燈</string>
+    <string name="connect_site">連結網站</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">震動裝置</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">選擇音效</string>
     <string name="notification_settings_category_sights_and_sounds">提示與音效</string>
@@ -1523,12 +1894,12 @@ Language: zh_TW
     <string name="notification_settings_category_other">其他</string>
     <string name="notification_settings_item_your_sites_all_your_sites">我所有的網站</string>
     <string name="notification_settings_category_your_sites">你的網站</string>
-    <string name="notification_settings_master_off_message">關閉「通知設定」將停用此應用程式的所有通知，無論何種類型。開啟「通知設定」之後，你可以調整接收的通知類型。</string>
-    <string name="notification_settings_master_off_title">若要在此裝置上接收通知，請開啟「通知設定」。</string>
-    <string name="notification_settings_master_hint_off">啓用通知</string>
-    <string name="notification_settings_master_hint_on">停用通知</string>
-    <string name="notification_settings_master_status_off">關閉</string>
-    <string name="notification_settings_master_status_on">開啟</string>
+    <string name="notification_settings_main_off_message">關閉「通知設定」將停用此應用程式的所有通知，無論類型為何。 開啟「通知設定」之後，你可以調整接收的通知類型。</string>
+    <string name="notification_settings_main_off_title">若要在此裝置上接收通知，請開啟「通知設定」。</string>
+    <string name="notification_settings_main_hint_off">啟用通知</string>
+    <string name="notification_settings_main_hint_on">停用通知</string>
+    <string name="notification_settings_main_status_off">關閉</string>
+    <string name="notification_settings_main_status_on">開啟</string>
     <string name="max_video_resolution">影片大小上限</string>
     <string name="max_thumbnail_px_size">圖片大小上限</string>
     <string name="error_upload_post_media_param">於此文章中上傳媒體時發生錯誤：%s.</string>
@@ -1565,17 +1936,17 @@ Language: zh_TW
     <string name="login_site_address_more_help">需要更多協助嗎？</string>
     <string name="login_site_address_help_content">當你使用 Chrome 造訪自己的網站時，網站位址會顯示在畫面上方的網址列中。</string>
     <string name="login_site_address_help_title">我的網站位址是？</string>
-    <string name="login_site_address_help">需要幫你找網站位址嗎？</string>
     <string name="login_site_address">網站位址</string>
+    <string name="enter_site_address">請輸入要連結的 WordPress 網站位址。</string>
     <string name="login_already_logged_in_wpcom">已登入 WordPress.com</string>
     <string name="login_continue">繼續</string>
+    <string name="connect_more">連結其他網站</string>
     <string name="enter_wpcom_password">輸入你的 WordPress.com 密碼。</string>
     <string name="login_magic_link_email_requesting">要求登入的電子郵件</string>
     <string name="password_incorrect">看來你輸入的密碼不正確。請重新確認你的資訊，然後再試一次。</string>
     <string name="requesting_otp">透過 SMS 要求驗證碼。</string>
     <string name="login_text_otp">請改用簡訊傳送驗證碼給我</string>
     <string name="enter_verification_code">快完成了！請輸入驗證器應用程式上的驗證碼。</string>
-    <string name="open_mail">開啟郵件</string>
     <string name="next">下一篇</string>
     <string name="enter_email_wordpress_com">使用電子郵件地址登入 WordPress.com，即可管理你的所有 WordPress 網站。</string>
     <string name="image_optimization_promo_desc">圖片最佳化會壓縮圖片，以加快上傳速度。\n\n你可以隨時在網站設定變更此設定。</string>
@@ -1598,10 +1969,6 @@ Language: zh_TW
     <string name="post_status_draft">草稿</string>
     <string name="post_status_pending_review">待審中</string>
     <string name="post_status_publish_post">發佈</string>
-    <string name="change_location">變更位置</string>
-    <string name="remove_location">移除位置</string>
-    <string name="post_settings_error_placepicker_missing_play_services">無法開啟位置挑選器，Google Play 服務無法使用</string>
-    <string name="post_settings_location">位置</string>
     <string name="now">立即</string>
     <string name="post_settings_password_dialog_hint">只有知道密碼的使用者可檢視這篇文章</string>
     <string name="post_settings_excerpt_dialog_hint">文章摘要是指選擇性手動摘錄的內容。</string>
@@ -1731,11 +2098,12 @@ Language: zh_TW
     <string name="media_encoder_quality_85">中</string>
     <string name="media_encoder_quality_80">低</string>
     <string name="media_upload_state_uploaded">已上傳</string>
-    <string name="media_upload_state_failed">上傳失敗</string>
     <string name="media_upload_state_deleted">已刪除</string>
     <string name="media_upload_state_deleting">正在刪除</string>
     <string name="media_upload_state_uploading">正在上傳</string>
     <string name="media_upload_state_queued">已排進佇列</string>
+    <string name="media_upload_state_failed">上傳失敗</string>
+    <string name="image_quality">圖片品質</string>
     <string name="error_all_media_upload_canceled">由於未知的錯誤，所有的媒體上傳均已取消。請重試上傳</string>
     <string name="error_unknown_post_type">未知的文章格式</string>
     <string name="submit_for_review">送出</string>
@@ -1784,7 +2152,7 @@ Language: zh_TW
     <string name="signout">登出</string>
     <string name="sign_in_wpcom">登入 WordPress.com</string>
     <string name="reader_label_global_related_posts">想瞭解更多資訊，請上 WordPress.com</string>
-    <string name="reader_label_local_related_posts">想瞭解更多資訊，請前往 %s</string>
+    <string name="reader_label_local_related_posts">更多來自 %s 的項目</string>
     <string name="preference_open_device_settings">開啟裝置設定</string>
     <string name="invite_invalid_email">%s：電子郵件無效</string>
     <string name="invite_user_blocked_invites">%s：使用者已封鎖邀請</string>
@@ -1794,88 +2162,83 @@ Language: zh_TW
     <string name="comment_moderated_approved">留言已核准！</string>
     <string name="like">讚</string>
     <string name="timespan_now">立即</string>
-    <string name="role_viewer">瀏覽者</string>
     <string name="role_follower">關注者</string>
+    <string name="role_viewer">瀏覽者</string>
     <string name="error_post_my_profile_no_connection">無法連線，故無法儲存你的個人檔案</string>
-    <string name="alignment_right">右</string>
-    <string name="alignment_left">左</string>
     <string name="alignment_none">無</string>
+    <string name="alignment_left">左</string>
+    <string name="alignment_right">右</string>
     <string name="site_settings_list_editor_action_mode_title">已選取 %1$d</string>
     <string name="error_fetch_users_list">無法擷取網站使用者</string>
-    <string name="title_email_follower">電子郵件關注者</string>
     <string name="title_follower">關注者</string>
+    <string name="title_email_follower">電子郵件關注者</string>
     <string name="people_fetching">正在擷取使用者…</string>
-    <string name="people_dropdown_item_viewers">讀者</string>
     <string name="people_dropdown_item_email_followers">電子郵件關注者</string>
+    <string name="people_dropdown_item_viewers">讀者</string>
     <string name="people_dropdown_item_followers">關注者</string>
     <string name="people_dropdown_item_team">團隊</string>
     <string name="invite_message_usernames_limit">可邀請最多 10 個電子郵件地址及/或 WordPress.com 使用者名稱。尚未命名的使用者，將收到一份如何建立使用者名稱的指示。</string>
     <string name="viewer_remove_confirmation_message">如果移除這位瀏覽者，對方將無法造訪此網站。\n\n仍要移除這位瀏覽者嗎？</string>
     <string name="follower_remove_confirmation_message">移除後，這位關注者如果沒有重新關注，就會停止收到此網站的通知。\n\n仍要移除這位關注者嗎？</string>
     <string name="follower_subscribed_since">自 %1$s 開始</string>
-    <string name="error_remove_viewer">無法移除瀏覽者</string>
     <string name="error_remove_follower">無法移除關注者</string>
+    <string name="error_remove_viewer">無法移除瀏覽者</string>
     <string name="error_fetch_email_followers_list">無法擷取網站電子郵件關注者</string>
     <string name="error_fetch_followers_list">無法擷取網站關注者</string>
     <string name="editor_failed_uploads_switch_html">部分媒體上傳失敗。在此狀態下，你無法\n切換至 HTML 模式。要移除所有上傳失敗的項目並繼續嗎？</string>
-    <string name="image_width">寬度</string>
-    <string name="image_link_to">連結至</string>
-    <string name="image_caption">說明</string>
     <string name="image_settings_save_toast">變更已儲存</string>
+    <string name="image_caption">說明</string>
+    <string name="image_link_to">連結至</string>
+    <string name="image_width">寬度</string>
     <string name="image_settings_dismiss_dialog_title">要捨棄未儲存的變更嗎？</string>
     <string name="stop_upload_dialog_title">停止上傳？</string>
-    <string name="tap_to_try_again">點選以重試！</string>
+    <string name="invite_error_some_failed">已送出邀請但發生錯誤！</string>
     <string name="invite_sent">已成功送出邀請</string>
+    <string name="tap_to_try_again">點選以重試！</string>
     <string name="invite_error_for_username">%1$s：%2$s</string>
-    <string name="invite_error_some_failed">已送出邀請但發生錯誤！</string>
     <string name="invite_error_sending">嘗試傳送邀請時發生錯誤！</string>
     <string name="invite_error_invalid_usernames_multiple">無法傳送：使用者名稱或電子郵件無效</string>
     <string name="invite_error_invalid_usernames_one">無法傳送：使用者名稱或電子郵件無效</string>
     <string name="invite_error_no_usernames">請新增至少一個使用者名稱</string>
-    <string name="invite_message_info">(選用) 你最多可以輸入 500 個字元的自訂訊息，附在傳送給使用者的邀請中。</string>
-    <string name="invite_message_remaining_other">剩下 %d 個字元</string>
-    <string name="invite_message_remaining_one">剩下 1 個字元</string>
-    <string name="invite_message_remaining_zero">剩下 0 個字元</string>
     <string name="invite_message_title">自訂訊息</string>
     <string name="invite">邀請</string>
     <string name="invite_names_title">使用者名稱或電子郵件</string>
-    <string name="invite_people">邀請他人</string>
     <string name="my_site_header_external">外部</string>
-    <string name="send_link">傳送連結</string>
+    <string name="invite_people">邀請他人</string>
     <string name="label_clear_search_history">清除搜尋記錄</string>
     <string name="dlg_confirm_clear_search_history">清除搜尋記錄？</string>
     <string name="reader_empty_search_description">在你的語言中找不到與 %s 相關的結果</string>
     <string name="reader_hint_post_search">搜尋 WordPress</string>
+    <string name="reader_title_related_post_detail">相關文章</string>
     <string name="preview_screen_links_disabled">預覽畫面上的連結已停用</string>
     <string name="send">傳送</string>
-    <string name="person_removed">已成功移除 %1$s</string>
     <string name="user_remove_confirmation_message">如果移除 %1$s，該使用者將無法再存取此網站，但 %1$s 建立的所有內容仍會保留在網站上。\n\n仍要移除這位使用者嗎？</string>
+    <string name="person_removed">已成功移除 %1$s</string>
     <string name="person_remove_confirmation_title">移除 %1$s</string>
-    <string name="role">角色</string>
-    <string name="people">使用者</string>
     <string name="reader_empty_posts_in_custom_list">此清單中的網站最近未張貼任何文章</string>
+    <string name="people">使用者</string>
+    <string name="role">角色</string>
     <string name="error_remove_user">無法移除使用者</string>
-    <string name="error_update_role">無法更新使用者角色</string>
     <string name="error_fetch_viewers_list">無法擷取網站使用者</string>
+    <string name="error_update_role">無法更新使用者角色</string>
     <string name="error_updating_gravatar">更新你的 Gravatar 時發生錯誤</string>
-    <string name="error_refreshing_gravatar">重新載入你的 Gravatar 時發生錯誤</string>
     <string name="error_locating_image">尋找裁切的圖片時發生錯誤</string>
+    <string name="error_refreshing_gravatar">重新載入你的 Gravatar 時發生錯誤</string>
     <string name="error_cropping_image">裁切圖片時發生錯誤</string>
     <string name="checking_email">正在檢查電子郵件</string>
     <string name="magic_link_unavailable_error_message">目前無法使用。請輸入你的密碼</string>
     <string name="logging_in">正在登入</string>
-    <string name="enter_your_password_instead">改為輸入你的密碼</string>
     <string name="web_address_dialog_hint">當你留言時公開顯示。</string>
     <string name="capture_or_pick_photo">拍攝或選取照片</string>
-    <string name="plans">方案</string>
-    <string name="plan">方案</string>
     <string name="export_your_content_message">我們會將你的文章、頁面和設定寄到你的電子郵件地址：%s.</string>
+    <string name="plan">方案</string>
+    <string name="plans">方案</string>
     <string name="export_your_content">匯出你的內容</string>
-    <string name="export_email_sent">匯出電子郵件已傳送！</string>
     <string name="exporting_content_progress">匯出內容…</string>
-    <string name="checking_purchases">檢查購買項目</string>
-    <string name="show_purchases">顯示購買項目</string>
+    <string name="export_email_sent">匯出電子郵件已傳送！</string>
     <string name="premium_upgrades_message">你的網站已啟用進階版升級服務。刪除網站前，請先取消升級。</string>
+    <string name="show_purchases">顯示購買項目</string>
+    <string name="checking_purchases">檢查購買項目</string>
     <string name="premium_upgrades_title">進階版升級</string>
     <string name="purchases_request_error">發生了點錯誤。無法要求購買項目。</string>
     <string name="delete_site_progress">正在刪除網站…</string>
@@ -1884,46 +2247,49 @@ Language: zh_TW
     <string name="primary_domain">主要網域</string>
     <string name="error_deleting_site_summary">刪除網站時發生錯誤。請聯絡支援團隊，尋求進一步協助。</string>
     <string name="error_deleting_site">刪除網站時發生錯誤</string>
-    <string name="site_settings_export_content_title">匯出內容</string>
     <string name="confirm_delete_site_prompt">請在下方欄位中輸入 %1$s 以確認。系統將永久刪除你的網站。</string>
+    <string name="site_settings_export_content_title">匯出內容</string>
+    <string name="contact_support">聯絡支援團隊</string>
     <string name="confirm_delete_site">確認刪除網站</string>
     <string name="start_over_text">如果你想保留網站，但不想保留現有的文章和頁面，我們的支援團隊可以為你刪除網站上的文章、頁面、媒體及留言。\n\n這能讓你保留網站和 URL，但重新開始建立內容。若要清除目前的內容，請與我們聯絡。</string>
-    <string name="let_us_help">我們很樂意協助</string>
     <string name="site_settings_start_over_hint">重新開始設計你的網站</string>
-    <string name="start_over">重新開始</string>
+    <string name="let_us_help">我們很樂意協助</string>
     <string name="me_btn_app_settings">應用程式設定</string>
+    <string name="start_over">重新開始</string>
     <string name="editor_remove_failed_uploads">移除失敗的上傳項目</string>
+    <string name="comments_empty_list_filtered_trashed">沒有已移至垃圾桶的留言</string>
     <string name="site_settings_advanced_header">進階</string>
     <string name="comments_empty_list_filtered_pending">無待審核的迴響</string>
+    <string name="comments_empty_list_filtered_approved">沒有已核准的留言</string>
     <string name="xmlrpc_missing_method_error">無法連結。伺服器缺少必要的 XML-RPC 方式。</string>
-    <string name="alignment_center">置中</string>
-    <string name="post_format_video">影片</string>
     <string name="post_format_status">狀態</string>
-    <string name="post_format_standard">標準版</string>
-    <string name="post_format_quote">引文</string>
-    <string name="post_format_link">連結</string>
-    <string name="post_format_image">圖片</string>
-    <string name="post_format_gallery">圖庫</string>
+    <string name="post_format_video">影片</string>
+    <string name="alignment_center">置中</string>
     <string name="post_format_chat">聊天</string>
-    <string name="post_format_audio">音訊</string>
-    <string name="post_format_aside">旁白</string>
+    <string name="post_format_gallery">圖庫</string>
+    <string name="post_format_image">圖片</string>
+    <string name="post_format_link">連結</string>
+    <string name="post_format_quote">引文</string>
+    <string name="post_format_standard">標準版</string>
     <string name="notif_events">WordPress.com 課程與活動相關資訊 (線上和專人洽詢)。</string>
+    <string name="post_format_aside">旁白</string>
+    <string name="post_format_audio">音訊</string>
     <string name="notif_surveys">參與 WordPress.com 研究與調查的機會。</string>
     <string name="notif_tips">讓 WordPress.com 發揮最大功效的秘訣。</string>
     <string name="notif_community">社群</string>
-    <string name="notif_research">研究</string>
-    <string name="notif_suggestions">建議</string>
     <string name="replies_to_my_comments">留言的回覆</string>
-    <string name="username_mentions">使用者名稱標記</string>
+    <string name="notif_suggestions">建議</string>
+    <string name="notif_research">研究</string>
     <string name="site_achievements">網站成就</string>
-    <string name="site_follows">網站關注數</string>
+    <string name="username_mentions">使用者名稱標記</string>
     <string name="likes_on_my_posts">文章按讚數</string>
+    <string name="site_follows">網站關注數</string>
     <string name="likes_on_my_comments">留言按讚數</string>
     <string name="comments_on_my_site">網站留言</string>
     <string name="site_settings_list_editor_summary_other">%d 個項目</string>
     <string name="site_settings_list_editor_summary_one">1 個項目</string>
-    <string name="approve_auto">所有使用者</string>
     <string name="approve_auto_if_previously_approved">已知使用者的留言</string>
+    <string name="approve_auto">所有使用者</string>
     <string name="approve_manual">無留言</string>
     <string name="site_settings_paging_summary_other">每頁 %d 則留言</string>
     <string name="site_settings_paging_summary_one">每頁 1 則留言</string>
@@ -1933,25 +2299,26 @@ Language: zh_TW
     <string name="detail_approve_auto">自動核准所有人的留言。</string>
     <string name="detail_approve_auto_if_previously_approved">如果使用者有已審核的留言，則自動核准</string>
     <string name="detail_approve_manual">需要人工審核所有人的留言。</string>
-    <string name="days_quantity_other">%d 天</string>
     <string name="days_quantity_one">1 天</string>
-    <string name="web_address">網址</string>
-    <string name="primary_site">主要網站</string>
+    <string name="days_quantity_other">%d 天</string>
     <string name="pending_email_change_snackbar">按一下電子郵件 (收件者：%1$s) 中的驗證連結以確認您的新地址</string>
+    <string name="primary_site">主要網站</string>
+    <string name="web_address">網址</string>
     <string name="editor_toast_uploading_please_wait">你目前正在上傳媒體。請等待此作業完成。</string>
     <string name="error_refresh_comments_showing_older">目前無法重新整理留言 – 顯示較舊的留言</string>
+    <string name="post_settings_set_featured_image">設定精選圖片</string>
     <string name="post_settings_featured_image">精選圖片</string>
     <string name="email_address">電子郵件地址</string>
     <string name="dlg_sure_to_delete_comments">永久刪除這些留言？</string>
     <string name="dlg_sure_to_delete_comment">永久刪除此回應？</string>
     <string name="mnu_comment_delete_permanently">刪除</string>
-    <string name="mnu_comment_untrash">還原</string>
     <string name="comment_deleted_permanently">留言已刪除</string>
+    <string name="mnu_comment_untrash">還原</string>
     <string name="comments_empty_list_filtered_spam">沒有垃圾留言</string>
-    <string name="comment_status_all">全部</string>
     <string name="could_not_load_page">無法載入頁面</string>
-    <string name="off">關閉</string>
+    <string name="comment_status_all">全部</string>
     <string name="interface_language">介面語言</string>
+    <string name="off">關閉</string>
     <string name="about_the_app">關於此應用程式</string>
     <string name="error_post_account_settings">無法儲存你的帳號設定</string>
     <string name="error_fetch_account_settings">無法擷取你的帳號設定</string>
@@ -1959,20 +2326,20 @@ Language: zh_TW
     <string name="site_settings_unknown_language_code_error">無法辨識語言代碼</string>
     <string name="site_settings_threading_dialog_description">允許留言以階層式嵌入留言串中。</string>
     <string name="site_settings_threading_dialog_header">留言串最多</string>
-    <string name="disabled">已停用</string>
-    <string name="search">搜尋</string>
     <string name="remove">移除</string>
+    <string name="search">搜尋</string>
+    <string name="disabled">已停用</string>
     <string name="site_settings_image_original_size">原始尺寸</string>
     <string name="privacy_private">只有你和經核准的使用者可看見你的網站</string>
     <string name="privacy_public_not_indexed">所有人都能看見你的網站，但網站會要求搜尋引擎不要加入索引</string>
     <string name="privacy_public">所有人都能看見你的網站，且搜尋引擎可能會將網站加入索引</string>
     <string name="about_me_hint">簡單介紹一下自己…</string>
-    <string name="about_me">關於我</string>
     <string name="public_display_name_hint">如果未設定，顯示名稱會預設為你的使用者名稱</string>
+    <string name="about_me">關於我</string>
     <string name="public_display_name">公開顯示名稱</string>
-    <string name="last_name">姓氏</string>
-    <string name="first_name">名字</string>
     <string name="my_profile">我的個人檔案</string>
+    <string name="first_name">名字</string>
+    <string name="last_name">姓氏</string>
     <string name="cd_related_post_preview_image">相關文章預覽圖片</string>
     <string name="error_post_remote_site_settings">無法儲存網站資訊</string>
     <string name="error_fetch_remote_site_settings">無法擷取網站資訊</string>
@@ -1981,7 +2348,7 @@ Language: zh_TW
     <string name="site_settings_paging_dialog_description">將留言串分為數頁。</string>
     <string name="site_settings_paging_dialog_header">每頁留言數</string>
     <string name="site_settings_close_after_dialog_title">關閉留言功能</string>
-    <string name="site_settings_blacklist_description">如果留言的內容、名稱、URL、電子郵件或 IP 位址中含有以下文字，該留言將標記為垃圾留言。你也可以輸入字詞的一部分，例如「press」會與「WordPress」相符。</string>
+    <string name="site_settings_denylist_description">如果留言的內容、名稱、URL、電子郵件或 IP 位址中含有以下文字，就會被標記為垃圾留言。 你也可以輸入字詞的一部分，例如「press」會與「WordPress」相符。</string>
     <string name="site_settings_hold_for_moderation_description">如果留言的內容、名稱、URL、電子郵件或 IP 位址中含有以下文字，就會被送進審核清單。你也可以輸入字詞的一部分，例如「press」會與「WordPress」相符。</string>
     <string name="site_settings_list_editor_input_hint">輸入字詞或片語</string>
     <string name="site_settings_list_editor_no_items_text">無項目</string>
@@ -1996,10 +2363,10 @@ Language: zh_TW
     <string name="site_settings_rp_show_header_title">顯示頁首</string>
     <string name="site_settings_rp_switch_summary">相關文章會在你的文章下方顯示網站上的相關內容。</string>
     <string name="site_settings_rp_switch_title">顯示相關文章</string>
-    <string name="site_settings_blacklist_hint">與篩選條件相符的留言將標示為垃圾留言</string>
+    <string name="site_settings_denylist_hint">與篩選條件相符的留言將標示為垃圾留言</string>
     <string name="site_settings_moderation_hold_hint">與篩選條件相符的留言將被送進審核清單</string>
     <string name="site_settings_multiple_links_hint">忽略已知使用者的連結限制</string>
-    <string name="site_settings_whitelist_hint">先前有經核准的留言才可以發表留言</string>
+    <string name="site_settings_allowlist_hint">須有留言經核准的記錄，才可發表留言</string>
     <string name="site_settings_user_account_required_hint">已註冊且登入的使用者才可以發表留言</string>
     <string name="site_settings_identity_required_hint">輸入名稱和電子郵件後才可以發表留言</string>
     <string name="site_settings_paging_hint">按照指定的區塊大小顯示留言</string>
@@ -2022,19 +2389,18 @@ Language: zh_TW
     <string name="site_settings_address_hint">目前不支援變更網址</string>
     <string name="site_settings_tagline_hint">使用簡短的說明或好記的字詞組合來描述你的網誌</string>
     <string name="site_settings_title_hint">以簡單幾個字說明此網站主題</string>
-    <string name="site_settings_whitelist_known_summary">已知使用者的留言</string>
-    <string name="site_settings_whitelist_all_summary">所有使用者的留言</string>
+    <string name="site_settings_allowlist_known_summary">已知使用者的留言</string>
+    <string name="site_settings_allowlist_all_summary">所有使用者的留言</string>
     <string name="site_settings_threading_summary">%d 層</string>
     <string name="site_settings_privacy_private_summary">私密</string>
     <string name="site_settings_privacy_hidden_summary">隱藏</string>
-    <string name="site_settings_privacy_public_summary">公開</string>
     <string name="site_settings_delete_site_title">刪除網站</string>
-    <string name="site_settings_blacklist_title">封鎖清單</string>
+    <string name="site_settings_privacy_public_summary">公開</string>
     <string name="site_settings_moderation_hold_title">等待審核</string>
     <string name="site_settings_multiple_links_title">留言中的連結</string>
-    <string name="site_settings_whitelist_title">自動核准</string>
-    <string name="site_settings_paging_title">分頁</string>
+    <string name="site_settings_allowlist_title">自動核准</string>
     <string name="site_settings_threading_title">階層顯示</string>
+    <string name="site_settings_paging_title">分頁</string>
     <string name="site_settings_sort_by_title">排序依據</string>
     <string name="site_settings_account_required_title">使用者必須登入</string>
     <string name="site_settings_identity_required_title">必須包含名稱和電子郵件</string>
@@ -2044,22 +2410,22 @@ Language: zh_TW
     <string name="site_settings_default_format_title">預設格式</string>
     <string name="site_settings_default_category_title">預設類別</string>
     <string name="site_settings_address_title">位址</string>
-    <string name="site_settings_tagline_title">標語</string>
     <string name="site_settings_title_title">網站標題</string>
+    <string name="site_settings_tagline_title">標語</string>
     <string name="site_settings_discussion_new_posts_header">新文章預設設定</string>
-    <string name="site_settings_writing_header">撰寫</string>
     <string name="site_settings_account_header">帳號</string>
-    <string name="site_settings_general_header">一般</string>
+    <string name="site_settings_writing_header">撰寫</string>
     <string name="newest_first">最新的在前</string>
-    <string name="oldest_first">最舊的在前</string>
-    <string name="close_after">以下時間後關閉</string>
-    <string name="comments">留言</string>
-    <string name="related_posts">相關文章</string>
-    <string name="privacy">隱私</string>
+    <string name="site_settings_general_header">一般</string>
     <string name="discussion">討論</string>
+    <string name="privacy">隱私</string>
+    <string name="related_posts">相關文章</string>
+    <string name="comments">留言</string>
+    <string name="close_after">以下時間後關閉</string>
+    <string name="oldest_first">最舊的在前</string>
     <string name="media_error_no_permission_upload">你沒有權限，無法上傳媒體檔案至網站</string>
-    <string name="unknown">不明</string>
     <string name="never">從未</string>
+    <string name="unknown">不明</string>
     <string name="reader_err_get_post_not_found">此文章已不存在</string>
     <string name="reader_err_get_post_not_authorized">你未獲授權無法檢視此文章</string>
     <string name="reader_err_get_post_generic">無法擷取此文章</string>
@@ -2071,22 +2437,22 @@ Language: zh_TW
     <string name="theme_activation_error">發生了點錯誤。無法啟用佈景主題</string>
     <string name="theme_by_author_prompt_append">作者：%1$s</string>
     <string name="theme_prompt">感謝你選擇 %1$s</string>
-    <string name="theme_manage_site">管理網站</string>
-    <string name="theme_done">完成</string>
-    <string name="theme_support">支援</string>
-    <string name="theme_details">詳細資料</string>
-    <string name="theme_view">檢視</string>
     <string name="theme_try_and_customize">試用與自訂</string>
+    <string name="theme_view">檢視</string>
+    <string name="theme_details">詳細資料</string>
+    <string name="theme_support">支援</string>
+    <string name="theme_done">完成</string>
+    <string name="theme_manage_site">管理網站</string>
     <string name="theme_activate">啟用</string>
-    <string name="active">已啟用</string>
-    <string name="support">支援</string>
-    <string name="details">詳細資料</string>
-    <string name="customize">自訂</string>
     <string name="current_theme">目前佈景主題</string>
-    <string name="page_updated">頁面已更新</string>
-    <string name="post_updated">文章已更新</string>
-    <string name="page_published">頁面已發表</string>
+    <string name="customize">自訂</string>
+    <string name="details">詳細資料</string>
+    <string name="support">支援</string>
+    <string name="active">已啟用</string>
     <string name="post_published">文章已發表</string>
+    <string name="page_published">頁面已發表</string>
+    <string name="post_updated">文章已更新</string>
+    <string name="page_updated">頁面已更新</string>
     <string name="theme_no_search_result_found">很抱歉，找不到佈景主題。</string>
     <string name="reader_label_gap_marker">載入更多文章</string>
     <string name="notifications_no_search_results">沒有網站符合「%s」</string>
@@ -2094,6 +2460,7 @@ Language: zh_TW
     <string name="notifications_empty_view_reader">前往讀取器</string>
     <string name="notifications_empty_action_followers_likes">引起關注：在已閱讀的文章上留言</string>
     <string name="notifications_empty_action_comments">加入討論：在關注的網誌文章上留言</string>
+    <string name="notifications_empty_action_unread">激發討論：撰寫新文章</string>
     <string name="notifications_empty_action_all">動起來吧！在關注的網誌文章上留言。</string>
     <string name="notifications_empty_comments">尚未有留言</string>
     <string name="notifications_empty_unread">全部都是最新版本！</string>
@@ -2107,6 +2474,8 @@ Language: zh_TW
     <string name="reader_short_like_count_multi">%s 個讚</string>
     <string name="reader_short_like_count_one">1 個讚</string>
     <string name="reader_short_like_count_none">讚</string>
+    <string name="reader_label_follow_count">%,d 個追蹤我的人</string>
+    <string name="reader_menu_tags">編輯主題和網站</string>
     <string name="reader_title_post_detail">讀者文章</string>
     <string name="notifications_push_summary">在裝置上顯示通知的相關設定。</string>
     <string name="notifications_email_summary">將通知傳送至帳號所繫結之電子郵件地址的相關設定。</string>
@@ -2116,23 +2485,24 @@ Language: zh_TW
     <string name="error_loading_notifications">無法載入通知設定</string>
     <string name="comment_likes">按讚的留言</string>
     <string name="app_notifications">應用程式通知</string>
-    <string name="email">電子郵件</string>
     <string name="notifications_tab">通知索引標籤</string>
+    <string name="email">電子郵件</string>
+    <string name="notification_settings_item_other_account_emails_summary">我們會隨時傳送與帳號資訊相關的重要電子郵件，除此之外，你也能獲得實用的額外資訊。</string>
     <string name="stats_insights_latest_post_summary">最新文章摘要</string>
     <string name="connectionbar_no_connection">沒有連線</string>
     <string name="post_trashed">文章已移至垃圾桶</string>
-    <string name="button_trash">垃圾桶</string>
     <string name="button_stats">統計</string>
+    <string name="button_trash">垃圾桶</string>
     <string name="button_preview">預覽</string>
     <string name="button_view">檢視</string>
-    <string name="button_publish">發表</string>
     <string name="button_edit">編輯</string>
+    <string name="button_publish">發表</string>
     <string name="reader_toast_err_follow_blog_not_authorized">你沒有存取此網站的權限</string>
     <string name="reader_toast_err_follow_blog_not_found">找不到這個網站</string>
     <string name="undo">復原</string>
     <string name="push_auth_expired">要求已到期。登入 WordPress.com 再試一次。</string>
-    <string name="ignore">忽略</string>
     <string name="stats_insights_best_ever">最佳的瀏覽次數</string>
+    <string name="ignore">忽略</string>
     <string name="stats_insights_today">本日統計</string>
     <string name="stats_insights_all_time">有史以來的文章數、瀏覽次數與訪客數</string>
     <string name="stats_insights">Insights</string>
@@ -2140,181 +2510,186 @@ Language: zh_TW
     <string name="me_connect_to_wordpress_com">連線 WordPress.com</string>
     <string name="me_btn_login_logout">登入/登出</string>
     <string name="me_btn_support">說明與客戶服務</string>
-    <string name="account_settings">帳號設定</string>
     <string name="site_picker_cant_hide_current_site">由於「%s」是目前的網站，因此並未隱藏</string>
+    <string name="account_settings">帳號設定</string>
+    <string name="site_picker_create_wpcom">建立 WordPress.com 網站</string>
     <string name="site_picker_add_self_hosted">新增自助託管的網站</string>
     <string name="site_picker_edit_visibility">顯示/隱藏網站</string>
-    <string name="site_picker_title">選擇網站</string>
-    <string name="my_site_btn_view_site">檢視網站</string>
+    <string name="site_picker_add_site">新增網站</string>
     <string name="my_site_btn_view_admin">檢視管理員</string>
+    <string name="my_site_btn_view_site">檢視網站</string>
+    <string name="site_picker_title">選擇網站</string>
     <string name="my_site_btn_switch_site">切換網站</string>
-    <string name="my_site_btn_site_settings">設定</string>
     <string name="my_site_btn_blog_posts">網誌文章</string>
-    <string name="my_site_header_publish">發表</string>
+    <string name="my_site_btn_site_settings">設定</string>
     <string name="my_site_header_look_and_feel">外觀和風格</string>
+    <string name="my_site_header_publish">發表</string>
     <string name="my_site_header_configuration">組態</string>
     <string name="reader_label_new_posts_subtitle">點選以顯示</string>
     <string name="deselect_all">取消全選</string>
-    <string name="select_all">全部選取</string>
-    <string name="hide">隱藏</string>
     <string name="show">顯示</string>
-    <string name="auth_required">再次登入以繼續操作。</string>
-    <string name="invalid_verification_code">驗證碼無效</string>
-    <string name="verification_code">驗證碼</string>
+    <string name="hide">隱藏</string>
+    <string name="select_all">全部選取</string>
     <string name="language">語言</string>
+    <string name="verification_code">驗證碼</string>
+    <string name="invalid_verification_code">驗證碼無效</string>
+    <string name="auth_required">再次登入以繼續操作。</string>
     <string name="reader_empty_posts_request_failed">無法擷取文章</string>
     <string name="publisher">發佈者：</string>
     <string name="error_notification_open">無法開啟通知</string>
     <string name="stats_search_terms_unknown_search_terms">不明搜尋字詞</string>
-    <string name="stats_view_search_terms">搜尋字詞</string>
     <string name="stats_view_authors">作者</string>
+    <string name="stats_view_search_terms">搜尋字詞</string>
     <string name="comments_fetching">正在擷取留言…</string>
     <string name="pages_fetching">正在擷取頁面…</string>
     <string name="posts_fetching">正在擷取文章…</string>
     <string name="media_fetching">正在擷取媒體…</string>
     <string name="logs_copied_to_clipboard">應用程式記錄已複製到剪貼簿</string>
-    <string name="reader_empty_posts_in_blog">這個網站沒有內容</string>
     <string name="reader_label_new_posts">新文章</string>
-    <string name="reader_page_recommended_blogs">你或許也會喜歡以下網站：</string>
     <string name="error_copy_to_clipboard">將文字複製到剪貼簿時發生錯誤</string>
+    <string name="reader_empty_posts_in_blog">這個網站沒有內容</string>
     <string name="post_uploading">正在上傳文章</string>
-    <string name="stats_followers_years">%1$d 年</string>
-    <string name="stats_followers_a_year">一年</string>
+    <string name="themes_fetching">正在擷取佈景主題…</string>
     <string name="stats_followers_months">%1$d 個月</string>
+    <string name="stats_followers_a_year">一年</string>
+    <string name="stats_followers_years">%1$d 年</string>
     <string name="stats_followers_a_month">一個月</string>
-    <string name="stats_followers_days">%1$d 天</string>
-    <string name="stats_followers_a_day">一天</string>
-    <string name="stats_followers_hours">%1$d 個小時</string>
-    <string name="stats_followers_an_hour_ago">一小時前</string>
     <string name="stats_followers_minutes">%1$d 分鐘</string>
+    <string name="stats_followers_an_hour_ago">一小時前</string>
+    <string name="stats_followers_hours">%1$d 個小時</string>
+    <string name="stats_followers_a_day">一天</string>
+    <string name="stats_followers_days">%1$d 天</string>
     <string name="stats_followers_a_minute_ago">一分鐘前</string>
     <string name="stats_followers_seconds_ago">幾秒鐘前</string>
-    <string name="stats_view_followers">關注者</string>
-    <string name="stats_view_publicize">宣傳</string>
-    <string name="stats_view_videos">影片</string>
     <string name="stats_view_top_posts_and_pages">文章與頁面</string>
+    <string name="stats_view_videos">影片</string>
+    <string name="stats_view_publicize">宣傳</string>
+    <string name="stats_view_followers">關注者</string>
     <string name="stats_view_countries">國家</string>
     <string name="stats_likes">按讚數</string>
-    <string name="stats_visitors">訪客</string>
-    <string name="stats_views">點閱數</string>
     <string name="stats_timeframe_years">年</string>
-    <string name="themes_fetching">正在擷取佈景主題…</string>
+    <string name="stats_views">點閱數</string>
+    <string name="stats_visitors">訪客</string>
     <string name="ssl_certificate_details">詳細資料</string>
     <string name="cab_selected">已選取：%d</string>
     <string name="browse_our_faq_button">瀏覽常見問題集</string>
     <string name="reader_empty_comments">尚未有留言</string>
-    <string name="reader_label_like">按讚</string>
     <string name="reader_label_view_original">查看原始文章</string>
+    <string name="reader_label_like">按讚</string>
     <string name="reader_label_comments_closed">留言已關閉</string>
     <string name="reader_title_photo_viewer">第 %1$d 個，共 %2$d 個</string>
     <string name="error_publish_empty_post">無法發表空白的文章</string>
     <string name="error_refresh_unauthorized_posts">你沒有查看或編輯文章的權限</string>
     <string name="error_refresh_unauthorized_pages">你沒有查看或編輯頁面的權限</string>
     <string name="error_refresh_unauthorized_comments">你沒有查看或編輯留言的權限</string>
-    <string name="more">更多</string>
     <string name="older_month">超過一個月</string>
-    <string name="older_last_week">超過一週</string>
+    <string name="more">更多</string>
     <string name="older_two_days">超過 2 天</string>
+    <string name="older_last_week">超過一週</string>
     <string name="mnu_comment_liked">已按讚</string>
     <string name="comment">留言</string>
     <string name="comment_trashed">留言已移至垃圾桶</string>
-    <string name="comment_reply_to_user">回覆 %s</string>
     <string name="posts_empty_list">尚無文章。建立文章？</string>
+    <string name="comment_reply_to_user">回覆 %s</string>
     <string name="signing_out">正在登出…</string>
+    <string name="reader_empty_posts_in_tag">沒有任何與此主題相關的文章</string>
     <string name="reader_toast_err_generic">無法執行此動作</string>
     <string name="reader_toast_err_block_blog">無法封鎖此網站</string>
     <string name="reader_toast_blog_blocked">將不再顯示此網站的文章</string>
     <string name="reader_menu_block_blog">封鎖此網站</string>
-    <string name="schedule_verb">排程</string>
     <string name="update_verb">更新</string>
-    <string name="reader_empty_recommended_blogs">沒有推薦的網站</string>
-    <string name="reader_toast_err_unfollow_blog">無法取消關注此網站</string>
-    <string name="reader_toast_err_follow_blog">無法關注此網站</string>
-    <string name="reader_toast_err_already_follow_blog">你已經關注此網站</string>
-    <string name="reader_toast_err_get_blog_info">無法顯示此網站</string>
-    <string name="reader_label_followed_blog">已關注的網站</string>
+    <string name="schedule_verb">排程</string>
     <string name="reader_page_followed_blogs">關注的網站</string>
+    <string name="reader_label_followed_blog">已關注的網站</string>
+    <string name="reader_toast_err_get_blog_info">無法顯示此網站</string>
+    <string name="reader_toast_err_already_follow_blog">你已經關注此網站</string>
+    <string name="reader_toast_err_follow_blog">無法關注此網站</string>
+    <string name="reader_toast_err_unfollow_blog">無法取消關注此網站</string>
+    <string name="reader_empty_recommended_blogs">沒有推薦的網站</string>
     <string name="reader_title_blog_preview">讀者網站</string>
-    <string name="ssl_certificate_ask_trust">如果你通常能夠順利連線至此網站，則此錯誤可能代表有人正嘗試冒充該網站，因此請勿繼續操作。是否仍然要信任憑證？</string>
-    <string name="ssl_certificate_error">無效的 SSL 憑證</string>
-    <string name="forgot_password">忘記密碼？</string>
+    <string name="reader_page_followed_tags">已關注的主題</string>
+    <string name="reader_hint_add_tag_or_url">輸入要關注的 URL 或主題</string>
     <string name="help">說明</string>
-    <string name="username_or_password_incorrect">你輸入的使用者名稱或密碼不正確</string>
-    <string name="email_invalid">輸入有效的電子郵件地址</string>
-    <string name="invalid_email_message">你的電子郵件地址無效</string>
-    <string name="error_downloading_image">下載圖片時發生錯誤</string>
-    <string name="error_load_comment">無法載入回應</string>
-    <string name="error_edit_comment">編輯回應時發生錯誤</string>
-    <string name="error_moderate_comment">審核時發生錯誤</string>
-    <string name="error_generic">發生錯誤</string>
-    <string name="error_refresh_comments">目前無法重新整理回應</string>
-    <string name="error_refresh_pages">目前無法重新整理頁面</string>
+    <string name="ssl_certificate_error">無效的 SSL 憑證</string>
+    <string name="ssl_certificate_ask_trust">如果你通常能夠順利連線至此網站，則此錯誤可能代表有人正嘗試冒充該網站，因此請勿繼續操作。是否仍然要信任憑證？</string>
+    <string name="no_network_message">沒有可用的網路</string>
+    <string name="gallery_error">無法擷取媒體項目</string>
+    <string name="blog_not_found">存取此網誌時發生錯誤</string>
+    <string name="theme_fetch_failed">無法擷取佈景主題</string>
+    <string name="mnu_comment_unspam">非垃圾</string>
+    <string name="adding_cat_failed">新增類別失敗</string>
+    <string name="adding_cat_success">類別已成功新增</string>
+    <string name="cat_name_required">類別名稱欄位為必填</string>
+    <string name="sdcard_message">需要掛接 SD 卡以上傳媒體</string>
+    <string name="notifications_empty_list">沒有通知</string>
     <string name="error_refresh_posts">目前無法重新整理文章</string>
+    <string name="error_refresh_pages">目前無法重新整理頁面</string>
+    <string name="error_refresh_comments">目前無法重新整理回應</string>
+    <string name="error_generic">發生錯誤</string>
+    <string name="error_moderate_comment">審核時發生錯誤</string>
+    <string name="error_edit_comment">編輯回應時發生錯誤</string>
+    <string name="error_load_comment">無法載入回應</string>
+    <string name="error_downloading_image">下載圖片時發生錯誤</string>
+    <string name="invalid_email_message">你的電子郵件地址無效</string>
+    <string name="email_invalid">輸入有效的電子郵件地址</string>
+    <string name="username_or_password_incorrect">你輸入的使用者名稱或密碼不正確</string>
     <string name="error_deleting_post">刪除文章時發生錯誤</string>
-    <string name="notifications_empty_list">沒有通知</string>
-    <string name="sdcard_message">需要掛接 SD 卡以上傳媒體</string>
-    <string name="cat_name_required">類別名稱欄位為必填</string>
-    <string name="adding_cat_success">類別已成功新增</string>
-    <string name="adding_cat_failed">新增類別失敗</string>
-    <string name="mnu_comment_unspam">非垃圾</string>
-    <string name="theme_fetch_failed">無法擷取佈景主題</string>
-    <string name="blog_not_found">存取此網誌時發生錯誤</string>
-    <string name="gallery_error">無法擷取媒體項目</string>
-    <string name="no_network_message">沒有可用的網路</string>
-    <string name="reader_title_applog">應用程式記錄檔</string>
-    <string name="fatal_db_error">建立應用程式資料庫時發生錯誤。請嘗試重新安裝應用程式。</string>
-    <string name="error_blog_hidden">此網誌已隱藏，無法載入。請在設定中啟用網誌，然後再試一次。</string>
-    <string name="error_refresh_media">目前無法重新整理媒體</string>
-    <string name="wordpress_blog">WordPress 網誌</string>
-    <string name="image_settings">圖片設定</string>
-    <string name="local_changes">本機變更</string>
-    <string name="privacy_policy">隱私權政策</string>
-    <string name="new_media">新媒體</string>
+    <string name="select_categories">選取類別</string>
+    <string name="connection_error">連線錯誤</string>
+    <string name="cancel_edit">取消編輯</string>
+    <string name="post_not_found">載入文章時發生錯誤。重新整理你的文章，然後再試一次。</string>
+    <string name="learn_more">瞭解更多</string>
+    <string name="media_gallery_type_thumbnail_grid">縮圖格線</string>
+    <string name="media_error_no_permission">你沒有檢視媒體庫的權限</string>
+    <string name="cannot_delete_multi_media_items">目前無法刪除部分媒體。請稍後再試一次。</string>
+    <string name="link_enter_url_text">連結文字 (選填)</string>
+    <string name="page_settings">頁面設定</string>
+    <string name="local_draft">本機草稿</string>
+    <string name="post_settings">文章設定</string>
+    <string name="comment_status_approved">已核准</string>
+    <string name="comment_status_unapproved">審核中</string>
+    <string name="comment_status_spam">垃圾</string>
+    <string name="comment_status_trash">已移至垃圾桶</string>
+    <string name="edit_comment">編輯回應</string>
+    <string name="mnu_comment_approve">核准</string>
+    <string name="mnu_comment_unapprove">駁回</string>
+    <string name="mnu_comment_spam">垃圾</string>
+    <string name="mnu_comment_trash">垃圾桶</string>
+    <string name="dlg_approving_comments">核准中</string>
+    <string name="dlg_unapproving_comments">駁回中</string>
+    <string name="dlg_spamming_comments">標記為垃圾</string>
+    <string name="dlg_trashing_comments">正在移至垃圾桶</string>
+    <string name="dlg_confirm_trash_comments">移至垃圾桶？</string>
+    <string name="trash">垃圾桶</string>
+    <string name="saving_changes">正在儲存變更</string>
+    <string name="sure_to_cancel_edit_comment">取消編輯此回應？</string>
+    <string name="content_required">必須發表回應</string>
+    <string name="toast_comment_unedited">回應尚未變更</string>
+    <string name="view_in_browser">在瀏覽器中檢視</string>
+    <string name="add_new_category">新增類別</string>
+    <string name="category_name">類別名稱</string>
+    <string name="file_error_create">無法建立暫存檔進行媒體上傳。確認裝置上有足夠的可用空間。</string>
+    <string name="open_source_licenses">開啟來源授權</string>
+    <string name="http_authorization_required">需要授權</string>
     <string name="new_post">新文章</string>
+    <string name="new_media">新媒體</string>
+    <string name="privacy_policy">隱私權政策</string>
+    <string name="local_changes">本機變更</string>
+    <string name="image_settings">圖片設定</string>
+    <string name="wordpress_blog">WordPress 網誌</string>
+    <string name="error_blog_hidden">此網誌已隱藏，無法載入。請在設定中啟用網誌，然後再試一次。</string>
+    <string name="fatal_db_error">建立應用程式資料庫時發生錯誤。請嘗試重新安裝應用程式。</string>
+    <string name="reader_title_applog">應用程式記錄檔</string>
+    <string name="remove_account">移除網站</string>
     <string name="notifications_empty_all">尚未有任何通知。</string>
-    <string name="http_authorization_required">需要授權</string>
     <string name="invalid_site_url_message">檢查輸入的網站 URL 是否有效</string>
-    <string name="open_source_licenses">開啟來源授權</string>
-    <string name="file_error_create">無法建立暫存檔進行媒體上傳。確認裝置上有足夠的可用空間。</string>
-    <string name="category_name">類別名稱</string>
-    <string name="add_new_category">新增類別</string>
-    <string name="view_in_browser">在瀏覽器中檢視</string>
-    <string name="remove_account">移除網站</string>
-    <string name="toast_comment_unedited">回應尚未變更</string>
-    <string name="content_required">必須發表回應</string>
-    <string name="sure_to_cancel_edit_comment">取消編輯此回應？</string>
-    <string name="saving_changes">正在儲存變更</string>
-    <string name="trash">垃圾桶</string>
-    <string name="dlg_confirm_trash_comments">移至垃圾桶？</string>
-    <string name="dlg_trashing_comments">正在移至垃圾桶</string>
-    <string name="dlg_spamming_comments">標記為垃圾</string>
-    <string name="dlg_unapproving_comments">駁回中</string>
-    <string name="dlg_approving_comments">核准中</string>
-    <string name="mnu_comment_trash">垃圾桶</string>
-    <string name="mnu_comment_spam">垃圾</string>
-    <string name="mnu_comment_unapprove">駁回</string>
-    <string name="mnu_comment_approve">核准</string>
-    <string name="edit_comment">編輯回應</string>
-    <string name="comment_status_trash">已移至垃圾桶</string>
-    <string name="comment_status_spam">垃圾</string>
-    <string name="comment_status_unapproved">審核中</string>
-    <string name="comment_status_approved">已核准</string>
-    <string name="delete_page">是否要刪除頁面？</string>
-    <string name="delete_post">是否要刪除文章？</string>
-    <string name="post_settings">文章設定</string>
-    <string name="file_not_found">找不到可上傳的檔案。該檔案是否已刪除或移走？</string>
-    <string name="local_draft">本機草稿</string>
-    <string name="page_settings">頁面設定</string>
-    <string name="link_enter_url_text">連結文字 (選填)</string>
-    <string name="cannot_delete_multi_media_items">目前無法刪除部分媒體。請稍後再試一次。</string>
-    <string name="media_error_no_permission">你沒有檢視媒體庫的權限</string>
-    <string name="media_gallery_type_thumbnail_grid">縮圖格線</string>
-    <string name="learn_more">瞭解更多</string>
-    <string name="post_not_found">載入文章時發生錯誤。重新整理你的文章，然後再試一次。</string>
+    <string name="error_refresh_media">目前無法重新整理媒體</string>
     <string name="plugin_not_found">存取此外掛程式時發生錯誤</string>
-    <string name="cancel_edit">取消編輯</string>
-    <string name="connection_error">連線錯誤</string>
-    <string name="select_categories">選取類別</string>
+    <string name="file_not_found">找不到可上傳的檔案。該檔案是否已刪除或移走？</string>
+    <string name="delete_post">是否要刪除文章？</string>
+    <string name="delete_page">是否要刪除頁面？</string>
+    <string name="reader_toast_err_add_tag">無法新增此主題</string>
+    <string name="reader_toast_err_remove_tag">無法移除此主題</string>
     <string name="share_link">分享連結</string>
     <string name="reader_empty_posts_in_tag_updating">正在擷取文章…</string>
     <string name="reader_likes_you_and_multi">你和其他 %,d 個人都說這個讚</string>
@@ -2322,72 +2697,74 @@ Language: zh_TW
     <string name="reader_label_reply">回覆</string>
     <string name="cant_share_no_visible_blog">你無法在沒有可見網誌的情形下分享至 WordPress</string>
     <string name="comment_spammed">已將留言標記為垃圾</string>
-    <string name="reader_toast_err_get_post">無法擷取此文章</string>
     <string name="reader_likes_you_and_one">你和其他 1 人都說這個讚</string>
-    <string name="pick_video">選取影片</string>
     <string name="pick_photo">選取照片</string>
-    <string name="sign_up_label">註冊</string>
+    <string name="pick_video">選取影片</string>
+    <string name="reader_toast_err_get_post">無法擷取此文章</string>
+    <string name="empty_list_default">清單是空的</string>
+    <string name="reader_untitled_post">（未命名）</string>
+    <string name="reader_btn_unfollow">追蹤</string>
+    <string name="reader_label_added_tag">新增 %s</string>
+    <string name="reader_label_removed_tag">移除 %s</string>
+    <string name="reader_btn_share">分享</string>
+    <string name="reader_btn_follow">追蹤</string>
     <string name="reader_toast_err_url_intent">無法開啟 %s</string>
-    <string name="reader_toast_err_view_image">無法檢視圖片</string>
-    <string name="reader_toast_err_share_intent">無法分享</string>
-    <string name="reader_toast_err_comment_failed">無法張貼你的回應</string>
-    <string name="reader_likes_only_you">你說這個讚</string>
     <string name="reader_likes_one">1 人說這個讚</string>
-    <string name="reader_label_removed_tag">移除 %s</string>
-    <string name="reader_label_added_tag">新增 %s</string>
+    <string name="reader_likes_only_you">你說這個讚</string>
+    <string name="reader_toast_err_comment_failed">無法張貼你的回應</string>
+    <string name="reader_toast_err_share_intent">無法分享</string>
+    <string name="reader_toast_err_view_image">無法檢視圖片</string>
     <string name="reader_hint_comment_on_comment">回應評論</string>
-    <string name="reader_btn_unfollow">追蹤</string>
-    <string name="reader_btn_follow">追蹤</string>
-    <string name="reader_btn_share">分享</string>
-    <string name="reader_view_reblog">轉發</string>
-    <string name="reader_untitled_post">（未命名）</string>
     <string name="comments_empty_list">尚未有留言</string>
-    <string name="empty_list_default">清單是空的</string>
-    <string name="stats_timeframe_months">月</string>
-    <string name="stats_timeframe_weeks">週</string>
-    <string name="stats_timeframe_days">天</string>
-    <string name="stats_timeframe_yesterday">昨天</string>
-    <string name="stats_timeframe_today">今天</string>
-    <string name="stats_view_referrers">來源網址</string>
-    <string name="stats_view_tags_and_categories">標籤與分類</string>
-    <string name="stats_view_clicks">點擊率</string>
-    <string name="stats">統計</string>
-    <string name="share_action">分享</string>
-    <string name="theme_activate_button">啟用</string>
-    <string name="media_edit_failure">更新失敗</string>
+    <string name="reader_view_reblog">轉發</string>
+    <string name="sign_up_label">註冊</string>
+    <string name="reader_toast_err_tag_exists">你已經關注了此主題</string>
+    <string name="reader_toast_err_tag_invalid">這不是有效的主題</string>
+    <string name="themes">佈景主題</string>
+    <string name="media_gallery_type_slideshow">幻燈片</string>
     <string name="media_edit_description_text">說明</string>
-    <string name="media_edit_caption_text">副標題</string>
     <string name="media_edit_title_text">標題</string>
-    <string name="media_gallery_type_slideshow">幻燈片</string>
-    <string name="media_gallery_type_circles">圓形</string>
-    <string name="media_gallery_type_tiled">磁磚</string>
+    <string name="media_edit_caption_text">副標題</string>
     <string name="media_gallery_type_squares">方塊</string>
-    <string name="themes">佈景主題</string>
-    <string name="discard">放棄</string>
+    <string name="media_gallery_type_tiled">磁磚</string>
+    <string name="media_gallery_type_circles">圓形</string>
+    <string name="media_edit_failure">更新失敗</string>
+    <string name="theme_activate_button">啟用</string>
+    <string name="share_action">分享</string>
+    <string name="stats">統計</string>
+    <string name="stats_view_clicks">點擊率</string>
+    <string name="stats_view_referrers">來源網址</string>
+    <string name="stats_timeframe_today">今天</string>
+    <string name="stats_timeframe_yesterday">昨天</string>
+    <string name="stats_timeframe_days">天</string>
+    <string name="stats_timeframe_weeks">週</string>
+    <string name="stats_timeframe_months">月</string>
+    <string name="stats_view_tags_and_categories">標籤與分類</string>
     <string name="manage">管理</string>
-    <string name="more_notifications">還有 %d 個。</string>
+    <string name="discard">放棄</string>
+    <string name="sign_in">登入</string>
+    <string name="note_reply_successful">回覆已發佈</string>
     <string name="new_notifications">%d 個新通知</string>
+    <string name="more_notifications">還有 %d 個。</string>
     <string name="follows">關注者</string>
-    <string name="note_reply_successful">回覆已發佈</string>
-    <string name="sign_in">登入</string>
     <string name="loading">載入中…</string>
     <string name="httppassword">HTTP 密碼</string>
     <string name="httpuser">HTTP 使用者帳號</string>
     <string name="error_media_upload">上傳媒體時發生錯誤</string>
     <string name="incorrect_credentials">錯誤的使用者帳號或密碼。</string>
-    <string name="log_in">登入</string>
-    <string name="username">使用者帳號</string>
     <string name="password">密碼</string>
+    <string name="username">使用者帳號</string>
+    <string name="log_in">登入</string>
     <string name="reader">閱讀器</string>
     <string name="pages">頁面</string>
     <string name="posts">文章</string>
     <string name="anonymous">匿名</string>
     <string name="no_network_title">沒有網路連線</string>
-    <string name="done">完成</string>
     <string name="ok">OK</string>
+    <string name="done">完成</string>
     <string name="link_enter_url">URL</string>
-    <string name="tos">服務條款</string>
     <string name="version">版本</string>
+    <string name="tos">服務條款</string>
     <string name="app_title">WordPress for Android</string>
     <string name="image_alignment">對齊</string>
     <string name="refresh">更新</string>
@@ -2399,24 +2776,24 @@ Language: zh_TW
     <string name="quickpress_add_error">捷徑名稱不能為空</string>
     <string name="pages_private">私人</string>
     <string name="title">標題</string>
-    <string name="tags_separate_with_commas">以逗號分隔標籤</string>
     <string name="categories">分類</string>
+    <string name="tags_separate_with_commas">以逗號分隔標籤</string>
     <string name="dlg_deleting_comments">刪除留言</string>
     <string name="sdcard_title">需要 SD 卡</string>
     <string name="media">媒體</string>
-    <string name="approve">通過</string>
     <string name="delete">刪除</string>
+    <string name="approve">通過</string>
     <string name="none">無</string>
-    <string name="publish_now">立即發佈</string>
-    <string name="reply">回覆</string>
-    <string name="on">於</string>
-    <string name="preview">預覽</string>
-    <string name="category_refresh_error">分類更新錯誤</string>
     <string name="error">錯誤</string>
-    <string name="no">否</string>
+    <string name="cancel">取消</string>
+    <string name="save">儲存</string>
+    <string name="add">新增</string>
+    <string name="category_refresh_error">分類更新錯誤</string>
+    <string name="on">於</string>
+    <string name="reply">回覆</string>
     <string name="yes">是</string>
+    <string name="no">否</string>
+    <string name="preview">預覽</string>
     <string name="notification_settings">通知設定</string>
-    <string name="add">新增</string>
-    <string name="save">儲存</string>
-    <string name="cancel">取消</string>
+    <string name="publish_now">立即發佈</string>
 </resources>
diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml
index 1eaf81d9fb27..ef02e055b7da 100644
--- a/WordPress/src/main/res/values-zh-rTW/strings.xml
+++ b/WordPress/src/main/res/values-zh-rTW/strings.xml
@@ -1,17 +1,490 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-Translation-Revision-Date: 2020-10-16 11:54:09+0000
+Translation-Revision-Date: 2021-05-13 09:54:08+0000
 Plural-Forms: nplurals=1; plural=0;
 Generator: GlotPress/3.0.0-alpha.2
 Language: zh_TW
 -->
 <resources>
+    <string name="gutenberg_native_size">尺寸</string>
+    <string name="gutenberg_native_image_settings">圖片設定</string>
+    <string name="gutenberg_native_audio_settings">音訊設定</string>
+    <string name="user_profile_untitled_site">(未命名)</string>
+    <string name="user_profile_site_section_header">網站</string>
+    <string name="user_profile_bottom_sheet_description">使用者個人資料底頁資訊</string>
+    <string name="likes_list_screen_title">按讚清單%s</string>
+    <string name="gutenberg_native_write_code">撰寫程式碼…</string>
+    <string name="gutenberg_native_sorting_and_filtering">排序及篩選方式</string>
+    <string name="gutenberg_native_show_download_button">顯示下載按鈕</string>
+    <string name="gutenberg_native_shortcode">短代碼</string>
+    <string name="gutenberg_native_read_more">閱讀全文</string>
+    <string name="gutenberg_native_preload">預先載入</string>
+    <string name="gutenberg_native_post_meta_settings">文章中繼資料設定</string>
+    <string name="gutenberg_native_post_content_settings">文章內容設定</string>
+    <string name="gutenberg_native_metadata">中繼資料</string>
+    <string name="gutenberg_native_media_file">媒體檔案</string>
+    <string name="gutenberg_native_media_area">媒體區域</string>
+    <string name="gutenberg_native_loop">循環播放</string>
+    <string name="gutenberg_native_link_to_12d6f96a">連結到</string>
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery">第 %1$d 張圖片，圖庫中總計 %2$d 張圖片</string>
+    <string name="gutenberg_native_heading_d">標題 %d</string>
+    <string name="gutenberg_native_featured">精選內容</string>
+    <string name="gutenberg_native_enter_url_to_embed_here">在這裡輸入網址以嵌入內容…</string>
+    <string name="gutenberg_native_edit_image">編輯圖片</string>
+    <string name="gutenberg_native_display_post_date">顯示內容發佈日期</string>
+    <string name="gutenberg_native_code">標示為程式碼</string>
+    <string name="gutenberg_native_change_heading_level">變更標題階層</string>
+    <string name="gutenberg_native_browser_default">瀏覽器預設值</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable">區塊已刪除或無法使用。</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself">區塊無法在內部含有相同區塊時進行轉譯。</string>
+    <string name="gutenberg_native_autoplay">自動播放</string>
+    <string name="gutenberg_native_auto">自動載入</string>
+    <string name="gutenberg_native_attachment_page">附件頁面</string>
+    <string name="gutenberg_native_add_text">加入文字…</string>
+    <string name="gutenberg_native_add_caption">新增說明文字</string>
+    <string name="gutenberg_native_what_is_alt_text">替代文字是什麼？</string>
+    <string name="gutenberg_native_transform_s_to">將 %s 轉換為</string>
+    <string name="gutenberg_native_transform_block">轉換區塊…</string>
+    <string name="gutenberg_native_failed_to_insert_media">無法插入媒體。</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file">無法插入音訊檔案。</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur">說明圖片用途。 如果圖片只是為了裝飾，請保留空白。 </string>
+    <string name="gutenberg_native_1_s_transformed_to_2_s">%1$s 已轉換為 %2$s</string>
+    <string name="like_faces_error_loading_message">載入讚資料時發生錯誤。%s。</string>
+    <string name="like_faces_plural_text">%d 位部落客說這個讚。</string>
+    <string name="like_faces_singular_text">1 位部落客說這個讚。</string>
+    <string name="like_title_plural">%d 按讚數</string>
+    <string name="like_title_singular">1 個讚</string>
+    <string name="threat_fix_enter_server_creds_message_plural">輸入你的伺服器憑證以修正威脅。</string>
+    <string name="threat_fix_enter_server_creds_message_singular">輸入你的伺服器憑證以修正威脅。</string>
+    <string name="suggestion">建議：</string>
+    <string name="gutenberg_native_search_blocks">搜尋區塊</string>
+    <string name="gutenberg_native_search_block">搜尋區塊</string>
+    <string name="gutenberg_native_double_tap_to_change_unit">按兩下以變更單位</string>
+    <string name="gutenberg_native_clear_search">清除搜尋</string>
+    <string name="gutenberg_native_cancel_search">取消搜尋</string>
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s">%1$s。%2$s 是 %3$s %4$s。</string>
+    <string name="get_likes_empty_state_title">取得按讚資料時發生錯誤</string>
+    <string name="get_likes_unknown_error">獲得「讚」時發生未知的錯誤。</string>
+    <string name="get_likes_no_network_error">沒有可用的網路。</string>
+    <string name="comments_empty_list_filtered_unreplied">沒有尚未回覆的留言</string>
+    <string name="comment_status_unreplied">尚未回覆</string>
+    <string name="gutenberg_native_table_of_contents">目錄</string>
+    <string name="gutenberg_native_summary">摘要</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h">列出標題以呈現文章摘要。 將 HTML 錨點新增至標題區塊，藉此連結相應文章內容。</string>
+    <string name="gutenberg_native_document_outline">文件大綱</string>
+    <string name="gutenberg_native_buttongroup">ButtonGroup</string>
+    <string name="jetpack_brute_force_allowlist_title">一律允許的 IP 位址</string>
+    <string name="site_settings_denylist_title">留言含有不允許的內容</string>
+    <string name="reader_title_interests">追蹤主題</string>
+    <string name="stories_intro_main_subtitle">在網站創作並發布引人注目內容的全新方式。</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">忽略</string>
+    <string name="activity_log_backup_download_notice_download_action">下載</string>
+    <string name="threat_fix_all_status_success_message_plural">已成功修正威脅。</string>
+    <string name="threat_fix_all_confirmation_message_plural">請確認你要修正所有 %s 個作用中威脅。</string>
+    <string name="scan_idle_threats_description_plural">掃描作業發現 %2$s 有 %1$s 個潛在威脅。 請檢閱以下威脅並採取行動，或點選「全部修正」按鈕。 如果你有需要，我們 %3$s。</string>
+    <string name="scan_fixing_threats_description_plural">我們正努力在背景修正這些威脅。 這段時間你可以照常使用網站，也可以隨時回來查看掃瞄進度。</string>
+    <string name="gutenberg_native_edit_focal_point">編輯焦點</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag">點兩下開啟底部工作表，然後編輯、取代或清除圖片</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag">點兩下開啟動作工作表，然後編輯、取代或清除圖片</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
+    <string name="new_site_creation_search_domain_input_hint">輸入網站的名稱</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;已完成所有任務&lt;/b&gt;&lt;br/&gt;你將觸及更多使用者。 做得好！</string>
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;已完成所有任務&lt;/b&gt;&lt;br/&gt;你已自訂你的網站。 做得好！</string>
+    <string name="quick_start_card_menu_hide">暫時隱藏</string>
+    <string name="magic_link_not_meaning_to_create_account">不是要建立一個新帳號嗎？ 返回並重新輸入你的電子郵件地址。</string>
+    <string name="invite_links_disable_dialog_message">一旦你停用此邀請連結，就沒有人可以再用此連結加入你的團隊。 你確定嗎？</string>
+    <string name="invite_links_disable_dialog_title">停用邀請連結</string>
+    <string name="invite_links_bad_format_response">收到無效回應</string>
+    <string name="invite_links_null_response">未收到回應</string>
+    <string name="invite_links_cannot_get_role_data_error">取得角色的資料時發生錯誤%1$s</string>
+    <string name="invite_links_cannot_get_roles_error">取得角色發生錯誤</string>
+    <string name="invite_links_generic_get_data_error">擷取邀請連結資料時發生未知錯誤</string>
+    <string name="invite_links_helper_text">用這個連結直接加入成員，就不需要一個一個邀請。 造訪此 URL 的人都可以註冊你的組織，即使他們是從其他人那裡收到連結，因此請務必與值得信任的人分享。</string>
+    <string name="invite_links_expire_date">過期 %1$s</string>
+    <string name="invite_links_disable_invite_link">停用邀請連結</string>
+    <string name="invite_links_share_invite_link">分享邀請連結</string>
+    <string name="invite_links_generate">產生新連結</string>
+    <string name="invite_links_get_status_retry">重新整理連結狀態</string>
+    <string name="invite_links_section_title">邀請連結</string>
+    <string name="threats_found_singular">發現威脅</string>
+    <string name="threats_found_plural">發現數個威脅</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;掃描完成&lt;/b&gt; &lt;br&gt; %s 發現潛在威脅</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;掃描完成&lt;/b&gt; &lt;br&gt; 發現一個潛在威脅</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;掃描完成&lt;/b&gt; &lt;br&gt; 未發現威脅</string>
+    <string name="scan_fixing_threats_title_singular">正在修正威脅</string>
+    <string name="disable">停用</string>
+    <string name="quick_start_card_menu_unpin">取消釘選此項目</string>
+    <string name="quick_start_list_review_pages_subtitle">檢查你的頁面並進行變更，或新增/移除頁面。</string>
+    <string name="quick_start_list_view_site_title">造訪你的網站</string>
+    <string name="quick_start_list_upload_icon_subtitle">新增網站圖示，讓網站看起來更專業幹練。</string>
+    <string name="quick_start_list_follow_site_subtitle">探索並追蹤帶給你啟發的網站。</string>
+    <string name="quick_start_list_enable_sharing_title">啟用分享功能</string>
+    <string name="quick_start_list_enable_sharing_subtitle">自動將新文章分享到社群媒體。</string>
+    <string name="quick_start_list_update_site_title_subtitle">為網站取一個能反映出自我風格和主題的名稱。</string>
+    <string name="quick_start_list_check_stats_title">檢視統計資料</string>
+    <string name="backup_download_status_failure_bullet2">我們仍會嘗試為你建立可下載的備份檔案。</string>
+    <string name="backup_download_status_failure_bullet1">我們擷取不到狀態，無法判斷需要花多久時間建立可下載的備份。</string>
+    <string name="backup_download_status_failure_heading">看來，我們擷取不到可下載備份的狀態</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">核取記號圖示</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">時鐘圖示</string>
+    <string name="restore_status_failure_bullet3">我們會在完成時通知你。</string>
+    <string name="restore_status_failure_bullet2">我們仍在嘗試還原你的網站。</string>
+    <string name="restore_status_failure_bullet1">我們擷取不到狀態，無法判斷還原程序需要花多久時間。</string>
+    <string name="restore_status_failure_heading">看來，我們擷取不到你的還原狀態</string>
+    <string name="restore_complete_failed_description">我們無法還原你的網站</string>
+    <string name="restore_warning_action_button">確認</string>
+    <string name="restore_warning_description_with_two_parameters">你確定要將網站還原到 %2$s 的 %1$s 嗎？\n        你在那之後所做的任何變更都會遺失。</string>
+    <string name="backup_download_complete_failed_description">我們無法建立你的備份</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+    <string name="backup_item_content_hint">(排除佈景主題、外掛程式和上傳內容)</string>
+    <string name="backup_item_contents">WP 內容目錄</string>
+    <string name="backup_item_roots">WordPress 根目錄</string>
+    <string name="backup_download_details_choose_items_header">包含在這次下載中的項目</string>
+    <string name="gutenberg_native_uploading">上傳中…</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios">可重複使用區塊無法在 iOS 版 WordPress 中編輯</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android">可重複使用區塊無法在 Android 版 WordPress 中編輯</string>
+    <string name="gutenberg_native_replace_file">取代檔案</string>
+    <string name="gutenberg_native_replace_audio">替換音訊</string>
+    <string name="gutenberg_native_problem_opening_the_audio">開啟音訊時發生問題</string>
+    <string name="gutenberg_native_open">開啟</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request">沒有應用程式可以處理這項要求。</string>
+    <string name="gutenberg_native_lock_icon">鎖定圖示</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options">無法插入音訊檔案。 請點選以顯示選項。</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file">按兩下以選擇音訊檔案</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file">按兩下以聆聽音訊檔案</string>
+    <string name="gutenberg_native_choose_audio">選擇音樂</string>
+    <string name="gutenberg_native_audio_player">音樂播放器</string>
+    <string name="gutenberg_native_audio_file">音訊檔案</string>
+    <string name="gutenberg_native_audio_caption_s">音訊字幕。 %s</string>
+    <string name="gutenberg_native_audio_caption_empty">音訊字幕。 清空</string>
+    <string name="gutenberg_native_add_audio">新增音訊</string>
+    <string name="continue_with_wpcom">登入或註冊 WordPress.com</string>
+    <string name="photo_picker_use_audio">使用這個音訊</string>
+    <string name="photo_picker_choose_audio">從裝置中選擇音訊</string>
+    <string name="people_optional_custom_message_helper_text">選填：輸入自訂訊息，連同你的邀請一併傳送。</string>
+    <string name="people_learn_more_about_roles">瞭解更多有關角色的資訊</string>
+    <string name="threat_status_fixed">固定</string>
+    <string name="threat_found_header">找到</string>
+    <string name="scan_here_to_help">隨時為你提供協助</string>
+    <string name="scan_idle_threats_description_singular">掃描作業發現 %1$s 有一個潛在威脅。 請檢閱以下威脅並採取行動，或點選「全部修正」按鈕。 如果你有需要，我們 %2$s。</string>
+    <string name="scan_idle_manual_scan_description">如要再次檢查網站，請執行手動掃瞄，或等待 Jetpack 於今日稍晚掃瞄你的網站。</string>
+    <string name="scan_provisioning_description">歡迎使用 Jetpack Scan！ 我們已經預定執行完整掃描，將會徹底審視你的網站。 如果我們發現可能影響掃瞄作業的問題，就會通知你；接著就可以開始進行首次完整掃瞄。</string>
+    <string name="scan_scanning_is_initial_description">歡迎使用 Jetpack Scan 服務。我們會掃瞄你的網站，並且很快讓你得知結果。</string>
+    <string name="scan_fixing_threats_description_singular">我們正致力在背景解決此威脅。 這段時間你可以照常使用網站，也可以隨時回來查看掃瞄進度。</string>
+    <string name="scan_scanning_description">掃瞄作業完成後，我們會傳送通知給你。 這段時間你可以照常使用網站，也可以隨時回來查看掃瞄進度。</string>
+    <string name="scan_fixing_threats_title_plural">正在修正威脅</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan 無法完成網站掃瞄作業。 請檢查你的網站是否已經關閉。若否，請再試一次。 如果網站已關閉，或 Jetpack Scan 仍無法順利掃瞄，請與我們的支援團隊聯絡。</string>
+    <string name="scan_request_failed_title">發生錯誤</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">正在備份網站</string>
+    <string name="activity_log_currently_backing_up_message">正在從 %1$s %2$s 備份網站</string>
+    <string name="activity_log_currently_backing_up_title">正在建立可下載的備份</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">你的網站已成功備份</string>
+    <string name="activity_log_backup_finished_snackbar_message">你的網站已成功備份\n已從 %1$s %2$s 備份</string>
+    <string name="activity_log_backup_started_snackbar_message">正在備份你的網站\n正在從 %1$s %2$s 備份</string>
+    <string name="pick_audio">設定音樂</string>
+    <string name="restore_another_process_running">有其他還原作業正在執行。</string>
+    <string name="restore_complete_failed_icon_content_description">錯誤圖示</string>
+    <string name="restore_complete_failed_action_button_content_description">「完成」按鈕</string>
+    <string name="restore_complete_failed_title">還原失敗</string>
+    <string name="restore_complete_visit_site_button_content_description">「造訪網站」按鈕</string>
+    <string name="restore_complete_done_button_content_description">「完成」按鈕</string>
+    <string name="restore_complete_icon_content_description">還原圖示</string>
+    <string name="restore_complete_visit_site_action_button">造訪網站</string>
+    <string name="restore_complete_description_with_two_parameters">所有你選取的項目現在都還原至 %1$s %2$s。</string>
+    <string name="restore_complete_header">你的網站已經還原</string>
+    <string name="restore_progress_label">%1$s%%</string>
+    <string name="restore_progress_footnote">無須等待。 我們會在網站還原後通知你。</string>
+    <string name="restore_progress_icon_content_description">還原網站圖示</string>
+    <string name="restore_progress_description_with_two_parameters">我們正在將你的網站還原至 %1$s %2$s。</string>
+    <string name="restore_progress_header">目前正在還原網站</string>
+    <string name="restore_warning_action_button_content_description">「確認還原網站」按鈕</string>
+    <string name="restore_warning_icon_content_description">紅色圓圈圖片，中間有驚嘆號</string>
+    <string name="restore_warning_header">警告</string>
+    <string name="restore_details_action_button_content_description">「還原網站」按鈕</string>
+    <string name="restore_details_icon_content_description">還原圖示</string>
+    <string name="restore_details_action_button">還原網站</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s 是你選取的還原時間點。</string>
+    <string name="restore_details_header">還原網站</string>
+    <string name="restore_details_choose_items_header">選擇要還原的項目：</string>
+    <string name="restore">還原</string>
+    <string name="backup_download_complete_failed_icon_content_description">含有 X 圖示的雲端</string>
+    <string name="backup_download_complete_failed_action_button_content_description">「完成」按鈕</string>
+    <string name="backup_download_complete_failed_action_button">完成</string>
+    <string name="backup_download_complete_failed_title">下載失敗</string>
+    <string name="web_preview_tablet">平板電腦</string>
+    <string name="web_preview_mobile">行動裝置</string>
+    <string name="quick_start_card_menu_remove">不要再顯示</string>
+    <string name="quick_start_card_menu_pin">釘選此項目</string>
+    <string name="quick_start_dialog_review_pages_message_short">選取%1$s「頁面」%2$s以檢視頁面清單。</string>
+    <string name="quick_start_dialog_review_pages_message">變更、新增或移除網站的頁面。</string>
+    <string name="quick_start_dialog_review_pages_title">檢閱網站頁面</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short">選取%1$s「首頁」%2$s以編輯首頁。</string>
+    <string name="quick_start_dialog_edit_homepage_message_short">選取%1$s「頁面」%2$s以檢視頁面清單。</string>
+    <string name="quick_start_dialog_edit_homepage_message">變更、新增或移除網站首頁的內容。</string>
+    <string name="quick_start_dialog_edit_homepage_title">編輯首頁</string>
+    <string name="reader_menu_mark_as_unseen">標示為未讀。</string>
+    <string name="reader_menu_mark_as_seen">標示為已讀。</string>
+    <string name="error_media_upload_failed_for_reason">上傳媒體失敗。\n%1$s</string>
+    <string name="error_media_not_enough_storage">網站儲存空間不足</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">無法切換此文章的已讀狀態</string>
+    <string name="reader_marked_post_as_unseen">已將文章標示為未讀</string>
+    <string name="reader_marked_post_as_seen">已將文章標示為已讀</string>
+    <string name="threat_fix_all_status_error_message">取得修正狀態時發生錯誤。 請聯絡我們的支援團隊。</string>
+    <string name="threat_fix_all_status_success_message_singular">已成功修正威脅。</string>
+    <string name="threat_fix_all_error_message">修正威脅時發生錯誤。 請聯絡我們的支援團隊。</string>
+    <string name="threat_fix_all_confirmation_message_singular">請確認你要修正一個作用中威脅。</string>
+    <string name="threat_fix_all_warning_title">修復所有威脅</string>
+    <string name="threat_ignore_error_message">忽略威脅時發生錯誤。 請聯絡支援團隊。</string>
+    <string name="threat_ignore_success_message">已忽略威脅。</string>
+    <string name="threat_ignore_warning">除非徹底確認安全無害，否則請不要忽視安全性問題。 若你選擇忽略此威脅，該威脅會繼續存在於你的網站 &lt;b&gt;%s&lt;/b&gt;。</string>
+    <string name="threat_fix_error_message">修正威脅時發生錯誤。 請聯絡我們的支援團隊。</string>
+    <string name="threat_item_sub_header_status_ignored">威脅已忽略</string>
+    <string name="threat_item_sub_header_status_fixed_on">威脅已於 %s 修正</string>
+    <string name="threat_fixing">正在修正威脅</string>
+    <string name="scan_history_ignored_threats_tab">已忽略</string>
+    <string name="scan_history_no_threats_found">找不到任何項目</string>
+    <string name="scan_history_fixed_threats_tab">固定</string>
+    <string name="scan_history_all_threats_tab">全部</string>
+    <string name="scan_scanning_title">掃描檔案</string>
+    <string name="scan_preparing_to_scan_title">準備掃描</string>
+    <string name="scan_history_menu_title">記錄</string>
+    <string name="scan_history">掃描記錄</string>
+    <string name="backup_active_filter_empty_subtitle">請嘗試調整你的日期範圍</string>
+    <string name="backup_active_filter_empty_title">找不到相符的備份</string>
+    <string name="backup_empty_subtitle">你的第一次備份將於 24 小時內顯示於此；備份完成後，你會收到通知</string>
+    <string name="backup_empty_title">第一次備份即將準備就緒</string>
+    <string name="request_failed_message">處理要求時發生問題。 請稍後再試一次。</string>
+    <string name="gutenberg_native_move_to_bottom">移至底部</string>
+    <string name="gutenberg_native_change_block_position">變更區塊位置</string>
+    <string name="label_control_upload">上傳</string>
+    <string name="jetpack_icon_content_description">圖示</string>
+    <string name="backup_download_complete_info">我們也已將檔案連結透過電子郵件傳送給你。</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">分享連結按鈕</string>
+    <string name="backup_download_complete_download_action_button_content_description">下載按鈕</string>
+    <string name="backup_download_complete_icon_content_description">可下載備份已準備就緒圖示</string>
+    <string name="backup_download_complete_download_share_action_button">分享連結</string>
+    <string name="backup_download_complete_download_action_button">下載</string>
+    <string name="backup_download_complete_description_with_two_parameters">我們已成功建立 %1$s %2$s 的網站備份。</string>
+    <string name="backup_download_complete_header">你的備份現在已可下載</string>
+    <string name="backup_download_complete_page_title">你的備份</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+    <string name="backup_download_progress_footnote">無須等待。 我們會在備份準備就緒時通知你。</string>
+    <string name="backup_download_progress_icon_content_description">建立可下載備份圖示</string>
+    <string name="backup_download_progress_description_with_two_parameters">我們正在為你的網站建立 %1$s %2$s 的可下載備份。</string>
+    <string name="backup_download_progress_header">目前正在為你的網站建立可下載的備份</string>
+    <string name="backup_download_progress_page_title">下載備份</string>
+    <string name="backup_download_another_download_running">正在執行其他下載作業。</string>
+    <string name="backup_download_generic_failure">處理要求時發生問題。 請稍後再試一次。</string>
+    <string name="backup_download_details_action_button_content_description">建立可下載備份按鈕</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s 是選定建立可下載備份的時間點。</string>
+    <string name="gutenberg_native_image_link_url">圖片連結 URL</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="suggestion_xpost">多重發佈</string>
+    <string name="suggestion_user">使用者</string>
+    <string name="suggestion_no_matching">沒有相符的 %s。</string>
+    <string name="suggestion_problem">載入建議時發生問題。</string>
+    <string name="suggestion_none">無可用的 %s 建議。</string>
+    <string name="suggestion_selection_needed">請輸入字詞以篩選建議清單。</string>
+    <string name="threat_get_free_estimate">免費估價</string>
+    <string name="threat_ignore">忽略威脅</string>
+    <string name="threat_fix">威脅處理</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan 會解決威脅。</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan 會刪除受影響的檔案或目錄。</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan 將升級至更新版本 (%s)。</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan 會刪除受影響的檔案或目錄。</string>
+    <string name="threat_fix_fixable_replace">Jetpack Scan 會替換受影響的檔案或目錄。</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan 無法自動修正此威脅。\n 建議你手動處理，方法如下：確認 WordPress、你使用的佈景主題與所有外掛程式都是最新的版本，並且將可能有資安疑慮的程式碼、佈景主題或外掛程式自網站上移除。 \n \n\n 如需更多協助來解決此威脅，建議你使用 &lt;b&gt;Codeable&lt;/b&gt;；這個自由工作者平台上的 WordPress 專家均通過嚴格審查，專業能力值得信賴。\n 他們已經選出一群安全專家協助你處理這些專案。 價格為一小時 $70 到 $120 之間，平台提供免費報價，不一定要聘用。</string>
+    <string name="threat_fix_current_not_fixable_header">正在解決威脅</string>
+    <string name="threat_fix_fixed_header">Jetpack 如何修復問題？</string>
+    <string name="threat_fix_default_header">如何修復？</string>
+    <string name="threat_file_description">檔案中發現的威脅：</string>
+    <string name="threat_technical_details_header">技術詳細資訊</string>
+    <string name="threat_problem_header">問題為何？</string>
+    <string name="threat_details">威脅詳細資訊</string>
+    <string name="threat_item_sub_header_vulnerable_theme">已在佈景主題中發現安全漏洞</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">已在外掛程式中發現安全漏洞</string>
+    <string name="threat_item_sub_header_file_signature">發現威脅 %s</string>
+    <string name="threat_item_sub_header_core_file">已在 WordPress 中發現安全漏洞</string>
+    <string name="threat_item_sub_header_misc_vulnerability">其他安全漏洞</string>
+    <string name="threat_item_header_vulnerable_theme">易受攻擊的佈景主題：%s (版本：%s)</string>
+    <string name="threat_item_header_vulnerable_plugin">易受攻擊的外掛程式：%s (版本：%s)</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s：惡意程式碼模式</string>
+    <string name="threat_item_header_database_threat">資料庫有 %s 個威脅</string>
+    <string name="threat_item_header_infected_core_file">%s：受感染的核心檔案</string>
+    <string name="threat_item_header_threat_found">發現威脅</string>
+    <string name="threats_fix_all">全部修復</string>
+    <string name="scan_in_few_seconds">幾秒鐘前</string>
+    <string name="scan_in_minutes_ago">%s 分鐘前</string>
+    <string name="scan_in_hours_ago">%s 小時前</string>
+    <string name="scan_this_site">此網站</string>
+    <string name="scan_idle_last_scan_description">最近一次 Jetpack 掃瞄已執行 %s，且未找到任何風險。 %s</string>
+    <string name="scan_idle_threats_found_title">你的網站可能存在風險</string>
+    <string name="scan_idle_no_threats_found_title">完全不必擔心</string>
+    <string name="scan_again">重新掃瞄</string>
+    <string name="scan_now">立即掃瞄</string>
+    <string name="scan_state_icon">掃瞄狀態圖示</string>
+    <string name="backup">備份</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">活動類型篩選器 (已選取 %s 個類型)</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (顯示 %s 個項目)</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">活動類型篩選器</string>
+    <string name="activity_log_activity_type_empty_subtitle">選取的日期範圍內沒有任何活動記錄。</string>
+    <string name="activity_log_activity_type_empty_title">無活動可查看</string>
+    <string name="activity_log_activity_type_error_subtitle">請檢查你的網際網路連線，然後再試一次。</string>
+    <string name="activity_log_activity_type_error_title">沒有連線</string>
+    <string name="activity_log_activity_type_filter_active_label">活動類型 (%s)</string>
+    <string name="activity_log_date_range_filter_label_content_description">日期範圍篩選器</string>
+    <string name="activity_log_active_filter_empty_subtitle">請嘗試調整日期範圍或活動類型篩選條件</string>
+    <string name="activity_log_active_filter_empty_title">找不到符合的活動</string>
+    <string name="backup_item_sqls">網站資料庫</string>
+    <string name="backup_item_roots_hint">(包括 wp-config.php 和任何非 WordPress 檔案)</string>
+    <string name="backup_item_media_uploads">媒體上傳</string>
+    <string name="backup_item_plugins">WordPress 外掛程式</string>
+    <string name="backup_item_themes">WordPress 佈景主題</string>
+    <string name="backup_download_details_icon_content_description">建立可下載的備份圖示</string>
+    <string name="backup_download_details_action_button">建立可下載檔案</string>
+    <string name="backup_download_details_header">建立可下載的備份</string>
+    <string name="backup_download_details_page_title">下載備份</string>
+    <string name="backup_download">備份下載</string>
+    <string name="gutenberg_native_error">錯誤</string>
+    <string name="gutenberg_native_choose_file">選擇檔案</string>
+    <string name="activity_log_item_menu_download_backup_label">下載備份</string>
+    <string name="activity_log_item_menu_restore_label">還原至此時間點</string>
+    <string name="activity_log_activity_type_filter_label">活動類型</string>
+    <string name="activity_log_date_range_filter_label">日期範圍</string>
+    <string name="activity_log_activity_type_filter_header">依活動類型篩選</string>
+    <string name="dialog_confirm_copy_local_copy_button">複製此應用程式的版本</string>
+    <string name="dialog_confirm_copy_local_edit_button">首先編輯文章</string>
+    <string name="dialog_confirm_copy_local_message">你嘗試複製的文章有兩個互相不一致的版本，或者你最近進行變更但沒有儲存。\n首先編輯文章，解決任何不一致，或繼續複製此應用程式的版本。</string>
+    <string name="dialog_confirm_copy_local_title">文章同步不一致</string>
+    <string name="button_copy">複製</string>
+    <string name="toast_edit_story_update_in_progress_title">正在儲存故事，請稍候…</string>
+    <string name="gutenberg_native_file_name">檔案名稱</string>
+    <string name="gutenberg_native_file_block_settings">檔案區塊設定</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options">上傳檔案失敗。\n請點選以顯示選項。</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options">存檔失敗。\n請點選以顯示選項。</string>
+    <string name="gutenberg_native_edit_file">編輯檔案</string>
+    <string name="gutenberg_native_copy_file_url">複製檔案 URL</string>
+    <string name="gutenberg_native_choose_a_file">選擇檔案</string>
+    <string name="new_site_creation_domain_header_title">選擇網域</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack 設定</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
+    <string name="reader_btn_following_comments">透過電子郵件追蹤對話</string>
+    <string name="reader_btn_follow_comments">透過電子郵件追蹤對話</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">無法取消訂閱這篇文章的留言</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">無法訂閱這篇文章的留言</string>
+    <string name="reader_follow_comments_get_status_error">擷取文章訂閱狀態時發生錯誤</string>
+    <string name="reader_follow_comments_unsubscribe_success">已成功取消訂閱留言</string>
+    <string name="reader_follow_comments_subscribe_success">已成功訂閱留言</string>
+    <string name="reader_follow_comments_bad_format_response">收到無效回應</string>
+    <string name="reader_follow_comments_null_response">未收到回應</string>
+    <string name="activity_log_activity_type_filter_clear">清除</string>
+    <string name="activity_log_activity_type_filter_apply">套用</string>
+    <string name="dialog_edit_story_unsupported_format_message">一或多張投影片並未加入你的限時動態，因為「限時動態」功能目前不支援 GIF 檔案。 請改為選擇靜態圖片或影片背景。</string>
+    <string name="dialog_edit_story_unsupported_format_title">不支援 GIF 檔案</string>
+    <string name="dialog_edit_story_unrecoverable_message">我們無法在網站上找到這個限時動態使用的媒體。</string>
+    <string name="dialog_edit_story_unrecoverable_title">無法編輯限時動態</string>
+    <string name="dialog_edit_story_unavailable_message">無法載入這個限時動態的媒體 請檢查你的網際網路連線，並稍後再試一次。</string>
+    <string name="dialog_edit_story_unavailable_title">無法編輯限時動態</string>
+    <string name="dialog_edit_story_limited_message">這個限時動態已在不同裝置上編輯過，因此特定物件的編輯功能可能受到限制。</string>
+    <string name="dialog_edit_story_limited_title">限時動態編輯功能受限</string>
+    <string name="cannot_retry_deleted_media_item_fatal">已移除媒體。 請嘗試重新建立你的限時動態。</string>
+    <string name="color_picker_label_background">背景</string>
+    <string name="color_picker_label_text">文字</string>
+    <string name="dialog_discard_story_ok_button_edit">捨棄</string>
+    <string name="dialog_discard_story_message_edit">系統將不會儲存任何變更。</string>
+    <string name="dialog_discard_story_title_edit">要捨棄變更嗎？</string>
+    <string name="label_done_button">完成</string>
+    <string name="label_next_button">下一步</string>
+    <string name="delete_button_alt">刪除</string>
+    <string name="hpp_choose_error">選取設計時發生錯誤。</string>
+    <string name="hpp_retry_error">請檢查你的網際網路連線，然後再試一次。</string>
+    <string name="hpp_error_subtitle">請在重新上線時點選重試。</string>
+    <string name="hpp_error_title">版面配置在離線時無法使用</string>
+    <string name="continue_site_credentials">使用商店憑證繼續</string>
+    <string name="login_find_your_connected_email">尋找你連結的電子郵件</string>
+    <string name="reader_discover_no_posts_button_text">追蹤主題</string>
+    <string name="reader_discover_no_posts_subtitle">嘗試追蹤更多主題以擴大搜尋範圍</string>
+    <string name="reader_discover_no_posts_title">沒有近期文章</string>
+    <string name="reader_discover_empty_title">歡迎！</string>
+    <string name="scan">掃瞄</string>
+    <string name="login_prologue_third_subtitle_three">&lt;b&gt;Johan Brandt&lt;/b&gt; 已回應你的文章</string>
+    <string name="login_prologue_third_subtitle_two">你的網站本日獲得 &lt;b&gt;50 個讚&lt;/b&gt;</string>
+    <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; 已對你的文章按讚</string>
+    <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block">已開啟可捲動的區塊選單。 請選取一個區塊。</string>
+    <string name="gutenberg_native_scrollable_block_menu_closed">已關閉可捲動的區塊選單。</string>
+    <string name="hpp_skip_button">跳過</string>
+    <string name="hpp_choose_button">選擇</string>
+    <string name="hpp_subtitle">選擇你喜愛的首頁版面配置。 你可於稍後加以編輯及自訂。</string>
+    <string name="hpp_title">選擇一款設計</string>
+    <string name="mlp_network_error_subtitle">請在重新上線時點選重試，或是使用下方按鈕建立空白頁面。</string>
+    <string name="mlp_network_error_title">版面配置在離線時無法使用</string>
+    <string name="mlp_error_subtitle">請點選重試或使用下方按鈕建立空白頁面。</string>
+    <string name="mlp_error_title">發生錯誤導致版面配置無法使用</string>
+    <string name="prepublishing_nudges_add_category_button">新增類別</string>
+    <string name="prepublishing_nudges_toolbar_title_add_categories">新增類別</string>
+    <string name="prepublishing_nudges_toolbar_title_categories">類別</string>
+    <string name="prepublishing_nudges_home_categories_not_set">未設定</string>
+    <string name="prepublishing_nudges_categories_action">類別</string>
+    <string name="login_prologue_fifth_caption_three">倫敦的博物館</string>
+    <string name="login_prologue_fifth_caption_two">全球最棒的粉絲</string>
+    <string name="login_prologue_fifth_caption_one">我最愛的十家咖啡館</string>
+    <string name="login_prologue_fifth_tag_six">政治</string>
+    <string name="login_prologue_fifth_tag_five">音樂</string>
+    <string name="login_prologue_fifth_tag_four">園藝</string>
+    <string name="login_prologue_fifth_tag_three">橄欖球</string>
+    <string name="login_prologue_fifth_tag_two">烹飪</string>
+    <string name="login_prologue_fifth_tag_one">藝術</string>
+    <string name="login_prologue_fifth_subtitle_three">每週搖滾</string>
+    <string name="login_prologue_fifth_subtitle_two">網路新聞</string>
+    <string name="login_prologue_fifth_subtitle_one">Pamela Nguyen</string>
+    <string name="login_prologue_second_subtitle_two">攝影師 Cameron Karsten 的作品讓我深受啟發。 我下次會嘗試這些技巧</string>
+    <string name="login_prologue_second_subtitle_one">激發靈感</string>
+    <string name="login_prologue_title_fifth">關注你喜歡的網站並發掘新網誌。</string>
+    <string name="login_prologue_title_fourth">透過深入分析資料拓展讀者群。</string>
+    <string name="login_prologue_title_third">即時查看留言和通知。</string>
+    <string name="login_prologue_title_second">這個功能強大的編輯器讓你隨時隨地都能發佈文章。</string>
+    <string name="login_prologue_title_first">歡迎使用全球最受歡迎的網站建置工具。</string>
+    <string name="media_loading_failed">媒體載入失敗</string>
+    <string name="reader_discover_recommended_blogs_header">值得關注的網站</string>
+    <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release">我們正在努力開發，讓每次版本更新都可以新增更多區塊。</string>
+    <string name="gutenberg_native_s_is_not_fully_supported">無法完全支援「%s」</string>
+    <string name="gutenberg_native_help_button">「協助」按鈕</string>
+    <string name="gutenberg_native_edit_using_web_editor">使用網頁編輯器編輯</string>
+    <string name="gutenberg_native_choose_images">選擇圖片</string>
+    <string name="stories_intro_create_story_post_label">建立限時動態文章</string>
+    <string name="stories_intro_description_second">它們會以新網誌文章的形式發佈在你的網站上，這樣你的讀者群永遠不會錯過任何精彩內容。</string>
+    <string name="stories_intro_title_second">故事文章不會消失</string>
+    <string name="stories_intro_description_first">結合相片、視訊和文字，建立吸睛又可點按的故事，你的訪客一定會喜歡。</string>
+    <string name="stories_intro_title_first">現在人人都可以發佈限時動態</string>
+    <string name="stories_intro_image_caption_second">限時動態標題例子</string>
+    <string name="stories_intro_image_caption_first">如何建立限時動態文章</string>
+    <string name="stories_intro_main_title">限時動態文章介紹</string>
+    <string name="mlp_notice_blank_page_created">已建立空白頁面</string>
+    <string name="mlp_notice_page_created">已建立頁面</string>
+    <string name="media_picker_soft_ask_permissions_denied">%1$s 存取你的相片時遭拒絕。 若要解決此問題，請編輯存取權限並開啟 %2$s 和 %3$s。</string>
+    <string name="media_insert_failed">媒體插入失敗。</string>
+    <string name="media_insert_failed_with_reason">媒體插入失敗：%s</string>
+    <string name="photo_picker_wordpress_media_library">從 WordPress 媒體庫選擇</string>
+    <string name="reader_label_toolbar_back">返回</string>
+    <string name="reader_discover_empty_button_text">開始使用</string>
+    <string name="reader_discover_empty_subtitle">追蹤主題以探索新網誌</string>
+    <string name="reader_post_details_header_by_author_name">發表者：</string>
+    <string name="stats_referrer_snackbar_cant_mark_as_spam">此推薦連結不能被標記為垃圾郵件</string>
+    <string name="stats_referrer_popup_unmark_as_spam">取消標記為垃圾郵件</string>
+    <string name="stats_referrer_popup_menu_mark_as_spam">標記為垃圾</string>
+    <string name="stats_referrer_popup_menu_open_website">開啟網站</string>
+    <string name="media_uploading_gif_library_photo">正在上傳 GIF 媒體</string>
+    <string name="media_uploading_stock_library_photo">正在上傳庫存媒體</string>
+    <string name="media_uploading_default">正在上傳媒體</string>
     <string name="gutenberg_native_select_item">選取項目</string>
     <string name="gutenberg_native_search_or_type_url">搜尋或輸入 URL</string>
+    <string name="gutenberg_native_page_break">分頁符號</string>
     <string name="gutenberg_native_add_this_telephone_link">新增此電話連結</string>
     <string name="gutenberg_native_add_this_link">新增此連結</string>
     <string name="gutenberg_native_add_this_email_link">新增此電子郵件連結</string>
-    <string name="suggestion_no_connection">「沒有網際網路連線。\n無法使用建議。」</string>
+    <string name="suggestion_no_connection">沒有網際網路連線。\n建議無法使用。</string>
     <string name="typeface_label_shrikhand">粗體</string>
     <string name="typeface_label_space_mono">現代</string>
     <string name="typeface_label_pacifico">趣味</string>
@@ -19,6 +492,7 @@ Language: zh_TW
     <string name="typeface_label_libre_baskerville">傳統編輯器</string>
     <string name="typeface_label_nunito">休閒</string>
     <string name="toast_capture_operation_permission_needed">你需要授予應用程式錄音權限，才能錄製影片</string>
+    <string name="mlp_notselected_description">%s</string>
     <string name="mlp_selected_description">已選取 %s</string>
     <string name="login_get_link_by_email">透過電子郵件取得登入連結</string>
     <string name="email_not_registered_wpcom">很抱歉，我們找不到與此電子郵件地址連結的 WordPress.com 帳號。</string>
@@ -26,7 +500,6 @@ Language: zh_TW
     <string name="comment_unable_to_show_error">無法顯示此留言</string>
     <string name="media_browse_for_items">瀏覽項目</string>
     <string name="reader_menu_report_post">檢舉這篇文章</string>
-    <string name="gutenberg_native_angle">角度</string>
     <string name="reader_welcome_banner">歡迎使用閱讀器。 動動指尖即可探索數百萬個網誌。</string>
     <string name="error_media_xmlrcp_server_error">發生內部伺服器錯誤</string>
     <string name="error_media_xmlrpc_not_allowed">你無法執行此動作</string>
@@ -36,7 +509,6 @@ Language: zh_TW
     <string name="create_post_story_fab_tooltip">建立文章或故事</string>
     <string name="create_page_fab_tooltip">建立頁面</string>
     <string name="create_post_fab_tooltip">建立文章</string>
-    <string name="contact_fragment_title">\@string/contact_support</string>
     <string name="reader_discover_interests_header">你可能會喜歡</string>
     <string name="reader_expandable_tags_view_overflow_indicator_collapse_title">隱藏</string>
     <string name="gutenberg_native_video_caption_empty">視訊標題。 清空</string>
@@ -75,7 +547,6 @@ Language: zh_TW
     <string name="dialog_discard_errored_page_message">此投影片尚未儲存。 若刪除此投影片，你所做的任何編輯將會遺失。</string>
     <string name="dialog_discard_page_message">此投影片將從你的故事移除。</string>
     <string name="dialog_discard_page_title">要刪除故事投影片嗎？</string>
-    <string name="menu_delete_page">刪除投影片</string>
     <string name="label_text_color_button">變更文字顏色</string>
     <string name="label_text_alignment_button">變更文字對齊方式</string>
     <string name="label_frame_errored">發生錯誤</string>
@@ -85,8 +556,6 @@ Language: zh_TW
     <string name="label_retry_icon">重試</string>
     <string name="label_saved_icon">已儲存</string>
     <string name="label_close_button">關閉</string>
-    <string name="label_control_publish">下一篇</string>
-    <string name="label_done">完成</string>
     <string name="label_share_to">分享至</string>
     <string name="label_snackbar_share">分享</string>
     <string name="label_snackbar_loop_frame_saved">已儲存至相片</string>
@@ -97,7 +566,6 @@ Language: zh_TW
     <string name="label_control_flip_camera">翻轉</string>
     <string name="sound_button_alt">音效</string>
     <string name="text_button_alt">文字</string>
-    <string name="more_button_alt">更多</string>
     <string name="stickers_button_alt">貼紙</string>
     <string name="flash_button_alt">閃爍</string>
     <string name="flip_button_alt">翻轉相機</string>
@@ -108,7 +576,9 @@ Language: zh_TW
     <string name="mlp_choose_layout_subtitle">首先請從各種預先製作的頁面版面配置挑選。 或從空白頁面開始也可以。</string>
     <string name="mlp_choose_layout_title">選擇版面配置</string>
     <string name="prepublishing_nudges_story_title_hint">新增故事標題</string>
-    <string name="quick_start_dialog_create_new_post_message_short">點選 %1$s「建立」。 %2$s 然後選取&lt;b>「網誌文章」&lt;/b></string>
+    <string name="create_post_page_fab_tooltip_contributors_stories_enabled">建立文章或限時動態</string>
+    <string name="create_post_page_fab_tooltip_stories_enabled">建立文章、頁面或限時動態</string>
+    <string name="quick_start_dialog_create_new_post_message_short">點選 %1$s「建立」。 %2$s 然後選取&lt;b&gt;「網誌文章」&lt;/b&gt;</string>
     <string name="photo_picker_choose_file">從裝置中選擇</string>
     <string name="my_site_bottom_sheet_add_story">故事文章</string>
     <string name="my_site_icon_dialog_change_requires_jetpack_message">你需要 Jetpack 外掛程式才能在自助託管的 WordPress 網站上編輯網站圖示。</string>
@@ -122,13 +592,10 @@ Language: zh_TW
     <string name="gutenberg_native_choose_image_or_video">選擇圖片或視訊</string>
     <string name="gutenberg_native_choose_image">選擇圖片</string>
     <string name="gutenberg_native_block_removed">已移除區塊</string>
-    <string name="content_description_logo">WordPress 標誌</string>
-    <string name="enter_your_site_address">請輸入你的網站位址</string>
-    <string name="continue_with_wpcom">繼續使用 WordPress.com</string>
+    <string name="enter_your_site_address">輸入你現有的網址</string>
     <string name="signup_confirmation_title">註冊確認</string>
     <string name="continue_with_google_terms_of_service_text">如果你繼續使用 Google 操作且尚未擁有 WordPress.com 帳號，即表示你正在建立帳號，並同意我們的%1$s服務條款%2$s。</string>
     <string name="continue_terms_of_service_text">繼續操作即代表你同意我們的%1$s服務條款%2$s。</string>
-    <string name="signup_confirmation_magic_link_message">我們會透過電子郵件傳送註冊連結給你，使用此連結即可建立新的 WordPress.com 帳號。</string>
     <string name="signup_confirmation_message">我們會使用這個電子郵件地址，為你建立全新的 WordPress.com 帳號。</string>
     <string name="signup_magic_link_message">我們已透過電子郵件傳送註冊連結給你，使用此連結即可建立新的 WordPress.com 帳號。 請使用此裝置查看電子郵件，並點選 WordPress.com 所傳送電子郵件中的連結。</string>
     <string name="enter_account_info_for_site">輸入你的 %1$s 帳號資訊。</string>
@@ -145,17 +612,15 @@ Language: zh_TW
     <string name="or_type_your_password">或輸入你的密碼</string>
     <string name="create_account">建立帳號</string>
     <string name="send_link_by_email">以電子郵件傳送連結</string>
-    <string name="login_promo_text_unlock_the_power">最具彈性、功能最強大的網站建置系統，釋放無限可能。</string>
     <string name="reset_your_password">重設密碼</string>
-    <string name="quick_start_list_update_site_title_subtitle">為網站取一個能反映出自我風格和主題的名稱。 第一印象很重要！</string>
+    <string name="reader_error_request_failed_title">處理要求時發生問題。 請稍後再試一次。</string>
     <string name="quick_start_list_update_site_title_title">設定你的網站標題</string>
-    <string name="quick_start_dialog_update_site_title_message_short">點選 &lt;b>%1$s&lt;/b> 以設定新標題</string>
+    <string name="quick_start_dialog_update_site_title_message_short">點選 &lt;b&gt;%1$s&lt;/b&gt; 以設定新標題</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">將這篇文章移至垃圾桶也會捨棄本機變更，確定要繼續此操作？</string>
     <string name="gutenberg_native_s_block_options">%s 區塊選項</string>
     <string name="gutenberg_native_duplicate_block">重複區塊</string>
     <string name="gutenberg_native_copy_block">複製區塊</string>
     <string name="gutenberg_native_copied_block">複製的區塊</string>
-    <string name="gutenberg_native_block_settings">區塊設定</string>
     <string name="gutenberg_native_block_pasted">已貼上區塊</string>
     <string name="gutenberg_native_block_duplicated">已重複區塊</string>
     <string name="gutenberg_native_block_cut">已剪下區塊</string>
@@ -171,7 +636,6 @@ Language: zh_TW
     <string name="gutenberg_native_gradient_type">漸層色彩類型</string>
     <string name="gutenberg_native_double_tap_to_select_the_option">按兩下以選擇</string>
     <string name="gutenberg_native_customize_gradient">自訂漸層色彩</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
     <string name="pages_list_author">頁面作者</string>
     <string name="photo_picker_use_gif">使用此 GIF</string>
     <string name="error_media_thumbnail_not_loaded">無法載入媒體縮圖</string>
@@ -194,8 +658,8 @@ Language: zh_TW
     <string name="post_list_move_trashed_post_to_draft_dialog_positive">移至草稿</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_message">你無法編輯移至垃圾桶的文章。 要將此文章狀態變更為「草稿」以便修正嗎？</string>
     <string name="post_list_move_trashed_post_to_draft_dialog_title">是否將文章移至草稿？</string>
-    <string name="reader_label_choose_your_interests">選擇你的興趣</string>
-    <string name="reader_choose_interests_content_description">選擇你的興趣</string>
+    <string name="reader_label_choose_your_interests">選擇你的主題</string>
+    <string name="reader_choose_interests_content_description">選擇你的主題</string>
     <string name="reader_btn_done">完成</string>
     <string name="reader_btn_select_few_interests">選取幾項以繼續操作</string>
     <string name="post_status_post_published">已發表</string>
@@ -207,17 +671,14 @@ Language: zh_TW
     <string name="ccpa_privacy_notice_header">加州使用者的隱私權聲明</string>
     <string name="status_and_visibility">狀態及可見度</string>
     <string name="update_now">馬上更新</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="gutenberg_native_try_a_starter_layout">試用入門版面配置</string>
     <string name="gutenberg_native_open_block_actions_menu">開啟區塊操作選單</string>
-    <string name="gutenberg_native_insert_mention">插入標記</string>
+    <string name="gutenberg_native_move_to_top">移至頂端</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options">按兩下以開啟含有可用選項的底部工作表</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options">按兩下以開啟含有可用選項的操作工作表</string>
     <string name="pages_cannot_be_started">目前我們無法開啟頁面。請稍後再試一次</string>
     <string name="pages_set_as_posts_page">設為文章頁面</string>
     <string name="pages_set_as_homepage">設為首頁</string>
-    <string name="suggestion_no_matching_users">「沒有符合條件的使用者。」</string>
-    <string name="suggestion_invalid_user">「%s不是有效的使用者」</string>
+    <string name="suggestion_invalid">%s 不是有效的 %s</string>
     <string name="site_settings_select_page">選取頁面</string>
     <string name="site_settings_posts_page">文章列表頁面</string>
     <string name="site_settings_static_homepage">靜態首頁</string>
@@ -237,7 +698,6 @@ Language: zh_TW
     <string name="page_homepage_successfully_updated">首頁已成功更新</string>
     <string name="page_cannot_set_posts_page">若要設定文章頁面，請在網站設定中啟用「靜態首頁」</string>
     <string name="page_cannot_set_homepage">若要設定首頁，請在網站設定中啟用「靜態首頁」</string>
-    <string name="gutenberg_native_welcome_to_our_new_blog">歡迎來到我們全新的網誌</string>
     <string name="gutenberg_native_select_a_color">選擇顏色</string>
     <string name="gutenberg_native_double_tap_to_go_to_color_settings">點選兩次即可前往顏色設定</string>
     <string name="reader_empty_followed_blogs_description">關注網站後，網站內容就會顯示於此</string>
@@ -271,7 +731,6 @@ Language: zh_TW
     <string name="gutenberg_native_move_block_left">向左移動區塊</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right">按兩下將區塊向右移</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left">按兩下將區塊向左移</string>
-    <string name="gutenberg_native_blog">網誌</string>
     <string name="new_site_creation_creating_site_loading_4">建立儀表板</string>
     <string name="new_site_creation_creating_site_loading_3">設定佈景主題</string>
     <string name="new_site_creation_creating_site_loading_2">新增網站功能</string>
@@ -327,57 +786,20 @@ Language: zh_TW
     <string name="app_theme_light">淡色系</string>
     <string name="app_theme">外觀</string>
     <string name="dialog_confirm_autosave_body_first_part_for_page">你最近變更了這個頁面，但沒有儲存這些變更。選擇要載入的版本：\n\n</string>
-    <string name="gutenberg_native_what_people_say">使用者評價</string>
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you">我們提供一系列服務，可協助你達到期望的成果。不確定自己需要什麼，或所需內容的費用嗎？我們可以說明有哪些符合你需求的服務，並提供相關費用的詳細資訊。請於下方與我們聯絡。</string>
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o">我們是由一群才華橫溢的專業人士組成的小團隊，具備廣泛的技能和經驗。我們熱愛自己的工作，對旅遊產業充滿熱情。期待能與你合作。</string>
-    <string name="gutenberg_native_warning_message">警告訊息</string>
-    <string name="gutenberg_native_want_to_work_with_us">想加入我們的行列嗎？</string>
-    <string name="gutenberg_native_walt_disney">華特迪士尼</string>
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u">訪客會想知道頁面作者是什麼樣的人。利用此空間介紹你本人、你的網站、企業或任何你想說的話。使用下方的證言，即可引用他人針對同一主題發表的言論。</string>
-    <string name="gutenberg_native_usa">美國</string>
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i">這是範本內含的範例內容，用以說明其功能。你可以移除或用自己的話和媒體取代該內容。</string>
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing">想要有所做為，坐而言不如起而行。</string>
-    <string name="gutenberg_native_team">團隊</string>
-    <string name="gutenberg_native_success_message">成功訊息</string>
-    <string name="gutenberg_native_strategy">策略</string>
     <string name="gutenberg_native_show_post_content">顯示文章內容</string>
-    <string name="gutenberg_native_services">服務</string>
-    <string name="gutenberg_native_samuel_the_dog">校犬 Samuel</string>
-    <string name="gutenberg_native_sally_smith">莎莉史密斯</string>
-    <string name="gutenberg_native_project_name">專案名稱</string>
-    <string name="gutenberg_native_position_or_job_title">職位或職稱</string>
-    <string name="gutenberg_native_portfolio">作品集</string>
     <string name="gutenberg_native_only_show_excerpt">只顯示摘要</string>
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car">我的個人作品集展示了我在職涯中完成的各項專案。我的聯絡資訊如下，歡迎與我聯繫。</string>
     <string name="gutenberg_native_link_to">連結至</string>
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati">與我們討論 👋 如有任何疑問，歡迎使用下方資訊與我們聯絡，或使用表單傳送訊息給我們。</string>
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3">讓我們攜手創造不凡！</string>
-    <string name="gutenberg_native_let_s_build_something_together">讓我們攜手創造不凡！</string>
-    <string name="gutenberg_native_juan_p_rez">胡安培瑞茲</string>
-    <string name="gutenberg_native_j_k_rowling">J.K.羅琳</string>
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than">哈利，決定我們成為什麼樣的人，並不是我們的能力，而是我們做了什麼選擇。</string>
-    <string name="gutenberg_native_inspiration">旅遊靈感</string>
-    <string name="gutenberg_native_get_in_touch">與我們聯絡</string>
+    <string name="gutenberg_native_link_settings">連結設定</string>
     <string name="gutenberg_native_excerpt_length_words">摘要長度 (字數)</string>
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a">透過電子郵件聯絡我：&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_dr_seuss">蘇斯博士</string>
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened">不要因為結束而哭泣，要為曾經發生過而微笑。</string>
     <string name="gutenberg_native_customize">自訂</string>
-    <string name="gutenberg_native_city_10100">City, 10100</string>
+    <string name="gutenberg_native_video_settings">視訊設定</string>
     <string name="gutenberg_native_add_paragraph_block">新增段落區塊</string>
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer">簡要說明你提供的服務。</string>
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest">提供簡短自傳，包括個人經歷、重大成就或趣事。</string>
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a">&lt;a href=\"mailto:mail@example.com\">mail@example.com&lt;/a></string>
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented">專案及展示作品的說明。</string>
-    <string name="gutenberg_native_555_555_1234">(555)555–1234</string>
-    <string name="gutenberg_native_10_street_road">10 Street Road</string>
     <string name="create_post_page_fab_tooltip_contributors">建立文章</string>
     <string name="post_list_tab_trashed_posts">已移至垃圾桶</string>
     <string name="post_list_tab_scheduled_posts">已排程</string>
     <string name="post_list_tab_published_posts">已發佈</string>
     <string name="sharing_facebook_account_must_have_pages">Facebook 連結找不到任何頁面。Publicize 無法連結至 Facebook 個人檔案，只能連結至已發表的頁面。</string>
     <string name="dialog_title_sharing_facebook_account_must_have_pages">未連線</string>
-    <string name="my_site_select_domains_page_title">網站位址</string>
     <string name="notifications_tab_title_likes">按讚數</string>
     <string name="notifications_tab_title_follows">關注者</string>
     <string name="notifications_tab_title_comments">留言</string>
@@ -391,24 +813,25 @@ Language: zh_TW
     <string name="stats_management_add_new_stats_card">新增統計資料卡片</string>
     <string name="reader_self_hosted_select_filter">使用篩選按鈕尋找特定主題的文章</string>
     <string name="reader_bottom_sheet_content_description">選擇一個標籤或網站、快顯視窗</string>
-    <string name="reader_btn_selected_filter_tick_content_description">已選取</string>
     <string name="reader_btn_select_filter_content_description">選擇網站或標籤以篩選文章</string>
     <string name="reader_btn_remove_filter_content_description">移除目前的篩選條件</string>
+    <string name="reader_title_subs">管理主題和網站</string>
     <string name="reader_filter_self_hosted_empty_sites_tags_action">登入 WordPress.com</string>
+    <string name="reader_filter_self_hosted_empty_tagss_list">登入 WordPress.com，查看你關注主題的最新文章</string>
     <string name="reader_filter_self_hosted_empty_sites_list">登入 WordPress.com，查看關注網站的最新文章</string>
-    <string name="gutenberg_native_template_preview">範例預覽</string>
     <string name="gutenberg_native_replace_current_block">取代目前區塊</string>
     <string name="gutenberg_native_add_to_end">新增至「結束」</string>
     <string name="gutenberg_native_add_to_beginning">新增至「開始」</string>
     <string name="gutenberg_native_add_block_before">在之前新增區塊</string>
     <string name="gutenberg_native_add_block_after">在之後新增區塊</string>
+    <string name="reader_filter_empty_tags_action">新增主題</string>
     <string name="reader_filter_empty_sites_action">關注網站</string>
+    <string name="reader_filter_empty_tags_list">你可以新增主題以關注特定主題的文章</string>
     <string name="reader_filter_empty_sites_list">查看你關注網站的最新聞張</string>
     <string name="reader_filter_main_title">關注中</string>
     <string name="reader_filter_cta">篩選</string>
     <string name="gutenberg_native_video_caption_s">視訊標題。%s</string>
     <string name="gutenberg_native_edit_video">編輯視訊</string>
-    <string name="gutenberg_native_double_tap_to_select_layout">按兩下以選擇版面形式</string>
     <string name="gutenberg_native_add_a_shortcode">新增短代碼…</string>
     <string name="post_list_author">文章作者</string>
     <string name="fab_create_desc">建立文章</string>
@@ -423,10 +846,8 @@ Language: zh_TW
     <string name="stats_box_type_low">低</string>
     <string name="stats_bar_chart_accessibility_overlapping_entry"> 與 %1$d %2$s</string>
     <string name="stats_bar_chart_accessibility_entry">%1$s，%2$d %3$s</string>
-    <string name="gutenberg_native_move_image_forward">向前移動圖片</string>
-    <string name="gutenberg_native_move_image_backward">向後移動圖片</string>
+    <string name="gutenberg_native_replace_image">更換圖片</string>
     <string name="gutenberg_native_gallery_caption_s">圖庫標題。%s</string>
-    <string name="gutenberg_native_1_s_current_value_is_2_s">%1$s。目前的值是 %2$s</string>
     <string name="create_post_page_fab_tooltip">建立文章或頁面</string>
     <string name="content_description_person_building_website">網站架設人員</string>
     <string name="post_signup_interstitial_not_right_now">現在不用</string>
@@ -440,53 +861,46 @@ Language: zh_TW
     <string name="my_site_bottom_sheet_add_post">網誌文章</string>
     <string name="my_site_bottom_sheet_title">新增</string>
     <string name="post_settings_publish">發佈</string>
-    <string name="dialog_gutenberg_informative_description_v2">我們大幅改進了區塊編輯器，值得你一試！我們為新文章和頁面啟用了這項功能，但如果你希望變更為傳統編輯器，請前往「我的網站」>「網站設定」進行變更。</string>
     <string name="dialog_confirm_scheduled_post_sync_yes">立即同步</string>
     <string name="dialog_confirm_scheduled_post_sync_message">此文章會立即同步。</string>
     <string name="dialog_confirm_scheduled_post_sync_title">準備好要同步了嗎？</string>
     <string name="new_site_creation_unavailable_domain">此網域不可使用</string>
-    <string name="login_promo_viewpager_content_description">簡介</string>
     <string name="negative_prefix">-%s</string>
     <string name="login_discovery_error_generic">無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_discovery_error_ssl">由於 &lt;b>SSL 憑證&lt;/b>發生問題，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_discovery_error_http_auth">由於你的網站須進行 &lt;b>HTTP 驗證&lt;/b>，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_discovery_error_xmlrpc">無法存取你網站上的 &lt;b>XMLRPC 檔案&lt;/b>。你必須聯絡主機商以解決此問題。</string>
-    <string name="login_site_credentials_magic_link_label">快完成了！我們只需驗證你與 Jetpack 綁定的電子郵件地址就行了&lt;b>%1$s&lt;/b></string>
-    <string name="enter_site_credentials_instead">請使用網站憑證登入。</string>
+    <string name="login_discovery_error_ssl">由於 &lt;b&gt;SSL 憑證&lt;/b&gt;發生問題，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
+    <string name="login_discovery_error_http_auth">由於你的網站須進行 &lt;b&gt;HTTP 驗證&lt;/b&gt;，我們無法存取你的網站。你必須聯絡主機商以解決此問題。</string>
+    <string name="login_discovery_error_xmlrpc">無法存取你網站上的 &lt;b&gt;XMLRPC 檔案&lt;/b&gt;。你必須聯絡主機商以解決此問題。</string>
+    <string name="login_site_credentials_magic_link_label">快完成了！我們只需驗證你與 Jetpack 綁定的電子郵件地址就行了&lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="enter_credentials_for_site">請使用 %1$s 網站憑證登入</string>
-    <string name="send_verification_email">傳送驗證電子郵件</string>
     <string name="my_site_bottom_sheet_add_page">網頁</string>
     <string name="reader_following_display_name">關注中</string>
     <string name="reader_my_likes_display_name">按讚數</string>
     <string name="reader_discover_display_name">探索</string>
     <string name="reader_save_for_later_display_name">已儲存</string>
+    <string name="reader_filter_tags_title">主題</string>
     <string name="reader_filter_sites_title">網站</string>
     <string name="suffix_1_000_000_000_000_000_000">%sQi</string>
     <string name="suffix_1_000_000_000_000_000">%sQa</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000">%sM</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="posts_cannot_be_started">目前無法開啟文章。請稍後再試一次</string>
     <string name="site_cannot_be_loaded">目前無法載入你的網站資料。請稍後再試一次</string>
     <string name="gutenberg_native_wordpress_media_library">WordPress 媒體庫</string>
+    <string name="gutenberg_native_unsupported">不支援</string>
     <string name="gutenberg_native_ungroup">取消群組</string>
     <string name="gutenberg_native_translate">翻譯</string>
-    <string name="gutenberg_native_title">標題：</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard">點選即可隱藏鍵盤</string>
     <string name="gutenberg_native_tap_here_to_show_help">點選此處顯示說明</string>
     <string name="gutenberg_native_take_a_video">拍攝視訊</string>
     <string name="gutenberg_native_take_a_photo_or_video">拍攝相片或視訊</string>
     <string name="gutenberg_native_take_a_photo">拍攝照片</string>
     <string name="gutenberg_native_start_writing">開始撰寫內容…</string>
-    <string name="gutenberg_native_size">大小</string>
-    <string name="gutenberg_native_sidebar_title_plugin">側邊欄標題外掛程式</string>
     <string name="gutenberg_native_show_section">顯示區段</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">%s 區塊含有無效內容</string>
     <string name="gutenberg_native_s_block_empty">%s 區塊空白</string>
     <string name="gutenberg_native_cut_block">剪下區塊</string>
-    <string name="gutenberg_native_reset_block">重設區塊</string>
-    <string name="gutenberg_native_remove_annotations">移除註解</string>
     <string name="gutenberg_native_problem_opening_the_video">開啟視訊時發生問題</string>
     <string name="gutenberg_native_problem_displaying_block">顯示區塊時發生問題</string>
     <string name="gutenberg_native_post_title_s">文章標題。%s</string>
@@ -496,17 +910,12 @@ Language: zh_TW
     <string name="gutenberg_native_open_settings">開啟設定</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows">沒有應用程式可以處理這項要求。請安裝網頁瀏覽器。</string>
     <string name="gutenberg_native_navigate_up">瀏覽</string>
-    <string name="gutenberg_native_my_pre_publish_panel">我的發表前面板</string>
-    <string name="gutenberg_native_my_post_status_info">我的文章狀態資訊</string>
-    <string name="gutenberg_native_my_post_publish_panel">我的發表後面板</string>
-    <string name="gutenberg_native_my_document_setting_panel">我的文件設定面板</string>
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s">將區塊從第 %1$s 列向上移至第 %2$s 列</string>
     <string name="gutenberg_native_move_block_up">向上移動區塊</string>
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s">將區塊從第 %1$s 列向下移至第 %2$s 列</string>
     <string name="gutenberg_native_move_block_down">向下移動區塊</string>
     <string name="gutenberg_native_image_caption_s">圖片說明。%s</string>
     <string name="gutenberg_native_hide_keyboard">隱藏鍵盤</string>
-    <string name="gutenberg_native_here_is_the_panel_content">這裡是面板內容！</string>
     <string name="gutenberg_native_help_icon">說明圖示</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">無法插入媒體。\n請點選以顯示選項。</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">按兩次即可復原上次變更</string>
@@ -518,34 +927,28 @@ Language: zh_TW
     <string name="gutenberg_native_double_tap_to_move_the_block_up">按兩下將區塊向上移</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down">按兩下將區塊向下移</string>
     <string name="gutenberg_native_double_tap_to_edit_this_value">按兩下以編輯此數值</string>
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider">按兩下以使用滑桿變更數值</string>
     <string name="gutenberg_native_double_tap_to_add_a_block">按兩下以新增區塊</string>
     <string name="gutenberg_native_current_value_is_s">目前的值是 %s</string>
-    <string name="gutenberg_native_content">內容…</string>
     <string name="gutenberg_native_choose_from_device">從裝置中選擇</string>
-    <string name="gutenberg_native_annotations_sidebar">註解側邊欄</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again">發生不明的錯誤，請再試一次。</string>
     <string name="gutenberg_native_alt_text">替代文字</string>
     <string name="gutenberg_native_add_video">新增視訊</string>
     <string name="gutenberg_native_add_url">新增網址</string>
+    <string name="gutenberg_native_add_alt_text">新增替代文字</string>
     <string name="gutenberg_native_add_image_or_video">新增圖片或視訊</string>
     <string name="gutenberg_native_add_image">新增圖片</string>
     <string name="gutenberg_native_add_block_here">在此新增區塊</string>
-    <string name="gutenberg_native_add_annotation">新增註解</string>
-    <string name="gutenberg_native_add_a_description">新增說明</string>
     <string name="reader_empty_saved_posts_content_description">點選「新增至儲存文章」按鈕即可將文章儲存至你的清單。</string>
     <string name="reader_acessibility_list_loaded">「此清單已載入 %1$d 個項目。」</string>
     <string name="notifications_tab_dialog_switch_desc">通知</string>
-    <string name="master_switch_default_title_off">關閉</string>
-    <string name="master_switch_default_title_on">開啟</string>
-    <string name="notifications_tab_dialog_master_off_message">若關閉此網站的「通知」功能，將會停用網站通知分頁的通知顯示。你可以開啟網站的「通知」功能，進一步調整想查看哪一類通知。</string>
-    <string name="notifications_tab_dialog_master_off_title">若要在此網站的通知分頁查看通知，請開啟此網站的「通知」功能。</string>
-    <string name="notifications_tab_dialog_master_hint_off">啟用此網站通知分頁的通知顯示</string>
-    <string name="notifications_tab_dialog_master_hint_on">停用此網站通知分頁的通知顯示</string>
-    <string name="notifications_tab_dialog_master_status_off">此網站的通知</string>
-    <string name="notifications_tab_dialog_master_status_on">此網站的通知</string>
-    <string name="dialog_gutenberg_informative_description_page">你正在使用區塊編輯器編輯新頁面，太棒了！ 如想改用傳統編輯器，請前往「我的網站」>「網站設定」。</string>
-    <string name="dialog_gutenberg_informative_description_post">你正在使用區塊編輯器編輯新文章，太棒了！ 如想改用傳統編輯器，請前往「我的網站」>「網站設定」。</string>
+    <string name="main_switch_default_title_off">關閉</string>
+    <string name="main_switch_default_title_on">開啟</string>
+    <string name="notifications_tab_dialog_main_off_message">若關閉此網站的「通知」功能，將會停用網站通知分頁的通知顯示。 你可以開啟網站的「通知」功能，進一步調整想查看的通知類型。</string>
+    <string name="notifications_tab_dialog_main_off_title">若要在此網站的通知分頁查看通知，請開啟此網站的「通知」功能。</string>
+    <string name="notifications_tab_dialog_main_hint_off">啟用此網站通知分頁的通知顯示</string>
+    <string name="notifications_tab_dialog_main_hint_on">停用此網站通知分頁的通知顯示</string>
+    <string name="notifications_tab_dialog_main_status_off">此網站的通知</string>
+    <string name="notifications_tab_dialog_main_status_on">此網站的通知</string>
     <string name="pick_media">新增圖片或視訊</string>
     <string name="error_post_not_submitted_retrying">我們無法將這篇文章提交送審，但稍後會再試一次。</string>
     <string name="error_post_not_scheduled_retrying">我們無法排程這篇文章，但稍後會再試一次。</string>
@@ -638,8 +1041,6 @@ Language: zh_TW
     <string name="post_settings_add_to_calendar">新增到行事曆</string>
     <string name="post_settings_notification">通知</string>
     <string name="post_settings_time_and_date">日期和時間</string>
-    <string name="login_need_help_finding_connected_email">需要協助找出你連結的電子郵件嗎？</string>
-    <string name="enter_wordpress_site">此地址的網站不是 WordPress 網站。為協助我們連結網站，網站必須安裝 WordPress。</string>
     <string name="login_invalid_site_url">請輸入完整的網站位址，例如 example.com。</string>
     <string name="enter_email_for_site">透過 WordPress.com 登入以連結至 %1$s</string>
     <string name="stats_post_views_label">瀏覽次數</string>
@@ -705,7 +1106,7 @@ Language: zh_TW
     <string name="domain_registration_state_picker_dialog_title">選取州/省</string>
     <string name="domain_registration_country_picker_dialog_title">選取國家</string>
     <string name="domain_registration_result_continue_button">繼續</string>
-    <string name="domain_registration_result_description">正在設定你的新網域 &lt;b>%s&lt;/b>。你的網站\n簡直令人樂不可支！</string>
+    <string name="domain_registration_result_description">正在設定你的新網域 &lt;b&gt;%s&lt;/b&gt;。你的網站\n簡直令人樂不可支！</string>
     <string name="domain_registration_result_title">恭喜</string>
     <string name="domain_contact_information_register_domain_button">註冊網域</string>
     <string name="domain_contact_information_postal_code_hint">郵遞區號</string>
@@ -734,11 +1135,14 @@ Language: zh_TW
     <string name="editor_failed_to_insert_media_tap_to_retry">無法插入媒體。\n請點選以重試。</string>
     <string name="editor_uploading_draft">你的草稿正在上傳中…</string>
     <string name="post_uploading_draft">正在上傳草稿</string>
+    <string name="post_list_tab_drafts">草稿</string>
     <string name="error_restoring_post">還原文章時發生錯誤</string>
     <string name="backdated_for">回溯至：%s</string>
     <string name="stats_insights_management_title">只查看最相關的統計資料。在下方新增及管理你的洞察報告。</string>
     <string name="stats_insights_social">社交</string>
     <string name="stats_insights_annual_site_stats">年度網站統計</string>
+    <string name="stats_view_follower_totals">追蹤者總數</string>
+    <string name="domain_suggestions_search_hint">輸入關鍵字尋找更多想法</string>
     <string name="register_domain">註冊網域</string>
     <string name="jetpack_installed_message">現在 Jetpack 已安裝完成，我們只需要協助你完成設定即可。這只需要一分鐘左右。</string>
     <string name="stats_menu_remove">從洞察報告中移除</string>
@@ -807,14 +1211,14 @@ Language: zh_TW
     <string name="plans_loading_error_no_plans_subtitle">目前無法載入「方案」，請稍後再試一次。</string>
     <string name="plans_loading_error_no_plans_title">無法載入「方案」</string>
     <string name="plans_loading_error_network_title">沒有網路連線</string>
+    <string name="menu_switch_to_gutenberg_editor">切換至區塊編輯器</string>
     <string name="stats_loading_block_error">載入資料時發生問題，請重新整理網頁並重試。</string>
     <string name="stats_loading_error">未載入資料</string>
     <string name="site_settings_gutenberg_default_for_new_posts_summary">使用區塊編輯器編輯新文章和網頁</string>
     <string name="site_settings_gutenberg_default_for_new_posts">使用區塊編輯器</string>
-    <string name="dialog_gutenberg_informative_title">已啟用區塊編輯器</string>
     <string name="exit">結束</string>
     <string name="quick_start_sites_type_subtitle">已完成 %2$d 個，共 %1$d 個</string>
-    <string name="quick_start_sites_type_grow">拓展你的讀者群</string>
+    <string name="quick_start_sites_type_grow">讀者持續成長</string>
     <string name="quick_start_sites_type_customize">自訂你的網站</string>
     <string name="quick_start_sites">後續步驟</string>
     <string name="quick_start_complete_tasks_header">完成 (%d)</string>
@@ -822,8 +1226,6 @@ Language: zh_TW
     <string name="quick_start_dialog_upload_icon_title">上傳網站圖示</string>
     <string name="quick_start_dialog_upload_icon_message">你的訪客會在他們的瀏覽器上看到你的圖示。新增自訂圖示會讓網站看起來更專業幹練。</string>
     <string name="quick_start_dialog_explore_plans_message_short">點選%1$s方案%2$s以查看你目前的方案和其他可用方案</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">點選%1$s新增頁面%2$s以建立新頁面。</string>
-    <string name="quick_start_dialog_create_new_page_message_short">請點選%1$s「網頁」%2$s以繼續。</string>
     <string name="quick_start_dialog_check_stats_message_short">點選%1$s統計資料%2$s以瞭解網站的成效。</string>
     <string name="quick_start_dialog_upload_site_icon_message_short">點選%1$s你的網站圖示%2$s以上傳新圖示</string>
     <string name="quick_start_dialog_publish_post_message">撰寫並發表你的第一篇文章。</string>
@@ -834,13 +1236,8 @@ Language: zh_TW
     <string name="quick_start_dialog_explore_plans_message">深入瞭解付費專案中的行銷和 SEO 工具。</string>
     <string name="quick_start_dialog_enable_sharing_title">啟用文章分享功能</string>
     <string name="quick_start_dialog_enable_sharing_message">自動將新文章分享到社交媒體帳號。</string>
-    <string name="quick_start_dialog_customize_site_message">調整字型、新增圖片等。</string>
-    <string name="quick_start_dialog_create_page_title">建立新頁面</string>
-    <string name="quick_start_dialog_create_page_message">為重要內容新增頁面：就從「關於」頁面開始吧！</string>
     <string name="quick_start_dialog_check_stats_title">檢視網站統計資料</string>
     <string name="quick_start_dialog_check_stats_message">隨時掌握你的網站成效。</string>
-    <string name="quick_start_dialog_browse_themes_title">瀏覽佈景主題</string>
-    <string name="quick_start_dialog_browse_themes_message">探索數十種版面配置選項，尋找最適合你的版面。</string>
     <string name="quick_start_dialog_remove_next_steps_message">移除後續步驟會隱藏此網站上的所有導覽。此動作無法復原。</string>
     <string name="quick_start_dialog_remove_next_steps_title">移除後續步驟</string>
     <string name="quick_start_remove_next_steps_menu_title">移除此項</string>
@@ -864,15 +1261,11 @@ Language: zh_TW
     <string name="notification_new_site_creation_failed">發生問題</string>
     <string name="notification_new_site_creation_title">建立網站</string>
     <string name="new_site_creation_create_site_button">建立網站</string>
-    <string name="new_site_creation_search_domain_input_hint">搜尋網域</string>
     <string name="new_site_creation_domain_header_subtitle">這是人們在網際網路上找到你的地方。</string>
-    <string name="new_site_creation_domain_header_title">選擇網站的網域名稱</string>
     <string name="new_site_creation_empty_domain_list_message">找不到你搜尋的網址</string>
     <string name="site_creation_error_generic_subtitle">與伺服器通訊時發生錯誤，請再試一次</string>
     <string name="site_creation_error_generic_title">發生問題</string>
     <string name="site_creation_fetch_suggestions_error_unknown">發生問題</string>
-    <string name="site_creation_segments_subtitle">這會協助我們向你推薦相關選項。但你不應裹足不前，所有網站都會不斷進步！</string>
-    <string name="site_creation_segments_title">告訴我們你希望建立什麼類型的網站</string>
     <string name="new_site_creation_preview_title">你的網站已建立！</string>
     <string name="new_site_creation_screen_title_step_count">第 %1$d 步 (共 %2$d 步)</string>
     <string name="new_site_creation_screen_title_general">建立網站</string>
@@ -893,6 +1286,9 @@ Language: zh_TW
     <string name="stats_no_data_for_period">此期間沒有資料</string>
     <string name="preference_strip_image_location">從媒體移除位置資訊</string>
     <string name="stats_cannot_be_started">目前我們無法開啟統計資料。請稍後再試一次</string>
+    <string name="gif_picker_endless_scroll_network_error">網路發生錯誤，導致部份媒體載入失敗。</string>
+    <string name="gif_picker_empty_search_list">沒有符合搜尋條件的媒體</string>
+    <string name="gif_picker_initial_empty_text">搜尋 GIF 以新增至你的媒體庫！</string>
     <string name="stats_author_views_label">瀏覽數</string>
     <string name="stats_author_label">作者</string>
     <string name="stats_authors">作者</string>
@@ -944,6 +1340,7 @@ Language: zh_TW
     <string name="stats_followers_count_message">%1$s 關注者總數：%2$s</string>
     <string name="stats_followers_email">電子郵件</string>
     <string name="stats_followers_wordpress_com">WordPress.com</string>
+    <string name="stats_manage_insights">管理洞察報告</string>
     <string name="stats_empty_insights_title">尚未新增任何洞察報告</string>
     <string name="stats_no_data_yet">尚無資料</string>
     <string name="menu_debug">除錯選單</string>
@@ -1023,20 +1420,16 @@ Language: zh_TW
     <string name="quick_start_dialog_need_help_button_neutral">從未</string>
     <string name="quick_start_dialog_need_help_button_negative">不用了，謝謝</string>
     <string name="quick_start_dialog_follow_sites_title">關注其他網站</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">點選%1$s搜尋%2$s以尋找具有相似興趣的網站</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">點選%1$s搜尋%2$s以尋找具有相似主題的網站</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader">點選%1$s讀取器%2$s以繼續</string>
     <string name="quick_start_dialog_follow_sites_message">尋找並關注讓你獲得啟發的網站，在這些網站發表文章時獲得最新資訊。</string>
-    <string name="quick_start_dialog_customize_site_title">自訂你的網站</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes">點選%1$s佈景主題%2$s以繼續</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">點選%1$s自訂%2$s以開始個人化你的網站</string>
-    <string name="quick_start_dialog_choose_theme_title">選擇佈景主題</string>
-    <string name="quick_start_dialog_browse_themes_message_short">點選%1$s「佈景主題」%2$s以探索新的佈景主題</string>
-    <string name="quick_start_dialog_choose_theme_message">瀏覽所有佈景主題，找到最適合的完美之選。</string>
     <string name="quick_start_button_positive">執行</string>
     <string name="quick_start_button_negative_short">取消</string>
     <string name="quick_start_button_negative">現在不要</string>
     <string name="content_description_more">更多</string>
     <string name="my_site_create_new_site_title">你沒有任何網站</string>
+    <string name="reader_empty_followed_tags_title">沒有關注任何主題</string>
+    <string name="reader_empty_followed_tags_subtitle">請在此處新增主題，以尋找你最愛的主題文章</string>
     <string name="login_to_to_connect_jetpack">請登入你用來連結 Jetpack 的 WordPress.com 帳號。</string>
     <string name="install_jetpack_retry">重試</string>
     <string name="install_jetpack_continue">設定</string>
@@ -1093,14 +1486,10 @@ Language: zh_TW
     <string name="support_contact_email">聯絡電子郵件</string>
     <string name="application_log_button">應用程式記錄檔</string>
     <string name="my_tickets">我的票證</string>
-    <string name="activity_log_rewind_dialog_message">確定要將你的網站還原至 %1$s 的 %2$s？這將移除在該時間點之後所建立或變更的全部內容和選項。</string>
-    <string name="activity_log_rewind_site">還原網站</string>
-    <string name="activity_log_currently_restoring_message_no_dates">正在還原</string>
-    <string name="activity_log_currently_restoring_message">正在還原至 %1$s %2$s</string>
     <string name="activity_log_currently_restoring_title">目前正在還原你的網站</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">已成功還原你的網站</string>
-    <string name="activity_log_rewind_finished_snackbar_message">已成功還原你的網站\n已還原至 %1$s %2$s</string>
-    <string name="activity_log_rewind_started_snackbar_message">正在還原網站\n正在還原至 %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">已成功還原你的網站\n(還原至 %1$s %2$s)</string>
+    <string name="activity_log_rewind_started_snackbar_message">正在還原你的網站\n(還原至 %1$s %2$s)</string>
     <string name="activity_log_button">活動記錄動作按鈕</string>
     <string name="plugin_auto_managed">自動管理</string>
     <string name="reader_save_posts_locally_dialog_message">儲存這篇文章，即可隨時返回閱讀。儲存的文章不會同步至其他裝置，因此你只能在這部裝置上存取文章。</string>
@@ -1110,20 +1499,16 @@ Language: zh_TW
     <string name="comment_read_source_post">參閱原始文章</string>
     <string name="sites">網站</string>
     <string name="signup_magic_link_title">神奇連結已傳送</string>
-    <string name="signup_email_screen_title">電子郵件註冊</string>
     <string name="verification_2fa_screen_title">代碼驗證</string>
     <string name="selfhosted_site_login_title">登入憑證</string>
     <string name="magic_link_sent_login_title">神奇連結已傳送</string>
     <string name="magic_link_login_title">神奇連結登入</string>
     <string name="site_address_login_title">網站位址登入</string>
     <string name="email_address_login_title">電子郵件地址登入</string>
-    <string name="alternatively">替代作法：</string>
     <string name="reader_empty_saved_posts_description">點選「%s」即可將文章儲存至你的清單。</string>
     <string name="reader_empty_saved_posts_title">尚未儲存任何文章！</string>
     <string name="reader_bookmark_snack_title">文章已儲存</string>
     <string name="reader_bookmark_snack_btn">檢視全部</string>
-    <string name="reader_btn_bookmarked">已儲存</string>
-    <string name="reader_btn_bookmark">儲存</string>
     <string name="reader_remove_bookmark">從已儲存文章中移除</string>
     <string name="reader_add_bookmark">加入已儲存文章</string>
     <string name="reader_save_for_later_title">已儲存文章</string>
@@ -1143,11 +1528,9 @@ Language: zh_TW
     <string name="reader_btn_notifications_on">開啟網站通知</string>
     <string name="reader_btn_notifications_off">關閉網站通知</string>
     <string name="activity_log_jetpack_icon">Jetpack 圖示</string>
-    <string name="rewind">還原</string>
     <string name="activity_log_event">事件</string>
     <string name="activity_log_icon">活動圖示</string>
     <string name="activity_log">活動記錄</string>
-    <string name="activity">活動</string>
     <string name="privacy_policy_read">閱讀隱私權政策</string>
     <string name="third_party_policy_learn_more_caption">我們會使用其他的追蹤工具，包括由第三方所提供的追蹤工具。瞭解相關資訊及其控制方式。</string>
     <string name="third_party_policy_learn_more_header">第三方政策</string>
@@ -1158,7 +1541,6 @@ Language: zh_TW
     <string name="preference_privacy_settings">隱私權設定</string>
     <string name="preference_collect_information">收集資訊</string>
     <string name="post_submitted">文章已提交。</string>
-    <string name="login_email_button_signup">還沒有帳號？%1$s註冊%2$s</string>
     <string name="plugin_install_site_ineligible_site_graylisted">外掛功能需要該網站具有良好聲譽。</string>
     <string name="plugin_install_site_ineligible_not_domain_owner">外掛功能需要主要網域訂閱與此名使用者相關聯。</string>
     <string name="plugin_install_site_ineligible_non_admin_user">外掛功能需要管理員權限。</string>
@@ -1255,7 +1637,6 @@ Language: zh_TW
     <string name="edit_photo_screen_title">編輯照片</string>
     <string name="share_intent_screen_title">挑選網站</string>
     <string name="signup_epilogue_screen_title">新增帳號</string>
-    <string name="login_prologue_screen_title">登入</string>
     <string name="login_epilogue_screen_title">已登入為</string>
     <string name="person_detail_screen_title">個人詳細資料</string>
     <string name="media_settings_screen_title">檔案詳細資料</string>
@@ -1263,12 +1644,13 @@ Language: zh_TW
     <string name="notifications_screen_title">通知</string>
     <string name="reader_screen_title">讀取器</string>
     <string name="me_section_screen_title">我</string>
+    <string name="my_site_section_screen_title">我的網站</string>
     <string name="notif_settings_screen_title">通知設定</string>
     <string name="help_screen_title">說明與支援</string>
     <string name="license_screen_title">授權</string>
     <string name="release_notes_screen_title">版本備註</string>
     <string name="signup_epilogue_error_avatar_view">你的大頭貼已上傳，且稍後即可使用。</string>
-    <string name="permissions_denied_message">你似乎已關閉此功能所需的權限。&lt;br/>&lt;br/>若要變更此設定，請編輯權限並確認已啟用 &lt;strong>%s&lt;/strong>。</string>
+    <string name="permissions_denied_message">你似乎已關閉此功能所需的權限。&lt;br/&gt;&lt;br/&gt;若要變更此設定，請編輯權限並確認已啟用 &lt;strong&gt;%s&lt;/strong&gt;。</string>
     <string name="permissions_denied_title">權限</string>
     <string name="plugin_caption_featured">精選</string>
     <string name="sharing_disabled_description">由於你的「分享 Jetpack」模組已停用，因此無法存取分享設定。</string>
@@ -1309,7 +1691,6 @@ Language: zh_TW
     <string name="media_file_post_singular_mixed_not_uploaded_one_file">無法上傳 1 篇文章和 1 個檔案</string>
     <string name="untitled_in_parentheses">(未命名)</string>
     <string name="at_username">\@%s</string>
-    <string name="latitude_longitude">%1$f，%2$f</string>
     <string name="site_creation_domain_finish_button">建立網站</string>
     <string name="notification_site_creation_created">點選以繼續。</string>
     <string name="notification_site_creation_title_success">網站已建立！</string>
@@ -1323,11 +1704,8 @@ Language: zh_TW
     <string name="username_changer_dismiss_button_positive">放棄</string>
     <string name="username_changer_action">儲存</string>
     <string name="content_description_add_avatar">新增大頭貼</string>
-    <string name="signup_with_google_button">透過 Google 註冊</string>
-    <string name="signup_with_email_button">透過電子郵件註冊</string>
     <string name="signup_user_exists">電子郵件已存在於 WordPress.com。\n繼續登入。</string>
     <string name="signup_updating_account">正在更新帳號……</string>
-    <string name="signup_terms_of_service_text">註冊即代表你同意我們的%1$s服務條款%2$s。</string>
     <string name="signup_magic_link_progress">正在傳送電子郵件</string>
     <string name="signup_magic_link_error_button_positive">重試</string>
     <string name="signup_magic_link_error_button_negative">關閉</string>
@@ -1340,11 +1718,6 @@ Language: zh_TW
     <string name="signup_epilogue_error_button_negative">還原</string>
     <string name="signup_epilogue_error_generic">更新你的帳號時發生錯誤。你可以重試或還原變更並繼續。</string>
     <string name="signup_epilogue_error_avatar">上傳你的大頭貼時發生錯誤。</string>
-    <string name="signup_email_header">若要建立新的 WordPress.com 帳號，請輸入你的電子郵件地址。</string>
-    <string name="signup_email_error_generic">檢查電子郵件地址時發生錯誤。</string>
-    <string name="sign_up">註冊 WordPress.com</string>
-    <string name="enter_username_instead">用你的使用者名稱登入。</string>
-    <string name="enter_site_address_instead">藉由輸入你的網站位址來登入。</string>
     <string name="plugin_needs_update">需要更新</string>
     <string name="plugin_caption_search">搜尋外掛程式</string>
     <string name="plugin_caption_new">新增</string>
@@ -1465,7 +1838,6 @@ Language: zh_TW
     <string name="login_error_suffix">\n要嘗試其他帳號嗎？</string>
     <string name="login_error_generic">連線 Google 帳號時發生一些問題。</string>
     <string name="login_error_button">關閉</string>
-    <string name="login_google_button_suffix">透過 Google 登入。</string>
     <string name="enter_wpcom_password_google">若要繼續使用此 Google 帳號，請提供相符的 WordPress.com 密碼。只會詢問一次。</string>
     <string name="error_generic_network">網路發生錯誤。請檢查你的連線並再試一次。</string>
     <string name="post_settings_remove_featured_image">移除特色圖片</string>
@@ -1477,12 +1849,11 @@ Language: zh_TW
     <string name="jetpack_disconnect_confirm">中斷連線</string>
     <string name="jetpack_disconnect_confirmation_message">確定要中斷網站與 Jetpack 的連線？</string>
     <string name="jetpack_disconnect_pref_title">「中斷與 WordPress.com 的連線」</string>
-    <string name="site_settings_jetpack_whitelist_description">你可在允許清單中新增 IP 位址或一系列的位址，以避免這些位址受到 Jetpack 封鎖。可接受 IPv4 和 IPv6。若要指定範圍，請輸入最低值及最高值，並以破折號分隔。範例：12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_jetpack_allowlist_description">你可以將某個 IP 位址 (或多個位址) 標記為「一律允許」，避免這些位址遭到 Jetpack 封鎖。 可接受 IPv4 和 IPv6。 若要指定範圍，請輸入最低值及最高值，並以破折號分隔。 例如：12.12.12.1–12.12.12.100</string>
     <string name="jetpack_require_two_factor_title">需要雙步驟驗證</string>
     <string name="jetpack_match_wpcom_via_email_title">使用電子郵件地址比對帳號</string>
     <string name="jetpack_allow_wpcom_sign_in_title">允許登入 WordPress.com</string>
     <string name="jetpack_wpcom_sign_in_category_title">登入 WordPress.com</string>
-    <string name="jetpack_brute_force_whitelist_title">在允許清單中的 IP 位址</string>
     <string name="jetpack_prevent_brute_force_title">封鎖嘗試登入的惡意攻擊</string>
     <string name="jetpack_prevent_brute_force_category_title">暴力破解密碼攻擊防護</string>
     <string name="jetpack_send_wp_notifications_title">傳送推播通知</string>
@@ -1512,6 +1883,7 @@ Language: zh_TW
     <string name="media_edit_filename_caption">檔案名稱</string>
     <string name="media_edit_url_caption">URL</string>
     <string name="media_edit_alttext_text">替代文字</string>
+    <string name="connect_site">連結網站</string>
     <string name="notification_settings_item_sights_and_sounds_blink_light">閃爍燈</string>
     <string name="notification_settings_item_sights_and_sounds_vibrate_device">震動裝置</string>
     <string name="notification_settings_item_sights_and_sounds_choose_sound">選擇音效</string>
@@ -1522,12 +1894,12 @@ Language: zh_TW
     <string name="notification_settings_category_other">其他</string>
     <string name="notification_settings_item_your_sites_all_your_sites">我所有的網站</string>
     <string name="notification_settings_category_your_sites">你的網站</string>
-    <string name="notification_settings_master_off_message">關閉「通知設定」將停用此應用程式的所有通知，無論何種類型。開啟「通知設定」之後，你可以調整接收的通知類型。</string>
-    <string name="notification_settings_master_off_title">若要在此裝置上接收通知，請開啟「通知設定」。</string>
-    <string name="notification_settings_master_hint_off">啓用通知</string>
-    <string name="notification_settings_master_hint_on">停用通知</string>
-    <string name="notification_settings_master_status_off">關閉</string>
-    <string name="notification_settings_master_status_on">開啟</string>
+    <string name="notification_settings_main_off_message">關閉「通知設定」將停用此應用程式的所有通知，無論類型為何。 開啟「通知設定」之後，你可以調整接收的通知類型。</string>
+    <string name="notification_settings_main_off_title">若要在此裝置上接收通知，請開啟「通知設定」。</string>
+    <string name="notification_settings_main_hint_off">啟用通知</string>
+    <string name="notification_settings_main_hint_on">停用通知</string>
+    <string name="notification_settings_main_status_off">關閉</string>
+    <string name="notification_settings_main_status_on">開啟</string>
     <string name="max_video_resolution">影片大小上限</string>
     <string name="max_thumbnail_px_size">圖片大小上限</string>
     <string name="error_upload_post_media_param">於此文章中上傳媒體時發生錯誤：%s.</string>
@@ -1564,17 +1936,17 @@ Language: zh_TW
     <string name="login_site_address_more_help">需要更多協助嗎？</string>
     <string name="login_site_address_help_content">當你使用 Chrome 造訪自己的網站時，網站位址會顯示在畫面上方的網址列中。</string>
     <string name="login_site_address_help_title">我的網站位址是？</string>
-    <string name="login_site_address_help">需要幫你找網站位址嗎？</string>
     <string name="login_site_address">網站位址</string>
+    <string name="enter_site_address">請輸入要連結的 WordPress 網站位址。</string>
     <string name="login_already_logged_in_wpcom">已登入 WordPress.com</string>
     <string name="login_continue">繼續</string>
+    <string name="connect_more">連結其他網站</string>
     <string name="enter_wpcom_password">輸入你的 WordPress.com 密碼。</string>
     <string name="login_magic_link_email_requesting">要求登入的電子郵件</string>
     <string name="password_incorrect">看來你輸入的密碼不正確。請重新確認你的資訊，然後再試一次。</string>
     <string name="requesting_otp">透過 SMS 要求驗證碼。</string>
     <string name="login_text_otp">請改用簡訊傳送驗證碼給我</string>
     <string name="enter_verification_code">快完成了！請輸入驗證器應用程式上的驗證碼。</string>
-    <string name="open_mail">開啟郵件</string>
     <string name="next">下一篇</string>
     <string name="enter_email_wordpress_com">使用電子郵件地址登入 WordPress.com，即可管理你的所有 WordPress 網站。</string>
     <string name="image_optimization_promo_desc">圖片最佳化會壓縮圖片，以加快上傳速度。\n\n你可以隨時在網站設定變更此設定。</string>
@@ -1597,10 +1969,6 @@ Language: zh_TW
     <string name="post_status_draft">草稿</string>
     <string name="post_status_pending_review">待審中</string>
     <string name="post_status_publish_post">發佈</string>
-    <string name="change_location">變更位置</string>
-    <string name="remove_location">移除位置</string>
-    <string name="post_settings_error_placepicker_missing_play_services">無法開啟位置挑選器，Google Play 服務無法使用</string>
-    <string name="post_settings_location">位置</string>
     <string name="now">立即</string>
     <string name="post_settings_password_dialog_hint">只有知道密碼的使用者可檢視這篇文章</string>
     <string name="post_settings_excerpt_dialog_hint">文章摘要是指選擇性手動摘錄的內容。</string>
@@ -1735,6 +2103,7 @@ Language: zh_TW
     <string name="media_upload_state_deleting">正在刪除</string>
     <string name="media_upload_state_uploading">正在上傳</string>
     <string name="media_upload_state_queued">已排進佇列</string>
+    <string name="image_quality">圖片品質</string>
     <string name="error_all_media_upload_canceled">由於未知的錯誤，所有的媒體上傳均已取消。請重試上傳</string>
     <string name="error_unknown_post_type">未知的文章格式</string>
     <string name="submit_for_review">送出</string>
@@ -1783,7 +2152,7 @@ Language: zh_TW
     <string name="signout">登出</string>
     <string name="sign_in_wpcom">登入 WordPress.com</string>
     <string name="reader_label_global_related_posts">想瞭解更多資訊，請上 WordPress.com</string>
-    <string name="reader_label_local_related_posts">想瞭解更多資訊，請前往 %s</string>
+    <string name="reader_label_local_related_posts">更多來自 %s 的項目</string>
     <string name="preference_open_device_settings">開啟裝置設定</string>
     <string name="invite_invalid_email">%s：電子郵件無效</string>
     <string name="invite_user_blocked_invites">%s：使用者已封鎖邀請</string>
@@ -1831,20 +2200,16 @@ Language: zh_TW
     <string name="invite_error_invalid_usernames_multiple">無法傳送：使用者名稱或電子郵件無效</string>
     <string name="invite_error_invalid_usernames_one">無法傳送：使用者名稱或電子郵件無效</string>
     <string name="invite_error_no_usernames">請新增至少一個使用者名稱</string>
-    <string name="invite_message_info">(選用) 你最多可以輸入 500 個字元的自訂訊息，附在傳送給使用者的邀請中。</string>
-    <string name="invite_message_remaining_other">剩下 %d 個字元</string>
-    <string name="invite_message_remaining_one">剩下 1 個字元</string>
-    <string name="invite_message_remaining_zero">剩下 0 個字元</string>
     <string name="invite_message_title">自訂訊息</string>
     <string name="invite">邀請</string>
     <string name="invite_names_title">使用者名稱或電子郵件</string>
     <string name="invite_people">邀請他人</string>
     <string name="my_site_header_external">外部</string>
-    <string name="send_link">傳送連結</string>
     <string name="label_clear_search_history">清除搜尋記錄</string>
     <string name="dlg_confirm_clear_search_history">清除搜尋記錄？</string>
     <string name="reader_empty_search_description">在你的語言中找不到與 %s 相關的結果</string>
     <string name="reader_hint_post_search">搜尋 WordPress</string>
+    <string name="reader_title_related_post_detail">相關文章</string>
     <string name="preview_screen_links_disabled">預覽畫面上的連結已停用</string>
     <string name="send">傳送</string>
     <string name="person_removed">已成功移除 %1$s</string>
@@ -1863,7 +2228,6 @@ Language: zh_TW
     <string name="checking_email">正在檢查電子郵件</string>
     <string name="magic_link_unavailable_error_message">目前無法使用。請輸入你的密碼</string>
     <string name="logging_in">正在登入</string>
-    <string name="enter_your_password_instead">改為輸入你的密碼</string>
     <string name="web_address_dialog_hint">當你留言時公開顯示。</string>
     <string name="capture_or_pick_photo">拍攝或選取照片</string>
     <string name="plans">方案</string>
@@ -1886,6 +2250,7 @@ Language: zh_TW
     <string name="site_settings_export_content_title">匯出內容</string>
     <string name="confirm_delete_site_prompt">請在下方欄位中輸入 %1$s 以確認。系統將永久刪除你的網站。</string>
     <string name="confirm_delete_site">確認刪除網站</string>
+    <string name="contact_support">聯絡支援團隊</string>
     <string name="start_over_text">如果你想保留網站，但不想保留現有的文章和頁面，我們的支援團隊可以為你刪除網站上的文章、頁面、媒體及留言。\n\n這能讓你保留網站和 URL，但重新開始建立內容。若要清除目前的內容，請與我們聯絡。</string>
     <string name="let_us_help">我們很樂意協助</string>
     <string name="site_settings_start_over_hint">重新開始設計你的網站</string>
@@ -1893,7 +2258,9 @@ Language: zh_TW
     <string name="me_btn_app_settings">應用程式設定</string>
     <string name="editor_remove_failed_uploads">移除失敗的上傳項目</string>
     <string name="site_settings_advanced_header">進階</string>
+    <string name="comments_empty_list_filtered_trashed">沒有已移至垃圾桶的留言</string>
     <string name="comments_empty_list_filtered_pending">無待審核的迴響</string>
+    <string name="comments_empty_list_filtered_approved">沒有已核准的留言</string>
     <string name="xmlrpc_missing_method_error">無法連結。伺服器缺少必要的 XML-RPC 方式。</string>
     <string name="alignment_center">置中</string>
     <string name="post_format_video">影片</string>
@@ -1939,6 +2306,7 @@ Language: zh_TW
     <string name="pending_email_change_snackbar">按一下電子郵件 (收件者：%1$s) 中的驗證連結以確認您的新地址</string>
     <string name="editor_toast_uploading_please_wait">你目前正在上傳媒體。請等待此作業完成。</string>
     <string name="error_refresh_comments_showing_older">目前無法重新整理留言 – 顯示較舊的留言</string>
+    <string name="post_settings_set_featured_image">設定精選圖片</string>
     <string name="post_settings_featured_image">精選圖片</string>
     <string name="email_address">電子郵件地址</string>
     <string name="dlg_sure_to_delete_comments">永久刪除這些留言？</string>
@@ -1980,7 +2348,7 @@ Language: zh_TW
     <string name="site_settings_paging_dialog_description">將留言串分為數頁。</string>
     <string name="site_settings_paging_dialog_header">每頁留言數</string>
     <string name="site_settings_close_after_dialog_title">關閉留言功能</string>
-    <string name="site_settings_blacklist_description">如果留言的內容、名稱、URL、電子郵件或 IP 位址中含有以下文字，該留言將標記為垃圾留言。你也可以輸入字詞的一部分，例如「press」會與「WordPress」相符。</string>
+    <string name="site_settings_denylist_description">如果留言的內容、名稱、URL、電子郵件或 IP 位址中含有以下文字，就會被標記為垃圾留言。 你也可以輸入字詞的一部分，例如「press」會與「WordPress」相符。</string>
     <string name="site_settings_hold_for_moderation_description">如果留言的內容、名稱、URL、電子郵件或 IP 位址中含有以下文字，就會被送進審核清單。你也可以輸入字詞的一部分，例如「press」會與「WordPress」相符。</string>
     <string name="site_settings_list_editor_input_hint">輸入字詞或片語</string>
     <string name="site_settings_list_editor_no_items_text">無項目</string>
@@ -1995,10 +2363,10 @@ Language: zh_TW
     <string name="site_settings_rp_show_header_title">顯示頁首</string>
     <string name="site_settings_rp_switch_summary">相關文章會在你的文章下方顯示網站上的相關內容。</string>
     <string name="site_settings_rp_switch_title">顯示相關文章</string>
-    <string name="site_settings_blacklist_hint">與篩選條件相符的留言將標示為垃圾留言</string>
+    <string name="site_settings_denylist_hint">與篩選條件相符的留言將標示為垃圾留言</string>
     <string name="site_settings_moderation_hold_hint">與篩選條件相符的留言將被送進審核清單</string>
     <string name="site_settings_multiple_links_hint">忽略已知使用者的連結限制</string>
-    <string name="site_settings_whitelist_hint">先前有經核准的留言才可以發表留言</string>
+    <string name="site_settings_allowlist_hint">須有留言經核准的記錄，才可發表留言</string>
     <string name="site_settings_user_account_required_hint">已註冊且登入的使用者才可以發表留言</string>
     <string name="site_settings_identity_required_hint">輸入名稱和電子郵件後才可以發表留言</string>
     <string name="site_settings_paging_hint">按照指定的區塊大小顯示留言</string>
@@ -2021,17 +2389,16 @@ Language: zh_TW
     <string name="site_settings_address_hint">目前不支援變更網址</string>
     <string name="site_settings_tagline_hint">使用簡短的說明或好記的字詞組合來描述你的網誌</string>
     <string name="site_settings_title_hint">以簡單幾個字說明此網站主題</string>
-    <string name="site_settings_whitelist_known_summary">已知使用者的留言</string>
-    <string name="site_settings_whitelist_all_summary">所有使用者的留言</string>
+    <string name="site_settings_allowlist_known_summary">已知使用者的留言</string>
+    <string name="site_settings_allowlist_all_summary">所有使用者的留言</string>
     <string name="site_settings_threading_summary">%d 層</string>
     <string name="site_settings_privacy_private_summary">私密</string>
     <string name="site_settings_privacy_hidden_summary">隱藏</string>
     <string name="site_settings_privacy_public_summary">公開</string>
     <string name="site_settings_delete_site_title">刪除網站</string>
-    <string name="site_settings_blacklist_title">封鎖清單</string>
     <string name="site_settings_moderation_hold_title">等待審核</string>
     <string name="site_settings_multiple_links_title">留言中的連結</string>
-    <string name="site_settings_whitelist_title">自動核准</string>
+    <string name="site_settings_allowlist_title">自動核准</string>
     <string name="site_settings_paging_title">分頁</string>
     <string name="site_settings_threading_title">階層顯示</string>
     <string name="site_settings_sort_by_title">排序依據</string>
@@ -2093,6 +2460,7 @@ Language: zh_TW
     <string name="notifications_empty_view_reader">前往讀取器</string>
     <string name="notifications_empty_action_followers_likes">引起關注：在已閱讀的文章上留言</string>
     <string name="notifications_empty_action_comments">加入討論：在關注的網誌文章上留言</string>
+    <string name="notifications_empty_action_unread">激發討論：撰寫新文章</string>
     <string name="notifications_empty_action_all">動起來吧！在關注的網誌文章上留言。</string>
     <string name="notifications_empty_comments">尚未有留言</string>
     <string name="notifications_empty_unread">全部都是最新版本！</string>
@@ -2106,6 +2474,8 @@ Language: zh_TW
     <string name="reader_short_like_count_multi">%s 個讚</string>
     <string name="reader_short_like_count_one">1 個讚</string>
     <string name="reader_short_like_count_none">讚</string>
+    <string name="reader_label_follow_count">%,d 個追蹤我的人</string>
+    <string name="reader_menu_tags">編輯主題和網站</string>
     <string name="reader_title_post_detail">讀者文章</string>
     <string name="notifications_push_summary">在裝置上顯示通知的相關設定。</string>
     <string name="notifications_email_summary">將通知傳送至帳號所繫結之電子郵件地址的相關設定。</string>
@@ -2117,6 +2487,7 @@ Language: zh_TW
     <string name="app_notifications">應用程式通知</string>
     <string name="email">電子郵件</string>
     <string name="notifications_tab">通知索引標籤</string>
+    <string name="notification_settings_item_other_account_emails_summary">我們會隨時傳送與帳號資訊相關的重要電子郵件，除此之外，你也能獲得實用的額外資訊。</string>
     <string name="stats_insights_latest_post_summary">最新文章摘要</string>
     <string name="connectionbar_no_connection">沒有連線</string>
     <string name="post_trashed">文章已移至垃圾桶</string>
@@ -2141,7 +2512,9 @@ Language: zh_TW
     <string name="me_btn_support">說明與客戶服務</string>
     <string name="account_settings">帳號設定</string>
     <string name="site_picker_cant_hide_current_site">由於「%s」是目前的網站，因此並未隱藏</string>
+    <string name="site_picker_create_wpcom">建立 WordPress.com 網站</string>
     <string name="site_picker_add_self_hosted">新增自助託管的網站</string>
+    <string name="site_picker_add_site">新增網站</string>
     <string name="site_picker_edit_visibility">顯示/隱藏網站</string>
     <string name="site_picker_title">選擇網站</string>
     <string name="my_site_btn_view_site">檢視網站</string>
@@ -2174,7 +2547,6 @@ Language: zh_TW
     <string name="logs_copied_to_clipboard">應用程式記錄已複製到剪貼簿</string>
     <string name="reader_empty_posts_in_blog">這個網站沒有內容</string>
     <string name="reader_label_new_posts">新文章</string>
-    <string name="reader_page_recommended_blogs">你或許也會喜歡以下網站：</string>
     <string name="error_copy_to_clipboard">將文字複製到剪貼簿時發生錯誤</string>
     <string name="post_uploading">正在上傳文章</string>
     <string name="stats_followers_years">%1$d 年</string>
@@ -2202,6 +2574,7 @@ Language: zh_TW
     <string name="cab_selected">已選取：%d</string>
     <string name="browse_our_faq_button">瀏覽常見問題集</string>
     <string name="reader_empty_comments">尚未有留言</string>
+    <string name="reader_empty_posts_in_tag">沒有任何與此主題相關的文章</string>
     <string name="reader_label_like">按讚</string>
     <string name="reader_label_view_original">查看原始文章</string>
     <string name="reader_label_comments_closed">留言已關閉</string>
@@ -2232,11 +2605,12 @@ Language: zh_TW
     <string name="reader_toast_err_already_follow_blog">你已經關注此網站</string>
     <string name="reader_toast_err_get_blog_info">無法顯示此網站</string>
     <string name="reader_label_followed_blog">已關注的網站</string>
+    <string name="reader_hint_add_tag_or_url">輸入要關注的 URL 或主題</string>
     <string name="reader_page_followed_blogs">關注的網站</string>
+    <string name="reader_page_followed_tags">已關注的主題</string>
     <string name="reader_title_blog_preview">讀者網站</string>
     <string name="ssl_certificate_ask_trust">如果你通常能夠順利連線至此網站，則此錯誤可能代表有人正嘗試冒充該網站，因此請勿繼續操作。是否仍然要信任憑證？</string>
     <string name="ssl_certificate_error">無效的 SSL 憑證</string>
-    <string name="forgot_password">忘記密碼？</string>
     <string name="help">說明</string>
     <string name="username_or_password_incorrect">你輸入的使用者名稱或密碼不正確</string>
     <string name="email_invalid">輸入有效的電子郵件地址</string>
@@ -2260,6 +2634,8 @@ Language: zh_TW
     <string name="blog_not_found">存取此網誌時發生錯誤</string>
     <string name="gallery_error">無法擷取媒體項目</string>
     <string name="no_network_message">沒有可用的網路</string>
+    <string name="reader_toast_err_remove_tag">無法移除此主題</string>
+    <string name="reader_toast_err_add_tag">無法新增此主題</string>
     <string name="reader_title_applog">應用程式記錄檔</string>
     <string name="fatal_db_error">建立應用程式資料庫時發生錯誤。請嘗試重新安裝應用程式。</string>
     <string name="error_blog_hidden">此網誌已隱藏，無法載入。請在設定中啟用網誌，然後再試一次。</string>
@@ -2329,6 +2705,8 @@ Language: zh_TW
     <string name="reader_toast_err_url_intent">無法開啟 %s</string>
     <string name="reader_toast_err_view_image">無法檢視圖片</string>
     <string name="reader_toast_err_share_intent">無法分享</string>
+    <string name="reader_toast_err_tag_invalid">這不是有效的主題</string>
+    <string name="reader_toast_err_tag_exists">你已經關注了此主題</string>
     <string name="reader_toast_err_comment_failed">無法張貼你的回應</string>
     <string name="reader_likes_only_you">你說這個讚</string>
     <string name="reader_likes_one">1 人說這個讚</string>
diff --git a/WordPress/src/main/res/values/attrs.xml b/WordPress/src/main/res/values/attrs.xml
index 5b60ff8cec1d..ca02084edb16 100644
--- a/WordPress/src/main/res/values/attrs.xml
+++ b/WordPress/src/main/res/values/attrs.xml
@@ -6,6 +6,7 @@
     <!-- Semantic colors -->
     <attr name="wpColorError" format="reference|color" />
     <attr name="wpColorSuccess" format="reference|color" />
+    <attr name="wpColorNavBar" format="reference|color" />
     <attr name="wpColorAppBar" format="reference|color" />
     <attr name="wpColorOnSurfaceMedium" format="reference|color" />
 
@@ -21,7 +22,7 @@
     <attr name="colorGutenbergBackground" format="reference|color" />
 
     <!-- Modal layout picker colors-->
-    <attr name="categoriesBackground" format="reference|color" />
+    <attr name="layoutPickerBackground" format="reference|color" />
     <attr name="categoriesButtonBackground" format="reference|color" />
     <attr name="categoriesButtonBackgroundSelected" format="reference|color" />
     <attr name="mlpDividerColor" format="reference|color" />
@@ -101,6 +102,10 @@
         ReaderFollowButton attributes
     -->
     <declare-styleable name="ReaderFollowButton">
+        <attr name="wpReaderFollowButtonType" format="enum">
+            <enum name="followSite" value="0" />
+            <enum name="followComments" value="1" />
+        </attr>
         <attr name="wpShowFollowButtonCaption" format="boolean" />
     </declare-styleable>
 
@@ -215,17 +220,17 @@
     </declare-styleable>
 
     <!--
-        Master Switch Toolbar View
+        Main Switch Toolbar View
     -->
-    <declare-styleable name="PrefMasterSwitchToolbarView">
-        <attr name="masterTitleOn" format="reference" />
-        <attr name="masterTitleOff" format="reference" />
-        <attr name="masterContentDescription" format="reference" />
-        <attr name="masterHintOn" format="reference" />
-        <attr name="masterHintOff" format="reference" />
-        <attr name="masterContentInsetStart" format="dimension" />
-        <attr name="masterOffsetEnd" format="dimension" />
-        <attr name="masterViewStyle" format="enum">
+    <declare-styleable name="PrefMainSwitchToolbarView">
+        <attr name="mainTitleOn" format="reference" />
+        <attr name="mainTitleOff" format="reference" />
+        <attr name="mainContentDescription" format="reference" />
+        <attr name="mainHintOn" format="reference" />
+        <attr name="mainHintOff" format="reference" />
+        <attr name="mainContentInsetStart" format="dimension" />
+        <attr name="mainOffsetEnd" format="dimension" />
+        <attr name="mainViewStyle" format="enum">
             <enum name="highlighted" value="0" />
             <enum name="normal" value="1" />
         </attr>
@@ -241,4 +246,23 @@
         <attr name="badgeHorizontalOffset" format="dimension" />
         <attr name="badgeVerticalOffset" format="dimension" />
     </declare-styleable>
+
+    <!--
+    WPEditTextWithChipsOutlined
+    -->
+    <declare-styleable name="WPEditTextWithChipsOutlined">
+        <attr name="wpHint" format="reference"/>
+        <attr name="wpChipifyEnabled" format="boolean"/>
+        <attr name="wpMaxNumberChips" format="integer" />
+    </declare-styleable>
+
+    <!--
+        QuickStartFocusPoint attributes
+    -->
+    <declare-styleable name="QuickStartFocusPoint">
+        <attr name="size" format="enum">
+            <enum name="small" value="0" />
+            <enum name="normal" value="1" />
+        </attr>
+    </declare-styleable>
 </resources>
diff --git a/WordPress/src/main/res/values/available_languages.xml b/WordPress/src/main/res/values/available_languages.xml
index f8c128e91616..3e092622662e 100644
--- a/WordPress/src/main/res/values/available_languages.xml
+++ b/WordPress/src/main/res/values/available_languages.xml
@@ -1,208 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--Warning: Auto-generated file, don't edit it.-->
+<!--Warning: Auto-generated file, do not edit.-->
 <resources>
-<string-array name="available_languages" translatable="false">
-
-<item>
-en_US
-</item>
-
-<item>
-az
-</item>
-
-<item>
-de
-</item>
-
-<item>
-el
-</item>
-
-<item>
-es
-</item>
-
-<item>
-es_MX
-</item>
-
-<item>
-es_CL
-</item>
-
-<item>
-fr
-</item>
-
-<item>
-gd
-</item>
-
-<item>
-hi
-</item>
-
-<item>
-hu
-</item>
-
-<item>
-id
-</item>
-
-<item>
-it
-</item>
-
-<item>
-ja
-</item>
-
-<item>
-ko
-</item>
-
-<item>
-nb
-</item>
-
-<item>
-nl
-</item>
-
-<item>
-pl
-</item>
-
-<item>
-ru
-</item>
-
-<item>
-sv
-</item>
-
-<item>
-th
-</item>
-
-<item>
-uz
-</item>
-
-<item>
-zh_CN
-</item>
-
-<item>
-zh_TW
-</item>
-
-<item>
-zh_HK
-</item>
-
-<item>
-en_GB
-</item>
-
-<item>
-tr
-</item>
-
-<item>
-eu
-</item>
-
-<item>
-he
-</item>
-
-<item>
-pt_BR
-</item>
-
-<item>
-ar
-</item>
-
-<item>
-ro
-</item>
-
-<item>
-mk
-</item>
-
-<item>
-en_AU
-</item>
-
-<item>
-sr
-</item>
-
-<item>
-sk
-</item>
-
-<item>
-cy
-</item>
-
-<item>
-da
-</item>
-
-<item>
-bg
-</item>
-
-<item>
-sq
-</item>
-
-<item>
-hr
-</item>
-
-<item>
-cs
-</item>
-
-<item>
-en_CA
-</item>
-
-<item>
-ms
-</item>
-
-<item>
-es_VE
-</item>
-
-<item>
-gl
-</item>
-
-<item>
-vi
-</item>
-
-<item>
-is
-</item>
-
-<item>
-es_CO
-</item>
-
-<item>
-kmr
-</item>
-
-</string-array>
+  <string-array name="available_languages" translatable="false">
+    <item>en_US</item>
+    <item>ar</item>
+    <item>de</item>
+    <item>en_GB</item>
+    <item>es</item>
+    <item>fr_CA</item>
+    <item>fr</item>
+    <item>he</item>
+    <item>id</item>
+    <item>it</item>
+    <item>ja</item>
+    <item>ko</item>
+    <item>nl</item>
+    <item>pl</item>
+    <item>pt_BR</item>
+    <item>ru</item>
+    <item>sr</item>
+    <item>sv</item>
+    <item>th</item>
+    <item>tr</item>
+    <item>vi</item>
+    <item>zh_CN</item>
+    <item>zh_TW</item>
+    <item>az</item>
+    <item>el</item>
+    <item>es_MX</item>
+    <item>es_CL</item>
+    <item>gd</item>
+    <item>hi</item>
+    <item>hu</item>
+    <item>nb</item>
+    <item>pl</item>
+    <item>th</item>
+    <item>uz</item>
+    <item>zh_HK</item>
+    <item>eu</item>
+    <item>ro</item>
+    <item>mk</item>
+    <item>en_AU</item>
+    <item>sr</item>
+    <item>sk</item>
+    <item>cy</item>
+    <item>da</item>
+    <item>bg</item>
+    <item>sq</item>
+    <item>hr</item>
+    <item>cs</item>
+    <item>pt_BR</item>
+    <item>en_CA</item>
+    <item>ms</item>
+    <item>es_VE</item>
+    <item>gl</item>
+    <item>is</item>
+    <item>es_CO</item>
+    <item>kmr</item>
+  </string-array>
 </resources>
-
diff --git a/WordPress/src/main/res/values/colors.xml b/WordPress/src/main/res/values/colors.xml
index d3a4499659a0..db5fffbad3a7 100644
--- a/WordPress/src/main/res/values/colors.xml
+++ b/WordPress/src/main/res/values/colors.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<resources
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="UnusedResources">
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
 
     <!-- APPLICATION -->
     <color name="background_dark">#121212</color>
@@ -16,23 +14,7 @@
 
     <!-- Switch to attribute after dropping support for api 21-23 -->
     <color name="placeholder">#1A000000</color>
-
-    <!-- Stats -->
-
-    <color name="stats_activity_very_low">@color/gray_0</color>
-    <color name="stats_activity_low">@color/blue_5</color>
-    <color name="stats_activity_medium">@color/blue_20</color>
-    <color name="stats_activity_high">@color/blue_50</color>
-    <color name="stats_activity_very_high">@color/blue_70</color>
-    <color name="stats_value_bar_color">@color/gray_10</color>
-    <color name="stats_bar_chart_bottom">@color/blue_60</color>
-    <color name="stats_bar_chart_top">@color/blue_30</color>
-    <color name="stats_bar_chart_accent_top">@color/pink_30</color>
-    <color name="stats_bar_chart_accent_bottom">@color/pink_60</color>
-    <color name="stats_bar_chart_gridline">@color/neutral_5</color>
-    <color name="stats_map_activity_low">@color/accent_5</color>
-    <color name="stats_map_activity_high">@color/accent</color>
-    <color name="stats_map_activity_empty">@color/neutral_5</color>
+    <color name="p2_author_bg_stroke">#FFF</color>
 
     <!-- Post History -->
 
@@ -42,7 +24,7 @@
     <color name="promo_indicator_color_default">@color/black_translucent_20</color>
     <color name="login_prologue_background_circle_purple">@color/purple_20</color>
     <color name="login_prologue_background_circle_light_purple">@color/purple_10</color>
-    <color name="login_prologue_background_circle_blue">@color/wordpress_blue_20</color>
+    <color name="login_prologue_background_circle_blue">@color/blue_20</color>
     <color name="login_prologue_background_circle_light_blue">@color/blue_5</color>
     <color name="login_prologue_background_circle_green">@color/green_5</color>
     <color name="login_prologue_background_circle_yellow">@color/yellow_10</color>
@@ -56,274 +38,13 @@
     <color name="prepublishing_action_type_disabled_color">@color/gray_10</color>
     <color name="prepublishing_action_result_disabled_color">@color/gray_10</color>
 
-    <!-- SEMANTIC -->
-    <color name="accent">@color/pink_50</color>
-    <color name="accent_0">@color/pink_0</color>
-    <color name="accent_5">@color/pink_5</color>
-    <color name="accent_10">@color/pink_10</color>
-    <color name="accent_20">@color/pink_20</color>
-    <color name="accent_30">@color/pink_30</color>
-    <color name="accent_40">@color/pink_40</color>
-    <color name="accent_50">@color/pink_50</color>
-    <color name="accent_60">@color/pink_60</color>
-    <color name="accent_70">@color/pink_70</color>
-    <color name="accent_80">@color/pink_80</color>
-    <color name="accent_90">@color/pink_90</color>
-    <color name="accent_100">@color/pink_100</color>
-    <color name="accent_dark">@color/pink_70</color>
-    <color name="accent_light">@color/pink_30</color>
-    <color name="divider">@color/gray_5</color>
-    <color name="error">@color/red_50</color>
-    <color name="error_0">@color/red_0</color>
-    <color name="error_5">@color/red_5</color>
-    <color name="error_10">@color/red_10</color>
-    <color name="error_20">@color/red_20</color>
-    <color name="error_30">@color/red_30</color>
-    <color name="error_40">@color/red_40</color>
-    <color name="error_50">@color/red_50</color>
-    <color name="error_60">@color/red_60</color>
-    <color name="error_70">@color/red_70</color>
-    <color name="error_80">@color/red_80</color>
-    <color name="error_90">@color/red_90</color>
-    <color name="error_100">@color/red_100</color>
-    <color name="error_dark">@color/red_70</color>
-    <color name="error_light">@color/red_30</color>
-    <color name="neutral">@color/gray_50</color>
-    <color name="neutral_0">@color/gray_0</color>
-    <color name="neutral_5">@color/gray_5</color>
-    <color name="neutral_10">@color/gray_10</color>
-    <color name="neutral_20">@color/gray_20</color>
-    <color name="neutral_30">@color/gray_30</color>
-    <color name="neutral_40">@color/gray_40</color>
-    <color name="neutral_50">@color/gray_50</color>
-    <color name="neutral_60">@color/gray_60</color>
-    <color name="neutral_70">@color/gray_70</color>
-    <color name="neutral_80">@color/gray_80</color>
-    <color name="neutral_90">@color/gray_90</color>
-    <color name="neutral_100">@color/gray_100</color>
-    <color name="primary">@color/wordpress_blue_50</color>
-    <color name="primary_0">@color/wordpress_blue_0</color>
-    <color name="primary_5">@color/wordpress_blue_5</color>
-    <color name="primary_10">@color/wordpress_blue_10</color>
-    <color name="primary_20">@color/wordpress_blue_20</color>
-    <color name="primary_30">@color/wordpress_blue_30</color>
-    <color name="primary_40">@color/wordpress_blue_40</color>
-    <color name="primary_50">@color/wordpress_blue_50</color>
-    <color name="primary_60">@color/wordpress_blue_60</color>
-    <color name="primary_70">@color/wordpress_blue_70</color>
-    <color name="primary_80">@color/wordpress_blue_80</color>
-    <color name="primary_90">@color/wordpress_blue_90</color>
-    <color name="primary_100">@color/wordpress_blue_100</color>
-    <color name="primary_dark">@color/wordpress_blue_80</color>
-    <color name="primary_light">@color/wordpress_blue_30</color>
-    <color name="success">@color/green_50</color>
-    <color name="success_0">@color/green_0</color>
-    <color name="success_5">@color/green_5</color>
-    <color name="success_10">@color/green_10</color>
-    <color name="success_20">@color/green_20</color>
-    <color name="success_30">@color/green_30</color>
-    <color name="success_40">@color/green_40</color>
-    <color name="success_50">@color/green_50</color>
-    <color name="success_60">@color/green_60</color>
-    <color name="success_70">@color/green_70</color>
-    <color name="success_80">@color/green_80</color>
-    <color name="success_90">@color/green_90</color>
-    <color name="success_100">@color/green_100</color>
-    <color name="success_dark">@color/green_70</color>
-    <color name="success_light">@color/green_30</color>
-    <color name="text">@color/gray_80</color>
-    <color name="text_subtle">@color/gray_50</color>
-    <color name="warning">@color/yellow_20</color>
-    <color name="warning_0">@color/yellow_0</color>
-    <color name="warning_5">@color/yellow_5</color>
-    <color name="warning_10">@color/yellow_10</color>
-    <color name="warning_20">@color/yellow_20</color>
-    <color name="warning_30">@color/yellow_30</color>
-    <color name="warning_40">@color/yellow_40</color>
-    <color name="warning_50">@color/yellow_50</color>
-    <color name="warning_60">@color/yellow_60</color>
-    <color name="warning_70">@color/yellow_70</color>
-    <color name="warning_80">@color/yellow_80</color>
-    <color name="warning_90">@color/yellow_90</color>
-    <color name="warning_100">@color/yellow_100</color>
-    <color name="warning_dark">@color/yellow_40</color>
-    <color name="warning_light">@color/yellow_5</color>
-
-    <!-- STUDIO 2.2.0 -->
-    <color name="blue">#2271b1</color>
-    <color name="blue_0">#e9eff5</color>
-    <color name="blue_5">#c5d9ed</color>
-    <color name="blue_10">#9ec2e6</color>
-    <color name="blue_20">#72aee6</color>
-    <color name="blue_30">#5198d9</color>
-    <color name="blue_40">#3582c4</color>
-    <color name="blue_50">#2271b1</color>
-    <color name="blue_60">#135e96</color>
-    <color name="blue_70">#0a4b78</color>
-    <color name="blue_80">#043959</color>
-    <color name="blue_90">#01263a</color>
-    <color name="blue_100">#00131c</color>
-    <color name="celadon">#007e65</color>
-    <color name="celadon_0">#e4f2ed</color>
-    <color name="celadon_5">#a7e8d4</color>
-    <color name="celadon_10">#63d6b6</color>
-    <color name="celadon_20">#2ebd99</color>
-    <color name="celadon_30">#09a884</color>
-    <color name="celadon_40">#009172</color>
-    <color name="celadon_50">#007e65</color>
-    <color name="celadon_60">#006753</color>
-    <color name="celadon_70">#005042</color>
-    <color name="celadon_80">#003b30</color>
-    <color name="celadon_90">#002721</color>
-    <color name="celadon_100">#001c17</color>
-    <color name="gray">#646970</color>
-    <color name="gray_0">#f6f7f7</color>
-    <color name="gray_5">#dcdcde</color>
-    <color name="gray_10">#c3c4c7</color>
-    <color name="gray_20">#a7aaad</color>
-    <color name="gray_30">#8e9196</color>
-    <color name="gray_40">#787c82</color>
-    <color name="gray_50">#646970</color>
-    <color name="gray_60">#50575e</color>
-    <color name="gray_70">#3c434a</color>
-    <color name="gray_80">#2c3338</color>
-    <color name="gray_90">#1d2327</color>
-    <color name="gray_100">#101517</color>
-    <color name="green">#008a20</color>
-    <color name="green_0">#e6f2e8</color>
-    <color name="green_5">#b8e6bf</color>
-    <color name="green_10">#68de86</color>
-    <color name="green_20">#1ed15a</color>
-    <color name="green_30">#00ba37</color>
-    <color name="green_40">#00a32a</color>
-    <color name="green_50">#008a20</color>
-    <color name="green_60">#007017</color>
-    <color name="green_70">#005c12</color>
-    <color name="green_80">#00450c</color>
-    <color name="green_90">#003008</color>
-    <color name="green_100">#001c05</color>
-    <color name="jetpack_green">#00BE28</color>
-    <color name="jetpack_green_0">#f0f2eb</color>
-    <color name="jetpack_green_5">#d0e6b8</color>
-    <color name="jetpack_green_10">#9dd977</color>
-    <color name="jetpack_green_20">#64ca43</color>
-    <color name="jetpack_green_30">#2fb41f</color>
-    <color name="jetpack_green_40">#069e08</color>
-    <color name="jetpack_green_50">#008710</color>
-    <color name="jetpack_green_60">#007117</color>
-    <color name="jetpack_green_70">#005b18</color>
-    <color name="jetpack_green_80">#004515</color>
-    <color name="jetpack_green_90">#003010</color>
-    <color name="jetpack_green_100">#001c09</color>
-    <color name="orange">#b26200</color>
-    <color name="orange_0">#f5ece6</color>
-    <color name="orange_5">#f7dcc6</color>
-    <color name="orange_10">#ffbf86</color>
-    <color name="orange_20">#faa754</color>
-    <color name="orange_30">#e68b28</color>
-    <color name="orange_40">#d67709</color>
-    <color name="orange_50">#b26200</color>
-    <color name="orange_60">#8a4d00</color>
-    <color name="orange_70">#704000</color>
-    <color name="orange_80">#543100</color>
-    <color name="orange_90">#361f00</color>
-    <color name="orange_100">#1f1200</color>
-    <color name="pink">#c9356e</color>
-    <color name="pink_0">#f5e9ed</color>
-    <color name="pink_5">#f2ceda</color>
-    <color name="pink_10">#f7a8c3</color>
-    <color name="pink_20">#f283aa</color>
-    <color name="pink_30">#eb6594</color>
-    <color name="pink_40">#e34c84</color>
-    <color name="pink_50">#c9356e</color>
-    <color name="pink_60">#ab235a</color>
-    <color name="pink_70">#8c1749</color>
-    <color name="pink_80">#700f3b</color>
-    <color name="pink_90">#4f092a</color>
-    <color name="pink_100">#260415</color>
-    <color name="purple">#984a9c</color>
-    <color name="purple_0">#f2e9ed</color>
-    <color name="purple_5">#ebcee0</color>
-    <color name="purple_10">#e3afd5</color>
-    <color name="purple_20">#d48fc8</color>
-    <color name="purple_30">#c475bd</color>
-    <color name="purple_40">#b35eb1</color>
-    <color name="purple_50">#984a9c</color>
-    <color name="purple_60">#7c3982</color>
-    <color name="purple_70">#662c6e</color>
-    <color name="purple_80">#4d2054</color>
-    <color name="purple_90">#35163b</color>
-    <color name="purple_100">#1e0c21</color>
-    <color name="red">#d63638</color>
-    <color name="red_0">#f7ebec</color>
-    <color name="red_5">#facfd2</color>
-    <color name="red_10">#ffabaf</color>
-    <color name="red_20">#ff8085</color>
-    <color name="red_30">#f86368</color>
-    <color name="red_40">#e65054</color>
-    <color name="red_50">#d63638</color>
-    <color name="red_60">#b32d2e</color>
-    <color name="red_70">#8a2424</color>
-    <color name="red_80">#691c1c</color>
-    <color name="red_90">#451313</color>
-    <color name="red_100">#240a0a</color>
-    <color name="woocommerce_purple">#7f54b3</color>
-    <color name="woocommerce_purple_0">#f7edf7</color>
-    <color name="woocommerce_purple_5">#e5cfe8</color>
-    <color name="woocommerce_purple_10">#d6b4e0</color>
-    <color name="woocommerce_purple_20">#c792e0</color>
-    <color name="woocommerce_purple_30">#af7dd1</color>
-    <color name="woocommerce_purple_40">#9a69c7</color>
-    <color name="woocommerce_purple_50">#7f54b3</color>
-    <color name="woocommerce_purple_60">#674399</color>
-    <color name="woocommerce_purple_70">#533582</color>
-    <color name="woocommerce_purple_80">#3c2861</color>
-    <color name="woocommerce_purple_90">#271b3d</color>
-    <color name="woocommerce_purple_100">#140e1f</color>
-    <color name="wordpress_blue">#006088</color>
-    <color name="wordpress_blue_0">#e6f1f5</color>
-    <color name="wordpress_blue_5">#bedae6</color>
-    <color name="wordpress_blue_10">#98c6d9</color>
-    <color name="wordpress_blue_20">#6ab3d0</color>
-    <color name="wordpress_blue_30">#3895ba</color>
-    <color name="wordpress_blue_40">#187aa2</color>
-    <color name="wordpress_blue_50">#006088</color>
-    <color name="wordpress_blue_60">#004e6e</color>
-    <color name="wordpress_blue_70">#003c56</color>
-    <color name="wordpress_blue_80">#002c40</color>
-    <color name="wordpress_blue_90">#001d2d</color>
-    <color name="wordpress_blue_100">#00101c</color>
-    <color name="yellow">#907300</color>
-    <color name="yellow_0">#f5efe4</color>
-    <color name="yellow_5">#f5e1b3</color>
-    <color name="yellow_10">#f2cf75</color>
-    <color name="yellow_20">#f0c443</color>
-    <color name="yellow_30">#dbae17</color>
-    <color name="yellow_40">#b69000</color>
-    <color name="yellow_50">#907300</color>
-    <color name="yellow_60">#705b00</color>
-    <color name="yellow_70">#5c4b00</color>
-    <color name="yellow_80">#453900</color>
-    <color name="yellow_90">#302800</color>
-    <color name="yellow_100">#1c1700</color>
-
-    <!-- TRANSLUCENT -->
-    <color name="black_translucent_20">#33000000</color>
-    <color name="black_translucent_40">#66000000</color>
-    <color name="black_translucent_50">#80000000</color>
-    <color name="grey_lighten_30_translucent_50">#80e9eff3</color> <!-- Use for old Stats.  Will be removed soon. -->
-    <color name="white_translucent_20">#33ffffff</color>
-    <color name="white_translucent_40">#66ffffff</color>
-    <color name="white_translucent_50">#80ffffff</color>
-    <color name="white_translucent_65">#a6ffffff</color>
-
     <!-- Reader -->
 
     <!--Reader Following empty view -->
     <color name="reader_following_empty_view_upper_right_plus">@color/yellow_0</color>
     <color name="reader_following_empty_view_mid_left_plus">@color/green_0</color>
     <color name="reader_following_empty_view_center_circle">@color/blue_0</color>
-    <color name="reader_following_empty_view_left_lower_plus">@color/pink_0</color>
+    <color name="reader_following_empty_view_left_lower_plus">@color/blue_0</color>
     <color name="reader_following_empty_view_outline">@color/gray_10</color>
     <color name="reader_following_empty_view_middle_plus">@android:color/white</color>
     <color name="reader_following_empty_view_background">@color/background_default</color>
@@ -345,4 +66,49 @@
     <!-- Collapsing Toolbar Custom Scrim Color -->
     <color name="collapsing_toolbar_custom_scrim_color">@color/white_translucent_50</color>
 
+    <!-- Scan Threat Context Line Custom Colors -->
+    <color name="context_line_highlighted_row_background">@color/red_5</color>
+
+    <!-- Quick Start Task Cards -->
+    <color name="quick_start_task_card_illustration_background">@color/gray_0</color>
+    <color name="quick_start_task_card_illustration_surface">@color/white</color>
+    <color name="quick_start_task_card_illustration_details">@color/gray_30</color>
+    <color name="quick_start_task_card_illustration_line">@color/blue_5</color>
+    <color name="quick_start_task_card_illustration_area">@color/blue_0</color>
+    <color name="quick_start_task_card_illustration_mountain">@color/gray_5</color>
+    <color name="quick_start_task_card_illustration_sun_fill">#F5E6B3</color>
+    <color name="quick_start_task_card_illustration_sun_stroke">#F0C930</color>
+
+    <color name="quick_start_task_card_illustration_check_site_stats_stroke">@color/pink_5</color>
+    <color name="quick_start_task_card_illustration_edit_site_icon_area">@color/blue_0</color>
+    <color name="quick_start_task_card_illustration_edit_site_icon_mountain_fill">@color/gray_5</color>
+    <color name="quick_start_task_card_illustration_edit_site_icon_mountain_stroke">@color/gray_40</color>
+    <color name="quick_start_task_card_illustration_follow_other_sites_fill">@color/blue_0</color>
+    <color name="quick_start_task_card_illustration_set_site_title_header">@color/blue_0</color>
+    <color name="quick_start_task_card_illustration_set_site_title_body">@color/white</color>
+    <color name="quick_start_task_card_illustration_set_site_title_box_stroke">@color/blue_5</color>
+    <color name="quick_start_task_card_illustration_visit_your_site_star">#FFD60A</color>
+
+    <!-- Reader Topics You Might Like Chips -->
+    <color name="reader_topics_you_might_like_chip_green_stroke">@color/green_5</color>
+    <color name="reader_topics_you_might_like_chip_green_font">@color/green_50</color>
+    <color name="reader_topics_you_might_like_chip_green_fill">@color/green_0</color>
+    <color name="reader_topics_you_might_like_chip_purple_stroke">@color/purple_5</color>
+    <color name="reader_topics_you_might_like_chip_purple_font">@color/purple_50</color>
+    <color name="reader_topics_you_might_like_chip_purple_fill">@color/purple_0</color>
+    <color name="reader_topics_you_might_like_chip_yellow_stroke">@color/yellow_5</color>
+    <color name="reader_topics_you_might_like_chip_yellow_font">@color/yellow_50</color>
+    <color name="reader_topics_you_might_like_chip_yellow_fill">@color/yellow_0</color>
+    <color name="reader_topics_you_might_like_chip_orange_stroke">@color/orange_5</color>
+    <color name="reader_topics_you_might_like_chip_orange_font">@color/orange_50</color>
+    <color name="reader_topics_you_might_like_chip_orange_fill">@color/orange_0</color>
+
+    <!-- These colors were removed from the login library and moved here as they are still being
+    used by some old layouts. They should be replaced here as well, whenever possible. -->
+    <color name="color_primary_dark">#006b98</color>
+    <color name="light_gray">@color/grey_lighten_30</color>
+    <color name="grey_lighten_30">#e9eff3</color>
+    <color name="grey_lighten_20">#c8d7e1</color>
+    <color name="grey_300">#ffe0e0e0</color>
+    <color name="grey_900">#ff212121</color>
 </resources>
diff --git a/WordPress/src/main/res/values/colors_base.xml b/WordPress/src/main/res/values/colors_base.xml
new file mode 100644
index 000000000000..ec85c4ffcd46
--- /dev/null
+++ b/WordPress/src/main/res/values/colors_base.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+    <color name="colorPrimary">@color/primary</color>
+    <color name="colorPrimaryVariant">@color/primary_70</color>
+    <color name="colorSecondary">@color/primary</color>
+    <color name="colorSecondaryVariant">@color/primary_70</color>
+
+    <color name="primary">@color/blue_50</color>
+    <color name="primary_0">@color/blue_0</color>
+    <color name="primary_5">@color/blue_5</color>
+    <color name="primary_10">@color/blue_10</color>
+    <color name="primary_20">@color/blue_20</color>
+    <color name="primary_30">@color/blue_30</color>
+    <color name="primary_40">@color/blue_40</color>
+    <color name="primary_50">@color/blue_50</color>
+    <color name="primary_60">@color/blue_60</color>
+    <color name="primary_70">@color/blue_70</color>
+    <color name="primary_80">@color/blue_80</color>
+    <color name="primary_90">@color/blue_90</color>
+    <color name="primary_100">@color/blue_100</color>
+    <color name="primary_dark">@color/blue_80</color>
+    <color name="primary_light">@color/blue_30</color>
+
+    <color name="nav_bar">@color/colorPrimary</color>
+</resources>
diff --git a/WordPress/src/main/res/values/colors_semantic.xml b/WordPress/src/main/res/values/colors_semantic.xml
new file mode 100644
index 000000000000..ec1b65960ca7
--- /dev/null
+++ b/WordPress/src/main/res/values/colors_semantic.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+    <color name="accent">@color/pink_50</color>
+    <color name="accent_0">@color/pink_0</color>
+    <color name="accent_5">@color/pink_5</color>
+    <color name="accent_10">@color/pink_10</color>
+    <color name="accent_20">@color/pink_20</color>
+    <color name="accent_30">@color/pink_30</color>
+    <color name="accent_40">@color/pink_40</color>
+    <color name="accent_50">@color/pink_50</color>
+    <color name="accent_60">@color/pink_60</color>
+    <color name="accent_70">@color/pink_70</color>
+    <color name="accent_80">@color/pink_80</color>
+    <color name="accent_90">@color/pink_90</color>
+    <color name="accent_100">@color/pink_100</color>
+    <color name="accent_dark">@color/pink_70</color>
+    <color name="accent_light">@color/pink_30</color>
+
+    <color name="error">@color/red_50</color>
+    <color name="error_0">@color/red_0</color>
+    <color name="error_5">@color/red_5</color>
+    <color name="error_10">@color/red_10</color>
+    <color name="error_20">@color/red_20</color>
+    <color name="error_30">@color/red_30</color>
+    <color name="error_40">@color/red_40</color>
+    <color name="error_50">@color/red_50</color>
+    <color name="error_60">@color/red_60</color>
+    <color name="error_70">@color/red_70</color>
+    <color name="error_80">@color/red_80</color>
+    <color name="error_90">@color/red_90</color>
+    <color name="error_100">@color/red_100</color>
+    <color name="error_dark">@color/red_70</color>
+    <color name="error_light">@color/red_30</color>
+
+    <color name="neutral">@color/gray_50</color>
+    <color name="neutral_0">@color/gray_0</color>
+    <color name="neutral_5">@color/gray_5</color>
+    <color name="neutral_10">@color/gray_10</color>
+    <color name="neutral_20">@color/gray_20</color>
+    <color name="neutral_30">@color/gray_30</color>
+    <color name="neutral_40">@color/gray_40</color>
+    <color name="neutral_50">@color/gray_50</color>
+    <color name="neutral_60">@color/gray_60</color>
+    <color name="neutral_70">@color/gray_70</color>
+    <color name="neutral_80">@color/gray_80</color>
+    <color name="neutral_90">@color/gray_90</color>
+    <color name="neutral_100">@color/gray_100</color>
+
+    <color name="success">@color/green_50</color>
+    <color name="success_0">@color/green_0</color>
+    <color name="success_5">@color/green_5</color>
+    <color name="success_10">@color/green_10</color>
+    <color name="success_20">@color/green_20</color>
+    <color name="success_30">@color/green_30</color>
+    <color name="success_40">@color/green_40</color>
+    <color name="success_50">@color/green_50</color>
+    <color name="success_60">@color/green_60</color>
+    <color name="success_70">@color/green_70</color>
+    <color name="success_80">@color/green_80</color>
+    <color name="success_90">@color/green_90</color>
+    <color name="success_100">@color/green_100</color>
+    <color name="success_dark">@color/green_70</color>
+    <color name="success_light">@color/green_30</color>
+
+    <color name="warning">@color/yellow_20</color>
+    <color name="warning_0">@color/yellow_0</color>
+    <color name="warning_5">@color/yellow_5</color>
+    <color name="warning_10">@color/yellow_10</color>
+    <color name="warning_20">@color/yellow_20</color>
+    <color name="warning_30">@color/yellow_30</color>
+    <color name="warning_40">@color/yellow_40</color>
+    <color name="warning_50">@color/yellow_50</color>
+    <color name="warning_60">@color/yellow_60</color>
+    <color name="warning_70">@color/yellow_70</color>
+    <color name="warning_80">@color/yellow_80</color>
+    <color name="warning_90">@color/yellow_90</color>
+    <color name="warning_100">@color/yellow_100</color>
+    <color name="warning_dark">@color/yellow_40</color>
+    <color name="warning_light">@color/yellow_5</color>
+
+    <color name="divider">@color/gray_5</color>
+
+    <color name="text">@color/gray_80</color>
+    <color name="text_subtle">@color/gray_50</color>
+</resources>
diff --git a/WordPress/src/main/res/values/colors_stats.xml b/WordPress/src/main/res/values/colors_stats.xml
new file mode 100644
index 000000000000..feeda1425bfa
--- /dev/null
+++ b/WordPress/src/main/res/values/colors_stats.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="stats_activity_very_low">@color/gray_0</color>
+    <color name="stats_activity_low">@color/blue_5</color>
+    <color name="stats_activity_medium">@color/blue_20</color>
+    <color name="stats_activity_high">@color/blue_50</color>
+    <color name="stats_activity_very_high">@color/blue_70</color>
+    <color name="stats_value_bar_color">@color/gray_10</color>
+    <color name="stats_bar_chart_bottom">@color/blue_60</color>
+    <color name="stats_bar_chart_top">@color/blue_30</color>
+    <color name="stats_bar_chart_accent_top">@color/pink_30</color>
+    <color name="stats_bar_chart_accent_bottom">@color/pink_60</color>
+    <color name="stats_bar_chart_gridline">@color/neutral_5</color>
+    <color name="stats_map_activity_low">@color/blue_5</color>
+    <color name="stats_map_activity_high">@color/blue</color>
+    <color name="stats_map_activity_empty">@color/neutral_5</color>
+</resources>
diff --git a/WordPress/src/main/res/values/colors_studio_palette.xml b/WordPress/src/main/res/values/colors_studio_palette.xml
new file mode 100644
index 000000000000..c46d9819b367
--- /dev/null
+++ b/WordPress/src/main/res/values/colors_studio_palette.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
+
+    <!-- Generated by Color Studio v2.5.0 -->
+    <color name="white">#fff</color>
+    <color name="black">#000</color>
+
+    <color name="gray">#646970</color>
+    <color name="gray_0">#f6f7f7</color>
+    <color name="gray_5">#dcdcde</color>
+    <color name="gray_10">#c3c4c7</color>
+    <color name="gray_20">#a7aaad</color>
+    <color name="gray_30">#8c8f94</color>
+    <color name="gray_40">#787c82</color>
+    <color name="gray_50">#646970</color>
+    <color name="gray_60">#50575e</color>
+    <color name="gray_70">#3c434a</color>
+    <color name="gray_80">#2c3338</color>
+    <color name="gray_90">#1d2327</color>
+    <color name="gray_100">#101517</color>
+
+    <color name="blue">#0675c4</color>
+    <color name="blue_0">#e9f0f5</color>
+    <color name="blue_5">#bbe0fa</color>
+    <color name="blue_10">#91caf2</color>
+    <color name="blue_20">#68b3e8</color>
+    <color name="blue_30">#399ce3</color>
+    <color name="blue_40">#1689db</color>
+    <color name="blue_50">#0675c4</color>
+    <color name="blue_60">#055d9c</color>
+    <color name="blue_70">#044b7a</color>
+    <color name="blue_80">#02395c</color>
+    <color name="blue_90">#01283d</color>
+    <color name="blue_100">#001621</color>
+
+    <color name="purple">#984a9c</color>
+    <color name="purple_0">#f2e9ed</color>
+    <color name="purple_5">#ebcee0</color>
+    <color name="purple_10">#e3afd5</color>
+    <color name="purple_20">#d48fc8</color>
+    <color name="purple_30">#c475bd</color>
+    <color name="purple_40">#b35eb1</color>
+    <color name="purple_50">#984a9c</color>
+    <color name="purple_60">#7c3982</color>
+    <color name="purple_70">#662c6e</color>
+    <color name="purple_80">#4d2054</color>
+    <color name="purple_90">#35163b</color>
+    <color name="purple_100">#1e0c21</color>
+
+    <color name="pink">#c9356e</color>
+    <color name="pink_0">#f5e9ed</color>
+    <color name="pink_5">#f2ceda</color>
+    <color name="pink_10">#f7a8c3</color>
+    <color name="pink_20">#f283aa</color>
+    <color name="pink_30">#eb6594</color>
+    <color name="pink_40">#e34c84</color>
+    <color name="pink_50">#c9356e</color>
+    <color name="pink_60">#ab235a</color>
+    <color name="pink_70">#8c1749</color>
+    <color name="pink_80">#700f3b</color>
+    <color name="pink_90">#4f092a</color>
+    <color name="pink_100">#260415</color>
+
+    <color name="red">#d63638</color>
+    <color name="red_0">#f7ebec</color>
+    <color name="red_5">#facfd2</color>
+    <color name="red_10">#ffabaf</color>
+    <color name="red_20">#ff8085</color>
+    <color name="red_30">#f86368</color>
+    <color name="red_40">#e65054</color>
+    <color name="red_50">#d63638</color>
+    <color name="red_60">#b32d2e</color>
+    <color name="red_70">#8a2424</color>
+    <color name="red_80">#691c1c</color>
+    <color name="red_90">#451313</color>
+    <color name="red_100">#240a0a</color>
+
+    <color name="orange">#b26200</color>
+    <color name="orange_0">#f5ece6</color>
+    <color name="orange_5">#f7dcc6</color>
+    <color name="orange_10">#ffbf86</color>
+    <color name="orange_20">#faa754</color>
+    <color name="orange_30">#e68b28</color>
+    <color name="orange_40">#d67709</color>
+    <color name="orange_50">#b26200</color>
+    <color name="orange_60">#8a4d00</color>
+    <color name="orange_70">#704000</color>
+    <color name="orange_80">#543100</color>
+    <color name="orange_90">#361f00</color>
+    <color name="orange_100">#1f1200</color>
+
+    <color name="yellow">#9d6e00</color>
+    <color name="yellow_0">#f5f1e1</color>
+    <color name="yellow_5">#f5e6b3</color>
+    <color name="yellow_10">#f2d76b</color>
+    <color name="yellow_20">#f0c930</color>
+    <color name="yellow_30">#deb100</color>
+    <color name="yellow_40">#c08c00</color>
+    <color name="yellow_50">#9d6e00</color>
+    <color name="yellow_60">#7d5600</color>
+    <color name="yellow_70">#674600</color>
+    <color name="yellow_80">#4f3500</color>
+    <color name="yellow_90">#320</color>
+    <color name="yellow_100">#1c1300</color>
+
+    <color name="green">#008a20</color>
+    <color name="green_0">#e6f2e8</color>
+    <color name="green_5">#b8e6bf</color>
+    <color name="green_10">#68de86</color>
+    <color name="green_20">#1ed15a</color>
+    <color name="green_30">#00ba37</color>
+    <color name="green_40">#00a32a</color>
+    <color name="green_50">#008a20</color>
+    <color name="green_60">#007017</color>
+    <color name="green_70">#005c12</color>
+    <color name="green_80">#00450c</color>
+    <color name="green_90">#003008</color>
+    <color name="green_100">#001c05</color>
+
+    <color name="celadon">#008763</color>
+    <color name="celadon_0">#e4f2ed</color>
+    <color name="celadon_5">#a7e8d3</color>
+    <color name="celadon_10">#66deb9</color>
+    <color name="celadon_20">#31cc9f</color>
+    <color name="celadon_30">#09b585</color>
+    <color name="celadon_40">#009e73</color>
+    <color name="celadon_50">#008763</color>
+    <color name="celadon_60">#007053</color>
+    <color name="celadon_70">#005c44</color>
+    <color name="celadon_80">#004533</color>
+    <color name="celadon_90">#003024</color>
+    <color name="celadon_100">#001c15</color>
+
+    <color name="wordpress_blue">#006088</color>
+    <color name="wordpress_blue_0">#e6f1f5</color>
+    <color name="wordpress_blue_5">#bedae6</color>
+    <color name="wordpress_blue_10">#98c6d9</color>
+    <color name="wordpress_blue_20">#6ab3d0</color>
+    <color name="wordpress_blue_30">#3895ba</color>
+    <color name="wordpress_blue_40">#187aa2</color>
+    <color name="wordpress_blue_50">#006088</color>
+    <color name="wordpress_blue_60">#004e6e</color>
+    <color name="wordpress_blue_70">#003c56</color>
+    <color name="wordpress_blue_80">#002c40</color>
+    <color name="wordpress_blue_90">#001d2d</color>
+    <color name="wordpress_blue_100">#00101c</color>
+
+    <color name="simplenote_blue">#3361cc</color>
+    <color name="simplenote_blue_0">#e9ecf5</color>
+    <color name="simplenote_blue_5">#ced9f2</color>
+    <color name="simplenote_blue_10">#abc1f5</color>
+    <color name="simplenote_blue_20">#84a4f0</color>
+    <color name="simplenote_blue_30">#618df2</color>
+    <color name="simplenote_blue_40">#4678eb</color>
+    <color name="simplenote_blue_50">#3361cc</color>
+    <color name="simplenote_blue_60">#1d4fc4</color>
+    <color name="simplenote_blue_70">#113ead</color>
+    <color name="simplenote_blue_80">#0d2f85</color>
+    <color name="simplenote_blue_90">#09205c</color>
+    <color name="simplenote_blue_100">#05102e</color>
+
+    <color name="woocommerce_purple">#7f54b3</color>
+    <color name="woocommerce_purple_0">#f7edf7</color>
+    <color name="woocommerce_purple_5">#e5cfe8</color>
+    <color name="woocommerce_purple_10">#d6b4e0</color>
+    <color name="woocommerce_purple_20">#c792e0</color>
+    <color name="woocommerce_purple_30">#af7dd1</color>
+    <color name="woocommerce_purple_40">#9a69c7</color>
+    <color name="woocommerce_purple_50">#7f54b3</color>
+    <color name="woocommerce_purple_60">#674399</color>
+    <color name="woocommerce_purple_70">#533582</color>
+    <color name="woocommerce_purple_80">#3c2861</color>
+    <color name="woocommerce_purple_90">#271b3d</color>
+    <color name="woocommerce_purple_100">#140e1f</color>
+
+    <color name="jetpack_green">#069e08</color>
+    <color name="jetpack_green_0">#f0f2eb</color>
+    <color name="jetpack_green_5">#d0e6b8</color>
+    <color name="jetpack_green_10">#9dd977</color>
+    <color name="jetpack_green_20">#64ca43</color>
+    <color name="jetpack_green_30">#2fb41f</color>
+    <color name="jetpack_green_40">#069e08</color>
+    <color name="jetpack_green_50">#008710</color>
+    <color name="jetpack_green_60">#007117</color>
+    <color name="jetpack_green_70">#005b18</color>
+    <color name="jetpack_green_80">#004515</color>
+    <color name="jetpack_green_90">#003010</color>
+    <color name="jetpack_green_100">#001c09</color>
+</resources>
diff --git a/WordPress/src/main/res/values/colors_translucent.xml b/WordPress/src/main/res/values/colors_translucent.xml
new file mode 100644
index 000000000000..e3f7ee358d2d
--- /dev/null
+++ b/WordPress/src/main/res/values/colors_translucent.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="UnusedResources">
+    <color name="black_translucent_20">#33000000</color>
+    <color name="black_translucent_40">#66000000</color>
+    <color name="black_translucent_50">#80000000</color>
+
+    <color name="white_translucent_20">#33ffffff</color>
+    <color name="white_translucent_40">#66ffffff</color>
+    <color name="white_translucent_50">#80ffffff</color>
+    <color name="white_translucent_65">#a6ffffff</color>
+
+    <!-- Use for old Stats.  Will be removed soon. -->
+    <color name="grey_lighten_30_translucent_50">#80e9eff3</color>
+</resources>
diff --git a/WordPress/src/main/res/values/dimens.xml b/WordPress/src/main/res/values/dimens.xml
index e0aad713e178..d569f504e3ff 100644
--- a/WordPress/src/main/res/values/dimens.xml
+++ b/WordPress/src/main/res/values/dimens.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <dimen name="min_touch_target_sz">48dp</dimen>
 
@@ -19,6 +19,7 @@
 
     <dimen name="fab_margin">@dimen/fab_margin_default</dimen>
     <dimen name="fab_margin_default">16dp</dimen>
+    <dimen name="fab_margin_stories">64dp</dimen>
     <dimen name="fab_margin_tablet">24dp</dimen>
     <dimen name="design_fab_size">56dp</dimen>
 
@@ -66,6 +67,8 @@
 
     <dimen name="default_cardview_radius">2dp</dimen>
 
+    <dimen name="bottom_sheet_dialog_width">0dp</dimen>
+
     <!-- bottom navigation bar -->
     <dimen name="bottom_nav_bar_icon_size">24dp</dimen>
     <dimen name="bottom_nav_bar_badge_size">12dp</dimen>
@@ -152,13 +155,22 @@
     <dimen name="reader_tag_header_horizontal_padding">20dp</dimen>
     <dimen name="reader_tag_header_vertical_padding">40dp</dimen>
 
+    <!-- reader follow unfollow comments dimensions -->
+    <dimen name="reader_follow_button_min_height">32dp</dimen>
+    <dimen name="reader_follow_button_skeleton_width">200dp</dimen>
+    <dimen name="reader_follow_button_skeleton_icon_size">14dp</dimen>
+    <dimen name="reader_follow_button_skeleton_icon_text_margin">4dp</dimen>
+
+    <!-- reader more menu spacer height -->
+    <dimen name="reader_more_menu_spacer_height">16dp</dimen>
     <!-- collapsing toolbar scrim visible height trigger -->
-    <dimen name="scrim_visible_height_trigger">100dp</dimen>
+    <dimen name="scrim_visible_height_trigger">150dp</dimen>
 
     <item name="expandable_chips_view_chip_alpha" format="float" type="dimen">
         @dimen/emphasis_extra_low
     </item>
 
+    <dimen name="text_sz_extra_extra_small">7sp</dimen>
     <dimen name="text_sz_extra_small">10sp</dimen>
     <dimen name="text_sz_small">12sp</dimen>
     <dimen name="text_sz_medium">14sp</dimen>
@@ -173,6 +185,7 @@
     <dimen name="avatar_sz_medium">40dp</dimen>
     <dimen name="avatar_sz_inner_circle">60dp</dimen>
     <dimen name="avatar_sz_large">64dp</dimen>
+    <dimen name="avatar_sz_extra_large">72dp</dimen>
     <dimen name="avatar_sz_login">40dp</dimen>
     <dimen name="avatar_sz_login_epilogue">72dp</dimen>
     <dimen name="blavatar_sz_small">32dp</dimen>
@@ -187,7 +200,6 @@
     <dimen name="reader_more_icon">36dp</dimen>
     <dimen name="reader_follow_icon">16dp</dimen>
     <dimen name="reader_follow_icon_no_caption">24dp</dimen>
-    <dimen name="reader_follow_button_padding">@dimen/margin_small</dimen>
     <dimen name="reader_follow_icon_padding_no_caption">@dimen/margin_none</dimen>
 
     <dimen name="reader_featured_image_height_default">220dp</dimen>
@@ -198,7 +210,7 @@
     <dimen name="reader_featured_image_corner_radius">4dp</dimen>
     <dimen name="reader_image_featured_border_width">1dp</dimen>
 
-    <dimen name="reader_simple_post_image_width">72dp</dimen>
+    <dimen name="reader_related_post_image_width">150dp</dimen>
 
     <dimen name="reader_subfilter_end_guideline_margin">16dp</dimen>
 
@@ -206,6 +218,8 @@
 
     <dimen name="reader_subfilter_component_height">48dp</dimen>
 
+    <dimen name="reader_subfilter_unseen_count_height">30dp</dimen>
+
     <item name="reader_photo_title_shadow_offset" format="float" type="dimen">3.0</item>
     <item name="reader_photo_title_shadow_radius" format="float" type="dimen">1.5</item>
 
@@ -237,6 +251,11 @@
     <dimen name="post_settings_featured_image_height_min">150dp</dimen>
     <dimen name="post_settings_featured_image_height_max">300dp</dimen>
 
+    <!-- comments -->
+    <dimen name="comment_avatar_sz">40dp</dimen>
+    <dimen name="comment_status_dot_sz">8dp</dimen>
+    <dimen name="comment_list_divider_start_offset">72dp</dimen>
+
     <!-- notifications -->
     <dimen name="note_icon_sz">16dp</dimen>
     <dimen name="comment_avatar_margin_top">6dp</dimen>
@@ -293,6 +312,7 @@
     <dimen name="my_site_name_label_double_line_text_size">16sp</dimen>
     <dimen name="my_site_content_area">500dp</dimen>
     <dimen name="my_site_quick_action_button_container_width">64dp</dimen>
+    <dimen name="my_site_quick_action_button_text_max_width">84dp</dimen>
 
     <!--me-->
     <dimen name="me_list_row_icon_size">24dp</dimen>
@@ -345,6 +365,8 @@
     <dimen name="people_list_row_height">72dp</dimen>
     <dimen name="people_list_row_role_margin_top">20dp</dimen>
     <dimen name="people_list_divider_left_margin">72dp</dimen>
+    <dimen name="people_chips_min_target">40dp</dimen>
+    <dimen name="people_default_margin_top">5dp</dimen>
 
     <!-- photo picker -->
     <dimen name="photo_picker_item_padding">2dp</dimen>
@@ -365,7 +387,6 @@
 
     <!-- login -->
     <dimen name="promo_indicator_bullet_size">4dp</dimen>
-    <dimen name="magic_link_sent_illustration_sz">120dp</dimen>
 
     <dimen name="button_container_shadow_height">5dp</dimen>
 
@@ -399,14 +420,38 @@
     <dimen name="quick_start_focus_point_my_site_right_offset">24dp</dimen>
     <dimen name="quick_start_focus_point_bottom_nav_offset">4dp</dimen>
     <dimen name="quick_start_focus_point_size">40dp</dimen>
+    <dimen name="quick_start_focus_point_small_size">30dp</dimen>
+    <dimen name="quick_start_focus_point_small_offset_negative">-15dp</dimen>
+    <dimen name="quick_start_focus_point_elevation">100dp</dimen>
     <dimen name="quick_start_type_divider_margin_start">64dp</dimen>
     <dimen name="quick_start_type_icon">@dimen/blavatar_sz</dimen>
     <dimen name="quick_start_complete_tasks_header_height">48dp</dimen>
 
+    <dimen name="quick_start_card_progress_indicator_size">24dp</dimen>
+    <dimen name="quick_start_task_card_width">168dp</dimen>
+    <dimen name="quick_start_task_card_elevation">0dp</dimen>
+    <dimen name="quick_start_task_card_corner_radius">8dp</dimen>
+    <dimen name="quick_start_task_card_overlay_alpha" format="float" type="dimen">0.8</dimen>
+
     <!-- activity log -->
     <dimen name="activity_log_icon_size">40dp</dimen>
     <dimen name="activity_log_icon_margin">16dp</dimen>
 
+    <!-- jetpack -->
+    <dimen name="jetpack_icon_size">32dp</dimen>
+    <dimen name="jetpack_icon_margin">0dp</dimen>
+    <dimen name="jetpack_button_icon_size">16dp</dimen>
+
+    <!-- jetpack backup restore last bullet bottom margin-->
+    <dimen name="jetpack_backup_restore_last_bullet_bottom_margin">20dp</dimen>
+    <dimen name="jetpack_backup_restore_footnote_icon_size">24dp</dimen>
+
+    <!-- scan -->
+    <dimen name="scan_list_threat_skeleton_text_height">20dp</dimen>
+    <dimen name="scan_icon_size">48dp</dimen>
+    <dimen name="scan_icon_margin">16dp</dimen>
+    <dimen name="scan_threat_item_icon_size">40dp</dimen>
+
     <!-- actionable empty view -->
     <dimen name="actionable_empty_view_text_margin_horizontal">30dp</dimen>
     <dimen name="actionable_empty_view_text_maximum_width">440dp</dimen>
@@ -450,7 +495,7 @@
     <!--site creation-->
     <dimen name="site_creation_segments_icon_size">24dp</dimen>
     <dimen name="site_creation_segments_list_divider_start_margin">72dp</dimen>
-    <dimen name="site_creation_segments_content_padding_vertical">24dp</dimen>
+    <dimen name="site_creation_segments_content_padding_vertical">16dp</dimen>
     <dimen name="site_creation_segments_content_padding_horizontal">16dp</dimen>
     <dimen name="site_creation_verticals_search_progress_size">24dp</dimen>
     <dimen name="site_creation_verticals_clear_search_icon_size">24dp</dimen>
@@ -462,6 +507,14 @@
 
     <dimen name="site_creation_domains_radio_button_padding_start">28dp</dimen>
 
+    <dimen name="site_creation_domains_example_top_cell_height">28dp</dimen>
+    <dimen name="site_creation_domains_example_middle_cell_height">23dp</dimen>
+    <dimen name="site_creation_domains_example_middle_cell_top_margin">44dp</dimen>
+    <dimen name="site_creation_domains_example_bottom_cell_top_margin">75dp</dimen>
+    <dimen name="site_creation_domains_example_left_cell_width">97dp</dimen>
+    <dimen name="site_creation_domains_example_right_cell_width">49dp</dimen>
+    <dimen name="site_creation_domains_example_top_margin">40dp</dimen>
+
     <dimen name="site_creation_preview_skeleton_mid_size_width">174dp</dimen>
     <dimen name="site_creation_preview_skeleton_large_block_height">136dp</dimen>
     <dimen name="site_creation_preview_landscape_title_and_button_container_width">220dp</dimen>
@@ -505,7 +558,7 @@
     <!--settings username changer-->
     <dimen name="settings_username_changer_confirm_dialog_padding">20dp</dimen>
 
-    <!--preferences master switch -->
+    <!--preferences main switch -->
     <dimen name="notifications_tab_dialog_toolbar_content_offset">24dp</dimen>
     <dimen name="notifications_settings_dialog_divider_height">1dp</dimen>
 
@@ -547,15 +600,16 @@
     <!-- Common Picker resources -->
     <dimen name="picker_header_scroll_snap_threshold">-54dp</dimen>
     <dimen name="picker_bottom_button_vertical_margin">@dimen/margin_extra_large</dimen>
+    <dimen name="picker_header_selection_overlay_width">2dp</dimen>
 
     <!-- Modal Layout Picker -->
-    <dimen name="mlp_layouts_row_height">281dp</dimen>
+    <dimen name="mlp_layouts_row_height">317dp</dimen>
     <dimen name="mlp_bottom_shadow_height">@dimen/margin_medium</dimen>
     <dimen name="mlp_bottom_button_horizontal_margin">@dimen/mlp_layout_card_margin_start</dimen>
     <dimen name="mlp_bottom_button_horizontal_central_margin">@dimen/margin_extra_large</dimen>
     <dimen name="mlp_categories_bar_height">44dp</dimen>
-    <dimen name="mlp_layout_card_height">204dp</dimen>
-    <dimen name="mlp_layout_card_width">153dp</dimen>
+    <dimen name="mlp_layout_card_height">240dp</dimen>
+    <dimen name="mlp_layout_card_width">160dp</dimen>
     <dimen name="mlp_layout_card_margin_start">20dp</dimen>
     <dimen name="mlp_layouts_category_radius">40dp</dimen>
     <dimen name="mlp_layouts_category_height">36dp</dimen>
@@ -572,18 +626,43 @@
     <dimen name="mlp_layouts_line_separator_height">@dimen/margin_extra_extra_small</dimen>
     <dimen name="mlp_layout_skeleton_line_height">24dp</dimen>
     <dimen name="mlp_layout_skeleton_line_width">100dp</dimen>
-    <dimen name="mlp_preview_toolbar_offset">80dp</dimen>
 
     <!-- Home Page Picker -->
-    <dimen name="hpp_card_width">160dp</dimen>
-    <dimen name="hpp_card_padding">16dp</dimen>
-    <dimen name="hpp_card_margin_outer">40dp</dimen>
-    <dimen name="hpp_maximum_container_width">728dp</dimen>
-    <dimen name="hpp_subtitle_width">350dp</dimen>
     <dimen name="hpp_button_max_width">244dp</dimen>
+    <dimen name="hpp_title_padding_start">@dimen/margin_extra_extra_medium_large</dimen>
 
     <!-- Login Prologue -->
     <dimen name="login_prologue_content_area">320dp</dimen>
     <dimen name="login_prologue_background_circle_size">140dp</dimen>
     <dimen name="login_prologue_background_circle_size_large">160dp</dimen>
+
+    <!-- edit text with chips view -->
+    <dimen name="edit_text_with_chips_margin_top">5dp</dimen>
+    <dimen name="edit_text_with_chips_padding">12dp</dimen>
+    <dimen name="edit_text_with_chips_edit_view_min_height">32dp</dimen>
+    <dimen name="edit_text_with_chips_label_text_size">12sp</dimen>
+    <dimen name="edit_text_with_chips_hint_text_size">16sp</dimen>
+    <dimen name="edit_with_chips_outline_radius">4dp</dimen>
+    <dimen name="edit_with_chips_outline_default_width">1dp</dimen>
+    <dimen name="edit_with_chips_outline_focused_width">2dp</dimen>
+    <dimen name="edit_with_chips_outline_default_alpha" format="float" type="dimen">0.38</dimen>
+    <dimen name="edit_with_chips_outline_focused_alpha" format="float" type="dimen">1.0</dimen>
+    <dimen name="edit_with_chips_hint_label_default_alpha" format="float" type="dimen">0.6</dimen>
+
+    <!-- Hack to make snackbar padding smaller -->
+    <dimen name="design_snackbar_padding_vertical_2lines" tools:ignore="MissingDefaultResource" tools:override="true">
+        @dimen/design_snackbar_padding_vertical
+    </dimen>
+
+    <!-- likes list and user profile bottom sheet -->
+    <dimen name="reader_like_faces_padding">2dp</dimen>
+    <dimen name="liker_faces_section_min_height">80dp</dimen>
+    <dimen name="user_profile_bottom_sheet_avatar_sz">56dp</dimen>
+    <dimen name="user_profile_bottom_sheet_user_name_text_size">20sp</dimen>
+
+    <!-- Login empty views-->
+    <dimen name="login_empty_view_avatar_width">72dp</dimen>
+    <dimen name="login_empty_view_avatar_height">72dp</dimen>
+    <dimen name="login_empty_view_avatar_margin_bottom">12dp</dimen>
+    <dimen name="login_empty_view_line_spacing">2sp</dimen>
 </resources>
diff --git a/WordPress/src/main/res/values/drawables.xml b/WordPress/src/main/res/values/drawables.xml
deleted file mode 100644
index 3ecca15ada27..000000000000
--- a/WordPress/src/main/res/values/drawables.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<resources>
-    <!--
-        Aliases for login library.
-    -->
-    <drawable name="login_email_alert">@drawable/img_illustration_email_alert_120dp</drawable>
-
-</resources>
diff --git a/WordPress/src/main/res/values/ids.xml b/WordPress/src/main/res/values/ids.xml
index 9166d05a4cda..e9f9dbdb413c 100644
--- a/WordPress/src/main/res/values/ids.xml
+++ b/WordPress/src/main/res/values/ids.xml
@@ -14,7 +14,7 @@
     <item type="id" name="note_block_tag_id" />
     <item type="id" name="bottom_nav_reader_button" />
     <item type="id" name="bottom_nav_new_post_button" />
-    <item type="id" name="media_grid_file_path_id" />
+    <item type="id" name="media_grid_remote_thumb_extract_id" />
     <item type="id" name="post_menu_item_view_layout_type" />
     <item type="id" name="original_view_pager_fragment_id_tag_key" />
     <item type="id" name="pages_search_recycler_view_id" />
diff --git a/WordPress/src/main/res/values/jetpack_styles.xml b/WordPress/src/main/res/values/jetpack_styles.xml
new file mode 100644
index 000000000000..87859fac313c
--- /dev/null
+++ b/WordPress/src/main/res/values/jetpack_styles.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Icon -->
+    <style name="Jetpack.Icon" parent="">
+        <item name="android:layout_width">@dimen/jetpack_icon_size</item>
+        <item name="android:layout_height">@dimen/jetpack_icon_size</item>
+        <item name="android:importantForAccessibility">no</item>
+    </style>
+
+    <!-- TextViews -->
+    <style name="Jetpack.TextView" parent="android:Widget.TextView">
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody2</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
+
+    <style name="Jetpack.Header" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">start</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
+        <item name="android:layout_marginTop">@dimen/margin_medium</item>
+        <item name="android:layout_marginBottom">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Jetpack.SecondaryHeader" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:layout_marginBottom">@dimen/margin_medium</item>
+        <item name="android:gravity">start</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="fontWeight">600</item>
+    </style>
+
+    <style name="Jetpack.Description" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">start</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:layout_marginBottom">@dimen/margin_extra_large</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+    </style>
+
+    <style name="Jetpack.PrimaryButton" parent="WordPress.Button.Primary">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_small</item>
+        <item name="android:layout_marginBottom">@dimen/margin_small</item>
+    </style>
+
+    <style name="Jetpack.SecondaryButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="textAllCaps">false</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.SecondaryButton.OnSurface</item>
+        <item name="android:layout_marginTop">@dimen/margin_small</item>
+        <item name="android:layout_marginBottom">@dimen/margin_small</item>
+    </style>
+
+    <style name="ThemeOverlay.SecondaryButton.OnSurface" parent="">
+        <item name="colorPrimary">?attr/colorOnSurface</item>
+    </style>
+
+    <style name="Jetpack.ListItem.Progress.Label" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:layout_marginBottom">@dimen/margin_medium</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+    </style>
+
+    <style name="Jetpack.ListItem.Progress.Label.Info" parent="Jetpack.ListItem.Progress.Label">
+        <item name="android:layout_marginBottom">0dp</item>
+        <item name="android:layout_marginTop">@dimen/margin_medium</item>
+        <item name="android:textColor">?attr/wpColorOnSurfaceMedium</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody2</item>
+    </style>
+
+    <style name="Jetpack.ListItem.Checkbox" parent="">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginEnd">@dimen/margin_extra_extra_medium_large</item>
+    </style>
+
+    <style name="Jetpack.ListItem.Checkbox.Label" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+    </style>
+
+    <style name="Jetpack.ListItem.Bullet.Icon" parent="">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginEnd">@dimen/margin_extra_extra_medium_large</item>
+    </style>
+
+    <style name="Jetpack.ListItem.Bullet.Label" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:layout_marginTop">@dimen/margin_medium</item>
+        <item name="android:layout_marginBottom">@dimen/margin_medium</item>
+    </style>
+
+    <!-- Backup Styles -->
+    <style name="Jetpack.Backup.ListItem.Footnote" parent="Jetpack.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+        <item name="android:layout_marginTop">@dimen/margin_extra_large</item>
+    </style>
+
+    <style name="Jetpack.Backup.ListItem.Footnote.Icon" parent="">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginEnd">@dimen/margin_medium</item>
+        <item name="android:layout_marginBottom">@dimen/margin_medium</item>
+        <item name="tint">?attr/colorOnSurface</item>
+    </style>
+</resources>
diff --git a/WordPress/src/main/res/values/key_strings.xml b/WordPress/src/main/res/values/key_strings.xml
index a03c56aaf460..32843ffcd3b1 100644
--- a/WordPress/src/main/res/values/key_strings.xml
+++ b/WordPress/src/main/res/values/key_strings.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- layout tags - do not translate -->
-    <string name="fragment_tag_comment_list" translatable="false">fragment_comment_list</string>
-    <string name="fragment_tag_comment_detail" translatable="false" tools:ignore="UnusedResources">fragment_comment_detail</string>
     <string name="fragment_tag_reader_post_list" translatable="false">fragment_reader_post_list</string>
-    <string name="fragment_tag_reader_post_detail" translatable="false">fragment_reader_post_detail</string>
     <string name="fragment_tag_publicize_list" translatable="false">fragment_publicize_list</string>
     <string name="fragment_tag_publicize_detail" translatable="false">fragment_publicize_detail</string>
     <string name="fragment_tag_publicize_webview" translatable="false">fragment_publicize_webview</string>
@@ -78,10 +75,10 @@
     <string name="pref_key_site_paging" translatable="false">wp_pref_site_paging</string>
     <string name="pref_key_site_identity_required" translatable="false">wp_pref_site_identity_required</string>
     <string name="pref_key_site_user_account_required" translatable="false">wp_pref_site_user_account_required</string>
-    <string name="pref_key_site_whitelist" translatable="false">wp_pref_site_whitelist</string>
+    <string name="pref_key_site_allowlist" translatable="false">wp_pref_site_whitelist</string>
     <string name="pref_key_site_multiple_links" translatable="false">wp_pref_site_multiple_links</string>
     <string name="pref_key_site_moderation_hold" translatable="false">wp_pref_site_moderation_hold</string>
-    <string name="pref_key_site_blacklist" translatable="false">wp_pref_site_blacklist</string>
+    <string name="pref_key_site_denylist" translatable="false">wp_pref_site_blacklist</string>
     <string name="pref_key_site_advanced" translatable="false">wp_pref_site_advanced</string>
     <string name="pref_key_site_disconnect" translatable="false">wp_pref_site_disconnect</string>
     <string name="pref_key_site_start_over" translatable="false">wp_pref_site_start_over</string>
@@ -129,14 +126,14 @@
     <string name="pref_key_jetpack_send_email_notifications" translatable="false">wp_pref_jetpack_send_email_notifications</string>
     <string name="pref_key_jetpack_send_wp_notifications" translatable="false">wp_pref_jetpack_send_wp_notifications</string>
     <string name="pref_key_jetpack_prevent_brute_force" translatable="false">wp_pref_jetpack_prevent_brute_force</string>
-    <string name="pref_key_jetpack_brute_force_whitelist" translatable="false">wp_pref_jetpack_brute_force_whitelist</string>
+    <string name="pref_key_jetpack_brute_force_allowlist" translatable="false">wp_pref_jetpack_brute_force_whitelist</string>
     <string name="pref_key_jetpack_allow_wpcom_sign_in" translatable="false">wp_pref_jetpack_allow_wpcom_sign_in</string>
     <string name="pref_key_jetpack_match_via_email" translatable="false">wp_pref_jetpack_match_via_email</string>
     <string name="pref_key_jetpack_require_two_factor" translatable="false">wp_pref_jetpack_require_two_factor</string>
     <string name="pref_key_jetpack_learn_more" translatable="false">wp_pref_jetpack_learn_more</string>
 
     <string name="wp_pref_notifications_root" translatable="false">wp_pref_notifications_root</string>
-    <string name="wp_pref_notifications_master" translatable="false">wp_pref_notifications_master</string>
+    <string name="wp_pref_notifications_main" translatable="false">wp_pref_notifications_master</string>
     <string name="wp_pref_custom_notification_sound" translatable="false">wp_pref_custom_notification_sound</string>
     <string name="wp_pref_notification_vibrate" translatable="false">wp_pref_notification_vibrate</string>
     <string name="wp_pref_notification_light" translatable="false">wp_pref_notification_light</string>
diff --git a/WordPress/src/main/res/values/reader_styles.xml b/WordPress/src/main/res/values/reader_styles.xml
index 17b8887f80c4..a2c5e3ae1eb1 100644
--- a/WordPress/src/main/res/values/reader_styles.xml
+++ b/WordPress/src/main/res/values/reader_styles.xml
@@ -117,8 +117,11 @@
     <style name="ReaderTextView.MetaHeader">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+        <item name="android:textAppearance">?attr/textAppearanceOverline</item>
         <item name="android:textAllCaps">true</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textStyle">bold</item>
     </style>
 
     <style name="ReaderTextView.Date" parent="ReaderTextView">
@@ -141,15 +144,10 @@
         <item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
     </style>
 
-    <style name="ReaderTextView.Interests.ListItem.Text" parent="ReaderTextView">
+    <style name="ReaderTextView.Interests.ListItem.Chip" parent="">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginBottom">@dimen/margin_large</item>
-        <item name="android:layout_marginEnd">@dimen/margin_extra_large</item>
-        <item name="android:layout_marginStart">@dimen/margin_extra_large</item>
-        <item name="android:layout_marginTop">@dimen/margin_large</item>
-        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
     </style>
 
     <style name="ReaderTextView.Interests.Title" parent="ReaderTextView">
@@ -175,6 +173,26 @@
         <item name="android:paddingEnd">@dimen/margin_extra_extra_large</item>
     </style>
 
+    <style name="ReaderTextView.RelatedPost.Title" parent="ReaderTextView">
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+        <item name="android:maxLines">3</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
+    <style name="ReaderTextView.RelatedPost.Excerpt" parent="ReaderTextView">
+        <item name="android:textAppearance">?attr/textAppearanceCaption</item>
+        <item name="android:gravity">start</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+        <item name="android:maxLines">3</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
     <style name="ReaderTextView.Site.Header.Title" parent="ReaderTextView">
         <item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
         <item name="textColor">?attr/colorOnSurface</item>
@@ -265,6 +283,17 @@
         <item name="wpShowFollowButtonCaption">false</item>
     </style>
 
+    <style name="Reader.Follow.Button.Comments" parent="Reader.Follow.Button">
+        <item name="iconTint">@color/secondary_gray_20_disabled_selector</item>
+        <item name="android:textColor">@color/secondary_gray_20_disabled_selector</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+        <item name="android:minHeight">@dimen/reader_follow_button_min_height</item>
+        <item name="android:foreground">?android:attr/selectableItemBackground</item>
+        <item name="android:background">@color/transparent</item>
+        <item name="wpShowFollowButtonCaption">true</item>
+        <item name="wpReaderFollowButtonType">followComments</item>
+    </style>
+
     <style name="Reader.Button.Error" parent="WordPress.Button.Primary">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/WordPress/src/main/res/values/scan_styles.xml b/WordPress/src/main/res/values/scan_styles.xml
new file mode 100644
index 000000000000..7e9018d636cb
--- /dev/null
+++ b/WordPress/src/main/res/values/scan_styles.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Scan.TextView" parent="android:Widget.TextView">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+    </style>
+
+    <!--Threats List Header-->
+    <style name="Scan.Threats.Header" parent="Scan.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:paddingStart">@dimen/margin_extra_large</item>
+        <item name="android:paddingEnd">@dimen/margin_extra_large</item>
+        <item name="android:paddingTop">@dimen/margin_extra_medium_large</item>
+        <item name="android:paddingBottom">@dimen/margin_large</item>
+        <item name="android:clickable">false</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody2</item>
+    </style>
+
+    <!--Threats List Header-->
+    <style name="Scan.Threats.Date" parent="Scan.Threats.Header" >
+        <item name="android:paddingTop">@dimen/margin_large</item>
+    </style>
+
+    <!--Threat List Item-->
+    <style name="Scan.Threat.Icon" parent="">
+        <item name="android:layout_width">@dimen/scan_threat_item_icon_size</item>
+        <item name="android:layout_height">@dimen/scan_threat_item_icon_size</item>
+        <item name="android:layout_marginEnd">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginStart">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginBottom">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginTop">@dimen/margin_extra_large</item>
+        <item name="android:importantForAccessibility">no</item>
+        <item name="android:padding">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Scan.Threat.Header" parent="Scan.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginEnd">@dimen/margin_medium</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">start</item>
+        <item name="android:maxLines">2</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
+    </style>
+
+    <style name="Scan.Threat.SecondaryHeader" parent="Scan.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">start</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceCaption</item>
+        <item name="android:alpha">@dimen/material_emphasis_medium</item>
+    </style>
+
+    <!--Threat Details: ContextLine-->
+    <style name="Scan.ThreatDetails.ContextLine" parent="Scan.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">start</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:padding">@dimen/margin_medium</item>
+    </style>
+
+    <style name="Scan.ThreatDetails.ContextLine.LineNumber" parent="Scan.ThreatDetails.ContextLine">
+        <item name="android:layout_width">48dp</item>
+        <item name="android:layout_marginBottom">@dimen/margin_extra_extra_small</item>
+        <item name="android:background">@color/gray_20</item>
+        <item name="android:textAlignment">viewEnd</item>
+    </style>
+
+    <style name="Scan.ThreatDetails.ContextLine.Content" parent="Scan.ThreatDetails.ContextLine">
+        <item name="android:layout_marginBottom">@dimen/margin_extra_extra_small</item>
+        <item name="android:background">@color/gray_5</item>
+    </style>
+
+    <!--Threat Details - FileName-->
+    <style name="Scan.ThreatDetails.FileName" parent="Scan.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:gravity">center_vertical|start</item>
+        <item name="android:padding">@dimen/margin_large</item>
+        <item name="android:background">@drawable/bg_rectangle_on_surface_emphasis_lowest</item>
+        <item name="android:layout_marginBottom">@dimen/margin_extra_large</item>
+    </style>
+
+    <!-- Threat Details -->
+    <style name="Scan.ThreatDetails.Icon" parent="Scan.Threat.Icon">
+        <item name="android:layout_marginStart">0dp</item>
+    </style>
+    <style name="Scan.ThreatDetails.Header" parent="Jetpack.Header"/>
+    <style name="Scan.ThreatDetails.Description" parent="Jetpack.Description"/>
+</resources>
diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml
index fe45a23e50e1..ab1f95133426 100644
--- a/WordPress/src/main/res/values/strings.xml
+++ b/WordPress/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="app_name" translatable="false">WordPress</string>
+    <string name="widgets_enabled" translatable="false">true</string>
 
     <!-- account setup -->
     <string name="xmlrpc_missing_method_error">Couldn\'t connect. Required XML-RPC methods are missing on the server.</string>
@@ -12,6 +13,7 @@
         this problem.</string>
     <string name="no_network_title">No network available</string>
     <string name="no_network_message">There is no network available</string>
+    <string name="request_failed_message">There was a problem handling the request. Please try again later.</string>
     <string name="sign_out_wpcom_confirm_with_changes">You have changes to posts that haven’t been uploaded to your site. Logging out now will delete those changes from your device. Log out anyway?</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">Log out of WordPress?</string>
 
@@ -59,6 +61,7 @@
     <string name="remove">Remove</string>
     <string name="removed">Removed</string>
     <string name="search">Search</string>
+    <string name="suggestion">Suggestion:</string>
     <string name="show">Show</string>
     <string name="hide">Hide</string>
     <string name="select_all">Select all</string>
@@ -95,6 +98,7 @@
     <string name="confirm">Confirm</string>
     <string name="cant_open_url">Unable to open the link</string>
     <string name="retry">Retry</string>
+    <string name="disable">Disable</string>
     <string name="invalid_ip_or_range">Invalid IP or IP range</string>
     <string name="copy_text">Copy</string>
     <string name="error_please_choose_browser">Error opening the default web browser. Please choose another app:</string>
@@ -113,7 +117,6 @@
 
     <string name="button_not_now">Not now</string>
 
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="at_username">\@%s</string>
 
     <string name="me">Me</string>
@@ -142,6 +145,7 @@
     <string name="wp_media_title">WordPress media</string>
     <string name="pick_photo">Select photo</string>
     <string name="pick_video">Select video</string>
+    <string name="pick_audio">Select audio</string>
     <string name="pick_media">Add image or video</string>
     <string name="pick_file">Add file</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
@@ -209,7 +213,7 @@
     <!-- Delete Media -->
     <string name="cannot_delete_multi_media_items">Some media can\'t be deleted at this time. Try again later.</string>
     <string name="cannot_retry_deleted_media_item">Media has been removed. Delete it from this post?</string>
-    <string name="cannot_retry_deleted_media_item_fatal">Media has been removed. Try editing your Story.</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media has been removed. Try re-creating your Story.</string>
     <string name="media_empty_list">You don\'t have any media</string>
     <string name="media_empty_search_list">No media matching your search</string>
     <string name="media_empty_image_list">You don\'t have any images</string>
@@ -303,6 +307,7 @@
     <string name="button_discard">Discard</string>
     <string name="button_retry">Retry</string>
     <string name="button_move_to_draft">Move to Draft</string>
+    <string name="button_copy">Duplicate</string>
 
     <!-- post uploads -->
     <string name="upload_failed_param">Upload failed for \"%s\"</string>
@@ -374,18 +379,18 @@
     <string name="dialog_confirm_autosave_restore_button">The version from another device</string>
     <string name="dialog_confirm_autosave_dont_restore_button">The version from this app</string>
 
+    <!-- post confirm copy local post dialog -->
+    <string name="dialog_confirm_copy_local_title">Post sync conflict</string>
+    <string name="dialog_confirm_copy_local_message">The post you are trying to copy has two versions that are in conflict or you recently made changes but didn\'t save them.\nEdit the post first to resolve any conflict or proceed with copying the version from this app.</string>
+    <string name="dialog_confirm_copy_local_edit_button">Edit the post first</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copy the version from this app</string>
+
     <!-- trash post with local changes dialog -->
     <string name="dialog_confirm_trash_losing_local_changes_title">Local changes</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Trashing this post will also discard local changes, are you sure you want to continue?</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_title">Unsaved changes</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Trashing this post will also discard unsaved changes, are you sure you want to continue?</string>
 
-    <!-- gutenberg informative dialog -->
-    <string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
-    <string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts, great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages, great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages but if you\'d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-
     <!-- reload drop down -->
     <string name="loading">Loading…</string>
 
@@ -393,6 +398,7 @@
     <string name="on">on</string>
     <string name="comment_status_approved">Approved</string>
     <string name="comment_status_unapproved">Pending</string>
+    <string name="comment_status_unreplied">Unreplied</string>
     <string name="comment_status_spam">Spam</string>
     <string name="comment_status_trash">Trashed</string>
     <string name="comment_status_all">All</string>
@@ -400,6 +406,7 @@
     <string name="comments_empty_list">No comments yet</string>
     <string name="comments_empty_list_filtered_approved">No approved comments</string>
     <string name="comments_empty_list_filtered_pending">No pending comments</string>
+    <string name="comments_empty_list_filtered_unreplied">No unreplied comments</string>
     <string name="comments_empty_list_filtered_spam">No spam comments</string>
     <string name="comments_empty_list_filtered_trashed">No trashed comments</string>
     <string name="comment_reply_to_user">Reply to %s</string>
@@ -614,10 +621,10 @@
     <string name="site_settings_sort_by_title">Sort by</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_paging_title">Paging</string>
-    <string name="site_settings_whitelist_title">Automatically approve</string>
+    <string name="site_settings_allowlist_title">Automatically approve</string>
     <string name="site_settings_multiple_links_title">Links in comments</string>
     <string name="site_settings_moderation_hold_title">Hold for Moderation</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
+    <string name="site_settings_denylist_title">Disallowed comments</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
     <string name="site_settings_timezones_error">Unable to load timezones</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
@@ -635,6 +642,7 @@
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Cannot save homepage settings before pages are loaded</string>
     <string name="site_settings_failed_update_homepage_settings">Homepage settings update failed, check your internet connection</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Selected homepage and page for posts cannot be the same.</string>
+    <string name="site_settings_timezones_manual_offsets" translatable="false">Manual Offsets</string>
 
     <!-- Media -->
     <string name="site_settings_quota_header">Media</string>
@@ -695,7 +703,7 @@
     <string name="jetpack_send_wp_notifications_title">Send push notifications</string>
     <string name="jetpack_prevent_brute_force_category_title">Brute force attack protection</string>
     <string name="jetpack_prevent_brute_force_title">Block malicious login attempts</string>
-    <string name="jetpack_brute_force_whitelist_title">Whitelisted IP addresses</string>
+    <string name="jetpack_brute_force_allowlist_title">Always allowed IP addresses</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com login</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Allow WordPress.com login</string>
     <string name="jetpack_match_wpcom_via_email_title">Match accounts using email</string>
@@ -706,9 +714,9 @@
     <string name="site_settings_privacy_hidden_summary">Hidden</string>
     <string name="site_settings_privacy_private_summary">Private</string>
     <string name="site_settings_threading_summary">%d levels</string>
-    <string name="site_settings_whitelist_all_summary">Comments from all users</string>
-    <string name="site_settings_whitelist_known_summary">Comments from known users</string>
-    <string name="site_settings_whitelist_none_summary" translatable="false">@string/none</string>
+    <string name="site_settings_allowlist_all_summary">Comments from all users</string>
+    <string name="site_settings_allowlist_known_summary">Comments from known users</string>
+    <string name="site_settings_allowlist_none_summary" translatable="false">@string/none</string>
     <string name="site_settings_optimize_images_summary">Enable to resize and compress pictures</string>
     <string name="site_settings_optimize_video_summary">Enable to resize and compress videos</string>
 
@@ -793,10 +801,10 @@
     <string name="site_settings_paging_hint">Display comments in chunks of a specified size</string>
     <string name="site_settings_identity_required_hint">Comment author must fill out name and e-mail</string>
     <string name="site_settings_user_account_required_hint">Users must be registered and logged in to comment</string>
-    <string name="site_settings_whitelist_hint">Comment author must have a previously approved comment</string>
+    <string name="site_settings_allowlist_hint">Comment author must have a previously approved comment</string>
     <string name="site_settings_multiple_links_hint">Ignores link limit from known users</string>
     <string name="site_settings_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
-    <string name="site_settings_blacklist_hint">Comments that match a filter are marked as spam</string>
+    <string name="site_settings_denylist_hint">Comments that match a filter are marked as spam</string>
 
     <!-- Related Posts -->
     <string name="site_settings_rp_switch_title">Show Related Posts</string>
@@ -815,7 +823,7 @@
     <string name="site_settings_learn_more_header" translatable="false">@string/learn_more</string>
     <string name="site_settings_learn_more_caption">You can override these settings for individual posts.</string>
 
-    <!-- List Editors (Blacklist, Hold for Moderation) -->
+    <!-- List Editors (Denylist, Hold for Moderation) -->
     <string name="site_settings_list_editor_summary_one">1 item</string>
     <string name="site_settings_list_editor_summary_other">%d items</string>
 
@@ -823,8 +831,8 @@
     <string name="site_settings_list_editor_no_items_text">No items</string>
     <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
     <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
-    <string name="site_settings_blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
-    <string name="site_settings_jetpack_whitelist_description">You may whitelist an IP address or series of addresses preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_denylist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+    <string name="site_settings_jetpack_allowlist_description">You may mark an IP address (or series of addresses) as \"Always allowed\", preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
 
     <!-- Dialogs -->
     <string name="site_settings_discussion_title" translatable="false">@string/discussion</string>
@@ -937,7 +945,7 @@
 
     <!-- Number suffixes -->
     <string name="negative_prefix">-%s</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="suffix_1_000_000">%sM</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
@@ -1008,27 +1016,173 @@
     <string name="login_to_to_connect_jetpack">Log in to the WordPress.com account you used to connect Jetpack.</string>
 
     <!-- activity log -->
-    <string name="activity">Activity</string>
     <string name="activity_log">Activity Log</string>
     <string name="activity_log_icon">Activity icon</string>
     <string name="activity_log_event">Event</string>
-    <string name="rewind">Rewind</string>
     <string name="activity_log_button">Activity Log action button</string>
     <string name="activity_log_jetpack_icon">Jetpack icon</string>
     <string name="activity_log_empty_title">No activity yet</string>
     <string name="activity_log_empty_subtitle">When you make changes to your site you\'ll be able to see your activity history here</string>
-    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRewinding to %1$s %2$s</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRewound to %1$s %2$s</string>
+    <string name="activity_log_active_filter_empty_title">No matching events found</string>
+    <string name="activity_log_active_filter_empty_subtitle">Try adjusting your date range or activity type filters</string>
+    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRestoring to %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRestored to %1$s %2$s</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Your site has been successfully restored</string>
+    <string name="activity_log_backup_started_snackbar_message">Your site is being backed up\nBacking up from %1$s %2$s</string>
+    <string name="activity_log_backup_finished_snackbar_message">Your site has been successfully backed up\nBacked up from %1$s %2$s</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Your site has been successfully backed up</string>
     <string name="activity_log_currently_restoring_title">Currently restoring your site</string>
-    <string name="activity_log_currently_restoring_message">Rewinding to %1$s %2$s</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rewind in progress</string>
-    <string name="activity_log_rewind_site">Rewind Site</string>
-    <string name="activity_log_rewind_dialog_message">Are you sure you want to rewind your site back to %1$s at %2$s? This will remove all content and options created or changed since then.</string>
+    <string name="activity_log_currently_restoring_message">Restoring to %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restore in progress</string>
+    <string name="activity_log_currently_backing_up_title">Creating downloadable backup</string>
+    <string name="activity_log_currently_backing_up_message">Backing up site from %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Backing up site</string>
     <string name="activity_log_limited_content_on_free_plan">Since you\'re on a free plan, you\'ll see limited events in your activity.</string>
+    <string name="activity_log_activity_type_filter_header">Filter by Activity Type</string>
+    <string name="activity_log_activity_type_filter_apply">Apply</string>
+    <string name="activity_log_activity_type_filter_clear">Clear</string>
+    <string name="activity_log_date_range_filter_label">Date Range</string>
+    <string name="activity_log_date_range_filter_label_content_description">Date Range filter</string>
+    <string name="activity_log_activity_type_filter_label">Activity Type</string>
+    <string name="activity_log_activity_type_filter_active_label">Activity Type (%s)</string>
+    <string name="activity_log_activity_type_error_title">No connection</string>
+    <string name="activity_log_activity_type_error_subtitle">Please check your internet connection and retry.</string>
+    <string name="activity_log_activity_type_empty_title">No activities available</string>
+    <string name="activity_log_activity_type_empty_subtitle">No activities recorded in the selected date range.</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Activity Type filter</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (showing %s items)</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Activity Type filter (%s types selected)</string>
+
+    <!-- activity log list popup menu -->
+    <string name="activity_log_item_menu_restore_label">Restore to this point</string>
+    <string name="activity_log_item_menu_download_backup_label">Download backup</string>
+
+    <!-- activity log list backup download notice -->
+    <string name="activity_log_backup_download_notice_description_with_two_params" translatable="false">@string/backup_download_complete_description_with_two_parameters</string>
+    <string name="activity_log_backup_download_notice_download_action">Download</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Dismiss</string>
+
+    <!-- backup -->
+    <string name="backup">Backup</string>
+    <string name="backup_empty_title">Your first backup will be ready soon</string>
+    <string name="backup_empty_subtitle">Your first backup will appear here within 24 hours and you will receive a notification once the backup has been completed</string>
+    <string name="backup_active_filter_empty_title">No matching backups found</string>
+    <string name="backup_active_filter_empty_subtitle">Try adjusting your date range</string>
 
     <!-- scan -->
     <string name="scan">Scan</string>
+    <string name="scan_history">Scan History</string>
+    <string name="scan_history_menu_title">History</string>
+
+    <string name="scan_no_network_title" translatable="false">@string/no_network_title</string>
+    <string name="scan_no_network_subtitle" translatable="false">@string/no_network_message</string>
+    <string name="scan_request_failed_title">Something went wrong</string>
+    <string name="scan_request_failed_subtitle" translatable="false">@string/request_failed_message</string>
+    <string name="scan_start_request_failed_title" translatable="false">@string/scan_request_failed_title</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan couldn\'t complete a scan of your site. Please check to see if your site is down – if it\'s not, try again. If it is, or if Jetpack Scan is still having problems, contact our support team.</string>
+
+    <string name="scan_state_icon">Scan state icon</string>
+    <string name="scan_now">Scan now</string>
+    <string name="scan_again">Scan again</string>
+    <string name="scan_preparing_to_scan_title">Preparing to scan</string>
+    <string name="scan_scanning_title">Scanning files</string>
+    <string name="scan_idle_no_threats_found_title">Don\'t worry about a thing</string>
+    <string name="scan_idle_threats_found_title">Your site may be at risk</string>
+    <string name="scan_fixing_threats_title_plural">Fixing Threats</string>
+    <string name="scan_fixing_threats_title_singular">Fixing Threat</string>
+    <string name="scan_scanning_description">We will send you a notification once the scan is complete. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_fixing_threats_description_plural">We\'re hard at work in the background fixing these threats. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_fixing_threats_description_singular">We\'re hard at work in the background fixing this threat. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_scanning_is_initial_description">Welcome to Jetpack Scan, we are taking a first look at your site now and the results will be with you soon.</string>
+    <string name="scan_provisioning_description">Welcome to Jetpack Scan! We\'re scoping out your site, setting up to do a full scan. We\'ll let you know if we spot any issues that might impact a scan, then your first full scan will start.</string>
+    <string name="scan_idle_manual_scan_description">To review your site again run a manual scan, or wait for Jetpack to scan your site later today.</string>
+    <string name="scan_idle_last_scan_description">The last Jetpack scan ran %s and did not find any risks. %s</string>
+    <!-- translators: %3$s: "here to help" clickable text linking to help screen inside the app. -->
+    <string name="scan_idle_threats_description_plural">The scan found %1$s potential threats with %2$s. Please review them below and take action or tap the fix all button. We are %3$s if you need us.</string>
+    <!-- translators: %2$s: "here to help" clickable text linking to help screen inside the app. -->
+    <string name="scan_idle_threats_description_singular">The scan found one potential threat with %1$s. Please review the threat below and take action or tap the fix all button. We are %2$s if you need us.</string>
+    <string name="scan_here_to_help">here to help</string>
+    <string name="scan_this_site">this site</string>
+    <string name="scan_in_hours_ago">%s hour(s) ago</string>
+    <string name="scan_in_minutes_ago">%s minute(s) ago</string>
+    <string name="scan_in_few_seconds">a few seconds ago</string>
+    <string name="scan_progress_label" translatable="false">%1$s%%</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; No threats found</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; One potential threat found</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; %s potential threats found</string>
+
+    <!-- scan history -->
+    <string name="scan_history_all_threats_tab">All</string>
+    <string name="scan_history_fixed_threats_tab">Fixed</string>
+    <string name="scan_history_no_threats_found">No items found</string>
+    <string name="scan_history_ignored_threats_tab">Ignored</string>
+    <string name="scan_history_no_connection" translatable="false">@string/no_network_message</string>
+    <string name="scan_history_request_failed" translatable="false">@string/request_failed_message</string>
+
+    <!-- threats -->
+    <string name="threats_fix_all">Fix All</string>
+    <string name="threats_found_plural">Threats found</string>
+    <string name="threats_found_singular">Threat found</string>
+    <string name="threat_fixing">Fixing threat</string>
+
+    <!-- threat item header -->
+    <string name="threat_item_header_threat_found">Threat found</string>
+    <string name="threat_item_header_infected_core_file">%s: infected core file</string>
+    <string name="threat_item_header_database_threat">Database %s threats</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: malicious code pattern</string>
+    <string name="threat_item_header_vulnerable_plugin">Vulnerable Plugin: %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_theme">Vulnerable Theme: %s (version %s)</string>
+
+    <!-- threat item sub header -->
+    <string name="threat_item_sub_header_misc_vulnerability">Miscellaneous vulnerability</string>
+    <string name="threat_item_sub_header_core_file">Vulnerability found in WordPress</string>
+    <string name="threat_item_sub_header_file_signature">Threat found %s</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerability found in plugin</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerability found in theme</string>
+    <string name="threat_item_sub_header_status_fixed_on">Threat fixed on %s</string>
+    <string name="threat_item_sub_header_status_ignored">Threat ignored</string>
+
+    <!-- threat details -->
+    <string name="threat_details">Threat Details</string>
+    <string name="threat_problem_header">What was the problem?</string>
+    <string name="threat_found_header">Found</string>
+    <string name="threat_technical_details_header">The technical details</string>
+    <string name="threat_file_description">Threat found in file:</string>
+    <string name="threat_status_fixed">Fixed</string>
+    <!-- threat fix -->
+    <string name="threat_fix_default_header">How will we fix it?</string>
+    <string name="threat_fix_fixed_header">How did Jetpack fix it?</string>
+    <string name="threat_fix_current_fixable_header" translatable="false">@string/threat_fix_default_header</string>
+    <string name="threat_fix_current_not_fixable_header">Resolving the threat</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan cannot automatically fix this threat.
+        We suggest that you resolve the threat manually: ensure that WordPress, your theme, and all of your plugins are up to date, and remove the offending code, theme, or plugin from your site. \n \n
+        If you need more help to resolve this threat, we recommend &lt;b&gt;Codeable&lt;/b&gt;, a trusted freelancer marketplace of highly vetted WordPress experts.
+        They have identified a select group of security experts to help with these projects. Pricing ranges from $70–120/hour, and you can get a free estimate with no obligation to hire.
+    </string>
+    <!-- threat fixable -->
+    <string name="threat_fix_fixable_replace">Jetpack Scan will replace the affected file or directory.</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan will delete the affected file or directory.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan will update to a newer version (%s).</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan will edit the affected file or directory.</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan will resolve the threat.</string>
+    <!-- threat button labels -->
+    <string name="threat_fix">Fix threat</string>
+    <string name="threat_ignore">Ignore threat</string>
+    <string name="threat_get_free_estimate">Get a free estimate</string>
+    <!-- threat alert messages -->
+    <string name="threat_fix_error_message">Error fixing threat. Please contact our support.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Enter your server credentials to fix threat.</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Enter your server credentials to fix threats.</string>
+    <string name="threat_ignore_warning">You shouldn\’t ignore a security issue unless you are absolute sure it\’s harmless. If you choose to ignore this threat, it will remain on your site &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_ignore_success_message">Threat ignored.</string>
+    <string name="threat_ignore_error_message">Error ignoring threat. Please contact support.</string>
+    <string name="threat_fix_all_warning_title">Fix all threats</string>
+    <string name="threat_fix_all_confirmation_message_plural">Please confirm you want to fix all %s active threats.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Please confirm you want to fix one active threat.</string>
+    <string name="threat_fix_all_error_message">Error fixing threats. Please contact our support.</string>
+    <string name="threat_fix_all_status_success_message_plural">Threats were successfully fixed.</string>
+    <string name="threat_fix_all_status_success_message_singular">Threat was successfully fixed.</string>
+    <string name="threat_fix_all_status_error_message">Error getting fix status. Please contact our support.</string>
 
     <!-- stats: labels for timeframes -->
     <string name="stats_timeframe_today">Today</string>
@@ -1223,12 +1377,12 @@
 
     <!-- Notification Settings -->
     <string name="notification_settings">Notification Settings</string>
-    <string name="notification_settings_master_status_on">On</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_hint_on">Disable notifications</string>
-    <string name="notification_settings_master_hint_off">Enable notifications</string>
-    <string name="notification_settings_master_off_title">To receive notifications on this device, turn Notification Settings on.</string>
-    <string name="notification_settings_master_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
+    <string name="notification_settings_main_status_on">On</string>
+    <string name="notification_settings_main_status_off">Off</string>
+    <string name="notification_settings_main_hint_on">Disable notifications</string>
+    <string name="notification_settings_main_hint_off">Enable notifications</string>
+    <string name="notification_settings_main_off_title">To receive notifications on this device, turn Notification Settings on.</string>
+    <string name="notification_settings_main_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
     <string name="notification_settings_category_followed_sites">Followed Sites</string>
     <string name="notification_settings_category_your_sites">Your Sites</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">All My Followed Sites</string>
@@ -1267,15 +1421,15 @@
     <string name="notification_settings_followed_dialog_email_comments">Email me new comments</string>
     <string name="notification_settings_followed_dialog_title">Notifications</string>
 
-    <string name="notifications_tab_dialog_master_status_on">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Disable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_hint_off">Enable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifications for this site</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifications for this site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Disable notifications display on notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_hint_off">Enable notifications display on notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
+    <string name="notifications_tab_dialog_main_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
 
-    <string name="master_switch_default_title_on">On</string>
-    <string name="master_switch_default_title_off">Off</string>
+    <string name="main_switch_default_title_on">On</string>
+    <string name="main_switch_default_title_off">Off</string>
 
     <string name="comments_on_my_site">Comments on my site</string>
     <string name="likes_on_my_comments">Likes on my comments</string>
@@ -1316,6 +1470,16 @@
         <item>@string/notif_events</item>
     </string-array>
 
+    <!-- likes -->
+    <string name="get_likes_no_network_error">No network available.</string>
+    <string name="get_likes_unknown_error">An unknown error occurred while getting likes.</string>
+    <string name="get_likes_empty_state_title">An error occurred while getting likes data</string>
+    <string name="like_title_singular">1 Like</string>
+    <string name="like_title_plural">%d Likes</string>
+    <string name="like_faces_singular_text">1 blogger likes this.</string>
+    <string name="like_faces_plural_text">%d bloggers like this.</string>
+    <string name="like_faces_error_loading_message">Error loading like data. %s.</string>
+
     <!-- reader -->
     <string name="reader">Reader</string>
     <string name="reader_filter_cta">Filter</string>
@@ -1337,8 +1501,23 @@
     <string name="reader_discover_recommended_blogs_header">Sites to follow</string>
     <string name="reader_post_details_header_by_author_name">By</string>
     <string name="show_n_hidden_items_desc">%1$s more items</string>
-    <string name="reader_discover_empty_title">Follow topics to discover new blogs</string>
+    <string name="reader_discover_empty_title">Welcome!</string>
+    <string name="reader_discover_empty_subtitle">Follow topics to discover new blogs</string>
+    <string name="reader_discover_no_posts_title">No recent posts</string>
+    <string name="reader_discover_no_posts_subtitle">Try following more topics to broaden the search</string>
     <string name="reader_discover_empty_button_text">Get Started</string>
+    <string name="reader_discover_no_posts_button_text">Follow topics</string>
+    <string name="reader_author_with_blog_name" translatable="false">%1$s ▸ %2$s</string>
+    <string name="reader_follow_comments_null_response">No response received</string>
+    <string name="reader_follow_comments_bad_format_response">Invalid response received</string>
+    <string name="reader_follow_comments_subscribe_success">Successfully subscribed to the comments</string>
+    <string name="reader_follow_comments_unsubscribe_success">Successfully unsubscribed from the comments</string>
+    <string name="reader_follow_comments_get_status_error">Error fetching subscription status for post</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Could not subscribe to comments for this post</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Could not unsubscribe from comments for this post</string>
+    <string name="reader_marked_post_as_seen">Marked post as seen</string>
+    <string name="reader_marked_post_as_unseen">Marked post as unseen</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Can\'t toggle seen status of this post</string>
 
     <!-- editor -->
     <string name="editor_post_saved_online">Post saved online</string>
@@ -1405,12 +1584,6 @@
     <string name="calendar_scheduled_post_title">WordPress Scheduled Post: \"%s\"</string>
     <string name="calendar_scheduled_post_description">\"%s\" scheduled for publishing on \"%s\" in your WordPress app \n %s</string>
 
-    <!-- location -->
-    <string name="post_settings_location">Location</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Can\'t open the Location Picker, Google Play Services is not available</string>
-    <string name="remove_location">Remove Location</string>
-    <string name="change_location">Change Location</string>
-
     <!-- Post Status -->
     <string name="post_status_publish_post">Publish</string>
     <string name="post_status_pending_review">Pending review</string>
@@ -1427,6 +1600,11 @@
         <item>@string/post_status_post_private</item>
     </string-array>
 
+    <string-array name="post_settings_homepage_statuses" translatable="false">
+        <item>@string/post_status_publish_post</item>
+        <item>@string/post_status_post_private</item>
+    </string-array>
+
     <!-- Aztec -->
     <string name="editor_content_hint">Share your story here…</string>
 
@@ -1450,7 +1628,6 @@
     <string name="menu_undo">Undo</string>
     <string name="menu_redo">Redo</string>
     <string name="menu_debug">Debug Menu</string>
-    <string name="menu_switch_to_aztec_editor">Switch to classic editor</string>
     <string name="menu_switch_to_gutenberg_editor">Switch to block editor</string>
     <string name="menu_content_info">Content structure</string>
 
@@ -1624,6 +1801,8 @@
     <string name="error_media_canceled">Uploading media were canceled</string>
     <string name="error_media_quota_exceeded">Storage quota exceeded</string>
     <string name="error_media_quota_exceeded_toast">Cannot upload file.\nStorage quota was exceeded.</string>
+    <string name="error_media_not_enough_storage">Not enough available site storage</string>
+    <string name="error_media_upload_failed_for_reason">Media upload failed.\n%1$s</string>
     <string name="error_media_xmlrpc_not_allowed">Your action is not allowed</string>
     <string name="error_media_xmlrcp_server_error">Internal server error occurred</string>
     <string name="error_post_does_not_exist">This post no longer exists</string>
@@ -1712,9 +1891,11 @@
     <string name="reader_title_blog_preview">Reader Site</string>
     <string name="reader_title_tag_preview">Topic</string>
     <string name="reader_title_post_detail">Reader Post</string>
+    <string name="reader_title_related_post_detail">Related Post</string>
     <string name="reader_title_subs">Manage Topics &amp; Sites</string>
     <string name="reader_title_photo_viewer">%1$d of %2$d</string>
     <string name="reader_title_comments" translatable="false">@string/comments</string>
+    <string name="reader_title_interests">Follow topics</string>
 
     <!-- view pager titles -->
     <string name="reader_page_followed_tags">Followed topics</string>
@@ -1724,6 +1905,8 @@
     <string name="reader_menu_tags">Edit topics and sites</string>
     <string name="reader_menu_block_blog">Block this site</string>
     <string name="reader_menu_report_post">Report this post</string>
+    <string name="reader_menu_mark_as_seen">Mark as seen</string>
+    <string name="reader_menu_mark_as_unseen">Mark as unseen</string>
 
     <!-- button text -->
     <string name="reader_btn_share">Share</string>
@@ -1731,22 +1914,20 @@
     <string name="reader_btn_unfollow">Following</string>
     <string name="reader_add_bookmark">Add to saved posts</string>
     <string name="reader_remove_bookmark">Remove from saved posts</string>
-    <string name="reader_btn_bookmark">Save</string>
-    <string name="reader_btn_bookmarked">Saved</string>
     <string name="reader_bookmark_snack_btn">View All</string>
     <string name="reader_bookmark_snack_title">Post saved</string>
     <string name="reader_btn_notifications_off">Turn off site notifications</string>
     <string name="reader_btn_notifications_on">Turn on site notifications</string>
     <string name="reader_btn_select_few_interests">Select a few to continue</string>
     <string name="reader_btn_done">Done</string>
-
+    <string name="reader_btn_follow_comments">Follow conversation by email</string>
+    <string name="reader_btn_following_comments">Following conversation by email</string>
 
     <!-- accessibility content desciptions -->
     <string name="reader_btn_remove_filter_content_description">Remove the current filter</string>
     <string name="reader_btn_select_filter_content_description">Select a Site or Tag to filter posts</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selected</string>
     <string name="reader_bottom_sheet_content_description">Select a Tag or Site, Pop Up Window</string>
-    <string name="reader_choose_interests_content_description">Choose your interests</string>
+    <string name="reader_choose_interests_content_description">Choose your topics</string>
 
     <string name="reader_followed_blog_notifications">Enable notifications for %1$s%2$s%3$s?</string>
     <string name="reader_followed_blog_notifications_action">Enable</string>
@@ -1771,10 +1952,10 @@
     <string name="reader_label_follow_count">%,d Followers</string>
     <string name="reader_label_gap_marker">Load more posts</string>
     <string name="reader_label_post_search_explainer">What would you like to find?</string>
-    <string name="reader_label_local_related_posts">More in %s</string>
+    <string name="reader_label_local_related_posts">More from %s</string>
     <string name="reader_label_global_related_posts">More on WordPress.com</string>
     <string name="reader_label_visit">Visit site</string>
-    <string name="reader_label_choose_your_interests">Choose your interests</string>
+    <string name="reader_label_choose_your_interests">Choose your topics</string>
     <string name="reader_view_comments">View comments</string>
     <string name="reader_welcome_banner">Welcome to Reader. Discover millions of blogs at your fingertips.</string>
     <string name="reader_label_toolbar_back">Back</string>
@@ -1901,7 +2082,6 @@
 
     <!-- Help view -->
     <string name="help">Help</string>
-    <string name="forgot_password" tools:ignore="UnusedResources">Lost your password?</string>
     <string name="browse_our_faq_button">Browse our FAQ</string>
     <string name="my_tickets">My Tickets</string>
     <string name="application_log_button">Application log</string>
@@ -1909,13 +2089,19 @@
     <string name="support_contact_email_not_set">Not set</string>
     <string name="support_push_notification_title">WordPress</string>
     <string name="support_push_notification_message">New message from \'Help &amp; Support\'</string>
-    <string name="contact_fragment_title">@string/contact_support</string>
+    <string name="contact_fragment_title" translatable="false">@string/contact_support</string>
+
+    <!-- Contact us -->
+    <!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
+    <string name="support_ticket_subject" translatable="false">WordPress for Android Support</string>
 
     <!--My Site-->
     <string name="my_site_header_external">External</string>
     <string name="my_site_header_configuration">Configuration</string>
     <string name="my_site_header_look_and_feel">Look and Feel</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
     <string name="my_site_header_publish">Publish</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack Settings</string>
     <string name="my_site_btn_site_pages">Site Pages</string>
     <string name="my_site_btn_blog_posts">Blog Posts</string>
     <string name="my_site_btn_sharing">Sharing</string>
@@ -1928,7 +2114,6 @@
     <string name="my_site_create_new_site">Create a new site for your business, magazine, or personal blog; or connect an existing WordPress installation.</string>
     <string name="my_site_create_new_site_title">You don\'t have any sites</string>
     <string name="my_site_add_new_site">Add new site</string>
-    <string name="my_site_select_domains_page_title">Site Address</string>
     <string name="my_site_custom_domain_name">All WordPress.com plans include a custom domain name. Register your free premium domain now.</string>
     <string name="my_site_verify_your_email">Verify your email address - instructions sent to %s</string>
     <string name="my_site_verify_your_email_without_email">Verify your email address - instructions sent to your email</string>
@@ -2082,7 +2267,7 @@
     <string name="viewer_remove_confirmation_message">If you remove this viewer, he or she will not be able to visit this site.\n\nWould you still like to remove this viewer?</string>
     <string name="person_removed">Successfully removed %1$s</string>
     <string name="invite_people">Invite People</string>
-    <string name="invite_names_title">Usernames or Emails</string>
+    <string name="invite_names_title">Usernames or emails</string>
     <string name="invite">Invite</string>
     <string name="button_invite" translatable="false">@string/invite</string>
     <string name="invite_username_not_found">%s: User not found</string>
@@ -2090,11 +2275,7 @@
     <string name="invite_already_following">%s: Already following</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
-    <string name="invite_message_title">Custom Message</string>
-    <string name="invite_message_remaining_zero">0 characters remaining</string>
-    <string name="invite_message_remaining_one">1 character remaining</string>
-    <string name="invite_message_remaining_other">%d characters remaining</string>
-    <string name="invite_message_info">(Optional) You can enter a custom message of up to 500 characters that will be included in the invitation to the user(s).</string>
+    <string name="invite_message_title">Custom message</string>
     <string name="invite_message_usernames_limit">Invite up to 10 email addresses and/or WordPress.com usernames. Those needing a username will be sent instructions on how to create one.</string>
     <string name="invite_error_no_usernames">Please add at least one username</string>
     <string name="invite_error_invalid_usernames_one">Cannot send: A username or email is invalid</string>
@@ -2104,6 +2285,9 @@
     <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_sent">Invite sent successfully</string>
 
+    <string name="people_learn_more_about_roles">Learn more about roles</string>
+    <string name="people_optional_custom_message_helper_text">Optional: enter a custom message to be sent with your invitation.</string>
+
     <string name="people_dropdown_item_team">Team</string>
     <string name="people_dropdown_item_followers">Followers</string>
     <string name="people_dropdown_item_email_followers">Email Followers</string>
@@ -2119,6 +2303,21 @@
     <string name="role_follower">Follower</string>
     <string name="role_viewer">Viewer</string>
 
+    <string name="invite_links_section_title">Invite Link</string>
+    <string name="invite_links_get_status_retry">Refresh links status</string>
+    <string name="invite_links_generate">Generate new link</string>
+    <string name="invite_links_share_invite_link">Share invite link</string>
+    <string name="invite_links_disable_invite_link">Disable invite link</string>
+    <string name="invite_links_expire_date">Expires %1$s</string>
+    <string name="invite_links_helper_text">Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted people.</string>
+    <string name="invite_links_generic_get_data_error">Unknown error fetching invite links data</string>
+    <string name="invite_links_cannot_get_roles_error">There was an error getting roles</string>
+    <string name="invite_links_cannot_get_role_data_error">There was an error getting data for role %1$s</string>
+    <string name="invite_links_null_response">No response received</string>
+    <string name="invite_links_bad_format_response">Invalid response received</string>
+    <string name="invite_links_disable_dialog_title">Disable invite link</string>
+    <string name="invite_links_disable_dialog_message">Once this invite link is disabled, nobody will be able to use it to join your team. Are you sure?</string>
+
     <!--Plugins-->
     <string name="plugins">Plugins</string>
     <string name="plugin_byline">by %s</string>
@@ -2316,9 +2515,14 @@
     <string name="edit">Edit</string>
     <string name="tap_to_try_again">Tap to try again!</string>
     <string name="add_media_progress">Adding media</string>
-    <string name="suggestion_invalid_user">"%s is not a valid user"</string>
-    <string name="suggestion_no_matching_users">"No matching users available."</string>
-    <string name="suggestion_no_connection">"No internet connection.\nSuggestions are unavailable."</string>
+    <string name="suggestion_invalid">%s is not a valid %s</string>
+    <string name="suggestion_selection_needed">Please type to filter the list of suggestions.</string>
+    <string name="suggestion_none">No %s suggestions available.</string>
+    <string name="suggestion_problem">There was a problem loading suggestions.</string>
+    <string name="suggestion_no_matching">No matching %s.</string>
+    <string name="suggestion_no_connection">No internet connection.\nSuggestions are unavailable.</string>
+    <string name="suggestion_user">user</string>
+    <string name="suggestion_xpost">crosspost</string>
 
     <string name="stop_upload_dialog_title">Stop uploading?</string>
 
@@ -2342,6 +2546,7 @@
     <string name="photo_picker_choose_photo">Choose photo from device</string>
     <string name="photo_picker_choose_video">Choose video from device</string>
     <string name="photo_picker_choose_file">Choose from device</string>
+    <string name="photo_picker_choose_audio">Choose audio from device</string>
     <string name="photo_picker_capture_photo">Take photo</string>
     <string name="photo_picker_capture_video">Take video</string>
     <string name="photo_picker_stock_media">Choose from Free Photo Library</string>
@@ -2352,6 +2557,7 @@
     <string name="photo_picker_soft_ask_permissions_denied">%1$s was denied access to your photos. To fix this, edit your permissions and turn on %2$s.</string>
     <string name="photo_picker_use_photo">Use this photo</string>
     <string name="photo_picker_use_video">Use this video</string>
+    <string name="photo_picker_use_audio">Use this audio</string>
     <string name="photo_picker_use_media">Use this media</string>
     <string name="photo_picker_use_gif">Use this GIF</string>
     <string name="photo_picker_image_thumbnail_content_description">Image Thumbnail</string>
@@ -2409,7 +2615,7 @@
     <string name="login_prologue_title_second">With the powerful editor you can post on the go.</string>
     <string name="login_prologue_title_third">See comments and notifications in real time.</string>
     <string name="login_prologue_title_fourth">Watch your audience grow with in-depth analytics.</string>
-    <string name="login_prologue_title_fifth">Follow your favorite sites and discover new reads.</string>
+    <string name="login_prologue_title_fifth">Follow your favorite sites and discover new blogs.</string>
     <string name="login_prologue_second_subtitle_one">Getting Inspired</string>
     <string name="login_prologue_second_subtitle_two">I am so inspired by photographer Cameron Karsten\’s work. I will be trying these techniques on my next</string>
     <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; liked your post</string>
@@ -2428,21 +2634,15 @@
     <string name="login_prologue_fifth_caption_two">The World\'s Best Fans</string>
     <string name="login_prologue_fifth_caption_three">Museums in London</string>
     <string name="invalid_verification_code">Invalid verification code</string>
-    <string name="send_link" tools:ignore="UnusedResources">Send link</string>
-    <string name="enter_your_password_instead" tools:ignore="UnusedResources">Enter your password instead</string>
     <string name="send_link_by_email">Send link by email</string>
     <string name="create_account">Create account</string>
     <string name="or_type_your_password">Or type your password</string>
-    <string name="alternatively">Alternatively:</string>
     <string name="enter_email_wordpress_com">Log in to WordPress.com using an email address to manage all your WordPress sites.</string>
     <string name="enter_email_to_continue_wordpress_com">Enter your email address to log in or create a WordPress.com account.</string>
     <string name="enter_email_for_site">Log in with WordPress.com to connect to %1$s</string>
     <string name="get_started">Get Started</string>
     <string name="next">Next</string>
-    <string name="open_mail" tools:ignore="UnusedResources">Open mail</string>
     <string name="check_email">Check email</string>
-    <string name="enter_site_address_instead">Log in by entering your site address.</string>
-    <string name="enter_username_instead">Log in with your username.</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
     <string name="enter_verification_code_sms">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>
     <string name="login_text_otp">Text me a code instead</string>
@@ -2454,6 +2654,7 @@
     <string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from WordPress.com.</string>
     <string name="login_magic_link_email_requesting">Requesting log-in email</string>
     <string name="magic_link_not_seeing_email_message">Not seeing the email? Check your Spam or Junk Mail folder.</string>
+    <string name="magic_link_not_meaning_to_create_account">Didn\'t mean to create a new account? Go back to re-enter your email address.</string>
     <string name="login_get_link_by_email">Get a login link by email</string>
     <string name="enter_wpcom_password">Enter your WordPress.com password.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
@@ -2465,11 +2666,11 @@
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="enter_site_address_share_intent">Enter the address of your WordPress site you\'d like to share the content to.</string>
     <string name="login_site_address">Site address</string>
-    <string name="login_site_address_help" tools:ignore="UnusedResources">Need help finding your site address?</string>
     <string name="login_site_address_help_title">What\'s my site address?</string>
     <string name="login_site_address_help_content">Your site address appears in the bar at the top of the screen when you visit your site in Chrome.</string>
     <string name="login_site_address_more_help">Need more help?</string>
     <string name="login_find_your_site_adress">Find your site address</string>
+    <string name="login_find_your_connected_email">Find your connected email</string>
     <string name="login_checking_site_address">Checking site address</string>
     <string name="login_error_while_adding_site">Error while adding site. Error code: %s</string>
     <string name="login_log_in_for_deeplink">Log in to WordPress.com to access the post.</string>
@@ -2478,12 +2679,11 @@
     <string name="login_empty_username">Please enter a username</string>
     <string name="login_empty_password">Please enter a password</string>
     <string name="login_empty_2fa">Please enter a verification code</string>
-    <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="login_email_client_not_found">Can\'t detect your email client app</string>
     <string name="login_epilogue_mysites_one">My site</string>
     <string name="login_epilogue_mysites_other">My sites</string>
-    <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="continue_google_button_suffix">Continue with Google</string>
+    <string name="continue_site_credentials">Continue with store credentials</string>
     <string name="login_or">or</string>
     <string name="login_error_button">Close</string>
     <string name="login_error_email_not_found_v2">There\'s no WordPress.com account matching this Google account.</string>
@@ -2492,17 +2692,20 @@
     <string name="login_error_generic_start">Google login could not be started.</string>
     <string name="login_error_suffix">\nMaybe try a different account?</string>
     <string name="enter_wpcom_or_jetpack_site">Please enter a WordPress.com or Jetpack-connected self-hosted WordPress site</string>
-    <string name="enter_wordpress_site">The website at this address is not a WordPress site. For us to connect to it, the site must have WordPress installed.</string>
-    <string name="login_need_help_finding_connected_email">Need help finding the email you connected with?</string>
-    <string name="send_verification_email">Send verification email</string>
     <string name="enter_credentials_for_site" tools:ignore="UnusedResources">Log in with your %1$s site credentials</string>
     <string name="enter_account_info_for_site">Enter your account information for %1$s.</string>
-    <string name="enter_site_credentials_instead">Log in with site credentials.</string>
     <string name="login_site_credentials_magic_link_label">Almost there! We just need to verify your Jetpack connected email address &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="login_discovery_error_xmlrpc">We were unable to access the &lt;b&gt;XMLRPC file&lt;/b&gt; on your site. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_http_auth">We were unable to access your site because it requires &lt;b&gt;HTTP Authentication&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b&gt;SSL Certificate&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_generic">We were unable to access your site. You will need to reach out to your host to resolve this.</string>
+    <string name="login_not_a_jetpack_site">To use this app for %1$s you\'ll need to have the Jetpack plugin installed and connected to your WordPress.com account.</string>
+    <string name="login_no_jetpack_sites">No Jetpack sites found</string>
+    <string name="login_empty_view_avatar_content_description">Your profile photo</string>
+    <string name="login_no_jetpack_sites_error_message">If you already have a site, you\'ll need to install the free Jetpack plugin and connect it to your WordPress.com account.</string>
+    <string name="login_empty_view_see_instructions">See instructions</string>
+    <string name="login_empty_view_try_another_account">Try with another account</string>
+
     <!-- Screen titles -->
     <string name="email_address_login_title">Email address login</string>
     <string name="site_address_login_title">Site address login</string>
@@ -2513,9 +2716,6 @@
 
     <!-- Signup -->
     <string name="sign_up_label">Sign Up</string>
-    <string name="sign_up">Sign Up for WordPress.com</string>
-    <string name="signup_email_error_generic">There was some trouble checking the email address.</string>
-    <string name="signup_email_header">To create your new WordPress.com account, please enter your email address.</string>
     <string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
     <string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
     <string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
@@ -2531,22 +2731,17 @@
     <string name="signup_magic_link_message">We’ve emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.</string>
     <string name="signup_magic_link_progress">Sending email</string>
     <string name="signup_confirmation_message">We’ll use this email address to create your new WordPress.com account.</string>
-    <string name="signup_confirmation_magic_link_message">We’ll email you a signup link to create your new WordPress.com account.</string>
-    <string name="signup_terms_of_service_text">By signing up, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_terms_of_service_text">By continuing, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_with_google_terms_of_service_text">If you continue with Google and don\'t already have a WordPress.com account, you are creating an account and you agree to our %1$sTerms of Service%2$s.</string>
     <string name="signup_updating_account">Updating account…</string>
     <string name="signup_user_exists">Email already exists on WordPress.com.\nProceeding with login.</string>
-    <string name="signup_with_email_button">Sign Up with Email</string>
-    <string name="signup_with_google_button">Sign Up with Google</string>
     <string name="signup_with_google_progress">Signing up with Google…</string>
     <string name="content_description_add_avatar">Add avatar</string>
     <!-- Screen titles -->
-    <string name="signup_email_screen_title">Email signup</string>
     <string name="signup_magic_link_title">Magic link sent</string>
     <string name="signup_confirmation_title">Signup confirmation</string>
 
-    <string name="continue_with_wpcom">Continue with WordPress.com</string>
+    <string name="continue_with_wpcom">Log in or sign up with WordPress.com</string>
     <string name="enter_your_site_address">Enter your existing site address</string>
 
     <string name="username_changer_action">Save</string>
@@ -2660,28 +2855,17 @@
     <string name="quick_start_remove_next_steps_menu_title">Remove this</string>
     <string name="quick_start_dialog_remove_next_steps_title">Remove Next Steps</string>
     <string name="quick_start_dialog_remove_next_steps_message">Removing Next Steps will hide all tours on this site. This action cannot be undone.</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore dozens of layout options and find your perfect fit.</string>
-    <string name="quick_start_dialog_browse_themes_message_short" tools:ignore="UnusedResources">Tap %1$s Themes %2$s to discover new themes</string>
-    <string name="quick_start_dialog_browse_themes_title">Browse themes</string>
     <string name="quick_start_dialog_check_stats_message">Keep up to date on your site\'s performance.</string>
     <string name="quick_start_dialog_check_stats_title">Check your site stats</string>
-    <string name="quick_start_dialog_choose_theme_title">Choose a theme</string>
-    <string name="quick_start_dialog_choose_theme_message">Browse all our themes to find your perfect fit.</string>
-    <string name="quick_start_dialog_create_page_message">Add a page for key content — an \"About\" page is a great start.</string>
-    <string name="quick_start_dialog_create_page_title">Create a new page</string>
-    <string name="quick_start_dialog_customize_site_message">Tweak fonts, add images, and more.</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tap %1$s Customize %2$s to start personalizing your site</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes" tools:ignore="UnusedResources">Tap %1$s Themes %2$s to continue</string>
-    <string name="quick_start_dialog_customize_site_title">Customize your site</string>
-    <string name="quick_start_dialog_enable_sharing_message">Automatically share new posts to your social media accounts.</string>
+    <string name="quick_start_dialog_enable_sharing_message" tools:ignore="UnusedResources">Automatically share new posts to your social media accounts.</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Tap the %1$s Connections %2$s to add your social media accounts</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing" tools:ignore="UnusedResources">Tap %1$s Sharing %2$s to continue</string>
-    <string name="quick_start_dialog_enable_sharing_title">Enable post sharing</string>
+    <string name="quick_start_dialog_enable_sharing_title" tools:ignore="UnusedResources">Enable post sharing</string>
     <string name="quick_start_dialog_explore_plans_message">Learn about the marketing and SEO tools in our paid plans.</string>
     <string name="quick_start_dialog_explore_plans_title">Explore plans</string>
     <string name="quick_start_dialog_follow_sites_message">Find sites that inspire you, and follow them to get updates when they post.</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader" tools:ignore="UnusedResources">Tap %1$s Reader %2$s to continue</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar interests</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar topics</string>
     <string name="quick_start_dialog_follow_sites_title">Follow other sites</string>
     <string name="quick_start_dialog_migration_message">We\'ve added more tasks to help you grow your audience.</string>
     <string name="quick_start_dialog_migration_title">We\'ve made some changes to your checklist</string>
@@ -2697,8 +2881,6 @@
     <string name="quick_start_dialog_share_site_message">Connect to your social media accounts – your site will automatically share new posts.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short" tools:ignore="UnusedResources">Tap %1$s Your Site Icon %2$s to upload a new one</string>
     <string name="quick_start_dialog_check_stats_message_short" tools:ignore="UnusedResources">Tap %1$s Stats %2$s to see how your site is performing.</string>
-    <string name="quick_start_dialog_create_new_page_message_short" tools:ignore="UnusedResources">Tap %1$s Pages %2$s to continue.</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tap %1$s Add Page %2$s to create a new page.</string>
     <string name="quick_start_dialog_create_new_post_message_short" tools:ignore="UnusedResources">Tap %1$s Create. %2$s Then select &lt;b&gt;Blog post&lt;/b&gt;</string>
     <string name="quick_start_dialog_explore_plans_message_short" tools:ignore="UnusedResources">Tap %1$s Plan %2$s to see your current plan and other available plans</string>
     <string name="quick_start_dialog_upload_icon_message">Your visitors will see your icon in their browser. Add a custom icon for a polished, pro look.</string>
@@ -2707,39 +2889,52 @@
     <string name="quick_start_dialog_view_site_message_short" tools:ignore="UnusedResources">Tap %1$s View Site %2$s to preview your site</string>
     <string name="quick_start_dialog_view_site_title">View your site</string>
     <string name="quick_start_dialog_update_site_title_message_short">Tap &lt;b&gt;%1$s&lt;/b&gt; to set a new title</string>
+    <string name="quick_start_dialog_edit_homepage_title">Edit your homepage</string>
+    <string name="quick_start_dialog_edit_homepage_message">Change, add, or remove content from your site\'s homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short" tools:ignore="UnusedResources">Select %1$s Pages %2$s to see your page list.</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short" tools:ignore="UnusedResources">Select %1$s Homepage %2$s to edit your Homepage.</string>
+    <string name="quick_start_dialog_review_pages_title">Review site pages</string>
+    <string name="quick_start_dialog_review_pages_message">Change, add, or remove your site\'s pages.</string>
+    <string name="quick_start_dialog_review_pages_message_short" tools:ignore="UnusedResources">Select %1$s Pages %2$s to see your page list.</string>
     <string name="quick_start_complete_tasks_header">Complete (%d)</string>
-    <string name="quick_start_list_browse_themes_subtitle" translatable="false">@string/quick_start_dialog_browse_themes_message</string>
-    <string name="quick_start_list_browse_themes_title" translatable="false">@string/quick_start_dialog_browse_themes_title</string>
     <string name="quick_start_list_check_stats_subtitle" translatable="false">@string/quick_start_dialog_check_stats_message</string>
-    <string name="quick_start_list_check_stats_title" translatable="false">@string/quick_start_dialog_check_stats_title</string>
-    <string name="quick_start_list_create_page_subtitle" translatable="false">@string/quick_start_dialog_create_page_message</string>
-    <string name="quick_start_list_create_page_title" translatable="false">@string/quick_start_dialog_create_page_title</string>
+    <string name="quick_start_list_check_stats_title">Check your stats</string>
     <string name="quick_start_list_create_site_subtitle">Get your site up and running.</string>
     <string name="quick_start_list_create_site_title">Create your site</string>
     <string name="quick_start_list_update_site_title_title">Set your site title</string>
-    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic. First impressions count!</string>
-    <string name="quick_start_list_customize_site_subtitle" translatable="false">@string/quick_start_dialog_customize_site_message</string>
-    <string name="quick_start_list_customize_site_title" translatable="false">@string/quick_start_dialog_customize_site_title</string>
-    <string name="quick_start_list_enable_sharing_subtitle" translatable="false">@string/quick_start_dialog_enable_sharing_message</string>
-    <string name="quick_start_list_enable_sharing_title" translatable="false">@string/quick_start_dialog_enable_sharing_title</string>
+    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic.</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Automatically share new posts to your social media.</string>
+    <string name="quick_start_list_enable_sharing_title">Enable sharing</string>
     <string name="quick_start_list_explore_plans_subtitle" translatable="false">@string/quick_start_dialog_explore_plans_message</string>
     <string name="quick_start_list_explore_plans_title" translatable="false">@string/quick_start_dialog_explore_plans_title</string>
-    <string name="quick_start_list_follow_site_subtitle" translatable="false">@string/quick_start_dialog_follow_sites_message</string>
+    <string name="quick_start_list_follow_site_subtitle">Discover and follow sites that inspire you.</string>
     <string name="quick_start_list_follow_site_title" translatable="false">@string/quick_start_dialog_follow_sites_title</string>
     <string name="quick_start_list_publish_post_subtitle" translatable="false">@string/quick_start_dialog_publish_post_message</string>
     <string name="quick_start_list_publish_post_title" translatable="false">@string/quick_start_dialog_publish_post_title</string>
-    <string name="quick_start_list_upload_icon_subtitle" translatable="false">@string/quick_start_dialog_upload_icon_message</string>
+    <string name="quick_start_list_upload_icon_subtitle">Add a site icon for a polished, pro look.</string>
     <string name="quick_start_list_upload_icon_title" translatable="false">@string/quick_start_dialog_upload_icon_title</string>
     <string name="quick_start_list_view_site_subtitle" translatable="false">@string/quick_start_dialog_view_site_message</string>
-    <string name="quick_start_list_view_site_title" translatable="false">@string/quick_start_dialog_view_site_title</string>
+    <string name="quick_start_list_view_site_title">Visit your site</string>
+    <string name="quick_start_list_edit_homepage_subtitle" translatable="false">@string/quick_start_dialog_edit_homepage_message</string>
+    <string name="quick_start_list_edit_homepage_title" translatable="false">@string/quick_start_dialog_edit_homepage_title</string>
+    <string name="quick_start_list_review_pages_subtitle">Check your pages and make changes, or add or remove pages.</string>
+    <string name="quick_start_list_review_pages_title" translatable="false">@string/quick_start_dialog_review_pages_title</string>
     <string name="quick_start_sites">Next Steps</string>
-    <string name="quick_start_sites_type_customize">Customize Your Site</string>
-    <string name="quick_start_sites_type_grow">Grow Your Audience</string>
+    <string name="quick_start_sites_type_customize">Customize your site</string>
+    <string name="quick_start_sites_type_grow">Grow your audience</string>
     <string name="quick_start_sites_type_subtitle">%1$d of %2$d complete</string>
     <string name="quick_start_span_end" translatable="false">&lt;/span&gt;</string>
     <string name="quick_start_span_start" translatable="false">&lt;span&gt;</string>
     <string name="quick_start_focus_point_description">tap here</string>
 
+    <string name="quick_start_card_menu_pin">Pin this</string>
+    <string name="quick_start_card_menu_unpin">Unpin this</string>
+    <string name="quick_start_card_menu_hide">Hide for now</string>
+    <string name="quick_start_card_menu_remove">Don\'t show again</string>
+
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ve customized your site. Well done!</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ll reach more people. Nice job!</string>
+
     <!-- Pages -->
     <string name="pages_published" tools:ignore="UnusedResources">Published</string>
     <string name="pages_drafts" tools:ignore="UnusedResources">Drafts</string>
@@ -2765,8 +2960,9 @@
     <string name="pages_and_posts_cancel_auto_upload">Cancel upload</string>
     <string name="pages_list_author">Page author</string>
     <string name="pages_cannot_be_started">We cannot open pages at the moment. Please try again later</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
 
     <string name="page_status_pending_review" translatable="false">@string/post_status_pending_review</string>
     <string name="page_status_page_private" translatable="false">@string/post_status_post_private</string>
@@ -2822,7 +3018,10 @@
 
     <!-- Web Preview -->
     <string name="web_preview_default">Default</string>
+    <string name="web_preview_mobile">Mobile</string>
+    <string name="web_preview_tablet">Tablet</string>
     <string name="web_preview_desktop">Desktop</string>
+    <string name="web_preview_width_script" translatable="false">let parent = document.querySelector(\'meta[name=viewport]\'); parent.setAttribute(\'content\',\'width=%1$d, initial-scale=1\');</string>
 
     <string name="create_post_page_fab_tooltip">Create a post or page</string>
     <string name="create_post_page_fab_tooltip_contributors">Create a post</string>
@@ -2839,16 +3038,15 @@
     <string name="new_site_creation_screen_title_step_count">%1$d of %2$d</string>
     <string name="new_site_creation_preview_title">Your site has been created!</string>
     <string name="new_site_creation_preview_subtitle">You\'ll be able to customize look and feel of your site later</string>
-    <string name="site_creation_segments_title">Tell us what kind of site you\’d like to make</string>
-    <string name="site_creation_segments_subtitle">This helps us make recommendations. But you’re never locked in — all sites evolve!</string>
     <string name="site_creation_fetch_suggestions_error_unknown">There was a problem</string>
     <string name="site_creation_error_generic_title">There was a problem</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="new_site_creation_unavailable_domain">This domain is unavailable</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
+    <string name="new_site_creation_search_domain_input_hint">Type a name for your site</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
     <string name="site_creation_domain_finish_button">Create site</string>
     <string name="new_site_creation_create_site_button">Create Site</string>
     <string name="notification_new_site_creation_title">Create Site</string>
@@ -2918,7 +3116,6 @@
     <string name="mlp_create_blank_page">Create blank page</string>
     <string name="mlp_create_page">Create page</string>
     <string name="mlp_preview_page">Preview</string>
-    <string name="mlp_preview_title">Layout Preview</string>
     <string name="mlp_selected_description">%s selected</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_notice_page_created">Page created</string>
@@ -2930,12 +3127,13 @@
 
     <!-- Home Page Picker -->
     <string name="hpp_title">Choose a design</string>
-    <string name="hpp_subtitle">Pick your favorite homepage layout. You can customize or change it later.</string>
+    <string name="hpp_subtitle">Pick your favorite homepage layout. You can edit and customize it later.</string>
     <string name="hpp_choose_button">Choose</string>
     <string name="hpp_skip_button">Skip</string>
     <string name="hpp_error_title">Layouts not available while offline</string>
     <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
     <string name="hpp_retry_error">Please Check your internet connection and retry.</string>
+    <string name="hpp_choose_error">There was an error while selecting the design.</string>
 
     <!-- Stories -->
     <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
@@ -2946,6 +3144,7 @@
     <string name="dialog_edit_story_unrecoverable_message">We couldn\'t find the media for this story on the site.</string>
     <string name="dialog_edit_story_unsupported_format_title">GIF files not supported</string>
     <string name="dialog_edit_story_unsupported_format_message">One or more slides have not been added to your Story because Stories don\'t support GIF files at the moment. Please choose a static image or video background instead.</string>
+    <string name="toast_edit_story_update_in_progress_title">Story being saved, please wait…</string>
     <string name="capture_button_alt">Capture</string>
     <string name="flip_button_alt">Flip camera</string>
     <string name="flash_button_alt">Flash</string>
@@ -3005,7 +3204,7 @@
 
     <!-- Intro to Stories screen -->
     <string name="stories_intro_main_title">Introducing Story Posts</string>
-    <string name="stories_intro_main_subtitle">You\'ve got early access to Story Posts and we\'d love for you to give it a try.</string>
+    <string name="stories_intro_main_subtitle">A new way to create and publish engaging content on your site.</string>
     <string name="stories_intro_image_caption_first">How to create a story post</string>
     <string name="stories_intro_image_caption_second">Example story title</string>
     <string name="stories_intro_title_first">Now stories are for everyone</string>
@@ -3015,29 +3214,22 @@
     <string name="stories_intro_create_story_post_label">Create Story Post</string>
 
     <!--Autogenerated:Gutenberg Native-->
-    <!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: Current value. -->
-    <string name="gutenberg_native_1_s_current_value_is_2_s" tools:ignore="UnusedResources">%1$s. Current value is %2$s</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_10_street_road" tools:ignore="UnusedResources">10 Street Road</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_555_555_1234" tools:ignore="UnusedResources">(555)555–1234</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented" tools:ignore="UnusedResources">A description of the project and the works presented.</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">&lt;a href=\"mailto:mail@example.com\"&gt;mail@example.com&lt;/a&gt;</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest" tools:ignore="UnusedResources">A short bio with personal history, key achievements, or an interesting fact.</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer" tools:ignore="UnusedResources">A short description of the services you offer.</string>
-    <string name="gutenberg_native_add_a_description" tools:ignore="UnusedResources">Add a description</string>
+    <!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: setting label (example: width), %3$s: Current value. %4$s: value measurement unit (example: pixels) -->
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s" tools:ignore="UnusedResources">%1$s. %2$s is %3$s %4$s.</string>
+    <!-- translators: 1: From block title, e.g. Paragraph. 2: To block title, e.g. Header. -->
+    <string name="gutenberg_native_1_s_transformed_to_2_s" tools:ignore="UnusedResources">%1$s transformed to %2$s</string>
     <string name="gutenberg_native_add_a_shortcode" tools:ignore="UnusedResources">Add a shortcode…</string>
-    <string name="gutenberg_native_add_annotation" tools:ignore="UnusedResources">Add annotation</string>
+    <string name="gutenberg_native_add_alt_text" tools:ignore="UnusedResources">Add alt text</string>
+    <string name="gutenberg_native_add_audio" tools:ignore="UnusedResources">ADD AUDIO</string>
     <string name="gutenberg_native_add_block_after" tools:ignore="UnusedResources">Add Block After</string>
     <string name="gutenberg_native_add_block_before" tools:ignore="UnusedResources">Add Block Before</string>
     <string name="gutenberg_native_add_block_here" tools:ignore="UnusedResources">ADD BLOCK HERE</string>
+    <string name="gutenberg_native_add_caption" tools:ignore="UnusedResources">Add caption</string>
     <string name="gutenberg_native_add_image" tools:ignore="UnusedResources">ADD IMAGE</string>
     <string name="gutenberg_native_add_image_or_video" tools:ignore="UnusedResources">ADD IMAGE OR VIDEO</string>
+    <string name="gutenberg_native_add_link" tools:ignore="UnusedResources">ADD LINK</string>
     <string name="gutenberg_native_add_paragraph_block" tools:ignore="UnusedResources">Add paragraph block</string>
+    <string name="gutenberg_native_add_text" tools:ignore="UnusedResources">Add text…</string>
     <string name="gutenberg_native_add_this_email_link" tools:ignore="UnusedResources">Add this email link</string>
     <string name="gutenberg_native_add_this_link" tools:ignore="UnusedResources">Add this link</string>
     <string name="gutenberg_native_add_this_telephone_link" tools:ignore="UnusedResources">Add this telephone link</string>
@@ -3047,8 +3239,14 @@
     <string name="gutenberg_native_add_video" tools:ignore="UnusedResources">ADD VIDEO</string>
     <string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
-    <string name="gutenberg_native_angle" tools:ignore="UnusedResources">Angle</string>
-    <string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
+    <string name="gutenberg_native_attachment_page" tools:ignore="UnusedResources">Attachment page</string>
+    <!-- translators: accessibility text. Empty Audio caption. -->
+    <string name="gutenberg_native_audio_caption_empty" tools:ignore="UnusedResources">Audio caption. Empty</string>
+    <!-- translators: accessibility text. %s: Audio caption. -->
+    <string name="gutenberg_native_audio_caption_s" tools:ignore="UnusedResources">Audio caption. %s</string>
+    <!-- translators: displays audio file extension. e.g. MP3 audio file -->
+    <string name="gutenberg_native_audio_file" tools:ignore="UnusedResources"> audio file</string>
+    <string name="gutenberg_native_audio_player" tools:ignore="UnusedResources">Audio Player</string>
     <!-- translators: displayed right after the block is copied. -->
     <string name="gutenberg_native_block_copied" tools:ignore="UnusedResources">Block copied</string>
     <!-- translators: displayed right after the block is cut. -->
@@ -3060,90 +3258,104 @@
     <!-- translators: displayed right after the block is removed. -->
     <string name="gutenberg_native_block_removed" tools:ignore="UnusedResources">Block removed</string>
     <string name="gutenberg_native_block_settings" tools:ignore="UnusedResources">Block settings</string>
-    <!-- translators: title for "Blog" page template -->
-    <string name="gutenberg_native_blog" tools:ignore="UnusedResources">Blog</string>
+    <string name="gutenberg_native_buttongroup" tools:ignore="UnusedResources">ButtonGroup</string>
+    <string name="gutenberg_native_audio_settings" tools:ignore="UnusedResources">Audio settings</string>
+    <string name="gutenberg_native_auto" tools:ignore="UnusedResources">Auto</string>
+    <string name="gutenberg_native_autoplay" tools:ignore="UnusedResources">Autoplay</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself" tools:ignore="UnusedResources">Block cannot be rendered inside itself.</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable" tools:ignore="UnusedResources">Block has been deleted or is unavailable.</string>
+    <string name="gutenberg_native_browser_default" tools:ignore="UnusedResources">Browser default</string>
+    <string name="gutenberg_native_cancel_search" tools:ignore="UnusedResources">Cancel search</string>
+    <string name="gutenberg_native_change_block_position" tools:ignore="UnusedResources">Change block position</string>
+    <string name="gutenberg_native_change_heading_level" tools:ignore="UnusedResources">Change heading level</string>
+    <string name="gutenberg_native_choose_a_file" tools:ignore="UnusedResources">CHOOSE A FILE</string>
+    <string name="gutenberg_native_choose_audio" tools:ignore="UnusedResources">Choose audio</string>
+    <string name="gutenberg_native_choose_file" tools:ignore="UnusedResources">Choose file</string>
     <string name="gutenberg_native_choose_from_device" tools:ignore="UnusedResources">Choose from device</string>
     <string name="gutenberg_native_choose_image" tools:ignore="UnusedResources">Choose image</string>
     <string name="gutenberg_native_choose_image_or_video" tools:ignore="UnusedResources">Choose image or video</string>
     <string name="gutenberg_native_choose_images" tools:ignore="UnusedResources">Choose images</string>
     <string name="gutenberg_native_choose_video" tools:ignore="UnusedResources">Choose video</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_city_10100" tools:ignore="UnusedResources">City, 10100</string>
-    <string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
+    <string name="gutenberg_native_clear_search" tools:ignore="UnusedResources">Clear search</string>
+    <string name="gutenberg_native_code" tools:ignore="UnusedResources">Code</string>
     <string name="gutenberg_native_copied_block" tools:ignore="UnusedResources">Copied block</string>
     <string name="gutenberg_native_copy_block" tools:ignore="UnusedResources">Copy block</string>
+    <string name="gutenberg_native_copy_file_url" tools:ignore="UnusedResources">Copy file URL</string>
     <!-- translators: %s: current cell value. -->
     <string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
     <string name="gutenberg_native_customize" tools:ignore="UnusedResources">CUSTOMIZE</string>
     <string name="gutenberg_native_customize_gradient" tools:ignore="UnusedResources">Customize Gradient</string>
     <string name="gutenberg_native_cut_block" tools:ignore="UnusedResources">Cut block</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur" tools:ignore="UnusedResources">Describe the purpose of the image. Leave empty if the image is purely decorative. </string>
     <string name="gutenberg_native_dismiss" tools:ignore="UnusedResources">Dismiss</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened" tools:ignore="UnusedResources">Don’t cry because it’s over, smile because it happened.</string>
+    <string name="gutenberg_native_document_outline" tools:ignore="UnusedResources">document outline</string>
+    <string name="gutenberg_native_display_post_date" tools:ignore="UnusedResources">Display post date</string>
     <string name="gutenberg_native_double_tap_to_add_a_block" tools:ignore="UnusedResources">Double tap to add a block</string>
-    <!-- translators: accessibility text (hint for focusing a slider) -->
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider" tools:ignore="UnusedResources">Double tap to change the value using slider</string>
+    <string name="gutenberg_native_double_tap_to_add_a_link" tools:ignore="UnusedResources">Double tap to add a link.</string>
+    <string name="gutenberg_native_double_tap_to_change_unit" tools:ignore="UnusedResources">double–tap to change unit</string>
     <!-- translators: accessibility text -->
     <string name="gutenberg_native_double_tap_to_edit_this_value" tools:ignore="UnusedResources">Double tap to edit this value</string>
     <!-- translators: accessibility text (hint for moving to color settings) -->
     <string name="gutenberg_native_double_tap_to_go_to_color_settings" tools:ignore="UnusedResources">Double tap to go to color settings</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file" tools:ignore="UnusedResources">Double tap to listen the audio file</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down" tools:ignore="UnusedResources">Double tap to move the block down</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left" tools:ignore="UnusedResources">Double tap to move the block to the left</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right" tools:ignore="UnusedResources">Double tap to move the block to the right</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up" tools:ignore="UnusedResources">Double tap to move the block up</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag" tools:ignore="UnusedResources">Double tap to open Action Sheet to edit, replace, or clear the image</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Action Sheet with available options</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag" tools:ignore="UnusedResources">Double tap to open Bottom Sheet to edit, replace, or clear the image</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Bottom Sheet with available options</string>
     <string name="gutenberg_native_double_tap_to_redo_last_change" tools:ignore="UnusedResources">Double tap to redo last change</string>
     <string name="gutenberg_native_double_tap_to_select" tools:ignore="UnusedResources">Double tap to select</string>
     <string name="gutenberg_native_double_tap_to_select_a_video" tools:ignore="UnusedResources">Double tap to select a video</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file" tools:ignore="UnusedResources">Double tap to select an audio file</string>
     <string name="gutenberg_native_double_tap_to_select_an_image" tools:ignore="UnusedResources">Double tap to select an image</string>
-    <string name="gutenberg_native_double_tap_to_select_layout" tools:ignore="UnusedResources">Double tap to select layout</string>
     <!-- translators: accessibility text (hint for selecting option) -->
     <string name="gutenberg_native_double_tap_to_select_the_option" tools:ignore="UnusedResources">Double tap to select the option</string>
     <!-- translators: accessibility text (hint for switches) -->
     <string name="gutenberg_native_double_tap_to_toggle_setting" tools:ignore="UnusedResources">Double tap to toggle setting</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_dr_seuss" tools:ignore="UnusedResources">Dr. Seuss</string>
     <string name="gutenberg_native_duplicate_block" tools:ignore="UnusedResources">Duplicate block</string>
+    <string name="gutenberg_native_edit_file" tools:ignore="UnusedResources">Edit file</string>
+    <string name="gutenberg_native_edit_focal_point" tools:ignore="UnusedResources">Edit focal point</string>
+    <string name="gutenberg_native_edit_image" tools:ignore="UnusedResources">Edit image</string>
     <string name="gutenberg_native_edit_using_web_editor" tools:ignore="UnusedResources">Edit using web editor</string>
     <string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:mail@example.com\"&gt;mail@example.com&lt;/a&gt;</string>
+    <string name="gutenberg_native_enter_url_to_embed_here" tools:ignore="UnusedResources">Enter URL to embed here…</string>
+    <string name="gutenberg_native_error" tools:ignore="UnusedResources">Error</string>
     <string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file" tools:ignore="UnusedResources">Failed to insert audio file.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert audio file. Please tap for options.</string>
+    <string name="gutenberg_native_failed_to_insert_media" tools:ignore="UnusedResources">Failed to insert media.</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to save files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to upload files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_featured" tools:ignore="UnusedResources">Featured</string>
+    <string name="gutenberg_native_file_block_settings" tools:ignore="UnusedResources">File block settings</string>
+    <string name="gutenberg_native_file_name" tools:ignore="UnusedResources">File name</string>
     <!-- translators: accessibility text. %s: gallery caption. -->
     <string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
-    <!-- translators: sample content for "About" page template
-translators: sample content for "Contact" page template
-translators: sample content for "Portfolio" page template
-translators: sample content for "Services" page template
-translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_get_in_touch" tools:ignore="UnusedResources">Get in Touch</string>
     <string name="gutenberg_native_gradient_type" tools:ignore="UnusedResources">Gradient Type</string>
+    <!-- translators: %s: heading level e.g: "1", "2", "3" -->
+    <string name="gutenberg_native_heading_d" tools:ignore="UnusedResources">Heading %d</string>
     <string name="gutenberg_native_help_button" tools:ignore="UnusedResources">Help button</string>
     <string name="gutenberg_native_help_icon" tools:ignore="UnusedResources">Help icon</string>
-    <string name="gutenberg_native_here_is_the_panel_content" tools:ignore="UnusedResources">Here is the panel content!</string>
     <string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">Hide keyboard</string>
+    <!-- translators: 1: the order number of the image. 2: the total number of images. -->
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery" tools:ignore="UnusedResources">image %1$d of %2$d in gallery</string>
     <!-- translators: accessibility text. %s: image caption. -->
     <string name="gutenberg_native_image_caption_s" tools:ignore="UnusedResources">Image caption. %s</string>
-    <string name="gutenberg_native_insert_mention" tools:ignore="UnusedResources">Insert mention</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_inspiration" tools:ignore="UnusedResources">Inspiration</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than" tools:ignore="UnusedResources">It is our choices, Harry, that show what we truly are, far more than our abilities.</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_j_k_rowling" tools:ignore="UnusedResources">J.K. Rowling</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_juan_p_rez" tools:ignore="UnusedResources">Juan Pérez</string>
-    <!-- translators: sample content for "About" page template
-translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_let_s_build_something_together" tools:ignore="UnusedResources">Let’s build something together!</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3" tools:ignore="UnusedResources">Let\'s build something together!</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati" tools:ignore="UnusedResources">Let\'s talk 👋 Don\'t hesitate to reach out with the contact information below, or send a message using the form.</string>
+    <string name="gutenberg_native_image_link_url" tools:ignore="UnusedResources">Image Link URL</string>
+    <string name="gutenberg_native_image_settings" tools:ignore="UnusedResources">Image settings</string>
+    <string name="gutenberg_native_link_settings" tools:ignore="UnusedResources">Link Settings</string>
     <string name="gutenberg_native_link_to" tools:ignore="UnusedResources">Link To</string>
+    <string name="gutenberg_native_link_to_12d6f96a" tools:ignore="UnusedResources">Link to</string>
+    <string name="gutenberg_native_lock_icon" tools:ignore="UnusedResources">Lock icon</string>
+    <string name="gutenberg_native_loop" tools:ignore="UnusedResources">Loop</string>
+    <string name="gutenberg_native_media_area" tools:ignore="UnusedResources">Media area</string>
+    <string name="gutenberg_native_media_file" tools:ignore="UnusedResources">Media file</string>
+    <string name="gutenberg_native_metadata" tools:ignore="UnusedResources">Metadata</string>
     <string name="gutenberg_native_move_block_down" tools:ignore="UnusedResources">Move block down</string>
     <!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block down from row %1$s to row %2$s</string>
@@ -3158,21 +3370,20 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block up from row %1$s to row %2$s</string>
     <string name="gutenberg_native_move_image_backward" tools:ignore="UnusedResources">Move Image Backward</string>
     <string name="gutenberg_native_move_image_forward" tools:ignore="UnusedResources">Move Image Forward</string>
-    <string name="gutenberg_native_my_document_setting_panel" tools:ignore="UnusedResources">My Document Setting Panel</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car" tools:ignore="UnusedResources">My portfolio showcases various projects created throughout my career. See my contact information below and get in touch.</string>
-    <string name="gutenberg_native_my_post_publish_panel" tools:ignore="UnusedResources">My post publish panel</string>
-    <string name="gutenberg_native_my_post_status_info" tools:ignore="UnusedResources">My post status info</string>
-    <string name="gutenberg_native_my_pre_publish_panel" tools:ignore="UnusedResources">My pre publish panel</string>
+    <string name="gutenberg_native_move_to_bottom" tools:ignore="UnusedResources">Move to bottom</string>
+    <string name="gutenberg_native_move_to_top" tools:ignore="UnusedResources">Move to top</string>
     <string name="gutenberg_native_navigate_up" tools:ignore="UnusedResources">Navigate Up</string>
     <string name="gutenberg_native_navigates_to_custom_color_picker" tools:ignore="UnusedResources">Navigates to custom color picker</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient" tools:ignore="UnusedResources">Navigates to customize the gradient</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request" tools:ignore="UnusedResources">No application can handle this request.</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes" tools:ignore="UnusedResources">Note: Column layout may vary between themes and screen sizes</string>
     <string name="gutenberg_native_only_show_excerpt" tools:ignore="UnusedResources">Only show excerpt</string>
+    <string name="gutenberg_native_open" tools:ignore="UnusedResources">OPEN</string>
     <string name="gutenberg_native_open_block_actions_menu" tools:ignore="UnusedResources">Open Block Actions Menu</string>
     <string name="gutenberg_native_open_link_in_a_browser" tools:ignore="UnusedResources">Open link in a browser</string>
     <string name="gutenberg_native_open_settings" tools:ignore="UnusedResources">Open Settings</string>
+    <string name="gutenberg_native_page_break" tools:ignore="UnusedResources">Page break</string>
     <!-- translators: accessibility text. %s: Page break text. -->
     <string name="gutenberg_native_page_break_block_s" tools:ignore="UnusedResources">Page break block. %s</string>
     <!-- translators: accessibility text. empty page title. -->
@@ -3181,23 +3392,25 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_page_title_s" tools:ignore="UnusedResources">Page title. %s</string>
     <string name="gutenberg_native_paste_block_after" tools:ignore="UnusedResources">Paste block after</string>
     <string name="gutenberg_native_paste_url" tools:ignore="UnusedResources">Paste URL</string>
-    <!-- translators: title for "Portfolio" page template -->
-    <string name="gutenberg_native_portfolio" tools:ignore="UnusedResources">Portfolio</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_position_or_job_title" tools:ignore="UnusedResources">Position or Job Title</string>
+    <string name="gutenberg_native_post_content_settings" tools:ignore="UnusedResources">Post content settings</string>
+    <string name="gutenberg_native_post_meta_settings" tools:ignore="UnusedResources">Post meta settings</string>
     <!-- translators: accessibility text. empty post title. -->
     <string name="gutenberg_native_post_title_empty" tools:ignore="UnusedResources">Post title. Empty</string>
     <!-- translators: accessibility text. %s: text content of the post title. -->
     <string name="gutenberg_native_post_title_s" tools:ignore="UnusedResources">Post title. %s</string>
+    <string name="gutenberg_native_preload" tools:ignore="UnusedResources">Preload</string>
     <string name="gutenberg_native_problem_displaying_block" tools:ignore="UnusedResources">Problem displaying block</string>
+    <string name="gutenberg_native_problem_opening_the_audio" tools:ignore="UnusedResources">Problem opening the audio</string>
     <string name="gutenberg_native_problem_opening_the_video" tools:ignore="UnusedResources">Problem opening the video</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_project_name" tools:ignore="UnusedResources">Project Name</string>
-    <string name="gutenberg_native_remove_annotations" tools:ignore="UnusedResources">Remove annotations</string>
+    <string name="gutenberg_native_read_more" tools:ignore="UnusedResources">Read more</string>
+    <string name="gutenberg_native_replace_audio" tools:ignore="UnusedResources">Replace audio</string>
     <string name="gutenberg_native_replace_current_block" tools:ignore="UnusedResources">Replace Current Block</string>
+    <string name="gutenberg_native_replace_file" tools:ignore="UnusedResources">Replace file</string>
+    <string name="gutenberg_native_replace_image" tools:ignore="UnusedResources">Replace image</string>
     <string name="gutenberg_native_replace_image_or_video" tools:ignore="UnusedResources">Replace image or video</string>
     <string name="gutenberg_native_replace_video" tools:ignore="UnusedResources">Replace video</string>
-    <string name="gutenberg_native_reset_block" tools:ignore="UnusedResources">Reset Block</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android" tools:ignore="UnusedResources">Reusable blocks aren\'t editable on WordPress for Android</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios" tools:ignore="UnusedResources">Reusable blocks aren\'t editable on WordPress for iOS</string>
     <!-- translators: accessibility text for the media block empty state. %s: media type -->
     <string name="gutenberg_native_s_block_empty" tools:ignore="UnusedResources">%s block. Empty</string>
     <!-- translators: %s: block title e.g: "Paragraph". -->
@@ -3206,67 +3419,47 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_s_block_this_block_has_invalid_content" tools:ignore="UnusedResources">%s block. This block has invalid content</string>
     <!-- translators: Missing block alert title. %s: The localized block name -->
     <string name="gutenberg_native_s_is_not_fully_supported" tools:ignore="UnusedResources">\'%s\' is not fully–supported</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_sally_smith" tools:ignore="UnusedResources">Sally Smith</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_samuel_the_dog" tools:ignore="UnusedResources">Samuel the Dog</string>
     <string name="gutenberg_native_scrollable_block_menu_closed" tools:ignore="UnusedResources">Scrollable block menu closed.</string>
     <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block" tools:ignore="UnusedResources">Scrollable block menu opened. Select a block.</string>
+    <string name="gutenberg_native_search_block" tools:ignore="UnusedResources">Search block</string>
+    <string name="gutenberg_native_search_blocks" tools:ignore="UnusedResources">Search blocks</string>
     <string name="gutenberg_native_search_or_type_url" tools:ignore="UnusedResources">Search or type URL</string>
     <string name="gutenberg_native_select_a_color" tools:ignore="UnusedResources">Select a color</string>
     <string name="gutenberg_native_select_a_layout" tools:ignore="UnusedResources">Select a layout</string>
     <string name="gutenberg_native_select_item" tools:ignore="UnusedResources">Select item</string>
-    <!-- translators: title for "Services" page template -->
-    <string name="gutenberg_native_services" tools:ignore="UnusedResources">Services</string>
+    <string name="gutenberg_native_shortcode" tools:ignore="UnusedResources">Shortcode</string>
+    <string name="gutenberg_native_show_download_button" tools:ignore="UnusedResources">Show download button</string>
     <string name="gutenberg_native_show_post_content" tools:ignore="UnusedResources">Show post content</string>
+    <string name="gutenberg_native_size" tools:ignore="UnusedResources">Size</string>
+    <string name="gutenberg_native_sorting_and_filtering" tools:ignore="UnusedResources">Sorting and filtering</string>
     <!-- translators: Checkbox toggle label -->
     <string name="gutenberg_native_show_section" tools:ignore="UnusedResources">Show section</string>
-    <string name="gutenberg_native_sidebar_title_plugin" tools:ignore="UnusedResources">Sidebar title plugin</string>
-    <string name="gutenberg_native_size" tools:ignore="UnusedResources">Size</string>
     <string name="gutenberg_native_start_writing" tools:ignore="UnusedResources">Start writing…</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_strategy" tools:ignore="UnusedResources">Strategy</string>
-    <string name="gutenberg_native_success_message" tools:ignore="UnusedResources">Success Message</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h" tools:ignore="UnusedResources">Summarize your post with a list of headings. Add HTML anchors to Heading blocks to link them here.</string>
+    <string name="gutenberg_native_summary" tools:ignore="UnusedResources">summary</string>
+    <string name="gutenberg_native_table_of_contents" tools:ignore="UnusedResources">Table of Contents</string>
     <string name="gutenberg_native_take_a_photo" tools:ignore="UnusedResources">Take a Photo</string>
     <string name="gutenberg_native_take_a_photo_or_video" tools:ignore="UnusedResources">Take a Photo or Video</string>
     <string name="gutenberg_native_take_a_video" tools:ignore="UnusedResources">Take a Video</string>
     <string name="gutenberg_native_tap_here_to_show_help" tools:ignore="UnusedResources">Tap here to show help</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard" tools:ignore="UnusedResources">Tap to hide the keyboard</string>
-    <!-- translators: title for "Team" page template -->
-    <string name="gutenberg_native_team" tools:ignore="UnusedResources">Team</string>
-    <string name="gutenberg_native_template_preview" tools:ignore="UnusedResources">Template Preview</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing" tools:ignore="UnusedResources">The way to get started is to quit talking and begin doing.</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i" tools:ignore="UnusedResources">This is sample content, included with the template to illustrate its features. Remove or replace it with your own words and media.</string>
-    <string name="gutenberg_native_title" tools:ignore="UnusedResources">Title:</string>
+    <string name="gutenberg_native_transform_block" tools:ignore="UnusedResources">Transform block…</string>
+    <!-- translators: %s: block title e.g: "Paragraph". -->
+    <string name="gutenberg_native_transform_s_to" tools:ignore="UnusedResources">Transform %s to</string>
     <string name="gutenberg_native_translate" tools:ignore="UnusedResources">Translate</string>
-    <string name="gutenberg_native_try_a_starter_layout" tools:ignore="UnusedResources">Try a starter layout</string>
     <string name="gutenberg_native_ungroup" tools:ignore="UnusedResources">Ungroup</string>
+    <string name="gutenberg_native_unsupported" tools:ignore="UnusedResources">Unsupported</string>
     <string name="gutenberg_native_updates_the_title" tools:ignore="UnusedResources">Updates the title.</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_usa" tools:ignore="UnusedResources">USA</string>
+    <string name="gutenberg_native_uploading" tools:ignore="UnusedResources">Uploading…</string>
     <!-- translators: accessibility text. Empty video caption. -->
     <string name="gutenberg_native_video_caption_empty" tools:ignore="UnusedResources">Video caption. Empty</string>
     <!-- translators: accessibility text. %s: video caption. -->
     <string name="gutenberg_native_video_caption_s" tools:ignore="UnusedResources">Video caption. %s</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u" tools:ignore="UnusedResources">Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing – in their own words.</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_walt_disney" tools:ignore="UnusedResources">Walt Disney</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_want_to_work_with_us" tools:ignore="UnusedResources">Want to work with us?</string>
-    <string name="gutenberg_native_warning_message" tools:ignore="UnusedResources">Warning Message</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o" tools:ignore="UnusedResources">We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.</string>
+    <string name="gutenberg_native_video_settings" tools:ignore="UnusedResources">Video settings</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release" tools:ignore="UnusedResources">We are working hard to add more blocks with each release.</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you" tools:ignore="UnusedResources">We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.</string>
-    <!-- translators: sample content for "Blog" page template -->
-    <string name="gutenberg_native_welcome_to_our_new_blog" tools:ignore="UnusedResources">Welcome to our new blog</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_what_people_say" tools:ignore="UnusedResources">What People Say</string>
+    <string name="gutenberg_native_what_is_alt_text" tools:ignore="UnusedResources">What is alt text?</string>
     <string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
+    <string name="gutenberg_native_write_code" tools:ignore="UnusedResources">Write code…</string>
     <!--/Autogenerated:Gutenberg Native-->
     <string name="toast_capture_operation_permission_needed">You need to grant the app audio recording permission in order to record video</string>
     <string name="typeface_label_nunito">Casual</string>
@@ -3275,4 +3468,129 @@ translators: sample content for "Services" page template -->
     <string name="typeface_label_pacifico">Playful</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_shrikhand">Bold</string>
+    <string name="delete_button_alt">Delete</string>
+    <string name="label_next_button">Next</string>
+    <string name="label_done_button">Done</string>
+    <string name="dialog_discard_story_title_edit">Discard changes?</string>
+    <string name="dialog_discard_story_message_edit">Any changes made will not be saved.</string>
+    <string name="dialog_discard_story_ok_button_edit">Discard</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="color_picker_label_background">Background</string>
+
+    <!-- Jetpack backup download -->
+    <string name="backup_download">Backup Download</string>
+    <string name="backup_download_details_page_title">Download Backup</string>
+    <string name="backup_download_details_header">Create downloadable backup</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s is the selected point to create a downloadable backup.</string>
+    <string name="backup_download_details_choose_items_header">Items included in this download</string>
+    <string name="backup_download_details_action_button">Create downloadable file</string>
+    <string name="backup_download_details_icon_content_description">Create downloadable backup icon</string>
+    <string name="backup_download_details_action_button_content_description">Create downloadable backup button</string>
+    <string name="backup_download_generic_failure">There was a problem handling the request. Please try again later.</string>
+    <string name="backup_download_another_download_running">There is another download running.</string>
+
+    <string name="backup_download_progress_page_title">Download Backup</string>
+    <string name="backup_download_progress_header">Currently creating a downloadable backup of your site</string>
+    <string name="backup_download_progress_description_with_two_parameters">We\'re creating a downloadable backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_progress_icon_content_description">Creating downloadable backup icon</string>
+    <string name="backup_download_progress_footnote">No need to wait around. We\'ll notify you when your backup is ready.</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+
+    <string name="backup_item_themes">WordPress Themes</string>
+    <string name="backup_item_plugins">WordPress Plugins</string>
+    <string name="backup_item_media_uploads">Media Uploads</string>
+    <string name="backup_item_roots">WordPress root</string>
+    <string name="backup_item_roots_hint">(includes wp-config.php and any non WordPress files)</string>
+    <string name="backup_item_contents">WP-content directory</string>
+    <string name="backup_item_content_hint">(excludes themes, plugins, and uploads)</string>
+    <string name="backup_item_sqls">Site database</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+
+    <string name="backup_download_complete_page_title">Your Backup</string>
+    <string name="backup_download_complete_header">Your backup is now available for download</string>
+    <string name="backup_download_complete_description_with_two_parameters">We successfully created a backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_complete_download_action_button">Download</string>
+    <string name="backup_download_complete_download_share_action_button">Share link</string>
+    <string name="backup_download_complete_icon_content_description">Downloadable backup ready icon</string>
+    <string name="backup_download_complete_download_action_button_content_description">Download button</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Share link button</string>
+    <string name="backup_download_complete_info">We\'ve also emailed you a link to your file.</string>
+    <string name="backup_download_complete_failed_title">Download failed</string>
+    <string name="backup_download_complete_failed_description">We couldn\'t create your backup</string>
+    <string name="backup_download_complete_failed_action_button">Done</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Done button</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud with X icon</string>
+
+    <string name="jetpack_icon_content_description">icon</string>
+    <string name="label_control_upload">Upload</string>
+
+    <!-- Jetpack restore -->
+    <string name="restore">Restore</string>
+    <string name="restore_details_page_title" translatable="false">@string/restore</string>
+    <string name="restore_details_choose_items_header">Choose the items to restore:</string>
+    <string name="restore_details_header">Restore Site</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s is the selected point for your restore.</string>
+    <string name="restore_details_action_button">Restore site</string>
+    <string name="restore_details_icon_content_description">Restore icon</string>
+    <string name="restore_details_action_button_content_description">Restore site button</string>
+
+    <string name="restore_warning_page_title" translatable="false">@string/restore</string>
+    <string name="restore_warning_header">Warning</string>
+    <string name="restore_warning_description_with_two_parameters">Are you sure you want to revert your site back to %1$s at %2$s?
+        Anything you changed since then will be lost.</string>
+    <string name="restore_warning_action_button">Confirm</string>
+    <string name="restore_warning_icon_content_description">Red circle image with exclamation point</string>
+    <string name="restore_warning_action_button_content_description">Confirm restore site button</string>
+
+    <string name="restore_progress_page_title" translatable="false">@string/restore</string>
+    <string name="restore_progress_header">Currently restoring site</string>
+    <string name="restore_progress_description_with_two_parameters">We\'re restoring your site back to %1$s %2$s.</string>
+    <string name="restore_progress_icon_content_description">Restore site icon</string>
+    <string name="restore_progress_footnote">No need to wait around. We\'ll notify you when your site has been restored.</string>
+    <string name="restore_progress_label">%1$s%%</string>
+
+    <string name="restore_complete_page_title" translatable="false">@string/restore</string>
+    <string name="restore_complete_header">Your site has been restored</string>
+    <string name="restore_complete_description_with_two_parameters">All of your selected items are now restored back to %1$s %2$s.</string>
+    <string name="restore_complete_done_action_button" translatable="false">@string/label_done_button</string>
+    <string name="restore_complete_visit_site_action_button">Visit site</string>
+    <string name="restore_complete_icon_content_description">Restore icon</string>
+    <string name="restore_complete_done_button_content_description">Done button</string>
+    <string name="restore_complete_visit_site_button_content_description">Visit site button</string>
+
+    <string name="restore_complete_failed_title">Restore failed</string>
+    <string name="restore_complete_failed_description">We couldn\'t restore your site</string>
+    <string name="restore_complete_failed_action_button" translatable="false">@string/label_done_button</string>
+    <string name="restore_complete_failed_action_button_content_description">Done button</string>
+    <string name="restore_complete_failed_icon_content_description">Error icon</string>
+
+    <string name="restore_generic_failure" translatable="false">@string/backup_download_generic_failure</string>
+    <string name="restore_another_process_running">There is another restore running.</string>
+    <string name="restore_status_failure_heading">Hmm, we couldn\'t find your restore status</string>
+    <string name="restore_status_failure_bullet1">We couldn\'t find the status to say how long your restore will take.</string>
+    <string name="restore_status_failure_bullet2">We\'ll still attempt to restore your site.</string>
+    <string name="restore_status_failure_bullet3">We\’ll notify you when its done.</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Clock icon</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Checkmark icon</string>
+
+    <string name="backup_download_status_failure_heading">Hmm, we couldn\'t find your downloadable backup status</string>
+    <string name="backup_download_status_failure_bullet1">We couldn\'t find the status to say how long your downloadable backup will take.</string>
+    <string name="backup_download_status_failure_bullet2">We\'ll still attempt to create your downloadable backup file.</string>
+    <string name="backup_download_status_failure_bullet3" translatable="false">@string/restore_status_failure_bullet3</string>
+    <string name="backup_download_status_bullet_clock_icon_content_desc" translatable="false">@string/restore_status_bullet_clock_icon_content_desc</string>
+    <string name="backup_download_status_bullet_checkmark_icon_content_desc" translatable="false">@string/restore_status_bullet_checkmark_icon_content_desc</string>
+
+    <!-- likes -->
+    <string name="likes_list_screen_title">Likes list %s</string>
+
+    <!-- user profile bottom sheet -->
+    <string name="user_profile_bottom_sheet_description">User profile bottom sheet information</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_untitled_site">(Untitled)</string>
+
+    <!-- Storage Utils Provider -->
+    <string name="storage_utils_dialog_title">Insufficient device storage</string>
+    <string name="storage_utils_dialog_message">We need to save your content on the device before it can be published. Review your storage settings and remove files to free up space.</string>
+    <string name="storage_utils_dialog_ok_button">View Storage</string>
+    <string name="storage_utils_dialog_dont_show_button">Don\'t Show Again</string>
 </resources>
diff --git a/WordPress/src/main/res/values/styles.xml b/WordPress/src/main/res/values/styles.xml
index 83bf6609af8c..bd494c42be39 100644
--- a/WordPress/src/main/res/values/styles.xml
+++ b/WordPress/src/main/res/values/styles.xml
@@ -3,10 +3,10 @@
 
     <style name="Base.Wordpress" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <!-- Material theme -->
-        <item name="colorPrimary">@color/blue_50</item>
-        <item name="colorPrimaryVariant">@color/blue_70</item>
-        <item name="colorSecondary">@color/pink_50</item>
-        <item name="colorSecondaryVariant">@color/pink_70</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorSecondaryVariant">@color/colorSecondaryVariant</item>
         <item name="android:colorBackground">@android:color/white</item>
         <item name="colorSurface">@android:color/white</item>
         <item name="colorError">@color/red_50</item>
@@ -18,7 +18,7 @@
         <item name="colorAccent">?attr/colorPrimary</item>
 
         <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorControlActivated">@color/primary_30</item>
+        <item name="colorControlActivated">?attr/colorPrimary</item>
 
         <item name="toolbarIconNormalColor">@color/grey_darken_20</item>
         <item name="toolbarIconHighlightColor">@color/almost_black</item>
@@ -27,7 +27,9 @@
         <item name="toolbarStyle">@style/WordPress.ToolBar</item>
         <item name="tabStyle">@style/WordPress.TabLayout</item>
         <item name="appBarLayoutStyle">@style/WordPress.AppBarLayout</item>
-        <item name="snackbarStyle">@style/Widget.MaterialComponents.Snackbar</item>
+        <item name="snackbarStyle">@style/WordPress.Snackbar</item>
+        <item name="snackbarButtonStyle">@style/WordPress.SnackbarButton</item>
+        <item name="snackbarTextViewStyle">@style/WordPress.SnackbarText</item>
 
         <!-- we can remove it after moving away from Bridge version of theme -->
         <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
@@ -39,6 +41,7 @@
         <item name="wpColorSuccess">@color/green_50</item>
         <item name="wpColorWarningDark">@color/warning_50</item>
         <item name="wpColorWarningLight">@color/yellow_20</item>
+        <item name="wpColorNavBar">@color/nav_bar</item>
         <item name="wpColorAppBar">?attr/colorSurface</item>
         <item name="wpColorOnSurfaceMedium">@color/material_on_surface_emphasis_medium</item>
         <item name="wpColorActionModeIcon">?attr/colorOnSurface</item>
@@ -92,7 +95,77 @@
         <item name="categoriesButtonBackground">@color/mlp_categories_button_background</item>
         <item name="categoriesButtonBackgroundSelected">@color/grey_900</item>
         <item name="mlpDividerColor">@color/grey_300</item>
-        <item name="categoriesBackground">@color/white</item>
+        <item name="layoutPickerBackground">@color/white</item>
+
+        <!-- Material Date Range Picker -->
+        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+        <item name="materialCalendarFullscreenTheme">@style/WordPress.MaterialCalendarFullscreenTheme</item>
+        <item name="materialCalendarTheme">@style/WordPress.MaterialCalendarTheme</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarFullscreenTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
+        <item name="materialCalendarStyle">@style/WordPress.MaterialCalendarStyle</item>
+        <item name="materialCalendarHeaderTitle">@style/WordPress.MaterialCalendarHeaderTitle</item>
+        <item name="materialCalendarHeaderLayout">@style/WordPress.MaterialCalendarHeaderLayout</item>
+        <item name="materialCalendarHeaderSelection">@style/WordPress.MaterialCalendarHeaderSelection</item>
+        <item name="materialCalendarHeaderToggleButton">@style/WordPress.MaterialCalendarHeaderToggleButton</item>
+        <item name="materialCalendarHeaderConfirmButton">@style/WordPress.MaterialCalendarHeaderConfirmButton</item>
+        <item name="materialCalendarHeaderDivider">@style/WordPress.MaterialCalendarHeaderDivider</item>
+        <!--    Days of week header    -->
+        <item name="textAppearanceBody2">@style/WordPress.TextAppearance.MaterialCalendarDaysOfWeek</item>
+        <!-- Grid day items  -->
+        <item name="materialCalendarDay">@style/WordPress.MaterialCalendarDayTextView</item>
+        <!-- Used to color the cancel button which doesn't use any overridable styles -->
+        <item name="colorOnPrimary">?attr/colorOnSurface</item>
+        <item name="android:background">?attr/colorSurface</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarStyle" parent="Widget.MaterialComponents.MaterialCalendar.Fullscreen">
+        <!-- Grid selected day item  -->
+        <item name="daySelectedStyle">@style/WordPress.MaterialCalendarSelectedDay</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarTheme" parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
+    </style>
+
+    <style name="WordPress.MaterialCalendarHeaderTitle" parent="Widget.MaterialComponents.MaterialCalendar.HeaderTitle">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarHeaderLayout" parent="Widget.MaterialComponents.MaterialCalendar.HeaderLayout">
+        <item name="android:background">?attr/colorSurface</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarHeaderSelection" parent="Widget.MaterialComponents.MaterialCalendar.HeaderSelection.Fullscreen">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
+        <item name="android:background">@color/transparent</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarHeaderToggleButton" parent="Widget.MaterialComponents.MaterialCalendar.HeaderToggleButton">
+        <item name="android:tint">?attr/colorOnSurface</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarHeaderConfirmButton" parent="Widget.MaterialComponents.MaterialCalendar.HeaderConfirmButton">
+        <item name="android:textColor">@color/on_surface_button_selector</item>
+        <item name="rippleColor">@color/on_surface_button_selector</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarHeaderDivider" parent="Widget.MaterialComponents.MaterialCalendar.HeaderDivider">
+        <item name="android:visibility">visible</item>
+        <item name="android:background">?attr/wpColorSurfaceSecondary</item>
+    </style>
+
+    <style name="WordPress.TextAppearance.MaterialCalendarDaysOfWeek" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:textSize">@dimen/text_sz_medium</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarDayTextView" parent="Widget.MaterialComponents.MaterialCalendar.DayTextView">
+        <item name="android:textSize">@dimen/text_sz_medium</item>
+    </style>
+
+    <style name="WordPress.MaterialCalendarSelectedDay" parent="Widget.MaterialComponents.MaterialCalendar.Day.Selected">
+        <item name="itemTextColor">?attr/colorOnSecondary</item>
     </style>
 
     <style name="WordPress.ActionMode" parent="@style/Widget.AppCompat.ActionMode">
@@ -141,11 +214,6 @@
         <item name="android:navigationBarColor">@android:color/black</item>
     </style>
 
-    <style name="WordPress.ZenDesk.Toolbar" parent="Widget.MaterialComponents.Toolbar.Surface">
-        <item name="titleTextColor">?attr/colorOnPrimary</item>
-        <item name="colorControlNormal">?attr/colorOnPrimary</item>
-    </style>
-
     <style name="WordPress.Stories.Immersive" parent="WordPress.NoActionBar">
         <item name="android:navigationBarColor">@android:color/black</item>
         <item name="android:immersive">true</item>
@@ -257,15 +325,6 @@
         <item name="android:textAppearance">@style/TextAppearance.AppCompat.Title</item>
     </style>
 
-    <style name="WordPress.ToolBar" parent="Widget.MaterialComponents.Toolbar.Surface">
-        <item name="titleTextColor">?attr/colorOnSurface</item>
-        <item name="android:background">@null</item>
-        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
-        <item name="titleTextAppearance">@style/WordPress.ToolBar.Title</item>
-        <item name="android:elevation">0dp</item>
-        <item name="colorControlNormal">?attr/colorOnSurface</item>
-    </style>
-
     <style name="WordPress.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
         <item name="android:background">?attr/colorSurface</item>
         <item name="liftOnScroll">true</item>
@@ -279,11 +338,6 @@
         <item name="android:textColorHint">?attr/wpColorOnSurfaceMedium</item>
     </style>
 
-    <style name="WordPress.ToolBar.Title" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="fontFamily">serif</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
     <style name="WordPress.ActionBar.LightDark" parent="Theme.AppCompat.Light">
         <item name="titleTextColor">?attr/colorOnSurface</item>
         <item name="toolbarNavigationButtonStyle">
@@ -295,7 +349,22 @@
         <item name="tint">?attr/colorOnSurface</item>
     </style>
 
-    <style name="WordPress.TabLayout" parent="Widget.MaterialComponents.TabLayout.Colored">
+    <style name="WordPress.Snackbar" parent="@style/Widget.MaterialComponents.Snackbar">
+        <item name="android:layout_margin">@dimen/margin_medium</item>
+        <item name="actionTextColorAlpha">1.0</item>
+        <item name="android:paddingStart">@dimen/margin_small</item>
+        <item name="android:paddingEnd">@dimen/margin_small</item>
+    </style>
+
+    <style name="WordPress.SnackbarButton" parent="Widget.MaterialComponents.Button.TextButton.Snackbar">
+        <item name="android:textColor">@color/blue_30</item>
+    </style>
+
+    <style name="WordPress.SnackbarText" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
+        <item name="actionTextColorAlpha">1.0</item>
+    </style>
+
+    <style name="WordPress.TabLayout" parent="Widget.MaterialComponents.TabLayout">
         <item name="android:background">@drawable/tab_layout_background</item>
         <item name="android:elevation">0dp</item>
         <item name="android:duplicateParentState">true</item>
@@ -417,6 +486,13 @@
         <item name="android:layout_centerHorizontal">true</item>
     </style>
 
+    <style name="ImprovedMySiteQuickActionButtonLabel" parent="MySiteQuickActionButtonLabel">
+        <item name="android:maxLines">1</item>
+        <item name="android:textSize">@dimen/text_sz_small</item>
+        <item name="android:ellipsize">end</item>
+        <item name="maxWidth">@dimen/my_site_quick_action_button_text_max_width</item>
+    </style>
+
     <style name="MySiteListRowLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -437,6 +513,15 @@
         <item name="android:gravity">center_vertical</item>
     </style>
 
+    <style name="UpdatedMySiteListRowIcon">
+        <item name="tint">?attr/wpColorOnSurfaceMedium</item>
+        <item name="android:layout_width">@dimen/my_site_list_row_icon_size</item>
+        <item name="android:layout_height">@dimen/my_site_list_row_icon_size</item>
+        <item name="android:layout_alignParentStart">true</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:gravity">center_vertical</item>
+    </style>
+
     <style name="MySiteListRowAlertIcon">
         <item name="tint">?attr/wpColorWarningLight</item>
         <item name="android:layout_width">@dimen/my_site_list_row_icon_size</item>
@@ -463,6 +548,16 @@
         <item name="android:paddingEnd">0dp</item>
     </style>
 
+    <style name="UpdatedMySiteListRowTextView">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_centerVertical">true</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
+    </style>
+
     <style name="MySiteListRowDescription">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
@@ -480,7 +575,7 @@
     </style>
 
     <style name="MySiteListRowSecondaryTextView" parent="MySiteListRowSecondaryElement">
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_alignParentEnd">true</item>
         <item name="android:ellipsize">end</item>
@@ -671,6 +766,11 @@
         <item name="android:textColor">?attr/wpColorOnSurfaceMedium</item>
     </style>
 
+    <style name="ShapeAppearance.QuickStartTaskCardIllustration" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">@dimen/quick_start_task_card_corner_radius</item>
+    </style>
+
     <!--People Management Styles-->
     <style name="PersonAvatar">
         <item name="android:layout_width">@dimen/people_avatar_sz</item>
@@ -685,11 +785,6 @@
         <item name="android:maxLines">1</item>
     </style>
 
-
-    <style name="SwitchBlueMedium">
-        <item name="colorControlActivated">@color/primary_40</item>
-    </style>
-
     <!--Post Settings Styles-->
     <style name="PostSettingsCardViewInnerLayout">
         <item name="android:layout_width">match_parent</item>
@@ -908,7 +1003,9 @@
         <item name="android:textSize">@dimen/text_sz_large</item>
     </style>
 
-    <style name="ActionableEmptyStateButton" parent="WordPress.Button.Primary">
+    <style name="ActionableEmptyStateButton" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Invite.Button.Secondary</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
         <item name="android:layout_marginEnd">
             @dimen/actionable_empty_view_text_margin_horizontal
         </item>
@@ -944,6 +1041,16 @@
         <item name="android:enabled">false</item>
     </style>
 
+    <!-- Site Creation: Domain Search Example-->
+    <style name="SiteCreationDomainExample">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textColor">@color/gray_40</item>
+        <item name="android:textSize">@dimen/text_sz_medium</item>
+        <item name="android:drawableStart">@drawable/ic_gridicons_lock</item>
+    </style>
+
     <!--Site Preview -->
     <style name="SiteCreationHeaderLinearLayoutStyle">
         <item name="android:layout_width">match_parent</item>
@@ -961,16 +1068,13 @@
         <item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
     </style>
 
-    <style name="SiteCreationHeaderTitle" parent="SiteCreationHeaderBaseTextStyle">
-        <item name="android:layout_marginBottom">@dimen/margin_small</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
     <style name="SiteCreationHeaderSubtitle" parent="SiteCreationHeaderBaseTextStyle">
         <item name="android:textColor">?attr/wpColorOnSurfaceMedium</item>
     </style>
 
-    <style name="SiteCreationPreviewHeaderTitle" parent="SiteCreationHeaderTitle">
+    <style name="SiteCreationPreviewHeaderTitle" parent="SiteCreationHeaderBaseTextStyle">
+        <item name="android:layout_marginBottom">@dimen/margin_small</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
         <item name="android:text">@string/new_site_creation_preview_title</item>
     </style>
@@ -1153,6 +1257,7 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:paddingTop">0dp</item>
         <item name="android:paddingBottom">0dp</item>
+        <item name="android:textAllCaps">true</item>
     </style>
 
     <style name="SubfilterDividerItem">
@@ -1225,6 +1330,10 @@
         <item name="android:windowAnimationStyle">@style/FullScreenDialogFragmentAnimation</item>
     </style>
 
+    <style name="WordPress.FullscreenDialog">
+        <item name="android:windowIsFloating">false</item>
+    </style>
+
     <!-- Overload of Aztec theme -->
     <style name="FormatBarButton">
         <item name="android:minWidth">@dimen/format_bar_height</item>
@@ -1270,31 +1379,6 @@
         <item name="android:paddingBottom">@dimen/margin_small_medium</item>
     </style>
 
-    <style name="TextAppearance.App.CollapsingToolbar.Expanded" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="fontFamily">serif</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.App.CollapsingToolbar.Collapsed" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="fontFamily">serif</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="WordPress.CollapsedToolbarLayout">
-        <item name="layout_scrollFlags">scroll|exitUntilCollapsed</item>
-        <item name="collapsedTitleTextAppearance">
-            @style/TextAppearance.App.CollapsingToolbar.Collapsed
-        </item>
-        <item name="expandedTitleTextAppearance">
-            @style/TextAppearance.App.CollapsingToolbar.Expanded
-        </item>
-        <item name="expandedTitleMarginBottom">@dimen/collapsible_toolbar_expanded_bottom_margin
-        </item>
-        <item name="expandedTitleMarginStart">16dp</item>
-    </style>
-
     <!-- Modal Layout Picker Styles -->
 
     <style name="ModalLayoutPickerText">
@@ -1310,6 +1394,9 @@
         <item name="android:textAppearance">?attr/textAppearanceHeadline6</item>
         <item name="fontFamily">serif</item>
         <item name="android:textStyle">bold</item>
+        <item name="autoSizeMaxTextSize">@dimen/text_sz_extra_large</item>
+        <item name="autoSizeMinTextSize">@dimen/text_sz_extra_extra_small</item>
+        <item name="autoSizeTextType">uniform</item>
     </style>
 
     <style name="ModalLayoutPickerTitle" parent="ModalLayoutPickerText">
@@ -1319,6 +1406,7 @@
         <item name="android:textColor">?attr/colorOnSurface</item>
         <item name="android:paddingTop">@dimen/mlp_titles_top_margin</item>
         <item name="android:paddingBottom">@dimen/margin_small_medium</item>
+        <item name="android:maxLines">3</item>
         <item name="fontFamily">serif</item>
     </style>
 
@@ -1370,7 +1458,9 @@
     <style name="ModalLayoutPickerCategoryEmoji" parent="ModalLayoutPickerText">
         <item name="android:layout_width">@dimen/mlp_categories_emoji_size</item>
         <item name="android:layout_height">@dimen/mlp_categories_emoji_size</item>
-        <item name="android:textSize">@dimen/text_sz_medium</item>
+        <item name="autoSizeMaxTextSize">@dimen/text_sz_medium</item>
+        <item name="autoSizeMinTextSize">@dimen/text_sz_extra_extra_small</item>
+        <item name="autoSizeTextType">uniform</item>
         <item name="android:layout_marginStart">@dimen/mlp_category_horizontal_margin</item>
         <item name="android:layout_marginEnd">@dimen/mlp_category_horizontal_central_margin</item>
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>
@@ -1391,4 +1481,65 @@
         <item name="android:textColor">@color/blue_50</item>
         <item name="android:textSize">@dimen/text_sz_medium</item>
     </style>
+
+    <!-- Invite Links -->
+    <style name="WordPress.Invite.Button.Primary" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.Invite.Button.Secondary</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+    </style>
+
+    <style name="ThemeOverlay.Invite.Button.Secondary" parent="">
+        <item name="colorPrimary">?attr/colorSecondary</item>
+        <item name="colorOnPrimary">?attr/colorOnSecondary</item>
+    </style>
+
+    <style name="WordPress.Invite.Button.Secondary" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="materialThemeOverlay">@style/ThemeOverlay.LoginFlow.Button.OnSurface</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+    </style>
+
+    <style name="WordPress.Button.Invite.DisruptiveAction" parent="WordPress.Invite.Button.Secondary">
+        <item name="android:textColor">?attr/wpColorError</item>
+    </style>
+
+    <!-- ActivityLog List Backup Download Notice Item -->
+    <style name="ActivityLogList.Notice.Item.Label" parent="android:Widget.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginBottom">@dimen/margin_small</item>
+        <item name="android:layout_marginStart">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginEnd">@dimen/margin_small</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
+        <item name="android:lineSpacingMultiplier">1.3</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:gravity">center_horizontal|center_vertical</item>
+    </style>
+
+    <style name="ActivityLogList.Notice.Item.PrimaryButton" parent="WordPress.Button.Primary">
+        <item name="android:textAllCaps">false</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginTop">@dimen/margin_small</item>
+        <item name="android:layout_marginBottom">@dimen/margin_extra_large</item>
+        <item name="android:layout_marginRight">@dimen/margin_medium</item>
+        <item name="android:paddingStart">@dimen/margin_extra_large</item>
+        <item name="android:paddingEnd">@dimen/margin_extra_large</item>
+        <item name="android:minHeight">@dimen/min_touch_target_sz</item>
+        <item name="android:minWidth">@dimen/min_touch_target_sz</item>
+    </style>
+
+    <style name="ActivityLogList.Notice.Item.SecondaryButton" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="textAllCaps">false</item>
+        <item name="materialThemeOverlay">@style/ThemeOverlay.SecondaryButton.OnSurface</item>
+        <item name="android:layout_marginBottom">@dimen/margin_small</item>
+        <item name="android:layout_marginLeft">@dimen/margin_medium</item>
+        <item name="android:paddingStart">@dimen/margin_extra_large</item>
+        <item name="android:paddingEnd">@dimen/margin_extra_large</item>
+        <item name="android:minHeight">@dimen/min_touch_target_sz</item>
+        <item name="android:minWidth">@dimen/min_touch_target_sz</item>
+    </style>
 </resources>
diff --git a/WordPress/src/main/res/values/styles_login.xml b/WordPress/src/main/res/values/styles_login.xml
new file mode 100644
index 000000000000..07c8ccaa9d00
--- /dev/null
+++ b/WordPress/src/main/res/values/styles_login.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="LoginTheme" parent="Theme.LoginFlow">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryVariant">@color/colorPrimaryVariant</item>
+        <item name="colorSecondary">@color/colorSecondary</item>
+        <item name="colorSecondaryVariant">@color/colorSecondaryVariant</item>
+    </style>
+
+    <style name="LoginTheme.TransparentStatusBar" parent="LoginTheme" />
+
+    <style name="Login.EmptyView.TextView.Username" parent="android:Widget.TextView">
+        <item name="android:textSize">@null</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle2</item>
+    </style>
+
+    <style name="Login.EmptyView.TextView.DisplayName" parent="android:Widget.TextView">
+        <item name="android:fontFamily">serif</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="Widget.EmptyView.CardView.BottomBar" parent="Widget.MaterialComponents.CardView">
+        <item name="cardCornerRadius">0dp</item>
+        <item name="cardElevation">0dp</item>
+    </style>
+
+    <style name="Login.EmptyView.Title" parent="">
+        <item name="android:layout_marginBottom">@dimen/margin_medium</item>
+        <item name="android:layout_marginEnd">
+            @dimen/actionable_empty_view_text_margin_horizontal
+        </item>
+        <item name="android:layout_marginStart">
+            @dimen/actionable_empty_view_text_margin_horizontal
+        </item>
+        <item name="android:maxWidth">@dimen/actionable_empty_view_text_maximum_width</item>
+        <item name="android:textAlignment">center</item>
+        <item name="android:textColor">?attr/wpColorOnSurfaceMedium</item>
+        <item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
+        <item name="android:textSize">@dimen/text_sz_extra_large</item>
+        <item name="android:lineSpacingExtra">@dimen/login_empty_view_line_spacing</item>
+        <item name="android:gravity">center_horizontal</item>
+    </style>
+
+    <style name="Login.EmptyView.SubTitle" parent="@style/Login.EmptyView.Title">
+        <item name="android:layout_marginBottom">@dimen/margin_extra_large</item>
+        <item name="android:textSize">@dimen/text_sz_large</item>
+        <item name="android:lineSpacingExtra">@dimen/login_empty_view_line_spacing</item>
+        <item name="android:gravity">center_horizontal</item>
+    </style>
+
+    <!-- Login Prologue -->
+    <style name="Widget.LoginFlow.Prologue" parent=""/>
+    <style name="Widget.LoginFlow.Button.Primary.Prologue" parent="Widget.LoginFlow.Button.Primary"/>
+    <style name="Widget.LoginFlow.Button.Secondary.Prologue" parent="Widget.LoginFlow.Button.Secondary"/>
+</resources>
diff --git a/WordPress/src/main/res/values/styles_toolbar.xml b/WordPress/src/main/res/values/styles_toolbar.xml
new file mode 100644
index 000000000000..2ac24928e044
--- /dev/null
+++ b/WordPress/src/main/res/values/styles_toolbar.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- Login -->
+    <style name="Widget.LoginFlow.Toolbar" parent="Widget.MaterialComponents.Toolbar.Surface">
+        <item name="titleTextAppearance">@style/TextAppearance.App.Toolbar.Title</item>
+        <item name="android:theme">@style/ThemeOverlay.LoginFlow.Toolbar</item>
+    </style>
+
+    <!-- App -->
+    <style name="WordPress.ToolBar" parent="Widget.MaterialComponents.Toolbar.Surface">
+        <item name="titleTextColor">?attr/colorOnSurface</item>
+        <item name="android:background">@null</item>
+        <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
+        <item name="titleTextAppearance">@style/TextAppearance.App.Toolbar.Title</item>
+        <item name="android:elevation">0dp</item>
+        <item name="colorControlNormal">?attr/colorOnSurface</item>
+    </style>
+
+    <style name="WordPress.CollapsedToolbarLayout">
+        <item name="layout_scrollFlags">scroll|exitUntilCollapsed</item>
+        <item name="collapsedTitleTextAppearance">
+            @style/TextAppearance.App.CollapsingToolbar.Collapsed
+        </item>
+        <item name="expandedTitleTextAppearance">
+            @style/TextAppearance.App.CollapsingToolbar.Expanded
+        </item>
+        <item name="expandedTitleMarginBottom">@dimen/collapsible_toolbar_expanded_bottom_margin
+        </item>
+        <item name="expandedTitleMarginStart">16dp</item>
+    </style>
+
+    <!-- Zendesk -->
+    <style name="WordPress.ZenDesk.Toolbar" parent="Widget.MaterialComponents.Toolbar.Surface">
+        <item name="titleTextAppearance">@style/TextAppearance.App.Toolbar.Title</item>
+        <item name="titleTextColor">?attr/colorOnPrimary</item>
+        <item name="colorControlNormal">?attr/colorOnPrimary</item>
+    </style>
+
+    <!-- TextAppearance -->
+    <style name="TextAppearance.App.Toolbar.Title" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="fontFamily">serif</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextAppearance.App.CollapsingToolbar.Expanded" parent="TextAppearance.MaterialComponents.Headline4">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="fontFamily">serif</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextAppearance.App.CollapsingToolbar.Collapsed" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="android:textColor">?attr/colorOnSurface</item>
+        <item name="fontFamily">serif</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+</resources>
diff --git a/WordPress/src/main/res/xml/jetpack_settings.xml b/WordPress/src/main/res/xml/jetpack_settings.xml
index 72f3f7cf0bd0..3530384c3ee5 100644
--- a/WordPress/src/main/res/xml/jetpack_settings.xml
+++ b/WordPress/src/main/res/xml/jetpack_settings.xml
@@ -33,12 +33,6 @@
             android:key="@string/pref_key_jetpack_prevent_brute_force"
             android:title="@string/jetpack_prevent_brute_force_title" />
 
-        <org.wordpress.android.ui.prefs.WPPreference
-            android:id="@+id/pref_brute_force_whitelist"
-            android:dependency="@string/pref_key_jetpack_prevent_brute_force"
-            android:key="@string/pref_key_jetpack_brute_force_whitelist"
-            android:title="@string/jetpack_brute_force_whitelist_title" />
-
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/WordPress/src/main/res/xml/site_settings.xml b/WordPress/src/main/res/xml/site_settings.xml
index 89e4461629ce..6713c498ded9 100644
--- a/WordPress/src/main/res/xml/site_settings.xml
+++ b/WordPress/src/main/res/xml/site_settings.xml
@@ -428,13 +428,13 @@
                     app:longClickHint="@string/site_settings_paging_hint" />
 
                 <org.wordpress.android.ui.prefs.DetailListPreference
-                    android:id="@+id/pref_whitelist"
+                    android:id="@+id/pref_allowlist"
                     android:entries="@array/site_settings_auto_approve_entries"
                     android:entryValues="@array/site_settings_auto_approve_values"
-                    android:key="@string/pref_key_site_whitelist"
-                    android:title="@string/site_settings_whitelist_title"
+                    android:key="@string/pref_key_site_allowlist"
+                    android:title="@string/site_settings_allowlist_title"
                     app:entryDetails="@array/site_settings_auto_approve_details"
-                    app:longClickHint="@string/site_settings_whitelist_hint" />
+                    app:longClickHint="@string/site_settings_allowlist_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
                     android:id="@+id/pref_multiple_links"
@@ -449,10 +449,10 @@
                     app:longClickHint="@string/site_settings_moderation_hold_hint" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
-                    android:id="@+id/pref_blacklist"
-                    android:key="@string/pref_key_site_blacklist"
-                    android:title="@string/site_settings_blacklist_title"
-                    app:longClickHint="@string/site_settings_blacklist_hint" />
+                    android:id="@+id/pref_denylist"
+                    android:key="@string/pref_key_site_denylist"
+                    android:title="@string/site_settings_denylist_title"
+                    app:longClickHint="@string/site_settings_denylist_hint" />
 
             </PreferenceCategory>
 
@@ -498,10 +498,10 @@
                     android:title="@string/jetpack_prevent_brute_force_title" />
 
                 <org.wordpress.android.ui.prefs.WPPreference
-                    android:id="@+id/pref_brute_force_whitelist"
+                    android:id="@+id/pref_brute_force_allowlist"
                     android:dependency="@string/pref_key_jetpack_prevent_brute_force"
-                    android:key="@string/pref_key_jetpack_brute_force_whitelist"
-                    android:title="@string/jetpack_brute_force_whitelist_title" />
+                    android:key="@string/pref_key_jetpack_brute_force_allowlist"
+                    android:title="@string/jetpack_brute_force_allowlist_title" />
 
             </PreferenceCategory>
 
diff --git a/WordPress/src/test/java/org/wordpress/android/CoroutinesUtils.kt b/WordPress/src/test/java/org/wordpress/android/CoroutinesUtils.kt
index 9c7ffb0fa0ac..397cd40a738a 100644
--- a/WordPress/src/test/java/org/wordpress/android/CoroutinesUtils.kt
+++ b/WordPress/src/test/java/org/wordpress/android/CoroutinesUtils.kt
@@ -23,7 +23,7 @@ fun <T : Any, R> KStubbing<T>.onBlocking(methodCall: suspend T.() -> R): Ongoing
     return runBlocking { Mockito.`when`(mock.methodCall()) }
 }
 
-val TEST_SCOPE = CoroutineScope(Unconfined)
+fun testScope() = CoroutineScope(Unconfined)
 @InternalCoroutinesApi val TEST_DISPATCHER: CoroutineDispatcher = TestDispatcher()
 
 @InternalCoroutinesApi
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModelTest.kt
new file mode 100644
index 000000000000..9aa05426dd46
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModelTest.kt
@@ -0,0 +1,124 @@
+package org.wordpress.android.ui.accounts
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import org.wordpress.android.util.BuildConfigWrapper
+
+class LoginEpilogueViewModelTest : BaseUnitTest() {
+    private lateinit var viewModel: LoginEpilogueViewModel
+
+    @Mock lateinit var appPrefsWrapper: AppPrefsWrapper
+    @Mock lateinit var buildConfigWrapper: BuildConfigWrapper
+    @Mock lateinit var siteStore: SiteStore
+
+    @Before
+    fun setUp() {
+        viewModel = LoginEpilogueViewModel(appPrefsWrapper, buildConfigWrapper, siteStore)
+    }
+
+    /* WordPress app - Post Signup Interstitial Screen */
+    @Test
+    fun `given wp app with no sites, when continued from epilogue first time, then signup interstitial shown`() {
+        init(isJetpackApp = false, hasSite = false, postSignupInterstitialShownEarlier = false)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(navigationEvents.first())
+                .isInstanceOf(LoginNavigationEvents.ShowPostSignupInterstitialScreen::class.java)
+    }
+
+    @Test
+    fun `given wp app with no sites, when continued from epilogue next time, then signup interstitial not shown`() {
+        init(isJetpackApp = false, hasSite = false, postSignupInterstitialShownEarlier = true)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(
+                navigationEvents.filterIsInstance(LoginNavigationEvents.ShowPostSignupInterstitialScreen::class.java)
+        ).isEmpty()
+    }
+
+    @Test
+    fun `given wp app with sites, when continued from epilogue, then signup interstitial not shown`() {
+        init(isJetpackApp = false, hasSite = true)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(
+                navigationEvents.filterIsInstance(LoginNavigationEvents.ShowPostSignupInterstitialScreen::class.java)
+        ).isEmpty()
+    }
+
+    /* WordPress app - Eplilogue Screen Close */
+    @Test
+    fun `given wp app with no sites, when continued from epilogue, then epilogue closes with ok result`() {
+        init(isJetpackApp = false, hasSite = false)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(navigationEvents.last())
+                .isInstanceOf(LoginNavigationEvents.CloseWithResultOk::class.java)
+    }
+
+    @Test
+    fun `given wp app with sites, when continued from epilogue, then epilogue closes with ok result`() {
+        init(isJetpackApp = false, hasSite = true)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(navigationEvents.last()).isInstanceOf(LoginNavigationEvents.CloseWithResultOk::class.java)
+    }
+
+    /* Jetpack app - No Jetpack Sites Screen */
+    @Test
+    fun `given jetpack app with no sites, when continued from epilogue, then no jetpack sites is shown`() {
+        init(isJetpackApp = true, hasSite = false)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(navigationEvents.last()).isInstanceOf(LoginNavigationEvents.ShowNoJetpackSites::class.java)
+    }
+
+    /* Jetpack app - Eplilogue Screen Close */
+    @Test
+    fun `given jetpack app with sites, when continued from epilogue, then screen closes with ok result`() {
+        init(isJetpackApp = true, hasSite = true)
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onContinue()
+
+        assertThat(navigationEvents.last()).isInstanceOf(LoginNavigationEvents.CloseWithResultOk::class.java)
+    }
+
+    private data class Observers(val navigationEvents: List<LoginNavigationEvents>)
+
+    private fun initObservers(): Observers {
+        val navigationEvents = mutableListOf<LoginNavigationEvents>()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it.peekContent()) }
+
+        return Observers(navigationEvents)
+    }
+
+    fun init(
+        isJetpackApp: Boolean,
+        hasSite: Boolean = false,
+        postSignupInterstitialShownEarlier: Boolean = false
+    ) {
+        whenever(buildConfigWrapper.isJetpackApp).thenReturn(isJetpackApp)
+        whenever(siteStore.hasSite()).thenReturn(hasSite)
+        whenever(appPrefsWrapper.shouldShowPostSignupInterstitial).thenReturn(!postSignupInterstitialShownEarlier)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginViewModelTest.kt
new file mode 100644
index 000000000000..283109192604
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/accounts/LoginViewModelTest.kt
@@ -0,0 +1,77 @@
+package org.wordpress.android.ui.accounts
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayloadScheme
+import org.wordpress.android.fluxc.store.SiteStore.ConnectSiteInfoPayload
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowNoJetpackSites
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSiteAddressError
+import org.wordpress.android.util.BuildConfigWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
+
+class LoginViewModelTest : BaseUnitTest() {
+    @Mock lateinit var buildConfigWrapper: BuildConfigWrapper
+    @Mock lateinit var resourceProvider: ResourceProvider
+    private lateinit var viewModel: LoginViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = LoginViewModel(buildConfigWrapper)
+    }
+
+    @Test
+    fun `given no jetpack sites, then ShowNoJetpackSitesError navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.onHandleNoJetpackSites()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowNoJetpackSites::class.java)
+    }
+
+    @Test
+    fun `given site is not jetpack, then ShowSiteAddressError navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+        val url = "nojetpack.wordpress.com"
+
+        val connectSiteInfoPayload = getConnectSiteInfoPayload(url)
+        viewModel.onHandleSiteAddressError(connectSiteInfoPayload)
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowSiteAddressError::class.java)
+    }
+
+    @Test
+    fun `given jetpack app, when magic link scheme is requested, then jetpack scheme is returned`() {
+        whenever(buildConfigWrapper.isJetpackApp).thenReturn(true)
+
+        val scheme = viewModel.getMagicLinkScheme()
+
+        assertThat(scheme).isEqualTo(AuthEmailPayloadScheme.JETPACK)
+    }
+
+    @Test
+    fun `given wordpress app, when magic link scheme is requested, then wordpress scheme is returned`() {
+        whenever(buildConfigWrapper.isJetpackApp).thenReturn(false)
+
+        val scheme = viewModel.getMagicLinkScheme()
+
+        assertThat(scheme).isEqualTo(AuthEmailPayloadScheme.WORDPRESS)
+    }
+
+    private fun getConnectSiteInfoPayload(url: String): ConnectSiteInfoPayload =
+            ConnectSiteInfoPayload(url, null)
+
+    private data class Observers(
+        val navigationEvents: List<LoginNavigationEvents>
+    )
+
+    private fun initObservers(): Observers {
+        val navigationEvents = mutableListOf<LoginNavigationEvents>()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it.peekContent()) }
+
+        return Observers(navigationEvents)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesViewModelTest.kt
new file mode 100644
index 000000000000..4d127315f334
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/jetpack/LoginNoSitesViewModelTest.kt
@@ -0,0 +1,192 @@
+package org.wordpress.android.ui.accounts.login.jetpack
+
+import android.os.Bundle
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.argThat
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.WordPress
+import org.wordpress.android.fluxc.model.AccountModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.accounts.LoginNavigationEvents
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowInstructions
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSignInForResultJetpackOnly
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.State.NoUser
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.State.ShowUser
+import org.wordpress.android.ui.accounts.login.jetpack.LoginNoSitesViewModel.UiModel
+
+private const val USERNAME = "username"
+private const val DISPLAY_NAME = "display_name"
+private const val AVATAR_URL = "avatar_url"
+
+@InternalCoroutinesApi
+class LoginNoSitesViewModelTest : BaseUnitTest() {
+    @Mock lateinit var unifiedLoginTracker: UnifiedLoginTracker
+    @Mock lateinit var wordPress: WordPress
+    @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var savedInstanceState: Bundle
+    private lateinit var viewModel: LoginNoSitesViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = LoginNoSitesViewModel(
+                unifiedLoginTracker,
+                accountStore,
+                TEST_DISPATCHER,
+                TEST_DISPATCHER
+        )
+    }
+
+    @Test
+    fun `given started, then application sign out is invoked`() {
+        setupAccountItem()
+
+        startViewModel()
+
+        verify(wordPress).wordPressComSignOut()
+    }
+
+    @Test
+    fun `given state does not include a user, when started, then state is recreated without a user`() {
+        val uiModel = initObservers().uiModel
+        setupInstanceStateForNoUser()
+
+        startViewModel(savedInstanceState)
+
+        assertThat(uiModel.last().state).isInstanceOf(NoUser::class.java)
+    }
+
+    @Test
+    fun `given state includes a user, when started, then state is recreated with a user`() {
+        val uiModel = initObservers().uiModel
+        setupInstanceStateForShowUser()
+
+        startViewModel(savedInstanceState)
+
+        assertThat(uiModel.last().state).isInstanceOf(ShowUser::class.java)
+    }
+
+    @Test
+    fun `given state is null, when account is null, then state is created without a user`() {
+        val uiModel = initObservers().uiModel
+
+        startViewModel()
+
+        assertThat(uiModel.last().state).isInstanceOf(NoUser::class.java)
+    }
+
+    @Test
+    fun `given state is null, when account is not null, then state is created with a user`() {
+        val uiModel = initObservers().uiModel
+        setupAccountItem()
+
+        startViewModel()
+
+        assertThat(uiModel.last().state).isInstanceOf(ShowUser::class.java)
+    }
+
+    @Test
+    fun `given on back pressed, then a sign in navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+        setupAccountItem()
+
+        startViewModel()
+        viewModel.onBackPressed()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowSignInForResultJetpackOnly::class.java)
+    }
+
+    @Test
+    fun `when see instructions pressed, then a show instructions navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+        setupAccountItem()
+
+        startViewModel()
+        viewModel.onSeeInstructionsPressed()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowInstructions::class.java)
+    }
+
+    @Test
+    fun `when choose another account is pressed, then a sign in navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+        setupAccountItem()
+
+        startViewModel()
+        viewModel.onTryAnotherAccountPressed()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowSignInForResultJetpackOnly::class.java)
+    }
+
+    @Test
+    fun `given state does not include a user, when save state is invoked, then a no user state is written`() {
+        startViewModel()
+
+        viewModel.writeToBundle(savedInstanceState)
+
+        verify(savedInstanceState).putSerializable(any(), argThat { this is NoUser })
+    }
+
+    @Test
+    fun `given state includes a user, when save state is invoked, then a user state is written`() {
+        setupAccountItem()
+        startViewModel()
+
+        viewModel.writeToBundle(savedInstanceState)
+
+        verify(savedInstanceState).putSerializable(any(), argThat { this is ShowUser })
+    }
+
+    private fun setupInstanceStateForNoUser() {
+        whenever(savedInstanceState.getSerializable(KEY_STATE)).thenReturn(NoUser)
+    }
+
+    private fun setupInstanceStateForShowUser() {
+        whenever(savedInstanceState.getSerializable(KEY_STATE)).thenReturn(
+                ShowUser(
+                        userName = USERNAME,
+                        displayName = DISPLAY_NAME,
+                        accountAvatarUrl = AVATAR_URL
+                )
+        )
+    }
+
+    private fun startViewModel(savedInstanceState: Bundle? = null) {
+        viewModel.start(wordPress, savedInstanceState)
+    }
+
+    private fun setupAccountItem(
+        userName: String = USERNAME,
+        displayName: String = DISPLAY_NAME,
+        avatarUrl: String = AVATAR_URL
+    ) {
+        val accountModel = AccountModel()
+        accountModel.userName = userName
+        accountModel.displayName = displayName
+        accountModel.avatarUrl = avatarUrl
+        whenever(accountStore.account).thenReturn(accountModel)
+    }
+
+    private data class Observers(
+        val navigationEvents: List<LoginNavigationEvents>,
+        val uiModel: List<UiModel>
+    )
+
+    private fun initObservers(): Observers {
+        val navigationEvents = mutableListOf<LoginNavigationEvents>()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it.peekContent()) }
+
+        val uiModel = mutableListOf<UiModel>()
+        viewModel.uiModel.observeForever { uiModel.add(it) }
+
+        return Observers(navigationEvents, uiModel)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModelTest.kt
new file mode 100644
index 000000000000..adc6faa0b461
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/accounts/login/jetpack/LoginSiteCheckErrorViewModelTest.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.ui.accounts.login.jetpack
+
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.ui.accounts.LoginNavigationEvents
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowInstructions
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowSignInForResultJetpackOnly
+
+@InternalCoroutinesApi
+class LoginSiteCheckErrorViewModelTest : BaseUnitTest() {
+    private lateinit var viewModel: LoginSiteCheckErrorViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = LoginSiteCheckErrorViewModel(TEST_DISPATCHER)
+    }
+
+    private data class Observers(
+        val navigationEvents: List<LoginNavigationEvents>
+    )
+
+    private fun initObservers(): Observers {
+        val navigationEvents = mutableListOf<LoginNavigationEvents>()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it.peekContent()) }
+
+        return Observers(navigationEvents)
+    }
+
+    @Test
+    fun `when see instructions pressed, then a show instructions navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.start()
+        viewModel.onSeeInstructionsPressed()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowInstructions::class.java)
+    }
+
+    @Test
+    fun `when choose another account is pressed, then a sign in navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.start()
+        viewModel.onTryAnotherAccountPressed()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowSignInForResultJetpackOnly::class.java)
+    }
+
+    @Test
+    fun `given on back pressed, then show sign in navigation event is posted`() {
+        val navigationEvents = initObservers().navigationEvents
+
+        viewModel.start()
+        viewModel.onBackPressed()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShowSignInForResultJetpackOnly::class.java)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/activitylog/RewindProgressCheckerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/activitylog/RewindProgressCheckerTest.kt
deleted file mode 100644
index 8ca7de7d0124..000000000000
--- a/WordPress/src/test/java/org/wordpress/android/ui/activitylog/RewindProgressCheckerTest.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.wordpress.android.ui.activitylog
-
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.inOrder
-import com.nhaarman.mockitokotlin2.verifyZeroInteractions
-import com.nhaarman.mockitokotlin2.whenever
-import junit.framework.Assert.assertEquals
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
-import org.wordpress.android.TEST_SCOPE
-import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_REWIND_STATE
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FINISHED
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State.ACTIVE
-import org.wordpress.android.fluxc.store.ActivityLogStore
-import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewindStatusFetched
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType.GENERIC_ERROR
-import java.util.Date
-
-@RunWith(MockitoJUnitRunner::class)
-class RewindProgressCheckerTest {
-    @Mock lateinit var activityLogStore: ActivityLogStore
-    @Mock lateinit var site: SiteModel
-    private val restoreId = 1L
-    private lateinit var rewindProgressChecker: RewindProgressChecker
-    @Before
-    fun setUp() {
-        rewindProgressChecker = RewindProgressChecker(activityLogStore, TEST_SCOPE)
-    }
-
-    private val finishedRewind = Rewind("rewindId", restoreId, FINISHED, 100, "finished")
-
-    private val rewindStatusModel = RewindStatusModel(ACTIVE, "reason", Date(), true, null, null)
-    private val finishedRewindStatus = rewindStatusModel.copy(rewind = finishedRewind)
-
-    @Test
-    fun `on start checks current value and finishes if rewind is done`() = runBlocking {
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(finishedRewindStatus)
-
-        val onRewindStatusFetched = rewindProgressChecker.start(site, restoreId, checkDelay = -1)
-
-        assertEquals(OnRewindStatusFetched(FETCH_REWIND_STATE), onRewindStatusFetched)
-    }
-
-    @Test
-    fun `on start triggers fetch if rewind not in progress`() = runBlocking {
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(rewindStatusModel, finishedRewindStatus)
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
-
-        val onRewindStatusFetched = rewindProgressChecker.start(site, restoreId, checkDelay = -1)
-
-        with(inOrder(activityLogStore)) {
-            verify(activityLogStore).getRewindStatusForSite(site)
-            verify(activityLogStore).fetchActivitiesRewind(any())
-            verify(activityLogStore).getRewindStatusForSite(site)
-        }
-
-        assertEquals(OnRewindStatusFetched(FETCH_REWIND_STATE), onRewindStatusFetched)
-    }
-
-    @Test
-    fun `on fetch fail return error`() = runBlocking {
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(rewindStatusModel)
-        val errorStatus = OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR, "generic error"), FETCH_REWIND_STATE)
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(errorStatus)
-
-        val onRewindStatusFetched = rewindProgressChecker.start(site, restoreId, checkDelay = -1)
-
-        with(inOrder(activityLogStore)) {
-            verify(activityLogStore).getRewindStatusForSite(site)
-            verify(activityLogStore).fetchActivitiesRewind(any())
-            verifyNoMoreInteractions()
-        }
-
-        assertEquals(errorStatus, onRewindStatusFetched)
-    }
-
-    @Test
-    fun `on cancel stops a job`() = runBlocking {
-        val onRewindStatusFetched = launch {
-            rewindProgressChecker.start(site, restoreId)
-        }
-
-        onRewindStatusFetched.cancel()
-
-        verifyZeroInteractions(activityLogStore)
-    }
-}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/activitylog/RewindStatusServiceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/activitylog/RewindStatusServiceTest.kt
deleted file mode 100644
index 22599514356b..000000000000
--- a/WordPress/src/test/java/org/wordpress/android/ui/activitylog/RewindStatusServiceTest.kt
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.wordpress.android.ui.activitylog
-
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.nhaarman.mockitokotlin2.any
-import com.nhaarman.mockitokotlin2.argumentCaptor
-import com.nhaarman.mockitokotlin2.reset
-import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.whenever
-import kotlinx.coroutines.runBlocking
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
-import org.wordpress.android.TEST_SCOPE
-import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_REWIND_STATE
-import org.wordpress.android.fluxc.action.ActivityLogAction.REWIND
-import org.wordpress.android.fluxc.model.SiteModel
-import org.wordpress.android.fluxc.model.activity.ActivityLogModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FAILED
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FINISHED
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.RUNNING
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State.ACTIVE
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State.INACTIVE
-import org.wordpress.android.fluxc.store.ActivityLogStore
-import org.wordpress.android.fluxc.store.ActivityLogStore.FetchRewindStatePayload
-import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewind
-import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewindStatusFetched
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindError
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindErrorType
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindPayload
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
-import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType.INVALID_RESPONSE
-import org.wordpress.android.fluxc.tools.FormattableContent
-import org.wordpress.android.ui.activitylog.RewindStatusService.RewindProgress
-import java.util.Date
-
-@RunWith(MockitoJUnitRunner::class)
-class RewindStatusServiceTest {
-    @Rule @JvmField val rule = InstantTaskExecutorRule()
-
-    private val rewindStatusCaptor = argumentCaptor<FetchRewindStatePayload>()
-    private val rewindCaptor = argumentCaptor<RewindPayload>()
-
-    @Mock private lateinit var activityLogStore: ActivityLogStore
-    @Mock private lateinit var rewindProgressChecker: RewindProgressChecker
-    @Mock private lateinit var site: SiteModel
-
-    private lateinit var rewindStatusService: RewindStatusService
-    private var rewindAvailable: Boolean? = null
-    private var rewindProgress: RewindProgress? = null
-    private var rewindError: RewindError? = null
-    private var rewindStatusFetchError: RewindStatusError? = null
-
-    private val rewindId = "10"
-    private val activityID = "activityId"
-    private val published = Date()
-    private val activityLogModel = ActivityLogModel(
-            activityID,
-            "summary",
-            FormattableContent(text = "text"),
-            null,
-            null,
-            null,
-            null,
-            null,
-            rewindId,
-            published
-    )
-
-    private val activeRewindStatusModel = RewindStatusModel(
-            state = ACTIVE,
-            lastUpdated = Date(),
-            rewind = null,
-            credentials = null,
-            reason = null,
-            canAutoconfigure = null
-    )
-
-    private val progress = 23
-    private val rewindInProgress = Rewind(
-            rewindId = rewindId,
-            restoreId = 10,
-            status = RUNNING,
-            progress = progress,
-            reason = null
-    )
-
-    @Before
-    fun setUp() = runBlocking<Unit> {
-        rewindStatusService = RewindStatusService(activityLogStore, rewindProgressChecker, TEST_SCOPE)
-        rewindAvailable = null
-        rewindStatusService.rewindAvailable.observeForever { rewindAvailable = it }
-        rewindStatusService.rewindProgress.observeForever { rewindProgress = it }
-        rewindStatusService.rewindError.observeForever { rewindError = it }
-        rewindStatusService.rewindStatusFetchError.observeForever { rewindStatusFetchError = it }
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(null)
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
-        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind(rewindId, null, REWIND))
-
-        whenever(activityLogStore.getActivityLogItemByRewindId(rewindId)).thenReturn(activityLogModel)
-        whenever(site.origin).thenReturn(SiteModel.ORIGIN_WPCOM_REST)
-        whenever(rewindProgressChecker.startNow(any(), any())).thenReturn(null)
-    }
-
-    @After
-    fun tearDown() {
-        rewindStatusService.stop()
-    }
-
-    @Test
-    fun emitsAvailableRewindStatusOnStartWhenActiveStatusPresent() {
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(activeRewindStatusModel)
-
-        rewindStatusService.start(site)
-
-        assertEquals(rewindAvailable, true)
-    }
-
-    @Test
-    fun emitsUnavailableRewindStatusOnStartWhenNonActiveStatusPresent() {
-        val inactiveRewindStatusModel = activeRewindStatusModel.copy(state = INACTIVE)
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(inactiveRewindStatusModel)
-
-        rewindStatusService.start(site)
-
-        assertEquals(rewindAvailable, false)
-    }
-
-    @Test
-    fun emitsUnavailableRewindStatusOnStartWhenRewindInProgress() = runBlocking {
-        val inactiveRewindStatusModel = activeRewindStatusModel.copy(rewind = rewindInProgress)
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(inactiveRewindStatusModel, null)
-
-        rewindStatusService.start(site)
-
-        assertEquals(rewindAvailable, false)
-    }
-
-    @Test
-    fun triggersFetchWhenRewindStatusNotAvailable() = runBlocking {
-        rewindStatusService.start(site)
-
-        assertFetchRewindStatusAction()
-    }
-
-    @Test
-    fun updatesRewindStatusAndRestartsCheckerWhenRewindNotAlreadyRunning() = runBlocking<Unit> {
-        rewindStatusService.start(site)
-        val rewindStatusInProgress = activeRewindStatusModel.copy(rewind = rewindInProgress)
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(rewindStatusInProgress, null)
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
-        reset(rewindProgressChecker)
-
-        rewindStatusService.requestStatusUpdate()
-
-        verify(rewindProgressChecker).startNow(site, rewindInProgress.restoreId)
-    }
-
-    @Test
-    fun triggersRewindAndMakesActionUnavailable() = runBlocking {
-        val rewindId = "10"
-
-        rewindStatusService.rewind(rewindId, site)
-
-        assertRewindAction(rewindId)
-        assertEquals(false, rewindAvailable)
-        assertEquals(rewindProgress, RewindProgress(activityLogModel, 0, published, RUNNING))
-    }
-
-    @Test
-    fun cancelsWorkerOnFetchErrorRewindStateAndEmitsError() = runBlocking {
-        rewindStatusService.start(site)
-        val error = RewindStatusError(INVALID_RESPONSE, null)
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(error, REWIND))
-
-        rewindStatusService.requestStatusUpdate()
-
-        assertEquals(error, rewindStatusFetchError)
-    }
-
-    @Test
-    fun onRewindStateInProgressUpdateState() = runBlocking {
-        rewindStatusService.start(site)
-
-        val rewindStatusInProgress = activeRewindStatusModel.copy(rewind = rewindInProgress)
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(rewindStatusInProgress, null)
-
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
-
-        rewindStatusService.requestStatusUpdate()
-
-        assertEquals(rewindAvailable, false)
-        assertEquals(rewindProgress?.status, Status.RUNNING)
-        assertEquals(rewindProgress, RewindProgress(activityLogModel, progress, published, RUNNING))
-    }
-
-    @Test
-    fun onRewindStateFinishedUpdateState() = runBlocking {
-        rewindStatusService.start(site)
-
-        val rewindFinished = rewindInProgress.copy(status = FINISHED, progress = 100)
-        val rewindStatusInProgress = activeRewindStatusModel.copy(rewind = rewindFinished)
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(rewindStatusInProgress, null)
-
-        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
-
-        rewindStatusService.requestStatusUpdate()
-
-        assertEquals(rewindAvailable, true)
-        assertEquals(rewindProgress?.status, Status.FINISHED)
-    }
-
-    @Test
-    fun onRewindErrorCancelWorkerAndReenableRewindStatus() = runBlocking {
-        rewindStatusService.start(site)
-
-        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(activeRewindStatusModel)
-
-        val error = RewindError(RewindErrorType.INVALID_RESPONSE, null)
-        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind(rewindId, error, REWIND))
-
-        rewindAvailable = null
-
-        rewindStatusService.rewind(rewindId, site)
-
-        assertEquals(rewindAvailable, true)
-        assertEquals(error, rewindError)
-        val progress = RewindProgress(activityLogModel, 0, published, FAILED, INVALID_RESPONSE.toString())
-        assertEquals(rewindProgress, progress)
-    }
-
-    @Test
-    fun onRewindFetchStatusAndStartWorker() = runBlocking<Unit> {
-        rewindStatusService.start(site)
-        reset(rewindProgressChecker)
-
-        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind("5", 10, REWIND))
-
-        rewindStatusService.rewind(rewindId, site)
-
-        verify(rewindProgressChecker).start(site, 10)
-    }
-
-    private suspend fun assertFetchRewindStatusAction() {
-        verify(activityLogStore).fetchActivitiesRewind(rewindStatusCaptor.capture())
-        rewindStatusCaptor.firstValue.apply {
-            assertEquals(this.site, site)
-        }
-    }
-
-    private suspend fun assertRewindAction(rewindId: String) {
-        verify(activityLogStore).rewind(rewindCaptor.capture())
-        rewindCaptor.firstValue.apply {
-            assertEquals(this.site, site)
-            assertEquals(this.rewindId, rewindId)
-        }
-    }
-}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModelTest.kt
new file mode 100644
index 000000000000..ceb11308f2ad
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/activitylog/list/filter/ActivityLogTypeFilterViewModelTest.kt
@@ -0,0 +1,260 @@
+package org.wordpress.android.ui.activitylog.list.filter
+
+import androidx.core.util.Pair
+import com.nhaarman.mockitokotlin2.KArgumentCaptor
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.argumentCaptor
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_ACTIVITY_TYPES
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityTypesError
+import org.wordpress.android.fluxc.store.ActivityLogStore.ActivityTypesErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.FetchActivityTypesPayload
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnActivityTypesFetched
+import org.wordpress.android.test
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.ListItemUiState.ActivityType
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState
+import org.wordpress.android.ui.activitylog.list.filter.ActivityLogTypeFilterViewModel.UiState.Content
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel
+import org.wordpress.android.viewmodel.activitylog.DateRange
+
+private const val REMOTE_SITE_ID = 0L
+
+@InternalCoroutinesApi
+class ActivityLogTypeFilterViewModelTest : BaseUnitTest() {
+    private lateinit var viewModel: ActivityLogTypeFilterViewModel
+    @Mock private lateinit var parentViewModel: ActivityLogViewModel
+    @Mock private lateinit var activityLogStore: ActivityLogStore
+
+    @Before
+    fun setUp() {
+        viewModel = ActivityLogTypeFilterViewModel(activityLogStore, TEST_DISPATCHER, TEST_DISPATCHER)
+    }
+
+    @Test
+    fun `fullscreen loading shown, when screen initialized`() = test {
+        val uiStates = init().uiStates
+
+        startVM()
+
+        assertThat(uiStates[0]).isInstanceOf(UiState.FullscreenLoading::class.java)
+    }
+
+    @Test
+    fun `available activity types fetched, when screen initialized, when content shown`() = test {
+        init()
+
+        startVM()
+
+        verify(activityLogStore).fetchActivityTypes(anyOrNull())
+    }
+
+    @Test
+    fun `section header gets added as first item in the list, when content shown`() = test {
+        init()
+
+        startVM()
+
+        assertThat((viewModel.uiState.value as Content).items[0])
+                .isInstanceOf(ListItemUiState.SectionHeader::class.java)
+    }
+
+    @Test
+    fun `content shown, when fetch available activity types completes successfully`() = test {
+        init(successResponse = true)
+
+        startVM()
+
+        assertThat(viewModel.uiState.value).isInstanceOf(Content::class.java)
+    }
+
+    @Test
+    fun `connection error shown, when fetch available activity types completes with error`() = test {
+        init(successResponse = false)
+
+        startVM()
+
+        assertThat(viewModel.uiState.value).isInstanceOf(UiState.Error.ConnectionError::class.java)
+    }
+
+    @Test
+    fun `no activities error shown, when fetch available activity types returns empty list`() = test {
+        init(successResponse = true, activityTypeCount = 0)
+
+        startVM()
+
+        assertThat(viewModel.uiState.value).isInstanceOf(UiState.Error.NoActivitiesError::class.java)
+    }
+
+    @Test
+    fun `available activity types fetched, when error retry action invoked`() = test {
+        init(successResponse = false)
+        startVM()
+
+        (viewModel.uiState.value as UiState.Error).retryAction!!.action.invoke()
+
+        verify(activityLogStore, times(2)).fetchActivityTypes(anyOrNull())
+    }
+
+    @Test
+    fun `content shown, when retry succeeds`() = test {
+        init(successResponse = false)
+        startVM()
+        init(successResponse = true)
+
+        (viewModel.uiState.value as UiState.Error).retryAction!!.action.invoke()
+
+        assertThat(viewModel.uiState.value).isInstanceOf(Content::class.java)
+    }
+
+    @Test
+    fun `content contains all fetched activity types, when fetch activity types completes`() = test {
+        val activityTypeCount = 17 // random number
+        init(activityTypeCount = activityTypeCount)
+
+        startVM()
+
+        assertThat((viewModel.uiState.value as Content).items.size).isEqualTo(1 + activityTypeCount)
+    }
+
+    @Test
+    fun `item is checked, when the user clicks on it`() = test {
+        val uiStates = init().uiStates
+        startVM()
+
+        ((uiStates.last() as Content).items[1] as ActivityType).onClick.invoke()
+
+        assertThat(((uiStates.last() as Content).items[1] as ActivityType).checked).isTrue
+    }
+
+    @Test
+    fun `item is unchecked, when the user clicks on it twice`() = test {
+        val uiStates = init().uiStates
+        startVM()
+
+        ((uiStates.last() as Content).items[1] as ActivityType).onClick.invoke()
+        ((uiStates.last() as Content).items[1] as ActivityType).onClick.invoke()
+
+        assertThat(((uiStates.last() as Content).items[1] as ActivityType).checked).isFalse
+    }
+
+    @Test
+    fun `dialog dismissed, when the user clicks on apply action`() = test {
+        val observers = init()
+        startVM()
+
+        (observers.uiStates.last() as Content).primaryAction.action.invoke()
+
+        assertThat(observers.dismissDialogEvents).isNotEmpty
+    }
+
+    @Test
+    fun `selected items propagated to activity log, when the user clicks on apply action`() = test {
+        val observers = init(activityTypeCount = 1)
+        startVM()
+        // select an item
+        val activityType = ((observers.uiStates.last() as Content).items[1] as ActivityType)
+        activityType.onClick.invoke()
+
+        (observers.uiStates.last() as Content).primaryAction.action.invoke()
+
+        verify(parentViewModel).onActivityTypesSelected(listOf(ActivityTypeModel("1", "1", 1)))
+    }
+
+    @Test
+    fun `items unchecked, when the user clicks on clear action`() = test {
+        val uiStates = init().uiStates
+        startVM()
+        // select an item
+        val activityType = ((uiStates.last() as Content).items[1] as ActivityType)
+        activityType.onClick.invoke()
+
+        (uiStates.last() as Content).secondaryAction.action.invoke()
+
+        assertThat(
+                (uiStates.last() as Content).items.filterIsInstance(ActivityType::class.java)
+                        .filter { it.checked }
+        ).isEmpty()
+    }
+
+    @Test
+    fun `items are checked, when the user opens the screen with active activity type filter`() = test {
+        val uiStates = init().uiStates
+        val initialSelection = listOf("1", "4")
+
+        startVM(initialSelection = initialSelection)
+
+        assertThat((uiStates.last() as Content).items.filterIsInstance(ActivityType::class.java)
+                .filter { it.checked }.map { it.id }
+        ).containsExactlyElementsOf(initialSelection)
+    }
+
+    @Test
+    fun `date range passed to the api, when provided on view model start`() = test {
+        val after = 1L
+        val before = 2L
+        init().uiStates
+        val captor: KArgumentCaptor<FetchActivityTypesPayload> = argumentCaptor()
+
+        startVM(dateRange = Pair(after, before))
+
+        verify(activityLogStore).fetchActivityTypes(captor.capture())
+        assertThat(captor.firstValue.after!!.time).isEqualTo(after)
+        assertThat(captor.firstValue.before!!.time).isEqualTo(before)
+    }
+
+    private suspend fun init(successResponse: Boolean = true, activityTypeCount: Int = 5): Observers {
+        val uiStates = mutableListOf<UiState>()
+        val dismissDialogEvents = mutableListOf<Unit>()
+        viewModel.uiState.observeForever {
+            uiStates.add(it)
+        }
+        viewModel.dismissDialog.observeForever {
+            dismissDialogEvents.add(it.peekContent())
+        }
+
+        whenever(activityLogStore.fetchActivityTypes(anyOrNull()))
+                .thenReturn(
+                        if (successResponse) {
+                            OnActivityTypesFetched(
+                                    FETCH_ACTIVITY_TYPES,
+                                    REMOTE_SITE_ID,
+                                    generateActivityTypes(activityTypeCount),
+                                    activityTypeCount
+                            )
+                        } else {
+                            OnActivityTypesFetched(
+                                    REMOTE_SITE_ID,
+                                    ActivityTypesError(GENERIC_ERROR),
+                                    FETCH_ACTIVITY_TYPES
+                            )
+                        }
+                )
+        return Observers(uiStates, dismissDialogEvents)
+    }
+
+    private fun startVM(initialSelection: List<String> = listOf(), dateRange: DateRange? = null) {
+        viewModel.start(RemoteId(REMOTE_SITE_ID), parentViewModel, dateRange, initialSelection)
+    }
+
+    private fun generateActivityTypes(count: Int): List<ActivityTypeModel> {
+        return (1..count).asSequence().map { ActivityTypeModel("$it", it.toString(), count) }.toList()
+    }
+
+    private data class Observers(
+        val uiStates: List<UiState>,
+        val dismissDialogEvents: List<Unit>
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt
new file mode 100644
index 000000000000..803b5418937e
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkUriUtilsTest.kt
@@ -0,0 +1,59 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.util.UriUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class DeepLinkUriUtilsTest {
+    @Mock lateinit var siteStore: SiteStore
+    @Mock lateinit var uriUtilsWrapper: UriUtilsWrapper
+    private lateinit var deepLinkUriUtils: DeepLinkUriUtils
+    private val host = "example.com"
+    lateinit var site: SiteModel
+
+    @Before
+    fun setUp() {
+        deepLinkUriUtils = DeepLinkUriUtils(siteStore, uriUtilsWrapper)
+        site = SiteModel()
+        val buildUri = buildUri("example.com")
+        whenever(uriUtilsWrapper.parse(host)).thenReturn(buildUri)
+    }
+
+    @Test
+    fun `converts host to site when site exists and host matches URL`() {
+        site.url = host
+        whenever(siteStore.getSitesByNameOrUrlMatching(host)).thenReturn(listOf(site))
+
+        val hostToSite = deepLinkUriUtils.hostToSite(host)
+
+        assertThat(hostToSite).isEqualTo(site)
+    }
+
+    @Test
+    fun `returns null when site exists but host doesn't match URL`() {
+        site.url = host
+        val differentUrl = "different_url.com"
+        whenever(siteStore.getSitesByNameOrUrlMatching(differentUrl)).thenReturn(listOf(site))
+
+        val hostToSite = deepLinkUriUtils.hostToSite(differentUrl)
+
+        assertThat(hostToSite).isNull()
+    }
+
+    @Test
+    fun `returns null when site doesnt exist`() {
+        whenever(siteStore.getSitesByNameOrUrlMatching(host)).thenReturn(listOf())
+
+        val hostToSite = deepLinkUriUtils.hostToSite(host)
+
+        assertThat(hostToSite).isNull()
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModelTest.kt
new file mode 100644
index 000000000000..c4561c4717aa
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/DeepLinkingIntentReceiverViewModelTest.kt
@@ -0,0 +1,293 @@
+package org.wordpress.android.ui.deeplinks
+
+import android.net.Uri
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.isNull
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DEEP_LINKED
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.LoginForResult
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenEditor
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.StartCreateSiteFlow
+import org.wordpress.android.util.UriWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+
+class DeepLinkingIntentReceiverViewModelTest : BaseUnitTest() {
+    @Mock lateinit var editorLinkHandler: EditorLinkHandler
+    @Mock lateinit var statsLinkHandler: StatsLinkHandler
+    @Mock lateinit var startLinkHandler: StartLinkHandler
+    @Mock lateinit var readerLinkHandler: ReaderLinkHandler
+    @Mock lateinit var notificationsLinkHandler: NotificationsLinkHandler
+    @Mock lateinit var pagesLinkHandler: PagesLinkHandler
+    @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var deepLinkUriUtils: DeepLinkUriUtils
+    @Mock lateinit var serverTrackingHandler: ServerTrackingHandler
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    private lateinit var viewModel: DeepLinkingIntentReceiverViewModel
+    private val startUrl = buildUri("wordpress.com", "start")
+    private val postUrl = buildUri("wordpress.com", "post")
+    private var isFinished = false
+    private lateinit var navigateActions: MutableList<NavigateAction>
+
+    @InternalCoroutinesApi
+    @Before
+    fun setUp() {
+        viewModel = DeepLinkingIntentReceiverViewModel(
+                TEST_DISPATCHER,
+                editorLinkHandler,
+                statsLinkHandler,
+                startLinkHandler,
+                readerLinkHandler,
+                pagesLinkHandler,
+                notificationsLinkHandler,
+                deepLinkUriUtils,
+                accountStore,
+                serverTrackingHandler,
+                analyticsUtilsWrapper
+        )
+        whenever(startLinkHandler.isStartUrl(startUrl)).thenReturn(true)
+        whenever(editorLinkHandler.isEditorUrl(postUrl)).thenReturn(true)
+        isFinished = false
+        viewModel.finish.observeForever {
+            it?.getContentIfNotHandled()?.let {
+                isFinished = true
+            }
+        }
+        navigateActions = mutableListOf()
+        viewModel.navigateAction.observeForever {
+            it?.getContentIfNotHandled()?.let {
+                navigateActions.add(it)
+            }
+        }
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+    }
+
+    @Test
+    fun `does not navigate and finishes on WPcom URL`() {
+        val uri = buildUri("wordpress.com", "bar")
+
+        viewModel.start(null, uri)
+
+        assertUriNotHandled()
+    }
+
+    @Test
+    fun `does not navigate and finishes on non-mobile URL`() {
+        val uri = buildUri("public-api.wordpress.com", "bar")
+
+        viewModel.start(null, uri)
+
+        assertUriNotHandled()
+    }
+
+    @Test
+    fun `mbar URL without redirect parameter replaced mbar to bar and opened in browser`() {
+        val uri = buildUri("public-api.wordpress.com", "mbar")
+        val barUri = buildUri("public-api.wordpress.com", "bar")
+        whenever(uri.copy("bar")).thenReturn(barUri)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(NavigateAction.OpenInBrowser(barUri))
+    }
+
+    @Test
+    fun `create site mbar URL triggers the Site Creation flow`() {
+        val uri = buildUri("public-api.wordpress.com", "mbar", "redirect_to=...")
+        val firstRedirect = buildUri("wordpress.com", "wp-login.php", "redirect_to...")
+
+        whenever(deepLinkUriUtils.getUriFromQueryParameter(uri, "redirect_to")).thenReturn(firstRedirect)
+        whenever(deepLinkUriUtils.getUriFromQueryParameter(firstRedirect, "redirect_to")).thenReturn(startUrl)
+        whenever(startLinkHandler.buildNavigateAction()).thenReturn(StartCreateSiteFlow)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(StartCreateSiteFlow)
+        verify(serverTrackingHandler).request(uri)
+    }
+
+    @Test
+    fun `wp-login mbar URL redirects user to browser with missing second redirect`() {
+        val uri = buildUri("public-api.wordpress.com", "mbar", "redirect_to=...")
+        val redirect = buildUri("wordpress.com", "wp-login.php")
+        whenever(deepLinkUriUtils.getUriFromQueryParameter(uri, "redirect_to")).thenReturn(redirect)
+        val barUri = buildUri("public-api.wordpress.com", "bar")
+        whenever(uri.copy("bar")).thenReturn(barUri)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(NavigateAction.OpenInBrowser(barUri))
+    }
+
+    @Test
+    fun `post mbar URL triggers the editor`() {
+        val uri = buildUri("public-api.wordpress.com", "mbar", "redirect_to=...")
+        whenever(deepLinkUriUtils.getUriFromQueryParameter(uri, "redirect_to")).thenReturn(postUrl)
+        val expectedAction = NavigateAction.OpenEditor
+        whenever(editorLinkHandler.buildOpenEditorNavigateAction(postUrl)).thenReturn(expectedAction)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(expectedAction)
+        verify(serverTrackingHandler).request(uri)
+    }
+
+    @Test
+    fun `does not handle pages url`() {
+        val uri = buildUri("wordpress.com", "pages")
+
+        viewModel.start(null, uri)
+
+        assertUriNotHandled()
+    }
+
+    @Test
+    fun `does not handle app link to pages`() {
+        val uri = buildUri("pages", "")
+
+        viewModel.start(null, uri)
+
+        assertUriNotHandled()
+    }
+
+    @Test
+    fun `opens navigate action from editor link handler`() {
+        val (uri, expected) = initEditorLinkHandler()
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(expected)
+    }
+
+    @Test
+    fun `opens login when user logged out`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+        val (uri, _) = initEditorLinkHandler()
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(LoginForResult)
+    }
+
+    @Test
+    fun `opens navigate action from stats link handler`() {
+        val siteUrl = "site123"
+        val uri = buildUri("wordpress.com", "stats", siteUrl)
+        whenever(statsLinkHandler.isStatsUrl(uri)).thenReturn(true)
+        val expected = NavigateAction.OpenStats
+        whenever(statsLinkHandler.buildOpenStatsNavigateAction(uri)).thenReturn(expected)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(expected)
+    }
+
+    @Test
+    fun `opens navigate action from notifications link handler`() {
+        val siteUrl = "site123"
+        val uri = buildUri("wordpress.com", "notifications", siteUrl)
+        whenever(notificationsLinkHandler.isNotificationsUrl(uri)).thenReturn(true)
+        val expected = NavigateAction.OpenNotifications
+        whenever(notificationsLinkHandler.buildNavigateAction()).thenReturn(expected)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(expected)
+    }
+
+    @Test
+    fun `view post mbar URL triggers the reader when it can be resolved`() {
+        val uri = buildUri("public-api.wordpress.com", "mbar", "redirect_to=...")
+        val redirect = buildUri("wordpress.com", "read")
+        val expectedAction = NavigateAction.OpenInReader(redirect)
+
+        whenever(deepLinkUriUtils.getUriFromQueryParameter(uri, "redirect_to")).thenReturn(redirect)
+        whenever(readerLinkHandler.isReaderUrl(redirect)).thenReturn(true)
+        whenever(readerLinkHandler.buildOpenInReaderNavigateAction(redirect)).thenReturn(expectedAction)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(expectedAction)
+        verify(serverTrackingHandler).request(uri)
+    }
+
+    @Test
+    fun `view post mbar URL triggers the browser when it can't be resolved`() {
+        val uri = buildUri("public-api.wordpress.com", "mbar", "redirect_to=...")
+        val redirect = buildUri("wordpress.com", "read")
+        val barUri = buildUri("public-api.wordpress.com", "bar")
+        val expectedAction = NavigateAction.OpenInBrowser(barUri)
+
+        whenever(deepLinkUriUtils.getUriFromQueryParameter(uri, "redirect_to")).thenReturn(redirect)
+        whenever(readerLinkHandler.isReaderUrl(redirect)).thenReturn(false)
+        whenever(uri.copy("bar")).thenReturn(barUri)
+
+        viewModel.start(null, uri)
+
+        assertUriHandled(expectedAction)
+        verifyZeroInteractions(serverTrackingHandler)
+    }
+
+    @Test
+    fun `tracks deeplink when action not null and URL null`() {
+        val action = "VIEW"
+
+        viewModel.start(action, null)
+
+        verify(analyticsUtilsWrapper).trackWithDeepLinkData(eq(DEEP_LINKED), eq(action), eq(""), isNull())
+    }
+
+    @Test
+    fun `tracks deeplink when action not null and URL not null`() {
+        val action = "VIEW"
+        val host = "wordpress.com"
+        val uriWrapper = buildUri(host, "read")
+        val mockedUri = mock<Uri>()
+        whenever(uriWrapper.uri).thenReturn(mockedUri)
+
+        viewModel.start(action, uriWrapper)
+
+        verify(analyticsUtilsWrapper).trackWithDeepLinkData(DEEP_LINKED, action, host, mockedUri)
+    }
+
+    @Test
+    fun `on successful login rehandles the cached URL`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false, true)
+        val (uri, expected) = initEditorLinkHandler()
+        viewModel.start(null, uri)
+
+        viewModel.onSuccessfulLogin()
+
+        assertThat(navigateActions).containsExactly(LoginForResult, expected)
+    }
+
+    private fun assertUriNotHandled() {
+        assertThat(isFinished).isTrue()
+        assertThat(navigateActions).isEmpty()
+    }
+
+    private fun assertUriHandled(navigateAction: NavigateAction) {
+        assertThat(isFinished).isFalse()
+        assertThat(navigateActions.last()).isEqualTo(navigateAction)
+    }
+
+    private fun initEditorLinkHandler(): Pair<UriWrapper, OpenEditor> {
+        val siteUrl = "site123"
+        val uri = buildUri("wordpress.com", "post", siteUrl)
+        whenever(editorLinkHandler.isEditorUrl(uri)).thenReturn(true)
+        val expected = OpenEditor
+        whenever(editorLinkHandler.buildOpenEditorNavigateAction(uri)).thenReturn(expected)
+        return Pair(uri, expected)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/EditorLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/EditorLinkHandlerTest.kt
new file mode 100644
index 000000000000..7ce531b6b88a
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/EditorLinkHandlerTest.kt
@@ -0,0 +1,192 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+
+class EditorLinkHandlerTest : BaseUnitTest() {
+    @Mock lateinit var deepLinkUriUtils: DeepLinkUriUtils
+    @Mock lateinit var postStore: PostStore
+    private lateinit var editorLinkHandler: EditorLinkHandler
+    private lateinit var site: SiteModel
+    private lateinit var post: PostModel
+    private val siteUrl = "site123"
+    private val blogId = "321"
+    private val remotePostId = 123L
+    private val localPostId = 1
+    private lateinit var toasts: MutableList<Int>
+
+    @Before
+    fun setUp() {
+        editorLinkHandler = EditorLinkHandler(deepLinkUriUtils, postStore)
+        site = SiteModel()
+        site.url = siteUrl
+        post = PostModel()
+        post.setRemotePostId(remotePostId)
+        post.setId(localPostId)
+        toasts = mutableListOf()
+        editorLinkHandler.toast.observeForever { it?.getContentIfNotHandled()?.let { toast -> toasts.add(toast) } }
+    }
+
+    @Test
+    fun `handles post URI`() {
+        val postUri = buildUri(host = "wordpress.com", path1 = "post")
+
+        val isEditorUri = editorLinkHandler.isEditorUrl(postUri)
+
+        assertThat(isEditorUri).isTrue()
+    }
+
+    @Test
+    fun `handles post app link`() {
+        val postUri = buildUri(host = "post")
+
+        val isEditorUri = editorLinkHandler.isEditorUrl(postUri)
+
+        assertThat(isEditorUri).isTrue()
+    }
+
+    @Test
+    fun `does not handle post URI with different host`() {
+        val postUri = buildUri(host = "wordpress.org", path1 = "post")
+
+        val isEditorUri = editorLinkHandler.isEditorUrl(postUri)
+
+        assertThat(isEditorUri).isFalse()
+    }
+
+    @Test
+    fun `does not handle URI with different path`() {
+        val postUri = buildUri(host = "wordpress.com", path1 = "stats")
+
+        val isEditorUri = editorLinkHandler.isEditorUrl(postUri)
+
+        assertThat(isEditorUri).isFalse()
+    }
+
+    @Test
+    fun `deeplink - opens editor and shows toast when site not found`() {
+        val uri = buildUri(path1 = "post", path2 = siteUrl)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditor)
+        assertThat(toasts.last()).isEqualTo(R.string.blog_not_found)
+    }
+
+    @Test
+    fun `deeplink - opens editor for a site when post missing in URL`() {
+        val uri = buildUri(path1 = "post", path2 = siteUrl)
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForSite(site))
+        assertThat(toasts).isEmpty()
+    }
+
+    @Test
+    fun `deeplink - opens editor for a post when both site and post exist`() {
+        val uri = buildUri(path1 = "post", path2 = siteUrl, path3 = remotePostId.toString())
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+        whenever(postStore.getPostByRemotePostId(remotePostId, site)).thenReturn(post)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForPost(site, localPostId))
+        assertThat(toasts).isEmpty()
+    }
+
+    @Test
+    fun `deeplink - opens editor for a site and shows toast when post not found`() {
+        val uri = buildUri(path1 = "post", path2 = siteUrl, path3 = remotePostId.toString())
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+        whenever(postStore.getPostByRemotePostId(remotePostId, site)).thenReturn(null)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForSite(site))
+        assertThat(toasts.last()).isEqualTo(R.string.post_not_found)
+    }
+
+    @Test
+    fun `applink - opens editor and shows toast when site not found`() {
+        val uri = buildUri(
+                host = "post",
+                queryParam1 = "blogId" to blogId
+        )
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditor)
+        assertThat(toasts.last()).isEqualTo(R.string.blog_not_found)
+    }
+
+    @Test
+    fun `applink - opens editor for a site from ID when post missing in URL`() {
+        val uri = buildUri(
+                host = "post",
+                queryParam1 = "blogId" to blogId
+        )
+        whenever(deepLinkUriUtils.blogIdToSite(blogId)).thenReturn(site)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForSite(site))
+        assertThat(toasts).isEmpty()
+    }
+
+    @Test
+    fun `applink - opens editor for a site from URL`() {
+        val uri = buildUri(
+                host = "post",
+                queryParam1 = "blogId" to siteUrl
+        )
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForSite(site))
+        assertThat(toasts).isEmpty()
+    }
+
+    @Test
+    fun `applink - opens editor for a post when both site and post exist`() {
+        val uri = buildUri(
+                host = "post",
+                queryParam1 = "blogId" to blogId,
+                queryParam2 = "postId" to remotePostId.toString()
+        )
+        whenever(deepLinkUriUtils.blogIdToSite(blogId)).thenReturn(site)
+        whenever(postStore.getPostByRemotePostId(remotePostId, site)).thenReturn(post)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForPost(site, localPostId))
+        assertThat(toasts).isEmpty()
+    }
+
+    @Test
+    fun `applink - opens editor for a site and shows toast when post not found`() {
+        val uri = buildUri(
+                host = "post",
+                queryParam1 = "blogId" to blogId,
+                queryParam2 = "postId" to remotePostId.toString()
+        )
+        whenever(deepLinkUriUtils.blogIdToSite(blogId)).thenReturn(site)
+        whenever(postStore.getPostByRemotePostId(remotePostId, site)).thenReturn(null)
+
+        val navigateAction = editorLinkHandler.buildOpenEditorNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenEditorForSite(site))
+        assertThat(toasts.last()).isEqualTo(R.string.post_not_found)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/NotificationsLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/NotificationsLinkHandlerTest.kt
new file mode 100644
index 000000000000..af67211e3f19
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/NotificationsLinkHandlerTest.kt
@@ -0,0 +1,55 @@
+package org.wordpress.android.ui.deeplinks
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenNotifications
+
+@RunWith(MockitoJUnitRunner::class)
+class NotificationsLinkHandlerTest {
+    private val notificationsLinkHandler = NotificationsLinkHandler()
+
+    @Test
+    fun `handles WPCom notifications URL`() {
+        val uri = buildUri(host = "wordpress.com", path1 = "notifications")
+
+        val isHandled = notificationsLinkHandler.isNotificationsUrl(uri)
+
+        assertThat(isHandled).isTrue()
+    }
+
+    @Test
+    fun `handles notifications app link`() {
+        val uri = buildUri(host = "notifications")
+
+        val isHandled = notificationsLinkHandler.isNotificationsUrl(uri)
+
+        assertThat(isHandled).isTrue()
+    }
+
+    @Test
+    fun `does not handle WPCom non-notifications URL`() {
+        val uri = buildUri(host = "wordpress.com", path1 = "stats")
+
+        val isHandled = notificationsLinkHandler.isNotificationsUrl(uri)
+
+        assertThat(isHandled).isFalse()
+    }
+
+    @Test
+    fun `does not handle non-WPCom notifications URL`() {
+        val uri = buildUri(host = "wordpress.org", path1 = "notifications")
+
+        val isHandled = notificationsLinkHandler.isNotificationsUrl(uri)
+
+        assertThat(isHandled).isFalse()
+    }
+
+    @Test
+    fun `builds notifications navigate action`() {
+        val navigateAction = notificationsLinkHandler.buildNavigateAction()
+
+        assertThat(navigateAction).isEqualTo(OpenNotifications)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/PagesLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/PagesLinkHandlerTest.kt
new file mode 100644
index 000000000000..6ed7df2b41bc
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/PagesLinkHandlerTest.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+
+@RunWith(MockitoJUnitRunner::class)
+class PagesLinkHandlerTest {
+    @Mock lateinit var deepLinkUriUtils: DeepLinkUriUtils
+    @Mock lateinit var site: SiteModel
+    private lateinit var pagesLinkHandler: PagesLinkHandler
+
+    @Before
+    fun setUp() {
+        pagesLinkHandler = PagesLinkHandler(deepLinkUriUtils)
+    }
+
+    @Test
+    fun `handles pages URI`() {
+        val pagesUri = buildUri(host = "wordpress.com", path1 = "pages")
+
+        val isPagesUri = pagesLinkHandler.isPagesUrl(pagesUri)
+
+        assertThat(isPagesUri).isTrue()
+    }
+
+    @Test
+    fun `does not handle pages URI with different host`() {
+        val pagesUri = buildUri(host = "wordpress.org", path1 = "pages")
+
+        val isPagesUri = pagesLinkHandler.isPagesUrl(pagesUri)
+
+        assertThat(isPagesUri).isFalse()
+    }
+
+    @Test
+    fun `does not handle URI with different path`() {
+        val pagesUri = buildUri(host = "wordpress.com", path1 = "post")
+
+        val isPagesUri = pagesLinkHandler.isPagesUrl(pagesUri)
+
+        assertThat(isPagesUri).isFalse()
+    }
+
+    @Test
+    fun `opens pages screen from empty URL`() {
+        val uri = buildUri(path1 = "pages")
+
+        val navigateAction = pagesLinkHandler.buildNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenPages)
+    }
+
+    @Test
+    fun `opens pages screen for a site when URL ends with site URL`() {
+        val siteUrl = "example.com"
+        val uri = buildUri(path1 = "pages", path2 = siteUrl)
+        whenever(uri.lastPathSegment).thenReturn(siteUrl)
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+
+        val navigateAction = pagesLinkHandler.buildNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(NavigateAction.OpenPagesForSite(site))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/ReaderLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/ReaderLinkHandlerTest.kt
new file mode 100644
index 000000000000..1e069d8114f1
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/ReaderLinkHandlerTest.kt
@@ -0,0 +1,121 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.READER_VIEWPOST_INTERCEPTED
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenInReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.OpenReader
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ViewPostInReader
+import org.wordpress.android.ui.reader.ReaderConstants
+import org.wordpress.android.ui.utils.IntentUtils
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+
+class ReaderLinkHandlerTest : BaseUnitTest() {
+    @Mock lateinit var intentUtils: IntentUtils
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    private lateinit var readerLinkHandler: ReaderLinkHandler
+
+    @Before
+    fun setUp() {
+        readerLinkHandler = ReaderLinkHandler(intentUtils, analyticsUtilsWrapper)
+    }
+
+    @Test
+    fun `handles URI with host == read`() {
+        val uri = buildUri(host = "read")
+
+        val isReaderUri = readerLinkHandler.isReaderUrl(uri)
+
+        assertThat(isReaderUri).isTrue()
+    }
+
+    @Test
+    fun `handles URI with host == viewpost`() {
+        val uri = buildUri(host = "viewpost")
+
+        val isReaderUri = readerLinkHandler.isReaderUrl(uri)
+
+        assertThat(isReaderUri).isTrue()
+    }
+
+    @Test
+    fun `handles URI when intent utils can resolve it`() {
+        val uri = buildUri(host = "reader")
+        whenever(intentUtils.canResolveWith(ReaderConstants.ACTION_VIEW_POST, uri)).thenReturn(true)
+
+        val isReaderUri = readerLinkHandler.isReaderUrl(uri)
+
+        assertThat(isReaderUri).isTrue()
+    }
+
+    @Test
+    fun `does not handle URI when intent utils cannot resolve it`() {
+        val uri = buildUri(host = "reader")
+        whenever(intentUtils.canResolveWith(ReaderConstants.ACTION_VIEW_POST, uri)).thenReturn(false)
+
+        val isReaderUri = readerLinkHandler.isReaderUrl(uri)
+
+        assertThat(isReaderUri).isFalse()
+    }
+
+    @Test
+    fun `URI with read host opens reader`() {
+        val uri = buildUri(host = "read")
+
+        val navigateAction = readerLinkHandler.buildOpenInReaderNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(OpenReader)
+    }
+
+    @Test
+    fun `URI with viewpost host without query params opens reader`() {
+        val uri = buildUri(host = "viewpost")
+
+        val navigateAction = readerLinkHandler.buildOpenInReaderNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(OpenReader)
+    }
+
+    @Test
+    fun `URI with viewpost host with non-number query params opens reader`() {
+        val uri = buildUri(
+                host = "viewpost",
+                queryParam1 = "blogId" to "abc",
+                queryParam2 = "postId" to "cba"
+        )
+
+        val navigateAction = readerLinkHandler.buildOpenInReaderNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(OpenReader)
+    }
+
+    @Test
+    fun `URI with viewpost host with query params opens post in reader`() {
+        val blogId: Long = 123
+        val postId: Long = 321
+        val uri = buildUri(
+                host = "viewpost",
+                queryParam1 = "blogId" to blogId.toString(),
+                queryParam2 = "postId" to postId.toString()
+        )
+
+        val navigateAction = readerLinkHandler.buildOpenInReaderNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(ViewPostInReader(blogId, postId, uri))
+        verify(analyticsUtilsWrapper).trackWithBlogPostDetails(READER_VIEWPOST_INTERCEPTED, blogId, postId)
+    }
+
+    @Test
+    fun `opens URI in reader when host is neither read nor viewpost`() {
+        val uri = buildUri(host = "openInReader")
+
+        val navigateAction = readerLinkHandler.buildOpenInReaderNavigateAction(uri)
+
+        assertThat(navigateAction).isEqualTo(OpenInReader(uri))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/StartLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/StartLinkHandlerTest.kt
new file mode 100644
index 000000000000..55156341b097
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/StartLinkHandlerTest.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.ShowSignInFlow
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction.StartCreateSiteFlow
+
+@RunWith(MockitoJUnitRunner::class)
+class StartLinkHandlerTest {
+    @Mock lateinit var accountStore: AccountStore
+    private lateinit var startLinkHandler: StartLinkHandler
+
+    @Before
+    fun setUp() {
+        startLinkHandler = StartLinkHandler(accountStore)
+    }
+
+    @Test
+    fun `handles start URI is true`() {
+        val startUri = buildUri("wordpress.com", "start")
+
+        val isStartUri = startLinkHandler.isStartUrl(startUri)
+
+        assertThat(isStartUri).isTrue()
+    }
+
+    @Test
+    fun `does not handle start URI with different host`() {
+        val startUri = buildUri("wordpress.org", "start")
+
+        val isStartUri = startLinkHandler.isStartUrl(startUri)
+
+        assertThat(isStartUri).isFalse()
+    }
+
+    @Test
+    fun `does not handle URI with different path`() {
+        val startUri = buildUri("wordpress.com", "stop")
+
+        val isStartUri = startLinkHandler.isStartUrl(startUri)
+
+        assertThat(isStartUri).isFalse()
+    }
+
+    @Test
+    fun `returns site creation flow action when user logged in`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+
+        val navigateAction = startLinkHandler.buildNavigateAction()
+
+        assertThat(navigateAction).isEqualTo(StartCreateSiteFlow)
+    }
+
+    @Test
+    fun `returns sign in action when user not logged in`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+
+        val navigateAction = startLinkHandler.buildNavigateAction()
+
+        assertThat(navigateAction).isEqualTo(ShowSignInFlow)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/StatsLinkHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/StatsLinkHandlerTest.kt
new file mode 100644
index 000000000000..86314ebf2449
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/StatsLinkHandlerTest.kt
@@ -0,0 +1,129 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.deeplinks.DeepLinkNavigator.NavigateAction
+import org.wordpress.android.ui.stats.StatsTimeframe.DAY
+import org.wordpress.android.ui.stats.StatsTimeframe.INSIGHTS
+import org.wordpress.android.ui.stats.StatsTimeframe.MONTH
+import org.wordpress.android.ui.stats.StatsTimeframe.WEEK
+import org.wordpress.android.ui.stats.StatsTimeframe.YEAR
+
+@RunWith(MockitoJUnitRunner::class)
+class StatsLinkHandlerTest {
+    @Mock lateinit var deepLinkUriUtils: DeepLinkUriUtils
+    @Mock lateinit var site: SiteModel
+    private lateinit var statsLinkHandler: StatsLinkHandler
+
+    @Before
+    fun setUp() {
+        statsLinkHandler = StatsLinkHandler(deepLinkUriUtils)
+    }
+
+    @Test
+    fun `handles stats URI`() {
+        val statsUri = buildUri(host = "wordpress.com", path1 = "stats")
+
+        val isStatsUri = statsLinkHandler.isStatsUrl(statsUri)
+
+        assertThat(isStatsUri).isTrue()
+    }
+
+    @Test
+    fun `handles stats App link`() {
+        val statsUri = buildUri(host = "stats")
+
+        val isStatsUri = statsLinkHandler.isStatsUrl(statsUri)
+
+        assertThat(isStatsUri).isTrue()
+    }
+
+    @Test
+    fun `does not handle stats URI with different host`() {
+        val statsUri = buildUri(host = "wordpress.org", path1 = "stats")
+
+        val isStatsUri = statsLinkHandler.isStatsUrl(statsUri)
+
+        assertThat(isStatsUri).isFalse()
+    }
+
+    @Test
+    fun `does not handle URI with different path`() {
+        val statsUri = buildUri(host = "wordpress.com", path1 = "post")
+
+        val isStatsUri = statsLinkHandler.isStatsUrl(statsUri)
+
+        assertThat(isStatsUri).isFalse()
+    }
+
+    @Test
+    fun `opens stats screen from empty URL`() {
+        val uri = buildUri(path1 = "stats")
+
+        val buildOpenStatsNavigateAction = statsLinkHandler.buildOpenStatsNavigateAction(uri)
+
+        assertThat(buildOpenStatsNavigateAction).isEqualTo(NavigateAction.OpenStats)
+    }
+
+    @Test
+    fun `opens stats screen from app link`() {
+        val uri = buildUri(host = "stats")
+
+        val buildOpenStatsNavigateAction = statsLinkHandler.buildOpenStatsNavigateAction(uri)
+
+        assertThat(buildOpenStatsNavigateAction).isEqualTo(NavigateAction.OpenStats)
+    }
+
+    @Test
+    fun `opens stats screen for a site when URL ends with site URL`() {
+        val siteUrl = "example.com"
+        val uri = buildUri(path1 = "stats", path2 = siteUrl)
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+
+        val buildOpenStatsNavigateAction = statsLinkHandler.buildOpenStatsNavigateAction(uri)
+
+        assertThat(buildOpenStatsNavigateAction).isEqualTo(NavigateAction.OpenStatsForSite(site))
+    }
+
+    @Test
+    fun `opens stats screen for a stats timeframe and a site when both present in URL`() {
+        val siteUrl = "example.com"
+        val timeframes = mapOf(
+                "day" to DAY,
+                "week" to WEEK,
+                "month" to MONTH,
+                "year" to YEAR,
+                "insights" to INSIGHTS
+        )
+        timeframes.forEach { (key, timeframe) ->
+            val uri = buildUri(path1 = "stats", path2 = key, path3 = siteUrl)
+            whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+
+            val buildOpenStatsNavigateAction = statsLinkHandler.buildOpenStatsNavigateAction(uri)
+
+            assertThat(buildOpenStatsNavigateAction).isEqualTo(
+                    NavigateAction.OpenStatsForSiteAndTimeframe(
+                            site,
+                            timeframe
+                    )
+            )
+        }
+    }
+
+    @Test
+    fun `opens stats screen for a site when timeframe not valid`() {
+        val siteUrl = "example.com"
+        val uri = buildUri(path1 = "stats", path2 = "invalid", path3 = siteUrl)
+        whenever(deepLinkUriUtils.hostToSite(siteUrl)).thenReturn(site)
+
+        val buildOpenStatsNavigateAction = statsLinkHandler.buildOpenStatsNavigateAction(uri)
+
+        assertThat(buildOpenStatsNavigateAction).isEqualTo(NavigateAction.OpenStatsForSite(site))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/UriTestHelper.kt b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/UriTestHelper.kt
new file mode 100644
index 000000000000..c19a15e2215a
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/deeplinks/UriTestHelper.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.deeplinks
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.wordpress.android.util.UriWrapper
+
+fun buildUri(host: String? = null, path1: String? = null, path2: String? = null, path3: String? = null): UriWrapper {
+    val uri = mock<UriWrapper>()
+    if (host != null) {
+        whenever(uri.host).thenReturn(host)
+    }
+    if (path1 != null || path2 != null || path3 != null) {
+        whenever(uri.pathSegments).thenReturn(listOfNotNull(path1, path2, path3))
+    }
+    return uri
+}
+
+fun buildUri(
+    host: String? = null,
+    queryParam1: Pair<String, String>? = null,
+    queryParam2: Pair<String, String>? = null
+): UriWrapper {
+    val uri = mock<UriWrapper>()
+    if (host != null) {
+        whenever(uri.host).thenReturn(host)
+    }
+    if (queryParam1 != null) {
+        whenever(uri.getQueryParameter(queryParam1.first)).thenReturn(queryParam1.second)
+    }
+    if (queryParam2 != null) {
+        whenever(uri.getQueryParameter(queryParam2.first)).thenReturn(queryParam2.second)
+    }
+    return uri
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/EngagedPeopleListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/EngagedPeopleListViewModelTest.kt
new file mode 100644
index 000000000000..cd7c141c8d4a
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/EngagedPeopleListViewModelTest.kt
@@ -0,0 +1,509 @@
+package org.wordpress.android.ui.engagement
+
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.test
+import org.wordpress.android.ui.engagement.AuthorName.AuthorNameString
+import org.wordpress.android.ui.engagement.EngageItem.LikedItem
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngageItem.NextLikesPageLoader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewCommentInReader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewPostInReader
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewSiteById
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.PreviewSiteByUrl
+import org.wordpress.android.ui.engagement.EngagedListServiceRequestEvent.RequestBlogPost
+import org.wordpress.android.ui.engagement.EngagedListServiceRequestEvent.RequestComment
+import org.wordpress.android.ui.engagement.EngagedPeopleListViewModel.EngagedPeopleListUiState
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_NOTIFICATION_LIST
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_READER_LIST
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeGroupFingerPrint
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_COMMENT_LIKES
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_POST_LIKES
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_1
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_2
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_3
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_4
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_5
+import org.wordpress.android.ui.engagement.utils.generatesEquivalentLikedItem
+import org.wordpress.android.ui.engagement.utils.getGetLikesState
+import org.wordpress.android.ui.engagement.utils.isEqualTo
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.viewmodel.Event
+
+@InternalCoroutinesApi
+class EngagedPeopleListViewModelTest : BaseUnitTest() {
+    @Mock lateinit var getLikesHandler: GetLikesHandler
+    @Mock lateinit var readerUtilsWrapper: ReaderUtilsWrapper
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    @Mock lateinit var listScenario: ListScenario
+    @Mock lateinit var headerData: HeaderData
+
+    private lateinit var viewModel: EngagedPeopleListViewModel
+
+    private val engagementUtils = EngagementUtils()
+
+    private val snackbarEvents = MutableLiveData<Event<SnackbarMessageHolder>>()
+    private val getLikesState = MutableLiveData<GetLikesState>()
+
+    private var uiState: EngagedPeopleListUiState? = null
+    private var navigationEvent: EngagedListNavigationEvent? = null
+    private var serviceRequestEvent: MutableList<EngagedListServiceRequestEvent> = mutableListOf()
+    private var holder: SnackbarMessageHolder? = null
+
+    private val siteId = 100L
+    private val postId = 1000L
+    private val commentId = 10000L
+    private val expectedNumLikes = 6
+
+    @Before
+    fun setup() {
+        setupMocksForPostOrComment(LOAD_POST_LIKES)
+
+        whenever(getLikesHandler.snackbarEvents).thenReturn(snackbarEvents)
+        whenever(getLikesHandler.likesStatusUpdate).thenReturn(getLikesState)
+
+        viewModel = EngagedPeopleListViewModel(
+                TEST_DISPATCHER,
+                TEST_DISPATCHER,
+                getLikesHandler,
+                readerUtilsWrapper,
+                engagementUtils,
+                analyticsUtilsWrapper
+        )
+
+        setupObservers()
+    }
+
+    @Test
+    fun `onCleared call clear on likes handler`() {
+        viewModel.onCleared()
+
+        verify(getLikesHandler, times(1)).clear()
+    }
+
+    @Test
+    fun `data refresh is requested on start`() = test {
+        viewModel.start(listScenario)
+
+        verify(getLikesHandler, times(1)).handleGetLikesForPost(
+                LikeGroupFingerPrint(
+                        siteId,
+                        postId,
+                        expectedNumLikes
+                ),
+                false
+        )
+    }
+
+    @Test
+    fun `post is requested for reader when post does not exist`() {
+        whenever(readerUtilsWrapper.postExists(siteId, postId)).thenReturn(false)
+
+        viewModel.start(listScenario)
+
+        assertThat(serviceRequestEvent).isNotEmpty
+        assertThat(serviceRequestEvent).isEqualTo(listOf(RequestBlogPost(siteId, postId)))
+    }
+
+    @Test
+    fun `comment is requested for reader when comment does not exist`() {
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        whenever(readerUtilsWrapper.postExists(siteId, postId)).thenReturn(true)
+        whenever(readerUtilsWrapper.commentExists(siteId, postId, commentId)).thenReturn(false)
+
+        viewModel.start(listScenario)
+
+        assertThat(serviceRequestEvent).isNotEmpty
+        assertThat(serviceRequestEvent).isEqualTo(listOf(RequestComment(siteId, postId, commentId)))
+    }
+
+    @Test
+    fun `post and comment are requested for reader when they do not exist`() {
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        whenever(readerUtilsWrapper.postExists(siteId, postId)).thenReturn(false)
+        whenever(readerUtilsWrapper.commentExists(siteId, postId, commentId)).thenReturn(false)
+
+        viewModel.start(listScenario)
+
+        assertThat(serviceRequestEvent).isNotEmpty
+        assertThat(serviceRequestEvent).isEqualTo(
+                listOf(
+                        RequestBlogPost(siteId, postId),
+                        RequestComment(siteId, postId, commentId)
+                )
+        )
+    }
+
+    @Test
+    fun `likes are requested for post`() = test {
+        viewModel.start(listScenario)
+
+        verify(getLikesHandler, times(1)).handleGetLikesForPost(
+                LikeGroupFingerPrint(
+                        siteId,
+                        postId,
+                        expectedNumLikes
+                ),
+                false
+        )
+    }
+
+    @Test
+    fun `likes are requested for comment`() = test {
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        viewModel.start(listScenario)
+
+        verify(getLikesHandler, times(1)).handleGetLikesForComment(
+                LikeGroupFingerPrint(
+                        siteId,
+                        commentId,
+                        expectedNumLikes
+                ),
+                false
+        )
+    }
+
+    @Test
+    fun `uiState is updated with post liked item, likers and no page loader`() = test {
+        val likesState = getGetLikesState(TEST_CONFIG_1)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            assertThat(it.showLikeFacesTrainContainer).isFalse
+            assertThat(it.showLoading).isFalse
+            with(it.engageItemsList) {
+                val likedItem = this.filterIsInstance<LikedItem>()
+                val likerItems = this.filterIsInstance<Liker>()
+                val pageLoader = this.filterIsInstance<NextLikesPageLoader>()
+
+                assertThat(likedItem.size).isEqualTo(1)
+                assertThat(listScenario.generatesEquivalentLikedItem(likedItem.first()))
+                assertThat((likesState as LikesData).likes.isEqualTo(likerItems)).isTrue
+                assertThat(pageLoader).isEmpty()
+            }
+        }
+    }
+
+    @Test
+    fun `uiState is updated with post liked item, likers and page loader`() = test {
+        val likesState = getGetLikesState(TEST_CONFIG_2)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            assertThat(it.showLikeFacesTrainContainer).isFalse
+            assertThat(it.showLoading).isFalse
+            with(it.engageItemsList) {
+                val likedItem = this.filterIsInstance<LikedItem>()
+                val likerItems = this.filterIsInstance<Liker>()
+                val pageLoader = this.filterIsInstance<NextLikesPageLoader>()
+
+                assertThat(likedItem.size).isEqualTo(1)
+                assertThat(listScenario.generatesEquivalentLikedItem(likedItem.first()))
+                assertThat((likesState as LikesData).likes.isEqualTo(likerItems)).isTrue
+                assertThat(pageLoader.size).isEqualTo(1)
+            }
+        }
+    }
+
+    @Test
+    fun `uiState is updated with comment liked item, likers and no page loader`() = test {
+        val likesState = getGetLikesState(TEST_CONFIG_3)
+
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            assertThat(it.showLikeFacesTrainContainer).isFalse
+            assertThat(it.showLoading).isFalse
+            with(it.engageItemsList) {
+                val likedItem = this.filterIsInstance<LikedItem>()
+                val likerItems = this.filterIsInstance<Liker>()
+                val pageLoader = this.filterIsInstance<NextLikesPageLoader>()
+
+                assertThat(likedItem.size).isEqualTo(1)
+                assertThat(listScenario.generatesEquivalentLikedItem(likedItem.first()))
+                assertThat((likesState as LikesData).likes.isEqualTo(likerItems)).isTrue
+                assertThat(pageLoader).isEmpty()
+            }
+        }
+    }
+
+    @Test
+    fun `uiState is updated with comment liked item, likers and page loader`() = test {
+        val likesState = getGetLikesState(TEST_CONFIG_4)
+
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            assertThat(it.showLikeFacesTrainContainer).isFalse
+            assertThat(it.showLoading).isFalse
+            with(it.engageItemsList) {
+                val likedItem = this.filterIsInstance<LikedItem>()
+                val likerItems = this.filterIsInstance<Liker>()
+                val pageLoader = this.filterIsInstance<NextLikesPageLoader>()
+
+                assertThat(likedItem.size).isEqualTo(1)
+                assertThat(listScenario.generatesEquivalentLikedItem(likedItem.first()))
+                assertThat((likesState as LikesData).likes.isEqualTo(likerItems)).isTrue
+                assertThat(pageLoader.size).isEqualTo(1)
+            }
+        }
+    }
+
+    @Test
+    fun `uiState shows empty state on failure with no values in cache`() = test {
+        val likesState = getGetLikesState(TEST_CONFIG_5)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            assertThat(it.showLikeFacesTrainContainer).isFalse
+            assertThat(it.showLoading).isFalse
+            with(it.engageItemsList) {
+                val likedItem = this.filterIsInstance<LikedItem>()
+                val likerItems = this.filterIsInstance<Liker>()
+                val pageLoader = this.filterIsInstance<NextLikesPageLoader>()
+
+                assertThat(likedItem.size).isEqualTo(1)
+                assertThat(listScenario.generatesEquivalentLikedItem(likedItem.first()))
+                assertThat((likesState as Failure).cachedLikes.isEqualTo(likerItems)).isTrue
+                assertThat(pageLoader.size).isEqualTo(0)
+            }
+            assertThat(it.showEmptyState).isTrue
+        }
+    }
+
+    @Test
+    fun `when user profile holder is clicked, sheet is opened`() {
+        val likesState = getGetLikesState(TEST_CONFIG_1)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            (it.engageItemsList[1] as Liker).onClick!!.invoke(mock(), listScenario.source)
+
+            requireNotNull(navigationEvent).let {
+                assertThat(navigationEvent is OpenUserProfileBottomSheet).isTrue
+            }
+        }
+    }
+
+    @Test
+    fun `when site holder with site id is clicked, the site is previewed in reader`() {
+        val likesState = getGetLikesState(TEST_CONFIG_1)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            val likedItem = it.engageItemsList[0] as LikedItem
+            likedItem.onGravatarClick.invoke(
+                    likedItem.authorPreferredSiteId,
+                    likedItem.authorPreferredSiteUrl,
+                    likedItem.blogPreviewSource
+            )
+
+            requireNotNull(navigationEvent).let {
+                assertThat(navigationEvent is PreviewSiteById).isTrue
+            }
+        }
+    }
+
+    @Test
+    fun `when site holder with zero site id is clicked, the site is previewed in webview`() {
+        val likesState = getGetLikesState(TEST_CONFIG_1)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            val likedItem = it.engageItemsList[0] as LikedItem
+            likedItem.onGravatarClick.invoke(
+                    0,
+                    likedItem.authorPreferredSiteUrl,
+                    likedItem.blogPreviewSource
+            )
+
+            requireNotNull(navigationEvent).let {
+                assertThat(navigationEvent is PreviewSiteByUrl).isTrue
+            }
+        }
+    }
+
+    @Test
+    fun `when header holder for comment is clicked, reader is opened if data is available`() {
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        val likesState = getGetLikesState(TEST_CONFIG_2)
+
+        whenever(readerUtilsWrapper.postAndCommentExists(anyLong(), anyLong(), anyLong())).thenReturn(true)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            val likedItem = it.engageItemsList[0] as LikedItem
+            likedItem.onHeaderClicked.invoke(
+                    likedItem.likedItemSiteId,
+                    likedItem.likedItemSiteUrl,
+                    likedItem.likedItemId,
+                    likedItem.likedItemPostId
+            )
+
+            requireNotNull(navigationEvent).let {
+                assertThat(navigationEvent is PreviewCommentInReader).isTrue
+            }
+        }
+    }
+
+    @Test
+    fun `when header holder for comment is clicked, webview is opened if data is not available`() {
+        setupMocksForPostOrComment(LOAD_COMMENT_LIKES)
+
+        val likesState = getGetLikesState(TEST_CONFIG_2)
+
+        whenever(readerUtilsWrapper.postAndCommentExists(anyLong(), anyLong(), anyLong())).thenReturn(false)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            val likedItem = it.engageItemsList[0] as LikedItem
+            likedItem.onHeaderClicked.invoke(
+                    likedItem.likedItemSiteId,
+                    likedItem.likedItemSiteUrl,
+                    likedItem.likedItemId,
+                    likedItem.likedItemPostId
+            )
+
+            requireNotNull(navigationEvent).let {
+                assertThat(navigationEvent is PreviewSiteByUrl).isTrue
+            }
+        }
+    }
+
+    @Test
+    fun `when header holder for post is clicked, reader is opened`() {
+        val likesState = getGetLikesState(TEST_CONFIG_1)
+
+        viewModel.start(listScenario)
+
+        getLikesState.value = likesState
+
+        requireNotNull(uiState).let {
+            val likedItem = it.engageItemsList[0] as LikedItem
+            likedItem.onHeaderClicked.invoke(
+                    likedItem.likedItemSiteId,
+                    likedItem.likedItemSiteUrl,
+                    likedItem.likedItemId,
+                    likedItem.likedItemPostId
+            )
+
+            requireNotNull(navigationEvent).let {
+                assertThat(navigationEvent is PreviewPostInReader).isTrue
+            }
+        }
+    }
+
+    private fun setupMocksForPostOrComment(type: ListScenarioType) {
+        whenever(headerData.authorName).thenReturn(AuthorNameString("authorName"))
+        whenever(headerData.snippetText).thenReturn("snippetText")
+        whenever(headerData.authorAvatarUrl).thenReturn("authorAvatarUrl")
+        whenever(headerData.numLikes).thenReturn(expectedNumLikes)
+        whenever(headerData.authorUserId).thenReturn(100)
+
+        whenever(headerData.authorPreferredSiteId).thenReturn(1000)
+        whenever(headerData.authorPreferredSiteUrl).thenReturn("authorPreferredSiteUrl")
+
+        whenever(listScenario.commentSiteUrl).thenReturn("commentSiteUrl")
+
+        when (type) {
+            LOAD_POST_LIKES -> {
+                whenever(listScenario.type).thenReturn(LOAD_POST_LIKES)
+                whenever(listScenario.siteId).thenReturn(siteId)
+                whenever(listScenario.postOrCommentId).thenReturn(postId)
+                whenever(listScenario.commentPostId).thenReturn(0L)
+                whenever(listScenario.headerData).thenReturn(headerData)
+                whenever(listScenario.source).thenReturn(LIKE_READER_LIST)
+            }
+            LOAD_COMMENT_LIKES -> {
+                whenever(listScenario.type).thenReturn(LOAD_COMMENT_LIKES)
+                whenever(listScenario.siteId).thenReturn(siteId)
+                whenever(listScenario.postOrCommentId).thenReturn(commentId)
+                whenever(listScenario.commentPostId).thenReturn(postId)
+                whenever(listScenario.headerData).thenReturn(headerData)
+                whenever(listScenario.source).thenReturn(LIKE_NOTIFICATION_LIST)
+            }
+        }
+    }
+
+    private fun setupObservers() {
+        uiState = null
+        navigationEvent = null
+        serviceRequestEvent.clear()
+        holder = null
+
+        viewModel.uiState.observeForever {
+            uiState = it
+        }
+
+        viewModel.onNavigationEvent.observeForever {
+            it.applyIfNotHandled {
+                navigationEvent = this
+            }
+        }
+
+        viewModel.onServiceRequestEvent.observeForever {
+            it.applyIfNotHandled {
+                serviceRequestEvent.add(this)
+            }
+        }
+
+        viewModel.onSnackbarMessage.observeForever {
+            it.applyIfNotHandled {
+                holder = this
+            }
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/EngagementUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/EngagementUtilsTest.kt
new file mode 100644
index 000000000000..a0a288c4241b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/EngagementUtilsTest.kt
@@ -0,0 +1,62 @@
+package org.wordpress.android.ui.engagement
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+import org.wordpress.android.ui.engagement.utils.getDefaultLikers
+import org.wordpress.android.ui.engagement.utils.isEqualTo
+
+@RunWith(MockitoJUnitRunner::class)
+class EngagementUtilsTest {
+    private lateinit var engagementUtils: EngagementUtils
+
+    private val numLikers = 10
+    private val siteId = 100L
+    private val postId = 1000L
+
+    @Before
+    fun setup() {
+        engagementUtils = EngagementUtils()
+    }
+
+    @Test
+    fun `like models are mapped to engage items`() {
+        val likersList = getDefaultLikers(numLikers, POST_LIKE, siteId, postId)
+
+        val engageItems = engagementUtils.likesToEngagedPeople(likersList)
+
+        assertThat(likersList.isEqualTo(engageItems)).isTrue
+    }
+
+    @Test
+    fun `like models maps onClick function`() {
+        val likersList = getDefaultLikers(numLikers, POST_LIKE, siteId, postId)
+        val onClickFunction = ::onClickDummy
+
+        val engageItems = engagementUtils.likesToEngagedPeople(likersList, onClickFunction)
+
+        assertThat(engageItems.all { it as Liker != null && it.onClick == onClickFunction }).isTrue
+    }
+
+    @Test
+    fun `like models maps source`() {
+        val likersList = getDefaultLikers(numLikers, POST_LIKE, siteId, postId)
+        val onClickFunction = ::onClickDummy
+        val source = EngagementNavigationSource.LIKE_READER_LIST
+
+        val engageItems = engagementUtils.likesToEngagedPeople(
+                likersList,
+                onClickFunction,
+                source
+        )
+
+        assertThat(engageItems.all { it as Liker != null && it.source == source }).isTrue
+    }
+
+    private fun onClickDummy(userProfile: UserProfile, source: EngagementNavigationSource?) { }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/GetLikesHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/GetLikesHandlerTest.kt
new file mode 100644
index 000000000000..69449366beda
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/GetLikesHandlerTest.kt
@@ -0,0 +1,216 @@
+package org.wordpress.android.ui.engagement
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flow
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.COMMENT_LIKE
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.test
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.DONT_CARE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure.EmptyStateData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeGroupFingerPrint
+import org.wordpress.android.ui.engagement.GetLikesUseCase.PaginationParams
+import org.wordpress.android.ui.engagement.utils.getDefaultLikers
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiString.UiStringText
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class GetLikesHandlerTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock lateinit var getLikesUseCase: GetLikesUseCase
+
+    private lateinit var getLikesHandler: GetLikesHandler
+    private var likesState: GetLikesState? = null
+    private var holder: SnackbarMessageHolder? = null
+
+    private val siteId = 100L
+    private val postId = 1000L
+    private val commentId = 10000L
+    private val expectedNumLikes = 6
+    private val defaultPageLenght = 20
+    private val noLikesLimit = -1
+
+    @Before
+    fun setup() {
+        getLikesHandler = GetLikesHandler(getLikesUseCase, TEST_DISPATCHER)
+    }
+
+    @Test
+    fun `handleGetLikesForPost collects expected state`() = test {
+        val fingerPrint = LikeGroupFingerPrint(siteId, postId, expectedNumLikes)
+        val paginationParams = PaginationParams(false, defaultPageLenght, noLikesLimit)
+        val likesData = getDefaultLikers(expectedNumLikes, POST_LIKE, siteId, postId)
+
+        val state = LikesData(
+                likes = likesData,
+                expectedNumLikes = expectedNumLikes,
+                hasMore = false
+        )
+
+        whenever(getLikesUseCase.getLikesForPost(fingerPrint, paginationParams, DONT_CARE)).thenReturn(
+                flow { emit(state) }
+        )
+
+        setupObservers()
+
+        getLikesHandler.handleGetLikesForPost(
+                fingerPrint,
+                paginationParams.requestNextPage,
+                paginationParams.pageLength,
+                paginationParams.limit
+        )
+
+        requireNotNull(likesState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        assertThat(holder).isNull()
+    }
+
+    @Test
+    fun `handleGetLikesForPost forwards failures signaling to snackbar`() = test {
+        val error = UiStringText("An error occurred")
+        val fingerPrint = LikeGroupFingerPrint(siteId, postId, expectedNumLikes)
+        val paginationParams = PaginationParams(false, defaultPageLenght, noLikesLimit)
+        val likesData = getDefaultLikers(expectedNumLikes, POST_LIKE, siteId, postId)
+
+        val state = Failure(
+                failureType = FailureType.GENERIC,
+                error = error,
+                cachedLikes = likesData,
+                emptyStateData = EmptyStateData(false),
+                expectedNumLikes = expectedNumLikes,
+                hasMore = false
+        )
+
+        whenever(getLikesUseCase.getLikesForPost(fingerPrint, paginationParams, DONT_CARE)).thenReturn(
+                flow { emit(state) }
+        )
+
+        setupObservers()
+
+        getLikesHandler.handleGetLikesForPost(
+                fingerPrint,
+                paginationParams.requestNextPage,
+                paginationParams.pageLength,
+                paginationParams.limit
+        )
+
+        requireNotNull(likesState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(error)
+        }
+    }
+
+    @Test
+    fun `handleGetLikesForComment collects expected state`() = test {
+        val fingerPrint = LikeGroupFingerPrint(siteId, commentId, expectedNumLikes)
+        val paginationParams = PaginationParams(false, defaultPageLenght, noLikesLimit)
+        val likesData = getDefaultLikers(expectedNumLikes, COMMENT_LIKE, siteId, commentId)
+
+        val state = LikesData(
+                likes = likesData,
+                expectedNumLikes = expectedNumLikes,
+                hasMore = false
+        )
+
+        whenever(getLikesUseCase.getLikesForComment(fingerPrint, paginationParams)).thenReturn(
+                flow { emit(state) }
+        )
+
+        setupObservers()
+
+        getLikesHandler.handleGetLikesForComment(
+                fingerPrint,
+                paginationParams.requestNextPage,
+                paginationParams.pageLength
+        )
+
+        requireNotNull(likesState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        assertThat(holder).isNull()
+    }
+
+    @Test
+    fun `handleGetLikesForComment forwards failures signaling to snackbar`() = test {
+        val error = UiStringText("An error occurred")
+        val fingerPrint = LikeGroupFingerPrint(siteId, commentId, expectedNumLikes)
+        val paginationParams = PaginationParams(false, defaultPageLenght, noLikesLimit)
+        val likesData = getDefaultLikers(expectedNumLikes, COMMENT_LIKE, siteId, commentId)
+
+        val state = Failure(
+                failureType = FailureType.GENERIC,
+                error = error,
+                cachedLikes = likesData,
+                emptyStateData = EmptyStateData(false),
+                expectedNumLikes = expectedNumLikes,
+                hasMore = false
+        )
+
+        whenever(getLikesUseCase.getLikesForComment(fingerPrint, paginationParams)).thenReturn(
+                flow { emit(state) }
+        )
+
+        setupObservers()
+
+        getLikesHandler.handleGetLikesForComment(
+                fingerPrint,
+                paginationParams.requestNextPage,
+                paginationParams.pageLength
+        )
+
+        requireNotNull(likesState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(error)
+        }
+    }
+
+    @Test
+    fun `clear calls clear on use case`() {
+        getLikesHandler.clear()
+
+        verify(getLikesUseCase, times(1)).clear()
+    }
+
+    private fun setupObservers() {
+        likesState = null
+
+        getLikesHandler.likesStatusUpdate.observeForever {
+            likesState = it
+        }
+
+        holder = null
+
+        getLikesHandler.snackbarEvents.observeForever { event ->
+            event.applyIfNotHandled {
+                holder = this
+            }
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/ListScenarioUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/ListScenarioUtilsTest.kt
new file mode 100644
index 000000000000..406d192e785c
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/ListScenarioUtilsTest.kt
@@ -0,0 +1,92 @@
+package org.wordpress.android.ui.engagement
+
+import android.content.Context
+import android.text.SpannableStringBuilder
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.json.JSONArray
+import org.json.JSONObject
+import org.junit.Assert.assertThrows
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.tools.FormattableContent
+import org.wordpress.android.models.Note
+import org.wordpress.android.ui.engagement.ListScenarioType.LOAD_POST_LIKES
+import org.wordpress.android.ui.notifications.blocks.NoteBlockClickableSpan
+import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper
+import org.wordpress.android.util.image.ImageManager
+
+@RunWith(MockitoJUnitRunner::class)
+class ListScenarioUtilsTest {
+    @Mock lateinit var imageManager: ImageManager
+    @Mock lateinit var notificationsUtilsWrapper: NotificationsUtilsWrapper
+    @Mock lateinit var note: Note
+    @Mock lateinit var context: Context
+    @Mock lateinit var spannableBuilder: SpannableStringBuilder
+
+    private lateinit var listScenarioUtils: ListScenarioUtils
+
+    private val siteId = 100L
+    private val postId = 1000L
+
+    @Before
+    fun setup() {
+        whenever(note.isLikeType).thenReturn(true)
+        whenever(note.isPostLikeType).thenReturn(true)
+        whenever(note.siteId).thenReturn(siteId.toInt())
+        whenever(note.postId).thenReturn(postId.toInt())
+        whenever(note.siteId).thenReturn(siteId.toInt())
+        whenever(
+                spannableBuilder.getSpans(anyInt(), anyInt(), eq(NoteBlockClickableSpan::class.java))
+        ).thenReturn(listOf<NoteBlockClickableSpan>().toTypedArray())
+        whenever(spannableBuilder.length).thenReturn(0)
+        whenever(
+                notificationsUtilsWrapper.getSpannableContentForRanges(anyOrNull<FormattableContent>())
+        ).thenReturn(spannableBuilder)
+
+        listScenarioUtils = ListScenarioUtils(imageManager, notificationsUtilsWrapper)
+    }
+
+    @Test
+    fun `exception is thrown if note is not like type`() {
+        whenever(note.isLikeType).thenReturn(false)
+
+        assertThrows(IllegalArgumentException::class.java) {
+            listScenarioUtils.mapLikeNoteToListScenario(note, context)
+        }
+    }
+
+    @Test
+    fun `note is mapped to list scenario`() {
+        val listScenario = listScenarioUtils.mapLikeNoteToListScenario(note, context)
+
+        with(listScenario) {
+            assertThat(type).isEqualTo(LOAD_POST_LIKES)
+            assertThat(source).isEqualTo(EngagementNavigationSource.LIKE_NOTIFICATION_LIST)
+            assertThat(siteId).isEqualTo(this@ListScenarioUtilsTest.siteId)
+            assertThat(postId).isEqualTo(this@ListScenarioUtilsTest.postId)
+            assertThat(commentPostId).isEqualTo(0L)
+            assertThat(commentSiteUrl).isEqualTo("")
+        }
+    }
+
+    @Test
+    fun `json array is mapped to list of formattable content`() {
+        val headerArray = mock<JSONArray>()
+        val content = mock<FormattableContent>()
+        val jsonObject = mock<JSONObject>()
+        whenever(headerArray.length()).thenReturn(1)
+        whenever(headerArray.getJSONObject(anyInt())).thenReturn(jsonObject)
+        whenever(notificationsUtilsWrapper.mapJsonToFormattableContent(anyOrNull())).thenReturn(content)
+        val formattableList = listScenarioUtils.transformToFormattableContentList(headerArray)
+
+        assertThat(formattableList).isEqualTo(listOf(content))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/UserProfileViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/UserProfileViewModelTest.kt
new file mode 100644
index 000000000000..b737d057c7c2
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/UserProfileViewModelTest.kt
@@ -0,0 +1,116 @@
+package org.wordpress.android.ui.engagement
+
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.ui.engagement.BottomSheetAction.HideBottomSheet
+import org.wordpress.android.ui.engagement.BottomSheetAction.ShowBottomSheet
+import org.wordpress.android.ui.engagement.BottomSheetUiState.UserProfileUiState
+import org.wordpress.android.ui.engagement.EngagedListNavigationEvent.OpenUserProfileBottomSheet.UserProfile
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_NOTIFICATION_LIST
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
+
+class UserProfileViewModelTest : BaseUnitTest() {
+    @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+
+    private lateinit var viewModel: UserProfileViewModel
+
+    private var sheetAction: BottomSheetAction? = null
+    private var sheetUiState: BottomSheetUiState? = null
+
+    @Before
+    fun setup() {
+        viewModel = UserProfileViewModel(
+                resourceProvider,
+                analyticsUtilsWrapper
+        )
+
+        setupObservers()
+    }
+
+    @Test
+    fun `bottom sheet ui state is updated when user clicks on a liker`() {
+        val userProfile = getDefaultUserProfile()
+        viewModel.onBottomSheetOpen(userProfile, ::onClickDummy, LIKE_NOTIFICATION_LIST)
+
+        requireNotNull(sheetUiState).let {
+            assertThat(it is UserProfileUiState).isTrue
+            with(it as UserProfileUiState) {
+                assertThat(userAvatarUrl).isEqualTo(userProfile.userAvatarUrl)
+                assertThat(blavatarUrl).isEqualTo(userProfile.blavatarUrl)
+                assertThat(userName).isEqualTo(userProfile.userName)
+                assertThat(userLogin).isEqualTo(userProfile.userLogin)
+                assertThat(userBio).isEqualTo(userProfile.userBio)
+                assertThat(siteTitle).isEqualTo(userProfile.siteTitle)
+                assertThat(siteUrl).isEqualTo(userProfile.siteUrl)
+                assertThat(siteId).isEqualTo(userProfile.siteId)
+                assertThat(blogPreviewSource).isEqualTo(ReaderTracker.SOURCE_NOTIF_LIKE_LIST_USER_PROFILE)
+            }
+        }
+    }
+
+    @Test
+    fun `bottom sheet is opened when user clicks on a liker`() {
+        val userProfile = getDefaultUserProfile()
+        viewModel.onBottomSheetOpen(userProfile, ::onClickDummy, LIKE_NOTIFICATION_LIST)
+
+        requireNotNull(sheetAction).let {
+            assertThat(it is ShowBottomSheet).isTrue
+        }
+    }
+
+    @Test
+    fun `bottom sheet opening is tracked`() {
+        val userProfile = getDefaultUserProfile()
+        viewModel.onBottomSheetOpen(userProfile, ::onClickDummy, LIKE_NOTIFICATION_LIST)
+
+        verify(analyticsUtilsWrapper, times(1)).trackUserProfileShown(anyString())
+    }
+
+    @Test
+    fun `bottom sheet is closed on cancel`() {
+        viewModel.onBottomSheetCancelled()
+
+        requireNotNull(sheetAction).let {
+            assertThat(it is HideBottomSheet).isTrue
+        }
+    }
+
+    private fun getDefaultUserProfile(): UserProfile {
+        return UserProfile(
+                userAvatarUrl = "userAvatarUrl",
+                blavatarUrl = "blavatarUrl",
+                userName = "userName",
+                userLogin = "userLogin",
+                userBio = "userBio",
+                siteTitle = "siteTitle",
+                siteUrl = "siteUrl",
+                siteId = 100L
+        )
+    }
+
+    private fun onClickDummy(siteId: Long, siteUrl: String, source: String) {}
+
+    private fun setupObservers() {
+        sheetUiState = null
+        sheetAction = null
+
+        viewModel.bottomSheetUiState.observeForever {
+            sheetUiState = it
+        }
+
+        viewModel.onBottomSheetAction.observeForever {
+            it.applyIfNotHandled {
+                sheetAction = this
+            }
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt
new file mode 100644
index 000000000000..33470a722485
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/usecases/GetLikesUseCaseTest.kt
@@ -0,0 +1,523 @@
+package org.wordpress.android.ui.engagement.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.CommentAction.FETCHED_COMMENT_LIKES
+import org.wordpress.android.fluxc.model.CauseOfOnPostChanged.FetchPostLikes
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.COMMENT_LIKE
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.CommentStore
+import org.wordpress.android.fluxc.store.CommentStore.CommentError
+import org.wordpress.android.fluxc.store.CommentStore.CommentErrorType
+import org.wordpress.android.fluxc.store.CommentStore.OnCommentLikesChanged
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.fluxc.store.PostStore.OnPostLikesChanged
+import org.wordpress.android.fluxc.store.PostStore.PostError
+import org.wordpress.android.test
+import org.wordpress.android.ui.engagement.GetLikesUseCase
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.DONT_CARE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType.GENERIC
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType.NO_NETWORK
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure.EmptyStateData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Loading
+import org.wordpress.android.ui.engagement.GetLikesUseCase.LikeGroupFingerPrint
+import org.wordpress.android.ui.engagement.GetLikesUseCase.PaginationParams
+import org.wordpress.android.ui.engagement.utils.getDefaultLikers
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class GetLikesUseCaseTest {
+    @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var commentStore: CommentStore
+    @Mock private lateinit var postStore: PostStore
+    @Mock private lateinit var accountStore: AccountStore
+
+    private lateinit var getLikesUseCase: GetLikesUseCase
+    private val siteId = 100L
+    private val postId = 1000L
+    private val commentId = 10000L
+    private val expectedNumLikes = 6
+    private val defaultPageLenght = 20
+    private val defaultLikesLimit = 5
+    private val noLikesLimit = -1
+
+    @Before
+    fun setup() {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+
+        getLikesUseCase = GetLikesUseCase(
+                networkUtilsWrapper,
+                dispatcher,
+                commentStore,
+                postStore,
+                accountStore
+        )
+    }
+
+    @Test
+    fun `dispatcher is registered on init`() {
+        verify(dispatcher, times(1)).register(getLikesUseCase)
+    }
+
+    @Test
+    fun `dispatcher is unregistered on clear`() {
+        getLikesUseCase.clear()
+        verify(dispatcher, times(1)).unregister(getLikesUseCase)
+    }
+
+    @Test
+    fun `getLikesForPost emits Loading when not requesting next page`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    )
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, defaultLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList().firstOrNull() is Loading).isTrue
+    }
+
+    @Test
+    fun `getLikesForPost does not emit Loading when requesting next page`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    )
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(true, defaultPageLenght, defaultLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList().firstOrNull() is Loading).isFalse
+    }
+
+    @Test
+    fun `getLikesForPost emits no net failure when no net detected`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    ).apply {
+                        error = PostError("GENERIC_ERROR", "Error occurred")
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, defaultLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        Failure(
+                                failureType = NO_NETWORK,
+                                error = UiStringRes(R.string.get_likes_no_network_error),
+                                cachedLikes = listOf(),
+                                emptyStateData = EmptyStateData(
+                                        showEmptyState = true,
+                                        title = UiStringRes(R.string.no_network_title)
+                                ),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForPost emits failure when error detected`() = test {
+        val errorMessage = "User not authorized"
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    ).apply {
+                        error = PostError("UNAUTHORIZED", errorMessage)
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, noLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        Failure(
+                                failureType = GENERIC,
+                                error = UiStringText(errorMessage),
+                                cachedLikes = listOf(),
+                                emptyStateData = EmptyStateData(
+                                        showEmptyState = true,
+                                        title = UiStringRes(R.string.get_likes_empty_state_title)
+                                ),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForPost emits failure with default message when error has empty string`() = test {
+        val errorMessage = ""
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    ).apply {
+                        error = PostError("UNAUTHORIZED", errorMessage)
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, noLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        Failure(
+                                failureType = GENERIC,
+                                error = UiStringRes(R.string.get_likes_unknown_error),
+                                cachedLikes = listOf(),
+                                emptyStateData = EmptyStateData(
+                                        showEmptyState = true,
+                                        title = UiStringRes(R.string.get_likes_empty_state_title)
+                                ),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForPost emits likes data when available`() = test {
+        val likeData = getDefaultLikers(expectedNumLikes, POST_LIKE, siteId, postId)
+
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    ).apply {
+                        postLikes = likeData
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, noLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        LikesData(
+                                likes = likeData,
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForPost emits likes data until limit`() = test {
+        val likeData = getDefaultLikers(expectedNumLikes, POST_LIKE, siteId, postId)
+
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onPostLikesChanged(
+                    OnPostLikesChanged(
+                            FetchPostLikes,
+                            siteId,
+                            postId,
+                            false
+                    ).apply {
+                        postLikes = likeData
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForPost(
+                LikeGroupFingerPrint(siteId, postId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, defaultLikesLimit),
+                DONT_CARE
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        LikesData(
+                                likes = likeData.take(defaultLikesLimit),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForComment emits no net failure when no net detected`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onCommentLikesChanged(
+                    OnCommentLikesChanged(
+                            siteId,
+                            commentId,
+                            false
+                    ).apply {
+                        causeOfChange = FETCHED_COMMENT_LIKES
+                        error = CommentError(
+                                CommentErrorType.AUTHORIZATION_REQUIRED,
+                                "Error occurred"
+                        )
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForComment(
+                LikeGroupFingerPrint(siteId, commentId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, defaultLikesLimit)
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        Failure(
+                                failureType = NO_NETWORK,
+                                error = UiStringRes(R.string.get_likes_no_network_error),
+                                cachedLikes = listOf(),
+                                emptyStateData = EmptyStateData(
+                                        showEmptyState = true,
+                                        title = UiStringRes(R.string.no_network_title)
+                                ),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForComment emits failure when error detected`() = test {
+        val errorMessage = "User not authorized"
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onCommentLikesChanged(
+                    OnCommentLikesChanged(
+                            siteId,
+                            commentId,
+                            false
+                    ).apply {
+                        causeOfChange = FETCHED_COMMENT_LIKES
+                        error = CommentError(
+                                CommentErrorType.AUTHORIZATION_REQUIRED,
+                                errorMessage
+                        )
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForComment(
+                LikeGroupFingerPrint(siteId, commentId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, noLikesLimit)
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        Failure(
+                                failureType = GENERIC,
+                                error = UiStringText(errorMessage),
+                                cachedLikes = listOf(),
+                                emptyStateData = EmptyStateData(
+                                        showEmptyState = true,
+                                        title = UiStringRes(R.string.get_likes_empty_state_title)
+                                ),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForComment emits failure with default message when error has empty string`() = test {
+        val errorMessage = ""
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onCommentLikesChanged(
+                    OnCommentLikesChanged(
+                            siteId,
+                            commentId,
+                            false
+                    ).apply {
+                        causeOfChange = FETCHED_COMMENT_LIKES
+                        error = CommentError(
+                                CommentErrorType.AUTHORIZATION_REQUIRED,
+                                errorMessage
+                        )
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForComment(
+                LikeGroupFingerPrint(siteId, commentId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, noLikesLimit)
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        Failure(
+                                failureType = GENERIC,
+                                error = UiStringRes(R.string.get_likes_unknown_error),
+                                cachedLikes = listOf(),
+                                emptyStateData = EmptyStateData(
+                                        showEmptyState = true,
+                                        title = UiStringRes(R.string.get_likes_empty_state_title)
+                                ),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForComment emits likes data when available`() = test {
+        val likeData = getDefaultLikers(expectedNumLikes, COMMENT_LIKE, siteId, commentId)
+
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onCommentLikesChanged(
+                    OnCommentLikesChanged(
+                            siteId,
+                            commentId,
+                            false
+                    ).apply {
+                        causeOfChange = FETCHED_COMMENT_LIKES
+                        commentLikes = likeData
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForComment(
+                LikeGroupFingerPrint(siteId, commentId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, noLikesLimit)
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        LikesData(
+                                likes = likeData,
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `getLikesForComment emits likes data until limit`() = test {
+        val likeData = getDefaultLikers(expectedNumLikes, COMMENT_LIKE, siteId, commentId)
+
+        whenever(dispatcher.dispatch(any())).then {
+            getLikesUseCase.onCommentLikesChanged(
+                    OnCommentLikesChanged(
+                            siteId,
+                            commentId,
+                            false
+                    ).apply {
+                        causeOfChange = FETCHED_COMMENT_LIKES
+                        commentLikes = likeData
+                    }
+            )
+        }
+
+        val flow = getLikesUseCase.getLikesForComment(
+                LikeGroupFingerPrint(siteId, commentId, expectedNumLikes),
+                PaginationParams(false, defaultPageLenght, defaultLikesLimit)
+        )
+
+        assertThat(flow.toList()).isNotEmpty
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        Loading,
+                        LikesData(
+                                likes = likeData.take(defaultLikesLimit),
+                                expectedNumLikes = expectedNumLikes,
+                                hasMore = false
+                        )
+                )
+        )
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/engagement/utils/GetLikesTestUtils.kt b/WordPress/src/test/java/org/wordpress/android/ui/engagement/utils/GetLikesTestUtils.kt
new file mode 100644
index 000000000000..2134a93c0abc
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/engagement/utils/GetLikesTestUtils.kt
@@ -0,0 +1,157 @@
+package org.wordpress.android.ui.engagement.utils
+
+import org.wordpress.android.fluxc.model.LikeModel
+import org.wordpress.android.fluxc.model.LikeModel.LikeType
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.COMMENT_LIKE
+import org.wordpress.android.fluxc.model.LikeModel.LikeType.POST_LIKE
+import org.wordpress.android.ui.engagement.EngageItem
+import org.wordpress.android.ui.engagement.EngageItem.LikedItem
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_NOTIFICATION_LIST
+import org.wordpress.android.ui.engagement.EngagementNavigationSource.LIKE_READER_LIST
+import org.wordpress.android.ui.engagement.GetLikesUseCase.FailureType.GENERIC
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure.EmptyStateData
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.ListScenario
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_1
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_2
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_3
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_4
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_5
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+
+fun getDefaultLikers(numLikers: Int, likedItemType: LikeType, siteId: Long, itemId: Long): List<LikeModel> {
+    val likersList = mutableListOf<LikeModel>()
+
+    for (i in 0 until numLikers) {
+        likersList.add(LikeModel().apply {
+            type = likedItemType.typeName
+            remoteSiteId = siteId
+            remoteItemId = itemId
+            likerName = "liker name $i"
+            likerLogin = "liker${i}login"
+            likerSiteId = 10L + i * 100L
+            likerSiteUrl = "https://liker$i-site.org"
+            likerAvatarUrl = "https://liker$i-site.org/avatar.jpg"
+            likerBio = "This is the bio for liker$i"
+            likerId = 100L + i * 1000L
+            preferredBlogId = 10L + i * 100L
+            preferredBlogName = "Liker $i preferred blog name"
+            preferredBlogUrl = "https://liker$i-preferred-blog.wordpress.com"
+            preferredBlogBlavatarUrl = "https://liker$i-preferred-blog.wordpress.com/avatar.jpg"
+        })
+    }
+
+    return likersList
+}
+
+enum class GetLikesTestConfig {
+    TEST_CONFIG_1,
+    TEST_CONFIG_2,
+    TEST_CONFIG_3,
+    TEST_CONFIG_4,
+    TEST_CONFIG_5
+}
+
+fun getGetLikesState(testConfig: GetLikesTestConfig): GetLikesState {
+    return when (testConfig) {
+        // Like Data available for post and fetched from API; no more data available
+        TEST_CONFIG_1 -> {
+            LikesData(
+                    getDefaultLikers(10, POST_LIKE, 10, 100),
+                    10,
+                    false
+            )
+        }
+        // Like Data available for post and fetched from API, more data available
+        TEST_CONFIG_2 -> {
+            LikesData(
+                    getDefaultLikers(10, COMMENT_LIKE, 10, 100),
+                    10,
+                    true
+            )
+        }
+        // Like Data available for comment and fetched from API, no more data available
+        TEST_CONFIG_3 -> {
+            LikesData(
+                    getDefaultLikers(10, COMMENT_LIKE, 10, 100),
+                    10,
+                    false
+            )
+        }
+        // Like Data available for comment and fetched from API, more data available
+        TEST_CONFIG_4 -> {
+            LikesData(
+                    getDefaultLikers(10, COMMENT_LIKE, 10, 100),
+                    10,
+                    true
+            )
+        }
+        // Failure getting like data from API, and no cached data available
+        TEST_CONFIG_5 -> {
+            val cachedData = listOf<LikeModel>()
+            Failure(
+                    GENERIC,
+                    UiStringText("There was an error"),
+                    listOf(),
+                    EmptyStateData(
+                            cachedData.isEmpty(),
+                            UiStringRes(10)
+                    ),
+                    10,
+                    false
+            )
+        }
+    }
+}
+
+fun List<LikeModel>.isEqualTo(engageItemList: List<EngageItem>): Boolean {
+    val sameSize = this.size == engageItemList.size
+    val likersList = engageItemList as? List<Liker>
+
+    val allEquals = this.all { likeModel ->
+        val liker = likersList!!.firstOrNull {
+            it.userId == likeModel.likerId
+        }
+
+        liker != null && likeModel.isEqualTo(liker)
+    }
+
+    return sameSize && allEquals
+}
+
+fun LikeModel.isEqualTo(liker: Liker): Boolean {
+    return liker.name == this.likerName &&
+            liker.login == this.likerLogin &&
+            liker.userSiteId == this.likerSiteId &&
+            liker.userSiteUrl == this.likerSiteUrl &&
+            liker.userAvatarUrl == this.likerAvatarUrl &&
+            liker.userBio == this.likerBio &&
+            liker.userId == this.likerId &&
+            liker.preferredBlogId == this.preferredBlogId &&
+            liker.preferredBlogName == this.preferredBlogName &&
+            liker.preferredBlogUrl == this.preferredBlogUrl &&
+            liker.preferredBlogBlavatar == this.preferredBlogBlavatarUrl
+}
+
+fun ListScenario.generatesEquivalentLikedItem(likedItem: LikedItem): Boolean {
+    val headerData = this.headerData
+    return likedItem.author == headerData.authorName &&
+            likedItem.postOrCommentText == headerData.snippetText &&
+            likedItem.authorAvatarUrl == headerData.authorAvatarUrl &&
+            likedItem.likedItemId == this.postOrCommentId &&
+            likedItem.likedItemSiteId == this.siteId &&
+            likedItem.likedItemSiteUrl == this.commentSiteUrl &&
+            likedItem.likedItemPostId == this.commentPostId &&
+            likedItem.authorUserId == headerData.authorUserId &&
+            likedItem.authorPreferredSiteId == headerData.authorPreferredSiteId &&
+            likedItem.authorPreferredSiteUrl == headerData.authorPreferredSiteUrl &&
+            likedItem.blogPreviewSource == when (this.source) {
+                LIKE_NOTIFICATION_LIST -> ReaderTracker.SOURCE_NOTIFICATION
+                LIKE_READER_LIST -> ReaderTracker.SOURCE_READER_LIKE_LIST
+            }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/JetpackAvailableItemsProviderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/JetpackAvailableItemsProviderTest.kt
new file mode 100644
index 000000000000..34028851365d
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/JetpackAvailableItemsProviderTest.kt
@@ -0,0 +1,30 @@
+package org.wordpress.android.ui.jetpack
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider
+
+@RunWith(MockitoJUnitRunner::class)
+class JetpackAvailableItemsProviderTest {
+    private lateinit var provider: JetpackAvailableItemsProvider
+
+    @Before
+    fun setUp() {
+        provider = JetpackAvailableItemsProvider()
+    }
+
+    @Test
+    fun `when requested, the available items list is returned`() {
+        // setup
+        val expectedItemCount = 6
+
+        // act
+        val items = provider.getAvailableItems()
+
+        // Assert
+        assertThat(items.size).isEqualTo(expectedItemCount)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCaseTest.kt
new file mode 100644
index 000000000000..a60a87c92d14
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/JetpackCapabilitiesUseCaseTest.kt
@@ -0,0 +1,161 @@
+package org.wordpress.android.ui.jetpack
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.JetpackCapability
+import org.wordpress.android.fluxc.model.JetpackCapability.BACKUP
+import org.wordpress.android.fluxc.model.JetpackCapability.BACKUP_DAILY
+import org.wordpress.android.fluxc.model.JetpackCapability.BACKUP_REALTIME
+import org.wordpress.android.fluxc.model.JetpackCapability.SCAN
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.fluxc.store.SiteStore.OnJetpackCapabilitiesFetched
+import org.wordpress.android.test
+import org.wordpress.android.ui.prefs.AppPrefsWrapper
+
+private const val SITE_ID = 1L
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class JetpackCapabilitiesUseCaseTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock private lateinit var dispatcher: Dispatcher
+    @Mock private lateinit var store: SiteStore
+    @Mock private lateinit var appPrefsWrapper: AppPrefsWrapper
+    private lateinit var useCase: JetpackCapabilitiesUseCase
+    private lateinit var event: OnJetpackCapabilitiesFetched
+
+    @Before
+    fun setUp() {
+        useCase = JetpackCapabilitiesUseCase(
+                store,
+                dispatcher,
+                appPrefsWrapper
+        )
+        event = buildCapabilitiesFetchedEvent(listOf(BACKUP_REALTIME))
+    }
+
+    @Test
+    fun `coroutine resumed, when result event dispatched`() = test {
+        whenever(dispatcher.dispatch(any())).then { useCase.onJetpackCapabilitiesFetched(event) }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf())
+
+        assertThat(result.size).isEqualTo(2)
+    }
+
+    @Test
+    fun `when purchased products requested, then data from cache are returned first`() = test {
+        whenever(dispatcher.dispatch(any())).then { useCase.onJetpackCapabilitiesFetched(event) }
+        whenever(appPrefsWrapper.getSiteJetpackCapabilities(SITE_ID)).thenReturn(mutableListOf(SCAN))
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf())
+
+        verify(appPrefsWrapper).getSiteJetpackCapabilities(SITE_ID)
+        assertThat(result.first().scan).isTrue
+    }
+
+    @Test
+    fun `when purchased products requested, then data from server are returned`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf(BACKUP)))
+        }
+        whenever(appPrefsWrapper.getSiteJetpackCapabilities(SITE_ID)).thenReturn(mutableListOf(SCAN))
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf())
+
+        verify(appPrefsWrapper).getSiteJetpackCapabilities(SITE_ID)
+        assertThat(result.last().backup).isTrue
+    }
+
+    @Test
+    fun `updates cache, when fetch finishes`() = test {
+        whenever(dispatcher.dispatch(any())).then { useCase.onJetpackCapabilitiesFetched(event) }
+
+        useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf())
+
+        verify(appPrefsWrapper).setSiteJetpackCapabilities(SITE_ID, event.capabilities!!)
+    }
+
+    @Test
+    fun `Scan enabled, when JetpackCapabilities contains SCAN`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf(SCAN)))
+        }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf()).last()
+
+        assertThat(result.scan).isTrue
+    }
+
+    @Test
+    fun `Scan disabled, when JetpackCapabilities does NOT contain SCAN`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf()))
+        }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf()).last()
+
+        assertThat(result.scan).isFalse
+    }
+
+    @Test
+    fun `Backup enabled, when JetpackCapabilities contains BACKUP`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf(BACKUP)))
+        }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf()).last()
+
+        assertThat(result.backup).isTrue
+    }
+
+    @Test
+    fun `Backup enabled, when JetpackCapabilities contains BACKUP_REALTIME`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf(BACKUP_REALTIME)))
+        }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf()).last()
+
+        assertThat(result.backup).isTrue
+    }
+
+    @Test
+    fun `Backup enabled, when JetpackCapabilities contains BACKUP_DAILY`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf(BACKUP_DAILY)))
+        }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf()).last()
+
+        assertThat(result.backup).isTrue
+    }
+
+    @Test
+    fun `Backup disabled, when JetpackCapabilities does not contain any BACKUP capability`() = test {
+        whenever(dispatcher.dispatch(any())).then {
+            useCase.onJetpackCapabilitiesFetched(buildCapabilitiesFetchedEvent(listOf()))
+        }
+
+        val result = useCase.getJetpackPurchasedProducts(SITE_ID).toList(mutableListOf()).last()
+
+        assertThat(result.backup).isFalse
+    }
+
+    private fun buildCapabilitiesFetchedEvent(capabilities: List<JetpackCapability>) =
+            OnJetpackCapabilitiesFetched(SITE_ID, capabilities, null)
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModelTest.kt
new file mode 100644
index 000000000000..8d926bab7f6f
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/BackupDownloadViewModelTest.kt
@@ -0,0 +1,479 @@
+package org.wordpress.android.ui.jetpack.backup.download
+
+import android.os.Bundle
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.argThat
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flow
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.verify
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadNavigationEvents.DownloadFile
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadNavigationEvents.ShareLink
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ContentState.CompleteState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ContentState.DetailsState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ContentState.ProgressState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadUiState.ErrorState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadCanceled
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadCompleted
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadViewModel.BackupDownloadWizardState.BackupDownloadInProgress
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.CompleteToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.DetailsToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.ErrorToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.ToolbarState.ProgressToolbarState
+import org.wordpress.android.ui.jetpack.backup.download.builders.BackupDownloadStateListItemBuilder
+import org.wordpress.android.ui.jetpack.backup.download.usecases.GetBackupDownloadStatusUseCase
+import org.wordpress.android.ui.jetpack.backup.download.usecases.PostBackupDownloadUseCase
+import org.wordpress.android.ui.jetpack.common.CheckboxSpannableLabel
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider
+import org.wordpress.android.ui.jetpack.usecases.GetActivityLogItemUseCase
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.wizard.WizardManager
+import org.wordpress.android.util.wizard.WizardNavigationTarget
+import org.wordpress.android.viewmodel.ResourceProvider
+import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.util.Date
+
+@InternalCoroutinesApi
+class BackupDownloadViewModelTest : BaseUnitTest() {
+    @Mock lateinit var wizardManager: WizardManager<BackupDownloadStep>
+    @Mock lateinit var backupDownloadStep: BackupDownloadStep
+    @Mock lateinit var savedInstanceState: Bundle
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var getActivityLogItemUseCase: GetActivityLogItemUseCase
+    @Mock private lateinit var backupDownloadStatusUseCase: GetBackupDownloadStatusUseCase
+    @Mock private lateinit var postBackupDownloadUseCase: PostBackupDownloadUseCase
+    @Mock private lateinit var resourceProvider: ResourceProvider
+    @Mock private lateinit var checkboxSpannableLabel: CheckboxSpannableLabel
+    private lateinit var availableItemsProvider: JetpackAvailableItemsProvider
+    private lateinit var stateListItemBuilder: BackupDownloadStateListItemBuilder
+
+    private val wizardManagerNavigatorLiveData = SingleLiveEvent<BackupDownloadStep>()
+
+    private lateinit var viewModel: BackupDownloadViewModel
+
+    private val activityId = "1"
+
+    private val backupDownloadState = BackupDownloadState(
+            activityId = "activityId",
+            rewindId = "rewindId",
+            downloadId = 100L,
+            siteId = 200L,
+            url = null,
+            published = Date(1609690147756)
+    )
+
+    @Before
+    fun setUp() = test {
+        whenever(wizardManager.navigatorLiveData).thenReturn(wizardManagerNavigatorLiveData)
+        whenever(wizardManager.showNextStep()).then {
+            wizardManagerNavigatorLiveData.value = backupDownloadStep
+            Unit
+        }
+        availableItemsProvider = JetpackAvailableItemsProvider()
+        stateListItemBuilder = BackupDownloadStateListItemBuilder(checkboxSpannableLabel)
+        viewModel = BackupDownloadViewModel(
+                wizardManager,
+                availableItemsProvider,
+                getActivityLogItemUseCase,
+                stateListItemBuilder,
+                postBackupDownloadUseCase,
+                backupDownloadStatusUseCase,
+                TEST_DISPATCHER
+        )
+        whenever(getActivityLogItemUseCase.get(anyOrNull())).thenReturn(fakeActivityLogModel)
+        whenever(postBackupDownloadUseCase.postBackupDownloadRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postBackupDownloadSuccess)
+        whenever(backupDownloadStatusUseCase.getBackupDownloadStatus(anyOrNull(), anyOrNull()))
+                .thenReturn(flow { emit(getStatusProgress) })
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_themes, null))
+                .thenReturn("themes")
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_plugins, null))
+                .thenReturn("plugins")
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_media_uploads, null))
+                .thenReturn("uploads")
+        whenever(
+                checkboxSpannableLabel.buildSpannableLabel(
+                        R.string.backup_item_roots,
+                        R.string.backup_item_roots_hint
+                )
+        )
+                .thenReturn("roots")
+        whenever(
+                checkboxSpannableLabel.buildSpannableLabel(
+                        R.string.backup_item_contents,
+                        R.string.backup_item_content_hint
+                )
+        )
+                .thenReturn("contents")
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_sqls, R.string.backup_item_sqls_hint))
+                .thenReturn("sqls")
+    }
+
+    @Test
+    fun `given view model, when started, then process moves to next step`() = test {
+        startViewModel()
+
+        verify(wizardManager).showNextStep()
+    }
+
+    @Test
+    fun `given view model, when started, then state reflect details`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+
+        assertThat(uiStates.last()).isInstanceOf(DetailsState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(DetailsToolbarState::class.java)
+    }
+
+    @Test
+    fun `given item is checked, when item is clicked, then item gets unchecked`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+
+        clearInvocations(wizardManager)
+
+        ((uiStates.last().items).first { it is CheckboxState } as CheckboxState).onClick.invoke()
+
+        assertThat((((uiStates.last()).items)
+                .first { it is CheckboxState } as CheckboxState).checked).isFalse
+    }
+
+    @Test
+    fun `given item is unchecked, when item is clicked, then item gets checked`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+
+        clearInvocations(wizardManager)
+
+        ((uiStates.last().items).first { it is CheckboxState } as CheckboxState).onClick.invoke()
+        ((uiStates.last().items).first { it is CheckboxState } as CheckboxState).onClick.invoke()
+
+        assertThat(((uiStates.last().items).first { it is CheckboxState } as CheckboxState).checked).isTrue
+    }
+
+    @Test
+    fun `given details step, when request create download success, then state reflects progress`() = test {
+        whenever(postBackupDownloadUseCase.postBackupDownloadRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postBackupDownloadSuccess)
+
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+        clearInvocations(wizardManager)
+        whenever(wizardManager.showNextStep()).then {
+            wizardManagerNavigatorLiveData.value = BackupDownloadStep.PROGRESS
+            Unit
+        }
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(uiStates.last()).isInstanceOf(ProgressState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(ProgressToolbarState::class.java)
+    }
+
+    @Test
+    fun `given details step, when no network connection, then a snackbar message is shown`() = test {
+        whenever(postBackupDownloadUseCase.postBackupDownloadRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postBackupDownloadNetworkError)
+
+        val uiStates = initObservers().uiStates
+        val msgs = initObservers().snackbarMessages
+
+        startViewModel()
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(msgs.last().message).isEqualTo(UiStringRes(R.string.error_network_connection))
+    }
+
+    @Test
+    fun `given details step, when request in error, then a snackbar message is shown`() = test {
+        whenever(postBackupDownloadUseCase.postBackupDownloadRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postBackupDownloadRemoteRequestError)
+
+        val uiStates = initObservers().uiStates
+        val msgs = initObservers().snackbarMessages
+
+        startViewModel()
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(msgs.last().message).isEqualTo(UiStringRes(R.string.backup_download_generic_failure))
+    }
+
+    @Test
+    fun `given details step, when another request is running, then a snackbar message is shown`() = test {
+        whenever(postBackupDownloadUseCase.postBackupDownloadRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(otherRequestRunningError)
+
+        val uiStates = initObservers().uiStates
+        val msgs = initObservers().snackbarMessages
+
+        startViewModel()
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(msgs.last().message).isEqualTo(UiStringRes(R.string.backup_download_another_download_running))
+    }
+
+    @Test
+    fun `given in details step, when onBackPressed, then invokes wizard finished with cancel`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+
+        startViewModel()
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(BackupDownloadStep.DETAILS.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(BackupDownloadCanceled::class.java)
+    }
+
+    @Test
+    fun `given in progress step, when onBackPressed, then invokes wizard finished with BackupDownloadInProgress`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+        startViewModelForProgress()
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(BackupDownloadStep.PROGRESS.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(BackupDownloadInProgress::class.java)
+    }
+
+    @Test
+    fun `given in complete step, when onBackPressed, then invokes wizard finished with BackupDownloadCompleted`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+        startViewModelForComplete(backupDownloadState = backupDownloadState.copy(url = "www.wordpress.com"))
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(BackupDownloadStep.COMPLETE.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(BackupDownloadCompleted::class.java)
+    }
+
+    @Test
+    fun `given backupDownloadState, when writeToBundle is invoked, state is writtenToBundle`() {
+        startViewModel()
+
+        viewModel.writeToBundle(savedInstanceState)
+
+        verify(savedInstanceState)
+                .putParcelable(any(), argThat { this is BackupDownloadState })
+    }
+
+    @Test
+    fun `given step index, when returned from background, then step index is restored`() {
+        val index = BackupDownloadStep.PROGRESS.id
+
+        startViewModelForProgress()
+
+        verify(wizardManager).setCurrentStepIndex(index)
+    }
+
+    @Test
+    fun `given progress step, when started, then the progress is set to zero`() = test {
+        whenever(postBackupDownloadUseCase.postBackupDownloadRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postBackupDownloadSuccess)
+
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+        clearInvocations(wizardManager)
+        whenever(wizardManager.showNextStep()).then {
+            wizardManagerNavigatorLiveData.value = BackupDownloadStep.PROGRESS
+            Unit
+        }
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(((uiStates.last().items)
+                .first { it is JetpackListItemState.ProgressState } as JetpackListItemState.ProgressState).progress)
+                .isEqualTo(0)
+    }
+
+    @Test
+    fun `given showStep for details is invoked, then state reflects details`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+        clearInvocations(wizardManager)
+
+        viewModel.showStep(WizardNavigationTarget(BackupDownloadStep.DETAILS, backupDownloadState))
+
+        assertThat(uiStates.last()).isInstanceOf(DetailsState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(DetailsToolbarState::class.java)
+    }
+
+    @Test
+    fun `given showStep for progress is invoked, then state reflects progress`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModelForProgress()
+        viewModel.showStep(WizardNavigationTarget(BackupDownloadStep.PROGRESS, backupDownloadState))
+
+        assertThat(uiStates.last()).isInstanceOf(ProgressState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(ProgressToolbarState::class.java)
+    }
+
+    @Test
+    fun `given showStep for complete is invoked, then state reflects complete`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModelForComplete(backupDownloadState = backupDownloadState.copy(url = "www.wordpress.com"))
+        viewModel.showStep(WizardNavigationTarget(BackupDownloadStep.COMPLETE, backupDownloadState))
+
+        assertThat(uiStates.last()).isInstanceOf(CompleteState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(CompleteToolbarState::class.java)
+    }
+
+    @Test
+    fun `given showStep for error is invoked, then state reflects error`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModelForError()
+        viewModel.showStep(WizardNavigationTarget(BackupDownloadStep.ERROR, backupDownloadState))
+
+        assertThat(uiStates.last()).isInstanceOf(ErrorState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(ErrorToolbarState::class.java)
+    }
+
+    @Test
+    fun `given complete, when downloadFile is clicked, then a navigationEvent is posted`() = test {
+        val uiStates = initObservers().uiStates
+        val navigationEvents = initObservers().navigationEvents
+        val url = "www.google.com"
+
+        startViewModelForComplete(backupDownloadState = backupDownloadState.copy(url = url))
+        viewModel.showStep(WizardNavigationTarget(BackupDownloadStep.COMPLETE, backupDownloadState))
+
+        (uiStates.last().items)
+                .filterIsInstance<ActionButtonState>()
+                .first()
+                .onClick.invoke()
+
+        assertThat(navigationEvents.last()).isInstanceOf(DownloadFile::class.java)
+    }
+
+    @Test
+    fun `given complete, when shareLink is clicked, then a navigationEvent is posted`() = test {
+        val uiStates = initObservers().uiStates
+        val navigationEvents = initObservers().navigationEvents
+        val url = "www.google.com"
+
+        startViewModelForComplete(backupDownloadState = backupDownloadState.copy(url = url))
+        viewModel.showStep(WizardNavigationTarget(BackupDownloadStep.COMPLETE, backupDownloadState))
+
+        (uiStates.last().items)
+                .filterIsInstance<ActionButtonState>()
+                .last()
+                .onClick.invoke()
+
+        assertThat(navigationEvents.last()).isInstanceOf(ShareLink::class.java)
+    }
+
+    private fun startViewModel(savedInstanceState: Bundle? = null) {
+        viewModel.start(site, activityId, savedInstanceState)
+    }
+
+    private fun startViewModelForProgress() {
+        whenever(savedInstanceState.getInt(KEY_BACKUP_DOWNLOAD_CURRENT_STEP))
+                .thenReturn(BackupDownloadStep.PROGRESS.id)
+        whenever(savedInstanceState.getParcelable<BackupDownloadState>(KEY_BACKUP_DOWNLOAD_STATE))
+                .thenReturn(backupDownloadState)
+        startViewModel(savedInstanceState)
+    }
+
+    private fun startViewModelForComplete(backupDownloadState: BackupDownloadState? = null) {
+        whenever(savedInstanceState.getInt(KEY_BACKUP_DOWNLOAD_CURRENT_STEP))
+                .thenReturn(BackupDownloadStep.COMPLETE.id)
+        whenever(savedInstanceState.getParcelable<BackupDownloadState>(KEY_BACKUP_DOWNLOAD_STATE))
+                .thenReturn(backupDownloadState)
+        startViewModel(savedInstanceState)
+    }
+
+    private fun startViewModelForError() {
+        whenever(savedInstanceState.getInt(KEY_BACKUP_DOWNLOAD_CURRENT_STEP))
+                .thenReturn(BackupDownloadStep.ERROR.id)
+        whenever(savedInstanceState.getParcelable<BackupDownloadState>(KEY_BACKUP_DOWNLOAD_STATE))
+                .thenReturn(backupDownloadState)
+        startViewModel(savedInstanceState)
+    }
+
+    private fun initObservers(): Observers {
+        val wizardFinishedObserver = mutableListOf<BackupDownloadWizardState>()
+        viewModel.wizardFinishedObservable.observeForever { wizardFinishedObserver.add(it.peekContent()) }
+
+        val snackbarMsgs = mutableListOf<SnackbarMessageHolder>()
+        viewModel.snackbarEvents.observeForever { snackbarMsgs.add(it.peekContent()) }
+
+        val navigationEvents = mutableListOf<BackupDownloadNavigationEvents>()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it.peekContent()) }
+
+        val uiStates = mutableListOf<BackupDownloadUiState>()
+        viewModel.uiState.observeForever { uiStates.add(it) }
+
+        return Observers(
+                wizardFinishedObserver,
+                snackbarMsgs,
+                navigationEvents,
+                uiStates
+        )
+    }
+
+    private data class Observers(
+        val wizardFinishedObserver: List<BackupDownloadWizardState>,
+        val snackbarMessages: List<SnackbarMessageHolder>,
+        val navigationEvents: List<BackupDownloadNavigationEvents>,
+        val uiStates: List<BackupDownloadUiState>
+    )
+
+    private val fakeActivityLogModel: ActivityLogModel = ActivityLogModel(
+            activityID = "1",
+            summary = "summary",
+            content = null,
+            name = null,
+            type = null,
+            gridicon = null,
+            status = null,
+            rewindable = null,
+            rewindID = "rewindId",
+            published = Date()
+    )
+
+    private val postBackupDownloadSuccess = BackupDownloadRequestState.Success(
+            requestRewindId = "rewindId",
+            rewindId = "rewindId",
+            downloadId = 100L
+    )
+
+    private val getStatusProgress = BackupDownloadRequestState.Progress(
+            rewindId = "rewindId",
+            progress = 0
+    )
+
+    private val postBackupDownloadNetworkError = BackupDownloadRequestState.Failure.NetworkUnavailable
+    private val postBackupDownloadRemoteRequestError = BackupDownloadRequestState.Failure.RemoteRequestFailure
+    private val otherRequestRunningError = BackupDownloadRequestState.Failure.OtherRequestRunning
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/GetBackupDownloadStatusUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/GetBackupDownloadStatusUseCaseTest.kt
new file mode 100644
index 000000000000..eb913257d12b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/GetBackupDownloadStatusUseCaseTest.kt
@@ -0,0 +1,349 @@
+package org.wordpress.android.ui.jetpack.backup.download.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_BACKUP_DOWNLOAD_STATE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadStatusError
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadStatusErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnBackupDownloadStatusFetched
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Complete
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Empty
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Progress
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.util.Calendar
+import java.util.Date
+
+@InternalCoroutinesApi
+@ExperimentalCoroutinesApi
+class GetBackupDownloadStatusUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: GetBackupDownloadStatusUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var activityLogStore: ActivityLogStore
+    @Mock private lateinit var site: SiteModel
+
+    @Before
+    fun setup() = test {
+        useCase = GetBackupDownloadStatusUseCase(networkUtilsWrapper, activityLogStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        whenever(activityLogStore.fetchBackupDownloadState(any()))
+                .thenReturn(OnBackupDownloadStatusFetched(FETCH_BACKUP_DOWNLOAD_STATE))
+        whenever(activityLogStore.getActivityLogItemByRewindId(rewindId)).thenReturn(activityLogModel)
+    }
+
+    @Test
+    fun `given no network without download id, when backup status triggers, then return network unavailable`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat(result).contains(Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given no network with download id, when backup status triggers, then return network unavailable`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+        assertThat(result).contains(Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given failure without download id, when backup status triggers, then return remote request failure`() =
+            test {
+                whenever(activityLogStore.fetchBackupDownloadState(any()))
+                        .thenReturn(
+                                OnBackupDownloadStatusFetched(
+                                        BackupDownloadStatusError(GENERIC_ERROR),
+                                        FETCH_BACKUP_DOWNLOAD_STATE
+                                )
+                        )
+
+                val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+                assertThat(result).contains(RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given failure with download id, when backup status triggers, then return remote request failure`() =
+            test {
+                whenever(activityLogStore.fetchBackupDownloadState(any())).thenReturn(
+                        OnBackupDownloadStatusFetched(
+                                BackupDownloadStatusError(GENERIC_ERROR),
+                                FETCH_BACKUP_DOWNLOAD_STATE
+                        )
+                )
+
+                val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+                assertThat(result).contains(RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given success without download id, when backup status triggers, then return complete`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(statusModel)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat(result).contains(completeStatus)
+    }
+
+    @Test
+    fun `given success with download id, when backup status triggers, then return complete`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(statusModel)
+
+        val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+        assertThat(result).contains(completeStatus)
+    }
+
+    @Test
+    fun `given success with null url, when backup status triggers, then isValid is false`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(noUrlStatusModel)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat((result.first() as? Complete)?.isValid).isEqualTo(false)
+    }
+
+    @Test
+    fun `given success with null validUntil date, when backup status triggers, then isValid is false`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(noValidUntilDateStatusModel)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat((result.first() as? Complete)?.isValid).isEqualTo(false)
+    }
+
+    @Test
+    fun `given success with null invalid date, when backup status triggers, then isValid is false`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(oldValidUntilDateStatusModel)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat((result.first() as? Complete)?.isValid).isEqualTo(false)
+    }
+
+    @Test
+    fun `given success with valid status, when backup status triggers, then isValid is true`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(statusModel)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat((result.first() as? Complete)?.isValid).isEqualTo(true)
+    }
+
+    @Test
+    fun `given status model is null without download id, when backup status triggers, then return empty`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(null)
+
+        val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+        assertThat(result).contains(Empty)
+    }
+
+    @Test
+    fun `given status model is null with download id, when backup status triggers, then return empty`() = test {
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site)).thenReturn(null)
+
+        val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+        assertThat(result).contains(Empty)
+    }
+
+    @Test
+    fun `given download in process without download id, when backup status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getBackupDownloadStatusForSite(site))
+                        .thenReturn(inProgressModel)
+                        .thenReturn(statusModel)
+                whenever(activityLogStore.fetchBackupDownloadState(any()))
+                        .thenReturn(OnBackupDownloadStatusFetched(FETCH_BACKUP_DOWNLOAD_STATE))
+
+                val result = useCase.getBackupDownloadStatus(site, null).toList()
+
+                assertThat(result).contains(progressStatus, completeStatus)
+            }
+
+    @Test
+    fun `given download in process with download id, when backup status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getBackupDownloadStatusForSite(site))
+                        .thenReturn(inProgressModel)
+                        .thenReturn(statusModel)
+                whenever(activityLogStore.fetchBackupDownloadState(any()))
+                        .thenReturn(OnBackupDownloadStatusFetched(FETCH_BACKUP_DOWNLOAD_STATE))
+
+                val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+                assertThat(result).contains(progressStatus, completeStatus)
+            }
+
+    @Test
+    fun `given max fetch retries exceeded, when backup status triggers, then return remote request failure`() =
+            test {
+                whenever(activityLogStore.fetchBackupDownloadState(any()))
+                        .thenReturn(
+                                OnBackupDownloadStatusFetched(
+                                        BackupDownloadStatusError(GENERIC_ERROR),
+                                        FETCH_BACKUP_DOWNLOAD_STATE
+                                )
+                        )
+                        .thenReturn(
+                                OnBackupDownloadStatusFetched(
+                                        BackupDownloadStatusError(GENERIC_ERROR),
+                                        FETCH_BACKUP_DOWNLOAD_STATE
+                                )
+                        )
+                        .thenReturn(
+                                OnBackupDownloadStatusFetched(
+                                        BackupDownloadStatusError(GENERIC_ERROR),
+                                        FETCH_BACKUP_DOWNLOAD_STATE
+                                )
+                        )
+
+                val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+                assertThat(result).size().isEqualTo(1)
+                assertThat(result).isEqualTo(listOf(RemoteRequestFailure))
+            }
+
+    @Test
+    fun `given fetch error under retry count, when backup status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getBackupDownloadStatusForSite(site))
+                        .thenReturn(inProgressModel)
+                        .thenReturn(statusModel)
+                whenever(activityLogStore.fetchBackupDownloadState(any()))
+                        .thenReturn(
+                                OnBackupDownloadStatusFetched(
+                                        BackupDownloadStatusError(GENERIC_ERROR),
+                                        FETCH_BACKUP_DOWNLOAD_STATE
+                                )
+                        )
+                        .thenReturn(
+                                OnBackupDownloadStatusFetched(
+                                        BackupDownloadStatusError(GENERIC_ERROR),
+                                        FETCH_BACKUP_DOWNLOAD_STATE
+                                )
+                        )
+                        .thenReturn(OnBackupDownloadStatusFetched(FETCH_BACKUP_DOWNLOAD_STATE))
+
+                val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+                assertThat(result).isEqualTo(listOf(progressStatus, completeStatus))
+            }
+
+    @Test
+    fun `given network not available under retry count, when backup status triggers, then return progress`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable())
+                .thenReturn(false)
+                .thenReturn(false)
+                .thenReturn(true)
+        whenever(activityLogStore.getBackupDownloadStatusForSite(site))
+                .thenReturn(inProgressModel)
+                .thenReturn(statusModel)
+        whenever(activityLogStore.fetchBackupDownloadState(any()))
+                .thenReturn(OnBackupDownloadStatusFetched(FETCH_BACKUP_DOWNLOAD_STATE))
+
+        val result = useCase.getBackupDownloadStatus(site, downloadId).toList()
+
+        assertThat(result).isEqualTo(listOf(progressStatus, completeStatus))
+    }
+
+    private val rewindId = "rewindId"
+    private val url = "www.wordpress.com"
+    private val downloadId = 100L
+    private val progress = 50
+    private val published = Date()
+    private val validDate = Calendar.getInstance().apply { time = Date() }.apply { add(Calendar.DATE, 3) }.time
+    private val invalidDate = Calendar.getInstance().apply { time = Date() }.time
+
+    private val statusModel = BackupDownloadStatusModel(
+            downloadId = downloadId,
+            rewindId = rewindId,
+            backupPoint = Date(1609690147756),
+            startedAt = Date(1609690147756),
+            progress = null,
+            downloadCount = 0,
+            validUntil = validDate,
+            url = url
+    )
+
+    private val inProgressModel = BackupDownloadStatusModel(
+            downloadId = downloadId,
+            rewindId = rewindId,
+            backupPoint = Date(1609690147756),
+            startedAt = Date(1609690147756),
+            progress = progress,
+            downloadCount = 0,
+            url = null,
+            validUntil = null
+    )
+
+    private val activityLogModel = ActivityLogModel(
+            activityID = "activityID",
+            summary = "summary",
+            content = null,
+            name = null,
+            type = null,
+            gridicon = null,
+            status = null,
+            rewindable = null,
+            rewindID = null,
+            published = published,
+            actor = null
+    )
+
+    private val noUrlStatusModel = BackupDownloadStatusModel(
+            downloadId = downloadId,
+            rewindId = rewindId,
+            backupPoint = Date(1609690147756),
+            startedAt = Date(1609690147756),
+            progress = null,
+            downloadCount = 0,
+            validUntil = validDate,
+            url = null
+    )
+
+    private val noValidUntilDateStatusModel = BackupDownloadStatusModel(
+            downloadId = downloadId,
+            rewindId = rewindId,
+            backupPoint = Date(1609690147756),
+            startedAt = Date(1609690147756),
+            progress = null,
+            downloadCount = 0,
+            validUntil = null,
+            url = url
+    )
+
+    private val oldValidUntilDateStatusModel = BackupDownloadStatusModel(
+            downloadId = downloadId,
+            rewindId = rewindId,
+            backupPoint = Date(1609690147756),
+            startedAt = Date(1609690147756),
+            progress = null,
+            downloadCount = 0,
+            validUntil = invalidDate,
+            url = url
+    )
+
+    private val completeStatus = Complete(rewindId, downloadId, url, published, validDate, true)
+    private val progressStatus = Progress(rewindId, progress, published)
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostBackupDownloadUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostBackupDownloadUseCaseTest.kt
new file mode 100644
index 000000000000..5b5378436c63
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostBackupDownloadUseCaseTest.kt
@@ -0,0 +1,164 @@
+package org.wordpress.android.ui.jetpack.backup.download.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ActivityLogAction.BACKUP_DOWNLOAD
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.BackupDownloadStatusModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadError
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.ActivityLogStore.BackupDownloadRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnBackupDownload
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.OtherRequestRunning
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.util.Date
+
+@InternalCoroutinesApi
+class PostBackupDownloadUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: PostBackupDownloadUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var activityLogStore: ActivityLogStore
+    @Mock lateinit var siteModel: SiteModel
+
+    @Before
+    fun setup() = test {
+        useCase = PostBackupDownloadUseCase(networkUtilsWrapper, activityLogStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `given no network, when download is triggered, then NetworkUnavailable is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(NetworkUnavailable)
+    }
+
+    @Test
+    fun `given invalid response, when download is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.backupDownload(any())).thenReturn(
+                OnBackupDownload(
+                        rewindId, BackupDownloadError(
+                        INVALID_RESPONSE
+                ), BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given generic error response, when download is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.backupDownload(any())).thenReturn(
+                OnBackupDownload(
+                        rewindId, BackupDownloadError(
+                        GENERIC_ERROR
+                ), BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given api error response, when download is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.backupDownload(any())).thenReturn(
+                OnBackupDownload(
+                        rewindId, BackupDownloadError(
+                        API_ERROR
+                ), BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `when download is triggered successfully, then Success is returned`() = test {
+        whenever(activityLogStore.backupDownload(any())).thenReturn(
+                OnBackupDownload(
+                        rewindId = rewindId,
+                        downloadId = downloadId,
+                        causeOfChange = BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(Success(requestRewindId = rewindId, rewindId = rewindId, downloadId = downloadId))
+    }
+
+    @Test
+    fun `given download success, when downloadId is null, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.backupDownload(any())).thenReturn(
+                OnBackupDownload(
+                        rewindId = rewindId,
+                        downloadId = null,
+                        causeOfChange = BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given download success, when unmatched rewindIds, then OtherRequestRunning is returned`() = test {
+        whenever(activityLogStore.backupDownload(any())).thenReturn(
+                OnBackupDownload(
+                        rewindId = "unmatchedRewindId",
+                        downloadId = downloadId,
+                        causeOfChange = BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.postBackupDownloadRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(OtherRequestRunning)
+    }
+
+    private val rewindId = "rewindId"
+    private val downloadId = 100L
+
+    private val types: BackupDownloadRequestTypes = BackupDownloadRequestTypes(
+            themes = true,
+            plugins = true,
+            uploads = true,
+            sqls = true,
+            roots = true,
+            contents = true
+    )
+
+    private val statusModel = BackupDownloadStatusModel(
+            downloadId = downloadId,
+            rewindId = rewindId,
+            backupPoint = Date(1609690147756),
+            startedAt = Date(1609690147756),
+            progress = null,
+            downloadCount = 0,
+            validUntil = Date(1609690147756),
+            url = "www.wordpress.com"
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostDismissBackupDownloadUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostDismissBackupDownloadUseCaseTest.kt
new file mode 100644
index 000000000000..9dd7634a443e
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/backup/download/usecases/PostDismissBackupDownloadUseCaseTest.kt
@@ -0,0 +1,89 @@
+package org.wordpress.android.ui.jetpack.backup.download.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ActivityLogAction.DISMISS_BACKUP_DOWNLOAD
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadError
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.DismissBackupDownloadErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnDismissBackupDownload
+import org.wordpress.android.test
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+class PostDismissBackupDownloadUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: PostDismissBackupDownloadUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var activityLogStore: ActivityLogStore
+    @Mock lateinit var siteModel: SiteModel
+
+    private val downloadId = 100L
+
+    @Before
+    fun setup() = test {
+        useCase = PostDismissBackupDownloadUseCase(networkUtilsWrapper, activityLogStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `given no network, when dismiss is triggered, then false is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.dismissBackupDownload(downloadId, siteModel)
+
+        assertThat(result).isEqualTo(false)
+    }
+
+    @Test
+    fun `given invalid response, when dismiss is triggered, then false is returned`() = test {
+        whenever(activityLogStore.dismissBackupDownload(any())).thenReturn(
+                OnDismissBackupDownload(
+                        downloadId, DismissBackupDownloadError(INVALID_RESPONSE),
+                        DISMISS_BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.dismissBackupDownload(downloadId, siteModel)
+
+        assertThat(result).isEqualTo(false)
+    }
+
+    @Test
+    fun `given generic error response, when dismiss download is triggered, then false is returned`() = test {
+        whenever(activityLogStore.dismissBackupDownload(any()))
+                .thenReturn(
+                        OnDismissBackupDownload(
+                                downloadId, DismissBackupDownloadError(GENERIC_ERROR),
+                                DISMISS_BACKUP_DOWNLOAD
+                        )
+                )
+
+        val result = useCase.dismissBackupDownload(downloadId, siteModel)
+
+        assertThat(result).isEqualTo(false)
+    }
+
+    @Test
+    fun `when dismiss download is triggered successfully, then true is returned`() = test {
+        whenever(activityLogStore.dismissBackupDownload(any())).thenReturn(
+                OnDismissBackupDownload(
+                        downloadId = downloadId,
+                        isDismissed = true,
+                        causeOfChange = DISMISS_BACKUP_DOWNLOAD
+                )
+        )
+
+        val result = useCase.dismissBackupDownload(downloadId, siteModel)
+
+        assertThat(result).isEqualTo(true)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModelTest.kt
new file mode 100644
index 000000000000..bc984df3f8b5
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/RestoreViewModelTest.kt
@@ -0,0 +1,440 @@
+package org.wordpress.android.ui.jetpack.restore
+
+import android.os.Bundle
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.argThat
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flowOf
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.mockito.Mockito.clearInvocations
+import org.mockito.Mockito.verify
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.FINISHED
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.common.CheckboxSpannableLabel
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.CheckboxState
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.CONTENTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.MEDIA_UPLOADS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.PLUGINS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.ROOTS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.SQLS
+import org.wordpress.android.ui.jetpack.common.providers.JetpackAvailableItemsProvider.JetpackAvailableItemType.THEMES
+import org.wordpress.android.ui.jetpack.restore.RestoreNavigationEvents.VisitSite
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Complete
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Success
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.COMPLETE
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.DETAILS
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.ERROR
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.PROGRESS
+import org.wordpress.android.ui.jetpack.restore.RestoreStep.WARNING
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.CompleteState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.DetailsState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ContentState.ProgressState
+import org.wordpress.android.ui.jetpack.restore.RestoreUiState.ErrorState
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreCanceled
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreCompleted
+import org.wordpress.android.ui.jetpack.restore.RestoreViewModel.RestoreWizardState.RestoreInProgress
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.CompleteToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.DetailsToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.ErrorToolbarState
+import org.wordpress.android.ui.jetpack.restore.ToolbarState.ProgressToolbarState
+import org.wordpress.android.ui.jetpack.restore.builders.RestoreStateListItemBuilder
+import org.wordpress.android.ui.jetpack.restore.usecases.GetRestoreStatusUseCase
+import org.wordpress.android.ui.jetpack.restore.usecases.PostRestoreUseCase
+import org.wordpress.android.ui.jetpack.usecases.GetActivityLogItemUseCase
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.wizard.WizardManager
+import org.wordpress.android.util.wizard.WizardNavigationTarget
+import org.wordpress.android.viewmodel.SingleLiveEvent
+import java.util.Date
+
+@InternalCoroutinesApi
+class RestoreViewModelTest : BaseUnitTest() {
+    @Mock lateinit var wizardManager: WizardManager<RestoreStep>
+    @Mock lateinit var savedInstanceState: Bundle
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var getActivityLogItemUseCase: GetActivityLogItemUseCase
+    @Mock private lateinit var restoreStatusUseCase: GetRestoreStatusUseCase
+    @Mock private lateinit var postRestoreUseCase: PostRestoreUseCase
+    @Mock private lateinit var checkboxSpannableLabel: CheckboxSpannableLabel
+    private lateinit var availableItemsProvider: JetpackAvailableItemsProvider
+    private lateinit var stateListItemBuilder: RestoreStateListItemBuilder
+
+    private val activityId = "1"
+    private val wizardManagerNavigatorLiveData = SingleLiveEvent<RestoreStep>()
+
+    private lateinit var viewModel: RestoreViewModel
+
+    private val restoreState = RestoreState(
+            rewindId = "rewindId",
+            restoreId = 100L,
+            optionsSelected = listOf(
+                    Pair(THEMES.id, true),
+                    Pair(PLUGINS.id, true),
+                    Pair(MEDIA_UPLOADS.id, true),
+                    Pair(SQLS.id, true),
+                    Pair(ROOTS.id, true),
+                    Pair(CONTENTS.id, true)
+            ),
+            published = Date(1609690147756),
+            shouldInitProgress = true
+    )
+
+    @Before
+    fun setUp() = test {
+        whenever(wizardManager.navigatorLiveData).thenReturn(wizardManagerNavigatorLiveData)
+
+        availableItemsProvider = JetpackAvailableItemsProvider()
+        stateListItemBuilder = RestoreStateListItemBuilder(checkboxSpannableLabel)
+        viewModel = RestoreViewModel(
+                wizardManager,
+                availableItemsProvider,
+                getActivityLogItemUseCase,
+                stateListItemBuilder,
+                postRestoreUseCase,
+                restoreStatusUseCase,
+                TEST_DISPATCHER
+        )
+        whenever(getActivityLogItemUseCase.get(anyOrNull())).thenReturn(fakeActivityLogModel)
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_themes, null))
+                .thenReturn("themes")
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_plugins, null))
+                .thenReturn("plugins")
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_media_uploads, null))
+                .thenReturn("uploads")
+        whenever(
+                checkboxSpannableLabel.buildSpannableLabel(
+                        R.string.backup_item_roots,
+                        R.string.backup_item_roots_hint
+                )
+        )
+                .thenReturn("roots")
+        whenever(
+                checkboxSpannableLabel.buildSpannableLabel(
+                        R.string.backup_item_contents,
+                        R.string.backup_item_content_hint
+                )
+        )
+                .thenReturn("contents")
+        whenever(checkboxSpannableLabel.buildSpannableLabel(R.string.backup_item_sqls, R.string.backup_item_sqls_hint))
+                .thenReturn("sqls")
+    }
+
+    @Test
+    fun `given view model, when started, then process moves to next step`() = test {
+        startViewModel()
+
+        verify(wizardManager).showNextStep()
+    }
+
+    @Test
+    fun `given view model, when started, then state reflect details`() = test {
+        val uiStates = initObservers().uiStates
+
+        whenever(wizardManager.showNextStep()).then {
+            wizardManagerNavigatorLiveData.value = DETAILS
+            Unit
+        }
+
+        startViewModel()
+
+        assertThat(uiStates.last()).isInstanceOf(DetailsState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(DetailsToolbarState::class.java)
+    }
+
+    @Test
+    fun `given item is checked, when item is clicked, then item gets unchecked`() = test {
+        val uiStates = initObservers().uiStates
+
+        whenever(wizardManager.showNextStep()).then {
+            wizardManagerNavigatorLiveData.value = DETAILS
+            Unit
+        }
+
+        startViewModel()
+
+        clearInvocations(wizardManager)
+
+        ((uiStates.last().items).first { it is CheckboxState } as CheckboxState).onClick.invoke()
+
+        assertThat((((uiStates.last()).items)
+                .first { it is CheckboxState } as CheckboxState).checked).isFalse
+    }
+
+    @Test
+    fun `given item is unchecked, when item is clicked, then item gets checked`() = test {
+        val uiStates = initObservers().uiStates
+
+        whenever(wizardManager.showNextStep()).then {
+            wizardManagerNavigatorLiveData.value = DETAILS
+            Unit
+        }
+
+        startViewModel()
+
+        ((uiStates.last().items).first { it is CheckboxState } as CheckboxState).onClick.invoke()
+        ((uiStates.last().items).first { it is CheckboxState } as CheckboxState).onClick.invoke()
+
+        assertThat(((uiStates.last().items).first { it is CheckboxState } as CheckboxState).checked).isTrue
+    }
+
+    @Test
+    fun `given in details step, when onBackPressed, then invokes wizard finished with cancel`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+
+        startViewModel()
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(DETAILS.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(RestoreCanceled::class.java)
+    }
+
+    @Test
+    fun `given in warning step, when onBackPressed, then invokes wizard finished with cancel`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+
+        startViewModel()
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(WARNING.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(RestoreCanceled::class.java)
+    }
+
+    @Test
+    fun `given in progress step, when onBackPressed, then invokes wizard finished with RestoreInProgress`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+        startViewModelForStep(PROGRESS)
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(PROGRESS.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(RestoreInProgress::class.java)
+    }
+
+    @Test
+    fun `given in complete step, when onBackPressed, then invokes wizard finished with RestoreCompleted`() {
+        val wizardFinishedObserver = initObservers().wizardFinishedObserver
+        startViewModelForStep(step = COMPLETE)
+        clearInvocations(wizardManager)
+
+        whenever(wizardManager.currentStep).thenReturn(COMPLETE.id)
+        viewModel.onBackPressed()
+
+        assertThat(wizardFinishedObserver.last()).isInstanceOf(RestoreCompleted::class.java)
+    }
+
+    @Test
+    fun `given RestoreState, when writeToBundle is invoked, state is writtenToBundle`() {
+        startViewModel()
+
+        viewModel.writeToBundle(savedInstanceState)
+
+        verify(savedInstanceState)
+                .putParcelable(any(), argThat { this is RestoreState })
+    }
+
+    @Test
+    fun `given step index, when returned from background, then step index is restored`() {
+        val index = PROGRESS.id
+
+        startViewModelForStep(PROGRESS)
+
+        verify(wizardManager).setCurrentStepIndex(index)
+    }
+
+    @Test
+    fun `given showStep for details is invoked, then state reflects details`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModel()
+        clearInvocations(wizardManager)
+
+        viewModel.showStep(WizardNavigationTarget(DETAILS, restoreState))
+
+        assertThat(uiStates.last()).isInstanceOf(DetailsState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(DetailsToolbarState::class.java)
+    }
+
+    @Test
+    fun `given showStep for progress is invoked, then state reflects progress`() = test {
+        val uiStates = initObservers().uiStates
+        clearInvocations(wizardManager)
+
+        whenever(postRestoreUseCase.postRestoreRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postSuccess)
+        whenever(restoreStatusUseCase.getRestoreStatus(anyOrNull(), anyOrNull()))
+                .thenReturn(flowOf(Complete("Id", 100L, Date(1609690147756))))
+
+        startViewModelForStep(PROGRESS)
+
+        viewModel.showStep(WizardNavigationTarget(PROGRESS, restoreState))
+
+        assertThat(uiStates.last()).isInstanceOf(ProgressState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(ProgressToolbarState::class.java)
+    }
+
+    @Test
+    fun `given showStep for complete is invoked, then state reflects complete`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModelForStep(step = COMPLETE)
+        viewModel.showStep(WizardNavigationTarget(COMPLETE, restoreState))
+
+        assertThat(uiStates.last()).isInstanceOf(CompleteState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(CompleteToolbarState::class.java)
+    }
+
+    @Test
+    fun `given showStep for error is invoked, then state reflects error`() = test {
+        val uiStates = initObservers().uiStates
+
+        startViewModelForStep(ERROR)
+        viewModel.showStep(WizardNavigationTarget(ERROR, restoreState))
+
+        assertThat(uiStates.last()).isInstanceOf(ErrorState::class.java)
+        assertThat(uiStates.last().toolbarState).isInstanceOf(ErrorToolbarState::class.java)
+    }
+
+    @Test
+    fun `given complete, when visitSite is clicked, then a navigationEvent is posted`() = test {
+        val uiStates = initObservers().uiStates
+        val navigationEvents = initObservers().navigationEvents
+        val url = "www.google.com"
+        whenever(site.url).thenReturn(url)
+
+        startViewModelForStep(step = COMPLETE)
+        viewModel.showStep(WizardNavigationTarget(COMPLETE, restoreState))
+
+        (uiStates.last().items)
+                .filterIsInstance<ActionButtonState>()
+                .last()
+                .onClick.invoke()
+
+        assertThat(navigationEvents.last()).isInstanceOf(VisitSite::class.java)
+    }
+
+    @Test
+    fun `given progress step, when no network connection, then a snackbar message is shown`() = test {
+        whenever(postRestoreUseCase.postRestoreRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postRestoreNetworkError)
+
+        val uiStates = initObservers().uiStates
+        val msgs = initObservers().snackbarMessages
+
+        startViewModelForStep(PROGRESS)
+        viewModel.showStep(WizardNavigationTarget(PROGRESS, restoreState))
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(msgs.last().message).isEqualTo(UiStringRes(R.string.error_network_connection))
+    }
+
+    @Test
+    fun `given progress step, when remote request fails, then a snackbar message is shown`() = test {
+        whenever(postRestoreUseCase.postRestoreRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(postRestoreRemoteRequestError)
+
+        val uiStates = initObservers().uiStates
+        val msgs = initObservers().snackbarMessages
+
+        startViewModelForStep(PROGRESS)
+        viewModel.showStep(WizardNavigationTarget(PROGRESS, restoreState))
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(msgs.last().message).isEqualTo(UiStringRes(R.string.restore_generic_failure))
+    }
+
+    @Test
+    fun `given progress step, when another request is running, then a snackbar message is shown`() = test {
+        whenever(postRestoreUseCase.postRestoreRequest(anyOrNull(), anyOrNull(), anyOrNull()))
+                .thenReturn(otherRequestRunningError)
+
+        val uiStates = initObservers().uiStates
+        val msgs = initObservers().snackbarMessages
+
+        startViewModelForStep(PROGRESS)
+        viewModel.showStep(WizardNavigationTarget(PROGRESS, restoreState))
+
+        ((uiStates.last().items).first { it is ActionButtonState } as ActionButtonState).onClick.invoke()
+
+        assertThat(msgs.last().message).isEqualTo(UiStringRes(R.string.restore_another_process_running))
+    }
+
+    private fun startViewModel(savedInstanceState: Bundle? = null) {
+        viewModel.start(site, activityId, savedInstanceState)
+    }
+
+    private fun startViewModelForStep(step: RestoreStep, restoreState: RestoreState? = null) {
+        whenever(savedInstanceState.getInt(KEY_RESTORE_CURRENT_STEP))
+                .thenReturn(step.id)
+        whenever(savedInstanceState.getParcelable<RestoreState>(KEY_RESTORE_STATE))
+                .thenReturn(restoreState ?: this.restoreState)
+        startViewModel(savedInstanceState)
+    }
+
+    private fun initObservers(): Observers {
+        val wizardFinishedObserver = mutableListOf<RestoreWizardState>()
+        viewModel.wizardFinishedObservable.observeForever { wizardFinishedObserver.add(it.peekContent()) }
+
+        val snackbarMsgs = mutableListOf<SnackbarMessageHolder>()
+        viewModel.snackbarEvents.observeForever { snackbarMsgs.add(it.peekContent()) }
+
+        val navigationEvents = mutableListOf<RestoreNavigationEvents>()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it.peekContent()) }
+
+        val uiStates = mutableListOf<RestoreUiState>()
+        viewModel.uiState.observeForever { uiStates.add(it) }
+
+        return Observers(
+                wizardFinishedObserver,
+                snackbarMsgs,
+                navigationEvents,
+                uiStates
+        )
+    }
+
+    private data class Observers(
+        val wizardFinishedObserver: List<RestoreWizardState>,
+        val snackbarMessages: List<SnackbarMessageHolder>,
+        val navigationEvents: List<RestoreNavigationEvents>,
+        val uiStates: List<RestoreUiState>
+    )
+
+    private val fakeActivityLogModel: ActivityLogModel = ActivityLogModel(
+            activityID = "1",
+            summary = "summary",
+            content = null,
+            name = null,
+            type = null,
+            gridicon = null,
+            status = null,
+            rewindable = null,
+            rewindID = "rewindId",
+            published = Date()
+    )
+
+    private val postRestoreNetworkError = RestoreRequestState.Failure.NetworkUnavailable
+    private val postRestoreRemoteRequestError = RestoreRequestState.Failure.RemoteRequestFailure
+    private val otherRequestRunningError = RestoreRequestState.Failure.OtherRequestRunning
+    private val postSuccess = Success(rewindId = "rewindId", requestRewindId = "rewindId", restoreId = 1L)
+    private val getFinished = FINISHED
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/usecases/GetRestoreStatusUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/usecases/GetRestoreStatusUseCaseTest.kt
new file mode 100644
index 000000000000..ca902fbb822c
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/usecases/GetRestoreStatusUseCaseTest.kt
@@ -0,0 +1,339 @@
+package org.wordpress.android.ui.jetpack.restore.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_REWIND_STATE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.ActivityLogModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewindStatusFetched
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType.GENERIC_ERROR
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Complete
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Progress
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.util.Date
+
+private const val REWIND_ID = "rewindId"
+private const val RESTORE_ID = 123456789L
+private const val PROGRESS = 50
+private const val MESSAGE = "message"
+private const val CURRENT_ENTRY = "current entry"
+
+private val PUBLISHED = Date()
+
+@InternalCoroutinesApi
+@ExperimentalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class GetRestoreStatusUseCaseTest {
+    private lateinit var useCase: GetRestoreStatusUseCase
+
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var activityLogStore: ActivityLogStore
+    @Mock private lateinit var site: SiteModel
+
+    @Before
+    fun setup() = test {
+        useCase = GetRestoreStatusUseCase(networkUtilsWrapper, activityLogStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
+        whenever(activityLogStore.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(activityLogModel())
+    }
+
+    @Test
+    fun `given no network without restore id, when restore status triggers, then return network unavailable`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.getRestoreStatus(site, null).toList()
+
+        assertThat(result).contains(Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given no network with restore id, when restore status triggers, then return network unavailable`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+        assertThat(result).contains(Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given failure without restore id, when restore status triggers, then return remote request failure`() =
+            test {
+                whenever(activityLogStore.fetchActivitiesRewind(any()))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).contains(Failure.RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given failure with restore id, when restore status triggers, then return failure`() =
+            test {
+                whenever(activityLogStore.fetchActivitiesRewind(any()))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(Failure.RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given finished without restore id and rewind id, when restore status triggers, then return complete`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).contains(Complete(REWIND_ID, RESTORE_ID, PUBLISHED))
+            }
+
+    @Test
+    fun `given finished with restore id and rewind id, when restore status triggers, then return complete`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(Complete(REWIND_ID, RESTORE_ID, PUBLISHED))
+            }
+
+    @Test
+    fun `given finished without restore id no rewind id, when restore status triggers, then return failure`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(null, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).contains(Failure.RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given finished with restore id no rewind id, when restore status triggers, then return failure`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(null, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(Failure.RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given failed without restore id, when restore status triggers, then return failure`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FAILED))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).contains(Failure.RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given failed with restore id, when restore status triggers, then return failure`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FAILED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(Failure.RemoteRequestFailure)
+            }
+
+    @Test
+    fun `given running without restore id, when restore status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.RUNNING))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).contains(
+                        Progress(REWIND_ID, PROGRESS, MESSAGE, CURRENT_ENTRY, PUBLISHED),
+                        Complete(REWIND_ID, RESTORE_ID, PUBLISHED)
+                )
+            }
+
+    @Test
+    fun `given running with restore id, when restore status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.RUNNING))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(
+                        Progress(REWIND_ID, PROGRESS, MESSAGE, CURRENT_ENTRY, PUBLISHED),
+                        Complete(REWIND_ID, RESTORE_ID, PUBLISHED)
+                )
+            }
+
+    @Test
+    fun `given queued without restore id, when restore status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.QUEUED))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).contains(
+                        Progress(REWIND_ID, PROGRESS, MESSAGE, CURRENT_ENTRY, PUBLISHED),
+                        Complete(REWIND_ID, RESTORE_ID, PUBLISHED)
+                )
+            }
+
+    @Test
+    fun `given queued with restore id, when restore status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.QUEUED))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(
+                        Progress(REWIND_ID, PROGRESS, MESSAGE, CURRENT_ENTRY, PUBLISHED),
+                        Complete(REWIND_ID, RESTORE_ID, PUBLISHED)
+                )
+            }
+
+    @Test
+    fun `given get status model is null without restoreId, when restore status triggers, then return empty`() = test {
+        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(null)
+
+        val result = useCase.getRestoreStatus(site, null).toList()
+
+        assertThat(result).contains(RestoreRequestState.Empty)
+    }
+
+    @Test
+    fun `given get status model is null with restoreId, when restore status triggers, then return empty`() = test {
+        whenever(activityLogStore.getRewindStatusForSite(site)).thenReturn(null)
+
+        val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+        assertThat(result).contains(RestoreRequestState.Empty)
+    }
+
+    @Test
+    fun `given max fetch retries exceeded, when restore status triggers, then return remote request failure`() =
+            test {
+                whenever(activityLogStore.fetchActivitiesRewind(any()))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+
+                val result = useCase.getRestoreStatus(site, null).toList()
+
+                assertThat(result).size().isEqualTo(1)
+                assertThat(result).isEqualTo(listOf(RemoteRequestFailure))
+            }
+
+    @Test
+    fun `given fetch error under retry count, when restore status triggers, then return progress`() =
+            test {
+                whenever(activityLogStore.fetchActivitiesRewind(any()))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+                        .thenReturn(OnRewindStatusFetched(RewindStatusError(GENERIC_ERROR), FETCH_REWIND_STATE))
+                        .thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
+
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.RUNNING))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(
+                        Progress(REWIND_ID, PROGRESS, MESSAGE, CURRENT_ENTRY, PUBLISHED),
+                        Complete(REWIND_ID, RESTORE_ID, PUBLISHED)
+                )
+            }
+
+    @Test
+    fun `given no network available under retry count, when restore status triggers, then return progress`() =
+            test {
+                whenever(networkUtilsWrapper.isNetworkAvailable())
+                        .thenReturn(false)
+                        .thenReturn(false)
+                        .thenReturn(true)
+                whenever(activityLogStore.fetchActivitiesRewind(any()))
+                        .thenReturn(OnRewindStatusFetched(FETCH_REWIND_STATE))
+
+                whenever(activityLogStore.getRewindStatusForSite(site))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.RUNNING))
+                        .thenReturn(rewindStatusModel(REWIND_ID, Rewind.Status.FINISHED))
+
+                val result = useCase.getRestoreStatus(site, RESTORE_ID).toList()
+
+                assertThat(result).contains(
+                        Progress(REWIND_ID, PROGRESS, MESSAGE, CURRENT_ENTRY, PUBLISHED),
+                        Complete(REWIND_ID, RESTORE_ID, PUBLISHED)
+                )
+            }
+    /* PRIVATE */
+
+    private fun activityLogModel() = ActivityLogModel(
+            activityID = "activityID",
+            summary = "summary",
+            content = null,
+            name = null,
+            type = null,
+            gridicon = null,
+            status = null,
+            rewindable = null,
+            rewindID = null,
+            published = PUBLISHED,
+            actor = null
+    )
+
+    private fun rewindStatusModel(
+        rewindId: String?,
+        status: Rewind.Status
+    ) = RewindStatusModel(
+            state = State.ACTIVE,
+            reason = null,
+            lastUpdated = PUBLISHED,
+            canAutoconfigure = null,
+            credentials = null,
+            rewind = rewind(rewindId, status)
+    )
+
+    private fun rewind(
+        rewindId: String?,
+        status: Rewind.Status
+    ) = Rewind(
+            rewindId = rewindId,
+            restoreId = RESTORE_ID,
+            status = status,
+            progress = PROGRESS,
+            reason = null,
+            message = MESSAGE,
+            currentEntry = CURRENT_ENTRY
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/usecases/PostRestoreUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/usecases/PostRestoreUseCaseTest.kt
new file mode 100644
index 000000000000..56c8e677d82c
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/restore/usecases/PostRestoreUseCaseTest.kt
@@ -0,0 +1,161 @@
+package org.wordpress.android.ui.jetpack.restore.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ActivityLogAction
+import org.wordpress.android.fluxc.action.ActivityLogAction.REWIND
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.QUEUED
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.Rewind.Status.RUNNING
+import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State.ACTIVE
+import org.wordpress.android.fluxc.store.ActivityLogStore
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewind
+import org.wordpress.android.fluxc.store.ActivityLogStore.OnRewindStatusFetched
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindError
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindErrorType.API_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindRequestTypes
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusError
+import org.wordpress.android.fluxc.store.ActivityLogStore.RewindStatusErrorType
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.NetworkUnavailable
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.OtherRequestRunning
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.util.Date
+
+@InternalCoroutinesApi
+class PostRestoreUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: PostRestoreUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var activityLogStore: ActivityLogStore
+    @Mock lateinit var siteModel: SiteModel
+
+    private val rewindId = "rewindId"
+    private val restoreId = 1L
+    private val types: RewindRequestTypes = RewindRequestTypes(
+            themes = true,
+            plugins = true,
+            uploads = true,
+            sqls = true,
+            roots = true,
+            contents = true
+    )
+
+    @Before
+    fun setup() = test {
+        useCase = PostRestoreUseCase(networkUtilsWrapper, activityLogStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(
+                OnRewindStatusFetched(ActivityLogAction.FETCH_REWIND_STATE)
+        )
+    }
+
+    @Test
+    fun `given no network, when rewind is triggered, then NetworkUnavailable is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(NetworkUnavailable)
+    }
+
+    @Test
+    fun `given invalid response, when restore is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind(rewindId, RewindError(INVALID_RESPONSE), REWIND))
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given generic error response, when restore is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind(rewindId, RewindError(GENERIC_ERROR), REWIND))
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given api error response, when restore is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind(rewindId, RewindError(API_ERROR), REWIND))
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `when restore is triggered successfully, then Success is returned`() = test {
+        whenever(activityLogStore.rewind(any())).thenReturn(OnRewind(rewindId, restoreId, REWIND))
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(Success(requestRewindId = rewindId, rewindId = rewindId, restoreId = restoreId))
+    }
+
+    @Test
+    fun `given fetch error, then RemoteRequestFailure is returned`() = test {
+        whenever(activityLogStore.fetchActivitiesRewind(any())).thenReturn(
+                OnRewindStatusFetched(
+                        RewindStatusError(RewindStatusErrorType.GENERIC_ERROR),
+                        ActivityLogAction.FETCH_REWIND_STATE
+                )
+        )
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given fetch success, when process is running, then OtherRequestRunning is returned`() = test {
+        whenever(activityLogStore.getRewindStatusForSite(siteModel))
+                .thenReturn(buildStatusModel(RUNNING))
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(OtherRequestRunning)
+    }
+
+    @Test
+    fun `given fetch success, when process is queued, then OtherRequestRunning is returned`() = test {
+        whenever(activityLogStore.getRewindStatusForSite(siteModel))
+                .thenReturn(buildStatusModel(QUEUED))
+
+        val result = useCase.postRestoreRequest(rewindId, siteModel, types)
+
+        assertThat(result).isEqualTo(OtherRequestRunning)
+    }
+
+    private fun buildStatusModel(status: Status) = RewindStatusModel(
+            state = ACTIVE,
+            reason = null,
+            lastUpdated = Date(1609690147756),
+            canAutoconfigure = null,
+            credentials = null,
+            rewind = Rewind(
+                    rewindId = rewindId,
+                    restoreId = restoreId,
+                    status = status,
+                    progress = null,
+                    reason = null,
+                    message = null,
+                    currentEntry = null
+            )
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/ScanViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/ScanViewModelTest.kt
new file mode 100644
index 000000000000..7589fa371087
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/ScanViewModelTest.kt
@@ -0,0 +1,776 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runBlockingTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.Constants
+import org.wordpress.android.MainCoroutineScopeRule
+import org.wordpress.android.R
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState.ClickableTextInfo
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ProgressState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemState
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.OpenFixThreatsConfirmationDialog
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowContactSupport
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowJetpackSettings
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowThreatDetails
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.jetpack.scan.ScanViewModel.UiState.FullScreenLoadingUiState
+import org.wordpress.android.ui.jetpack.scan.builders.ScanStateListItemsBuilder
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState.Success
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState.ScanningStateUpdatedInDb
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.viewmodel.Event
+
+private const val ON_START_SCAN_BUTTON_CLICKED_PARAM_POSITION = 3
+private const val ON_FIX_ALL_THREATS_BUTTON_CLICKED_PARAM_POSITION = 4
+private const val ON_THREAT_ITEM_CLICKED_PARAM_POSITION = 5
+private const val ON_ENTER_SERVER_CREDS_MESSAGE_CLICKED_PARAM_POSITION = 7
+
+@ExperimentalCoroutinesApi
+@InternalCoroutinesApi
+class ScanViewModelTest : BaseUnitTest() {
+    @Rule
+    @JvmField val coroutineScope = MainCoroutineScopeRule()
+
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var scanStateItemsBuilder: ScanStateListItemsBuilder
+    @Mock private lateinit var fetchScanStateUseCase: FetchScanStateUseCase
+    @Mock private lateinit var startScanUseCase: StartScanUseCase
+    @Mock private lateinit var fixThreatsUseCase: FixThreatsUseCase
+    @Mock private lateinit var fetchFixThreatsStatusUseCase: FetchFixThreatsStatusUseCase
+    @Mock private lateinit var scanStore: ScanStore
+    @Mock private lateinit var scanTracker: ScanTracker
+    @Mock private lateinit var htmlMessageUtils: HtmlMessageUtils
+
+    private lateinit var viewModel: ScanViewModel
+
+    private val fakeScanStateModel = ScanStateModel(state = ScanStateModel.State.IDLE, hasCloud = true)
+    private val fakeUiStringText = UiStringText("")
+    private val fakeDetectedAt = UiStringText("")
+    private val fakeSubHeaderColor = 1
+    private val fakeThreatId = 1L
+    private val fakeIconId = 1
+    private val fakeIconBackgroundId = 1
+
+    @Before
+    fun setUp() = test {
+        viewModel = ScanViewModel(
+                scanStateItemsBuilder,
+                fetchScanStateUseCase,
+                startScanUseCase,
+                fixThreatsUseCase,
+                fetchFixThreatsStatusUseCase,
+                scanStore,
+                scanTracker,
+                htmlMessageUtils,
+                TEST_DISPATCHER
+        )
+        whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Success(fakeScanStateModel)))
+        whenever(scanStateItemsBuilder.buildScanStateListItems(any(), any(), any(), any(), any(), any(), any(), any()))
+                .thenAnswer {
+                    createDummyScanStateListItems(
+                            it.getArgument(ON_START_SCAN_BUTTON_CLICKED_PARAM_POSITION),
+                            it.getArgument(ON_FIX_ALL_THREATS_BUTTON_CLICKED_PARAM_POSITION),
+                            it.getArgument(ON_THREAT_ITEM_CLICKED_PARAM_POSITION),
+                            it.getArgument(ON_ENTER_SERVER_CREDS_MESSAGE_CLICKED_PARAM_POSITION)
+                    )
+                }
+        whenever(scanStore.getScanStateForSite(site)).thenReturn(fakeScanStateModel)
+        whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                flowOf(FetchFixThreatsState.Complete(fixedThreatsCount = 1))
+        )
+        whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(anyInt())).thenReturn("")
+    }
+
+    @Test
+    fun `given last scan state not present in db, when vm starts, then app displays full screen loading scan state`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                val uiStates = init().uiStates
+
+                assertThat(uiStates.first()).isInstanceOf(FullScreenLoadingUiState::class.java)
+            }
+
+    @Test
+    fun `when vm starts, fetch scan state is triggered`() = test {
+        viewModel.start(site)
+
+        verify(fetchScanStateUseCase).fetchScanState(site)
+    }
+
+    @Test
+    fun `given fixable threats present in db, when vm starts, fetch fix threats status is triggered`() =
+            test {
+                val scanStateModelWithFixableThreats = fakeScanStateModel
+                        .copy(threats = listOf(ThreatTestData.fixableThreatInCurrentStatus))
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(scanStateModelWithFixableThreats)
+
+                viewModel.start(site)
+
+                verify(fetchFixThreatsStatusUseCase).fetchFixThreatsStatus(any(), any())
+            }
+
+    @Test
+    fun `given no network, when scan state fetched over empty scan state, then app reaches no connection state`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.NetworkUnavailable))
+                val uiStates = init().uiStates
+
+                assertThat(uiStates.last()).isInstanceOf(ErrorUiState.NoConnection::class.java)
+            }
+
+    @Test
+    fun `given no connection state, when scan state fetched over empty scan state, then no network ui is shown`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.NetworkUnavailable))
+                val uiStates = init().uiStates
+
+                val error = uiStates.last() as ErrorUiState
+                with(error) {
+                    assertThat(image).isEqualTo(R.drawable.img_illustration_cloud_off_152dp)
+                    assertThat(title).isEqualTo(UiStringRes(R.string.scan_no_network_title))
+                    assertThat(subtitle).isEqualTo(UiStringRes(R.string.scan_no_network_subtitle))
+                    assertThat(buttonText).isEqualTo(UiStringRes(R.string.retry))
+                }
+            }
+
+    @Test
+    fun `given no network, when scan state fetched over last scan state, then no network msg is shown`() = test {
+        whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.NetworkUnavailable))
+        val observers = init()
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.error_generic_network)))
+    }
+
+    @Test
+    fun `given fetch scan fails, when scan state fetched over empty scan state, then app reaches failed ui state`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.RemoteRequestFailure))
+                val uiStates = init().uiStates
+
+                assertThat(uiStates.last()).isInstanceOf(ErrorUiState.GenericRequestFailed::class.java)
+            }
+
+    @Test
+    fun `given request failed ui state, when scan state fetched over empty scan state, then request failed ui shown`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.RemoteRequestFailure))
+                val uiStates = init().uiStates
+
+                val state = uiStates.last() as ErrorUiState
+                with(state) {
+                    assertThat(image).isEqualTo(R.drawable.img_illustration_cloud_off_152dp)
+                    assertThat(title).isEqualTo(UiStringRes(R.string.scan_request_failed_title))
+                    assertThat(subtitle).isEqualTo(UiStringRes(R.string.scan_request_failed_subtitle))
+                    assertThat(buttonText).isEqualTo(UiStringRes(R.string.contact_support))
+                }
+            }
+
+    @Test
+    fun `given fetch scan state fails, when scan state fetched over last scan state, then request failed msg shown`() =
+            test {
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.RemoteRequestFailure))
+                val observers = init()
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.request_failed_message)))
+            }
+
+    @Test
+    fun `given fetch scan state succeeds with valid state, when scan state is fetched, then ui updated with content`() =
+            test {
+                val uiStates = init().uiStates
+
+                assertThat(uiStates.last()).isInstanceOf(ContentUiState::class.java)
+            }
+
+    @Test
+    fun `given fetch scan state succeeds with invalid state, when scan state is fetched, then error ui is shown`() =
+            test {
+                whenever(fetchScanStateUseCase.fetchScanState(site))
+                        .thenReturn(flowOf(Success(fakeScanStateModel.copy(state = ScanStateModel.State.UNKNOWN))))
+
+                val uiStates = init().uiStates
+
+                val errorState = uiStates.last() as ErrorUiState
+                assertThat(errorState).isInstanceOf(ErrorUiState.ScanRequestFailed::class.java)
+            }
+
+    @Test
+    fun `given invalid scan state error ui, when contact support is clicked, then contact support is shown`() = test {
+        whenever(fetchScanStateUseCase.fetchScanState(site))
+                .thenReturn(flowOf(Success(fakeScanStateModel.copy(state = ScanStateModel.State.UNKNOWN))))
+        val observers = init()
+
+        (observers.uiStates.last() as ErrorUiState).action.invoke()
+
+        assertThat(observers.navigation.last().peekContent()).isEqualTo(ShowContactSupport(site))
+    }
+
+    @Test
+    fun `given no network error ui state, when retry is clicked, then fetch scan state is triggered`() =
+            coroutineScope.runBlockingTest {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.NetworkUnavailable))
+                val uiStates = init().uiStates
+
+                (uiStates.last() as ErrorUiState).action.invoke()
+                advanceTimeBy(RETRY_DELAY)
+
+                verify(fetchScanStateUseCase, times(2)).fetchScanState(site)
+            }
+
+    @Test
+    fun `given request failed error ui state, when contact support is clicked, then contact support screen is shown`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Failure.RemoteRequestFailure))
+                val observers = init()
+
+                (observers.uiStates.last() as ErrorUiState).action.invoke()
+
+                assertThat(observers.navigation.last().peekContent()).isEqualTo(ShowContactSupport(site))
+            }
+
+    @Test
+    fun `when threat item is clicked, then app navigates to threat details`() = test {
+        val observers = init()
+
+        (observers.uiStates.last() as ContentUiState).items.filterIsInstance<ThreatItemState>().first().onClick.invoke()
+
+        assertThat(observers.navigation.last().peekContent()).isInstanceOf(ShowThreatDetails::class.java)
+    }
+
+    @Test
+    fun `when scan button is clicked, then start scan is triggered`() = test {
+        whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(ScanningStateUpdatedInDb(fakeScanStateModel)))
+        val uiStates = init().uiStates
+
+        (uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+
+        verify(startScanUseCase).startScan(site)
+    }
+
+    @Test
+    fun `when scan button is clicked, then content updated on scan optimistic start (scanning state updated in db)`() =
+            test {
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(null)
+                whenever(startScanUseCase.startScan(any()))
+                        .thenReturn(flowOf(ScanningStateUpdatedInDb(fakeScanStateModel)))
+                val uiStates = init().uiStates
+
+                (uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+
+                assertThat(uiStates.filterIsInstance<ContentUiState>()).size().isEqualTo(2)
+            }
+
+    @Test
+    fun `when server creds msg is clicked, then app opens site's jetpack settings external url`() = test {
+        val observers = init()
+
+        (observers.uiStates.last() as ContentUiState).items
+                .filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) }
+                ?.clickableTextsInfo
+                ?.firstOrNull()
+                ?.onClick
+                ?.invoke()
+
+        assertThat(observers.navigation.last().peekContent()).isEqualTo(
+                ShowJetpackSettings("${Constants.URL_JETPACK_SETTINGS}/${site.siteId}")
+        )
+    }
+
+    @Test
+    fun `given no network, when scan button is clicked, then no network msg is shown`() = test {
+        whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(StartScanState.Failure.NetworkUnavailable))
+        val observers = init()
+
+        (observers.uiStates.last() as ContentUiState)
+                .items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.error_generic_network)))
+    }
+
+    @Test
+    fun `given scan start request fails, when scan button is clicked, then app reaches scan request failed state`() =
+            test {
+                whenever(startScanUseCase.startScan(any()))
+                        .thenReturn(flowOf(StartScanState.Failure.RemoteRequestFailure))
+                val observers = init()
+
+                (observers.uiStates.last() as ContentUiState)
+                        .items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+
+                assertThat(observers.uiStates.last()).isInstanceOf(ErrorUiState.ScanRequestFailed::class.java)
+            }
+
+    @Test
+    fun `given scan request failed state, when scan button is clicked, then request failed ui is shown`() = test {
+        whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(StartScanState.Failure.RemoteRequestFailure))
+        val observers = init()
+
+        (observers.uiStates.last() as ContentUiState)
+                .items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+
+        val errorState = observers.uiStates.last() as ErrorUiState
+        with(errorState) {
+            assertThat(image).isEqualTo(R.drawable.img_illustration_empty_results_216dp)
+            assertThat(title).isEqualTo(UiStringRes(R.string.scan_start_request_failed_title))
+            assertThat(subtitle).isEqualTo(UiStringRes(R.string.scan_start_request_failed_subtitle))
+            assertThat(buttonText).isEqualTo(UiStringRes(R.string.contact_support))
+        }
+    }
+
+    @Test
+    fun `given scan request failed error state, when contact support is clicked, then contact support shown`() =
+            test {
+                whenever(startScanUseCase.startScan(any()))
+                        .thenReturn(flowOf(StartScanState.Failure.RemoteRequestFailure))
+                val observers = init()
+
+                (observers.uiStates.last() as ContentUiState)
+                        .items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+                (observers.uiStates.last() as ErrorUiState).action.invoke()
+
+                assertThat(observers.navigation.last().peekContent()).isEqualTo(ShowContactSupport(site))
+            }
+
+    @Test
+    fun `given scan start succeeds, when scan button is clicked, then scan state is fetched after delay`() = test {
+        whenever(fetchScanStateUseCase.fetchScanState(site = site, startWithDelay = true))
+                .thenReturn(flowOf(Success(fakeScanStateModel)))
+        whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(StartScanState.Success))
+        val uiStates = init().uiStates
+
+        (uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+
+        verify(fetchScanStateUseCase).fetchScanState(site = site, startWithDelay = true)
+    }
+
+    @Test
+    fun `given no threats found, when scan button is clicked, then no threats message is displayed`() = test {
+        val noThreatsFoundMessage = "no threats found"
+        whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(R.string.scan_finished_no_threats_found_message))
+                .thenReturn(noThreatsFoundMessage)
+        whenever(fetchScanStateUseCase.fetchScanState(site = site, startWithDelay = true))
+                .thenReturn(flowOf(Success(fakeScanStateModel)))
+        whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(StartScanState.Success))
+        val observers = init()
+
+        (observers.uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>().first()
+                .onClick.invoke()
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringText(noThreatsFoundMessage)))
+    }
+
+    @Test
+    fun `given single threat found, when scan button is clicked, then single threat found message is displayed`() =
+            test {
+                val threatFoundMessage = "1 potential threat found"
+                whenever(
+                        htmlMessageUtils
+                                .getHtmlMessageFromStringFormatResId(
+                                        R.string.scan_finished_potential_threats_found_message_singular
+                                )
+                ).thenReturn(threatFoundMessage)
+                val fakeScanStateModelWithThreat = fakeScanStateModel.copy(
+                        threats = listOf(ThreatTestData.genericThreatModel)
+                )
+                whenever(fetchScanStateUseCase.fetchScanState(site = site, startWithDelay = true))
+                        .thenReturn(flowOf(Success(fakeScanStateModelWithThreat)))
+                whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(StartScanState.Success))
+                val observers = init()
+
+                (observers.uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>().first()
+                        .onClick.invoke()
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringText(threatFoundMessage)))
+            }
+
+    @Test
+    fun `given multiple threats found, when scan button is clicked, then plural threats found message is displayed`() =
+            test {
+                val threats = listOf(ThreatTestData.genericThreatModel, ThreatTestData.genericThreatModel)
+                val threatsFoundMessage = "${threats.size} potential threats found."
+                whenever(
+                        htmlMessageUtils
+                                .getHtmlMessageFromStringFormatResId(
+                                        R.string.scan_finished_potential_threats_found_message_plural,
+                                        "${threats.size}"
+                                )
+                ).thenReturn(threatsFoundMessage)
+                val fakeScanStateModelWithThreats = fakeScanStateModel.copy(threats = threats)
+                whenever(fetchScanStateUseCase.fetchScanState(site = site, startWithDelay = true))
+                        .thenReturn(flowOf(Success(fakeScanStateModelWithThreats)))
+                whenever(startScanUseCase.startScan(any())).thenReturn(flowOf(StartScanState.Success))
+                val observers = init()
+
+                (observers.uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>().first()
+                        .onClick.invoke()
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringText(threatsFoundMessage)))
+            }
+
+    @Test
+    fun `when fix all threats button is clicked, then fix threats confirmation dialog action is triggered`() =
+            test {
+                val observers = init()
+
+                (observers.uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>()
+                        .last().onClick.invoke()
+
+                val fixThreatsDialogAction = observers.navigation.last().peekContent()
+                assertThat(fixThreatsDialogAction).isInstanceOf(OpenFixThreatsConfirmationDialog::class.java)
+            }
+
+    @Test
+    fun `when fix threat confirmation dialog action is triggered, then fix threat confirmation dialog is shown`() =
+            test {
+                val scanStateModelWithFixableThreats = fakeScanStateModel
+                        .copy(threats = listOf(ThreatTestData.fixableThreatInCurrentStatus))
+                whenever(fetchScanStateUseCase.fetchScanState(site))
+                        .thenReturn(flowOf(Success(scanStateModelWithFixableThreats)))
+                val observers = init()
+
+                (observers.uiStates.last() as ContentUiState).items.filterIsInstance<ActionButtonState>()
+                        .last().onClick.invoke()
+
+                val confirmationDialog = observers.navigation.last().peekContent() as OpenFixThreatsConfirmationDialog
+                with(confirmationDialog) {
+                    assertThat(title).isEqualTo(UiStringRes(R.string.threat_fix_all_warning_title))
+                    assertThat(message).isEqualTo(
+                            UiStringRes(R.string.threat_fix_all_confirmation_message_singular)
+                    )
+                    assertThat(positiveButtonLabel).isEqualTo(R.string.dialog_button_ok)
+                    assertThat(negativeButtonLabel).isEqualTo(R.string.dialog_button_cancel)
+                }
+            }
+
+    @Test
+    fun `given no network, when fix threats is triggered, then network error message is shown`() = test {
+        whenever(fixThreatsUseCase.fixThreats(any(), any()))
+                .thenReturn(FixThreatsState.Failure.NetworkUnavailable)
+        val observers = init()
+
+        triggerFixThreatsAction(observers)
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.error_generic_network)))
+    }
+
+    @Test
+    fun `given invalid response, when fix threats action is triggered, then fix threats error message is shown`() =
+            test {
+                whenever(fixThreatsUseCase.fixThreats(any(), any()))
+                        .thenReturn(FixThreatsState.Failure.RemoteRequestFailure)
+                val observers = init()
+
+                triggerFixThreatsAction(observers)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg)
+                        .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.threat_fix_all_error_message)))
+            }
+
+    @Test
+    fun `given threats are fixed, when threats fix status is checked, then pluralised success message is shown`() =
+            test {
+                whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                        flowOf(FetchFixThreatsState.Complete(fixedThreatsCount = 2))
+                )
+                val observers = init()
+
+                fetchFixThreatsStatus(observers)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(
+                        SnackbarMessageHolder(UiStringRes(R.string.threat_fix_all_status_success_message_plural))
+                )
+            }
+
+    @Test
+    fun `given single threat is fixed, when threat fix status is checked, then single threat success msg is shown`() =
+            test {
+                whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                        flowOf(FetchFixThreatsState.Complete(fixedThreatsCount = 1))
+                )
+                val observers = init()
+
+                fetchFixThreatsStatus(observers)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(
+                        SnackbarMessageHolder(UiStringRes(R.string.threat_fix_all_status_success_message_singular))
+                )
+            }
+
+    @Test
+    fun `given no network, when threats fix status is checked, then network error message is shown`() = test {
+        whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                flowOf(FetchFixThreatsState.Failure.NetworkUnavailable)
+        )
+        val observers = init()
+
+        fetchFixThreatsStatus(observers)
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.error_generic_network)))
+    }
+
+    @Test
+    fun `given server is unavailable, when threats fix status is checked, then error message is shown`() = test {
+        whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                flowOf(FetchFixThreatsState.Failure.RemoteRequestFailure)
+        )
+        val observers = init()
+
+        fetchFixThreatsStatus(observers)
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(
+                SnackbarMessageHolder(UiStringRes(R.string.threat_fix_all_status_error_message))
+        )
+    }
+
+    @Test
+    fun `given threats fixing fails, when threats fix status checked, then fix threats error message shown`() =
+            test {
+                whenever(fixThreatsUseCase.fixThreats(any(), any())).thenReturn(FixThreatsState.Success)
+                whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                        flowOf(
+                                FetchFixThreatsState.Failure.FixFailure(
+                                        containsOnlyErrors = true,
+                                        mightBeMissingCredentials = false
+                                )
+                        )
+                )
+                val observers = init()
+
+                triggerFixThreatsAction(observers)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(
+                        SnackbarMessageHolder(UiStringRes(R.string.threat_fix_all_status_error_message))
+                )
+            }
+
+    @Test
+    fun `given some threats not fixed, when threats fix status checked, then scan state is re-fetched`() =
+            test {
+                whenever(fetchScanStateUseCase.fetchScanState(site)).thenReturn(flowOf(Success(mock())))
+                whenever(fixThreatsUseCase.fixThreats(any(), any())).thenReturn(FixThreatsState.Success)
+                whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                        flowOf(
+                                FetchFixThreatsState.Failure.FixFailure(
+                                        containsOnlyErrors = false,
+                                        mightBeMissingCredentials = false
+                                )
+                        )
+                )
+                val observers = init()
+
+                triggerFixThreatsAction(observers)
+
+                verify(fetchScanStateUseCase, times(2)).fetchScanState(site = site)
+            }
+
+    @Test
+    fun `given activity result fix threat status data, when fix status is requested, then fix status is fetched`() =
+            test {
+                whenever(site.siteId).thenReturn(1L)
+                viewModel.start(site)
+
+                viewModel.onFixStateRequested(threatId = 11L)
+
+                verify(fetchFixThreatsStatusUseCase).fetchFixThreatsStatus(
+                        remoteSiteId = 1L,
+                        fixableThreatIds = listOf(11L)
+                )
+            }
+
+    @Test
+    fun `given activity result request scan state data, when scan state is requested, then snackbar msg is shown`() =
+            test {
+                val observers = init()
+
+                viewModel.onScanStateRequestedWithMessage(R.string.threat_ignore_success_message)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg)
+                        .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.threat_ignore_success_message)))
+            }
+
+    @Test
+    fun `given activity result request scan state data, when scan state is requested, then scan state is fetched`() =
+            test {
+                viewModel.start(site)
+
+                viewModel.onScanStateRequestedWithMessage(R.string.threat_ignore_success_message)
+
+                verify(fetchScanStateUseCase, times(2)).fetchScanState(site)
+            }
+
+    @Test
+    fun `given FixFailure(onlyErr=true) returned, when fetch fix status invoked by user, then snackbar is shown`() =
+            test {
+                val messages = init().snackBarMsgs
+                whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                        flowOf(
+                                FetchFixThreatsState.Failure.FixFailure(
+                                        containsOnlyErrors = true,
+                                        mightBeMissingCredentials = false
+                                )
+                        )
+                )
+
+                viewModel.onFixStateRequested(threatId = 11L)
+
+                assertThat(messages.isNotEmpty()).isTrue
+            }
+
+    @Test
+    fun `given FixFailure(onlyErr=true) returned, when fetchStatus NOT invoked by user, then snackbar is NOT shown`() =
+            test {
+                whenever(fetchFixThreatsStatusUseCase.fetchFixThreatsStatus(any(), any())).thenReturn(
+                        flowOf(
+                                FetchFixThreatsState.Failure.FixFailure(
+                                        containsOnlyErrors = true,
+                                        mightBeMissingCredentials = false
+                                )
+                        )
+                )
+                val scanStateModelWithFixableThreats = fakeScanStateModel
+                        .copy(threats = listOf(ThreatTestData.fixableThreatInCurrentStatus))
+                whenever(scanStore.getScanStateForSite(site)).thenReturn(scanStateModelWithFixableThreats)
+
+                val messages = init().snackBarMsgs
+
+                assertThat(messages.isEmpty()).isTrue
+            }
+
+    private fun triggerFixThreatsAction(observers: Observers) {
+        (observers.uiStates.last() as ContentUiState)
+                .items.filterIsInstance<ActionButtonState>().last().onClick.invoke()
+        (observers.navigation.last().peekContent() as OpenFixThreatsConfirmationDialog).okButtonAction.invoke()
+    }
+
+    private suspend fun fetchFixThreatsStatus(observers: Observers) {
+        whenever(fixThreatsUseCase.fixThreats(any(), any())).thenReturn(FixThreatsState.Success)
+        triggerFixThreatsAction(observers)
+    }
+
+    private fun createDummyScanStateListItems(
+        onStartScanButtonClicked: (() -> Unit),
+        onFixAllButtonClicked: (() -> Unit),
+        onThreatItemClicked: (Long) -> Unit,
+        onEnterServerCredsMessageClicked: () -> Unit
+    ) = listOf(
+            ActionButtonState(
+                    text = fakeUiStringText,
+                    contentDescription = fakeUiStringText,
+                    isSecondary = false,
+                    onClick = onStartScanButtonClicked
+            ),
+            ActionButtonState(
+                    text = fakeUiStringText,
+                    contentDescription = fakeUiStringText,
+                    isSecondary = true,
+                    onClick = onFixAllButtonClicked
+            ),
+            ProgressState(
+                    progress = 0,
+                    progressLabel = fakeUiStringText,
+                    isIndeterminate = true,
+                    isVisible = false
+            ),
+            DescriptionState(
+                    text = UiStringRes(R.string.threat_fix_enter_server_creds_message_singular),
+                    clickableTextsInfo = listOf(
+                            ClickableTextInfo(
+                                    startIndex = 0,
+                                    endIndex = 1,
+                                    onClick = onEnterServerCredsMessageClicked
+                            )
+                    )
+            ),
+            ThreatItemState(
+                    threatId = fakeThreatId,
+                    isFixing = false,
+                    firstDetectedDate = fakeDetectedAt,
+                    header = fakeUiStringText,
+                    subHeader = fakeUiStringText,
+                    subHeaderColor = fakeSubHeaderColor,
+                    icon = fakeIconId,
+                    iconBackground = fakeIconBackgroundId
+            ) { onThreatItemClicked(fakeThreatId) }
+    )
+
+    private fun init(): Observers {
+        val uiStates = mutableListOf<UiState>()
+        viewModel.uiState.observeForever {
+            uiStates.add(it)
+        }
+        val snackbarMsgs = mutableListOf<Event<SnackbarMessageHolder>>()
+        viewModel.snackbarEvents.observeForever {
+            snackbarMsgs.add(it)
+        }
+        val navigation = mutableListOf<Event<ScanNavigationEvents>>()
+        viewModel.navigationEvents.observeForever {
+            navigation.add(it)
+        }
+
+        viewModel.start(site)
+
+        return Observers(uiStates, snackbarMsgs, navigation)
+    }
+
+    private data class Observers(
+        val uiStates: List<UiState>,
+        val snackBarMsgs: List<Event<SnackbarMessageHolder>>,
+        val navigation: List<Event<ScanNavigationEvents>>
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/ThreatTestData.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/ThreatTestData.kt
new file mode 100644
index 000000000000..50d616afcb72
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/ThreatTestData.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.ui.jetpack.scan
+
+import org.wordpress.android.fluxc.model.scan.threat.BaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.CoreFileModificationThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.DatabaseThreatModel.Row
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.FileThreatModel.ThreatContext.ContextLine
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable.FixType
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension.ExtensionType
+import java.util.Date
+
+const val TEST_FILE_PATH = "/var/www/html/jp-scan-daily/wp-admin/index.php"
+const val TEST_FILE_NAME = "index.php"
+const val TEST_VULNERABLE_THREAT_SLUG = "test slug"
+const val TEST_VULNERABLE_THREAT_VERSION = "test version"
+const val TEST_SIGNATURE = "test signature"
+const val TEST_DESCRIPTION = "test description"
+const val TEST_CONTEXT_LINE_CONTENTS = "test contents"
+
+object ThreatTestData {
+    val extension = Extension(
+            type = ExtensionType.PLUGIN,
+            slug = TEST_VULNERABLE_THREAT_SLUG,
+            name = "",
+            version = TEST_VULNERABLE_THREAT_VERSION,
+            isPremium = false
+    )
+    val rows = listOf(Row(id = 1, rowNumber = 1))
+    val contextLine = ContextLine(
+            lineNumber = 1,
+            contents = TEST_CONTEXT_LINE_CONTENTS,
+            highlights = listOf(Pair(2, 5))
+    )
+
+    val baseThreatModel = BaseThreatModel(
+            id = 1L,
+            signature = TEST_SIGNATURE,
+            description = TEST_DESCRIPTION,
+            status = ThreatStatus.CURRENT,
+            firstDetected = Date(0),
+            fixedOn = Date(123)
+    )
+    val genericThreatModel = GenericThreatModel(
+            baseThreatModel = baseThreatModel
+    )
+    val coreFileModificationThreatModel = CoreFileModificationThreatModel(
+            baseThreatModel = baseThreatModel,
+            fileName = TEST_FILE_PATH,
+            diff = ""
+    )
+    val databaseThreatModel = DatabaseThreatModel(
+            baseThreatModel = baseThreatModel,
+            rows = rows
+    )
+    val fileThreatModel = FileThreatModel(
+            baseThreatModel = baseThreatModel,
+            fileName = TEST_FILE_PATH,
+            context = ThreatContext(lines = listOf(contextLine))
+    )
+    val vulnerableExtensionThreatModel = VulnerableExtensionThreatModel(
+            baseThreatModel = baseThreatModel,
+            extension = extension
+    )
+    val fixableThreatInCurrentStatus = GenericThreatModel(
+            baseThreatModel.copy(
+                    fixable = Fixable(file = null, fixer = FixType.EDIT, target = null),
+                    status = ThreatStatus.CURRENT
+            )
+    )
+    val notFixableThreatInCurrentStatus = GenericThreatModel(
+            baseThreatModel.copy(
+                    fixable = null,
+                    status = ThreatStatus.CURRENT
+            )
+    )
+    val fixableThreatInFixedStatus = GenericThreatModel(
+            baseThreatModel.copy(
+                    fixable = Fixable(file = null, fixer = FixType.EDIT, target = null),
+                    status = ThreatStatus.FIXED
+            )
+    )
+    val fixableThreatInIgnoredStatus = GenericThreatModel(
+            baseThreatModel.copy(
+                    fixable = Fixable(file = null, fixer = FixType.EDIT, target = null),
+                    status = ThreatStatus.IGNORED
+            )
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilderTest.kt
new file mode 100644
index 000000000000..9060db5244d2
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ScanStateListItemsBuilderTest.kt
@@ -0,0 +1,656 @@
+package org.wordpress.android.ui.jetpack.scan.builders
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.ScanProgressStatus
+import org.wordpress.android.fluxc.model.scan.ScanStateModel.State
+import org.wordpress.android.fluxc.model.scan.threat.BaseThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState.ClickableTextInfo
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.IconState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ProgressState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemState
+import org.wordpress.android.ui.jetpack.scan.ThreatTestData
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemsBuilder
+import org.wordpress.android.ui.reader.utils.DateProvider
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.viewmodel.ResourceProvider
+import java.util.Date
+
+private const val DUMMY_CURRENT_TIME = 10000000L
+private const val ONE_MINUTE = 60 * 1000L
+private const val ONE_HOUR = 60 * ONE_MINUTE
+private const val DUMMY_TEXT = "dummy text"
+
+@InternalCoroutinesApi
+class ScanStateListItemsBuilderTest : BaseUnitTest() {
+    private lateinit var builder: ScanStateListItemsBuilder
+
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var dateProvider: DateProvider
+    @Mock private lateinit var htmlMessageUtils: HtmlMessageUtils
+    @Mock private lateinit var resourceProvider: ResourceProvider
+    @Mock private lateinit var threatItemBuilder: ThreatItemBuilder
+    @Mock private lateinit var threatDetailsListItemsBuilder: ThreatDetailsListItemsBuilder
+    @Mock private lateinit var scanStore: ScanStore
+    @Mock private lateinit var onHelpClickedMock: () -> Unit
+    @Mock private lateinit var onEnterServerCredsMessageClicked: () -> Unit
+
+    private val baseThreatModel = BaseThreatModel(
+            id = 1L,
+            signature = "",
+            description = "",
+            status = ThreatStatus.CURRENT,
+            firstDetected = Date(0)
+    )
+    private val threat = ThreatModel.GenericThreatModel(baseThreatModel)
+    private val threats = listOf(threat)
+    private val scanStateModelWithNoThreats = ScanStateModel(state = State.IDLE)
+    private val scanStateModelWithThreats = scanStateModelWithNoThreats.copy(threats = threats)
+
+    @Before
+    fun setUp() {
+        builder = ScanStateListItemsBuilder(
+                dateProvider,
+                htmlMessageUtils,
+                resourceProvider,
+                threatItemBuilder,
+                threatDetailsListItemsBuilder,
+                scanStore
+        )
+        whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(anyInt(), any())).thenReturn("")
+        whenever(resourceProvider.getString(anyInt())).thenReturn(DUMMY_TEXT)
+        whenever(site.name).thenReturn((""))
+        whenever(dateProvider.getCurrentDate()).thenReturn(Date(DUMMY_CURRENT_TIME))
+    }
+
+    /* FIXING THREATS STATE */
+
+    @Test
+    fun `given fixing threats state, when items are built, then shield warning icon with error color exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(
+                        model = scanStateModelWithThreats,
+                        fixingThreatIds = listOf(threat.baseThreatModel.id)
+                )
+
+                assertThat(scanStateItems.filterIsInstance(IconState::class.java).first()).isEqualTo(
+                        IconState(
+                                icon = R.drawable.ic_shield_warning_white,
+                                colorResId = R.color.error,
+                                sizeResId = R.dimen.scan_icon_size,
+                                marginResId = R.dimen.scan_icon_margin,
+                                contentDescription = UiStringRes(R.string.scan_state_icon)
+                        )
+                )
+            }
+
+    @Test
+    fun `given fixing threats state, when items are built, then fixing threats header exists`() = test {
+        val scanStateItems = buildScanStateItems(
+                model = scanStateModelWithThreats,
+                fixingThreatIds = listOf(threat.baseThreatModel.id)
+        )
+
+        assertThat(scanStateItems.filterIsInstance(HeaderState::class.java).first()).isEqualTo(
+                HeaderState(UiStringRes(R.string.scan_fixing_threats_title_singular))
+        )
+    }
+
+    @Test
+    fun `given fixing threats state, when items are built, then fixing threats description exists`() = test {
+        val scanStateItems = buildScanStateItems(
+                model = scanStateModelWithThreats,
+                fixingThreatIds = listOf(threat.baseThreatModel.id)
+        )
+
+        assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).first()).isEqualTo(
+                DescriptionState(UiStringRes(R.string.scan_fixing_threats_description_singular))
+        )
+    }
+
+    @Test
+    fun `given fixing threats state, when items are built, then indeterminate progress bar exists`() = test {
+        val scanStateItems = buildScanStateItems(
+                model = scanStateModelWithThreats,
+                fixingThreatIds = listOf(threat.baseThreatModel.id)
+        )
+
+        assertThat(scanStateItems.filterIsInstance(ProgressState::class.java).first()).isEqualTo(
+                ProgressState(isIndeterminate = true, isVisible = true)
+        )
+    }
+
+    @Test
+    fun `given fixing threats state, when items are built, then fixing threats exist`() = test {
+        val threatModel = ThreatTestData.fixableThreatInCurrentStatus
+        val threatItemState = createDummyThreatItemState(threatModel)
+        whenever(threatItemBuilder.buildThreatItem(threatModel)).thenReturn(threatItemState)
+        whenever(threatDetailsListItemsBuilder.buildFixableThreatDescription(any())).thenReturn(mock())
+        whenever(scanStore.getThreatModelByThreatId(any())).thenReturn(threatModel)
+
+        val scanStateItems = buildScanStateItems(
+                model = scanStateModelWithThreats,
+                fixingThreatIds = listOf(threat.baseThreatModel.id)
+        )
+
+        assertThat(scanStateItems.filterIsInstance(ThreatItemState::class.java)).isNotEmpty
+    }
+
+    @Test
+    fun `given fixing threats state, when items are built, then threats with fixable description subheader exist`() =
+            test {
+                val threatModel = ThreatTestData.fixableThreatInCurrentStatus
+                val threatItemState = createDummyThreatItemState(threatModel)
+                val subHeader = DescriptionState(UiStringText("sub header"))
+                whenever(threatItemBuilder.buildThreatItem(threatModel)).thenReturn(threatItemState)
+                whenever(threatDetailsListItemsBuilder.buildFixableThreatDescription(any())).thenReturn(subHeader)
+                whenever(scanStore.getThreatModelByThreatId(any())).thenReturn(threatModel)
+
+                val scanStateItems = buildScanStateItems(
+                        model = scanStateModelWithThreats,
+                        fixingThreatIds = listOf(threatModel.baseThreatModel.id)
+                )
+
+                assertThat(scanStateItems.filterIsInstance(ThreatItemState::class.java).first().subHeader)
+                        .isEqualTo(subHeader.text)
+            }
+
+    @Test
+    fun `given fixing state fixable threats without server creds, when items are built, then creds msg not exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(
+                        model = scanStateModelWithThreats,
+                        fixingThreatIds = listOf(threat.baseThreatModel.id),
+                        fixableThreatsPresent = true,
+                        serverCredsPresent = false
+                )
+
+                assertThat(
+                        scanStateItems.filterIsInstance(DescriptionState::class.java)
+                                .firstOrNull {
+                                    it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular)
+                                }
+                ).isNull()
+            }
+
+    /* IDLE - THREATS FOUND STATE */
+
+    @Test
+    fun `given idle state with threats, when items are built, then shield warning icon with error color exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(scanStateModelWithThreats)
+
+                assertThat(scanStateItems.filterIsInstance(IconState::class.java).first()).isEqualTo(
+                        IconState(
+                                icon = R.drawable.ic_shield_warning_white,
+                                colorResId = R.color.error,
+                                sizeResId = R.dimen.scan_icon_size,
+                                marginResId = R.dimen.scan_icon_margin,
+                                contentDescription = UiStringRes(R.string.scan_state_icon)
+                        )
+                )
+            }
+
+    @Test
+    fun `given idle state with threats, when items are built, then header for threats found exists`() = test {
+        val scanStateItems = buildScanStateItems(model = scanStateModelWithThreats)
+
+        assertThat(scanStateItems.filterIsInstance(HeaderState::class.java).first()).isEqualTo(
+                HeaderState(UiStringRes(R.string.scan_idle_threats_found_title))
+        )
+    }
+
+    @Test
+    fun `given idle state with threats, when items are built, then threats found description exists`() = test {
+        buildScanStateItems(scanStateModelWithThreats)
+
+        verify(htmlMessageUtils).getHtmlMessageFromStringFormatResId(
+                R.string.scan_idle_threats_description_singular,
+                "<b>${site.name ?: resourceProvider.getString(R.string.scan_this_site)}</b>",
+                resourceProvider.getString(R.string.scan_here_to_help)
+        )
+    }
+
+    @Test
+    fun `given idle state with threats, when items are built, then scan again button exists`() = test {
+        val scanStateItems = buildScanStateItems(scanStateModelWithThreats)
+
+        assertThat(scanStateItems.filterIsInstance(ActionButtonState::class.java).map { it.text }).contains(
+                UiStringRes(R.string.scan_again)
+        )
+    }
+
+    @Test
+    fun `given idle state with fixable threats, when items are built, then fix all threats button exists`() = test {
+        val threats = listOf(threat.copy(baseThreatModel = baseThreatModel.copy(fixable = mock())))
+        val scanStateModelWithFixableThreats = scanStateModelWithThreats.copy(threats = threats)
+
+        val scanStateItems = buildScanStateItems(scanStateModelWithFixableThreats)
+
+        assertThat(scanStateItems.filterIsInstance(ActionButtonState::class.java).map { it.text }).contains(
+                UiStringRes(R.string.threats_fix_all)
+        )
+    }
+
+    @Test
+    fun `given idle state with no fixable threats, when items are built, then fix all threats btn does not exists`() =
+            test {
+                val threats = listOf(threat.copy(baseThreatModel = baseThreatModel.copy(fixable = null)))
+                val scanStateModelWithNoFixableThreats = scanStateModelWithThreats.copy(threats = threats)
+
+                val scanStateItems = buildScanStateItems(scanStateModelWithNoFixableThreats)
+
+                assertThat(scanStateItems.filterIsInstance(ActionButtonState::class.java).map { it.text })
+                        .doesNotContain(UiStringRes(R.string.threats_fix_all))
+            }
+
+    @Test
+    fun `given idle state fixable threats without server creds, when items are built, then fix all btn is disabled`() =
+            test {
+                val scanStateItems = buildScanStateItems(fixableThreatsPresent = true, serverCredsPresent = false)
+
+                val fixAllButton = scanStateItems.filterIsInstance(ActionButtonState::class.java)
+                        .firstOrNull { it.text == UiStringRes(R.string.threats_fix_all) }
+                assertThat(fixAllButton?.isEnabled).isFalse
+            }
+
+    @Test
+    fun `given idle state fixable threats with server creds, when items are built, then fix all btn is enabled`() =
+            test {
+                val scanStateItems = buildScanStateItems(fixableThreatsPresent = true, serverCredsPresent = true)
+
+                val fixAllButton = scanStateItems.filterIsInstance(ActionButtonState::class.java)
+                        .firstOrNull { it.text == UiStringRes(R.string.threats_fix_all) }
+                assertThat(fixAllButton?.isEnabled).isTrue
+            }
+
+    @Test
+    fun `given idle state fixable threats without server creds, when items are built, then server creds msg exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(fixableThreatsPresent = true, serverCredsPresent = false)
+
+                val messageResourceId = R.string.threat_fix_enter_server_creds_message_singular
+                assertThat(
+                        scanStateItems.contains(
+                                DescriptionState(
+                                        text = UiStringRes(messageResourceId),
+                                        clickableTextsInfo = listOf(
+                                                ClickableTextInfo(
+                                                        startIndex = 0,
+                                                        endIndex = resourceProvider.getString(messageResourceId).length,
+                                                        onClick = onEnterServerCredsMessageClicked
+                                                )
+                                        )
+                                )
+                        )
+                ).isNotNull
+            }
+
+    @Test
+    fun `given idle state fixable threats with server creds, when items are built, then server creds msg not exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(fixableThreatsPresent = true, serverCredsPresent = true)
+
+                assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java)
+                        .firstOrNull {
+                            it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular)
+                        })
+                        .isNull()
+            }
+
+    @Test
+    fun `given idle state with no fixable threats, when items are built, then server creds msg does not exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(fixableThreatsPresent = false)
+
+                assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java)
+                        .firstOrNull {
+                            it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular)
+                        })
+                        .isNull()
+            }
+
+    @Test
+    fun `given idle state with threats, when items are built, then description with clickable help info exists`() =
+            test {
+                val clickableText = "clickable help text"
+                val descriptionWithClickableText = "description with $clickableText"
+                whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(anyInt(), any()))
+                        .thenReturn(descriptionWithClickableText)
+                whenever(resourceProvider.getString(R.string.scan_here_to_help)).thenReturn(clickableText)
+
+                val scanStateItems = buildScanStateItems(scanStateModelWithThreats)
+
+                val descriptionState = scanStateItems.filterIsInstance(DescriptionState::class.java).first()
+                assertThat(descriptionState.clickableTextsInfo?.first()).isEqualTo(
+                        ClickableTextInfo(
+                                17,
+                                36,
+                                onHelpClickedMock
+                        )
+                )
+            }
+
+    /* IDLE - THREATS NOT FOUND STATE */
+
+    @Test
+    fun `given idle no threats state, when items are built, then shield tick icon with green color exists`() =
+            test {
+                val scanStateItems = buildScanStateItems(scanStateModelWithNoThreats)
+
+                assertThat(scanStateItems.filterIsInstance(IconState::class.java).first()).isEqualTo(
+                        IconState(
+                                icon = R.drawable.ic_shield_tick_white,
+                                colorResId = R.color.jetpack_green_40,
+                                sizeResId = R.dimen.scan_icon_size,
+                                marginResId = R.dimen.scan_icon_margin,
+                                contentDescription = UiStringRes(R.string.scan_state_icon)
+                        )
+                )
+            }
+
+    @Test
+    fun `given idle no threats state, when items are built, then header for no threats found exists`() = test {
+        val scanStateItems = buildScanStateItems(model = scanStateModelWithNoThreats)
+
+        assertThat(scanStateItems.filterIsInstance(HeaderState::class.java).first()).isEqualTo(
+                HeaderState(UiStringRes(R.string.scan_idle_no_threats_found_title))
+        )
+    }
+
+    @Test
+    fun `given idle no threats state, when items are built, then scan now button exists`() = test {
+        val scanStateItems = buildScanStateItems(scanStateModelWithNoThreats)
+
+        assertThat(scanStateItems.filterIsInstance(ActionButtonState::class.java).map { it.text }).contains(
+                UiStringRes(R.string.scan_now)
+        )
+    }
+
+    @Test
+    fun `given idle no threats state with last scan secs ago, when items are built, then few secs exists in desc`() =
+            test {
+                whenever(dateProvider.getCurrentDate()).thenReturn(Date(DUMMY_CURRENT_TIME))
+                val scanStateModelWithMostRecentStartDate = scanStateModelWithNoThreats.copy(
+                        mostRecentStatus = ScanProgressStatus(startDate = Date(DUMMY_CURRENT_TIME - 10))
+                )
+                val scanStateItems = buildScanStateItems(scanStateModelWithMostRecentStartDate)
+
+                assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).map { it.text }).contains(
+                        UiStringResWithParams(
+                                R.string.scan_idle_last_scan_description,
+                                listOf(
+                                        UiStringRes(R.string.scan_in_few_seconds),
+                                        UiStringRes(R.string.scan_idle_manual_scan_description)
+                                )
+                        )
+                )
+            }
+
+    @Test
+    fun `given idle no threats state with last scan hrs ago, when items are built, then hrs ago exists in descr`() =
+            test {
+                val scanStateModelWithMostRecentStartDate = scanStateModelWithNoThreats.copy(
+                        mostRecentStatus = ScanProgressStatus(startDate = Date(DUMMY_CURRENT_TIME - ONE_HOUR))
+                )
+
+                val scanStateItems = buildScanStateItems(scanStateModelWithMostRecentStartDate)
+
+                assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).map { it.text }).contains(
+                        UiStringResWithParams(
+                                R.string.scan_idle_last_scan_description,
+                                listOf(
+                                        UiStringResWithParams(R.string.scan_in_hours_ago, listOf(UiStringText("1"))),
+                                        UiStringRes(R.string.scan_idle_manual_scan_description)
+                                )
+                        )
+                )
+            }
+
+    @Test
+    fun `given idle no threats state with last scan mins ago, when items are built, then mins ago exists in descr`() =
+            test {
+                val scanStateModelWithMostRecentStartDate = scanStateModelWithNoThreats.copy(
+                        mostRecentStatus = ScanProgressStatus(startDate = Date(DUMMY_CURRENT_TIME - ONE_MINUTE))
+                )
+
+                val scanStateItems = buildScanStateItems(scanStateModelWithMostRecentStartDate)
+
+                assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).map { it.text }).contains(
+                        UiStringResWithParams(
+                                R.string.scan_idle_last_scan_description,
+                                listOf(
+                                        UiStringResWithParams(
+                                                R.string.scan_in_minutes_ago,
+                                                listOf(UiStringText("1"))
+                                        ),
+                                        UiStringRes(R.string.scan_idle_manual_scan_description)
+                                )
+                        )
+                )
+            }
+
+    /* SCANNING STATE */
+
+    @Test
+    fun `given scanning state, when items are built, then shield icon with light green color exists`() =
+            test {
+                val scanStateModelInScanningState = scanStateModelWithNoThreats.copy(state = State.SCANNING)
+
+                val scanStateItems = buildScanStateItems(scanStateModelInScanningState)
+
+                assertThat(scanStateItems.filterIsInstance(IconState::class.java).first()).isEqualTo(
+                        IconState(
+                                icon = R.drawable.ic_shield_white,
+                                colorResId = R.color.jetpack_green_5,
+                                sizeResId = R.dimen.scan_icon_size,
+                                marginResId = R.dimen.scan_icon_margin,
+                                contentDescription = UiStringRes(R.string.scan_state_icon)
+                        )
+                )
+            }
+
+    @Test
+    fun `given scanning state with zero progress, when items are built, then preparing for scan header exists`() =
+            test {
+                val scanStateModelInScanningState = scanStateModelWithNoThreats.copy(
+                        state = State.SCANNING,
+                        currentStatus = ScanProgressStatus(progress = 0, startDate = Date(0))
+                )
+
+                val scanStateItems = buildScanStateItems(scanStateModelInScanningState)
+
+                assertThat(scanStateItems.filterIsInstance(HeaderState::class.java).first()).isEqualTo(
+                        HeaderState(UiStringRes(R.string.scan_preparing_to_scan_title))
+                )
+            }
+
+    @Test
+    fun `given scanning state with non zero progress, when items are built, then scanning files header exists`() =
+            test {
+                val scanStateModelInScanningState = scanStateModelWithNoThreats.copy(
+                        state = State.SCANNING,
+                        currentStatus = ScanProgressStatus(progress = 10, startDate = Date(0))
+                )
+
+                val scanStateItems = buildScanStateItems(scanStateModelInScanningState)
+
+                assertThat(scanStateItems.filterIsInstance(HeaderState::class.java).first()).isEqualTo(
+                        HeaderState(UiStringRes(R.string.scan_scanning_title))
+                )
+            }
+
+    @Test
+    fun `given initial scanning state, when items are built, then initial scanning description exists`() =
+            test {
+                val scanStateModelInScanningInitialState = scanStateModelWithNoThreats.copy(
+                        state = State.SCANNING,
+                        mostRecentStatus = ScanProgressStatus(isInitial = true, startDate = Date(0))
+                )
+
+                val scanStateItems = buildScanStateItems(scanStateModelInScanningInitialState)
+
+                assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).first()).isEqualTo(
+                        DescriptionState(UiStringRes(R.string.scan_scanning_is_initial_description))
+                )
+            }
+
+    @Test
+    fun `given non initial scanning state, when items are built, then scanning description exists`() = test {
+        val scanStateModelInScanningNonInitialState = scanStateModelWithNoThreats.copy(
+                state = State.SCANNING,
+                mostRecentStatus = ScanProgressStatus(isInitial = false, startDate = Date(0))
+        )
+
+        val scanStateItems = buildScanStateItems(scanStateModelInScanningNonInitialState)
+
+        assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).first()).isEqualTo(
+                DescriptionState(UiStringRes(R.string.scan_scanning_description))
+        )
+    }
+
+    @Test
+    fun `given scanning state, when items are built, then progress bar with progress values exists`() = test {
+        val progress = 10
+        val scanStateModelInScanningState = scanStateModelWithNoThreats.copy(
+                state = State.SCANNING,
+                currentStatus = ScanProgressStatus(progress = progress, startDate = Date(0))
+        )
+
+        val scanStateItems = buildScanStateItems(scanStateModelInScanningState)
+
+        assertThat(scanStateItems.filterIsInstance(ProgressState::class.java).first()).isEqualTo(
+                ProgressState(
+                        progress = progress,
+                        progressLabel = UiStringResWithParams(
+                                R.string.scan_progress_label,
+                                listOf(UiStringText(progress.toString()))
+                        )
+                )
+        )
+    }
+
+    /* PROVISIONING STATE */
+
+    @Test
+    fun `given provisioning state, when items are built, then shield icon with light green color exists`() = test {
+        val scanStateModelInProvisioningState = scanStateModelWithNoThreats.copy(state = State.PROVISIONING)
+
+        val scanStateItems = buildScanStateItems(scanStateModelInProvisioningState)
+
+        assertThat(scanStateItems.filterIsInstance(IconState::class.java).first()).isEqualTo(
+                IconState(
+                        icon = R.drawable.ic_shield_white,
+                        colorResId = R.color.jetpack_green_5,
+                        sizeResId = R.dimen.scan_icon_size,
+                        marginResId = R.dimen.scan_icon_margin,
+                        contentDescription = UiStringRes(R.string.scan_state_icon)
+                )
+        )
+    }
+
+    @Test
+    fun `given provisioning state, when items are built, then preparing to scan header exists`() = test {
+        val scanStateModelInProvisioningState = scanStateModelWithNoThreats.copy(state = State.PROVISIONING)
+
+        val scanStateItems = buildScanStateItems(scanStateModelInProvisioningState)
+
+        assertThat(scanStateItems.filterIsInstance(HeaderState::class.java).first()).isEqualTo(
+                HeaderState(UiStringRes(R.string.scan_preparing_to_scan_title))
+        )
+    }
+
+    @Test
+    fun `given provisioning state, when items are built, then provisioning description exists`() = test {
+        val scanStateModelInProvisioningState = scanStateModelWithNoThreats.copy(state = State.PROVISIONING)
+
+        val scanStateItems = buildScanStateItems(scanStateModelInProvisioningState)
+
+        assertThat(scanStateItems.filterIsInstance(DescriptionState::class.java).first()).isEqualTo(
+                DescriptionState(UiStringRes(R.string.scan_provisioning_description))
+        )
+    }
+
+    /* INVALID STATES */
+
+    @Test
+    fun `given unknown state, when items are built, then items list is empty`() = test {
+        val scanStateModelInUnknownState = scanStateModelWithNoThreats.copy(state = State.UNKNOWN)
+
+        val scanStateItems = buildScanStateItems(scanStateModelInUnknownState)
+
+        assertThat(scanStateItems).isEmpty()
+    }
+
+    @Test
+    fun `given unavailable state, when items are built, then items list is empty`() = test {
+        val scanStateModelInUnAvailableState = scanStateModelWithNoThreats.copy(state = State.UNAVAILABLE)
+
+        val scanStateItems = buildScanStateItems(scanStateModelInUnAvailableState)
+
+        assertThat(scanStateItems).isEmpty()
+    }
+
+    private suspend fun buildScanStateItems(
+        model: ScanStateModel? = null,
+        fixingThreatIds: List<Long> = emptyList(),
+        fixableThreatsPresent: Boolean = false,
+        serverCredsPresent: Boolean = false
+    ): List<JetpackListItemState> {
+        var scanStateModel = model ?: scanStateModelWithThreats
+
+        if (fixableThreatsPresent) {
+            val threats = listOf(threat.copy(baseThreatModel = baseThreatModel.copy(fixable = mock())))
+            scanStateModel = scanStateModel.copy(threats = threats)
+        }
+
+        if (serverCredsPresent) {
+            scanStateModel = scanStateModel.copy(hasValidCredentials = serverCredsPresent)
+        }
+
+        return builder.buildScanStateListItems(
+                model = scanStateModel,
+                site = site,
+                fixingThreatIds = fixingThreatIds,
+                onScanButtonClicked = mock(),
+                onFixAllButtonClicked = mock(),
+                onThreatItemClicked = mock(),
+                onHelpClicked = onHelpClickedMock,
+                onEnterServerCredsMessageClicked = onEnterServerCredsMessageClicked
+        )
+    }
+
+    private fun createDummyThreatItemState(threatModel: ThreatModel) = ThreatItemState(
+            threatId = threatModel.baseThreatModel.id,
+            header = UiStringText(""),
+            firstDetectedDate = UiStringText(""),
+            subHeader = UiStringText(""),
+            subHeaderColor = 0,
+            icon = 0,
+            iconBackground = 0,
+            onClick = {}
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ThreatItemBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ThreatItemBuilderTest.kt
new file mode 100644
index 000000000000..acbc6166dd12
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/builders/ThreatItemBuilderTest.kt
@@ -0,0 +1,294 @@
+package org.wordpress.android.ui.jetpack.scan.builders
+
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.CURRENT
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.FIXED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.IGNORED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.VulnerableExtensionThreatModel.Extension.ExtensionType
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.TEST_FILE_NAME
+import org.wordpress.android.ui.jetpack.scan.TEST_SIGNATURE
+import org.wordpress.android.ui.jetpack.scan.TEST_VULNERABLE_THREAT_SLUG
+import org.wordpress.android.ui.jetpack.scan.TEST_VULNERABLE_THREAT_VERSION
+import org.wordpress.android.ui.jetpack.scan.ThreatTestData
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DateFormatWrapper
+import java.text.DateFormat
+
+private const val TEST_FIXED_ON_DATE = "2 January, 2020"
+
+@InternalCoroutinesApi
+class ThreatItemBuilderTest : BaseUnitTest() {
+    private lateinit var builder: ThreatItemBuilder
+
+    @Mock private lateinit var dateFormatWrapper: DateFormatWrapper
+    @Mock private lateinit var dateFormat: DateFormat
+
+    @Before
+    fun setUp() {
+        builder = ThreatItemBuilder(dateFormatWrapper)
+        whenever(dateFormatWrapper.getLongDateFormat()).thenReturn(dateFormat)
+        whenever(dateFormat.format(anyOrNull()))
+                .thenReturn(TEST_FIXED_ON_DATE)
+    }
+
+    @Test
+    fun `builds threat sub header correctly for fixed threat`() {
+        val threatModel = GenericThreatModel(ThreatTestData.baseThreatModel.copy(status = FIXED))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.subHeader).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_sub_header_status_fixed_on,
+                        listOf(UiStringText(TEST_FIXED_ON_DATE))
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat sub header correctly for ignored threat`() {
+        val threatModel = GenericThreatModel(ThreatTestData.baseThreatModel.copy(status = IGNORED))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.subHeader).isEqualTo(UiStringRes(R.string.threat_item_sub_header_status_ignored))
+    }
+
+    @Test
+    fun `builds threat header correctly for CoreFileModificationThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItem.header).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_header_infected_core_file,
+                        listOf(UiStringText(TEST_FILE_NAME))
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat sub header correctly for CoreFileModificationThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItem.subHeader).isEqualTo(UiStringRes(R.string.threat_item_sub_header_core_file))
+    }
+
+    @Test
+    fun `builds threat header correctly for DatabaseThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.databaseThreatModel)
+
+        assertThat(threatItem.header).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_header_database_threat,
+                        listOf(UiStringText("${ThreatTestData.rows.size}"))
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat sub header correctly for DatabaseThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.databaseThreatModel)
+
+        assertThat(threatItem.subHeader).isNull()
+    }
+
+    @Test
+    fun `builds threat header correctly for FileThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.fileThreatModel)
+
+        assertThat(threatItem.header).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_header_file_malicious_code_pattern,
+                        listOf(UiStringText(TEST_FILE_NAME))
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat sub header correctly for FileThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.fileThreatModel)
+
+        assertThat(threatItem.subHeader).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_sub_header_file_signature,
+                        listOf(UiStringText(TEST_SIGNATURE))
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat header correctly for VulnerableExtensionThreatModel of Plugin type`() {
+        val threatItem = buildThreatItem(ThreatTestData.vulnerableExtensionThreatModel)
+
+        assertThat(threatItem.header).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_header_vulnerable_plugin,
+                        listOf(
+                                UiStringText(TEST_VULNERABLE_THREAT_SLUG),
+                                UiStringText(
+                                        TEST_VULNERABLE_THREAT_VERSION
+                                )
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat sub header correctly for VulnerableExtensionThreatModel of Plugin type`() {
+        val threatItem = buildThreatItem(ThreatTestData.vulnerableExtensionThreatModel)
+
+        assertThat(threatItem.subHeader).isEqualTo(UiStringRes(R.string.threat_item_sub_header_vulnerable_plugin))
+    }
+
+    @Test
+    fun `builds threat header correctly for VulnerableExtensionThreatModel of Theme type`() {
+        val threatItem = buildThreatItem(
+                ThreatTestData.vulnerableExtensionThreatModel.copy(
+                        extension = ThreatTestData.extension.copy(type = ExtensionType.THEME)
+                )
+        )
+
+        assertThat(threatItem.header).isEqualTo(
+                UiStringResWithParams(
+                        R.string.threat_item_header_vulnerable_theme,
+                        listOf(
+                                UiStringText(TEST_VULNERABLE_THREAT_SLUG),
+                                UiStringText(
+                                        TEST_VULNERABLE_THREAT_VERSION
+                                )
+                        )
+                )
+        )
+    }
+
+    @Test
+    fun `builds threat sub header correctly for VulnerableExtensionThreatModel of Theme type`() {
+        val threatItem = buildThreatItem(
+                ThreatTestData.vulnerableExtensionThreatModel.copy(
+                        extension = ThreatTestData.extension.copy(type = ExtensionType.THEME)
+                )
+        )
+
+        assertThat(threatItem.subHeader).isEqualTo(UiStringRes(R.string.threat_item_sub_header_vulnerable_theme))
+    }
+
+    @Test
+    fun `builds threat header correctly for GenericThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItem.header).isEqualTo(UiStringRes(R.string.threat_item_header_threat_found))
+    }
+
+    @Test
+    fun `builds threat sub header correctly for GenericThreatModel`() {
+        val threatItem = buildThreatItem(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItem.subHeader).isEqualTo(UiStringRes(R.string.threat_item_sub_header_misc_vulnerability))
+    }
+
+    @Test
+    fun `displays loading for threat in fixing state`() {
+        val threatItem = buildThreatItem(threatModel = ThreatTestData.genericThreatModel, isFixing = true)
+
+        assertThat(threatItem.isLoadingVisible).isTrue
+    }
+
+    @Test
+    fun `displays icon for threat not in fixing state`() {
+        val threatItem = buildThreatItem(threatModel = ThreatTestData.genericThreatModel, isFixing = false)
+
+        assertThat(threatItem.isIconVisible).isTrue
+    }
+
+    @Test
+    fun `onThreatItemClicked listener is correctly assigned to ThreatItem's onClick`() = test {
+        val onThreatItemClicked: (Long) -> Unit = mock()
+        val threatItem = buildThreatItem(ThreatTestData.genericThreatModel, onThreatItemClicked)
+
+        threatItem.onClick.invoke()
+
+        verify(onThreatItemClicked).invoke(ThreatTestData.genericThreatModel.baseThreatModel.id)
+    }
+
+    @Test
+    fun `Shield icon and green background is used for fixed threat`() {
+        val threatModel = GenericThreatModel(ThreatTestData.genericThreatModel.baseThreatModel.copy(status = FIXED))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.icon).isEqualTo(R.drawable.ic_shield_tick_white)
+        assertThat(threatItem.iconBackground).isEqualTo(R.drawable.bg_oval_success_50)
+    }
+
+    @Test
+    fun `Notice icon and grey background is used for ignored threat`() {
+        val threatModel = GenericThreatModel(ThreatTestData.genericThreatModel.baseThreatModel.copy(status = IGNORED))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.icon).isEqualTo(R.drawable.ic_notice_outline_white_24dp)
+        assertThat(threatItem.iconBackground).isEqualTo(R.drawable.bg_oval_neutral_30)
+    }
+
+    @Test
+    fun `Notice icon and red background is used for current threat`() {
+        val threatModel = GenericThreatModel(ThreatTestData.genericThreatModel.baseThreatModel.copy(status = CURRENT))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.icon).isEqualTo(R.drawable.ic_notice_outline_white_24dp)
+        assertThat(threatItem.iconBackground).isEqualTo(R.drawable.bg_oval_error_50)
+    }
+
+    @Test
+    fun `Subheader for fixed threat has success color`() {
+        val threatModel = GenericThreatModel(ThreatTestData.baseThreatModel.copy(status = FIXED))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.subHeaderColor).isEqualTo(R.attr.wpColorSuccess)
+    }
+
+    @Test
+    fun `sub header for current threat has onSurface color`() {
+        val threatModel = GenericThreatModel(ThreatTestData.baseThreatModel.copy(status = CURRENT))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.subHeaderColor).isEqualTo(R.attr.colorOnSurface)
+    }
+
+    @Test
+    fun `sub header for ignored threat has onSurface color`() {
+        val threatModel = GenericThreatModel(ThreatTestData.baseThreatModel.copy(status = IGNORED))
+
+        val threatItem = buildThreatItem(threatModel)
+
+        assertThat(threatItem.subHeaderColor).isEqualTo(R.attr.colorOnSurface)
+    }
+
+    private fun buildThreatItem(
+        threatModel: ThreatModel,
+        onThreatItemClicked: ((Long) -> Unit) = mock(),
+        isFixing: Boolean = false
+    ) = builder.buildThreatItem(
+            threatModel = threatModel,
+            isFixing = isFixing,
+            onThreatItemClicked = onThreatItemClicked
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemsBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemsBuilderTest.kt
new file mode 100644
index 000000000000..039983b9c7c0
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsListItemsBuilderTest.kt
@@ -0,0 +1,623 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import android.text.SpannedString
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.Fixable
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.FIXED
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus.IGNORED
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.HeaderState
+import org.wordpress.android.ui.jetpack.scan.TEST_FILE_PATH
+import org.wordpress.android.ui.jetpack.scan.ThreatTestData
+import org.wordpress.android.ui.jetpack.scan.builders.ThreatItemBuilder
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatContextLinesItemState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatDetailHeaderState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsListItemState.ThreatFileNameState
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DateFormatWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
+import java.text.DateFormat
+
+private const val TEST_THREAT_ITEM_HEADER = "Threat found"
+private const val TEST_THREAT_ITEM_SUB_HEADER = "Miscellaneous vulnerability"
+private const val TEST_FOUND_ON_DATE = "1 January, 2020"
+private const val TEST_FIXED_ON_DATE = "2 January, 2020"
+private const val TEST_TEXT = "Test text"
+
+@InternalCoroutinesApi
+class ThreatDetailsListItemsBuilderTest : BaseUnitTest() {
+    @Mock
+    private lateinit var htmlMessageUtils: HtmlMessageUtils
+
+    @Mock
+    private lateinit var threatItemBuilder: ThreatItemBuilder
+
+    @Mock
+    private lateinit var dateFormatWrapper: DateFormatWrapper
+
+    @Mock
+    private lateinit var dateFormat: DateFormat
+
+    @Mock
+    private lateinit var resourceProvider: ResourceProvider
+    private lateinit var builder: ThreatDetailsListItemsBuilder
+
+    private val technicalDetailsHeaderItem = HeaderState(UiStringRes(R.string.threat_technical_details_header))
+    private val fileNameDescriptionItem = DescriptionState(UiStringRes(R.string.threat_file_description))
+
+    private val onFixThreatButtonClicked: () -> Unit = mock()
+    private val onGetFreeEstimateButtonClicked: () -> Unit = mock()
+    private val onIgnoreThreatButtonClicked: () -> Unit = mock()
+
+    private val fixThreatButtonItem = ActionButtonState(
+            text = UiStringRes(R.string.threat_fix),
+            onClick = onFixThreatButtonClicked,
+            contentDescription = UiStringRes(R.string.threat_fix)
+    )
+    private val getFreeEstimateButtonItem = ActionButtonState(
+            text = UiStringRes(R.string.threat_get_free_estimate),
+            onClick = onGetFreeEstimateButtonClicked,
+            contentDescription = UiStringRes(R.string.threat_get_free_estimate)
+    )
+    private val ignoreThreatButtonItem = ActionButtonState(
+            text = UiStringRes(R.string.threat_ignore),
+            onClick = onIgnoreThreatButtonClicked,
+            contentDescription = UiStringRes(R.string.threat_ignore),
+            isSecondary = true
+    )
+
+    @Before
+    fun setUp() {
+        builder = ThreatDetailsListItemsBuilder(
+                htmlMessageUtils,
+                threatItemBuilder,
+                dateFormatWrapper,
+                resourceProvider
+        )
+
+        whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(any())).thenReturn(
+                SpannedString("")
+        )
+        with(threatItemBuilder) {
+            whenever(buildThreatItemHeader(any())).thenReturn(UiStringText(TEST_THREAT_ITEM_HEADER))
+            whenever(buildThreatItemDescription(any())).thenReturn(UiStringText(TEST_THREAT_ITEM_SUB_HEADER))
+        }
+        whenever(dateFormatWrapper.getLongDateFormat()).thenReturn(dateFormat)
+        whenever(dateFormat.format(ThreatTestData.genericThreatModel.baseThreatModel.firstDetected))
+                .thenReturn(TEST_FOUND_ON_DATE)
+        whenever(dateFormat.format(ThreatTestData.genericThreatModel.baseThreatModel.fixedOn))
+                .thenReturn(TEST_FIXED_ON_DATE)
+        whenever(resourceProvider.getString(anyInt())).thenReturn(TEST_TEXT)
+    }
+
+    /* BASIC DETAILS */
+
+    @Test
+    fun `given any threat model, when items are built, then icon is added from threat item builder`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].icon).isEqualTo(
+                threatItemBuilder.buildThreatItemIcon(ThreatTestData.genericThreatModel)
+        )
+    }
+
+    @Test
+    fun `given any threat model, when items are built, then icon background is added from threat item builder`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].iconBackground).isEqualTo(
+                threatItemBuilder.buildThreatItemIconBackground(ThreatTestData.genericThreatModel)
+        )
+    }
+
+    @Test
+    fun `given any threat model, when items are built, then threat item header is added from threat item builder`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItems.filterIsInstance<HeaderState>()).contains(
+                HeaderState(threatItemBuilder.buildThreatItemHeader(ThreatTestData.genericThreatModel))
+        )
+    }
+
+    @Test
+    fun `given any threat model, when items are built, then threat item description added from threat item builder`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItems.filterIsInstance<DescriptionState>()).contains(
+                DescriptionState(threatItemBuilder.buildThreatItemDescription(ThreatTestData.genericThreatModel))
+        )
+    }
+
+    @Test
+    fun `given any threat model, when items are built, then problem details are added`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.genericThreatModel)
+
+        assertThat(threatItems.filterIsInstance<HeaderState>()).contains(
+                HeaderState(UiStringRes(R.string.threat_problem_header))
+        )
+        assertThat(threatItems.filterIsInstance<DescriptionState>()).contains(
+                DescriptionState(UiStringText(ThreatTestData.genericThreatModel.baseThreatModel.description))
+        )
+    }
+
+    /* TECHNICAL DETAILS - FILE THREAT */
+
+    @Test
+    fun `given file threat with file name, when items are built, then technical details exist in correct sequence`() {
+        val fileThreatModelWithFileName = ThreatTestData.fileThreatModel
+
+        val threatItems = buildThreatDetailsListItems(fileThreatModelWithFileName)
+
+        assertThat(threatItems.map { it::class.java }).containsSequence(
+                HeaderState::class.java,
+                DescriptionState::class.java,
+                ThreatFileNameState::class.java,
+                ThreatContextLinesItemState::class.java
+        )
+    }
+
+    @Test
+    fun `given file threat, when items are built, then technical details header exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.fileThreatModel)
+
+        assertThat(threatItems).contains(technicalDetailsHeaderItem)
+    }
+
+    @Test
+    fun `given file threat with file name, when items are built, then file name description exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.fileThreatModel)
+
+        assertThat(threatItems).contains(fileNameDescriptionItem)
+    }
+
+    @Test
+    fun `given file threat without file name, when items are built, then file name description does not exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.fileThreatModel.copy(fileName = null))
+
+        assertThat(threatItems).doesNotContain(fileNameDescriptionItem)
+    }
+
+    @Test
+    fun `given file threat without file nam, when items are built, then file name does not exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.fileThreatModel.copy(fileName = null))
+
+        assertThat(threatItems).doesNotContain(ThreatFileNameState(UiStringText(TEST_FILE_PATH)))
+    }
+
+    @Test
+    fun `given file threat, when items are built, then context lines exist`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.fileThreatModel)
+
+        assertThat(threatItems).contains(
+                ThreatContextLinesItemState(
+                        listOf(
+                                ThreatContextLinesItemState.ThreatContextLineItemState(
+                                        line = ThreatTestData.contextLine,
+                                        lineNumberBackgroundColorRes = R.color.context_line_highlighted_row_background,
+                                        contentBackgroundColorRes = R.color.context_line_highlighted_row_background,
+                                        highlightedBackgroundColorRes = R.color.red_60,
+                                        highlightedTextColorRes = R.color.white
+                                )
+                        )
+                )
+        )
+    }
+
+    /* TECHNICAL DETAILS - CORE FILE MODIFICATION THREAT */
+
+    @Test
+    fun `given core file modif threat, when items are built, then technical details exist in correct sequence`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItems.map { it::class.java }).containsSequence(
+                HeaderState::class.java,
+                DescriptionState::class.java,
+                ThreatFileNameState::class.java,
+                DescriptionState::class.java
+        )
+    }
+
+    @Test
+    fun `given core file modif threat, when items are built, then technical details header exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItems).contains(technicalDetailsHeaderItem)
+    }
+
+    @Test
+    fun `given core file modif threat with file name, when items are built, then file name description exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItems).contains(fileNameDescriptionItem)
+    }
+
+    @Test
+    fun `given core file modif threat with file name, when items are built, then file name exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItems).contains(fileNameDescriptionItem)
+    }
+
+    @Test
+    fun `given core file modif threat, when items are built, then diff item exists`() {
+        val threatItems = buildThreatDetailsListItems(ThreatTestData.coreFileModificationThreatModel)
+
+        assertThat(threatItems).contains(
+                DescriptionState(UiStringText(ThreatTestData.coreFileModificationThreatModel.diff))
+        )
+    }
+
+    /* FIXABLE THREAT */
+
+    @Test
+    fun `given fixable threat not in fixed status, when items are built, then fix header exists`() {
+        val fixableThreat = GenericThreatModel(
+                ThreatTestData.baseThreatModel.copy(
+                        fixable = Fixable(file = null, fixer = Fixable.FixType.EDIT, target = null)
+                )
+        )
+
+        val threatItems = buildThreatDetailsListItems(fixableThreat)
+
+        assertThat(threatItems).contains(HeaderState(UiStringRes(R.string.threat_fix_current_fixable_header)))
+    }
+
+    @Test
+    fun `given current fixable threat with server creds, when items are built, then fix threat btn is enabled`() {
+        val items = buildThreatDetailsListItems(ThreatTestData.fixableThreatInCurrentStatus)
+
+        assertThat(
+                items.filterIsInstance(ActionButtonState::class.java)
+                        .firstOrNull { it.text == UiStringRes(R.string.threat_fix) }?.isEnabled
+        ).isTrue
+    }
+
+    @Test
+    fun `given current fixable threat without server creds, when items are built, then fix threat btn is disabled`() {
+        val items = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus,
+                scanStateHasValidCredentials = false
+        )
+
+        assertThat(
+                items.filterIsInstance(ActionButtonState::class.java)
+                        .firstOrNull { it.text == UiStringRes(R.string.threat_fix) }?.isEnabled
+        ).isFalse
+    }
+
+    @Test
+    fun `given current fixable threat with server creds, when items are built, then server creds msg doesn't exist`() {
+        val items = buildThreatDetailsListItems(ThreatTestData.fixableThreatInCurrentStatus)
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNull()
+    }
+
+    @Test
+    fun `given current fixable threat without server creds, when items are built, then server creds msg exists`() {
+        val items = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus,
+                scanStateHasValidCredentials = false
+        )
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNotNull
+    }
+
+    @Test
+    fun `given ignored fixable threat with server creds, when items are built, then server creds msg doesn't exist`() {
+        val items = buildThreatDetailsListItems(ThreatTestData.fixableThreatInIgnoredStatus)
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNull()
+    }
+
+    @Test
+    fun `given ignored fixable threat without server creds, when items are built, then server creds msg exists`() {
+        val items = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInIgnoredStatus,
+                scanStateHasValidCredentials = false
+        )
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNotNull
+    }
+
+    @Test
+    fun `given fixed threat with server creds, when items are built, then server creds msg doesn't exist`() {
+        val items = buildThreatDetailsListItems(ThreatTestData.fixableThreatInFixedStatus)
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNull()
+    }
+
+    @Test
+    fun `given fixed threat without server creds, when items are built, then server creds msg doesn't exist`() {
+        val items = buildThreatDetailsListItems(ThreatTestData.fixableThreatInFixedStatus)
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNull()
+    }
+
+    @Test
+    fun `given fixable threat in fixed status, when items are built, then fix header does not exists`() {
+        val fixableThreat = GenericThreatModel(
+                ThreatTestData.baseThreatModel.copy(
+                        fixable = Fixable(file = null, fixer = Fixable.FixType.EDIT, target = null),
+                        status = FIXED
+                )
+        )
+
+        val threatItems = buildThreatDetailsListItems(fixableThreat)
+
+        assertThat(threatItems).doesNotContain(HeaderState(UiStringRes(R.string.threat_fix_current_fixable_header)))
+    }
+
+    @Test
+    fun `given fixable threat not in fixed status, when items are built, then fix description exists`() {
+        val fixableThreat = GenericThreatModel(
+                ThreatTestData.baseThreatModel.copy(
+                        fixable = Fixable(file = null, fixer = Fixable.FixType.EDIT, target = null)
+                )
+        )
+
+        val threatItems = buildThreatDetailsListItems(fixableThreat)
+
+        assertThat(threatItems).contains(DescriptionState(UiStringRes(R.string.threat_fix_fixable_edit)))
+    }
+
+    @Test
+    fun `given fixable threat in fixed status, when items are built, then fix description does not exists`() {
+        val fixableThreat = GenericThreatModel(
+                ThreatTestData.baseThreatModel.copy(
+                        fixable = Fixable(file = null, fixer = Fixable.FixType.EDIT, target = null),
+                        status = FIXED
+                )
+        )
+
+        val threatItems = buildThreatDetailsListItems(fixableThreat)
+
+        assertThat(threatItems).doesNotContain(DescriptionState(UiStringRes(R.string.threat_fix_fixable_edit)))
+    }
+
+    @Test
+    fun `given fixable threat in current status, when items are built, then fix threat button exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus,
+                onFixThreatButtonClicked = onFixThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).contains(fixThreatButtonItem)
+    }
+
+    @Test
+    fun `given fixable threat in ignored status, when items are built, then fix threat button exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus.copy(
+                        baseThreatModel = ThreatTestData.fixableThreatInCurrentStatus.baseThreatModel
+                                .copy(status = IGNORED)
+                ),
+                onFixThreatButtonClicked = onFixThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).contains(fixThreatButtonItem)
+    }
+
+    @Test
+    fun `given fixable threat in fixed status, when items are built, then fix threat button does not exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus.copy(
+                        baseThreatModel = ThreatTestData.fixableThreatInCurrentStatus.baseThreatModel
+                                .copy(status = FIXED)
+                ),
+                onFixThreatButtonClicked = onFixThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).doesNotContain(fixThreatButtonItem)
+    }
+
+    @Test
+    fun `given fixable threat in current status, when items are built, then ignore threat button exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus,
+                onIgnoreThreatButtonClicked = onIgnoreThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).contains(ignoreThreatButtonItem)
+    }
+
+    @Test
+    fun `given fixable threat in fixed status, when items are built, then ignore threat button does not exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus.copy(
+                        baseThreatModel = ThreatTestData.fixableThreatInCurrentStatus.baseThreatModel
+                                .copy(status = FIXED)
+                ),
+                onIgnoreThreatButtonClicked = onIgnoreThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).doesNotContain(ignoreThreatButtonItem)
+    }
+
+    @Test
+    fun `given fixable threat in ignored status, when items are built, then ignore threat button does not exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.fixableThreatInCurrentStatus.copy(
+                        baseThreatModel = ThreatTestData.fixableThreatInCurrentStatus.baseThreatModel
+                                .copy(status = IGNORED)
+                ),
+                onIgnoreThreatButtonClicked = onIgnoreThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).doesNotContain(ignoreThreatButtonItem)
+    }
+
+    /* NON FIXABLE THREAT */
+
+    @Test
+    fun `given non fixable threat, when items are built, then not fixable header exists`() {
+        val notFixableThreat = GenericThreatModel(ThreatTestData.baseThreatModel.copy(fixable = null))
+
+        val threatItems = buildThreatDetailsListItems(notFixableThreat)
+
+        assertThat(threatItems).contains(HeaderState(UiStringRes(R.string.threat_fix_current_not_fixable_header)))
+    }
+
+    @Test
+    fun `given non fixable threat, when items are built, then not fixable description exists`() {
+        val notFixableThreat = GenericThreatModel(ThreatTestData.baseThreatModel.copy(fixable = null))
+
+        buildThreatDetailsListItems(notFixableThreat)
+
+        verify(htmlMessageUtils)
+                .getHtmlMessageFromStringFormatResId(R.string.threat_fix_current_not_fixable_description)
+    }
+
+    @Test
+    fun `given non fixable threat in current status, when items are built, then get free estimates button exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.notFixableThreatInCurrentStatus,
+                onGetFreeEstimateButtonClicked = onGetFreeEstimateButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).contains(getFreeEstimateButtonItem)
+    }
+
+    @Test
+    fun `given non fixable threat in current status, when items are built, then ignore threat button exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.notFixableThreatInCurrentStatus,
+                onIgnoreThreatButtonClicked = onIgnoreThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).contains(ignoreThreatButtonItem)
+    }
+
+    @Test
+    fun `given non fixable threat in ignored status, when items are built, then ignore threat btn does not exists`() {
+        val threatItems = buildThreatDetailsListItems(
+                model = ThreatTestData.notFixableThreatInCurrentStatus.copy(
+                        baseThreatModel = ThreatTestData.fixableThreatInCurrentStatus.baseThreatModel
+                                .copy(status = IGNORED)
+                ),
+                onIgnoreThreatButtonClicked = onIgnoreThreatButtonClicked
+        )
+
+        val buttonItems = threatItems.filterIsInstance(ActionButtonState::class.java)
+        assertThat(buttonItems).doesNotContain(ignoreThreatButtonItem)
+    }
+
+    @Test
+    fun `given non fixable threat, when items are built, then server creds msg doesn't exist`() {
+        val items = buildThreatDetailsListItems(ThreatTestData.notFixableThreatInCurrentStatus)
+
+        assertThat(items.filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) })
+                .isNull()
+    }
+
+    /* FIXED THREAT */
+
+    @Test
+    fun `given threat status = fixed, when items are built, then Fixed header is added as main header`() {
+        val threatModel = GenericThreatModel(ThreatTestData.genericThreatModel.baseThreatModel.copy(status = FIXED))
+
+        val threatItems = buildThreatDetailsListItems(threatModel)
+
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>().size).isEqualTo(1)
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].header)
+                .isEqualTo(UiStringRes(R.string.threat_status_fixed))
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].description)
+                .isEqualTo(UiStringText(TEST_FIXED_ON_DATE))
+    }
+
+    @Test
+    fun `given threat status = fixed, when items are built, then Found header is added below main header`() {
+        val threatModel = GenericThreatModel(ThreatTestData.genericThreatModel.baseThreatModel.copy(status = FIXED))
+
+        val threatItems = buildThreatDetailsListItems(threatModel)
+
+        assertThat(threatItems.filterIsInstance<HeaderState>()[0].text)
+                .isEqualTo(UiStringRes(R.string.threat_found_header))
+        assertThat(threatItems.filterIsInstance<DescriptionState>()[0].text)
+                .isEqualTo(UiStringText(TEST_FOUND_ON_DATE))
+    }
+
+    /* IGNORED THREAT */
+
+    @Test
+    fun `given threat status = ignored, when items are built, then Found header is added as main header`() {
+        val threatModel = GenericThreatModel(ThreatTestData.genericThreatModel.baseThreatModel.copy(status = IGNORED))
+
+        val threatItems = buildThreatDetailsListItems(threatModel)
+
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>().size).isEqualTo(1)
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].header)
+                .isEqualTo(UiStringRes(R.string.threat_found_header))
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].description)
+                .isEqualTo(UiStringText(TEST_FOUND_ON_DATE))
+    }
+
+    /* CURRENT THREAT */
+
+    @Test
+    fun `given threat status = current, when items are built, then Found header is added as main header`() {
+        val threatModel = GenericThreatModel(
+                ThreatTestData.genericThreatModel.baseThreatModel.copy(status = ThreatStatus.CURRENT)
+        )
+
+        val threatItems = buildThreatDetailsListItems(threatModel)
+
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>().size).isEqualTo(1)
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].header)
+                .isEqualTo(UiStringRes(R.string.threat_found_header))
+        assertThat(threatItems.filterIsInstance<ThreatDetailHeaderState>()[0].description)
+                .isEqualTo(UiStringText(TEST_FOUND_ON_DATE))
+    }
+
+    private fun buildThreatDetailsListItems(
+        model: ThreatModel,
+        scanStateHasValidCredentials: Boolean = true,
+        onFixThreatButtonClicked: () -> Unit = mock(),
+        onGetFreeEstimateButtonClicked: () -> Unit = mock(),
+        onIgnoreThreatButtonClicked: () -> Unit = mock()
+    ) = builder.buildThreatDetailsListItems(
+            threatModel = model,
+            scanStateHasValidCredentials = scanStateHasValidCredentials,
+            onFixThreatButtonClicked = onFixThreatButtonClicked,
+            onGetFreeEstimateButtonClicked = onGetFreeEstimateButtonClicked,
+            onIgnoreThreatButtonClicked = onIgnoreThreatButtonClicked,
+            onEnterServerCredsMessageClicked = mock()
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModelTest.kt
new file mode 100644
index 000000000000..c79cae777bcf
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/ThreatDetailsViewModelTest.kt
@@ -0,0 +1,415 @@
+package org.wordpress.android.ui.jetpack.scan.details
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.Constants
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.ActionButtonState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState
+import org.wordpress.android.ui.jetpack.common.JetpackListItemState.DescriptionState.ClickableTextInfo
+import org.wordpress.android.ui.jetpack.scan.ThreatTestData
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.OpenThreatActionDialog
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowJetpackSettings
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowUpdatedFixState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsNavigationEvents.ShowUpdatedScanStateWithMessage
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsViewModel.UiState
+import org.wordpress.android.ui.jetpack.scan.details.ThreatDetailsViewModel.UiState.Content
+import org.wordpress.android.ui.jetpack.scan.details.usecases.GetThreatModelUseCase
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState.Failure
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState.Success
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState
+import org.wordpress.android.ui.mysite.SelectedSiteRepository
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.viewmodel.Event
+import org.wordpress.android.viewmodel.ResourceProvider
+
+private const val ON_FIX_THREAT_BUTTON_CLICKED_PARAM_POSITION = 2
+private const val ON_GET_FREE_ESTIMATE_BUTTON_CLICKED_PARAM_POSITION = 3
+private const val ON_IGNORE_THREAT_BUTTON_CLICKED_PARAM_POSITION = 4
+private const val ON_ENTER_SERVER_CREDS_MESSAGE_CLICKED_PARAM_POSITION = 5
+private const val TEST_SITE_NAME = "test site name"
+
+@InternalCoroutinesApi
+class ThreatDetailsViewModelTest : BaseUnitTest() {
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var getThreatModelUseCase: GetThreatModelUseCase
+    @Mock private lateinit var ignoreThreatUseCase: IgnoreThreatUseCase
+    @Mock private lateinit var fixThreatsUseCase: FixThreatsUseCase
+    @Mock private lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock private lateinit var builder: ThreatDetailsListItemsBuilder
+    @Mock private lateinit var htmlMessageUtils: HtmlMessageUtils
+    @Mock private lateinit var resourceProvider: ResourceProvider
+    @Mock private lateinit var scanTracker: ScanTracker
+    @Mock private lateinit var scanStore: ScanStore
+
+    private lateinit var viewModel: ThreatDetailsViewModel
+    private val threatId = 1L
+    private val fakeUiStringText = UiStringText("")
+    private val fakeThreatModel = ThreatTestData.fixableThreatInCurrentStatus.copy(
+            baseThreatModel = ThreatTestData.fixableThreatInCurrentStatus.baseThreatModel.copy(id = threatId)
+    )
+
+    @Before
+    fun setUp() = test {
+        viewModel = ThreatDetailsViewModel(
+                getThreatModelUseCase,
+                ignoreThreatUseCase,
+                fixThreatsUseCase,
+                selectedSiteRepository,
+                scanStore,
+                builder,
+                htmlMessageUtils,
+                resourceProvider,
+                scanTracker
+        )
+        whenever(site.name).thenReturn(TEST_SITE_NAME)
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(any(), any())).thenReturn(mock())
+        whenever(getThreatModelUseCase.get(anyLong())).thenReturn(fakeThreatModel)
+        whenever(builder.buildThreatDetailsListItems(any(), any(), any(), any(), any(), any())).thenAnswer {
+            createDummyThreatDetailsListItems(
+                    it.getArgument(ON_FIX_THREAT_BUTTON_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_IGNORE_THREAT_BUTTON_CLICKED_PARAM_POSITION)
+            )
+        }
+        whenever(builder.buildFixableThreatDescription(any())).thenAnswer {
+            DescriptionState(UiStringRes(R.string.threat_fix_fixable_edit))
+        }
+        whenever(scanStore.hasValidCredentials(site)).thenReturn(true)
+    }
+
+    @Test
+    fun `given threat id, when on start, then threat details are retrieved`() = test {
+        viewModel.start(threatId)
+
+        verify(getThreatModelUseCase).get(threatId)
+    }
+
+    @Test
+    fun `given threat id, when on start, then ui is updated with content`() = test {
+        val uiStates = init().uiStates
+
+        val uiState = uiStates.last()
+        assertThat(uiState).isInstanceOf(Content::class.java)
+    }
+
+    @Test
+    fun `when fix threat button is clicked, then open threat action dialog action is triggered for fix threat`() =
+            test {
+                val observers = init()
+
+                (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>()
+                        .first().onClick.invoke()
+
+                assertThat(observers.navigation.last().peekContent()).isInstanceOf(OpenThreatActionDialog::class.java)
+            }
+
+    @Test
+    fun `when open threat action dialog is triggered for fix threat, then fix threat confirmation dialog is shown`() =
+            test {
+                val observers = init()
+
+                (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>()
+                        .first().onClick.invoke()
+
+                val confirmationDialog = observers.navigation.last().peekContent() as OpenThreatActionDialog
+                with(confirmationDialog) {
+                    assertThat(title).isEqualTo(UiStringRes(R.string.threat_fix))
+                    val fixable = requireNotNull(fakeThreatModel.baseThreatModel.fixable)
+                    assertThat(message).isEqualTo(builder.buildFixableThreatDescription(fixable).text)
+                    assertThat(positiveButtonLabel).isEqualTo(R.string.dialog_button_ok)
+                    assertThat(negativeButtonLabel).isEqualTo(R.string.dialog_button_cancel)
+                }
+            }
+
+    @Test
+    fun `when get free estimate button is clicked, then ShowGetFreeEstimate event is triggered`() = test {
+        whenever(builder.buildThreatDetailsListItems(any(), any(), any(), any(), any(), any())).thenAnswer {
+            createDummyThreatDetailsListItems(
+                    it.getArgument(ON_GET_FREE_ESTIMATE_BUTTON_CLICKED_PARAM_POSITION)
+            )
+        }
+        val observers = init()
+
+        (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>()
+                .first().onClick.invoke()
+
+        assertThat(observers.navigation.last().peekContent())
+                .isInstanceOf(ThreatDetailsNavigationEvents.ShowGetFreeEstimate::class.java)
+    }
+
+    @Test
+    fun `when enter server creds msg is clicked, then app opens site's jetpack settings external url`() = test {
+        whenever(builder.buildThreatDetailsListItems(any(), any(), any(), any(), any(), any())).thenAnswer {
+            createDummyThreatDetailsListItems(
+                    onEnterServerCredsMessageClicked = it
+                            .getArgument(ON_ENTER_SERVER_CREDS_MESSAGE_CLICKED_PARAM_POSITION)
+            )
+        }
+        val observers = init()
+
+        (observers.uiStates.last() as Content)
+                .items
+                .filterIsInstance(DescriptionState::class.java)
+                .firstOrNull { it.text == UiStringRes(R.string.threat_fix_enter_server_creds_message_singular) }
+                ?.clickableTextsInfo
+                ?.firstOrNull()
+                ?.onClick
+                ?.invoke()
+
+        assertThat(observers.navigation.last().peekContent()).isEqualTo(
+                ShowJetpackSettings("${Constants.URL_JETPACK_SETTINGS}/${site.siteId}")
+        )
+    }
+
+    @Test
+    fun `given server unavailable, when fix threat action is triggered, then fix threat error msg is shown`() =
+            test {
+                whenever(fixThreatsUseCase.fixThreats(any(), any()))
+                        .thenReturn(FixThreatsState.Failure.RemoteRequestFailure)
+                val observers = init()
+
+                triggerFixThreatAction(observers)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.threat_fix_error_message)))
+            }
+
+    @Test
+    fun `given no network, when fix threat action is triggered, then network error msg is shown`() = test {
+        whenever(fixThreatsUseCase.fixThreats(any(), any())).thenReturn(FixThreatsState.Failure.NetworkUnavailable)
+        val observers = init()
+
+        triggerFixThreatAction(observers)
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.error_generic_network)))
+    }
+
+    @Test
+    fun `when ok button on fix action confirmation dialog is clicked, then action buttons are disabled`() = test {
+        val observers = init()
+
+        triggerFixThreatAction(observers)
+
+        val contentItems = (observers.uiStates.last() as Content).items
+        val ignoreThreatButton = contentItems.filterIsInstance<ActionButtonState>().first()
+        assertThat(ignoreThreatButton.isEnabled).isEqualTo(false)
+    }
+
+    @Test
+    fun `given failure response, when fix threat action is triggered, then action buttons are enabled`() = test {
+        whenever(fixThreatsUseCase.fixThreats(any(), any())).thenReturn(FixThreatsState.Failure.RemoteRequestFailure)
+        val observers = init()
+
+        triggerFixThreatAction(observers)
+
+        val contentItems = (observers.uiStates.last() as Content).items
+        val ignoreThreatButton = contentItems.filterIsInstance<ActionButtonState>().first()
+        assertThat(ignoreThreatButton.isEnabled).isEqualTo(true)
+    }
+
+    @Test
+    fun `given success response, when fix threat action is triggered, then update fix state action is triggered`() =
+            test {
+                whenever(fixThreatsUseCase.fixThreats(any(), any())).thenReturn(FixThreatsState.Success)
+                val observers = init()
+
+                triggerFixThreatAction(observers)
+
+                assertThat(observers.navigation.last().peekContent()).isEqualTo(ShowUpdatedFixState(threatId))
+            }
+
+    @Test
+    fun `when ignore threat button is clicked, then open threat action dialog action is triggered for ignore threat`() =
+            test {
+                val observers = init()
+
+                (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>()
+                        .last().onClick.invoke()
+
+                assertThat(observers.navigation.last().peekContent()).isInstanceOf(OpenThreatActionDialog::class.java)
+            }
+
+    @Test
+    fun `when open threat action dialog triggered for ignore threat, then ignore threat confirmation dialog shown`() =
+            test {
+                val observers = init()
+
+                (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>()
+                        .last().onClick.invoke()
+
+                val siteName = site.name ?: resourceProvider.getString(R.string.scan_this_site)
+                val confirmationDialog = observers.navigation.last().peekContent() as OpenThreatActionDialog
+                with(confirmationDialog) {
+                    assertThat(title).isEqualTo(UiStringRes(R.string.threat_ignore))
+                    assertThat(message).isEqualTo(
+                            UiStringText(
+                                    htmlMessageUtils
+                                            .getHtmlMessageFromStringFormatResId(
+                                                    R.string.threat_ignore_warning,
+                                                    "<b>$siteName</b>"
+                                            )
+                            )
+                    )
+                    assertThat(positiveButtonLabel).isEqualTo(R.string.dialog_button_ok)
+                    assertThat(negativeButtonLabel).isEqualTo(R.string.dialog_button_cancel)
+                }
+            }
+
+    @Test
+    fun `given server unavailable, when ignore threat action is triggered, then ignore threat error msg is shown`() =
+            test {
+                whenever(ignoreThreatUseCase.ignoreThreat(any(), any())).thenReturn(Failure.RemoteRequestFailure)
+                val observers = init()
+
+                triggerIgnoreThreatAction(observers)
+
+                val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+                assertThat(snackBarMsg)
+                        .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.threat_ignore_error_message)))
+            }
+
+    @Test
+    fun `given no network, when ignore threat action is triggered, then network error msg is shown`() = test {
+        whenever(ignoreThreatUseCase.ignoreThreat(any(), any())).thenReturn(Failure.NetworkUnavailable)
+        val observers = init()
+
+        triggerIgnoreThreatAction(observers)
+
+        val snackBarMsg = observers.snackBarMsgs.last().peekContent()
+        assertThat(snackBarMsg).isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.error_generic_network)))
+    }
+
+    @Test
+    fun `when ok button on ignore action confirmation dialog is clicked, then action buttons are disabled`() = test {
+        val observers = init()
+
+        triggerIgnoreThreatAction(observers)
+
+        val contentItems = (observers.uiStates.last() as Content).items
+        val ignoreThreatButton = contentItems.filterIsInstance<ActionButtonState>().first()
+        assertThat(ignoreThreatButton.isEnabled).isEqualTo(false)
+    }
+
+    @Test
+    fun `given failure response, when threat action fails, then action buttons are enabled`() = test {
+        whenever(ignoreThreatUseCase.ignoreThreat(any(), any())).thenReturn(Failure.RemoteRequestFailure)
+        val observers = init()
+
+        triggerIgnoreThreatAction(observers)
+
+        val contentItems = (observers.uiStates.last() as Content).items
+        val ignoreThreatButton = contentItems.filterIsInstance<ActionButtonState>().first()
+        assertThat(ignoreThreatButton.isEnabled).isEqualTo(true)
+    }
+
+    @Test
+    fun `given success response, when ignore threat action is triggered, then update scan state action is triggered`() =
+            test {
+                whenever(ignoreThreatUseCase.ignoreThreat(any(), any())).thenReturn(Success)
+                val observers = init()
+
+                triggerIgnoreThreatAction(observers)
+
+                assertThat(observers.navigation.last().peekContent())
+                        .isEqualTo(ShowUpdatedScanStateWithMessage(R.string.threat_ignore_success_message))
+            }
+
+    private fun triggerIgnoreThreatAction(observers: Observers) {
+        (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>().last().onClick.invoke()
+        (observers.navigation.last().peekContent() as OpenThreatActionDialog).okButtonAction.invoke()
+    }
+
+    private fun triggerFixThreatAction(observers: Observers) {
+        (observers.uiStates.last() as Content).items.filterIsInstance<ActionButtonState>().first().onClick.invoke()
+        (observers.navigation.last().peekContent() as OpenThreatActionDialog).okButtonAction.invoke()
+    }
+
+    private fun createDummyThreatDetailsListItems(
+        primaryAction: (() -> Unit)? = null,
+        secondaryAction: (() -> Unit)? = null,
+        onEnterServerCredsMessageClicked: (() -> Unit)? = null
+    ): List<JetpackListItemState> {
+        val items = ArrayList<JetpackListItemState>()
+        primaryAction?.let {
+            items.add(
+                    ActionButtonState(
+                            text = fakeUiStringText,
+                            contentDescription = fakeUiStringText,
+                            isSecondary = false,
+                            onClick = primaryAction
+                    )
+            )
+        }
+        secondaryAction?.let {
+            items.add(
+                    ActionButtonState(
+                            text = fakeUiStringText,
+                            contentDescription = fakeUiStringText,
+                            isSecondary = true,
+                            onClick = secondaryAction
+                    )
+            )
+        }
+        onEnterServerCredsMessageClicked?.let {
+            items.add(
+                    DescriptionState(
+                            text = UiStringRes(R.string.threat_fix_enter_server_creds_message_singular),
+                            clickableTextsInfo = listOf(
+                                    ClickableTextInfo(
+                                            startIndex = 0,
+                                            endIndex = 1,
+                                            onClick = onEnterServerCredsMessageClicked
+                                    )
+                            )
+                    )
+            )
+        }
+        return items
+    }
+
+    private fun init(): Observers {
+        val uiStates = mutableListOf<UiState>()
+        viewModel.uiState.observeForever {
+            uiStates.add(it)
+        }
+        val snackbarMsgs = mutableListOf<Event<SnackbarMessageHolder>>()
+        viewModel.snackbarEvents.observeForever {
+            snackbarMsgs.add(it)
+        }
+        val navigation = mutableListOf<Event<ThreatDetailsNavigationEvents>>()
+        viewModel.navigationEvents.observeForever {
+            navigation.add(it)
+        }
+
+        viewModel.start(threatId)
+
+        return Observers(uiStates, snackbarMsgs, navigation)
+    }
+
+    private data class Observers(
+        val uiStates: List<UiState>,
+        val snackBarMsgs: List<Event<SnackbarMessageHolder>>,
+        val navigation: List<Event<ThreatDetailsNavigationEvents>>
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/usecases/IgnoreThreatUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/usecases/IgnoreThreatUseCaseTest.kt
new file mode 100644
index 000000000000..8c846cd263cb
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/details/usecases/IgnoreThreatUseCaseTest.kt
@@ -0,0 +1,66 @@
+package org.wordpress.android.ui.jetpack.scan.details.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ScanAction.IGNORE_THREAT
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatError
+import org.wordpress.android.fluxc.store.ScanStore.IgnoreThreatErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.ScanStore.OnIgnoreThreatStarted
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState.Failure
+import org.wordpress.android.ui.jetpack.scan.details.usecases.IgnoreThreatUseCase.IgnoreThreatState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+class IgnoreThreatUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: IgnoreThreatUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var scanStore: ScanStore
+
+    private val fakeSiteId = 1L
+    private val fakeThreatId = 11L
+
+    @Before
+    fun setup() = test {
+        useCase = IgnoreThreatUseCase(networkUtilsWrapper, scanStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `given no network, when ignore threat is triggered, then the call fails due to network unavailability`() =
+            test {
+                whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+                val result = useCase.ignoreThreat(fakeSiteId, fakeThreatId)
+
+                assertThat(result).isEqualTo(Failure.NetworkUnavailable)
+            }
+
+    @Test
+    fun `given invalid response, when ignore threat is triggered, then the call fails`() = test {
+        whenever(scanStore.ignoreThreat(any())).thenReturn(
+                OnIgnoreThreatStarted(IgnoreThreatError(INVALID_RESPONSE), IGNORE_THREAT)
+        )
+
+        val result = useCase.ignoreThreat(fakeSiteId, fakeThreatId)
+
+        assertThat(result).isEqualTo(Failure.RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given valid response, when ignore threat is triggered, then the call succeeds`() = test {
+        whenever(scanStore.ignoreThreat(any())).thenReturn(OnIgnoreThreatStarted(IGNORE_THREAT))
+
+        val result = useCase.ignoreThreat(fakeSiteId, fakeThreatId)
+
+        assertThat(result).isEqualTo(Success)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListViewModelTest.kt
new file mode 100644
index 000000000000..7434c858a57b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryListViewModelTest.kt
@@ -0,0 +1,231 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.argumentCaptor
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyBoolean
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.GenericThreatModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel.ThreatStatus
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatDateItemState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemLoadingSkeletonState
+import org.wordpress.android.ui.jetpack.scan.ScanListItemState.ThreatItemState
+import org.wordpress.android.ui.jetpack.scan.ScanNavigationEvents.ShowThreatDetails
+import org.wordpress.android.ui.jetpack.scan.ThreatTestData.genericThreatModel
+import org.wordpress.android.ui.jetpack.scan.builders.ThreatItemBuilder
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel.ScanHistoryUiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryListViewModel.ScanHistoryUiState.EmptyUiState.EmptyHistory
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.ALL
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.ScanTracker
+import org.wordpress.android.util.toFormattedDateString
+import java.util.Calendar
+
+private const val ON_ITEM_CLICKED_PARAM_POSITION = 1
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ScanHistoryListViewModelTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock private lateinit var scanThreatItemBuilder: ThreatItemBuilder
+    @Mock private lateinit var scanHistoryViewModel: ScanHistoryViewModel
+    @Mock private lateinit var scanTracker: ScanTracker
+    private val captor = argumentCaptor<ThreatModel>()
+
+    private lateinit var viewModel: ScanHistoryListViewModel
+
+    private val site: SiteModel = SiteModel()
+
+    @Before
+    fun setUp() = test {
+        viewModel = ScanHistoryListViewModel(
+                scanThreatItemBuilder,
+                scanTracker,
+                TEST_DISPATCHER
+        )
+        val threats = listOf(
+                GenericThreatModel(genericThreatModel.baseThreatModel.copy(status = ThreatStatus.FIXED)),
+                GenericThreatModel(genericThreatModel.baseThreatModel.copy(status = ThreatStatus.UNKNOWN)),
+                GenericThreatModel(genericThreatModel.baseThreatModel.copy(status = ThreatStatus.FIXED)),
+                GenericThreatModel(genericThreatModel.baseThreatModel.copy(status = ThreatStatus.IGNORED)),
+                GenericThreatModel(genericThreatModel.baseThreatModel.copy(status = ThreatStatus.FIXED)),
+                GenericThreatModel(genericThreatModel.baseThreatModel.copy(status = ThreatStatus.CURRENT))
+        )
+        whenever(scanHistoryViewModel.threats).thenReturn(MutableLiveData(threats))
+        whenever(scanThreatItemBuilder.buildThreatItem(anyOrNull(), anyOrNull(), anyBoolean())).thenAnswer {
+            ThreatItemState(1L, true, mock(), mock(), mock(), 0, 0, 0) {
+                it.getArgument<(Long) -> Unit>(ON_ITEM_CLICKED_PARAM_POSITION)(1L)
+            }
+        }
+    }
+
+    @Test
+    fun `Loading skeletons shown, when the user opens the screen`() {
+        whenever(scanHistoryViewModel.threats).thenReturn(MutableLiveData())
+
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
+        assertThat((viewModel.uiState.value as ContentUiState).items).allMatch { it is ThreatItemLoadingSkeletonState }
+    }
+
+    @Test
+    fun `Threat ui state items shown, when the data is available`() {
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
+        assertThat((viewModel.uiState.value as ContentUiState).items).allMatch {
+            it is ThreatDateItemState || it is ThreatItemState
+        }
+    }
+
+    @Test
+    fun `Threat date is shown as first item, when data is available`() {
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
+        assertThat((viewModel.uiState.value as ContentUiState).items.first())
+                .isInstanceOf(ThreatDateItemState::class.java)
+    }
+
+    @Test
+    fun `Threat date is shown again, when the date is different`() {
+        // assign
+        val calendar = Calendar.getInstance()
+        val threats = listOf(
+                GenericThreatModel(
+                        genericThreatModel.baseThreatModel.copy(
+                                firstDetected = calendar.time,
+                                status = ThreatStatus.FIXED
+                        )
+                ),
+
+                GenericThreatModel(
+                        genericThreatModel.baseThreatModel.copy(
+                                firstDetected = calendar.apply {
+                                    add(Calendar.DAY_OF_YEAR, 1)
+                                }.time,
+                                status = ThreatStatus.FIXED
+                        )
+                ),
+                GenericThreatModel(
+                        genericThreatModel.baseThreatModel.copy(
+                                firstDetected = calendar.time,
+                                status = ThreatStatus.FIXED
+                        )
+                ),
+                GenericThreatModel(
+                        genericThreatModel.baseThreatModel.copy(
+                                firstDetected = calendar.apply {
+                                    add(Calendar.DAY_OF_YEAR, 1)
+                                }.time,
+                                status = ThreatStatus.FIXED
+                        )
+                ),
+                GenericThreatModel(
+                        genericThreatModel.baseThreatModel.copy(
+                                firstDetected = calendar.apply {
+                                    add(Calendar.DAY_OF_YEAR, 1)
+                                }.time,
+                                status = ThreatStatus.FIXED
+                        )
+                )
+        )
+        whenever(scanHistoryViewModel.threats).thenReturn(MutableLiveData(threats))
+
+        whenever(scanThreatItemBuilder.buildThreatItem(anyOrNull(), anyOrNull(), anyBoolean())).thenAnswer {
+            val threat = it.arguments[0] as GenericThreatModel
+            val date = threat.baseThreatModel.firstDetected.toFormattedDateString()
+            ThreatItemState(1L, true, UiStringText(date), mock(), mock(), 0, 0, 0) {
+                it.getArgument<(Long) -> Unit>(ON_ITEM_CLICKED_PARAM_POSITION)(1L)
+            }
+        }
+
+        // act
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        // asset
+        assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
+        val dateItemStates = (viewModel.uiState.value as ContentUiState)
+                .items
+                .filterIndexed { index, _ ->
+                    index == 0 || index == 2 || index == 5 || index == 7
+                }
+        assertThat(dateItemStates)
+                .allMatch { it is ThreatDateItemState }
+    }
+
+    @Test
+    fun `Only fixed threats are shown, when fixed tab is selected`() {
+        viewModel.start(ScanHistoryTabType.FIXED, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        verify(scanThreatItemBuilder, times(3)).buildThreatItem(captor.capture(), anyOrNull(), anyBoolean())
+        assertThat(captor.allValues).allMatch { it.baseThreatModel.status == ThreatStatus.FIXED }
+    }
+
+    @Test
+    fun `Only ignored threats are shown, when ignore tab is selected`() {
+        viewModel.start(ScanHistoryTabType.IGNORED, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        verify(scanThreatItemBuilder, times(1)).buildThreatItem(captor.capture(), anyOrNull(), anyBoolean())
+        assertThat(captor.allValues).allMatch { it.baseThreatModel.status == ThreatStatus.IGNORED }
+    }
+
+    @Test
+    fun `Only fixed and ignored threats are shown, when all tab is selected`() {
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        verify(scanThreatItemBuilder, times(4)).buildThreatItem(captor.capture(), anyOrNull(), anyBoolean())
+        assertThat(captor.allValues).allMatch {
+            it.baseThreatModel.status == ThreatStatus.FIXED || it.baseThreatModel.status == ThreatStatus.IGNORED
+        }
+    }
+
+    @Test
+    fun `Empty screen shown, when history is empty`() {
+        whenever(scanHistoryViewModel.threats).thenReturn(MutableLiveData(listOf()))
+
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+
+        assertThat(viewModel.uiState.value).isInstanceOf(EmptyHistory::class.java)
+    }
+
+    @Test
+    fun `Threat detail screen opened, when the user clicks on threat list item`() {
+        viewModel.start(ALL, site, scanHistoryViewModel)
+        viewModel.uiState.observeForever(mock())
+        viewModel.navigation.observeForever(mock())
+
+        // first item is date header
+        ((viewModel.uiState.value!! as ContentUiState).items[1] as ThreatItemState).onClick.invoke()
+
+        assertThat(viewModel.navigation.value!!.peekContent()).isInstanceOf(ShowThreatDetails::class.java)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModelTest.kt
new file mode 100644
index 000000000000..50b116c637cf
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/history/ScanHistoryViewModelTest.kt
@@ -0,0 +1,132 @@
+package org.wordpress.android.ui.jetpack.scan.history
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.ALL
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.FIXED
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.ScanHistoryTabType.IGNORED
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ContentUiState
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ErrorUiState.NoConnection
+import org.wordpress.android.ui.jetpack.scan.history.ScanHistoryViewModel.UiState.ErrorUiState.RequestFailed
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase
+import org.wordpress.android.util.analytics.ScanTracker
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ScanHistoryViewModelTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock private lateinit var scanTracker: ScanTracker
+    @Mock private lateinit var fetchScanHistoryUseCase: FetchScanHistoryUseCase
+
+    private val site: SiteModel = SiteModel()
+
+    private lateinit var viewModel: ScanHistoryViewModel
+
+    @Before
+    fun setUp() = test {
+        viewModel = ScanHistoryViewModel(
+                scanTracker,
+                fetchScanHistoryUseCase,
+                TEST_DISPATCHER
+        )
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Success(listOf(mock())))
+    }
+
+    @Test
+    fun `Threats loaded, when the user opens the screen`() = test {
+        viewModel.start(site)
+
+        assertThat(viewModel.threats.value!!.size).isEqualTo(1)
+    }
+
+    @Test
+    fun `Content shown, when fetching threats`() = test {
+        val observers = init()
+
+        assertThat(observers.uiStates[0]).isInstanceOf(ContentUiState::class.java)
+    }
+
+    @Test
+    fun `All tabs shown, when content displayed`() = test {
+        val observers = init()
+
+        assertThat((observers.uiStates[0] as ContentUiState).tabs.map { it.type }).isEqualTo(
+                listOf(ALL, FIXED, IGNORED)
+        )
+    }
+
+    @Test
+    fun `No connection error shown, when network not available`() = test {
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Failure.NetworkUnavailable)
+
+        val observers = init()
+
+        assertThat(observers.uiStates.last()).isInstanceOf(NoConnection::class.java)
+    }
+
+    @Test
+    fun `RequestFailed error shown, when network request fails`() = test {
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Failure.RemoteRequestFailure)
+
+        val observers = init()
+
+        assertThat(observers.uiStates.last()).isInstanceOf(RequestFailed::class.java)
+    }
+
+    @Test
+    fun `Threats fetched, when user clicks on Retry button on NoConnection screen`() = test {
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Failure.NetworkUnavailable)
+        val observers = init()
+
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Success(listOf(mock())))
+        (observers.uiStates.last() as NoConnection).retry.invoke()
+
+        assertThat(viewModel.threats.value!!.size).isEqualTo(1)
+    }
+
+    @Test
+    fun `Threats fetched, when user clicks on Retry button on RequestFailed screen`() = test {
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Failure.RemoteRequestFailure)
+        val observers = init()
+
+        whenever(fetchScanHistoryUseCase.fetch(site))
+                .thenReturn(FetchScanHistoryUseCase.FetchScanHistoryState.Success(listOf(mock())))
+        (observers.uiStates.last() as RequestFailed).retry.invoke()
+
+        assertThat(viewModel.threats.value!!.size).isEqualTo(1)
+    }
+
+    private fun init(): Observers {
+        val uiStates = mutableListOf<UiState>()
+        viewModel.uiState.observeForever {
+            uiStates.add(it)
+        }
+        viewModel.start(site)
+        return Observers(uiStates)
+    }
+
+    private data class Observers(
+        val uiStates: List<UiState>
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchFixThreatsStatusUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchFixThreatsStatusUseCaseTest.kt
new file mode 100644
index 000000000000..b0037c3a233d
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchFixThreatsStatusUseCaseTest.kt
@@ -0,0 +1,212 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import kotlinx.coroutines.test.runBlockingTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.MainCoroutineScopeRule
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ScanAction.FETCH_FIX_THREATS_STATUS
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel
+import org.wordpress.android.fluxc.model.scan.threat.FixThreatStatusModel.FixStatus
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusError
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsStatusErrorType
+import org.wordpress.android.fluxc.store.ScanStore.OnFixThreatsStatusFetched
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.Complete
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.InProgress
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchFixThreatsStatusUseCase.FetchFixThreatsState.NotStarted
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@ExperimentalCoroutinesApi
+@InternalCoroutinesApi
+class FetchFixThreatsStatusUseCaseTest : BaseUnitTest() {
+    @Rule
+    @JvmField val coroutineScope = MainCoroutineScopeRule()
+
+    private lateinit var useCase: FetchFixThreatsStatusUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var scanStore: ScanStore
+
+    private val fakeSiteId = 1L
+    private val fakeThreatId = 11L
+    private val fakeFixThreatsStatusModel = FixThreatStatusModel(fakeThreatId, FixStatus.IN_PROGRESS)
+
+    private val storeResultWithInProgressFixStatusModel = OnFixThreatsStatusFetched(
+            fakeSiteId,
+            listOf(fakeFixThreatsStatusModel),
+            FETCH_FIX_THREATS_STATUS
+    )
+
+    private val storeResultWithFixedFixStatusModel = storeResultWithInProgressFixStatusModel.copy(
+            fixThreatStatusModels = listOf(fakeFixThreatsStatusModel.copy(status = FixStatus.FIXED))
+    )
+
+    @Before
+    fun setup() {
+        useCase = FetchFixThreatsStatusUseCase(networkUtilsWrapper, scanStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `given no network, when threats fix status is fetched, then NetworkUnavailable is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(fakeThreatId))
+                .toList(mutableListOf())
+                .last()
+
+        assertThat(useCaseResult).isEqualTo(Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `when in progress threats fix status is fetched, then polling occurs until in progress status changes`() =
+            coroutineScope.runBlockingTest {
+                whenever(scanStore.fetchFixThreatsStatus(any()))
+                        .thenReturn(storeResultWithInProgressFixStatusModel)
+                        .thenReturn(storeResultWithInProgressFixStatusModel)
+                        .thenReturn(storeResultWithFixedFixStatusModel)
+
+                val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(fakeThreatId))
+                        .toList(mutableListOf())
+                advanceTimeBy(FETCH_FIX_THREATS_STATUS_DELAY_MILLIS)
+
+                verify(scanStore, times(3)).fetchFixThreatsStatus(any())
+                assertThat(useCaseResult).containsSequence(
+                        InProgress(listOf(fakeThreatId)),
+                        InProgress(listOf(fakeThreatId)),
+                        Complete(fixedThreatsCount = 1)
+                )
+            }
+
+    @Test
+    fun `given threats fixed successfully, when threats fix status is fetched, then Complete is returned`() = test {
+        whenever(scanStore.fetchFixThreatsStatus(any())).thenReturn(storeResultWithFixedFixStatusModel)
+
+        val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(fakeThreatId))
+                .toList(mutableListOf())
+                .last()
+
+        assertThat(useCaseResult).isEqualTo(Complete(fixedThreatsCount = 1))
+    }
+
+    @Test
+    fun `given invalid response, when threats fix status is fetched, then RemoteRequestFailure is returned`() = test {
+        val storeResultWithGenericError = OnFixThreatsStatusFetched(
+                fakeSiteId,
+                FixThreatsStatusError(FixThreatsStatusErrorType.INVALID_RESPONSE),
+                FETCH_FIX_THREATS_STATUS
+        )
+        whenever(scanStore.fetchFixThreatsStatus(any())).thenReturn(storeResultWithGenericError)
+
+        val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(fakeThreatId))
+                .toList(mutableListOf())
+                .last()
+
+        assertThat(useCaseResult).isEqualTo(Failure.RemoteRequestFailure)
+    }
+
+    @Test
+    fun `given result models contain error, when threats fix status is fetched, then FixFailure is returned`() = test {
+        val fixThreatsStatusModels = listOf(
+                fakeFixThreatsStatusModel.copy(status = FixStatus.FIXED),
+                fakeFixThreatsStatusModel.copy(status = FixStatus.UNKNOWN, error = "not_found")
+        )
+        val storeResultWithErrorFixStatusModel = OnFixThreatsStatusFetched(
+                fakeSiteId,
+                fixThreatsStatusModels,
+                FETCH_FIX_THREATS_STATUS
+        )
+        whenever(scanStore.fetchFixThreatsStatus(any())).thenReturn(storeResultWithErrorFixStatusModel)
+
+        val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(1L, 2L))
+                .toList(mutableListOf())
+                .last()
+
+        assertThat(useCaseResult).isEqualTo(
+                Failure.FixFailure(
+                        containsOnlyErrors = false,
+                        mightBeMissingCredentials = false
+                )
+        )
+    }
+
+    @Test
+    fun `given result models contains only errors, then FixFailure - containsOnlyErrors is true`() = test {
+        val fixThreatsStatusModels = listOf(
+                fakeFixThreatsStatusModel.copy(status = FixStatus.NOT_FIXED),
+                fakeFixThreatsStatusModel.copy(status = FixStatus.UNKNOWN, error = "not_found")
+        )
+        val storeResultWithErrorFixStatusModel = OnFixThreatsStatusFetched(
+                fakeSiteId,
+                fixThreatsStatusModels,
+                FETCH_FIX_THREATS_STATUS
+        )
+        whenever(scanStore.fetchFixThreatsStatus(any())).thenReturn(storeResultWithErrorFixStatusModel)
+
+        val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(1L, 2L))
+                .toList(mutableListOf())
+                .last()
+
+        assertThat(useCaseResult).isEqualTo(
+                Failure.FixFailure(
+                        containsOnlyErrors = true,
+                        mightBeMissingCredentials = false
+                )
+        )
+    }
+
+    @Test
+    fun `given model contains not started state, when threats fix status is fetched, then NotStarted is returned`() =
+            test {
+                val storeResultWithErrorFixStatusModel = OnFixThreatsStatusFetched(
+                        fakeSiteId,
+                        listOf(fakeFixThreatsStatusModel.copy(status = FixStatus.NOT_STARTED)),
+                        FETCH_FIX_THREATS_STATUS
+                )
+                whenever(scanStore.fetchFixThreatsStatus(any())).thenReturn(storeResultWithErrorFixStatusModel)
+
+                val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(fakeThreatId))
+                        .toList(mutableListOf())
+                        .last()
+
+                assertThat(useCaseResult).isEqualTo(NotStarted)
+            }
+
+    @Test
+    fun `given all threats NOT_FIXED, when status is fetched, then FixFailure(containsOnly = true) returned`() = test {
+        val fixThreatsStatusModels = listOf(
+                fakeFixThreatsStatusModel.copy(status = FixStatus.NOT_FIXED),
+                fakeFixThreatsStatusModel.copy(status = FixStatus.NOT_FIXED)
+        )
+        val storeResultWithErrorFixStatusModel = OnFixThreatsStatusFetched(
+                fakeSiteId,
+                fixThreatsStatusModels,
+                FETCH_FIX_THREATS_STATUS
+        )
+        whenever(scanStore.fetchFixThreatsStatus(any())).thenReturn(storeResultWithErrorFixStatusModel)
+
+        val useCaseResult = useCase.fetchFixThreatsStatus(fakeSiteId, listOf(1L, 2L))
+                .toList(mutableListOf())
+                .last()
+
+        assertThat(useCaseResult).isEqualTo(
+                Failure.FixFailure(
+                        containsOnlyErrors = true,
+                        mightBeMissingCredentials = true
+                )
+        )
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanHistoryUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanHistoryUseCaseTest.kt
new file mode 100644
index 000000000000..316f42a87795
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanHistoryUseCaseTest.kt
@@ -0,0 +1,95 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ScanAction.FETCH_SCAN_HISTORY
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.threat.ThreatModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanHistoryError
+import org.wordpress.android.fluxc.store.ScanStore.FetchScanHistoryErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.store.ScanStore.OnScanHistoryFetched
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase.FetchScanHistoryState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanHistoryUseCase.FetchScanHistoryState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.analytics.ScanTracker
+
+@InternalCoroutinesApi
+class FetchScanHistoryUseCaseTest : BaseUnitTest() {
+    private lateinit var fetchScanHistoryUseCase: FetchScanHistoryUseCase
+
+    @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock private lateinit var scanStore: ScanStore
+    @Mock private lateinit var scanTracker: ScanTracker
+    private val site: SiteModel = SiteModel()
+
+    @Before
+    fun setUp() {
+        fetchScanHistoryUseCase = FetchScanHistoryUseCase(networkUtilsWrapper, scanStore, scanTracker, TEST_DISPATCHER)
+
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `Network failure returned, when the device is offline`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = fetchScanHistoryUseCase.fetch(site)
+
+        assertThat(result).isInstanceOf(Failure.NetworkUnavailable::class.java)
+    }
+
+    @Test
+    fun `Network error tracked, when the device is offline`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        fetchScanHistoryUseCase.fetch(site)
+
+        verify(scanTracker).trackOnError(ScanTracker.ErrorAction.FETCH_SCAN_HISTORY, ScanTracker.ErrorCause.OFFLINE)
+    }
+
+    @Test
+    fun `Request failure returned, when the request fails`() = test {
+        whenever(scanStore.fetchScanHistory(anyOrNull())).thenReturn(
+                OnScanHistoryFetched(site.siteId, FetchScanHistoryError(GENERIC_ERROR), FETCH_SCAN_HISTORY)
+        )
+
+        val result = fetchScanHistoryUseCase.fetch(site)
+
+        assertThat(result).isInstanceOf(Failure.RemoteRequestFailure::class.java)
+    }
+
+    @Test
+    fun `Request failure tracked, when the request fails`() = test {
+        whenever(scanStore.fetchScanHistory(anyOrNull())).thenReturn(
+                OnScanHistoryFetched(site.siteId, FetchScanHistoryError(GENERIC_ERROR), FETCH_SCAN_HISTORY)
+        )
+
+        fetchScanHistoryUseCase.fetch(site)
+
+        verify(scanTracker).trackOnError(ScanTracker.ErrorAction.FETCH_SCAN_HISTORY, ScanTracker.ErrorCause.REMOTE)
+    }
+
+    @Test
+    fun `Data from db returned, when the request succeeds`() = test {
+        val threats = listOf<ThreatModel>(mock(), mock())
+        whenever(scanStore.fetchScanHistory(anyOrNull())).thenReturn(
+                OnScanHistoryFetched(site.siteId, null, FETCH_SCAN_HISTORY)
+        )
+        whenever(scanStore.getScanHistoryForSite(site)).thenReturn(threats)
+
+        val result = fetchScanHistoryUseCase.fetch(site)
+
+        assertThat((result as Success).threatModels).isEqualTo(threats)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanStateUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanStateUseCaseTest.kt
new file mode 100644
index 000000000000..cb597e3ec2a7
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FetchScanStateUseCaseTest.kt
@@ -0,0 +1,144 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ScanAction.FETCH_SCAN_STATE
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.OnScanStateFetched
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateError
+import org.wordpress.android.fluxc.store.ScanStore.ScanStateErrorType
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState.Failure.RemoteRequestFailure
+import org.wordpress.android.ui.jetpack.scan.usecases.FetchScanStateUseCase.FetchScanState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@ExperimentalCoroutinesApi
+@InternalCoroutinesApi
+class FetchScanStateUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: FetchScanStateUseCase
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var scanStateModel: ScanStateModel
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var scanStore: ScanStore
+
+    @Before
+    fun setup() = test {
+        useCase = FetchScanStateUseCase(networkUtilsWrapper, scanStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        whenever(scanStore.getScanStateForSite(site)).thenReturn(scanStateModel)
+    }
+
+    @Test
+    fun `given site, when scan state is fetched, then NetworkUnavailable is returned on no network`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.fetchScanState(site).toList(mutableListOf())
+
+        assertThat(result).contains(FetchScanState.Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given site, when scan state is fetched, then Success is returned on success`() = test {
+        whenever(scanStore.fetchScanState(any())).thenReturn(OnScanStateFetched(FETCH_SCAN_STATE))
+
+        val result = useCase.fetchScanState(site).toList(mutableListOf())
+
+        assertThat(result).contains(Success(scanStateModel))
+    }
+
+    @Test
+    fun `given site, when scan state is fetched, then RemoteRequestFailure is returned on failure`() = test {
+        whenever(scanStore.fetchScanState(any())).thenReturn(
+                OnScanStateFetched(ScanStateError(ScanStateErrorType.GENERIC_ERROR), FETCH_SCAN_STATE)
+        )
+        val result = useCase.fetchScanState(site).toList(mutableListOf())
+
+        assertThat(result).contains(FetchScanState.Failure.RemoteRequestFailure)
+    }
+
+    @Test
+    fun `when SCANNING scan state is fetched, then polling occurs until IDLE state is returned on success`() = test {
+        whenever(scanStore.fetchScanState(any())).thenReturn(OnScanStateFetched(FETCH_SCAN_STATE))
+        val scanStateScanningModel = ScanStateModel(state = ScanStateModel.State.SCANNING)
+        val scanStateModels = listOf(
+                scanStateScanningModel,
+                scanStateScanningModel,
+                ScanStateModel(state = ScanStateModel.State.IDLE)
+        )
+        whenever(scanStore.getScanStateForSite(any()))
+                .thenReturn(scanStateModels[0])
+                .thenReturn(scanStateModels[1])
+                .thenReturn(scanStateModels[2])
+
+        val result = useCase.fetchScanState(site = site).toList(mutableListOf())
+
+        verify(scanStore, times(scanStateModels.size)).fetchScanState(any())
+        assertThat(result).containsSequence(scanStateModels.map { Success(it) })
+    }
+
+    @Test
+    fun `when SCANNING scan state is fetched, then polling occurs until error is returned on failure`() = test {
+        val scanStateScanningModel = ScanStateModel(state = ScanStateModel.State.SCANNING)
+        val scanStateError = ScanStateError(ScanStateErrorType.GENERIC_ERROR)
+        whenever(scanStore.getScanStateForSite(any())).thenReturn(scanStateScanningModel)
+        whenever(scanStore.fetchScanState(any())).thenReturn(
+                OnScanStateFetched(FETCH_SCAN_STATE),
+                OnScanStateFetched(scanStateError, FETCH_SCAN_STATE)
+        )
+
+        val result = useCase.fetchScanState(site = site).toList(mutableListOf())
+
+        // one success and 1+MAX_RETRY attempts
+        verify(scanStore, times(5)).fetchScanState(any())
+        assertThat(result).containsSequence(
+                Success(scanStateScanningModel),
+                FetchScanState.Failure.RemoteRequestFailure
+        )
+    }
+
+    @Test
+    fun `given max fetch retries exceeded, when scan state triggers, then return remote request failure`() = test {
+        val scanStateError = ScanStateError(ScanStateErrorType.GENERIC_ERROR)
+        whenever(scanStore.fetchScanState(any())).thenReturn(OnScanStateFetched(scanStateError, FETCH_SCAN_STATE))
+
+        val result = useCase.fetchScanState(site = site).toList(mutableListOf())
+
+        verify(scanStore, times(MAX_RETRY + 1)).fetchScanState(anyOrNull())
+        assertThat(result).size().isEqualTo(1)
+        assertThat(result).isEqualTo(listOf(RemoteRequestFailure))
+    }
+
+    @Test
+    fun `given fetch error under retry count, when scan state triggers, then return only success`() = test {
+        val scanStateScanningModel = ScanStateModel(state = ScanStateModel.State.SCANNING)
+        val scanStateFinished = ScanStateModel(state = ScanStateModel.State.IDLE)
+        val scanStateError = ScanStateError(ScanStateErrorType.GENERIC_ERROR)
+        whenever(scanStore.fetchScanState(any()))
+                .thenReturn(OnScanStateFetched(scanStateError, FETCH_SCAN_STATE))
+                .thenReturn(OnScanStateFetched(scanStateError, FETCH_SCAN_STATE))
+                .thenReturn(OnScanStateFetched(FETCH_SCAN_STATE))
+
+        whenever(scanStore.getScanStateForSite(site))
+                .thenReturn(scanStateScanningModel)
+                .thenReturn(scanStateFinished)
+
+        val result = useCase.fetchScanState(site = site).toList(mutableListOf())
+
+        assertThat(result).allSatisfy { it is Success }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FixThreatsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FixThreatsUseCaseTest.kt
new file mode 100644
index 000000000000..50151be3336b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/FixThreatsUseCaseTest.kt
@@ -0,0 +1,65 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ScanAction.FIX_THREATS
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsError
+import org.wordpress.android.fluxc.store.ScanStore.FixThreatsErrorType.INVALID_RESPONSE
+import org.wordpress.android.fluxc.store.ScanStore.OnFixThreatsStarted
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState.Failure
+import org.wordpress.android.ui.jetpack.scan.usecases.FixThreatsUseCase.FixThreatsState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+class FixThreatsUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: FixThreatsUseCase
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var scanStore: ScanStore
+
+    private val fakeSiteId = 1L
+    private val fakeThreatIds = listOf(11L)
+
+    @Before
+    fun setup() = test {
+        useCase = FixThreatsUseCase(networkUtilsWrapper, scanStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `given no network, when fix threats is triggered, then NetworkUnavailable is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.fixThreats(fakeSiteId, fakeThreatIds)
+
+        assertThat(result).isEqualTo(Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given invalid response, when fix threats is triggered, then RemoteRequestFailure is returned`() = test {
+        whenever(scanStore.fixThreats(any())).thenReturn(
+                OnFixThreatsStarted(FixThreatsError(INVALID_RESPONSE), FIX_THREATS)
+        )
+
+        val result = useCase.fixThreats(fakeSiteId, fakeThreatIds)
+
+        assertThat(result).isEqualTo(Failure.RemoteRequestFailure)
+    }
+
+    @Test
+    fun `when fix threats is triggered successfully, then Success is returned`() = test {
+        whenever(scanStore.fixThreats(any())).thenReturn(OnFixThreatsStarted(FIX_THREATS))
+
+        val result = useCase.fixThreats(fakeSiteId, fakeThreatIds)
+
+        assertThat(result).isEqualTo(Success)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/StartScanUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/StartScanUseCaseTest.kt
new file mode 100644
index 000000000000..d78b05a4f303
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/jetpack/scan/usecases/StartScanUseCaseTest.kt
@@ -0,0 +1,93 @@
+package org.wordpress.android.ui.jetpack.scan.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.action.ScanAction.START_SCAN
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.scan.ScanStateModel
+import org.wordpress.android.fluxc.store.ScanStore
+import org.wordpress.android.fluxc.store.ScanStore.OnScanStarted
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartError
+import org.wordpress.android.fluxc.store.ScanStore.ScanStartErrorType
+import org.wordpress.android.test
+import org.wordpress.android.ui.jetpack.scan.usecases.StartScanUseCase.StartScanState
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+class StartScanUseCaseTest : BaseUnitTest() {
+    private lateinit var useCase: StartScanUseCase
+    @Mock private lateinit var site: SiteModel
+    @Mock private lateinit var scanStateModel: ScanStateModel
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var scanStore: ScanStore
+
+    @Before
+    fun setup() = test {
+        useCase = StartScanUseCase(networkUtilsWrapper, scanStore, TEST_DISPATCHER)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        whenever(scanStore.getScanStateForSite(site)).thenReturn(scanStateModel)
+    }
+
+    @Test
+    fun `given site and no network, when scan is started, then NetworkUnavailable is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.startScan(site).toList(mutableListOf())
+
+        assertThat(result).contains(StartScanState.Failure.NetworkUnavailable)
+    }
+
+    @Test
+    fun `given site, when scan is started, then Success is returned on success`() = testWithSuccessResponse {
+        val result = useCase.startScan(site).toList(mutableListOf())
+
+        assertThat(result).contains(StartScanState.Success)
+    }
+
+    @Test
+    fun `when scan start is triggered, then scan starts optimistically by updating scanning scan state in db`() =
+            testWithSuccessResponse {
+                val scanStateModelInIdleState = ScanStateModel(state = ScanStateModel.State.IDLE)
+                val expectedScanStateModel = scanStateModelInIdleState.copy(state = ScanStateModel.State.SCANNING)
+                whenever(scanStore.getScanStateForSite(any())).thenReturn(scanStateModel)
+
+                val result = useCase.startScan(site).toList(mutableListOf())
+
+                verify(scanStore).addOrUpdateScanStateModelForSite(START_SCAN, site, expectedScanStateModel)
+                assertThat(result).contains(StartScanState.ScanningStateUpdatedInDb(expectedScanStateModel))
+            }
+
+    @Test
+    fun `given server is unavailable, when scan is started, then RemoteRequestFailure is returned`() =
+            testWithErrorResponse {
+                val result = useCase.startScan(site).toList(mutableListOf())
+
+                assertThat(result).contains(StartScanState.Failure.RemoteRequestFailure)
+            }
+
+    private fun <T> testWithSuccessResponse(block: suspend CoroutineScope.() -> T) {
+        test {
+            whenever(scanStore.startScan(any())).thenReturn(OnScanStarted(START_SCAN))
+            block()
+        }
+    }
+
+    private fun <T> testWithErrorResponse(block: suspend CoroutineScope.() -> T) {
+        test {
+            whenever(scanStore.startScan(any())).thenReturn(
+                    OnScanStarted(ScanStartError(ScanStartErrorType.GENERIC_ERROR), START_SCAN)
+            )
+            block()
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt
index a59d1542819a..2da35a3a2768 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModelTest.kt
@@ -2,11 +2,13 @@ package org.wordpress.android.ui.mediapicker
 
 import android.content.Context
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doAnswer
 import com.nhaarman.mockitokotlin2.inOrder
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.flow
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -17,6 +19,7 @@ import org.wordpress.android.R
 import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.MediaStore
+import org.wordpress.android.fluxc.utils.MimeTypes
 import org.wordpress.android.test
 import org.wordpress.android.ui.mediapicker.MediaItem.Identifier.LocalUri
 import org.wordpress.android.ui.mediapicker.MediaNavigationEvent.IconClickEvent
@@ -55,6 +58,7 @@ import org.wordpress.android.ui.mediapicker.insert.MediaInsertHandler
 import org.wordpress.android.ui.mediapicker.insert.MediaInsertHandlerFactory
 import org.wordpress.android.ui.mediapicker.loader.MediaLoader
 import org.wordpress.android.ui.mediapicker.loader.MediaLoader.DomainModel
+import org.wordpress.android.ui.mediapicker.loader.MediaLoader.LoadAction
 import org.wordpress.android.ui.mediapicker.loader.MediaLoaderFactory
 import org.wordpress.android.ui.photopicker.PermissionsHandler
 import org.wordpress.android.ui.utils.UiString
@@ -83,10 +87,12 @@ class MediaPickerViewModelTest : BaseUnitTest() {
     @Mock lateinit var mediaStore: MediaStore
     private lateinit var viewModel: MediaPickerViewModel
     private var uiStates = mutableListOf<MediaPickerUiState>()
+    private lateinit var actions: Channel<LoadAction>
     private var navigateEvents = mutableListOf<Event<MediaNavigationEvent>>()
     private val singleSelectMediaPickerSetup = buildMediaPickerSetup(false, setOf(IMAGE))
     private val multiSelectMediaPickerSetup = buildMediaPickerSetup(true, setOf(IMAGE, VIDEO))
     private val singleSelectVideoPickerSetup = buildMediaPickerSetup(false, setOf(VIDEO))
+    private val singleSelectAudioPickerSetup = buildMediaPickerSetup(false, setOf(AUDIO))
     private val multiSelectFilePickerSetup = buildMediaPickerSetup(true, setOf(IMAGE, VIDEO, AUDIO, DOCUMENT))
     private val site = SiteModel()
     private lateinit var firstItem: MediaItem
@@ -123,6 +129,7 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         whenever(mediaUtilsWrapper.getExtensionForMimeType("audio/mp3")).thenReturn("mp3")
         whenever(mediaUtilsWrapper.getExtensionForMimeType("video/mpeg")).thenReturn("mpg")
         whenever(mediaUtilsWrapper.getExtensionForMimeType("application/pdf")).thenReturn("pdf")
+        whenever(mediaUtilsWrapper.getSitePlanForMimeTypes(site)).thenReturn(MimeTypes.Plan.NO_PLAN_SPECIFIED)
         whenever(localeManagerWrapper.getLocale()).thenReturn(Locale.US)
     }
 
@@ -341,6 +348,20 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         )
     }
 
+    @Test
+    fun `action mode title is Use Audio when audio browser type`() = test {
+        setupViewModel(listOf(firstItem, secondItem), buildMediaPickerSetup(false, setOf(AUDIO)))
+
+        viewModel.refreshData(false)
+
+        selectItem(0)
+
+        assertActionModeVisible(
+                UiStringRes(R.string.photo_picker_use_audio),
+                EditActionUiModel(isVisible = true, isCounterBadgeVisible = false)
+        )
+    }
+
     @Test
     fun `action mode title is Select N items when multi selection available`() = test {
         whenever(resourceProvider.getString(R.string.cab_selected)).thenReturn("%d selected")
@@ -494,6 +515,27 @@ class MediaPickerViewModelTest : BaseUnitTest() {
                 .isEqualTo(ChooserContext.PHOTO_OR_VIDEO)
     }
 
+    @Test
+    fun `system picker opened for audio when allowed types is AUDIO only`() = test {
+        setupViewModel(listOf(), singleSelectAudioPickerSetup, true)
+
+        val iconClickEvents = mutableListOf<IconClickEvent>()
+
+        viewModel.onNavigate.observeForever {
+            it.peekContent().let { clickEvent ->
+                if (clickEvent is IconClickEvent) {
+                    iconClickEvents.add(clickEvent)
+                }
+            }
+        }
+
+        viewModel.onMenuItemClicked(SYSTEM_PICKER)
+
+        assertThat(iconClickEvents).hasSize(1)
+        assertThat(iconClickEvents[0].action is OpenSystemPicker).isTrue()
+        assertThat((iconClickEvents[0].action as OpenSystemPicker).chooserContext).isEqualTo(ChooserContext.AUDIO)
+    }
+
     @Test
     fun `system picker opened for all supported files when is browser picker`() = test {
         setupViewModel(listOf(), multiSelectFilePickerSetup, true)
@@ -542,12 +584,14 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         assertThat(iconClickEvents).hasSize(1)
         assertThat(iconClickEvents[0].action is SwitchMediaPicker).isTrue()
         val updatedMediaPickerSetup = (iconClickEvents[0].action as SwitchMediaPicker).mediaPickerSetup
-        assertThat(updatedMediaPickerSetup).isEqualTo(mediaPickerSetup.copy(
-                primaryDataSource = WP_LIBRARY,
-                availableDataSources = setOf(),
-                systemPickerEnabled = false,
-                cameraSetup = HIDDEN
-        ))
+        assertThat(updatedMediaPickerSetup).isEqualTo(
+                mediaPickerSetup.copy(
+                        primaryDataSource = WP_LIBRARY,
+                        availableDataSources = setOf(),
+                        systemPickerEnabled = false,
+                        cameraSetup = HIDDEN
+                )
+        )
     }
 
     @Test
@@ -574,12 +618,14 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         assertThat(iconClickEvents).hasSize(1)
         assertThat(iconClickEvents[0].action is SwitchMediaPicker).isTrue()
         val updatedMediaPickerSetup = (iconClickEvents[0].action as SwitchMediaPicker).mediaPickerSetup
-        assertThat(updatedMediaPickerSetup).isEqualTo(mediaPickerSetup.copy(
-                primaryDataSource = STOCK_LIBRARY,
-                availableDataSources = setOf(),
-                defaultSearchView = true,
-                systemPickerEnabled = false
-        ))
+        assertThat(updatedMediaPickerSetup).isEqualTo(
+                mediaPickerSetup.copy(
+                        primaryDataSource = STOCK_LIBRARY,
+                        availableDataSources = setOf(),
+                        defaultSearchView = true,
+                        systemPickerEnabled = false
+                )
+        )
     }
 
     @Test
@@ -637,6 +683,39 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         assertPhotoListUiStateData()
     }
 
+    @Test
+    fun `does not start loading without storage permissions`() = test {
+        setupViewModel(
+                listOf(firstItem),
+                singleSelectMediaPickerSetup.copy(requiresStoragePermissions = true),
+                hasStoragePermissions = false
+        )
+
+        assertThat(actions.poll()).isNull()
+    }
+
+    @Test
+    fun `starts loading with storage permissions`() = test {
+        setupViewModel(
+                listOf(firstItem),
+                singleSelectMediaPickerSetup.copy(requiresStoragePermissions = true),
+                hasStoragePermissions = true
+        )
+
+        assertThat(actions.poll()).isEqualTo(LoadAction.Start(null))
+    }
+
+    @Test
+    fun `starts loading when storage permissions not necessary`() = test {
+        setupViewModel(
+                listOf(firstItem),
+                singleSelectMediaPickerSetup.copy(requiresStoragePermissions = false),
+                hasStoragePermissions = false
+        )
+
+        assertThat(actions.poll()).isEqualTo(LoadAction.Start(null))
+    }
+
     private fun selectItem(position: Int) {
         when (val item = itemOnPosition(position)) {
             is PhotoItem -> item.toggleAction.toggle()
@@ -733,17 +812,21 @@ class MediaPickerViewModelTest : BaseUnitTest() {
     ) {
         whenever(permissionsHandler.hasStoragePermission()).thenReturn(hasStoragePermissions)
         whenever(mediaLoaderFactory.build(mediaPickerSetup, site)).thenReturn(mediaLoader)
-        whenever(mediaLoader.loadMedia(any())).thenReturn(flow {
-            if (null != domainModel) {
-                emit(
-                        DomainModel(
-                                domainModel,
-                                filter = filter,
-                                hasMore = hasMore
-                        )
-                )
+        doAnswer {
+            actions = it.getArgument(0)
+            return@doAnswer flow {
+                if (null != domainModel) {
+                    emit(
+                            DomainModel(
+                                    domainModel,
+                                    filter = filter,
+                                    hasMore = hasMore
+                            )
+                    )
+                }
             }
-        })
+        }.whenever(mediaLoader).loadMedia(any())
+
         whenever(mediaInsertHandlerFactory.build(mediaPickerSetup, site)).thenReturn(mediaInsertHandler)
 
         viewModel.start(listOf(), mediaPickerSetup, null, site)
@@ -825,12 +908,13 @@ class MediaPickerViewModelTest : BaseUnitTest() {
         canMultiselect: Boolean,
         allowedTypes: Set<MediaType>,
         cameraSetup: CameraSetup = HIDDEN,
-        editingEnabled: Boolean = true
+        editingEnabled: Boolean = true,
+        requiresStoragePermissions: Boolean = true
     ) = MediaPickerSetup(
             primaryDataSource = DEVICE,
             availableDataSources = setOf(),
             canMultiselect = canMultiselect,
-            requiresStoragePermissions = true,
+            requiresStoragePermissions = requiresStoragePermissions,
             allowedTypes = allowedTypes,
             cameraSetup = cameraSetup,
             systemPickerEnabled = true,
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilderTest.kt
index 8d915a76de45..d7446a8e8c7d 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/DeviceListBuilderTest.kt
@@ -9,6 +9,7 @@ import org.junit.Test
 import org.mockito.Mock
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.test
 import org.wordpress.android.ui.mediapicker.MediaItem.Identifier.LocalUri
 import org.wordpress.android.ui.mediapicker.MediaType
@@ -18,12 +19,15 @@ import org.wordpress.android.ui.mediapicker.loader.DeviceMediaLoader.DeviceMedia
 import org.wordpress.android.ui.mediapicker.loader.DeviceMediaLoader.DeviceMediaList
 import org.wordpress.android.ui.mediapicker.loader.MediaSource.MediaLoadingResult
 import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.MediaUtilsWrapper
 import org.wordpress.android.util.UriWrapper
 
 @InternalCoroutinesApi
 class DeviceListBuilderTest : BaseUnitTest() {
     @Mock lateinit var localeManagerWrapper: LocaleManagerWrapper
     @Mock lateinit var deviceMediaLoader: DeviceMediaLoader
+    @Mock lateinit var mediaUtilsWrapper: MediaUtilsWrapper
+    @Mock lateinit var site: SiteModel
     @Mock lateinit var uri1: UriWrapper
     @Mock lateinit var uri2: UriWrapper
     @Mock lateinit var uri3: UriWrapper
@@ -41,6 +45,7 @@ class DeviceListBuilderTest : BaseUnitTest() {
         newestItem = DeviceMediaItem(uri1, "Newest item", 10)
         middleItem = DeviceMediaItem(uri2, "Middle item", 9)
         oldestItem = DeviceMediaItem(uri3, "Oldest item", 8)
+        whenever(mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(any(), any())).thenReturn(true)
     }
 
     @Test
@@ -109,6 +114,35 @@ class DeviceListBuilderTest : BaseUnitTest() {
         }
     }
 
+    @Test
+    fun `media - loads first page when isMimeTypeSupportedBySitePlan is true`() = test {
+        setUp(setOf(mediaType))
+        setupMedia(mediaType, null, DeviceMediaList(listOf(newestItem)))
+        whenever(deviceMediaLoader.getMimeType(any())).thenReturn(mediaMimeType)
+        whenever(mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(any(), any())).thenReturn(true)
+
+        val result = deviceListBuilder.load(forced = false, loadMore = false, filter = null)
+
+        (result as MediaLoadingResult.Success).apply {
+            assertThat(this.data).hasSize(1)
+            assertMediaItem(newestItem)
+        }
+    }
+
+    @Test
+    fun `media - loads first page with no results when isMimeTypeSupportedBySitePlan is false`() = test {
+        setUp(setOf(mediaType))
+        setupMedia(mediaType, null, DeviceMediaList(listOf(newestItem)))
+        whenever(deviceMediaLoader.getMimeType(any())).thenReturn(mediaMimeType)
+        whenever(mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(any(), any())).thenReturn(false)
+
+        val result = deviceListBuilder.load(forced = false, loadMore = false, filter = null)
+
+        (result as MediaLoadingResult.Success).apply {
+            assertThat(this.data).isEmpty()
+        }
+    }
+
     @Test
     fun `document - loads first page and has more is false when next item is missing`() = test {
         setUp(setOf(DOCUMENT))
@@ -232,6 +266,35 @@ class DeviceListBuilderTest : BaseUnitTest() {
         }
     }
 
+    @Test
+    fun `document - loads first page when isMimeTypeSupportedBySitePlan is true`() = test {
+        setUp(setOf(DOCUMENT))
+        setupDocuments(null, DeviceMediaList(listOf(newestItem)))
+        whenever(deviceMediaLoader.getMimeType(any())).thenReturn(documentMimeType)
+        whenever(mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(any(), any())).thenReturn(true)
+
+        val result = deviceListBuilder.load(forced = false, loadMore = false, filter = null)
+
+        (result as MediaLoadingResult.Success).apply {
+            assertThat(this.data).hasSize(1)
+            assertDocumentItem(newestItem)
+        }
+    }
+
+    @Test
+    fun `document - loads first page with no results when isMimeTypeSupportedBySitePlan is false`() = test {
+        setUp(setOf(DOCUMENT))
+        setupDocuments(null, DeviceMediaList(listOf(newestItem)))
+        whenever(deviceMediaLoader.getMimeType(any())).thenReturn(documentMimeType)
+        whenever(mediaUtilsWrapper.isMimeTypeSupportedBySitePlan(any(), any())).thenReturn(false)
+
+        val result = deviceListBuilder.load(forced = false, loadMore = false, filter = null)
+
+        (result as MediaLoadingResult.Success).apply {
+            assertThat(this.data).isEmpty()
+        }
+    }
+
     private fun setupMedia(type: MediaType, nextTimestamp: Long?, results: DeviceMediaList) {
         whenever(deviceMediaLoader.loadMedia(type, null, pageSize, nextTimestamp)).thenReturn(
                 results
@@ -248,6 +311,8 @@ class DeviceListBuilderTest : BaseUnitTest() {
         deviceListBuilder = DeviceListBuilder(
                 localeManagerWrapper,
                 deviceMediaLoader,
+                mediaUtilsWrapper,
+                site,
                 TEST_DISPATCHER,
                 allowedTypes,
                 pageSize
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactoryTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactoryTest.kt
index 99639cfbfee7..db6ed262b615 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactoryTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mediapicker/loader/MediaLoaderFactoryTest.kt
@@ -60,7 +60,7 @@ class MediaLoaderFactoryTest {
                 defaultSearchView = false,
                 title = string.wp_media_title
         )
-        whenever(deviceListBuilderFactory.build(setOf())).thenReturn(deviceListBuilder)
+        whenever(deviceListBuilderFactory.build(setOf(), site)).thenReturn(deviceListBuilder)
         val mediaLoader = mediaLoaderFactory.build(mediaPickerSetup, site)
 
         assertThat(mediaLoader).isEqualTo(
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/CurrentAvatarSourceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/CurrentAvatarSourceTest.kt
new file mode 100644
index 000000000000..2afeff6240a7
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/CurrentAvatarSourceTest.kt
@@ -0,0 +1,46 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.AccountModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.test
+import org.wordpress.android.testScope
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.CurrentAvatarUrl
+
+class CurrentAvatarSourceTest : BaseUnitTest() {
+    @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var accountModel: AccountModel
+    private lateinit var currentAvatarSource: CurrentAvatarSource
+
+    @Before
+    fun setUp() {
+        currentAvatarSource = CurrentAvatarSource(accountStore)
+    }
+
+    @Test
+    fun `current avatar is empty on start`() = test {
+        var result: CurrentAvatarUrl? = null
+        currentAvatarSource.buildSource(testScope()).observeForever { it?.let { result = it } }
+
+        assertThat(result!!.url).isEqualTo("")
+    }
+
+    @Test
+    fun `current avatar is loaded on refresh from account store`() = test {
+        whenever(accountStore.account).thenReturn(accountModel)
+        val avatarUrl = "avatar.jpg"
+        whenever(accountModel.avatarUrl).thenReturn(avatarUrl)
+
+        var result: CurrentAvatarUrl? = null
+        currentAvatarSource.buildSource(testScope()).observeForever { it?.let { result = it } }
+
+        currentAvatarSource.refresh()
+
+        assertThat(result!!.url).isEqualTo(avatarUrl)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/DomainRegistrationHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/DomainRegistrationHandlerTest.kt
new file mode 100644
index 000000000000..f58a536c3d43
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/DomainRegistrationHandlerTest.kt
@@ -0,0 +1,142 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.PlanModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched
+import org.wordpress.android.fluxc.store.SiteStore.PlansError
+import org.wordpress.android.fluxc.store.SiteStore.PlansErrorType
+import org.wordpress.android.fluxc.store.SiteStore.PlansErrorType.GENERIC_ERROR
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.test
+import org.wordpress.android.testScope
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DomainCreditAvailable
+import org.wordpress.android.ui.plans.PlansConstants.PREMIUM_PLAN_ID
+import org.wordpress.android.util.SiteUtilsWrapper
+
+class DomainRegistrationHandlerTest : BaseUnitTest() {
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock lateinit var appLogWrapper: AppLogWrapper
+    @Mock lateinit var siteUtils: SiteUtilsWrapper
+    private val siteId = 1
+    private val site = SiteModel()
+    private lateinit var result: MutableList<DomainCreditAvailable>
+    private lateinit var handler: DomainRegistrationHandler
+
+    @InternalCoroutinesApi
+    @Before
+    fun setUp() {
+        handler = DomainRegistrationHandler(
+                TEST_DISPATCHER,
+                dispatcher,
+                selectedSiteRepository,
+                appLogWrapper,
+                siteUtils
+        )
+        site.id = siteId
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        result = mutableListOf()
+    }
+
+    @Test
+    fun `when site is free, emit false and don't fetch`() = test {
+        setupSite(site = site, isFree = true, hasCustomDomain = false)
+
+        assertThat(result.last().isDomainCreditAvailable).isFalse
+
+        verify(dispatcher, never()).dispatch(any())
+    }
+
+    @Test
+    fun `when site has custom domain, emit false and don't fetch`() = test {
+        setupSite(site = site, isFree = false, hasCustomDomain = true)
+
+        assertThat(result.last().isDomainCreditAvailable).isFalse
+
+        verify(dispatcher, never()).dispatch(any())
+    }
+
+    @Test
+    fun `when fetched site has a plan with credits, start to fetch and emit true`() = test {
+        setupSite(site = site, currentPlan = buildPlan(hasDomainCredit = true))
+
+        assertThat(result.last().isDomainCreditAvailable).isTrue
+
+        verify(dispatcher, times(1)).dispatch(any())
+    }
+
+    @Test
+    fun `when fetched site doesn't have a plan with credits, start to fetch and emit false`() = test {
+        setupSite(site = site, currentPlan = buildPlan(hasDomainCredit = false))
+
+        assertThat(result.last().isDomainCreditAvailable).isFalse
+    }
+
+    @Test
+    fun `when fetched site is different from currently selected site, don't emit value`() = test {
+        val selectedSite = SiteModel().apply { id = 1 }
+
+        setupSite(site = selectedSite, currentPlan = buildPlan(hasDomainCredit = false))
+
+        val fetchedSite = SiteModel().apply { id = 2 }
+
+        buildOnPlansFetchedEvent(site = fetchedSite, currentPlan = buildPlan(hasDomainCredit = true))?.let { event ->
+            handler.onPlansFetched(event)
+        }
+
+        assertThat(result.last().isDomainCreditAvailable).isFalse
+    }
+
+    @Test
+    fun `when fetch fails, don't emit value`() = test {
+        setupSite(site = site, error = GENERIC_ERROR)
+
+        assertThat(result.count()).isEqualTo(0)
+    }
+
+    private fun setupSite(
+        site: SiteModel,
+        isFree: Boolean = false,
+        hasCustomDomain: Boolean = false,
+        currentPlan: PlanModel? = null,
+        error: PlansErrorType? = null
+    ) {
+        whenever(siteUtils.onFreePlan(any())).thenReturn(isFree)
+        whenever(siteUtils.hasCustomDomain(any())).thenReturn(hasCustomDomain)
+        buildOnPlansFetchedEvent(site, currentPlan, error)?.let { event ->
+            whenever(dispatcher.dispatch(any())).then { handler.onPlansFetched(event) }
+        }
+        handler.buildSource(testScope(), siteId).observeForever { result.add(it) }
+    }
+
+    private fun buildOnPlansFetchedEvent(
+        site: SiteModel,
+        currentPlan: PlanModel? = null,
+        error: PlansErrorType? = null
+    ) = if (currentPlan != null || error != null) {
+        OnPlansFetched(site, currentPlan?.let { listOf(it) }, error?.let { PlansError(it) })
+    } else {
+        null
+    }
+
+    private fun buildPlan(hasDomainCredit: Boolean) = PlanModel(
+            productId = PREMIUM_PLAN_ID.toInt(),
+            productSlug = null,
+            productName = null,
+            isCurrentPlan = true,
+            hasDomainCredit = hasDomainCredit
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteItemTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteItemTest.kt
new file mode 100644
index 000000000000..cbd04b2ca869
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteItemTest.kt
@@ -0,0 +1,116 @@
+package org.wordpress.android.ui.mysite
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.wordpress.android.R.color
+import org.wordpress.android.R.drawable
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.mysite.MySiteItem.DomainRegistrationBlock
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard
+import org.wordpress.android.ui.mysite.MySiteItem.ListItem
+import org.wordpress.android.ui.mysite.MySiteItem.QuickActionsBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock.IconState.Visible
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringText
+
+class MySiteItemTest {
+    private val interaction = ListItemInteraction.create { }
+
+    @Test
+    fun `site info block is active when focus point on title`() {
+        val siteInfoBlock = initSiteInfoBlock(showTitleFocusPoint = true)
+
+        assertThat(siteInfoBlock.activeQuickStartItem).isTrue()
+    }
+
+    @Test
+    fun `site info block is active when focus point on icon`() {
+        val siteInfoBlock = initSiteInfoBlock(showIconFocusPoint = true)
+
+        assertThat(siteInfoBlock.activeQuickStartItem).isTrue()
+    }
+
+    @Test
+    fun `site info block is not active when focus point not added`() {
+        val siteInfoBlock = initSiteInfoBlock()
+
+        assertThat(siteInfoBlock.activeQuickStartItem).isFalse()
+    }
+
+    private fun initSiteInfoBlock(
+        showTitleFocusPoint: Boolean = false,
+        showIconFocusPoint: Boolean = false
+    ): SiteInfoBlock {
+        return SiteInfoBlock(
+                title = "test",
+                url = "url",
+                iconState = Visible(null),
+                showTitleFocusPoint = showTitleFocusPoint,
+                showIconFocusPoint = showIconFocusPoint,
+                onTitleClick = null,
+                onIconClick = interaction,
+                onUrlClick = interaction,
+                onSwitchSiteClick = interaction
+        )
+    }
+
+    @Test
+    fun `quick actions block is never active`() {
+        val quickActionsBlock = QuickActionsBlock(interaction, interaction, interaction, interaction, true)
+
+        assertThat(quickActionsBlock.activeQuickStartItem).isFalse()
+    }
+
+    @Test
+    fun `domain registration block is never active`() {
+        val domainRegistrationBlock = DomainRegistrationBlock(interaction)
+
+        assertThat(domainRegistrationBlock.activeQuickStartItem).isFalse()
+    }
+
+    @Test
+    fun `quick start card is never active`() {
+        val quickStartCard = QuickStartCard(
+                GROW_QUICK_START,
+                UiStringText("title"),
+                listOf(),
+                color.pink_40,
+                0,
+                interaction
+        )
+
+        assertThat(quickStartCard.activeQuickStartItem).isFalse()
+    }
+
+    @Test
+    fun `category header is never active`() {
+        val categoryHeader = CategoryHeader(UiStringText("title"))
+
+        assertThat(categoryHeader.activeQuickStartItem).isFalse()
+    }
+
+    @Test
+    fun `list item is active when shows focus point`() {
+        val listItem = initListItem(showFocusPoint = true)
+
+        assertThat(listItem.activeQuickStartItem).isTrue()
+    }
+
+    @Test
+    fun `list item is not active when does not show focus point`() {
+        val listItem = initListItem(showFocusPoint = false)
+
+        assertThat(listItem.activeQuickStartItem).isFalse()
+    }
+
+    private fun initListItem(showFocusPoint: Boolean) = ListItem(
+            primaryIcon = drawable.ic_dropdown_primary_30_24dp,
+            primaryText = UiStringText("title"),
+            secondaryIcon = null,
+            secondaryText = null,
+            showFocusPoint = showFocusPoint,
+            onClick = interaction
+    )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt
new file mode 100644
index 000000000000..59be59077d35
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/MySiteViewModelTest.kt
@@ -0,0 +1,1030 @@
+package org.wordpress.android.ui.mysite
+
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doAnswer
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_PROMPT_SHOWN
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_REDEMPTION_SUCCESS
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.DOMAIN_CREDIT_REDEMPTION_TAPPED
+import org.wordpress.android.fluxc.model.DynamicCardType.CUSTOMIZE_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CHECK_STATS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EXPLORE_PLANS
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.REVIEW_PAGES
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPLOAD_SITE_ICON
+import org.wordpress.android.test
+import org.wordpress.android.ui.mysite.ListItemAction.ACTIVITY_LOG
+import org.wordpress.android.ui.mysite.ListItemAction.ADMIN
+import org.wordpress.android.ui.mysite.ListItemAction.COMMENTS
+import org.wordpress.android.ui.mysite.ListItemAction.MEDIA
+import org.wordpress.android.ui.mysite.ListItemAction.PAGES
+import org.wordpress.android.ui.mysite.ListItemAction.PLAN
+import org.wordpress.android.ui.mysite.ListItemAction.PLUGINS
+import org.wordpress.android.ui.mysite.ListItemAction.POSTS
+import org.wordpress.android.ui.mysite.ListItemAction.SCAN
+import org.wordpress.android.ui.mysite.ListItemAction.SHARING
+import org.wordpress.android.ui.mysite.ListItemAction.SITE_SETTINGS
+import org.wordpress.android.ui.mysite.ListItemAction.STATS
+import org.wordpress.android.ui.mysite.ListItemAction.THEMES
+import org.wordpress.android.ui.mysite.ListItemAction.VIEW_SITE
+import org.wordpress.android.ui.mysite.MySiteItem.DomainRegistrationBlock
+import org.wordpress.android.ui.mysite.MySiteItem.QuickActionsBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock
+import org.wordpress.android.ui.mysite.MySiteItem.SiteInfoBlock.IconState
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.CurrentAvatarUrl
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DomainCreditAvailable
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DynamicCardsUpdate
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.JetpackCapabilities
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.QuickStartUpdate
+import org.wordpress.android.ui.mysite.MySiteViewModel.State.NoSites
+import org.wordpress.android.ui.mysite.MySiteViewModel.State.SiteSelected
+import org.wordpress.android.ui.mysite.MySiteViewModel.TextInputDialogModel
+import org.wordpress.android.ui.mysite.MySiteViewModel.UiModel
+import org.wordpress.android.ui.mysite.MySiteViewModelTest.SiteInfoBlockAction.ICON_CLICK
+import org.wordpress.android.ui.mysite.MySiteViewModelTest.SiteInfoBlockAction.SWITCH_SITE_CLICK
+import org.wordpress.android.ui.mysite.MySiteViewModelTest.SiteInfoBlockAction.TITLE_CLICK
+import org.wordpress.android.ui.mysite.MySiteViewModelTest.SiteInfoBlockAction.URL_CLICK
+import org.wordpress.android.ui.mysite.SiteDialogModel.AddSiteIconDialogModel
+import org.wordpress.android.ui.mysite.SiteDialogModel.ChangeSiteIconDialogModel
+import org.wordpress.android.ui.mysite.SiteNavigationAction.AddNewSite
+import org.wordpress.android.ui.mysite.SiteNavigationAction.ConnectJetpackForStats
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenActivityLog
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenAdmin
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenComments
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenDomainRegistration
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMeScreen
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenMedia
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPages
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPlan
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPlugins
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenPosts
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenScan
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSharing
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSite
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSitePicker
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenSiteSettings
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenStats
+import org.wordpress.android.ui.mysite.SiteNavigationAction.OpenThemes
+import org.wordpress.android.ui.mysite.SiteNavigationAction.StartWPComLoginForJetpackStats
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardsSource
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.BuildConfigWrapper
+import org.wordpress.android.util.DisplayUtilsWrapper
+import org.wordpress.android.util.FluxCUtilsWrapper
+import org.wordpress.android.util.MediaUtilsWrapper
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.WPMediaUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+
+@ExperimentalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class MySiteViewModelTest : BaseUnitTest() {
+    @Mock lateinit var siteInfoBlockBuilder: SiteInfoBlockBuilder
+    @Mock lateinit var siteItemsBuilder: SiteItemsBuilder
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock lateinit var wpMediaUtilsWrapper: WPMediaUtilsWrapper
+    @Mock lateinit var mediaUtilsWrapper: MediaUtilsWrapper
+    @Mock lateinit var fluxCUtilsWrapper: FluxCUtilsWrapper
+    @Mock lateinit var contextProvider: ContextProvider
+    @Mock lateinit var siteIconUploadHandler: SiteIconUploadHandler
+    @Mock lateinit var siteStoriesHandler: SiteStoriesHandler
+    @Mock lateinit var domainRegistrationHandler: DomainRegistrationHandler
+    @Mock lateinit var displayUtilsWrapper: DisplayUtilsWrapper
+    @Mock lateinit var quickStartRepository: QuickStartRepository
+    @Mock lateinit var quickStartItemBuilder: QuickStartItemBuilder
+    @Mock lateinit var scanAndBackupSource: ScanAndBackupSource
+    @Mock lateinit var currentAvatarSource: CurrentAvatarSource
+    @Mock lateinit var dynamicCardsSource: DynamicCardsSource
+    @Mock lateinit var buildConfigWrapper: BuildConfigWrapper
+    private lateinit var viewModel: MySiteViewModel
+    private lateinit var uiModels: MutableList<UiModel>
+    private lateinit var snackbars: MutableList<SnackbarMessageHolder>
+    private lateinit var textInputDialogModels: MutableList<TextInputDialogModel>
+    private lateinit var dialogModels: MutableList<SiteDialogModel>
+    private lateinit var navigationActions: MutableList<SiteNavigationAction>
+    private val avatarUrl = "https://1.gravatar.com/avatar/1000?s=96&d=identicon"
+    private val siteId = 1
+    private val siteUrl = "http://site.com"
+    private val siteIcon = "http://site.com/icon.jpg"
+    private val siteName = "Site"
+    private val emailAddress = "test@email.com"
+    private lateinit var site: SiteModel
+    private lateinit var siteInfoBlock: SiteInfoBlock
+    private val onSiteChange = MutableLiveData<SiteModel>()
+    private val onSiteSelected = MutableLiveData<Int>()
+    private val onShowSiteIconProgressBar = MutableLiveData<Boolean>()
+    private val isDomainCreditAvailable = MutableLiveData(DomainCreditAvailable(false))
+    private val jetpackCapabilities = MutableLiveData(JetpackCapabilities(false, false))
+    private val currentAvatar = MutableLiveData(CurrentAvatarUrl(""))
+    private val quickStartUpdate = MutableLiveData(QuickStartUpdate())
+    private val activeTask = MutableLiveData<QuickStartTask>()
+    private val dynamicCards = MutableLiveData(
+            DynamicCardsUpdate(
+                    cards = listOf(
+                            CUSTOMIZE_QUICK_START,
+                            GROW_QUICK_START
+                    )
+            )
+    )
+
+    @InternalCoroutinesApi
+    @Before
+    fun setUp() = test {
+        onSiteChange.value = null
+        onShowSiteIconProgressBar.value = null
+        onSiteSelected.value = null
+        whenever(domainRegistrationHandler.buildSource(any(), any())).thenReturn(isDomainCreditAvailable)
+        whenever(scanAndBackupSource.buildSource(any(), any())).thenReturn(jetpackCapabilities)
+        whenever(currentAvatarSource.buildSource(any())).thenReturn(currentAvatar)
+        whenever(currentAvatarSource.buildSource(any(), any())).thenReturn(currentAvatar)
+        whenever(quickStartRepository.buildSource(any(), any())).thenReturn(quickStartUpdate)
+        whenever(dynamicCardsSource.buildSource(any(), any())).thenReturn(dynamicCards)
+        whenever(selectedSiteRepository.selectedSiteChange).thenReturn(onSiteChange)
+        whenever(selectedSiteRepository.siteSelected).thenReturn(onSiteSelected)
+        whenever(selectedSiteRepository.showSiteIconProgressBar).thenReturn(onShowSiteIconProgressBar)
+        whenever(quickStartRepository.activeTask).thenReturn(activeTask)
+        viewModel = MySiteViewModel(
+                networkUtilsWrapper,
+                TEST_DISPATCHER,
+                TEST_DISPATCHER,
+                analyticsTrackerWrapper,
+                siteInfoBlockBuilder,
+                siteItemsBuilder,
+                accountStore,
+                selectedSiteRepository,
+                wpMediaUtilsWrapper,
+                mediaUtilsWrapper,
+                fluxCUtilsWrapper,
+                contextProvider,
+                siteIconUploadHandler,
+                siteStoriesHandler,
+                domainRegistrationHandler,
+                scanAndBackupSource,
+                displayUtilsWrapper,
+                quickStartRepository,
+                quickStartItemBuilder,
+                currentAvatarSource,
+                dynamicCardsSource,
+                buildConfigWrapper
+        )
+        uiModels = mutableListOf()
+        snackbars = mutableListOf()
+        textInputDialogModels = mutableListOf()
+        dialogModels = mutableListOf()
+        navigationActions = mutableListOf()
+        launch(Dispatchers.Default) {
+            viewModel.uiModel.observeForever {
+                uiModels.add(it)
+            }
+        }
+        viewModel.onSnackbarMessage.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                snackbars.add(it)
+            }
+        }
+        viewModel.onTextInputDialogShown.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                textInputDialogModels.add(it)
+            }
+        }
+        viewModel.onBasicDialogShown.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                dialogModels.add(it)
+            }
+        }
+        viewModel.onNavigation.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                navigationActions.add(it)
+            }
+        }
+        site = SiteModel()
+        site.id = siteId
+        site.url = siteUrl
+        site.name = siteName
+        site.iconUrl = siteIcon
+
+        siteInfoBlock = SiteInfoBlock(
+                title = siteName,
+                url = siteUrl,
+                iconState = IconState.Visible(siteIcon),
+                showTitleFocusPoint = false,
+                showIconFocusPoint = false,
+                onTitleClick = mock(),
+                onIconClick = mock(),
+                onUrlClick = mock(),
+                onSwitchSiteClick = mock()
+        )
+
+        doAnswer {
+            siteInfoBlock = siteInfoBlock.copy(
+                    onTitleClick = ListItemInteraction.create { (it.getArgument(2) as () -> Unit).invoke() },
+                    onIconClick = ListItemInteraction.create { (it.getArgument(3) as () -> Unit).invoke() },
+                    onUrlClick = ListItemInteraction.create { (it.getArgument(4) as () -> Unit).invoke() },
+                    onSwitchSiteClick = ListItemInteraction.create {
+                        (it.getArgument(5) as () -> Unit).invoke()
+                    }
+            )
+            siteInfoBlock
+        }.whenever(siteInfoBlockBuilder).buildSiteInfoBlock(
+                site = any(),
+                showSiteIconProgressBar = any(),
+                titleClick = any(),
+                iconClick = any(),
+                urlClick = any(),
+                switchSiteClick = any(),
+                showUpdateSiteTitleFocusPoint = any(),
+                showUploadSiteIconFocusPoint = any()
+        )
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `model is empty with no selected site`() {
+        onSiteSelected.value = null
+        currentAvatar.value = CurrentAvatarUrl("")
+
+        assertThat(uiModels.last().state).isInstanceOf(NoSites::class.java)
+    }
+
+    @Test
+    fun `model contains header of selected site`() {
+        initSelectedSite()
+
+        assertThat(uiModels.last().state).isInstanceOf(SiteSelected::class.java)
+
+        assertThat(getLastItems()).hasSize(2)
+        assertThat(getLastItems().first()).isInstanceOf(SiteInfoBlock::class.java)
+    }
+
+    @Test
+    fun `site block title click shows snackbar message when network not available`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        invokeSiteInfoBlockAction(TITLE_CLICK)
+
+        assertThat(textInputDialogModels).isEmpty()
+        assertThat(snackbars).containsOnly(
+                SnackbarMessageHolder(UiStringRes(R.string.error_network_connection))
+        )
+    }
+
+    @Test
+    fun `site block title click shows snackbar message when hasCapabilityManageOptions is false`() = test {
+        site.hasCapabilityManageOptions = false
+        site.origin = SiteModel.ORIGIN_WPCOM_REST
+
+        invokeSiteInfoBlockAction(TITLE_CLICK)
+
+        assertThat(textInputDialogModels).isEmpty()
+        assertThat(snackbars).containsOnly(
+                SnackbarMessageHolder(
+                        UiStringRes(R.string.my_site_title_changer_dialog_not_allowed_hint)
+                )
+        )
+    }
+
+    @Test
+    fun `site block title click shows snackbar message when origin not ORIGIN_WPCOM_REST`() = test {
+        site.hasCapabilityManageOptions = true
+        site.origin = SiteModel.ORIGIN_XMLRPC
+
+        invokeSiteInfoBlockAction(TITLE_CLICK)
+
+        assertThat(textInputDialogModels).isEmpty()
+        assertThat(snackbars).containsOnly(
+                SnackbarMessageHolder(UiStringRes(R.string.my_site_title_changer_dialog_not_allowed_hint))
+        )
+    }
+
+    @Test
+    fun `site block title click shows input dialog when editing allowed`() = test {
+        site.hasCapabilityManageOptions = true
+        site.origin = SiteModel.ORIGIN_WPCOM_REST
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+
+        invokeSiteInfoBlockAction(TITLE_CLICK)
+
+        assertThat(snackbars).isEmpty()
+        assertThat(textInputDialogModels.last()).isEqualTo(
+                TextInputDialogModel(
+                        callbackId = MySiteViewModel.SITE_NAME_CHANGE_CALLBACK_ID,
+                        title = R.string.my_site_title_changer_dialog_title,
+                        initialText = siteName,
+                        hint = R.string.my_site_title_changer_dialog_hint,
+                        isMultiline = false,
+                        isInputEnabled = true
+                )
+        )
+    }
+
+    @Test
+    fun `site block icon click shows change icon dialog when site has icon`() = test {
+        site.hasCapabilityManageOptions = true
+        site.hasCapabilityUploadFiles = true
+        site.iconUrl = siteIcon
+
+        invokeSiteInfoBlockAction(ICON_CLICK)
+
+        assertThat(dialogModels.last()).isEqualTo(ChangeSiteIconDialogModel)
+    }
+
+    @Test
+    fun `site block icon click shows add icon dialog when site doesn't have icon`() = test {
+        site.hasCapabilityManageOptions = true
+        site.hasCapabilityUploadFiles = true
+        site.iconUrl = null
+
+        invokeSiteInfoBlockAction(ICON_CLICK)
+
+        assertThat(dialogModels.last()).isEqualTo(AddSiteIconDialogModel)
+    }
+
+    @Test
+    fun `site block icon click shows snackbar when upload files not allowed and site doesn't have Jetpack`() = test {
+        site.hasCapabilityManageOptions = true
+        site.hasCapabilityUploadFiles = false
+        site.setIsWPCom(false)
+
+        invokeSiteInfoBlockAction(ICON_CLICK)
+
+        assertThat(dialogModels).isEmpty()
+        assertThat(snackbars).containsOnly(
+                SnackbarMessageHolder(UiStringRes(R.string.my_site_icon_dialog_change_requires_jetpack_message))
+        )
+    }
+
+    @Test
+    fun `site block icon click shows snackbar when upload files not allowed and site has icon`() = test {
+        site.hasCapabilityManageOptions = true
+        site.hasCapabilityUploadFiles = false
+        site.setIsWPCom(true)
+        site.iconUrl = siteIcon
+
+        invokeSiteInfoBlockAction(ICON_CLICK)
+
+        assertThat(dialogModels).isEmpty()
+        assertThat(snackbars).containsOnly(
+                SnackbarMessageHolder(UiStringRes(R.string.my_site_icon_dialog_change_requires_permission_message))
+        )
+    }
+
+    @Test
+    fun `site block icon click shows snackbar when upload files not allowed and site does not have icon`() = test {
+        site.hasCapabilityManageOptions = true
+        site.hasCapabilityUploadFiles = false
+        site.setIsWPCom(true)
+        site.iconUrl = null
+
+        invokeSiteInfoBlockAction(ICON_CLICK)
+
+        assertThat(dialogModels).isEmpty()
+        assertThat(snackbars).containsOnly(
+                SnackbarMessageHolder(UiStringRes(R.string.my_site_icon_dialog_add_requires_permission_message))
+        )
+    }
+
+    @Test
+    fun `on site name chosen updates title if network available `() = test {
+        val title = "updated site name"
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+
+        viewModel.onSiteNameChosen(title)
+
+        verify(selectedSiteRepository).updateTitle(title)
+    }
+
+    @Test
+    fun `on site name chosen shows snackbar if network not available `() = test {
+        val title = "updated site name"
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        viewModel.onSiteNameChosen(title)
+
+        verify(selectedSiteRepository, never()).updateTitle(any())
+        assertThat(snackbars).containsOnly(SnackbarMessageHolder(UiStringRes(R.string.error_update_site_title_network)))
+    }
+
+    @Test
+    fun `site block url click opens site`() = test {
+        invokeSiteInfoBlockAction(URL_CLICK)
+
+        assertThat(navigationActions).containsOnly(OpenSite(site))
+    }
+
+    @Test
+    fun `site block switch click opens site picker`() = test {
+        invokeSiteInfoBlockAction(SWITCH_SITE_CLICK)
+
+        assertThat(navigationActions).containsOnly(OpenSitePicker(site))
+    }
+
+    @Test
+    fun `passes active UPDATE_SITE_TITLE into site info block builder`() = test {
+        initSelectedSite()
+
+        whenever(
+                siteInfoBlockBuilder.buildSiteInfoBlock(
+                        site = eq(site),
+                        showSiteIconProgressBar = any(),
+                        titleClick = any(),
+                        iconClick = any(),
+                        urlClick = any(),
+                        switchSiteClick = any(),
+                        showUpdateSiteTitleFocusPoint = any(),
+                        showUploadSiteIconFocusPoint = any()
+                )
+        ).thenReturn(
+                siteInfoBlock.copy(showTitleFocusPoint = true)
+        )
+
+        quickStartUpdate.value = QuickStartUpdate(UPDATE_SITE_TITLE, listOf())
+
+        assertThat(findSiteInfoBlock()!!.showTitleFocusPoint).isTrue()
+    }
+
+    @Test
+    fun `passes active UPLOAD_SITE_ICON into site info block builder`() {
+        initSelectedSite()
+
+        whenever(
+                siteInfoBlockBuilder.buildSiteInfoBlock(
+                        site = eq(site),
+                        showSiteIconProgressBar = any(),
+                        titleClick = any(),
+                        iconClick = any(),
+                        urlClick = any(),
+                        switchSiteClick = any(),
+                        showUpdateSiteTitleFocusPoint = eq(false),
+                        showUploadSiteIconFocusPoint = eq(true)
+                )
+        ).thenReturn(
+                siteInfoBlock.copy(showIconFocusPoint = true)
+        )
+
+        quickStartUpdate.value = QuickStartUpdate(UPLOAD_SITE_ICON, listOf())
+
+        assertThat(findSiteInfoBlock()!!.showIconFocusPoint).isTrue()
+    }
+
+    @Test
+    fun `account avatar url value is emitted and updated from the source`() {
+        initSelectedSite()
+
+        currentAvatar.value = CurrentAvatarUrl(avatarUrl)
+
+        assertThat(uiModels.last().accountAvatarUrl).isEqualTo(avatarUrl)
+    }
+
+    @Test
+    fun `avatar press opens me screen`() {
+        viewModel.onAvatarPressed()
+
+        assertThat(navigationActions).containsOnly(OpenMeScreen)
+    }
+
+    @Test
+    fun `quick actions does not show pages button when site doesn't have the required capability`() {
+        site.hasCapabilityEditPages = false
+
+        initSelectedSite()
+
+        val quickActionsBlock = findQuickActionsBlock()
+
+        assertThat(quickActionsBlock).isNotNull
+        assertThat(quickActionsBlock?.showPages).isFalse
+    }
+
+    @Test
+    fun `quick action stats click opens stats screen when user is logged in and site is WPCOM`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+
+        site.setIsWPCom(true)
+
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onStatsClick?.click()
+
+        assertThat(navigationActions).containsOnly(OpenStats(site))
+    }
+
+    @Test
+    fun `quick action stats click opens stats screen when user is logged in and site is Jetpack`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+
+        site.setIsJetpackInstalled(true)
+        site.setIsJetpackConnected(true)
+
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onStatsClick?.click()
+
+        assertThat(navigationActions).containsOnly(OpenStats(site))
+    }
+
+    @Test
+    fun `quick action stats click opens connect jetpack screen when user is logged in and site is self-hosted`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+
+        site.setIsJetpackInstalled(false)
+        site.setIsJetpackConnected(false)
+
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onStatsClick?.click()
+
+        assertThat(navigationActions).containsOnly(ConnectJetpackForStats(site))
+    }
+
+    @Test
+    fun `quick action stats click starts login when user is not logged in and site is Jetpack`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+
+        site.setIsJetpackInstalled(true)
+        site.setIsJetpackConnected(true)
+
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onStatsClick?.click()
+
+        assertThat(navigationActions).containsOnly(StartWPComLoginForJetpackStats)
+    }
+
+    @Test
+    fun `quick action stats click opens connect jetpack screen when user is not logged in and site is self-hosted`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+
+        site.setIsJetpackInstalled(false)
+        site.setIsJetpackConnected(false)
+
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onStatsClick?.click()
+
+        assertThat(navigationActions).containsOnly(ConnectJetpackForStats(site))
+    }
+
+    @Test
+    fun `quick action stats click completes CHECK_STATS task`() {
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onStatsClick?.click()
+
+        verify(quickStartRepository).completeTask(CHECK_STATS)
+    }
+
+    @Test
+    fun `quick action pages click opens pages screen and requests next step of EDIT_HOMEPAGE task`() {
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onPagesClick?.click()
+
+        verify(quickStartRepository).requestNextStepOfTask(EDIT_HOMEPAGE)
+        assertThat(navigationActions).containsOnly(OpenPages(site))
+    }
+
+    @Test
+    fun `quick action pages click opens pages screen and completes REVIEW_PAGES task`() {
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onPagesClick?.click()
+
+        verify(quickStartRepository).completeTask(REVIEW_PAGES)
+        assertThat(navigationActions).containsOnly(OpenPages(site))
+    }
+
+    @Test
+    fun `quick action posts click opens posts screen`() {
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onPostsClick?.click()
+
+        assertThat(navigationActions).containsOnly(OpenPosts(site))
+    }
+
+    @Test
+    fun `quick action media click opens media screen`() {
+        initSelectedSite()
+
+        findQuickActionsBlock()?.onMediaClick?.click()
+
+        assertThat(navigationActions).containsOnly(OpenMedia(site))
+    }
+
+    @Test
+    fun `handling successful login result opens stats screen`() {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+
+        viewModel.handleSuccessfulLoginResult()
+
+        assertThat(navigationActions).containsOnly(OpenStats(site))
+    }
+
+    @Test
+    fun `activity item click emits OpenActivity navigation event`() {
+        invokeItemClickAction(ACTIVITY_LOG)
+
+        assertThat(navigationActions).containsExactly(OpenActivityLog(site))
+    }
+
+    @Test
+    fun `scan item click emits OpenScan navigation event`() {
+        invokeItemClickAction(SCAN)
+
+        assertThat(navigationActions).containsExactly(OpenScan(site))
+    }
+
+    @Test
+    fun `plan item click emits OpenPlan navigation event and completes EXPLORE_PLANS quick task`() {
+        invokeItemClickAction(PLAN)
+
+        verify(quickStartRepository).completeTask(EXPLORE_PLANS)
+        assertThat(navigationActions).containsExactly(OpenPlan(site))
+    }
+
+    @Test
+    fun `posts item click emits OpenPosts navigation event`() {
+        invokeItemClickAction(POSTS)
+
+        assertThat(navigationActions).containsExactly(OpenPosts(site))
+    }
+
+    @Test
+    fun `pages item click emits OpenPages navigation event`() {
+        invokeItemClickAction(PAGES)
+
+        verify(quickStartRepository).completeTask(REVIEW_PAGES)
+        assertThat(navigationActions).containsExactly(OpenPages(site))
+    }
+
+    @Test
+    fun `admin item click emits OpenAdmin navigation event`() {
+        invokeItemClickAction(ADMIN)
+
+        assertThat(navigationActions).containsExactly(OpenAdmin(site))
+    }
+
+    @Test
+    fun `sharing item click emits OpenSharing navigation event`() {
+        invokeItemClickAction(SHARING)
+
+        assertThat(navigationActions).containsExactly(OpenSharing(site))
+    }
+
+    @Test
+    fun `site settings item click emits OpenSiteSettings navigation event`() {
+        invokeItemClickAction(SITE_SETTINGS)
+
+        assertThat(navigationActions).containsExactly(OpenSiteSettings(site))
+    }
+
+    @Test
+    fun `themes item click emits OpenThemes navigation event`() {
+        invokeItemClickAction(THEMES)
+
+        assertThat(navigationActions).containsExactly(OpenThemes(site))
+    }
+
+    @Test
+    fun `plugins item click emits OpenPlugins navigation event`() {
+        invokeItemClickAction(PLUGINS)
+
+        assertThat(navigationActions).containsExactly(OpenPlugins(site))
+    }
+
+    @Test
+    fun `media item click emits OpenMedia navigation event`() {
+        invokeItemClickAction(MEDIA)
+
+        assertThat(navigationActions).containsExactly(OpenMedia(site))
+    }
+
+    @Test
+    fun `comments item click emits OpenMedia navigation event`() {
+        invokeItemClickAction(COMMENTS)
+
+        assertThat(navigationActions).containsExactly(OpenComments(site))
+    }
+
+    @Test
+    fun `view site item click emits OpenSite navigation event`() {
+        invokeItemClickAction(VIEW_SITE)
+
+        assertThat(navigationActions).containsExactly(OpenSite(site))
+    }
+
+    @Test
+    fun `stats item click emits OpenStats navigation event if site is WPCom and has access token`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+        site.setIsWPCom(true)
+
+        invokeItemClickAction(STATS)
+
+        assertThat(navigationActions).containsExactly(OpenStats(site))
+    }
+
+    @Test
+    fun `stats item click emits OpenStats navigation event if site is Jetpack and has access token`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+        site.setIsJetpackConnected(true)
+        site.setIsJetpackInstalled(true)
+
+        invokeItemClickAction(STATS)
+
+        assertThat(navigationActions).containsExactly(OpenStats(site))
+    }
+
+    @Test
+    fun `stats item click completes CHECK_STATS task`() {
+        invokeItemClickAction(STATS)
+
+        verify(quickStartRepository).completeTask(CHECK_STATS)
+    }
+
+    @Test
+    fun `stats item click emits StartWPComLoginForJetpackStats if site is Jetpack and doesn't have access token`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+        site.setIsJetpackConnected(true)
+
+        invokeItemClickAction(STATS)
+
+        assertThat(navigationActions).containsExactly(StartWPComLoginForJetpackStats)
+    }
+
+    @Test
+    fun `stats item click emits ConnectJetpackForStats if neither Jetpack, nor WPCom and no access token`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+        site.setIsJetpackConnected(false)
+        site.setIsWPCom(false)
+
+        invokeItemClickAction(STATS)
+
+        assertThat(navigationActions).containsExactly(ConnectJetpackForStats(site))
+    }
+
+    @Test
+    fun `domain registration item click opens domain registration`() {
+        initSelectedSite()
+        isDomainCreditAvailable.value = DomainCreditAvailable(true)
+
+        findDomainRegistrationBlock()?.onClick?.click()
+
+        verify(analyticsTrackerWrapper).track(DOMAIN_CREDIT_REDEMPTION_TAPPED, site)
+
+        assertThat(navigationActions).containsOnly(OpenDomainRegistration(site))
+    }
+
+    @Test
+    fun `correct event is tracked when domain registration item is shown`() = test {
+        onSiteSelected.value = siteId
+        onSiteChange.value = site
+        isDomainCreditAvailable.value = DomainCreditAvailable(true)
+
+        delay(1000)
+
+        verify(analyticsTrackerWrapper).track(DOMAIN_CREDIT_PROMPT_SHOWN)
+    }
+
+    @Test
+    fun `snackbar is shown and event is tracked when handling successful domain registration result without email`() {
+        viewModel.handleSuccessfulDomainRegistrationResult(null)
+
+        verify(analyticsTrackerWrapper).track(DOMAIN_CREDIT_REDEMPTION_SUCCESS)
+
+        val message = UiStringRes(R.string.my_site_verify_your_email_without_email)
+
+        assertThat(snackbars).containsOnly(SnackbarMessageHolder(message))
+    }
+
+    @Test
+    fun `snackbar is shown and event is tracked when handling successful domain registration result with email`() {
+        viewModel.handleSuccessfulDomainRegistrationResult(emailAddress)
+
+        verify(analyticsTrackerWrapper).track(DOMAIN_CREDIT_REDEMPTION_SUCCESS)
+
+        val message = UiStringResWithParams(R.string.my_site_verify_your_email, listOf(UiStringText(emailAddress)))
+
+        assertThat(snackbars).containsOnly(SnackbarMessageHolder(message))
+    }
+
+    @Test
+    fun `backup menu item is NOT visible, when getJetpackMenuItemsVisibility is false`() = test {
+        initSelectedSite()
+
+        jetpackCapabilities.value = JetpackCapabilities(scanAvailable = false, backupAvailable = false)
+
+        verify(siteItemsBuilder, times(1)).buildSiteItems(
+                site = eq(site),
+                onClick = any(),
+                isBackupAvailable = eq(false),
+                isScanAvailable = any(),
+                showViewSiteFocusPoint = eq(false),
+                showEnablePostSharingFocusPoint = any(),
+                showExplorePlansFocusPoint = any()
+        )
+    }
+
+    @Test
+    fun `scan menu item is NOT visible, when getJetpackMenuItemsVisibility is false`() = test {
+        initSelectedSite()
+
+        jetpackCapabilities.value = JetpackCapabilities(scanAvailable = false, backupAvailable = false)
+
+        verify(siteItemsBuilder, times(1)).buildSiteItems(
+                site = eq(site),
+                onClick = any(),
+                isBackupAvailable = any(),
+                isScanAvailable = eq(false),
+                showViewSiteFocusPoint = any(),
+                showEnablePostSharingFocusPoint = any(),
+                showExplorePlansFocusPoint = any()
+        )
+    }
+
+    @Test
+    fun `scan menu item is visible, when getJetpackMenuItemsVisibility is true`() = test {
+        initSelectedSite()
+
+        jetpackCapabilities.value = JetpackCapabilities(scanAvailable = true, backupAvailable = false)
+
+        verify(siteItemsBuilder).buildSiteItems(
+                site = eq(site),
+                onClick = any(),
+                isBackupAvailable = any(),
+                isScanAvailable = eq(true),
+                showViewSiteFocusPoint = eq(false),
+                showEnablePostSharingFocusPoint = any(),
+                showExplorePlansFocusPoint = any()
+        )
+    }
+
+    @Test
+    fun `backup menu item is visible, when getJetpackMenuItemsVisibility is true`() = test {
+        initSelectedSite()
+
+        jetpackCapabilities.value = JetpackCapabilities(scanAvailable = false, backupAvailable = true)
+
+        verify(siteItemsBuilder).buildSiteItems(
+                site = eq(site),
+                onClick = any(),
+                isBackupAvailable = eq(true),
+                isScanAvailable = any(),
+                showViewSiteFocusPoint = any(),
+                showEnablePostSharingFocusPoint = any(),
+                showExplorePlansFocusPoint = any()
+        )
+    }
+
+    @Test
+    fun `when no site is selected and screen height is higher than 600 pixels, show empty view image`() {
+        whenever(displayUtilsWrapper.getDisplayPixelHeight()).thenReturn(600)
+
+        initSelectedSite()
+        onSiteSelected.value = null
+
+        assertThat(uiModels.last().state).isInstanceOf(NoSites::class.java)
+        assertThat((uiModels.last().state as NoSites).shouldShowImage).isTrue
+    }
+
+    @Test
+    fun `when no site is selected and screen height is lower than 600 pixels, hide empty view image`() {
+        whenever(displayUtilsWrapper.getDisplayPixelHeight()).thenReturn(500)
+
+        initSelectedSite()
+        onSiteSelected.value = null
+
+        assertThat(uiModels.last().state).isInstanceOf(NoSites::class.java)
+        assertThat((uiModels.last().state as NoSites).shouldShowImage).isFalse
+    }
+
+    @Test
+    fun `add new site press is handled correctly`() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+
+        viewModel.onAddSitePressed()
+
+        assertThat(navigationActions).containsOnly(AddNewSite(true))
+    }
+
+    @Test
+    fun `hides quick start menu item in quickStartRepository`() {
+        val id = CUSTOMIZE_QUICK_START
+        viewModel.onQuickStartMenuInteraction(DynamicCardMenuInteraction.Hide(id))
+
+        verify(analyticsTrackerWrapper).track(Stat.QUICK_START_HIDE_CARD_TAPPED)
+        verify(quickStartRepository).refresh()
+    }
+
+    @Test
+    fun `removes quick start menu item in quickStartRepository`() {
+        val id = CUSTOMIZE_QUICK_START
+        viewModel.onQuickStartMenuInteraction(DynamicCardMenuInteraction.Remove(id))
+
+        verify(analyticsTrackerWrapper).track(Stat.QUICK_START_REMOVE_CARD_TAPPED)
+        verify(quickStartRepository).refresh()
+    }
+
+    @Test
+    fun `when build is Jetpack, then quick action block is not built`() {
+        whenever(buildConfigWrapper.isJetpackApp).thenReturn(true)
+
+        initSelectedSite()
+
+        val quickActionsBlock = findQuickActionsBlock()
+
+        assertThat(quickActionsBlock).isNull()
+    }
+
+    @Test
+    fun `when build is WordPress, then quick action block is built`() {
+        whenever(buildConfigWrapper.isJetpackApp).thenReturn(false)
+
+        initSelectedSite()
+
+        val quickActionsBlock = findQuickActionsBlock()
+
+        assertThat(quickActionsBlock).isNotNull
+    }
+
+    private fun findQuickActionsBlock() = getLastItems().find { it is QuickActionsBlock } as QuickActionsBlock?
+
+    private fun findDomainRegistrationBlock() =
+            getLastItems().find { it is DomainRegistrationBlock } as DomainRegistrationBlock?
+
+    private fun findSiteInfoBlock() =
+            getLastItems().find { it is SiteInfoBlock } as SiteInfoBlock?
+
+    private fun getLastItems() = (uiModels.last().state as SiteSelected).items
+
+    private suspend fun invokeSiteInfoBlockAction(action: SiteInfoBlockAction) {
+        onSiteChange.value = site
+        onSiteSelected.value = siteId
+        while (uiModels.last().state is NoSites) {
+            delay(100)
+        }
+        val siteInfoBlock = findSiteInfoBlock()!!
+        when (action) {
+            TITLE_CLICK -> siteInfoBlock.onTitleClick!!.click()
+            ICON_CLICK -> siteInfoBlock.onIconClick.click()
+            URL_CLICK -> siteInfoBlock.onUrlClick.click()
+            SWITCH_SITE_CLICK -> siteInfoBlock.onSwitchSiteClick.click()
+        }
+    }
+
+    private fun invokeItemClickAction(action: ListItemAction) {
+        var clickAction: ((ListItemAction) -> Unit)? = null
+        doAnswer {
+            clickAction = it.getArgument(1)
+            listOf<MySiteItem>()
+        }.whenever(siteItemsBuilder).buildSiteItems(eq(site), any(), any(), any(), any(), any(), any())
+
+        initSelectedSite()
+
+        assertThat(clickAction).isNotNull
+        clickAction!!.invoke(action)
+    }
+
+    private fun initSelectedSite() {
+        onSiteSelected.value = siteId
+        onSiteChange.value = site
+    }
+
+    private enum class SiteInfoBlockAction {
+        TITLE_CLICK, ICON_CLICK, URL_CLICK, SWITCH_SITE_CLICK
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartItemBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartItemBuilderTest.kt
new file mode 100644
index 000000000000..677bad4e1f1b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartItemBuilderTest.kt
@@ -0,0 +1,154 @@
+package org.wordpress.android.ui.mysite
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.DynamicCardType.CUSTOMIZE_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.VIEW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import org.wordpress.android.ui.mysite.MySiteItem.DynamicCard.QuickStartCard.QuickStartTaskCard
+import org.wordpress.android.ui.mysite.QuickStartRepository.QuickStartCategory
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuFragment.DynamicCardMenuModel
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails.PUBLISH_POST_TUTORIAL
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails.UPDATE_SITE_TITLE
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails.VIEW_SITE_TUTORIAL
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+
+@RunWith(MockitoJUnitRunner::class)
+class QuickStartItemBuilderTest {
+    private val builder = QuickStartItemBuilder()
+    private val onQuickStartTaskCardClick: (QuickStartTask) -> Unit = {}
+
+    @Test
+    fun `builds a customize category into quick start card`() {
+        val quickStartCategory = QuickStartCategory(CUSTOMIZE, listOf(), listOf())
+        var clickedId: DynamicCardMenuModel? = null
+
+        val quickStartCard = builder.build(quickStartCategory, null, { id ->
+            clickedId = id
+        }, onQuickStartTaskCardClick)
+
+        assertThat(quickStartCard.id).isEqualTo(CUSTOMIZE_QUICK_START)
+        assertThat(quickStartCard.title).isEqualTo(UiStringRes(R.string.quick_start_sites_type_customize))
+        assertThat(quickStartCard.accentColor).isEqualTo(R.color.green_20)
+        assertThat(quickStartCard.progress).isEqualTo(0)
+        assertThat(quickStartCard.taskCards).isEmpty()
+
+        quickStartCard.onMoreClick.click()
+        assertThat(clickedId).isEqualTo(DynamicCardMenuModel(CUSTOMIZE_QUICK_START, false))
+    }
+
+    @Test
+    fun `builds a pinned dynamic card`() {
+        val quickStartCategory = QuickStartCategory(CUSTOMIZE, listOf(), listOf())
+        var clickedId: DynamicCardMenuModel? = null
+
+        val quickStartCard = builder.build(quickStartCategory, CUSTOMIZE_QUICK_START, { id ->
+            clickedId = id
+        }, onQuickStartTaskCardClick)
+
+        assertThat(quickStartCard.id).isEqualTo(CUSTOMIZE_QUICK_START)
+        assertThat(quickStartCard.title).isEqualTo(UiStringRes(R.string.quick_start_sites_type_customize))
+        assertThat(quickStartCard.accentColor).isEqualTo(R.color.green_20)
+        assertThat(quickStartCard.progress).isEqualTo(0)
+        assertThat(quickStartCard.taskCards).isEmpty()
+
+        quickStartCard.onMoreClick.click()
+        assertThat(clickedId).isEqualTo(DynamicCardMenuModel(CUSTOMIZE_QUICK_START, true))
+    }
+
+    @Test
+    fun `builds a grow category into quick start card`() {
+        val quickStartCategory = QuickStartCategory(GROW, listOf(), listOf())
+        var clickedId: DynamicCardMenuModel? = null
+
+        val quickStartCard = builder.build(quickStartCategory, null, { id ->
+            clickedId = id
+        }, onQuickStartTaskCardClick)
+
+        assertThat(quickStartCard.id).isEqualTo(GROW_QUICK_START)
+        assertThat(quickStartCard.title).isEqualTo(UiStringRes(R.string.quick_start_sites_type_grow))
+        assertThat(quickStartCard.accentColor).isEqualTo(R.color.orange_40)
+        assertThat(quickStartCard.progress).isEqualTo(0)
+        assertThat(quickStartCard.taskCards).isEmpty()
+
+        quickStartCard.onMoreClick.click()
+        assertThat(clickedId).isEqualTo(DynamicCardMenuModel(GROW_QUICK_START, false))
+    }
+
+    @Test
+    fun `builds 1 completed and 1 uncompleted task with 50 progress`() {
+        val quickStartCategory = QuickStartCategory(CUSTOMIZE, listOf(VIEW_SITE_TUTORIAL), listOf(UPDATE_SITE_TITLE))
+
+        val quickStartCard = builder.build(quickStartCategory, null, { }, onQuickStartTaskCardClick)
+
+        assertThat(quickStartCard.progress).isEqualTo(50)
+        assertThat(quickStartCard.taskCards).containsExactly(
+                QuickStartTaskCard(
+                        VIEW_SITE,
+                        UiStringRes(VIEW_SITE_TUTORIAL.titleResId),
+                        UiStringRes(VIEW_SITE_TUTORIAL.subtitleResId),
+                        R.drawable.img_illustration_quick_start_task_visit_your_site,
+                        R.color.green_20,
+                        false,
+                        ListItemInteraction.create(VIEW_SITE, onQuickStartTaskCardClick)
+                ),
+                QuickStartTaskCard(
+                        QuickStartTask.UPDATE_SITE_TITLE,
+                        UiStringRes(UPDATE_SITE_TITLE.titleResId),
+                        UiStringRes(UPDATE_SITE_TITLE.subtitleResId),
+                        R.drawable.img_illustration_quick_start_task_set_site_title,
+                        R.color.green_20,
+                        true,
+                        ListItemInteraction.create(QuickStartTask.UPDATE_SITE_TITLE, onQuickStartTaskCardClick)
+                )
+        )
+    }
+
+    @Test
+    fun `builds 0 completed and 1 uncompleted task with 0 progress`() {
+        val quickStartCategory = QuickStartCategory(GROW, listOf(PUBLISH_POST_TUTORIAL), listOf())
+
+        val quickStartCard = builder.build(quickStartCategory, null, { }, onQuickStartTaskCardClick)
+
+        assertThat(quickStartCard.progress).isEqualTo(0)
+        assertThat(quickStartCard.taskCards).containsExactly(
+                QuickStartTaskCard(
+                        PUBLISH_POST,
+                        UiStringRes(PUBLISH_POST_TUTORIAL.titleResId),
+                        UiStringRes(PUBLISH_POST_TUTORIAL.subtitleResId),
+                        R.drawable.img_illustration_quick_start_task_publish_post,
+                        R.color.orange_40,
+                        false,
+                        ListItemInteraction.create(PUBLISH_POST, onQuickStartTaskCardClick)
+                )
+        )
+    }
+
+    @Test
+    fun `builds 1 completed and 0 uncompleted task with 100 progress`() {
+        val quickStartCategory = QuickStartCategory(CUSTOMIZE, listOf(), listOf(UPDATE_SITE_TITLE))
+
+        val quickStartCard = builder.build(quickStartCategory, null, { }, onQuickStartTaskCardClick)
+
+        assertThat(quickStartCard.progress).isEqualTo(100)
+        assertThat(quickStartCard.taskCards).containsExactly(
+                QuickStartTaskCard(
+                        QuickStartTask.UPDATE_SITE_TITLE,
+                        UiStringRes(UPDATE_SITE_TITLE.titleResId),
+                        UiStringRes(UPDATE_SITE_TITLE.subtitleResId),
+                        R.drawable.img_illustration_quick_start_task_set_site_title,
+                        R.color.green_20,
+                        true,
+                        ListItemInteraction.create(QuickStartTask.UPDATE_SITE_TITLE, onQuickStartTaskCardClick)
+                )
+        )
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt
new file mode 100644
index 000000000000..cce7cd1b1721
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt
@@ -0,0 +1,325 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.reset
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.DynamicCardType.CUSTOMIZE_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardsModel
+import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.DynamicCardStore
+import org.wordpress.android.fluxc.store.QuickStartStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.CREATE_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.ENABLE_POST_SHARING
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.CUSTOMIZE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTaskType.GROW
+import org.wordpress.android.test
+import org.wordpress.android.testScope
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.QuickStartUpdate
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.quickstart.QuickStartEvent
+import org.wordpress.android.ui.quickstart.QuickStartMySitePrompts
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails.CREATE_SITE_TUTORIAL
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails.PUBLISH_POST_TUTORIAL
+import org.wordpress.android.ui.quickstart.QuickStartTaskDetails.SHARE_SITE_TUTORIAL
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.HtmlCompatWrapper
+import org.wordpress.android.util.QuickStartUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
+import org.wordpress.android.viewmodel.ResourceProvider
+
+class QuickStartRepositoryTest : BaseUnitTest() {
+    @Mock lateinit var quickStartStore: QuickStartStore
+    @Mock lateinit var quickStartUtils: QuickStartUtilsWrapper
+    @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var eventBus: EventBusWrapper
+    @Mock lateinit var dynamicCardStore: DynamicCardStore
+    @Mock lateinit var htmlCompat: HtmlCompatWrapper
+    @Mock lateinit var mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig
+    private lateinit var site: SiteModel
+    private lateinit var quickStartRepository: QuickStartRepository
+    private lateinit var snackbars: MutableList<SnackbarMessageHolder>
+    private lateinit var quickStartPrompts: MutableList<QuickStartMySitePrompts>
+    private lateinit var result: MutableList<QuickStartUpdate>
+    private val siteId = 1
+
+    @InternalCoroutinesApi
+    @Before
+    fun setUp() = test {
+        quickStartRepository = QuickStartRepository(
+                TEST_DISPATCHER,
+                quickStartStore,
+                quickStartUtils,
+                selectedSiteRepository,
+                resourceProvider,
+                analyticsTrackerWrapper,
+                dispatcher,
+                eventBus,
+                dynamicCardStore,
+                htmlCompat,
+                mySiteImprovementsFeatureConfig
+        )
+        snackbars = mutableListOf()
+        quickStartPrompts = mutableListOf()
+        quickStartRepository.onSnackbar.observeForever { event ->
+            event?.getContentIfNotHandled()
+                    ?.let { snackbars.add(it) }
+        }
+        quickStartRepository.onQuickStartMySitePrompts.observeForever { event ->
+            event?.getContentIfNotHandled()?.let { quickStartPrompts.add(it) }
+        }
+        site = SiteModel()
+        site.id = siteId
+        result = mutableListOf()
+        quickStartRepository.buildSource(testScope(), siteId).observeForever { result.add(it) }
+    }
+
+    @Test
+    fun `refresh loads model`() = test {
+        initStore()
+
+        quickStartRepository.refresh()
+
+        assertModel()
+    }
+
+    @Test
+    fun `refresh shows completion message and removes card if all tasks of a same type have been completed`() = test {
+        initStore()
+
+        val completionMessage = "All tasks completed!"
+
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(quickStartUtils.isEveryQuickStartTaskDoneForType(siteId, GROW)).thenReturn(true)
+        whenever(resourceProvider.getString(any())).thenReturn(completionMessage)
+        whenever(htmlCompat.fromHtml(completionMessage)).thenReturn(completionMessage)
+
+        val task = PUBLISH_POST
+        quickStartRepository.setActiveTask(task)
+        quickStartRepository.completeTask(task)
+        quickStartRepository.refresh()
+
+        assertThat(snackbars).containsOnly(SnackbarMessageHolder(UiStringText(completionMessage)))
+
+        verify(dynamicCardStore).removeCard(siteId, GROW_QUICK_START)
+    }
+
+    @Test
+    fun `refresh does not show completion message if not all tasks of a same type have been completed`() = test {
+        initStore()
+
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(quickStartUtils.isEveryQuickStartTaskDoneForType(siteId, GROW)).thenReturn(false)
+
+        val task = PUBLISH_POST
+        quickStartRepository.setActiveTask(task)
+        quickStartRepository.completeTask(task)
+        quickStartRepository.refresh()
+
+        assertThat(snackbars).isEmpty()
+    }
+
+    @Test
+    fun `start marks CREATE_SITE as done and loads model`() = test {
+        initStore()
+
+        quickStartRepository.startQuickStart(siteId)
+
+        verify(quickStartUtils).startQuickStart(siteId)
+        assertModel()
+    }
+
+    @Test
+    fun `sets active task and shows stylized snackbar when not UPDATE_SITE_TITLE`() = test {
+        initStore()
+        quickStartRepository.refresh()
+
+        quickStartRepository.setActiveTask(PUBLISH_POST)
+
+        assertThat(result.last().activeTask).isEqualTo(PUBLISH_POST)
+        assertThat(quickStartPrompts.last()).isEqualTo(QuickStartMySitePrompts.PUBLISH_POST_TUTORIAL)
+    }
+
+    @Test
+    fun `completeTask marks current active task as done and refreshes model`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        initStore()
+        quickStartRepository.refresh()
+        val task = PUBLISH_POST
+
+        quickStartRepository.setActiveTask(task)
+
+        quickStartRepository.completeTask(task)
+
+        verify(quickStartStore).setDoneTask(siteId.toLong(), task, true)
+        val update = result.last()
+        assertThat(update.activeTask).isNull()
+        assertThat(update.categories).isNotEmpty()
+    }
+
+    @Test
+    fun `completeTask marks current pending task as done and refreshes model`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        initStore()
+        quickStartRepository.refresh()
+        val task = PUBLISH_POST
+
+        quickStartRepository.setActiveTask(task)
+        quickStartRepository.requestNextStepOfTask(task)
+        quickStartRepository.completeTask(task)
+
+        verify(quickStartStore).setDoneTask(siteId.toLong(), task, true)
+        val update = result.last()
+        assertThat(update.activeTask).isNull()
+        assertThat(update.categories).isNotEmpty()
+    }
+
+    @Test
+    fun `completeTask does not marks active task as done if it is different`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        initStore()
+
+        quickStartRepository.setActiveTask(PUBLISH_POST)
+
+        reset(quickStartStore)
+
+        quickStartRepository.completeTask(UPDATE_SITE_TITLE)
+
+        verifyZeroInteractions(quickStartStore)
+    }
+
+    @Test
+    fun `requestNextStepOfTask emits quick start event`() = test {
+        initQuickStartInProgress()
+
+        quickStartRepository.setActiveTask(ENABLE_POST_SHARING)
+        quickStartRepository.requestNextStepOfTask(ENABLE_POST_SHARING)
+
+        verify(eventBus).postSticky(QuickStartEvent(ENABLE_POST_SHARING))
+    }
+
+    @Test
+    fun `requestNextStepOfTask clears current active task`() = test {
+        initQuickStartInProgress()
+
+        quickStartRepository.setActiveTask(ENABLE_POST_SHARING)
+        quickStartRepository.requestNextStepOfTask(ENABLE_POST_SHARING)
+
+        val update = result.last()
+        assertThat(update.activeTask).isNull()
+    }
+
+    @Test
+    fun `requestNextStepOfTask does not proceed if the active task is different`() = test {
+        initQuickStartInProgress()
+
+        quickStartRepository.setActiveTask(PUBLISH_POST)
+        quickStartRepository.requestNextStepOfTask(ENABLE_POST_SHARING)
+
+        verifyZeroInteractions(eventBus)
+        val update = result.last()
+        assertThat(update.activeTask).isEqualTo(PUBLISH_POST)
+    }
+
+    @Test
+    fun `clearActiveTask clears current active task`() = test {
+        initQuickStartInProgress()
+
+        quickStartRepository.setActiveTask(ENABLE_POST_SHARING)
+        quickStartRepository.clearActiveTask()
+
+        val update = result.last()
+        assertThat(update.activeTask).isNull()
+    }
+
+    @Test
+    fun `marks EDIT_HOMEPAGE task as done when site showing Posts instead of Homepage`() = test {
+        initStore()
+
+        val updatedSiteId = 2
+        site.id = updatedSiteId
+        site.showOnFront = ShowOnFront.POSTS.value
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(quickStartStore.hasDoneTask(updatedSiteId.toLong(), EDIT_HOMEPAGE)).thenReturn(false)
+
+        quickStartRepository.buildSource(testScope(), updatedSiteId)
+
+        verify(quickStartStore).setDoneTask(updatedSiteId.toLong(), EDIT_HOMEPAGE, true)
+    }
+
+    @Test
+    fun `does not mark EDIT_HOMEPAGE task as done when site showing Homepage`() = test {
+        val updatedSiteId = 2
+        site.id = updatedSiteId
+        site.showOnFront = ShowOnFront.PAGE.value
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+
+        quickStartRepository.buildSource(testScope(), updatedSiteId)
+
+        verify(quickStartStore, never()).setDoneTask(updatedSiteId.toLong(), EDIT_HOMEPAGE, true)
+    }
+
+    private suspend fun initQuickStartInProgress() {
+        initStore()
+        quickStartRepository.refresh()
+    }
+
+    private suspend fun initStore() {
+        whenever(dynamicCardStore.getCards(siteId)).thenReturn(
+                DynamicCardsModel(
+                        dynamicCardTypes = listOf(
+                                CUSTOMIZE_QUICK_START,
+                                GROW_QUICK_START
+                        )
+                )
+        )
+        whenever(quickStartUtils.isQuickStartInProgress(site.id)).thenReturn(true)
+        whenever(quickStartStore.getUncompletedTasksByType(siteId.toLong(), CUSTOMIZE)).thenReturn(listOf(CREATE_SITE))
+        whenever(quickStartStore.getCompletedTasksByType(siteId.toLong(), CUSTOMIZE)).thenReturn(
+                listOf(
+                        UPDATE_SITE_TITLE
+                )
+        )
+        whenever(
+                quickStartStore.getUncompletedTasksByType(
+                        siteId.toLong(),
+                        GROW
+                )
+        ).thenReturn(listOf(ENABLE_POST_SHARING))
+        whenever(quickStartStore.getCompletedTasksByType(siteId.toLong(), GROW)).thenReturn(listOf(PUBLISH_POST))
+    }
+
+    private fun assertModel() {
+        val quickStartUpdate = result.last()
+        quickStartUpdate.categories.let { categories ->
+            assertThat(categories).hasSize(2)
+            assertThat(categories[0].taskType).isEqualTo(CUSTOMIZE)
+            assertThat(categories[0].uncompletedTasks).containsExactly(CREATE_SITE_TUTORIAL)
+            assertThat(categories[0].completedTasks).containsExactly(QuickStartTaskDetails.UPDATE_SITE_TITLE)
+            assertThat(categories[1].taskType).isEqualTo(GROW)
+            assertThat(categories[1].uncompletedTasks).containsExactly(SHARE_SITE_TUTORIAL)
+            assertThat(categories[1].completedTasks).containsExactly(PUBLISH_POST_TUTORIAL)
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/ScanAndBackupSourceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/ScanAndBackupSourceTest.kt
new file mode 100644
index 000000000000..b8cfcc756c89
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/ScanAndBackupSourceTest.kt
@@ -0,0 +1,126 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flow
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.test
+import org.wordpress.android.testScope
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase.JetpackPurchasedProducts
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.JetpackCapabilities
+
+class ScanAndBackupSourceTest : BaseUnitTest() {
+    @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock lateinit var jetpackCapabilitiesUseCase: JetpackCapabilitiesUseCase
+    @Mock lateinit var site: SiteModel
+    private lateinit var scanAndBackupSource: ScanAndBackupSource
+    private val siteId = 1
+    private val siteRemoteId = 2L
+
+    @InternalCoroutinesApi
+    @Before
+    fun setUp() {
+        scanAndBackupSource = ScanAndBackupSource(
+                TEST_DISPATCHER,
+                selectedSiteRepository,
+                jetpackCapabilitiesUseCase
+        )
+        whenever(site.id).thenReturn(siteId)
+        whenever(site.isWPCom).thenReturn(false)
+        whenever(site.isWPComAtomic).thenReturn(false)
+    }
+
+    @Test
+    fun `jetpack capabilities disabled when site not present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(null)
+
+        var result: JetpackCapabilities? = null
+        scanAndBackupSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result!!.backupAvailable).isFalse
+        assertThat(result!!.scanAvailable).isFalse
+    }
+
+    @Test
+    fun `jetpack capabilities reloads both scan and backup as true`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(site.siteId).thenReturn(siteRemoteId)
+        whenever(jetpackCapabilitiesUseCase.getJetpackPurchasedProducts(siteRemoteId)).thenReturn(
+                flow { emit(JetpackPurchasedProducts(scan = true, backup = true)) }
+        )
+
+        var result: JetpackCapabilities? = null
+        scanAndBackupSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result!!.backupAvailable).isTrue
+        assertThat(result!!.scanAvailable).isTrue
+    }
+
+    @Test
+    fun `jetpack capabilities reloads both scan and backup as false`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(site.siteId).thenReturn(siteRemoteId)
+        whenever(jetpackCapabilitiesUseCase.getJetpackPurchasedProducts(siteRemoteId)).thenReturn(
+                flow { emit(JetpackPurchasedProducts(scan = false, backup = false)) }
+        )
+
+        var result: JetpackCapabilities? = null
+        scanAndBackupSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result!!.backupAvailable).isFalse
+        assertThat(result!!.scanAvailable).isFalse
+    }
+
+    @Test
+    fun `Scan not visible on wpcom sites even when Scan product is available`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(site.siteId).thenReturn(siteRemoteId)
+        whenever(jetpackCapabilitiesUseCase.getJetpackPurchasedProducts(siteRemoteId)).thenReturn(
+                flow { emit(JetpackPurchasedProducts(scan = true, backup = false)) }
+        )
+        whenever(site.isWPCom).thenReturn(true)
+
+        var result: JetpackCapabilities? = null
+        scanAndBackupSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result!!.scanAvailable).isFalse
+    }
+
+    @Test
+    fun `Scan not visible on atomic sites even when Scan product is available`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(site.siteId).thenReturn(siteRemoteId)
+        whenever(jetpackCapabilitiesUseCase.getJetpackPurchasedProducts(siteRemoteId)).thenReturn(
+                flow { emit(JetpackPurchasedProducts(scan = true, backup = false)) }
+        )
+        whenever(site.isWPComAtomic).thenReturn(true)
+
+        var result: JetpackCapabilities? = null
+        scanAndBackupSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result!!.scanAvailable).isFalse
+    }
+
+    @Test
+    fun `Scan visible on non-wpcom sites when Scan product is available and feature flag enabled`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
+        whenever(site.siteId).thenReturn(siteRemoteId)
+        whenever(jetpackCapabilitiesUseCase.getJetpackPurchasedProducts(siteRemoteId)).thenReturn(
+                flow { emit(JetpackPurchasedProducts(scan = true, backup = false)) }
+        )
+        whenever(site.isWPCom).thenReturn(false)
+        whenever(site.isWPComAtomic).thenReturn(false)
+
+        var result: JetpackCapabilities? = null
+        scanAndBackupSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result!!.scanAvailable).isTrue
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SelectedSiteRepositoryTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SelectedSiteRepositoryTest.kt
new file mode 100644
index 000000000000..627430d1259c
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SelectedSiteRepositoryTest.kt
@@ -0,0 +1,223 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.doAnswer
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.inOrder
+import com.nhaarman.mockitokotlin2.isNull
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.action.SiteAction
+import org.wordpress.android.fluxc.annotations.action.Action
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.prefs.SiteSettingsInterfaceWrapper
+
+class SelectedSiteRepositoryTest : BaseUnitTest() {
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var siteSettingsInterfaceFactory: SiteSettingsInterfaceWrapper.Factory
+    @Mock lateinit var siteSettingsInterfaceWrapper: SiteSettingsInterfaceWrapper
+    private lateinit var siteModel: SiteModel
+    private var siteIconProgressBarVisible: Boolean = false
+    private var selectedSite: SiteModel? = null
+    private lateinit var actions: MutableList<Action<*>>
+    private lateinit var selectedSiteRepository: SelectedSiteRepository
+    private var onSaveError: ((error: Exception?) -> Unit)? = null
+    private var onFetchError: ((error: Exception?) -> Unit)? = null
+    private var onSettingsSaved: (() -> Unit)? = null
+    private val selectedSiteId = 1
+
+    @Before
+    fun setUp() {
+        selectedSiteRepository = SelectedSiteRepository(dispatcher, siteSettingsInterfaceFactory)
+        selectedSiteRepository.showSiteIconProgressBar.observeForever { siteIconProgressBarVisible = it == true }
+        selectedSiteRepository.selectedSiteChange.observeForever { selectedSite = it }
+        siteModel = SiteModel()
+        siteModel.id = selectedSiteId
+        whenever(siteSettingsInterfaceWrapper.localSiteId).thenReturn(selectedSiteId)
+        doAnswer {
+            actions.add(it.getArgument(0))
+        }.whenever(dispatcher).dispatch(any())
+        actions = mutableListOf()
+    }
+
+    @Test
+    fun `icon update updates site settings and shows progress bar when selected site is initialized`() {
+        initializeSiteAndSiteSettings()
+        val mediaId = 5
+
+        selectedSiteRepository.updateSiteIconMediaId(mediaId, true)
+
+        assertThat(siteIconProgressBarVisible).isTrue()
+        val inOrder = inOrder(siteSettingsInterfaceWrapper)
+        inOrder.verify(siteSettingsInterfaceWrapper).setSiteIconMediaId(mediaId)
+        inOrder.verify(siteSettingsInterfaceWrapper).saveSettings()
+    }
+
+    @Test
+    fun `icon update updates site settings and does not show progress bar when parameter is false`() {
+        initializeSiteAndSiteSettings()
+        val mediaId = 5
+
+        selectedSiteRepository.updateSiteIconMediaId(mediaId, false)
+
+        assertThat(siteIconProgressBarVisible).isFalse()
+        val inOrder = inOrder(siteSettingsInterfaceWrapper)
+        inOrder.verify(siteSettingsInterfaceWrapper).setSiteIconMediaId(mediaId)
+        inOrder.verify(siteSettingsInterfaceWrapper).saveSettings()
+    }
+
+    @Test
+    fun `icon update does not show progress bar when site not initialized`() {
+        val mediaId = 5
+
+        selectedSiteRepository.updateSiteIconMediaId(mediaId, true)
+
+        assertThat(siteIconProgressBarVisible).isFalse()
+        verifyZeroInteractions(siteSettingsInterfaceWrapper)
+    }
+
+    @Test
+    fun `showSiteIconProgressBar(true) shows progress bar`() {
+        selectedSiteRepository.showSiteIconProgressBar(true)
+
+        assertThat(siteIconProgressBarVisible).isTrue()
+    }
+
+    @Test
+    fun `showSiteIconProgressBar(false) hides progress bar`() {
+        selectedSiteRepository.showSiteIconProgressBar(false)
+
+        assertThat(siteIconProgressBarVisible).isFalse()
+    }
+
+    @Test
+    fun `title update changes site name, settings title and dispatches change`() {
+        initializeSiteAndSiteSettings()
+        siteModel.name = "original title"
+        val updatedTitle = "updated title"
+
+        selectedSiteRepository.updateTitle(updatedTitle)
+
+        assertThat(siteModel.name).isEqualTo(updatedTitle)
+        verify(dispatcher).dispatch(any())
+        assertThat(actions.last().payload).isEqualTo(siteModel)
+        assertThat(actions.last().type).isEqualTo(SiteAction.UPDATE_SITE)
+
+        val inOrder = inOrder(siteSettingsInterfaceWrapper)
+        inOrder.verify(siteSettingsInterfaceWrapper).title = updatedTitle
+        inOrder.verify(siteSettingsInterfaceWrapper).saveSettings()
+    }
+
+    @Test
+    fun `updateSite updates site`() {
+        assertThat(selectedSiteRepository.hasSelectedSite()).isFalse()
+        assertThat(selectedSiteRepository.getSelectedSite()).isNull()
+
+        selectedSiteRepository.updateSite(siteModel)
+
+        assertThat(selectedSiteRepository.hasSelectedSite()).isTrue()
+        assertThat(selectedSiteRepository.getSelectedSite()).isEqualTo(siteModel)
+    }
+
+    @Test
+    fun `updateSite hides progress bar if icon has changed`() {
+        siteModel.iconUrl = "originalIcon.jpg"
+        initializeSiteAndSiteSettings()
+        val updatedSite = SiteModel()
+        updatedSite.iconUrl = "updatedIcon.jpg"
+        selectedSiteRepository.showSiteIconProgressBar(true)
+
+        selectedSiteRepository.updateSite(updatedSite)
+
+        assertThat(siteIconProgressBarVisible).isFalse()
+    }
+
+    @Test
+    fun `updateSite does not hide progress bar if icon has not changed`() {
+        val iconName = "originalIcon.jpg"
+        siteModel.iconUrl = iconName
+        initializeSiteAndSiteSettings()
+        val updatedSite = SiteModel()
+        updatedSite.iconUrl = iconName
+        selectedSiteRepository.showSiteIconProgressBar(true)
+
+        selectedSiteRepository.updateSite(updatedSite)
+
+        assertThat(siteIconProgressBarVisible).isTrue()
+    }
+
+    @Test
+    fun `site settings onSaveError hides icon progress bar`() {
+        initializeSiteAndSiteSettings()
+        selectedSiteRepository.showSiteIconProgressBar(true)
+        assertThat(siteIconProgressBarVisible).isTrue()
+
+        onSaveError!!.invoke(Exception("testing"))
+
+        assertThat(siteIconProgressBarVisible).isFalse()
+    }
+
+    @Test
+    fun `site settings onFetchError hides icon progress bar`() {
+        initializeSiteAndSiteSettings()
+        selectedSiteRepository.showSiteIconProgressBar(true)
+        assertThat(siteIconProgressBarVisible).isTrue()
+
+        onFetchError!!.invoke(Exception("testing"))
+
+        assertThat(siteIconProgressBarVisible).isFalse()
+    }
+
+    @Test
+    fun `site settings onSettingsSaved emits fetch site event`() {
+        initializeSiteAndSiteSettings()
+
+        onSettingsSaved!!.invoke()
+
+        assertThat(actions.last().type).isEqualTo(SiteAction.FETCH_SITE)
+        assertThat(actions.last().payload).isEqualTo(siteModel)
+    }
+
+    @Test
+    fun `clears previous site settings when selected site has different ID`() {
+        val firstSiteId = 1
+        val updatedSiteId = 2
+        whenever(siteSettingsInterfaceWrapper.localSiteId).thenReturn(firstSiteId)
+        initializeSiteAndSiteSettings()
+        siteModel.id = updatedSiteId
+
+        selectedSiteRepository.updateSiteSettingsIfNecessary()
+
+        verify(siteSettingsInterfaceWrapper).clear()
+    }
+
+    @Test
+    fun `emits null site ID when site not selected`() {
+        var emptySiteIdEmitted = false
+
+        selectedSiteRepository.siteSelected.observeForever { emptySiteIdEmitted = true }
+
+        assertThat(emptySiteIdEmitted).isTrue()
+    }
+
+    private fun initializeSiteAndSiteSettings() {
+        selectedSiteRepository.updateSite(siteModel)
+        doAnswer {
+            onSaveError = it.getArgument(1)
+            onFetchError = it.getArgument(2)
+            onSettingsSaved = it.getArgument(4)
+            siteSettingsInterfaceWrapper
+        }.whenever(siteSettingsInterfaceFactory).build(any(), any(), any(), isNull(), any(), isNull())
+
+        selectedSiteRepository.updateSiteSettingsIfNecessary()
+        verify(siteSettingsInterfaceWrapper).init(true)
+        verify(siteSettingsInterfaceFactory).build(eq(siteModel), any(), any(), isNull(), any(), isNull())
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteCategoryItemBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteCategoryItemBuilderTest.kt
new file mode 100644
index 000000000000..f33c1176a945
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteCategoryItemBuilderTest.kt
@@ -0,0 +1,127 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.themes.ThemeBrowserUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.SiteUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteCategoryItemBuilderTest {
+    @Mock lateinit var themeBrowserUtils: ThemeBrowserUtils
+    @Mock lateinit var siteUtilsWrapper: SiteUtilsWrapper
+    @Mock lateinit var siteModel: SiteModel
+    private lateinit var siteCategoryItemBuilder: SiteCategoryItemBuilder
+
+    @Before
+    fun setUp() {
+        siteCategoryItemBuilder = SiteCategoryItemBuilder(themeBrowserUtils, siteUtilsWrapper)
+    }
+
+    @Test
+    fun `returns jetpack header when site is jetpack, WPCom, can manage options and is not atomic`() {
+        setupJetpackHeader(isJetpackConnected = true, isAtomic = false)
+
+        val lookAndFeelHeader = siteCategoryItemBuilder.buildJetpackCategoryIfAvailable(siteModel)
+
+        assertThat(lookAndFeelHeader).isEqualTo(CategoryHeader(UiStringRes(R.string.my_site_header_jetpack)))
+    }
+
+    @Test
+    fun `does not return jetpack header when site is not jetpack`() {
+        setupJetpackHeader(isJetpackConnected = false)
+
+        val lookAndFeelHeader = siteCategoryItemBuilder.buildJetpackCategoryIfAvailable(siteModel)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    @Test
+    fun `does not return jetpack header when site is atomic`() {
+        setupJetpackHeader(isAtomic = true)
+
+        val lookAndFeelHeader = siteCategoryItemBuilder.buildJetpackCategoryIfAvailable(siteModel)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    @Test
+    fun `returns look and feel header when themes accessible`() {
+        whenever(themeBrowserUtils.isAccessible(siteModel)).thenReturn(true)
+
+        val lookAndFeelHeader = siteCategoryItemBuilder.buildLookAndFeelHeaderIfAvailable(siteModel)
+
+        assertThat(lookAndFeelHeader).isEqualTo(CategoryHeader(UiStringRes(R.string.my_site_header_look_and_feel)))
+    }
+
+    @Test
+    fun `does not return look and feel header when themes not accessible`() {
+        whenever(themeBrowserUtils.isAccessible(siteModel)).thenReturn(false)
+
+        val lookAndFeelHeader = siteCategoryItemBuilder.buildLookAndFeelHeaderIfAvailable(siteModel)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    @Test
+    fun `returns configuration header when site is not WPCom`() {
+        setupConfigurationHeader(isWpCom = false)
+
+        val configurationHeader = siteCategoryItemBuilder.buildConfigurationHeaderIfAvailable(siteModel)
+
+        assertThat(configurationHeader).isEqualTo(CategoryHeader(UiStringRes(R.string.my_site_header_configuration)))
+    }
+
+    @Test
+    fun `returns configuration header when site can list users`() {
+        setupConfigurationHeader(canListUsers = true)
+
+        val configurationHeader = siteCategoryItemBuilder.buildConfigurationHeaderIfAvailable(siteModel)
+
+        assertThat(configurationHeader).isEqualTo(CategoryHeader(UiStringRes(R.string.my_site_header_configuration)))
+    }
+
+    @Test
+    fun `returns configuration header when site can manage options`() {
+        setupConfigurationHeader(canManageOptions = true)
+
+        val configurationHeader = siteCategoryItemBuilder.buildConfigurationHeaderIfAvailable(siteModel)
+
+        assertThat(configurationHeader).isEqualTo(CategoryHeader(UiStringRes(R.string.my_site_header_configuration)))
+    }
+
+    @Test
+    fun `does not return configuration header when site cannot manage options, list users and is WPCom`() {
+        setupConfigurationHeader(canManageOptions = false, isWpCom = true, canListUsers = false)
+
+        val configurationHeader = siteCategoryItemBuilder.buildConfigurationHeaderIfAvailable(siteModel)
+
+        assertThat(configurationHeader).isNull()
+    }
+
+    private fun setupJetpackHeader(
+        isJetpackConnected: Boolean = true,
+        isAtomic: Boolean = false
+    ) {
+        whenever(siteModel.isJetpackConnected).thenReturn(isJetpackConnected)
+        whenever(siteModel.isWPComAtomic).thenReturn(isAtomic)
+    }
+
+    private fun setupConfigurationHeader(
+        canManageOptions: Boolean = false,
+        isWpCom: Boolean = true,
+        canListUsers: Boolean = false
+    ) {
+        whenever(siteModel.hasCapabilityManageOptions).thenReturn(canManageOptions)
+        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(isWpCom)
+        whenever(siteModel.hasCapabilityListUsers).thenReturn(canListUsers)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteIconUploadHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteIconUploadHandlerTest.kt
new file mode 100644
index 000000000000..6c09bbe2373f
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteIconUploadHandlerTest.kt
@@ -0,0 +1,144 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_UPLOADED
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.MY_SITE_ICON_UPLOAD_UNSUCCESSFUL
+import org.wordpress.android.fluxc.model.MediaModel
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.mysite.SiteIconUploadHandler.ItemUploadedModel
+import org.wordpress.android.ui.mysite.SiteIconUploadHandler.ItemUploadedModel.MediaUploaded
+import org.wordpress.android.ui.mysite.SiteIconUploadHandler.ItemUploadedModel.PostUploaded
+import org.wordpress.android.ui.uploads.UploadService.UploadErrorEvent
+import org.wordpress.android.ui.uploads.UploadService.UploadMediaSuccessEvent
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+
+class SiteIconUploadHandlerTest : BaseUnitTest() {
+    @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock lateinit var eventBusWrapper: EventBusWrapper
+    @Mock lateinit var postModel: PostModel
+    @Mock lateinit var mediaModel: MediaModel
+    @Mock lateinit var siteModel: SiteModel
+    private var uploadedEvents = mutableListOf<ItemUploadedModel>()
+    private lateinit var viewModel: SiteIconUploadHandler
+
+    @Before
+    fun setUp() {
+        viewModel = SiteIconUploadHandler(selectedSiteRepository, analyticsTrackerWrapper, eventBusWrapper)
+        uploadedEvents = mutableListOf()
+        viewModel.onUploadedItem.observeForever {
+            it?.getContentIfNotHandled()?.let { model ->
+                uploadedEvents.add(model)
+            }
+        }
+    }
+
+    @Test
+    fun `view model gets registered on creation`() {
+        verify(eventBusWrapper).register(viewModel)
+    }
+
+    @Test
+    fun `on post upload error hides progress bar, removes event, propagates event if site present and matches ID`() {
+        val message = "error message"
+        val event = UploadErrorEvent(postModel, message)
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+        val siteLocalId = 1
+        whenever(siteModel.id).thenReturn(siteLocalId)
+        whenever(postModel.localSiteId).thenReturn(siteLocalId)
+
+        viewModel.onEventMainThread(event)
+
+        verify(analyticsTrackerWrapper).track(MY_SITE_ICON_UPLOAD_UNSUCCESSFUL)
+        verify(eventBusWrapper).removeStickyEvent(event)
+        verify(selectedSiteRepository).showSiteIconProgressBar(false)
+        assertThat(uploadedEvents).containsOnly(PostUploaded(postModel, siteModel, message))
+    }
+
+    @Test
+    fun `on post upload error does not propagate event if site not present`() {
+        val message = "error message"
+        val event = UploadErrorEvent(postModel, message)
+
+        viewModel.onEventMainThread(event)
+
+        assertThat(uploadedEvents).isEmpty()
+    }
+
+    @Test
+    fun `on post upload error does not propagate event if site ID does not match post site ID`() {
+        val message = "error message"
+        val event = UploadErrorEvent(postModel, message)
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+        whenever(siteModel.id).thenReturn(1)
+        whenever(postModel.localSiteId).thenReturn(2)
+
+        viewModel.onEventMainThread(event)
+
+        assertThat(uploadedEvents).isEmpty()
+    }
+
+    @Test
+    fun `on media upload error hides progress bar, removes event, propagates event if media not empty`() {
+        val message = "error message"
+        val event = UploadErrorEvent(listOf(mediaModel), message)
+
+        viewModel.onEventMainThread(event)
+
+        verify(analyticsTrackerWrapper).track(MY_SITE_ICON_UPLOAD_UNSUCCESSFUL)
+        verify(eventBusWrapper).removeStickyEvent(event)
+        verify(selectedSiteRepository).showSiteIconProgressBar(false)
+        assertThat(uploadedEvents).containsOnly(MediaUploaded(listOf(mediaModel), null, message))
+    }
+
+    @Test
+    fun `on media upload error hides progress bar, removes event, does not propagate event if media empty`() {
+        val message = "error message"
+        val event = UploadErrorEvent(listOf(), message)
+
+        viewModel.onEventMainThread(event)
+
+        verify(analyticsTrackerWrapper).track(MY_SITE_ICON_UPLOAD_UNSUCCESSFUL)
+        verify(eventBusWrapper).removeStickyEvent(event)
+        verify(selectedSiteRepository).showSiteIconProgressBar(false)
+        assertThat(uploadedEvents).isEmpty()
+    }
+
+    @Test
+    fun `on media upload success removes event, updates icon ID if media not empty and icon upload in progress`() {
+        val message = "success message"
+        val event = UploadMediaSuccessEvent(listOf(mediaModel), message)
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+        whenever(selectedSiteRepository.isSiteIconUploadInProgress()).thenReturn(true)
+        val mediaId: Long = 10
+        whenever(mediaModel.mediaId).thenReturn(mediaId)
+
+        viewModel.onEventMainThread(event)
+
+        verify(analyticsTrackerWrapper).track(MY_SITE_ICON_UPLOADED)
+        verify(eventBusWrapper).removeStickyEvent(event)
+        verify(selectedSiteRepository).updateSiteIconMediaId(mediaId.toInt(), true)
+    }
+
+    @Test
+    fun `on media upload success removes event, propagates event if media not empty and icon upload not in progress`() {
+        val message = "success message"
+        val event = UploadMediaSuccessEvent(listOf(mediaModel), message)
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+        whenever(selectedSiteRepository.isSiteIconUploadInProgress()).thenReturn(false)
+
+        viewModel.onEventMainThread(event)
+
+        verify(analyticsTrackerWrapper).track(MY_SITE_ICON_UPLOADED)
+        verify(eventBusWrapper).removeStickyEvent(event)
+        assertThat(uploadedEvents).containsOnly(MediaUploaded(listOf(mediaModel), siteModel, message))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteInfoBlockBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteInfoBlockBuilderTest.kt
new file mode 100644
index 000000000000..36379407c230
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteInfoBlockBuilderTest.kt
@@ -0,0 +1,68 @@
+package org.wordpress.android.ui.mysite
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.viewmodel.ResourceProvider
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteInfoBlockBuilderTest {
+    @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var site: SiteModel
+    private lateinit var siteInfoBlockBuilder: SiteInfoBlockBuilder
+
+    @Before
+    fun setUp() {
+        siteInfoBlockBuilder = SiteInfoBlockBuilder(resourceProvider)
+    }
+
+    @Test
+    fun `shows title quick start focus point when showUpdateSiteTitleFocusPoint is true`() {
+        val buildSiteInfoBlock = buildSiteInfoBlock(
+                showUpdateSiteTitleFocusPoint = true
+        )
+
+        assertThat(buildSiteInfoBlock.showTitleFocusPoint).isTrue()
+    }
+
+    @Test
+    fun `hides title quick start focus point when showUpdateSiteTitleFocusPoint is false`() {
+        val buildSiteInfoBlock = buildSiteInfoBlock(
+                showUpdateSiteTitleFocusPoint = false
+        )
+
+        assertThat(buildSiteInfoBlock.showTitleFocusPoint).isFalse()
+    }
+
+    @Test
+    fun `shows icon quick start focus point when showUploadSiteIconFocusPoint is true`() {
+        val buildSiteInfoBlock = buildSiteInfoBlock(
+                showUploadSiteIconFocusPoint = true
+        )
+
+        assertThat(buildSiteInfoBlock.showIconFocusPoint).isTrue()
+    }
+
+    @Test
+    fun `hides icon quick start focus point when showUploadSiteIconFocusPoint is false`() {
+        val buildSiteInfoBlock = buildSiteInfoBlock(
+                showUploadSiteIconFocusPoint = false
+        )
+
+        assertThat(buildSiteInfoBlock.showIconFocusPoint).isFalse()
+    }
+
+    private fun buildSiteInfoBlock(
+        showUpdateSiteTitleFocusPoint: Boolean = false,
+        showUploadSiteIconFocusPoint: Boolean = false
+    ) =
+            siteInfoBlockBuilder.buildSiteInfoBlock(site,
+                    showUploadSiteIconFocusPoint, {}, {}, {}, {},
+                    showUpdateSiteTitleFocusPoint = showUpdateSiteTitleFocusPoint,
+                    showUploadSiteIconFocusPoint = showUploadSiteIconFocusPoint
+            )
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteItemFixtures.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteItemFixtures.kt
new file mode 100644
index 000000000000..9302b63b5312
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteItemFixtures.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.ui.mysite
+
+import org.wordpress.android.R
+import org.wordpress.android.ui.mysite.MySiteItem.CategoryHeader
+import org.wordpress.android.ui.mysite.MySiteItem.ListItem
+import org.wordpress.android.ui.utils.ListItemInteraction
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+
+val SITE_ITEM_ACTION: (ListItemAction) -> Unit = {}
+val JETPACK_HEADER = CategoryHeader(
+        UiStringRes(R.string.my_site_header_jetpack)
+)
+val PUBLISH_HEADER = CategoryHeader(UiStringRes(R.string.my_site_header_publish))
+val LOOK_AND_FEEL_HEADER = CategoryHeader(
+        UiStringRes(R.string.my_site_header_look_and_feel)
+)
+val CONFIGURATION_HEADER = CategoryHeader(
+        UiStringRes(R.string.my_site_header_configuration)
+)
+val EXTERNAL_HEADER = CategoryHeader(UiStringRes(R.string.my_site_header_external))
+val PLAN_NAME = "plan_name"
+val PLAN_ITEM = ListItem(
+        R.drawable.ic_plans_white_24dp,
+        UiStringRes(R.string.plan),
+        secondaryText = UiStringText(PLAN_NAME),
+        onClick = ListItemInteraction.create(ListItemAction.PLAN, SITE_ITEM_ACTION)
+)
+val JETPACK_ITEM = ListItem(
+        R.drawable.ic_cog_white_24dp,
+        UiStringRes(R.string.my_site_btn_jetpack_settings),
+        onClick = ListItemInteraction.create(ListItemAction.JETPACK_SETTINGS, SITE_ITEM_ACTION)
+)
+val STATS_ITEM = ListItem(
+        R.drawable.ic_stats_alt_white_24dp,
+        UiStringRes(R.string.stats),
+        onClick = ListItemInteraction.create(ListItemAction.STATS, SITE_ITEM_ACTION)
+)
+val ACTIVITY_ITEM = ListItem(
+        R.drawable.ic_gridicons_clipboard_white_24dp,
+        UiStringRes(R.string.activity_log),
+        onClick = ListItemInteraction.create(ListItemAction.ACTIVITY_LOG, SITE_ITEM_ACTION)
+)
+val BACKUP_ITEM = ListItem(
+        R.drawable.ic_gridicons_cloud_upload_white_24dp,
+        UiStringRes(R.string.backup),
+        onClick = ListItemInteraction.create(ListItemAction.BACKUP, SITE_ITEM_ACTION)
+)
+val SCAN_ITEM = ListItem(
+        R.drawable.ic_baseline_security_white_24dp,
+        UiStringRes(R.string.scan),
+        onClick = ListItemInteraction.create(ListItemAction.SCAN, SITE_ITEM_ACTION)
+)
+val PAGES_ITEM = ListItem(
+        R.drawable.ic_pages_white_24dp,
+        UiStringRes(R.string.my_site_btn_site_pages),
+        onClick = ListItemInteraction.create(ListItemAction.PAGES, SITE_ITEM_ACTION)
+)
+val POSTS_ITEM = ListItem(
+        R.drawable.ic_posts_white_24dp,
+        UiStringRes(R.string.my_site_btn_blog_posts),
+        onClick = ListItemInteraction.create(ListItemAction.POSTS, SITE_ITEM_ACTION)
+)
+val MEDIA_ITEM = ListItem(
+        R.drawable.ic_media_white_24dp,
+        UiStringRes(R.string.media),
+        onClick = ListItemInteraction.create(ListItemAction.MEDIA, SITE_ITEM_ACTION)
+)
+val COMMENTS_ITEM = ListItem(
+        R.drawable.ic_comment_white_24dp,
+        UiStringRes(R.string.my_site_btn_comments),
+        onClick = ListItemInteraction.create(ListItemAction.COMMENTS, SITE_ITEM_ACTION)
+)
+val ADMIN_ITEM = ListItem(
+        R.drawable.ic_wordpress_white_24dp,
+        UiStringRes(R.string.my_site_btn_view_admin),
+        secondaryIcon = R.drawable.ic_external_white_24dp,
+        onClick = ListItemInteraction.create(ListItemAction.ADMIN, SITE_ITEM_ACTION)
+)
+val PEOPLE_ITEM = ListItem(
+        R.drawable.ic_user_white_24dp,
+        UiStringRes(R.string.people),
+        onClick = ListItemInteraction.create(ListItemAction.PEOPLE, SITE_ITEM_ACTION)
+)
+val PLUGINS_ITEM = ListItem(
+        R.drawable.ic_plugins_white_24dp,
+        UiStringRes(R.string.my_site_btn_plugins),
+        onClick = ListItemInteraction.create(ListItemAction.PLUGINS, SITE_ITEM_ACTION)
+)
+val SHARING_ITEM = ListItem(
+        R.drawable.ic_share_white_24dp,
+        UiStringRes(R.string.my_site_btn_sharing),
+        onClick = ListItemInteraction.create(ListItemAction.SHARING, SITE_ITEM_ACTION)
+)
+val SITE_SETTINGS_ITEM = ListItem(
+        R.drawable.ic_cog_white_24dp,
+        UiStringRes(R.string.my_site_btn_site_settings),
+        onClick = ListItemInteraction.create(ListItemAction.SITE_SETTINGS, SITE_ITEM_ACTION)
+)
+val THEMES_ITEM = ListItem(
+        R.drawable.ic_themes_white_24dp,
+        UiStringRes(R.string.themes),
+        onClick = ListItemInteraction.create(ListItemAction.THEMES, SITE_ITEM_ACTION)
+)
+val VIEW_SITE_ITEM = ListItem(
+        R.drawable.ic_globe_white_24dp,
+        UiStringRes(R.string.my_site_btn_view_site),
+        secondaryIcon = R.drawable.ic_external_white_24dp,
+        onClick = ListItemInteraction.create(ListItemAction.VIEW_SITE, SITE_ITEM_ACTION)
+)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteItemsBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteItemsBuilderTest.kt
new file mode 100644
index 000000000000..93f50b0eb7cf
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteItemsBuilderTest.kt
@@ -0,0 +1,203 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteItemsBuilderTest {
+    @Mock lateinit var siteCategoryItemBuilder: SiteCategoryItemBuilder
+    @Mock lateinit var siteListItemBuilder: SiteListItemBuilder
+    @Mock lateinit var siteModel: SiteModel
+    private lateinit var siteItemsBuilder: SiteItemsBuilder
+
+    @Before
+    fun setUp() {
+        siteItemsBuilder = SiteItemsBuilder(siteCategoryItemBuilder, siteListItemBuilder)
+    }
+
+    @Test
+    fun `always adds stats, publish, posts, media, comment, external and view site items`() {
+        setupHeaders(addJetpackHeader = false, addLookAndFeelHeader = false, addConfigurationHeader = false)
+
+        val buildSiteItems = siteItemsBuilder.buildSiteItems(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(buildSiteItems).containsExactly(
+                STATS_ITEM,
+                PUBLISH_HEADER,
+                POSTS_ITEM,
+                MEDIA_ITEM,
+                COMMENTS_ITEM,
+                EXTERNAL_HEADER,
+                VIEW_SITE_ITEM
+        )
+    }
+
+    @Test
+    fun `adds all the items in the correct order`() {
+        setupHeaders(
+                addJetpackHeader = true,
+                addJetpackSettings = true,
+                addLookAndFeelHeader = true,
+                addConfigurationHeader = true,
+                addActivityLogItem = true,
+                addPlanItem = true,
+                addPagesItem = true,
+                addAdminItem = true,
+                addPeopleItem = true,
+                addPluginItem = true,
+                addShareItem = true,
+                addSiteSettingsItem = true,
+                addThemesItem = true,
+                addBackupItem = true,
+                addScanItem = true
+        )
+
+        val buildSiteItems = siteItemsBuilder.buildSiteItems(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(buildSiteItems).containsExactly(
+                PLAN_ITEM,
+                JETPACK_HEADER,
+                STATS_ITEM,
+                ACTIVITY_ITEM,
+                BACKUP_ITEM,
+                SCAN_ITEM,
+                JETPACK_ITEM,
+                PUBLISH_HEADER,
+                POSTS_ITEM,
+                MEDIA_ITEM,
+                PAGES_ITEM,
+                COMMENTS_ITEM,
+                LOOK_AND_FEEL_HEADER,
+                THEMES_ITEM,
+                CONFIGURATION_HEADER,
+                PEOPLE_ITEM,
+                PLUGINS_ITEM,
+                SHARING_ITEM,
+                SITE_SETTINGS_ITEM,
+                EXTERNAL_HEADER,
+                VIEW_SITE_ITEM,
+                ADMIN_ITEM
+        )
+    }
+
+    @Test
+    fun `passes parameter to show focus point to plan item`() {
+        val showPlansFocusPoint = true
+        setupHeaders(addPlanItem = true, showPlansFocusPoint = showPlansFocusPoint)
+
+        val buildSiteItems = siteItemsBuilder.buildSiteItems(
+                siteModel,
+                SITE_ITEM_ACTION,
+                showExplorePlansFocusPoint = showPlansFocusPoint
+        )
+
+        assertThat(buildSiteItems.first()).isEqualTo(PLAN_ITEM.copy(showFocusPoint = showPlansFocusPoint))
+    }
+
+    private fun setupHeaders(
+        addJetpackHeader: Boolean = false,
+        addJetpackSettings: Boolean = false,
+        addLookAndFeelHeader: Boolean = false,
+        addConfigurationHeader: Boolean = false,
+        addActivityLogItem: Boolean = false,
+        addPlanItem: Boolean = false,
+        addPagesItem: Boolean = false,
+        addAdminItem: Boolean = false,
+        addPeopleItem: Boolean = false,
+        addPluginItem: Boolean = false,
+        addShareItem: Boolean = false,
+        addSiteSettingsItem: Boolean = false,
+        addThemesItem: Boolean = false,
+        addBackupItem: Boolean = false,
+        addScanItem: Boolean = false,
+        showPlansFocusPoint: Boolean = false
+    ) {
+        if (addJetpackHeader) {
+            whenever(siteCategoryItemBuilder.buildJetpackCategoryIfAvailable(siteModel)).thenReturn(
+                    JETPACK_HEADER
+            )
+        }
+        if (addJetpackSettings) {
+            whenever(siteListItemBuilder.buildJetpackItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    JETPACK_ITEM
+            )
+        }
+        if (addLookAndFeelHeader) {
+            whenever(siteCategoryItemBuilder.buildLookAndFeelHeaderIfAvailable(siteModel)).thenReturn(
+                    LOOK_AND_FEEL_HEADER
+            )
+        }
+        if (addConfigurationHeader) {
+            whenever(siteCategoryItemBuilder.buildConfigurationHeaderIfAvailable(siteModel)).thenReturn(
+                    CONFIGURATION_HEADER
+            )
+        }
+        if (addPlanItem) {
+            whenever(
+                    siteListItemBuilder.buildPlanItemIfAvailable(
+                            siteModel,
+                            showPlansFocusPoint,
+                            SITE_ITEM_ACTION
+                    )
+            ).thenReturn(
+                    PLAN_ITEM.copy(showFocusPoint = showPlansFocusPoint)
+            )
+        }
+        if (addActivityLogItem) {
+            whenever(siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    ACTIVITY_ITEM
+            )
+        }
+        if (addBackupItem) {
+            whenever(siteListItemBuilder.buildBackupItemIfAvailable(SITE_ITEM_ACTION)).thenReturn(
+                    BACKUP_ITEM
+            )
+        }
+        if (addScanItem) {
+            whenever(siteListItemBuilder.buildScanItemIfAvailable(SITE_ITEM_ACTION)).thenReturn(
+                    SCAN_ITEM
+            )
+        }
+        if (addPagesItem) {
+            whenever(siteListItemBuilder.buildPagesItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    PAGES_ITEM
+            )
+        }
+        if (addAdminItem) {
+            whenever(siteListItemBuilder.buildAdminItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    ADMIN_ITEM
+            )
+        }
+        if (addPeopleItem) {
+            whenever(siteListItemBuilder.buildPeopleItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    PEOPLE_ITEM
+            )
+        }
+        if (addPluginItem) {
+            whenever(siteListItemBuilder.buildPluginItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    PLUGINS_ITEM
+            )
+        }
+        if (addShareItem) {
+            whenever(siteListItemBuilder.buildShareItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    SHARING_ITEM
+            )
+        }
+        if (addSiteSettingsItem) {
+            whenever(siteListItemBuilder.buildSiteSettingsItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    SITE_SETTINGS_ITEM
+            )
+        }
+        if (addThemesItem) {
+            whenever(siteListItemBuilder.buildThemesItemIfAvailable(siteModel, SITE_ITEM_ACTION)).thenReturn(
+                    THEMES_ITEM
+            )
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteListItemBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteListItemBuilderTest.kt
new file mode 100644
index 000000000000..96f3d96da89e
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteListItemBuilderTest.kt
@@ -0,0 +1,437 @@
+package org.wordpress.android.ui.mysite
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.AccountModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.ui.plugins.PluginUtilsWrapper
+import org.wordpress.android.ui.themes.ThemeBrowserUtils
+import org.wordpress.android.util.SiteUtilsWrapper
+
+@RunWith(MockitoJUnitRunner::class)
+class SiteListItemBuilderTest {
+    @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var pluginUtilsWrapper: PluginUtilsWrapper
+    @Mock lateinit var siteUtilsWrapper: SiteUtilsWrapper
+    @Mock lateinit var themeBrowserUtils: ThemeBrowserUtils
+    @Mock lateinit var siteModel: SiteModel
+    private lateinit var siteListItemBuilder: SiteListItemBuilder
+
+    @Before
+    fun setUp() {
+        siteListItemBuilder = SiteListItemBuilder(
+                accountStore,
+                pluginUtilsWrapper,
+                siteUtilsWrapper,
+                themeBrowserUtils
+        )
+    }
+
+    @Test
+    fun `activity item built when site uses WPComRest, can manage options and is not WP for teams`() {
+        setupActivityLogItem(
+                isAccessedViaWPComRest = true,
+                canManageOptions = true,
+                isJetpackConnected = false,
+                isWpForTeams = false
+        )
+
+        val item = siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(ACTIVITY_ITEM)
+    }
+
+    @Test
+    fun `activity item built when site is Jetpack, can manage options and is not WP for teams`() {
+        setupActivityLogItem(
+                isAccessedViaWPComRest = false,
+                canManageOptions = true,
+                isJetpackConnected = true,
+                isWpForTeams = false
+        )
+
+        val item = siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(ACTIVITY_ITEM)
+    }
+
+    @Test
+    fun `activity item not built when site cannot manage options`() {
+        setupActivityLogItem(canManageOptions = false)
+
+        val item = siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `activity item not built when site is WP for teams`() {
+        setupActivityLogItem(isWpForTeams = true)
+
+        val item = siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `activity item not built when site is neither Jetpack nor uses WPComRest`() {
+        setupActivityLogItem(isAccessedViaWPComRest = false, isJetpackConnected = false)
+
+        val item = siteListItemBuilder.buildActivityLogItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    private fun setupActivityLogItem(
+        isAccessedViaWPComRest: Boolean = true,
+        isJetpackConnected: Boolean = true,
+        canManageOptions: Boolean = true,
+        isWpForTeams: Boolean = false
+    ) {
+        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(isAccessedViaWPComRest)
+        whenever(siteModel.isJetpackConnected).thenReturn(isJetpackConnected)
+        whenever(siteModel.hasCapabilityManageOptions).thenReturn(canManageOptions)
+        whenever(siteModel.isWpForTeamsSite).thenReturn(isWpForTeams)
+    }
+
+    @Test
+    fun `backup item built if backup is available`() {
+        val isBackupsAvailable = true
+
+        val item = siteListItemBuilder.buildBackupItemIfAvailable(SITE_ITEM_ACTION, isBackupsAvailable)
+
+        assertThat(item).isEqualTo(BACKUP_ITEM)
+    }
+
+    @Test
+    fun `backup item not built if backup is not available`() {
+        val isBackupsAvailable = false
+
+        val item = siteListItemBuilder.buildBackupItemIfAvailable(SITE_ITEM_ACTION, isBackupsAvailable)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `scan item built if scan is available`() {
+        val isScanAvailable = true
+
+        val item = siteListItemBuilder.buildScanItemIfAvailable(SITE_ITEM_ACTION, isScanAvailable)
+
+        assertThat(item).isEqualTo(SCAN_ITEM)
+    }
+
+    @Test
+    fun `scan item not built if scan is not available`() {
+        val isScanAvailable = false
+
+        val item = siteListItemBuilder.buildScanItemIfAvailable(SITE_ITEM_ACTION, isScanAvailable)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `plan item built when plan not empty, site can manage options, is not WP for teams and is WPcom`() {
+        setupPlanItem(
+                planShortName = PLAN_NAME,
+                canManageOptions = true,
+                isWpForTeams = false,
+                isWPCom = true,
+                isAutomatedTransfer = false
+        )
+        val showFocusPoint = true
+
+        val item = siteListItemBuilder.buildPlanItemIfAvailable(siteModel, showFocusPoint, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(PLAN_ITEM.copy(showFocusPoint = showFocusPoint))
+    }
+
+    @Test
+    fun `plan item built when plan not empty, site can manage options, is not WP for teams and is AT`() {
+        setupPlanItem(
+                planShortName = PLAN_NAME,
+                canManageOptions = true,
+                isWpForTeams = false,
+                isWPCom = false,
+                isAutomatedTransfer = true
+        )
+
+        val item = siteListItemBuilder.buildPlanItemIfAvailable(siteModel, false, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(PLAN_ITEM)
+    }
+
+    @Test
+    fun `plan item not built when plan name is empty`() {
+        setupPlanItem(planShortName = "")
+
+        val item = siteListItemBuilder.buildPlanItemIfAvailable(siteModel, false, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `plan item not built when site cannot manage options`() {
+        setupPlanItem(canManageOptions = false)
+
+        val item = siteListItemBuilder.buildPlanItemIfAvailable(siteModel, false, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `plan item not built when site is WP for teams`() {
+        setupPlanItem(isWpForTeams = true)
+
+        val item = siteListItemBuilder.buildPlanItemIfAvailable(siteModel, false, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `plan item not built when site is neither WP com nor AT`() {
+        setupPlanItem(isWPCom = false, isAutomatedTransfer = false)
+
+        val item = siteListItemBuilder.buildPlanItemIfAvailable(siteModel, false, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    private fun setupPlanItem(
+        planShortName: String = PLAN_NAME,
+        canManageOptions: Boolean = true,
+        isWpForTeams: Boolean = false,
+        isWPCom: Boolean = true,
+        isAutomatedTransfer: Boolean = true
+    ) {
+        whenever(siteModel.planShortName).thenReturn(planShortName)
+        whenever(siteModel.hasCapabilityManageOptions).thenReturn(canManageOptions)
+        whenever(siteModel.isWpForTeamsSite).thenReturn(isWpForTeams)
+        whenever(siteModel.isWPCom).thenReturn(isWPCom)
+        whenever(siteModel.isAutomatedTransfer).thenReturn(isAutomatedTransfer)
+    }
+
+    @Test
+    fun `returns jetpack item when site is jetpack, WPCom, can manage options and is not atomic`() {
+        setupJetpackItem(isJetpackConnected = true, isWpCom = true, canManageOptions = true, isAtomic = false)
+
+        val lookAndFeelHeader = siteListItemBuilder.buildJetpackItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(lookAndFeelHeader).isEqualTo(JETPACK_ITEM)
+    }
+
+    @Test
+    fun `does not return jetpack item when site is not jetpack`() {
+        setupJetpackItem(isJetpackConnected = false)
+
+        val lookAndFeelHeader = siteListItemBuilder.buildJetpackItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    @Test
+    fun `does not return jetpack item when site is not WPCom`() {
+        setupJetpackItem(isWpCom = false)
+
+        val lookAndFeelHeader = siteListItemBuilder.buildJetpackItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    @Test
+    fun `does not return jetpack item when site can manage options`() {
+        setupJetpackItem(canManageOptions = false)
+
+        val lookAndFeelHeader = siteListItemBuilder.buildJetpackItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    @Test
+    fun `does not return jetpack item when site is atomic`() {
+        setupJetpackItem(isAtomic = true)
+
+        val lookAndFeelHeader = siteListItemBuilder.buildJetpackItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(lookAndFeelHeader).isNull()
+    }
+
+    private fun setupJetpackItem(
+        isJetpackConnected: Boolean = true,
+        isAtomic: Boolean = false,
+        isWpCom: Boolean = true,
+        canManageOptions: Boolean = true
+    ) {
+        whenever(siteModel.isJetpackConnected).thenReturn(isJetpackConnected)
+        whenever(siteModel.isWPComAtomic).thenReturn(isAtomic)
+        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(isWpCom)
+        whenever(siteModel.hasCapabilityManageOptions).thenReturn(canManageOptions)
+    }
+
+    @Test
+    fun `pages item not built when not self-hosted admin and cannot edit pages`() {
+        setupPagesItem(isSelfHostedAdmin = false, canEditPages = false)
+
+        val item = siteListItemBuilder.buildPagesItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `pages item built when self-hosted admin`() {
+        setupPagesItem(isSelfHostedAdmin = true)
+
+        val item = siteListItemBuilder.buildPagesItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(PAGES_ITEM)
+    }
+
+    @Test
+    fun `pages item built when can edit pages`() {
+        setupPagesItem(canEditPages = true)
+
+        val item = siteListItemBuilder.buildPagesItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(PAGES_ITEM)
+    }
+
+    private fun setupPagesItem(isSelfHostedAdmin: Boolean = false, canEditPages: Boolean = false) {
+        whenever(siteModel.isSelfHostedAdmin).thenReturn(isSelfHostedAdmin)
+        whenever(siteModel.hasCapabilityEditPages).thenReturn(canEditPages)
+    }
+
+    @Test
+    fun `admin item built when site is not WPCom`() {
+        setupAdminItem(isWPCom = false)
+
+        val item = siteListItemBuilder.buildAdminItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(ADMIN_ITEM)
+    }
+
+    @Test
+    fun `admin item built when site is WPCom and account created before 2015-10-07`() {
+        setupAdminItem(isWPCom = true, accountDate = "2015-10-06T02:00:00+0200")
+
+        val item = siteListItemBuilder.buildAdminItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(ADMIN_ITEM)
+    }
+
+    @Test
+    fun `admin item built when site is WPCom and account date is empty`() {
+        setupAdminItem(isWPCom = true, accountDate = "")
+
+        val item = siteListItemBuilder.buildAdminItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(ADMIN_ITEM)
+    }
+
+    @Test
+    fun `admin item not built when site is WPCom and account created after 2015-10-07`() {
+        setupAdminItem(isWPCom = true, accountDate = "2015-10-08T02:00:00+0200")
+
+        val item = siteListItemBuilder.buildAdminItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    private fun setupAdminItem(isWPCom: Boolean = true, accountDate: String = "") {
+        whenever(siteModel.isWPCom).thenReturn(isWPCom)
+        val accountModel = AccountModel()
+        accountModel.date = accountDate
+        whenever(accountStore.account).thenReturn(accountModel)
+    }
+
+    @Test
+    fun `people item built if site can list users`() {
+        whenever(siteModel.hasCapabilityListUsers).thenReturn(true)
+
+        val item = siteListItemBuilder.buildPeopleItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(PEOPLE_ITEM)
+    }
+
+    @Test
+    fun `people item not built if site cannot list users`() {
+        whenever(siteModel.hasCapabilityListUsers).thenReturn(false)
+
+        val item = siteListItemBuilder.buildPeopleItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `plugin item built if feature available`() {
+        whenever(pluginUtilsWrapper.isPluginFeatureAvailable(siteModel)).thenReturn(true)
+
+        val item = siteListItemBuilder.buildPluginItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(PLUGINS_ITEM)
+    }
+
+    @Test
+    fun `plugin item not built if feature not available`() {
+        whenever(pluginUtilsWrapper.isPluginFeatureAvailable(siteModel)).thenReturn(false)
+
+        val item = siteListItemBuilder.buildPluginItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `share item built if is accessed through WPCom REST`() {
+        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(true)
+
+        val item = siteListItemBuilder.buildShareItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(SHARING_ITEM)
+    }
+
+    @Test
+    fun `share item not built if is not accessed through WPCom REST`() {
+        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(false)
+
+        val item = siteListItemBuilder.buildShareItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `settings item built if site can manage options`() {
+        setupSiteSettings(canManageOptions = true)
+
+        val item = siteListItemBuilder.buildSiteSettingsItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(SITE_SETTINGS_ITEM)
+    }
+
+    @Test
+    fun `settings item built if site is not accessed through WPCom REST`() {
+        setupSiteSettings(isAccessedViaWPComRest = false)
+
+        val item = siteListItemBuilder.buildSiteSettingsItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isEqualTo(SITE_SETTINGS_ITEM)
+    }
+
+    @Test
+    fun `settings item not built if site is accessed through WPCom REST and cannot manage options`() {
+        setupSiteSettings(canManageOptions = false, isAccessedViaWPComRest = true)
+
+        val item = siteListItemBuilder.buildSiteSettingsItemIfAvailable(siteModel, SITE_ITEM_ACTION)
+
+        assertThat(item).isNull()
+    }
+
+    private fun setupSiteSettings(canManageOptions: Boolean = false, isAccessedViaWPComRest: Boolean = true) {
+        whenever(siteModel.hasCapabilityManageOptions).thenReturn(canManageOptions)
+        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(isAccessedViaWPComRest)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuViewModelTest.kt
new file mode 100644
index 000000000000..693a04e62c6f
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardMenuViewModelTest.kt
@@ -0,0 +1,75 @@
+package org.wordpress.android.ui.mysite.dynamiccards
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.DynamicCardType.CUSTOMIZE_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Hide
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Pin
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Remove
+import org.wordpress.android.ui.mysite.dynamiccards.DynamicCardMenuViewModel.DynamicCardMenuInteraction.Unpin
+
+@RunWith(MockitoJUnitRunner::class)
+class DynamicCardMenuViewModelTest : BaseUnitTest() {
+    private lateinit var viewModel: DynamicCardMenuViewModel
+    private lateinit var mInteractions: MutableList<DynamicCardMenuInteraction>
+
+    @Before
+    fun setUp() {
+        mInteractions = mutableListOf()
+
+        viewModel = DynamicCardMenuViewModel()
+        viewModel.onInteraction.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                mInteractions.add(it)
+            }
+        }
+    }
+
+    @Test
+    fun `when pin button is pressed, should emit Pin interaction event with correct id and isPinned is false`() {
+        viewModel.start(CUSTOMIZE_QUICK_START.name, false)
+        viewModel.onPinActionClicked()
+
+        assertThat(mInteractions).containsOnly(Pin(CUSTOMIZE_QUICK_START))
+    }
+
+    @Test
+    fun `when pin button is pressed, should emit Unpin interaction event when isPinned is true`() {
+        viewModel.start(CUSTOMIZE_QUICK_START.name, true)
+        viewModel.onPinActionClicked()
+
+        assertThat(mInteractions).containsOnly(Unpin(CUSTOMIZE_QUICK_START))
+    }
+
+    @Test
+    fun `when hide button is pressed, should emit Hide interaction event with correct id`() {
+        viewModel.start(CUSTOMIZE_QUICK_START.name, false)
+        viewModel.onHideActionClicked()
+
+        assertThat(mInteractions).containsOnly(Hide(CUSTOMIZE_QUICK_START))
+    }
+
+    @Test
+    fun `when don't show again button is pressed, should emit Remove interaction event with correct id`() {
+        viewModel.start(CUSTOMIZE_QUICK_START.name, false)
+        viewModel.onRemoveActionClicked()
+
+        assertThat(mInteractions).containsOnly(Remove(CUSTOMIZE_QUICK_START))
+    }
+
+    @Test
+    fun `when id changes, should emit interaction event with updated id`() {
+        viewModel.start(CUSTOMIZE_QUICK_START.name, false)
+        viewModel.onPinActionClicked()
+        viewModel.start(GROW_QUICK_START.name, false)
+        viewModel.onPinActionClicked()
+
+        assertThat(mInteractions).containsExactly(Pin(CUSTOMIZE_QUICK_START), Pin(GROW_QUICK_START))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardsSourceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardsSourceTest.kt
new file mode 100644
index 000000000000..8974588c6432
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/dynamiccards/DynamicCardsSourceTest.kt
@@ -0,0 +1,104 @@
+package org.wordpress.android.ui.mysite.dynamiccards
+
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Java6Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.DynamicCardType.CUSTOMIZE_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardType.GROW_QUICK_START
+import org.wordpress.android.fluxc.model.DynamicCardsModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.DynamicCardStore
+import org.wordpress.android.test
+import org.wordpress.android.testScope
+import org.wordpress.android.ui.mysite.MySiteUiState.PartialState.DynamicCardsUpdate
+import org.wordpress.android.ui.mysite.SelectedSiteRepository
+
+class DynamicCardsSourceTest : BaseUnitTest() {
+    @Mock lateinit var dynamicCardStore: DynamicCardStore
+    @Mock lateinit var selectedSiteRepository: SelectedSiteRepository
+    @Mock lateinit var siteModel: SiteModel
+    private lateinit var dynamicCardsSource: DynamicCardsSource
+    private val siteId: Int = 1
+
+    @Before
+    fun setUp() {
+        dynamicCardsSource = DynamicCardsSource(dynamicCardStore, selectedSiteRepository)
+        whenever(siteModel.id).thenReturn(siteId)
+    }
+
+    @Test
+    fun `returns cards from the store`() = test {
+        val pinnedItem = GROW_QUICK_START
+        val dynamicCardTypes = listOf(CUSTOMIZE_QUICK_START, GROW_QUICK_START)
+        whenever(dynamicCardStore.getCards(siteId)).thenReturn(
+                DynamicCardsModel(
+                        pinnedItem,
+                        dynamicCardTypes
+                )
+        )
+        var result: DynamicCardsUpdate? = null
+        dynamicCardsSource.buildSource(testScope(), siteId).observeForever { result = it }
+
+        assertThat(result?.pinnedDynamicCard).isEqualTo(pinnedItem)
+        assertThat(result?.cards).isEqualTo(dynamicCardTypes)
+    }
+
+    @Test
+    fun `hides card when site is present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+
+        dynamicCardsSource.hideItem(CUSTOMIZE_QUICK_START)
+
+        verify(dynamicCardStore).hideCard(siteId, CUSTOMIZE_QUICK_START)
+    }
+
+    @Test
+    fun `does not hide card when site not present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(null)
+
+        dynamicCardsSource.hideItem(GROW_QUICK_START)
+
+        verifyZeroInteractions(dynamicCardStore)
+    }
+
+    @Test
+    fun `pins card when site is present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+
+        dynamicCardsSource.pinItem(CUSTOMIZE_QUICK_START)
+
+        verify(dynamicCardStore).pinCard(siteId, CUSTOMIZE_QUICK_START)
+    }
+
+    @Test
+    fun `does not pin card when site not present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(null)
+
+        dynamicCardsSource.pinItem(GROW_QUICK_START)
+
+        verifyZeroInteractions(dynamicCardStore)
+    }
+
+    @Test
+    fun `unpins when site is present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(siteModel)
+
+        dynamicCardsSource.unpinItem()
+
+        verify(dynamicCardStore).unpinCard(siteId)
+    }
+
+    @Test
+    fun `does not unpin when site not present`() = test {
+        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(null)
+
+        dynamicCardsSource.unpinItem()
+
+        verifyZeroInteractions(dynamicCardStore)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/people/InviteLinksHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/people/InviteLinksHandlerTest.kt
new file mode 100644
index 000000000000..cf5e68dc77f4
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/people/InviteLinksHandlerTest.kt
@@ -0,0 +1,135 @@
+package org.wordpress.android.ui.people
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flow
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.test
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksData
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksError
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.GENERATING_LINKS
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.INITIALIZING
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.MANAGING_AVAILABLE_LINKS
+import org.wordpress.android.ui.utils.UiString.UiStringText
+
+@InternalCoroutinesApi
+class InviteLinksHandlerTest : BaseUnitTest() {
+    @Mock lateinit var inviteLinksUseCase: InviteLinksUseCase
+
+    private lateinit var inviteLinksHandler: InviteLinksHandler
+    private var uiState: InviteLinksState? = null
+    private var holder: SnackbarMessageHolder? = null
+    private val blogId = 100L
+
+    @Before
+    fun setUp() {
+        inviteLinksHandler = InviteLinksHandler(
+                inviteLinksUseCase,
+                TEST_DISPATCHER
+        )
+        setupObservers()
+    }
+
+    @Test
+    fun `manageState populates snackbar on Failure`() = test {
+        val errorMessage = UiStringText("error message")
+
+        val state = InviteLinksError(
+                scenarioContext = INITIALIZING,
+                error = errorMessage
+        )
+
+        whenever(
+                inviteLinksUseCase.getInviteLinksStatus(blogId, INITIALIZING)
+        ).thenReturn(flow { emit(state) })
+
+        inviteLinksHandler.handleInviteLinksStatusRequest(blogId, INITIALIZING)
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(errorMessage)
+        }
+    }
+
+    @Test
+    fun `handleInviteLinksStatusRequest collects expected state`() = test {
+        val state = InviteLinksData(
+                scenarioContext = INITIALIZING,
+                links = listOf(mock(), mock())
+        )
+
+        whenever(
+                inviteLinksUseCase.getInviteLinksStatus(blogId, INITIALIZING)
+        ).thenReturn(flow { emit(state) })
+
+        inviteLinksHandler.handleInviteLinksStatusRequest(blogId, INITIALIZING)
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        assertThat(holder).isNull()
+    }
+
+    @Test
+    fun `handleGenerateLinks collects expected state`() = test {
+        val state = InviteLinksData(
+                scenarioContext = GENERATING_LINKS,
+                links = listOf(mock(), mock())
+        )
+
+        whenever(inviteLinksUseCase.generateLinks(blogId)).thenReturn(flow { emit(state) })
+
+        inviteLinksHandler.handleGenerateLinks(blogId)
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        assertThat(holder).isNull()
+    }
+
+    @Test
+    fun `handleDisableLinks collects expected state`() = test {
+        val state = InviteLinksData(
+                scenarioContext = MANAGING_AVAILABLE_LINKS,
+                links = listOf()
+        )
+
+        whenever(inviteLinksUseCase.disableLinks(blogId)).thenReturn(flow { emit(state) })
+
+        inviteLinksHandler.handleDisableLinks(blogId)
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        assertThat(holder).isNull()
+    }
+
+    private fun setupObservers() {
+        uiState = null
+
+        inviteLinksHandler.inviteLinksState.observeForever {
+            uiState = it
+        }
+
+        holder = null
+        inviteLinksHandler.snackbarEvents.observeForever { event ->
+            event.applyIfNotHandled {
+                holder = this
+            }
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/people/InvitePeopleUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/people/InvitePeopleUtilsTest.kt
new file mode 100644
index 000000000000..89ac78fa2808
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/people/InvitePeopleUtilsTest.kt
@@ -0,0 +1,124 @@
+package org.wordpress.android.ui.people
+
+import android.content.Context
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.RoleModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.models.InvitePeopleUtils
+import org.wordpress.android.models.wrappers.RoleUtilsWrapper
+import org.wordpress.android.models.wrappers.SimpleDateFormatWrapper
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksItem
+import org.wordpress.android.util.DateTimeUtilsWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import java.text.DateFormat
+import java.util.Date
+
+class InvitePeopleUtilsTest : BaseUnitTest() {
+    @Mock lateinit var siteStore: SiteStore
+    @Mock lateinit var siteModel: SiteModel
+    @Mock lateinit var contextProvider: ContextProvider
+    @Mock lateinit var dateTimeUtilsWrapper: DateTimeUtilsWrapper
+    @Mock lateinit var roleUtilsWrapper: RoleUtilsWrapper
+    @Mock lateinit var context: Context
+    @Mock lateinit var simpleDateFormatWrapper: SimpleDateFormatWrapper
+    @Mock lateinit var dateFormat: DateFormat
+
+    private lateinit var invitePeopleUtils: InvitePeopleUtils
+
+    private val roles = listOf(
+            RoleModel().apply {
+                name = "administrator"
+                displayName = "Administrator"
+            },
+            RoleModel().apply {
+                name = "contributor"
+                displayName = "Contributor"
+            }
+    )
+
+    private val linkItems = mutableListOf(
+            InviteLinksItem(
+                    role = "administrator",
+                    expiry = 0,
+                    link = "https://wordpress.com/linkdata"
+            ),
+            InviteLinksItem(
+                    role = "follower",
+                    expiry = 0,
+                    link = "https://wordpress.com/linkdata"
+            )
+    )
+
+    @Before
+    fun setUp() {
+        val date: Date = mock()
+        whenever(contextProvider.getContext()).thenReturn(context)
+        whenever(roleUtilsWrapper.getInviteRoles(siteStore, siteModel, context)).thenReturn(roles)
+        whenever(dateTimeUtilsWrapper.dateFromTimestamp(anyLong())).thenReturn(date)
+        whenever(dateFormat.format(eq(date))).thenReturn("")
+        whenever(simpleDateFormatWrapper.getDateInstance()).thenReturn(dateFormat)
+
+        invitePeopleUtils = InvitePeopleUtils(
+                siteStore,
+                contextProvider,
+                dateTimeUtilsWrapper,
+                roleUtilsWrapper,
+                simpleDateFormatWrapper
+        )
+    }
+
+    @Test
+    fun `link data found by available display name`() {
+        val item = invitePeopleUtils.getInviteLinkDataFromRoleDisplayName(linkItems, siteModel, "Administrator")
+
+        requireNotNull(item).let {
+            assertThat(it.role).isEqualTo("administrator")
+        }
+    }
+
+    @Test
+    fun `link data not found by missing display name`() {
+        val item = invitePeopleUtils.getInviteLinkDataFromRoleDisplayName(linkItems, siteModel, "Follower")
+
+        assertThat(item).isNull()
+    }
+
+    @Test
+    fun `display name found for available role`() {
+        val displayName = invitePeopleUtils.getDisplayNameForRole(siteModel, "administrator")
+
+        assertThat(displayName).isEqualTo("Administrator")
+    }
+
+    @Test
+    fun `display name not found for missing role`() {
+        val displayName = invitePeopleUtils.getDisplayNameForRole(siteModel, "follower")
+
+        assertThat(displayName).isEmpty()
+    }
+
+    @Test
+    fun `ui items list created as expected`() {
+        val uiItemsList = invitePeopleUtils.getMappedLinksUiItems(linkItems, siteModel)
+
+        assertThat(uiItemsList.count()).isEqualTo(1)
+        assertThat(uiItemsList.get(0).roleName).isEqualTo("administrator")
+    }
+
+    @Test
+    fun `role display names created as expected`() {
+        val displayNamesList = invitePeopleUtils.getInviteLinksRoleDisplayNames(linkItems, siteModel)
+
+        assertThat(displayNamesList.count()).isEqualTo(1)
+        assertThat(displayNamesList.get(0)).isEqualTo("Administrator")
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/people/PeopleInviteViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/people/PeopleInviteViewModelTest.kt
new file mode 100644
index 000000000000..4070f9154513
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/people/PeopleInviteViewModelTest.kt
@@ -0,0 +1,225 @@
+package org.wordpress.android.ui.people
+
+import android.content.Context
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.anyList
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.models.InvitePeopleUtils
+import org.wordpress.android.test
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksItem
+import org.wordpress.android.ui.people.InviteLinksUiStateType.HIDDEN
+import org.wordpress.android.ui.people.InviteLinksUiStateType.LOADING
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksData
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.INITIALIZING
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DateTimeUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.Event
+
+@InternalCoroutinesApi
+class PeopleInviteViewModelTest : BaseUnitTest() {
+    @Mock lateinit var inviteLinksHandler: InviteLinksHandler
+    @Mock lateinit var dateTimeUtilsWrapper: DateTimeUtilsWrapper
+    @Mock lateinit var contextProvider: ContextProvider
+    @Mock lateinit var invitePeopleUtils: InvitePeopleUtils
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    @Mock lateinit var siteModel: SiteModel
+    @Mock lateinit var context: Context
+    @Mock lateinit var inviteLinksItem: InviteLinksItem
+
+    private lateinit var viewModel: PeopleInviteViewModel
+    private val blogId = 100L
+
+    private val snackbarEvents = MutableLiveData<Event<SnackbarMessageHolder>>()
+    private val inviteLinksState = MutableLiveData<InviteLinksState>()
+
+    private var holder: SnackbarMessageHolder? = null
+    private var uiState: InviteLinksUiState? = null
+    private var sharedLink: InviteLinksItem? = null
+    private var rolesForSelectDialog: Array<String>? = null
+
+    @Before
+    fun setUp() {
+        whenever(inviteLinksHandler.snackbarEvents).thenReturn(snackbarEvents)
+        whenever(inviteLinksHandler.inviteLinksState).thenReturn(inviteLinksState)
+        whenever(siteModel.siteId).thenReturn(blogId)
+        whenever(siteModel.isWpForTeamsSite).thenReturn(true)
+        whenever(contextProvider.getContext()).thenReturn(context)
+
+        viewModel = PeopleInviteViewModel(
+                inviteLinksHandler,
+                TEST_DISPATCHER,
+                dateTimeUtilsWrapper,
+                contextProvider,
+                invitePeopleUtils,
+                analyticsUtilsWrapper
+        )
+    }
+
+    @Test
+    fun `View Model has expected state when starting and site is WP for teams site`() = test {
+        setupObvserversAndStart()
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(getInviteLinksUiState())
+        }
+
+        verify(
+                inviteLinksHandler, times(1)
+        ).handleInviteLinksStatusRequest(anyLong(), eq(INITIALIZING))
+    }
+
+    @Test
+    fun `View Model has expected state when starting and site is NOT WP for teams site`() = test {
+        whenever(siteModel.isWpForTeamsSite).thenReturn(false)
+
+        setupObvserversAndStart()
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(getInviteLinksUiState(type = HIDDEN, isLinksSectionVisible = false))
+        }
+    }
+
+    @Test
+    fun `selecting links role opens role dialog`() {
+        val roles = listOf("administrator", "contributor")
+
+        whenever(invitePeopleUtils.getInviteLinksRoleDisplayNames(anyList(), eq(siteModel))).thenReturn(roles)
+
+        setupObvserversAndStart()
+
+        viewModel.onLinksRoleClicked()
+
+        requireNotNull(rolesForSelectDialog).let {
+            assertThat(it).isEqualTo(roles.toTypedArray())
+        }
+    }
+
+    @Test
+    fun `selecting links role gives error if role cannot be found`() {
+        val roles = listOf<String>()
+        val message = "snackbar message"
+
+        whenever(invitePeopleUtils.getInviteLinksRoleDisplayNames(anyList(), eq(siteModel))).thenReturn(roles)
+        whenever(context.getString(anyInt())).thenReturn(message)
+
+        setupObvserversAndStart()
+
+        viewModel.onLinksRoleClicked()
+
+        assertThat(rolesForSelectDialog).isNull()
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(UiStringText(message))
+        }
+    }
+
+    @Test
+    fun `expected link is shared when data is found`() {
+        val role = "viewer"
+
+        whenever(inviteLinksItem.role).thenReturn(role)
+        whenever(
+                invitePeopleUtils.getInviteLinkDataFromRoleDisplayName(anyList(), eq(siteModel), eq(role))
+        ).thenReturn(inviteLinksItem)
+
+        setupObvserversAndStart()
+
+        viewModel.onShareButtonClicked(role)
+
+        requireNotNull(sharedLink).let {
+            assertThat(it).isEqualTo(inviteLinksItem)
+        }
+    }
+
+    @Test
+    fun `snackbar is shown when link to shared data is not found`() {
+        val role = "viewer"
+        val message = "snackbar message"
+
+        whenever(inviteLinksItem.role).thenReturn(role)
+        whenever(
+                invitePeopleUtils.getInviteLinkDataFromRoleDisplayName(anyList(), eq(siteModel), eq(role))
+        ).thenReturn(null)
+        whenever(context.getString(anyInt(), eq(role))).thenReturn(message)
+
+        setupObvserversAndStart()
+        inviteLinksState.value = InviteLinksData(INITIALIZING, listOf(inviteLinksItem))
+
+        viewModel.onShareButtonClicked(role)
+
+        assertThat(sharedLink).isNull()
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(UiStringText(message))
+        }
+    }
+
+    private fun setupObvserversAndStart() {
+        viewModel.inviteLinksUiState.observeForever {
+            uiState = it
+        }
+
+        viewModel.shareLink.observeForever {
+            it.applyIfNotHandled {
+                sharedLink = this
+            }
+        }
+
+        viewModel.snackbarEvents.observeForever {
+            it.applyIfNotHandled {
+                holder = this
+            }
+        }
+
+        viewModel.showSelectLinksRoleDialog.observeForever {
+            it.applyIfNotHandled {
+                rolesForSelectDialog = this
+            }
+        }
+
+        viewModel.start(siteModel)
+    }
+
+    companion object {
+        fun getInviteLinksUiState(
+            type: InviteLinksUiStateType = LOADING,
+            isLinksSectionVisible: Boolean = true,
+            loadAndRetryUiState: LoadAndRetryUiState = LoadAndRetryUiState.LOADING,
+            isShimmerSectionVisible: Boolean = false,
+            isRoleSelectionAllowed: Boolean = false,
+            links: List<InviteLinksUiItem> = listOf(),
+            inviteLinksSelectedRole: InviteLinksUiItem = InviteLinksUiItem.getEmptyItem(),
+            enableManageLinksActions: Boolean = false,
+            startShimmer: Boolean = isShimmerSectionVisible && type == LOADING,
+            isActionButtonsEnabled: Boolean = !startShimmer
+        ): InviteLinksUiState {
+            return InviteLinksUiState(
+                    type = type,
+                    isLinksSectionVisible = isLinksSectionVisible,
+                    loadAndRetryUiState = loadAndRetryUiState,
+                    isShimmerSectionVisible = isShimmerSectionVisible,
+                    isRoleSelectionAllowed = isRoleSelectionAllowed,
+                    links = links,
+                    inviteLinksSelectedRole = inviteLinksSelectedRole,
+                    enableManageLinksActions = enableManageLinksActions,
+                    startShimmer = startShimmer,
+                    isActionButtonsEnabled = isActionButtonsEnabled
+            )
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/people/usecases/InviteLinksUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/people/usecases/InviteLinksUseCaseTest.kt
new file mode 100644
index 000000000000..7d518a9c1833
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/people/usecases/InviteLinksUseCaseTest.kt
@@ -0,0 +1,191 @@
+package org.wordpress.android.ui.people.usecases
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R.string
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.SiteStore
+import org.wordpress.android.test
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Failure
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksCallResult.Success
+import org.wordpress.android.ui.people.InviteLinksApiCallsProvider.InviteLinksItem
+import org.wordpress.android.ui.people.InviteLinksUseCase
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksData
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksError
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.InviteLinksLoading
+import org.wordpress.android.ui.people.InviteLinksUseCase.InviteLinksState.UserNotAuthenticated
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.GENERATING_LINKS
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.INITIALIZING
+import org.wordpress.android.ui.people.InviteLinksUseCase.UseCaseScenarioContext.MANAGING_AVAILABLE_LINKS
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
+
+class InviteLinksUseCaseTest : BaseUnitTest() {
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var inviteLinksApiCallsProvider: InviteLinksApiCallsProvider
+    @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    @Mock lateinit var siteStore: SiteStore
+
+    private lateinit var inviteLinksUseCase: InviteLinksUseCase
+    private val blogId = 100L
+
+    @Before
+    fun setUp() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+
+        inviteLinksUseCase = InviteLinksUseCase(
+                networkUtilsWrapper,
+                inviteLinksApiCallsProvider,
+                accountStore,
+                analyticsUtilsWrapper,
+                siteStore
+        )
+    }
+
+    @Test
+    fun `makeChecksAndApplyStrategy emits expected state when user not logged in`() = test {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+
+        val flow = inviteLinksUseCase.getInviteLinksStatus(blogId, INITIALIZING)
+
+        assertThat(flow.toList()).isEqualTo(listOf(UserNotAuthenticated))
+    }
+
+    @Test
+    fun `makeChecksAndApplyStrategy emits expected states when no network`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val flow = inviteLinksUseCase.getInviteLinksStatus(blogId, INITIALIZING)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(INITIALIZING),
+                        InviteLinksError(INITIALIZING, UiStringRes(string.error_network_connection))
+                )
+        )
+    }
+
+    @Test
+    fun `getInviteLinksStatus emits expected states on Success`() = test {
+        val inviteLinks = listOf<InviteLinksItem>(mock(), mock())
+
+        whenever(inviteLinksApiCallsProvider.getInviteLinksStatus(anyLong())).thenReturn(Success(inviteLinks))
+
+        val flow = inviteLinksUseCase.getInviteLinksStatus(blogId, INITIALIZING)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(INITIALIZING),
+                        InviteLinksData(INITIALIZING, inviteLinks)
+                )
+        )
+    }
+
+    @Test
+    fun `getInviteLinksStatus emits expected states on Failure`() = test {
+        val error = "error message"
+
+        whenever(inviteLinksApiCallsProvider.getInviteLinksStatus(anyLong())).thenReturn(Failure(error))
+
+        val flow = inviteLinksUseCase.getInviteLinksStatus(blogId, INITIALIZING)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(INITIALIZING),
+                        InviteLinksError(INITIALIZING, UiStringText(error))
+                )
+        )
+    }
+
+    @Test
+    fun `generateInvitesStrategy emits expected states when getInviteLinksStatus succeeds`() = test {
+        val inviteLinks = listOf<InviteLinksItem>(mock(), mock())
+
+        whenever(inviteLinksApiCallsProvider.generateLinks(anyLong())).thenReturn(Success(listOf()))
+        whenever(inviteLinksApiCallsProvider.getInviteLinksStatus(anyLong())).thenReturn(Success(inviteLinks))
+
+        val flow = inviteLinksUseCase.generateLinks(blogId)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(GENERATING_LINKS),
+                        InviteLinksData(GENERATING_LINKS, inviteLinks)
+                )
+        )
+    }
+
+    @Test
+    fun `generateInvitesStrategy emits expected states when getInviteLinksStatus fails`() = test {
+        val error = "error message"
+
+        whenever(inviteLinksApiCallsProvider.generateLinks(anyLong())).thenReturn(Success(listOf()))
+        whenever(inviteLinksApiCallsProvider.getInviteLinksStatus(anyLong())).thenReturn(Failure(error))
+
+        val flow = inviteLinksUseCase.generateLinks(blogId)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(GENERATING_LINKS),
+                        InviteLinksError(GENERATING_LINKS, UiStringText(error))
+                )
+        )
+    }
+
+    @Test
+    fun `generateInvitesStrategy emits expected states when generateLinks fails`() = test {
+        val error = "error message"
+
+        whenever(inviteLinksApiCallsProvider.generateLinks(anyLong())).thenReturn(Success(listOf()))
+        whenever(inviteLinksApiCallsProvider.getInviteLinksStatus(anyLong())).thenReturn(Failure(error))
+
+        val flow = inviteLinksUseCase.generateLinks(blogId)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(InviteLinksLoading(GENERATING_LINKS),
+                        InviteLinksError(GENERATING_LINKS, UiStringText(error))
+                )
+        )
+    }
+
+    @Test
+    fun `disableInvitesStrategy emits expected states on Success`() = test {
+        whenever(inviteLinksApiCallsProvider.disableLinks(anyLong())).thenReturn(Success(listOf()))
+
+        val flow = inviteLinksUseCase.disableLinks(blogId)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(MANAGING_AVAILABLE_LINKS),
+                        InviteLinksData(MANAGING_AVAILABLE_LINKS, listOf())
+                )
+        )
+    }
+
+    @Test
+    fun `disableInvitesStrategy emits expected states on Failure`() = test {
+        val error = "error message"
+
+        whenever(inviteLinksApiCallsProvider.disableLinks(anyLong())).thenReturn(Failure(error))
+
+        val flow = inviteLinksUseCase.disableLinks(blogId)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(
+                        InviteLinksLoading(MANAGING_AVAILABLE_LINKS),
+                        InviteLinksError(MANAGING_AVAILABLE_LINKS, UiStringText(error))
+                )
+        )
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModelTest.kt
index 3f8ee49751c4..3cf3ea4954d1 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModelTest.kt
@@ -28,13 +28,14 @@ import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.BottomBarUiMode
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.PhotoListUiModel
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.PhotoPickerUiState
 import org.wordpress.android.ui.photopicker.PhotoPickerViewModel.SoftAskViewUiModel
+import org.wordpress.android.ui.posts.editor.media.CopyMediaToAppStorageUseCase
+import org.wordpress.android.ui.posts.editor.media.GetMediaModelUseCase
 import org.wordpress.android.ui.utils.UiString
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.UriWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
-import org.wordpress.android.util.config.TenorFeatureConfig
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ResourceProvider
 
@@ -45,9 +46,10 @@ class PhotoPickerViewModelTest : BaseUnitTest() {
     @Mock lateinit var uriWrapper1: UriWrapper
     @Mock lateinit var uriWrapper2: UriWrapper
     @Mock lateinit var permissionsHandler: PermissionsHandler
-    @Mock lateinit var tenorFeatureConfig: TenorFeatureConfig
     @Mock lateinit var context: Context
     @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var copyMediaToAppStorageUseCase: CopyMediaToAppStorageUseCase
+    @Mock lateinit var getMediaModelUseCase: GetMediaModelUseCase
     private lateinit var viewModel: PhotoPickerViewModel
     private var uiStates = mutableListOf<PhotoPickerUiState>()
     private var navigateEvents = mutableListOf<Event<UriWrapper>>()
@@ -67,8 +69,9 @@ class PhotoPickerViewModelTest : BaseUnitTest() {
                 analyticsUtilsWrapper,
                 analyticsTrackerWrapper,
                 permissionsHandler,
-                tenorFeatureConfig,
-                resourceProvider
+                resourceProvider,
+                copyMediaToAppStorageUseCase,
+                getMediaModelUseCase
         )
         uiStates.clear()
         firstItem = PhotoPickerItem(1, uriWrapper1, false)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/BasicDialogViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/BasicDialogViewModelTest.kt
new file mode 100644
index 000000000000..f0588d6b74e3
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/BasicDialogViewModelTest.kt
@@ -0,0 +1,54 @@
+package org.wordpress.android.ui.posts
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Dismissed
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Negative
+import org.wordpress.android.ui.posts.BasicDialogViewModel.DialogInteraction.Positive
+
+class BasicDialogViewModelTest : BaseUnitTest() {
+    private lateinit var interactions: MutableList<DialogInteraction>
+    private lateinit var viewModel: BasicDialogViewModel
+    private val tag = "tag"
+
+    @Before
+    fun setUp() {
+        viewModel = BasicDialogViewModel()
+        interactions = mutableListOf()
+        viewModel.onInteraction.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                interactions.add(it)
+            }
+        }
+    }
+
+    @Test
+    fun `propagates positive interaction`() {
+        viewModel.onPositiveClicked(tag)
+
+        assertThat(interactions).hasSize(1)
+        assertThat(interactions.last().tag).isEqualTo(tag)
+        assertThat(interactions.last() is Positive).isTrue()
+    }
+
+    @Test
+    fun `propagates negative interaction`() {
+        viewModel.onNegativeButtonClicked(tag)
+
+        assertThat(interactions).hasSize(1)
+        assertThat(interactions.last().tag).isEqualTo(tag)
+        assertThat(interactions.last() is Negative).isTrue()
+    }
+
+    @Test
+    fun `propagates dismiss interaction`() {
+        viewModel.onDismissByOutsideTouch(tag)
+
+        assertThat(interactions).hasSize(1)
+        assertThat(interactions.last().tag).isEqualTo(tag)
+        assertThat(interactions.last() is Dismissed).isTrue()
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelCopyPostTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelCopyPostTest.kt
new file mode 100644
index 000000000000..a13a1927f24b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelCopyPostTest.kt
@@ -0,0 +1,116 @@
+package org.wordpress.android.ui.posts
+
+import androidx.lifecycle.Observer
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentCaptor
+import org.mockito.Mock
+import org.mockito.Mockito
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.Dispatcher
+import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.post.PostStatus
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRestClient
+import org.wordpress.android.fluxc.network.xmlrpc.post.PostXMLRPCClient
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
+import org.wordpress.android.fluxc.store.PostStore
+import org.wordpress.android.ui.posts.PostListAction.EditPost
+
+class PostListMainViewModelCopyPostTest : BaseUnitTest() {
+    @Mock lateinit var site: SiteModel
+    @Mock lateinit var dispatcher: Dispatcher
+    @Mock lateinit var postSqlUtils: PostSqlUtils
+    @Mock lateinit var onPostListActionObserver: Observer<PostListAction>
+
+    private lateinit var viewModel: PostListMainViewModel
+    private lateinit var postStore: PostStore
+
+    private val copyPostId = 2
+    private val mockedPost = PostModel().apply {
+        setId(1)
+        setTitle("mockedTitle")
+        setContent("mockedContent")
+        setCategoryIdList(listOf()) // Using an empty list to avoid invoking android.text.TextUtils.join
+        setPostFormat("mockedPostFormat")
+    }
+
+    @InternalCoroutinesApi
+    @Before
+    fun setUp() {
+        postStore = PostStore(
+                dispatcher,
+                Mockito.mock(PostRestClient::class.java),
+                Mockito.mock(PostXMLRPCClient::class.java),
+                postSqlUtils
+        )
+        viewModel = PostListMainViewModel(
+                dispatcher = dispatcher,
+                postStore = postStore,
+                accountStore = mock(),
+                uploadStore = mock(),
+                mediaStore = mock(),
+                networkUtilsWrapper = mock(),
+                prefs = mock(),
+                previewStateHelper = mock(),
+                analyticsTracker = mock(),
+                mainDispatcher = Dispatchers.Unconfined,
+                bgDispatcher = Dispatchers.Unconfined,
+                postListEventListenerFactory = mock(),
+                uploadStarter = mock(),
+                uploadActionUseCase = mock(),
+                savePostToDbUseCase = mock()
+        )
+        viewModel.postListAction.observeForever(onPostListActionObserver)
+
+        whenever(postSqlUtils.insertPostForResult(any())).thenAnswer { invocation ->
+            (invocation.arguments[0] as PostModel).apply { setId(copyPostId) }
+        }
+    }
+
+    @Test
+    fun `when the user copies a post the editor opens`() {
+        viewModel.copyPost(site, mockedPost)
+        val captor = ArgumentCaptor.forClass(PostListAction::class.java)
+        verify(onPostListActionObserver).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value is EditPost))
+    }
+
+    @Test
+    fun `when the user copies a post a new post is created`() {
+        viewModel.copyPost(site, mockedPost)
+        val captor = ArgumentCaptor.forClass(PostListAction::class.java)
+        verify(onPostListActionObserver).onChanged(captor.capture())
+        val newPost = requireNotNull(captor.value as? EditPost).post
+        assertThat(newPost.id).isNotEqualTo(mockedPost.id)
+        assertThat(newPost.id).isEqualTo(copyPostId)
+    }
+
+    @Test
+    fun `when the user copies a post the title, content, categories and post format is copied in the new post`() {
+        viewModel.copyPost(site, mockedPost)
+        val captor = ArgumentCaptor.forClass(PostListAction::class.java)
+        verify(onPostListActionObserver).onChanged(captor.capture())
+        val newPost = requireNotNull(captor.value as? EditPost).post
+        assertThat(newPost.title).isEqualTo(mockedPost.title)
+        assertThat(newPost.content).isEqualTo(mockedPost.content)
+        assertThat(newPost.categoryIdList).isEqualTo(mockedPost.categoryIdList)
+        assertThat(newPost.postFormat).isEqualTo(mockedPost.postFormat)
+    }
+
+    @Test
+    fun `when the user copies a published post a draft copy of the post is opened for edit`() {
+        viewModel.copyPost(site, mockedPost.apply { setStatus(PostStatus.PUBLISHED.toString()) })
+        val captor = ArgumentCaptor.forClass(PostListAction::class.java)
+        verify(onPostListActionObserver).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value is EditPost))
+        assertThat((captor.value as EditPost).post.status).isEqualTo(PostStatus.DRAFT.toString())
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelTest.kt
index 32686979359b..115a8a1747c1 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostListMainViewModelTest.kt
@@ -24,7 +24,6 @@ import org.wordpress.android.ui.posts.PostListViewLayoutType.COMPACT
 import org.wordpress.android.ui.posts.PostListViewLayoutType.STANDARD
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.uploads.UploadStarter
-import org.wordpress.android.util.config.WPStoriesFeatureConfig
 import org.wordpress.android.viewmodel.Event
 
 class PostListMainViewModelTest : BaseUnitTest() {
@@ -34,7 +33,6 @@ class PostListMainViewModelTest : BaseUnitTest() {
     @Mock lateinit var dispatcher: Dispatcher
     @Mock lateinit var editPostRepository: EditPostRepository
     @Mock lateinit var savePostToDbUseCase: SavePostToDbUseCase
-    @Mock lateinit var wpStoriesFeatureConfig: WPStoriesFeatureConfig
     private lateinit var viewModel: PostListMainViewModel
 
     @InternalCoroutinesApi
@@ -61,8 +59,7 @@ class PostListMainViewModelTest : BaseUnitTest() {
                 postListEventListenerFactory = mock(),
                 uploadStarter = uploadStarter,
                 uploadActionUseCase = mock(),
-                savePostToDbUseCase = savePostToDbUseCase,
-                wpStoriesFeatureConfig = wpStoriesFeatureConfig
+                savePostToDbUseCase = savePostToDbUseCase
         )
     }
 
@@ -190,8 +187,7 @@ class PostListMainViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `if stories is enabled and onFabClicked then _onFabClicked is called`() {
-        whenever(wpStoriesFeatureConfig.isEnabled()).thenReturn(true)
+    fun `if onFabClicked then _onFabClicked is called`() {
         whenever(site.isWPCom).thenReturn(true)
 
         viewModel.start(site, PostListRemotePreviewState.NONE, currentBottomSheetPostId, editPostRepository, mock())
@@ -201,18 +197,7 @@ class PostListMainViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `if stories is disabled and onFabClicked then _onFabClicked is not called`() {
-        whenever(wpStoriesFeatureConfig.isEnabled()).thenReturn(false)
-
-        viewModel.start(site, PostListRemotePreviewState.NONE, currentBottomSheetPostId, editPostRepository, mock())
-        viewModel.fabClicked()
-
-        assertThat(viewModel.onFabClicked.value?.peekContent()).isNull()
-    }
-
-    @Test
-    fun `if stories is enabled and onFabLongPressed then onFabLongPressedForCreateMenu is called`() {
-        whenever(wpStoriesFeatureConfig.isEnabled()).thenReturn(true)
+    fun `if onFabLongPressed then onFabLongPressedForCreateMenu is called`() {
         whenever(site.isWPCom).thenReturn(true)
 
         viewModel.start(site, PostListRemotePreviewState.NONE, currentBottomSheetPostId, editPostRepository, mock())
@@ -220,14 +205,4 @@ class PostListMainViewModelTest : BaseUnitTest() {
 
         assertThat(viewModel.onFabLongPressedForCreateMenu.value?.peekContent()).isNotNull
     }
-
-    @Test
-    fun `if stories is disabled and onFabLongPressed then onFabLongPressedForPostList is called`() {
-        whenever(wpStoriesFeatureConfig.isEnabled()).thenReturn(false)
-
-        viewModel.start(site, PostListRemotePreviewState.NONE, currentBottomSheetPostId, editPostRepository, mock())
-        viewModel.onFabLongPressed()
-
-        assertThat(viewModel.onFabLongPressedForPostList.value?.peekContent()).isNotNull
-    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/PostUtilsUnitTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostUtilsUnitTest.kt
index 1ec83ec01a82..63670e401cea 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/PostUtilsUnitTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/PostUtilsUnitTest.kt
@@ -123,6 +123,20 @@ class PostUtilsUnitTest {
         assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, imgId)).isTrue()
     }
 
+    @Test
+    fun `isMediaInGutenberg returns true when a File Block is found in the post content`() {
+        val mediaId = "999"
+        val postContent = "<!-- wp:file {\"id\":$mediaId} --> ...... <!-- /wp:file -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, mediaId)).isTrue()
+    }
+
+    @Test
+    fun `isMediaInGutenberg returns true when an Audio Block is found in the post content`() {
+        val mediaId = "999"
+        val postContent = "<!-- wp:audio {\"id\":$mediaId} --> ...... <!-- /wp:audio -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, mediaId)).isTrue()
+    }
+
     @Test
     fun `isMediaInGutenberg returns false when an imageBlock with provided id is NOT found in the post content`() {
         val imgId = "123"
@@ -144,6 +158,20 @@ class PostUtilsUnitTest {
         assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, "999")).isFalse()
     }
 
+    @Test
+    fun `isMediaInGutenberg returns false when a File Block with provided id is NOT found in the post content`() {
+        val mediaId = "123"
+        val postContent = "<!-- wp:file {\"id\":$mediaId} --> ...... <!-- /wp:file -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, "999")).isFalse()
+    }
+
+    @Test
+    fun `isMediaInGutenberg returns false when an Audio Block with provided id is NOT found in the post content`() {
+        val mediaId = "123"
+        val postContent = "<!-- wp:audio {\"id\":$mediaId} --> ...... <!-- /wp:audio -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, "999")).isFalse()
+    }
+
     @Test
     fun `isMediaInGutenberg returns false for an imageBlock when only part of the id matches`() {
         val imgId = "12345"
@@ -165,6 +193,20 @@ class PostUtilsUnitTest {
         assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, "123")).isFalse()
     }
 
+    @Test
+    fun `isMediaInGutenberg returns false for a File Block when only part of the id matches`() {
+        val mediaId = "12345"
+        val postContent = "<!-- wp:file {\"id\":$mediaId} --> ...... <!-- /wp:file -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, "123")).isFalse()
+    }
+
+    @Test
+    fun `isMediaInGutenberg returns false for an Audio Block when only part of the id matches`() {
+        val mediaId = "12345"
+        val postContent = "<!-- wp:audio {\"id\":$mediaId} --> ...... <!-- /wp:audio -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, "123")).isFalse()
+    }
+
     @Test
     fun `isMediaInGutenberg returns false when a galleryBlock with provided id is NOT found in the post content`() {
         val imgId = "123"
@@ -194,6 +236,14 @@ class PostUtilsUnitTest {
         assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, imgId)).isTrue()
     }
 
+    @Test
+    fun `isMediaInGutenberg works when a File Block tag has multiple attributes`() {
+        val mediaId = "999"
+        val href = "https://example.com/my.mp3"
+        val postContent = "<!-- wp:file {\"id\":$mediaId,\"href\":\"$href\"} --> ...... <!-- /wp:file -->"
+        assertThat(PostUtils.isMediaInGutenbergPostBody(postContent, mediaId)).isTrue()
+    }
+
     @Test
     fun `isMediaInGutenberg works when a galleryBlock tag has multiple attributes`() {
         val imgId = "999"
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModelTest.kt
index b2d7ad0998fb..3c059b6e3d05 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/PrepublishingHomeViewModelTest.kt
@@ -371,6 +371,26 @@ class PrepublishingHomeViewModelTest : BaseUnitTest() {
         verify(updateStoryTitleUseCase).updateStoryTitle(eq(storyTitle), any())
     }
 
+    @Test
+    fun `verify story title is correctly updated when title is changed and publish is tapped `() {
+        // arrange
+        var event: Event<PublishPost>? = null
+        val storyTitle = "Story Title"
+        viewModel.onSubmitButtonClicked.observeForever {
+            event = it
+        }
+
+        // act
+        viewModel.start(editPostRepository, site, true)
+        getStoryTitleUiState()?.onStoryTitleChanged?.invoke(storyTitle)
+        val buttonUiState = getButtonUiState()
+        buttonUiState?.onButtonClicked?.invoke(true)
+
+        // assert
+        assertThat(event).isNotNull
+        verify(updateStoryTitleUseCase).updateStoryTitle(eq(storyTitle), any())
+    }
+
     private fun getHeaderUiState() = viewModel.uiState.value?.filterIsInstance(HeaderUiState::class.java)?.first()
     private fun getStoryTitleUiState() = viewModel.storyTitleUiState.value
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/StorePostViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/StorePostViewModelTest.kt
index 64d5a7e3de06..7ff6c6041fa5 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/StorePostViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/StorePostViewModelTest.kt
@@ -15,6 +15,7 @@ import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.editor.gutenberg.DialogVisibility
 import org.wordpress.android.editor.gutenberg.DialogVisibility.Hidden
 import org.wordpress.android.editor.gutenberg.DialogVisibility.Showing
+import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.PostImmutableModel
 import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
@@ -38,6 +39,7 @@ class StorePostViewModelTest : BaseUnitTest() {
     @Mock lateinit var postRepository: EditPostRepository
     @Mock lateinit var savePostToDbUseCase: SavePostToDbUseCase
     @Mock lateinit var networkUtils: NetworkUtilsWrapper
+    @Mock lateinit var dispatcher: Dispatcher
     @Mock lateinit var context: Context
 
     private lateinit var viewModel: StorePostViewModel
@@ -60,7 +62,8 @@ class StorePostViewModelTest : BaseUnitTest() {
                 postUtils,
                 uploadService,
                 savePostToDbUseCase,
-                networkUtils
+                networkUtils,
+                dispatcher
         )
         postModel.setId(postId)
         postModel.setTitle(title)
@@ -245,7 +248,7 @@ class StorePostViewModelTest : BaseUnitTest() {
         expected.add(Hidden)
         assertThat(actual).isEqualTo(expected)
 
-        viewModel.showSaveProgressDialog()
+        viewModel.showSavingProgressDialog()
         expected.add(Showing)
         assertThat(actual).isEqualTo(expected)
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/XPostsCapabilityCheckerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/XPostsCapabilityCheckerTest.kt
new file mode 100644
index 000000000000..3a9af588b3ff
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/XPostsCapabilityCheckerTest.kt
@@ -0,0 +1,71 @@
+package org.wordpress.android.ui.posts.editor
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.InjectMocks
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.XPostsResult
+import org.wordpress.android.fluxc.store.XPostsResult.Companion
+import org.wordpress.android.fluxc.store.XPostsStore
+import org.wordpress.android.test
+
+@RunWith(MockitoJUnitRunner::class)
+class XPostsCapabilityCheckerTest : BaseUnitTest() {
+    @Mock lateinit var mockXPostsStore: XPostsStore
+    @Mock lateinit var mockSite: SiteModel
+    @InjectMocks lateinit var xPostsCapabilityChecker: XPostsCapabilityChecker
+
+    @Test
+    fun `if has xposts in db, is capable`() = test {
+        testCapability(XPostsResult.dbResult(listOf(mock())), null, true)
+    }
+
+    @Test
+    fun `if no xposts in db and xposts in api response, is capable`() = test {
+        testCapability(XPostsResult.dbResult(emptyList()), Companion.apiResult(listOf(mock())), true)
+    }
+
+    @Test
+    fun `if no xposts in db and api response shows no xposts, is not capable`() = test {
+        testCapability(XPostsResult.dbResult(emptyList()), XPostsResult.apiResult(emptyList()), false)
+    }
+
+    @Test
+    fun `if no xposts in db and unknown xposts api response, capable`() = test {
+        testCapability(XPostsResult.dbResult(emptyList()), XPostsResult.Unknown, true)
+    }
+
+    @Test
+    fun `if unknown xposts in db and xposts in api response, is capable`() = test {
+        testCapability(XPostsResult.Unknown, XPostsResult.apiResult(listOf(mock())), true)
+    }
+
+    @Test
+    fun `if unknown xposts in db and api response shows no xposts, is not capable`() = test {
+        testCapability(XPostsResult.Unknown, XPostsResult.apiResult(emptyList()), false)
+    }
+
+    @Test
+    fun `if unknown xposts in db and unknown xposts api response, is capable`() = test {
+        testCapability(XPostsResult.Unknown, XPostsResult.Unknown, true)
+    }
+
+    private suspend fun testCapability(
+        dbResponse: XPostsResult,
+        apiResponse: XPostsResult?,
+        expectedCapability: Boolean
+    ) {
+        whenever(mockXPostsStore.getXPostsFromDb(mockSite)).thenReturn(dbResponse)
+        if (apiResponse != null) {
+            whenever(mockXPostsStore.fetchXPosts(mockSite)).thenReturn(apiResponse)
+        }
+        val actualCapability = xPostsCapabilityChecker.isCapable(mockSite)
+        assertEquals(expectedCapability, actualCapability)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCaseTest.kt
index 6a4283d0ac3f..2c693d32ab83 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/AddLocalMediaToPostUseCaseTest.kt
@@ -153,7 +153,8 @@ class AddLocalMediaToPostUseCaseTest : BaseUnitTest() {
         verify(optimizeMediaUseCase).optimizeMediaIfSupportedAsync(
                 any(),
                 eq(FRESHLY_TAKEN),
-                eq(urisOfCopiedFiles)
+                eq(urisOfCopiedFiles),
+                any()
         )
     }
 
@@ -221,7 +222,7 @@ class AddLocalMediaToPostUseCaseTest : BaseUnitTest() {
 
         // Assert
         inOrder.verify(copyMediaToAppStorageUseCase).copyFilesToAppStorageIfNecessary(localUris)
-        inOrder.verify(optimizeMediaUseCase).optimizeMediaIfSupportedAsync(any(), any(), any())
+        inOrder.verify(optimizeMediaUseCase).optimizeMediaIfSupportedAsync(any(), any(), any(), any())
         inOrder.verify(getMediaModelUseCase)
                 .createMediaModelFromUri(eq(LOCAL_SITE_ID), any<List<Uri>>())
         inOrder.verify(updateMediaModelUseCase)
@@ -303,6 +304,7 @@ class AddLocalMediaToPostUseCaseTest : BaseUnitTest() {
                         optimizeMediaIfSupportedAsync(
                                 any(),
                                 eq(FRESHLY_TAKEN),
+                                any(),
                                 any()
                         )
                     }.thenReturn(optimizeMediaResult)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCaseTest.kt
index 149c17f744c5..8623ca68fc51 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/CopyMediaToAppStorageUseCaseTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.android.test
 import org.wordpress.android.util.MediaUtilsWrapper
 
 @RunWith(MockitoJUnitRunner::class)
-@UseExperimental(InternalCoroutinesApi::class)
+@InternalCoroutinesApi
 class CopyMediaToAppStorageUseCaseTest : BaseUnitTest() {
     @Test
     fun `do NOT copy files which are present in media store`() = test {
@@ -88,6 +88,7 @@ class CopyMediaToAppStorageUseCaseTest : BaseUnitTest() {
     }
 
     private companion object Fixtures {
+        @InternalCoroutinesApi
         fun createCopyMediaToAppStorageUseCase(mediaUtilsWrapper: MediaUtilsWrapper = createMediaUtilsWrapper()) =
                 CopyMediaToAppStorageUseCase(mediaUtilsWrapper, TEST_DISPATCHER)
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt
index db32af14e001..51753abcf41a 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt
@@ -160,7 +160,7 @@ class EditorMediaTest : BaseUnitTest() {
                 // Assert
                 verify(addLocalMediaToPostUseCase).addNewMediaToEditorAsync(
                         eq(listOf(lastRecoredVideoUri)),
-                        anyOrNull(), anyBoolean(), anyOrNull(), anyBoolean()
+                        anyOrNull(), anyBoolean(), anyOrNull(), anyBoolean(), anyBoolean()
                 )
             }
 
@@ -436,6 +436,7 @@ class EditorMediaTest : BaseUnitTest() {
                                 anyOrNull(),
                                 anyBoolean(),
                                 anyOrNull(),
+                                anyBoolean(),
                                 anyBoolean()
                         )
                     }.thenReturn(resultForAddNewMediaToEditorAsync)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessorTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessorTest.kt
new file mode 100644
index 000000000000..b6c4aa232205
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessorTest.kt
@@ -0,0 +1,34 @@
+package org.wordpress.android.ui.posts.mediauploadcompletionprocessors
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.util.helpers.MediaFile
+
+class AudioBlockProcessorTest {
+    private val mediaFile: MediaFile = mock()
+    private lateinit var processor: AudioBlockProcessor
+
+    @Before
+    fun before() {
+        whenever(mediaFile.mediaId).thenReturn(TestContent.remoteMediaId)
+        whenever(mediaFile.fileURL).thenReturn(TestContent.remoteAudioUrl)
+        processor = AudioBlockProcessor(TestContent.localMediaId, mediaFile)
+    }
+
+    @Test
+    fun `processBlock replaces id and src in matching block`() {
+        val processedBlock = processor.processBlock(TestContent.oldAudioBlock)
+        Assertions.assertThat(processedBlock).isEqualTo(TestContent.newAudioBlock)
+    }
+
+    @Test
+    fun `processBlock leaves non-matching block unchanged`() {
+        val nonMatchingId = "123"
+        val processor = AudioBlockProcessor(nonMatchingId, mediaFile)
+        val processedBlock = processor.processBlock(TestContent.oldFileBlock)
+        Assertions.assertThat(processedBlock).isEqualTo(TestContent.oldFileBlock)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/FileBlockProcessorTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/FileBlockProcessorTest.kt
new file mode 100644
index 000000000000..20c5f0033298
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/FileBlockProcessorTest.kt
@@ -0,0 +1,40 @@
+package org.wordpress.android.ui.posts.mediauploadcompletionprocessors
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.util.helpers.MediaFile
+
+class FileBlockProcessorTest {
+    private val mediaFile: MediaFile = mock()
+    private lateinit var processor: FileBlockProcessor
+
+    @Before
+    fun before() {
+        whenever(mediaFile.mediaId).thenReturn(TestContent.remoteMediaId)
+        whenever(mediaFile.fileURL).thenReturn(TestContent.remoteImageUrl)
+        processor = FileBlockProcessor(TestContent.localMediaId, mediaFile)
+    }
+
+    @Test
+    fun `processBlock replaces id and href in matching block`() {
+        val processedBlock = processor.processBlock(TestContent.oldFileBlock)
+        Assertions.assertThat(processedBlock).isEqualTo(TestContent.newFileBlock)
+    }
+
+    @Test
+    fun `processBlock leaves non-matching block unchanged`() {
+        val nonMatchingId = "123"
+        val fileBlockProcessor = FileBlockProcessor(nonMatchingId, mediaFile)
+        val processedBlock = fileBlockProcessor.processBlock(TestContent.oldFileBlock)
+        Assertions.assertThat(processedBlock).isEqualTo(TestContent.oldFileBlock)
+    }
+
+    @Test
+    fun `processBlock replaces id and href in matching block when id is not first`() {
+        val processedBlock = processor.processBlock(TestContent.oldFileBlockIdNotFirst)
+        Assertions.assertThat(processedBlock).isEqualTo(TestContent.newFileBlockIdNotFirst)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/TestContent.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/TestContent.kt
index b078f93e0495..54f321ce8a82 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/TestContent.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/TestContent.kt
@@ -6,8 +6,10 @@ object TestContent {
     const val siteUrl = "https://wordpress.org"
     const val localImageUrl = "file://Screenshot-1-1.png"
     const val localImageUrl2 = "file://Screenshot-1-2.png"
+    const val localAudioUrl = "file://test-song.mp3"
     const val remoteImageUrl = "https://onetwoonetwothisisjustatesthome.files.wordpress.com/2019/11/pexels-photo-1671668.jpg"
     const val remoteImageUrl2 = "https://onetwoonetwothisisjustatesthome.files.wordpress.com/2019/12/img_20191202_094944-19.jpg"
+    const val remoteAudioUrl = "https://onetwoonetwothisisjustatesthome.files.wordpress.com/2020/11/test-song.mp3"
     private const val remoteImageUrlBlogLink = "http://onetwoonetwothisisjustatest.home.blog/pexels-photo-1671668/"
     private const val remoteImageUrlWithSize = "https://onetwoonetwothisisjustatesthome.files.wordpress.com/2019/11/pexels-photo-1671668.jpg?w=1024"
     private const val remoteImageUrl2BlogLink = "http://onetwoonetwothisisjustatest.home.blog/?attachment_id=369"
@@ -176,7 +178,7 @@ object TestContent {
 <!-- /wp:gallery -->
 """
 
-    const val oldGalleryBlockIdsNotFirst = """<!-- wp:gallery {"linkTo":"attachment","ids":[203,${localMediaId},369]} -->
+    const val oldGalleryBlockIdsNotFirst = """<!-- wp:gallery {"linkTo":"post","ids":[203,${localMediaId},369]} -->
 <figure class="wp-block-gallery columns-3 is-cropped">
   <ul class="blocks-gallery-grid">
     <li class="blocks-gallery-item">
@@ -193,7 +195,7 @@ object TestContent {
 <!-- /wp:gallery -->
 """
 
-    const val newGalleryBlockIdsNotFirst = """<!-- wp:gallery {"linkTo":"attachment","ids":[203,${remoteMediaId},369]} -->
+    const val newGalleryBlockIdsNotFirst = """<!-- wp:gallery {"linkTo":"post","ids":[203,${remoteMediaId},369]} -->
 <figure class="wp-block-gallery columns-3 is-cropped">
   <ul class="blocks-gallery-grid">
     <li class="blocks-gallery-item">
@@ -294,7 +296,7 @@ object TestContent {
 <!-- /wp:video -->
 """
 
-    const val oldGalleryBlockLinkToMediaFile = """<!-- wp:gallery {"ids":[203,${localMediaId},369],"linkTo":"media"} -->
+    const val oldGalleryBlockLinkToMediaFile = """<!-- wp:gallery {"ids":[203,${localMediaId},369],"linkTo":"file"} -->
 <figure class="wp-block-gallery columns-3 is-cropped">
   <ul class="blocks-gallery-grid">
     <li class="blocks-gallery-item">
@@ -311,7 +313,7 @@ object TestContent {
 <!-- /wp:gallery -->
 """
 
-    const val newGalleryBlockLinkToMediaFile = """<!-- wp:gallery {"ids":[203,${remoteMediaId},369],"linkTo":"media"} -->
+    const val newGalleryBlockLinkToMediaFile = """<!-- wp:gallery {"ids":[203,${remoteMediaId},369],"linkTo":"file"} -->
 <figure class="wp-block-gallery columns-3 is-cropped">
   <ul class="blocks-gallery-grid">
     <li class="blocks-gallery-item">
@@ -328,7 +330,7 @@ object TestContent {
 <!-- /wp:gallery -->
 """
 
-    const val oldGalleryBlockLinkToAttachmentPage = """<!-- wp:gallery {"ids":[203,${localMediaId},369],"linkTo":"attachment"} -->
+    const val oldGalleryBlockLinkToAttachmentPage = """<!-- wp:gallery {"ids":[203,${localMediaId},369],"linkTo":"post"} -->
 <figure class="wp-block-gallery columns-3 is-cropped">
   <ul class="blocks-gallery-grid">
     <li class="blocks-gallery-item">
@@ -345,7 +347,7 @@ object TestContent {
 <!-- /wp:gallery -->
 """
 
-    const val newGalleryBlockLinkToAttachmentPage = """<!-- wp:gallery {"ids":[203,${remoteMediaId},369],"linkTo":"attachment"} -->
+    const val newGalleryBlockLinkToAttachmentPage = """<!-- wp:gallery {"ids":[203,${remoteMediaId},369],"linkTo":"post"} -->
 <figure class="wp-block-gallery columns-3 is-cropped">
   <ul class="blocks-gallery-grid">
     <li class="blocks-gallery-item">
@@ -554,6 +556,31 @@ object TestContent {
 <div class="wp-story wp-block-jetpack-story"></div>
 <!-- /wp:jetpack/story -->"""
 
+    const val oldFileBlock = """<!-- wp:file {"id":${localMediaId},"href":"$localImageUrl"} -->
+<div class="wp-block-file"><a href="$localImageUrl">Test image</a><a href="$localImageUrl" class="wp-block-file__button" download>Download</a></div>
+<!-- /wp:file -->
+    """
+    const val newFileBlock = """<!-- wp:file {"id":${remoteMediaId},"href":"$remoteImageUrl"} -->
+<div class="wp-block-file"><a href="$remoteImageUrl">Test image</a><a href="$remoteImageUrl" class="wp-block-file__button" download>Download</a></div>
+<!-- /wp:file -->
+    """
+
+    const val oldFileBlockIdNotFirst = """<!-- wp:file {"href":"$localImageUrl","id":${localMediaId}} -->
+<div class="wp-block-file"><a href="$localImageUrl">Test image</a><a href="$localImageUrl" class="wp-block-file__button" download>Download</a></div>
+<!-- /wp:file -->
+    """
+    const val newFileBlockIdNotFirst = """<!-- wp:file {"href":"$remoteImageUrl","id":${remoteMediaId}} -->
+<div class="wp-block-file"><a href="$remoteImageUrl">Test image</a><a href="$remoteImageUrl" class="wp-block-file__button" download>Download</a></div>
+<!-- /wp:file -->
+    """
+    const val oldAudioBlock = """<!-- wp:audio {"id":${localMediaId}} -->
+<figure class="wp-block-audio"><audio controls src="$localAudioUrl"></audio></figure>
+<!-- /wp:audio -->"""
+
+    const val newAudioBlock = """<!-- wp:audio {"id":${remoteMediaId}} -->
+<figure class="wp-block-audio"><audio controls src="$remoteAudioUrl"></audio></figure>
+<!-- /wp:audio -->"""
+
     const val oldPostImage = paragraphBlock + oldImageBlock + newVideoBlock + newMediaTextBlock + newGalleryBlock
     const val newPostImage = paragraphBlock + newImageBlock + newVideoBlock + newMediaTextBlock + newGalleryBlock
     const val oldPostVideo = paragraphBlock + newImageBlock + oldVideoBlock + newMediaTextBlock + newGalleryBlock
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingCategoriesViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingCategoriesViewModelTest.kt
index d21f386f11b3..c86dca1b37f4 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingCategoriesViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/prepublishing/PrepublishingCategoriesViewModelTest.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.doAnswer
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
@@ -63,7 +64,7 @@ class PrepublishingCategoriesViewModelTest : BaseUnitTest() {
                 TEST_DISPATCHER
         )
 
-        whenever(getCategoriesUseCase.getPostCategories(anyOrNull(), anyOrNull()))
+        whenever(getCategoriesUseCase.getPostCategories(anyOrNull()))
                 .thenReturn(postCategoriesList())
         whenever(getCategoriesUseCase.getSiteCategories(any()))
                 .thenReturn(siteCategoriesList())
@@ -145,7 +146,21 @@ class PrepublishingCategoriesViewModelTest : BaseUnitTest() {
     fun `getPostCategories is invoked on start`() {
         viewModel.start(editPostRepository, siteModel, null, listOf())
 
-        verify(getCategoriesUseCase, times(1)).getPostCategories(editPostRepository, siteModel)
+        verify(getCategoriesUseCase, times(1)).getPostCategories(editPostRepository)
+    }
+
+    @Test
+    fun `fetchSiteCategories is invoked on start when not an addCategoryRequest`() {
+        viewModel.start(editPostRepository, siteModel, null, listOf())
+
+        verify(getCategoriesUseCase, times(1)).fetchSiteCategories(siteModel)
+    }
+
+    @Test
+    fun `fetchSiteCategories is not invoked on start when there is an addCategoryRequest`() {
+        viewModel.start(editPostRepository, siteModel, addCategoryRequest, listOf())
+
+        verify(getCategoriesUseCase, never()).fetchSiteCategories(siteModel)
     }
 
     @Test
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt
index 306cbaa1d67b..fb6b5eeceb67 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/reactnative/ReactNativeRequestHandlerTest.kt
@@ -62,7 +62,7 @@ class ReactNativeRequestHandlerTest {
         val fetchResponse = ReactNativeFetchResponse.Success(successfulResponseJson)
         whenever(reactNativeStore.executeRequest(site, pathWithParams)).thenReturn(fetchResponse)
 
-        subject.performGetRequest(pathWithParams, site, successHandler, errorHandler)
+        subject.performGetRequest(pathWithParams, site, true, successHandler, errorHandler)
 
         assertTrue(calledSuccess)
     }
@@ -87,7 +87,7 @@ class ReactNativeRequestHandlerTest {
         val fetchResponse = getFetchResponseError(errorMessage, statusCode)
         whenever(reactNativeStore.executeRequest(site, pathWithParams)).thenReturn(fetchResponse)
 
-        subject.performGetRequest(pathWithParams, site, successHandler, errorHandler)
+        subject.performGetRequest(pathWithParams, site, true, successHandler, errorHandler)
 
         assertTrue(calledError)
     }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneViewModelTest.kt
new file mode 100644
index 000000000000..2149257c0957
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/prefs/timezone/SiteSettingsTimezoneViewModelTest.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.ui.prefs.timezone
+
+import android.content.Context
+import org.assertj.core.api.Assertions
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.viewmodel.ResourceProvider
+
+class SiteSettingsTimezoneViewModelTest : BaseUnitTest() {
+    @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var context: Context
+
+    private lateinit var viewModel: SiteSettingsTimezoneViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = SiteSettingsTimezoneViewModel(resourceProvider)
+    }
+
+    @Test
+    fun testSearchTimezones() {
+        var filteredList: List<TimezonesList>? = null
+        viewModel.timezones.observeForever {
+            filteredList = it
+        }
+
+        viewModel.searchTimezones("Sydney")
+
+        Assertions.assertThat(filteredList).isNotNull
+    }
+
+    @Test
+    fun testGetShowEmptyView() {
+        var showEmptyView = false
+        viewModel.showEmptyView.observeForever {
+            showEmptyView = it
+        }
+
+        viewModel.filterTimezones("")
+
+        assertEquals(showEmptyView, true)
+    }
+
+    @Test
+    fun testGetSelectedTimezone() {
+        var selectedTimezone: String? = null
+        viewModel.selectedTimezone.observeForever {
+            selectedTimezone = it
+        }
+
+        viewModel.onTimezoneSelected("Australia/Sydney")
+
+        Assertions.assertThat(selectedTimezone).isNotNull
+    }
+
+    @Test
+    fun testOnSearchCancelled() {
+        var timezones: List<TimezonesList>? = null
+        viewModel.timezones.observeForever {
+            timezones = it
+        }
+
+        viewModel.onSearchCancelled()
+
+        Assertions.assertThat(timezones).isNotNull
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderCommentListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderCommentListViewModelTest.kt
index 62edc0a9beed..80cd93b6c2ae 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderCommentListViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderCommentListViewModelTest.kt
@@ -1,16 +1,47 @@
 package org.wordpress.android.ui.reader
 
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.doAnswer
+import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
 import org.junit.Test
+import org.mockito.ArgumentMatchers.anyBoolean
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.test
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.FollowCommentsUiStateType.VISIBLE_WITH_STATE
 import org.wordpress.android.ui.reader.ReaderCommentListViewModel.ScrollPosition
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowStateChanged
 import org.wordpress.android.viewmodel.Event
 
 @InternalCoroutinesApi
 class ReaderCommentListViewModelTest : BaseUnitTest() {
-    private val viewModel: ReaderCommentListViewModel = ReaderCommentListViewModel(TEST_DISPATCHER)
+    @Mock lateinit var followCommentsHandler: ReaderFollowCommentsHandler
+
+    private lateinit var viewModel: ReaderCommentListViewModel
+    private val blogId = 100L
+    private val postId = 1000L
+    private var snackbarEvents = MutableLiveData<Event<SnackbarMessageHolder>>()
+    private var followStatusUpdate = MutableLiveData<FollowCommentsState>()
+    private var uiState: FollowCommentsUiState? = null
+
+    @Before
+    fun setUp() {
+        whenever(followCommentsHandler.snackbarEvents).thenReturn(snackbarEvents)
+        whenever(followCommentsHandler.followStatusUpdate).thenReturn(followStatusUpdate)
+
+        viewModel = ReaderCommentListViewModel(
+                followCommentsHandler,
+                TEST_DISPATCHER,
+                TEST_DISPATCHER
+        )
+    }
 
     @Test
     fun `emits scroll event on scroll`() {
@@ -29,4 +60,73 @@ class ReaderCommentListViewModelTest : BaseUnitTest() {
         assertThat(scrollPosition.isSmooth).isEqualTo(isSmooth)
         assertThat(scrollPosition.position).isEqualTo(expectedPosition)
     }
+
+    @Test
+    fun `follow ui state is DISABLED on start`() {
+        setupObserversAndStart()
+
+        assertThat(uiState).isNotNull
+        assertThat(uiState!!.type).isEqualTo(FollowCommentsUiStateType.DISABLED)
+    }
+
+    @Test
+    fun `onSwipeToRefresh updates follow conversation status`() = test {
+        var stateChanged = FollowStateChanged(blogId, postId, true, true)
+        doAnswer {
+            followStatusUpdate.postValue(stateChanged)
+        }.whenever(followCommentsHandler).handleFollowCommentsStatusRequest(anyLong(), anyLong(), anyBoolean())
+
+        setupObserversAndStart()
+
+        requireNotNull(uiState).let {
+            assertThat(it.type).isEqualTo(VISIBLE_WITH_STATE)
+            assertThat(it.animate).isFalse()
+        }
+
+        stateChanged = FollowStateChanged(blogId, postId, true, false)
+        doAnswer {
+            followStatusUpdate.postValue(stateChanged)
+        }.whenever(followCommentsHandler).handleFollowCommentsStatusRequest(anyLong(), anyLong(), anyBoolean())
+
+        viewModel.onSwipeToRefresh()
+
+        requireNotNull(uiState).let {
+            assertThat(it.type).isEqualTo(VISIBLE_WITH_STATE)
+            assertThat(it.animate).isTrue()
+        }
+    }
+
+    @Test
+    fun `onFollowConversationClicked toggles follow button status`() = test {
+        var stateChanged = FollowStateChanged(blogId, postId, true)
+        doAnswer {
+            followStatusUpdate.postValue(stateChanged)
+        }.whenever(followCommentsHandler).handleFollowCommentsStatusRequest(anyLong(), anyLong(), anyBoolean())
+
+        doAnswer {
+            stateChanged = FollowStateChanged(blogId, postId, false)
+            followStatusUpdate.postValue(stateChanged)
+        }.whenever(followCommentsHandler).handleFollowCommentsClicked(blogId, postId, false)
+
+        setupObserversAndStart()
+
+        requireNotNull(uiState).let {
+            assertThat(it.type).isEqualTo(VISIBLE_WITH_STATE)
+            assertThat(it.isFollowing).isTrue()
+            it.onFollowButtonClick?.invoke(false)
+        }
+
+        requireNotNull(uiState).let {
+            assertThat(it.type).isEqualTo(VISIBLE_WITH_STATE)
+            assertThat(it.isFollowing).isFalse()
+        }
+    }
+
+    private fun setupObserversAndStart() {
+        viewModel.updateFollowUiState.observeForever {
+            uiState = it
+        }
+
+        viewModel.start(blogId, postId)
+    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderFollowCommentsHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderFollowCommentsHandlerTest.kt
new file mode 100644
index 000000000000..8a1993d8430e
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderFollowCommentsHandlerTest.kt
@@ -0,0 +1,110 @@
+package org.wordpress.android.ui.reader
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.flow
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.test
+import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState
+import org.wordpress.android.ui.utils.UiString.UiStringText
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ReaderFollowCommentsHandlerTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock lateinit var readerCommentsFollowUseCase: ReaderCommentsFollowUseCase
+
+    private lateinit var followCommentsHandler: ReaderFollowCommentsHandler
+    private val blogId = 100L
+    private val postId = 1000L
+    private var uiState: FollowCommentsState? = null
+    private var holder: SnackbarMessageHolder? = null
+
+    @Before
+    fun setup() {
+        followCommentsHandler = ReaderFollowCommentsHandler(readerCommentsFollowUseCase, TEST_DISPATCHER)
+    }
+
+    @Test
+    fun `handleFollowCommentsStatusRequest collects expected state`() = test {
+        val userMessage = UiStringText("handleFollowCommentsStatusRequest")
+        val state = FollowCommentsState.FollowStateChanged(
+                blogId = blogId,
+                postId = postId,
+                isFollowing = true,
+                isInit = false,
+                userMessage = userMessage
+        )
+
+        whenever(readerCommentsFollowUseCase.getMySubscriptionToPost(blogId, postId, false)).thenReturn(
+                flow { emit(state) }
+        )
+
+        setupObservers()
+
+        followCommentsHandler.handleFollowCommentsStatusRequest(blogId, postId, false)
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(userMessage)
+        }
+    }
+
+    @Test
+    fun `handleFollowCommentsClicked collects expected state`() = test {
+        val userMessage = UiStringText("handleFollowCommentsClicked")
+        val state = FollowCommentsState.FollowStateChanged(
+                blogId = blogId,
+                postId = postId,
+                isFollowing = true,
+                isInit = false,
+                userMessage = userMessage
+        )
+
+        whenever(readerCommentsFollowUseCase.setMySubscriptionToPost(blogId, postId, true)).thenReturn(
+                flow { emit(state) }
+        )
+
+        setupObservers()
+
+        followCommentsHandler.handleFollowCommentsClicked(blogId, postId, true)
+
+        requireNotNull(uiState).let {
+            assertThat(it).isEqualTo(state)
+        }
+
+        requireNotNull(holder).let {
+            assertThat(it.message).isEqualTo(userMessage)
+        }
+    }
+
+    private fun setupObservers() {
+        uiState = null
+
+        followCommentsHandler.followStatusUpdate.observeForever {
+            uiState = it
+        }
+
+        holder = null
+        followCommentsHandler.snackbarEvents.observeForever { event ->
+            event.applyIfNotHandled {
+                holder = this
+            }
+        }
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderPostDetailUiStateBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderPostDetailUiStateBuilderTest.kt
new file mode 100644
index 000000000000..7c6d74f9ad77
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderPostDetailUiStateBuilderTest.kt
@@ -0,0 +1,274 @@
+package org.wordpress.android.ui.reader
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.test
+import org.wordpress.android.ui.reader.discover.ReaderPostUiStateBuilder
+import org.wordpress.android.ui.reader.models.ReaderSimplePost
+import org.wordpress.android.ui.reader.models.ReaderSimplePostList
+import org.wordpress.android.ui.reader.utils.FeaturedImageUtils
+import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.ExcerptFooterUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.ReaderPostFeaturedImageUiState
+import org.wordpress.android.ui.reader.views.ReaderPostDetailsHeaderViewUiStateBuilder
+import org.wordpress.android.ui.utils.HtmlMessageUtils
+import org.wordpress.android.ui.utils.HtmlUtilsWrapper
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.DisplayUtilsWrapper
+import org.wordpress.android.viewmodel.ContextProvider
+import org.wordpress.android.viewmodel.ResourceProvider
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ReaderPostDetailUiStateBuilderTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    private lateinit var builder: ReaderPostDetailUiStateBuilder
+    @Mock lateinit var postUiStateBuilder: ReaderPostUiStateBuilder
+    @Mock lateinit var headerViewUiStateBuilder: ReaderPostDetailsHeaderViewUiStateBuilder
+    @Mock lateinit var featuredImageUtils: FeaturedImageUtils
+    @Mock lateinit var readerUtilsWrapper: ReaderUtilsWrapper
+    @Mock lateinit var displayUtilsWrapper: DisplayUtilsWrapper
+    @Mock lateinit var resourceProvider: ResourceProvider
+    @Mock lateinit var contextProvider: ContextProvider
+    @Mock lateinit var htmlUtilsWrapper: HtmlUtilsWrapper
+    @Mock lateinit var htmlMessageUtils: HtmlMessageUtils
+    @Mock private lateinit var readerSimplePost: ReaderSimplePost
+    private lateinit var dummyRelatedPosts: ReaderSimplePostList
+
+    private var dummySourceReaderPost = ReaderPost().apply {
+        this.blogId = 1L
+        this.feedId = 2L
+        this.blogName = "blog name"
+    }
+    private val dummyOnRelatedPostItemClicked: (Long, Long, Boolean) -> Unit = { _, _, _ -> }
+    private val dummyFeaturedImageUrl = "/image/url"
+    private val dummyVisitPostLinkText = "visit post"
+    private val dummyDisplayPixelHeight = 100
+
+    @Before
+    fun setUp() = test {
+        dummyRelatedPosts = ReaderSimplePostList().apply { add(readerSimplePost) }
+
+        builder = ReaderPostDetailUiStateBuilder(
+                headerViewUiStateBuilder,
+                postUiStateBuilder,
+                featuredImageUtils,
+                readerUtilsWrapper,
+                displayUtilsWrapper,
+                contextProvider,
+                htmlUtilsWrapper,
+                htmlMessageUtils,
+                resourceProvider
+        )
+    }
+
+    /* READER POST FEATURED IMAGE */
+    @Test
+    fun `given featured image should be shown, when post ui is built, then featured image exists`() = test {
+        val postUiState = buildPostUiState(shouldShowFeaturedImage = true)
+
+        assertThat(postUiState.featuredImageUiState).isEqualTo(
+                ReaderPostFeaturedImageUiState(
+                        blogId = dummySourceReaderPost.blogId,
+                        url = dummyFeaturedImageUrl,
+                        height = (dummyDisplayPixelHeight * READER_POST_FEATURED_IMAGE_HEIGHT_PERCENT).toInt()
+                )
+        )
+    }
+
+    @Test
+    fun `given featured image should not be shown, when post ui is built, then featured image does not exists`() =
+            test {
+                val postUiState = buildPostUiState(shouldShowFeaturedImage = false)
+
+                assertThat(postUiState.featuredImageUiState).isNull()
+            }
+
+    /* EXCERPT FOOTER */
+    @Test
+    fun `given excerpt is shown, when post ui is built, then excerpt footer exists`() = test {
+        val readerPost = mock<ReaderPost>()
+        whenever(readerPost.blogName).thenReturn("blog name")
+        whenever(readerPost.url).thenReturn("url")
+        whenever(readerPost.shouldShowExcerpt()).thenReturn(true)
+
+        val postUiState = buildPostUiState(readerPost = readerPost)
+
+        assertThat(postUiState.excerptFooterUiState).isEqualTo(
+                ExcerptFooterUiState(
+                        visitPostExcerptFooterLinkText = UiStringText(dummyVisitPostLinkText),
+                        postLink = readerPost.url
+                )
+        )
+    }
+
+    @Test
+    fun `given excerpt is not shown, when post ui is built, then excerpt footer does not exists`() = test {
+        val readerPost = mock<ReaderPost>()
+        whenever(readerPost.shouldShowExcerpt()).thenReturn(false)
+
+        val postUiState = buildPostUiState(readerPost = readerPost)
+
+        assertThat(postUiState.excerptFooterUiState).isNull()
+    }
+
+    /* RELATED POSTS */
+    @Test
+    fun `when local related posts ui is built, then source post site name exists in header label`() = test {
+        val relatedPostsUiState = buildRelatedPostsUiState(isGlobal = false)
+
+        assertThat(relatedPostsUiState.headerLabel).isEqualTo(
+                UiStringResWithParams(
+                        R.string.reader_label_local_related_posts,
+                        listOf(UiStringText(dummySourceReaderPost.blogName))
+                )
+        )
+    }
+
+    @Test
+    fun `when global related posts ui is built, then global related posts header label exists`() = test {
+        val relatedPostsUiState = buildRelatedPostsUiState(isGlobal = true)
+
+        assertThat(relatedPostsUiState.headerLabel).isEqualTo(UiStringRes(R.string.reader_label_global_related_posts))
+    }
+
+    @Test
+    fun `given empty related posts, when related posts ui is built, then related post cards are empty`() = test {
+        val relatedPostsUiState = buildRelatedPostsUiState(relatedPosts = ReaderSimplePostList())
+
+        assertThat(relatedPostsUiState.cards).isEmpty()
+    }
+
+    @Test
+    fun `given related posts, when related posts ui is built, then related post cards exist`() = test {
+        val relatedPostsUiState = buildRelatedPostsUiState()
+
+        assertThat(relatedPostsUiState.cards).isNotEmpty
+    }
+
+    @Test
+    fun `given related post with title, when related posts ui is built, then related post title exists`() = test {
+        val title = "title"
+        whenever(readerSimplePost.hasTitle()).thenReturn(true)
+        whenever(readerSimplePost.title).thenReturn(title)
+
+        val relatedPostsUiState = buildRelatedPostsUiState()
+
+        assertThat(relatedPostsUiState.cards?.first()?.title).isEqualTo(UiStringText(title))
+    }
+
+    @Test
+    fun `given related post without title, when related posts ui is built, then related post title does not exists`() =
+            test {
+                whenever(readerSimplePost.hasTitle()).thenReturn(false)
+
+                val relatedPostsUiState = buildRelatedPostsUiState()
+
+                assertThat(relatedPostsUiState.cards?.first()?.title).isNull()
+            }
+
+    @Test
+    fun `given related post with excerpt, when related posts ui is built, then excerpt exists`() = test {
+        val excerpt = "excerpt"
+        whenever(readerSimplePost.hasExcerpt()).thenReturn(true)
+        whenever(readerSimplePost.excerpt).thenReturn(excerpt)
+
+        val relatedPostsUiState = buildRelatedPostsUiState()
+
+        assertThat(relatedPostsUiState.cards?.first()?.excerpt).isEqualTo(UiStringText(excerpt))
+    }
+
+    @Test
+    fun `given related post without excerpt, when related posts ui is built, then excerpt does not exists`() =
+            test {
+                whenever(readerSimplePost.hasExcerpt()).thenReturn(false)
+
+                val relatedPostsUiState = buildRelatedPostsUiState()
+
+                assertThat(relatedPostsUiState.cards?.first()?.excerpt).isNull()
+            }
+
+    @Test
+    fun `given related post with featured image url, when related posts ui is built, then featured image exists`() =
+            test {
+                val url = "/featured/image/url"
+                whenever(readerSimplePost.getFeaturedImageForDisplay(any(), any())).thenReturn(url)
+
+                val relatedPostsUiState = buildRelatedPostsUiState()
+
+                assertThat(relatedPostsUiState.cards?.first()?.featuredImageUrl).isEqualTo(url)
+            }
+
+    @Test
+    fun `given related post without featured image url, when related posts ui is built, then featured image exists`() =
+            test {
+                whenever(readerSimplePost.getFeaturedImageForDisplay(any(), any())).thenReturn(null)
+
+                val relatedPostsUiState = buildRelatedPostsUiState()
+
+                assertThat(relatedPostsUiState.cards?.first()?.featuredImageUrl).isNull()
+            }
+
+    private fun buildRelatedPostsUiState(
+        relatedPosts: ReaderSimplePostList = dummyRelatedPosts,
+        isGlobal: Boolean = false
+    ) = builder.mapRelatedPostsToUiState(
+            sourcePost = dummySourceReaderPost,
+            relatedPosts = relatedPosts,
+            isGlobal = isGlobal,
+            onItemClicked = dummyOnRelatedPostItemClicked
+    )
+
+    private fun buildPostUiState(
+        readerPost: ReaderPost? = null,
+        shouldShowFeaturedImage: Boolean = false
+    ): ReaderPostDetailsUiState {
+        val post = readerPost ?: dummySourceReaderPost
+
+        if (post.shouldShowExcerpt()) {
+            val dummyLinkHexColor = "#FFFFFF"
+            whenever(htmlUtilsWrapper.colorResToHtmlColor(anyOrNull(), any())).thenReturn(dummyLinkHexColor)
+            whenever(
+                    htmlMessageUtils.getHtmlMessageFromStringFormatResId(
+                            R.string.reader_excerpt_link,
+                            "<font color='" + dummyLinkHexColor + "'>" + post.blogName + "</font>"
+                    )
+            ).thenReturn(dummyVisitPostLinkText)
+        }
+
+        whenever(featuredImageUtils.shouldAddFeaturedImage(any())).thenReturn(shouldShowFeaturedImage)
+        whenever(displayUtilsWrapper.getDisplayPixelHeight()).thenReturn(dummyDisplayPixelHeight)
+        whenever(readerUtilsWrapper.getResizedImageUrl(any(), any(), any(), any(), any()))
+                .thenReturn(dummyFeaturedImageUrl)
+
+        whenever(headerViewUiStateBuilder.mapPostToUiState(any(), any(), any(), any())).thenReturn(mock())
+        whenever(postUiStateBuilder.mapPostToActions(any(), any())).thenReturn(mock())
+
+        return builder.mapPostToUiState(
+                post = post,
+                moreMenuItems = null,
+                onButtonClicked = mock(),
+                onBlogSectionClicked = mock(),
+                onFollowClicked = mock(),
+                onTagItemClicked = mock()
+        )
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderTrackerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderTrackerTest.kt
index 908bfc2d72a0..38eb6e719807 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderTrackerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/ReaderTrackerTest.kt
@@ -9,12 +9,10 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
-import org.wordpress.android.ui.reader.tracker.ReaderTrackerType.FILTERED_LIST
-import org.wordpress.android.ui.reader.tracker.ReaderTrackerType.MAIN_READER
-import org.wordpress.android.ui.reader.tracker.ReaderTrackerType.PAGED_POST
-import org.wordpress.android.ui.reader.tracker.ReaderTrackerType.SUBFILTERED_LIST
+import org.wordpress.android.ui.reader.tracker.ReaderTrackerType
 import org.wordpress.android.ui.reader.utils.DateProvider
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 import java.util.Calendar
 import java.util.Date
 
@@ -23,12 +21,18 @@ class ReaderTrackerTest {
     @Mock lateinit var dateProvider: DateProvider
     @Mock lateinit var appPrefsWrapper: AppPrefsWrapper
     @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
 
     private lateinit var tracker: ReaderTracker
 
     @Before
     fun setup() {
-        tracker = ReaderTracker(dateProvider, appPrefsWrapper, analyticsTrackerWrapper)
+        tracker = ReaderTracker(
+                dateProvider,
+                appPrefsWrapper,
+                analyticsTrackerWrapper,
+                analyticsUtilsWrapper
+        )
     }
 
     @Test
@@ -51,22 +55,22 @@ class ReaderTrackerTest {
 
         whenever(dateProvider.getCurrentDate()).thenReturn(startPoint)
 
-        tracker.start(MAIN_READER)
-        tracker.start(FILTERED_LIST)
-        tracker.start(PAGED_POST)
-        tracker.start(SUBFILTERED_LIST)
+        tracker.start(ReaderTrackerType.MAIN_READER)
+        tracker.start(ReaderTrackerType.FILTERED_LIST)
+        tracker.start(ReaderTrackerType.PAGED_POST)
+        tracker.start(ReaderTrackerType.SUBFILTERED_LIST)
 
         whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, Int.MAX_VALUE - 1))
-        tracker.stop(MAIN_READER)
+        tracker.stop(ReaderTrackerType.MAIN_READER)
 
         whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, Int.MAX_VALUE - 2))
-        tracker.stop(FILTERED_LIST)
+        tracker.stop(ReaderTrackerType.FILTERED_LIST)
 
         whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, Int.MAX_VALUE - 3))
-        tracker.stop(PAGED_POST)
+        tracker.stop(ReaderTrackerType.PAGED_POST)
 
         whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, Int.MAX_VALUE - 4))
-        tracker.stop(SUBFILTERED_LIST)
+        tracker.stop(ReaderTrackerType.SUBFILTERED_LIST)
 
         val expected = mapOf(
                 "time_in_main_reader" to Int.MAX_VALUE - 1,
@@ -88,22 +92,22 @@ class ReaderTrackerTest {
 
             whenever(dateProvider.getCurrentDate()).thenReturn(startPoint)
 
-            tracker.start(MAIN_READER)
-            tracker.start(FILTERED_LIST)
-            tracker.start(PAGED_POST)
-            tracker.start(SUBFILTERED_LIST)
+            tracker.start(ReaderTrackerType.MAIN_READER)
+            tracker.start(ReaderTrackerType.FILTERED_LIST)
+            tracker.start(ReaderTrackerType.PAGED_POST)
+            tracker.start(ReaderTrackerType.SUBFILTERED_LIST)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 1))
-            tracker.stop(MAIN_READER)
+            tracker.stop(ReaderTrackerType.MAIN_READER)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 2))
-            tracker.stop(FILTERED_LIST)
+            tracker.stop(ReaderTrackerType.FILTERED_LIST)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 3))
-            tracker.stop(PAGED_POST)
+            tracker.stop(ReaderTrackerType.PAGED_POST)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 4))
-            tracker.stop(SUBFILTERED_LIST)
+            tracker.stop(ReaderTrackerType.SUBFILTERED_LIST)
         }
 
         val expected = mapOf(
@@ -126,22 +130,22 @@ class ReaderTrackerTest {
 
             whenever(dateProvider.getCurrentDate()).thenReturn(startPoint)
 
-            tracker.start(MAIN_READER)
-            tracker.start(FILTERED_LIST)
-            tracker.start(PAGED_POST)
-            tracker.start(SUBFILTERED_LIST)
+            tracker.start(ReaderTrackerType.MAIN_READER)
+            tracker.start(ReaderTrackerType.FILTERED_LIST)
+            tracker.start(ReaderTrackerType.PAGED_POST)
+            tracker.start(ReaderTrackerType.SUBFILTERED_LIST)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 1))
-            tracker.stop(MAIN_READER)
+            tracker.stop(ReaderTrackerType.MAIN_READER)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 2))
-            tracker.stop(FILTERED_LIST)
+            tracker.stop(ReaderTrackerType.FILTERED_LIST)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 3))
-            tracker.stop(PAGED_POST)
+            tracker.stop(ReaderTrackerType.PAGED_POST)
 
             whenever(dateProvider.getCurrentDate()).thenReturn(addToDate(startPoint, 4))
-            tracker.stop(SUBFILTERED_LIST)
+            tracker.stop(ReaderTrackerType.SUBFILTERED_LIST)
         }
 
         var expected = mapOf(
@@ -167,7 +171,7 @@ class ReaderTrackerTest {
     fun `tracker is not running if not started`() {
         tracker.setupTrackers()
 
-        assertThat(tracker.isRunning(MAIN_READER)).isEqualTo(false)
+        assertThat(tracker.isRunning(ReaderTrackerType.MAIN_READER)).isEqualTo(false)
     }
 
     @Test
@@ -176,9 +180,9 @@ class ReaderTrackerTest {
         val startPoint = Date()
         whenever(dateProvider.getCurrentDate()).thenReturn(startPoint)
 
-        tracker.start(MAIN_READER)
+        tracker.start(ReaderTrackerType.MAIN_READER)
 
-        assertThat(tracker.isRunning(MAIN_READER)).isEqualTo(true)
+        assertThat(tracker.isRunning(ReaderTrackerType.MAIN_READER)).isEqualTo(true)
     }
 
     @Test
@@ -187,10 +191,10 @@ class ReaderTrackerTest {
         val startPoint = Date()
         whenever(dateProvider.getCurrentDate()).thenReturn(startPoint)
 
-        tracker.start(MAIN_READER)
-        tracker.stop(MAIN_READER)
+        tracker.start(ReaderTrackerType.MAIN_READER)
+        tracker.stop(ReaderTrackerType.MAIN_READER)
 
-        assertThat(tracker.isRunning(MAIN_READER)).isEqualTo(false)
+        assertThat(tracker.isRunning(ReaderTrackerType.MAIN_READER)).isEqualTo(false)
     }
 
     private fun addToDate(date: Date, seconds: Int): Date {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/TagUpdateClientUtilsProviderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/TagUpdateClientUtilsProviderTest.kt
index 515babf7ea63..d5484ad76dfe 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/TagUpdateClientUtilsProviderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/TagUpdateClientUtilsProviderTest.kt
@@ -24,11 +24,11 @@ class TagUpdateClientUtilsProviderTest {
 
     @Test
     fun `getRestClientForTagUpdate return the expected client version`() {
-        assertThat(clientProvider.getRestClientForTagUpdate()).isEqualTo(WordPress.getRestClientUtilsV1_2())
+        assertThat(clientProvider.getRestClientForTagUpdate()).isEqualTo(WordPress.getRestClientUtilsV1_3())
     }
 
     @Test
     fun `getTagUpdateEndpointURL return the expected end point URL`() {
-        assertThat(clientProvider.getTagUpdateEndpointURL()).isEqualTo("https://public-api.wordpress.com/rest/v1.2/")
+        assertThat(clientProvider.getTagUpdateEndpointURL()).isEqualTo("https://public-api.wordpress.com/rest/v1.3/")
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModelTest.kt
index b0715fa86fe0..4d220ea97eb4 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderDiscoverViewModelTest.kt
@@ -17,6 +17,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyBoolean
 import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.R
@@ -41,11 +42,14 @@ import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderRecommen
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderWelcomeBannerCardUiState
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.ContentUiState
-import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.ShowFollowInterestsEmptyUiState
+import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.RequestFailedUiState
+import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.ShowNoFollowedTagsUiState
+import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.EmptyUiState.ShowNoPostsUiState
 import org.wordpress.android.ui.reader.discover.ReaderDiscoverViewModel.DiscoverUiState.LoadingUiState
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenEditorForReblog
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBlogPreview
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostsByTag
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderSubs
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryAction
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.BOOKMARK
@@ -61,26 +65,29 @@ import org.wordpress.android.ui.reader.repository.ReaderDiscoverDataProvider
 import org.wordpress.android.ui.reader.repository.usecases.tags.GetFollowedTagsUseCase
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.DiscoverTasks.REQUEST_FIRST_PAGE
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.DiscoverTasks.REQUEST_MORE
-import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState
-import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState.ReaderBlogSectionClickData
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
+import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState
+import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState.ReaderBlogSectionClickData
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.util.DisplayUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
 import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ReactiveMutableLiveData
 
-private const val POST_PARAM_POSITION = 0
-private const val ON_ITEM_RENDERED_PARAM_POSITION = 7
-private const val ON_TAG_CLICKED_PARAM_POSITION = 13
-private const val ON_BUTTON_CLICKED_PARAM_POSITION = 5
-private const val ON_VIDEO_OVERLAY_CLICKED_PARAM_POSITION = 11
-private const val ON_POST_HEADER_CLICKED_PARAM_POSITION = 12
-private const val ON_POST_ITEM_CLICKED_PARAM_POSITION = 6
-private const val ON_MORE_MENU_CLICKED_PARAM_POSITION = 9
-private const val ON_MORE_MENU_DISMISSED_PARAM_POSITION = 10
+private const val POST_PARAM_POSITION = 1
+private const val ON_BUTTON_CLICKED_PARAM_POSITION = 6
+private const val ON_POST_ITEM_CLICKED_PARAM_POSITION = 7
+private const val ON_ITEM_RENDERED_PARAM_POSITION = 8
+private const val ON_MORE_MENU_CLICKED_PARAM_POSITION = 10
+private const val ON_MORE_MENU_DISMISSED_PARAM_POSITION = 11
+private const val ON_VIDEO_OVERLAY_CLICKED_PARAM_POSITION = 12
+private const val ON_POST_HEADER_CLICKED_PARAM_POSITION = 13
+private const val ON_TAG_CLICKED_PARAM_POSITION = 14
+
 private const val NUMBER_OF_ITEMS = 10L
+
 private const val RECOMMENDED_BLOG_PARAM_POSITION = 0
 private const val ON_RECOMMENDED_BLOG_ITEM_CLICKED_PARAM_POSITION = 1
 private const val ON_RECOMMENDED_BLOG_FOLLOW_CLICKED_PARAM_POSITION = 2
@@ -98,7 +105,7 @@ class ReaderDiscoverViewModelTest {
     @Mock private lateinit var reblogUseCase: ReblogUseCase
     @Mock private lateinit var readerUtilsWrapper: ReaderUtilsWrapper
     @Mock private lateinit var getFollowedTagsUseCase: GetFollowedTagsUseCase
-    @Mock private lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock private lateinit var readerTracker: ReaderTracker
     @Mock private lateinit var appPrefsWrapper: AppPrefsWrapper
     @Mock private lateinit var displayUtilsWrapper: DisplayUtilsWrapper
     @Mock private lateinit var parentViewModel: ReaderViewModel
@@ -120,7 +127,7 @@ class ReaderDiscoverViewModelTest {
                 reblogUseCase,
                 readerUtilsWrapper,
                 appPrefsWrapper,
-                analyticsTrackerWrapper,
+                readerTracker,
                 displayUtilsWrapper,
                 getFollowedTagsUseCase,
                 TEST_DISPATCHER,
@@ -130,26 +137,37 @@ class ReaderDiscoverViewModelTest {
         whenever(readerPostCardActionsHandler.navigationEvents).thenReturn(fakeNavigationFeed)
         whenever(readerPostCardActionsHandler.snackbarEvents).thenReturn(fakeSnackBarFeed)
         whenever(readerUtilsWrapper.getTagFromTagName(anyOrNull(), anyOrNull())).thenReturn(mock())
-        whenever(menuUiStateBuilder.buildMoreMenuItems(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn(mock())
+        whenever(menuUiStateBuilder.buildMoreMenuItems(anyOrNull(), anyOrNull())).thenReturn(mock())
         whenever(
                 uiStateBuilder.mapPostToUiState(
-                        anyOrNull(), anyBoolean(), anyInt(), anyInt(), anyOrNull(), anyOrNull(),
-                        anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull(), anyOrNull(),
-                        anyOrNull(), anyOrNull()
+                        source = anyString(),
+                        post = anyOrNull(),
+                        isDiscover = anyBoolean(),
+                        photonWidth = anyInt(),
+                        photonHeight = anyInt(),
+                        postListType = anyOrNull(),
+                        onButtonClicked = anyOrNull(),
+                        onItemClicked = anyOrNull(),
+                        onItemRendered = anyOrNull(),
+                        onDiscoverSectionClicked = anyOrNull(),
+                        onMoreButtonClicked = anyOrNull(),
+                        onMoreDismissed = anyOrNull(),
+                        onVideoOverlayClicked = anyOrNull(),
+                        onPostHeaderViewClicked = anyOrNull(),
+                        onTagItemClicked = anyOrNull(),
+                        moreMenuItems = anyOrNull()
                 )
         ).thenAnswer {
-            val post = it.getArgument<ReaderPost>(POST_PARAM_POSITION)
-            // propagate some of the arguments
             createDummyReaderPostUiState(
-                    post,
-                    it.getArgument<(ReaderCardUiState) -> Unit>(ON_ITEM_RENDERED_PARAM_POSITION),
-                    it.getArgument<(String) -> Unit>(ON_TAG_CLICKED_PARAM_POSITION),
-                    it.getArgument<(Long, Long, ReaderPostCardActionType) -> Unit>(ON_BUTTON_CLICKED_PARAM_POSITION),
-                    it.getArgument<(Long, Long) -> Unit>(ON_VIDEO_OVERLAY_CLICKED_PARAM_POSITION),
-                    it.getArgument<(Long, Long) -> Unit>(ON_POST_HEADER_CLICKED_PARAM_POSITION),
-                    it.getArgument<(Long, Long) -> Unit>(ON_POST_ITEM_CLICKED_PARAM_POSITION),
-                    it.getArgument<(ReaderPostUiState) -> Unit>(ON_MORE_MENU_CLICKED_PARAM_POSITION),
-                    it.getArgument<(ReaderPostUiState) -> Unit>(ON_MORE_MENU_DISMISSED_PARAM_POSITION)
+                    it.getArgument(POST_PARAM_POSITION),
+                    it.getArgument(ON_ITEM_RENDERED_PARAM_POSITION),
+                    it.getArgument(ON_TAG_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_BUTTON_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_VIDEO_OVERLAY_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_POST_HEADER_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_POST_ITEM_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_MORE_MENU_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_MORE_MENU_DISMISSED_PARAM_POSITION)
             )
         }
         whenever(readerDiscoverDataProvider.communicationChannel).thenReturn(fakeCommunicationChannel)
@@ -164,11 +182,11 @@ class ReaderDiscoverViewModelTest {
                 )
         ).thenAnswer {
             createReaderRecommendedBlogsCardUiState(
-                    recommendedBlogs = it.getArgument<List<ReaderBlog>>(RECOMMENDED_BLOG_PARAM_POSITION),
-                    onItemClicked = it.getArgument<(Long, Long) -> Unit>(
+                    recommendedBlogs = it.getArgument(RECOMMENDED_BLOG_PARAM_POSITION),
+                    onItemClicked = it.getArgument(
                             ON_RECOMMENDED_BLOG_ITEM_CLICKED_PARAM_POSITION
                     ),
-                    onFollowClicked = it.getArgument<(ReaderRecommendedBlogUiState) -> Unit>(
+                    onFollowClicked = it.getArgument(
                             ON_RECOMMENDED_BLOG_FOLLOW_CLICKED_PARAM_POSITION
                     )
             )
@@ -201,7 +219,7 @@ class ReaderDiscoverViewModelTest {
     }
 
     @Test
-    fun `ShowFollowInterestsEmptyUiState is shown when the user does NOT follow any tags `() = test {
+    fun `ShowFollowInterestsEmptyUiState is shown when the user does NOT follow any tags`() = test {
         // Arrange
         whenever(getFollowedTagsUseCase.get()).thenReturn(ReaderTagList())
         val uiStates = init().uiStates
@@ -209,7 +227,17 @@ class ReaderDiscoverViewModelTest {
         viewModel.start(parentViewModel)
         // Assert
         assertThat(uiStates.size).isEqualTo(2)
-        assertThat(uiStates[1]).isInstanceOf(ShowFollowInterestsEmptyUiState::class.java)
+        assertThat(uiStates[1]).isInstanceOf(ShowNoFollowedTagsUiState::class.java)
+    }
+
+    @Test
+    fun `ShowNoPostsUiState is shown when the discoverFeed does not contain any posts`() = test {
+        // Arrange
+        val uiStates = init(autoUpdateFeed = false).uiStates
+        // Act
+        fakeDiscoverFeed.value = createDummyReaderCardsList(numberOfItems = 0)
+        // Assert
+        assertThat(uiStates[1]).isInstanceOf(ShowNoPostsUiState::class.java)
     }
 
     @Test
@@ -251,17 +279,17 @@ class ReaderDiscoverViewModelTest {
 
     @Test
     fun `if ReaderRecommendedBlogsCard exist then ReaderRecommendedBlogsCardUiState will be present`() =
-        test {
-            // Arrange
-            val uiStates = init(autoUpdateFeed = false).uiStates
+            test {
+                // Arrange
+                val uiStates = init(autoUpdateFeed = false).uiStates
 
-            // Act
-            fakeDiscoverFeed.value = ReaderDiscoverCards(createReaderRecommendedBlogsCardList())
+                // Act
+                fakeDiscoverFeed.value = ReaderDiscoverCards(createReaderRecommendedBlogsCardList())
 
-            // Assert
-            val contentUiState = uiStates[1] as ContentUiState
-            assertThat(contentUiState.cards.first()).isInstanceOf(ReaderRecommendedBlogsCardUiState::class.java)
-        }
+                // Assert
+                val contentUiState = uiStates[1] as ContentUiState
+                assertThat(contentUiState.cards.first()).isInstanceOf(ReaderRecommendedBlogsCardUiState::class.java)
+            }
 
     @Test
     fun `if ReaderPostCard exist then ReaderPostUiState will be present in the ContentUIState`() = test {
@@ -275,7 +303,7 @@ class ReaderDiscoverViewModelTest {
     }
 
     @Test
-    fun `if welcome card exists with other cards, it is present in ContentUiState`() = test {
+    fun `if welcome card exists then ReaderWelcomeBannerCardUiState will be present`() = test {
         // Arrange
         val uiStates = init(autoUpdateFeed = false).uiStates
         // Act
@@ -288,17 +316,6 @@ class ReaderDiscoverViewModelTest {
         assertThat(contentUiState.cards.first()).isInstanceOf(ReaderWelcomeBannerCardUiState::class.java)
     }
 
-    @Test
-    fun `if welcome card exists as the only card in the feed then ContentUiState is not shown`() = test {
-        // Arrange
-        val uiStates = init(autoUpdateFeed = false).uiStates
-        // Act
-        fakeDiscoverFeed.value = ReaderDiscoverCards(createWelcomeBannerCard())
-        // Assert
-        assertThat(uiStates.size).isEqualTo(1)
-        assertThat(uiStates[0]).isInstanceOf(LoadingUiState::class.java)
-    }
-
     @Test
     fun `WelcomeBannerCard has welcome title set to it`() = test {
         // Arrange
@@ -326,7 +343,7 @@ class ReaderDiscoverViewModelTest {
         // Act
         fakeCommunicationChannel.postValue(Event(Started(REQUEST_FIRST_PAGE)))
         // Assert
-        assertThat(uiStates.last().reloadProgressVisibility).isTrue()
+        assertThat(uiStates.last().reloadProgressVisibility).isTrue
     }
 
     @Test
@@ -336,7 +353,7 @@ class ReaderDiscoverViewModelTest {
         // Act
         fakeCommunicationChannel.postValue(Event(Started(REQUEST_MORE)))
         // Assert
-        assertThat(uiStates.last().loadMoreProgressVisibility).isTrue()
+        assertThat(uiStates.last().loadMoreProgressVisibility).isTrue
     }
 
     @Test
@@ -346,7 +363,7 @@ class ReaderDiscoverViewModelTest {
         // Act
         fakeCommunicationChannel.postValue(Event(Started(mock())))
         // Assert
-        assertThat(uiStates.last().fullscreenProgressVisibility).isTrue()
+        assertThat(uiStates.last().fullscreenProgressVisibility).isTrue
     }
 
     @Test
@@ -357,7 +374,7 @@ class ReaderDiscoverViewModelTest {
         // Act
         fakeCommunicationChannel.postValue(Event(NetworkUnavailable(mock())))
         // Assert
-        assertThat(uiStates.last().fullscreenErrorVisibility).isTrue()
+        assertThat(uiStates.last()).isInstanceOf(RequestFailedUiState::class.java)
     }
 
     @Test
@@ -367,9 +384,9 @@ class ReaderDiscoverViewModelTest {
         // Act
         fakeCommunicationChannel.postValue(Event(NetworkUnavailable(mock())))
         // Assert
-        assertThat(uiStates.last().fullscreenProgressVisibility).isFalse()
-        assertThat(uiStates.last().reloadProgressVisibility).isFalse()
-        assertThat(uiStates.last().loadMoreProgressVisibility).isFalse()
+        assertThat(uiStates.last().fullscreenProgressVisibility).isFalse
+        assertThat(uiStates.last().reloadProgressVisibility).isFalse
+        assertThat(uiStates.last().loadMoreProgressVisibility).isFalse
     }
 
     @Test
@@ -403,7 +420,7 @@ class ReaderDiscoverViewModelTest {
                 eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post),
                 eq(LIKE),
                 eq(false),
-                eq(false)
+                anyString()
         )
     }
 
@@ -429,7 +446,8 @@ class ReaderDiscoverViewModelTest {
         // Assert
         verify(readerPostCardActionsHandler).handleHeaderClicked(
                 eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post.blogId),
-                eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post.feedId)
+                eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post.feedId),
+                eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post.isFollowedByCurrentUser)
         )
     }
 
@@ -442,7 +460,8 @@ class ReaderDiscoverViewModelTest {
                 .onItemClicked.invoke(2, 200)
         // Assert
         verify(readerPostCardActionsHandler).handleOnItemClicked(
-                eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post)
+                eq((fakeDiscoverFeed.value!!.cards[2] as ReaderPostCard).post),
+                eq(ReaderTracker.SOURCE_DISCOVER)
         )
     }
 
@@ -473,12 +492,12 @@ class ReaderDiscoverViewModelTest {
     @Test
     fun `When user picks a site for reblog action the app shows the editor`() {
         // Arrange
-        val navigaitonObserver = init().navigation
+        val navigationObserver = init().navigation
         fakeNavigationFeed.value = Event(ShowSitePickerForResult(mock(), mock(), mock()))
         // Act
         viewModel.onReblogSiteSelected(1)
         // Assert
-        assertThat(navigaitonObserver.last().peekContent()).isInstanceOf(OpenEditorForReblog::class.java)
+        assertThat(navigationObserver.last().peekContent()).isInstanceOf(OpenEditorForReblog::class.java)
     }
 
     @Test
@@ -490,7 +509,7 @@ class ReaderDiscoverViewModelTest {
         // Act
         (uiStates.last() as ContentUiState).let {
             (it.cards.first() as ReaderRecommendedBlogsCardUiState).let { card ->
-                card.blogs[0].onItemClicked.invoke(1, 0L)
+                card.blogs[0].onItemClicked.invoke(1, 0L, false)
             }
         }
 
@@ -512,13 +531,16 @@ class ReaderDiscoverViewModelTest {
         }
 
         // Assert
-        verify(readerPostCardActionsHandler).handleFollowRecommendedSiteClicked(blog)
+        verify(readerPostCardActionsHandler).handleFollowRecommendedSiteClicked(
+                eq(blog),
+                anyString()
+        )
     }
 
     @Test
     fun `Data are refreshed when the user swipes down to refresh`() = test {
         // Arrange
-        val navigaitonObserver = init()
+        init()
         // Act
         viewModel.swipeToRefresh()
         // Assert
@@ -528,7 +550,7 @@ class ReaderDiscoverViewModelTest {
     @Test
     fun `Data are refreshed when the user clicks on retry`() = test {
         // Arrange
-        val navigaitonObserver = init()
+        init()
         // Act
         viewModel.onRetryButtonClick()
         // Assert
@@ -543,7 +565,7 @@ class ReaderDiscoverViewModelTest {
         viewModel.swipeToRefresh()
         fakeDiscoverFeed.value = createDummyReaderCardsList()
         // Assert
-        assertThat(uiStates.last().scrollToTop).isTrue()
+        assertThat(uiStates.last().scrollToTop).isTrue
     }
 
     @Test
@@ -558,19 +580,44 @@ class ReaderDiscoverViewModelTest {
         }
         fakeDiscoverFeed.value = createDummyReaderCardsList()
         // Assert
-        assertThat(uiStates.last().scrollToTop).isFalse()
+        assertThat(uiStates.last().scrollToTop).isFalse
     }
 
     @Test
-    fun `OnEmptyActionClicked shows select interests screen`() = test {
+    fun `Action button on no tags empty screen opens reader interests screen`() = test {
         // Arrange
+        whenever(getFollowedTagsUseCase.get()).thenReturn(ReaderTagList())
         init()
+        fakeDiscoverFeed.value = ReaderDiscoverCards(listOf())
         // Act
-        viewModel.onEmptyActionClick()
+        (viewModel.uiState.value as ShowNoFollowedTagsUiState).action.invoke()
         // Assert
         verify(parentViewModel).onShowReaderInterests()
     }
 
+    @Test
+    fun `Action button on no posts empty screen opens subs screen`() = test {
+        // Arrange
+        val navigation = init().navigation
+        fakeDiscoverFeed.value = ReaderDiscoverCards(listOf())
+        // Act
+        (viewModel.uiState.value as ShowNoPostsUiState).action.invoke()
+        // Assert
+        assertThat(navigation[0].peekContent()).isInstanceOf(ShowReaderSubs::class.java)
+    }
+
+    @Test
+    fun `Action button on error empty screen invokes refresh cards`() = test {
+        // Arrange
+        init(autoUpdateFeed = false).uiStates
+        viewModel.start(parentViewModel)
+        fakeCommunicationChannel.postValue(Event(NetworkUnavailable(mock())))
+        // Act
+        (viewModel.uiState.value as RequestFailedUiState).action.invoke()
+        // Assert
+        verify(readerDiscoverDataProvider).refreshCards()
+    }
+
     private fun init(autoUpdateFeed: Boolean = true): Observers {
         val uiStates = mutableListOf<DiscoverUiState>()
         viewModel.uiState.observeForever {
@@ -594,8 +641,12 @@ class ReaderDiscoverViewModelTest {
     // since we are adding an InterestsYouMayLikeCard we remove one item from the numberOfItems since it counts as 1.
     private fun createDummyReaderCardsList(numberOfItems: Long = NUMBER_OF_ITEMS): ReaderDiscoverCards {
         return ReaderDiscoverCards(
-                createInterestsYouMayLikeCardList()
-                        .plus(createDummyReaderPostCardList(numberOfItems - 1))
+                if (numberOfItems != 0L) {
+                    createInterestsYouMayLikeCardList()
+                            .plus(createDummyReaderPostCardList(numberOfItems - 1))
+                } else {
+                    listOf()
+                }
         )
     }
 
@@ -622,10 +673,22 @@ class ReaderDiscoverViewModelTest {
         onMoreMenuDismissed: (ReaderPostUiState) -> Unit
     ): ReaderPostUiState {
         return ReaderPostUiState(
+                source = "source",
                 postId = post.postId,
                 blogId = post.blogId,
+                feedId = post.feedId,
+                isFollowed = post.isFollowedByCurrentUser,
                 blogSection = ReaderBlogSectionUiState(
-                        post.postId, post.blogId, "", mock(), "", "", ReaderBlogSectionClickData(postHeaderClicked, 0)
+                        post.postId,
+                        post.blogId,
+                        "",
+                        mock(),
+                        "",
+                        "",
+                        "",
+                        false,
+                        blavatarType = BLAVATAR_CIRCULAR,
+                        ReaderBlogSectionClickData(postHeaderClicked, 0)
                 ),
                 tagItems = listOf(TagUiState("", "", false, onTagClicked)),
                 excerpt = "",
@@ -655,11 +718,11 @@ class ReaderDiscoverViewModelTest {
     }
 
     private fun createReaderInterestsCardUiState(readerTagList: ReaderTagList) =
-            ReaderInterestsCardUiState(readerTagList.map { ReaderInterestUiState("", false, mock()) })
+            ReaderInterestsCardUiState(readerTagList.map { ReaderInterestUiState("", mock(), mock()) })
 
     private fun createReaderRecommendedBlogsCardUiState(
         recommendedBlogs: List<ReaderBlog>,
-        onItemClicked: (Long, Long) -> Unit,
+        onItemClicked: (Long, Long, Boolean) -> Unit,
         onFollowClicked: (ReaderRecommendedBlogUiState) -> Unit
     ): ReaderRecommendedBlogsCardUiState {
         return ReaderRecommendedBlogsCardUiState(
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt
index 2ddcbd73b077..a38ef4e0da83 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostCardActionsHandlerTest.kt
@@ -1,9 +1,11 @@
 package org.wordpress.android.ui.reader.discover
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.InternalCoroutinesApi
@@ -16,14 +18,16 @@ import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyBoolean
 import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.TEST_DISPATCHER
-import org.wordpress.android.TEST_SCOPE
+import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPayload.SubscriptionAction
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.test
+import org.wordpress.android.testScope
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenEditorForReblog
@@ -35,10 +39,10 @@ import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowBookm
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowNoSitesToReblog
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostDetail
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReaderComments
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReportPost
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowVideoViewer
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.BLOCK_SITE
-import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowReportPost
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.BOOKMARK
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.COMMENTS
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.FOLLOW
@@ -59,19 +63,25 @@ import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.PostLikedInLocalDb
 import org.wordpress.android.ui.reader.repository.usecases.UndoBlockBlogUseCase
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.Success
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderFetchSiteUseCase.FetchSiteState
 import org.wordpress.android.ui.reader.usecases.ReaderPostBookmarkUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.Failed.NoNetwork
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.Failed.RequestFailed
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState
 import org.wordpress.android.ui.utils.HtmlMessageUtils
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.ResourceProvider
 
+private const val SOURCE = "source"
+
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
 class ReaderPostCardActionsHandlerTest {
@@ -79,23 +89,26 @@ class ReaderPostCardActionsHandlerTest {
     @JvmField val rule = InstantTaskExecutorRule()
 
     private lateinit var actionHandler: ReaderPostCardActionsHandler
-    @Mock private lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock private lateinit var readerTracker: ReaderTracker
     @Mock private lateinit var reblogUseCase: ReblogUseCase
     @Mock private lateinit var bookmarkUseCase: ReaderPostBookmarkUseCase
     @Mock private lateinit var followUseCase: ReaderSiteFollowUseCase
     @Mock private lateinit var blockBlogUseCase: BlockBlogUseCase
     @Mock private lateinit var likeUseCase: PostLikeUseCase
     @Mock private lateinit var siteNotificationsUseCase: ReaderSiteNotificationsUseCase
+    @Mock private lateinit var seenStatusToggleUseCase: ReaderSeenStatusToggleUseCase
     @Mock private lateinit var undoBlockBlogUseCase: UndoBlockBlogUseCase
+    @Mock private lateinit var fetchSiteUseCase: ReaderFetchSiteUseCase
     @Mock private lateinit var appPrefsWrapper: AppPrefsWrapper
+    @Mock private lateinit var readerBlogTableWrapper: ReaderBlogTableWrapper
     @Mock private lateinit var dispatcher: Dispatcher
     @Mock private lateinit var resourceProvider: ResourceProvider
     @Mock private lateinit var htmlMessageUtils: HtmlMessageUtils
 
     @Before
-    fun setUp() {
+    fun setUp() = test {
         actionHandler = ReaderPostCardActionsHandler(
-                analyticsTrackerWrapper,
+                readerTracker,
                 reblogUseCase,
                 bookmarkUseCase,
                 followUseCase,
@@ -103,30 +116,39 @@ class ReaderPostCardActionsHandlerTest {
                 likeUseCase,
                 siteNotificationsUseCase,
                 undoBlockBlogUseCase,
+                fetchSiteUseCase,
                 appPrefsWrapper,
                 dispatcher,
                 resourceProvider,
                 htmlMessageUtils,
                 mock(),
-                TEST_DISPATCHER,
-                TEST_SCOPE,
-                TEST_SCOPE
+                seenStatusToggleUseCase,
+                readerBlogTableWrapper,
+                TEST_DISPATCHER
         )
+        actionHandler.initScope(testScope())
         whenever(appPrefsWrapper.shouldShowBookmarksSavedLocallyDialog()).thenReturn(false)
         whenever(htmlMessageUtils.getHtmlMessageFromStringFormatResId(anyInt(), anyOrNull())).thenReturn(mock())
+        whenever(readerBlogTableWrapper.getReaderBlog(any(), any())).thenReturn(mock())
     }
 
     /** BOOKMARK ACTION begin **/
     @Test
     fun `shows dialog when bookmark action is successful and shouldShowDialog returns true`() = test {
         // Arrange
-        whenever(bookmarkUseCase.toggleBookmark(anyLong(), anyLong(), anyBoolean(), anyBoolean()))
+        whenever(bookmarkUseCase.toggleBookmark(any(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(Success(true)))
-        whenever(appPrefsWrapper.shouldShowBookmarksSavedLocallyDialog()).thenReturn(true)
+        whenever(appPrefsWrapper.shouldShowBookmarksSavedLocallyDialog())
+                .thenReturn(true)
 
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), BOOKMARK, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                BOOKMARK,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(ShowBookmarkedSavedOnlyLocallyDialog::class.java)
@@ -135,13 +157,19 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `doesn't shows when dialog bookmark action is successful and shouldShowDialog returns false`() = test {
         // Arrange
-        whenever(bookmarkUseCase.toggleBookmark(anyLong(), anyLong(), anyBoolean(), anyBoolean()))
+        whenever(bookmarkUseCase.toggleBookmark(any(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(Success(true)))
-        whenever(appPrefsWrapper.shouldShowBookmarksSavedLocallyDialog()).thenReturn(false)
+        whenever(appPrefsWrapper.shouldShowBookmarksSavedLocallyDialog())
+                .thenReturn(false)
 
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), BOOKMARK, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                BOOKMARK,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.navigation).isEmpty()
@@ -150,12 +178,17 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `shows snackbar on successful bookmark action`() = test {
         // Arrange
-        whenever(bookmarkUseCase.toggleBookmark(anyLong(), anyLong(), anyBoolean(), anyBoolean()))
+        whenever(bookmarkUseCase.toggleBookmark(any(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(Success(true)))
 
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), BOOKMARK, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                BOOKMARK,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -164,13 +197,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Doesn't show snackbar on successful bookmark action when on bookmark(saved) tab`() = test {
         // Arrange
-        whenever(bookmarkUseCase.toggleBookmark(anyLong(), anyLong(), anyBoolean(), anyBoolean()))
+        whenever(bookmarkUseCase.toggleBookmark(any(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(Success(true)))
 
         val observedValues = startObserving()
         val isBookmarkList = true
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), BOOKMARK, isBookmarkList)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                BOOKMARK,
+                isBookmarkList,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs).isEmpty()
@@ -179,13 +217,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Doesn't show snackbar on successful UNbookmark action`() = test {
         // Arrange
-        whenever(bookmarkUseCase.toggleBookmark(anyLong(), anyLong(), anyBoolean(), anyBoolean()))
+        whenever(bookmarkUseCase.toggleBookmark(any(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(Success(false)))
 
         val observedValues = startObserving()
         val isBookmarkList = true
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), BOOKMARK, isBookmarkList)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                BOOKMARK,
+                isBookmarkList,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs).isEmpty()
@@ -194,12 +237,17 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `navigates to bookmark tab on bookmark snackbar action clicked`() = test {
         // Arrange
-        whenever(bookmarkUseCase.toggleBookmark(anyLong(), anyLong(), anyBoolean(), anyBoolean()))
+        whenever(bookmarkUseCase.toggleBookmark(any(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(Success(true)))
 
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), BOOKMARK, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                BOOKMARK,
+                false,
+                SOURCE
+        )
         observedValues.snackbarMsgs[0].buttonAction.invoke()
 
         // Assert
@@ -211,11 +259,17 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Emit followStatusUpdated after follow status update`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(flowOf(mock<FollowStatusChanged>()))
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(mock<FollowStatusChanged>()))
         val observedValues = startObserving()
 
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.followStatusUpdated.size).isEqualTo(1)
@@ -224,10 +278,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Fetch subscriptions after follow status update`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(flowOf(mock<FollowStatusChanged>()))
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(mock<FollowStatusChanged>()))
 
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Assert
         verify(siteNotificationsUseCase).fetchSubscriptions()
@@ -236,12 +296,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Enable notifications snackbar shown when user follows a post`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(
-                flowOf(FollowStatusChanged(-1, following = true, showEnableNotification = true))
-        )
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(
+                        flowOf(FollowStatusChanged(-1, -1, following = true, showEnableNotification = true))
+                )
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -250,12 +316,25 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Post notifications are disabled when user unfollows a post`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(
-                flowOf(FollowStatusChanged(-1, following = false, deleteNotificationSubscription = true))
-        )
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(
+                        flowOf(
+                                FollowStatusChanged(
+                                        -1,
+                                        -1,
+                                        following = false,
+                                        deleteNotificationSubscription = true
+                                )
+                        )
+                )
 
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Assert
         verify(siteNotificationsUseCase).updateSubscription(anyLong(), eq(SubscriptionAction.DELETE))
@@ -265,11 +344,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Post notifications are enabled when user clicks on enable notifications snackbar action`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(
-                flowOf(FollowStatusChanged(-1, following = true, showEnableNotification = true))
-        )
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(FollowStatusChanged(-1, -1, following = true, showEnableNotification = true)))
         val observedValues = startObserving()
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Act
         observedValues.snackbarMsgs[0].buttonAction.invoke()
@@ -282,11 +366,17 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Error message is shown when follow action fails with NoNetwork error`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(flowOf(NoNetwork))
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(NoNetwork))
         val observedValues = startObserving()
 
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -295,38 +385,138 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Error message is shown when follow action fails with RequestFailed error`() = test {
         // Arrange
-        whenever(followUseCase.toggleFollow(anyOrNull())).thenReturn(flowOf(RequestFailed))
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(RequestFailed))
+        val observedValues = startObserving()
+
+        // Act
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
+
+        // Assert
+        assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
+    }
+
+    @Test
+    fun `given site present in db, when follow action is requested, follow site is triggered`() = test {
+        // Arrange
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(FollowSiteState.Success))
+
+        // Act
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
+
+        // Assert
+        verify(followUseCase, times(1)).toggleFollow(any(), anyString())
+    }
+
+    @Test
+    fun `given site not present in db, when follow action is requested, fetch site is triggered`() = test {
+        // Arrange
+        whenever(readerBlogTableWrapper.getReaderBlog(any(), any()))
+                .thenReturn(null)
+        whenever(fetchSiteUseCase.fetchSite(any(), any(), anyOrNull()))
+                .thenReturn(FetchSiteState.Success)
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(FollowSiteState.Success))
+
+        // Act
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
+
+        // Assert
+        verify(fetchSiteUseCase, times(1)).fetchSite(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `given fetch site request fails, when follow action is requested, error snackbar is shown`() = test {
+        // Arrange
+        whenever(readerBlogTableWrapper.getReaderBlog(any(), any()))
+                .thenReturn(null)
+        whenever(fetchSiteUseCase.fetchSite(any(), any(), anyOrNull()))
+                .thenReturn(FetchSiteState.Failed.RequestFailed)
         val observedValues = startObserving()
 
         // Act
-        actionHandler.onAction(dummyReaderPostModel(), FOLLOW, false)
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
     }
+
+    @Test
+    fun `given fetch site request succeeds, when follow action is requested, follow site is triggered`() = test {
+        // Arrange
+        whenever(readerBlogTableWrapper.getReaderBlog(any(), any()))
+                .thenReturn(null)
+        whenever(fetchSiteUseCase.fetchSite(any(), any(), anyOrNull()))
+                .thenReturn(FetchSiteState.Success)
+        whenever(followUseCase.toggleFollow(anyOrNull(), anyString()))
+                .thenReturn(flowOf(FollowSiteState.Success))
+
+        // Act
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                FOLLOW,
+                false,
+                SOURCE
+        )
+
+        // Assert
+        verify(followUseCase, times(1)).toggleFollow(any(), anyString())
+    }
     /** FOLLOW ACTION end **/
 
     /** SITE NOTIFICATIONS ACTION Begin **/
     @Test
     fun `ToggleNotifications when user clicks on Notifcations button`() = test {
         // Arrange
-        whenever(siteNotificationsUseCase.toggleNotification(anyLong())).thenReturn(SiteNotificationState.Success)
+        whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
+                .thenReturn(SiteNotificationState.Success)
         // Act
-        actionHandler.onAction(mock(), SITE_NOTIFICATIONS, false)
+        actionHandler.onAction(
+                mock(),
+                SITE_NOTIFICATIONS,
+                false,
+                SOURCE
+        )
 
         // Assert
-        verify(siteNotificationsUseCase).toggleNotification(anyLong())
+        verify(siteNotificationsUseCase).toggleNotification(anyLong(), anyLong())
     }
 
     @Test
     fun `Show snackbar message when toggleNotification return network error`() = test {
         // Arrange
-        whenever(siteNotificationsUseCase.toggleNotification(anyLong()))
+        whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
                 .thenReturn(SiteNotificationState.Failed.NoNetwork)
         val observedValues = startObserving()
 
         // Act
-        actionHandler.onAction(mock(), SITE_NOTIFICATIONS, false)
+        actionHandler.onAction(
+                mock(),
+                SITE_NOTIFICATIONS,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -335,12 +525,17 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Show snackbar message when toggleNotification returns request error`() = test {
         // Arrange
-        whenever(siteNotificationsUseCase.toggleNotification(anyLong()))
+        whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
                 .thenReturn(SiteNotificationState.Failed.RequestFailed)
         val observedValues = startObserving()
 
         // Act
-        actionHandler.onAction(mock(), SITE_NOTIFICATIONS, false)
+        actionHandler.onAction(
+                mock(),
+                SITE_NOTIFICATIONS,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -349,16 +544,107 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Do not Show snackbar message when toggleNotification returns alreadyRunning error`() = test {
         // Arrange
-        whenever(siteNotificationsUseCase.toggleNotification(anyLong()))
+        whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
                 .thenReturn(SiteNotificationState.Failed.AlreadyRunning)
         val observedValues = startObserving()
 
         // Act
-        actionHandler.onAction(mock(), SITE_NOTIFICATIONS, false)
+        actionHandler.onAction(
+                mock(),
+                SITE_NOTIFICATIONS,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs).isEmpty()
     }
+
+    @Test
+    fun `given site present in db, when site notifications action is requested, toggle notifications is triggered`() =
+            test {
+                // Arrange
+                whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
+                        .thenReturn(SiteNotificationState.Success)
+
+                // Act
+                actionHandler.onAction(
+                        dummyReaderPostModel(),
+                        SITE_NOTIFICATIONS,
+                        false,
+                        SOURCE
+                )
+
+                // Assert
+                verify(siteNotificationsUseCase, times(1)).toggleNotification(any(), any())
+            }
+
+    @Test
+    fun `given site not present in db, when site notifications action is requested, fetch site is triggered`() = test {
+        // Arrange
+        whenever(readerBlogTableWrapper.getReaderBlog(any(), any()))
+                .thenReturn(null)
+        whenever(fetchSiteUseCase.fetchSite(any(), any(), anyOrNull()))
+                .thenReturn(FetchSiteState.Success)
+        whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
+                .thenReturn(SiteNotificationState.Success)
+
+        // Act
+        actionHandler.onAction(
+                dummyReaderPostModel(),
+                SITE_NOTIFICATIONS,
+                false,
+                SOURCE
+        )
+
+        // Assert
+        verify(fetchSiteUseCase, times(1)).fetchSite(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `given fetch site request fails, when site notifications action is requested, error snackbar is shown`() =
+            test {
+                // Arrange
+                whenever(readerBlogTableWrapper.getReaderBlog(any(), any()))
+                        .thenReturn(null)
+                whenever(fetchSiteUseCase.fetchSite(any(), any(), anyOrNull()))
+                        .thenReturn(FetchSiteState.Failed.RequestFailed)
+                val observedValues = startObserving()
+
+                // Act
+                actionHandler.onAction(
+                        dummyReaderPostModel(),
+                        SITE_NOTIFICATIONS,
+                        false,
+                        SOURCE
+                )
+
+                // Assert
+                assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
+            }
+
+    @Test
+    fun `given fetch site request succeeds, when site notifications is requested, toggle notifications is triggered`() =
+            test {
+                // Arrange
+                whenever(readerBlogTableWrapper.getReaderBlog(any(), any()))
+                        .thenReturn(null)
+                whenever(fetchSiteUseCase.fetchSite(any(), any(), anyOrNull()))
+                        .thenReturn(FetchSiteState.Success)
+                whenever(siteNotificationsUseCase.toggleNotification(anyLong(), anyLong()))
+                        .thenReturn(SiteNotificationState.Success)
+
+                // Act
+                actionHandler.onAction(
+                        dummyReaderPostModel(),
+                        SITE_NOTIFICATIONS,
+                        false,
+                        SOURCE
+                )
+
+                // Assert
+                verify(siteNotificationsUseCase, times(1)).toggleNotification(any(), any())
+            }
     /** SITE NOTIFICATIONS ACTION end **/
 
     /** SHARE ACTION Begin **/
@@ -367,7 +653,12 @@ class ReaderPostCardActionsHandlerTest {
         // Arrange
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), SHARE, false)
+        actionHandler.onAction(
+                mock(),
+                SHARE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(SharePost::class.java)
@@ -380,7 +671,12 @@ class ReaderPostCardActionsHandlerTest {
         // Arrange
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), VISIT_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                VISIT_SITE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(OpenPost::class.java)
@@ -391,10 +687,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Posts are refreshed when site blocked in local db`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.refreshPosts.size).isEqualTo(1)
@@ -403,10 +705,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Snackbar shown when site blocked in local db`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -415,10 +723,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Snackbar shown when request to block site failes with no network error`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(Failed.NoNetwork))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(Failed.NoNetwork))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -427,10 +741,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Posts are refreshed when request to block site failes with request failed error`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(Failed.RequestFailed))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(Failed.RequestFailed))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.refreshPosts.size).isEqualTo(1)
@@ -439,10 +759,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Snackbar shown when request to block site failes with request failed error`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(Failed.RequestFailed))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(Failed.RequestFailed))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
 
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
@@ -451,21 +777,33 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Undo action is invoked when user clicks on undo action in snackbar`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
         val observedValues = startObserving()
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
         // Act
         observedValues.snackbarMsgs[0].buttonAction.invoke()
         // Assert
-        verify(undoBlockBlogUseCase).undoBlockBlog(anyOrNull())
+        verify(undoBlockBlogUseCase).undoBlockBlog(anyOrNull(), anyString())
     }
 
     @Test
     fun `Post refreshed when user clicks on undo action in snackbar`() = test {
         // Arrange
-        whenever(blockBlogUseCase.blockBlog(anyLong())).thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
+        whenever(blockBlogUseCase.blockBlog(anyLong(), anyLong()))
+                .thenReturn(flowOf(SiteBlockedInLocalDb(mock())))
         val observedValues = startObserving()
-        actionHandler.onAction(mock(), BLOCK_SITE, false)
+        actionHandler.onAction(
+                mock(),
+                BLOCK_SITE,
+                false,
+                SOURCE
+        )
         // Act
         observedValues.snackbarMsgs[0].buttonAction.invoke()
         // Assert
@@ -477,44 +815,68 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Like action is initiated when user clicks on like button`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean())).thenReturn(flowOf())
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
+                .thenReturn(flowOf())
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
-        verify(likeUseCase).perform(anyOrNull(), anyBoolean(), anyBoolean())
+        verify(likeUseCase).perform(anyOrNull(), anyBoolean(), anyString())
     }
 
     @Test
     fun `Like use cases is initiated with like action when the post is not liked by the current user`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean())).thenReturn(flowOf())
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
+                .thenReturn(flowOf())
         val isLiked = false
         val post = ReaderPost().apply { isLikedByCurrentUser = isLiked }
         // Act
-        actionHandler.onAction(post, LIKE, false)
+        actionHandler.onAction(
+                post,
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
-        verify(likeUseCase).perform(anyOrNull(), eq(!isLiked), eq(false))
+        verify(likeUseCase).perform(anyOrNull(), eq(!isLiked), anyString())
     }
 
     @Test
     fun `Like use cases is initiated with unlike action when the post is not liked by the current user`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean())).thenReturn(flowOf())
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
+                .thenReturn(flowOf())
         val isLiked = true
         val post = ReaderPost().apply { isLikedByCurrentUser = isLiked }
         // Act
-        actionHandler.onAction(post, LIKE, false)
+        actionHandler.onAction(
+                post,
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
-        verify(likeUseCase).perform(anyOrNull(), eq(!isLiked), eq(false))
+        verify(likeUseCase).perform(anyOrNull(), eq(!isLiked), anyString())
     }
 
     @Test
     fun `Posts are refreshed when user likes a post`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean())).thenReturn(flowOf(PostLikedInLocalDb))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
+                .thenReturn(flowOf(PostLikedInLocalDb))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.refreshPosts.size).isEqualTo(1)
     }
@@ -522,11 +884,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Posts are refreshed when like action fails with RequestFailed error`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean()))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(PostLikeState.Failed.RequestFailed))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.refreshPosts.size).isEqualTo(1)
     }
@@ -534,11 +901,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Snackbar shown when like action fails with no network error`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean()))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(PostLikeState.Failed.NoNetwork))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
     }
@@ -546,11 +918,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Snackbar shown when like action fails with no RequestFailed error`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean()))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(PostLikeState.Failed.RequestFailed))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
     }
@@ -558,10 +935,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Nothing happens when like action succeeds`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean())).thenReturn(flowOf(PostLikeState.Success))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
+                .thenReturn(flowOf(PostLikeState.Success))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.snackbarMsgs).isEmpty()
         assertThat(observedValues.navigation).isEmpty()
@@ -573,11 +956,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Nothing happens when like action results in Unchanged state`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean()))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(PostLikeState.Unchanged))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.snackbarMsgs).isEmpty()
         assertThat(observedValues.navigation).isEmpty()
@@ -589,11 +977,16 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Nothing happens when like action results in AlreadyRunning`() = test {
         // Arrange
-        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyBoolean()))
+        whenever(likeUseCase.perform(anyOrNull(), anyBoolean(), anyString()))
                 .thenReturn(flowOf(PostLikeState.AlreadyRunning))
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), LIKE, false)
+        actionHandler.onAction(
+                mock(),
+                LIKE,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.snackbarMsgs).isEmpty()
         assertThat(observedValues.navigation).isEmpty()
@@ -608,10 +1001,17 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Reblog action is initiated when user clicks on reblog button`() = test {
         // Arrange
-        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull())).thenReturn(mock())
-        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull())).thenReturn(mock())
+        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull()))
+                .thenReturn(mock())
+        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull()))
+                .thenReturn(mock())
         // Act
-        actionHandler.onAction(mock(), REBLOG, false)
+        actionHandler.onAction(
+                mock(),
+                REBLOG,
+                false,
+                SOURCE
+        )
         // Assert
         verify(reblogUseCase).onReblogButtonClicked(anyOrNull())
     }
@@ -619,11 +1019,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Show NoSitesToReblog screen when user does not have any sites attached`() = test {
         // Arrange
-        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull())).thenReturn(NoSite)
-        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull())).thenCallRealMethod()
+        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull()))
+                .thenReturn(NoSite)
+        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull()))
+                .thenCallRealMethod()
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), REBLOG, false)
+        actionHandler.onAction(
+                mock(),
+                REBLOG,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(ShowNoSitesToReblog::class.java)
     }
@@ -631,11 +1038,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Show SitePicker when user has multiple sites attached`() = test {
         // Arrange
-        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull())).thenReturn(MultipleSites(mock(), mock()))
-        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull())).thenCallRealMethod()
+        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull()))
+                .thenReturn(MultipleSites(mock(), mock()))
+        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull()))
+                .thenCallRealMethod()
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), REBLOG, false)
+        actionHandler.onAction(
+                mock(),
+                REBLOG,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(ShowSitePickerForResult::class.java)
     }
@@ -643,11 +1057,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Show Editor when user has a single site attached or they selected a site they want to reblog to`() = test {
         // Arrange
-        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull())).thenReturn(SingleSite(mock(), mock()))
-        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull())).thenCallRealMethod()
+        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull()))
+                .thenReturn(SingleSite(mock(), mock()))
+        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull()))
+                .thenCallRealMethod()
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), REBLOG, false)
+        actionHandler.onAction(
+                mock(),
+                REBLOG,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(OpenEditorForReblog::class.java)
     }
@@ -655,11 +1076,18 @@ class ReaderPostCardActionsHandlerTest {
     @Test
     fun `Show snackbar when an error occurs`() = test {
         // Arrange
-        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull())).thenReturn(Unknown)
-        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull())).thenCallRealMethod()
+        whenever(reblogUseCase.onReblogButtonClicked(anyOrNull()))
+                .thenReturn(Unknown)
+        whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull()))
+                .thenCallRealMethod()
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), REBLOG, false)
+        actionHandler.onAction(
+                mock(),
+                REBLOG,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.snackbarMsgs.size).isEqualTo(1)
     }
@@ -671,7 +1099,12 @@ class ReaderPostCardActionsHandlerTest {
         // Arrange
         val observedValues = startObserving()
         // Act
-        actionHandler.onAction(mock(), COMMENTS, false)
+        actionHandler.onAction(
+                mock(),
+                COMMENTS,
+                false,
+                SOURCE
+        )
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(ShowReaderComments::class.java)
     }
@@ -684,7 +1117,7 @@ class ReaderPostCardActionsHandlerTest {
         val observedValues = startObserving()
 
         // Act
-        actionHandler.handleOnItemClicked(mock())
+        actionHandler.handleOnItemClicked(mock(), anyString())
 
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(ShowPostDetail::class.java)
@@ -708,7 +1141,7 @@ class ReaderPostCardActionsHandlerTest {
         val observedValues = startObserving()
 
         // Act
-        actionHandler.handleHeaderClicked(0L, 0L)
+        actionHandler.handleHeaderClicked(0L, 0L, false)
 
         // Assert
         assertThat(observedValues.navigation[0]).isInstanceOf(ShowBlogPreview::class.java)
@@ -756,6 +1189,7 @@ class ReaderPostCardActionsHandlerTest {
         // Assert
         assertThat(navigation[0]).isInstanceOf(ShowReportPost::class.java)
     }
+
     /** REPORT POST ACTION end **/
 
     private fun dummyReaderPostModel(): ReaderPost {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilderTest.kt
index 6113eb77bc74..ec86d1df6e1c 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostMoreButtonUiStateBuilderTest.kt
@@ -18,10 +18,10 @@ import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.test
-import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType.TAG_FOLLOWED
-import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType.TAG_PREVIEW
+import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.SecondaryAction
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.config.SeenUnseenWithCounterFeatureConfig
 
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
@@ -34,13 +34,17 @@ class ReaderPostMoreButtonUiStateBuilderTest {
     @Mock lateinit var readerPostTableWrapper: ReaderPostTableWrapper
     @Mock lateinit var readerBlogTableWrapper: ReaderBlogTableWrapper
     @Mock lateinit var readerUtilsWrapper: ReaderUtilsWrapper
+    @Mock lateinit var mSeenUnseenWithCounterFeatureConfig: SeenUnseenWithCounterFeatureConfig
 
     @Before
     fun setUp() = test {
+        whenever(mSeenUnseenWithCounterFeatureConfig.isEnabled()).thenReturn(true)
+
         builder = ReaderPostMoreButtonUiStateBuilder(
                 readerPostTableWrapper,
                 readerBlogTableWrapper,
                 readerUtilsWrapper,
+                mSeenUnseenWithCounterFeatureConfig,
                 TEST_DISPATCHER
         )
     }
@@ -50,11 +54,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = false)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.FOLLOW &&
-                    it.label == UiStringRes(R.string.reader_btn_follow)
+                    (it as SecondaryAction).label == UiStringRes(R.string.reader_btn_follow)
         }).isNotNull
     }
 
@@ -63,11 +67,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.FOLLOW &&
-                    it.label == UiStringRes(R.string.reader_btn_unfollow)
+                    (it as SecondaryAction).label == UiStringRes(R.string.reader_btn_unfollow)
         }).isNotNull
     }
 
@@ -76,7 +80,7 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = false)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS
@@ -88,7 +92,7 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS
@@ -102,7 +106,7 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         whenever(readerUtilsWrapper.isExternalFeed(post.feedId, post.blogId)).thenReturn(true)
 
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS
@@ -114,11 +118,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true, isNotificationsEnabled = false)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS &&
-                    it.label == UiStringRes(R.string.reader_btn_notifications_on)
+                    (it as SecondaryAction).label == UiStringRes(R.string.reader_btn_notifications_on)
         }).isNotNull
     }
 
@@ -127,11 +131,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true, isNotificationsEnabled = true)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS &&
-                    it.label == UiStringRes(R.string.reader_btn_notifications_off)
+                    (it as SecondaryAction).label == UiStringRes(R.string.reader_btn_notifications_off)
         }).isNotNull
     }
 
@@ -140,7 +144,7 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init()
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find { it.type == ReaderPostCardActionType.SHARE }).isNotNull
     }
@@ -150,27 +154,27 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init()
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find { it.type == ReaderPostCardActionType.VISIT_SITE }).isNotNull
     }
 
     @Test
-    fun `contains block site action when post list type is TAG_FOLLOWED`() = test {
+    fun `contains block site action when post is not followed`() = test {
         // Arrange
-        val post = init()
+        val post = init(isFollowed = false)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find { it.type == ReaderPostCardActionType.BLOCK_SITE }).isNotNull
     }
 
     @Test
-    fun `does not contain block site action when post list type is not TAG_FOLLOWED`() = test {
+    fun `does not contain block site action when post is followed`() = test {
         // Arrange
-        val post = init()
+        val post = init(isFollowed = true)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_PREVIEW, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find { it.type == ReaderPostCardActionType.BLOCK_SITE }).isNull()
     }
@@ -180,11 +184,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = false)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.FOLLOW &&
-                    it.labelColor == R.attr.colorSecondary
+                    (it as SecondaryAction).labelColor == R.attr.colorSecondary
         }).isNotNull
     }
 
@@ -193,11 +197,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.FOLLOW &&
-                    it.labelColor == R.attr.wpColorOnSurfaceMedium
+                    (it as SecondaryAction).labelColor == R.attr.wpColorOnSurfaceMedium
         }).isNotNull
     }
 
@@ -206,11 +210,11 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true, isNotificationsEnabled = false)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS &&
-                    it.labelColor == R.attr.colorOnSurface
+                    (it as SecondaryAction).labelColor == R.attr.colorOnSurface
         }).isNotNull
     }
 
@@ -219,44 +223,95 @@ class ReaderPostMoreButtonUiStateBuilderTest {
         // Arrange
         val post = init(isFollowed = true, isNotificationsEnabled = true)
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find {
             it.type == ReaderPostCardActionType.SITE_NOTIFICATIONS &&
-                    it.labelColor == R.attr.wpColorOnSurfaceMedium
+                    (it as SecondaryAction).labelColor == R.attr.wpColorOnSurfaceMedium
         }).isNotNull
     }
 
     @Test
-    fun `contains report post action when post list type is TAG_FOLLOWED`() = test {
+    fun `contains report post action`() = test {
         // Arrange
         val post = init()
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_FOLLOWED, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
         assertThat(menuItems.find { it.type == ReaderPostCardActionType.REPORT_POST }).isNotNull
     }
 
     @Test
-    fun `does not contain report post action when post list type is not TAG_FOLLOWED`() = test {
+    fun `contains mark as seen when post is unseen`() = test {
+        // Arrange
+        val post = init(isSeen = false)
+        // Act
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
+        // Assert
+        assertThat(menuItems.find {
+            it.type == ReaderPostCardActionType.TOGGLE_SEEN_STATUS &&
+                    (it as SecondaryAction).label == UiStringRes(R.string.reader_menu_mark_as_seen)
+        }).isNotNull
+    }
+
+    @Test
+    fun `contains mark as unseen action when post is seen`() = test {
+        // Arrange
+        val post = init(isSeen = true)
+        // Act
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
+        // Assert
+        assertThat(menuItems.find {
+            it.type == ReaderPostCardActionType.TOGGLE_SEEN_STATUS &&
+                    (it as SecondaryAction).label == UiStringRes(R.string.reader_menu_mark_as_unseen)
+        }).isNotNull
+    }
+
+    @Test
+    fun `contains seen status toggle action when posts isSeenSupported is true`() = test {
+        // Arrange
+        val post = init()
+        // Act
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
+        // Assert
+        assertThat(menuItems.find { it.type == ReaderPostCardActionType.TOGGLE_SEEN_STATUS }).isNotNull
+    }
+
+    @Test
+    fun `does not contain seen status toggle action when posts isSeenSupported is false`() = test {
+        // Arrange
+        val post = init(isSeenSupported = false)
+        // Act
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
+        // Assert
+        assertThat(menuItems.find { it.type == ReaderPostCardActionType.TOGGLE_SEEN_STATUS }).isNull()
+    }
+
+    @Test
+    fun `given post list card actions created, then list contains spacer no action`() = test {
         // Arrange
         val post = init()
         // Act
-        val menuItems = builder.buildMoreMenuItems(post, TAG_PREVIEW, dummyOnClick)
+        val menuItems = builder.buildMoreMenuItems(post, dummyOnClick)
         // Assert
-        assertThat(menuItems.find { it.type == ReaderPostCardActionType.REPORT_POST }).isNull()
+        assertThat(menuItems.find { it.type == ReaderPostCardActionType.SPACER_NO_ACTION }).isNotNull
     }
 
     private fun init(
         isFollowed: Boolean = false,
         isNotificationsEnabled: Boolean = false,
-        isFeed: Boolean = false
+        isFeed: Boolean = false,
+        isSeenSupported: Boolean = true,
+        isSeen: Boolean = false
     ): ReaderPost {
         whenever(readerPostTableWrapper.isPostFollowed(anyOrNull())).thenReturn(isFollowed)
+        whenever(readerPostTableWrapper.isPostSeen(anyOrNull())).thenReturn(isSeen)
         whenever(readerBlogTableWrapper.isNotificationsEnabled(anyLong())).thenReturn(isNotificationsEnabled)
         return ReaderPost().apply {
             this.blogId = 1L
             this.feedId = if (isFeed) 1L else 2L // set blogId == feedId so the post is treated as a feed
+            this.isSeenSupported = isSeenSupported
+            this.isSeen = isSeen
         }
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilderTest.kt
index 7dcff500bc1f..3b31095b1e89 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/ReaderPostUiStateBuilderTest.kt
@@ -35,9 +35,15 @@ import org.wordpress.android.models.ReaderPostDiscoverData.DiscoverType.SITE_PIC
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.ReaderTagList
 import org.wordpress.android.test
+import org.wordpress.android.ui.Organization.NO_ORGANIZATION
+import org.wordpress.android.ui.Organization.P2
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType.BLOG_PREVIEW
 import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType.TAG_FOLLOWED
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStyleGreen
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStyleOrange
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStylePurple
+import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderInterestsCardUiState.ChipStyle.ChipStyleYellow
 import org.wordpress.android.ui.reader.discover.ReaderCardUiState.ReaderPostUiState
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.BOOKMARK
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.LIKE
@@ -47,6 +53,7 @@ import org.wordpress.android.ui.reader.utils.ReaderImageScanner
 import org.wordpress.android.ui.reader.utils.ReaderImageScannerProvider
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.DateTimeUtilsWrapper
 import org.wordpress.android.util.GravatarUtilsWrapper
@@ -116,6 +123,20 @@ class ReaderPostUiStateBuilderTest {
             assertThat(uiState.blogSection.blogSectionClickData).isNotNull
         }
     }
+
+    @Test
+    fun `p2 posts in the feed show author's avatar alongside site icon`() = test {
+        // Arrange
+        val p2post = createPost(isp2Post = true)
+        val nonP2Post = createPost(isp2Post = false)
+        // Act
+        val p2UiState = mapPostToUiState(p2post)
+        val nonP2UiState = mapPostToUiState(nonP2Post)
+        // Assert
+        assertThat(p2UiState.blogSection.isAuthorAvatarVisible).isTrue
+        assertThat(nonP2UiState.blogSection.isAuthorAvatarVisible).isFalse
+    }
+
     // endregion
 
     // region BLOG URL
@@ -237,7 +258,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.videoOverlayVisibility).isTrue()
+        assertThat(uiState.videoOverlayVisibility).isTrue
     }
 
     @Test
@@ -323,7 +344,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.photoTitle).isNotNull()
+        assertThat(uiState.photoTitle).isNotNull
     }
 
     @Test
@@ -369,7 +390,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.photoFrameVisibility).isFalse()
+        assertThat(uiState.photoFrameVisibility).isFalse
     }
 
     @Test
@@ -379,7 +400,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.photoFrameVisibility).isTrue()
+        assertThat(uiState.photoFrameVisibility).isTrue
     }
 
     @Test
@@ -389,7 +410,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.photoFrameVisibility).isFalse()
+        assertThat(uiState.photoFrameVisibility).isFalse
     }
 
     @Test
@@ -399,7 +420,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.photoFrameVisibility).isTrue()
+        assertThat(uiState.photoFrameVisibility).isTrue
     }
 
     @Test
@@ -409,7 +430,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.photoFrameVisibility).isFalse()
+        assertThat(uiState.photoFrameVisibility).isFalse
     }
     // endregion
 
@@ -487,7 +508,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.blogSection.blogName).isNotNull()
+        assertThat(uiState.blogSection.blogName).isNotNull
     }
 
     @Test
@@ -499,6 +520,38 @@ class ReaderPostUiStateBuilderTest {
         // Assert
         assertThat((uiState.blogSection.blogName as UiStringRes).stringRes).isEqualTo(R.string.untitled_in_parentheses)
     }
+
+    @Test
+    fun `p2 posts in the feed show author's first name (or full name) alongside the blog name`() = test {
+        // Arrange
+        val postWithFirstName = createPost(
+                isp2Post = true,
+                blogName = "Fancy Blog",
+                authorFirstName = "John",
+                authorName = "John Smith"
+        )
+        val postWithoutFirstName = createPost(
+                isp2Post = true,
+                blogName = "Fancy Blog",
+                authorFirstName = "",
+                authorName = "John Smith"
+        )
+        // Act
+        val firstNameUiState = mapPostToUiState(postWithFirstName)
+        val fullNameUiState = mapPostToUiState(postWithoutFirstName)
+        // Assert
+        val firstNameBlog = firstNameUiState.blogSection.blogName as UiStringResWithParams
+        assertThat(firstNameBlog.stringRes).isEqualTo(R.string.reader_author_with_blog_name)
+        assertThat(firstNameBlog.params.size).isEqualTo(2)
+        assertThat((firstNameBlog.params[0] as UiStringText).text).isEqualTo("John")
+        assertThat((firstNameBlog.params[1] as UiStringText).text).isEqualTo("Fancy Blog")
+
+        val fullNameBlog = fullNameUiState.blogSection.blogName as UiStringResWithParams
+        assertThat(fullNameBlog.stringRes).isEqualTo(R.string.reader_author_with_blog_name)
+        assertThat(fullNameBlog.params.size).isEqualTo(2)
+        assertThat((fullNameBlog.params[0] as UiStringText).text).isEqualTo("John Smith")
+        assertThat((fullNameBlog.params[1] as UiStringText).text).isEqualTo("Fancy Blog")
+    }
     // endregion
 
     // region DATELINE
@@ -524,7 +577,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.bookmarkAction.isEnabled).isFalse()
+        assertThat(uiState.bookmarkAction.isEnabled).isFalse
     }
 
     @Test
@@ -534,7 +587,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.bookmarkAction.isEnabled).isFalse()
+        assertThat(uiState.bookmarkAction.isEnabled).isFalse
     }
 
     @Test
@@ -544,7 +597,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.bookmarkAction.isEnabled).isTrue()
+        assertThat(uiState.bookmarkAction.isEnabled).isTrue
     }
 
     @Test
@@ -554,7 +607,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.bookmarkAction.isSelected).isTrue()
+        assertThat(uiState.bookmarkAction.isSelected).isTrue
     }
 
     @Test
@@ -564,7 +617,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.bookmarkAction.isSelected).isFalse()
+        assertThat(uiState.bookmarkAction.isSelected).isFalse
     }
 
     @Test
@@ -588,7 +641,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.likeAction.isEnabled).isTrue()
+        assertThat(uiState.likeAction.isEnabled).isTrue
     }
 
     @Test
@@ -599,7 +652,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.likeAction.isEnabled).isFalse()
+        assertThat(uiState.likeAction.isEnabled).isFalse
     }
 
     @Test
@@ -609,7 +662,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.likeAction.isEnabled).isFalse()
+        assertThat(uiState.likeAction.isEnabled).isFalse
     }
 
     @Test
@@ -633,7 +686,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.reblogAction.isEnabled).isTrue()
+        assertThat(uiState.reblogAction.isEnabled).isTrue
     }
 
     @Test
@@ -643,7 +696,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.reblogAction.isEnabled).isFalse()
+        assertThat(uiState.reblogAction.isEnabled).isFalse
     }
 
     @Test
@@ -654,7 +707,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.reblogAction.isEnabled).isFalse()
+        assertThat(uiState.reblogAction.isEnabled).isFalse
     }
 
     @Test
@@ -678,7 +731,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.commentsAction.isEnabled).isTrue()
+        assertThat(uiState.commentsAction.isEnabled).isTrue
     }
 
     @Test
@@ -688,7 +741,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.commentsAction.isEnabled).isFalse()
+        assertThat(uiState.commentsAction.isEnabled).isFalse
     }
 
     @Test
@@ -698,7 +751,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.commentsAction.isEnabled).isFalse()
+        assertThat(uiState.commentsAction.isEnabled).isFalse
     }
 
     @Test
@@ -709,7 +762,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.commentsAction.isEnabled).isFalse()
+        assertThat(uiState.commentsAction.isEnabled).isFalse
     }
 
     @Test
@@ -720,7 +773,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.commentsAction.isEnabled).isTrue()
+        assertThat(uiState.commentsAction.isEnabled).isTrue
     }
 
     @Test
@@ -730,7 +783,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = mapPostToUiState(post)
         // Assert
-        assertThat(uiState.commentsAction.isEnabled).isFalse()
+        assertThat(uiState.commentsAction.isEnabled).isFalse
     }
 
     @Test
@@ -775,30 +828,36 @@ class ReaderPostUiStateBuilderTest {
     }
 
     @Test
-    fun `Ensures that the first InterestUiState has isDividerVisible set to true`() = test {
+    fun `given a tag list with 4 elements, then the uiState contains each style`() = test {
         // arrange
-        val currentReaderTagListSize = 2
+        val currentReaderTagListSize = 4
+        val expectedListStyles = listOf(ChipStyleGreen, ChipStylePurple, ChipStyleYellow, ChipStyleOrange)
+
         val readerTagList = createReaderTagList(currentReaderTagListSize)
 
         // act
         val result = builder.mapTagListToReaderInterestUiState(readerTagList, mock())
 
         // assert
-        assertThat(result.interest.first().isDividerVisible).isTrue()
+        for ((index, interest) in result.interest.withIndex()) {
+            assertThat(interest.chipStyle).isEqualTo(expectedListStyles[index])
+        }
     }
 
     @Test
-    fun `Ensures that the last InterestUiState has isDividerVisible set to false`() = test {
+    fun `given a tag list with 5 elements, then the 5th interest within the uiState is styled green`() = test {
         // arrange
-        val currentReaderTagListSize = 2
+        val currentReaderTagListSize = 5
+
         val readerTagList = createReaderTagList(currentReaderTagListSize)
 
         // act
         val result = builder.mapTagListToReaderInterestUiState(readerTagList, mock())
 
         // assert
-        assertThat(result.interest.last().isDividerVisible).isFalse()
+        assertThat(result.interest.last().chipStyle).isInstanceOf(ChipStyleGreen::class.java)
     }
+
     // endregion
 
     @Test
@@ -810,7 +869,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = builder.mapRecommendedBlogsToReaderRecommendedBlogsCardUiState(
                 listOf(blog),
-                { _, _ -> },
+                { _, _, _ -> },
                 { }
         )
         // Assert
@@ -826,7 +885,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = builder.mapRecommendedBlogsToReaderRecommendedBlogsCardUiState(
                 blogs,
-                { _, _ -> },
+                { _, _, _ -> },
                 { }
         )
 
@@ -843,7 +902,7 @@ class ReaderPostUiStateBuilderTest {
         // Act
         val uiState = builder.mapRecommendedBlogsToReaderRecommendedBlogsCardUiState(
                 blogs,
-                { _, _ -> },
+                { _, _, _ -> },
                 { }
         )
 
@@ -858,6 +917,7 @@ class ReaderPostUiStateBuilderTest {
         onButtonClicked: (Long, Long, ReaderPostCardActionType) -> Unit = mock()
     ): ReaderPostUiState {
         return builder.mapPostToUiState(
+                source = "source",
                 post = post,
                 isDiscover = false,
                 photonWidth = 0,
@@ -894,7 +954,11 @@ class ReaderPostUiStateBuilderTest {
         isCanLikePost: Boolean = true,
         hasFeaturedImage: Boolean = false,
         featuredImageUrlForDisplay: String? = null,
-        hasFeaturedVideo: Boolean = false
+        hasFeaturedVideo: Boolean = false,
+        isp2Post: Boolean = false,
+        blogName: String = "",
+        authorFirstName: String = "",
+        authorName: String = ""
     ): ReaderPost {
         val post = spy(ReaderPost().apply {
             this.blogUrl = blogUrl
@@ -924,6 +988,10 @@ class ReaderPostUiStateBuilderTest {
         whenever(post.getFeaturedImageForDisplay(anyInt(), anyInt())).thenReturn(featuredImageUrlForDisplay)
         whenever(post.hasFeaturedImage()).thenReturn(hasFeaturedImage)
         whenever(post.hasFeaturedVideo()).thenReturn(hasFeaturedVideo)
+        post.organization = if (isp2Post) P2 else NO_ORGANIZATION
+        post.blogName = blogName
+        post.authorFirstName = authorFirstName
+        post.authorName = authorName
         return post
     }
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModelTest.kt
index 7bfe36c464f7..8c3a3b46ae46 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/discover/interests/ReaderInterestsViewModelTest.kt
@@ -23,10 +23,10 @@ import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.ReaderTagList
 import org.wordpress.android.models.ReaderTagType
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsFragment.EntryPoint
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState.DoneButtonDisabledUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState.DoneButtonEnabledUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.DoneButtonUiState.DoneButtonHiddenUiState
-
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.UiState.ContentUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.UiState.ErrorUiState.ConnectionErrorUiState
 import org.wordpress.android.ui.reader.discover.interests.ReaderInterestsViewModel.UiState.ErrorUiState.RequestFailedErrorUiState
@@ -35,17 +35,18 @@ import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.Success
 import org.wordpress.android.ui.reader.repository.ReaderRepositoryCommunication.SuccessWithData
 import org.wordpress.android.ui.reader.repository.ReaderTagRepository
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.ui.utils.UiString.UiStringRes
 
 private const val CURRENT_LANGUAGE = "en"
+
+@ExperimentalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
 class ReaderInterestsViewModelTest {
     @Rule
     @JvmField val rule = InstantTaskExecutorRule()
 
-    @ExperimentalCoroutinesApi
     @Rule
     @JvmField val coroutineScope = MainCoroutineScopeRule()
 
@@ -53,413 +54,555 @@ class ReaderInterestsViewModelTest {
     @Mock lateinit var parentViewModel: ReaderViewModel
 
     @Mock lateinit var readerTagRepository: ReaderTagRepository
-    @Mock lateinit var trackerWrapper: AnalyticsTrackerWrapper
+    @Mock lateinit var readerTracker: ReaderTracker
 
     @Before
     fun setUp() {
-        viewModel = ReaderInterestsViewModel(readerTagRepository, trackerWrapper)
+        viewModel = ReaderInterestsViewModel(readerTagRepository, readerTracker)
     }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `getUserTags invoked on start`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
 
-            // When
-            initViewModel()
+                // When
+                initViewModel()
 
-            // Then
-            verify(readerTagRepository, times(1)).getUserTags()
-        }
+                // Then
+                verify(readerTagRepository, times(1)).getUserTags()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `getInterests invoked if empty user tags received from repo`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
 
-            // When
-            initViewModel()
+                // When
+                initViewModel()
 
-            // Then
-            verify(readerTagRepository, times(1)).getInterests()
-        }
+                // Then
+                verify(readerTagRepository, times(1)).getInterests()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
-    fun `close reader screen triggered if non empty user tags are received from repo`() =
-        testWithNonEmptyUserTags {
-            // When
-            initViewModel()
+    fun `discover close reader screen triggered if non empty user tags are received from repo`() =
+            testWithNonEmptyUserTags {
+                // When
+                initViewModel(EntryPoint.DISCOVER)
 
-            // Then
-            verify(parentViewModel, times(1)).onCloseReaderInterests()
-        }
+                // Then
+                verify(parentViewModel, times(1)).onCloseReaderInterests()
+            }
+
+    @Test
+    fun `settings does not close reader screen triggered if non empty user tags are received from repo`() =
+            testWithNonEmptyUserTags {
+                // When
+                initViewModel(EntryPoint.SETTINGS)
+
+                // Then
+                verify(parentViewModel, times(0)).onCloseReaderInterests()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `progress bar shown on start hides on successful interests data load`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
 
-            // Pause dispatcher so we can verify progress bar initial state
-            coroutineScope.pauseDispatcher()
+                // Pause dispatcher so we can verify progress bar initial state
+                coroutineScope.pauseDispatcher()
 
-            // Trigger data load
-            initViewModel()
+                // Trigger data load
+                initViewModel()
 
-            assertThat(requireNotNull(viewModel.uiState.value).progressBarVisible).isEqualTo(true)
+                assertThat(requireNotNull(viewModel.uiState.value).progressBarVisible).isEqualTo(true)
 
-            // Resume pending coroutines execution
-            coroutineScope.resumeDispatcher()
+                // Resume pending coroutines execution
+                coroutineScope.resumeDispatcher()
 
-            assertThat(requireNotNull(viewModel.uiState.value).progressBarVisible).isEqualTo(false)
-        }
+                assertThat(requireNotNull(viewModel.uiState.value).progressBarVisible).isEqualTo(false)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `title hidden on start become visible on successful interests data load`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
 
-            // Pause dispatcher so we can verify title initial state
-            coroutineScope.pauseDispatcher()
+                // Pause dispatcher so we can verify title initial state
+                coroutineScope.pauseDispatcher()
 
-            // Trigger data load
-            initViewModel()
+                // Trigger data load
+                initViewModel()
 
-            assertThat(requireNotNull(viewModel.uiState.value).titleVisible).isEqualTo(false)
+                assertThat(requireNotNull(viewModel.uiState.value).titleVisible).isEqualTo(false)
 
-            // Resume pending coroutines execution
-            coroutineScope.resumeDispatcher()
+                // Resume pending coroutines execution
+                coroutineScope.resumeDispatcher()
 
-            assertThat(requireNotNull(viewModel.uiState.value).titleVisible).isEqualTo(true)
-        }
+                assertThat(requireNotNull(viewModel.uiState.value).titleVisible).isEqualTo(true)
+            }
+
+    @Test
+    fun `interests correctly shown on successful interests data load without excluded interests`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getUserTags()).thenReturn(SuccessWithData(ReaderTagList()))
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // When
+                initViewModel()
+
+                // Then
+                assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).interests)
+                        .isEqualTo(interests)
+
+                val uiState = requireNotNull(viewModel.uiState.value) as ContentUiState
+                assertThat(uiState.interests).isEqualTo(interests)
+                assertThat(uiState.interestsUiState[0]).isInstanceOf(TagUiState::class.java)
+                assertThat(uiState.interestsUiState[0].title).isEqualTo(interests[0].tagTitle)
+            }
+
+    @Test
+    fun `interests correctly shown on successful interests data load with excluded interests`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                val excludedInterests = getExcludedInterests()
+                whenever(readerTagRepository.getUserTags()).thenReturn(SuccessWithData(excludedInterests))
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // When
+                initViewModel(
+                        entryPoint = EntryPoint.SETTINGS
+                )
+
+                // Then
+                interests.removeAll(excludedInterests)
+                assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).interests)
+                        .isEqualTo(interests)
+
+                val uiState = requireNotNull(viewModel.uiState.value) as ContentUiState
+                assertThat(uiState.interests).isEqualTo(interests)
+                assertThat(uiState.interestsUiState[0]).isInstanceOf(TagUiState::class.java)
+                assertThat(uiState.interestsUiState[0].title).isEqualTo(interests[0].tagTitle)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
-    fun `interests correctly shown on successful interests data load`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
+    fun `discover title shown on start when interests tags received from repo`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
 
-            // When
-            initViewModel()
+                // Pause dispatcher so we can verify done button initial state
+                coroutineScope.pauseDispatcher()
 
-            // Then
-            assertThat(viewModel.uiState.value).isInstanceOf(ContentUiState::class.java)
-            assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).interests)
-                .isEqualTo(mockInterests)
+                // Trigger data load
+                initViewModel(EntryPoint.DISCOVER)
 
-            val uiState = requireNotNull(viewModel.uiState.value) as ContentUiState
-            assertThat(uiState.interests).isEqualTo(mockInterests)
-            assertThat(uiState.interestsUiState[0]).isInstanceOf(TagUiState::class.java)
-            assertThat(uiState.interestsUiState[0].title).isEqualTo(mockInterests[0].tagTitle)
-        }
+                // Resume pending coroutines execution
+                coroutineScope.resumeDispatcher()
+
+                assertThat(requireNotNull(viewModel.uiState.value).titleVisible).isTrue
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
-    fun `done button hidden on start switches to disabled state when interests tags received from repo`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
+    fun `settings title hidden on start when interests tags received from repo`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
 
-            // Pause dispatcher so we can verify done button initial state
-            coroutineScope.pauseDispatcher()
+                // Pause dispatcher so we can verify done button initial state
+                coroutineScope.pauseDispatcher()
 
-            // Trigger data load
-            initViewModel()
+                // Trigger data load
+                initViewModel(EntryPoint.SETTINGS)
 
-            assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
-                .isInstanceOf(DoneButtonHiddenUiState::class.java)
+                // Resume pending coroutines execution
+                coroutineScope.resumeDispatcher()
 
-            // Resume pending coroutines execution
-            coroutineScope.resumeDispatcher()
+                assertThat(requireNotNull(viewModel.uiState.value).titleVisible).isFalse
+            }
 
-            assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
-                .isInstanceOf(DoneButtonDisabledUiState::class.java)
-        }
+    @Test
+    fun `discover done button hidden on start switches to disabled state when interests tags received from repo`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // Pause dispatcher so we can verify done button initial state
+                coroutineScope.pauseDispatcher()
+
+                // Trigger data load
+                initViewModel(EntryPoint.DISCOVER)
+
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonHiddenUiState::class.java)
+
+                // Resume pending coroutines execution
+                coroutineScope.resumeDispatcher()
+
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonDisabledUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.titleRes)
+                        .isEqualTo(R.string.reader_btn_select_few_interests)
+            }
+
+    @Test
+    fun `settings done button hidden on start switches to disabled state when interests tags received from repo`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // Pause dispatcher so we can verify done button initial state
+                coroutineScope.pauseDispatcher()
+
+                // Trigger data load
+                initViewModel(EntryPoint.SETTINGS)
+
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonHiddenUiState::class.java)
+
+                // Resume pending coroutines execution
+                coroutineScope.resumeDispatcher()
+
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonDisabledUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.titleRes)
+                        .isEqualTo(R.string.reader_btn_done)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `interest selected if onInterestAtIndexToggled invoked on a deselected interest`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            val selectedIndex = 0
-
-            // When
-            initViewModel()
-            viewModel.onInterestAtIndexToggled(index = selectedIndex, isChecked = true)
-
-            // Then
-            assertThat(requireNotNull(viewModel.uiState.value as ContentUiState)
-                .interestsUiState[selectedIndex].isChecked)
-                .isEqualTo(true)
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                val selectedIndex = 0
+
+                // When
+                initViewModel()
+                viewModel.onInterestAtIndexToggled(index = selectedIndex, isChecked = true)
+
+                // Then
+                assertThat(
+                        requireNotNull(viewModel.uiState.value as ContentUiState)
+                                .interestsUiState[selectedIndex].isChecked
+                )
+                        .isEqualTo(true)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `interest deselected if onInterestAtIndexToggled invoked on a selected interest`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            val selectedIndex = 0
-
-            // When
-            initViewModel()
-            viewModel.onInterestAtIndexToggled(index = selectedIndex, isChecked = true)
-            viewModel.onInterestAtIndexToggled(index = selectedIndex, isChecked = false)
-
-            // Then
-            assertThat(requireNotNull(viewModel.uiState.value as ContentUiState)
-                .interestsUiState[selectedIndex].isChecked)
-                .isEqualTo(false)
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                val selectedIndex = 0
+
+                // When
+                initViewModel()
+                viewModel.onInterestAtIndexToggled(index = selectedIndex, isChecked = true)
+                viewModel.onInterestAtIndexToggled(index = selectedIndex, isChecked = false)
+
+                // Then
+                assertThat(
+                        requireNotNull(viewModel.uiState.value as ContentUiState)
+                                .interestsUiState[selectedIndex].isChecked
+                )
+                        .isEqualTo(false)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `done button shown in enabled state if an interest is in selected state`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-
-            // When
-            initViewModel()
-            viewModel.onInterestAtIndexToggled(index = 0, isChecked = true)
-
-            // Then
-            assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
-                .isInstanceOf(DoneButtonEnabledUiState::class.java)
-            assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.titleRes)
-                .isEqualTo(R.string.reader_btn_done)
-            assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.enabled)
-                .isEqualTo(true)
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // When
+                initViewModel()
+                viewModel.onInterestAtIndexToggled(index = 0, isChecked = true)
+
+                // Then
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonEnabledUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.titleRes)
+                        .isEqualTo(R.string.reader_btn_done)
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.enabled)
+                        .isEqualTo(true)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
-    fun `done button shown in disabled state if no interests are in selected state`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-
-            // When
-            initViewModel()
-
-            // Then
-            assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
-                .isInstanceOf(DoneButtonDisabledUiState::class.java)
-        }
+    fun `discover done button shown in disabled state if no interests are in selected state`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // When
+                initViewModel(EntryPoint.DISCOVER)
+
+                // Then
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonDisabledUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.titleRes)
+                        .isEqualTo(R.string.reader_btn_select_few_interests)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
-    fun `close reader interests screen triggered when interests are saved successfully`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            whenever(readerTagRepository.saveInterests(any())).thenReturn(Success)
+    fun `settings done button shown in disabled state if no interests are in selected state`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+
+                // When
+                initViewModel(EntryPoint.SETTINGS)
+
+                // Then
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState)
+                        .isInstanceOf(DoneButtonDisabledUiState::class.java)
+                assertThat(requireNotNull(viewModel.uiState.value).doneButtonUiState.titleRes)
+                        .isEqualTo(R.string.reader_btn_done)
+            }
 
-            // When
-            initViewModel()
-            viewModel.onDoneButtonClick()
+    @Test
+    fun `discover close reader interests screen triggered when interests are saved successfully`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                whenever(readerTagRepository.saveInterests(any())).thenReturn(Success)
+
+                // When
+                initViewModel(EntryPoint.DISCOVER)
+                viewModel.onDoneButtonClick()
+
+                // Then
+                verify(parentViewModel, times(1)).onCloseReaderInterests()
+            }
 
-            // Then
-            verify(parentViewModel, times(1)).onCloseReaderInterests()
-        }
+    @Test
+    fun `settings close reader interests screen triggered when interests are saved successfully`() =
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                whenever(readerTagRepository.saveInterests(any())).thenReturn(Success)
+
+                // When
+                initViewModel(EntryPoint.SETTINGS)
+                viewModel.onDoneButtonClick()
+
+                // Then
+                assertThat(viewModel.closeReaderInterests.value).isNotNull
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `selected interests saved on done button click`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            val selectInterestAtIndex = 2
-
-            // When
-            initViewModel()
-            viewModel.onInterestAtIndexToggled(index = selectInterestAtIndex, isChecked = true)
-            viewModel.onDoneButtonClick()
-
-            // Then
-            verify(readerTagRepository, times(1)).saveInterests(eq(listOf(mockInterests[selectInterestAtIndex])))
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                val selectInterestAtIndex = 2
+
+                // When
+                initViewModel()
+                viewModel.onInterestAtIndexToggled(index = selectInterestAtIndex, isChecked = true)
+                viewModel.onDoneButtonClick()
+
+                // Then
+                verify(readerTagRepository, times(1)).saveInterests(eq(listOf(interests[selectInterestAtIndex])))
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `get interests triggered on retry`() =
-        testWithEmptyUserTags {
-            // When
-            viewModel.onRetryButtonClick()
+            testWithEmptyUserTags {
+                // When
+                viewModel.onRetryButtonClick()
 
-            // Then
-            verify(readerTagRepository, times(1)).getInterests()
-        }
+                // Then
+                verify(readerTagRepository, times(1)).getInterests()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `get user tags re-triggered on retry if user tags request had failed earlier`() =
-        testWithFailedUserTags {
-            // When
-            initViewModel()
-            viewModel.onRetryButtonClick()
+            testWithFailedUserTags {
+                // When
+                initViewModel()
+                viewModel.onRetryButtonClick()
 
-            // Then
-            verify(readerTagRepository, times(2)).getUserTags()
-        }
+                // Then
+                verify(readerTagRepository, times(2)).getUserTags()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `get user tags not re-triggered on retry if user tags request had not failed earlier`() =
-        testWithEmptyUserTags {
-            // When
-            initViewModel()
-            viewModel.onRetryButtonClick()
+            testWithEmptyUserTags {
+                // When
+                initViewModel()
+                viewModel.onRetryButtonClick()
 
-            // Then
-            verify(readerTagRepository, times(1)).getUserTags()
-        }
+                // Then
+                verify(readerTagRepository, times(1)).getUserTags()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `error layout is shown on interests load error`() =
-        testWithEmptyUserTags {
-            // Given
-            whenever(readerTagRepository.getInterests()).thenReturn(NetworkUnavailable)
+            testWithEmptyUserTags {
+                // Given
+                whenever(readerTagRepository.getInterests()).thenReturn(NetworkUnavailable)
 
-            // When
-            initViewModel()
+                // When
+                initViewModel()
 
-            // Then
-            val contentLoadFailedUiState = requireNotNull(viewModel.uiState.value) as ConnectionErrorUiState
-            assertThat(contentLoadFailedUiState.errorLayoutVisible).isEqualTo(true)
-        }
+                // Then
+                val contentLoadFailedUiState = requireNotNull(viewModel.uiState.value) as ConnectionErrorUiState
+                assertThat(contentLoadFailedUiState.errorLayoutVisible).isEqualTo(true)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `network error shown when internet access not available on interests load`() =
-        testWithEmptyUserTags {
-            // Given
-            whenever(readerTagRepository.getInterests()).thenReturn(NetworkUnavailable)
+            testWithEmptyUserTags {
+                // Given
+                whenever(readerTagRepository.getInterests()).thenReturn(NetworkUnavailable)
 
-            // When
-            initViewModel()
+                // When
+                initViewModel()
 
-            // Then
-            assertThat(viewModel.uiState.value).isInstanceOf(ConnectionErrorUiState::class.java)
-            val errorUiState = requireNotNull(viewModel.uiState.value) as ConnectionErrorUiState
-            assertThat(errorUiState.titleResId).isEqualTo(R.string.no_network_message)
-        }
+                // Then
+                assertThat(viewModel.uiState.value).isInstanceOf(ConnectionErrorUiState::class.java)
+                val errorUiState = requireNotNull(viewModel.uiState.value) as ConnectionErrorUiState
+                assertThat(errorUiState.titleRes).isEqualTo(R.string.no_network_message)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `request failed error shown on load interests remote request failure`() =
-        testWithEmptyUserTags {
-            // Given
-            whenever(readerTagRepository.getInterests()).thenReturn(RemoteRequestFailure)
+            testWithEmptyUserTags {
+                // Given
+                whenever(readerTagRepository.getInterests()).thenReturn(RemoteRequestFailure)
 
-            // When
-            initViewModel()
+                // When
+                initViewModel()
 
-            // Then
-            assertThat(viewModel.uiState.value).isInstanceOf(RequestFailedErrorUiState::class.java)
-            val errorUiState = requireNotNull(viewModel.uiState.value) as RequestFailedErrorUiState
-            assertThat(errorUiState.titleResId).isEqualTo(R.string.reader_error_request_failed_title)
-        }
+                // Then
+                assertThat(viewModel.uiState.value).isInstanceOf(RequestFailedErrorUiState::class.java)
+                val errorUiState = requireNotNull(viewModel.uiState.value) as RequestFailedErrorUiState
+                assertThat(errorUiState.titleRes).isEqualTo(R.string.reader_error_request_failed_title)
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `snackbar is shown on save interests error`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            whenever(readerTagRepository.saveInterests(any())).thenReturn(NetworkUnavailable)
-
-            // When
-            initViewModel()
-            viewModel.onDoneButtonClick()
-
-            // Then
-            assertThat(viewModel.snackbarEvents.value).isNotNull
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                whenever(readerTagRepository.saveInterests(any())).thenReturn(NetworkUnavailable)
+
+                // When
+                initViewModel()
+                viewModel.onDoneButtonClick()
+
+                // Then
+                assertThat(viewModel.snackbarEvents.value).isNotNull
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `snackbar is not shown when interests are saved successfully`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            whenever(readerTagRepository.saveInterests(any())).thenReturn(Success)
-
-            // When
-            initViewModel()
-            viewModel.onDoneButtonClick()
-
-            // Then
-            assertThat(viewModel.snackbarEvents.value).isNull()
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                whenever(readerTagRepository.saveInterests(any())).thenReturn(Success)
+
+                // When
+                initViewModel()
+                viewModel.onDoneButtonClick()
+
+                // Then
+                assertThat(viewModel.snackbarEvents.value).isNull()
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `network error shown when internet access not available on save interests`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            whenever(readerTagRepository.saveInterests(any())).thenReturn(NetworkUnavailable)
-
-            // When
-            initViewModel()
-            viewModel.onDoneButtonClick()
-
-            // Then
-            assertThat(requireNotNull(viewModel.snackbarEvents.value).peekContent())
-                    .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.no_network_message)))
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                whenever(readerTagRepository.saveInterests(any())).thenReturn(NetworkUnavailable)
+
+                // When
+                initViewModel()
+                viewModel.onDoneButtonClick()
+
+                // Then
+                assertThat(requireNotNull(viewModel.snackbarEvents.value).peekContent())
+                        .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.no_network_message)))
+            }
 
-    @ExperimentalCoroutinesApi
     @Test
     fun `request failed error shown on save interests remote request failure`() =
-        testWithEmptyUserTags {
-            // Given
-            val mockInterests = getMockInterests()
-            whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(mockInterests))
-            whenever(readerTagRepository.saveInterests(any())).thenReturn(RemoteRequestFailure)
-
-            // When
-            initViewModel()
-            viewModel.onDoneButtonClick()
-
-            // Then
-            assertThat(requireNotNull(viewModel.snackbarEvents.value).peekContent())
-                .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.reader_error_request_failed_title)))
-        }
+            testWithEmptyUserTags {
+                // Given
+                val interests = getInterests()
+                whenever(readerTagRepository.getInterests()).thenReturn(SuccessWithData(interests))
+                whenever(readerTagRepository.saveInterests(any())).thenReturn(RemoteRequestFailure)
+
+                // When
+                initViewModel()
+                viewModel.onDoneButtonClick()
+
+                // Then
+                assertThat(requireNotNull(viewModel.snackbarEvents.value).peekContent())
+                        .isEqualTo(SnackbarMessageHolder(UiStringRes(R.string.reader_error_request_failed_title)))
+            }
+
+    @Test
+    fun `discover close reader screen on back button click`() {
+        // When
+        initViewModel(EntryPoint.DISCOVER)
+
+        viewModel.onBackButtonClick()
 
-    private fun initViewModel() = viewModel.start(
-        parentViewModel = parentViewModel,
-        currentLanguage = CURRENT_LANGUAGE
+        // Then
+        verify(parentViewModel, times(1)).onCloseReaderInterests()
+    }
+
+    @Test
+    fun `settings close reader screen on back button click`() {
+        // When
+        initViewModel(EntryPoint.SETTINGS)
+
+        viewModel.onBackButtonClick()
+
+        // Then
+        assertThat(viewModel.closeReaderInterests.value).isNotNull
+    }
+
+    private fun initViewModel(
+        entryPoint: EntryPoint = EntryPoint.DISCOVER
+    ) = viewModel.start(
+            entryPoint = entryPoint,
+            currentLanguage = CURRENT_LANGUAGE,
+            parentViewModel = parentViewModel
     )
 
-    @ExperimentalCoroutinesApi
     private fun <T> testWithEmptyUserTags(block: suspend CoroutineScope.() -> T) {
         coroutineScope.runBlockingTest {
             whenever(readerTagRepository.getUserTags()).thenReturn(SuccessWithData(ReaderTagList()))
@@ -467,7 +610,6 @@ class ReaderInterestsViewModelTest {
         }
     }
 
-    @ExperimentalCoroutinesApi
     private fun <T> testWithFailedUserTags(block: suspend CoroutineScope.() -> T) {
         coroutineScope.runBlockingTest {
             whenever(readerTagRepository.getUserTags()).thenReturn(NetworkUnavailable)
@@ -475,7 +617,6 @@ class ReaderInterestsViewModelTest {
         }
     }
 
-    @ExperimentalCoroutinesApi
     private fun <T> testWithNonEmptyUserTags(block: suspend CoroutineScope.() -> T) {
         coroutineScope.runBlockingTest {
             val nonEmptyUserTags = ReaderTagList().apply {
@@ -487,15 +628,27 @@ class ReaderInterestsViewModelTest {
         }
     }
 
-    private fun getMockInterests() =
-        ReaderTagList().apply {
-            for (c in 'A'..'Z')
-                (add(
-                    ReaderTag(
-                        c.toString(), c.toString(), c.toString(),
-                        "https://public-api.wordpress.com/rest/v1.2/read/tags/$c/posts",
-                        ReaderTagType.DEFAULT
-                    )
-                ))
-        }
+    private fun getInterests() =
+            ReaderTagList().apply {
+                for (c in 'A'..'Z')
+                    (add(
+                            ReaderTag(
+                                    c.toString(), c.toString(), c.toString(),
+                                    "https://public-api.wordpress.com/rest/v1.2/read/tags/$c/posts",
+                                    ReaderTagType.DEFAULT
+                            )
+                    ))
+            }
+
+    private fun getExcludedInterests() =
+            ReaderTagList().apply {
+                for (c in 'A'..'C')
+                    (add(
+                            ReaderTag(
+                                    c.toString(), c.toString(), c.toString(),
+                                    "https://public-api.wordpress.com/rest/v1.2/read/tags/$c/posts",
+                                    ReaderTagType.DEFAULT
+                            )
+                    ))
+            }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProviderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProviderTest.kt
index 82a69f482f2c..b4614c996bf5 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProviderTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/ReaderDiscoverDataProviderTest.kt
@@ -15,7 +15,6 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.MainCoroutineScopeRule
 import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.models.ReaderPost
-import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.discover.ReaderDiscoverCard.ReaderPostCard
 import org.wordpress.android.models.discover.ReaderDiscoverCards
 import org.wordpress.android.test
@@ -49,7 +48,6 @@ class ReaderDiscoverDataProviderTest {
     @JvmField val coroutineScope = MainCoroutineScopeRule()
 
     private lateinit var dataProvider: ReaderDiscoverDataProvider
-    private lateinit var readerTag: ReaderTag
 
     @Mock private lateinit var eventBusWrapper: EventBusWrapper
     @Mock private lateinit var getDiscoverCardsUseCase: GetDiscoverCardsUseCase
@@ -60,6 +58,7 @@ class ReaderDiscoverDataProviderTest {
     @Before
     fun setUp() {
         dataProvider = ReaderDiscoverDataProvider(
+                TEST_DISPATCHER,
                 TEST_DISPATCHER,
                 eventBusWrapper,
                 readerTagWrapper,
@@ -121,18 +120,41 @@ class ReaderDiscoverDataProviderTest {
     }
 
     @Test
-    fun `on cards updated has new the data gets posted to discover feed`() = test {
-        // Arrange
+    fun `when new observer added and db is empty, does NOT post anything to discover feed`() = test {
+        whenever(shouldAutoUpdateTagUseCase.get(dataProvider.readerTag)).thenReturn(false)
+        whenever(getDiscoverCardsUseCase.get()).thenReturn(ReaderDiscoverCards(listOf()))
+        val event = FetchDiscoverCardsEnded(REQUEST_FIRST_PAGE, HAS_NEW)
+
+        dataProvider.discoverFeed.observeForever { }
+
+        Assertions.assertThat(dataProvider.discoverFeed.value).isNull()
+    }
 
+    @Test
+    fun `when new observer added and db is NOT empty, the data gets posted to discover feed`() = test {
+        whenever(shouldAutoUpdateTagUseCase.get(dataProvider.readerTag)).thenReturn(false)
         whenever(getDiscoverCardsUseCase.get()).thenReturn(createDummyReaderCardsList())
+        val event = FetchDiscoverCardsEnded(REQUEST_FIRST_PAGE, HAS_NEW)
+
+        dataProvider.discoverFeed.observeForever { }
+
+        Assertions.assertThat(dataProvider.discoverFeed.value).isNotNull
+    }
 
+    @Test
+    fun `when request first page finishes, the data gets posted to discover feed`() = test {
+        // Make sure the provider doesn't emit any values when a new observer is added
+        whenever(getDiscoverCardsUseCase.get()).thenReturn(ReaderDiscoverCards(listOf()))
+        whenever(shouldAutoUpdateTagUseCase.get(dataProvider.readerTag)).thenReturn(false)
+        dataProvider.discoverFeed.observeForever { }
+        // Make sure the db returns some data
+        whenever(getDiscoverCardsUseCase.get()).thenReturn(createDummyReaderCardsList())
         val event = FetchDiscoverCardsEnded(REQUEST_FIRST_PAGE, HAS_NEW)
 
         dataProvider.onCardsUpdated(event)
 
         Assertions.assertThat(requireNotNull(dataProvider.discoverFeed.value))
                 .isInstanceOf(ReaderDiscoverCards::class.java)
-
         Assertions.assertThat(requireNotNull(dataProvider.discoverFeed.value).cards.size)
                 .isEqualTo(NUMBER_OF_ITEMS)
     }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCaseTest.kt
index 9a37992b069a..c44b5f162784 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/BlockBlogUseCaseTest.kt
@@ -8,8 +8,8 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.ui.reader.actions.ReaderBlogActionsWrapper
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 
 @RunWith(MockitoJUnitRunner::class)
 class BlockBlogUseCaseTest {
@@ -18,12 +18,16 @@ class BlockBlogUseCaseTest {
 
     private lateinit var mBlockBlogUseCase: BlockBlogUseCase
     @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
-    @Mock private lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    @Mock private lateinit var readerTracker: ReaderTracker
     @Mock private lateinit var readerBlogActionsWrapper: ReaderBlogActionsWrapper
 
     @Before
     fun setUp() {
-        mBlockBlogUseCase = BlockBlogUseCase(networkUtilsWrapper, analyticsUtilsWrapper, readerBlogActionsWrapper)
+        mBlockBlogUseCase = BlockBlogUseCase(
+                networkUtilsWrapper,
+                readerTracker,
+                readerBlogActionsWrapper
+        )
     }
 
     @Test
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCaseTest.kt
index 377a43111138..bee12a284b2c 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/GetDiscoverCardsUseCaseTest.kt
@@ -97,6 +97,16 @@ class GetDiscoverCardsUseCaseTest {
         assertThat(result.cards.filterIsInstance<WelcomeBannerCard>()).size().isEqualTo(0)
     }
 
+    @Test
+    fun `welcome card is not added to the list of cards when there are no other cards`() = test {
+        // Arrange
+        whenever(mockedJsonArray.length()).thenReturn(0)
+        // Act
+        val result = useCase.get()
+        // Assert
+        assertThat(result.cards.filterIsInstance<WelcomeBannerCard>()).size().isEqualTo(0)
+    }
+
     @Test
     fun `interest you might like card json is transformed into InterestsYouMayLikeCard object`() = test {
         // Arrange
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCaseTest.kt
index 4f64bb556efc..3f7a3baaf244 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/repository/usecases/PostLikeUseCaseTest.kt
@@ -7,7 +7,6 @@ import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.flow.toList
-import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
@@ -17,7 +16,6 @@ import org.mockito.ArgumentMatchers.anyBoolean
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
-import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.fluxc.model.AccountModel
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.models.ReaderPost
@@ -28,10 +26,11 @@ import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostL
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.Failed.NoNetwork
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.Success
 import org.wordpress.android.ui.reader.repository.usecases.PostLikeUseCase.PostLikeState.Unchanged
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 
 private const val POST_AND_BLOG_ID = 1L
+private const val SOURCE = "source"
 
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
@@ -43,7 +42,7 @@ class PostLikeUseCaseTest {
     @Mock private lateinit var accountStore: AccountStore
     @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
     @Mock private lateinit var readerPostActionsWrapper: ReaderPostActionsWrapper
-    @Mock private lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    @Mock private lateinit var readerTracker: ReaderTracker
 
     private lateinit var useCase: PostLikeUseCase
 
@@ -56,10 +55,9 @@ class PostLikeUseCaseTest {
 
         useCase = PostLikeUseCase(
                 readerPostActionsWrapper,
-                analyticsUtilsWrapper,
+                readerTracker,
                 accountStore,
-                networkUtilsWrapper,
-                TEST_DISPATCHER
+                networkUtilsWrapper
         )
     }
 
@@ -69,10 +67,14 @@ class PostLikeUseCaseTest {
         val readerPost = init(isNetworkAvailable = false)
 
         // When
-        val result = useCase.perform(readerPost, true).toList(mutableListOf())
+        val result = useCase.perform(
+                readerPost,
+                true,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Then
-        Assertions.assertThat(result[0]).isEqualTo(NoNetwork)
+        assertThat(result[0]).isEqualTo(NoNetwork)
     }
 
     @Test
@@ -81,7 +83,11 @@ class PostLikeUseCaseTest {
         val readerPost = init(isLikedByCurrentUser = true, localSucceeds = false)
 
         // When
-        val result = useCase.perform(readerPost, true).toList(mutableListOf())
+        val result = useCase.perform(
+                readerPost,
+                true,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Then
         assertThat(result[0]).isEqualTo(Unchanged)
@@ -93,7 +99,11 @@ class PostLikeUseCaseTest {
         val readerPost = init(isLikedByCurrentUser = false, localSucceeds = false)
 
         // When
-        val result = useCase.perform(readerPost, false).toList(mutableListOf())
+        val result = useCase.perform(
+                readerPost,
+                false,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Then
         assertThat(result[0]).isEqualTo(Unchanged)
@@ -104,7 +114,11 @@ class PostLikeUseCaseTest {
             test {
                 val readerPost = init(isLikedByCurrentUser = false)
                 // Act
-                val result = useCase.perform(readerPost, true).toList(mutableListOf())
+                val result = useCase.perform(
+                        readerPost,
+                        true,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 assertThat((result)).contains(Success)
@@ -116,7 +130,11 @@ class PostLikeUseCaseTest {
                 val readerPost = init(isLikedByCurrentUser = true)
 
                 // Act
-                val result = useCase.perform(readerPost, false).toList(mutableListOf())
+                val result = useCase.perform(
+                        readerPost,
+                        false,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 assertThat((result)).contains(Success)
@@ -128,7 +146,11 @@ class PostLikeUseCaseTest {
                 val readerPost = init(isLikedByCurrentUser = false, remoteSucceeds = false)
 
                 // Act
-                val result = useCase.perform(readerPost, true).toList(mutableListOf())
+                val result = useCase.perform(
+                        readerPost,
+                        true,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 assertThat((result)).contains(Failed.RequestFailed)
@@ -140,7 +162,11 @@ class PostLikeUseCaseTest {
                 val readerPost = init(isLikedByCurrentUser = true, remoteSucceeds = false)
 
                 // Act
-                val result = useCase.perform(readerPost, false).toList(mutableListOf())
+                val result = useCase.perform(
+                        readerPost,
+                        false,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 assertThat((result)).contains(Failed.RequestFailed)
@@ -152,7 +178,11 @@ class PostLikeUseCaseTest {
                 val readerPost = init(isLikedByCurrentUser = false)
 
                 // Act
-                useCase.perform(readerPost, true).toList(mutableListOf())
+                useCase.perform(
+                        readerPost,
+                        true,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 verify(readerPostActionsWrapper).performLikeActionLocal(
@@ -168,7 +198,11 @@ class PostLikeUseCaseTest {
                 val readerPost = init(isLikedByCurrentUser = false)
 
                 // Act
-                useCase.perform(readerPost, true).toList(mutableListOf())
+                useCase.perform(
+                        readerPost,
+                        true,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 verify(readerPostActionsWrapper).performLikeActionRemote(
@@ -184,7 +218,11 @@ class PostLikeUseCaseTest {
             test {
                 val readerPost = init(isLikedByCurrentUser = false)
                 // Act
-                useCase.perform(readerPost, true).toList(mutableListOf())
+                useCase.perform(
+                        readerPost,
+                        true,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 verify(readerPostActionsWrapper).bumpPageViewForPost(anyOrNull())
@@ -196,7 +234,11 @@ class PostLikeUseCaseTest {
                 val readerPost = init(isLikedByCurrentUser = true)
 
                 // Act
-                useCase.perform(readerPost, false).toList(mutableListOf())
+                useCase.perform(
+                        readerPost,
+                        false,
+                        SOURCE
+                ).toList(mutableListOf())
 
                 // Assert
                 verify(readerPostActionsWrapper, never()).bumpPageViewForPost(anyOrNull())
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModelTest.kt
index 6e9720b0c215..dca11f11dfbd 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/subfilter/SubFilterViewModelTest.kt
@@ -1,7 +1,11 @@
 package org.wordpress.android.ui.reader.subfilter
 
+import android.os.Bundle
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.reset
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
@@ -16,19 +20,30 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.fluxc.model.AccountModel
 import org.wordpress.android.fluxc.store.AccountStore
-import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.models.ReaderTag
 import org.wordpress.android.models.ReaderTagType.BOOKMARKED
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.reader.ReaderSubsActivity
+import org.wordpress.android.ui.reader.ReaderTypes.ReaderPostListType
+import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic
 import org.wordpress.android.ui.reader.services.update.ReaderUpdateLogic.UpdateTask
 import org.wordpress.android.ui.reader.subfilter.ActionType.OpenLoginPage
 import org.wordpress.android.ui.reader.subfilter.ActionType.OpenSubsAtPage
+import org.wordpress.android.ui.reader.subfilter.BottomSheetUiState.BottomSheetHidden
+import org.wordpress.android.ui.reader.subfilter.BottomSheetUiState.BottomSheetVisible
+import org.wordpress.android.ui.reader.subfilter.SubFilterViewModel.Companion
 import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.SITES
 import org.wordpress.android.ui.reader.subfilter.SubfilterCategory.TAGS
+import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.ItemType.SITE
+import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.ItemType.SITE_ALL
+import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.ItemType.TAG
+import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Site
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.SiteAll
 import org.wordpress.android.ui.reader.subfilter.SubfilterListItem.Tag
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.tracker.ReaderTrackerType
+import org.wordpress.android.ui.reader.viewmodels.ReaderModeInfo
+import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.EventBusWrapper
 import java.util.EnumSet
 
@@ -49,21 +64,35 @@ class SubFilterViewModelTest {
     @Mock private lateinit var eventBusWrapper: EventBusWrapper
     @Mock private lateinit var accountStore: AccountStore
     @Mock private lateinit var readerTracker: ReaderTracker
-    @Mock private lateinit var siteStore: SiteStore
+    @Mock private lateinit var savedState: Bundle
+    @Mock private lateinit var filter: SubfilterListItem
 
     private lateinit var viewModel: SubFilterViewModel
 
     @Before
     fun setUp() {
+        whenever(initialTag.label).thenReturn("tag-label")
         whenever(savedTag.tagTitle).thenReturn("tag-title")
-        val tag = Tag(
-                tag = savedTag,
-                onClickAction = ::onClickActionDummy
+
+        viewModel = SubFilterViewModel(
+                TEST_DISPATCHER,
+                TEST_DISPATCHER,
+                appPrefsWrapper,
+                subfilterListItemMapper,
+                eventBusWrapper,
+                accountStore,
+                readerTracker
         )
+
+        viewModel.start(initialTag, savedTag, savedState)
+    }
+
+    @Test
+    fun `current subfilter is set back when we have a previous intance state`() {
         val json = "{\"blogId\":0,\"feedId\":0,\"tagSlug\":\"news\",\"tagType\":1,\"type\":4}"
 
-        whenever(appPrefsWrapper.getReaderSubfilter()).thenReturn(json)
-        whenever(subfilterListItemMapper.fromJson(any(), any(), any())).thenReturn(tag)
+        whenever(savedState.getString(SubFilterViewModel.ARG_CURRENT_SUBFILTER_JSON)).thenReturn(json)
+        whenever(subfilterListItemMapper.fromJson(eq(json), any(), any())).thenReturn(filter)
 
         viewModel = SubFilterViewModel(
                 TEST_DISPATCHER,
@@ -74,26 +103,56 @@ class SubFilterViewModelTest {
                 accountStore,
                 readerTracker
         )
+
+        viewModel.start(initialTag, savedTag, savedState)
+
+        assertThat(viewModel.getCurrentSubfilterValue()).isEqualTo(filter)
     }
 
     @Test
-    fun `view model change subfilter visibility as requested`() {
-        viewModel.changeSubfiltersVisibility(true)
-        assertThat(viewModel.shouldShowSubFilters.value).isEqualTo(true)
+    fun `view model start and stop tracking subfiltered list if filter is a tracked item`() {
+        viewModel.setSubfilterFromTag(savedTag)
 
-        viewModel.changeSubfiltersVisibility(false)
-        assertThat(viewModel.shouldShowSubFilters.value).isEqualTo(false)
+        // this is done to focus this unit test only on effects of initSubfiltersTracking
+        // usually it's not considered great to use this function but here it seemed
+        // fair enough for the scope
+        // (see https://javadoc.io/static/org.mockito/mockito-core/3.7.7/org/mockito/Mockito.html#resetting_mocks)
+        reset(readerTracker)
+
+        viewModel.initSubfiltersTracking(true)
+        viewModel.initSubfiltersTracking(false)
+
+        verify(readerTracker, times(1)).start(ReaderTrackerType.SUBFILTERED_LIST)
+        verify(readerTracker, times(1)).stop(ReaderTrackerType.SUBFILTERED_LIST)
+    }
+
+    @Test
+    fun `view model doesn't start tracking subfiltered list if filter is a not tracked item`() {
+        viewModel.setDefaultSubfilter()
+
+        // this is done to focus this unit test only on effects of initSubfiltersTracking
+        // usually it's not considered great to use this function but here it seemed
+        // fair enough for the scope
+        // (see https://javadoc.io/static/org.mockito/mockito-core/3.7.7/org/mockito/Mockito.html#resetting_mocks)
+        reset(readerTracker)
+
+        viewModel.initSubfiltersTracking(true)
+        viewModel.initSubfiltersTracking(false)
+
+        verify(readerTracker, times(0)).start(ReaderTrackerType.SUBFILTERED_LIST)
+        verify(readerTracker, times(2)).stop(ReaderTrackerType.SUBFILTERED_LIST)
     }
 
     @Test
     fun `view model returns default filter on start`() {
-        assertThat(viewModel.getCurrentSubfilterValue()).isInstanceOf(Tag::class.java)
+        assertThat(viewModel.getCurrentSubfilterValue()).isInstanceOf(SiteAll::class.java)
     }
 
     @Test
     fun `view model is able to set requested subfilter given a tag`() {
         val tag = ReaderTag("", "", "", "", BOOKMARKED)
         var item: SubfilterListItem? = null
+
         viewModel.setSubfilterFromTag(tag)
 
         viewModel.currentSubFilter.observeForever { item = it }
@@ -114,7 +173,6 @@ class SubFilterViewModelTest {
     @Test
     fun `view model updates count of matched sites and tags`() {
         val data = hashMapOf(SITES to 3, TAGS to 25)
-        viewModel.start(initialTag)
 
         for (testStep in data.keys) {
             viewModel.onSubfilterPageUpdated(testStep, data.getOrDefault(testStep, 0))
@@ -124,31 +182,31 @@ class SubFilterViewModelTest {
     }
 
     @Test
-    fun `when WPCOM user selects empty bottom sheet SITES cta the subs is opened on followed blogs page`() {
+    fun `when WPCOM user taps empty bottom sheet SITES cta the subs activity is opened on followed blogs page`() {
         val action = OpenSubsAtPage(ReaderSubsActivity.TAB_IDX_FOLLOWED_BLOGS)
         viewModel.onBottomSheetActionClicked(action)
 
-        assertThat(viewModel.changeBottomSheetVisibility.value!!.peekContent()).isEqualTo(false)
+        assertThat(viewModel.bottomSheetUiState.value!!.peekContent()).isEqualTo(BottomSheetHidden)
         assertThat(viewModel.bottomSheetEmptyViewAction.value!!.peekContent())
                 .isEqualTo(action)
     }
 
     @Test
-    fun `when WPCOM user selects empty bottom sheet TAGS cta the subs is opened on followed tags page`() {
+    fun `when WPCOM user taps empty bottom sheet TAGS cta the subs activity is opened on followed tags page`() {
         val action = OpenSubsAtPage(ReaderSubsActivity.TAB_IDX_FOLLOWED_TAGS)
         viewModel.onBottomSheetActionClicked(action)
 
-        assertThat(viewModel.changeBottomSheetVisibility.value!!.peekContent()).isEqualTo(false)
+        assertThat(viewModel.bottomSheetUiState.value!!.peekContent()).isEqualTo(BottomSheetHidden)
         assertThat(viewModel.bottomSheetEmptyViewAction.value!!.peekContent())
                 .isEqualTo(action)
     }
 
     @Test
-    fun `when self-hosted user selects empty bottom sheet cta the me page is opened`() {
+    fun `when self-hosted user taps empty bottom sheet cta the me page is opened`() {
         val action = OpenLoginPage
         viewModel.onBottomSheetActionClicked(action)
 
-        assertThat(viewModel.changeBottomSheetVisibility.value!!.peekContent()).isEqualTo(false)
+        assertThat(viewModel.bottomSheetUiState.value!!.peekContent()).isEqualTo(BottomSheetHidden)
         assertThat(viewModel.bottomSheetEmptyViewAction.value!!.peekContent())
                 .isEqualTo(action)
     }
@@ -214,8 +272,7 @@ class SubFilterViewModelTest {
 
         assertThat(viewModel.updateTagsAndSites.value).isEqualTo(null)
 
-        // we didn't call start so noone should have changed the value
-        assertThat(viewModel.currentSubFilter.value).isEqualTo(null)
+        assertThat(viewModel.currentSubFilter.value).isInstanceOf(SiteAll::class.java)
     }
 
     @Test
@@ -231,11 +288,147 @@ class SubFilterViewModelTest {
 
         assertThat(viewModel.updateTagsAndSites.value).isEqualTo(null)
 
-        // we didn't call start so noone should have changed the value
-        assertThat(viewModel.currentSubFilter.value).isEqualTo(null)
+        assertThat(viewModel.currentSubFilter.value).isInstanceOf(SiteAll::class.java)
+    }
+
+    @Test
+    fun `view model updates the tags and sites and asks to show the bottom sheet when filters button is tapped`() {
+        var updateTasks: EnumSet<ReaderUpdateLogic.UpdateTask>? = null
+        var uiState: BottomSheetUiState? = null
+
+        viewModel.updateTagsAndSites.observeForever { updateTasks = it.peekContent() }
+        viewModel.bottomSheetUiState.observeForever { uiState = it.peekContent() }
+
+        viewModel.onSubFiltersListButtonClicked()
+
+        assertThat(updateTasks).isEqualTo(EnumSet.of(
+                UpdateTask.TAGS,
+                UpdateTask.FOLLOWED_BLOGS
+        ))
+
+        assertThat(uiState).isInstanceOf(BottomSheetVisible::class.java)
     }
 
-    private fun onClickActionDummy(filter: SubfilterListItem) {
-        return
+    @Test
+    fun `view model hides the bottom sheet when it is cancelled`() {
+        var uiState: BottomSheetUiState? = null
+
+        viewModel.bottomSheetUiState.observeForever { uiState = it.peekContent() }
+
+        viewModel.onBottomSheetCancelled()
+
+        assertThat(uiState).isInstanceOf(BottomSheetHidden::class.java)
+    }
+
+    @Test
+    fun `bottom sheet is hidden when a filter is tapped on`() {
+        var uiState: BottomSheetUiState? = null
+        val filter: SubfilterListItem = mock()
+
+        viewModel.setSubfilterFromTag(savedTag)
+
+        viewModel.bottomSheetUiState.observeForever { uiState = it.peekContent() }
+
+        viewModel.getCurrentSubfilterValue().onClickAction!!.invoke(filter)
+
+        assertThat(uiState).isInstanceOf(BottomSheetHidden::class.java)
+    }
+
+    @Test
+    fun `onSaveInstanceState puts expected parameters in the bundle`() {
+        val outState: Bundle = mock()
+        whenever(subfilterListItemMapper.toJson(any())).thenReturn("test-json")
+
+        viewModel.onSaveInstanceState(outState)
+
+        verify(outState, times(1)).putString(eq(Companion.ARG_CURRENT_SUBFILTER_JSON), any())
+        verify(outState, times(1)).putBoolean(eq(Companion.ARG_IS_FIRST_LOAD), any())
+    }
+
+    @Test
+    fun `view model start register event bus`() {
+        verify(eventBusWrapper, times(1)).register(viewModel)
+    }
+
+    @Test
+    fun `onSubfilterSelected requests newer posts when new filter is selected`() {
+        val filter: SubfilterListItem = mock()
+        var readerModeInfo: ReaderModeInfo? = null
+
+        whenever(filter.type).thenReturn(SITE_ALL)
+        whenever(filter.label).thenReturn(UiStringText("test-label"))
+
+        viewModel.readerModeInfo.observeForever { readerModeInfo = it }
+
+        viewModel.onSubfilterSelected(filter)
+
+        assertThat(readerModeInfo!!.requestNewerPosts).isTrue()
+    }
+
+    @Test
+    fun `onSubfilterReselected does not request newer posts when already selected filter is re-selected`() {
+        var readerModeInfo: ReaderModeInfo? = null
+
+        viewModel.readerModeInfo.observeForever { readerModeInfo = it }
+
+        viewModel.onSubfilterReselected()
+        assertThat(readerModeInfo!!.requestNewerPosts).isFalse()
+    }
+
+    @Test
+    fun `onSubfilterSelected set expected readerModeInfo when filters are removed`() {
+        val filter: SubfilterListItem = mock()
+        var readerModeInfo: ReaderModeInfo? = null
+
+        whenever(filter.type).thenReturn(SITE_ALL)
+        whenever(filter.label).thenReturn(UiStringText("test-label"))
+
+        viewModel.readerModeInfo.observeForever { readerModeInfo = it }
+
+        viewModel.onSubfilterSelected(filter)
+
+        requireNotNull(readerModeInfo).let {
+            assertThat(it.listType).isEqualTo(ReaderPostListType.TAG_FOLLOWED)
+            assertThat(it.blogId).isEqualTo(0L)
+            assertThat(it.feedId).isEqualTo(0L)
+            assertThat(it.isFiltered).isEqualTo(false)
+        }
+    }
+
+    @Test
+    fun `onSubfilterSelected set expected readerModeInfo when a site filter was tapped`() {
+        val filter: Site = mock()
+        var readerModeInfo: ReaderModeInfo? = null
+
+        whenever(filter.type).thenReturn(SITE)
+        whenever(filter.label).thenReturn(UiStringText("test-label"))
+        whenever(filter.blog).thenReturn(mock())
+
+        viewModel.readerModeInfo.observeForever { readerModeInfo = it }
+
+        viewModel.onSubfilterSelected(filter)
+
+        requireNotNull(readerModeInfo).let {
+            assertThat(it.listType).isEqualTo(ReaderPostListType.BLOG_PREVIEW)
+            assertThat(it.isFiltered).isEqualTo(true)
+        }
+    }
+
+    @Test
+    fun `onSubfilterSelected set expected readerModeInfo when a tag filter was tapped`() {
+        val filter: Tag = mock()
+        var readerModeInfo: ReaderModeInfo? = null
+
+        whenever(filter.type).thenReturn(TAG)
+        whenever(filter.label).thenReturn(UiStringText("test-label"))
+
+        viewModel.readerModeInfo.observeForever { readerModeInfo = it }
+
+        viewModel.onSubfilterSelected(filter)
+
+        requireNotNull(readerModeInfo).let {
+            assertThat(it.listType).isEqualTo(ReaderPostListType.TAG_FOLLOWED)
+            assertThat(it.isFiltered).isEqualTo(true)
+        }
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderCommentsFollowUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderCommentsFollowUseCaseTest.kt
new file mode 100644
index 000000000000..4971be4631c9
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderCommentsFollowUseCaseTest.kt
@@ -0,0 +1,170 @@
+package org.wordpress.android.ui.reader.usecases
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.R.string
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.test
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.Failure
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowCommentsNotAllowed
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.FollowStateChanged
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.Loading
+import org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.FollowCommentsState.UserNotAuthenticated
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider
+import org.wordpress.android.ui.reader.utils.PostSubscribersApiCallsProvider.PostSubscribersCallResult
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ReaderCommentsFollowUseCaseTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock private lateinit var postSubscribersApiCallsProvider: PostSubscribersApiCallsProvider
+    @Mock private lateinit var accountStore: AccountStore
+    @Mock private lateinit var readerTracker: ReaderTracker
+    @Mock private lateinit var readerPostTableWrapper: ReaderPostTableWrapper
+
+    private lateinit var followCommentsUseCase: ReaderCommentsFollowUseCase
+
+    private val blogId = 100L
+    private val postId = 1000L
+
+    @Before
+    fun setup() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+
+        followCommentsUseCase = ReaderCommentsFollowUseCase(
+                networkUtilsWrapper,
+                postSubscribersApiCallsProvider,
+                accountStore,
+                readerTracker,
+                readerPostTableWrapper
+        )
+    }
+
+    @Test
+    fun `getMySubscriptionToPost emits expected state when user not logged in`() = test {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+        val flow = followCommentsUseCase.getMySubscriptionToPost(blogId, postId, false)
+
+        assertThat(flow.toList()).isEqualTo(listOf(UserNotAuthenticated))
+    }
+
+    @Test
+    fun `getMySubscriptionToPost emits expected state when no network`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val flow = followCommentsUseCase.getMySubscriptionToPost(blogId, postId, false)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(Loading, Failure(blogId, postId, UiStringRes(string.error_network_connection)))
+        )
+    }
+
+    @Test
+    fun `getMySubscriptionToPost emits expected state when cannot follow comments`() = test {
+        whenever(postSubscribersApiCallsProvider.getCanFollowComments(anyLong())).thenReturn(false)
+
+        val flow = followCommentsUseCase.getMySubscriptionToPost(blogId, postId, false)
+
+        assertThat(flow.toList()).isEqualTo(listOf(Loading, FollowCommentsNotAllowed))
+    }
+
+    @Test
+    fun `getMySubscriptionToPost emits expected state when can follow with success`() = test {
+        whenever(postSubscribersApiCallsProvider.getCanFollowComments(anyLong())).thenReturn(true)
+        whenever(postSubscribersApiCallsProvider.getMySubscriptionToPost(anyLong(), anyLong()))
+                .thenReturn(PostSubscribersCallResult.Success(true))
+
+        val flow = followCommentsUseCase.getMySubscriptionToPost(blogId, postId, false)
+
+        assertThat(flow.toList()).isEqualTo(listOf(
+                        Loading,
+                        FollowStateChanged(
+                            blogId,
+                            postId,
+                            true,
+                            false
+                        )
+        ))
+    }
+
+    @Test
+    fun `getMySubscriptionToPost emits expected state when can follow with failure`() = test {
+        val errorMessage = "There was an error"
+        val failure = PostSubscribersCallResult.Failure(errorMessage)
+
+        whenever(postSubscribersApiCallsProvider.getCanFollowComments(anyLong())).thenReturn(true)
+        whenever(postSubscribersApiCallsProvider.getMySubscriptionToPost(anyLong(), anyLong())).thenReturn(failure)
+
+        val flow = followCommentsUseCase.getMySubscriptionToPost(blogId, postId, false)
+
+        assertThat(flow.toList()).isEqualTo(listOf(
+                Loading,
+                Failure(blogId, postId, UiStringText(errorMessage))
+        ))
+    }
+
+    @Test
+    fun `setMySubscriptionToPost emits expected state when no network`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val flow = followCommentsUseCase.setMySubscriptionToPost(blogId, postId, true)
+
+        assertThat(flow.toList()).isEqualTo(
+                listOf(Loading, Failure(blogId, postId, UiStringRes(string.error_network_connection)))
+        )
+    }
+
+    @Test
+    fun `setMySubscriptionToPost emits expected state when subscribing with success`() = test {
+        whenever(postSubscribersApiCallsProvider.subscribeMeToPost(anyLong(), anyLong()))
+                .thenReturn(PostSubscribersCallResult.Success(true))
+
+        val flow = followCommentsUseCase.setMySubscriptionToPost(blogId, postId, true)
+
+        assertThat(flow.toList()).isEqualTo(listOf(
+                Loading,
+                FollowStateChanged(
+                        blogId,
+                        postId,
+                        true,
+                        false,
+                        UiStringRes(R.string.reader_follow_comments_subscribe_success)
+                )
+        ))
+    }
+
+    @Test
+    fun `setMySubscriptionToPost emits expected state when unsubscribing with failure`() = test {
+        val errorMessage = "There was an error"
+        val failure = PostSubscribersCallResult.Failure(errorMessage)
+
+        whenever(postSubscribersApiCallsProvider.unsubscribeMeFromPost(anyLong(), anyLong())).thenReturn(failure)
+
+        val flow = followCommentsUseCase.setMySubscriptionToPost(blogId, postId, false)
+
+        assertThat(flow.toList()).isEqualTo(listOf(
+                Loading,
+                Failure(blogId, postId, UiStringText(errorMessage))
+        ))
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderFetchPostUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderFetchPostUseCaseTest.kt
new file mode 100644
index 000000000000..69aa555e081b
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderFetchPostUseCaseTest.kt
@@ -0,0 +1,133 @@
+package org.wordpress.android.ui.reader.usecases
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.test
+import org.wordpress.android.ui.reader.actions.ReaderActions
+import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Failed
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Success
+import org.wordpress.android.util.NetworkUtilsWrapper
+import java.net.HttpURLConnection
+
+private const val REQUEST_BLOG_LISTENER_PARAM_POSITION = 2
+
+@InternalCoroutinesApi
+class ReaderFetchPostUseCaseTest : BaseUnitTest() {
+    @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock private lateinit var readerPostActionsWrapper: ReaderPostActionsWrapper
+    private lateinit var useCase: ReaderFetchPostUseCase
+
+    private val postId = 1L
+    private val blogId = 2L
+
+    @Before
+    fun setUp() {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        useCase = ReaderFetchPostUseCase(networkUtilsWrapper, readerPostActionsWrapper)
+    }
+
+    @Test
+    fun `given no network, when reader post is fetched, then no network is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        assertThat(result).isEqualTo(Failed.NoNetwork)
+    }
+
+    @Test
+    fun `given feed, when reader post is fetched, then feed post is requested`() = test {
+        whenever(readerPostActionsWrapper.requestFeedPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onSuccess(null)
+        }
+
+        useCase.fetchPost(postId = postId, blogId = blogId, isFeed = true)
+
+        verify(readerPostActionsWrapper)
+                .requestFeedPost(feedId = eq(blogId), postId = eq(postId), requestListener = any())
+    }
+
+    @Test
+    fun `given blog, when reader post is fetched, then blog post is requested`() = test {
+        whenever(readerPostActionsWrapper.requestBlogPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onSuccess(null)
+        }
+
+        useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        verify(readerPostActionsWrapper)
+                .requestBlogPost(blogId = eq(blogId), postId = eq(postId), requestListener = any())
+    }
+
+    @Test
+    fun `given success response, when reader post is fetched, then success is returned`() = test {
+        whenever(readerPostActionsWrapper.requestBlogPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onSuccess(null)
+        }
+
+        val result = useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        assertThat(result).isEqualTo(Success)
+    }
+
+    @Test
+    fun `given http not found status code, when reader post is fetched, then post not found is returned`() = test {
+        whenever(readerPostActionsWrapper.requestBlogPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onFailure(HttpURLConnection.HTTP_NOT_FOUND)
+        }
+
+        val result = useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        assertThat(result).isEqualTo(Failed.PostNotFound)
+    }
+
+    @Test
+    fun `given http unauthorised status code, when reader post is fetched, then not authorised is returned`() = test {
+        whenever(readerPostActionsWrapper.requestBlogPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onFailure(HttpURLConnection.HTTP_UNAUTHORIZED)
+        }
+
+        val result = useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        assertThat(result).isEqualTo(Failed.NotAuthorised)
+    }
+
+    @Test
+    fun `given http forbidden status code, when reader post is fetched, then not authorised is returned`() = test {
+        whenever(readerPostActionsWrapper.requestBlogPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onFailure(HttpURLConnection.HTTP_FORBIDDEN)
+        }
+
+        val result = useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        assertThat(result).isEqualTo(Failed.NotAuthorised)
+    }
+
+    @Test
+    fun `given unknown status code, when reader post is fetched, then request failed is returned`() = test {
+        whenever(readerPostActionsWrapper.requestBlogPost(anyLong(), anyLong(), any())).then {
+            (it.arguments[REQUEST_BLOG_LISTENER_PARAM_POSITION] as ReaderActions.OnRequestListener<*>)
+                    .onFailure(500)
+        }
+
+        val result = useCase.fetchPost(postId = postId, blogId = blogId, isFeed = false)
+
+        assertThat(result).isEqualTo(Failed.RequestFailed)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderFetchRelatedPostsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderFetchRelatedPostsUseCaseTest.kt
new file mode 100644
index 000000000000..9514c284f37a
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderFetchRelatedPostsUseCaseTest.kt
@@ -0,0 +1,77 @@
+package org.wordpress.android.ui.reader.usecases
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.MainCoroutineScopeRule
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.test
+import org.wordpress.android.ui.reader.ReaderEvents.RelatedPostsUpdated
+import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState.Failed
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ReaderFetchRelatedPostsUseCaseTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @ExperimentalCoroutinesApi
+    @Rule
+    @JvmField val coroutineScope = MainCoroutineScopeRule()
+
+    lateinit var useCase: ReaderFetchRelatedPostsUseCase
+    @Mock lateinit var readerPostActionsWrapper: ReaderPostActionsWrapper
+    @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var readerPost: ReaderPost
+
+    @Before
+    fun setup() {
+        useCase = ReaderFetchRelatedPostsUseCase(networkUtilsWrapper, readerPostActionsWrapper)
+
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+    }
+
+    @Test
+    fun `given no network, when related posts are fetched, then no network is returned`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val result = useCase.fetchRelatedPosts(readerPost)
+
+        assertThat(result).isEqualTo(Failed.NoNetwork)
+    }
+
+    @Test
+    fun `given related posts fetch succeeds, when related posts are fetched, then success is returned`() = test {
+        val successEvent = RelatedPostsUpdated(readerPost, mock(), mock(), true)
+        whenever(readerPostActionsWrapper.requestRelatedPosts(readerPost))
+                .then { useCase.onRelatedPostUpdated(successEvent) }
+
+        val result = useCase.fetchRelatedPosts(readerPost)
+
+        assertThat(result).isInstanceOf(FetchRelatedPostsState.Success::class.java)
+    }
+
+    @Test
+    fun `given related posts fetch fails, when related posts are fetched, then request failed is returned`() = test {
+        val failedEvent = RelatedPostsUpdated(readerPost, mock(), mock(), false)
+        whenever(readerPostActionsWrapper.requestRelatedPosts(readerPost))
+                .then { useCase.onRelatedPostUpdated(failedEvent) }
+
+        val result = useCase.fetchRelatedPosts(readerPost)
+
+        assertThat(result).isEqualTo(Failed.RequestFailed)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderGetPostUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderGetPostUseCaseTest.kt
new file mode 100644
index 000000000000..a6701e972c48
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderGetPostUseCaseTest.kt
@@ -0,0 +1,128 @@
+package org.wordpress.android.ui.reader.usecases
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.spy
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.models.ReaderPostDiscoverData
+import org.wordpress.android.models.ReaderPostDiscoverData.DiscoverType
+import org.wordpress.android.test
+
+@InternalCoroutinesApi
+class ReaderGetPostUseCaseTest : BaseUnitTest() {
+    @Mock private lateinit var readerPostTableWrapper: ReaderPostTableWrapper
+    private val readerPostId = 1L
+    private val readerBlogId = 2L
+    private val discoverPostId = 3L
+    private val discoverBlogId = 4L
+
+    private val readerPost = ReaderPost().apply {
+        postId = readerPostId
+        blogId = readerBlogId
+    }
+
+    private val readerDiscoverSourcePost = ReaderPost().apply {
+        postId = discoverPostId
+        blogId = discoverBlogId
+    }
+
+    private lateinit var useCase: ReaderGetPostUseCase
+
+    @Before
+    fun setUp() {
+        useCase = ReaderGetPostUseCase(TEST_DISPATCHER, readerPostTableWrapper)
+    }
+
+    @Test
+    fun `given feed, when reader post is retrieved, feed post is returned`() = test {
+        whenever(
+                readerPostTableWrapper.getFeedPost(
+                        blogId = readerBlogId,
+                        postId = readerPostId,
+                        excludeTextColumn = false
+                )
+        )
+                .thenReturn(readerPost)
+
+        val result = useCase.get(blogId = readerBlogId, postId = readerPostId, isFeed = true)
+
+        assertThat(result).isEqualTo(Pair<ReaderPost?, Boolean>(readerPost, true))
+    }
+
+    @Test
+    fun `given blog, when reader post is retrieved, blog post is returned`() = test {
+        whenever(
+                readerPostTableWrapper.getBlogPost(
+                        blogId = readerBlogId,
+                        postId = readerPostId,
+                        excludeTextColumn = false
+                )
+        )
+                .thenReturn(readerPost)
+
+        val result = useCase.get(blogId = readerBlogId, postId = readerPostId, isFeed = false)
+
+        assertThat(result).isEqualTo(Pair<ReaderPost?, Boolean>(readerPost, false))
+    }
+
+    @Test
+    fun `given editor pick discover post is found, when reader post is retrieved, discover source post returned`() =
+            test {
+                val readerPost = createPost(discoverType = DiscoverType.EDITOR_PICK)
+                whenever(
+                        readerPostTableWrapper.getBlogPost(
+                                blogId = readerBlogId,
+                                postId = readerPostId,
+                                excludeTextColumn = false
+                        )
+                ).thenReturn(readerPost)
+                whenever(
+                        readerPostTableWrapper.getBlogPost(
+                                blogId = readerDiscoverSourcePost.blogId,
+                                postId = readerDiscoverSourcePost.postId,
+                                excludeTextColumn = false
+                        )
+                ).thenReturn(readerDiscoverSourcePost)
+
+                val result = useCase.get(blogId = readerBlogId, postId = readerPostId, isFeed = false)
+
+                assertThat(result).isEqualTo(Pair<ReaderPost?, Boolean>(readerDiscoverSourcePost, false))
+            }
+
+    @Test
+    fun `given non editor pick reader post is found, when reader post is retrieved, reader post is returned`() =
+            test {
+                val readerPost = createPost(discoverType = DiscoverType.SITE_PICK)
+                whenever(
+                        readerPostTableWrapper.getBlogPost(
+                                blogId = readerBlogId,
+                                postId = readerPostId,
+                                excludeTextColumn = false
+                        )
+                ).thenReturn(readerPost)
+
+                val result = useCase.get(blogId = readerBlogId, postId = readerPostId, isFeed = false)
+
+                assertThat(result).isEqualTo(Pair<ReaderPost?, Boolean>(readerPost, false))
+            }
+
+    private fun createPost(discoverType: DiscoverType = DiscoverType.OTHER): ReaderPost {
+        val post = spy(readerPost)
+        // The ReaderPost contains business logic and accesses static classes. Using spy() allows us to use it in tests.
+        whenever(post.isDiscoverPost).thenReturn(true)
+        val mockedDiscoverData: ReaderPostDiscoverData = mock()
+        whenever(post.discoverData).thenReturn(mockedDiscoverData)
+        whenever(mockedDiscoverData.discoverType).thenReturn(discoverType)
+        whenever(mockedDiscoverData.postId).thenReturn(readerDiscoverSourcePost.postId)
+        whenever(mockedDiscoverData.blogId).thenReturn(readerDiscoverSourcePost.blogId)
+        return post
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCaseTest.kt
index 151d0d25c4d6..bbf077dd95c8 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostBookmarkUseCaseTest.kt
@@ -18,9 +18,11 @@ import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.test
 import org.wordpress.android.ui.reader.actions.ReaderPostActionsWrapper
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.BookmarkPostState.PreLoadPostContent
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+
+private const val SOURCE = "source"
 
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
@@ -29,7 +31,7 @@ class ReaderPostBookmarkUseCaseTest {
     @JvmField val rule = InstantTaskExecutorRule()
 
     lateinit var useCase: ReaderPostBookmarkUseCase
-    @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    @Mock lateinit var readerTracker: ReaderTracker
     @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
     @Mock lateinit var readerPostActionsWrapper: ReaderPostActionsWrapper
     @Mock lateinit var readerPostTableWrapper: ReaderPostTableWrapper
@@ -37,7 +39,7 @@ class ReaderPostBookmarkUseCaseTest {
     @Before
     fun setup() {
         useCase = ReaderPostBookmarkUseCase(
-                analyticsTrackerWrapper,
+                readerTracker,
                 networkUtilsWrapper,
                 readerPostActionsWrapper,
                 readerPostTableWrapper
@@ -49,7 +51,11 @@ class ReaderPostBookmarkUseCaseTest {
         // Arrange
         val dummyPost = init(isBookmarked = false)
         // Act
-        useCase.toggleBookmark(0L, 0L, false).toList(mutableListOf())
+        useCase.toggleBookmark(
+                post(),
+                false,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Assert
         verify(readerPostActionsWrapper).addToBookmarked(dummyPost)
@@ -60,7 +66,11 @@ class ReaderPostBookmarkUseCaseTest {
         // Arrange
         val dummyPost = init(isBookmarked = true)
         // Act
-        useCase.toggleBookmark(0L, 0L, false).toList(mutableListOf())
+        useCase.toggleBookmark(
+                post(),
+                false,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Assert
         verify(readerPostActionsWrapper).removeFromBookmarked(dummyPost)
@@ -72,10 +82,14 @@ class ReaderPostBookmarkUseCaseTest {
         init(isBookmarked = false, networkAvailable = true)
 
         // Act
-        val result = useCase.toggleBookmark(0L, 0L, false).toList(mutableListOf())
+        val result = useCase.toggleBookmark(
+                post(),
+                false,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Assert
-        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isTrue()
+        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isTrue
     }
 
     @Test
@@ -84,10 +98,14 @@ class ReaderPostBookmarkUseCaseTest {
         init(isBookmarked = false, networkAvailable = false)
 
         // Act
-        val result = useCase.toggleBookmark(0L, 0L, false).toList(mutableListOf())
+        val result = useCase.toggleBookmark(
+                post(),
+                false,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Assert
-        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isFalse()
+        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isFalse
     }
 
     @Test
@@ -96,22 +114,30 @@ class ReaderPostBookmarkUseCaseTest {
         init(isBookmarked = true)
 
         // Act
-        val result = useCase.toggleBookmark(0L, 0L, false).toList(mutableListOf())
+        val result = useCase.toggleBookmark(
+                post(),
+                false,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Assert
-        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isFalse()
+        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isFalse
     }
 
     @Test
     fun `does not initiate content preload when on bookmarkList(savedTab)`() = test {
         // Arrange
         init()
-        val isBookmarkList = true
+
         // Act
-        val result = useCase.toggleBookmark(0L, 0L, isBookmarkList).toList(mutableListOf())
+        val result = useCase.toggleBookmark(
+                post(),
+                true,
+                SOURCE
+        ).toList(mutableListOf())
 
         // Assert
-        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isFalse()
+        assertThat(result.contains(PreLoadPostContent(0L, 0L))).isFalse
     }
 
     private fun init(isBookmarked: Boolean = false, networkAvailable: Boolean = true): ReaderPost {
@@ -121,4 +147,13 @@ class ReaderPostBookmarkUseCaseTest {
         whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(networkAvailable)
         return post
     }
+
+    private fun post(): ReaderPost {
+        val post = ReaderPost()
+        post.postId = 0L
+        post.feedId = 0L
+        post.postId = 0L
+        post.isFollowedByCurrentUser = false
+        return post
+    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostSeenStatusToggleUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostSeenStatusToggleUseCaseTest.kt
new file mode 100644
index 000000000000..90f222870b1d
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderPostSeenStatusToggleUseCaseTest.kt
@@ -0,0 +1,197 @@
+package org.wordpress.android.ui.reader.usecases
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
+import kotlinx.coroutines.flow.toList
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R.string
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.datasets.ReaderBlogTableWrapper
+import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.models.ReaderPost
+import org.wordpress.android.test
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.Error
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.PostSeenStateChanged
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.PostSeenState.UserNotAuthenticated
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.ReaderPostSeenToggleSource.READER_POST_CARD
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase.ReaderPostSeenToggleSource.READER_POST_DETAILS
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider
+import org.wordpress.android.ui.reader.utils.PostSeenStatusApiCallsProvider.SeenStatusToggleCallResult.Success
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.util.NetworkUtilsWrapper
+
+@InternalCoroutinesApi
+@RunWith(MockitoJUnitRunner::class)
+class ReaderPostSeenStatusToggleUseCaseTest {
+    @Rule
+    @JvmField val rule = InstantTaskExecutorRule()
+
+    @Mock private lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock private lateinit var postSeenStatusApiCallsProvider: PostSeenStatusApiCallsProvider
+    @Mock private lateinit var accountStore: AccountStore
+    @Mock private lateinit var readerTracker: ReaderTracker
+    @Mock private lateinit var readerPostTableWrapper: ReaderPostTableWrapper
+    @Mock private lateinit var readerBlogTableWrapper: ReaderBlogTableWrapper
+
+    private lateinit var seenStatusToggleUseCase: ReaderSeenStatusToggleUseCase
+
+    @Before
+    fun setup() {
+        whenever(accountStore.hasAccessToken()).thenReturn(true)
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
+        whenever(readerPostTableWrapper.isPostSeen(any())).thenReturn(true)
+
+        seenStatusToggleUseCase = ReaderSeenStatusToggleUseCase(
+                networkUtilsWrapper,
+                postSeenStatusApiCallsProvider,
+                accountStore,
+                readerTracker,
+                readerPostTableWrapper,
+                readerBlogTableWrapper
+        )
+    }
+
+    @Test
+    fun `toggleSeenStatus emits expected state when user not logged in`() = test {
+        whenever(accountStore.hasAccessToken()).thenReturn(false)
+        val dummyPost = createDummyReaderPost()
+        val flow = seenStatusToggleUseCase.toggleSeenStatus(dummyPost, READER_POST_CARD)
+
+        val result = flow.toList()
+        assertThat(result).isEqualTo(listOf(UserNotAuthenticated))
+    }
+
+    @Test
+    fun `toggleSeenStatus emits expected state when no network`() = test {
+        whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
+
+        val dummyPost = createDummyReaderPost()
+        val flow = seenStatusToggleUseCase.toggleSeenStatus(dummyPost, READER_POST_CARD)
+
+        val result = flow.toList()
+        assertThat(result).isEqualTo(
+                listOf(Error(UiStringRes(string.error_network_connection)))
+        )
+    }
+
+    @Test
+    fun `toggleSeenStatus emits expected state when trying to change status of unsupported post`() = test {
+        val dummyPost = createDummyReaderPost(isSeen = true, isSeenSupported = false)
+        val flow = seenStatusToggleUseCase.toggleSeenStatus(dummyPost, READER_POST_CARD)
+
+        val result = flow.toList()
+        assertThat(result).isEqualTo(
+                listOf(Error(UiStringRes(string.reader_error_changing_seen_status_of_unsupported_post)))
+        )
+    }
+
+    @Test
+    fun `markPostAsSeenIfNecessary correctly marks post as seen depending on if it is seen or not`() = test {
+        whenever(
+                postSeenStatusApiCallsProvider.markPostAsSeen(any())
+        ).thenReturn(Success(true))
+
+        val unseenPost = createDummyReaderPost(isSeen = false)
+        val seenPost = createDummyReaderPost(isSeen = true)
+        whenever(readerPostTableWrapper.isPostSeen(unseenPost)).thenReturn(false)
+        seenStatusToggleUseCase.markPostAsSeenIfNecessary(seenPost)
+
+        verify(postSeenStatusApiCallsProvider, times(0)).markPostAsSeen(any())
+        verify(readerPostTableWrapper, times(0)).setPostSeenStatusInDb(any(), any())
+        verify(readerTracker, times(0)).trackPost(
+                stat = any(),
+                post = any(),
+                source = any()
+        )
+
+        seenStatusToggleUseCase.markPostAsSeenIfNecessary(unseenPost)
+
+        verify(postSeenStatusApiCallsProvider, times(1)).markPostAsSeen(unseenPost)
+        verify(readerPostTableWrapper, times(1)).setPostSeenStatusInDb(unseenPost, true)
+        verify(readerTracker, never()).trackPost(
+                AnalyticsTracker.Stat.READER_POST_MARKED_AS_SEEN,
+                unseenPost,
+                READER_POST_DETAILS.toString()
+        )
+    }
+
+    @Test
+    fun `toggleSeenStatus emits correct state when toggling post seen status`() = test {
+        whenever(
+                postSeenStatusApiCallsProvider.markPostAsUnseen(any())
+        ).thenReturn(Success(false))
+        whenever(
+                postSeenStatusApiCallsProvider.markPostAsSeen(any())
+        ).thenReturn(Success(true))
+
+        val unseenPost = createDummyReaderPost(isSeen = false)
+        val seenPost = createDummyReaderPost(isSeen = true)
+
+        whenever(readerPostTableWrapper.isPostSeen(unseenPost)).thenReturn(false)
+
+        val markAsSeenFlow = seenStatusToggleUseCase.toggleSeenStatus(unseenPost, READER_POST_DETAILS)
+        val markAsUnseenFlow = seenStatusToggleUseCase.toggleSeenStatus(seenPost, READER_POST_CARD)
+
+        assertThat(markAsSeenFlow.toList()).isEqualTo(
+                listOf(
+                        PostSeenStateChanged(
+                                true,
+                                UiStringRes(string.reader_marked_post_as_seen)
+                        )
+                )
+        )
+
+        // local DB status toggle check
+        verify(readerPostTableWrapper, times(1)).setPostSeenStatusInDb(unseenPost, true)
+        verify(readerBlogTableWrapper, times(1)).decrementUnseenCount(unseenPost.blogId)
+
+        // analytics check
+        verify(readerTracker, times(1)).trackPost(
+                AnalyticsTracker.Stat.READER_POST_MARKED_AS_SEEN,
+                unseenPost,
+                READER_POST_DETAILS.toString()
+        )
+
+        assertThat(markAsUnseenFlow.toList()).isEqualTo(
+                listOf(
+                        PostSeenStateChanged(
+                                false,
+                                UiStringRes(string.reader_marked_post_as_unseen)
+                        )
+                )
+        )
+
+        // local DB status toggle check
+        verify(readerPostTableWrapper, times(1)).setPostSeenStatusInDb(seenPost, false)
+        verify(readerBlogTableWrapper, times(1)).incrementUnseenCount(unseenPost.blogId)
+
+        // analytics check
+        verify(readerTracker, times(1)).trackPost(
+                AnalyticsTracker.Stat.READER_POST_MARKED_AS_UNSEEN,
+                seenPost,
+                READER_POST_CARD.toString()
+        )
+    }
+
+    private fun createDummyReaderPost(isSeen: Boolean = false, isSeenSupported: Boolean = true): ReaderPost =
+            ReaderPost().apply {
+                this.postId = 1
+                this.blogId = 2
+                this.feedId = 3
+                this.isSeen = isSeen
+                this.isSeenSupported = isSeenSupported
+            }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCaseTest.kt
index d082fe08aabe..1715ed55595a 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteFollowUseCaseTest.kt
@@ -15,12 +15,14 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers.anyBoolean
 import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.datasets.ReaderBlogTableWrapper
 import org.wordpress.android.test
 import org.wordpress.android.ui.reader.actions.ReaderActions.ActionListener
 import org.wordpress.android.ui.reader.actions.ReaderBlogActionsWrapper
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.Failed.NoNetwork
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.Failed.RequestFailed
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged
@@ -29,6 +31,7 @@ import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
 
 private const val FOLLOW_BLOG_ACTION_LISTENER_PARAM_POSITION = 3
+private const val SOURCE = "source"
 
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
@@ -41,6 +44,7 @@ class ReaderSiteFollowUseCaseTest {
     @Mock lateinit var readerUtilsWrapper: ReaderUtilsWrapper
     @Mock lateinit var readerBlogActionsWrapper: ReaderBlogActionsWrapper
     @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
+    @Mock lateinit var readerTracker: ReaderTracker
 
     private val useCaseParam = ReaderSiteFollowUseCase.Param(11L, 13L, "FakeBlogName")
 
@@ -50,7 +54,8 @@ class ReaderSiteFollowUseCaseTest {
                 networkUtilsWrapper,
                 readerBlogActionsWrapper,
                 readerBlogTableWrapper,
-                readerUtilsWrapper
+                readerUtilsWrapper,
+                readerTracker
         )
 
         whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
@@ -63,7 +68,7 @@ class ReaderSiteFollowUseCaseTest {
         whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
 
         // Act
-        val result = useCase.toggleFollow(useCaseParam).toList(mutableListOf())
+        val result = useCase.toggleFollow(useCaseParam, SOURCE).toList(mutableListOf())
 
         // Then
         assertThat(result).contains(NoNetwork)
@@ -73,7 +78,7 @@ class ReaderSiteFollowUseCaseTest {
     fun `Success returned on success response`() =
             testWithFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
@@ -84,7 +89,7 @@ class ReaderSiteFollowUseCaseTest {
     fun `RequestFailed returned on failed response`() =
             testWithFailedResponseForFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
@@ -95,92 +100,92 @@ class ReaderSiteFollowUseCaseTest {
     fun `follow site action returns info to show enable notification`() =
             testWithUnFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
-                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isTrue()
+                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isTrue
             }
 
     @Test
     fun `un-follow site action returns info to not show enable notification`() =
             testWithFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
-                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isFalse()
+                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isFalse
             }
 
     @Test
     fun `follow site action returns info that site is followed`() =
             testWithUnFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
-                assertThat((result[0] as FollowStatusChanged).following).isTrue()
+                assertThat((result[0] as FollowStatusChanged).following).isTrue
             }
 
     @Test
     fun `un-follow site action returns info that site is un-followed`() =
             testWithFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
-                assertThat((result[0] as FollowStatusChanged).following).isFalse()
+                assertThat((result[0] as FollowStatusChanged).following).isFalse
             }
 
     @Test
     fun `follow site action returns info to not delete notification subscriptions`() =
             testWithUnFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
                 assertThat(result.size).isGreaterThanOrEqualTo(2)
-                assertThat((result[1] as FollowStatusChanged).deleteNotificationSubscription).isFalse()
+                assertThat((result[1] as FollowStatusChanged).deleteNotificationSubscription).isFalse
             }
 
     @Test
     fun `un-follow site action returns info to delete notification subscriptions`() =
             testWithFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
                 assertThat(result.size).isGreaterThanOrEqualTo(2)
-                assertThat((result[1] as FollowStatusChanged).deleteNotificationSubscription).isTrue()
+                assertThat((result[1] as FollowStatusChanged).deleteNotificationSubscription).isTrue
             }
 
     @Test
     fun `request failure on un-follow site action returns info that site is followed`() =
             testWithFailedResponseForFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
                 assertThat(result.size).isGreaterThanOrEqualTo(2)
-                assertThat((result[1] as FollowStatusChanged).following).isTrue()
+                assertThat((result[1] as FollowStatusChanged).following).isTrue
             }
 
     @Test
     fun `request failure on follow site action returns info that site is not followed`() =
             testWithFailedResponseForUnFollowedSitePost {
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
                 assertThat(result.size).isGreaterThanOrEqualTo(2)
-                assertThat((result[1] as FollowStatusChanged).following).isFalse()
+                assertThat((result[1] as FollowStatusChanged).following).isFalse
             }
 
     @Test
@@ -190,11 +195,11 @@ class ReaderSiteFollowUseCaseTest {
                 whenever(readerUtilsWrapper.isExternalFeed(anyLong(), anyLong())).thenReturn(true)
 
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
-                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isFalse()
+                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isFalse
             }
 
     @Test
@@ -204,52 +209,77 @@ class ReaderSiteFollowUseCaseTest {
                 whenever(readerUtilsWrapper.isExternalFeed(anyLong(), anyLong())).thenReturn(true)
 
                 // Act
-                val result = useCase.toggleFollow(useCaseParam)
+                val result = useCase.toggleFollow(useCaseParam, SOURCE)
                         .toList(mutableListOf())
 
                 // Assert
-                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isFalse()
+                assertThat((result[0] as FollowStatusChanged).showEnableNotification).isFalse
             }
 
     @Test
     fun `toggling follow for un-followed site post initiates follow blog (or site) action`() =
             testWithUnFollowedSitePost {
                 // Act
-                useCase.toggleFollow(useCaseParam).toList(mutableListOf())
+                useCase.toggleFollow(useCaseParam, SOURCE).toList(mutableListOf())
 
                 // Assert
-                verify(readerBlogActionsWrapper).followBlog(anyLong(), anyLong(), eq(true), anyOrNull())
+                verify(readerBlogActionsWrapper).followBlog(
+                        anyLong(),
+                        anyLong(),
+                        eq(true),
+                        anyOrNull(),
+                        eq(SOURCE),
+                        eq(readerTracker)
+                )
             }
 
     @Test
     fun `toggling follow for followed site post initiates un-follow blog (or site) action`() =
             testWithFollowedSitePost {
                 // Act
-                useCase.toggleFollow(useCaseParam).toList(mutableListOf())
+                useCase.toggleFollow(useCaseParam, SOURCE).toList(mutableListOf())
 
                 // Assert
-                verify(readerBlogActionsWrapper).followBlog(anyLong(), anyLong(), eq(false), anyOrNull())
+                verify(readerBlogActionsWrapper).followBlog(
+                        anyLong(),
+                        anyLong(),
+                        eq(false),
+                        anyOrNull(),
+                        eq(SOURCE),
+                        eq(readerTracker)
+                )
             }
 
     @Test
     fun `follow blog (or site) action is triggered for selected reader post`() =
             testWithFollowedSitePost {
                 // Act
-                useCase.toggleFollow(useCaseParam).toList(mutableListOf())
+                useCase.toggleFollow(useCaseParam, SOURCE).toList(mutableListOf())
 
                 // Assert
                 verify(readerBlogActionsWrapper).followBlog(
                         eq(useCaseParam.blogId),
                         eq(useCaseParam.feedId),
                         anyBoolean(),
-                        anyOrNull()
+                        anyOrNull(),
+                        eq(SOURCE),
+                        eq(readerTracker)
                 )
             }
 
     private fun <T> testWithFollowedSitePost(block: suspend CoroutineScope.() -> T) {
         test {
             whenever(readerBlogTableWrapper.isSiteFollowed(useCaseParam.blogId, useCaseParam.feedId)).thenReturn(true)
-            whenever(readerBlogActionsWrapper.followBlog(anyLong(), anyLong(), anyBoolean(), anyOrNull())).then {
+            whenever(
+                    readerBlogActionsWrapper.followBlog(
+                            anyLong(),
+                            anyLong(),
+                            anyBoolean(),
+                            anyOrNull(),
+                            anyString(),
+                            eq(readerTracker)
+                    )
+            ).then {
                 (it.arguments[FOLLOW_BLOG_ACTION_LISTENER_PARAM_POSITION] as ActionListener).onActionResult(true)
                 true
             }
@@ -261,7 +291,16 @@ class ReaderSiteFollowUseCaseTest {
     private fun <T> testWithUnFollowedSitePost(block: suspend CoroutineScope.() -> T) {
         test {
             whenever(readerBlogTableWrapper.isSiteFollowed(useCaseParam.blogId, useCaseParam.feedId)).thenReturn(false)
-            whenever(readerBlogActionsWrapper.followBlog(anyLong(), anyLong(), anyBoolean(), anyOrNull())).then {
+            whenever(
+                    readerBlogActionsWrapper.followBlog(
+                            anyLong(),
+                            anyLong(),
+                            anyBoolean(),
+                            anyOrNull(),
+                            anyString(),
+                            eq(readerTracker)
+                    )
+            ).then {
                 (it.arguments[FOLLOW_BLOG_ACTION_LISTENER_PARAM_POSITION] as ActionListener).onActionResult(true)
                 true
             }
@@ -273,7 +312,16 @@ class ReaderSiteFollowUseCaseTest {
     private fun <T> testWithFailedResponseForFollowedSitePost(block: suspend CoroutineScope.() -> T) {
         test {
             whenever(readerBlogTableWrapper.isSiteFollowed(useCaseParam.blogId, useCaseParam.feedId)).thenReturn(true)
-            whenever(readerBlogActionsWrapper.followBlog(anyLong(), anyLong(), anyBoolean(), anyOrNull())).then {
+            whenever(
+                    readerBlogActionsWrapper.followBlog(
+                            anyLong(),
+                            anyLong(),
+                            anyBoolean(),
+                            anyOrNull(),
+                            anyString(),
+                            eq(readerTracker)
+                    )
+            ).then {
                 (it.arguments[FOLLOW_BLOG_ACTION_LISTENER_PARAM_POSITION] as ActionListener).onActionResult(false)
                 true
             }
@@ -285,7 +333,16 @@ class ReaderSiteFollowUseCaseTest {
     private fun <T> testWithFailedResponseForUnFollowedSitePost(block: suspend CoroutineScope.() -> T) {
         test {
             whenever(readerBlogTableWrapper.isSiteFollowed(useCaseParam.blogId, useCaseParam.feedId)).thenReturn(false)
-            whenever(readerBlogActionsWrapper.followBlog(anyLong(), anyLong(), anyBoolean(), anyOrNull())).then {
+            whenever(
+                    readerBlogActionsWrapper.followBlog(
+                            anyLong(),
+                            anyLong(),
+                            anyBoolean(),
+                            anyOrNull(),
+                            anyString(),
+                            eq(readerTracker)
+                    )
+            ).then {
                 (it.arguments[FOLLOW_BLOG_ACTION_LISTENER_PARAM_POSITION] as ActionListener).onActionResult(false)
                 true
             }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCaseTest.kt
index 676a79ef826f..9b5d0f3dfb9e 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/usecases/ReaderSiteNotificationsUseCaseTest.kt
@@ -27,11 +27,11 @@ import org.wordpress.android.fluxc.store.AccountStore.AddOrDeleteSubscriptionPay
 import org.wordpress.android.fluxc.store.AccountStore.OnSubscriptionUpdated
 import org.wordpress.android.fluxc.store.AccountStore.SubscriptionError
 import org.wordpress.android.test
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState.Failed.NoNetwork
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState.Failed.RequestFailed
 import org.wordpress.android.ui.reader.usecases.ReaderSiteNotificationsUseCase.SiteNotificationState.Success
 import org.wordpress.android.util.NetworkUtilsWrapper
-import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper
 
 private const val ERROR = "Error"
 @InternalCoroutinesApi
@@ -42,7 +42,7 @@ class ReaderSiteNotificationsUseCaseTest {
 
     lateinit var useCase: ReaderSiteNotificationsUseCase
     @Mock lateinit var dispatcher: Dispatcher
-    @Mock lateinit var analyticsUtilsWrapper: AnalyticsUtilsWrapper
+    @Mock lateinit var readerTracker: ReaderTracker
     @Mock lateinit var readerBlogTableWrapper: ReaderBlogTableWrapper
     @Mock lateinit var networkUtilsWrapper: NetworkUtilsWrapper
     private val event = OnSubscriptionUpdated()
@@ -53,12 +53,12 @@ class ReaderSiteNotificationsUseCaseTest {
     fun setup() {
         useCase = ReaderSiteNotificationsUseCase(
                 dispatcher,
-                analyticsUtilsWrapper,
+                readerTracker,
                 readerBlogTableWrapper,
                 networkUtilsWrapper
         )
 
-        doNothing().whenever(analyticsUtilsWrapper).trackWithSiteId(any(), any())
+        doNothing().whenever(readerTracker).trackBlog(any(), any(), any())
         whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(true)
         whenever(dispatcher.dispatch(argWhere<Action<Void>> {
             it.type == AccountAction.UPDATE_SUBSCRIPTION_NOTIFICATION_POST
@@ -77,7 +77,7 @@ class ReaderSiteNotificationsUseCaseTest {
         whenever(readerBlogTableWrapper.isNotificationsEnabled(blogId)).thenReturn(false)
 
         // Act
-        useCase.toggleNotification(blogId)
+        useCase.toggleNotification(blogId, 1L)
 
         // Assert
         verify(readerBlogTableWrapper).setNotificationsEnabledByBlogId(blogId, true)
@@ -90,7 +90,7 @@ class ReaderSiteNotificationsUseCaseTest {
         whenever(readerBlogTableWrapper.isNotificationsEnabled(blogId)).thenReturn(true)
 
         // Act
-        useCase.toggleNotification(blogId)
+        useCase.toggleNotification(blogId, 1L)
 
         // Assert
         verify(readerBlogTableWrapper).setNotificationsEnabledByBlogId(blogId, false)
@@ -103,7 +103,7 @@ class ReaderSiteNotificationsUseCaseTest {
         whenever(readerBlogTableWrapper.isNotificationsEnabled(blogId)).thenReturn(true)
 
         // Act
-        useCase.toggleNotification(blogId)
+        useCase.toggleNotification(blogId, 1L)
 
         // Assert
         verify(dispatcher, times(2)).dispatch(dispatchCaptor.capture())
@@ -117,7 +117,7 @@ class ReaderSiteNotificationsUseCaseTest {
         whenever(readerBlogTableWrapper.isNotificationsEnabled(blogId)).thenReturn(false)
 
         // Act
-        useCase.toggleNotification(blogId)
+        useCase.toggleNotification(blogId, 1L)
 
         // Assert
         verify(dispatcher, times(2)).dispatch(dispatchCaptor.capture())
@@ -127,10 +127,9 @@ class ReaderSiteNotificationsUseCaseTest {
     @Test
     fun `fetch subscriptions action invoked if notification is subscribed successfully`() = test {
         // Arrange
-        val blogId = 1L
 
         // Act
-        useCase.toggleNotification(blogId)
+        useCase.toggleNotification(1L, 1L)
 
         // Assert
         verify(dispatcher, times(2)).dispatch(dispatchCaptor.capture())
@@ -139,11 +138,8 @@ class ReaderSiteNotificationsUseCaseTest {
 
     @Test
     fun `Success returned if notification is subscribed successfully`() = test {
-        // Arrange
-        val blogId = 1L
-
         // Act
-        val result = useCase.toggleNotification(blogId)
+        val result = useCase.toggleNotification(1L, 1L)
 
         // Assert
         assertThat(result).isEqualTo(Success)
@@ -152,8 +148,6 @@ class ReaderSiteNotificationsUseCaseTest {
     @Test
     fun `RequestFailed returned if notification subscription failed with error`() = test {
         // Arrange
-        val blogId = 1L
-
         val failedEvent = OnSubscriptionUpdated()
         failedEvent.error = SubscriptionError(ERROR, ERROR)
 
@@ -166,7 +160,7 @@ class ReaderSiteNotificationsUseCaseTest {
         }
 
         // Act
-        val result = useCase.toggleNotification(blogId)
+        val result = useCase.toggleNotification(1L, 1L)
 
         // Assert
         assertThat(result).isEqualTo(RequestFailed)
@@ -175,11 +169,10 @@ class ReaderSiteNotificationsUseCaseTest {
     @Test
     fun `NoNetwork returned on toggling notification when no network is available`() = test {
         // Arrange
-        val blogId = 1L
         whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
 
         // Act
-        val result = useCase.toggleNotification(blogId)
+        val result = useCase.toggleNotification(1L, 1L)
 
         // Assert
         assertThat(result).isEqualTo(NoNetwork)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtilsTest.kt
index 7b60d4a4d8c0..31a23231cbcb 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtilsTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/utils/FeaturedImageUtilsTest.kt
@@ -65,6 +65,17 @@ class FeaturedImageUtilsTest {
         assertThat(result).isTrue()
     }
 
+    @Test
+    fun `shows featured image with different name and non-last path segment containing a dash`() {
+        val featuredImage = "https://wordpress.com/wp-content/image1.png"
+        val bodyImage = "https://wordpress.com/wp-content/image2.png"
+        val readerPost = initReaderPost(bodyImage, featuredImage)
+
+        val result = featuredImageUtils.showFeaturedImage(readerPost.featuredImage, readerPost.text)
+
+        assertThat(result).isTrue
+    }
+
     @Test
     fun `shows featured image with the same name from different host`() {
         val featuredImage = "https://wordpress.com/image.png"
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModelTest.kt
index 806a63e3f826..e51e7edc6120 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/reader/viewmodels/ReaderPostDetailViewModelTest.kt
@@ -1,30 +1,57 @@
 package org.wordpress.android.ui.reader.viewmodels
 
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import android.content.Context
 import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.InternalCoroutinesApi
-import org.assertj.core.api.Assertions
-
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
-import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
+import org.mockito.ArgumentMatchers.anyBoolean
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.anyList
+import org.mockito.ArgumentMatchers.anyLong
+import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
 import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.datasets.wrappers.ReaderPostTableWrapper
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.models.ReaderPost
 import org.wordpress.android.test
+import org.wordpress.android.ui.engagement.EngageItem.Liker
+import org.wordpress.android.ui.engagement.EngagedPeopleListViewModel.EngagedPeopleListUiState
+import org.wordpress.android.ui.engagement.EngagementUtils
+import org.wordpress.android.ui.engagement.GetLikesHandler
+import org.wordpress.android.ui.engagement.GetLikesUseCase.CurrentUserInListRequirement.DONT_CARE
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.Failure
+import org.wordpress.android.ui.engagement.GetLikesUseCase.GetLikesState.LikesData
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_1
+import org.wordpress.android.ui.engagement.utils.GetLikesTestConfig.TEST_CONFIG_5
+import org.wordpress.android.ui.engagement.utils.getGetLikesState
 import org.wordpress.android.ui.pages.SnackbarMessageHolder
+import org.wordpress.android.ui.reader.ReaderPostDetailUiStateBuilder
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenEditorForReblog
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.OpenUrl
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ReplaceRelatedPostDetailsWithHistory
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowEngagedPeopleList
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowMediaPreview
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostInWebView
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowPostsByTag
+import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowRelatedPostDetails
 import org.wordpress.android.ui.reader.discover.ReaderNavigationEvents.ShowSitePickerForResult
 import org.wordpress.android.ui.reader.discover.ReaderPostActions
 import org.wordpress.android.ui.reader.discover.ReaderPostCardAction.PrimaryAction
@@ -37,15 +64,37 @@ import org.wordpress.android.ui.reader.discover.ReaderPostCardActionType.REBLOG
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionsHandler
 import org.wordpress.android.ui.reader.discover.ReaderPostMoreButtonUiStateBuilder
 import org.wordpress.android.ui.reader.discover.interests.TagUiState
+import org.wordpress.android.ui.reader.models.ReaderSimplePost
+import org.wordpress.android.ui.reader.models.ReaderSimplePostList
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
+import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.AlreadyRunning
+import org.wordpress.android.ui.reader.usecases.ReaderFetchPostUseCase.FetchReaderPostState.Failed
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase
+import org.wordpress.android.ui.reader.usecases.ReaderFetchRelatedPostsUseCase.FetchRelatedPostsState
+import org.wordpress.android.ui.reader.usecases.ReaderGetPostUseCase
 import org.wordpress.android.ui.reader.usecases.ReaderSiteFollowUseCase.FollowSiteState.FollowStatusChanged
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
-import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.ReaderPostDetailsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.LoadingUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState
+import org.wordpress.android.ui.reader.viewmodels.ReaderPostDetailViewModel.UiState.ReaderPostDetailsUiState.RelatedPostsUiState.ReaderRelatedPostUiState
 import org.wordpress.android.ui.reader.views.uistates.FollowButtonUiState
 import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState
 import org.wordpress.android.ui.reader.views.uistates.ReaderBlogSectionUiState.ReaderBlogSectionClickData
 import org.wordpress.android.ui.reader.views.uistates.ReaderPostDetailsHeaderViewUiState.ReaderPostDetailsHeaderUiState
+import org.wordpress.android.ui.utils.UiDimen.UIDimenRes
+import org.wordpress.android.ui.utils.UiString.UiStringRes
 import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.EventBusWrapper
+import org.wordpress.android.util.WpUrlUtilsWrapper
+import org.wordpress.android.util.config.LikesEnhancementsFeatureConfig
+import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
+import org.wordpress.android.viewmodel.ContextProvider
 import org.wordpress.android.viewmodel.Event
 
 private const val POST_PARAM_POSITION = 0
@@ -54,12 +103,13 @@ private const val ON_POST_BLOG_SECTION_CLICKED_PARAM_POSITION = 3
 private const val ON_POST_FOLLOW_BUTTON_CLICKED_PARAM_POSITION = 4
 private const val ON_TAG_CLICKED_PARAM_POSITION = 5
 
-@InternalCoroutinesApi
-@RunWith(MockitoJUnitRunner::class)
-class ReaderPostDetailViewModelTest {
-    @Rule
-    @JvmField val rule = InstantTaskExecutorRule()
+private const val IS_GLOBAL_RELATED_POSTS_PARAM_POSITION = 2
+private const val ON_RELATED_POST_ITEM_CLICKED_PARAM_POSITION = 3
 
+private const val INTERCEPTED_URI = "intercepted uri"
+
+@InternalCoroutinesApi
+class ReaderPostDetailViewModelTest : BaseUnitTest() {
     private lateinit var viewModel: ReaderPostDetailViewModel
 
     @Mock private lateinit var readerPostCardActionsHandler: ReaderPostCardActionsHandler
@@ -68,13 +118,32 @@ class ReaderPostDetailViewModelTest {
     @Mock private lateinit var readerPostTableWrapper: ReaderPostTableWrapper
     @Mock private lateinit var menuUiStateBuilder: ReaderPostMoreButtonUiStateBuilder
     @Mock private lateinit var reblogUseCase: ReblogUseCase
+    @Mock private lateinit var readerFetchRelatedPostsUseCase: ReaderFetchRelatedPostsUseCase
+    @Mock private lateinit var readerGetPostUseCase: ReaderGetPostUseCase
+    @Mock private lateinit var readerFetchPostUseCase: ReaderFetchPostUseCase
+    @Mock private lateinit var eventBusWrapper: EventBusWrapper
+    @Mock private lateinit var readerSimplePost: ReaderSimplePost
+    @Mock private lateinit var readerTracker: ReaderTracker
+    @Mock private lateinit var siteStore: SiteStore
+    @Mock private lateinit var accountStore: AccountStore
+    @Mock private lateinit var wpUrlUtilsWrapper: WpUrlUtilsWrapper
+    @Mock private lateinit var getLikesHandler: GetLikesHandler
+    @Mock private lateinit var likesEnhancementsFeatureConfig: LikesEnhancementsFeatureConfig
+    @Mock private lateinit var contextProvider: ContextProvider
+    @Mock private lateinit var engagementUtils: EngagementUtils
 
     private val fakePostFollowStatusChangedFeed = MutableLiveData<FollowStatusChanged>()
     private val fakeRefreshPostFeed = MutableLiveData<Event<Unit>>()
     private val fakeNavigationFeed = MutableLiveData<Event<ReaderNavigationEvents>>()
     private val fakeSnackBarFeed = MutableLiveData<Event<SnackbarMessageHolder>>()
+    private val getLikesState = MutableLiveData<GetLikesState>()
+
+    private val snackbarEvents = MutableLiveData<Event<SnackbarMessageHolder>>()
 
     private val readerPost = createDummyReaderPost(2)
+    private val site = SiteModel().apply { siteId = readerPost.blogId }
+
+    private lateinit var relatedPosts: ReaderSimplePostList
 
     @Before
     fun setUp() = test {
@@ -85,21 +154,38 @@ class ReaderPostDetailViewModelTest {
                 menuUiStateBuilder,
                 postDetailsUiStateBuilder,
                 reblogUseCase,
+                readerFetchRelatedPostsUseCase,
+                readerGetPostUseCase,
+                readerFetchPostUseCase,
+                siteStore,
+                accountStore,
+                readerTracker,
+                eventBusWrapper,
+                wpUrlUtilsWrapper,
+                contextProvider,
+                TEST_DISPATCHER,
+                TEST_DISPATCHER,
                 TEST_DISPATCHER,
-                TEST_DISPATCHER
+                getLikesHandler,
+                likesEnhancementsFeatureConfig,
+                engagementUtils
         )
+        whenever(readerGetPostUseCase.get(any(), any(), any())).thenReturn(Pair(readerPost, false))
         whenever(readerPostCardActionsHandler.followStatusUpdated).thenReturn(fakePostFollowStatusChangedFeed)
         whenever(readerPostCardActionsHandler.refreshPosts).thenReturn(fakeRefreshPostFeed)
         whenever(readerPostCardActionsHandler.navigationEvents).thenReturn(fakeNavigationFeed)
         whenever(readerPostCardActionsHandler.snackbarEvents).thenReturn(fakeSnackBarFeed)
+        whenever(siteStore.getSiteBySiteId(readerPost.blogId)).thenReturn(site)
 
         whenever(readerUtilsWrapper.getTagFromTagName(anyOrNull(), anyOrNull())).thenReturn(mock())
 
-        whenever(readerPostTableWrapper.getBlogPost(
-                anyOrNull(),
-                anyOrNull(),
-                anyOrNull()
-        )).thenReturn(readerPost)
+        whenever(
+                readerPostTableWrapper.getBlogPost(
+                        anyOrNull(),
+                        anyOrNull(),
+                        anyOrNull()
+                )
+        ).thenReturn(readerPost)
 
         whenever(
                 postDetailsUiStateBuilder.mapPostToUiState(
@@ -115,194 +201,682 @@ class ReaderPostDetailViewModelTest {
             // propagate some of the arguments
             createDummyReaderPostDetailsUiState(
                     post,
-                    it.getArgument<(String) -> Unit>(ON_TAG_CLICKED_PARAM_POSITION),
-                    it.getArgument<(Long, Long, ReaderPostCardActionType) -> Unit>(ON_BUTTON_CLICKED_PARAM_POSITION),
-                    it.getArgument<(Long, Long) -> Unit>(ON_POST_BLOG_SECTION_CLICKED_PARAM_POSITION),
-                    it.getArgument<() -> Unit>(ON_POST_FOLLOW_BUTTON_CLICKED_PARAM_POSITION)
+                    it.getArgument(ON_TAG_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_BUTTON_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_POST_BLOG_SECTION_CLICKED_PARAM_POSITION),
+                    it.getArgument(ON_POST_FOLLOW_BUTTON_CLICKED_PARAM_POSITION)
+            )
+        }
+
+        relatedPosts = ReaderSimplePostList().apply { add(readerSimplePost) }
+
+        whenever(
+                postDetailsUiStateBuilder.mapRelatedPostsToUiState(
+                        anyOrNull(),
+                        anyOrNull(),
+                        anyOrNull(),
+                        anyOrNull()
+                )
+        ).thenAnswer {
+            // propagate some of the arguments
+            createDummyRelatedPostsUiState(
+                    it.getArgument(IS_GLOBAL_RELATED_POSTS_PARAM_POSITION),
+                    it.getArgument(ON_RELATED_POST_ITEM_CLICKED_PARAM_POSITION)
             )
         }
 
         whenever(reblogUseCase.onReblogSiteSelected(ArgumentMatchers.anyInt(), anyOrNull())).thenReturn(mock())
         whenever(reblogUseCase.convertReblogStateToNavigationEvent(anyOrNull())).thenReturn(mock<OpenEditorForReblog>())
+
+        whenever(likesEnhancementsFeatureConfig.isEnabled()).thenReturn(true)
+        whenever(getLikesHandler.snackbarEvents).thenReturn(snackbarEvents)
+        whenever(getLikesHandler.likesStatusUpdate).thenReturn(getLikesState)
+        val context = mock<Context>()
+        whenever(context.getString(anyInt(), anyInt())).thenReturn("10 bloggers like this.")
+        whenever(contextProvider.getContext()).thenReturn(context)
     }
 
+    /* SHOW POST - LOADING */
     @Test
-    fun `uiState updated on post show`() = test {
-        // Arrange + Act
-        val uiStates = init().uiStates
+    fun `when show post is triggered, then loading state is shown`() = test {
+        val observers = init(showPost = false)
+        whenever(readerGetPostUseCase.get(anyLong(), anyLong(), anyBoolean())).thenReturn(Pair(readerPost, false))
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.uiStates.first()).isEqualTo(LoadingUiState)
+    }
+
+    /* SHOW POST - GET LOCAL POST */
+    @Test
+    fun `given local post is found, when show post is triggered, then ui is updated`() = test {
+        val observers = init(showPost = false)
+        whenever(readerGetPostUseCase.get(anyLong(), anyLong(), anyBoolean())).thenReturn(Pair(readerPost, false))
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.uiStates.last()).isInstanceOf(ReaderPostDetailsUiState::class.java)
+    }
+
+    @Test
+    fun `given local post is found, when show post is triggered, then post is updated in webview`() = test {
+        val observers = init(showPost = false)
+        whenever(readerGetPostUseCase.get(anyLong(), anyLong(), anyBoolean())).thenReturn(Pair(readerPost, false))
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.navigation.last().peekContent()).isInstanceOf(ShowPostInWebView::class.java)
+    }
+
+    @Test
+    fun `given local post not found, when show post is triggered, then post is fetched from remote server`() =
+            testWithoutLocalPost {
+                init(showPost = false)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                verify(readerFetchPostUseCase).fetchPost(readerPost.blogId, readerPost.postId, false)
+            }
+
+    /* SHOW POST - FETCH SUCCESS HANDLING */
+    @Test
+    fun `given request succeeded, when post is fetched, then post details ui is updated`() = test {
+        val observers = init()
+        whenever(readerGetPostUseCase.get(any(), any(), any()))
+                .thenReturn(Pair(null, false))
+                .thenReturn(Pair(readerPost, false))
+        whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                .thenReturn(FetchReaderPostState.Success)
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        val postDetailsUiStates = observers.uiStates.filterIsInstance<ReaderPostDetailsUiState>()
+        assertThat(postDetailsUiStates.size).isEqualTo(2)
+    }
+
+    @Test
+    fun `given request succeeded, when post is fetched, then post is shown in web view`() = test {
+        val observers = init()
+        whenever(readerGetPostUseCase.get(any(), any(), any()))
+                .thenReturn(Pair(null, false))
+                .thenReturn(Pair(readerPost, false))
+        whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                .thenReturn(FetchReaderPostState.Success)
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.navigation.last().peekContent()).isInstanceOf(ShowPostInWebView::class.java)
+    }
+
+    /* SHOW POST - FETCH ERROR HANDLING */
+    @Test
+    fun `given no network, when post is fetched, then no network message is shown`() = testWithoutLocalPost {
+        val observers = init()
+        whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean())).thenReturn(Failed.NoNetwork)
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.uiStates.last()).isEqualTo(ErrorUiState(UiStringRes(R.string.no_network_message)))
+    }
+
+    @Test
+    fun `given request failed, when post is fetched, then request failed message is shown`() = testWithoutLocalPost {
+        val observers = init()
+        whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                .thenReturn(Failed.RequestFailed)
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.uiStates.last()).isEqualTo(ErrorUiState(UiStringRes(R.string.reader_err_get_post_generic)))
+    }
+
+    @Test
+    fun `given request already running, when post is fetched, then no error is shown`() =
+            testWithoutLocalPost {
+                val observers = init()
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(AlreadyRunning)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat(observers.uiStates.filterIsInstance<ErrorUiState>().last().message).isNull()
+            }
+
+    @Test
+    fun `given post not found, when post is fetched, then post not found message is shown`() = testWithoutLocalPost {
+        val observers = init()
+        whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                .thenReturn(Failed.PostNotFound)
+
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.uiStates.last())
+                .isEqualTo(ErrorUiState(UiStringRes(R.string.reader_err_get_post_not_found)))
+    }
+
+    @Test
+    fun `given unauthorised, when post is fetched, then error ui is shown`() = testWithoutLocalPost {
+        val observers = init()
+        whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                .thenReturn(Failed.PostNotFound)
 
-        // Assert
-        Assertions.assertThat(uiStates.size).isEqualTo(1)
-        Assertions.assertThat(uiStates.first()).isInstanceOf(ReaderPostDetailsUiState::class.java)
+        viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+        assertThat(observers.uiStates.last()).isInstanceOf(ErrorUiState::class.java)
     }
 
     @Test
-    fun `uiState updated when post is updated`() = test {
-        // Arrange
+    fun `given unauthorised with signin offer, when error ui shown, then sign in button is visible`() =
+            testWithoutLocalPost {
+                val observers = init(offerSignIn = true)
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(Failed.NotAuthorised)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat((observers.uiStates.last() as ErrorUiState).signInButtonVisibility).isEqualTo(true)
+            }
+
+    @Test
+    fun `given unauthorised without signin offer, when error ui shown, then sign in button is not visible`() =
+            testWithoutLocalPost {
+                val observers = init(offerSignIn = false)
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(Failed.NotAuthorised)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat((observers.uiStates.last() as ErrorUiState).signInButtonVisibility).isEqualTo(false)
+            }
+
+    @Test
+    fun `given unauthorised with no signin offer and no intercept uri, when error ui shown, then correct msg exists`() =
+            testWithoutLocalPost {
+                val observers = init(offerSignIn = false, interceptedUrPresent = false)
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(Failed.NotAuthorised)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat((observers.uiStates.last() as ErrorUiState).message)
+                        .isEqualTo(UiStringRes(R.string.reader_err_get_post_not_authorized))
+            }
+
+    @Test
+    fun `given unauthorised with no signin offer and intercept uri, when error ui shown, then correct msg exists`() =
+            testWithoutLocalPost {
+                val observers = init(offerSignIn = false, interceptedUrPresent = true)
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(Failed.NotAuthorised)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat((observers.uiStates.last() as ErrorUiState).message)
+                        .isEqualTo(UiStringRes(R.string.reader_err_get_post_not_authorized_fallback))
+            }
+
+    @Test
+    fun `given unauthorised with signin offer and no intercept uri, when error ui shown, then correct msg exists`() =
+            testWithoutLocalPost {
+                val observers = init(offerSignIn = true, interceptedUrPresent = false)
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(Failed.NotAuthorised)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat((observers.uiStates.last() as ErrorUiState).message)
+                        .isEqualTo(UiStringRes(R.string.reader_err_get_post_not_authorized_signin))
+            }
+
+    @Test
+    fun `given unauthorised with signin offer and intercept uri, when error ui shown, then correct msg exists`() =
+            testWithoutLocalPost {
+                val observers = init(offerSignIn = true, interceptedUrPresent = true)
+                whenever(readerFetchPostUseCase.fetchPost(anyLong(), anyLong(), anyBoolean()))
+                        .thenReturn(Failed.NotAuthorised)
+
+                viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
+
+                assertThat((observers.uiStates.last() as ErrorUiState).message)
+                        .isEqualTo(UiStringRes(R.string.reader_err_get_post_not_authorized_signin_fallback))
+            }
+
+    /* UPDATE POST */
+    @Test
+    fun `when post is updated, then ui is updated`() = test {
         val uiStates = init().uiStates
-        // Act
+
         viewModel.onUpdatePost(readerPost)
-        // Assert
-        Assertions.assertThat(uiStates.size).isEqualTo(2)
-        Assertions.assertThat(uiStates.last()).isInstanceOf(ReaderPostDetailsUiState::class.java)
+
+        assertThat(uiStates.filterIsInstance<ReaderPostDetailsUiState>().size).isEqualTo(2)
+    }
+
+    /* READER POST FEATURED IMAGE */
+    @Test
+    fun `when featured image is clicked, then media preview is shown`() = test {
+        val observers = init()
+
+        viewModel.onFeaturedImageClicked(blogId = readerPost.blogId, featuredImageUrl = readerPost.featuredImage)
+
+        assertThat(observers.navigation.last().peekContent()).isInstanceOf(ShowMediaPreview::class.java)
+    }
+
+    @Test
+    fun `when media preview is requested, then correct media from selected post's site is previewed`() = test {
+        val observers = init()
+
+        viewModel.onFeaturedImageClicked(blogId = readerPost.blogId, featuredImageUrl = readerPost.featuredImage)
+
+        assertThat(observers.navigation.last().peekContent() as ShowMediaPreview).isEqualTo(
+                ShowMediaPreview(site = site, featuredImage = readerPost.featuredImage)
+        )
+    }
+
+    /* MORE MENU */
+    @Test
+    fun `when more button is clicked, then more menu is shown`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        viewModel.onMoreButtonClicked()
+
+        assertThat(uiState.moreMenuItems).isNotNull
     }
 
     @Test
-    fun `When user clicks on like button postActionHandler is invoked`() = test {
-        // Arrange
+    fun `when user dismisses the menu, then more menu is not shown`() = test {
         val uiStates = init().uiStates
 
-        // Act
-        uiStates.last().actions.likeAction.onClicked!!.invoke(readerPost.postId, 200, LIKE)
-        // Assert
+        viewModel.onMoreMenuDismissed()
+
+        assertThat((uiStates.last() as ReaderPostDetailsUiState).moreMenuItems).isNull()
+    }
+
+    @Test
+    fun `when more menu list item is clicked, then corresponding action is invoked`() = test {
+        init().uiStates
+
+        viewModel.onMoreMenuItemClicked(FOLLOW)
+
+        verify(readerPostCardActionsHandler).onAction(
+                eq(readerPost),
+                eq(FOLLOW),
+                eq(false),
+                anyString()
+        )
+    }
+
+    /* HEADER */
+    @Test
+    fun `when tag is clicked, then posts for tag are shown`() = test {
+        val observers = init()
+        val uiState = (observers.uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.headerUiState.tagItems[0].onClick!!.invoke("t")
+
+        assertThat(observers.navigation.last().peekContent()).isInstanceOf(ShowPostsByTag::class.java)
+    }
+
+    @Test
+    fun `when header blog section is clicked, then selected blog's header click action is invoked`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.headerUiState.blogSectionUiState.blogSectionClickData!!.onBlogSectionClicked!!
+                .invoke(readerPost.postId, readerPost.blogId)
+
+        verify(readerPostCardActionsHandler).handleHeaderClicked(
+                eq(readerPost.blogId),
+                eq(readerPost.feedId),
+                eq(readerPost.isFollowedByCurrentUser)
+        )
+    }
+
+    @Test
+    fun `when header follow button is clicked, then follow action is invoked`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.headerUiState.followButtonUiState.onFollowButtonClicked!!.invoke()
+
+        verify(readerPostCardActionsHandler).onAction(
+                eq(readerPost),
+                eq(FOLLOW),
+                eq(false),
+                anyString()
+        )
+    }
+
+    /* EXCERPT FOOTER */
+    @Test
+    fun `when visit excerpt link is clicked, then post blog url is opened`() = test {
+        val observers = init()
+
+        viewModel.onVisitPostExcerptFooterClicked(postLink = readerPost.url)
+
+        assertThat(observers.navigation.last().peekContent()).isEqualTo(OpenUrl(url = readerPost.url))
+    }
+
+    /* RELATED POSTS */
+    @Test
+    fun `given local related posts fetch succeeds, when related posts are requested, then local related posts shown`() =
+            test {
+                val localRelatedPostsUiState = createDummyRelatedPostsUiState(isGlobal = false)
+                whenever(
+                        postDetailsUiStateBuilder.mapRelatedPostsToUiState(
+                                sourcePost = eq(readerPost),
+                                relatedPosts = eq(relatedPosts),
+                                isGlobal = eq(false),
+                                onItemClicked = any()
+                        )
+                ).thenReturn(localRelatedPostsUiState)
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(
+                                FetchRelatedPostsState.Success(
+                                        localRelatedPosts = relatedPosts,
+                                        globalRelatedPosts = ReaderSimplePostList()
+                                )
+                        )
+                val uiStates = init().uiStates
+
+                viewModel.onRelatedPostsRequested(readerPost)
+
+                val uiState = (uiStates.last() as ReaderPostDetailsUiState)
+                assertThat(uiState.localRelatedPosts).isEqualTo(localRelatedPostsUiState)
+            }
+
+    @Test
+    fun `given global related posts fetch succeeds, when related posts requested, then global related posts shown`() =
+            test {
+                val globalRelatedPostsUiState = createDummyRelatedPostsUiState(isGlobal = false)
+                whenever(
+                        postDetailsUiStateBuilder.mapRelatedPostsToUiState(
+                                sourcePost = eq(readerPost),
+                                relatedPosts = eq(relatedPosts),
+                                isGlobal = eq(true),
+                                onItemClicked = any()
+                        )
+                ).thenReturn(globalRelatedPostsUiState)
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(
+                                FetchRelatedPostsState.Success(
+                                        localRelatedPosts = ReaderSimplePostList(),
+                                        globalRelatedPosts = relatedPosts
+                                )
+                        )
+                val uiStates = init().uiStates
+
+                viewModel.onRelatedPostsRequested(readerPost)
+
+                val uiState = (uiStates.last() as ReaderPostDetailsUiState)
+                assertThat(uiState.globalRelatedPosts).isEqualTo(globalRelatedPostsUiState)
+            }
+
+    @Test
+    fun `given related posts fetch fails, when related posts are requested, then related posts are not shown`() =
+            test {
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(FetchRelatedPostsState.Failed.RequestFailed)
+                val uiStates = init().uiStates
+
+                viewModel.onRelatedPostsRequested(readerPost)
+
+                val uiState = (uiStates.last() as ReaderPostDetailsUiState)
+                with(uiState) {
+                    assertThat(localRelatedPosts).isNull()
+                    assertThat(globalRelatedPosts).isNull()
+                }
+            }
+
+    @Test
+    fun `given no network, when related posts are requested, then related posts are not shown`() =
+            test {
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(FetchRelatedPostsState.Failed.NoNetwork)
+                val uiStates = init().uiStates
+
+                viewModel.onRelatedPostsRequested(readerPost)
+
+                val uiState = (uiStates.last() as ReaderPostDetailsUiState)
+                with(uiState) {
+                    assertThat(localRelatedPosts).isNull()
+                    assertThat(globalRelatedPosts).isNull()
+                }
+            }
+
+    @Test
+    fun `given related posts fetch in progress, when related posts are requested, then related posts are not shown`() =
+            test {
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(FetchRelatedPostsState.AlreadyRunning)
+                val uiStates = init().uiStates
+
+                viewModel.onRelatedPostsRequested(readerPost)
+
+                val uiState = (uiStates.last() as ReaderPostDetailsUiState)
+                with(uiState) {
+                    assertThat(localRelatedPosts).isNull()
+                    assertThat(globalRelatedPosts).isNull()
+                }
+            }
+
+    @Test
+    fun `given wp com post, when related posts are requested, then related posts are fetched`() =
+            test {
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost)).thenReturn(mock())
+
+                viewModel.onRelatedPostsRequested(readerPost)
+
+                verify(readerFetchRelatedPostsUseCase).fetchRelatedPosts(readerPost)
+            }
+
+    @Test
+    fun `given non wp com post, when related posts are requested, then related posts are not fetched`() =
+            test {
+                val nonWpComPost = createDummyReaderPost(id = 1, isWpComPost = false)
+
+                viewModel.onRelatedPostsRequested(nonWpComPost)
+
+                verify(readerFetchRelatedPostsUseCase, times(0)).fetchRelatedPosts(readerPost)
+            }
+
+    @Test
+    fun `when related post is clicked from non related post details screen, then related post details screen shown`() =
+            test {
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(
+                                FetchRelatedPostsState.Success(
+                                        localRelatedPosts = ReaderSimplePostList(),
+                                        globalRelatedPosts = relatedPosts
+                                )
+                        )
+                val observers = init(isRelatedPost = false)
+
+                viewModel.onRelatedPostsRequested(readerPost)
+                val uiState = (observers.uiStates.last() as ReaderPostDetailsUiState)
+                val relatedPost = uiState.globalRelatedPosts?.cards?.first()
+                relatedPost?.onItemClicked?.invoke(relatedPost.postId, relatedPost.blogId, relatedPost.isGlobal)
+
+                assertThat(observers.navigation.last().peekContent()).isInstanceOf(ShowRelatedPostDetails::class.java)
+            }
+
+    @Test
+    fun `when related post is clicked from related post screen, then related post replaced with history`() =
+            test {
+                whenever(readerFetchRelatedPostsUseCase.fetchRelatedPosts(readerPost))
+                        .thenReturn(
+                                FetchRelatedPostsState.Success(
+                                        localRelatedPosts = ReaderSimplePostList(),
+                                        globalRelatedPosts = relatedPosts
+                                )
+                        )
+                val observers = init(isRelatedPost = true)
+
+                viewModel.onRelatedPostsRequested(readerPost)
+                val uiState = (observers.uiStates.last() as ReaderPostDetailsUiState)
+                val relatedPost = uiState.globalRelatedPosts?.cards?.first()
+                relatedPost?.onItemClicked?.invoke(relatedPost.postId, relatedPost.blogId, relatedPost.isGlobal)
+
+                assertThat(observers.navigation.last().peekContent())
+                        .isInstanceOf(ReplaceRelatedPostDetailsWithHistory::class.java)
+            }
+
+    /* FOOTER */
+    @Test
+    fun `when like button is clicked, then like action is invoked`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.actions.likeAction.onClicked!!.invoke(readerPost.postId, 200, LIKE)
+
         verify(readerPostCardActionsHandler).onAction(
                 eq(readerPost),
                 eq(LIKE),
                 eq(false),
-                eq(true)
+                anyString()
         )
     }
 
     @Test
-    fun `When user clicks on comments button postActionHandler is invoked`() = test {
-        // Arrange
-        val uiStates = init().uiStates
+    fun `when comments button is clicked, then comments action is invoked`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.actions.commentsAction.onClicked!!.invoke(readerPost.postId, 200, COMMENTS)
 
-        // Act
-        uiStates.last().actions.commentsAction.onClicked!!.invoke(readerPost.postId, 200, COMMENTS)
-        // Assert
         verify(readerPostCardActionsHandler).onAction(
                 eq(readerPost),
                 eq(COMMENTS),
                 eq(false),
-                eq(true)
+                anyString()
         )
     }
 
     @Test
-    fun `When user clicks on reblog button postActionHandler is invoked`() = test {
-        // Arrange
-        val uiStates = init().uiStates
+    fun `when reblog button is clicked, then reblog action is invoked`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.actions.commentsAction.onClicked!!.invoke(readerPost.postId, 200, REBLOG)
 
-        // Act
-        uiStates.last().actions.commentsAction.onClicked!!.invoke(readerPost.postId, 200, REBLOG)
-        // Assert
         verify(readerPostCardActionsHandler).onAction(
                 eq(readerPost),
                 eq(REBLOG),
                 eq(false),
-                eq(true)
+                anyString()
         )
     }
 
     @Test
-    fun `When user picks a site for reblog action the app shows the editor`() {
-        // Arrange
+    fun `when site is picked for reblog action, then editor is opened for reblog`() {
         val navigaitonObserver = init().navigation
         fakeNavigationFeed.value = Event(ShowSitePickerForResult(mock(), mock(), mock()))
-        // Act
+
         viewModel.onReblogSiteSelected(1)
-        // Assert
-        Assertions.assertThat(navigaitonObserver.last().peekContent()).isInstanceOf(OpenEditorForReblog::class.java)
+
+        assertThat(navigaitonObserver.last().peekContent()).isInstanceOf(OpenEditorForReblog::class.java)
     }
 
     @Test
-    fun `When user clicks on bookmark button postActionHandler is invoked`() = test {
-        // Arrange
-        val uiStates = init().uiStates
+    fun `when bookmark button is clicked, then bookmark action is invoked`() = test {
+        val uiState = (init().uiStates.last() as ReaderPostDetailsUiState)
+
+        uiState.actions.commentsAction.onClicked!!.invoke(readerPost.postId, 200, BOOKMARK)
 
-        // Act
-        uiStates.last().actions.commentsAction.onClicked!!.invoke(readerPost.postId, 200, BOOKMARK)
-        // Assert
         verify(readerPostCardActionsHandler).onAction(
                 eq(readerPost),
                 eq(BOOKMARK),
                 eq(false),
-                eq(true)
+                anyString()
         )
     }
 
     @Test
-    fun `When user clicks on a tag, a list of posts for that tag is shown`() = test {
-        // Arrange
-        val observers = init()
-        // Act
-        observers.uiStates.last().headerUiState.tagItems[0].onClick!!.invoke("t")
-        // Assert
-        Assertions.assertThat(observers.navigation[0].peekContent()).isInstanceOf(ShowPostsByTag::class.java)
+    fun `likes for post are refreshed on request`() = test {
+        val likesState = getGetLikesState(TEST_CONFIG_1) as LikesData
+
+        getLikesState.value = likesState
+        init()
+        viewModel.onRefreshLikersData(viewModel.post!!)
+        verify(
+                getLikesHandler,
+                times(1)
+        ).handleGetLikesForPost(anyOrNull(), anyBoolean(), anyInt(), anyInt(), eq(DONT_CARE))
     }
 
     @Test
-    fun `When user clicks on header's blog section post action handler is invoked`() = test {
-        // Arrange
-        val uiStates = init().uiStates
-        // Act
-        uiStates.last().headerUiState.blogSectionUiState.blogSectionClickData!!.onBlogSectionClicked!!
-                .invoke(readerPost.postId, readerPost.blogId)
-        // Assert
-        verify(readerPostCardActionsHandler).handleHeaderClicked(
-                eq(readerPost.blogId),
-                eq(readerPost.feedId)
-        )
+    fun `ui state show likers faces when data available`() {
+        val likesState = getGetLikesState(TEST_CONFIG_1) as LikesData
+        val likers = MutableList(5) { mock<Liker>() }
+
+        getLikesState.value = likesState
+        whenever(engagementUtils.likesToEngagedPeople(anyList(), eq(null), eq(null))).thenReturn(likers)
+        val post = mock<ReaderPost>()
+        whenever(post.isWP).thenReturn(true)
+        viewModel.post = post
+        val likeObserver = init().likesUiState
+
+        getLikesState.value = likesState
+
+        assertThat(likeObserver).isNotEmpty
+        with(likeObserver.first()) {
+            assertThat(showLikeFacesTrainContainer).isTrue
+            assertThat(showLoading).isFalse
+            assertThat(engageItemsList).isEqualTo(likers)
+            assertThat(numLikes).isEqualTo(likesState.expectedNumLikes)
+            assertThat(showEmptyState).isFalse
+            assertThat(emptyStateTitle).isNull()
+            assertThat(likersFacesText is UiStringText).isTrue
+        }
     }
 
     @Test
-    fun `When user clicks on more button menu is shown`() = test {
-        // Arrange
-        val uiStates = init().uiStates
-
-        // Act
-        viewModel.onMoreButtonClicked()
-        // Assert
-        Assertions.assertThat(uiStates.last().moreMenuItems).isNotNull
+    fun `ui state shows empty state on failure and no cached data`() {
+        val likesState = getGetLikesState(TEST_CONFIG_5) as Failure
+        val likers = listOf<Liker>()
+
+        getLikesState.value = likesState
+        whenever(engagementUtils.likesToEngagedPeople(anyList(), eq(null), eq(null))).thenReturn(likers)
+        val post = mock<ReaderPost>()
+        whenever(post.isWP).thenReturn(true)
+        viewModel.post = post
+        val likeObserver = init().likesUiState
+
+        getLikesState.value = likesState
+
+        assertThat(likeObserver).isNotEmpty
+        with(likeObserver.first()) {
+            assertThat(showLikeFacesTrainContainer).isTrue
+            assertThat(showLoading).isFalse
+            assertThat(engageItemsList).isEqualTo(likers)
+            assertThat(numLikes).isEqualTo(likesState.expectedNumLikes)
+            assertThat(showEmptyState).isTrue
+            assertThat(emptyStateTitle is UiStringRes).isTrue
+            assertThat(likersFacesText).isNull()
+        }
     }
 
     @Test
-    fun `When user dismisses the menu the ui state is updated`() = test {
-        // Arrange
-        val uiStates = init().uiStates
-        // Act
-        viewModel.onMoreMenuDismissed()
-        // Assert
-        Assertions.assertThat(uiStates.last().moreMenuItems).isNull()
-    }
+    fun `likers list is shown when like faces are clicked`() {
+        val post = mock<ReaderPost>()
+        viewModel.post = post
 
-    @Test
-    fun `When user clicks more menu list item post action handler is invoked`() = test {
-        // Arrange
-        init().uiStates
-        // Act
-        viewModel.onMoreMenuItemClicked(FOLLOW)
-        // Assert
-        verify(readerPostCardActionsHandler).onAction(
-                eq(readerPost),
-                eq(FOLLOW),
-                eq(false),
-                eq(true)
-        )
+        val navigation = init().navigation
+
+        viewModel.onLikeFacesClicked()
+
+        assertThat(navigation.last().peekContent()).isInstanceOf(ShowEngagedPeopleList::class.java)
     }
 
-    @Test
-    fun `When user clicks follow button in the header, post action handler is invoked`() = test {
-        // Arrange
-        val uiStates = init().uiStates
-        // Act
-        uiStates.last().headerUiState.followButtonUiState.onFollowButtonClicked!!.invoke()
-        // Assert
-        verify(readerPostCardActionsHandler).onAction(
-                eq(readerPost),
-                eq(FOLLOW),
-                eq(false),
-                eq(true)
-        )
+    private fun <T> testWithoutLocalPost(block: suspend CoroutineScope.() -> T) {
+        test {
+            whenever(readerGetPostUseCase.get(any(), any(), any())).thenReturn(Pair(null, false))
+            block()
+        }
     }
 
-    private fun createDummyReaderPost(id: Long): ReaderPost = ReaderPost().apply {
+    private fun createDummyReaderPost(id: Long, isWpComPost: Boolean = true): ReaderPost = ReaderPost().apply {
         this.postId = id
         this.blogId = id * 100
         this.feedId = id * 1000
         this.title = "DummyPost"
         this.featuredVideo = id.toString()
+        this.featuredImage = "/featured_image/$id/url"
+        this.isExternal = !isWpComPost
     }
 
     private fun createDummyReaderPostDetailsUiState(
@@ -315,40 +889,73 @@ class ReaderPostDetailViewModelTest {
         return ReaderPostDetailsUiState(
                 postId = post.postId,
                 blogId = post.blogId,
+                featuredImageUiState = mock(),
                 headerUiState = ReaderPostDetailsHeaderUiState(
                         UiStringText(post.title),
                         post.authorName,
                         listOf(TagUiState("", "", false, onTagClicked)),
                         true,
                         ReaderBlogSectionUiState(
-                            postId = post.postId,
-                            blogId = post.blogId,
-                            dateLine = "",
-                            blogName = mock(),
-                            blogUrl = "",
-                            avatarOrBlavatarUrl = "",
-                            blogSectionClickData = ReaderBlogSectionClickData(onBlogSectionClicked, 0)
+                                postId = post.postId,
+                                blogId = post.blogId,
+                                dateLine = "",
+                                blogName = mock(),
+                                blogUrl = "",
+                                avatarOrBlavatarUrl = "",
+                                authorAvatarUrl = "",
+                                isAuthorAvatarVisible = false,
+                                blavatarType = BLAVATAR_CIRCULAR,
+                                blogSectionClickData = ReaderBlogSectionClickData(onBlogSectionClicked, 0)
                         ),
                         FollowButtonUiState(
-                            onFollowButtonClicked = onFollowButtonClicked,
-                            isFollowed = false,
-                            isEnabled = true,
-                            isVisible = true
+                                onFollowButtonClicked = onFollowButtonClicked,
+                                isFollowed = false,
+                                isEnabled = true,
+                                isVisible = true
                         ),
                         ""
                 ),
+                excerptFooterUiState = mock(),
                 moreMenuItems = mock(),
                 actions = ReaderPostActions(
-                    bookmarkAction = PrimaryAction(true, onClicked = onButtonClicked, type = BOOKMARK),
-                    likeAction = PrimaryAction(true, onClicked = onButtonClicked, type = LIKE),
-                    reblogAction = PrimaryAction(true, onClicked = onButtonClicked, type = REBLOG),
-                    commentsAction = PrimaryAction(true, onClicked = onButtonClicked, type = COMMENTS)
+                        bookmarkAction = PrimaryAction(true, onClicked = onButtonClicked, type = BOOKMARK),
+                        likeAction = PrimaryAction(true, onClicked = onButtonClicked, type = LIKE),
+                        reblogAction = PrimaryAction(true, onClicked = onButtonClicked, type = REBLOG),
+                        commentsAction = PrimaryAction(true, onClicked = onButtonClicked, type = COMMENTS)
                 )
         )
     }
 
-    private fun init(showPost: Boolean = true): Observers {
-        val uiStates = mutableListOf<ReaderPostDetailsUiState>()
+    private fun createDummyRelatedPostsUiState(
+        isGlobal: Boolean,
+        onRelatedPostItemClicked: ((Long, Long, Boolean) -> Unit)? = null
+    ) = RelatedPostsUiState(
+            cards = relatedPosts.map {
+                ReaderRelatedPostUiState(
+                        postId = it.postId,
+                        blogId = it.siteId,
+                        isGlobal = isGlobal,
+                        title = UiStringText(""),
+                        excerpt = UiStringText(""),
+                        featuredImageUrl = "",
+                        featuredImageVisibility = false,
+                        featuredImageCornerRadius = UIDimenRes(R.dimen.reader_featured_image_corner_radius),
+                        onItemClicked = onRelatedPostItemClicked ?: mock()
+                )
+            },
+            isGlobal = isGlobal,
+            headerLabel = UiStringText(""),
+            railcarJsonStrings = emptyList()
+    )
+
+    private fun init(
+        showPost: Boolean = true,
+        isRelatedPost: Boolean = false,
+        isFeed: Boolean = false,
+        offerSignIn: Boolean = false,
+        interceptedUrPresent: Boolean = false
+    ): Observers {
+        val uiStates = mutableListOf<UiState>()
         viewModel.uiState.observeForever {
             uiStates.add(it)
         }
@@ -360,22 +967,38 @@ class ReaderPostDetailViewModelTest {
         viewModel.snackbarEvents.observeForever {
             msgs.add(it)
         }
-        viewModel.start()
+        val likesUiStates = mutableListOf<EngagedPeopleListUiState>()
+        viewModel.likesUiState.observeForever {
+            likesUiStates.add(it)
+        }
+
+        val interceptedUri = INTERCEPTED_URI.takeIf { interceptedUrPresent }
+
+        if (offerSignIn) {
+            whenever(wpUrlUtilsWrapper.isWordPressCom(interceptedUri)).thenReturn(true)
+            whenever(accountStore.hasAccessToken()).thenReturn(false)
+        } else {
+            whenever(wpUrlUtilsWrapper.isWordPressCom(interceptedUri)).thenReturn(false)
+        }
+
+        viewModel.start(isRelatedPost = isRelatedPost, isFeed = isFeed, interceptedUri = interceptedUri)
 
         if (showPost) {
-            viewModel.onShowPost(readerPost)
+            viewModel.onShowPost(blogId = readerPost.blogId, postId = readerPost.postId)
         }
 
         return Observers(
                 uiStates,
                 navigation,
-                msgs
+                msgs,
+                likesUiStates
         )
     }
 
     private data class Observers(
-        val uiStates: List<ReaderPostDetailsUiState>,
+        val uiStates: List<UiState>,
         val navigation: List<Event<ReaderNavigationEvents>>,
-        val snackbarMsgs: List<Event<SnackbarMessageHolder>>
+        val snackbarMsgs: List<Event<SnackbarMessageHolder>>,
+        val likesUiState: List<EngagedPeopleListUiState>
     )
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
index 47e5df267ef0..298cb599d384 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/SiteCreationMainVMTest.kt
@@ -72,28 +72,12 @@ class SiteCreationMainVMTest {
         clearInvocations(wizardManager)
     }
 
-    @Test
-    fun segmentSelectedResultsInNextStep() {
-        viewModel.onSegmentSelected(SEGMENT_ID)
-        verify(wizardManager).showNextStep()
-    }
-
     @Test
     fun domainSelectedResultsInNextStep() {
         viewModel.onDomainsScreenFinished(DOMAIN)
         verify(wizardManager).showNextStep()
     }
 
-    @Test
-    fun siteCreationStateUpdatedWithSelectedSegment() {
-        whenever(wizardManager.showNextStep()).then {
-            wizardManagerNavigatorLiveData.value = SiteCreationStep.DOMAINS
-            Unit
-        }
-        viewModel.onSegmentSelected(SEGMENT_ID)
-        assertThat(currentWizardState(viewModel).segmentId).isEqualTo(SEGMENT_ID)
-    }
-
     @Test
     fun siteCreationStateUpdatedWithSelectedDomain() {
         viewModel.onDomainsScreenFinished(DOMAIN)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizerTest.kt
index 129055a41aa6..43f8924142be 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainSanitizerTest.kt
@@ -36,4 +36,16 @@ class SiteCreationDomainSanitizerTest {
         val result = domainSanitizer.sanitizeDomainQuery("test_this-site.wordpress.com")
         assertEquals(result, "testthissite")
     }
+
+    @Test
+    fun `Get first domain part`() {
+        val result = domainSanitizer.getName("https://test_this-site.wordpress.com")
+        assertEquals(result, "test_this-site")
+    }
+
+    @Test
+    fun `Get second domain part`() {
+        val result = domainSanitizer.getDomain("https://test_this-site.wordpress.com")
+        assertEquals(result, ".wordpress.com")
+    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt
index 657e38288ee1..5dc8a1a8cd1d 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt
@@ -3,7 +3,9 @@ package org.wordpress.android.ui.sitecreation.domains
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.firstValue
+import com.nhaarman.mockitokotlin2.isNull
 import com.nhaarman.mockitokotlin2.lastValue
 import com.nhaarman.mockitokotlin2.secondValue
 import com.nhaarman.mockitokotlin2.thirdValue
@@ -39,7 +41,6 @@ import org.hamcrest.CoreMatchers.`is` as Is
 
 private const val MULTI_RESULT_DOMAIN_FETCH_RESULT_SIZE = 20
 private const val ERROR_RESULT_FETCH_QUERY = "error_result_query"
-private const val SEGMENT_ID = 123L
 private val MULTI_RESULT_DOMAIN_FETCH_QUERY = Pair(
         "multi_result_query",
         MULTI_RESULT_DOMAIN_FETCH_RESULT_SIZE
@@ -88,10 +89,24 @@ class SiteCreationDomainsViewModelTest {
         block: suspend CoroutineScope.() -> T
     ) {
         test {
+            whenever(mSiteCreationDomainSanitizer.getName(any())).thenReturn(
+                    "${MULTI_RESULT_DOMAIN_FETCH_QUERY.first}-1"
+            )
+            whenever(mSiteCreationDomainSanitizer.getDomain(any())).thenReturn(
+                    ".wordpress.com"
+            )
             whenever(mSiteCreationDomainSanitizer.sanitizeDomainQuery(any())).thenReturn(
                     createSanitizedDomainResult(isDomainAvailableInSuggestions)
             )
-            whenever(fetchDomainsUseCase.fetchDomains(queryResultSizePair.first, SEGMENT_ID))
+            whenever(
+                    fetchDomainsUseCase.fetchDomains(
+                            eq(queryResultSizePair.first),
+                            isNull(),
+                            eq(true),
+                            eq(true),
+                            any()
+                    )
+            )
                     .thenReturn(createSuccessfulOnSuggestedDomains(queryResultSizePair))
             block()
         }
@@ -101,7 +116,15 @@ class SiteCreationDomainsViewModelTest {
         block: suspend CoroutineScope.() -> T
     ) {
         test {
-            whenever(fetchDomainsUseCase.fetchDomains(ERROR_RESULT_FETCH_QUERY, SEGMENT_ID))
+            whenever(
+                    fetchDomainsUseCase.fetchDomains(
+                            eq(ERROR_RESULT_FETCH_QUERY),
+                            isNull(),
+                            eq(true),
+                            eq(true),
+                            any()
+                    )
+            )
                     .thenReturn(createFailedOnSuggestedDomains(ERROR_RESULT_FETCH_QUERY))
             block()
         }
@@ -112,7 +135,7 @@ class SiteCreationDomainsViewModelTest {
      */
     @Test
     fun verifyEmptyTitleQueryUiState() = testWithSuccessResponse {
-        viewModel.start(SEGMENT_ID)
+        viewModel.start()
         verifyInitialContentUiState(requireNotNull(viewModel.uiState.value), showProgress = false)
     }
 
@@ -121,7 +144,7 @@ class SiteCreationDomainsViewModelTest {
      */
     @Test
     fun verifyNonEmptyUpdateQueryInitialUiState() = testWithSuccessResponse {
-        viewModel.start(SEGMENT_ID)
+        viewModel.start()
         viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first)
         val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
         verify(uiStateObserver, times(3)).onChanged(captor.capture())
@@ -134,7 +157,7 @@ class SiteCreationDomainsViewModelTest {
     @Test
     fun verifyNonEmptyUpdateQueryUiStateAfterResponseWithEmptyResults() =
             testWithSuccessResponse(queryResultSizePair = EMPTY_RESULT_DOMAIN_FETCH_QUERY) {
-                viewModel.start(SEGMENT_ID)
+                viewModel.start()
                 viewModel.updateQuery(EMPTY_RESULT_DOMAIN_FETCH_QUERY.first)
                 val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
                 verify(uiStateObserver, times(3)).onChanged(captor.capture())
@@ -150,7 +173,7 @@ class SiteCreationDomainsViewModelTest {
     @Test
     fun verifyNonEmptyUpdateQueryUiStateAfterResponseWithMultipleResults() =
             testWithSuccessResponse {
-                viewModel.start(SEGMENT_ID)
+                viewModel.start()
                 viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first)
                 val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
                 verify(uiStateObserver, times(3)).onChanged(captor.capture())
@@ -164,7 +187,7 @@ class SiteCreationDomainsViewModelTest {
     @Test
     fun verifyDomainUnavailableUiStateAfterResponseWithMultipleResults() =
             testWithSuccessResponse(isDomainAvailableInSuggestions = false) {
-                viewModel.start(SEGMENT_ID)
+                viewModel.start()
                 viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first)
                 val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
                 verify(uiStateObserver, times(3)).onChanged(captor.capture())
@@ -178,7 +201,7 @@ class SiteCreationDomainsViewModelTest {
      */
     @Test
     fun verifyNonEmptyUpdateQueryUiStateAfterErrorResponse() = testWithErrorResponse {
-        viewModel.start(SEGMENT_ID)
+        viewModel.start()
         viewModel.updateQuery(ERROR_RESULT_FETCH_QUERY)
         val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
         verify(uiStateObserver, times(3)).onChanged(captor.capture())
@@ -199,7 +222,7 @@ class SiteCreationDomainsViewModelTest {
      */
     @Test
     fun verifyClearQueryWithEmptyTitleInitialState() = testWithSuccessResponse {
-        viewModel.start(SEGMENT_ID)
+        viewModel.start()
         viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first)
         viewModel.updateQuery("")
         val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/CreateSiteUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/CreateSiteUseCaseTest.kt
index e1ca0edea434..c78f5cf4319e 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/CreateSiteUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/CreateSiteUseCaseTest.kt
@@ -26,7 +26,8 @@ import org.wordpress.android.util.UrlUtilsWrapper
 
 private val DUMMY_SITE_DATA: SiteCreationServiceData = SiteCreationServiceData(
         123,
-        "slug"
+        "slug",
+        "domain"
 )
 private const val LANGUAGE_ID = "lang_id"
 
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
index a18514ebb84b..2cb0e65922b3 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/SitePreviewViewModelTest.kt
@@ -1,7 +1,10 @@
 package org.wordpress.android.ui.sitecreation.previews
 
+import android.os.Bundle
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
+import com.nhaarman.mockitokotlin2.eq
+import com.nhaarman.mockitokotlin2.notNull
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import kotlinx.coroutines.CoroutineScope
@@ -17,6 +20,7 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.fluxc.Dispatcher
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.QuickStartStore
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged
 import org.wordpress.android.fluxc.store.SiteStore.SiteError
@@ -40,6 +44,7 @@ import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState
 import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState.SiteCreationStep.CREATE_SITE
 import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState.SiteCreationStep.FAILURE
 import org.wordpress.android.ui.sitecreation.services.SiteCreationServiceState.SiteCreationStep.SUCCESS
+import org.wordpress.android.ui.sitecreation.theme.defaultTemplateSlug
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.UrlUtilsWrapper
 
@@ -48,7 +53,7 @@ private const val DOMAIN = ".wordpress.com"
 private const val URL = "$SUB_DOMAIN$DOMAIN"
 private const val REMOTE_SITE_ID = 1L
 private const val LOCAL_SITE_ID = 2
-private val SITE_CREATION_STATE = SiteCreationState(1, URL)
+private val SITE_CREATION_STATE = SiteCreationState(1, defaultTemplateSlug, URL)
 
 @InternalCoroutinesApi
 @ExperimentalCoroutinesApi
@@ -59,6 +64,8 @@ class SitePreviewViewModelTest {
 
     @Mock private lateinit var dispatcher: Dispatcher
     @Mock private lateinit var siteStore: SiteStore
+    @Mock private lateinit var bundle: Bundle
+    @Mock private lateinit var quickStartStore: QuickStartStore
     @Mock private lateinit var fetchWpComUseCase: FetchWpComSiteUseCase
     @Mock private lateinit var networkUtils: NetworkUtilsWrapper
     @Mock private lateinit var urlUtils: UrlUtilsWrapper
@@ -68,7 +75,6 @@ class SitePreviewViewModelTest {
     @Mock private lateinit var onHelpedClickedObserver: Observer<Unit>
     @Mock private lateinit var onCancelWizardClickedObserver: Observer<CreateSiteState>
     @Mock private lateinit var onOkClickedObserver: Observer<CreateSiteState>
-    @Mock private lateinit var hideGetStartedObserver: Observer<Unit>
     @Mock private lateinit var preloadPreviewObserver: Observer<String>
 
     private lateinit var viewModel: SitePreviewViewModel
@@ -79,6 +85,7 @@ class SitePreviewViewModelTest {
         viewModel = SitePreviewViewModel(
                 dispatcher,
                 siteStore,
+                quickStartStore,
                 fetchWpComUseCase,
                 networkUtils,
                 urlUtils,
@@ -91,7 +98,6 @@ class SitePreviewViewModelTest {
         viewModel.onHelpClicked.observeForever(onHelpedClickedObserver)
         viewModel.onCancelWizardClicked.observeForever(onCancelWizardClickedObserver)
         viewModel.onOkButtonClicked.observeForever(onOkClickedObserver)
-        viewModel.hideGetStartedBar.observeForever(hideGetStartedObserver)
         viewModel.preloadPreview.observeForever(preloadPreviewObserver)
         whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
         whenever(urlUtils.extractSubDomain(URL)).thenReturn(SUB_DOMAIN)
@@ -201,13 +207,6 @@ class SitePreviewViewModelTest {
         assertThat(viewModel.onOkButtonClicked.value).isEqualTo(SiteNotCreated)
     }
 
-    @Test
-    fun `hide GetStartedBar on UrlLoaded`() {
-        initViewModel()
-        viewModel.onUrlLoaded()
-        verify(hideGetStartedObserver).onChanged(null)
-    }
-
     @Test
     fun `show content on UrlLoaded`() {
         initViewModel()
@@ -266,8 +265,68 @@ class SitePreviewViewModelTest {
         assertThat(getCreateSiteState()).isEqualTo(SiteNotInLocalDb(REMOTE_SITE_ID))
     }
 
-    private fun initViewModel() {
-        viewModel.start(SITE_CREATION_STATE)
+    @Test
+    fun `CreateSiteState is saved into bundle`() {
+        initViewModel(null)
+
+        viewModel.writeToBundle(bundle)
+
+        verify(bundle).putParcelable(eq(KEY_CREATE_SITE_STATE), notNull())
+    }
+
+    @Test
+    fun `show fullscreen progress when restoring from SiteNotCreated state`() = testWithSuccessResponse {
+        whenever(bundle.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE)).thenReturn(SiteNotCreated)
+        initViewModel(bundle)
+
+        assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewFullscreenProgressUiState::class.java)
+    }
+
+    @Test
+    fun `service started when restoring from SiteNotCreated state`() {
+        whenever(bundle.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE)).thenReturn(SiteNotCreated)
+        initViewModel(bundle)
+
+        assertThat(viewModel.startCreateSiteService.value).isNotNull
+    }
+
+    @Test
+    fun `show fullscreen progress when restoring from SiteNotInLocalDb state`() = testWithSuccessResponse {
+        whenever(bundle.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE)).thenReturn(SiteNotCreated)
+        initViewModel(bundle)
+
+        assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewFullscreenProgressUiState::class.java)
+    }
+
+    @Test
+    fun `start pre-loading WebView when restoring from SiteNotInLocalDb state`() = testWithSuccessResponse {
+        whenever(bundle.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE))
+                .thenReturn(SiteNotInLocalDb(REMOTE_SITE_ID))
+        initViewModel(bundle)
+
+        assertThat(viewModel.uiState.value).isInstanceOf(SitePreviewFullscreenProgressUiState::class.java)
+    }
+
+    @Test
+    fun `fetch newly created SiteModel when restoring from SiteNotInLocalDb state`() = testWithSuccessResponse {
+        whenever(bundle.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE))
+                .thenReturn(SiteNotInLocalDb(REMOTE_SITE_ID))
+        initViewModel(bundle)
+
+        verify(fetchWpComUseCase).fetchSiteWithRetry(REMOTE_SITE_ID)
+    }
+
+    @Test
+    fun `start pre-loading WebView when restoring from SiteCreationCompleted state`() {
+        whenever(bundle.getParcelable<CreateSiteState>(KEY_CREATE_SITE_STATE))
+                .thenReturn(SiteCreationCompleted(LOCAL_SITE_ID))
+        initViewModel(bundle)
+
+        assertThat(viewModel.preloadPreview.value).isEqualTo(URL)
+    }
+
+    private fun initViewModel(savedState: Bundle? = null) {
+        viewModel.start(SITE_CREATION_STATE, savedState)
     }
 
     private fun createServiceFailureState(): SiteCreationServiceState {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsViewModelTest.kt
deleted file mode 100644
index 03a10acafbd0..000000000000
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/segments/SiteCreationSegmentsViewModelTest.kt
+++ /dev/null
@@ -1,273 +0,0 @@
-package org.wordpress.android.ui.sitecreation.segments
-
-import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.Observer
-import com.nhaarman.mockitokotlin2.anyOrNull
-import com.nhaarman.mockitokotlin2.inOrder
-import com.nhaarman.mockitokotlin2.whenever
-import junit.framework.Assert.assertFalse
-import junit.framework.Assert.assertNull
-import junit.framework.Assert.assertTrue
-import kotlinx.coroutines.InternalCoroutinesApi
-import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.MatcherAssert.assertThat
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.Mock
-import org.mockito.junit.MockitoJUnitRunner
-import org.wordpress.android.TEST_DISPATCHER
-import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.model.vertical.VerticalSegmentModel
-import org.wordpress.android.fluxc.store.VerticalStore.FetchSegmentsError
-import org.wordpress.android.fluxc.store.VerticalStore.OnSegmentsFetched
-import org.wordpress.android.fluxc.store.VerticalStore.VerticalErrorType.GENERIC_ERROR
-import org.wordpress.android.test
-import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.HeaderUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.ProgressUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsItemUiState.SegmentUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsContentUiState
-import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsErrorUiState
-import org.wordpress.android.ui.sitecreation.usecases.FetchSegmentsUseCase
-import org.wordpress.android.util.NetworkUtilsWrapper
-
-private const val FIRST_MODEL_TITLE = "first_title"
-private const val FIRST_MODEL_SUBTITLE = "first_subtitle"
-private const val FIRST_MODEL_ICON_URL = "http://first_url.com"
-private const val FIRST_MODEL_ICON_COLOR = "first_icon_color"
-private const val FIRST_MODEL_SEGMENT_ID = 1L
-private const val FIRST_MODEL_IS_MOBILE_SEGMENT = true
-
-private const val SECOND_MODEL_TITLE = "second_title"
-private const val SECOND_MODEL_SUBTITLE = "second_subtitle"
-private const val SECOND_MODEL_ICON_URL = "http://second_url.com"
-private const val SECOND_MODEL_ICON_COLOR = "second_icon_color"
-private const val SECOND_MODEL_SEGMENT_ID = 2L
-private const val SECOND_MODEL_IS_MOBILE_SEGMENT = true
-
-private const val THIRD_MODEL_TITLE = "third_title"
-private const val THIRD_MODEL_SUBTITLE = "third_subtitle"
-private const val THIRD_MODEL_ICON_URL = "http://third_url.com"
-private const val THIRD_MODEL_ICON_COLOR = "third_icon_color"
-private const val THIRD_MODEL_SEGMENT_ID = 3L
-private const val THIRD_MODEL_IS_MOBILE_SEGMENT = false
-
-private const val ERROR_MESSAGE = "dummy_error_message"
-
-private val FIRST_MODEL =
-        VerticalSegmentModel(
-                title = FIRST_MODEL_TITLE,
-                subtitle = FIRST_MODEL_SUBTITLE,
-                iconUrl = FIRST_MODEL_ICON_URL,
-                iconColor = FIRST_MODEL_ICON_COLOR,
-                segmentId = FIRST_MODEL_SEGMENT_ID,
-                isMobileSegment = FIRST_MODEL_IS_MOBILE_SEGMENT
-        )
-
-private val SECOND_MODEL =
-        VerticalSegmentModel(
-                title = SECOND_MODEL_TITLE,
-                subtitle = SECOND_MODEL_SUBTITLE,
-                iconUrl = SECOND_MODEL_ICON_URL,
-                iconColor = SECOND_MODEL_ICON_COLOR,
-                segmentId = SECOND_MODEL_SEGMENT_ID,
-                isMobileSegment = SECOND_MODEL_IS_MOBILE_SEGMENT
-        )
-
-private val THIRD_MODEL =
-        VerticalSegmentModel(
-                title = THIRD_MODEL_TITLE,
-                subtitle = THIRD_MODEL_SUBTITLE,
-                iconUrl = THIRD_MODEL_ICON_URL,
-                iconColor = THIRD_MODEL_ICON_COLOR,
-                segmentId = THIRD_MODEL_SEGMENT_ID,
-                isMobileSegment = THIRD_MODEL_IS_MOBILE_SEGMENT
-        )
-
-private val PROGRESS_STATE = SegmentsContentUiState(listOf(HeaderUiState, ProgressUiState))
-private val HEADER_AND_FIRST_ITEM_STATE = SegmentsContentUiState(
-        listOf(
-                HeaderUiState,
-                SegmentUiState(
-                        FIRST_MODEL.segmentId,
-                        FIRST_MODEL.title,
-                        FIRST_MODEL.subtitle,
-                        FIRST_MODEL.iconUrl,
-                        FIRST_MODEL_ICON_COLOR,
-                        false
-                )
-        )
-)
-private val HEADER_AND_SECOND_ITEM_STATE = SegmentsContentUiState(
-        listOf(
-                HeaderUiState,
-                SegmentUiState(
-                        SECOND_MODEL.segmentId,
-                        SECOND_MODEL.title,
-                        SECOND_MODEL.subtitle,
-                        SECOND_MODEL.iconUrl,
-                        SECOND_MODEL.iconColor,
-                        false
-                )
-        )
-)
-
-private val FIRST_MODEL_EVENT = OnSegmentsFetched(listOf(FIRST_MODEL))
-private val SECOND_MODEL_EVENT = OnSegmentsFetched(listOf(SECOND_MODEL))
-private val FIRST_AND_SECOND_MODEL_EVENT = OnSegmentsFetched(listOf(FIRST_MODEL, SECOND_MODEL))
-private val FIRST_SECOND_AND_THIRD_MODEL_EVENT = OnSegmentsFetched(listOf(FIRST_MODEL, SECOND_MODEL, THIRD_MODEL))
-private val ERROR_EVENT = OnSegmentsFetched(emptyList(), FetchSegmentsError(GENERIC_ERROR, ERROR_MESSAGE))
-
-@InternalCoroutinesApi
-@RunWith(MockitoJUnitRunner::class)
-class SiteCreationSegmentsViewModelTest {
-    @Rule
-    @JvmField val rule = InstantTaskExecutorRule()
-
-    @Mock lateinit var dispatcher: Dispatcher
-    @Mock lateinit var fetchSegmentsUseCase: FetchSegmentsUseCase
-    @Mock lateinit var networkUtils: NetworkUtilsWrapper
-
-    private lateinit var viewModel: SiteCreationSegmentsViewModel
-
-    @Mock private lateinit var tracker: SiteCreationTracker
-    @Mock private lateinit var uiStateObserver: Observer<SegmentsUiState>
-    @Mock private lateinit var segmentSelectedObserver: Observer<Long>
-    @Mock private lateinit var onHelpClickedObserver: Observer<Unit>
-
-    @Before
-    fun setUp() {
-        viewModel = SiteCreationSegmentsViewModel(
-                networkUtils,
-                dispatcher,
-                fetchSegmentsUseCase,
-                tracker,
-                TEST_DISPATCHER,
-                TEST_DISPATCHER
-        )
-        viewModel.segmentsUiState.observeForever(uiStateObserver)
-        viewModel.segmentSelected.observeForever(segmentSelectedObserver)
-        viewModel.onHelpClicked.observeForever(onHelpClickedObserver)
-        whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
-    }
-
-    @Test
-    fun onStartFetchesCategories() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(FIRST_MODEL_EVENT)
-        viewModel.start()
-
-        assertTrue(viewModel.segmentsUiState.value!! == HEADER_AND_FIRST_ITEM_STATE)
-    }
-
-    @Test
-    fun onlyMobileSegmentsAreShown() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(FIRST_SECOND_AND_THIRD_MODEL_EVENT)
-        viewModel.start()
-
-        // Find the segment items
-        val items = (viewModel.segmentsUiState.value!! as SegmentsContentUiState).items
-        val segmentUiStates = items.mapNotNull { it as? SegmentUiState }
-
-        // Verify that there are only 2 segments items and third segment is filtered out since it's not a mobile segment
-        assertThat(segmentUiStates.size, `is`(2))
-        assertNull(segmentUiStates.find { it.segmentId == THIRD_MODEL_SEGMENT_ID })
-    }
-
-    @Test
-    fun onRetryFetchesCategories() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(FIRST_MODEL_EVENT)
-        viewModel.start()
-
-        assertTrue(viewModel.segmentsUiState.value!! == HEADER_AND_FIRST_ITEM_STATE)
-
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(SECOND_MODEL_EVENT)
-        viewModel.onRetryClicked()
-
-        assertTrue(viewModel.segmentsUiState.value!! == HEADER_AND_SECOND_ITEM_STATE)
-    }
-
-    @Test
-    fun fetchCategoriesChangesStateToProgress() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(FIRST_MODEL_EVENT)
-        viewModel.start()
-
-        inOrder(uiStateObserver).apply {
-            verify(uiStateObserver).onChanged(PROGRESS_STATE)
-            verify(uiStateObserver).onChanged(HEADER_AND_FIRST_ITEM_STATE)
-            verifyNoMoreInteractions()
-        }
-    }
-
-    @Test
-    fun onErrorEventChangesStateToError() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(ERROR_EVENT)
-        viewModel.start()
-
-        inOrder(uiStateObserver).apply {
-            verify(uiStateObserver).onChanged(PROGRESS_STATE)
-            verify(uiStateObserver).onChanged(SegmentsErrorUiState.SegmentsGenericErrorUiState)
-            verifyNoMoreInteractions()
-        }
-    }
-
-    @Test
-    fun onSuccessfulRetryRemovesErrorState() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(ERROR_EVENT)
-        viewModel.start()
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(SECOND_MODEL_EVENT)
-        viewModel.onRetryClicked()
-
-        inOrder(uiStateObserver).apply {
-            verify(uiStateObserver).onChanged(PROGRESS_STATE)
-            verify(uiStateObserver).onChanged(SegmentsErrorUiState.SegmentsGenericErrorUiState)
-            verify(uiStateObserver).onChanged(PROGRESS_STATE)
-            verify(uiStateObserver).onChanged(HEADER_AND_SECOND_ITEM_STATE)
-            verifyNoMoreInteractions()
-        }
-    }
-
-    @Test
-    fun verifyLastItemDoesNotShowDivider() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(FIRST_AND_SECOND_MODEL_EVENT)
-        viewModel.start()
-
-        val items = (viewModel.segmentsUiState.value!! as SegmentsContentUiState).items
-        assertFalse((items[items.size - 1] as SegmentUiState).showDivider)
-    }
-
-    @Test
-    fun verifyOnSegmentSelectedIsPropagated() = test {
-        whenever(fetchSegmentsUseCase.fetchCategories()).thenReturn(FIRST_MODEL_EVENT)
-        viewModel.start()
-        ((viewModel.segmentsUiState.value!! as SegmentsContentUiState).items[1] as SegmentUiState)
-                .onItemTapped!!.invoke()
-
-        inOrder(segmentSelectedObserver).apply {
-            verify(segmentSelectedObserver).onChanged(FIRST_MODEL_SEGMENT_ID)
-            verifyNoMoreInteractions()
-        }
-    }
-
-    @Test
-    fun verifyNoConnectionErrorShown() = test {
-        whenever(networkUtils.isNetworkAvailable()).thenReturn(false)
-        viewModel.start()
-
-        inOrder(uiStateObserver).apply {
-            verify(uiStateObserver).onChanged(PROGRESS_STATE)
-            verify(uiStateObserver).onChanged(SegmentsErrorUiState.SegmentsConnectionErrorUiState)
-            verifyNoMoreInteractions()
-        }
-    }
-
-    @Test
-    fun verifyOnHelpClickedPropagated() = test {
-        viewModel.onHelpClicked()
-        inOrder(onHelpClickedObserver).apply {
-            verify(onHelpClickedObserver).onChanged(anyOrNull())
-            verifyNoMoreInteractions()
-        }
-    }
-}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManagerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManagerTest.kt
index 32bb8708c83d..ef44fdb15dfd 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManagerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManagerTest.kt
@@ -33,7 +33,8 @@ private const val NEW_SITE_REMOTE_ID = 1234L
 
 private val DUMMY_SITE_DATA: SiteCreationServiceData = SiteCreationServiceData(
         123,
-        "slug"
+        "slug",
+        "domain"
 )
 
 private val IDLE_STATE = SiteCreationServiceState(IDLE)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt
index 509a967abbcd..d8406d78ff5f 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/FetchHomePageLayoutsUseCaseTest.kt
@@ -19,6 +19,7 @@ import org.wordpress.android.fluxc.store.SiteStore.SuggestDomainsPayload
 import org.wordpress.android.fluxc.store.ThemeStore
 import org.wordpress.android.fluxc.store.ThemeStore.OnStarterDesignsFetched
 import org.wordpress.android.test
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 
 @RunWith(MockitoJUnitRunner::class)
@@ -32,7 +33,7 @@ class FetchHomePageLayoutsUseCaseTest {
 
     private lateinit var useCase: FetchHomePageLayoutsUseCase
     private lateinit var dispatchCaptor: KArgumentCaptor<Action<SuggestDomainsPayload>>
-    private val event = OnStarterDesignsFetched(emptyList(), null)
+    private val event = OnStarterDesignsFetched(emptyList(), emptyList(), null)
 
     @Before
     fun setUp() {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
index 70206f350bf6..9e04ab123809 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/theme/HomePagePickerViewModelTest.kt
@@ -15,16 +15,26 @@ import org.mockito.ArgumentCaptor
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.model.StarterDesignModel
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesign
+import org.wordpress.android.fluxc.network.rest.wpcom.theme.StarterDesignCategory
 import org.wordpress.android.fluxc.store.ThemeStore.OnStarterDesignsFetched
 import org.wordpress.android.fluxc.store.ThemeStore.ThemeErrorType
 import org.wordpress.android.fluxc.store.ThemeStore.ThemesError
 import org.wordpress.android.test
-import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel.UiState
+import org.wordpress.android.ui.PreviewMode
+import org.wordpress.android.ui.sitecreation.misc.SiteCreationTracker
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction
+import org.wordpress.android.ui.layoutpicker.LayoutPickerViewModel.DesignPreviewAction.Show
+import org.wordpress.android.ui.sitecreation.theme.HomePagePickerViewModel.DesignSelectionAction
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState
 import org.wordpress.android.ui.sitecreation.usecases.FetchHomePageLayoutsUseCase
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.NoDelayCoroutineDispatcher
 
+private const val mockedDesignSlug = "mockedDesignSlug"
+private const val mockedDesignSegmentId = 1L
+private const val mockedDesignDemoUrl = "mockedDemoUrl"
+
 @RunWith(MockitoJUnitRunner::class)
 class HomePagePickerViewModelTest {
     @Rule
@@ -33,47 +43,80 @@ class HomePagePickerViewModelTest {
     @Mock lateinit var dispatcher: Dispatcher
     @Mock lateinit var networkUtils: NetworkUtilsWrapper
     @Mock lateinit var fetchHomePageLayoutsUseCase: FetchHomePageLayoutsUseCase
-    @Mock lateinit var uiStateObserver: Observer<UiState>
+    @Mock lateinit var uiStateObserver: Observer<LayoutPickerUiState>
+    @Mock lateinit var onDesignActionObserver: Observer<DesignSelectionAction>
+    @Mock lateinit var onPreviewActionObserver: Observer<DesignPreviewAction>
+    @Mock lateinit var previewModeObserver: Observer<PreviewMode>
+    @Mock lateinit var analyticsTracker: SiteCreationTracker
 
     private lateinit var viewModel: HomePagePickerViewModel
 
+    val mockCategory = StarterDesignCategory(
+            slug = "about",
+            title = "About",
+            description = "About pages",
+            emoji = "👋"
+    )
+
     @Before
     fun setUp() {
         viewModel = HomePagePickerViewModel(
                 networkUtils,
                 dispatcher,
                 fetchHomePageLayoutsUseCase,
+                analyticsTracker,
                 NoDelayCoroutineDispatcher(),
                 NoDelayCoroutineDispatcher()
         )
         viewModel.uiState.observeForever(uiStateObserver)
+        viewModel.onDesignActionPressed.observeForever(onDesignActionObserver)
+        viewModel.onPreviewActionPressed.observeForever(onPreviewActionObserver)
+        viewModel.previewMode.observeForever(previewModeObserver)
     }
 
     private fun <T> mockResponse(isError: Boolean = false, block: suspend CoroutineScope.() -> T) = test {
-        val response = if (isError) OnStarterDesignsFetched(emptyList(), ThemesError(ThemeErrorType.GENERIC_ERROR))
+        val response = if (isError) OnStarterDesignsFetched(
+                emptyList(),
+                emptyList(),
+                ThemesError(ThemeErrorType.GENERIC_ERROR)
+        )
         else OnStarterDesignsFetched(
-                listOf(StarterDesignModel(0, "slug", "title", "site", "demo", "theme", "image")),
+                listOf(
+                        StarterDesign(
+                                mockedDesignSlug,
+                                "title",
+                                mockedDesignSegmentId,
+                                listOf(mockCategory),
+                                mockedDesignDemoUrl,
+                                "theme",
+                                "desktopThumbnail",
+                                "tabletThumbnail",
+                                "mobileThumbnail"
+                        )
+                ),
+                listOf(mockCategory),
                 null
         )
         whenever(fetchHomePageLayoutsUseCase.fetchStarterDesigns()).thenReturn(response)
+        whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
         block()
     }
 
     @Test
     fun `when the picker starts the content is loaded`() = mockResponse {
         viewModel.start()
-        val captor = ArgumentCaptor.forClass(UiState::class.java)
-        verify(uiStateObserver, times(2)).onChanged(captor.capture())
-        assertThat(captor.value is UiState.Content)
-        assertThat((captor.value as UiState.Content).layouts.size).isGreaterThan(0)
+        val captor = ArgumentCaptor.forClass(LayoutPickerUiState::class.java)
+        verify(uiStateObserver, times(3)).onChanged(captor.capture())
+        assertThat(captor.value is LayoutPickerUiState.Content)
+        assertThat((captor.value as LayoutPickerUiState.Content).layoutCategories.size).isGreaterThan(0)
     }
 
     @Test
     fun `when the picker starts fetch errors are handled`() = mockResponse(isError = true) {
         viewModel.start()
-        val captor = ArgumentCaptor.forClass(UiState::class.java)
+        val captor = ArgumentCaptor.forClass(LayoutPickerUiState::class.java)
         verify(uiStateObserver, times(2)).onChanged(captor.capture())
-        assertThat(captor.value is UiState.Error)
+        assertThat(captor.value is LayoutPickerUiState.Error)
     }
 
     @Test
@@ -93,31 +136,32 @@ class HomePagePickerViewModelTest {
     @Test
     fun `when the picker starts no layout is selected`() = mockResponse {
         viewModel.start()
-        assertThat(requireNotNull(viewModel.uiState.value as UiState.Content).selectedLayoutSlug).isNull()
+        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
     }
 
     @Test
     fun `when the user taps on a layout the layout is selected if the thumbnail has loaded`() = mockResponse {
         viewModel.start()
-        viewModel.onThumbnailReady("slug")
-        viewModel.onLayoutTapped("slug")
-        assertThat(requireNotNull(viewModel.uiState.value as UiState.Content).selectedLayoutSlug).isEqualTo("slug")
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug)
+                .isEqualTo(mockedDesignSlug)
     }
 
     @Test
     fun `when the user taps on a layout the layout is not selected if the thumbnail has not loaded`() = mockResponse {
         viewModel.start()
-        viewModel.onLayoutTapped("slug")
-        assertThat(requireNotNull(viewModel.uiState.value as UiState.Content).selectedLayoutSlug).isNull()
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
     }
 
     @Test
     fun `when the user taps on a selected layout the layout is deselected`() = mockResponse {
         viewModel.start()
-        viewModel.onThumbnailReady("slug")
-        viewModel.onLayoutTapped("slug")
-        viewModel.onLayoutTapped("slug")
-        assertThat(requireNotNull(viewModel.uiState.value as UiState.Content).selectedLayoutSlug).isNull()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        assertThat(requireNotNull(viewModel.uiState.value as LayoutPickerUiState.Content).selectedLayoutSlug).isNull()
     }
 
     @Test
@@ -127,10 +171,67 @@ class HomePagePickerViewModelTest {
     }
 
     @Test
-    fun `when the user selects a layout the toolbar is shown`() = mockResponse {
+    fun `when the user selects a design the toolbar is shown`() = mockResponse {
         viewModel.start()
-        viewModel.onThumbnailReady("slug")
-        viewModel.onLayoutTapped("slug")
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
         assertThat(viewModel.uiState.value?.isToolbarVisible).isEqualTo(true)
     }
+
+    @Test
+    fun `when the user presses skip the default design is selected`() = mockResponse {
+        viewModel.start()
+        viewModel.onSkippedTapped()
+        val captor = ArgumentCaptor.forClass(DesignSelectionAction::class.java)
+        verify(onDesignActionObserver).onChanged(captor.capture())
+        assertThat(captor.value.template).isEqualTo(defaultTemplateSlug)
+    }
+
+    @Test
+    fun `when the user chooses a design the design info is passed to the next step`() = mockResponse {
+        viewModel.start()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        viewModel.onChooseTapped()
+        val captor = ArgumentCaptor.forClass(DesignSelectionAction::class.java)
+        verify(onDesignActionObserver).onChanged(captor.capture())
+        assertThat(captor.value.template).isEqualTo(mockedDesignSlug)
+    }
+
+    @Test
+    fun `when the user selects a design and presses preview the preview flow is triggered`() = mockResponse {
+        viewModel.start()
+        viewModel.onThumbnailReady(mockedDesignSlug)
+        viewModel.onLayoutTapped(mockedDesignSlug)
+        viewModel.onPreviewTapped()
+        val captor = ArgumentCaptor.forClass(DesignPreviewAction::class.java)
+        verify(onPreviewActionObserver).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value as Show).template).isEqualTo(mockedDesignSlug)
+        assertThat(requireNotNull(captor.value as Show).demoUrl).isEqualTo(mockedDesignDemoUrl)
+    }
+
+    @Test
+    fun `when the picker starts on a phone the mobile thumbnails or preview load by default`() = mockResponse {
+        viewModel.start(isTablet = false)
+        val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
+        verify(previewModeObserver).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value as PreviewMode)).isEqualTo(PreviewMode.MOBILE)
+    }
+
+    @Test
+    fun `when the picker starts on a tablet the tablet thumbnails or preview load by default`() = mockResponse {
+        viewModel.start(isTablet = true)
+        val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
+        verify(previewModeObserver).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value as PreviewMode)).isEqualTo(PreviewMode.TABLET)
+    }
+
+    @Test
+    fun `when the changes the preview mode the thumbnails or preview change`() = mockResponse {
+        viewModel.start()
+        viewModel.onPreviewModeChanged(PreviewMode.DESKTOP)
+        val captor = ArgumentCaptor.forClass(PreviewMode::class.java)
+        verify(previewModeObserver, times(2)).onChanged(captor.capture())
+        assertThat(requireNotNull(captor.value as PreviewMode)).isEqualTo(PreviewMode.DESKTOP)
+    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt
index 78b8c0b00833..e4ae32c74660 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/OverviewUseCaseTest.kt
@@ -1,7 +1,9 @@
 package org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases
 
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.isNull
+import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
@@ -14,6 +16,7 @@ import org.mockito.Mock
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.R
 import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.analytics.AnalyticsTracker.Stat.STATS_OVERVIEW_ERROR
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.stats.LimitMode
 import org.wordpress.android.fluxc.model.stats.LimitMode.Top
@@ -35,8 +38,10 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDa
 import org.wordpress.android.ui.stats.refresh.lists.widget.WidgetUpdater.StatsWidgetUpdaters
 import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.StatsSiteProvider
+import org.wordpress.android.util.LocaleManagerWrapper
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.viewmodel.ResourceProvider
+import java.util.Calendar
 
 class OverviewUseCaseTest : BaseUnitTest() {
     @Mock lateinit var store: VisitsAndViewsStore
@@ -50,6 +55,7 @@ class OverviewUseCaseTest : BaseUnitTest() {
     @Mock lateinit var barChartItem: BarChartItem
     @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
     @Mock lateinit var statsWidgetUpdaters: StatsWidgetUpdaters
+    @Mock lateinit var localeManagerWrapper: LocaleManagerWrapper
     private lateinit var useCase: OverviewUseCase
     private val site = SiteModel()
     private val siteId = 1L
@@ -58,6 +64,7 @@ class OverviewUseCaseTest : BaseUnitTest() {
     private val limitMode = Top(15)
     private val statsGranularity = DAYS
     private val model = VisitsAndViewsModel(modelPeriod, listOf(periodData))
+
     @InternalCoroutinesApi
     @Before
     fun setUp() {
@@ -72,6 +79,7 @@ class OverviewUseCaseTest : BaseUnitTest() {
                 TEST_DISPATCHER,
                 analyticsTrackerWrapper,
                 statsWidgetUpdaters,
+                localeManagerWrapper,
                 resourceProvider
         )
         site.siteId = siteId
@@ -85,6 +93,7 @@ class OverviewUseCaseTest : BaseUnitTest() {
     @Test
     fun `maps domain model to UI model`() = test {
         val forced = false
+        setupCalendar()
         whenever(store.getVisits(site, statsGranularity, LimitMode.All)).thenReturn(model)
         whenever(store.fetchVisits(site, statsGranularity, limitMode, forced)).thenReturn(
                 OnStatsFetched(
@@ -119,6 +128,66 @@ class OverviewUseCaseTest : BaseUnitTest() {
         assertThat(result.state).isEqualTo(UseCaseState.ERROR)
     }
 
+    @Test
+    fun `does not track incorrect data when the last stats item is less than 2 days old`() = test {
+        val forced = false
+        setupCalendar(1)
+        whenever(store.fetchVisits(site, statsGranularity, limitMode, forced)).thenReturn(
+                OnStatsFetched(
+                        model
+                )
+        )
+
+        loadData(true, forced)
+
+        verify(analyticsTrackerWrapper, never()).track(eq(STATS_OVERVIEW_ERROR), any<Map<String, *>>())
+    }
+
+    @Test
+    fun `tracks incorrect data when the last stats item is at least 2 days old`() = test {
+        val forced = false
+        setupCalendar(2)
+        whenever(store.fetchVisits(site, statsGranularity, limitMode, forced)).thenReturn(
+                OnStatsFetched(
+                        model
+                )
+        )
+
+        loadData(true, forced)
+
+        verify(analyticsTrackerWrapper).track(
+                STATS_OVERVIEW_ERROR, mapOf(
+                "stats_last_date" to "2020-12-13",
+                "stats_current_date" to "2020-12-15",
+                "stats_age_in_days" to 2,
+                "is_jetpack_connected" to false,
+                "is_atomic" to false,
+                "action_source" to "remote"
+        )
+        )
+    }
+
+    private fun setupCalendar(ageOfLastStatsItemInDays: Int = 0) {
+        val today = Calendar.getInstance()
+        today.set(Calendar.YEAR, 2020)
+        today.set(Calendar.MONTH, 11)
+        val todayDay = 15
+        today.set(Calendar.DAY_OF_MONTH, todayDay)
+        today.set(Calendar.HOUR_OF_DAY, 20)
+        val lastItemAge = Calendar.getInstance()
+        lastItemAge.time = today.time
+        val lastItemDay = todayDay - ageOfLastStatsItemInDays
+        lastItemAge.set(Calendar.DAY_OF_MONTH, lastItemDay)
+        lastItemAge.set(Calendar.HOUR_OF_DAY, 22)
+        whenever(localeManagerWrapper.getCurrentCalendar()).then {
+                Calendar.getInstance()
+                        .apply { this.time = today.time }
+        }
+        whenever(statsDateFormatter.parseStatsDate(any(), any())).thenReturn(lastItemAge.time)
+        whenever(statsDateFormatter.printStatsDate(lastItemAge.time)).thenReturn("2020-12-$lastItemDay")
+        whenever(statsDateFormatter.printStatsDate(today.time)).thenReturn("2020-12-$todayDay")
+    }
+
     private suspend fun loadData(refresh: Boolean, forced: Boolean): UseCaseModel {
         var result: UseCaseModel? = null
         useCase.liveData.observeForever { result = it }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCaseTest.kt
index 6b0c9543abbe..581c705a9fca 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stats/refresh/lists/sections/insights/usecases/FollowerTotalsUseCaseTest.kt
@@ -101,7 +101,7 @@ class FollowerTotalsUseCaseTest : BaseUnitTest() {
 
     private fun assertItem(item: ListItemWithIcon) {
         when (item.icon) {
-            R.drawable.ic_my_sites_white_24dp -> {
+            R.drawable.ic_wordpress_white_24dp -> {
                 assertThat(item.value).isEqualTo(3.toString())
             }
             R.drawable.ic_mail_white_24dp -> {
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCaseTest.kt
index aca40497d5f3..4df7db585eab 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/SaveStoryGutenbergBlockUseCaseTest.kt
@@ -17,12 +17,15 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.fluxc.model.PostModel
+import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.store.PostStore
 import org.wordpress.android.ui.posts.EditPostRepository
 import org.wordpress.android.ui.posts.mediauploadcompletionprocessors.TestContent
 import org.wordpress.android.ui.stories.SaveStoryGutenbergBlockUseCase.Companion.TEMPORARY_ID_PREFIX
+import org.wordpress.android.ui.stories.SaveStoryGutenbergBlockUseCase.DoWithMediaFilesListener
 import org.wordpress.android.ui.stories.SaveStoryGutenbergBlockUseCase.StoryMediaFileData
 import org.wordpress.android.ui.stories.prefs.StoriesPrefs
+import org.wordpress.android.util.CrashLogging
 import org.wordpress.android.util.helpers.MediaFile
 
 @RunWith(MockitoJUnitRunner::class)
@@ -30,6 +33,7 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
     private lateinit var saveStoryGutenbergBlockUseCase: SaveStoryGutenbergBlockUseCase
     private lateinit var editPostRepository: EditPostRepository
     @Mock lateinit var storiesPrefs: StoriesPrefs
+    @Mock lateinit var crashLogging: CrashLogging
     @Mock lateinit var context: Context
     @Mock lateinit var postStore: PostStore
     @Mock lateinit var mediaFile: MediaFile
@@ -38,7 +42,7 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
     @InternalCoroutinesApi
     @Before
     fun setUp() {
-        saveStoryGutenbergBlockUseCase = SaveStoryGutenbergBlockUseCase(storiesPrefs)
+        saveStoryGutenbergBlockUseCase = SaveStoryGutenbergBlockUseCase(storiesPrefs, crashLogging)
         editPostRepository = EditPostRepository(
                 mock(),
                 postStore,
@@ -138,10 +142,12 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
         val mediaFile = getMediaFile(1)
         val postModel = PostModel()
         postModel.setContent(BLOCK_WITH_NON_EMPTY_MEDIA_FILES)
+        val siteModel = SiteModel()
 
         // When
         saveStoryGutenbergBlockUseCase.replaceLocalMediaIdsWithRemoteMediaIdsInPost(
                 postModel,
+                siteModel,
                 mediaFile
         )
 
@@ -176,9 +182,10 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
         whenever(mediaFile.fileURL).thenReturn(TestContent.remoteImageUrl)
         val postModel = PostModel()
         postModel.setContent(TestContent.storyBlockWithLocalIdsAndUrls)
+        val siteModel = SiteModel()
 
         // act
-        saveStoryGutenbergBlockUseCase.replaceLocalMediaIdsWithRemoteMediaIdsInPost(postModel, mediaFile)
+        saveStoryGutenbergBlockUseCase.replaceLocalMediaIdsWithRemoteMediaIdsInPost(postModel, siteModel, mediaFile)
 
         // assert
         Assertions.assertThat(postModel.content).isEqualTo(TestContent.storyBlockWithFirstRemoteIdsAndUrlsReplaced)
@@ -193,10 +200,12 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
         whenever(mediaFile.id).thenReturn(TestContent.localMediaId.toInt())
         whenever(mediaFile.fileURL).thenReturn(TestContent.localImageUrl)
         whenever(mediaFile.mimeType).thenReturn(TestContent.storyMediaFileMimeTypeImage)
+        whenever(mediaFile.alt).thenReturn("")
 
         whenever(mediaFile2.id).thenReturn(TestContent.localMediaId2.toInt())
         whenever(mediaFile2.fileURL).thenReturn(TestContent.localImageUrl2)
         whenever(mediaFile2.mimeType).thenReturn(TestContent.storyMediaFileMimeTypeImage)
+        whenever(mediaFile2.alt).thenReturn("")
 
         val mediaFiles = ArrayList<MediaFile>()
         mediaFiles.add(mediaFile)
@@ -209,6 +218,25 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
         Assertions.assertThat(postModel.content).isEqualTo(TestContent.storyBlockWithLocalIdsAndUrls)
     }
 
+    @Test
+    fun `post with a Story block with no mediaFiles is not taken into account for processing`() {
+        // Given
+        val siteModel = SiteModel()
+        val postModel = PostModel()
+        val listener: DoWithMediaFilesListener = mock()
+        postModel.setContent(BLOCK_LACKING_MEDIA_FILES_ARRAY)
+
+        // When
+        saveStoryGutenbergBlockUseCase.findAllStoryBlocksInPostAndPerformOnEachMediaFilesJson(
+                postModel,
+                siteModel,
+                mock()
+        )
+
+        // Then
+        verify(listener, times(0)).doWithMediaFilesJson(any(), any())
+    }
+
     private fun setupFluxCMediaFiles(
         emptyList: Boolean
     ): ArrayList<MediaFile> {
@@ -221,6 +249,7 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
                     mediaFile.id = i
                     mediaFile.mediaId = (i + 1000).toString()
                     mediaFile.mimeType = "image/jpeg"
+                    mediaFile.alt = ""
                     mediaFile.fileURL = "https://testsite.files.wordpress.com/2020/10/wp-0000000.jpg"
                     mediaFiles.add(mediaFile)
                 }
@@ -234,6 +263,7 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
         mediaFile.id = id
         mediaFile.mediaId = (id + 1000).toString()
         mediaFile.mimeType = "image/jpeg"
+        mediaFile.alt = ""
         mediaFile.fileURL = "https://testsite.files.wordpress.com/2020/10/wp-0000000.jpg"
         return mediaFile
     }
@@ -270,6 +300,9 @@ class SaveStoryGutenbergBlockUseCaseTest : BaseUnitTest() {
     }
 
     companion object {
+        private const val BLOCK_LACKING_MEDIA_FILES_ARRAY = "<!-- wp:jetpack/story -->\n" +
+                "<div class=\"wp-story wp-block-jetpack-story\"></div>\n" +
+                "<!-- /wp:jetpack/story -->"
         private const val BLOCK_WITH_EMPTY_MEDIA_FILES = "<!-- wp:jetpack/story {\"mediaFiles\":[]} -->\n" +
                 "<div class=\"wp-story wp-block-jetpack-story\"></div>\n" +
                 "<!-- /wp:jetpack/story -->"
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/StoryComposerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/StoryComposerViewModelTest.kt
index e10f3519b2cc..c8ec9805cb44 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stories/StoryComposerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/StoryComposerViewModelTest.kt
@@ -7,6 +7,7 @@ import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
+import com.wordpress.stories.compose.frame.StorySaveEvents.StorySaveResult
 import kotlinx.coroutines.InternalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -66,7 +67,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val expectedPostId = LocalId(0)
 
         // act
-        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock())
+        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock(), mock())
 
         verify(saveInitialPostUseCase, times(1)).saveInitialPost(eq(editPostRepository), eq(site))
     }
@@ -77,7 +78,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val expectedPostId = LocalId(0)
 
         // act
-        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock())
+        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock(), mock())
 
         assertThat(viewModel.trackEditorCreatedPost.value).isNotNull
     }
@@ -88,7 +89,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val expectedPostId = LocalId(2)
 
         // act
-        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock())
+        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock(), mock())
 
         assertThat(viewModel.trackEditorCreatedPost.value).isNull()
     }
@@ -99,7 +100,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val expectedPostId = LocalId(2)
 
         // act
-        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock())
+        viewModel.start(site, editPostRepository, expectedPostId, mock(), mock(), mock())
 
         verify(postStore, times(1)).getPostByLocalPostId(eq(expectedPostId.value))
     }
@@ -108,17 +109,21 @@ class StoryComposerViewModelTest : BaseUnitTest() {
     fun `if postEditorAnalyticsSession does not exist then create one with PostEditorAnalyticsSessionWrapper`() {
         // arrange
         val postEditorAnalyticsSession: PostEditorAnalyticsSession? = null
+        whenever(
+                postStore.getPostByLocalPostId(any())
+        ).thenReturn(mock())
+
         whenever(
                 postEditorAnalyticsSessionWrapper.getNewPostEditorAnalyticsSession(
                         any(),
-                        anyOrNull(),
+                        any(),
                         anyOrNull(),
                         any()
                 )
         ).thenReturn(mock())
 
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), postEditorAnalyticsSession, mock())
+        viewModel.start(site, editPostRepository, LocalId(1), postEditorAnalyticsSession, mock(), mock())
 
         // assert
         verify(postEditorAnalyticsSessionWrapper, times(1)).getNewPostEditorAnalyticsSession(
@@ -135,7 +140,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val postEditorAnalyticsSession: PostEditorAnalyticsSession? = mock()
 
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), postEditorAnalyticsSession, mock())
+        viewModel.start(site, editPostRepository, LocalId(0), postEditorAnalyticsSession, mock(), mock())
 
         // assert
         verify(postEditorAnalyticsSessionWrapper, times(0)).getNewPostEditorAnalyticsSession(
@@ -152,7 +157,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val notificationType: NotificationType? = mock()
 
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), notificationType)
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), notificationType, mock())
 
         verify(systemNotificationsTracker, times(1)).trackTappedNotification(eq(notificationType!!))
     }
@@ -163,7 +168,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val notificationType: NotificationType? = null
 
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), notificationType)
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), notificationType, mock())
 
         verify(systemNotificationsTracker, times(0)).trackTappedNotification(any())
     }
@@ -175,7 +180,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         val action = { _: PostModel -> true }
 
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock())
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), mock())
         editPostRepository.updateAsync(action, null)
 
         // assert
@@ -185,7 +190,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
     @Test
     fun `If EditPostRepository is not updated then the savePostToDbUseCase should not be called`() {
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock())
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), mock())
 
         // assert
         verify(savePostToDbUseCase, times(0)).savePostToDb(any(), any())
@@ -194,7 +199,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
     @Test
     fun `If onStoryDiscarded is called then the post is removed with the dispatcher when deleteDiscardedPost true `() {
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock())
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), mock())
         viewModel.onStoryDiscarded(deleteDiscardedPost = true)
 
         // assert
@@ -204,7 +209,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
     @Test
     fun `If onStoryDiscarded is called then the post is not removed when deleteDiscardedPost false `() {
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock())
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), mock())
         viewModel.onStoryDiscarded(deleteDiscardedPost = false)
 
         // assert
@@ -223,7 +228,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
     @Test
     fun `if onSubmitClicked then setUntitledStoryTitleIfTitleEmptyUseCase should be triggered`() {
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock())
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), mock())
         viewModel.onSubmitButtonClicked()
 
         // assert
@@ -234,7 +239,7 @@ class StoryComposerViewModelTest : BaseUnitTest() {
     @Test
     fun `if onSubmitClicked then submitButtonClicked LiveData event should be triggered`() {
         // act
-        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock())
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), mock())
         viewModel.onSubmitButtonClicked()
 
         // assert
@@ -249,4 +254,47 @@ class StoryComposerViewModelTest : BaseUnitTest() {
         // assert
         assertThat(viewModel.mediaFilesUris).isNotNull
     }
+
+    @Test
+    fun `if editPostRepository does not have a post then vm start() returns false`() {
+        // arrange
+        whenever(
+                postStore.getPostByLocalPostId(any())
+        ).thenReturn(null)
+
+        // act
+        val result = viewModel.start(site, editPostRepository, LocalId(2), mock(), mock(), mock())
+
+        // assert
+        assertThat(result).isFalse()
+    }
+
+    @Test
+    fun `if editPostRepository does have a post then vm start() returns true`() {
+        // arrange
+        whenever(
+                postStore.getPostByLocalPostId(any())
+        ).thenReturn(mock())
+
+        // act
+        val result = viewModel.start(site, editPostRepository, LocalId(2), mock(), mock(), mock())
+
+        // assert
+        assertThat(result).isTrue()
+    }
+
+    @Test
+    fun `if originalStorySaveResult is passed and is a retry, onStoryDiscarded returns true`() {
+        // arrange
+        val originalStorySaveReult = StorySaveResult(
+                isRetry = true
+        )
+
+        // act
+        viewModel.start(site, editPostRepository, LocalId(0), mock(), mock(), originalStorySaveReult)
+        val result = viewModel.onStoryDiscarded(deleteDiscardedPost = false)
+
+        // assert
+        assertThat(result).isTrue()
+    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt
index 03075e5e39fd..7660e49c7350 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt
@@ -196,6 +196,7 @@ class StoryEditorMediaTest : BaseUnitTest() {
                                 anyOrNull(),
                                 anyBoolean(),
                                 anyOrNull(),
+                                anyBoolean(),
                                 anyBoolean()
                         )
                     }.thenReturn(resultForAddNewMediaToEditorAsync)
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/suggestion/SuggestionSourceProviderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/suggestion/SuggestionSourceProviderTest.kt
new file mode 100644
index 000000000000..ac77f8544e60
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/suggestion/SuggestionSourceProviderTest.kt
@@ -0,0 +1,47 @@
+package org.wordpress.android.ui.suggestion
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.whenever
+import junit.framework.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.InjectMocks
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.ui.suggestion.SuggestionType.Users
+import org.wordpress.android.ui.suggestion.SuggestionType.XPosts
+
+@RunWith(MockitoJUnitRunner::class)
+class SuggestionSourceProviderTest {
+    @Mock lateinit var mockSuggestionSourceSubcomponentFactory: SuggestionSourceSubcomponent.Factory
+    @Mock lateinit var mockSuggestionSourceSubcomponent: SuggestionSourceSubcomponent
+    @Mock lateinit var mockSite: SiteModel
+
+    @InjectMocks lateinit var provider: SuggestionSourceProvider
+
+    @Before
+    fun setUp() {
+        whenever(mockSuggestionSourceSubcomponentFactory.create(mockSite))
+                .thenReturn(mockSuggestionSourceSubcomponent)
+    }
+
+    @Test
+    fun `gets xpost source`() {
+        val expected = mock<XPostsSuggestionSource>()
+        whenever(mockSuggestionSourceSubcomponent.xPostSuggestionSource())
+                .thenReturn(expected)
+        val actual = provider.get(XPosts, mockSite)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `gets user source`() {
+        val expected = mock<UserSuggestionSource>()
+        whenever(mockSuggestionSourceSubcomponent.userSuggestionSource())
+                .thenReturn(expected)
+        val actual = provider.get(Users, mockSite)
+        assertEquals(expected, actual)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/suggestion/SuggestionViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/suggestion/SuggestionViewModelTest.kt
new file mode 100644
index 000000000000..4bfebacd5140
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/suggestion/SuggestionViewModelTest.kt
@@ -0,0 +1,336 @@
+package org.wordpress.android.ui.suggestion
+
+import android.view.View
+import androidx.lifecycle.LiveData
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertFalse
+import junit.framework.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyInt
+import org.mockito.ArgumentMatchers.anyString
+import org.mockito.InjectMocks
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.R
+import org.wordpress.android.analytics.AnalyticsTracker
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.networking.ConnectionChangeReceiver.ConnectionChangeEvent
+import org.wordpress.android.ui.suggestion.FinishAttempt.NotExactlyOneAvailable
+import org.wordpress.android.ui.suggestion.FinishAttempt.OnlyOneAvailable
+import org.wordpress.android.ui.suggestion.SuggestionType.Users
+import org.wordpress.android.ui.suggestion.SuggestionType.XPosts
+import org.wordpress.android.util.NetworkUtilsWrapper
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.ResourceProvider
+
+@RunWith(MockitoJUnitRunner::class)
+class SuggestionViewModelTest {
+    @Mock lateinit var mockSuggestionSourceProvider: SuggestionSourceProvider
+    @Mock lateinit var mockResourceProvider: ResourceProvider
+    @Mock lateinit var mockNetworkUtils: NetworkUtilsWrapper
+    @Mock lateinit var mockAnalyticsTracker: AnalyticsTrackerWrapper
+    @Mock lateinit var mockSite: SiteModel
+    @Mock lateinit var mockLiveData: LiveData<SuggestionResult>
+    @Mock lateinit var mockSuggestionSource: SuggestionSource
+
+    @InjectMocks lateinit var viewModel: SuggestionViewModel
+
+    private val xpostSuggestionTypeString = "xpost_suggestion_type_string"
+    private val userSuggestionTypeString = "user_suggestion_type_string"
+
+    @Before
+    fun setUp() {
+        setSuggestionsSupported(true)
+
+        whenever(mockResourceProvider.getString(R.string.suggestion_xpost)).thenReturn(xpostSuggestionTypeString)
+        whenever(mockResourceProvider.getString(R.string.suggestion_user)).thenReturn(userSuggestionTypeString)
+
+        whenever(mockSuggestionSource.suggestionData).thenReturn(mockLiveData)
+    }
+
+    @Test
+    fun `init when suggestions not supported`() {
+        setSuggestionsSupported(false)
+        val anySuggestionType = XPosts
+        assertFalse(viewModel.init(anySuggestionType, mockSite))
+    }
+
+    @Test
+    fun `init with xpost suggestions`() {
+        assertTrue(initViewModel(XPosts))
+        verifyViewModelSuggestionType(XPosts)
+    }
+
+    @Test
+    fun `init with user suggestions`() {
+        assertTrue(initViewModel(Users))
+        verifyViewModelSuggestionType(Users)
+    }
+
+    @Test
+    fun `onConnectionChanged not connected`() {
+        initViewModel()
+        viewModel.onConnectionChanged(ConnectionChangeEvent(false))
+        verify(mockSuggestionSource, never()).refreshSuggestions()
+    }
+
+    @Test
+    fun `onConnectionChanged connected`() {
+        initViewModel()
+        viewModel.onConnectionChanged(ConnectionChangeEvent(true))
+        verify(mockSuggestionSource).refreshSuggestions()
+    }
+
+    @Test
+    fun `getEmptyViewState visibility gone if displaying any suggestions`() {
+        initViewModel()
+        stubEmptyViewStateText()
+
+        val nonEmptyList = listOf(mock<Suggestion>())
+        val actual = viewModel.getEmptyViewState(nonEmptyList)
+        assertEquals(View.GONE, actual.visibility)
+    }
+
+    @Test
+    fun `getEmptyViewState visibility visible if not displaying any suggestions`() {
+        initViewModel()
+        stubEmptyViewStateText()
+
+        val actual = viewModel.getEmptyViewState(emptyList())
+        assertEquals(View.VISIBLE, actual.visibility)
+    }
+
+    private fun stubEmptyViewStateText() {
+        whenever(mockNetworkUtils.isNetworkAvailable()).thenReturn(true)
+        whenever(mockResourceProvider.getString(anyInt(), anyString())).thenReturn("")
+    }
+
+    @Test
+    fun `getEmptyViewState text no matching suggestions if suggestions available`() {
+        initViewModel()
+        val nonEmptyList = listOf(mock<Suggestion>())
+        whenever(mockLiveData.value).thenReturn(SuggestionResult(nonEmptyList, false))
+        val expectedText = "expected_text"
+        whenever(mockResourceProvider.getString(R.string.suggestion_no_matching, viewModel.suggestionTypeString))
+                .thenReturn(expectedText)
+
+        val actual = viewModel.getEmptyViewState(emptyList())
+        assertEquals(expectedText, actual.string)
+    }
+
+    @Test
+    fun `getEmptyViewState problem text if has network, suggestions list empty, and fetch error`() {
+        initViewModel()
+        whenever(mockNetworkUtils.isNetworkAvailable()).thenReturn(true)
+        whenever(mockLiveData.value).thenReturn(SuggestionResult(emptyList(), true))
+        val expectedText = "expected_text"
+        whenever(mockResourceProvider.getString(R.string.suggestion_problem)).thenReturn(expectedText)
+
+        val actual = viewModel.getEmptyViewState(emptyList())
+        assertEquals(expectedText, actual.string)
+    }
+
+    @Test
+    fun `getEmptyViewState text no suggestions of type if has network, suggestions list empty, and NO fetch error`() {
+        initViewModel()
+        whenever(mockNetworkUtils.isNetworkAvailable()).thenReturn(true)
+        whenever(mockLiveData.value).thenReturn(SuggestionResult(emptyList(), false))
+        val expectedText = "expected_text"
+        whenever(mockResourceProvider.getString(R.string.suggestion_none, viewModel.suggestionTypeString))
+                .thenReturn(expectedText)
+
+        val actual = viewModel.getEmptyViewState(emptyList())
+        assertEquals(expectedText, actual.string)
+    }
+
+    @Test
+    fun `getEmptyViewState text loading if has network and suggestions have never been received`() {
+        initViewModel()
+        whenever(mockNetworkUtils.isNetworkAvailable()).thenReturn(true)
+        whenever(mockSuggestionSource.isFetchInProgress()).thenReturn(true)
+        val expectedText = "expected_text"
+        whenever(mockResourceProvider.getString(R.string.loading))
+                .thenReturn(expectedText)
+
+        val actual = viewModel.getEmptyViewState(emptyList())
+        assertEquals(expectedText, actual.string)
+    }
+
+    @Test
+    fun `getEmptyViewState text no internet if no suggestions available and network unavailable`() {
+        initViewModel()
+        whenever(mockLiveData.value).thenReturn(SuggestionResult(emptyList(), false))
+        whenever(mockNetworkUtils.isNetworkAvailable()).thenReturn(false)
+        val expectedText = "expected_text"
+        whenever(mockResourceProvider.getString(R.string.suggestion_no_connection))
+                .thenReturn(expectedText)
+
+        val actual = viewModel.getEmptyViewState(emptyList())
+        assertEquals(expectedText, actual.string)
+    }
+
+    @Test
+    fun `onAttemptToFinish no displayed suggestions`() {
+        initViewModel()
+        val userInput = "user_input"
+        val expectedMesage = "expected_message"
+        whenever(
+                mockResourceProvider.getString(
+                        R.string.suggestion_invalid,
+                        userInput, viewModel.suggestionTypeString
+                )
+        )
+                .thenReturn(expectedMesage)
+
+        val actual = viewModel.onAttemptToFinish(emptyList(), userInput)
+
+        val expected = NotExactlyOneAvailable(expectedMesage)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `onAttemptToFinish no filter text from user`() {
+        initViewModel(XPosts)
+        val emptyUserInput = "+"
+        val expectedMesage = "expected_message"
+        whenever(mockResourceProvider.getString(R.string.suggestion_selection_needed))
+                .thenReturn(expectedMesage)
+
+        val listWithMoreThanOne = listOf<Suggestion>(mock(), mock())
+        val actual = viewModel.onAttemptToFinish(listWithMoreThanOne, emptyUserInput)
+
+        val expected = NotExactlyOneAvailable(expectedMesage)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `onAttemptToFinish multiple displayed suggestions`() {
+        initViewModel()
+        val userInput = "user_input"
+        val expectedMesage = "expected_message"
+        whenever(
+                mockResourceProvider.getString(
+                        R.string.suggestion_invalid,
+                        userInput, viewModel.suggestionTypeString
+                )
+        )
+                .thenReturn(expectedMesage)
+
+        val listWithMoreThanOne = listOf<Suggestion>(mock(), mock())
+        val actual = viewModel.onAttemptToFinish(listWithMoreThanOne, userInput)
+
+        val expected = NotExactlyOneAvailable(expectedMesage)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `onAttemptToFinish exactly 1 displayed suggestion`() {
+        initViewModel()
+
+        val mockSuggestion = Suggestion("", "expected_value", "")
+        val listWithExactlyOne = listOf<Suggestion>(mockSuggestion)
+        val actual = viewModel.onAttemptToFinish(listWithExactlyOne, "")
+
+        val expected = OnlyOneAvailable(mockSuggestion.value)
+        assertEquals(expected, actual)
+    }
+
+    @Test
+    fun `trackExit xpost suggestion true`() {
+        initViewModel(XPosts)
+
+        val withSuggestion = true
+        viewModel.trackExit(withSuggestion)
+
+        val props = mapOf(
+                "did_select_suggestion" to withSuggestion,
+                "suggestion_type" to "xpost"
+        )
+        verify(mockAnalyticsTracker).track(AnalyticsTracker.Stat.SUGGESTION_SESSION_FINISHED, props)
+    }
+
+    @Test
+    fun `trackExit xpost suggestion false`() {
+        initViewModel(XPosts)
+
+        val withSuggestion = false
+        viewModel.trackExit(withSuggestion)
+
+        val props = mapOf(
+                "did_select_suggestion" to withSuggestion,
+                "suggestion_type" to "xpost"
+        )
+        verify(mockAnalyticsTracker).track(AnalyticsTracker.Stat.SUGGESTION_SESSION_FINISHED, props)
+    }
+
+    @Test
+    fun `trackExit user suggestion true`() {
+        initViewModel(Users)
+
+        val withSuggestion = true
+        viewModel.trackExit(withSuggestion)
+
+        val props = mapOf(
+                "did_select_suggestion" to withSuggestion,
+                "suggestion_type" to "user"
+        )
+        verify(mockAnalyticsTracker).track(AnalyticsTracker.Stat.SUGGESTION_SESSION_FINISHED, props)
+    }
+
+    @Test
+    fun `trackExit user suggestion false`() {
+        initViewModel(Users)
+
+        val withSuggestion = false
+        viewModel.trackExit(withSuggestion)
+
+        val props = mapOf(
+                "did_select_suggestion" to withSuggestion,
+                "suggestion_type" to "user"
+        )
+        verify(mockAnalyticsTracker).track(AnalyticsTracker.Stat.SUGGESTION_SESSION_FINISHED, props)
+    }
+
+    private fun initViewModel(type: SuggestionType = XPosts): Boolean {
+        whenever(mockSuggestionSourceProvider.get(type, mockSite)).thenReturn(mockSuggestionSource)
+        return viewModel.init(type, mockSite)
+    }
+
+    private fun verifyViewModelSuggestionType(type: SuggestionType) {
+        verifySuggestionPrefix(type)
+        verifySuggestionTypeString(type)
+    }
+
+    private fun verifySuggestionPrefix(type: SuggestionType) {
+        val expectedPrefix = when (type) {
+            XPosts -> '+'
+            Users -> '@'
+        }
+        val actualPrefix = viewModel.suggestionPrefix
+        assertEquals(expectedPrefix, actualPrefix)
+    }
+
+    private fun verifySuggestionTypeString(type: SuggestionType) {
+        val expectedTypeString = when (type) {
+            XPosts -> xpostSuggestionTypeString
+            Users -> userSuggestionTypeString
+        }
+        val actualTypeString = viewModel.suggestionTypeString
+        assertEquals(expectedTypeString, actualTypeString)
+    }
+
+    private fun setSuggestionsSupported(areSupported: Boolean) {
+        val origin = if (areSupported) {
+            SiteModel.ORIGIN_WPCOM_REST
+        } else {
+            SiteModel.ORIGIN_UNKNOWN
+        }
+        whenever(mockSite.origin).thenReturn(origin)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/suggestion/XPostsSuggestionSourceTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/suggestion/XPostsSuggestionSourceTest.kt
new file mode 100644
index 000000000000..14c0a6d793a0
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/suggestion/XPostsSuggestionSourceTest.kt
@@ -0,0 +1,154 @@
+package org.wordpress.android.ui.suggestion
+
+import androidx.lifecycle.MutableLiveData
+import com.nhaarman.mockitokotlin2.doNothing
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.spy
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.Job
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.model.XPostSiteModel
+import org.wordpress.android.fluxc.store.XPostsResult
+import org.wordpress.android.fluxc.store.XPostsStore
+import org.wordpress.android.test
+import org.wordpress.android.util.NoDelayCoroutineDispatcher
+
+class XPostsSuggestionSourceTest : BaseUnitTest() {
+    @Mock lateinit var mockXPostsStore: XPostsStore
+    @Mock lateinit var mockSite: SiteModel
+    private lateinit var xPostsSource: XPostsSuggestionSource
+
+    @Before
+    fun setUp() {
+        xPostsSource = XPostsSuggestionSource(mockXPostsStore, mockSite, NoDelayCoroutineDispatcher())
+    }
+
+    @Test
+    fun `initialization sends non-empty db result and refreshes suggestions`() = test {
+        val expectedDbXpostSite = XPostSiteModel(
+                1,
+                2,
+                "db_xpost_site_title",
+                "db_site_url",
+                "db_xpost_subdomain",
+                "db_xpost_blavatar"
+        )
+        val expectedDbResult = XPostsResult.dbResult(listOf(expectedDbXpostSite))
+        whenever(mockXPostsStore.getXPostsFromDb(mockSite)).thenReturn(expectedDbResult)
+
+        xPostsSource = spy(xPostsSource)
+        doNothing().whenever(xPostsSource).refreshSuggestions()
+
+        val actualResults = mutableListOf<SuggestionResult>()
+        xPostsSource.suggestionData.observeForever { actualResults.add(it) }
+
+        xPostsSource.initialize()
+
+        val expectedResults = listOf(SuggestionResult(suggestionsFromResult(expectedDbResult), false))
+        assertEquals(expectedResults, actualResults)
+        verify(xPostsSource).refreshSuggestions()
+    }
+
+    @Test
+    fun `initialization does not send empty db result and refreshes suggestions`() = test {
+        val expectedDbResult = XPostsResult.dbResult(emptyList())
+        whenever(mockXPostsStore.getXPostsFromDb(mockSite)).thenReturn(expectedDbResult)
+
+        xPostsSource = spy(xPostsSource)
+        doNothing().whenever(xPostsSource).refreshSuggestions()
+
+        val actualResults = mutableListOf<SuggestionResult>()
+        xPostsSource.suggestionData.observeForever { actualResults.add(it) }
+        xPostsSource.initialize()
+
+        assertEquals(emptyList<SuggestionResult>(), actualResults)
+        verify(xPostsSource).refreshSuggestions()
+    }
+
+    @Test
+    fun `refreshSuggestions sends api result`() = test {
+        val expectedApiXpostSite = XPostSiteModel(
+                11,
+                12,
+                "api_xpost_site_title",
+                "api_site_url",
+                "api_xpost_subdomain",
+                "api_xpost_blavatar"
+        )
+        val expectedApiResult = XPostsResult.apiResult(listOf(expectedApiXpostSite))
+        whenever(mockXPostsStore.fetchXPosts(mockSite)).thenReturn(expectedApiResult)
+
+        val actualResults = mutableListOf<SuggestionResult>()
+        xPostsSource.suggestionData.observeForever { actualResults.add(it) }
+        xPostsSource.refreshSuggestions()
+
+        val expectedApiSuggestionResult = SuggestionResult(suggestionsFromResult(expectedApiResult), false)
+        val expected = listOf(expectedApiSuggestionResult)
+        assertEquals(expected, actualResults)
+    }
+
+    @Test
+    fun `refreshSuggestions does nothing if refresh already in progress`() = test {
+        val actualResults = mutableListOf<SuggestionResult>()
+        xPostsSource.suggestionData.observeForever { actualResults.add(it) }
+
+        xPostsSource.fetchJob = mock<Job>().apply {
+            whenever(this.isActive).thenReturn(true)
+        }
+        xPostsSource.refreshSuggestions()
+
+        assertEquals(emptyList<SuggestionResult>(), actualResults)
+    }
+
+    @Test
+    fun `sends previous result with error if api result is unknown`() = test {
+        val actualResults = mutableListOf<SuggestionResult>()
+        xPostsSource.suggestionData.observeForever { actualResults.add(it) }
+
+        val earlierSuggestion = Suggestion("avatar_1", "value_1", "displayValue_1")
+        val earlierSuggestionResult = SuggestionResult(listOf(earlierSuggestion), false)
+        (xPostsSource.suggestionData as MutableLiveData<SuggestionResult>).setValue(earlierSuggestionResult)
+        whenever(mockXPostsStore.fetchXPosts(mockSite)).thenReturn(XPostsResult.Unknown)
+
+        xPostsSource.refreshSuggestions()
+
+        assertEquals(2, actualResults.size)
+        assertEquals(earlierSuggestionResult, actualResults[0])
+        assertEquals(earlierSuggestionResult.copy(hadFetchError = true), actualResults[1])
+    }
+
+    @Test
+    fun `isFetchInProgress true if job active`() {
+        xPostsSource.fetchJob = mock<Job>().apply {
+            whenever(this.isActive).thenReturn(true)
+        }
+        assertTrue(xPostsSource.isFetchInProgress())
+    }
+
+    @Test
+    fun `isFetchInProgress false if job not active`() {
+        xPostsSource.fetchJob = mock<Job>().apply {
+            whenever(this.isActive).thenReturn(false)
+        }
+        assertFalse(xPostsSource.isFetchInProgress())
+    }
+
+    @Test
+    fun `isFetchInProgress false if job null`() {
+        xPostsSource.fetchJob = null
+        assertFalse(xPostsSource.isFetchInProgress())
+    }
+
+    private fun suggestionsFromResult(result: XPostsResult.Result): List<Suggestion> =
+            result.xPosts
+                    .map { Suggestion.fromXpost(it) }
+                    .sortedBy { it.value }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/utils/ListItemInteractionTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/utils/ListItemInteractionTest.kt
new file mode 100644
index 000000000000..1e3d053f4851
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/ui/utils/ListItemInteractionTest.kt
@@ -0,0 +1,70 @@
+package org.wordpress.android.ui.utils
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.junit.MockitoJUnitRunner
+
+@RunWith(MockitoJUnitRunner::class)
+class ListItemInteractionTest {
+    @Test
+    fun `triggers click without params`() {
+        var clicked = false
+
+        val interaction = ListItemInteraction.create { clicked = true }
+
+        interaction.click()
+
+        assertThat(clicked).isTrue()
+    }
+    @Test
+    fun `triggers click with params`() {
+        val param = "param"
+        var invokedWithParam: String? = null
+
+        val interaction = ListItemInteraction.create(param) { invokedWithParam = it }
+
+        interaction.click()
+
+        assertThat(invokedWithParam).isEqualTo(param)
+    }
+
+    @Test
+    fun `not equals when using lambda`() {
+        val interaction1 = ListItemInteraction.create { emptyFunction() }
+        val interaction2 = ListItemInteraction.create { emptyFunction() }
+
+        assertThat(interaction1).isNotEqualTo(interaction2)
+    }
+
+    @Test
+    fun `equals when using function pointers`() {
+        val interaction1 = ListItemInteraction.create(this::emptyFunction)
+        val interaction2 = ListItemInteraction.create(this::emptyFunction)
+
+        assertThat(interaction1).isEqualTo(interaction2)
+    }
+    @Test
+    fun `not equals when using lambda with a parameter`() {
+        val param = "param"
+        val interaction1 = ListItemInteraction.create { parametrizedEmptyFunction(param) }
+        val interaction2 = ListItemInteraction.create { parametrizedEmptyFunction(param) }
+
+        assertThat(interaction1).isNotEqualTo(interaction2)
+    }
+
+    @Test
+    fun `equals when using function pointers with parameter`() {
+        val param = "param"
+        val interaction1 = ListItemInteraction.create(param, this::parametrizedEmptyFunction)
+        val interaction2 = ListItemInteraction.create(param, this::parametrizedEmptyFunction)
+
+        assertThat(interaction1).isEqualTo(interaction2)
+    }
+
+    private fun emptyFunction() {
+    }
+
+    private fun parametrizedEmptyFunction(param: String) {
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/util/AppLog.java b/WordPress/src/test/java/org/wordpress/android/util/AppLog.java
index 1861ae108d18..3418b9476fd0 100644
--- a/WordPress/src/test/java/org/wordpress/android/util/AppLog.java
+++ b/WordPress/src/test/java/org/wordpress/android/util/AppLog.java
@@ -36,10 +36,14 @@ public enum T {
         SHARING,
         PLUGINS,
         ACTIVITY_LOG,
+        SCAN,
         JETPACK_REMOTE_INSTALL,
         SUPPORT,
         SITE_CREATION,
-        DOMAIN_REGISTRATION
+        DOMAIN_REGISTRATION,
+        JETPACK_BACKUP,
+        JETPACK_REWIND,
+        JETPACK_SCAN,
     }
 
     public static final String TAG = "WordPress";
diff --git a/WordPress/src/test/java/org/wordpress/android/util/CommentLevelerTest.kt b/WordPress/src/test/java/org/wordpress/android/util/CommentLevelerTest.kt
new file mode 100644
index 000000000000..72a18d05b370
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/util/CommentLevelerTest.kt
@@ -0,0 +1,96 @@
+package org.wordpress.android.util
+
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import org.wordpress.android.fluxc.model.CommentModel
+import org.wordpress.android.ui.comments.CommentLeveler
+
+class CommentLevelerTest {
+    private val firstTopLevelComment = CommentModel().apply {
+        remoteCommentId = 1
+        id = 1
+        parentId = 0
+        hasParent = false
+    }
+
+    private val firstSecondLevelComment = CommentModel().apply {
+        remoteCommentId = 2
+        id = 2
+        parentId = 1
+        hasParent = true
+    }
+
+    private val secondSecondLevelComment = CommentModel().apply {
+        remoteCommentId = 3
+        id = 3
+        parentId = 1
+        hasParent = true
+    }
+
+    private val firstThirdLevelComment = CommentModel().apply {
+        remoteCommentId = 4
+        id = 4
+        parentId = 2
+        hasParent = true
+    }
+
+    private val firstFourthLevelComment = CommentModel().apply {
+        remoteCommentId = 5
+        id = 5
+        parentId = 4
+        hasParent = true
+    }
+
+    private val orphanedComment = CommentModel().apply {
+        remoteCommentId = 6
+        id = 6
+        parentId = 99 // parent does not exist
+        hasParent = true
+    }
+
+    private val listOfComments = arrayListOf(
+            firstTopLevelComment,
+            firstSecondLevelComment,
+            secondSecondLevelComment,
+            firstThirdLevelComment,
+            firstFourthLevelComment,
+            orphanedComment
+    )
+
+    private lateinit var commentLeveler: CommentLeveler
+
+    @Before
+    fun setup() {
+        commentLeveler = CommentLeveler(listOfComments)
+    }
+
+    @Test
+    fun `createLevelList creates list of comments with correct level variable`() {
+        val leveledCommentList = commentLeveler.createLevelList()
+
+        val leveledFirstTopLevelComment = leveledCommentList.find { it == firstTopLevelComment }
+        Assert.assertNotNull(leveledFirstTopLevelComment)
+        Assert.assertEquals(0, leveledFirstTopLevelComment!!.level)
+
+        val leveledFirstSecondLevelComment = leveledCommentList.find { it == firstSecondLevelComment }
+        Assert.assertNotNull(leveledFirstSecondLevelComment)
+        Assert.assertEquals(1, leveledFirstSecondLevelComment!!.level)
+
+        val leveledSecondSecondLevelComment = leveledCommentList.find { it == secondSecondLevelComment }
+        Assert.assertNotNull(leveledSecondSecondLevelComment)
+        Assert.assertEquals(1, leveledSecondSecondLevelComment!!.level)
+
+        val leveledFirstThirdLevelComment = leveledCommentList.find { it == firstThirdLevelComment }
+        Assert.assertNotNull(leveledFirstThirdLevelComment)
+        Assert.assertEquals(2, leveledFirstThirdLevelComment!!.level)
+
+        val leveledFirstFourthLevelComment = leveledCommentList.find { it == firstFourthLevelComment }
+        Assert.assertNotNull(leveledFirstFourthLevelComment)
+        Assert.assertEquals(3, leveledFirstFourthLevelComment!!.level)
+
+        val leveledOrphanedComment = leveledCommentList.find { it == orphanedComment }
+        Assert.assertNotNull(leveledOrphanedComment)
+        Assert.assertEquals(1, leveledOrphanedComment!!.level)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/util/OrganizationTest.kt b/WordPress/src/test/java/org/wordpress/android/util/OrganizationTest.kt
new file mode 100644
index 000000000000..782f56deecff
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/util/OrganizationTest.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.util
+
+import org.junit.Test
+import org.assertj.core.api.Assertions.assertThat
+import org.wordpress.android.ui.Organization
+
+class OrganizationTest {
+    @Test
+    fun `fromOrgId returns correct Organization`() {
+        assertThat(Organization.fromOrgId(0)).isEqualTo(Organization.NO_ORGANIZATION)
+        assertThat(Organization.fromOrgId(1)).isEqualTo(Organization.A8C)
+        assertThat(Organization.fromOrgId(2)).isEqualTo(Organization.P2)
+        assertThat(Organization.fromOrgId(3)).isEqualTo(Organization.UNKNOWN)
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt
index 0541b57bee33..805520f9225d 100644
--- a/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/util/SiteUtilsTest.kt
@@ -9,6 +9,15 @@ import org.wordpress.android.ui.plans.PlansConstants.BLOGGER_PLAN_ONE_YEAR_ID
 import org.wordpress.android.ui.plans.PlansConstants.BLOGGER_PLAN_TWO_YEARS_ID
 import org.wordpress.android.ui.plans.PlansConstants.FREE_PLAN_ID
 import org.wordpress.android.ui.plans.PlansConstants.PREMIUM_PLAN_ID
+import org.wordpress.android.util.image.BlavatarShape.CIRCULAR
+import org.wordpress.android.util.image.BlavatarShape.SQUARE
+import org.wordpress.android.util.image.BlavatarShape.SQUARE_WITH_ROUNDED_CORNERES
+import org.wordpress.android.util.image.ImageType.BLAVATAR
+import org.wordpress.android.util.image.ImageType.BLAVATAR_CIRCULAR
+import org.wordpress.android.util.image.ImageType.BLAVATAR_ROUNDED_CORNERS
+import org.wordpress.android.util.image.ImageType.P2_BLAVATAR
+import org.wordpress.android.util.image.ImageType.P2_BLAVATAR_CIRCULAR
+import org.wordpress.android.util.image.ImageType.P2_BLAVATAR_ROUNDED_CORNERS
 
 class SiteUtilsTest {
     @Test
@@ -169,6 +178,27 @@ class SiteUtilsTest {
         assertFalse(supportsStoriesFeature)
     }
 
+    @Test
+    fun `getSiteIconType returns correct value for p2 and regular sites`() {
+        val squareP2Image = SiteUtils.getSiteImageType(true, SQUARE)
+        assertThat(squareP2Image).isEqualTo(P2_BLAVATAR)
+
+        val roundedCornersP2Image = SiteUtils.getSiteImageType(true, SQUARE_WITH_ROUNDED_CORNERES)
+        assertThat(roundedCornersP2Image).isEqualTo(P2_BLAVATAR_ROUNDED_CORNERS)
+
+        val circularP2Image = SiteUtils.getSiteImageType(true, CIRCULAR)
+        assertThat(circularP2Image).isEqualTo(P2_BLAVATAR_CIRCULAR)
+
+        val squareSiteImage = SiteUtils.getSiteImageType(false, SQUARE)
+        assertThat(squareSiteImage).isEqualTo(BLAVATAR)
+
+        val roundedCornersSiteImage = SiteUtils.getSiteImageType(false, SQUARE_WITH_ROUNDED_CORNERES)
+        assertThat(roundedCornersSiteImage).isEqualTo(BLAVATAR_ROUNDED_CORNERS)
+
+        val circularSiteImage = SiteUtils.getSiteImageType(false, CIRCULAR)
+        assertThat(circularSiteImage).isEqualTo(BLAVATAR_CIRCULAR)
+    }
+
     private fun initJetpackSite(): SiteModel {
         return SiteModel().apply {
             origin = SiteModel.ORIGIN_WPCOM_REST
diff --git a/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerConcurrentTest.kt b/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerConcurrentTest.kt
index a1f2d0f08a55..c1124adf9e5f 100644
--- a/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerConcurrentTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerConcurrentTest.kt
@@ -3,6 +3,7 @@ package org.wordpress.android.util
 import android.app.Activity
 import android.view.View
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.google.android.material.snackbar.Snackbar
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
@@ -22,7 +23,6 @@ import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.SnackbarItem.Info
-import org.wordpress.android.widgets.WPSnackbar
 import org.wordpress.android.widgets.WPSnackbarWrapper
 
 private val TEST_MESSAGE_TEMPLATE = "This is test message number "
@@ -35,7 +35,7 @@ class SnackbarSequencerConcurrentTest {
     @get:Rule val rule = InstantTaskExecutorRule()
 
     @Mock lateinit var wpSnackbarWrapper: WPSnackbarWrapper
-    @Mock lateinit var wpSnackbar: WPSnackbar
+    @Mock lateinit var wpSnackbar: Snackbar
     @Mock lateinit var view: View
     @Mock lateinit var activity: Activity
 
diff --git a/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerTest.kt b/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerTest.kt
index 96bb2bbf83d8..8d532a2762ef 100644
--- a/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/util/SnackbarSequencerTest.kt
@@ -25,7 +25,6 @@ import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.ui.utils.UiHelpers
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.util.SnackbarItem.Info
-import org.wordpress.android.widgets.WPSnackbar
 import org.wordpress.android.widgets.WPSnackbarWrapper
 import java.lang.ref.WeakReference
 
@@ -38,7 +37,7 @@ class SnackbarSequencerTest {
     @Rule @JvmField var thrown2: ExpectedException = ExpectedException.none()
 
     @Mock lateinit var wpSnackbarWrapper: WPSnackbarWrapper
-    @Mock lateinit var wpSnackbar: WPSnackbar
+    @Mock lateinit var wpSnackbar: Snackbar
     @Mock lateinit var view: View
     @Mock lateinit var activity: Activity
 
diff --git a/WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsUtilsTest.java b/WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsUtilsTest.java
deleted file mode 100644
index 460078e2cd2a..000000000000
--- a/WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsUtilsTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.wordpress.android.util.analytics;
-
-import org.junit.Test;
-import org.wordpress.android.fluxc.model.SiteModel;
-import org.wordpress.android.util.SiteUtils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.wordpress.android.util.analytics.AnalyticsUtils.isGutenbergEnabledOnAnySite;
-
-public class AnalyticsUtilsTest {
-    @Test
-    public void isGutenbergEnabledOnAnySite_no_sites() {
-        assertFalse(isGutenbergEnabledOnAnySite(siteList()));
-    }
-
-    @Test
-    public void isGutenbergEnabledOnAnySite_single_gutenberg_site() {
-        List<SiteModel> sites = siteList(false, true, false);
-        assertTrue(isGutenbergEnabledOnAnySite(sites));
-    }
-
-    @Test
-    public void isGutenbergEnabledOnAnySite_multiple_gutenberg_sites() {
-        List<SiteModel> sites = siteList(true, false, true, false);
-        assertTrue(isGutenbergEnabledOnAnySite(sites));
-    }
-
-    @Test
-    public void isGutenbergEnabledOnAnySite_no_gutenberg_sites() {
-        List<SiteModel> sites = siteList(false, false);
-        assertFalse(isGutenbergEnabledOnAnySite(sites));
-    }
-
-    private List<SiteModel> siteList(boolean... isGutenbergEnabledList) {
-        List<SiteModel> sites = new ArrayList<>();
-        for (boolean isEnabled : isGutenbergEnabledList) {
-            sites.add(mockSite(isEnabled));
-        }
-        return sites;
-    }
-
-    private SiteModel mockSite(boolean isGutenbergEnabled) {
-        String enabledString = isGutenbergEnabled ? SiteUtils.GB_EDITOR_NAME : "";
-        SiteModel mockSite = mock(SiteModel.class);
-        when(mockSite.getMobileEditor()).thenReturn(enabledString);
-        return mockSite;
-    }
-}
diff --git a/WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsUtilsTest.kt b/WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsUtilsTest.kt
new file mode 100644
index 000000000000..75960345b3d7
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/util/analytics/AnalyticsUtilsTest.kt
@@ -0,0 +1,64 @@
+package org.wordpress.android.util.analytics
+
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Assert
+import org.junit.Test
+import org.mockito.Mockito
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.util.SiteUtils
+import org.wordpress.android.util.analytics.AnalyticsUtils.AnalyticsSiteType
+import java.util.ArrayList
+
+class AnalyticsUtilsTest {
+    @Test
+    fun isGutenbergEnabledOnAnySite_no_sites() {
+        Assert.assertFalse(AnalyticsUtils.isGutenbergEnabledOnAnySite(siteList()))
+    }
+
+    @Test
+    fun isGutenbergEnabledOnAnySite_single_gutenberg_site() {
+        val sites = siteList(false, true, false)
+        Assert.assertTrue(AnalyticsUtils.isGutenbergEnabledOnAnySite(sites))
+    }
+
+    @Test
+    fun isGutenbergEnabledOnAnySite_multiple_gutenberg_sites() {
+        val sites = siteList(true, false, true, false)
+        Assert.assertTrue(AnalyticsUtils.isGutenbergEnabledOnAnySite(sites))
+    }
+
+    @Test
+    fun isGutenbergEnabledOnAnySite_no_gutenberg_sites() {
+        val sites = siteList(false, false)
+        Assert.assertFalse(AnalyticsUtils.isGutenbergEnabledOnAnySite(sites))
+    }
+
+    @Test
+    fun `AnalyticsSiteType return correct site type based on content of SiteModel `() {
+        val p2Site = mockSite(isp2 = true)
+        val nonP2Site = mockSite(isp2 = false)
+
+        assertThat(AnalyticsSiteType.fromSiteModel(p2Site)).isEqualTo(AnalyticsSiteType.P2)
+        assertThat(AnalyticsSiteType.fromSiteModel(nonP2Site)).isEqualTo(AnalyticsSiteType.BLOG)
+
+        assertThat(AnalyticsSiteType.toStringFromSiteModel(p2Site)).isEqualTo("p2")
+        assertThat(AnalyticsSiteType.toStringFromSiteModel(nonP2Site)).isEqualTo("blog")
+    }
+
+    private fun siteList(vararg isGutenbergEnabledList: Boolean): List<SiteModel> {
+        val sites: MutableList<SiteModel> = ArrayList()
+        for (isEnabled in isGutenbergEnabledList) {
+            sites.add(mockSite(isEnabled))
+        }
+        return sites
+    }
+
+    private fun mockSite(isGutenbergEnabled: Boolean = true, isp2: Boolean = false): SiteModel {
+        val enabledString = if (isGutenbergEnabled) SiteUtils.GB_EDITOR_NAME else ""
+        val mockSite = Mockito.mock(SiteModel::class.java)
+        whenever(mockSite.mobileEditor).thenReturn(enabledString)
+        whenever(mockSite.isWpForTeamsSite).thenReturn(isp2)
+        return mockSite
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigParametrizedTest.kt b/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigParametrizedTest.kt
new file mode 100644
index 000000000000..19ea32507915
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigParametrizedTest.kt
@@ -0,0 +1,166 @@
+package org.wordpress.android.util.config
+
+import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.wordpress.android.analytics.AnalyticsTracker.Stat
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.util.config.AppConfig.FeatureState
+import org.wordpress.android.util.config.AppConfig.FeatureState.BuildConfigValue
+import org.wordpress.android.util.config.AppConfig.FeatureState.DefaultValue
+import org.wordpress.android.util.config.AppConfig.FeatureState.ManuallyOverriden
+import org.wordpress.android.util.config.AppConfig.FeatureState.RemoteValue
+import org.wordpress.android.util.config.AppConfig.FeatureState.StaticValue
+import org.wordpress.android.util.config.manual.ManualFeatureConfig
+
+@RunWith(Parameterized::class)
+class AppConfigParametrizedTest(
+    private val params: Params
+) {
+    private val remoteConfig: RemoteConfig = mock()
+    private val analyticsTracker: AnalyticsTrackerWrapper = mock()
+    private val featureConfig: FeatureConfig = mock()
+    private val manualFeatureConfig: ManualFeatureConfig = mock()
+    private lateinit var appConfig: AppConfig
+
+    @Before
+    fun setUp() {
+        appConfig = AppConfig(remoteConfig, analyticsTracker, manualFeatureConfig)
+    }
+
+    @Test
+    fun `shows correct value of isEnabled based on params and tracks the decision`() {
+        setupFeatureConfig()
+
+        assertThat(appConfig.isEnabled(featureConfig)).isEqualTo(params.result.isEnabled)
+
+        if (params.remoteField != null) {
+            verify(analyticsTracker).track(Stat.FEATURE_FLAG_VALUE, params.remoteField, params.result)
+        } else {
+            verifyZeroInteractions(analyticsTracker)
+        }
+    }
+
+    @Test
+    fun `shows correct value of feature set based on params and tracks the decision`() {
+        setupFeatureConfig()
+
+        assertThat(appConfig.featureState(featureConfig)).isEqualTo(params.result)
+
+        if (params.remoteField != null) {
+            verify(analyticsTracker).track(Stat.FEATURE_FLAG_VALUE, params.remoteField, params.result)
+        } else {
+            verifyZeroInteractions(analyticsTracker)
+        }
+    }
+
+    private fun setupFeatureConfig() {
+        whenever(manualFeatureConfig.hasManualSetup(featureConfig)).thenReturn(params.hasManualSetup)
+        whenever(manualFeatureConfig.isManuallyEnabled(featureConfig)).thenReturn(params.isManuallyEnabled)
+        whenever(featureConfig.buildConfigValue).thenReturn(params.buildConfigValue)
+        whenever(featureConfig.remoteField).thenReturn(params.remoteField)
+        whenever(remoteConfig.isEnabled(REMOTE_FIELD)).thenReturn(params.remoteConfigValue)
+        whenever(remoteConfig.getFeatureState(REMOTE_FIELD)).thenReturn(params.remoteFeatureState)
+    }
+
+    companion object {
+        @JvmStatic
+        @Parameterized.Parameters
+        fun parameters() = listOf(
+                // Manual override shows the flag as enabled
+                arrayOf(
+                        Params(
+                                hasManualSetup = true,
+                                isManuallyEnabled = true,
+                                result = ManuallyOverriden(true)
+                        )
+                ),
+                // Manual override shows the flag as disabled
+                arrayOf(
+                        Params(
+                                hasManualSetup = true,
+                                isManuallyEnabled = false,
+                                result = ManuallyOverriden(false)
+                        )
+                ),
+                // Returns build config value true when remote field is missing
+                arrayOf(
+                        Params(
+                                remoteField = null,
+                                buildConfigValue = true,
+                                result = BuildConfigValue(true)
+                        )
+                ),
+                // Returns build config value false when remote field is missing
+                arrayOf(
+                        Params(
+                                remoteField = null,
+                                buildConfigValue = false,
+                                result = BuildConfigValue(false)
+                        )
+                ),
+                // Returns build config value true if remote field set
+                arrayOf(
+                        Params(
+                                remoteField = REMOTE_FIELD,
+                                buildConfigValue = true,
+                                result = BuildConfigValue(true)
+                        )
+                ),
+                // Returns remote value == true and source STATIC from remote field
+                arrayOf(
+                        Params(
+                                remoteFeatureState = StaticValue(true),
+                                remoteField = REMOTE_FIELD,
+                                remoteConfigValue = true,
+                                result = StaticValue(true)
+                        )
+                ),
+                // Returns remote value == false and source STATIC from remote field
+                arrayOf(
+                        Params(
+                                remoteFeatureState = StaticValue(false),
+                                remoteField = REMOTE_FIELD,
+                                remoteConfigValue = false,
+                                result = StaticValue(false)
+                        )
+                ),
+                // Returns remote value == true from remote field and source REMOTE
+                arrayOf(
+                        Params(
+                                remoteFeatureState = RemoteValue(true),
+                                remoteField = REMOTE_FIELD,
+                                remoteConfigValue = true,
+                                result = RemoteValue(true)
+                        )
+                ),
+                // Returns default remote value == true from remote field and source Default
+                arrayOf(
+                        Params(
+                                remoteFeatureState = DefaultValue(true),
+                                remoteField = REMOTE_FIELD,
+                                remoteConfigValue = true,
+                                result = DefaultValue(true)
+                        )
+                )
+        )
+
+        private const val REMOTE_FIELD = "remote_field"
+
+        data class Params(
+            val hasManualSetup: Boolean = false,
+            val isManuallyEnabled: Boolean = false,
+            val remoteField: String? = null,
+            val buildConfigValue: Boolean = false,
+            val remoteFeatureState: FeatureState? = null,
+            val remoteConfigValue: Boolean = false,
+            val result: FeatureState
+        )
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigTest.kt b/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigTest.kt
index c99e2b9157f7..cc91c1b90c2a 100644
--- a/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/util/config/AppConfigTest.kt
@@ -1,7 +1,6 @@
 package org.wordpress.android.util.config
 
 import com.nhaarman.mockitokotlin2.verify
-import com.nhaarman.mockitokotlin2.verifyZeroInteractions
 import com.nhaarman.mockitokotlin2.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatIllegalArgumentException
@@ -19,7 +18,6 @@ import org.wordpress.android.util.config.manual.ManualFeatureConfig
 class AppConfigTest {
     @Mock lateinit var remoteConfig: RemoteConfig
     @Mock lateinit var analyticsTracker: AnalyticsTrackerWrapper
-    @Mock lateinit var featureConfig: FeatureConfig
     @Mock lateinit var experimentConfig: ExperimentConfig
     @Mock lateinit var manualFeatureConfig: ManualFeatureConfig
     private lateinit var appConfig: AppConfig
@@ -30,7 +28,6 @@ class AppConfigTest {
     @Before
     fun setUp() {
         appConfig = AppConfig(remoteConfig, analyticsTracker, manualFeatureConfig)
-        whenever(manualFeatureConfig.hasManualSetup(featureConfig)).thenReturn(false)
     }
 
     @Test
@@ -40,76 +37,6 @@ class AppConfigTest {
         verify(remoteConfig).refresh()
     }
 
-    @Test
-    fun `returns feature as enabled when the build config value is enabled and tracks the event`() {
-        setupFeatureConfig(buildConfigValue = true, remoteConfigValue = false)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isTrue()
-        verify(analyticsTracker).track(Stat.FEATURE_FLAG_SET, mapOf(remoteField to true))
-    }
-
-    @Test
-    fun `returns feature as enabled when the remote config value is enabled and tracks the event`() {
-        setupFeatureConfig(buildConfigValue = false, remoteConfigValue = true)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isTrue()
-        verify(analyticsTracker).track(Stat.FEATURE_FLAG_SET, mapOf(remoteField to true))
-    }
-
-    @Test
-    fun `returns feature as disabled when the remote config value is disabled and tracks the event`() {
-        setupFeatureConfig(buildConfigValue = false, remoteConfigValue = false)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isFalse()
-        verify(analyticsTracker).track(Stat.FEATURE_FLAG_SET, mapOf(remoteField to false))
-    }
-
-    @Test
-    fun `returns feature as enabled when the manual config is enabled and does not track the event`() {
-        setupFeatureConfig(buildConfigValue = false, remoteConfigValue = false)
-        whenever(manualFeatureConfig.hasManualSetup(featureConfig)).thenReturn(true)
-        whenever(manualFeatureConfig.isManuallyEnabled(featureConfig)).thenReturn(true)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isTrue()
-        verifyZeroInteractions(analyticsTracker)
-    }
-
-    @Test
-    fun `returns feature as disabled when the manual config is disabled and does not track the event`() {
-        setupFeatureConfig(buildConfigValue = true, remoteConfigValue = false)
-        whenever(manualFeatureConfig.hasManualSetup(featureConfig)).thenReturn(true)
-        whenever(manualFeatureConfig.isManuallyEnabled(featureConfig)).thenReturn(false)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isFalse()
-        verifyZeroInteractions(analyticsTracker)
-    }
-
-    @Test
-    fun `returns cached true value and tracks only once`() {
-        setupFeatureConfig(buildConfigValue = false, remoteConfigValue = true)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isTrue()
-
-        setupFeatureConfig(buildConfigValue = false, remoteConfigValue = false)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isTrue()
-
-        verify(analyticsTracker).track(Stat.FEATURE_FLAG_SET, mapOf(remoteField to true))
-    }
-
-    @Test
-    fun `returns cached false value and tracks only once`() {
-        setupFeatureConfig(buildConfigValue = false, remoteConfigValue = false)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isFalse()
-
-        setupFeatureConfig(buildConfigValue = true, remoteConfigValue = true)
-
-        assertThat(appConfig.isEnabled(featureConfig)).isFalse()
-
-        verify(analyticsTracker).track(Stat.FEATURE_FLAG_SET, mapOf(remoteField to false))
-    }
-
     @Test
     fun `returns experiment variant from remote config when experiment contains variant and tracks the event`() {
         val variant = Variant(experimentVariantA)
@@ -152,12 +79,6 @@ class AppConfigTest {
         )
     }
 
-    private fun setupFeatureConfig(buildConfigValue: Boolean, remoteConfigValue: Boolean) {
-        whenever(featureConfig.buildConfigValue).thenReturn(buildConfigValue)
-        whenever(featureConfig.remoteField).thenReturn(remoteField)
-        whenever(remoteConfig.isEnabled(remoteField)).thenReturn(remoteConfigValue)
-    }
-
     private fun setupExperimentConfig(remoteConfigValue: String, experimentVariants: List<Variant>) {
         whenever(experimentConfig.remoteField).thenReturn(remoteField)
         whenever(experimentConfig.variants).thenReturn(experimentVariants)
diff --git a/WordPress/src/test/java/org/wordpress/android/util/experiments/ExPlatTest.kt b/WordPress/src/test/java/org/wordpress/android/util/experiments/ExPlatTest.kt
new file mode 100644
index 000000000000..c0eb76a2eac4
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/util/experiments/ExPlatTest.kt
@@ -0,0 +1,220 @@
+package org.wordpress.android.util.experiments
+
+import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.never
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
+import com.nhaarman.mockitokotlin2.whenever
+import dagger.Lazy
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.fluxc.model.experiments.Assignments
+import org.wordpress.android.fluxc.model.experiments.Variation
+import org.wordpress.android.fluxc.model.experiments.Variation.Control
+import org.wordpress.android.fluxc.model.experiments.Variation.Treatment
+import org.wordpress.android.fluxc.store.ExperimentStore
+import org.wordpress.android.fluxc.store.ExperimentStore.OnAssignmentsFetched
+import org.wordpress.android.fluxc.utils.AppLogWrapper
+import org.wordpress.android.test
+import org.wordpress.android.testScope
+import java.util.Date
+
+@RunWith(MockitoJUnitRunner::class)
+class ExPlatTest : BaseUnitTest() {
+    @Mock lateinit var experiments: Lazy<Set<Experiment>>
+    @Mock lateinit var experimentStore: ExperimentStore
+    @Mock lateinit var appLog: AppLogWrapper
+    private lateinit var exPlat: ExPlat
+    private lateinit var dummyExperiment: Experiment
+
+    @Before
+    fun setUp() {
+        exPlat = ExPlat(experiments, experimentStore, appLog, testScope())
+        dummyExperiment = object : Experiment("dummy", exPlat) {}
+
+        setupExperiments(setOf(dummyExperiment))
+    }
+
+    @Test
+    fun `refreshIfNeeded fetches assignments if cache is null`() = test {
+        setupAssignments(cachedAssignments = null, fetchedAssignments = buildAssignments())
+
+        exPlat.refreshIfNeeded()
+
+        verify(experimentStore, times(1)).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `refreshIfNeeded fetches assignments if cache is stale`() = test {
+        setupAssignments(cachedAssignments = buildAssignments(isStale = true), fetchedAssignments = buildAssignments())
+
+        exPlat.refreshIfNeeded()
+
+        verify(experimentStore, times(1)).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `refreshIfNeeded does not fetch assignments if cache is fresh`() = test {
+        setupAssignments(cachedAssignments = buildAssignments(isStale = false), fetchedAssignments = buildAssignments())
+
+        exPlat.refreshIfNeeded()
+
+        verify(experimentStore, never()).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `forceRefresh fetches assignments if cache is fresh`() = test {
+        setupAssignments(cachedAssignments = buildAssignments(isStale = true), fetchedAssignments = buildAssignments())
+
+        exPlat.forceRefresh()
+
+        verify(experimentStore, times(1)).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `clear calls experiment store`() = test {
+        exPlat.clear()
+
+        verify(experimentStore, times(1)).clearCachedAssignments()
+    }
+
+    @Test
+    fun `getVariation fetches assignments if cache is null`() = test {
+        setupAssignments(cachedAssignments = null, fetchedAssignments = buildAssignments())
+
+        exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = true)
+
+        verify(experimentStore, times(1)).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `getVariation fetches assignments if cache is stale`() = test {
+        setupAssignments(cachedAssignments = buildAssignments(isStale = true), fetchedAssignments = buildAssignments())
+
+        exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = true)
+
+        verify(experimentStore, times(1)).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `getVariation does not fetch assignments if cache is fresh`() = test {
+        setupAssignments(cachedAssignments = buildAssignments(isStale = false), fetchedAssignments = buildAssignments())
+
+        exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = true)
+
+        verify(experimentStore, never()).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `getVariation does not fetch assignments if cache is null but shouldRefreshIfStale is false`() = test {
+        setupAssignments(cachedAssignments = null, fetchedAssignments = buildAssignments())
+
+        exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = false)
+
+        verify(experimentStore, never()).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `getVariation does not fetch assignments if cache is stale but shouldRefreshIfStale is false`() = test {
+        setupAssignments(cachedAssignments = null, fetchedAssignments = buildAssignments())
+
+        exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = false)
+
+        verify(experimentStore, never()).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `getVariation does not return different cached assignments if active variation exists`() = test {
+        val controlVariation = Control
+        val treatmentVariation = Treatment("treatment")
+
+        val treatmentAssignments = buildAssignments(variations = mapOf(dummyExperiment.name to treatmentVariation))
+
+        setupAssignments(cachedAssignments = null, fetchedAssignments = treatmentAssignments)
+
+        val firstVariation = exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = false)
+        assertThat(firstVariation).isEqualTo(controlVariation)
+
+        exPlat.forceRefresh()
+
+        setupAssignments(cachedAssignments = treatmentAssignments, fetchedAssignments = treatmentAssignments)
+
+        val secondVariation = exPlat.getVariation(dummyExperiment, shouldRefreshIfStale = false)
+        assertThat(secondVariation).isEqualTo(controlVariation)
+    }
+
+    @Test
+    fun `forceRefresh fetches assignments if experiments is not empty`() = test {
+        setupExperiments(setOf(dummyExperiment))
+
+        exPlat.forceRefresh()
+
+        verify(experimentStore, times(1)).fetchAssignments(any(), any(), anyOrNull())
+    }
+
+    @Test
+    fun `forceRefresh does not interact with store if experiments is empty`() = test {
+        setupExperiments(emptySet())
+
+        exPlat.forceRefresh()
+
+        verifyZeroInteractions(experimentStore)
+    }
+
+    @Test
+    fun `refreshIfNeeded does not interact with store if experiments is empty`() = test {
+        setupExperiments(emptySet())
+
+        exPlat.refreshIfNeeded()
+
+        verifyZeroInteractions(experimentStore)
+    }
+
+    @Test
+    fun `getVariation does not interact with store if experiments is empty`() = test {
+        setupExperiments(emptySet())
+
+        try {
+            exPlat.getVariation(dummyExperiment, false)
+        } catch (e: IllegalArgumentException) {
+            // Do nothing.
+        } finally {
+            verifyZeroInteractions(experimentStore)
+        }
+    }
+
+    private fun setupExperiments(experiments: Set<Experiment>) {
+        whenever(this.experiments.get()).thenReturn(experiments)
+    }
+
+    private suspend fun setupAssignments(cachedAssignments: Assignments?, fetchedAssignments: Assignments) {
+        whenever(experimentStore.getCachedAssignments()).thenReturn(cachedAssignments)
+        whenever(experimentStore.fetchAssignments(any(), any(), anyOrNull()))
+                .thenReturn(OnAssignmentsFetched(fetchedAssignments))
+    }
+
+    private fun buildAssignments(
+        isStale: Boolean = false,
+        variations: Map<String, Variation> = emptyMap()
+    ): Assignments {
+        val now = System.currentTimeMillis()
+        val oneHourAgo = now - ONE_HOUR_IN_SECONDS * 1000
+        val oneHourFromNow = now + ONE_HOUR_IN_SECONDS * 1000
+        return if (isStale) {
+            Assignments(variations, ONE_HOUR_IN_SECONDS, Date(oneHourAgo))
+        } else {
+            Assignments(variations, ONE_HOUR_IN_SECONDS, Date(oneHourFromNow))
+        }
+    }
+
+    companion object {
+        private const val ONE_HOUR_IN_SECONDS = 3600
+    }
+}
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/WPWebViewViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/WPWebViewViewModelTest.kt
index a9ff963268f8..5d0c23a51ae7 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/WPWebViewViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/WPWebViewViewModelTest.kt
@@ -13,12 +13,14 @@ import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.test
 import org.wordpress.android.ui.WPWebViewUsageCategory
+import org.wordpress.android.ui.PreviewMode
+import org.wordpress.android.ui.PreviewMode.DESKTOP
+import org.wordpress.android.ui.PreviewMode.MOBILE
+import org.wordpress.android.ui.PreviewMode.TABLET
+import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode.DEFAULT
-import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewMode.DESKTOP
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.PreviewModeSelectorStatus
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState
 import org.wordpress.android.viewmodel.wpwebview.WPWebViewViewModel.WebPreviewUiState.WebPreviewContentUiState
@@ -34,12 +36,13 @@ class WPWebViewViewModelTest {
     @Mock private lateinit var connectionStatus: LiveData<ConnectionStatus>
     @Mock private lateinit var networkUtils: NetworkUtilsWrapper
     @Mock private lateinit var uiStateObserver: Observer<WebPreviewUiState>
+    @Mock lateinit var displayUtilsWrapper: DisplayUtilsWrapper
 
     private lateinit var viewModel: WPWebViewViewModel
 
     @Before
     fun setUp() {
-        viewModel = WPWebViewViewModel(networkUtils, connectionStatus)
+        viewModel = WPWebViewViewModel(displayUtilsWrapper, networkUtils, connectionStatus)
         viewModel.uiState.observeForever(uiStateObserver)
         whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
     }
@@ -80,17 +83,35 @@ class WPWebViewViewModelTest {
     }
 
     @Test
-    fun `initially navigation is not enabled and preview mode is set to default and disabled`() {
+    fun `on mobile initially navigation is not enabled and preview mode is set to mobile and disabled`() {
+        whenever(displayUtilsWrapper.isTablet()).thenReturn(false)
+
+        viewModel.start(WPWebViewUsageCategory.WEBVIEW_STANDARD)
+        assertThat(viewModel.navbarUiState.value).isNotNull()
+        assertThat(viewModel.navbarUiState.value!!.backNavigationEnabled).isFalse()
+        assertThat(viewModel.navbarUiState.value!!.forwardNavigationEnabled).isFalse()
+        assertThat(viewModel.navbarUiState.value!!.previewModeHintVisible).isFalse()
+        assertThat(viewModel.previewMode.value).isEqualTo(MOBILE)
+        assertThat(viewModel.previewModeSelector.value).isNotNull()
+        assertThat(viewModel.previewModeSelector.value!!.isVisible).isFalse()
+        assertThat(viewModel.previewModeSelector.value!!.isEnabled).isFalse()
+        assertThat(viewModel.previewModeSelector.value!!.selectedPreviewMode).isEqualTo(MOBILE)
+    }
+
+    @Test
+    fun `on tablet initially navigation is not enabled and preview mode is set to tablet and disabled`() {
+        whenever(displayUtilsWrapper.isTablet()).thenReturn(true)
+
         viewModel.start(WPWebViewUsageCategory.WEBVIEW_STANDARD)
         assertThat(viewModel.navbarUiState.value).isNotNull()
         assertThat(viewModel.navbarUiState.value!!.backNavigationEnabled).isFalse()
         assertThat(viewModel.navbarUiState.value!!.forwardNavigationEnabled).isFalse()
-        assertThat(viewModel.navbarUiState.value!!.desktopPreviewHintVisible).isFalse()
-        assertThat(viewModel.previewMode.value).isEqualTo(DEFAULT)
+        assertThat(viewModel.navbarUiState.value!!.previewModeHintVisible).isFalse()
+        assertThat(viewModel.previewMode.value).isEqualTo(TABLET)
         assertThat(viewModel.previewModeSelector.value).isNotNull()
         assertThat(viewModel.previewModeSelector.value!!.isVisible).isFalse()
         assertThat(viewModel.previewModeSelector.value!!.isEnabled).isFalse()
-        assertThat(viewModel.previewModeSelector.value!!.selectedPreviewMode).isEqualTo(DEFAULT)
+        assertThat(viewModel.previewModeSelector.value!!.selectedPreviewMode).isEqualTo(TABLET)
     }
 
     @Test
@@ -202,6 +223,8 @@ class WPWebViewViewModelTest {
 
     @Test
     fun `selected preview mode is reflected in preview mode selector`() {
+        whenever(displayUtilsWrapper.isTablet()).thenReturn(false)
+
         viewModel.start(WPWebViewUsageCategory.WEBVIEW_STANDARD)
 
         var previewModeSelectorStatus: PreviewModeSelectorStatus? = null
@@ -211,7 +234,7 @@ class WPWebViewViewModelTest {
 
         assertThat(previewModeSelectorStatus).isNotNull()
         assertThat(previewModeSelectorStatus!!.isVisible).isFalse()
-        assertThat(previewModeSelectorStatus!!.selectedPreviewMode).isEqualTo(DEFAULT)
+        assertThat(previewModeSelectorStatus!!.selectedPreviewMode).isEqualTo(MOBILE)
 
         viewModel.selectPreviewMode(DESKTOP)
         viewModel.togglePreviewModeSelectorVisibility(true)
@@ -234,6 +257,8 @@ class WPWebViewViewModelTest {
 
     @Test
     fun `selecting a preview mode changes it if it's not already selected`() {
+        whenever(displayUtilsWrapper.isTablet()).thenReturn(false)
+
         viewModel.start(WPWebViewUsageCategory.WEBVIEW_STANDARD)
 
         val selectedPreviewModes: ArrayList<PreviewMode> = ArrayList()
@@ -243,11 +268,11 @@ class WPWebViewViewModelTest {
 
         // initial state
         assertThat(selectedPreviewModes.size).isEqualTo(1)
-        assertThat(selectedPreviewModes[0]).isEqualTo(DEFAULT)
+        assertThat(selectedPreviewModes[0]).isEqualTo(MOBILE)
 
-        viewModel.selectPreviewMode(DEFAULT)
+        viewModel.selectPreviewMode(MOBILE)
         assertThat(selectedPreviewModes.size).isEqualTo(1)
-        assertThat(selectedPreviewModes[0]).isEqualTo(DEFAULT)
+        assertThat(selectedPreviewModes[0]).isEqualTo(MOBILE)
 
         viewModel.selectPreviewMode(DESKTOP)
         assertThat(selectedPreviewModes.size).isEqualTo(2)
@@ -260,7 +285,7 @@ class WPWebViewViewModelTest {
 
         var isDesktopPreviewModeHintVisible = false
         viewModel.navbarUiState.observeForever {
-            isDesktopPreviewModeHintVisible = it.desktopPreviewHintVisible
+            isDesktopPreviewModeHintVisible = it.previewModeHintVisible
         }
 
         assertThat(isDesktopPreviewModeHintVisible).isFalse()
@@ -268,7 +293,7 @@ class WPWebViewViewModelTest {
         viewModel.selectPreviewMode(DESKTOP)
         assertThat(isDesktopPreviewModeHintVisible).isTrue()
 
-        viewModel.selectPreviewMode(DEFAULT)
+        viewModel.selectPreviewMode(MOBILE)
         assertThat(isDesktopPreviewModeHintVisible).isFalse()
     }
 
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModelTest.kt
index d08821f656b1..1f091c5f8d57 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogDetailViewModelTest.kt
@@ -7,6 +7,7 @@ import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -19,8 +20,9 @@ import org.wordpress.android.fluxc.model.activity.ActivityLogModel
 import org.wordpress.android.fluxc.store.ActivityLogStore
 import org.wordpress.android.fluxc.tools.FormattableContent
 import org.wordpress.android.fluxc.tools.FormattableRange
-import org.wordpress.android.ui.activitylog.RewindStatusService
 import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailModel
+import org.wordpress.android.ui.activitylog.detail.ActivityLogDetailNavigationEvents
+import org.wordpress.android.viewmodel.Event
 import java.util.Date
 
 @RunWith(MockitoJUnitRunner::class)
@@ -30,9 +32,10 @@ class ActivityLogDetailViewModelTest {
     @Mock private lateinit var dispatcher: Dispatcher
     @Mock private lateinit var activityLogStore: ActivityLogStore
     @Mock private lateinit var site: SiteModel
-    @Mock private lateinit var rewindStatusService: RewindStatusService
     private lateinit var viewModel: ActivityLogDetailViewModel
 
+    private val areButtonsVisible = true
+
     private val activityID = "id1"
     private val summary = "Jetpack"
     private val text = "Blog post 123 created"
@@ -61,15 +64,20 @@ class ActivityLogDetailViewModelTest {
     )
 
     private var lastEmittedItem: ActivityLogDetailModel? = null
+    private var restoreVisible: Boolean = false
+    private var downloadBackupVisible: Boolean = false
+    private var navigationEvents: MutableList<Event<ActivityLogDetailNavigationEvents?>> = mutableListOf()
 
     @Before
     fun setUp() {
         viewModel = ActivityLogDetailViewModel(
                 dispatcher,
-                activityLogStore,
-                rewindStatusService
+                activityLogStore
         )
         viewModel.activityLogItem.observeForever { lastEmittedItem = it }
+        viewModel.restoreVisible.observeForever { restoreVisible = it }
+        viewModel.downloadBackupVisible.observeForever { downloadBackupVisible = it }
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it) }
     }
 
     @After
@@ -77,11 +85,32 @@ class ActivityLogDetailViewModelTest {
         lastEmittedItem = null
     }
 
+    @Test
+    fun `given buttons are not visible, when view model starts, then restore button is not shown`() {
+        viewModel.start(site, activityID, false)
+
+        assertEquals(false, restoreVisible)
+    }
+
+    @Test
+    fun `given buttons are visible, when view model starts, then restore button is shown`() {
+        viewModel.start(site, activityID, true)
+
+        assertEquals(true, restoreVisible)
+    }
+
+    @Test
+    fun `given buttons are not visible, when view model starts, then download backup button is not shown`() {
+        viewModel.start(site, activityID, false)
+
+        assertEquals(false, downloadBackupVisible)
+    }
+
     @Test
     fun emitsUIModelOnStart() {
         whenever(activityLogStore.getActivityLogForSite(site)).thenReturn(listOf(activityLogModel))
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         assertNotNull(lastEmittedItem)
         lastEmittedItem?.let {
@@ -91,14 +120,16 @@ class ActivityLogDetailViewModelTest {
 
     @Test
     fun showsJetpackIconWhenActorIconEmptyAndNameIsJetpackAndTypeIsApplication() {
-        val updatedActivity = activityLogModel.copy(actor = activityLogModel.actor?.copy(
-                avatarURL = null,
-                displayName = "Jetpack",
-                type = "Application"
-        ))
+        val updatedActivity = activityLogModel.copy(
+                actor = activityLogModel.actor?.copy(
+                        avatarURL = null,
+                        displayName = "Jetpack",
+                        type = "Application"
+                )
+        )
         whenever(activityLogStore.getActivityLogForSite(site)).thenReturn(listOf(updatedActivity))
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         assertNotNull(lastEmittedItem)
         lastEmittedItem?.let {
@@ -109,14 +140,16 @@ class ActivityLogDetailViewModelTest {
 
     @Test
     fun showsJetpackIconWhenActorIconEmptyAndNameAndTypeIsHappinessEngineer() {
-        val updatedActivity = activityLogModel.copy(actor = activityLogModel.actor?.copy(
-                avatarURL = null,
-                displayName = "Happiness Engineer",
-                type = "Happiness Engineer"
-        ))
+        val updatedActivity = activityLogModel.copy(
+                actor = activityLogModel.actor?.copy(
+                        avatarURL = null,
+                        displayName = "Happiness Engineer",
+                        type = "Happiness Engineer"
+                )
+        )
         whenever(activityLogStore.getActivityLogForSite(site)).thenReturn(listOf(updatedActivity))
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         assertNotNull(lastEmittedItem)
         lastEmittedItem?.let {
@@ -129,11 +162,11 @@ class ActivityLogDetailViewModelTest {
     fun doesNotReemitUIModelOnStartWithTheSameActivityID() {
         whenever(activityLogStore.getActivityLogForSite(site)).thenReturn(listOf(activityLogModel))
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         lastEmittedItem = null
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         assertNull(lastEmittedItem)
     }
@@ -146,11 +179,11 @@ class ActivityLogDetailViewModelTest {
         val secondActivity = activityLogModel.copy(activityID = activityID2, content = updatedContent)
         whenever(activityLogStore.getActivityLogForSite(site)).thenReturn(listOf(activityLogModel, secondActivity))
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         lastEmittedItem = null
 
-        viewModel.start(site, activityID2)
+        viewModel.start(site, activityID2, areButtonsVisible)
 
         assertNotNull(lastEmittedItem)
         lastEmittedItem?.let {
@@ -165,7 +198,7 @@ class ActivityLogDetailViewModelTest {
 
         lastEmittedItem = mock()
 
-        viewModel.start(site, activityID)
+        viewModel.start(site, activityID, areButtonsVisible)
 
         assertNull(lastEmittedItem)
     }
@@ -180,12 +213,46 @@ class ActivityLogDetailViewModelTest {
     }
 
     @Test
-    fun onRewindClickTriggersRewindIfRewindIdNotNull() {
+    fun `given without rewind id, when on restore clicked, then do nothing`() {
+        val model = mock<ActivityLogDetailModel>()
+        whenever(model.rewindId).thenReturn(null)
+
+        viewModel.onRestoreClicked(model)
+
+        assertTrue(navigationEvents.isEmpty())
+    }
+
+    @Test
+    fun `when on restore clicked, then show restore with model`() {
+        val model = mock<ActivityLogDetailModel>()
+        whenever(model.rewindId).thenReturn("123")
+
+        viewModel.onRestoreClicked(model)
+
+        navigationEvents.last().peekContent()?.let {
+            assertEquals(model, (it as ActivityLogDetailNavigationEvents.ShowRestore).model)
+        }
+    }
+
+    @Test
+    fun `given without rewind id, when on download backup clicked, then do nothing`() {
+        val model = mock<ActivityLogDetailModel>()
+        whenever(model.rewindId).thenReturn(null)
+
+        viewModel.onDownloadBackupClicked(model)
+
+        assertTrue(navigationEvents.isEmpty())
+    }
+
+    @Test
+    fun `given with rewind id, when on download backup clicked, then show backup download with model`() {
         val model = mock<ActivityLogDetailModel>()
         whenever(model.rewindId).thenReturn("123")
 
-        viewModel.onRewindClicked(model)
+        viewModel.onDownloadBackupClicked(model)
 
-        assertEquals(model, viewModel.showRewindDialog.value)
+        navigationEvents.last().peekContent()?.let {
+            assertEquals(model, (it as ActivityLogDetailNavigationEvents.ShowBackupDownload).model)
+        }
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModelTest.kt
index e9ca0d0fe9d2..cb93b5eccee7 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/activitylog/ActivityLogViewModelTest.kt
@@ -1,371 +1,1611 @@
 package org.wordpress.android.viewmodel.activitylog
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import androidx.lifecycle.MutableLiveData
+import androidx.core.util.Pair
 import com.nhaarman.mockitokotlin2.KArgumentCaptor
 import com.nhaarman.mockitokotlin2.any
+import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.argumentCaptor
+import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.reset
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.flow.flow
+import org.assertj.core.api.Assertions.assertThat
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
-import org.wordpress.android.fluxc.action.ActivityLogAction.FETCH_ACTIVITIES
+import org.wordpress.android.R
+import org.wordpress.android.fluxc.action.ActivityLogAction
+import org.wordpress.android.fluxc.model.LocalOrRemoteId.RemoteId
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.activity.ActivityLogModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel
-import org.wordpress.android.fluxc.model.activity.RewindStatusModel.State.ACTIVE
+import org.wordpress.android.fluxc.model.activity.ActivityTypeModel
 import org.wordpress.android.fluxc.store.ActivityLogStore
 import org.wordpress.android.fluxc.store.ActivityLogStore.FetchActivityLogPayload
 import org.wordpress.android.fluxc.store.ActivityLogStore.OnActivityLogFetched
-import org.wordpress.android.ui.activitylog.RewindStatusService
-import org.wordpress.android.ui.activitylog.RewindStatusService.RewindProgress
+import org.wordpress.android.test
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents
+import org.wordpress.android.ui.activitylog.ActivityLogNavigationEvents.DownloadBackupFile
 import org.wordpress.android.ui.activitylog.list.ActivityLogListItem
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Event
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Footer
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Header
-import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Loading
-import org.wordpress.android.util.config.ActivityLogFiltersFeatureConfig
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Notice
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Progress.Type.BACKUP_DOWNLOAD
+import org.wordpress.android.ui.activitylog.list.ActivityLogListItem.Progress.Type.RESTORE
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase
+import org.wordpress.android.ui.jetpack.JetpackCapabilitiesUseCase.JetpackPurchasedProducts
+import org.wordpress.android.ui.jetpack.backup.download.BackupDownloadRequestState
+import org.wordpress.android.ui.jetpack.backup.download.usecases.GetBackupDownloadStatusUseCase
+import org.wordpress.android.ui.jetpack.backup.download.usecases.PostDismissBackupDownloadUseCase
+import org.wordpress.android.ui.jetpack.common.JetpackBackupDownloadActionState
+import org.wordpress.android.ui.jetpack.restore.RestoreRequestState
+import org.wordpress.android.ui.jetpack.restore.usecases.GetRestoreStatusUseCase
+import org.wordpress.android.ui.stats.refresh.utils.DateUtils
+import org.wordpress.android.ui.utils.UiString.UiStringRes
+import org.wordpress.android.ui.utils.UiString.UiStringResWithParams
+import org.wordpress.android.ui.utils.UiString.UiStringText
+import org.wordpress.android.util.analytics.ActivityLogTracker
+import org.wordpress.android.viewmodel.Event
 import org.wordpress.android.viewmodel.ResourceProvider
 import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ActivityLogListStatus
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.BackupDownloadEvent
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.EmptyUiState
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.FiltersUiState.FiltersShown
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.RestoreEvent
+import org.wordpress.android.viewmodel.activitylog.ActivityLogViewModel.ShowDateRangePicker
 import java.util.Calendar
 import java.util.Date
 
+private const val DATE_1_IN_MILLIS = 1578614400000L // 2020-01-10T00:00:00+00:00
+private const val DATE_2_IN_MILLIS = 1578787200000L // 2020-01-12T00:00:00+00:00
+
+private const val TIMEZONE_GMT_0 = "GMT+0"
+private const val ONE_DAY_WITHOUT_SECOND_IN_MILLIS = 1000 * 60 * 60 * 24 - 1000
+
+private const val SITE_ID = 1L
+
+private const val NOW = "Now"
+private const val RESTORE_STARTED = "Your site is being restored\nRestoring to date time"
+private const val RESTORING_CURRENTLY = "Currently restoring your site"
+private const val RESTORING_DATE_TIME = "Restoring to date time"
+private const val RESTORING_NO_DATE = "Restore in progress"
+private const val RESTORED_DATE_TIME = "Your site has been successfully restored\nRestored to date time"
+private const val RESTORED_NO_DATE = "Your site has been successfully restored"
+
+private const val BACKUP_STARTED = "Your site is being backed up\nBacking up from date time"
+private const val BACKING_UP_CURRENTLY = "Creating downloadable backup"
+private const val BACKING_UP_DATE_TIME = "Backing up site from date time"
+private const val BACKING_UP_NO_DATE = "Backing up site"
+private const val BACKED_UP_DATE_TIME = "Your site has been successfully backed up\nBacked up from date time"
+private const val BACKED_UP_NO_DATE = "Your site has been successfully backed up"
+private const val BACKUP_NOTICE = "We successfully created a backup of your site from date time"
+
+private const val REWIND_ID = "rewindId"
+private const val RESTORE_ID = 123456789L
+private const val DOWNLOAD_URL = "downloadUrl"
+private const val DOWNLOAD_IS_VALID = true
+private const val DOWNLOAD_IS_NOT_VALID = false
+private const val DOWNLOAD_ID = 987654321L
+private val DOWNLOAD_PUBLISHED = Date()
+private val DOWNLOAD_VALID_UNTIL = Date()
+
 @RunWith(MockitoJUnitRunner::class)
 class ActivityLogViewModelTest {
     @Rule @JvmField val rule = InstantTaskExecutorRule()
+
     @Mock private lateinit var store: ActivityLogStore
     @Mock private lateinit var site: SiteModel
-    @Mock private lateinit var rewindStatusService: RewindStatusService
+    @Mock private lateinit var getRestoreStatusUseCase: GetRestoreStatusUseCase
+    @Mock private lateinit var getBackupDownloadStatusUseCase: GetBackupDownloadStatusUseCase
     @Mock private lateinit var resourceProvider: ResourceProvider
-    @Mock private lateinit var activityLogFiltersFeatureConfig: ActivityLogFiltersFeatureConfig
+    @Mock private lateinit var dateUtils: DateUtils
+    @Mock private lateinit var activityLogTracker: ActivityLogTracker
+    @Mock private lateinit var jetpackCapabilitiesUseCase: JetpackCapabilitiesUseCase
+    @Mock private lateinit var postDismissBackupDownloadUseCase: PostDismissBackupDownloadUseCase
+
     private lateinit var fetchActivityLogCaptor: KArgumentCaptor<FetchActivityLogPayload>
+    private lateinit var formatDateRangeTimezoneCaptor: KArgumentCaptor<String>
+    private lateinit var viewModel: ActivityLogViewModel
 
     private var events: MutableList<List<ActivityLogListItem>?> = mutableListOf()
     private var itemDetails: MutableList<ActivityLogListItem?> = mutableListOf()
-    private var rewindDialogs: MutableList<ActivityLogListItem?> = mutableListOf()
     private var eventListStatuses: MutableList<ActivityLogListStatus?> = mutableListOf()
     private var snackbarMessages: MutableList<String?> = mutableListOf()
     private var moveToTopEvents: MutableList<Unit?> = mutableListOf()
-    private lateinit var activityLogList: List<ActivityLogModel>
-    private lateinit var viewModel: ActivityLogViewModel
-    private var rewindProgress = MutableLiveData<RewindProgress>()
-    private var rewindAvailable = MutableLiveData<Boolean>()
-
-    private val rewindStatusModel = RewindStatusModel(
-            ACTIVE,
-            null,
-            Date(),
-            true,
-            null,
-            null)
-
-    val event = ActivityLogListItem.Event(
-            "activityId",
-            "",
-            ",",
-            null,
-            null,
-            true,
-            null,
-            Date(),
-            true
-    )
-    val activity = ActivityLogModel(
-            "activityId",
-            "",
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            null,
-            Date(),
-            null
-            )
+    private var navigationEvents: MutableList<Event<ActivityLogNavigationEvents?>> = mutableListOf()
+    private var showDateRangePickerEvents: MutableList<ShowDateRangePicker> = mutableListOf()
+
+    private val activityList = listOf(firstActivity(), secondActivity(), thirdActivity())
+    private val rewindableOnly = false
 
     @Before
-    fun setUp() = runBlocking<Unit> {
+    fun setUp() = test {
         viewModel = ActivityLogViewModel(
                 store,
-                rewindStatusService,
+                getRestoreStatusUseCase,
+                getBackupDownloadStatusUseCase,
+                postDismissBackupDownloadUseCase,
                 resourceProvider,
-                activityLogFiltersFeatureConfig,
-                Dispatchers.Unconfined
+                dateUtils,
+                activityLogTracker,
+                jetpackCapabilitiesUseCase
         )
         viewModel.site = site
+        viewModel.rewindableOnly = rewindableOnly
+
         viewModel.events.observeForever { events.add(it) }
         viewModel.eventListStatus.observeForever { eventListStatuses.add(it) }
         viewModel.showItemDetail.observeForever { itemDetails.add(it) }
-        viewModel.showRewindDialog.observeForever { rewindDialogs.add(it) }
         viewModel.showSnackbarMessage.observeForever { snackbarMessages.add(it) }
         viewModel.moveToTop.observeForever { moveToTopEvents.add(it) }
-        fetchActivityLogCaptor = argumentCaptor()
+        viewModel.navigationEvents.observeForever { navigationEvents.add(it) }
+        viewModel.showDateRangePicker.observeForever { showDateRangePickerEvents.add(it) }
 
-        activityLogList = initializeActivityList()
-        whenever(store.getActivityLogForSite(site, false)).thenReturn(activityLogList.toList())
-        whenever(store.getRewindStatusForSite(site)).thenReturn(rewindStatusModel)
-        whenever(rewindStatusService.rewindProgress).thenReturn(rewindProgress)
-        whenever(rewindStatusService.rewindAvailable).thenReturn(rewindAvailable)
-        whenever(store.fetchActivities(any())).thenReturn(mock())
+        fetchActivityLogCaptor = argumentCaptor()
+        formatDateRangeTimezoneCaptor = argumentCaptor()
+
+        whenever(store.getActivityLogForSite(site, false, rewindableOnly)).thenReturn(activityList.toList())
+        whenever(store.fetchActivities(anyOrNull())).thenReturn(mock())
+        whenever(site.hasFreePlan).thenReturn(false)
+        whenever(site.siteId).thenReturn(SITE_ID)
+        whenever(jetpackCapabilitiesUseCase.getCachedJetpackPurchasedProducts(anyLong()))
+                .thenReturn(JetpackPurchasedProducts(scan = false, backup = false))
     }
 
     @Test
-    fun onStartEmitsDataFromStoreAndStartsFetching() = runBlocking {
+    fun onStartEmitsDataFromStoreAndStartsFetching() = test {
         assertNull(viewModel.events.value)
         assertTrue(eventListStatuses.isEmpty())
 
-        viewModel.start(site)
+        viewModel.start(site, rewindableOnly)
 
-        assertEquals(
-                viewModel.events.value,
-                expectedActivityList()
-        )
+        assertEquals(viewModel.events.value, expectedActivityList(rewindDisabled = false))
         assertEquals(eventListStatuses[0], ActivityLogListStatus.FETCHING)
         assertEquals(eventListStatuses[1], ActivityLogListStatus.DONE)
-
         assertFetchEvents()
-        verify(rewindStatusService).start(site)
     }
 
     @Test
-    fun fetchesEventsOnPullToRefresh() = runBlocking {
+    fun fetchesEventsOnPullToRefresh() = test {
         viewModel.onPullToRefresh()
 
         assertFetchEvents()
     }
 
     @Test
-    fun onDataFetchedPostsDataAndChangesStatusIfCanLoadMore() = runBlocking {
+    fun onDataFetchedPostsDataAndChangesStatusIfCanLoadMore() = test {
         val canLoadMore = true
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(1, canLoadMore, FETCH_ACTIVITIES))
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(1, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
 
-        viewModel.start(site)
+        viewModel.start(site, rewindableOnly)
 
         assertEquals(
                 viewModel.events.value,
-                expectedActivityList(false, canLoadMore)
+                expectedActivityList(
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = canLoadMore
+                )
         )
-
         assertEquals(viewModel.eventListStatus.value, ActivityLogListStatus.CAN_LOAD_MORE)
     }
 
     @Test
-    fun onDataFetchedLoadsMoreDataIfCanLoadMore() = runBlocking {
+    fun onDataFetchedLoadsMoreDataIfCanLoadMore() = test {
         val canLoadMore = true
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(1, canLoadMore, FETCH_ACTIVITIES))
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(1, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+        viewModel.start(site, rewindableOnly)
+        reset(store)
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(1, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.onScrolledToBottom()
+
+        assertFetchEvents(canLoadMore)
+    }
 
-        viewModel.start(site)
+    @Test
+    fun onDataFetchedPostsDataAndChangesStatusIfCannotLoadMore() = test {
+        val canLoadMore = false
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(1, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
 
+        viewModel.start(site, rewindableOnly)
+
+        assertEquals(viewModel.events.value, expectedActivityList(rewindDisabled = false))
+        assertEquals(viewModel.eventListStatus.value, ActivityLogListStatus.DONE)
+    }
+
+    @Test
+    fun onDataFetchedShowsFooterIfCannotLoadMoreAndIsFreeSite() = test {
+        val canLoadMore = false
+        whenever(site.hasFreePlan).thenReturn(true)
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(1, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.start(site, rewindableOnly)
+
+        assertEquals(viewModel.events.value, expectedActivityList(rewindDisabled = false, isLastPageAndFreeSite = true))
+        assertEquals(viewModel.eventListStatus.value, ActivityLogListStatus.DONE)
+    }
+
+    @Test
+    fun onDataFetchedDoesNotLoadMoreDataIfCannotLoadMore() = test {
+        val canLoadMore = false
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(1, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+        viewModel.start(site, rewindableOnly)
         reset(store)
 
         viewModel.onScrolledToBottom()
 
+        verify(store, never()).fetchActivities(anyOrNull())
+    }
+
+    @Test
+    fun onDataFetchedGoesToTopWhenSomeRowsAffected() = test {
+        assertTrue(moveToTopEvents.isEmpty())
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(10, true, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.start(site, rewindableOnly)
+
+        assertTrue(moveToTopEvents.isNotEmpty())
+    }
+
+    @Test
+    fun onDataFetchedDoesNotLoadMoreDataIfNoRowsAffected() = test {
+        val canLoadMore = true
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(0, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.start(site, rewindableOnly)
+
+        verify(store).getActivityLogForSite(site, rewindableOnly)
+    }
+
+    @Test
+    fun headerIsDisplayedForFirstItemOrWhenDifferentThenPrevious() = test {
+        val canLoadMore = true
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(3, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.start(site, rewindableOnly)
+
+        assertTrue(events.last()?.get(0) is ActivityLogListItem.Header)
+        assertTrue(events.last()?.get(3) is ActivityLogListItem.Header)
+    }
+
+    @Test
+    fun onItemClickShowsItemDetail() {
+        val event = event()
+        assertTrue(itemDetails.isEmpty())
+
+        viewModel.onItemClicked(event)
+
+        assertEquals(itemDetails.firstOrNull(), event)
+    }
+
+    @Test
+    fun loadsNextPageOnScrollToBottom() = test {
+        val canLoadMore = true
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(10, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+        viewModel.start(site, rewindableOnly)
+        reset(store)
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(10, canLoadMore, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.onScrolledToBottom()
+
         assertFetchEvents(canLoadMore)
     }
 
     @Test
-    fun onDataFetchedPostsDataAndChangesStatusIfCannotLoadMore() = runBlocking {
-        val canLoadMore = false
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(1, canLoadMore, FETCH_ACTIVITIES))
+    fun filtersAreVisibleWhenSiteOnPaidPlan() {
+        whenever(site.hasFreePlan).thenReturn(false)
+
+        viewModel.start(site, rewindableOnly)
+
+        assertEquals(true, viewModel.filtersUiState.value!!.visibility)
+    }
+
+    @Test
+    fun filtersAreNotVisibleWhenSiteOnFreePlan() {
+        whenever(site.hasFreePlan).thenReturn(true)
+
+        viewModel.start(site, rewindableOnly)
+
+        assertEquals(false, viewModel.filtersUiState.value!!.visibility)
+    }
+
+    @Test
+    fun filtersAreVisibleWhenSiteOnFreePlanButHasPurchasedBackupProduct() = test {
+        whenever(site.hasFreePlan).thenReturn(true)
+        whenever(jetpackCapabilitiesUseCase.getCachedJetpackPurchasedProducts(SITE_ID))
+                .thenReturn(JetpackPurchasedProducts(scan = false, backup = true))
+
+        viewModel.start(site, rewindableOnly)
+
+        assertEquals(true, viewModel.filtersUiState.value!!.visibility)
+    }
+
+    @Test
+    fun onActivityTypeFilterClickShowsActivityTypeFilter() {
+        viewModel.onActivityTypeFilterClicked()
+
+        assertNotNull(viewModel.showActivityTypeFilterDialog.value)
+    }
+
+    @Test
+    fun onActivityTypeFilterClickRemoteSiteIdIsPassed() {
+        viewModel.onActivityTypeFilterClicked()
+
+        assertEquals(RemoteId(SITE_ID), viewModel.showActivityTypeFilterDialog.value!!.siteId)
+    }
+
+    @Test
+    fun onActivityTypeFilterClickPreviouslySelectedTypesPassed() {
+        val selectedItems = listOf(
+                ActivityTypeModel("user", "User", 10),
+                ActivityTypeModel("backup", "Backup", 5)
+        )
+        viewModel.onActivityTypesSelected(selectedItems)
+
+        viewModel.onActivityTypeFilterClicked()
+
+        assertEquals(selectedItems.map { it.key }, viewModel.showActivityTypeFilterDialog.value!!.initialSelection)
+    }
 
-        viewModel.start(site)
+    @Test
+    fun onSecondaryActionClickRestoreNavigationEventIsShowRestore() {
+        viewModel.onSecondaryActionClicked(ActivityLogListItem.SecondaryAction.RESTORE, event())
+
+        assertThat(navigationEvents.last().peekContent())
+                .isInstanceOf(ActivityLogNavigationEvents.ShowRestore::class.java)
+    }
+
+    @Test
+    fun onSecondaryActionClickDownloadBackupNavigationEventIsShowBackupDownload() {
+        viewModel.onSecondaryActionClicked(ActivityLogListItem.SecondaryAction.DOWNLOAD_BACKUP, event())
+
+        assertThat(navigationEvents.last().peekContent())
+                .isInstanceOf(ActivityLogNavigationEvents.ShowBackupDownload::class.java)
+    }
+
+    @Test
+    fun dateRangeTrackDateRangeFilterSelectedEventFired() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+        val dateRange = Pair(10L, 20L)
+
+        viewModel.onDateRangeSelected(dateRange)
+
+        verify(activityLogTracker).trackDateRangeFilterSelected(dateRange, rewindableOnly)
+    }
+
+    @Test
+    fun dateRangeFilterClearActionShownWhenFilterNotEmpty() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+        val dateRange = Pair(10L, 20L)
+
+        viewModel.onDateRangeSelected(dateRange)
+
+        val action = (viewModel.filtersUiState.value as FiltersShown).onClearDateRangeFilterClicked
+        assertThat(action != null).isTrue
+    }
+
+    @Test
+    fun dateRangeFilterClearActionHiddenWhenFilterEmpty() {
+        viewModel.onDateRangeSelected(null)
+
+        val action = (viewModel.filtersUiState.value as FiltersShown).onClearDateRangeFilterClicked
+        assertThat(action == null).isTrue
+    }
+
+    @Test
+    fun onDateRangeFilterClearActionClickClearActionDisappears() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+        viewModel.onDateRangeSelected(Pair(10L, 20L))
+
+        (viewModel.filtersUiState.value as FiltersShown).onClearDateRangeFilterClicked!!.invoke()
+
+        val action = (viewModel.filtersUiState.value as FiltersShown).onClearDateRangeFilterClicked
+        assertThat(action == null).isTrue
+    }
+
+    @Test
+    fun basicDateRangeLabelShownWhenFilterEmpty() {
+        viewModel.onDateRangeSelected(null)
+
+        assertThat((viewModel.filtersUiState.value as FiltersShown).dateRangeLabel)
+                .isEqualTo(UiStringRes(R.string.activity_log_date_range_filter_label))
+    }
+
+    @Test
+    fun dateRangeLabelWithDatesShownWhenFilterNotEmpty() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+
+        viewModel.onDateRangeSelected(Pair(10L, 20L))
+
+        assertThat((viewModel.filtersUiState.value as FiltersShown).dateRangeLabel).isEqualTo(UiStringText("TEST"))
+    }
+
+    @Test
+    fun dateRangeLabelFormattingUsesGMT0Timezone() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), formatDateRangeTimezoneCaptor.capture()))
+                .thenReturn("TEST")
+
+        viewModel.onDateRangeSelected(Pair(10L, 20L))
+
+        assertThat(formatDateRangeTimezoneCaptor.firstValue).isEqualTo(TIMEZONE_GMT_0)
+    }
+
+    @Test
+    fun dateRangeTrackDateRangeFilterButtonClickedEventFired() {
+        viewModel.dateRangePickerClicked()
+
+        verify(activityLogTracker).trackDateRangeFilterButtonClicked(rewindableOnly)
+    }
+
+    @Test
+    fun dateRangeEndTimestampGetsAdjustedToEndOfDay() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+
+        viewModel.onDateRangeSelected(Pair(DATE_1_IN_MILLIS, DATE_2_IN_MILLIS))
+        viewModel.dateRangePickerClicked()
+
+        assertThat(showDateRangePickerEvents[0].initialSelection)
+                .isEqualTo(Pair(DATE_1_IN_MILLIS, DATE_2_IN_MILLIS + ONE_DAY_WITHOUT_SECOND_IN_MILLIS))
+    }
+
+    @Test
+    fun activityTypeFilterClearActionShownWhenFilterNotEmpty() {
+        viewModel.onActivityTypesSelected(listOf(ActivityTypeModel("user", "User", 10)))
+
+        val action = (viewModel.filtersUiState.value as FiltersShown).onClearActivityTypeFilterClicked
+        assertThat(action != null).isTrue
+    }
+
+    @Test
+    fun activityTypeFilterClearActionHiddenWhenFilterEmpty() {
+        viewModel.onActivityTypesSelected(listOf())
+
+        val action = (viewModel.filtersUiState.value as FiltersShown).onClearActivityTypeFilterClicked
+        assertThat(action == null).isTrue
+    }
+
+    @Test
+    fun onActivityTypeFilterClearActionClickClearActionDisappears() {
+        viewModel.onActivityTypesSelected(listOf(ActivityTypeModel("user", "User", 10)))
+
+        (viewModel.filtersUiState.value as FiltersShown).onClearActivityTypeFilterClicked!!.invoke()
+
+        val action = (viewModel.filtersUiState.value as FiltersShown).onClearActivityTypeFilterClicked
+        assertThat(action == null).isTrue
+    }
+
+    @Test
+    fun basicActivityTypeLabelShownWhenFilterEmpty() {
+        viewModel.onActivityTypesSelected(listOf())
+
+        assertThat((viewModel.filtersUiState.value as FiltersShown).activityTypeLabel)
+                .isEqualTo(UiStringRes(R.string.activity_log_activity_type_filter_label))
+    }
+
+    @Test
+    fun activityTypeLabelWithNameShownWhenFilterHasOneItem() {
+        val activityTypeName = "Backups and Restores"
+        val activityTypeCount = 5
+        viewModel.onActivityTypesSelected(listOf(ActivityTypeModel("backup", activityTypeName, activityTypeCount)))
+
+        assertThat((viewModel.filtersUiState.value as FiltersShown).activityTypeLabel)
+                .isEqualTo(UiStringText(activityTypeName))
+    }
+
+    @Test
+    fun activityTypeLabelWithCountShownWhenFilterHasMoreThanOneItem() {
+        viewModel.onActivityTypesSelected(
+                listOf(
+                        ActivityTypeModel("user", "User", 10),
+                        ActivityTypeModel("backup", "Backup", 5)
+                )
+        )
+
+        val params = listOf(UiStringText("2"))
+        assertThat((viewModel.filtersUiState.value as FiltersShown).activityTypeLabel)
+                .isEqualTo(UiStringResWithParams(R.string.activity_log_activity_type_filter_active_label, params))
+    }
+
+    @Test
+    fun dateRangeTrackDateRangeFilterClearedEventFired() {
+        viewModel.onClearDateRangeFilterClicked()
+
+        verify(activityLogTracker).trackDateRangeFilterCleared(rewindableOnly)
+    }
+
+    @Test
+    fun verifyActivityLogEmptyScreenTextsWhenFiltersAreEmpty() {
+        viewModel.onClearDateRangeFilterClicked()
+        viewModel.onClearActivityTypeFilterClicked()
+
+        assertThat(viewModel.emptyUiState.value).isEqualTo(EmptyUiState.ActivityLog.EmptyFilters)
+    }
+
+    @Test
+    fun verifyActivityLogEmptyScreenTextsWhenDateRangeFilterSet() {
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+
+        viewModel.onDateRangeSelected(Pair(1L, 2L))
+
+        assertThat(viewModel.emptyUiState.value).isEqualTo(EmptyUiState.ActivityLog.ActiveFilters)
+    }
+
+    @Test
+    fun verifyActivityLogEmptyScreenTextsWhenActivityTypeFilterSet() {
+        viewModel.onActivityTypesSelected(listOf(ActivityTypeModel("user", "User", 10)))
+
+        assertThat(viewModel.emptyUiState.value).isEqualTo(EmptyUiState.ActivityLog.ActiveFilters)
+    }
+
+    @Test
+    fun verifyBackupEmptyScreenTextsWhenFilterIsEmpty() {
+        viewModel.rewindableOnly = true
+
+        viewModel.onClearDateRangeFilterClicked()
+
+        assertThat(viewModel.emptyUiState.value).isEqualTo(EmptyUiState.Backup.EmptyFilters)
+    }
+
+    @Test
+    fun verifyBackupEmptyScreenTextsWhenDateRangeFilterSet() {
+        viewModel.rewindableOnly = true
+        whenever(dateUtils.formatDateRange(anyOrNull(), anyOrNull(), anyOrNull())).thenReturn("TEST")
+
+        viewModel.onDateRangeSelected(Pair(1L, 2L))
+
+        assertThat(viewModel.emptyUiState.value).isEqualTo(EmptyUiState.Backup.ActiveFilters)
+    }
+
+    /* RELOAD EVENTS - RESTORE */
+
+    @Test
+    fun `given no restore progress item, when reloading events, then the menu items are visible`() {
+        val displayRestoreProgressItem = false
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = displayRestoreProgressItem)
+        )
 
         assertEquals(
                 viewModel.events.value,
-                expectedActivityList()
+                expectedActivityList(
+                        displayRestoreProgress = displayRestoreProgressItem,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayRestoreProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
         )
+    }
 
-        assertEquals(viewModel.eventListStatus.value, ActivityLogListStatus.DONE)
+    @Test
+    fun `given no restore progress item, when reloading events, then item is not visible`() {
+        val displayRestoreProgressItem = false
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = displayRestoreProgressItem)
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = displayRestoreProgressItem,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayRestoreProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
     }
 
     @Test
-    fun onDataFetchedShowsFooterIfCannotLoadMoreAndIsFreeSite() = runBlocking {
-        val canLoadMore = false
-        whenever(site.hasFreePlan).thenReturn(true)
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(1, canLoadMore, FETCH_ACTIVITIES))
+    fun `given no restore progress item, when reloading events, then move to top is not triggered`() {
+        val displayRestoreProgressItem = false
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = displayRestoreProgressItem)
+        )
+
+        assertTrue(moveToTopEvents.isEmpty())
+    }
 
-        viewModel.start(site)
+    @Test
+    fun `given restore progress item, when reloading events, then the menu items are not visible`() {
+        val displayRestoreProgressItem = true
+        val displayRestoreProgressWithDate = false
+        initRestoreProgressMocks(displayRestoreProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = displayRestoreProgressItem)
+        )
 
         assertEquals(
                 viewModel.events.value,
-                expectedActivityList(true)
+                expectedActivityList(
+                        displayRestoreProgress = displayRestoreProgressItem,
+                        restoreProgressWithDate = displayRestoreProgressWithDate,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayRestoreProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
         )
+    }
 
-        assertEquals(viewModel.eventListStatus.value, ActivityLogListStatus.DONE)
+    @Test
+    fun `given restore progress item with date, when reloading events, then item is visible with date`() {
+        val displayRestoreProgressItem = true
+        val displayRestoreProgressWithDate = true
+        initRestoreProgressMocks(displayRestoreProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = displayRestoreProgressItem, rewindId = REWIND_ID)
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = displayRestoreProgressItem,
+                        restoreProgressWithDate = displayRestoreProgressWithDate,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayRestoreProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
     }
 
-    private fun expectedActivityList(isLastPageAndFreeSite: Boolean = false, canLoadMore: Boolean = false):
-            List<ActivityLogListItem> {
-        val activityLogListItems = mutableListOf<ActivityLogListItem>()
-        val first = Event(activityLogList[0], true)
-        val second = Event(activityLogList[1], true)
-        val third = Event(activityLogList[2], true)
-        activityLogListItems.add(Header(first.formattedDate))
-        activityLogListItems.add(first)
-        activityLogListItems.add(second)
-        activityLogListItems.add(Header(third.formattedDate))
-        activityLogListItems.add(third)
-        if (isLastPageAndFreeSite) {
-            activityLogListItems.add(Footer)
-        }
-        if (canLoadMore) {
-            activityLogListItems.add(Loading)
-        }
-        return activityLogListItems
+    @Test
+    fun `given restore progress item without date, when reloading events, then item is visible without date`() {
+        val displayRestoreProgressItem = true
+        val displayRestoreProgressWithDate = false
+        initRestoreProgressMocks(displayRestoreProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = displayRestoreProgressItem)
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = displayRestoreProgressItem,
+                        restoreProgressWithDate = displayRestoreProgressWithDate,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayRestoreProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
     }
 
     @Test
-    fun onDataFetchedDoesNotLoadMoreDataIfCannotLoadMore() = runBlocking<Unit> {
-        val canLoadMore = false
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(1, canLoadMore, FETCH_ACTIVITIES))
+    fun `given restore progress item, when reloading events, then move to top is triggered`() {
+        initRestoreProgressMocks()
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = true, rewindId = REWIND_ID)
+        )
 
-        viewModel.start(site)
+        assertTrue(moveToTopEvents.isNotEmpty())
+    }
 
-        reset(store)
+    @Test
+    fun `given restore finished with date, when reloading events, then show restore finished message with date`() {
+        val date = activity().published
+        initRestoreProgressFinishedMocks(date, true)
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(
+                        displayProgress = false,
+                        isCompleted = true,
+                        rewindId = REWIND_ID,
+                        published = date
+                )
+        )
 
-        viewModel.onScrolledToBottom()
+        assertEquals(snackbarMessages.firstOrNull(), RESTORED_DATE_TIME)
+    }
 
-        verify(store, never()).fetchActivities(any())
+    @Test
+    fun `given restore finished without date, when reloading events, then show restore finished msg without date`() {
+        val date = null
+        initRestoreProgressFinishedMocks(date, false)
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(
+                        displayProgress = false,
+                        isCompleted = true,
+                        rewindId = REWIND_ID,
+                        published = date
+                )
+        )
+
+        assertEquals(snackbarMessages.firstOrNull(), RESTORED_NO_DATE)
     }
 
+    /* RELOAD EVENTS - BACKUP DOWNLOAD */
+
     @Test
-    fun onDataFetchedGoesToTopWhenSomeRowsAffected() = runBlocking {
+    fun `given no backup progress item, when reloading events, then the menu items are visible`() {
+        val displayBackupProgressItem = false
+        val displayNoticeItem = false
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem
+                )
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given no backup progress item, when reloading events, then item is not visible`() {
+        val displayBackupProgressItem = false
+        val displayNoticeItem = false
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem
+                )
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given no backup progress item, when reloading events, then move to top is not triggered`() {
+        val displayBackupProgressItem = false
+        val displayNoticeItem = false
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem
+                )
+        )
+
         assertTrue(moveToTopEvents.isEmpty())
+    }
+
+    @Test
+    fun `given backup progress item, when reloading events, then the menu items are not visible`() {
+        val displayBackupProgressItem = true
+        val displayBackupProgressWithDate = false
+        val displayNoticeItem = false
+        initBackupProgressMocks(displayBackupProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem
+                )
+        )
 
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(10, true, FETCH_ACTIVITIES))
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = displayBackupProgressWithDate,
+                        emptyList = false,
+                        rewindDisabled = displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
 
-        viewModel.start(site)
+    @Test
+    fun `given backup progress item with date, when reloading events, then item is visible with date`() {
+        val displayBackupProgressItem = true
+        val displayBackupProgressWithDate = true
+        val displayNoticeItem = false
+        initBackupProgressMocks(displayBackupProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem,
+                        rewindId = REWIND_ID
+                )
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = displayBackupProgressWithDate,
+                        emptyList = false,
+                        rewindDisabled = displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given backup progress item without date, when reloading events, then item is visible without date`() {
+        val displayBackupProgressItem = true
+        val displayBackupProgressWithDate = false
+        val displayNoticeItem = false
+        initBackupProgressMocks(displayBackupProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem
+                )
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = displayBackupProgressWithDate,
+                        emptyList = false,
+                        rewindDisabled = displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given backup progress item, when reloading events, then move to top is triggered`() {
+        initBackupProgressMocks()
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = true,
+                        displayNotice = false,
+                        rewindId = REWIND_ID
+                )
+        )
 
         assertTrue(moveToTopEvents.isNotEmpty())
     }
 
     @Test
-    fun onDataFetchedDoesNotLoadMoreDataIfNoRowsAffected() = runBlocking<Unit> {
-        val canLoadMore = true
+    fun `given backup complete, when reloading events, then move to top is triggered`() {
+        initBackupDownloadCompleteMocks()
 
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(0, canLoadMore, FETCH_ACTIVITIES))
+        viewModel.reloadEvents(done = false, backupDownloadEvent = backupDownloadCompleteEvent())
 
-        viewModel.start(site)
+        assertTrue(moveToTopEvents.isNotEmpty())
+    }
 
-        verify(store).getActivityLogForSite(site, false)
+    @Test
+    fun `given backup finished, when reloading events, then list contains notice item`() {
+        initBackupDownloadCompleteMocks()
+
+        viewModel.reloadEvents(done = false, backupDownloadEvent = backupDownloadCompleteEvent())
+
+        assertThat(events.first()?.first()).isInstanceOf(Notice::class.java)
     }
 
     @Test
-    fun headerIsDisplayedForFirstItemOrWhenDifferentThenPrevious() = runBlocking {
-        val canLoadMore = true
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(3, canLoadMore, FETCH_ACTIVITIES))
+    fun `given notice shown, when download clicked, then a navigationEvent is posted`() {
+        initBackupDownloadCompleteMocks()
 
-        viewModel.start(site)
+        viewModel.reloadEvents(done = false, backupDownloadEvent = backupDownloadCompleteEvent())
 
-        assertTrue(events.last()?.get(0) is Header)
-        assertTrue(events.last()?.get(3) is Header)
+        val notice = events.first()?.filterIsInstance<Notice>()
+        notice?.first()?.primaryAction?.invoke()
+        assertThat(navigationEvents.last().peekContent()).isInstanceOf(DownloadBackupFile::class.java)
     }
 
     @Test
-    fun onItemClickShowsItemDetail() {
-        assertTrue(itemDetails.isEmpty())
+    fun `given notice shown, when dismiss clicked, then item is removed from list`() {
+        initBackupDownloadCompleteMocks()
 
-        viewModel.onItemClicked(event)
+        viewModel.reloadEvents(done = false, backupDownloadEvent = backupDownloadCompleteEvent())
 
-        assertEquals(itemDetails.firstOrNull(), event)
+        events.first()
+                ?.filterIsInstance<Notice>()
+                ?.first()
+                ?.secondaryAction
+                ?.invoke()
+        assertThat(events.last()?.filterIsInstance<Notice>()).isEmpty()
     }
 
     @Test
-    fun onActionButtonClickShowsRewindDialog() {
-        assertTrue(rewindDialogs.isEmpty())
+    fun `given notice shown, when dismiss clicked, then dismiss button tapped event is tracked`() {
+        initBackupDownloadCompleteMocks()
 
-        viewModel.onActionButtonClicked(event)
+        viewModel.reloadEvents(done = false, backupDownloadEvent = backupDownloadCompleteEvent())
+        events.first()
+                ?.filterIsInstance<Notice>()
+                ?.first()
+                ?.secondaryAction
+                ?.invoke()
 
-        assertEquals(rewindDialogs.firstOrNull(), event)
+        verify(activityLogTracker).trackDownloadBackupDismissButtonClicked(rewindableOnly)
     }
 
     @Test
-    fun onRewindConfirmedTriggersRewindOperation() {
-        viewModel.start(site)
-        val rewindId = "rewindId"
+    fun `given notice shown, when download clicked, then download button tapped event is tracked`() {
+        initBackupDownloadCompleteMocks()
 
-        viewModel.onRewindConfirmed(rewindId)
+        viewModel.reloadEvents(done = false, backupDownloadEvent = backupDownloadCompleteEvent())
+        events.first()?.filterIsInstance<Notice>()?.first()?.primaryAction?.invoke()
 
-        verify(rewindStatusService).rewind(rewindId, site)
+        verify(activityLogTracker).trackDownloadBackupDownloadButtonClicked(rewindableOnly)
     }
 
     @Test
-    fun onRewindConfirmedShowsRewindStartedMessage() {
-        assertTrue(snackbarMessages.isEmpty())
-        whenever(rewindStatusService.rewindingActivity).thenReturn(activity)
-        val snackBarMessage = "snackBar message"
-        whenever(resourceProvider.getString(any(), any(), any())).thenReturn(snackBarMessage)
+    fun `given backup progress item, when reloading events, then the notice banner is not visible`() {
+        val displayBackupProgressItem = true
+        val displayBackupProgressWithDate = true
+        val displayNoticeItem = false
+        initBackupProgressMocks(displayBackupProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem,
+                        rewindId = REWIND_ID
+                )
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = displayBackupProgressWithDate,
+                        emptyList = false,
+                        rewindDisabled = displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
 
-        viewModel.onRewindConfirmed("rewindId")
+    /* RELOAD EVENTS - RESTORE AND BACKUP DOWNLOAD */
 
-        assertEquals(snackbarMessages.firstOrNull(), snackBarMessage)
+    @Test
+    fun `given restore and backup progress items, when reloading events, then both items are visible`() {
+        val displayRestoreProgressItem = true
+        val displayRestoreProgressWithDate = true
+        val displayBackupProgressItem = true
+        val displayBackupProgressWithDate = true
+        val displayNoticeItem = false
+        initRestoreProgressMocks(displayRestoreProgressWithDate)
+        initBackupProgressMocks(displayBackupProgressWithDate)
+
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(
+                        displayProgress = displayRestoreProgressItem,
+                        rewindId = REWIND_ID
+                ),
+                backupDownloadEvent = BackupDownloadEvent(
+                        displayProgress = displayBackupProgressItem,
+                        displayNotice = displayNoticeItem,
+                        rewindId = REWIND_ID
+                )
+        )
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = displayRestoreProgressItem,
+                        restoreProgressWithDate = displayRestoreProgressWithDate,
+                        displayBackupProgress = displayBackupProgressItem,
+                        backupProgressWithDate = displayBackupProgressWithDate,
+                        emptyList = false,
+                        rewindDisabled = displayRestoreProgressItem || displayBackupProgressItem,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
     }
 
+    /* RELOAD EVENTS - DONE */
+
     @Test
-    fun loadsNextPageOnScrollToBottom() = runBlocking {
-        whenever(store.fetchActivities(any())).thenReturn(OnActivityLogFetched(10, true, FETCH_ACTIVITIES))
+    fun `given not done and the event list is empty, when reloading events, then the loading item is not visible`() {
+        whenever(store.getActivityLogForSite(site, false, rewindableOnly)).thenReturn(emptyList())
+        val done = false
 
-        viewModel.start(site)
-        reset(store)
+        viewModel.reloadEvents(done)
 
-        viewModel.onScrolledToBottom()
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = true,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = false,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given not done and the event list is not empty, when reloading events, then the loading item is visible`() {
+        whenever(store.getActivityLogForSite(site, false, rewindableOnly)).thenReturn(activityList.toList())
+        val done = false
 
-        assertFetchEvents(true)
+        viewModel.reloadEvents(done)
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
     }
 
     @Test
-    fun dateRangePickerIsNotVisibleWhenFiltersFeatureFlagIsDisabled() = runBlocking {
-        whenever(activityLogFiltersFeatureConfig.isEnabled()).thenReturn(false)
+    fun `given done and the event list is empty, when reloading events, then the loading item is not visible`() {
+        whenever(store.getActivityLogForSite(site, false, rewindableOnly)).thenReturn(emptyList())
+        val done = true
 
-        viewModel.start(site)
+        viewModel.reloadEvents(done)
 
-        assertEquals(false, viewModel.dateRangePickerVisibility.value)
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = true,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = false,
+                        withFooter = false
+                )
+        )
     }
 
     @Test
-    fun dateRangePickerIsVisibleWhenFiltersFeatureFlagIsEnabled() = runBlocking {
-        whenever(activityLogFiltersFeatureConfig.isEnabled()).thenReturn(true)
+    fun `given done and the event list is not empty, when reloading events, then the loading item is not visible`() {
+        whenever(store.getActivityLogForSite(site, false, rewindableOnly)).thenReturn(activityList.toList())
+        val done = true
 
-        viewModel.start(site)
+        viewModel.reloadEvents(done)
 
-        assertEquals(true, viewModel.dateRangePickerVisibility.value)
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = false,
+                        withFooter = false
+                )
+        )
     }
 
+    @Test
+    fun `given done a not empty event list and free plan, when reloading events, then the footer item is visible`() {
+        whenever(site.hasFreePlan).thenReturn(true)
+        whenever(store.getActivityLogForSite(site, false, rewindableOnly)).thenReturn(activityList.toList())
+        val done = true
+
+        viewModel.reloadEvents(done)
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = false,
+                        withFooter = true
+                )
+        )
+    }
+
+    /* QUERY RESTORE STATUS */
+
+    @Test
+    fun `when query restore status, then trigger get restore status`() = test {
+        viewModel.onQueryRestoreStatus(REWIND_ID, RESTORE_ID)
+
+        verify(getRestoreStatusUseCase).getRestoreStatus(site, RESTORE_ID)
+    }
+
+    @Test
+    fun `given status is a progress, when query restore status, then reload events for progress`() = test {
+        val progress = RestoreRequestState.Progress(REWIND_ID, 50)
+        whenever(getRestoreStatusUseCase.getRestoreStatus(site, RESTORE_ID)).thenReturn(flow { emit(progress) })
+        initRestoreProgressMocks()
+
+        viewModel.onQueryRestoreStatus(REWIND_ID, RESTORE_ID)
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = true,
+                        restoreProgressWithDate = true,
+                        emptyList = false,
+                        rewindDisabled = true,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given status is a complete, when query restore status, then request events update for complete`() = test {
+        val progress = RestoreRequestState.Progress(REWIND_ID, 50)
+        val complete = RestoreRequestState.Complete(REWIND_ID, RESTORE_ID)
+        whenever(getRestoreStatusUseCase.getRestoreStatus(site, RESTORE_ID))
+                .thenReturn(flow { emit(progress); emit(complete) })
+        initRestoreProgressMocks()
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(10, false, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.onQueryRestoreStatus(REWIND_ID, RESTORE_ID)
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = false,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given status is something else, when query restore status, then do not trigger anything`() = test {
+        val success = RestoreRequestState.Success(REWIND_ID, REWIND_ID, RESTORE_ID)
+        whenever(getRestoreStatusUseCase.getRestoreStatus(site, RESTORE_ID)).thenReturn(flow { emit(success) })
+
+        viewModel.onQueryRestoreStatus(REWIND_ID, RESTORE_ID)
+
+        assertNull(viewModel.events.value)
+    }
+
+    @Test
+    fun `when query restore status, then show restore started message`() {
+        whenever(store.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(activity())
+        whenever(resourceProvider.getString(eq(R.string.activity_log_rewind_started_snackbar_message), any(), any()))
+                .thenReturn(RESTORE_STARTED)
+
+        viewModel.onQueryRestoreStatus(REWIND_ID, RESTORE_ID)
+
+        assertEquals(snackbarMessages.firstOrNull(), RESTORE_STARTED)
+    }
+
+    /* QUERY BACKUP DOWNLOAD STATUS */
+
+    @Test
+    fun `when query backup status, then trigger get backup download status`() = test {
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.PROGRESS.id)
+
+        verify(getBackupDownloadStatusUseCase).getBackupDownloadStatus(site, DOWNLOAD_ID)
+    }
+
+    @Test
+    fun `given status is a progress, when query backup status, then reload events for progress`() = test {
+        val progress = BackupDownloadRequestState.Progress(REWIND_ID, 50)
+        whenever(getBackupDownloadStatusUseCase.getBackupDownloadStatus(site, DOWNLOAD_ID))
+                .thenReturn(flow { emit(progress) })
+        initBackupProgressMocks()
+
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.PROGRESS.id)
+
+        assertEquals(
+                viewModel.events.value,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = true,
+                        backupProgressWithDate = true,
+                        emptyList = false,
+                        rewindDisabled = true,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = true,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given status is a complete, when query backup status, then request events update for complete`() = test {
+        val progress = BackupDownloadRequestState.Progress(REWIND_ID, 50)
+        val complete = BackupDownloadRequestState.Complete(
+                REWIND_ID,
+                DOWNLOAD_ID,
+                DOWNLOAD_URL,
+                DOWNLOAD_PUBLISHED,
+                DOWNLOAD_VALID_UNTIL,
+                DOWNLOAD_IS_VALID
+        )
+        whenever(getBackupDownloadStatusUseCase.getBackupDownloadStatus(site, DOWNLOAD_ID))
+                .thenReturn(flow { emit(progress); emit(complete) })
+        initBackupProgressMocks()
+        initBackupDownloadCompleteMocks()
+        whenever(store.fetchActivities(anyOrNull()))
+                .thenReturn(OnActivityLogFetched(10, false, ActivityLogAction.FETCH_ACTIVITIES))
+
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.COMPLETE.id)
+
+        assertThat(viewModel.events.value?.first() as? Notice).isNotNull
+        val events = viewModel.events.value?.filterNot { it is Notice }
+        assertEquals(
+                events,
+                expectedActivityList(
+                        displayRestoreProgress = false,
+                        restoreProgressWithDate = false,
+                        displayBackupProgress = false,
+                        backupProgressWithDate = false,
+                        emptyList = false,
+                        rewindDisabled = false,
+                        isLastPageAndFreeSite = false,
+                        canLoadMore = false,
+                        withFooter = false
+                )
+        )
+    }
+
+    @Test
+    fun `given status is something else, when query backup status, then do not trigger anything`() = test {
+        val success = BackupDownloadRequestState.Success(REWIND_ID, REWIND_ID, DOWNLOAD_ID)
+        whenever(getBackupDownloadStatusUseCase.getBackupDownloadStatus(site, DOWNLOAD_ID))
+                .thenReturn(flow { emit(success) })
+
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.CANCEL.id)
+
+        assertNull(viewModel.events.value)
+    }
+
+    @Test
+    fun `when query backup status in progress, then show backup download started message`() {
+        whenever(store.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(activity())
+        whenever(resourceProvider.getString(eq(R.string.activity_log_backup_started_snackbar_message), any(), any()))
+                .thenReturn(BACKUP_STARTED)
+
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.PROGRESS.id)
+
+        assertEquals(snackbarMessages.firstOrNull(), BACKUP_STARTED)
+    }
+
+    @Test
+    fun `given published date, when query backup status complete, then show dates backup finished message`() {
+        whenever(store.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(activity())
+        whenever(resourceProvider.getString(eq(R.string.activity_log_backup_finished_snackbar_message), any(), any()))
+                .thenReturn(BACKED_UP_DATE_TIME)
+
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.COMPLETE.id)
+
+        assertEquals(snackbarMessages.firstOrNull(), BACKED_UP_DATE_TIME)
+    }
+
+    @Test
+    fun `given no published date, when query backup status complete, then show no dates backup finished message`() {
+        whenever(store.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(null)
+        whenever(resourceProvider.getString(eq(R.string.activity_log_backup_finished_snackbar_message_no_dates)))
+                .thenReturn(BACKED_UP_NO_DATE)
+
+        viewModel.onQueryBackupDownloadStatus(REWIND_ID, DOWNLOAD_ID, JetpackBackupDownloadActionState.COMPLETE.id)
+
+        assertEquals(snackbarMessages.firstOrNull(), BACKED_UP_NO_DATE)
+    }
+
+    /* PRIVATE */
+
+    private fun firstActivity() = activity()
+
+    private fun secondActivity() = activity(rewindable = false)
+
+    private fun thirdActivity() = activity(published = activityPublishedTime(1987, 5, 26))
+
+    private fun activity(
+        rewindable: Boolean = true,
+        published: Date = activityPublishedTime(1985, 8, 27)
+    ) = ActivityLogModel(
+            activityID = "activityId",
+            summary = "",
+            content = null,
+            name = "",
+            type = "",
+            gridicon = "",
+            status = "",
+            rewindable = rewindable,
+            rewindID = "",
+            published = published,
+            actor = null
+    )
+
+    private fun activityPublishedTime(year: Int, month: Int, date: Int): Date {
+        val calendar = Calendar.getInstance()
+        calendar.set(year, month, date)
+        return calendar.time
+    }
+
+    private fun expectedActivityList(
+        displayRestoreProgress: Boolean = false,
+        restoreProgressWithDate: Boolean = false,
+        displayBackupProgress: Boolean = false,
+        backupProgressWithDate: Boolean = false,
+        emptyList: Boolean = false,
+        rewindDisabled: Boolean = true,
+        isLastPageAndFreeSite: Boolean = false,
+        canLoadMore: Boolean = false,
+        withFooter: Boolean = false
+    ): List<ActivityLogListItem> {
+        val list = mutableListOf<ActivityLogListItem>()
+        if (displayRestoreProgress || displayBackupProgress) {
+            list.add(ActivityLogListItem.Header(NOW))
+        }
+        if (displayRestoreProgress) {
+            if (restoreProgressWithDate) {
+                list.add(ActivityLogListItem.Progress(RESTORING_CURRENTLY, RESTORING_DATE_TIME, RESTORE))
+            } else {
+                list.add(ActivityLogListItem.Progress(RESTORING_CURRENTLY, RESTORING_NO_DATE, RESTORE))
+            }
+        }
+        if (displayBackupProgress) {
+            if (backupProgressWithDate) {
+                list.add(ActivityLogListItem.Progress(BACKING_UP_CURRENTLY, BACKING_UP_DATE_TIME, BACKUP_DOWNLOAD))
+            } else {
+                list.add(ActivityLogListItem.Progress(BACKING_UP_CURRENTLY, BACKING_UP_NO_DATE, BACKUP_DOWNLOAD))
+            }
+        }
+        if (!emptyList) {
+            firstItem(rewindDisabled).let {
+                list.add(ActivityLogListItem.Header(it.formattedDate))
+                list.add(it)
+            }
+            list.add(secondItem(rewindDisabled))
+            thirdItem(rewindDisabled).let {
+                list.add(ActivityLogListItem.Header(it.formattedDate))
+                list.add(it)
+            }
+        }
+        if (isLastPageAndFreeSite) {
+            list.add(ActivityLogListItem.Footer)
+        }
+        if (canLoadMore) {
+            list.add(ActivityLogListItem.Loading)
+        }
+
+        if (withFooter) {
+            list.add(ActivityLogListItem.Footer)
+        }
+        return list
+    }
+
+    private fun firstItem(rewindDisabled: Boolean) = ActivityLogListItem.Event(
+            model = activityList[0],
+            rewindDisabled = rewindDisabled
+    )
+
+    private fun secondItem(rewindDisabled: Boolean) = ActivityLogListItem.Event(
+            model = activityList[1],
+            rewindDisabled = rewindDisabled
+    )
+
+    private fun thirdItem(rewindDisabled: Boolean) = ActivityLogListItem.Event(
+            model = activityList[2],
+            rewindDisabled = rewindDisabled
+    )
+
     private suspend fun assertFetchEvents(canLoadMore: Boolean = false) {
         verify(store).fetchActivities(fetchActivityLogCaptor.capture())
 
         fetchActivityLogCaptor.lastValue.apply {
-            assertEquals(this.loadMore, canLoadMore)
-            assertEquals(this.site, site)
+            assertEquals(canLoadMore, loadMore)
+            assertEquals(this@ActivityLogViewModelTest.site, site)
         }
     }
 
-    private fun initializeActivityList(): List<ActivityLogModel> {
-        val birthday = Calendar.getInstance()
-        birthday.set(1985, 8, 27)
+    private fun event() = ActivityLogListItem.Event(
+            activityId = "activityId",
+            title = "",
+            description = ",",
+            gridIcon = null,
+            eventStatus = null,
+            isRewindable = true,
+            rewindId = null,
+            date = Date(),
+            isButtonVisible = true,
+            buttonIcon = ActivityLogListItem.Icon.DEFAULT
+    )
 
-        val list = mutableListOf<ActivityLogModel>()
-        val activity = ActivityLogModel("", "", null, "", "", "",
-                "", true, "", birthday.time)
-        list.add(activity)
-        list.add(activity.copy())
+    private fun backupDownloadCompleteEvent() = BackupDownloadEvent(
+            displayProgress = false,
+            displayNotice = true,
+            isCompleted = true,
+            rewindId = REWIND_ID,
+            published = activity().published,
+            url = "www.wordpress.com",
+            validUntil = activity().published,
+            downloadId = 10L
+    )
 
-        birthday.set(1987, 5, 26)
-        list.add(activity.copy(published = birthday.time))
+    private fun initRestoreProgressMocks(displayProgressWithDate: Boolean = true) {
+        if (displayProgressWithDate) {
+            whenever(store.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(activity())
+        }
+        whenever(resourceProvider.getString(R.string.now)).thenReturn(NOW)
+        whenever(resourceProvider.getString(R.string.activity_log_currently_restoring_title))
+                .thenReturn(RESTORING_CURRENTLY)
+        if (displayProgressWithDate) {
+            whenever(resourceProvider.getString(eq(R.string.activity_log_currently_restoring_message), any(), any()))
+                    .thenReturn(RESTORING_DATE_TIME)
+        } else {
+            whenever(resourceProvider.getString(R.string.activity_log_currently_restoring_message_no_dates))
+                    .thenReturn(RESTORING_NO_DATE)
+        }
+    }
 
-        return list
+    private fun initBackupProgressMocks(displayProgressWithDate: Boolean = true) {
+        if (displayProgressWithDate) {
+            whenever(store.getActivityLogItemByRewindId(REWIND_ID)).thenReturn(activity())
+        }
+        whenever(resourceProvider.getString(R.string.now)).thenReturn(NOW)
+        whenever(resourceProvider.getString(R.string.activity_log_currently_backing_up_title))
+                .thenReturn(BACKING_UP_CURRENTLY)
+        if (displayProgressWithDate) {
+            whenever(resourceProvider.getString(eq(R.string.activity_log_currently_backing_up_message), any(), any()))
+                    .thenReturn(BACKING_UP_DATE_TIME)
+        } else {
+            whenever(resourceProvider.getString(R.string.activity_log_currently_backing_up_message_no_dates))
+                    .thenReturn(BACKING_UP_NO_DATE)
+        }
+    }
+
+    private fun initRestoreProgressFinishedMocks(date: Date?, displayProgressWithDate: Boolean) {
+        initRestoreProgressMocks(displayProgressWithDate)
+        viewModel.reloadEvents(
+                done = false,
+                restoreEvent = RestoreEvent(displayProgress = true, rewindId = REWIND_ID)
+        )
+        if (date != null) {
+            whenever(
+                    resourceProvider.getString(
+                            eq(R.string.activity_log_rewind_finished_snackbar_message),
+                            any(),
+                            any()
+                    )
+            ).thenReturn(RESTORED_DATE_TIME)
+        } else {
+            whenever(resourceProvider.getString(R.string.activity_log_rewind_finished_snackbar_message_no_dates))
+                    .thenReturn(RESTORED_NO_DATE)
+        }
+    }
+
+    private fun initBackupDownloadCompleteMocks() {
+        whenever(
+                resourceProvider.getString(
+                        eq(R.string.activity_log_backup_download_notice_description_with_two_params),
+                        any(),
+                        any()
+                )
+        ).thenReturn(BACKUP_NOTICE)
+        whenever(
+                resourceProvider.getString(
+                        eq(R.string.activity_log_backup_finished_snackbar_message),
+                        any(),
+                        any()
+                )
+        ).thenReturn(BACKED_UP_DATE_TIME)
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt
index 0e0370712fd2..9e2d79024c19 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModelTest.kt
@@ -1,10 +1,14 @@
 package org.wordpress.android.viewmodel.main
 
+import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.Observer
+import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.never
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
+import com.nhaarman.mockitokotlin2.verifyZeroInteractions
 import com.nhaarman.mockitokotlin2.whenever
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
@@ -16,11 +20,19 @@ import org.wordpress.android.BaseUnitTest
 import org.wordpress.android.R
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.FEATURE_ANNOUNCEMENT_SHOWN_ON_APP_UPGRADE
 import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.FOLLOW_SITE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.PUBLISH_POST
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.UPDATE_SITE_TITLE
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.VIEW_SITE
 import org.wordpress.android.test
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_PAGE
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_POST
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_STORY
+import org.wordpress.android.ui.main.MainActionListItem.ActionType.NO_ACTION
 import org.wordpress.android.ui.main.MainActionListItem.CreateAction
+import org.wordpress.android.ui.main.MainFabUiState
+import org.wordpress.android.ui.mysite.QuickStartRepository
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncement
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncementItem
@@ -28,19 +40,24 @@ import org.wordpress.android.ui.whatsnew.FeatureAnnouncementProvider
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.NoDelayCoroutineDispatcher
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
-import org.wordpress.android.util.config.WPStoriesFeatureConfig
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
+import org.wordpress.android.viewmodel.main.WPMainActivityViewModel.FocusPointInfo
 
 @RunWith(MockitoJUnitRunner::class)
 class WPMainActivityViewModelTest : BaseUnitTest() {
     private lateinit var viewModel: WPMainActivityViewModel
 
+    private var loginFlowTriggered: Boolean = false
+    private var switchTabTriggered: Boolean = false
+
     @Mock private lateinit var appPrefsWrapper: AppPrefsWrapper
     @Mock lateinit var featureAnnouncementProvider: FeatureAnnouncementProvider
     @Mock lateinit var onFeatureAnnouncementRequestedObserver: Observer<Unit>
     @Mock lateinit var onQuickStartCompletedEventObserver: Observer<Unit>
     @Mock lateinit var buildConfigWrapper: BuildConfigWrapper
     @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
-    @Mock lateinit var wpStoriesFeatureConfig: WPStoriesFeatureConfig
+    @Mock lateinit var mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig
+    @Mock lateinit var quickStartRepository: QuickStartRepository
 
     private val featureAnnouncement = FeatureAnnouncement(
             "14.7",
@@ -59,18 +76,25 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
                     )
             )
     )
+    private lateinit var activeTask: MutableLiveData<QuickStartTask?>
+    private lateinit var externalFocusPointEvents: MutableList<List<FocusPointInfo>>
+    private var fabUiState: MainFabUiState? = null
 
     @Before
     fun setUp() {
         whenever(appPrefsWrapper.isMainFabTooltipDisabled()).thenReturn(false)
         whenever(buildConfigWrapper.getAppVersionCode()).thenReturn(850)
         whenever(buildConfigWrapper.getAppVersionName()).thenReturn("14.7")
+        activeTask = MutableLiveData()
+        externalFocusPointEvents = mutableListOf()
+        whenever(quickStartRepository.activeTask).thenReturn(activeTask)
         viewModel = WPMainActivityViewModel(
                 featureAnnouncementProvider,
                 buildConfigWrapper,
                 appPrefsWrapper,
                 analyticsTrackerWrapper,
-                wpStoriesFeatureConfig,
+                mySiteImprovementsFeatureConfig,
+                quickStartRepository,
                 NoDelayCoroutineDispatcher()
         )
         viewModel.onFeatureAnnouncementRequested.observeForever(
@@ -79,44 +103,176 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         viewModel.completeBottomSheetQuickStartTask.observeForever(
                 onQuickStartCompletedEventObserver
         )
+        viewModel.onFocusPointVisibilityChange.observeForever { event ->
+            event?.getContentIfNotHandled()?.let {
+                externalFocusPointEvents.add(it)
+            }
+        }
         // mainActions is MediatorLiveData and needs observer in order for us to access it's value
         viewModel.mainActions.observeForever { }
+        viewModel.fabUiState.observeForever { fabUiState = it }
+        whenever(mySiteImprovementsFeatureConfig.isEnabled()).thenReturn(false)
+
+        loginFlowTriggered = false
+        switchTabTriggered = false
+    }
+
+    /* FAB VISIBILITY */
+
+    @Test
+    fun `given wordpress app, when page changed to my site, then fab is visible`() {
+        startViewModelWithDefaultParameters()
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isTrue
+    }
+
+    @Test
+    fun `given wordpress app, when page changed away from my site, then fab is hidden`() {
+        startViewModelWithDefaultParameters()
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isFalse
+    }
+
+    @Test
+    fun `given wordpress app, when my site page is resumed, then fab is visible`() {
+        startViewModelWithDefaultParameters()
+
+        viewModel.onResume(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isTrue
+    }
+
+    @Test
+    fun `given wordpress app, when non my site page is resumed, then fab is hidden`() {
+        startViewModelWithDefaultParameters()
+
+        viewModel.onResume(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when page changed to my site, then fab is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when page changed away from my site, then fab is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isFalse
     }
 
     @Test
-    fun `fab visible when asked`() {
+    fun `given jetpack app, when my site page is resumed, then fab is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onResume(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when non my site page is resumed, then fab is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onResume(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabVisible).isFalse
+    }
+
+    /* FAB TOOLTIP VISIBILITY */
+
+    @Test
+    fun `given wordpress app, when page changed to my site, then fab tooltip is visible`() {
         startViewModelWithDefaultParameters()
-        viewModel.onPageChanged(showFab = true, site = initSite(hasFullAccessToContent = true))
-        assertThat(viewModel.fabUiState.value?.isFabVisible).isEqualTo(true)
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isTrue
     }
 
     @Test
-    fun `fab hidden when asked`() {
+    fun `given wordpress app, when page changed away from my site, then fab tooltip is hidden`() {
         startViewModelWithDefaultParameters()
-        viewModel.onPageChanged(showFab = false, site = initSite(hasFullAccessToContent = true))
-        assertThat(viewModel.fabUiState.value?.isFabVisible).isEqualTo(false)
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse
     }
 
     @Test
-    fun `fab tooltip visible when asked`() {
+    fun `given wordpress app, when my site page is resumed, then fab tooltip is visible`() {
         startViewModelWithDefaultParameters()
-        viewModel.onPageChanged(showFab = true, site = initSite(hasFullAccessToContent = true))
-        assertThat(viewModel.fabUiState.value?.isFabTooltipVisible).isEqualTo(true)
+
+        viewModel.onResume(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isTrue
     }
 
     @Test
-    fun `fab tooltip hidden when asked`() {
+    fun `given wordpress app, when non my site page is resumed, then fab tooltip is hidden`() {
         startViewModelWithDefaultParameters()
-        viewModel.onPageChanged(showFab = false, site = initSite(hasFullAccessToContent = true))
-        assertThat(viewModel.fabUiState.value?.isFabTooltipVisible).isEqualTo(false)
+
+        viewModel.onResume(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when page changed to my site, then fab tooltip is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when page changed away from my site, then fab tooltip is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when my site page is resumed, then fab tooltip is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onResume(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse
+    }
+
+    @Test
+    fun `given jetpack app, when non my site page is resumed, then fab tooltip is hidden`() {
+        startViewModelWithDefaultParameters(isJetpackApp = true)
+
+        viewModel.onResume(isOnMySitePageWithValidSite = false, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse
     }
 
+    /* FAB TOOLTIP DISABLED */
+
     @Test
     fun `fab tooltip disabled when tapped`() {
         startViewModelWithDefaultParameters()
         viewModel.onTooltipTapped(initSite(hasFullAccessToContent = true))
         verify(appPrefsWrapper).setMainFabTooltipDisabled(true)
-        assertThat(viewModel.fabUiState.value?.isFabTooltipVisible).isEqualTo(false)
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse()
     }
 
     @Test
@@ -125,7 +281,7 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         whenever(appPrefsWrapper.isMainFabTooltipDisabled()).thenReturn(true)
         viewModel.onFabClicked(initSite(hasFullAccessToContent = false))
         verify(appPrefsWrapper).setMainFabTooltipDisabled(true)
-        assertThat(viewModel.fabUiState.value?.isFabTooltipVisible).isEqualTo(false)
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse()
     }
 
     @Test
@@ -134,7 +290,7 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         whenever(appPrefsWrapper.isMainFabTooltipDisabled()).thenReturn(true)
         viewModel.onFabClicked(initSite(hasFullAccessToContent = true))
         verify(appPrefsWrapper).setMainFabTooltipDisabled(true)
-        assertThat(viewModel.fabUiState.value?.isFabTooltipVisible).isEqualTo(false)
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse()
     }
 
     @Test
@@ -142,7 +298,34 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         startViewModelWithDefaultParameters()
         viewModel.onFabLongPressed(initSite(hasFullAccessToContent = true))
         verify(appPrefsWrapper).setMainFabTooltipDisabled(true)
-        assertThat(viewModel.fabUiState.value?.isFabTooltipVisible).isEqualTo(false)
+        assertThat(fabUiState?.isFabTooltipVisible).isFalse()
+    }
+
+    @Test
+    fun `fab focus point visible when active task is PUBLISH_POST`() {
+        startViewModelWithDefaultParameters()
+        activeTask.value = PUBLISH_POST
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFocusPointVisible).isTrue()
+    }
+
+    @Test
+    fun `fab focus point gone when active task is different`() {
+        startViewModelWithDefaultParameters()
+        activeTask.value = UPDATE_SITE_TITLE
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFocusPointVisible).isFalse()
+    }
+
+    @Test
+    fun `fab focus point gone when active task is null`() {
+        startViewModelWithDefaultParameters()
+        activeTask.value = null
+        viewModel.onPageChanged(isOnMySitePageWithValidSite = true, site = initSite(hasFullAccessToContent = true))
+
+        assertThat(fabUiState?.isFocusPointVisible).isFalse()
     }
 
     @Test
@@ -164,8 +347,7 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `bottom sheet action is new story when new story is tapped if stories enabled`() {
-        setupWPStoriesFeatureConfigEnabled(buildConfigValue = true)
+    fun `bottom sheet action is new story when new story is tapped`() {
         viewModel.start(site = initSite(hasFullAccessToContent = true))
         val action = viewModel.mainActions.value?.first { it.actionType == CREATE_NEW_STORY } as CreateAction
         assertThat(action).isNotNull
@@ -173,20 +355,11 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         assertThat(viewModel.createAction.value).isEqualTo(CREATE_NEW_STORY)
     }
 
-    @Test
-    fun `bottom sheet is shown when user has full access to content if stories feature flag disabled`() {
-        setupWPStoriesFeatureConfigEnabled(buildConfigValue = false)
-        startViewModelWithDefaultParameters()
-        viewModel.onFabClicked(site = initSite(hasFullAccessToContent = true))
-        assertThat(viewModel.createAction.value).isNull()
-        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isEqualTo(true)
-    }
-
     @Test
     fun `bottom sheet does not show quick start focus point by default`() {
         startViewModelWithDefaultParameters()
         viewModel.onFabClicked(site = initSite(hasFullAccessToContent = true))
-        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isEqualTo(true)
+        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isTrue()
         assertThat(viewModel.mainActions.value?.any { it is CreateAction && it.showQuickStartFocusPoint }).isEqualTo(
                 false
         )
@@ -196,7 +369,7 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
     fun `CREATE_NEW_POST action in bottom sheet with active Quick Start completes task and hides the focus point`() {
         startViewModelWithDefaultParameters()
         viewModel.onFabClicked(site = initSite(hasFullAccessToContent = true), shouldShowQuickStartFocusPoint = true)
-        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isEqualTo(true)
+        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isTrue()
         assertThat(viewModel.mainActions.value?.any { it is CreateAction && it.showQuickStartFocusPoint }).isEqualTo(
                 true
         )
@@ -205,17 +378,32 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         assertThat(action).isNotNull
         action.onClickAction?.invoke(CREATE_NEW_POST)
         verify(onQuickStartCompletedEventObserver).onChanged(anyOrNull())
+        verify(quickStartRepository, never()).completeTask(any(), any())
 
         assertThat(viewModel.mainActions.value?.any { it is CreateAction && it.showQuickStartFocusPoint }).isEqualTo(
                 false
         )
     }
 
+    @Test
+    fun `CREATE_NEW_POST action sets task as done in QuickStartRepository when my site improvements turned on`() {
+        whenever(mySiteImprovementsFeatureConfig.isEnabled()).thenReturn(true)
+        startViewModelWithDefaultParameters()
+        viewModel.onFabClicked(site = initSite(hasFullAccessToContent = true), shouldShowQuickStartFocusPoint = true)
+
+        val action = viewModel.mainActions.value?.first { it.actionType == CREATE_NEW_POST } as CreateAction
+        assertThat(action).isNotNull
+        action.onClickAction?.invoke(CREATE_NEW_POST)
+
+        verify(quickStartRepository).completeTask(PUBLISH_POST)
+        verifyZeroInteractions(onQuickStartCompletedEventObserver)
+    }
+
     @Test
     fun `actions that are not CREATE_NEW_POST will not complete quick start task`() {
         startViewModelWithDefaultParameters()
         viewModel.onFabClicked(site = initSite(hasFullAccessToContent = true), shouldShowQuickStartFocusPoint = true)
-        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isEqualTo(true)
+        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isTrue()
         assertThat(viewModel.mainActions.value?.any { it is CreateAction && it.showQuickStartFocusPoint }).isEqualTo(
                 true
         )
@@ -231,17 +419,7 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `new post action is triggered from FAB when user has not full access to content if stories disabled`() {
-        setupWPStoriesFeatureConfigEnabled(buildConfigValue = false)
-        startViewModelWithDefaultParameters()
-        viewModel.onFabClicked(site = initSite(hasFullAccessToContent = false))
-        assertThat(viewModel.isBottomSheetShowing.value).isNull()
-        assertThat(viewModel.createAction.value).isEqualTo(CREATE_NEW_POST)
-    }
-
-    @Test
-    fun `new post action is triggered from FAB when no full access to content if stories enabled but unavailable`() {
-        setupWPStoriesFeatureConfigEnabled(buildConfigValue = true)
+    fun `new post action is triggered from FAB when no full access to content if stories unavailable`() {
         startViewModelWithDefaultParameters()
         viewModel.onFabClicked(site = initSite(hasFullAccessToContent = false, supportsStories = false))
         assertThat(viewModel.isBottomSheetShowing.value).isNull()
@@ -249,65 +427,69 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `bottom sheet is visualized when user has full access to content and has all 3 options if stories enabled`() {
-        setupWPStoriesFeatureConfigEnabled(buildConfigValue = true)
+    fun `bottom sheet is visualized when user has full access to content and has all 3 options`() {
         startViewModelWithDefaultParameters()
         viewModel.onFabClicked(site = initSite(hasFullAccessToContent = true))
         assertThat(viewModel.createAction.value).isNull()
         assertThat(viewModel.mainActions.value?.size).isEqualTo(4) // 3 options plus NO_ACTION, first in list
-        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isEqualTo(true)
+        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isTrue()
     }
 
     @Test
-    fun `bottom sheet is visualized when user has partial access and has only 2 options if stories enabled`() {
-        setupWPStoriesFeatureConfigEnabled(buildConfigValue = true)
+    fun `bottom sheet is visualized when user has partial access and has only 2 options`() {
         startViewModelWithDefaultParameters()
         viewModel.onFabClicked(site = initSite(hasFullAccessToContent = false))
         assertThat(viewModel.createAction.value).isNull()
         assertThat(viewModel.mainActions.value?.size).isEqualTo(3) // 2 options plus NO_ACTION, first in list
-        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isEqualTo(true)
+        assertThat(viewModel.isBottomSheetShowing.value!!.peekContent()).isTrue()
     }
 
     @Test
-    fun `when user taps to open the login page from the bottom sheet empty view cta the correct action is triggered`() {
+    fun `when user taps to open the login page from the bottom sheet empty view cta the login page flow is started`() {
+        setupObservers()
+
         startViewModelWithDefaultParameters()
-        viewModel.onOpenLoginPage()
 
-        assertThat(viewModel.startLoginFlow.value!!.peekContent()).isEqualTo(true)
+        viewModel.onOpenLoginPage(0)
+
+        assertThat(loginFlowTriggered).isTrue
     }
 
     @Test
-    fun `onResume set expected content message when user has full access to content if stories not enabled`() {
-        setupWPStoriesFeatureConfigEnabled(false)
+    fun `when user taps to open the login page from the bottom sheet empty view cta default page is set to My Site`() {
+        setupObservers()
+
         startViewModelWithDefaultParameters()
-        resumeViewModelWithDefaultParameters()
-        assertThat(viewModel.fabUiState.value!!.CreateContentMessageId).isEqualTo(R.string.create_post_page_fab_tooltip)
+
+        viewModel.onOpenLoginPage(0)
+
+        verify(appPrefsWrapper, times(1)).setMainPageIndex(eq(0))
     }
 
     @Test
-    fun `onResume set expected content message when user has not full access to content if stories not enabled`() {
-        setupWPStoriesFeatureConfigEnabled(false)
+    fun `when user taps to open the login page from the bottom sheet empty view cta main page switches to My Site`() {
+        setupObservers()
+
         startViewModelWithDefaultParameters()
-        viewModel.onResume(site = initSite(hasFullAccessToContent = false), showFab = true)
-        assertThat(viewModel.fabUiState.value!!.CreateContentMessageId)
-                .isEqualTo(R.string.create_post_page_fab_tooltip_contributors)
+
+        viewModel.onOpenLoginPage(0)
+
+        assertThat(switchTabTriggered).isTrue
     }
 
     @Test
-    fun `onResume set expected content message when user has full access to content if stories enabled`() {
-        setupWPStoriesFeatureConfigEnabled(true)
+    fun `onResume set expected content message when user has full access to content`() {
         startViewModelWithDefaultParameters()
         resumeViewModelWithDefaultParameters()
-        assertThat(viewModel.fabUiState.value!!.CreateContentMessageId)
+        assertThat(fabUiState!!.CreateContentMessageId)
                 .isEqualTo(R.string.create_post_page_fab_tooltip_stories_enabled)
     }
 
     @Test
-    fun `onResume set expected content message when user has not full access to content if stories enabled`() {
-        setupWPStoriesFeatureConfigEnabled(true)
+    fun `onResume set expected content message when user has not full access to content`() {
         startViewModelWithDefaultParameters()
-        viewModel.onResume(site = initSite(hasFullAccessToContent = false), showFab = true)
-        assertThat(viewModel.fabUiState.value!!.CreateContentMessageId)
+        viewModel.onResume(site = initSite(hasFullAccessToContent = false), isOnMySitePageWithValidSite = true)
+        assertThat(fabUiState!!.CreateContentMessageId)
                 .isEqualTo(R.string.create_post_page_fab_tooltip_contributors_stories_enabled)
     }
 
@@ -411,12 +593,77 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         verify(onFeatureAnnouncementRequestedObserver, times(1)).onChanged(anyOrNull())
     }
 
-    private fun startViewModelWithDefaultParameters() {
+    @Test
+    fun `when the active task needs to show an focus point, emit visible focus point info`() {
+        activeTask.value = FOLLOW_SITE
+
+        assertThat(externalFocusPointEvents).containsExactly(listOf(visibleFollowSiteFocusPointInfo))
+    }
+
+    @Test
+    fun `when the active task doesn't need to show an external focus point, emit invisible focus point info`() {
+        activeTask.value = VIEW_SITE
+
+        assertThat(externalFocusPointEvents).containsExactly(listOf(invisibleFollowSiteFocusPointInfo))
+    }
+
+    @Test
+    fun `when the active task is null, emit invisible focus point info`() {
+        activeTask.value = null
+
+        assertThat(externalFocusPointEvents).containsExactly(listOf(invisibleFollowSiteFocusPointInfo))
+    }
+
+    @Test
+    fun `when the active task changes more than once, only emit focus point event if its value has changed`() {
+        activeTask.value = FOLLOW_SITE
+        activeTask.value = FOLLOW_SITE
+        activeTask.value = VIEW_SITE
+        activeTask.value = null
+        activeTask.value = FOLLOW_SITE
+
+        assertThat(externalFocusPointEvents).containsExactly(
+                listOf(visibleFollowSiteFocusPointInfo),
+                listOf(invisibleFollowSiteFocusPointInfo),
+                listOf(visibleFollowSiteFocusPointInfo)
+        )
+    }
+
+    @Test
+    fun `bottom sheet actions are sorted in the correct order`() {
+        startViewModelWithDefaultParameters()
+
+        val expectedOrder = listOf(
+                NO_ACTION,
+                CREATE_NEW_STORY,
+                CREATE_NEW_POST,
+                CREATE_NEW_PAGE
+        )
+
+        assertThat(viewModel.mainActions.value!!.map { it.actionType }).isEqualTo(expectedOrder)
+    }
+
+    private fun startViewModelWithDefaultParameters(isJetpackApp: Boolean = false) {
+        whenever(buildConfigWrapper.isJetpackApp).thenReturn(isJetpackApp)
         viewModel.start(site = initSite(hasFullAccessToContent = true, supportsStories = true))
     }
 
+    private fun setupObservers() {
+        viewModel.startLoginFlow.observeForever { event ->
+            event.applyIfNotHandled {
+                loginFlowTriggered = true
+            }
+        }
+
+        viewModel.switchToMySite.observeForever { event ->
+            event.applyIfNotHandled {
+                switchTabTriggered = true
+            }
+        }
+    }
+
     private fun resumeViewModelWithDefaultParameters() {
-        viewModel.onResume(site = initSite(hasFullAccessToContent = true), showFab = true)
+        viewModel.onResume(site = initSite(hasFullAccessToContent = true), isOnMySitePageWithValidSite = true)
     }
 
     private fun initSite(hasFullAccessToContent: Boolean = true, supportsStories: Boolean = true): SiteModel {
@@ -426,7 +673,8 @@ class WPMainActivityViewModelTest : BaseUnitTest() {
         }
     }
 
-    private fun setupWPStoriesFeatureConfigEnabled(buildConfigValue: Boolean) {
-        whenever(wpStoriesFeatureConfig.isEnabled()).thenReturn(buildConfigValue)
+    companion object {
+        val visibleFollowSiteFocusPointInfo = FocusPointInfo(FOLLOW_SITE, true)
+        val invisibleFollowSiteFocusPointInfo = FocusPointInfo(FOLLOW_SITE, false)
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt
index 64ca0039b74d..94bb4628cd59 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModelTest.kt
@@ -29,16 +29,17 @@ import org.wordpress.android.fluxc.store.SiteStore.SiteError
 import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType.GENERIC_ERROR
 import org.wordpress.android.ui.mlp.SupportedBlocks
 import org.wordpress.android.ui.mlp.SupportedBlocksProvider
-import org.wordpress.android.ui.mlp.ThumbDimensionProvider
+import org.wordpress.android.ui.layoutpicker.ThumbDimensionProvider
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
+import org.wordpress.android.util.DisplayUtilsWrapper
 import org.wordpress.android.util.NetworkUtilsWrapper
 import org.wordpress.android.util.NoDelayCoroutineDispatcher
 import org.wordpress.android.util.SiteUtils.GB_EDITOR_NAME
 import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.PageRequest.Blank
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.PageRequest.Preview
 import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.PageRequest.Create
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.ContentUiState
-import org.wordpress.android.viewmodel.mlp.ModalLayoutPickerViewModel.UiState.ErrorUiState
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Content
+import org.wordpress.android.ui.layoutpicker.LayoutPickerUiState.Error
+import org.wordpress.android.ui.mlp.ModalLayoutPickerTracker
 
 @RunWith(MockitoJUnitRunner::class)
 class ModalLayoutPickerViewModelTest {
@@ -56,27 +57,31 @@ class ModalLayoutPickerViewModelTest {
     @Mock lateinit var appPrefsWrapper: AppPrefsWrapper
     @Mock lateinit var supportedBlocksProvider: SupportedBlocksProvider
     @Mock lateinit var thumbDimensionProvider: ThumbDimensionProvider
+    @Mock lateinit var displayUtilsWrapper: DisplayUtilsWrapper
     @Mock lateinit var networkUtils: NetworkUtilsWrapper
+    @Mock lateinit var analyticsTracker: ModalLayoutPickerTracker
     @Mock lateinit var onCreateNewPageRequestedObserver: Observer<Create>
-    @Mock lateinit var onPreviewPageRequestedObserver: Observer<Preview>
+
+    private val aboutCategory = GutenbergLayoutCategory(
+            slug = "about",
+            title = "About",
+            description = "About pages",
+            emoji = "👋"
+    )
+
+    private val aboutLayout = GutenbergLayout(
+            slug = "about",
+            title = "About",
+            previewTablet = "https://headstartdata.files.wordpress.com/2020/01/about-2.png",
+            previewMobile = "https://headstartdata.files.wordpress.com/2020/01/about-2.png",
+            preview = "https://headstartdata.files.wordpress.com/2020/01/about-2.png",
+            content = "",
+            demoUrl = "",
+            categories = listOf(aboutCategory)
+    )
 
     private val defaultPageLayoutsEvent: OnBlockLayoutsFetched
-        get() {
-            val aboutCategory = GutenbergLayoutCategory(
-                    slug = "about",
-                    title = "About",
-                    description = "About pages",
-                    emoji = "👋"
-            )
-            val aboutLayout = GutenbergLayout(
-                    slug = "about",
-                    title = "About",
-                    preview = "https://headstartdata.files.wordpress.com/2020/01/about-2.png",
-                    content = "",
-                    categories = listOf(aboutCategory)
-            )
-            return OnBlockLayoutsFetched(listOf(aboutLayout), listOf(aboutCategory), null)
-        }
+        get() = OnBlockLayoutsFetched(listOf(aboutLayout), listOf(aboutCategory), null)
 
     @Before
     fun setUp() {
@@ -86,16 +91,15 @@ class ModalLayoutPickerViewModelTest {
                 appPrefsWrapper,
                 supportedBlocksProvider,
                 thumbDimensionProvider,
+                displayUtilsWrapper,
                 networkUtils,
+                analyticsTracker,
                 NoDelayCoroutineDispatcher(),
                 NoDelayCoroutineDispatcher()
         )
         viewModel.onCreateNewPageRequested.observeForever(
                 onCreateNewPageRequestedObserver
         )
-        viewModel.onPreviewPageRequested.observeForever(
-                onPreviewPageRequestedObserver
-        )
     }
 
     @ExperimentalCoroutinesApi
@@ -106,9 +110,11 @@ class ModalLayoutPickerViewModelTest {
             whenever(appPrefsWrapper.getSelectedSite()).thenReturn(siteId)
             whenever(siteStore.getSiteByLocalId(siteId)).thenReturn(site)
             whenever(siteStore.getSiteByLocalId(siteId)).thenReturn(site)
+            whenever(siteStore.getBlockLayout(site, "about")).thenReturn(aboutLayout)
             whenever(supportedBlocksProvider.fromAssets()).thenReturn(SupportedBlocks())
             whenever(thumbDimensionProvider.previewWidth).thenReturn(136)
             whenever(thumbDimensionProvider.scale).thenReturn(1.0)
+            whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
             setupFetchLayoutsDispatcher(isError)
             block()
         }
@@ -132,7 +138,7 @@ class ModalLayoutPickerViewModelTest {
     fun `when the user scroll beyond a threshold the title becomes visible`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
         viewModel.onAppBarOffsetChanged(9, 10)
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).isHeaderVisible).isEqualTo(true)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).isHeaderVisible).isEqualTo(true)
     }
 
     @ExperimentalCoroutinesApi
@@ -140,28 +146,28 @@ class ModalLayoutPickerViewModelTest {
     fun `when the user scroll bellow a threshold the title remains hidden`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
         viewModel.onAppBarOffsetChanged(11, 10)
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).isHeaderVisible).isEqualTo(false)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).isHeaderVisible).isEqualTo(false)
     }
 
     @ExperimentalCoroutinesApi
     @Test
     fun `when modal layout picker starts the categories are loaded`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).categories.size).isGreaterThan(0)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).categories.size).isGreaterThan(0)
     }
 
     @ExperimentalCoroutinesApi
     @Test
     fun `when modal layout picker starts the layouts are loaded`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).layoutCategories.size).isGreaterThan(0)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).layoutCategories.size).isGreaterThan(0)
     }
 
     @ExperimentalCoroutinesApi
     @Test
     fun `when modal layout picker starts fetch errors are handled`() = mockFetchingSelectedSite(true) {
         viewModel.createPageFlowTriggered()
-        assertThat(viewModel.uiState.value is ErrorUiState).isEqualTo(true)
+        assertThat(viewModel.uiState.value is Error).isEqualTo(true)
     }
 
     @ExperimentalCoroutinesApi
@@ -203,24 +209,11 @@ class ModalLayoutPickerViewModelTest {
                 assertThat(captor.value.template).isEqualTo("about")
             }
 
-    @ExperimentalCoroutinesApi
-    @Test
-    fun `when a layout is selected and the preview page is clicked the preview flow starts`() =
-            mockFetchingSelectedSite {
-                viewModel.createPageFlowTriggered()
-                viewModel.onThumbnailReady("about")
-                viewModel.onLayoutTapped("about")
-                viewModel.onPreviewPageClicked()
-                val captor = ArgumentCaptor.forClass(Preview::class.java)
-                verify(onPreviewPageRequestedObserver).onChanged(captor.capture())
-                assertThat(captor.value.template).isEqualTo("about")
-            }
-
     @ExperimentalCoroutinesApi
     @Test
     fun `when modal layout picker starts no layout is selected`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedLayoutSlug).isNull()
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedLayoutSlug).isNull()
     }
 
     @ExperimentalCoroutinesApi
@@ -230,7 +223,7 @@ class ModalLayoutPickerViewModelTest {
                 viewModel.createPageFlowTriggered()
                 viewModel.onThumbnailReady("about-1")
                 viewModel.onLayoutTapped("about-1")
-                assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedLayoutSlug)
+                assertThat(requireNotNull(viewModel.uiState.value as Content).selectedLayoutSlug)
                         .isEqualTo("about-1")
             }
 
@@ -240,7 +233,7 @@ class ModalLayoutPickerViewModelTest {
             mockFetchingSelectedSite {
                 viewModel.createPageFlowTriggered()
                 viewModel.onLayoutTapped("about-1")
-                assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedLayoutSlug)
+                assertThat(requireNotNull(viewModel.uiState.value as Content).selectedLayoutSlug)
                         .isNotEqualTo("about-1")
             }
 
@@ -250,7 +243,7 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onLayoutTapped("about-1")
         viewModel.onLayoutTapped("about-1")
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedLayoutSlug).isNull()
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedLayoutSlug).isNull()
     }
 
     @ExperimentalCoroutinesApi
@@ -259,14 +252,14 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onLayoutTapped("about-1")
         viewModel.dismiss()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedLayoutSlug).isNull()
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedLayoutSlug).isNull()
     }
 
     @ExperimentalCoroutinesApi
     @Test
     fun `when modal layout picker starts no category is selected`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedCategoriesSlugs).isEmpty()
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedCategoriesSlugs).isEmpty()
     }
 
     @ExperimentalCoroutinesApi
@@ -274,7 +267,7 @@ class ModalLayoutPickerViewModelTest {
     fun `when the user taps on a category the category is selected`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
         viewModel.onCategoryTapped("about")
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedCategoriesSlugs)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedCategoriesSlugs)
                 .contains("about")
     }
 
@@ -284,7 +277,7 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onCategoryTapped("about")
         viewModel.onCategoryTapped("about")
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedCategoriesSlugs)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedCategoriesSlugs)
                 .doesNotContain("about")
     }
 
@@ -294,14 +287,14 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onCategoryTapped("about")
         viewModel.dismiss()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).selectedCategoriesSlugs).isEmpty()
+        assertThat(requireNotNull(viewModel.uiState.value as Content).selectedCategoriesSlugs).isEmpty()
     }
 
     @ExperimentalCoroutinesApi
     @Test
     fun `when no layout is selected the create blank page button is visible`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).buttonsUiState.createBlankPageVisible)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).buttonsUiState.createBlankPageVisible)
                 .isEqualTo(true)
     }
 
@@ -311,7 +304,7 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onThumbnailReady("about-1")
         viewModel.onLayoutTapped("about-1")
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).buttonsUiState.createBlankPageVisible)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).buttonsUiState.createBlankPageVisible)
                 .isEqualTo(false)
     }
 
@@ -319,7 +312,7 @@ class ModalLayoutPickerViewModelTest {
     @Test
     fun `when no layout is selected the create page button is not visible`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).buttonsUiState.createPageVisible)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).buttonsUiState.createPageVisible)
                 .isEqualTo(false)
     }
 
@@ -329,7 +322,7 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onThumbnailReady("about-1")
         viewModel.onLayoutTapped("about-1")
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).buttonsUiState.createPageVisible)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).buttonsUiState.createPageVisible)
                 .isEqualTo(true)
     }
 
@@ -337,7 +330,7 @@ class ModalLayoutPickerViewModelTest {
     @Test
     fun `when no layout is selected the preview button is not visible`() = mockFetchingSelectedSite {
         viewModel.createPageFlowTriggered()
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).buttonsUiState.previewVisible)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).buttonsUiState.previewVisible)
                 .isEqualTo(false)
     }
 
@@ -347,7 +340,7 @@ class ModalLayoutPickerViewModelTest {
         viewModel.createPageFlowTriggered()
         viewModel.onThumbnailReady("about-1")
         viewModel.onLayoutTapped("about-1")
-        assertThat(requireNotNull(viewModel.uiState.value as ContentUiState).buttonsUiState.previewVisible)
+        assertThat(requireNotNull(viewModel.uiState.value as Content).buttonsUiState.previewVisible)
                 .isEqualTo(true)
     }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCaseTest.kt
index c468c940173e..1ee51e8c0745 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCaseTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/CreatePageListItemActionsUseCaseTest.kt
@@ -10,6 +10,7 @@ import org.wordpress.android.fluxc.model.SiteHomepageSettings.ShowOnFront
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.SiteModel.ORIGIN_WPCOM_REST
 import org.wordpress.android.ui.pages.PageItem.Action.CANCEL_AUTO_UPLOAD
+import org.wordpress.android.ui.pages.PageItem.Action.COPY
 import org.wordpress.android.ui.pages.PageItem.Action.DELETE_PERMANENTLY
 import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_DRAFT
 import org.wordpress.android.ui.pages.PageItem.Action.MOVE_TO_TRASH
@@ -40,7 +41,7 @@ class CreatePageListItemActionsUseCaseTest {
     @Test
     fun `Verify DRAFT actions`() {
         // Arrange
-        val expectedActions = setOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH)
+        val expectedActions = setOf(VIEW_PAGE, SET_PARENT, PUBLISH_NOW, MOVE_TO_TRASH, COPY)
 
         // Act
         val draftActions = useCase.setupPageActions(DRAFTS, mock(), site, defaultRemoteId)
@@ -68,7 +69,8 @@ class CreatePageListItemActionsUseCaseTest {
                 VIEW_PAGE,
                 SET_PARENT,
                 MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                MOVE_TO_TRASH,
+                COPY
         )
 
         // Act
@@ -87,7 +89,8 @@ class CreatePageListItemActionsUseCaseTest {
                 SET_AS_HOMEPAGE,
                 SET_AS_POSTS_PAGE,
                 MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                MOVE_TO_TRASH,
+                COPY
         )
         site.showOnFront = ShowOnFront.PAGE.value
         site.setIsWPCom(true)
@@ -108,7 +111,8 @@ class CreatePageListItemActionsUseCaseTest {
                 SET_AS_HOMEPAGE,
                 SET_AS_POSTS_PAGE,
                 MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                MOVE_TO_TRASH,
+                COPY
         )
         site.showOnFront = ShowOnFront.PAGE.value
         site.setIsJetpackConnected(true)
@@ -128,8 +132,7 @@ class CreatePageListItemActionsUseCaseTest {
                 VIEW_PAGE,
                 SET_PARENT,
                 SET_AS_POSTS_PAGE,
-                MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                COPY
         )
         site.showOnFront = ShowOnFront.PAGE.value
         site.pageOnFront = defaultRemoteId
@@ -150,7 +153,8 @@ class CreatePageListItemActionsUseCaseTest {
                 SET_PARENT,
                 SET_AS_HOMEPAGE,
                 MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                MOVE_TO_TRASH,
+                COPY
         )
         site.showOnFront = ShowOnFront.PAGE.value
         site.pageForPosts = defaultRemoteId
@@ -169,8 +173,7 @@ class CreatePageListItemActionsUseCaseTest {
         val expectedActions = setOf(
                 VIEW_PAGE,
                 SET_PARENT,
-                MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                COPY
         )
         site.showOnFront = ShowOnFront.PAGE.value
         val remoteId = -1L
@@ -189,7 +192,8 @@ class CreatePageListItemActionsUseCaseTest {
                 VIEW_PAGE,
                 SET_PARENT,
                 MOVE_TO_DRAFT,
-                MOVE_TO_TRASH
+                MOVE_TO_TRASH,
+                COPY
         )
         site.showOnFront = ShowOnFront.PAGE.value
         site.setIsWPCom(false)
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt
index 960e927e1662..6529071ec1e6 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageListViewModelTest.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
 import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.mock
+import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
 import junit.framework.Assert.assertNull
 import kotlinx.coroutines.Dispatchers
@@ -21,6 +22,8 @@ import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.MediaStore
+import org.wordpress.android.fluxc.store.QuickStartStore.QuickStartTask.EDIT_HOMEPAGE
+import org.wordpress.android.ui.mysite.QuickStartRepository
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Divider
 import org.wordpress.android.ui.pages.PageItem.Page
@@ -30,6 +33,8 @@ import org.wordpress.android.ui.posts.AuthorFilterSelection
 import org.wordpress.android.ui.posts.AuthorFilterSelection.EVERYONE
 import org.wordpress.android.ui.posts.AuthorFilterSelection.ME
 import org.wordpress.android.util.LocaleManagerWrapper
+import org.wordpress.android.util.QuickStartUtilsWrapper
+import org.wordpress.android.util.config.MySiteImprovementsFeatureConfig
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListState
 import org.wordpress.android.viewmodel.pages.PageListViewModel.PageListType.PUBLISHED
 import org.wordpress.android.viewmodel.pages.PostModelUploadUiStateUseCase.PostUploadUiState
@@ -49,10 +54,14 @@ class PageListViewModelTest : BaseUnitTest() {
     @Mock lateinit var createUploadStateUseCase: PostModelUploadUiStateUseCase
     @Mock lateinit var createLabelsUseCase: CreatePageListItemLabelsUseCase
     @Mock lateinit var accountStore: AccountStore
+    @Mock lateinit var quickStartUtilsWrapper: QuickStartUtilsWrapper
+    @Mock lateinit var mySiteImprovementsFeatureConfig: MySiteImprovementsFeatureConfig
+    @Mock lateinit var quickStartRepository: QuickStartRepository
 
     private lateinit var viewModel: PageListViewModel
     private val site = SiteModel()
     private val pageListState = MutableLiveData<PageListState>()
+
     @Before
     fun setUp() {
         viewModel = PageListViewModel(
@@ -64,11 +73,17 @@ class PageListViewModelTest : BaseUnitTest() {
                 dispatcher,
                 localeManagerWrapper,
                 accountStore,
-                Dispatchers.Unconfined
+                Dispatchers.Unconfined,
+                mySiteImprovementsFeatureConfig,
+                quickStartRepository,
+                quickStartUtilsWrapper
         )
 
-        whenever(pageItemProgressUiStateUseCase.getProgressStateForPage(any())).thenReturn(Pair(
-                ProgressBarUiState.Hidden, false))
+        whenever(pageItemProgressUiStateUseCase.getProgressStateForPage(any())).thenReturn(
+                Pair(
+                        ProgressBarUiState.Hidden, false
+                )
+        )
 
         val invalidateUploadStatus = MutableLiveData<List<LocalId>>()
 
@@ -335,7 +350,8 @@ class PageListViewModelTest : BaseUnitTest() {
         authorFilterState.value = PagesAuthorFilterUIState(
                 authorFilterSelection = EVERYONE,
                 authorFilterItems = listOf(),
-                isAuthorFilterVisible = true)
+                isAuthorFilterVisible = true
+        )
         authorFilterSelection.value = EVERYONE
 
         pageItems = pagesResult[1].first
@@ -367,7 +383,8 @@ class PageListViewModelTest : BaseUnitTest() {
         authorFilterState.value = PagesAuthorFilterUIState(
                 authorFilterSelection = ME,
                 authorFilterItems = listOf(),
-                isAuthorFilterVisible = true)
+                isAuthorFilterVisible = true
+        )
         authorFilterSelection.value = ME
 
         pageItems = pagesResult[1].first
@@ -390,14 +407,19 @@ class PageListViewModelTest : BaseUnitTest() {
 
         viewModel.pages.observeForever { pagesResult.add(it) }
 
-        val pageModels = (0..1).map { buildPageModel(it, authorId = it.toLong(),
-                authorDisplayName = authorDisplayName) }
+        val pageModels = (0..1).map {
+            buildPageModel(
+                    it, authorId = it.toLong(),
+                    authorDisplayName = authorDisplayName
+            )
+        }
         pages.value = pageModels
 
         authorFilterState.value = PagesAuthorFilterUIState(
                 authorFilterSelection = EVERYONE,
                 authorFilterItems = listOf(),
-                isAuthorFilterVisible = true)
+                isAuthorFilterVisible = true
+        )
         authorFilterSelection.value = EVERYONE
 
         val pageItems = pagesResult[1].first
@@ -426,7 +448,8 @@ class PageListViewModelTest : BaseUnitTest() {
         authorFilterState.value = PagesAuthorFilterUIState(
                 authorFilterSelection = ME,
                 authorFilterItems = listOf(),
-                isAuthorFilterVisible = true)
+                isAuthorFilterVisible = true
+        )
         authorFilterSelection.value = ME
 
         val pageItems = pagesResult[1].first
@@ -434,6 +457,44 @@ class PageListViewModelTest : BaseUnitTest() {
         assertNull(pageItem.author)
     }
 
+    @Test
+    fun `completes EDIT_HOMEPAGE task on homepage click`() {
+        initEmptyPagesViewModel()
+
+        whenever(pagesViewModel.site).thenReturn(site)
+        whenever(mySiteImprovementsFeatureConfig.isEnabled()).thenReturn(true)
+        val pageRemoteId = 1L
+        site.pageOnFront = pageRemoteId
+
+        viewModel.onItemTapped(
+                pageItem = PublishedPage(
+                        pageRemoteId,
+                        2,
+                        "title",
+                        date = Date(),
+                        labels = listOf(),
+                        labelsColor = null,
+                        indent = 0,
+                        imageUrl = null,
+                        actions = setOf(),
+                        actionsEnabled = false,
+                        progressBarUiState = ProgressBarUiState.Hidden,
+                        author = null,
+                        showOverlay = false,
+                        showQuickStartFocusPoint = false
+                ), context = mock()
+        )
+
+        verify(quickStartRepository).completeTask(EDIT_HOMEPAGE)
+    }
+
+    private fun initEmptyPagesViewModel() {
+        val pages = MutableLiveData<List<PageModel>>()
+        whenever(pagesViewModel.pages).thenReturn(pages)
+
+        viewModel.start(PUBLISHED, pagesViewModel)
+    }
+
     private fun buildPageModel(
         id: Int,
         date: Date = Date(0),
@@ -444,11 +505,15 @@ class PageListViewModelTest : BaseUnitTest() {
         authorDisplayName: String? = null
     ): PageModel {
         val title = pageTitle ?: if (id < 10) "Title 0$id" else "Title $id"
-        return PageModel(PostModel().apply { this.setId(id)
-                this.setAuthorId(authorId ?: 0)
-                this.setAuthorDisplayName(authorDisplayName) },
+        return PageModel(
+                PostModel().apply {
+                    this.setId(id)
+                    this.setAuthorId(authorId ?: 0)
+                    this.setAuthorDisplayName(authorDisplayName)
+                },
                 site, id, title, status, date, false, id.toLong(),
-                parent, id.toLong())
+                parent, id.toLong()
+        )
     }
 
     private fun assertDivider(pageItem: PageItem) {
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
index fa094ee6e98a..5e151e846ea8 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PageParentSearchViewModelTest.kt
@@ -4,6 +4,7 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
@@ -12,10 +13,11 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.R.string
-import org.wordpress.android.TEST_SCOPE
+import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.ui.pages.PageItem
 import org.wordpress.android.ui.pages.PageItem.Empty
 
+@InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
 class PageParentSearchViewModelTest {
     @Rule
@@ -28,7 +30,7 @@ class PageParentSearchViewModelTest {
 
     @Before
     fun setUp() {
-        viewModel = PageParentSearchViewModel(TEST_SCOPE)
+        viewModel = PageParentSearchViewModel(TEST_DISPATCHER)
         searchPages = MutableLiveData()
         whenever(pageParentViewModel.searchPages).thenReturn(searchPages)
         viewModel.start(pageParentViewModel)
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
index 2c9195c47fbe..52cfb3b41360 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/PagesViewModelTest.kt
@@ -18,6 +18,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
+import org.mockito.Mockito
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.Dispatcher
@@ -28,9 +29,13 @@ import org.wordpress.android.fluxc.model.SiteHomepageSettings.StaticPage
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.page.PageModel
 import org.wordpress.android.fluxc.model.page.PageStatus.DRAFT
+import org.wordpress.android.fluxc.network.rest.wpcom.post.PostRestClient
+import org.wordpress.android.fluxc.network.xmlrpc.post.PostXMLRPCClient
+import org.wordpress.android.fluxc.persistence.PostSqlUtils
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.fluxc.store.PageStore
 import org.wordpress.android.fluxc.store.PageStore.OnPageChanged
+import org.wordpress.android.fluxc.store.PostStore
 import org.wordpress.android.fluxc.store.SiteOptionsStore
 import org.wordpress.android.fluxc.store.SiteOptionsStore.HomepageUpdatedPayload
 import org.wordpress.android.fluxc.store.SiteOptionsStore.SiteOptionsError
@@ -39,6 +44,7 @@ import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.test
 import org.wordpress.android.ui.pages.PageItem
+import org.wordpress.android.ui.pages.PageItem.Action.COPY
 import org.wordpress.android.ui.pages.PageItem.Action.PUBLISH_NOW
 import org.wordpress.android.ui.pages.PageItem.Action.SET_AS_HOMEPAGE
 import org.wordpress.android.ui.pages.PageItem.Action.SET_AS_POSTS_PAGE
@@ -77,18 +83,29 @@ class PagesViewModelTest {
     @Mock lateinit var siteStore: SiteStore
     @Mock lateinit var accountStore: AccountStore
     @Mock lateinit var appPrefsWrapper: AppPrefsWrapper
+    @Mock lateinit var postSqlUtils: PostSqlUtils
     private lateinit var viewModel: PagesViewModel
     private lateinit var listStates: MutableList<PageListState>
     private lateinit var pages: MutableList<List<PageModel>>
     private lateinit var searchPages: MutableList<SortedMap<PageListType, List<PageModel>>>
     private lateinit var authorSelectionUpdated: MutableLiveData<AuthorFilterSelection>
     private lateinit var authorUIState: MutableLiveData<PagesAuthorFilterUIState>
+    private lateinit var postStore: PostStore
+
+    private val mockedPageId = 1
+    private val copyPageId = 2
 
     @Before
     fun setUp() {
+        postStore = PostStore(
+                dispatcher,
+                Mockito.mock(PostRestClient::class.java),
+                Mockito.mock(PostXMLRPCClient::class.java),
+                postSqlUtils
+        )
         viewModel = PagesViewModel(
                 pageStore = pageStore,
-                postStore = mock(),
+                postStore = postStore,
                 dispatcher = dispatcher,
                 actionPerfomer = actionPerformer,
                 networkUtils = networkUtils,
@@ -118,6 +135,9 @@ class PagesViewModelTest {
         viewModel.authorSelectionUpdated.observeForever { if (it != null) authorSelectionUpdated.value = it }
         viewModel.authorUIState.observeForever { if (it != null) authorUIState.value = it }
         whenever(networkUtils.isNetworkAvailable()).thenReturn(true)
+        whenever(postSqlUtils.insertPostForResult(any())).thenAnswer { invocation ->
+            (invocation.arguments[0] as PostModel).apply { setId(copyPageId) }
+        }
     }
 
     @Test
@@ -248,6 +268,23 @@ class PagesViewModelTest {
         assertThat(viewModel.publishAction.value).isEqualTo(pageModel)
     }
 
+    @Test
+    fun `duplicate menu action opens a copy of the page for edit`() = test {
+        // Given
+        val pageModel = setUpPageStoreWithASinglePage(site)
+        val page: PageItem.Page = mock()
+        whenever(page.remoteId).thenReturn(pageModel.remoteId)
+        whenever(pageStore.getPagesFromDb(anyOrNull())).thenReturn(listOf(pageModel))
+        viewModel.start(site)
+        // When
+        viewModel.onMenuAction(COPY, page)
+        // Then
+        val newPage: PostModel = requireNotNull(viewModel.editPage.value?.second)
+        assertThat(newPage.id).isNotEqualTo(pageModel.post.id)
+        assertThat(newPage.title).isEqualTo(pageModel.title)
+        assertThat(newPage.content).isEqualTo(pageModel.post.content)
+    }
+
     @Test
     fun `scrollToPage is invoked on edit post activity result`() = test {
         // Given
@@ -419,7 +456,7 @@ class PagesViewModelTest {
     }
 
     private suspend fun setUpPageStoreWithASinglePage(site: SiteModel): PageModel {
-        val pageModel = PageModel(PostModel(), site, 1, "title", DRAFT, Date(), false, 1, null, 0)
+        val pageModel = PageModel(PostModel(), site, mockedPageId, "title", DRAFT, Date(), false, 1, null, 0)
 
         whenever(pageStore.getPagesFromDb(site)).thenReturn(listOf(pageModel))
         whenever(pageStore.requestPagesFromServer(any(), any())).thenReturn(
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt
index 81c688fb2f5a..5c40677c48d8 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/pages/SearchListViewModelTest.kt
@@ -6,6 +6,7 @@ import com.nhaarman.mockitokotlin2.any
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.verify
 import com.nhaarman.mockitokotlin2.whenever
+import kotlinx.coroutines.InternalCoroutinesApi
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Rule
@@ -14,7 +15,7 @@ import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.junit.MockitoJUnitRunner
 import org.wordpress.android.R.string
-import org.wordpress.android.TEST_SCOPE
+import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.fluxc.model.PostModel
 import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.model.page.PageModel
@@ -33,6 +34,7 @@ import org.wordpress.android.viewmodel.uistate.ProgressBarUiState
 import java.util.Date
 import java.util.SortedMap
 
+@InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
 class SearchListViewModelTest {
     @Rule
@@ -60,7 +62,7 @@ class SearchListViewModelTest {
                 pageListItemActionsUseCase,
                 pageItemProgressUiStateUseCase,
                 resourceProvider,
-                TEST_SCOPE
+                TEST_DISPATCHER
         )
         searchPages = MutableLiveData()
 
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModelTest.kt
index 7e1ffbeca29b..36cf2660120a 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListCreateMenuViewModelTest.kt
@@ -13,19 +13,20 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.ui.main.MainActionListItem.ActionType
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_POST
 import org.wordpress.android.ui.main.MainActionListItem.ActionType.CREATE_NEW_STORY
+import org.wordpress.android.ui.main.MainActionListItem.ActionType.NO_ACTION
 import org.wordpress.android.ui.main.MainActionListItem.CreateAction
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
-import org.wordpress.android.util.config.WPStoriesFeatureConfig
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 
 class PostListCreateMenuViewModelTest : BaseUnitTest() {
     private lateinit var viewModel: PostListCreateMenuViewModel
     @Mock lateinit var appPrefsWrapper: AppPrefsWrapper
-    @Mock lateinit var wpStoriesFeatureConfig: WPStoriesFeatureConfig
+    @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
     @Mock lateinit var site: SiteModel
 
     @Before
     fun setUp() {
-        viewModel = PostListCreateMenuViewModel(appPrefsWrapper, wpStoriesFeatureConfig)
+        viewModel = PostListCreateMenuViewModel(appPrefsWrapper, analyticsTrackerWrapper)
     }
 
     @Test
@@ -57,6 +58,8 @@ class PostListCreateMenuViewModelTest : BaseUnitTest() {
 
     @Test
     fun `when onFabClicked then bottom sheet showing is true`() {
+        viewModel.start(site)
+
         viewModel.onFabClicked()
 
         Assertions.assertThat(viewModel.isBottomSheetShowing.value?.getContentIfNotHandled()).isTrue()
@@ -64,6 +67,8 @@ class PostListCreateMenuViewModelTest : BaseUnitTest() {
 
     @Test
     fun `when onFabClicked then appPrefsWrapper's setPostListFabTooltipDisabled is called with true`() {
+        viewModel.start(site)
+
         viewModel.onFabClicked()
 
         verify(appPrefsWrapper).setPostListFabTooltipDisabled(eq(true))
@@ -101,28 +106,27 @@ class PostListCreateMenuViewModelTest : BaseUnitTest() {
     }
 
     @Test
-    fun `start set expected content message if stories not enabled`() {
-        setupWPStoriesFeatureConfigEnabled(false)
+    fun `start set expected content message`() {
+        whenever(site.isWPCom).thenReturn(true)
 
         viewModel.start(site)
         Assertions.assertThat(viewModel.fabUiState.value!!.CreateContentMessageId)
-                .isEqualTo(R.string.create_post_fab_tooltip)
+                .isEqualTo(R.string.create_post_story_fab_tooltip)
     }
 
     @Test
-    fun `start set expected content message if stories enabled`() {
-        setupWPStoriesFeatureConfigEnabled(true)
-        whenever(site.isWPCom).thenReturn(true)
-
+    fun `bottom sheet actions are sorted in the correct order`() {
         viewModel.start(site)
-        Assertions.assertThat(viewModel.fabUiState.value!!.CreateContentMessageId)
-                .isEqualTo(R.string.create_post_story_fab_tooltip)
+
+        val expectedOrder = listOf(
+                NO_ACTION,
+                CREATE_NEW_STORY,
+                CREATE_NEW_POST
+        )
+
+        Assertions.assertThat(viewModel.mainActions.value!!.map { it.actionType }).isEqualTo(expectedOrder)
     }
 
     private fun getCreateAction(actionType: ActionType) =
             viewModel.mainActions.value?.first { it.actionType == actionType } as CreateAction
-
-    private fun setupWPStoriesFeatureConfigEnabled(buildConfigValue: Boolean) {
-        whenever(wpStoriesFeatureConfig.isEnabled()).thenReturn(buildConfigValue)
-    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelperTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelperTest.kt
index 3011505f5083..227b754dc469 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelperTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/posts/PostListItemUiStateHelperTest.kt
@@ -85,8 +85,9 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions).hasSize(3)
 
         assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_VIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(3)
     }
 
     @Test
@@ -101,8 +102,9 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions).hasSize(3)
 
         assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(3)
     }
 
     @Test
@@ -118,8 +120,9 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions).hasSize(3)
 
         assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_VIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(3)
     }
 
     @Test
@@ -135,8 +138,9 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions).hasSize(3)
 
         assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(3)
     }
 
     @Test
@@ -150,8 +154,12 @@ class PostListItemUiStateHelperTest {
 
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
+
+        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
     }
 
     @Test
@@ -165,8 +173,12 @@ class PostListItemUiStateHelperTest {
 
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
+
+        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
     }
 
     @Test
@@ -181,8 +193,12 @@ class PostListItemUiStateHelperTest {
 
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
+
+        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
     }
 
     @Test
@@ -198,8 +214,12 @@ class PostListItemUiStateHelperTest {
 
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
+
+        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
     }
 
     @Test
@@ -213,9 +233,12 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
 
-        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_STATS)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        val moreActions = (state.actions[2] as MoreItem).actions
+        assertThat(moreActions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_STATS)
+        assertThat(moreActions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat(moreActions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MOVE_TO_DRAFT)
+        assertThat(moreActions[3].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(moreActions).hasSize(4)
     }
 
     @Test
@@ -229,9 +252,12 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
 
-        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        val moreActions = (state.actions[2] as MoreItem).actions
+        assertThat(moreActions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
+        assertThat(moreActions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat(moreActions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MOVE_TO_DRAFT)
+        assertThat(moreActions[3].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(moreActions).hasSize(4)
     }
 
     @Test
@@ -245,8 +271,14 @@ class PostListItemUiStateHelperTest {
 
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
+
+        val moreActions = (state.actions[2] as MoreItem).actions
+        assertThat(moreActions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat(moreActions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_MOVE_TO_DRAFT)
+        assertThat(moreActions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(moreActions).hasSize(3)
     }
 
     @Test
@@ -344,9 +376,12 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_CANCEL_PENDING_AUTO_UPLOAD)
         assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
-        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        val moreActions = (state.actions[2] as MoreItem).actions
+        assertThat(moreActions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
+        assertThat(moreActions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat(moreActions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MOVE_TO_DRAFT)
+        assertThat(moreActions[3].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(moreActions).hasSize(4)
     }
 
     @Test
@@ -400,8 +435,9 @@ class PostListItemUiStateHelperTest {
         assertThat(state.actions).hasSize(3)
 
         assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_PREVIEW)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat((state.actions[2] as MoreItem).actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat((state.actions[2] as MoreItem).actions).hasSize(3)
     }
 
     @Test
@@ -424,13 +460,15 @@ class PostListItemUiStateHelperTest {
 
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_CANCEL_PENDING_AUTO_UPLOAD)
-
         assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
 
-        assertThat((state.actions[2] as MoreItem).actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat((state.actions[2] as MoreItem).actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
-        assertThat((state.actions[2] as MoreItem).actions).hasSize(2)
+        val moreActions = (state.actions[2] as MoreItem).actions
+        assertThat(moreActions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
+        assertThat(moreActions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat(moreActions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MOVE_TO_DRAFT)
+        assertThat(moreActions[3].buttonType).isEqualTo(PostListButtonType.BUTTON_TRASH)
+        assertThat(moreActions).hasSize(4)
     }
 
     @Test
@@ -541,7 +579,8 @@ class PostListItemUiStateHelperTest {
                 createFailedUploadUiState(uploadError = UploadError(MediaError(AUTHORIZATION_REQUIRED)))
         )
         val state = createPostListItemUiState(
-                post = createPostModel(isLocallyChanged = true, status = POST_STATE_PRIVATE))
+                post = createPostModel(isLocallyChanged = true, status = POST_STATE_PRIVATE)
+        )
         assertThat(state.data.statuses).containsOnly(UiStringRes(R.string.error_media_recover_post))
     }
 
@@ -563,7 +602,8 @@ class PostListItemUiStateHelperTest {
                 )
         )
         val state = createPostListItemUiState(
-                post = createPostModel(isLocallyChanged = true, status = POST_STATE_PENDING))
+                post = createPostModel(isLocallyChanged = true, status = POST_STATE_PENDING)
+        )
         assertThat(state.data.statuses)
                 .containsOnly(UiStringRes(R.string.error_media_recover_post_not_submitted_retrying))
     }
@@ -574,7 +614,8 @@ class PostListItemUiStateHelperTest {
                 createFailedUploadUiState(
                         uploadError = UploadError(MediaError(AUTHORIZATION_REQUIRED)),
                         isEligibleForAutoUpload = false,
-                        retryWillPushChanges = true)
+                        retryWillPushChanges = true
+                )
         )
         val state = createPostListItemUiState(
                 post = createPostModel(isLocallyChanged = true, status = POST_STATE_PENDING)
@@ -763,8 +804,14 @@ class PostListItemUiStateHelperTest {
         )
         assertThat(state.actions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_EDIT)
         assertThat(state.actions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_RETRY)
-        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat(state.actions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_MORE)
         assertThat(state.actions).hasSize(3)
+
+        val moreActions = (state.actions[2] as MoreItem).actions
+        assertThat(moreActions[0].buttonType).isEqualTo(PostListButtonType.BUTTON_COPY)
+        assertThat(moreActions[1].buttonType).isEqualTo(PostListButtonType.BUTTON_MOVE_TO_DRAFT)
+        assertThat(moreActions[2].buttonType).isEqualTo(PostListButtonType.BUTTON_DELETE)
+        assertThat(moreActions).hasSize(3)
     }
 
     @Test
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/reader/ReaderPostListViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/reader/ReaderPostListViewModelTest.kt
index 96919144244d..5e1bdc90fa4d 100644
--- a/WordPress/src/test/java/org/wordpress/android/viewmodel/reader/ReaderPostListViewModelTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/reader/ReaderPostListViewModelTest.kt
@@ -12,6 +12,7 @@ import org.wordpress.android.TEST_DISPATCHER
 import org.wordpress.android.ui.reader.discover.ReaderPostCardActionsHandler
 import org.wordpress.android.ui.reader.reblog.ReblogUseCase
 import org.wordpress.android.ui.reader.tracker.ReaderTracker
+import org.wordpress.android.ui.reader.usecases.ReaderSeenStatusToggleUseCase
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostListViewModel
 
 @InternalCoroutinesApi
@@ -24,6 +25,7 @@ class ReaderPostListViewModelTest {
     @Mock private lateinit var reblogUseCase: ReblogUseCase
     @Mock private lateinit var readerTracker: ReaderTracker
     @Mock private lateinit var readerPostCardActionsHandler: ReaderPostCardActionsHandler
+    @Mock private lateinit var readerSeenStatusToggleUseCase: ReaderSeenStatusToggleUseCase
 
     private lateinit var viewModel: ReaderPostListViewModel
 
@@ -33,6 +35,7 @@ class ReaderPostListViewModelTest {
                 readerPostCardActionsHandler,
                 reblogUseCase,
                 readerTracker,
+                readerSeenStatusToggleUseCase,
                 TEST_DISPATCHER,
                 TEST_DISPATCHER
         )
diff --git a/WordPress/src/test/java/org/wordpress/android/viewmodel/storage/StorageUtilsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/viewmodel/storage/StorageUtilsViewModelTest.kt
new file mode 100644
index 000000000000..7f3dba2d11a7
--- /dev/null
+++ b/WordPress/src/test/java/org/wordpress/android/viewmodel/storage/StorageUtilsViewModelTest.kt
@@ -0,0 +1,56 @@
+package org.wordpress.android.viewmodel.storage
+
+import androidx.fragment.app.FragmentManager
+import androidx.lifecycle.Observer
+import com.nhaarman.mockitokotlin2.anyOrNull
+import com.nhaarman.mockitokotlin2.times
+import com.nhaarman.mockitokotlin2.verify
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.util.StorageUtilsProvider
+import org.wordpress.android.util.StorageUtilsProvider.Source
+import org.wordpress.android.viewmodel.Event
+
+@InternalCoroutinesApi
+class StorageUtilsViewModelTest : BaseUnitTest() {
+    @Mock lateinit var storageUtilsProvider: StorageUtilsProvider
+    @Mock lateinit var checkStorageWarningObserver: Observer<Event<Unit>>
+    @Mock lateinit var fm: FragmentManager
+    @Mock lateinit var source: Source
+
+    private lateinit var viewModel: StorageUtilsViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = StorageUtilsViewModel(
+                TEST_DISPATCHER,
+                storageUtilsProvider
+        )
+    }
+
+    @Test
+    fun `view model emits checkStorageWarning event when it is the first start`() {
+        viewModel.checkStorageWarning.observeForever(checkStorageWarningObserver)
+        viewModel.start(true)
+
+        verify(checkStorageWarningObserver, times(1)).onChanged(anyOrNull())
+    }
+
+    @Test
+    fun `view model does not emit checkStorageWarning event when it is not the first start`() {
+        viewModel.checkStorageWarning.observeForever(checkStorageWarningObserver)
+        viewModel.start(false)
+
+        verify(checkStorageWarningObserver, times(0)).onChanged(anyOrNull())
+    }
+
+    @Test
+    fun `onStorageWarningCheck triggers notifyOnLowStorageSpace`() {
+        viewModel.onStorageWarningCheck(fm, source)
+        verify(storageUtilsProvider, times(1)).notifyOnLowStorageSpace(fm, source)
+    }
+}
diff --git a/WordPress/src/testJetpack/java/org.wordpress.android/ui.accounts.login/LoginPrologueViewModelTest.kt b/WordPress/src/testJetpack/java/org.wordpress.android/ui.accounts.login/LoginPrologueViewModelTest.kt
new file mode 100644
index 000000000000..8f853fe70ddf
--- /dev/null
+++ b/WordPress/src/testJetpack/java/org.wordpress.android/ui.accounts.login/LoginPrologueViewModelTest.kt
@@ -0,0 +1,84 @@
+package org.wordpress.android.ui.accounts.login
+
+import kotlinx.coroutines.InternalCoroutinesApi
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mock
+import org.wordpress.android.BaseUnitTest
+import org.wordpress.android.R
+import org.wordpress.android.TEST_DISPATCHER
+import org.wordpress.android.ui.accounts.LoginNavigationEvents
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowEmailLoginScreen
+import org.wordpress.android.ui.accounts.LoginNavigationEvents.ShowLoginViaSiteAddressScreen
+import org.wordpress.android.ui.accounts.UnifiedLoginTracker
+import org.wordpress.android.ui.accounts.login.LoginPrologueViewModel.UiState
+import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import org.wordpress.android.viewmodel.Event
+
+@InternalCoroutinesApi
+class LoginPrologueViewModelTest : BaseUnitTest() {
+    @Mock lateinit var unifiedLoginTracker: UnifiedLoginTracker
+    @Mock lateinit var analyticsTrackerWrapper: AnalyticsTrackerWrapper
+    private lateinit var viewModel: LoginPrologueViewModel
+
+    @Before
+    fun setUp() {
+        viewModel = LoginPrologueViewModel(unifiedLoginTracker, analyticsTrackerWrapper, TEST_DISPATCHER)
+    }
+
+    @Test
+    fun `when view starts, then continue with wpcom button is displayed with correct title`() {
+        val observers = init()
+
+        assertThat(observers.uiStates.last().continueWithWpcomButtonState.title)
+                .isEqualTo(R.string.continue_with_wpcom_no_signup)
+    }
+
+    @Test
+    fun `when view starts, enter your site address button is displayed with correct title`() {
+        val observers = init()
+
+        assertThat(observers.uiStates.last().enterYourSiteAddressButtonState.title)
+                .isEqualTo(R.string.enter_your_site_address)
+    }
+
+    @Test
+    fun `when continue with wpcom button is clicked, then app navigates to email login screen`() {
+        val observers = init()
+
+        (observers.uiStates.last().continueWithWpcomButtonState).onClick.invoke()
+
+        assertThat(observers.navigationEvents.last().peekContent()).isEqualTo(ShowEmailLoginScreen)
+    }
+
+    @Test
+    fun `when enter your site address button is clicked, then app navigates to show login via site address screen`() {
+        val observers = init()
+
+        (observers.uiStates.last().enterYourSiteAddressButtonState).onClick.invoke()
+
+        assertThat(observers.navigationEvents.last().peekContent()).isEqualTo(ShowLoginViaSiteAddressScreen)
+    }
+
+    private fun init(): Observers {
+        val uiStates = mutableListOf<UiState>()
+        viewModel.uiState.observeForever {
+            uiStates.add(it)
+        }
+
+        val navigationEvents = mutableListOf<Event<LoginNavigationEvents>>()
+        viewModel.navigationEvents.observeForever {
+            navigationEvents.add(it)
+        }
+
+        viewModel.start()
+
+        return Observers(uiStates, navigationEvents)
+    }
+
+    private data class Observers(
+        val uiStates: List<UiState>,
+        val navigationEvents: List<Event<LoginNavigationEvents>>
+    )
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt b/WordPress/src/wordpress/java/org.wordpress.android.ui.accounts.login/LoginPrologueFragment.kt
similarity index 74%
rename from WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt
rename to WordPress/src/wordpress/java/org.wordpress.android.ui.accounts.login/LoginPrologueFragment.kt
index 83fd57ff55a9..69cf5be2b565 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt
+++ b/WordPress/src/wordpress/java/org.wordpress.android.ui.accounts.login/LoginPrologueFragment.kt
@@ -4,21 +4,16 @@ import android.content.Context
 import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import androidx.annotation.FloatRange
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.tabs.TabLayoutMediator
-import kotlinx.android.synthetic.main.login_intro_template_view.view.*
-import kotlinx.android.synthetic.main.login_prologue_bottom_buttons_container_default.*
-import kotlinx.android.synthetic.main.login_signup_screen.*
-import org.wordpress.android.BuildConfig
 import org.wordpress.android.R
 import org.wordpress.android.WordPress
 import org.wordpress.android.analytics.AnalyticsTracker
 import org.wordpress.android.analytics.AnalyticsTracker.Stat.LOGIN_PROLOGUE_VIEWED
+import org.wordpress.android.databinding.LoginSignupScreenBinding
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Click
 import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Flow
@@ -26,7 +21,7 @@ import org.wordpress.android.ui.accounts.UnifiedLoginTracker.Step.PROLOGUE
 import org.wordpress.android.util.analytics.AnalyticsUtils
 import javax.inject.Inject
 
-class LoginPrologueFragment : Fragment() {
+class LoginPrologueFragment : Fragment(R.layout.login_signup_screen) {
     private lateinit var loginPrologueListener: LoginPrologueListener
 
     @Inject lateinit var unifiedLoginTracker: UnifiedLoginTracker
@@ -43,12 +38,6 @@ class LoginPrologueFragment : Fragment() {
         loginPrologueListener = context
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View = inflater.inflate(R.layout.login_signup_screen, container, false)
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -62,43 +51,39 @@ class LoginPrologueFragment : Fragment() {
             flags = flags or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE
             decorView.systemUiVisibility = flags
         }
+        val binding = LoginSignupScreenBinding.bind(view)
 
-        if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
-            bottom_buttons.removeAllViews()
-            View.inflate(context, R.layout.login_prologue_bottom_buttons_container_unified, bottom_buttons)
-        }
+        with(binding.bottomButtonsContainer) {
+            continueWithWpcomButton.setText(R.string.continue_with_wpcom)
 
-        first_button.setOnClickListener {
-            unifiedLoginTracker.trackClick(Click.CONTINUE_WITH_WORDPRESS_COM)
-            loginPrologueListener.showEmailLoginScreen()
-        }
+            continueWithWpcomButton.setOnClickListener {
+                unifiedLoginTracker.trackClick(Click.CONTINUE_WITH_WORDPRESS_COM)
+                loginPrologueListener.showEmailLoginScreen()
+            }
 
-        second_button.setOnClickListener {
-            if (BuildConfig.UNIFIED_LOGIN_AVAILABLE) {
+            enterYourSiteAddressButton.setOnClickListener {
                 unifiedLoginTracker.trackClick(Click.LOGIN_WITH_SITE_ADDRESS)
                 loginPrologueListener.loginViaSiteAddress()
-            } else {
-                loginPrologueListener.doStartSignup()
             }
         }
 
         val adapter = LoginProloguePagerAdapter(this)
 
-        intros_pager.adapter = adapter
-        intros_pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+        binding.introsPager.adapter = adapter
+        binding.introsPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
                 AnalyticsUtils.trackLoginProloguePages(position)
             }
         })
-        intros_pager.setPageTransformer(object : ViewPager2.PageTransformer {
+        binding.introsPager.setPageTransformer(object : ViewPager2.PageTransformer {
             override fun transformPage(page: View, position: Float) {
                 // Since we want to achieve the illusion of having a single continuous background, we apply a
                 // parallax effect to the foreground views of each page, making them enter and exit the screen
                 // at a different speed than the background, which just follows the speed of the swipe gesture.
                 page.apply {
-                    applyParallaxEffect(promo_title, position, width, 0.25f)
-                    applyParallaxEffect(promo_layout_container, position, width, 0.5f)
+                    applyParallaxEffect(this.findViewById(R.id.promo_title), position, width, 0.25f)
+                    applyParallaxEffect(this.findViewById(R.id.promo_layout_container), position, width, 0.5f)
                 }
             }
 
@@ -127,9 +112,9 @@ class LoginPrologueFragment : Fragment() {
 
         if (adapter.itemCount > 1) {
             TabLayoutMediator(
-                    tab_layout_indicator,
-                    intros_pager,
-                    TabLayoutMediator.TabConfigurationStrategy { _, _ -> }).attach()
+                    binding.tabLayoutIndicator,
+                    binding.introsPager
+            ) { _, _ -> }.attach()
         }
 
         if (savedInstanceState == null) {
diff --git a/WordPress/src/wordpress/java/org.wordpress.android.ui.accounts.login/LoginPrologueViewModel.kt b/WordPress/src/wordpress/java/org.wordpress.android.ui.accounts.login/LoginPrologueViewModel.kt
new file mode 100644
index 000000000000..d68201ba0949
--- /dev/null
+++ b/WordPress/src/wordpress/java/org.wordpress.android.ui.accounts.login/LoginPrologueViewModel.kt
@@ -0,0 +1,6 @@
+package org.wordpress.android.ui.accounts.login
+
+import androidx.lifecycle.ViewModel
+import javax.inject.Inject
+
+class LoginPrologueViewModel @Inject constructor() : ViewModel()
diff --git a/WordPress/src/main/res/layout/login_signup_screen.xml b/WordPress/src/wordpress/res/layout/login_signup_screen.xml
similarity index 92%
rename from WordPress/src/main/res/layout/login_signup_screen.xml
rename to WordPress/src/wordpress/res/layout/login_signup_screen.xml
index eca44ff3b49c..b59fada49655 100644
--- a/WordPress/src/main/res/layout/login_signup_screen.xml
+++ b/WordPress/src/wordpress/res/layout/login_signup_screen.xml
@@ -40,6 +40,8 @@
         app:cardCornerRadius="0dp"
         app:cardElevation="@dimen/appbar_elevation">
 
-        <include layout="@layout/login_prologue_bottom_buttons_container_default" />
+        <include
+            android:id="@+id/bottom_buttons_container"
+            layout="@layout/login_prologue_bottom_buttons_container" />
     </com.google.android.material.card.MaterialCardView>
 </RelativeLayout>
diff --git a/build.gradle b/build.gradle
index 7e2138650c54..5f86ce9caa36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,9 @@ buildscript {
     ext.kotlin_coroutines_version = '1.3.9'
     ext.coroutinesVersion = '1.3.9'
     ext.kotlin_ktx_version = '1.2.0'
-    ext.androidx_work_version = "2.0.1"
-    ext.buildGutenbergMobileJSBundle = 1
+    ext.wordPressUtilsVersion = '1.40.0'
+    ext.detektVersion = '1.15.0'
+    ext.gutenbergMobileVersion = 'v1.53.0'
 
     repositories {
         google()
@@ -15,52 +16,33 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.automattic.android:fetchstyle:1.1'
+        //classpath 'com.automattic.android:fetchstyle:1.1'
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navComponentVersion"
+        classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
     }
 }
 
-ext {
-    buildGutenbergMobileJSBundle = 1
-}
-
-apply plugin: 'com.automattic.android.fetchstyle'
-
-project.ext.buildGutenbergFromSource = project.properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean()
-def suppressJSBundle =  System.getenv('SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD').asBoolean()
-project.ext.buildGutenbergMobileJSBundle = !(suppressJSBundle || project.ext.buildGutenbergFromSource)
-
-if (project.ext.buildGutenbergFromSource) {
-    def nodeModulesDir = new File('libs/gutenberg-mobile/node_modules')
-    if (!nodeModulesDir.exists()) {
-        def message = "Attempting to build Gutenberg from source without a libs/gutenberg-mobile/node_modules directory. \
-Either run `npm install` manually within libs/gutenberg-mobile or disable building Gutenberg from source by \
-setting wp.BUILD_GUTENBERG_FROM_SOURCE to false."
-        throw new GradleException(message)
-    }
-}
+//apply plugin: 'com.automattic.android.fetchstyle'
 
 allprojects {
     apply plugin: 'checkstyle'
+    apply plugin: 'io.gitlab.arturbosch.detekt'
 
     repositories {
         google()
         jcenter()
-        maven { url "https://dl.bintray.com/wordpress-mobile/maven" }
         maven { url "https://jitpack.io" }
 
-        if (rootProject.ext.buildGutenbergFromSource) {
-            // nested RN libraries need the RN maven repo defined from outside so, do it here when building from source
-
+        if (gradle.ext.includedBuildGutenbergMobilePath) {
             maven {
                 // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-                url "$rootDir/libs/gutenberg-mobile/gutenberg/node_modules/react-native/android"
+                url "$rootDir/$gradle.ext.includedBuildGutenbergMobilePath/gutenberg/node_modules/react-native/android"
             }
         } else {
-            maven { url "https://dl.bintray.com/wordpress-mobile/react-native-mirror/" }
+            maven { url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" }
         }
 
         flatDir {
@@ -78,6 +60,27 @@ allprojects {
         toolVersion = '8.3'
         configFile file("${project.rootDir}/config/checkstyle.xml")
     }
+
+    detekt {
+        config = files("${project.rootDir}/config/detekt/detekt.yml")
+        autoCorrect = false
+        buildUponDefaultConfig = false
+        disableDefaultRuleSets = false
+        ignoreFailures = false
+        parallel = false
+        debug = false
+        reports {
+            html.enabled = true
+            xml.enabled = true
+            txt.enabled = true
+        }
+    }
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+        kotlinOptions {
+            jvmTarget = "1.8"
+        }
+    }
 }
 
 subprojects {
@@ -127,13 +130,14 @@ ext {
     targetSdkVersion = 29
 
     coroutinesVersion = '1.3.9'
-    androidxWorkVersion = "2.0.1"
+    androidxWorkVersion = "2.4.0"
 
     daggerVersion = '2.29.1'
-    fluxCVersion = '1.6.26-beta-5'
+    fluxCVersion = '1.17.0'
 
     appCompatVersion = '1.0.2'
-    coreVersion = '1.2.0'
+    coreVersion = '1.3.2'
+    lifecycleVersion = '2.2.0'
     constraintLayoutVersion = '1.1.3'
     materialVersion = '1.2.1'
     preferenceVersion = '1.1.0'
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
new file mode 100644
index 000000000000..1c3d8fd17b34
--- /dev/null
+++ b/config/detekt/baseline.xml
@@ -0,0 +1,564 @@
+<?xml version="1.0" ?>
+<SmellBaseline>
+  <ManuallySuppressedIssues></ManuallySuppressedIssues>
+  <CurrentIssues>
+    <ID>ComplexCondition:AllTimeStatsUseCase.kt$AllTimeStatsUseCase$!hasPosts &amp;&amp; !hasViews &amp;&amp; !hasVisitors &amp;&amp; !hasViewsBestDayTotal</ID>
+    <ID>ComplexCondition:FollowersUseCase.kt$FollowersUseCase$wpComModel.followers.size &gt;= VIEW_ALL_PAGE_SIZE &amp;&amp; uiState.selectedTab == 0 || emailModel.followers.size &gt;= VIEW_ALL_PAGE_SIZE &amp;&amp; uiState.selectedTab == 1</ID>
+    <ID>ComplexCondition:FollowersUseCase.kt$FollowersUseCase$wpComModel.hasMore &amp;&amp; uiState.selectedTab == 0 || emailModel.hasMore &amp;&amp; uiState.selectedTab == 1</ID>
+    <ID>ComplexCondition:GifPickerActivity.kt$GifPickerActivity$isVisible &amp;&amp; selectionBar.visibility == View.VISIBLE || !isVisible &amp;&amp; selectionBar.visibility != View.VISIBLE</ID>
+    <ID>ComplexCondition:MinifiedWidgetUpdater.kt$MinifiedWidgetUpdater$networkAvailable &amp;&amp; hasAccessToken &amp;&amp; siteModel != null &amp;&amp; dataType != null</ID>
+    <ID>ComplexCondition:NullCheckExtensions.kt$value1 != null &amp;&amp; value2 != null &amp;&amp; value3 != null &amp;&amp; value4 != null</ID>
+    <ID>ComplexCondition:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$activity != null &amp;&amp; requestCode == READER_FILE_DOWNLOAD_PERMISSION_REQUEST_CODE &amp;&amp; grantResults.isNotEmpty() &amp;&amp; grantResults[0] == PackageManager.PERMISSION_GRANTED</ID>
+    <ID>ComplexCondition:SiteListItemBuilder.kt$SiteListItemBuilder$!TextUtils.isEmpty(planShortName) &amp;&amp; site.hasCapabilityManageOptions &amp;&amp; !site.isWpForTeamsSite &amp;&amp; (site.isWPCom || site.isAutomatedTransfer)</ID>
+    <ID>ComplexCondition:TodayStatsUseCase.kt$TodayStatsUseCase$!hasViews &amp;&amp; !hasVisitors &amp;&amp; !hasLikes &amp;&amp; !hasComments</ID>
+    <ID>ComplexMethod:BarChartViewHolder.kt$BarChartViewHolder$private fun BarChart.draw( item: BarChartItem, labelStart: TextView, labelEnd: TextView ): BarCount</ID>
+    <ID>ComplexMethod:BlockDiffCallback.kt$BlockDiffCallback$override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any?</ID>
+    <ID>ComplexMethod:BlockListAdapter.kt$BlockListAdapter$override fun onBindViewHolder(holder: BlockListItemViewHolder, position: Int, payloads: List&lt;Any&gt;)</ID>
+    <ID>ComplexMethod:BlockListAdapter.kt$BlockListAdapter$override fun onCreateViewHolder(parent: ViewGroup, itemType: Int): BlockListItemViewHolder</ID>
+    <ID>ComplexMethod:CreatePageListItemActionsUseCase.kt$CreatePageListItemActionsUseCase$fun setupPageActions( listType: PageListType, uploadUiState: PostUploadUiState, siteModel: SiteModel, remoteId: Long ): Set&lt;Action&gt;</ID>
+    <ID>ComplexMethod:CreatePageListItemLabelsUseCase.kt$CreatePageListItemLabelsUseCase$private fun getLabels( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, hasUnhandledConflicts: Boolean, hasAutoSave: Boolean ): List&lt;UiString&gt;</ID>
+    <ID>ComplexMethod:EditorTracker.kt$EditorTracker$@JvmOverloads fun trackEditorEvent( event: TrackableEvent, editorName: String, properties: Map&lt;String, String&gt; = mapOf() )</ID>
+    <ID>ComplexMethod:FormattableContentClickHandler.kt$FormattableContentClickHandler$fun onClick( activity: FragmentActivity, clickedSpan: FormattableRange, source: String )</ID>
+    <ID>ComplexMethod:HomepageSettingsDialog.kt$HomepageSettingsDialog$override fun onCreateDialog(savedInstanceState: Bundle?): Dialog</ID>
+    <ID>ComplexMethod:ImagePlaceholderManager.kt$ImagePlaceholderManager$fun getErrorResource(imgType: ImageType): Int?</ID>
+    <ID>ComplexMethod:ImagePlaceholderManager.kt$ImagePlaceholderManager$fun getPlaceholderResource(imgType: ImageType): Int?</ID>
+    <ID>ComplexMethod:ImprovedMySiteFragment.kt$ImprovedMySiteFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>ComplexMethod:MediaPickerFragment.kt$MediaPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>ComplexMethod:MediaPickerViewModel.kt$MediaPickerViewModel$private fun buildUiModel( domainModel: DomainModel?, selectedIds: List&lt;Identifier&gt;?, softAskRequest: SoftAskRequest?, isSearching: Boolean? ): PhotoListUiModel</ID>
+    <ID>ComplexMethod:MySiteAdapterDiffCallback.kt$MySiteAdapterDiffCallback$override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean</ID>
+    <ID>ComplexMethod:MySiteFragment.kt$MySiteFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>ComplexMethod:MySiteViewModel.kt$MySiteViewModel$private fun onItemClick(action: ListItemAction)</ID>
+    <ID>ComplexMethod:NoticonUtils.kt$NoticonUtils$fun noticonToGridicon(noticon: String): Int</ID>
+    <ID>ComplexMethod:PostActionHandler.kt$PostActionHandler$fun handlePostButton(buttonType: PostListButtonType, post: PostModel, hasAutoSave: Boolean)</ID>
+    <ID>ComplexMethod:PostListActionTracker.kt$fun trackPostListAction(site: SiteModel, buttonType: PostListButtonType, postData: PostModel, statsEvent: Stat)</ID>
+    <ID>ComplexMethod:PostListDialogHelper.kt$PostListDialogHelper$fun onPositiveClickedForBasicDialog( instanceTag: String, trashPostWithLocalChanges: (Int) -&gt; Unit, trashPostWithUnsavedChanges: (Int) -&gt; Unit, deletePost: (Int) -&gt; Unit, publishPost: (Int) -&gt; Unit, updateConflictedPostWithRemoteVersion: (Int) -&gt; Unit, editRestoredAutoSavePost: (Int) -&gt; Unit, moveTrashedPostToDraft: (Int) -&gt; Unit, resolveConflictsAndEditPost: (Int) -&gt; Unit )</ID>
+    <ID>ComplexMethod:PostListItemUiStateHelper.kt$PostListItemUiStateHelper$private fun createButtonTypes( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, siteHasCapabilitiesToPublish: Boolean, statsSupported: Boolean ): List&lt;PostListButtonType&gt;</ID>
+    <ID>ComplexMethod:PostListItemUiStateHelper.kt$PostListItemUiStateHelper$private fun getStatuses( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, hasUnhandledConflicts: Boolean, hasAutoSave: Boolean ): List&lt;UiString&gt;</ID>
+    <ID>ComplexMethod:PostPageListLabelColorUseCase.kt$PostPageListLabelColorUseCase$@ColorRes private fun getLabelColor( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, hasUnhandledConflicts: Boolean, hasAutoSave: Boolean ): Int?</ID>
+    <ID>ComplexMethod:ReaderPostBookmarkUseCase.kt$ReaderPostBookmarkUseCase$private fun trackEvent( bookmarked: Boolean, isBookmarkList: Boolean, post: ReaderPost, source: String )</ID>
+    <ID>ComplexMethod:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$private fun ReaderNavigationEvents.handleNavigationEvent()</ID>
+    <ID>ComplexMethod:ReferrersUseCase.kt$ReferrersUseCase$override fun buildUiModel(domainModel: ReferrersModel, uiState: SelectedGroup): List&lt;BlockListItem&gt;</ID>
+    <ID>ComplexMethod:StatsNavigator.kt$StatsNavigator$fun navigate(activity: FragmentActivity, target: NavigationTarget)</ID>
+    <ID>ComplexMethod:SystemNotificationsTracker.kt$SystemNotificationsTracker$private fun NotificationType.toTypeValue(): String</ID>
+    <ID>ComplexMethod:UiModelMapper.kt$UiModelMapper$fun mapInsights( useCaseModels: List&lt;UseCaseModel&gt;, showError: (Int) -&gt; Unit ): UiModel</ID>
+    <ID>ComplexMethod:UiModelMapper.kt$UiModelMapper$private fun mapStatsWithOverview( overViewType: StatsType, useCaseModels: List&lt;UseCaseModel&gt;, showError: (Int) -&gt; Unit ): UiModel</ID>
+    <ID>ComplexMethod:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined$private fun setListeners()</ID>
+    <ID>ConstructorParameterNaming:MainFabUiState.kt$MainFabUiState$@StringRes val CreateContentMessageId: Int</ID>
+    <ID>ConstructorParameterNaming:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined.SavedState$`in`: Parcel</ID>
+    <ID>EmptyFunctionBlock:AllTimeWidgetListProvider.kt$AllTimeWidgetListProvider${ }</ID>
+    <ID>EmptyFunctionBlock:CommentFullScreenDialogFragment.kt$CommentFullScreenDialogFragment.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:DomainRegistrationDetailsFragment.kt$DomainRegistrationDetailsFragment.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:DomainSuggestionsFragment.kt$DomainSuggestionsFragment.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:EditPostPublishSettingsFragment.kt$EditPostPublishSettingsFragment${}</ID>
+    <ID>EmptyFunctionBlock:GlideMShotsLoader.kt$GlideMShotsLoader.Factory${}</ID>
+    <ID>EmptyFunctionBlock:ImageManager.kt$ImageManager.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:LayoutViewHolder.kt$LayoutViewHolder.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:MySiteFragment.kt$MySiteFragment${}</ID>
+    <ID>EmptyFunctionBlock:NotificationsListFragment.kt$NotificationsListFragment.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:NotificationsListFragmentPage.kt$NotificationsListFragmentPage.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:PagesFragment.kt$PagesFragment.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:PagesFragment.kt$PagesFragment.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:PostsListActivity.kt$PostsListActivity.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:PrepublishingAddCategoryFragment.kt$PrepublishingAddCategoryFragment.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:QuickStartFocusPoint.kt$QuickStartFocusPoint.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:ReaderDiscoverDataProvider.kt$ReaderDiscoverDataProvider${ }</ID>
+    <ID>EmptyFunctionBlock:ReaderPostDetailFragment.kt$ReaderPostDetailFragment${ }</ID>
+    <ID>EmptyFunctionBlock:ScanHistoryFragment.kt$ScanHistoryFragment.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:SearchInputWithHeader.kt$SearchInputWithHeader.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:SettingsUsernameChangerFragment.kt$SettingsUsernameChangerFragment.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:SiteCreationService.kt$SiteCreationService${ }</ID>
+    <ID>EmptyFunctionBlock:StatsFragment.kt$SelectedTabListener${ }</ID>
+    <ID>EmptyFunctionBlock:StatsViewAllFragment.kt$StatsViewAllFragment.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:StoryTitleHeaderView.kt$StoryTitleHeaderView.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:SuggestionActivity.kt$SuggestionActivity.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:TabsViewHolder.kt$TabsViewHolder.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:ThreatLoadingSkeletonViewHolder.kt$ThreatLoadingSkeletonViewHolder${}</ID>
+    <ID>EmptyFunctionBlock:TodayWidgetListProvider.kt$TodayWidgetListProvider${ }</ID>
+    <ID>EmptyFunctionBlock:ViewsWidgetListProvider.kt$ViewsWidgetListProvider${ }</ID>
+    <ID>EmptyFunctionBlock:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined.&lt;no name provided&gt;${ }</ID>
+    <ID>EmptyFunctionBlock:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined.&lt;no name provided&gt;${}</ID>
+    <ID>EmptyFunctionBlock:WPTextViewDrawableCallback.kt$WPTextViewDrawableCallback${}</ID>
+    <ID>EmptyFunctionBlock:WidgetBlockListProvider.kt$WidgetBlockListProvider${ }</ID>
+    <ID>EmptyFunctionBlock:WordPressGlideModule.kt$WordPressGlideModule${}</ID>
+    <ID>EmptySecondaryConstructor:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined.SavedState${}</ID>
+    <ID>FunctionNaming:WPMainActivityViewModel.kt$WPMainActivityViewModel$// create_post_page_fab_tooltip_stories_feature_flag_on private fun getCreateContentMessageId_StoriesFlagOn(hasFullAccessToContent: Boolean): Int</ID>
+    <ID>FunctionNaming:WPMainActivityViewModel.kt$WPMainActivityViewModel$private fun getCreateContentMessageId_StoriesFlagOff(hasFullAccessToContent: Boolean): Int</ID>
+    <ID>FunctionParameterNaming:WizardManager.kt$WizardManager$T: WizardStep</ID>
+    <ID>LargeClass:MySiteFragment.kt$MySiteFragment : FragmentOnScrollToTopListenerBasicDialogPositiveClickInterfaceBasicDialogNegativeClickInterfaceBasicDialogOnDismissByOutsideTouchInterfacePromoDialogClickInterfaceOnConfirmListenerOnDismissListenerCallback</ID>
+    <ID>LargeClass:PagesViewModel.kt$PagesViewModel : ScopedViewModel</ID>
+    <ID>LargeClass:ReaderPostDetailFragment.kt$ReaderPostDetailFragment : ViewPagerFragmentOnActivityBackPressedListenerScrollDirectionListenerReaderCustomViewListenerReaderWebViewPageFinishedListenerReaderWebViewUrlClickListenerPrivateAtCookieProgressDialogOnDismissListenerAutoHideToolbarListener</ID>
+    <ID>LongMethod:AuthorsUseCase.kt$AuthorsUseCase$override fun buildUiModel(domainModel: AuthorsModel, uiState: SelectedAuthor): List&lt;BlockListItem&gt;</ID>
+    <ID>LongMethod:BarChartViewHolder.kt$BarChartViewHolder$private fun BarChart.draw( item: BarChartItem, labelStart: TextView, labelEnd: TextView ): BarCount</ID>
+    <ID>LongMethod:ClicksUseCase.kt$ClicksUseCase$override fun buildUiModel(domainModel: ClicksModel, uiState: SelectedClicksGroup): List&lt;BlockListItem&gt;</ID>
+    <ID>LongMethod:HomepageSettingsDialog.kt$HomepageSettingsDialog$override fun onCreateDialog(savedInstanceState: Bundle?): Dialog</ID>
+    <ID>LongMethod:ImprovedMySiteFragment.kt$ImprovedMySiteFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>LongMethod:JetpackRemoteInstallFragment.kt$JetpackRemoteInstallFragment$override fun onActivityCreated(savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:MediaPickerActivity.kt$MediaPickerActivity$override fun onActivityResult( requestCode: Int, resultCode: Int, data: Intent? )</ID>
+    <ID>LongMethod:MediaPickerFragment.kt$MediaPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:MediaPickerViewModel.kt$MediaPickerViewModel$private fun buildUiModel( domainModel: DomainModel?, selectedIds: List&lt;Identifier&gt;?, softAskRequest: SoftAskRequest?, isSearching: Boolean? ): PhotoListUiModel</ID>
+    <ID>LongMethod:MySiteFragment.kt$MySiteFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>LongMethod:OverviewMapper.kt$OverviewMapper$fun buildChart( dates: List&lt;PeriodData&gt;, statsGranularity: StatsGranularity, onBarSelected: (String?) -&gt; Unit, onBarChartDrawn: (visibleBarCount: Int) -&gt; Unit, selectedType: Int, selectedItemPeriod: String ): List&lt;BlockListItem&gt;</ID>
+    <ID>LongMethod:PhotoPickerFragment.kt$PhotoPickerFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:PostListItemUiStateHelper.kt$PostListItemUiStateHelper$fun createPostListItemUiState( authorFilterSelection: AuthorFilterSelection, post: PostModel, site: SiteModel, unhandledConflicts: Boolean, hasAutoSave: Boolean, capabilitiesToPublish: Boolean, statsSupported: Boolean, featuredImageUrl: String?, formattedDate: String, performingCriticalAction: Boolean, isSearch: Boolean, uploadStatusTracker: PostModelUploadStatusTracker, onAction: (PostModel, PostListButtonType, AnalyticsTracker.Stat) -&gt; Unit ): PostListItemUiState</ID>
+    <ID>LongMethod:PrepublishingHomeViewModel.kt$PrepublishingHomeViewModel$private fun setupHomeUiState( editPostRepository: EditPostRepository, site: SiteModel, isStoryPost: Boolean )</ID>
+    <ID>LongMethod:PublishSettingsFragment.kt$PublishSettingsFragment$override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View?</ID>
+    <ID>LongMethod:ReferrersUseCase.kt$ReferrersUseCase$override fun buildUiModel(domainModel: ReferrersModel, uiState: SelectedGroup): List&lt;BlockListItem&gt;</ID>
+    <ID>LongMethod:SearchListViewModel.kt$SearchListViewModel$private fun PageModel.toPageItem(areActionsEnabled: Boolean): PageItem</ID>
+    <ID>LongMethod:StatsMinifiedWidgetConfigureFragment.kt$StatsMinifiedWidgetConfigureFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:StatsNavigator.kt$StatsNavigator$fun navigate(activity: FragmentActivity, target: NavigationTarget)</ID>
+    <ID>LongMethod:StatsWidgetConfigureFragment.kt$StatsWidgetConfigureFragment$override fun onViewCreated(view: View, savedInstanceState: Bundle?)</ID>
+    <ID>LongMethod:SuggestionActivity.kt$SuggestionActivity$private fun initializeActivity(siteModel: SiteModel, suggestionType: SuggestionType)</ID>
+    <ID>LongParameterList:AddLocalMediaToPostUseCase.kt$AddLocalMediaToPostUseCase$( uriList: List&lt;Uri&gt;, site: SiteModel, freshlyTaken: Boolean, editorMediaListener: EditorMediaListener, doUploadAfterAdding: Boolean = true, trackEvent: Boolean = true )</ID>
+    <ID>LongParameterList:AnnualSiteStatsUseCase.kt$AnnualSiteStatsUseCase$( @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val mostPopularStore: MostPopularInsightsStore, private val statsSiteProvider: StatsSiteProvider, private val selectedDateProvider: SelectedDateProvider, private val annualStatsMapper: AnnualStatsMapper, private val localeManagerWrapper: LocaleManagerWrapper, private val popupMenuHandler: ItemPopupMenuHandler, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:AuthorsUseCase.kt$AuthorsUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val authorsStore: AuthorsStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:BasicFragmentDialog.kt$BasicFragmentDialog$( tag: String, title: CharSequence?, message: CharSequence, positiveButtonLabel: CharSequence, negativeButtonLabel: CharSequence? = null, cancelButtonLabel: CharSequence? = null )</ID>
+    <ID>LongParameterList:ClicksUseCase.kt$ClicksUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val store: ClicksStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:CountryViewsUseCase.kt$CountryViewsUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val store: CountryViewsStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:CreatePageListItemLabelsUseCase.kt$CreatePageListItemLabelsUseCase$( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, hasUnhandledConflicts: Boolean, hasAutoSave: Boolean )</ID>
+    <ID>LongParameterList:FileDownloadsUseCase.kt$FileDownloadsUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val store: FileDownloadsStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val localeManagerWrapper: LocaleManagerWrapper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:FollowersUseCase.kt$FollowersUseCase$( @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher, private val followersStore: FollowersStore, private val statsSiteProvider: StatsSiteProvider, private val statsUtilsWrapper: StatsUtilsWrapper, private val resourceProvider: ResourceProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val popupMenuHandler: ItemPopupMenuHandler, private val contentDescriptionHelper: ContentDescriptionHelper, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:GifMediaInsertUseCase.kt$GifMediaInsertUseCase$( private val context: Context, private val site: SiteModel, private val dispatcher: Dispatcher, private val ioDispatcher: CoroutineDispatcher, private val wpMediaUtilsWrapper: WPMediaUtilsWrapper, private val fluxCUtilsWrapper: FluxCUtilsWrapper, private val mimeTypeMapUtilsWrapper: MimeTypeMapUtilsWrapper )</ID>
+    <ID>LongParameterList:GifMediaViewHolder.kt$GifMediaViewHolder.Companion$( imageManager: ImageManager, onClickListener: (GifMediaViewModel?) -&gt; Unit, onLongClickListener: (GifMediaViewModel) -&gt; Unit, parent: ViewGroup, thumbnailViewDimensions: ThumbnailViewDimensions, isMultiSelectEnabled: Boolean )</ID>
+    <ID>LongParameterList:GranularStatefulUseCase.kt$GranularStatefulUseCase$( type: StatsType, mainDispatcher: CoroutineDispatcher, backgroundDispatcher: CoroutineDispatcher, val statsSiteProvider: StatsSiteProvider, val selectedDateProvider: SelectedDateProvider, val statsGranularity: StatsGranularity, defaultUiState: UI_STATE )</ID>
+    <ID>LongParameterList:ImageManager.kt$ImageManager$( awt: AppWidgetTarget, context: Context, imageType: ImageType, imgUrl: String = "", scaleType: ScaleType = CENTER, width: Int? = null, height: Int? = null )</ID>
+    <ID>LongParameterList:ImageManager.kt$ImageManager$( imageView: ImageView, imageType: ImageType, imgUri: Uri, scaleType: ScaleType = CENTER, thumbnailUrl: String? = null, requestListener: RequestListener&lt;Drawable&gt; )</ID>
+    <ID>LongParameterList:ImageManager.kt$ImageManager$( imageView: ImageView, imageType: ImageType, imgUrl: String, scaleType: ScaleType = CENTER, thumbnailUrl: String? = null, requestListener: RequestListener&lt;Drawable&gt; )</ID>
+    <ID>LongParameterList:JetpackRemoteInstallViewState.kt$JetpackRemoteInstallViewState$( val type: Type, @StringRes val titleResource: Int, @StringRes val messageResource: Int, @DrawableRes val icon: Int, @ColorRes val iconTint: Int? = null, @StringRes val buttonResource: Int? = null, open val onClick: () -&gt; Unit = {}, val progressBarVisible: Boolean = false )</ID>
+    <ID>LongParameterList:LiveDataUtils.kt$( sourceA: LiveData&lt;S&gt;, sourceB: LiveData&lt;T&gt;, sourceC: LiveData&lt;U&gt;, sourceD: LiveData&lt;V&gt;, distinct: Boolean = false, merger: (S?, T?, U?, V?) -&gt; W? )</ID>
+    <ID>LongParameterList:LiveDataUtils.kt$( sourceA: LiveData&lt;S&gt;, sourceB: LiveData&lt;T&gt;, sourceC: LiveData&lt;U&gt;, sourceD: LiveData&lt;V&gt;, sourceE: LiveData&lt;W&gt;, distinct: Boolean = false, merger: (S?, T?, U?, V?, W?) -&gt; X? )</ID>
+    <ID>LongParameterList:MeGravatarLoader.kt$MeGravatarLoader$( newAvatarUploaded: Boolean, avatarUrl: String, injectFilePath: String?, imageView: ImageView, imageType: ImageType, listener: RequestListener&lt;Drawable&gt;? = null )</ID>
+    <ID>LongParameterList:MediaLibraryDataSource.kt$MediaLibraryDataSource$( private val mediaStore: MediaStore, private val dispatcher: Dispatcher, @param:Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher, private val networkUtilsWrapper: NetworkUtilsWrapper, private val dateTimeUtilsWrapper: DateTimeUtilsWrapper, private val siteModel: SiteModel, private val mediaTypes: Set&lt;MediaType&gt; )</ID>
+    <ID>LongParameterList:MediaThumbnailViewUtils.kt$MediaThumbnailViewUtils$( container: View, imgThumbnail: ImageView, fileName: String, isSelected: Boolean, clickAction: ClickAction, toggleAction: ToggleAction, animateSelection: Boolean )</ID>
+    <ID>LongParameterList:MinifiedWidgetUpdater.kt$MinifiedWidgetUpdater$( appWidgetManager: AppWidgetManager, appWidgetId: Int, site: SiteModel, views: RemoteViews, dataType: DataType, isWideView: Boolean )</ID>
+    <ID>LongParameterList:MinifiedWidgetUpdater.kt$MinifiedWidgetUpdater$( appWidgetManager: AppWidgetManager, appWidgetId: Int, views: RemoteViews, site: SiteModel, dataType: DataType, isWideView: Boolean )</ID>
+    <ID>LongParameterList:NotificationsListFragment.kt$NotificationsListFragment.Companion$( activity: Activity?, noteId: String?, shouldShowKeyboard: Boolean, replyText: String?, filter: FILTERS?, isTappedFromPushNotification: Boolean )</ID>
+    <ID>LongParameterList:NotificationsListFragmentPage.kt$NotificationsListFragmentPage.Companion$( activity: Activity?, noteId: String?, shouldShowKeyboard: Boolean, replyText: String?, filter: FILTERS?, isTappedFromPushNotification: Boolean )</ID>
+    <ID>LongParameterList:OverviewMapper.kt$OverviewMapper$( dates: List&lt;PeriodData&gt;, statsGranularity: StatsGranularity, onBarSelected: (String?) -&gt; Unit, onBarChartDrawn: (visibleBarCount: Int) -&gt; Unit, selectedType: Int, selectedItemPeriod: String )</ID>
+    <ID>LongParameterList:OverviewMapper.kt$OverviewMapper$( selectedItem: PeriodData, previousItem: PeriodData?, selectedPosition: Int, isLast: Boolean, startValue: Int = MILLION, statsGranularity: StatsGranularity = DAYS )</ID>
+    <ID>LongParameterList:OverviewUseCase.kt$OverviewUseCase$( private val statsGranularity: StatsGranularity, private val visitsAndViewsStore: VisitsAndViewsStore, private val selectedDateProvider: SelectedDateProvider, private val statsSiteProvider: StatsSiteProvider, private val statsDateFormatter: StatsDateFormatter, private val overviewMapper: OverviewMapper, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val analyticsTracker: AnalyticsTrackerWrapper, private val statsWidgetUpdaters: StatsWidgetUpdaters, private val localeManagerWrapper: LocaleManagerWrapper, private val resourceProvider: ResourceProvider )</ID>
+    <ID>LongParameterList:PageItem.kt$PageItem.Page$( open val remoteId: Long, open val localId: Int, open val title: String, open val subtitle: Int? = null, open val icon: Int? = null, open val date: Date, open val labels: List&lt;UiString&gt;, @ColorRes open val labelsColor: Int?, open var indent: Int, open var imageUrl: String?, open val actions: Set&lt;Action&gt;, open var actionsEnabled: Boolean, open val tapActionEnabled: Boolean, open val progressBarUiState: ProgressBarUiState, open val showOverlay: Boolean, open val author: String?, open var showQuickStartFocusPoint: Boolean )</ID>
+    <ID>LongParameterList:PageItemViewHolder.kt$PageItemViewHolder.PageViewHolder$( parentView: ViewGroup, private val onMenuAction: (PageItem.Action, Page) -&gt; Boolean, private val onItemTapped: (Page) -&gt; Unit, private val imageManager: ImageManager? = null, private val isSitePhotonCapable: Boolean = false, private val isPrivateAtSite: Boolean = false, private val uiHelper: UiHelpers )</ID>
+    <ID>LongParameterList:PageListAdapter.kt$PageListAdapter$( private val onMenuAction: (PageItem.Action, Page) -&gt; Boolean, private val onItemTapped: (Page) -&gt; Unit, private val onEmptyActionButtonTapped: () -&gt; Unit, private val isSitePhotonCapable: Boolean, private val isPrivateAtSite: Boolean, private val imageManager: ImageManager, private val uiHelpers: UiHelpers )</ID>
+    <ID>LongParameterList:PageListEventListener.kt$PageListEventListener$( private val dispatcher: Dispatcher, private val bgDispatcher: CoroutineDispatcher, private val postStore: PostStore, private val eventBusWrapper: EventBusWrapper, private val siteStore: SiteStore, private val site: SiteModel, private val handleRemoteAutoSave: (LocalId, Boolean) -&gt; Unit, private val handlePostUploadFinished: (RemoteId, Boolean, Boolean) -&gt; Unit, private val invalidateUploadStatus: (List&lt;LocalId&gt;) -&gt; Unit, private val handleHomepageSettingsChange: (SiteModel) -&gt; Unit )</ID>
+    <ID>LongParameterList:PageListEventListener.kt$PageListEventListener.Factory$( dispatcher: Dispatcher, bgDispatcher: CoroutineDispatcher, postStore: PostStore, eventBusWrapper: EventBusWrapper, siteStore: SiteStore, site: SiteModel, invalidateUploadStatus: (List&lt;LocalId&gt;) -&gt; Unit, handleRemoteAutoSave: (LocalId, Boolean) -&gt; Unit, handlePostUploadFinished: (RemoteId, Boolean, Boolean) -&gt; Unit, handleHomepageSettingsChange: (SiteModel) -&gt; Unit )</ID>
+    <ID>LongParameterList:PhotoPickerUiItem.kt$PhotoPickerUiItem$( val type: Type, open val id: Long, open val uri: UriWrapper? = null, open val isSelected: Boolean = false, open val selectedOrder: Int? = null, open val showOrderCounter: Boolean = false, open val toggleAction: ToggleAction, open val clickAction: ClickAction )</ID>
+    <ID>LongParameterList:PostActionHandler.kt$PostActionHandler$( private val dispatcher: Dispatcher, private val site: SiteModel, private val postStore: PostStore, private val postListDialogHelper: PostListDialogHelper, private val doesPostHaveUnhandledConflict: (PostModel) -&gt; Boolean, private val hasUnhandledAutoSave: (PostModel) -&gt; Boolean, private val triggerPostListAction: (PostListAction) -&gt; Unit, private val triggerPostUploadAction: (PostUploadAction) -&gt; Unit, private val triggerPublishAction: (PostModel) -&gt; Unit, private val invalidateList: () -&gt; Unit, private val checkNetworkConnection: () -&gt; Boolean, private val showSnackbar: (SnackbarMessageHolder) -&gt; Unit, private val showToast: (ToastMessageHolder) -&gt; Unit, private val triggerPreviewStateUpdate: (PostListRemotePreviewState, PostInfoType) -&gt; Unit, private val copyPost: (SiteModel, PostModel, Boolean) -&gt; Unit )</ID>
+    <ID>LongParameterList:PostAverageViewsPerDayUseCase.kt$PostAverageViewsPerDayUseCase$( @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val statsSiteProvider: StatsSiteProvider, private val statsPostProvider: StatsPostProvider, private val postDetailStore: PostDetailStore, private val postDetailMapper: PostDetailMapper, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:PostConflictResolver.kt$PostConflictResolver$( private val dispatcher: Dispatcher, private val site: SiteModel, private val getPostByLocalPostId: (Int) -&gt; PostModel?, private val invalidateList: () -&gt; Unit, private val checkNetworkConnection: () -&gt; Boolean, private val showSnackbar: (SnackbarMessageHolder) -&gt; Unit, private val showToast: (ToastMessageHolder) -&gt; Unit )</ID>
+    <ID>LongParameterList:PostListDialogHelper.kt$PostListDialogHelper$( instanceTag: String, trashPostWithLocalChanges: (Int) -&gt; Unit, trashPostWithUnsavedChanges: (Int) -&gt; Unit, deletePost: (Int) -&gt; Unit, publishPost: (Int) -&gt; Unit, updateConflictedPostWithRemoteVersion: (Int) -&gt; Unit, editRestoredAutoSavePost: (Int) -&gt; Unit, moveTrashedPostToDraft: (Int) -&gt; Unit, resolveConflictsAndEditPost: (Int) -&gt; Unit )</ID>
+    <ID>LongParameterList:PostListEmptyUiState.kt$( postListType: PostListType, isNetworkAvailable: Boolean, isLoadingData: Boolean, isListEmpty: Boolean, isSearchPromptRequired: Boolean, error: ListError?, fetchFirstPage: () -&gt; Unit, newPost: () -&gt; Unit )</ID>
+    <ID>LongParameterList:PostListEventListener.kt$PostListEventListener$( private val lifecycle: Lifecycle, private val dispatcher: Dispatcher, private val bgDispatcher: CoroutineDispatcher, private val postStore: PostStore, private val site: SiteModel, private val postActionHandler: PostActionHandler, private val handlePostUpdatedWithoutError: () -&gt; Unit, private val handlePostUploadedWithoutError: (LocalId) -&gt; Unit, private val triggerPostUploadAction: (PostUploadAction) -&gt; Unit, private val invalidateUploadStatus: (List&lt;Int&gt;) -&gt; Unit, private val invalidateFeaturedMedia: (List&lt;Long&gt;) -&gt; Unit, private val triggerPreviewStateUpdate: (PostListRemotePreviewState, PostInfoType) -&gt; Unit, private val isRemotePreviewingFromPostsList: () -&gt; Boolean, private val hasRemoteAutoSavePreviewError: () -&gt; Boolean )</ID>
+    <ID>LongParameterList:PostListEventListener.kt$PostListEventListener.Factory$( lifecycle: Lifecycle, dispatcher: Dispatcher, bgDispatcher: CoroutineDispatcher, postStore: PostStore, site: SiteModel, postActionHandler: PostActionHandler, handlePostUpdatedWithoutError: () -&gt; Unit, handlePostUploadedWithoutError: (LocalId) -&gt; Unit, triggerPostUploadAction: (PostUploadAction) -&gt; Unit, invalidateUploadStatus: (List&lt;Int&gt;) -&gt; Unit, invalidateFeaturedMedia: (List&lt;Long&gt;) -&gt; Unit, triggerPreviewStateUpdate: (PostListRemotePreviewState, PostInfoType) -&gt; Unit, isRemotePreviewingFromPostsList: () -&gt; Boolean, hasRemoteAutoSavePreviewError: () -&gt; Boolean )</ID>
+    <ID>LongParameterList:PostListItemUiStateHelper.kt$PostListItemUiStateHelper$( authorFilterSelection: AuthorFilterSelection, post: PostModel, site: SiteModel, unhandledConflicts: Boolean, hasAutoSave: Boolean, capabilitiesToPublish: Boolean, statsSupported: Boolean, featuredImageUrl: String?, formattedDate: String, performingCriticalAction: Boolean, isSearch: Boolean, uploadStatusTracker: PostModelUploadStatusTracker, onAction: (PostModel, PostListButtonType, AnalyticsTracker.Stat) -&gt; Unit )</ID>
+    <ID>LongParameterList:PostListItemUiStateHelper.kt$PostListItemUiStateHelper$( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, hasUnhandledConflicts: Boolean, hasAutoSave: Boolean )</ID>
+    <ID>LongParameterList:PostListItemUiStateHelper.kt$PostListItemUiStateHelper$( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, siteHasCapabilitiesToPublish: Boolean, statsSupported: Boolean )</ID>
+    <ID>LongParameterList:PostListViewModelConnector.kt$PostListViewModelConnector$( val site: SiteModel, val postListType: PostListType, val postActionHandler: PostActionHandler, val doesPostHaveUnhandledConflict: (PostModel) -&gt; Boolean, val hasAutoSave: (PostModel) -&gt; Boolean, val postFetcher: PostFetcher, val uploadStatusTracker: PostModelUploadStatusTracker, private val getFeaturedImageUrl: (site: SiteModel, featuredImageId: Long) -&gt; String? )</ID>
+    <ID>LongParameterList:PostMonthsAndYearsUseCase.kt$PostMonthsAndYearsUseCase$( @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val statsSiteProvider: StatsSiteProvider, private val statsPostProvider: StatsPostProvider, private val postDetailStore: PostDetailStore, private val postDetailMapper: PostDetailMapper, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:PostPageListLabelColorUseCase.kt$PostPageListLabelColorUseCase$( postStatus: PostStatus, isLocalDraft: Boolean, isLocallyChanged: Boolean, uploadUiState: PostUploadUiState, hasUnhandledConflicts: Boolean, hasAutoSave: Boolean )</ID>
+    <ID>LongParameterList:PostRecentWeeksUseCase.kt$PostRecentWeeksUseCase$( @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val statsSiteProvider: StatsSiteProvider, private val statsPostProvider: StatsPostProvider, private val postDetailStore: PostDetailStore, private val postDetailMapper: PostDetailMapper, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:PostsAndPagesUseCase.kt$PostsAndPagesUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val postsAndPageViewsStore: PostAndPageViewsStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:PromoDialog.kt$PromoDialog$( tag: String, title: String, message: String, positiveButtonLabel: String, @DrawableRes drawableResId: Int = UNDEFINED_RES_ID, negativeButtonLabel: String = "", linkLabel: String = "", neutralButtonLabel: String = "" )</ID>
+    <ID>LongParameterList:ReaderPostDetailFragment.kt$ReaderPostDetailFragment.Companion$( isFeed: Boolean, blogId: Long, postId: Long, directOperation: DirectOperation?, commentId: Int, isRelatedPost: Boolean, interceptedUri: String?, postListType: ReaderPostListType?, postSlugsResolutionUnderway: Boolean )</ID>
+    <ID>LongParameterList:ReaderPostDetailUiStateBuilder.kt$ReaderPostDetailUiStateBuilder$( post: ReaderPost, moreMenuItems: List&lt;SecondaryAction&gt;? = null, onButtonClicked: (Long, Long, ReaderPostCardActionType) -&gt; Unit, onBlogSectionClicked: (Long, Long) -&gt; Unit, onFollowClicked: () -&gt; Unit, onTagItemClicked: (String) -&gt; Unit )</ID>
+    <ID>LongParameterList:ReaderPostUiStateBuilder.kt$ReaderPostUiStateBuilder$( source: String, post: ReaderPost, isDiscover: Boolean = false, photonWidth: Int, photonHeight: Int, postListType: ReaderPostListType, onButtonClicked: (Long, Long, ReaderPostCardActionType) -&gt; Unit, onItemClicked: (Long, Long) -&gt; Unit, onItemRendered: (ReaderCardUiState) -&gt; Unit, onDiscoverSectionClicked: (Long, Long) -&gt; Unit, onMoreButtonClicked: (ReaderPostUiState) -&gt; Unit, onMoreDismissed: (ReaderPostUiState) -&gt; Unit, onVideoOverlayClicked: (Long, Long) -&gt; Unit, onPostHeaderViewClicked: (Long, Long) -&gt; Unit, onTagItemClicked: (String) -&gt; Unit, moreMenuItems: List&lt;SecondaryAction&gt;? = null )</ID>
+    <ID>LongParameterList:ReferrersUseCase.kt$ReferrersUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val referrersStore: ReferrersStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode, private val popupMenuHandler: ReferrerPopupMenuHandler )</ID>
+    <ID>LongParameterList:SearchTermsUseCase.kt$SearchTermsUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val store: SearchTermsStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:SiteInfoBlockBuilder.kt$SiteInfoBlockBuilder$( site: SiteModel, showSiteIconProgressBar: Boolean, titleClick: () -&gt; Unit, iconClick: () -&gt; Unit, urlClick: () -&gt; Unit, switchSiteClick: () -&gt; Unit, showUpdateSiteTitleFocusPoint: Boolean, showUploadSiteIconFocusPoint: Boolean )</ID>
+    <ID>LongParameterList:SiteItemsBuilder.kt$SiteItemsBuilder$( site: SiteModel, onClick: (ListItemAction) -&gt; Unit, isBackupAvailable: Boolean = false, isScanAvailable: Boolean = false, showViewSiteFocusPoint: Boolean = false, showEnablePostSharingFocusPoint: Boolean = false, showExplorePlansFocusPoint: Boolean = false )</ID>
+    <ID>LongParameterList:SiteSettingsInterfaceWrapper.kt$SiteSettingsInterfaceWrapper.Factory$( site: SiteModel, onSaveError: ((error: Exception?) -&gt; Unit)? = null, onFetchError: ((error: Exception?) -&gt; Unit)? = null, onSettingsUpdated: (() -&gt; Unit)? = null, onSettingsSaved: (() -&gt; Unit)? = null, onCredentialsValidated: ((error: Exception?) -&gt; Unit)? = null )</ID>
+    <ID>LongParameterList:StatsDetailActivity.kt$StatsDetailActivity.Companion$( context: Context, site: SiteModel, postId: Long, postType: String, postTitle: String, postUrl: String? )</ID>
+    <ID>LongParameterList:StatsModule.kt$StatsModule$( allTimeStatsUseCase: AllTimeStatsUseCase, latestPostSummaryUseCase: LatestPostSummaryUseCase, todayStatsUseCase: TodayStatsUseCase, followersUseCaseFactory: FollowersUseCaseFactory, commentsUseCase: CommentsUseCase, mostPopularInsightsUseCase: MostPopularInsightsUseCase, tagsAndCategoriesUseCaseFactory: TagsAndCategoriesUseCaseFactory, publicizeUseCaseFactory: PublicizeUseCaseFactory, postingActivityUseCase: PostingActivityUseCase, followerTotalsUseCase: FollowerTotalsUseCase, annualSiteStatsUseCaseFactory: AnnualSiteStatsUseCaseFactory, managementControlUseCase: ManagementControlUseCase, managementNewsCardUseCase: ManagementNewsCardUseCase )</ID>
+    <ID>LongParameterList:StatsModule.kt$StatsModule$( followersUseCaseFactory: FollowersUseCaseFactory, tagsAndCategoriesUseCaseFactory: TagsAndCategoriesUseCaseFactory, publicizeUseCaseFactory: PublicizeUseCaseFactory, postMonthsAndYearsUseCaseFactory: PostMonthsAndYearsUseCaseFactory, postAverageViewsPerDayUseCaseFactory: PostAverageViewsPerDayUseCaseFactory, postRecentWeeksUseCaseFactory: PostRecentWeeksUseCaseFactory, annualSiteStatsUseCaseFactory: AnnualSiteStatsUseCaseFactory )</ID>
+    <ID>LongParameterList:StatsModule.kt$StatsModule$( postsAndPagesUseCaseFactory: PostsAndPagesUseCaseFactory, referrersUseCaseFactory: ReferrersUseCaseFactory, clicksUseCaseFactory: ClicksUseCaseFactory, countryViewsUseCaseFactory: CountryViewsUseCaseFactory, videoPlaysUseCaseFactory: VideoPlaysUseCaseFactory, searchTermsUseCaseFactory: SearchTermsUseCaseFactory, authorsUseCaseFactory: AuthorsUseCaseFactory, overviewUseCaseFactory: OverviewUseCaseFactory, fileDownloadsUseCaseFactory: FileDownloadsUseCaseFactory )</ID>
+    <ID>LongParameterList:StatsModule.kt$StatsModule$( statsStore: StatsStore, @Named(BG_THREAD) bgDispatcher: CoroutineDispatcher, @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher, statsSiteProvider: StatsSiteProvider, @Named(BLOCK_DETAIL_USE_CASES) useCases: List&lt;@JvmSuppressWildcards BaseStatsUseCase&lt;*, *&gt;&gt;, uiModelMapper: UiModelMapper )</ID>
+    <ID>LongParameterList:StatsModule.kt$StatsModule$( statsStore: StatsStore, @Named(BG_THREAD) bgDispatcher: CoroutineDispatcher, @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher, statsSiteProvider: StatsSiteProvider, @Named(BLOCK_INSIGHTS_USE_CASES) useCases: List&lt;@JvmSuppressWildcards BaseStatsUseCase&lt;*, *&gt;&gt;, uiModelMapper: UiModelMapper )</ID>
+    <ID>LongParameterList:StatsModule.kt$StatsModule$( statsStore: StatsStore, @Named(BG_THREAD) bgDispatcher: CoroutineDispatcher, @Named(UI_THREAD) mainDispatcher: CoroutineDispatcher, statsSiteProvider: StatsSiteProvider, @Named(GRANULAR_USE_CASE_FACTORIES) useCasesFactories: List&lt;@JvmSuppressWildcards GranularUseCaseFactory&gt;, uiModelMapper: UiModelMapper )</ID>
+    <ID>LongParameterList:StatsViewAllActivity.kt$StatsViewAllActivity.Companion$( context: Context, statsType: StatsViewType, granularity: StatsGranularity? = null, selectedDate: SelectedDate? = null, selectedTab: Int? = null, localSiteId: Int )</ID>
+    <ID>LongParameterList:UploadUtilsWrapper.kt$UploadUtilsWrapper$( activity: Activity, snackbarAttachView: View, data: Intent, post: PostModel, site: SiteModel, uploadAction: UploadAction, publishPostListener: OnClickListener? )</ID>
+    <ID>LongParameterList:UploadUtilsWrapper.kt$UploadUtilsWrapper$( activity: Activity?, snackbarAttachView: View?, isError: Boolean, isFirstTimePublish: Boolean, post: PostModel?, errorMessage: String?, site: SiteModel? )</ID>
+    <ID>LongParameterList:UploadUtilsWrapper.kt$UploadUtilsWrapper$( activity: Activity?, snackbarAttachView: View?, isError: Boolean, mediaList: List&lt;MediaModel?&gt;?, site: SiteModel?, messageForUser: String? )</ID>
+    <ID>LongParameterList:VideoPlaysUseCase.kt$VideoPlaysUseCase$( statsGranularity: StatsGranularity, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher, @Named(BG_THREAD) private val backgroundDispatcher: CoroutineDispatcher, private val store: VideoPlaysStore, statsSiteProvider: StatsSiteProvider, selectedDateProvider: SelectedDateProvider, private val analyticsTracker: AnalyticsTrackerWrapper, private val contentDescriptionHelper: ContentDescriptionHelper, private val statsUtils: StatsUtils, private val useCaseMode: UseCaseMode )</ID>
+    <ID>LongParameterList:WidgetUtils.kt$WidgetUtils$( appWidgetManager: AppWidgetManager, views: RemoteViews, appWidgetId: Int, networkAvailable: Boolean, hasAccessToken: Boolean, resourceProvider: ResourceProvider, context: Context, widgetType: Class&lt;*&gt; )</ID>
+    <ID>LongParameterList:WidgetUtils.kt$WidgetUtils$( appWidgetManager: AppWidgetManager, views: RemoteViews, context: Context, appWidgetId: Int, colorMode: Color, siteId: Int, widgetType: WidgetType, isWideView: Boolean )</ID>
+    <ID>LongParameterList:ZendeskHelper.kt$( context: Context, allSites: List&lt;SiteModel&gt;?, origin: Origin?, selectedSite: SiteModel? = null, extraTags: List&lt;String&gt;? = null, zendeskPlanFieldHelper: ZendeskPlanFieldHelper )</ID>
+    <ID>LoopWithTooManyJumpStatements:RemoveMediaUseCase.kt$RemoveMediaUseCase$for (mediaId in mediaIds) { if (!TextUtils.isEmpty(mediaId)) { // make sure the MediaModel exists val mediaModel = try { mediaStore.getMediaWithLocalId(Integer.valueOf(mediaId)) ?: continue } catch (e: NumberFormatException) { AppLog.e(AppLog.T.MEDIA, "Invalid media id: $mediaId") continue } // also make sure it's not being uploaded anywhere else (maybe on some other Post, // simultaneously) if (mediaModel.uploadState != null &amp;&amp; mediaUtils.isLocalFile(mediaModel.uploadState.toLowerCase(Locale.ROOT)) &amp;&amp; !uploadService.isPendingOrInProgressMediaUpload(mediaModel)) { dispatcher.dispatch(MediaActionBuilder.newRemoveMediaAction(mediaModel)) } } }</ID>
+    <ID>MagicNumber:ActivityViewHolder.kt$ActivityViewHolder$3</ID>
+    <ID>MagicNumber:ActivityViewHolder.kt$ActivityViewHolder$50</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$10</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$100</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$100F</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$10f</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$24</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$25</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$255</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$4</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$5</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$50</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$51</ID>
+    <ID>MagicNumber:BarChartViewHolder.kt$BarChartViewHolder$8f</ID>
+    <ID>MagicNumber:BaseStatsUseCase.kt$BaseStatsUseCase$50</ID>
+    <ID>MagicNumber:ColorUnderlineSpan.kt$ColorUnderlineSpan$5f</ID>
+    <ID>MagicNumber:ColorUtils.kt$ColorUtils$255</ID>
+    <ID>MagicNumber:DateTimeUtilsWrapper.kt$DateTimeUtilsWrapper$1000</ID>
+    <ID>MagicNumber:DateUtils.kt$DateUtils$3</ID>
+    <ID>MagicNumber:DateUtils.kt$DateUtils$4</ID>
+    <ID>MagicNumber:DateUtils.kt$DateUtils$5</ID>
+    <ID>MagicNumber:DateUtils.kt$DateUtils$50</ID>
+    <ID>MagicNumber:DateUtils.kt$DateUtils$6</ID>
+    <ID>MagicNumber:DeviceMediaLoader.kt$DeviceMediaLoader$1000</ID>
+    <ID>MagicNumber:EditorPhotoPicker.kt$EditorPhotoPicker$0.5f</ID>
+    <ID>MagicNumber:EncryptedLogWriter.kt$EncryptedLogWriter$108</ID>
+    <ID>MagicNumber:EncryptedLogWriter.kt$EncryptedLogWriter$32</ID>
+    <ID>MagicNumber:ExpandableItemViewHolder.kt$ExpandableItemViewHolder$180</ID>
+    <ID>MagicNumber:ExpandableItemViewHolder.kt$ExpandableItemViewHolder$180F</ID>
+    <ID>MagicNumber:ExpandableItemViewHolder.kt$ExpandableItemViewHolder$200</ID>
+    <ID>MagicNumber:FeatureAnnouncementViewModel.kt$FeatureAnnouncementViewModel$1000</ID>
+    <ID>MagicNumber:GifPickerActivity.kt$GifPickerActivity$0.75</ID>
+    <ID>MagicNumber:GifPickerActivity.kt$GifPickerActivity$3</ID>
+    <ID>MagicNumber:GifPickerActivity.kt$GifPickerActivity$4</ID>
+    <ID>MagicNumber:ImprovedMySiteFragment.kt$ImprovedMySiteFragment$100</ID>
+    <ID>MagicNumber:LargeValueFormatter.kt$LargeValueFormatter$3</ID>
+    <ID>MagicNumber:LargeValueFormatter.kt$LargeValueFormatter$5</ID>
+    <ID>MagicNumber:LatestPostSummaryMapper.kt$LatestPostSummaryMapper$30</ID>
+    <ID>MagicNumber:LoginPrologueFragment.kt$LoginPrologueFragment.&lt;no name provided&gt;$0.25f</ID>
+    <ID>MagicNumber:LoginPrologueFragment.kt$LoginPrologueFragment.&lt;no name provided&gt;$0.5f</ID>
+    <ID>MagicNumber:MapViewHolder.kt$MapViewHolder$0xffffff</ID>
+    <ID>MagicNumber:MapViewHolder.kt$MapViewHolder$100</ID>
+    <ID>MagicNumber:MapViewHolder.kt$MapViewHolder$5</ID>
+    <ID>MagicNumber:MapViewHolder.kt$MapViewHolder$8</ID>
+    <ID>MagicNumber:MediaPickerViewModel.kt$MediaPickerViewModel$100</ID>
+    <ID>MagicNumber:MediaPickerViewModel.kt$MediaPickerViewModel$300</ID>
+    <ID>MagicNumber:MySiteFragment.kt$MySiteFragment$0.5</ID>
+    <ID>MagicNumber:MySiteFragment.kt$MySiteFragment$100</ID>
+    <ID>MagicNumber:MySiteFragment.kt$MySiteFragment$4</ID>
+    <ID>MagicNumber:MySiteFragment.kt$MySiteFragment$600</ID>
+    <ID>MagicNumber:MySiteViewModel.kt$MySiteViewModel$600</ID>
+    <ID>MagicNumber:NotificationsListFragmentPage.kt$NotificationsListFragmentPage$1000L</ID>
+    <ID>MagicNumber:OverviewMapper.kt$OverviewMapper$100</ID>
+    <ID>MagicNumber:OverviewUseCase.kt$OverviewUseCase$86400000.0</ID>
+    <ID>MagicNumber:PageItemViewHolder.kt$PageItemViewHolder.PageViewHolder$16</ID>
+    <ID>MagicNumber:PageParentAdapter.kt$PageParentAdapter$200</ID>
+    <ID>MagicNumber:PageParentFragment.kt$PageParentFragment$8</ID>
+    <ID>MagicNumber:PageParentSearchAdapter.kt$PageParentSearchAdapter$200</ID>
+    <ID>MagicNumber:PagesFragment.kt$PagesFragment$8</ID>
+    <ID>MagicNumber:PluginBrowserViewModel.kt$PluginBrowserViewModel$250</ID>
+    <ID>MagicNumber:PostDayViewsMapper.kt$PostDayViewsMapper$100</ID>
+    <ID>MagicNumber:PostListItemViewHolder.kt$PostListItemViewHolder.Standard$1000</ID>
+    <ID>MagicNumber:PostModelUploadStatusTracker.kt$PostModelUploadStatusTracker$100</ID>
+    <ID>MagicNumber:PostingActivityUseCase.kt$PostingActivityUseCase$2</ID>
+    <ID>MagicNumber:PublishSettingsViewModel.kt$PublishSettingsViewModel$10</ID>
+    <ID>MagicNumber:PublishSettingsViewModel.kt$PublishSettingsViewModel$10000</ID>
+    <ID>MagicNumber:PublishSettingsViewModel.kt$PublishSettingsViewModel$60</ID>
+    <ID>MagicNumber:PublishSettingsViewModel.kt$PublishSettingsViewModel$6000</ID>
+    <ID>MagicNumber:QuickStartCardViewHolder.kt$QuickStartCardViewHolder$600</ID>
+    <ID>MagicNumber:QuickStartItemBuilder.kt$QuickStartItemBuilder$100</ID>
+    <ID>MagicNumber:ReaderCommentListViewModel.kt$ReaderCommentListViewModel$300</ID>
+    <ID>MagicNumber:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$300</ID>
+    <ID>MagicNumber:ReaderTagRepository.kt$ReaderTagRepository$5</ID>
+    <ID>MagicNumber:RequestThrottler.kt$RequestThrottler$1000L</ID>
+    <ID>MagicNumber:RequestThrottler.kt$RequestThrottler$60</ID>
+    <ID>MagicNumber:SaveInitialPostUseCase.kt$SaveInitialPostUseCase$1000</ID>
+    <ID>MagicNumber:SearchInputWithHeader.kt$SearchInputWithHeader$200</ID>
+    <ID>MagicNumber:SiteCreationMainVM.kt$SiteCreationMainVM$3</ID>
+    <ID>MagicNumber:StatsDateFormatter.kt$StatsDateFormatter$31</ID>
+    <ID>MagicNumber:StatsDateFormatter.kt$StatsDateFormatter$6</ID>
+    <ID>MagicNumber:StatsDateFormatter.kt$StatsDateFormatter$60</ID>
+    <ID>MagicNumber:StatsFragment.kt$StatsFragment$3</ID>
+    <ID>MagicNumber:StatsFragment.kt$StatsFragment$4</ID>
+    <ID>MagicNumber:StatsSiteProvider.kt$StatsSiteProvider$3</ID>
+    <ID>MagicNumber:StatsUtils.kt$100</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$10</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$10.0</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$100</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$1_000L</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$1_000_000L</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$1_000_000_000L</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$1_000_000_000_000L</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$1_000_000_000_000_000L</ID>
+    <ID>MagicNumber:StatsUtils.kt$StatsUtils$1_000_000_000_000_000_000L</ID>
+    <ID>MagicNumber:UiHelpers.kt$UiHelpers.Companion$0.8</ID>
+    <ID>MagicNumber:UploadWorker.kt$6</ID>
+    <ID>MagicNumber:UploadWorker.kt$8</ID>
+    <ID>MagicNumber:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined$255</ID>
+    <ID>MagicNumber:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined$255f</ID>
+    <ID>MagicNumber:WPTooltipView.kt$WPTooltipView$400</ID>
+    <ID>MagicNumber:WPTooltipView.kt$WPTooltipView$90f</ID>
+    <ID>MagicNumber:WPWebView.kt$21</ID>
+    <ID>MagicNumber:WPWebView.kt$22</ID>
+    <ID>MagicNumber:WidgetUtils.kt$WidgetUtils$300</ID>
+    <ID>MaxLineLength:AppConfig.kt$AppConfig$*</ID>
+    <ID>MaxLineLength:EncryptedLogWriter.kt$EncryptedLogWriter$*</ID>
+    <ID>MaxLineLength:FeatureAnnouncementViewModel.kt$FeatureAnnouncementViewModel$?:</ID>
+    <ID>MaxLineLength:GifPickerActivity.kt$GifPickerActivity$// Update the "Add" and "Preview" labels to include the number of items. For example, "Add 7" and "Preview 7".</ID>
+    <ID>MaxLineLength:GifPickerActivity.kt$GifPickerActivity$// We do not change to labels back to the original text if the number of items go back to zero because that</ID>
+    <ID>MaxLineLength:GifPickerActivity.kt$GifPickerActivity$// causes a weird UX. The selection bar is animated to disappear at that time and it looks weird if the labels</ID>
+    <ID>MaxLineLength:ImageManager.kt$ImageManager$*</ID>
+    <ID>MaxLineLength:MySiteFragment.kt$MySiteFragment$private</ID>
+    <ID>MaxLineLength:ReaderPostListViewModel.kt$ReaderPostListViewModel$// TODO this is related to tracking time spent in reader - we should move it to the parent but also keep it here for !isTopLevel :(</ID>
+    <ID>MaxLineLength:ReaderUtilsWrapper.kt$ReaderUtilsWrapper$*</ID>
+    <ID>MaxLineLength:SaveStoryGutenbergBlockUseCase.kt$SaveStoryGutenbergBlockUseCase.&lt;no name provided&gt;$// now replace matching localMediaId with remoteMediaId in the mediaFileObjects, obtain the URLs and replace</ID>
+    <ID>MaxLineLength:SiteStoriesHandler.kt$SiteStoriesHandler$// TODO add NotificationType.MEDIA_SAVE_ERROR param later when integrating with WPAndroid</ID>
+    <ID>MaxLineLength:StoryComposerActivity.kt$StoryComposerActivity$// if the frame.id is populated and is not a temporary id, this should be an actual MediaModel mediaId so,</ID>
+    <ID>MaxLineLength:StoryMediaSaveUploadBridge.kt$StoryMediaSaveUploadBridge.&lt;no name provided&gt;$// WARNING: don't remove this, we need to call the listener no matter what, so save &amp; upload actually happen</ID>
+    <ID>MaxLineLength:StoryMediaSaveUploadBridge.kt$StoryMediaSaveUploadBridge.&lt;no name provided&gt;$// here we change the ids on the actual StoryFrameItems, and also update the flattened / composed image</ID>
+    <ID>MaxLineLength:TenorProvider.kt$TenorProvider$*</ID>
+    <ID>MaxLineLength:WPWebViewUsageCategory.kt$WPWebViewUsageCategory$*</ID>
+    <ID>MaxLineLength:XPostsCapabilityChecker.kt$XPostsCapabilityChecker$// suggestions, but because the response will almost always be empty, it's not an expensive call.</ID>
+    <ID>MemberNameEqualsClassName:ActivityLogTypeFilterViewModel.kt$ActivityLogTypeFilterViewModel.Action$lateinit var action: (() -&gt; Unit)</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.pages.PageItemViewHolder.kt:252</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.pages.PageItemViewHolder.kt:254</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.pages.PageItemViewHolder.kt:84</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.pages.PageItemViewHolder.kt:86</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.posts.PostDatePickerDialogFragment.kt:51</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.posts.PostDatePickerDialogFragment.kt:53</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.posts.PrepublishingHomeViewModel.kt:138</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.posts.prepublishing.visibility.usecases.UpdatePostStatusUseCase.kt:25</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.reader.repository.usecases.FetchDiscoverCardsUseCase.kt:26</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.reader.repository.usecases.FetchDiscoverCardsUseCase.kt:28</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.reader.subfilter.SubFilterViewModel.kt:251</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.reader.subfilter.SubFilterViewModel.kt:253</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.kt:103</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.ui.reader.usecases.ReaderCommentsFollowUseCase.kt:105</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.viewmodel.main.SitePickerViewModel.kt:54</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.viewmodel.main.SitePickerViewModel.kt:56</ID>
+    <ID>MultiLineIfElse:org.wordpress.android.viewmodel.pages.PageListViewModel.kt:419</ID>
+    <ID>NestedBlockDepth:AllTimeWidgetBlockListViewModel.kt$AllTimeWidgetBlockListViewModel$override fun onDataSetChanged(context: Context)</ID>
+    <ID>NestedBlockDepth:AllTimeWidgetListViewModel.kt$AllTimeWidgetListViewModel$fun onDataSetChanged(onError: (appWidgetId: Int) -&gt; Unit)</ID>
+    <ID>NestedBlockDepth:CreatePageListItemActionsUseCase.kt$CreatePageListItemActionsUseCase$fun setupPageActions( listType: PageListType, uploadUiState: PostUploadUiState, siteModel: SiteModel, remoteId: Long ): Set&lt;Action&gt;</ID>
+    <ID>NestedBlockDepth:LoadStoryFromStoriesPrefsUseCase.kt$LoadStoryFromStoriesPrefsUseCase$private fun loadOrReCreateStoryFromStoriesPrefs(site: SiteModel, mediaIds: ArrayList&lt;String&gt;): ReCreateStoryResult</ID>
+    <ID>NestedBlockDepth:MeFragment.kt$MeFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>NestedBlockDepth:MediaPickerActivity.kt$MediaPickerActivity$override fun onActivityResult( requestCode: Int, resultCode: Int, data: Intent? )</ID>
+    <ID>NestedBlockDepth:MySiteFragment.kt$MySiteFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>NestedBlockDepth:PublicizeErrorDialogFragment.kt$PublicizeErrorDialogFragment$override fun onCreateDialog(savedInstanceState: Bundle?): Dialog</ID>
+    <ID>NestedBlockDepth:PublishNotificationReceiverViewModel.kt$PublishNotificationReceiverViewModel$fun loadNotification(notificationId: Int): NotificationUiModel?</ID>
+    <ID>NestedBlockDepth:ReaderDiscoverLogic.kt$ReaderDiscoverLogic$private fun createSimplifiedRecommendedBlogsCardJson(originalCardJson: JSONObject): JSONObject</ID>
+    <ID>NestedBlockDepth:StoriesPrefs.kt$StoriesPrefs$private fun checkSlideOriginalBackgroundMediaExists(storyFrameItem: StoryFrameItem?): Boolean</ID>
+    <ID>NestedBlockDepth:StoryComposerActivity.kt$StoryComposerActivity$override fun onStorySaveButtonPressed()</ID>
+    <ID>NestedBlockDepth:StoryComposerActivity.kt$StoryComposerActivity$private fun buildStoryMediaFileDataListFromStoryFrameIndexes( storyIndex: StoryIndex ): ArrayList&lt;StoryMediaFileData&gt;</ID>
+    <ID>NestedBlockDepth:TodayWidgetBlockListViewModel.kt$TodayWidgetBlockListViewModel$override fun onDataSetChanged(context: Context)</ID>
+    <ID>NestedBlockDepth:TodayWidgetListViewModel.kt$TodayWidgetListViewModel$fun onDataSetChanged(onError: (appWidgetId: Int) -&gt; Unit)</ID>
+    <ID>NestedBlockDepth:ViewsWidgetListViewModel.kt$ViewsWidgetListViewModel$fun onDataSetChanged(onError: (appWidgetId: Int) -&gt; Unit)</ID>
+    <ID>NestedBlockDepth:WPMainActivityViewModel.kt$WPMainActivityViewModel$private fun onCreateActionClicked(actionType: ActionType)</ID>
+    <ID>ProtectedMemberInFinalClass:PageParentSearchFragment.kt$PageParentSearchFragment$protected var job: Job = Job()</ID>
+    <ID>ReturnCount:BarChartViewHolder.kt$BarChartViewHolder$private fun roundUp(input: Float): Float</ID>
+    <ID>ReturnCount:BlockDiffCallback.kt$BlockDiffCallback$override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any?</ID>
+    <ID>ReturnCount:DomainPhoneNumberUtils.kt$DomainPhoneNumberUtils.Companion$fun getPhoneNumberPrefixFromFullPhoneNumber(phoneNumber: String?): String?</ID>
+    <ID>ReturnCount:DomainPhoneNumberUtils.kt$DomainPhoneNumberUtils.Companion$fun getPhoneNumberWithoutPrefix(phoneNumber: String?): String?</ID>
+    <ID>ReturnCount:DomainRegistrationHandler.kt$DomainRegistrationHandler$override fun buildSource(coroutineScope: CoroutineScope, siteId: Int): LiveData&lt;DomainCreditAvailable&gt;</ID>
+    <ID>ReturnCount:FeatureAnnouncementListAdapter.kt$FeatureAnnouncementListAdapter$override fun getItemCount(): Int</ID>
+    <ID>ReturnCount:FeaturedImageHelper.kt$FeaturedImageHelper$fun createCurrentFeaturedImageState(site: SiteModel, post: PostImmutableModel): FeaturedImageData</ID>
+    <ID>ReturnCount:FeaturedImageHelper.kt$FeaturedImageHelper$fun queueFeaturedImageForUpload( localPostId: Int, site: SiteModel, uri: Uri, mimeType: String? ): EnqueueFeaturedImageResult</ID>
+    <ID>ReturnCount:FollowedBlogsProvider.kt$FollowedBlogsProvider$fun getAllFollowedBlogs(query: String?): List&lt;PreferenceModel&gt;</ID>
+    <ID>ReturnCount:ImageManager.kt$ImageManager$ private fun Context?.isAvailable(): Boolean</ID>
+    <ID>ReturnCount:ImprovedMySiteFragment.kt$ImprovedMySiteFragment$override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?)</ID>
+    <ID>ReturnCount:LoadStoryFromStoriesPrefsUseCase.kt$LoadStoryFromStoriesPrefsUseCase$fun areAllStorySlidesEditable(site: SiteModel, mediaIds: ArrayList&lt;String&gt;): Boolean</ID>
+    <ID>ReturnCount:MediaPickerAdapterDiffCallback.kt$MediaPickerAdapterDiffCallback$override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any?</ID>
+    <ID>ReturnCount:MySiteFragment.kt$MySiteFragment$private fun startSiteIconUpload(filePath: String)</ID>
+    <ID>ReturnCount:MySiteViewModel.kt$MySiteViewModel$private fun startSiteIconUpload(filePath: String)</ID>
+    <ID>ReturnCount:PageListViewModel.kt$PageListViewModel$private fun getFeaturedImageUrl(featuredImageId: Long): String?</ID>
+    <ID>ReturnCount:PageParentFragment.kt$PageParentFragment$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
+    <ID>ReturnCount:ParseDiscoverCardsJsonUseCase.kt$ParseDiscoverCardsJsonUseCase$fun parseInterestCard(interestCardJson: JSONObject?): ReaderTagList</ID>
+    <ID>ReturnCount:PhotoPickerAdapterDiffCallback.kt$PhotoPickerAdapterDiffCallback$override fun getChangePayload(oldItemPosition: Int, newItemPosition: Int): Any?</ID>
+    <ID>ReturnCount:PostListAdapter.kt$&lt;no name provided&gt;$override fun areContentsTheSame(oldItem: PostListItemType, newItem: PostListItemType): Boolean</ID>
+    <ID>ReturnCount:PostListAdapter.kt$&lt;no name provided&gt;$override fun areItemsTheSame(oldItem: PostListItemType, newItem: PostListItemType): Boolean</ID>
+    <ID>ReturnCount:PostListFeaturedImageTracker.kt$PostListFeaturedImageTracker$fun getFeaturedImageUrl(site: SiteModel, featuredImageId: Long): String?</ID>
+    <ID>ReturnCount:PostsListActivity.kt$PostsListActivity$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
+    <ID>ReturnCount:PublishNotificationReceiverViewModel.kt$PublishNotificationReceiverViewModel$fun loadNotification(notificationId: Int): NotificationUiModel?</ID>
+    <ID>ReturnCount:QuickStartUtils.kt$QuickStartUtils.Companion$ @JvmStatic fun getNextUncompletedQuickStartTask( quickStartStore: QuickStartStore, siteId: Long, taskType: QuickStartTaskType ): QuickStartTask?</ID>
+    <ID>ReturnCount:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$/* * returns True if the passed URL should be opened in the external browser app */ private fun shouldOpenExternal(url: String): Boolean</ID>
+    <ID>ReturnCount:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$override fun onOptionsItemSelected(item: MenuItem): Boolean</ID>
+    <ID>ReturnCount:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$private fun doLikePost()</ID>
+    <ID>ReturnCount:ReaderPostDetailFragment.kt$ReaderPostDetailFragment$private fun showPhotoViewer( imageUrl: String, sourceView: View, startX: Int, startY: Int ): Boolean</ID>
+    <ID>ReturnCount:ReaderSiteNotificationsUseCase.kt$ReaderSiteNotificationsUseCase$suspend fun toggleNotification( blogId: Long, feedId: Long ): SiteNotificationState</ID>
+    <ID>ReturnCount:RemotePreviewLogicHelper.kt$RemotePreviewLogicHelper$fun runPostPreviewLogic( activity: Activity, site: SiteModel, post: PostImmutableModel, helperFunctions: RemotePreviewHelperFunctions ): PreviewLogicOperationResult</ID>
+    <ID>ReturnCount:StoriesMediaPickerResultHandler.kt$StoriesMediaPickerResultHandler$@Deprecated("Use rather the other handle method and the live data navigation.") fun handleMediaPickerResultForStories( data: Intent, activity: Activity?, selectedSite: SiteModel?, source: PagePostCreationSourcesDetail ): Boolean</ID>
+    <ID>ReturnCount:StoriesMediaPickerResultHandler.kt$StoriesMediaPickerResultHandler$private fun buildNavigationAction( data: Intent, selectedSite: SiteModel, source: PagePostCreationSourcesDetail ): SiteNavigationAction?</ID>
+    <ID>ReturnCount:StoriesPrefs.kt$StoriesPrefs$private fun checkSlideOriginalBackgroundMediaExists(storyFrameItem: StoryFrameItem?): Boolean</ID>
+    <ID>ReturnCount:StoriesPrefs.kt$StoriesPrefs$private fun isUriAccessible(uri: Uri): Boolean</ID>
+    <ID>ReturnCount:UploadActionUseCase.kt$UploadActionUseCase$fun getAutoUploadAction(post: PostImmutableModel, site: SiteModel): UploadAction</ID>
+    <ID>ReturnCount:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined$private fun endsWithDelimiter(string: String): Boolean</ID>
+    <ID>ReturnCount:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined$private fun removeDelimiterFromItemIfPresent(item: String?): String?</ID>
+    <ID>SpreadOperator:PageListEventListener.kt$PageListEventListener$(*event.mediaList.map { LocalId(it.localPostId) }.toTypedArray())</ID>
+    <ID>SpreadOperator:PageListEventListener.kt$PageListEventListener$(*postsToRefresh.map { LocalId(it.id) }.toTypedArray())</ID>
+    <ID>SpreadOperator:PageListViewModel.kt$PageListViewModel$(*event.mediaList.map { it.mediaId }.toLongArray())</ID>
+    <ID>SpreadOperator:PostListEventListener.kt$PostListEventListener$(*event.mediaList.map { it.localPostId }.toIntArray())</ID>
+    <ID>SpreadOperator:PostListEventListener.kt$PostListEventListener$(*event.mediaList.map { it.mediaId }.toLongArray())</ID>
+    <ID>SpreadOperator:PostListEventListener.kt$PostListEventListener$(*postsToRefresh.map { it.id }.toIntArray())</ID>
+    <ID>SpreadOperator:UiHelpers.kt$UiHelpers$( uiString.stringRes, *uiString.params.map { value -&gt; getTextOfUiString( context, value ) }.toTypedArray() )</ID>
+    <ID>ThrowsCount:PageListDialogHelper.kt$PageListDialogHelper$fun onNegativeClickedForBasicDialog( instanceTag: String, editPage: (RemoteId, LoadAutoSaveRevision) -&gt; Unit, copyPage: (RemoteId) -&gt; Unit )</ID>
+    <ID>ThrowsCount:PageListDialogHelper.kt$PageListDialogHelper$fun onPositiveClickedForBasicDialog( instanceTag: String, deletePage: (RemoteId) -&gt; Unit, editPage: (RemoteId, LoadAutoSaveRevision) -&gt; Unit, editPageFirst: (RemoteId) -&gt; Unit )</ID>
+    <ID>TooGenericExceptionCaught:BaseStatsUseCase.kt$BaseStatsUseCase$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:ColorUnderlineSpan.kt$ColorUnderlineSpan$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:GifMediaInsertUseCase.kt$GifMediaInsertUseCase$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:GifPickerViewModel.kt$GifPickerViewModel$e: Exception</ID>
+    <ID>TooGenericExceptionCaught:MediaPickerActivity.kt$MediaPickerActivity$e: RuntimeException</ID>
+    <ID>TooGenericExceptionCaught:UploadStarter.kt$UploadStarter$e: Exception</ID>
+    <ID>TooGenericExceptionThrown:ActionableEmptyView.kt$ActionableEmptyView$throw RuntimeException("$context: ActionableEmptyView must have a title (aevTitle)")</ID>
+    <ID>TooGenericExceptionThrown:ActivityLogDetailFragment.kt$ActivityLogDetailFragment$throw Throwable("Couldn't initialize Activity Log view model")</ID>
+    <ID>TooGenericExceptionThrown:BackupDownloadFragment.kt$BackupDownloadFragment$throw Throwable("Couldn't initialize ${this.javaClass.simpleName} view model")</ID>
+    <ID>TooGenericExceptionThrown:BaseListUseCase.kt$BaseListUseCase$throw RuntimeException("Duplicate stats type in a use case")</ID>
+    <ID>TooGenericExceptionThrown:BasicFragmentDialog.kt$BasicFragmentDialog$throw RuntimeException("Hosting activity must implement BasicDialogNegativeClickInterface")</ID>
+    <ID>TooGenericExceptionThrown:BasicFragmentDialog.kt$BasicFragmentDialog$throw RuntimeException("Hosting activity must implement BasicDialogPositiveClickInterface")</ID>
+    <ID>TooGenericExceptionThrown:GifMediaFetcher.kt$GifMediaFetcher$throw Exception("Failed to download the image.")</ID>
+    <ID>TooGenericExceptionThrown:GifMediaInsertUseCase.kt$GifMediaInsertUseCase$throw Exception("Failed to download the image.")</ID>
+    <ID>TooGenericExceptionThrown:LoginPrologueFragment.kt$LoginPrologueFragment$throw RuntimeException("$context must implement LoginPrologueListener")</ID>
+    <ID>TooGenericExceptionThrown:PageListAdapter.kt$PageListAdapter$throw Throwable("Unexpected view type")</ID>
+    <ID>TooGenericExceptionThrown:PageParentAdapter.kt$PageParentAdapter$throw Throwable("Unexpected view type")</ID>
+    <ID>TooGenericExceptionThrown:PageParentSearchAdapter.kt$PageParentSearchAdapter$throw Throwable("Unexpected view type")</ID>
+    <ID>TooGenericExceptionThrown:PageSearchAdapter.kt$PageSearchAdapter$throw Throwable("Unexpected view type")</ID>
+    <ID>TooGenericExceptionThrown:PostSettingsTagsFragment.kt$PostSettingsTagsFragment$throw RuntimeException("$context must implement TagsSelectedListener")</ID>
+    <ID>TooGenericExceptionThrown:PrepublishingBottomSheetFragment.kt$PrepublishingBottomSheetFragment$throw RuntimeException("$context must implement PrepublishingBottomSheetListener")</ID>
+    <ID>TooGenericExceptionThrown:PrepublishingCategoriesFragment.kt$PrepublishingCategoriesFragment$throw RuntimeException("$activity must implement EditPostActivityHook")</ID>
+    <ID>TooGenericExceptionThrown:PrepublishingHomeFragment.kt$PrepublishingHomeFragment$throw RuntimeException("$activity must implement EditPostActivityHook")</ID>
+    <ID>TooGenericExceptionThrown:PrepublishingTagsFragment.kt$PrepublishingTagsFragment$throw RuntimeException("$activity must implement EditPostActivityHook")</ID>
+    <ID>TooGenericExceptionThrown:PublishSettingsFragment.kt$PublishSettingsFragment$throw RuntimeException("$activity must implement EditPostActivityHook")</ID>
+    <ID>TooGenericExceptionThrown:ReaderTracker.kt$ReaderTab.Companion$throw RuntimeException("Unexpected ReaderTab id")</ID>
+    <ID>TooGenericExceptionThrown:RestoreFragment.kt$RestoreFragment$throw Throwable("Couldn't initialize ${this.javaClass.simpleName} view model")</ID>
+    <ID>TooGenericExceptionThrown:RestoreViewModel.kt$RestoreViewModel$throw Throwable("Unexpected restoreRequestResult ${this.javaClass.simpleName}")</ID>
+    <ID>TooGenericExceptionThrown:StatsDateFormatter.kt$StatsDateFormatter$throw RuntimeException("Unexpected date format")</ID>
+    <ID>TooGenericExceptionThrown:ThreatDetailsFragment.kt$ThreatDetailsFragment$throw RuntimeException("ThreatDetailsFragment - missing siteModel extras.")</ID>
+    <ID>TooManyFunctions:ActivityLogListFragment.kt$ActivityLogListFragment : Fragment</ID>
+    <ID>TooManyFunctions:ActivityLogTypeFilterFragment.kt$ActivityLogTypeFilterFragment : DialogFragment</ID>
+    <ID>TooManyFunctions:ActivityLogViewModel.kt$ActivityLogViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:AppPrefsWrapper.kt$AppPrefsWrapper</ID>
+    <ID>TooManyFunctions:BackupDownloadFragment.kt$BackupDownloadFragment : Fragment</ID>
+    <ID>TooManyFunctions:BackupDownloadStateListItemBuilder.kt$BackupDownloadStateListItemBuilder</ID>
+    <ID>TooManyFunctions:BackupDownloadViewModel.kt$BackupDownloadViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:BarChartViewHolder.kt$BarChartViewHolder : BlockListItemViewHolder</ID>
+    <ID>TooManyFunctions:BaseStatsUseCase.kt$BaseStatsUseCase&lt;DOMAIN_MODEL, UI_STATE&gt; : CoroutineScope</ID>
+    <ID>TooManyFunctions:DomainRegistrationDetailsFragment.kt$DomainRegistrationDetailsFragment : Fragment</ID>
+    <ID>TooManyFunctions:DomainRegistrationDetailsViewModel.kt$DomainRegistrationDetailsViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:EditPostRepository.kt$EditPostRepository : CoroutineScope</ID>
+    <ID>TooManyFunctions:EditorMedia.kt$EditorMedia : CoroutineScope</ID>
+    <ID>TooManyFunctions:FollowerTotalsUseCase.kt$FollowerTotalsUseCase : StatelessUseCase</ID>
+    <ID>TooManyFunctions:FollowersUseCase.kt$FollowersUseCase : BaseStatsUseCase</ID>
+    <ID>TooManyFunctions:FormattableContentUtils.kt$org.wordpress.android.util.FormattableContentUtils.kt</ID>
+    <ID>TooManyFunctions:GifPickerActivity.kt$GifPickerActivity : LocaleAwareActivity</ID>
+    <ID>TooManyFunctions:HomepageSettingsViewModel.kt$HomepageSettingsViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:ImageManager.kt$ImageManager</ID>
+    <ID>TooManyFunctions:ImprovedMySiteFragment.kt$ImprovedMySiteFragment : FragmentCallback</ID>
+    <ID>TooManyFunctions:LatestPostSummaryUseCase.kt$LatestPostSummaryUseCase : StatelessUseCase</ID>
+    <ID>TooManyFunctions:LayoutPickerViewModel.kt$LayoutPickerViewModel : ScopedViewModelPreviewModeHandler</ID>
+    <ID>TooManyFunctions:LiveDataUtils.kt$org.wordpress.android.util.LiveDataUtils.kt</ID>
+    <ID>TooManyFunctions:MeFragment.kt$MeFragment : FragmentOnScrollToTopListener</ID>
+    <ID>TooManyFunctions:MediaPickerActivity.kt$MediaPickerActivity : LocaleAwareActivityMediaPickerListener</ID>
+    <ID>TooManyFunctions:MediaPickerFragment.kt$MediaPickerFragment : Fragment</ID>
+    <ID>TooManyFunctions:MediaPickerLauncher.kt$MediaPickerLauncher</ID>
+    <ID>TooManyFunctions:MediaPickerTracker.kt$MediaPickerTracker</ID>
+    <ID>TooManyFunctions:MediaPickerViewModel.kt$MediaPickerViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:MediaUtilsWrapper.kt$MediaUtilsWrapper</ID>
+    <ID>TooManyFunctions:MySiteFragment.kt$MySiteFragment : FragmentOnScrollToTopListenerBasicDialogPositiveClickInterfaceBasicDialogNegativeClickInterfaceBasicDialogOnDismissByOutsideTouchInterfacePromoDialogClickInterfaceOnConfirmListenerOnDismissListenerCallback</ID>
+    <ID>TooManyFunctions:MySiteViewModel.kt$MySiteViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:NestedCoordinatorLayout.kt$NestedCoordinatorLayout : CoordinatorLayoutNestedScrollingChild3</ID>
+    <ID>TooManyFunctions:NestedWebView.kt$NestedWebView : WPWebViewNestedScrollingChild3</ID>
+    <ID>TooManyFunctions:NotificationsListFragment.kt$NotificationsListFragment : FragmentScrollableViewInitializedListener</ID>
+    <ID>TooManyFunctions:NotificationsListFragmentPage.kt$NotificationsListFragmentPage : ViewPagerFragmentOnScrollToTopListenerDataLoadedListener</ID>
+    <ID>TooManyFunctions:PageListEventListener.kt$PageListEventListener : CoroutineScope</ID>
+    <ID>TooManyFunctions:PageListFragment.kt$PageListFragment : ViewPagerFragment</ID>
+    <ID>TooManyFunctions:PageListViewModel.kt$PageListViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PageParentFragment.kt$PageParentFragment : FragmentCoroutineScope</ID>
+    <ID>TooManyFunctions:PageParentViewModel.kt$PageParentViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PagesFragment.kt$PagesFragment : FragmentScrollableViewInitializedListener</ID>
+    <ID>TooManyFunctions:PagesViewModel.kt$PagesViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PhotoPickerFragment.kt$PhotoPickerFragment : Fragment</ID>
+    <ID>TooManyFunctions:PhotoPickerViewModel.kt$PhotoPickerViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PluginBrowserViewModel.kt$PluginBrowserViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:PostActionHandler.kt$PostActionHandler</ID>
+    <ID>TooManyFunctions:PostListDialogHelper.kt$PostListDialogHelper</ID>
+    <ID>TooManyFunctions:PostListEventListener.kt$PostListEventListener : LifecycleObserverCoroutineScope</ID>
+    <ID>TooManyFunctions:PostListItemUiStateHelper.kt$PostListItemUiStateHelper</ID>
+    <ID>TooManyFunctions:PostListMainViewModel.kt$PostListMainViewModel : ViewModelCoroutineScope</ID>
+    <ID>TooManyFunctions:PostListViewModel.kt$PostListViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PostUtilsWrapper.kt$PostUtilsWrapper</ID>
+    <ID>TooManyFunctions:PostsListActivity.kt$PostsListActivity : LocaleAwareActivityEditPostActivityHookPrepublishingBottomSheetListenerBasicDialogPositiveClickInterfaceBasicDialogNegativeClickInterfaceBasicDialogOnDismissByOutsideTouchInterfaceScrollableViewInitializedListener</ID>
+    <ID>TooManyFunctions:PrefMainSwitchToolbarView.kt$PrefMainSwitchToolbarView : LinearLayoutOnCheckedChangeListenerOnLongClickListenerOnClickListener</ID>
+    <ID>TooManyFunctions:PrepublishingAddCategoryFragment.kt$PrepublishingAddCategoryFragment : Fragment</ID>
+    <ID>TooManyFunctions:PrepublishingAddCategoryViewModel.kt$PrepublishingAddCategoryViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PrepublishingBottomSheetFragment.kt$PrepublishingBottomSheetFragment : WPBottomSheetDialogFragmentPrepublishingScreenClosedListenerPrepublishingActionClickedListener</ID>
+    <ID>TooManyFunctions:PrepublishingCategoriesFragment.kt$PrepublishingCategoriesFragment : Fragment</ID>
+    <ID>TooManyFunctions:PrepublishingCategoriesViewModel.kt$PrepublishingCategoriesViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:PrepublishingTagsFragment.kt$PrepublishingTagsFragment : TagsFragmentTagsSelectedListener</ID>
+    <ID>TooManyFunctions:PrepublishingViewModel.kt$PrepublishingViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:PublishSettingsViewModel.kt$PublishSettingsViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:QuickStartRepository.kt$QuickStartRepository : CoroutineScopeMySiteSource</ID>
+    <ID>TooManyFunctions:QuickStartUtils.kt$QuickStartUtils$Companion</ID>
+    <ID>TooManyFunctions:ReaderDiscoverDataProvider.kt$ReaderDiscoverDataProvider : CoroutineScope</ID>
+    <ID>TooManyFunctions:ReaderDiscoverLogic.kt$ReaderDiscoverLogic</ID>
+    <ID>TooManyFunctions:ReaderDiscoverViewModel.kt$ReaderDiscoverViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:ReaderFragment.kt$ReaderFragment : FragmentScrollableViewInitializedListener</ID>
+    <ID>TooManyFunctions:ReaderInterestsFragment.kt$ReaderInterestsFragment : Fragment</ID>
+    <ID>TooManyFunctions:ReaderInterestsViewModel.kt$ReaderInterestsViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:ReaderPostCardActionsHandler.kt$ReaderPostCardActionsHandler</ID>
+    <ID>TooManyFunctions:ReaderPostDetailFragment.kt$ReaderPostDetailFragment : ViewPagerFragmentOnActivityBackPressedListenerScrollDirectionListenerReaderCustomViewListenerReaderWebViewPageFinishedListenerReaderWebViewUrlClickListenerPrivateAtCookieProgressDialogOnDismissListenerAutoHideToolbarListener</ID>
+    <ID>TooManyFunctions:ReaderPostDetailUiStateBuilder.kt$ReaderPostDetailUiStateBuilder</ID>
+    <ID>TooManyFunctions:ReaderPostDetailViewModel.kt$ReaderPostDetailViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:ReaderPostListViewModel.kt$ReaderPostListViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:ReaderPostUiStateBuilder.kt$ReaderPostUiStateBuilder</ID>
+    <ID>TooManyFunctions:ReaderViewModel.kt$ReaderViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:ReferrersUseCase.kt$ReferrersUseCase : GranularStatefulUseCase</ID>
+    <ID>TooManyFunctions:RestoreFragment.kt$RestoreFragment : Fragment</ID>
+    <ID>TooManyFunctions:RestoreStateListItemBuilder.kt$RestoreStateListItemBuilder</ID>
+    <ID>TooManyFunctions:RestoreViewModel.kt$RestoreViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:SaveStoryGutenbergBlockUseCase.kt$SaveStoryGutenbergBlockUseCase</ID>
+    <ID>TooManyFunctions:ScanFragment.kt$ScanFragment : Fragment</ID>
+    <ID>TooManyFunctions:ScanHistoryFragment.kt$ScanHistoryFragment : FragmentScrollableViewInitializedListener</ID>
+    <ID>TooManyFunctions:ScanHistoryListFragment.kt$ScanHistoryListFragment : ViewPagerFragment</ID>
+    <ID>TooManyFunctions:ScanStateListItemsBuilder.kt$ScanStateListItemsBuilder</ID>
+    <ID>TooManyFunctions:ScanTracker.kt$ScanTracker</ID>
+    <ID>TooManyFunctions:ScanViewModel.kt$ScanViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:SelectedDateProvider.kt$SelectedDateProvider</ID>
+    <ID>TooManyFunctions:SettingsUsernameChangerFragment.kt$SettingsUsernameChangerFragment : BaseUsernameChangerFullScreenDialogFragment</ID>
+    <ID>TooManyFunctions:SiteCreationDomainsFragment.kt$SiteCreationDomainsFragment : SiteCreationBaseFormFragment</ID>
+    <ID>TooManyFunctions:SiteCreationDomainsViewModel.kt$SiteCreationDomainsViewModel : ViewModelCoroutineScope</ID>
+    <ID>TooManyFunctions:SiteCreationMainVM.kt$SiteCreationMainVM : ViewModel</ID>
+    <ID>TooManyFunctions:SiteCreationPreviewFragment.kt$SiteCreationPreviewFragment : SiteCreationBaseFormFragmentErrorManagedWebViewClientListener</ID>
+    <ID>TooManyFunctions:SiteCreationTracker.kt$SiteCreationTracker : LayoutPickerTracker</ID>
+    <ID>TooManyFunctions:SiteListItemBuilder.kt$SiteListItemBuilder</ID>
+    <ID>TooManyFunctions:SitePreviewViewModel.kt$SitePreviewViewModel : ViewModelCoroutineScope</ID>
+    <ID>TooManyFunctions:StatsDateFormatter.kt$StatsDateFormatter</ID>
+    <ID>TooManyFunctions:StatsModule.kt$StatsModule</ID>
+    <ID>TooManyFunctions:StatsUtils.kt$StatsUtils</ID>
+    <ID>TooManyFunctions:StatsViewAllViewModel.kt$StatsViewAllViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:StorePostViewModel.kt$StorePostViewModel : ScopedViewModelDialogVisibilityProvider</ID>
+    <ID>TooManyFunctions:StoriesEventListener.kt$StoriesEventListener : LifecycleObserver</ID>
+    <ID>TooManyFunctions:StoriesPrefs.kt$StoriesPrefs</ID>
+    <ID>TooManyFunctions:StoryComposerActivity.kt$StoryComposerActivity : ComposeLoopFrameActivitySnackbarProviderMediaPickerProviderEditorMediaListenerAuthenticationHeadersProviderNotificationIntentLoaderMetadataProviderStoryDiscardListenerEditPostActivityHookPrepublishingEventProviderPrepublishingBottomSheetListenerPermanentPermissionDenialDialogProviderGenericAnnouncementDialogProvider</ID>
+    <ID>TooManyFunctions:StoryComposerViewModel.kt$StoryComposerViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:SubFilterViewModel.kt$SubFilterViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:SuggestionActivity.kt$SuggestionActivity : LocaleAwareActivity</ID>
+    <ID>TooManyFunctions:TagsAndCategoriesUseCase.kt$TagsAndCategoriesUseCase : BaseStatsUseCase</ID>
+    <ID>TooManyFunctions:ThreatDetailsListItemsBuilder.kt$ThreatDetailsListItemsBuilder</ID>
+    <ID>TooManyFunctions:ThreatDetailsViewModel.kt$ThreatDetailsViewModel : ViewModel</ID>
+    <ID>TooManyFunctions:UnifiedLoginTracker.kt$UnifiedLoginTracker</ID>
+    <ID>TooManyFunctions:UploadUtilsWrapper.kt$UploadUtilsWrapper</ID>
+    <ID>TooManyFunctions:WPEditTextWithChipsOutlined.kt$WPEditTextWithChipsOutlined : ConstraintLayout</ID>
+    <ID>TooManyFunctions:WPMainActivityViewModel.kt$WPMainActivityViewModel : ScopedViewModel</ID>
+    <ID>TooManyFunctions:WPMainNavigationView.kt$WPMainNavigationView : BottomNavigationViewOnNavigationItemSelectedListenerOnNavigationItemReselectedListener</ID>
+    <ID>TooManyFunctions:WPWebViewViewModel.kt$WPWebViewViewModel : ViewModelPreviewModeHandler</ID>
+    <ID>TooManyFunctions:ZendeskHelper.kt$ZendeskHelper</ID>
+    <ID>TopLevelPropertyNaming:ActivityLogTypeFilterAdapter.kt$private const val activityViewType: Int = 2</ID>
+    <ID>TopLevelPropertyNaming:ActivityLogTypeFilterAdapter.kt$private const val headerViewType: Int = 1</ID>
+    <ID>TopLevelPropertyNaming:HomePagePickerViewModel.kt$const val defaultTemplateSlug = "default"</ID>
+    <ID>TopLevelPropertyNaming:PrepublishingHomeAdapter.kt$private const val headerViewType: Int = 1</ID>
+    <ID>TopLevelPropertyNaming:PrepublishingHomeAdapter.kt$private const val homeItemViewType: Int = 2</ID>
+    <ID>TopLevelPropertyNaming:PrepublishingHomeAdapter.kt$private const val submitButtonViewType: Int = 3</ID>
+    <ID>TopLevelPropertyNaming:ReaderDiscoverAdapter.kt$private const val interestViewType: Int = 3</ID>
+    <ID>TopLevelPropertyNaming:ReaderDiscoverAdapter.kt$private const val postViewType: Int = 2</ID>
+    <ID>TopLevelPropertyNaming:ReaderDiscoverAdapter.kt$private const val recommendedBlogsViewType: Int = 4</ID>
+    <ID>TopLevelPropertyNaming:ReaderDiscoverAdapter.kt$private const val welcomeBannerViewType: Int = 1</ID>
+    <ID>TopLevelPropertyNaming:SiteCreationDomainsAdapter.kt$private const val suggestionErrorViewType: Int = 2</ID>
+    <ID>TopLevelPropertyNaming:SiteCreationDomainsAdapter.kt$private const val suggestionItemViewType: Int = 1</ID>
+    <ID>TopLevelPropertyNaming:SupportedBlocks.kt$private const val defaultAssetFilename = "supported-blocks.json"</ID>
+    <ID>TopLevelPropertyNaming:ZendeskHelper.kt$private const val enablePushNotificationsDelayAfterIdentityChange: Long = 2500</ID>
+    <ID>TopLevelPropertyNaming:ZendeskHelper.kt$private const val zendeskNeedsToBeEnabledError = "Zendesk needs to be setup before this method can be called"</ID>
+    <ID>UtilityClassWithPublicConstructor:AppThemeUtils.kt$AppThemeUtils</ID>
+    <ID>UtilityClassWithPublicConstructor:DomainPhoneNumberUtils.kt$DomainPhoneNumberUtils</ID>
+    <ID>UtilityClassWithPublicConstructor:EncryptionUtils.kt$EncryptionUtils</ID>
+    <ID>UtilityClassWithPublicConstructor:ImageEditorInitializer.kt$ImageEditorInitializer</ID>
+    <ID>UtilityClassWithPublicConstructor:QuickStartUtils.kt$QuickStartUtils</ID>
+    <ID>UtilityClassWithPublicConstructor:WPSnackbar.kt$WPSnackbar</ID>
+    <ID>VariableNaming:ReaderCommentsFollowUseCase.kt$ReaderCommentsFollowUseCase$private val FOLLOW_COMMENT_ACTION = "follow_action"</ID>
+    <ID>VariableNaming:ReaderCommentsFollowUseCase.kt$ReaderCommentsFollowUseCase$private val FOLLOW_COMMENT_ACTION_ERROR = "follow_action_error"</ID>
+    <ID>VariableNaming:ReaderCommentsFollowUseCase.kt$ReaderCommentsFollowUseCase$private val FOLLOW_COMMENT_ACTION_RESULT = "follow_action_result"</ID>
+  </CurrentIssues>
+</SmellBaseline>
diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
new file mode 100644
index 000000000000..f77f6400850f
--- /dev/null
+++ b/config/detekt/detekt.yml
@@ -0,0 +1,689 @@
+build:
+  maxIssues: 0
+  excludeCorrectable: false
+  weights:
+  # complexity: 2
+  # LongParameterList: 1
+  # style: 1
+  # comments: 1
+
+config:
+  validation: true
+  warningsAsErrors: true
+  # when writing own rules with new properties, exclude the property path e.g.: 'my_rule_set,.*>.*>[my_property]'
+  excludes: ''
+
+processors:
+  active: true
+  exclude:
+    - 'DetektProgressListener'
+  # - 'FunctionCountProcessor'
+  # - 'PropertyCountProcessor'
+  # - 'ClassCountProcessor'
+  # - 'PackageCountProcessor'
+  # - 'KtFileCountProcessor'
+
+console-reports:
+  active: true
+  exclude:
+    - 'ProjectStatisticsReport'
+    - 'ComplexityReport'
+    - 'NotificationReport'
+    #  - 'FindingsReport'
+    - 'FileBasedFindingsReport'
+
+output-reports:
+  active: true
+  exclude:
+  # - 'TxtOutputReport'
+  # - 'XmlOutputReport'
+  # - 'HtmlOutputReport'
+
+comments:
+  active: true
+  excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  AbsentOrWrongFileLicense:
+    active: false
+    licenseTemplateFile: 'license.template'
+  CommentOverPrivateFunction:
+    active: false
+  CommentOverPrivateProperty:
+    active: false
+  EndOfSentenceFormat:
+    active: false
+    endOfSentenceFormat: '([.?!][ \t\n\r\f<])|([.?!:]$)'
+  UndocumentedPublicClass:
+    active: false
+    searchInNestedClass: true
+    searchInInnerClass: true
+    searchInInnerObject: true
+    searchInInnerInterface: true
+  UndocumentedPublicFunction:
+    active: false
+  UndocumentedPublicProperty:
+    active: false
+
+complexity:
+  active: true
+  ComplexCondition:
+    active: true
+    threshold: 4
+  ComplexInterface:
+    active: false
+    threshold: 10
+    includeStaticDeclarations: false
+    includePrivateDeclarations: false
+  ComplexMethod:
+    active: true
+    threshold: 15
+    ignoreSingleWhenExpression: false
+    ignoreSimpleWhenEntries: false
+    ignoreNestingFunctions: false
+    nestingFunctions: [run, let, apply, with, also, use, forEach, isNotNull, ifNull]
+  LabeledExpression:
+    active: false
+    ignoredLabels: []
+  LargeClass:
+    active: true
+    threshold: 600
+  LongMethod:
+    active: true
+    threshold: 60
+  LongParameterList:
+    active: true
+    functionThreshold: 6
+    constructorThreshold: 7
+    ignoreDefaultParameters: false
+    ignoreDataClasses: true
+    ignoreAnnotated: ['javax.inject.Inject', 'javax.annotation.Generated']
+  MethodOverloading:
+    active: false
+    threshold: 6
+  NamedArguments:
+    active: false
+    threshold: 3
+  NestedBlockDepth:
+    active: true
+    threshold: 4
+  ReplaceSafeCallChainWithRun:
+    active: false
+  StringLiteralDuplication:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    threshold: 3
+    ignoreAnnotation: true
+    excludeStringsWithLessThan5Characters: true
+    ignoreStringsRegex: '$^'
+  TooManyFunctions:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    thresholdInFiles: 11
+    thresholdInClasses: 11
+    thresholdInInterfaces: 11
+    thresholdInObjects: 11
+    thresholdInEnums: 11
+    ignoreDeprecated: false
+    ignorePrivate: false
+    ignoreOverridden: false
+
+coroutines:
+  active: true
+  GlobalCoroutineUsage:
+    active: false
+  RedundantSuspendModifier:
+    active: false
+  SuspendFunWithFlowReturnType:
+    active: false
+
+empty-blocks:
+  active: true
+  EmptyCatchBlock:
+    active: true
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  EmptyClassBlock:
+    active: true
+  EmptyDefaultConstructor:
+    active: true
+  EmptyDoWhileBlock:
+    active: true
+  EmptyElseBlock:
+    active: true
+  EmptyFinallyBlock:
+    active: true
+  EmptyForBlock:
+    active: true
+  EmptyFunctionBlock:
+    active: true
+    ignoreOverridden: false
+  EmptyIfBlock:
+    active: true
+  EmptyInitBlock:
+    active: true
+  EmptyKtFile:
+    active: true
+  EmptySecondaryConstructor:
+    active: true
+  EmptyTryBlock:
+    active: true
+  EmptyWhenBlock:
+    active: true
+  EmptyWhileBlock:
+    active: true
+
+exceptions:
+  active: true
+  ExceptionRaisedInUnexpectedLocation:
+    active: false
+    methodNames: [toString, hashCode, equals, finalize]
+  InstanceOfCheckForException:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  NotImplementedDeclaration:
+    active: false
+  PrintStackTrace:
+    active: false
+  RethrowCaughtException:
+    active: false
+  ReturnFromFinally:
+    active: false
+    ignoreLabeled: false
+  SwallowedException:
+    active: false
+    ignoredExceptionTypes:
+      - InterruptedException
+      - NumberFormatException
+      - ParseException
+      - MalformedURLException
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  ThrowingExceptionFromFinally:
+    active: false
+  ThrowingExceptionInMain:
+    active: false
+  ThrowingExceptionsWithoutMessageOrCause:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptions:
+      - IllegalArgumentException
+      - IllegalStateException
+      - IOException
+  ThrowingNewInstanceOfSameException:
+    active: false
+  TooGenericExceptionCaught:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    exceptionNames:
+      - ArrayIndexOutOfBoundsException
+      - Error
+      - Exception
+      - IllegalMonitorStateException
+      - NullPointerException
+      - IndexOutOfBoundsException
+      - RuntimeException
+      - Throwable
+    allowedExceptionNameRegex: '_|(ignore|expected).*'
+  TooGenericExceptionThrown:
+    active: true
+    exceptionNames:
+      - Error
+      - Exception
+      - Throwable
+      - RuntimeException
+
+formatting:
+  active: true
+  android: true
+  autoCorrect: false
+  AnnotationOnSeparateLine:
+    active: false
+    autoCorrect: true
+  AnnotationSpacing:
+    active: false
+    autoCorrect: true
+  ArgumentListWrapping:
+    active: false
+    autoCorrect: true
+  ChainWrapping:
+    active: true
+    autoCorrect: true
+  CommentSpacing:
+    active: true
+    autoCorrect: true
+  EnumEntryNameCase:
+    active: false
+    autoCorrect: true
+  Filename:
+    active: true
+  FinalNewline:
+    active: true
+    autoCorrect: true
+    insertFinalNewLine: true
+  ImportOrdering:
+    active: false
+    autoCorrect: true
+    layout: 'idea'
+  Indentation:
+    active: false
+    autoCorrect: true
+    indentSize: 4
+    continuationIndentSize: 4
+  MaximumLineLength:
+    active: true
+    maxLineLength: 120
+  ModifierOrdering:
+    active: true
+    autoCorrect: true
+  MultiLineIfElse:
+    active: true
+    autoCorrect: true
+  NoBlankLineBeforeRbrace:
+    active: true
+    autoCorrect: true
+  NoConsecutiveBlankLines:
+    active: true
+    autoCorrect: true
+  NoEmptyClassBody:
+    active: true
+    autoCorrect: true
+  NoEmptyFirstLineInMethodBlock:
+    active: false
+    autoCorrect: true
+  NoLineBreakAfterElse:
+    active: true
+    autoCorrect: true
+  NoLineBreakBeforeAssignment:
+    active: true
+    autoCorrect: true
+  NoMultipleSpaces:
+    active: true
+    autoCorrect: true
+  NoSemicolons:
+    active: true
+    autoCorrect: true
+  NoTrailingSpaces:
+    active: true
+    autoCorrect: true
+  NoUnitReturn:
+    active: true
+    autoCorrect: true
+  NoUnusedImports:
+    active: true
+    autoCorrect: true
+  NoWildcardImports:
+    active: true
+  PackageName:
+    active: true
+    autoCorrect: true
+  ParameterListWrapping:
+    active: true
+    autoCorrect: true
+    indentSize: 4
+  SpacingAroundColon:
+    active: true
+    autoCorrect: true
+  SpacingAroundComma:
+    active: true
+    autoCorrect: true
+  SpacingAroundCurly:
+    active: true
+    autoCorrect: true
+  SpacingAroundDot:
+    active: true
+    autoCorrect: true
+  SpacingAroundDoubleColon:
+    active: false
+    autoCorrect: true
+  SpacingAroundKeyword:
+    active: true
+    autoCorrect: true
+  SpacingAroundOperators:
+    active: true
+    autoCorrect: true
+  SpacingAroundParens:
+    active: true
+    autoCorrect: true
+  SpacingAroundRangeOperator:
+    active: true
+    autoCorrect: true
+  SpacingBetweenDeclarationsWithAnnotations:
+    active: false
+    autoCorrect: true
+  SpacingBetweenDeclarationsWithComments:
+    active: false
+    autoCorrect: true
+  StringTemplate:
+    active: true
+    autoCorrect: true
+
+naming:
+  active: true
+  ClassNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    classPattern: '[A-Z][a-zA-Z0-9]*'
+  ConstructorParameterNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    privateParameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  EnumNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    enumEntryPattern: '[A-Z][_a-zA-Z0-9]*'
+  ForbiddenClassName:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    forbiddenName: []
+  FunctionMaxLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    maximumFunctionNameLength: 30
+  FunctionMinLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    minimumFunctionNameLength: 3
+  FunctionNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    functionPattern: '([a-z][a-zA-Z0-9]*)|(`.*`)'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+    ignoreAnnotated: ['Composable']
+  FunctionParameterNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    parameterPattern: '[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+  InvalidPackageDeclaration:
+    active: false
+    rootPackage: ''
+  MatchingDeclarationName:
+    active: true
+    mustBeFirst: true
+  MemberNameEqualsClassName:
+    active: true
+    ignoreOverridden: true
+  NonBooleanPropertyPrefixedWithIs:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  ObjectPropertyNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    constantPattern: '[A-Za-z][_A-Za-z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '(_)?[A-Za-z][_A-Za-z0-9]*'
+  PackageNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    packagePattern: '[a-z]+(\.[a-z][A-Za-z0-9]*)*'
+  TopLevelPropertyNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    constantPattern: '[A-Z][_A-Z0-9]*'
+    propertyPattern: '[A-Za-z][_A-Za-z0-9]*'
+    privatePropertyPattern: '_?[A-Za-z][_A-Za-z0-9]*'
+  VariableMaxLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    maximumVariableNameLength: 64
+  VariableMinLength:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    minimumVariableNameLength: 1
+  VariableNaming:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    variablePattern: '[a-z][A-Za-z0-9]*'
+    privateVariablePattern: '(_)?[a-z][A-Za-z0-9]*'
+    excludeClassPattern: '$^'
+    ignoreOverridden: true
+
+performance:
+  active: true
+  ArrayPrimitive:
+    active: true
+  ForEachOnRange:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  SpreadOperator:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+  UnnecessaryTemporaryInstantiation:
+    active: true
+
+potential-bugs:
+  active: true
+  Deprecation:
+    active: false
+  DuplicateCaseInWhenExpression:
+    active: true
+  EqualsAlwaysReturnsTrueOrFalse:
+    active: true
+  EqualsWithHashCodeExist:
+    active: true
+  ExplicitGarbageCollectionCall:
+    active: true
+  HasPlatformType:
+    active: false
+  IgnoredReturnValue:
+    active: false
+    restrictToAnnotatedMethods: true
+    returnValueAnnotations: ['*.CheckReturnValue', '*.CheckResult']
+  ImplicitDefaultLocale:
+    active: false
+  ImplicitUnitReturnType:
+    active: false
+    allowExplicitReturnType: true
+  InvalidRange:
+    active: true
+  IteratorHasNextCallsNextMethod:
+    active: true
+  IteratorNotThrowingNoSuchElementException:
+    active: true
+  LateinitUsage:
+    active: false
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    excludeAnnotatedProperties: []
+    ignoreOnClassesPattern: ''
+  MapGetWithNotNullAssertionOperator:
+    active: false
+  MissingWhenCase:
+    active: true
+    allowElseExpression: true
+  NullableToStringCall:
+    active: false
+  RedundantElseInWhen:
+    active: true
+  UnconditionalJumpStatementInLoop:
+    active: false
+  UnnecessaryNotNullOperator:
+    active: false
+  UnnecessarySafeCall:
+    active: false
+  UnreachableCode:
+    active: true
+  UnsafeCallOnNullableType:
+    active: true
+  UnsafeCast:
+    active: false
+  UselessPostfixExpression:
+    active: false
+  WrongEqualsTypeParameter:
+    active: true
+
+style:
+  active: true
+  ClassOrdering:
+    active: false
+  CollapsibleIfStatements:
+    active: false
+  DataClassContainsFunctions:
+    active: false
+    conversionFunctionPrefix: 'to'
+  DataClassShouldBeImmutable:
+    active: false
+  EqualsNullCall:
+    active: true
+  EqualsOnSignatureLine:
+    active: false
+  ExplicitCollectionElementAccessMethod:
+    active: false
+  ExplicitItLambdaParameter:
+    active: false
+  ExpressionBodySyntax:
+    active: false
+    includeLineWrapping: false
+  ForbiddenComment:
+    active: true
+    values: ['FIXME:', 'STOPSHIP:']
+    allowedPatterns: ''
+  ForbiddenImport:
+    active: false
+    imports: []
+    forbiddenPatterns: ''
+  ForbiddenMethodCall:
+    active: false
+    methods: ['kotlin.io.println', 'kotlin.io.print']
+  ForbiddenPublicDataClass:
+    active: false
+    ignorePackages: ['*.internal', '*.internal.*']
+  ForbiddenVoid:
+    active: false
+    ignoreOverridden: false
+    ignoreUsageInGenerics: false
+  FunctionOnlyReturningConstant:
+    active: true
+    ignoreOverridableFunction: true
+    excludedFunctions: 'describeContents'
+    excludeAnnotatedFunction: ['dagger.Provides']
+  LibraryCodeMustSpecifyReturnType:
+    active: true
+  LibraryEntitiesShouldNotBePublic:
+    active: false
+  LoopWithTooManyJumpStatements:
+    active: true
+    maxJumpCount: 1
+  MagicNumber:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    ignoreNumbers: ['-1', '0', '1', '2']
+    ignoreHashCodeFunction: true
+    ignorePropertyDeclaration: false
+    ignoreLocalVariableDeclaration: false
+    ignoreConstantDeclaration: true
+    ignoreCompanionObjectPropertyDeclaration: true
+    ignoreAnnotation: false
+    ignoreNamedArgument: true
+    ignoreEnums: true
+    ignoreRanges: false
+  MandatoryBracesIfStatements:
+    active: false
+  MandatoryBracesLoops:
+    active: false
+  MaxLineLength:
+    active: true
+    maxLineLength: 120
+    excludePackageStatements: true
+    excludeImportStatements: true
+    excludeCommentStatements: false
+  MayBeConst:
+    active: true
+  ModifierOrder:
+    active: true
+  NestedClassesVisibility:
+    active: false
+  NewLineAtEndOfFile:
+    active: true
+  NoTabs:
+    active: false
+  OptionalAbstractKeyword:
+    active: true
+  OptionalUnit:
+    active: false
+  OptionalWhenBraces:
+    active: false
+  PreferToOverPairSyntax:
+    active: false
+  ProtectedMemberInFinalClass:
+    active: true
+  RedundantExplicitType:
+    active: false
+  RedundantHigherOrderMapUsage:
+    active: false
+  RedundantVisibilityModifierRule:
+    active: false
+  ReturnCount:
+    active: true
+    max: 2
+    excludedFunctions: 'equals'
+    excludeLabeled: false
+    excludeReturnFromLambda: true
+    excludeGuardClauses: false
+  SafeCast:
+    active: true
+  SerialVersionUIDInSerializableClass:
+    active: false
+  SpacingBetweenPackageAndImports:
+    active: false
+  ThrowsCount:
+    active: true
+    max: 2
+  TrailingWhitespace:
+    active: false
+  UnderscoresInNumericLiterals:
+    active: false
+    acceptableDecimalLength: 5
+  UnnecessaryAbstractClass:
+    active: true
+    excludeAnnotatedClasses: ['dagger.Module']
+  UnnecessaryAnnotationUseSiteTarget:
+    active: false
+  UnnecessaryApply:
+    active: false
+  UnnecessaryInheritance:
+    active: true
+  UnnecessaryLet:
+    active: false
+  UnnecessaryParentheses:
+    active: false
+  UntilInsteadOfRangeTo:
+    active: false
+  UnusedImports:
+    active: false
+  UnusedPrivateClass:
+    active: true
+  UnusedPrivateMember:
+    active: false
+    allowedNames: '(_|ignored|expected|serialVersionUID)'
+  UseArrayLiteralsInAnnotations:
+    active: false
+  UseCheckNotNull:
+    active: false
+  UseCheckOrError:
+    active: false
+  UseDataClass:
+    active: false
+    excludeAnnotatedClasses: []
+    allowVars: false
+  UseEmptyCounterpart:
+    active: false
+  UseIfEmptyOrIfBlank:
+    active: false
+  UseIfInsteadOfWhen:
+    active: false
+  UseRequire:
+    active: false
+  UseRequireNotNull:
+    active: false
+  UselessCallOnNotNull:
+    active: true
+  UtilityClassWithPublicConstructor:
+    active: true
+  VarCouldBeVal:
+    active: false
+  WildcardImport:
+    active: true
+    excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**']
+    excludeImports: ['java.util.*', 'kotlinx.android.synthetic.*']
diff --git a/docs/coding-style.md b/docs/coding-style.md
index f6303bfcb790..dc44c93befdd 100644
--- a/docs/coding-style.md
+++ b/docs/coding-style.md
@@ -32,3 +32,25 @@ From there, add and enable the custom configuration file, located at [config/che
 ## ktlint
 
 You can run ktlint using `./gradlew ktlint`, and you can also run `./gradlew ktlintFormat` for auto-formatting. There is no IDEA plugin (like Checkstyle's) at this time.
+
+## Detekt
+
+You can run detekt via a gradle command:
+
+```
+$ ./gradlew WordPress:detekt
+```
+
+It generates an HTML report in `WordPress/build/reports/detekt/detekt.html`.
+
+You can also view errors and warnings in realtime with the Detekt plugin.
+
+You can install the detekt plugin in Android Studio here:
+
+`Android Studio > Preferences... > Plugins > detekt`
+
+Once installed, you can configure the plugin here:
+
+`Android Studio > Preferences... > Tools > Detekt`
+
+From there, add and enable the custom configuration file, located at [config/detekt/detekt.yml](https://github.com/wordpress-mobile/WordPress-Android/blob/develop/config/detekt/detekt.yml).
diff --git a/docs/issue-triage.md b/docs/issue-triage.md
index bd13799ec076..ed3b897c710b 100644
--- a/docs/issue-triage.md
+++ b/docs/issue-triage.md
@@ -40,11 +40,12 @@ Impact is determined by how many users are affected or how many reports we recei
 
 If you aren't sure how to estimate the number of users affected, use the number of user reports you can find as a starting point. The issue can be escalated later if we find a good estimate of users affected or if more user reports are noted on the issue.
 
-### Crashes
+### Special Cases
 
-In addition to the guidelines above, we have specific criteria for prioritizing crashes in a new production or beta release:
+In addition to the guidelines above, we have specific criteria for prioritizing certain types of issues in a new production or beta release:
 
 * A new crash affecting more than 0.2% of users once the rollout of a production release is completed requires a hotfix. Some considerations here:
    * If the crash leaves the user in an unrecoverable situation, that’s a breaking incident. All hands on deck until we push a fix.
    * If the user can recover, we need to find the developer(s) that have the highest chance of success and redirect them to the issue.
 * All new crashes in a beta release should be fixed on the frozen branch (i.e. "Blocking" priority).
+* Issues with Tracks events should be fixed as soon as they are discovered. We rely on Tracks to evaluate whether a project was a success or not, or if we should keep iterating on it, so it’s extremely important that all our events are accurate. When to hotfix or target the frozen branch will be determined on a case by case basis.
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 521771446c23..bee9f9482c32 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -7,31 +7,77 @@ end
 
 # NOTE: When updating the `promo_config` keys of those locale, ensure it matches the list
 # of locales enabled in `.circleci/config.yml` for the `raw-screenshots` job
-SUPPORTED_LOCALES = [
-  { glotpress: "ar",    google_play: "ar",     promo_config: {} },
-  { glotpress: "de",    google_play: "de-DE",  promo_config: {} },
-  { glotpress: "en-gb", google_play: "en-US",  promo_config: {} },
-  { glotpress: "es",    google_play: "es-ES",  promo_config: {} },
-  { glotpress: "fr",    google_play: "fr-CA",  promo_config: false },
-  { glotpress: "fr",    google_play: "fr-FR",  promo_config: {} },
-  { glotpress: "he",    google_play: "iw-IL",  promo_config: {} },
-  { glotpress: "id",    google_play: "in",     promo_config: {} },
-  { glotpress: "it",    google_play: "it-IT",  promo_config: {} },
-  { glotpress: "ja",    google_play: "ja-JP",  promo_config: {} },
-  { glotpress: "ko",    google_play: "ko-KR",  promo_config: {} },
-  { glotpress: "nl",    google_play: "nl-NL",  promo_config: {} },
-  { glotpress: "pl",    google_play: "pl-PL",  promo_config: {} },
-  { glotpress: "pt-br", google_play: "pt-BR",  promo_config: {} },
-  { glotpress: "ru",    google_play: "ru-RU",  promo_config: {} },
-  { glotpress: "sr",    google_play: "sr",     promo_config: {} },
-  { glotpress: "sv",    google_play: "sv-SE",  promo_config: {} },
-  { glotpress: "th",    google_play: "th",     promo_config: {} },
-  { glotpress: "tr",    google_play: "tr-TR",  promo_config: {} },
-  { glotpress: "vi",    google_play: "vi",     promo_config: {} },
-  { glotpress: "zh-cn", google_play: "zh-CN",  promo_config: {} },
-  { glotpress: "zh-tw", google_play: "zh-TW",  promo_config: {} },
+ALL_LOCALES = [
+  # First are the locales which are used for *both* downloading the `strings.xml` files from GlotPress *and* for generating the release notes XML files.
+  { glotpress: "ar", android: "ar",    google_play: "ar",     promo_config: {} },
+  { glotpress: "de", android: "de",    google_play: "de-DE",  promo_config: {} },
+  { glotpress: "en-gb", android: "en-rGB", google_play: "en-US",  promo_config: {} },
+  { glotpress: "es", android: "es",    google_play: "es-ES",  promo_config: {} },
+  { glotpress: "fr", android: "fr-rCA",    google_play: "fr-CA",  promo_config: false },
+  { glotpress: "fr", android: "fr",    google_play: "fr-FR",  promo_config: {} },
+  { glotpress: "he", android: "he",    google_play: "iw-IL",  promo_config: {} },
+  { glotpress: "id", android: "id",    google_play: "id",     promo_config: {} },
+  { glotpress: "it", android: "it",    google_play: "it-IT",  promo_config: {} },
+  { glotpress: "ja", android: "ja",    google_play: "ja-JP",  promo_config: {} },
+  { glotpress: "ko", android: "ko",    google_play: "ko-KR",  promo_config: {} },
+  { glotpress: "nl", android: "nl",    google_play: "nl-NL",  promo_config: {} },
+  { glotpress: "pl", android: "pl",    google_play: "pl-PL",  promo_config: {} },
+  { glotpress: "pt-br", android: "pt-rBR", google_play: "pt-BR",  promo_config: {} },
+  { glotpress: "ru", android: "ru",    google_play: "ru-RU",  promo_config: {} },
+  { glotpress: "sr", android: "sr",    google_play: "sr",     promo_config: {} },
+  { glotpress: "sv", android: "sv",    google_play: "sv-SE",  promo_config: {} },
+  { glotpress: "th", android: "th",    google_play: "th",     promo_config: {} },
+  { glotpress: "tr", android: "tr",    google_play: "tr-TR",  promo_config: {} },
+  { glotpress: "vi", android: "vi",    google_play: "vi",     promo_config: {} },
+  { glotpress: "zh-cn", android: "zh-rCN", google_play: "zh-CN",  promo_config: {} },
+  { glotpress: "zh-tw", android: "zh-rTW", google_play: "zh-TW",  promo_config: {} },
+  # From this point are locales that are still used for downloading `strings.xml`… but not for release notes – and thus don't need a `google_play` key. See `RELEASE_NOTES_LOCALES` below.
+  { glotpress: "az", android: "az", promo_config: false},
+  { glotpress: "el", android: "el", promo_config: false},
+  { glotpress: "es-mx", android: "es-rMX", promo_config: false},
+  { glotpress: "es-cl", android: "es-rCL", promo_config: false},
+  { glotpress: "gd", android: "gd", promo_config: false},
+  { glotpress: "hi", android: "hi", promo_config: false },
+  { glotpress: "hu", android: "hu", promo_config: false},
+  { glotpress: "nb", android: "nb", promo_config: false},
+  { glotpress: "pl", android: "pl", promo_config: false},
+  { glotpress: "th", android: "th", promo_config: false},
+  { glotpress: "uz", android: "uz", promo_config: false},
+  { glotpress: "zh-tw", android: "zh-rHK", promo_config: false},
+  { glotpress: "eu", android: "eu", promo_config: false},
+  { glotpress: "ro", android: "ro", promo_config: false},
+  { glotpress: "mk", android: "mk", promo_config: false},
+  { glotpress: "en-au", android: "en-rAU", promo_config: false},
+  { glotpress: "sr", android: "sr", promo_config: false},
+  { glotpress: "sk", android: "sk", promo_config: false},
+  { glotpress: "cy", android: "cy", promo_config: false},
+  { glotpress: "da", android: "da", promo_config: false },
+  { glotpress: "bg", android: "bg", promo_config: false },
+  { glotpress: "sq", android: "sq", promo_config: false},
+  { glotpress: "hr", android: "hr", promo_config: false},
+  { glotpress: "cs", android: "cs", promo_config: false},
+  { glotpress: "pt-br", android: "pt-rBR", promo_config: false},
+  { glotpress: "en-ca", android: "en-rCA", promo_config: false },
+  { glotpress: "ms", android: "ms", promo_config: false},
+  { glotpress: "es-ve", android: "es-rVE", promo_config: false},
+  { glotpress: "gl", android: "gl", promo_config: false},
+  { glotpress: "is", android: "is"},
+  { glotpress: "es-co", android: "es-rCO", promo_config: false },
+  { glotpress: "kmr", android: "kmr", promo_config: false},
 ].freeze
 
+RELEASE_NOTES_LOCALES = ALL_LOCALES.reject { |h| h[:google_play].nil? }.map { |h| [h[:glotpress], h[:google_play]] }
+
+# Env file paths to load
+USER_ENV_FILE_PATH = File.join(Dir.home, '.wpandroid-env.default')
+
+before_all do |lane|
+  # Check that the env file exists
+  unless is_ci || File.file?(USER_ENV_FILE_PATH)
+    UI.user_error!("#{USER_ENV_FILE_PATH} not found: Please copy fastlane/env/user.env-example to #{USER_ENV_FILE_PATH} and fill in the values")
+  end
+end
+
 platform :android do
 ########################################################################
 # Includes
@@ -40,12 +86,12 @@ import "./ScreenshotFastfile"
 
 # Environment
 ########################################################################
-Dotenv.load('~/.wpandroid-env.default')
+Dotenv.load(USER_ENV_FILE_PATH)
 ENV[GHHELPER_REPO="wordpress-mobile/WordPress-Android"]
-ENV["PROJECT_ROOT_FOLDER"]="./"
+ENV["PROJECT_ROOT_FOLDER"]=File.dirname(File.expand_path(__dir__)) + "/"
 ENV["PROJECT_NAME"]="WordPress"
 ENV["HAS_ALPHA_VERSION"]="true"
-ENV["validate_translations"]="lintVanillaRelease"
+REPOSITORY_NAME="WordPress-Android"
 
 ########################################################################
 # Release Lanes
@@ -65,24 +111,26 @@ ENV["validate_translations"]="lintVanillaRelease"
   #####################################################################################
   desc "Creates a new release branch from the current develop"
   lane :code_freeze do | options |
-    gutenberg_dep_check()
     old_version = android_codefreeze_prechecks(options)
 
     android_bump_version_release()
     new_version = android_get_app_version()
-    extract_release_notes_for_version(version: new_version, 
-      release_notes_file_path:"#{ENV["PROJECT_ROOT_FOLDER"]}RELEASE-NOTES.txt", 
+
+    # need to get prs list before version update to frozen tag
+    get_prs_list(repository:GHHELPER_REPO, milestone:new_version, report_path:"#{File.expand_path('~')}/wpandroid_prs_list_#{old_version}_#{new_version}.txt")
+
+    extract_release_notes_for_version(version: new_version,
+      release_notes_file_path:"#{ENV["PROJECT_ROOT_FOLDER"]}RELEASE-NOTES.txt",
       extracted_notes_file_path:release_notes_path)
     cleanup_release_files(files: [release_note_short_path])
     android_update_release_notes(new_version: new_version)
     setbranchprotection(repository:GHHELPER_REPO, branch: "release/#{new_version}")
     setfrozentag(repository:GHHELPER_REPO, milestone: new_version)
 
-    localize_gutenberg(skip_module_update: true)
+    localize_binary_deps()
     localize_libs()
     send_strings_for_translation()
     ensure_git_status_clean()
-    get_prs_list(repository:GHHELPER_REPO, start_tag:"release/#{old_version}", report_path:"#{File.expand_path('~')}/wpandroid_prs_list_#{old_version}_#{new_version}.txt")
   end
 
   #####################################################################################
@@ -100,7 +148,8 @@ ENV["validate_translations"]="lintVanillaRelease"
   desc "Creates a new release branch from the current develop"
   lane :complete_code_freeze do | options |
     android_completecodefreeze_prechecks(options)
-    android_tag_build()
+    new_version = android_get_app_version()
+    trigger_release_build(branch_to_build: "release/#{new_version}")
   end
 
 #####################################################################################
@@ -167,9 +216,10 @@ ENV["validate_translations"]="lintVanillaRelease"
   lane :new_beta_release do | options |
     android_betabuild_prechecks(options)
     send_strings_for_translation()
-    android_update_metadata(options)
+    download_translations(options)
     android_bump_version_beta()
-    android_tag_build()
+    new_version = android_get_app_version()
+    trigger_release_build(branch_to_build: "release/#{new_version}")
   end
 
   #####################################################################################
@@ -193,7 +243,7 @@ ENV["validate_translations"]="lintVanillaRelease"
   #####################################################################################
   # finalize_hotfix_release
   # -----------------------------------------------------------------------------------
-  # This lane finalizes the hotfix branch. 
+  # This lane finalizes the hotfix branch.
   # -----------------------------------------------------------------------------------
   # Usage:
   # bundle exec fastlane finalize_hotfix_release
@@ -202,7 +252,8 @@ ENV["validate_translations"]="lintVanillaRelease"
   # bundle exec fastlane finalize_hotfix_release
   desc "Finalizes a hotfix release by tagging the build"
   lane :finalize_hotfix_release do | options |
-    android_tag_build(tag_alpha: false)
+    new_version = android_get_app_version()
+    trigger_release_build(branch_to_build: "release/#{new_version}")
   end
 
   #####################################################################################
@@ -222,17 +273,19 @@ ENV["validate_translations"]="lintVanillaRelease"
     android_finalize_prechecks(options)
     configure_apply(force: is_ci)
     hotfix = android_current_branch_is_hotfix
-    android_update_metadata(options) unless hotfix
     android_bump_version_final_release() unless hotfix
-    version = android_get_release_version() unless hotfix
+    download_translations(options) unless hotfix
+    version = android_get_release_version()
     download_metadata_strings(version: version["name"], build_number: version["code"]) unless hotfix
-    android_tag_build(tag_alpha: false)
 
     # Wrap up
     removebranchprotection(repository:GHHELPER_REPO, branch: "release/#{version["name"]}")
     setfrozentag(repository:GHHELPER_REPO, milestone: version["name"], freeze: false)
     create_new_milestone(repository:GHHELPER_REPO)
     close_milestone(repository:GHHELPER_REPO, milestone: version["name"])
+
+    # Trigger release build
+    trigger_release_build(branch_to_build: "release/#{version["name"]}")
   end
 
   #####################################################################################
@@ -241,12 +294,13 @@ ENV["validate_translations"]="lintVanillaRelease"
   # This lane builds the final release of the app and uploads it
   # -----------------------------------------------------------------------------------
   # Usage:
-  # bundle exec fastlane build_and_upload_release [skip_confirm:<skip confirm>] [create_release:<Create release on GH> ]
+  # bundle exec fastlane build_and_upload_release [skip_confirm:<skip confirm>] [skip_prechecks:<skip prechecks>] [create_release:<Create release on GH> ]
   #
   # Example:
   # bundle exec fastlane build_and_upload_release
   # bundle exec fastlane build_and_upload_release skip_confirm:true
-  # bundle exec fastlane build_and_upload_release create_release:true 
+  # bundle exec fastlane build_and_upload_release skip_prechecks:true
+  # bundle exec fastlane build_and_upload_release create_release:true
   #####################################################################################
   desc "Builds and updates for distribution"
   lane :build_and_upload_release do | options |
@@ -254,11 +308,11 @@ ENV["validate_translations"]="lintVanillaRelease"
       alpha: false,
       beta: false,
       final: true)
-    android_build_preflight()
+    android_build_preflight() unless options[:skip_prechecks]
 
     # Create the file names
     version=android_get_release_version()
-    build_bundle(version: version, flavor:"vanilla", buildType: "release")
+    build_bundle(version: version, app: "wordpress", flavor:"Vanilla", buildType: "release")
 
     upload_build_to_play_store(version: version, track: "production")
 
@@ -278,7 +332,7 @@ ENV["validate_translations"]="lintVanillaRelease"
   # Example:
   # bundle exec fastlane build_and_upload_pre_releases
   # bundle exec fastlane build_and_upload_pre_releases skip_confirm:true
-  # bundle exec fastlane build_and_upload_beta create_release:true 
+  # bundle exec fastlane build_and_upload_beta create_release:true
   #####################################################################################
   desc "Builds and updates for distribution"
   lane :build_and_upload_pre_releases do | options |
@@ -311,7 +365,7 @@ ENV["validate_translations"]="lintVanillaRelease"
 
     # Create the file names
     version=android_get_alpha_version()
-    build_bundle(version: version, flavor:"zalpha", buildType: "release")
+    build_bundle(version: version, app:"wordpress", flavor:"Zalpha", buildType: "release")
 
     if (options[:upload_to_play_store]) then
        upload_build_to_play_store(version: version, track: "alpha")
@@ -342,7 +396,7 @@ ENV["validate_translations"]="lintVanillaRelease"
 
     # Create the file names
     version=android_get_release_version()
-    build_bundle(version: version, flavor:"vanilla", buildType: "release")
+    build_bundle(version: version, app: "wordpress", flavor:"Vanilla", buildType: "release")
 
     if (options[:upload_to_play_store]) then
        upload_build_to_play_store(version: version, track: "beta")
@@ -387,6 +441,24 @@ ENV["validate_translations"]="lintVanillaRelease"
     end
   end
 
+  #####################################################################################
+  # trigger_release_build
+  # -----------------------------------------------------------------------------------
+  # This lane triggers a stable release build on CI
+  # -----------------------------------------------------------------------------------
+  # Usage:
+  # bundle exec fastlane trigger_release_build branch_to_build:<branch_name>
+  #
+  #####################################################################################
+  lane :trigger_release_build do | options |
+    circleci_trigger_job(
+      circle_ci_token: ENV["CIRCLE_CI_AUTH_TOKEN"],
+      repository: REPOSITORY_NAME,
+      branch: options[:branch_to_build],
+      job_params: {"release_build" => true}
+    )
+  end
+
   #####################################################################################
   # upload_and_replace_screenshots_in_play_store
   # -----------------------------------------------------------------------------------
@@ -440,11 +512,11 @@ ENV["validate_translations"]="lintVanillaRelease"
     download_path=Dir.pwd + "/metadata/android"
     gp_downloadmetadata(project_url: "https://translate.wordpress.org/projects/apps/android/release-notes/",
       target_files: files,
-      locales: SUPPORTED_LOCALES.map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]},
+      locales: RELEASE_NOTES_LOCALES,
       source_locale: "en-US",
       download_path: download_path)
 
-    android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: SUPPORTED_LOCALES.map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]})
+    android_create_xml_release_notes(download_path: download_path, build_number: "#{options[:build_number]}", locales: RELEASE_NOTES_LOCALES)
     sh("git add #{download_path} && git commit -m \"Update metadata translations for #{options[:version]}\" && git push origin HEAD")
   end
 
@@ -459,6 +531,16 @@ ENV["validate_translations"]="lintVanillaRelease"
     {library: "Stories Creator", strings_path: "./libs/stories-android/stories/src/main/res/values/strings.xml", exclusions: []}
   ]
 
+  binary_imported_libraries = [
+    {
+      name: "Gutenberg Native",
+      import_key: "gutenbergMobileVersion",
+      repository: "wordpress-mobile/gutenberg-mobile",
+      strings_file_path: "bundle/android/strings.xml",
+      github_release_prefix: ""
+    },
+  ]
+
   private_lane :send_strings_for_translation do | options |
     sh("cd .. && mkdir -p #{update_strings_path} && cp #{main_strings_path} #{update_strings_path} && git add #{update_strings_path}strings.xml")
     sh("git diff-index --quiet HEAD || git commit -m \"Send strings to translation.\"")
@@ -484,15 +566,29 @@ ENV["validate_translations"]="lintVanillaRelease"
     end
   end
 
-  desc "Import Gutenberg strings"
-  lane :localize_gutenberg do | options |
-    unless options[:skip_module_update] then
-      sh("git submodule init")
-      sh("git submodule update")
+  desc "Import strings from binary dependencies"
+  lane :localize_binary_deps do | options |
+    merge_strings_tool_file_path = File.join(ENV["PROJECT_ROOT_FOLDER"], 'tools', 'merge_strings_xml.py')
+    binary_imported_libraries.each do  | lib |
+      download_path = android_download_file_by_version(
+        library_name: lib[:name],
+        import_key: lib[:import_key],
+        repository: lib[:repository],
+        file_path: lib[:strings_file_path],
+        github_release_prefix: lib[:github_release_prefix])
+
+      if download_path.nil?
+        error_message = "Can't download strings file for #{lib[:name]}.\r\n"
+        error_message += "Strings for this library won't get translated.\r\n"
+        error_message += "Do you want to continue anyway?"
+        UI.user_error! "Abort." unless UI.confirm(error_message)
+      else
+        UI.message("Strings.xml file for #{lib[:name]} downloaded to #{download_path}.")
+        sh(merge_strings_tool_file_path, lib[:name], download_path)
+        File.delete(download_path) if File.exist?(download_path)
+      end
     end
 
-    sh("cd .. && python ./tools/merge_strings_xml.py")
-
     is_repo_clean = ("git status --porcelain").empty?
     unless is_repo_clean then
       commit_strings(options)
@@ -516,7 +612,7 @@ ENV["validate_translations"]="lintVanillaRelease"
 ########################################################################
   desc "Get a list of pull request from `start_tag` to the current state"
   lane :get_pullrequests_list do | options |
-    get_prs_list(repository:GHHELPER_REPO, start_tag:"#{options[:start_tag]}", report_path:"#{File.expand_path('~')}/wpandroid_prs_list.txt")
+    get_prs_list(repository:GHHELPER_REPO, milestone:"#{options[:milestone]}", report_path:"#{File.expand_path('~')}/wpandroid_prs_list.txt")
   end
 
   #####################################################################################
@@ -533,74 +629,55 @@ ENV["validate_translations"]="lintVanillaRelease"
     version=options[:version]
     name="wpandroid-#{version["name"]}.aab"
     apk_name=universal_apk_name(version)
-    aab_file="org.wordpress.android-#{options[:flavor]}-#{options[:buildType]}.aab"
+    aab_file="org.wordpress.android-#{options[:app]}-#{options[:flavor]}-#{options[:buildType]}.aab".downcase
     output_dir="WordPress/build/outputs/bundle/"
     build_dir="build/"
     logfile_path="#{build_dir}build.log"
 
     # Intermediate Variables
-    bundle_path = "#{output_dir}#{options[:flavor]}Release/#{aab_file}"
+    bundle_path = "#{output_dir}#{options[:app]}#{options[:flavor]}Release/#{aab_file}"
 
     # Build
     Dir.chdir("..") do
       sh("mkdir -p #{build_dir}")
-      unless is_ci
-        # We pre-build the Gutenberg RN bundle on a different job on CI,  
-        # so cleaning here breaks the build 
-        UI.message("Cleaning branch...")
-        sh("echo \"Cleaning branch\" >> #{logfile_path}")
-        sh("./gradlew clean >> #{logfile_path} 2>&1")
-      end 
+
+      UI.message("Cleaning branch...")
+      sh("echo \"Cleaning branch\" >> #{logfile_path}")
+      sh("./gradlew clean >> #{logfile_path} 2>&1")
+
       sh("mkdir -p #{build_dir}")
       UI.message("Running lint...")
       sh("echo \"Running lint...\" >> #{logfile_path}")
-      sh("./gradlew lint#{options[:flavor]}Release >> #{logfile_path} 2>&1") unless is_ci
+      sh("./gradlew lint#{options[:app]}#{options[:flavor]}Release >> #{logfile_path} 2>&1") unless is_ci
       UI.message("Building #{version["name"]} / #{version["code"]} - #{aab_file}...")
       sh("echo \"Building #{version["name"]} / #{version["code"]} - #{aab_file}...\" >> #{logfile_path}")
-      sh("./gradlew bundle#{options[:flavor]}Release >> #{logfile_path} 2>&1")
+      sh("./gradlew bundle#{options[:app]}#{options[:flavor]}Release >> #{logfile_path} 2>&1")
 
       UI.crash!("Unable to find a bundle at #{bundle_path}") unless File.file?(bundle_path)
 
       sh("cp -v #{bundle_path} #{build_dir}#{name} | tee -a #{logfile_path}")
       UI.message("Bundle ready: #{name}")
       sh("echo \"Bundle ready: #{name}\" >> #{logfile_path}")
-      extract_universal_apk(bundle_path:"#{build_dir}#{name}", apk_path:"#{build_dir}#{apk_name}")
     end
     "#{build_dir}#{name}"
   end
 
   #####################################################################################
-  # gutenberg_dep_check
+  # download_translations
   # -----------------------------------------------------------------------------------
-  # Verifies that Gutenberg is on the last released version
+  # This lane download the string translations from GlotPress
   # -----------------------------------------------------------------------------------
   # Usage:
-  # bundle exec fastlane gutenberg_dep_check
-  #####################################################################################
-  desc "Verifies that Gutenberg is on the last released version"
-  lane :gutenberg_dep_check do | options |
-    # Pull the latest develop
-    sh("git checkout develop")
-    sh("git pull")
-    sh("git submodule init")
-    sh("git submodule update")
-
-    Dir.chdir("../libs/gutenberg-mobile") do
-      sh("git fetch --tags")
-      last_tag_hash = sh("git rev-list --tags --max-count\=1")
-      submodule_hash = sh("git rev-parse HEAD")
-
-      if (last_tag_hash != submodule_hash)
-        error_message = "Gutenberg submodule hash is not on the last tag!\nSubmodule hash: #{submodule_hash}\nLast tag hash: #{last_tag_hash}"
-        UI.user_error!(error_message) unless UI.interactive?
-
-        if (!UI.confirm("#{error_message}\nDo you want to continue anyway?"))
-          UI.user_error!("Aborted by user request. Please fix Gutenberg reference and try again.")
-        end
-      else
-        UI.message("Gutenberg is on the last tag: #{last_tag_hash}.")
-      end
-    end
+  # bundle exec fastlane download_translations
+  #####################################################################################
+  lane :download_translations do |options|
+    # Adapt the GP project URL and lint_task as needed if testing a project other than WordPress
+    android_download_translations(
+      res_dir: File.join(ENV['PROJECT_NAME'], 'src', 'main', 'res'),
+      glotpress_url: 'https://translate.wordpress.org/projects/apps/android/dev/',
+      locales: ALL_LOCALES,
+      lint_task: 'lintWordpressVanillaRelease'
+    )
   end
 
   #####################################################################################
@@ -613,19 +690,25 @@ ENV["validate_translations"]="lintVanillaRelease"
   #####################################################################################
   desc "Builds an app bundle"
   lane :build_for_translation_review do | options |
+
+    translator_locales = %w[de es fr id it ja ko nl ru sv zh-cn zh-tw tr he pt ar pl th sr vi]
+    translator_locales_map = ALL_LOCALES.select { translator_locales.include?(h[:glotpress]) }
+
+    android_download_translations(
+      glotpress_url: 'https://translate.wordpress.com/projects/wporg/apps/android',
+      status_filter: ['current', 'waiting', 'fuzzy'],
+      locales: translator_locales_map,
+      lint_task: nil, skip_commit: true
+    )
+
     cmd_params = ""
     unless options[:custom_version].nil?
-      UI.message("Building custom version: #{options[:custom_version]}") 
+      UI.message("Building custom version: #{options[:custom_version]}")
       cmd_params=" -PversionName=\"#{options[:custom_version]}\""
     end
 
-    sh("../tools/update-translations.sh review")
-    sh("../tools/update-translations.sh review waiting")
-    sh("../tools/update-translations.sh review fuzzy")
-
-    android_merge_translators_strings(strings_folder:"./WordPress/src/main/res/")
     sh("export SUPPRESS_GUTENBERG_MOBILE_JS_BUNDLE_BUILD=1 && cd .. && ./gradlew --stacktrace assembleJalapenoRelease #{cmd_params}")
-  end 
+  end
 
   #####################################################################################
   # trigger_ci
@@ -681,49 +764,25 @@ ENV["validate_translations"]="lintVanillaRelease"
     end
   end
 
-  private_lane :extract_universal_apk do | options |
-    bundle_path=options[:bundle_path]
-    apk_path=options[:apk_path]
-    temp_dir = Dir.mktmpdir()
-
-    command = ""
-    if is_ci 
-      command << "bundletool build-apks --bundle=\"#{bundle_path}\" \\
-      --output=\"#{temp_dir}/universal.apks\" \\
-      --mode=universal"
-    else
-      command = "source ./tools/gradle-functions.sh"
-      command << "&& bundletool build-apks --bundle=\"#{bundle_path}\" \\
-      --output=\"#{temp_dir}/universal.apks\" \\
-      --mode=universal \\
-      --ks=\"$(get_gradle_property gradle.properties storeFile)\" \\
-      --ks-pass=\"pass:$(get_gradle_property gradle.properties storePassword)\" \\
-      --ks-key-alias=\"$(get_gradle_property gradle.properties keyAlias)\" \\
-      --key-pass=\"pass:$(get_gradle_property gradle.properties keyPassword)\""
-    end
-    sh(command)
-
-    sh("unzip \"#{temp_dir}/universal.apks\" -d \"#{temp_dir}\"")
-    FileUtils.cp_r("#{temp_dir}/universal.apk", "#{apk_path}", remove_destination: true)
-    FileUtils.rm_rf("#{temp_dir}")
-  end
-
   private_lane :create_gh_release do | options |
     set_prerelease_flag = options[:prerelease].nil? ? false : options[:prerelease]
     version = options[:version]
     apk_file_path = universal_apk_file_path(version)
     aab_file_path = bundle_file_path(version)
-    create_release(repository:GHHELPER_REPO, 
-      version: version["name"], 
+    # APKs built on CI are unsigned, so don't upload them until we have a fix
+    release_assets = [aab_file_path]
+    release_assets.append(apk_file_path) unless is_ci
+    create_release(repository:GHHELPER_REPO,
+      version: version["name"],
       release_notes_file_path:release_notes_path,
       prerelease: set_prerelease_flag,
-      release_assets:"#{apk_file_path},#{aab_file_path}"
+      release_assets: release_assets.join(',')
     )
   end
 
   private_lane :cleanup_release_files do | options |
     files = options[:files]
-    
+
     files.each do | f |
       File.open(f, "w") {}
       sh("git add #{f}")
@@ -742,7 +801,7 @@ ENV["validate_translations"]="lintVanillaRelease"
   def release_note_short_path
     project_root = File.dirname(File.expand_path(File.dirname(__FILE__)))
     File.join(project_root, "WordPress", "metadata/release_notes_short.txt")
-  end 
+  end
 
   def universal_apk_name(version)
     "wpandroid-#{version["name"]}-universal.apk"
diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile
index b817d9d5f3e9..77c9cadf1d50 100644
--- a/fastlane/Pluginfile
+++ b/fastlane/Pluginfile
@@ -6,5 +6,5 @@ group :screenshots, optional: true do
   gem 'rmagick', '~> 4.1'
 end
 
-gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', tag: '0.10.0'
+gem 'fastlane-plugin-wpmreleasetoolkit', git: 'https://github.com/wordpress-mobile/release-toolkit', tag: '0.18.0'
 
diff --git a/fastlane/ScreenshotFastfile b/fastlane/ScreenshotFastfile
index 6409c4dcd40d..ab7851702624 100644
--- a/fastlane/ScreenshotFastfile
+++ b/fastlane/ScreenshotFastfile
@@ -41,7 +41,7 @@ platform :android do
   #####################################################################################
   desc "Build and capture screenshots"
   lane :screenshots do |options|
-    gradle(task: "assembleVanillaDebug assembleVanillaDebugAndroidTest")
+    gradle(task: "assembleWordPressVanillaDebug assembleWordPressVanillaDebugAndroidTest")
     take_screenshots(options)
   end
 
@@ -50,6 +50,9 @@ platform :android do
 
   	rebuild_screenshot_devices
 
+    # If you update this, be sure to also update the `rebuild_screenshot_devices` lane down below as well as the corresponding `fastlane/emulators/*.ini` config files.
+    # You might also want to mirror the changes of emulators used here with the ones used on Firebase Test Lab (when running on CI via `trigger_screenshots` lane),
+    # by updating the 2 places in the `raw-screenshots` job of `.circleci/config.yml` mentioning the devices used by FTL for screenshots
     screenshot_devices = [
       {
         screenshot_type: 'phone',
@@ -76,9 +79,10 @@ platform :android do
       should_clear_previous_screenshots = false
     end
 
-    locales = SUPPORTED_LOCALES
+    locales = ALL_LOCALES
       .select { |hsh| hsh[:promo_config] != false }
       .map { |hsh| hsh[:google_play] }
+      .compact
 
     # Allow creating screenshots for just one locale
     if options[:locale] != nil
@@ -94,8 +98,8 @@ platform :android do
 
     screenshot_options = {
       output_directory: RAW_SCREENSHOTS_DIR,
-      app_apk_path: "WordPress/build/outputs/apk/vanilla/debug/org.wordpress.android-vanilla-debug.apk",
-      tests_apk_path: "WordPress/build/outputs/apk/androidTest/vanilla/debug/org.wordpress.android-vanilla-debug-androidTest.apk",
+      app_apk_path: "WordPress/build/outputs/apk/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug.apk",
+      tests_apk_path: "WordPress/build/outputs/apk/androidTest/wordpressVanilla/debug/org.wordpress.android-wordpress-vanilla-debug-androidTest.apk",
       use_tests_in_classes: "org.wordpress.android.ui.screenshots.WPScreenshotTest",
       reinstall_app: false,
       clear_previous_screenshots: should_clear_previous_screenshots,
@@ -121,11 +125,13 @@ platform :android do
   desc "Downloads translated promo strings from the translation system"
   lane :download_promo_strings do |options|
     files = {
-      "play_store_screenshot_1" => {desc: "play_store_screenshot_2.txt"},
-      "play_store_screenshot_2" => {desc: "play_store_screenshot_1.txt"},
+      "play_store_screenshot_1" => {desc: "play_store_screenshot_1.txt"},
+      "play_store_screenshot_2" => {desc: "play_store_screenshot_2.txt"},
       "play_store_screenshot_3" => {desc: "play_store_screenshot_3.txt"},
-      "play_store_screenshot_4" => {desc: "play_store_screenshot_5.txt"},
-      "play_store_screenshot_5" => {desc: "play_store_screenshot_4.txt"},
+      "play_store_screenshot_4" => {desc: "play_store_screenshot_4.txt"},
+      "play_store_screenshot_5" => {desc: "play_store_screenshot_5.txt"},
+      "play_store_screenshot_6" => {desc: "play_store_screenshot_6.txt"},
+      "play_store_screenshot_7" => {desc: "play_store_screenshot_7.txt"},
 
       "enhanced_app_store_screenshot_1" => {desc: "play_store_screenshot_1.html"},
       "enhanced_app_store_screenshot_2" => {desc: "play_store_screenshot_2.html"},
@@ -136,7 +142,7 @@ platform :android do
       "enhanced_app_store_screenshot_7" => {desc: "play_store_screenshot_7.html"},
     }
 
-    locales = SUPPORTED_LOCALES
+    locales = ALL_LOCALES
       .select { |hsh| hsh[:promo_config] != false }
       .map {| hsh | [ hsh[:glotpress], hsh[:google_play] ]}
 
@@ -232,7 +238,7 @@ platform :android do
 
     # Clean temporary folder from previous runs
     FileUtils.rm_rf(PROMO_SCREENSHOTS_PROCESSING_DIR)
-    
+
     # Create a copy of the files to work with – this ensures that if we're doing multiple
     # screenshot generation tasks close together, we can keep reusing the same source files
     FileUtils.rm_rf(RAW_SCREENSHOTS_PROCESSING_DIR)
@@ -261,7 +267,7 @@ platform :android do
       File.rename( entry, newfilename.downcase )
     end
 
-    locales = SUPPORTED_LOCALES
+    locales = ALL_LOCALES
       .select { |hsh| hsh[:promo_config] != false }
       .map { |hsh| hsh[:google_play] }
 
diff --git a/fastlane/env.example b/fastlane/env.example
deleted file mode 100644
index f9b166b5cfd1..000000000000
--- a/fastlane/env.example
+++ /dev/null
@@ -1 +0,0 @@
-GHHELPER_ACCESS=<GitHub access token>
diff --git a/fastlane/env/user.env-example b/fastlane/env/user.env-example
new file mode 100644
index 000000000000..36baf27c7b4f
--- /dev/null
+++ b/fastlane/env/user.env-example
@@ -0,0 +1,3 @@
+GHHELPER_ACCESS=<GitHub access token>
+PLAYSTORE_SERVICE_API_KEY=<Path to the JSON file with the API Key>
+CIRCLE_CI_AUTH_TOKEN=<CircleCI Auth Token>
diff --git a/fastlane/helpers/android_git_helper.rb b/fastlane/helpers/android_git_helper.rb
deleted file mode 100644
index ebd14319e17d..000000000000
--- a/fastlane/helpers/android_git_helper.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-module Fastlane
-  module Helpers
-    module AndroidGitHelper
-     
-      def self.git_checkout_and_pull(branch)
-        Action.sh("git checkout #{branch}")
-        Action.sh("git pull")
-      end
-      
-      def self.get_create_codefreeze_branch(branch)
-        Action.sh("git checkout develop")
-        Action.sh("git pull")
-        Action.sh("git checkout -b #{branch}")
-        commit_release_notes_for_code_freeze
-        Action.sh("git push --set-upstream origin #{branch}")
-      end
-
-      def self.commit_release_notes_for_code_freeze
-        Action.sh("cp RELEASE-NOTES.txt WordPress/metadata/release_notes.txt")
-        Action.sh("echo > RELEASE-NOTES.txt")
-        Action.sh("git add RELEASE-NOTES.txt WordPress/metadata/release_notes.txt")
-        Action.sh("git commit -m \"Update release notes for code freeze\"")
-      end
-
-      def self.update_metadata()
-        Action.sh("./tools/update-translations.sh")
-        Action.sh("./gradlew build")
-        Action.sh("git add ./WordPress/src/main/res")
-        Action.sh("git commit -m \"Updates translations\"")
-
-        Action.sh("git push")
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/fastlane/helpers/android_version_helper.rb b/fastlane/helpers/android_version_helper.rb
deleted file mode 100644
index 6e636438960e..000000000000
--- a/fastlane/helpers/android_version_helper.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-module Fastlane
-  module Helpers
-    module AndroidVersionHelper
-      MAJOR_NUMBER = 0
-      MINOR_NUMBER = 1
-      HOTFIX_NUMBER = 2
-      ALPHA_PREFIX = "alpha-"
-      RC_SUFFIX = "-rc"
-
-      def self.get_version_name
-        get_version_name_from_file("./WordPress/build.gradle")
-      end
-
-      def self.get_build_version_code
-        get_version_build_from_file("./WordPress/build.gradle")
-      end
-
-      def self.is_alpha_version(version)
-        version.start_with?(ALPHA_PREFIX)
-      end
-
-      def self.is_beta_version(version)
-        version.include?(RC_SUFFIX)
-      end
-
-      def self.calc_next_alpha_version_name(version)
-        alpha_number = version.sub(ALPHA_PREFIX, '')
-        "#{ALPHA_PREFIX}#{alpha_number.to_i() + 1}"
-      end
-
-      def self.calc_prev_release_version(version)
-        vp = get_version_parts(version)
-        if (vp[MINOR_NUMBER] == 0)
-          vp[MAJOR_NUMBER] -= 1
-          vp[MINOR_NUMBER] = 9
-        else
-          vp[MINOR_NUMBER] -= 1
-        end
-        
-         "#{vp[MAJOR_NUMBER]}.#{vp[MINOR_NUMBER]}"
-      end
-
-      def self.is_hotfix(version)
-        return false if is_alpha_version(version)
-        vp = get_version_parts(version)
-        return (vp.length > 2) && (vp[HOTFIX_NUMBER] != 0)
-      end
-
-      # private 
-
-      def self.get_version_parts(version)
-        version.split(".").fill("0", version.length...2).map{|chr| chr.to_i}
-      end
-
-      def self.get_version_name_from_file(file_path)
-        Action.sh("cat #{file_path} | grep versionName").split(' ')[1].tr('\"', '')
-      end
-
-      def self.get_version_build_from_file(file_path)
-        Action.sh("cat #{file_path} | grep versionCode").split(' ')[1]
-      end
-    end
-  end
-end
\ No newline at end of file
diff --git a/fastlane/metadata/android/ar/changelogs/1044.txt b/fastlane/metadata/android/ar/changelogs/1044.txt
new file mode 100644
index 000000000000..1d50f2dd7cc5
--- /dev/null
+++ b/fastlane/metadata/android/ar/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+ما الجديد؟
+
+باستخدام مكوِّن البحث الجديد، يمكنك إضافة وظيفة البحث إلى أي مقالة أو صفحة. يمكنك الآن إضافة شعار "مميز" في مكوِّن الصورة. قمنا كذلك بتبسيط السير لإدراج وسائط عند استخدام مكوِّنات الوسائط المتعددة الشائعة لدينا.
+
+تشمل التحسينات الأخرى المزيد من معلومات المستخدم حول إعجاباتك، بالإضافة إلى شاشة تعليقات محدَّثة.
diff --git a/fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
index da39daaf650b..6ce1e6f0b38f 100644
--- a/fastlane/metadata/android/ar/full_description.txt
+++ b/fastlane/metadata/android/ar/full_description.txt
@@ -1,8 +1,8 @@
-يضع تطبيق وردبرس لنظام التشغيل Android قوة النشر على الويب في متناولك. إنَّه مُنشئ موقع على الويب وأكثر من ذلك بكثير!
+يضع تطبيق ووردبريس لنظام التشغيل Android قوة النشر على الويب في متناولك. إنَّه مُنشئ موقع على الويب وأكثر من ذلك بكثير!
 
 إنشاء
-- اجعل لأفكارك الكبيرة مكانًا على الويب. تطبيق وردبرس لنظام التشغيل Android عبارة عن مُنشئ موقع على الويب وصانع مدونة. استخدمه لإنشاء موقعك على الويب.
-- اختر الشكل والمظهر المناسبين من مجموعة واسعة من قوالب وردبرس، ثم خصصه بالصور والألوان والخطوط، لذا سيكون فريدًا بالنسبة إليك.
+- اجعل لأفكارك الكبيرة مكانًا على الويب. تطبيق ووردبريس لنظام التشغيل Android عبارة عن مُنشئ موقع على الويب وصانع مدونة. استخدمه لإنشاء موقعك على الويب.
+- اختر الشكل والمظهر المناسبين من مجموعة واسعة من قوالب ووردبريس، ثم خصصه بالصور والألوان والخطوط، لذا سيكون فريدًا بالنسبة إليك.
 - ترشدك نصائح البدء السريع المدمجة إلى أساسيات الإعداد لإعداد موقعك الجديد على الويب لتحقيق النجاح. (نحن لسنا مجرد منشئ مواقع على الويب -- نحن شريكك وفريق الهتاف لك!) 
 
 إحصاءات
@@ -28,18 +28,18 @@
 - يمكنك إعداد المشاركة التلقائية لإخبار متابعيك على شبكات التواصل الاجتماعي بموعد نشر إحدى المقالات الجديدة. انشر مقالتك تلقائيًّا على فيسبوك وتويتر والمزيد.
 - أضف أزرار المشاركة عبر وسائل التواصل الاجتماعي إلى مقالاتك بحيث يتمكن زائروك من مشاركتها من خلال شبكتهم، واسمح لمحبيك بأن يصبحوا بمثابة سفراء لك.
 
-لماذا وردبرس؟
+لماذا ووردبريس؟
 
-توجد العديد من خدمات التدوين ومنشئات مواقع الويب والشبكات الاجتماعية هناك. لماذا تنشئ موقعك على الويب من خلال وردبرس؟
+توجد العديد من خدمات التدوين ومنشئات مواقع الويب والشبكات الاجتماعية هناك. لماذا تنشئ موقعك على الويب من خلال ووردبريس؟
 
-يشغل وردبرس ما يزيد عن ثلث الويب. يُستخدم بواسطة المدونات المهتمة بهواية معيَّنة، والشركات من جميع الأحجام، والمتاجر على الإنترنت، وحتى أكبر المواقع الإخبارية على الإنترنت. تتمثَّل الاحتمالات في أنَّ العديد من مواقع الويب المفضَّلة لديك تعمل على وردبرس.
+يشغل ووردبريس ما يزيد عن ثلث الويب. يُستخدم بواسطة المدونات المهتمة بهواية معيَّنة، والشركات من جميع الأحجام، والمتاجر على الإنترنت، وحتى أكبر المواقع الإخبارية على الإنترنت. تتمثَّل الاحتمالات في أنَّ العديد من مواقع الويب المفضَّلة لديك تعمل على ووردبريس.
 
-بفضل وردبرس، تمتلك محتواك الخاص.  تُعاملك شبكات التواصل الأخرى كسلعة، وتتولى ملكية المحتوى الذي تنشره. ولكن بفضل وردبرس، يكون أي شيء تنشره ملكك، ويمكنك أخذه معك في أي مكان ترغب فيه.
+بفضل ووردبريس، تمتلك محتواك الخاص.  تُعاملك شبكات التواصل الأخرى كسلعة، وتتولى ملكية المحتوى الذي تنشره. ولكن بفضل ووردبريس، يكون أي شيء تنشره ملكك، ويمكنك أخذه معك في أي مكان ترغب فيه.
 
-وردبرس عبارة عن منشئ موقع ويب مفتوح المصدر، ما يعني أنه يمكن لأي شخص رؤية كيفية إنشائه والمساهمة فيه كذلك.  تكون الخدمات والشبكات الاجتماعية الأخرى محفوظة بحقوق ملكية وهي أنظمة مغلقة؛ ولا يمكنك التأكُّد تمامًا من كيفية عملها أو ما تقوم به -- ويمكنها الاختفاء!
+ووردبريس عبارة عن منشئ موقع ويب مفتوح المصدر، ما يعني أنه يمكن لأي شخص رؤية كيفية إنشائه والمساهمة فيه كذلك.  تكون الخدمات والشبكات الاجتماعية الأخرى محفوظة بحقوق ملكية وهي أنظمة مغلقة؛ ولا يمكنك التأكُّد تمامًا من كيفية عملها أو ما تقوم به -- ويمكنها الاختفاء!
 
-سواء أكنتَ تحتاج إلى منشئ موقع ويب لإنشاء موقعك على الويب أو مصمم مدوّنة بسيط، فيمكن لوردبرس تقديم المساعدة. يمنحك وردبرس تصميمات جميلة وميزات فعّالة وحرية إنشاء أي شيء تريده.
+سواء أكنتَ تحتاج إلى منشئ موقع ويب لإنشاء موقعك على الويب أو مصمم مدوّنة بسيط، فيمكن لووردبريس تقديم المساعدة. يمنحك ووردبريس تصميمات جميلة وميزات فعّالة وحرية إنشاء أي شيء تريده.
 
-يدعم تطبيق وردبرس لنظام التشغيل Android المواقع المستضافة ذاتيًّا، والذي يعمل بإصدار وردبرس 4.0 أو إصدارات أحدث، وجميع المواقع في وردبرس.كوم. مثلما هو الحال في وردبرس، يكون تطبيق وردبرس لنظام التشغيل Android مفتوح المصدر. اعرف المزيد على https://wp.me/P7jrAc-tJ.  هل تحتاج مساعدة في التعامل مع التطبيق؟ أرسل إلينا تغريدة على ‎@WPAndroid، أو تفضَّل بزيارة منتدياتنا على https://android.forums.wordpress.org/forum/troubleshooting.
+يدعم تطبيق ووردبريس لنظام التشغيل Android المواقع المستضافة ذاتيًّا، والتي تعمل بإصدار ووردبريس 4.0 أو إصدارات أحدث، وجميع المواقع في WordPress.com. كما هو الحال في ووردبريس، يكون تطبيق ووردبريس لنظام التشغيل Android مفتوح المصدر. اعرف المزيد على https://wp.me/P7jrAc-tJ.  هل تحتاج مساعدة في التعامل مع التطبيق؟ أرسل إلينا تغريدة على ‎@WPAndroid، أو تفضَّل بزيارة منتدياتنا على https://android.forums.wordpress.org/forum/troubleshooting.
 
 إشعار خصوصية المستخدمين في كاليفورنيا: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa.
diff --git a/fastlane/metadata/android/ar/short_description.txt b/fastlane/metadata/android/ar/short_description.txt
index 29f3207f03c9..a35662b91d07 100644
--- a/fastlane/metadata/android/ar/short_description.txt
+++ b/fastlane/metadata/android/ar/short_description.txt
@@ -1 +1 @@
-أنشئ موقعك على الويب ومدونتك بسهولة. أنشئ مقالات وتعقَّب التحليلات من أي مكان!
+إنشاء موقعك على الويب ومدوّنتك بسهولة. أنشئ مقالات وتتبّع التحليلات من أي مكان!
diff --git a/fastlane/metadata/android/de-DE/changelogs/1044.txt b/fastlane/metadata/android/de-DE/changelogs/1044.txt
new file mode 100644
index 000000000000..a9b9498803fb
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Was gibt's Neues?
+
+Mit dem neuen Suchblock kannst du jedem Beitrag und beliebigen Seiten eine Suchfunktion hinzufügen. Im Bildblock kannst du ab sofort ein Banner mit Empfehlungen hinzufügen. Außerdem haben wir den Flow zum Einfügen von Medien über unsere beliebten Multimedia-Blöcken erleichtert.
+
+Weitere Verbesserungen umfassen unter anderem mehr Benutzerdaten zu deinen Likes sowie einen aktualisierten Look der Kommentare.
diff --git a/fastlane/metadata/android/en-US/changelogs/1044.txt b/fastlane/metadata/android/en-US/changelogs/1044.txt
new file mode 100644
index 000000000000..c82a5996c24a
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+What’s new?
+
+With the new Search block, you can add a search function to any post or page. In the Image block, you can now add a “featured” banner. We’ve also simplified the flow for inserting media when using our popular multimedia blocks.
+
+Other improvements include more user information about your Likes, as well as an updated Comments screen.
diff --git a/fastlane/metadata/android/en-US/changelogs/946.txt b/fastlane/metadata/android/en-US/changelogs/946.txt
deleted file mode 100644
index a49faf190a6e..000000000000
--- a/fastlane/metadata/android/en-US/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-Block editor updates: There’s now full-width and wide alignment support for the Video, Gallery, and more blocks. We fixed an issue affecting the Classic block on Jetpack sites and resolved an issue involving unsupported blocks on rotated devices.
-
-Reader updates: Enjoy a cleaner reading experience and beautiful images in the redesigned Reader. You can access it even if you don’t follow any topics.
diff --git a/fastlane/metadata/android/es-ES/changelogs/1044.txt b/fastlane/metadata/android/es-ES/changelogs/1044.txt
new file mode 100644
index 000000000000..23c975d724af
--- /dev/null
+++ b/fastlane/metadata/android/es-ES/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Novedades
+
+Con el nuevo bloque de búsqueda, puedes añadir una función de búsqueda en cualquier entrada o página. En el bloque de imagen, ahora puedes añadir un banner destacado. También hemos simplificado los pasos para insertar elementos multimedia con nuestros bloques multimedia populares.
+
+Se han hecho otras mejoras, como incluir más información del usuario sobre tus Me gusta, o una pantalla de comentarios actualizada.
diff --git a/fastlane/metadata/android/es-ES/changelogs/946.txt b/fastlane/metadata/android/es-ES/changelogs/946.txt
deleted file mode 100644
index bf34360ca332..000000000000
--- a/fastlane/metadata/android/es-ES/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-Actualizaciones en el editor de bloques: Ahora es compatible con la alineación ancha y completa en los bloques de vídeo, galería y más. Hemos corregido un problema que afectaba al bloque clásico en los sitios Jetpack y resuelto un problema relacionado con blloques no compatibles en dispositivos rotados.
-
-Actualizaciones en el lector: Disfruta de una experiencia de lectura más limpia y de bonitas imágenes en el rediseñado lector. Puede acceder aunque no sigas ningún tema.
diff --git a/fastlane/metadata/android/fr-CA/changelogs/1044.txt b/fastlane/metadata/android/fr-CA/changelogs/1044.txt
new file mode 100644
index 000000000000..9ef888cfa9ee
--- /dev/null
+++ b/fastlane/metadata/android/fr-CA/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3 :
+Nouveautés
+
+Le nouveau bloc Recherche vous permet d’ajouter une fonction de recherche à un article ou une page. Dans le bloc Image, vous pouvez désormais ajouter une bannière « en une ». Nous avons également simplifié le flux d’insertion des médias lors de l’utilisation de nos blocs multimédias populaires.
+
+Les autres améliorations incluent davantage d’informations sur vos mentions J’aime, ainsi qu’un écran de commentaires mis à jour.
diff --git a/fastlane/metadata/android/fr-CA/video.txt b/fastlane/metadata/android/fr-CA/video.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/fastlane/metadata/android/fr-FR/changelogs/1044.txt b/fastlane/metadata/android/fr-FR/changelogs/1044.txt
new file mode 100644
index 000000000000..9ef888cfa9ee
--- /dev/null
+++ b/fastlane/metadata/android/fr-FR/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3 :
+Nouveautés
+
+Le nouveau bloc Recherche vous permet d’ajouter une fonction de recherche à un article ou une page. Dans le bloc Image, vous pouvez désormais ajouter une bannière « en une ». Nous avons également simplifié le flux d’insertion des médias lors de l’utilisation de nos blocs multimédias populaires.
+
+Les autres améliorations incluent davantage d’informations sur vos mentions J’aime, ainsi qu’un écran de commentaires mis à jour.
diff --git a/fastlane/metadata/android/id/changelogs/1044.txt b/fastlane/metadata/android/id/changelogs/1044.txt
new file mode 100644
index 000000000000..df2ea2280668
--- /dev/null
+++ b/fastlane/metadata/android/id/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Apa yang baru?
+
+Dengan blok Pencarian yang baru, Anda dapat menambahkan fungsi pencarian ke pos atau halaman mana pun. Di blok Gambar, sekarang Anda dapat menambahkan banner "unggulan". Kami juga telah menyederhanakan alur untuk menyisipkan media saat menggunakan blok multimedia populer.
+
+Peningkatan lainnya mencakup lebih banyak informasi pengguna tentang Sukai, serta pembaruan layar Komentar.
diff --git a/fastlane/metadata/android/in/full_description.txt b/fastlane/metadata/android/id/full_description.txt
similarity index 100%
rename from fastlane/metadata/android/in/full_description.txt
rename to fastlane/metadata/android/id/full_description.txt
diff --git a/fastlane/metadata/android/in/short_description.txt b/fastlane/metadata/android/id/short_description.txt
similarity index 100%
rename from fastlane/metadata/android/in/short_description.txt
rename to fastlane/metadata/android/id/short_description.txt
diff --git a/fastlane/metadata/android/in/title.txt b/fastlane/metadata/android/id/title.txt
similarity index 100%
rename from fastlane/metadata/android/in/title.txt
rename to fastlane/metadata/android/id/title.txt
diff --git a/fastlane/metadata/android/in/video.txt b/fastlane/metadata/android/in/video.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/fastlane/metadata/android/it-IT/changelogs/1044.txt b/fastlane/metadata/android/it-IT/changelogs/1044.txt
new file mode 100644
index 000000000000..24a1e537d857
--- /dev/null
+++ b/fastlane/metadata/android/it-IT/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Cosa c'è di nuovo?
+
+Con il nuovo blocco Cerca, puoi aggiungere una funzione di ricerca a qualsiasi articolo o pagina. Nel blocco Immagine, puoi ora aggiungere un banner "in evidenza". Abbiamo anche semplificato il flusso per l'inserimento di elementi multimediali durante l'uso dei blocchi multimediali popolari.
+
+Altri miglioramenti includono più informazioni per l'utente come i tuoi Mi piace e una schermata Commenti aggiornata.
diff --git a/fastlane/metadata/android/it-IT/changelogs/946.txt b/fastlane/metadata/android/it-IT/changelogs/946.txt
deleted file mode 100644
index c2433c9186c8..000000000000
--- a/fastlane/metadata/android/it-IT/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-Aggiornamenti editor a blocchi: ora è disponibile il supporto per l'allineamento Wide e Full width per i blocchi Video, Galleria e molti altri. Abbiamo corretto un problema che influenzava il blocco Classico sui siti Jetpack e abbiamo risolto un problema relativo a blocchi non supportati su dispositivi ruotati.
-
-Aggiornamenti Reader: Goditi un'esperienza di lettura più pulita e con immagini più belle nel Reader riprogettato. Puoi accedervi anche se non segui altri argomenti.
diff --git a/fastlane/metadata/android/iw-IL/changelogs/1044.txt b/fastlane/metadata/android/iw-IL/changelogs/1044.txt
new file mode 100644
index 000000000000..247858f5cf30
--- /dev/null
+++ b/fastlane/metadata/android/iw-IL/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+מה חדש?
+
+עם בלוק החיפוש החדש, אפשר להוסיף פונקציה של חיפוש בכל פוסט או עמוד. בבלוק התמונה, ניתן להוסיף באנר 'מרכזי'. בנוסף, הגדרנו תהליך פשוט יותר להוספה של מדיה כאשר משתמשים בבלוקים הפופולריים שלנו למולטימדיה.
+
+שיפורים נוספים כוללים עוד פרטים למשתמש על הלייקים ומסך 'תגובות' מעודכן.
diff --git a/fastlane/metadata/android/iw-IL/changelogs/946.txt b/fastlane/metadata/android/iw-IL/changelogs/946.txt
deleted file mode 100644
index dae9023169d9..000000000000
--- a/fastlane/metadata/android/iw-IL/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-עדכונים לעורך הבלוקים: יש כעת תמיכה ביישור בפריסה רחבה וברוחב מלא עבור הבלוקים 'וידאו', 'גלריה' ועוד. תיקנו בעיה שהשפיעה על הבלוק הקלאסי באתרי Jetpack ופתרנו בעיה בנוגע לבלוקים שאינם נתמכים בעת סיבוב המכשיר.
-
-עדכונים ל-Reader: כעת אפשר ליהנות מחוויית קריאה נקייה יותר ומתמונות מרהיבות ב-Reader שעוצב מחדש. אפשר לגשת אליו גם אם לא עוקבים אחר נושאים.
diff --git a/fastlane/metadata/android/ja-JP/changelogs/1044.txt b/fastlane/metadata/android/ja-JP/changelogs/1044.txt
new file mode 100644
index 000000000000..602c0c138f3e
--- /dev/null
+++ b/fastlane/metadata/android/ja-JP/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+新着情報
+
+新しいブロック検索で、任意の投稿またはページに検索を追加できます。 画像ブロックで、「おすすめ」のバナーを追加できるようになりました。 また、よく利用されるマルチメディアブロックを使用する場合にメディアを挿入するフローも簡単になりました。
+
+その他の改善内容には、「いいね」のユーザー情報の詳細化、コメント画面の更新などがあります。
diff --git a/fastlane/metadata/android/ko-KR/changelogs/1044.txt b/fastlane/metadata/android/ko-KR/changelogs/1044.txt
new file mode 100644
index 000000000000..457b641ec32e
--- /dev/null
+++ b/fastlane/metadata/android/ko-KR/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+새로운 기능
+
+새로운 검색 블록으로 글 또는 페이지에 검색 기능을 추가할 수 있습니다. 이미지 블록에서 이제 "추천" 배너를 추가할 수 있습니다. 사용자가 많이 사용하는 멀티미디어 블록을 사용할 때 미디어를 삽입하는 절차도 간소화했습니다.
+
+기타 개선 사항에는 좋아요에 대한 추가 사용자 정보는 물론 업데이트된 댓글 화면도 포함됩니다.
diff --git a/fastlane/metadata/android/ko-KR/changelogs/946.txt b/fastlane/metadata/android/ko-KR/changelogs/946.txt
deleted file mode 100644
index 0e3aade7d317..000000000000
--- a/fastlane/metadata/android/ko-KR/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-블록 편집기 업데이트: 영상, 갤러리 등 많은 블록이 이제 가로 전체 확장과 와이드 정렬을 지원합니다. Jetpack 사이트에서 클래식 블록에서 발생하는 문제와 회전된 기기를 지원하지 않는 블록과 관련된 문제를 수정했습니다.
-
-리더 업데이트: 새롭게 디자인된 리더로 향상된 가독성 경험과 아름다운 이미지를 사용해보세요. 주제를 팔로우하지 않아도 사용할 수 있습니다.
diff --git a/fastlane/metadata/android/nl-NL/changelogs/1044.txt b/fastlane/metadata/android/nl-NL/changelogs/1044.txt
new file mode 100644
index 000000000000..64740ad3f062
--- /dev/null
+++ b/fastlane/metadata/android/nl-NL/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Wat is er nieuw?
+
+Met het nieuwe zoek blok, kan je een zoekfunctie toevoegen aan elk bericht of pagina. In het afbeeldingsblok kun je nu een "uitgelichte" banner toevoegen. We hebben ook de flow vereenvoudigd voor het invoegen van media bij het gebruik van onze populaire multimediablokken.
+
+Andere verbeteringen zijn meer gebruikersinformatie over je likes, evenals een geüpdatet reacties scherm.
diff --git a/fastlane/metadata/android/nl-NL/changelogs/946.txt b/fastlane/metadata/android/nl-NL/changelogs/946.txt
deleted file mode 100644
index 442babaa90ab..000000000000
--- a/fastlane/metadata/android/nl-NL/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-Updates voor blok-editor: er is nu ondersteuning voor uitlijning over de volledige breedte en breedte voor de video-, galerij- en meer blokken. We hebben een probleem met het klassieke blok op Jetpack sites opgelost en een probleem met niet-ondersteunde blokken op geroteerde apparaten opgelost.
-
-Reader updates: geniet van een betere leeservaring en prachtige afbeeldingen in de opnieuw ontworpen Reader. Je hebt er zelfs toegang toe als je geen onderwerpen volgt.
diff --git a/fastlane/metadata/android/nl-NL/full_description.txt b/fastlane/metadata/android/nl-NL/full_description.txt
index a17a3aba1cc8..884a58f4b858 100644
--- a/fastlane/metadata/android/nl-NL/full_description.txt
+++ b/fastlane/metadata/android/nl-NL/full_description.txt
@@ -1,17 +1,17 @@
-WordPress voor Android brengt de kracht van online publiceren binnen handbereik. Het is een websitemaker en nog zo veel meer!
+WordPress voor Android brengt de kracht van online publiceren binnen handbereik. Het is een sitemaker en nog zo veel meer!
 
 MAKEN
-- Geef je grote ideeën een plekje op het web. WordPress voor Android is een websitebouwer en een blogmaker. Gebruik het om je website te maken.
-- Kies de juiste look en feel uit een brede selectie WordPress-thema's en pas deze aan met foto's, kleuren en lettertypen in jouw unieke stijl.
-- Met de ingebouwde snelle tips loop je snel door de basisprincipes van de installatie en kun je gaan knallen met je nieuwe website. (We zijn niet alleen een websitemaker, maar jouw partner en grootste fan!)
+- Geef je grote ideeën een plekje op het web. WordPress voor Android is een sitebouwer en een blogmaker. Gebruik het om je site te maken.
+- Kies de juiste look en feel uit een brede selectie WordPress-thema's en pas deze aan met foto's, kleuren en lettertypen in je unieke stijl.
+- Met de ingebouwde snelle tips loop je snel door de basisprincipes van de installatie en kun je gaan knallen met je nieuwe site. (We zijn niet alleen een sitemaker, maar je partner en grootste fan!)
 
 STATISTIEKEN
-- Bekijk de statistieken van je website in real-time om de activiteit op je site te volgen.
+- Bekijk de statistieken van je site in real-time om de activiteit op je site te volgen.
 - Volg welke berichten en pagina's in de loop van de tijd het meeste verkeer krijgen door dagelijkse, wekelijkse, maandelijkse en jaarlijkse inzichten te analyseren.
 - Gebruik de verkeerskaart om te zien uit welke landen je bezoekers komen.
 
 MELDINGEN
-- Ontvang meldingen over opmerkingen, vind-ik-leuks en nieuwe volgers, zodat je kunt zien hoe mensen reageren op je website.
+- Ontvang meldingen over opmerkingen, vind-ik-leuks en nieuwe volgers, zodat je kunt zien hoe mensen reageren op je site.
 - Reageer op nieuwe commentaren zodra ze verschijnen om het gesprek vlot te laten verlopen en je lezers te erkennen.
 
 PUBLICEREN
@@ -30,14 +30,16 @@ DELEN
 
 Waarom WordPress?
 
-Er zijn talloze bloggingservices, websitebouwers en sociale netwerken. Waarom zou je je website maken met WordPress?
+Er zijn talloze bloggingservices, sitebouwers en sociale netwerken. Waarom zou je je site maken met WordPress?
 
-WordPress stuurt meer dan een derde van alle websites op het web aan. Het wordt gebruikt door hobbyblogs, bedrijven van elke omvang, webwinkels en zelfs de grootste nieuwssites. De kans is groot dat veel van jouw favoriete websites op WordPress draaien.
+WordPress stuurt meer dan een derde van alle sites op het web aan. Het wordt gebruikt door hobbyblogs, bedrijven van elke omvang, webwinkels en zelfs de grootste nieuwssites. De kans is groot dat veel van jouw favoriete sites op WordPress draaien.
 
-Met WordPress blijf je eigenaar van jouw inhoud. Op andere sociale netwerken word je als handelswaar behandeld en ben je niet de eigenaar van de inhoud van je berichten. Maar met WordPress zijn je publicaties helemaal van jou en kun je ze overal meenemen.
+Met WordPress blijf je eigenaar van je inhoud. Op andere sociale netwerken word je als handelswaar behandeld en ben je niet de eigenaar van de inhoud van je berichten. Maar met WordPress zijn je publicaties helemaal van jou en kun je ze overal meenemen.
 
-WordPress is een open source websitemaker, wat inhoudt dat iedereen kan zien hoe het is gemaakt en er zelfs aan kan bijdragen. Andere services en sociale netwerken zijn eigen, gesloten systemen. Je weet nooit zeker hoe ze precies werken of wat ze doen. En ze kunnen zomaar verdwijnen!
+WordPress is een open source sitemaker, wat inhoudt dat iedereen kan zien hoe het is gemaakt en er zelfs aan kan bijdragen. Andere services en sociale netwerken zijn eigen, gesloten systemen. Je weet nooit zeker hoe ze precies werken of wat ze doen. En ze kunnen zomaar verdwijnen!
 
-Of je nu een websitebouwer nodig hebt om je website te maken of een eenvoudige blogmaker, WordPress is het antwoord! Je krijgt mooie designs, krachtige functies en de vrijheid om alles te bouwen wat je maar wilt.
+Of je nu een sitebouwer nodig hebt om je site te maken of een eenvoudige blogmaker, WordPress is het antwoord! Je krijgt mooie designs, krachtige functies en de vrijheid om alles te bouwen wat je maar wilt.
 
-WordPress voor Android ondersteunt zelfgehoste sites met WordPress 4.0 en hoger en alle sites op WordPress.com. Net als WordPress is WordPress voor Android open source. Ga naar https://apps.wordpress.com/contribute/ voor meer informatie. Hulp nodig bij de app? Stuur ons een tweet op @WPAndroid of bezoek onze forums op https://android.forums.wordpress.org/forum/troubleshooting.
+WordPress voor Android ondersteunt zelfgehoste sites met WordPress 4.0 en hoger en alle sites op WordPress.com. Net als WordPress is WordPress voor Android open source. Lees meer op  https://wp.me/P7jrAc-tJ. Heb je hulp nodig met de app? Stuur een tweet naar @WPAndroid, of bezoek onze forums op https://android.forums.wordpress.org/forum/troubleshooting.
+
+California users privacy notice: https://wp.me/Pe4R-d/#california-consumer-privacy-act-ccpa.
diff --git a/fastlane/metadata/android/nl-NL/title.txt b/fastlane/metadata/android/nl-NL/title.txt
index 69a78836a19c..258279a2e3f0 100644
--- a/fastlane/metadata/android/nl-NL/title.txt
+++ b/fastlane/metadata/android/nl-NL/title.txt
@@ -1 +1 @@
-WordPress – Website- en blog-bouwer
+WordPress – Site- en blog-bouwer
diff --git a/fastlane/metadata/android/pl-PL/video.txt b/fastlane/metadata/android/pl-PL/video.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/fastlane/metadata/android/release_notes.xml b/fastlane/metadata/android/release_notes.xml
index f1b269e21bba..901461b59522 100644
--- a/fastlane/metadata/android/release_notes.xml
+++ b/fastlane/metadata/android/release_notes.xml
@@ -1,54 +1,134 @@
+<ar>
+17.3:
+ما الجديد؟
+
+باستخدام مكوِّن البحث الجديد، يمكنك إضافة وظيفة البحث إلى أي مقالة أو صفحة. يمكنك الآن إضافة شعار "مميز" في مكوِّن الصورة. قمنا كذلك بتبسيط السير لإدراج وسائط عند استخدام مكوِّنات الوسائط المتعددة الشائعة لدينا.
+
+تشمل التحسينات الأخرى المزيد من معلومات المستخدم حول إعجاباتك، بالإضافة إلى شاشة تعليقات محدَّثة.
+</ar>
+<de-DE>
+17.3:
+Was gibt's Neues?
+
+Mit dem neuen Suchblock kannst du jedem Beitrag und beliebigen Seiten eine Suchfunktion hinzufügen. Im Bildblock kannst du ab sofort ein Banner mit Empfehlungen hinzufügen. Außerdem haben wir den Flow zum Einfügen von Medien über unsere beliebten Multimedia-Blöcken erleichtert.
+
+Weitere Verbesserungen umfassen unter anderem mehr Benutzerdaten zu deinen Likes sowie einen aktualisierten Look der Kommentare.
+</de-DE>
 <en-US>
-16.0:
-Block editor updates: There’s now full-width and wide alignment support for the Video, Gallery, and more blocks. We fixed an issue affecting the Classic block on Jetpack sites and resolved an issue involving unsupported blocks on rotated devices.
+17.3:
+What’s new?
+
+With the new Search block, you can add a search function to any post or page. In the Image block, you can now add a “featured” banner. We’ve also simplified the flow for inserting media when using our popular multimedia blocks.
 
-Reader updates: Enjoy a cleaner reading experience and beautiful images in the redesigned Reader. You can access it even if you don’t follow any topics.
+Other improvements include more user information about your Likes, as well as an updated Comments screen.
 </en-US>
 <es-ES>
-16.0:
-Actualizaciones en el editor de bloques: Ahora es compatible con la alineación ancha y completa en los bloques de vídeo, galería y más. Hemos corregido un problema que afectaba al bloque clásico en los sitios Jetpack y resuelto un problema relacionado con blloques no compatibles en dispositivos rotados.
+17.3:
+Novedades
+
+Con el nuevo bloque de búsqueda, puedes añadir una función de búsqueda en cualquier entrada o página. En el bloque de imagen, ahora puedes añadir un banner destacado. También hemos simplificado los pasos para insertar elementos multimedia con nuestros bloques multimedia populares.
 
-Actualizaciones en el lector: Disfruta de una experiencia de lectura más limpia y de bonitas imágenes en el rediseñado lector. Puede acceder aunque no sigas ningún tema.
+Se han hecho otras mejoras, como incluir más información del usuario sobre tus Me gusta, o una pantalla de comentarios actualizada.
 </es-ES>
+<fr-CA>
+17.3 :
+Nouveautés
+
+Le nouveau bloc Recherche vous permet d’ajouter une fonction de recherche à un article ou une page. Dans le bloc Image, vous pouvez désormais ajouter une bannière « en une ». Nous avons également simplifié le flux d’insertion des médias lors de l’utilisation de nos blocs multimédias populaires.
+
+Les autres améliorations incluent davantage d’informations sur vos mentions J’aime, ainsi qu’un écran de commentaires mis à jour.
+</fr-CA>
+<fr-FR>
+17.3 :
+Nouveautés
+
+Le nouveau bloc Recherche vous permet d’ajouter une fonction de recherche à un article ou une page. Dans le bloc Image, vous pouvez désormais ajouter une bannière « en une ». Nous avons également simplifié le flux d’insertion des médias lors de l’utilisation de nos blocs multimédias populaires.
+
+Les autres améliorations incluent davantage d’informations sur vos mentions J’aime, ainsi qu’un écran de commentaires mis à jour.
+</fr-FR>
 <iw-IL>
-16.0:
-עדכונים לעורך הבלוקים: יש כעת תמיכה ביישור בפריסה רחבה וברוחב מלא עבור הבלוקים 'וידאו', 'גלריה' ועוד. תיקנו בעיה שהשפיעה על הבלוק הקלאסי באתרי Jetpack ופתרנו בעיה בנוגע לבלוקים שאינם נתמכים בעת סיבוב המכשיר.
+17.3:
+מה חדש?
+
+עם בלוק החיפוש החדש, אפשר להוסיף פונקציה של חיפוש בכל פוסט או עמוד. בבלוק התמונה, ניתן להוסיף באנר 'מרכזי'. בנוסף, הגדרנו תהליך פשוט יותר להוספה של מדיה כאשר משתמשים בבלוקים הפופולריים שלנו למולטימדיה.
 
-עדכונים ל-Reader: כעת אפשר ליהנות מחוויית קריאה נקייה יותר ומתמונות מרהיבות ב-Reader שעוצב מחדש. אפשר לגשת אליו גם אם לא עוקבים אחר נושאים.
+שיפורים נוספים כוללים עוד פרטים למשתמש על הלייקים ומסך 'תגובות' מעודכן.
 </iw-IL>
+<id>
+17.3:
+Apa yang baru?
+
+Dengan blok Pencarian yang baru, Anda dapat menambahkan fungsi pencarian ke pos atau halaman mana pun. Di blok Gambar, sekarang Anda dapat menambahkan banner "unggulan". Kami juga telah menyederhanakan alur untuk menyisipkan media saat menggunakan blok multimedia populer.
+
+Peningkatan lainnya mencakup lebih banyak informasi pengguna tentang Sukai, serta pembaruan layar Komentar.
+</id>
 <it-IT>
-16.0:
-Aggiornamenti editor a blocchi: ora è disponibile il supporto per l'allineamento Wide e Full width per i blocchi Video, Galleria e molti altri. Abbiamo corretto un problema che influenzava il blocco Classico sui siti Jetpack e abbiamo risolto un problema relativo a blocchi non supportati su dispositivi ruotati.
+17.3:
+Cosa c'è di nuovo?
+
+Con il nuovo blocco Cerca, puoi aggiungere una funzione di ricerca a qualsiasi articolo o pagina. Nel blocco Immagine, puoi ora aggiungere un banner "in evidenza". Abbiamo anche semplificato il flusso per l'inserimento di elementi multimediali durante l'uso dei blocchi multimediali popolari.
 
-Aggiornamenti Reader: Goditi un'esperienza di lettura più pulita e con immagini più belle nel Reader riprogettato. Puoi accedervi anche se non segui altri argomenti.
+Altri miglioramenti includono più informazioni per l'utente come i tuoi Mi piace e una schermata Commenti aggiornata.
 </it-IT>
+<ja-JP>
+17.3:
+新着情報
+
+新しいブロック検索で、任意の投稿またはページに検索を追加できます。 画像ブロックで、「おすすめ」のバナーを追加できるようになりました。 また、よく利用されるマルチメディアブロックを使用する場合にメディアを挿入するフローも簡単になりました。
+
+その他の改善内容には、「いいね」のユーザー情報の詳細化、コメント画面の更新などがあります。
+</ja-JP>
 <ko-KR>
-16.0:
-블록 편집기 업데이트: 영상, 갤러리 등 많은 블록이 이제 가로 전체 확장과 와이드 정렬을 지원합니다. Jetpack 사이트에서 클래식 블록에서 발생하는 문제와 회전된 기기를 지원하지 않는 블록과 관련된 문제를 수정했습니다.
+17.3:
+새로운 기능
+
+새로운 검색 블록으로 글 또는 페이지에 검색 기능을 추가할 수 있습니다. 이미지 블록에서 이제 "추천" 배너를 추가할 수 있습니다. 사용자가 많이 사용하는 멀티미디어 블록을 사용할 때 미디어를 삽입하는 절차도 간소화했습니다.
 
-리더 업데이트: 새롭게 디자인된 리더로 향상된 가독성 경험과 아름다운 이미지를 사용해보세요. 주제를 팔로우하지 않아도 사용할 수 있습니다.
+기타 개선 사항에는 좋아요에 대한 추가 사용자 정보는 물론 업데이트된 댓글 화면도 포함됩니다.
 </ko-KR>
 <nl-NL>
-16.0:
-Updates voor blok-editor: er is nu ondersteuning voor uitlijning over de volledige breedte en breedte voor de video-, galerij- en meer blokken. We hebben een probleem met het klassieke blok op Jetpack sites opgelost en een probleem met niet-ondersteunde blokken op geroteerde apparaten opgelost.
+17.3:
+Wat is er nieuw?
+
+Met het nieuwe zoek blok, kan je een zoekfunctie toevoegen aan elk bericht of pagina. In het afbeeldingsblok kun je nu een "uitgelichte" banner toevoegen. We hebben ook de flow vereenvoudigd voor het invoegen van media bij het gebruik van onze populaire multimediablokken.
 
-Reader updates: geniet van een betere leeservaring en prachtige afbeeldingen in de opnieuw ontworpen Reader. Je hebt er zelfs toegang toe als je geen onderwerpen volgt.
+Andere verbeteringen zijn meer gebruikersinformatie over je likes, evenals een geüpdatet reacties scherm.
 </nl-NL>
 <ru-RU>
-16.0:
-Обновления редактора блоков: поддержка широкого и выравнивания на полную ширину блоков видео, галереи и многих других. Исправлена проблема с классическим блоком на сайтах Jetpack и другая проблема с неподдерживаемых блоках и поворотом экрана устройства.
+17,3:
+Что нового?
 
-Обновления чтива: переработано оформление, вам понравится! Доступно даже если у вас нет подписок.
+С новым блоком поиска вы можете добавить функцию поиска к любой записи или странице. В блоке изображений теперь можно добавить «избранный» баннер. Мы также упростили процесс вставки медиафайлов при использовании наших популярных мультимедийных блоков.
+
+Другие улучшения включают в себя дополнительную информацию об отметках "понравилось", а также обновленный экран комментариев.
 </ru-RU>
 <sv-SE>
-16.0:
-Nytt i blockredigereran: Nu finns det stöd för fullbredd och bredd layout av video-, galleri- m.fl. block. Vi har korrigerat ett problem med det klassiska blocket på webbplatser med Jetpack och löst ett bekymmer med ej stödda block vid rotering av mobila enheter.
+17.3:
+Vad är nytt?
+
+Med det nya sökblocket kan du lägga till en sökfunktion i ett inlägg eller på en sida. I bildblocket kan du nu lägga till en "utvalt"-banner. Vi har också förenklat flödet för att infoga media vid användning av våra populära multimediablock.
 
-Uppdateringar i läsaren: Njut av en snyggare läsupplevelse och vackra bilder med den nya designen av läsaren. Du kommer åt den även om du inte har följt några ämnen.
+Andra förbättringar inkluderar mer användarinformation om dina gilla-markeringar, samt en uppdaterad skärm för kommentarer.
 </sv-SE>
+<tr-TR>
+17.3:
+Yenilikler
+
+Yeni Arama bloku sayesinde, herhangi bir gönderi veya sayfaya arama işlevi ekleyebilirsiniz. Görüntü blokunda artık bir "öne çıkan" başlık ekleyebilirsiniz. Popüler multimedya bloklarımız kullanılırken yapılan medya ekleme işlemleriyle ilgili akışı da basitleştirdik.
+
+Diğer iyileştirmeler arasında, Beğenileriniz hakkında daha fazla kullanıcı bilgisinin yanı sıra güncellenmiş bir Yorumlar ekranı da bulunur.
+</tr-TR>
 <zh-CN>
-16.0：
-区块编辑器更新：现在，我们为视频、画廊和更多区块提供了“全宽”和“加宽”对齐支持。 我们修复了影响 Jetpack 站点上经典区块的问题，并解决了设备旋转后区块不受支持的问题。
+17.3：
+通过新的搜索区块，您可以在任何文章或页面中添加搜索功能。在图像区块中，现已可添加 "特色 "横幅。我们还简化了在使用多媒体区块时插入媒体的流程。
 
-阅读器更新：阅读器经过重新设计，可带来更清晰的阅读体验和精美图像。 即使您没有关注任何主题，也可以享受阅读器带来的这些出色体验。
+其他改进包括：可以查看更多关于您的 "喜欢"的用户信息，以及一个全新的评论界面。
 </zh-CN>
+<zh-TW>
+17.3:
+新功能
+
+現在有了新的搜尋區塊，你可以在任何文章或頁面中加入搜尋功能。 你現在可以在圖片區塊中加入「精選」橫幅。 我們也簡化了使用熱門多媒體區塊時插入媒體的程序。
+
+其他改善包括更多「按讚」的使用者資訊，以及煥然一新的「留言」畫面。
+</zh-TW>
diff --git a/fastlane/metadata/android/ru-RU/changelogs/1044.txt b/fastlane/metadata/android/ru-RU/changelogs/1044.txt
new file mode 100644
index 000000000000..8e5328ee4d74
--- /dev/null
+++ b/fastlane/metadata/android/ru-RU/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17,3:
+Что нового?
+
+С новым блоком поиска вы можете добавить функцию поиска к любой записи или странице. В блоке изображений теперь можно добавить «избранный» баннер. Мы также упростили процесс вставки медиафайлов при использовании наших популярных мультимедийных блоков.
+
+Другие улучшения включают в себя дополнительную информацию об отметках "понравилось", а также обновленный экран комментариев.
diff --git a/fastlane/metadata/android/ru-RU/changelogs/946.txt b/fastlane/metadata/android/ru-RU/changelogs/946.txt
deleted file mode 100644
index 947933056b8e..000000000000
--- a/fastlane/metadata/android/ru-RU/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-Обновления редактора блоков: поддержка широкого и выравнивания на полную ширину блоков видео, галереи и многих других. Исправлена проблема с классическим блоком на сайтах Jetpack и другая проблема с неподдерживаемых блоках и поворотом экрана устройства.
-
-Обновления чтива: переработано оформление, вам понравится! Доступно даже если у вас нет подписок.
diff --git a/fastlane/metadata/android/sr/full_description.txt b/fastlane/metadata/android/sr/full_description.txt
new file mode 100644
index 000000000000..26609b812065
--- /dev/null
+++ b/fastlane/metadata/android/sr/full_description.txt
@@ -0,0 +1,43 @@
+Вордпрес за Андроид доноси снагу веб објављивања у ваш џеп. То је градитељ веб страница и још много тога!
+
+СТВОРИТИ
+- Дајте својим великим идејама дом на вебу. Вордпрес за Андроид је градитељ веб страница и блогер. Помоћу њега креирајте своју веб страницу.
+- Изаберите прави изглед и осећај из широког избора Вордпрес тема, а затим прилагодите своје фотографије, боје и фонтове тако да одражавају вашу јединственост.
+- Уграђени савети за брзо покретање воде вас кроз основе постављања нове веб странице створене за успех. (Ми нисмо само креатор веб странице - ми смо ваш партнер и навијачки тим!)
+
+СТАТИСТИКА
+- Проверите статистику своје странице у реалном времену да бисте пратили активности на вашој страници.
+- Пратите који постови и странице добијају највише промета током времена, истражујући дневне, недељне, месечне и годишње увиде.
+- Користите карту саобраћаја да бисте видели из којих земаља ваши посетиоци долазе.
+
+ОБАВЕШТЕЊА
+- Примајте обавештења о коментарима, лајковима и новим пратиоцима како бисте могли да видите како људи реагују на вашу веб страницу у току самих догађаја.
+- Одговорите на нове коментаре док се приказују да би разговор наставио неометано да тече и да бисте одали почаст својим читаоцима.
+
+ОБЈАВИ
+- Стварајте ажурирања, приче, есеје са фотографијама - било шта! - са уредником.
+- Оживите своје постове и странице фотографијама и видео записима са фотоапарата и албума или пронађите савршену слику са бесплатном колекцијом фотографија у апликацији.
+- Спремите идеје као скице и вратите им се кад се ваша муза врати или закажете нове постове за будућност како би веб локација увек била свежа и привлачна.
+- Додајте ознаке и категорије како бисте помогли новим читаоцима да открију ваше постове и гледају како публика расте.
+
+ЧИТАЧ
+- Вордпрес је више од градитеља блога - Користите га за повезивање са заједницом писаца у WordPress Reader.-у . Истражите хиљаде тема ознаком, откријте нове ауторе и организације и следите оне које су изазвале ваше интересовање.
+- Сачувајте постове који вас очаравају уз помоћ опције Спреми за касније.
+
+ПОДЕЛИ
+- Подесите аутоматско дељење тако да би следбеници на друштвеним мрежама знали када објавите нову објаву. Аутоматски прелазите на Facebook, Twitter и још много тога.
+- Додајте дугмад за дељење на друштвеним мрежама својим постовима како би посетиоци могли да их деле у оквиру својих мрежа, и нека ваши фанови постану ваши амбасадори.
+
+Зашто Вордпрес?
+
+Постоји пуно платформи за блоговање, градитеља веб страница и сајтова за друштвене мреже. Зашто правити сопствену веб страницу путем Вордпреса?
+
+Вордпресс управља преко једне трећине Интернета. Користе је хоби блогови, предузећа свих величина, интернет продавнице, чак и највеће вести на Интернету. Велика је вероватноћа да на многе ваше омиљене веб странице раде на Вордпресу.
+
+Уз Вордпрес поседујете свој сопствени садржај. Остале друштвене мреже третирају вас као робу и преузимате власништво над садржајем који објављујете. Али са Вордпресом, све што објавите је ваше, и можете да га понесете са собом где год желите.
+
+Вордпрес је градитељ веб страница отвореног кода, што значи да свако може видети како је направљен и чак дати свој допринос. Остале услуге и друштвене мреже су власнички, затворени системи; никад не можете бити сигурни како и шта тачно раде - а можда ће и нестати!
+
+Без обзира да ли вам је потребан градитељ веб страница да бисте креирали сопствену или једноставан произвођач блогова, Вордпрес вам може помоћи. Даје вам леп дизајн, моћне карактеристике и слободу да градите све што желите.
+
+Вордпрес за Андроид подржава веб странице са хостом са Вордпрес верзијом 4.0 и новијим, као и све веб локације на WordPress.com. Баш као и Вордпрес, Вордпрес за Андроид је софтвер отвореног кода. Сазнајте више на https://apps.wordpress.com/contribute/. Потребна вам је помоћ око апликације? Пошаљите нам твит на @WPAndroid или посетите наше форуме на https://android.forums.wordpress.org/forum/troubleshooting.
diff --git a/fastlane/metadata/android/sr/title.txt b/fastlane/metadata/android/sr/title.txt
new file mode 100644
index 000000000000..d2e97ac427d3
--- /dev/null
+++ b/fastlane/metadata/android/sr/title.txt
@@ -0,0 +1 @@
+Вордпрес – градитељ веб места и блогова
diff --git a/fastlane/metadata/android/sr/video.txt b/fastlane/metadata/android/sr/video.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/fastlane/metadata/android/sv-SE/changelogs/1044.txt b/fastlane/metadata/android/sv-SE/changelogs/1044.txt
new file mode 100644
index 000000000000..6926b05004ca
--- /dev/null
+++ b/fastlane/metadata/android/sv-SE/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Vad är nytt?
+
+Med det nya sökblocket kan du lägga till en sökfunktion i ett inlägg eller på en sida. I bildblocket kan du nu lägga till en "utvalt"-banner. Vi har också förenklat flödet för att infoga media vid användning av våra populära multimediablock.
+
+Andra förbättringar inkluderar mer användarinformation om dina gilla-markeringar, samt en uppdaterad skärm för kommentarer.
diff --git a/fastlane/metadata/android/sv-SE/changelogs/946.txt b/fastlane/metadata/android/sv-SE/changelogs/946.txt
deleted file mode 100644
index 3dff1e415f37..000000000000
--- a/fastlane/metadata/android/sv-SE/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0:
-Nytt i blockredigereran: Nu finns det stöd för fullbredd och bredd layout av video-, galleri- m.fl. block. Vi har korrigerat ett problem med det klassiska blocket på webbplatser med Jetpack och löst ett bekymmer med ej stödda block vid rotering av mobila enheter.
-
-Uppdateringar i läsaren: Njut av en snyggare läsupplevelse och vackra bilder med den nya designen av läsaren. Du kommer åt den även om du inte har följt några ämnen.
diff --git a/fastlane/metadata/android/th/video.txt b/fastlane/metadata/android/th/video.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/fastlane/metadata/android/tr-TR/changelogs/1044.txt b/fastlane/metadata/android/tr-TR/changelogs/1044.txt
new file mode 100644
index 000000000000..eb41e272c712
--- /dev/null
+++ b/fastlane/metadata/android/tr-TR/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+Yenilikler
+
+Yeni Arama bloku sayesinde, herhangi bir gönderi veya sayfaya arama işlevi ekleyebilirsiniz. Görüntü blokunda artık bir "öne çıkan" başlık ekleyebilirsiniz. Popüler multimedya bloklarımız kullanılırken yapılan medya ekleme işlemleriyle ilgili akışı da basitleştirdik.
+
+Diğer iyileştirmeler arasında, Beğenileriniz hakkında daha fazla kullanıcı bilgisinin yanı sıra güncellenmiş bir Yorumlar ekranı da bulunur.
diff --git a/fastlane/metadata/android/vi/video.txt b/fastlane/metadata/android/vi/video.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/fastlane/metadata/android/zh-CN/changelogs/1044.txt b/fastlane/metadata/android/zh-CN/changelogs/1044.txt
new file mode 100644
index 000000000000..04b93abf5261
--- /dev/null
+++ b/fastlane/metadata/android/zh-CN/changelogs/1044.txt
@@ -0,0 +1,4 @@
+17.3：
+通过新的搜索区块，您可以在任何文章或页面中添加搜索功能。在图像区块中，现已可添加 "特色 "横幅。我们还简化了在使用多媒体区块时插入媒体的流程。
+
+其他改进包括：可以查看更多关于您的 "喜欢"的用户信息，以及一个全新的评论界面。
diff --git a/fastlane/metadata/android/zh-CN/changelogs/946.txt b/fastlane/metadata/android/zh-CN/changelogs/946.txt
deleted file mode 100644
index 45debd632668..000000000000
--- a/fastlane/metadata/android/zh-CN/changelogs/946.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-16.0：
-区块编辑器更新：现在，我们为视频、画廊和更多区块提供了“全宽”和“加宽”对齐支持。 我们修复了影响 Jetpack 站点上经典区块的问题，并解决了设备旋转后区块不受支持的问题。
-
-阅读器更新：阅读器经过重新设计，可带来更清晰的阅读体验和精美图像。 即使您没有关注任何主题，也可以享受阅读器带来的这些出色体验。
diff --git a/fastlane/metadata/android/zh-TW/changelogs/1044.txt b/fastlane/metadata/android/zh-TW/changelogs/1044.txt
new file mode 100644
index 000000000000..724257033ff4
--- /dev/null
+++ b/fastlane/metadata/android/zh-TW/changelogs/1044.txt
@@ -0,0 +1,6 @@
+17.3:
+新功能
+
+現在有了新的搜尋區塊，你可以在任何文章或頁面中加入搜尋功能。 你現在可以在圖片區塊中加入「精選」橫幅。 我們也簡化了使用熱門多媒體區塊時插入媒體的程序。
+
+其他改善包括更多「按讚」的使用者資訊，以及煥然一新的「留言」畫面。
diff --git a/fastlane/playstoreres/assets/attachments/device-frames/Android Pixel 2XL.png b/fastlane/playstoreres/assets/attachments/device-frames/Android Pixel 2XL.png
new file mode 100644
index 000000000000..b8b84a60bb7c
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/device-frames/Android Pixel 2XL.png differ
diff --git a/fastlane/playstoreres/assets/attachments/device-frames/Android Tablet.png b/fastlane/playstoreres/assets/attachments/device-frames/Android Tablet.png
new file mode 100644
index 000000000000..8b761b01bb38
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/device-frames/Android Tablet.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-1-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-1-t.png
new file mode 100644
index 000000000000..39ee6b31ab9a
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-1-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-1.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-1.png
new file mode 100644
index 000000000000..f8d73601ae32
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-1.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-2-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-2-t.png
new file mode 100644
index 000000000000..e5680853705c
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-2-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-2.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-2.png
new file mode 100644
index 000000000000..118586b5fdbd
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-2.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-3-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-3-t.png
new file mode 100644
index 000000000000..4292b22ae7f9
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-3-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-3.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-3.png
new file mode 100644
index 000000000000..a2c85acdf81f
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-3.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-4-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-4-t.png
new file mode 100644
index 000000000000..9725687a4eeb
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-4-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-4.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-4.png
new file mode 100644
index 000000000000..70ae9b61ddee
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-4.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-5-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-5-t.png
new file mode 100644
index 000000000000..9db316e4eb49
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-5-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-5.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-5.png
new file mode 100644
index 000000000000..53ed2637cd23
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-5.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-6-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-6-t.png
new file mode 100644
index 000000000000..e6de2429b5c7
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-6-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-6.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-6.png
new file mode 100644
index 000000000000..9245af1d4640
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-6.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-7-t.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-7-t.png
new file mode 100644
index 000000000000..4d3662d1fbc6
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-7-t.png differ
diff --git a/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-7.png b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-7.png
new file mode 100644
index 000000000000..3fcd376d43fc
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/phone-backgrounds/Circles-7.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-1.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-1.png
new file mode 100644
index 000000000000..21533bc4ea85
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-1.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-2.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-2.png
new file mode 100644
index 000000000000..89482127c02b
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-2.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-3.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-3.png
new file mode 100644
index 000000000000..dda0afa846d2
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-3.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-4.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-4.png
new file mode 100644
index 000000000000..b1bb7266e1b4
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-4.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-5.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-5.png
new file mode 100644
index 000000000000..cc9467f519b6
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-5.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-6.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-6.png
new file mode 100644
index 000000000000..eb594702c972
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-6.png differ
diff --git a/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-7.png b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-7.png
new file mode 100644
index 000000000000..5566cd208783
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/tablet-backgrounds/Circles-7.png differ
diff --git a/fastlane/playstoreres/assets/attachments/themes/Themes-Android-Phone.png b/fastlane/playstoreres/assets/attachments/themes/Themes-Android-Phone.png
new file mode 100644
index 000000000000..73ac7f0ddddd
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/themes/Themes-Android-Phone.png differ
diff --git a/fastlane/playstoreres/assets/attachments/themes/Themes-Android-Tablet.png b/fastlane/playstoreres/assets/attachments/themes/Themes-Android-Tablet.png
new file mode 100644
index 000000000000..8f6d69100fc4
Binary files /dev/null and b/fastlane/playstoreres/assets/attachments/themes/Themes-Android-Tablet.png differ
diff --git a/fastlane/playstoreres/assets/intro-text-tablet.css b/fastlane/playstoreres/assets/intro-text-tablet.css
new file mode 100644
index 000000000000..e4bbfca9c940
--- /dev/null
+++ b/fastlane/playstoreres/assets/intro-text-tablet.css
@@ -0,0 +1,6 @@
+*{
+	font-family: 'Noto Serif';
+	color: #0E3049;
+	text-align: center;
+	font-size: 100px;
+}
diff --git a/fastlane/playstoreres/assets/intro-text.css b/fastlane/playstoreres/assets/intro-text.css
index bde14c57231d..6003b39cd249 100644
--- a/fastlane/playstoreres/assets/intro-text.css
+++ b/fastlane/playstoreres/assets/intro-text.css
@@ -1,10 +1,6 @@
 *{
-	font-family: 'Noto Sans';
-	color: white;
-	text-align: left;
-	line-height: 1.1875;
-}
-
-strong{
-	font-family: 'NotoSans-Bold';
+	font-family: 'Noto Serif';
+	color: #0E3049;
+	text-align: center;
+	font-size: 80px;
 }
diff --git a/fastlane/playstoreres/assets/style.css b/fastlane/playstoreres/assets/style.css
index b462472a04cc..6003b39cd249 100644
--- a/fastlane/playstoreres/assets/style.css
+++ b/fastlane/playstoreres/assets/style.css
@@ -1,9 +1,6 @@
 *{
-	font-family: 'Noto Sans';
-	color: white;
+	font-family: 'Noto Serif';
+	color: #0E3049;
 	text-align: center;
-}
-
-strong{
-	font-family: 'NotoSans-Bold';
+	font-size: 80px;
 }
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_1.txt
index 53d8761959dc..a4c849e0d0bd 100644
--- a/fastlane/playstoreres/metadata/ar/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-شارك أفكارك
-مع العالم
+منشئ مواقع الويب الأكثر رواجًا في العالم
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_2.txt
index 74362aba5d32..2a8473da04cb 100644
--- a/fastlane/playstoreres/metadata/ar/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-الاستمتاع مع
-مواقعك المفضّلة
+إنشاء موقع أو بدء مدونة
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_3.txt
index 5ac2e95380d2..2bce96b221ee 100644
--- a/fastlane/playstoreres/metadata/ar/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-يمكنك إدارة موقعك
-من أي مكان تذهب إليه
+اكتشاف عمليات قراءة جديدة
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_4.txt
index 35c5349fd286..9834992158b2 100644
--- a/fastlane/playstoreres/metadata/ar/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-جميع الإحصاءات
-في متناول يديك
+كوّن جمهورًا
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_5.txt
index 37f3cda01cf0..92bf120b317a 100644
--- a/fastlane/playstoreres/metadata/ar/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-الحصول على تنبيهات فورية
-في الوقت الفعلي
+الحفاظ على علامات التبويب على موقعك
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..6ccec8dee3cd
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+الردّ في الوقت الحالي
diff --git a/fastlane/playstoreres/metadata/ar/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/ar/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..61d38c7b72bb
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ar/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+الرفع أثناء التنقّل
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_1.txt
index 3408aca6d1d0..44eae61f6a4e 100644
--- a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Teile deine Ideen
-mit der Welt
+Der weltweit beliebteste Website-Baukaste
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_2.txt
index edf5badeb3b6..e23573724193 100644
--- a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Betrachte deine
-Lieblings-Websites
+Erstelle eine Website oder starte ein Blog
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_3.txt
index f9ece98755c9..dad7bde5b3a1 100644
--- a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Verwalte deine Website
-immer und überall
+Entdecke neuen Lesestoff
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_4.txt
index d539b6396107..45882790fe76 100644
--- a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Alle Statistiken
-in deiner Hand
+Baue eine Zielgruppe auf
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_5.txt
index fe45cba0dff5..06b2e61a099e 100644
--- a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Erhalte Benachrichtigungen
-in Echtzeit
+Behalte deine Website im Blick
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..2976855d64e1
--- /dev/null
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+In Echtzeit antworten
diff --git a/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..b44d1d711987
--- /dev/null
+++ b/fastlane/playstoreres/metadata/de-DE/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Unterwegs hochladen
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_1.txt
index f05f62365f9c..ce8de997ef8c 100644
--- a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Share your ideas
-with the world
+The world’s most popular website builder
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_2.txt
index 6be99561adab..823055e4082f 100644
--- a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Enjoy your
-favorite sites
+Create a site or start a blog
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_3.txt
index d59c84b907e9..b0b414b9a964 100644
--- a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Manage your site
-everywhere you go
+Discover new reads
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_4.txt
index 63b0655fe4b2..303aa43ee80c 100644
--- a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-All the stats
-in your hand
+Build an audience
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_5.txt
index f9384a7f75d8..61a3da8bec63 100644
--- a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Get notified
-in real-time
+Keep tabs on your site
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..2ee6a876f962
--- /dev/null
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Reply in real time
diff --git a/fastlane/playstoreres/metadata/en-US/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..3732cb639b92
--- /dev/null
+++ b/fastlane/playstoreres/metadata/en-US/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Upload on the go
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_1.txt
index 31d5d067bd62..0e5cf13aeac8 100644
--- a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Comparte tus ideas
-con el mundo
+El creador web más popular en el mundo
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_2.txt
index 6078f9c3ac11..06bbf4e60fe7 100644
--- a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Disfruta de
-tus sitios favoritos
+Crea un sitio o empieza un blog
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_3.txt
index 02ee72207445..fe40820142dc 100644
--- a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Gestiona tu sito
-donde quiera que vayas
+Descubre nuevas lecturas
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_4.txt
index f93bd8587bff..fcd2fc7bee41 100644
--- a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Todas las estadísticas
-en tu mano
+Crea una audiencia
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_5.txt
index 199d03e49352..3af0f5bf30a0 100644
--- a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Recibe notificaciones
-en tiempo real
+Guarda las pestañas en tu sitio
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..f8cc6c9d90bc
--- /dev/null
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Responder en tiempo real
diff --git a/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..32aeae909da0
--- /dev/null
+++ b/fastlane/playstoreres/metadata/es-ES/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Subir sobre la marcha
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_1.txt
index 6f3d361510b2..59a02012cf40 100644
--- a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Partagez vos idées
-avec le monde entier
+Le constructeur de site le plus populaire au monde
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_2.txt
index 3161fd4a0f25..a14014f806d0 100644
--- a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Profitez de vos
-sites préférés
+Créer un site ou démarrer un blog
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_3.txt
index a8c7e16d083e..f2376a6adb4a 100644
--- a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Gérez votre site
-où que vous soyez
+Découvrez de nouvelles lectures
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_4.txt
index f2e996beefe7..a14c3be65527 100644
--- a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Toutes les statistiques
-à portée de main
+Construisez votre audience
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_5.txt
index 8119ac950a4c..bcd09f9d0cf5 100644
--- a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Recevez les notifications
-en temps réel
+Gardez un œil sur votre site
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..aca0fec5db5b
--- /dev/null
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Répondre en temps réel
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.html b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.html
index 20325546548c..d58498572bf6 100644
--- a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.html
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.html
@@ -1,2 +1,2 @@
-<strong>Build</strong> and manage
-your website
+<strong>Créer</strong> et gérer
+votre site Web
diff --git a/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..dae6413c920f
--- /dev/null
+++ b/fastlane/playstoreres/metadata/fr-FR/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Téléverser en déplacement
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_1.txt
index 12fe0921e1dd..73f1ffa80d66 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Bagikan ide Anda
-kepada dunia
+Pembuat situs web terpopuler di dunia
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_2.txt
index 40e19ba04a0e..b78e023d37af 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Nikmati
-situs favorit Anda
+Buat situs web atau mulai blog
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_3.html b/fastlane/playstoreres/metadata/in/play_store_screenshot_3.html
index 27ef85ed423d..39d2f64fb323 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_3.html
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_3.html
@@ -1,2 +1,2 @@
 <strong>Ketahui</strong> kabar terkini
-secara real-time
+terjadi secara real-time
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_3.txt
index 6cc6996d4053..7cb05f876ebe 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Kelola situs Anda
-dari mana saja
+Temukan bacaan-bacaan baru
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_4.html b/fastlane/playstoreres/metadata/in/play_store_screenshot_4.html
index 1c6ddc5bc90d..0bb6d27c143a 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_4.html
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_4.html
@@ -1,2 +1,2 @@
-<strong>Bagikan</strong> dari
-mana saja
+<strong>Bagikan</strong>
+dari mana saja
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_4.txt
index 9584564e95b2..4cfda9fcc6b0 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Semua statistik
-dalam kendali Anda
+Perbanyak pengunjung
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_5.txt
index 3915cf816508..74cab1e26dbd 100644
--- a/fastlane/playstoreres/metadata/in/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Dapatkan pemberitahuan
-secara real-time
+Pantau situs Anda
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..c37020dad2a0
--- /dev/null
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Balas secara real time
diff --git a/fastlane/playstoreres/metadata/in/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/in/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..b7874844586c
--- /dev/null
+++ b/fastlane/playstoreres/metadata/in/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Unggah di mana saja
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_1.txt
index 46aa1a33db0c..ee30652b010a 100644
--- a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Condividi idee
-con tutto il mondo
+Il costruttore di siti web più famoso al mondo
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_2.txt
index 7832801fab98..a09c12df0ea9 100644
--- a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Goditi
-i siti preferiti
+Crea un sito o inizia un blog
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_3.txt
index 430c02559daf..f2adef1fe66d 100644
--- a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Gestisci il sito
-ovunque tu vada
+Scopri nuove letture
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_4.txt
index 61c2a040f961..e59bdcd0d5eb 100644
--- a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Tutte le statistiche
-in una mano
+Crea un pubblico
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_5.txt
index c460e6f6c455..16f66e85cda9 100644
--- a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Notifiche in
-tempo reale
+Tieni sotto controllo il tuo sito
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..8fc7b3f93531
--- /dev/null
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Rispondi in tempo reale
diff --git a/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..422e805be5d4
--- /dev/null
+++ b/fastlane/playstoreres/metadata/it-IT/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Carica quando sei in movimento
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.html b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.html
new file mode 100644
index 000000000000..908cf425dc61
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.html
@@ -0,0 +1,2 @@
+<strong>ליצור</strong>
+פוסטים ועמודים יפים
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.txt
index b948f871fd04..9c5d872207e7 100644
--- a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-לשתף את הרעיונות
-שלך עם כולם
+בונה האתרים הפופולרי בעולם
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.html b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.html
new file mode 100644
index 000000000000..8068400c526f
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.html
@@ -0,0 +1,2 @@
+<strong>לעקוב</strong> אחרי מה
+שהמבקרים שלך אוהבים
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.txt
index edb46e221c6c..88fd8af831c3 100644
--- a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-ליהנות מהאתרים
-המועדפים עליך
+ליצור אתר או להתחיל בלוג
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.html b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.html
new file mode 100644
index 000000000000..7658e93157a5
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.html
@@ -0,0 +1,2 @@
+<strong>לראות</strong> מה
+מתרחש בזמן אמת
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.txt
index a412aed6887d..bcd8bd9caebb 100644
--- a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-ניהול האתר שלך
-מכל מקום
+לגלות דברים חדשים שמעניין לקרוא
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.html b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.html
new file mode 100644
index 000000000000..b21fa055722b
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.html
@@ -0,0 +1,2 @@
+<strong>שיתוף</strong>
+מכל מקום
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.txt
index d42da23a8add..16b1f96e19d5 100644
--- a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-כל הנתונים הסטטיסטיים
-בלחיצת כפתור
+ליצור קהל לאתר
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.html b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.html
new file mode 100644
index 000000000000..fcfe5661a2dc
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.html
@@ -0,0 +1,2 @@
+<strong>לקבל</strong> רעיונות
+בדרכים
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.txt
index 1846621b5b89..96c618380e98 100644
--- a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-קבלת הודעות
-בזמן אמת
+לעקוב אחר האתר שלך
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..bf2b8d48cc6f
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+להגיב בזמן אמת
diff --git a/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..963d1a2dcaa0
--- /dev/null
+++ b/fastlane/playstoreres/metadata/iw-IL/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+להעלות תוכן מכל מקום
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_1.txt
index cde07c0aa67c..90ed9bfa40ca 100644
--- a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-自分のアイデアを
-世界と共有する
+世界で最も人気のサイトビルダー
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_2.txt
index f62b1e41ab2f..0cb827c7a051 100644
--- a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-お気に入りの
-サイトを満喫
+サイトを作成またはブログをスタート
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_3.txt
index c766e1e8a24a..8db522c4fcbb 100644
--- a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-外出先からでも
-サイトを管理
+新しいブログを発見
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_4.txt
index 73d9e89729c8..63a52caa410f 100644
--- a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-すべての統計情報を
-入手する
+読者を集める
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_5.txt
index 038993876e16..d33203e374c6 100644
--- a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-リアルタイムで
-通知を受ける
+サイトをこまめにチェック
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..4e4af026e306
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+リアルタイムで返信
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.html b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.html
index 20325546548c..b1347637f91c 100644
--- a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.html
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.html
@@ -1,2 +1,3 @@
-<strong>Build</strong> and manage
-your website
+自分のサイトを
+<strong>構築</strong>、管理
+
diff --git a/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..91ca4450e5e3
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ja-JP/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+外出先でアップロード
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_1.txt
index 33fbca80dd17..a5bff5b524ce 100644
--- a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_1.txt
@@ -1 +1 @@
-전 세계 사람들과 아이디어 공유
+세계에서 가장 잘 알려진 웹사이트 제작기
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_2.txt
index 3006f35cee2f..7b98dfe13793 100644
--- a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_2.txt
@@ -1 +1 @@
-즐겨 찾는 사이트 즐기기
+사이트를 만들거나 블로그를 시작하세요
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_3.txt
index 9c12bf253391..a130f1f101fe 100644
--- a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_3.txt
@@ -1 +1 @@
-어디에서든 사이트 관리
+새 읽을거리 발견하기
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_4.txt
index 1028309d6c22..f2552a802ce8 100644
--- a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_4.txt
@@ -1 +1 @@
-모든 통계를 간편하게 확인
+독자 유치하기
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_5.txt
index 03ffb9d129f5..c66abce4d86d 100644
--- a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_5.txt
@@ -1 +1 @@
-실시간 알림 받기
+사이트에 탭 유지하기
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..96a5c066c575
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+실시간으로 답변하기
diff --git a/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..bc323ecce3ae
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ko-KR/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+이동하면서 업로드하기
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_1.txt
index 1bda0b27f086..a33a3a26a55d 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Deel je ideeën
-met de wereld
+De populairste sitebouwer ter wereld
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_2.txt
index cdc021d4ba22..2f68c349e17b 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Geniet van je
-favoriete sites
+Maak een site of start een blog
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_3.txt
index 8e48d12d0447..75e1133c51b5 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Beheer je site
-waar je ook bent
+Ontdek nieuwe verhalen
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.html b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.html
index bae6bbd9aee9..b2e2b3876a7f 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.html
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.html
@@ -1,2 +1,2 @@
-<strong>Delen</strong> ongeacht
-locatie
+<strong>Delen</strong>
+vanaf elke locatie
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.txt
index 1a8de7f661db..302f4afcc901 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Alle statistieken
-binnen handbereik
+Bouw een publiek op
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_5.txt
index 6e0a62b62053..757dd122a87b 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Ontvang een melding
-in realtime
+Behoud tabs op je site
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.html b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.html
index 58db9307330a..14f17d627631 100644
--- a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.html
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.html
@@ -1 +1 @@
-<strong>Schrijven</strong> zonder concessies
+<strong>Schrijven</strong> zonder belemmeringen
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..38466a5685a5
--- /dev/null
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Opnieuw afspelen in real time
diff --git a/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..a20a1efbdcde
--- /dev/null
+++ b/fastlane/playstoreres/metadata/nl-NL/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Upload terwijl je onderweg bent
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_1.txt
index 6161cd9be15c..52e5d74f6063 100644
--- a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Dziel się swoimi opiniami 
-ze światem 
+Najbardziej popularna platforma do tworzenia strony internetowej
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_2.txt
index da1f3b55f13a..247ac52f747b 100644
--- a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Ciesz się swoimi 
-ulubionymi witrynami 
+Stwórz witrynę lub zacznij prowadzić bloga
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_3.txt
index c6928621e701..fda7a6df5cd3 100644
--- a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_3.txt
@@ -1 +1 @@
-Zarządzaj swoją witryną gdziekolwiek jesteś 
+Odkrywaj nowe treści
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_4.txt
deleted file mode 100644
index b90b97bdaf19..000000000000
--- a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_4.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Wszystkie statystyki 
-jak na dłoni
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_5.txt
deleted file mode 100644
index c5b56b3aa651..000000000000
--- a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_5.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Otrzymuj powiadomienia 
-w czasie rzeczywistym 
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..c4b986792e23
--- /dev/null
+++ b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Odpowiadaj w czasie rzeczywistym
diff --git a/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..6dc64c78c187
--- /dev/null
+++ b/fastlane/playstoreres/metadata/pl-PL/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Przesyłaj w locie
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_1.txt
index b60fe496fba4..4e66736fdb85 100644
--- a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Compartilhe suas ideias
-com o mundo
+O construtor de sites mais popular do mundo
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_2.txt
index 04adaf2ffb8d..b98f6d89a57e 100644
--- a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Divirta-se com
-seus sites favoritos
+Crie um site ou inicie um blog
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_3.txt
index 74809ba7474a..c6e8be7ab73a 100644
--- a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Gerencie seu site
-de qualquer lugar
+Descubra novas leituras
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_4.txt
index 564d740b2c9e..e1b3f3ea3dac 100644
--- a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Todos os dados
-em suas mãos
+Atraia seu público-alvo
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_5.txt
index 4e0b2af21dec..77cae9bc04ac 100644
--- a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Notificações
-em tempo real
+Mantenha o controle do seu site
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..c7897772f9cd
--- /dev/null
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Responda em tempo real
diff --git a/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..5010f672b4ee
--- /dev/null
+++ b/fastlane/playstoreres/metadata/pt-BR/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Envie arquivos em qualquer lugar
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_1.txt
index 59900c172464..20a4b7629a46 100644
--- a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Делитесь идеями
-с миром
+Самый популярный в мире конструктор сайтов
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_2.txt
index 41e4abe05b1c..00697ff5595a 100644
--- a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Наслаждайтесь
-любимыми сайтами
+Создайте сайт или начните блог
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_3.txt
index e2bd427e5457..27dfd28a7f32 100644
--- a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Управляйте своим сайтом
-отовсюду
+Находите новое чтиво
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_4.txt
index 29eb6089fdb3..f59944f1ec6e 100644
--- a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Вся статистика
-у вас в руках
+Создавайте аудиторию
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_5.txt
index 03c582b9af04..875897d7d306 100644
--- a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_5.txt
@@ -1,3 +1 @@
-Получайте уведомления
-в реальном времени
-
+Следите за своим сайтом
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..e6628b0d4b7f
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Отвечайте в реальном времени
diff --git a/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..d10bc571623d
--- /dev/null
+++ b/fastlane/playstoreres/metadata/ru-RU/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Загружайте на ходу
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_1.txt
index 250cfe7a296a..1b888976747c 100644
--- a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Dela dina idéer med 
-resten av världen
+Världens populäraste webbplatsbyggare
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_2.txt
index 0fd914294f4b..d62ff8d7fd88 100644
--- a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Håll koll på dina 
-favoritwebbplatser
+Skapa en webpplats eller börja blogga
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_3.txt
index 370f55b8c232..eefefbdd325d 100644
--- a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Hantera din webbplats 
-var du än är
+Hitta nya läsare
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_4.txt
index 6f5d6b26c19f..cf8f02da1347 100644
--- a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-All statistik 
-till hands
+Bygg upp en läsekrets
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_5.txt
index 289957ae407b..1b1f78e86ed2 100644
--- a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Få notiser 
-i realtid
+Håll koll på din webbplats
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..f56b10681fa9
--- /dev/null
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Svara i realtid
diff --git a/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..7b465508683d
--- /dev/null
+++ b/fastlane/playstoreres/metadata/sv-SE/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Ladda upp när som helst
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_1.txt
index 6213e5d92728..6879a23d30c7 100644
--- a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-Fikirlerinizi dünya
-ile paylaşın
+Dünyanın en popüler web sitesi oluşturucusu
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_2.txt
index 0e6981481ac5..47d85c1b839b 100644
--- a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-Beğendiğiniz sitelerin
-keyfini çıkarın
+Bir site oluşturun veya bir blog açın
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_3.txt
index b9a7fdc72fa2..c9f1a70aef98 100644
--- a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-Her yerden sitenizi
-kontrol edin
+Okunacak yeni yazıları keşfedin
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_4.txt
index 3b773e4e2345..0642acf8c814 100644
--- a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-Tüm istatistikler
-avucunuzda
+Takipçi kitlesi oluşturun
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_5.txt
index af489559eaec..e2ae080e1011 100644
--- a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-Gerçek zamanlı
-olarak bildirim alın
+Sitenizi dikkatle izleyin
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..d6f68e4b1996
--- /dev/null
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+Gerçek zamanlı cevapla
diff --git a/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..160db33bd7ec
--- /dev/null
+++ b/fastlane/playstoreres/metadata/tr-TR/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+Hareket halindeyken yükle
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_1.txt
index 089802b482b4..325825c35b06 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-与全世界
-分享您的观点
+全球最热门的网站生成器
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_2.txt
index fbde724420ba..caa0736ec245 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-尽情访问
-您喜爱的站点
+创建站点或开通博客
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_3.txt
index 621eaf28020b..431d8078a1dc 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-随时随地
-管理您的站点
+发现新文章
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.html b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.html
index 6ea34e0295ca..48bfc9e30eb7 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.html
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.html
@@ -1,2 +1,2 @@
 <strong>共享</strong>
-不限位置
+不受限
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.txt
index 66947743ca56..10b807970b4e 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-掌握所有
-统计信息
+培养受众
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_5.txt
index 4c59907f5b63..41ad3d352601 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-实时
-获取通知
+保留您的站点标签
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.html b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.html
index 1166dd9acf0d..e0a469d922cd 100644
--- a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.html
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.html
@@ -1 +1 @@
-<strong>轻松撰写</strong>，自由无阻
+<strong>自由撰写</strong>，无需妥协
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..7af1a53b9ad9
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+实时回复
diff --git a/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..a0c495545a89
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-CN/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+随时随地上传
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.html b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.html
new file mode 100644
index 000000000000..cce91172427d
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.html
@@ -0,0 +1,2 @@
+<strong>打造</strong>精美文章
+和網頁
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.txt
index fa8b7484f5e4..19643d43a26a 100644
--- a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.txt
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_1.txt
@@ -1,2 +1 @@
-和全世界
-分享你的想法
+全球最受歡迎的網站建置工具
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.html b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.html
new file mode 100644
index 000000000000..de19c7fff9c9
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.html
@@ -0,0 +1,2 @@
+<strong>追蹤</strong>訪客喜愛的
+內容
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.txt
index bfd0d3eac94d..6ca1edc99632 100644
--- a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.txt
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_2.txt
@@ -1,2 +1 @@
-盡情瀏覽
-你喜愛的網站
+建立網站或網誌
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.html b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.html
new file mode 100644
index 000000000000..0b920ba0209a
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.html
@@ -0,0 +1,2 @@
+即時<strong>掌握</strong>最新
+消息
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.txt
index b3bb3cffabe2..a4eb5543495b 100644
--- a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.txt
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_3.txt
@@ -1,2 +1 @@
-隨時隨地
-管理你的網站
+發掘新讀物
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.html b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.html
new file mode 100644
index 000000000000..fe80c67cd076
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.html
@@ -0,0 +1,2 @@
+<strong>分享</strong>
+可於任何地方
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.txt
index bdef77677f76..fdf44c94427b 100644
--- a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.txt
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_4.txt
@@ -1,2 +1 @@
-所有統計資料
-盡在你掌握
+培養讀者群
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.html b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.html
new file mode 100644
index 000000000000..222598f063b9
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.html
@@ -0,0 +1,2 @@
+隨時隨地<strong>捕捉</strong>
+靈感
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.txt
index 3bcf65e4d957..f792a0f5fc65 100644
--- a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.txt
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_5.txt
@@ -1,2 +1 @@
-即時收到
-通知
+持續關注你的網站
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_6.html b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_6.html
new file mode 100644
index 000000000000..9eed2fa45be0
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_6.html
@@ -0,0 +1 @@
+<strong>盡情撰寫</strong>，不需妥協
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_6.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_6.txt
new file mode 100644
index 000000000000..bd73528942b3
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_6.txt
@@ -0,0 +1 @@
+即時回覆
diff --git a/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_7.txt b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_7.txt
new file mode 100644
index 000000000000..7b97570ec850
--- /dev/null
+++ b/fastlane/playstoreres/metadata/zh-TW/play_store_screenshot_7.txt
@@ -0,0 +1 @@
+行動途中上傳
diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml
index ac207db3142d..6ce035fc6bfb 100644
--- a/fastlane/resources/values/strings.xml
+++ b/fastlane/resources/values/strings.xml
@@ -2,6 +2,7 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="app_name" translatable="false">WordPress</string>
+    <string name="widgets_enabled" translatable="false">true</string>
 
     <!-- account setup -->
     <string name="xmlrpc_missing_method_error">Couldn\'t connect. Required XML-RPC methods are missing on the server.</string>
@@ -12,6 +13,7 @@
         this problem.</string>
     <string name="no_network_title">No network available</string>
     <string name="no_network_message">There is no network available</string>
+    <string name="request_failed_message">There was a problem handling the request. Please try again later.</string>
     <string name="sign_out_wpcom_confirm_with_changes">You have changes to posts that haven’t been uploaded to your site. Logging out now will delete those changes from your device. Log out anyway?</string>
     <string name="sign_out_wpcom_confirm_with_no_changes">Log out of WordPress?</string>
 
@@ -59,6 +61,7 @@
     <string name="remove">Remove</string>
     <string name="removed">Removed</string>
     <string name="search">Search</string>
+    <string name="suggestion">Suggestion:</string>
     <string name="show">Show</string>
     <string name="hide">Hide</string>
     <string name="select_all">Select all</string>
@@ -95,6 +98,7 @@
     <string name="confirm">Confirm</string>
     <string name="cant_open_url">Unable to open the link</string>
     <string name="retry">Retry</string>
+    <string name="disable">Disable</string>
     <string name="invalid_ip_or_range">Invalid IP or IP range</string>
     <string name="copy_text">Copy</string>
     <string name="error_please_choose_browser">Error opening the default web browser. Please choose another app:</string>
@@ -113,7 +117,6 @@
 
     <string name="button_not_now">Not now</string>
 
-    <string name="latitude_longitude">%1$f, %2$f</string>
     <string name="at_username">\@%s</string>
 
     <string name="me">Me</string>
@@ -142,6 +145,7 @@
     <string name="wp_media_title">WordPress media</string>
     <string name="pick_photo">Select photo</string>
     <string name="pick_video">Select video</string>
+    <string name="pick_audio">Select audio</string>
     <string name="pick_media">Add image or video</string>
     <string name="pick_file">Add file</string>
     <string name="capture_or_pick_photo">Capture or select photo</string>
@@ -209,6 +213,7 @@
     <!-- Delete Media -->
     <string name="cannot_delete_multi_media_items">Some media can\'t be deleted at this time. Try again later.</string>
     <string name="cannot_retry_deleted_media_item">Media has been removed. Delete it from this post?</string>
+    <string name="cannot_retry_deleted_media_item_fatal">Media has been removed. Try re-creating your Story.</string>
     <string name="media_empty_list">You don\'t have any media</string>
     <string name="media_empty_search_list">No media matching your search</string>
     <string name="media_empty_image_list">You don\'t have any images</string>
@@ -302,6 +307,7 @@
     <string name="button_discard">Discard</string>
     <string name="button_retry">Retry</string>
     <string name="button_move_to_draft">Move to Draft</string>
+    <string name="button_copy">Duplicate</string>
 
     <!-- post uploads -->
     <string name="upload_failed_param">Upload failed for \"%s\"</string>
@@ -373,18 +379,18 @@
     <string name="dialog_confirm_autosave_restore_button">The version from another device</string>
     <string name="dialog_confirm_autosave_dont_restore_button">The version from this app</string>
 
+    <!-- post confirm copy local post dialog -->
+    <string name="dialog_confirm_copy_local_title">Post sync conflict</string>
+    <string name="dialog_confirm_copy_local_message">The post you are trying to copy has two versions that are in conflict or you recently made changes but didn\'t save them.\nEdit the post first to resolve any conflict or proceed with copying the version from this app.</string>
+    <string name="dialog_confirm_copy_local_edit_button">Edit the post first</string>
+    <string name="dialog_confirm_copy_local_copy_button">Copy the version from this app</string>
+
     <!-- trash post with local changes dialog -->
     <string name="dialog_confirm_trash_losing_local_changes_title">Local changes</string>
     <string name="dialog_confirm_trash_losing_local_changes_message">Trashing this post will also discard local changes, are you sure you want to continue?</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_title">Unsaved changes</string>
     <string name="dialog_confirm_trash_losing_unsaved_changes_message">Trashing this post will also discard unsaved changes, are you sure you want to continue?</string>
 
-    <!-- gutenberg informative dialog -->
-    <string name="dialog_gutenberg_informative_title">Block Editor Enabled</string>
-    <string name="dialog_gutenberg_informative_description_post">You\’re now using the block editor for new posts, great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_page">You\’re now using the block editor for new pages, great! If you\’d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-    <string name="dialog_gutenberg_informative_description_v2">We made big improvements to the block editor and think it\'s worth a try! We enabled it for new posts and pages but if you\'d like to change to the classic editor, go to \'My Site\' &gt; \'Site Settings\'.</string>
-
     <!-- reload drop down -->
     <string name="loading">Loading…</string>
 
@@ -392,6 +398,7 @@
     <string name="on">on</string>
     <string name="comment_status_approved">Approved</string>
     <string name="comment_status_unapproved">Pending</string>
+    <string name="comment_status_unreplied">Unreplied</string>
     <string name="comment_status_spam">Spam</string>
     <string name="comment_status_trash">Trashed</string>
     <string name="comment_status_all">All</string>
@@ -399,6 +406,7 @@
     <string name="comments_empty_list">No comments yet</string>
     <string name="comments_empty_list_filtered_approved">No approved comments</string>
     <string name="comments_empty_list_filtered_pending">No pending comments</string>
+    <string name="comments_empty_list_filtered_unreplied">No unreplied comments</string>
     <string name="comments_empty_list_filtered_spam">No spam comments</string>
     <string name="comments_empty_list_filtered_trashed">No trashed comments</string>
     <string name="comment_reply_to_user">Reply to %s</string>
@@ -613,10 +621,10 @@
     <string name="site_settings_sort_by_title">Sort by</string>
     <string name="site_settings_threading_title">Threading</string>
     <string name="site_settings_paging_title">Paging</string>
-    <string name="site_settings_whitelist_title">Automatically approve</string>
+    <string name="site_settings_allowlist_title">Automatically approve</string>
     <string name="site_settings_multiple_links_title">Links in comments</string>
     <string name="site_settings_moderation_hold_title">Hold for Moderation</string>
-    <string name="site_settings_blacklist_title">Blacklist</string>
+    <string name="site_settings_denylist_title">Disallowed comments</string>
     <string name="site_settings_delete_site_title">Delete Site</string>
     <string name="site_settings_timezones_error">Unable to load timezones</string>
     <string name="site_settings_amp_title">Accelerated Mobile Pages (AMP)</string>
@@ -634,6 +642,7 @@
     <string name="site_settings_cannot_save_homepage_settings_before_pages_loaded">Cannot save homepage settings before pages are loaded</string>
     <string name="site_settings_failed_update_homepage_settings">Homepage settings update failed, check your internet connection</string>
     <string name="site_settings_page_for_posts_and_homepage_cannot_be_equal">Selected homepage and page for posts cannot be the same.</string>
+    <string name="site_settings_timezones_manual_offsets" translatable="false">Manual Offsets</string>
 
     <!-- Media -->
     <string name="site_settings_quota_header">Media</string>
@@ -694,7 +703,7 @@
     <string name="jetpack_send_wp_notifications_title">Send push notifications</string>
     <string name="jetpack_prevent_brute_force_category_title">Brute force attack protection</string>
     <string name="jetpack_prevent_brute_force_title">Block malicious login attempts</string>
-    <string name="jetpack_brute_force_whitelist_title">Whitelisted IP addresses</string>
+    <string name="jetpack_brute_force_allowlist_title">Always allowed IP addresses</string>
     <string name="jetpack_wpcom_sign_in_category_title">WordPress.com login</string>
     <string name="jetpack_allow_wpcom_sign_in_title">Allow WordPress.com login</string>
     <string name="jetpack_match_wpcom_via_email_title">Match accounts using email</string>
@@ -705,9 +714,9 @@
     <string name="site_settings_privacy_hidden_summary">Hidden</string>
     <string name="site_settings_privacy_private_summary">Private</string>
     <string name="site_settings_threading_summary">%d levels</string>
-    <string name="site_settings_whitelist_all_summary">Comments from all users</string>
-    <string name="site_settings_whitelist_known_summary">Comments from known users</string>
-    <string name="site_settings_whitelist_none_summary" translatable="false">@string/none</string>
+    <string name="site_settings_allowlist_all_summary">Comments from all users</string>
+    <string name="site_settings_allowlist_known_summary">Comments from known users</string>
+    <string name="site_settings_allowlist_none_summary" translatable="false">@string/none</string>
     <string name="site_settings_optimize_images_summary">Enable to resize and compress pictures</string>
     <string name="site_settings_optimize_video_summary">Enable to resize and compress videos</string>
 
@@ -792,10 +801,10 @@
     <string name="site_settings_paging_hint">Display comments in chunks of a specified size</string>
     <string name="site_settings_identity_required_hint">Comment author must fill out name and e-mail</string>
     <string name="site_settings_user_account_required_hint">Users must be registered and logged in to comment</string>
-    <string name="site_settings_whitelist_hint">Comment author must have a previously approved comment</string>
+    <string name="site_settings_allowlist_hint">Comment author must have a previously approved comment</string>
     <string name="site_settings_multiple_links_hint">Ignores link limit from known users</string>
     <string name="site_settings_moderation_hold_hint">Comments that match a filter are put in the moderation queue</string>
-    <string name="site_settings_blacklist_hint">Comments that match a filter are marked as spam</string>
+    <string name="site_settings_denylist_hint">Comments that match a filter are marked as spam</string>
 
     <!-- Related Posts -->
     <string name="site_settings_rp_switch_title">Show Related Posts</string>
@@ -814,7 +823,7 @@
     <string name="site_settings_learn_more_header" translatable="false">@string/learn_more</string>
     <string name="site_settings_learn_more_caption">You can override these settings for individual posts.</string>
 
-    <!-- List Editors (Blacklist, Hold for Moderation) -->
+    <!-- List Editors (Denylist, Hold for Moderation) -->
     <string name="site_settings_list_editor_summary_one">1 item</string>
     <string name="site_settings_list_editor_summary_other">%d items</string>
 
@@ -822,8 +831,8 @@
     <string name="site_settings_list_editor_no_items_text">No items</string>
     <string name="site_settings_list_editor_input_hint">Enter a word or phrase</string>
     <string name="site_settings_hold_for_moderation_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the moderation queue. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
-    <string name="site_settings_blacklist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
-    <string name="site_settings_jetpack_whitelist_description">You may whitelist an IP address or series of addresses preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
+    <string name="site_settings_denylist_description">When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. You can enter partial words, so \"press\" will match \"WordPress.\"</string>
+    <string name="site_settings_jetpack_allowlist_description">You may mark an IP address (or series of addresses) as \"Always allowed\", preventing them from ever being blocked by Jetpack. IPv4 and IPv6 are acceptable. To specify a range, enter the low value and high value separated by a dash. Example: 12.12.12.1–12.12.12.100</string>
 
     <!-- Dialogs -->
     <string name="site_settings_discussion_title" translatable="false">@string/discussion</string>
@@ -936,7 +945,7 @@
 
     <!-- Number suffixes -->
     <string name="negative_prefix">-%s</string>
-    <string name="suffix_1_000">%sk</string>
+    <string name="suffix_1_000">%sK</string>
     <string name="suffix_1_000_000">%sM</string>
     <string name="suffix_1_000_000_000">%sB</string>
     <string name="suffix_1_000_000_000_000">%sT</string>
@@ -1007,24 +1016,173 @@
     <string name="login_to_to_connect_jetpack">Log in to the WordPress.com account you used to connect Jetpack.</string>
 
     <!-- activity log -->
-    <string name="activity">Activity</string>
     <string name="activity_log">Activity Log</string>
     <string name="activity_log_icon">Activity icon</string>
     <string name="activity_log_event">Event</string>
-    <string name="rewind">Rewind</string>
     <string name="activity_log_button">Activity Log action button</string>
     <string name="activity_log_jetpack_icon">Jetpack icon</string>
     <string name="activity_log_empty_title">No activity yet</string>
     <string name="activity_log_empty_subtitle">When you make changes to your site you\'ll be able to see your activity history here</string>
-    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRewinding to %1$s %2$s</string>
-    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRewound to %1$s %2$s</string>
+    <string name="activity_log_active_filter_empty_title">No matching events found</string>
+    <string name="activity_log_active_filter_empty_subtitle">Try adjusting your date range or activity type filters</string>
+    <string name="activity_log_rewind_started_snackbar_message">Your site is being restored\nRestoring to %1$s %2$s</string>
+    <string name="activity_log_rewind_finished_snackbar_message">Your site has been successfully restored\nRestored to %1$s %2$s</string>
     <string name="activity_log_rewind_finished_snackbar_message_no_dates">Your site has been successfully restored</string>
+    <string name="activity_log_backup_started_snackbar_message">Your site is being backed up\nBacking up from %1$s %2$s</string>
+    <string name="activity_log_backup_finished_snackbar_message">Your site has been successfully backed up\nBacked up from %1$s %2$s</string>
+    <string name="activity_log_backup_finished_snackbar_message_no_dates">Your site has been successfully backed up</string>
     <string name="activity_log_currently_restoring_title">Currently restoring your site</string>
-    <string name="activity_log_currently_restoring_message">Rewinding to %1$s %2$s</string>
-    <string name="activity_log_currently_restoring_message_no_dates">Rewind in progress</string>
-    <string name="activity_log_rewind_site">Rewind Site</string>
-    <string name="activity_log_rewind_dialog_message">Are you sure you want to rewind your site back to %1$s at %2$s? This will remove all content and options created or changed since then.</string>
+    <string name="activity_log_currently_restoring_message">Restoring to %1$s %2$s</string>
+    <string name="activity_log_currently_restoring_message_no_dates">Restore in progress</string>
+    <string name="activity_log_currently_backing_up_title">Creating downloadable backup</string>
+    <string name="activity_log_currently_backing_up_message">Backing up site from %1$s %2$s</string>
+    <string name="activity_log_currently_backing_up_message_no_dates">Backing up site</string>
     <string name="activity_log_limited_content_on_free_plan">Since you\'re on a free plan, you\'ll see limited events in your activity.</string>
+    <string name="activity_log_activity_type_filter_header">Filter by Activity Type</string>
+    <string name="activity_log_activity_type_filter_apply">Apply</string>
+    <string name="activity_log_activity_type_filter_clear">Clear</string>
+    <string name="activity_log_date_range_filter_label">Date Range</string>
+    <string name="activity_log_date_range_filter_label_content_description">Date Range filter</string>
+    <string name="activity_log_activity_type_filter_label">Activity Type</string>
+    <string name="activity_log_activity_type_filter_active_label">Activity Type (%s)</string>
+    <string name="activity_log_activity_type_error_title">No connection</string>
+    <string name="activity_log_activity_type_error_subtitle">Please check your internet connection and retry.</string>
+    <string name="activity_log_activity_type_empty_title">No activities available</string>
+    <string name="activity_log_activity_type_empty_subtitle">No activities recorded in the selected date range.</string>
+    <string name="activity_log_activity_type_filter_no_item_selected_content_description">Activity Type filter</string>
+    <string name="activity_log_activity_type_filter_single_item_selected_content_description">%s (showing %s items)</string>
+    <string name="activity_log_activity_type_filter_multiple_items_selected_content_description">Activity Type filter (%s types selected)</string>
+
+    <!-- activity log list popup menu -->
+    <string name="activity_log_item_menu_restore_label">Restore to this point</string>
+    <string name="activity_log_item_menu_download_backup_label">Download backup</string>
+
+    <!-- activity log list backup download notice -->
+    <string name="activity_log_backup_download_notice_description_with_two_params" translatable="false">@string/backup_download_complete_description_with_two_parameters</string>
+    <string name="activity_log_backup_download_notice_download_action">Download</string>
+    <string name="activity_log_backup_download_notice_dismiss_action">Dismiss</string>
+
+    <!-- backup -->
+    <string name="backup">Backup</string>
+    <string name="backup_empty_title">Your first backup will be ready soon</string>
+    <string name="backup_empty_subtitle">Your first backup will appear here within 24 hours and you will receive a notification once the backup has been completed</string>
+    <string name="backup_active_filter_empty_title">No matching backups found</string>
+    <string name="backup_active_filter_empty_subtitle">Try adjusting your date range</string>
+
+    <!-- scan -->
+    <string name="scan">Scan</string>
+    <string name="scan_history">Scan History</string>
+    <string name="scan_history_menu_title">History</string>
+
+    <string name="scan_no_network_title" translatable="false">@string/no_network_title</string>
+    <string name="scan_no_network_subtitle" translatable="false">@string/no_network_message</string>
+    <string name="scan_request_failed_title">Something went wrong</string>
+    <string name="scan_request_failed_subtitle" translatable="false">@string/request_failed_message</string>
+    <string name="scan_start_request_failed_title" translatable="false">@string/scan_request_failed_title</string>
+    <string name="scan_start_request_failed_subtitle">Jetpack Scan couldn\'t complete a scan of your site. Please check to see if your site is down – if it\'s not, try again. If it is, or if Jetpack Scan is still having problems, contact our support team.</string>
+
+    <string name="scan_state_icon">Scan state icon</string>
+    <string name="scan_now">Scan now</string>
+    <string name="scan_again">Scan again</string>
+    <string name="scan_preparing_to_scan_title">Preparing to scan</string>
+    <string name="scan_scanning_title">Scanning files</string>
+    <string name="scan_idle_no_threats_found_title">Don\'t worry about a thing</string>
+    <string name="scan_idle_threats_found_title">Your site may be at risk</string>
+    <string name="scan_fixing_threats_title_plural">Fixing Threats</string>
+    <string name="scan_fixing_threats_title_singular">Fixing Threat</string>
+    <string name="scan_scanning_description">We will send you a notification once the scan is complete. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_fixing_threats_description_plural">We\'re hard at work in the background fixing these threats. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_fixing_threats_description_singular">We\'re hard at work in the background fixing this threat. In the meantime feel free to continue to use your site as normal, you can check the progress at anytime.</string>
+    <string name="scan_scanning_is_initial_description">Welcome to Jetpack Scan, we are taking a first look at your site now and the results will be with you soon.</string>
+    <string name="scan_provisioning_description">Welcome to Jetpack Scan! We\'re scoping out your site, setting up to do a full scan. We\'ll let you know if we spot any issues that might impact a scan, then your first full scan will start.</string>
+    <string name="scan_idle_manual_scan_description">To review your site again run a manual scan, or wait for Jetpack to scan your site later today.</string>
+    <string name="scan_idle_last_scan_description">The last Jetpack scan ran %s and did not find any risks. %s</string>
+    <!-- translators: %3$s: "here to help" clickable text linking to help screen inside the app. -->
+    <string name="scan_idle_threats_description_plural">The scan found %1$s potential threats with %2$s. Please review them below and take action or tap the fix all button. We are %3$s if you need us.</string>
+    <!-- translators: %2$s: "here to help" clickable text linking to help screen inside the app. -->
+    <string name="scan_idle_threats_description_singular">The scan found one potential threat with %1$s. Please review the threat below and take action or tap the fix all button. We are %2$s if you need us.</string>
+    <string name="scan_here_to_help">here to help</string>
+    <string name="scan_this_site">this site</string>
+    <string name="scan_in_hours_ago">%s hour(s) ago</string>
+    <string name="scan_in_minutes_ago">%s minute(s) ago</string>
+    <string name="scan_in_few_seconds">a few seconds ago</string>
+    <string name="scan_progress_label" translatable="false">%1$s%%</string>
+    <string name="scan_finished_no_threats_found_message">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; No threats found</string>
+    <string name="scan_finished_potential_threats_found_message_singular">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; One potential threat found</string>
+    <string name="scan_finished_potential_threats_found_message_plural">&lt;b&gt;Scan Finished&lt;/b&gt; &lt;br&gt; %s potential threats found</string>
+
+    <!-- scan history -->
+    <string name="scan_history_all_threats_tab">All</string>
+    <string name="scan_history_fixed_threats_tab">Fixed</string>
+    <string name="scan_history_no_threats_found">No items found</string>
+    <string name="scan_history_ignored_threats_tab">Ignored</string>
+    <string name="scan_history_no_connection" translatable="false">@string/no_network_message</string>
+    <string name="scan_history_request_failed" translatable="false">@string/request_failed_message</string>
+
+    <!-- threats -->
+    <string name="threats_fix_all">Fix All</string>
+    <string name="threats_found_plural">Threats found</string>
+    <string name="threats_found_singular">Threat found</string>
+    <string name="threat_fixing">Fixing threat</string>
+
+    <!-- threat item header -->
+    <string name="threat_item_header_threat_found">Threat found</string>
+    <string name="threat_item_header_infected_core_file">%s: infected core file</string>
+    <string name="threat_item_header_database_threat">Database %s threats</string>
+    <string name="threat_item_header_file_malicious_code_pattern">%s: malicious code pattern</string>
+    <string name="threat_item_header_vulnerable_plugin">Vulnerable Plugin: %s (version %s)</string>
+    <string name="threat_item_header_vulnerable_theme">Vulnerable Theme: %s (version %s)</string>
+
+    <!-- threat item sub header -->
+    <string name="threat_item_sub_header_misc_vulnerability">Miscellaneous vulnerability</string>
+    <string name="threat_item_sub_header_core_file">Vulnerability found in WordPress</string>
+    <string name="threat_item_sub_header_file_signature">Threat found %s</string>
+    <string name="threat_item_sub_header_vulnerable_plugin">Vulnerability found in plugin</string>
+    <string name="threat_item_sub_header_vulnerable_theme">Vulnerability found in theme</string>
+    <string name="threat_item_sub_header_status_fixed_on">Threat fixed on %s</string>
+    <string name="threat_item_sub_header_status_ignored">Threat ignored</string>
+
+    <!-- threat details -->
+    <string name="threat_details">Threat Details</string>
+    <string name="threat_problem_header">What was the problem?</string>
+    <string name="threat_found_header">Found</string>
+    <string name="threat_technical_details_header">The technical details</string>
+    <string name="threat_file_description">Threat found in file:</string>
+    <string name="threat_status_fixed">Fixed</string>
+    <!-- threat fix -->
+    <string name="threat_fix_default_header">How will we fix it?</string>
+    <string name="threat_fix_fixed_header">How did Jetpack fix it?</string>
+    <string name="threat_fix_current_fixable_header" translatable="false">@string/threat_fix_default_header</string>
+    <string name="threat_fix_current_not_fixable_header">Resolving the threat</string>
+    <string name="threat_fix_current_not_fixable_description">Jetpack Scan cannot automatically fix this threat.
+        We suggest that you resolve the threat manually: ensure that WordPress, your theme, and all of your plugins are up to date, and remove the offending code, theme, or plugin from your site. \n \n
+        If you need more help to resolve this threat, we recommend &lt;b&gt;Codeable&lt;/b&gt;, a trusted freelancer marketplace of highly vetted WordPress experts.
+        They have identified a select group of security experts to help with these projects. Pricing ranges from $70–120/hour, and you can get a free estimate with no obligation to hire.
+    </string>
+    <!-- threat fixable -->
+    <string name="threat_fix_fixable_replace">Jetpack Scan will replace the affected file or directory.</string>
+    <string name="threat_fix_fixable_delete">Jetpack Scan will delete the affected file or directory.</string>
+    <string name="threat_fix_fixable_update">Jetpack Scan will update to a newer version (%s).</string>
+    <string name="threat_fix_fixable_edit">Jetpack Scan will edit the affected file or directory.</string>
+    <string name="threat_fix_fixable_default">Jetpack Scan will resolve the threat.</string>
+    <!-- threat button labels -->
+    <string name="threat_fix">Fix threat</string>
+    <string name="threat_ignore">Ignore threat</string>
+    <string name="threat_get_free_estimate">Get a free estimate</string>
+    <!-- threat alert messages -->
+    <string name="threat_fix_error_message">Error fixing threat. Please contact our support.</string>
+    <string name="threat_fix_enter_server_creds_message_singular">Enter your server credentials to fix threat.</string>
+    <string name="threat_fix_enter_server_creds_message_plural">Enter your server credentials to fix threats.</string>
+    <string name="threat_ignore_warning">You shouldn\’t ignore a security issue unless you are absolute sure it\’s harmless. If you choose to ignore this threat, it will remain on your site &lt;b&gt;%s&lt;/b&gt;.</string>
+    <string name="threat_ignore_success_message">Threat ignored.</string>
+    <string name="threat_ignore_error_message">Error ignoring threat. Please contact support.</string>
+    <string name="threat_fix_all_warning_title">Fix all threats</string>
+    <string name="threat_fix_all_confirmation_message_plural">Please confirm you want to fix all %s active threats.</string>
+    <string name="threat_fix_all_confirmation_message_singular">Please confirm you want to fix one active threat.</string>
+    <string name="threat_fix_all_error_message">Error fixing threats. Please contact our support.</string>
+    <string name="threat_fix_all_status_success_message_plural">Threats were successfully fixed.</string>
+    <string name="threat_fix_all_status_success_message_singular">Threat was successfully fixed.</string>
+    <string name="threat_fix_all_status_error_message">Error getting fix status. Please contact our support.</string>
 
     <!-- stats: labels for timeframes -->
     <string name="stats_timeframe_today">Today</string>
@@ -1219,12 +1377,12 @@
 
     <!-- Notification Settings -->
     <string name="notification_settings">Notification Settings</string>
-    <string name="notification_settings_master_status_on">On</string>
-    <string name="notification_settings_master_status_off">Off</string>
-    <string name="notification_settings_master_hint_on">Disable notifications</string>
-    <string name="notification_settings_master_hint_off">Enable notifications</string>
-    <string name="notification_settings_master_off_title">To receive notifications on this device, turn Notification Settings on.</string>
-    <string name="notification_settings_master_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
+    <string name="notification_settings_main_status_on">On</string>
+    <string name="notification_settings_main_status_off">Off</string>
+    <string name="notification_settings_main_hint_on">Disable notifications</string>
+    <string name="notification_settings_main_hint_off">Enable notifications</string>
+    <string name="notification_settings_main_off_title">To receive notifications on this device, turn Notification Settings on.</string>
+    <string name="notification_settings_main_off_message">Turning Notification Settings off will disable all notifications from this app, regardless of type. You can fine-tune which kind of notification you receive after turning Notification Settings on.</string>
     <string name="notification_settings_category_followed_sites">Followed Sites</string>
     <string name="notification_settings_category_your_sites">Your Sites</string>
     <string name="notification_settings_item_your_sites_all_followed_sites">All My Followed Sites</string>
@@ -1263,15 +1421,15 @@
     <string name="notification_settings_followed_dialog_email_comments">Email me new comments</string>
     <string name="notification_settings_followed_dialog_title">Notifications</string>
 
-    <string name="notifications_tab_dialog_master_status_on">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_status_off">Notifications for this site</string>
-    <string name="notifications_tab_dialog_master_hint_on">Disable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_hint_off">Enable notifications display on notifications tab for this site</string>
-    <string name="notifications_tab_dialog_master_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
-    <string name="notifications_tab_dialog_master_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
+    <string name="notifications_tab_dialog_main_status_on">Notifications for this site</string>
+    <string name="notifications_tab_dialog_main_status_off">Notifications for this site</string>
+    <string name="notifications_tab_dialog_main_hint_on">Disable notifications display on notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_hint_off">Enable notifications display on notifications tab for this site</string>
+    <string name="notifications_tab_dialog_main_off_title">To see notifications on notifications tab for this site, turn Notifications for this site on.</string>
+    <string name="notifications_tab_dialog_main_off_message">Turning Notifications for this site off will disable notifications display on notifications tab for this site. You can fine-tune which kind of notification you see after turning Notifications for this site on.</string>
 
-    <string name="master_switch_default_title_on">On</string>
-    <string name="master_switch_default_title_off">Off</string>
+    <string name="main_switch_default_title_on">On</string>
+    <string name="main_switch_default_title_off">Off</string>
 
     <string name="comments_on_my_site">Comments on my site</string>
     <string name="likes_on_my_comments">Likes on my comments</string>
@@ -1312,6 +1470,16 @@
         <item>@string/notif_events</item>
     </string-array>
 
+    <!-- likes -->
+    <string name="get_likes_no_network_error">No network available.</string>
+    <string name="get_likes_unknown_error">An unknown error occurred while getting likes.</string>
+    <string name="get_likes_empty_state_title">An error occurred while getting likes data</string>
+    <string name="like_title_singular">1 Like</string>
+    <string name="like_title_plural">%d Likes</string>
+    <string name="like_faces_singular_text">1 blogger likes this.</string>
+    <string name="like_faces_plural_text">%d bloggers like this.</string>
+    <string name="like_faces_error_loading_message">Error loading like data. %s.</string>
+
     <!-- reader -->
     <string name="reader">Reader</string>
     <string name="reader_filter_cta">Filter</string>
@@ -1333,8 +1501,23 @@
     <string name="reader_discover_recommended_blogs_header">Sites to follow</string>
     <string name="reader_post_details_header_by_author_name">By</string>
     <string name="show_n_hidden_items_desc">%1$s more items</string>
-    <string name="reader_discover_empty_title">Follow topics to discover new blogs</string>
+    <string name="reader_discover_empty_title">Welcome!</string>
+    <string name="reader_discover_empty_subtitle">Follow topics to discover new blogs</string>
+    <string name="reader_discover_no_posts_title">No recent posts</string>
+    <string name="reader_discover_no_posts_subtitle">Try following more topics to broaden the search</string>
     <string name="reader_discover_empty_button_text">Get Started</string>
+    <string name="reader_discover_no_posts_button_text">Follow topics</string>
+    <string name="reader_author_with_blog_name" translatable="false">%1$s ▸ %2$s</string>
+    <string name="reader_follow_comments_null_response">No response received</string>
+    <string name="reader_follow_comments_bad_format_response">Invalid response received</string>
+    <string name="reader_follow_comments_subscribe_success">Successfully subscribed to the comments</string>
+    <string name="reader_follow_comments_unsubscribe_success">Successfully unsubscribed from the comments</string>
+    <string name="reader_follow_comments_get_status_error">Error fetching subscription status for post</string>
+    <string name="reader_follow_comments_could_not_subscribe_error">Could not subscribe to comments for this post</string>
+    <string name="reader_follow_comments_could_not_unsubscribe_error">Could not unsubscribe from comments for this post</string>
+    <string name="reader_marked_post_as_seen">Marked post as seen</string>
+    <string name="reader_marked_post_as_unseen">Marked post as unseen</string>
+    <string name="reader_error_changing_seen_status_of_unsupported_post">Can\'t toggle seen status of this post</string>
 
     <!-- editor -->
     <string name="editor_post_saved_online">Post saved online</string>
@@ -1401,12 +1584,6 @@
     <string name="calendar_scheduled_post_title">WordPress Scheduled Post: \"%s\"</string>
     <string name="calendar_scheduled_post_description">\"%s\" scheduled for publishing on \"%s\" in your WordPress app \n %s</string>
 
-    <!-- location -->
-    <string name="post_settings_location">Location</string>
-    <string name="post_settings_error_placepicker_missing_play_services">Can\'t open the Location Picker, Google Play Services is not available</string>
-    <string name="remove_location">Remove Location</string>
-    <string name="change_location">Change Location</string>
-
     <!-- Post Status -->
     <string name="post_status_publish_post">Publish</string>
     <string name="post_status_pending_review">Pending review</string>
@@ -1423,6 +1600,11 @@
         <item>@string/post_status_post_private</item>
     </string-array>
 
+    <string-array name="post_settings_homepage_statuses" translatable="false">
+        <item>@string/post_status_publish_post</item>
+        <item>@string/post_status_post_private</item>
+    </string-array>
+
     <!-- Aztec -->
     <string name="editor_content_hint">Share your story here…</string>
 
@@ -1446,7 +1628,6 @@
     <string name="menu_undo">Undo</string>
     <string name="menu_redo">Redo</string>
     <string name="menu_debug">Debug Menu</string>
-    <string name="menu_switch_to_aztec_editor">Switch to classic editor</string>
     <string name="menu_switch_to_gutenberg_editor">Switch to block editor</string>
     <string name="menu_content_info">Content structure</string>
 
@@ -1620,6 +1801,8 @@
     <string name="error_media_canceled">Uploading media were canceled</string>
     <string name="error_media_quota_exceeded">Storage quota exceeded</string>
     <string name="error_media_quota_exceeded_toast">Cannot upload file.\nStorage quota was exceeded.</string>
+    <string name="error_media_not_enough_storage">Not enough available site storage</string>
+    <string name="error_media_upload_failed_for_reason">Media upload failed.\n%1$s</string>
     <string name="error_media_xmlrpc_not_allowed">Your action is not allowed</string>
     <string name="error_media_xmlrcp_server_error">Internal server error occurred</string>
     <string name="error_post_does_not_exist">This post no longer exists</string>
@@ -1708,9 +1891,11 @@
     <string name="reader_title_blog_preview">Reader Site</string>
     <string name="reader_title_tag_preview">Topic</string>
     <string name="reader_title_post_detail">Reader Post</string>
+    <string name="reader_title_related_post_detail">Related Post</string>
     <string name="reader_title_subs">Manage Topics &amp; Sites</string>
     <string name="reader_title_photo_viewer">%1$d of %2$d</string>
     <string name="reader_title_comments" translatable="false">@string/comments</string>
+    <string name="reader_title_interests">Follow topics</string>
 
     <!-- view pager titles -->
     <string name="reader_page_followed_tags">Followed topics</string>
@@ -1720,6 +1905,8 @@
     <string name="reader_menu_tags">Edit topics and sites</string>
     <string name="reader_menu_block_blog">Block this site</string>
     <string name="reader_menu_report_post">Report this post</string>
+    <string name="reader_menu_mark_as_seen">Mark as seen</string>
+    <string name="reader_menu_mark_as_unseen">Mark as unseen</string>
 
     <!-- button text -->
     <string name="reader_btn_share">Share</string>
@@ -1727,22 +1914,20 @@
     <string name="reader_btn_unfollow">Following</string>
     <string name="reader_add_bookmark">Add to saved posts</string>
     <string name="reader_remove_bookmark">Remove from saved posts</string>
-    <string name="reader_btn_bookmark">Save</string>
-    <string name="reader_btn_bookmarked">Saved</string>
     <string name="reader_bookmark_snack_btn">View All</string>
     <string name="reader_bookmark_snack_title">Post saved</string>
     <string name="reader_btn_notifications_off">Turn off site notifications</string>
     <string name="reader_btn_notifications_on">Turn on site notifications</string>
     <string name="reader_btn_select_few_interests">Select a few to continue</string>
     <string name="reader_btn_done">Done</string>
-
+    <string name="reader_btn_follow_comments">Follow conversation by email</string>
+    <string name="reader_btn_following_comments">Following conversation by email</string>
 
     <!-- accessibility content desciptions -->
     <string name="reader_btn_remove_filter_content_description">Remove the current filter</string>
     <string name="reader_btn_select_filter_content_description">Select a Site or Tag to filter posts</string>
-    <string name="reader_btn_selected_filter_tick_content_description">Selected</string>
     <string name="reader_bottom_sheet_content_description">Select a Tag or Site, Pop Up Window</string>
-    <string name="reader_choose_interests_content_description">Choose your interests</string>
+    <string name="reader_choose_interests_content_description">Choose your topics</string>
 
     <string name="reader_followed_blog_notifications">Enable notifications for %1$s%2$s%3$s?</string>
     <string name="reader_followed_blog_notifications_action">Enable</string>
@@ -1767,10 +1952,10 @@
     <string name="reader_label_follow_count">%,d Followers</string>
     <string name="reader_label_gap_marker">Load more posts</string>
     <string name="reader_label_post_search_explainer">What would you like to find?</string>
-    <string name="reader_label_local_related_posts">More in %s</string>
+    <string name="reader_label_local_related_posts">More from %s</string>
     <string name="reader_label_global_related_posts">More on WordPress.com</string>
     <string name="reader_label_visit">Visit site</string>
-    <string name="reader_label_choose_your_interests">Choose your interests</string>
+    <string name="reader_label_choose_your_interests">Choose your topics</string>
     <string name="reader_view_comments">View comments</string>
     <string name="reader_welcome_banner">Welcome to Reader. Discover millions of blogs at your fingertips.</string>
     <string name="reader_label_toolbar_back">Back</string>
@@ -1897,7 +2082,6 @@
 
     <!-- Help view -->
     <string name="help">Help</string>
-    <string name="forgot_password" tools:ignore="UnusedResources">Lost your password?</string>
     <string name="browse_our_faq_button">Browse our FAQ</string>
     <string name="my_tickets">My Tickets</string>
     <string name="application_log_button">Application log</string>
@@ -1905,13 +2089,19 @@
     <string name="support_contact_email_not_set">Not set</string>
     <string name="support_push_notification_title">WordPress</string>
     <string name="support_push_notification_message">New message from \'Help &amp; Support\'</string>
-    <string name="contact_fragment_title">@string/contact_support</string>
+    <string name="contact_fragment_title" translatable="false">@string/contact_support</string>
+
+    <!-- Contact us -->
+    <!--Note: Support ticket subject, only visible to the end users of the Zendesk support portal, doesn't need a translation -->
+    <string name="support_ticket_subject" translatable="false">WordPress for Android Support</string>
 
     <!--My Site-->
     <string name="my_site_header_external">External</string>
     <string name="my_site_header_configuration">Configuration</string>
     <string name="my_site_header_look_and_feel">Look and Feel</string>
+    <string name="my_site_header_jetpack">Jetpack</string>
     <string name="my_site_header_publish">Publish</string>
+    <string name="my_site_btn_jetpack_settings">Jetpack Settings</string>
     <string name="my_site_btn_site_pages">Site Pages</string>
     <string name="my_site_btn_blog_posts">Blog Posts</string>
     <string name="my_site_btn_sharing">Sharing</string>
@@ -1924,7 +2114,6 @@
     <string name="my_site_create_new_site">Create a new site for your business, magazine, or personal blog; or connect an existing WordPress installation.</string>
     <string name="my_site_create_new_site_title">You don\'t have any sites</string>
     <string name="my_site_add_new_site">Add new site</string>
-    <string name="my_site_select_domains_page_title">Site Address</string>
     <string name="my_site_custom_domain_name">All WordPress.com plans include a custom domain name. Register your free premium domain now.</string>
     <string name="my_site_verify_your_email">Verify your email address - instructions sent to %s</string>
     <string name="my_site_verify_your_email_without_email">Verify your email address - instructions sent to your email</string>
@@ -2078,7 +2267,7 @@
     <string name="viewer_remove_confirmation_message">If you remove this viewer, he or she will not be able to visit this site.\n\nWould you still like to remove this viewer?</string>
     <string name="person_removed">Successfully removed %1$s</string>
     <string name="invite_people">Invite People</string>
-    <string name="invite_names_title">Usernames or Emails</string>
+    <string name="invite_names_title">Usernames or emails</string>
     <string name="invite">Invite</string>
     <string name="button_invite" translatable="false">@string/invite</string>
     <string name="invite_username_not_found">%s: User not found</string>
@@ -2086,11 +2275,7 @@
     <string name="invite_already_following">%s: Already following</string>
     <string name="invite_user_blocked_invites">%s: User blocked invites</string>
     <string name="invite_invalid_email">%s: Invalid email</string>
-    <string name="invite_message_title">Custom Message</string>
-    <string name="invite_message_remaining_zero">0 characters remaining</string>
-    <string name="invite_message_remaining_one">1 character remaining</string>
-    <string name="invite_message_remaining_other">%d characters remaining</string>
-    <string name="invite_message_info">(Optional) You can enter a custom message of up to 500 characters that will be included in the invitation to the user(s).</string>
+    <string name="invite_message_title">Custom message</string>
     <string name="invite_message_usernames_limit">Invite up to 10 email addresses and/or WordPress.com usernames. Those needing a username will be sent instructions on how to create one.</string>
     <string name="invite_error_no_usernames">Please add at least one username</string>
     <string name="invite_error_invalid_usernames_one">Cannot send: A username or email is invalid</string>
@@ -2100,6 +2285,9 @@
     <string name="invite_error_for_username">%1$s: %2$s</string>
     <string name="invite_sent">Invite sent successfully</string>
 
+    <string name="people_learn_more_about_roles">Learn more about roles</string>
+    <string name="people_optional_custom_message_helper_text">Optional: enter a custom message to be sent with your invitation.</string>
+
     <string name="people_dropdown_item_team">Team</string>
     <string name="people_dropdown_item_followers">Followers</string>
     <string name="people_dropdown_item_email_followers">Email Followers</string>
@@ -2115,6 +2303,21 @@
     <string name="role_follower">Follower</string>
     <string name="role_viewer">Viewer</string>
 
+    <string name="invite_links_section_title">Invite Link</string>
+    <string name="invite_links_get_status_retry">Refresh links status</string>
+    <string name="invite_links_generate">Generate new link</string>
+    <string name="invite_links_share_invite_link">Share invite link</string>
+    <string name="invite_links_disable_invite_link">Disable invite link</string>
+    <string name="invite_links_expire_date">Expires %1$s</string>
+    <string name="invite_links_helper_text">Use this link to onboard your team members without having to invite them one by one. Anybody visiting this URL will be able to sign up to your organization, even if they received the link from somebody else, so make sure that you share it with trusted people.</string>
+    <string name="invite_links_generic_get_data_error">Unknown error fetching invite links data</string>
+    <string name="invite_links_cannot_get_roles_error">There was an error getting roles</string>
+    <string name="invite_links_cannot_get_role_data_error">There was an error getting data for role %1$s</string>
+    <string name="invite_links_null_response">No response received</string>
+    <string name="invite_links_bad_format_response">Invalid response received</string>
+    <string name="invite_links_disable_dialog_title">Disable invite link</string>
+    <string name="invite_links_disable_dialog_message">Once this invite link is disabled, nobody will be able to use it to join your team. Are you sure?</string>
+
     <!--Plugins-->
     <string name="plugins">Plugins</string>
     <string name="plugin_byline">by %s</string>
@@ -2312,9 +2515,14 @@
     <string name="edit">Edit</string>
     <string name="tap_to_try_again">Tap to try again!</string>
     <string name="add_media_progress">Adding media</string>
-    <string name="suggestion_invalid_user">"%s is not a valid user"</string>
-    <string name="suggestion_no_matching_users">"No matching users available."</string>
-    <string name="suggestion_no_connection">"No internet connection.\nSuggestions are unavailable."</string>
+    <string name="suggestion_invalid">%s is not a valid %s</string>
+    <string name="suggestion_selection_needed">Please type to filter the list of suggestions.</string>
+    <string name="suggestion_none">No %s suggestions available.</string>
+    <string name="suggestion_problem">There was a problem loading suggestions.</string>
+    <string name="suggestion_no_matching">No matching %s.</string>
+    <string name="suggestion_no_connection">No internet connection.\nSuggestions are unavailable.</string>
+    <string name="suggestion_user">user</string>
+    <string name="suggestion_xpost">crosspost</string>
 
     <string name="stop_upload_dialog_title">Stop uploading?</string>
 
@@ -2338,6 +2546,7 @@
     <string name="photo_picker_choose_photo">Choose photo from device</string>
     <string name="photo_picker_choose_video">Choose video from device</string>
     <string name="photo_picker_choose_file">Choose from device</string>
+    <string name="photo_picker_choose_audio">Choose audio from device</string>
     <string name="photo_picker_capture_photo">Take photo</string>
     <string name="photo_picker_capture_video">Take video</string>
     <string name="photo_picker_stock_media">Choose from Free Photo Library</string>
@@ -2348,6 +2557,7 @@
     <string name="photo_picker_soft_ask_permissions_denied">%1$s was denied access to your photos. To fix this, edit your permissions and turn on %2$s.</string>
     <string name="photo_picker_use_photo">Use this photo</string>
     <string name="photo_picker_use_video">Use this video</string>
+    <string name="photo_picker_use_audio">Use this audio</string>
     <string name="photo_picker_use_media">Use this media</string>
     <string name="photo_picker_use_gif">Use this GIF</string>
     <string name="photo_picker_image_thumbnail_content_description">Image Thumbnail</string>
@@ -2405,7 +2615,7 @@
     <string name="login_prologue_title_second">With the powerful editor you can post on the go.</string>
     <string name="login_prologue_title_third">See comments and notifications in real time.</string>
     <string name="login_prologue_title_fourth">Watch your audience grow with in-depth analytics.</string>
-    <string name="login_prologue_title_fifth">Follow your favorite sites and discover new reads.</string>
+    <string name="login_prologue_title_fifth">Follow your favorite sites and discover new blogs.</string>
     <string name="login_prologue_second_subtitle_one">Getting Inspired</string>
     <string name="login_prologue_second_subtitle_two">I am so inspired by photographer Cameron Karsten\’s work. I will be trying these techniques on my next</string>
     <string name="login_prologue_third_subtitle_one">&lt;b&gt;Madison Ruiz&lt;/b&gt; liked your post</string>
@@ -2424,21 +2634,15 @@
     <string name="login_prologue_fifth_caption_two">The World\'s Best Fans</string>
     <string name="login_prologue_fifth_caption_three">Museums in London</string>
     <string name="invalid_verification_code">Invalid verification code</string>
-    <string name="send_link" tools:ignore="UnusedResources">Send link</string>
-    <string name="enter_your_password_instead" tools:ignore="UnusedResources">Enter your password instead</string>
     <string name="send_link_by_email">Send link by email</string>
     <string name="create_account">Create account</string>
     <string name="or_type_your_password">Or type your password</string>
-    <string name="alternatively">Alternatively:</string>
     <string name="enter_email_wordpress_com">Log in to WordPress.com using an email address to manage all your WordPress sites.</string>
     <string name="enter_email_to_continue_wordpress_com">Enter your email address to log in or create a WordPress.com account.</string>
     <string name="enter_email_for_site">Log in with WordPress.com to connect to %1$s</string>
     <string name="get_started">Get Started</string>
     <string name="next">Next</string>
-    <string name="open_mail" tools:ignore="UnusedResources">Open mail</string>
     <string name="check_email">Check email</string>
-    <string name="enter_site_address_instead">Log in by entering your site address.</string>
-    <string name="enter_username_instead">Log in with your username.</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
     <string name="enter_verification_code_sms">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>
     <string name="login_text_otp">Text me a code instead</string>
@@ -2450,6 +2654,7 @@
     <string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from WordPress.com.</string>
     <string name="login_magic_link_email_requesting">Requesting log-in email</string>
     <string name="magic_link_not_seeing_email_message">Not seeing the email? Check your Spam or Junk Mail folder.</string>
+    <string name="magic_link_not_meaning_to_create_account">Didn\'t mean to create a new account? Go back to re-enter your email address.</string>
     <string name="login_get_link_by_email">Get a login link by email</string>
     <string name="enter_wpcom_password">Enter your WordPress.com password.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
@@ -2461,11 +2666,11 @@
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="enter_site_address_share_intent">Enter the address of your WordPress site you\'d like to share the content to.</string>
     <string name="login_site_address">Site address</string>
-    <string name="login_site_address_help" tools:ignore="UnusedResources">Need help finding your site address?</string>
     <string name="login_site_address_help_title">What\'s my site address?</string>
     <string name="login_site_address_help_content">Your site address appears in the bar at the top of the screen when you visit your site in Chrome.</string>
     <string name="login_site_address_more_help">Need more help?</string>
     <string name="login_find_your_site_adress">Find your site address</string>
+    <string name="login_find_your_connected_email">Find your connected email</string>
     <string name="login_checking_site_address">Checking site address</string>
     <string name="login_error_while_adding_site">Error while adding site. Error code: %s</string>
     <string name="login_log_in_for_deeplink">Log in to WordPress.com to access the post.</string>
@@ -2474,12 +2679,11 @@
     <string name="login_empty_username">Please enter a username</string>
     <string name="login_empty_password">Please enter a password</string>
     <string name="login_empty_2fa">Please enter a verification code</string>
-    <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
     <string name="login_email_client_not_found">Can\'t detect your email client app</string>
     <string name="login_epilogue_mysites_one">My site</string>
     <string name="login_epilogue_mysites_other">My sites</string>
-    <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="continue_google_button_suffix">Continue with Google</string>
+    <string name="continue_site_credentials">Continue with store credentials</string>
     <string name="login_or">or</string>
     <string name="login_error_button">Close</string>
     <string name="login_error_email_not_found_v2">There\'s no WordPress.com account matching this Google account.</string>
@@ -2488,17 +2692,20 @@
     <string name="login_error_generic_start">Google login could not be started.</string>
     <string name="login_error_suffix">\nMaybe try a different account?</string>
     <string name="enter_wpcom_or_jetpack_site">Please enter a WordPress.com or Jetpack-connected self-hosted WordPress site</string>
-    <string name="enter_wordpress_site">The website at this address is not a WordPress site. For us to connect to it, the site must have WordPress installed.</string>
-    <string name="login_need_help_finding_connected_email">Need help finding the email you connected with?</string>
-    <string name="send_verification_email">Send verification email</string>
     <string name="enter_credentials_for_site" tools:ignore="UnusedResources">Log in with your %1$s site credentials</string>
     <string name="enter_account_info_for_site">Enter your account information for %1$s.</string>
-    <string name="enter_site_credentials_instead">Log in with site credentials.</string>
     <string name="login_site_credentials_magic_link_label">Almost there! We just need to verify your Jetpack connected email address &lt;b&gt;%1$s&lt;/b&gt;</string>
     <string name="login_discovery_error_xmlrpc">We were unable to access the &lt;b&gt;XMLRPC file&lt;/b&gt; on your site. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_http_auth">We were unable to access your site because it requires &lt;b&gt;HTTP Authentication&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b&gt;SSL Certificate&lt;/b&gt;. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_generic">We were unable to access your site. You will need to reach out to your host to resolve this.</string>
+    <string name="login_not_a_jetpack_site">To use this app for %1$s you\'ll need to have the Jetpack plugin installed and connected to your WordPress.com account.</string>
+    <string name="login_no_jetpack_sites">No Jetpack sites found</string>
+    <string name="login_empty_view_avatar_content_description">Your profile photo</string>
+    <string name="login_no_jetpack_sites_error_message">If you already have a site, you\'ll need to install the free Jetpack plugin and connect it to your Wordpress account.</string>
+    <string name="login_empty_view_see_instructions">See instructions</string>
+    <string name="login_empty_view_try_another_account">Try with another account</string>
+
     <!-- Screen titles -->
     <string name="email_address_login_title">Email address login</string>
     <string name="site_address_login_title">Site address login</string>
@@ -2509,9 +2716,6 @@
 
     <!-- Signup -->
     <string name="sign_up_label">Sign Up</string>
-    <string name="sign_up">Sign Up for WordPress.com</string>
-    <string name="signup_email_error_generic">There was some trouble checking the email address.</string>
-    <string name="signup_email_header">To create your new WordPress.com account, please enter your email address.</string>
     <string name="signup_epilogue_error_avatar">There was some trouble uploading your avatar.</string>
     <string name="signup_epilogue_error_avatar_view">Your avatar has been uploaded and will be available shortly.</string>
     <string name="signup_epilogue_error_generic">There was some trouble updating your account. You can retry or revert your changes to continue.</string>
@@ -2527,22 +2731,17 @@
     <string name="signup_magic_link_message">We’ve emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.</string>
     <string name="signup_magic_link_progress">Sending email</string>
     <string name="signup_confirmation_message">We’ll use this email address to create your new WordPress.com account.</string>
-    <string name="signup_confirmation_magic_link_message">We’ll email you a signup link to create your new WordPress.com account.</string>
-    <string name="signup_terms_of_service_text">By signing up, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_terms_of_service_text">By continuing, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_with_google_terms_of_service_text">If you continue with Google and don\'t already have a WordPress.com account, you are creating an account and you agree to our %1$sTerms of Service%2$s.</string>
     <string name="signup_updating_account">Updating account…</string>
     <string name="signup_user_exists">Email already exists on WordPress.com.\nProceeding with login.</string>
-    <string name="signup_with_email_button">Sign Up with Email</string>
-    <string name="signup_with_google_button">Sign Up with Google</string>
     <string name="signup_with_google_progress">Signing up with Google…</string>
     <string name="content_description_add_avatar">Add avatar</string>
     <!-- Screen titles -->
-    <string name="signup_email_screen_title">Email signup</string>
     <string name="signup_magic_link_title">Magic link sent</string>
     <string name="signup_confirmation_title">Signup confirmation</string>
 
-    <string name="continue_with_wpcom">Continue with WordPress.com</string>
+    <string name="continue_with_wpcom">Log in or sign up with WordPress.com</string>
     <string name="enter_your_site_address">Enter your existing site address</string>
 
     <string name="username_changer_action">Save</string>
@@ -2656,28 +2855,17 @@
     <string name="quick_start_remove_next_steps_menu_title">Remove this</string>
     <string name="quick_start_dialog_remove_next_steps_title">Remove Next Steps</string>
     <string name="quick_start_dialog_remove_next_steps_message">Removing Next Steps will hide all tours on this site. This action cannot be undone.</string>
-    <string name="quick_start_dialog_browse_themes_message">Explore dozens of layout options and find your perfect fit.</string>
-    <string name="quick_start_dialog_browse_themes_message_short" tools:ignore="UnusedResources">Tap %1$s Themes %2$s to discover new themes</string>
-    <string name="quick_start_dialog_browse_themes_title">Browse themes</string>
     <string name="quick_start_dialog_check_stats_message">Keep up to date on your site\'s performance.</string>
     <string name="quick_start_dialog_check_stats_title">Check your site stats</string>
-    <string name="quick_start_dialog_choose_theme_title">Choose a theme</string>
-    <string name="quick_start_dialog_choose_theme_message">Browse all our themes to find your perfect fit.</string>
-    <string name="quick_start_dialog_create_page_message">Add a page for key content — an \"About\" page is a great start.</string>
-    <string name="quick_start_dialog_create_page_title">Create a new page</string>
-    <string name="quick_start_dialog_customize_site_message">Tweak fonts, add images, and more.</string>
-    <string name="quick_start_dialog_customize_site_message_short_customize">Tap %1$s Customize %2$s to start personalizing your site</string>
-    <string name="quick_start_dialog_customize_site_message_short_themes" tools:ignore="UnusedResources">Tap %1$s Themes %2$s to continue</string>
-    <string name="quick_start_dialog_customize_site_title">Customize your site</string>
-    <string name="quick_start_dialog_enable_sharing_message">Automatically share new posts to your social media accounts.</string>
+    <string name="quick_start_dialog_enable_sharing_message" tools:ignore="UnusedResources">Automatically share new posts to your social media accounts.</string>
     <string name="quick_start_dialog_enable_sharing_message_short_connections">Tap the %1$s Connections %2$s to add your social media accounts</string>
     <string name="quick_start_dialog_enable_sharing_message_short_sharing" tools:ignore="UnusedResources">Tap %1$s Sharing %2$s to continue</string>
-    <string name="quick_start_dialog_enable_sharing_title">Enable post sharing</string>
+    <string name="quick_start_dialog_enable_sharing_title" tools:ignore="UnusedResources">Enable post sharing</string>
     <string name="quick_start_dialog_explore_plans_message">Learn about the marketing and SEO tools in our paid plans.</string>
     <string name="quick_start_dialog_explore_plans_title">Explore plans</string>
     <string name="quick_start_dialog_follow_sites_message">Find sites that inspire you, and follow them to get updates when they post.</string>
     <string name="quick_start_dialog_follow_sites_message_short_reader" tools:ignore="UnusedResources">Tap %1$s Reader %2$s to continue</string>
-    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar interests</string>
+    <string name="quick_start_dialog_follow_sites_message_short_search">Tap %1$s Search %2$s to look for sites with similar topics</string>
     <string name="quick_start_dialog_follow_sites_title">Follow other sites</string>
     <string name="quick_start_dialog_migration_message">We\'ve added more tasks to help you grow your audience.</string>
     <string name="quick_start_dialog_migration_title">We\'ve made some changes to your checklist</string>
@@ -2693,8 +2881,6 @@
     <string name="quick_start_dialog_share_site_message">Connect to your social media accounts – your site will automatically share new posts.</string>
     <string name="quick_start_dialog_upload_site_icon_message_short" tools:ignore="UnusedResources">Tap %1$s Your Site Icon %2$s to upload a new one</string>
     <string name="quick_start_dialog_check_stats_message_short" tools:ignore="UnusedResources">Tap %1$s Stats %2$s to see how your site is performing.</string>
-    <string name="quick_start_dialog_create_new_page_message_short" tools:ignore="UnusedResources">Tap %1$s Pages %2$s to continue.</string>
-    <string name="quick_start_dialog_create_new_page_message_short_pages">Tap %1$s Add Page %2$s to create a new page.</string>
     <string name="quick_start_dialog_create_new_post_message_short" tools:ignore="UnusedResources">Tap %1$s Create. %2$s Then select &lt;b&gt;Blog post&lt;/b&gt;</string>
     <string name="quick_start_dialog_explore_plans_message_short" tools:ignore="UnusedResources">Tap %1$s Plan %2$s to see your current plan and other available plans</string>
     <string name="quick_start_dialog_upload_icon_message">Your visitors will see your icon in their browser. Add a custom icon for a polished, pro look.</string>
@@ -2703,39 +2889,52 @@
     <string name="quick_start_dialog_view_site_message_short" tools:ignore="UnusedResources">Tap %1$s View Site %2$s to preview your site</string>
     <string name="quick_start_dialog_view_site_title">View your site</string>
     <string name="quick_start_dialog_update_site_title_message_short">Tap &lt;b&gt;%1$s&lt;/b&gt; to set a new title</string>
+    <string name="quick_start_dialog_edit_homepage_title">Edit your homepage</string>
+    <string name="quick_start_dialog_edit_homepage_message">Change, add, or remove content from your site\'s homepage.</string>
+    <string name="quick_start_dialog_edit_homepage_message_short" tools:ignore="UnusedResources">Select %1$s Pages %2$s to see your page list.</string>
+    <string name="quick_start_dialog_edit_homepage_message_pages_short" tools:ignore="UnusedResources">Select %1$s Homepage %2$s to edit your Homepage.</string>
+    <string name="quick_start_dialog_review_pages_title">Review site pages</string>
+    <string name="quick_start_dialog_review_pages_message">Change, add, or remove your site\'s pages.</string>
+    <string name="quick_start_dialog_review_pages_message_short" tools:ignore="UnusedResources">Select %1$s Pages %2$s to see your page list.</string>
     <string name="quick_start_complete_tasks_header">Complete (%d)</string>
-    <string name="quick_start_list_browse_themes_subtitle" translatable="false">@string/quick_start_dialog_browse_themes_message</string>
-    <string name="quick_start_list_browse_themes_title" translatable="false">@string/quick_start_dialog_browse_themes_title</string>
     <string name="quick_start_list_check_stats_subtitle" translatable="false">@string/quick_start_dialog_check_stats_message</string>
-    <string name="quick_start_list_check_stats_title" translatable="false">@string/quick_start_dialog_check_stats_title</string>
-    <string name="quick_start_list_create_page_subtitle" translatable="false">@string/quick_start_dialog_create_page_message</string>
-    <string name="quick_start_list_create_page_title" translatable="false">@string/quick_start_dialog_create_page_title</string>
+    <string name="quick_start_list_check_stats_title">Check your stats</string>
     <string name="quick_start_list_create_site_subtitle">Get your site up and running.</string>
     <string name="quick_start_list_create_site_title">Create your site</string>
     <string name="quick_start_list_update_site_title_title">Set your site title</string>
-    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic. First impressions count!</string>
-    <string name="quick_start_list_customize_site_subtitle" translatable="false">@string/quick_start_dialog_customize_site_message</string>
-    <string name="quick_start_list_customize_site_title" translatable="false">@string/quick_start_dialog_customize_site_title</string>
-    <string name="quick_start_list_enable_sharing_subtitle" translatable="false">@string/quick_start_dialog_enable_sharing_message</string>
-    <string name="quick_start_list_enable_sharing_title" translatable="false">@string/quick_start_dialog_enable_sharing_title</string>
+    <string name="quick_start_list_update_site_title_subtitle">Give your site a name that reflects its personality and topic.</string>
+    <string name="quick_start_list_enable_sharing_subtitle">Automatically share new posts to your social media.</string>
+    <string name="quick_start_list_enable_sharing_title">Enable sharing</string>
     <string name="quick_start_list_explore_plans_subtitle" translatable="false">@string/quick_start_dialog_explore_plans_message</string>
     <string name="quick_start_list_explore_plans_title" translatable="false">@string/quick_start_dialog_explore_plans_title</string>
-    <string name="quick_start_list_follow_site_subtitle" translatable="false">@string/quick_start_dialog_follow_sites_message</string>
+    <string name="quick_start_list_follow_site_subtitle">Discover and follow sites that inspire you.</string>
     <string name="quick_start_list_follow_site_title" translatable="false">@string/quick_start_dialog_follow_sites_title</string>
     <string name="quick_start_list_publish_post_subtitle" translatable="false">@string/quick_start_dialog_publish_post_message</string>
     <string name="quick_start_list_publish_post_title" translatable="false">@string/quick_start_dialog_publish_post_title</string>
-    <string name="quick_start_list_upload_icon_subtitle" translatable="false">@string/quick_start_dialog_upload_icon_message</string>
+    <string name="quick_start_list_upload_icon_subtitle">Add a site icon for a polished, pro look.</string>
     <string name="quick_start_list_upload_icon_title" translatable="false">@string/quick_start_dialog_upload_icon_title</string>
     <string name="quick_start_list_view_site_subtitle" translatable="false">@string/quick_start_dialog_view_site_message</string>
-    <string name="quick_start_list_view_site_title" translatable="false">@string/quick_start_dialog_view_site_title</string>
+    <string name="quick_start_list_view_site_title">Visit your site</string>
+    <string name="quick_start_list_edit_homepage_subtitle" translatable="false">@string/quick_start_dialog_edit_homepage_message</string>
+    <string name="quick_start_list_edit_homepage_title" translatable="false">@string/quick_start_dialog_edit_homepage_title</string>
+    <string name="quick_start_list_review_pages_subtitle">Check your pages and make changes, or add or remove pages.</string>
+    <string name="quick_start_list_review_pages_title" translatable="false">@string/quick_start_dialog_review_pages_title</string>
     <string name="quick_start_sites">Next Steps</string>
-    <string name="quick_start_sites_type_customize">Customize Your Site</string>
-    <string name="quick_start_sites_type_grow">Grow Your Audience</string>
+    <string name="quick_start_sites_type_customize">Customize your site</string>
+    <string name="quick_start_sites_type_grow">Grow your audience</string>
     <string name="quick_start_sites_type_subtitle">%1$d of %2$d complete</string>
     <string name="quick_start_span_end" translatable="false">&lt;/span&gt;</string>
     <string name="quick_start_span_start" translatable="false">&lt;span&gt;</string>
     <string name="quick_start_focus_point_description">tap here</string>
 
+    <string name="quick_start_card_menu_pin">Pin this</string>
+    <string name="quick_start_card_menu_unpin">Unpin this</string>
+    <string name="quick_start_card_menu_hide">Hide for now</string>
+    <string name="quick_start_card_menu_remove">Don\'t show again</string>
+
+    <string name="quick_start_completed_type_customize_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ve customized your site. Well done!</string>
+    <string name="quick_start_completed_type_grow_message">&lt;b&gt;All tasks completed&lt;/b&gt;&lt;br/&gt;You’ll reach more people. Nice job!</string>
+
     <!-- Pages -->
     <string name="pages_published" tools:ignore="UnusedResources">Published</string>
     <string name="pages_drafts" tools:ignore="UnusedResources">Drafts</string>
@@ -2761,8 +2960,9 @@
     <string name="pages_and_posts_cancel_auto_upload">Cancel upload</string>
     <string name="pages_list_author">Page author</string>
     <string name="pages_cannot_be_started">We cannot open pages at the moment. Please try again later</string>
-    <string name="pages_item_subtitle">%1$s · %2$s</string>
-    <string name="pages_item_subtitle_date_author">%1$s · %2$s · %3$s</string>
+    <string name="pages_item_date_subtitle">%1$s ·</string>
+    <string name="pages_item_date_author">%1$s · %2$s</string>
+    <string name="pages_item_date_author_subtitle">%1$s · %2$s ·</string>
 
     <string name="page_status_pending_review" translatable="false">@string/post_status_pending_review</string>
     <string name="page_status_page_private" translatable="false">@string/post_status_post_private</string>
@@ -2818,7 +3018,10 @@
 
     <!-- Web Preview -->
     <string name="web_preview_default">Default</string>
+    <string name="web_preview_mobile">Mobile</string>
+    <string name="web_preview_tablet">Tablet</string>
     <string name="web_preview_desktop">Desktop</string>
+    <string name="web_preview_width_script" translatable="false">let parent = document.querySelector(\'meta[name=viewport]\'); parent.setAttribute(\'content\',\'width=%1$d, initial-scale=1\');</string>
 
     <string name="create_post_page_fab_tooltip">Create a post or page</string>
     <string name="create_post_page_fab_tooltip_contributors">Create a post</string>
@@ -2835,16 +3038,15 @@
     <string name="new_site_creation_screen_title_step_count">%1$d of %2$d</string>
     <string name="new_site_creation_preview_title">Your site has been created!</string>
     <string name="new_site_creation_preview_subtitle">You\'ll be able to customize look and feel of your site later</string>
-    <string name="site_creation_segments_title">Tell us what kind of site you\’d like to make</string>
-    <string name="site_creation_segments_subtitle">This helps us make recommendations. But you’re never locked in — all sites evolve!</string>
     <string name="site_creation_fetch_suggestions_error_unknown">There was a problem</string>
     <string name="site_creation_error_generic_title">There was a problem</string>
     <string name="site_creation_error_generic_subtitle">Error communicating with the server, please try again</string>
     <string name="new_site_creation_empty_domain_list_message">No available addresses matching your search</string>
     <string name="new_site_creation_unavailable_domain">This domain is unavailable</string>
-    <string name="new_site_creation_domain_header_title">Choose a domain name for your site</string>
+    <string name="new_site_creation_domain_header_title">Choose a domain</string>
     <string name="new_site_creation_domain_header_subtitle">This is where people will find you on the internet.</string>
-    <string name="new_site_creation_search_domain_input_hint">Search Domains</string>
+    <string name="new_site_creation_search_domain_input_hint">Type a name for your site</string>
+    <string name="new_site_creation_search_domain_example">example.com</string>
     <string name="site_creation_domain_finish_button">Create site</string>
     <string name="new_site_creation_create_site_button">Create Site</string>
     <string name="notification_new_site_creation_title">Create Site</string>
@@ -2914,7 +3116,6 @@
     <string name="mlp_create_blank_page">Create blank page</string>
     <string name="mlp_create_page">Create page</string>
     <string name="mlp_preview_page">Preview</string>
-    <string name="mlp_preview_title">Layout Preview</string>
     <string name="mlp_selected_description">%s selected</string>
     <string name="mlp_notselected_description">%s</string>
     <string name="mlp_notice_page_created">Page created</string>
@@ -2926,15 +3127,28 @@
 
     <!-- Home Page Picker -->
     <string name="hpp_title">Choose a design</string>
-    <string name="hpp_subtitle">Pick your favorite homepage layout. You can customize or change it later.</string>
+    <string name="hpp_subtitle">Pick your favorite homepage layout. You can edit and customize it later.</string>
     <string name="hpp_choose_button">Choose</string>
     <string name="hpp_skip_button">Skip</string>
-
+    <string name="hpp_error_title">Layouts not available while offline</string>
+    <string name="hpp_error_subtitle">Tap retry when you\'re back online.</string>
+    <string name="hpp_retry_error">Please Check your internet connection and retry.</string>
+    <string name="hpp_choose_error">There was an error while selecting the design.</string>
+
+    <!-- Stories -->
+    <string name="dialog_edit_story_limited_title">Limited Story Editing</string>
+    <string name="dialog_edit_story_limited_message">This story was edited on a different device and the ability to edit certain objects may be limited.</string>
+    <string name="dialog_edit_story_unavailable_title">Can\'t edit Story</string>
+    <string name="dialog_edit_story_unavailable_message">Unable to load media for this story. Check your internet connection and try again in a moment.</string>
+    <string name="dialog_edit_story_unrecoverable_title">Can\'t edit Story</string>
+    <string name="dialog_edit_story_unrecoverable_message">We couldn\'t find the media for this story on the site.</string>
+    <string name="dialog_edit_story_unsupported_format_title">GIF files not supported</string>
+    <string name="dialog_edit_story_unsupported_format_message">One or more slides have not been added to your Story because Stories don\'t support GIF files at the moment. Please choose a static image or video background instead.</string>
+    <string name="toast_edit_story_update_in_progress_title">Story being saved, please wait…</string>
     <string name="capture_button_alt">Capture</string>
     <string name="flip_button_alt">Flip camera</string>
     <string name="flash_button_alt">Flash</string>
     <string name="stickers_button_alt">Stickers</string>
-    <string name="more_button_alt">More</string>
     <string name="text_button_alt">Text</string>
     <string name="sound_button_alt">Sound</string>
     <string name="label_control_flip_camera">Flip</string>
@@ -2945,8 +3159,6 @@
     <string name="label_snackbar_loop_frame_saved">Saved to photos</string>
     <string name="label_snackbar_share">SHARE</string>
     <string name="label_share_to">Share to</string>
-    <string name="label_done">Done</string>
-    <string name="label_control_publish">Next</string>
     <string name="label_close_button">Close</string>
     <string name="label_saved_icon">Saved</string>
     <string name="label_retry_icon">Retry</string>
@@ -2956,7 +3168,6 @@
     <string name="label_frame_errored">errored</string>
     <string name="label_text_alignment_button">Change text alignment</string>
     <string name="label_text_color_button">Change text color</string>
-    <string name="menu_delete_page">Delete slide</string>
     <string name="dialog_discard_page_title">Delete story slide?</string>
     <string name="dialog_discard_page_message">This slide will be removed from your story.</string>
     <string name="dialog_discard_errored_page_message">This slide has not been saved yet. If you delete this slide, you will lose any edits you have made.</string>
@@ -2993,7 +3204,7 @@
 
     <!-- Intro to Stories screen -->
     <string name="stories_intro_main_title">Introducing Story Posts</string>
-    <string name="stories_intro_main_subtitle">You\'ve got early access to Story Posts and we\'d love for you to give it a try.</string>
+    <string name="stories_intro_main_subtitle">A new way to create and publish engaging content on your site.</string>
     <string name="stories_intro_image_caption_first">How to create a story post</string>
     <string name="stories_intro_image_caption_second">Example story title</string>
     <string name="stories_intro_title_first">Now stories are for everyone</string>
@@ -3003,29 +3214,22 @@
     <string name="stories_intro_create_story_post_label">Create Story Post</string>
 
     <!--Autogenerated:Gutenberg Native-->
-    <!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: Current value. -->
-    <string name="gutenberg_native_1_s_current_value_is_2_s" tools:ignore="UnusedResources">%1$s. Current value is %2$s</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_10_street_road" tools:ignore="UnusedResources">10 Street Road</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_555_555_1234" tools:ignore="UnusedResources">(555)555–1234</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_a_description_of_the_project_and_the_works_presented" tools:ignore="UnusedResources">A description of the project and the works presented.</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">&lt;a href=\"mailto:mail@example.com\"&gt;mail@example.com&lt;/a&gt;</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_a_short_bio_with_personal_history_key_achievements_or_an_interest" tools:ignore="UnusedResources">A short bio with personal history, key achievements, or an interesting fact.</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_a_short_description_of_the_services_you_offer" tools:ignore="UnusedResources">A short description of the services you offer.</string>
-    <string name="gutenberg_native_add_a_description" tools:ignore="UnusedResources">Add a description</string>
+    <!-- translators: accessibility text. Inform about current value. %1$s: Control label %2$s: setting label (example: width), %3$s: Current value. %4$s: value measurement unit (example: pixels) -->
+    <string name="gutenberg_native_1_s_2_s_is_3_s_4_s" tools:ignore="UnusedResources">%1$s. %2$s is %3$s %4$s.</string>
+    <!-- translators: 1: From block title, e.g. Paragraph. 2: To block title, e.g. Header. -->
+    <string name="gutenberg_native_1_s_transformed_to_2_s" tools:ignore="UnusedResources">%1$s transformed to %2$s</string>
     <string name="gutenberg_native_add_a_shortcode" tools:ignore="UnusedResources">Add a shortcode…</string>
-    <string name="gutenberg_native_add_annotation" tools:ignore="UnusedResources">Add annotation</string>
+    <string name="gutenberg_native_add_alt_text" tools:ignore="UnusedResources">Add alt text</string>
+    <string name="gutenberg_native_add_audio" tools:ignore="UnusedResources">ADD AUDIO</string>
     <string name="gutenberg_native_add_block_after" tools:ignore="UnusedResources">Add Block After</string>
     <string name="gutenberg_native_add_block_before" tools:ignore="UnusedResources">Add Block Before</string>
     <string name="gutenberg_native_add_block_here" tools:ignore="UnusedResources">ADD BLOCK HERE</string>
+    <string name="gutenberg_native_add_caption" tools:ignore="UnusedResources">Add caption</string>
     <string name="gutenberg_native_add_image" tools:ignore="UnusedResources">ADD IMAGE</string>
     <string name="gutenberg_native_add_image_or_video" tools:ignore="UnusedResources">ADD IMAGE OR VIDEO</string>
+    <string name="gutenberg_native_add_link" tools:ignore="UnusedResources">ADD LINK</string>
     <string name="gutenberg_native_add_paragraph_block" tools:ignore="UnusedResources">Add paragraph block</string>
+    <string name="gutenberg_native_add_text" tools:ignore="UnusedResources">Add text…</string>
     <string name="gutenberg_native_add_this_email_link" tools:ignore="UnusedResources">Add this email link</string>
     <string name="gutenberg_native_add_this_link" tools:ignore="UnusedResources">Add this link</string>
     <string name="gutenberg_native_add_this_telephone_link" tools:ignore="UnusedResources">Add this telephone link</string>
@@ -3035,8 +3239,14 @@
     <string name="gutenberg_native_add_video" tools:ignore="UnusedResources">ADD VIDEO</string>
     <string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
-    <string name="gutenberg_native_angle" tools:ignore="UnusedResources">Angle</string>
-    <string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
+    <string name="gutenberg_native_attachment_page" tools:ignore="UnusedResources">Attachment page</string>
+    <!-- translators: accessibility text. Empty Audio caption. -->
+    <string name="gutenberg_native_audio_caption_empty" tools:ignore="UnusedResources">Audio caption. Empty</string>
+    <!-- translators: accessibility text. %s: Audio caption. -->
+    <string name="gutenberg_native_audio_caption_s" tools:ignore="UnusedResources">Audio caption. %s</string>
+    <!-- translators: displays audio file extension. e.g. MP3 audio file -->
+    <string name="gutenberg_native_audio_file" tools:ignore="UnusedResources"> audio file</string>
+    <string name="gutenberg_native_audio_player" tools:ignore="UnusedResources">Audio Player</string>
     <!-- translators: displayed right after the block is copied. -->
     <string name="gutenberg_native_block_copied" tools:ignore="UnusedResources">Block copied</string>
     <!-- translators: displayed right after the block is cut. -->
@@ -3048,90 +3258,104 @@
     <!-- translators: displayed right after the block is removed. -->
     <string name="gutenberg_native_block_removed" tools:ignore="UnusedResources">Block removed</string>
     <string name="gutenberg_native_block_settings" tools:ignore="UnusedResources">Block settings</string>
-    <!-- translators: title for "Blog" page template -->
-    <string name="gutenberg_native_blog" tools:ignore="UnusedResources">Blog</string>
+    <string name="gutenberg_native_buttongroup" tools:ignore="UnusedResources">ButtonGroup</string>
+    <string name="gutenberg_native_audio_settings" tools:ignore="UnusedResources">Audio settings</string>
+    <string name="gutenberg_native_auto" tools:ignore="UnusedResources">Auto</string>
+    <string name="gutenberg_native_autoplay" tools:ignore="UnusedResources">Autoplay</string>
+    <string name="gutenberg_native_block_cannot_be_rendered_inside_itself" tools:ignore="UnusedResources">Block cannot be rendered inside itself.</string>
+    <string name="gutenberg_native_block_has_been_deleted_or_is_unavailable" tools:ignore="UnusedResources">Block has been deleted or is unavailable.</string>
+    <string name="gutenberg_native_browser_default" tools:ignore="UnusedResources">Browser default</string>
+    <string name="gutenberg_native_cancel_search" tools:ignore="UnusedResources">Cancel search</string>
+    <string name="gutenberg_native_change_block_position" tools:ignore="UnusedResources">Change block position</string>
+    <string name="gutenberg_native_change_heading_level" tools:ignore="UnusedResources">Change heading level</string>
+    <string name="gutenberg_native_choose_a_file" tools:ignore="UnusedResources">CHOOSE A FILE</string>
+    <string name="gutenberg_native_choose_audio" tools:ignore="UnusedResources">Choose audio</string>
+    <string name="gutenberg_native_choose_file" tools:ignore="UnusedResources">Choose file</string>
     <string name="gutenberg_native_choose_from_device" tools:ignore="UnusedResources">Choose from device</string>
     <string name="gutenberg_native_choose_image" tools:ignore="UnusedResources">Choose image</string>
     <string name="gutenberg_native_choose_image_or_video" tools:ignore="UnusedResources">Choose image or video</string>
     <string name="gutenberg_native_choose_images" tools:ignore="UnusedResources">Choose images</string>
     <string name="gutenberg_native_choose_video" tools:ignore="UnusedResources">Choose video</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_city_10100" tools:ignore="UnusedResources">City, 10100</string>
-    <string name="gutenberg_native_content" tools:ignore="UnusedResources">Content…</string>
+    <string name="gutenberg_native_clear_search" tools:ignore="UnusedResources">Clear search</string>
+    <string name="gutenberg_native_code" tools:ignore="UnusedResources">Code</string>
     <string name="gutenberg_native_copied_block" tools:ignore="UnusedResources">Copied block</string>
     <string name="gutenberg_native_copy_block" tools:ignore="UnusedResources">Copy block</string>
+    <string name="gutenberg_native_copy_file_url" tools:ignore="UnusedResources">Copy file URL</string>
     <!-- translators: %s: current cell value. -->
     <string name="gutenberg_native_current_value_is_s" tools:ignore="UnusedResources">Current value is %s</string>
     <string name="gutenberg_native_customize" tools:ignore="UnusedResources">CUSTOMIZE</string>
     <string name="gutenberg_native_customize_gradient" tools:ignore="UnusedResources">Customize Gradient</string>
     <string name="gutenberg_native_cut_block" tools:ignore="UnusedResources">Cut block</string>
+    <string name="gutenberg_native_describe_the_purpose_of_the_image_leave_empty_if_the_image_is_pur" tools:ignore="UnusedResources">Describe the purpose of the image. Leave empty if the image is purely decorative. </string>
     <string name="gutenberg_native_dismiss" tools:ignore="UnusedResources">Dismiss</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_don_t_cry_because_it_s_over_smile_because_it_happened" tools:ignore="UnusedResources">Don’t cry because it’s over, smile because it happened.</string>
+    <string name="gutenberg_native_document_outline" tools:ignore="UnusedResources">document outline</string>
+    <string name="gutenberg_native_display_post_date" tools:ignore="UnusedResources">Display post date</string>
     <string name="gutenberg_native_double_tap_to_add_a_block" tools:ignore="UnusedResources">Double tap to add a block</string>
-    <!-- translators: accessibility text (hint for focusing a slider) -->
-    <string name="gutenberg_native_double_tap_to_change_the_value_using_slider" tools:ignore="UnusedResources">Double tap to change the value using slider</string>
+    <string name="gutenberg_native_double_tap_to_add_a_link" tools:ignore="UnusedResources">Double tap to add a link.</string>
+    <string name="gutenberg_native_double_tap_to_change_unit" tools:ignore="UnusedResources">double–tap to change unit</string>
     <!-- translators: accessibility text -->
     <string name="gutenberg_native_double_tap_to_edit_this_value" tools:ignore="UnusedResources">Double tap to edit this value</string>
     <!-- translators: accessibility text (hint for moving to color settings) -->
     <string name="gutenberg_native_double_tap_to_go_to_color_settings" tools:ignore="UnusedResources">Double tap to go to color settings</string>
+    <string name="gutenberg_native_double_tap_to_listen_the_audio_file" tools:ignore="UnusedResources">Double tap to listen the audio file</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_down" tools:ignore="UnusedResources">Double tap to move the block down</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_left" tools:ignore="UnusedResources">Double tap to move the block to the left</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_to_the_right" tools:ignore="UnusedResources">Double tap to move the block to the right</string>
     <string name="gutenberg_native_double_tap_to_move_the_block_up" tools:ignore="UnusedResources">Double tap to move the block up</string>
+    <string name="gutenberg_native_double_tap_to_open_action_sheet_to_edit_replace_or_clear_the_imag" tools:ignore="UnusedResources">Double tap to open Action Sheet to edit, replace, or clear the image</string>
     <string name="gutenberg_native_double_tap_to_open_action_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Action Sheet with available options</string>
+    <string name="gutenberg_native_double_tap_to_open_bottom_sheet_to_edit_replace_or_clear_the_imag" tools:ignore="UnusedResources">Double tap to open Bottom Sheet to edit, replace, or clear the image</string>
     <string name="gutenberg_native_double_tap_to_open_bottom_sheet_with_available_options" tools:ignore="UnusedResources">Double tap to open Bottom Sheet with available options</string>
     <string name="gutenberg_native_double_tap_to_redo_last_change" tools:ignore="UnusedResources">Double tap to redo last change</string>
     <string name="gutenberg_native_double_tap_to_select" tools:ignore="UnusedResources">Double tap to select</string>
     <string name="gutenberg_native_double_tap_to_select_a_video" tools:ignore="UnusedResources">Double tap to select a video</string>
+    <string name="gutenberg_native_double_tap_to_select_an_audio_file" tools:ignore="UnusedResources">Double tap to select an audio file</string>
     <string name="gutenberg_native_double_tap_to_select_an_image" tools:ignore="UnusedResources">Double tap to select an image</string>
-    <string name="gutenberg_native_double_tap_to_select_layout" tools:ignore="UnusedResources">Double tap to select layout</string>
     <!-- translators: accessibility text (hint for selecting option) -->
     <string name="gutenberg_native_double_tap_to_select_the_option" tools:ignore="UnusedResources">Double tap to select the option</string>
     <!-- translators: accessibility text (hint for switches) -->
     <string name="gutenberg_native_double_tap_to_toggle_setting" tools:ignore="UnusedResources">Double tap to toggle setting</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change" tools:ignore="UnusedResources">Double tap to undo last change</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_dr_seuss" tools:ignore="UnusedResources">Dr. Seuss</string>
     <string name="gutenberg_native_duplicate_block" tools:ignore="UnusedResources">Duplicate block</string>
+    <string name="gutenberg_native_edit_file" tools:ignore="UnusedResources">Edit file</string>
+    <string name="gutenberg_native_edit_focal_point" tools:ignore="UnusedResources">Edit focal point</string>
+    <string name="gutenberg_native_edit_image" tools:ignore="UnusedResources">Edit image</string>
     <string name="gutenberg_native_edit_using_web_editor" tools:ignore="UnusedResources">Edit using web editor</string>
     <string name="gutenberg_native_edit_video" tools:ignore="UnusedResources">Edit video</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:mail@example.com\"&gt;mail@example.com&lt;/a&gt;</string>
+    <string name="gutenberg_native_enter_url_to_embed_here" tools:ignore="UnusedResources">Enter URL to embed here…</string>
+    <string name="gutenberg_native_error" tools:ignore="UnusedResources">Error</string>
     <string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file" tools:ignore="UnusedResources">Failed to insert audio file.</string>
+    <string name="gutenberg_native_failed_to_insert_audio_file_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert audio file. Please tap for options.</string>
+    <string name="gutenberg_native_failed_to_insert_media" tools:ignore="UnusedResources">Failed to insert media.</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_save_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to save files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_failed_to_upload_files_please_tap_for_options" tools:ignore="UnusedResources">Failed to upload files.\nPlease tap for options.</string>
+    <string name="gutenberg_native_featured" tools:ignore="UnusedResources">Featured</string>
+    <string name="gutenberg_native_file_block_settings" tools:ignore="UnusedResources">File block settings</string>
+    <string name="gutenberg_native_file_name" tools:ignore="UnusedResources">File name</string>
     <!-- translators: accessibility text. %s: gallery caption. -->
     <string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
-    <!-- translators: sample content for "About" page template
-translators: sample content for "Contact" page template
-translators: sample content for "Portfolio" page template
-translators: sample content for "Services" page template
-translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_get_in_touch" tools:ignore="UnusedResources">Get in Touch</string>
     <string name="gutenberg_native_gradient_type" tools:ignore="UnusedResources">Gradient Type</string>
+    <!-- translators: %s: heading level e.g: "1", "2", "3" -->
+    <string name="gutenberg_native_heading_d" tools:ignore="UnusedResources">Heading %d</string>
     <string name="gutenberg_native_help_button" tools:ignore="UnusedResources">Help button</string>
     <string name="gutenberg_native_help_icon" tools:ignore="UnusedResources">Help icon</string>
-    <string name="gutenberg_native_here_is_the_panel_content" tools:ignore="UnusedResources">Here is the panel content!</string>
     <string name="gutenberg_native_hide_keyboard" tools:ignore="UnusedResources">Hide keyboard</string>
+    <!-- translators: 1: the order number of the image. 2: the total number of images. -->
+    <string name="gutenberg_native_image_1_d_of_2_d_in_gallery" tools:ignore="UnusedResources">image %1$d of %2$d in gallery</string>
     <!-- translators: accessibility text. %s: image caption. -->
     <string name="gutenberg_native_image_caption_s" tools:ignore="UnusedResources">Image caption. %s</string>
-    <string name="gutenberg_native_insert_mention" tools:ignore="UnusedResources">Insert mention</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_inspiration" tools:ignore="UnusedResources">Inspiration</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_it_is_our_choices_harry_that_show_what_we_truly_are_far_more_than" tools:ignore="UnusedResources">It is our choices, Harry, that show what we truly are, far more than our abilities.</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_j_k_rowling" tools:ignore="UnusedResources">J.K. Rowling</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_juan_p_rez" tools:ignore="UnusedResources">Juan Pérez</string>
-    <!-- translators: sample content for "About" page template
-translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_let_s_build_something_together" tools:ignore="UnusedResources">Let’s build something together!</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_let_s_build_something_together_7019bfe3" tools:ignore="UnusedResources">Let\'s build something together!</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_let_s_talk_don_t_hesitate_to_reach_out_with_the_contact_informati" tools:ignore="UnusedResources">Let\'s talk 👋 Don\'t hesitate to reach out with the contact information below, or send a message using the form.</string>
+    <string name="gutenberg_native_image_link_url" tools:ignore="UnusedResources">Image Link URL</string>
+    <string name="gutenberg_native_image_settings" tools:ignore="UnusedResources">Image settings</string>
+    <string name="gutenberg_native_link_settings" tools:ignore="UnusedResources">Link Settings</string>
     <string name="gutenberg_native_link_to" tools:ignore="UnusedResources">Link To</string>
+    <string name="gutenberg_native_link_to_12d6f96a" tools:ignore="UnusedResources">Link to</string>
+    <string name="gutenberg_native_lock_icon" tools:ignore="UnusedResources">Lock icon</string>
+    <string name="gutenberg_native_loop" tools:ignore="UnusedResources">Loop</string>
+    <string name="gutenberg_native_media_area" tools:ignore="UnusedResources">Media area</string>
+    <string name="gutenberg_native_media_file" tools:ignore="UnusedResources">Media file</string>
+    <string name="gutenberg_native_metadata" tools:ignore="UnusedResources">Metadata</string>
     <string name="gutenberg_native_move_block_down" tools:ignore="UnusedResources">Move block down</string>
     <!-- translators: accessibility text. %1: current block position (number). %2: next block position (number) -->
     <string name="gutenberg_native_move_block_down_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block down from row %1$s to row %2$s</string>
@@ -3146,21 +3370,20 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_move_block_up_from_row_1_s_to_row_2_s" tools:ignore="UnusedResources">Move block up from row %1$s to row %2$s</string>
     <string name="gutenberg_native_move_image_backward" tools:ignore="UnusedResources">Move Image Backward</string>
     <string name="gutenberg_native_move_image_forward" tools:ignore="UnusedResources">Move Image Forward</string>
-    <string name="gutenberg_native_my_document_setting_panel" tools:ignore="UnusedResources">My Document Setting Panel</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_my_portfolio_showcases_various_projects_created_throughout_my_car" tools:ignore="UnusedResources">My portfolio showcases various projects created throughout my career. See my contact information below and get in touch.</string>
-    <string name="gutenberg_native_my_post_publish_panel" tools:ignore="UnusedResources">My post publish panel</string>
-    <string name="gutenberg_native_my_post_status_info" tools:ignore="UnusedResources">My post status info</string>
-    <string name="gutenberg_native_my_pre_publish_panel" tools:ignore="UnusedResources">My pre publish panel</string>
+    <string name="gutenberg_native_move_to_bottom" tools:ignore="UnusedResources">Move to bottom</string>
+    <string name="gutenberg_native_move_to_top" tools:ignore="UnusedResources">Move to top</string>
     <string name="gutenberg_native_navigate_up" tools:ignore="UnusedResources">Navigate Up</string>
     <string name="gutenberg_native_navigates_to_custom_color_picker" tools:ignore="UnusedResources">Navigates to custom color picker</string>
     <string name="gutenberg_native_navigates_to_customize_the_gradient" tools:ignore="UnusedResources">Navigates to customize the gradient</string>
+    <string name="gutenberg_native_no_application_can_handle_this_request" tools:ignore="UnusedResources">No application can handle this request.</string>
     <string name="gutenberg_native_no_application_can_handle_this_request_please_install_a_web_brows" tools:ignore="UnusedResources">No application can handle this request. Please install a Web browser.</string>
     <string name="gutenberg_native_note_column_layout_may_vary_between_themes_and_screen_sizes" tools:ignore="UnusedResources">Note: Column layout may vary between themes and screen sizes</string>
     <string name="gutenberg_native_only_show_excerpt" tools:ignore="UnusedResources">Only show excerpt</string>
+    <string name="gutenberg_native_open" tools:ignore="UnusedResources">OPEN</string>
     <string name="gutenberg_native_open_block_actions_menu" tools:ignore="UnusedResources">Open Block Actions Menu</string>
     <string name="gutenberg_native_open_link_in_a_browser" tools:ignore="UnusedResources">Open link in a browser</string>
     <string name="gutenberg_native_open_settings" tools:ignore="UnusedResources">Open Settings</string>
+    <string name="gutenberg_native_page_break" tools:ignore="UnusedResources">Page break</string>
     <!-- translators: accessibility text. %s: Page break text. -->
     <string name="gutenberg_native_page_break_block_s" tools:ignore="UnusedResources">Page break block. %s</string>
     <!-- translators: accessibility text. empty page title. -->
@@ -3169,23 +3392,25 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_page_title_s" tools:ignore="UnusedResources">Page title. %s</string>
     <string name="gutenberg_native_paste_block_after" tools:ignore="UnusedResources">Paste block after</string>
     <string name="gutenberg_native_paste_url" tools:ignore="UnusedResources">Paste URL</string>
-    <!-- translators: title for "Portfolio" page template -->
-    <string name="gutenberg_native_portfolio" tools:ignore="UnusedResources">Portfolio</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_position_or_job_title" tools:ignore="UnusedResources">Position or Job Title</string>
+    <string name="gutenberg_native_post_content_settings" tools:ignore="UnusedResources">Post content settings</string>
+    <string name="gutenberg_native_post_meta_settings" tools:ignore="UnusedResources">Post meta settings</string>
     <!-- translators: accessibility text. empty post title. -->
     <string name="gutenberg_native_post_title_empty" tools:ignore="UnusedResources">Post title. Empty</string>
     <!-- translators: accessibility text. %s: text content of the post title. -->
     <string name="gutenberg_native_post_title_s" tools:ignore="UnusedResources">Post title. %s</string>
+    <string name="gutenberg_native_preload" tools:ignore="UnusedResources">Preload</string>
     <string name="gutenberg_native_problem_displaying_block" tools:ignore="UnusedResources">Problem displaying block</string>
+    <string name="gutenberg_native_problem_opening_the_audio" tools:ignore="UnusedResources">Problem opening the audio</string>
     <string name="gutenberg_native_problem_opening_the_video" tools:ignore="UnusedResources">Problem opening the video</string>
-    <!-- translators: sample content for "Portfolio" page template -->
-    <string name="gutenberg_native_project_name" tools:ignore="UnusedResources">Project Name</string>
-    <string name="gutenberg_native_remove_annotations" tools:ignore="UnusedResources">Remove annotations</string>
+    <string name="gutenberg_native_read_more" tools:ignore="UnusedResources">Read more</string>
+    <string name="gutenberg_native_replace_audio" tools:ignore="UnusedResources">Replace audio</string>
     <string name="gutenberg_native_replace_current_block" tools:ignore="UnusedResources">Replace Current Block</string>
+    <string name="gutenberg_native_replace_file" tools:ignore="UnusedResources">Replace file</string>
+    <string name="gutenberg_native_replace_image" tools:ignore="UnusedResources">Replace image</string>
     <string name="gutenberg_native_replace_image_or_video" tools:ignore="UnusedResources">Replace image or video</string>
     <string name="gutenberg_native_replace_video" tools:ignore="UnusedResources">Replace video</string>
-    <string name="gutenberg_native_reset_block" tools:ignore="UnusedResources">Reset Block</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_android" tools:ignore="UnusedResources">Reusable blocks aren\'t editable on WordPress for Android</string>
+    <string name="gutenberg_native_reusable_blocks_aren_t_editable_on_wordpress_for_ios" tools:ignore="UnusedResources">Reusable blocks aren\'t editable on WordPress for iOS</string>
     <!-- translators: accessibility text for the media block empty state. %s: media type -->
     <string name="gutenberg_native_s_block_empty" tools:ignore="UnusedResources">%s block. Empty</string>
     <!-- translators: %s: block title e.g: "Paragraph". -->
@@ -3194,67 +3419,47 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_s_block_this_block_has_invalid_content" tools:ignore="UnusedResources">%s block. This block has invalid content</string>
     <!-- translators: Missing block alert title. %s: The localized block name -->
     <string name="gutenberg_native_s_is_not_fully_supported" tools:ignore="UnusedResources">\'%s\' is not fully–supported</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_sally_smith" tools:ignore="UnusedResources">Sally Smith</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_samuel_the_dog" tools:ignore="UnusedResources">Samuel the Dog</string>
     <string name="gutenberg_native_scrollable_block_menu_closed" tools:ignore="UnusedResources">Scrollable block menu closed.</string>
     <string name="gutenberg_native_scrollable_block_menu_opened_select_a_block" tools:ignore="UnusedResources">Scrollable block menu opened. Select a block.</string>
+    <string name="gutenberg_native_search_block" tools:ignore="UnusedResources">Search block</string>
+    <string name="gutenberg_native_search_blocks" tools:ignore="UnusedResources">Search blocks</string>
     <string name="gutenberg_native_search_or_type_url" tools:ignore="UnusedResources">Search or type URL</string>
     <string name="gutenberg_native_select_a_color" tools:ignore="UnusedResources">Select a color</string>
     <string name="gutenberg_native_select_a_layout" tools:ignore="UnusedResources">Select a layout</string>
     <string name="gutenberg_native_select_item" tools:ignore="UnusedResources">Select item</string>
-    <!-- translators: title for "Services" page template -->
-    <string name="gutenberg_native_services" tools:ignore="UnusedResources">Services</string>
+    <string name="gutenberg_native_shortcode" tools:ignore="UnusedResources">Shortcode</string>
+    <string name="gutenberg_native_show_download_button" tools:ignore="UnusedResources">Show download button</string>
     <string name="gutenberg_native_show_post_content" tools:ignore="UnusedResources">Show post content</string>
+    <string name="gutenberg_native_size" tools:ignore="UnusedResources">Size</string>
+    <string name="gutenberg_native_sorting_and_filtering" tools:ignore="UnusedResources">Sorting and filtering</string>
     <!-- translators: Checkbox toggle label -->
     <string name="gutenberg_native_show_section" tools:ignore="UnusedResources">Show section</string>
-    <string name="gutenberg_native_sidebar_title_plugin" tools:ignore="UnusedResources">Sidebar title plugin</string>
-    <string name="gutenberg_native_size" tools:ignore="UnusedResources">Size</string>
     <string name="gutenberg_native_start_writing" tools:ignore="UnusedResources">Start writing…</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_strategy" tools:ignore="UnusedResources">Strategy</string>
-    <string name="gutenberg_native_success_message" tools:ignore="UnusedResources">Success Message</string>
+    <string name="gutenberg_native_summarize_your_post_with_a_list_of_headings_add_html_anchors_to_h" tools:ignore="UnusedResources">Summarize your post with a list of headings. Add HTML anchors to Heading blocks to link them here.</string>
+    <string name="gutenberg_native_summary" tools:ignore="UnusedResources">summary</string>
+    <string name="gutenberg_native_table_of_contents" tools:ignore="UnusedResources">Table of Contents</string>
     <string name="gutenberg_native_take_a_photo" tools:ignore="UnusedResources">Take a Photo</string>
     <string name="gutenberg_native_take_a_photo_or_video" tools:ignore="UnusedResources">Take a Photo or Video</string>
     <string name="gutenberg_native_take_a_video" tools:ignore="UnusedResources">Take a Video</string>
     <string name="gutenberg_native_tap_here_to_show_help" tools:ignore="UnusedResources">Tap here to show help</string>
     <string name="gutenberg_native_tap_to_hide_the_keyboard" tools:ignore="UnusedResources">Tap to hide the keyboard</string>
-    <!-- translators: title for "Team" page template -->
-    <string name="gutenberg_native_team" tools:ignore="UnusedResources">Team</string>
-    <string name="gutenberg_native_template_preview" tools:ignore="UnusedResources">Template Preview</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_the_way_to_get_started_is_to_quit_talking_and_begin_doing" tools:ignore="UnusedResources">The way to get started is to quit talking and begin doing.</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_this_is_sample_content_included_with_the_template_to_illustrate_i" tools:ignore="UnusedResources">This is sample content, included with the template to illustrate its features. Remove or replace it with your own words and media.</string>
-    <string name="gutenberg_native_title" tools:ignore="UnusedResources">Title:</string>
+    <string name="gutenberg_native_transform_block" tools:ignore="UnusedResources">Transform block…</string>
+    <!-- translators: %s: block title e.g: "Paragraph". -->
+    <string name="gutenberg_native_transform_s_to" tools:ignore="UnusedResources">Transform %s to</string>
     <string name="gutenberg_native_translate" tools:ignore="UnusedResources">Translate</string>
-    <string name="gutenberg_native_try_a_starter_layout" tools:ignore="UnusedResources">Try a starter layout</string>
     <string name="gutenberg_native_ungroup" tools:ignore="UnusedResources">Ungroup</string>
+    <string name="gutenberg_native_unsupported" tools:ignore="UnusedResources">Unsupported</string>
     <string name="gutenberg_native_updates_the_title" tools:ignore="UnusedResources">Updates the title.</string>
-    <!-- translators: sample content for "Contact" page template -->
-    <string name="gutenberg_native_usa" tools:ignore="UnusedResources">USA</string>
+    <string name="gutenberg_native_uploading" tools:ignore="UnusedResources">Uploading…</string>
     <!-- translators: accessibility text. Empty video caption. -->
     <string name="gutenberg_native_video_caption_empty" tools:ignore="UnusedResources">Video caption. Empty</string>
     <!-- translators: accessibility text. %s: video caption. -->
     <string name="gutenberg_native_video_caption_s" tools:ignore="UnusedResources">Video caption. %s</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_visitors_will_want_to_know_who_is_on_the_other_side_of_the_page_u" tools:ignore="UnusedResources">Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing – in their own words.</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_walt_disney" tools:ignore="UnusedResources">Walt Disney</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_want_to_work_with_us" tools:ignore="UnusedResources">Want to work with us?</string>
-    <string name="gutenberg_native_warning_message" tools:ignore="UnusedResources">Warning Message</string>
-    <!-- translators: sample content for "Team" page template -->
-    <string name="gutenberg_native_we_are_a_small_team_of_talented_professionals_with_a_wide_range_o" tools:ignore="UnusedResources">We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.</string>
+    <string name="gutenberg_native_video_settings" tools:ignore="UnusedResources">Video settings</string>
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release" tools:ignore="UnusedResources">We are working hard to add more blocks with each release.</string>
-    <!-- translators: sample content for "Services" page template -->
-    <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you" tools:ignore="UnusedResources">We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.</string>
-    <!-- translators: sample content for "Blog" page template -->
-    <string name="gutenberg_native_welcome_to_our_new_blog" tools:ignore="UnusedResources">Welcome to our new blog</string>
-    <!-- translators: sample content for "About" page template -->
-    <string name="gutenberg_native_what_people_say" tools:ignore="UnusedResources">What People Say</string>
+    <string name="gutenberg_native_what_is_alt_text" tools:ignore="UnusedResources">What is alt text?</string>
     <string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>
+    <string name="gutenberg_native_write_code" tools:ignore="UnusedResources">Write code…</string>
     <!--/Autogenerated:Gutenberg Native-->
     <string name="toast_capture_operation_permission_needed">You need to grant the app audio recording permission in order to record video</string>
     <string name="typeface_label_nunito">Casual</string>
@@ -3263,4 +3468,124 @@ translators: sample content for "Services" page template -->
     <string name="typeface_label_pacifico">Playful</string>
     <string name="typeface_label_space_mono">Modern</string>
     <string name="typeface_label_shrikhand">Bold</string>
+    <string name="delete_button_alt">Delete</string>
+    <string name="label_next_button">Next</string>
+    <string name="label_done_button">Done</string>
+    <string name="dialog_discard_story_title_edit">Discard changes?</string>
+    <string name="dialog_discard_story_message_edit">Any changes made will not be saved.</string>
+    <string name="dialog_discard_story_ok_button_edit">Discard</string>
+    <string name="color_picker_label_text">Text</string>
+    <string name="color_picker_label_background">Background</string>
+
+    <!-- Jetpack backup download -->
+    <string name="backup_download">Backup Download</string>
+    <string name="backup_download_details_page_title">Download Backup</string>
+    <string name="backup_download_details_header">Create downloadable backup</string>
+    <string name="backup_download_details_description_with_two_parameters">%1$s %2$s is the selected point to create a downloadable backup.</string>
+    <string name="backup_download_details_choose_items_header">Items included in this download</string>
+    <string name="backup_download_details_action_button">Create downloadable file</string>
+    <string name="backup_download_details_icon_content_description">Create downloadable backup icon</string>
+    <string name="backup_download_details_action_button_content_description">Create downloadable backup button</string>
+    <string name="backup_download_generic_failure">There was a problem handling the request. Please try again later.</string>
+    <string name="backup_download_another_download_running">There is another download running.</string>
+
+    <string name="backup_download_progress_page_title">Download Backup</string>
+    <string name="backup_download_progress_header">Currently creating a downloadable backup of your site</string>
+    <string name="backup_download_progress_description_with_two_parameters">We\'re creating a downloadable backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_progress_icon_content_description">Creating downloadable backup icon</string>
+    <string name="backup_download_progress_footnote">No need to wait around. We\'ll notify you when your backup is ready.</string>
+    <string name="backup_download_progress_label">%1$s%%</string>
+
+    <string name="backup_item_themes">WordPress Themes</string>
+    <string name="backup_item_plugins">WordPress Plugins</string>
+    <string name="backup_item_media_uploads">Media Uploads</string>
+    <string name="backup_item_roots">WordPress root</string>
+    <string name="backup_item_roots_hint">(includes wp-config.php and any non WordPress files)</string>
+    <string name="backup_item_contents">WP-content directory</string>
+    <string name="backup_item_content_hint">(excludes themes, plugins, and uploads)</string>
+    <string name="backup_item_sqls">Site database</string>
+    <string name="backup_item_sqls_hint">(SQL)</string>
+
+    <string name="backup_download_complete_page_title">Your Backup</string>
+    <string name="backup_download_complete_header">Your backup is now available for download</string>
+    <string name="backup_download_complete_description_with_two_parameters">We successfully created a backup of your site from %1$s %2$s.</string>
+    <string name="backup_download_complete_download_action_button">Download</string>
+    <string name="backup_download_complete_download_share_action_button">Share link</string>
+    <string name="backup_download_complete_icon_content_description">Downloadable backup ready icon</string>
+    <string name="backup_download_complete_download_action_button_content_description">Download button</string>
+    <string name="backup_download_complete_download_share_action_button_content_description">Share link button</string>
+    <string name="backup_download_complete_info">We\'ve also emailed you a link to your file.</string>
+    <string name="backup_download_complete_failed_title">Download failed</string>
+    <string name="backup_download_complete_failed_description">We couldn\'t create your backup</string>
+    <string name="backup_download_complete_failed_action_button">Done</string>
+    <string name="backup_download_complete_failed_action_button_content_description">Done button</string>
+    <string name="backup_download_complete_failed_icon_content_description">Cloud with X icon</string>
+
+    <string name="jetpack_icon_content_description">icon</string>
+    <string name="label_control_upload">Upload</string>
+
+    <!-- Jetpack restore -->
+    <string name="restore">Restore</string>
+    <string name="restore_details_page_title" translatable="false">@string/restore</string>
+    <string name="restore_details_choose_items_header">Choose the items to restore:</string>
+    <string name="restore_details_header">Restore Site</string>
+    <string name="restore_details_description_with_two_parameters">%1$s %2$s is the selected point for your restore.</string>
+    <string name="restore_details_action_button">Restore site</string>
+    <string name="restore_details_icon_content_description">Restore icon</string>
+    <string name="restore_details_action_button_content_description">Restore site button</string>
+
+    <string name="restore_warning_page_title" translatable="false">@string/restore</string>
+    <string name="restore_warning_header">Warning</string>
+    <string name="restore_warning_description_with_two_parameters">Are you sure you want to revert your site back to %1$s at %2$s?
+        Anything you changed since then will be lost.</string>
+    <string name="restore_warning_action_button">Confirm</string>
+    <string name="restore_warning_icon_content_description">Red circle image with exclamation point</string>
+    <string name="restore_warning_action_button_content_description">Confirm restore site button</string>
+
+    <string name="restore_progress_page_title" translatable="false">@string/restore</string>
+    <string name="restore_progress_header">Currently restoring site</string>
+    <string name="restore_progress_description_with_two_parameters">We\'re restoring your site back to %1$s %2$s.</string>
+    <string name="restore_progress_icon_content_description">Restore site icon</string>
+    <string name="restore_progress_footnote">No need to wait around. We\'ll notify you when your site has been restored.</string>
+    <string name="restore_progress_label">%1$s%%</string>
+
+    <string name="restore_complete_page_title" translatable="false">@string/restore</string>
+    <string name="restore_complete_header">Your site has been restored</string>
+    <string name="restore_complete_description_with_two_parameters">All of your selected items are now restored back to %1$s %2$s.</string>
+    <string name="restore_complete_done_action_button" translatable="false">@string/label_done_button</string>
+    <string name="restore_complete_visit_site_action_button">Visit site</string>
+    <string name="restore_complete_icon_content_description">Restore icon</string>
+    <string name="restore_complete_done_button_content_description">Done button</string>
+    <string name="restore_complete_visit_site_button_content_description">Visit site button</string>
+
+    <string name="restore_complete_failed_title">Restore failed</string>
+    <string name="restore_complete_failed_description">We couldn\'t restore your site</string>
+    <string name="restore_complete_failed_action_button" translatable="false">@string/label_done_button</string>
+    <string name="restore_complete_failed_action_button_content_description">Done button</string>
+    <string name="restore_complete_failed_icon_content_description">Error icon</string>
+
+    <string name="restore_generic_failure" translatable="false">@string/backup_download_generic_failure</string>
+    <string name="restore_another_process_running">There is another restore running.</string>
+    <string name="restore_status_failure_heading">Hmm, we couldn\'t find your restore status</string>
+    <string name="restore_status_failure_bullet1">We couldn\'t find the status to say how long your restore will take.</string>
+    <string name="restore_status_failure_bullet2">We\'ll still attempt to restore your site.</string>
+    <string name="restore_status_failure_bullet3">We\’ll notify you when its done.</string>
+    <string name="restore_status_bullet_clock_icon_content_desc">Clock icon</string>
+    <string name="restore_status_bullet_checkmark_icon_content_desc">Checkmark icon</string>
+
+    <string name="backup_download_status_failure_heading">Hmm, we couldn\'t find your downloadable backup status</string>
+    <string name="backup_download_status_failure_bullet1">We couldn\'t find the status to say how long your downloadable backup will take.</string>
+    <string name="backup_download_status_failure_bullet2">We\'ll still attempt to create your downloadable backup file.</string>
+    <string name="backup_download_status_failure_bullet3" translatable="false">@string/restore_status_failure_bullet3</string>
+    <string name="backup_download_status_bullet_clock_icon_content_desc" translatable="false">@string/restore_status_bullet_clock_icon_content_desc</string>
+    <string name="backup_download_status_bullet_checkmark_icon_content_desc" translatable="false">@string/restore_status_bullet_checkmark_icon_content_desc</string>
+
+    <!-- likes -->
+    <string name="likes_list_screen_title">Likes list %s</string>
+
+    <!-- user profile bottom sheet -->
+    <string name="user_profile_bottom_sheet_description">User profile bottom sheet information</string>
+    <string name="user_profile_site_section_header">Site</string>
+    <string name="user_profile_untitled_site">(Untitled)</string>
+
 </resources>
diff --git a/fastlane/screenshots.json b/fastlane/screenshots.json
index 960b756dc637..587e94f86eeb 100644
--- a/fastlane/screenshots.json
+++ b/fastlane/screenshots.json
@@ -19,245 +19,161 @@
 		{
 			"name": "Pixel 3",
 			"canvas_size": [1080,1920],
-			"text_size": [1080, 372],
-			"font_size": "84px",
-			"screenshot_size": [696, 1391],
-			"screenshot_offset": [193, 501],
+			"text_size": [750,350],
+			"text_offset": [157,0 ],
+			"font_size": "80px",
+			"screenshot_size": [636, 1191],
+			"screenshot_offset": [226, 501],
 			"screenshot_mask": "playstoreres/assets/pixel-3-mask.png",
 			"device_frame": "playstoreres/assets/pixel-3.png",
-			"device_frame_size": [966, 1826],
-			"device_frame_offset": [58, 286]
+			"device_frame_size": [900, 1626],
+			"device_frame_offset": [91, 286]
 		},
 		{
 			"name": "Nexus 9",
 			"canvas_size": [3000,2000],
-			"text_size": [3000, 317],
-			"text_offset": [0, 0],
-			"font_size": "70px",
-			"screenshot_size": [2107, 1581],
-			"screenshot_offset": [446, 424],
+			"text_size": [3000,120],
+			"text_offset": [0,120 ],
+			"font_size": "100px",
+			"screenshot_size": [1731, 1298],
+			"screenshot_offset": [634, 493],
 			"device_frame": "playstoreres/assets/nexus-9.png",
-			"device_frame_size": [2715, 1827],
-			"device_frame_offset": [149, 301]
+			"device_frame_size": [2139, 1451],
+			"device_frame_offset": [430, 419]
 		}
 	],
 	"entries": [
+		// The world's most popular website builder
 		{
 			"device": "Pixel 3",
-			"filename": "images/phoneScreenshots/1-build-and-manage-your-website-pt1.png",
+			"filename": "images/phoneScreenshots/7-the-worlds-most-popular-website-builder.png",
 			"attachments": [
 				{
-					"file": "playstoreres/assets/attachments/Intro-1.png",
+					"file": "playstoreres/assets/attachments/phone-backgrounds/Circles-1.png",
 					"size": [1080, 1920],
 					"position": [0, 0]
 				},
 				{
-					"text": "playstoreres/metadata/%s/play_store_screenshot_7.html",
-					"size": [881,744],
-					"position": [110,75 ],
-					"font-size": 140,
-					"alignment": "left",
+					"file": "playstoreres/assets/attachments/themes/Themes-Android-Phone.png",
+					"size": [1080, 1438],
+					"position": [0, 465]
+				},
+				{
+					"text": "playstoreres/metadata/%s/play_store_screenshot_1.txt",
+					"size": [810,480],
+					"position": [127,0 ],
+					"alignment": "center",
 					"stylesheet": "playstoreres/assets/intro-text.css"
 				}
 			]
 		},
+		// Create a site or start a blog
 		{
 			"device": "Pixel 3",
-			"filename": "images/phoneScreenshots/1-build-and-manage-your-website-pt2.png",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/Intro-2.png",
-					"size": [1080, 1920],
-					"position": [0, 0]
-				}
-			]
+			"screenshot": "images/phoneScreenshots/1-create-a-site-or-start-a-blog.png",
+			"background": "playstoreres/assets/attachments/phone-backgrounds/Circles-2.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_2.txt"
 		},
+		// Discover new reads
 		{
 			"device": "Pixel 3",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_1.html",
-			"screenshot": "images/phoneScreenshots/2-create-beautiful-posts-and-pages.png",
-			"background": "#9658A3",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/phone-white-keyboard-with-status-bar.png",
-					"size": [696, 560],
-					"position": [193, 1360]
-					
-				},
-				{
-					"file": "playstoreres/assets/attachments/02-gutenberg-toolbar.png",
-					"size": [980, 203],
-					"position": [48, 1216]
-				}
-			]
+			"screenshot": "images/phoneScreenshots/2-discover-new-reads.png",
+			"background": "playstoreres/assets/attachments/phone-backgrounds/Circles-3.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_3.txt"
 		},
+		// Build an audience
 		{
 			"device": "Pixel 3",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_2.html",
-			"screenshot": "images/phoneScreenshots/3-track-what-your-visitors-love.png",
-			"background": "#006088",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/03-stats-phone.png",
-					"size": [924,808],
-					"position": [78, 695]
-				}
-			]
+			"screenshot": "images/phoneScreenshots/3-build-an-audience.png",
+			"background": "playstoreres/assets/attachments/phone-backgrounds/Circles-4.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_4.txt"
 		},
+		// Keep tabs on your site
 		{
 			"device": "Pixel 3",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_3.html",
-			"screenshot": "images/phoneScreenshots/4-check-whats-happening-in-real-time.png",
-			"background": "#9658A3",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/04-1.png",
-					"size": [848,297],
-					"position": [62, 685]
-				},
-				{
-					"file": "playstoreres/assets/attachments/04-2.png",
-					"size": [869,297],
-					"position": [161, 1084]
-				},
-				{
-					"file": "playstoreres/assets/attachments/04-3.png",
-					"size": [848, 297],
-					"position": [75, 1413]
-				}
-			]
+			"screenshot": "images/phoneScreenshots/4-keep-tabs-on-your-site.png",
+			"background": "playstoreres/assets/attachments/phone-backgrounds/Circles-5.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_5.txt"
 		},
+		// Reply in real time
 		{
 			"device": "Pixel 3",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_4.html",
-			"screenshot": "images/phoneScreenshots/5-share-from-anywhere.png",
-			"background": "#006088",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/05-photos.png",
-					"size": [1000,1207],
-					"position": [36, 580]
-				}
-			]
+			"screenshot": "images/phoneScreenshots/5-reply-in-real-time.png",
+			"background": "playstoreres/assets/attachments/phone-backgrounds/Circles-6.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_6.txt"
 		},
+		// Upload on the go
 		{
 			"device": "Pixel 3",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_5.html",
-			"screenshot": "images/phoneScreenshots/6-capture-ideas-on-the-go.png",
-			"background": "#9658A3",
+			"screenshot": "images/phoneScreenshots/6-upload-on-the-go.png",
+			"background": "playstoreres/assets/attachments/phone-backgrounds/Circles-7.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_7.txt"
+		},
+		// The world's most popular website builder
+		{
+			"device": "Nexus 9",
+			"filename": "images/tenInchScreenshots/7-the-worlds-most-popular-website-builder.png",
 			"attachments": [
 				{
-					"file": "playstoreres/assets/attachments/listening-keyboard.png",
-					"size": [697,688],
-					"position": [192, 1203]
+					"file": "playstoreres/assets/attachments/tablet-backgrounds/Circles-1.png",
+					"size": [3000, 2000],
+					"position": [0, 0]
 				},
 				{
-				 	"file": "playstoreres/assets/attachments/06-listening-bar.png",
-				 	"size": [990,226],
-				 	"position": [46, 1237]
+					"file": "playstoreres/assets/attachments/themes/Themes-Android-Tablet.png",
+					"size": [3000, 1500],
+					"position": [0, 424]
+				},
+				{
+					"text": "playstoreres/metadata/%s/play_store_screenshot_1.txt",
+					"size": [3000,120],
+					"position": [0,120 ],
+					"alignment": "center",
+					"stylesheet": "playstoreres/assets/intro-text-tablet.css"
 				}
 			]
 		},
-		// Build and manage your website
+		// Create a site or start a blog
 		{
 			"device": "Nexus 9",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_7.html",
-			"screenshot": "images/tenInchScreenshots/1-build-and-manage-your-website.png",
-			"background": "#006088",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/01-tablet-website.png",
-					"size": [2107, 1581],
-					"position": [446, 424]
-				}
-			]
+			"screenshot": "images/tenInchScreenshots/1-create-a-site-or-start-a-blog.png",
+			"background": "playstoreres/assets/attachments/tablet-backgrounds/Circles-2.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_2.txt"
 		},
-		// Create beautiful posts and pages
+		// Discover new reads
 		{
 			"device": "Nexus 9",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_1.html",
-			"screenshot": "images/tenInchScreenshots/7-create-beautiful-posts-and-pages.png",
-			"filename": "images/tenInchScreenshots/2-create-beautiful-posts-and-pages.png",
-			"background": "#9658A3",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/gutenberg-toolbar-tablet.png",
-					"size": [2107, 100],
-					"position": [446, 1803]
-				}
-			]
+			"screenshot": "images/tenInchScreenshots/2-discover-new-reads.png",
+			"background": "playstoreres/assets/attachments/tablet-backgrounds/Circles-3.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_3.txt"
 		},
-		// Track what your visitors love
+		// Build an audience
 		{
 			"device": "Nexus 9",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_2.html",
-			"screenshot": "images/tenInchScreenshots/3-track-what-your-visitors-love.png",
-			"background": "#006088",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/03-stats-tablet.png",
-					"size": [1642, 925],
-					"position": [679, 694]
-				}
-			]
+			"screenshot": "images/tenInchScreenshots/3-build-an-audience.png",
+			"background": "playstoreres/assets/attachments/tablet-backgrounds/Circles-4.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_4.txt"
 		},
-		// Check what's happening in real-time
+		// Keep tabs on your site
 		{
 			"device": "Nexus 9",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_3.html",
-			"screenshot": "images/tenInchScreenshots/4-check-whats-happening-in-real-time.png",
-			"background": "#9658A3",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/04-1-tablet.png",
-					"size": [1409, 297],
-					"position": [716, 697]
-				},
-				{
-					"file": "playstoreres/assets/attachments/04-2-tablet.png",
-					"size": [1409, 297],
-					"position": [838, 1077]
-				},
-				{
-					"file": "playstoreres/assets/attachments/04-3-tablet.png",
-					"size": [1409, 297],
-					"position": [756, 1430]
-				}
-			]
+			"screenshot": "images/tenInchScreenshots/4-keep-tabs-on-your-site.png",
+			"background": "playstoreres/assets/attachments/tablet-backgrounds/Circles-5.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_5.txt"
 		},
-		// Share from anywhere
+		// Reply in real time
 		{
 			"device": "Nexus 9",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_4.html",
-			"screenshot": "images/tenInchScreenshots/5-share-from-anywhere.png",
-			"background": "#006088",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/share-from-anywhere-tablet-photos.png",
-					"size": [2309, 1353],
-					"position": [336, 519]
-				}
-			]
+			"screenshot": "images/tenInchScreenshots/5-reply-in-real-time.png",
+			"background": "playstoreres/assets/attachments/tablet-backgrounds/Circles-6.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_6.txt"
 		},
-		// Write without compromises
+		// Upload on the go
 		{
 			"device": "Nexus 9",
-			"text": "playstoreres/metadata/%s/play_store_screenshot_6.html",
-			"screenshot": "images/tenInchScreenshots/8-write-without-compromises.png",
-			"filename": "images/tenInchScreenshots/6-write-without-compromises.png",
-			"background": "#9658A3",
-			"attachments": [
-				{
-					"file": "playstoreres/assets/attachments/08-screen.png",
-					"size": [2107, 1414],
-					"position": [446, 586]
-				},
-				{
-					"file": "playstoreres/assets/attachments/aztec-toolbar-overlay-tablet.png",
-					"size": [966, 194],
-					"position": [351, 1077]
-				}
-			]
+			"screenshot": "images/tenInchScreenshots/6-upload-on-the-go.png",
+			"background": "playstoreres/assets/attachments/tablet-backgrounds/Circles-7.png",
+			"text": "playstoreres/metadata/%s/play_store_screenshot_7.txt"
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/gradle.properties-example b/gradle.properties-example
index a64949664d16..5d4b0f794118 100644
--- a/gradle.properties-example
+++ b/gradle.properties-example
@@ -27,10 +27,7 @@ wp.zendesk.oauth_client_id=wordpress
 wp.reset_db_on_downgrade = false
 wp.sentry.dsn=https://00000000000000000000000000000000@sentry.io/00000000
 wp.tenor.api_key=wordpress
-wp.encrypted_logging_key=abcabcabcabcabcabcabcabcabcabcabcabcabcabcab
-
-# Needed to use the Google Maps component aka the PlacePicker (Post Settings -> Location)
-wp.res.com.google.android.geo.api.key = geo-api-key
+wp.encrypted_logging_key=z0g+oVkqR4kWNUTxJfTozOZQjfXI7W9f6bD0uMJ5VkA=
 
 # Uncomment and edit the line below to use a local copy of WordPressMocks
 # You should specify a relative path to the root of your WordPressMocks repo
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsMetadata.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsMetadata.java
index 939c690b7679..c2736e9aba43 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsMetadata.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsMetadata.java
@@ -8,6 +8,7 @@ public class AnalyticsMetadata {
     private int mNumBlogs;
     private String mUsername = "";
     private String mEmail = "";
+    private String mAppScheme = "";
     private boolean mIsGutenbergEnabled;
     private boolean mIsGutenbergEnabledVariableSet;
 
@@ -70,6 +71,14 @@ public void setEmail(String email) {
         this.mEmail = email;
     }
 
+    public String getAppScheme() {
+        return mAppScheme;
+    }
+
+    public void setAppScheme(String scheme) {
+        this.mAppScheme = scheme;
+    }
+
     public boolean isGutenbergEnabled() {
         return mIsGutenbergEnabled;
     }
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
index 7067c8e624e6..a8b7875c0f27 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java
@@ -28,6 +28,7 @@ public enum Stat {
         APPLICATION_UPGRADED,
         READER_ACCESSED,
         READER_ARTICLE_COMMENTED_ON,
+        READER_ARTICLE_COMMENT_REPLIED_TO,
         READER_ARTICLE_COMMENTS_OPENED,
         READER_ARTICLE_COMMENT_LIKED,
         READER_ARTICLE_COMMENT_UNLIKED,
@@ -50,6 +51,8 @@ public enum Stat {
         READER_INFINITE_SCROLL,
         READER_LIST_FOLLOWED,
         READER_LIST_LOADED,
+        READER_P2_SHOWN,
+        READER_A8C_SHOWN,
         READER_LIST_PREVIEWED,
         READER_LIST_UNFOLLOWED,
         READER_TAG_FOLLOWED,
@@ -110,6 +113,7 @@ public enum Stat {
         STATS_CLICKS_VIEW_MORE_TAPPED,
         STATS_COUNTRIES_VIEW_MORE_TAPPED,
         STATS_OVERVIEW_BAR_CHART_TAPPED,
+        STATS_OVERVIEW_ERROR,
         STATS_VIDEO_PLAYS_VIEW_MORE_TAPPED,
         STATS_SEARCH_TERMS_VIEW_MORE_TAPPED,
         STATS_AUTHORS_VIEW_MORE_TAPPED,
@@ -176,7 +180,6 @@ public enum Stat {
         EDITOR_SESSION_START,
         EDITOR_SESSION_SWITCH_EDITOR,
         EDITOR_SESSION_TEMPLATE_APPLY,
-        EDITOR_SESSION_TEMPLATE_PREVIEW,
         EDITOR_SESSION_END,
         EDITOR_PUBLISHED_POST,
         EDITOR_POST_PUBLISH_TAPPED,
@@ -189,7 +192,6 @@ public enum Stat {
         EDITOR_POST_FORMAT_CHANGED,
         EDITOR_POST_SLUG_CHANGED,
         EDITOR_POST_EXCERPT_CHANGED,
-        EDITOR_POST_LOCATION_CHANGED,
         EDITOR_SAVED_DRAFT,
         EDITOR_EDITED_IMAGE, // Visual editor only
         EDITOR_UPLOAD_MEDIA_FAILED, // Visual editor only
@@ -319,6 +321,30 @@ public enum Stat {
         ACTIVITY_LOG_LIST_OPENED,
         ACTIVITY_LOG_DETAIL_OPENED,
         ACTIVITY_LOG_REWIND_STARTED,
+        ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_BUTTON_TAPPED,
+        ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_BUTTON_TAPPED,
+        ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_SELECTED,
+        ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_SELECTED,
+        ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_RESET,
+        ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_RESET,
+        JETPACK_BACKUP_LIST_OPENED,
+        JETPACK_BACKUP_REWIND_STARTED,
+        JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_BUTTON_TAPPED,
+        JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_SELECTED,
+        JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_RESET,
+        JETPACK_SCAN_ACCESSED,
+        JETPACK_SCAN_HISTORY_ACCESSED,
+        JETPACK_SCAN_HISTORY_FILTER,
+        JETPACK_SCAN_THREAT_LIST_ITEM_TAPPED,
+        JETPACK_SCAN_THREAT_CODEABLE_ESTIMATE_TAPPED,
+        JETPACK_SCAN_RUN_TAPPED,
+        JETPACK_SCAN_IGNORE_THREAT_DIALOG_OPEN,
+        JETPACK_SCAN_THREAT_IGNORE_TAPPED,
+        JETPACK_SCAN_FIX_THREAT_DIALOG_OPEN,
+        JETPACK_SCAN_THREAT_FIX_TAPPED,
+        JETPACK_SCAN_ALL_THREATS_OPEN,
+        JETPACK_SCAN_ALL_THREATS_FIX_TAPPED,
+        JETPACK_SCAN_ERROR,
         OPENED_PLUGIN_LIST,
         OPENED_PLUGIN_DETAIL,
         CREATE_ACCOUNT_INITIATED,
@@ -447,6 +473,24 @@ public enum Stat {
         ENHANCED_SITE_CREATION_EXITED,
         ENHANCED_SITE_CREATION_ERROR_SHOWN,
         ENHANCED_SITE_CREATION_BACKGROUND_SERVICE_UPDATED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_VIEWED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_MODE_BUTTON_TAPPED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_MODE_CHANGED,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADING,
+        ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADED,
+        LAYOUT_PICKER_PREVIEW_MODE_CHANGED,
+        LAYOUT_PICKER_THUMBNAIL_MODE_BUTTON_TAPPED,
+        LAYOUT_PICKER_PREVIEW_MODE_BUTTON_TAPPED,
+        LAYOUT_PICKER_PREVIEW_LOADING,
+        LAYOUT_PICKER_PREVIEW_LOADED,
+        LAYOUT_PICKER_PREVIEW_VIEWED,
+        LAYOUT_PICKER_ERROR_SHOWN,
+        CATEGORY_FILTER_SELECTED,
+        CATEGORY_FILTER_DESELECTED,
         // This stat is part of a funnel that provides critical information.  Before
         // making ANY modification to this stat please refer to: p4qSXL-35X-p2
         SITE_CREATED,
@@ -495,8 +539,12 @@ public enum Stat {
         SITE_SETTINGS_DELETE_SITE_RESPONSE_OK,
         SITE_SETTINGS_DELETE_SITE_RESPONSE_ERROR,
         SITE_SETTINGS_OPTIMIZE_IMAGES_CHANGED,
+        SITE_SETTINGS_JETPACK_SECURITY_SETTINGS_VIEWED,
+        SITE_SETTINGS_JETPACK_ALLOWLISTED_IPS_VIEWED,
+        SITE_SETTINGS_JETPACK_ALLOWLISTED_IPS_CHANGED,
         ABTEST_START,
-        FEATURE_FLAG_SET,
+        FEATURE_FLAG_VALUE,
+        FEATURE_FLAGS_SYNCED_STATE,
         EXPERIMENT_VARIANT_SET,
         TRAIN_TRACKS_RENDER,
         TRAIN_TRACKS_INTERACT,
@@ -547,6 +595,7 @@ public enum Stat {
         SUPPORT_TICKET_LIST_VIEWED,
         SUPPORT_IDENTITY_FORM_VIEWED,
         SUPPORT_IDENTITY_SET,
+        QUICK_START_STARTED,
         QUICK_START_TASK_DIALOG_VIEWED,
         QUICK_START_TASK_DIALOG_NEGATIVE_TAPPED,
         QUICK_START_TASK_DIALOG_POSITIVE_TAPPED,
@@ -565,39 +614,36 @@ public enum Stat {
         QUICK_START_LIST_CREATE_SITE_SKIPPED,
         QUICK_START_LIST_UPDATE_SITE_TITLE_SKIPPED,
         QUICK_START_LIST_VIEW_SITE_SKIPPED,
-        QUICK_START_LIST_BROWSE_THEMES_SKIPPED,
-        QUICK_START_LIST_CUSTOMIZE_SITE_SKIPPED,
         QUICK_START_LIST_ADD_SOCIAL_SKIPPED,
         QUICK_START_LIST_PUBLISH_POST_SKIPPED,
         QUICK_START_LIST_FOLLOW_SITE_SKIPPED,
         QUICK_START_LIST_UPLOAD_ICON_SKIPPED,
-        QUICK_START_LIST_CREATE_PAGE_SKIPPED,
         QUICK_START_LIST_CHECK_STATS_SKIPPED,
         QUICK_START_LIST_EXPLORE_PLANS_SKIPPED,
+        QUICK_START_LIST_EDIT_HOMEPAGE_SKIPPED,
+        QUICK_START_LIST_REVIEW_PAGES_SKIPPED,
         QUICK_START_LIST_CREATE_SITE_TAPPED,
         QUICK_START_LIST_UPDATE_SITE_TITLE_TAPPED,
         QUICK_START_LIST_VIEW_SITE_TAPPED,
-        QUICK_START_LIST_BROWSE_THEMES_TAPPED,
-        QUICK_START_LIST_CUSTOMIZE_SITE_TAPPED,
         QUICK_START_LIST_ADD_SOCIAL_TAPPED,
         QUICK_START_LIST_PUBLISH_POST_TAPPED,
         QUICK_START_LIST_FOLLOW_SITE_TAPPED,
         QUICK_START_LIST_UPLOAD_ICON_TAPPED,
-        QUICK_START_LIST_CREATE_PAGE_TAPPED,
         QUICK_START_LIST_CHECK_STATS_TAPPED,
         QUICK_START_LIST_EXPLORE_PLANS_TAPPED,
+        QUICK_START_LIST_EDIT_HOMEPAGE_TAPPED,
+        QUICK_START_LIST_REVIEW_PAGES_TAPPED,
         QUICK_START_CREATE_SITE_TASK_COMPLETED,
         QUICK_START_UPDATE_SITE_TITLE_COMPLETED,
         QUICK_START_VIEW_SITE_TASK_COMPLETED,
-        QUICK_START_BROWSE_THEMES_TASK_COMPLETED,
-        QUICK_START_CUSTOMIZE_SITE_TASK_COMPLETED,
         QUICK_START_SHARE_SITE_TASK_COMPLETED,
         QUICK_START_PUBLISH_POST_TASK_COMPLETED,
         QUICK_START_FOLLOW_SITE_TASK_COMPLETED,
         QUICK_START_UPLOAD_ICON_COMPLETED,
-        QUICK_START_CREATE_PAGE_COMPLETED,
         QUICK_START_CHECK_STATS_COMPLETED,
         QUICK_START_EXPLORE_PLANS_COMPLETED,
+        QUICK_START_EDIT_HOMEPAGE_TASK_COMPLETED,
+        QUICK_START_REVIEW_PAGES_TASK_COMPLETED,
         QUICK_START_ALL_TASKS_COMPLETED,
         QUICK_START_REQUEST_VIEWED,
         QUICK_START_REQUEST_DIALOG_NEGATIVE_TAPPED,
@@ -606,6 +652,8 @@ public enum Stat {
         QUICK_START_NOTIFICATION_DISMISSED,
         QUICK_START_NOTIFICATION_SENT,
         QUICK_START_NOTIFICATION_TAPPED,
+        QUICK_START_HIDE_CARD_TAPPED,
+        QUICK_START_REMOVE_CARD_TAPPED,
         INSTALLATION_REFERRER_OBTAINED,
         INSTALLATION_REFERRER_FAILED,
         GUTENBERG_WARNING_CONFIRM_DIALOG_SHOWN,
@@ -658,6 +706,7 @@ public enum Stat {
         STORY_INTRO_SHOWN,
         STORY_INTRO_DISMISSED,
         STORY_INTRO_CREATE_STORY_BUTTON_TAPPED,
+        STORY_BLOCK_ADD_MEDIA_TAPPED,
         PREPUBLISHING_BOTTOM_SHEET_OPENED,
         PREPUBLISHING_BOTTOM_SHEET_DISMISSED,
         FEATURE_ANNOUNCEMENT_SHOWN_ON_APP_UPGRADE,
@@ -684,6 +733,60 @@ public enum Stat {
         ENCRYPTED_LOGGING_UPLOAD_SUCCESSFUL,
         ENCRYPTED_LOGGING_UPLOAD_FAILED,
         READER_POST_REPORTED,
+        READER_POST_MARKED_AS_SEEN,
+        READER_POST_MARKED_AS_UNSEEN,
+        SUGGESTION_SESSION_FINISHED,
+        COMMENT_APPROVED,
+        COMMENT_UNAPPROVED,
+        COMMENT_SPAMMED,
+        COMMENT_UNSPAMMED,
+        COMMENT_LIKED,
+        COMMENT_UNLIKED,
+        COMMENT_TRASHED,
+        COMMENT_UNTRASHED,
+        COMMENT_REPLIED_TO,
+        COMMENT_EDITED,
+        COMMENT_VIEWED,
+        COMMENT_DELETED,
+        COMMENT_QUICK_ACTION_APPROVED,
+        COMMENT_QUICK_ACTION_LIKED,
+        COMMENT_QUICK_ACTION_REPLIED_TO,
+        COMMENT_FOLLOW_CONVERSATION,
+        COMMENT_BATCH_APPROVED,
+        COMMENT_BATCH_UNAPPROVED,
+        COMMENT_BATCH_SPAMMED,
+        COMMENT_BATCH_TRASHED,
+        COMMENT_BATCH_DELETED,
+        COMMENT_EDITOR_OPENED,
+        COMMENT_FILTER_CHANGED,
+        JETPACK_RESTORE_OPENED,
+        JETPACK_RESTORE_CONFIRMED,
+        JETPACK_RESTORE_ERROR,
+        JETPACK_BACKUP_DOWNLOAD_OPENED,
+        JETPACK_BACKUP_DOWNLOAD_CONFIRMED,
+        JETPACK_BACKUP_DOWNLOAD_ERROR,
+        JETPACK_BACKUP_DOWNLOAD_FILE_DOWNLOAD_TAPPED,
+        JETPACK_BACKUP_DOWNLOAD_SHARE_LINK_TAPPED,
+        MY_SITE_CREATE_SHEET_SHOWN,
+        MY_SITE_CREATE_SHEET_ACTION_TAPPED,
+        POST_LIST_CREATE_SHEET_SHOWN,
+        POST_LIST_CREATE_SHEET_ACTION_TAPPED,
+        INVITE_LINKS_GET_STATUS,
+        INVITE_LINKS_GENERATE,
+        INVITE_LINKS_DISABLE,
+        INVITE_LINKS_SHARE,
+        JETPACK_BACKUP_DOWNLOAD_FILE_NOTICE_DOWNLOAD_TAPPED,
+        JETPACK_BACKUP_DOWNLOAD_FILE_NOTICE_DISMISSED_TAPPED,
+        ACTIVITY_LOG_DOWNLOAD_FILE_NOTICE_DOWNLOAD_TAPPED,
+        ACTIVITY_LOG_DOWNLOAD_FILE_NOTICE_DISMISSED_TAPPED,
+        USER_PROFILE_SHEET_SHOWN,
+        USER_PROFILE_SHEET_SITE_SHOWN,
+        BLOG_URL_PREVIEWED,
+        LIKE_LIST_OPENED,
+        STORAGE_WARNING_SHOWN,
+        STORAGE_WARNING_ACKNOWLEDGED,
+        STORAGE_WARNING_CANCELED,
+        STORAGE_WARNING_DONT_SHOW_AGAIN
     }
 
     private static final List<Tracker> TRACKERS = new ArrayList<>();
diff --git a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
index 143e42dd3bde..f47de494fe1c 100644
--- a/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
+++ b/libs/analytics/WordPressAnalytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java
@@ -20,13 +20,15 @@ public class AnalyticsTrackerNosara extends Tracker {
     @SuppressWarnings("checkstyle:RegexpSingleline")
     private static final String WPCOM_USER = "dotcom_user";
     private static final String IS_GUTENBERG_ENABLED = "gutenberg_enabled";
+    private static final String APP_SCHEME = "app_scheme";
 
-    private static final String EVENTS_PREFIX = "wpandroid_";
+    private final String mEventsPrefix;
 
-    private TracksClient mNosaraClient;
+    private final TracksClient mNosaraClient;
 
-    public AnalyticsTrackerNosara(Context context) throws IllegalArgumentException {
+    public AnalyticsTrackerNosara(Context context, String eventsPrefix) throws IllegalArgumentException {
         super(context);
+        mEventsPrefix = eventsPrefix;
         mNosaraClient = TracksClient.getClient(context);
     }
 
@@ -229,6 +231,9 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case NOTIFICATION_QUICK_ACTIONS_LIKED:
             case NOTIFICATION_QUICK_ACTIONS_REPLIED_TO:
             case NOTIFICATION_QUICK_ACTIONS_APPROVED:
+            case COMMENT_QUICK_ACTION_LIKED:
+            case COMMENT_QUICK_ACTION_REPLIED_TO:
+            case COMMENT_QUICK_ACTION_APPROVED:
                 predefinedEventProperties.put("is_quick_action", true);
                 break;
             case SIGNUP_EMAIL_EPILOGUE_UNCHANGED:
@@ -333,12 +338,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case QUICK_START_LIST_VIEW_SITE_SKIPPED:
                 predefinedEventProperties.put("task_name", "view_site");
                 break;
-            case QUICK_START_LIST_BROWSE_THEMES_SKIPPED:
-                predefinedEventProperties.put("task_name", "browse_themes");
-                break;
-            case QUICK_START_LIST_CUSTOMIZE_SITE_SKIPPED:
-                predefinedEventProperties.put("task_name", "customize_site");
-                break;
             case QUICK_START_LIST_ADD_SOCIAL_SKIPPED:
                 predefinedEventProperties.put("task_name", "share_site");
                 break;
@@ -351,9 +350,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case QUICK_START_LIST_UPLOAD_ICON_SKIPPED:
                 predefinedEventProperties.put("task_name", "upload_icon");
                 break;
-            case QUICK_START_LIST_CREATE_PAGE_SKIPPED:
-                predefinedEventProperties.put("task_name", "create_page");
-                break;
             case QUICK_START_LIST_CHECK_STATS_SKIPPED:
                 predefinedEventProperties.put("task_name", "check_stats");
                 break;
@@ -363,12 +359,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case QUICK_START_LIST_VIEW_SITE_TAPPED:
                 predefinedEventProperties.put("task_name", "view_site");
                 break;
-            case QUICK_START_LIST_BROWSE_THEMES_TAPPED:
-                predefinedEventProperties.put("task_name", "browse_themes");
-                break;
-            case QUICK_START_LIST_CUSTOMIZE_SITE_TAPPED:
-                predefinedEventProperties.put("task_name", "customize_site");
-                break;
             case QUICK_START_LIST_ADD_SOCIAL_TAPPED:
                 predefinedEventProperties.put("task_name", "share_site");
                 break;
@@ -381,9 +371,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case QUICK_START_LIST_UPLOAD_ICON_TAPPED:
                 predefinedEventProperties.put("task_name", "upload_icon");
                 break;
-            case QUICK_START_LIST_CREATE_PAGE_TAPPED:
-                predefinedEventProperties.put("task_name", "create_page");
-                break;
             case QUICK_START_LIST_CHECK_STATS_TAPPED:
                 predefinedEventProperties.put("task_name", "check_stats");
                 break;
@@ -399,12 +386,6 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case QUICK_START_VIEW_SITE_TASK_COMPLETED:
                 predefinedEventProperties.put("task_name", "view_site");
                 break;
-            case QUICK_START_BROWSE_THEMES_TASK_COMPLETED:
-                predefinedEventProperties.put("task_name", "browse_themes");
-                break;
-            case QUICK_START_CUSTOMIZE_SITE_TASK_COMPLETED:
-                predefinedEventProperties.put("task_name", "customize_site");
-                break;
             case QUICK_START_SHARE_SITE_TASK_COMPLETED:
                 predefinedEventProperties.put("task_name", "share_site");
                 break;
@@ -417,15 +398,22 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case QUICK_START_UPLOAD_ICON_COMPLETED:
                 predefinedEventProperties.put("task_name", "upload_icon");
                 break;
-            case QUICK_START_CREATE_PAGE_COMPLETED:
-                predefinedEventProperties.put("task_name", "create_page");
-                break;
             case QUICK_START_CHECK_STATS_COMPLETED:
                 predefinedEventProperties.put("task_name", "check_stats");
                 break;
             case QUICK_START_EXPLORE_PLANS_COMPLETED:
                 predefinedEventProperties.put("task_name", "explore_plans");
                 break;
+            case QUICK_START_LIST_EDIT_HOMEPAGE_SKIPPED:
+            case QUICK_START_LIST_EDIT_HOMEPAGE_TAPPED:
+            case QUICK_START_EDIT_HOMEPAGE_TASK_COMPLETED:
+                predefinedEventProperties.put("task_name", "edit_homepage");
+                break;
+            case QUICK_START_LIST_REVIEW_PAGES_SKIPPED:
+            case QUICK_START_LIST_REVIEW_PAGES_TAPPED:
+            case QUICK_START_REVIEW_PAGES_TASK_COMPLETED:
+                predefinedEventProperties.put("task_name", "review_pages");
+                break;
             case QUICK_START_REQUEST_DIALOG_NEGATIVE_TAPPED:
                 predefinedEventProperties.put("type", "negative");
                 break;
@@ -477,6 +465,12 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
             case FEATURE_ANNOUNCEMENT_FIND_OUT_MORE_TAPPED:
                 predefinedEventProperties.put("button", "find_out_more");
                 break;
+            case READER_ARTICLE_COMMENTED_ON:
+                predefinedEventProperties.put("replying_to", "post");
+                break;
+            case READER_ARTICLE_COMMENT_REPLIED_TO:
+                predefinedEventProperties.put("replying_to", "comment");
+                break;
         }
 
         final String user;
@@ -541,11 +535,11 @@ public void track(AnalyticsTracker.Stat stat, Map<String, ?> properties) {
         }
 
         if (propertiesToJSON.length() > 0) {
-            mNosaraClient.track(EVENTS_PREFIX + eventName, propertiesToJSON, user, userType);
+            mNosaraClient.track(mEventsPrefix + eventName, propertiesToJSON, user, userType);
             String jsonString = propertiesToJSON.toString();
             AppLog.i(T.STATS, "\uD83D\uDD35 Tracked: " + eventName + ", Properties: " + jsonString);
         } else {
-            mNosaraClient.track(EVENTS_PREFIX + eventName, user, userType);
+            mNosaraClient.track(mEventsPrefix + eventName, user, userType);
             AppLog.i(T.STATS, "\uD83D\uDD35 Tracked: " + eventName);
         }
     }
@@ -575,6 +569,7 @@ public void refreshMetadata(AnalyticsMetadata metadata) {
             properties.put(JETPACK_USER, metadata.isJetpackUser());
             properties.put(NUMBER_OF_BLOGS, metadata.getNumBlogs());
             properties.put(WPCOM_USER, metadata.isWordPressComUser());
+            properties.put(APP_SCHEME, metadata.getAppScheme());
             // Only add the editor information if it was set before.
             // See: https://github.com/wordpress-mobile/WordPress-Android/pull/10300#discussion_r309145514
             if (metadata.isGutenbergEnabledVariableSet()) {
@@ -635,6 +630,7 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
             case READER_ACCESSED:
                 return "reader_accessed";
             case READER_ARTICLE_COMMENTED_ON:
+            case READER_ARTICLE_COMMENT_REPLIED_TO:
                 return "reader_article_commented_on";
             case READER_ARTICLE_COMMENTS_OPENED:
                 return "reader_article_comments_opened";
@@ -688,6 +684,10 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "reader_reader_tag_followed";
             case READER_TAG_LOADED:
                 return "reader_tag_loaded";
+            case READER_P2_SHOWN:
+                return "reader_p2_shown";
+            case READER_A8C_SHOWN:
+                return "reader_a8c_shown";
             case READER_TAG_PREVIEWED:
                 return "reader_tag_previewed";
             case READER_SEARCH_LOADED:
@@ -753,8 +753,6 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "editor_session_switch_editor";
             case EDITOR_SESSION_TEMPLATE_APPLY:
                 return "editor_session_template_apply";
-            case EDITOR_SESSION_TEMPLATE_PREVIEW:
-                return "editor_session_template_preview";
             case EDITOR_SESSION_END:
                 return "editor_session_end";
             case EDITOR_GUTENBERG_ENABLED:
@@ -829,8 +827,6 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "editor_post_slug_changed";
             case EDITOR_POST_EXCERPT_CHANGED:
                 return "editor_post_excerpt_changed";
-            case EDITOR_POST_LOCATION_CHANGED:
-                return "editor_post_location_changed";
             case EDITOR_TAPPED_BLOCKQUOTE:
                 return "editor_button_tapped";
             case EDITOR_TAPPED_BOLD:
@@ -1141,6 +1137,8 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "stats_countries_view_more_tapped";
             case STATS_OVERVIEW_BAR_CHART_TAPPED:
                 return "stats_overview_bar_chart_tapped";
+            case STATS_OVERVIEW_ERROR:
+                return "stats_overview_error";
             case STATS_VIDEO_PLAYS_VIEW_MORE_TAPPED:
                 return "stats_video_plays_view_more_tapped";
             case STATS_VIDEO_PLAYS_VIDEO_TAPPED:
@@ -1379,6 +1377,42 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "enhanced_site_creation_error_shown";
             case ENHANCED_SITE_CREATION_BACKGROUND_SERVICE_UPDATED:
                 return "enhanced_site_creation_background_service_updated";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_VIEWED:
+                return "enhanced_site_creation_site_design_viewed";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_THUMBNAIL_MODE_BUTTON_TAPPED:
+                return "enhanced_site_creation_site_design_thumbnail_mode_button_tapped";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_SELECTED:
+                return "enhanced_site_creation_site_design_selected";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_SKIPPED:
+                return "enhanced_site_creation_site_design_skipped";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_VIEWED:
+                return "enhanced_site_creation_site_design_preview_viewed";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_MODE_BUTTON_TAPPED:
+                return "enhanced_site_creation_site_design_preview_mode_button_tapped";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_MODE_CHANGED:
+                return "enhanced_site_creation_site_design_preview_mode_changed";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADING:
+                return "enhanced_site_creation_site_design_preview_loading";
+            case ENHANCED_SITE_CREATION_SITE_DESIGN_PREVIEW_LOADED:
+                return "enhanced_site_creation_site_design_preview_loaded";
+            case LAYOUT_PICKER_PREVIEW_MODE_CHANGED:
+                return "layout_picker_preview_mode_changed";
+            case LAYOUT_PICKER_THUMBNAIL_MODE_BUTTON_TAPPED:
+                return "layout_picker_thumbnail_mode_button_tapped";
+            case LAYOUT_PICKER_PREVIEW_MODE_BUTTON_TAPPED:
+                return "layout_picker_preview_mode_button_tapped";
+            case LAYOUT_PICKER_PREVIEW_LOADING:
+                return "layout_picker_preview_loading";
+            case LAYOUT_PICKER_PREVIEW_LOADED:
+                return "layout_picker_preview_loaded";
+            case LAYOUT_PICKER_PREVIEW_VIEWED:
+                return "layout_picker_preview_viewed";
+            case LAYOUT_PICKER_ERROR_SHOWN:
+                return "layout_picker_error_shown";
+            case CATEGORY_FILTER_SELECTED:
+                return "category_filter_selected";
+            case CATEGORY_FILTER_DESELECTED:
+                return "category_filter_deselected";
             case SITE_CREATED:
                 // This stat is part of a funnel that provides critical information.  Before
                 // making ANY modification to this stat please refer to: p4qSXL-35X-p2
@@ -1501,10 +1535,18 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "site_settings_delete_site_response_error";
             case SITE_SETTINGS_OPTIMIZE_IMAGES_CHANGED:
                 return "site_settings_optimize_images_changed";
+            case SITE_SETTINGS_JETPACK_SECURITY_SETTINGS_VIEWED:
+                return "jetpack_settings_viewed";
+            case SITE_SETTINGS_JETPACK_ALLOWLISTED_IPS_VIEWED:
+                return "jetpack_allowlisted_ips_viewed";
+            case SITE_SETTINGS_JETPACK_ALLOWLISTED_IPS_CHANGED:
+                return "jetpack_allowlisted_ips_changed";
             case ABTEST_START:
                 return "abtest_start";
-            case FEATURE_FLAG_SET:
-                return "feature_flag_set";
+            case FEATURE_FLAG_VALUE:
+                return "feature_flag_value";
+            case FEATURE_FLAGS_SYNCED_STATE:
+                return "feature_flags_synced_state";
             case EXPERIMENT_VARIANT_SET:
                 return "experiment_variant_set";
             case TRAIN_TRACKS_RENDER:
@@ -1639,6 +1681,54 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "activity_log_detail_opened";
             case ACTIVITY_LOG_REWIND_STARTED:
                 return "activity_log_rewind_started";
+            case ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_BUTTON_TAPPED:
+                return "activitylog_filterbar_range_button_tapped";
+            case ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_BUTTON_TAPPED:
+                return "activitylog_filterbar_type_button_tapped";
+            case ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_SELECTED:
+                return "activitylog_filterbar_select_range";
+            case ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_SELECTED:
+                return "activitylog_filterbar_select_type";
+            case ACTIVITY_LOG_FILTER_BAR_DATE_RANGE_RESET:
+                return "activitylog_filterbar_reset_range";
+            case ACTIVITY_LOG_FILTER_BAR_ACTIVITY_TYPE_RESET:
+                return "activitylog_filterbar_reset_type";
+            case JETPACK_BACKUP_LIST_OPENED:
+                return "jetpack_backup_list_opened";
+            case JETPACK_BACKUP_REWIND_STARTED:
+                return "jetpack_backup_rewind_started";
+            case JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_BUTTON_TAPPED:
+                return "jetpack_backup_filterbar_range_button_tapped";
+            case JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_SELECTED:
+                return "jetpack_backup_filterbar_select_range";
+            case JETPACK_BACKUP_FILTER_BAR_DATE_RANGE_RESET:
+                return "jetpack_backup_filterbar_reset_range";
+            case JETPACK_SCAN_ACCESSED:
+                return "jetpack_scan_accessed";
+            case JETPACK_SCAN_HISTORY_ACCESSED:
+                return "jetpack_scan_history_accessed";
+            case JETPACK_SCAN_HISTORY_FILTER:
+                return "jetpack_scan_history_filter";
+            case JETPACK_SCAN_THREAT_LIST_ITEM_TAPPED:
+                return "jetpack_scan_threat_list_item_tapped";
+            case JETPACK_SCAN_THREAT_CODEABLE_ESTIMATE_TAPPED:
+                return "jetpack_scan_threat_codeable_estimate_tapped";
+            case JETPACK_SCAN_RUN_TAPPED:
+                return "jetpack_scan_run_tapped";
+            case JETPACK_SCAN_IGNORE_THREAT_DIALOG_OPEN:
+                return "jetpack_scan_ignorethreat_dialogopen";
+            case JETPACK_SCAN_THREAT_IGNORE_TAPPED:
+                return "jetpack_scan_threat_ignore_tapped";
+            case JETPACK_SCAN_FIX_THREAT_DIALOG_OPEN:
+                return "jetpack_scan_fixthreat_dialogopen";
+            case JETPACK_SCAN_THREAT_FIX_TAPPED:
+                return "jetpack_scan_threat_fix_tapped";
+            case JETPACK_SCAN_ALL_THREATS_OPEN:
+                return "jetpack_scan_allthreats_open";
+            case JETPACK_SCAN_ALL_THREATS_FIX_TAPPED:
+                return "jetpack_scan_allthreats_fix_tapped";
+            case JETPACK_SCAN_ERROR:
+                return "jetpack_scan_error";
             case SUPPORT_HELP_CENTER_VIEWED:
                 return "support_help_center_viewed";
             case SUPPORT_NEW_REQUEST_VIEWED:
@@ -1653,6 +1743,8 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "support_identity_set";
             case QUICK_START_TASK_DIALOG_VIEWED:
                 return "quick_start_task_dialog_viewed";
+            case QUICK_START_STARTED:
+                return "quick_start_started";
             case QUICK_START_TASK_DIALOG_NEGATIVE_TAPPED:
             case QUICK_START_TASK_DIALOG_POSITIVE_TAPPED:
                 return "quick_start_task_dialog_button_tapped";
@@ -1678,41 +1770,38 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
             case QUICK_START_LIST_CREATE_SITE_SKIPPED:
             case QUICK_START_LIST_UPDATE_SITE_TITLE_SKIPPED:
             case QUICK_START_LIST_VIEW_SITE_SKIPPED:
-            case QUICK_START_LIST_BROWSE_THEMES_SKIPPED:
-            case QUICK_START_LIST_CUSTOMIZE_SITE_SKIPPED:
             case QUICK_START_LIST_ADD_SOCIAL_SKIPPED:
             case QUICK_START_LIST_PUBLISH_POST_SKIPPED:
             case QUICK_START_LIST_FOLLOW_SITE_SKIPPED:
             case QUICK_START_LIST_UPLOAD_ICON_SKIPPED:
-            case QUICK_START_LIST_CREATE_PAGE_SKIPPED:
             case QUICK_START_LIST_CHECK_STATS_SKIPPED:
             case QUICK_START_LIST_EXPLORE_PLANS_SKIPPED:
+            case QUICK_START_LIST_EDIT_HOMEPAGE_SKIPPED:
+            case QUICK_START_LIST_REVIEW_PAGES_SKIPPED:
                 return "quick_start_list_item_skipped";
             case QUICK_START_LIST_CREATE_SITE_TAPPED:
             case QUICK_START_LIST_UPDATE_SITE_TITLE_TAPPED:
             case QUICK_START_LIST_VIEW_SITE_TAPPED:
-            case QUICK_START_LIST_BROWSE_THEMES_TAPPED:
-            case QUICK_START_LIST_CUSTOMIZE_SITE_TAPPED:
             case QUICK_START_LIST_ADD_SOCIAL_TAPPED:
             case QUICK_START_LIST_PUBLISH_POST_TAPPED:
             case QUICK_START_LIST_FOLLOW_SITE_TAPPED:
             case QUICK_START_LIST_UPLOAD_ICON_TAPPED:
-            case QUICK_START_LIST_CREATE_PAGE_TAPPED:
             case QUICK_START_LIST_CHECK_STATS_TAPPED:
             case QUICK_START_LIST_EXPLORE_PLANS_TAPPED:
+            case QUICK_START_LIST_EDIT_HOMEPAGE_TAPPED:
+            case QUICK_START_LIST_REVIEW_PAGES_TAPPED:
                 return "quick_start_list_item_tapped";
             case QUICK_START_CREATE_SITE_TASK_COMPLETED:
             case QUICK_START_UPDATE_SITE_TITLE_COMPLETED:
             case QUICK_START_VIEW_SITE_TASK_COMPLETED:
-            case QUICK_START_BROWSE_THEMES_TASK_COMPLETED:
-            case QUICK_START_CUSTOMIZE_SITE_TASK_COMPLETED:
             case QUICK_START_SHARE_SITE_TASK_COMPLETED:
             case QUICK_START_PUBLISH_POST_TASK_COMPLETED:
             case QUICK_START_FOLLOW_SITE_TASK_COMPLETED:
             case QUICK_START_UPLOAD_ICON_COMPLETED:
-            case QUICK_START_CREATE_PAGE_COMPLETED:
             case QUICK_START_CHECK_STATS_COMPLETED:
             case QUICK_START_EXPLORE_PLANS_COMPLETED:
+            case QUICK_START_EDIT_HOMEPAGE_TASK_COMPLETED:
+            case QUICK_START_REVIEW_PAGES_TASK_COMPLETED:
                 return "quick_start_task_completed";
             case QUICK_START_ALL_TASKS_COMPLETED:
                 return "quick_start_all_tasks_completed";
@@ -1728,6 +1817,10 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "quick_start_notification_sent";
             case QUICK_START_NOTIFICATION_TAPPED:
                 return "quick_start_notification_tapped";
+            case QUICK_START_HIDE_CARD_TAPPED:
+                return "quick_start_hide_card_tapped";
+            case QUICK_START_REMOVE_CARD_TAPPED:
+                return "quick_start_remove_card_tapped";
             case INSTALLATION_REFERRER_OBTAINED:
                 return "installation_referrer_obtained";
             case INSTALLATION_REFERRER_FAILED:
@@ -1827,6 +1920,8 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "story_intro_dismissed";
             case STORY_INTRO_CREATE_STORY_BUTTON_TAPPED:
                 return "story_intro_create_story_button_tapped";
+            case STORY_BLOCK_ADD_MEDIA_TAPPED:
+                return "story_block_add_media_tapped";
             case FEATURE_ANNOUNCEMENT_SHOWN_ON_APP_UPGRADE:
             case FEATURE_ANNOUNCEMENT_SHOWN_FROM_APP_SETTINGS:
                 return "feature_announcement_shown";
@@ -1879,6 +1974,111 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) {
                 return "encrypted_logging_upload_failed";
             case READER_POST_REPORTED:
                 return "reader_post_reported";
+            case SUGGESTION_SESSION_FINISHED:
+                return "suggestion_session_finished";
+            case COMMENT_APPROVED:
+            case COMMENT_QUICK_ACTION_APPROVED:
+                return "comment_approved";
+            case COMMENT_UNAPPROVED:
+                return "comment_unapproved";
+            case COMMENT_SPAMMED:
+                return "comment_spammed";
+            case COMMENT_UNSPAMMED:
+                return "comment_unspammed";
+            case COMMENT_LIKED:
+            case COMMENT_QUICK_ACTION_LIKED:
+                return "comment_liked";
+            case COMMENT_UNLIKED:
+                return "comment_unliked";
+            case COMMENT_TRASHED:
+                return "comment_trashed";
+            case COMMENT_UNTRASHED:
+                return "comment_untrashed";
+            case COMMENT_REPLIED_TO:
+            case COMMENT_QUICK_ACTION_REPLIED_TO:
+                return "comment_replied_to";
+            case COMMENT_EDITED:
+                return "comment_edited";
+            case COMMENT_VIEWED:
+                return "comment_viewed";
+            case COMMENT_DELETED:
+                return "comment_deleted";
+            case COMMENT_FOLLOW_CONVERSATION:
+                return "comment_follow_conversation";
+            case COMMENT_BATCH_APPROVED:
+                return "comment_batch_approved";
+            case COMMENT_BATCH_UNAPPROVED:
+                return "comment_batch_unapproved";
+            case COMMENT_BATCH_SPAMMED:
+                return "comment_batch_spammed";
+            case COMMENT_BATCH_TRASHED:
+                return "comment_batch_trashed";
+            case COMMENT_BATCH_DELETED:
+                return "comment_batch_deleted";
+            case COMMENT_EDITOR_OPENED:
+                return "comment_editor_opened";
+            case COMMENT_FILTER_CHANGED:
+                return "comment_filter_changed";
+            case READER_POST_MARKED_AS_SEEN:
+                return "reader_mark_as_seen";
+            case READER_POST_MARKED_AS_UNSEEN:
+                return "reader_mark_as_unseen";
+            case JETPACK_RESTORE_OPENED:
+                return "jetpack_restore_opened";
+            case JETPACK_RESTORE_CONFIRMED:
+                return "jetpack_restore_confirmed";
+            case JETPACK_RESTORE_ERROR:
+                return "jetpack_restore_error";
+            case JETPACK_BACKUP_DOWNLOAD_OPENED:
+                return "jetpack_backup_download_opened";
+            case JETPACK_BACKUP_DOWNLOAD_CONFIRMED:
+                return "jetpack_backup_download_confirmed";
+            case JETPACK_BACKUP_DOWNLOAD_ERROR:
+                return "jetpack_backup_download_error";
+            case JETPACK_BACKUP_DOWNLOAD_FILE_DOWNLOAD_TAPPED:
+                return "jetpack_backup_download_file_download_tapped";
+            case JETPACK_BACKUP_DOWNLOAD_SHARE_LINK_TAPPED:
+                return "jetpack_backup_download_share_link_tapped";
+            case MY_SITE_CREATE_SHEET_SHOWN:
+                return "my_site_create_sheet_shown";
+            case MY_SITE_CREATE_SHEET_ACTION_TAPPED:
+                return "my_site_create_sheet_action_tapped";
+            case POST_LIST_CREATE_SHEET_SHOWN:
+                return "post_list_create_sheet_shown";
+            case POST_LIST_CREATE_SHEET_ACTION_TAPPED:
+                return "post_list_create_sheet_action_tapped";
+            case INVITE_LINKS_GET_STATUS:
+                return "invite_links_get_status";
+            case INVITE_LINKS_GENERATE:
+                return "invite_links_generate";
+            case INVITE_LINKS_DISABLE:
+                return "invite_links_disable";
+            case INVITE_LINKS_SHARE:
+                return "invite_links_share";
+            case JETPACK_BACKUP_DOWNLOAD_FILE_NOTICE_DOWNLOAD_TAPPED:
+                return "jetpack_backup_download_file_notice_download_tapped";
+            case JETPACK_BACKUP_DOWNLOAD_FILE_NOTICE_DISMISSED_TAPPED:
+                return "jetpack_backup_download_file_notice_dismissed_tapped";
+            case ACTIVITY_LOG_DOWNLOAD_FILE_NOTICE_DOWNLOAD_TAPPED:
+                return "activity_log_download_file_notice_download_tapped";
+            case ACTIVITY_LOG_DOWNLOAD_FILE_NOTICE_DISMISSED_TAPPED:
+                return "activity_log_download_file_notice_dismissed_tapped";
+            case USER_PROFILE_SHEET_SHOWN:
+                return "user_profile_sheet_shown";
+            case USER_PROFILE_SHEET_SITE_SHOWN:
+                return "user_profile_sheet_site_shown";
+            case BLOG_URL_PREVIEWED:
+                return "blog_url_previewed";
+            case LIKE_LIST_OPENED:
+                return "like_list_opened";
+            case STORAGE_WARNING_SHOWN:
+                return "storage_warning_shown";
+            case STORAGE_WARNING_ACKNOWLEDGED:
+                return "storage_warning_acknowledged";
+            case STORAGE_WARNING_CANCELED:
+                return "storage_warning_canceled";
+            case STORAGE_WARNING_DONT_SHOW_AGAIN:
+                return "storage_warning_dont_show_again";
         }
         return null;
     }
diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle
index 45c1fd6e2ad5..8960ce73a380 100644
--- a/libs/editor/WordPressEditor/build.gradle
+++ b/libs/editor/WordPressEditor/build.gradle
@@ -18,7 +18,7 @@ repositories {
     google()
     jcenter()
     maven { url "https://www.jitpack.io" }
-    maven { url "https://dl.bintray.com/wordpress-mobile/react-native-mirror/" }
+    maven { url "https://a8c-libs.s3.amazonaws.com/android" }
 }
 
 apply plugin: 'com.android.library'
@@ -27,10 +27,6 @@ apply plugin: 'signing'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
-
-// import the `submoduleGitHash()` function
-apply from: 'https://gist.githubusercontent.com/hypest/e06f6097065728b6db7b7c462f8fef1a/raw/3b91756fca76e4c2a9b573313e186c47842e1f7d/submoduleGitHash.gradle'
-
 android {
     compileSdkVersion 29
 
@@ -39,7 +35,6 @@ android {
         versionName "1.3"
         minSdkVersion 21
         targetSdkVersion 29
-        buildConfigField "boolean", "BUILD_GUTENBERG_FROM_SOURCE", (rootProject.ext.has("buildGutenbergFromSource") ? rootProject.ext.buildGutenbergFromSource : false).toString()
     }
     compileOptions {
         sourceCompatibility 1.8
@@ -72,17 +67,15 @@ dependencies {
     implementation 'com.android.volley:volley:1.1.1'
     implementation 'org.wordpress:utils:1.25'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:$aztecVersion") {
         exclude group: "com.android.volley"
     }
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-shortcodes:$aztecVersion")
     api ("com.github.wordpress-mobile.WordPress-Aztec-Android:wordpress-comments:$aztecVersion")
 
-    implementation (project(':@wordpress_react-native-bridge')) {
-        exclude group: "com.android.volley"
-        exclude group: 'com.google.code.findbugs'
-    }
+    // This dependency will be substituted if the `local-builds.gradle` file contains
+    // `localGutenbergMobilePath`. Details for this can be found in the `settings.gradle` file.
+    implementation "$rootProject.gradle.ext.gutenbergMobileBinaryPath:$rootProject.ext.gutenbergMobileVersion"
 
     // Required Aztec dependencies (they should be included but Jitpack seems to be stripping these out)
     implementation "org.jetbrains.kotlin:kotlin-stdlib:1.1.4"
diff --git a/libs/editor/WordPressEditor/src/main/assets/unsupported-block-editor b/libs/editor/WordPressEditor/src/main/assets/unsupported-block-editor
deleted file mode 120000
index 119bab496558..000000000000
--- a/libs/editor/WordPressEditor/src/main/assets/unsupported-block-editor
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../gutenberg-mobile/resources/unsupported-block-editor/
\ No newline at end of file
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
index 1f7ab5758cca..5308dbace359 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
@@ -8,6 +8,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Color;
@@ -19,6 +20,7 @@
 import android.os.Handler;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -420,6 +422,11 @@ public void onResume() {
             hideActionBarIfNeeded();
         }
 
+        // Existing Posts have title set before onResume is called
+        if (isEmptyPost() && !hasSeenClassicEditorDeprecationDialog()) {
+            showClassicEditorDeprecationDialog();
+        }
+        
         addOverlayToGifs();
         updateFailedAndUploadingMedia();
     }
@@ -2378,4 +2385,28 @@ public void setExternalLogger(AztecLog.ExternalLogger logger) {
     public void disableHWAcceleration() {
         mFragmentView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
     }
+
+    /**
+     * Methods for showing Classic Editor Deprecation notice
+     */
+    private boolean isEmptyPost() {
+        return TextUtils.isEmpty(mTitle.getText())
+                          && TextUtils.isEmpty(mContent.getText());
+    }
+
+    private boolean hasSeenClassicEditorDeprecationDialog() {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        return prefs.getBoolean(getString(R.string.pref_key_seen_classic_editor_deprecation_notice), false);
+    }
+
+    private void showClassicEditorDeprecationDialog() {
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getActivity());
+        builder.setTitle(getString(R.string.dialog_title_try_block_editor));
+        builder.setMessage(getString(R.string.dialog_body_try_block_editor));
+        builder.setNegativeButton(getString(R.string.dialog_dismiss_try_block_editor), null);
+        builder.show();
+
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        prefs.edit().putBoolean(getString(R.string.pref_key_seen_classic_editor_deprecation_notice), true).apply();
+    }
 }
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
index c3ca0429d248..473f9163136e 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
@@ -177,11 +177,13 @@ public static MediaType getEditorMimeType(MediaFile mediaFile) {
      */
     public interface EditorFragmentListener extends DialogVisibilityProvider {
         void onEditorFragmentInitialized();
-        void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocks);
+        void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocks, boolean replaceBlockActionWaiting);
         void onAddMediaClicked();
         void onAddMediaImageClicked(boolean allowMultipleSelection);
         void onAddMediaVideoClicked(boolean allowMultipleSelection);
         void onAddLibraryMediaClicked(boolean allowMultipleSelection);
+        void onAddLibraryFileClicked(boolean allowMultipleSelection);
+        void onAddLibraryAudioFileClicked(boolean allowMultipleSelection);
         void onAddPhotoClicked(boolean allowMultipleSelection);
         void onCapturePhotoClicked();
         void onAddVideoClicked(boolean allowMultipleSelection);
@@ -199,18 +201,21 @@ public interface EditorFragmentListener extends DialogVisibilityProvider {
         void onHtmlModeToggledInToolbar();
         void onAddStockMediaClicked(boolean allowMultipleSelection);
         void onAddGifClicked(boolean allowMultipleSelection);
-        void onPerformFetch(String path, Consumer<String> onResult, Consumer<Bundle> onError);
-        void onGutenbergEditorSessionTemplateApplyTracked(String template);
-        void onGutenbergEditorSessionTemplatePreviewTracked(String template);
-        void getMention(Consumer<String> onResult);
-        void onGutenbergEditorSetStarterPageTemplatesTooltipShown(boolean tooltipShown);
-        boolean onGutenbergEditorRequestStarterPageTemplatesTooltipShown();
+        void onAddFileClicked(boolean allowMultipleSelection);
+        void onAddAudioFileClicked(boolean allowMultipleSelection);
+        void onPerformFetch(String path, boolean enableCaching, Consumer<String> onResult, Consumer<Bundle> onError);
+        void showUserSuggestions(Consumer<String> onResult);
+        void showXpostSuggestions(Consumer<String> onResult);
+        void onGutenbergEditorSetFocalPointPickerTooltipShown(boolean tooltipShown);
+        boolean onGutenbergEditorRequestFocalPointPickerTooltipShown();
         String getErrorMessageFromMedia(int mediaId);
         void showJetpackSettings();
         void onStoryComposerLoadRequested(ArrayList<Object> mediaFiles, String blockId);
         void onRetryUploadForMediaCollection(ArrayList<Object> mediaFiles);
         void onCancelUploadForMediaCollection(ArrayList<Object> mediaFiles);
         void onCancelSaveForMediaCollection(ArrayList<Object> mediaFiles);
+        void onReplaceStoryEditedBlockActionSent();
+        void onReplaceStoryEditedBlockActionReceived();
     }
 
     /**
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java
index 3e4095d2213a..6bee73a43c0b 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/WPGutenbergWebViewActivity.java
@@ -140,13 +140,13 @@ private String getAuthenticationPostData(String authenticationUrl,
 
     @Override
     protected List<String> getOnGutenbergReadyExternalSources() {
-        String file = getFileContentFromAssets("unsupported-block-editor/remove-nux.js");
+        String file = getFileContentFromAssets("remove-nux.js");
         return Arrays.asList(file);
     }
 
     @Override protected List<String> getOnPageLoadExternalSources() {
         long userId = getIntent().getExtras().getLong(ARG_USER_ID, 0);
-        String file = getFileContentFromAssets("unsupported-block-editor/extra-localstorage-entries.js")
+        String file = getFileContentFromAssets("extra-localstorage-entries.js")
                 .replace("%@", Long.toString(userId));
         return Arrays.asList(file);
     }
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java
index d215a8be808e..d9c4b6f2f806 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergContainerFragment.java
@@ -10,7 +10,7 @@
 import org.wordpress.android.editor.BuildConfig;
 import org.wordpress.android.editor.ExceptionLogger;
 import org.wordpress.android.editor.R;
-import org.wordpress.mobile.WPAndroidGlue.AddMentionUtil;
+import org.wordpress.mobile.WPAndroidGlue.ShowSuggestionsUtil;
 import org.wordpress.mobile.WPAndroidGlue.GutenbergProps;
 import org.wordpress.mobile.WPAndroidGlue.RequestExecutor;
 import org.wordpress.mobile.WPAndroidGlue.Media;
@@ -23,10 +23,9 @@
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidRequestUnsupportedBlockFallbackListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidSendButtonPressedActionListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnImageFullscreenPreviewListener;
-import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnLogGutenbergUserEventListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener;
-import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnStarterPageTemplatesTooltipShownEventListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnFocalPointPickerTooltipShownEventListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaEditorListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaFilesCollectionBasedBlockEditorListener;
@@ -63,15 +62,14 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
                                   RequestExecutor fetchExecutor,
                                   OnImageFullscreenPreviewListener onImageFullscreenPreviewListener,
                                   OnMediaEditorListener onMediaEditorListener,
-                                  OnLogGutenbergUserEventListener onLogGutenbergUserEventListener,
                                   OnGutenbergDidRequestUnsupportedBlockFallbackListener
                                           onGutenbergDidRequestUnsupportedBlockFallbackListener,
                                   OnGutenbergDidSendButtonPressedActionListener
                                           onGutenbergDidSendButtonPressedActionListener,
-                                  AddMentionUtil addMentionUtil,
-                                  OnStarterPageTemplatesTooltipShownEventListener onSPTTooltipShownEventListener,
+                                  ShowSuggestionsUtil showSuggestionsUtil,
                                   OnMediaFilesCollectionBasedBlockEditorListener
                                           onMediaFilesCollectionBasedBlockEditorListener,
+                                  OnFocalPointPickerTooltipShownEventListener onFPPTooltipShownEventListener,
                                   boolean isDarkMode) {
             mWPAndroidGlueCode.attachToContainer(
                     viewGroup,
@@ -84,12 +82,11 @@ public void attachToContainer(ViewGroup viewGroup, OnMediaLibraryButtonListener
                     fetchExecutor,
                     onImageFullscreenPreviewListener,
                     onMediaEditorListener,
-                    onLogGutenbergUserEventListener,
                     onGutenbergDidRequestUnsupportedBlockFallbackListener,
                     onGutenbergDidSendButtonPressedActionListener,
-                    addMentionUtil,
-                    onSPTTooltipShownEventListener,
+                    showSuggestionsUtil,
                     onMediaFilesCollectionBasedBlockEditorListener,
+                    onFPPTooltipShownEventListener,
                     isDarkMode);
     }
 
@@ -113,7 +110,6 @@ public void onCreate(Bundle savedInstanceState) {
                 getContext(),
                 getActivity().getApplication(),
                 BuildConfig.DEBUG,
-                BuildConfig.BUILD_GUTENBERG_FROM_SOURCE,
                 getContext().getResources().getColor(R.color.background_color),
                 exceptionLogger,
                 breadcrumbLogger,
@@ -260,4 +256,8 @@ public void onStorySaveResult(final String storyFirstMediaId, final boolean succ
     public void onMediaModelCreatedForFile(String oldId, String newId, String oldUrl) {
         mWPAndroidGlueCode.mediaIdChanged(oldId, newId, oldUrl);
     }
+
+    public void sendToJSFeaturedImageId(int mediaId) {
+        mWPAndroidGlueCode.sendToJSFeaturedImageId(mediaId);
+    }
 }
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
index b61743db4930..a1d2f56de720 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
@@ -24,6 +24,7 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.util.Consumer;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
@@ -31,6 +32,7 @@
 
 import com.android.volley.toolbox.ImageLoader;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.gson.Gson;
 
 import org.wordpress.android.editor.BuildConfig;
 import org.wordpress.android.editor.EditorEditMediaListener;
@@ -52,21 +54,20 @@
 import org.wordpress.android.util.helpers.MediaFile;
 import org.wordpress.android.util.helpers.MediaGallery;
 import org.wordpress.aztec.IHistoryListener;
-import org.wordpress.mobile.ReactNativeGutenbergBridge.GutenbergBridgeJS2Parent.GutenbergUserEvent;
 import org.wordpress.mobile.WPAndroidGlue.Media;
 import org.wordpress.mobile.WPAndroidGlue.MediaOption;
+import org.wordpress.mobile.WPAndroidGlue.ShowSuggestionsUtil;
 import org.wordpress.mobile.WPAndroidGlue.UnsupportedBlock;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnContentInfoReceivedListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorMountListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnFocalPointPickerTooltipShownEventListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGetContentTimeout;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidRequestUnsupportedBlockFallbackListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnGutenbergDidSendButtonPressedActionListener;
-import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnLogGutenbergUserEventListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaFilesCollectionBasedBlockEditorListener;
+import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaSavingQueryListener;
 import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachMediaUploadQueryListener;
-import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnStarterPageTemplatesTooltipShownEventListener;
-import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
-import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaFilesCollectionBasedBlockEditorListener;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -88,15 +89,18 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
     private static final String KEY_EDITOR_DID_MOUNT = "KEY_EDITOR_DID_MOUNT";
     private static final String ARG_IS_NEW_POST = "param_is_new_post";
     private static final String ARG_GUTENBERG_WEB_VIEW_AUTH_DATA = "param_gutenberg_web_view_auth_data";
-    private static final String ARG_TENOR_ENABLED = "param_tenor_enabled";
     private static final String ARG_GUTENBERG_PROPS_BUILDER = "param_gutenberg_props_builder";
     private static final String ARG_STORY_EDITOR_REQUEST_CODE = "param_sory_editor_request_code";
     public static final String ARG_STORY_BLOCK_ID = "story_block_id";
     public static final String ARG_STORY_BLOCK_UPDATED_CONTENT = "story_block_updated_content";
+    public static final String ARG_STORY_BLOCK_EXTERNALLY_EDITED_ORIGINAL_HASH = "story_block_original_hash";
+    public static final String ARG_FAILED_MEDIAS = "arg_failed_medias";
 
     private static final int CAPTURE_PHOTO_PERMISSION_REQUEST_CODE = 101;
     private static final int CAPTURE_VIDEO_PERMISSION_REQUEST_CODE = 102;
 
+    private static final String MEDIA_SOURCE_FILE = "MEDIA_SOURCE_FILE";
+    private static final String MEDIA_SOURCE_AUDIO_FILE = "MEDIA_SOURCE_AUDIO_FILE";
     private static final String MEDIA_SOURCE_STOCK_MEDIA = "MEDIA_SOURCE_STOCK_MEDIA";
     private static final String GIF_MEDIA = "GIF_MEDIA";
 
@@ -118,7 +122,7 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
     GutenbergContainerFragment mRetainedGutenbergContainerFragment;
 
     private ConcurrentHashMap<String, Float> mUploadingMediaProgressMax = new ConcurrentHashMap<>();
-    private Set<String> mFailedMediaIds = new HashSet<>();
+    private HashSet<String> mFailedMediaIds = new HashSet<>();
     private ConcurrentHashMap<String, Date> mCancelledMediaIds = new ConcurrentHashMap<>();
 
     private boolean mIsNewPost;
@@ -126,6 +130,11 @@ public class GutenbergEditorFragment extends EditorFragmentAbstract implements
 
     private boolean mEditorDidMount;
     private GutenbergPropsBuilder mCurrentGutenbergPropsBuilder;
+    private boolean mUpdateCapabilitiesOnCreate = false;
+    private String mExternallyEditedBlockOriginalHash = null;
+    private boolean mStoryBlockReplacedSignalWait = false;
+
+    private String mUpdatedStoryBlockContent = null;
 
     private ProgressDialog mSavingContentProgressDialog;
 
@@ -133,7 +142,6 @@ public static GutenbergEditorFragment newInstance(String title,
                                                       String content,
                                                       boolean isNewPost,
                                                       GutenbergWebViewAuthorizationData webViewAuthorizationData,
-                                                      boolean tenorEnabled,
                                                       GutenbergPropsBuilder gutenbergPropsBuilder,
                                                       int storyBlockEditRequestCode) {
         GutenbergEditorFragment fragment = new GutenbergEditorFragment();
@@ -142,7 +150,6 @@ public static GutenbergEditorFragment newInstance(String title,
         args.putString(ARG_PARAM_CONTENT, content);
         args.putBoolean(ARG_IS_NEW_POST, isNewPost);
         args.putParcelable(ARG_GUTENBERG_WEB_VIEW_AUTH_DATA, webViewAuthorizationData);
-        args.putBoolean(ARG_TENOR_ENABLED, tenorEnabled);
         args.putParcelable(ARG_GUTENBERG_PROPS_BUILDER, gutenbergPropsBuilder);
         args.putInt(ARG_STORY_EDITOR_REQUEST_CODE, storyBlockEditRequestCode);
         fragment.setArguments(args);
@@ -177,12 +184,19 @@ public void onCreate(Bundle savedInstanceState) {
             fragmentTransaction.commitNow();
         }
 
+        if (mUpdateCapabilitiesOnCreate) {
+            getGutenbergContainerFragment().updateCapabilities(mCurrentGutenbergPropsBuilder);
+        }
+
         ProfilingUtils.start("Visual Editor Startup");
         ProfilingUtils.split("EditorFragment.onCreate");
 
         if (savedInstanceState != null) {
             mHtmlModeEnabled = savedInstanceState.getBoolean(KEY_HTML_MODE_ENABLED);
             mEditorDidMount = savedInstanceState.getBoolean(KEY_EDITOR_DID_MOUNT);
+            mExternallyEditedBlockOriginalHash = savedInstanceState.getString(
+                    ARG_STORY_BLOCK_EXTERNALLY_EDITED_ORIGINAL_HASH);
+            mFailedMediaIds = (HashSet<String>) savedInstanceState.getSerializable(ARG_FAILED_MEDIAS);
         }
     }
 
@@ -217,6 +231,16 @@ public void onMediaLibraryMediaButtonClicked(boolean allowMultipleSelection) {
                         mEditorFragmentListener.onAddLibraryMediaClicked(allowMultipleSelection);
                     }
 
+                    @Override public void onMediaLibraryFileButtonClicked(boolean allowMultipleSelection) {
+                        mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
+                        mEditorFragmentListener.onAddLibraryFileClicked(allowMultipleSelection);
+                    }
+
+                    @Override public void onMediaLibraryAudioButtonClicked(boolean allowMultipleSelection) {
+                        mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
+                        mEditorFragmentListener.onAddLibraryAudioFileClicked(allowMultipleSelection);
+                    }
+
                     @Override
                     public void onUploadPhotoButtonClicked(boolean allowMultipleSelection) {
                         mEditorFragmentListener.onAddPhotoClicked(allowMultipleSelection);
@@ -263,12 +287,34 @@ public ArrayList<MediaOption> onGetOtherMediaImageOptions() {
                         return otherMediaImageOptions;
                     }
 
+                    @Override
+                    public ArrayList<MediaOption> onGetOtherMediaFileOptions() {
+                        ArrayList<MediaOption> otherMediaFileOptions = initOtherMediaFileOptions();
+                        return otherMediaFileOptions;
+                    }
+
+                    @Override public ArrayList<MediaOption> onGetOtherMediaAudioFileOptions() {
+                        return initOtherMediaAudioFileOptions();
+                    }
+
                     @Override
                     public void onOtherMediaButtonClicked(String mediaSource, boolean allowMultipleSelection) {
-                        if (mediaSource.equals(MEDIA_SOURCE_STOCK_MEDIA)) {
-                            mEditorFragmentListener.onAddStockMediaClicked(allowMultipleSelection);
-                        } else if (mediaSource.equals(GIF_MEDIA)) {
-                            mEditorFragmentListener.onAddGifClicked(allowMultipleSelection);
+                        switch (mediaSource) {
+                            case MEDIA_SOURCE_STOCK_MEDIA:
+                                mEditorFragmentListener.onAddStockMediaClicked(allowMultipleSelection);
+                                break;
+                            case GIF_MEDIA:
+                                mEditorFragmentListener.onAddGifClicked(allowMultipleSelection);
+                                break;
+                            case MEDIA_SOURCE_FILE:
+                                mEditorFragmentListener.onAddFileClicked(allowMultipleSelection);
+                                break;
+                            case MEDIA_SOURCE_AUDIO_FILE:
+                                mEditorFragmentListener.onAddAudioFileClicked(allowMultipleSelection);
+                                break;
+                            default:
+                                AppLog.e(T.EDITOR,
+                                        "Unsupported media source " + mediaSource);
                         }
                     }
                 },
@@ -291,7 +337,10 @@ public void onQueryCurrentProgressForUploadingMedia() {
                     @Override
                     public void onEditorDidMount(ArrayList<Object> unsupportedBlocks) {
                         mEditorDidMount = true;
-                        mEditorFragmentListener.onEditorFragmentContentReady(unsupportedBlocks);
+                        mEditorFragmentListener.onEditorFragmentContentReady(
+                                unsupportedBlocks,
+                                mExternallyEditedBlockOriginalHash != null
+                        );
 
                         // Hide the progress bar when editor is ready
                         new Handler(Looper.getMainLooper()).post(new Runnable() {
@@ -307,21 +356,6 @@ public void run() {
                 mEditorFragmentListener::onPerformFetch,
                 mEditorImagePreviewListener::onImagePreviewRequested,
                 mEditorEditMediaListener::onMediaEditorRequested,
-                new OnLogGutenbergUserEventListener() {
-                    @Override
-                    public void onGutenbergUserEvent(GutenbergUserEvent event, Map<String, Object> properties) {
-                        switch (event) {
-                            case EDITOR_SESSION_TEMPLATE_PREVIEW:
-                                mEditorFragmentListener.onGutenbergEditorSessionTemplatePreviewTracked((String)
-                                        properties.get(USER_EVENT_KEY_TEMPLATE));
-                                break;
-                            case EDITOR_SESSION_TEMPLATE_APPLY:
-                                mEditorFragmentListener.onGutenbergEditorSessionTemplateApplyTracked((String)
-                                        properties.get(USER_EVENT_KEY_TEMPLATE));
-                                break;
-                        }
-                    }
-                },
                 new OnGutenbergDidRequestUnsupportedBlockFallbackListener() {
                     @Override
                     public void gutenbergDidRequestUnsupportedBlockFallback(UnsupportedBlock unsupportedBlock) {
@@ -339,20 +373,24 @@ public void gutenbergDidSendButtonPressedAction(String buttonType) {
                         mEditorFragmentListener.showJetpackSettings();
                     }
                 },
-                mEditorFragmentListener::getMention,
-                new OnStarterPageTemplatesTooltipShownEventListener() {
-                    @Override
-                    public void onSetStarterPageTemplatesTooltipShown(boolean tooltipShown) {
-                        mEditorFragmentListener.onGutenbergEditorSetStarterPageTemplatesTooltipShown(tooltipShown);
+
+                new ShowSuggestionsUtil() {
+                    @Override public void showUserSuggestions(Consumer<String> onResult) {
+                        mEditorFragmentListener.showUserSuggestions(onResult);
                     }
 
-                    @Override
-                    public boolean onRequestStarterPageTemplatesTooltipShown() {
-                        return mEditorFragmentListener.onGutenbergEditorRequestStarterPageTemplatesTooltipShown();
+                    @Override public void showXpostSuggestions(Consumer<String> onResult) {
+                        mEditorFragmentListener.showXpostSuggestions(onResult);
                     }
                 },
                 new OnMediaFilesCollectionBasedBlockEditorListener() {
                     @Override public void onRequestMediaFilesEditorLoad(ArrayList<Object> mediaFiles, String blockId) {
+                        // let's first calculate the hash on this mediaFiles array, this will let us
+                        // identify the block later when we need to replace it as we come back from the Story
+                        // composer
+                        mExternallyEditedBlockOriginalHash = calculateHashOnMediaCollectionBasedBlock(mediaFiles);
+
+                        // now pass the signal up to the EditorFragmentListener
                         mEditorFragmentListener.onStoryComposerLoadRequested(mediaFiles, blockId);
                     }
 
@@ -367,6 +405,51 @@ public boolean onRequestStarterPageTemplatesTooltipShown() {
                     @Override public void onCancelSaveForMediaCollection(ArrayList<Object> mediaFiles) {
                         showCancelMediaCollectionSaveDialog(mediaFiles);
                     }
+
+                    @Override public void onMediaFilesBlockReplaceSync(ArrayList<Object> mediaFiles, String blockId) {
+                        if (mStoryBlockReplacedSignalWait) {
+                            // in case we were expecting a fresh block replacement sync signal, let the fragment
+                            // listener know so it can process all of the pending block save / update / upload events
+                            mStoryBlockReplacedSignalWait = false;
+                            mExternallyEditedBlockOriginalHash = null;
+                            mEditorFragmentListener.onReplaceStoryEditedBlockActionReceived();
+                        } else {
+                            // caclulate the hash to verify whether this is the block that needs to get replaced
+                            // this is important given we could be receiving a request to sync from a different Story
+                            // block in the same Post otherwise
+                            String calculatedHash = calculateHashOnMediaCollectionBasedBlock(mediaFiles);
+                            if (mExternallyEditedBlockOriginalHash != null && calculatedHash != null
+                                && mExternallyEditedBlockOriginalHash.contentEquals(calculatedHash)) {
+                                if (!TextUtils.isEmpty(mUpdatedStoryBlockContent)) {
+                                    // after the replaceStoryEditedBlock is sent down to Gutenberg, we can expect the
+                                    // new block to signal a replaceBlockSync to us again after loading, calling this
+                                    // very callback method again
+                                    mStoryBlockReplacedSignalWait = true;
+                                    // this call needs to be made right before `replaceStoryEditedBlock()`
+                                    mEditorFragmentListener.onReplaceStoryEditedBlockActionSent();
+                                    getGutenbergContainerFragment()
+                                            .replaceStoryEditedBlock(mUpdatedStoryBlockContent, blockId);
+                                } else {
+                                    // TODO handle / log error here, or maybe just skip it
+                                }
+                            } else {
+                                // no op
+                                // the arrays don't match means we're getting a signal to sync a different Story block,
+                                // other than the one that was actually edited. Just skip it.
+                            }
+                        }
+                    }
+                },
+                new OnFocalPointPickerTooltipShownEventListener() {
+                    @Override
+                    public void onSetFocalPointPickerTooltipShown(boolean tooltipShown) {
+                        mEditorFragmentListener.onGutenbergEditorSetFocalPointPickerTooltipShown(tooltipShown);
+                    }
+
+                    @Override
+                    public boolean onRequestFocalPointPickerTooltipShown() {
+                        return mEditorFragmentListener.onGutenbergEditorRequestFocalPointPickerTooltipShown();
+                    }
                 },
                 GutenbergUtils.isDarkMode(getActivity()));
 
@@ -399,6 +482,26 @@ public void run() {
         return view;
     }
 
+    private String calculateHashOnMediaCollectionBasedBlock(ArrayList<Object> mediaFiles) {
+        Gson gson = new Gson();
+        // make sure to normalize ids to Strings as these may vary and make the hash not coincide
+        normalizeMediaFilesIds(mediaFiles);
+        return StringUtils.getMd5Hash(gson.toJson(mediaFiles));
+    }
+
+    private void normalizeMediaFilesIds(ArrayList<Object> mediaFiles) {
+        // iterate through all of mediaFiles objects    and convert ids to String
+        for (Object mediaFile : mediaFiles) {
+            // this conversion is needed to strip off decimals that can come from RN when using int as
+            // string
+            if (((HashMap<String, Object>) mediaFile).get("id") instanceof Double) {
+                Double originalValue = (Double) ((HashMap<String, Object>) mediaFile).get("id");
+                // now set it back to String to normalize with temporary ids
+                ((HashMap) mediaFile).put("id", String.valueOf(originalValue.longValue()));
+            }
+        }
+    }
+
     private void initializeSavingProgressDialog() {
         if (mEditorFragmentListener != null) {
             mEditorFragmentListener.getSavingInProgressDialogVisibility()
@@ -460,13 +563,15 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
             }
         } else if (requestCode == mStoryBlockEditRequestCode) {
             if (resultCode == Activity.RESULT_OK) {
-                // handle edited block content
+                // handle edited block content, also keep edited block content to handle later if Gutenberg not
+                // mounted right now
                 String blockId = data.getStringExtra(ARG_STORY_BLOCK_ID);
-                String updatedBlockContent = data.getStringExtra(ARG_STORY_BLOCK_UPDATED_CONTENT);
-                getGutenbergContainerFragment().replaceStoryEditedBlock(updatedBlockContent, blockId);
+                mUpdatedStoryBlockContent = data.getStringExtra(ARG_STORY_BLOCK_UPDATED_CONTENT);
+                getGutenbergContainerFragment().replaceStoryEditedBlock(mUpdatedStoryBlockContent, blockId);
                 // TODO maybe we need to track something here?
             } else {
                 // TODO maybe we need to track something here?
+                mExternallyEditedBlockOriginalHash = null;
             }
         }
     }
@@ -485,7 +590,6 @@ private ArrayList<MediaOption> initOtherMediaImageOptions() {
         GutenbergWebViewAuthorizationData gutenbergWebViewAuthorizationData =
                 arguments.getParcelable(ARG_GUTENBERG_WEB_VIEW_AUTH_DATA);
         boolean supportStockPhotos = gutenbergWebViewAuthorizationData.isSiteUsingWPComRestAPI();
-        boolean supportGifs = arguments.getBoolean(ARG_TENOR_ENABLED, false);
 
         String packageName = activity.getApplication().getPackageName();
         if (supportStockPhotos) {
@@ -494,12 +598,38 @@ private ArrayList<MediaOption> initOtherMediaImageOptions() {
 
             otherMediaOptions.add(new MediaOption(MEDIA_SOURCE_STOCK_MEDIA, getString(stockMediaResourceId)));
         }
-        if (supportGifs) {
-            int gifMediaResourceId =
-                    getResources().getIdentifier("photo_picker_gif", "string", packageName);
-            otherMediaOptions.add(new MediaOption(GIF_MEDIA, getString(gifMediaResourceId)));
+        int gifMediaResourceId =
+                getResources().getIdentifier("photo_picker_gif", "string", packageName);
+        otherMediaOptions.add(new MediaOption(GIF_MEDIA, getString(gifMediaResourceId)));
+
+        return otherMediaOptions;
+    }
+
+    private ArrayList<MediaOption> initOtherMediaFileOptions() {
+        return initOtherMediaFileOptions(MEDIA_SOURCE_FILE);
+    }
+
+    private ArrayList<MediaOption> initOtherMediaAudioFileOptions() {
+        return initOtherMediaFileOptions(MEDIA_SOURCE_AUDIO_FILE);
+    }
+
+    private ArrayList<MediaOption> initOtherMediaFileOptions(String mediaOptionId) {
+        ArrayList<MediaOption> otherMediaOptions = new ArrayList<>();
+
+        FragmentActivity activity = getActivity();
+        if (activity == null) {
+            AppLog.e(T.EDITOR,
+                    "Failed to initialize other media options because the activity is null");
+            return otherMediaOptions;
         }
 
+        String packageName = activity.getApplication().getPackageName();
+
+        int chooseFileResourceId =
+                getResources().getIdentifier("photo_picker_choose_file", "string", packageName);
+
+        otherMediaOptions.add(new MediaOption(mediaOptionId, getString(chooseFileResourceId)));
+
         return otherMediaOptions;
     }
 
@@ -644,6 +774,10 @@ public void onClick(DialogInterface dialog, int id) {
         dialog.show();
     }
 
+    public void sendToJSFeaturedImageId(int mediaId) {
+        getGutenbergContainerFragment().sendToJSFeaturedImageId(mediaId);
+    }
+
     private void showCancelMediaCollectionUploadDialog(ArrayList<Object> mediaFiles) {
         // Display 'cancel upload' dialog
         AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
@@ -746,6 +880,8 @@ public void onAttach(Activity activity) {
     public void onSaveInstanceState(Bundle outState) {
         outState.putBoolean(KEY_HTML_MODE_ENABLED, mHtmlModeEnabled);
         outState.putBoolean(KEY_EDITOR_DID_MOUNT, mEditorDidMount);
+        outState.putString(ARG_STORY_BLOCK_EXTERNALLY_EDITED_ORIGINAL_HASH, mExternallyEditedBlockOriginalHash);
+        outState.putSerializable(ARG_FAILED_MEDIAS, mFailedMediaIds);
     }
 
     @Override
@@ -836,10 +972,17 @@ public void setContent(CharSequence text) {
         getGutenbergContainerFragment().setContent(postContent);
     }
 
-    public void updateCapabilities(boolean isJetpackSsoEnabled, GutenbergPropsBuilder gutenbergPropsBuilder) {
-        mIsJetpackSsoEnabled = isJetpackSsoEnabled;
+    public void setJetpackSsoEnabled(boolean jetpackSsoEnabled) {
+        mIsJetpackSsoEnabled = jetpackSsoEnabled;
+    }
+
+    public void updateCapabilities(GutenbergPropsBuilder gutenbergPropsBuilder) {
         mCurrentGutenbergPropsBuilder = gutenbergPropsBuilder;
-        getGutenbergContainerFragment().updateCapabilities(gutenbergPropsBuilder);
+        if (isAdded()) {
+            getGutenbergContainerFragment().updateCapabilities(gutenbergPropsBuilder);
+        } else {
+            mUpdateCapabilitiesOnCreate = true;
+        }
     }
 
     public void onToggleHtmlMode() {
@@ -1016,7 +1159,8 @@ public void appendMediaFiles(Map<String, MediaFile> mediaList) {
             rnMediaList.add(createRNMediaUsingMimeType(mediaId,
                     url,
                     mediaEntry.getValue().getMimeType(),
-                    mediaEntry.getValue().getCaption()));
+                    mediaEntry.getValue().getCaption(),
+                    mediaEntry.getValue().getTitle()));
         }
 
         getGutenbergContainerFragment().appendMediaFiles(rnMediaList);
@@ -1164,8 +1308,8 @@ public void onEditorThemeUpdated(Bundle editorTheme) {
     @Override public void onStorySaveResult(String storyFirstMediaId, boolean success) {
         if (!success) {
             mFailedMediaIds.add(storyFirstMediaId);
-            mUploadingMediaProgressMax.remove(storyFirstMediaId);
         }
+        mUploadingMediaProgressMax.remove(storyFirstMediaId);
         getGutenbergContainerFragment().onStorySaveResult(storyFirstMediaId, success);
     }
 
@@ -1173,6 +1317,19 @@ public void onEditorThemeUpdated(Bundle editorTheme) {
         getGutenbergContainerFragment().onMediaModelCreatedForFile(oldId, newId, oldUrl);
     }
 
+    @Override public void onStoryMediaSavedToRemote(String localId, String remoteId, String oldUrl, String newUrl) {
+        mUploadingMediaProgressMax.remove(localId);
+        // this method may end up being called twice if the original FluxC OnMediaUploaded event was correctly caught
+        // when posted, and can be retriggered by StoriesEventListener in the case a Gutenberg instance is re-mounted
+        // while a Story media item upload is progressing. In any case, it's harmless (the second time the event
+        // arrives at Gutenberg it will simply not find the old ids in the blocks anymore and the event gets discarded)
+        getGutenbergContainerFragment().mediaFileUploadSucceeded(
+                Integer.parseInt(localId),
+                newUrl,
+                Integer.parseInt(remoteId)
+        );
+    }
+
     @Override
     public void showNotice(String message) {
         getGutenbergContainerFragment().showNotice(message);
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt
index e1bdd64b90df..d010663b79ae 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt
@@ -8,28 +8,34 @@ import org.wordpress.mobile.WPAndroidGlue.GutenbergProps
 
 @Parcelize
 data class GutenbergPropsBuilder(
+    private val enableContactInfoBlock: Boolean,
     private val enableMediaFilesCollectionBlocks: Boolean,
     private val enableMentions: Boolean,
+    private val enableXPosts: Boolean,
     private val enableUnsupportedBlockEditor: Boolean,
     private val unsupportedBlockEditorSwitch: Boolean,
-    private val enablePreviewMode: Boolean,
-    private val enableModalLayoutPicker: Boolean,
+    private val enableAudioBlock: Boolean,
     private val localeSlug: String,
     private val postType: String,
-    private val editorTheme: Bundle?
+    private val featuredImageId: Int,
+    private val editorTheme: Bundle?,
+    private val canViewEditorOnboarding: Boolean
 ) : Parcelable {
     fun build(activity: Activity, isHtmlModeEnabled: Boolean) = GutenbergProps(
+            enableContactInfoBlock = enableContactInfoBlock,
             enableMediaFilesCollectionBlocks = enableMediaFilesCollectionBlocks,
             enableMentions = enableMentions,
+            enableXPosts = enableXPosts,
             enableUnsupportedBlockEditor = enableUnsupportedBlockEditor,
             canEnableUnsupportedBlockEditor = unsupportedBlockEditorSwitch,
+            enableAudioBlock = enableAudioBlock,
             localeSlug = localeSlug,
             postType = postType,
+            featuredImageId = featuredImageId,
             editorTheme = editorTheme,
             translations = GutenbergUtils.getTranslations(activity),
             isDarkMode = GutenbergUtils.isDarkMode(activity),
             htmlModeEnabled = isHtmlModeEnabled,
-            isPreview = enablePreviewMode,
-            isModalLayoutPickerEnabled = enableModalLayoutPicker
+            canViewEditorOnboarding = canViewEditorOnboarding
     )
 }
diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/StorySaveMediaListener.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/StorySaveMediaListener.java
index 40eec3651fe7..2ba7a2a814c9 100644
--- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/StorySaveMediaListener.java
+++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/StorySaveMediaListener.java
@@ -7,4 +7,5 @@ public interface StorySaveMediaListener {
     void onMediaSaveFailed(String localId);
     void onStorySaveResult(String storyFirstMediaId, boolean success);
     void onMediaModelCreatedForFile(String oldId, String newId, String oldUrl);
+    void onStoryMediaSavedToRemote(String localId, String remoteId, String oldUrl, String newUrl);
 }
diff --git a/libs/editor/WordPressEditor/src/main/res/values/strings.xml b/libs/editor/WordPressEditor/src/main/res/values/strings.xml
index 5f0296797549..136f2d1dc7e1 100644
--- a/libs/editor/WordPressEditor/src/main/res/values/strings.xml
+++ b/libs/editor/WordPressEditor/src/main/res/values/strings.xml
@@ -148,4 +148,12 @@
 
     <string name="menu_toolbar_title">Edit %s block"</string>
 
+    <!-- Aztec Try Block Editor Dialog -->
+    <string name="pref_key_seen_classic_editor_deprecation_notice" translatable="false">wp_pref_seen_classic_editor_deprecation_notice</string>
+    <string name="dialog_title_try_block_editor" translatable="true">Try the new Block Editor</string>
+    <string name="dialog_body_try_block_editor" translatable="true">We’ll be removing the classic editor for new posts soon, but this won’t affect editing any of your existing posts or pages. Get a head start by enabling the Block Editor now in site settings.</string>
+    <string name="dialog_dismiss_try_block_editor" translatable="true">Dismiss</string>
+
+
+
 </resources>
diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle
index 8ed3bd11d03c..eab68fcef032 100644
--- a/libs/editor/example/build.gradle
+++ b/libs/editor/example/build.gradle
@@ -15,7 +15,7 @@ repositories {
     google()
     jcenter()
     maven { url "https://www.jitpack.io" }
-    maven { url "https://dl.bintray.com/wordpress-mobile/react-native-mirror/" }
+    maven { url "https://a8c-libs.s3.amazonaws.com/android/react-native-mirror" }
 }
 
 android {
diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile
deleted file mode 160000
index b16c8d2fb12a..000000000000
--- a/libs/gutenberg-mobile
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b16c8d2fb12ad225fce33c4be855d4ee62486d6e
diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle
index 36a16c494a3d..8595a9cb2015 100644
--- a/libs/login/WordPressLoginFlow/build.gradle
+++ b/libs/login/WordPressLoginFlow/build.gradle
@@ -51,6 +51,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
     implementation "com.google.android.material:material:1.2.1"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation "androidx.core:core-ktx:$kotlin_ktx_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/Login2FaFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/Login2FaFragment.java
index 96b494a59c56..154b00dfbb7a 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/Login2FaFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/Login2FaFragment.java
@@ -189,9 +189,8 @@ public void onClick(View v) {
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        secondaryButton.setVisibility(View.GONE);
-        primaryButton.setOnClickListener(new OnClickListener() {
+    protected void setupBottomButton(Button button) {
+        button.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 next();
             }
@@ -379,7 +378,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         updateContinueButtonEnabledStatus();
     }
 
-    private void show2FaError(String message) {
+    private void show2FaError(@Nullable String message) {
         if (!TextUtils.isEmpty(message)) {
             mAnalyticsListener.trackFailure(message);
         }
@@ -388,7 +387,7 @@ private void show2FaError(String message) {
 
     private void updateContinueButtonEnabledStatus() {
         String currentVerificationCode = m2FaInput.getEditText().getText().toString();
-        getPrimaryButton().setEnabled(!currentVerificationCode.trim().isEmpty());
+        getBottomButton().setEnabled(!currentVerificationCode.trim().isEmpty());
     }
 
     @Override
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginAnalyticsListener.kt b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginAnalyticsListener.kt
index 3aeb38264e43..8f8e3698e1d8 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginAnalyticsListener.kt
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginAnalyticsListener.kt
@@ -65,9 +65,13 @@ interface LoginAnalyticsListener {
     fun trackPickEmailFromHint()
     fun trackShowEmailHints()
     fun emailFormScreenResumed()
-    fun trackEmailSignupConfirmationViewed()
     fun trackSocialSignupConfirmationViewed()
     fun trackCreateAccountClick()
+    fun emailPasswordFormScreenResumed()
+    fun siteAddressFormScreenResumed()
+    fun magicLinkRequestScreenResumed()
+    fun magicLinkSentScreenResumed()
+    fun usernamePasswordScreenResumed()
 
     enum class CreatedAccountSource {
         EMAIL,
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseDiscoveryFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseDiscoveryFragment.java
index 40c916f6ee1c..fc8ee334d9c1 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseDiscoveryFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseDiscoveryFragment.java
@@ -26,7 +26,8 @@ public void onDetach() {
     }
 
     void initiateDiscovery() {
-        if (!NetworkUtils.checkConnection(getActivity())) {
+        if (mLoginBaseDiscoveryListener == null || !NetworkUtils.checkConnection(getActivity())) {
+            // Fragment was detached or there's no active network connection
             return;
         }
 
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java
index 574ca638e050..0ef2ff95bfc7 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginBaseFormFragment.java
@@ -12,7 +12,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
 import android.view.ViewStub;
 import android.widget.Button;
 import android.widget.EditText;
@@ -38,8 +37,10 @@
 import org.wordpress.android.fluxc.store.AccountStore.AccountErrorType;
 import org.wordpress.android.fluxc.store.AccountStore.OnAccountChanged;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
 import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType;
+import org.wordpress.android.login.util.SiteUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.EditTextUtils;
 import org.wordpress.android.util.ToastUtils;
@@ -51,8 +52,7 @@ public abstract class LoginBaseFormFragment<LoginListenerType> extends Fragment
     private static final String KEY_IN_PROGRESS = "KEY_IN_PROGRESS";
     private static final String KEY_LOGIN_FINISHED = "KEY_LOGIN_FINISHED";
 
-    private Button mPrimaryButton;
-    private Button mSecondaryButton;
+    private Button mBottomButton;
     private ProgressDialog mProgressDialog;
 
     protected LoginListenerType mLoginListener;
@@ -69,7 +69,7 @@ public abstract class LoginBaseFormFragment<LoginListenerType> extends Fragment
     protected abstract @LayoutRes int getContentLayout();
     protected abstract void setupLabel(@NonNull TextView label);
     protected abstract void setupContent(ViewGroup rootView);
-    protected abstract void setupBottomButtons(Button secondaryButton, Button primaryButton);
+    protected abstract void setupBottomButton(Button button);
     protected abstract @StringRes int getProgressBarText();
 
     protected boolean listenForLogin() {
@@ -84,8 +84,8 @@ protected boolean isInProgress() {
         return mInProgress;
     }
 
-    protected Button getPrimaryButton() {
-        return mPrimaryButton;
+    protected Button getBottomButton() {
+        return mBottomButton;
     }
 
     protected abstract void onHelp();
@@ -108,24 +108,10 @@ protected ViewGroup createMainView(LayoutInflater inflater, ViewGroup container,
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         ViewGroup rootView = createMainView(inflater, container, savedInstanceState);
-
         setupLabel((TextView) rootView.findViewById(R.id.label));
-
         setupContent(rootView);
-
-        mPrimaryButton = (Button) rootView.findViewById(R.id.primary_button);
-        mSecondaryButton = (Button) rootView.findViewById(R.id.secondary_button);
-        setupBottomButtons(mSecondaryButton, mPrimaryButton);
-
-        // Set the primary button width to match_parent if the secondary button doesn't exist or isn't visible.
-        // This can be removed after we get rid of the unified flow feature flag.
-        if ((mSecondaryButton == null || mSecondaryButton.getVisibility() == View.GONE)
-            && (mPrimaryButton != null && mPrimaryButton.getVisibility() == View.VISIBLE)) {
-            final LayoutParams layoutParams = mPrimaryButton.getLayoutParams();
-            layoutParams.width = LayoutParams.MATCH_PARENT;
-            mPrimaryButton.setLayoutParams(layoutParams);
-        }
-
+        mBottomButton = rootView.findViewById(R.id.bottom_button);
+        setupBottomButton(mBottomButton);
         return rootView;
     }
 
@@ -232,6 +218,16 @@ public void onDestroy() {
         super.onDestroy();
     }
 
+    @Override public void onDestroyView() {
+        mBottomButton = null;
+
+        if (mProgressDialog != null) {
+            mProgressDialog.setOnCancelListener(null);
+            mProgressDialog = null;
+        }
+        super.onDestroyView();
+    }
+
     protected void startProgressIfNeeded() {
         if (!isInProgress()) {
             startProgress();
@@ -243,11 +239,7 @@ protected void startProgress() {
     }
 
     protected void startProgress(boolean cancellable) {
-        mPrimaryButton.setEnabled(false);
-
-        if (mSecondaryButton != null) {
-            mSecondaryButton.setEnabled(false);
-        }
+        mBottomButton.setEnabled(false);
 
         mProgressDialog =
                 ProgressDialog.show(getActivity(), "", getActivity().getString(getProgressBarText()), true, cancellable,
@@ -275,12 +267,8 @@ protected void endProgress() {
             mProgressDialog.setOnCancelListener(null);
             mProgressDialog = null;
         }
-        if (mPrimaryButton != null) {
-            mPrimaryButton.setEnabled(true);
-        }
-
-        if (mSecondaryButton != null) {
-            mSecondaryButton.setEnabled(true);
+        if (mBottomButton != null) {
+            mBottomButton.setEnabled(true);
         }
     }
 
@@ -346,11 +334,17 @@ public void onAccountChanged(OnAccountChanged event) {
             mDispatcher.dispatch(AccountActionBuilder.newFetchSettingsAction());
         } else if (event.causeOfChange == AccountAction.FETCH_SETTINGS) {
             // The user's account settings have also been fetched and stored - now we can fetch the user's sites
-            mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction());
+            FetchSitesPayload payload = SiteUtils.getFetchSitesPayload(isJetpackAppLogin());
+            mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction(payload));
             mDispatcher.dispatch(AccountActionBuilder.newFetchSubscriptionsAction());
         }
     }
 
+    protected boolean isJetpackAppLogin() {
+        return (mLoginListener instanceof LoginListener)
+               && ((LoginListener) mLoginListener).getLoginMode() == LoginMode.JETPACK_LOGIN_ONLY;
+    }
+
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onSiteChanged(OnSiteChanged event) {
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
index c18032d51c81..8344c4d03c9f 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailFragment.java
@@ -18,8 +18,6 @@
 import android.view.ViewGroup;
 import android.view.autofill.AutofillManager;
 import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.LayoutRes;
@@ -45,7 +43,6 @@
 import org.wordpress.android.fluxc.generated.AccountActionBuilder;
 import org.wordpress.android.fluxc.store.AccountStore.FetchAuthOptionsPayload;
 import org.wordpress.android.fluxc.store.AccountStore.OnAuthOptionsFetched;
-import org.wordpress.android.login.SignupBottomSheetDialogFragment.SignupSheetListener;
 import org.wordpress.android.login.util.ContextExtensionsKt;
 import org.wordpress.android.login.util.SiteUtils;
 import org.wordpress.android.login.widgets.WPLoginInputRow;
@@ -82,10 +79,11 @@ public class LoginEmailFragment extends LoginBaseFormFragment<LoginListener> imp
 
     private static final String ARG_LOGIN_SITE_URL = "ARG_LOGIN_SITE_URL";
     private static final String ARG_SIGNUP_FROM_LOGIN_ENABLED = "ARG_SIGNUP_FROM_LOGIN_ENABLED";
-    private static final String ARG_SITE_LOGIN_ENABLED = "ARG_SITE_LOGIN_ENABLED";
-    private static final String ARG_SHOULD_USE_NEW_LAYOUT = "ARG_SHOULD_USE_NEW_LAYOUT";
+    private static final String ARG_OPTIONAL_SITE_CREDS_LAYOUT = "ARG_OPTIONAL_SITE_CREDS_LAYOUT";
+    private static final String ARG_HIDE_TOS = "ARG_HIDE_TOS";
 
     public static final String TAG = "login_email_fragment_tag";
+    public static final String TAG_SITE_CREDS_LAYOUT = "login_email_fragment_site_creds_layout_tag";
     public static final int MAX_EMAIL_LENGTH = 100;
 
     private ArrayList<Integer> mOldSitesIDs = new ArrayList<>();
@@ -95,8 +93,8 @@ public class LoginEmailFragment extends LoginBaseFormFragment<LoginListener> imp
     private boolean mIsSocialLogin;
     private Integer mCurrentEmailErrorRes = null;
     private boolean mIsSignupFromLoginEnabled;
-    private boolean mIsSiteLoginEnabled;
-    private boolean mShouldUseNewLayout;
+    private boolean mOptionalSiteCredsLayout;
+    private boolean mHideTos;
 
     protected WPLoginInputRow mEmailInput;
     protected boolean mHasDismissedEmailHints;
@@ -104,33 +102,42 @@ public class LoginEmailFragment extends LoginBaseFormFragment<LoginListener> imp
     protected String mLoginSiteUrl;
 
     public static LoginEmailFragment newInstance(String url) {
-        LoginEmailFragment fragment = new LoginEmailFragment();
-        Bundle args = new Bundle();
-        args.putString(ARG_LOGIN_SITE_URL, url);
-        fragment.setArguments(args);
-        return fragment;
+        return newInstance(url, false, false, false);
     }
 
-    public static LoginEmailFragment newInstance(boolean isSignupFromLoginEnabled, boolean isSiteLoginEnabled,
-                                                 boolean shouldUseNewLayout) {
-        return newInstance(isSignupFromLoginEnabled, isSiteLoginEnabled, shouldUseNewLayout, null);
+    public static LoginEmailFragment newInstance(String url, boolean optionalSiteCredsLayout) {
+        return newInstance(url, optionalSiteCredsLayout, false, false);
     }
 
-    public static LoginEmailFragment newInstance(boolean isSignupFromLoginEnabled, boolean isSiteLoginEnabled,
-                                                 boolean shouldUseNewLayout, String url) {
+    public static LoginEmailFragment newInstance(boolean isSignupFromLoginEnabled) {
+        return newInstance(null, false, isSignupFromLoginEnabled, false);
+    }
+
+    public static LoginEmailFragment newInstance(boolean isSignupFromLoginEnabled, boolean hideTos) {
+        return newInstance(null, false, isSignupFromLoginEnabled, hideTos);
+    }
+
+    private static LoginEmailFragment newInstance(String url,
+                                                  boolean optionalSiteCredsLayout,
+                                                  boolean isSignupFromLoginEnabled,
+                                                  boolean hideTos) {
         LoginEmailFragment fragment = new LoginEmailFragment();
         Bundle args = new Bundle();
-        args.putBoolean(ARG_SIGNUP_FROM_LOGIN_ENABLED, isSignupFromLoginEnabled);
-        args.putBoolean(ARG_SITE_LOGIN_ENABLED, isSiteLoginEnabled);
-        args.putBoolean(ARG_SHOULD_USE_NEW_LAYOUT, shouldUseNewLayout);
         args.putString(ARG_LOGIN_SITE_URL, url);
+        args.putBoolean(ARG_OPTIONAL_SITE_CREDS_LAYOUT, optionalSiteCredsLayout);
+        args.putBoolean(ARG_SIGNUP_FROM_LOGIN_ENABLED, isSignupFromLoginEnabled);
+        args.putBoolean(ARG_HIDE_TOS, hideTos);
         fragment.setArguments(args);
         return fragment;
     }
 
     @Override
     protected @LayoutRes int getContentLayout() {
-        return mShouldUseNewLayout ? R.layout.login_email_screen : R.layout.login_email_screen_old;
+        if (mOptionalSiteCredsLayout) {
+            return R.layout.login_email_optional_site_creds_screen;
+        } else {
+            return R.layout.login_email_screen;
+        }
     }
 
     @Override
@@ -149,17 +156,22 @@ protected void setupLabel(@NonNull TextView label) {
                 break;
             case FULL:
             case WPCOM_LOGIN_ONLY:
+            case JETPACK_LOGIN_ONLY:
             case SELFHOSTED_ONLY:
-                if (!mShouldUseNewLayout) {
-                    label.setText(R.string.enter_email_wordpress_com);
-                } else if (!TextUtils.isEmpty(mLoginSiteUrl)) {
-                    label.setText(getString(R.string.enter_email_for_site, mLoginSiteUrl));
+                if (!TextUtils.isEmpty(mLoginSiteUrl)) {
+                    label.setText(Html.fromHtml(
+                            getString(R.string.enter_email_for_site, mLoginSiteUrl)));
                 } else {
                     label.setText(R.string.enter_email_to_continue_wordpress_com);
                 }
                 break;
             case WOO_LOGIN_MODE:
-                label.setText(getString(R.string.enter_email_for_site, mLoginSiteUrl));
+                if (mOptionalSiteCredsLayout) {
+                    label.setText(Html.fromHtml(
+                            getString(R.string.enter_email_for_site, mLoginSiteUrl)));
+                } else {
+                    label.setText(getString(R.string.enter_email_wordpress_com));
+                }
                 break;
             case JETPACK_STATS:
                 label.setText(R.string.login_to_to_connect_jetpack);
@@ -177,16 +189,17 @@ protected void setupContent(ViewGroup rootView) {
 
         setupEmailInput((WPLoginInputRow) rootView.findViewById(R.id.login_email_row));
 
-        if (mShouldUseNewLayout) {
+        if (mOptionalSiteCredsLayout) {
+            setupContinueButton((Button) rootView.findViewById(R.id.login_continue_button));
+            setupSiteCredsButton((Button) rootView.findViewById(R.id.login_site_creds));
+            setupFindEmailHelpButton(
+                    (Button) rootView.findViewById(R.id.login_find_connected_email));
+        } else {
             setupContinueButton((Button) rootView.findViewById(R.id.login_continue_button));
             setupTosButtons(
                     (Button) rootView.findViewById(R.id.continue_tos),
                     (Button) rootView.findViewById(R.id.continue_with_google_tos));
             setupSocialButtons((Button) rootView.findViewById(R.id.continue_with_google));
-        } else {
-            setupAlternativeButtons(
-                    (LinearLayout) rootView.findViewById(R.id.login_google_button),
-                    (LinearLayout) rootView.findViewById(R.id.login_site_button));
         }
     }
 
@@ -240,21 +253,35 @@ private void updateContinueButtonEnabledStatus() {
         }
     }
 
+    @Override public void onDestroyView() {
+        mEmailInput = null;
+
+        super.onDestroyView();
+    }
+
     private void setupTosButtons(Button continueTosButton, Button continueWithGoogleTosButton) {
-        OnClickListener onClickListener = new OnClickListener() {
-            public void onClick(View view) {
-                Context context = getContext();
-                if ((context instanceof SignupSheetListener)) {
-                    ((SignupSheetListener) context).onSignupSheetTermsOfServiceClicked();
+        if (mHideTos) {
+            // Hide the TOS buttons
+            continueTosButton.setVisibility(View.GONE);
+            continueWithGoogleTosButton.setVisibility(View.GONE);
+        } else {
+            // Show the TOS buttons
+            continueTosButton.setVisibility(View.VISIBLE);
+            continueWithGoogleTosButton.setVisibility(View.VISIBLE);
+
+            OnClickListener onClickListener = new OnClickListener() {
+                public void onClick(View view) {
+                    mLoginListener.onTermsOfServiceClicked();
                 }
-            }
-        };
+            };
 
-        continueTosButton.setOnClickListener(onClickListener);
-        continueTosButton.setText(formatTosText(R.string.continue_terms_of_service_text));
+            continueTosButton.setOnClickListener(onClickListener);
+            continueTosButton.setText(formatTosText(R.string.continue_terms_of_service_text));
 
-        continueWithGoogleTosButton.setOnClickListener(onClickListener);
-        continueWithGoogleTosButton.setText(formatTosText(R.string.continue_with_google_terms_of_service_text));
+            continueWithGoogleTosButton.setOnClickListener(onClickListener);
+            continueWithGoogleTosButton
+                    .setText(formatTosText(R.string.continue_with_google_terms_of_service_text));
+        }
     }
 
     private void setupSocialButtons(Button continueWithGoogleButton) {
@@ -266,99 +293,25 @@ public void onClick(View view) {
         });
     }
 
-    private void setupAlternativeButtons(LinearLayout googleLoginButton, LinearLayout siteLoginButton) {
-        googleLoginButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                onGoogleSigninClicked();
+    private void setupSiteCredsButton(Button continueWithSiteCreds) {
+        continueWithSiteCreds.setOnClickListener(new OnClickListener() {
+            @Override public void onClick(View v) {
+                mLoginListener.loginViaSiteCredentials(mLoginSiteUrl);
             }
         });
+    }
 
-        siteLoginButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (mLoginListener != null) {
-                    LoginMode loginMode = mLoginListener.getLoginMode();
-                    if (loginMode == LoginMode.JETPACK_STATS) {
-                        mLoginListener.loginViaWpcomUsernameInstead();
-                    } else if (loginMode == LoginMode.WOO_LOGIN_MODE) {
-                        mLoginListener.loginViaSiteCredentials(mLoginSiteUrl);
-                    } else {
-                        mLoginListener.loginViaSiteAddress();
-                    }
-                }
+    private void setupFindEmailHelpButton(Button findConnectedEmail) {
+        findConnectedEmail.setOnClickListener(new OnClickListener() {
+            @Override public void onClick(View v) {
+                mLoginListener.showHelpFindingConnectedEmail();
             }
         });
-
-        ImageView siteLoginButtonIcon = siteLoginButton.findViewById(R.id.login_site_button_icon);
-        TextView siteLoginButtonText = siteLoginButton.findViewById(R.id.login_site_button_text);
-
-        switch (mLoginListener.getLoginMode()) {
-            case WOO_LOGIN_MODE:
-                siteLoginButtonIcon.setImageResource(R.drawable.ic_domains_grey_24dp);
-                siteLoginButtonText.setText(R.string.enter_site_credentials_instead);
-                break;
-            case FULL:
-            case WPCOM_LOGIN_ONLY:
-            case SHARE_INTENT:
-                siteLoginButton.setVisibility(mIsSiteLoginEnabled ? View.VISIBLE : View.GONE);
-                siteLoginButtonIcon.setImageResource(R.drawable.ic_domains_grey_24dp);
-                siteLoginButtonText.setText(R.string.enter_site_address_instead);
-                break;
-            case JETPACK_STATS:
-                siteLoginButtonIcon.setImageResource(R.drawable.ic_user_circle_grey_24dp);
-                siteLoginButtonText.setText(R.string.enter_username_instead);
-                break;
-            case WPCOM_LOGIN_DEEPLINK:
-            case WPCOM_REAUTHENTICATE:
-                siteLoginButton.setVisibility(View.GONE);
-                break;
-        }
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        if (mShouldUseNewLayout) {
-            secondaryButton.setVisibility(View.GONE);
-            primaryButton.setVisibility(View.GONE);
-        } else {
-            setupSecondaryButton(secondaryButton);
-            setupPrimaryButton(primaryButton);
-        }
-    }
-
-    private void setupSecondaryButton(Button secondaryButton) {
-        // Show Sign-Up button if login mode is Jetpack and signup from login is not enabled
-        if (mLoginListener.getLoginMode() == LoginMode.JETPACK_STATS && !mIsSignupFromLoginEnabled) {
-            secondaryButton.setText(formatUnderlinedText(R.string.login_email_button_signup));
-            secondaryButton.setOnClickListener(new OnClickListener() {
-                public void onClick(View view) {
-                    mLoginListener.doStartSignup();
-                    mGoogleApiClient.stopAutoManage(getActivity());
-
-                    if (mGoogleApiClient.isConnected()) {
-                        mGoogleApiClient.disconnect();
-                    }
-                }
-            });
-        } else if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
-            secondaryButton.setText(getResources().getString(R.string.login_need_help_finding_connected_email));
-            secondaryButton.setOnClickListener(new OnClickListener() {
-                public void onClick(View view) {
-                    mLoginListener.showHelpFindingConnectedEmail();
-                }
-            });
-        } else {
-            secondaryButton.setVisibility(View.GONE);
-        }
-    }
-
-    private void setupPrimaryButton(Button primaryButton) {
-        primaryButton.setOnClickListener(new OnClickListener() {
-            public void onClick(View view) {
-                onContinueClicked();
-            }
-        });
+    protected void setupBottomButton(Button button) {
+        button.setVisibility(View.GONE);
     }
 
     private Spanned formatTosText(int stringResId) {
@@ -367,10 +320,6 @@ private Spanned formatTosText(int stringResId) {
         return Html.fromHtml(getString(stringResId, "<u><font color='" + primaryColorHtml + "'>", "</font></u>"));
     }
 
-    private Spanned formatUnderlinedText(int stringResId) {
-        return Html.fromHtml(getString(stringResId, "<u>", "</u>"));
-    }
-
     private void onContinueClicked() {
         next(getCleanedEmail());
     }
@@ -418,8 +367,8 @@ public void onCreate(Bundle savedInstanceState) {
         if (args != null) {
             mLoginSiteUrl = args.getString(ARG_LOGIN_SITE_URL, "");
             mIsSignupFromLoginEnabled = args.getBoolean(ARG_SIGNUP_FROM_LOGIN_ENABLED, false);
-            mIsSiteLoginEnabled = args.getBoolean(ARG_SITE_LOGIN_ENABLED, true);
-            mShouldUseNewLayout = args.getBoolean(ARG_SHOULD_USE_NEW_LAYOUT, false);
+            mOptionalSiteCredsLayout = args.getBoolean(ARG_OPTIONAL_SITE_CREDS_LAYOUT, false);
+            mHideTos = args.getBoolean(ARG_HIDE_TOS, false);
         }
     }
 
@@ -468,9 +417,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     public void onResume() {
         super.onResume();
         mAnalyticsListener.emailFormScreenResumed();
-        if (mShouldUseNewLayout) {
-            updateContinueButtonEnabledStatus();
-        }
+        updateContinueButtonEnabledStatus();
     }
 
     @Override
@@ -489,10 +436,15 @@ public void onSaveInstanceState(Bundle outState) {
 
     @Override
     protected void buildToolbar(Toolbar toolbar, ActionBar actionBar) {
-        if (mShouldUseNewLayout) {
-            actionBar.setTitle(R.string.get_started);
-        } else {
+        if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+            actionBar.setTitle(R.string.log_in);
+            return;
+        }
+
+        if (mOptionalSiteCredsLayout) {
             super.buildToolbar(toolbar, actionBar);
+        } else {
+            actionBar.setTitle(R.string.get_started);
         }
     }
 
@@ -561,9 +513,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         mEmailInput.setError(null);
         mIsSocialLogin = false;
         clearEmailError();
-        if (mShouldUseNewLayout) {
-            updateContinueButtonEnabledStatus();
-        }
+        updateContinueButtonEnabledStatus();
     }
 
     private void showEmailError(int messageId) {
@@ -613,7 +563,18 @@ public void onAuthOptionsFetched(OnAuthOptionsFetched event) {
             switch (event.error.type) {
                 case UNKNOWN_USER:
                     // This email does not correspond to an existing account
-                    if (mIsSignupFromLoginEnabled) {
+
+                    // Will be true if in the Woo app and currently in the WPcom login
+                    // flow. We need to check this to know if we should display the
+                    // 'No WPcom account found' error screen.
+                    boolean isWooWPcomLoginFlow = false;
+                    if (mLoginListener != null
+                        && mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE
+                        && !mOptionalSiteCredsLayout) {
+                        isWooWPcomLoginFlow = true;
+                    }
+
+                    if (mIsSignupFromLoginEnabled || isWooWPcomLoginFlow) {
                         if (mLoginListener != null) {
                             mLoginListener.gotUnregisteredEmail(email);
                         }
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailPasswordFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailPasswordFragment.java
index 9bb55e76d748..ea7583a2b41e 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailPasswordFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginEmailPasswordFragment.java
@@ -125,6 +125,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
+        mAnalyticsListener.emailPasswordFormScreenResumed();
         updatePrimaryButtonEnabledStatus();
 
         // connect to the Service. We'll receive updates via EventBus.
@@ -146,7 +147,7 @@ public void onPause() {
 
     private void updatePrimaryButtonEnabledStatus() {
         String currentPassword = mPasswordInput.getEditText().getText().toString();
-        getPrimaryButton().setEnabled(!currentPassword.trim().isEmpty());
+        getBottomButton().setEnabled(!currentPassword.trim().isEmpty());
     }
 
     @Override
@@ -219,9 +220,8 @@ protected void buildToolbar(Toolbar toolbar, ActionBar actionBar) {
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        secondaryButton.setVisibility(View.GONE);
-        primaryButton.setOnClickListener(new OnClickListener() {
+    protected void setupBottomButton(Button button) {
+        button.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 next();
             }
@@ -278,8 +278,15 @@ protected void next() {
 
         mRequestedPassword = mPasswordInput.getEditText().getText().toString();
 
-        LoginWpcomService.loginWithEmailAndPassword(getContext(), mEmailAddress, mRequestedPassword, mIdToken, mService,
-                                                    mIsSocialLogin);
+        LoginWpcomService.loginWithEmailAndPassword(
+                getContext(),
+                mEmailAddress,
+                mRequestedPassword,
+                mIdToken,
+                mService,
+                mIsSocialLogin,
+                mLoginListener.getLoginMode() == LoginMode.JETPACK_LOGIN_ONLY
+        );
         mOldSitesIDs = SiteUtils.getCurrentSiteIds(mSiteStore, false);
     }
 
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.java
index 0f04d4a9f33b..21226e90c7f3 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginListener.java
@@ -7,6 +7,7 @@
 
 import org.wordpress.android.fluxc.network.MemorizingTrustManager;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.ConnectSiteInfoPayload;
 
 import java.util.ArrayList;
 
@@ -16,6 +17,7 @@ interface SelfSignedSSLCallback {
     }
 
     LoginMode getLoginMode();
+    void startOver();
 
     // Login Email input callbacks
     void gotWpcomEmail(String email, boolean verifyEmail, @Nullable AuthOptions authOptions);
@@ -31,6 +33,7 @@ void gotUnregisteredSocialAccount(String email, String displayName, String idTok
     void helpSocialEmailScreen(String email);
     void addGoogleLoginFragment(boolean isSignupFromLoginEnabled);
     void showHelpFindingConnectedEmail();
+    void onTermsOfServiceClicked();
 
     // Login Request Magic Link callbacks
     void showMagicLinkSentScreen(String email, boolean allowPassword);
@@ -58,6 +61,7 @@ void gotUnregisteredSocialAccount(String email, String displayName, String idTok
     void handleSslCertificateError(MemorizingTrustManager memorizingTrustManager, SelfSignedSSLCallback callback);
     void helpSiteAddress(String url);
     void helpFindingSiteAddress(String username, SiteStore siteStore);
+    void handleSiteAddressError(ConnectSiteInfoPayload siteInfo);
 
     // Login username password callbacks
     void saveCredentialsInSmartLock(@Nullable String username, @Nullable String password,
@@ -77,7 +81,6 @@ void helpHandleDiscoveryError(String siteAddress, String endpointAddress, String
     void startPostLoginServices();
 
     // Signup
-    void doStartSignup();
     void helpSignupEmailScreen(String email);
     void helpSignupMagicLinkScreen(String email);
     void helpSignupConfirmationScreen(String email);
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java
index d8d23bdd2815..ccf6f94482cc 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java
@@ -11,7 +11,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -162,21 +161,15 @@ public void onClick(View v) {
         // Design changes added to the Woo Magic link sign-in
 
         if (mVerifyMagicLinkEmail) {
-            View avatarContainerView = view.findViewById(R.id.avatar_container);
-
-            LayoutParams lp = avatarContainerView.getLayoutParams();
-            lp.width = LayoutParams.WRAP_CONTENT;
-            lp.height = getContext().getResources().getDimensionPixelSize(R.dimen.magic_link_sent_illustration_sz);
-            avatarContainerView.setLayoutParams(lp);
-
-            mAvatarProgressBar.setVisibility(View.GONE);
-            avatarView.setImageResource(R.drawable.login_email_alert);
+            AvatarHelper.loadAvatarFromEmail(this, mEmail, avatarView, new AvatarRequestListener() {
+                @Override public void onRequestFinished() {
+                    mAvatarProgressBar.setVisibility(View.GONE);
+                }
+            });
 
             TextView labelTextView = view.findViewById(R.id.label);
             labelTextView.setText(Html.fromHtml(String.format(getResources().getString(
                     R.string.login_site_credentials_magic_link_label), mEmail)));
-
-            mRequestMagicLinkButton.setText(getString(R.string.send_verification_email));
         } else {
             AvatarHelper.loadAvatarFromEmail(this, mEmail, avatarView, new AvatarRequestListener() {
                 @Override public void onRequestFinished() {
@@ -224,12 +217,23 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         getActivity().setTitle(R.string.magic_link_login_title);
     }
 
+    @Override public void onResume() {
+        super.onResume();
+        mAnalyticsListener.magicLinkRequestScreenResumed();
+    }
+
     @Override
     public void onDetach() {
         super.onDetach();
         mLoginListener = null;
     }
 
+    @Override public void onDestroyView() {
+        mRequestMagicLinkButton = null;
+
+        super.onDestroyView();
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkSentFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkSentFragment.java
index 12594a21c17c..54fb001e851b 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkSentFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMagicLinkSentFragment.java
@@ -137,6 +137,11 @@ public void onAttach(Context context) {
         }
     }
 
+    @Override public void onResume() {
+        super.onResume();
+        mAnalyticsListener.magicLinkSentScreenResumed();
+    }
+
     @Override
     public void onDetach() {
         super.onDetach();
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMode.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMode.java
index c71973571efb..4b76f027d0af 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMode.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginMode.java
@@ -6,6 +6,7 @@ public enum LoginMode {
     FULL,
     SELFHOSTED_ONLY,
     WPCOM_LOGIN_ONLY,
+    JETPACK_LOGIN_ONLY,
     JETPACK_STATS,
     WPCOM_LOGIN_DEEPLINK,
     WPCOM_REAUTHENTICATE,
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
index 767ae90b256b..3cdeeb6ad8dd 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java
@@ -86,13 +86,10 @@ public class LoginSiteAddressFragment extends LoginBaseDiscoveryFragment impleme
 
     @Override
     protected void setupLabel(@NonNull TextView label) {
-        switch (mLoginListener.getLoginMode()) {
-            case SHARE_INTENT:
-                label.setText(R.string.enter_site_address_share_intent);
-                break;
-            default:
-                label.setText(R.string.enter_site_address);
-                break;
+        if (mLoginListener.getLoginMode() == LoginMode.SHARE_INTENT) {
+            label.setText(R.string.enter_site_address_share_intent);
+        } else {
+            label.setText(R.string.enter_site_address);
         }
     }
 
@@ -117,9 +114,8 @@ public void onClick(View v) {
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        secondaryButton.setVisibility(View.GONE);
-        primaryButton.setOnClickListener(new OnClickListener() {
+    protected void setupBottomButton(Button button) {
+        button.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 discover();
             }
@@ -163,7 +159,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
         mLoginSiteAddressValidator.getIsValid().observe(getViewLifecycleOwner(), new Observer<Boolean>() {
             @Override public void onChanged(Boolean enabled) {
-                getPrimaryButton().setEnabled(enabled);
+                getBottomButton().setEnabled(enabled);
             }
         });
         mLoginSiteAddressValidator.getErrorMessageResId().observe(getViewLifecycleOwner(), new Observer<Integer>() {
@@ -177,6 +173,12 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         });
     }
 
+    @Override public void onResume() {
+        super.onResume();
+
+        mAnalyticsListener.siteAddressFormScreenResumed();
+    }
+
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
@@ -185,8 +187,10 @@ public void onSaveInstanceState(Bundle outState) {
     }
 
     @Override public void onDestroyView() {
-        super.onDestroyView();
         mLoginSiteAddressValidator.dispose();
+        mSiteAddressInput = null;
+
+        super.onDestroyView();
     }
 
     protected void discover() {
@@ -209,14 +213,17 @@ protected void discover() {
 
     @Override
     public void onEditorCommit() {
-        if (getPrimaryButton().isEnabled()) {
+        if (getBottomButton().isEnabled()) {
             discover();
         }
     }
 
     @Override
     public void afterTextChanged(Editable s) {
-        mLoginSiteAddressValidator.setAddress(EditTextUtils.getText(mSiteAddressInput.getEditText()));
+        if (mSiteAddressInput != null) {
+            mLoginSiteAddressValidator
+                    .setAddress(EditTextUtils.getText(mSiteAddressInput.getEditText()));
+        }
     }
 
     @Override
@@ -225,7 +232,9 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
-        mSiteAddressInput.setError(null);
+        if (mSiteAddressInput != null) {
+            mSiteAddressInput.setError(null);
+        }
     }
 
     private void showError(int messageId) {
@@ -371,6 +380,8 @@ public void onFetchedConnectSiteInfo(OnConnectSiteInfoChecked event) {
 
             if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
                 handleConnectSiteInfoForWoo(event.info, hasJetpack);
+            } else if (mLoginListener.getLoginMode() == LoginMode.JETPACK_LOGIN_ONLY) {
+                handleConnectSiteInfoForJetpack(event.info);
             } else {
                 handleConnectSiteInfoForWordPress(event.info);
             }
@@ -385,7 +396,7 @@ private void handleConnectSiteInfoForWoo(ConnectSiteInfoPayload siteInfo, boolea
             showError(R.string.invalid_site_url_message);
         } else if (!siteInfo.isWordPress) {
             // Not a WordPress site
-            showError(R.string.enter_wordpress_site);
+            mLoginListener.handleSiteAddressError(siteInfo);
         } else {
             mLoginListener.gotConnectedSiteInfo(
                     siteInfo.url,
@@ -420,6 +431,16 @@ private void handleConnectSiteInfoForWordPress(ConnectSiteInfoPayload siteInfo)
         }
     }
 
+    private void handleConnectSiteInfoForJetpack(ConnectSiteInfoPayload siteInfo) {
+        endProgressIfNeeded();
+
+        if (siteInfo.hasJetpack && siteInfo.isJetpackConnected && siteInfo.isJetpackActive) {
+            mLoginListener.gotWpcomSiteInfo(UrlUtils.removeScheme(siteInfo.url));
+        } else {
+            mLoginListener.handleSiteAddressError(siteInfo);
+        }
+    }
+
     private boolean calculateHasJetpack(ConnectSiteInfoPayload siteInfo) {
         // Determining if jetpack is actually installed takes additional logic. This final
         // calculated event property will make querying this event more straight-forward.
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java
index c620d0eef349..56169294d4d9 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java
@@ -117,8 +117,10 @@ public static LoginUsernamePasswordFragment newInstance(String inputSiteAddress,
     protected void setupLabel(@NonNull TextView label) {
         final boolean isWoo = mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE;
         final int labelResId = isWoo ? R.string.enter_credentials_for_site : R.string.enter_account_info_for_site;
+        final String siteAddress =
+                (mEndpointAddress == null || mEndpointAddress.isEmpty()) ? mInputSiteAddress : mEndpointAddress;
         final String formattedSiteAddress =
-                UrlUtils.removeScheme(UrlUtils.removeXmlrpcSuffix(StringUtils.notNullStr(mInputSiteAddress)));
+                UrlUtils.removeScheme(UrlUtils.removeXmlrpcSuffix(StringUtils.notNullStr(siteAddress)));
         label.setText(getString(labelResId, formattedSiteAddress));
     }
 
@@ -172,9 +174,8 @@ public void onClick(View v) {
     }
 
     @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        secondaryButton.setVisibility(View.GONE);
-        primaryButton.setOnClickListener(new OnClickListener() {
+    protected void setupBottomButton(Button button) {
+        button.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 next();
             }
@@ -198,6 +199,20 @@ protected void onHelp() {
         }
     }
 
+    @Override public void onDestroyView() {
+        if (mPasswordInput != null) {
+            mPasswordInput.setOnEditorCommitListener(null);
+            mPasswordInput = null;
+        }
+        if (mUsernameInput != null) {
+            mUsernameInput.setOnEditorCommitListener(null);
+            mUsernameInput = null;
+        }
+        mScrollView = null;
+
+        super.onDestroyView();
+    }
+
     @Override
     public void onAttach(Context context) {
         AndroidSupportInjection.inject(this);
@@ -232,10 +247,10 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
 
             // auto-login if username and password are set for wpcom login
             if (mIsWpcom && !TextUtils.isEmpty(mInputUsername) && !TextUtils.isEmpty(mInputPassword)) {
-                getPrimaryButton().post(new Runnable() {
+                getBottomButton().post(new Runnable() {
                     @Override
                     public void run() {
-                        getPrimaryButton().performClick();
+                        getBottomButton().performClick();
                     }
                 });
             }
@@ -256,13 +271,14 @@ public void onSaveInstanceState(Bundle outState) {
 
     @Override public void onResume() {
         super.onResume();
+        mAnalyticsListener.usernamePasswordScreenResumed();
         updatePrimaryButtonEnabledStatus();
     }
 
     private void updatePrimaryButtonEnabledStatus() {
         String currentUsername = mUsernameInput.getEditText().getText().toString();
         String currentPassword = mPasswordInput.getEditText().getText().toString();
-        getPrimaryButton().setEnabled(!currentPassword.trim().isEmpty() && !currentUsername.trim().isEmpty());
+        getBottomButton().setEnabled(!currentPassword.trim().isEmpty() && !currentUsername.trim().isEmpty());
     }
 
     protected void next() {
@@ -473,6 +489,7 @@ private void handleAuthError(AuthenticationErrorType error, String errorMessage)
         switch (error) {
             case INCORRECT_USERNAME_OR_PASSWORD:
             case NOT_AUTHENTICATED: // NOT_AUTHENTICATED is the generic error from XMLRPC response on first call.
+            case HTTP_AUTH_ERROR:
                 showError(getString(R.string.username_or_password_incorrect));
                 break;
             case INVALID_OTP:
@@ -491,7 +508,7 @@ private void handleAuthError(AuthenticationErrorType error, String errorMessage)
                 AppLog.e(T.NUX, "Server response: " + errorMessage);
 
                 ToastUtils.showToast(getActivity(),
-                        errorMessage == null ? getString(R.string.error_generic) : errorMessage);
+                        TextUtils.isEmpty(errorMessage) ? getString(R.string.error_generic) : errorMessage);
                 break;
         }
     }
@@ -611,7 +628,7 @@ public void onSiteChanged(OnSiteChanged event) {
             return;
         }
 
-        if (mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
+        if (!mIsWpcom && mLoginListener.getLoginMode() == LoginMode.WOO_LOGIN_MODE) {
             SiteModel lastAddedXMLRPCSite = SiteUtils.getXMLRPCSiteByUrl(mSiteStore, mInputSiteAddress);
             if (lastAddedXMLRPCSite != null) {
                 // the wp.getOptions endpoint is already called
@@ -672,3 +689,4 @@ public void onProfileFetched(OnProfileFetched event) {
         finishLogin();
     }
 }
+
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
index 947b3c09c511..24d8c7afffd8 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginWpcomService.java
@@ -22,9 +22,11 @@
 import org.wordpress.android.fluxc.store.AccountStore.OnAuthenticationChanged;
 import org.wordpress.android.fluxc.store.AccountStore.OnSocialChanged;
 import org.wordpress.android.fluxc.store.AccountStore.PushSocialPayload;
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload;
 import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged;
 import org.wordpress.android.fluxc.store.SiteStore.SiteErrorType;
 import org.wordpress.android.login.LoginWpcomService.LoginState;
+import org.wordpress.android.login.util.SiteUtils;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.AutoForeground;
@@ -42,6 +44,7 @@ public class LoginWpcomService extends AutoForeground<LoginState> {
     private static final String ARG_PASSWORD = "ARG_PASSWORD";
     private static final String ARG_SOCIAL_ID_TOKEN = "ARG_SOCIAL_ID_TOKEN";
     private static final String ARG_SOCIAL_LOGIN = "ARG_SOCIAL_LOGIN";
+    private static final String ARG_JETPACK_APP_LOGIN = "ARG_JETPACK_APP_LOGIN";
     private static final String ARG_SOCIAL_SERVICE = "ARG_SOCIAL_SERVICE";
 
     public enum LoginStep {
@@ -155,19 +158,22 @@ static class OnCredentialsOK {
     private String mIdToken;
     private String mService;
     private boolean mIsSocialLogin;
+    private boolean mIsJetpackAppLogin;
 
     public static void loginWithEmailAndPassword(
             Context context,
             String email,
             String password,
             String idToken, String service,
-            boolean isSocialLogin) {
+            boolean isSocialLogin,
+            boolean isJetpackAppLogin) {
         Intent intent = new Intent(context, LoginWpcomService.class);
         intent.putExtra(ARG_EMAIL, email);
         intent.putExtra(ARG_PASSWORD, password);
         intent.putExtra(ARG_SOCIAL_ID_TOKEN, idToken);
         intent.putExtra(ARG_SOCIAL_SERVICE, service);
         intent.putExtra(ARG_SOCIAL_LOGIN, isSocialLogin);
+        intent.putExtra(ARG_JETPACK_APP_LOGIN, isJetpackAppLogin);
         context.startService(intent);
     }
 
@@ -256,6 +262,7 @@ public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
         mIdToken = intent.getStringExtra(ARG_SOCIAL_ID_TOKEN);
         mService = intent.getStringExtra(ARG_SOCIAL_SERVICE);
         mIsSocialLogin = intent.getBooleanExtra(ARG_SOCIAL_LOGIN, false);
+        mIsJetpackAppLogin = intent.getBooleanExtra(ARG_JETPACK_APP_LOGIN, false);
 
         AuthenticatePayload payload = new AuthenticatePayload(email, password);
         mDispatcher.dispatch(AuthenticationActionBuilder.newAuthenticateAction(payload));
@@ -375,7 +382,8 @@ public void onAccountChanged(OnAccountChanged event) {
         } else if (event.causeOfChange == AccountAction.FETCH_SETTINGS) {
             setState(LoginStep.FETCHING_SITES);
             // The user's account settings have also been fetched and stored - now we can fetch the user's sites
-            mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction());
+            FetchSitesPayload payload = SiteUtils.getFetchSitesPayload(mIsJetpackAppLogin);
+            mDispatcher.dispatch(SiteActionBuilder.newFetchSitesAction(payload));
         }
     }
 
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupBottomSheetDialogFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupBottomSheetDialogFragment.java
deleted file mode 100644
index 93ba2342d141..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupBottomSheetDialogFragment.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.wordpress.android.login;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnShowListener;
-import android.os.Bundle;
-import android.text.Html;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.FrameLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.bottomsheet.BottomSheetDialog;
-
-import org.wordpress.android.login.widgets.WPBottomSheetDialogFragment;
-
-public class SignupBottomSheetDialogFragment extends WPBottomSheetDialogFragment {
-    public static final String TAG = SignupBottomSheetDialogFragment.class.getSimpleName();
-    private SignupSheetListener mSignupSheetListener;
-
-    public static SignupBottomSheetDialogFragment newInstance() {
-        return new SignupBottomSheetDialogFragment();
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        if (!(context instanceof SignupSheetListener)) {
-            throw new IllegalStateException("Parent activity doesn't implement SignupSheetListener");
-        }
-        mSignupSheetListener = (SignupSheetListener) context;
-    }
-
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             @Nullable ViewGroup container,
-                             @Nullable Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.signup_bottom_sheet_dialog, container);
-    }
-
-    @Override
-    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        Button termsOfServiceText = view.findViewById(R.id.signup_tos);
-        termsOfServiceText.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mSignupSheetListener.onSignupSheetTermsOfServiceClicked();
-            }
-        });
-        termsOfServiceText.setText(Html.fromHtml(String.format(
-                getDialog()
-                    .getContext()
-                    .getResources()
-                    .getString(R.string.signup_terms_of_service_text), "<u>", "</u>")));
-
-        Button signupWithEmailButton = view.findViewById(R.id.signup_email);
-        signupWithEmailButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mSignupSheetListener.onSignupSheetEmailClicked();
-            }
-        });
-
-        Button signupWithGoogleButton = view.findViewById(R.id.signup_google);
-        signupWithGoogleButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                mSignupSheetListener.onSignupSheetGoogleClicked();
-            }
-        });
-
-        Dialog dialog = getDialog();
-        if (dialog != null) {
-            // Set peek height to full height of view to avoid signup buttons being off screen when
-            // bottom sheet is shown with small screen height (e.g. landscape orientation).
-            dialog.setOnShowListener(new OnShowListener() {
-                @Override
-                public void onShow(DialogInterface dialogInterface) {
-                    BottomSheetDialog sheetDialog = (BottomSheetDialog) dialogInterface;
-                    FrameLayout bottomSheet = sheetDialog
-                            .findViewById(com.google.android.material.R.id.design_bottom_sheet);
-
-                    if (bottomSheet != null) {
-                        BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet);
-                        behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
-                    }
-                }
-            });
-        }
-    }
-
-    @Override public void onDismiss(DialogInterface dialog) {
-        super.onDismiss(dialog);
-        if (mSignupSheetListener != null) {
-            mSignupSheetListener.onSignupSheetCanceled();
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mSignupSheetListener = null;
-    }
-
-    public interface SignupSheetListener {
-        void onSignupSheetCanceled();
-        void onSignupSheetEmailClicked();
-        void onSignupSheetGoogleClicked();
-        void onSignupSheetTermsOfServiceClicked();
-    }
-}
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupConfirmationFragment.kt b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupConfirmationFragment.kt
index 24e7f69ca727..74d5bb77f06d 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupConfirmationFragment.kt
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupConfirmationFragment.kt
@@ -15,7 +15,6 @@ import kotlinx.android.synthetic.main.login_include_email_header.*
 import kotlinx.android.synthetic.main.signup_confirmation_screen.*
 import kotlinx.android.synthetic.main.toolbar_login.*
 import org.wordpress.android.login.util.AvatarHelper.AvatarRequestListener
-import org.wordpress.android.login.util.AvatarHelper.loadAvatarFromEmail
 import org.wordpress.android.login.util.AvatarHelper.loadAvatarFromUrl
 import javax.inject.Inject
 
@@ -27,7 +26,6 @@ class SignupConfirmationFragment : Fragment() {
     private var mIdToken: String? = null
     private var mPhotoUrl: String? = null
     private var mService: String? = null
-    private var mIsSocialSignup: Boolean = false
 
     @Inject lateinit var mAnalyticsListener: LoginAnalyticsListener
 
@@ -39,16 +37,6 @@ class SignupConfirmationFragment : Fragment() {
         private const val ARG_SOCIAL_ID_TOKEN = "ARG_SOCIAL_ID_TOKEN"
         private const val ARG_SOCIAL_PHOTO_URL = "ARG_SOCIAL_PHOTO_URL"
         private const val ARG_SOCIAL_SERVICE = "ARG_SOCIAL_SERVICE"
-        private const val ARG_IS_SOCIAL_SIGNUP = "ARG_IS_SOCIAL_SIGNUP"
-
-        @JvmStatic fun newInstance(email: String?): SignupConfirmationFragment {
-            return SignupConfirmationFragment().apply {
-                arguments = Bundle().apply {
-                    putString(ARG_EMAIL, email)
-                    putBoolean(ARG_IS_SOCIAL_SIGNUP, false)
-                }
-            }
-        }
 
         @JvmStatic fun newInstance(
             email: String?,
@@ -64,7 +52,6 @@ class SignupConfirmationFragment : Fragment() {
                     putString(ARG_SOCIAL_ID_TOKEN, idToken)
                     putString(ARG_SOCIAL_PHOTO_URL, photoUrl)
                     putString(ARG_SOCIAL_SERVICE, service)
-                    putBoolean(ARG_IS_SOCIAL_SIGNUP, true)
                 }
             }
         }
@@ -87,7 +74,6 @@ class SignupConfirmationFragment : Fragment() {
             mIdToken = it.getString(ARG_SOCIAL_ID_TOKEN)
             mPhotoUrl = it.getString(ARG_SOCIAL_PHOTO_URL)
             mService = it.getString(ARG_SOCIAL_SERVICE)
-            mIsSocialSignup = it.getBoolean(ARG_IS_SOCIAL_SIGNUP)
         }
         setHasOptionsMenu(true)
     }
@@ -117,30 +103,14 @@ class SignupConfirmationFragment : Fragment() {
             }
         }
 
-        if (mIsSocialSignup) {
-            loadAvatarFromUrl(this, mPhotoUrl, gravatar, avatarRequestListener)
-            label.setText(R.string.signup_confirmation_message)
-            signup_confirmation_button.setText(R.string.create_account)
-            signup_confirmation_button.setOnClickListener {
-                mAnalyticsListener.trackCreateAccountClick()
-                mLoginListener?.showSignupSocial(mEmail, mDisplayName, mIdToken, mPhotoUrl, mService)
-            }
-        } else {
-            loadAvatarFromEmail(this, mEmail, gravatar, avatarRequestListener)
-            label.setText(R.string.signup_confirmation_magic_link_message)
-            signup_confirmation_button.setText(R.string.send_link_by_email)
-            signup_confirmation_button.setOnClickListener {
-                mAnalyticsListener.trackRequestMagicLinkClick()
-                mLoginListener?.showSignupMagicLink(mEmail)
-            }
+        loadAvatarFromUrl(this, mPhotoUrl, gravatar, avatarRequestListener)
+        signup_confirmation_button.setOnClickListener {
+            mAnalyticsListener.trackCreateAccountClick()
+            mLoginListener?.showSignupSocial(mEmail, mDisplayName, mIdToken, mPhotoUrl, mService)
         }
 
         if (savedInstanceState == null) {
-            if (mIsSocialSignup) {
-                mAnalyticsListener.trackSocialSignupConfirmationViewed()
-            } else {
-                mAnalyticsListener.trackEmailSignupConfirmationViewed()
-            }
+            mAnalyticsListener.trackSocialSignupConfirmationViewed()
         }
     }
 
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java
deleted file mode 100644
index c6c69c5b5023..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupEmailFragment.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package org.wordpress.android.login;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentSender;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Patterns;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.LayoutRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-
-import com.google.android.gms.auth.api.Auth;
-import com.google.android.gms.auth.api.credentials.Credential;
-import com.google.android.gms.auth.api.credentials.CredentialPickerConfig;
-import com.google.android.gms.auth.api.credentials.HintRequest;
-import com.google.android.gms.common.ConnectionResult;
-import com.google.android.gms.common.GoogleApiAvailability;
-import com.google.android.gms.common.api.GoogleApiClient;
-import com.google.android.gms.common.api.GoogleApiClient.ConnectionCallbacks;
-import com.google.android.gms.common.api.GoogleApiClient.OnConnectionFailedListener;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
-import org.wordpress.android.fluxc.generated.AccountActionBuilder;
-import org.wordpress.android.fluxc.store.AccountStore.OnAvailabilityChecked;
-import org.wordpress.android.login.widgets.WPLoginInputRow;
-import org.wordpress.android.login.widgets.WPLoginInputRow.OnEditorCommitListener;
-import org.wordpress.android.util.ActivityUtils;
-import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.AppLog.T;
-import org.wordpress.android.util.EditTextUtils;
-import org.wordpress.android.util.NetworkUtils;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import static android.app.Activity.RESULT_OK;
-
-import dagger.android.support.AndroidSupportInjection;
-
-public class SignupEmailFragment extends LoginBaseFormFragment<LoginListener> implements TextWatcher,
-        OnEditorCommitListener, ConnectionCallbacks, OnConnectionFailedListener {
-    private static final String KEY_HAS_DISMISSED_EMAIL_HINTS = "KEY_HAS_DISMISSED_EMAIL_HINTS";
-    private static final String KEY_IS_DISPLAYING_EMAIL_HINTS = "KEY_IS_DISPLAYING_EMAIL_HINTS";
-    private static final String KEY_REQUESTED_EMAIL = "KEY_REQUESTED_EMAIL";
-    private static final String LOG_TAG = SignupEmailFragment.class.getSimpleName();
-    private static final int EMAIL_CREDENTIALS_REQUEST_CODE = 25100;
-    private static final int GOOGLE_API_CLIENT_ID = 1001;
-
-    public static final String TAG = "signup_email_fragment_tag";
-    public static final int MAX_EMAIL_LENGTH = 100;
-
-    private GoogleApiClient mGoogleApiClient;
-    private String mRequestedEmail;
-
-    protected Button mPrimaryButton;
-    protected WPLoginInputRow mEmailInput;
-    protected boolean mHasDismissedEmailHints;
-    protected boolean mIsDisplayingEmailHints;
-
-    @Override
-    protected @LayoutRes int getContentLayout() {
-        return R.layout.signup_email_screen;
-    }
-
-    @Override
-    protected @LayoutRes int getProgressBarText() {
-        return R.string.checking_email;
-    }
-
-    @Override
-    protected void setupLabel(@NonNull TextView label) {
-        label.setText(R.string.signup_email_header);
-    }
-
-    @Override
-    protected void setupContent(ViewGroup rootView) {
-        // important for accessibility - talkback
-        getActivity().setTitle(R.string.signup_email_screen_title);
-        mEmailInput = rootView.findViewById(R.id.login_email_row);
-
-        if (BuildConfig.DEBUG) {
-            mEmailInput.getEditText().setText(BuildConfig.DEBUG_WPCOM_LOGIN_EMAIL);
-        }
-
-        mEmailInput.addTextChangedListener(this);
-        mEmailInput.setOnEditorCommitListener(this);
-        mEmailInput.getEditText().setOnFocusChangeListener(new View.OnFocusChangeListener() {
-            @Override
-            public void onFocusChange(View view, boolean hasFocus) {
-                if (hasFocus && !mIsDisplayingEmailHints && !mHasDismissedEmailHints) {
-                    mAnalyticsListener.trackSelectEmailField();
-                    mIsDisplayingEmailHints = true;
-                    getEmailHints();
-                }
-            }
-        });
-        mEmailInput.getEditText().setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (!mIsDisplayingEmailHints && !mHasDismissedEmailHints) {
-                    mAnalyticsListener.trackSelectEmailField();
-                    mIsDisplayingEmailHints = true;
-                    getEmailHints();
-                }
-            }
-        });
-    }
-
-    @Override
-    protected void setupBottomButtons(Button secondaryButton, Button primaryButton) {
-        secondaryButton.setVisibility(View.GONE);
-
-        mPrimaryButton = primaryButton;
-        mPrimaryButton.setEnabled(false);
-        mPrimaryButton.setOnClickListener(new OnClickListener() {
-            @SuppressWarnings("PrivateMemberAccessBetweenOuterAndInnerClass")
-            public void onClick(View view) {
-                next(getCleanedEmail());
-            }
-        });
-    }
-
-    @Override
-    protected void buildToolbar(Toolbar toolbar, ActionBar actionBar) {
-        actionBar.setTitle(R.string.sign_up_label);
-    }
-
-    @Override
-    protected void onHelp() {
-        if (mLoginListener != null) {
-            mLoginListener.helpSignupEmailScreen(EditTextUtils.getText(mEmailInput.getEditText()));
-        }
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        AndroidSupportInjection.inject(this);
-        super.onAttach(context);
-    }
-
-    @Override public void onStart() {
-        super.onStart();
-        mGoogleApiClient = new GoogleApiClient.Builder(getActivity())
-                .addConnectionCallbacks(SignupEmailFragment.this)
-                .enableAutoManage(getActivity(), GOOGLE_API_CLIENT_ID, SignupEmailFragment.this)
-                .addApi(Auth.CREDENTIALS_API)
-                .build();
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-        if (mGoogleApiClient != null) {
-            mGoogleApiClient.stopAutoManage(getActivity());
-            if (mGoogleApiClient.isConnected()) {
-                mGoogleApiClient.disconnect();
-            }
-        }
-    }
-
-    @Override
-    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        if (savedInstanceState != null) {
-            mRequestedEmail = savedInstanceState.getString(KEY_REQUESTED_EMAIL);
-            mIsDisplayingEmailHints = savedInstanceState.getBoolean(KEY_IS_DISPLAYING_EMAIL_HINTS);
-            mHasDismissedEmailHints = savedInstanceState.getBoolean(KEY_HAS_DISMISSED_EMAIL_HINTS);
-        } else {
-            mAnalyticsListener.trackEmailFormViewed();
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mAnalyticsListener.emailFormScreenResumed();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putString(KEY_REQUESTED_EMAIL, mRequestedEmail);
-        outState.putBoolean(KEY_IS_DISPLAYING_EMAIL_HINTS, mIsDisplayingEmailHints);
-        outState.putBoolean(KEY_HAS_DISMISSED_EMAIL_HINTS, mHasDismissedEmailHints);
-    }
-
-    protected void next(String email) {
-        mAnalyticsListener.trackSubmitClicked();
-        if (NetworkUtils.checkConnection(getActivity())) {
-            if (isValidEmail(email)) {
-                startProgress();
-                mRequestedEmail = email;
-                mDispatcher.dispatch(AccountActionBuilder.newIsAvailableEmailAction(email));
-            } else {
-                showErrorEmail(getString(R.string.email_invalid));
-            }
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mLoginListener = null;
-    }
-
-    private String getCleanedEmail() {
-        return EditTextUtils.getText(mEmailInput.getEditText()).trim();
-    }
-
-    private boolean isValidEmail(String email) {
-        Pattern emailRegExPattern = Patterns.EMAIL_ADDRESS;
-        Matcher matcher = emailRegExPattern.matcher(email);
-        return matcher.find() && email.length() <= MAX_EMAIL_LENGTH;
-    }
-
-    @Override
-    public void onEditorCommit() {
-        next(getCleanedEmail());
-    }
-
-    @Override
-    public void afterTextChanged(Editable s) {
-    }
-
-    @Override
-    public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-    }
-
-    @Override
-    public void onTextChanged(CharSequence s, int start, int before, int count) {
-        mEmailInput.setError(null);
-        mPrimaryButton.setEnabled(!s.toString().trim().isEmpty());
-    }
-
-    protected void showErrorDialog(String message) {
-        AlertDialog dialog = new MaterialAlertDialogBuilder(getActivity())
-                .setMessage(message)
-                .setPositiveButton(R.string.login_error_button, null)
-                .create();
-        dialog.show();
-    }
-
-    private void showErrorEmail(String message) {
-        mAnalyticsListener.trackFailure(message);
-        mEmailInput.setError(message);
-    }
-
-    @Override
-    protected void endProgress() {
-        super.endProgress();
-        mRequestedEmail = null;
-    }
-
-    @SuppressWarnings("unused")
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onAvailabilityChecked(OnAvailabilityChecked event) {
-        if (mRequestedEmail != null && mRequestedEmail.equalsIgnoreCase(event.value)) {
-            if (isInProgress()) {
-                endProgress();
-            }
-
-            if (event.isError()) {
-                AppLog.e(T.API, "OnAvailabilityChecked error: " + event.error.type + " - " + event.error.message);
-                showErrorDialog(getString(R.string.signup_email_error_generic));
-            } else {
-                switch (event.type) {
-                    case EMAIL:
-                        ActivityUtils.hideKeyboard(getActivity());
-
-                        if (mLoginListener != null) {
-                            if (event.isAvailable) {
-                                mLoginListener.showSignupMagicLink(event.value);
-                            } else {
-                                mAnalyticsListener.trackSignupEmailToLogin();
-                                mLoginListener.showSignupToLoginMessage();
-                                mLoginListener.gotWpcomEmail(event.value, false, null);
-                                // Kill connections with FluxC and this fragment since the flow is changing to login.
-                                mDispatcher.unregister(this);
-                                getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
-                            }
-                        }
-
-                        break;
-                    default:
-                        AppLog.e(T.API, "OnAvailabilityChecked unhandled event: " + event.error.type);
-                        break;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onConnected(Bundle bundle) {
-        AppLog.d(T.NUX, LOG_TAG + ": Google API client connected");
-    }
-
-    @Override
-    public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
-        AppLog.d(T.NUX, LOG_TAG + ": Google API connection result: " + connectionResult);
-    }
-
-    @Override
-    public void onConnectionSuspended(int i) {
-        AppLog.d(T.NUX, LOG_TAG + ": Google API client connection suspended");
-    }
-
-    public void getEmailHints() {
-        GoogleApiAvailability googleApiAvailability = GoogleApiAvailability.getInstance();
-        if (getContext() == null
-            || googleApiAvailability.isGooglePlayServicesAvailable(getContext()) != ConnectionResult.SUCCESS) {
-            AppLog.w(T.NUX, LOG_TAG + ": Couldn't start hint picker - Play Services unavailable");
-            return;
-        }
-        HintRequest hintRequest = new HintRequest.Builder()
-                .setHintPickerConfig(new CredentialPickerConfig.Builder()
-                        .setShowCancelButton(true)
-                        .build())
-                .setEmailAddressIdentifierSupported(true)
-                .build();
-
-        PendingIntent intent = Auth.CredentialsApi.getHintPickerIntent(mGoogleApiClient, hintRequest);
-
-        try {
-            mAnalyticsListener.trackShowEmailHints();
-            startIntentSenderForResult(intent.getIntentSender(), EMAIL_CREDENTIALS_REQUEST_CODE, null, 0, 0, 0, null);
-        } catch (IntentSender.SendIntentException exception) {
-            AppLog.d(T.NUX, LOG_TAG + "Could not start email hint picker" + exception);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == EMAIL_CREDENTIALS_REQUEST_CODE) {
-            if (mEmailInput == null) {
-                // Activity result received before the fragments onCreateView(), disregard result.
-                return;
-            }
-            if (resultCode == RESULT_OK) {
-                mAnalyticsListener.trackPickEmailFromHint();
-                Credential credential = data.getParcelableExtra(Credential.EXTRA_KEY);
-                mEmailInput.getEditText().setText(credential.getId());
-                next(getCleanedEmail());
-            } else {
-                mAnalyticsListener.trackDismissDialog();
-                mHasDismissedEmailHints = true;
-                mEmailInput.getEditText().postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        if (isAdded()) {
-                            ActivityUtils.showKeyboard(mEmailInput.getEditText());
-                        }
-                    }
-                }, getResources().getInteger(android.R.integer.config_mediumAnimTime));
-            }
-
-            mIsDisplayingEmailHints = false;
-        }
-    }
-}
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/di/LoginFragmentModule.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/di/LoginFragmentModule.java
index cce15c42a095..ab83237f48c4 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/di/LoginFragmentModule.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/di/LoginFragmentModule.java
@@ -10,7 +10,6 @@
 import org.wordpress.android.login.LoginSiteAddressHelpDialogFragment;
 import org.wordpress.android.login.LoginUsernamePasswordFragment;
 import org.wordpress.android.login.SignupConfirmationFragment;
-import org.wordpress.android.login.SignupEmailFragment;
 import org.wordpress.android.login.SignupGoogleFragment;
 import org.wordpress.android.login.SignupMagicLinkFragment;
 
@@ -46,9 +45,6 @@ public abstract class LoginFragmentModule {
     @ContributesAndroidInjector
     abstract LoginUsernamePasswordFragment loginUsernamePasswordFragment();
 
-    @ContributesAndroidInjector
-    abstract SignupEmailFragment signupEmailFragment();
-
     @ContributesAndroidInjector
     abstract SignupGoogleFragment signupGoogleFragment();
 
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/util/SiteUtils.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/util/SiteUtils.java
index 79023cfe2979..4a8e9ad55aaf 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/util/SiteUtils.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/util/SiteUtils.java
@@ -1,9 +1,12 @@
 package org.wordpress.android.login.util;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.wordpress.android.fluxc.model.SiteModel;
 import org.wordpress.android.fluxc.store.SiteStore;
+import org.wordpress.android.fluxc.store.SiteStore.FetchSitesPayload;
+import org.wordpress.android.fluxc.store.SiteStore.SiteFilter;
 import org.wordpress.android.util.UrlUtils;
 
 import java.util.ArrayList;
@@ -43,4 +46,11 @@ private static SiteModel getSiteByMatchingUrl(List<SiteModel> siteModelList, Str
         }
         return null;
     }
+
+    @NonNull
+    public static FetchSitesPayload getFetchSitesPayload(boolean isJetpackAppLogin) {
+        ArrayList<SiteFilter> siteFilters = new ArrayList<>();
+        if (isJetpackAppLogin) siteFilters.add(SiteFilter.JETPACK);
+        return new FetchSitesPayload(siteFilters);
+    }
 }
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable-ldrtl-v18/ic_arrow_left_white_24dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable-ldrtl-v18/ic_arrow_left_white_24dp.xml
deleted file mode 100644
index eaa294f0a3fd..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable-ldrtl-v18/ic_arrow_left_white_24dp.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="-1">
-        <path
-            android:fillColor="@android:color/white"
-            android:pathData="M20,11H7.8l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13H20V11z"></path>
-    </group>
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_arrow_left_white_24dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_arrow_left_white_24dp.xml
deleted file mode 100644
index b335e020b86c..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_arrow_left_white_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,11H7.8l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13H20V11z" >
-    </path>
-
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_domains_grey_24dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_domains_grey_24dp.xml
deleted file mode 100644
index 2b7c41a4024a..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_domains_grey_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@color/grey"
-        android:pathData="M12 2C6.477 2 2 6.477 2 12s4.477 10 10 10 10-4.477 10-10S17.523 2 12 2zm6.918 6h-3.215c-0.188-1.424-0.42-2.65-0.565-3.357 1.593 0.682 2.916 1.87 3.78 3.357zm-5.904-3.928c0.068 0.352 0.387 2.038 0.645 3.928h-3.32c0.26-1.89 0.578-3.576 0.646-3.928C11.32 4.03 11.656 4 12 4s0.68 0.03 1.014 0.072zM14 12c0 0.598-0.043 1.286-0.11 2h-3.78c-0.067-0.714-0.11-1.402-0.11-2s0.043-1.286 0.11-2h3.78c0.067 0.714 0.11 1.402 0.11 2zM8.862 4.643C8.717 5.35 8.485 6.576 8.297 8H5.082c0.864-1.487 2.187-2.675 3.78-3.357zM4.262 10h3.822c-0.05 0.668-0.084 1.344-0.084 2s0.033 1.332 0.085 2H4.263C4.097 13.36 4 12.692 4 12s0.098-1.36 0.263-2zm0.82 6h3.215c0.188 1.424 0.42 2.65 0.565 3.357-1.593-0.682-2.916-1.87-3.78-3.357zm5.904 3.928c-0.068-0.353-0.388-2.038-0.645-3.928h3.32c-0.26 1.89-0.578 3.576-0.646 3.928-0.333 0.043-0.67 0.072-1.014 0.072s-0.68-0.03-1.014-0.072zm4.152-0.57c0.145-0.708 0.377-1.934 0.565-3.358h3.215c-0.864 1.487-2.187 2.675-3.78 3.357zm4.6-5.358h-3.822c0.05-0.668 0.084-1.344 0.084-2s-0.033-1.332-0.085-2h3.82c0.167 0.64 0.265 1.308 0.265 2s-0.097 1.36-0.263 2z" >
-    </path>
-
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_gridicons_user_circle_100dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_gridicons_user_circle_100dp.xml
deleted file mode 100644
index 86af6c40b4c0..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_gridicons_user_circle_100dp.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<vector android:height="100dp" android:viewportHeight="24.0"
-    android:viewportWidth="24.0" android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@color/grey_lighten_10" android:pathData="M12,2C6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10S17.523,2 12,2zM12,20.5c-4.694,0 -8.5,-3.806 -8.5,-8.5S7.306,3.5 12,3.5s8.5,3.806 8.5,8.5 -3.806,8.5 -8.5,8.5zM12,12.5c-3.038,0 -5.5,1.728 -5.5,3.5s2.462,3.5 5.5,3.5 5.5,-1.728 5.5,-3.5 -2.462,-3.5 -5.5,-3.5zM12,12c1.657,0 3,-1.343 3,-3s-1.343,-3 -3,-3 -3,1.343 -3,3 1.343,3 3,3z"/>
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_lock_grey_24dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_lock_grey_24dp.xml
deleted file mode 100644
index d30453311a40..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_lock_grey_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@color/grey"
-        android:pathData="M18,8h-1V7c0,-2.757 -2.243,-5 -5,-5S7,4.243 7,7v1H6c-1.105,0 -2,0.895 -2,2v10c0,1.105 0.895,2 2,2h12c1.105,0 2,-0.895 2,-2V10C20,8.895 19.105,8 18,8zM9,7c0,-1.654 1.346,-3 3,-3s3,1.346 3,3v1H9V7zM13,15.723V18h-2v-2.277c-0.595,-0.346 -1,-0.984 -1,-1.723c0,-1.105 0.895,-2 2,-2s2,0.895 2,2C14,14.738 13.595,15.376 13,15.723z" >
-    </path>
-
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_user_circle_grey_24dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_user_circle_grey_24dp.xml
deleted file mode 100644
index 76eb20d5fbef..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_user_circle_grey_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@color/grey"
-        android:pathData="M12,2C6.477,2 2,6.477 2,12s4.477,10 10,10 10,-4.477 10,-10S17.523,2 12,2zM12,20.5c-4.694,0 -8.5,-3.806 -8.5,-8.5S7.306,3.5 12,3.5s8.5,3.806 8.5,8.5 -3.806,8.5 -8.5,8.5zM12,12.5c-3.038,0 -5.5,1.728 -5.5,3.5s2.462,3.5 5.5,3.5 5.5,-1.728 5.5,-3.5 -2.462,-3.5 -5.5,-3.5zM12,12c1.657,0 3,-1.343 3,-3s-1.343,-3 -3,-3 -3,1.343 -3,3 1.343,3 3,3z" >
-    </path>
-
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_user_grey_24dp.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_user_grey_24dp.xml
deleted file mode 100644
index 33b716204281..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/ic_user_grey_24dp.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
-
-    <path
-        android:fillColor="@color/grey"
-        android:pathData="M12,4c2.2,0 4,1.8 4,4s-1.8,4 -4,4s-4,-1.8 -4,-4S9.8,4 12,4zM12,20c0,0 8,0 8,-2c0,-2.4 -3.9,-5 -8,-5s-8,2.6 -8,5C4,20 12,20 12,20z" >
-    </path>
-
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/login_email_alert.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/login_email_alert.xml
deleted file mode 100644
index 6e503943586e..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/login_email_alert.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<vector android:height="120dp" android:viewportHeight="160.0"
-    android:viewportWidth="160.0" android:width="120dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFFFFF" android:pathData="M96.5,22.1c-9.3,0 -15,2.6 -16.9,6.2s-4.4,48.9 -1.3,50.3c3.1,1.4 25.9,4.1 29.6,1.2c3.8,-2.9 9.4,-38.4 3.6,-47.8C105.8,22.6 99.4,22.1 96.5,22.1z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M51.8,116.7l-1,35.3l22.8,0.2l-0.5,-35.9z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M119.1,115.9l4.9,37.9c0,0 7.9,1.8 12.1,-2.3c4.2,-4.1 7.5,-11.5 8,-15.6s-0.7,-20.5 -1.3,-23.7C142.2,109 119.1,115.9 119.1,115.9z"/>
-    <path android:fillColor="#00A9DE" android:pathData="M145.6,118.8c0,0 -3.7,-42.3 -37.7,-48.5c0,0 -5.5,7.9 -14,7.9s-12.8,-7.9 -12.8,-7.9C47.1,81 49,119.3 49,119.3h21.2L69.6,152h55.3l-1.5,-32.8L145.6,118.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M20.1,151.5L118.2,151.5"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M20.1,151.1c8.2,-0.5 16.4,-0.6 24.5,-0.6l24.5,-0.1l24.5,0.1c8.2,0 16.4,0.1 24.5,0.3c0.4,0 0.7,0.3 0.6,0.7c0,0.4 -0.3,0.6 -0.6,0.6c-8.2,0.3 -16.4,0.3 -24.5,0.3l-24.5,0.1l-24.5,-0.1c-8.2,0 -16.4,-0.1 -24.5,-0.6c-0.2,0 -0.4,-0.2 -0.4,-0.4C19.8,151.3 19.9,151.1 20.1,151.1z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M136.1,151.5L153.6,151.5"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M136.1,151.1c1.5,-0.5 2.9,-0.6 4.4,-0.6c1.5,-0.1 2.9,-0.1 4.4,-0.1l4.4,0.1c1.5,0 2.9,0.1 4.4,0.3c0.4,0.1 0.6,0.4 0.5,0.8c-0.1,0.3 -0.3,0.5 -0.5,0.5c-1.5,0.3 -2.9,0.3 -4.4,0.3l-4.4,0.1c-1.5,0 -2.9,0 -4.4,-0.1c-1.5,0 -2.9,-0.1 -4.4,-0.6c-0.2,-0.1 -0.4,-0.3 -0.3,-0.6C135.9,151.2 136,151.1 136.1,151.1z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M95.2,121.1H79.2l-2.2,-29.4c-0.1,-1.5 1.1,-2.8 2.6,-2.8h15.1c1.5,0 2.7,1.3 2.6,2.8L95.2,121.1z"/>
-    <path android:fillColor="#0084C0" android:pathData="M95.4,121.6l-3.7,0.3c-1.3,0.1 -2.7,0.1 -4.1,0.2c-2.8,0.1 -5.6,0.1 -8.3,0.1c-0.5,0 -1,-0.4 -1,-0.9l0,0l-1.6,-20.6l-0.4,-5.1L76,92.9l0,-0.6l0,-0.3l0,-0.2l0,-0.2c0,-0.6 0.1,-1.2 0.4,-1.8c0.6,-1.1 1.7,-1.8 3,-1.9c0.3,0 0.5,0 0.7,0l0.6,0l1.3,0l5.2,0l5.2,0l1.3,0l0.6,0c0.2,0 0.4,0 0.7,0c1.2,0.1 2.4,0.8 2.9,1.9c0.3,0.5 0.4,1.1 0.4,1.7c0,0.3 0,0.5 0,0.7l-0.1,0.7l-0.2,2.6l-0.4,5.3c-0.6,7 -1.4,14 -2.2,20.5L95.4,121.6zM94.9,120.6c0.1,-7.1 0.3,-13.8 0.8,-20.4l0.3,-5l0.2,-2.5l0,-0.6c0,-0.2 0,-0.5 0,-0.6c0,-0.3 -0.1,-0.5 -0.2,-0.7c-0.2,-0.5 -0.7,-0.8 -1.2,-0.8l-2.5,0l-5.2,0L82,90l-2.5,0c-0.5,0 -0.9,0.3 -1.2,0.8c-0.1,0.2 -0.2,0.5 -0.2,0.7l0,0.1l0,0.2l0,0.3l0,0.6l0.2,2.6l0.4,5.1l1.4,20.6l-1,-1c2.5,0 5.1,0 7.6,0.1c1.3,0 2.5,0.1 3.9,0.2l4,0.3L94.9,120.6z"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M101.6,63.5v-4c-5.1,0.9 -9.6,1.3 -13.5,0C84.1,58.2 94.2,63.6 101.6,63.5z"/>
-    <path android:fillColor="#004F84" android:pathData="M88.1,45.3L88.1,45.3c-0.7,0 -1.2,-0.5 -1.2,-1.2v-1.9c0,-0.7 0.5,-1.2 1.2,-1.2l0,0c0.7,0 1.2,0.5 1.2,1.2v1.9C89.4,44.8 88.8,45.3 88.1,45.3z"/>
-    <path android:fillColor="#86A6BD" android:pathData="M115.6,44.1c-0.6,-6.4 1.6,-9.4 -1.7,-18.6c-2.1,-5.8 -12.1,-12.5 -22.4,-10C80.5,17 75.7,27.1 75.7,38.4c0,15.1 -9.2,14.7 -9.2,25.3s7.3,12.2 7.3,12.2s3.6,0.6 7.3,-0.4v-5.3h0c2.9,-0.3 5.2,-2.6 5.5,-5.5l0.7,-5.8c-9.1,-5.2 -7.9,-19.1 -7.9,-19.1c11.9,0.8 14.5,-8 17.2,-13.2c1,1.9 3.4,4.8 6.5,7c6.8,5.1 6.2,14.4 3.4,19.7c-2.7,5 -5.2,5.6 -5.2,5.6l-0.3,5.9c0.1,2.6 2.1,4.8 4.7,5.2l1.3,0.2l3.8,1l4.1,1.6c0,0 3,0.1 5.7,-7.5C123.4,57.6 116,48 115.6,44.1z"/>
-    <path android:fillColor="#004F81" android:pathData="M80.2,39.5c0.1,2.4 0.2,4.8 0.5,7.2c0.3,2.4 0.9,4.7 2,6.8c1.1,2 2.8,3.6 4.9,4.5c2.1,0.9 4.5,1.2 6.8,1.3c2.4,0 4.8,-0.1 6.8,-1c2.1,-0.9 3.7,-2.6 4.6,-4.7c0.9,-2.1 1.3,-4.5 1.6,-6.9c0.2,-2.4 0.3,-4.8 0.3,-7.2c0,-0.3 0.2,-0.5 0.5,-0.5c0.3,0 0.5,0.2 0.5,0.5c0,2.4 0.1,4.9 -0.1,7.3c-0.2,2.5 -0.5,5 -1.5,7.3c-1,2.4 -2.9,4.4 -5.3,5.5c-2.4,1.1 -5,1.2 -7.5,1.1c-2.5,-0.1 -5,-0.4 -7.4,-1.5c-0.6,-0.3 -1.2,-0.5 -1.7,-0.9c-0.3,-0.2 -0.5,-0.4 -0.8,-0.6l-0.7,-0.7c-0.5,-0.4 -0.9,-1 -1.3,-1.5c-0.4,-0.5 -0.7,-1.1 -1,-1.6c-1.1,-2.3 -1.7,-4.8 -2,-7.2c-0.3,-2.5 -0.3,-4.9 -0.3,-7.4c0,-0.3 0.2,-0.5 0.5,-0.5C79.9,39 80.1,39.2 80.2,39.5L80.2,39.5z"/>
-    <path android:fillColor="#004F81" android:pathData="M95.7,41.1c0.2,1.1 0.3,2.3 0.4,3.4c0,0.6 0,1.1 0,1.7c0,0.6 -0.1,1.1 -0.2,1.7c-0.1,0.3 -0.3,0.5 -0.6,0.4c-0.2,0 -0.4,-0.2 -0.4,-0.4c-0.1,-0.6 -0.1,-1.1 -0.2,-1.7c0,-0.6 0,-1.1 0,-1.7c0,-1.1 0.1,-2.3 0.4,-3.4c0,-0.2 0.2,-0.3 0.5,-0.3C95.5,40.8 95.7,41 95.7,41.1z"/>
-    <path android:fillColor="#004F84" android:pathData="M102.2,45.3L102.2,45.3c-0.7,0 -1.2,-0.5 -1.2,-1.2v-1.9c0,-0.7 0.5,-1.2 1.2,-1.2l0,0c0.7,0 1.2,0.5 1.2,1.2v1.9C103.5,44.8 102.9,45.3 102.2,45.3z"/>
-    <path android:fillColor="#004F81" android:pathData="M92.3,51.7c0.4,0.1 0.9,0.3 1.5,0.3c0.5,0.1 1.1,0.1 1.6,0.1c0.5,0 1.1,0 1.6,-0.1c0.5,-0.1 1,-0.2 1.4,-0.3l0.1,0c0.2,-0.1 0.5,0 0.7,0.2c0.1,0.2 0,0.4 -0.1,0.6c-0.5,0.5 -1.2,0.8 -1.8,0.9c-0.6,0.2 -1.2,0.2 -1.9,0.2c-0.6,0 -1.2,-0.1 -1.8,-0.2c-0.6,-0.2 -1.2,-0.4 -1.8,-0.9c-0.2,-0.2 -0.2,-0.5 0,-0.7C91.8,51.7 92,51.6 92.3,51.7L92.3,51.7z"/>
-    <path android:fillColor="#004F81" android:pathData="M99.1,35.9c0.4,-0.5 1,-0.7 1.4,-0.8c0.5,-0.1 1,-0.2 1.5,-0.1c0.5,0 1,0.1 1.4,0.2c0.5,0.2 1,0.4 1.3,0.8c0.2,0.2 0.2,0.5 0,0.7c-0.1,0.1 -0.4,0.2 -0.5,0.1l-0.1,0c-0.3,-0.1 -0.7,-0.2 -1.1,-0.3c-0.4,0 -0.8,-0.1 -1.2,-0.1c-0.4,0 -0.8,0 -1.2,0c-0.4,0 -0.8,0.1 -1,0.1l-0.2,0c-0.3,0.1 -0.5,-0.1 -0.6,-0.4C98.9,36.1 99,36 99.1,35.9z"/>
-    <path android:fillColor="#004F81" android:pathData="M90.5,36.6c-0.2,-0.1 -0.6,-0.1 -1,-0.1c-0.4,0 -0.8,0 -1.2,0c-0.4,0 -0.8,0 -1.2,0.1c-0.4,0.1 -0.7,0.1 -1.1,0.3l-0.1,0c-0.3,0.1 -0.6,0 -0.6,-0.3c-0.1,-0.2 0,-0.4 0.1,-0.5c0.4,-0.4 0.9,-0.6 1.3,-0.8c0.5,-0.2 1,-0.2 1.4,-0.2c0.5,0 1,0 1.5,0.1c0.5,0.1 1,0.3 1.4,0.8c0.2,0.2 0.2,0.5 0,0.7c-0.1,0.1 -0.3,0.1 -0.4,0.1L90.5,36.6z"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M149.7,145.1c0,-4.5 0.3,-9.1 0.6,-13.6l1.1,-13.5c0.4,-4.5 0.8,-9 1.2,-13.5l1.2,-13.5l1,1.1c-2.4,0 -4.9,0 -7.3,-0.1c-2.4,0 -4.9,-0.1 -7.3,-0.2c-0.4,0 -0.7,-0.3 -0.6,-0.7c0,-0.3 0.3,-0.6 0.6,-0.6c2.4,-0.1 4.9,-0.2 7.3,-0.2c2.4,-0.1 4.9,-0.1 7.3,-0.1c0.5,0 1,0.4 1,1l0,0.1l0,0l-1.1,13.5c-0.4,4.5 -0.7,9 -1.1,13.5l-1.3,13.5c-0.5,4.5 -1,9 -1.7,13.5c0,0.2 -0.3,0.4 -0.5,0.3C149.8,145.5 149.7,145.4 149.7,145.1z"/>
-    <path android:fillColor="#74DCFC" android:pathData="M94.5,84.8m-1.3,0a1.3,1.3 0,1 1,2.6 0a1.3,1.3 0,1 1,-2.6 0"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M128.1,154.3c-19.2,0 -26.5,-32.1 -26.5,-32.1s-3.4,-0.6 -6.8,-2.8c-3,-2 -3.4,-6.2 -3.4,-6.2s-4.6,-0.4 -8.5,0.6c-1.3,0.3 -1.7,-0.6 -2.3,-2.3c-0.6,-1.7 0.6,-3.9 3.4,-4.5c10,-5.6 12.7,-1.7 14.7,0c4.5,3.9 26.5,21.4 26.5,21.4"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M88.4,52.1c0,-0.2 0,-0.3 0,-0.5c0,-0.1 0.1,-0.3 0.1,-0.4c0.1,-0.3 0.2,-0.5 0.5,-0.7l0.4,0.2c0.1,0.3 0,0.6 -0.1,0.9c-0.1,0.1 -0.1,0.3 -0.2,0.4c-0.1,0.1 -0.2,0.2 -0.3,0.3L88.4,52.1z"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M101.9,52.3c-0.1,-0.1 -0.2,-0.2 -0.3,-0.3c-0.1,-0.1 -0.1,-0.2 -0.2,-0.4c-0.1,-0.3 -0.2,-0.5 -0.1,-0.9l0.4,-0.2c0.3,0.2 0.4,0.5 0.5,0.7c0,0.1 0.1,0.3 0.1,0.4c0,0.1 0,0.3 0,0.5L101.9,52.3z"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M103.8,128.8c-0.1,0 -0.3,-0.1 -0.4,-0.2c-0.2,-0.2 -0.2,-0.5 0,-0.7l9,-8.5c0.2,-0.2 0.5,-0.2 0.7,0c0.2,0.2 0.2,0.5 0,0.7l-9,8.5C104.1,128.8 103.9,128.8 103.8,128.8z"/>
-    <path android:fillColor="#004F81" android:pathData="M83.3,106.6c1.6,-1.4 3.6,-2.5 5.8,-2.9c2.2,-0.5 4.5,-0.3 6.7,0.4c1.1,0.4 2.1,0.9 3.1,1.6c0.5,0.4 0.9,0.7 1.3,1l1.2,1l4.9,4l9.7,8c3.3,2.6 6.5,5.3 9.6,8.1c0.3,0.2 0.3,0.7 0,0.9c-0.2,0.3 -0.6,0.3 -0.9,0.1c-3.5,-2.4 -6.8,-5 -10.1,-7.6l-9.9,-7.8l-4.9,-4l-1.2,-1c-0.4,-0.3 -0.8,-0.7 -1.1,-1c-0.7,-0.6 -1.6,-1 -2.5,-1.3c-1.8,-0.7 -3.8,-0.9 -5.7,-0.6c-1.9,0.2 -3.9,0.8 -5.8,1.8c-0.2,0.1 -0.4,0 -0.4,-0.2C83.2,106.9 83.2,106.7 83.3,106.6z"/>
-    <path android:fillColor="#004F81" android:pathData="M82.1,113.1c0.7,-0.4 1.5,-0.8 2.3,-1c0.8,-0.3 1.6,-0.4 2.4,-0.5c0.8,-0.1 1.7,0 2.5,0.1c0.8,0.1 1.6,0.3 2.5,0.6c0.4,0.1 0.6,0.4 0.6,0.8l0,0.1c0.1,1 0.5,2.2 1,3.1c0.5,1 1.2,1.8 2,2.3c1,0.6 2,1.2 3.1,1.6c1.1,0.4 2.2,0.8 3.3,1c0.4,0.1 0.8,0.4 0.9,0.8l0,0c1.7,6.7 4.3,13.4 8,19.3c1.9,2.9 4,5.7 6.6,7.8c2.6,2.2 5.7,3.7 9,4.1c1.7,0.2 3.3,0.1 4.9,-0.2c1.6,-0.4 3.1,-1.1 4.4,-2.1c2.6,-2 4.3,-5.1 5.3,-8.4c1.1,-3.3 1.7,-6.7 2,-10.2c0.2,-1.7 0.3,-3.5 0.4,-5.3c0.1,-1.8 0.1,-3.5 0,-5.3l0,0c0,-0.2 0.1,-0.3 0.3,-0.3c0.2,0 0.3,0.1 0.3,0.3c0.6,3.6 0.7,7.1 0.6,10.7c-0.2,3.6 -0.7,7.2 -1.8,10.7c-1.1,3.5 -2.9,6.9 -6,9.4c-1.5,1.2 -3.3,2 -5.2,2.5c-1.9,0.4 -3.8,0.5 -5.7,0.3c-3.8,-0.4 -7.3,-2.2 -10.2,-4.5c-2.9,-2.4 -5.2,-5.3 -7.1,-8.3c-1.9,-3.1 -3.5,-6.3 -4.9,-9.7c-1.3,-3.4 -2.5,-6.7 -3.3,-10.3l0.9,0.8c-1.4,-0.3 -2.5,-0.7 -3.7,-1.2c-1.2,-0.5 -2.3,-1.1 -3.4,-1.8c-1.2,-0.8 -2.1,-1.9 -2.7,-3.1c-0.6,-1.2 -1,-2.5 -1.2,-3.9l0.6,0.9c-0.6,-0.2 -1.3,-0.4 -2,-0.5c-0.7,-0.1 -1.4,-0.1 -2.1,-0.1c-0.7,0 -1.4,0.1 -2.1,0.2c-0.7,0.1 -1.4,0.3 -2.1,0.6l0,0c-0.4,0.1 -0.7,-0.1 -0.8,-0.4C81.7,113.6 81.8,113.2 82.1,113.1z"/>
-    <path android:fillColor="#004F81" android:pathData="M81.1,110.2c0.9,-0.5 2,-0.8 3,-1c1,-0.2 2.1,-0.3 3.1,-0.3c1.1,0 2.1,0.2 3.1,0.4c1,0.2 2,0.6 3,1c0.3,0.1 0.4,0.4 0.2,0.7c-0.1,0.2 -0.3,0.3 -0.6,0.3c-1,-0.2 -1.9,-0.4 -2.9,-0.6c-1,-0.2 -1.9,-0.2 -2.9,-0.3c-1,0 -1.9,0 -2.9,0.1c-1,0.1 -1.9,0.3 -2.9,0.6c-0.3,0.1 -0.5,-0.1 -0.6,-0.3C80.8,110.6 80.9,110.3 81.1,110.2z"/>
-    <path android:fillColor="#004F81" android:pathData="M81,108.2c0.9,-0.6 1.9,-1 2.9,-1.3c1,-0.3 2.1,-0.4 3.2,-0.5c1.1,0 2.1,0 3.2,0.2c1,0.2 2.1,0.5 3,0.9c0.3,0.1 0.4,0.4 0.2,0.7c-0.1,0.2 -0.3,0.3 -0.6,0.3l0,0c-1,-0.2 -1.9,-0.4 -2.9,-0.5c-1,-0.1 -1.9,-0.1 -2.9,-0.1c-1,0 -1.9,0.1 -2.9,0.3c-0.9,0.2 -1.9,0.5 -2.7,0.9l0,0c-0.3,0.1 -0.5,0 -0.7,-0.2C80.7,108.6 80.8,108.3 81,108.2z"/>
-    <path android:fillColor="#86A6BD" android:pathData="M87.2,47.7c-2.6,0 -4.7,-1.9 -4.9,-4.4l-0.1,-1.1c-0.1,-0.9 0.2,-1.8 0.9,-2.5c0.7,-0.7 1.6,-1.1 2.6,-1.1l3.5,0.1c1.1,0 2.2,0.5 3,1.3c0.7,0.8 1.1,1.8 1.1,2.8c-0.1,2.6 -2.3,4.7 -5.1,4.8l0,0L87.2,47.7C87.2,47.7 87.2,47.7 87.2,47.7zM88.1,47.1L88.1,47.1L88.1,47.1zM85.6,39.8c-0.6,0 -1.3,0.3 -1.7,0.7c-0.4,0.4 -0.6,1 -0.6,1.6l0.1,1.1c0.1,1.9 1.8,3.3 3.8,3.3c0,0 0,0 0.1,0l0.9,0c2.2,0 3.9,-1.6 4,-3.7c0,-0.7 -0.2,-1.4 -0.8,-2c-0.6,-0.6 -1.3,-0.9 -2.2,-1L85.6,39.8C85.6,39.8 85.6,39.8 85.6,39.8z"/>
-    <path android:fillColor="#86A6BD" android:pathData="M103.2,48.3c-0.1,0 -0.3,0 -0.4,0l-0.9,-0.1l0,0c-2.8,-0.2 -4.8,-2.5 -4.7,-5.1c0.1,-2.2 2,-3.9 4.3,-3.9l3.5,0.1c1,0 1.9,0.5 2.6,1.2c0.6,0.7 0.8,1.6 0.7,2.5l-0.2,1.1C107.8,46.5 105.7,48.3 103.2,48.3zM102.1,47l0.9,0.1c2,0.2 3.8,-1.2 4.1,-3.1l0.2,-1.1c0.1,-0.6 -0.1,-1.2 -0.5,-1.6c-0.4,-0.5 -1,-0.8 -1.7,-0.8l-3.5,-0.1c-1.7,-0.1 -3.1,1.2 -3.2,2.8C98.3,45.1 99.9,46.9 102.1,47L102.1,47z"/>
-    <path android:fillColor="#86A6BD" android:pathData="M97.9,41.9C97.9,41.9 97.9,41.9 97.9,41.9l-5.4,-0.2c-0.3,0 -0.6,-0.3 -0.5,-0.6c0,-0.3 0.3,-0.5 0.6,-0.5l5.4,0.2c0.3,0 0.6,0.3 0.5,0.6C98.4,41.7 98.2,41.9 97.9,41.9z"/>
-    <path android:fillColor="#004F81" android:pathData="M52.2,121.7c0.4,1.2 0.2,2.4 0.2,3.5l0,3.5c0,2.4 0,4.7 -0.1,7.1c-0.1,2.4 -0.2,4.7 -0.3,7.1c-0.1,2.4 -0.2,4.7 -0.8,7.1c0,0.1 -0.2,0.2 -0.3,0.2c-0.1,0 -0.2,-0.1 -0.2,-0.2c-0.3,-2.4 -0.3,-4.7 -0.2,-7.1l0.1,-7.1l0.2,-7.1l0.1,-3.5c0.1,-1.2 -0.1,-2.4 0.3,-3.5c0.1,-0.3 0.4,-0.4 0.6,-0.4C52,121.4 52.1,121.5 52.2,121.7z"/>
-    <path android:fillColor="#004F81" android:pathData="M62.5,134.8c0.2,0.2 0.4,0.4 0.6,0.6c0.2,0.2 0.3,0.4 0.5,0.7c0.2,0.2 0.3,0.5 0.4,0.7c0.1,0.3 0.2,0.5 0.2,0.8c0,0.3 -0.2,0.6 -0.5,0.6c-0.1,0 -0.3,0 -0.4,-0.1c-0.2,-0.2 -0.4,-0.4 -0.6,-0.6c-0.2,-0.2 -0.3,-0.4 -0.5,-0.7c-0.1,-0.2 -0.3,-0.5 -0.4,-0.7c-0.1,-0.3 -0.2,-0.5 -0.3,-0.8c-0.1,-0.3 0.1,-0.6 0.4,-0.6C62.2,134.7 62.4,134.7 62.5,134.8z"/>
-    <path android:fillColor="#004F81" android:pathData="M102.2,59.5l0.1,2.9l0,1.5c0,0.5 0,1 0.1,1.4c0.2,1.6 1.4,3.1 2.9,3.7c0.2,0.1 0.4,0.1 0.6,0.2l0.3,0.1l0.4,0.1c0.5,0.1 1,0.2 1.5,0.3c1,0.2 1.9,0.4 2.9,0.7c1.9,0.5 3.8,1.2 5.6,1.9c3.7,1.5 7.2,3.5 10.3,5.9c3.1,2.5 5.9,5.4 8.1,8.7c0.2,0.3 0.1,0.7 -0.2,0.9c-0.3,0.2 -0.7,0.1 -0.9,-0.1c-2.4,-3 -5.1,-5.7 -8.1,-8c-3,-2.3 -6.4,-4.1 -9.9,-5.6c-1.8,-0.7 -3.6,-1.4 -5.4,-1.9c-0.9,-0.3 -1.8,-0.5 -2.8,-0.7l-1.4,-0.3l-0.4,-0.1l-0.4,-0.1c-0.3,-0.1 -0.5,-0.2 -0.8,-0.3c-2.1,-0.9 -3.6,-2.9 -3.8,-5.2c0,-0.3 0,-0.6 0,-0.8l0,-0.7l0,-1.5l0.1,-2.9c0,-0.4 0.3,-0.7 0.7,-0.6C101.9,58.9 102.2,59.2 102.2,59.5z"/>
-    <path android:fillColor="#74DCFC" android:pathData="M50.8,42.7l-45.5,0l-0.1,-28.9l45.5,0z"/>
-    <path android:fillColor="#004F81" android:pathData="M51.1,42.9l-0.1,0l-11.2,0.3l-11.4,0.3l-11.5,0.2L5.3,43.8c-0.6,0 -1,-0.4 -1,-1l0,0c-0.1,-9.7 -0.2,-19.3 -0.2,-29l0,0c0,-0.6 0.5,-1.1 1.1,-1.1l0,0L28,12.7l11.4,0l11.4,0.1l0,0c0.5,0 0.9,0.4 0.9,0.9C51.5,23.6 51.2,33.4 51.1,42.9zM50.5,42.6l0,-0.1c-0.2,-9.7 -0.6,-19.2 -0.7,-28.7l0.9,0.9l-11.4,0.1l-11.4,0L5.2,14.9l1.1,-1.1c0,9.7 0,19.3 0,29l-1,-1c3.7,0 7.5,0.1 11.2,0.1L27.8,42L50.5,42.6z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M7,16.6l20.5,12.4l21.6,-13.2"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M7.1,16.4c3.7,1.5 7.2,3.5 10.7,5.5c1.7,1 3.5,2 5.2,3c1.7,1 3.4,2.1 5.1,3.1l-1.1,0c3.6,-2.2 7.2,-4.4 10.9,-6.5c1.8,-1.1 3.7,-2.1 5.5,-3.1c1.8,-1 3.7,-2 5.6,-3c0.2,-0.1 0.4,0 0.5,0.2c0.1,0.2 0,0.4 -0.1,0.5c-1.7,1.2 -3.5,2.4 -5.2,3.6c-1.8,1.2 -3.5,2.3 -5.3,3.5c-3.6,2.3 -7.2,4.5 -10.7,6.7c-0.3,0.2 -0.8,0.2 -1.1,0l0,0c-1.7,-1 -3.5,-2 -5.1,-3.1c-1.7,-1 -3.4,-2.1 -5.1,-3.2c-3.4,-2.1 -6.7,-4.3 -9.8,-6.9c-0.1,-0.1 -0.1,-0.2 0,-0.3C6.9,16.4 7,16.4 7.1,16.4z"/>
-    <path android:fillColor="#74DCFC" android:pathData="M7,16.6l20.5,12.4l21.6,-13.2"/>
-    <path android:fillColor="#004F81" android:pathData="M7.1,16.4c3.7,1.5 7.2,3.5 10.7,5.5c1.7,1 3.5,2 5.2,3c1.7,1 3.4,2.1 5.1,3.1l-1.1,0c3.6,-2.2 7.2,-4.4 10.9,-6.5c1.8,-1.1 3.7,-2.1 5.5,-3.1c1.8,-1 3.7,-2 5.6,-3c0.2,-0.1 0.4,0 0.5,0.2c0.1,0.2 0,0.4 -0.1,0.5c-1.7,1.2 -3.5,2.4 -5.2,3.6c-1.8,1.2 -3.5,2.3 -5.3,3.5c-3.6,2.3 -7.2,4.5 -10.7,6.7c-0.3,0.2 -0.8,0.2 -1.1,0l0,0c-1.7,-1 -3.5,-2 -5.1,-3.1c-1.7,-1 -3.4,-2.1 -5.1,-3.2c-3.4,-2.1 -6.7,-4.3 -9.8,-6.9c-0.1,-0.1 -0.1,-0.2 0,-0.3C6.9,16.4 7,16.4 7.1,16.4z"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,73.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,64.3m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,54.6m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,73.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,83.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M37.5,83.9m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,64.3m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#C8D7E2" android:pathData="M27.5,54.6m-1.9,0a1.9,1.9 0,1 1,3.8 0a1.9,1.9 0,1 1,-3.8 0"/>
-    <path android:fillColor="#44D0A3" android:pathData="M50.5,14.3m-8.5,0a8.5,8.5 0,1 1,17 0a8.5,8.5 0,1 1,-17 0"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M50.5,5.7c4.7,0 8.5,3.8 8.5,8.5s-3.8,8.5 -8.5,8.5c-4.7,0 -8.5,-3.8 -8.5,-8.5S45.8,5.7 50.5,5.7M50.5,4.2c-5.5,0 -10,4.5 -10,10s4.5,10 10,10s10,-4.5 10,-10S56,4.2 50.5,4.2L50.5,4.2z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M49.4,17.8c0,-0.3 0.1,-0.6 0.3,-0.7s0.4,-0.3 0.8,-0.3c0.3,0 0.6,0.1 0.8,0.3s0.3,0.4 0.3,0.7c0,0.3 -0.1,0.6 -0.3,0.7s-0.4,0.3 -0.8,0.3c-0.3,0 -0.6,-0.1 -0.8,-0.3S49.4,18.1 49.4,17.8zM51.1,15.8h-1.4l-0.3,-5.7h2L51.1,15.8z"/>
-</vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/drawable/login_site_address_help.xml b/libs/login/WordPressLoginFlow/src/main/res/drawable/login_site_address_help.xml
index 2878526e35af..b6344100c4d6 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/drawable/login_site_address_help.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/drawable/login_site_address_help.xml
@@ -1,39 +1,113 @@
-<vector android:height="24dp" android:viewportHeight="262.0"
-    android:viewportWidth="280.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#E9EFF3" android:pathData="M2,43.8h276v217h-276z"/>
-    <path android:fillColor="#A8BECE" android:pathData="M2,45.2V21C2,10.1 10.9,1.2 21.8,1.2h236.4C269.1,1.2 278,10 278,21v24.2"/>
-    <path android:fillColor="#87A6BC" android:pathData="M0.5,45c23.2,-0.8 46.5,-0.8 69.8,-0.8l69.8,-0.1l69.8,0.1c23.2,0 46.5,0 69.8,0.8c0.1,0 0.2,0.1 0.2,0.3c0,0.1 -0.1,0.2 -0.2,0.2c-23.2,0.8 -46.5,0.8 -69.8,0.8L140,46.4l-69.8,-0.1c-23.2,0 -46.5,0 -69.8,-0.8c-0.1,0 -0.2,-0.1 -0.2,-0.3C0.3,45.1 0.4,45 0.5,45z"/>
-    <path android:fillColor="#87A6BC" android:pathData="M113.5,23.7c2,-0.8 4.1,-1.2 6.1,-1.4c2,-0.2 4.1,-0.2 6.1,-0.3c4.1,-0.1 8.2,-0.2 12.2,-0.2c4.1,0 8.2,0.1 12.2,0.2c2,0.1 4.1,0.1 6.1,0.3c2,0.2 4.1,0.6 6.1,1.4c0.3,0.1 0.4,0.4 0.3,0.7c-0.1,0.1 -0.2,0.2 -0.3,0.3c-2,0.8 -4.1,1.2 -6.1,1.4c-2,0.2 -4.1,0.2 -6.1,0.3c-4.1,0.1 -8.2,0.2 -12.2,0.2c-4.1,0 -8.2,-0.1 -12.2,-0.2c-2,-0.1 -4.1,-0.1 -6.1,-0.3c-2,-0.2 -4.1,-0.6 -6.1,-1.4c-0.3,-0.1 -0.4,-0.4 -0.3,-0.7C113.2,23.9 113.4,23.8 113.5,23.7z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M11,99.2h258v152h-258z"/>
-    <path android:fillAlpha="0.26" android:fillColor="#86A6BD"
-        android:pathData="M228.6,230.8h-84v-63.7h106.9v40.8C251.5,220.6 241.2,230.8 228.6,230.8z" android:strokeAlpha="0.26"/>
-    <path android:fillColor="#C8D7E1" android:pathData="M107.6,230.8H30.3V120.2h95.3v92.6C125.6,222.8 117.5,230.8 107.6,230.8z"/>
-    <path android:fillColor="#A8BECE" android:pathData="M125.6,212.8v-5.9c-4.8,-11.2 -13.2,-17.4 -24.3,-20.5c-19.9,-5.5 -52.7,6.2 -71.1,-34.8v79.3h77.2C117.5,230.8 125.6,222.8 125.6,212.8z"/>
-    <path android:fillAlpha="0.26" android:fillColor="#86A6BD"
-        android:pathData="M144.6,120.2h106.9v29h-106.9z" android:strokeAlpha="0.26"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M98.7,149.3m-11.7,0a11.7,11.7 0,1 1,23.4 0a11.7,11.7 0,1 1,-23.4 0"/>
-    <path android:fillColor="#00AADC" android:pathData="M12.5,56.8h257v33h-257z"/>
-    <path android:fillColor="#0087BE" android:pathData="M269.7,89.9c-21.2,0.2 -42.5,0.4 -63.9,0.5l-64.4,0.2L12.5,90.9c-0.6,0 -1.1,-0.5 -1.1,-1.1l0,0v-33c0,-0.6 0.5,-1.2 1.2,-1.2l0,0L141,55.7l64.2,0.1c21.4,0.1 42.8,0.1 64.3,0.3l0,0c0.4,0 0.7,0.3 0.6,0.7c0,5.6 -0.1,11.2 -0.2,16.7L269.7,89.9zM269.3,89.6L269,73.1c-0.1,-5.5 -0.2,-10.9 -0.2,-16.3l0.7,0.7c-21.4,0.2 -42.8,0.3 -64.3,0.3H141L12.5,57.9l1.2,-1.2v33l-1.1,-1.1l128.1,0.2l64.1,0.2C226.2,89.1 247.7,89.3 269.3,89.6z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M47.9,71.2c1.4,0 2.6,0.7 2.7,2.6c0,0.5 0,1 -0.1,1.3h-4c0.1,1.1 0.8,1.6 1.8,1.6c0.5,0 1.4,-0.2 1.7,-0.3l0.3,1c-0.4,0.4 -1.4,0.7 -2.5,0.7c-2,0 -3.2,-1.3 -3.2,-3.5C44.8,72.7 45.9,71.3 47.9,71.2zM48.9,74.1c0.1,-1 -0.2,-1.6 -1,-1.6c-0.7,0 -1.1,0.4 -1.3,1.6H48.9z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M53.7,74.6l-2.3,-3.3h2.1l1.1,1.7l0.2,0.4L55,73l1.1,-1.7h2.1l-2.4,3.3l2.4,3.4h-2.1l-1.2,-1.9l-0.2,-0.3l-0.2,0.3l-1,1.9h-2.1L53.7,74.6z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M60.1,74.3c0.7,-0.3 1.8,-0.4 2.7,-0.4v-0.4c0,-0.7 -0.2,-0.9 -1.3,-0.9c-0.4,0 -1.3,0.2 -1.8,0.5l-0.4,-1.2c0.4,-0.3 1.6,-0.7 2.7,-0.7c1.9,0 2.7,0.5 2.7,2.4v4.5h-1.1c-0.4,0 -0.7,0 -0.7,-0.6l0,0c-0.4,0.3 -0.9,0.7 -1.7,0.7c-1.3,0 -2.2,-0.9 -2.2,-2.2C58.9,75.1 59.4,74.6 60.1,74.3zM61.7,76.9c0.4,0 0.9,-0.2 1,-0.4v-1.6c-0.4,0 -1.1,0.1 -1.4,0.2c-0.3,0.1 -0.6,0.3 -0.6,0.8C60.8,76.6 61.2,76.9 61.7,76.9z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M66.5,71.3h1.7V72c0.5,-0.3 1.4,-0.8 2.2,-0.8s1.4,0.2 1.7,0.8c0.4,-0.3 1.3,-0.8 2.3,-0.8c1.4,0 2.2,0.6 2.2,2.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.4c-0.5,0 -1,0.2 -1.3,0.5c0,0.2 0,0.4 0,0.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.5c-0.3,0 -0.9,0.2 -1.3,0.5V78h-1.8L66.5,71.3L66.5,71.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M80.3,78.8V81h-1.8v-9.6h1.7V72c0.3,-0.3 0.9,-0.8 1.9,-0.8c1.4,0 2.7,1 2.7,3.2s-1.4,3.7 -3.4,3.7c-0.5,0 -0.8,-0.1 -1.1,-0.2L80.3,78.8zM81.3,76.8c0.9,0 1.5,-0.8 1.5,-2.2c0,-1.5 -0.5,-2 -1.3,-2c-0.5,0 -1,0.2 -1.3,0.4v3.5C80.5,76.8 80.9,76.8 81.3,76.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M86.4,68.3h1.8V78h-1.8V68.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M93,71.2c1.4,0 2.6,0.7 2.7,2.6c0,0.5 0,1 -0.1,1.3h-4c0.1,1.1 0.8,1.6 1.8,1.6c0.5,0 1.4,-0.2 1.7,-0.3l0.3,1C95,77.8 94,78.1 93,78.1c-2,0 -3.2,-1.3 -3.2,-3.5C89.8,72.7 91,71.3 93,71.2zM94,74.1c0.1,-1 -0.2,-1.6 -1,-1.6c-0.7,0 -1.1,0.4 -1.3,1.6H94z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M98.2,75.8c0.7,0 1.1,0.5 1.1,1.1c0,0.7 -0.5,1.2 -1.2,1.2c-0.6,0 -1.1,-0.5 -1.1,-1.1S97.5,75.8 98.2,75.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M100.1,71.3h1.8l0.8,3.2l0.3,1.6l0.3,-1.6l1,-3.2h1.7l1,3.2l0.3,1.6l0.3,-1.6l0.8,-3.2h1.8l-2.1,6.8h-1.6l-1.1,-3.6l-0.3,-1.3l-0.3,1.3l-1,3.6h-1.7L100.1,71.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M114.2,71.2c2.4,0 3.2,1.7 3.2,3.6c0,2.1 -1.4,3.3 -3.3,3.3c-2.4,0 -3.2,-1.7 -3.2,-3.6C110.9,72.4 112.3,71.2 114.2,71.2zM115.5,74.7c0,-1.1 -0.4,-2.2 -1.3,-2.2c-1,0 -1.4,0.7 -1.4,2c0,1.2 0.4,2.2 1.3,2.2C115.1,76.8 115.5,76.1 115.5,74.7z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M118.8,71.3h1.6l0.1,0.9c0.3,-0.5 1,-1 1.9,-1c0.2,0 0.4,0 0.5,0.1v1.8c-0.1,-0.1 -0.3,-0.2 -0.8,-0.2c-0.7,0 -1.2,0.3 -1.5,0.6V78h-1.8C118.8,78 118.8,71.3 118.8,71.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M127.3,71.2c0.5,0 0.8,0.1 1.1,0.2v-0.6v-2.6h1.8V78H129c-0.3,0 -0.4,0 -0.4,-0.3v-0.5c-0.3,0.3 -0.9,0.8 -2,0.8c-1.4,0 -2.7,-1 -2.7,-3.2C123.9,72.7 125.3,71.2 127.3,71.2zM128.4,76.3v-3.6c-0.2,-0.2 -0.6,-0.2 -1,-0.2c-0.9,0 -1.5,0.7 -1.5,2.2s0.5,1.9 1.3,1.9C127.6,76.7 128.1,76.5 128.4,76.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M134,78.8V81h-1.8v-9.6h1.7V72c0.3,-0.3 0.9,-0.8 1.9,-0.8c1.4,0 2.7,1 2.7,3.2s-1.4,3.7 -3.4,3.7c-0.5,0 -0.8,-0.1 -1.1,-0.2L134,78.8zM135,76.8c0.9,0 1.5,-0.8 1.5,-2.2c0,-1.5 -0.5,-2 -1.3,-2c-0.5,0 -1,0.2 -1.3,0.4v3.5C134.2,76.8 134.6,76.8 135,76.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M140,71.3h1.6l0.1,0.9c0.3,-0.5 1,-1 1.9,-1c0.2,0 0.4,0 0.5,0.1v1.8c-0.1,-0.1 -0.3,-0.2 -0.8,-0.2c-0.7,0 -1.2,0.3 -1.5,0.6V78H140V71.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M148.2,71.2c1.4,0 2.6,0.7 2.7,2.6c0,0.5 0,1 -0.1,1.3h-4c0.1,1.1 0.8,1.6 1.8,1.6c0.5,0 1.4,-0.2 1.7,-0.3l0.3,1c-0.4,0.4 -1.4,0.7 -2.5,0.7c-2,0 -3.2,-1.3 -3.2,-3.5C145,72.7 146.2,71.3 148.2,71.2zM149.2,74.1c0.1,-1 -0.2,-1.6 -1,-1.6c-0.7,0 -1.1,0.4 -1.3,1.6H149.2z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M152.3,76.2c0.2,0.2 1.1,0.5 1.9,0.5c0.7,0 1,-0.1 1,-0.6c0,-0.4 -0.5,-0.7 -1.4,-1c-1.2,-0.4 -1.7,-1.1 -1.7,-2.1c0,-1.3 1.1,-1.9 2.7,-1.9c0.9,0 1.6,0.2 1.9,0.4l-0.2,1.4c-0.3,-0.2 -0.9,-0.5 -1.5,-0.5c-0.8,0 -1.1,0.2 -1.1,0.5c0,0.4 0.3,0.6 1.3,0.9c1.4,0.5 1.9,1 1.9,2c0,1.4 -1,2.1 -2.6,2.1c-1,0 -2,-0.3 -2.3,-0.5L152.3,76.2z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M158.4,76.2c0.2,0.2 1.1,0.5 1.9,0.5c0.7,0 1,-0.1 1,-0.6c0,-0.4 -0.5,-0.7 -1.4,-1c-1.2,-0.4 -1.7,-1.1 -1.7,-2.1c0,-1.3 1.1,-1.9 2.7,-1.9c0.9,0 1.6,0.2 1.9,0.4l-0.2,1.4c-0.3,-0.2 -0.9,-0.5 -1.5,-0.5c-0.8,0 -1.1,0.2 -1.1,0.5c0,0.4 0.3,0.6 1.3,0.9c1.4,0.5 1.9,1 1.9,2c0,1.4 -1,2.1 -2.6,2.1c-1,0 -2,-0.3 -2.3,-0.5L158.4,76.2z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M165.7,75.8c0.7,0 1.1,0.5 1.1,1.1c0,0.7 -0.5,1.2 -1.2,1.2c-0.6,0 -1.1,-0.5 -1.1,-1.1S165,75.8 165.7,75.8z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M171.4,71.2c0.8,0 1.5,0.2 1.7,0.3l-0.2,1.4c-0.3,-0.2 -0.7,-0.3 -1.3,-0.3c-0.8,0 -1.7,0.5 -1.7,1.8c0,1.4 0.7,2.1 1.6,2.1c0.6,0 1.2,-0.1 1.5,-0.3l0.3,1.1c-0.4,0.4 -1.2,0.7 -2.1,0.7c-2.1,0 -3.1,-1.4 -3.1,-3.4C168,72.8 169.1,71.2 171.4,71.2z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M177.5,71.2c2.4,0 3.2,1.7 3.2,3.6c0,2.1 -1.4,3.3 -3.3,3.3c-2.4,0 -3.2,-1.7 -3.2,-3.6C174.2,72.4 175.6,71.2 177.5,71.2zM178.8,74.7c0,-1.1 -0.4,-2.2 -1.3,-2.2c-1,0 -1.4,0.7 -1.4,2c0,1.2 0.4,2.2 1.3,2.2C178.4,76.8 178.8,76.1 178.8,74.7z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M182.3,71.3h1.7V72c0.5,-0.3 1.4,-0.8 2.2,-0.8s1.4,0.2 1.7,0.8c0.4,-0.3 1.3,-0.8 2.3,-0.8c1.4,0 2.2,0.6 2.2,2.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.4c-0.5,0 -1,0.2 -1.3,0.5c0,0.2 0,0.4 0,0.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.5c-0.3,0 -0.9,0.2 -1.3,0.5V78h-1.8L182.3,71.3L182.3,71.3z"/>
-    <path android:fillColor="#FFFFFF" android:pathData="M33.3,70.6h-0.8v-0.8c0,-2.1 -1.7,-3.8 -3.8,-3.8s-3.8,1.7 -3.8,3.8v0.8h-0.8c-0.8,0 -1.5,0.7 -1.5,1.5v7.5c0,0.8 0.7,1.5 1.5,1.5h9c0.8,0 1.5,-0.7 1.5,-1.5v-7.5C34.8,71.3 34.1,70.6 33.3,70.6zM26.6,69.8c0,-1.2 1,-2.2 2.2,-2.2s2.2,1 2.2,2.2v0.8h-4.5L26.6,69.8L26.6,69.8zM29.6,76.4v1.7h-1.5v-1.7c-0.4,-0.3 -0.8,-0.7 -0.8,-1.3c0,-0.8 0.7,-1.5 1.5,-1.5s1.5,0.7 1.5,1.5C30.3,75.6 30,76.1 29.6,76.4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="262dp"
+    android:height="280dp"
+    android:viewportHeight="262.0"
+    android:viewportWidth="280.0">
+    <path
+        android:fillColor="#E9EFF3"
+        android:pathData="M2,43.8h276v217h-276z" />
+    <path
+        android:fillColor="#A8BECE"
+        android:pathData="M2,45.2V21C2,10.1 10.9,1.2 21.8,1.2h236.4C269.1,1.2 278,10 278,21v24.2" />
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M0.5,45c23.2,-0.8 46.5,-0.8 69.8,-0.8l69.8,-0.1l69.8,0.1c23.2,0 46.5,0 69.8,0.8c0.1,0 0.2,0.1 0.2,0.3c0,0.1 -0.1,0.2 -0.2,0.2c-23.2,0.8 -46.5,0.8 -69.8,0.8L140,46.4l-69.8,-0.1c-23.2,0 -46.5,0 -69.8,-0.8c-0.1,0 -0.2,-0.1 -0.2,-0.3C0.3,45.1 0.4,45 0.5,45z" />
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M113.5,23.7c2,-0.8 4.1,-1.2 6.1,-1.4c2,-0.2 4.1,-0.2 6.1,-0.3c4.1,-0.1 8.2,-0.2 12.2,-0.2c4.1,0 8.2,0.1 12.2,0.2c2,0.1 4.1,0.1 6.1,0.3c2,0.2 4.1,0.6 6.1,1.4c0.3,0.1 0.4,0.4 0.3,0.7c-0.1,0.1 -0.2,0.2 -0.3,0.3c-2,0.8 -4.1,1.2 -6.1,1.4c-2,0.2 -4.1,0.2 -6.1,0.3c-4.1,0.1 -8.2,0.2 -12.2,0.2c-4.1,0 -8.2,-0.1 -12.2,-0.2c-2,-0.1 -4.1,-0.1 -6.1,-0.3c-2,-0.2 -4.1,-0.6 -6.1,-1.4c-0.3,-0.1 -0.4,-0.4 -0.3,-0.7C113.2,23.9 113.4,23.8 113.5,23.7z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M11,99.2h258v152h-258z" />
+    <path
+        android:fillAlpha="0.26"
+        android:fillColor="#86A6BD"
+        android:pathData="M228.6,230.8h-84v-63.7h106.9v40.8C251.5,220.6 241.2,230.8 228.6,230.8z"
+        android:strokeAlpha="0.26" />
+    <path
+        android:fillColor="#C8D7E1"
+        android:pathData="M107.6,230.8H30.3V120.2h95.3v92.6C125.6,222.8 117.5,230.8 107.6,230.8z" />
+    <path
+        android:fillColor="#A8BECE"
+        android:pathData="M125.6,212.8v-5.9c-4.8,-11.2 -13.2,-17.4 -24.3,-20.5c-19.9,-5.5 -52.7,6.2 -71.1,-34.8v79.3h77.2C117.5,230.8 125.6,222.8 125.6,212.8z" />
+    <path
+        android:fillAlpha="0.26"
+        android:fillColor="#86A6BD"
+        android:pathData="M144.6,120.2h106.9v29h-106.9z"
+        android:strokeAlpha="0.26" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M98.7,149.3m-11.7,0a11.7,11.7 0,1 1,23.4 0a11.7,11.7 0,1 1,-23.4 0" />
+    <path
+        android:fillColor="#00AADC"
+        android:pathData="M12.5,56.8h257v33h-257z" />
+    <path
+        android:fillColor="#0087BE"
+        android:pathData="M269.7,89.9c-21.2,0.2 -42.5,0.4 -63.9,0.5l-64.4,0.2L12.5,90.9c-0.6,0 -1.1,-0.5 -1.1,-1.1l0,0v-33c0,-0.6 0.5,-1.2 1.2,-1.2l0,0L141,55.7l64.2,0.1c21.4,0.1 42.8,0.1 64.3,0.3l0,0c0.4,0 0.7,0.3 0.6,0.7c0,5.6 -0.1,11.2 -0.2,16.7L269.7,89.9zM269.3,89.6L269,73.1c-0.1,-5.5 -0.2,-10.9 -0.2,-16.3l0.7,0.7c-21.4,0.2 -42.8,0.3 -64.3,0.3H141L12.5,57.9l1.2,-1.2v33l-1.1,-1.1l128.1,0.2l64.1,0.2C226.2,89.1 247.7,89.3 269.3,89.6z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M47.9,71.2c1.4,0 2.6,0.7 2.7,2.6c0,0.5 0,1 -0.1,1.3h-4c0.1,1.1 0.8,1.6 1.8,1.6c0.5,0 1.4,-0.2 1.7,-0.3l0.3,1c-0.4,0.4 -1.4,0.7 -2.5,0.7c-2,0 -3.2,-1.3 -3.2,-3.5C44.8,72.7 45.9,71.3 47.9,71.2zM48.9,74.1c0.1,-1 -0.2,-1.6 -1,-1.6c-0.7,0 -1.1,0.4 -1.3,1.6H48.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M53.7,74.6l-2.3,-3.3h2.1l1.1,1.7l0.2,0.4L55,73l1.1,-1.7h2.1l-2.4,3.3l2.4,3.4h-2.1l-1.2,-1.9l-0.2,-0.3l-0.2,0.3l-1,1.9h-2.1L53.7,74.6z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M60.1,74.3c0.7,-0.3 1.8,-0.4 2.7,-0.4v-0.4c0,-0.7 -0.2,-0.9 -1.3,-0.9c-0.4,0 -1.3,0.2 -1.8,0.5l-0.4,-1.2c0.4,-0.3 1.6,-0.7 2.7,-0.7c1.9,0 2.7,0.5 2.7,2.4v4.5h-1.1c-0.4,0 -0.7,0 -0.7,-0.6l0,0c-0.4,0.3 -0.9,0.7 -1.7,0.7c-1.3,0 -2.2,-0.9 -2.2,-2.2C58.9,75.1 59.4,74.6 60.1,74.3zM61.7,76.9c0.4,0 0.9,-0.2 1,-0.4v-1.6c-0.4,0 -1.1,0.1 -1.4,0.2c-0.3,0.1 -0.6,0.3 -0.6,0.8C60.8,76.6 61.2,76.9 61.7,76.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M66.5,71.3h1.7V72c0.5,-0.3 1.4,-0.8 2.2,-0.8s1.4,0.2 1.7,0.8c0.4,-0.3 1.3,-0.8 2.3,-0.8c1.4,0 2.2,0.6 2.2,2.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.4c-0.5,0 -1,0.2 -1.3,0.5c0,0.2 0,0.4 0,0.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.5c-0.3,0 -0.9,0.2 -1.3,0.5V78h-1.8L66.5,71.3L66.5,71.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M80.3,78.8V81h-1.8v-9.6h1.7V72c0.3,-0.3 0.9,-0.8 1.9,-0.8c1.4,0 2.7,1 2.7,3.2s-1.4,3.7 -3.4,3.7c-0.5,0 -0.8,-0.1 -1.1,-0.2L80.3,78.8zM81.3,76.8c0.9,0 1.5,-0.8 1.5,-2.2c0,-1.5 -0.5,-2 -1.3,-2c-0.5,0 -1,0.2 -1.3,0.4v3.5C80.5,76.8 80.9,76.8 81.3,76.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M86.4,68.3h1.8V78h-1.8V68.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M93,71.2c1.4,0 2.6,0.7 2.7,2.6c0,0.5 0,1 -0.1,1.3h-4c0.1,1.1 0.8,1.6 1.8,1.6c0.5,0 1.4,-0.2 1.7,-0.3l0.3,1C95,77.8 94,78.1 93,78.1c-2,0 -3.2,-1.3 -3.2,-3.5C89.8,72.7 91,71.3 93,71.2zM94,74.1c0.1,-1 -0.2,-1.6 -1,-1.6c-0.7,0 -1.1,0.4 -1.3,1.6H94z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M98.2,75.8c0.7,0 1.1,0.5 1.1,1.1c0,0.7 -0.5,1.2 -1.2,1.2c-0.6,0 -1.1,-0.5 -1.1,-1.1S97.5,75.8 98.2,75.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M100.1,71.3h1.8l0.8,3.2l0.3,1.6l0.3,-1.6l1,-3.2h1.7l1,3.2l0.3,1.6l0.3,-1.6l0.8,-3.2h1.8l-2.1,6.8h-1.6l-1.1,-3.6l-0.3,-1.3l-0.3,1.3l-1,3.6h-1.7L100.1,71.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M114.2,71.2c2.4,0 3.2,1.7 3.2,3.6c0,2.1 -1.4,3.3 -3.3,3.3c-2.4,0 -3.2,-1.7 -3.2,-3.6C110.9,72.4 112.3,71.2 114.2,71.2zM115.5,74.7c0,-1.1 -0.4,-2.2 -1.3,-2.2c-1,0 -1.4,0.7 -1.4,2c0,1.2 0.4,2.2 1.3,2.2C115.1,76.8 115.5,76.1 115.5,74.7z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M118.8,71.3h1.6l0.1,0.9c0.3,-0.5 1,-1 1.9,-1c0.2,0 0.4,0 0.5,0.1v1.8c-0.1,-0.1 -0.3,-0.2 -0.8,-0.2c-0.7,0 -1.2,0.3 -1.5,0.6V78h-1.8C118.8,78 118.8,71.3 118.8,71.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M127.3,71.2c0.5,0 0.8,0.1 1.1,0.2v-0.6v-2.6h1.8V78H129c-0.3,0 -0.4,0 -0.4,-0.3v-0.5c-0.3,0.3 -0.9,0.8 -2,0.8c-1.4,0 -2.7,-1 -2.7,-3.2C123.9,72.7 125.3,71.2 127.3,71.2zM128.4,76.3v-3.6c-0.2,-0.2 -0.6,-0.2 -1,-0.2c-0.9,0 -1.5,0.7 -1.5,2.2s0.5,1.9 1.3,1.9C127.6,76.7 128.1,76.5 128.4,76.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M134,78.8V81h-1.8v-9.6h1.7V72c0.3,-0.3 0.9,-0.8 1.9,-0.8c1.4,0 2.7,1 2.7,3.2s-1.4,3.7 -3.4,3.7c-0.5,0 -0.8,-0.1 -1.1,-0.2L134,78.8zM135,76.8c0.9,0 1.5,-0.8 1.5,-2.2c0,-1.5 -0.5,-2 -1.3,-2c-0.5,0 -1,0.2 -1.3,0.4v3.5C134.2,76.8 134.6,76.8 135,76.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M140,71.3h1.6l0.1,0.9c0.3,-0.5 1,-1 1.9,-1c0.2,0 0.4,0 0.5,0.1v1.8c-0.1,-0.1 -0.3,-0.2 -0.8,-0.2c-0.7,0 -1.2,0.3 -1.5,0.6V78H140V71.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M148.2,71.2c1.4,0 2.6,0.7 2.7,2.6c0,0.5 0,1 -0.1,1.3h-4c0.1,1.1 0.8,1.6 1.8,1.6c0.5,0 1.4,-0.2 1.7,-0.3l0.3,1c-0.4,0.4 -1.4,0.7 -2.5,0.7c-2,0 -3.2,-1.3 -3.2,-3.5C145,72.7 146.2,71.3 148.2,71.2zM149.2,74.1c0.1,-1 -0.2,-1.6 -1,-1.6c-0.7,0 -1.1,0.4 -1.3,1.6H149.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M152.3,76.2c0.2,0.2 1.1,0.5 1.9,0.5c0.7,0 1,-0.1 1,-0.6c0,-0.4 -0.5,-0.7 -1.4,-1c-1.2,-0.4 -1.7,-1.1 -1.7,-2.1c0,-1.3 1.1,-1.9 2.7,-1.9c0.9,0 1.6,0.2 1.9,0.4l-0.2,1.4c-0.3,-0.2 -0.9,-0.5 -1.5,-0.5c-0.8,0 -1.1,0.2 -1.1,0.5c0,0.4 0.3,0.6 1.3,0.9c1.4,0.5 1.9,1 1.9,2c0,1.4 -1,2.1 -2.6,2.1c-1,0 -2,-0.3 -2.3,-0.5L152.3,76.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M158.4,76.2c0.2,0.2 1.1,0.5 1.9,0.5c0.7,0 1,-0.1 1,-0.6c0,-0.4 -0.5,-0.7 -1.4,-1c-1.2,-0.4 -1.7,-1.1 -1.7,-2.1c0,-1.3 1.1,-1.9 2.7,-1.9c0.9,0 1.6,0.2 1.9,0.4l-0.2,1.4c-0.3,-0.2 -0.9,-0.5 -1.5,-0.5c-0.8,0 -1.1,0.2 -1.1,0.5c0,0.4 0.3,0.6 1.3,0.9c1.4,0.5 1.9,1 1.9,2c0,1.4 -1,2.1 -2.6,2.1c-1,0 -2,-0.3 -2.3,-0.5L158.4,76.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M165.7,75.8c0.7,0 1.1,0.5 1.1,1.1c0,0.7 -0.5,1.2 -1.2,1.2c-0.6,0 -1.1,-0.5 -1.1,-1.1S165,75.8 165.7,75.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M171.4,71.2c0.8,0 1.5,0.2 1.7,0.3l-0.2,1.4c-0.3,-0.2 -0.7,-0.3 -1.3,-0.3c-0.8,0 -1.7,0.5 -1.7,1.8c0,1.4 0.7,2.1 1.6,2.1c0.6,0 1.2,-0.1 1.5,-0.3l0.3,1.1c-0.4,0.4 -1.2,0.7 -2.1,0.7c-2.1,0 -3.1,-1.4 -3.1,-3.4C168,72.8 169.1,71.2 171.4,71.2z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M177.5,71.2c2.4,0 3.2,1.7 3.2,3.6c0,2.1 -1.4,3.3 -3.3,3.3c-2.4,0 -3.2,-1.7 -3.2,-3.6C174.2,72.4 175.6,71.2 177.5,71.2zM178.8,74.7c0,-1.1 -0.4,-2.2 -1.3,-2.2c-1,0 -1.4,0.7 -1.4,2c0,1.2 0.4,2.2 1.3,2.2C178.4,76.8 178.8,76.1 178.8,74.7z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M182.3,71.3h1.7V72c0.5,-0.3 1.4,-0.8 2.2,-0.8s1.4,0.2 1.7,0.8c0.4,-0.3 1.3,-0.8 2.3,-0.8c1.4,0 2.2,0.6 2.2,2.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.4c-0.5,0 -1,0.2 -1.3,0.5c0,0.2 0,0.4 0,0.6V78h-1.8v-3.8c0,-1.1 -0.2,-1.5 -1,-1.5c-0.3,0 -0.9,0.2 -1.3,0.5V78h-1.8L182.3,71.3L182.3,71.3z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M33.3,70.6h-0.8v-0.8c0,-2.1 -1.7,-3.8 -3.8,-3.8s-3.8,1.7 -3.8,3.8v0.8h-0.8c-0.8,0 -1.5,0.7 -1.5,1.5v7.5c0,0.8 0.7,1.5 1.5,1.5h9c0.8,0 1.5,-0.7 1.5,-1.5v-7.5C34.8,71.3 34.1,70.6 33.3,70.6zM26.6,69.8c0,-1.2 1,-2.2 2.2,-2.2s2.2,1 2.2,2.2v0.8h-4.5L26.6,69.8L26.6,69.8zM29.6,76.4v1.7h-1.5v-1.7c-0.4,-0.3 -0.8,-0.7 -0.8,-1.3c0,-0.8 0.7,-1.5 1.5,-1.5s1.5,0.7 1.5,1.5C30.3,75.6 30,76.1 29.6,76.4z" />
+
 </vector>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout-land/signup_bottom_sheet_dialog.xml b/libs/login/WordPressLoginFlow/src/main/res/layout-land/signup_bottom_sheet_dialog.xml
deleted file mode 100644
index f528b5447ef1..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/layout-land/signup_bottom_sheet_dialog.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true"
-    android:paddingLeft="@dimen/margin_extra_large"
-    android:paddingTop="@dimen/margin_medium"
-    android:paddingRight="@dimen/margin_extra_large"
-    android:paddingBottom="@dimen/margin_extra_large">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/signup_tos"
-        style="@style/Widget.LoginFlow.Button.Tertiary.Small"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="@dimen/margin_extra_large"
-        android:text="@string/signup_terms_of_service_text" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_small"
-        android:layout_marginBottom="@dimen/margin_extra_small"
-        android:orientation="horizontal">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/signup_email"
-            style="@style/Widget.LoginFlow.Button.Secondary"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginEnd="@dimen/margin_medium"
-            android:layout_weight="1"
-            android:text="@string/signup_with_email_button" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/signup_google"
-            style="@style/Widget.LoginFlow.Button.Secondary"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginStart="@dimen/margin_medium"
-            android:layout_weight="1"
-            android:text="@string/signup_with_google_button" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_optional_site_creds_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_optional_site_creds_screen.xml
new file mode 100644
index 000000000000..9baf3b28ff43
--- /dev/null
+++ b/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_optional_site_creds_screen.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    android:paddingStart="@dimen/margin_extra_large"
+    android:paddingEnd="@dimen/margin_extra_large">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/label"
+            style="@style/Widget.LoginFlow.TextView.Label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/margin_extra_large"
+            android:gravity="start"
+            android:textAlignment="viewStart"
+            tools:text="@string/enter_email_wordpress_com"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/login_email_row"/>
+
+        <org.wordpress.android.login.widgets.WPLoginInputRow
+            android:id="@+id/login_email_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start"
+            android:hint="@string/email_address"
+            android:imeOptions="actionNext"
+            android:importantForAutofill="noExcludeDescendants"
+            android:inputType="textEmailAddress"
+            android:textAlignment="viewStart"
+            tools:ignore="UnusedAttribute"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/label"
+            app:layout_constraintBottom_toTopOf="@+id/login_find_connected_email"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/login_find_connected_email"
+            style="@style/Widget.LoginFlow.Button.Tertiary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingEnd="@dimen/margin_none"
+            android:paddingStart="@dimen/margin_none"
+            android:text="@string/login_find_your_connected_email"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/login_email_row"
+            app:layout_constraintHorizontal_bias="0.0"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/login_continue_button"
+            style="@style/Widget.LoginFlow.Button.Primary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/login_continue"
+            app:layout_constraintTop_toBottomOf="@+id/login_find_connected_email"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/login_site_creds"
+            app:layout_constraintVertical_bias="1.0"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/login_site_creds"
+            style="@style/Widget.LoginFlow.Button.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/continue_site_credentials"
+            app:icon="@drawable/ic_globe_grey_24dp"
+            app:iconGravity="textStart"
+            app:iconPadding="@dimen/margin_small_medium"
+            app:iconSize="14dp"
+            app:iconTint="@color/login_secondary_button_icon_tint_color"
+            app:iconTintMode="src_in"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen.xml
index 040074a6960a..ba182e221a8c 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen.xml
@@ -1,104 +1,141 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:fillViewport="true"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/label"
-        style="@style/Widget.LoginFlow.TextView.Label"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_extra_large"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        tools:text="@string/enter_email_wordpress_com" />
+        android:layout_height="wrap_content">
 
-    <!-- Even though this field only accepts email addresses, we also include "username" as an
-    autofill hint value to ensure that the default autofill service works well with it -->
-    <org.wordpress.android.login.widgets.WPLoginInputRow
-        android:id="@+id/login_email_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:autofillHints="emailAddress,username"
-        android:hint="@string/email_address"
-        android:imeOptions="actionNext"
-        android:importantForAutofill="yes"
-        android:inputType="textEmailAddress"
-        tools:ignore="UnusedAttribute" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/continue_tos"
-        style="@style/Widget.LoginFlow.Button.Tertiary.Small"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:text="@string/continue_terms_of_service_text" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/label"
+            style="@style/Widget.LoginFlow.TextView.Label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:text="@string/enter_email_wordpress_com" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/login_continue_button"
-        style="@style/Widget.LoginFlow.Button.Primary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:text="@string/login_continue" />
+        <!-- Even though this field only accepts email addresses, we also include "username" as an
+        autofill hint value to ensure that the default autofill service works well with it -->
+        <org.wordpress.android.login.widgets.WPLoginInputRow
+            android:id="@+id/login_email_row"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:layout_marginTop="@dimen/margin_extra_large"
+            android:autofillHints="emailAddress,username"
+            android:hint="@string/email_address"
+            android:imeOptions="actionNext"
+            android:importantForAutofill="yes"
+            android:inputType="textEmailAddress"
+            app:layout_constraintTop_toBottomOf="@+id/label"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:ignore="UnusedAttribute" />
 
-    <Space
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/continue_tos"
+            style="@style/Widget.LoginFlow.Button.Tertiary.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:text="@string/continue_terms_of_service_text"
+            app:layout_constraintTop_toBottomOf="@+id/login_email_row"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            tools:visibility="gone"/>
 
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_small_medium">
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/login_continue_button"
+            style="@style/Widget.LoginFlow.Button.Primary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:text="@string/login_continue"
+            app:layout_goneMarginTop="@dimen/margin_extra_large"
+            app:layout_constraintTop_toBottomOf="@+id/continue_tos"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
-        <View
+        <Space
+            android:id="@+id/spacer"
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_gravity="center_vertical"
-            android:alpha="0.12"
-            android:background="?attr/colorOnSurface" />
+            android:layout_height="0dp"
+            android:layout_weight="1"
+            app:layout_constraintTop_toBottomOf="@+id/login_continue_button"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
 
-        <TextView
-            style="@style/Widget.LoginFlow.TextView.DividerText"
-            android:layout_width="wrap_content"
+        <FrameLayout
+            android:id="@+id/orLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:paddingStart="@dimen/margin_small"
-            android:paddingEnd="@dimen/margin_small"
-            android:text="@string/login_or" />
+            android:layout_marginBottom="@dimen/margin_small_medium"
+            app:layout_constraintTop_toBottomOf="@+id/spacer"
+            app:layout_constraintBottom_toTopOf="@+id/continue_with_google"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintVertical_bias="1.0">
 
-    </FrameLayout>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_gravity="center_vertical"
+                android:alpha="0.12"
+                android:background="?attr/colorOnSurface" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/continue_with_google"
-        style="@style/Widget.LoginFlow.Button.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:text="@string/continue_google_button_suffix"
-        android:visibility="visible"
-        app:icon="@drawable/ic_google_60dp"
-        app:iconGravity="textStart"
-        app:iconPadding="@dimen/margin_small_medium"
-        app:iconSize="14dp"
-        app:iconTint="@null" />
+            <TextView
+                style="@style/Widget.LoginFlow.TextView.DividerText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:paddingStart="@dimen/margin_small"
+                android:paddingEnd="@dimen/margin_small"
+                android:text="@string/login_or" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/continue_with_google_tos"
-        style="@style/Widget.LoginFlow.Button.Tertiary.Small"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/margin_extra_large"
-        android:layout_marginEnd="@dimen/margin_extra_large"
-        android:text="@string/continue_with_google_terms_of_service_text" />
+        </FrameLayout>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/continue_with_google"
+            style="@style/Widget.LoginFlow.Button.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:text="@string/continue_google_button_suffix"
+            android:visibility="visible"
+            app:icon="@drawable/ic_google_60dp"
+            app:iconGravity="textStart"
+            app:iconPadding="@dimen/margin_small_medium"
+            app:iconSize="14dp"
+            app:iconTint="@null"
+            app:layout_constraintBottom_toTopOf="@+id/continue_with_google_tos"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/continue_with_google_tos"
+            style="@style/Widget.LoginFlow.Button.Tertiary.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:text="@string/continue_with_google_terms_of_service_text"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+</ScrollView>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen_old.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen_old.xml
deleted file mode 100644
index 2844ae06d7b5..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/login_email_screen_old.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingStart="@dimen/margin_extra_large"
-    android:paddingEnd="@dimen/margin_extra_large">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/label"
-        style="@style/Widget.LoginFlow.TextView.Label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_extra_large"
-        android:gravity="start"
-        android:textAlignment="viewStart"
-        tools:text="@string/enter_email_wordpress_com" />
-
-    <org.wordpress.android.login.widgets.WPLoginInputRow
-        android:id="@+id/login_email_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="start"
-        android:hint="@string/email_address"
-        android:imeOptions="actionNext"
-        android:importantForAutofill="noExcludeDescendants"
-        android:inputType="textEmailAddress"
-        android:textAlignment="viewStart"
-        tools:ignore="UnusedAttribute" />
-
-    <com.google.android.material.textview.MaterialTextView
-        style="@style/Widget.LoginFlow.TextView.Label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_large"
-        android:layout_marginBottom="@dimen/margin_medium"
-        android:gravity="center_vertical"
-        android:text="@string/alternatively" />
-
-    <LinearLayout
-        android:id="@+id/login_google_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/margin_medium"
-        android:paddingEnd="@dimen/margin_medium"
-        android:paddingBottom="@dimen/margin_medium"
-        tools:ignore="RtlSymmetry">
-
-        <ImageView
-            android:layout_width="@dimen/google_button_icon_sz"
-            android:layout_height="@dimen/google_button_icon_sz"
-            android:layout_marginEnd="@dimen/margin_medium"
-            android:importantForAccessibility="no"
-            app:srcCompat="@drawable/ic_google_60dp" />
-
-        <com.google.android.material.textview.MaterialTextView
-            style="@style/LoginTheme.Button.LoginOption"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/login_google_button_suffix" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/login_site_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_extra_large"
-        android:background="?attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingTop="@dimen/margin_medium"
-        android:paddingEnd="@dimen/margin_medium"
-        android:paddingBottom="@dimen/margin_medium"
-        tools:ignore="RtlSymmetry">
-
-        <ImageView
-            android:id="@+id/login_site_button_icon"
-            android:layout_width="@dimen/google_button_icon_sz"
-            android:layout_height="@dimen/google_button_icon_sz"
-            android:layout_marginEnd="@dimen/margin_medium"
-            android:importantForAccessibility="no"
-            app:srcCompat="@drawable/ic_domains_grey_24dp" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/login_site_button_text"
-            style="@style/LoginTheme.Button.LoginOption"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/enter_site_address_instead" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/login_form_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/login_form_screen.xml
index 9898c35cdc60..de7631d24d6a 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/login_form_screen.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/layout/login_form_screen.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -31,34 +30,15 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true">
 
-        <LinearLayout
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/bottom_button"
+            style="@style/Widget.LoginFlow.Button.Primary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:gravity="center_vertical">
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/secondary_button"
-                style="@style/Widget.LoginFlow.Button.Tertiary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/margin_medium_large"
-                android:layout_marginStart="@dimen/margin_medium_large"
-                android:layout_marginTop="@dimen/margin_medium_large"
-                android:layout_weight="1"
-                android:gravity="start|center_vertical"
-                tools:text="Secondary action" />
-
-            <com.google.android.material.button.MaterialButton
-                android:id="@+id/primary_button"
-                style="@style/Widget.LoginFlow.Button.Primary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/margin_medium_large"
-                android:layout_marginEnd="@dimen/margin_extra_large"
-                android:layout_marginStart="@dimen/margin_extra_large"
-                android:layout_marginTop="@dimen/margin_medium_large"
-                android:text="@string/login_continue" />
-        </LinearLayout>
+            android:layout_marginBottom="@dimen/margin_medium_large"
+            android:layout_marginEnd="@dimen/margin_extra_large"
+            android:layout_marginStart="@dimen/margin_extra_large"
+            android:layout_marginTop="@dimen/margin_medium_large"
+            android:text="@string/login_continue" />
     </com.google.android.material.card.MaterialCardView>
 </RelativeLayout>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/login_magic_link_sent_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/login_magic_link_sent_screen.xml
index 504ddb57b725..f9192b18a9eb 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/login_magic_link_sent_screen.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/layout/login_magic_link_sent_screen.xml
@@ -6,6 +6,7 @@
     <include layout="@layout/toolbar_login" />
 
     <ScrollView
+        android:id="@+id/login_magic_link_container"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_bottom_sheet_dialog.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/signup_bottom_sheet_dialog.xml
deleted file mode 100644
index d27de169e604..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_bottom_sheet_dialog.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clipChildren="false"
-    android:clipToPadding="false"
-    android:orientation="vertical"
-    android:fitsSystemWindows="true"
-    android:paddingLeft="@dimen/margin_extra_large"
-    android:paddingTop="@dimen/margin_medium"
-    android:paddingRight="@dimen/margin_extra_large"
-    android:paddingBottom="@dimen/margin_extra_large">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/signup_tos"
-        style="@style/Widget.LoginFlow.Button.Tertiary.Small"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:padding="@dimen/margin_extra_large"
-        android:text="@string/signup_terms_of_service_text" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/signup_email"
-        style="@style/Widget.LoginFlow.Button.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_extra_small"
-        android:layout_marginBottom="@dimen/margin_medium"
-        android:text="@string/signup_with_email_button" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/signup_google"
-        style="@style/Widget.LoginFlow.Button.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_extra_small"
-        android:text="@string/signup_with_google_button" />
-
-</LinearLayout>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_confirmation_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/signup_confirmation_screen.xml
index f53eb189ddf7..0ed00631d658 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_confirmation_screen.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/layout/signup_confirmation_screen.xml
@@ -1,7 +1,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical">
 
     <include layout="@layout/toolbar_login" />
@@ -26,12 +25,11 @@
                 android:layout_marginTop="@dimen/margin_extra_large" />
 
             <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/label"
                 style="@style/Widget.LoginFlow.TextView.Label"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/margin_extra_medium_large"
-                tools:text="@string/signup_confirmation_magic_link_message" />
+                android:text="@string/signup_confirmation_message" />
 
         </LinearLayout>
 
@@ -46,6 +44,6 @@
         android:layout_marginEnd="@dimen/margin_extra_large"
         android:layout_marginStart="@dimen/margin_extra_large"
         android:layout_marginTop="@dimen/margin_medium_large"
-        tools:text="@string/send_link_by_email" />
+        android:text="@string/create_account" />
 
 </LinearLayout>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_email_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/signup_email_screen.xml
deleted file mode 100644
index 2741f5e27014..000000000000
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_email_screen.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_extra_large"
-    android:orientation="vertical"
-    android:paddingEnd="@dimen/margin_extra_large"
-    android:paddingStart="@dimen/margin_extra_large">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/label"
-        style="@style/Widget.LoginFlow.TextView.Label"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/margin_extra_large"
-        tools:text="@string/signup_email_header" />
-
-    <org.wordpress.android.login.widgets.WPLoginInputRow
-        android:id="@+id/login_email_row"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/email_address"
-        android:imeOptions="actionNext"
-        android:importantForAutofill="noExcludeDescendants"
-        android:inputType="textEmailAddress" />
-
-</LinearLayout>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_magic_link_screen.xml b/libs/login/WordPressLoginFlow/src/main/res/layout/signup_magic_link_screen.xml
index ce723cdd451e..5ec0d7ed3e77 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/layout/signup_magic_link_screen.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/layout/signup_magic_link_screen.xml
@@ -31,6 +31,13 @@
                 android:layout_marginTop="@dimen/margin_extra_medium_large"
                 android:text="@string/magic_link_not_seeing_email_message" />
 
+            <com.google.android.material.textview.MaterialTextView
+                style="@style/Widget.LoginFlow.TextView.Label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/margin_extra_medium_large"
+                android:text="@string/magic_link_not_meaning_to_create_account" />
+
         </LinearLayout>
 
     </ScrollView>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values-night/themes.xml b/libs/login/WordPressLoginFlow/src/main/res/values-night/themes.xml
index f5296a5ea887..2a117d9d6107 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values-night/themes.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values-night/themes.xml
@@ -2,10 +2,10 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
 
     <style name="Base.Theme.LoginFlow" parent="Base.Theme.LoginFlow.Shared">
-        <item name="colorPrimary">@color/wp_blue_40</item>
-        <item name="colorPrimaryVariant">@color/wp_blue_70</item>
-        <item name="colorSecondary">@color/wp_pink_50</item>
-        <item name="colorSecondaryVariant">@color/wp_pink_70</item>
+        <item name="colorPrimary">@color/wp_blue_30</item>
+        <item name="colorPrimaryVariant">@color/wp_blue_50</item>
+        <item name="colorSecondary">@color/wp_blue_30</item>
+        <item name="colorSecondaryVariant">@color/wp_blue_50</item>
 
         <item name="android:colorBackground">@color/material_black_800</item>
         <item name="colorSurface">@color/material_black_800</item>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml b/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml
index 2412c4aca542..98ca6fd31692 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/colors.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Theme Colors -->
-    <color name="wp_blue_40">#3582c4</color>
-    <color name="wp_blue_50">#2271b1</color>
-    <color name="wp_blue_70">#0a4b78</color>
+    <color name="wp_blue_30">#399ce3</color>
+    <color name="wp_blue_50">#0675c4</color>
+    <color name="wp_blue_70">#044b7a</color>
 
     <color name="wp_pink_50">#c9356e</color>
     <color name="wp_pink_70">#8c1749</color>
@@ -19,122 +19,9 @@
     <color name="avatar_placeholder">#61121212</color>
 
     <!-- Legacy -->
-    <!--
-        colorPrimary            app branding color for the app bar
-        colorPrimaryDark        status bar and contextual app bars
-        colorControlNormal      (unused here) controls in their normal state (spinner arrow, scrollbars, unchecked checkboxes)
-        colorControlActivated   controls in their activated/checked state (search highlight, checked checkboxes)
-        colorControlHighlight   control highlights (ripples, list selectors)
-    -->
-    <color name="color_primary">@color/blue_wordpress</color>
-    <color name="color_primary_dark">@color/status_bar</color>
-    <color name="color_accent">@color/orange_jazzy</color>
-    <color name="color_control_normal">@color/white</color>
-    <color name="color_control_activated">@color/blue_light</color>
-    <color name="color_control_highlight">@color/grey_lighten_20</color>
-
-    <!-- Default Colors -->
-    <color name="transparent">#00000000</color>
-    <color name="light_gray">@color/grey_lighten_30</color>
-    <color name="gray">@color/grey_lighten_20</color>
-    <color name="white">#FFFFFF</color>
-    <color name="white_self_hosted_back">#F1F1F1</color>
-    <!-- note that black should NOT be used for text - use grey_dark instead -->
-    <color name="black">#000000</color>
-    <color name="background_default">@color/grey_lighten_30</color>
-
-    <!-- ==================================== -->
-    <!-- WordPress.com Colors                 -->
-    <!-- wordpress.com/design-handbook/colors -->
-    <!-- Blues -->
-    <color name="blue_wordpress">#0087be</color>
-    <color name="blue_light">#78dcfa</color>
-    <color name="blue_medium">#00aadc</color>
-    <color name="blue_dark">#005082</color>
-
-    <!-- Primary Greys -->
     <color name="grey">#87a6bc</color>
-    <color name="grey_light">#f3f6f8</color>
-    <color name="grey_dark">#2e4453</color>
-    <color name="grey_disabled">@color/grey_darken_10</color>
-
-    <color name="grey_text_min">#537994</color>
-
-    <!-- Secondary Greys -->
-    <color name="grey_lighten_30">#e9eff3</color>
-    <color name="grey_lighten_20">#c8d7e1</color>
-    <color name="grey_lighten_10">#a8bece</color>
-    <color name="grey_darken_10">#668eaa</color>
-    <color name="grey_darken_20">#4f748e</color>
-    <color name="grey_darken_30">#3d596d</color>
-
-    <!-- Oranges -->
-    <color name="orange_jazzy">#f0821e</color>
-    <color name="orange_fire">#d54e21</color>
-
-    <!-- Alerts -->
-    <color name="alert_yellow">#f0b849</color>
-    <color name="alert_red">#d94f4f</color>
-    <color name="alert_green">#4ab866</color>
-
-    <!-- Translucent -->
-    <color name="black_translucent_40">#66000000</color>
-    <color name="black_translucent_50">#80000000</color>
-    <color name="blue_light_translucent_80">#cc78dcfa</color>
-    <color name="grey_dark_translucent_50">#802e4453</color>
-    <color name="grey_dark_translucent_70">#b32e4453</color>
-    <color name="grey_translucent_50">#80888888</color>
-    <color name="grey_lighten_10_translucent_50">#80a8bece</color>
-    <color name="grey_lighten_20_translucent_50">#80c8d7e1</color>
-    <color name="grey_lighten_30_translucent_50">#80e9eff3</color>
-    <color name="white_translucent_40">#66ffffff</color>
-    <color name="white_translucent_60">#99ffffff</color>
-    <color name="white_translucent_65">#a6ffffff</color>
-
-    <!-- END WordPress.com Colors -->
-    <!-- ======================== -->
-
-    <!-- Material Design -->
-    <color name="grey_50">#fffafafa</color>
-    <color name="grey_100">#fff5f5f5</color>
-    <color name="grey_200">#ffeeeeee</color>
-    <color name="grey_300">#ffe0e0e0</color>
-    <color name="grey_400">#ffbdbdbd</color>
-    <color name="grey_500">#ff9e9e9e</color>
-    <color name="grey_600">#ff757575</color>
-    <color name="grey_700">#ff616161</color>
-    <color name="grey_800">#ff424242</color>
-    <color name="grey_900">#ff212121</color>
-
-    <!-- App specific colors -->
-    <!-- We could use blue_dark for the status bar color, but to adhere to the material design spec very closely,
-      we're using a shade of blue_wordpress -->
-    <color name="status_bar">#006b98</color>
-    <color name="status_bar_action_mode">#ff517188</color>
 
     <!-- Login -->
-    <color name="login_theme_accent_color">@color/blue_medium</color>
-    <color name="login_background_color">@color/grey_light</color>
-
-    <color name="login_toolbar_color">@color/blue_wordpress</color>
-    <color name="login_base_button_normal_color">@color/white</color>
-    <color name="login_primary_button_normal_color">@color/blue_medium</color>
-    <color name="login_primary_button_text_color">@color/white</color>
-    <color name="login_secondary_button_text_color">@color/blue_wordpress</color>
-    <color name="login_google_button_text_color">@color/blue_wordpress</color>
-    <color name="login_text_label_text_color">@color/grey_dark</color>
-    <color name="login_input_label_static_text_color">@color/grey_text_min</color>
-    <color name="login_edit_text_color_control_normal">@color/grey_text_min</color>
-    <color name="login_edit_text_color_control_activated">@color/blue_medium</color>
-    <color name="login_edit_text_color_control_highlight">@color/blue_medium</color>
-    <color name="login_edit_text_text_color">@color/grey_dark</color>
-    <color name="login_edit_text_text_hint_color">@color/grey_text_min</color>
-    <color name="login_heading_text_color">@color/grey_text_min</color>
-    <color name="login_subhead_text_color">@color/grey_dark</color>
-    <color name="login_username_text_color">@color/grey_text_min</color>
-    <color name="login_footnote_text_color">@color/grey_dark</color>
-
-    <color name="login_input_icon_color">@color/grey_lighten_10</color>
-    <color name="login_input_password_icon_color">@color/grey</color>
-    <color name="login_notification_accent_color">@color/blue_wordpress</color>
+    <color name="login_secondary_button_icon_tint_color">#c8d7e1</color>
+    <color name="login_notification_accent_color">#0087be</color>
 </resources>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/dimens.xml b/libs/login/WordPressLoginFlow/src/main/res/values/dimens.xml
index c29f2334f88a..c3ef9473aff1 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/dimens.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/dimens.xml
@@ -3,9 +3,6 @@
 <resources>
     <item name="material_emphasis_low" format="float" type="dimen">0.12</item>
 
-    <dimen name="toolbar_content_offset">72dp</dimen>
-    <dimen name="toolbar_content_offset_end">0dp</dimen>
-
     <dimen name="margin_none">0dp</dimen>
     <dimen name="margin_dialog">24dp</dimen>
     <dimen name="margin_extra_extra_small">1dp</dimen>
@@ -29,18 +26,8 @@
     <dimen name="blavatar_sz_small">32dp</dimen>
     <dimen name="blavatar_sz">40dp</dimen>
 
-    <!-- http://www.google.com/design/spec/what-is-material/elevation-shadows.html#elevation-shadows-shadows -->
-    <dimen name="appbar_elevation">4dp</dimen>
-
     <!-- login -->
-    <dimen name="margin_text_input_layout_baseline">20dp</dimen>
     <dimen name="margin_extra_extra_extra_large">92dp</dimen>
     <dimen name="promo_indicator_bullet_size">4dp</dimen>
-    <dimen name="magic_link_sent_illustration_sz">120dp</dimen>
-    <dimen name="google_button_icon_sz">24dp</dimen>
-    <dimen name="textinputlayout_correction_padding_right">9dp</dimen>
-
-    <!-- signup -->
-    <dimen name="bottom_sheet_dialog_width">0dp</dimen>
 
 </resources>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
index 8677081533d5..3997120f17f1 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/strings.xml
@@ -3,11 +3,8 @@
     <string name="email_address">Email address</string>
     <string name="verification_code">Verification code</string>
     <string name="invalid_verification_code">Invalid verification code</string>
-    <string name="send_link">Send link</string>
     <string name="send_link_by_email">Send link by email</string>
     <string name="create_account">Create account</string>
-    <string name="send_verification_email">Send verification email</string>
-    <string name="enter_your_password_instead">Enter your password instead</string>
     <string name="or_type_your_password">Or type your password</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
@@ -20,12 +17,7 @@
     <string name="enter_account_info_for_site">Enter your account information for %1$s.</string>
     <string name="get_started">Get Started</string>
     <string name="next">Next</string>
-    <string name="open_mail">Open mail</string>
     <string name="check_email">Check email</string>
-    <string name="alternatively">Alternatively:</string>
-    <string name="enter_site_address_instead">Log in by entering your site address.</string>
-    <string name="enter_site_credentials_instead">Log in with site credentials.</string>
-    <string name="enter_username_instead">Log in with your username.</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
     <string name="enter_verification_code_sms">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>
     <string name="login_text_otp">Text me a code instead</string>
@@ -38,23 +30,20 @@
     <string name="login_magic_links_sent_label">Check your email on this device and tap the link in the email you received from WordPress.com.</string>
     <string name="login_magic_link_email_requesting">Requesting log-in email</string>
     <string name="magic_link_not_seeing_email_message">Not seeing the email? Check your Spam or Junk Mail folder.</string>
+    <string name="magic_link_not_meaning_to_create_account">Didn\'t mean to create a new account? Go back to re-enter your email address.</string>
     <string name="magic_link_unavailable_error_message">Currently unavailable. Please enter your password</string>
     <string name="login_get_link_by_email">Get a login link by email</string>
     <string name="enter_wpcom_password">Enter your WordPress.com password.</string>
     <string name="enter_wpcom_password_google">To proceed with this Google account, please provide the matching WordPress.com password. This will be asked only once.</string>
-    <string name="connect_more">Connect another site</string>
-    <string name="connect_site">Connect a site</string>
     <string name="login_continue">Continue</string>
-    <string name="login_done">Done</string>
-    <string name="login_already_logged_in_wpcom">Already logged in to WordPress.com</string>
     <string name="enter_site_address">Enter the address of the WordPress site you\'d like to connect.</string>
     <string name="enter_site_address_share_intent">Enter the address of your WordPress site you\'d like to share the content to.</string>
     <string name="login_site_address">Site address</string>
-    <string name="login_site_address_help">Need help finding your site address?</string>
     <string name="login_site_address_help_title">What\'s my site address?</string>
     <string name="login_site_address_help_content">Your site address appears in the bar at the top of the screen when you visit your site in Chrome.</string>
     <string name="login_site_address_more_help">Need more help?</string>
     <string name="login_find_your_site_adress">Find your site address</string>
+    <string name="login_find_your_connected_email">Find your connected email</string>
     <string name="login_checking_site_address">Checking site address</string>
     <string name="login_error_while_adding_site">Error while adding site. Error code: %s</string>
     <string name="login_log_in_for_deeplink">Log in to WordPress.com to access the post.</string>
@@ -63,10 +52,8 @@
     <string name="login_empty_username">Please enter a username</string>
     <string name="login_empty_password">Please enter a password</string>
     <string name="login_empty_2fa">Please enter a verification code</string>
-    <string name="login_email_button_signup">Don\'t have an account? %1$sSign up%2$s</string>
-    <string name="login_email_client_not_found">Can\'t detect your email client app</string>
-    <string name="login_google_button_suffix">Log in with Google.</string>
     <string name="continue_google_button_suffix">Continue with Google</string>
+    <string name="continue_site_credentials">Continue with store credentials</string>
     <string name="login_or">or</string>
     <string name="login_error_button">Close</string>
     <string name="login_error_email_not_found_v2">There\'s no WordPress.com account matching this Google account.</string>
@@ -75,24 +62,15 @@
     <string name="login_error_generic_start">Google login could not be started.</string>
     <string name="login_error_suffix">\nMaybe try a different account?</string>
     <string name="sign_up_label">Sign Up</string>
-    <string name="sign_up">Sign Up for WordPress.com</string>
-    <string name="signup_email_error_generic">There was some trouble checking the email address.</string>
-    <string name="signup_email_header">To create your new WordPress.com account, please enter your email address.</string>
     <string name="signup_magic_link_error">There was some trouble sending the email. You can retry now or close and try again later.</string>
     <string name="signup_magic_link_error_button_negative">Close</string>
     <string name="signup_magic_link_error_button_positive">Retry</string>
     <string name="signup_magic_link_message">We’ve emailed you a signup link to create your new WordPress.com account. Check your email on this device, and tap the link in the email you receive from WordPress.com.</string>
     <string name="signup_magic_link_progress">Sending email</string>
     <string name="signup_confirmation_message">We’ll use this email address to create your new WordPress.com account.</string>
-    <string name="signup_confirmation_magic_link_message">We’ll email you a signup link to create your new WordPress.com account.</string>
-    <string name="signup_terms_of_service_text">By signing up, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_terms_of_service_text">By continuing, you agree to our %1$sTerms of Service%2$s.</string>
     <string name="continue_with_google_terms_of_service_text">If you continue with Google and don\'t already have a WordPress.com account, you are creating an account and you agree to our %1$sTerms of Service%2$s.</string>
-    <string name="signup_with_email_button">Sign Up with Email</string>
-    <string name="signup_with_google_button">Sign Up with Google</string>
     <string name="signup_with_google_progress">Signing up with Google&#8230;</string>
-    <string name="continue_with_wpcom">Continue with WordPress.com</string>
-    <string name="enter_your_site_address">Enter your existing site address</string>
 
     <string name="google_error_timeout">Google took too long to respond. You may need to wait until you have a stronger internet connection.</string>
 
@@ -107,7 +85,6 @@
     <string name="email_invalid">Enter a valid email address</string>
     <string name="error_user_username_instead_of_email">Please log in using your WordPress.com username instead of your email address.</string>
     <string name="logging_in">Logging in</string>
-    <string name="forgot_password">Lost your password?</string>
     <string name="reset_your_password">Reset your password</string>
     <string name="error_generic">An error occurred</string>
     <string name="no_site_error">The site at this address is not a WordPress site. For us to connect to it, the site must use WordPress.</string>
@@ -123,7 +100,6 @@
     <string name="login_discovery_error_ssl">We were unable to access your site because of a problem with the &lt;b>SSL Certificate&lt;/b>. You will need to reach out to your host to resolve this.</string>
     <string name="login_discovery_error_generic">We were unable to access your site. You will need to reach out to your host to resolve this.</string>
     <string name="enter_wpcom_or_jetpack_site">Please enter a WordPress.com or Jetpack-connected self-hosted WordPress site</string>
-    <string name="enter_wordpress_site">The website at this address is not a WordPress site. For us to connect to it, the site must have WordPress installed.</string>
     <string name="error_generic_network">A network error occurred. Please check your connection and try again.</string>
 
     <string name="notification_login_title_success">Logged in!</string>
@@ -146,7 +122,6 @@
     <string name="selfhosted_site_login_title">Login credentials</string>
     <string name="verification_2fa_screen_title">Code verification</string>
 
-    <string name="signup_email_screen_title">Email signup</string>
     <string name="signup_magic_link_title">Magic link sent</string>
     <string name="signup_confirmation_title">Signup confirmation</string>
 
@@ -163,6 +138,4 @@
     <!-- Placeholder for notification channel to be used by login service notification.
      This resource must be overwritten in the host project with a real notification channel id it has configured. -->
     <string name="login_notification_channel_id">placeholder</string>
-
-    <string name="login_need_help_finding_connected_email">Need help finding the email you connected with?</string>
 </resources>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/styles.xml b/libs/login/WordPressLoginFlow/src/main/res/values/styles.xml
index 8d166bc53315..a63c72c9b971 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/styles.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/styles.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
+    <!-- Note: styles not used by the library directly but which can still be used by screens that
+    are part of the login flow (e.g. Prologue) should be marked with the tools:keep attribute -->
+
     <!-- App Bar -->
     <style name="Widget.LoginFlow.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
         <item name="elevation">0dp</item>
@@ -68,7 +71,7 @@
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>
     </style>
 
-    <style name="Widget.LoginFlow.TextView.Headline" parent="Widget.MaterialComponents.TextView">
+    <style name="Widget.LoginFlow.TextView.Headline" parent="Widget.MaterialComponents.TextView" tools:keep="@style/Widget_LoginFlow_TextView_Headline">
         <item name="android:textAppearance">?attr/textAppearanceHeadline5</item>
     </style>
 
@@ -77,7 +80,7 @@
         <item name="android:textColor">@color/login_on_surface_medium_selector</item>
     </style>
 
-    <style name="Widget.LoginFlow.TextView.Footnote" parent="Widget.MaterialComponents.TextView">
+    <style name="Widget.LoginFlow.TextView.Footnote" parent="Widget.MaterialComponents.TextView" tools:keep="@style/Widget_LoginFlow_TextView_Footnote">
         <item name="android:textAppearance">?attr/textAppearanceCaption</item>
         <item name="android:textColor">@color/login_on_surface_medium_selector</item>
     </style>
@@ -88,16 +91,16 @@
         <item name="android:background">?android:colorBackground</item>
     </style>
 
-    <style name="Widget.LoginFlow.TextView.List.Subheader" parent="Widget.MaterialComponents.TextView">
+    <style name="Widget.LoginFlow.TextView.List.Subheader" parent="Widget.MaterialComponents.TextView" tools:keep="@style/Widget_LoginFlow_TextView_List_Subheader">
         <item name="android:textAppearance">?attr/textAppearanceOverline</item>
         <item name="android:textColor">?attr/colorPrimary</item>
     </style>
 
-    <style name="Widget.LoginFlow.TextView.List.Line1" parent="Widget.MaterialComponents.TextView">
+    <style name="Widget.LoginFlow.TextView.List.Line1" parent="Widget.MaterialComponents.TextView" tools:keep="@style/Widget_LoginFlow_TextView_List_Line1">
         <item name="android:textAppearance">?attr/textAppearanceSubtitle1</item>
     </style>
 
-    <style name="Widget.LoginFlow.TextView.List.Line2" parent="Widget.MaterialComponents.TextView">
+    <style name="Widget.LoginFlow.TextView.List.Line2" parent="Widget.MaterialComponents.TextView" tools:keep="@style/Widget_LoginFlow_TextView_List_Line2">
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>
         <item name="android:textColor">@color/login_on_surface_medium_selector</item>
     </style>
@@ -111,10 +114,4 @@
         <item name="cardElevation">0dp</item>
     </style>
 
-    <!-- Legacy (remove after getting rid of the old layouts) -->
-    <style name="LoginTheme.Button.LoginOption" parent="TextAppearance.MaterialComponents.Body2">
-        <item name="android:textColor">?attr/colorPrimary</item>
-        <item name="android:padding">0dp</item>
-    </style>
-
 </resources>
diff --git a/libs/login/WordPressLoginFlow/src/main/res/values/themes.xml b/libs/login/WordPressLoginFlow/src/main/res/values/themes.xml
index 40849e2761c7..df28fc779090 100644
--- a/libs/login/WordPressLoginFlow/src/main/res/values/themes.xml
+++ b/libs/login/WordPressLoginFlow/src/main/res/values/themes.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Note: styles not used by the library directly but which can still be used by screens that
+    are part of the login flow (e.g. Prologue) should be marked with the tools:keep attribute -->
 
     <!-- Base parent theme that can be overridden by the client -->
     <style name="Base.Theme.LoginFlow.Parent" parent="Theme.MaterialComponents.DayNight.NoActionBar" />
@@ -22,12 +24,17 @@
         <item name="textAppearanceOverline">@style/TextAppearance.LoginFlow.Overline</item>
 
         <!-- Shape attributes -->
-        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.LoginFlow.SmallComponent</item>
-        <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.LoginFlow.MediumComponent</item>
-        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.LoginFlow.LargeComponent</item>
+        <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.LoginFlow.SmallComponent
+        </item>
+        <item name="shapeAppearanceMediumComponent">
+            @style/ShapeAppearance.LoginFlow.MediumComponent
+        </item>
+        <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.LoginFlow.LargeComponent
+        </item>
 
         <!-- Component styles -->
-        <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert
+        </item>
         <item name="bottomSheetDialogTheme">@style/ThemeOverlay.LoginFlow.BottomSheetDialog</item>
         <item name="appBarLayoutStyle">@style/Widget.LoginFlow.AppBarLayout</item>
         <item name="toolbarStyle">@style/Widget.LoginFlow.Toolbar</item>
@@ -40,8 +47,8 @@
     <style name="Base.Theme.LoginFlow" parent="Base.Theme.LoginFlow.Shared">
         <item name="colorPrimary">@color/wp_blue_50</item>
         <item name="colorPrimaryVariant">@color/wp_blue_70</item>
-        <item name="colorSecondary">@color/wp_pink_50</item>
-        <item name="colorSecondaryVariant">@color/wp_pink_70</item>
+        <item name="colorSecondary">@color/wp_blue_50</item>
+        <item name="colorSecondaryVariant">@color/wp_blue_70</item>
 
         <item name="android:colorBackground">@color/material_white_50</item>
         <item name="colorSurface">@color/material_white_50</item>
@@ -56,9 +63,9 @@
 
     <!-- Top-level theme containing attributes that are overridden by API version variants -->
     <!-- This is the theme that will be used and possibly extended by the client -->
-    <style name="Theme.LoginFlow" parent="Base.Theme.LoginFlow">
+    <style name="Theme.LoginFlow" parent="Base.Theme.LoginFlow" tools:keep="@style/Theme_LoginFlow">
         <item name="android:statusBarColor">@android:color/black</item>
     </style>
 
-    <style name="Theme.LoginFlow.TransparentStatusBar" parent="Theme.LoginFlow" />
+    <style name="Theme.LoginFlow.TransparentStatusBar" parent="Theme.LoginFlow" tools:keep="@style/Theme_LoginFlow_TransparentStatusBar" />
 </resources>
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/blocks.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/blocks.json
new file mode 100644
index 000000000000..803aa5315ddb
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/blocks.json
@@ -0,0 +1,24 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wp/v2/sites/181851495/blocks",
+        "queryParameters": {
+            "context": {
+                "equalTo": "edit"
+            },
+            "locale": {
+                "matches": "(.*)"
+            },
+            "_locale": {
+                "equalTo": "user"
+            },
+            "per_page": {
+                "equalTo": "10"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": []
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/media.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/media.json
new file mode 100644
index 000000000000..daeb14731886
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/media.json
@@ -0,0 +1,980 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wp/v2/sites/181851495/media/",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": [{
+            "id": 384,
+            "date": "2019-03-15T16:47:52",
+            "date_gmt": "2019-03-15T16:47:52",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg"
+            },
+            "modified": "2019-03-15T16:47:52",
+            "modified_gmt": "2019-03-15T16:47:52",
+            "slug": "poney-shetland-roux-14",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-14\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-7f",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"449\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-14\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-91.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-91.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-91.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-91.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-91.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-91.jpg",
+            "_links": {
+            }
+        }, {
+            "id": 448,
+            "date": "2019-03-15T16:47:51",
+            "date_gmt": "2019-03-15T16:47:51",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg"
+            },
+            "modified": "2019-03-15T16:47:51",
+            "modified_gmt": "2019-03-15T16:47:51",
+            "slug": "poney-shetland-roux-13",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-13\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-7e",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"448\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-13\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-90.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-90.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-90.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-90.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-90.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-90.jpg",
+            "_links": {
+
+            }
+        }, {
+            "id": 410,
+            "date": "2019-03-15T16:05:52",
+            "date_gmt": "2019-03-15T16:05:52",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg"
+            },
+            "modified": "2019-03-15T16:05:53",
+            "modified_gmt": "2019-03-15T16:05:53",
+            "slug": "poney-shetland-roux-12",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-12\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-6C",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"410\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-12\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-66.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-66.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-66.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-66.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-66.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-66.jpg",
+            "_links": {
+
+            }
+        }, {
+            "id": 383,
+            "date": "2019-03-15T15:56:10",
+            "date_gmt": "2019-03-15T15:56:10",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg"
+            },
+            "modified": "2019-03-15T15:56:11",
+            "modified_gmt": "2019-03-15T15:56:11",
+            "slug": "poney-shetland-roux-11",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-11\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-6b",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"383\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-11\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-64.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-64.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-64.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-64.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-64.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-64.jpg",
+            "_links": {
+            }
+        }, {
+            "id": 382,
+            "date": "2019-03-15T15:56:09",
+            "date_gmt": "2019-03-15T15:56:09",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg"
+            },
+            "modified": "2019-03-15T15:56:10",
+            "modified_gmt": "2019-03-15T15:56:10",
+            "slug": "poney-shetland-roux-10",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-10\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-6a",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"382\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-10\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-63.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-63.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-63.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-63.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-63.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-63.jpg",
+            "_links": {
+
+            }
+        }, {
+            "id": 344,
+            "date": "2019-03-15T15:33:04",
+            "date_gmt": "2019-03-15T15:33:04",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg"
+            },
+            "modified": "2019-03-15T15:33:05",
+            "modified_gmt": "2019-03-15T15:33:05",
+            "slug": "poney-shetland-roux-9",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-9\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-5y",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"344\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-9\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-51.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-51.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-51.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-51.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-51.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-51.jpg",
+            "_links": {
+
+            }
+        }, {
+            "id": 343,
+            "date": "2019-03-15T15:33:03",
+            "date_gmt": "2019-03-15T15:33:03",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg"
+            },
+            "modified": "2019-03-15T15:33:04",
+            "modified_gmt": "2019-03-15T15:33:04",
+            "slug": "poney-shetland-roux-8",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-8\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-5x",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"343\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-8\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-50.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-50.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-50.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-50.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-50.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-50.jpg",
+            "_links": {
+
+            }
+        }, {
+            "id": 324,
+            "date": "2019-03-15T00:01:21",
+            "date_gmt": "2019-03-15T00:01:21",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg"
+            },
+            "modified": "2019-03-15T00:01:22",
+            "modified_gmt": "2019-03-15T00:01:22",
+            "slug": "poney-shetland-roux-7",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-7\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-5e",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"324\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-7\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-38.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-38.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-38.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-38.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-38.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-38.jpg",
+            "_links": {
+            }
+        }, {
+            "id": 323,
+            "date": "2019-03-15T00:01:20",
+            "date_gmt": "2019-03-15T00:01:20",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg"
+            },
+            "modified": "2019-03-15T00:01:21",
+            "modified_gmt": "2019-03-15T00:01:21",
+            "slug": "poney-shetland-roux-6",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-6\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-5d",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"323\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-6\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-37.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-37.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-37.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-37.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-37.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-37.jpg",
+            "_links": {
+            }
+        }, {
+            "id": 286,
+            "date": "2019-03-14T20:37:05",
+            "date_gmt": "2019-03-14T20:37:05",
+            "guid": {
+                "rendered": "http:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg"
+            },
+            "modified": "2019-03-14T20:37:05",
+            "modified_gmt": "2019-03-14T20:37:05",
+            "slug": "poney-shetland-roux-5",
+            "status": "inherit",
+            "type": "attachment",
+            "link": "https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-5\/",
+            "title": {
+                "rendered": "Test Title"
+            },
+            "author": 68646169,
+            "comment_status": "open",
+            "ping_status": "closed",
+            "template": "",
+            "meta": {
+                "advanced_seo_description": "",
+                "_coblocks_attr": "",
+                "_coblocks_dimensions": "",
+                "_coblocks_responsive_height": "",
+                "_coblocks_accordion_ie_support": "",
+                "spay_email": ""
+            },
+            "jetpack_shortlink": "https:\/\/wp.me\/a4R8pH-4C",
+            "jetpack_sharing_enabled": true,
+            "jetpack_likes_enabled": true,
+            "description": {
+                "rendered": "<p class=\"attachment\"><a href='https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg'><img width=\"199\" height=\"300\" src=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=199&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"Test Alt\" loading=\"lazy\" srcset=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=199 199w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=398 398w, https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=100 100w\" sizes=\"(max-width: 199px) 100vw, 199px\" data-attachment-id=\"286\" data-permalink=\"https:\/\/thenomadicwordsmith.wordpress.com\/poney-shetland-roux-5\/\" data-orig-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg\" data-orig-size=\"2000,3008\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5&quot;,&quot;credit&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;camera&quot;:&quot;NIKON D50&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1165667632&quot;,&quot;copyright&quot;:&quot;val\\u00e9rie beudon - Fotolia&quot;,&quot;focal_length&quot;:&quot;40&quot;,&quot;iso&quot;:&quot;200&quot;,&quot;shutter_speed&quot;:&quot;0.00625&quot;,&quot;title&quot;:&quot;poney shetland roux&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Test Title\" data-image-description=\"&lt;p&gt;Test Description&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=199\" data-large-file=\"https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=681\" \/><\/a><\/p>\n<p>Test Description<\/p>\n"
+            },
+            "caption": {
+                "rendered": "<p>Test Caption<\/p>\n"
+            },
+            "alt_text": "Test Alt",
+            "media_type": "image",
+            "mime_type": "image\/jpeg",
+            "media_details": {
+                "width": 2000,
+                "height": 3008,
+                "file": "2019\/03\/pony-16.jpg",
+                "sizes": {
+                    "thumbnail": {
+                        "file": "pony-16.jpg?w=100",
+                        "width": 100,
+                        "height": 150,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=100"
+                    },
+                    "medium": {
+                        "file": "pony-16.jpg?w=199",
+                        "width": 199,
+                        "height": 300,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=199"
+                    },
+                    "large": {
+                        "file": "pony-16.jpg?w=681",
+                        "width": 681,
+                        "height": 1024,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg?w=681"
+                    },
+                    "full": {
+                        "file": "pony-16.jpg",
+                        "width": 1024,
+                        "height": 1540,
+                        "mime_type": "image\/jpeg",
+                        "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg"
+                    }
+                },
+                "image_meta": {
+                    "aperture": "5",
+                    "credit": "val\u00e9rie beudon - Fotolia",
+                    "camera": "NIKON D50",
+                    "caption": "",
+                    "created_timestamp": "1165667632",
+                    "copyright": "val\u00e9rie beudon - Fotolia",
+                    "focal_length": "40",
+                    "iso": "200",
+                    "shutter_speed": "0.00625",
+                    "title": "poney shetland roux",
+                    "orientation": "1",
+                    "keywords": ["poney", "roux", "shetland", "bretagne", "nain", "\u00e9quitation", "enfant", "animal domestique"],
+                    "latitude": 0,
+                    "longitude": 0
+                },
+                "filesize": 1913681
+            },
+            "post": null,
+            "source_url": "https:\/\/thenomadicwordsmith.files.wordpress.com\/2019\/03\/pony-16.jpg",
+            "_links": {
+            }
+        }]
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/themes.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/themes.json
new file mode 100644
index 000000000000..9180072de3dc
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wp/themes.json
@@ -0,0 +1,118 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wp/v2/sites/181851495/themes/",
+        "queryParameters": {
+            "status": {
+                "equalTo": "active"
+            },
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": [{
+            "stylesheet": "pub\/friendly-business",
+            "template": "pub\/twentynineteen",
+            "requires_php": "",
+            "requires_wp": "WordPress 4.9.6",
+            "textdomain": "friendly-business",
+            "version": "1.4.2",
+            "screenshot": "https:\/\/s0.wp.com\/wp-content\/themes\/pub\/friendly-business\/screenshot.png",
+            "author": {
+                "raw": "Automattic",
+                "rendered": "<a href=\"https:\/\/wordpress.org\/\">Automattic<\/a>"
+            },
+            "author_uri": {
+                "raw": "https:\/\/wordpress.org\/",
+                "rendered": "https:\/\/wordpress.org\/"
+            },
+            "description": {
+                "raw": "Simple, approachable, with bold, handsome typography, Friendly Business conveys quality and sustainability, which makes it especially good fit for education, agriculture and family-run businesses.",
+                "rendered": "Simple, approachable, with bold, handsome typography, Friendly Business conveys quality and sustainability, which makes it especially good fit for education, agriculture and family-run businesses."
+            },
+            "name": {
+                "raw": "Friendly Business",
+                "rendered": "Friendly Business"
+            },
+            "tags": {
+                "raw": ["One Column", "flexible-header", "Accessibility Ready", "Custom Colors", "custom-menu", "Custom Logo", "Editor Style", "Featured Images", "Footer Widgets", "RTL Language Support", "Sticky Post", "threaded-comments", "Translation Ready"],
+                "rendered": "One Column, flexible-header, Accessibility Ready, Custom Colors, custom-menu, Custom Logo, Editor Style, Featured Images, Footer Widgets, RTL Language Support, Sticky Post, threaded-comments, Translation Ready"
+            },
+            "theme_uri": {
+                "raw": "https:\/\/github.com\/automattic\/themes",
+                "rendered": "https:\/\/github.com\/automattic\/themes"
+            },
+            "status": "active",
+            "theme_supports": {
+                "align-wide": true,
+                "automatic-feed-links": true,
+                "custom-background": false,
+                "custom-header": false,
+                "custom-logo": {
+                    "width": 180,
+                    "height": 180,
+                    "flex-width": true,
+                    "flex-height": false,
+                    "header-text": ["site-title"],
+                    "unlink-homepage-logo": false
+                },
+                "customize-selective-refresh-widgets": true,
+                "dark-editor-style": false,
+                "disable-custom-colors": false,
+                "disable-custom-font-sizes": false,
+                "disable-custom-gradients": false,
+                "editor-color-palette": [{
+                    "name": "Primary",
+                    "slug": "primary",
+                    "color": "#20603c"
+                }, {
+                    "name": "Secondary",
+                    "slug": "secondary",
+                    "color": "#133a24"
+                }, {
+                    "name": "Dark Gray",
+                    "slug": "dark-gray",
+                    "color": "#3c2323"
+                }, {
+                    "name": "Light Gray",
+                    "slug": "light-gray",
+                    "color": "#0d1b24"
+                }, {
+                    "name": "White",
+                    "slug": "white",
+                    "color": "#ffffff"
+                }],
+                "editor-font-sizes": [{
+                    "name": "Small",
+                    "size": 19.5,
+                    "slug": "small"
+                }, {
+                    "name": "Normal",
+                    "size": 22,
+                    "slug": "normal"
+                }, {
+                    "name": "Large",
+                    "size": 36.5,
+                    "slug": "large"
+                }, {
+                    "name": "Huge",
+                    "size": 49.5,
+                    "slug": "huge"
+                }],
+                "editor-gradient-presets": false,
+                "editor-styles": true,
+                "html5": ["search-form", "comment-form", "comment-list", "gallery", "caption", "script", "style", "navigation-widgets"],
+                "formats": ["standard"],
+                "post-thumbnails": true,
+                "responsive-embeds": true,
+                "title-tag": false,
+                "wp-block-styles": true
+            },
+            "_links": {
+            }
+        }]
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/experiments/assignments.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/experiments/assignments.json
new file mode 100644
index 000000000000..04e173f204f8
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/experiments/assignments.json
@@ -0,0 +1,16 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPattern": "/wpcom/v2/experiments/.*/assignments/.*"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "variations": {},
+      "ttl": 3600
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_0_rewind_capabilities.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_0_rewind_capabilities.json
new file mode 100644
index 000000000000..94f1cf9593d4
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_0_rewind_capabilities.json
@@ -0,0 +1,17 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/wpcom/v2/sites/0/rewind/capabilities(/)?($|\\?.*)"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "capabilities": []
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_106707880_rewind_capabilities.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_106707880_rewind_capabilities.json
new file mode 100644
index 000000000000..7dce083df950
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_106707880_rewind_capabilities.json
@@ -0,0 +1,17 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/wpcom/v2/sites/106707880/rewind/capabilities(/)?($|\\?.*)"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "capabilities": []
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_181851495_rewind_capabilities.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_181851495_rewind_capabilities.json
new file mode 100644
index 000000000000..a2d3757a5e01
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/jetpack/wpcom_v2_sites_181851495_rewind_capabilities.json
@@ -0,0 +1,17 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/wpcom/v2/sites/181851495/rewind/capabilities(/)?($|\\?.*)"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "capabilities": []
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json
index e7d15464f009..045c37342e22 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json
@@ -9,10 +9,155 @@
             "sites": [
                 {
                       "ID": 106707880,
-                      "name": "In Focus Photography",
+                      "name": "Tri-County Real Estate",
                       "description": "",
-                      "URL": "http:\/\/infocusphotographers.com",
-                      "user_can_manage": false,
+                      "URL": "https:\/\/tricountyrealestate.wordpress.com",
+                      "user_can_manage": true,
+                      "capabilities": {
+                        "edit_pages": true,
+                        "edit_posts": true,
+                        "edit_others_posts": true,
+                        "edit_others_pages": true,
+                        "delete_posts": true,
+                        "delete_others_posts": true,
+                        "edit_theme_options": true,
+                        "edit_users": false,
+                        "list_users": true,
+                        "manage_categories": true,
+                        "manage_options": true,
+                        "moderate_comments": true,
+                        "activate_wordads": true,
+                        "promote_users": true,
+                        "publish_posts": true,
+                        "upload_files": true,
+                        "delete_users": false,
+                        "remove_users": true,
+                        "own_site": true,
+                        "view_hosting": true,
+                        "view_stats": true
+                      },
+                      "jetpack": false,
+                      "jetpack_connection": false,
+                      "is_multisite": true,
+                      "post_count": 3,
+                      "subscribers_count": 0,
+                      "lang": "en",
+                      "icon": {
+                        "img": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=96",
+                        "ico": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=96",
+                        "media_id": 133
+                      },
+                      "logo": {
+                        "id": 0,
+                        "sizes": [],
+                        "url": ""
+                      },
+                      
+                      "visible": true,
+                      "is_private": true,
+                      "is_coming_soon": true,
+                      "single_user_site": false,
+                      "is_vip": false,
+                      "is_following": false,
+                      "options": {
+                        "timezone": "America\/Los_Angeles",
+                        "gmt_offset": -7,
+                        "blog_public": -1,
+                        "videopress_enabled": false,
+                        "upgraded_filetypes_enabled": false,
+                        "login_url": "https:\/\/tricountyrealestate.wordpress.com\/wp-login.php",
+                        "admin_url": "https:\/\/tricountyrealestate.wordpress.com\/wp-admin\/",
+                        "is_mapped_domain": false,
+                        "is_redirect": false,
+                        "unmapped_url": "https:\/\/tricountyrealestate.wordpress.com",
+                        "featured_images_enabled": false,
+                        "theme_slug": "pub\/hever",
+                        "header_image": false,
+                        "background_color": false,
+                        "image_default_link_type": "none",
+                        "image_thumbnail_width": 150,
+                        "image_thumbnail_height": 150,
+                        "image_thumbnail_crop": 0,
+                        "image_medium_width": 300,
+                        "image_medium_height": 300,
+                        "image_large_width": 1024,
+                        "image_large_height": 1024,
+                        "permalink_structure": "\/%year%\/%monthnum%\/%day%\/%postname%\/",
+                        "post_formats": [],
+                        "default_post_format": "standard",
+                        "default_category": 1,
+                        "allowed_file_types": ["jpg", "jpeg", "png", "gif", "pdf", "doc", "ppt", "odt", "pptx", "docx", "pps", "ppsx", "xls", "xlsx", "key", "asc"],
+                        "show_on_front": "page",
+                        "default_likes_enabled": true,
+                        "default_sharing_status": false,
+                        "default_comment_status": true,
+                        "default_ping_status": true,
+                        "software_version": "5.5-wpcom-48929",
+                        "created_at": "2020-08-21T23:23:47+00:00",
+                        "wordads": false,
+                        "publicize_permanently_disabled": false,
+                        "frame_nonce": "354ead212c",
+                        "jetpack_frame_nonce": "354ead212c",
+                        "page_on_front": 5,
+                        "page_for_posts": 0,
+                        "wpcom_public_coming_soon_page_id": 0,
+                        "headstart": false,
+                        "headstart_is_fresh": false,
+                        "ak_vp_bundle_enabled": null,
+                        "advanced_seo_front_page_description": "",
+                        "advanced_seo_title_formats": [],
+                        "verification_services_codes": null,
+                        "podcasting_archive": null,
+                        "is_domain_only": false,
+                        "is_automated_transfer": false,
+                        "is_wpcom_atomic": false,
+                        "is_wpcom_store": false,
+                        "woocommerce_is_active": false,
+                        "design_type": null,
+                        "site_goals": null,
+                        "site_segment": null,
+                        "import_engine": null,
+                        "is_pending_plan": false,
+                        "is_wpforteams_site": false,
+                        "is_cloud_eligible": false
+                      },
+                      "plan": {
+                        "product_id": 1,
+                        "product_slug": "free_plan",
+                        "product_name_short": "Free",
+                        "expired": false,
+                        "user_is_owner": false,
+                        "is_free": true
+                      },
+                      "products": [],
+                      "jetpack_modules": null,
+                      "meta": {
+                        "links": {
+                          "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851541",
+                          "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851541\/help",
+                          "posts": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851541\/posts\/",
+                          "comments": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/comments\/",
+                          "xmlrpc": "https:\/\/tricountyrealestate.wordpress.com\/xmlrpc.php",
+                          "site_icon": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851541\/media\/133"
+                        }
+                      },
+                      "quota": {
+                        "space_allowed": 3221225472,
+                        "space_used": 75318143,
+                        "percent_used": 2.338182895133893,
+                        "space_available": 3145907329
+                      },
+                      "launch_status": "unlaunched",
+                      "site_migration": null,
+                      "is_fse_active": false,
+                      "is_fse_eligible": false,
+                      "is_core_site_editor_enabled": false
+                    }, {
+                      "ID": 181851495,
+                      "name": "Four Paws Dog Grooming",
+                      "description": "",
+                      "URL": "https:\/\/fourpawsdoggrooming.wordpress.com",
+                      "user_can_manage": true,
                       "capabilities": {
                         "edit_pages": true,
                         "edit_posts": true,
@@ -32,91 +177,47 @@
                         "upload_files": true,
                         "delete_users": false,
                         "remove_users": true,
+                        "own_site": false,
+                        "view_hosting": true,
                         "view_stats": true
                       },
                       "jetpack": false,
+                      "jetpack_connection": false,
                       "is_multisite": true,
-                      "post_count": 2,
+                      "post_count": 3,
                       "subscribers_count": 0,
                       "lang": "en",
                       "icon": {
-                        "img": "https:\/\/secure.gravatar.com\/blavatar\/e150bfd1895a72358af2b617b575be19",
-                        "ico": "https:\/\/secure.gravatar.com\/blavatar\/e150bfd1895a72358af2b617b575be19"
+                        "img": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=96",
+                        "ico": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=96",
+                        "media_id": 39
                       },
                       "logo": {
-                        "id": 104,
-                        "sizes": {
-                          "thumbnail": {
-                            "height": 124,
-                            "width": 150,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=150",
-                            "orientation": "landscape"
-                          },
-                          "medium": {
-                            "height": 247,
-                            "width": 300,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=300",
-                            "orientation": "landscape"
-                          },
-                          "edin-thumbnail-landscape": {
-                            "height": 240,
-                            "width": 330,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=330&h=240&crop=1",
-                            "orientation": "landscape"
-                          },
-                          "edin-thumbnail-square": {
-                            "height": 330,
-                            "width": 330,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=330&h=330&crop=1",
-                            "orientation": "landscape"
-                          },
-                          "edin-thumbnail-avatar": {
-                            "height": 96,
-                            "width": 96,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=96&h=96&crop=1",
-                            "orientation": "landscape"
-                          },
-                          "edin-hero": {
-                            "height": 384,
-                            "width": 466,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=466&h=384&crop=1",
-                            "orientation": "landscape"
-                          },
-                          "edin-logo": {
-                            "height": 192,
-                            "width": 233,
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png?w=233",
-                            "orientation": "landscape"
-                          },
-                          "full": {
-                            "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png",
-                            "height": 384,
-                            "width": 466,
-                            "orientation": "landscape"
-                          }
-                        },
-                        "url": "https:\/\/infocusphotographers.files.wordpress.com\/2016\/03\/infocus_logo22.png"
+                        "id": 0,
+                        "sizes": [],
+                        "url": ""
                       },
                       "visible": true,
-                      "is_private": false,
+                      "is_private": true,
+                      "is_coming_soon": true,
                       "single_user_site": false,
                       "is_vip": false,
                       "is_following": false,
                       "options": {
-                        "timezone": "",
-                        "gmt_offset": 0,
-                        "blog_public": 1,
+                        "timezone": "America\/Los_Angeles",
+                        "gmt_offset": -7,
+                        "blog_public": -1,
                         "videopress_enabled": false,
-                        "upgraded_filetypes_enabled": true,
-                        "login_url": "https:\/\/infocusphotographers.wordpress.com\/wp-login.php",
-                        "admin_url": "https:\/\/infocusphotographers.wordpress.com\/wp-admin\/",
-                        "is_mapped_domain": true,
+                        "upgraded_filetypes_enabled": false,
+                        "login_url": "https:\/\/fourpawsdoggrooming.wordpress.com\/wp-login.php",
+                        "admin_url": "https:\/\/fourpawsdoggrooming.wordpress.com\/wp-admin\/",
+                        "is_mapped_domain": false,
                         "is_redirect": false,
-                        "unmapped_url": "https:\/\/infocusphotographers.wordpress.com",
+                        "unmapped_url": "https:\/\/fourpawsdoggrooming.wordpress.com",
                         "featured_images_enabled": false,
-                        "theme_slug": "pub\/edin",
+                        "theme_slug": "pub\/hever",
                         "header_image": false,
-                        "background_color": "ffffff",
+                        "background_color": false,
                         "image_default_link_type": "none",
                         "image_thumbnail_width": 150,
                         "image_thumbnail_height": 150,
@@ -129,42 +230,21 @@
                         "post_formats": [],
                         "default_post_format": "0",
                         "default_category": 1,
-                        "allowed_file_types": [
-                          "jpg",
-                          "jpeg",
-                          "png",
-                          "gif",
-                          "pdf",
-                          "doc",
-                          "ppt",
-                          "odt",
-                          "pptx",
-                          "docx",
-                          "pps",
-                          "ppsx",
-                          "xls",
-                          "xlsx",
-                          "key",
-                          "asc",
-                          "mp3",
-                          "m4a",
-                          "wav",
-                          "ogg",
-                          "zip"
-                        ],
+                        "allowed_file_types": ["jpg", "jpeg", "png", "gif", "pdf", "doc", "ppt", "odt", "pptx", "docx", "pps", "ppsx", "xls", "xlsx", "key", "asc"],
                         "show_on_front": "page",
                         "default_likes_enabled": true,
-                        "default_sharing_status": true,
+                        "default_sharing_status": false,
                         "default_comment_status": true,
                         "default_ping_status": true,
-                        "software_version": "5.2.2",
-                        "created_at": "2016-02-09T16:07:34+00:00",
+                        "software_version": "5.5-wpcom-48929",
+                        "created_at": "2020-08-21T23:21:16+00:00",
                         "wordads": false,
                         "publicize_permanently_disabled": false,
-                        "frame_nonce": "c0bfd655c4",
-                        "jetpack_frame_nonce": "c0bfd655c4",
-                        "page_on_front": 1,
+                        "frame_nonce": "6c9ff09ee5",
+                        "jetpack_frame_nonce": "6c9ff09ee5",
+                        "page_on_front": 5,
                         "page_for_posts": 0,
+                        "wpcom_public_coming_soon_page_id": 0,
                         "headstart": false,
                         "headstart_is_fresh": false,
                         "ak_vp_bundle_enabled": null,
@@ -179,165 +259,186 @@
                         "woocommerce_is_active": false,
                         "design_type": null,
                         "site_goals": null,
-                        "site_segment": null
+                        "site_segment": null,
+                        "import_engine": null,
+                        "is_pending_plan": false,
+                        "is_wpforteams_site": false,
+                        "is_cloud_eligible": false
                       },
                       "plan": {
-                        "product_id": 1029,
-                        "product_slug": "personal-bundle-2y",
-                        "product_name": "WordPress.com Personal",
-                        "product_name_short": "Personal",
+                        "product_id": 1,
+                        "product_slug": "free_plan",
+                        "product_name_short": "Free",
                         "expired": false,
                         "user_is_owner": false,
-                        "is_free": false,
-                        "features": {
-                          "active": [
-                            "free-blog",
-                            "custom-domain",
-                            "space",
-                            "support",
-                            "wordads-jetpack"
-                          ],
-                          "available": {
-                            "free-blog": [
-                              "free_plan",
-                              "personal-bundle",
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "blogger-bundle",
-                              "blogger-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "space": [
-                              "free_plan",
-                              "personal-bundle",
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "blogger-bundle",
-                              "blogger-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "support": [
-                              "free_plan",
-                              "personal-bundle",
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "blogger-bundle",
-                              "blogger-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "custom-domain": [
-                              "personal-bundle",
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "blogger-bundle",
-                              "blogger-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "no-adverts\/no-adverts.php": [
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "custom-design": [
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "videopress": [
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "unlimited_themes": [
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "live_support": [
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "simple-payments": [
-                              "value_bundle",
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "value_bundle-2y",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "premium-themes": [
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ],
-                            "google-analytics": [
-                              "business-bundle",
-                              "ecommerce-bundle",
-                              "business-bundle-2y",
-                              "ecommerce-bundle",
-                              "ecommerce-bundle-2y"
-                            ]
-                          }
+                        "is_free": true
+                      },
+                      "products": [],
+                      "jetpack_modules": null,
+                      "meta": {
+                        "links": {
+                          "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495",
+                          "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/help",
+                          "posts": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/posts\/",
+                          "comments": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/comments\/",
+                          "xmlrpc": "https:\/\/fourpawsdoggrooming.wordpress.com\/xmlrpc.php",
+                          "site_icon": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/39"
                         }
                       },
+                      "quota": {
+                        "space_allowed": 3221225472,
+                        "space_used": 4495332,
+                        "percent_used": 0.1395534723997116,
+                        "space_available": 3216730140
+                      },
+                      "launch_status": "unlaunched",
+                      "site_migration": null,
+                      "is_fse_active": false,
+                      "is_fse_eligible": false,
+                      "is_core_site_editor_enabled": false
+                    }, {
+                      "ID": 181977606,
+                      "name": "Weekend Bakes",
+                      "description": "",
+                      "URL": "https:\/\/weekendbakesblog.wordpress.com",
+                      "user_can_manage": false,
+                      "capabilities": {
+                        "edit_pages": true,
+                        "edit_posts": true,
+                        "edit_others_posts": true,
+                        "edit_others_pages": true,
+                        "delete_posts": true,
+                        "delete_others_posts": true,
+                        "edit_theme_options": true,
+                        "edit_users": false,
+                        "list_users": true,
+                        "manage_categories": true,
+                        "manage_options": true,
+                        "moderate_comments": true,
+                        "activate_wordads": true,
+                        "promote_users": true,
+                        "publish_posts": true,
+                        "upload_files": true,
+                        "delete_users": false,
+                        "remove_users": true,
+                        "own_site": true,
+                        "view_hosting": true,
+                        "view_stats": true
+                      },
+                      "jetpack": false,
+                      "jetpack_connection": false,
+                      "is_multisite": true,
+                      "post_count": 2,
+                      "subscribers_count": 1,
+                      "lang": "en",
+                      "icon": {
+                        "img": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/image.jpg?w=96",
+                        "ico": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/image.jpg?w=96",
+                        "media_id": 12
+                      },
+                      "logo": {
+                        "id": 0,
+                        "sizes": [],
+                        "url": ""
+                      },
+                      "visible": true,
+                      "is_private": false,
+                      "is_coming_soon": false,
+                      "single_user_site": true,
+                      "is_vip": false,
+                      "is_following": true,
+                      "options": {
+                        "timezone": "",
+                        "gmt_offset": 0,
+                        "blog_public": 1,
+                        "videopress_enabled": false,
+                        "upgraded_filetypes_enabled": false,
+                        "login_url": "https:\/\/weekendbakesblog.wordpress.com\/wp-login.php",
+                        "admin_url": "https:\/\/weekendbakesblog.wordpress.com\/wp-admin\/",
+                        "is_mapped_domain": false,
+                        "is_redirect": false,
+                        "unmapped_url": "https:\/\/weekendbakesblog.wordpress.com",
+                        "featured_images_enabled": false,
+                        "theme_slug": "pub\/independent-publisher-2",
+                        "header_image": false,
+                        "background_color": false,
+                        "image_default_link_type": "none",
+                        "image_thumbnail_width": 150,
+                        "image_thumbnail_height": 150,
+                        "image_thumbnail_crop": 0,
+                        "image_medium_width": 300,
+                        "image_medium_height": 300,
+                        "image_large_width": 1024,
+                        "image_large_height": 1024,
+                        "permalink_structure": "\/%year%\/%monthnum%\/%day%\/%postname%\/",
+                        "post_formats": [],
+                        "default_post_format": "standard",
+                        "default_category": 1,
+                        "allowed_file_types": ["jpg", "jpeg", "png", "gif", "pdf", "doc", "ppt", "odt", "pptx", "docx", "pps", "ppsx", "xls", "xlsx", "key", "asc"],
+                        "show_on_front": "posts",
+                        "default_likes_enabled": true,
+                        "default_sharing_status": true,
+                        "default_comment_status": true,
+                        "default_ping_status": true,
+                        "software_version": "5.5-wpcom-48929",
+                        "created_at": "2020-08-25T04:02:19+00:00",
+                        "wordads": false,
+                        "publicize_permanently_disabled": false,
+                        "frame_nonce": "7c19c3023d",
+                        "jetpack_frame_nonce": "7c19c3023d",
+                        "wpcom_public_coming_soon_page_id": 0,
+                        "headstart": false,
+                        "headstart_is_fresh": false,
+                        "ak_vp_bundle_enabled": null,
+                        "advanced_seo_front_page_description": "",
+                        "advanced_seo_title_formats": [],
+                        "verification_services_codes": null,
+                        "podcasting_archive": null,
+                        "is_domain_only": false,
+                        "is_automated_transfer": false,
+                        "is_wpcom_atomic": false,
+                        "is_wpcom_store": false,
+                        "woocommerce_is_active": false,
+                        "design_type": null,
+                        "site_goals": null,
+                        "site_segment": 2,
+                        "import_engine": null,
+                        "is_pending_plan": false,
+                        "is_wpforteams_site": false,
+                        "is_cloud_eligible": false
+                      },
+                      "plan": {
+                        "product_id": 1,
+                        "product_slug": "free_plan",
+                        "product_name_short": "Free",
+                        "expired": false,
+                        "user_is_owner": false,
+                        "is_free": true
+                      },
+                      "products": [],
                       "jetpack_modules": null,
                       "meta": {
                         "links": {
-                          "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/106707880",
-                          "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/106707880\/help",
-                          "posts": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/106707880\/posts\/",
-                          "comments": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/106707880\/comments\/",
-                          "xmlrpc": "https:\/\/infocusphotographers.wordpress.com\/xmlrpc.php"
+                          "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181977606",
+                          "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181977606\/help",
+                          "posts": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181977606\/posts\/",
+                          "comments": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181977606\/comments\/",
+                          "xmlrpc": "https:\/\/weekendbakesblog.wordpress.com\/xmlrpc.php",
+                          "site_icon": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181977606\/media\/12"
                         }
                       },
                       "quota": {
-                        "space_allowed": 6442450944,
-                        "space_used": 442302007,
-                        "percent_used": 6.865430731947224,
-                        "space_available": 6000148937
+                        "space_allowed": 3221225472,
+                        "space_used": 52880326,
+                        "percent_used": 1.6416213785608609,
+                        "space_available": 3168345146
                       },
-                      "launch_status": false
-                }
+                      "launch_status": false,
+                      "site_migration": null,
+                      "is_fse_active": false,
+                      "is_fse_eligible": false,
+                      "is_core_site_editor_enabled": false
+                    }
             ]
         },
         "headers": {
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_151.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_151.json
index cc35c81048f2..ad1b7483b7a3 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_151.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_151.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/media/151/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/media/151/",
         "queryParameters": {
             "locale": {
                 "matches": "(.*)"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_238.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_238.json
index d189b5fb0a5f..d60a23bfef85 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_238.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_238.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/media/238/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/media/238/",
         "queryParameters": {
             "locale": {
                 "matches": "(.*)"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_294.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_294.json
index 200204f48068..b6d284ac972b 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_294.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_294.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/wp/v2/sites/106707880/media/294",
+        "urlPathPattern": "/wp/v2/sites/([0-9]+)/media/294",
         "queryParameters": {
             "locale": {
                 "matches": "(.*)"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_307.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_307.json
new file mode 100644
index 000000000000..dc20121edb8c
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_307.json
@@ -0,0 +1,62 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wp/v2/sites/106707880/media/307",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "ID": 307,
+            "URL": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg",
+            "guid": "http://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg",
+            "date": "2019-05-08T09:49:00+00:00",
+            "post_ID": 295,
+            "author_ID": 152748359,
+            "file": "img_0111-14.jpg",
+            "mime_type": "image/jpeg",
+            "extension": "jpg",
+            "title": "img_0111",
+            "caption": "",
+            "description": "",
+            "alt": "",
+            "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
+            "thumbnails": {
+                "thumbnail": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=150",
+                "medium": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=300",
+                "large": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=1024",
+                "post-thumbnail": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=740&h=430&crop=1",
+                "independent-publisher-2-banner": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=1440&h=600&crop=1",
+                "independent-publisher-2-full-width": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=1100"
+            },
+            "height": 3024,
+            "width": 4032,
+            "exif": {
+                "aperture": "2.4",
+                "credit": "",
+                "camera": "iPhone X",
+                "caption": "",
+                "created_timestamp": "1522412059",
+                "copyright": "",
+                "focal_length": "6",
+                "iso": "16",
+                "shutter_speed": "0.0047846889952153",
+                "title": "",
+                "orientation": "1",
+                "keywords": []
+            },
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/307",
+                    "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/307/help",
+                    "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880",
+                    "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/posts/295"
+                }
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_308.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_308.json
new file mode 100644
index 000000000000..62530d4cc301
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_308.json
@@ -0,0 +1,62 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wp/v2/sites/106707880/media/308",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "ID": 308,
+            "URL": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg",
+            "guid": "http://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg",
+            "date": "2019-05-08T09:49:00+00:00",
+            "post_ID": 295,
+            "author_ID": 152748359,
+            "file": "img_0111-14.jpg",
+            "mime_type": "image/jpeg",
+            "extension": "jpg",
+            "title": "img_0111",
+            "caption": "",
+            "description": "",
+            "alt": "",
+            "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
+            "thumbnails": {
+                "thumbnail": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=150",
+                "medium": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=300",
+                "large": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=1024",
+                "post-thumbnail": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=740&h=430&crop=1",
+                "independent-publisher-2-banner": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=1440&h=600&crop=1",
+                "independent-publisher-2-full-width": "https://e2eflowtestingmobile.files.wordpress.com/2019/05/img_0111-14.jpg?w=1100"
+            },
+            "height": 3024,
+            "width": 4032,
+            "exif": {
+                "aperture": "2.4",
+                "credit": "",
+                "camera": "iPhone X",
+                "caption": "",
+                "created_timestamp": "1522412059",
+                "copyright": "",
+                "focal_length": "6",
+                "iso": "16",
+                "shutter_speed": "0.0047846889952153",
+                "title": "",
+                "orientation": "1",
+                "keywords": []
+            },
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/308",
+                    "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/308/help",
+                    "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880",
+                    "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/posts/295"
+                }
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_62.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_62.json
index 50a57ce9c3ae..68f96b50c523 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_62.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_62.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/media/62/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/media/62/",
         "queryParameters": {
             "locale": {
                 "matches": "(.*)"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_82.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_82.json
index 02be4fa27ce7..148469222e0a 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_82.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/media_82.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/media/82/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/media/82/",
         "queryParameters": {
             "locale": {
                 "matches": "(.*)"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/rest_v11_sites_158396482_media.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/rest_v11_sites_158396482_media.json
index 5975f1e7ae47..1ce1efaca20a 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/rest_v11_sites_158396482_media.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/rest_v11_sites_158396482_media.json
@@ -6,962 +6,3828 @@
     "response": {
         "status": 200,
         "jsonBody": {
-            "found": 20,
-            "media": [
-                {
-                    "ID": 243,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg",
-                    "date": "2019-03-20T23:56:52+00:00",
-                    "post_ID": 225,
-                    "author_ID": 14151046,
-                    "file": "beach-children-family-39691.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "beach-children-family-39691",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/01/beach-children-family-39691.jpg?w=288"
-                    },
-                    "height": 2446,
-                    "width": 3669,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/243",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/243/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880",
-                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/posts/225"
-                        }
-                    }
-                },
-                {
-                    "ID": 238,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg",
-                    "date": "2019-03-20T23:44:49+00:00",
-                    "post_ID": 237,
-                    "author_ID": 14151046,
-                    "file": "art-bright-celebration-1313817.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "art-bright-celebration-1313817",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/03/art-bright-celebration-1313817.jpg?w=311"
-                    },
-                    "height": 2628,
-                    "width": 4256,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/238",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/238/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880",
-                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/posts/237"
-                        }
-                    }
-                },
-                {
-                    "ID": 211,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg",
-                    "date": "2019-02-06T22:01:32+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "destination-landmark-las-vegas-165799.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "destination-landmark-las-vegas-165799",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/destination-landmark-las-vegas-165799.jpg?w=288"
-                    },
-                    "height": 3072,
-                    "width": 4608,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/211",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/211/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 210,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg",
-                    "date": "2019-02-06T22:01:30+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "dawn-desktop-wallpaper-evening-1612351.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "dawn-desktop-wallpaper-evening-1612351",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/dawn-desktop-wallpaper-evening-1612351.jpg?w=288"
-                    },
-                    "height": 3649,
-                    "width": 5472,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/210",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/210/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 209,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg",
-                    "date": "2019-02-06T22:01:28+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "concert-effect-entertainment-1150837.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "concert-effect-entertainment-1150837",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=288"
-                    },
-                    "height": 4000,
-                    "width": 6000,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/209",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/209/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 208,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg",
-                    "date": "2019-02-06T22:01:26+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "clouds-flight-flying-6881.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "clouds-flight-flying-6881",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=1230&h=1224&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-flight-flying-6881.jpg?w=256"
-                    },
-                    "height": 1224,
-                    "width": 1632,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/208",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/208/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 207,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg",
-                    "date": "2019-02-06T22:01:25+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "clouds-countryside-daylight-51947.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "clouds-countryside-daylight-51947",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-countryside-daylight-51947.jpg?w=288"
-                    },
-                    "height": 1467,
-                    "width": 2200,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/207",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/207/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 206,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg",
-                    "date": "2019-02-06T22:01:23+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "clouds-country-countryside-459063.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "clouds-country-countryside-459063",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=1230&h=926&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-country-countryside-459063.jpg?w=415"
-                    },
-                    "height": 926,
-                    "width": 2001,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/206",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/206/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 205,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg",
-                    "date": "2019-02-06T22:01:21+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "clouds-conifer-daylight-371589.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "clouds-conifer-daylight-371589",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/clouds-conifer-daylight-371589.jpg?w=279"
-                    },
-                    "height": 1846,
-                    "width": 2685,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/205",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/205/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 204,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg",
-                    "date": "2019-02-06T22:01:20+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "celebration-colorful-colourful-587741.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "celebration-colorful-colourful-587741",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-colorful-colourful-587741.jpg?w=288"
-                    },
-                    "height": 3617,
-                    "width": 5425,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/204",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/204/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 203,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg",
-                    "date": "2019-02-06T22:01:18+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "celebration-christmas-dark-625789.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "celebration-christmas-dark-625789",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/celebration-christmas-dark-625789.jpg?w=256"
-                    },
-                    "height": 3024,
-                    "width": 4032,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/203",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/203/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 202,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg",
-                    "date": "2019-02-06T22:01:16+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "catering-decoration-dinner-57980.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "catering-decoration-dinner-57980",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/catering-decoration-dinner-57980.jpg?w=288"
-                    },
-                    "height": 4000,
-                    "width": 6000,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/202",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/202/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 201,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg",
-                    "date": "2019-02-06T22:01:14+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "carnival-carousel-circus-992763.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "carnival-carousel-circus-992763",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=100",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=200",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=683",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/carnival-carousel-circus-992763.jpg?w=128"
-                    },
-                    "height": 5184,
-                    "width": 3456,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/201",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/201/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 200,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg",
-                    "date": "2019-02-06T22:01:12+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "camera-macro-optics-122400.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "camera-macro-optics-122400",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/camera-macro-optics-122400.jpg?w=288"
-                    },
-                    "height": 3840,
-                    "width": 5760,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/200",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/200/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 199,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg",
-                    "date": "2019-02-06T22:01:09+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "camera-cup-device-821750.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "camera-cup-device-821750",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/camera-cup-device-821750.jpg?w=281"
-                    },
-                    "height": 1367,
-                    "width": 2000,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/199",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/199/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 198,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg",
-                    "date": "2019-02-06T22:01:08+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "bright-burning-celebrate-288478.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "bright-burning-celebrate-288478",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/bright-burning-celebrate-288478.jpg?w=256"
-                    },
-                    "height": 3456,
-                    "width": 4608,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/198",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/198/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 197,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg",
-                    "date": "2019-02-06T22:01:06+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "boat-branch-color-772429.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "boat-branch-color-772429",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/boat-branch-color-772429.jpg?w=288"
-                    },
-                    "height": 3739,
-                    "width": 5600,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/197",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/197/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 196,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg",
-                    "date": "2019-02-06T22:01:03+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "bloom-blossom-colorful-69776.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "bloom-blossom-colorful-69776",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-69776.jpg?w=256"
-                    },
-                    "height": 2448,
-                    "width": 3264,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/196",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/196/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                },
-                {
-                    "ID": 195,
-                    "URL": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg",
-                    "guid": "http://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg",
-                    "date": "2019-02-06T22:01:01+00:00",
-                    "post_ID": 0,
-                    "author_ID": 742098,
-                    "file": "bloom-blossom-colorful-66902.jpg",
-                    "mime_type": "image/jpeg",
-                    "extension": "jpg",
-                    "title": "bloom-blossom-colorful-66902",
-                    "caption": "",
-                    "description": "",
-                    "alt": "",
-                    "icon": "https://s1.wp.com/wp-includes/images/media/default.png",
-                    "thumbnails": {
-                        "thumbnail": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=150",
-                        "medium": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=300",
-                        "large": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=1024",
-                        "edin-thumbnail-landscape": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=330&h=240&crop=1",
-                        "edin-thumbnail-square": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=330&h=330&crop=1",
-                        "edin-thumbnail-avatar": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=96&h=96&crop=1",
-                        "edin-featured-image": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=648",
-                        "edin-hero": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=1230&h=1230&crop=1",
-                        "edin-logo": "https://infocusphotographers.files.wordpress.com/2019/02/bloom-blossom-colorful-66902.jpg?w=290"
-                    },
-                    "height": 2024,
-                    "width": 3056,
-                    "exif": {
-                        "aperture": "0",
-                        "credit": "",
-                        "camera": "",
-                        "caption": "",
-                        "created_timestamp": "0",
-                        "copyright": "",
-                        "focal_length": "0",
-                        "iso": "0",
-                        "shutter_speed": "0",
-                        "title": "",
-                        "orientation": "0",
-                        "keywords": []
-                    },
-                    "meta": {
-                        "links": {
-                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/195",
-                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/media/195/help",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880"
-                        }
-                    }
-                }
-            ]
+    "found": 67,
+    "media": [{
+        "ID": 133,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg",
+        "date": "2020-08-24T21:27:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "image-1.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "image-1",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640&h=640&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640&h=640&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640&h=640&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=600&h=640&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640&h=640&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/image-1.jpg?w=640"
         },
+        "height": 640,
+        "width": 640,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/133",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/133\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 132,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg",
+        "date": "2020-08-24T21:01:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-280222-1.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-280222-1",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280222-1.jpg?w=1568"
+        },
+        "height": 1249,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/132",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/132\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 131,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg",
+        "date": "2020-08-24T21:01:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1396132.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1396132",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396132.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/131",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/131\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 130,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg",
+        "date": "2020-08-24T21:01:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-271795.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-271795",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=900&h=1058&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=1200&h=1058&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271795.jpg?w=1568"
+        },
+        "height": 1058,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/130",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/130\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 129,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg",
+        "date": "2020-08-24T21:01:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-271624.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-271624",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271624.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/129",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/129\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 128,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg",
+        "date": "2020-08-24T21:01:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3705529.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3705529",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3705529.jpg?w=1568"
+        },
+        "height": 1245,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/128",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/128\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 127,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg",
+        "date": "2020-08-24T21:01:01-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1454805.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1454805",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=101",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=201",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=687",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=872&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=872&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=872&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=872",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1454805.jpg?w=872"
+        },
+        "height": 1300,
+        "width": 872,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/127",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/127\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 126,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg",
+        "date": "2020-08-24T21:01:00-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-259962.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-259962",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259962.jpg?w=1568"
+        },
+        "height": 1249,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/126",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/126\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 125,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg",
+        "date": "2020-08-24T20:59:59-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "kitchen-stove-sink-kitchen-counter-349749-1.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "kitchen-stove-sink-kitchen-counter-349749-1",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749-1.jpg?w=1568"
+        },
+        "height": 1245,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/125",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/125\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 124,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg",
+        "date": "2020-08-24T20:59:59-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1643383-1.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1643383-1",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383-1.jpg?w=1568"
+        },
+        "height": 1238,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/124",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/124\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 123,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg",
+        "date": "2020-08-24T20:59:59-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-298842.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-298842",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-298842.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/123",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/123\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 122,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg",
+        "date": "2020-08-24T20:59:58-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-276724.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-276724",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=900&h=1058&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=1200&h=1058&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-276724.jpg?w=1568"
+        },
+        "height": 1058,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/122",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/122\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 121,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg",
+        "date": "2020-08-24T20:59:58-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3933278.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3933278",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=100",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=200",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=683",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=867&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=867&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=867&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=867",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3933278.jpg?w=867"
+        },
+        "height": 1300,
+        "width": 867,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/121",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/121\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 120,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg",
+        "date": "2020-08-24T20:59:58-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3932930.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3932930",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=100",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=200",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=683",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=867&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=867&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=867&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=867",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3932930.jpg?w=867"
+        },
+        "height": 1300,
+        "width": 867,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/120",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/120\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 119,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg",
+        "date": "2020-08-24T20:59:58-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1457842.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1457842",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=900&h=1141&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=1200&h=1141&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457842.jpg?w=1568"
+        },
+        "height": 1141,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/119",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/119\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 118,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg",
+        "date": "2020-08-24T20:59:58-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-699459.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-699459",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=113",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=225",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=975&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=975&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=975",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-699459.jpg?w=975"
+        },
+        "height": 1300,
+        "width": 975,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/118",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/118\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 117,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg",
+        "date": "2020-08-24T20:58:37-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-210617-1.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-210617-1",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617-1.jpg?w=1568"
+        },
+        "height": 1259,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/117",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/117\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 116,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg",
+        "date": "2020-08-24T20:58:37-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-206172.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-206172",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-206172.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/116",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/116\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 115,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg",
+        "date": "2020-08-24T20:57:57-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2101086.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2101086",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2101086.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/115",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/115\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 114,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg",
+        "date": "2020-08-24T20:57:57-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-221024.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-221024",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-221024.jpg?w=1568"
+        },
+        "height": 1259,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/114",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/114\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 113,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg",
+        "date": "2020-08-24T20:57:56-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3209049.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3209049",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3209049.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/113",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/113\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 112,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg",
+        "date": "2020-08-24T20:57:26-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-534151-1.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-534151-1",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151-1.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/112",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/112\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 111,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg",
+        "date": "2020-08-24T20:57:26-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-534172.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-534172",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=103",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=207",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=705",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=895&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=895&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=895&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=895",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534172.jpg?w=895"
+        },
+        "height": 1300,
+        "width": 895,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/111",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/111\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 110,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg",
+        "date": "2020-08-24T20:56:44-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2062426.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2062426",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2062426.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/110",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/110\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 109,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg",
+        "date": "2020-08-24T20:56:44-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1080721.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1080721",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1080721.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/109",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/109\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 108,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg",
+        "date": "2020-08-24T20:56:44-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1125136.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1125136",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=100",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=200",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=684",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=868&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=868&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=868&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=868",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1125136.jpg?w=868"
+        },
+        "height": 1300,
+        "width": 868,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/108",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/108\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 107,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg",
+        "date": "2020-08-24T20:56:20-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1571468.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1571468",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571468.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/107",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/107\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 106,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg",
+        "date": "2020-08-24T20:56:19-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1571459.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1571459",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571459.jpg?w=1568"
+        },
+        "height": 1227,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/106",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/106\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 105,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg",
+        "date": "2020-08-24T20:55:47-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1648768.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1648768",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1648768.jpg?w=1537"
+        },
+        "height": 1300,
+        "width": 1537,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/105",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/105\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 104,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg",
+        "date": "2020-08-24T20:55:47-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2747901.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2747901",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2747901.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/104",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/104\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 103,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg",
+        "date": "2020-08-24T20:53:50-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1643389.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1643389",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643389.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/103",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/103\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 102,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-210617.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-210617",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-210617.jpg?w=1568"
+        },
+        "height": 1259,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/102",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/102\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 100,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-534151.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-534151",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-534151.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/100",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/100\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 99,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1396122.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1396122",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1396122.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/99",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/99\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 98,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-259593.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-259593",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-259593.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/98",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/98\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 97,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-238385.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-238385",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=900&h=1092&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=1200&h=1092&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-238385.jpg?w=1568"
+        },
+        "height": 1092,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/97",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/97\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 96,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1571463.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1571463",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1571463.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/96",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/96\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 95,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-271622.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-271622",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271622.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/95",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/95\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 94,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1543447.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1543447",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1543447.jpg?w=1568"
+        },
+        "height": 1209,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/94",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/94\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 93,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3701434.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3701434",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3701434.jpg?w=1568"
+        },
+        "height": 1300,
+        "width": 1733,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/93",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/93\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 92,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-261045.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-261045",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-261045.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/92",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/92\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 91,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2416932.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2416932",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2416932.jpg?w=1568"
+        },
+        "height": 1300,
+        "width": 1781,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/91",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/91\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 90,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3724312.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3724312",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3724312.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/90",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/90\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 89,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2251247.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2251247",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2251247.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/89",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/89\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 88,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1643383.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1643383",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1643383.jpg?w=1568"
+        },
+        "height": 1238,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/88",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/88\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 87,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3935338.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3935338",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935338.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/87",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/87\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 86,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1918291.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1918291",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=900&h=1058&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=1200&h=1058&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1918291.jpg?w=1568"
+        },
+        "height": 1058,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/86",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/86\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 85,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg",
+        "date": "2020-08-24T20:53:49-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3935314.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3935314",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3935314.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/85",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/85\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 84,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "living-room-couch-interior-room-584399.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "living-room-couch-interior-room-584399",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/living-room-couch-interior-room-584399.jpg?w=1568"
+        },
+        "height": 1244,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/84",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/84\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 83,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-277667.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-277667",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-277667.jpg?w=1568"
+        },
+        "height": 1258,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/83",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/83\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 82,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3915710.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3915710",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3915710.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/82",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/82\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 81,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "kitchen-stove-sink-kitchen-counter-349749.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "kitchen-stove-sink-kitchen-counter-349749",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/kitchen-stove-sink-kitchen-counter-349749.jpg?w=1568"
+        },
+        "height": 1245,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/81",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/81\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 80,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2724749.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2724749",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2724749.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/80",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/80\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 79,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-323780.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-323780",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-323780.jpg?w=1568"
+        },
+        "height": 1212,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/79",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/79\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 78,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-279648.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-279648",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-279648.jpg?w=1318"
+        },
+        "height": 1300,
+        "width": 1318,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/78",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/78\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 77,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-280232.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-280232",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-280232.jpg?w=1568"
+        },
+        "height": 1249,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/77",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/77\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 76,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3016430.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3016430",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3016430.jpg?w=1568"
+        },
+        "height": 1300,
+        "width": 1733,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/76",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/76\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 75,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg",
+        "date": "2020-08-24T20:53:48-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3214064.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3214064",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3214064.jpg?w=1568"
+        },
+        "height": 1253,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/75",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/75\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 74,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg",
+        "date": "2020-08-24T20:53:47-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3723719.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3723719",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=113",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=225",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=975&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=975&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=975",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3723719.jpg?w=975"
+        },
+        "height": 1300,
+        "width": 975,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/74",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/74\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 73,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg",
+        "date": "2020-08-24T20:53:47-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-262048.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-262048",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-262048.jpg?w=1568"
+        },
+        "height": 1300,
+        "width": 1823,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/73",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/73\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 72,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg",
+        "date": "2020-08-24T20:53:46-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-2635038.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-2635038",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=1200&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=1200&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=1200",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-2635038.jpg?w=1568"
+        },
+        "height": 1255,
+        "width": 1880,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/72",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/72\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 71,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg",
+        "date": "2020-08-24T20:53:45-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3315291.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3315291",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=125",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=250",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=1083&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=1083&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=1083",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3315291.jpg?w=1083"
+        },
+        "height": 1300,
+        "width": 1083,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/71",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/71\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 70,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg",
+        "date": "2020-08-24T20:53:45-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-4099300.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-4099300",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=120",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=240",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=1040&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=1040&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=1040",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-4099300.jpg?w=1040"
+        },
+        "height": 1300,
+        "width": 1040,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/70",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/70\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 69,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg",
+        "date": "2020-08-24T20:53:42-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-3554424.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-3554424",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=100",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=200",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=683",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=867&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=867&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=867&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=867",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-3554424.jpg?w=867"
+        },
+        "height": 1300,
+        "width": 867,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/69",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/69\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 68,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg",
+        "date": "2020-08-24T20:53:42-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-271631.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-271631",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=100",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=200",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=684",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=868&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=868&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=868&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=868",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-271631.jpg?w=868"
+        },
+        "height": 1300,
+        "width": 868,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/68",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/68\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 67,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg",
+        "date": "2020-08-24T20:53:42-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "pexels-photo-1457847.jpg",
+        "mime_type": "image\/jpeg",
+        "extension": "jpg",
+        "title": "pexels-photo-1457847",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=111",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=222",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=750",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=963&h=900&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=900&h=1200&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=963&h=1200&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=800&h=600&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=600&h=800&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=800&h=800&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=963",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/pexels-photo-1457847.jpg?w=963"
+        },
+        "height": 1300,
+        "width": 963,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "1",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/67",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/67\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }, {
+        "ID": 30,
+        "URL": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png",
+        "guid": "http:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png",
+        "date": "2020-08-24T13:58:54-07:00",
+        "post_ID": 0,
+        "author_ID": 191794483,
+        "file": "real-estate.png",
+        "mime_type": "image\/png",
+        "extension": "png",
+        "title": "Real Estate",
+        "caption": "",
+        "description": "",
+        "alt": "",
+        "icon": "https:\/\/s0.wp.com\/wp-includes\/images\/media\/default.png",
+        "thumbnails": {
+            "thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=150",
+            "medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=300",
+            "large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512",
+            "newspack-article-block-landscape-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512&h=512&crop=1",
+            "newspack-article-block-portrait-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512&h=512&crop=1",
+            "newspack-article-block-square-large": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512&h=512&crop=1",
+            "newspack-article-block-landscape-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512&h=512&crop=1",
+            "newspack-article-block-portrait-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512&h=512&crop=1",
+            "newspack-article-block-square-medium": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512&h=512&crop=1",
+            "newspack-article-block-landscape-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=400&h=300&crop=1",
+            "newspack-article-block-portrait-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=300&h=400&crop=1",
+            "newspack-article-block-square-small": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=400&h=400&crop=1",
+            "newspack-article-block-landscape-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=200&h=150&crop=1",
+            "newspack-article-block-portrait-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=150&h=200&crop=1",
+            "newspack-article-block-square-tiny": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=200&h=200&crop=1",
+            "newspack-article-block-uncropped": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512",
+            "post-thumbnail": "https:\/\/tricountyrealestate.files.wordpress.com\/2020\/08\/real-estate.png?w=512"
+        },
+        "height": 512,
+        "width": 512,
+        "exif": {
+            "aperture": "0",
+            "credit": "",
+            "camera": "",
+            "caption": "",
+            "created_timestamp": "0",
+            "copyright": "",
+            "focal_length": "0",
+            "iso": "0",
+            "shutter_speed": "0",
+            "title": "",
+            "orientation": "0",
+            "keywords": []
+        },
+        "meta": {
+            "links": {
+                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/30",
+                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541\/media\/30\/help",
+                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851541"
+            }
+        }
+    }]
+},
         "headers": {
             "Content-Type": "application/json",
             "Connection": "keep-alive",
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/v2_sites_181851495_media.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/v2_sites_181851495_media.json
new file mode 100644
index 000000000000..89ef0bae62b9
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/v2_sites_181851495_media.json
@@ -0,0 +1,1163 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/wp/v2/sites/181851495/media"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": [{
+      "id": 65,
+      "date": "2020-08-27T16:30:36",
+      "date_gmt": "2020-08-27T23:30:36",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg"
+      },
+      "modified": "2020-08-27T16:31:03",
+      "modified_gmt": "2020-08-27T23:31:03",
+      "slug": "image-2",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/image-2\/",
+      "title": {
+        "rendered": "image"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-13",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg'><img width=\"214\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=214&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=214 214w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=428 428w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=107 107w\" sizes=\"(max-width: 214px) 100vw, 214px\" data-attachment-id=\"65\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/image-2\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg\" data-orig-size=\"1320,1848\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"image\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=214\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=731\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1320,
+        "height": 1848,
+        "file": "2020\/08\/image-1.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "image-1.jpg?w=107",
+            "width": 107,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=107"
+          },
+          "medium": {
+            "file": "image-1.jpg?w=214",
+            "width": 214,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=214"
+          },
+          "large": {
+            "file": "image-1.jpg?w=731",
+            "width": 731,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=731"
+          },
+          "full": {
+            "file": "image-1.jpg",
+            "width": 1024,
+            "height": 1434,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 702736
+      },
+      "post": 45,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/65"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=65"
+        }]
+      }
+    }, {
+      "id": 63,
+      "date": "2020-08-26T12:20:02",
+      "date_gmt": "2020-08-26T19:20:02",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg"
+      },
+      "modified": "2020-08-26T12:20:02",
+      "modified_gmt": "2020-08-26T19:20:02",
+      "slug": "wp-1598469598971",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/wp-1598469598971\/",
+      "title": {
+        "rendered": "wp-1598469598971.jpg"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-11",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg'><img width=\"200\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200 200w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=400 400w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=100 100w\" sizes=\"(max-width: 200px) 100vw, 200px\" data-attachment-id=\"63\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/wp-1598469598971\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg\" data-orig-size=\"1851,2780\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"wp-1598469598971.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=682\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1851,
+        "height": 2780,
+        "file": "2020\/08\/wp-1598469598971.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "wp-1598469598971.jpg?w=100",
+            "width": 100,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=100"
+          },
+          "medium": {
+            "file": "wp-1598469598971.jpg?w=200",
+            "width": 200,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200"
+          },
+          "large": {
+            "file": "wp-1598469598971.jpg?w=682",
+            "width": 682,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=682"
+          },
+          "full": {
+            "file": "wp-1598469598971.jpg",
+            "width": 1024,
+            "height": 1538,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 437547
+      },
+      "post": 45,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/63"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=63"
+        }]
+      }
+    }, {
+      "id": 61,
+      "date": "2020-08-25T12:05:54",
+      "date_gmt": "2020-08-25T19:05:54",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg"
+      },
+      "modified": "2020-08-25T12:10:32",
+      "modified_gmt": "2020-08-25T19:10:32",
+      "slug": "image",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/image\/",
+      "title": {
+        "rendered": "image"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-Z",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg'><img width=\"300\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=300&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=600 600w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"61\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/image\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg\" data-orig-size=\"1846,1848\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"image\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1846,
+        "height": 1848,
+        "file": "2020\/08\/image.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "image.jpg?w=150",
+            "width": 150,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=150"
+          },
+          "medium": {
+            "file": "image.jpg?w=300",
+            "width": 300,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=300"
+          },
+          "large": {
+            "file": "image.jpg?w=1024",
+            "width": "1024",
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=1024"
+          },
+          "full": {
+            "file": "image.jpg",
+            "width": 1024,
+            "height": 1025,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 936680
+      },
+      "post": 45,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/61"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=61"
+        }]
+      }
+    }, {
+      "id": 49,
+      "date": "2020-08-24T12:07:27",
+      "date_gmt": "2020-08-24T19:07:27",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg"
+      },
+      "modified": "2020-08-24T12:07:27",
+      "modified_gmt": "2020-08-24T19:07:27",
+      "slug": "alvan-nee-1vgfqdcux-4-unsplash",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/alvan-nee-1vgfqdcux-4-unsplash\/",
+      "title": {
+        "rendered": "alvan-nee-1vgfqdcux-4-unsplash"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-N",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg'><img width=\"200\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=200&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=200 200w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=400 400w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=100 100w\" sizes=\"(max-width: 200px) 100vw, 200px\" data-attachment-id=\"49\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/alvan-nee-1vgfqdcux-4-unsplash\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg\" data-orig-size=\"1851,2780\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"alvan-nee-1vgfqdcux-4-unsplash\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=200\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=682\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1851,
+        "height": 2780,
+        "file": "2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "alvan-nee-1vgfqdcux-4-unsplash.jpg?w=100",
+            "width": 100,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=100"
+          },
+          "medium": {
+            "file": "alvan-nee-1vgfqdcux-4-unsplash.jpg?w=200",
+            "width": 200,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=200"
+          },
+          "large": {
+            "file": "alvan-nee-1vgfqdcux-4-unsplash.jpg?w=682",
+            "width": 682,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg?w=682"
+          },
+          "full": {
+            "file": "alvan-nee-1vgfqdcux-4-unsplash.jpg",
+            "width": 1024,
+            "height": 1538,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 437547
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/49"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=49"
+        }]
+      }
+    }, {
+      "id": 47,
+      "date": "2020-08-24T12:06:47",
+      "date_gmt": "2020-08-24T19:06:47",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg"
+      },
+      "modified": "2020-08-24T12:06:47",
+      "modified_gmt": "2020-08-24T19:06:47",
+      "slug": "boney-dhirbh9en6i-unsplash",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/boney-dhirbh9en6i-unsplash\/",
+      "title": {
+        "rendered": "boney-dhirbh9en6i-unsplash"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-L",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg'><img width=\"300\" height=\"200\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=300&#038;h=200\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=600 600w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"47\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/boney-dhirbh9en6i-unsplash\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg\" data-orig-size=\"4179,2781\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"boney-dhirbh9en6i-unsplash\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 4179,
+        "height": 2781,
+        "file": "2020\/08\/boney-dhirbh9en6i-unsplash.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "boney-dhirbh9en6i-unsplash.jpg?w=150",
+            "width": 150,
+            "height": 100,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=150"
+          },
+          "medium": {
+            "file": "boney-dhirbh9en6i-unsplash.jpg?w=300",
+            "width": 300,
+            "height": 200,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=300"
+          },
+          "large": {
+            "file": "boney-dhirbh9en6i-unsplash.jpg?w=1024",
+            "width": 1024,
+            "height": 681,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg?w=1024"
+          },
+          "full": {
+            "file": "boney-dhirbh9en6i-unsplash.jpg",
+            "width": 1024,
+            "height": 681,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 1707842
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/47"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=47"
+        }]
+      }
+    }, {
+      "id": 39,
+      "date": "2020-08-21T16:31:38",
+      "date_gmt": "2020-08-21T23:31:38",
+      "guid": {
+        "rendered": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png"
+      },
+      "modified": "2020-08-21T16:31:38",
+      "modified_gmt": "2020-08-21T23:31:38",
+      "slug": "cropped-fourpaws-logo-2-1-png",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/cropped-fourpaws-logo-2-1-png\/",
+      "title": {
+        "rendered": "cropped-fourpaws-logo-2-1.png"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-D",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png'><img width=\"300\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=300&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=150 150w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png 512w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"39\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/cropped-fourpaws-logo-2-1-png\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png\" data-orig-size=\"512,512\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"cropped-fourpaws-logo-2-1.png\" data-image-description=\"&lt;p&gt;https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=512\" \/><\/a><\/p>\n<p><a href=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png\"><img src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png\" style=\"max-width:100%;\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/png",
+      "media_details": {
+        "width": 512,
+        "height": 512,
+        "file": "2020\/08\/cropped-fourpaws-logo-2-1.png",
+        "sizes": {
+          "site_icon-270": {
+            "file": "cropped-fourpaws-logo-2-1-270x270.png",
+            "width": 270,
+            "height": 270,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=512"
+          },
+          "site_icon-192": {
+            "file": "cropped-fourpaws-logo-2-1-192x192.png",
+            "width": 192,
+            "height": 192,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=512"
+          },
+          "site_icon-180": {
+            "file": "cropped-fourpaws-logo-2-1-180x180.png",
+            "width": 180,
+            "height": 180,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=512"
+          },
+          "site_icon-32": {
+            "file": "cropped-fourpaws-logo-2-1-32x32.png",
+            "width": 32,
+            "height": 32,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=512"
+          },
+          "thumbnail": {
+            "file": "cropped-fourpaws-logo-2-1.png?w=150",
+            "width": 150,
+            "height": 150,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=150"
+          },
+          "medium": {
+            "file": "cropped-fourpaws-logo-2-1.png?w=300",
+            "width": 300,
+            "height": 300,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=300"
+          },
+          "large": {
+            "file": "cropped-fourpaws-logo-2-1.png?w=512",
+            "width": 512,
+            "height": 512,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=512"
+          },
+          "full": {
+            "file": "cropped-fourpaws-logo-2-1.png",
+            "width": 512,
+            "height": 512,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 11020
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/39"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=39"
+        }]
+      }
+    }, {
+      "id": 37,
+      "date": "2020-08-21T16:30:59",
+      "date_gmt": "2020-08-21T23:30:59",
+      "guid": {
+        "rendered": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png"
+      },
+      "modified": "2020-08-21T16:30:59",
+      "modified_gmt": "2020-08-21T23:30:59",
+      "slug": "cropped-fourpaws-logo-2-png",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/cropped-fourpaws-logo-2-png\/",
+      "title": {
+        "rendered": "cropped-fourpaws-logo-2.png"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-B",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png'><img width=\"300\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=300&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=150 150w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png 512w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"37\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/cropped-fourpaws-logo-2-png\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png\" data-orig-size=\"512,512\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"cropped-fourpaws-logo-2.png\" data-image-description=\"&lt;p&gt;https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=512\" \/><\/a><\/p>\n<p><a href=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png\"><img src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png\" style=\"max-width:100%;\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/png",
+      "media_details": {
+        "width": 512,
+        "height": 512,
+        "file": "2020\/08\/cropped-fourpaws-logo-2.png",
+        "sizes": {
+          "thumbnail": {
+            "file": "cropped-fourpaws-logo-2.png?w=150",
+            "width": 150,
+            "height": 150,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=150"
+          },
+          "medium": {
+            "file": "cropped-fourpaws-logo-2.png?w=300",
+            "width": 300,
+            "height": 300,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=300"
+          },
+          "large": {
+            "file": "cropped-fourpaws-logo-2.png?w=512",
+            "width": 512,
+            "height": 512,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png?w=512"
+          },
+          "full": {
+            "file": "cropped-fourpaws-logo-2.png",
+            "width": 512,
+            "height": 512,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 11020
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2.png",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/37"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=37"
+        }]
+      }
+    }, {
+      "id": 36,
+      "date": "2020-08-21T16:30:52",
+      "date_gmt": "2020-08-21T23:30:52",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png"
+      },
+      "modified": "2020-08-21T16:30:52",
+      "modified_gmt": "2020-08-21T23:30:52",
+      "slug": "fourpaws-logo-3",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/fourpaws-logo-3\/",
+      "title": {
+        "rendered": "FourPaws Logo"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-A",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png'><img width=\"300\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=300&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=150 150w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png 512w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"36\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/fourpaws-logo-3\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png\" data-orig-size=\"512,512\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"FourPaws Logo\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=512\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/png",
+      "media_details": {
+        "width": 512,
+        "height": 512,
+        "file": "2020\/08\/fourpaws-logo-2.png",
+        "sizes": {
+          "thumbnail": {
+            "file": "fourpaws-logo-2.png?w=150",
+            "width": 150,
+            "height": 150,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=150"
+          },
+          "medium": {
+            "file": "fourpaws-logo-2.png?w=300",
+            "width": 300,
+            "height": 300,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=300"
+          },
+          "large": {
+            "file": "fourpaws-logo-2.png?w=512",
+            "width": 512,
+            "height": 512,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png?w=512"
+          },
+          "full": {
+            "file": "fourpaws-logo-2.png",
+            "width": 512,
+            "height": 512,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 6945
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-2.png",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/36"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=36"
+        }]
+      }
+    }, {
+      "id": 34,
+      "date": "2020-08-21T16:29:57",
+      "date_gmt": "2020-08-21T23:29:57",
+      "guid": {
+        "rendered": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png"
+      },
+      "modified": "2020-08-21T16:29:57",
+      "modified_gmt": "2020-08-21T23:29:57",
+      "slug": "cropped-fourpaws-logo-1-png",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/cropped-fourpaws-logo-1-png\/",
+      "title": {
+        "rendered": "cropped-fourpaws-logo-1.png"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-y",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png'><img width=\"300\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=300&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=150 150w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png 400w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"34\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/cropped-fourpaws-logo-1-png\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png\" data-orig-size=\"400,400\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"cropped-fourpaws-logo-1.png\" data-image-description=\"&lt;p&gt;https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png&lt;\/p&gt;\n\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=400\" \/><\/a><\/p>\n<p><a href=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png\"><img src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png\" style=\"max-width:100%;\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/png",
+      "media_details": {
+        "width": 400,
+        "height": 400,
+        "file": "2020\/08\/cropped-fourpaws-logo-1.png",
+        "sizes": {
+          "thumbnail": {
+            "file": "cropped-fourpaws-logo-1.png?w=150",
+            "width": 150,
+            "height": 150,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=150"
+          },
+          "medium": {
+            "file": "cropped-fourpaws-logo-1.png?w=300",
+            "width": 300,
+            "height": 300,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=300"
+          },
+          "large": {
+            "file": "cropped-fourpaws-logo-1.png?w=400",
+            "width": 400,
+            "height": 400,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png?w=400"
+          },
+          "full": {
+            "file": "cropped-fourpaws-logo-1.png",
+            "width": 400,
+            "height": 400,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 8523
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-1.png",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/34"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=34"
+        }]
+      }
+    }, {
+      "id": 33,
+      "date": "2020-08-21T16:29:49",
+      "date_gmt": "2020-08-21T23:29:49",
+      "guid": {
+        "rendered": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png"
+      },
+      "modified": "2020-08-21T16:29:49",
+      "modified_gmt": "2020-08-21T23:29:49",
+      "slug": "fourpaws-logo-2",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/fourpawsdoggrooming.wordpress.com\/fourpaws-logo-2\/",
+      "title": {
+        "rendered": "FourPaws Logo"
+      },
+      "author": 14151046,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acj1SD-x",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png'><img width=\"300\" height=\"300\" src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=300&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=300 300w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=150 150w, https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png 400w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"33\" data-permalink=\"https:\/\/fourpawsdoggrooming.wordpress.com\/fourpaws-logo-2\/\" data-orig-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png\" data-orig-size=\"400,400\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"FourPaws Logo\" data-image-description=\"\" data-medium-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=300\" data-large-file=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=400\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/png",
+      "media_details": {
+        "width": 400,
+        "height": 400,
+        "file": "2020\/08\/fourpaws-logo-1.png",
+        "sizes": {
+          "thumbnail": {
+            "file": "fourpaws-logo-1.png?w=150",
+            "width": 150,
+            "height": 150,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=150"
+          },
+          "medium": {
+            "file": "fourpaws-logo-1.png?w=300",
+            "width": 300,
+            "height": 300,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=300"
+          },
+          "large": {
+            "file": "fourpaws-logo-1.png?w=400",
+            "width": 400,
+            "height": 400,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png?w=400"
+          },
+          "full": {
+            "file": "fourpaws-logo-1.png",
+            "width": 400,
+            "height": 400,
+            "mime_type": "image\/png",
+            "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 5332
+      },
+      "post": null,
+      "source_url": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/fourpaws-logo-1.png",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media\/33"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/users\/14151046"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181851495\/comments?post=33"
+        }]
+      }
+    }],
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache, must-revalidate, max-age=0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/v2_sites_181977606_media.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/v2_sites_181977606_media.json
new file mode 100644
index 000000000000..3db0138862bb
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/media/v2_sites_181977606_media.json
@@ -0,0 +1,1135 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/wp/v2/sites/181977606/media"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": [{
+      "id": 54,
+      "date": "2020-09-04T22:49:13",
+      "date_gmt": "2020-09-04T22:49:13",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg"
+      },
+      "modified": "2020-09-04T22:49:13",
+      "modified_gmt": "2020-09-04T22:49:13",
+      "slug": "wp-1599259750300",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750300\/",
+      "title": {
+        "rendered": "wp-1599259750300.jpg"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-S",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg'><img width=\"169\" height=\"300\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=169&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=169 169w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=338 338w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=84 84w\" sizes=\"(max-width: 169px) 100vw, 169px\" data-attachment-id=\"54\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750300\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg\" data-orig-size=\"1080,1920\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"wp-1599259750300.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=169\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=576\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1080,
+        "height": 1920,
+        "file": "2020\/09\/wp-1599259750300.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "wp-1599259750300.jpg?w=84",
+            "width": 84,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=84"
+          },
+          "medium": {
+            "file": "wp-1599259750300.jpg?w=169",
+            "width": 169,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=169"
+          },
+          "large": {
+            "file": "wp-1599259750300.jpg?w=576",
+            "width": 576,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg?w=576"
+          },
+          "full": {
+            "file": "wp-1599259750300.jpg",
+            "width": 1024,
+            "height": 1820,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 1185510
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750300.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/54"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=54"
+        }]
+      }
+    }, {
+      "id": 53,
+      "date": "2020-09-04T22:49:13",
+      "date_gmt": "2020-09-04T22:49:13",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg"
+      },
+      "modified": "2020-09-04T22:49:13",
+      "modified_gmt": "2020-09-04T22:49:13",
+      "slug": "wp-1599259750281",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750281\/",
+      "title": {
+        "rendered": "wp-1599259750281.jpg"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-R",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg'><img width=\"169\" height=\"300\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=169&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=169 169w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=338 338w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=84 84w\" sizes=\"(max-width: 169px) 100vw, 169px\" data-attachment-id=\"53\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750281\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg\" data-orig-size=\"1080,1920\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"wp-1599259750281.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=169\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=576\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1080,
+        "height": 1920,
+        "file": "2020\/09\/wp-1599259750281.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "wp-1599259750281.jpg?w=84",
+            "width": 84,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=84"
+          },
+          "medium": {
+            "file": "wp-1599259750281.jpg?w=169",
+            "width": 169,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=169"
+          },
+          "large": {
+            "file": "wp-1599259750281.jpg?w=576",
+            "width": 576,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg?w=576"
+          },
+          "full": {
+            "file": "wp-1599259750281.jpg",
+            "width": 1024,
+            "height": 1820,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 1237165
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750281.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/53"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=53"
+        }]
+      }
+    }, {
+      "id": 52,
+      "date": "2020-09-04T22:49:13",
+      "date_gmt": "2020-09-04T22:49:13",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg"
+      },
+      "modified": "2020-09-04T22:49:13",
+      "modified_gmt": "2020-09-04T22:49:13",
+      "slug": "wp-1599259750292",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750292\/",
+      "title": {
+        "rendered": "wp-1599259750292.jpg"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-Q",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg'><img width=\"169\" height=\"300\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=169&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=169 169w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=338 338w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=84 84w\" sizes=\"(max-width: 169px) 100vw, 169px\" data-attachment-id=\"52\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750292\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg\" data-orig-size=\"1080,1920\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"wp-1599259750292.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=169\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=576\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1080,
+        "height": 1920,
+        "file": "2020\/09\/wp-1599259750292.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "wp-1599259750292.jpg?w=84",
+            "width": 84,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=84"
+          },
+          "medium": {
+            "file": "wp-1599259750292.jpg?w=169",
+            "width": 169,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=169"
+          },
+          "large": {
+            "file": "wp-1599259750292.jpg?w=576",
+            "width": 576,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg?w=576"
+          },
+          "full": {
+            "file": "wp-1599259750292.jpg",
+            "width": 1024,
+            "height": 1820,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 1266683
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750292.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/52"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=52"
+        }]
+      }
+    }, {
+      "id": 51,
+      "date": "2020-09-04T22:49:13",
+      "date_gmt": "2020-09-04T22:49:13",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg"
+      },
+      "modified": "2020-09-04T22:49:13",
+      "modified_gmt": "2020-09-04T22:49:13",
+      "slug": "wp-1599259750308",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750308\/",
+      "title": {
+        "rendered": "wp-1599259750308.jpg"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-P",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg'><img width=\"169\" height=\"300\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=169&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=169 169w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=338 338w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=84 84w\" sizes=\"(max-width: 169px) 100vw, 169px\" data-attachment-id=\"51\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750308\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg\" data-orig-size=\"1080,1920\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"wp-1599259750308.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=169\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=576\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1080,
+        "height": 1920,
+        "file": "2020\/09\/wp-1599259750308.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "wp-1599259750308.jpg?w=84",
+            "width": 84,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=84"
+          },
+          "medium": {
+            "file": "wp-1599259750308.jpg?w=169",
+            "width": 169,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=169"
+          },
+          "large": {
+            "file": "wp-1599259750308.jpg?w=576",
+            "width": 576,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg?w=576"
+          },
+          "full": {
+            "file": "wp-1599259750308.jpg",
+            "width": 1024,
+            "height": 1820,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 1292188
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750308.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/51"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=51"
+        }]
+      }
+    }, {
+      "id": 50,
+      "date": "2020-09-04T22:49:13",
+      "date_gmt": "2020-09-04T22:49:13",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg"
+      },
+      "modified": "2020-09-04T22:49:13",
+      "modified_gmt": "2020-09-04T22:49:13",
+      "slug": "wp-1599259750265",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750265\/",
+      "title": {
+        "rendered": "wp-1599259750265.jpg"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-O",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg'><img width=\"169\" height=\"300\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=169&#038;h=300\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=169 169w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=338 338w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=84 84w\" sizes=\"(max-width: 169px) 100vw, 169px\" data-attachment-id=\"50\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/wp-1599259750265\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg\" data-orig-size=\"1080,1920\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"wp-1599259750265.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=169\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=576\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1080,
+        "height": 1920,
+        "file": "2020\/09\/wp-1599259750265.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "wp-1599259750265.jpg?w=84",
+            "width": 84,
+            "height": 150,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=84"
+          },
+          "medium": {
+            "file": "wp-1599259750265.jpg?w=169",
+            "width": 169,
+            "height": 300,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=169"
+          },
+          "large": {
+            "file": "wp-1599259750265.jpg?w=576",
+            "width": 576,
+            "height": 1024,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg?w=576"
+          },
+          "full": {
+            "file": "wp-1599259750265.jpg",
+            "width": 1024,
+            "height": 1820,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "0",
+          "keywords": []
+        },
+        "filesize": 1645026
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/09\/wp-1599259750265.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/50"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=50"
+        }]
+      }
+    }, {
+      "id": 49,
+      "date": "2020-08-26T22:12:44",
+      "date_gmt": "2020-08-26T22:12:44",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg"
+      },
+      "modified": "2020-08-26T22:12:44",
+      "modified_gmt": "2020-08-26T22:12:44",
+      "slug": "pexels-photo-732548",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-732548\/",
+      "title": {
+        "rendered": "pexels-photo-732548"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-N",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg'><img width=\"300\" height=\"200\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=300&#038;h=200\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=300 300w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=600 600w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"49\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-732548\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg\" data-orig-size=\"1880,1253\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"pexels-photo-732548\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=300\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1880,
+        "height": 1253,
+        "file": "2020\/08\/pexels-photo-732548.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "pexels-photo-732548.jpg?w=150",
+            "width": 150,
+            "height": 100,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=150"
+          },
+          "medium": {
+            "file": "pexels-photo-732548.jpg?w=300",
+            "width": 300,
+            "height": 200,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=300"
+          },
+          "large": {
+            "file": "pexels-photo-732548.jpg?w=1024",
+            "width": 1024,
+            "height": 682,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg?w=1024"
+          },
+          "full": {
+            "file": "pexels-photo-732548.jpg",
+            "width": 1024,
+            "height": 682,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 2850496
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-732548.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/49"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=49"
+        }]
+      }
+    }, {
+      "id": 48,
+      "date": "2020-08-26T22:12:44",
+      "date_gmt": "2020-08-26T22:12:44",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg"
+      },
+      "modified": "2020-08-26T22:12:44",
+      "modified_gmt": "2020-08-26T22:12:44",
+      "slug": "pexels-photo-131723",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-131723\/",
+      "title": {
+        "rendered": "pexels-photo-131723"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-M",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg'><img width=\"300\" height=\"199\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=300&#038;h=199\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=300 300w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=600 600w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"48\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-131723\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg\" data-orig-size=\"1880,1249\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"pexels-photo-131723\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=300\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1880,
+        "height": 1249,
+        "file": "2020\/08\/pexels-photo-131723.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "pexels-photo-131723.jpg?w=150",
+            "width": 150,
+            "height": 100,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=150"
+          },
+          "medium": {
+            "file": "pexels-photo-131723.jpg?w=300",
+            "width": 300,
+            "height": 199,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=300"
+          },
+          "large": {
+            "file": "pexels-photo-131723.jpg?w=1024",
+            "width": 1024,
+            "height": 680,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg?w=1024"
+          },
+          "full": {
+            "file": "pexels-photo-131723.jpg",
+            "width": 1024,
+            "height": 680,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 2579198
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-131723.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/48"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=48"
+        }]
+      }
+    }, {
+      "id": 47,
+      "date": "2020-08-26T22:12:44",
+      "date_gmt": "2020-08-26T22:12:44",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg"
+      },
+      "modified": "2020-08-26T22:12:44",
+      "modified_gmt": "2020-08-26T22:12:44",
+      "slug": "pexels-photo-1237119",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-1237119\/",
+      "title": {
+        "rendered": "pexels-photo-1237119"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-L",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg'><img width=\"300\" height=\"199\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=300&#038;h=199\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=300 300w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=600 600w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"47\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-1237119\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg\" data-orig-size=\"1880,1250\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"pexels-photo-1237119\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=300\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1880,
+        "height": 1250,
+        "file": "2020\/08\/pexels-photo-1237119.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "pexels-photo-1237119.jpg?w=150",
+            "width": 150,
+            "height": 100,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=150"
+          },
+          "medium": {
+            "file": "pexels-photo-1237119.jpg?w=300",
+            "width": 300,
+            "height": 199,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=300"
+          },
+          "large": {
+            "file": "pexels-photo-1237119.jpg?w=1024",
+            "width": 1024,
+            "height": 681,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg?w=1024"
+          },
+          "full": {
+            "file": "pexels-photo-1237119.jpg",
+            "width": 1024,
+            "height": 681,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 2424849
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-1237119.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/47"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=47"
+        }]
+      }
+    }, {
+      "id": 46,
+      "date": "2020-08-26T22:12:44",
+      "date_gmt": "2020-08-26T22:12:44",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg"
+      },
+      "modified": "2020-08-26T22:12:44",
+      "modified_gmt": "2020-08-26T22:12:44",
+      "slug": "pexels-photo-371589",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-371589\/",
+      "title": {
+        "rendered": "pexels-photo-371589"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-K",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg'><img width=\"300\" height=\"206\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=300&#038;h=206\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=300 300w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=600 600w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"46\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-371589\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg\" data-orig-size=\"1880,1293\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"pexels-photo-371589\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=300\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1880,
+        "height": 1293,
+        "file": "2020\/08\/pexels-photo-371589.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "pexels-photo-371589.jpg?w=150",
+            "width": 150,
+            "height": 103,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=150"
+          },
+          "medium": {
+            "file": "pexels-photo-371589.jpg?w=300",
+            "width": 300,
+            "height": 206,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=300"
+          },
+          "large": {
+            "file": "pexels-photo-371589.jpg?w=1024",
+            "width": 1024,
+            "height": 704,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg?w=1024"
+          },
+          "full": {
+            "file": "pexels-photo-371589.jpg",
+            "width": 1024,
+            "height": 704,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 2563558
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-371589.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/46"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=46"
+        }]
+      }
+    }, {
+      "id": 45,
+      "date": "2020-08-26T22:12:44",
+      "date_gmt": "2020-08-26T22:12:44",
+      "guid": {
+        "rendered": "http:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg"
+      },
+      "modified": "2020-08-26T22:12:44",
+      "modified_gmt": "2020-08-26T22:12:44",
+      "slug": "pexels-photo-235734",
+      "status": "inherit",
+      "type": "attachment",
+      "link": "https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-235734\/",
+      "title": {
+        "rendered": "pexels-photo-235734"
+      },
+      "author": 191794483,
+      "comment_status": "open",
+      "ping_status": "closed",
+      "template": "",
+      "meta": {
+        "_coblocks_attr": "",
+        "_coblocks_dimensions": "",
+        "_coblocks_responsive_height": "",
+        "_coblocks_accordion_ie_support": "",
+        "advanced_seo_description": "",
+        "amp_status": "",
+        "spay_email": ""
+      },
+      "jetpack_shortlink": "https:\/\/wp.me\/acjyGG-J",
+      "jetpack_sharing_enabled": true,
+      "jetpack_likes_enabled": true,
+      "description": {
+        "rendered": "<p class=\"attachment\"><a href='https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg'><img width=\"300\" height=\"200\" src=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=300&#038;h=200\" class=\"attachment-medium size-medium\" alt=\"\" loading=\"lazy\" srcset=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=300 300w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=600 600w, https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=150 150w\" sizes=\"(max-width: 300px) 100vw, 300px\" data-attachment-id=\"45\" data-permalink=\"https:\/\/weekendbakesblog.wordpress.com\/pexels-photo-235734\/\" data-orig-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg\" data-orig-size=\"1880,1253\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"pexels-photo-235734\" data-image-description=\"\" data-medium-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=300\" data-large-file=\"https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=1024\" \/><\/a><\/p>\n"
+      },
+      "caption": {
+        "rendered": ""
+      },
+      "alt_text": "",
+      "media_type": "image",
+      "mime_type": "image\/jpeg",
+      "media_details": {
+        "width": 1880,
+        "height": 1253,
+        "file": "2020\/08\/pexels-photo-235734.jpg",
+        "sizes": {
+          "thumbnail": {
+            "file": "pexels-photo-235734.jpg?w=150",
+            "width": 150,
+            "height": 100,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=150"
+          },
+          "medium": {
+            "file": "pexels-photo-235734.jpg?w=300",
+            "width": 300,
+            "height": 200,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=300"
+          },
+          "large": {
+            "file": "pexels-photo-235734.jpg?w=1024",
+            "width": 1024,
+            "height": 682,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg?w=1024"
+          },
+          "full": {
+            "file": "pexels-photo-235734.jpg",
+            "width": 1024,
+            "height": 682,
+            "mime_type": "image\/jpeg",
+            "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg"
+          }
+        },
+        "image_meta": {
+          "aperture": "0",
+          "credit": "",
+          "camera": "",
+          "caption": "",
+          "created_timestamp": "0",
+          "copyright": "",
+          "focal_length": "0",
+          "iso": "0",
+          "shutter_speed": "0",
+          "title": "",
+          "orientation": "1",
+          "keywords": []
+        },
+        "filesize": 2317303
+      },
+      "post": null,
+      "source_url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/pexels-photo-235734.jpg",
+      "_links": {
+        "self": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media\/45"
+        }],
+        "collection": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/media"
+        }],
+        "about": [{
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/types\/attachment"
+        }],
+        "author": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/users\/191794483"
+        }],
+        "replies": [{
+          "embeddable": true,
+          "href": "{{request.requestLine.baseUrl}}\/wp\/v2\/sites\/181977606\/comments?post=45"
+        }]
+      }
+    }],
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache, must-revalidate, max-age=0"
+    }
+  }
+}
\ No newline at end of file
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/default-notifications.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/default-notifications.json
index d289f354bfa2..29a903d96aa9 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/default-notifications.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/default-notifications.json
@@ -22,7926 +22,993 @@
         "jsonBody": {
             "last_seen_time": "1553125740",
             "number": 52,
-            "notes": [
-                {
-                    "id": 3864303999,
-                    "type": "post_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2019-03-20T23:49:00+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-1-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've made your first post on In Focus Photography.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        31,
-                                        51
-                                    ],
-                                    "url": "http://infocusphotographers.wordpress.com",
-                                    "id": 106707880
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "First Post",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-1-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on writing your first post on In Focus Photography!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        46,
-                                        66
-                                    ],
-                                    "url": "http://infocusphotographers.wordpress.com",
-                                    "id": 106707880
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 106707880
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/106707880"
-                        }
-                    },
-                    "title": "First Post"
-                },
-                {
-                    "id": 1304254364,
-                    "type": "follow",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2019-01-29T07:32:12+00:00",
-                    "icon": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "http://thenomadicwordsmith.wordpress.com",
-                    "subject": [
-                        {
-                            "text": "Riley Watts and 6 others followed your blog Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://example.wordpress.com",
-                                    "site_id": 157098772,
-                                    "email": "example@wordpress.com",
-                                    "id": 136100716
-                                },
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        47,
-                                        75
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Riley Watts",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://example.wordpress.com",
-                                    "id": 136100716,
-                                    "site_id": 157098772,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://example.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 136100716,
-                                    "site": 157098772
-                                },
-                                "titles": {
-                                    "home": "Site Title"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Chloe Mosley",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://ybsm.wordpress.com",
-                                    "id": 911487,
-                                    "site_id": 878232,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://ybsm.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 911487,
-                                    "site": 878232
-                                },
-                                "titles": {
-                                    "home": "ybsm",
-                                    "tagline": "Just a diary. Read ybsm as yabusame. That's it."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Rowan Shy",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://Rowanslittlenotes.wordpress.com",
-                                    "id": 126856765,
-                                    "site_id": 134651623,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/a16c450344e13c52abe9b7bb5b3ef103?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://Rowanslittlenotes.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 126856765,
-                                    "site": 134651623
-                                },
-                                "titles": {
-                                    "home": "Rowan's little notes",
-                                    "tagline": "Learn about my life, recent events and hamsters"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Bobby Whitaker",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://asterisk15.wordpress.com",
-                                    "id": 51178141,
-                                    "site_id": 53437676,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7b1a301d11cd8c5639e01dfb4dd56b85?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://asterisk15.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 51178141,
-                                    "site": 53437676
-                                },
-                                "titles": {
-                                    "home": "Mother Nature"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Lisa S.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74005263
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "PlayWithLIfE",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://www.playwithlife.org",
-                                    "id": 52196013,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        12
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/0e2284b177e549f3aab7138978122408?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://www.playwithlife.org"
-                                },
-                                "ids": {
-                                    "user": 52196013
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "7 Followers",
-                    "header": [
-                        {
-                            "text": "Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        28
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "id": 71769073
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=128"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Stories and images from The Nomadic Wordsmith"
-                        }
-                    ]
-                },
-                {
-                    "id": 3658516170,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-11-24T02:09:15+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2015/07/20/along-the-coast-2/",
-                    "subject": [
-                        {
-                            "text": "Brenton Hebert and documentedwanderlust liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://chaoticshapes.wordpress.com",
-                                    "site_id": 123568371,
-                                    "email": "example@wordpress.com",
-                                    "id": 116518196
-                                },
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        18,
-                                        38
-                                    ],
-                                    "url": "http://documentedwanderlust.wordpress.com",
-                                    "site_id": 108361066,
-                                    "email": "example@wordpress.com",
-                                    "id": 102352165
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        55,
-                                        70
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2015/07/20/along-the-coast-2/",
-                                    "site_id": 71769073,
-                                    "id": 132
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Brenton Hebert",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://chaoticshapes.wordpress.com",
-                                    "id": 116518196,
-                                    "site_id": 123568371,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://chaoticshapes.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 116518196,
-                                    "site": 123568371
-                                },
-                                "titles": {
-                                    "home": "Chaotic Shapes",
-                                    "tagline": "Art and Lifestyle by Brenton Hebert"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "documentedwanderlust",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://documentedwanderlust.wordpress.com",
-                                    "id": 102352165,
-                                    "site_id": 108361066,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd5dc704bef73822c2247434f91e025f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://documentedwanderlust.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 102352165,
-                                    "site": 108361066
-                                },
-                                "titles": {
-                                    "home": "Documented Wanderlust"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 132
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/132"
-                        }
-                    },
-                    "title": "2 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ]
-                },
-                {
-                    "id": 3658516156,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-11-24T02:09:14+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2016/01/28/along-the-coast-4/",
-                    "subject": [
-                        {
-                            "text": "Brenton Hebert liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://chaoticshapes.wordpress.com",
-                                    "site_id": 123568371,
-                                    "email": "example@wordpress.com",
-                                    "id": 116518196
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        30,
-                                        45
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/01/28/along-the-coast-4/",
-                                    "site_id": 71769073,
-                                    "id": 147
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Brenton Hebert",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://chaoticshapes.wordpress.com",
-                                    "id": 116518196,
-                                    "site_id": 123568371,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://chaoticshapes.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 116518196,
-                                    "site": 123568371
-                                },
-                                "titles": {
-                                    "home": "Chaotic Shapes",
-                                    "tagline": "Art and Lifestyle by Brenton Hebert"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 147
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/147"
-                        }
-                    },
-                    "title": "1 Like",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ]
-                },
-                {
-                    "id": 3467659357,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-11-24T02:09:13+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/",
-                    "subject": [
-                        {
-                            "text": "Brenton Hebert and 2 others liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://chaoticshapes.wordpress.com",
-                                    "site_id": 123568371,
-                                    "email": "example@wordpress.com",
-                                    "id": 116518196
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        43,
-                                        58
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/",
-                                    "site_id": 71769073,
-                                    "id": 161
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Brenton Hebert",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://chaoticshapes.wordpress.com",
-                                    "id": 116518196,
-                                    "site_id": 123568371,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://chaoticshapes.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 116518196,
-                                    "site": 123568371
-                                },
-                                "titles": {
-                                    "home": "Chaotic Shapes",
-                                    "tagline": "Art and Lifestyle by Brenton Hebert"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Riley Watts",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://example.wordpress.com",
-                                    "id": 136100716,
-                                    "site_id": 157098772,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://example.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 136100716,
-                                    "site": 157098772
-                                },
-                                "titles": {
-                                    "home": "Site Title"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Chloe Mosley",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://ybsm.wordpress.com",
-                                    "id": 911487,
-                                    "site_id": 878232,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://ybsm.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 911487,
-                                    "site": 878232
-                                },
-                                "titles": {
-                                    "home": "ybsm",
-                                    "tagline": "Just a diary. Read ybsm as yabusame. That's it."
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 161
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/161"
-                        }
-                    },
-                    "title": "3 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ]
-                },
-                {
-                    "id": 3528647758,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-09-03T06:30:38+00:00",
-                    "icon": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/",
-                    "subject": [
-                        {
-                            "text": "Riley Watts liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://example.wordpress.com",
-                                    "site_id": 157098772,
-                                    "email": "example@wordpress.com",
-                                    "id": 136100716
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        31,
-                                        46
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/",
-                                    "site_id": 71769073,
-                                    "id": 79
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Riley Watts",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://example.wordpress.com",
-                                    "id": 136100716,
-                                    "site_id": 157098772,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://example.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 136100716,
-                                    "site": 157098772
-                                },
-                                "titles": {
-                                    "home": "Site Title"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 79
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/79"
-                        }
-                    },
-                    "title": "1 Like",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ]
-                },
-                {
-                    "id": 3473753915,
-                    "type": "achieve_user_anniversary",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-07-24T18:13:52+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "4 Year Anniversary Achievement",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        30
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        },
-                        {
-                            "text": "You registered on WordPress.com 4 years ago."
-                        },
-                        {
-                            "text": "Thanks for flying with us. Keep up the good blogging."
-                        }
-                    ],
-                    "title": "Achievement"
-                },
-                {
-                    "id": 3467659628,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-07-19T23:46:17+00:00",
-                    "icon": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/comment-page-1/#comment-35",
-                    "subject": [
-                        {
-                            "text": "Chloe Mosley commented on Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "url": "http://ybsm.wordpress.com",
-                                    "site_id": 878232,
-                                    "email": "example@wordpress.com",
-                                    "id": 911487
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        24,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/",
-                                    "site_id": 71769073,
-                                    "id": 161
-                                }
-                            ]
-                        },
-                        {
-                            "text": "If we could somehow harness this lightning, we could go back to the future!\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        76
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/comment-page-1/#comment-35",
-                                    "site_id": 71769073,
-                                    "post_id": 161,
-                                    "id": 35
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Chloe Mosley",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://ybsm.wordpress.com",
-                                    "id": 911487,
-                                    "site_id": 878232,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://ybsm.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 911487,
-                                    "site": 878232
-                                },
-                                "titles": {
-                                    "home": "ybsm",
-                                    "tagline": "Just a diary. Read ybsm as yabusame. That's it."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "If we could somehow harness this lightning, we could go back to the future!",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 35,
-                                    "user": 911487,
-                                    "post": 161,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/35",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/911487",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/161",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/35?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 911487,
-                            "comment": 35,
-                            "post": 161,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/911487",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/35",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/161",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 2985661262,
-                    "type": "followed_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2017-07-07T20:45:02+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/followed-blog-5-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've received 5 follows on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        29,
-                                        57
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "5 Follows!",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/followed-blog-5-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on getting 5 total follows on Words, Whimsy, and the World!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        46,
-                                        74
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your current tally is 7."
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "5 Followers!"
-                },
-                {
-                    "id": 2584083750,
-                    "type": "post_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2016-08-17T18:28:59+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-20-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've made 20 posts on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        24,
-                                        52
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "20 Posts",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-20-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on writing 20 posts on Words, Whimsy, and the World!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        39,
-                                        67
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "20 Posts"
-                },
-                {
-                    "id": 1993981732,
-                    "type": "achieve_user_anniversary",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2015-08-06T20:43:05+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "1 Year Anniversary Achievement",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        30
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        },
-                        {
-                            "text": "You registered on WordPress.com one year ago."
-                        },
-                        {
-                            "text": "Thanks for flying with us. Keep up the good blogging."
-                        }
-                    ],
-                    "title": "Achievement"
-                },
-                {
-                    "id": 1305979273,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2015-05-30T18:20:54+00:00",
-                    "icon": "https://1.gravatar.com/avatar/7b1a301d11cd8c5639e01dfb4dd56b85?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/about/",
-                    "subject": [
-                        {
-                            "text": "Bobby Whitaker and 2 others liked your post About This Nomad",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://asterisk15.wordpress.com",
-                                    "site_id": 53437676,
-                                    "email": "example@wordpress.com",
-                                    "id": 51178141
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        43,
-                                        59
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/about/",
-                                    "site_id": 71769073,
-                                    "id": 1
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Bobby Whitaker",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://asterisk15.wordpress.com",
-                                    "id": 51178141,
-                                    "site_id": 53437676,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7b1a301d11cd8c5639e01dfb4dd56b85?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://asterisk15.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 51178141,
-                                    "site": 53437676
-                                },
-                                "titles": {
-                                    "home": "Mother Nature"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Nancy T.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "id": 74237684,
-                                    "site_id": 45151698,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": true
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://thisismyportfolioyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74237684,
-                                    "site": 45151698
-                                },
-                                "titles": {
-                                    "home": "Writing Bytes"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 1
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/1"
-                        }
-                    },
-                    "title": "3 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "About This Nomad"
-                        }
-                    ]
-                },
-                {
-                    "id": 1478993708,
-                    "type": "traffic_surge",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-11-01T16:17:37+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png",
-                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-11-01",
-                    "subject": [
-                        {
-                            "text": "Your stats are booming! Words, Whimsy, and the World is getting lots of traffic.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        24,
-                                        52
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your blog, Words, Whimsy, and the World, appears to be getting more traffic than usual! 26 hourly views - 1 hourly views on average",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        11,
-                                        39
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "A spike in your stats",
-                            "ranges": [
-                                {
-                                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-11-01",
-                                    "indices": [
-                                        11,
-                                        21
-                                    ],
-                                    "type": "stat",
-                                    "site_id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "Boom!"
-                },
-                {
-                    "id": 1477873727,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-11-01T01:45:35+00:00",
-                    "icon": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/comment-page-1/#comment-30",
-                    "subject": [
-                        {
-                            "text": "Nancy T. commented on Two More Hours: For Writing, For Magic",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "site_id": 45151698,
-                                    "email": "example@wordpress.com",
-                                    "id": 74237684
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        22,
-                                        60
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/",
-                                    "site_id": 71769073,
-                                    "id": 18
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Lovely, thoughtful writing. Thank you.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/comment-page-1/#comment-30",
-                                    "site_id": 71769073,
-                                    "post_id": 18,
-                                    "id": 30
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Nancy T.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "id": 74237684,
-                                    "site_id": 45151698,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": true
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://thisismyportfolioyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74237684,
-                                    "site": 45151698
-                                },
-                                "titles": {
-                                    "home": "Writing Bytes"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Lovely, thoughtful writing. Thank you.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 30,
-                                    "user": 74237684,
-                                    "post": 18,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/30",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74237684",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/30?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74237684,
-                            "comment": 30,
-                            "post": 18,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74237684",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/30",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Two More Hours: For Writing, For Magic"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1477860339,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-11-01T01:34:30+00:00",
-                    "icon": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-27",
-                    "subject": [
-                        {
-                            "text": "Mark commented on Roaming in the Desert",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ],
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "site_id": 78387788,
-                                    "email": "example@wordpress.com",
-                                    "id": 74004255
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        18,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/",
-                                    "site_id": 71769073,
-                                    "id": 45
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Very cool poem and photographs.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        32
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-27",
-                                    "site_id": 71769073,
-                                    "post_id": 45,
-                                    "id": 27
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Very cool poem and photographs.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 27,
-                                    "user": 74004255,
-                                    "post": 45,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/27",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/27?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74004255,
-                            "comment": 27,
-                            "post": 45,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/27",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Roaming in the Desert"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304317703,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-29T00:14:29+00:00",
-                    "icon": "https://1.gravatar.com/avatar/a494890f130ef2b12dba43c21e1ea028?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/",
-                    "subject": [
-                        {
-                            "text": "Meredith and Cheri Lucas Rowlands liked your post Roaming in the Desert",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "url": "http://stupidmatters.com",
-                                    "site_id": 58167694,
-                                    "email": "example@wordpress.com",
-                                    "id": 25855508
-                                },
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        13,
-                                        33
-                                    ],
-                                    "url": "http://cherilucasrowlands.com",
-                                    "site_id": 9838404,
-                                    "email": "example@wordpress.com",
-                                    "id": 10183950
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        50,
-                                        71
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/",
-                                    "site_id": 71769073,
-                                    "id": 45
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Meredith",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://stupidmatters.com",
-                                    "id": 25855508,
-                                    "site_id": 58167694,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/a494890f130ef2b12dba43c21e1ea028?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://stupidmatters.com"
-                                },
-                                "ids": {
-                                    "user": 25855508,
-                                    "site": 58167694
-                                },
-                                "titles": {
-                                    "home": "Stupid Matters",
-                                    "tagline": "Finding brilliance in the obvious and humor in the dumb."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 45
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45"
-                        }
-                    },
-                    "title": "2 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Roaming in the Desert"
-                        }
-                    ]
-                },
-                {
-                    "id": 1469692035,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-28T00:56:32+00:00",
-                    "icon": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-24",
-                    "subject": [
-                        {
-                            "text": "Mark commented on Great Perspective on Blogging",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ],
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "site_id": 78387788,
-                                    "email": "example@wordpress.com",
-                                    "id": 74004255
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        18,
-                                        47
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                                    "site_id": 71769073,
-                                    "id": 40
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Nice perspective on blogging — thanks.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-24",
-                                    "site_id": 71769073,
-                                    "post_id": 40,
-                                    "id": 24
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Nice perspective on blogging — thanks.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 24,
-                                    "user": 74004255,
-                                    "post": 40,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/24",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/24?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74004255,
-                            "comment": 24,
-                            "post": 40,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/24",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
+            "notes": [ {
+                "id": 4937363649,
+                "type": "like",
+                "read": 0,
+                "noticon": "\uf408",
+                "timestamp": "{{now}}",
+                "icon": "https:\/\/1.gravatar.com\/avatar\/11bcf6345930a9fbde5e6f0985c3f24a?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                "subject": [{
+                    "text": "Amechie Ajimobi and 5 others liked your post My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/amechieajimobi.wordpress.com",
+                        "site_id": 103806280,
+                        "email": "test@example.com",
+                        "id": 98380134
+                    }, {
+                        "type": "b",
+                        "indices": [20, 21]
+                    }, {
+                        "type": "post",
+                        "indices": [45, 69],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }],
+                "body": [{
+                    "text": "Amechie Ajimobi",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/amechieajimobi.wordpress.com",
+                        "id": 98380134,
+                        "site_id": 103806280,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/1.gravatar.com\/avatar\/11bcf6345930a9fbde5e6f0985c3f24a?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "actions": {
+                        "follow": false
+                    },
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/amechieajimobi.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98380134,
+                            "site": 103806280
+                        },
+                        "titles": {
+                            "home": "The Cooking Point"
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Catrina Ciobanu",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/catrinaciobanu.wordpress.com",
+                        "id": 98387381,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/9e99ce19f071c664fb4a882befb72391?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/catrinaciobanu.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98387381
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Pamela Nguyen",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/pamelanguyen.wordpress.com",
+                        "id": 98379476,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/b9dadbf067e5583eaf82abefc49727bb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/pamelanguyen.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379476
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Madison Ruiz",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/madisonruiz.wordpress.com",
+                        "id": 98379888,
+                        "type": "user",
+                        "indices": [0, 12]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/c536d5d44894a7575296e657d86ed770?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/madisonruiz.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379888
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Theresa Ray",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "id": 98379754,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/theresaray.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379754
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Reyansh Pawar",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/reyanshpawar.wordpress.com",
+                        "id": 98380071,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/1.gravatar.com\/avatar\/4b7ac5a2b497adbd473313b0701023a4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/reyanshpawar.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98380071
+                        }
+                    },
+                    "type": "user"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606,
+                        "post": 56
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56"
+                    }
+                },
+                "title": "6 Likes",
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "My Top 10 Pastry Recipes"
+                }],
+                "note_hash": 1391922081
+            }, {
+                "id": 4937370391,
+                "type": "comment_like",
+                "read": 1,
+                "noticon": "\uf408",
+                "timestamp": "{{now offset='-1 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-3",
+                "subject": [{
+                    "text": "Theresa Ray liked your comment on My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 11],
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98379754
+                    }, {
+                        "type": "post",
+                        "indices": [34, 58],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }],
+                "body": [{
+                    "text": "Theresa Ray",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "id": 98379754,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/theresaray.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379754
+                        }
+                    },
+                    "type": "user"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606,
+                        "post": 56,
+                        "comment": 3
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                        "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/3"
+                    }
+                },
+                "title": "1 Like",
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "Thanks!"
+                }],
+                "note_hash": 1528602550
+            }, {
+                "id": 4937363362,
+                "type": "comment",
+                "read": 1,
+                "noticon": "\uf300",
+                "timestamp": "{{now offset='-2 hours'}}",
+                "icon": "https:\/\/1.gravatar.com\/avatar\/4b7ac5a2b497adbd473313b0701023a4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-2",
+                "subject": [{
+                    "text": "Reyansh Pawar commented on My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/reyanshpawar.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98380071
+                    }, {
+                        "type": "post",
+                        "indices": [27, 51],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }, {
+                    "text": "Can you use almond or rice flour instead of the whole wheat to make the peach scone recipe gluten free?\n",
+                    "ranges": [{
+                        "type": "comment",
+                        "indices": [0, 104],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-2",
+                        "site_id": 181977606,
+                        "post_id": 56,
+                        "id": 2
+                    }]
+                }],
+                "body": [{
+                    "text": "Reyansh Pawar",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/reyanshpawar.wordpress.com",
+                        "id": 98380071,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/1.gravatar.com\/avatar\/4b7ac5a2b497adbd473313b0701023a4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/reyanshpawar.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98380071
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Can you use almond or rice flour instead of the whole wheat to make the peach scone recipe gluten free?",
+                    "actions": {
+                        "spam-comment": false,
+                        "trash-comment": false,
+                        "approve-comment": true,
+                        "edit-comment": true,
+                        "replyto-comment": true,
+                        "like-comment": false
                     },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great Perspective on Blogging"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469662312,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-28T00:31:29+00:00",
-                    "icon": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/comment-page-1/#comment-23",
-                    "subject": [
-                        {
-                            "text": "Nancy T. commented on Out to Sea",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "site_id": 45151698,
-                                    "email": "example@wordpress.com",
-                                    "id": 74237684
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        22,
-                                        32
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/",
-                                    "site_id": 71769073,
-                                    "id": 56
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great shot of a historic lighthouse.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        37
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/comment-page-1/#comment-23",
-                                    "site_id": 71769073,
-                                    "post_id": 56,
-                                    "id": 23
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Nancy T.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "id": 74237684,
-                                    "site_id": 45151698,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": true
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://thisismyportfolioyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74237684,
-                                    "site": 45151698
-                                },
-                                "titles": {
-                                    "home": "Writing Bytes"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Great shot of a historic lighthouse.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 23,
-                                    "user": 74237684,
-                                    "post": 56,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/23",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74237684",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/56",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/23?action=edit"
-                        }
-                    ],
                     "meta": {
                         "ids": {
-                            "user": 74237684,
-                            "comment": 23,
+                            "comment": 2,
+                            "user": 98380071,
                             "post": 56,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74237684",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/23",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/56",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Out to Sea"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469657359,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-28T00:27:40+00:00",
-                    "icon": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-21",
-                    "subject": [
-                        {
-                            "text": "Lisa S. commented on Roaming in the Desert",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        21,
-                                        42
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/",
-                                    "site_id": 71769073,
-                                    "id": 45
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Love this poem. It’s short and sweet.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        38
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-21",
-                                    "site_id": 71769073,
-                                    "post_id": 45,
-                                    "id": 21
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Lisa S.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74005263
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Love this poem. It’s short and sweet.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 21,
-                                    "user": 74005263,
-                                    "post": 45,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/21",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/21?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74005263,
-                            "comment": 21,
-                            "post": 45,
-                            "site": 71769073
+                            "site": 181977606
                         },
                         "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/21",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
+                            "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/2",
+                            "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380071",
+                            "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
                         }
                     },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Roaming in the Desert"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469655326,
                     "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-28T00:26:02+00:00",
-                    "icon": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-20",
-                    "subject": [
-                        {
-                            "text": "Mark commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ],
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "site_id": 78387788,
-                                    "email": "example@wordpress.com",
-                                    "id": 74004255
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        18,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Gorgeous gallery! I like the picture overlooking the Pacific.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        62
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-20",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 20
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Gorgeous gallery! I like the picture overlooking the Pacific.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 20,
-                                    "user": 74004255,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/20",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/20?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74004255,
-                            "comment": 20,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/20",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
+                    "nest_level": 0,
+                    "edit_comment_link": "https:\/\/wordpress.com\/comment\/weekendbakesblog.wordpress.com\/2?action=edit"
+                }],
+                "meta": {
+                    "ids": {
+                        "user": 98380071,
+                        "comment": 2,
+                        "post": 56,
+                        "site": 181977606
+                    },
+                    "links": {
+                        "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380071",
+                        "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/2",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "header": [{
+                    "text": "Pamela Nguyen",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "My Top 10 Pastry Recipes"
+                }],
+                "title": "Comment",
+                "note_hash": 1287359074
+            }, {
+                "id": 4937360549,
+                "type": "comment",
+                "read": 1,
+                "noticon": "\uf300",
+                "timestamp": "{{now offset='-3 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/bf9d10e44237e511d841a9b8076746d5?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-1",
+                "subject": [{
+                    "text": "Joao Montes commented on My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 11],
+                        "url": "http:\/\/joaomontes.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98380521
+                    }, {
+                        "type": "post",
+                        "indices": [25, 49],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }, {
+                    "text": "Amazing results!\n",
+                    "ranges": [{
+                        "type": "comment",
+                        "indices": [0, 17],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-1",
+                        "site_id": 181977606,
+                        "post_id": 56,
+                        "id": 1
+                    }]
+                }],
+                "body": [{
+                    "text": "Joao Montes",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/joaomontes.wordpress.com",
+                        "id": 98380521,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/bf9d10e44237e511d841a9b8076746d5?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/joaomontes.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98380521
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Amazing results!",
+                    "actions": {
+                        "spam-comment": false,
+                        "trash-comment": false,
+                        "approve-comment": true,
+                        "edit-comment": true,
+                        "replyto-comment": true,
+                        "like-comment": false
                     },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469652677,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-28T00:24:00+00:00",
-                    "icon": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/comment-page-1/#comment-19",
-                    "subject": [
-                        {
-                            "text": "Nancy T. commented on Two More Hours: For Writing, For Magic",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "site_id": 45151698,
-                                    "email": "example@wordpress.com",
-                                    "id": 74237684
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        22,
-                                        60
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/",
-                                    "site_id": 71769073,
-                                    "id": 18
-                                }
-                            ]
-                        },
-                        {
-                            "text": "A thoughtful piece on time and the writing process.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        52
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/comment-page-1/#comment-19",
-                                    "site_id": 71769073,
-                                    "post_id": 18,
-                                    "id": 19
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Nancy T.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://thisismyportfolioyay.wordpress.com",
-                                    "id": 74237684,
-                                    "site_id": 45151698,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": true
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://thisismyportfolioyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74237684,
-                                    "site": 45151698
-                                },
-                                "titles": {
-                                    "home": "Writing Bytes"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "A thoughtful piece on time and the writing process.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 19,
-                                    "user": 74237684,
-                                    "post": 18,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/19",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74237684",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/19?action=edit"
-                        }
-                    ],
                     "meta": {
                         "ids": {
-                            "user": 74237684,
-                            "comment": 19,
-                            "post": 18,
-                            "site": 71769073
+                            "comment": 1,
+                            "user": 98380521,
+                            "post": 56,
+                            "site": 181977606
                         },
                         "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74237684",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/19",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
+                            "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/1",
+                            "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380521",
+                            "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
                         }
                     },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Two More Hours: For Writing, For Magic"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469400992,
                     "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-27T21:24:54+00:00",
-                    "icon": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-18",
-                    "subject": [
-                        {
-                            "text": "Lisa S. commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        21,
-                                        42
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Fantastic gallery!\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-18",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 18
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Lisa S.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74005263
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Fantastic gallery!",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 18,
-                                    "user": 74005263,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/18",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/18?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74005263,
-                            "comment": 18,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/18",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469398671,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-27T21:23:17+00:00",
-                    "icon": "https://2.gravatar.com/avatar/e6f1fa8fa90f7e1b618be976bc8f82d4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-17",
-                    "subject": [
-                        {
-                            "text": "Alexander commented on Great Perspective on Blogging",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74006837
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        52
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                                    "site_id": 71769073,
-                                    "id": 40
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I agree: blogging is hard sometimes.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        37
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-17",
-                                    "site_id": 71769073,
-                                    "post_id": 40,
-                                    "id": 17
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Alexander",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74006837,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/e6f1fa8fa90f7e1b618be976bc8f82d4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74006837
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "I agree: blogging is hard sometimes.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 17,
-                                    "user": 74006837,
-                                    "post": 40,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/17",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74006837",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/17?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74006837,
-                            "comment": 17,
-                            "post": 40,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74006837",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/17",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great Perspective on Blogging"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469396527,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-27T21:21:49+00:00",
-                    "icon": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-16",
-                    "subject": [
-                        {
-                            "text": "Mark commented on Roaming in the Desert",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ],
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "site_id": 78387788,
-                                    "email": "example@wordpress.com",
-                                    "id": 74004255
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        18,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/",
-                                    "site_id": 71769073,
-                                    "id": 45
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great night shot! The poem is short and sweet.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        47
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-16",
-                                    "site_id": 71769073,
-                                    "post_id": 45,
-                                    "id": 16
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Great night shot! The poem is short and sweet.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 16,
-                                    "user": 74004255,
-                                    "post": 45,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/16",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/16?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74004255,
-                            "comment": 16,
-                            "post": 45,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/16",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Roaming in the Desert"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1469393320,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-27T21:19:48+00:00",
-                    "icon": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/comment-page-1/#comment-15",
-                    "subject": [
-                        {
-                            "text": "Lisa S. commented on Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        21,
-                                        36
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/",
-                                    "site_id": 71769073,
-                                    "id": 79
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I miss the ocean. What a lovely view.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        38
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/comment-page-1/#comment-15",
-                                    "site_id": 71769073,
-                                    "post_id": 79,
-                                    "id": 15
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Lisa S.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74005263
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "I miss the ocean. What a lovely view.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 15,
-                                    "user": 74005263,
-                                    "post": 79,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/15",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/79",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/15?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74005263,
-                            "comment": 15,
-                            "post": 79,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/15",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/79",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1465445299,
-                    "type": "traffic_surge",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-25T15:19:28+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png",
-                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-10-25",
-                    "subject": [
-                        {
-                            "text": "Your stats are booming! Words, Whimsy, and the World is getting lots of traffic.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        24,
-                                        52
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your blog, Words, Whimsy, and the World, appears to be getting more traffic than usual! 34 hourly views - 0 hourly views on average",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        11,
-                                        39
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "A spike in your stats",
-                            "ranges": [
-                                {
-                                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-10-25",
-                                    "indices": [
-                                        11,
-                                        21
-                                    ],
-                                    "type": "stat",
-                                    "site_id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "Boom!"
-                },
-                {
-                    "id": 1462051138,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-23T18:37:58+00:00",
-                    "icon": "https://2.gravatar.com/avatar/e6f1fa8fa90f7e1b618be976bc8f82d4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-14",
-                    "subject": [
-                        {
-                            "text": "Alexander commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74006837
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        44
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Superb shot from the monument in Berlin.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        41
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-14",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 14
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Alexander",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74006837,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/e6f1fa8fa90f7e1b618be976bc8f82d4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74006837
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Superb shot from the monument in Berlin.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 14,
-                                    "user": 74006837,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/14",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74006837",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/14?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74006837,
-                            "comment": 14,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74006837",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/14",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1462042059,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-23T18:31:42+00:00",
-                    "icon": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-13",
-                    "subject": [
-                        {
-                            "text": "Mark commented on Roaming in the Desert",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ],
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "site_id": 78387788,
-                                    "email": "example@wordpress.com",
-                                    "id": 74004255
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        18,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/",
-                                    "site_id": 71769073,
-                                    "id": 45
-                                }
-                            ]
-                        },
-                        {
-                            "text": "This poem is perfect!\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        22
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/burning-man/comment-page-1/#comment-13",
-                                    "site_id": 71769073,
-                                    "post_id": 45,
-                                    "id": 13
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "This poem is perfect!",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 13,
-                                    "user": 74004255,
-                                    "post": 45,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/13",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/13?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74004255,
-                            "comment": 13,
-                            "post": 45,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/13",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/45",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Roaming in the Desert"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1462036088,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-23T18:27:57+00:00",
-                    "icon": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/comment-page-1/#comment-12",
-                    "subject": [
-                        {
-                            "text": "Lisa S. commented on Out to Sea",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        21,
-                                        31
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/",
-                                    "site_id": 71769073,
-                                    "id": 56
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I’d love to visit this historical landmark along the sea.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        58
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/comment-page-1/#comment-12",
-                                    "site_id": 71769073,
-                                    "post_id": 56,
-                                    "id": 12
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Lisa S.",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74005263,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74005263
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "I’d love to visit this historical landmark along the sea.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 12,
-                                    "user": 74005263,
-                                    "post": 56,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/12",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/56",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/12?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74005263,
-                            "comment": 12,
-                            "post": 56,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74005263",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/12",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/56",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Out to Sea"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1462026240,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-23T18:21:25+00:00",
-                    "icon": "https://2.gravatar.com/avatar/e6f1fa8fa90f7e1b618be976bc8f82d4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-11",
-                    "subject": [
-                        {
-                            "text": "Alexander commented on Great Perspective on Blogging",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "email": "example@wordpress.com",
-                                    "id": 74006837
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        52
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                                    "site_id": 71769073,
-                                    "id": 40
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I feel the same! Making lasting connections with readers is important.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        71
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-11",
-                                    "site_id": 71769073,
-                                    "post_id": 40,
-                                    "id": 11
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Alexander",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "id": 74006837,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/e6f1fa8fa90f7e1b618be976bc8f82d4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74006837
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "I feel the same! Making lasting connections with readers is important.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 11,
-                                    "user": 74006837,
-                                    "post": 40,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/11",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74006837",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/11?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74006837,
-                            "comment": 11,
-                            "post": 40,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74006837",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/11",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great Perspective on Blogging"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1461981982,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-10-23T17:53:38+00:00",
-                    "icon": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-10",
-                    "subject": [
-                        {
-                            "text": "Mark commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ],
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "site_id": 78387788,
-                                    "email": "example@wordpress.com",
-                                    "id": 74004255
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        18,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great photographs. The shot overlooking the ocean is fantastic!\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        64
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-10",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 10
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://iamtestingthisyay.wordpress.com",
-                                    "id": 74004255,
-                                    "site_id": 78387788,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://iamtestingthisyay.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 74004255,
-                                    "site": 78387788
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Great photographs. The shot overlooking the ocean is fantastic!",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 10,
-                                    "user": 74004255,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/10",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/10?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 74004255,
-                            "comment": 10,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/74004255",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/10",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1355738022,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-08-22T19:41:04+00:00",
-                    "icon": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/",
-                    "subject": [
-                        {
-                            "text": "Cheri Lucas Rowlands liked your post Out to Sea",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ],
-                                    "url": "http://cherilucasrowlands.com",
-                                    "site_id": 9838404,
-                                    "email": "example@wordpress.com",
-                                    "id": 10183950
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        37,
-                                        47
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/08/22/out-to-sea/",
-                                    "site_id": 71769073,
-                                    "id": 56
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 56
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/56"
-                        }
-                    },
-                    "title": "1 Like",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Out to Sea"
-                        }
-                    ]
-                },
-                {
-                    "id": 1355737668,
-                    "type": "like_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-08-22T19:40:44+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/likeable-blog-20-2x.png",
-                    "url": "http://thenomadicwordsmith.wordpress.com",
-                    "subject": [
-                        {
-                            "text": "You've received 20 likes on Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        28,
-                                        56
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "20 Likes",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/likeable-blog-20-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on getting 20 total likes on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        45,
-                                        73
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your current tally is 30."
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "20 Likes"
-                },
-                {
-                    "id": 1310361903,
-                    "type": "traffic_surge",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-28T04:14:13+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png",
-                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-07-28",
-                    "subject": [
-                        {
-                            "text": "Your stats are booming! Words, Whimsy, and the World is getting lots of traffic.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        24,
-                                        52
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your blog, Words, Whimsy, and the World, appears to be getting more traffic than usual! 31 hourly views - 0 hourly views on average",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        11,
-                                        39
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "A spike in your stats",
-                            "ranges": [
-                                {
-                                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-07-28",
-                                    "indices": [
-                                        11,
-                                        21
-                                    ],
-                                    "type": "stat",
-                                    "site_id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "Boom!"
-                },
-                {
-                    "id": 1305980576,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-25T16:32:24+00:00",
-                    "icon": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/about/comment-page-1/#comment-9",
-                    "subject": [
-                        {
-                            "text": "Cheri Lucas Rowlands commented on About This Nomad",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ],
-                                    "url": "http://cherilucasrowlands.com",
-                                    "site_id": 9838404,
-                                    "email": "example@wordpress.com",
-                                    "id": 10183950
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        34,
-                                        50
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/about/",
-                                    "site_id": 71769073,
-                                    "id": 1
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your words and images are lovely and inspiring! I want to go to all of these places, too.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        90
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/about/comment-page-1/#comment-9",
-                                    "site_id": 71769073,
-                                    "post_id": 1,
-                                    "id": 9
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Your words and images are lovely and inspiring! I want to go to all of these places, too.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 9,
-                                    "user": 10183950,
-                                    "post": 1,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/9",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/10183950",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/1",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/9?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 10183950,
-                            "comment": 9,
-                            "post": 1,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/10183950",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/9",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/1",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "About This Nomad"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304343956,
-                    "type": "traffic_surge",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T19:57:36+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png",
-                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-07-24",
-                    "subject": [
-                        {
-                            "text": "Your stats are booming! Words, Whimsy, and the World is getting lots of traffic.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        24,
-                                        52
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/notes/images/traffic-surge-note-icon-256.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your blog, Words, Whimsy, and the World, appears to be getting more traffic than usual! 73 hourly views - 0 hourly views on average",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        11,
-                                        39
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "A spike in your stats",
-                            "ranges": [
-                                {
-                                    "url": "https://wordpress.com/stats/day/thenomadicwordsmith.wordpress.com?startDate=2014-07-24",
-                                    "indices": [
-                                        11,
-                                        21
-                                    ],
-                                    "type": "stat",
-                                    "site_id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "Boom!"
-                },
-                {
-                    "id": 1304254353,
-                    "type": "best_followed_day_feat",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:52:31+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/bestday-follows-2x.png",
-                    "url": "https://wordpress.com/people/followers/71769073",
-                    "subject": [
-                        {
-                            "text": "July 24: Your best day for follows on Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        38,
-                                        66
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/bestday-follows-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "On Thursday, July 24, 2014 you surpassed your previous record of most follows in one day for your blog Words, Whimsy, and the World. Nice!",
-                            "ranges": [
-                                {
-                                    "url": "",
-                                    "indices": [
-                                        65,
-                                        77
-                                    ]
-                                },
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        103,
-                                        131
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Most Follows in One Day"
-                        },
-                        {
-                            "text": "Current Record: 2"
-                        },
-                        {
-                            "text": "Old Record: 1"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "2 Followers"
-                },
-                {
-                    "id": 1304185197,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:43:35+00:00",
-                    "icon": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/wanderlust/",
-                    "subject": [
-                        {
-                            "text": "Michelle Weber and 2 others liked your post When Wanderlust Hits",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://kingofstates.com",
-                                    "site_id": 40536446,
-                                    "email": "example@wordpress.com",
-                                    "id": 2193192
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        44,
-                                        64
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/wanderlust/",
-                                    "site_id": 71769073,
-                                    "id": 22
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Michelle Weber",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kingofstates.com",
-                                    "id": 2193192,
-                                    "site_id": 40536446,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kingofstates.com"
-                                },
-                                "ids": {
-                                    "user": 2193192,
-                                    "site": 40536446
-                                },
-                                "titles": {
-                                    "home": "King of States!",
-                                    "tagline": "I'm Michelle. This is my blog. I write  about women and fatness, expound upon semi-coherent thoughts I have in the middle of the night, and offer tough love to those in whom I am disappointed; they are legion."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Kjell Reigstad",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kjellr.com",
-                                    "id": 39377736,
-                                    "site_id": 87462575,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/115aabd707fe985c79744d3e7df8fade?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kjellr.com"
-                                },
-                                "ids": {
-                                    "user": 39377736,
-                                    "site": 87462575
-                                },
-                                "titles": {
-                                    "home": "Kjell Reigstad",
-                                    "tagline": "Graphic Design"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 22
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/22"
-                        }
-                    },
-                    "title": "3 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "When Wanderlust Hits"
-                        }
-                    ]
-                },
-                {
-                    "id": 1304241630,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:42:50+00:00",
-                    "icon": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-6",
-                    "subject": [
-                        {
-                            "text": "Michelle Weber commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://kingofstates.com",
-                                    "site_id": 40536446,
-                                    "email": "example@wordpress.com",
-                                    "id": 2193192
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        28,
-                                        49
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Hey, I can see my house from there!\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        36
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-6",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 6
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Michelle Weber",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kingofstates.com",
-                                    "id": 2193192,
-                                    "site_id": 40536446,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kingofstates.com"
-                                },
-                                "ids": {
-                                    "user": 2193192,
-                                    "site": 40536446
-                                },
-                                "titles": {
-                                    "home": "King of States!",
-                                    "tagline": "I'm Michelle. This is my blog. I write  about women and fatness, expound upon semi-coherent thoughts I have in the middle of the night, and offer tough love to those in whom I am disappointed; they are legion."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Hey, I can see my house from there!",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 6,
-                                    "user": 2193192,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/6",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/2193192",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/6?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 2193192,
-                            "comment": 6,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/2193192",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/6",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304179269,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:42:33+00:00",
-                    "icon": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                    "subject": [
-                        {
-                            "text": "Michelle Weber and 5 others liked your post Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://kingofstates.com",
-                                    "site_id": 40536446,
-                                    "email": "example@wordpress.com",
-                                    "id": 2193192
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        44,
-                                        65
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Michelle Weber",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kingofstates.com",
-                                    "id": 2193192,
-                                    "site_id": 40536446,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kingofstates.com"
-                                },
-                                "ids": {
-                                    "user": 2193192,
-                                    "site": 40536446
-                                },
-                                "titles": {
-                                    "home": "King of States!",
-                                    "tagline": "I'm Michelle. This is my blog. I write  about women and fatness, expound upon semi-coherent thoughts I have in the middle of the night, and offer tough love to those in whom I am disappointed; they are legion."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Kjell Reigstad",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kjellr.com",
-                                    "id": 39377736,
-                                    "site_id": 87462575,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/115aabd707fe985c79744d3e7df8fade?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kjellr.com"
-                                },
-                                "ids": {
-                                    "user": 39377736,
-                                    "site": 87462575
-                                },
-                                "titles": {
-                                    "home": "Kjell Reigstad",
-                                    "tagline": "Graphic Design"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Elizabeth",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://elizabeth.blog/",
-                                    "id": 876809,
-                                    "site_id": 847631,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7cde026ba626f4a827f12b454177947b?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://elizabeth.blog/"
-                                },
-                                "ids": {
-                                    "user": 876809,
-                                    "site": 847631
-                                },
-                                "titles": {
-                                    "home": "Accismus",
-                                    "tagline": "The thoughts, opinions, and occasional rantings of Elizabeth Urello."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Mark Armstrong",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "https://markarms.blog/",
-                                    "id": 22917495,
-                                    "site_id": 66671758,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/19f62880113934b262c0bbb597644adb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "https://markarms.blog/"
-                                },
-                                "ids": {
-                                    "user": 22917495,
-                                    "site": 66671758
-                                },
-                                "titles": {
-                                    "home": "Mark Armstrong",
-                                    "tagline": "Founder of Longreads; Editor at Automattic"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Mike Dang",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://mikedang.wordpress.com",
-                                    "id": 4275359,
-                                    "site_id": 10563972,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://mikedang.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 4275359,
-                                    "site": 10563972
-                                },
-                                "titles": {
-                                    "home": "Reporter Mike"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 38
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38"
-                        }
-                    },
-                    "title": "6 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ]
-                },
-                {
-                    "id": 1304240088,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:41:38+00:00",
-                    "icon": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-5",
-                    "subject": [
-                        {
-                            "text": "Michelle Weber replied to a comment I read a story in the New York Times today about how no one uses pens anymore. WHAT. Give me …\n",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://kingofstates.com",
-                                    "site_id": 40536446,
-                                    "email": "example@wordpress.com",
-                                    "id": 2193192
-                                },
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        36,
-                                        131
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-1",
-                                    "site_id": 71769073,
-                                    "post_id": 40,
-                                    "id": 1
-                                }
-                            ]
-                        },
-                        {
-                            "text": "You’ll pry my red pens out of my cold, dead hands, Dang.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        57
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-5",
-                                    "site_id": 71769073,
-                                    "post_id": 40,
-                                    "id": 5
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Michelle Weber",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kingofstates.com",
-                                    "id": 2193192,
-                                    "site_id": 40536446,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kingofstates.com"
-                                },
-                                "ids": {
-                                    "user": 2193192,
-                                    "site": 40536446
-                                },
-                                "titles": {
-                                    "home": "King of States!",
-                                    "tagline": "I'm Michelle. This is my blog. I write  about women and fatness, expound upon semi-coherent thoughts I have in the middle of the night, and offer tough love to those in whom I am disappointed; they are legion."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "You’ll pry my red pens out of my cold, dead hands, Dang.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 5,
-                                    "user": 2193192,
-                                    "post": 40,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/5",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/2193192",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 1,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/5?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "parent_comment": 1,
-                            "user": 2193192,
-                            "comment": 5,
-                            "post": 40,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "parent_comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/1",
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/2193192",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/5",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "Mike Dang on Great Perspective on Blogging",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "url": "http://mikedang.wordpress.com",
-                                    "site_id": 10563972,
-                                    "email": "example@wordpress.com",
-                                    "id": 4275359
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        13,
-                                        42
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                                    "site_id": 71769073,
-                                    "id": 40
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I read a story in the New York Times today about how no one uses pens anymore. WHAT. Give me …"
-                        }
-                    ],
-                    "title": "Reply"
-                },
-                {
-                    "id": 1304176391,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:41:15+00:00",
-                    "icon": "https://2.gravatar.com/avatar/e870a6cbd22eedb95c72bba37b144b7d?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                    "subject": [
-                        {
-                            "text": "Amanda Lyle and 4 others liked your post Great Perspective on Blogging",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        11
-                                    ],
-                                    "url": "http://www.insidethelifeofmoi.com",
-                                    "site_id": 100718137,
-                                    "email": "example@wordpress.com",
-                                    "id": 61155091
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        41,
-                                        70
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                                    "site_id": 71769073,
-                                    "id": 40
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Amanda Lyle",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://www.insidethelifeofmoi.com",
-                                    "id": 61155091,
-                                    "site_id": 100718137,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        11
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/e870a6cbd22eedb95c72bba37b144b7d?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://www.insidethelifeofmoi.com"
-                                },
-                                "ids": {
-                                    "user": 61155091,
-                                    "site": 100718137
-                                },
-                                "titles": {
-                                    "home": "Insidethelifeofmoi",
-                                    "tagline": "An eccentric blogger with a pen and a thousand ideas"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Kjell Reigstad",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kjellr.com",
-                                    "id": 39377736,
-                                    "site_id": 87462575,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/115aabd707fe985c79744d3e7df8fade?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kjellr.com"
-                                },
-                                "ids": {
-                                    "user": 39377736,
-                                    "site": 87462575
-                                },
-                                "titles": {
-                                    "home": "Kjell Reigstad",
-                                    "tagline": "Graphic Design"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Elizabeth",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://elizabeth.blog/",
-                                    "id": 876809,
-                                    "site_id": 847631,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7cde026ba626f4a827f12b454177947b?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://elizabeth.blog/"
-                                },
-                                "ids": {
-                                    "user": 876809,
-                                    "site": 847631
-                                },
-                                "titles": {
-                                    "home": "Accismus",
-                                    "tagline": "The thoughts, opinions, and occasional rantings of Elizabeth Urello."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Michelle Weber",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kingofstates.com",
-                                    "id": 2193192,
-                                    "site_id": 40536446,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/2367004060918e221dcb9799584e9279?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kingofstates.com"
-                                },
-                                "ids": {
-                                    "user": 2193192,
-                                    "site": 40536446
-                                },
-                                "titles": {
-                                    "home": "King of States!",
-                                    "tagline": "I'm Michelle. This is my blog. I write  about women and fatness, expound upon semi-coherent thoughts I have in the middle of the night, and offer tough love to those in whom I am disappointed; they are legion."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Mike Dang",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://mikedang.wordpress.com",
-                                    "id": 4275359,
-                                    "site_id": 10563972,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://mikedang.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 4275359,
-                                    "site": 10563972
-                                },
-                                "titles": {
-                                    "home": "Reporter Mike"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 40
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40"
-                        }
-                    },
-                    "title": "5 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great Perspective on Blogging"
-                        }
-                    ]
-                },
-                {
-                    "id": 1304234553,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:37:23+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/comment-page-1/#comment-4",
-                    "subject": [
-                        {
-                            "text": "Mike Dang commented on Two More Hours: For Writing, For Magic",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "url": "http://mikedang.wordpress.com",
-                                    "site_id": 10563972,
-                                    "email": "example@wordpress.com",
-                                    "id": 4275359
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        61
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/",
-                                    "site_id": 71769073,
-                                    "id": 18
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I wish I had more time in the day to write!\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        44
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/comment-page-1/#comment-4",
-                                    "site_id": 71769073,
-                                    "post_id": 18,
-                                    "id": 4
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mike Dang",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://mikedang.wordpress.com",
-                                    "id": 4275359,
-                                    "site_id": 10563972,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://mikedang.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 4275359,
-                                    "site": 10563972
-                                },
-                                "titles": {
-                                    "home": "Reporter Mike"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "I wish I had more time in the day to write!",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 4,
-                                    "user": 4275359,
-                                    "post": 18,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/4",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/4275359",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/4?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 4275359,
-                            "comment": 4,
-                            "post": 18,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/4275359",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/4",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Two More Hours: For Writing, For Magic"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304185631,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:36:31+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/",
-                    "subject": [
-                        {
-                            "text": "Mike Dang and 2 others liked your post Two More Hours: For Writing, For Magic",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "url": "http://mikedang.wordpress.com",
-                                    "site_id": 10563972,
-                                    "email": "example@wordpress.com",
-                                    "id": 4275359
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        39,
-                                        77
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/two-more-hours/",
-                                    "site_id": 71769073,
-                                    "id": 18
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mike Dang",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://mikedang.wordpress.com",
-                                    "id": 4275359,
-                                    "site_id": 10563972,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://mikedang.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 4275359,
-                                    "site": 10563972
-                                },
-                                "titles": {
-                                    "home": "Reporter Mike"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Kjell Reigstad",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://kjellr.com",
-                                    "id": 39377736,
-                                    "site_id": 87462575,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/115aabd707fe985c79744d3e7df8fade?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://kjellr.com"
-                                },
-                                "ids": {
-                                    "user": 39377736,
-                                    "site": 87462575
-                                },
-                                "titles": {
-                                    "home": "Kjell Reigstad",
-                                    "tagline": "Graphic Design"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Cheri Lucas Rowlands",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://cherilucasrowlands.com",
-                                    "id": 10183950,
-                                    "site_id": 9838404,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://cherilucasrowlands.com"
-                                },
-                                "ids": {
-                                    "user": 10183950,
-                                    "site": 9838404
-                                },
-                                "titles": {
-                                    "home": "Cheri Lucas Rowlands"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073,
-                            "post": 18
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/18"
-                        }
-                    },
-                    "title": "3 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Two More Hours: For Writing, For Magic"
-                        }
-                    ]
-                },
-                {
-                    "id": 1304211566,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:20:06+00:00",
-                    "icon": "https://1.gravatar.com/avatar/7cde026ba626f4a827f12b454177947b?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-3",
-                    "subject": [
-                        {
-                            "text": "Elizabeth commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "url": "http://elizabeth.blog/",
-                                    "site_id": 847631,
-                                    "email": "example@wordpress.com",
-                                    "id": 876809
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        44
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Lovely photos! I want to go to there.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        38
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-3",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 3
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Elizabeth",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://elizabeth.blog/",
-                                    "id": 876809,
-                                    "site_id": 847631,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7cde026ba626f4a827f12b454177947b?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://elizabeth.blog/"
-                                },
-                                "ids": {
-                                    "user": 876809,
-                                    "site": 847631
-                                },
-                                "titles": {
-                                    "home": "Accismus",
-                                    "tagline": "The thoughts, opinions, and occasional rantings of Elizabeth Urello."
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Lovely photos! I want to go to there.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 3,
-                                    "user": 876809,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/3",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/876809",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/3?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 876809,
-                            "comment": 3,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/876809",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/3",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304210924,
-                    "type": "like_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:19:39+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/likeable-blog-10-2x.png",
-                    "url": "http://thenomadicwordsmith.wordpress.com",
-                    "subject": [
-                        {
-                            "text": "You've received 10 likes on Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        28,
-                                        56
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "10 Likes",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/likeable-blog-10-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on getting 10 total likes on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        45,
-                                        73
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your current tally is 30."
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "10 Likes"
-                },
-                {
-                    "id": 1304184444,
-                    "type": "like_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:01:58+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/likeable-blog-5-2x.png",
-                    "url": "http://thenomadicwordsmith.wordpress.com",
-                    "subject": [
-                        {
-                            "text": "You've received 5 likes on Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        27,
-                                        55
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "5 Likes",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/likeable-blog-5-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on getting 5 total likes on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        44,
-                                        72
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your current tally is 30."
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "5 Likes"
-                },
-                {
-                    "id": 1304184439,
-                    "type": "best_liked_day_feat",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T18:01:58+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/bestday-likes-2x.png",
-                    "url": "http://thenomadicwordsmith.wordpress.com",
-                    "subject": [
-                        {
-                            "text": "July 24: Your best day for likes on Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        36,
-                                        64
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "5 Likes",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/bestday-likes-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "On Thursday July 24, 2014, you surpassed your previous record of most likes in one day for your posts on Words, Whimsy, and the World. That's pretty awesome, well done!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        105,
-                                        133
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Most Likes in One Day"
-                        },
-                        {
-                            "text": "Current Record: 5"
-                        },
-                        {
-                            "text": "Old Record: 4"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "5 Likes"
-                },
-                {
-                    "id": 1304179843,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T17:58:59+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-2",
-                    "subject": [
-                        {
-                            "text": "Mike Dang commented on Dreaming of Elsewhere",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "url": "http://mikedang.wordpress.com",
-                                    "site_id": 10563972,
-                                    "email": "example@wordpress.com",
-                                    "id": 4275359
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        44
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/",
-                                    "site_id": 71769073,
-                                    "id": 38
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Wait, I had this dream too. HOW DID YOU READ MY DREAMS!?\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        57
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/dreaming-of-elsewhere/comment-page-1/#comment-2",
-                                    "site_id": 71769073,
-                                    "post_id": 38,
-                                    "id": 2
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mike Dang",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://mikedang.wordpress.com",
-                                    "id": 4275359,
-                                    "site_id": 10563972,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://mikedang.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 4275359,
-                                    "site": 10563972
-                                },
-                                "titles": {
-                                    "home": "Reporter Mike"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Wait, I had this dream too. HOW DID YOU READ MY DREAMS!?",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 2,
-                                    "user": 4275359,
-                                    "post": 38,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/2",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/4275359",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/2?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 4275359,
-                            "comment": 2,
-                            "post": 38,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/4275359",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/2",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/38",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Dreaming of Elsewhere"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304178014,
-                    "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T17:57:49+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-1",
-                    "subject": [
-                        {
-                            "text": "Mike Dang commented on Great Perspective on Blogging",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ],
-                                    "url": "http://mikedang.wordpress.com",
-                                    "site_id": 10563972,
-                                    "email": "example@wordpress.com",
-                                    "id": 4275359
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        52
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/",
-                                    "site_id": 71769073,
-                                    "id": 40
-                                }
-                            ]
-                        },
-                        {
-                            "text": "I read a story in the New York Times today about how no one uses pens anymore. WHAT. Give me your pens. I love pens.\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        117
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/07/24/on-blogging-2/comment-page-1/#comment-1",
-                                    "site_id": 71769073,
-                                    "post_id": 40,
-                                    "id": 1
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Mike Dang",
-                            "ranges": [
-                                {
-                                    "email": "example@wordpress.com",
-                                    "url": "http://mikedang.wordpress.com",
-                                    "id": 4275359,
-                                    "site_id": 10563972,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d861b27aa3a4ba53cf0fc5f59b7e0527?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "example@wordpress.com",
-                                    "home": "http://mikedang.wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 4275359,
-                                    "site": 10563972
-                                },
-                                "titles": {
-                                    "home": "Reporter Mike"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "I read a story in the New York Times today about how no one uses pens anymore. WHAT. Give me your pens. I love pens.",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 1,
-                                    "user": 4275359,
-                                    "post": 40,
-                                    "site": 71769073
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/1",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/4275359",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/1?action=edit"
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "user": 4275359,
-                            "comment": 1,
-                            "post": 40,
-                            "site": 71769073
-                        },
-                        "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/4275359",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/1",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/40",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 71769073,
-                                    "email": "example@wordpress.com",
-                                    "id": 68646169
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Great Perspective on Blogging"
-                        }
-                    ],
-                    "title": "Comment"
-                },
-                {
-                    "id": 1304158185,
-                    "type": "post_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T17:43:49+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-5-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've made 5 posts on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        23,
-                                        51
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "5 Posts",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-5-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on writing 5 posts on Words, Whimsy, and the World!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        38,
-                                        66
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "5 Posts"
-                },
-                {
-                    "id": 1304116488,
-                    "type": "post_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2014-07-24T17:13:51+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-1-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've made your first post on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        31,
-                                        59
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "First Post",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-1-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on writing your first post on Words, Whimsy, and the World!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        46,
-                                        74
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 71769073
-                                }
-                            ]
-                        }
-                    ],
-                    "meta": {
-                        "ids": {
-                            "site": 71769073
-                        },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/71769073"
-                        }
-                    },
-                    "title": "First Post"
-                }
-            ]
+                    "nest_level": 0,
+                    "edit_comment_link": "https:\/\/wordpress.com\/comment\/weekendbakesblog.wordpress.com\/1?action=edit"
+                }, {
+                    "text": "You replied to this comment.",
+                    "ranges": [{
+                        "type": "noticon",
+                        "indices": [0, 0],
+                        "value": "\uf467"
+                    }, {
+                        "type": "comment",
+                        "indices": [4, 11],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-3",
+                        "site_id": 181977606,
+                        "post_id": 56,
+                        "id": 3
+                    }]
+                }],
+                "meta": {
+                    "ids": {
+                        "user": 98380521,
+                        "comment": 1,
+                        "post": 56,
+                        "site": 181977606,
+                        "reply_comment": 3
+                    },
+                    "links": {
+                        "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380521",
+                        "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/1",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "reply_comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/3"
+                    }
+                },
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "My Top 10 Pastry Recipes"
+                }],
+                "title": "Comment",
+                "note_hash": 638476488
+            }, {
+                "id": 4937354640,
+                "type": "new_post",
+                "read": 0,
+                "noticon": "\uf455",
+                "timestamp": "{{now offset='-4 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/easy-blueberry-muffins\/",
+                "subject": [{
+                    "text": "Kate Williams posted on Kate's Kitchen: French Toast Four Different Ways",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }, {
+                        "type": "site",
+                        "indices": [24, 38],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }, {
+                        "type": "post",
+                        "indices": [40, 72],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/easy-blueberry-muffins\/",
+                        "site_id": 181977606,
+                        "id": 14
+                    }]
+                }, {
+                    "text": "Depending what mood I'm in, I like to..."
+                }],
+                "body": [{
+                    "text": "\n\n\t\u2022 \n\t\n\t\n\t\u2022 \n\t\n\t\n\t\u2022 \n\t\n\t\nIngredients\n\n\t\u2022 1 cup fresh or frozen blueberries\n\t\n\t\u2022 1 3\/4 cup flour\n\t\n\t\u2022 2 tsp baking powder\n\t\n\t\u2022 3\/4 cups sugar\n\t\n\t\u2022 1\/4 cup canola oil\n\t\n\t\u2022 1 egg\n\t\n",
+                    "ranges": [{
+                        "type": "h4",
+                        "indices": [26, 37]
+                    }, {
+                        "type": "list",
+                        "indices": [1, 25]
+                    }, {
+                        "type": "list",
+                        "indices": [38, 178]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [14, 16],
+                        "url": "https:\/\/appscreens.files.wordpress.com\/2020\/08\/sarah-gualtieri-o3mdjpy3qdo-unsplash.jpg?w=683"
+                    }, {
+                        "type": "image",
+                        "indices": [22, 24],
+                        "url": "https:\/\/appscreens.files.wordpress.com\/2020\/08\/yulia-khlebnikova-oh5mxkl9oho-unsplash.jpg?w=1024"
+                    }, {
+                        "type": "image",
+                        "indices": [6, 8],
+                        "url": "https:\/\/appscreens.files.wordpress.com\/2020\/08\/sarah-gualtieri-tohjvyg65n0-unsplash.jpg?w=683"
+                    }],
+                    "actions": {
+                        "replyto-comment": true,
+                        "like-post": false
+                    },
+                    "meta": {
+                        "ids": {
+                            "post": 14,
+                            "site": 181977606
+                        },
+                        "links": {
+                            "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/14",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                        }
+                    },
+                    "type": "post"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606,
+                        "post": 14,
+                        "user": 191794483
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/14",
+                        "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/191794483"
+                    }
+                },
+                "title": "New Post",
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "Easy Blueberry Muffins",
+                    "ranges": [{
+                        "type": "post",
+                        "indices": [0, 22],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/easy-blueberry-muffins\/",
+                        "site_id": 181977606,
+                        "id": 14
+                    }]
+                }],
+                "note_hash": 492599271
+            }, {
+                "id": 4937350334,
+                "type": "follow",
+                "read": 0,
+                "noticon": "\uf801",
+                "timestamp": "{{now offset='-5 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/b9dadbf067e5583eaf82abefc49727bb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "http:\/\/weekendbakesblog.wordpress.com",
+                "subject": [{
+                    "text": "Pamela Nguyen and 4 others followed your blog Weekend Bakes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/pamelanguyen.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98379476
+                    }, {
+                        "type": "b",
+                        "indices": [18, 19]
+                    }, {
+                        "type": "site",
+                        "indices": [46, 59],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "body": [{
+                    "text": "Pamela Nguyen",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/pamelanguyen.wordpress.com",
+                        "id": 98379476,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/b9dadbf067e5583eaf82abefc49727bb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/pamelanguyen.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379476
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Catrina Ciobanu",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/catrinaciobanu.wordpress.com",
+                        "id": 98387381,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/9e99ce19f071c664fb4a882befb72391?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/catrinaciobanu.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98387381
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Theresa Ray",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "id": 98379754,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/theresaray.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379754
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Madison Ruiz",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/madisonruiz.wordpress.com",
+                        "id": 98379888,
+                        "type": "user",
+                        "indices": [0, 12]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/c536d5d44894a7575296e657d86ed770?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/madisonruiz.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379888
+                        }
+                    },
+                    "type": "user"
+                }, {
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "id": 191794483,
+                        "site_id": 181851541,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "actions": {
+                        "follow": false
+                    },
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/tricountyrealestate.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 191794483,
+                            "site": 181851541
+                        },
+                        "titles": {
+                            "home": "Tri-County Real Estate"
+                        }
+                    },
+                    "type": "user"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "title": "5 Followers",
+                "header": [{
+                    "text": "Weekend Bakes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "site_id": 181977606,
+                        "id": 181977606
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/image.jpg?w=96"
+                    }]
+                }, {
+                    "text": "http:\/\/weekendbakesblog.wordpress.com"
+                }],
+                "note_hash": 3590885648
+            }, {
+                "id": 4937367020,
+                "type": "best_liked_day_feat",
+                "read": 1,
+                "noticon": "\uf806",
+                "timestamp": "{{now offset='-1 days'}}",
+                "icon": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/bestday-likes-2x.png",
+                "url": "http:\/\/weekendbakesblog.wordpress.com",
+                "subject": [{
+                    "text": "October 5: Your best day for likes on Weekend Bakes",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [38, 51],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "body": [{
+                    "text": "5 Likes",
+                    "media": [{
+                        "type": "badge",
+                        "indices": [0, 7],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/bestday-likes-2x.png"
+                    }]
+                }, {
+                    "text": "On Monday October 5, 2020, you surpassed your previous record of most likes in one day for your posts on Weekend Bakes. That's pretty awesome, well done!",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [105, 118],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }, {
+                    "text": "Most Likes in One Day"
+                }, {
+                    "text": "Current Record: 5",
+                    "ranges": [{
+                        "type": "b",
+                        "indices": [16, 17]
+                    }]
+                }, {
+                    "text": "Old Record: 4",
+                    "ranges": [{
+                        "type": "b",
+                        "indices": [12, 13]
+                    }]
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "title": "5 Likes",
+                "note_hash": 3233821948
+            }, {
+                "id": 4880577651,
+                "type": "post_milestone_achievement",
+                "read": 1,
+                "noticon": "\uf806",
+                "timestamp": "{{now offset='-2 days'}}",
+                "icon": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/post-milestone-1-2x.png",
+                "url": "http:\/\/wordpress.com\/trophy-case\/",
+                "subject": [{
+                    "text": "You've made your first post on Weekend Bakes.",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [31, 44],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "body": [{
+                    "text": "First Post",
+                    "media": [{
+                        "type": "badge",
+                        "indices": [0, 10],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/post-milestone-1-2x.png"
+                    }]
+                }, {
+                    "text": "Congratulations on writing your first post on Weekend Bakes!",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [46, 59],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "title": "First Post",
+                "note_hash": 2994072417
+            }]
         }
     }
 }
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications.json
index 68551311e3aa..7aeda1c33e8e 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPattern": "/rest/v1.1/notifications(/)?($|\\?.*)",
+        "urlPath": "/rest/v1.1/notifications/",
         "queryParameters": {
             "fields": {
                 "matches": "id,(note_hash,)?type,unread,body,subject,timestamp,meta"
@@ -11,1770 +11,995 @@
     "response": {
         "status": 200,
         "jsonBody": {
-            "last_seen_time": "1553125740",
-            "number": 12,
-            "notes": [
-                {
-                    "id": 3864303999,
-                    "note_hash": 3043037365,
-                    "type": "post_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2019-03-20T23:49:00+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-1-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've made your first post on In Focus Photography.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        31,
-                                        51
-                                    ],
-                                    "url": "http://infocusphotographers.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "First Post",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-1-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on writing your first post on In Focus Photography!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        46,
-                                        66
-                                    ],
-                                    "url": "http://infocusphotographers.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
-                        }
-                    ],
+            "last_seen_time": "1598052184",
+            "number": 9,
+            "notes": [ {
+                "id": 4937363649,
+                "type": "like",
+                "read": 0,
+                "noticon": "\uf408",
+                "timestamp": "{{now}}",
+                "icon": "https:\/\/1.gravatar.com\/avatar\/11bcf6345930a9fbde5e6f0985c3f24a?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                "subject": [{
+                    "text": "Amechie Ajimobi and 5 others liked your post My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/amechieajimobi.wordpress.com",
+                        "site_id": 103806280,
+                        "email": "test@example.com",
+                        "id": 98380134
+                    }, {
+                        "type": "b",
+                        "indices": [20, 21]
+                    }, {
+                        "type": "post",
+                        "indices": [45, 69],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }],
+                "body": [{
+                    "text": "Amechie Ajimobi",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/amechieajimobi.wordpress.com",
+                        "id": 98380134,
+                        "site_id": 103806280,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/1.gravatar.com\/avatar\/11bcf6345930a9fbde5e6f0985c3f24a?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "actions": {
+                        "follow": false
+                    },
                     "meta": {
-                        "ids": {
-                            "site": 0
-                        },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0"
-                        }
-                    },
-                    "title": "First Post"
-                },
-                {
-                    "id": 1304254364,
-                    "note_hash": 1137486184,
-                    "type": "follow",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2019-01-29T07:32:12+00:00",
-                    "icon": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "http://thenomadicwordsmith.wordpress.com",
-                    "subject": [
-                        {
-                            "text": "Dennis Gotcher and 6 others followed your blog Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        47,
-                                        75
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Dennis Gotcher",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Site Title"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "jocelynpoe",
-                            "ranges": [
-                                {
-                                    "email": "0000000@gmail.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "",
-                                    "tagline": ""
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Rowan Shy",
-                            "ranges": [
-                                {
-                                    "email": "text@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        9
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/a16c450344e13c52abe9b7bb5b3ef103?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "rrluscan@icloud.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Rowan's little notes",
-                                    "tagline": "Learn about my life, recent events and hamsters"
-                                }
-                            },
-                            "type": "user"
+                            "email": "test@example.com",
+                            "home": "http:\/\/amechieajimobi.wordpress.com"
                         },
-                        {
-                            "text": "Alex Smithson",
-                            "ranges": [
-                                {
-                                    "email": "test@example.comn",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7b1a301d11cd8c5639e01dfb4dd56b85?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.comn",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Mother Nature"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Lisa S.",
-                            "ranges": [
-                                {
-                                    "email": "text@example.com",
-                                    "id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/88fa4a65e2d06dcf34c98c038e827e10?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "text@example.com"
-                                },
-                                "ids": {
-                                    "user": 0
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Mark",
-                            "ranges": [
-                                {
-                                    "email": "text@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        4
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/54d388fd4592cfed0b14bd1d52f80185?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Nature Walks",
-                                    "tagline": "Exploring the countryside"
-                                }
-                            },
-                            "type": "user"
+                        "ids": {
+                            "user": 98380134,
+                            "site": 103806280
                         },
-                        {
-                            "text": "Antoniarexes",
-                            "ranges": [
-                                {
-                                    "email": "text@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        12
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/0e2284b177e549f3aab7138978122408?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0
-                                }
-                            },
-                            "type": "user"
+                        "titles": {
+                            "home": "The Cooking Point"
                         }
-                    ],
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Catrina Ciobanu",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/catrinaciobanu.wordpress.com",
+                        "id": 98387381,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/9e99ce19f071c664fb4a882befb72391?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
                     "meta": {
-                        "ids": {
-                            "site": 0
-                        },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0"
+                            "email": "test@example.com",
+                            "home": "http:\/\/catrinaciobanu.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98387381
                         }
                     },
-                    "title": "7 Followers",
-                    "header": [
-                        {
-                            "text": "Words, Whimsy, and the World",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        28
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s=128"
-                                }
-                            ]
+                    "type": "user"
+                }, {
+                    "text": "Pamela Nguyen",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/pamelanguyen.wordpress.com",
+                        "id": 98379476,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/b9dadbf067e5583eaf82abefc49727bb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/pamelanguyen.wordpress.com"
                         },
-                        {
-                            "text": "Stories and images from The Nomadic Wordsmith"
-                        }
-                    ]
-                },
-                {
-                    "id": 36585070,
-                    "note_hash": 3899811297,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-11-24T02:09:15+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2015/07/20/along-the-coast-2/",
-                    "subject": [
-                        {
-                            "text": "Brandon Knoll and documentedwanderlust liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        18,
-                                        38
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        55,
-                                        70
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2015/07/20/along-the-coast-2/",
-                                    "site_id": 0,
-                                    "id": 132
-                                }
-                            ]
+                        "ids": {
+                            "user": 98379476
                         }
-                    ],
-                    "body": [
-                        {
-                            "text": "Brandon Knoll",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Chaotic Shapes",
-                                    "tagline": "Art and Lifestyle by Brandon"
-                                }
-                            },
-                            "type": "user"
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Madison Ruiz",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/madisonruiz.wordpress.com",
+                        "id": 98379888,
+                        "type": "user",
+                        "indices": [0, 12]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/c536d5d44894a7575296e657d86ed770?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                            "email": "test@example.com",
+                            "home": "http:\/\/madisonruiz.wordpress.com"
                         },
-                        {
-                            "text": "documentedwanderlust",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd5dc704bef73822c2247434f91e025f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Documented Wanderlust"
-                                }
-                            },
-                            "type": "user"
+                        "ids": {
+                            "user": 98379888
                         }
-                    ],
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Theresa Ray",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "id": 98379754,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
                     "meta": {
-                        "ids": {
-                            "site": 0,
-                            "post": 132
-                        },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/132"
+                        "email": "test@example.com",
+                            "home": "http:\/\/theresaray.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98379754
                         }
                     },
-                    "title": "2 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
+                    "type": "user"
+                }, {
+                    "text": "Reyansh Pawar",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/reyanshpawar.wordpress.com",
+                        "id": 98380071,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/1.gravatar.com\/avatar\/4b7ac5a2b497adbd473313b0701023a4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                        "email": "test@example.com",
+                            "home": "http:\/\/reyanshpawar.wordpress.com"
                         },
-                        {
-                            "text": "Along the Coast"
+                        "ids": {
+                            "user": 98380071
                         }
-                    ]
+                    },
+                    "type": "user"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606,
+                        "post": 56
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56"
+                    }
                 },
-                {
-                    "id": 36585056,
-                    "note_hash": 2262707516,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-11-24T02:09:14+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2016/01/28/along-the-coast-4/",
-                    "subject": [
-                        {
-                            "text": "Brandon liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        23,
-                                        38
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/01/28/along-the-coast-4/",
-                                    "site_id": 0,
-                                    "id": 147
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Brandon",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        7
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Chaotic Shapes",
-                                    "tagline": "Art and Lifestyle by Brandon"
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
+                "title": "6 Likes",
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "My Top 10 Pastry Recipes"
+                }],
+                "note_hash": 1391922081
+            }, {
+                "id": 4937370391,
+                "type": "comment_like",
+                "read": 1,
+                "noticon": "\uf408",
+                "timestamp": "{{now offset='-1 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-3",
+                "subject": [{
+                    "text": "Theresa Ray liked your comment on My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 11],
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98379754
+                    }, {
+                        "type": "post",
+                        "indices": [34, 58],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }],
+                "body": [{
+                    "text": "Theresa Ray",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "id": 98379754,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
                     "meta": {
-                        "ids": {
-                            "site": 0,
-                            "post": 147
-                        },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/147"
-                        }
-                    },
-                    "title": "1 Like",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
+                        "email": "test@example.com",
+                            "home": "http:\/\/theresaray.wordpress.com"
                         },
-                        {
-                            "text": "Along the Coast"
+                        "ids": {
+                            "user": 98379754
                         }
-                    ]
+                    },
+                    "type": "user"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606,
+                        "post": 56,
+                        "comment": 3
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                        "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/3"
+                    }
                 },
-                {
-                    "id": 3467659357,
-                    "note_hash": 3085655305,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-11-24T02:09:13+00:00",
-                    "icon": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/",
-                    "subject": [
-                        {
-                            "text": "Brandon Knoll and 2 others liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        43,
-                                        58
-                                    ],
-                                    "url": "https://wordpress.com/",
-                                    "site_id": 0,
-                                    "id": 0
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Brandon Knoll",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/d20d9beb90a8e4c049135bb43c0c7c6e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Chaotic Shapes",
-                                    "tagline": "Art and Lifestyle by Brandon"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Dennis Gotcher",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Site Title"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "jocelynpoe",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "",
-                                    "tagline": ""
-                                }
-                            },
-                            "type": "user"
-                        }
-                    ],
+                "title": "1 Like",
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "Thanks!"
+                }],
+                "note_hash": 1528602550
+            }, {
+                "id": 4937363362,
+                "type": "comment",
+                "read": 1,
+                "noticon": "\uf300",
+                "timestamp": "{{now offset='-2 hours'}}",
+                "icon": "https:\/\/1.gravatar.com\/avatar\/4b7ac5a2b497adbd473313b0701023a4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-2",
+                "subject": [{
+                    "text": "Reyansh Pawar commented on My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/reyanshpawar.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98380071
+                    }, {
+                        "type": "post",
+                        "indices": [27, 51],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }, {
+                    "text": "Can you use almond or rice flour instead of the whole wheat to make the peach scone recipe gluten free?\n",
+                    "ranges": [{
+                        "type": "comment",
+                        "indices": [0, 104],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-2",
+                        "site_id": 181977606,
+                        "post_id": 56,
+                        "id": 2
+                    }]
+                }],
+                "body": [{
+                    "text": "Reyansh Pawar",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/reyanshpawar.wordpress.com",
+                        "id": 98380071,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/1.gravatar.com\/avatar\/4b7ac5a2b497adbd473313b0701023a4?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
                     "meta": {
-                        "ids": {
-                            "site": 0,
-                            "post": 0
-                        },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/0"
-                        }
-                    },
-                    "title": "3 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
+                        "email": "test@example.com",
+                            "home": "http:\/\/reyanshpawar.wordpress.com"
                         },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ]
-                },
-                {
-                    "id": 3528647758,
-                    "note_hash": 520929093,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-09-03T06:30:38+00:00",
-                    "icon": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/",
-                    "subject": [
-                        {
-                            "text": "Dennis Gotcher liked your post Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        31,
-                                        46
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2014/10/25/along-the-coast/",
-                                    "site_id": 0,
-                                    "id": 79
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "Dennis Gotcher",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        14
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/dc6812f0d56d01c8d8a1f126458ffa7e?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Site Title"
-                                }
-                            },
-                            "type": "user"
+                        "ids": {
+                            "user": 98380071
                         }
-                    ],
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Can you use almond or rice flour instead of the whole wheat to make the peach scone recipe gluten free?",
+                    "actions": {
+                        "spam-comment": false,
+                        "trash-comment": false,
+                        "approve-comment": true,
+                        "edit-comment": true,
+                        "replyto-comment": true,
+                        "like-comment": false
+                    },
                     "meta": {
                         "ids": {
-                            "site": 0,
-                            "post": 79
+                            "comment": 2,
+                            "user": 98380071,
+                            "post": 56,
+                            "site": 181977606
                         },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/79"
+                            "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/2",
+                            "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380071",
+                            "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
                         }
                     },
-                    "title": "1 Like",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ]
-                },
-                {
-                    "id": 3473753915,
-                    "note_hash": 1538257386,
-                    "type": "achieve_user_anniversary",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-07-24T18:13:52+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "4 Year Anniversary Achievement",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        30
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        },
-                        {
-                            "text": "You registered on WordPress.com 4 years ago."
-                        },
-                        {
-                            "text": "Thanks for flying with us. Keep up the good blogging."
-                        }
-                    ],
-                    "title": "Achievement"
-                },
-                {
-                    "id": 3467659628,
-                    "note_hash": 1707514061,
                     "type": "comment",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2018-07-19T23:46:17+00:00",
-                    "icon": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/comment-page-1/#comment-35",
-                    "subject": [
-                        {
-                            "text": "jocelynpoe commented on Along the Coast",
-                            "ranges": [
-                                {
-                                    "type": "noticon",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "value": ""
-                                },
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.com",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        24,
-                                        39
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/",
-                                    "site_id": 0,
-                                    "id": 0
-                                }
-                            ]
-                        },
-                        {
-                            "text": "If we could somehow harness this lightning: 9.385803\n",
-                            "ranges": [
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        0,
-                                        53
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/comment-page-1/#comment-35",
-                                    "site_id": 0,
-                                    "post_id": 0,
-                                    "id": 35
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "jocelynpoe",
-                            "ranges": [
-                                {
-                                    "email": "test@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://2.gravatar.com/avatar/bd3072753daa7e03db6ec81716a662c1?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "",
-                                    "tagline": ""
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "If we could somehow harness this lightning: 9.385803",
-                            "actions": {
-                                "spam-comment": false,
-                                "trash-comment": false,
-                                "approve-comment": true,
-                                "edit-comment": true,
-                                "replyto-comment": true,
-                                "like-comment": false
-                            },
-                            "meta": {
-                                "ids": {
-                                    "comment": 35,
-                                    "user": 0,
-                                    "post": 0,
-                                    "site": 0
-                                },
-                                "links": {
-                                    "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/35",
-                                    "user": "{{request.requestLine.baseUrl}}/rest/v1/users/0",
-                                    "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/0",
-                                    "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0"
-                                }
-                            },
-                            "type": "comment",
-                            "nest_level": 0,
-                            "edit_comment_link": "https://wordpress.com/comment/thenomadicwordsmith.wordpress.com/35?action=edit"
+                    "nest_level": 0,
+                    "edit_comment_link": "https:\/\/wordpress.com\/comment\/weekendbakesblog.wordpress.com\/2?action=edit"
+                }],
+                "meta": {
+                    "ids": {
+                        "user": 98380071,
+                        "comment": 2,
+                        "post": 56,
+                        "site": 181977606
+                    },
+                    "links": {
+                        "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380071",
+                        "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/2",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "header": [{
+                    "text": "Pamela Nguyen",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "My Top 10 Pastry Recipes"
+                }],
+                "title": "Comment",
+                "note_hash": 1287359074
+            }, {
+                "id": 4937360549,
+                "type": "comment",
+                "read": 1,
+                "noticon": "\uf300",
+                "timestamp": "{{now offset='-3 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/bf9d10e44237e511d841a9b8076746d5?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-1",
+                "subject": [{
+                    "text": "Joao Montes commented on My Top 10 Pastry Recipes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 11],
+                        "url": "http:\/\/joaomontes.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98380521
+                    }, {
+                        "type": "post",
+                        "indices": [25, 49],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/",
+                        "site_id": 181977606,
+                        "id": 56
+                    }]
+                }, {
+                    "text": "Amazing results!\n",
+                    "ranges": [{
+                        "type": "comment",
+                        "indices": [0, 17],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-1",
+                        "site_id": 181977606,
+                        "post_id": 56,
+                        "id": 1
+                    }]
+                }],
+                "body": [{
+                    "text": "Jo\u00e3o Montes",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/joaomontes.wordpress.com",
+                        "id": 98380521,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/bf9d10e44237e511d841a9b8076746d5?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                        "email": "test@example.com",
+                            "home": "http:\/\/joaomontes.wordpress.com"
                         },
-                        {
-                            "text": "You replied to this comment.",
-                            "ranges": [
-                                {
-                                    "type": "noticon",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "value": ""
-                                },
-                                {
-                                    "type": "comment",
-                                    "indices": [
-                                        4,
-                                        11
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/2016/08/25/along-the-coast-6/comment-page-1/#comment-64",
-                                    "site_id": 0,
-                                    "post_id": 0,
-                                    "id": 64
-                                }
-                            ]
+                        "ids": {
+                            "user": 98380521
                         }
-                    ],
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Amazing results!",
+                    "actions": {
+                        "spam-comment": false,
+                        "trash-comment": false,
+                        "approve-comment": true,
+                        "edit-comment": true,
+                        "replyto-comment": true,
+                        "like-comment": false
+                    },
                     "meta": {
                         "ids": {
-                            "user": 0,
-                            "comment": 35,
-                            "post": 0,
-                            "site": 0,
-                            "reply_comment": 64
+                            "comment": 1,
+                            "user": 98380521,
+                            "post": 56,
+                            "site": 181977606
                         },
                         "links": {
-                            "user": "{{request.requestLine.baseUrl}}/rest/v1/users/0",
-                            "comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/35",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/0",
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0",
-                            "reply_comment": "{{request.requestLine.baseUrl}}/rest/v1/comments/64"
+                            "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/1",
+                            "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380521",
+                            "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
                         }
                     },
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Along the Coast"
-                        }
-                    ],
-                    "title": "Comment"
+                    "type": "comment",
+                    "nest_level": 0,
+                    "edit_comment_link": "https:\/\/wordpress.com\/comment\/weekendbakesblog.wordpress.com\/1?action=edit"
+                }, {
+                    "text": "You replied to this comment.",
+                    "ranges": [{
+                        "type": "noticon",
+                        "indices": [0, 0],
+                        "value": "\uf467"
+                    }, {
+                        "type": "comment",
+                        "indices": [4, 11],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/my-top-10-pastry-recipes\/comment-page-1\/#comment-3",
+                        "site_id": 181977606,
+                        "post_id": 56,
+                        "id": 3
+                    }]
+                }],
+                "meta": {
+                    "ids": {
+                        "user": 98380521,
+                        "comment": 1,
+                        "post": 56,
+                        "site": 181977606,
+                        "reply_comment": 3
+                    },
+                    "links": {
+                        "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/98380521",
+                        "comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/1",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/56",
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "reply_comment": "{{request.requestLine.baseUrl}}\/rest\/v1\/comments\/3"
+                    }
                 },
-                {
-                    "id": 2985661262,
-                    "note_hash": 2021782991,
-                    "type": "followed_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2017-07-07T20:45:02+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/followed-blog-5-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've received 5 follows on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        29,
-                                        57
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "5 Follows!",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        10
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/followed-blog-5-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Congratulations on getting 5 total follows on Words, Whimsy, and the World!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        46,
-                                        74
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Your current tally is 7."
-                        }
-                    ],
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "My Top 10 Pastry Recipes"
+                }],
+                "title": "Comment",
+                "note_hash": 638476488
+            }, {
+                "id": 4937354640,
+                "type": "new_post",
+                "read": 0,
+                "noticon": "\uf455",
+                "timestamp": "{{now offset='-4 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/easy-blueberry-muffins\/",
+                "subject": [{
+                    "text": "Kate Williams posted on Kate's Kitchen: French Toast Four Different Ways",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }, {
+                        "type": "site",
+                        "indices": [24, 38],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }, {
+                        "type": "post",
+                        "indices": [40, 72],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/easy-blueberry-muffins\/",
+                        "site_id": 181977606,
+                        "id": 14
+                    }]
+                }, {
+                    "text": "Depending what mood I'm in, I like to\u2026"
+                }],
+                "body": [{
+                    "text": "\n\n\t\u2022 \n\t\n\t\n\t\u2022 \n\t\n\t\n\t\u2022 \n\t\n\t\nIngredients\n\n\t\u2022 1 cup fresh or frozen blueberries\n\t\n\t\u2022 1 3\/4 cup flour\n\t\n\t\u2022 2 tsp baking powder\n\t\n\t\u2022 3\/4 cups sugar\n\t\n\t\u2022 1\/4 cup canola oil\n\t\n\t\u2022 1 egg\n\t\n",
+                    "ranges": [{
+                        "type": "h4",
+                        "indices": [26, 37]
+                    }, {
+                        "type": "list",
+                        "indices": [1, 25]
+                    }, {
+                        "type": "list",
+                        "indices": [38, 178]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [14, 16],
+                        "url": "https:\/\/appscreens.files.wordpress.com\/2020\/08\/sarah-gualtieri-o3mdjpy3qdo-unsplash.jpg?w=683"
+                    }, {
+                        "type": "image",
+                        "indices": [22, 24],
+                        "url": "https:\/\/appscreens.files.wordpress.com\/2020\/08\/yulia-khlebnikova-oh5mxkl9oho-unsplash.jpg?w=1024"
+                    }, {
+                        "type": "image",
+                        "indices": [6, 8],
+                        "url": "https:\/\/appscreens.files.wordpress.com\/2020\/08\/sarah-gualtieri-tohjvyg65n0-unsplash.jpg?w=683"
+                    }],
+                    "actions": {
+                        "replyto-comment": true,
+                        "like-post": false
+                    },
                     "meta": {
                         "ids": {
-                            "site": 0
+                            "post": 14,
+                            "site": 181977606
                         },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0"
+                            "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/14",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
                         }
                     },
-                    "title": "5 Followers!"
+                    "type": "post"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606,
+                        "post": 14,
+                        "user": 191794483
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606",
+                        "post": "{{request.requestLine.baseUrl}}\/rest\/v1\/posts\/14",
+                        "user": "{{request.requestLine.baseUrl}}\/rest\/v1\/users\/191794483"
+                    }
                 },
-                {
-                    "id": 2584083750,
-                    "note_hash": 2021782123,
-                    "type": "post_milestone_achievement",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2016-08-17T18:28:59+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-20-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "You've made 20 posts on Words, Whimsy, and the World.",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        24,
-                                        52
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "20 Posts",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/post-milestone-20-2x.png"
-                                }
-                            ]
+                "title": "New Post",
+                "header": [{
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 15],
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "site_id": 181851541,
+                        "email": "test@example.com",
+                        "id": 191794483
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }]
+                }, {
+                    "text": "Easy Blueberry Muffins",
+                    "ranges": [{
+                        "type": "post",
+                        "indices": [0, 22],
+                        "url": "https:\/\/weekendbakesblog.wordpress.com\/2020\/10\/05\/easy-blueberry-muffins\/",
+                        "site_id": 181977606,
+                        "id": 14
+                    }]
+                }],
+                "note_hash": 492599271
+            }, {
+                "id": 4937350334,
+                "type": "follow",
+                "read": 0,
+                "noticon": "\uf801",
+                "timestamp": "{{now offset='-5 hours'}}",
+                "icon": "https:\/\/2.gravatar.com\/avatar\/b9dadbf067e5583eaf82abefc49727bb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
+                "url": "http:\/\/weekendbakesblog.wordpress.com",
+                "subject": [{
+                    "text": "Pamela Nguyen and 4 others followed your blog Weekend Bakes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/pamelanguyen.wordpress.com",
+                        "email": "test@example.com",
+                        "id": 98379476
+                    }, {
+                        "type": "b",
+                        "indices": [18, 19]
+                    }, {
+                        "type": "site",
+                        "indices": [46, 59],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "body": [{
+                    "text": "Pamela Nguyen",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/pamelanguyen.wordpress.com",
+                        "id": 98379476,
+                        "type": "user",
+                        "indices": [0, 13]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/b9dadbf067e5583eaf82abefc49727bb?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                        "email": "test@example.com",
+                            "home": "http:\/\/pamelanguyen.wordpress.com"
                         },
-                        {
-                            "text": "Congratulations on writing 20 posts on Words, Whimsy, and the World!",
-                            "ranges": [
-                                {
-                                    "type": "site",
-                                    "indices": [
-                                        39,
-                                        67
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "id": 0
-                                }
-                            ]
+                        "ids": {
+                            "user": 98379476
                         }
-                    ],
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Catrina Ciobanu",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/catrinaciobanu.wordpress.com",
+                        "id": 98387381,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/9e99ce19f071c664fb4a882befb72391?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
                     "meta": {
-                        "ids": {
-                            "site": 0
-                        },
                         "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0"
+                        "email": "test@example.com",
+                            "home": "http:\/\/catrinaciobanu.wordpress.com"
+                        },
+                        "ids": {
+                            "user": 98387381
                         }
                     },
-                    "title": "20 Posts"
-                },
-                {
-                    "id": 1993981732,
-                    "type": "achieve_user_anniversary",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2015-08-06T20:43:05+00:00",
-                    "icon": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png",
-                    "url": "http://wordpress.com/trophy-case/",
-                    "subject": [
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        }
-                    ],
-                    "body": [
-                        {
-                            "text": "1 Year Anniversary Achievement",
-                            "media": [
-                                {
-                                    "type": "badge",
-                                    "indices": [
-                                        0,
-                                        30
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://s.wp.com/wp-content/mu-plugins/achievements/anniversary-2x.png"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "Happy Anniversary with WordPress.com!"
-                        },
-                        {
-                            "text": "You registered on WordPress.com one year ago."
+                    "type": "user"
+                }, {
+                    "text": "Theresa Ray",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/theresaray.wordpress.com",
+                        "id": 98379754,
+                        "type": "user",
+                        "indices": [0, 11]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/2.gravatar.com\/avatar\/e31f50d91bb2f5b278038898680ea194?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                        "email": "test@example.com",
+                            "home": "http:\/\/theresaray.wordpress.com"
                         },
-                        {
-                            "text": "Thanks for flying with us. Keep up the good blogging."
-                        }
-                    ],
-                    "title": "Achievement"
-                },
-                {
-                    "id": 1305979273,
-                    "type": "like",
-                    "read": 1,
-                    "noticon": "",
-                    "timestamp": "2015-05-30T18:20:54+00:00",
-                    "icon": "https://1.gravatar.com/avatar/7b1a301d11cd8c5639e01dfb4dd56b85?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G",
-                    "url": "https://thenomadicwordsmith.wordpress.com/about/",
-                    "subject": [
-                        {
-                            "text": "Alex Smithson and 2 others liked your post About This Nomad",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ],
-                                    "url": "http://wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                },
-                                {
-                                    "type": "post",
-                                    "indices": [
-                                        43,
-                                        59
-                                    ],
-                                    "url": "https://thenomadicwordsmith.wordpress.com/about/",
-                                    "site_id": 0,
-                                    "id": 1
-                                }
-                            ]
+                        "ids": {
+                            "user": 98379754
                         }
-                    ],
-                    "body": [
-                        {
-                            "text": "Alex Smithson",
-                            "ranges": [
-                                {
-                                    "email": "test@example.comn",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        13
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/7b1a301d11cd8c5639e01dfb4dd56b85?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.comn",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Mother Nature"
-                                }
-                            },
-                            "type": "user"
-                        },
-                        {
-                            "text": "Nancy T.",
-                            "ranges": [
-                                {
-                                    "email": "test@example.comn",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        8
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://1.gravatar.com/avatar/4e3309b5cf977f89206c1dbb2b00e8e3?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": true
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "test@example.comn",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Writing Bytes"
-                                }
-                            },
-                            "type": "user"
+                    },
+                    "type": "user"
+                }, {
+                    "text": "Madison Ruiz",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/madisonruiz.wordpress.com",
+                        "id": 98379888,
+                        "type": "user",
+                        "indices": [0, 12]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/c536d5d44894a7575296e657d86ed770?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "meta": {
+                        "links": {
+                        "email": "test@example.com",
+                            "home": "http:\/\/madisonruiz.wordpress.com"
                         },
-                        {
-                            "text": "Kathy Kavanagh",
-                            "ranges": [
-                                {
-                                    "email": "text@example.com",
-                                    "url": "http://wordpress.com",
-                                    "id": 0,
-                                    "site_id": 0,
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        20
-                                    ]
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ],
-                            "actions": {
-                                "follow": false
-                            },
-                            "meta": {
-                                "links": {
-                                    "email": "text@example.com",
-                                    "home": "http://wordpress.com"
-                                },
-                                "ids": {
-                                    "user": 0,
-                                    "site": 0
-                                },
-                                "titles": {
-                                    "home": "Kathy Kavanagh"
-                                }
-                            },
-                            "type": "user"
+                        "ids": {
+                            "user": 98379888
                         }
-                    ],
+                    },
+                    "type": "user"
+                }, {
+                    "text": "appstorescreens",
+                    "ranges": [{
+                        "email": "test@example.com",
+                        "url": "http:\/\/tricountyrealestate.wordpress.com",
+                        "id": 191794483,
+                        "site_id": 181851541,
+                        "type": "user",
+                        "indices": [0, 15]
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
+                    }],
+                    "actions": {
+                        "follow": false
+                    },
                     "meta": {
+                        "links": {
+                        "email": "test@example.com",
+                            "home": "http:\/\/tricountyrealestate.wordpress.com"
+                        },
                         "ids": {
-                            "site": 0,
-                            "post": 1
+                            "user": 191794483,
+                            "site": 181851541
                         },
-                        "links": {
-                            "site": "{{request.requestLine.baseUrl}}/rest/v1/sites/0",
-                            "post": "{{request.requestLine.baseUrl}}/rest/v1/posts/1"
+                        "titles": {
+                            "home": "Tri-County Real Estate"
                         }
                     },
-                    "title": "3 Likes",
-                    "header": [
-                        {
-                            "text": "thenomadicwordsmith",
-                            "ranges": [
-                                {
-                                    "type": "user",
-                                    "indices": [
-                                        0,
-                                        19
-                                    ],
-                                    "url": "http://thenomadicwordsmith.wordpress.com",
-                                    "site_id": 0,
-                                    "email": "test@example.comn",
-                                    "id": 0
-                                }
-                            ],
-                            "media": [
-                                {
-                                    "type": "image",
-                                    "indices": [
-                                        0,
-                                        0
-                                    ],
-                                    "height": "256",
-                                    "width": "256",
-                                    "url": "https://0.gravatar.com/avatar/9ba48385fc40dfd9a55a3348d8e7f4d9?s=256&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fad516503a11cd5ca435acc9bb6523536%3Fs%3D256&r=G"
-                                }
-                            ]
-                        },
-                        {
-                            "text": "About This Nomad"
-                        }
-                    ]
-                }
-            ]
+                    "type": "user"
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "title": "5 Followers",
+                "header": [{
+                    "text": "Weekend Bakes",
+                    "ranges": [{
+                        "type": "user",
+                        "indices": [0, 13],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "site_id": 181977606,
+                        "id": 181977606
+                    }],
+                    "media": [{
+                        "type": "image",
+                        "indices": [0, 0],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/weekendbakesblog.files.wordpress.com\/2020\/08\/image.jpg?w=96"
+                    }]
+                }, {
+                    "text": "http:\/\/weekendbakesblog.wordpress.com"
+                }],
+                "note_hash": 3590885648
+            }, {
+                "id": 4937367020,
+                "type": "best_liked_day_feat",
+                "read": 1,
+                "noticon": "\uf806",
+                "timestamp": "{{now offset='-1 days'}}",
+                "icon": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/bestday-likes-2x.png",
+                "url": "http:\/\/weekendbakesblog.wordpress.com",
+                "subject": [{
+                    "text": "October 5: Your best day for likes on Weekend Bakes",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [38, 51],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "body": [{
+                    "text": "5 Likes",
+                    "media": [{
+                        "type": "badge",
+                        "indices": [0, 7],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/bestday-likes-2x.png"
+                    }]
+                }, {
+                    "text": "On Monday October 5, 2020, you surpassed your previous record of most likes in one day for your posts on Weekend Bakes. That's pretty awesome, well done!",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [105, 118],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }, {
+                    "text": "Most Likes in One Day"
+                }, {
+                    "text": "Current Record: 5",
+                    "ranges": [{
+                        "type": "b",
+                        "indices": [16, 17]
+                    }]
+                }, {
+                    "text": "Old Record: 4",
+                    "ranges": [{
+                        "type": "b",
+                        "indices": [12, 13]
+                    }]
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "title": "5 Likes",
+                "note_hash": 3233821948
+            }, {
+                "id": 4880577651,
+                "type": "post_milestone_achievement",
+                "read": 1,
+                "noticon": "\uf806",
+                "timestamp": "{{now offset='-2 days'}}",
+                "icon": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/post-milestone-1-2x.png",
+                "url": "http:\/\/wordpress.com\/trophy-case\/",
+                "subject": [{
+                    "text": "You've made your first post on Weekend Bakes.",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [31, 44],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "body": [{
+                    "text": "First Post",
+                    "media": [{
+                        "type": "badge",
+                        "indices": [0, 10],
+                        "height": "256",
+                        "width": "256",
+                        "url": "https:\/\/s.wp.com\/wp-content\/mu-plugins\/achievements\/post-milestone-1-2x.png"
+                    }]
+                }, {
+                    "text": "Congratulations on writing your first post on Weekend Bakes!",
+                    "ranges": [{
+                        "type": "site",
+                        "indices": [46, 59],
+                        "url": "http:\/\/weekendbakesblog.wordpress.com",
+                        "id": 181977606
+                    }]
+                }],
+                "meta": {
+                    "ids": {
+                        "site": 181977606
+                    },
+                    "links": {
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1\/sites\/181977606"
+                    }
+                },
+                "title": "First Post",
+                "note_hash": 2994072417
+            }]
         },
         "headers": {
             "Content-Type": "application/json",
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications_note_hashes.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications_note_hashes.json
index 978b44885530..1a347fc03d83 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications_note_hashes.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/notifications/rest_v11_notifications_note_hashes.json
@@ -11,50 +11,33 @@
     "response": {
         "status": 200,
         "jsonBody": {
-            "last_seen_time": "1553125740",
-            "number": 10,
-            "notes": [
-                {
-                    "id": 3864303999,
-                    "note_hash": 3043037365
-                },
-                {
-                    "id": 1304254364,
-                    "note_hash": 1137486184
-                },
-                {
-                    "id": 3658516170,
-                    "note_hash": 3899811297
-                },
-                {
-                    "id": 3658516156,
-                    "note_hash": 2262707516
-                },
-                {
-                    "id": 3467659357,
-                    "note_hash": 3085655305
-                },
-                {
-                    "id": 3528647758,
-                    "note_hash": 520929093
-                },
-                {
-                    "id": 3473753915,
-                    "note_hash": 1538257386
-                },
-                {
-                    "id": 3467659628,
-                    "note_hash": 1707514061
-                },
-                {
-                    "id": 2584083750,
-                    "note_hash": 2021782991
-                },
-                {
-                    "id": 1305979273,
-                    "note_hash": 2021782123
-                }
-            ]
+            "last_seen_time": "1598052184",
+            "number": 9,
+            "notes": [{
+                "id": 4937370391,
+                "note_hash": 1528602550
+            }, {
+                "id": 4937363649,
+                "note_hash": 1391922081
+            }, {
+                "id": 4937363362,
+                "note_hash": 1287359074
+            }, {
+                "id": 4937360549,
+                "note_hash": 638476488
+            }, {
+                "id": 4937354640,
+                "note_hash": 492599271
+            }, {
+                "id": 4937350334,
+                "note_hash": 3590885648
+            }, {
+                "id": 4937367020,
+                "note_hash": 3233821948
+            }, {
+                "id": 4880577651,
+                "note_hash": 2994072417
+            }]
         },
         "headers": {
             "Content-Type": "application/json",
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/plans/rest_v13_sites_158396482_plans.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/plans/rest_v13_sites_158396482_plans.json
index 2f03ed5b3c90..8b0023efea3e 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/plans/rest_v13_sites_158396482_plans.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/plans/rest_v13_sites_158396482_plans.json
@@ -1,7 +1,12 @@
 {
     "request": {
-        "urlPath": "/rest/v1.3/sites/106707880/plans",
-        "method": "GET"
+        "urlPath": "/rest/v1.3/sites/106707880/plans/",
+        "method": "GET",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
     },
     "response": {
         "status": 200,
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_213_diffs.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_213_diffs.json
deleted file mode 100644
index b7ff9ce207d9..000000000000
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_213_diffs.json
+++ /dev/null
@@ -1,1916 +0,0 @@
-{
-    "request": {
-        "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/post/213/diffs/",
-        "queryParameters": {
-            "locale": {
-                "matches": "(.*)"
-            }
-        }
-    },
-    "response": {
-        "status": 200,
-        "jsonBody": {
-            "diffs": [
-                {
-                    "from": 400,
-                    "to": 401,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 2,
-                            "add": 3
-                        }
-                    }
-                },
-                {
-                    "from": 309,
-                    "to": 400,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 3,
-                            "add": 2
-                        }
-                    }
-                },
-                {
-                    "from": 303,
-                    "to": 309,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "add": 50
-                        }
-                    }
-                },
-                {
-                    "from": 300,
-                    "to": 303,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 26
-                        }
-                    }
-                },
-                {
-                    "from": 299,
-                    "to": 300,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!"
-                            },
-                            {
-                                "op": "del",
-                                "value": " ..."
-                            },
-                            {
-                                "op": "copy",
-                                "value": "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 0
-                        }
-                    }
-                },
-                {
-                    "from": 298,
-                    "to": 299,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots! ...</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 2,
-                            "add": 3
-                        }
-                    }
-                },
-                {
-                    "from": 297,
-                    "to": 298,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots! ...</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 3,
-                            "add": 2
-                        }
-                    }
-                },
-                {
-                    "from": 296,
-                    "to": 297,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!"
-                            },
-                            {
-                                "op": "add",
-                                "value": " ..."
-                            },
-                            {
-                                "op": "copy",
-                                "value": "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->\n"
-                            }
-                        ],
-                        "totals": {
-                            "add": 0
-                        }
-                    }
-                },
-                {
-                    "from": 292,
-                    "to": 296,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {&quot;id&quot;:209} -->"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\t \t "
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n<figure class=&quot;wp-block-image&quot;><img src=&quot;https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024&quot; alt=&quot;&quot; class=&quot;wp-image-209&quot; /></figure>"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\t \t "
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n<!-- /wp:image -->\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 0
-                        }
-                    }
-                },
-                {
-                    "from": 291,
-                    "to": 292,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 2,
-                            "add": 3
-                        }
-                    }
-                },
-                {
-                    "from": 289,
-                    "to": 291,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 3,
-                            "add": 2
-                        }
-                    }
-                },
-                {
-                    "from": 288,
-                    "to": 289,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 2,
-                            "add": 3
-                        }
-                    }
-                },
-                {
-                    "from": 287,
-                    "to": 288,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 3,
-                            "add": 2
-                        }
-                    }
-                },
-                {
-                    "from": 286,
-                    "to": 287,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 2,
-                            "add": 3
-                        }
-                    }
-                },
-                {
-                    "from": 285,
-                    "to": 286,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 3,
-                            "add": 2
-                        }
-                    }
-                },
-                {
-                    "from": 284,
-                    "to": 285,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>"
-                            },
-                            {
-                                "op": "del",
-                                "value": "Blue"
-                            },
-                            {
-                                "op": "add",
-                                "value": "This"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "skies"
-                            },
-                            {
-                                "op": "add",
-                                "value": "event"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "and"
-                            },
-                            {
-                                "op": "add",
-                                "value": "was"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "warm"
-                            },
-                            {
-                                "op": "add",
-                                "value": "so"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "weather"
-                            },
-                            {
-                                "op": "add",
-                                "value": "much fun"
-                            },
-                            {
-                                "op": "copy",
-                                "value": ", "
-                            },
-                            {
-                                "op": "del",
-                                "value": "what's"
-                            },
-                            {
-                                "op": "add",
-                                "value": "I"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "not"
-                            },
-                            {
-                                "op": "add",
-                                "value": "couldn’t wait"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " to "
-                            },
-                            {
-                                "op": "del",
-                                "value": "love"
-                            },
-                            {
-                                "op": "add",
-                                "value": "share a few of my"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "about"
-                            },
-                            {
-                                "op": "add",
-                                "value": "favorite"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "summer?"
-                            },
-                            {
-                                "op": "add",
-                                "value": "shots!"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:"
-                            },
-                            {
-                                "op": "del",
-                                "value": "paragraph -->\n<p>It's"
-                            },
-                            {
-                                "op": "add",
-                                "value": "image"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "a great season for outdoor family portrait sessions and now is the time to book them!"
-                            },
-                            {
-                                "op": "del",
-                                "value": "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>We offer a number of <a href="
-                            },
-                            {
-                                "op": "add",
-                                "value": "{"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": "https://infocusphotographers.com/services/"
-                            },
-                            {
-                                "op": "add",
-                                "value": "id"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": ">family portrait packages</a>"
-                            },
-                            {
-                                "op": "add",
-                                "value": ":209}"
-                            },
-                            {
-                                "op": "del",
-                                "value": " and for a limited time are offering 15% off packages booked before May 1.</p>\n<!-- /wp:paragraph"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " -->"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\n\n<!--"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\t"
-                            },
-                            {
-                                "op": "del",
-                                "value": " wp:image"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "{&quot;id&quot;:193}"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\t"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "-->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n<figure class=&quot;wp-block-image&quot;><img src=&quot;https://infocusphotographers.files.wordpress.com/2019/02/"
-                            },
-                            {
-                                "op": "del",
-                                "value": "beach"
-                            },
-                            {
-                                "op": "add",
-                                "value": "concert"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "clouds"
-                            },
-                            {
-                                "op": "add",
-                                "value": "effect"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "daytime"
-                            },
-                            {
-                                "op": "add",
-                                "value": "entertainment"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "994605"
-                            },
-                            {
-                                "op": "add",
-                                "value": "1150837"
-                            },
-                            {
-                                "op": "copy",
-                                "value": ".jpg"
-                            },
-                            {
-                                "op": "add",
-                                "value": "?w=1024"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; alt=&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": "beach-clouds-daytime-994605"
-                            },
-                            {
-                                "op": "add",
-                                "value": ""
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; class=&quot;wp-image-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "193"
-                            },
-                            {
-                                "op": "add",
-                                "value": "209"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; /></figure>"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\t \t "
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n<!-- /wp:image -->\n"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\n<!-- wp:paragraph -->\n<p><strong>How to book</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><a href=\"mailto:hello@infocusphotographers.com\">Email us</a> to set up a time to visit our studio.</p>\n<!-- /wp:paragraph -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 127,
-                            "add": 26
-                        }
-                    }
-                },
-                {
-                    "from": 283,
-                    "to": 284,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>"
-                            },
-                            {
-                                "op": "del",
-                                "value": "This"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Blue"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "event"
-                            },
-                            {
-                                "op": "add",
-                                "value": "skies"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "was"
-                            },
-                            {
-                                "op": "add",
-                                "value": "and"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "so"
-                            },
-                            {
-                                "op": "add",
-                                "value": "warm"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "much fun"
-                            },
-                            {
-                                "op": "add",
-                                "value": "weather"
-                            },
-                            {
-                                "op": "copy",
-                                "value": ", "
-                            },
-                            {
-                                "op": "del",
-                                "value": "I"
-                            },
-                            {
-                                "op": "add",
-                                "value": "what's"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "couldn’t wait"
-                            },
-                            {
-                                "op": "add",
-                                "value": "not"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " to "
-                            },
-                            {
-                                "op": "del",
-                                "value": "share a few of my"
-                            },
-                            {
-                                "op": "add",
-                                "value": "love"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "favorite"
-                            },
-                            {
-                                "op": "add",
-                                "value": "about"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "shots!"
-                            },
-                            {
-                                "op": "add",
-                                "value": "summer?"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:"
-                            },
-                            {
-                                "op": "del",
-                                "value": "image"
-                            },
-                            {
-                                "op": "add",
-                                "value": "paragraph -->\n<p>It's"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "add",
-                                "value": "a great season for outdoor family portrait sessions and now is the time to book them!"
-                            },
-                            {
-                                "op": "del",
-                                "value": "{"
-                            },
-                            {
-                                "op": "add",
-                                "value": "</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>We offer a number of <a href="
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": "id"
-                            },
-                            {
-                                "op": "add",
-                                "value": "https://infocusphotographers.com/services/"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": ":209}"
-                            },
-                            {
-                                "op": "add",
-                                "value": ">family portrait packages</a>"
-                            },
-                            {
-                                "op": "add",
-                                "value": " and for a limited time are offering 15% off packages booked before May 1.</p>\n<!-- /wp:paragraph"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " -->"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\t"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\n\n<!--"
-                            },
-                            {
-                                "op": "add",
-                                "value": " wp:image"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "\t"
-                            },
-                            {
-                                "op": "add",
-                                "value": "{&quot;id&quot;:193}"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "add",
-                                "value": "-->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n<figure class=&quot;wp-block-image&quot;><img src=&quot;https://infocusphotographers.files.wordpress.com/2019/02/"
-                            },
-                            {
-                                "op": "del",
-                                "value": "concert"
-                            },
-                            {
-                                "op": "add",
-                                "value": "beach"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "effect"
-                            },
-                            {
-                                "op": "add",
-                                "value": "clouds"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "entertainment"
-                            },
-                            {
-                                "op": "add",
-                                "value": "daytime"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "1150837"
-                            },
-                            {
-                                "op": "add",
-                                "value": "994605"
-                            },
-                            {
-                                "op": "copy",
-                                "value": ".jpg"
-                            },
-                            {
-                                "op": "del",
-                                "value": "?w=1024"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; alt=&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": ""
-                            },
-                            {
-                                "op": "add",
-                                "value": "beach-clouds-daytime-994605"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; class=&quot;wp-image-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "209"
-                            },
-                            {
-                                "op": "add",
-                                "value": "193"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; /></figure>"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\t \t "
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n<!-- /wp:image -->\n"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\n<!-- wp:paragraph -->\n<p><strong>How to book</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><a href=\"mailto:hello@infocusphotographers.com\">Email us</a> to set up a time to visit our studio.</p>\n<!-- /wp:paragraph -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 26,
-                            "add": 127
-                        }
-                    }
-                },
-                {
-                    "from": 280,
-                    "to": 283,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\n<!-- wp:image {\"id\":209} -->\t \t \n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \n<!-- /wp:image -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "add": 26
-                        }
-                    }
-                },
-                {
-                    "from": 277,
-                    "to": 280,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "add",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 2,
-                            "add": 3
-                        }
-                    }
-                },
-                {
-                    "from": 273,
-                    "to": 277,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": "Summer"
-                            },
-                            {
-                                "op": "add",
-                                "value": "(no"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "Band Jam"
-                            },
-                            {
-                                "op": "add",
-                                "value": "title)"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->"
-                            }
-                        ],
-                        "totals": {
-                            "del": 3,
-                            "add": 2
-                        }
-                    }
-                },
-                {
-                    "from": 267,
-                    "to": 273,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n"
-                            },
-                            {
-                                "op": "del",
-                                "value": "\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 26
-                        }
-                    }
-                },
-                {
-                    "from": 240,
-                    "to": 267,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "add",
-                                "value": "<!-- wp:paragraph -->\n<p>"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "This event was so much fun, I couldn’t wait to share a few of my favorite shots!"
-                            },
-                            {
-                                "op": "add",
-                                "value": "</p>\n<!-- /wp:paragraph -->"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n\n<"
-                            },
-                            {
-                                "op": "del",
-                                "value": "img"
-                            },
-                            {
-                                "op": "add",
-                                "value": "!-- wp:image"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "class="
-                            },
-                            {
-                                "op": "add",
-                                "value": "{"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": "alignnone"
-                            },
-                            {
-                                "op": "add",
-                                "value": "id&quot;:209}"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "del",
-                                "value": "size"
-                            },
-                            {
-                                "op": "add",
-                                "value": ""
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "full"
-                            },
-                            {
-                                "op": "add",
-                                "value": "->\n<figure"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " "
-                            },
-                            {
-                                "op": "add",
-                                "value": "class=&quot;"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "wp-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "image"
-                            },
-                            {
-                                "op": "add",
-                                "value": "block"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "-"
-                            },
-                            {
-                                "op": "del",
-                                "value": "209"
-                            },
-                            {
-                                "op": "add",
-                                "value": "image"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot;"
-                            },
-                            {
-                                "op": "add",
-                                "value": "><img"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " src=&quot;https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg"
-                            },
-                            {
-                                "op": "add",
-                                "value": "?w=1024"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; alt=&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": "concert-effect-entertainment-1150837"
-                            },
-                            {
-                                "op": "add",
-                                "value": ""
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; "
-                            },
-                            {
-                                "op": "del",
-                                "value": "width"
-                            },
-                            {
-                                "op": "add",
-                                "value": "class"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "=&quot;"
-                            },
-                            {
-                                "op": "del",
-                                "value": "6000"
-                            },
-                            {
-                                "op": "add",
-                                "value": "wp-image-209"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "&quot; "
-                            },
-                            {
-                                "op": "del",
-                                "value": "height="
-                            },
-                            {
-                                "op": "del",
-                                "value": "&quot;4000&quot;"
-                            },
-                            {
-                                "op": "add",
-                                "value": "/></figure>\n<!--"
-                            },
-                            {
-                                "op": "copy",
-                                "value": " /"
-                            },
-                            {
-                                "op": "add",
-                                "value": "wp:image --"
-                            },
-                            {
-                                "op": "copy",
-                                "value": ">\n"
-                            }
-                        ],
-                        "totals": {
-                            "add": 29,
-                            "del": 11
-                        }
-                    }
-                },
-                {
-                    "from": 214,
-                    "to": 240,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "copy",
-                                "value": "Summer Band Jam"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "copy",
-                                "value": "This event was so much fun, I couldn’t wait to share a few of my favorite shots!\n"
-                            },
-                            {
-                                "op": "add",
-                                "value": "\n<img class=\"alignnone size-full wp-image-209\" src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg\" alt=\"concert-effect-entertainment-1150837\" width=\"6000\" height=\"4000\" />"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "add": 17
-                        }
-                    }
-                },
-                {
-                    "from": 0,
-                    "to": 214,
-                    "diff": {
-                        "post_title": [
-                            {
-                                "op": "del",
-                                "value": ""
-                            },
-                            {
-                                "op": "add",
-                                "value": "Summer Band Jam"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "post_content": [
-                            {
-                                "op": "add",
-                                "value": "This event was so much fun, I couldn’t wait to share a few of my favorite shots!"
-                            },
-                            {
-                                "op": "copy",
-                                "value": "\n"
-                            }
-                        ],
-                        "totals": {
-                            "del": 0,
-                            "add": 21
-                        }
-                    }
-                }
-            ],
-            "revisions": {
-                "401": {
-                    "post_date_gmt": "2019-07-16 02:39:45Z",
-                    "post_modified_gmt": "2019-07-16 02:39:45Z",
-                    "post_author": "68646169",
-                    "id": 401,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "400": {
-                    "post_date_gmt": "2019-06-28 21:04:40Z",
-                    "post_modified_gmt": "2019-06-28 21:04:40Z",
-                    "post_author": "68646169",
-                    "id": 400,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "309": {
-                    "post_date_gmt": "2019-05-27 21:36:25Z",
-                    "post_modified_gmt": "2019-05-27 21:36:25Z",
-                    "post_author": "742098",
-                    "id": 309,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "303": {
-                    "post_date_gmt": "2019-05-27 19:26:17Z",
-                    "post_modified_gmt": "2019-05-27 19:26:17Z",
-                    "post_author": "742098",
-                    "id": 303,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "300": {
-                    "post_date_gmt": "2019-04-17 10:45:45Z",
-                    "post_modified_gmt": "2019-04-17 10:45:45Z",
-                    "post_author": "67626417",
-                    "id": 300,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "299": {
-                    "post_date_gmt": "2019-04-17 10:45:25Z",
-                    "post_modified_gmt": "2019-04-17 10:45:25Z",
-                    "post_author": "67626417",
-                    "id": 299,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots! ...</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "298": {
-                    "post_date_gmt": "2019-04-17 10:44:49Z",
-                    "post_modified_gmt": "2019-04-17 10:44:49Z",
-                    "post_author": "68646169",
-                    "id": 298,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots! ...</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "297": {
-                    "post_date_gmt": "2019-04-17 10:44:12Z",
-                    "post_modified_gmt": "2019-04-17 10:44:12Z",
-                    "post_author": "67626417",
-                    "id": 297,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots! ...</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "296": {
-                    "post_date_gmt": "2019-04-17 10:42:14Z",
-                    "post_modified_gmt": "2019-04-17 10:42:14Z",
-                    "post_author": "67626417",
-                    "id": 296,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "292": {
-                    "post_date_gmt": "2019-04-17 10:39:09Z",
-                    "post_modified_gmt": "2019-04-17 10:39:09Z",
-                    "post_author": "67626417",
-                    "id": 292,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "291": {
-                    "post_date_gmt": "2019-04-17 10:36:25Z",
-                    "post_modified_gmt": "2019-04-17 10:36:25Z",
-                    "post_author": "68646169",
-                    "id": 291,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "289": {
-                    "post_date_gmt": "2019-04-17 10:29:16Z",
-                    "post_modified_gmt": "2019-04-17 10:29:16Z",
-                    "post_author": "67626417",
-                    "id": 289,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "288": {
-                    "post_date_gmt": "2019-04-17 10:28:37Z",
-                    "post_modified_gmt": "2019-04-17 10:28:37Z",
-                    "post_author": "68646169",
-                    "id": 288,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "287": {
-                    "post_date_gmt": "2019-04-17 10:27:45Z",
-                    "post_modified_gmt": "2019-04-17 10:27:45Z",
-                    "post_author": "67626417",
-                    "id": 287,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "286": {
-                    "post_date_gmt": "2019-04-17 10:27:13Z",
-                    "post_modified_gmt": "2019-04-17 10:27:13Z",
-                    "post_author": "68646169",
-                    "id": 286,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "285": {
-                    "post_date_gmt": "2019-04-17 09:35:57Z",
-                    "post_modified_gmt": "2019-04-17 09:35:57Z",
-                    "post_author": "67626417",
-                    "id": 285,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "284": {
-                    "post_date_gmt": "2019-04-17 09:32:58Z",
-                    "post_modified_gmt": "2019-04-17 09:32:58Z",
-                    "post_author": "68646169",
-                    "id": 284,
-                    "post_content": "<!-- wp:paragraph -->\n<p>Blue skies and warm weather, what's not to love about summer?</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>It's a great season for outdoor family portrait sessions and now is the time to book them!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>We offer a number of <a href=\"https://infocusphotographers.com/services/\">family portrait packages</a> and for a limited time are offering 15% off packages booked before May 1.</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":193} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/beach-clouds-daytime-994605.jpg\" alt=\"beach-clouds-daytime-994605\" class=\"wp-image-193\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:paragraph -->\n<p><strong>How to book</strong></p>\n<!-- /wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><a href=\"mailto:hello@infocusphotographers.com\">Email us</a> to set up a time to visit our studio.</p>\n<!-- /wp:paragraph -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "283": {
-                    "post_date_gmt": "2019-04-17 09:32:34Z",
-                    "post_modified_gmt": "2019-04-17 09:32:34Z",
-                    "post_author": "67626417",
-                    "id": 283,
-                    "post_content": "<!-- wp:paragraph -->\r\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\r\n<!-- /wp:paragraph -->\r\n\r\n<!-- wp:image {\"id\":209} -->\t \t \r\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\t \t \r\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "280": {
-                    "post_date_gmt": "2019-04-17 09:23:35Z",
-                    "post_modified_gmt": "2019-04-17 09:23:35Z",
-                    "post_author": "67626417",
-                    "id": 280,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "277": {
-                    "post_date_gmt": "2019-04-16 14:21:22Z",
-                    "post_modified_gmt": "2019-04-16 14:21:22Z",
-                    "post_author": "68646169",
-                    "id": 277,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->",
-                    "post_excerpt": "",
-                    "post_title": ""
-                },
-                "273": {
-                    "post_date_gmt": "2019-03-21 17:23:26Z",
-                    "post_modified_gmt": "2019-03-21 17:23:26Z",
-                    "post_author": "68646169",
-                    "id": 273,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "267": {
-                    "post_date_gmt": "2019-03-21 17:17:59Z",
-                    "post_modified_gmt": "2019-03-21 17:17:59Z",
-                    "post_author": "68646169",
-                    "id": 267,
-                    "post_content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":209} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg?w=1024\" alt=\"\" class=\"wp-image-209\" /></figure>\n<!-- /wp:image -->",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "240": {
-                    "post_date_gmt": "2019-03-20 23:45:49Z",
-                    "post_modified_gmt": "2019-03-20 23:45:49Z",
-                    "post_author": "14151046",
-                    "id": 240,
-                    "post_content": "This event was so much fun, I couldn’t wait to share a few of my favorite shots!\n\n<img class=\"alignnone size-full wp-image-209\" src=\"https://infocusphotographers.files.wordpress.com/2019/02/concert-effect-entertainment-1150837.jpg\" alt=\"concert-effect-entertainment-1150837\" width=\"6000\" height=\"4000\" />",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                },
-                "214": {
-                    "post_date_gmt": "2019-02-15 23:26:48Z",
-                    "post_modified_gmt": "2019-02-15 23:26:48Z",
-                    "post_author": "68646169",
-                    "id": 214,
-                    "post_content": "This event was so much fun, I couldn’t wait to share a few of my favorite shots!",
-                    "post_excerpt": "",
-                    "post_title": "Summer Band Jam"
-                }
-            }
-        }
-    }
-}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending-181851495.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending-181851495.json
new file mode 100644
index 000000000000..a1aee79ecda7
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending-181851495.json
@@ -0,0 +1,48 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/rest/v1.1/sites/181851495/posts/",
+        "queryParameters": {
+            "number": {
+                "equalTo": "60"
+            },
+            "context": {
+                "equalTo": "edit"
+            },
+            "order_by": {
+                "equalTo": "date"
+            },
+            "fields": {
+                "equalTo": "ID,modified,status,meta"
+            },
+            "order": {
+                "equalTo": "DESC"
+            },
+            "status": {
+                "equalTo": "draft,pending"
+            },
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "found": 7,
+            "posts": [
+                {
+                    "ID": 213,
+                    "modified": "2019-07-16T02:39:45+00:00",
+                    "status": "draft"
+                }
+            ],
+            "meta": {
+                "links": {
+                    "counts": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/106707880/post-counts/post"
+                },
+                "wpcom": true
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending_v2.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending_v2.json
index 1d2002b536e5..c55c0113a697 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending_v2.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-draft,pending_v2.json
@@ -44,25 +44,25 @@
                 "profile_URL": "https://en.gravatar.com/thenomadicwordsmith",
                 "site_ID": 71769073
             },
-            "date": "2019-07-16T02:39:44+00:00",
-            "modified": "2019-08-09T16:28:42+00:00",
-            "title": "Summer Band Jam",
-            "URL": "http://infocusphotographers.com/?p=213",
-            "short_URL": "https://wp.me/p7dJAQ-3r",
-            "content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn’t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->",
+            "date": "2020-08-24T12:17:14-07:00",
+            "modified": "2020-08-27T16:31:00-07:00",
+            "title": "Our Services",
+            "URL": "https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/",
+            "short_URL": "https:\/\/wp.me\/Pcj1SD-J",
+            "content": "<!-- wp:cover {\"url\":\"https:\\\/\\\/fourpawsdoggrooming.files.wordpress.com\\\/2020\\\/08\\\/alvan-nee-1vgfqdcux-4-unsplash.jpg\",\"id\":49,\"focalPoint\":{\"x\":\"0.45\",\"y\":\"0.60\"},\"minHeight\":260,\"minHeightUnit\":\"px\",\"align\":\"center\"} -->\n<div class=\"wp-block-cover aligncenter has-background-dim\" style=\"background-image:url('https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg');background-position:45% 60%;min-height:260px;\"><div class=\"wp-block-cover__inner-container\"><!-- wp:heading {\"align\":\"center\"} -->\n<h2 class=\"has-text-align-center\">Mobile grooming salon for cats and dogs.<\/h2>\n<!-- \/wp:heading -->\n\n<!-- wp:buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-buttons aligncenter\"><!-- wp:button {\"borderRadius\":50,\"backgroundColor\":\"background\",\"textColor\":\"foreground-dark\",\"className\":\"is-style-outline\"} -->\n<div class=\"wp-block-button is-style-outline\"><a class=\"wp-block-button__link has-foreground-dark-color has-background-background-color has-text-color has-background\" href=\"\" style=\"border-radius:50px;\" rel=\"\">Book Appointment<\/a><\/div>\n<!-- \/wp:button --><\/div>\n<!-- \/wp:buttons --><\/div><\/div>\n<!-- \/wp:cover -->\n\n<!-- wp:heading -->\n<h2><strong>Dog grooming<\/strong><\/h2>\n<!-- \/wp:heading -->\n\n<!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:paragraph -->\n<p><strong>Our deluxe grooming service includes:<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:list -->\n<ul><li>Nail clip<\/li><li>Ear cleaning<\/li><li>1st shampoo<\/li><li>2nd shampoo<\/li><li>Conditioning rinse<\/li><li>Towel dry<\/li><li>Blow dry<\/li><li>Brush out<\/li><li>And a treat!<\/li><\/ul>\n<!-- \/wp:list --><\/div>\n<!-- \/wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"id\":65,\"sizeSlug\":\"large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=731\" alt=\"\" class=\"wp-image-65\" \/><\/figure>\n<!-- \/wp:image --><\/div>\n<!-- \/wp:column --><\/div>\n<!-- \/wp:columns -->\n\n<!-- wp:paragraph -->\n<p><strong>Deluxe Cut and Groom<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Our deluxe cut and groom package includes everything in the deluxe groom plus a haircut.<\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>Add on services<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Pamper your pup even more with one of our signature add on services:<\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:list -->\n<ul><li>Aloe conditioning treatment<\/li><li>Soothing medicated shampoos<\/li><li>Tooth brushing<\/li><li>Creative styling with temporary color <\/li><li>Nail polish application<\/li><li>Coat braiding<\/li><li>Bows and other accessories <\/li><\/ul>\n<!-- \/wp:list -->\n\n<!-- wp:cover {\"url\":\"https:\\\/\\\/fourpawsdoggrooming.files.wordpress.com\\\/2020\\\/08\\\/boney-dhirbh9en6i-unsplash.jpg\",\"id\":47,\"focalPoint\":{\"x\":\"0.48\",\"y\":\"1.00\"},\"minHeight\":344,\"minHeightUnit\":\"px\"} -->\n<div class=\"wp-block-cover has-background-dim\" style=\"background-image:url('https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg');background-position:48% 100%;min-height:344px;\"><div class=\"wp-block-cover__inner-container\"><!-- wp:paragraph {\"align\":\"center\",\"placeholder\":\"Write title\\u2026\",\"fontSize\":\"large\"} -->\n<p class=\"has-text-align-center has-large-font-size\"><\/p>\n<!-- \/wp:paragraph --><\/div><\/div>\n<!-- \/wp:cover -->\n\n<!-- wp:paragraph -->\n<p><\/p>\n<!-- \/wp:paragraph -->",
             "excerpt": "",
-            "slug": "summer-band-jam",
-            "guid": "http://infocusphotographers.com/?p=213",
-            "status": "draft",
+            "slug": "our-services",
+            "guid": "https:\/\/fourpawsdoggrooming.wordpress.com\/?p=45",
+            "status": "publish",
             "sticky": false,
             "password": "",
             "parent": false,
             "type": "post",
             "discussion": {
-                "comments_open": true,
-                "comment_status": "open",
-                "pings_open": true,
-                "ping_status": "open",
+                "comments_open": false,
+                "comment_status": "closed",
+                "pings_open": false,
+                "ping_status": "closed",
                 "comment_count": 0
             },
             "likes_enabled": true,
@@ -72,15 +72,8 @@
             "is_reblogged": false,
             "is_following": false,
             "global_ID": "e41d1c97a7b93a594b07e4df51dfafb3",
-            "featured_image": "https://infocusphotographers.files.wordpress.com/2019/02/adult-band-concert-995301.jpg",
-            "post_thumbnail": {
-                "ID": 151,
-                "URL": "https://infocusphotographers.files.wordpress.com/2019/02/adult-band-concert-995301.jpg",
-                "guid": "http://infocusphotographers.files.wordpress.com/2019/02/adult-band-concert-995301.jpg",
-                "mime_type": "image/jpeg",
-                "width": 5184,
-                "height": 3456
-            },
+            "featured_image": "",
+            "post_thumbnail": null,
             "format": "standard",
             "geo": false,
             "menu_order": 0,
@@ -126,8 +119,180 @@
                     }
                 }
             },
-            "attachments": {},
-            "attachment_count": 0,
+            "attachments": {
+                "65": {
+                    "ID": 65,
+                    "URL": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg",
+                    "guid": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg",
+                    "date": "2020-08-27T16:30:36-07:00",
+                    "post_ID": 45,
+                    "author_ID": 191794483,
+                    "file": "image-1.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "image",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=107",
+                        "medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=214",
+                        "large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=731",
+                        "newspack-article-block-landscape-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=1200&h=900&crop=1",
+                        "newspack-article-block-portrait-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=900&h=1200&crop=1",
+                        "newspack-article-block-square-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=1200&h=1200&crop=1",
+                        "newspack-article-block-landscape-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=800&h=600&crop=1",
+                        "newspack-article-block-portrait-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=600&h=800&crop=1",
+                        "newspack-article-block-square-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=800&h=800&crop=1",
+                        "newspack-article-block-landscape-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=400&h=300&crop=1",
+                        "newspack-article-block-portrait-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=300&h=400&crop=1",
+                        "newspack-article-block-square-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=400&h=400&crop=1",
+                        "newspack-article-block-landscape-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=200&h=150&crop=1",
+                        "newspack-article-block-portrait-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=150&h=200&crop=1",
+                        "newspack-article-block-square-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=200&h=200&crop=1",
+                        "newspack-article-block-uncropped": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=1200"
+                    },
+                    "height": 1848,
+                    "width": 1320,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/65",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/65\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/45"
+                        }
+                    }
+                },
+                "63": {
+                    "ID": 63,
+                    "URL": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg",
+                    "guid": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg",
+                    "date": "2020-08-26T12:20:02-07:00",
+                    "post_ID": 45,
+                    "author_ID": 191794483,
+                    "file": "wp-1598469598971.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "wp-1598469598971.jpg",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=100",
+                        "medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200",
+                        "large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=682",
+                        "newspack-article-block-landscape-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=1200&h=900&crop=1",
+                        "newspack-article-block-portrait-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=900&h=1200&crop=1",
+                        "newspack-article-block-square-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=1200&h=1200&crop=1",
+                        "newspack-article-block-landscape-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=800&h=600&crop=1",
+                        "newspack-article-block-portrait-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=600&h=800&crop=1",
+                        "newspack-article-block-square-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=800&h=800&crop=1",
+                        "newspack-article-block-landscape-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=400&h=300&crop=1",
+                        "newspack-article-block-portrait-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=300&h=400&crop=1",
+                        "newspack-article-block-square-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=400&h=400&crop=1",
+                        "newspack-article-block-landscape-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200&h=150&crop=1",
+                        "newspack-article-block-portrait-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=150&h=200&crop=1",
+                        "newspack-article-block-square-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=200&h=200&crop=1",
+                        "newspack-article-block-uncropped": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/wp-1598469598971.jpg?w=1200"
+                    },
+                    "height": 2780,
+                    "width": 1851,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "0",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/63",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/63\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/45"
+                        }
+                    }
+                },
+                "61": {
+                    "ID": 61,
+                    "URL": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg",
+                    "guid": "http:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg",
+                    "date": "2020-08-25T12:05:54-07:00",
+                    "post_ID": 45,
+                    "author_ID": 191794483,
+                    "file": "image.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "image",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=150",
+                        "medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=300",
+                        "large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=1024",
+                        "newspack-article-block-landscape-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=1200&h=900&crop=1",
+                        "newspack-article-block-portrait-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=900&h=1200&crop=1",
+                        "newspack-article-block-square-large": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=1200&h=1200&crop=1",
+                        "newspack-article-block-landscape-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=800&h=600&crop=1",
+                        "newspack-article-block-portrait-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=600&h=800&crop=1",
+                        "newspack-article-block-square-medium": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=800&h=800&crop=1",
+                        "newspack-article-block-landscape-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=400&h=300&crop=1",
+                        "newspack-article-block-portrait-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=300&h=400&crop=1",
+                        "newspack-article-block-square-small": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=400&h=400&crop=1",
+                        "newspack-article-block-landscape-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=200&h=150&crop=1",
+                        "newspack-article-block-portrait-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=150&h=200&crop=1",
+                        "newspack-article-block-square-tiny": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=200&h=200&crop=1",
+                        "newspack-article-block-uncropped": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image.jpg?w=1200"
+                    },
+                    "height": 1848,
+                    "width": 1846,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/61",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/media\/61\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/45"
+                        }
+                    }
+                }
+            },
+            "attachment_count": 3,
             "metadata": [
                 {
                     "id": "502",
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-future.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-future.json
index e6d7e4faafd1..c754fd318973 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-future.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-future.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/posts/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/posts/",
         "queryParameters": {
             "number": {
                 "equalTo": "60"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-private,publish.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-private,publish.json
index 24e8a9825cb6..029385961d0c 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-private,publish.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts-private,publish.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/posts/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/posts/",
         "queryParameters": {
             "number": {
                 "equalTo": "60"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_106.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_106.json
index 958de94bb990..87cd3d111d5d 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_106.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_106.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/posts/106/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/posts/106/",
         "queryParameters": {
             "context": {
                 "equalTo": "edit"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_213.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_213.json
index c507fb436af6..24f84b423f25 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_213.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_213.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/posts/213/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/posts/213/",
         "queryParameters": {
             "context": {
                 "equalTo": "edit"
@@ -15,7 +15,7 @@
         "status": 200,
         "jsonBody": {
             "ID": 213,
-            "site_ID": 106707880,
+            "site_ID": 181851495,
             "author": {
                 "ID": 68646169,
                 "login": "thenomadicwordsmith",
@@ -31,10 +31,10 @@
             },
             "date": "2019-07-16T02:39:44+00:00",
             "modified": "2019-07-16T02:39:45+00:00",
-            "title": "Summer Band Jam",
+            "title": "Our Services",
             "URL": "http://infocusphotographers.com/?p=213",
             "short_URL": "https://wp.me/p7dJAQ-3r",
-            "content": "<!-- wp:paragraph -->\n<p>This event was so much fun, I couldn&#x2019;t wait to share a few of my favorite shots!</p>\n<!-- /wp:paragraph -->\n\n<!-- wp:image {\"id\":307} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-top-image-tablet-1.png\" alt=\"\" class=\"wp-image-307\" /></figure>\n<!-- /wp:image -->\n\n<!-- wp:image {\"id\":308} -->\n<figure class=\"wp-block-image\"><img src=\"https://infocusphotographers.files.wordpress.com/2019/05/02-bottom-image-tablet-1.png\" alt=\"\" class=\"wp-image-308\" /></figure>\n<!-- /wp:image -->",
+            "content": "<!-- wp:cover {\"url\":\"https:\\\/\\\/fourpawsdoggrooming.files.wordpress.com\\\/2020\\\/08\\\/alvan-nee-1vgfqdcux-4-unsplash.jpg\",\"id\":49,\"focalPoint\":{\"x\":\"0.45\",\"y\":\"0.60\"},\"minHeight\":260,\"minHeightUnit\":\"px\",\"align\":\"center\"} -->\n<div class=\"wp-block-cover aligncenter has-background-dim\" style=\"background-image:url('https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg');background-position:45% 60%;min-height:260px;\"><div class=\"wp-block-cover__inner-container\"><!-- wp:heading {\"align\":\"center\"} -->\n<h2 class=\"has-text-align-center\">Mobile grooming salon for cats and dogs.<\/h2>\n<!-- \/wp:heading -->\n\n<!-- wp:buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-buttons aligncenter\"><!-- wp:button {\"borderRadius\":50,\"backgroundColor\":\"background\",\"textColor\":\"foreground-dark\",\"className\":\"is-style-outline\"} -->\n<div class=\"wp-block-button is-style-outline\"><a class=\"wp-block-button__link has-foreground-dark-color has-background-background-color has-text-color has-background\" href=\"\" style=\"border-radius:50px;\" rel=\"\">Book Appointment<\/a><\/div>\n<!-- \/wp:button --><\/div>\n<!-- \/wp:buttons --><\/div><\/div>\n<!-- \/wp:cover -->\n\n<!-- wp:heading -->\n<h2><strong>Dog grooming<\/strong><\/h2>\n<!-- \/wp:heading -->\n\n<!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:paragraph -->\n<p><strong>Our deluxe grooming service includes:<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:list -->\n<ul><li>Nail clip<\/li><li>Ear cleaning<\/li><li>1st shampoo<\/li><li>2nd shampoo<\/li><li>Conditioning rinse<\/li><li>Towel dry<\/li><li>Blow dry<\/li><li>Brush out<\/li><li>And a treat!<\/li><\/ul>\n<!-- \/wp:list --><\/div>\n<!-- \/wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"id\":65,\"sizeSlug\":\"large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=731\" alt=\"\" class=\"wp-image-65\" \/><\/figure>\n<!-- \/wp:image --><\/div>\n<!-- \/wp:column --><\/div>\n<!-- \/wp:columns -->\n\n<!-- wp:paragraph -->\n<p><strong>Deluxe Cut and Groom<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Our deluxe cut and groom package includes everything in the deluxe groom plus a haircut.<\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>Add on services<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Pamper your pup even more with one of our signature add on services:<\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:list -->\n<ul><li>Aloe conditioning treatment<\/li><li>Soothing medicated shampoos<\/li><li>Tooth brushing<\/li><li>Creative styling with temporary color <\/li><li>Nail polish application<\/li><li>Coat braiding<\/li><li>Bows and other accessories <\/li><\/ul>\n<!-- \/wp:list -->\n\n<!-- wp:cover {\"url\":\"https:\\\/\\\/fourpawsdoggrooming.files.wordpress.com\\\/2020\\\/08\\\/boney-dhirbh9en6i-unsplash.jpg\",\"id\":47,\"focalPoint\":{\"x\":\"0.48\",\"y\":\"1.00\"},\"minHeight\":344,\"minHeightUnit\":\"px\"} -->\n<div class=\"wp-block-cover has-background-dim\" style=\"background-image:url('https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg');background-position:48% 100%;min-height:344px;\"><div class=\"wp-block-cover__inner-container\"><!-- wp:paragraph {\"align\":\"center\",\"placeholder\":\"Write title\\u2026\",\"fontSize\":\"large\"} -->\n<p class=\"has-text-align-center has-large-font-size\"><\/p>\n<!-- \/wp:paragraph --><\/div><\/div>\n<!-- \/wp:cover -->\n\n<!-- wp:paragraph -->\n<p><\/p>\n<!-- \/wp:paragraph -->",
             "excerpt": "",
             "slug": "summer-band-jam",
             "guid": "http://infocusphotographers.com/?p=213",
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_237.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_237.json
index fa9773ff543a..bd2f1c921181 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_237.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_237.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/posts/237/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/posts/237/",
         "queryParameters": {
             "context": {
                 "equalTo": "edit"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_90.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_90.json
index 63025d29ad49..a10bd96137c2 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_90.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/posts_90.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/posts/90/",
+        "urlPathPattern": "/rest/v1.1/sites/([0-9]+)/posts/90/",
         "queryParameters": {
             "context": {
                 "equalTo": "edit"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_v12_sites_181851495_posts-draft,pending.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_v12_sites_181851495_posts-draft,pending.json
new file mode 100644
index 000000000000..26046d286cb3
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/rest_v12_sites_181851495_posts-draft,pending.json
@@ -0,0 +1,152 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/rest/v1.2/sites/181851495/posts",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            },
+            "context": {
+                "equalTo": "edit"
+            },
+            "meta": {
+                "equalTo": "autosave"
+            },
+            "number": {
+                "equalTo": "40"
+            },
+            "status": {
+                "equalTo": "draft,pending"
+            },
+            "type": {
+                "equalTo": "post"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "found": 1,
+            "posts": [{
+                "ID": 67,
+                "site_ID": 181851495,
+                "author": {
+                    "ID": 152748359,
+                    "login": "appstorescreens",
+                    "email": "main.ee0zglcj@mailosaur.io",
+                    "name": "appstorescreens",
+                    "first_name": "",
+                    "last_name": "",
+                    "nice_name": "appstorescreens",
+                    "URL": "http:\/\/tricountyrealestate.wordpress.com",
+                    "avatar_URL": "https:\/\/0.gravatar.com\/avatar\/35029b2103460109f574c38dfeea5f3f?s=96&d=identicon&r=G",
+                    "profile_URL": "https:\/\/en.gravatar.com\/appstorescreens",
+                    "site_ID": 181851541
+                },
+                "date": "2020-10-05T05:10:17-07:00",
+                "modified": "2020-10-05T05:12:29-07:00",
+                "title": "Our Services",
+                "URL": "https:\/\/fourpawsdoggrooming.wordpress.com\/our-services\/",
+                "short_URL": "https:\/\/wp.me\/pcj1SD-15",
+                "content": "<!-- wp:cover {\"url\":\"https:\\\/\\\/fourpawsdoggrooming.files.wordpress.com\\\/2020\\\/08\\\/alvan-nee-1vgfqdcux-4-unsplash.jpg\",\"id\":49,\"focalPoint\":{\"x\":\"0.45\",\"y\":\"0.60\"},\"minHeight\":260,\"minHeightUnit\":\"px\",\"align\":\"center\"} -->\n<div class=\"wp-block-cover aligncenter has-background-dim\" style=\"background-image:url('https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/alvan-nee-1vgfqdcux-4-unsplash.jpg');min-height:260px;background-position:45% 60%;\"><div class=\"wp-block-cover__inner-container\"><!-- wp:heading {\"align\":\"center\"} -->\n<h2 class=\"has-text-align-center\">Mobile grooming salon for cats and dogs.<\/h2>\n<!-- \/wp:heading -->\n\n<!-- wp:buttons {\"align\":\"center\"} -->\n<div class=\"wp-block-buttons aligncenter\"><!-- wp:button {\"borderRadius\":50,\"backgroundColor\":\"background\",\"textColor\":\"foreground-dark\",\"className\":\"is-style-outline\"} -->\n<div class=\"wp-block-button is-style-outline\"><a class=\"wp-block-button__link has-foreground-dark-color has-background-background-color has-text-color has-background\" href=\"\" style=\"border-radius:50px;\" rel=\"\">Book Appointment<\/a><\/div>\n<!-- \/wp:button --><\/div>\n<!-- \/wp:buttons --><\/div><\/div>\n<!-- \/wp:cover -->\n\n<!-- wp:heading -->\n<h2><strong>Dog grooming<\/strong><\/h2>\n<!-- \/wp:heading -->\n\n<!-- wp:columns -->\n<div class=\"wp-block-columns\"><!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:paragraph -->\n<p><strong>Our deluxe grooming service includes:<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:list -->\n<ul><li>Nail clip<\/li><li>Ear cleaning<\/li><li>1st shampoo<\/li><li>2nd shampoo<\/li><li>Conditioning rinse<\/li><li>Towel dry<\/li><li>Blow dry<\/li><li>Brush out<\/li><li>And a treat!<\/li><\/ul>\n<!-- \/wp:list --><\/div>\n<!-- \/wp:column -->\n\n<!-- wp:column -->\n<div class=\"wp-block-column\"><!-- wp:image {\"id\":65,\"sizeSlug\":\"large\"} -->\n<figure class=\"wp-block-image size-large\"><img src=\"https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/image-1.jpg?w=731\" alt=\"\" class=\"wp-image-65\" \/><\/figure>\n<!-- \/wp:image --><\/div>\n<!-- \/wp:column --><\/div>\n<!-- \/wp:columns -->\n\n<!-- wp:paragraph -->\n<p><strong>Deluxe Cut and Groom<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Our deluxe cut and groom package includes everything in the deluxe groom plus a haircut.<\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p><strong>Add on services<\/strong><\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:paragraph -->\n<p>Pamper your pup even more with one of our signature add on services:<\/p>\n<!-- \/wp:paragraph -->\n\n<!-- wp:list -->\n<ul><li>Aloe conditioning treatment<\/li><li>Soothing medicated shampoos<\/li><li>Tooth brushing<\/li><li>Creative styling with temporary color <\/li><li>Nail polish application<\/li><li>Coat braiding<\/li><li>Bows and other accessories <\/li><\/ul>\n<!-- \/wp:list -->\n\n<!-- wp:cover {\"url\":\"https:\\\/\\\/fourpawsdoggrooming.files.wordpress.com\\\/2020\\\/08\\\/boney-dhirbh9en6i-unsplash.jpg\",\"id\":47,\"focalPoint\":{\"x\":\"0.48\",\"y\":\"1.00\"},\"minHeight\":344,\"minHeightUnit\":\"px\"} -->\n<div class=\"wp-block-cover has-background-dim\" style=\"background-image:url('https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/boney-dhirbh9en6i-unsplash.jpg');min-height:344px;background-position:48% 100%;\"><div class=\"wp-block-cover__inner-container\"><!-- wp:paragraph {\"align\":\"center\",\"placeholder\":\"Write title\\u2026\",\"fontSize\":\"large\"} -->\n<p class=\"has-text-align-center has-large-font-size\"><\/p>\n<!-- \/wp:paragraph --><\/div><\/div>\n<!-- \/wp:cover -->\n\n<!-- wp:paragraph -->\n<p><\/p>\n<!-- \/wp:paragraph -->",
+                "excerpt": "",
+                "slug": "our-services",
+                "guid": "https:\/\/fourpawsdoggrooming.wordpress.com\/?p=67",
+                "status": "draft",
+                "sticky": false,
+                "password": "",
+                "parent": false,
+                "type": "post",
+                "discussion": {
+                    "comments_open": true,
+                    "comment_status": "open",
+                    "pings_open": true,
+                    "ping_status": "open",
+                    "comment_count": 0
+                },
+                "likes_enabled": true,
+                "sharing_enabled": true,
+                "like_count": 0,
+                "i_like": false,
+                "is_reblogged": false,
+                "is_following": false,
+                "global_ID": "8baa5f9a6478573f6869e88704679280",
+                "featured_image": "",
+                "post_thumbnail": null,
+                "format": "standard",
+                "geo": false,
+                "menu_order": 0,
+                "page_template": "",
+                "publicize_URLs": [],
+                "terms": {
+                    "category": {
+                        "Uncategorized": {
+                            "ID": 1,
+                            "name": "Uncategorized",
+                            "slug": "uncategorized",
+                            "description": "",
+                            "post_count": 3,
+                            "parent": 0,
+                            "meta": {
+                                "links": {
+                                    "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/categories\/slug:uncategorized",
+                                    "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/categories\/slug:uncategorized\/help",
+                                    "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495"
+                                }
+                            }
+                        }
+                    },
+                    "post_tag": {},
+                    "post_format": {},
+                    "mentions": {}
+                },
+                "tags": {},
+                "categories": {
+                    "Uncategorized": {
+                        "ID": 1,
+                        "name": "Uncategorized",
+                        "slug": "uncategorized",
+                        "description": "",
+                        "post_count": 3,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/categories\/slug:uncategorized",
+                                "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/categories\/slug:uncategorized\/help",
+                                "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495"
+                            }
+                        }
+                    }
+                },
+                "attachments": {},
+                "attachment_count": 0,
+                "metadata": false,
+                "meta": {
+                    "links": {
+                        "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/67",
+                        "help": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/posts\/67\/help",
+                        "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495",
+                        "replies": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/67\/replies\/",
+                        "likes": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/67\/likes\/"
+                    }
+                },
+                "capabilities": {
+                    "publish_post": true,
+                    "delete_post": true,
+                    "edit_post": true
+                },
+                "revisions": [68],
+                "other_URLs": {
+                    "permalink_URL": "https:\/\/fourpawsdoggrooming.wordpress.com\/2020\/10\/05\/%postname%\/",
+                    "suggested_slug": "our-services"
+                }
+            }],
+            "meta": {
+                "links": {
+                    "counts": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/181851495\/post-counts\/post"
+                },
+                "wpcom": true
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_liked.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_liked.json
new file mode 100644
index 000000000000..27b89967eea3
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_liked.json
@@ -0,0 +1,36 @@
+{
+    "request": {
+        "urlPath": "/rest/v1.2/read/liked",
+        "method": "GET",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            },
+            "meta": {
+                "matches": "(.*)"
+            },
+            "number": {
+                "equalTo": "20"
+            },
+            "order": {
+                "equalTo": "DESC"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "date_range": {
+                "before": "2020-10-07T17:33:58+00:00",
+                "after": "2020-08-21T21:07:01+00:00"
+            },
+            "number": 20,
+            "posts": []
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_menu.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_menu.json
index 15b92669db18..c46d0cc034f0 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_menu.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_menu.json
@@ -20,7 +20,16 @@
                     "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/liked"
                 }
             },
-            "subscribed": [],
+            "subscribed": {
+                "436": {
+                    "ID": "436",
+                    "title": "Photography",
+                    "URL": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/read\/tags\/photography\/posts",
+                    "slug": "photography",
+                    "display_name": "photography",
+                    "type": "tag"
+                }
+            },
             "recommended": {
                 "116": {
                     "ID": 116,
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v13_read_menu.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v13_read_menu.json
new file mode 100644
index 000000000000..4341f57de19d
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v13_read_menu.json
@@ -0,0 +1,226 @@
+{
+    "request": {
+        "urlPath": "/rest/v1.3/read/menu",
+        "method": "GET"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "default": {
+                "following": {
+                    "title": "Followed Sites",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/following"
+                },
+                "discover": {
+                    "title": "Discover",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/sites/53424024/posts"
+                },
+                "liked": {
+                    "title": "My Likes",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/liked"
+                }
+            },
+            "subscribed": {
+                "436": {
+                    "ID": "436",
+                    "title": "Photography",
+                    "URL": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/read\/tags\/photography\/posts",
+                    "slug": "photography",
+                    "display_name": "photography",
+                    "type": "tag"
+                }
+            },
+            "recommended": {
+                "116": {
+                    "ID": 116,
+                    "title": "Religion",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/religion/posts",
+                    "slug": "religion",
+                    "display_name": "religion",
+                    "type": "tag"
+                },
+                "178": {
+                    "ID": 178,
+                    "title": "Books",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/books/posts",
+                    "slug": "books",
+                    "display_name": "books",
+                    "type": "tag"
+                },
+                "200": {
+                    "ID": 200,
+                    "title": "Travel",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/travel/posts",
+                    "slug": "travel",
+                    "display_name": "travel",
+                    "type": "tag"
+                },
+                "376": {
+                    "ID": 376,
+                    "title": "Humor",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/humor/posts",
+                    "slug": "humor",
+                    "display_name": "humor",
+                    "type": "tag"
+                },
+                "406": {
+                    "ID": 406,
+                    "title": "Family",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/family/posts",
+                    "slug": "family",
+                    "display_name": "family",
+                    "type": "tag"
+                },
+                "436": {
+                    "ID": 436,
+                    "title": "Photography",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/photography/posts",
+                    "slug": "photography",
+                    "display_name": "photography",
+                    "type": "tag"
+                },
+                "586": {
+                    "ID": 586,
+                    "title": "Food",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/food/posts",
+                    "slug": "food",
+                    "display_name": "food",
+                    "type": "tag"
+                },
+                "676": {
+                    "ID": 676,
+                    "title": "Websites",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/websites/posts",
+                    "slug": "websites",
+                    "display_name": "websites",
+                    "type": "tag"
+                },
+                "1098": {
+                    "ID": 1098,
+                    "title": "Culture",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/culture/posts",
+                    "slug": "culture",
+                    "display_name": "culture",
+                    "type": "tag"
+                },
+                "2806": {
+                    "ID": 2806,
+                    "title": "Art &amp; Design",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/art-design/posts",
+                    "slug": "art-design",
+                    "display_name": "art-design",
+                    "type": "tag"
+                },
+                "3750": {
+                    "ID": 3750,
+                    "title": "Magazines",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/magazines/posts",
+                    "slug": "magazines",
+                    "display_name": "magazines",
+                    "type": "tag"
+                },
+                "13985": {
+                    "ID": 13985,
+                    "title": "Health &amp; Wellness",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/health-wellness/posts",
+                    "slug": "health-wellness",
+                    "display_name": "health-wellness",
+                    "type": "tag"
+                },
+                "26879": {
+                    "ID": 26879,
+                    "title": "Portfolios",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/portfolios/posts",
+                    "slug": "portfolios",
+                    "display_name": "portfolios",
+                    "type": "tag"
+                },
+                "38881": {
+                    "ID": 38881,
+                    "title": "Science &amp; Nature",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/science-nature/posts",
+                    "slug": "science-nature",
+                    "display_name": "science-nature",
+                    "type": "tag"
+                },
+                "84776": {
+                    "ID": 84776,
+                    "title": "News &amp; Current Events",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/news-current-events/posts",
+                    "slug": "news-current-events",
+                    "display_name": "news-current-events",
+                    "type": "tag"
+                },
+                "258845": {
+                    "ID": 258845,
+                    "title": "Business &amp; Technology",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/business-technology/posts",
+                    "slug": "business-technology",
+                    "display_name": "business-technology",
+                    "type": "tag"
+                },
+                "960817": {
+                    "ID": 960817,
+                    "title": "Fiction &amp; Poetry",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/fiction-poetry/posts",
+                    "slug": "fiction-poetry",
+                    "display_name": "fiction-poetry",
+                    "type": "tag"
+                },
+                "998458": {
+                    "ID": 998458,
+                    "title": "Writing &amp; Blogging",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/writing-blogging/posts",
+                    "slug": "writing-blogging",
+                    "display_name": "writing-blogging",
+                    "type": "tag"
+                },
+                "1446729": {
+                    "ID": 1446729,
+                    "title": "Sports &amp; Gaming",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/sports-gaming/posts",
+                    "slug": "sports-gaming",
+                    "display_name": "sports-gaming",
+                    "type": "tag"
+                },
+                "10016773": {
+                    "ID": 10016773,
+                    "title": "Musings &amp; Personal",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/musings-personal/posts",
+                    "slug": "musings-personal",
+                    "display_name": "musings-personal",
+                    "type": "tag"
+                },
+                "35328892": {
+                    "ID": 35328892,
+                    "title": "Longreads",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/longreads/posts",
+                    "slug": "longreads",
+                    "display_name": "longreads",
+                    "type": "tag"
+                },
+                "63611190": {
+                    "ID": 63611190,
+                    "title": "Crafts &amp; Fashion",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/crafts-fashion/posts",
+                    "slug": "crafts-fashion",
+                    "display_name": "crafts-fashion",
+                    "type": "tag"
+                },
+                "87210105": {
+                    "ID": 87210105,
+                    "title": "Popular Culture &amp; Entertainment",
+                    "URL": "{{request.requestLine.baseUrl}}/rest/v1.2/read/tags/popular-culture-entertainment/posts",
+                    "slug": "popular-culture-entertainment",
+                    "display_name": "popular-culture-entertainment",
+                    "type": "tag"
+                }
+            }
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_interests.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_interests.json
new file mode 100644
index 000000000000..ee93e623240a
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_interests.json
@@ -0,0 +1,300 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wpcom/v2/read/interests"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "success": true,
+            "interests": [{
+                "title": "Activism",
+                "slug": "activism"
+            }, {
+                "title": "Advice",
+                "slug": "advice"
+            }, {
+                "title": "Adventure",
+                "slug": "adventure"
+            }, {
+                "title": "Animals",
+                "slug": "animals"
+            }, {
+                "title": "Architecture",
+                "slug": "architecture"
+            }, {
+                "title": "Art",
+                "slug": "art"
+            }, {
+                "title": "Authors",
+                "slug": "authors"
+            }, {
+                "title": "Baking",
+                "slug": "baking"
+            }, {
+                "title": "Beauty",
+                "slug": "beauty"
+            }, {
+                "title": "Beer",
+                "slug": "beer"
+            }, {
+                "title": "Blogging",
+                "slug": "blogging"
+            }, {
+                "title": "Books",
+                "slug": "books"
+            }, {
+                "title": "Business",
+                "slug": "business"
+            }, {
+                "title": "Camping",
+                "slug": "camping"
+            }, {
+                "title": "Cars",
+                "slug": "cars"
+            }, {
+                "title": "Cocktails",
+                "slug": "cocktails"
+            }, {
+                "title": "Coding",
+                "slug": "coding"
+            }, {
+                "title": "Comics",
+                "slug": "comics"
+            }, {
+                "title": "Cooking",
+                "slug": "cooking"
+            }, {
+                "title": "Community",
+                "slug": "community"
+            }, {
+                "title": "Comics",
+                "slug": "comics"
+            }, {
+                "title": "Crafts",
+                "slug": "crafts"
+            }, {
+                "title": "Creativity",
+                "slug": "creativity"
+            }, {
+                "title": "Culture",
+                "slug": "culture"
+            }, {
+                "title": "Current Events",
+                "slug": "current-events"
+            }, {
+                "title": "Dance",
+                "slug": "dance"
+            }, {
+                "title": "Decorating",
+                "slug": "decorating"
+            }, {
+                "title": "Design",
+                "slug": "design"
+            }, {
+                "title": "Diversity",
+                "slug": "diversity"
+            }, {
+                "title": "DIY",
+                "slug": "diy"
+            }, {
+                "title": "Drawing",
+                "slug": "drawing"
+            }, {
+                "title": "Ecommerce",
+                "slug": "ecommerce"
+            }, {
+                "title": "Education",
+                "slug": "education"
+            }, {
+                "title": "Entertainment",
+                "slug": "entertainment"
+            }, {
+                "title": "Environment",
+                "slug": "environment"
+            }, {
+                "title": "Family",
+                "slug": "family"
+            }, {
+                "title": "Farming",
+                "slug": "farming"
+            }, {
+                "title": "Fashion",
+                "slug": "fashion"
+            }, {
+                "title": "Fiction",
+                "slug": "fiction"
+            }, {
+                "title": "Finance",
+                "slug": "finance"
+            }, {
+                "title": "Fitness",
+                "slug": "fitness"
+            }, {
+                "title": "Food",
+                "slug": "food"
+            }, {
+                "title": "Gaming",
+                "slug": "gaming"
+            }, {
+                "title": "Gardening",
+                "slug": "gardening"
+            }, {
+                "title": "Health",
+                "slug": "health"
+            }, {
+                "title": "History",
+                "slug": "history"
+            }, {
+                "title": "Homeschooling",
+                "slug": "homeschooling"
+            }, {
+                "title": "Humor",
+                "slug": "humor"
+            }, {
+                "title": "Identity",
+                "slug": "identity"
+            }, {
+                "title": "Illustration",
+                "slug": "illustration"
+            }, {
+                "title": "Inspiration",
+                "slug": "inspiration"
+            }, {
+                "title": "Internet",
+                "slug": "internet"
+            }, {
+                "title": "Journalism",
+                "slug": "journalism"
+            }, {
+                "title": "Kids",
+                "slug": "kids"
+            }, {
+                "title": "Language",
+                "slug": "language"
+            }, {
+                "title": "LGBTQ",
+                "slug": "lgbtq"
+            }, {
+                "title": "Lifestyle",
+                "slug": "lifestyle"
+            }, {
+                "title": "Literature",
+                "slug": "literature"
+            }, {
+                "title": "Mathematics",
+                "slug": "mathematics"
+            }, {
+                "title": "Media",
+                "slug": "media"
+            }, {
+                "title": "Mental Health",
+                "slug": "mental-health"
+            }, {
+                "title": "Military",
+                "slug": "military"
+            }, {
+                "title": "Movies",
+                "slug": "movies"
+            }, {
+                "title": "Music",
+                "slug": "music"
+            }, {
+                "title": "Nature",
+                "slug": "nature"
+            }, {
+                "title": "Nonfiction",
+                "slug": "nonfiction"
+            }, {
+                "title": "Nostalgia",
+                "slug": "nostalgia"
+            }, {
+                "title": "Outdoors",
+                "slug": "outdoors"
+            }, {
+                "title": "Parenting",
+                "slug": "parenting"
+            }, {
+                "title": "Pets",
+                "slug": "pets"
+            }, {
+                "title": "Photography",
+                "slug": "photography"
+            }, {
+                "title": "Poetry",
+                "slug": "poetry"
+            }, {
+                "title": "Politics",
+                "slug": "politics"
+            }, {
+                "title": "Publishing",
+                "slug": "publishing"
+            }, {
+                "title": "Reading",
+                "slug": "reading"
+            }, {
+                "title": "Recipes",
+                "slug": "recipes"
+            }, {
+                "title": "Relationships",
+                "slug": "relationships"
+            }, {
+                "title": "Religion",
+                "slug": "religion"
+            }, {
+                "title": "Science",
+                "slug": "science"
+            }, {
+                "title": "Self-Improvement",
+                "slug": "self-improvement"
+            }, {
+                "title": "Self-Publishing",
+                "slug": "self-publishing"
+            }, {
+                "title": "Sewing",
+                "slug": "sewing"
+            }, {
+                "title": "Social Media",
+                "slug": "social-media"
+            }, {
+                "title": "Sports",
+                "slug": "sports"
+            }, {
+                "title": "Teaching",
+                "slug": "teaching"
+            }, {
+                "title": "Technology",
+                "slug": "technology"
+            }, {
+                "title": "Television",
+                "slug": "television"
+            }, {
+                "title": "Travel",
+                "slug": "travel"
+            }, {
+                "title": "Weddings",
+                "slug": "weddings"
+            }, {
+                "title": "Wellness",
+                "slug": "wellness"
+            }, {
+                "title": "Wine",
+                "slug": "wine"
+            }, {
+                "title": "WordPress",
+                "slug": "wordpress"
+            }, {
+                "title": "Work",
+                "slug": "work"
+            }, {
+                "title": "Writing",
+                "slug": "writing"
+            }]
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_tags_cards.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_tags_cards.json
new file mode 100644
index 000000000000..1dd8d1818b41
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v2_read_tags_cards.json
@@ -0,0 +1,3859 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wpcom/v2/read/tags/cards"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+    "success": true,
+    "tags": ["photography"],
+    "sort": "popularity",
+    "lang": "en",
+    "page": 1,
+    "refresh": 1,
+    "cards": [{
+        "type": "interests_you_may_like",
+        "data": [{
+            "slug": "blogging",
+            "title": "Blogging",
+            "score": 278
+        }, {
+            "slug": "travel",
+            "title": "Travel",
+            "score": 251
+        }, {
+            "slug": "photos",
+            "title": "Photos",
+            "score": 173
+        }, {
+            "slug": "technology",
+            "title": "Technology",
+            "score": 139
+        }]
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 37222,
+            "site_ID": 53424024,
+            "author": {
+                "ID": 47411601,
+                "login": "benhuberman",
+                "email": false,
+                "name": "Ben Huberman",
+                "first_name": "Ben",
+                "last_name": "Huberman",
+                "nice_name": "benhuberman",
+                "URL": "https://benz.blog/",
+                "avatar_URL": "https://0.gravatar.com/avatar/663dcd498e8c5f255bfb230a7ba07678?s=96&d=identicon&r=G",
+                "profile_URL": "http://en.gravatar.com/benhuberman",
+                "site_ID": 122910962,
+                "has_avatar": true
+            },
+            "date": "{{now offset='-2 hours'}}",
+            "modified": "{{now offset='-2 hours'}}",
+            "title": "Kelsey Montague Art",
+            "URL": "https://discover.wordpress.com/2019/05/27/kelsey-montague-art/",
+            "short_URL": "https://wp.me/p3Ca1O-9Gm",
+            "content": "<p>Explore mural artist Kelsey Montague&#8217;s work, stay up-to-date on her latest projects, and shop for prints on her Anything Is Possible-featured website.&nbsp;</p>\r\n\r\n\r\n<p></p>\r\n",
+            "excerpt": "<p>Explore mural artist Kelsey Montague&#8217;s work, stay up-to-date on her latest projects, and shop for prints on her Anything Is Possible-featured website.&nbsp;</p>\n",
+            "slug": "kelsey-montague-art",
+            "guid": "https://discover.wordpress.com/?p=37222",
+            "status": "publish",
+            "sticky": false,
+            "password": "",
+            "parent": false,
+            "type": "post",
+            "discussion": {
+                "comments_open": false,
+                "comment_status": "closed",
+                "pings_open": false,
+                "ping_status": "closed",
+                "comment_count": 0
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 33,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": true,
+            "global_ID": "b06fd6b4fd1b95644d71981f34f747f8",
+            "featured_image": "https://discover.files.wordpress.com/2019/05/img_3760.jpg",
+            "post_thumbnail": {
+                "ID": 37226,
+                "URL": "https://discover.files.wordpress.com/2019/05/img_3760.jpg",
+                "guid": "http://discover.files.wordpress.com/2019/05/img_3760.jpg",
+                "mime_type": "image/jpeg",
+                "width": 1280,
+                "height": 1706
+            },
+            "format": "standard",
+            "geo": false,
+            "menu_order": 0,
+            "page_template": "",
+            "publicize_URLs": [],
+            "terms": {
+                "category": {
+                    "Art": {
+                        "ID": 177,
+                        "name": "Art",
+                        "slug": "art",
+                        "description": "Artists' sites, powerful artwork in multiple genres in a variety of mediums, and news from the art world.",
+                        "post_count": 370,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:art",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:art/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Culture": {
+                        "ID": 1098,
+                        "name": "Culture",
+                        "slug": "culture",
+                        "description": "A curated collection of WordPress sites on society, culture in all its forms, and diverse art forms from around the world.",
+                        "post_count": 414,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:culture",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:culture/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Diversity": {
+                        "ID": 47458,
+                        "name": "Diversity",
+                        "slug": "diversity",
+                        "description": "Blogs, stories, and web projects that highlight activists working towards greater diversity in culture, politics, and the business world.",
+                        "post_count": 131,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:diversity",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:diversity/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Feminism": {
+                        "ID": 553,
+                        "name": "Feminism",
+                        "slug": "feminism",
+                        "description": "Magazines, collaborative websites, and feminist blogs that cover important issues in politics, culture, diversity, and the fight for gender equality.",
+                        "post_count": 99,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:feminism",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:feminism/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Inspiration": {
+                        "ID": 107,
+                        "name": "Inspiration",
+                        "slug": "inspiration",
+                        "description": "Ideas and advice to empower and motivate people – especially bloggers, writers, and creative types – in their personal or professional journeys.",
+                        "post_count": 327,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:inspiration",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:inspiration/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Popular Culture": {
+                        "ID": 2437,
+                        "name": "Popular Culture",
+                        "slug": "popular-culture",
+                        "description": "The web's leading pop culture magazines and blogs, covering music, film, television, gaming, and more.",
+                        "post_count": 198,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:popular-culture",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:popular-culture/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_tag": {
+                    "AnythingIsPossible": {
+                        "ID": 109479402,
+                        "name": "AnythingIsPossible",
+                        "slug": "anythingispossible",
+                        "description": "",
+                        "post_count": 15,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:anythingispossible",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:anythingispossible/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "mural": {
+                        "ID": 159763,
+                        "name": "mural",
+                        "slug": "mural",
+                        "description": "",
+                        "post_count": 4,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:mural",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:mural/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "mural art": {
+                        "ID": 5762997,
+                        "name": "mural art",
+                        "slug": "mural-art",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:mural-art",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:mural-art/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "murals": {
+                        "ID": 135373,
+                        "name": "murals",
+                        "slug": "murals",
+                        "description": "",
+                        "post_count": 2,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:murals",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:murals/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "street art": {
+                        "ID": 57447,
+                        "name": "street art",
+                        "slug": "street-art",
+                        "description": "",
+                        "post_count": 18,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:street-art",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:street-art/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "urban art": {
+                        "ID": 28923,
+                        "name": "urban art",
+                        "slug": "urban-art",
+                        "description": "",
+                        "post_count": 2,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:urban-art",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:urban-art/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_format": {},
+                "mentions": {}
+            },
+            "tags": {
+                "AnythingIsPossible": {
+                    "ID": 109479402,
+                    "name": "AnythingIsPossible",
+                    "slug": "anythingispossible",
+                    "description": "",
+                    "post_count": 15,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:anythingispossible",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:anythingispossible/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "anythingispossible"
+                },
+                "mural": {
+                    "ID": 159763,
+                    "name": "mural",
+                    "slug": "mural",
+                    "description": "",
+                    "post_count": 4,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:mural",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:mural/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "mural"
+                },
+                "mural art": {
+                    "ID": 5762997,
+                    "name": "mural art",
+                    "slug": "mural-art",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:mural-art",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:mural-art/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "mural-art"
+                },
+                "murals": {
+                    "ID": 135373,
+                    "name": "murals",
+                    "slug": "murals",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:murals",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:murals/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "murals"
+                },
+                "street art": {
+                    "ID": 57447,
+                    "name": "street art",
+                    "slug": "street-art",
+                    "description": "",
+                    "post_count": 18,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:street-art",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:street-art/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "street-art"
+                },
+                "urban art": {
+                    "ID": 28923,
+                    "name": "urban art",
+                    "slug": "urban-art",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:urban-art",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:urban-art/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "urban-art"
+                }
+            },
+            "categories": {
+                "Art": {
+                    "ID": 177,
+                    "name": "Art",
+                    "slug": "art",
+                    "description": "Artists' sites, powerful artwork in multiple genres in a variety of mediums, and news from the art world.",
+                    "post_count": 370,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:art",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:art/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Culture": {
+                    "ID": 1098,
+                    "name": "Culture",
+                    "slug": "culture",
+                    "description": "A curated collection of WordPress sites on society, culture in all its forms, and diverse art forms from around the world.",
+                    "post_count": 414,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:culture",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:culture/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Diversity": {
+                    "ID": 47458,
+                    "name": "Diversity",
+                    "slug": "diversity",
+                    "description": "Blogs, stories, and web projects that highlight activists working towards greater diversity in culture, politics, and the business world.",
+                    "post_count": 131,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:diversity",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:diversity/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Feminism": {
+                    "ID": 553,
+                    "name": "Feminism",
+                    "slug": "feminism",
+                    "description": "Magazines, collaborative websites, and feminist blogs that cover important issues in politics, culture, diversity, and the fight for gender equality.",
+                    "post_count": 99,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:feminism",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:feminism/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Inspiration": {
+                    "ID": 107,
+                    "name": "Inspiration",
+                    "slug": "inspiration",
+                    "description": "Ideas and advice to empower and motivate people – especially bloggers, writers, and creative types – in their personal or professional journeys.",
+                    "post_count": 327,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:inspiration",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:inspiration/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Popular Culture": {
+                    "ID": 2437,
+                    "name": "Popular Culture",
+                    "slug": "popular-culture",
+                    "description": "The web's leading pop culture magazines and blogs, covering music, film, television, gaming, and more.",
+                    "post_count": 198,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:popular-culture",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:popular-culture/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                }
+            },
+            "attachments": {
+                "37226": {
+                    "ID": 37226,
+                    "URL": "https://discover.files.wordpress.com/2019/05/img_3760.jpg",
+                    "guid": "http://discover.files.wordpress.com/2019/05/img_3760.jpg",
+                    "date": "2019-05-21T23:48:08-04:00",
+                    "post_ID": 37222,
+                    "author_ID": 47411601,
+                    "file": "img_3760.jpg",
+                    "mime_type": "image/jpeg",
+                    "extension": "jpg",
+                    "title": "IMG_3760",
+                    "caption": "",
+                    "description": "",
+                    "alt": "Kelsey Montague mural art",
+                    "thumbnails": {
+                        "thumbnail": "https://discover.files.wordpress.com/2019/05/img_3760.jpg?w=113",
+                        "medium": "https://discover.files.wordpress.com/2019/05/img_3760.jpg?w=311",
+                        "large": "https://discover.files.wordpress.com/2019/05/img_3760.jpg?w=768"
+                    },
+                    "height": 1706,
+                    "width": 1280,
+                    "exif": {
+                        "aperture": "1.8",
+                        "credit": "",
+                        "camera": "iPhone 8 Plus",
+                        "caption": "",
+                        "created_timestamp": "1536421883",
+                        "copyright": "",
+                        "focal_length": "3.99",
+                        "iso": "20",
+                        "shutter_speed": "0.0014836795252226",
+                        "title": "",
+                        "orientation": "0",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37226",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37226/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37222"
+                        }
+                    }
+                }
+            },
+            "attachment_count": 1,
+            "metadata": [
+                {
+                    "id": "130242",
+                    "key": "geo_public",
+                    "value": "0"
+                },
+                {
+                    "id": "130230",
+                    "key": "_thumbnail_id",
+                    "value": "37226"
+                },
+                {
+                    "id": "130401",
+                    "key": "_wpas_done_17927786",
+                    "value": "1"
+                },
+                {
+                    "id": "130238",
+                    "key": "_wpas_mess",
+                    "value": "Visit @kelsmontagueart's website - featured on @wordpressdotcom's #AnythingIsPossible list - for inspiration, prints, and updates on Kelsey's latest mural projects."
+                }
+            ],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}/rest/v1.1/read/sites/53424024/posts/37222",
+                    "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/37222/help",
+                    "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                    "replies": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37222/replies/",
+                    "likes": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37222/likes/"
+                },
+                "data": {
+                    "site": {
+                        "ID": 53424024,
+                        "name": "Discover",
+                        "description": "A daily selection of the best content published on WordPress, collected for you by humans who love to read.",
+                        "URL": "https://discover.wordpress.com",
+                        "jetpack": false,
+                        "post_count": 3603,
+                        "subscribers_count": 35192480,
+                        "locale": "en",
+                        "icon": {
+                            "img": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace",
+                            "ico": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace"
+                        },
+                        "logo": {
+                            "id": 0,
+                            "sizes": [],
+                            "url": ""
+                        },
+                        "visible": true,
+                        "is_private": false,
+                        "is_following": true,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/help",
+                                "posts": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/",
+                                "comments": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/comments/",
+                                "xmlrpc": "https://discover.wordpress.com/xmlrpc.php"
+                            }
+                        }
+                    }
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "other_URLs": {},
+            "discover_metadata": {
+                "permalink": "https://kelseymontagueart.com/",
+                "attribution": {
+                    "author_name": "Krista Stevens",
+                    "author_url": "https://kelseymontagueart.com/",
+                    "blog_name": "Kelsey Montague Art",
+                    "blog_url": "https://kelseymontagueart.com",
+                    "avatar_url": "https://discover.files.wordpress.com/2019/05/kelsey-thumbnail.png?w=100&h=100&crop=true"
+                },
+                "discover_fp_post_formats": [
+                    {
+                        "name": "Pick",
+                        "slug": "pick",
+                        "id": 346750
+                    },
+                    {
+                        "name": "Site Pick",
+                        "slug": "site-pick",
+                        "id": 308219249
+                    }
+                ],
+                "featured_post_wpcom_data": {
+                    "blog_id": 161169196
+                }
+            },
+            "feed_ID": 41325786,
+            "feed_URL": "http://discover.wordpress.com",
+            "pseudo_ID": "b06fd6b4fd1b95644d71981f34f747f8",
+            "is_external": false,
+            "site_name": "Discover",
+            "site_URL": "https://discover.wordpress.com",
+            "site_is_private": false,
+            "featured_media": {},
+            "use_excerpt": false,
+            "is_following_conversation": false
+        }
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 37189,
+            "site_ID": 53424024,
+            "author": {
+                "ID": 10183950,
+                "login": "cherilucas",
+                "email": false,
+                "name": "Cheri Lucas Rowlands",
+                "first_name": "Cheri",
+                "last_name": "Rowlands",
+                "nice_name": "cherilucas",
+                "URL": "http://cherilucasrowlands.com",
+                "avatar_URL": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=96&d=identicon&r=G",
+                "profile_URL": "http://en.gravatar.com/cherilucas",
+                "site_ID": 9838404,
+                "has_avatar": true
+            },
+            "date": "{{now offset='-1 days'}}",
+            "modified": "{{now offset='-1 days'}}",
+            "title": "The Radical Notion of Not Letting Work Define You",
+            "URL": "https://discover.wordpress.com/2019/05/26/the-radical-notion-of-not-letting-work-define-you/",
+            "short_URL": "https://wp.me/p3Ca1O-9FP",
+            "content": "<p>&#8220;Just because something can’t be a career doesn’t have to mean that it can’t be part of your life and identity.&#8221; At <em>Man Repeller</em>, Molly Conway muses on imposter syndrome, work and identity, and being a playwright.</p>\n",
+            "excerpt": "<p>&#8220;Just because something can’t be a career doesn’t have to mean that it can’t be part of your life and identity.&#8221; At Man Repeller, Molly Conway muses on imposter syndrome, work and identity, and being a playwright.</p>\n",
+            "slug": "the-radical-notion-of-not-letting-work-define-you",
+            "guid": "https://discover.wordpress.com/?p=37189",
+            "status": "publish",
+            "sticky": false,
+            "password": "",
+            "parent": false,
+            "type": "post",
+            "discussion": {
+                "comments_open": false,
+                "comment_status": "closed",
+                "pings_open": false,
+                "ping_status": "closed",
+                "comment_count": 0
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 102,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": true,
+            "global_ID": "eedec98542f8cbec7df4d4c608c847ef",
+            "featured_image": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png",
+            "post_thumbnail": {
+                "ID": 37191,
+                "URL": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png",
+                "guid": "http://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png",
+                "mime_type": "image/png",
+                "width": 1482,
+                "height": 988
+            },
+            "format": "standard",
+            "geo": false,
+            "menu_order": 0,
+            "page_template": "",
+            "publicize_URLs": [],
+            "terms": {
+                "category": {
+                    "Identity": {
+                        "ID": 10679,
+                        "name": "Identity",
+                        "slug": "identity",
+                        "description": "Engaging conversations and writing around the topics of identity, diversity, and the search for authenticity.",
+                        "post_count": 166,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:identity",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:identity/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Personal Essay": {
+                        "ID": 253221,
+                        "name": "Personal Essay",
+                        "slug": "personal-essay",
+                        "description": "Personal and introspective essays and longform from new and established writers and authors.",
+                        "post_count": 156,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:personal-essay",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:personal-essay/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Personal Musings": {
+                        "ID": 5316,
+                        "name": "Personal Musings",
+                        "slug": "personal-musings",
+                        "description": "Introspective and self-reflective writing in various formats.",
+                        "post_count": 437,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:personal-musings",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:personal-musings/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Work": {
+                        "ID": 131,
+                        "name": "Work",
+                        "slug": "work",
+                        "description": "From tech to farming, posts and websites dedicated to the many facets of work, work-life balance, and social inequality.",
+                        "post_count": 80,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:work",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:work/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Writing": {
+                        "ID": 349,
+                        "name": "Writing",
+                        "slug": "writing",
+                        "description": "Writing, advice, and commentary on the act and process of writing, blogging, and publishing.",
+                        "post_count": 437,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:writing",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:writing/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_tag": {
+                    "imposter syndrome": {
+                        "ID": 392126,
+                        "name": "imposter syndrome",
+                        "slug": "imposter-syndrome",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:imposter-syndrome",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:imposter-syndrome/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "playwright": {
+                        "ID": 160393,
+                        "name": "playwright",
+                        "slug": "playwright",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:playwright",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:playwright/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "PoweredByWordPress": {
+                        "ID": 76162589,
+                        "name": "PoweredByWordPress",
+                        "slug": "poweredbywordpress",
+                        "description": "",
+                        "post_count": 42,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:poweredbywordpress",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:poweredbywordpress/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "writers": {
+                        "ID": 16761,
+                        "name": "writers",
+                        "slug": "writers",
+                        "description": "",
+                        "post_count": 70,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:writers",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:writers/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_format": {},
+                "mentions": {}
+            },
+            "tags": {
+                "imposter syndrome": {
+                    "ID": 392126,
+                    "name": "imposter syndrome",
+                    "slug": "imposter-syndrome",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:imposter-syndrome",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:imposter-syndrome/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "imposter-syndrome"
+                },
+                "playwright": {
+                    "ID": 160393,
+                    "name": "playwright",
+                    "slug": "playwright",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:playwright",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:playwright/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "playwright"
+                },
+                "PoweredByWordPress": {
+                    "ID": 76162589,
+                    "name": "PoweredByWordPress",
+                    "slug": "poweredbywordpress",
+                    "description": "",
+                    "post_count": 42,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:poweredbywordpress",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:poweredbywordpress/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "poweredbywordpress"
+                },
+                "writers": {
+                    "ID": 16761,
+                    "name": "writers",
+                    "slug": "writers",
+                    "description": "",
+                    "post_count": 70,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:writers",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:writers/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "writers"
+                }
+            },
+            "categories": {
+                "Identity": {
+                    "ID": 10679,
+                    "name": "Identity",
+                    "slug": "identity",
+                    "description": "Engaging conversations and writing around the topics of identity, diversity, and the search for authenticity.",
+                    "post_count": 166,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:identity",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:identity/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Personal Essay": {
+                    "ID": 253221,
+                    "name": "Personal Essay",
+                    "slug": "personal-essay",
+                    "description": "Personal and introspective essays and longform from new and established writers and authors.",
+                    "post_count": 156,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:personal-essay",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:personal-essay/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Personal Musings": {
+                    "ID": 5316,
+                    "name": "Personal Musings",
+                    "slug": "personal-musings",
+                    "description": "Introspective and self-reflective writing in various formats.",
+                    "post_count": 437,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:personal-musings",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:personal-musings/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Work": {
+                    "ID": 131,
+                    "name": "Work",
+                    "slug": "work",
+                    "description": "From tech to farming, posts and websites dedicated to the many facets of work, work-life balance, and social inequality.",
+                    "post_count": 80,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:work",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:work/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Writing": {
+                    "ID": 349,
+                    "name": "Writing",
+                    "slug": "writing",
+                    "description": "Writing, advice, and commentary on the act and process of writing, blogging, and publishing.",
+                    "post_count": 437,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:writing",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:writing/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                }
+            },
+            "attachments": {
+                "37191": {
+                    "ID": 37191,
+                    "URL": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png",
+                    "guid": "http://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png",
+                    "date": "2019-05-20T14:50:23-04:00",
+                    "post_ID": 37189,
+                    "author_ID": 10183950,
+                    "file": "screen-shot-2019-05-20-at-11.50.07-am.png",
+                    "mime_type": "image/png",
+                    "extension": "png",
+                    "title": "man repeller header image",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png?w=150",
+                        "medium": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png?w=315",
+                        "large": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png?w=1220"
+                    },
+                    "height": 988,
+                    "width": 1482,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "0",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37191",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37191/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37189"
+                        }
+                    }
+                },
+                "37192": {
+                    "ID": 37192,
+                    "URL": "https://discover.files.wordpress.com/2019/05/man-repeller-logo.jpg",
+                    "guid": "http://discover.files.wordpress.com/2019/05/man-repeller-logo.jpg",
+                    "date": "2019-05-20T14:50:47-04:00",
+                    "post_ID": 37189,
+                    "author_ID": 10183950,
+                    "file": "man-repeller-logo.jpg",
+                    "mime_type": "image/jpeg",
+                    "extension": "jpg",
+                    "title": "man repeller logo",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https://discover.files.wordpress.com/2019/05/man-repeller-logo.jpg?w=150",
+                        "medium": "https://discover.files.wordpress.com/2019/05/man-repeller-logo.jpg?w=315",
+                        "large": "https://discover.files.wordpress.com/2019/05/man-repeller-logo.jpg?w=400"
+                    },
+                    "height": 400,
+                    "width": 400,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "0",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37192",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37192/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37189"
+                        }
+                    }
+                }
+            },
+            "attachment_count": 2,
+            "metadata": [
+                {
+                    "id": "130145",
+                    "key": "geo_public",
+                    "value": "0"
+                },
+                {
+                    "id": "130142",
+                    "key": "_thumbnail_id",
+                    "value": "37191"
+                },
+                {
+                    "id": "130392",
+                    "key": "_wpas_done_17926349",
+                    "value": "1"
+                },
+                {
+                    "id": "130146",
+                    "key": "_wpas_mess",
+                    "value": "\"Just because something can’t be a career doesn’t have to mean that it can’t be part of your life and identity.\" Molly Conway muses on imposter syndrome, work and identity, and being a playwright. (@ManRepeller)"
+                }
+            ],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}/rest/v1.1/read/sites/53424024/posts/37189",
+                    "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/37189/help",
+                    "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                    "replies": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37189/replies/",
+                    "likes": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37189/likes/"
+                },
+                "data": {
+                    "site": {
+                        "ID": 53424024,
+                        "name": "Discover",
+                        "description": "A daily selection of the best content published on WordPress, collected for you by humans who love to read.",
+                        "URL": "https://discover.wordpress.com",
+                        "jetpack": false,
+                        "post_count": 3603,
+                        "subscribers_count": 35192480,
+                        "locale": "en",
+                        "icon": {
+                            "img": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace",
+                            "ico": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace"
+                        },
+                        "logo": {
+                            "id": 0,
+                            "sizes": [],
+                            "url": ""
+                        },
+                        "visible": true,
+                        "is_private": false,
+                        "is_following": true,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/help",
+                                "posts": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/",
+                                "comments": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/comments/",
+                                "xmlrpc": "https://discover.wordpress.com/xmlrpc.php"
+                            }
+                        }
+                    }
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "other_URLs": {},
+            "discover_metadata": {
+                "permalink": "https://www.manrepeller.com/2019/05/work-identity.html",
+                "attribution": {
+                    "author_name": "Molly Conway",
+                    "author_url": "https://www.manrepeller.com/author/molly-conway",
+                    "blog_name": "Man Repeller",
+                    "blog_url": "https://www.manrepeller.com",
+                    "avatar_url": "https://discover.files.wordpress.com/2019/05/man-repeller-logo.jpg?w=100&h=100&crop=true"
+                },
+                "discover_fp_post_formats": [
+                    {
+                        "name": "Pick",
+                        "slug": "pick",
+                        "id": 346750
+                    },
+                    {
+                        "name": "Standard Pick",
+                        "slug": "standard-pick",
+                        "id": 337879995
+                    }
+                ],
+                "featured_post_wpcom_data": {
+                    "blog_id": 61780023
+                }
+            },
+            "feed_ID": 41325786,
+            "feed_URL": "http://discover.wordpress.com",
+            "pseudo_ID": "eedec98542f8cbec7df4d4c608c847ef",
+            "is_external": false,
+            "site_name": "Discover",
+            "site_URL": "https://discover.wordpress.com",
+            "site_is_private": false,
+            "featured_media": {
+                "uri": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-20-at-11.50.07-am.png",
+                "width": 1482,
+                "height": 988,
+                "type": "image"
+            },
+            "use_excerpt": false,
+            "is_following_conversation": false
+        }
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 37205,
+            "site_ID": 53424024,
+            "author": {
+                "ID": 47411601,
+                "login": "benhuberman",
+                "email": false,
+                "name": "Ben Huberman",
+                "first_name": "Ben",
+                "last_name": "Huberman",
+                "nice_name": "benhuberman",
+                "URL": "https://benz.blog/",
+                "avatar_URL": "https://0.gravatar.com/avatar/663dcd498e8c5f255bfb230a7ba07678?s=96&d=identicon&r=G",
+                "profile_URL": "http://en.gravatar.com/benhuberman",
+                "site_ID": 122910962,
+                "has_avatar": true
+            },
+            "date": "2019-05-25T09:00:36-04:00",
+            "modified": "2019-05-21T23:45:15-04:00",
+            "title": "Barista Hustle",
+            "URL": "https://discover.wordpress.com/2019/05/25/barista-hustle/",
+            "short_URL": "https://wp.me/p3Ca1O-9G5",
+            "content": "\n<p>The team at <em>Barista Hustle</em>, a leading coffee-education hub, creates resources and shares their extensive knowledge on topics ranging from cutting-edge gear to latte art.</p>\n",
+            "excerpt": "<p>The team at Barista Hustle, a leading coffee-education hub, creates resources and shares their extensive knowledge on topics ranging from cutting-edge gear to latte art.</p>\n",
+            "slug": "barista-hustle",
+            "guid": "https://discover.wordpress.com/?p=37205",
+            "status": "publish",
+            "sticky": false,
+            "password": "",
+            "parent": false,
+            "type": "post",
+            "discussion": {
+                "comments_open": false,
+                "comment_status": "closed",
+                "pings_open": false,
+                "ping_status": "closed",
+                "comment_count": 0
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 58,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": true,
+            "global_ID": "5344123ea1ee2da1788f11183966d068",
+            "featured_image": "https://discover.files.wordpress.com/2019/05/bh-home-header-element-wide-final.jpg",
+            "post_thumbnail": {
+                "ID": 37206,
+                "URL": "https://discover.files.wordpress.com/2019/05/bh-home-header-element-wide-final.jpg",
+                "guid": "http://discover.files.wordpress.com/2019/05/bh-home-header-element-wide-final.jpg",
+                "mime_type": "image/jpeg",
+                "width": 2800,
+                "height": 1500
+            },
+            "format": "standard",
+            "geo": false,
+            "menu_order": 0,
+            "page_template": "",
+            "publicize_URLs": [],
+            "terms": {
+                "category": {
+                    "Business": {
+                        "ID": 179,
+                        "name": "Business",
+                        "slug": "business",
+                        "description": "Small business and ecommerce resources, writing for professionals, and commentary on business, economics, and related topics.",
+                        "post_count": 88,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:business",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:business/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Education": {
+                        "ID": 1342,
+                        "name": "Education",
+                        "slug": "education",
+                        "description": "Resources across disciplines and perspectives on teaching, learning, and the educational system from educators, teachers, and parents.",
+                        "post_count": 121,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:education",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:education/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Food": {
+                        "ID": 586,
+                        "name": "Food",
+                        "slug": "food",
+                        "description": "Recipes, writing on food and culinary culture, and food photography or visual art.",
+                        "post_count": 215,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:food",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:food/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Lifestyle": {
+                        "ID": 278,
+                        "name": "Lifestyle",
+                        "slug": "lifestyle",
+                        "description": "Sites devoted to fashion and beauty, interior design, travel, alternative ways of living, and more.",
+                        "post_count": 127,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:lifestyle",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:lifestyle/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Work": {
+                        "ID": 131,
+                        "name": "Work",
+                        "slug": "work",
+                        "description": "From tech to farming, posts and websites dedicated to the many facets of work, work-life balance, and social inequality.",
+                        "post_count": 80,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:work",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:work/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_tag": {
+                    "Baristas": {
+                        "ID": 831444,
+                        "name": "Baristas",
+                        "slug": "baristas",
+                        "description": "",
+                        "post_count": 2,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:baristas",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:baristas/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "business blog": {
+                        "ID": 287435,
+                        "name": "business blog",
+                        "slug": "business-blog",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:business-blog",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:business-blog/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "coffee": {
+                        "ID": 16166,
+                        "name": "coffee",
+                        "slug": "coffee",
+                        "description": "",
+                        "post_count": 10,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:coffee",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:coffee/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "ecommerce": {
+                        "ID": 11160,
+                        "name": "ecommerce",
+                        "slug": "ecommerce",
+                        "description": "",
+                        "post_count": 10,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:ecommerce",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:ecommerce/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Small Business": {
+                        "ID": 10585,
+                        "name": "Small Business",
+                        "slug": "small-business",
+                        "description": "",
+                        "post_count": 37,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:small-business",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:small-business/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_format": {},
+                "mentions": {}
+            },
+            "tags": {
+                "Baristas": {
+                    "ID": 831444,
+                    "name": "Baristas",
+                    "slug": "baristas",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:baristas",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:baristas/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "baristas"
+                },
+                "business blog": {
+                    "ID": 287435,
+                    "name": "business blog",
+                    "slug": "business-blog",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:business-blog",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:business-blog/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "business-blog"
+                },
+                "coffee": {
+                    "ID": 16166,
+                    "name": "coffee",
+                    "slug": "coffee",
+                    "description": "",
+                    "post_count": 10,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:coffee",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:coffee/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "coffee"
+                },
+                "ecommerce": {
+                    "ID": 11160,
+                    "name": "ecommerce",
+                    "slug": "ecommerce",
+                    "description": "",
+                    "post_count": 10,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:ecommerce",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:ecommerce/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "ecommerce"
+                },
+                "Small Business": {
+                    "ID": 10585,
+                    "name": "Small Business",
+                    "slug": "small-business",
+                    "description": "",
+                    "post_count": 37,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:small-business",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:small-business/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "small-business"
+                }
+            },
+            "categories": {
+                "Business": {
+                    "ID": 179,
+                    "name": "Business",
+                    "slug": "business",
+                    "description": "Small business and ecommerce resources, writing for professionals, and commentary on business, economics, and related topics.",
+                    "post_count": 88,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:business",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:business/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Education": {
+                    "ID": 1342,
+                    "name": "Education",
+                    "slug": "education",
+                    "description": "Resources across disciplines and perspectives on teaching, learning, and the educational system from educators, teachers, and parents.",
+                    "post_count": 121,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:education",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:education/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Food": {
+                    "ID": 586,
+                    "name": "Food",
+                    "slug": "food",
+                    "description": "Recipes, writing on food and culinary culture, and food photography or visual art.",
+                    "post_count": 215,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:food",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:food/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Lifestyle": {
+                    "ID": 278,
+                    "name": "Lifestyle",
+                    "slug": "lifestyle",
+                    "description": "Sites devoted to fashion and beauty, interior design, travel, alternative ways of living, and more.",
+                    "post_count": 127,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:lifestyle",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:lifestyle/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Work": {
+                    "ID": 131,
+                    "name": "Work",
+                    "slug": "work",
+                    "description": "From tech to farming, posts and websites dedicated to the many facets of work, work-life balance, and social inequality.",
+                    "post_count": 80,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:work",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:work/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                }
+            },
+            "attachments": {},
+            "attachment_count": 0,
+            "metadata": [
+                {
+                    "id": "130216",
+                    "key": "geo_public",
+                    "value": "0"
+                },
+                {
+                    "id": "130206",
+                    "key": "_thumbnail_id",
+                    "value": "37206"
+                },
+                {
+                    "id": "130379",
+                    "key": "_wpas_done_17927786",
+                    "value": "1"
+                },
+                {
+                    "id": "130212",
+                    "key": "_wpas_mess",
+                    "value": "Whether you're a coffee professional, an aspiring latte artist, or just looking to improve your next cup, check out the resources and courses @BaristaHustle, a #PoweredByWordPress website:"
+                }
+            ],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}/rest/v1.1/read/sites/53424024/posts/37205",
+                    "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/37205/help",
+                    "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                    "replies": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37205/replies/",
+                    "likes": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37205/likes/"
+                },
+                "data": {
+                    "site": {
+                        "ID": 53424024,
+                        "name": "Discover",
+                        "description": "A daily selection of the best content published on WordPress, collected for you by humans who love to read.",
+                        "URL": "https://discover.wordpress.com",
+                        "jetpack": false,
+                        "post_count": 3603,
+                        "subscribers_count": 35192480,
+                        "locale": "en",
+                        "icon": {
+                            "img": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace",
+                            "ico": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace"
+                        },
+                        "logo": {
+                            "id": 0,
+                            "sizes": [],
+                            "url": ""
+                        },
+                        "visible": true,
+                        "is_private": false,
+                        "is_following": true,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/help",
+                                "posts": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/",
+                                "comments": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/comments/",
+                                "xmlrpc": "https://discover.wordpress.com/xmlrpc.php"
+                            }
+                        }
+                    }
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "other_URLs": {},
+            "discover_metadata": {
+                "permalink": "https://baristahustle.com/",
+                "attribution": {
+                    "author_name": "Krista Stevens",
+                    "author_url": "https://baristahustle.com/",
+                    "blog_name": "Barista Hustle",
+                    "blog_url": "https://baristahustle.com",
+                    "avatar_url": "https://discover.files.wordpress.com/2019/05/bh-logo-new-512-1-400x400.png?w=100&h=100&crop=true"
+                },
+                "discover_fp_post_formats": [
+                    {
+                        "name": "Pick",
+                        "slug": "pick",
+                        "id": 346750
+                    },
+                    {
+                        "name": "Site Pick",
+                        "slug": "site-pick",
+                        "id": 308219249
+                    }
+                ],
+                "featured_post_wpcom_data": {
+                    "blog_id": 82609915
+                }
+            },
+            "feed_ID": 41325786,
+            "feed_URL": "http://discover.wordpress.com",
+            "pseudo_ID": "5344123ea1ee2da1788f11183966d068",
+            "is_external": false,
+            "site_name": "Discover",
+            "site_URL": "https://discover.wordpress.com",
+            "site_is_private": false,
+            "featured_media": {},
+            "use_excerpt": false,
+            "is_following_conversation": false
+        }
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 37123,
+            "site_ID": 53424024,
+            "author": {
+                "ID": 10183950,
+                "login": "cherilucas",
+                "email": false,
+                "name": "Cheri Lucas Rowlands",
+                "first_name": "Cheri",
+                "last_name": "Rowlands",
+                "nice_name": "cherilucas",
+                "URL": "http://cherilucasrowlands.com",
+                "avatar_URL": "https://0.gravatar.com/avatar/36207d4c7c014b0999b995ca3971d383?s=96&d=identicon&r=G",
+                "profile_URL": "http://en.gravatar.com/cherilucas",
+                "site_ID": 9838404,
+                "has_avatar": true
+            },
+            "date": "2019-05-24T09:00:50-04:00",
+            "modified": "2019-05-22T17:07:30-04:00",
+            "title": "Lonely Planet Kids",
+            "URL": "https://discover.wordpress.com/2019/05/24/lonely-planet-kids/",
+            "short_URL": "https://wp.me/p3Ca1O-9EL",
+            "content": "<p>Lonely Planet Kids &#8212; an offshoot of the popular travel guide company &#8211;inspires children to be curious about the world. The site features books, activities, family travel posts, and more.</p>\n",
+            "excerpt": "<p>Lonely Planet Kids &#8212; an offshoot of the popular travel guide company &#8211;inspires children to be curious about the world. The site features books, activities, family travel posts, and more.</p>\n",
+            "slug": "lonely-planet-kids",
+            "guid": "https://discover.wordpress.com/?p=37123",
+            "status": "publish",
+            "sticky": false,
+            "password": "",
+            "parent": false,
+            "type": "post",
+            "discussion": {
+                "comments_open": false,
+                "comment_status": "closed",
+                "pings_open": false,
+                "ping_status": "closed",
+                "comment_count": 0
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 49,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": true,
+            "global_ID": "12ac818a3de41e3b0cf84fea7efa2592",
+            "featured_image": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png",
+            "post_thumbnail": {
+                "ID": 37125,
+                "URL": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png",
+                "guid": "http://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png",
+                "mime_type": "image/png",
+                "width": 1434,
+                "height": 808
+            },
+            "format": "standard",
+            "geo": false,
+            "menu_order": 0,
+            "page_template": "",
+            "publicize_URLs": [],
+            "terms": {
+                "category": {
+                    "Books": {
+                        "ID": 178,
+                        "name": "Books",
+                        "slug": "books",
+                        "description": "Writing, reviews, resources, and news on books, authors, reading, and publishing.",
+                        "post_count": 233,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:books",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:books/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Education": {
+                        "ID": 1342,
+                        "name": "Education",
+                        "slug": "education",
+                        "description": "Resources across disciplines and perspectives on teaching, learning, and the educational system from educators, teachers, and parents.",
+                        "post_count": 121,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:education",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:education/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Exploration": {
+                        "ID": 7543,
+                        "name": "Exploration",
+                        "slug": "exploration",
+                        "description": "Writing and photography on travel, self-discovery, research, observation, and more.",
+                        "post_count": 147,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:exploration",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:exploration/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Family": {
+                        "ID": 406,
+                        "name": "Family",
+                        "slug": "family",
+                        "description": "Writing that encompasses aspects of family, including marriage, parenting, childhood, relationships, and ancestry.",
+                        "post_count": 226,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:family",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:family/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Inspiration": {
+                        "ID": 107,
+                        "name": "Inspiration",
+                        "slug": "inspiration",
+                        "description": "Ideas and advice to empower and motivate people – especially bloggers, writers, and creative types – in their personal or professional journeys.",
+                        "post_count": 327,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:inspiration",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:inspiration/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Parenting": {
+                        "ID": 5309,
+                        "name": "Parenting",
+                        "slug": "parenting",
+                        "description": "Writing and resources on parenting, motherhood, marriage, and family.",
+                        "post_count": 141,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:parenting",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:parenting/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Publishing": {
+                        "ID": 3330,
+                        "name": "Publishing",
+                        "slug": "publishing",
+                        "description": "Writers and editors discussing publishing-industry news, the ins and outs of the literary world, and their own journey to a published book.",
+                        "post_count": 124,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:publishing",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:publishing/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Reading": {
+                        "ID": 1473,
+                        "name": "Reading",
+                        "slug": "reading",
+                        "description": "Posts and book blogs that focus on authors, book reviews, and the pleasures of reading in the digital age.",
+                        "post_count": 143,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:reading",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:reading/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Travel": {
+                        "ID": 200,
+                        "name": "Travel",
+                        "slug": "travel",
+                        "description": "Blogs, online guides, and trip planning resources devoted to travel, exploration, the outdoors, expat life, and global culture.",
+                        "post_count": 247,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:travel",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:travel/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Wanderlust": {
+                        "ID": 13181,
+                        "name": "Wanderlust",
+                        "slug": "wanderlust",
+                        "description": "Stunning travel photography, travel and lifestyle sites, and blog posts on the joys and rewards of exploring new destinations.",
+                        "post_count": 97,
+                        "parent": 0,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:wanderlust",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:wanderlust/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_tag": {
+                    "activities": {
+                        "ID": 6751,
+                        "name": "activities",
+                        "slug": "activities",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:activities",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:activities/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "children": {
+                        "ID": 1343,
+                        "name": "children",
+                        "slug": "children",
+                        "description": "",
+                        "post_count": 28,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:children",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:children/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "family travel": {
+                        "ID": 421426,
+                        "name": "family travel",
+                        "slug": "family-travel",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:family-travel",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:family-travel/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "imagination": {
+                        "ID": 10906,
+                        "name": "imagination",
+                        "slug": "imagination",
+                        "description": "",
+                        "post_count": 7,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:imagination",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:imagination/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "kids": {
+                        "ID": 3374,
+                        "name": "kids",
+                        "slug": "kids",
+                        "description": "",
+                        "post_count": 14,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:kids",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:kids/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Lonely Planet": {
+                        "ID": 232853,
+                        "name": "Lonely Planet",
+                        "slug": "lonely-planet",
+                        "description": "",
+                        "post_count": 1,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:lonely-planet",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:lonely-planet/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    },
+                    "Teaching": {
+                        "ID": 1591,
+                        "name": "Teaching",
+                        "slug": "teaching",
+                        "description": "",
+                        "post_count": 2,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:teaching",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:teaching/help",
+                                "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                            }
+                        }
+                    }
+                },
+                "post_format": {},
+                "mentions": {}
+            },
+            "tags": {
+                "activities": {
+                    "ID": 6751,
+                    "name": "activities",
+                    "slug": "activities",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:activities",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:activities/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "activities"
+                },
+                "children": {
+                    "ID": 1343,
+                    "name": "children",
+                    "slug": "children",
+                    "description": "",
+                    "post_count": 28,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:children",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:children/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "children"
+                },
+                "family travel": {
+                    "ID": 421426,
+                    "name": "family travel",
+                    "slug": "family-travel",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:family-travel",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:family-travel/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "family-travel"
+                },
+                "imagination": {
+                    "ID": 10906,
+                    "name": "imagination",
+                    "slug": "imagination",
+                    "description": "",
+                    "post_count": 7,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:imagination",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:imagination/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "imagination"
+                },
+                "kids": {
+                    "ID": 3374,
+                    "name": "kids",
+                    "slug": "kids",
+                    "description": "",
+                    "post_count": 14,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:kids",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:kids/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "kids"
+                },
+                "Lonely Planet": {
+                    "ID": 232853,
+                    "name": "Lonely Planet",
+                    "slug": "lonely-planet",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:lonely-planet",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:lonely-planet/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "lonely-planet"
+                },
+                "Teaching": {
+                    "ID": 1591,
+                    "name": "Teaching",
+                    "slug": "teaching",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/tags/slug:teaching",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/tags/slug:teaching/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    },
+                    "display_name": "teaching"
+                }
+            },
+            "categories": {
+                "Books": {
+                    "ID": 178,
+                    "name": "Books",
+                    "slug": "books",
+                    "description": "Writing, reviews, resources, and news on books, authors, reading, and publishing.",
+                    "post_count": 233,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:books",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:books/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Education": {
+                    "ID": 1342,
+                    "name": "Education",
+                    "slug": "education",
+                    "description": "Resources across disciplines and perspectives on teaching, learning, and the educational system from educators, teachers, and parents.",
+                    "post_count": 121,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:education",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:education/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Exploration": {
+                    "ID": 7543,
+                    "name": "Exploration",
+                    "slug": "exploration",
+                    "description": "Writing and photography on travel, self-discovery, research, observation, and more.",
+                    "post_count": 147,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:exploration",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:exploration/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Family": {
+                    "ID": 406,
+                    "name": "Family",
+                    "slug": "family",
+                    "description": "Writing that encompasses aspects of family, including marriage, parenting, childhood, relationships, and ancestry.",
+                    "post_count": 226,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:family",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:family/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Inspiration": {
+                    "ID": 107,
+                    "name": "Inspiration",
+                    "slug": "inspiration",
+                    "description": "Ideas and advice to empower and motivate people – especially bloggers, writers, and creative types – in their personal or professional journeys.",
+                    "post_count": 327,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:inspiration",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:inspiration/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Parenting": {
+                    "ID": 5309,
+                    "name": "Parenting",
+                    "slug": "parenting",
+                    "description": "Writing and resources on parenting, motherhood, marriage, and family.",
+                    "post_count": 141,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:parenting",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:parenting/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Publishing": {
+                    "ID": 3330,
+                    "name": "Publishing",
+                    "slug": "publishing",
+                    "description": "Writers and editors discussing publishing-industry news, the ins and outs of the literary world, and their own journey to a published book.",
+                    "post_count": 124,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:publishing",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:publishing/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Reading": {
+                    "ID": 1473,
+                    "name": "Reading",
+                    "slug": "reading",
+                    "description": "Posts and book blogs that focus on authors, book reviews, and the pleasures of reading in the digital age.",
+                    "post_count": 143,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:reading",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:reading/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Travel": {
+                    "ID": 200,
+                    "name": "Travel",
+                    "slug": "travel",
+                    "description": "Blogs, online guides, and trip planning resources devoted to travel, exploration, the outdoors, expat life, and global culture.",
+                    "post_count": 247,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:travel",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:travel/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                },
+                "Wanderlust": {
+                    "ID": 13181,
+                    "name": "Wanderlust",
+                    "slug": "wanderlust",
+                    "description": "Stunning travel photography, travel and lifestyle sites, and blog posts on the joys and rewards of exploring new destinations.",
+                    "post_count": 97,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/categories/slug:wanderlust",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/categories/slug:wanderlust/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024"
+                        }
+                    }
+                }
+            },
+            "attachments": {
+                "37125": {
+                    "ID": 37125,
+                    "URL": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png",
+                    "guid": "http://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png",
+                    "date": "2019-05-10T18:53:26-04:00",
+                    "post_ID": 37123,
+                    "author_ID": 10183950,
+                    "file": "screen-shot-2019-05-10-at-3.53.09-pm.png",
+                    "mime_type": "image/png",
+                    "extension": "png",
+                    "title": "lonely planet kids header",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png?w=150",
+                        "medium": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png?w=315",
+                        "large": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png?w=1220"
+                    },
+                    "height": 808,
+                    "width": 1434,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "0",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37125",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37125/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37123"
+                        }
+                    }
+                },
+                "37126": {
+                    "ID": 37126,
+                    "URL": "https://discover.files.wordpress.com/2019/05/lonely-planet-kids-logo.png",
+                    "guid": "http://discover.files.wordpress.com/2019/05/lonely-planet-kids-logo.png",
+                    "date": "2019-05-10T18:53:28-04:00",
+                    "post_ID": 37123,
+                    "author_ID": 10183950,
+                    "file": "lonely-planet-kids-logo.png",
+                    "mime_type": "image/png",
+                    "extension": "png",
+                    "title": "lonely planet kids logo",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https://discover.files.wordpress.com/2019/05/lonely-planet-kids-logo.png?w=150",
+                        "medium": "https://discover.files.wordpress.com/2019/05/lonely-planet-kids-logo.png?w=315",
+                        "large": "https://discover.files.wordpress.com/2019/05/lonely-planet-kids-logo.png?w=400"
+                    },
+                    "height": 400,
+                    "width": 400,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "0",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37126",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/media/37126/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                            "parent": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37123"
+                        }
+                    }
+                }
+            },
+            "attachment_count": 2,
+            "metadata": [
+                {
+                    "id": "129821",
+                    "key": "geo_public",
+                    "value": "0"
+                },
+                {
+                    "id": "129818",
+                    "key": "_thumbnail_id",
+                    "value": "37125"
+                },
+                {
+                    "id": "130369",
+                    "key": "_wpas_done_17926349",
+                    "value": "1"
+                },
+                {
+                    "id": "129822",
+                    "key": "_wpas_mess",
+                    "value": "Lonely Planet Kids (@lpkids) inspires children to be curious about the world. The #PoweredByWordPress site features children's books, activities, family travel resources, and more."
+                }
+            ],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}/rest/v1.1/read/sites/53424024/posts/37123",
+                    "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/37123/help",
+                    "site": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                    "replies": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37123/replies/",
+                    "likes": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/posts/37123/likes/"
+                },
+                "data": {
+                    "site": {
+                        "ID": 53424024,
+                        "name": "Discover",
+                        "description": "A daily selection of the best content published on WordPress, collected for you by humans who love to read.",
+                        "URL": "https://discover.wordpress.com",
+                        "jetpack": false,
+                        "post_count": 3603,
+                        "subscribers_count": 35192480,
+                        "locale": "en",
+                        "icon": {
+                            "img": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace",
+                            "ico": "https://secure.gravatar.com/blavatar/c9e4e04719c81ca4936a63ea2dce6ace"
+                        },
+                        "logo": {
+                            "id": 0,
+                            "sizes": [],
+                            "url": ""
+                        },
+                        "visible": true,
+                        "is_private": false,
+                        "is_following": true,
+                        "meta": {
+                            "links": {
+                                "self": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024",
+                                "help": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/help",
+                                "posts": "{{request.requestLine.baseUrl}}/rest/v1.2/sites/53424024/posts/",
+                                "comments": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/53424024/comments/",
+                                "xmlrpc": "https://discover.wordpress.com/xmlrpc.php"
+                            }
+                        }
+                    }
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "other_URLs": {},
+            "discover_metadata": {
+                "permalink": "https://www.lonelyplanet.com/kids/",
+                "attribution": {
+                    "author_name": "Contributors",
+                    "author_url": "https://www.lonelyplanet.com/kids/about/",
+                    "blog_name": "Lonely Planet Kids",
+                    "blog_url": "https://www.lonelyplanet.com",
+                    "avatar_url": "https://discover.files.wordpress.com/2019/05/lonely-planet-kids-logo.png?w=100&h=100&crop=true"
+                },
+                "discover_fp_post_formats": [
+                    {
+                        "name": "Pick",
+                        "slug": "pick",
+                        "id": 346750
+                    },
+                    {
+                        "name": "Site Pick",
+                        "slug": "site-pick",
+                        "id": 308219249
+                    }
+                ]
+            },
+            "feed_ID": 41325786,
+            "feed_URL": "http://discover.wordpress.com",
+            "pseudo_ID": "12ac818a3de41e3b0cf84fea7efa2592",
+            "is_external": false,
+            "site_name": "Discover",
+            "site_URL": "https://discover.wordpress.com",
+            "site_is_private": false,
+            "featured_media": {
+                "uri": "https://discover.files.wordpress.com/2019/05/screen-shot-2019-05-10-at-3.53.09-pm.png",
+                "width": 1434,
+                "height": 808,
+                "type": "image"
+            },
+            "use_excerpt": false,
+            "is_following_conversation": false
+        }
+    }, {
+        "type": "recommended_blogs",
+        "data": [{
+            "description": "A South Staffordshire Wildlife Journal",
+            "feed_ID": 49407045,
+            "feed_URL": "http:\/\/petehillmansnaturephotography.wordpress.com",
+            "icon": {
+                "img": "https:\/\/petehillmansnaturephotography.files.wordpress.com\/2020\/09\/cropped-peter-hillman-a-nature-journey.jpg?w=96",
+                "ico": "https:\/\/petehillmansnaturephotography.files.wordpress.com\/2020\/09\/cropped-peter-hillman-a-nature-journey.jpg?w=96"
+            },
+            "ID": 112482965,
+            "is_private": false,
+            "jetpack": false,
+            "name": "A Nature Journey",
+            "prefer_feed": false,
+            "subscribers_count": 1968,
+            "subscription": {
+                "delivery_methods": {
+                    "email": null,
+                    "notification": {
+                        "send_posts": false
+                    }
+                }
+            },
+            "URL": "http:\/\/petehillmansnaturephotography.wordpress.com"
+        }, {
+            "description": "Jane's Lens",
+            "feed_ID": 1366484,
+            "feed_URL": "http:\/\/janeluriephotography.wordpress.com",
+            "icon": {
+                "img": "https:\/\/secure.gravatar.com\/blavatar\/3d272d8f6c1070fe12a4b778f2058c72",
+                "ico": "https:\/\/secure.gravatar.com\/blavatar\/3d272d8f6c1070fe12a4b778f2058c72"
+            },
+            "ID": 26839598,
+            "is_private": false,
+            "jetpack": false,
+            "name": "Jane Lurie Photography",
+            "prefer_feed": false,
+            "subscribers_count": 6920,
+            "subscription": {
+                "delivery_methods": {
+                    "email": null,
+                    "notification": {
+                        "send_posts": false
+                    }
+                }
+            },
+            "URL": "http:\/\/janeluriephotography.wordpress.com"
+        }]
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 10046,
+            "site_ID": 28958452,
+            "author": {
+                "ID": 28500267,
+                "login": "terriwebsterschrandt",
+                "email": false,
+                "name": "Terri Webster Schrandt",
+                "first_name": "Terri",
+                "last_name": "Webster Schrandt",
+                "nice_name": "terriwebsterschrandt",
+                "URL": "http:\/\/terriwebsterschrandt.wordpress.com",
+                "avatar_URL": "https:\/\/2.gravatar.com\/avatar\/8870e170782893e9891d83bc57e9c8df?s=96&d=retro&r=G",
+                "profile_URL": "https:\/\/en.gravatar.com\/terriwebsterschrandt",
+                "site_ID": 28958452,
+                "has_avatar": true
+            },
+            "date": "2020-09-27T07:00:00-07:00",
+            "modified": "2020-09-26T16:05:26-07:00",
+            "title": "Sunday Stills: Wishing for Water, But #Droplets Will Do",
+            "URL": "https:\/\/secondwindleisure.com\/2020\/09\/27\/sunday-stills-wishing-for-water-but-droplets-will-do\/",
+            "short_URL": "https:\/\/wp.me\/p1XvpO-2C2",
+            "content": "\n<p>My return to blogging was fun and satisfying after a tumultuous break! Thank you for welcoming me back last week. It was great to catch up with you!<\/p>\n\n\n\n<p>If you are confused by this week\u2019s Sunday Stills post, we are examining the world of water droplets. In my dry, still excessively warm part of the world, if I want water, I must turn on the garden hose. Artificially produced water droplets will work! <\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"10043\" data-permalink=\"https:\/\/secondwindleisure.com\/2019-daisy_drops\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg\" data-orig-size=\"1000,1333\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.7&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G935V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1558430309&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.2&quot;,&quot;iso&quot;:&quot;40&quot;,&quot;shutter_speed&quot;:&quot;0.00032894736842105&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"2019 Daisy_drops\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=225\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=768\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=640\" alt=\"End of summer daisy\" class=\"wp-image-10043\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=113 113w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=225 225w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2019-daisy_drops-e1600906288397.jpg 1000w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure>\n\n\n\n<p>After the few weeks of turmoil I recently experienced, I find calm and peace in my backyard garden any time of year. <\/p>\n\n\n\n<p>During our recent visit to Spokane, a few raindrops made their presence known by the end of the week.<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"10044\" data-permalink=\"https:\/\/secondwindleisure.com\/2020_spokane_waterdrops\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg\" data-orig-size=\"3024,3024\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;2.4&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-N975U&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1600346109&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.3&quot;,&quot;iso&quot;:&quot;50&quot;,&quot;shutter_speed&quot;:&quot;0.0040983606557377&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"2020_spokane_waterdrops\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=640\" alt=\"Evergreen with water drops\" class=\"wp-image-10044\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=1280 1280w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg?w=1024 1024w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure>\n\n\n\n<p>After a long, dry spell, my current library of water droplets is depleted, so please enjoy a few of my favorites from the past:<\/p>\n\n\n\n<figure class=\"wp-block-image size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"7814\" data-permalink=\"https:\/\/secondwindleisure.com\/2018\/05\/18\/the-nature-of-liquid\/dropoyellow\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg\" data-orig-size=\"2345,2521\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.7&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G935V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1519994225&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.2&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"dropoyellow\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=279\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=953\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=640\" alt=\"House in a droplet\" class=\"wp-image-7814\" width=\"569\" height=\"611\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=569 569w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=1138 1138w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=140 140w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=279 279w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2018\/05\/dropoyellow.jpg?w=953 953w\" sizes=\"(max-width: 569px) 100vw, 569px\" \/><\/figure>\n\n\n\n<p>My plumeria blossomed last year but no blooms this year. I\u2019m pretty sure I blew up social media and my blog with images of plumeria last summer. Here are a couple donning their droplets from daily backyard watering.<\/p>\n\n\n\n<figure class=\"wp-block-gallery columns-2 is-cropped\"><ul data-carousel-extra='{\"blog_id\":28958452,\"permalink\":\"https:\\\/\\\/secondwindleisure.com\\\/2020\\\/09\\\/27\\\/sunday-stills-wishing-for-water-but-droplets-will-do\\\/\"}' class=\"blocks-gallery-grid\"><li class=\"blocks-gallery-item\"><figure><img data-attachment-id=\"10042\" data-permalink=\"https:\/\/secondwindleisure.com\/plumeria_drops2_2019\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg\" data-orig-size=\"1000,1202\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.7&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G935V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1564764465&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.2&quot;,&quot;iso&quot;:&quot;64&quot;,&quot;shutter_speed&quot;:&quot;0.0083333333333333&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"plumeria_drops2_2019\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=250\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=852\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=640\" alt=\"Pink plumeria with water drops\" data-id=\"10042\" data-link=\"http:\/\/secondwindleisure.com\/plumeria_drops2_2019\/\" class=\"wp-image-10042\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=125 125w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=250 250w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/plumeria_drops2_2019-e1600906332570.jpg 1000w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure><\/li><li class=\"blocks-gallery-item\"><figure><img data-attachment-id=\"9633\" data-permalink=\"https:\/\/secondwindleisure.com\/_plumeria_pink_drops2019\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg\" data-orig-size=\"2160,2160\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.7&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G935V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1563895347&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.2&quot;,&quot;iso&quot;:&quot;40&quot;,&quot;shutter_speed&quot;:&quot;0.0021141649048626&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"_plumeria_pink_drops2019\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=640\" alt=\"Drops on Top\" data-id=\"9633\" data-link=\"http:\/\/secondwindleisure.com\/_plumeria_pink_drops2019\/\" class=\"wp-image-9633\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=1280 1280w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/plumeria_pink_drops2019.jpg?w=1024 1024w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure><\/li><\/ul><\/figure>\n\n\n\n<p>More flowers from my backyard include the Teddy Bear sunflower and the geranium in my deck garden.<\/p>\n\n\n\n<figure class=\"wp-block-gallery columns-2 is-cropped\"><ul data-carousel-extra='{\"blog_id\":28958452,\"permalink\":\"https:\\\/\\\/secondwindleisure.com\\\/2020\\\/09\\\/27\\\/sunday-stills-wishing-for-water-but-droplets-will-do\\\/\"}' class=\"blocks-gallery-grid\"><li class=\"blocks-gallery-item\"><figure><img data-attachment-id=\"9130\" data-permalink=\"https:\/\/secondwindleisure.com\/lastteddy_sunflower_2019\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg\" data-orig-size=\"2160,2437\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.7&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G935V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1567761597&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.2&quot;,&quot;iso&quot;:&quot;40&quot;,&quot;shutter_speed&quot;:&quot;0.00095057034220532&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"LastTeddy_sunflower_2019\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=266\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=908\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=640\" alt=\"Last teddy sunflower of the summer\" data-id=\"9130\" data-link=\"http:\/\/secondwindleisure.com\/lastteddy_sunflower_2019\/\" class=\"wp-image-9130\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=1280 1280w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=133 133w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=266 266w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2019\/09\/lastteddy_sunflower_2019.jpg?w=908 908w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure><\/li><li class=\"blocks-gallery-item\"><figure><img data-attachment-id=\"9637\" data-permalink=\"https:\/\/secondwindleisure.com\/2019-03-02-geraniumdrop2\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg\" data-orig-size=\"2160,2160\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.7&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G935V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1551539892&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.2&quot;,&quot;iso&quot;:&quot;50&quot;,&quot;shutter_speed&quot;:&quot;0.0083333333333333&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"2019-03-02 geraniumdrop2\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=640\" alt=\"Geranium Drops\" data-id=\"9637\" data-link=\"http:\/\/secondwindleisure.com\/2019-03-02-geraniumdrop2\/\" class=\"wp-image-9637\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=1280 1280w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/04\/2019-03-02-geraniumdrop2.jpg?w=1024 1024w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure><\/li><\/ul><\/figure>\n\n\n\n<p>Hint: I&#8217;m sure it&#8217;s no secret, but if you need an image with water droplets pronto, use a mister or spray bottle and create your own droplets.<\/p>\n\n\n\n<p><em>If close-ups of water droplets aren&#8217;t your style, I included a couple of shots of suspended water drops: <\/em><\/p>\n\n\n\n<p>Catching a wall of water drops in Baja Mexico. <\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"3592\" data-permalink=\"https:\/\/secondwindleisure.com\/2018\/08\/26\/sunday-stills-water-water-everywhere-my-paddleboard-can-shrink\/water-becomes-weightless\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg\" data-orig-size=\"3178,2396\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;2.2&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G900V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1452504576&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.8&quot;,&quot;iso&quot;:&quot;40&quot;,&quot;shutter_speed&quot;:&quot;0.0004416961130742&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Water becomes weightless\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=640\" alt=\"Weightless water\" class=\"wp-image-3592\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=1280 1280w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2016\/01\/water-becomes-weightless.jpg?w=1024 1024w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure>\n\n\n\n<p><br>I have to share this one again of Brodie romping through the river, stirring up loads of droplets.<\/p>\n\n\n\n<figure class=\"wp-block-image size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"7511\" data-permalink=\"https:\/\/secondwindleisure.com\/2017\/11\/24\/the-transformations-of-dogs-and-trees\/brodies-first-water-experience\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg\" data-orig-size=\"471,443\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;4&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;DMC-FZ300&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1493474351&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;23.5&quot;,&quot;iso&quot;:&quot;100&quot;,&quot;shutter_speed&quot;:&quot;0.0015625&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"Brodie&#8217;s First Water Experience\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg?w=471\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg\" alt=\"Brodie's First Water Experience\" class=\"wp-image-7511\" width=\"535\" height=\"503\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg 471w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg?w=150&amp;h=141 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/11\/brodies-first-water-experience.jpg?w=300&amp;h=282 300w\" sizes=\"(max-width: 535px) 100vw, 535px\" \/><\/figure>\n\n\n\n<p>No doubt, Spring has sprung in the Southern Hemisphere along with lots of opportunities to see water droplets in action. The calendar says that Autumn is here in the Northern Hemisphere, but we won&#8217;t see scenes like this in California until November!<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"7272\" data-permalink=\"https:\/\/secondwindleisure.com\/2017\/09\/22\/layers-of-autumn\/layers-and-drops\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg\" data-orig-size=\"2346,3128\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;2.2&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;SM-G900V&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1445085696&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;4.8&quot;,&quot;iso&quot;:&quot;40&quot;,&quot;shutter_speed&quot;:&quot;0.033333333333333&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"layers and drops\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=225\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=768\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=640\" alt=\"Layers of drops on layers of leaves\" class=\"wp-image-7272\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=640 640w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=1280 1280w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=113 113w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=225 225w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2017\/09\/layers-and-drops.jpg?w=768 768w\" sizes=\"(max-width: 640px) 100vw, 640px\" \/><\/figure>\n\n\n\n<p>As you know I also love taking part in other photo challenges and I love it when the planets align. I have been wanting to join <strong><a rel=\"noreferrer noopener\" href=\"https:\/\/oureyesopen.blog\/2020\/09\/25\/bird-weekly-photo-challenge-short-legged-birds\/\" target=\"_blank\">Lisa\u2019s Bird Weekly Challenge <\/a><\/strong>since I recently discovered it. Back in August, my lens captured this cute duck family (common merganser) out for a swim on Grant Lake in the June Lake loop in the Eastern Sierra Nevadas. <\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"10060\" data-permalink=\"https:\/\/secondwindleisure.com\/2020_mammothducks2\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg\" data-orig-size=\"3221,2853\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;6.3&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;Canon PowerShot SX610 HS&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1596285407&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;65.612&quot;,&quot;iso&quot;:&quot;80&quot;,&quot;shutter_speed&quot;:&quot;0.008&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"2020_mammothducks2\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=1024\" alt=\"\" class=\"wp-image-10060\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=1024 1024w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=2048 2048w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothducks2.jpg?w=768 768w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<p>Yes, it\u2019s a bit of a stretch but my Canon Sureshot managed to capture water droplets on the feathers of the adult duck, seen best in the pic below. (Best I could do, Lisa, I think their legs are short enough)!<\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"10061\" data-permalink=\"https:\/\/secondwindleisure.com\/2020_mammothduck\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png\" data-orig-size=\"1818,1818\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"2020_mammothduck\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=1024\" alt=\"\" class=\"wp-image-10061\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=1024 1024w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_mammothduck.png 1818w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<p>Today&#8217;s images are partly inspired by two other fab photographers: <a href=\"https:\/\/ceenphotography.com\/2020\/09\/24\/fotd-september-25-zinnia\/\" target=\"_blank\" rel=\"noreferrer noopener\"><strong>Cee&#8217;s Flower of the Day<\/strong> <\/a>and <strong><a href=\"https:\/\/jezbraithwaite.blog\/2020\/09\/21\/full-speed-ahead-water-water-everywhere-46\/\" target=\"_blank\" rel=\"noreferrer noopener\">Jez&#8217; Water, Water Everywhere<\/a><\/strong>.<\/p>\n\n\n\n<p class=\"has-pale-cyan-blue-background-color has-background\">I\u2019m hoping to live vicariously through your wonderful images of water droplets on flowers, plants, animals, whatever! Walls of water droplets cascading down from waves and fountains and other watery images also fit this week&#8217;s theme.<\/p>\n\n\n<h4 class=\"wp-block-block\">Sunday Stills Photo Challenge Reminders<\/h4>\n\n<ul class=\"wp-block-block\"><li>Please create a new post for the theme.<\/li><li> Title your post a little differently than mine.<\/li><li> Don\u2019t forget to create a pingback to this post so that other participants can read your post. I also recommend adding your post\u2019s URL into the comments.<\/li><li> Entries for this theme can be shared all week. Use hashtag #SundayStills for sharing on social media.<\/li><\/ul>\n\n\n<p class=\"has-cyan-bluish-gray-background-color has-background\">October themes are ready to view on my <strong><a href=\"https:\/\/secondwindleisure.com\/photography\/sunday-stills-photo-challenge\/\" target=\"_blank\" rel=\"noreferrer noopener\">Sunday Stills page<\/a><\/strong>.<\/p>\n\n\n\n<div data-carousel-extra='{\"blog_id\":28958452,\"permalink\":\"https:\\\/\\\/secondwindleisure.com\\\/2020\\\/09\\\/27\\\/sunday-stills-wishing-for-water-but-droplets-will-do\\\/\"}' class=\"wp-block-image\"><figure class=\"aligncenter size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"10067\" data-permalink=\"https:\/\/secondwindleisure.com\/cp-drops\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png\" data-orig-size=\"1080,1080\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"CP drops\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=640\" alt=\"\" class=\"wp-image-10067\" width=\"342\" height=\"342\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=342 342w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=684 684w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png?w=300 300w\" sizes=\"(max-width: 342px) 100vw, 342px\" \/><figcaption>Original image Color Planet<\/figcaption><\/figure><\/div>\n\n\n\n<p>I look forward to you sharing your images of refreshing water droplets in whatever form they might take. Have a great week!<\/p>\n\n\n\n<figure class=\"wp-block-image size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"9870\" data-permalink=\"https:\/\/secondwindleisure.com\/facebook-group-cover\/\" data-orig-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png\" data-orig-size=\"1640,856\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"SUP Signature\" data-image-description=\"\" data-medium-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=300\" data-large-file=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=1024\" src=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=640\" alt=\"SUPSIG\" class=\"wp-image-9870\" width=\"562\" height=\"293\" srcset=\"https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=562 562w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=1124 1124w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=150 150w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=300 300w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=768 768w, https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/06\/facebook-group-cover.png?w=1024 1024w\" sizes=\"(max-width: 562px) 100vw, 562px\" \/><\/figure>\n\n\n\n<p class=\"has-small-font-size\"><strong>\u00a9 2020 Copyright-All rights reserved-secondwindleisure.com<\/strong><\/p>\n",
+            "excerpt": "<p>My return to blogging was fun and satisfying after a tumultuous break! Thank you for welcoming me back last week. It was great to catch up with you! If you are confused by this week\u2019s Sunday Stills post, we are examining the world of water droplets. In my dry, still excessively warm part of the [&hellip;]<\/p>\n",
+            "slug": "sunday-stills-wishing-for-water-but-droplets-will-do",
+            "guid": "http:\/\/secondwindleisure.com\/?p=10046",
+            "status": "publish",
+            "discussion": {
+                "comments_open": true,
+                "comment_status": "open",
+                "pings_open": true,
+                "ping_status": "open",
+                "comment_count": 80
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 77,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": false,
+            "global_ID": "6295b4c918b214147d966e6e8c6fe18e",
+            "featured_image": "https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png",
+            "post_thumbnail": {
+                "ID": 10067,
+                "URL": "https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png",
+                "guid": "http:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/cp-drops.png",
+                "mime_type": "image\/png",
+                "width": 1080,
+                "height": 1080
+            },
+            "format": "standard",
+            "tags": {
+                "birdweekly": {
+                    "ID": 701015324,
+                    "name": "birdweekly",
+                    "slug": "birdweekly",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:birdweekly",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:birdweekly\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "Cees FOTD": {
+                    "ID": 652598373,
+                    "name": "Cees FOTD",
+                    "slug": "cees-fotd",
+                    "description": "",
+                    "post_count": 19,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:cees-fotd",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:cees-fotd\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "gardening": {
+                    "ID": 1833,
+                    "name": "gardening",
+                    "slug": "gardening",
+                    "description": "",
+                    "post_count": 5,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:gardening",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:gardening\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "Mammoth Lakes": {
+                    "ID": 964261,
+                    "name": "Mammoth Lakes",
+                    "slug": "mammoth-lakes",
+                    "description": "",
+                    "post_count": 4,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:mammoth-lakes",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:mammoth-lakes\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "photography": {
+                    "ID": 436,
+                    "name": "photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 345,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "photography challenges": {
+                    "ID": 1009473,
+                    "name": "photography challenges",
+                    "slug": "photography-challenges",
+                    "description": "",
+                    "post_count": 33,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:photography-challenges",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:photography-challenges\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "plumeria": {
+                    "ID": 616561,
+                    "name": "plumeria",
+                    "slug": "plumeria",
+                    "description": "",
+                    "post_count": 8,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:plumeria",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:plumeria\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "Sunday Stills": {
+                    "ID": 11911599,
+                    "name": "Sunday Stills",
+                    "slug": "sunday-stills",
+                    "description": "",
+                    "post_count": 131,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:sunday-stills",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:sunday-stills\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "water": {
+                    "ID": 14157,
+                    "name": "water",
+                    "slug": "water",
+                    "description": "",
+                    "post_count": 14,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:water",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:water\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "water droplets": {
+                    "ID": 450032,
+                    "name": "water droplets",
+                    "slug": "water-droplets",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/tags\/slug:water-droplets",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/tags\/slug:water-droplets\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                }
+            },
+            "categories": {
+                "leisure": {
+                    "ID": 3172,
+                    "name": "leisure",
+                    "slug": "leisure",
+                    "description": "",
+                    "post_count": 346,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/categories\/slug:leisure",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/categories\/slug:leisure\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "photography": {
+                    "ID": 436,
+                    "name": "photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 454,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/categories\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/categories\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                },
+                "weekly photo challenge": {
+                    "ID": 5114028,
+                    "name": "weekly photo challenge",
+                    "slug": "weekly-photo-challenge",
+                    "description": "",
+                    "post_count": 79,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/categories\/slug:weekly-photo-challenge",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/categories\/slug:weekly-photo-challenge\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452"
+                        }
+                    }
+                }
+            },
+            "attachments": {},
+            "attachment_count": 0,
+            "metadata": [],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/read\/sites\/28958452\/posts\/10046",
+                    "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28958452\/posts\/10046\/help",
+                    "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28958452",
+                    "replies": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/posts\/10046\/replies\/",
+                    "likes": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28958452\/posts\/10046\/likes\/"
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "is_seen": false,
+            "feed_ID": 55643820,
+            "feed_URL": "http:\/\/secondwindleisure.com",
+            "pseudo_ID": "6295b4c918b214147d966e6e8c6fe18e",
+            "is_external": false,
+            "site_name": "Second Wind Leisure Perspectives",
+            "site_URL": "https:\/\/secondwindleisure.com",
+            "site_is_private": false,
+            "featured_media": {
+                "uri": "https:\/\/terriwebsterschrandt.files.wordpress.com\/2020\/09\/2020_spokane_waterdrops.jpg",
+                "width": 0,
+                "height": 0,
+                "type": "image"
+            },
+            "use_excerpt": false
+        }
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 1007,
+            "site_ID": 60412660,
+            "author": {
+                "ID": 57807571,
+                "login": "singhpiyush6089",
+                "email": false,
+                "name": "singhpiyush6089",
+                "first_name": "Piyush",
+                "last_name": "Singh",
+                "nice_name": "singhpiyush6089",
+                "URL": "http:\/\/theperceptionssquare.com",
+                "avatar_URL": "https:\/\/0.gravatar.com\/avatar\/fbfa5fcddc8bbef89657e331658e648c?s=96&d=identicon&r=G",
+                "profile_URL": "https:\/\/en.gravatar.com\/singhpiyush6089",
+                "site_ID": 60412660,
+                "has_avatar": true
+            },
+            "date": "2020-09-26T13:31:59+00:00",
+            "modified": "2020-09-26T13:47:39+00:00",
+            "title": "In Between the Shadows",
+            "URL": "https:\/\/theperceptionssquare.com\/2020\/09\/26\/in-between-the-shadows\/",
+            "short_URL": "https:\/\/wp.me\/p45u5K-gf",
+            "content": "\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"1006\" data-permalink=\"https:\/\/theperceptionssquare.com\/img_20200829_140232_624\/\" data-orig-file=\"https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg\" data-orig-size=\"3120,3120\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;0&quot;}\" data-image-title=\"IMG_20200829_140232_624.jpg\" data-image-description=\"\" data-medium-file=\"https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=300\" data-large-file=\"https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=1024\" src=\"https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=1024\" alt=\"\" class=\"wp-image-1006\" srcset=\"https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=1024 1024w, https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=2048 2048w, https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=150 150w, https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=300 300w, https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg?w=768 768w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><\/figure>\n\n\n\n<p><em>In between the shadows,<\/em><br><em>In the midst of darkness<\/em><br><em>And grief , I desire to survive,<\/em><br><em>I persevere hollowness of life.<\/em><br><em>My strength is that<\/em><br><em>Ray of sunshine who<\/em><br><em>Itself is persevering,<\/em><br><em>Piercing through darkness<\/em><br><em>And my grief, breaking barriers<\/em><br><em>And finally reaches me<\/em> !<\/p>\n\n\n\n<p>\u00a92020 Piyush Singh<\/p>\n",
+            "excerpt": "<p>In between the shadows,In the midst of darknessAnd grief , I desire to survive,I persevere hollowness of life.My strength is thatRay of sunshine whoItself is persevering,Piercing through darknessAnd my grief, breaking barriersAnd finally reaches me ! \u00a92020 Piyush Singh<\/p>\n",
+            "slug": "in-between-the-shadows",
+            "guid": "http:\/\/theperceptionssquare.com\/?p=1007",
+            "status": "publish",
+            "discussion": {
+                "comments_open": true,
+                "comment_status": "open",
+                "pings_open": true,
+                "ping_status": "open",
+                "comment_count": 42
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 167,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": false,
+            "global_ID": "2669cbf58f34e7d71da5e939657d1d4f",
+            "featured_image": "",
+            "post_thumbnail": null,
+            "format": "standard",
+            "tags": {
+                "#quotes": {
+                    "ID": 755,
+                    "name": "#quotes",
+                    "slug": "quotes",
+                    "description": "",
+                    "post_count": 68,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/tags\/slug:quotes",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/tags\/slug:quotes\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                },
+                "blogging": {
+                    "ID": 91,
+                    "name": "blogging",
+                    "slug": "blogging",
+                    "description": "",
+                    "post_count": 60,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/tags\/slug:blogging",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/tags\/slug:blogging\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                },
+                "nature": {
+                    "ID": 1099,
+                    "name": "nature",
+                    "slug": "nature",
+                    "description": "",
+                    "post_count": 20,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/tags\/slug:nature",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/tags\/slug:nature\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                },
+                "photography": {
+                    "ID": 436,
+                    "name": "photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 89,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/tags\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/tags\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                },
+                "poetry": {
+                    "ID": 422,
+                    "name": "poetry",
+                    "slug": "poetry",
+                    "description": "",
+                    "post_count": 122,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/tags\/slug:poetry",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/tags\/slug:poetry\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                }
+            },
+            "categories": {
+                "photography": {
+                    "ID": 436,
+                    "name": "photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 66,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/categories\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/categories\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                },
+                "poetry": {
+                    "ID": 422,
+                    "name": "poetry",
+                    "slug": "poetry",
+                    "description": "",
+                    "post_count": 128,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/categories\/slug:poetry",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/categories\/slug:poetry\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                },
+                "Uncategorized": {
+                    "ID": 1,
+                    "name": "Uncategorized",
+                    "slug": "uncategorized",
+                    "description": "",
+                    "post_count": 32,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/categories\/slug:uncategorized",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/categories\/slug:uncategorized\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660"
+                        }
+                    }
+                }
+            },
+            "attachments": {},
+            "attachment_count": 0,
+            "metadata": false,
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/read\/sites\/60412660\/posts\/1007",
+                    "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/60412660\/posts\/1007\/help",
+                    "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/60412660",
+                    "replies": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/posts\/1007\/replies\/",
+                    "likes": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/60412660\/posts\/1007\/likes\/"
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "is_seen": false,
+            "feed_ID": 103168091,
+            "feed_URL": "http:\/\/theperceptionssquare.com",
+            "pseudo_ID": "2669cbf58f34e7d71da5e939657d1d4f",
+            "is_external": false,
+            "site_name": "The Perceptions Square",
+            "site_URL": "https:\/\/theperceptionssquare.com",
+            "site_is_private": false,
+            "featured_media": {
+                "uri": "https:\/\/singhpiyush6089.files.wordpress.com\/2020\/08\/img_20200829_140232_624.jpg",
+                "width": 0,
+                "height": 0,
+                "type": "image"
+            },
+            "use_excerpt": false
+        }
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 20653,
+            "site_ID": 28002157,
+            "author": {
+                "ID": 27562902,
+                "login": "marinakanavaki",
+                "email": false,
+                "name": "marina kanavaki",
+                "first_name": "Marina Artemis",
+                "last_name": "Kanavaki",
+                "nice_name": "marinakanavaki",
+                "URL": "http:\/\/marinakanavaki.wordpress.com",
+                "avatar_URL": "https:\/\/1.gravatar.com\/avatar\/4a0d3606785602212228493e899bc8a2?s=96&d=identicon&r=G",
+                "profile_URL": "https:\/\/en.gravatar.com\/marinakanavaki",
+                "site_ID": 28002157,
+                "has_avatar": true
+            },
+            "date": "2020-09-22T16:50:42+03:00",
+            "modified": "2020-09-22T16:50:42+03:00",
+            "title": "Autumnal [Fall] Equinox 2020",
+            "URL": "https:\/\/marinakanavaki.com\/2020\/09\/22\/autumnal-fall-equinox-2020\/",
+            "short_URL": "https:\/\/wp.me\/p1TuDH-5n7",
+            "content": "\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20676\" data-permalink=\"https:\/\/marinakanavaki.com\/fall-equinox-2020\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg\" data-orig-size=\"1956,1956\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;7.1&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1525414219&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;200&quot;,&quot;iso&quot;:&quot;100&quot;,&quot;shutter_speed&quot;:&quot;0.0005&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"fall-equinox-2020\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=1024\" alt=\"\" class=\"wp-image-20676\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><figcaption>Sunrise &amp; Sunset merged<\/figcaption><\/figure><\/div>\n\n\n\n<h4><em>The time of the year when the Sun shines directly on the Equator and the length of day and night is almost equal, marking the first day of Autumn in the Northern Hemisphere and the first day of Spring in the Southern Hemisphere.<\/em><\/h4>\n\n\n\n<h4><em>Autumn over here and my favorite season too. There&#8217;s a special kind of quiet this season, accompanied by a burst of fiery colors, very dear to me.<\/em><\/h4>\n\n\n\n<h2><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><\/span><\/h2>\n\n\n\n<h6>Moon Phase: Waxing Crescent <span style=\"color:#ff9900;\">\u2022<\/span> Visible: 33%\u2191 <span style=\"color:#ff9900;\">\u2022<\/span> Age: 5,72 days \u2022 Moon Distance: 368,382.09 km<\/h6>\n\n\n\n<h2><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span><\/h2>\n\n\n\n<h4><em>This Equinox,<\/em><\/h4>\n\n\n\n<h4><em>I decided to do<\/em><\/h4>\n\n\n\n<h4><em>the Sun and the Moon,<\/em><\/h4>\n\n\n\n<h4><em>side by side<\/em><\/h4>\n\n\n\n<h4><em>in similar &#8230;moods.<\/em><\/h4>\n\n\n\n<p><\/p>\n\n\n\n<h3><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span>  Sun and clouds<\/h3>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20659\" data-permalink=\"https:\/\/marinakanavaki.com\/sun-for-equinox\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg\" data-orig-size=\"1956,1956\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;7.1&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1523862002&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;200&quot;,&quot;iso&quot;:&quot;100&quot;,&quot;shutter_speed&quot;:&quot;0.0005&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"sun-for-equinox\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=1024\" alt=\"\" class=\"wp-image-20659\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sun-for-equinox.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><\/figure><\/div>\n\n\n\n<h3><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><\/span>  Moon and clouds<\/h3>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20660\" data-permalink=\"https:\/\/marinakanavaki.com\/moon-for-equinox\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg\" data-orig-size=\"1956,1956\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;5.6&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1514920200&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;200&quot;,&quot;iso&quot;:&quot;3200&quot;,&quot;shutter_speed&quot;:&quot;0.02&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"moon-for-equinox\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=1024\" alt=\"\" class=\"wp-image-20660\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moon-for-equinox.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><\/figure><\/div>\n\n\n\n<h3><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span>  Sun bokeh<\/h3>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20662\" data-permalink=\"https:\/\/marinakanavaki.com\/sunbokeh-for-equinox\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg\" data-orig-size=\"1956,1956\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;7.1&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1519716277&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;102&quot;,&quot;iso&quot;:&quot;100&quot;,&quot;shutter_speed&quot;:&quot;0.0005&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"sunbokeh-for-equinox\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=1024\" alt=\"\" class=\"wp-image-20662\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunbokeh-for-equinox.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><\/figure><\/div>\n\n\n\n<h3><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><\/span>  Moon bokeh<\/h3>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20663\" data-permalink=\"https:\/\/marinakanavaki.com\/moonbokeh-for-equinox\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg\" data-orig-size=\"1956,1956\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;4.5&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1568578587&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;100&quot;,&quot;iso&quot;:&quot;800&quot;,&quot;shutter_speed&quot;:&quot;0.33333333333333&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"moonbokeh-for-equinox\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=1024\" alt=\"\" class=\"wp-image-20663\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/moonbokeh-for-equinox.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><\/figure><\/div>\n\n\n\n<p><\/p>\n\n\n\n<p><\/p>\n\n\n\n<h2><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><\/h2>\n\n\n\n<h3><em>Finally, a day beginning and a day ending,<\/em><\/h3>\n\n\n\n<h5><em>before they merge into one image [top]<\/em><\/h5>\n\n\n\n<h3><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span>  Sunrise<\/h3>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20655\" data-permalink=\"https:\/\/marinakanavaki.com\/sunrise-for-equinox\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg\" data-orig-size=\"1684,1684\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;7.1&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1525414219&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;200&quot;,&quot;iso&quot;:&quot;100&quot;,&quot;shutter_speed&quot;:&quot;0.0005&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"sunrise-for-equinox\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=1024\" alt=\"\" class=\"wp-image-20655\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunrise-for-equinox.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><\/figure><\/div>\n\n\n\n<h3><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span>  Sunset<\/h3>\n\n\n\n<div class=\"wp-block-image\"><figure class=\"alignleft size-large is-resized\"><img loading=\"lazy\" data-attachment-id=\"20657\" data-permalink=\"https:\/\/marinakanavaki.com\/sunset-for-equinox\/\" data-orig-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg\" data-orig-size=\"1956,1956\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;11&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;NIKON D3200&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1531684608&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;200&quot;,&quot;iso&quot;:&quot;400&quot;,&quot;shutter_speed&quot;:&quot;0.002&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"sunset-for-equinox\" data-image-description=\"\" data-medium-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=300\" data-large-file=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=1024\" src=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=1024\" alt=\"\" class=\"wp-image-20657\" width=\"768\" height=\"768\" srcset=\"https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=1024 1024w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=768 768w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=1536 1536w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=150 150w, https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/sunset-for-equinox.jpg?w=300 300w\" sizes=\"(max-width: 768px) 100vw, 768px\" \/><\/figure><\/div>\n\n\n\n<h6><\/h6>\n\n\n\n<h2><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><\/h2>\n\n\n\n<h2>Jean-Michel Jarre<\/h2>\n\n\n\n<h3><em>\u00c9quinoxe , Pt. 2 <\/em><\/h3>\n\n\n\n<h6>\u00c9quinoxe, 1978<\/h6>\n\n\n\n<figure class=\"wp-block-embed is-type-rich is-provider-youtube wp-block-embed-youtube wp-embed-aspect-16-9 wp-has-aspect-ratio\"><div class=\"wp-block-embed__wrapper\">\n<span class=\"embed-youtube\" style=\"text-align:center; display: block;\"><iframe data-wpcom-embed-url=\"https:\/\/www.youtube.com\/watch?v=_okeeslfmh8\" class='youtube-player' width='640' height='360' src='https:\/\/www.youtube.com\/embed\/_okeeslfmh8?version=3&#038;rel=1&#038;fs=1&#038;autohide=2&#038;showsearch=0&#038;showinfo=1&#038;iv_load_policy=1&#038;wmode=transparent' allowfullscreen='true' style='border:0;'><\/iframe><\/span>\n<\/div><\/figure>\n\n\n\n<h2><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><\/h2>\n\n\n\n<h1><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">Happy<\/span><\/span><\/h1>\n\n\n\n<h6><em>and safe<\/em><\/h6>\n\n\n\n<h1><span style=\"color:#ff9900;\">Fall Equinox<\/span><\/h1>\n\n\n\n<h2 class=\"has-text-color\" style=\"color:#5c6b47;\"><span style=\"color:#ffcc00;\"><em>everyone!<\/em><\/span><\/h2>\n\n\n\n<h2><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cb<\/span><span style=\"color:#ff6600;\"><span class=\"has-inline-color has-luminous-vivid-amber-color\">\u25cf<\/span><\/span><\/h2>\n\n\n\n<p><\/p>\n",
+            "excerpt": "<p>The time of the year when the Sun shines directly on the Equator and the length of day and night is almost equal, marking the first day of Autumn in the Northern Hemisphere and the first day of Spring in the Southern Hemisphere. Autumn over here and my favorite season too. There&#8217;s a special kind [&hellip;]<\/p>\n",
+            "slug": "autumnal-fall-equinox-2020",
+            "guid": "http:\/\/marinakanavaki.com\/?p=20653",
+            "status": "publish",
+            "discussion": {
+                "comments_open": true,
+                "comment_status": "open",
+                "pings_open": true,
+                "ping_status": "open",
+                "comment_count": 63
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 110,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": false,
+            "global_ID": "34de6e3639f699de7bfa414385811f2e",
+            "featured_image": "https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg",
+            "post_thumbnail": {
+                "ID": 20676,
+                "URL": "https:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg",
+                "guid": "http:\/\/marinakanavaki.files.wordpress.com\/2020\/09\/fall-equinox-2020.jpg",
+                "mime_type": "image\/jpeg",
+                "width": 1956,
+                "height": 1956
+            },
+            "format": "standard",
+            "tags": {
+                "2020": {
+                    "ID": 65608,
+                    "name": "2020",
+                    "slug": "2020",
+                    "description": "",
+                    "post_count": 24,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:2020",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:2020\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "autumn": {
+                    "ID": 2865,
+                    "name": "autumn",
+                    "slug": "autumn",
+                    "description": "",
+                    "post_count": 10,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:autumn",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:autumn\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Autumnal Equinox": {
+                    "ID": 1868835,
+                    "name": "Autumnal Equinox",
+                    "slug": "autumnal-equinox",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:autumnal-equinox",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:autumnal-equinox\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "\u00c9quinoxe": {
+                    "ID": 5562732,
+                    "name": "\u00c9quinoxe",
+                    "slug": "equinoxe",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:equinoxe",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:equinoxe\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Fall Equinox": {
+                    "ID": 1811742,
+                    "name": "Fall Equinox",
+                    "slug": "fall-equinox",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:fall-equinox",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:fall-equinox\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Jean-Michel Jarre": {
+                    "ID": 357230,
+                    "name": "Jean-Michel Jarre",
+                    "slug": "jean-michel-jarre",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:jean-michel-jarre",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:jean-michel-jarre\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Moon phase": {
+                    "ID": 337555,
+                    "name": "Moon phase",
+                    "slug": "moon-phase",
+                    "description": "",
+                    "post_count": 4,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:moon-phase",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:moon-phase\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "moonrise": {
+                    "ID": 360921,
+                    "name": "moonrise",
+                    "slug": "moonrise",
+                    "description": "",
+                    "post_count": 8,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:moonrise",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:moonrise\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "photo": {
+                    "ID": 994,
+                    "name": "photo",
+                    "slug": "photo",
+                    "description": "",
+                    "post_count": 5,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:photo",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:photo\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Photography": {
+                    "ID": 436,
+                    "name": "Photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 110,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "sunrise": {
+                    "ID": 35945,
+                    "name": "sunrise",
+                    "slug": "sunrise",
+                    "description": "",
+                    "post_count": 27,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:sunrise",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:sunrise\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "sunset": {
+                    "ID": 766,
+                    "name": "sunset",
+                    "slug": "sunset",
+                    "description": "",
+                    "post_count": 34,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/tags\/slug:sunset",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/tags\/slug:sunset\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                }
+            },
+            "categories": {
+                "Nature": {
+                    "ID": 1099,
+                    "name": "Nature",
+                    "slug": "nature",
+                    "description": "",
+                    "post_count": 139,
+                    "parent": 78522247,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/categories\/slug:nature",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/categories\/slug:nature\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Photography": {
+                    "ID": 436,
+                    "name": "Photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 156,
+                    "parent": 78522247,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/categories\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/categories\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Seasons": {
+                    "ID": 20333,
+                    "name": "Seasons",
+                    "slug": "seasons",
+                    "description": "",
+                    "post_count": 142,
+                    "parent": 680306717,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/categories\/slug:seasons",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/categories\/slug:seasons\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                },
+                "Time": {
+                    "ID": 5087,
+                    "name": "Time",
+                    "slug": "time",
+                    "description": "",
+                    "post_count": 143,
+                    "parent": 680306717,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/categories\/slug:time",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/categories\/slug:time\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157"
+                        }
+                    }
+                }
+            },
+            "attachments": {},
+            "attachment_count": 0,
+            "metadata": [],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/read\/sites\/28002157\/posts\/20653",
+                    "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/28002157\/posts\/20653\/help",
+                    "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/28002157",
+                    "replies": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/posts\/20653\/replies\/",
+                    "likes": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/28002157\/posts\/20653\/likes\/"
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "is_seen": false,
+            "feed_ID": 2091483,
+            "feed_URL": "http:\/\/marinakanavaki.com",
+            "pseudo_ID": "34de6e3639f699de7bfa414385811f2e",
+            "is_external": false,
+            "site_name": "Marina Kanavaki",
+            "site_URL": "https:\/\/marinakanavaki.com",
+            "site_is_private": false,
+            "featured_media": {
+                "uri": "https:\/\/www.youtube.com\/embed\/_okeeslfmh8?version=3&rel=1&fs=1&autohide=2&showsearch=0&showinfo=1&iv_load_policy=1&wmode=transparent",
+                "type": "video"
+            },
+            "use_excerpt": false
+        }
+    }, {
+        "type": "post",
+        "data": {
+            "ID": 15697,
+            "site_ID": 21271414,
+            "author": {
+                "ID": 21825924,
+                "login": "abubot6",
+                "email": false,
+                "name": "Island Traveler",
+                "first_name": "Barnard",
+                "last_name": "Deocampo",
+                "nice_name": "abubot6",
+                "URL": "http:\/\/thismansjourney.net\/",
+                "avatar_URL": "https:\/\/2.gravatar.com\/avatar\/201ebd347a0197bf0e7ffde03f9f2441?s=96&d=&r=G",
+                "profile_URL": "https:\/\/en.gravatar.com\/abubot6",
+                "site_ID": 21271414,
+                "has_avatar": true
+            },
+            "date": "2020-09-19T16:16:00-07:00",
+            "modified": "2020-09-19T16:16:32-07:00",
+            "title": "FALL in LOVE with your LIFE",
+            "URL": "https:\/\/this-mans-journey.com\/2020\/09\/19\/fall-in-love-with-your-life\/",
+            "short_URL": "https:\/\/wp.me\/p1rfFk-45b",
+            "content": "\n<p><strong>It took pain, anxiety and sadness for me to realize I needed to be kind to myself. <\/strong><\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"15701\" data-permalink=\"https:\/\/this-mans-journey.com\/2020\/09\/19\/fall-in-love-with-your-life\/img_0190\/\" data-orig-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg\" data-orig-size=\"1170,1477\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;0&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;0&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;0&quot;,&quot;iso&quot;:&quot;0&quot;,&quot;shutter_speed&quot;:&quot;0&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"img_0190\" data-image-description=\"\" data-medium-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=238\" data-large-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=811\" src=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=811\" alt=\"\" class=\"wp-image-15701\" srcset=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=811 811w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=119 119w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=238 238w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=768 768w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg 1170w\" sizes=\"(max-width: 811px) 100vw, 811px\" \/><figcaption>Our first Fall Harvest Blessing Tree. We\u2019re skipping the pumpkin patch this year. Instead, we went to Ross, Marshall\u2019s and Dollar Tree for our pumpkin hunting. If we choose to see and celebrate what\u2019s good of 2020, then it has been a good year. <\/figcaption><\/figure>\n\n\n\n<p><strong>In this world, our happiness will not be given easily. In fact, people will find a way to take it. So, today care less of what others will say. Be nice to yourself instead of trying to please everyone. People will take advantage of your kindness and will tear your joy and positivity in pieces. <\/strong><\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"15703\" data-permalink=\"https:\/\/this-mans-journey.com\/2020\/09\/19\/fall-in-love-with-your-life\/img_0038\/\" data-orig-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg\" data-orig-size=\"4032,3024\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.8&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;iPhone 8 Plus&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1600038963&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;3.99&quot;,&quot;iso&quot;:&quot;64&quot;,&quot;shutter_speed&quot;:&quot;0.066666666666667&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"img_0038\" data-image-description=\"\" data-medium-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=300\" data-large-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=1024\" src=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=1024\" alt=\"\" class=\"wp-image-15703\" srcset=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=1024 1024w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=2048 2048w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=150 150w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=300 300w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=768 768w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><figcaption>These pumpkins light up our dining room. We don\u2019t wait for light to happen. We find light where we can. <\/figcaption><\/figure>\n\n\n\n<p><strong>Fall in love with your life because no one can love it more than you do. <\/strong><\/p>\n\n\n\n<p><strong>Fall in love with your life because it deserves to be happy too. <\/strong><\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"15704\" data-permalink=\"https:\/\/this-mans-journey.com\/2020\/09\/19\/fall-in-love-with-your-life\/img_0176\/\" data-orig-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg\" data-orig-size=\"4032,3024\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.8&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;iPhone 8 Plus&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1600460637&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;3.99&quot;,&quot;iso&quot;:&quot;50&quot;,&quot;shutter_speed&quot;:&quot;0.066666666666667&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"img_0176\" data-image-description=\"\" data-medium-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=300\" data-large-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=1024\" src=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=1024\" alt=\"\" class=\"wp-image-15704\" srcset=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=1024 1024w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=2048 2048w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=150 150w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=300 300w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=768 768w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><figcaption>I can only change how I react. <\/figcaption><\/figure>\n\n\n\n<p><strong>It\u2019s never too late to feel like we matter again. You\u2019d been a light and warmth to others. It\u2019s okay to experience the same. <\/strong><\/p>\n\n\n\n<figure class=\"wp-block-image size-large\"><img data-attachment-id=\"15707\" data-permalink=\"https:\/\/this-mans-journey.com\/2020\/09\/19\/fall-in-love-with-your-life\/img_0216-2\/\" data-orig-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg\" data-orig-size=\"4032,3024\" data-comments-opened=\"1\" data-image-meta=\"{&quot;aperture&quot;:&quot;1.8&quot;,&quot;credit&quot;:&quot;&quot;,&quot;camera&quot;:&quot;iPhone 8 Plus&quot;,&quot;caption&quot;:&quot;&quot;,&quot;created_timestamp&quot;:&quot;1600531126&quot;,&quot;copyright&quot;:&quot;&quot;,&quot;focal_length&quot;:&quot;3.99&quot;,&quot;iso&quot;:&quot;20&quot;,&quot;shutter_speed&quot;:&quot;0.00055586436909394&quot;,&quot;title&quot;:&quot;&quot;,&quot;orientation&quot;:&quot;1&quot;}\" data-image-title=\"img_0216-2\" data-image-description=\"\" data-medium-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=300\" data-large-file=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=1024\" src=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=1024\" alt=\"\" class=\"wp-image-15707\" srcset=\"https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=1024 1024w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=2048 2048w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=150 150w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=300 300w, https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=768 768w\" sizes=\"(max-width: 1024px) 100vw, 1024px\" \/><figcaption>Family Day in San Francisco. Stopping to watch the ocean before heading down Union Square. I turned down 3 overtime work including today and tomorrow. Money won\u2019t make you happy, but following your heart will. 9\/19\/20<\/figcaption><\/figure>\n\n\n\n<p><strong>Today, being better begins. <\/strong><\/p>\n\n\n\n<p><\/p>\n",
+            "excerpt": "<p>It took pain, anxiety and sadness for me to realize I needed to be kind to myself. In this world, our happiness will not be given easily. In fact, people will find a way to take it. So, today care less of what others will say. Be nice to yourself instead of trying to please [&hellip;]<\/p>\n",
+            "slug": "fall-in-love-with-your-life",
+            "guid": "http:\/\/this-mans-journey.com\/?p=15697",
+            "status": "publish",
+            "discussion": {
+                "comments_open": true,
+                "comment_status": "open",
+                "pings_open": true,
+                "ping_status": "open",
+                "comment_count": 44
+            },
+            "likes_enabled": true,
+            "sharing_enabled": true,
+            "like_count": 219,
+            "i_like": false,
+            "is_reblogged": false,
+            "is_following": false,
+            "global_ID": "e61dd75e67bdca48b91ad87a2400429f",
+            "featured_image": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg",
+            "post_thumbnail": {
+                "ID": 15706,
+                "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg",
+                "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg",
+                "mime_type": "image\/jpeg",
+                "width": 1170,
+                "height": 1477
+            },
+            "format": "standard",
+            "tags": {
+                "anxiety": {
+                    "ID": 3252,
+                    "name": "anxiety",
+                    "slug": "anxiety",
+                    "description": "",
+                    "post_count": 1,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:anxiety",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:anxiety\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "decor": {
+                    "ID": 48669,
+                    "name": "decor",
+                    "slug": "decor",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:decor",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:decor\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Fall": {
+                    "ID": 46710,
+                    "name": "Fall",
+                    "slug": "fall",
+                    "description": "",
+                    "post_count": 4,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:fall",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:fall\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Happiness": {
+                    "ID": 22297,
+                    "name": "Happiness",
+                    "slug": "happiness",
+                    "description": "",
+                    "post_count": 26,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:happiness",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:happiness\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Health": {
+                    "ID": 337,
+                    "name": "Health",
+                    "slug": "health",
+                    "description": "",
+                    "post_count": 16,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:health",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:health\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Life": {
+                    "ID": 124,
+                    "name": "Life",
+                    "slug": "life",
+                    "description": "",
+                    "post_count": 56,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:life",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:life\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "love": {
+                    "ID": 3785,
+                    "name": "love",
+                    "slug": "love",
+                    "description": "",
+                    "post_count": 6,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:love",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:love\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Photography": {
+                    "ID": 436,
+                    "name": "Photography",
+                    "slug": "photography",
+                    "description": "",
+                    "post_count": 57,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:photography",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:photography\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Pumpkin": {
+                    "ID": 186595,
+                    "name": "Pumpkin",
+                    "slug": "pumpkin",
+                    "description": "",
+                    "post_count": 3,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:pumpkin",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:pumpkin\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                },
+                "Shopping": {
+                    "ID": 1508,
+                    "name": "Shopping",
+                    "slug": "shopping",
+                    "description": "",
+                    "post_count": 2,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/tags\/slug:shopping",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/tags\/slug:shopping\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                }
+            },
+            "categories": {
+                "Life": {
+                    "ID": 124,
+                    "name": "Life",
+                    "slug": "life",
+                    "description": "",
+                    "post_count": 38,
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/categories\/slug:life",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/categories\/slug:life\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414"
+                        }
+                    }
+                }
+            },
+            "attachments": {
+                "15708": {
+                    "ID": 15708,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg",
+                    "date": "2020-09-19T16:15:49-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0216.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0216",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg?w=150",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg?w=300",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg?w=1024",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg"
+                    },
+                    "height": 3024,
+                    "width": 4032,
+                    "exif": {
+                        "aperture": "1.8",
+                        "credit": "",
+                        "camera": "iPhone 8 Plus",
+                        "caption": "",
+                        "created_timestamp": "1600531126",
+                        "copyright": "",
+                        "focal_length": "3.99",
+                        "iso": "20",
+                        "shutter_speed": "0.00055586436909394",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15708",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15708\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15709": {
+                    "ID": 15709,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-1.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-1.jpg",
+                    "date": "2020-09-19T16:15:49-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0216-1.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0216-1",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-1.jpg?w=150",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-1.jpg?w=300",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-1.jpg?w=1024",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-1.jpg"
+                    },
+                    "height": 3024,
+                    "width": 4032,
+                    "exif": {
+                        "aperture": "1.8",
+                        "credit": "",
+                        "camera": "iPhone 8 Plus",
+                        "caption": "",
+                        "created_timestamp": "1600531126",
+                        "copyright": "",
+                        "focal_length": "3.99",
+                        "iso": "20",
+                        "shutter_speed": "0.00055586436909394",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15709",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15709\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15707": {
+                    "ID": 15707,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg",
+                    "date": "2020-09-19T16:11:40-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0216-2.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0216-2",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=150",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=300",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg?w=1024",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216-2.jpg"
+                    },
+                    "height": 3024,
+                    "width": 4032,
+                    "exif": {
+                        "aperture": "1.8",
+                        "credit": "",
+                        "camera": "iPhone 8 Plus",
+                        "caption": "",
+                        "created_timestamp": "1600531126",
+                        "copyright": "",
+                        "focal_length": "3.99",
+                        "iso": "20",
+                        "shutter_speed": "0.00055586436909394",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15707",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15707\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15706": {
+                    "ID": 15706,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg",
+                    "date": "2020-09-19T13:52:11-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0190-1.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0190-1",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg?w=119",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg?w=238",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg?w=811",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190-1.jpg"
+                    },
+                    "height": 1477,
+                    "width": 1170,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15706",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15706\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15704": {
+                    "ID": 15704,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg",
+                    "date": "2020-09-19T13:36:18-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0176.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0176",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=150",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=300",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg?w=1024",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0176.jpg"
+                    },
+                    "height": 3024,
+                    "width": 4032,
+                    "exif": {
+                        "aperture": "1.8",
+                        "credit": "",
+                        "camera": "iPhone 8 Plus",
+                        "caption": "",
+                        "created_timestamp": "1600460637",
+                        "copyright": "",
+                        "focal_length": "3.99",
+                        "iso": "50",
+                        "shutter_speed": "0.066666666666667",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15704",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15704\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15703": {
+                    "ID": 15703,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg",
+                    "date": "2020-09-19T13:36:04-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0038.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0038",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=150",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=300",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg?w=1024",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0038.jpg"
+                    },
+                    "height": 3024,
+                    "width": 4032,
+                    "exif": {
+                        "aperture": "1.8",
+                        "credit": "",
+                        "camera": "iPhone 8 Plus",
+                        "caption": "",
+                        "created_timestamp": "1600038963",
+                        "copyright": "",
+                        "focal_length": "3.99",
+                        "iso": "64",
+                        "shutter_speed": "0.066666666666667",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15703",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15703\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15701": {
+                    "ID": 15701,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg",
+                    "date": "2020-09-19T12:59:41-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0190.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0190",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=119",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=238",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg?w=811",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0190.jpg"
+                    },
+                    "height": 1477,
+                    "width": 1170,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15701",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15701\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                },
+                "15696": {
+                    "ID": 15696,
+                    "URL": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0188.jpg",
+                    "guid": "http:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0188.jpg",
+                    "date": "2020-09-19T10:47:21-07:00",
+                    "post_ID": 15697,
+                    "author_ID": 21825924,
+                    "file": "img_0188.jpg",
+                    "mime_type": "image\/jpeg",
+                    "extension": "jpg",
+                    "title": "img_0188",
+                    "caption": "",
+                    "description": "",
+                    "alt": "",
+                    "thumbnails": {
+                        "thumbnail": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0188.jpg?w=112",
+                        "medium": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0188.jpg?w=225",
+                        "large": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0188.jpg?w=767",
+                        "full": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0188.jpg"
+                    },
+                    "height": 1800,
+                    "width": 1348,
+                    "exif": {
+                        "aperture": "0",
+                        "credit": "",
+                        "camera": "",
+                        "caption": "",
+                        "created_timestamp": "0",
+                        "copyright": "",
+                        "focal_length": "0",
+                        "iso": "0",
+                        "shutter_speed": "0",
+                        "title": "",
+                        "orientation": "1",
+                        "keywords": []
+                    },
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414\/media\/15696",
+                            "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/media\/15696\/help",
+                            "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                            "parent": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697"
+                        }
+                    }
+                }
+            },
+            "attachment_count": 8,
+            "metadata": [],
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/read\/sites\/21271414\/posts\/15697",
+                    "help": "{{request.requestLine.baseUrl}}\/rest\/v\/sites\/21271414\/posts\/15697\/help",
+                    "site": "{{request.requestLine.baseUrl}}\/rest\/v1.2\/sites\/21271414",
+                    "replies": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697\/replies\/",
+                    "likes": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/21271414\/posts\/15697\/likes\/"
+                }
+            },
+            "capabilities": {
+                "publish_post": false,
+                "delete_post": false,
+                "edit_post": false
+            },
+            "is_seen": false,
+            "feed_ID": 107168226,
+            "feed_URL": "http:\/\/this-mans-journey.com",
+            "pseudo_ID": "e61dd75e67bdca48b91ad87a2400429f",
+            "is_external": false,
+            "site_name": "This Man&#039;s Journey",
+            "site_URL": "https:\/\/this-mans-journey.com",
+            "site_is_private": false,
+            "featured_media": {
+                "uri": "https:\/\/consumerjournaldotnet.files.wordpress.com\/2020\/09\/img_0216.jpg",
+                "width": 4032,
+                "height": 3024,
+                "type": "image"
+            },
+            "use_excerpt": false
+        }
+    }],
+    "next_page_handle": "ZnJvbT04JnJlZnJlc2g9MQ=="
+},
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_106707880.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_106707880.json
index d8b1dcd17a12..37fa5d98dfee 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_106707880.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_106707880.json
@@ -3,9 +3,6 @@
         "method": "GET",
         "urlPath": "/rest/v1.1/sites/106707880",
         "queryParameters": {
-            "fields": {
-                "equalTo": "ID,URL,name,description,jetpack,visible,is_private,options,plan,capabilities,quota,icon,meta"
-            },
             "locale": {
                 "matches": "(.*)"
             }
@@ -15,9 +12,9 @@
         "status": 200,
         "jsonBody": {
             "ID": 106707880,
-            "name": "In Focus Photography",
+            "name": "Tri-County Real Estate",
             "description": "",
-            "URL": "http://infocusphotographers.com",
+            "URL": "http://tricountyrealestate.wordpress.com",
             "capabilities": {
                 "edit_pages": true,
                 "edit_posts": true,
@@ -41,8 +38,8 @@
             },
             "jetpack": false,
             "icon": {
-                "img": "https://secure.gravatar.com/blavatar/e150bfd1895a72358af2b617b575be19",
-                "ico": "https://secure.gravatar.com/blavatar/e150bfd1895a72358af2b617b575be19"
+                "img": "https://tricountyrealestate.files.wordpress.com/2020/08/image-1.jpg?w=96",
+                "ico": "https://tricountyrealestate.files.wordpress.com/2020/08/image-1.jpg?w=96\""
             },
             "visible": true,
             "is_private": false,
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495.json
new file mode 100644
index 000000000000..897e7006d682
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495.json
@@ -0,0 +1,187 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/rest/v1.1/sites/181851495",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "ID": 181851495,
+            "name": "Four Paws Dog Grooming",
+            "description": "",
+            "URL": "https:\/\/fourpawsdoggrooming.wordpress.com",
+            "user_can_manage": true,
+            "capabilities": {
+                "edit_pages": true,
+                "edit_posts": true,
+                "edit_others_posts": true,
+                "edit_others_pages": true,
+                "delete_posts": true,
+                "delete_others_posts": true,
+                "edit_theme_options": true,
+                "edit_users": false,
+                "list_users": true,
+                "manage_categories": true,
+                "manage_options": true,
+                "moderate_comments": true,
+                "activate_wordads": false,
+                "promote_users": true,
+                "publish_posts": true,
+                "upload_files": true,
+                "delete_users": false,
+                "remove_users": true,
+                "own_site": false,
+                "view_hosting": true,
+                "view_stats": true
+            },
+            "jetpack": false,
+            "jetpack_connection": false,
+            "is_multisite": true,
+            "post_count": 3,
+            "subscribers_count": 0,
+            "lang": "en",
+            "icon": {
+                "img": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=96",
+                "ico": "https:\/\/fourpawsdoggrooming.files.wordpress.com\/2020\/08\/cropped-fourpaws-logo-2-1.png?w=96",
+                "media_id": 39
+            },
+            "logo": {
+                "id": 0,
+                "sizes": [],
+                "url": ""
+            },
+            "visible": true,
+            "is_private": true,
+            "is_coming_soon": true,
+            "single_user_site": false,
+            "is_vip": false,
+            "is_following": false,
+            "options": {
+                "timezone": "America\/Los_Angeles",
+                "gmt_offset": -7,
+                "blog_public": -1,
+                "videopress_enabled": false,
+                "upgraded_filetypes_enabled": false,
+                "login_url": "https:\/\/fourpawsdoggrooming.wordpress.com\/wp-login.php",
+                "admin_url": "https:\/\/fourpawsdoggrooming.wordpress.com\/wp-admin\/",
+                "is_mapped_domain": false,
+                "is_redirect": false,
+                "unmapped_url": "https:\/\/fourpawsdoggrooming.wordpress.com",
+                "featured_images_enabled": false,
+                "theme_slug": "pub\/hever",
+                "header_image": false,
+                "background_color": false,
+                "image_default_link_type": "none",
+                "image_thumbnail_width": 150,
+                "image_thumbnail_height": 150,
+                "image_thumbnail_crop": 0,
+                "image_medium_width": 300,
+                "image_medium_height": 300,
+                "image_large_width": 1024,
+                "image_large_height": 1024,
+                "permalink_structure": "\/%year%\/%monthnum%\/%day%\/%postname%\/",
+                "post_formats": [],
+                "default_post_format": "0",
+                "default_category": 1,
+                "allowed_file_types": ["jpg", "jpeg", "png", "gif", "pdf", "doc", "ppt", "odt", "pptx", "docx", "pps", "ppsx", "xls", "xlsx", "key", "asc"],
+                "show_on_front": "page",
+                "default_likes_enabled": true,
+                "default_sharing_status": false,
+                "default_comment_status": true,
+                "default_ping_status": true,
+                "software_version": "5.5-wpcom-48929",
+                "created_at": "2020-08-21T23:21:16+00:00",
+                "wordads": false,
+                "publicize_permanently_disabled": false,
+                "frame_nonce": "6c9ff09ee5",
+                "jetpack_frame_nonce": "6c9ff09ee5",
+                "page_on_front": 5,
+                "page_for_posts": 0,
+                "wpcom_public_coming_soon_page_id": 0,
+                "headstart": false,
+                "headstart_is_fresh": false,
+                "ak_vp_bundle_enabled": null,
+                "advanced_seo_front_page_description": "",
+                "advanced_seo_title_formats": [],
+                "verification_services_codes": null,
+                "podcasting_archive": null,
+                "is_domain_only": false,
+                "is_automated_transfer": false,
+                "is_wpcom_atomic": false,
+                "is_wpcom_store": false,
+                "woocommerce_is_active": false,
+                "design_type": null,
+                "site_goals": null,
+                "site_segment": null,
+                "import_engine": null,
+                "is_pending_plan": false,
+                "is_wpforteams_site": false,
+                "is_cloud_eligible": false
+            },
+            "plan": {
+                "product_id": 1,
+                "product_slug": "free_plan",
+                "product_name": "WordPress.com Free",
+                "product_name_short": "Free",
+                "expired": false,
+                "user_is_owner": false,
+                "is_free": true,
+                "features": {
+                    "active": ["free-blog", "space", "support"],
+                    "available": {
+                        "free-blog": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "blogger-bundle", "blogger-bundle-2y", "ecommerce-bundle-2y"],
+                        "custom-domain": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "blogger-bundle", "blogger-bundle-2y", "ecommerce-bundle-2y"],
+                        "space": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "blogger-bundle", "blogger-bundle-2y", "ecommerce-bundle-2y"],
+                        "donations": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "core\/audio": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "premium-content\/container": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "support": ["personal-bundle", "value_bundle", "business-bundle", "ecommerce-bundle", "personal-bundle-2y", "value_bundle-2y", "business-bundle-2y", "blogger-bundle", "blogger-bundle-2y", "ecommerce-bundle-2y"],
+                        "no-adverts\/no-adverts.php": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "custom-design": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "videopress": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "unlimited_themes": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "live_support": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "private_whois": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "simple-payments": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "calendly": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "opentable": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "send-a-message": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "core\/video": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "core\/cover": ["value_bundle", "business-bundle", "ecommerce-bundle", "value_bundle-2y", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "premium-themes": ["business-bundle", "ecommerce-bundle", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "google-analytics": ["business-bundle", "ecommerce-bundle", "business-bundle-2y", "ecommerce-bundle-2y"],
+                        "social-previews": ["business-bundle", "ecommerce-bundle", "business-bundle-2y", "ecommerce-bundle-2y"]
+                    }
+                }
+            },
+            "products": [],
+            "jetpack_modules": null,
+            "meta": {
+                "links": {
+                    "self": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495",
+                    "help": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/help",
+                    "posts": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/posts\/",
+                    "comments": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/comments\/",
+                    "xmlrpc": "https:\/\/fourpawsdoggrooming.wordpress.com\/xmlrpc.php",
+                    "site_icon": "{{request.requestLine.baseUrl}}\/rest\/v1.1\/sites\/181851495\/media\/39"
+                }
+            },
+            "quota": {
+                "space_allowed": 3221225472,
+                "space_used": 4495332,
+                "percent_used": 0.1395534723997116,
+                "space_available": 3216730140
+            },
+            "launch_status": "unlaunched",
+            "site_migration": null,
+            "is_fse_active": false,
+            "is_fse_eligible": false,
+            "is_core_site_editor_enabled": false
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495_settings.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495_settings.json
new file mode 100644
index 000000000000..5427192b8a1b
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495_settings.json
@@ -0,0 +1,114 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/rest/v1.1/sites/181851495/settings",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "ID": 181851495,
+            "name": "Four Paws Dog Grooming",
+            "description": "",
+            "URL": "https:\/\/fourpawsdoggrooming.wordpress.com",
+            "lang": "en",
+            "settings": {
+                "admin_url": "https:\/\/fourpawsdoggrooming.wordpress.com\/wp-admin\/",
+                "default_ping_status": true,
+                "default_comment_status": true,
+                "instant_search_enabled": false,
+                "blog_public": -1,
+                "jetpack_sync_non_public_post_stati": false,
+                "jetpack_relatedposts_allowed": true,
+                "jetpack_relatedposts_enabled": true,
+                "jetpack_relatedposts_show_headline": false,
+                "jetpack_relatedposts_show_thumbnails": false,
+                "jetpack_search_enabled": false,
+                "jetpack_search_supported": false,
+                "default_category": 1,
+                "post_categories": [{
+                    "value": 1,
+                    "name": "Uncategorized"
+                }],
+                "default_post_format": "0",
+                "default_pingback_flag": true,
+                "require_name_email": true,
+                "comment_registration": false,
+                "close_comments_for_old_posts": false,
+                "close_comments_days_old": 14,
+                "thread_comments": true,
+                "thread_comments_depth": 3,
+                "page_comments": true,
+                "comments_per_page": 50,
+                "default_comments_page": "newest",
+                "comment_order": "asc",
+                "comments_notify": true,
+                "moderation_notify": true,
+                "social_notifications_like": false,
+                "social_notifications_reblog": false,
+                "social_notifications_subscribe": false,
+                "comment_moderation": false,
+                "comment_whitelist": true,
+                "comment_previously_approved": false,
+                "comment_max_links": 2,
+                "moderation_keys": "",
+                "blacklist_keys": "",
+                "disallowed_keys": false,
+                "lang_id": 1,
+                "wga": false,
+                "disabled_likes": false,
+                "disabled_reblogs": false,
+                "jetpack_comment_likes_enabled": true,
+                "twitter_via": "",
+                "jetpack-twitter-cards-site-tag": "",
+                "eventbrite_api_token": null,
+                "gmt_offset": -7,
+                "timezone_string": "America\/Los_Angeles",
+                "date_format": "F j, Y",
+                "time_format": "g:i a",
+                "start_of_week": "1",
+                "jetpack_testimonial": false,
+                "jetpack_testimonial_posts_per_page": 10,
+                "jetpack_portfolio": false,
+                "jetpack_portfolio_posts_per_page": 10,
+                "markdown_supported": true,
+                "site_icon": 39,
+                "advanced_seo_front_page_description": "",
+                "advanced_seo_title_formats": [],
+                "amp_is_supported": false,
+                "amp_is_enabled": true,
+                "api_cache": true,
+                "posts_per_page": 10,
+                "posts_per_rss": 10,
+                "rss_use_excerpt": false,
+                "wpcom_publish_posts_with_markdown": false,
+                "wpcom_publish_comments_with_markdown": false,
+                "infinite_scroll": true,
+                "infinite_scroll_blocked": false,
+                "wpcom_coming_soon": 1,
+                "podcasting_category_id": 0,
+                "podcasting_title": "",
+                "podcasting_subtitle": "",
+                "podcasting_talent_name": "",
+                "podcasting_summary": "",
+                "podcasting_copyright": "",
+                "podcasting_explicit": "no",
+                "podcasting_image": "",
+                "podcasting_keywords": "",
+                "podcasting_category_1": "",
+                "podcasting_category_2": "",
+                "podcasting_category_3": "",
+                "podcasting_email": "",
+                "podcasting_image_id": 0,
+                "sharing_button_style": "icon-text",
+                "sharing_label": "Share this:",
+                "sharing_show": ["post", "page"],
+                "sharing_open_links": "same"
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495_settings_update.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495_settings_update.json
new file mode 100644
index 000000000000..9c7b7e47d24f
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v11_sites_181851495_settings_update.json
@@ -0,0 +1,18 @@
+{
+    "request": {
+        "method": "POST",
+        "urlPath": "/rest/v1.1/sites/181851495/settings",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "updated": []
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v12_sites_comments_likes.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v12_sites_comments_likes.json
new file mode 100644
index 000000000000..bd94b2b2d4c1
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v12_sites_comments_likes.json
@@ -0,0 +1,27 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/rest/v1.2/sites/.*/comments/.*/likes",
+    "queryParameters": {
+      "locale": {
+        "matches": "(.*)"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "found": 0,
+      "i_like": false,
+      "likes": [],
+      "meta": {
+        "links": {
+          "help": "https://public-api.wordpress.com/rest/v1.2/sites/106707880/comments/2/likes/help",
+          "post": "https://public-api.wordpress.com/rest/v1.1/sites/106707880/posts/2",
+          "comment": "https://public-api.wordpress.com/rest/v1.1/sites/106707880/comments/2",
+          "site": "https://public-api.wordpress.com/rest/v1.2/sites/106707880"
+        }
+      }
+    }
+  }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v12_sites_posts_likes.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v12_sites_posts_likes.json
new file mode 100644
index 000000000000..730ef1d56a82
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v12_sites_posts_likes.json
@@ -0,0 +1,26 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/rest/v1.2/sites/.*/posts/.*/likes",
+    "queryParameters": {
+      "locale": {
+        "matches": "(.*)"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "found": 0,
+      "i_like": false,
+      "likes": [],
+      "meta": {
+        "links": {
+          "help": "https://public-api.wordpress.com/rest/v1.2/sites/106707880/posts/106/likes/help",
+          "post": "https://public-api.wordpress.com/rest/v1.1/sites/106707880/posts/106",
+          "site": "https://public-api.wordpress.com/rest/v1.2/sites/106707880"
+        }
+      }
+    }
+  }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_disabled.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_disabled.json
new file mode 100644
index 000000000000..6d1aa1c01497
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_disabled.json
@@ -0,0 +1,21 @@
+{
+    "scenarioName": "gutenberg",
+    "requiredScenarioState": "Started",
+    "request": {
+        "urlPattern": "/wpcom/v2/sites/181851495/gutenberg(/)?($|\\?.*)",
+        "method": "GET"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "editor_mobile": "aztec",
+            "editor_web": "gutenberg",
+            "opt_in": "{{request.requestLine.baseUrl}}/wpcom/v2/sites/106707880/gutenberg?editor=gutenberg&platform=mobile"
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_enable.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_enable.json
new file mode 100644
index 000000000000..d0c061fd89a6
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_enable.json
@@ -0,0 +1,21 @@
+{
+    "scenarioName": "gutenberg",
+    "requiredScenarioState": "enabled",
+    "request": {
+        "urlPattern": "/wpcom/v2/sites/181851495/gutenberg(/)?($|\\?.*)",
+        "method": "GET"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "editor_mobile": "gutenberg",
+            "editor_web": "gutenberg",
+            "opt_in": "{{request.requestLine.baseUrl}}/wpcom/v2/sites/181851495/gutenberg?editor=gutenberg&platform=mobile"
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_null.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_null.json
new file mode 100644
index 000000000000..5bafcd4f2385
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_null.json
@@ -0,0 +1,19 @@
+{
+    "request": {
+        "urlPath": "/wpcom/v2/sites/181851495/gutenberg/",
+        "method": "POST"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "editor_mobile": "gutenberg",
+            "editor_web": "gutenberg",
+            "opt_in": "{{request.requestLine.baseUrl}}/wpcom/v2/sites/181851495/gutenberg?editor=gutenberg&platform=mobile"
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_opt_in.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_opt_in.json
new file mode 100644
index 000000000000..5c73f34b48c1
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_opt_in.json
@@ -0,0 +1,29 @@
+{
+    "scenarioName": "gutenberg",
+    "newScenarioState": "enabled",
+    "request": {
+        "urlPattern": "/wpcom/v2/sites/181851495/gutenberg(/+)?\\?(.*)",
+        "method": "POST",
+        "queryParameters": {
+            "editor": {
+                "equalTo": "gutenberg"
+            },
+            "platform": {
+                "equalTo": "mobile"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "editor_mobile": "gutenberg",
+            "editor_web": "gutenberg",
+            "opt_out": "{{request.requestLine.baseUrl}}/wpcom/v2/sites/181851495/gutenberg?editor=classic&platform=mobile"
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_opt_out.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_opt_out.json
new file mode 100644
index 000000000000..0f495d6e7e60
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_gutenberg_opt_out.json
@@ -0,0 +1,29 @@
+{
+    "scenarioName": "gutenberg",
+    "newScenarioState": "Started",
+    "request": {
+        "urlPattern": "/wpcom/v2/sites/181851495/gutenberg(/+)?\\?(.*)",
+        "method": "POST",
+        "queryParameters": {
+            "editor": {
+                "equalTo": "aztec"
+            },
+            "platform": {
+                "equalTo": "mobile"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "editor_mobile": "aztec",
+            "editor_web": "gutenberg",
+            "opt_in": "{{request.requestLine.baseUrl}}/wpcom/v2/sites/181851495/gutenberg?editor=gutenberg&platform=mobile"
+        },
+        "headers": {
+            "Content-Type": "application/json",
+            "Connection": "keep-alive",
+            "Cache-Control": "no-cache, must-revalidate, max-age=0"
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_xposts.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_xposts.json
new file mode 100644
index 000000000000..d21eec8456b2
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/rest_v2_sites_181851495_xposts.json
@@ -0,0 +1,24 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/wpcom/v2/sites/181851495/xposts/",
+        "queryParameters": {
+            "decode_html": {
+                "equalTo": "true"
+            },
+            "_locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "code": "xposts_require_o2_enabled",
+            "message": "Xposts are only available on sites with the o2-plugin enabled.",
+            "data": {
+                "status": 400
+            }
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_categories.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_categories.json
new file mode 100644
index 000000000000..70081b88bdea
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_categories.json
@@ -0,0 +1,51 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/rest/v1.1/sites/.*/categories.*",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "found": 2,
+            "categories": [
+                {
+                    "ID": 1,
+                    "name": "Uncategorized",
+                    "slug": "uncategorized",
+                    "description": "",
+                    "post_count": 1,
+                    "feed_url": "http://infocusphotographers.com/category/uncategorized/feed/",
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/181851495/categories/slug:uncategorized",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/181851495/categories/slug:uncategorized/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/181851495"
+                        }
+                    }
+                },
+                {
+                    "ID": 1674,
+                    "name": "Wedding",
+                    "slug": "wedding",
+                    "description": "",
+                    "post_count": 1,
+                    "feed_url": "http://infocusphotographers.com/category/wedding/feed/",
+                    "parent": 0,
+                    "meta": {
+                        "links": {
+                            "self": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/181851495/categories/slug:wedding",
+                            "help": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/181851495/categories/slug:wedding/help",
+                            "site": "{{request.requestLine.baseUrl}}/rest/v1.1/sites/181851495"
+                        }
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_comments.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_comments.json
new file mode 100644
index 000000000000..b4d8c39383d8
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_comments.json
@@ -0,0 +1,31 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/rest/v1.1/sites/.*/comments.*",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            },
+            "context": {
+                "equalTo": "edit"
+            },
+            "force": {
+                "equalTo": "wpcom"
+            },
+            "number": {
+                "equalTo": "100"
+            },
+            "status": {
+                "equalTo": "all"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "found": 0,
+            "site_ID": 106707880,
+            "comments": []
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_publicize_connections.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_publicize_connections.json
new file mode 100644
index 000000000000..6c0af0b2b5e7
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_publicize_connections.json
@@ -0,0 +1,17 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/rest/v1.1/sites/.*/publicize-connections.*",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "connections": []
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_users.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_users.json
new file mode 100644
index 000000000000..b2a82ad1a82a
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/sites/sites_users.json
@@ -0,0 +1,25 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPattern": "/rest/v1.1/sites/.*/users.*",
+        "queryParameters": {
+            "locale": {
+                "matches": "(.*)"
+            },
+            "authors_only": {
+                "equalTo": "1"
+            },
+            "number": {
+                "equalTo": "100"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "found": 0,
+            "site_ID": 106707880,
+            "comments": []
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts-month.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts-month.json
index 4ce6b8a703a5..6713d39c981f 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts-month.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts-month.json
@@ -30,34 +30,52 @@
                             "date": "2016-02-09 16:07:34",
                             "title": "Home",
                             "type": "page",
-                            "views": 12,
-                            "video_play": false
-                        },
-                        {
-                            "id": 0,
-                            "href": "http://infocusphotographers.com/",
-                            "date": null,
-                            "title": "Home page / Archives",
-                            "type": "homepage",
-                            "views": 2,
+                            "views": 403,
                             "video_play": false
                         },
                         {
                             "id": 22,
                             "href": "http://infocusphotographers.com/our-story/",
                             "date": "2016-02-09 17:32:50",
-                            "title": "Our Story",
+                            "title": "Our Services",
+                            "type": "page",
+                            "views": 306,
+                            "video_play": false
+                        },
+                        {
+                            "id": 24,
+                            "href": "http://infocusphotographers.com/portfolio/",
+                            "date": "2016-02-09 17:33:03",
+                            "title": "About Us",
+                            "type": "page",
+                            "views": 288,
+                            "video_play": false
+                        },
+                        {
+                            "id": 24,
+                            "href": "http://infocusphotographers.com/portfolio/",
+                            "date": "2016-02-09 17:33:03",
+                            "title": "Contact Us",
+                            "type": "page",
+                            "views": 145,
+                            "video_play": false
+                        },
+                        {
+                            "id": 24,
+                            "href": "http://infocusphotographers.com/portfolio/",
+                            "date": "2016-02-09 17:33:03",
+                            "title": "What to know buying your first home",
                             "type": "page",
-                            "views": 1,
+                            "views": 52,
                             "video_play": false
                         },
                         {
                             "id": 24,
                             "href": "http://infocusphotographers.com/portfolio/",
                             "date": "2016-02-09 17:33:03",
-                            "title": "Portfolio",
+                            "title": "Staging tips and tricks",
                             "type": "page",
-                            "views": 1,
+                            "views": 39,
                             "video_play": false
                         }
                     ],
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts.json
index b0cfb73a2134..6c9cac1e5e9b 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_top-posts.json
@@ -11,16 +11,16 @@
                 "{{fnow format='yyyy-MM-dd'}}": {
                     "postviews": [
                         {
-                            "id": 0,
-                            "href": "https://e2eflowtestingmobile.wordpress.com/",
-                            "date": null,
-                            "title": "Home page / Archives",
-                            "type": "homepage",
-                            "views": 183,
+                            "id": 24,
+                            "href": "http://infocusphotographers.com/portfolio/",
+                            "date": "2016-02-09 17:33:03",
+                            "title": "Sticking To It",
+                            "type": "page",
+                            "views": 2535,
                             "video_play": false
                         }
                     ],
-                    "total_views": 183
+                    "total_views": 2535
                 }
             },
             "period": "day"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-month.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-month.json
index e27ff13701bc..5b7391e3b231 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-month.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-month.json
@@ -20,7 +20,7 @@
     "response": {
         "status": 200,
         "jsonBody": {
-            "date": "2019-07-16",
+            "date": "2020-08-01",
             "unit": "month",
             "fields": [
                 "period",
@@ -33,135 +33,112 @@
             ],
             "data": [
                 [
-                    "2018-05-01",
-                    176,
-                    93,
-                    0,
-                    0,
-                    0,
-                    0
-                ],
-                [
-                    "2018-06-01",
-                    86,
-                    58,
+                    "2019-07-01",
+                  1443, 678,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2018-07-01",
-                    48,
-                    29,
+                    "2019-08-01",
+                  1371, 647,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2018-08-01",
-                    44,
-                    23,
+                    "2019-09-01",
+                  1444, 678,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2018-09-01",
-                    63,
-                    32,
+                    "2019-10-01",
+                  1361, 634,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2018-10-01",
-                    70,
-                    39,
+                    "2019-11-01",
+                  1195, 560,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2018-11-01",
-                    81,
-                    35,
+                    "2019-12-01",
+                  1391, 644,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2018-12-01",
-                    40,
-                    26,
+                    "2020-01-01",
+                  1257, 588,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-01-01",
-                    22,
-                    17,
+                    "2020-02-01",
+                  1458, 686,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-02-01",
-                    70,
-                    25,
+                    "2020-03-01",
+                  1716, 808,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-03-01",
-                    34,
-                    23,
+                    "2020-04-01",
+                  1586, 746,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-04-01",
-                    64,
-                    25,
+                    "2020-05-01",
+                  1342, 659,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-05-01",
-                    55,
-                    17,
+                    "2020-06-01",
+                  1280, 643,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-06-01",
-                    52,
-                    19,
+                    "2020-07-01",
+                  1218, 623,
                     0,
                     0,
                     0,
                     0
                 ],
                 [
-                    "2019-07-01",
-                    16,
-                    9,
+                    "2020-08-01",
+                  1233, 655,
                     0,
                     0,
                     0,
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-week.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-week.json
new file mode 100644
index 000000000000..f9569d136e5b
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/stats/stats_visits-week.json
@@ -0,0 +1,37 @@
+{
+    "request": {
+        "method": "GET",
+        "urlPath": "/rest/v1.1/sites/106707880/stats/visits/",
+        "queryParameters": {
+            "unit": {
+                "equalTo": "week"
+            },
+            "quantity": {
+                "matches": "[0-9]+"
+            },
+            "date": {
+                "matches": "(.*)"
+            },
+            "locale": {
+                "matches": "(.*)"
+            }
+        }
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "date": "2020-08-01",
+            "unit": "week",
+            "fields": [
+                "period",
+                "views",
+                "visitors",
+                "likes",
+                "reblogs",
+                "comments",
+                "posts"
+            ],
+            "data": []
+        }
+    }
+}
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/terms/category.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/terms/category.json
index 5873671b8ad1..e2c49ae9dc69 100644
--- a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/terms/category.json
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/terms/category.json
@@ -1,7 +1,7 @@
 {
     "request": {
         "method": "GET",
-        "urlPath": "/rest/v1.1/sites/106707880/taxonomies/category/terms/",
+        "urlPath": "/rest/v1.1/sites/181851495/taxonomies/category/terms/",
         "queryParameters": {
             "number": {
                 "equalTo": "1000"
diff --git a/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/themes/v2_sites_181851495_themes.json b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/themes/v2_sites_181851495_themes.json
new file mode 100644
index 000000000000..69becae76fb3
--- /dev/null
+++ b/libs/mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/themes/v2_sites_181851495_themes.json
@@ -0,0 +1,24 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/wp/v2/sites/181851495/themes",
+    "queryParameters": {
+      "locale": {
+        "matches": "(.*)"
+      },
+      "status": {
+        "equalTo": "active"
+      }
+    }
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": [
+    ],
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache, must-revalidate, max-age=0"
+    }
+  }
+}
diff --git a/libs/stories-android b/libs/stories-android
index 130daec678db..8866392ad6c4 160000
--- a/libs/stories-android
+++ b/libs/stories-android
@@ -1 +1 @@
-Subproject commit 130daec678db776512eaac37e7f1422289b05a40
+Subproject commit 8866392ad6c4a275d3960d033d89a90eb21f5c4c
diff --git a/libs/utils/.circleci/config.yml b/libs/utils/.circleci/config.yml
deleted file mode 100644
index b863a75292c5..000000000000
--- a/libs/utils/.circleci/config.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-version: 2.1
-
-orbs:
-  android: wordpress-mobile/android@0.0.22
-
-commands:
-  copy-gradle-properties:
-    steps:
-      - run:
-          name: Setup gradle.properties
-          command: cp gradle.properties-example gradle.properties
-
-jobs:
-  Lint:
-    executor:
-      name: android/default
-      api-version: "27"
-    steps:
-      - checkout
-      - copy-gradle-properties
-      - android/restore-gradle-cache
-      - run:
-          name: Lint & Checkstyle
-          command: ./gradlew --stacktrace lint checkstyle
-      - android/save-gradle-cache
-      - android/save-lint-results
-  Test:
-    executor:
-      name: android/default
-      api-version: "27"
-    steps:
-      - checkout
-      - copy-gradle-properties
-      - android/restore-gradle-cache
-      - run:
-          name: Test
-          command: ./gradlew --stacktrace test
-      - android/save-gradle-cache
-  Build:
-    executor:
-      name: android/default
-      api-version: "27"
-    steps:
-      - checkout
-      - copy-gradle-properties
-      - android/restore-gradle-cache
-      - run:
-          name: Build
-          command: ./gradlew --stacktrace assembleDebug assembleRelease
-      - android/save-gradle-cache
-
-workflows:
-  WordPress-Utils-Android:
-    jobs:
-      - Lint
-      - Test
-      - Build:
-          requires:
-            - Test
diff --git a/libs/utils/.editorconfig b/libs/utils/.editorconfig
deleted file mode 100644
index 590d68372e0d..000000000000
--- a/libs/utils/.editorconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-[*.{kt,kts}]
-max_line_length=120
diff --git a/libs/utils/.gitignore b/libs/utils/.gitignore
deleted file mode 100644
index 3f762d543ec7..000000000000
--- a/libs/utils/.gitignore
+++ /dev/null
@@ -1,57 +0,0 @@
-# OS X generated file
-.DS_Store
-
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-build/
-build.log
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Eclipse project files
-.settings/
-.classpath
-.project
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-/.idea/*
-
-# IntelliJ/Android Studio exceptions
-!/.idea/vcs.xml
-!/.idea/codeStyles/
-!/.idea/fileTemplates/
-!/.idea/inspectionProfiles/
-!/.idea/scopes/
-!/.idea/codeStyleSettings.xml
-!/.idea/encodings.xml
-!/.idea/copyright/
-!/.idea/compiler.xml
-# Enforce plugins
-!/.idea/externalDependencies.xml
-# Checkstyle configuration
-!/.idea/checkstyle-idea.xml
-
-# Gradle
-.gradle/
-gradle.properties
-
-# Silver Searcher ignore file
-.agignore
-
-# Windows Backup
-*.bak
diff --git a/libs/utils/.idea/checkstyle-idea.xml b/libs/utils/.idea/checkstyle-idea.xml
deleted file mode 100644
index 0cfcc74ce7f4..000000000000
--- a/libs/utils/.idea/checkstyle-idea.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CheckStyle-IDEA">
-    <option name="configuration">
-      <map>
-        <entry key="active-configuration" value="LOCAL_FILE:$PROJECT_DIR$/config/checkstyle.xml:a8c Style" />
-        <entry key="checkstyle-version" value="8.2" />
-        <entry key="copy-libs" value="false" />
-        <entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
-        <entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
-        <entry key="location-2" value="LOCAL_FILE:$PROJECT_DIR$/config/checkstyle.xml:a8c Style" />
-        <entry key="scan-before-checkin" value="false" />
-        <entry key="scanscope" value="AllSourcesWithTests" />
-        <entry key="suppress-errors" value="false" />
-      </map>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/libs/utils/.idea/codeStyleSettings.xml b/libs/utils/.idea/codeStyleSettings.xml
deleted file mode 100644
index c3f56acf6b1c..000000000000
--- a/libs/utils/.idea/codeStyleSettings.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="FIELD_NAME_PREFIX" value="m" />
-        <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-          <value />
-        </option>
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="android" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="com" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="junit" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="net" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="java" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="javax" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="true" />
-            <emptyLine />
-          </value>
-        </option>
-        <option name="RIGHT_MARGIN" value="120" />
-        <AndroidXmlCodeStyleSettings>
-          <option name="USE_CUSTOM_SETTINGS" value="true" />
-        </AndroidXmlCodeStyleSettings>
-        <JavaCodeStyleSettings>
-          <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
-        </JavaCodeStyleSettings>
-        <JetCodeStyleSettings>
-          <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-            <value>
-              <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-            </value>
-          </option>
-          <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-          <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-          <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
-        </JetCodeStyleSettings>
-        <Objective-C-extensions>
-          <file>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-          </file>
-          <class>
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-            <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-          </class>
-          <extensions>
-            <pair source="cpp" header="h" />
-            <pair source="c" header="h" />
-          </extensions>
-        </Objective-C-extensions>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
-          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-          <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
-          <option name="CALL_PARAMETERS_WRAP" value="1" />
-          <option name="METHOD_PARAMETERS_WRAP" value="1" />
-          <option name="RESOURCE_LIST_WRAP" value="1" />
-          <option name="EXTENDS_LIST_WRAP" value="1" />
-          <option name="THROWS_LIST_WRAP" value="1" />
-          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-          <option name="THROWS_KEYWORD_WRAP" value="1" />
-          <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-          <option name="BINARY_OPERATION_WRAP" value="1" />
-          <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-          <option name="TERNARY_OPERATION_WRAP" value="1" />
-          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-          <option name="FOR_STATEMENT_WRAP" value="1" />
-          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-          <option name="ASSIGNMENT_WRAP" value="1" />
-          <option name="ASSERT_STATEMENT_WRAP" value="1" />
-          <option name="IF_BRACE_FORCE" value="3" />
-          <option name="DOWHILE_BRACE_FORCE" value="1" />
-          <option name="WHILE_BRACE_FORCE" value="1" />
-          <option name="FOR_BRACE_FORCE" value="3" />
-          <option name="WRAP_LONG_LINES" value="true" />
-          <option name="METHOD_ANNOTATION_WRAP" value="1" />
-          <option name="FIELD_ANNOTATION_WRAP" value="1" />
-        </codeStyleSettings>
-        <codeStyleSettings language="XML">
-          <option name="FORCE_REARRANGE_MODE" value="1" />
-          <indentOptions>
-            <option name="CONTINUATION_INDENT_SIZE" value="4" />
-          </indentOptions>
-          <arrangement>
-            <rules>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>xmlns:android</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>xmlns:.*</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:id</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:name</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>name</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>style</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*</NAME>
-                      <XML_NAMESPACE>^$</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:layout_width</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:layout_height</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:layout_.*</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:width</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*:height</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*</NAME>
-                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-              <section>
-                <rule>
-                  <match>
-                    <AND>
-                      <NAME>.*</NAME>
-                      <XML_NAMESPACE>.*</XML_NAMESPACE>
-                    </AND>
-                  </match>
-                  <order>BY_NAME</order>
-                </rule>
-              </section>
-            </rules>
-          </arrangement>
-        </codeStyleSettings>
-        <codeStyleSettings language="kotlin">
-          <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-          <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/libs/utils/.idea/codeStyles/Project.xml b/libs/utils/.idea/codeStyles/Project.xml
deleted file mode 100644
index a6f575ec5fc6..000000000000
--- a/libs/utils/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,281 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
-    <JavaCodeStyleSettings>
-      <option name="FIELD_NAME_PREFIX" value="m" />
-      <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
-      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
-      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
-      <option name="IMPORT_LAYOUT_TABLE">
-        <value>
-          <package name="android" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="com" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="junit" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="net" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="org" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="java" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="javax" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="false" />
-          <emptyLine />
-          <package name="" withSubpackages="true" static="true" />
-          <emptyLine />
-        </value>
-      </option>
-    </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-        </value>
-      </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="IMPORT_NESTED_CLASSES" value="true" />
-      <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
-      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
-    </JetCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
-    <codeStyleSettings language="JAVA">
-      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
-      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
-      <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
-      <option name="CALL_PARAMETERS_WRAP" value="1" />
-      <option name="METHOD_PARAMETERS_WRAP" value="1" />
-      <option name="RESOURCE_LIST_WRAP" value="1" />
-      <option name="EXTENDS_LIST_WRAP" value="1" />
-      <option name="THROWS_LIST_WRAP" value="1" />
-      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
-      <option name="THROWS_KEYWORD_WRAP" value="1" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
-      <option name="BINARY_OPERATION_WRAP" value="1" />
-      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="TERNARY_OPERATION_WRAP" value="1" />
-      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
-      <option name="FOR_STATEMENT_WRAP" value="1" />
-      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
-      <option name="ASSIGNMENT_WRAP" value="1" />
-      <option name="ASSERT_STATEMENT_WRAP" value="1" />
-      <option name="IF_BRACE_FORCE" value="3" />
-      <option name="DOWHILE_BRACE_FORCE" value="1" />
-      <option name="WHILE_BRACE_FORCE" value="1" />
-      <option name="FOR_BRACE_FORCE" value="3" />
-      <option name="WRAP_LONG_LINES" value="true" />
-      <option name="METHOD_ANNOTATION_WRAP" value="1" />
-      <option name="FIELD_ANNOTATION_WRAP" value="1" />
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="CALL_PARAMETERS_WRAP" value="5" />
-      <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="CALL_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_WRAP" value="5" />
-      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
-      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
-      <option name="EXTENDS_LIST_WRAP" value="5" />
-      <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
-      <option name="METHOD_ANNOTATION_WRAP" value="1" />
-      <option name="FIELD_ANNOTATION_WRAP" value="1" />
-      <option name="ENUM_CONSTANTS_WRAP" value="5" />
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/libs/utils/.idea/codeStyles/codeStyleConfig.xml b/libs/utils/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c2b23..000000000000
--- a/libs/utils/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/libs/utils/.idea/compiler.xml b/libs/utils/.idea/compiler.xml
deleted file mode 100644
index 9a8b7e5c45ee..000000000000
--- a/libs/utils/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/libs/utils/.idea/copyright/profiles_settings.xml b/libs/utils/.idea/copyright/profiles_settings.xml
deleted file mode 100644
index e7bedf3377d4..000000000000
--- a/libs/utils/.idea/copyright/profiles_settings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
\ No newline at end of file
diff --git a/libs/utils/.idea/encodings.xml b/libs/utils/.idea/encodings.xml
deleted file mode 100644
index 97626ba45445..000000000000
--- a/libs/utils/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/libs/utils/.idea/externalDependencies.xml b/libs/utils/.idea/externalDependencies.xml
deleted file mode 100644
index 687e9fd1e473..000000000000
--- a/libs/utils/.idea/externalDependencies.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalDependencies">
-    <plugin id="CheckStyle-IDEA" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/libs/utils/.idea/inspectionProfiles/Project_Default.xml b/libs/utils/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 4e2b427ce8a3..000000000000
--- a/libs/utils/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="ClassName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <scope name="Tests" level="INFORMATION" enabled="true" />
-    </inspection_tool>
-    <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="ERROR" enabled_by_default="true">
-      <option name="ignoreSwitchStatementsWithDefault" value="false" />
-    </inspection_tool>
-    <inspection_tool class="IllegalIdentifier" enabled="true" level="ERROR" enabled_by_default="true">
-      <scope name="Tests" level="ERROR" enabled="false" />
-    </inspection_tool>
-    <inspection_tool class="KotlinUnusedImport" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="RedundantSemicolon" enabled="true" level="ERROR" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/libs/utils/.idea/inspectionProfiles/profiles_settings.xml b/libs/utils/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 3b312839bf2e..000000000000
--- a/libs/utils/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="PROJECT_PROFILE" value="Project Default" />
-    <option name="USE_PROJECT_PROFILE" value="true" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/libs/utils/.idea/vcs.xml b/libs/utils/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4cb4..000000000000
--- a/libs/utils/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/libs/utils/README.md b/libs/utils/README.md
deleted file mode 100644
index 9a17a4008c5a..000000000000
--- a/libs/utils/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# WordPress-Utils-Android
-
-Collection of utility methods for Android and WordPress.
-
-## Use the library in your project
-
-* In your build.gradle:
-```groovy
-dependencies {
-    compile 'org.wordpress:utils:1.30.0' // use version 1.30.0
-}
-```
-
-## Publish an updated version to your local maven repository
-
-You can bump the [version name in the main build file: `WordPressUtils/build.gradle`][1]. After updating the build file, you can build, and publish the library to your local maven repo. That will let you try the new version in your app for example.
-
-```shell
-$ ./gradlew assemble test publishToMavenLocal
-```
-
-## Publish it to Bintray
-
-When a new version is ready to be published to the remote repository, use the following command to publish it to Bintray:
-
-```shell
-$ ./gradlew clean build
-$ ./gradlew bintrayUpload -PbintrayUser=FIXME -PbintrayKey=FIXME
-```
-
-## Apps and libraries using WordPress-Utils-Android:
-
-- [WordPress for Android][2]
-- [FluxC][3]
-
-## License
-Dual licensed under MIT, and GPL.
-
-[1]: https://github.com/wordpress-mobile/WordPress-Utils-Android/blob/a9fbe8e6597d44055ec2180dbf45aecbfc332a20/WordPressUtils/build.gradle#L37
-[2]: https://github.com/wordpress-mobile/WordPress-Android
-[3]: https://github.com/wordpress-mobile/WordPress-FluxC-Android
diff --git a/libs/utils/WordPressUtils/README.md b/libs/utils/WordPressUtils/README.md
deleted file mode 100644
index 62a759585e63..000000000000
--- a/libs/utils/WordPressUtils/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# org.wordpress.android.util
\ No newline at end of file
diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle
deleted file mode 100644
index 5cb460031f40..000000000000
--- a/libs/utils/WordPressUtils/build.gradle
+++ /dev/null
@@ -1,122 +0,0 @@
-buildscript {
-    ext.kotlinVersion = '1.4.10'
-    ext.kotlin_ktx_version = '1.2.0'
-
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
-    }
-}
-
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-
-repositories {
-    google()
-    jcenter()
-}
-
-dependencies {
-    implementation 'org.apache.commons:commons-text:1.1'
-    implementation 'com.android.volley:volley:1.1.1'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'org.greenrobot:eventbus:3.0.0'
-
-    implementation "androidx.core:core-ktx:$kotlin_ktx_version"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
-
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
-    testImplementation "org.robolectric:robolectric:4.4"
-    testImplementation 'androidx.test:core:1.0.0'
-
-    lintChecks 'org.wordpress:lint:1.0.1'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test:rules:1.1.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
-
-}
-
-android {
-    useLibrary 'org.apache.http.legacy'
-
-    compileSdkVersion 29
-
-    defaultConfig {
-        versionName "1.30"
-        minSdkVersion 18
-        targetSdkVersion 29
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    testOptions {
-        unitTests {
-            includeAndroidResources = true
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
-    }
-}
-
-android.libraryVariants.all { variant ->
-    task("generate${variant.name}Javadoc", type: Javadoc) {
-        description "Generates Javadoc for $variant.name."
-        source = variant.javaCompile.source
-
-        options {
-            links "http://docs.oracle.com/javase/7/docs/api/"
-        }
-        exclude '**/R.java'
-        doFirst {
-            classpath =
-                    files(variant.javaCompile.classpath.files,
-                            project.android.getBootClasspath())
-        }
-    }
-}
-
-bintray {
-    user = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER')
-    key = project.hasProperty('bintrayKey') ? project.property('bintrayKey') : System.getenv('BINTRAY_KEY')
-    publications = ['UtilsPublication']
-    publish = true
-    pkg {
-        repo = 'maven'
-        name = 'utils'
-        userOrg = 'wordpress-mobile'
-        licenses = ['MIT', 'GPL']
-        vcsUrl = 'https://github.com/wordpress-mobile/WordPress-Utils-Android.git'
-        version {
-            name = android.defaultConfig.versionName
-            desc = 'Utils library for Android'
-            released  = new Date()
-        }
-    }
-}
-
-project.afterEvaluate {
-    publishing {
-        publications {
-            UtilsPublication(MavenPublication) {
-                from components.release
-                groupId 'org.wordpress'
-                artifactId 'utils'
-                version android.defaultConfig.versionName
-            }
-        }
-    }
-}
-
diff --git a/libs/utils/WordPressUtils/gradle.properties-example b/libs/utils/WordPressUtils/gradle.properties-example
deleted file mode 100644
index c9edd062db8b..000000000000
--- a/libs/utils/WordPressUtils/gradle.properties-example
+++ /dev/null
@@ -1,7 +0,0 @@
-android.useAndroidX=true
-ossrhUsername=hello
-ossrhPassword=world
-
-signing.keyId=byebye
-signing.password=secret
-signing.secretKeyRingFile=/home/user/secret.gpg
diff --git a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/ImageUtilsTest.java b/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/ImageUtilsTest.java
deleted file mode 100644
index 05b0af2f7ade..000000000000
--- a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/ImageUtilsTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.wordpress.android.util;
-
-import android.graphics.BitmapFactory;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ImageUtilsTest {
-    @Test
-    public void testGetScaleForResizingReturnsOneWhenMaxSizeIsZero() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        int scale = ImageUtils.getScaleForResizing(0, options);
-
-        assertEquals(1, scale);
-    }
-
-    @Test
-    public void testGetScaleForResizingSameSizeReturnsOne() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.outHeight = 100;
-        options.outWidth = 100;
-        int maxSize = 100;
-
-        int scale = ImageUtils.getScaleForResizing(maxSize, options);
-
-        assertEquals(1, scale);
-    }
-
-    @Test
-    public void testGetScaleForResizingPortraitMaxHeightSameAsMaxSizeReturnsOne() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.outHeight = 100;
-        options.outWidth = 1;
-        int maxSize = 100;
-
-        int scale = ImageUtils.getScaleForResizing(maxSize, options);
-
-        assertEquals(1, scale);
-    }
-
-    @Test
-    public void testGetScaleForResizingLandscapeMaxWidthSameAsMaxSizeReturnsOne() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.outHeight = 1;
-        options.outWidth = 100;
-        int maxSize = 100;
-
-        int scale = ImageUtils.getScaleForResizing(maxSize, options);
-
-        assertEquals(1, scale);
-    }
-
-    @Test
-    public void testGetScaleForResizingDoubleSizeReturnsTwo() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.outHeight = 100;
-        options.outWidth = 200;
-        int maxSize = 100;
-
-        int scale = ImageUtils.getScaleForResizing(maxSize, options);
-
-        assertEquals(2, scale);
-    }
-
-    @Test
-    public void testGetScaleForResizingThreeTimesSizeReturnsTwo() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.outHeight = 100;
-        options.outWidth = 300;
-        int maxSize = 100;
-
-        int scale = ImageUtils.getScaleForResizing(maxSize, options);
-
-        assertEquals(2, scale);
-    }
-
-    @Test
-    public void testGetScaleForResizingEightTimesSizeReturnsEight() {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.outHeight = 100;
-        options.outWidth = 800;
-        int maxSize = 100;
-
-        int scale = ImageUtils.getScaleForResizing(maxSize, options);
-
-        assertEquals(8, scale);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/JSONUtilsTest.java b/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/JSONUtilsTest.java
deleted file mode 100644
index e02656fe4f3f..000000000000
--- a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/JSONUtilsTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.wordpress.android.util;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.junit.Test;
-
-public class JSONUtilsTest {
-    @Test
-    public void testQueryJSONNullSource1() {
-        JSONUtils.queryJSON((JSONObject) null, "", "");
-    }
-
-    @Test
-    public void testQueryJSONNullSource2() {
-        JSONUtils.queryJSON((JSONArray) null, "", "");
-    }
-
-    @Test
-    public void testQueryJSONNullQuery1() {
-        JSONUtils.queryJSON(new JSONObject(), null, "");
-    }
-
-    @Test
-    public void testQueryJSONNullQuery2() {
-        JSONUtils.queryJSON(new JSONArray(), null, "");
-    }
-
-    @Test
-    public void testQueryJSONNullReturnValue1() {
-        JSONUtils.queryJSON(new JSONObject(), "", null);
-    }
-
-    @Test
-    public void testQueryJSONNullReturnValue2() {
-        JSONUtils.queryJSON(new JSONArray(), "", null);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/PhotonUtilsTest.java b/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/PhotonUtilsTest.java
deleted file mode 100644
index 0e2d4b301706..000000000000
--- a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/PhotonUtilsTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.wordpress.android.util;
-
-import org.junit.Test;
-import org.wordpress.android.util.PhotonUtils.Quality;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-
-
-public class PhotonUtilsTest {
-    @Test
-    public void getPhotonImageUrlIsEmptyWhenUrlIsNull() {
-        String photonUrl = PhotonUtils.getPhotonImageUrl(null, 0, 1);
-
-        assertThat(photonUrl, equalTo(""));
-    }
-
-    @Test
-    public void getPhotonImageUrlIsEmptyWhenUrlIsEmpty() {
-        String photonUrl = PhotonUtils.getPhotonImageUrl("", 0, 1);
-
-        assertThat(photonUrl, equalTo(""));
-    }
-
-    @Test
-    public void getPhotonImageUrlReturnsImageUrlOnNoScheme() {
-        String imageUrl = "wordpress.com";
-        String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 0, 1);
-
-        assertThat(photonUrl, equalTo(imageUrl));
-    }
-
-    @Test
-    public void getPhotonImageUrlReturnsMshots() {
-        String imageUrl = "http://test.wordpress.com/mshots/test.jpg?query=dummy";
-        String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 0, 1);
-
-        assertThat(photonUrl, equalTo("http://test.wordpress.com/mshots/test.jpg?w=0&h=1"));
-    }
-
-    @Test
-    public void getPhotonImageUrlReturnsCorrectQuality() {
-        Map<Quality, String> qualities = new HashMap<>();
-        qualities.put(Quality.HIGH, "100");
-        qualities.put(Quality.MEDIUM, "65");
-        qualities.put(Quality.LOW, "35");
-
-        String imageUrl = "http://test.wordpress.com/test.jpg?query=dummy";
-
-        for (Quality quality : qualities.keySet()) {
-            String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 0, 1, quality);
-            assertThat(photonUrl, containsString("&quality=" + qualities.get(quality)));
-        }
-    }
-
-    @Test
-    public void getPhotonImageUrlUsesResize() {
-        String imageUrl = "http://test.wordpress.com/test.jpg?query=dummy";
-        String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("http://test.wordpress.com/test.jpg?strip=info&quality=65&resize=2,1"));
-    }
-
-    @Test
-    public void getPhotonImageUrlManageSslOnPhotonUrl() {
-        String imageUrl = "https://i0.wp.com/test.jpg?query=dummy";
-        String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("https://i0.wp.com/test.jpg?strip=info&quality=65&resize=2,1"));
-
-        imageUrl = "https://i0.wp.com/test.jpg?query=dummy&ssl=1";
-        photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("https://i0.wp.com/test.jpg?strip=info&quality=65&resize=2,1&ssl=1"));
-    }
-
-    @Test
-    public void getPhotonImageUrlDoNotUseSslOnWordPressCom() {
-        String imageUrl = "https://test.wordpress.com/test.jpg?query=dummy";
-        String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("https://test.wordpress.com/test.jpg?strip=info&quality=65&resize=2,1"));
-
-        imageUrl = "https://test.wordpress.com/test.jpg?query=dummy&ssl=1";
-        photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("https://test.wordpress.com/test.jpg?strip=info&quality=65&resize=2,1"));
-    }
-
-    @Test
-    public void getPhotonImageUrlUsesSslOnHttpsImageUrl() {
-        String imageUrl = "http://mysite.com/test.jpg?query=dummy";
-        String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("https://i0.wp.com/mysite.com/test.jpg?strip=info&quality=65&resize=2,1"));
-
-        imageUrl = "https://mysite.com/test.jpg?query=dummy&ssl=1";
-        photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 2, 1);
-
-        assertThat(photonUrl, equalTo("https://i0.wp.com/mysite.com/test.jpg?strip=info&quality=65&resize=2,1&ssl=1"));
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/ShortcodeUtilsTest.java b/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/ShortcodeUtilsTest.java
deleted file mode 100644
index 32435e40e6e8..000000000000
--- a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/ShortcodeUtilsTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.wordpress.android.util;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class ShortcodeUtilsTest {
-    @Test
-    public void testGetVideoPressShortcodeFromId() {
-        assertEquals("[wpvideo abcd1234]", ShortcodeUtils.getVideoPressShortcodeFromId("abcd1234"));
-    }
-
-    @Test
-    public void testGetVideoPressShortcodeFromNullId() {
-        assertEquals("", ShortcodeUtils.getVideoPressShortcodeFromId(null));
-    }
-
-    @Test
-    public void testGetVideoPressIdFromCorrectShortcode() {
-        assertEquals("abcd1234", ShortcodeUtils.getVideoPressIdFromShortCode("[wpvideo abcd1234]"));
-    }
-
-    @Test
-    public void testGetVideoPressIdFromInvalidShortcode() {
-        assertEquals("", ShortcodeUtils.getVideoPressIdFromShortCode("[other abcd1234]"));
-    }
-
-    @Test
-    public void testGetVideoPressIdFromNullShortcode() {
-        assertEquals("", ShortcodeUtils.getVideoPressIdFromShortCode(null));
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java b/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java
deleted file mode 100644
index 9cf88220712d..000000000000
--- a/libs/utils/WordPressUtils/src/androidTest/java/org/wordpress/android/util/UrlUtilsTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.wordpress.android.util;
-
-import org.junit.Test;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class UrlUtilsTest {
-    @Test
-    public void testGetDomainFromUrlWithEmptyStringDoesNotReturnNull() {
-        assertNotNull(UrlUtils.getHost(""));
-    }
-
-    @Test
-    public void testGetDomainFromUrlWithNoHostDoesNotReturnNull() {
-        assertNotNull(UrlUtils.getHost("wordpress"));
-    }
-
-    @Test
-    public void testGetDomainFromUrlWithHostReturnsHost() {
-        String url = "http://www.wordpress.com";
-        String host = UrlUtils.getHost(url);
-
-        assertTrue(host.equals("www.wordpress.com"));
-    }
-
-    @Test
-    public void testAppendUrlParameter1() {
-        String url = UrlUtils.appendUrlParameter("http://wp.com/test", "preview", "true");
-        assertEquals("http://wp.com/test?preview=true", url);
-    }
-
-    @Test
-    public void testAppendUrlParameter2() {
-        String url = UrlUtils.appendUrlParameter("http://wp.com/test?q=pony", "preview", "true");
-        assertEquals("http://wp.com/test?q=pony&preview=true", url);
-    }
-
-    @Test
-    public void testAppendUrlParameter3() {
-        String url = UrlUtils.appendUrlParameter("http://wp.com/test?q=pony#unicorn", "preview", "true");
-        assertEquals("http://wp.com/test?q=pony&preview=true#unicorn", url);
-    }
-
-    @Test
-    public void testAppendUrlParameter4() {
-        String url = UrlUtils.appendUrlParameter("/relative/test", "preview", "true");
-        assertEquals("/relative/test?preview=true", url);
-    }
-
-    @Test
-    public void testAppendUrlParameter5() {
-        String url = UrlUtils.appendUrlParameter("/relative/", "preview", "true");
-        assertEquals("/relative/?preview=true", url);
-    }
-
-    @Test
-    public void testAppendUrlParameter6() {
-        String url = UrlUtils.appendUrlParameter("http://wp.com/test/", "preview", "true");
-        assertEquals("http://wp.com/test/?preview=true", url);
-    }
-
-    @Test
-    public void testAppendUrlParameter7() {
-        String url = UrlUtils.appendUrlParameter("http://wp.com/test/?q=pony", "preview", "true");
-        assertEquals("http://wp.com/test/?q=pony&preview=true", url);
-    }
-
-    @Test
-    public void testAppendUrlParameters1() {
-        Map<String, String> params = new HashMap<>();
-        params.put("w", "200");
-        params.put("h", "300");
-        String url = UrlUtils.appendUrlParameters("http://wp.com/test", params);
-        if (!url.equals("http://wp.com/test?h=300&w=200") && !url.equals("http://wp.com/test?w=200&h=300")) {
-            assertTrue("failed test on url: " + url, false);
-        }
-    }
-
-    @Test
-    public void testAppendUrlParameters2() {
-        Map<String, String> params = new HashMap<>();
-        params.put("h", "300");
-        params.put("w", "200");
-        String url = UrlUtils.appendUrlParameters("/relative/test", params);
-        if (!url.equals("/relative/test?h=300&w=200") && !url.equals("/relative/test?w=200&h=300")) {
-            assertTrue("failed test on url: " + url, false);
-        }
-    }
-
-    @Test
-    public void testHttps1() {
-        assertFalse(UrlUtils.isHttps(buildURL("http://wordpress.com/xmlrpc.php")));
-    }
-
-    @Test
-    public void testHttps2() {
-        assertFalse(UrlUtils.isHttps(buildURL("http://wordpress.com#.b.com/test")));
-    }
-
-    @Test
-    public void testHttps3() {
-        assertFalse(UrlUtils.isHttps(buildURL("http://wordpress.com/xmlrpc.php")));
-    }
-
-    @Test
-    public void testHttps4() {
-        assertTrue(UrlUtils.isHttps(buildURL("https://wordpress.com")));
-    }
-
-    @Test
-    public void testHttps5() {
-        assertTrue(UrlUtils.isHttps(buildURL("https://wordpress.com/test#test")));
-    }
-
-    private URL buildURL(String address) {
-        URL url = null;
-        try {
-            url = new URL(address);
-        } catch (MalformedURLException e) {
-        }
-        return url;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/AndroidManifest.xml b/libs/utils/WordPressUtils/src/main/AndroidManifest.xml
deleted file mode 100644
index d52c0f661462..000000000000
--- a/libs/utils/WordPressUtils/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="org.wordpress.android.util">
-  <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-</manifest>
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AccessibilityEventListener.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AccessibilityEventListener.java
deleted file mode 100644
index 78b9ee6d9fd6..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AccessibilityEventListener.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.wordpress.android.util;
-
-import android.view.accessibility.AccessibilityEvent;
-
-public interface AccessibilityEventListener {
-    void onResult(AccessibilityEvent event);
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AccessibilityUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AccessibilityUtils.java
deleted file mode 100644
index 3c6ad25eebd5..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AccessibilityUtils.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.view.AccessibilityDelegateCompat;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
-
-import com.google.android.material.snackbar.Snackbar;
-
-import org.wordpress.android.util.AppLog.T;
-
-import static android.content.Context.ACCESSIBILITY_SERVICE;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
-
-public class AccessibilityUtils {
-    private static final int SNACKBAR_WITH_ACTION_DURATION_IN_MILLIS = 10000;
-
-    public static boolean isAccessibilityEnabled(Context ctx) {
-        AccessibilityManager am = (AccessibilityManager) ctx.getSystemService(ACCESSIBILITY_SERVICE);
-        return am != null && am.isEnabled();
-    }
-
-    /**
-     * If the default duration is LENGTH_INDEFINITE, ignore accessibility duration and return LENGTH_INDEFINITE.
-     * If the accessibility is enabled, returns increased snackbar duration, otherwise returns defaultDuration.
-     *
-     * @param defaultDuration Either be one of the predefined lengths: LENGTH_SHORT, LENGTH_LONG, or a custom duration
-     *                        in milliseconds.
-     */
-    public static int getSnackbarDuration(Context ctx, int defaultDuration) {
-        return defaultDuration == Snackbar.LENGTH_INDEFINITE ? Snackbar.LENGTH_INDEFINITE
-                : isAccessibilityEnabled(ctx) ? SNACKBAR_WITH_ACTION_DURATION_IN_MILLIS : defaultDuration;
-    }
-
-    public static void setActionModeDoneButtonContentDescription(@Nullable final Activity activity,
-                                                                 @NonNull final String contentDescription) {
-        if (activity != null) {
-            View decorView = activity.getWindow().getDecorView();
-
-            decorView.post(new Runnable() {
-                @Override public void run() {
-                    View doneButton = activity.findViewById(androidx.appcompat.R.id.action_mode_close_button);
-
-                    if (doneButton != null) {
-                        doneButton.setContentDescription(contentDescription);
-                    }
-                }
-            });
-        }
-    }
-
-    public static void addPopulateAccessibilityEventFocusedListener(@NonNull final View target,
-                                                                    @NonNull final AccessibilityEventListener
-                                                                            listener) {
-        ViewCompat.setAccessibilityDelegate(target, new AccessibilityDelegateCompat() {
-            @Override public void onPopulateAccessibilityEvent(View host, AccessibilityEvent event) {
-                if (event.getEventType() == TYPE_VIEW_ACCESSIBILITY_FOCUSED) {
-                    listener.onResult(event);
-                }
-                super.onPopulateAccessibilityEvent(host, event);
-            }
-        });
-    }
-
-    public static void disableHintAnnouncement(@NonNull TextView textView) {
-        setAccessibilityDelegateSafely(textView, new AccessibilityDelegateCompat() {
-            @Override public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {
-                super.onInitializeAccessibilityNodeInfo(host, info);
-                info.setHintText(null);
-            }
-        });
-    }
-
-    /**
-     * When the minsdk is 28 this can be replaced by adding android:accessibilityHeading="true" as a property to the
-     * view's xml declaration.
-     * @param view that will become a heading.
-     */
-    public static void enableAccessibilityHeading(@NonNull View view) {
-        setAccessibilityDelegateSafely(view, new AccessibilityDelegateCompat() {
-            @Override public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {
-                super.onInitializeAccessibilityNodeInfo(host, info);
-                info.setHeading(true);
-            }
-        });
-    }
-
-    public static void setAccessibilityDelegateSafely(View view,
-                                                      AccessibilityDelegateCompat accessibilityDelegateCompat) {
-        if (ViewCompat.hasAccessibilityDelegate(view)) {
-            final String errorMessage = "View already has an AccessibilityDelegate.";
-            if (PackageUtils.isDebugBuild()) {
-                throw new RuntimeException(errorMessage);
-            }
-            AppLog.e(T.UTILS, errorMessage);
-        } else {
-            ViewCompat.setAccessibilityDelegate(view, accessibilityDelegateCompat);
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ActivityUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ActivityUtils.java
deleted file mode 100644
index 0751b0a5d977..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ActivityUtils.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-
-import androidx.annotation.Nullable;
-
-public class ActivityUtils {
-    /**
-     * Hides the keyboard in the given {@link Activity}'s current focus using the
-     * {@link InputMethodManager#HIDE_NOT_ALWAYS} flag, which will hide the keyboard unless it was originally shown
-     * with {@link InputMethodManager#SHOW_FORCED}.
-     */
-    public static void hideKeyboard(Activity activity) {
-        if (activity != null && activity.getCurrentFocus() != null) {
-            InputMethodManager inputManager = (InputMethodManager) activity.getSystemService(
-                    Context.INPUT_METHOD_SERVICE);
-            inputManager.hideSoftInputFromWindow(activity.getCurrentFocus().getWindowToken(),
-                                                 InputMethodManager.HIDE_NOT_ALWAYS);
-        }
-    }
-
-    /**
-     * Hides the keyboard for the given {@link View}. No {@link InputMethodManager} flag is used, therefore the
-     * keyboard is forcibly hidden regardless of the circumstances.
-     */
-    public static void hideKeyboardForced(@Nullable final View view) {
-        if (view == null) {
-            return;
-        }
-        InputMethodManager inputMethodManager =
-                (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
-    }
-
-    /**
-     * Shows the keyboard for the given {@link View} using the {@link InputMethodManager#SHOW_IMPLICIT} flag,
-     * which is an implicit request (i.e. not requested by the user) to show the keyboard.
-     */
-    public static void showKeyboard(@Nullable final View view) {
-        if (view == null) {
-            return;
-        }
-        InputMethodManager inputMethodManager =
-                (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
-        inputMethodManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
-    }
-
-    public static boolean isDeepLinking(Intent intent) {
-        return Intent.ACTION_VIEW.equals(intent.getAction());
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtils.java
deleted file mode 100644
index 6a09c42f20c1..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtils.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2011 wordpress.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wordpress.android.util;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-
-public class AlertUtils {
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param messageId
-     */
-    public static void showAlert(Context context, int titleId, int messageId) {
-        Dialog dlg = new AlertDialog.Builder(context)
-                .setTitle(titleId)
-                .setPositiveButton(android.R.string.ok, null)
-                .setMessage(messageId)
-                .create();
-
-        dlg.show();
-    }
-
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param message
-     */
-    public static void showAlert(Context context, int titleId, String message) {
-        Dialog dlg = new AlertDialog.Builder(context)
-                .setTitle(titleId)
-                .setPositiveButton(android.R.string.ok, null)
-                .setMessage(message)
-                .create();
-
-        dlg.show();
-    }
-
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param messageId
-     * @param positiveButtontxt
-     * @param positiveListener
-     * @param negativeButtontxt
-     * @param negativeListener
-     */
-    public static void showAlert(Context context, int titleId, int messageId,
-                                 CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener,
-                                 CharSequence negativeButtontxt, DialogInterface.OnClickListener negativeListener) {
-        Dialog dlg = new AlertDialog.Builder(context)
-                .setTitle(titleId)
-                .setPositiveButton(positiveButtontxt, positiveListener)
-                .setNegativeButton(negativeButtontxt, negativeListener)
-                .setMessage(messageId)
-                .setCancelable(false)
-                .create();
-
-        dlg.show();
-    }
-
-    /**
-     * Show Alert Dialog
-     * @param context
-     * @param titleId
-     * @param message
-     * @param positiveButtontxt
-     * @param positiveListener
-     */
-    public static void showAlert(Context context, int titleId, String message,
-                                 CharSequence positiveButtontxt, DialogInterface.OnClickListener positiveListener) {
-        Dialog dlg = new AlertDialog.Builder(context)
-                .setTitle(titleId)
-                .setPositiveButton(positiveButtontxt, positiveListener)
-                .setMessage(message)
-                .setCancelable(false)
-                .create();
-
-        dlg.show();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
deleted file mode 100644
index f1d93476c24b..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
+++ /dev/null
@@ -1,382 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.NonNull;
-
-import org.wordpress.android.util.helpers.logfile.LogFileCleaner;
-import org.wordpress.android.util.helpers.logfile.LogFileProvider;
-import org.wordpress.android.util.helpers.logfile.LogFileWriter;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.NoSuchElementException;
-import java.util.TimeZone;
-
-import static java.lang.String.format;
-
-/**
- * simple wrapper for Android log calls, enables recording and displaying log
- */
-public class AppLog {
-    // T for Tag
-    public enum T {
-        READER,
-        EDITOR,
-        MEDIA,
-        NUX,
-        API,
-        STATS,
-        UTILS,
-        NOTIFS,
-        DB,
-        POSTS,
-        PAGES,
-        COMMENTS,
-        THEMES,
-        TESTS,
-        PROFILING,
-        SIMPERIUM,
-        SUGGESTION,
-        MAIN,
-        SETTINGS,
-        PLANS,
-        PEOPLE,
-        SHARING,
-        PLUGINS,
-        ACTIVITY_LOG,
-        JETPACK_REMOTE_INSTALL,
-        SUPPORT,
-        SITE_CREATION,
-        DOMAIN_REGISTRATION,
-        FEATURE_ANNOUNCEMENT,
-        PREPUBLISHING_NUDGES
-    }
-
-    public static final String TAG = "WordPress";
-    public static final int HEADER_LINE_COUNT = 2;
-    private static boolean mEnableRecording = false;
-    private static List<AppLogListener> mListeners = new ArrayList<>(0);
-    private static TimeZone mUtcTimeZone = TimeZone.getTimeZone("UTC");
-
-    private AppLog() {
-        throw new AssertionError();
-    }
-
-    /**
-     * Capture log so it can be displayed by AppLogViewerActivity
-     * @param enable A boolean flag to capture log. Default is false, pass true to enable recording
-     */
-    public static void enableRecording(boolean enable) {
-        mEnableRecording = enable;
-    }
-
-    public static void addListener(@NonNull AppLogListener listener) {
-        mListeners.add(listener);
-    }
-
-    public static void removeListeners() {
-        mListeners.clear();
-    }
-
-    public interface AppLogListener {
-        void onLog(T tag, LogLevel logLevel, String message);
-    }
-
-    /**
-     * Add a LogFileWriter that will persist logs to disk
-     * @param context The current application context
-     * @param maxLogCount The maximum number of logs that should be stored
-     */
-     public static void enableLogFilePersistence(Context context, int maxLogCount) {
-         LogFileProvider logFileProvider = LogFileProvider.fromContext(context);
-         new LogFileCleaner(logFileProvider, maxLogCount).clean();
-
-         sLogFileWriter = new LogFileWriter(logFileProvider);
-         sLogFileWriter.write(getAppInfoHeaderText(context) + "\n");
-         sLogFileWriter.write(getDeviceInfoHeaderText(context) + "\n");
-    }
-
-    private static LogFileWriter sLogFileWriter;
-
-    /**
-     * Sends a VERBOSE log message
-     * @param tag Used to identify the source of a log message.
-     * It usually identifies the class or activity where the log call occurs.
-     * @param message The message you would like logged.
-     */
-    public static void v(T tag, String message) {
-        message = StringUtils.notNullStr(message);
-        Log.v(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.v, message);
-    }
-
-    /**
-     * Sends a DEBUG log message
-     * @param tag Used to identify the source of a log message.
-     * It usually identifies the class or activity where the log call occurs.
-     * @param message The message you would like logged.
-     */
-    public static void d(T tag, String message) {
-        message = StringUtils.notNullStr(message);
-        Log.d(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.d, message);
-    }
-
-    /**
-     * Sends a INFO log message
-     * @param tag Used to identify the source of a log message.
-     * It usually identifies the class or activity where the log call occurs.
-     * @param message The message you would like logged.
-     */
-    public static void i(T tag, String message) {
-        message = StringUtils.notNullStr(message);
-        Log.i(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.i, message);
-    }
-
-    /**
-     * Sends a WARN log message
-     * @param tag Used to identify the source of a log message.
-     * It usually identifies the class or activity where the log call occurs.
-     * @param message The message you would like logged.
-     */
-    public static void w(T tag, String message) {
-        message = StringUtils.notNullStr(message);
-        Log.w(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.w, message);
-    }
-
-    /**
-     * Sends a ERROR log message
-     * @param tag Used to identify the source of a log message.
-     * It usually identifies the class or activity where the log call occurs.
-     * @param message The message you would like logged.
-     */
-    public static void e(T tag, String message) {
-        message = StringUtils.notNullStr(message);
-        Log.e(TAG + "-" + tag.toString(), message);
-        addEntry(tag, LogLevel.e, message);
-    }
-
-    /**
-     * Send a ERROR log message and log the exception.
-     * @param tag Used to identify the source of a log message.
-     * It usually identifies the class or activity where the log call occurs.
-     * @param message The message you would like logged.
-     * @param tr An exception to log
-     */
-    public static void e(T tag, String message, Throwable tr) {
-        message = StringUtils.notNullStr(message);
-        Log.e(TAG + "-" + tag.toString(), message, tr);
-        addEntry(tag, LogLevel.e, message + " - exception: " + tr.getMessage());
-        addEntry(tag, LogLevel.e, "StackTrace: " + getStringStackTrace(tr));
-    }
-
-    /**
-     * Sends a ERROR log message and the exception with StackTrace
-     * @param tag Used to identify the source of a log message. It usually identifies the class or activity where the
-     *           log call occurs.
-     * @param tr An exception to log to get StackTrace
-     */
-    public static void e(T tag, Throwable tr) {
-        Log.e(TAG + "-" + tag.toString(), tr.getMessage(), tr);
-        addEntry(tag, LogLevel.e, tr.getMessage());
-        addEntry(tag, LogLevel.e, "StackTrace: " + getStringStackTrace(tr));
-    }
-
-    /**
-     * Sends a ERROR log message
-     * @param tag Used to identify the source of a log message. It usually identifies the class or activity where the
-     *           log call occurs.
-     * @param volleyErrorMsg
-     * @param statusCode
-     */
-    public static void e(T tag, String volleyErrorMsg, int statusCode) {
-        if (TextUtils.isEmpty(volleyErrorMsg)) {
-            return;
-        }
-        String logText;
-        if (statusCode == -1) {
-            logText = volleyErrorMsg;
-        } else {
-            logText = volleyErrorMsg + ", status " + statusCode;
-        }
-        Log.e(TAG + "-" + tag.toString(), logText);
-        addEntry(tag, LogLevel.w, logText);
-    }
-
-    // --------------------------------------------------------------------------------------------------------
-
-    private static final int MAX_ENTRIES = 99;
-
-    public enum LogLevel {
-        v, d, i, w, e;
-    }
-
-    private static class LogEntry {
-        final LogLevel mLogLevel;
-        final String mLogText;
-        final java.util.Date mDate;
-        final T mLogTag;
-
-        LogEntry(LogLevel logLevel, String logText, T logTag) {
-            mLogLevel = logLevel;
-            mDate = new Date();
-            if (logText == null) {
-                mLogText = "null";
-            } else {
-                mLogText = logText;
-            }
-            mLogTag = logTag;
-        }
-
-        private String formatLogDate() {
-            SimpleDateFormat sdf = new SimpleDateFormat("MMM-dd kk:mm", Locale.US);
-            sdf.setTimeZone(mUtcTimeZone);
-            return sdf.format(mDate);
-        }
-
-        private String toHtml() {
-            StringBuilder sb = new StringBuilder();
-            sb.append("[");
-            sb.append(formatLogDate()).append(" ");
-            sb.append(mLogTag.name()).append(" ");
-            sb.append(mLogLevel.name());
-            sb.append("] ");
-            sb.append(TextUtils.htmlEncode(mLogText).replace("\n", "<br />"));
-            return sb.toString();
-        }
-
-        @Override
-        public @NonNull String toString() {
-            return "["
-            + formatLogDate()
-            + " "
-            + mLogTag.name()
-            + "] "
-            + mLogText
-            + "\n";
-        }
-    }
-
-    private static class LogEntryList extends ArrayList<LogEntry> {
-        private synchronized boolean addEntry(LogEntry entry) {
-            if (size() >= MAX_ENTRIES) {
-                removeFirstEntry();
-            }
-            return add(entry);
-        }
-
-        private void removeFirstEntry() {
-            Iterator<LogEntry> it = iterator();
-            if (!it.hasNext()) {
-                return;
-            }
-            try {
-                remove(it.next());
-            } catch (NoSuchElementException e) {
-                // ignore
-            }
-        }
-    }
-
-    private static LogEntryList mLogEntries = new LogEntryList();
-
-    private static void addEntry(T tag, LogLevel level, String text) {
-        // Call our listeners if any
-        for (AppLogListener listener : mListeners) {
-            listener.onLog(tag, level, text);
-        }
-        // Record entry if enabled
-        if (mEnableRecording) {
-            LogEntry entry = new LogEntry(level, text, tag);
-            mLogEntries.addEntry(entry);
-
-            if (sLogFileWriter != null) {
-                sLogFileWriter.write(entry.toString());
-            }
-        }
-    }
-
-    private static String getStringStackTrace(Throwable throwable) {
-        StringWriter errors = new StringWriter();
-        throwable.printStackTrace(new PrintWriter(errors));
-        return errors.toString();
-    }
-
-
-    private static String getAppInfoHeaderText(Context context) {
-        StringBuilder sb = new StringBuilder();
-        PackageManager packageManager = context.getPackageManager();
-        PackageInfo pkInfo = PackageUtils.getPackageInfo(context);
-
-        ApplicationInfo applicationInfo = pkInfo != null ? pkInfo.applicationInfo : null;
-        String appName;
-        if (applicationInfo != null && packageManager.getApplicationLabel(applicationInfo) != null) {
-            appName = packageManager.getApplicationLabel(applicationInfo).toString();
-        } else {
-            appName = "Unknown";
-        }
-        sb.append(appName).append(" - ").append(PackageUtils.getVersionName(context))
-          .append(" - Version code: ").append(PackageUtils.getVersionCode(context));
-        return sb.toString();
-    }
-
-    private static String getDeviceInfoHeaderText(Context context) {
-        return "Android device name: " + DeviceUtils.getInstance().getDeviceName(context);
-    }
-
-    /**
-     * Returns entire log as html for display (see AppLogViewerActivity)
-     * @param context
-     * @return Arraylist of Strings containing log messages
-     */
-    public static ArrayList<String> toHtmlList(Context context) {
-        ArrayList<String> items = new ArrayList<String>();
-
-        // add version & device info - be sure to change HEADER_LINE_COUNT if additional lines are added
-        items.add("<strong>" + getAppInfoHeaderText(context) + "</strong>");
-        items.add("<strong>" + getDeviceInfoHeaderText(context) + "</strong>");
-
-        Iterator<LogEntry> it = new ArrayList<>(mLogEntries).iterator();
-        while (it.hasNext()) {
-            items.add(it.next().toHtml());
-        }
-        return items;
-    }
-
-    /**
-     * Converts the entire log to plain text
-     * @param context
-     * @return The log as plain text
-     */
-    public static synchronized String toPlainText(Context context) {
-        StringBuilder sb = new StringBuilder();
-
-        // add version & device info
-        sb.append(getAppInfoHeaderText(context)).append("\n")
-          .append(getDeviceInfoHeaderText(context)).append("\n\n");
-
-        Iterator<LogEntry> it = new ArrayList<>(mLogEntries).iterator();
-        int lineNum = 1;
-        while (it.hasNext()) {
-            LogEntry entry = it.next();
-            sb.append(format(Locale.US, "%02d - ", lineNum))
-              .append(entry.toString());
-            lineNum++;
-        }
-        return sb.toString();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java
deleted file mode 100644
index 4cdc2911058f..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForeground.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.Notification;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Binder;
-import android.os.IBinder;
-
-import androidx.annotation.CallSuper;
-import androidx.annotation.Nullable;
-import androidx.core.app.NotificationManagerCompat;
-
-import org.greenrobot.eventbus.EventBus;
-import org.wordpress.android.util.AutoForeground.ServiceState;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public abstract class AutoForeground<StateClass extends ServiceState>
-        extends Service {
-    public static final int NOTIFICATION_ID_PROGRESS = 1;
-    public static final int NOTIFICATION_ID_SUCCESS = 2;
-    public static final int NOTIFICATION_ID_FAILURE = 3;
-
-    public interface ServiceState {
-        boolean isIdle();
-
-        boolean isInProgress();
-
-        boolean isError();
-
-        boolean isTerminal();
-
-        String getStepName();
-    }
-
-    public static class ServiceEventConnection {
-        private final ServiceConnection mServiceConnection;
-
-        public ServiceEventConnection(Context context, Class<? extends AutoForeground> clazz, Object client) {
-            EventBus.getDefault().register(client);
-
-            mServiceConnection = new ServiceConnection() {
-                @Override
-                public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-                    // nothing here
-                }
-
-                @Override
-                public void onServiceDisconnected(ComponentName componentName) {
-                    // nothing here
-                }
-            };
-
-            context.bindService(new Intent(context, clazz), mServiceConnection, Context.BIND_AUTO_CREATE);
-        }
-
-        public void disconnect(Context context, Object client) {
-            context.unbindService(mServiceConnection);
-            EventBus.getDefault().unregister(client);
-        }
-    }
-
-    private class LocalBinder extends Binder {
-    }
-
-    private final IBinder mBinder = new LocalBinder();
-
-    private final Class<StateClass> mStateClass;
-
-    private boolean mIsForeground;
-
-    protected abstract void onProgressStart();
-
-    protected abstract void onProgressEnd();
-
-    protected abstract Notification getNotification(StateClass state);
-
-    protected abstract void trackStateUpdate(Map<String, ?> props);
-
-    @SuppressWarnings("unchecked")
-    protected AutoForeground(StateClass initialState) {
-        mStateClass = (Class<StateClass>) initialState.getClass();
-
-        // initialize the sticky phase if it hasn't already
-        if (EventBus.getDefault().getStickyEvent(mStateClass) == null) {
-            notifyState(initialState);
-        }
-    }
-
-    public boolean isForeground() {
-        return mIsForeground;
-    }
-
-    @Nullable
-    private StateClass getState() {
-        return getState(mStateClass);
-    }
-
-    @Nullable
-    protected static <StateClass> StateClass getState(Class<StateClass> stateClass) {
-        return EventBus.getDefault().getStickyEvent(stateClass);
-    }
-
-    @Nullable
-    @CallSuper
-    @Override
-    public IBinder onBind(Intent intent) {
-        clearAllNotifications();
-        return mBinder;
-    }
-
-    @CallSuper
-    @Override
-    public void onRebind(Intent intent) {
-        super.onRebind(intent);
-
-        clearAllNotifications();
-        background();
-    }
-
-    @CallSuper
-    @Override
-    public boolean onUnbind(Intent intent) {
-        if (!hasConnectedClients()) {
-            final StateClass state = getState();
-            if (state != null && state.isInProgress()) {
-                promoteForeground(state);
-            }
-        }
-
-        return true; // call onRebind() if new clients connect
-    }
-
-    protected void clearAllNotifications() {
-        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID_PROGRESS);
-        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID_SUCCESS);
-        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID_FAILURE);
-    }
-
-    private EventBus getEventBus() {
-        return EventBus.getDefault();
-    }
-
-    private boolean hasConnectedClients() {
-        return getEventBus().hasSubscriberForEvent(mStateClass);
-    }
-
-    private void promoteForeground(StateClass currentState) {
-        startForeground(NOTIFICATION_ID_PROGRESS, getNotification(currentState));
-        mIsForeground = true;
-    }
-
-    private void background() {
-        stopForeground(true);
-        mIsForeground = false;
-    }
-
-    @CallSuper
-    protected void setState(StateClass newState) {
-        StateClass currentState = getState();
-        if ((currentState == null || !currentState.isInProgress()) && newState.isInProgress()) {
-            onProgressStart();
-        }
-
-        track(newState);
-        notifyState(newState);
-
-        if (newState.isTerminal()) {
-            onProgressEnd();
-            stopSelf();
-        }
-    }
-
-    protected void track(ServiceState state) {
-        Map<String, Object> props = new HashMap<>();
-        props.put("login_phase", state == null ? "null" : state.getStepName());
-        props.put("login_service_is_foreground", isForeground());
-        trackStateUpdate(props);
-    }
-
-    protected static <T> void clearServiceState(Class<T> klass) {
-        EventBus.getDefault().removeStickyEvent(klass);
-    }
-
-    @CallSuper
-    protected void notifyState(StateClass state) {
-        // sticky emit the state. The stickiness serves as a state keeping mechanism for clients to re-read upon connect
-        getEventBus().postSticky(state);
-
-        if (hasConnectedClients()) {
-            // there are connected clients so, nothing more to do here
-            return;
-        }
-
-        // ok, no connected clients so, update might need to be delivered to a notification as well
-
-        if (state.isIdle()) {
-            // no need to have a notification when idle
-            return;
-        }
-
-        if (state.isInProgress()) {
-            // operation still is progress so, update the notification
-            NotificationManagerCompat.from(this).notify(NOTIFICATION_ID_PROGRESS, getNotification(state));
-            return;
-        }
-
-        // operation has ended so, demote the Service to a background one
-        background();
-
-        // dismiss the sticky notification
-        NotificationManagerCompat.from(this).cancel(NOTIFICATION_ID_PROGRESS);
-
-        // put out a simple success/failure notification
-        NotificationManagerCompat.from(this).notify(
-                state.isError() ? NOTIFICATION_ID_FAILURE : NOTIFICATION_ID_SUCCESS,
-                getNotification(state));
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForegroundNotification.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForegroundNotification.java
deleted file mode 100644
index db8c8b32b592..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AutoForegroundNotification.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.Notification;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.annotation.ColorRes;
-import androidx.annotation.DrawableRes;
-import androidx.annotation.StringRes;
-import androidx.core.app.NotificationCompat;
-
-import static org.wordpress.android.util.AutoForeground.NOTIFICATION_ID_FAILURE;
-import static org.wordpress.android.util.AutoForeground.NOTIFICATION_ID_PROGRESS;
-import static org.wordpress.android.util.AutoForeground.NOTIFICATION_ID_SUCCESS;
-
-public class AutoForegroundNotification {
-    private static Intent getResumeIntent(Context context) {
-        // Let's get an Intent with the sole purpose of _resuming_ the app from the background
-        Intent resumeIntent = context.getPackageManager().getLaunchIntentForPackage(context.getPackageName());
-
-        // getLaunchIntentForPackage() seems to set the Package Name but if we construct a launcher Intent manually
-        // the package name is not set so, let's null it out here to match the manual Intent.
-        resumeIntent.setSelector(null);
-        resumeIntent.setPackage(null);
-
-        return resumeIntent;
-    }
-
-    private static NotificationCompat.Builder getNotificationBuilder(Context context, String channelId, int requestCode,
-                                                                     @StringRes int title, @StringRes int content,
-                                                                     @DrawableRes int icon, @ColorRes int accentColor) {
-        NotificationCompat.BigTextStyle bigTextStyle = new NotificationCompat.BigTextStyle();
-        bigTextStyle.setBigContentTitle(context.getString(title));
-        bigTextStyle.bigText(context.getString(content));
-
-        return new NotificationCompat.Builder(context, channelId)
-                .setStyle(bigTextStyle)
-                .setContentTitle(context.getString(title))
-                .setContentText(context.getString(content))
-                .setSmallIcon(icon)
-                .setColor(context.getResources().getColor(accentColor))
-                .setAutoCancel(true)
-                .setOnlyAlertOnce(true)
-                .setContentIntent(PendingIntent.getActivity(
-                        context,
-                        requestCode,
-                        getResumeIntent(context),
-                        PendingIntent.FLAG_ONE_SHOT));
-    }
-
-    public static Notification progress(Context context, String channelId, int progress, @StringRes int title,
-                                        @StringRes int content,
-                                        @DrawableRes int icon, @ColorRes int accentColor) {
-        return getNotificationBuilder(context, channelId, NOTIFICATION_ID_PROGRESS, title, content, icon, accentColor)
-                .setProgress(100, progress, false)
-                .build();
-    }
-
-    public static Notification progressIndeterminate(Context context, String channelId, @StringRes int title,
-                                                     @StringRes int content, @DrawableRes int icon,
-                                                     @ColorRes int accentColor) {
-        return getNotificationBuilder(context, channelId, NOTIFICATION_ID_PROGRESS, title, content, icon, accentColor)
-                .setProgress(0, 0, true)
-                .build();
-    }
-
-    public static Notification success(Context context, String channelId, @StringRes int title, @StringRes int content,
-                                       @DrawableRes int icon, @ColorRes int accentColor) {
-        return getNotificationBuilder(context, channelId, NOTIFICATION_ID_SUCCESS, title, content, icon, accentColor)
-                .build();
-    }
-
-    public static Notification failure(Context context, String channelId, @StringRes int title, @StringRes int content,
-                                       @DrawableRes int icon, @ColorRes int accentColor) {
-        return getNotificationBuilder(context, channelId, NOTIFICATION_ID_FAILURE, title, content, icon, accentColor)
-                .build();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DateTimeUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DateTimeUtils.java
deleted file mode 100644
index 3f8f0fee74e4..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DateTimeUtils.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.TimeZone;
-
-public class DateTimeUtils {
-    private DateTimeUtils() {
-        throw new AssertionError();
-    }
-
-    // See http://drdobbs.com/java/184405382
-    private static final ThreadLocal<DateFormat> ISO8601_FORMAT = new ThreadLocal<DateFormat>() {
-        @Override
-        protected DateFormat initialValue() {
-            return new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ", Locale.US);
-        }
-    };
-
-    public static String javaDateToTimeSpan(final Date date, Context context, long currentTime) {
-        if (date == null) {
-            return "";
-        }
-
-        long passedTime = date.getTime();
-
-        // return "now" if less than a minute has elapsed
-        long secondsSince = (currentTime - passedTime) / 1000;
-        if (secondsSince < 60) {
-            return context.getString(R.string.timespan_now);
-        }
-
-        long daysSince = secondsSince / (60 * 60 * 24);
-
-        // less than a year old, let `DateUtils.getRelativeTimeSpanString` do the job
-        if (daysSince < 365) {
-            return DateUtils.getRelativeTimeSpanString(passedTime, currentTime, DateUtils.MINUTE_IN_MILLIS,
-                                                       DateUtils.FORMAT_ABBREV_ALL).toString();
-        }
-
-        // date is older, so include year (ex: Jan 30, 2013)
-        return DateUtils.formatDateTime(context, passedTime, DateUtils.FORMAT_ABBREV_ALL);
-    }
-
-    /**
-     * Converts a date to a localized relative time span ("Now", "8 hr. ago", "Yesterday", "3 days ago", "Jul 10, 1940")
-     * We're using a call to `DateUtils.getRelativeTimeSpanString` in most cases.
-     */
-    public static String javaDateToTimeSpan(final Date date, Context context) {
-        return javaDateToTimeSpan(date, context, System.currentTimeMillis());
-    }
-
-    /**
-     * Given an ISO 8601-formatted date as a String, returns a {@link Date}.
-     */
-    public static Date dateFromIso8601(final String strDate) {
-        try {
-            DateFormat formatter = ISO8601_FORMAT.get();
-            return formatter.parse(strDate);
-        } catch (ParseException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Given an ISO 8601-formatted date as a String, returns a {@link Date} in UTC.
-     */
-    public static Date dateUTCFromIso8601(String iso8601date) {
-        try {
-            iso8601date = iso8601date.replace("Z", "+0000").replace("+00:00", "+0000");
-            DateFormat formatter = ISO8601_FORMAT.get();
-            formatter.setTimeZone(TimeZone.getTimeZone("UTC"));
-            return formatter.parse(iso8601date);
-        } catch (ParseException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Given a {@link Date}, returns an ISO 8601-formatted String.
-     */
-    public static String iso8601FromDate(Date date) {
-        if (date == null) {
-            return "";
-        }
-        DateFormat formatter = ISO8601_FORMAT.get();
-        return formatter.format(date);
-    }
-
-    /**
-     * Given a {@link Date}, returns an ISO 8601-formatted String in UTC.
-     */
-    public static String iso8601UTCFromDate(Date date) {
-        if (date == null) {
-            return "";
-        }
-        TimeZone tz = TimeZone.getTimeZone("UTC");
-        DateFormat formatter = ISO8601_FORMAT.get();
-        formatter.setTimeZone(tz);
-
-        String iso8601date = formatter.format(date);
-
-        // Use "+00:00" notation rather than "+0000" to be consistent with the WP.COM API
-        return iso8601date.replace("+0000", "+00:00");
-    }
-
-    /**
-     * Returns the current UTC date.
-     *
-     * @deprecated This method doesn't work as expected and shouldn't be used in production code. It doesn't take
-     * into account that `Date` class uses TimeZone.getDefault(). It substracts the currentOffsetFromUTC, but the
-     * final date still uses system default timezone.
-     */
-    @Deprecated
-    public static Date nowUTC() {
-        Date dateTimeNow = new Date();
-        return localDateToUTC(dateTimeNow);
-    }
-
-    /**
-     *
-     * @deprecated This method doesn't work as expected and shouldn't be used in production code. It doesn't take
-     * into account that `Date` class uses TimeZone.getDefault(). It substracts the currentOffsetFromUTC, but the
-     * final date still uses system default timezone.
-     */
-    @Deprecated
-    public static Date localDateToUTC(Date dtLocal) {
-        if (dtLocal == null) {
-            return null;
-        }
-        TimeZone tz = TimeZone.getDefault();
-        int currentOffsetFromUTC = tz.getRawOffset() + (tz.inDaylightTime(dtLocal) ? tz.getDSTSavings() : 0);
-        return new Date(dtLocal.getTime() - currentOffsetFromUTC);
-    }
-
-    // Routines to return a diff between two dates - always return a positive number
-
-    public static int daysBetween(Date dt1, Date dt2) {
-        long hrDiff = hoursBetween(dt1, dt2);
-        if (hrDiff == 0) {
-            return 0;
-        }
-        return (int) (hrDiff / 24);
-    }
-
-    public static int hoursBetween(Date dt1, Date dt2) {
-        long minDiff = minutesBetween(dt1, dt2);
-        if (minDiff == 0) {
-            return 0;
-        }
-        return (int) (minDiff / 60);
-    }
-
-    public static int minutesBetween(Date dt1, Date dt2) {
-        long msDiff = millisecondsBetween(dt1, dt2);
-        if (msDiff == 0) {
-            return 0;
-        }
-        return (int) (msDiff / 60000);
-    }
-
-    public static int secondsBetween(Date dt1, Date dt2) {
-        long msDiff = millisecondsBetween(dt1, dt2);
-        if (msDiff == 0) {
-            return 0;
-        }
-        return (int) (msDiff / 1000);
-    }
-
-    public static long millisecondsBetween(Date dt1, Date dt2) {
-        if (dt1 == null || dt2 == null) {
-            return 0;
-        }
-        return Math.abs(dt1.getTime() - dt2.getTime());
-    }
-
-    public static boolean isSameYear(Date dt1, Date dt2) {
-        if (dt1 == null || dt2 == null) {
-            return false;
-        }
-        return dt1.getYear() == dt2.getYear();
-    }
-
-    public static boolean isSameMonthAndYear(Date dt1, Date dt2) {
-        if (dt1 == null || dt2 == null) {
-            return false;
-        }
-        return dt1.getYear() == dt2.getYear() && dt1.getMonth() == dt2.getMonth();
-    }
-
-    // Routines involving Unix timestamps (GMT assumed)
-
-    /**
-     * Given an ISO 8601-formatted date as a String, returns the corresponding UNIX timestamp.
-     */
-    public static long timestampFromIso8601(final String strDate) {
-        return timestampFromIso8601Millis(strDate) / 1000;
-    }
-
-    /**
-     * Given an ISO 8601-formatted date as a String, returns the corresponding timestamp in milliseconds.
-     *
-     * @return 0 if the parameter is null, empty or not a date.
-     */
-    public static long timestampFromIso8601Millis(final String strDate) {
-        if (TextUtils.isEmpty(strDate)) {
-            return 0;
-        }
-        Date date = dateFromIso8601(strDate);
-        if (date == null) {
-            return 0;
-        }
-        return date.getTime();
-    }
-
-    /**
-     * Given a UNIX timestamp, returns the corresponding {@link Date}.
-     */
-    public static Date dateFromTimestamp(long timestamp) {
-        return new java.util.Date(timestamp * 1000);
-    }
-
-    /**
-     * Given a UNIX timestamp, returns an ISO 8601-formatted date as a String.
-     */
-    public static String iso8601FromTimestamp(long timestamp) {
-        return iso8601FromDate(dateFromTimestamp(timestamp));
-    }
-
-    /**
-     * Given a UNIX timestamp, returns an ISO 8601-formatted date in UTC as a String.
-     */
-    public static String iso8601UTCFromTimestamp(long timestamp) {
-        return iso8601UTCFromDate(dateFromTimestamp(timestamp));
-    }
-
-    /**
-     * Given a UNIX timestamp, returns a relative time span ("8h", "3d", etc.).
-     */
-    public static String timeSpanFromTimestamp(long timestamp, Context context) {
-        Date dateGMT = dateFromTimestamp(timestamp);
-        return javaDateToTimeSpan(dateGMT, context);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java
deleted file mode 100644
index dcd7d1d4ec0a..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DeviceUtils.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.KeyguardManager;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Environment;
-import android.os.StatFs;
-
-import androidx.annotation.NonNull;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-public class DeviceUtils {
-    private static final String APP_RUNTIME_ON_CHROME_FLAG = "org.chromium.arc.device_management";
-
-    private static DeviceUtils instance;
-    private boolean mIsKindleFire = false;
-
-    public boolean isKindleFire() {
-        return mIsKindleFire;
-    }
-
-    public static DeviceUtils getInstance() {
-        if (instance == null) {
-            instance = new DeviceUtils();
-        }
-        return instance;
-    }
-
-    private DeviceUtils() {
-        mIsKindleFire = android.os.Build.MODEL.equalsIgnoreCase("kindle fire") ? true : false;
-    }
-
-    /**
-     * Checks camera availability recursively based on API level.
-     *
-     * TODO: change "android.hardware.camera.front" and "android.hardware.camera.any" to
-     * {@link PackageManager#FEATURE_CAMERA_FRONT} and {@link PackageManager#FEATURE_CAMERA_ANY},
-     * respectively, once they become accessible or minSdk version is incremented.
-     *
-     * @param context The context.
-     * @return Whether camera is available.
-     */
-    public boolean hasCamera(Context context) {
-        final PackageManager pm = context.getPackageManager();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)
-                   || pm.hasSystemFeature("android.hardware.camera.front");
-        }
-
-        return pm.hasSystemFeature("android.hardware.camera.any");
-    }
-
-    public String getDeviceName(Context context) {
-        String manufacturer = Build.MANUFACTURER;
-        String undecodedModel = Build.MODEL;
-        String model = null;
-
-        try {
-            Properties prop = new Properties();
-            InputStream fileStream;
-            // Read the device name from a precomplied list:
-            // see http://making.meetup.com/post/29648976176/human-readble-android-device-names
-            fileStream = context.getAssets().open("android_models.properties");
-            prop.load(fileStream);
-            fileStream.close();
-            String decodedModel = prop.getProperty(undecodedModel.replaceAll(" ", "_"));
-            if (decodedModel != null && !decodedModel.trim().equals("")) {
-                model = decodedModel;
-            }
-        } catch (IOException e) {
-            AppLog.e(T.UTILS, "Can't read `android_models.properties` file from assets, or it's in the wrong form.", e);
-            AppLog.d(T.UTILS,
-                 "If you need more info about the file, please check the reference implementation available here: "
-                 + "https://github.com/wordpress-mobile/WordPress-Android/blob/dd989429bd701a66bcba911de08f2e8d336798ef"
-                 + "/WordPress/src/main/assets/android_models.properties");
-        }
-
-        if (model == null) { // Device model not found in the list
-            if (undecodedModel.startsWith(manufacturer)) {
-                model = capitalize(undecodedModel);
-            } else {
-                model = capitalize(manufacturer) + " " + undecodedModel;
-            }
-        }
-        return model;
-    }
-
-    public boolean isDeviceLocked(Context context) {
-        KeyguardManager myKM = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-        return myKM.inKeyguardRestrictedInputMode();
-    }
-
-    /**
-     * Checks if the current device runtime is ARC which effectively means it is a chromebook.
-     *
-     * @param context The context.
-     * @return Whether the device is a chromebook.
-     */
-    public boolean isChromebook(Context context) {
-        return context.getPackageManager().hasSystemFeature(APP_RUNTIME_ON_CHROME_FLAG);
-    }
-
-    /**
-     * Checks if the device has a hardware keyboard - note this will return true for emulators
-     */
-    public boolean hasHardwareKeyboard(@NonNull Context context) {
-        return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
-    }
-
-    private String capitalize(String s) {
-        if (s == null || s.length() == 0) {
-            return "";
-        }
-        char first = s.charAt(0);
-        if (Character.isUpperCase(first)) {
-            return s;
-        } else {
-            return Character.toUpperCase(first) + s.substring(1);
-        }
-    }
-
-    // Taken and modified from https://stackoverflow.com/a/8133437
-    public static String getTotalAvailableMemorySize() {
-        File internalMemoryPath = Environment.getDataDirectory();
-        long availableInternal = availableSpaceAtFilePath(internalMemoryPath);
-        long availableExternal = 0L;
-        if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED)) {
-            File externalStoragePath = Environment.getExternalStorageDirectory();
-            availableExternal = availableSpaceAtFilePath(externalStoragePath);
-        }
-        return formatSize(availableInternal + availableExternal);
-    }
-
-    private static long availableSpaceAtFilePath(File path) {
-        StatFs stat = new StatFs(path.getPath());
-        long bytesAvailable;
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {
-            return stat.getBlockSizeLong() * stat.getAvailableBlocksLong();
-        } else {
-            //noinspection deprecation - Deprecated calls properly handled
-            bytesAvailable = (long) stat.getBlockSize() * (long) stat.getAvailableBlocks();
-        }
-        return bytesAvailable;
-    }
-
-    private static String formatSize(long size) {
-        String suffix = null;
-
-        if (size >= 1024) {
-            suffix = "KB";
-            size /= 1024;
-            if (size >= 1024) {
-                suffix = "MB";
-                size /= 1024;
-            }
-        }
-
-        StringBuilder resultBuffer = new StringBuilder(Long.toString(size));
-
-        int commaOffset = resultBuffer.length() - 3;
-        while (commaOffset > 0) {
-            resultBuffer.insert(commaOffset, ',');
-            commaOffset -= 3;
-        }
-
-        if (suffix != null) {
-            resultBuffer.append(suffix);
-        }
-        return resultBuffer.toString();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java
deleted file mode 100644
index 60877b7082f5..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/DisplayUtils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.graphics.Point;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.view.Display;
-import android.view.Window;
-import android.view.WindowManager;
-
-public class DisplayUtils {
-    private DisplayUtils() {
-        throw new AssertionError();
-    }
-
-    public static boolean isLandscape(Context context) {
-        if (context == null) {
-            return false;
-        }
-        return context.getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
-    }
-
-    public static Point getDisplayPixelSize(Context context) {
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display display = wm.getDefaultDisplay();
-        Point size = new Point();
-        display.getSize(size);
-        return size;
-    }
-
-    public static int getDisplayPixelWidth(Context context) {
-        Point size = getDisplayPixelSize(context);
-        return (size.x);
-    }
-
-    public static int getDisplayPixelHeight(Context context) {
-        Point size = getDisplayPixelSize(context);
-        return (size.y);
-    }
-
-    public static int getDisplayPixelWidth() {
-        return Resources.getSystem().getDisplayMetrics().widthPixels;
-    }
-
-    public static float spToPx(Context context, float sp) {
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        final float scale = displayMetrics.scaledDensity;
-        return sp * scale;
-    }
-
-    public static int dpToPx(Context context, int dp) {
-        float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
-                                             context.getResources().getDisplayMetrics());
-        return (int) px;
-    }
-
-    public static int pxToDp(Context context, int px) {
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        return (int) ((px / displayMetrics.density) + 0.5);
-    }
-
-    public static boolean isXLargeTablet(Context context) {
-        if ((context.getResources().getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK)
-            == Configuration.SCREENLAYOUT_SIZE_XLARGE) {
-            return true;
-        }
-        return false;
-    }
-
-    public static boolean isTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout
-                & Configuration.SCREENLAYOUT_SIZE_MASK)
-               == Configuration.SCREENLAYOUT_SIZE_LARGE;
-    }
-
-    /**
-     * returns the height of the ActionBar if one is enabled - supports both the native ActionBar
-     * and ActionBarSherlock - http://stackoverflow.com/a/15476793/1673548
-     */
-    public static int getActionBarHeight(Context context) {
-        if (context == null) {
-            return 0;
-        }
-        TypedValue tv = new TypedValue();
-        if (context.getTheme() != null
-            && context.getTheme().resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
-            return TypedValue.complexToDimensionPixelSize(tv.data, context.getResources().getDisplayMetrics());
-        }
-
-        // if we get this far, it's because the device doesn't support an ActionBar,
-        // so return the standard ActionBar height (48dp)
-        return dpToPx(context, 48);
-    }
-
-    /**
-     * detect when FEATURE_ACTION_BAR_OVERLAY has been set
-     */
-    public static boolean hasActionBarOverlay(Window window) {
-        return window.hasFeature(Window.FEATURE_ACTION_BAR_OVERLAY);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java
deleted file mode 100644
index ec4e0b69313a..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EditTextUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.Activity;
-import android.content.Context;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.TextView;
-
-/**
- * EditText utils
- */
-public class EditTextUtils {
-    private EditTextUtils() {
-        throw new AssertionError();
-    }
-
-    /**
-     * returns non-null text string from passed TextView
-     */
-    public static String getText(TextView textView) {
-        return (textView != null) ? textView.getText().toString() : "";
-    }
-
-    /**
-     * moves caret to end of text
-     */
-    public static void moveToEnd(EditText edit) {
-        if (edit.getText() == null) {
-            return;
-        }
-        edit.setSelection(edit.getText().toString().length());
-    }
-
-    /**
-     * returns true if nothing has been entered into passed editor
-     */
-    public static boolean isEmpty(EditText edit) {
-        return TextUtils.isEmpty(getText(edit));
-    }
-
-    /**
-     * hide the soft keyboard for the passed EditText
-     *
-     * @deprecated Use {@link ActivityUtils#hideKeyboard(Activity)} or {@link ActivityUtils#hideKeyboardForced(View)}
-     * instead.
-     */
-    // TODO: Replace instances with ActivityUtils#showKeyboard(Activity) or ActivityUtils#showKeyboardForced(View) to
-    // consolidate similar methods and favor library version.
-    @Deprecated
-    public static void hideSoftInput(EditText edit) {
-        if (edit == null) {
-            return;
-        }
-
-        InputMethodManager imm = getInputMethodManager(edit);
-        if (imm != null) {
-            imm.hideSoftInputFromWindow(edit.getWindowToken(), 0);
-        }
-    }
-
-    /**
-     * show the soft keyboard for the passed EditText
-     *
-     * @deprecated Use {@link ActivityUtils#showKeyboard(View)} instead.
-     */
-    // TODO: Replace instances with ActivityUtils#showKeyboard(View) to consolidate similar methods and favor library
-    // version.
-    @Deprecated
-    public static void showSoftInput(EditText edit) {
-        if (edit == null) {
-            return;
-        }
-
-        edit.requestFocus();
-
-        InputMethodManager imm = getInputMethodManager(edit);
-        if (imm != null) {
-            imm.showSoftInput(edit, InputMethodManager.SHOW_IMPLICIT);
-        }
-    }
-
-    private static InputMethodManager getInputMethodManager(EditText edit) {
-        Context context = edit.getContext();
-        return (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java
deleted file mode 100644
index 08d0d3417c2d..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.Html;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.ImageSpan;
-import android.util.SparseArray;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static android.os.Build.VERSION_CODES;
-
-public class EmoticonsUtils {
-    public static final int EMOTICON_COLOR = 0xFF21759B;
-    private static final boolean HAS_EMOJI = SDK_INT >= VERSION_CODES.JELLY_BEAN;
-    private static final Map<String, String> WP_SMILIES;
-    public static final SparseArray<String> WP_SMILIES_CODE_POINT_TO_TEXT;
-
-    static {
-        Map<String, String> smilies = new HashMap<String, String>();
-        smilies.put("icon_mrgreen.gif", HAS_EMOJI ? "\uD83D\uDE00" : ":mrgreen:");
-        smilies.put("icon_neutral.gif", HAS_EMOJI ? "\uD83D\uDE14" : ":|");
-        smilies.put("icon_twisted.gif", HAS_EMOJI ? "\uD83D\uDE16" : ":twisted:");
-        smilies.put("icon_arrow.gif", HAS_EMOJI ? "\u27A1" : ":arrow:");
-        smilies.put("icon_eek.gif", HAS_EMOJI ? "\uD83D\uDE32" : "8-O");
-        smilies.put("icon_smile.gif", HAS_EMOJI ? "\uD83D\uDE0A" : ":)");
-        smilies.put("icon_confused.gif", HAS_EMOJI ? "\uD83D\uDE15" : ":?");
-        smilies.put("icon_cool.gif", HAS_EMOJI ? "\uD83D\uDE0A" : "8)");
-        smilies.put("icon_evil.gif", HAS_EMOJI ? "\uD83D\uDE21" : ":evil:");
-        smilies.put("icon_biggrin.gif", HAS_EMOJI ? "\uD83D\uDE03" : ":D");
-        smilies.put("icon_idea.gif", HAS_EMOJI ? "\uD83D\uDCA1" : ":idea:");
-        smilies.put("icon_redface.gif", HAS_EMOJI ? "\uD83D\uDE33" : ":oops:");
-        smilies.put("icon_razz.gif", HAS_EMOJI ? "\uD83D\uDE1D" : ":P");
-        smilies.put("icon_rolleyes.gif", HAS_EMOJI ? "\uD83D\uDE0F" : ":roll:");
-        smilies.put("icon_wink.gif", HAS_EMOJI ? "\uD83D\uDE09" : ";)");
-        smilies.put("icon_cry.gif", HAS_EMOJI ? "\uD83D\uDE22" : ":'(");
-        smilies.put("icon_surprised.gif", HAS_EMOJI ? "\uD83D\uDE32" : ":o");
-        smilies.put("icon_lol.gif", HAS_EMOJI ? "\uD83D\uDE03" : ":lol:");
-        smilies.put("icon_mad.gif", HAS_EMOJI ? "\uD83D\uDE21" : ":x");
-        smilies.put("icon_sad.gif", HAS_EMOJI ? "\uD83D\uDE1E" : ":(");
-        smilies.put("icon_exclaim.gif", HAS_EMOJI ? "\u2757" : ":!:");
-        smilies.put("icon_question.gif", HAS_EMOJI ? "\u2753" : ":?:");
-
-        WP_SMILIES = Collections.unmodifiableMap(smilies);
-
-        WP_SMILIES_CODE_POINT_TO_TEXT = new SparseArray<String>(20);
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(10145, ":arrow:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128161, ":idea:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128512, ":mrgreen:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128515, ":D");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128522, ":)");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128521, ";)");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128532, ":|");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128533, ":?");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128534, ":twisted:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128542, ":(");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128545, ":evil:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128546, ":'(");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128562, ":o");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128563, ":oops:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(128527, ":roll:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(10071, ":!:");
-        WP_SMILIES_CODE_POINT_TO_TEXT.put(10067, ":?:");
-    }
-
-    public static String lookupImageSmiley(String url) {
-        return lookupImageSmiley(url, "");
-    }
-
-    public static String lookupImageSmiley(String url, String ifNone) {
-        if (url == null) {
-            return ifNone;
-        }
-        String file = url.substring(url.lastIndexOf("/") + 1);
-        if (WP_SMILIES.containsKey(file)) {
-            return WP_SMILIES.get(file);
-        }
-        return ifNone;
-    }
-
-    public static Spanned replaceEmoticonsWithEmoji(SpannableStringBuilder html) {
-        ImageSpan[] imgs = html.getSpans(0, html.length(), ImageSpan.class);
-        for (ImageSpan img : imgs) {
-            String emoticon = EmoticonsUtils.lookupImageSmiley(img.getSource());
-            if (!emoticon.equals("")) {
-                int start = html.getSpanStart(img);
-                html.replace(start, html.getSpanEnd(img), emoticon);
-                html.setSpan(new ForegroundColorSpan(EMOTICON_COLOR), start,
-                             start + emoticon.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-                html.removeSpan(img);
-            }
-        }
-        return html;
-    }
-
-    public static String replaceEmoticonsWithEmoji(final String text) {
-        if (text != null && text.contains("icon_")) {
-            final SpannableStringBuilder html =
-                    (SpannableStringBuilder) replaceEmoticonsWithEmoji((SpannableStringBuilder) Html.fromHtml(text));
-            // Html.toHtml() is used here rather than toString() since the latter strips html
-            return Html.toHtml(html);
-        } else {
-            return text;
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FileUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FileUtils.java
deleted file mode 100644
index cadee0b6906f..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FileUtils.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-import java.io.File;
-
-public class FileUtils {
-    /**
-     * Returns the length of the file denoted by this abstract pathname.
-     * The return value is unspecified if this pathname denotes a directory.
-     *
-     * @return The length, in bytes, of the file denoted by this abstract
-     * pathname, or <code>-1L</code> if the file does not exist, or an
-     * exception is thrown accessing the file.
-     * Some operating systems may return <code>0L</code> for pathnames
-     * denoting system-dependent entities such as devices or pipes.
-     */
-    public static long length(String path) {
-        // File not found
-        File file = new File(path);
-        try {
-            if (!file.exists()) {
-                AppLog.w(AppLog.T.MEDIA, "Can't access the file. It doesn't exists anymore?");
-                return -1L;
-            }
-
-            return file.length();
-        } catch (SecurityException e) {
-            AppLog.e(AppLog.T.MEDIA, "Can't access the file.", e);
-            return -1L;
-        }
-    }
-
-    /**
-     * Given the full file path, or the filename with extension (i.e. my-picture.jpg), returns the filename part only
-     * (my-picture).
-     *
-     * @param filePath The path to the file or the full filename
-     * @return filename part only or null
-     */
-    public static String getFileNameFromPath(String filePath) {
-        if (TextUtils.isEmpty(filePath)) {
-            return null;
-        }
-        if (filePath.contains("/")) {
-            if (filePath.lastIndexOf("/") + 1 >= filePath.length()) {
-                filePath = filePath.substring(0, filePath.length() - 1);
-            }
-            filePath = filePath.substring(filePath.lastIndexOf("/") + 1);
-        }
-
-        String filename;
-        int dotPos = filePath.indexOf('.');
-        if (dotPos > 0) {
-            filename = filePath.substring(0, dotPos);
-        } else {
-            filename = filePath;
-        }
-        return filename;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FormatUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FormatUtils.java
deleted file mode 100644
index c2850e58d11c..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/FormatUtils.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.wordpress.android.util;
-
-import java.text.DecimalFormat;
-import java.text.NumberFormat;
-
-public class FormatUtils {
-    /*
-     * NumberFormat isn't synchronized, so a separate instance must be created for each thread
-     * http://developer.android.com/reference/java/text/NumberFormat.html
-     */
-    private static final ThreadLocal<NumberFormat> INTEGER_INSTANCE = new ThreadLocal<NumberFormat>() {
-        @Override
-        protected NumberFormat initialValue() {
-            return NumberFormat.getIntegerInstance();
-        }
-    };
-
-    private static final ThreadLocal<DecimalFormat> DECIMAL_INSTANCE = new ThreadLocal<DecimalFormat>() {
-        @Override
-        protected DecimalFormat initialValue() {
-            return (DecimalFormat) DecimalFormat.getInstance();
-        }
-    };
-
-    /*
-     * returns the passed integer formatted with thousands-separators based on the current locale
-     */
-    public static final String formatInt(int value) {
-        return INTEGER_INSTANCE.get().format(value).toString();
-    }
-
-    public static final String formatDecimal(int value) {
-        return DECIMAL_INSTANCE.get().format(value).toString();
-    }
-
-    /*
-     * returns the passed long formatted as an human readable filesize. Ex: 10 GB
-     * unitStrings is expected to be an array of all possible sizes from byte to TeraByte, in the current locale
-     */
-    public static final String formatFileSize(long size, final String[] unitStrings) {
-        final double log1024 = Math.log10(1024);
-        if (size <= 0) {
-            return "0";
-        }
-        int digitGroups = (int) (Math.log10(size) / log1024);
-
-        NumberFormat f = NumberFormat.getInstance();
-        if (f instanceof DecimalFormat) {
-            ((DecimalFormat) f).applyPattern("#,##0.#");
-        }
-        return String.format(unitStrings[digitGroups], f.format(size / Math.pow(1024, digitGroups)));
-    }
-
-    /*
-     * returns the passed double percentage (0 to 1) formatted as an human readable percentage. Ex: 0.25 returns 25%
-     */
-    public static final String formatPercentage(double value) {
-        return formatPercentageLimit100(value, false);
-    }
-
-    /*
-     * returns the passed double percentage (0 to 1) formatted as an human readable percentage. Ex: 0.251 returns 25.1%
-     * if limit100 is true, it limits the percentage to 100%
-     */
-    public static final String formatPercentageLimit100(double value, boolean limit100) {
-        double limit = 1.0001;
-
-        NumberFormat percentFormat = NumberFormat.getPercentInstance();
-        percentFormat.setMaximumFractionDigits(1);
-
-        if (limit100 && value > limit) {
-            value = limit;
-        }
-
-        String percentage = percentFormat.format(value);
-
-        return percentage;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GeocoderUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GeocoderUtils.java
deleted file mode 100644
index 4b2fdd8875c5..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GeocoderUtils.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.location.Address;
-import android.location.Geocoder;
-
-import java.io.IOException;
-import java.util.List;
-
-public final class GeocoderUtils {
-    private GeocoderUtils() {
-        throw new AssertionError();
-    }
-
-    public static Geocoder getGeocoder(Context context) {
-        // first make sure a Geocoder service exists on this device (requires API 9)
-        if (!Geocoder.isPresent()) {
-            return null;
-        }
-
-        Geocoder gcd;
-
-        try {
-            gcd = new Geocoder(context, LanguageUtils.getCurrentDeviceLanguage(context));
-        } catch (NullPointerException cannotIstantiateEx) {
-            AppLog.e(AppLog.T.UTILS, "Cannot instantiate Geocoder", cannotIstantiateEx);
-            return null;
-        }
-
-        return gcd;
-    }
-
-    public static Address getAddressFromCoords(Context context, double latitude, double longitude) {
-        Address address = null;
-        List<Address> addresses = null;
-
-        Geocoder gcd = getGeocoder(context);
-
-        if (gcd == null) {
-            return null;
-        }
-
-        try {
-            addresses = gcd.getFromLocation(latitude, longitude, 1);
-        } catch (IOException e) {
-            // may get "Unable to parse response from server" IOException here if Geocoder
-            // service is hit too frequently
-            AppLog.e(AppLog.T.UTILS,
-                     "Unable to parse response from server. Is Geocoder service hitting the server too frequently?",
-                     e
-                    );
-        }
-
-        // addresses may be null or empty if network isn't connected
-        if (addresses != null && addresses.size() > 0) {
-            address = addresses.get(0);
-        }
-
-        return address;
-    }
-
-    public static Address getAddressFromLocationName(Context context, String locationName) {
-        int maxResults = 1;
-        Address address = null;
-        List<Address> addresses = null;
-
-        Geocoder gcd = getGeocoder(context);
-
-        if (gcd == null) {
-            return null;
-        }
-
-        try {
-            addresses = gcd.getFromLocationName(locationName, maxResults);
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.UTILS, "Failed to get coordinates from location", e);
-        }
-
-        // addresses may be null or empty if network isn't connected
-        if (addresses != null && addresses.size() > 0) {
-            address = addresses.get(0);
-        }
-
-        return address;
-    }
-
-    public static String getLocationNameFromAddress(Address address) {
-        String locality = "", adminArea = "", country = "";
-        if (address.getLocality() != null) {
-            locality = address.getLocality();
-        }
-
-        if (address.getAdminArea() != null) {
-            adminArea = address.getAdminArea();
-        }
-
-        if (address.getCountryName() != null) {
-            country = address.getCountryName();
-        }
-
-        return ((locality.equals("")) ? locality : locality + ", ")
-               + ((adminArea.equals("")) ? adminArea : adminArea + " ") + country;
-    }
-
-    public static double[] getCoordsFromAddress(Address address) {
-        double[] coordinates = new double[2];
-
-        if (address.hasLatitude() && address.hasLongitude()) {
-            coordinates[0] = address.getLatitude();
-            coordinates[1] = address.getLongitude();
-        }
-
-        return coordinates;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
deleted file mode 100644
index f650dea0dcf5..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/GravatarUtils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-/**
- * see https://en.gravatar.com/site/implement/images/
- */
-public class GravatarUtils {
-    // by default tell gravatar to respond to non-existent images with a 404 - this means
-    // it's up to the caller to catch the 404 and provide a suitable default image
-    private static final DefaultImage DEFAULT_GRAVATAR = DefaultImage.MYSTERY_MAN;
-
-    public enum DefaultImage {
-        MYSTERY_MAN,
-        STATUS_404,
-        IDENTICON,
-        MONSTER,
-        WAVATAR,
-        RETRO,
-        BLANK;
-
-        @Override
-        public String toString() {
-            switch (this) {
-                case MYSTERY_MAN:
-                    return "mm";
-                case STATUS_404:
-                    return "404";
-                case IDENTICON:
-                    return "identicon";
-                case MONSTER:
-                    return "monsterid";
-                case WAVATAR:
-                    return "wavatar";
-                case RETRO:
-                    return "retro";
-                default:
-                    return "blank";
-            }
-        }
-    }
-
-    /*
-    * gravatars often contain the ?s= parameter which determines their size - detect this and
-    * replace it with a new ?s= parameter which requests the avatar at the exact size needed
-    */
-    public static String fixGravatarUrl(final String imageUrl, int avatarSz) {
-        return fixGravatarUrl(imageUrl, avatarSz, DEFAULT_GRAVATAR);
-    }
-
-    public static String fixGravatarUrl(final String imageUrl, int avatarSz, DefaultImage defaultImage) {
-        if (TextUtils.isEmpty(imageUrl)) {
-            return "";
-        }
-
-        // if this isn't a gravatar image, return as resized photon image url
-        if (!imageUrl.contains("gravatar.com")) {
-            return PhotonUtils.getPhotonImageUrl(imageUrl, avatarSz, avatarSz);
-        }
-
-        // remove all other params, then add query string for size and default image
-        return UrlUtils.removeQuery(imageUrl) + "?s=" + avatarSz + "&d=" + defaultImage.toString();
-    }
-
-    public static String gravatarFromEmail(final String email, int size) {
-        return gravatarFromEmail(email, size, DEFAULT_GRAVATAR);
-    }
-
-    public static String gravatarFromEmail(final String email, int size, DefaultImage defaultImage) {
-        return "http://gravatar.com/avatar/"
-               + StringUtils.getMd5Hash(StringUtils.notNullStr(email))
-               + "?d=" + defaultImage.toString()
-               + "&size=" + Integer.toString(size);
-    }
-
-    public static String blavatarFromUrl(final String url, int size) {
-        return blavatarFromUrl(url, size, DEFAULT_GRAVATAR);
-    }
-
-    public static String blavatarFromUrl(final String url, int size, DefaultImage defaultImage) {
-        return "http://gravatar.com/blavatar/"
-               + StringUtils.getMd5Hash(UrlUtils.getHost(url))
-               + "?d=" + defaultImage.toString()
-               + "&size=" + Integer.toString(size);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java
deleted file mode 100644
index e91024b12587..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.text.Html;
-import android.text.Html.ImageGetter;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.QuoteSpan;
-
-import org.apache.commons.text.StringEscapeUtils;
-import org.wordpress.android.util.helpers.WPHtmlTagHandler;
-import org.wordpress.android.util.helpers.WPQuoteSpan;
-
-import static org.wordpress.android.util.AppLog.T.UTILS;
-
-public class HtmlUtils {
-    /**
-     * Removes html from the passed string - relies on Html.fromHtml which handles invalid HTML,
-     * but it's very slow, so avoid using this where performance is important
-     * @param text String containing html
-     * @return String without HTML
-     */
-    public static String stripHtml(final String text) {
-        if (TextUtils.isEmpty(text)) {
-            return "";
-        }
-        return Html.fromHtml(text).toString().trim();
-    }
-
-    /**
-     * This is much faster than stripHtml() but should only be used when we know the html is valid
-     * since the regex will be unpredictable with invalid html
-     * @param str String containing only valid html
-     * @return String without HTML
-     */
-    public static String fastStripHtml(String str) {
-        if (TextUtils.isEmpty(str)) {
-            return str;
-        }
-
-        // insert a line break before P tags unless the only one is at the start
-        if (str.lastIndexOf("<p") > 0) {
-            str = str.replaceAll("<p(.|\n)*?>", "\n<p>");
-        }
-
-        // convert BR tags to line breaks
-        if (str.contains("<br")) {
-            str = str.replaceAll("<br(.|\n)*?>", "\n");
-        }
-
-        // use regex to strip tags, then convert entities in the result
-        return trimStart(StringEscapeUtils.unescapeHtml4(str.replaceAll("<(.|\n)*?>", "")));
-    }
-
-    /*
-     * Same as apache.commons.lang.StringUtils.stripStart() but also removes non-breaking
-     * space (160) chars
-     */
-    private static String trimStart(final String str) {
-        int strLen;
-        if (str == null || (strLen = str.length()) == 0) {
-            return "";
-        }
-        int start = 0;
-        while (start != strLen && (Character.isWhitespace(str.charAt(start)) || str.charAt(start) == 160)) {
-            start++;
-        }
-        return str.substring(start);
-    }
-
-    /**
-     * Converts an R.color.xxx resource to an HTML hex color
-     * @param context Android Context
-     * @param resId Android R.color.xxx
-     * @return A String HTML hex color code
-     */
-    public static String colorResToHtmlColor(Context context, int resId) {
-        try {
-            return String.format("#%06X", 0xFFFFFF & context.getResources().getColor(resId));
-        } catch (Resources.NotFoundException e) {
-            return "#000000";
-        }
-    }
-
-    /**
-     * Remove {@code <script>..</script>} blocks from the passed string - added to project after noticing
-     * comments on posts that use the "Sociable" plugin ( http://wordpress.org/plugins/sociable/ )
-     * may have a script block which contains {@code <!--//-->} followed by a CDATA section followed by {@code <!]]>,}
-     * all of which will show up if we don't strip it here.
-     * @see <a href="http://wordpress.org/plugins/sociable/">Wordpress Sociable Plugin</a>
-     * @return String without {@code <script>..</script>}, {@code <!--//-->} blocks followed by a CDATA section
-     * followed by {@code <!]]>,}
-     * @param text String containing script tags
-     */
-    public static String stripScript(final String text) {
-        if (text == null) {
-            return null;
-        }
-
-        StringBuilder sb = new StringBuilder(text);
-        int start = sb.indexOf("<script");
-
-        while (start > -1) {
-            int end = sb.indexOf("</script>", start);
-            if (end == -1) {
-                return sb.toString();
-            }
-            sb.delete(start, end + 9);
-            start = sb.indexOf("<script", start);
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * An alternative to Html.fromHtml() supporting {@code <ul>}, {@code <ol>}, {@code <blockquote>}
-     * tags and replacing EmoticonsUtils with Emojis
-     * @param source
-     * @param imageGetter
-     */
-    public static SpannableStringBuilder fromHtml(String source, ImageGetter imageGetter) {
-        source = replaceListTagsWithCustomTags(source);
-        SpannableStringBuilder html;
-        try {
-            html = (SpannableStringBuilder) Html.fromHtml(source, imageGetter, new WPHtmlTagHandler());
-        } catch (RuntimeException runtimeException) {
-            // In case our tag handler fails
-            try {
-                html = (SpannableStringBuilder) Html.fromHtml(source, imageGetter, null);
-            } catch (IllegalArgumentException illegalArgumentException) {
-                // In case the html is missing a required parameter (for example: "src" missing from img)
-                html = new SpannableStringBuilder("");
-                AppLog.w(UTILS, "Could not parse html");
-            }
-        }
-
-        EmoticonsUtils.replaceEmoticonsWithEmoji(html);
-        QuoteSpan[] spans = html.getSpans(0, html.length(), QuoteSpan.class);
-        for (QuoteSpan span : spans) {
-            html.setSpan(new WPQuoteSpan(), html.getSpanStart(span), html.getSpanEnd(span), html.getSpanFlags(span));
-            html.setSpan(new ForegroundColorSpan(0xFF666666), html.getSpanStart(span), html.getSpanEnd(span),
-                         html.getSpanFlags(span));
-            html.removeSpan(span);
-        }
-        return html;
-    }
-
-    private static String replaceListTagsWithCustomTags(String source) {
-        return source.replace("<ul", "<WPUL")
-                     .replace("</ul>", "</WPUL>")
-                     .replace("<ol", "<WPOL")
-                     .replace("</ol>", "</WPOL>")
-                     .replace("<li", "<WPLI")
-                     .replace("</li>", "</WPLI>");
-    }
-
-    public static Spanned fromHtml(String source) {
-        return fromHtml(source, null);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java
deleted file mode 100644
index d42cb0ba8aec..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ImageUtils.java
+++ /dev/null
@@ -1,898 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.Point;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.graphics.RectF;
-import android.media.ExifInterface;
-import android.media.MediaMetadataRetriever;
-import android.media.ThumbnailUtils;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.provider.MediaStore;
-import android.text.TextUtils;
-import android.util.Log;
-import android.webkit.MimeTypeMap;
-import android.widget.ImageView;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.ref.WeakReference;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-public class ImageUtils {
-    public static int[] getImageSize(Uri uri, Context context) {
-        String path = null;
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-
-        if (uri.toString().contains("content:")) {
-            String[] projection = new String[]{MediaStore.Images.Media._ID, MediaStore.Images.Media.DATA};
-            Cursor cur = null;
-            try {
-                cur = context.getContentResolver().query(uri, projection, null, null, null);
-                if (cur != null && cur.moveToFirst()) {
-                    int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
-                    path = cur.getString(dataColumn);
-                }
-            } catch (IllegalStateException stateException) {
-                Log.d(ImageUtils.class.getName(), "IllegalStateException querying content:" + uri);
-            } finally {
-                SqlUtils.closeCursor(cur);
-            }
-        }
-
-        if (TextUtils.isEmpty(path)) {
-            // The file isn't ContentResolver, or it can't be access by ContentResolver. Try to access the file
-            // directly.
-            path = uri.toString().replace("content://media", "");
-            path = path.replace("file://", "");
-        }
-
-        BitmapFactory.decodeFile(path, options);
-        int imageHeight = options.outHeight;
-        int imageWidth = options.outWidth;
-        return new int[]{imageWidth, imageHeight};
-    }
-
-    // Read the orientation from ContentResolver. If it fails, read from EXIF.
-    public static int getImageOrientation(Context ctx, String filePath) {
-        if (TextUtils.isEmpty(filePath) || ctx == null) {
-            AppLog.w(AppLog.T.UTILS, "Can't read orientation. Passed context or file is null or empty.");
-            return 0;
-        }
-        Uri curStream;
-        int orientation = 0;
-
-        // Remove file protocol
-        filePath = filePath.replace("file://", "");
-
-        if (!filePath.contains("content://")) {
-            curStream = Uri.parse("content://media" + filePath);
-        } else {
-            curStream = Uri.parse(filePath);
-        }
-
-        try {
-            Cursor cur = ctx.getContentResolver()
-                            .query(curStream, new String[]{MediaStore.Images.Media.ORIENTATION}, null, null, null);
-            if (cur != null) {
-                if (cur.moveToFirst()) {
-                    orientation = cur.getInt(cur.getColumnIndex(MediaStore.Images.Media.ORIENTATION));
-                }
-                cur.close();
-            }
-        } catch (Exception errReadingContentResolver) {
-            AppLog.e(AppLog.T.UTILS, "Error reading orientation of the file: " + filePath, errReadingContentResolver);
-        }
-
-        if (orientation == 0) {
-            orientation = getExifOrientation(filePath);
-        }
-
-        return orientation;
-    }
-
-
-    private static int getExifOrientation(String path) {
-        if (TextUtils.isEmpty(path)) {
-            AppLog.w(AppLog.T.UTILS, "Can't read EXIF orientation. Passed path is empty.");
-            return 0;
-        }
-        ExifInterface exif;
-        try {
-            exif = new ExifInterface(path);
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.UTILS, "Can't read EXIF orientation.", e);
-            return 0;
-        }
-
-        int exifOrientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
-
-        switch (exifOrientation) {
-            case ExifInterface.ORIENTATION_NORMAL:
-                return 0;
-            case ExifInterface.ORIENTATION_ROTATE_90:
-                return 90;
-            case ExifInterface.ORIENTATION_ROTATE_180:
-                return 180;
-            case ExifInterface.ORIENTATION_ROTATE_270:
-                return 270;
-            default:
-                return 0;
-        }
-    }
-
-    public static Bitmap downloadBitmap(String url) {
-        final DefaultHttpClient client = new DefaultHttpClient();
-
-        final HttpGet getRequest = new HttpGet(url);
-
-        try {
-            HttpResponse response = client.execute(getRequest);
-            final int statusCode = response.getStatusLine().getStatusCode();
-            if (statusCode != HttpStatus.SC_OK) {
-                AppLog.w(AppLog.T.UTILS, "ImageDownloader Error " + statusCode
-                                         + " while retrieving bitmap from " + url);
-                return null;
-            }
-
-            final HttpEntity entity = response.getEntity();
-            if (entity != null) {
-                InputStream inputStream = null;
-                try {
-                    inputStream = entity.getContent();
-                    return BitmapFactory.decodeStream(inputStream);
-                } finally {
-                    if (inputStream != null) {
-                        inputStream.close();
-                    }
-                    entity.consumeContent();
-                }
-            }
-        } catch (Exception e) {
-            // Could provide a more explicit error message for IOException or
-            // IllegalStateException
-            getRequest.abort();
-            AppLog.w(AppLog.T.UTILS, "ImageDownloader Error while retrieving bitmap from " + url);
-        }
-        return null;
-    }
-
-    /** From http://developer.android.com/training/displaying-bitmaps/load-bitmap.html **/
-    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        // Raw height and width of image
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-
-        if (height > reqHeight || width > reqWidth) {
-            // Calculate ratios of height and width to requested height and width
-            final int heightRatio = Math.round((float) height / (float) reqHeight);
-            final int widthRatio = Math.round((float) width / (float) reqWidth);
-
-            // Choose the smallest ratio as inSampleSize value, this will guarantee
-            // a final image with both dimensions larger than or equal to the
-            // requested height and width.
-            inSampleSize = heightRatio < widthRatio ? heightRatio : widthRatio;
-        }
-
-        return inSampleSize;
-    }
-
-
-    public interface BitmapWorkerCallback {
-        void onBitmapReady(String filePath, ImageView imageView, Bitmap bitmap);
-    }
-
-    public static class BitmapWorkerTask extends AsyncTask<String, Void, Bitmap> {
-        private final WeakReference<ImageView> mImageViewReference;
-        private final BitmapWorkerCallback mCallback;
-        private int mTargetWidth;
-        private int mTargetHeight;
-        private String mPath;
-
-        public BitmapWorkerTask(ImageView imageView, int width, int height, BitmapWorkerCallback callback) {
-            // Use a WeakReference to ensure the ImageView can be garbage collected
-            mImageViewReference = new WeakReference<ImageView>(imageView);
-            this.mCallback = callback;
-            mTargetWidth = width;
-            mTargetHeight = height;
-        }
-
-        // Decode image in background.
-        @Override
-        protected Bitmap doInBackground(String... params) {
-            mPath = params[0];
-
-            BitmapFactory.Options bfo = new BitmapFactory.Options();
-            bfo.inJustDecodeBounds = true;
-            BitmapFactory.decodeFile(mPath, bfo);
-
-            bfo.inSampleSize = calculateInSampleSize(bfo, mTargetWidth, mTargetHeight);
-            bfo.inJustDecodeBounds = false;
-
-            // get proper rotation
-            int bitmapWidth = 0;
-            int bitmapHeight = 0;
-            try {
-                File f = new File(mPath);
-                ExifInterface exif = new ExifInterface(f.getPath());
-                int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL);
-                int angle = 0;
-                if (orientation == ExifInterface.ORIENTATION_NORMAL) { // no need to rotate
-                    return BitmapFactory.decodeFile(mPath, bfo);
-                } else if (orientation == ExifInterface.ORIENTATION_ROTATE_90) {
-                    angle = 90;
-                } else if (orientation == ExifInterface.ORIENTATION_ROTATE_180) {
-                    angle = 180;
-                } else if (orientation == ExifInterface.ORIENTATION_ROTATE_270) {
-                    angle = 270;
-                }
-
-                Matrix mat = new Matrix();
-                mat.postRotate(angle);
-
-                try {
-                    Bitmap bmp = BitmapFactory.decodeStream(new FileInputStream(f), null, bfo);
-                    if (bmp == null) {
-                        AppLog.e(AppLog.T.UTILS, "can't decode bitmap: " + f.getPath());
-                        return null;
-                    }
-                    bitmapWidth = bmp.getWidth();
-                    bitmapHeight = bmp.getHeight();
-                    return Bitmap.createBitmap(bmp, 0, 0, bmp.getWidth(), bmp.getHeight(), mat, true);
-                } catch (OutOfMemoryError oom) {
-                    AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + oom);
-                }
-            } catch (IOException e) {
-                AppLog.e(AppLog.T.UTILS, "Error in setting image", e);
-            }
-
-            return null;
-        }
-
-        // Once complete, see if ImageView is still around and set bitmap.
-        @Override
-        protected void onPostExecute(Bitmap bitmap) {
-            if (mImageViewReference == null || bitmap == null) {
-                return;
-            }
-
-            final ImageView imageView = mImageViewReference.get();
-
-            if (mCallback != null) {
-                mCallback.onBitmapReady(mPath, imageView, bitmap);
-            }
-        }
-    }
-
-    public static String getTitleForWPImageSpan(Context ctx, String filePath) {
-        if (filePath == null) {
-            return null;
-        }
-
-        Uri curStream;
-        String title;
-
-        if (!filePath.contains("content://")) {
-            curStream = Uri.parse("content://media" + filePath);
-        } else {
-            curStream = Uri.parse(filePath);
-        }
-
-        if (filePath.contains("video")) {
-            return "Video";
-        } else {
-            String[] projection = new String[]{MediaStore.Images.Thumbnails.DATA};
-
-            Cursor cur;
-            try {
-                cur = ctx.getContentResolver().query(curStream, projection, null, null, null);
-            } catch (Exception e1) {
-                AppLog.e(AppLog.T.UTILS, e1);
-                return null;
-            }
-            File jpeg;
-            if (cur != null) {
-                String thumbData = "";
-                if (cur.moveToFirst()) {
-                    int dataColumn = cur.getColumnIndex(MediaStore.Images.Media.DATA);
-                    thumbData = cur.getString(dataColumn);
-                }
-                cur.close();
-                if (thumbData == null) {
-                    return null;
-                }
-                jpeg = new File(thumbData);
-            } else {
-                String path = filePath.toString().replace("file://", "");
-                jpeg = new File(path);
-            }
-            title = jpeg.getName();
-            return title;
-        }
-    }
-
-    /**
-     * Resizes an image to be placed in the Post Content Editor
-     *
-     * @return resized bitmap
-     */
-    public static Bitmap getWPImageSpanThumbnailFromFilePath(Context context, String filePath, int targetWidth) {
-        if (filePath == null || context == null) {
-            return null;
-        }
-
-        Uri curUri = Uri.parse(filePath);
-
-        if (filePath.contains("video")) {
-            // Load the video thumbnail from the MediaStore
-            int videoId = 0;
-            try {
-                videoId = Integer.parseInt(curUri.getLastPathSegment());
-            } catch (NumberFormatException e) {
-            }
-            ContentResolver crThumb = context.getContentResolver();
-            BitmapFactory.Options options = new BitmapFactory.Options();
-            options.inSampleSize = 1;
-            Bitmap videoThumbnail =
-                    MediaStore.Video.Thumbnails.getThumbnail(crThumb, videoId, MediaStore.Video.Thumbnails.MINI_KIND,
-                                                             options);
-            if (videoThumbnail != null) {
-                return getScaledBitmapAtLongestSide(videoThumbnail, targetWidth);
-            } else {
-                return null;
-            }
-        } else {
-            // Create resized bitmap
-            int rotation = getImageOrientation(context, filePath);
-            byte[] bytes = createThumbnailFromUri(context, curUri, targetWidth, null, rotation);
-
-            if (bytes != null && bytes.length > 0) {
-                try {
-                    Bitmap resizedBitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length);
-                    if (resizedBitmap != null) {
-                        return getScaledBitmapAtLongestSide(resizedBitmap, targetWidth);
-                    }
-                } catch (OutOfMemoryError e) {
-                    AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error in setting image: " + e);
-                    return null;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /*
-     Resize a bitmap to the targetSize on its longest side.
-     */
-    public static Bitmap getScaledBitmapAtLongestSide(Bitmap bitmap, int targetSize) {
-        if (bitmap == null || bitmap.getWidth() <= targetSize && bitmap.getHeight() <= targetSize) {
-            // Do not resize.
-            return bitmap;
-        }
-
-        int targetWidth, targetHeight;
-        if (bitmap.getHeight() > bitmap.getWidth()) {
-            // Resize portrait bitmap
-            targetHeight = targetSize;
-            float percentage = (float) targetSize / bitmap.getHeight();
-            targetWidth = (int) (bitmap.getWidth() * percentage);
-        } else {
-            // Resize landscape or square image
-            targetWidth = targetSize;
-            float percentage = (float) targetSize / bitmap.getWidth();
-            targetHeight = (int) (bitmap.getHeight() * percentage);
-        }
-
-        return Bitmap.createScaledBitmap(bitmap, targetWidth, targetHeight, true);
-    }
-
-    private static boolean resizeImageAndWriteToStream(Context context,
-                                                       Uri imageUri,
-                                                       String fileExtension,
-                                                       int maxSize,
-                                                       int orientation,
-                                                       int quality,
-                                                       OutputStream outStream) throws OutOfMemoryError, IOException {
-        String realFilePath = MediaUtils.getRealPathFromURI(context, imageUri);
-
-        // get just the image bounds
-        BitmapFactory.Options optBounds = new BitmapFactory.Options();
-        optBounds.inJustDecodeBounds = true;
-
-        try {
-            BitmapFactory.decodeFile(realFilePath, optBounds);
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error while decoding the original image: " + realFilePath, e);
-            throw e;
-        }
-
-        int scale = getScaleForResizing(maxSize, optBounds);
-
-        BitmapFactory.Options optActual = new BitmapFactory.Options();
-        optActual.inSampleSize = scale;
-
-        // Get the roughly resized bitmap
-        final Bitmap bmpResized;
-        try {
-            bmpResized = BitmapFactory.decodeFile(realFilePath, optActual);
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.UTILS, "OutOfMemoryError Error while decoding the original image: " + realFilePath, e);
-            throw e;
-        }
-
-        if (bmpResized == null) {
-            AppLog.e(AppLog.T.UTILS, "Can't decode the resized picture.");
-            throw new IOException("Can't decode the resized picture.");
-        }
-
-        // Resize the bitmap to exact size: calculate exact scale in order to resize accurately
-        float scaleBy = getScaleImageBy(maxSize, bmpResized);
-
-        Matrix matrix = new Matrix();
-        matrix.postScale(scaleBy, scaleBy);
-
-        // apply orientation
-        if (orientation != 0) {
-            matrix.setRotate(orientation);
-        }
-
-        Bitmap.CompressFormat fmt;
-        if (fileExtension != null
-            && (fileExtension.equals("png") || fileExtension.equals(".png"))) {
-            fmt = Bitmap.CompressFormat.PNG;
-        } else {
-            fmt = Bitmap.CompressFormat.JPEG;
-        }
-
-        final Bitmap bmpRotated;
-        try {
-            bmpRotated =
-                    Bitmap.createBitmap(bmpResized, 0, 0, bmpResized.getWidth(), bmpResized.getHeight(), matrix, true);
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.UTILS, "OutOfMemoryError while creating the resized bitmap", e);
-            throw e;
-        } catch (NullPointerException e) {
-            // See: https://github.com/wordpress-mobile/WordPress-Android/issues/1844
-            AppLog.e(AppLog.T.UTILS, "Bitmap.createBitmap has thrown a NPE internally. This should never happen!", e);
-            throw e;
-        }
-
-        if (bmpRotated == null) {
-            // Fix an issue where bmpRotated is null even if the documentation doesn't say Bitmap.createBitmap can
-            // return null.
-            AppLog.e(AppLog.T.UTILS,
-                     "bmpRotated is null even if the documentation doesn't say Bitmap.createBitmap can return null.");
-            // See: https://github.com/wordpress-mobile/WordPress-Android/issues/1848
-            throw new IOException(
-                    "bmpRotated is null even if the documentation doesn't say Bitmap.createBitmap can return null.");
-        }
-
-        return bmpRotated.compress(fmt, quality, outStream);
-    }
-
-    /**
-     * Given the path to an image, compress and resize it.
-     * @param context the passed context
-     * @param path the path to the original image
-     * @param maxImageSize the maximum allowed width
-     * @param quality the encoder quality
-     * @return the path to the optimized image
-     */
-    public static String optimizeImage(Context context, String path, int maxImageSize, int quality) {
-        if (context == null || TextUtils.isEmpty(path)) {
-            return path;
-        }
-
-        File file = new File(path);
-        if (!file.exists()) {
-            return path;
-        }
-
-        String mimeType = MediaUtils.getMediaFileMimeType(file);
-        if (mimeType.equals("image/gif")) {
-            // Don't rescale gifs to maintain their quality
-            return path;
-        }
-
-        Uri srcImageUri = Uri.parse(path);
-        if (srcImageUri == null) {
-            return path;
-        }
-
-        String fileName = MediaUtils.getMediaFileName(file, mimeType);
-        String fileExtension = MimeTypeMap.getFileExtensionFromUrl(fileName).toLowerCase(Locale.ROOT);
-
-        int[] imageDimensions = getImageSize(srcImageUri, context);
-        int selectedMaxSize = Math.max(imageDimensions[0], imageDimensions[1]);
-        if (selectedMaxSize == 0) {
-            // Can't read the src dimensions.
-            return path;
-        }
-
-        // do not optimize if original-size and 100% quality are set.
-        if (maxImageSize == Integer.MAX_VALUE && quality == 100) {
-            return path;
-        }
-
-        if (selectedMaxSize > maxImageSize) {
-            selectedMaxSize = maxImageSize;
-        }
-
-        int orientation = getImageOrientation(context, path);
-
-        File resizedImageFile;
-        FileOutputStream out;
-
-        try {
-            // try to re-use the same name as prefix of the temp file
-            String prefix = FileUtils.getFileNameFromPath(fileName);
-
-            if (TextUtils.isEmpty(prefix) || prefix.length() < 3) {
-                // prefix must be at least 3 characters
-                prefix = "wp-image";
-            }
-
-            resizedImageFile = File.createTempFile(prefix, "." + fileExtension);
-            out = new FileOutputStream(resizedImageFile);
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create the temp file on storage. Use the original picture instead.");
-            return path;
-        } catch (SecurityException e) {
-            AppLog.e(AppLog.T.MEDIA,
-                     "Can't write the tmp file due to security restrictions. Use the original picture instead.");
-            return path;
-        }
-
-        try {
-            boolean res = resizeImageAndWriteToStream(context, srcImageUri, fileExtension, selectedMaxSize, orientation,
-                                                      quality, out);
-            if (!res) {
-                AppLog.w(AppLog.T.MEDIA, "Failed to compress the optimized image. Use the original picture instead.");
-                return path;
-            }
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create optimized image. Use the original picture instead.");
-            return path;
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.MEDIA, "Can't optimize the picture due to low memory. Use the original picture instead.");
-            return path;
-        } finally {
-            // close the stream
-            try {
-                out.flush();
-                out.close();
-            } catch (IOException e) {
-                // nope
-            }
-        }
-
-        String tempFilePath = resizedImageFile.getPath();
-        if (!TextUtils.isEmpty(tempFilePath)) {
-            return tempFilePath;
-        } else {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create optimized image. Use the full picture instead.");
-        }
-
-        return path;
-    }
-
-    /**
-     * Generate a thumbnail from a video url.
-     * Note that this method could take time if network url.
-     *
-     * @param videoPath The path to the video on internet
-     * @param maxWidth the maximumWidth for the thumbnail
-     * @return the path to the picture on disk
-     */
-    public static Bitmap getVideoFrameFromVideo(String videoPath, int maxWidth) {
-        return getVideoFrameFromVideo(videoPath, maxWidth, new HashMap<String, String>());
-    }
-
-    /**
-     * Generate a thumbnail from a video url.
-     * Note that this method could take time if network url.
-     *
-     * @param videoPath The path to the video on internet
-     * @param maxWidth the maximumWidth for the thumbnail
-     * @param headers optional: HTTP headers map to add to the request if the video is remote
-     * @return the path to the picture on disk
-     */
-    public static Bitmap getVideoFrameFromVideo(String videoPath, int maxWidth, Map<String, String> headers) {
-        if (TextUtils.isEmpty(videoPath) || maxWidth <= 0) {
-            return null;
-        }
-
-        if (new File(videoPath).exists()) {
-            // Local file
-            Bitmap thumb =
-                    ThumbnailUtils.createVideoThumbnail(videoPath, MediaStore.Images.Thumbnails.FULL_SCREEN_KIND);
-            return ImageUtils.getScaledBitmapAtLongestSide(thumb, maxWidth);
-        }
-
-        // Not a local file.
-        MediaMetadataRetriever mediaMetadataRetriever = new MediaMetadataRetriever();
-        Bitmap bitmap = null;
-        try {
-            mediaMetadataRetriever.setDataSource(videoPath, headers);
-            bitmap = mediaMetadataRetriever.getFrameAtTime();
-        } catch (IllegalArgumentException e) {
-            AppLog.e(AppLog.T.MEDIA, "The passed video path is invalid: " + videoPath);
-        } catch (java.lang.RuntimeException e) {
-            // I've see this kind of error on one of my testing device
-            AppLog.e(AppLog.T.MEDIA, "The passed video path is invalid: " + videoPath);
-        } finally {
-            mediaMetadataRetriever.release();
-        }
-
-        if (bitmap == null) {
-            AppLog.w(AppLog.T.MEDIA, "Failed to retrieve frame from the passed video path: " + videoPath);
-            return null;
-        }
-
-        return getScaledBitmapAtLongestSide(bitmap, maxWidth);
-    }
-
-    /**
-     * nbradbury - 21-Feb-2014 - similar to createThumbnail but more efficient since it doesn't
-     * require passing the full-size image as an array of bytes[]
-     */
-    public static byte[] createThumbnailFromUri(Context context,
-                                                Uri imageUri,
-                                                int maxWidth,
-                                                String fileExtension,
-                                                int orientation) {
-        if (context == null || imageUri == null || maxWidth <= 0) {
-            return null;
-        }
-
-        ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        try {
-            boolean res =
-                    resizeImageAndWriteToStream(context, imageUri, fileExtension, maxWidth, orientation, 75, stream);
-            if (!res) {
-                AppLog.w(AppLog.T.MEDIA, "Failed to compress the resized image. Use the full picture instead.");
-                return null;
-            }
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create resized image. Use the full picture instead.");
-            return null;
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.MEDIA, "Can't resize the picture due to low memory. Use the full picture instead.");
-            return null;
-        }
-
-        return stream.toByteArray();
-    }
-
-    public static Bitmap getCircularBitmap(final Bitmap bitmap) {
-        if (bitmap == null) {
-            return null;
-        }
-
-        final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(output);
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(Color.RED);
-        canvas.drawOval(rectF, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        return output;
-    }
-
-    /**
-     * Returns the passed bitmap with rounded corners
-     * @param bitmap - the bitmap to modify
-     * @param radius - the radius of the corners
-     * @param borderColor - the border to apply (use Color.TRANSPARENT for none)
-     */
-    public static Bitmap getRoundedEdgeBitmap(final Bitmap bitmap, int radius, int borderColor) {
-        if (bitmap == null) {
-            return null;
-        }
-
-        final Bitmap output = Bitmap.createBitmap(bitmap.getWidth(), bitmap.getHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(output);
-        final Paint paint = new Paint();
-        final Rect rect = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
-        final RectF rectF = new RectF(rect);
-
-        paint.setAntiAlias(true);
-        canvas.drawARGB(0, 0, 0, 0);
-        paint.setColor(Color.RED);
-        canvas.drawRoundRect(rectF, radius, radius, paint);
-
-        paint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));
-        canvas.drawBitmap(bitmap, rect, rect, paint);
-
-        if (borderColor != Color.TRANSPARENT) {
-            paint.setStyle(Paint.Style.STROKE);
-            paint.setStrokeWidth(1f);
-            paint.setColor(borderColor);
-            canvas.drawRoundRect(rectF, radius, radius, paint);
-        }
-
-        return output;
-    }
-
-    /**
-     * Get the maximum size a thumbnail can be to fit in either portrait or landscape orientations.
-     * @deprecated Use `getMaximumThumbnailSizeForEditor` available in MediaUtils class in Editors project
-     */
-    public static int getMaximumThumbnailWidthForEditor(Context context) {
-        int maximumThumbnailWidthForEditor;
-        Point size = DisplayUtils.getDisplayPixelSize(context);
-        int screenWidth = size.x;
-        int screenHeight = size.y;
-        maximumThumbnailWidthForEditor = (screenWidth > screenHeight) ? screenHeight : screenWidth;
-        // 48dp of padding on each side so you can still place the cursor next to the image.
-        int padding = DisplayUtils.dpToPx(context, 48) * 2;
-        maximumThumbnailWidthForEditor -= padding;
-        return maximumThumbnailWidthForEditor;
-    }
-
-    /**
-     * Given the path to an image, rotate it by using EXIF info
-     * @param context the passed context
-     * @param path the path to the original image
-     * @return the path to the rotated image or null
-     */
-    public static String rotateImageIfNecessary(Context context, String path) {
-        if (context == null || TextUtils.isEmpty(path)) {
-            return null;
-        }
-
-        File file = new File(path);
-        if (!file.exists()) {
-            return null;
-        }
-
-        int orientation = getImageOrientation(context, path);
-        // Do not rotate portrait pictures
-        if (orientation == 0) {
-            return null;
-        }
-
-        String mimeType = MediaUtils.getMediaFileMimeType(file);
-        if (mimeType.equals("image/gif")) {
-            // Don't rotate gifs to maintain their quality
-            return null;
-        }
-
-        Uri srcImageUri = Uri.parse(path);
-        if (srcImageUri == null) {
-            return null;
-        }
-
-        String fileName = MediaUtils.getMediaFileName(file, mimeType);
-        String fileExtension = MimeTypeMap.getFileExtensionFromUrl(fileName).toLowerCase(Locale.ROOT);
-
-        int selectedWidth = getImageSize(srcImageUri, context)[0];
-        if (selectedWidth == 0) {
-            // Can't read the src dimensions.
-            return null;
-        }
-
-        File rotatedImageFile;
-        FileOutputStream out;
-
-        try {
-            // try to re-use the same name as prefix of the temp file
-            String prefix = FileUtils.getFileNameFromPath(fileName);
-
-            if (TextUtils.isEmpty(prefix) || prefix.length() < 3) {
-                // prefix must be at least 3 characters
-                prefix = "wp-image";
-            }
-
-            rotatedImageFile = File.createTempFile(prefix, "." + fileExtension);
-            out = new FileOutputStream(rotatedImageFile);
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create the temp file on storage.");
-            return null;
-        } catch (SecurityException e) {
-            AppLog.e(AppLog.T.MEDIA, "Can't write the tmp file due to security restrictions.");
-            return null;
-        }
-
-        try {
-            boolean res =
-                    resizeImageAndWriteToStream(context, srcImageUri, fileExtension, selectedWidth, orientation, 85,
-                                                out);
-            if (!res) {
-                AppLog.w(AppLog.T.MEDIA, "Failed to compress the rotates image.");
-                return null;
-            }
-        } catch (IOException e) {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create rotated image.");
-            return null;
-        } catch (OutOfMemoryError e) {
-            AppLog.e(AppLog.T.MEDIA, "Can't rotate the picture due to low memory.");
-            return null;
-        } finally {
-            // close the stream
-            try {
-                out.flush();
-                out.close();
-            } catch (IOException e) {
-                // nope
-            }
-        }
-
-        String tempFilePath = rotatedImageFile.getPath();
-        if (!TextUtils.isEmpty(tempFilePath)) {
-            return tempFilePath;
-        } else {
-            AppLog.e(AppLog.T.MEDIA, "Failed to create rotated image.");
-        }
-
-        return null;
-    }
-
-    // determine correct scale value (should be power of 2)
-    // http://stackoverflow.com/questions/477572/android-strange-out-of-memory-issue/3549021#3549021
-    protected static int getScaleForResizing(int maxSize, BitmapFactory.Options optBounds) {
-        if (maxSize < 1) {
-            return 1;
-        }
-
-        int maxDimension = Math.max(optBounds.outWidth, optBounds.outHeight);
-        int scale = 1;
-
-        while (maxDimension / scale / 2 >= maxSize) {
-            scale *= 2;
-        }
-        return scale;
-    }
-
-    private static float getScaleImageBy(float maxSize, Bitmap bmpResized) {
-        int divideBy = Math.max(bmpResized.getHeight(), bmpResized.getWidth());
-        float percentage = maxSize / divideBy;
-
-        float proportionateHeight = bmpResized.getHeight() * percentage;
-        int finalHeight = (int) Math.rint(proportionateHeight);
-
-        float scaleWidth = maxSize / bmpResized.getWidth();
-        float scaleHeight = ((float) finalHeight) / bmpResized.getHeight();
-
-        return Math.min(scaleWidth, scaleHeight);
-    }
-
-    public static Rect getScaledBounds(int width, int height, int maxWidth) {
-        float xScale = Math.max(1.0f, (float) width / maxWidth);
-        return new Rect(0, 0, Math.round(width / xScale), Math.round(height / xScale));
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java
deleted file mode 100644
index 7e4e177b392b..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-import org.apache.commons.text.StringEscapeUtils;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.wordpress.android.util.AppLog.T;
-
-import java.util.ArrayList;
-
-public class JSONUtils {
-    private static final String QUERY_SEPERATOR = ".";
-    private static final String QUERY_ARRAY_INDEX_START = "[";
-    private static final String QUERY_ARRAY_INDEX_END = "]";
-    private static final String QUERY_ARRAY_FIRST = "first";
-    private static final String QUERY_ARRAY_LAST = "last";
-
-    private static final String JSON_NULL_STR = "null";
-    private static final String TAG = "JSONUtils";
-
-    /**
-     * Given a JSONObject and a key path (e.g property.child) and a default it will
-     * traverse the object graph and pull out the desired property
-     */
-    public static <U> U queryJSON(JSONObject source, String query, U defaultObject) {
-        if (source == null) {
-            AppLog.e(T.UTILS, "Parameter source is null, can't query a null object");
-            return defaultObject;
-        }
-        if (query == null) {
-            AppLog.e(T.UTILS, "Parameter query is null");
-            return defaultObject;
-        }
-        int nextSeperator = query.indexOf(QUERY_SEPERATOR);
-        int nextIndexStart = query.indexOf(QUERY_ARRAY_INDEX_START);
-        if (nextSeperator == -1 && nextIndexStart == -1) {
-            // last item let's get it
-            try {
-                if (!source.has(query)) {
-                    return defaultObject;
-                }
-                Object result = source.get(query);
-                if (result.getClass().isAssignableFrom(defaultObject.getClass())) {
-                    return (U) result;
-                } else {
-                    AppLog.w(T.UTILS, String.format(
-                            "The returned object type %s is not assignable to the type %s. Using default!",
-                            result.getClass(), defaultObject.getClass()));
-                    return defaultObject;
-                }
-            } catch (java.lang.ClassCastException e) {
-                AppLog.e(T.UTILS, "Unable to cast the object to " + defaultObject.getClass().getName(), e);
-                return defaultObject;
-            } catch (JSONException e) {
-                AppLog.e(T.UTILS, "Unable to get the Key from the input object. Key:" + query, e);
-                return defaultObject;
-            }
-        }
-        int endQuery;
-        if (nextSeperator == -1 || nextIndexStart == -1) {
-            endQuery = Math.max(nextSeperator, nextIndexStart);
-        } else {
-            endQuery = Math.min(nextSeperator, nextIndexStart);
-        }
-        String nextQuery = query.substring(endQuery);
-        String key = query.substring(0, endQuery);
-        try {
-            if (nextQuery.indexOf(QUERY_SEPERATOR) == 0) {
-                return queryJSON(source.getJSONObject(key), nextQuery.substring(1), defaultObject);
-            } else if (nextQuery.indexOf(QUERY_ARRAY_INDEX_START) == 0) {
-                return queryJSON(source.getJSONArray(key), nextQuery, defaultObject);
-            } else if (!nextQuery.equals("")) {
-                return defaultObject;
-            }
-            Object result = source.get(key);
-            if (result.getClass().isAssignableFrom(defaultObject.getClass())) {
-                return (U) result;
-            } else {
-                AppLog.w(T.UTILS,
-                         String.format("The returned object type %s is not assignable to the type %s. Using default!",
-                                       result.getClass(), defaultObject.getClass()));
-                return defaultObject;
-            }
-        } catch (java.lang.ClassCastException e) {
-            AppLog.e(T.UTILS, "Unable to cast the object to " + defaultObject.getClass().getName(), e);
-            return defaultObject;
-        } catch (JSONException e) {
-            return defaultObject;
-        }
-    }
-
-    /**
-     * Given a JSONArray and a query (e.g. [0].property) it will traverse the array and
-     * pull out the requested property.
-     *
-     * Acceptable indexes include negative numbers to reference items from the end of
-     * the list as well as "last" and "first" as more explicit references to "0" and "-1"
-     */
-    public static <U> U queryJSON(JSONArray source, String query, U defaultObject) {
-        if (source == null) {
-            AppLog.e(T.UTILS, "Parameter source is null, can't query a null object");
-            return defaultObject;
-        }
-        if (query == null) {
-            AppLog.e(T.UTILS, "Parameter query is null");
-            return defaultObject;
-        }
-        // query must start with [ have an index and then have ]
-        int indexStart = query.indexOf(QUERY_ARRAY_INDEX_START);
-        int indexEnd = query.indexOf(QUERY_ARRAY_INDEX_END);
-        if (indexStart == -1 || indexEnd == -1 || indexStart > indexEnd) {
-            return defaultObject;
-        }
-        // get "index" from "[index]"
-        String indexStr = query.substring(indexStart + 1, indexEnd);
-        int index;
-        if (indexStr.equals(QUERY_ARRAY_FIRST)) {
-            index = 0;
-        } else if (indexStr.equals(QUERY_ARRAY_LAST)) {
-            index = -1;
-        } else {
-            index = Integer.parseInt(indexStr);
-        }
-        if (index < 0) {
-            index = source.length() + index;
-        }
-        // copy remaining query
-        String remainingQuery = query.substring(indexEnd + 1);
-        try {
-            if (remainingQuery.indexOf(QUERY_ARRAY_INDEX_START) == 0) {
-                return queryJSON(source.getJSONArray(index), remainingQuery, defaultObject);
-            } else if (remainingQuery.indexOf(QUERY_SEPERATOR) == 0) {
-                return queryJSON(source.getJSONObject(index), remainingQuery.substring(1), defaultObject);
-            } else if (!remainingQuery.equals("")) {
-                // TODO throw an exception since the query isn't valid?
-                AppLog.w(T.UTILS, String.format("Incorrect query for next object %s", remainingQuery));
-                return defaultObject;
-            }
-            Object result = source.get(index);
-            if (result.getClass().isAssignableFrom(defaultObject.getClass())) {
-                return (U) result;
-            } else {
-                AppLog.w(T.UTILS,
-                         String.format("The returned object type %s is not assignable to the type %s. Using default!",
-                                       result.getClass(), defaultObject.getClass()));
-                return defaultObject;
-            }
-        } catch (java.lang.ClassCastException e) {
-            AppLog.e(T.UTILS, "Unable to cast the object to " + defaultObject.getClass().getName(), e);
-            return defaultObject;
-        } catch (JSONException e) {
-            return defaultObject;
-        }
-    }
-
-    /**
-     * Convert a JSONArray (expected to contain strings) in a string list
-     */
-    public static ArrayList<String> fromJSONArrayToStringList(JSONArray jsonArray) {
-        ArrayList<String> stringList = new ArrayList<String>();
-        for (int i = 0; i < jsonArray.length(); i++) {
-            try {
-                stringList.add(jsonArray.getString(i));
-            } catch (JSONException e) {
-                AppLog.e(T.UTILS, e);
-            }
-        }
-        return stringList;
-    }
-
-    /**
-     * Convert a string list in a JSONArray
-     */
-    public static JSONArray fromStringListToJSONArray(ArrayList<String> stringList) {
-        JSONArray jsonArray = new JSONArray();
-        if (stringList != null) {
-            for (int i = 0; i < stringList.size(); i++) {
-                jsonArray.put(stringList.get(i));
-            }
-        }
-        return jsonArray;
-    }
-
-    /*
-     * wrapper for JSONObject.optString() which handles "null" values
-     */
-    public static String getString(JSONObject json, String name) {
-        String value = json.optString(name);
-        // return empty string for "null"
-        if (JSON_NULL_STR.equals(value)) {
-            return "";
-        }
-        return value;
-    }
-
-    /*
-     * use with strings that contain HTML entities
-     */
-    public static String getStringDecoded(JSONObject json, String name) {
-        String value = getString(json, name);
-        return StringEscapeUtils.unescapeHtml4(value);
-    }
-
-    /*
-     * replacement for JSONObject.optBoolean() - optBoolean() only checks for "true" and "false",
-     * but our API sometimes uses "0" to denote false
-     */
-    public static boolean getBool(JSONObject json, String name) {
-        String value = getString(json, name);
-        if (TextUtils.isEmpty(value)) {
-            return false;
-        }
-        if (value.equals("0")) {
-            return false;
-        }
-        if (value.equalsIgnoreCase("false")) {
-            return false;
-        }
-        if (value.equalsIgnoreCase("no")) {
-            return false;
-        }
-        return true;
-    }
-
-    /*
-     * returns the JSONObject child of the passed parent that matches the passed query
-     * this is basically an "optJSONObject" that supports nested queries, for example:
-     *
-     * getJSONChild("meta/data/site")
-     *
-     * would find this:
-     *
-     *  "meta": {
-     *       "data": {
-     *           "site": {
-     *                "ID": 3584907,
-     *                "name": "WordPress.com News",
-     *           }
-     *       }
-     *   }
-     */
-    public static JSONObject getJSONChild(final JSONObject jsonParent, final String query) {
-        if (jsonParent == null || TextUtils.isEmpty(query)) {
-            return null;
-        }
-        String[] names = query.split("/");
-        JSONObject jsonChild = null;
-        for (int i = 0; i < names.length; i++) {
-            if (jsonChild == null) {
-                jsonChild = jsonParent.optJSONObject(names[i]);
-            } else {
-                jsonChild = jsonChild.optJSONObject(names[i]);
-            }
-            if (jsonChild == null) {
-                return null;
-            }
-        }
-        return jsonChild;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/LanguageUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/LanguageUtils.java
deleted file mode 100644
index 1deaa603efd7..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/LanguageUtils.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-import androidx.annotation.Nullable;
-
-import java.util.Locale;
-
-/**
- * Methods for dealing with i18n messages
- */
-public class LanguageUtils {
-    /**
-     * @deprecated Use {@link #getCurrentDeviceLanguage()}. As of API 25, setting the locale by updating the
-     * configuration on the resources object was deprecated, so this method stopped working for newer versions
-     * of Android. The current active locale should always be set in {@link Locale#getDefault()}. When manually
-     * setting the active locale, the developer should set it in {@link Locale#setDefault(Locale)}.
-     */
-    @SuppressWarnings("DeprecatedIsStillUsed")
-    @Deprecated
-    public static Locale getCurrentDeviceLanguage(@Nullable Context context) {
-        return getCurrentDeviceLanguage();
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    public static Locale getCurrentDeviceLanguage() {
-        return Locale.getDefault();
-    }
-
-    /**
-     * @deprecated Use {@link #getCurrentDeviceLanguageCode()}.
-     */
-    @SuppressWarnings("WeakerAccess,DeprecatedIsStillUsed")
-    @Deprecated
-    public static String getCurrentDeviceLanguageCode(@Nullable Context context) {
-        return getCurrentDeviceLanguageCode();
-    }
-
-    @SuppressWarnings("WeakerAccess")
-    public static String getCurrentDeviceLanguageCode() {
-        return getCurrentDeviceLanguage().toString();
-    }
-
-    public static String getPatchedCurrentDeviceLanguage(Context context) {
-        return patchDeviceLanguageCode(getCurrentDeviceLanguageCode(context));
-    }
-
-    /**
-     * Patches a deviceLanguageCode if any of deprecated values iw, id, or yi
-     */
-    @SuppressWarnings("WeakerAccess")
-    public static String patchDeviceLanguageCode(String deviceLanguageCode) {
-        String patchedCode = deviceLanguageCode;
-        /*
-         <p>Note that Java uses several deprecated two-letter codes. The Hebrew ("he") language
-         * code is rewritten as "iw", Indonesian ("id") as "in", and Yiddish ("yi") as "ji". This
-         * rewriting happens even if you construct your own {@code Locale} object, not just for
-         * instances returned by the various lookup methods.
-         */
-        if (deviceLanguageCode != null) {
-            if (deviceLanguageCode.startsWith("iw")) {
-                patchedCode = deviceLanguageCode.replace("iw", "he");
-            } else if (deviceLanguageCode.startsWith("in")) {
-                patchedCode = deviceLanguageCode.replace("in", "id");
-            } else if (deviceLanguageCode.startsWith("ji")) {
-                patchedCode = deviceLanguageCode.replace("ji", "yi");
-            }
-        }
-
-        return patchedCode;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ListUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ListUtils.java
deleted file mode 100644
index 30d38e36c514..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ListUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.wordpress.android.util;
-
-import androidx.annotation.Nullable;
-
-import org.apache.commons.lang3.ArrayUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class ListUtils {
-    @Nullable
-    public static ArrayList<Long> fromLongArray(long[] array) {
-        if (array == null) {
-            return null;
-        }
-        Long[] longObjects = ArrayUtils.toObject(array);
-        return new ArrayList<>(Arrays.asList(longObjects));
-    }
-
-    @Nullable
-    public static long[] toLongArray(List<Long> list) {
-        if (list == null) {
-            return null;
-        }
-        Long[] array = list.toArray(new Long[list.size()]);
-        return ArrayUtils.toPrimitive(array);
-    }
-
-    @Nullable
-    public static ArrayList<Integer> fromIntArray(int[] array) {
-        if (array == null) {
-            return null;
-        }
-        Integer[] intObjects = ArrayUtils.toObject(array);
-        return new ArrayList<>(Arrays.asList(intObjects));
-    }
-
-    @Nullable
-    public static int[] toIntArray(List<Integer> list) {
-        if (list == null) {
-            return null;
-        }
-        Integer[] array = list.toArray(new Integer[list.size()]);
-        return ArrayUtils.toPrimitive(array);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java
deleted file mode 100644
index 4345a4b22cfe..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MapUtils.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.wordpress.android.util;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * wrappers for extracting values from a Map object
- */
-public class MapUtils {
-    /*
-     * returns a String value for the passed key in the passed map
-     * always returns "" instead of null
-     */
-    public static String getMapStr(final Map<?, ?> map, final String key) {
-        if (map == null || key == null || !map.containsKey(key) || map.get(key) == null) {
-            return "";
-        }
-        return map.get(key).toString();
-    }
-
-    /*
-     * returns an int value for the passed key in the passed map
-     * defaultValue is returned if key doesn't exist or isn't a number
-     */
-    public static int getMapInt(final Map<?, ?> map, final String key) {
-        return getMapInt(map, key, 0);
-    }
-
-    public static int getMapInt(final Map<?, ?> map, final String key, int defaultValue) {
-        try {
-            return Integer.parseInt(getMapStr(map, key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /*
-     * long version of above
-     */
-    public static long getMapLong(final Map<?, ?> map, final String key) {
-        return getMapLong(map, key, 0);
-    }
-
-    public static long getMapLong(final Map<?, ?> map, final String key, long defaultValue) {
-        try {
-            return Long.parseLong(getMapStr(map, key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /*
-     * float version of above
-     */
-    public static float getMapFloat(final Map<?, ?> map, final String key) {
-        return getMapFloat(map, key, 0);
-    }
-
-    public static float getMapFloat(final Map<?, ?> map, final String key, float defaultValue) {
-        try {
-            return Float.parseFloat(getMapStr(map, key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /*
-     * double version of above
-     */
-    public static double getMapDouble(final Map<?, ?> map, final String key) {
-        return getMapDouble(map, key, 0);
-    }
-
-    public static double getMapDouble(final Map<?, ?> map, final String key, double defaultValue) {
-        try {
-            return Double.parseDouble(getMapStr(map, key));
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /*
-     * returns a date object from the passed key in the passed map
-     * returns null if key doesn't exist or isn't a date
-     */
-    public static Date getMapDate(final Map<?, ?> map, final String key) {
-        if (map == null || key == null || !map.containsKey(key)) {
-            return null;
-        }
-        try {
-            return (Date) map.get(key);
-        } catch (ClassCastException e) {
-            return null;
-        }
-    }
-
-    /*
-     * returns a boolean value from the passed key in the passed map
-     * returns true unless key doesn't exist, or the value is "0" or "false"
-     */
-    public static boolean getMapBool(final Map<?, ?> map, final String key) {
-        String value = getMapStr(map, key);
-        if (value.isEmpty()) {
-            return false;
-        }
-        if (value.startsWith("0")) { // handles "0" and "0.0"
-            return false;
-        }
-        if (value.equalsIgnoreCase("false")) {
-            return false;
-        }
-        // all other values are assume to be true
-        return true;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java
deleted file mode 100644
index d052d0758dc1..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/MediaUtils.java
+++ /dev/null
@@ -1,563 +0,0 @@
-package org.wordpress.android.util;
-
-import android.annotation.TargetApi;
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.CursorLoader;
-import android.database.Cursor;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.provider.OpenableColumns;
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-
-import androidx.annotation.Nullable;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class MediaUtils {
-    private static final int DEFAULT_MAX_IMAGE_WIDTH = 1024;
-    private static final Pattern FILE_EXISTS_PATTERN = Pattern.compile("(.*?)(-([0-9]+))?(\\..*$)?");
-
-    public static boolean isValidImage(String url) {
-        if (url == null) {
-            return false;
-        }
-        url = url.toLowerCase(Locale.ROOT);
-        return url.endsWith(".png") || url.endsWith(".jpg") || url.endsWith(".jpeg") || url.endsWith(".gif");
-    }
-
-    public static boolean isDocument(String url) {
-        if (url == null) {
-            return false;
-        }
-        url = url.toLowerCase(Locale.ROOT);
-        return url.endsWith(".doc") || url.endsWith(".docx") || url.endsWith(".odt") || url.endsWith(".pdf");
-    }
-
-    public static boolean isPowerpoint(String url) {
-        if (url == null) {
-            return false;
-        }
-        url = url.toLowerCase(Locale.ROOT);
-        return url.endsWith(".ppt") || url.endsWith(".pptx") || url.endsWith(".pps") || url.endsWith(".ppsx")
-               || url.endsWith(".key");
-    }
-
-    public static boolean isSpreadsheet(String url) {
-        if (url == null) {
-            return false;
-        }
-        url = url.toLowerCase(Locale.ROOT);
-        return url.endsWith(".xls") || url.endsWith(".xlsx");
-    }
-
-    public static boolean isVideo(String url) {
-        if (url == null) {
-            return false;
-        }
-        url = url.toLowerCase(Locale.ROOT);
-        return url.endsWith(".ogv") || url.endsWith(".mp4") || url.endsWith(".m4v") || url.endsWith(".mov")
-               || url.endsWith(".wmv") || url.endsWith(".avi") || url.endsWith(".mpg") || url.endsWith(".3gp")
-               || url.endsWith(".3g2") || url.contains("video");
-    }
-
-    public static boolean isAudio(String url) {
-        if (url == null) {
-            return false;
-        }
-        url = url.toLowerCase(Locale.ROOT);
-        return url.endsWith(".mp3") || url.endsWith(".ogg") || url.endsWith(".wav") || url.endsWith(".wma")
-               || url.endsWith(".aiff") || url.endsWith(".aif") || url.endsWith(".aac") || url.endsWith(".m4a");
-    }
-
-    public static boolean isGif(String url) {
-        return "gif".equals(MimeTypeMap.getFileExtensionFromUrl(url));
-    }
-
-    public static boolean isLocalFile(String state) {
-        if (state == null) {
-            return false;
-        }
-
-        return state.equalsIgnoreCase("queued")
-               || state.equalsIgnoreCase("uploading")
-               || state.equalsIgnoreCase("retry")
-               || state.equalsIgnoreCase("failed");
-    }
-
-    public static Uri getLastRecordedVideoUri(Context appContext) {
-        String[] proj = {MediaStore.Video.Media._ID};
-        Uri contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-        String sortOrder = MediaStore.Video.VideoColumns.DATE_TAKEN + " DESC";
-        CursorLoader loader = new CursorLoader(appContext, contentUri, proj, null, null, sortOrder);
-        Cursor cursor = loader.loadInBackground();
-        cursor.moveToFirst();
-        long value = cursor.getLong(0);
-        SqlUtils.closeCursor(cursor);
-
-        return Uri.parse(contentUri.toString() + "/" + value);
-    }
-
-    /**
-     * Get image max size setting from the image max size setting string. This string can be an int, in this case it's
-     * the maximum image width defined by the site.
-     * Examples:
-     * "1000" will return 1000
-     * "Original Size" will return Integer.MAX_VALUE
-     * "Largeur originale" will return Integer.MAX_VALUE
-     * null will return Integer.MAX_VALUE
-     * @param imageMaxSizeSiteSettingString Image max size site setting string
-     * @return Integer.MAX_VALUE if image width is not defined or invalid, maximum image width in other cases.
-     */
-    public static int getImageMaxSizeSettingFromString(String imageMaxSizeSiteSettingString) {
-        if (imageMaxSizeSiteSettingString == null) {
-            return Integer.MAX_VALUE;
-        }
-        try {
-            return Integer.valueOf(imageMaxSizeSiteSettingString);
-        } catch (NumberFormatException e) {
-            return Integer.MAX_VALUE;
-        }
-    }
-
-    /**
-     * Calculate and return the maximum allowed image width by comparing the width of the image at its full size with
-     * the maximum upload width set in the blog settings
-     * @param imageSize the image's natural (full) width
-     * @param imageMaxSizeSiteSettingString the maximum upload width set in the site settings
-     * @return maximum allowed image width
-     */
-    public static int getMaximumImageSize(int imageSize, String imageMaxSizeSiteSettingString) {
-        int imageMaxSizeBlogSetting = getImageMaxSizeSettingFromString(imageMaxSizeSiteSettingString);
-        int imageWidthPictureSetting = imageSize == 0 ? Integer.MAX_VALUE : imageSize;
-
-        if (Math.min(imageWidthPictureSetting, imageMaxSizeBlogSetting) == Integer.MAX_VALUE) {
-            // Default value in case of errors reading the picture size or the blog settings is set to Original size
-            return DEFAULT_MAX_IMAGE_WIDTH;
-        } else {
-            return Math.min(imageWidthPictureSetting, imageMaxSizeBlogSetting);
-        }
-    }
-
-    public static int getMaximumImageSize(Context context, Uri curStream, String imageMaxSizeBlogSettingString) {
-        int[] dimensions = ImageUtils.getImageSize(curStream, context);
-        return getMaximumImageSize(dimensions[0], imageMaxSizeBlogSettingString);
-    }
-
-    public static boolean isInMediaStore(Uri mediaUri) {
-        // Check if the image is externally hosted (Picasa/Google Photos for example)
-        return mediaUri != null && mediaUri.toString().startsWith("content://media/");
-    }
-
-    public static @Nullable String getFilenameFromURI(Context context, Uri uri) {
-        Cursor cursor = context.getContentResolver().query(uri, new String[]{OpenableColumns.DISPLAY_NAME},
-                null, null, null);
-        try {
-            String result = null;
-            if (cursor != null && cursor.moveToFirst()) {
-                int columnIndexDisplayName = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
-                if (columnIndexDisplayName == -1) {
-                    return null;
-                }
-                result = cursor.getString(columnIndexDisplayName);
-            }
-            return result;
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-    }
-
-    /*
-     * Some media providers (eg. Google Photos) give us a limited access to media files just so we can copy them and
-     * then they revoke the access. Copying these files must be performed on the UI thread, otherwise the access might
-     * be revoked before the action completes. See https://github.com/wordpress-mobile/WordPress-Android/issues/5818
-     */
-    public static Uri downloadExternalMedia(Context context, Uri imageUri) {
-        if (context == null || imageUri == null) {
-            return null;
-        }
-        String mimeType = UrlUtils.getUrlMimeType(imageUri.toString());
-        File cacheDir = context.getCacheDir();
-
-        if (cacheDir != null && !cacheDir.exists()) {
-            cacheDir.mkdirs();
-        }
-        try {
-            InputStream input;
-            // Download the file
-            if (imageUri.toString().startsWith("content://")) {
-                input = context.getContentResolver().openInputStream(imageUri);
-                if (input == null) {
-                    AppLog.e(T.UTILS, "openInputStream returned null");
-                    return null;
-                }
-            } else {
-                input = new URL(imageUri.toString()).openStream();
-            }
-
-            String fileName = getFilenameFromURI(context, imageUri);
-            if (TextUtils.isEmpty(fileName)) {
-                fileName = generateTimeStampedFileName(mimeType);
-            }
-
-            File f = getUniqueCacheFileForName(fileName, cacheDir, mimeType);
-
-            OutputStream output = new FileOutputStream(f);
-
-            byte[] data = new byte[1024];
-            int count;
-            while ((count = input.read(data)) != -1) {
-                output.write(data, 0, count);
-            }
-
-            output.flush();
-            output.close();
-            input.close();
-
-            return Uri.fromFile(f);
-        } catch (IOException e) {
-            AppLog.e(T.UTILS, e);
-        }
-
-        return null;
-    }
-
-    private static File getUniqueCacheFileForName(String fileName, File cacheDir, String mimeType) {
-        File file = new File(cacheDir, fileName);
-
-        while (file.exists()) {
-            Matcher matcher = FILE_EXISTS_PATTERN.matcher(fileName);
-            if (matcher.matches()) {
-                String baseFileName = matcher.group(1);
-                String existingDuplicationNumber = matcher.group(3);
-                String fileType = StringUtils.notNullStr(matcher.group(4));
-
-                if (existingDuplicationNumber == null) {
-                    // Not a copy already
-                    fileName = baseFileName + "-1" + fileType;
-                } else {
-                    fileName = baseFileName + "-" + (StringUtils.stringToInt(existingDuplicationNumber) + 1) + fileType;
-                }
-            } else {
-                // Shouldn't happen, but in case our match fails fall back to timestamped file name
-                fileName = generateTimeStampedFileName(mimeType);
-            }
-            file = new File(cacheDir, fileName);
-        }
-        return file;
-    }
-
-    public static String generateTimeStampedFileName(String mimeType) {
-        return "wp-" + System.currentTimeMillis() + "." + getExtensionForMimeType(mimeType);
-    }
-
-    public static String getMimeTypeOfInputStream(InputStream stream) {
-        BitmapFactory.Options options = new BitmapFactory.Options();
-        options.inJustDecodeBounds = true;
-        BitmapFactory.decodeStream(stream, null, options);
-        return options.outMimeType;
-    }
-
-    public static String getMediaFileMimeType(File mediaFile) {
-        String originalFileName = mediaFile.getName().toLowerCase(Locale.ROOT);
-        String mimeType = UrlUtils.getUrlMimeType(originalFileName);
-
-        if (TextUtils.isEmpty(mimeType)) {
-            try {
-                String filePathForGuessingMime;
-                if (mediaFile.getPath().contains("://")) {
-                    filePathForGuessingMime = Uri.encode(mediaFile.getPath(), ":/");
-                } else {
-                    filePathForGuessingMime = "file://" + Uri.encode(mediaFile.getPath(), "/");
-                }
-                URL urlForGuessingMime = new URL(filePathForGuessingMime);
-                URLConnection uc = urlForGuessingMime.openConnection();
-                String guessedContentType = null;
-                try {
-                    guessedContentType =
-                            uc.getContentType(); // internally calls guessContentTypeFromName(url.getFile()); and
-                    // guessContentTypeFromStream(is);
-                } catch (StringIndexOutOfBoundsException e) {
-                    // Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/5699
-                    AppLog.e(AppLog.T.MEDIA, "Error getting the content type for " + mediaFile.getPath()
-                                             + " by using URLConnection.getContentType", e);
-                }
-                // check if returned "content/unknown"
-                if (!TextUtils.isEmpty(guessedContentType) && !guessedContentType.equals("content/unknown")) {
-                    mimeType = guessedContentType;
-                }
-            } catch (MalformedURLException e) {
-                AppLog.e(AppLog.T.MEDIA,
-                         "MalformedURLException while trying to guess the content type for the file here " + mediaFile
-                                 .getPath() + " with URLConnection", e);
-            } catch (IOException e) {
-                AppLog.e(AppLog.T.MEDIA,
-                         "Error while trying to guess the content type for the file here " + mediaFile.getPath()
-                         + " with URLConnection", e);
-            }
-        }
-
-        // No mimeType yet? Try to decode the image and get the mimeType from there
-        if (TextUtils.isEmpty(mimeType)) {
-            try {
-                DataInputStream inputStream = new DataInputStream(new FileInputStream(mediaFile));
-                String mimeTypeFromStream = getMimeTypeOfInputStream(inputStream);
-                if (!TextUtils.isEmpty(mimeTypeFromStream)) {
-                    mimeType = mimeTypeFromStream;
-                }
-                inputStream.close();
-            } catch (FileNotFoundException e) {
-                AppLog.e(AppLog.T.MEDIA,
-                         "FileNotFoundException while trying to guess the content type for the file " + mediaFile
-                                 .getPath(), e);
-            } catch (IOException e) {
-                AppLog.e(AppLog.T.MEDIA,
-                         "IOException while trying to guess the content type for the file " + mediaFile.getPath(), e);
-            }
-        }
-
-        if (TextUtils.isEmpty(mimeType)) {
-            mimeType = "";
-        } else {
-            if (mimeType.equalsIgnoreCase("video/mp4v-es")) { // Fixes #533. See: http://tools.ietf.org/html/rfc3016
-                mimeType = "video/mp4";
-            }
-        }
-
-        return mimeType;
-    }
-
-    public static String getMediaFileName(File mediaFile, String mimeType) {
-        String originalFileName = mediaFile.getName().toLowerCase(Locale.ROOT);
-        String extension = MimeTypeMap.getFileExtensionFromUrl(originalFileName);
-        if (!TextUtils.isEmpty(extension)) { // File name already has the extension in it
-            return originalFileName;
-        }
-
-        if (!TextUtils.isEmpty(mimeType)) { // try to get the extension from mimeType
-            String fileExtension = getExtensionForMimeType(mimeType);
-            if (!TextUtils.isEmpty(fileExtension)) {
-                originalFileName += "." + fileExtension;
-            }
-        } else {
-            // No mimetype and no extension!!
-            AppLog.e(AppLog.T.API, "No mimetype and no extension for " + mediaFile.getPath());
-        }
-
-        return originalFileName;
-    }
-
-    public static String getExtensionForMimeType(String mimeType) {
-        if (TextUtils.isEmpty(mimeType)) {
-            return "";
-        }
-
-        MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
-        String fileExtensionFromMimeType = mimeTypeMap.getExtensionFromMimeType(mimeType);
-        if (TextUtils.isEmpty(fileExtensionFromMimeType)) {
-            // We're still without an extension - split the mime type and retrieve it
-            String[] split = mimeType.split("/");
-            fileExtensionFromMimeType = split.length > 1 ? split[1] : split[0];
-        }
-
-        return fileExtensionFromMimeType.toLowerCase(Locale.ROOT);
-    }
-
-    public static String getRealPathFromURI(final Context context, Uri uri) {
-        String path;
-        if ("content".equals(uri.getScheme())) {
-            path = MediaUtils.getPath(context, uri);
-        } else if ("file".equals(uri.getScheme())) {
-            path = uri.getPath();
-        } else {
-            path = uri.toString();
-        }
-
-        return path;
-    }
-
-    /**
-     * Get a file path from a Uri. This will get the the path for Storage Access
-     * Framework Documents, as well as the _data field for the MediaStore and
-     * other file-based ContentProviders.
-     *
-     * Based on paulburke's solution for aFileChooser - https://github.com/iPaulPro/aFileChooser
-     *
-     * @param context The context.
-     * @param uri The Uri to query.
-     */
-    private static String getPath(final Context context, final Uri uri) {
-        String path = getDocumentProviderPathKitkatOrHigher(context, uri);
-
-        if (path != null) {
-            return path;
-        }
-
-        // MediaStore (and general)
-        if ("content".equalsIgnoreCase(uri.getScheme())) {
-            return getDataColumn(context, uri, null, null);
-        } else if ("file".equalsIgnoreCase(uri.getScheme())) { // File
-            return uri.getPath();
-        }
-
-        return null;
-    }
-
-    @TargetApi(Build.VERSION_CODES.KITKAT)
-    private static String getDocumentProviderPathKitkatOrHigher(final Context context, final Uri uri) {
-        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
-        // DocumentProvider
-        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-            if (isExternalStorageDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                if ("primary".equalsIgnoreCase(type)) {
-                    return Environment.getExternalStorageDirectory() + "/" + split[1];
-                }
-
-                // TODO handle non-primary volumes
-            } else if (isDownloadsDocument(uri)) {
-                String id = DocumentsContract.getDocumentId(uri);
-
-                if (id != null && id.startsWith("raw:")) {
-                    return id.substring(4);
-                }
-
-                // https://github.com/Javernaut/WhatTheCodec/issues/2
-                if (id != null && id.startsWith("msf:")) {
-                    id = id.substring(4);
-                }
-
-                String[] contentUriPrefixesToTry = new String[]{
-                        "content://downloads/public_downloads",
-                        "content://downloads/my_downloads",
-                        "content://downloads/all_downloads"
-                };
-
-                for (String contentUriPrefix : contentUriPrefixesToTry) {
-                    Uri contentUri = ContentUris.withAppendedId(Uri.parse(contentUriPrefix), Long.valueOf(id));
-                    try {
-                        String path = getDataColumn(context, contentUri, null, null);
-                        if (path != null) {
-                            return path;
-                        }
-                    } catch (Exception e) {
-                        AppLog.e(AppLog.T.UTILS, "Error reading _data column for URI: " + contentUri, e);
-                    }
-                }
-                return downloadExternalMedia(context, uri).getPath();
-            } else if (isMediaDocument(uri)) { // MediaProvider
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                } else if ("video".equals(type)) {
-                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                } else if ("audio".equals(type)) {
-                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = MediaStore.MediaColumns._ID + "=?";
-
-                final String[] selectionArgs = new String[]{
-                        split[1]
-                };
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the value of the data column for this Uri. This is useful for
-     * MediaStore Uris, and other file-based ContentProviders.
-     *
-     * @param context The context.
-     * @param uri The Uri to query.
-     * @param selection (Optional) Filter used in the query.
-     * @param selectionArgs (Optional) Selection arguments used in the query.
-     * @return The value of the _data column, which is typically a file path.
-     */
-    public static String getDataColumn(Context context, Uri uri, String selection,
-                                       String[] selectionArgs) {
-        Cursor cursor = null;
-        final String column = MediaStore.MediaColumns.DATA;
-
-        final String[] projection = {
-                column
-        };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs, null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int columnIndex = cursor.getColumnIndex(column);
-                if (columnIndex != -1) {
-                    return cursor.getString(columnIndex);
-                }
-            }
-        } catch (SecurityException errReadingContentResolver) {
-            AppLog.e(AppLog.T.UTILS, "Error reading _data column for URI: " + uri, errReadingContentResolver);
-        } finally {
-            if (cursor != null) {
-                cursor.close();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is ExternalStorageProvider.
-     */
-    public static boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is DownloadsProvider.
-     */
-    public static boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is MediaProvider.
-     */
-    public static boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java
deleted file mode 100644
index 83a2cb20066e..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/NetworkUtils.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.wordpress.android.util;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Build;
-import android.os.Build.VERSION_CODES;
-import android.provider.Settings;
-
-/**
- * requires android.permission.ACCESS_NETWORK_STATE
- */
-@SuppressLint("MissingPermission")
-public class NetworkUtils {
-    public static final int TYPE_UNKNOWN = -1;
-
-    /**
-     * returns information on the active network connection
-     */
-    @SuppressLint("MissingPermission")
-    public static NetworkInfo getActiveNetworkInfo(Context context) {
-        if (context == null) {
-            return null;
-        }
-        ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (cm == null) {
-            return null;
-        }
-        // note that this may return null if no network is currently active
-        return cm.getActiveNetworkInfo();
-    }
-
-    /**
-     * returns the ConnectivityManager.TYPE_xxx if there's an active connection, otherwise
-     * returns TYPE_UNKNOWN
-     */
-    private static int getActiveNetworkType(Context context) {
-        NetworkInfo info = getActiveNetworkInfo(context);
-        if (info == null || !info.isConnected()) {
-            return TYPE_UNKNOWN;
-        }
-        return info.getType();
-    }
-
-    /**
-     * returns true if a network connection is available
-     */
-    public static boolean isNetworkAvailable(Context context) {
-        NetworkInfo info = getActiveNetworkInfo(context);
-        return (info != null && info.isConnected());
-    }
-
-    /**
-     * returns true if the user is connected to WiFi
-     */
-    public static boolean isWiFiConnected(Context context) {
-        return (getActiveNetworkType(context) == ConnectivityManager.TYPE_WIFI);
-    }
-
-    /**
-     * returns true if the user is connected with the mobile data connection
-     */
-    public static boolean isMobileConnected(Context context) {
-        int networkType = getActiveNetworkType(context);
-        return (networkType == ConnectivityManager.TYPE_MOBILE
-                || networkType == ConnectivityManager.TYPE_MOBILE_DUN);
-    }
-
-    /**
-     * returns true if airplane mode has been enabled
-     */
-    @TargetApi(VERSION_CODES.JELLY_BEAN_MR1)
-    @SuppressWarnings("deprecation")
-    public static boolean isAirplaneModeOn(Context context) {
-        // prior to JellyBean 4.2 this was Settings.System.AIRPLANE_MODE_ON, JellyBean 4.2
-        // moved it to Settings.Global
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return Settings.System.getInt(context.getContentResolver(), Settings.System.AIRPLANE_MODE_ON, 0) != 0;
-        } else {
-            return Settings.Global.getInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
-        }
-    }
-
-    /**
-     * returns true if there's an active network connection, otherwise displays a toast error
-     * and returns false
-     */
-    public static boolean checkConnection(Context context) {
-        if (context == null) {
-            return false;
-        }
-        if (isNetworkAvailable(context)) {
-            return true;
-        }
-        ToastUtils.showToast(context, R.string.no_network_message);
-        return false;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PackageUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PackageUtils.java
deleted file mode 100644
index 52900a0bf27e..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PackageUtils.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-public class PackageUtils {
-    /**
-     * Return true if Debug build. false otherwise.
-     */
-    public static boolean isDebugBuild() {
-        return BuildConfig.DEBUG;
-    }
-
-    public static PackageInfo getPackageInfo(Context context) {
-        try {
-            PackageManager manager = context.getPackageManager();
-            return manager.getPackageInfo(context.getPackageName(), 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Return version code, or 0 if it can't be read
-     */
-    public static int getVersionCode(Context context) {
-        PackageInfo packageInfo = getPackageInfo(context);
-        if (packageInfo != null) {
-            return packageInfo.versionCode;
-        }
-        return 0;
-    }
-
-    /**
-     * Return version name, or the string "0" if it can't be read
-     */
-    public static String getVersionName(Context context) {
-        PackageInfo packageInfo = getPackageInfo(context);
-        if (packageInfo != null) {
-            return packageInfo.versionName;
-        }
-        return "0";
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PermissionUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PermissionUtils.java
deleted file mode 100644
index 8d484d847519..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PermissionUtils.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.wordpress.android.util;
-
-import android.Manifest.permission;
-import android.app.Activity;
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PermissionUtils {
-    /**
-     * Check for permissions, request them if they're not granted.
-     *
-     * @return true if permissions are already granted, else request them and return false.
-     */
-    public static boolean checkAndRequestPermissions(Activity activity, int requestCode, String[] permissionList) {
-        List<String> toRequest = new ArrayList<>();
-        for (String permission : permissionList) {
-            if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) {
-                toRequest.add(permission);
-            }
-        }
-        if (toRequest.size() > 0) {
-            String[] requestedPermissions = toRequest.toArray(new String[toRequest.size()]);
-            ActivityCompat.requestPermissions(activity, requestedPermissions, requestCode);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check for permissions, request them if they're not granted.
-     *
-     * @return true if permissions are already granted, else request them and return false.
-     */
-    private static boolean checkAndRequestPermissions(Fragment fragment, int requestCode, String[] permissionList) {
-        List<String> toRequest = new ArrayList<>();
-        for (String permission : permissionList) {
-            Context context = fragment.getActivity();
-            if (context != null && ContextCompat.checkSelfPermission(context, permission) != PackageManager
-                    .PERMISSION_GRANTED) {
-                toRequest.add(permission);
-            }
-        }
-        if (toRequest.size() > 0) {
-            String[] requestedPermissions = toRequest.toArray(new String[toRequest.size()]);
-            fragment.requestPermissions(requestedPermissions, requestCode);
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check for permissions without requesting them
-     *
-     * @return true if all permissions are granted
-     */
-    public static boolean checkPermissions(Activity activity, String[] permissionList) {
-        for (String permission : permissionList) {
-            if (ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static boolean checkCameraAndStoragePermissions(Activity activity) {
-        return checkPermissions(activity,
-                                new String[]{
-                                        permission.WRITE_EXTERNAL_STORAGE,
-                                        permission.CAMERA});
-    }
-
-    public static boolean checkAndRequestCameraAndStoragePermissions(Fragment fragment, int requestCode) {
-        return checkAndRequestPermissions(fragment, requestCode, new String[]{
-                permission.WRITE_EXTERNAL_STORAGE,
-                permission.CAMERA
-        });
-    }
-
-    public static boolean checkAndRequestCameraAndStoragePermissions(Activity activity, int requestCode) {
-        return checkAndRequestPermissions(activity, requestCode, new String[]{
-                permission.WRITE_EXTERNAL_STORAGE,
-                permission.CAMERA
-        });
-    }
-
-    public static boolean checkAndRequestStoragePermission(Activity activity, int requestCode) {
-        return checkAndRequestPermissions(activity, requestCode, new String[]{
-                permission.WRITE_EXTERNAL_STORAGE
-        });
-    }
-
-    public static boolean checkAndRequestStoragePermission(Fragment fragment, int requestCode) {
-        return checkAndRequestPermissions(fragment, requestCode, new String[]{
-                permission.WRITE_EXTERNAL_STORAGE
-        });
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
deleted file mode 100644
index 2f12eb05fae7..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.wordpress.android.util;
-
-import android.text.TextUtils;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * routines related to the Photon API
- * http://developer.wordpress.com/docs/photon/
- */
-public class PhotonUtils {
-    private PhotonUtils() {
-        throw new AssertionError();
-    }
-
-    /*
-     * returns true if the passed url is an obvious "mshots" url
-     */
-    public static boolean isMshotsUrl(final String imageUrl) {
-        return (imageUrl != null && imageUrl.contains("/mshots/"));
-    }
-
-    /*
-     * returns a photon url for the passed image with the resize query set to the passed
-     * dimensions - note that the passed quality parameter will only affect JPEGs
-     */
-    public enum Quality {
-        HIGH,
-        MEDIUM,
-        LOW
-    }
-
-    public static final String ATOMIC_MEDIA_PROXY_URL_PREFIX = "https://public-api.wordpress.com/wpcom/v2/sites/";
-    public static final String ATOMIC_MEDIA_PROXY_URL_SUFFIX = "/atomic-auth-proxy/file";
-
-    public static String getPhotonImageUrl(String imageUrl, int width, int height) {
-        return getPhotonImageUrl(imageUrl, width, height, Quality.MEDIUM);
-    }
-
-    public static String getPhotonImageUrl(String imageUrl, int width, int height, boolean isPrivateAtomicSite) {
-        return getPhotonImageUrl(imageUrl, width, height, Quality.MEDIUM, isPrivateAtomicSite);
-    }
-
-    public static String getPhotonImageUrl(String imageUrl, int width, int height, Quality quality) {
-        return getPhotonImageUrl(imageUrl, width, height, quality, false);
-    }
-
-    public static String getPhotonImageUrl(String imageUrl, int width, int height, Quality quality,
-                                           boolean isPrivateAtomicSite) {
-        if (TextUtils.isEmpty(imageUrl)) {
-            return "";
-        }
-
-        // make sure it's valid
-        int schemePos = imageUrl.indexOf("://");
-        if (schemePos == -1) {
-            return imageUrl;
-        }
-
-        // we have encountered some image urls that incorrectly have a # fragment part, which
-        // must be removed before removing the query string
-        int fragmentPos = imageUrl.indexOf("#");
-        if (fragmentPos > 0) {
-            imageUrl = imageUrl.substring(0, fragmentPos);
-        }
-
-        String urlCopy = imageUrl;
-
-        // remove existing query string since it may contain params that conflict with the passed ones
-        imageUrl = UrlUtils.removeQuery(imageUrl);
-
-        // if this is an "mshots" url, skip photon and return it with a query that sets the width/height
-        if (isMshotsUrl(imageUrl)) {
-            return imageUrl + "?w=" + width + "&h=" + height;
-        }
-
-        // strip=info removes Exif, IPTC and comment data from the output image.
-        String query = "?strip=info";
-
-        switch (quality) {
-            case HIGH:
-                query += "&quality=100";
-                break;
-            case LOW:
-                query += "&quality=35";
-                break;
-            default: // medium
-                query += "&quality=65";
-                break;
-        }
-
-        // if both width & height are passed use the "resize" param, use only "w" or "h" if just
-        // one of them is set
-        if (width > 0 && height > 0) {
-            query += "&resize=" + width + "," + height;
-        } else if (width > 0) {
-            query += "&w=" + width;
-        } else if (height > 0) {
-            query += "&h=" + height;
-        }
-
-        if (isPrivateAtomicSite) {
-            try {
-                URL url = new URL(imageUrl);
-                String slug = url.getHost();
-                String path = url.getPath();
-                return ATOMIC_MEDIA_PROXY_URL_PREFIX + slug + ATOMIC_MEDIA_PROXY_URL_SUFFIX
-                       + "?path=" + path + "&" + query;
-            } catch (MalformedURLException e) {
-                e.printStackTrace();
-                return "";
-            }
-        }
-
-        // return passed url+query if it's already a photon url
-        if (imageUrl.contains(".wp.com")) {
-            if (imageUrl.contains("i0.wp.com") || imageUrl.contains("i1.wp.com") || imageUrl.contains("i2.wp.com")) {
-                boolean useSsl = urlCopy.indexOf("?") > 0 && urlCopy.contains("ssl=1");
-
-                if (useSsl) {
-                    query += "&ssl=1";
-                }
-
-                return imageUrl + query;
-            }
-        }
-
-        // use wordpress.com as the host if image is on wordpress.com since it supports the same
-        // query params and, more importantly, can handle images in private blogs
-        if (imageUrl.contains("wordpress.com")) {
-            return imageUrl + query;
-        }
-
-        // must use ssl=1 parameter for https image urls
-        boolean useSSl = UrlUtils.isHttps(imageUrl);
-        if (useSSl) {
-            query += "&ssl=1";
-        }
-
-        return "https://i0.wp.com/" + imageUrl.substring(schemePos + 3, imageUrl.length()) + query;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ProfilingUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ProfilingUtils.java
deleted file mode 100644
index 2bda40589853..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ProfilingUtils.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.wordpress.android.util;
-
-import android.os.SystemClock;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.util.ArrayList;
-
-/**
- * forked from android.util.TimingLogger to use AppLog instead of Log + new static interface.
- */
-public class ProfilingUtils {
-    private static ProfilingUtils sInstance;
-
-    private String mLabel;
-    private ArrayList<Long> mSplits;
-    private ArrayList<String> mSplitLabels;
-
-    public static void start(String label) {
-        getInstance().reset(label);
-    }
-
-    public static void split(String splitLabel) {
-        getInstance().addSplit(splitLabel);
-    }
-
-    public static void dump() {
-        getInstance().dumpToLog();
-    }
-
-    public static void stop() {
-        getInstance().reset(null);
-    }
-
-    private static ProfilingUtils getInstance() {
-        if (sInstance == null) {
-            sInstance = new ProfilingUtils();
-        }
-        return sInstance;
-    }
-
-    public ProfilingUtils() {
-        reset("init");
-    }
-
-    public void reset(String label) {
-        mLabel = label;
-        reset();
-    }
-
-    public void reset() {
-        if (mSplits == null) {
-            mSplits = new ArrayList<Long>();
-            mSplitLabels = new ArrayList<String>();
-        } else {
-            mSplits.clear();
-            mSplitLabels.clear();
-        }
-        addSplit(null);
-    }
-
-    public void addSplit(String splitLabel) {
-        if (mLabel == null) {
-            return;
-        }
-        long now = SystemClock.elapsedRealtime();
-        mSplits.add(now);
-        mSplitLabels.add(splitLabel);
-    }
-
-    public void dumpToLog() {
-        if (mLabel == null) {
-            return;
-        }
-        AppLog.d(T.PROFILING, mLabel + ": begin");
-        final long first = mSplits.get(0);
-        long now = first;
-        for (int i = 1; i < mSplits.size(); i++) {
-            now = mSplits.get(i);
-            final String splitLabel = mSplitLabels.get(i);
-            final long prev = mSplits.get(i - 1);
-            AppLog.d(T.PROFILING, mLabel + ": " + (now - prev) + " ms, " + splitLabel);
-        }
-        AppLog.d(T.PROFILING, mLabel + ": end, " + (now - first) + " ms");
-    }
-}
-
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ServiceUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ServiceUtils.java
deleted file mode 100644
index 6bcfde06b892..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ServiceUtils.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.wordpress.android.util;
-
-import android.app.ActivityManager;
-import android.content.Context;
-
-public class ServiceUtils {
-    public static boolean isServiceRunning(Context context, Class<?> serviceClass) {
-        ActivityManager manager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
-        for (ActivityManager.RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE)) {
-            if (serviceClass.getName().equals(service.service.getClassName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ShortcodeUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ShortcodeUtils.java
deleted file mode 100644
index 09480f156364..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ShortcodeUtils.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.wordpress.android.util;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class ShortcodeUtils {
-    public static String getVideoPressShortcodeFromId(String videoPressId) {
-        if (videoPressId == null || videoPressId.isEmpty()) {
-            return "";
-        }
-
-        return "[wpvideo " + videoPressId + "]";
-    }
-
-    public static String getVideoPressIdFromShortCode(String shortcode) {
-        String videoPressId = "";
-
-        if (shortcode != null) {
-            String videoPressShortcodeRegex = "^\\[wpvideo (.*)]$";
-
-            Pattern pattern = Pattern.compile(videoPressShortcodeRegex);
-            Matcher matcher = pattern.matcher(shortcode);
-
-            if (matcher.find()) {
-                videoPressId = matcher.group(1);
-            }
-        }
-
-        return videoPressId;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java
deleted file mode 100644
index e9ca93d2ec7c..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SqlUtils.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.wordpress.android.util;
-
-import android.database.Cursor;
-import android.database.DatabaseUtils;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDoneException;
-import android.database.sqlite.SQLiteException;
-import android.database.sqlite.SQLiteStatement;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SqlUtils {
-    private SqlUtils() {
-        throw new AssertionError();
-    }
-
-    /*
-     * SQLite doesn't have a boolean datatype, so booleans are stored as 0=false, 1=true
-     */
-    public static long boolToSql(boolean value) {
-        return (value ? 1 : 0);
-    }
-
-    public static boolean sqlToBool(int value) {
-        return (value != 0);
-    }
-
-    public static void closeStatement(SQLiteStatement stmt) {
-        if (stmt != null) {
-            stmt.close();
-        }
-    }
-
-    public static void closeCursor(Cursor c) {
-        if (c != null && !c.isClosed()) {
-            c.close();
-        }
-    }
-
-    /*
-     * wrapper for DatabaseUtils.longForQuery() which returns 0 if query returns no rows
-     */
-    public static long longForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        try {
-            return DatabaseUtils.longForQuery(db, query, selectionArgs);
-        } catch (SQLiteDoneException e) {
-            return 0;
-        }
-    }
-
-    public static int intForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        long value = longForQuery(db, query, selectionArgs);
-        return (int) value;
-    }
-
-    public static boolean boolForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        long value = longForQuery(db, query, selectionArgs);
-        return sqlToBool((int) value);
-    }
-
-    /*
-     * wrapper for DatabaseUtils.stringForQuery(), returns "" if query returns no rows
-     */
-    public static String stringForQuery(SQLiteDatabase db, String query, String[] selectionArgs) {
-        try {
-            return DatabaseUtils.stringForQuery(db, query, selectionArgs);
-        } catch (SQLiteDoneException e) {
-            return "";
-        }
-    }
-
-    /*
-     * returns the number of rows in the passed table
-     */
-    public static long getRowCount(SQLiteDatabase db, String tableName) {
-        return DatabaseUtils.queryNumEntries(db, tableName);
-    }
-
-    /*
-     * removes all rows from the passed table
-     */
-    public static void deleteAllRowsInTable(SQLiteDatabase db, String tableName) {
-        db.delete(tableName, null, null);
-    }
-
-    /*
-     * drop all tables from the passed SQLiteDatabase - make sure to pass a
-     * writable database
-     */
-    public static boolean dropAllTables(SQLiteDatabase db) throws SQLiteException {
-        if (db == null) {
-            return false;
-        }
-
-        if (db.isReadOnly()) {
-            throw new SQLiteException("can't drop tables from a read-only database");
-        }
-
-        List<String> tableNames = new ArrayList<String>();
-        Cursor cursor = db.rawQuery("SELECT name FROM sqlite_master WHERE type='table'", null);
-        if (cursor.moveToFirst()) {
-            do {
-                String tableName = cursor.getString(0);
-                if (!tableName.equals("android_metadata") && !tableName.equals("sqlite_sequence")) {
-                    tableNames.add(tableName);
-                }
-            } while (cursor.moveToNext());
-        }
-
-        db.beginTransaction();
-        try {
-            for (String tableName : tableNames) {
-                db.execSQL("DROP TABLE IF EXISTS " + tableName);
-            }
-            db.setTransactionSuccessful();
-            return true;
-        } finally {
-            db.endTransaction();
-            closeCursor(cursor);
-        }
-    }
-
-    /*
-     * Android's CursorWindow has a max size of 2MB per row which can be exceeded
-     * with a very large text column, causing an IllegalStateException when the
-     * row is read - prevent this by limiting the amount of text that's stored in
-     * the text column.
-     * https://github.com/android/platform_frameworks_base/blob/b77bc869241644a662f7e615b0b00ecb5aee373d/core/res/res
-     * /values/config.xml#L1268
-     * https://github.com/android/platform_frameworks_base/blob/3bdbf644d61f46b531838558fabbd5b990fc4913/core/java
-     * /android/database/CursorWindow.java#L103
-     */
-    // Max 512K characters (a UTF-8 char is 4 bytes max, so a 512K characters string is always < 2Mb)
-    private static final int MAX_TEXT_LEN = 1024 * 1024 / 2;
-
-    public static String maxSQLiteText(final String text) {
-        if (text.length() <= MAX_TEXT_LEN) {
-            return text;
-        }
-        AppLog.w(T.UTILS, "sqlite > max text exceeded, storing truncated text");
-        return text.substring(0, MAX_TEXT_LEN);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java
deleted file mode 100644
index ef96282eb1fb..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.text.TextUtils;
-
-import androidx.annotation.StringRes;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-
-public class StringUtils {
-    /**
-     * Compare two Strings lexicographically
-     * Mirrors {@link org.apache.commons.lang3.StringUtils#compare(String, String)}. Use this version when there is a
-     * hint that the Apache lib might not be provided by the system.
-     * @param s1 the String to compare from
-     * @param s2 the String to compare to
-     * @return &lt; 0, 0, &gt; 0, if {@code s1} is respectively less, equal ou greater than {@code s2}
-     */
-    public static int compare(String s1, String s2) {
-        if (s1 == s2) {
-            return 0;
-        } else if (s1 == null) {
-            return -1;
-        } else if (s2 == null) {
-            return 1;
-        } else {
-            return s1.compareTo(s2);
-        }
-    }
-
-    /**
-     * Compare two Strings lexicographically, ignoring case differences.
-     * Mirrors {@link org.apache.commons.lang3.StringUtils#compareIgnoreCase(String, String)}. Use this version when
-     * there is a hint that the Apache lib might not be provided by the system.
-     * @param s1 the String to compare from
-     * @param s2 the String to compare to
-     * @return &lt; 0, 0, &gt; 0, if {@code s1} is respectively less, equal ou greater than {@code s2}
-     */
-    public static int compareIgnoreCase(final String s1, final String s2) {
-        if (s1 == s2) {
-            return 0;
-        }
-        if (s1 == null) {
-            return -1;
-        }
-        if (s2 == null) {
-            return 1;
-        }
-        return s1.compareToIgnoreCase(s2);
-    }
-
-    public static String[] mergeStringArrays(String[] array1, String[] array2) {
-        if (array1 == null || array1.length == 0) {
-            return array2;
-        }
-        if (array2 == null || array2.length == 0) {
-            return array1;
-        }
-        List<String> array1List = Arrays.asList(array1);
-        List<String> array2List = Arrays.asList(array2);
-        List<String> result = new ArrayList<String>(array1List);
-        List<String> tmp = new ArrayList<String>(array1List);
-        tmp.retainAll(array2List);
-        result.addAll(array2List);
-        return ((String[]) result.toArray(new String[result.size()]));
-    }
-
-    public static String convertHTMLTagsForUpload(String source) {
-        // bold
-        source = source.replace("<b>", "<strong>");
-        source = source.replace("</b>", "</strong>");
-
-        // italics
-        source = source.replace("<i>", "<em>");
-        source = source.replace("</i>", "</em>");
-
-        return source;
-    }
-
-    public static String convertHTMLTagsForDisplay(String source) {
-        // bold
-        source = source.replace("<strong>", "<b>");
-        source = source.replace("</strong>", "</b>");
-
-        // italics
-        source = source.replace("<em>", "<i>");
-        source = source.replace("</em>", "</i>");
-
-        return source;
-    }
-
-    public static String addPTags(String source) {
-        String[] asploded = source.split("\n\n");
-
-        if (asploded.length > 0) {
-            StringBuilder wrappedHTML = new StringBuilder();
-            for (int i = 0; i < asploded.length; i++) {
-                String trimmed = asploded[i].trim();
-                if (trimmed.length() > 0) {
-                    trimmed = trimmed.replace("<br />", "<br>").replace("<br/>", "<br>").replace("<br>\n", "<br>")
-                                     .replace("\n", "<br>");
-                    wrappedHTML.append("<p>");
-                    wrappedHTML.append(trimmed);
-                    wrappedHTML.append("</p>");
-                }
-            }
-            return wrappedHTML.toString();
-        } else {
-            return source;
-        }
-    }
-
-    public static BigInteger getMd5IntHash(String input) {
-        try {
-            MessageDigest md = MessageDigest.getInstance("MD5");
-            byte[] messageDigest = md.digest(input.getBytes());
-            BigInteger number = new BigInteger(1, messageDigest);
-            return number;
-        } catch (NoSuchAlgorithmException e) {
-            AppLog.e(T.UTILS, e);
-            return null;
-        }
-    }
-
-    public static String getMd5Hash(String input) {
-        BigInteger number = getMd5IntHash(input);
-        String md5 = number.toString(16);
-        while (md5.length() < 32) {
-            md5 = "0" + md5;
-        }
-        return md5;
-    }
-
-    /*
-     * nbradbury - adapted from Html.escapeHtml(), which was added in API Level 16
-     * TODO: not thoroughly tested yet, so marked as private - not sure I like the way
-     * this replaces two spaces with "&nbsp;"
-     */
-    private static String escapeHtml(final String text) {
-        if (text == null) {
-            return "";
-        }
-
-        StringBuilder out = new StringBuilder();
-        int length = text.length();
-
-        for (int i = 0; i < length; i++) {
-            char c = text.charAt(i);
-
-            if (c == '<') {
-                out.append("&lt;");
-            } else if (c == '>') {
-                out.append("&gt;");
-            } else if (c == '&') {
-                out.append("&amp;");
-            } else if (c > 0x7E || c < ' ') {
-                out.append("&#").append((int) c).append(";");
-            } else if (c == ' ') {
-                while (i + 1 < length && text.charAt(i + 1) == ' ') {
-                    out.append("&nbsp;");
-                    i++;
-                }
-
-                out.append(' ');
-            } else {
-                out.append(c);
-            }
-        }
-
-        return out.toString();
-    }
-
-    /*
-     * returns empty string if passed string is null, otherwise returns passed string
-     */
-    public static String notNullStr(String s) {
-        if (s == null) {
-            return "";
-        }
-        return s;
-    }
-
-    /**
-     * returns true if two strings are equal or two strings are null
-     */
-    public static boolean equals(String s1, String s2) {
-        if (s1 == null) {
-            return s2 == null;
-        }
-        return s1.equals(s2);
-    }
-
-    /*
-     * capitalizes the first letter in the passed string - based on Apache commons/lang3/StringUtils
-     * http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/main/java/org/apache/commons/lang3/StringUtils
-     * .java?revision=1497829&view=markup
-     */
-    public static String capitalize(final String str) {
-        int strLen;
-        if (str == null || (strLen = str.length()) == 0) {
-            return str;
-        }
-
-        char firstChar = str.charAt(0);
-        if (Character.isTitleCase(firstChar)) {
-            return str;
-        }
-
-        return new StringBuilder(strLen).append(Character.toTitleCase(firstChar)).append(str.substring(1)).toString();
-    }
-
-    public static String removeTrailingSlash(final String str) {
-        if (TextUtils.isEmpty(str) || !str.endsWith("/")) {
-            return str;
-        }
-
-        return str.substring(0, str.length() - 1);
-    }
-
-    /*
-     * Wrap an image URL in a photon URL
-     * Check out http://developer.wordpress.com/docs/photon/
-     */
-    public static String getPhotonUrl(String imageUrl, int size) {
-        imageUrl = imageUrl.replace("http://", "").replace("https://", "");
-        return "http://i0.wp.com/" + imageUrl + "?w=" + size;
-    }
-
-    public static String replaceUnicodeSurrogateBlocksWithHTMLEntities(final String inputString) {
-        final int length = inputString.length();
-        StringBuilder out = new StringBuilder(); // Used to hold the output.
-        for (int offset = 0; offset < length;) {
-            final int codepoint = inputString.codePointAt(offset);
-            final char current = inputString.charAt(offset);
-            if (Character.isHighSurrogate(current) || Character.isLowSurrogate(current)) {
-                if (EmoticonsUtils.WP_SMILIES_CODE_POINT_TO_TEXT.get(codepoint) != null) {
-                    out.append(EmoticonsUtils.WP_SMILIES_CODE_POINT_TO_TEXT.get(codepoint));
-                } else {
-                    final String htmlEscapedChar = "&#x" + Integer.toHexString(codepoint) + ";";
-                    out.append(htmlEscapedChar);
-                }
-            } else {
-                out.append(current);
-            }
-            offset += Character.charCount(codepoint);
-        }
-        return out.toString();
-    }
-
-    /**
-     * Used to convert a language code ([lc]_[rc] where lc is language code (en, fr, es, etc...)
-     * and rc is region code (zh-CN, zh-HK, zh-TW, etc...) to a displayable string with the languages
-     * name.
-     *
-     * The input string must be between 2 and 6 characters, inclusive. An empty string is returned
-     * if that is not the case.
-     *
-     * If the input string is recognized by {@link Locale} the result of this method is the given
-     *
-     * @return non-null
-     */
-    public static String getLanguageString(String languagueCode, Locale displayLocale) {
-        if (languagueCode == null || languagueCode.length() < 2 || languagueCode.length() > 6) {
-            return "";
-        }
-
-        Locale languageLocale = new Locale(languagueCode.substring(0, 2));
-        return languageLocale.getDisplayLanguage(displayLocale) + languagueCode.substring(2);
-    }
-
-    /**
-     * This method ensures that the output String has only
-     * valid XML unicode characters as specified by the
-     * XML 1.0 standard. For reference, please see
-     * <a href="http://www.w3.org/TR/2000/REC-xml-20001006#NT-Char">the
-     * standard</a>. This method will return an empty
-     * String if the input is null or empty.
-     *
-     * @param in The String whose non-valid characters we want to remove.
-     * @return The in String, stripped of non-valid characters.
-     */
-    public static final String stripNonValidXMLCharacters(String in) {
-        StringBuilder out = new StringBuilder(); // Used to hold the output.
-        char current; // Used to reference the current character.
-
-        if (in == null || ("".equals(in))) {
-            return ""; // vacancy test.
-        }
-        for (int i = 0; i < in.length(); i++) {
-            current = in.charAt(i); // NOTE: No IndexOutOfBoundsException caught here; it should not happen.
-            if ((current == 0x9)
-                || (current == 0xA)
-                || (current == 0xD)
-                || ((current >= 0x20) && (current <= 0xD7FF))
-                || ((current >= 0xE000) && (current <= 0xFFFD))
-                || ((current >= 0x10000) && (current <= 0x10FFFF))) {
-                out.append(current);
-            }
-        }
-        return out.toString();
-    }
-
-    /*
-     * simple wrapper for Integer.valueOf(string) so caller doesn't need to catch NumberFormatException
-     */
-    public static int stringToInt(String s) {
-        return stringToInt(s, 0);
-    }
-
-    public static int stringToInt(String s, int defaultValue) {
-        if (s == null) {
-            return defaultValue;
-        }
-        try {
-            return Integer.valueOf(s);
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    public static long stringToLong(String s) {
-        return stringToLong(s, 0L);
-    }
-
-    public static long stringToLong(String s, long defaultValue) {
-        if (s == null) {
-            return defaultValue;
-        }
-        try {
-            return Long.valueOf(s);
-        } catch (NumberFormatException e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * Formats the string for the given quantity, using the given arguments.
-     * We need this because our translation platform doesn't support Android plurals.
-     *
-     * @param zero The desired string identifier to get when quantity is exactly 0
-     * @param one The desired string identifier to get when quantity is exactly 1
-     * @param other The desired string identifier to get when quantity is not (0 or 1)
-     * @param quantity The number used to get the correct string
-     */
-    public static String getQuantityString(Context context, @StringRes int zero, @StringRes int one,
-                                           @StringRes int other, int quantity) {
-        if (quantity == 0) {
-            return context.getString(zero);
-        }
-        if (quantity == 1) {
-            return context.getString(one);
-        }
-        return String.format(context.getString(other), quantity);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactory.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactory.java
deleted file mode 100644
index e3fee7fc33b7..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactory.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-public class SystemServiceFactory {
-    private static SystemServiceFactoryAbstract sFactory;
-
-    public static Object get(Context context, String name) {
-        if (sFactory == null) {
-            sFactory = new SystemServiceFactoryDefault();
-        }
-        return sFactory.get(context, name);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryAbstract.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryAbstract.java
deleted file mode 100644
index 7b86f6631062..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryAbstract.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-public interface SystemServiceFactoryAbstract {
-    Object get(Context context, String name);
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryDefault.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryDefault.java
deleted file mode 100644
index eb488dde9bf4..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/SystemServiceFactoryDefault.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-
-public class SystemServiceFactoryDefault implements SystemServiceFactoryAbstract {
-    public Object get(Context context, String name) {
-        return context.getSystemService(name);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ToastUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ToastUtils.java
deleted file mode 100644
index 470867364b8c..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ToastUtils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.wordpress.android.util;
-
-import android.content.Context;
-import android.view.Gravity;
-import android.widget.Toast;
-
-/**
- * Provides a simplified way to show toast messages without having to create the toast, set the
- * desired gravity, etc.
- */
-public class ToastUtils {
-    public enum Duration {
-        SHORT, LONG
-    }
-
-    private ToastUtils() {
-        throw new AssertionError();
-    }
-
-    public static Toast showToast(Context context, int stringResId) {
-        return showToast(context, stringResId, Duration.SHORT);
-    }
-
-    public static Toast showToast(Context context, int stringResId, Duration duration) {
-        return showToast(context, context.getString(stringResId), duration);
-    }
-
-    public static Toast showToast(Context context, String text) {
-        return showToast(context, text, Duration.SHORT);
-    }
-
-    public static Toast showToast(Context context, String text, Duration duration) {
-        return showToast(context, text, duration, Gravity.CENTER);
-    }
-
-    public static Toast showToast(Context context, String text, Duration duration, int gravity) {
-        return showToast(context, text, duration, gravity, 0, 0);
-    }
-
-    public static Toast showToast(
-            Context context,
-            String text,
-            Duration duration,
-            int gravity,
-            int xOffset,
-            int yOffset) {
-        Toast toast = Toast.makeText(context, text,
-                (duration == Duration.SHORT ? Toast.LENGTH_SHORT : Toast.LENGTH_LONG));
-        toast.setGravity(gravity, xOffset, yOffset);
-        toast.show();
-        return toast;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java
deleted file mode 100644
index 0068ac9d4d8b..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UrlUtils.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package org.wordpress.android.util;
-
-import android.net.Uri;
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-import android.webkit.URLUtil;
-
-import androidx.annotation.Nullable;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.io.UnsupportedEncodingException;
-import java.net.IDN;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-
-import static org.wordpress.android.util.PhotonUtils.ATOMIC_MEDIA_PROXY_URL_PREFIX;
-import static org.wordpress.android.util.PhotonUtils.ATOMIC_MEDIA_PROXY_URL_SUFFIX;
-
-public class UrlUtils {
-    public static String urlEncode(final String text) {
-        try {
-            return URLEncoder.encode(text, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return text;
-        }
-    }
-
-    public static String urlDecode(final String text) {
-        try {
-            return URLDecoder.decode(text, "UTF-8");
-        } catch (UnsupportedEncodingException e) {
-            return text;
-        }
-    }
-
-    /**
-     * @param urlString url to get host from
-     * @return host of uri if available. Empty string otherwise.
-     */
-    public static String getHost(final String urlString) {
-        if (urlString != null) {
-            Uri uri = Uri.parse(urlString);
-            if (uri.getHost() != null) {
-                return uri.getHost();
-            }
-        }
-        return "";
-    }
-
-    public static boolean isContentUri(String uri) {
-        return "content".equals(Uri.parse(uri).getScheme());
-    }
-
-    /**
-     * Convert IDN names to punycode if necessary
-     */
-    public static String convertUrlToPunycodeIfNeeded(String url) {
-        if (!Charset.forName("US-ASCII").newEncoder().canEncode(url)) {
-            if (url.toLowerCase(Locale.ROOT).startsWith("http://")) {
-                url = "http://" + IDN.toASCII(url.substring(7), IDN.ALLOW_UNASSIGNED);
-            } else if (url.toLowerCase(Locale.ROOT).startsWith("https://")) {
-                url = "https://" + IDN.toASCII(url.substring(8), IDN.ALLOW_UNASSIGNED);
-            } else {
-                url = IDN.toASCII(url, IDN.ALLOW_UNASSIGNED);
-            }
-        }
-        return url;
-    }
-
-    /**
-     * Remove leading double slash, and inherit protocol scheme
-     */
-    public static String removeLeadingDoubleSlash(String url, String scheme) {
-        if (url != null && url.startsWith("//")) {
-            url = url.substring(2);
-            if (scheme != null) {
-                if (scheme.endsWith("://")) {
-                    url = scheme + url;
-                } else {
-                    AppLog.e(T.UTILS, "Invalid scheme used: " + scheme);
-                }
-            }
-        }
-        return url;
-    }
-
-    /**
-     * Add scheme prefix to an URL. This method must be called on all user entered or server fetched URLs to ensure
-     * http client will work as expected.
-     *
-     * @param url url entered by the user or fetched from a server
-     * @param addHttps true and the url is not starting with http://, it will make the url starts with https://
-     * @return url prefixed by http:// or https://
-     */
-    public static String addUrlSchemeIfNeeded(String url, boolean addHttps) {
-        if (url == null) {
-            return null;
-        }
-
-        // Remove leading double slash (eg. // example.com), needed for some wporg instances configured to
-        // switch between http or https
-        url = removeLeadingDoubleSlash(url, (addHttps ? "https" : "http") + "://");
-
-        // If the URL is a valid http or https URL, we're good to go
-        if (URLUtil.isHttpUrl(url) || URLUtil.isHttpsUrl(url)) {
-            return url;
-        }
-
-        // Else, remove the old scheme and prefix it by https:// or http://
-        return (addHttps ? "https" : "http") + "://" + removeScheme(url);
-    }
-
-    /**
-     * normalizes a URL, primarily for comparison purposes, for example so that
-     * normalizeUrl("http://google.com/") = normalizeUrl("http://google.com")
-     */
-    public static String normalizeUrl(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-
-        // this routine is called from some performance-critical code and creating a URI from a string
-        // is slow, so skip it when possible - if we know it's not a relative path (and 99.9% of the
-        // time it won't be for our purposes) then we can normalize it without java.net.URI.normalize()
-        if (urlString.startsWith("http")
-            && !urlString.contains("build/intermediates/exploded-aar/org.wordpress/graphview/3.1.1")) {
-            // return without a trailing slash
-            if (urlString.endsWith("/")) {
-                return urlString.substring(0, urlString.length() - 1);
-            }
-            return urlString;
-        }
-
-        // url is relative, so fall back to using slower java.net.URI normalization
-        try {
-            URI uri = URI.create(urlString);
-            return uri.normalize().toString();
-        } catch (IllegalArgumentException e) {
-            return urlString;
-        }
-    }
-
-
-    /**
-     * returns the passed url without the scheme
-     */
-    public static String removeScheme(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-
-        int doubleslash = urlString.indexOf("//");
-        if (doubleslash == -1) {
-            doubleslash = 0;
-        } else {
-            doubleslash += 2;
-        }
-
-        return urlString.substring(doubleslash, urlString.length());
-    }
-
-    /**
-     * returns the passed url without the query parameters
-     */
-    public static String removeQuery(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-        return Uri.parse(urlString).buildUpon().clearQuery().toString();
-    }
-
-    /**
-     * returns true if passed url is https:
-     */
-    public static boolean isHttps(final String urlString) {
-        return (urlString != null && urlString.startsWith("https:"));
-    }
-
-    public static boolean isHttps(URL url) {
-        return url != null && "https".equals(url.getProtocol());
-    }
-
-    public static boolean isHttps(URI uri) {
-        if (uri == null) {
-            return false;
-        }
-
-        String protocol = uri.getScheme();
-        return protocol != null && protocol.equals("https");
-    }
-
-    /**
-     * returns https: version of passed http: url
-     */
-    public static String makeHttps(final String urlString) {
-        if (urlString == null || !urlString.startsWith("http:")) {
-            return urlString;
-        }
-        return "https:" + urlString.substring(5, urlString.length());
-    }
-
-    /**
-     * see http://stackoverflow.com/a/8591230/1673548
-     */
-    public static String getUrlMimeType(final String urlString) {
-        if (urlString == null) {
-            return null;
-        }
-
-        String extension = MimeTypeMap.getFileExtensionFromUrl(urlString);
-        if (extension == null) {
-            return null;
-        }
-
-        MimeTypeMap mime = MimeTypeMap.getSingleton();
-        String mimeType = mime.getMimeTypeFromExtension(extension);
-        if (mimeType == null) {
-            return null;
-        }
-
-        return mimeType;
-    }
-
-    /**
-     * returns false if the url is not valid or if the url host is null, else true
-     */
-    public static boolean isValidUrlAndHostNotNull(String url) {
-        try {
-            URI uri = URI.create(url);
-            if (uri.getHost() == null) {
-                return false;
-            }
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
-        return true;
-    }
-
-    // returns true if the passed url is for an image
-    public static boolean isImageUrl(String url) {
-        if (TextUtils.isEmpty(url)) {
-            return false;
-        }
-
-        String cleanedUrl = removeQuery(url.toLowerCase(Locale.ROOT));
-
-        if (isAtomicImageProxyUrl(cleanedUrl)) {
-            return true;
-        }
-
-        return cleanedUrl.endsWith("jpg") || cleanedUrl.endsWith("jpeg")
-               || cleanedUrl.endsWith("gif") || cleanedUrl.endsWith("png");
-    }
-
-    public static @Nullable String getPageJumpOrNull(String url) {
-        if (TextUtils.isEmpty(url)) {
-            return null;
-        }
-
-        if (url.contains("#")
-            && url.indexOf("#") < url.length() - 1
-            && url.split("#").length == 2) {
-            return url.substring(url.indexOf('#') + 1);
-        }
-
-        return null;
-    }
-
-    private static boolean isAtomicImageProxyUrl(String urlString) {
-        return urlString.startsWith(ATOMIC_MEDIA_PROXY_URL_PREFIX) && urlString.endsWith(ATOMIC_MEDIA_PROXY_URL_SUFFIX);
-    }
-
-    public static String appendUrlParameter(String url, String paramName, String paramValue) {
-        Map<String, String> parameters = new HashMap<>();
-        parameters.put(paramName, paramValue);
-        return appendUrlParameters(url, parameters);
-    }
-
-    public static String appendUrlParameters(String url, Map<String, String> parameters) {
-        Uri.Builder uriBuilder = Uri.parse(url).buildUpon();
-        for (Map.Entry<String, String> parameter : parameters.entrySet()) {
-            uriBuilder.appendQueryParameter(parameter.getKey(), parameter.getValue());
-        }
-        return uriBuilder.build().toString();
-    }
-
-    /**
-     * Extracts the subdomain from a domain string.
-     * @param domain A domain is expected. Protocol is optional
-     * @return The subdomain or an empty string.
-     */
-    public static String extractSubDomain(String domain) {
-        String str = UrlUtils.addUrlSchemeIfNeeded(domain, false);
-        String host = UrlUtils.getHost(str);
-        if (host.length() > 0) {
-            String[] parts = host.split("\\.");
-            if (parts.length > 1) { // There should be at least 2 dots for there to be a subdomain.
-                return parts[0];
-            }
-        }
-        return "";
-    }
-
-    public static String removeXmlrpcSuffix(String siteAddress) {
-        if (siteAddress.toLowerCase(Locale.ROOT).endsWith("/xmlrpc.php")) {
-            return siteAddress.substring(0, siteAddress.lastIndexOf("xmlrpc.php"));
-        } else {
-            return siteAddress;
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java
deleted file mode 100644
index 8ccb5c4a51c8..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wordpress.android.util;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.Context;
-import android.util.Patterns;
-
-import org.wordpress.android.util.AppLog.T;
-
-import java.util.regex.Pattern;
-
-public class UserEmailUtils {
-    /**
-     * Get primary account and return its name if it matches the email address pattern.
-     *
-     * @return primary account email address if it can be found or empty string else.
-     */
-    public static String getPrimaryEmail(Context context) {
-        try {
-            AccountManager accountManager = AccountManager.get(context);
-            if (accountManager == null) {
-                return "";
-            }
-            Account[] accounts = accountManager.getAccounts();
-            Pattern emailPattern = Patterns.EMAIL_ADDRESS;
-            for (Account account : accounts) {
-                // make sure account.name is an email address before adding to the list
-                if (emailPattern.matcher(account.name).matches()) {
-                    return account.name;
-                }
-            }
-            return "";
-        } catch (SecurityException e) {
-            // exception will occur if app doesn't have GET_ACCOUNTS permission
-            AppLog.e(T.UTILS, "SecurityException - missing GET_ACCOUNTS permission");
-            return "";
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/VideoUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/VideoUtils.java
deleted file mode 100644
index 38ed56a7e744..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/VideoUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.wordpress.android.util;
-
-
-import android.content.Context;
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-
-import java.io.File;
-
-public class VideoUtils {
-    public static long getVideoDurationMS(Context context, File file) {
-        if (context == null || file == null) {
-            AppLog.e(AppLog.T.MEDIA, "context and file can't be null.");
-            return 0L;
-        }
-        return getVideoDurationMS(context, Uri.fromFile(file));
-    }
-
-    public static long getVideoDurationMS(Context context, Uri videoUri) {
-        if (context == null || videoUri == null) {
-            AppLog.e(AppLog.T.MEDIA, "context and videoUri can't be null.");
-            return 0L;
-        }
-        MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-        try {
-            retriever.setDataSource(context, videoUri);
-        } catch (IllegalArgumentException | SecurityException e) {
-            AppLog.e(AppLog.T.MEDIA, "Can't read duration of the video.", e);
-            return 0L;
-        } catch (RuntimeException e) {
-            // Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/5431
-            AppLog.e(AppLog.T.MEDIA,
-                     "Can't read duration of the video due to a Runtime Exception happened setting the datasource", e);
-            return 0L;
-        }
-
-        String time = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
-        if (time == null) {
-            return 0L;
-        }
-        return Long.parseLong(time);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ViewUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ViewUtils.java
deleted file mode 100644
index 9f7a11eeb6e9..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/ViewUtils.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.wordpress.android.util;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.content.res.TypedArray;
-import android.graphics.Outline;
-import android.os.Build;
-import android.view.View;
-import android.view.ViewOutlineProvider;
-
-import androidx.annotation.AttrRes;
-import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
-import androidx.core.view.ViewCompat;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class ViewUtils {
-    /**
-     * Generate a value suitable for use in {@link View#setId(int)}.
-     * This value will not collide with ID values generated at build time by aapt for R.id.
-     * Uses the native implementation if API 17 or above, otherwise uses a copied implementation.
-     *
-     * @return a generated ID value
-     */
-    public static int generateViewId() {
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            return View.generateViewId();
-        } else {
-            return copiedGenerateViewId();
-        }
-    }
-
-    private static final AtomicInteger NEXT_GENERATED_ID = new AtomicInteger(1);
-
-    /**
-     * Copied from {@link View#generateViewId()}
-     * Generate a value suitable for use in {@link View#setId(int)}.
-     * This value will not collide with ID values generated at build time by aapt for R.id.
-     *
-     * @return a generated ID value
-     */
-    private static int copiedGenerateViewId() {
-        for (;;) {
-            final int result = NEXT_GENERATED_ID.get();
-            // aapt-generated IDs have the high byte nonzero; clamp to the range under that.
-            int newValue = result + 1;
-            if (newValue > 0x00FFFFFF) {
-                newValue = 1; // Roll over to 1, not 0.
-            }
-            if (NEXT_GENERATED_ID.compareAndSet(result, newValue)) {
-                return result;
-            }
-        }
-    }
-
-    public static void setButtonBackgroundColor(Context context, View button, @StyleRes int styleId,
-                                                @AttrRes int colorAttribute) {
-        TypedArray a = context.obtainStyledAttributes(styleId, new int[]{colorAttribute});
-        ColorStateList color = a.getColorStateList(0);
-        a.recycle();
-        ViewCompat.setBackgroundTintList(button, color);
-    }
-
-    /**
-     * adds an inset circular shadow outline the passed view (Lollipop+ only) - note that
-     * the view should have its elevation set prior to calling this
-     */
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public static void addCircularShadowOutline(@NonNull View view) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            view.setOutlineProvider(new ViewOutlineProvider() {
-                @Override
-                public void getOutline(View view, Outline outline) {
-                    outline.setOval(0, 0, view.getWidth(), view.getHeight());
-                }
-            });
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WebViewUtils.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WebViewUtils.java
deleted file mode 100644
index 6247957819dc..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/WebViewUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.wordpress.android.util;
-
-import android.os.Build;
-import android.webkit.CookieManager;
-import android.webkit.ValueCallback;
-
-public class WebViewUtils {
-    public static void clearCookiesAsync() {
-        clearCookiesAsync(null);
-    }
-
-    public static void clearCookiesAsync(ValueCallback<Boolean> callback) {
-        CookieManager cookieManager = CookieManager.getInstance();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            cookieManager.removeAllCookies(callback);
-        } else {
-            //noinspection deprecation
-            cookieManager.removeAllCookie();
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Debouncer.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Debouncer.java
deleted file mode 100644
index 1cd723331330..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Debouncer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-public class Debouncer {
-    private final ScheduledExecutorService mScheduler = Executors.newSingleThreadScheduledExecutor();
-    private final ConcurrentHashMap<Object, Future<?>> mDelayedMap = new ConcurrentHashMap<>();
-
-    /**
-     * Debounces {@code callable} by {@code delay}, i.e., schedules it to be executed after {@code delay},
-     * or cancels its execution if the method is called with the same key within the {@code delay} again.
-     */
-    public void debounce(final Object key, final Runnable runnable, long delay, TimeUnit unit) {
-        if (mScheduler.isShutdown()) {
-            return;
-        }
-        final Future<?> prev = mDelayedMap.put(key, mScheduler.schedule(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    runnable.run();
-                } finally {
-                    mDelayedMap.remove(key);
-                }
-            }
-        }, delay, unit));
-        if (prev != null) {
-            prev.cancel(true);
-        }
-    }
-
-    public void shutdown() {
-        mScheduler.shutdownNow();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/ListScrollPositionManager.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/ListScrollPositionManager.java
deleted file mode 100644
index 914373c8f2e1..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/ListScrollPositionManager.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.preference.PreferenceManager;
-import android.view.View;
-import android.widget.ListView;
-
-public class ListScrollPositionManager {
-    private int mSelectedPosition;
-    private int mListViewScrollStateIndex;
-    private int mListViewScrollStateOffset;
-    private ListView mListView;
-    private boolean mSetSelection;
-
-    public ListScrollPositionManager(ListView listView, boolean setSelection) {
-        mListView = listView;
-        mSetSelection = setSelection;
-    }
-
-    public void saveScrollOffset() {
-        mListViewScrollStateIndex = mListView.getFirstVisiblePosition();
-        View view = mListView.getChildAt(0);
-        mListViewScrollStateOffset = 0;
-        if (view != null) {
-            mListViewScrollStateOffset = view.getTop();
-        }
-        if (mSetSelection) {
-            mSelectedPosition = mListView.getCheckedItemPosition();
-        }
-    }
-
-    public void restoreScrollOffset() {
-        mListView.setSelectionFromTop(mListViewScrollStateIndex, mListViewScrollStateOffset);
-        if (mSetSelection) {
-            mListView.setItemChecked(mSelectedPosition, true);
-        }
-    }
-
-    public void saveToPreferences(Context context, String uniqueId) {
-        saveScrollOffset();
-        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
-        Editor editor = settings.edit();
-        editor.putInt("scroll-position-manager-index-" + uniqueId, mListViewScrollStateIndex);
-        editor.putInt("scroll-position-manager-offset-" + uniqueId, mListViewScrollStateOffset);
-        editor.putInt("scroll-position-manager-selected-position-" + uniqueId, mSelectedPosition);
-        editor.apply();
-    }
-
-    public void restoreFromPreferences(Context context, String uniqueId) {
-        SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
-        mListViewScrollStateIndex = settings.getInt("scroll-position-manager-index-" + uniqueId, 0);
-        mListViewScrollStateOffset = settings.getInt("scroll-position-manager-offset-" + uniqueId, 0);
-        mSelectedPosition = settings.getInt("scroll-position-manager-selected-position-" + uniqueId, 0);
-        restoreScrollOffset();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java
deleted file mode 100644
index 98d815802ed2..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaFile.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.text.TextUtils;
-import android.webkit.MimeTypeMap;
-
-import org.wordpress.android.util.MapUtils;
-import org.wordpress.android.util.StringUtils;
-import org.wordpress.android.util.UrlUtils;
-
-import java.util.Date;
-import java.util.Locale;
-import java.util.Map;
-
-public class MediaFile {
-    protected int mId;
-    protected long mPostID;
-    protected String mFilePath = null; // path of the file into disk
-    protected String mFileName = null; // name of the file into the server
-    protected String mTitle = null;
-    protected String mDescription = null;
-    protected String mCaption = null;
-    protected int mHorizontalAlignment; // 0 = none, 1 = left, 2 = center, 3 = right
-    protected boolean mVerticalAligment = false; // false = bottom, true = top
-    protected int mWidth = 500;
-    protected int mHeight;
-    protected String mMimeType = "";
-    protected String mVideoPressShortCode = null;
-    protected boolean mFeatured = false;
-    protected boolean mIsVideo = false;
-    protected boolean mFeaturedInPost;
-    protected String mFileURL = null; // url of the file to download
-    protected String mThumbnailURL = null; // url of the thumbnail to download
-    private String mBlogId;
-    private long mDateCreatedGmt;
-    private String mUploadState = null;
-    private String mMediaId;
-
-    private static final String VIDEOPRESS_SHORTCODE_ID = "videopress_shortcode";
-
-    public MediaFile(String blogId, Map<?, ?> resultMap, boolean isWPCom) {
-        setBlogId(blogId);
-        setMediaId(MapUtils.getMapStr(resultMap, "attachment_id"));
-        setPostID(MapUtils.getMapLong(resultMap, "parent"));
-        setTitle(MapUtils.getMapStr(resultMap, "title"));
-        setCaption(MapUtils.getMapStr(resultMap, "caption"));
-        setDescription(MapUtils.getMapStr(resultMap, "description"));
-        setVideoPressShortCode(MapUtils.getMapStr(resultMap, VIDEOPRESS_SHORTCODE_ID));
-
-        // get the file name from the link
-        String link = MapUtils.getMapStr(resultMap, "link");
-        setFileName(new String(link).replaceAll("^.*/([A-Za-z0-9_-]+)\\.\\w+$", "$1"));
-
-        String fileType = new String(link).replaceAll(".*\\.(\\w+)$", "$1").toLowerCase(Locale.ROOT);
-        String fileMimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileType);
-        setMimeType(fileMimeType);
-
-        // make the file urls be https://... so that we can get these images with oauth when the blogs are private
-        // assume no https for images in self-hosted blogs
-        String fileUrl = MapUtils.getMapStr(resultMap, "link");
-        if (isWPCom) {
-            fileUrl = fileUrl.replace("http:", "https:");
-        }
-        setFileURL(fileUrl);
-
-        String thumbnailURL = MapUtils.getMapStr(resultMap, "thumbnail");
-        if (thumbnailURL.startsWith("http")) {
-            if (isWPCom) {
-                thumbnailURL = thumbnailURL.replace("http:", "https:");
-            }
-            setThumbnailURL(thumbnailURL);
-        }
-
-        Date date = MapUtils.getMapDate(resultMap, "date_created_gmt");
-        if (date != null) {
-            setDateCreatedGMT(date.getTime());
-        }
-
-        Object meta = resultMap.get("metadata");
-        if (meta != null && meta instanceof Map) {
-            Map<?, ?> metadata = (Map<?, ?>) meta;
-            setWidth(MapUtils.getMapInt(metadata, "width"));
-            setHeight(MapUtils.getMapInt(metadata, "height"));
-        }
-    }
-
-    public MediaFile() {
-        // default constructor
-    }
-
-    public MediaFile(MediaFile mediaFile) {
-        this.mId = mediaFile.mId;
-        this.mPostID = mediaFile.mPostID;
-        this.mFilePath = mediaFile.mFilePath;
-        this.mFileName = mediaFile.mFileName;
-        this.mTitle = mediaFile.mTitle;
-        this.mDescription = mediaFile.mDescription;
-        this.mCaption = mediaFile.mCaption;
-        this.mHorizontalAlignment = mediaFile.mHorizontalAlignment;
-        this.mVerticalAligment = mediaFile.mVerticalAligment;
-        this.mWidth = mediaFile.mWidth;
-        this.mHeight = mediaFile.mHeight;
-        this.mMimeType = mediaFile.mMimeType;
-        this.mVideoPressShortCode = mediaFile.mVideoPressShortCode;
-        this.mFeatured = mediaFile.mFeatured;
-        this.mIsVideo = mediaFile.mIsVideo;
-        this.mFeaturedInPost = mediaFile.mFeaturedInPost;
-        this.mFileURL = mediaFile.mFileURL;
-        this.mThumbnailURL = mediaFile.mThumbnailURL;
-        this.mBlogId = mediaFile.mBlogId;
-        this.mDateCreatedGmt = mediaFile.mDateCreatedGmt;
-        this.mUploadState = mediaFile.mUploadState;
-        this.mMediaId = mediaFile.mMediaId;
-    }
-
-    public int getId() {
-        return mId;
-    }
-
-    public void setId(int id) {
-        this.mId = id;
-    }
-
-    public String getMediaId() {
-        return mMediaId;
-    }
-
-    public void setMediaId(String id) {
-        mMediaId = id;
-    }
-
-    public boolean isFeatured() {
-        return mFeatured;
-    }
-
-    public void setFeatured(boolean featured) {
-        this.mFeatured = featured;
-    }
-
-    public long getPostID() {
-        return mPostID;
-    }
-
-    public void setPostID(long postID) {
-        this.mPostID = postID;
-    }
-
-    public String getFilePath() {
-        return mFilePath;
-    }
-
-    public void setFilePath(String filePath) {
-        this.mFilePath = filePath;
-    }
-
-    public String getTitle() {
-        return mTitle;
-    }
-
-    public void setTitle(String title) {
-        this.mTitle = title;
-    }
-
-    public String getCaption() {
-        return mCaption;
-    }
-
-    public void setCaption(String caption) {
-        this.mCaption = caption;
-    }
-
-    public String getDescription() {
-        return mDescription;
-    }
-
-    public void setDescription(String description) {
-        this.mDescription = description;
-    }
-
-    public String getFileURL() {
-        return mFileURL;
-    }
-
-    public void setFileURL(String fileURL) {
-        this.mFileURL = fileURL;
-    }
-
-    public String getThumbnailURL() {
-        return mThumbnailURL;
-    }
-
-    public void setThumbnailURL(String thumbnailURL) {
-        this.mThumbnailURL = thumbnailURL;
-    }
-
-    public boolean isVerticalAlignmentOnTop() {
-        return mVerticalAligment;
-    }
-
-    public void setVerticalAlignmentOnTop(boolean verticalAligment) {
-        this.mVerticalAligment = verticalAligment;
-    }
-
-    public int getWidth() {
-        return mWidth;
-    }
-
-    public void setWidth(int width) {
-        this.mWidth = width;
-    }
-
-    public int getHeight() {
-        return mHeight;
-    }
-
-    public void setHeight(int height) {
-        this.mHeight = height;
-    }
-
-    public String getFileName() {
-        return mFileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.mFileName = fileName;
-    }
-
-    public String getMimeType() {
-        return StringUtils.notNullStr(mMimeType);
-    }
-
-    public void setMimeType(String type) {
-        mMimeType = StringUtils.notNullStr(type);
-    }
-
-    public String getVideoPressShortCode() {
-        return mVideoPressShortCode;
-    }
-
-    public void setVideoPressShortCode(String videoPressShortCode) {
-        this.mVideoPressShortCode = videoPressShortCode;
-    }
-
-    public int getHorizontalAlignment() {
-        return mHorizontalAlignment;
-    }
-
-    public void setHorizontalAlignment(int horizontalAlignment) {
-        this.mHorizontalAlignment = horizontalAlignment;
-    }
-
-    public boolean isVideo() {
-        return mIsVideo;
-    }
-
-    public void setVideo(boolean isVideo) {
-        this.mIsVideo = isVideo;
-    }
-
-    public boolean isFeaturedInPost() {
-        return mFeaturedInPost;
-    }
-
-    public void setFeaturedInPost(boolean featuredInPost) {
-        this.mFeaturedInPost = featuredInPost;
-    }
-
-    public String getBlogId() {
-        return mBlogId;
-    }
-
-    public void setBlogId(String blogId) {
-        this.mBlogId = blogId;
-    }
-
-    public void setDateCreatedGMT(long dateCreatedGmt) {
-        this.mDateCreatedGmt = dateCreatedGmt;
-    }
-
-    public long getDateCreatedGMT() {
-        return mDateCreatedGmt;
-    }
-
-    public void setUploadState(String uploadState) {
-        this.mUploadState = uploadState;
-    }
-
-    public String getUploadState() {
-        return mUploadState;
-    }
-
-    /**
-     * Outputs the Html for an image
-     * If a fullSizeUrl exists, a link will be created to it from the resizedPictureUrl
-     */
-    public String getImageHtmlForUrls(String fullSizeUrl, String resizedPictureURL, boolean shouldAddImageWidthCSS) {
-        String alignment = "";
-        switch (getHorizontalAlignment()) {
-            case 0:
-                alignment = "alignnone";
-                break;
-            case 1:
-                alignment = "alignleft";
-                break;
-            case 2:
-                alignment = "aligncenter";
-                break;
-            case 3:
-                alignment = "alignright";
-                break;
-        }
-
-        String alignmentCSS = "class=\"" + alignment + " size-full\" ";
-
-        if (shouldAddImageWidthCSS) {
-            alignmentCSS += "style=\"max-width: " + getWidth() + "px\" ";
-        }
-
-        // Check if we uploaded a featured picture that is not added to the Post content (normal case)
-        if ((fullSizeUrl != null && fullSizeUrl.equalsIgnoreCase(""))
-            || (resizedPictureURL != null && resizedPictureURL.equalsIgnoreCase(""))) {
-            return ""; // Not featured in Post. Do not add to the content.
-        }
-
-        if (fullSizeUrl == null && resizedPictureURL != null) {
-            fullSizeUrl = resizedPictureURL;
-        } else if (fullSizeUrl != null && resizedPictureURL == null) {
-            resizedPictureURL = fullSizeUrl;
-        }
-
-        String mediaTitle = StringUtils.notNullStr(getTitle());
-
-        String content = String.format(Locale.US, "<a href=\"%s\"><img title=\"%s\" %s alt=\"image\" src=\"%s\" /></a>",
-                                       fullSizeUrl, mediaTitle, alignmentCSS, resizedPictureURL);
-
-        if (!TextUtils.isEmpty(getCaption())) {
-            content = String.format(Locale.US, "[caption id=\"\" align=\"%s\" width=\"%d\"]%s%s[/caption]",
-                                    alignment, getWidth(), content, TextUtils.htmlEncode(getCaption()));
-        }
-
-        return content;
-    }
-
-    public String getAttachmentPageURL(String siteUrl) {
-        siteUrl = UrlUtils.makeHttps(siteUrl);
-        String attachmentPageUrl = UrlUtils.appendUrlParameter(siteUrl, "p", mMediaId);
-        return attachmentPageUrl;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaGallery.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaGallery.java
deleted file mode 100644
index ea13f012b699..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaGallery.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-/**
- * A model representing a Media Gallery.
- * A unique id is not used on the website, but only in this app.
- * It is used to uniquely determining the instance of the object, as it is
- * passed between post and media gallery editor.
- */
-public class MediaGallery implements Serializable {
-    private static final long serialVersionUID = 2359176987182027508L;
-
-    private long mUniqueId;
-    private boolean mIsRandom;
-    private String mType;
-    private int mNumColumns;
-    private ArrayList<Long> mIds;
-
-    public MediaGallery(boolean isRandom, String type, int numColumns, ArrayList<Long> ids) {
-        mIsRandom = isRandom;
-        mType = type;
-        mNumColumns = numColumns;
-        mIds = ids;
-        mUniqueId = System.currentTimeMillis();
-    }
-
-    public MediaGallery() {
-        mIsRandom = false;
-        mType = "";
-        mNumColumns = 3;
-        mIds = new ArrayList<>();
-        mUniqueId = System.currentTimeMillis();
-    }
-
-    public boolean isRandom() {
-        return mIsRandom;
-    }
-
-    public void setRandom(boolean isRandom) {
-        this.mIsRandom = isRandom;
-    }
-
-    public String getType() {
-        return mType;
-    }
-
-    public void setType(String type) {
-        this.mType = type;
-    }
-
-    public int getNumColumns() {
-        return mNumColumns;
-    }
-
-    public void setNumColumns(int numColumns) {
-        this.mNumColumns = numColumns;
-    }
-
-    public ArrayList<Long> getIds() {
-        return mIds;
-    }
-
-    public String getIdsStr() {
-        String idsStr = "";
-        if (mIds.size() > 0) {
-            for (Long id : mIds) {
-                idsStr += id + ",";
-            }
-            idsStr = idsStr.substring(0, idsStr.length() - 1);
-        }
-        return idsStr;
-    }
-
-    public void setIds(ArrayList<Long> ids) {
-        this.mIds = ids;
-    }
-
-    /**
-     * An id to uniquely identify a media gallery object, so that the same object can be edited in the post editor
-     */
-    public long getUniqueId() {
-        return mUniqueId;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaGalleryImageSpan.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaGalleryImageSpan.java
deleted file mode 100644
index 588b98141c27..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/MediaGalleryImageSpan.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.content.Context;
-import android.text.style.ImageSpan;
-
-public class MediaGalleryImageSpan extends ImageSpan {
-    private MediaGallery mMediaGallery;
-
-    public MediaGalleryImageSpan(Context context, MediaGallery mediaGallery, int placeHolder) {
-        super(context, placeHolder);
-        setMediaGallery(mediaGallery);
-    }
-
-    public MediaGallery getMediaGallery() {
-        return mMediaGallery;
-    }
-
-    public void setMediaGallery(MediaGallery mediaGallery) {
-        this.mMediaGallery = mediaGallery;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/RecyclerViewScrollPositionManager.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/RecyclerViewScrollPositionManager.java
deleted file mode 100644
index 93021257449d..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/RecyclerViewScrollPositionManager.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.os.Bundle;
-import android.view.View;
-
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-
-public class RecyclerViewScrollPositionManager {
-    private static final String RV_POSITION = "rv_position";
-    private static final String RV_OFFSET = "rv_offset";
-    private int mRVPosition = 0;
-    private int mRVOffset = 0;
-
-    public void onSaveInstanceState(Bundle outState, RecyclerView recyclerView) {
-        // make sure the layout manager is assigned to the RecyclerView
-        // also take into account this needs to be a LinearLayoutManager, otherwise ClassCastException occurs
-        outState.putInt(RV_POSITION,
-                        ((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition());
-        View firstItemView = recyclerView.getChildAt(0);
-        int offset = (firstItemView == null) ? 0 : (firstItemView.getTop() - recyclerView.getPaddingTop());
-        outState.putInt(RV_OFFSET, offset);
-    }
-
-    public void onRestoreInstanceState(Bundle savedInstanceState) {
-        mRVPosition = savedInstanceState.getInt(RV_POSITION);
-        mRVOffset = savedInstanceState.getInt(RV_OFFSET);
-    }
-
-    public void restoreScrollOffset(RecyclerView recyclerView) {
-        if (mRVPosition > 0 || mRVOffset > 0) {
-            ((LinearLayoutManager) recyclerView.getLayoutManager())
-                    .scrollToPositionWithOffset(mRVPosition, mRVOffset);
-        }
-        mRVPosition = 0;
-        mRVOffset = 0;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java
deleted file mode 100644
index 14cc5efef9a8..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.content.Context;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
-import androidx.core.content.ContextCompat;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener;
-
-import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout;
-
-public class SwipeToRefreshHelper implements OnRefreshListener {
-    private CustomSwipeRefreshLayout mSwipeRefreshLayout;
-    private RefreshListener mRefreshListener;
-    private boolean mRefreshing;
-
-    public interface RefreshListener {
-        void onRefreshStarted();
-    }
-
-    /**
-     * Helps {@link org.wordpress.android.util.widgets.CustomSwipeRefreshLayout} by passing the
-     * {@link SwipeRefreshLayout}, {@link RefreshListener}, and color.
-     *
-     * @param context {@link Context} in which this layout is used.
-     * @param swipeRefreshLayout {@link CustomSwipeRefreshLayout} for refreshing the contents
-     * of a view via a vertical swipe gesture.
-     * @param listener {@link RefreshListener} notified when a refresh is triggered
-     * via the swipe gesture.
-     *
-     * @deprecated Use {@link #SwipeToRefreshHelper(CustomSwipeRefreshLayout, RefreshListener, int, int...)} instead.
-     */
-    @Deprecated
-    public SwipeToRefreshHelper(Context context, CustomSwipeRefreshLayout swipeRefreshLayout,
-                                RefreshListener listener) {
-        init(swipeRefreshLayout, listener, ContextCompat.getColor(context, android.R.color.white),
-                android.R.color.holo_blue_dark);
-    }
-
-    /**
-     * Helps {@link org.wordpress.android.util.widgets.CustomSwipeRefreshLayout} by passing the
-     * {@link SwipeRefreshLayout}, {@link RefreshListener}, and color(s).
-     *
-     * @param swipeRefreshLayout {@link CustomSwipeRefreshLayout} for refreshing the contents
-     * of a view via a vertical swipe gesture.
-     * @param listener {@link RefreshListener} notified when a refresh is triggered
-     * via the swipe gesture.
-     * @param progressAnimationColors Comma-separated color resource integers used in the progress
-     * animation. The first color will also be the color of the bar
-     * that grows in response to a user swipe gesture.
-     */
-    public SwipeToRefreshHelper(CustomSwipeRefreshLayout swipeRefreshLayout, RefreshListener listener,
-                                @ColorInt int backgroundColor,
-                                @ColorRes int... progressAnimationColors) {
-        init(swipeRefreshLayout, listener, backgroundColor, progressAnimationColors);
-    }
-
-    /**
-     * Initializes {@link org.wordpress.android.util.widgets.CustomSwipeRefreshLayout} by assigning
-     * {@link SwipeRefreshLayout}, {@link RefreshListener}, and color(s).
-     *
-     * @param swipeRefreshLayout {@link CustomSwipeRefreshLayout} for refreshing the contents
-     * of a view via a vertical swipe gesture.
-     * @param listener {@link RefreshListener} notified when a refresh is triggered
-     * via the swipe gesture.
-     * @param progressAnimationColors Comma-separated color resource integers used in the progress
-     * animation. The first color will also be the color of the bar
-     * that grows in response to a user swipe gesture.
-     */
-    public void init(CustomSwipeRefreshLayout swipeRefreshLayout, RefreshListener listener,
-                     @ColorInt int backgroundColor,
-                     @ColorRes int... progressAnimationColors) {
-        mRefreshListener = listener;
-        mSwipeRefreshLayout = swipeRefreshLayout;
-        mSwipeRefreshLayout.setOnRefreshListener(this);
-        mSwipeRefreshLayout.setProgressBackgroundColorSchemeColor(backgroundColor);
-        mSwipeRefreshLayout.setColorSchemeResources(progressAnimationColors);
-    }
-
-    public void setRefreshing(boolean refreshing) {
-        mRefreshing = refreshing;
-        // Delayed refresh, it fixes https://code.google.com/p/android/issues/detail?id=77712
-        // 50ms seems a good compromise (always worked during tests) and fast enough so user can't notice the delay
-        if (refreshing) {
-            mSwipeRefreshLayout.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    // use mRefreshing so if the refresh takes less than 50ms, loading indicator won't show up.
-                    mSwipeRefreshLayout.setRefreshing(mRefreshing);
-                }
-            }, 50);
-        } else {
-            mSwipeRefreshLayout.setRefreshing(false);
-        }
-    }
-
-    public boolean isRefreshing() {
-        return mSwipeRefreshLayout.isRefreshing();
-    }
-
-    @Override
-    public void onRefresh() {
-        mRefreshListener.onRefreshStarted();
-    }
-
-    public void setEnabled(boolean enabled) {
-        mSwipeRefreshLayout.setEnabled(enabled);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Version.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Version.java
deleted file mode 100644
index 5e0da1f6b2b4..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Version.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-//See: http://stackoverflow.com/a/11024200
-public class Version implements Comparable<Version> {
-    private String mVersion;
-
-    public final String get() {
-        return this.mVersion;
-    }
-
-    public Version(String version) {
-        if (version == null) {
-            throw new IllegalArgumentException("Version can not be null");
-        }
-        if (!version.matches("[0-9]+(\\.[0-9]+)*")) {
-            throw new IllegalArgumentException("Invalid version format");
-        }
-        this.mVersion = version;
-    }
-
-    @Override public int compareTo(Version that) {
-        if (that == null) {
-            return 1;
-        }
-        String[] thisParts = this.get().split("\\.");
-        String[] thatParts = that.get().split("\\.");
-        int length = Math.max(thisParts.length, thatParts.length);
-        for (int i = 0; i < length; i++) {
-            int thisPart = i < thisParts.length
-                    ? Integer.parseInt(thisParts[i]) : 0;
-            int thatPart = i < thatParts.length
-                    ? Integer.parseInt(thatParts[i]) : 0;
-            if (thisPart < thatPart) {
-                return -1;
-            }
-            if (thisPart > thatPart) {
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    @Override public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (this.getClass() != that.getClass()) {
-            return false;
-        }
-        return this.compareTo((Version) that) == 0;
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPHtmlTagHandler.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPHtmlTagHandler.java
deleted file mode 100644
index e8d21791b454..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPHtmlTagHandler.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.text.Editable;
-import android.text.Html;
-import android.text.style.BulletSpan;
-import android.text.style.LeadingMarginSpan;
-
-import org.xml.sax.XMLReader;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Handle tags that the Html class doesn't understand
- * Tweaked from source at http://stackoverflow.com/questions/4044509/android-how-to-use-the-html-taghandler
- */
-public class WPHtmlTagHandler implements Html.TagHandler {
-    private static final int SPAN_INDENT_WIDTH = 15;
-
-    private int mListItemCount = 0;
-    private List<String> mListParents = new ArrayList<>();
-
-    @Override
-    public void handleTag(final boolean opening, final String tag, Editable output,
-                          final XMLReader xmlReader) {
-        if (tag != null) {
-            switch (tag) {
-                case "WPUL":
-                    if (opening) {
-                        mListParents.add("ul");
-                    } else {
-                        mListParents.remove("ul");
-                    }
-                    break;
-                case "WPOL":
-                    if (opening) {
-                        mListParents.add("ol");
-                    } else {
-                        mListParents.remove("ol");
-                    }
-                    break;
-                case "WPLI":
-                    if (!opening) {
-                        handleListTag(output);
-                    }
-                    break;
-                case "dd":
-                    if (opening) {
-                        mListParents.add("dd");
-                    } else {
-                        mListParents.remove("dd");
-                    }
-                    break;
-            }
-        }
-    }
-
-    private void handleListTag(Editable output) {
-        int size = mListParents.size();
-        if (size > 0 && output != null) {
-            if ("ul".equals(mListParents.get(size - 1))) {
-                output.append("\n");
-                String[] split = output.toString().split("\n");
-                int start = 0;
-                if (split.length != 1) {
-                    int lastIndex = split.length - 1;
-                    start = output.length() - split[lastIndex].length() - 1;
-                }
-                output.setSpan(new BulletSpan(SPAN_INDENT_WIDTH * mListParents.size()), start, output.length(), 0);
-            } else if ("ol".equals(mListParents.get(size - 1))) {
-                mListItemCount++;
-                output.append("\n");
-                String[] split = output.toString().split("\n");
-                int start = 0;
-                if (split.length != 1) {
-                    int lastIndex = split.length - 1;
-                    start = output.length() - split[lastIndex].length() - 1;
-                }
-                output.insert(start, mListItemCount + ". ");
-                output.setSpan(new LeadingMarginSpan.Standard(SPAN_INDENT_WIDTH * mListParents.size()), start,
-                               output.length(), 0);
-            }
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPImageSpan.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPImageSpan.java
deleted file mode 100644
index 61ba1b2d4708..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPImageSpan.java
+++ /dev/null
@@ -1,140 +0,0 @@
-//Add WordPress image fields to ImageSpan object
-
-package org.wordpress.android.util.helpers;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.style.ImageSpan;
-
-public class WPImageSpan extends ImageSpan implements Parcelable {
-    protected Uri mImageSource = null;
-    protected boolean mNetworkImageLoaded = false;
-    protected MediaFile mMediaFile;
-    protected int mStartPosition, mEndPosition;
-
-    protected WPImageSpan() {
-        super((Bitmap) null);
-    }
-
-    public WPImageSpan(Context context, Bitmap b, Uri src) {
-        super(context, b);
-        this.mImageSource = src;
-        mMediaFile = new MediaFile();
-    }
-
-    public WPImageSpan(Context context, int resId, Uri src) {
-        super(context, resId);
-        this.mImageSource = src;
-        mMediaFile = new MediaFile();
-    }
-
-    public void setPosition(int start, int end) {
-        mStartPosition = start;
-        mEndPosition = end;
-    }
-
-    public int getStartPosition() {
-        return mStartPosition >= 0 ? mStartPosition : 0;
-    }
-
-    public int getEndPosition() {
-        return mEndPosition < getStartPosition() ? getStartPosition() : mEndPosition;
-    }
-
-    public MediaFile getMediaFile() {
-        return mMediaFile;
-    }
-
-    public void setMediaFile(MediaFile mediaFile) {
-        this.mMediaFile = mediaFile;
-    }
-
-    public void setImageSource(Uri imageSource) {
-        this.mImageSource = imageSource;
-    }
-
-    public Uri getImageSource() {
-        return mImageSource;
-    }
-
-    public boolean isNetworkImageLoaded() {
-        return mNetworkImageLoaded;
-    }
-
-    public void setNetworkImageLoaded(boolean networkImageLoaded) {
-        this.mNetworkImageLoaded = networkImageLoaded;
-    }
-
-    protected void setupFromParcel(Parcel in) {
-        MediaFile mediaFile = new MediaFile();
-
-        boolean[] booleans = new boolean[2];
-        in.readBooleanArray(booleans);
-        setNetworkImageLoaded(booleans[0]);
-        mediaFile.setVideo(booleans[1]);
-
-        setImageSource(Uri.parse(in.readString()));
-        mediaFile.setMediaId(in.readString());
-        mediaFile.setBlogId(in.readString());
-        mediaFile.setPostID(in.readLong());
-        mediaFile.setCaption(in.readString());
-        mediaFile.setDescription(in.readString());
-        mediaFile.setTitle(in.readString());
-        mediaFile.setMimeType(in.readString());
-        mediaFile.setFileName(in.readString());
-        mediaFile.setThumbnailURL(in.readString());
-        mediaFile.setVideoPressShortCode(in.readString());
-        mediaFile.setFileURL(in.readString());
-        mediaFile.setFilePath(in.readString());
-        mediaFile.setDateCreatedGMT(in.readLong());
-        mediaFile.setWidth(in.readInt());
-        mediaFile.setHeight(in.readInt());
-        setPosition(in.readInt(), in.readInt());
-
-        setMediaFile(mediaFile);
-    }
-
-    public static final Parcelable.Creator<WPImageSpan> CREATOR
-            = new Parcelable.Creator<WPImageSpan>() {
-        public WPImageSpan createFromParcel(Parcel in) {
-            WPImageSpan imageSpan = new WPImageSpan();
-            imageSpan.setupFromParcel(in);
-            return imageSpan;
-        }
-
-        public WPImageSpan[] newArray(int size) {
-            return new WPImageSpan[size];
-        }
-    };
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeBooleanArray(new boolean[]{mNetworkImageLoaded, mMediaFile.isVideo()});
-        parcel.writeString(mImageSource.toString());
-        parcel.writeString(mMediaFile.getMediaId());
-        parcel.writeString(mMediaFile.getBlogId());
-        parcel.writeLong(mMediaFile.getPostID());
-        parcel.writeString(mMediaFile.getCaption());
-        parcel.writeString(mMediaFile.getDescription());
-        parcel.writeString(mMediaFile.getTitle());
-        parcel.writeString(mMediaFile.getMimeType());
-        parcel.writeString(mMediaFile.getFileName());
-        parcel.writeString(mMediaFile.getThumbnailURL());
-        parcel.writeString(mMediaFile.getVideoPressShortCode());
-        parcel.writeString(mMediaFile.getFileURL());
-        parcel.writeString(mMediaFile.getFilePath());
-        parcel.writeLong(mMediaFile.getDateCreatedGMT());
-        parcel.writeInt(mMediaFile.getWidth());
-        parcel.writeInt(mMediaFile.getHeight());
-        parcel.writeInt(getStartPosition());
-        parcel.writeInt(getEndPosition());
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPQuoteSpan.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPQuoteSpan.java
deleted file mode 100644
index 07d75e6af556..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPQuoteSpan.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.text.Layout;
-import android.text.style.QuoteSpan;
-
-/**
- * Customzed QuoteSpan for use in SpannableString's
- */
-public class WPQuoteSpan extends QuoteSpan {
-    public static final int STRIPE_COLOR = 0xFF21759B;
-    private static final int STRIPE_WIDTH = 5;
-    private static final int GAP_WIDTH = 20;
-
-    public WPQuoteSpan() {
-        super(STRIPE_COLOR);
-    }
-
-    @Override
-    public int getLeadingMargin(boolean first) {
-        int margin = GAP_WIDTH * 2 + STRIPE_WIDTH;
-        return margin;
-    }
-
-    /**
-     * Draw a nice thick gray bar if Ice Cream Sandwhich or newer. There's a
-     * bug on older devices that does not respect the increased margin.
-     */
-    @Override
-    public void drawLeadingMargin(Canvas c, Paint p, int x, int dir, int top, int baseline, int bottom,
-                                  CharSequence text, int start, int end, boolean first, Layout layout) {
-        Paint.Style style = p.getStyle();
-        int color = p.getColor();
-
-        p.setStyle(Paint.Style.FILL);
-        p.setColor(STRIPE_COLOR);
-
-        c.drawRect(GAP_WIDTH + x, top, x + dir * STRIPE_WIDTH, bottom, p);
-
-        p.setStyle(style);
-        p.setColor(color);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPUnderlineSpan.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPUnderlineSpan.java
deleted file mode 100644
index fbc23d069360..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPUnderlineSpan.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.wordpress.android.util.helpers;
-
-import android.os.Parcel;
-import android.text.style.UnderlineSpan;
-
-/**
- * WPUnderlineSpan is used as an alternative class to UnderlineSpan. UnderlineSpan is used by EditText auto
- * correct, so it can get mixed up with our formatting.
- */
-public class WPUnderlineSpan extends UnderlineSpan {
-    public WPUnderlineSpan() {
-        super();
-    }
-
-    public WPUnderlineSpan(Parcel src) {
-        super(src);
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPWebChromeClient.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPWebChromeClient.java
deleted file mode 100644
index 119677cb00e8..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPWebChromeClient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.wordpress.android.util.helpers;
-
-import android.app.Activity;
-import android.text.TextUtils;
-import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-import android.widget.ProgressBar;
-
-public class WPWebChromeClient extends WebChromeClient {
-    private final ProgressBar mProgressBar;
-    private final Activity mActivity;
-    private final boolean mAutoUpdateActivityTitle;
-
-    public WPWebChromeClient(Activity activity, ProgressBar progressBar) {
-        mActivity = activity;
-        mProgressBar = progressBar;
-        mAutoUpdateActivityTitle = true;
-    }
-
-    public WPWebChromeClient(Activity activity,
-                             ProgressBar progressBar,
-                             boolean autoUpdateActivityTitle) {
-        mActivity = activity;
-        mProgressBar = progressBar;
-        mAutoUpdateActivityTitle = autoUpdateActivityTitle;
-    }
-
-    public void onProgressChanged(WebView webView, int progress) {
-        if (mActivity != null
-            && !mActivity.isFinishing()
-            && mAutoUpdateActivityTitle
-            && !TextUtils.isEmpty(webView.getTitle())) {
-            mActivity.setTitle(webView.getTitle());
-        }
-        if (mProgressBar != null) {
-            if (progress == 100) {
-                mProgressBar.setVisibility(View.GONE);
-            } else {
-                mProgressBar.setVisibility(View.VISIBLE);
-                mProgressBar.setProgress(progress);
-            }
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileCleaner.kt b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileCleaner.kt
deleted file mode 100644
index 732e831c27ac..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileCleaner.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.wordpress.android.util.helpers.logfile
-
-/**
- * Prunes the Log File Store by retaining only the last `maxLogFileCount` log files.
- *
- * The file list is created upon instantiation – any files added
- * afterwards won't be modified.
- *
- * @param logFileProvider: An interface where the log files will be retrieved from
- * @param maxLogFileCount: The number of log files to retain
- */
-class LogFileCleaner(private val logFileProvider: LogFileProviderInterface, private val maxLogFileCount: Int) {
-    /**
-     * Immediately removes all log files known to exist by this instance except for
-     * the most recent `maxLogFileCount` items.
-     */
-    fun clean() {
-        logFileProvider.getLogFiles()
-                .dropLast(maxLogFileCount)
-                .forEach { it.delete() }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileProvider.kt b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileProvider.kt
deleted file mode 100644
index 0b59ec372b7b..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileProvider.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.wordpress.android.util.helpers.logfile
-
-import android.content.Context
-import java.io.File
-
-private const val LOG_FILE_DIRECTORY = "logs"
-
-/**
- * A collection of helpers for Log Files.
- */
-class LogFileProvider(private val logFileDirectoryPath: String) : LogFileProviderInterface {
-    /**
-     * Provides a {@link java.io.File} directory in which to store log files.
-     *
-     * If the directory doesn't already exist, it will be created.
-     */
-    override fun getLogFileDirectory(): File {
-        val logFileDirectory = File(logFileDirectoryPath, LOG_FILE_DIRECTORY)
-
-        if (!logFileDirectory.exists()) {
-            logFileDirectory.mkdir()
-        }
-
-        return logFileDirectory
-    }
-
-    /**
-     * Provides a list of stored log files, ordered oldest to newest.
-     */
-    override fun getLogFiles(): List<File> {
-        return getLogFileDirectory()
-                .listFiles()
-                .sortedBy { it.lastModified() }
-    }
-
-    companion object {
-        @JvmStatic
-        fun fromContext(context: Context): LogFileProvider {
-            return LogFileProvider(context.applicationInfo.dataDir)
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileProviderInterface.kt b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileProviderInterface.kt
deleted file mode 100644
index e415ed5b738e..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileProviderInterface.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.wordpress.android.util.helpers.logfile
-
-import java.io.File
-
-/**
- * An interface to retrieve log files
- */
-interface LogFileProviderInterface {
-    fun getLogFiles(): List<File>
-
-    fun getLogFileDirectory(): File
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileWriter.kt b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileWriter.kt
deleted file mode 100644
index 41e900f1ec0a..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/logfile/LogFileWriter.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.wordpress.android.util.helpers.logfile
-
-import org.jetbrains.annotations.TestOnly
-import java.io.File
-import java.io.FileWriter
-import java.util.Date
-import org.wordpress.android.util.DateTimeUtils
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-
-/**
- * A class that manages writing to a log file.
- *
- * This class creates and writes to a log file, and will typically persist for the entire lifecycle
- * of its host application.
- */
-class LogFileWriter @JvmOverloads constructor(
-    logFileProvider: LogFileProviderInterface,
-    fileId: String = DateTimeUtils.iso8601FromDate(Date())
-) {
-    private val file = File(logFileProvider.getLogFileDirectory(), "$fileId.log")
-    private val fileWriter: FileWriter = FileWriter(file)
-
-    /**
-     * A serial executor used to write to the file in a background thread
-     */
-    private val queue: ExecutorService = Executors.newSingleThreadExecutor()
-
-    /**
-     * A reference to the underlying {@link Java.IO.File} file.
-     * Should only be used for testing.
-     */
-    @TestOnly
-    fun getFile(): File = file
-
-    /**
-     * Writes the provided string to the log file synchronously
-     */
-    fun write(data: String) {
-        queue.execute {
-            fileWriter.write(data)
-            fileWriter.flush()
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/AutoResizeTextView.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/AutoResizeTextView.java
deleted file mode 100644
index 5f2c62e9a0b6..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/AutoResizeTextView.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package org.wordpress.android.util.widgets;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
-import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.widget.TextView;
-
-import androidx.appcompat.widget.AppCompatTextView;
-import androidx.core.view.ViewCompat;
-
-/**
- * Text view that auto adjusts text size to fit within the view.
- * If the text size equals the minimum text size and still does not
- * fit, append with an ellipsis.
- *
- * See http://stackoverflow.com/a/5535672
- *
- */
-public class AutoResizeTextView extends AppCompatTextView {
-    // Minimum text size for this text view
-    private static final float MIN_TEXT_SIZE = 20;
-
-    // Interface for resize notifications
-    public interface OnTextResizeListener {
-        void onTextResize(TextView textView, float oldSize, float newSize);
-    }
-
-    // Our ellipse string - Unicode Character 'HORIZONTAL ELLIPSIS'
-    private static final String M_ELLIPSIS = "\u2026";
-
-    // Registered resize listener
-    private OnTextResizeListener mTextResizeListener;
-
-    // Flag for text and/or size changes to force a resize
-    private boolean mNeedsResize = false;
-
-    // Text size that is set from code. This acts as a starting point for resizing
-    private float mTextSize;
-
-    // Temporary upper bounds on the starting text size
-    private float mMaxTextSize = 0;
-
-    // Lower bounds for text size
-    private float mMinTextSize = MIN_TEXT_SIZE;
-
-    // Text view line spacing multiplier
-    private float mSpacingMult = 1.0f;
-
-    // Text view additional line spacing
-    private float mSpacingAdd = 0.0f;
-
-    // Add ellipsis to text that overflows at the smallest text size
-    private boolean mAddEllipsis = true;
-
-    // Default constructor override
-    public AutoResizeTextView(Context context) {
-        this(context, null);
-    }
-
-    // Default constructor when inflating from XML file
-    public AutoResizeTextView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    // Default constructor override
-    public AutoResizeTextView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        mTextSize = getTextSize();
-    }
-
-    /**
-     * When text changes, set the force resize flag to true and reset the text size.
-     */
-    @Override
-    protected void onTextChanged(final CharSequence text, final int start, final int before, final int after) {
-        mNeedsResize = true;
-        // Since this view may be reused, it is good to reset the text size
-        resetTextSize();
-    }
-
-    /**
-     * If the text view size changed, set the force resize flag to true
-     */
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        if (w != oldw || h != oldh) {
-            mNeedsResize = true;
-        }
-    }
-
-    /**
-     * Register listener to receive resize notifications
-     * @param listener
-     */
-    public void setOnResizeListener(OnTextResizeListener listener) {
-        mTextResizeListener = listener;
-    }
-
-    /**
-     * Override the set text size to update our internal reference values
-     */
-    @Override
-    public void setTextSize(float size) {
-        super.setTextSize(size);
-        mTextSize = getTextSize();
-    }
-
-    /**
-     * Override the set text size to update our internal reference values
-     */
-    @Override
-    public void setTextSize(int unit, float size) {
-        super.setTextSize(unit, size);
-        mTextSize = getTextSize();
-    }
-
-    /**
-     * Override the set line spacing to update our internal reference values
-     */
-    @Override
-    public void setLineSpacing(float add, float mult) {
-        super.setLineSpacing(add, mult);
-        mSpacingMult = mult;
-        mSpacingAdd = add;
-    }
-
-    /**
-     * Set the upper text size limit and invalidate the view
-     * @param maxTextSize
-     */
-    public void setMaxTextSize(float maxTextSize) {
-        mMaxTextSize = maxTextSize;
-        requestLayout();
-        invalidate();
-    }
-
-    /**
-     * Return upper text size limit
-     * @return
-     */
-    public float getMaxTextSize() {
-        return mMaxTextSize;
-    }
-
-    /**
-     * Set the lower text size limit and invalidate the view
-     * @param minTextSize
-     */
-    public void setMinTextSize(float minTextSize) {
-        mMinTextSize = minTextSize;
-        requestLayout();
-        invalidate();
-    }
-
-    /**
-     * Return lower text size limit
-     * @return
-     */
-    public float getMinTextSize() {
-        return mMinTextSize;
-    }
-
-    /**
-     * Set flag to add ellipsis to text that overflows at the smallest text size
-     * @param addEllipsis
-     */
-    public void setAddEllipsis(boolean addEllipsis) {
-        mAddEllipsis = addEllipsis;
-    }
-
-    /**
-     * Return flag to add ellipsis to text that overflows at the smallest text size
-     * @return
-     */
-    public boolean getAddEllipsis() {
-        return mAddEllipsis;
-    }
-
-    /**
-     * Reset the text to the original size
-     */
-    private void resetTextSize() {
-        if (mTextSize > 0) {
-            super.setTextSize(TypedValue.COMPLEX_UNIT_PX, mTextSize);
-            mMaxTextSize = mTextSize;
-        }
-    }
-
-    /**
-     * Resize text after measuring
-     */
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (changed || mNeedsResize) {
-            int widthLimit = (right - left) - getCompoundPaddingLeft() - getCompoundPaddingRight();
-            int heightLimit = (bottom - top) - getCompoundPaddingBottom() - getCompoundPaddingTop();
-            resizeText(widthLimit, heightLimit);
-        }
-        super.onLayout(changed, left, top, right, bottom);
-    }
-
-    /**
-     * Resize the text size with default width and height
-     */
-    public void resizeText() {
-        int heightLimit = getHeight() - getPaddingBottom() - getPaddingTop();
-        int widthLimit = getWidth() - ViewCompat.getPaddingStart(this) - ViewCompat.getPaddingStart(this);
-        resizeText(widthLimit, heightLimit);
-    }
-
-    /**
-     * Resize the text size with specified width and height
-     * @param width
-     * @param height
-     */
-    @SuppressLint("SetTextI18n") public void resizeText(int width, int height) {
-        CharSequence text = getText();
-        // Do not resize if the view does not have dimensions or there is no text
-        if (text == null || text.length() == 0 || height <= 0 || width <= 0 || mTextSize == 0) {
-            return;
-        }
-
-        // Get the text view's paint object
-        TextPaint textPaint = getPaint();
-
-        // Store the current text size
-        float oldTextSize = textPaint.getTextSize();
-        // If there is a max text size set, use the lesser of that and the default text size
-        float targetTextSize = mMaxTextSize > 0 ? Math.min(mTextSize, mMaxTextSize) : mTextSize;
-
-        // Get the required text height
-        int textHeight = getTextHeight(text, textPaint, width, targetTextSize);
-
-        // Until we either fit within our text view or we had reached our min text size, incrementally try smaller sizes
-        while (textHeight > height && targetTextSize > mMinTextSize) {
-            targetTextSize = Math.max(targetTextSize - 2, mMinTextSize);
-            textHeight = getTextHeight(text, textPaint, width, targetTextSize);
-        }
-
-        // If we had reached our minimum text size and still don't fit, append an ellipsis
-        if (mAddEllipsis && targetTextSize == mMinTextSize && textHeight > height) {
-            // Draw using a static layout
-            // modified: use a copy of TextPaint for measuring
-            TextPaint paint = new TextPaint(textPaint);
-            // Draw using a static layout
-            StaticLayout layout = new StaticLayout(text, paint, width, Layout.Alignment.ALIGN_NORMAL,
-                                                   mSpacingMult, mSpacingAdd, false);
-            // Check that we have a least one line of rendered text
-            if (layout.getLineCount() > 0) {
-                // Since the line at the specific vertical position would be cut off,
-                // we must trim up to the previous line
-                int lastLine = layout.getLineForVertical(height) - 1;
-                // If the text would not even fit on a single line, clear it
-                if (lastLine < 0) {
-                    setText("");
-                } else {
-                    // Otherwise, trim to the previous line and add an ellipsis
-                    int start = layout.getLineStart(lastLine);
-                    int end = layout.getLineEnd(lastLine);
-                    float lineWidth = layout.getLineWidth(lastLine);
-                    float ellipseWidth = paint.measureText(M_ELLIPSIS);
-
-                    // Trim characters off until we have enough room to draw the ellipsis
-                    while (width < lineWidth + ellipseWidth) {
-                        lineWidth = paint.measureText(text.subSequence(start, --end + 1).toString());
-                    }
-                    if (ViewCompat.getLayoutDirection(this) == ViewCompat.LAYOUT_DIRECTION_RTL) {
-                        setText(M_ELLIPSIS + text.subSequence(0, end));
-                    } else {
-                        setText(text.subSequence(0, end) + M_ELLIPSIS);
-                    }
-                }
-            }
-        }
-
-        // Some devices try to auto adjust line spacing, so force default line spacing
-        // and invalidate the layout as a side effect
-        setTextSize(TypedValue.COMPLEX_UNIT_PX, targetTextSize);
-        setLineSpacing(mSpacingAdd, mSpacingMult);
-
-        // Notify the listener if registered
-        if (mTextResizeListener != null) {
-            mTextResizeListener.onTextResize(this, oldTextSize, targetTextSize);
-        }
-
-        // Reset force resize flag
-        mNeedsResize = false;
-    }
-
-    // Set the text size of the text paint object and use a static layout to render text off screen before measuring
-    private int getTextHeight(CharSequence source, TextPaint paint, int width, float textSize) {
-        // modified: make a copy of the original TextPaint object for measuring
-        // (apparently the object gets modified while measuring, see also the
-        // docs for TextView.getPaint() (which states to access it read-only)
-        TextPaint paintCopy = new TextPaint(paint);
-        // Update the text paint object
-        paintCopy.setTextSize(textSize);
-        // Measure using a static layout
-        StaticLayout layout = new StaticLayout(source, paintCopy, width, Layout.Alignment.ALIGN_NORMAL,
-                                               mSpacingMult, mSpacingAdd, true);
-        return layout.getHeight();
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/CustomSwipeRefreshLayout.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/CustomSwipeRefreshLayout.java
deleted file mode 100644
index 91c72674d487..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/CustomSwipeRefreshLayout.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.wordpress.android.util.widgets;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
-
-import org.wordpress.android.util.AppLog;
-import org.wordpress.android.util.AppLog.T;
-
-public class CustomSwipeRefreshLayout extends SwipeRefreshLayout {
-    public CustomSwipeRefreshLayout(Context context) {
-        super(context);
-    }
-
-    public CustomSwipeRefreshLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        try {
-            return super.onTouchEvent(event);
-        } catch (IllegalArgumentException e) {
-            // Fix for https://github.com/wordpress-mobile/WordPress-Android/issues/2373
-            // Catch IllegalArgumentException which can be fired by the underlying SwipeRefreshLayout.onTouchEvent()
-            // method.
-            // When android support-v4 fixes it, we'll have to remove that custom layout completely.
-            AppLog.e(T.UTILS, e);
-            return true;
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/WPTextInputLayout.java b/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/WPTextInputLayout.java
deleted file mode 100644
index 2c3951c61ec5..000000000000
--- a/libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/WPTextInputLayout.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.wordpress.android.util.widgets;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.EditText;
-
-import com.google.android.material.textfield.TextInputLayout;
-
-import org.wordpress.android.util.R;
-
-/**
- * Custom TextInputLayout to provide a usable getBaseline() and error view padding
- */
-public class WPTextInputLayout extends TextInputLayout {
-    public WPTextInputLayout(Context context) {
-        super(context);
-    }
-
-    public WPTextInputLayout(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public WPTextInputLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    @Override
-    public int getBaseline() {
-        EditText editText = getEditText();
-        return editText != null ? editText.getBaseline() - editText.getPaddingBottom()
-                                  + getResources().getDimensionPixelSize(R.dimen.textinputlayout_baseline_correction)
-                : 0;
-    }
-
-    @Override
-    public void setErrorEnabled(boolean enabled) {
-        super.setErrorEnabled(enabled);
-
-        // remove hardcoded side padding of the error view
-        if (enabled) {
-            View errorView = findViewById(com.google.android.material.R.id.textinput_error);
-            if (errorView != null && errorView.getParent() != null) {
-                ((View) errorView.getParent())
-                        .setPadding(0, errorView.getPaddingTop(), 0, errorView.getPaddingBottom());
-            }
-        }
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/main/res/values/dimens.xml b/libs/utils/WordPressUtils/src/main/res/values/dimens.xml
deleted file mode 100644
index 4f3fdecd3158..000000000000
--- a/libs/utils/WordPressUtils/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="textinputlayout_baseline_correction">2dp</dimen>
-    <dimen name="textinputlayout_correction_padding">4.3dp</dimen>
-    <dimen name="textinputlayout_correction_margin_right">-8.6dp</dimen>
-</resources>
diff --git a/libs/utils/WordPressUtils/src/main/res/values/strings.xml b/libs/utils/WordPressUtils/src/main/res/values/strings.xml
deleted file mode 100644
index 34d25dada509..000000000000
--- a/libs/utils/WordPressUtils/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="no_network_message">There is no network available</string>
-    <string name="timespan_now">Now</string>
-</resources>
diff --git a/libs/utils/WordPressUtils/src/main/res/values/tags.xml b/libs/utils/WordPressUtils/src/main/res/values/tags.xml
deleted file mode 100644
index 796e3fab2be0..000000000000
--- a/libs/utils/WordPressUtils/src/main/res/values/tags.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <item name="glide_image_loader_view_tag" type="id"/>
-</resources>
diff --git a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/DateTimeUtilsTest.java b/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/DateTimeUtilsTest.java
deleted file mode 100644
index a6ae733607e5..000000000000
--- a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/DateTimeUtilsTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.wordpress.android.util;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.util.Date;
-import java.util.TimeZone;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class DateTimeUtilsTest {
-    private final long mDefaultDate = 1564484058163L; // it's Tue Jul 30 2019 10:54:18 in UTC
-
-    @Test
-    public void testIso8601UTCFromDate() {
-        // Arrange
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+2:00"));
-        Date date = new Date(mDefaultDate);
-        String expected = "2019-07-30T10:54:18+00:00";
-
-        // Act
-        String actual = DateTimeUtils.iso8601UTCFromDate(date);
-
-        // Assert
-        assertThat(actual).isEqualTo(expected);
-    }
-
-    @Test
-    @Ignore(value = "This test is failing because `DateTimeUtils.localDateToUTC` doesn't work as expected. I've "
-                    + "marked it as deprecated and this tests serves just as a documentation.")
-    public void testLocalDateToUTC() {
-        // Arrange
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+2:00"));
-        Date date = new Date(mDefaultDate);
-        // this succeeds
-        assertThat(DateTimeUtils.iso8601FromDate(date)).isEqualTo("2019-07-30T12:54:18+0200");
-
-        // Act
-        String actual = DateTimeUtils.iso8601FromDate(DateTimeUtils.localDateToUTC(date));
-
-        // Assert
-
-        // fails because `localDateToUTC` doesn't work as expected. See DateTimeUtils.localDateToUTC for more info.
-        assertThat(actual).isEqualTo("2019-07-30T10:54:18+00:00");
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileCleanerTest.kt b/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileCleanerTest.kt
deleted file mode 100644
index 71789bd844dc..000000000000
--- a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileCleanerTest.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.wordpress.android.util
-
-import android.content.Context
-import android.os.Build
-import androidx.test.core.app.ApplicationProvider
-import java.io.File
-import java.io.FileReader
-import kotlin.random.Random
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.wordpress.android.util.helpers.logfile.LogFileCleaner
-import org.wordpress.android.util.helpers.logfile.LogFileProvider
-
-/**
- *  The number of test files to create for each test run
- */
-private const val MAX_FILES = 10
-
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1])
-class LogFileCleanerTest {
-    private lateinit var logFileProvider: LogFileProvider
-
-    @Before
-    fun setup() {
-        val context: Context = ApplicationProvider.getApplicationContext()
-        logFileProvider = LogFileProvider.fromContext(context)
-
-        repeat(MAX_FILES) {
-            val file = File(logFileProvider.getLogFileDirectory(), "$it.log")
-            file.writeText("$it")
-            file.setLastModified(it * 10_000L)
-        }
-
-        assert(logFileProvider.getLogFileDirectory().listFiles().count() == MAX_FILES)
-    }
-
-    @After
-    fun tearDown() {
-        // Delete the test directory after each test
-        logFileProvider.getLogFileDirectory().deleteRecursively()
-    }
-
-    @Test
-    fun testThatCleanerPreservesMostRecentlyCreatedFiles() {
-        val maxLogFileCount = Random.nextInt(MAX_FILES)
-        LogFileCleaner(logFileProvider, maxLogFileCount).clean()
-
-        // Strings are easier to assert against than arrays
-        val remainingFileIds = logFileProvider.getLogFiles().joinToString(",") {
-            FileReader(it).readText()
-        }
-
-        val expectedValue = (MAX_FILES - 1 downTo 0).take(maxLogFileCount).reversed().joinToString(",")
-        assertEquals(expectedValue, remainingFileIds)
-    }
-
-    @Test
-    fun testThatCleanerPreservesCorrectNumberOfFiles() {
-        val numberOfFiles = Random.nextInt(MAX_FILES)
-        LogFileCleaner(logFileProvider, numberOfFiles).clean()
-        assertEquals(numberOfFiles, logFileProvider.getLogFileDirectory().listFiles().count())
-    }
-
-    @Test
-    fun testThatCleanerErasesAllFilesIfGivenZero() {
-        LogFileCleaner(logFileProvider, 0).clean()
-        assert(logFileProvider.getLogFileDirectory().listFiles().isEmpty())
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileHelpersTest.kt b/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileHelpersTest.kt
deleted file mode 100644
index e4921c21e750..000000000000
--- a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileHelpersTest.kt
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.wordpress.android.util
-
-import android.content.Context
-import android.os.Build
-import androidx.test.core.app.ApplicationProvider
-import java.io.File
-import java.util.UUID
-import org.junit.After
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.wordpress.android.util.helpers.logfile.LogFileProvider
-
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1])
-class LogFileHelpersTest {
-    private lateinit var testProvider: LogFileProvider
-
-    @Before
-    fun setup() {
-        val context: Context = ApplicationProvider.getApplicationContext()
-        testProvider = LogFileProvider.fromContext(context)
-    }
-
-    @After
-    fun tearDown() {
-        // Delete the test directory after each test
-        testProvider.getLogFileDirectory().deleteRecursively()
-    }
-
-    @Test
-    fun testThatLogFileDirectoryIsCreatedIfNotExists() {
-        val directory = testProvider.getLogFileDirectory()
-        assert(directory.exists())
-    }
-
-    @Test
-    fun testThatLogFilesListsAllFiles() {
-        val directory = testProvider.getLogFileDirectory()
-        File(directory, UUID.randomUUID().toString()).createNewFile()
-        Assert.assertEquals(testProvider.getLogFiles().count(), 1)
-    }
-
-    @Test
-    fun testThatLogFilesSortsFilesWithMostRecentFirst() {
-        val directory = testProvider.getLogFileDirectory()
-
-        listOf(1_000L, 1_000_000L).shuffled().forEach { modifiedDate ->
-            File(directory, UUID.randomUUID().toString()).also { file ->
-                // Use timestamps in increments of 1000 to avoid issues from the File System's date precision
-                val date = modifiedDate * 1000
-                file.createNewFile()
-                file.setLastModified(date)
-                assert(file.lastModified() == date)
-            }
-        }
-
-        val files = testProvider.getLogFiles()
-        assert(files.first().lastModified() < files.last().lastModified())
-    }
-}
diff --git a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileWriterTest.kt b/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileWriterTest.kt
deleted file mode 100644
index 998a29398783..000000000000
--- a/libs/utils/WordPressUtils/src/test/java/org/wordpress/android/util/LogFileWriterTest.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.wordpress.android.util
-
-import android.content.Context
-import android.os.Build
-import androidx.test.core.app.ApplicationProvider
-import java.io.FileReader
-import java.util.UUID
-import org.junit.After
-import org.junit.Assert.assertEquals
-import org.junit.Before
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.robolectric.RobolectricTestRunner
-import org.robolectric.annotation.Config
-import org.wordpress.android.util.helpers.logfile.LogFileProvider
-import org.wordpress.android.util.helpers.logfile.LogFileWriter
-
-@RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1])
-class LogFileWriterTest {
-    private lateinit var testProvider: LogFileProvider
-
-    @Before
-    fun setup() {
-        val context: Context = ApplicationProvider.getApplicationContext()
-        testProvider = LogFileProvider.fromContext(context)
-    }
-
-    @After
-    fun tearDown() {
-        // Delete the test directory after each test
-        testProvider.getLogFileDirectory().deleteRecursively()
-    }
-
-    @Test
-    fun testThatFileWriterCreatesLogFile() {
-        val writer = LogFileWriter(testProvider)
-        assert(writer.getFile().exists())
-    }
-
-    @Test
-    fun testThatContentsAreWrittenToFile() {
-        val randomString = UUID.randomUUID().toString()
-        val writer = LogFileWriter(testProvider)
-        writer.write(randomString)
-
-        // Allow the async process to persist the file changes
-        Thread.sleep(1000)
-
-        val contents = FileReader(writer.getFile()).readText()
-        assertEquals(randomString, contents)
-    }
-}
diff --git a/libs/utils/build.gradle b/libs/utils/build.gradle
deleted file mode 100644
index ebb5278a193c..000000000000
--- a/libs/utils/build.gradle
+++ /dev/null
@@ -1,41 +0,0 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.automattic.android:fetchstyle:1.1'
-    }
-}
-
-apply plugin: 'com.automattic.android.fetchstyle'
-
-allprojects {
-    apply plugin: 'checkstyle'
-
-    repositories {
-        jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
-    }
-
-    if (tasks.findByPath('checkstyle') == null) {
-        tasks.create(name: 'checkstyle', type: Checkstyle) {
-            source 'src'
-
-            classpath = files()
-        }
-
-        checkstyle {
-            toolVersion = '8.3'
-            configFile file("${project.rootDir}/config/checkstyle.xml")
-        }
-    }
-
-    // Suppress false Javadoc lint errors preventing Bintray release
-    // See https://stackoverflow.com/questions/34828426/disable-javadoc-check-for-bintray-upload
-    tasks.withType(Javadoc) {
-        options.addBooleanOption('Xdoclint:none', true)
-    }
-}
diff --git a/libs/utils/config/checkstyle.xml b/libs/utils/config/checkstyle.xml
deleted file mode 100644
index 2ebaaac1412c..000000000000
--- a/libs/utils/config/checkstyle.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<module name="Checker">
-    <!-- Restricts scan to specific extensions.           -->
-    <!-- See http://checkstyle.sf.net/config.html#Checker -->
-    <property name="fileExtensions" value="java, kt, xml"/>
-
-    <!-- Excludes given file patterns from scan.              -->
-    <!-- See http://checkstyle.sf.net/config_filefilters.html -->
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="[/\\]gen[/\\]"/>
-    </module>
-
-    <!-- Checks whether files end with a new line.                        -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
-    <module name="NewlineAtEndOfFile"/>
-
-    <!-- Checks that property files contain the same keys.         -->
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-    <module name="Translation"/>
-
-    <!-- Checks for Size Violations.                    -->
-    <!-- See http://checkstyle.sf.net/config_sizes.html -->
-    <!--
-    <module name="FileLength"/>
-    -->
-
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="FileTabCharacter"/>
-
-    <!-- Miscellaneous other checks.                   -->
-    <!-- See http://checkstyle.sf.net/config_misc.html -->
-    <module name="RegexpMultiline">
-      <property name="format"
-                value="(\n|\r\n)[\t ]*(\n|\r\n)[\t ]*\}"/>
-      <property name="message" value="Empty line not allowed before brace"/>
-    </module>
-
-    <module name="RegexpMultiline">
-      <property name="format"
-                value="\{[\t ]*(\n|\r\n)[\t ]*(\n|\r\n)"/>
-      <property name="message" value="Empty line not allowed after brace"/>
-    </module>
-
-    <module name="RegexpSingleline">
-      <property name="format" value=" \/\/(?!noinspection)[^ \t]"/>
-      <property name="message" value="Line comments '//' must be followed by one whitespace"/>
-      <property name="severity" value="error"/>
-    </module>
-
-    <module name="RegexpSingleline">
-        <property name="format" value="[^\S\r\n]@[\S]*(\([{]?\&quot;.*\&quot;[}]?\)++|\([^\&quot;]*\)++)[^ \t]"/>
-        <property name="message" value="In-line annotations must be followed by one whitespace"/>
-        <property name="severity" value="error"/>
-    </module>
-
-    <module name="RegexpSingleline">
-        <property name="format" value="^(?!.*\bimport\b).*Store\.[A-Z][A-Za-z0-9]*[ );]"/>
-        <property name="message" value="Specific imports should be used for FluxC Store inner classes"/>
-        <property name="severity" value="error"/>
-    </module>
-
-    <module name="RegexpMultiline">
-        <property name="format" value="@Inject(\n|\r\n).*[^{,(]$"/>
-        <property name="message" value="Inject annotation should be in-line with the annotated field or property"/>
-    </module>
-
-    <module name="RegexpSingleline">
-        <property name="format" value="^(?!.*\bclass\b).*\S.*@Inject"/>
-        <property name="message" value="In-line inject annotation should precede the rest of the declaration"/>
-    </module>
-
-    <!-- Specific to FluxC -->
-    <module name="RegexpSingleline">
-        <property name="format" value="extends Payload[^&lt;]"/>
-        <property name="message" value="Payload should not be used as a raw type"/>
-        <property name="severity" value="error"/>
-    </module>
-
-    <!-- Specific to FluxC -->
-    <module name="RegexpMultiline">
-        <property name="format" value="(?&lt;!^@Singleton)\n.*extends Store[\s{]"/>
-        <property name="message" value="Stores must be annotated with @Singleton"/>
-    </module>
-
-    <!-- Specific to FluxC -->
-    <module name="RegexpMultiline">
-        <property name="format" value="(?&lt;!^@Singleton)\n.*extends Base[\w]*Client[\s{]"/>
-        <property name="message" value="Network clients must be annotated with @Singleton"/>
-    </module>
-
-    <!-- Specific to WordPress -->
-    <module name="RegexpSingleline">
-      <property name="format" value=".*dotcom(?!.*checkstyle ignore)"/>
-      <property name="ignoreCase" value="true"/>
-      <property name="message" value="You should not use _dotcom_, use _wpcom_ instead"/>
-      <property name="severity" value="error"/>
-    </module>
-
-    <!-- Specific to WordPress -->
-    <module name="RegexpSingleline">
-      <property name="format" value=".*dotorg(?!.*checkstyle ignore)"/>
-      <property name="ignoreCase" value="true"/>
-      <property name="message" value="You should not use _dotorg_, use _selfHosted_ instead"/>
-      <property name="severity" value="error"/>
-    </module>
-
-    <module name="TreeWalker">
-
-        <!-- Checks for Naming Conventions.                  -->
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
-        <module name="ConstantName"/>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <!-- <module name="MemberName"/> -->
-        <module name="MemberName">
-          <property name="applyToPublic" value="false"/>
-          <property name="applyToProtected" value="false"/>
-          <property name="applyToPackage" value="false"/>
-          <property name="applyToPrivate" value="false"/>
-          <property name="format" value="^[a-zA-Z0-9]*$"/>
-        </module>
-        <module name="MemberName">
-          <property name="applyToPublic" value="false"/>
-          <property name="applyToProtected" value="true"/>
-          <property name="applyToPackage" value="true"/>
-          <property name="applyToPrivate" value="true"/>
-          <property name="format" value="^m[a-zA-Z0-9]*$"/>
-        </module>
-
-        <module name="MethodName">
-           <property name="format" value="^[a-z](_?[a-zA-Z0-9]+)*$"/>
-        </module>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="StaticVariableName"/>
-        <module name="TypeName">
-          <property name="format" value="^[A-Z][a-zA-Z0-9_]*$"/>
-        </module>
-
-        <!-- Checks for imports                              -->
-        <!-- See http://checkstyle.sf.net/config_import.html -->
-        <module name="AvoidStarImport"/>
-        <module name="IllegalImport">
-            <property name="illegalClasses" value="android.app.Fragment"/>
-        </module>
-        <module name="RedundantImport"/>
-        <module name="UnusedImports">
-            <property name="processJavadoc" value="true"/>
-        </module>
-
-        <module name="ImportOrder">
-            <property name="groups" value="android,androidx,com,junit,net,org,java,javax"/>
-            <property name="ordered" value="false"/>
-            <property name="separated" value="true"/>
-            <property name="option" value="bottom"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
-        </module>
-
-        <!-- Checks for Size Violations.                    -->
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-          <!-- what is a good max value? -->
-          <property name="max" value="120"/>
-          <!-- ignore lines like "$File: //depot/... $" -->
-          <property name="ignorePattern" value="\$File.*\$"/>
-          <property name="severity" value="error"/>
-        </module>
-        <module name="MethodLength">
-          <property name="tokens" value="METHOD_DEF"/>
-          <!-- TODO: We should set this value around 40 or 50 -->
-          <property name="max" value="200"/>
-          <property name="severity" value="warning"/>
-        </module>
-
-        <!-- Checks for whitespace                               -->
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-        <module name="EmptyForIteratorPad"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore"/>
-        <module name="SingleSpaceSeparator"/>
-        <module name="OperatorWrap"/>
-        <module name="ParenPad"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-          <property name="allowEmptyTypes" value="true"/>
-          <property name="allowEmptyConstructors" value="true"/>
-          <property name="ignoreEnhancedForColon" value="false"/>
-        </module>
-        <module name="NoWhitespaceAfter">
-          <property name="tokens"
-                    value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" />
-        </module>
-
-        <!-- Modifier Checks                                    -->
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-        <module name="ModifierOrder"/>
-        <module name="RedundantModifier"/>
-
-
-        <!-- Checks for blocks. You know, those {}'s         -->
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
-        <module name="AvoidNestedBlocks"/>
-        <module name="EmptyBlock">
-          <property name="option" value="text"/>
-        </module>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces">
-            <property name="allowSingleLineStatement" value="true"/>
-        </module>
-        <module name="RightCurly"/>
-
-
-        <!-- Checks for common coding problems               -->
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
-        <module name="EmptyStatement"/>
-        <module name="FallThrough"/>
-        <module name="HiddenField">
-          <property name="ignoreConstructorParameter" value="true"/>
-          <property name="ignoreSetter" value="true"/>
-          <property name="severity" value="warning"/>
-        </module>
-        <module name="IllegalInstantiation"/>
-
-        <module name="SimplifyBooleanExpression"/>
-        <module name="SimplifyBooleanReturn"/>
-
-        <!-- Checks for class design                         -->
-        <!-- See http://checkstyle.sf.net/config_design.html -->
-        <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier">
-          <property name="packageAllowed" value="true"/>
-          <property name="protectedAllowed" value="true"/>
-          <property name="publicMemberPattern" value="^[a-zA-Z0-9_]*$"/>
-        </module>
-
-        <!-- Miscellaneous other checks.                   -->
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
-        <module name="ArrayTypeStyle"/>
-        <module name="TodoComment">
-          <property name="format" value="FIXME"/>
-          <property name="severity" value="warning"/>
-        </module>
-
-        <module name="UpperEll"/>
-
-        <module name="SuppressWarningsHolder"/> <!-- Required by suppression via annotation filter -->
-
-        <module name="OneStatementPerLine"/>
-
-        <!-- Enable suppression comments -->
-        <module name="SuppressionCommentFilter">
-            <property name="offCommentFormat" value="CHECKSTYLE IGNORE\s+(\S+)"/>
-            <property name="onCommentFormat" value="CHECKSTYLE END IGNORE\s+(\S+)"/>
-            <property name="checkFormat" value="$1"/>
-        </module>
-
-        <module name="SuppressWithNearbyCommentFilter">
-            <!-- Syntax is "SUPPRESS CHECKSTYLE name" -->
-            <property name="commentFormat" value="SUPPRESS CHECKSTYLE (\w+)"/>
-            <property name="checkFormat" value="$1"/>
-            <property name="influenceFormat" value="1"/>
-        </module>
-
-    </module>
-
-    <module name="SuppressWarningsFilter"/>
-
-</module>
diff --git a/libs/utils/gradle.properties-example b/libs/utils/gradle.properties-example
deleted file mode 100644
index 5bac8ac50462..000000000000
--- a/libs/utils/gradle.properties-example
+++ /dev/null
@@ -1 +0,0 @@
-android.useAndroidX=true
diff --git a/libs/utils/gradle/wrapper/gradle-wrapper.jar b/libs/utils/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index f3d88b1c2faf..000000000000
Binary files a/libs/utils/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/libs/utils/gradle/wrapper/gradle-wrapper.properties b/libs/utils/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 4e1cc9db6b59..000000000000
--- a/libs/utils/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
diff --git a/libs/utils/gradlew b/libs/utils/gradlew
deleted file mode 100755
index 2fe81a7d95e4..000000000000
--- a/libs/utils/gradlew
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
diff --git a/libs/utils/gradlew.bat b/libs/utils/gradlew.bat
deleted file mode 100644
index 62bd9b9ccefe..000000000000
--- a/libs/utils/gradlew.bat
+++ /dev/null
@@ -1,103 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/libs/utils/settings.gradle b/libs/utils/settings.gradle
deleted file mode 100644
index 3519745edd00..000000000000
--- a/libs/utils/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':WordPressUtils'
\ No newline at end of file
diff --git a/local-builds.gradle-example b/local-builds.gradle-example
index 76fa93da077d..e3f67fe4bb57 100644
--- a/local-builds.gradle-example
+++ b/local-builds.gradle-example
@@ -14,5 +14,7 @@ get better with some build improvements, but in the meantime it might be best to
 binary build if you're not working on a specific library.
 */
 ext {
-    localFluxCPath = "../WordPress-FluxC-Android"
+    //localFluxCPath = "../WordPress-FluxC-Android"
+    //localWPUtilsPath = "../WordPress-Utils-Android"
+    //localGutenbergMobilePath = "../gutenberg-mobile"
 }
diff --git a/settings.gradle b/settings.gradle
index c332f424f45d..d2912c564a2d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,7 +11,6 @@ include ':photoeditor'
 project(':photoeditor').projectDir = new File(rootProject.projectDir, 'libs/stories-android/photoeditor')
 
 include ':libs:image-editor:ImageEditor'
-include ':libs:utils:WordPressUtils'
 include ':libs:networking:WordPressNetworking'
 include ':libs:analytics:WordPressAnalytics'
 include ':libs:editor:WordPressEditor'
@@ -22,40 +21,10 @@ include ':libs:WordPressAnnotations'
 include ':WordPressMocks'
 project(':WordPressMocks').projectDir = new File(rootProject.projectDir, properties.getOrDefault('wp.wordpress_mocks_path', 'libs/mocks') + '/WordPressMocks')
 
-include ':@wordpress_react-native-aztec'
-project(':@wordpress_react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android')
-
-include ':@wordpress_react-native-bridge'
-project(':@wordpress_react-native-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android')
-
-if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean()) {
-    include ':react-native-linear-gradient'
-    project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-linear-gradient/android')
-    include ':react-native-svg'
-    project(':react-native-svg').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-svg/android')
-    include ':react-native-aztec'
-    project(':react-native-aztec').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-aztec/android')
-    include ':react-native-gutenberg-bridge'
-    project(':react-native-gutenberg-bridge').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android')
-    include ':react-native-video'
-    project(':react-native-video').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-video/android-exoplayer')
-    include ':@react-native-community_slider'
-    project(':@react-native-community_slider').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/@react-native-community/slider/src/android')
-    include ':react-native-get-random-values'
-    project(':react-native-get-random-values').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-get-random-values/android')
-    include ':@react-native-community_masked-view'
-    project(':@react-native-community_masked-view').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/@react-native-community/masked-view/android')
-    include ':react-native-gesture-handler'
-    project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-gesture-handler/android')
-    include ':react-native-screens'
-    project(':react-native-screens').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-screens/android')
-    include ':react-native-safe-area-context'
-    project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-safe-area-context/android')
-    include ':react-native-reanimated'
-    project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-reanimated/android')
-}
-
 gradle.ext.fluxCBinaryPath = "com.github.wordpress-mobile.WordPress-FluxC-Android"
+gradle.ext.wputilsBinaryPath = "org.wordpress:utils"
+gradle.ext.gutenbergMobileBinaryPath = "org.wordpress-mobile.gutenberg-mobile:react-native-gutenberg-bridge"
+gradle.ext.includedBuildGutenbergMobilePath = null
 
 def localBuilds = new File('local-builds.gradle')
 if (localBuilds.exists()) {
@@ -63,7 +32,7 @@ if (localBuilds.exists()) {
 
     /*
     In order to add a new included build:
-    1. Define a property for its path in the `local-builds.gradle-example` file. 
+    1. Define a property for its path in the `local-builds.gradle-example` file.
     2. Check if that property exists in `ext` since it may be commented out.
     3. Include the build using the property.
     4. Add dependencySubstitution block and substitute the binary module with the project.
@@ -80,5 +49,24 @@ if (localBuilds.exists()) {
             }
         }
     }
+
+    if (ext.has("localWPUtilsPath")) {
+        includeBuild(ext.localWPUtilsPath) {
+            dependencySubstitution {
+                println "Substituting wputils with the local build"
+                substitute module("$gradle.ext.wputilsBinaryPath") with project(':WordPressUtils')
+            }
+        }
+    }
+
+    if (ext.has("localGutenbergMobilePath")) {
+        gradle.ext.includedBuildGutenbergMobilePath = ext.localGutenbergMobilePath
+        includeBuild("$ext.localGutenbergMobilePath/gutenberg/packages/react-native-bridge/android") {
+            dependencySubstitution {
+                println "Substituting gutenberg-mobile with the local build"
+                substitute module("$gradle.ext.gutenbergMobileBinaryPath") with project(':react-native-bridge')
+            }
+        }
+    }
 }
 
diff --git a/tools/exported-language-codes.csv b/tools/exported-language-codes.csv
deleted file mode 100644
index 6809ef36fe2f..000000000000
--- a/tools/exported-language-codes.csv
+++ /dev/null
@@ -1,50 +0,0 @@
-en-us,en-rUS,English(US)
-az,az,Azerbaijani
-de,de,German
-el,el,Greek
-es,es,Spanish
-es-mx,es-rMX,Spanish(Mexico)
-es-cl,es-rCL,Spanish(Chile)
-fr,fr,French
-gd,gd,Scottish-Gaelic
-hi,hi,Hindi
-hu,hu,Hungarian
-id,id,Indonesian
-it,it,Italian
-ja,ja,Japanese
-ko,ko,Korean
-nb,nb,Norwegian
-nl,nl,Dutch
-pl,pl,Polish
-ru,ru,Russian
-sv,sv,Swedish
-th,th,Thai
-uz,uz,Uzbek
-zh-cn,zh-rCN,Chinese(Simplified)
-zh-tw,zh-rTW,Chinese(Traditional)
-zh-tw,zh-rHK,Chinese(Traditional)
-en-gb,en-rGB,GB-English
-tr,tr,Turkish
-eu,eu,Basque
-he,he,Hebrew
-pt-br,pt-rBR,Portuguese(Brazil)
-ar,ar,Arabic
-ro,ro,Romanian
-mk,mk,Macedonian
-en-au,en-rAU,English(Australian)
-sr,sr,Serbian
-sk,sk,Slovak
-cy,cy,Welch
-da,da,Danish
-bg,bg,Bulgarian
-sq,sq,Albanian
-hr,hr,Croatian
-cs,cs,Czech
-en-ca,en-rCA,English(Canada)
-ms,ms,Malay
-es-ve,es-rVE,Spanish(Venezuela)
-gl,gl,Galician
-vi,vi,Vietnamese
-is,is,Icelandic
-es-co,es-rCO,Spanish(Colombia)
-kmr,kmr,Kurdish(Kurmanji)
\ No newline at end of file
diff --git a/tools/merge_strings_xml.py b/tools/merge_strings_xml.py
index 2548a473cda9..1e319a1637eb 100755
--- a/tools/merge_strings_xml.py
+++ b/tools/merge_strings_xml.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import logging, sys
+import logging, sys, os
 import xml.etree.ElementTree as ET
 from xml.dom import minidom
 import json
@@ -98,16 +98,25 @@ def merge_strings(main_xml, extra_sections):
         add_section(main_root, insertion_point_index, section_name, new_elements)
     # make sure xml file ends with a newline
     main_root.tail = '\n'
-    xml_string = ('<?xml version="1.0" encoding="UTF-8"?>' + '\n' + 
+    xml_string = ('<?xml version="1.0" encoding="UTF-8"?>' + '\n' +
         ET.tostring(main_root, encoding='utf8').split('\n',1)[1])
     with open(main_xml, 'wb') as xml_file:
         xml_file.write(xml_string)
 
 def main():
+    if len(sys.argv) != 3:
+        print 'Usage: merge_strings_xml.py <section name> <strings.xml file path>'
+        sys.exit(1)
+
+    project_root_path = os.path.dirname(os.path.dirname(__file__))
+    main_strings_file = os.path.join(project_root_path, 'WordPress/src/main/res/values/strings.xml')
+    library_name = sys.argv[1]
+    input_file = sys.argv[2]
+    print('Merging strings for: ', library_name)
     merge_strings(
-        './WordPress/src/main/res/values/strings.xml',
+        main_strings_file,
         [
-            { 'name': 'Gutenberg Native', 'file': './libs/gutenberg-mobile/bundle/android/strings.xml' },
+            { 'name': library_name, 'file': input_file },
         ]
     )
 
diff --git a/tools/release-checks.sh b/tools/release-checks.sh
deleted file mode 100755
index 8d53a9df8075..000000000000
--- a/tools/release-checks.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-LANG_FILE=tools/exported-language-codes.csv
-RESDIR=WordPress/src/main/res/
-BUILDFILE=WordPress/build.gradle
-
-function checkDeviceToTest() {
-  lines=$(adb devices -l|wc -l)
-  if [ $lines -le 2 ]; then
-    echo You need a device connected or an emulator running
-    exit 2
-  fi
-}
-
-function runConnectedTests() {
-  echo Tests will be run on following devices:
-  adb devices -l
-  echo -----------
-  ./gradlew cIT
-}
-
-function pOk() {
-  echo "[$(tput setaf 2)OK$(tput sgr0)]"
-}
-
-function pFail() {
-  echo "[$(tput setaf 1)KO$(tput sgr0)]"
-}
-
-function checkENStrings() {
-  if [[ -n $(git status --porcelain|grep "M res") ]]; then
-    /bin/echo -n "Unstagged changes detected in $RESDIR - can't continue..."
-    pFail
-    exit 3
-  fi
-  # save local changes
-  git stash | grep "No local changes to save" > /dev/null
-  needpop=$?
-
-  rm -f $RESDIR/values-??/strings.xml $RESDIR/values-??-r??/strings.xml
-  /bin/echo -n "Check for missing strings (slow)..."
-  ./gradlew build > /dev/null 2>&1 && pOk || (pFail; ./gradlew build)
-  ./gradlew clean > /dev/null 2>&1
-  git checkout -- $RESDIR/
-
-  # restore local changes
-  if [ $needpop -eq 1 ]; then
-    git stash pop > /dev/null
-  fi
-}
-
-function checkNewLanguages() {
-  /bin/echo -n "Check for potential new languages..."
-  langs=`curl -L http://translate.wordpress.org/projects/apps/android/dev 2> /dev/null \
-   		| grep -B 1 morethan90|grep "android/dev/" \
-   		| sed "s+.*android/dev/\([a-zA-Z-]*\)/default.*+\1+"`
-  nerrors=''
-  for lang in $langs; do
-    grep "^$lang," $LANG_FILE > /dev/null
-    if [ $? -ne 0 ]; then
-      nerrors=$nerrors"language code $lang has reached 90% translation threshold and hasn't been found in $LANG_FILE\n"
-    fi
-  done
-  if [ "x$nerrors" = x ]; then
-    pOk
-  else
-    pFail
-    echo $nerrors
-  fi
-}
-
-function printVersion() {
-  gradle_version=$(grep -E 'versionName' $BUILDFILE | sed s/versionName// | grep -Eo "[a-zA-Z0-9.-]+" )
-  echo "$BUILDFILE version $gradle_version"
-}
-
-#checkNewLanguages
-checkENStrings
-printVersion
-# checkDeviceToTest
-# runConnectedTests
diff --git a/tools/review-language-codes.csv b/tools/review-language-codes.csv
deleted file mode 100644
index e5fb92c7c125..000000000000
--- a/tools/review-language-codes.csv
+++ /dev/null
@@ -1,17 +0,0 @@
-en-us,en-rUS,English(US)
-de,de,German
-es,es,Spanish
-fr,fr,French
-id,id,Indonesian
-it,it,Italian
-ja,ja,Japanese
-ko,ko,Korean
-nl,nl,Dutch
-ru,ru,Russian
-sv,sv,Swedish
-zh-cn,zh-rCN,Chinese(Simplified)
-zh-tw,zh-rTW,Chinese(Traditional)
-tr,tr,Turkish
-he,he,Hebrew
-pt-br,pt-rBR,Portuguese(Brazil)
-ar,ar,Arabic
diff --git a/tools/update-translations.sh b/tools/update-translations.sh
deleted file mode 100755
index 5a9d0c05cc20..000000000000
--- a/tools/update-translations.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-SCRIPT_DIR=$(dirname "$0")
-BUILD_TYPE=$1
-BUILD_FILTER=$2
-LANG_FILE="${SCRIPT_DIR}/../tools/exported-language-codes.csv"
-RESDIR="${SCRIPT_DIR}/../WordPress/src/main/res/"
-
-# Language definitions resource file
-HEADER=\<?xml\ version=\"1.0\"\ encoding=\"UTF-8\"?\>\\n\<!--Warning:\ Auto-generated\ file,\ don\'t\ edit\ it.--\>\\n\<resources\>\\n\<string-array\ name=\"available_languages\"\ translatable=\"false\"\>
-FOOTER=\\n\</string-array\>\\n\</resources\>\\n
-PREPEND=\\n\<item\>
-APPEND=\</item\>
-LANGUAGE_DEF_FILE=$RESDIR/values/available_languages.xml
-echo $HEADER > $LANGUAGE_DEF_FILE
-
-# Filter definition
-filter="current"
-strings_file="strings.xml"
-base_url="http://translate.wordpress.org/projects/apps/android/dev"
-
-if [ -n "$BUILD_TYPE" ]; then 
-    base_url="https://translate.wordpress.com/projects/wporg/apps/android";
-    LANG_FILE="${SCRIPT_DIR}/../tools/review-language-codes.csv"
-fi
-
-if [ "$BUILD_FILTER" == "review" ]; then 
-    filter=$BUILD_FILTER; 
-    strings_file="strings-$filter.xml"
-fi
-
-# Inject default en_US language
-echo $PREPEND >> $LANGUAGE_DEF_FILE
-echo en_US >> $LANGUAGE_DEF_FILE
-echo $APPEND >> $LANGUAGE_DEF_FILE
-
-for line in $(grep -v en-rUS $LANG_FILE) ; do
-    code=$(echo $line|cut -d "," -f1|tr -d " ")
-    local=$(echo $line|cut -d "," -f2|tr -d " ")
-    echo $PREPEND >> $LANGUAGE_DEF_FILE
-    echo $local | sed s/-r/_/ >> $LANGUAGE_DEF_FILE
-    echo $APPEND >> $LANGUAGE_DEF_FILE
-    echo updating $local - $code
-    test -d $RESDIR/values-$local/ || mkdir $RESDIR/values-$local/
-    test -f $RESDIR/values-$local/$strings_file && cp $RESDIR/values-$local/$strings_file $RESDIR/values-$local/$strings_file.bak
-    
-    curl -sSfL --globoff "$base_url/$code/default/export-translations?filters[status]=$filter&format=android" \
-        | sed $'s/\.\.\./\…/' \
-        | sed $'s/\t/    /g' \
-        | sed -E '/Translation-Revision-Date/!s/([[:digit:]])-([[:digit:]])/\1–\2/g' \
-        > $RESDIR/values-$local/$strings_file || (echo Error downloading $code && rm -rf $RESDIR/values-$local/)
-        
-    test -f $RESDIR/values-$local/$strings_file.bak && rm $RESDIR/values-$local/$strings_file.bak
-done
-
-echo $FOOTER >> $LANGUAGE_DEF_FILE